From 546346849e489054bc9107c55037ebf7f514de89 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 25 Jun 2017 12:25:01 +0000
Subject: [PATCH 0001/3253] fetchMavenArtifact: prevent leaking nix hash to jar
 name

---
 pkgs/build-support/fetchmavenartifact/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix
index a9c53249ae81..dc48a312fb37 100644
--- a/pkgs/build-support/fetchmavenartifact/default.nix
+++ b/pkgs/build-support/fetchmavenartifact/default.nix
@@ -67,7 +67,7 @@ in
     # packages packages that mention this derivation in their buildInputs.
     installPhase = ''
       mkdir -p $out/share/java
-      ln -s ${jar} $out/share/java
+      ln -s ${jar} $out/share/java/${artifactId}-${version}.jar
     '';
     # We also add a `jar` attribute that can be used to easily obtain the path
     # to the downloaded jar file.

From 458bcc8f7a95874afc21cc58ddef6e87d9924d5a Mon Sep 17 00:00:00 2001
From: Brian Olsen <brian@maven-group.org>
Date: Mon, 26 Feb 2018 23:57:44 +0100
Subject: [PATCH 0002/3253] nixos/rspamd: Preserve runtime directory when using
 socket activation

---
 nixos/modules/services/mail/rspamd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 09fb587e74b5..a88a8997c3a1 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -308,6 +308,7 @@ in
         ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
         Restart = "always";
         RuntimeDirectory = "rspamd";
+        RuntimeDirectoryPreserve = mkIf cfg.socketActivation true;
         PrivateTmp = true;
         Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames);
       };

From f1eb2f35a6c06c22d5299eb39ab9ce5b88008605 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 4 Mar 2018 06:28:49 -0500
Subject: [PATCH 0003/3253] lib/tests: Add check-eval.nix to run simple tests.

This can be used by evaluation-only tools to validate tests are still
working.
---
 lib/tests/check-eval.nix | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/tests/check-eval.nix

diff --git a/lib/tests/check-eval.nix b/lib/tests/check-eval.nix
new file mode 100644
index 000000000000..8bd7b605a39b
--- /dev/null
+++ b/lib/tests/check-eval.nix
@@ -0,0 +1,7 @@
+# Throws an error if any of our lib tests fail.
+
+let tests = [ "misc" "systems" ];
+    all = builtins.concatLists (map (f: import (./. + "/${f}.nix")) tests);
+in if all == []
+     then null
+   else throw (builtins.toJSON all)

From 9d6ac12f3935db5fedf530efa6aed8c3913924e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 5 Apr 2018 21:12:18 +0100
Subject: [PATCH 0004/3253] glib: bin/gio is required by gvfs executables

this fixes gvfs in caia (mate desktop)
---
 pkgs/development/libraries/glib/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 2c070ff3fa8c..4f347f3e15d0 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     ++ optional doCheck ./skip-timer-test.patch
     ++ [ ./schema-override-variable.patch ];
 
-  outputs = [ "out" "dev" "devdoc" ];
+  outputs = [ "bin" "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
@@ -106,12 +106,16 @@ stdenv.mkDerivation rec {
   DETERMINISTIC_BUILD = 1;
 
   postInstall = ''
+    mkdir -p $bin/bin
+    for app in gapplication gdbus gio gsettings; do
+      mv "$dev/bin/$app" "$bin/bin"
+    done
+
     moveToOutput "share/glib-2.0" "$dev"
     substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
-  ''
-  # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
-  + ''
+
+    # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
     sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
       -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
   '';

From 4b7c52e010b0aba3bada8f2bce85818475c6dfb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 6 Apr 2018 00:44:25 +0100
Subject: [PATCH 0005/3253] gtkd: correct glib output

---
 pkgs/development/libraries/gtkd/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 5a4cf75048f7..125bf7a8c25e 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
       --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
       --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
     substituteInPlace generated/gtkd/gtkc/gobject.d \
-      --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
-      --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+      --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
+      --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
     substituteInPlace generated/gtkd/gtkc/rsvg.d \
       --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
       --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
@@ -63,15 +63,15 @@ stdenv.mkDerivation rec {
       --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
       --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
     substituteInPlace generated/gtkd/gtkc/glib.d \
-      --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
-      --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
-      --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
-      --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
-      --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
-      --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+      --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \
+      --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \
+      --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
+      --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \
+      --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \
+      --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
     substituteInPlace generated/gtkd/gtkc/gio.d \
-      --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
-      --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
+      --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \
+      --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib
     substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \
       --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
       --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib

From 15bfee85f35231be92e439e7f3f02e9aba34dcdf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 22 Mar 2018 01:22:05 +0300
Subject: [PATCH 0006/3253] impureUseNativeOptimizations: add stdenv adapter

This allows one to force a compiler to use native machine optimizations. This
goes contrary to all the usual guarantees of Nix and so should be used only by
end-user and only in specific cases when they know what are they doing.

In my case this is needed to get a noticeable FPS boost in RPCS3 which is very
CPU-hungry PlayStation 3 emulator.
---
 pkgs/stdenv/adapters.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 734119491a0b..d3f7e4e99331 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -210,4 +210,19 @@ rec {
         NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + " -fuse-ld=gold";
       });
     };
+
+
+  /* Modify a stdenv so that it builds binaries optimized specifically
+     for the machine they are built on.
+
+     WARNING: this breaks purity! */
+  impureUseNativeOptimizations = stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // {
+        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -march=native";
+        NIX_ENFORCE_NO_NATIVE = false;
+
+        preferLocalBuild = true;
+        allowSubstitutes = false;
+      });
+    };
 }

From c3c695183cde665872fa53f4c592b47e3976c379 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 27 Apr 2018 15:09:48 +0800
Subject: [PATCH 0007/3253] nix-optimise: do not run in container

---
 nixos/modules/services/misc/nix-optimise.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index 295e7fb0ba03..f3c5d3e81db4 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -40,6 +40,8 @@ in
 
     systemd.services.nix-optimise =
       { description = "Nix Store Optimiser";
+        # No point running it inside a nixos-container. It should be on the host instead.
+        unitConfig.ConditionVirtualization = "!container";
         serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise";
         startAt = optionals cfg.automatic cfg.dates;
       };

From 6da6accd303be776bb4e958da52046da86f9cb5c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 22 May 2018 16:42:02 -0400
Subject: [PATCH 0008/3253] treewide: Remove uses of builtins.toPath.

toPath has confusing semantics and is never necessary; it can always
either just be omitted or replaced by pre-concatenating `/.`. It has
been marked as "!!! obsolete?" for more than 10 years in a C++
comment, hopefully removing it will let us properly deprecate and,
eventually, remove it.
---
 lib/strings.nix                                              | 5 ++---
 lib/tests/misc.nix                                           | 4 ++--
 nixos/lib/eval-config.nix                                    | 2 +-
 .../modules/services/x11/desktop-managers/enlightenment.nix  | 2 +-
 pkgs/build-support/fetchdocker/default.nix                   | 4 ++--
 pkgs/development/mobile/androidenv/androidndk.nix            | 2 +-
 .../apple-source-releases/libsecurity_generic/default.nix    | 2 +-
 pkgs/servers/bird/default.nix                                | 2 +-
 pkgs/servers/monitoring/telegraf/default.nix                 | 2 +-
 pkgs/servers/nosql/influxdb/default.nix                      | 2 +-
 pkgs/tools/typesetting/tex/texlive/combine.nix               | 2 +-
 11 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index e09ec42bfea2..2a61b1465cc2 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -492,7 +492,7 @@ rec {
   isStorePath = x:
        isCoercibleToString x
     && builtins.substring 0 1 (toString x) == "/"
-    && dirOf (builtins.toPath x) == builtins.storeDir;
+    && dirOf x == builtins.storeDir;
 
   /* Convert string to int
      Obviously, it is a bit hacky to use fromJSON that way.
@@ -528,11 +528,10 @@ rec {
   */
   readPathsFromFile = rootPath: file:
     let
-      root = toString rootPath;
       lines = lib.splitString "\n" (builtins.readFile file);
       removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
       relativePaths = removeComments lines;
-      absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
+      absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths;
     in
       absolutePaths;
 
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index c683df7d7ca3..c0e1aaa248eb 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -97,7 +97,7 @@ runTests {
         storePathAppendix = isStorePath
           "${goodPath}/bin/python";
         nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
-        asPath = isStorePath (builtins.toPath goodPath);
+        asPath = isStorePath goodPath;
         otherPath = isStorePath "/something/else";
         otherVals = {
           attrset = isStorePath {};
@@ -318,7 +318,7 @@ runTests {
       int = 42;
       bool = true;
       string = ''fno"rd'';
-      path = /. + "/foo"; # toPath returns a string
+      path = /. + "/foo";
       null_ = null;
       function = x: x;
       functionArgs = { arg ? 4, foo }: arg;
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 97c79487df4c..d005fc61dc4e 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -28,7 +28,7 @@
 
 let extraArgs_ = extraArgs; pkgs_ = pkgs;
     extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
-                   in if e == "" then [] else [(import (builtins.toPath e))];
+                   in if e == "" then [] else [(import e)];
 in
 
 let
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index da3287aaea6e..5c083a151ff3 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -61,7 +61,7 @@ in
       '';
     }];
 
-    security.wrappers = (import (builtins.toPath "${e.enlightenment}/e-wrappers.nix")).security.wrappers;
+    security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers;
 
     environment.etc = singleton
       { source = xcfg.xkbDir;
diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix
index ae3ae4185e05..b54e4141afc9 100644
--- a/pkgs/build-support/fetchdocker/default.nix
+++ b/pkgs/build-support/fetchdocker/default.nix
@@ -22,8 +22,8 @@ assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository
 assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName);
 
 let
-  # Abuse `builtins.toPath` to collapse possible double slashes
-  repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}");
+  # Abuse paths to collapse possible double slashes
+  repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}");
   repoTag1 = lib.removePrefix "/" repoTag0;
 
   layers = builtins.map stripNixStore imageLayers;
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 78e278be2376..1c0f75215e76 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
           patch -p1 \
             --no-backup-if-mismatch \
-            -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") }
+            -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" }
           wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
         ''
     }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
index 93857ea792c2..2efdc5abeb31 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -1,7 +1,7 @@
 { appleDerivation_, applePackage, pkgs, stdenv }:
 name: version: sha256: args: let
   n = stdenv.lib.removePrefix "lib" name;
-  makeFile = ../. + builtins.toPath "/${name}/GNUmakefile";
+  makeFile = ../. + "/${name}/GNUmakefile";
   appleDerivation = appleDerivation_ name version sha256;
   in applePackage name version sha256 (args // {
     appleDerivation = a:
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 94bd92abb4f8..f44ae83ec03a 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -17,7 +17,7 @@ let
       buildInputs = [ readline ];
 
       patches = [
-        (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch"))
+        (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")
       ];
 
       configureFlags = [
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index b7879cc763aa..dc219416fcb9 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
     -X main.version=${version}
   '' ];
 
-  goDeps = ./. + builtins.toPath "/deps-${version}.nix";
+  goDeps = ./. + "/deps-${version}.nix";
 
   meta = with lib; {
     description = "The plugin-driven server agent for collecting & reporting metrics.";
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 972bd53d95ee..466bf6a60a06 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -20,7 +20,7 @@ buildGoPackage rec {
   excludedPackages = "test";
 
   # Generated with the nix2go
-  goDeps = ./. + builtins.toPath "/deps-${version}.nix";
+  goDeps = ./. + "/deps-${version}.nix";
 
   meta = with lib; {
     description = "An open-source distributed time series database";
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 35fee64ba54f..f1a20552d382 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -35,7 +35,7 @@ let
 
   mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: >
     # here we deal with those dummy packages needed for hyphenation filtering
-    (map (p: if lib.isDerivation p then builtins.toPath p else "") pkgs);
+    (map (p: if lib.isDerivation p then p.outPath else "") pkgs);
 
 in buildEnv {
   name = "texlive-${extraName}-${bin.texliveYear}";

From ae09fe25e994ca6fe51681ebfcdcf32fa2e8b769 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Mon, 18 Jun 2018 16:46:11 -0700
Subject: [PATCH 0009/3253] libinput: split utilities to a bin output

libinput builds some executables which are useful for debugging or
unusual configurations, but not necessary in normal use of the library.
(See libinput(1) and the other referenced man pages.)

Some of these programs require Python, which makes the closure
significantly larger. Splitting /libexec/ and /bin/ to a separate "bin"
output allows systems that don't need these utilities to avoid the
substantial size hit.
---
 pkgs/development/libraries/libinput/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 3b4e3233d554..61c8095911f6 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "bin" ];
 
   mesonFlags = [
     (mkFlag documentationSupport "documentation")
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
     (mkFlag testsSupport "tests")
   ];
 
+  preConfigure = ''
+    mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
+  '';
+
   nativeBuildInputs = [ pkgconfig meson ninja ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];

From 6fcee4e1dde50336a7f1874dc63ec8e52b6254d9 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 20 Jun 2018 20:52:36 -0400
Subject: [PATCH 0010/3253] clementine: add gst_plugins to buildInputs so setup
 hooks work

when the build was refactored in ef5e212d, this was lost.  a4ba8c65
got most of it back, but missed the addition of gst_plugins to
buildInputs.

fixes #39960
---
 pkgs/applications/audio/clementine/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 6379975e951c..a18622e8bafc 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -72,7 +72,8 @@ let
     name = "clementine-free-${version}";
     inherit src patches nativeBuildInputs postPatch;
 
-    buildInputs = buildInputs ++ [ makeWrapper ];
+    # gst_plugins needed for setup-hooks
+    buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];
 
     cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
 
@@ -104,7 +105,7 @@ let
       ./clementine-spotify-blob.patch
     ];
 
-    buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ];
+    buildInputs = buildInputs ++ [ libspotify makeWrapper ];
     # Only build and install the Spotify blob
     preBuild = ''
       cd ext/clementine-spotifyblob

From d9fa88dfe86b4a884f64ccb785077020a21793e8 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Mon, 25 Jun 2018 14:11:59 +0200
Subject: [PATCH 0011/3253] Use a NixOS module for generating the gdk-pixbuf
 loaders cache.

Fixes issue #33231 and makes it possible to enable Plasma and KDE at the same time.

Previously, this worked like this:
- The gdk-pixbuf package comes with a cache file covering the modules bundled
  with gdk-pixbuf.
- The librsvg package comes with a cache covering modules from gdk-pixbuf as
  well as librsvg.
- plasma5 and xfce modules set the environment variable GDK_PIXBUF_MODULE_FILE
  to the one from librsvg, so that SVG was supported in addition to the
  formats supported by gdk-pixbuf. However if both were enabled a configuration
  conflict would result (despite setting to the same value).

While this sort of worked (ignoring the conflict which perhaps could be hacked
around), it is unscalable and a hack, as there would be a real problem when one
wanted to add a third package that supports additional image formats.

A new NixOS module (gdk-pixbuf) is added with a configuration option
(modulePackages) that other modules use to request specific packages to be
included in the loaders cache. When any package is present in the list, the
module generates a system-wide loaders cache which includes the requested
packages (and always gdk-pixbuf itself), and sets the environment variable
GDK_PIXBUF_MODULE_FILE to point to the generated cache file.

The plasma5 and xfce modules are updated to add librsvg to modulePackages
instead of setting GDK_PIXBUF_MODULE_FILE.

Note that many packages create wrappers that set GDK_PIXBUF_MODULE_FILE,
some directly to the one from librsvg. Therefore this change does not
change the existing hack in the librsvg package which ensures that
file is generated. This change aims only to solve the conflict in the
global environent variable configuration.
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/x11/desktop-managers/plasma5.nix |  6 +--
 .../services/x11/desktop-managers/xfce.nix    |  3 +-
 nixos/modules/services/x11/gdk-pixbuf.nix     | 45 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 nixos/modules/services/x11/gdk-pixbuf.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 193ef0d1c961..688239b044bf 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -703,6 +703,7 @@
   ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
+  ./services/x11/gdk-pixbuf.nix
   ./services/x11/redshift.nix
   ./services/x11/urxvtd.nix
   ./services/x11/window-managers/awesome.nix
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 91d091d7d7e2..72e08eda0412 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -181,10 +181,8 @@ in
         target = "X11/xkb";
       };
 
-      environment.variables = {
-        # Enable GTK applications to load SVG icons
-        GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-      };
+      # Enable GTK applications to load SVG icons
+      services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
 
       fonts.fonts = with pkgs; [ noto-fonts hack-font ];
       fonts.fontconfig.defaultFonts = {
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 7dcc600d2664..824e89781bc0 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -112,10 +112,11 @@ in
     ];
 
     environment.variables = {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
       GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
     };
 
+    services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
+
     services.xserver.desktopManager.session = [{
       name = "xfce";
       bgSupport = true;
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix
new file mode 100644
index 000000000000..58faa8e2f9df
--- /dev/null
+++ b/nixos/modules/services/x11/gdk-pixbuf.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.gdk-pixbuf;
+
+  # Get packages to generate the cache for. We always include gdk_pixbuf.
+  effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages);
+
+  # Generate the cache file by running gdk-pixbuf-query-loaders for each
+  # package and concatenating the results.
+  loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" {} ''
+    (
+      for package in ${concatStringsSep " " effectivePackages}; do
+        module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
+        if [[ ! -d $module_dir ]]; then
+          echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
+          continue
+        fi
+        GDK_PIXBUF_MODULEDIR="$module_dir" \
+          ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders
+      done
+    ) > "$out"
+  '';
+in
+
+{
+  options = {
+    services.xserver.gdk-pixbuf.modulePackages = mkOption {
+      type = types.listOf types.package;
+      default = [ ];
+      description = "Packages providing GDK-Pixbuf modules, for cache generation.";
+    };
+  };
+
+  # If there is any package configured in modulePackages, we generate the
+  # loaders.cache based on that and set the environment variable
+  # GDK_PIXBUF_MODULE_FILE to point to it.
+  config = mkIf (cfg.modulePackages != []) {
+    environment.variables = {
+      GDK_PIXBUF_MODULE_FILE = "${loadersCache}";
+    };
+  };
+}

From 7f308aa7b16727211868e233f29eca060f810352 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 2 Jul 2018 13:09:23 -0500
Subject: [PATCH 0012/3253] coreutils: 8.29 -> 8.30

http://savannah.gnu.org/forum/forum.php?forum_id=9187
---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 589c58d0acc0..d06d761d9a5b 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -14,11 +14,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "coreutils-8.29";
+  name = "coreutils-8.30";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
+    sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
   };
 
   patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;

From 92d48c6a21a0fe1c814d611b8a923688404f83f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 3 Jul 2018 22:20:07 -0700
Subject: [PATCH 0013/3253] libraw: 0.18.12 -> 0.19.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/raw-identify passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/unprocessed_raw passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/4channels passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/simple_dcraw passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/mem_image passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/dcraw_half passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/half_mt passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/multirender_test passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/postprocessing_benchmark passed the binary check.
- /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0/bin/dcraw_emu passed the binary check.
- 10 of 10 passed binary check by having a zero exit code.
- 0 of 10 passed binary check by having the new version present in output.
- found 0.19.0 with grep in /nix/store/c152az463594l2si39h4assahzv5wv6r-libraw-0.19.0
- directory tree listing: https://gist.github.com/d21a46bb80b662baa7febf18eab4e313
- du listing: https://gist.github.com/02a9d0af77dcf1045b4d3c5f7d17528f
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 9803e09610e6..e009a9f920b1 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.12";
+  version = "0.19.0";
 
   src = fetchurl {
     url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap";
+    sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From f26153754a1b6ac0d72adde9c75e1473463b4dbb Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sat, 30 Jun 2018 09:33:45 +0200
Subject: [PATCH 0014/3253] nixos/xserver: Implement configuration of NVIDIA
 Optimus via PRIME

This adds configuration options which automate the configuration of NVIDIA Optimus using PRIME. This allows using the NVIDIA proprietary driver on Optimus laptops, in order to render using the NVIDIA GPU while outputting to displays connected only to the integrated Intel GPU. It also adds an option for enabling kernel modesetting for the NVIDIA driver (via a kernel command line flag); this is particularly useful together with Optimus/PRIME because it fixes tearing on PRIME-connected screens.

The user still needs to enable the Optimus/PRIME feature and specify the bus IDs of the Intel and NVIDIA GPUs, but this is still much easier for users and more reliable. The implementation handles both the X configuration file as well as getting display managers to run certain necessary `xrandr` commands just after X has started.

Configuration of commands run after X startup is done using a new configuration option `services.xserver.displayManager.setupCommands`. Support for this option is implemented for LightDM, GDM and SDDM; all of these have been tested with this feature including logging into a Plasma session.

Note: support of `setupCommands` for GDM is implemented by making GDM run the session executable via a wrapper; the wrapper will run the `setupCommands` before execing. This seemed like the simplest and most reliable approach, and solves running these commands both for GDM's X server and user X servers (GDM starts separate X servers for itself and user sessions). An alternative approach would be with autostart files but that seems harder to set up and less reliable.

Note that some simple features for X configuration file generation (in `xserver.nix`) are added which are used in the implementation:
- `services.xserver.extraConfig`: Allows adding arbitrary new sections. This is used to add the Device section for the Intel GPU.
- `deviceSection` and `screenSection` within `services.xserver.drivers`. This allows the nvidia configuration module to add additional contents into the `Device` and `Screen` sections of the "nvidia" driver, and not into such sections for other drivers that may be enabled.
---
 nixos/modules/hardware/video/nvidia.nix       | 120 +++++++++++++++++-
 .../services/x11/display-managers/default.nix |  11 ++
 .../services/x11/display-managers/gdm.nix     |  12 ++
 .../services/x11/display-managers/lightdm.nix |   6 +
 .../services/x11/display-managers/sddm.nix    |   4 +-
 nixos/modules/services/x11/xserver.nix        |  10 ++
 pkgs/desktops/gnome-3/core/gdm/default.nix    |  16 ++-
 .../gdm/gdm-session-worker_forward-vars.patch |  31 +++++
 .../gdm/gdm-session-worker_xserver-path.patch |  17 ---
 .../gdm/gdm-x-session_session-wrapper.patch   |  40 ++++++
 10 files changed, 244 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
 delete mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
 create mode 100644 pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eb1952280331..6944d1a4f76b 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -26,9 +26,73 @@ let
   nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
 
   enabled = nvidia_x11 != null;
+
+  cfg = config.hardware.nvidia;
+  optimusCfg = cfg.optimus_prime;
 in
 
 {
+  options = {
+    hardware.nvidia.modesetting.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable kernel modesetting when using the NVIDIA proprietary driver.
+
+        Enabling this fixes screen tearing when using Optimus via PRIME (see
+        <option>hardware.nvidia.optimus_prime.enable</option>. This is not enabled
+        by default because it is not officially supported by NVIDIA and would not
+        work with SLI.
+      '';
+    };
+
+    hardware.nvidia.optimus_prime.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = ''
+        Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME.
+        If enabled, the NVIDIA GPU will be always on and used for all rendering,
+        while enabling output to displays attached only to the integrated Intel GPU
+        without a multiplexer.
+
+        Note that this option only has any effect if the "nvidia" driver is specified
+        in <option>services.xserver.videoDrivers</option>, and it should preferably
+        be the only driver there.
+
+        If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
+        specified (<option>hardware.nvidia.optimus_prime.nvidiaBusId</option> and
+        <option>hardware.nvidia.optimus_prime.intelBusId</option>).
+
+        If you enable this, you may want to also enable kernel modesetting for the
+        NVIDIA driver (<option>hardware.nvidia.modesetting.enable</option>) in order
+        to prevent tearing.
+
+        Note that this configuration will only be successful when a display manager
+        for which the <option>services.xserver.displayManager.setupCommands</option>
+        option is supported is used; notably, SLiM is not supported.
+      '';
+    };
+
+    hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
+      type = lib.types.string;
+      default = "";
+      example = "PCI:1:0:0";
+      description = ''
+        Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
+        shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
+      '';
+    };
+
+    hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
+      type = lib.types.string;
+      default = "";
+      example = "PCI:0:2:0";
+      description = ''
+        Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
+        shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
+      '';
+    };
+  };
 
   config = mkIf enabled {
     assertions = [
@@ -36,15 +100,61 @@ in
         assertion = config.services.xserver.displayManager.gdm.wayland;
         message = "NVidia drivers don't support wayland";
       }
+      {
+        assertion = !optimusCfg.enable ||
+          (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
+        message = ''
+          When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
+        '';
+      }
     ];
 
-    services.xserver.drivers = singleton
-      { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; };
+    # If Optimus/PRIME is enabled, we:
+    # - Specify the configured NVIDIA GPU bus ID in the Device section for the
+    #   "nvidia" driver.
+    # - Add the AllowEmptyInitialConfiguration option to the Screen section for the
+    #   "nvidia" driver, in order to allow the X server to start without any outputs.
+    # - Add a separate Device section for the Intel GPU, using the "modesetting"
+    #   driver and with the configured BusID.
+    # - Reference that Device section from the ServerLayout section as an inactive
+    #   device.
+    # - Configure the display manager to run specific `xrandr` commands which will
+    #   configure/enable displays connected to the Intel GPU.
 
-    services.xserver.screenSection =
+    services.xserver.drivers = singleton {
+      name = "nvidia";
+      modules = [ nvidia_x11.bin ];
+      libPath = [ nvidia_x11 ];
+      deviceSection = optionalString optimusCfg.enable
+        ''
+          BusID "${optimusCfg.nvidiaBusId}"
+        '';
+      screenSection =
+        ''
+          Option "RandRRotation" "on"
+          ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
+        '';
+    };
+
+    services.xserver.extraConfig = optionalString optimusCfg.enable
       ''
-        Option "RandRRotation" "on"
+        Section "Device"
+          Identifier "nvidia-optimus-intel"
+          Driver "modesetting"
+          BusID  "${optimusCfg.intelBusId}"
+          Option "AccelMethod" "none"
+        EndSection
       '';
+    services.xserver.serverLayoutSection = optionalString optimusCfg.enable
+      ''
+        Inactive "nvidia-optimus-intel"
+      '';
+
+    services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable ''
+      # Added by nvidia configuration module for Optimus/PRIME.
+      ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
+      ${pkgs.xorg.xrandr}/bin/xrandr --auto
+    '';
 
     environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles {
       source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
@@ -62,6 +172,8 @@ in
     boot.kernelModules = [ "nvidia-uvm" ] ++
       lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
 
+    # If requested enable modesetting via kernel parameter.
+    boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";
 
     # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
     services.udev.extraRules =
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 43ed21c95fee..e337f3af328f 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -227,6 +227,17 @@ in
         description = "List of arguments for the X server.";
       };
 
+      setupCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed just after the X server has started.
+
+          This option is only effective for display managers for which this feature
+          is supported; currently these are LightDM, GDM and SDDM.
+        '';
+      };
+
       sessionCommands = mkOption {
         type = types.lines;
         default = "";
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a6a38a21b617..0c6da2d564c6 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -7,6 +7,13 @@ let
   cfg = config.services.xserver.displayManager;
   gdm = pkgs.gnome3.gdm;
 
+  xSessionWrapper = if (cfg.setupCommands == "") then null else
+    pkgs.writeScript "gdm-x-session-wrapper" ''
+      #!${pkgs.bash}/bin/bash
+      ${cfg.setupCommands}
+      exec "$@"
+    '';
+
 in
 
 {
@@ -112,6 +119,11 @@ in
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
+        } // optionalAttrs (xSessionWrapper != null) {
+          # Make GDM use this wrapper before running the session, which runs the
+          # configured setupCommands. This relies on a patched GDM which supports
+          # this environment variable.
+          GDM_X_SESSION_WRAPPER = "${xSessionWrapper}";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 5beadacdfa93..028d655f8456 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -61,6 +61,12 @@ let
       ${optionalString hasDefaultUserSession ''
         user-session=${defaultSessionName}
       ''}
+      ${optionalString (dmcfg.setupCommands != "") ''
+        display-setup-script=${pkgs.writeScript "lightdm-display-setup" ''
+          #!${pkgs.bash}/bin/bash
+          ${dmcfg.setupCommands}
+        ''}
+      ''}
       ${cfg.extraSeatDefaults}
     '';
 
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index df782e82ed15..fe97666dc242 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -31,6 +31,7 @@ let
     rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache
 
     ${cfg.setupScript}
+    ${dmcfg.setupCommands}
   '';
 
   Xstop = pkgs.writeScript "Xstop" ''
@@ -148,7 +149,8 @@ in
           xrandr --auto
         '';
         description = ''
-          A script to execute when starting the display server.
+          A script to execute when starting the display server. DEPRECATED, please
+          use <option>services.xserver.displayManager.setupCommands</option>.
         '';
       };
 
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3048cd02683f..accdf3a5cf8a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -374,6 +374,12 @@ in
         description = "Contents of the first Monitor section of the X server configuration file.";
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional contents (sections) included in the X server configuration file";
+      };
+
       xrandrHeads = mkOption {
         default = [];
         example = [
@@ -741,6 +747,7 @@ in
             Driver "${driver.driverName or driver.name}"
             ${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
             ${cfg.deviceSection}
+            ${driver.deviceSection or ""}
             ${xrandrDeviceSection}
           EndSection
 
@@ -752,6 +759,7 @@ in
             ''}
 
             ${cfg.screenSection}
+            ${driver.screenSection or ""}
 
             ${optionalString (cfg.defaultDepth != 0) ''
               DefaultDepth ${toString cfg.defaultDepth}
@@ -781,6 +789,8 @@ in
         '')}
 
         ${xrandrMonitorSections}
+
+        ${cfg.extraConfig}
       '';
 
     fonts.enableDefaultFonts = mkDefault true;
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 2f7452dbc572..0d6bb9484421 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -36,13 +36,27 @@ stdenv.mkDerivation rec {
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
   patches = [
+    # Change hardcoded paths to nix store paths.
     (substituteAll {
       src = ./fix-paths.patch;
       inherit coreutils plymouth xwayland;
     })
+
+    # The following patches implement certain environment variables in GDM which are set by
+    # the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix).
+
+    # Look for session definition files in the directory specified by GDM_SESSIONS_DIR.
     ./sessions_dir.patch
+
+    # Allow specifying X server arguments with GDM_X_SERVER_EXTRA_ARGS.
     ./gdm-x-session_extra_args.patch
-    ./gdm-session-worker_xserver-path.patch
+
+    # Allow specifying a wrapper for running the session command.
+    ./gdm-x-session_session-wrapper.patch
+
+    # Forwards certain environment variables to the gdm-x-session child process
+    # to ensure that the above two patches actually work.
+    ./gdm-session-worker_forward-vars.patch
   ];
 
   installFlags = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
new file mode 100644
index 000000000000..401b6aea0c28
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
@@ -0,0 +1,31 @@
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 9ef4c5b..94da834 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -1515,6 +1515,16 @@ gdm_session_worker_load_env_d (GdmSessionWorker *worker)
+         g_object_unref (dir);
+ }
+ 
++static void
++gdm_session_worker_forward_var (GdmSessionWorker *worker, char const *var)
++{
++        char const *value = g_getenv(var);
++        if (value != NULL) {
++                g_debug ("forwarding %s= %s", var, value);
++                gdm_session_worker_set_environment_variable(worker, var, value);
++        }
++}
++
+ static gboolean
+ gdm_session_worker_accredit_user (GdmSessionWorker  *worker,
+                                   GError           **error)
+@@ -1559,6 +1569,9 @@ gdm_session_worker_accredit_user (GdmSessionWorker  *worker,
+                 goto out;
+         }
+ 
++        gdm_session_worker_forward_var(worker, "GDM_X_SERVER_EXTRA_ARGS");
++        gdm_session_worker_forward_var(worker, "GDM_X_SESSION_WRAPPER");
++
+         gdm_session_worker_update_environment_from_passwd_info (worker,
+                                                                 uid,
+                                                                 gid,
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
deleted file mode 100644
index d020752fef3a..000000000000
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_xserver-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session-worker.c.orig b/daemon/gdm-session-worker.c
-index 7bbda49..592691d 100644
---- a/daemon/gdm-session-worker.c.orig
-+++ b/daemon/gdm-session-worker.c
-@@ -1557,6 +1557,12 @@ gdm_session_worker_accredit_user (GdmSessionWorker  *worker,
-                 goto out;
-         }
- 
-+        if (g_getenv ("GDM_X_SERVER_EXTRA_ARGS") != NULL) {
-+                g_debug ("forwarding GDM_X_SERVER_EXTRA_ARGS= %s", g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
-+                gdm_session_worker_set_environment_variable (worker, "GDM_X_SERVER_EXTRA_ARGS",
-+                                                             g_getenv("GDM_X_SERVER_EXTRA_ARGS"));
-+        }
-+
-         gdm_session_worker_update_environment_from_passwd_info (worker,
-                                                                 uid,
-                                                                 gid,
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
new file mode 100644
index 000000000000..58481f0730fa
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
@@ -0,0 +1,40 @@
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index 88fe96f..b1b140a 100644
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -664,18 +664,34 @@ spawn_session (State        *state,
+                                                           state->session_command,
+                                                           NULL);
+         } else {
++                char const *session_wrapper;
++                char *eff_session_command;
+                 int ret;
+                 char **argv;
+ 
+-                ret = g_shell_parse_argv (state->session_command,
++                session_wrapper = g_getenv("GDM_X_SESSION_WRAPPER");
++                if (session_wrapper != NULL) {
++                        char *quoted_wrapper = g_shell_quote(session_wrapper);
++                        eff_session_command = g_strjoin(" ", quoted_wrapper, state->session_command, NULL);
++                        g_free(quoted_wrapper);
++                } else {
++                        eff_session_command = state->session_command;
++                }
++
++                ret = g_shell_parse_argv (eff_session_command,
+                                           NULL,
+                                           &argv,
+                                           &error);
+ 
++                if (session_wrapper != NULL) {
++                        g_free(eff_session_command);
++                }
++
+                 if (!ret) {
+                         g_debug ("could not parse session arguments: %s", error->message);
+                         goto out;
+                 }
++
+                 subprocess = g_subprocess_launcher_spawnv (launcher,
+                                                            (const char * const *) argv,
+                                                            &error);

From 16cccc251372c63f6dfdd5dd5a0f9046d9fecd8e Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alexey.lebedeff@booking.com>
Date: Thu, 25 Jan 2018 20:17:34 +0100
Subject: [PATCH 0015/3253] erlang: Build with systemd support

That way 'epmd' can be started by systemd using socket
activation. This is important to have when there is more than one
Erlang system used on the same host.

Support for this exists since 17.0:
https://github.com/erlang/otp/commit/b7c95eabf6017ddb352fb8ce2b3749af108ebf29

Configure flag was added in 17.1:
https://github.com/erlang/otp/commit/12cd5e5b394623fab9907622ad99163c5b9350e1
---
 pkgs/development/interpreters/erlang/generic-builder.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 6ea3ac73a4b1..b4f70899693c 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -3,6 +3,7 @@
 , openjdk ? null # javacSupport
 , unixODBC ? null # odbcSupport
 , libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
+, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
 }:
 
 { baseName ? "erlang"
@@ -53,6 +54,7 @@ in stdenv.mkDerivation ({
     ++ optionals wxSupport wxPackages2
     ++ optionals odbcSupport odbcPackages
     ++ optionals javacSupport javacPackages
+    ++ optional withSystemd systemd
     ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]);
 
   debugInfo = enableDebugInfo;
@@ -82,6 +84,7 @@ in stdenv.mkDerivation ({
     ++ optional javacSupport "--with-javac"
     ++ optional odbcSupport "--with-odbc=${unixODBC}"
     ++ optional wxSupport "--enable-wx"
+    ++ optional withSystemd "--enable-systemd"
     ++ optional stdenv.isDarwin "--enable-darwin-64bit";
 
   # install-docs will generate and install manpages and html docs

From c00d17aae388bca8bf5657a2f312a1e436e7aef0 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <alexey.lebedeff@booking.com>
Date: Thu, 25 Jan 2018 20:28:58 +0100
Subject: [PATCH 0016/3253] epmd: Introduce erlang port mapper daemon service

Having socket-activated epmd means that there always be only a single
instance managed centrally. Because Erlang also starts it
automatically if not available, and in worst case scenario 'epmd' can
be started by some Erlang application running under systemd. And then
restarting this application unit will cause complete loss of names in
'epmd' (if other Erlang system are also installed on this host).

E.g. see at which lengths RabbitMQ goes to recover from such
situations:
https://github.com/rabbitmq/rabbitmq-server/blame/7741b37b1efa97ac9b17685cc626bd35ee52ca16/src/rabbit_epmd_monitor.erl#L36

Having the only one socket-activated epmd completely solves this
problem.
---
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/services/networking/epmd.nix | 56 ++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 nixos/modules/services/networking/epmd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cd00bc8d6bc2..aa79849d18a8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -484,6 +484,7 @@
   ./services/networking/dnsdist.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
+  ./services/networking/epmd.nix
   ./services/networking/fakeroute.nix
   ./services/networking/ferm.nix
   ./services/networking/firefox/sync-server.nix
diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix
new file mode 100644
index 000000000000..692b75e4f086
--- /dev/null
+++ b/nixos/modules/services/networking/epmd.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.epmd;
+
+in
+
+{
+  ###### interface
+  options.services.epmd = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable socket activation for Erlang Port Mapper Daemon (epmd),
+        which acts as a name server on all hosts involved in distributed
+        Erlang computations.
+      '';
+    };
+    package = mkOption {
+      type = types.package;
+      default = pkgs.erlang;
+      description = ''
+        The Erlang package to use to get epmd binary. That way you can re-use
+        an Erlang runtime that is already installed for other purposes.
+      '';
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    systemd.sockets.epmd = rec {
+      description = "Erlang Port Mapper Daemon Activation Socket";
+      wantedBy = [ "sockets.target" ];
+      before = wantedBy;
+      socketConfig = {
+        ListenStream = "4369";
+        Accept = "false";
+      };
+    };
+
+    systemd.services.epmd = {
+      description = "Erlang Port Mapper Daemon";
+      after = [ "network.target" ];
+      requires = [ "epmd.socket" ];
+
+      serviceConfig = {
+        DynamicUser = true;
+        ExecStart = "${cfg.package}/bin/epmd -systemd";
+        Type = "notify";
+      };
+    };
+  };
+}

From 86b097432aef616552715f3f2ef6d183aee6da22 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Fri, 27 Jul 2018 10:41:42 +0200
Subject: [PATCH 0017/3253] procps: enable systemd support when available

`ps` can show various systemd-related information, like a unit to
which a process belongs. But when it's not compiled it, it shows only
'?' in such fields.

Can be tested with:

    ps -o unit= ax
---
 pkgs/os-specific/linux/procps-ng/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 7f1e93c072da..dd269c447df8 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,10 +1,20 @@
 { lib, stdenv, fetchurl, ncurses, pkgconfig
 
+# `ps` with systemd support is able to properly report different
+# attributes like unit name, so we want to have it on linux.
+# The strange `boostrap` condition is here because `procps` can be
+# pulled in to early in bootstrap process, when `stdenv` is not yet
+# functional enought to build `systemd` (or its dependencies).
+# See https://github.com/NixOS/nixpkgs/pull/43817#issuecomment-408346135
+, withSystemd ? stdenv.isLinux && !(lib.hasPrefix "bootstrap" stdenv.name)
+, systemd
+
 # procps is mostly Linux-only. Most commands require a running Linux
 # system (or very similar like that found in Cygwin). The one
 # exception is ‘watch’ which is portable enough to run on pretty much
 # any UNIX-compatible system.
-, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }:
+, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
+}:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
@@ -16,7 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses ]
+    ++ lib.optional withSystemd systemd;
   nativeBuildInputs = [ pkgconfig ];
 
   makeFlags = [ "usrbin_execdir=$(out)/bin" ]
@@ -26,6 +37,7 @@ stdenv.mkDerivation rec {
 
   # Too red
   configureFlags = [ "--disable-modern-top" ]
+    ++ lib.optional withSystemd "--with-systemd"
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
     [ "ac_cv_func_malloc_0_nonnull=yes"
       "ac_cv_func_realloc_0_nonnull=yes" ];

From f06942327ab60c0a546c7236cb718fd909430066 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <matthew.bauer@obsidian.systems>
Date: Thu, 19 Jul 2018 17:20:57 -0400
Subject: [PATCH 0018/3253] patch-shebangs: respect cross compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This hopefully makes patchShebangs respect cross compilation. It
introduces the concept of the HOST_PATH. Nothing is ever executed on
it but instead used as a way to get the proper path using ‘command
-v’. Needs more testing.

/cc @ericson2314 @dtzwill

Fixes #33956
Fixes #21138
---
 .../setup-hooks/patch-shebangs.sh             | 53 +++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 1433d1e1f144..0c61813f743d 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -5,10 +5,32 @@
 # rewritten to /nix/store/<hash>/bin/python.  Interpreters that are
 # already in the store are left untouched.
 
-fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
+fixupOutputHooks+=(patchShebangsAuto)
+
+# Run patch shebangs on a directory.
+# patchShebangs [--build | --host] directory
+
+# Flags:
+# --build : Lookup commands available at build-time
+# --host  : Lookup commands available at runtime
+
+# Example use cases,
+# $ patchShebangs --host /nix/store/...-hello-1.0/bin
+# $ patchShebangs --build configure
 
 patchShebangs() {
+    local pathName
+
+    if [ "$1" = "--host" ]; then
+        pathName=HOST_PATH
+        shift
+    elif [ "$1" = "--build" ]; then
+        pathName=PATH
+        shift
+    fi
+
     local dir="$1"
+
     header "patching script interpreter paths in $dir"
     local f
     local oldPath
@@ -27,6 +49,14 @@ patchShebangs() {
         oldInterpreterLine=$(head -1 "$f" | tail -c+3)
         read -r oldPath arg0 args <<< "$oldInterpreterLine"
 
+        if [ -z "$pathName" ]; then
+            if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then
+                pathName=HOST_PATH
+            else
+                pathName=PATH
+            fi
+        fi
+
         if $(echo "$oldPath" | grep -q "/bin/env$"); then
             # Check for unsupported 'env' functionality:
             # - options: something starting with a '-'
@@ -35,14 +65,17 @@ patchShebangs() {
                 echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
                 exit 1
             fi
-            newPath="$(command -v "$arg0" || true)"
+
+            newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"
         else
             if [ "$oldPath" = "" ]; then
                 # If no interpreter is specified linux will use /bin/sh. Set
                 # oldpath="/bin/sh" so that we get /nix/store/.../sh.
                 oldPath="/bin/sh"
             fi
-            newPath="$(command -v "$(basename "$oldPath")" || true)"
+
+            newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"
+
             args="$arg0 $args"
         fi
 
@@ -65,3 +98,17 @@ patchShebangs() {
 
     stopNest
 }
+
+patchShebangsAuto () {
+    if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
+
+        # Dev output will end up being run on the build platform. An
+        # example case of this is sdl2-config. Otherwise, we can just
+        # use the runtime path (--host).
+        if [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
+            patchShebangs --build "$prefix"
+        else
+            patchShebangs --host "$prefix"
+        fi
+    fi
+}

From 4abb8be7abec422bb221816931148d9465e380f3 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Fri, 3 Aug 2018 12:55:29 -0700
Subject: [PATCH 0019/3253] haskell-modules: add callCabal2nixWithOptions.

Fixes #44377.
---
 .../haskell-modules/make-package-set.nix      | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 95dac230cc55..928c002c3af0 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -170,19 +170,22 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
 
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
-    callCabal2nix = name: src: args: let
-      filter = path: type:
-                 pkgs.lib.hasSuffix "${name}.cabal" path ||
-                 baseNameOf path == "package.yaml";
-      expr = self.haskellSrc2nix {
-        inherit name;
-        src = if pkgs.lib.canCleanSource src
-                then pkgs.lib.cleanSourceWith { inherit src filter; }
-              else src;
-      };
-    in overrideCabal (callPackageKeepDeriver expr args) (orig: {
-         inherit src;
-       });
+    callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
+      let
+        filter = path: type:
+                   pkgs.lib.hasSuffix "${name}.cabal" path ||
+                   baseNameOf path == "package.yaml";
+        expr = self.haskellSrc2nix {
+          inherit name extraCabal2nixOptions;
+          src = if pkgs.lib.canCleanSource src
+                  then pkgs.lib.cleanSourceWith { inherit src filter; }
+                else src;
+        };
+      in overrideCabal (callPackageKeepDeriver expr args) (orig: {
+           inherit src;
+         });
+
+    callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
 
     # : { root : Path
     #   , source-overrides : Defaulted (Either Path VersionNumber)

From ae7cc3eb5c5edacb586fa613a2e98fc4b94aff3a Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 5 Aug 2018 13:05:23 +0200
Subject: [PATCH 0020/3253] soulseekqt : refactoring appimage manipulation to
 be more generic.

---
 .../networking/p2p/soulseekqt/default.nix     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 44e434aa8ee9..e67d768f3ded 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -5,7 +5,7 @@
 , qtbase, qtmultimedia
 , libjson, libgpgerror
 , libX11, libxcb, libXau, libXdmcp, freetype, libbsd
-, pythonPackages, squashfsTools, makeDesktopItem
+, pythonPackages, squashfsTools, desktop_file_utils
 }:
 
 with stdenv.lib;
@@ -23,16 +23,6 @@ let
     };
   };
 
-  desktopItem = makeDesktopItem {
-    name = "SoulseekQt";
-    exec = "soulseekqt";
-    icon = "$out/share/soulseekqt/";
-    comment = "Official Qt SoulSeek client"; 
-    desktopName = "SoulseekQt";
-    genericName = "SoulseekQt";
-    categories = "Network;";
-  };
-
 in stdenv.mkDerivation rec {
 
   name = "soulseekqt-${version}";
@@ -41,26 +31,36 @@ in stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  buildInputs = [ pythonPackages.binwalk squashfsTools ];
+  buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ];
 
-  # avoid usage of appimagetool
+  # avoid usage of appimage's runner option --appimage-extract 
   unpackCmd = ''
     export HOME=$(pwd) # workaround for binwalk
-    tar xvf $curSrc && binwalk --quiet \
-       ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e'
+    appimage=$(tar xvf $curSrc) && binwalk --quiet \
+       $appimage -D 'squashfs:squashfs:unsquashfs %e'
     '';
+  
+  patchPhase = ''
+    cd squashfs-root/
+    binary="$(readlink AppRun)"
+  
+    # fixup desktop file
+    desktop-file-edit --set-key Exec --set-value $binary default.desktop
+    desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop
+    desktop-file-edit --set-key Categories --set-value Network default.desktop   
+  '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share/soulseekqt}
-    cd squashfs-root/
-    cp -R soulseek.png translations $out/share/soulseekqt
-    cp SoulseekQt $out/bin/soulseekqt
+    mkdir -p $out/{bin,share/applications,share/icons/}
+    cp default.desktop $out/share/applications/$binary.desktop
+    cp soulseek.png $out/share/icons/
+    cp $binary $out/bin/
   '';
 
   fixupPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
              --set-rpath ${libPath} \
-             $out/bin/soulseekqt
+             $out/bin/$binary
   '';
 
   meta = with stdenv.lib; {

From cb1e30f84bc1814c693a2e224022a5b528192cae Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 7 Apr 2018 13:09:39 +0300
Subject: [PATCH 0021/3253] heimdal: refactor lib-prefixed packages to
 multi-output

---
 .../libraries/kerberos/heimdal.nix            | 65 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 24adb2a141e8..134ca4f05b0a 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -2,16 +2,11 @@
 , texinfo, perlPackages
 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam
 , CoreFoundation, Security, SystemConfiguration
-# Extra Args
-, type ? ""
 }:
 
-let
-  libOnly = type == "lib";
-in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "${type}heimdal-${version}";
+  name = "heimdal-${version}";
   version = "7.5.0";
 
   src = fetchFromGitHub {
@@ -21,15 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
   };
 
+  outputs = [ "out" "bin" "dev" "man" ];
+
   patches = [ ./heimdal-make-missing-headers.patch ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
-    ++ (with perlPackages; [ JSON ])
-    ++ optional (!libOnly) texinfo;
+  nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
+    ++ (with perlPackages; [ JSON ]);
   buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
-    ++ [ db sqlite openssl libedit ]
-    ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
-    ++ optionals (!libOnly) [ openldap pam ];
+    ++ [ db sqlite openssl libedit openldap pam]
+    ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
 
   ## ugly, X should be made an option
   configureFlags = [
@@ -37,12 +32,14 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
     "--enable-hdb-openldap-module"
     "--with-sqlite3=${sqlite.dev}"
-    "--with-libedit=${libedit}"
+
+  # ugly, --with-libedit is not enought, it fall back to bundled libedit
+    "--with-libedit-include=${libedit.dev}/include"
+    "--with-libedit-lib=${libedit}/lib"
     "--with-openssl=${openssl.dev}"
     "--without-x"
     "--with-berkeley-db"
     "--with-berkeley-db-include=${db.dev}/include"
-  ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap.dev}"
   ] ++ optionals (stdenv.isLinux) [
     "--with-capng"
@@ -50,24 +47,17 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
+    sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac 
   '';
 
-  buildPhase = optionalString libOnly ''
-    (cd include; make -j $NIX_BUILD_CORES)
-    (cd lib; make -j $NIX_BUILD_CORES)
-    (cd tools; make -j $NIX_BUILD_CORES)
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
-  '';
-
-  installPhase = optionalString libOnly ''
-    (cd include; make -j $NIX_BUILD_CORES install)
-    (cd lib; make -j $NIX_BUILD_CORES install)
-    (cd tools; make -j $NIX_BUILD_CORES install)
-    (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
-    (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
-    rm -rf $out/{libexec,sbin,share}
-    find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+  preConfigure = ''
+    configureFlagsArray+=(
+      "--bindir=$out/bin" # Put binaries to $out, then move them to $bin,
+                          # otherwise we go a cyclic dependecny
+      "--sbindir=$out/sbin"
+      "--mandir=$man/share/man"
+      "--infodir=$man/share/info"
+      "--includedir=$dev/include")
   '';
 
   # We need to build hcrypt for applications like samba
@@ -76,14 +66,27 @@ stdenv.mkDerivation rec {
     (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
+  # FIXME: share/info hits $bin, IDK why, but I decide is to minor to block
   postInstall = ''
     # Install hcrypto
     (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
     (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
 
+    # Do we need it?
+    rm $out/bin/su
+
     # Doesn't succeed with --libexec=$out/sbin, so
-    mv "$out/libexec/"* $out/sbin/
+    mkdir -p $dev/bin
+    mkdir -p $bin/{,s}bin
+    mv "$out/libexec/heimdal/"* $dev/bin/
+    rmdir $out/libexec/heimdal
+    mv "$out/libexec/"* $bin/sbin/
     rmdir $out/libexec
+
+    mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/
+
+    # Move remaining binaries to $bin
+    mv $out/bin/* $bin/bin/
   '';
 
   # Issues with hydra
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cd0eb706aea..6e4faf9fa32c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9700,10 +9700,14 @@ with pkgs;
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
+  # TODO : Let admin choose.
+  # We are using mit-krb5 because it is better maintained
+  kerberos = libkrb5;
+
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
   };
-  libheimdal = heimdal.override { type = "lib"; };
+  libheimdal = heimdal;
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = harfbuzz.override {

From 4622b765ac9de49526dec7d986243a755b103882 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 5 Jun 2018 19:07:22 +0300
Subject: [PATCH 0022/3253] kerberos: heimdal alias moved to aliases.nix

---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4faf9fa32c..9901c7b33e44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9700,10 +9700,6 @@ with pkgs;
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Let admin choose.
-  # We are using mit-krb5 because it is better maintained
-  kerberos = libkrb5;
-
   heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
   };

From 0a72127d57472069b12b080cd89d79917ac54bfe Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 21 Jun 2018 07:39:53 +0300
Subject: [PATCH 0023/3253] heimdal: move "info" to own output

---
 pkgs/development/libraries/kerberos/heimdal.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 134ca4f05b0a..11f0ffdad16c 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
   };
 
-  outputs = [ "out" "bin" "dev" "man" ];
+  outputs = [ "out" "bin" "dev" "man" "info" ];
 
   patches = [ ./heimdal-make-missing-headers.patch ];
 
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
+    "--infodir=$info/share/info"
     "--enable-hdb-openldap-module"
     "--with-sqlite3=${sqlite.dev}"
 
@@ -66,7 +67,6 @@ stdenv.mkDerivation rec {
     (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
   '';
 
-  # FIXME: share/info hits $bin, IDK why, but I decide is to minor to block
   postInstall = ''
     # Install hcrypto
     (cd include/hcrypto; make -j $NIX_BUILD_CORES install)

From 5a59d5e13143129e3e4f6f801874286781efac60 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 12 Jul 2018 20:01:08 +0300
Subject: [PATCH 0024/3253] heimdal: simplify build, keep bin/ in $out

---
 .../libraries/kerberos/heimdal.nix            | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 11f0ffdad16c..5b92458d89e9 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
   };
 
-  outputs = [ "out" "bin" "dev" "man" "info" ];
+  outputs = [ "out" "dev" "man" "info" ];
 
   patches = [ ./heimdal-make-missing-headers.patch ];
 
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     configureFlagsArray+=(
-      "--bindir=$out/bin" # Put binaries to $out, then move them to $bin,
-                          # otherwise we go a cyclic dependecny
+      "--bindir=$out/bin"
       "--sbindir=$out/sbin"
+      "--libexecdir=$out/libexec/heimdal"
       "--mandir=$man/share/man"
       "--infodir=$man/share/info"
       "--includedir=$dev/include")
@@ -75,18 +75,12 @@ stdenv.mkDerivation rec {
     # Do we need it?
     rm $out/bin/su
 
-    # Doesn't succeed with --libexec=$out/sbin, so
     mkdir -p $dev/bin
-    mkdir -p $bin/{,s}bin
-    mv "$out/libexec/heimdal/"* $dev/bin/
-    rmdir $out/libexec/heimdal
-    mv "$out/libexec/"* $bin/sbin/
-    rmdir $out/libexec
+    mv $out/bin/krb5-config $dev/bin/
 
-    mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/
-
-    # Move remaining binaries to $bin
-    mv $out/bin/* $bin/bin/
+    # asn1 compilers, move them to $dev
+    mv $out/libexec/heimdal/heimdal/* $dev/bin
+    rmdir $out/libexec/heimdal/heimdal
   '';
 
   # Issues with hydra

From e808b7da20c6123bfedc8b5b19ac7386a39b82ab Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 8 Aug 2018 13:35:03 +0300
Subject: [PATCH 0025/3253] heimdal: adjust daemon paths, they are in libexec
 now

---
 nixos/modules/services/system/kerberos.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index d151385d2f9b..e2c45ed64ac0 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -42,7 +42,7 @@ in
         protocol = "tcp";
         user = "root";
         server = "${pkgs.tcp_wrappers}/bin/tcpd";
-        serverArgs = "${pkgs.heimdalFull}/bin/kadmind";
+        serverArgs = "${pkgs.heimdalFull}/libexec/heimdal/kadmind";
       };
 
     systemd.services.kdc = {
@@ -51,13 +51,13 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
       '';
-      script = "${heimdalFull}/bin/kdc";
+      script = "${heimdalFull}/libexec/heimdal/kdc";
     };
 
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${heimdalFull}/bin/kpasswdd";
+      script = "${heimdalFull}/libexec/heimdal/kpasswdd";
     };
   };
 

From 7e192a55e7f1da45830bda0911128cad5e3f7804 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:23:27 -0400
Subject: [PATCH 0026/3253] pythonPackages.pytest-timeout: refactor add python
 2.7 compatibiliy

In version 1.3.1 of `pytest-timeout` (latest) the setup.py file is not
compatible with python 2.7 and 3+ due to how `open` is called. A patch
has been added that can be removed once a fix and new relase is given.
---
 .../python-modules/pytest-timeout/default.nix       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 012226de0532..45e9a4b9e477 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -1,5 +1,6 @@
 { buildPythonPackage
 , fetchPypi
+, fetchpatch
 , lib
 , pexpect
 , pytest
@@ -9,10 +10,20 @@ buildPythonPackage rec {
   pname = "pytest-timeout";
   version = "1.3.1";
 
+  # remove after version 1.3.1
+  patches = [
+    (fetchpatch {
+      name = "fix-installation-27-3-with-encoding-issue.patch";
+      url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/9de81d3fc57a71a36d418d4aa181c241a7c5350f/raw";
+      sha256 = "0g081j6iyc9825f63ssmmi40rkcgk4p9vvhy9g0lqd0gc6xzwa2p";
+    })
+  ];
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "4b261bec5782b603c98b4bb803484bc96bf1cdcb5480dae0999d21c7e0423a23";
   };
+
   buildInputs = [ pytest ];
   checkInputs = [ pytest pexpect ];
   checkPhase = ''pytest -ra'';
@@ -21,6 +32,6 @@ buildPythonPackage rec {
     description = "py.test plugin to abort hanging tests";
     homepage = https://bitbucket.org/pytest-dev/pytest-timeout/;
     license = licenses.mit;
-    maintainers = with maintainers; [ makefu ];
+    maintainers = with maintainers; [ makefu costrouc ];
   };
 }

From c79d054a4c579555a3c70b523c4efa02b6137c71 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 17 Apr 2018 20:37:01 +0100
Subject: [PATCH 0027/3253] libharu: Build on darwin

---
 pkgs/development/libraries/libharu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 5d120f61e086..0830b45b308b 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     homepage = http://libharu.org/;
     license = stdenv.lib.licenses.zlib;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 9c34d1069f4c6664a259a66c1815d473c1b8d4de Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 17 Apr 2018 20:37:29 +0100
Subject: [PATCH 0028/3253] libiodbc: Build on darwin

---
 pkgs/development/libraries/libiodbc/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 738c11161955..45649f944f51 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }:
+{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }:
 
 stdenv.mkDerivation rec {
   name = "libiodbc-3.52.12";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = stdenv.lib.optionals useGTK [ gtk2 ];
+  buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
+                ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
   preBuild =
     ''
@@ -19,6 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "iODBC driver manager";
     homepage = http://www.iodbc.org;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26fef8cb1d7d..bcb3acac0acd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10373,6 +10373,7 @@ with pkgs;
 
   libiodbc = callPackage ../development/libraries/libiodbc {
     useGTK = config.libiodbc.gtk or false;
+    inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
   libivykis = callPackage ../development/libraries/libivykis { };

From 2891beb31c5d3c8d055804ae4f41b07fbb366244 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 17 Apr 2018 20:39:10 +0100
Subject: [PATCH 0029/3253] vigra: Build on darwin

---
 pkgs/development/libraries/vigra/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 14211ea65e9a..27f66ff68812 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -15,6 +15,12 @@ in stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
+  # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
+  patches =
+    let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
+                                sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
+    in [ clangPatch ];
+
   buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
                   libtiff numpy openexr python ];
 
@@ -31,6 +37,6 @@ in stdenv.mkDerivation rec {
     homepage = https://hci.iwr.uni-heidelberg.de/vigra;
     license = licenses.mit;
     maintainers = [ maintainers.viric ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From cce0fc8fe5c5991b2fc36455b4b0353fff6cc2cf Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 17 Apr 2018 20:36:47 +0100
Subject: [PATCH 0030/3253] saga: Build on darwin

There are some unresolved dependency issues which means a lot of
additional dependencies have to be added explicitly on darwin but not on
linux. Maybe something to do with libtool.

See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
---
 pkgs/applications/gis/saga/default.nix | 17 +++++++++++------
 pkgs/top-level/all-packages.nix        |  4 ++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index a0f2e007555e..02f2de64811a 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,10 +1,15 @@
 { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
-  libharu, opencv, vigra, postgresql }:
+  libharu, opencv, vigra, postgresql, Cocoa,
+  unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "saga-6.3.0";
 
-  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
+  # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
+  # for why the have additional buildInputs on darwin
+  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]
+                ++ stdenv.lib.optionals stdenv.isDarwin
+                  [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
 
   enableParallelBuilding = true;
 
@@ -13,11 +18,11 @@ stdenv.mkDerivation rec {
     sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "System for Automated Geoscientific Analyses";
     homepage = http://www.saga-gis.org;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.michelk ];
-    platforms = ["x86_64-linux" ];
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.michelk ];
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcb3acac0acd..7e124de83a48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19878,6 +19878,10 @@ with pkgs;
 
   saga = callPackage ../applications/gis/saga { };
 
+  saga = callPackage ../applications/gis/saga {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
+
   samplv1 = callPackage ../applications/audio/samplv1 { };
 
   sauerbraten = callPackage ../games/sauerbraten {};

From 7262b88b0a9033e3b000ac6b80582551245a6fa7 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Tue, 17 Apr 2018 20:39:50 +0100
Subject: [PATCH 0031/3253] saga_2_3_2: Init at 2.3.2

This is the lts branch of SAGA which is currently used by QGIS 2.18.x
series.
---
 pkgs/applications/gis/saga/clang_patch.patch | 19 +++++++++++
 pkgs/applications/gis/saga/lts.nix           | 33 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +++
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/gis/saga/clang_patch.patch
 create mode 100644 pkgs/applications/gis/saga/lts.nix

diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch
new file mode 100644
index 000000000000..e6af8d130514
--- /dev/null
+++ b/pkgs/applications/gis/saga/clang_patch.patch
@@ -0,0 +1,19 @@
+commit e92b250968e9656084ab5984689747ca615ff6e7
+Author: Volker Wichmann <wichmann@laserdata.at>
+Date:   Sun Mar 5 13:49:53 2017 +0100
+
+    saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly
+
+diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp
+index 76a1d8d..fa1a66f 100644
+--- a/src/saga_core/saga_api/table.cpp
++++ b/src/saga_core/saga_api/table.cpp
+@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord)
+ //---------------------------------------------------------
+ bool CSG_Table::Del_Records(void)
+ {
+-	if( m_Records > 0 )
++	if( m_nRecords > 0 )
+ 	{
+ 		_Index_Destroy();
+
diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix
new file mode 100644
index 000000000000..a0e9d64ac8e8
--- /dev/null
+++ b/pkgs/applications/gis/saga/lts.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
+  libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa
+  , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "saga-2.3.2";
+
+  # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
+  # for why the have additional buildInputs on darwin
+  buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra
+                  postgresql libiodbc lzma jasper
+                  Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
+
+  enableParallelBuilding = true;
+
+  sourceRoot = "code-b6f474f/saga-gis";
+
+  patches = [ ./clang_patch.patch ];
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/saga-gis/code.git";
+    rev = "b6f474f8af4af7f0ff82548cc6f88c53547d91f5";
+    sha256 = "0iakynai8mhcwj6wxvafkqhd7b417ss7hyhbcp9wf6092l6vc2zd";
+  };
+
+  meta = with stdenv.lib; {
+    description = "System for Automated Geoscientific Analyses";
+    homepage = http://www.saga-gis.org;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.mpickering ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e124de83a48..56088c77e847 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19882,6 +19882,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  saga_2_3_2 = callPackage ../applications/gis/saga/lts.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
+
   samplv1 = callPackage ../applications/audio/samplv1 { };
 
   sauerbraten = callPackage ../games/sauerbraten {};

From f5b097b34606cee52021f28f7b86abff4b31a694 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 18 Apr 2018 21:23:13 +0100
Subject: [PATCH 0032/3253] Build QGIS with SAGA plugins

---
 pkgs/applications/gis/qgis/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix        | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 8f06a659f60c..d76557b0a412 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
 , qjson, qca2, txt2tags, openssl, darwin, pkgconfig
-, withGrass ? true, grass, IOKit, ApplicationServices
+, withGrass ? true, grass, saga, IOKit, ApplicationServices
 }:
 
 stdenv.mkDerivation rec {
   name = "qgis-2.18.22";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
-    fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ]
+    fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig
+    saga ]
   ++
     (stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices])
   ++
@@ -60,6 +61,8 @@ stdenv.mkDerivation rec {
       # Necessary for QGIS to find the correct default GRASS path
       # Plugins look for gdal tools like deminfo on the PATH
       ${stdenv.lib.optionalString withGrass "ln -sf ${grass} $out/QGIS.app/Contents/MacOS/grass"}
+      # Necessary for QGIS to find the right SAGA installation
+      ln -sf ${saga}/bin/saga_cmd $out/QGIS.app/Contents/MacOS/bin/saga_cmd
       for file in $(find $out -type f -name "QGIS"); do
         wrapProgram "$file" \
           --prefix DYLD_LIBRARY_PATH : "${qwt}/lib" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56088c77e847..10ce58081ba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17950,6 +17950,7 @@ with pkgs;
 
   qgis = callPackage ../applications/gis/qgis {
     inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
+    saga = saga_2_3_2;
   };
 
   qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { };

From 115027abe153ceb7872be82f13959a9e5136d2f2 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 11 Aug 2018 17:18:58 +0000
Subject: [PATCH 0033/3253] Fix linux build

---
 pkgs/applications/gis/saga/lts.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix
index a0e9d64ac8e8..ed2fb1a65ada 100644
--- a/pkgs/applications/gis/saga/lts.nix
+++ b/pkgs/applications/gis/saga/lts.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   # for why the have additional buildInputs on darwin
   buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra
                   postgresql libiodbc lzma jasper
-                  Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
+                  unixODBC poppler hdf4.out hdf5 netcdf sqlite ]
+                ++ stdenv.lib.optional stdenv.isDarwin Cocoa ;
 
   enableParallelBuilding = true;
 

From bcab40610be6e1b31c14c95fe7b195f43536459f Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 11 Aug 2018 23:08:17 +0100
Subject: [PATCH 0034/3253] Remove duplicated attribute

---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10ce58081ba3..a2da185795cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19877,8 +19877,6 @@ with pkgs;
 
   rrootage = callPackage ../games/rrootage { };
 
-  saga = callPackage ../applications/gis/saga { };
-
   saga = callPackage ../applications/gis/saga {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };

From 5caa3fcae9a757d67d97caa0ada7732d79f6642e Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 12 Aug 2018 10:36:43 +0100
Subject: [PATCH 0035/3253] Small fixes

---
 pkgs/applications/gis/saga/default.nix           | 4 ++--
 pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 02f2de64811a..b1ad81a6a3ff 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
   libharu, opencv, vigra, postgresql, Cocoa,
-  unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }:
+  unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull }:
 
 stdenv.mkDerivation rec {
   name = "saga-6.3.0";
 
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
-  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ]
+  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper qhull ]
                 ++ stdenv.lib.optionals stdenv.isDarwin
                   [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
 
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index dd9264514d4a..df3de11e738d 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://projects.gnome.org/gconf/;
     description = "Deprecated system for storing application preferences";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 8a4661588af073fe6a3f8e90f66fdd2c11b99153 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 12 Aug 2018 22:13:00 +0100
Subject: [PATCH 0036/3253] Fixes for rebase

---
 pkgs/applications/gis/saga/finite.patch | 13 +++++++++++++
 pkgs/applications/gis/saga/lts.nix      | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/gis/saga/finite.patch

diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch
new file mode 100644
index 000000000000..7f60743534bd
--- /dev/null
+++ b/pkgs/applications/gis/saga/finite.patch
@@ -0,0 +1,13 @@
+diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
+index c5da854..d3e9cff 100755
+--- a/src/modules/imagery/imagery_maxent/me.cpp
++++ b/src/modules/imagery/imagery_maxent/me.cpp
+@@ -21,7 +21,7 @@
+ #ifdef _SAGA_MSW
+ #define isinf(x) (!_finite(x))
+ #else
+-#define isinf(x) (!finite(x))
++#define isinf(x) (!isfinite(x))
+ #endif
+
+ /** The input array contains a set of log probabilities lp1, lp2, lp3
diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix
index ed2fb1a65ada..e69d52701be7 100644
--- a/pkgs/applications/gis/saga/lts.nix
+++ b/pkgs/applications/gis/saga/lts.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
   libharu, opencv, vigra, postgresql, autoreconfHook, Cocoa
-  , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }:
+  , unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
 
 stdenv.mkDerivation rec {
   name = "saga-2.3.2";
@@ -9,14 +9,18 @@ stdenv.mkDerivation rec {
   # for why the have additional buildInputs on darwin
   buildInputs = [ autoreconfHook gdal wxGTK30 proj libharu opencv vigra
                   postgresql libiodbc lzma jasper
-                  unixODBC poppler hdf4.out hdf5 netcdf sqlite ]
+                  unixODBC poppler hdf4.out hdf5 netcdf sqlite qhull giflib ]
                 ++ stdenv.lib.optional stdenv.isDarwin Cocoa ;
 
   enableParallelBuilding = true;
 
+  GDAL_CFLAGS = "-std=c++11";
+
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+
   sourceRoot = "code-b6f474f/saga-gis";
 
-  patches = [ ./clang_patch.patch ];
+  patches = [ ./clang_patch.patch ./finite.patch];
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/saga-gis/code.git";

From 32cc3eb899e348a3178840e61280c6c328f78f10 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 12 Aug 2018 02:28:51 +0900
Subject: [PATCH 0037/3253] cmake: 3.11.2 -> 3.12.1

---
 .../cmake/application-services-3.12.patch         | 15 +++++++++++++++
 .../tools/build-managers/cmake/default.nix        |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/application-services-3.12.patch

diff --git a/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch b/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch
new file mode 100644
index 000000000000..c83f56ae5720
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch
@@ -0,0 +1,15 @@
+diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx
+--- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx	2018-08-09 21:14:08.000000000 +0900
++++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx	2018-08-12 02:47:28.719691934 +0900
+@@ -35,11 +35,6 @@
+ 
+ struct cmLinkImplementation;
+ 
+-#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__)
+-#  define HAVE_APPLICATION_SERVICES
+-#  include <ApplicationServices/ApplicationServices.h>
+-#endif
+-
+ #if defined(CMAKE_BUILD_WITH_CMAKE)
+ #  include "cmXMLParser.h"
+ 
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index ed0928febe29..9836aec1bff3 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig
 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
-, majorVersion ? "3.11"
+, majorVersion ? "3.12"
 # darwin attributes
 , ps
 , isBootstrap ? false
@@ -17,6 +17,10 @@ with stdenv.lib;
 
 with (
   {
+    "3.12" = {
+      minorVersion = "1";
+      sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
+    };
     "3.11" = {
       minorVersion = "2";
       sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y";
@@ -64,6 +68,7 @@ stdenv.mkDerivation rec {
     })
     # Don't depend on frameworks.
     ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch  # TODO: remove conditional
+    ++ optional (useSharedLibraries && majorVersion == "3.12") ./application-services-3.12.patch
     ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];

From e8144a30bb9dc5477cbc07bae01ccefbaa8398bb Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 13 Aug 2018 08:51:01 +0900
Subject: [PATCH 0038/3253] cmake: remove additional versions

---
 .../cmake/application-services-3.12.patch     | 15 ----
 .../cmake/application-services.patch          | 13 ++-
 .../tools/build-managers/cmake/default.nix    | 45 +++-------
 .../cmake/search-path-3.9.patch               | 62 -------------
 .../build-managers/cmake/search-path.patch    | 86 ++++++-------------
 5 files changed, 44 insertions(+), 177 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cmake/application-services-3.12.patch
 delete mode 100644 pkgs/development/tools/build-managers/cmake/search-path-3.9.patch

diff --git a/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch b/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch
deleted file mode 100644
index c83f56ae5720..000000000000
--- a/pkgs/development/tools/build-managers/cmake/application-services-3.12.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx
---- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx	2018-08-09 21:14:08.000000000 +0900
-+++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx	2018-08-12 02:47:28.719691934 +0900
-@@ -35,11 +35,6 @@
- 
- struct cmLinkImplementation;
- 
--#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__)
--#  define HAVE_APPLICATION_SERVICES
--#  include <ApplicationServices/ApplicationServices.h>
--#endif
--
- #if defined(CMAKE_BUILD_WITH_CMAKE)
- #  include "cmXMLParser.h"
- 
diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch
index 0ef710fa0195..c83f56ae5720 100644
--- a/pkgs/development/tools/build-managers/cmake/application-services.patch
+++ b/pkgs/development/tools/build-managers/cmake/application-services.patch
@@ -1,16 +1,15 @@
-diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
-index 2008a0b..5a3e8ee 100644
---- a/Source/cmGlobalXCodeGenerator.cxx
-+++ b/Source/cmGlobalXCodeGenerator.cxx
+diff -ur cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx
+--- cmake-3.12.1/Source/cmGlobalXCodeGenerator.cxx	2018-08-09 21:14:08.000000000 +0900
++++ cmake-3.12.1-patched/Source/cmGlobalXCodeGenerator.cxx	2018-08-12 02:47:28.719691934 +0900
 @@ -35,11 +35,6 @@
  
  struct cmLinkImplementation;
  
 -#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__)
--#define HAVE_APPLICATION_SERVICES
--#include <ApplicationServices/ApplicationServices.h>
+-#  define HAVE_APPLICATION_SERVICES
+-#  include <ApplicationServices/ApplicationServices.h>
 -#endif
 -
  #if defined(CMAKE_BUILD_WITH_CMAKE)
- #include "cmXMLParser.h"
+ #  include "cmXMLParser.h"
  
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9836aec1bff3..0070160bb58e 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig
 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
-, majorVersion ? "3.12"
 # darwin attributes
 , ps
 , isBootstrap ? false
@@ -15,31 +14,12 @@ assert useQt4 -> withQt5 == false;
 
 with stdenv.lib;
 
-with (
-  {
-    "3.12" = {
-      minorVersion = "1";
-      sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
-    };
-    "3.11" = {
-      minorVersion = "2";
-      sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y";
-    };
-    "3.10" = {
-      minorVersion = "2";
-      sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b";
-    };
-    "3.9" = {
-      minorVersion = "6";
-      sha256 = "7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218";
-    };
-
-  }.${majorVersion}
-    or (abort ''Unsupported configuration for cmake: majorVersion = "${majorVersion}";'')
-);
-
 let
   os = stdenv.lib.optionalString;
+  majorVersion = "3.12";
+  minorVersion = "1";
+  # from https://cmake.org/files/v3.12/cmake-3.12.1-SHA-256.txt
+  sha256 = "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -50,7 +30,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    # from https://cmake.org/files/v3.10/cmake-3.10.2-SHA-256.txt
     inherit sha256;
   };
 
@@ -59,17 +38,13 @@ stdenv.mkDerivation rec {
       --replace '"-framework CoreServices"' '""'
   '';
 
-  # Don't search in non-Nix locations such as /usr, but do search in our libc.
-  patches = [ ./search-path-3.9.patch ]
-    ++ optional (versionOlder version "3.12") (fetchpatch {
-      name = "cmake-3.11-libuv-1.21.patch";
-      url = https://gitlab.kitware.com/cmake/cmake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6.patch;
-      sha256 = "0683zbyb3bicaxqzrj4wgdan6x08k30m20kkmpjvw30nr6a8r6xq";
-    })
+  patches = [
+    # Don't search in non-Nix locations such as /usr, but do search in our libc.
+    ./search-path.patch
+
     # Don't depend on frameworks.
-    ++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch  # TODO: remove conditional
-    ++ optional (useSharedLibraries && majorVersion == "3.12") ./application-services-3.12.patch
-    ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
+    ./application-services.patch
+  ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];
   setOutputFlags = false;
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch
deleted file mode 100644
index 6213138402b1..000000000000
--- a/pkgs/development/tools/build-managers/cmake/search-path-3.9.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake
---- cmake-3.9.1/Modules/Platform/UnixPaths.cmake	2017-08-10 13:36:32.000000000 +0000
-+++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake	2017-09-03 01:24:31.901473539 +0000
-@@ -22,9 +22,6 @@
- # List common installation prefixes.  These will be used for all
- # search types.
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
--  # Standard
--  /usr/local /usr /
--
-   # CMake install location
-   "${_CMAKE_INSTALL_DIR}"
-   )
-@@ -43,31 +40,26 @@
- 
- # Non "standard" but common install prefixes
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
--  /usr/X11R6
--  /usr/pkg
--  /opt
-   )
- 
- # List common include file locations not under the common prefixes.
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # X11
--  /usr/include/X11
-+  @libc_dev@/include
-   )
- 
- list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # X11
--  /usr/lib/X11
-+  @libc_lib@/lib
-   )
- 
- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  @libc_lib@/lib
-   )
- 
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @libc_dev@/include
-   )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @libc_dev@/include
-   )
- 
- # Enable use of lib32 and lib64 search path variants by default.
-diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake
---- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake	2017-08-10 13:36:32.000000000 +0000
-+++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake	2017-09-03 01:19:32.808355986 +0000
-@@ -66,7 +66,7 @@
- 
- if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-   # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
--  list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
-+  # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
- endif()
- 
- list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch
index 9fc949661686..6213138402b1 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path.patch
@@ -1,35 +1,7 @@
-diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake
---- cmake-2.8.12.2/Modules/Platform/Linux.cmake	2014-01-16 21:15:08.000000000 +0400
-+++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake	2016-04-13 22:00:32.928575740 +0300
-@@ -36,22 +36,11 @@
-   # checking the platform every time.  This option is advanced enough
-   # that only package maintainers should need to adjust it.  They are
-   # capable of providing a setting on the command line.
--  if(EXISTS "/etc/debian_version")
--    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  else()
--    set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
--      "Install .so files without execute permission.")
--  endif()
-+  set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
-+    "Install .so files without execute permission.")
- endif()
- 
- # Match multiarch library directory names.
- set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
- 
- include(Platform/UnixPaths)
--
--# Debian has lib64 paths only for compatibility so they should not be
--# searched.
--if(EXISTS "/etc/debian_version")
--  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
--endif()
-diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake
---- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake	2014-01-16 21:15:08.000000000 +0400
-+++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake	2016-04-14 00:09:10.106362636 +0300
-@@ -32,9 +32,6 @@
+diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake
+--- cmake-3.9.1/Modules/Platform/UnixPaths.cmake	2017-08-10 13:36:32.000000000 +0000
++++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake	2017-09-03 01:24:31.901473539 +0000
+@@ -22,9 +22,6 @@
  # List common installation prefixes.  These will be used for all
  # search types.
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@@ -38,45 +10,31 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod
 -
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
+   )
+@@ -43,31 +40,26 @@
  
-@@ -44,44 +41,26 @@
+ # Non "standard" but common install prefixes
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  /usr/X11R6
+-  /usr/pkg
+-  /opt
+   )
  
  # List common include file locations not under the common prefixes.
  list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
--  # Windows API on Cygwin
--  /usr/include/w32api
--
 -  # X11
--  /usr/X11R6/include /usr/include/X11
--
--  # Other
--  /usr/pkg/include
--  /opt/csw/include /opt/include
--  /usr/openwin/include
+-  /usr/include/X11
 +  @libc_dev@/include
    )
  
  list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
--  # Windows API on Cygwin
--  /usr/lib/w32api
--
 -  # X11
--  /usr/X11R6/lib /usr/lib/X11
--
--  # Other
--  /usr/pkg/lib
--  /opt/csw/lib /opt/lib
--  /usr/openwin/lib
+-  /usr/lib/X11
 +  @libc_lib@/lib
    )
  
- list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
--  /usr/pkg/bin
-+  @libc_bin@/bin
-   )
- 
  list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
--  /lib /usr/lib /usr/lib32 /usr/lib64
+-  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
 +  @libc_lib@/lib
    )
  
@@ -89,4 +47,16 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod
 +  @libc_dev@/include
    )
  
- # Enable use of lib64 search path variants by default.
+ # Enable use of lib32 and lib64 search path variants by default.
+diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake
+--- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake	2017-08-10 13:36:32.000000000 +0000
++++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake	2017-09-03 01:19:32.808355986 +0000
+@@ -66,7 +66,7 @@
+ 
+ if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+   # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
+-  list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
++  # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
+ endif()
+ 
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH

From 68ac282f8e8eff5f8e4bf51b09ebfbfbe5b76273 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 13 Aug 2018 10:16:02 +0900
Subject: [PATCH 0039/3253] cmake: patch internal libuv to remove dependency on
 macOS Frameworks

---
 .../tools/build-managers/cmake/default.nix    |  3 +
 .../cmake/libuv-application-services.patch    | 83 +++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/cmake/libuv-application-services.patch

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 0070160bb58e..ca81260ffdbc 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
 
     # Don't depend on frameworks.
     ./application-services.patch
+
+    # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
+    ./libuv-application-services.patch
   ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];
diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
new file mode 100644
index 000000000000..08899f5c241f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch
@@ -0,0 +1,83 @@
+diff -ur cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt cmake-3.12.1-patched/Utilities/cmlibuv/CMakeLists.txt
+--- cmake-3.12.1/Utilities/cmlibuv/CMakeLists.txt	2018-08-09 21:14:08.000000000 +0900
++++ cmake-3.12.1-patched/Utilities/cmlibuv/CMakeLists.txt	2018-08-13 10:14:53.000000000 +0900
+@@ -173,6 +173,22 @@
+     src/unix/kqueue.c
+     src/unix/proctitle.c
+     )
++
++  include(CheckIncludeFile)
++
++  check_include_file("ApplicationServices/ApplicationServices.h" HAVE_ApplicationServices)
++  if (HAVE_ApplicationServices)
++    list(APPEND uv_defines
++      HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H=1
++      )
++  endif()
++
++  check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices)
++  if (HAVE_CoreServices)
++    list(APPEND uv_defines
++      HAVE_CORESERVICES_CORESERVICES_H=1
++      )
++  endif()
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c
+--- cmake-3.12.1/Utilities/cmlibuv/src/unix/darwin-proctitle.c	2018-08-09 21:14:08.000000000 +0900
++++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/darwin-proctitle.c	2018-08-13 10:01:29.000000000 +0900
+@@ -26,9 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <TargetConditionals.h>
+-
+-#if !TARGET_OS_IPHONE
++#if HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+ # include <CoreFoundation/CoreFoundation.h>
+ # include <ApplicationServices/ApplicationServices.h>
+ #endif
+@@ -58,7 +56,7 @@
+ 
+ 
+ int uv__set_process_title(const char* title) {
+-#if TARGET_OS_IPHONE
++#if !HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+   return uv__pthread_setname_np(title);
+ #else
+   CFStringRef (*pCFStringCreateWithCString)(CFAllocatorRef,
+@@ -205,5 +203,5 @@
+     dlclose(application_services_handle);
+ 
+   return err;
+-#endif  /* !TARGET_OS_IPHONE */
++#endif  /* HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H */
+ }
+diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c
+--- cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c	2018-08-09 21:14:08.000000000 +0900
++++ cmake-3.12.1-patched/Utilities/cmlibuv/src/unix/fsevents.c	2018-08-13 10:01:29.000000000 +0900
+@@ -21,7 +21,7 @@
+ #include "uv.h"
+ #include "internal.h"
+ 
+-#if TARGET_OS_IPHONE
++#if !HAVE_CORESERVICES_CORESERVICES_H
+ 
+ /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */
+ 
+@@ -38,7 +38,7 @@
+ void uv__fsevents_loop_delete(uv_loop_t* loop) {
+ }
+ 
+-#else /* TARGET_OS_IPHONE */
++#else /* !HAVE_CORESERVICES_CORESERVICES_H */
+ 
+ #include <dlfcn.h>
+ #include <assert.h>
+@@ -916,4 +916,4 @@
+   return 0;
+ }
+ 
+-#endif /* TARGET_OS_IPHONE */
++#endif /* !HAVE_CORESERVICES_CORESERVICES_H */

From 07bd1d873789039e17cc143293ad9ff723d500d2 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 13 Aug 2018 08:47:02 +0900
Subject: [PATCH 0040/3253] kicad: use default cmake

---
 pkgs/applications/science/electronics/kicad/default.nix  | 3 +--
 pkgs/applications/science/electronics/kicad/unstable.nix | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 3e783d2e177c..c92da3eeb292 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
     ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
 
   nativeBuildInputs = [
-    # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html
-    (cmake.override {majorVersion = "3.10";})
+    cmake
     doxygen
     pkgconfig
     wrapGAppsHook
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index e43fd59e0431..a9a4c32a0b45 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
       "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
     ];
 
-  # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html
-  nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen  pkgconfig ];
+  nativeBuildInputs = [ cmake doxygen pkgconfig ];
   buildInputs = [
     libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
     cairo curl openssl boost

From e841ffec180ea911148a0147cea5e656d79802b3 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 13 Aug 2018 08:47:26 +0900
Subject: [PATCH 0041/3253] darwin stdenv stage1: use default cmake

---
 pkgs/stdenv/darwin/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 22dd700b2dda..3dcb37773959 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -190,7 +190,6 @@ in rec {
   stage1 = prevStage: let
     persistent = self: super: with prevStage; {
       cmake = super.cmake.override {
-        majorVersion = "3.9";  # FIXME: update ApplicationServices patch
         isBootstrap = true;
         useSharedLibraries = false;
       };

From 0c171538ff7245f9e45ea509953082bb76f54360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 13 Aug 2018 11:53:20 +0900
Subject: [PATCH 0042/3253] wasm: rename unofficial package into
 proglodyte-wasm

---
 .../interpreters/{wasm => proglodyte-wasm}/default.nix          | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/interpreters/{wasm => proglodyte-wasm}/default.nix (100%)

diff --git a/pkgs/development/interpreters/wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
similarity index 100%
rename from pkgs/development/interpreters/wasm/default.nix
rename to pkgs/development/interpreters/proglodyte-wasm/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9f6c16e9928..fc5de6d4ff2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7655,7 +7655,7 @@ with pkgs;
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
-  wasm = callPackage ../development/interpreters/wasm { };
+  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
 
 
   ### DEVELOPMENT / MISC

From 0d3b2b6990f559970f21456ed183f865cac70543 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 12 Aug 2018 23:04:19 +0200
Subject: [PATCH 0043/3253] cargo-download: init at 0.1.1

Cargo.nix was generated from cargo-download 0.1.1 with this patch
applied, which was necessary to not confuse carnix about the version
being different between Cargo.toml and Cargo.lock.

See https://github.com/Xion/cargo-download/pull/3.

From 5efd4cf11ff9d5042712303404169016b1e05c33 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 26 Jul 2018 21:19:06 +0200
Subject: [PATCH] Fix Cargo.lock

Running `cargo build` on a clean checkout produces a diff in Cargo.lock,
because it wasn't updated after the version number was bumped.

After this commit, `cargo build` should no longer produce a modified
working tree.
---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc7357c..c384dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [

 [[package]]
 name = "cargo-download"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.27.1 (registry+https://github.com/rust-lang/crates.io-index)",
--
2.17.1
---
 .../cargo-download/Cargo.nix                  | 3138 +++++++++++++++++
 .../cargo-download/default.nix                |    5 +
 pkgs/top-level/all-packages.nix               |    1 +
 3 files changed, 3144 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-download/Cargo.nix
 create mode 100644 pkgs/tools/package-management/cargo-download/default.nix

diff --git a/pkgs/tools/package-management/cargo-download/Cargo.nix b/pkgs/tools/package-management/cargo-download/Cargo.nix
new file mode 100644
index 000000000000..9735bde199dc
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-download/Cargo.nix
@@ -0,0 +1,3138 @@
+# Generated by carnix 0.7.2: carnix nix
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+    abi = buildPlatform.parsed.abi.name;
+    include = includedFiles: src: builtins.filterSource (path: type:
+      lib.lists.any (f:
+        let p = toString (src + ("/" + f)); in
+        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+      ) includedFiles
+    ) src;
+    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+    mapFeatures = features: map (fun: fun { features = features; });
+    mkFeatures = feat: lib.lists.foldl (features: featureName:
+      if feat.${featureName} or false then
+        [ featureName ] ++ features
+      else
+        features
+    ) [] (builtins.attrNames feat);
+in
+rec {
+  cargo_download = f: cargo_download_0_1_1 { features = cargo_download_0_1_1_features { cargo_download_0_1_1 = f; }; };
+  __all = [ (cargo_download {}) ];
+  adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "adler32";
+    version = "1.0.3";
+    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
+    sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb";
+    inherit dependencies buildDependencies features;
+  };
+  aho_corasick_0_5_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "aho-corasick";
+    version = "0.5.3";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
+    libName = "aho_corasick";
+    crateBin = [ {  name = "aho-corasick-dot"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  ansi_term_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ansi_term";
+    version = "0.9.0";
+    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" ];
+    sha256 = "1vcd8m2hglrdi4zmqnkkz5zy3c73ifgii245k7vj6qr5dzpn9hij";
+    inherit dependencies buildDependencies features;
+  };
+  ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ansi_term";
+    version = "0.11.0";
+    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
+    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
+    inherit dependencies buildDependencies features;
+  };
+  arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "arrayvec";
+    version = "0.4.7";
+    authors = [ "bluss" ];
+    sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4";
+    inherit dependencies buildDependencies features;
+  };
+  atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "atty";
+    version = "0.2.11";
+    authors = [ "softprops <d.tangren@gmail.com>" ];
+    sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20";
+    inherit dependencies buildDependencies features;
+  };
+  base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "base64";
+    version = "0.9.2";
+    authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ];
+    sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1";
+    inherit dependencies buildDependencies features;
+  };
+  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bitflags";
+    version = "0.9.1";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
+    inherit dependencies buildDependencies features;
+  };
+  bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bitflags";
+    version = "1.0.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw";
+    inherit dependencies buildDependencies features;
+  };
+  build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "build_const";
+    version = "0.2.1";
+    authors = [ "Garrett Berg <vitiral@gmail.com>" ];
+    sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl";
+    inherit dependencies buildDependencies features;
+  };
+  byteorder_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "byteorder";
+    version = "1.2.3";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1xghv5f5rydzsam8lnfqhfk090i8a1knb77ikbs0ik44bvrw2ij3";
+    inherit dependencies buildDependencies features;
+  };
+  bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bytes";
+    version = "0.4.9";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6";
+    inherit dependencies buildDependencies features;
+  };
+  cargo_download_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cargo-download";
+    version = "0.1.1";
+    authors = [ "Karol Kuczmarski <karol.kuczmarski@gmail.com>" ];
+    sha256 = "1xiffk4df6i9cvwimzwyf1finv6w8f8gr0zjp21fzbiz5c0ksx65";
+    crateBin = [ {  name = "cargo-download"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  case_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "case";
+    version = "0.1.0";
+    authors = [ "Skyler Lipthay <skyler.lipthay@gmail.com>" ];
+    sha256 = "06i1x3wqv30rkvlgj134qf9vzxhzz28bz41mm0rgki0i0f7gf96n";
+    inherit dependencies buildDependencies features;
+  };
+  cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cc";
+    version = "1.0.18";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx";
+    inherit dependencies buildDependencies features;
+  };
+  cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cfg-if";
+    version = "0.1.4";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4";
+    inherit dependencies buildDependencies features;
+  };
+  chrono_0_2_25_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "chrono";
+    version = "0.2.25";
+    authors = [ "Kang Seonghoon <public+rust@mearie.org>" ];
+    sha256 = "0gsvqk8cnmm43qj3xyngqvfqh50cbdbqas7ik0wjgnvknirmmca7";
+    inherit dependencies buildDependencies features;
+  };
+  clap_2_32_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "clap";
+    version = "2.32.0";
+    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
+    sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx";
+    inherit dependencies buildDependencies features;
+  };
+  conv_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "conv";
+    version = "0.3.3";
+    authors = [ "Daniel Keep <daniel.keep@gmail.com>" ];
+    sha256 = "08rl72k1a48xah0ar5l9v1bw19pp8jdw2pdkd3vvj9ijsyyg9yik";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation-sys";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crc";
+    version = "1.8.1";
+    authors = [ "Rui Hu <code@mrhooray.com>" ];
+    sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_0_2_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam";
+    version = "0.2.12";
+    authors = [ "Aaron Turon <aturon@mozilla.com>" ];
+    sha256 = "0jkm95is7bwv4parwfq4aim6cigiwd4w9hz09cpild4hp5ry625i";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-deque";
+    version = "0.3.1";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-epoch";
+    version = "0.4.3";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-utils";
+    version = "0.3.2";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql";
+    inherit dependencies buildDependencies features;
+  };
+  custom_derive_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "custom_derive";
+    version = "0.1.7";
+    authors = [ "Daniel Keep <daniel.keep@gmail.com>" ];
+    sha256 = "160q3pzri2fgrr6czfdkwy1sbddki2za96r7ivvyii52qp1523zs";
+    inherit dependencies buildDependencies features;
+  };
+  derive_error_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "derive-error";
+    version = "0.0.3";
+    authors = [ "rushmorem <rushmore@webenchanter.com>" ];
+    sha256 = "0239vzxn5xr9nm3i4d6hmqy7dv8llcjblgh1xixfk5dcgcqan77y";
+    procMacro = true;
+    inherit dependencies buildDependencies features;
+  };
+  dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "dtoa";
+    version = "0.4.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
+    inherit dependencies buildDependencies features;
+  };
+  either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "either";
+    version = "1.5.0";
+    authors = [ "bluss" ];
+    sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
+    inherit dependencies buildDependencies features;
+  };
+  encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "encoding_rs";
+    version = "0.7.2";
+    authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ];
+    sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q";
+    inherit dependencies buildDependencies features;
+  };
+  exitcode_1_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "exitcode";
+    version = "1.1.2";
+    authors = [ "Ben Wilber <benwilber@gmail.com>" ];
+    sha256 = "1cw9p4vzbscvyrbzv7z68gv2cairrns2d4wcb4nkahkcjk25phip";
+    inherit dependencies buildDependencies features;
+  };
+  filetime_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "filetime";
+    version = "0.2.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1wmbj3jnpl39851lymw64j9ac1nmy1z96h1wymvlvypspl68w5y0";
+    inherit dependencies buildDependencies features;
+  };
+  flate2_0_2_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "flate2";
+    version = "0.2.20";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1am0d2vmqym1vcg7rvv516vpcrbhdn1jisy0q03r3nbzdzh54ppl";
+    inherit dependencies buildDependencies features;
+  };
+  foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "foreign-types";
+    version = "0.3.2";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8";
+    inherit dependencies buildDependencies features;
+  };
+  foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "foreign-types-shared";
+    version = "0.1.1";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
+    inherit dependencies buildDependencies features;
+  };
+  fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "fuchsia-zircon";
+    version = "0.3.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
+    inherit dependencies buildDependencies features;
+  };
+  fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "fuchsia-zircon-sys";
+    version = "0.3.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
+    inherit dependencies buildDependencies features;
+  };
+  futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures";
+    version = "0.1.23";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21";
+    inherit dependencies buildDependencies features;
+  };
+  futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures-cpupool";
+    version = "0.1.8";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c";
+    inherit dependencies buildDependencies features;
+  };
+  httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "httparse";
+    version = "1.3.2";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper";
+    version = "0.11.27";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper-tls";
+    version = "0.1.3";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "1dr5arj79pdyz9f2jggqmna1qpc578f9pdgsf2ana5amjpsp0j89";
+    inherit dependencies buildDependencies features;
+  };
+  idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "idna";
+    version = "0.1.5";
+    authors = [ "The rust-url developers" ];
+    sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy";
+    inherit dependencies buildDependencies features;
+  };
+  iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "iovec";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r";
+    inherit dependencies buildDependencies features;
+  };
+  isatty_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "isatty";
+    version = "0.1.8";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1n5wzzkb1kxkfbcyv5vfrsybika0a1k01sp06ngad73ljx4kwj5h";
+    inherit dependencies buildDependencies features;
+  };
+  itertools_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "itertools";
+    version = "0.6.5";
+    authors = [ "bluss" ];
+    sha256 = "0gbhgn7s8qkxxw10i514fzpqnc3aissn4kcgylm2cvnv9zmg8mw1";
+    inherit dependencies buildDependencies features;
+  };
+  itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "itoa";
+    version = "0.4.2";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v";
+    inherit dependencies buildDependencies features;
+  };
+  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "kernel32-sys";
+    version = "0.2.2";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+    libName = "kernel32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "language-tags";
+    version = "0.2.2";
+    authors = [ "Pyfisch <pyfisch@gmail.com>" ];
+    sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy";
+    inherit dependencies buildDependencies features;
+  };
+  lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "0.2.11";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
+    inherit dependencies buildDependencies features;
+  };
+  lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "1.0.2";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r";
+    inherit dependencies buildDependencies features;
+  };
+  lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazycell";
+    version = "0.6.0";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ];
+    sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r";
+    inherit dependencies buildDependencies features;
+  };
+  libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libc";
+    version = "0.2.42";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx";
+    inherit dependencies buildDependencies features;
+  };
+  libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libflate";
+    version = "0.1.16";
+    authors = [ "Takeru Ohta <phjgt308@gmail.com>" ];
+    sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n";
+    inherit dependencies buildDependencies features;
+  };
+  log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "log";
+    version = "0.3.9";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
+    inherit dependencies buildDependencies features;
+  };
+  log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "log";
+    version = "0.4.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250";
+    inherit dependencies buildDependencies features;
+  };
+  maplit_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "maplit";
+    version = "0.1.6";
+    authors = [ "bluss" ];
+    sha256 = "1f8kf5v7xra8ssvh5c10qlacbk4l0z2817pkscflx5s5q6y7925h";
+    inherit dependencies buildDependencies features;
+  };
+  matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "matches";
+    version = "0.1.7";
+    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  memchr_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "memchr";
+    version = "0.1.11";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
+    sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
+    inherit dependencies buildDependencies features;
+  };
+  memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "memoffset";
+    version = "0.2.1";
+    authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ];
+    sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
+    inherit dependencies buildDependencies features;
+  };
+  mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mime";
+    version = "0.3.8";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3";
+    inherit dependencies buildDependencies features;
+  };
+  mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mime_guess";
+    version = "2.0.0-alpha.6";
+    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
+    sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db";
+    inherit dependencies buildDependencies features;
+  };
+  miniz_sys_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "miniz-sys";
+    version = "0.1.10";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "11vg6phafxil87nbxgrlhcx5hjr3145wsbwwkfmibvnmzxfdmvln";
+    libPath = "lib.rs";
+    libName = "miniz_sys";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mio";
+    version = "0.6.15";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa";
+    inherit dependencies buildDependencies features;
+  };
+  miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "miow";
+    version = "0.2.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
+    inherit dependencies buildDependencies features;
+  };
+  native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "native-tls";
+    version = "0.1.5";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf";
+    inherit dependencies buildDependencies features;
+  };
+  net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "net2";
+    version = "0.2.33";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq";
+    inherit dependencies buildDependencies features;
+  };
+  nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "nodrop";
+    version = "0.1.12";
+    authors = [ "bluss" ];
+    sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d";
+    inherit dependencies buildDependencies features;
+  };
+  num_0_1_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num";
+    version = "0.1.42";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1632gczzrmmxdsj3jignwcr793jq8vxw3qkdzpdvbip3vaf1ljgq";
+    inherit dependencies buildDependencies features;
+  };
+  num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-integer";
+    version = "0.1.39";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  num_iter_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-iter";
+    version = "0.1.37";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1rglyvi4yjfxfvfm2s7i60g1dkl5xmsyi77g6vy53jb11r6wl8ly";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-traits";
+    version = "0.2.5";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num_cpus";
+    version = "1.8.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl";
+    version = "0.9.24";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl-sys";
+    version = "0.9.33";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6";
+    build = "build/main.rs";
+    inherit dependencies buildDependencies features;
+  };
+  percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "percent-encoding";
+    version = "1.0.1";
+    authors = [ "The rust-url developers" ];
+    sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_codegen";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_generator";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k";
+    inherit dependencies buildDependencies features;
+  };
+  phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_shared";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pkg-config";
+    version = "0.3.12";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh";
+    inherit dependencies buildDependencies features;
+  };
+  quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "quote";
+    version = "0.3.15";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
+    inherit dependencies buildDependencies features;
+  };
+  rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rand";
+    version = "0.3.22";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
+    inherit dependencies buildDependencies features;
+  };
+  rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rand";
+    version = "0.4.2";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
+    inherit dependencies buildDependencies features;
+  };
+  redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "redox_syscall";
+    version = "0.1.40";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
+    libName = "syscall";
+    inherit dependencies buildDependencies features;
+  };
+  redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "redox_termios";
+    version = "0.1.1";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  regex_0_1_80_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex";
+    version = "0.1.80";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
+    inherit dependencies buildDependencies features;
+  };
+  regex_syntax_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex-syntax";
+    version = "0.3.9";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
+    inherit dependencies buildDependencies features;
+  };
+  relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "relay";
+    version = "0.1.1";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r";
+    inherit dependencies buildDependencies features;
+  };
+  remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "remove_dir_all";
+    version = "0.5.1";
+    authors = [ "Aaronepower <theaaronepower@gmail.com>" ];
+    sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7";
+    inherit dependencies buildDependencies features;
+  };
+  reqwest_0_8_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "reqwest";
+    version = "0.8.6";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "0ka9ndgybhf65fn44badnjbasn1fi0mvjfa3sfiw485mgg21n3a0";
+    inherit dependencies buildDependencies features;
+  };
+  safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "safemem";
+    version = "0.2.0";
+    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
+    sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm";
+    inherit dependencies buildDependencies features;
+  };
+  schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "schannel";
+    version = "0.1.13";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ];
+    sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3";
+    inherit dependencies buildDependencies features;
+  };
+  scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "scoped-tls";
+    version = "0.1.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla";
+    inherit dependencies buildDependencies features;
+  };
+  scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "scopeguard";
+    version = "0.3.3";
+    authors = [ "bluss" ];
+    sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework";
+    version = "0.1.16";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework-sys";
+    version = "0.1.16";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver";
+    version = "0.9.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
+    sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63";
+    inherit dependencies buildDependencies features;
+  };
+  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver-parser";
+    version = "0.7.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
+    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
+    inherit dependencies buildDependencies features;
+  };
+  serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde";
+    version = "1.0.70";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_json";
+    version = "1.0.24";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1";
+    inherit dependencies buildDependencies features;
+  };
+  serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_urlencoded";
+    version = "0.5.2";
+    authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ];
+    sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0";
+    inherit dependencies buildDependencies features;
+  };
+  siphasher_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "siphasher";
+    version = "0.2.2";
+    authors = [ "Frank Denis <github@pureftpd.org>" ];
+    sha256 = "0iyx7nlzfny9ly1634a6zcq0yvrinhxhypwas4p8ry3zqnn76qqr";
+    inherit dependencies buildDependencies features;
+  };
+  slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slab";
+    version = "0.3.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k";
+    inherit dependencies buildDependencies features;
+  };
+  slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slab";
+    version = "0.4.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
+    inherit dependencies buildDependencies features;
+  };
+  slog_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog";
+    version = "1.7.1";
+    authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "1qhnwv2gbxmnwasaa0vlhddq6cdhq6n3l8d6h3ql73367h7aav65";
+    inherit dependencies buildDependencies features;
+  };
+  slog_envlogger_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog-envlogger";
+    version = "0.5.0";
+    authors = [ "The Rust Project Developers" "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "0ry9k2ppj7z6prdz2kf924w7l9y2kbysrigca6shni1kz2j163qb";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  slog_extra_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog-extra";
+    version = "0.1.2";
+    authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "0jrw0xcc81wwcl59xx9qglfcv5l3ad5kbpcyp6ygk94p9kxfrhyj";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  slog_stdlog_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog-stdlog";
+    version = "1.1.0";
+    authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "0ig4mjixr4y3dn3s53rlnrpplwkqb8b0z2zkaiiiwyv7nhjxdg46";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  slog_stream_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog-stream";
+    version = "1.2.1";
+    authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "03dwzbydaamfzjpr16gm065i696lk86gqcpspv5qaqyv938fm2yj";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  slog_term_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slog-term";
+    version = "1.5.0";
+    authors = [ "Dawid Ciężarkiewicz <dpc@dpc.pw>" ];
+    sha256 = "0zq2kyvm7jhqj6sc09w540wqfrrpa46yxf9sgzq7jqpkr66wsiar";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "smallvec";
+    version = "0.2.1";
+    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "strsim";
+    version = "0.7.0";
+    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
+    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
+    inherit dependencies buildDependencies features;
+  };
+  syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "syn";
+    version = "0.11.11";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
+    inherit dependencies buildDependencies features;
+  };
+  synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "synom";
+    version = "0.11.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
+    inherit dependencies buildDependencies features;
+  };
+  take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "take";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd";
+    inherit dependencies buildDependencies features;
+  };
+  tar_0_4_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tar";
+    version = "0.4.16";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0s36d0nzn2hs20y805wpmpc4asd1jhrpabqwcpqf5ha442fa7f3b";
+    inherit dependencies buildDependencies features;
+  };
+  tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tempdir";
+    version = "0.3.7";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
+    inherit dependencies buildDependencies features;
+  };
+  termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "termion";
+    version = "1.5.1";
+    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
+    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
+    inherit dependencies buildDependencies features;
+  };
+  textwrap_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "textwrap";
+    version = "0.10.0";
+    authors = [ "Martin Geisler <martin@geisler.net>" ];
+    sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas";
+    inherit dependencies buildDependencies features;
+  };
+  thread_id_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "thread-id";
+    version = "2.0.0";
+    authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ];
+    sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
+    inherit dependencies buildDependencies features;
+  };
+  thread_local_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "thread_local";
+    version = "0.2.7";
+    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
+    sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
+    inherit dependencies buildDependencies features;
+  };
+  thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "thread_local";
+    version = "0.3.5";
+    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
+    sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6";
+    inherit dependencies buildDependencies features;
+  };
+  time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "time";
+    version = "0.1.40";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio";
+    version = "0.1.7";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-codec";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ];
+    sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-core";
+    version = "0.1.17";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-executor";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-fs";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-io";
+    version = "0.1.7";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-proto";
+    version = "0.1.1";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-reactor";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-service";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-tcp";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-threadpool";
+    version = "0.1.5";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-timer";
+    version = "0.2.4";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-tls";
+    version = "0.1.4";
+    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-udp";
+    version = "0.1.1";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9";
+    inherit dependencies buildDependencies features;
+  };
+  try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "try-lock";
+    version = "0.1.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3";
+    inherit dependencies buildDependencies features;
+  };
+  unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicase";
+    version = "1.4.2";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicase";
+    version = "2.1.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-bidi";
+    version = "0.3.4";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
+    libName = "unicode_bidi";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-normalization";
+    version = "0.1.7";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-width";
+    version = "0.1.5";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-xid";
+    version = "0.0.4";
+    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
+    inherit dependencies buildDependencies features;
+  };
+  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unreachable";
+    version = "1.0.0";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
+    inherit dependencies buildDependencies features;
+  };
+  url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "url";
+    version = "1.7.1";
+    authors = [ "The rust-url developers" ];
+    sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i";
+    inherit dependencies buildDependencies features;
+  };
+  utf8_ranges_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "utf8-ranges";
+    version = "0.1.3";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
+    inherit dependencies buildDependencies features;
+  };
+  uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "uuid";
+    version = "0.6.5";
+    authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ];
+    sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf";
+    inherit dependencies buildDependencies features;
+  };
+  vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "vcpkg";
+    version = "0.2.4";
+    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
+    sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml";
+    inherit dependencies buildDependencies features;
+  };
+  vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "vec_map";
+    version = "0.8.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ];
+    sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi";
+    inherit dependencies buildDependencies features;
+  };
+  version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "version_check";
+    version = "0.1.4";
+    authors = [ "Sergio Benitez <sb@sergio.bz>" ];
+    sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck";
+    inherit dependencies buildDependencies features;
+  };
+  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "void";
+    version = "1.0.2";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
+    inherit dependencies buildDependencies features;
+  };
+  want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "want";
+    version = "0.0.4";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.2.8";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.3.5";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-build";
+    version = "0.1.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+    libName = "build";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-i686-pc-windows-gnu";
+    version = "0.4.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-x86_64-pc-windows-gnu";
+    version = "0.4.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ws2_32-sys";
+    version = "0.2.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc";
+    libName = "ws2_32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  xattr_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "xattr";
+    version = "0.2.2";
+    authors = [ "Steven Allen <steven@stebalien.com>" ];
+    sha256 = "01zqnn6bhrd58hvpj3y1nqnbmlswrvsdapn2zbi7h1bh5lspiyk5";
+    inherit dependencies buildDependencies features;
+  };
+  adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {};
+  adler32_1_0_3_features = f: updateFeatures f (rec {
+    adler32_1_0_3.default = (f.adler32_1_0_3.default or true);
+  }) [];
+  aho_corasick_0_5_3 = { features?(aho_corasick_0_5_3_features {}) }: aho_corasick_0_5_3_ {
+    dependencies = mapFeatures features ([ memchr_0_1_11 ]);
+  };
+  aho_corasick_0_5_3_features = f: updateFeatures f (rec {
+    aho_corasick_0_5_3.default = (f.aho_corasick_0_5_3.default or true);
+    memchr_0_1_11.default = true;
+  }) [ memchr_0_1_11_features ];
+  ansi_term_0_9_0 = { features?(ansi_term_0_9_0_features {}) }: ansi_term_0_9_0_ {};
+  ansi_term_0_9_0_features = f: updateFeatures f (rec {
+    ansi_term_0_9_0.default = (f.ansi_term_0_9_0.default or true);
+  }) [];
+  ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
+    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  ansi_term_0_11_0_features = f: updateFeatures f (rec {
+    ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.errhandlingapi = true;
+    winapi_0_3_5.processenv = true;
+  }) [ winapi_0_3_5_features ];
+  arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ {
+    dependencies = mapFeatures features ([ nodrop_0_1_12 ]);
+    features = mkFeatures (features.arrayvec_0_4_7 or {});
+  };
+  arrayvec_0_4_7_features = f: updateFeatures f (rec {
+    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true);
+    arrayvec_0_4_7.serde =
+      (f.arrayvec_0_4_7.serde or false) ||
+      (f.arrayvec_0_4_7.serde-1 or false) ||
+      (arrayvec_0_4_7.serde-1 or false);
+    arrayvec_0_4_7.std =
+      (f.arrayvec_0_4_7.std or false) ||
+      (f.arrayvec_0_4_7.default or false) ||
+      (arrayvec_0_4_7.default or false);
+    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false);
+  }) [ nodrop_0_1_12_features ];
+  atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ {
+    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  atty_0_2_11_features = f: updateFeatures f (rec {
+    atty_0_2_11.default = (f.atty_0_2_11.default or true);
+    libc_0_2_42.default = (f.libc_0_2_42.default or false);
+    termion_1_5_1.default = true;
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwinbase = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.processenv = true;
+    winapi_0_3_5.winbase = true;
+  }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ];
+  base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ {
+    dependencies = mapFeatures features ([ byteorder_1_2_3 safemem_0_2_0 ]);
+  };
+  base64_0_9_2_features = f: updateFeatures f (rec {
+    base64_0_9_2.default = (f.base64_0_9_2.default or true);
+    byteorder_1_2_3.default = true;
+    safemem_0_2_0.default = true;
+  }) [ byteorder_1_2_3_features safemem_0_2_0_features ];
+  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
+    features = mkFeatures (features.bitflags_0_9_1 or {});
+  };
+  bitflags_0_9_1_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
+    bitflags_0_9_1.example_generated =
+      (f.bitflags_0_9_1.example_generated or false) ||
+      (f.bitflags_0_9_1.default or false) ||
+      (bitflags_0_9_1.default or false);
+  }) [];
+  bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
+    features = mkFeatures (features.bitflags_1_0_3 or {});
+  };
+  bitflags_1_0_3_features = f: updateFeatures f (rec {
+    bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
+  }) [];
+  build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ {
+    features = mkFeatures (features.build_const_0_2_1 or {});
+  };
+  build_const_0_2_1_features = f: updateFeatures f (rec {
+    build_const_0_2_1.default = (f.build_const_0_2_1.default or true);
+    build_const_0_2_1.std =
+      (f.build_const_0_2_1.std or false) ||
+      (f.build_const_0_2_1.default or false) ||
+      (build_const_0_2_1.default or false);
+  }) [];
+  byteorder_1_2_3 = { features?(byteorder_1_2_3_features {}) }: byteorder_1_2_3_ {
+    features = mkFeatures (features.byteorder_1_2_3 or {});
+  };
+  byteorder_1_2_3_features = f: updateFeatures f (rec {
+    byteorder_1_2_3.default = (f.byteorder_1_2_3.default or true);
+    byteorder_1_2_3.std =
+      (f.byteorder_1_2_3.std or false) ||
+      (f.byteorder_1_2_3.default or false) ||
+      (byteorder_1_2_3.default or false);
+  }) [];
+  bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ {
+    dependencies = mapFeatures features ([ byteorder_1_2_3 iovec_0_1_2 ]);
+    features = mkFeatures (features.bytes_0_4_9 or {});
+  };
+  bytes_0_4_9_features = f: updateFeatures f (rec {
+    byteorder_1_2_3.default = true;
+    byteorder_1_2_3.i128 =
+      (f.byteorder_1_2_3.i128 or false) ||
+      (bytes_0_4_9.i128 or false) ||
+      (f.bytes_0_4_9.i128 or false);
+    bytes_0_4_9.default = (f.bytes_0_4_9.default or true);
+    iovec_0_1_2.default = true;
+  }) [ byteorder_1_2_3_features iovec_0_1_2_features ];
+  cargo_download_0_1_1 = { features?(cargo_download_0_1_1_features {}) }: cargo_download_0_1_1_ {
+    dependencies = mapFeatures features ([ ansi_term_0_9_0 clap_2_32_0 conv_0_3_3 derive_error_0_0_3 exitcode_1_1_2 flate2_0_2_20 isatty_0_1_8 itertools_0_6_5 lazy_static_0_2_11 log_0_3_9 maplit_0_1_6 reqwest_0_8_6 semver_0_9_0 serde_json_1_0_24 slog_1_7_1 slog_envlogger_0_5_0 slog_stdlog_1_1_0 slog_stream_1_2_1 tar_0_4_16 time_0_1_40 ]);
+  };
+  cargo_download_0_1_1_features = f: updateFeatures f (rec {
+    ansi_term_0_9_0.default = true;
+    cargo_download_0_1_1.default = (f.cargo_download_0_1_1.default or true);
+    clap_2_32_0.default = true;
+    conv_0_3_3.default = true;
+    derive_error_0_0_3.default = true;
+    exitcode_1_1_2.default = true;
+    flate2_0_2_20.default = true;
+    isatty_0_1_8.default = true;
+    itertools_0_6_5.default = true;
+    lazy_static_0_2_11.default = true;
+    log_0_3_9.default = true;
+    maplit_0_1_6.default = true;
+    reqwest_0_8_6.default = true;
+    semver_0_9_0.default = true;
+    serde_json_1_0_24.default = true;
+    slog_1_7_1.default = true;
+    slog_envlogger_0_5_0.default = true;
+    slog_stdlog_1_1_0.default = true;
+    slog_stream_1_2_1.default = true;
+    tar_0_4_16.default = true;
+    time_0_1_40.default = true;
+  }) [ ansi_term_0_9_0_features clap_2_32_0_features conv_0_3_3_features derive_error_0_0_3_features exitcode_1_1_2_features flate2_0_2_20_features isatty_0_1_8_features itertools_0_6_5_features lazy_static_0_2_11_features log_0_3_9_features maplit_0_1_6_features reqwest_0_8_6_features semver_0_9_0_features serde_json_1_0_24_features slog_1_7_1_features slog_envlogger_0_5_0_features slog_stdlog_1_1_0_features slog_stream_1_2_1_features tar_0_4_16_features time_0_1_40_features ];
+  case_0_1_0 = { features?(case_0_1_0_features {}) }: case_0_1_0_ {};
+  case_0_1_0_features = f: updateFeatures f (rec {
+    case_0_1_0.default = (f.case_0_1_0.default or true);
+  }) [];
+  cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.cc_1_0_18 or {});
+  };
+  cc_1_0_18_features = f: updateFeatures f (rec {
+    cc_1_0_18.default = (f.cc_1_0_18.default or true);
+    cc_1_0_18.rayon =
+      (f.cc_1_0_18.rayon or false) ||
+      (f.cc_1_0_18.parallel or false) ||
+      (cc_1_0_18.parallel or false);
+  }) [];
+  cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {};
+  cfg_if_0_1_4_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true);
+  }) [];
+  chrono_0_2_25 = { features?(chrono_0_2_25_features {}) }: chrono_0_2_25_ {
+    dependencies = mapFeatures features ([ num_0_1_42 time_0_1_40 ]);
+  };
+  chrono_0_2_25_features = f: updateFeatures f (rec {
+    chrono_0_2_25.default = (f.chrono_0_2_25.default or true);
+    num_0_1_42.default = (f.num_0_1_42.default or false);
+    time_0_1_40.default = true;
+  }) [ num_0_1_42_features time_0_1_40_features ];
+  clap_2_32_0 = { features?(clap_2_32_0_features {}) }: clap_2_32_0_ {
+    dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_10_0 unicode_width_0_1_5 ]
+      ++ (if features.clap_2_32_0.atty or false then [ atty_0_2_11 ] else [])
+      ++ (if features.clap_2_32_0.strsim or false then [ strsim_0_7_0 ] else [])
+      ++ (if features.clap_2_32_0.vec_map or false then [ vec_map_0_8_1 ] else []))
+      ++ (if !(kernel == "windows") then mapFeatures features ([ ]
+      ++ (if features.clap_2_32_0.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []);
+    features = mkFeatures (features.clap_2_32_0 or {});
+  };
+  clap_2_32_0_features = f: updateFeatures f (rec {
+    ansi_term_0_11_0.default = true;
+    atty_0_2_11.default = true;
+    bitflags_1_0_3.default = true;
+    clap_2_32_0.ansi_term =
+      (f.clap_2_32_0.ansi_term or false) ||
+      (f.clap_2_32_0.color or false) ||
+      (clap_2_32_0.color or false);
+    clap_2_32_0.atty =
+      (f.clap_2_32_0.atty or false) ||
+      (f.clap_2_32_0.color or false) ||
+      (clap_2_32_0.color or false);
+    clap_2_32_0.clippy =
+      (f.clap_2_32_0.clippy or false) ||
+      (f.clap_2_32_0.lints or false) ||
+      (clap_2_32_0.lints or false);
+    clap_2_32_0.color =
+      (f.clap_2_32_0.color or false) ||
+      (f.clap_2_32_0.default or false) ||
+      (clap_2_32_0.default or false);
+    clap_2_32_0.default = (f.clap_2_32_0.default or true);
+    clap_2_32_0.strsim =
+      (f.clap_2_32_0.strsim or false) ||
+      (f.clap_2_32_0.suggestions or false) ||
+      (clap_2_32_0.suggestions or false);
+    clap_2_32_0.suggestions =
+      (f.clap_2_32_0.suggestions or false) ||
+      (f.clap_2_32_0.default or false) ||
+      (clap_2_32_0.default or false);
+    clap_2_32_0.term_size =
+      (f.clap_2_32_0.term_size or false) ||
+      (f.clap_2_32_0.wrap_help or false) ||
+      (clap_2_32_0.wrap_help or false);
+    clap_2_32_0.vec_map =
+      (f.clap_2_32_0.vec_map or false) ||
+      (f.clap_2_32_0.default or false) ||
+      (clap_2_32_0.default or false);
+    clap_2_32_0.yaml =
+      (f.clap_2_32_0.yaml or false) ||
+      (f.clap_2_32_0.doc or false) ||
+      (clap_2_32_0.doc or false);
+    clap_2_32_0.yaml-rust =
+      (f.clap_2_32_0.yaml-rust or false) ||
+      (f.clap_2_32_0.yaml or false) ||
+      (clap_2_32_0.yaml or false);
+    strsim_0_7_0.default = true;
+    textwrap_0_10_0.default = true;
+    textwrap_0_10_0.term_size =
+      (f.textwrap_0_10_0.term_size or false) ||
+      (clap_2_32_0.wrap_help or false) ||
+      (f.clap_2_32_0.wrap_help or false);
+    unicode_width_0_1_5.default = true;
+    vec_map_0_8_1.default = true;
+  }) [ atty_0_2_11_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_10_0_features unicode_width_0_1_5_features vec_map_0_8_1_features ansi_term_0_11_0_features ];
+  conv_0_3_3 = { features?(conv_0_3_3_features {}) }: conv_0_3_3_ {
+    dependencies = mapFeatures features ([ custom_derive_0_1_7 ]);
+  };
+  conv_0_3_3_features = f: updateFeatures f (rec {
+    conv_0_3_3.default = (f.conv_0_3_3.default or true);
+    custom_derive_0_1_7.default = true;
+  }) [ custom_derive_0_1_7_features ];
+  core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
+  };
+  core_foundation_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true);
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
+  core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+  };
+  core_foundation_sys_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true);
+    libc_0_2_42.default = true;
+  }) [ libc_0_2_42_features ];
+  crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ {
+    buildDependencies = mapFeatures features ([ build_const_0_2_1 ]);
+    features = mkFeatures (features.crc_1_8_1 or {});
+  };
+  crc_1_8_1_features = f: updateFeatures f (rec {
+    build_const_0_2_1.default = true;
+    crc_1_8_1.default = (f.crc_1_8_1.default or true);
+    crc_1_8_1.std =
+      (f.crc_1_8_1.std or false) ||
+      (f.crc_1_8_1.default or false) ||
+      (crc_1_8_1.default or false);
+  }) [ build_const_0_2_1_features ];
+  crossbeam_0_2_12 = { features?(crossbeam_0_2_12_features {}) }: crossbeam_0_2_12_ {
+    features = mkFeatures (features.crossbeam_0_2_12 or {});
+  };
+  crossbeam_0_2_12_features = f: updateFeatures f (rec {
+    crossbeam_0_2_12.default = (f.crossbeam_0_2_12.default or true);
+  }) [];
+  crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ {
+    dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]);
+  };
+  crossbeam_deque_0_3_1_features = f: updateFeatures f (rec {
+    crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true);
+    crossbeam_epoch_0_4_3.default = true;
+    crossbeam_utils_0_3_2.default = true;
+  }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ];
+  crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ {
+    dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ]
+      ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else []));
+    features = mkFeatures (features.crossbeam_epoch_0_4_3 or {});
+  };
+  crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec {
+    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false);
+    arrayvec_0_4_7.use_union =
+      (f.arrayvec_0_4_7.use_union or false) ||
+      (crossbeam_epoch_0_4_3.nightly or false) ||
+      (f.crossbeam_epoch_0_4_3.nightly or false);
+    cfg_if_0_1_4.default = true;
+    crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true);
+    crossbeam_epoch_0_4_3.lazy_static =
+      (f.crossbeam_epoch_0_4_3.lazy_static or false) ||
+      (f.crossbeam_epoch_0_4_3.use_std or false) ||
+      (crossbeam_epoch_0_4_3.use_std or false);
+    crossbeam_epoch_0_4_3.use_std =
+      (f.crossbeam_epoch_0_4_3.use_std or false) ||
+      (f.crossbeam_epoch_0_4_3.default or false) ||
+      (crossbeam_epoch_0_4_3.default or false);
+    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false);
+    crossbeam_utils_0_3_2.use_std =
+      (f.crossbeam_utils_0_3_2.use_std or false) ||
+      (crossbeam_epoch_0_4_3.use_std or false) ||
+      (f.crossbeam_epoch_0_4_3.use_std or false);
+    lazy_static_1_0_2.default = true;
+    memoffset_0_2_1.default = true;
+    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false);
+  }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ];
+  crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.crossbeam_utils_0_3_2 or {});
+  };
+  crossbeam_utils_0_3_2_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true);
+    crossbeam_utils_0_3_2.use_std =
+      (f.crossbeam_utils_0_3_2.use_std or false) ||
+      (f.crossbeam_utils_0_3_2.default or false) ||
+      (crossbeam_utils_0_3_2.default or false);
+  }) [ cfg_if_0_1_4_features ];
+  custom_derive_0_1_7 = { features?(custom_derive_0_1_7_features {}) }: custom_derive_0_1_7_ {
+    features = mkFeatures (features.custom_derive_0_1_7 or {});
+  };
+  custom_derive_0_1_7_features = f: updateFeatures f (rec {
+    custom_derive_0_1_7.default = (f.custom_derive_0_1_7.default or true);
+    custom_derive_0_1_7.std =
+      (f.custom_derive_0_1_7.std or false) ||
+      (f.custom_derive_0_1_7.default or false) ||
+      (custom_derive_0_1_7.default or false);
+  }) [];
+  derive_error_0_0_3 = { features?(derive_error_0_0_3_features {}) }: derive_error_0_0_3_ {
+    dependencies = mapFeatures features ([ case_0_1_0 quote_0_3_15 syn_0_11_11 ]);
+  };
+  derive_error_0_0_3_features = f: updateFeatures f (rec {
+    case_0_1_0.default = true;
+    derive_error_0_0_3.default = (f.derive_error_0_0_3.default or true);
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = true;
+  }) [ case_0_1_0_features quote_0_3_15_features syn_0_11_11_features ];
+  dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {};
+  dtoa_0_4_3_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true);
+  }) [];
+  either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.either_1_5_0 or {});
+  };
+  either_1_5_0_features = f: updateFeatures f (rec {
+    either_1_5_0.default = (f.either_1_5_0.default or true);
+    either_1_5_0.use_std =
+      (f.either_1_5_0.use_std or false) ||
+      (f.either_1_5_0.default or false) ||
+      (either_1_5_0.default or false);
+  }) [];
+  encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.encoding_rs_0_7_2 or {});
+  };
+  encoding_rs_0_7_2_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true);
+    encoding_rs_0_7_2.simd =
+      (f.encoding_rs_0_7_2.simd or false) ||
+      (f.encoding_rs_0_7_2.simd-accel or false) ||
+      (encoding_rs_0_7_2.simd-accel or false);
+  }) [ cfg_if_0_1_4_features ];
+  exitcode_1_1_2 = { features?(exitcode_1_1_2_features {}) }: exitcode_1_1_2_ {};
+  exitcode_1_1_2_features = f: updateFeatures f (rec {
+    exitcode_1_1_2.default = (f.exitcode_1_1_2.default or true);
+  }) [];
+  filetime_0_2_1 = { features?(filetime_0_2_1_features {}) }: filetime_0_2_1_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else []);
+  };
+  filetime_0_2_1_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    filetime_0_2_1.default = (f.filetime_0_2_1.default or true);
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+  }) [ cfg_if_0_1_4_features redox_syscall_0_1_40_features libc_0_2_42_features ];
+  flate2_0_2_20 = { features?(flate2_0_2_20_features {}) }: flate2_0_2_20_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]
+      ++ (if features.flate2_0_2_20.miniz-sys or false then [ miniz_sys_0_1_10 ] else []));
+    features = mkFeatures (features.flate2_0_2_20 or {});
+  };
+  flate2_0_2_20_features = f: updateFeatures f (rec {
+    flate2_0_2_20.default = (f.flate2_0_2_20.default or true);
+    flate2_0_2_20.futures =
+      (f.flate2_0_2_20.futures or false) ||
+      (f.flate2_0_2_20.tokio or false) ||
+      (flate2_0_2_20.tokio or false);
+    flate2_0_2_20.libz-sys =
+      (f.flate2_0_2_20.libz-sys or false) ||
+      (f.flate2_0_2_20.zlib or false) ||
+      (flate2_0_2_20.zlib or false);
+    flate2_0_2_20.miniz-sys =
+      (f.flate2_0_2_20.miniz-sys or false) ||
+      (f.flate2_0_2_20.default or false) ||
+      (flate2_0_2_20.default or false);
+    flate2_0_2_20.tokio-io =
+      (f.flate2_0_2_20.tokio-io or false) ||
+      (f.flate2_0_2_20.tokio or false) ||
+      (flate2_0_2_20.tokio or false);
+    libc_0_2_42.default = true;
+    miniz_sys_0_1_10.default = true;
+  }) [ libc_0_2_42_features miniz_sys_0_1_10_features ];
+  foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ {
+    dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]);
+  };
+  foreign_types_0_3_2_features = f: updateFeatures f (rec {
+    foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true);
+    foreign_types_shared_0_1_1.default = true;
+  }) [ foreign_types_shared_0_1_1_features ];
+  foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {};
+  foreign_types_shared_0_1_1_features = f: updateFeatures f (rec {
+    foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true);
+  }) [];
+  fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
+    dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
+  };
+  fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+    bitflags_1_0_3.default = true;
+    fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
+    fuchsia_zircon_sys_0_3_3.default = true;
+  }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
+  fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
+  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+    fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
+  }) [];
+  futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ {
+    features = mkFeatures (features.futures_0_1_23 or {});
+  };
+  futures_0_1_23_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = (f.futures_0_1_23.default or true);
+    futures_0_1_23.use_std =
+      (f.futures_0_1_23.use_std or false) ||
+      (f.futures_0_1_23.default or false) ||
+      (futures_0_1_23.default or false);
+    futures_0_1_23.with-deprecated =
+      (f.futures_0_1_23.with-deprecated or false) ||
+      (f.futures_0_1_23.default or false) ||
+      (futures_0_1_23.default or false);
+  }) [];
+  futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]);
+    features = mkFeatures (features.futures_cpupool_0_1_8 or {});
+  };
+  futures_cpupool_0_1_8_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = (f.futures_0_1_23.default or false);
+    futures_0_1_23.use_std = true;
+    futures_0_1_23.with-deprecated =
+      (f.futures_0_1_23.with-deprecated or false) ||
+      (futures_cpupool_0_1_8.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_8.with-deprecated or false);
+    futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true);
+    futures_cpupool_0_1_8.with-deprecated =
+      (f.futures_cpupool_0_1_8.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_8.default or false) ||
+      (futures_cpupool_0_1_8.default or false);
+    num_cpus_1_8_0.default = true;
+  }) [ futures_0_1_23_features num_cpus_1_8_0_features ];
+  httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ {
+    features = mkFeatures (features.httparse_1_3_2 or {});
+  };
+  httparse_1_3_2_features = f: updateFeatures f (rec {
+    httparse_1_3_2.default = (f.httparse_1_3_2.default or true);
+    httparse_1_3_2.std =
+      (f.httparse_1_3_2.std or false) ||
+      (f.httparse_1_3_2.default or false) ||
+      (httparse_1_3_2.default or false);
+  }) [];
+  hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ {
+    dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ]
+      ++ (if features.hyper_0_11_27.tokio-proto or false then [ tokio_proto_0_1_1 ] else []));
+    features = mkFeatures (features.hyper_0_11_27 or {});
+  };
+  hyper_0_11_27_features = f: updateFeatures f (rec {
+    base64_0_9_2.default = true;
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    futures_cpupool_0_1_8.default = true;
+    httparse_1_3_2.default = true;
+    hyper_0_11_27.default = (f.hyper_0_11_27.default or true);
+    hyper_0_11_27.http =
+      (f.hyper_0_11_27.http or false) ||
+      (f.hyper_0_11_27.compat or false) ||
+      (hyper_0_11_27.compat or false);
+    hyper_0_11_27.server-proto =
+      (f.hyper_0_11_27.server-proto or false) ||
+      (f.hyper_0_11_27.default or false) ||
+      (hyper_0_11_27.default or false);
+    hyper_0_11_27.tokio-proto =
+      (f.hyper_0_11_27.tokio-proto or false) ||
+      (f.hyper_0_11_27.server-proto or false) ||
+      (hyper_0_11_27.server-proto or false);
+    iovec_0_1_2.default = true;
+    language_tags_0_2_2.default = true;
+    log_0_4_3.default = true;
+    mime_0_3_8.default = true;
+    net2_0_2_33.default = true;
+    percent_encoding_1_0_1.default = true;
+    relay_0_1_1.default = true;
+    time_0_1_40.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_proto_0_1_1.default = true;
+    tokio_service_0_1_0.default = true;
+    unicase_2_1_0.default = true;
+    want_0_0_4.default = true;
+  }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ];
+  hyper_tls_0_1_3 = { features?(hyper_tls_0_1_3_features {}) }: hyper_tls_0_1_3_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]);
+  };
+  hyper_tls_0_1_3_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    hyper_0_11_27.default = true;
+    hyper_tls_0_1_3.default = (f.hyper_tls_0_1_3.default or true);
+    native_tls_0_1_5.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_service_0_1_0.default = true;
+    tokio_tls_0_1_4.default = true;
+  }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ];
+  idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ {
+    dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
+  };
+  idna_0_1_5_features = f: updateFeatures f (rec {
+    idna_0_1_5.default = (f.idna_0_1_5.default or true);
+    matches_0_1_7.default = true;
+    unicode_bidi_0_3_4.default = true;
+    unicode_normalization_0_1_7.default = true;
+  }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
+  iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ {
+    dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []);
+  };
+  iovec_0_1_2_features = f: updateFeatures f (rec {
+    iovec_0_1_2.default = (f.iovec_0_1_2.default or true);
+    libc_0_2_42.default = true;
+    winapi_0_2_8.default = true;
+  }) [ libc_0_2_42_features winapi_0_2_8_features ];
+  isatty_0_1_8 = { features?(isatty_0_1_8_features {}) }: isatty_0_1_8_ {
+    dependencies = (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  isatty_0_1_8_features = f: updateFeatures f (rec {
+    isatty_0_1_8.default = (f.isatty_0_1_8.default or true);
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.fileapi = true;
+    winapi_0_3_5.minwinbase = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.processenv = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.winnt = true;
+  }) [ redox_syscall_0_1_40_features libc_0_2_42_features winapi_0_3_5_features ];
+  itertools_0_6_5 = { features?(itertools_0_6_5_features {}) }: itertools_0_6_5_ {
+    dependencies = mapFeatures features ([ either_1_5_0 ]);
+  };
+  itertools_0_6_5_features = f: updateFeatures f (rec {
+    either_1_5_0.default = (f.either_1_5_0.default or false);
+    itertools_0_6_5.default = (f.itertools_0_6_5.default or true);
+  }) [ either_1_5_0_features ];
+  itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ {
+    features = mkFeatures (features.itoa_0_4_2 or {});
+  };
+  itoa_0_4_2_features = f: updateFeatures f (rec {
+    itoa_0_4_2.default = (f.itoa_0_4_2.default or true);
+    itoa_0_4_2.std =
+      (f.itoa_0_4_2.std or false) ||
+      (f.itoa_0_4_2.default or false) ||
+      (itoa_0_4_2.default or false);
+  }) [];
+  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.language_tags_0_2_2 or {});
+  };
+  language_tags_0_2_2_features = f: updateFeatures f (rec {
+    language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true);
+    language_tags_0_2_2.heapsize =
+      (f.language_tags_0_2_2.heapsize or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+    language_tags_0_2_2.heapsize_plugin =
+      (f.language_tags_0_2_2.heapsize_plugin or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+  }) [];
+  lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazy_static_0_2_11 or {});
+  };
+  lazy_static_0_2_11_features = f: updateFeatures f (rec {
+    lazy_static_0_2_11.compiletest_rs =
+      (f.lazy_static_0_2_11.compiletest_rs or false) ||
+      (f.lazy_static_0_2_11.compiletest or false) ||
+      (lazy_static_0_2_11.compiletest or false);
+    lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true);
+    lazy_static_0_2_11.nightly =
+      (f.lazy_static_0_2_11.nightly or false) ||
+      (f.lazy_static_0_2_11.spin_no_std or false) ||
+      (lazy_static_0_2_11.spin_no_std or false);
+    lazy_static_0_2_11.spin =
+      (f.lazy_static_0_2_11.spin or false) ||
+      (f.lazy_static_0_2_11.spin_no_std or false) ||
+      (lazy_static_0_2_11.spin_no_std or false);
+  }) [];
+  lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazy_static_1_0_2 or {});
+  };
+  lazy_static_1_0_2_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true);
+    lazy_static_1_0_2.nightly =
+      (f.lazy_static_1_0_2.nightly or false) ||
+      (f.lazy_static_1_0_2.spin_no_std or false) ||
+      (lazy_static_1_0_2.spin_no_std or false);
+    lazy_static_1_0_2.spin =
+      (f.lazy_static_1_0_2.spin or false) ||
+      (f.lazy_static_1_0_2.spin_no_std or false) ||
+      (lazy_static_1_0_2.spin_no_std or false);
+  }) [];
+  lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazycell_0_6_0 or {});
+  };
+  lazycell_0_6_0_features = f: updateFeatures f (rec {
+    lazycell_0_6_0.clippy =
+      (f.lazycell_0_6_0.clippy or false) ||
+      (f.lazycell_0_6_0.nightly-testing or false) ||
+      (lazycell_0_6_0.nightly-testing or false);
+    lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true);
+    lazycell_0_6_0.nightly =
+      (f.lazycell_0_6_0.nightly or false) ||
+      (f.lazycell_0_6_0.nightly-testing or false) ||
+      (lazycell_0_6_0.nightly-testing or false);
+  }) [];
+  libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ {
+    features = mkFeatures (features.libc_0_2_42 or {});
+  };
+  libc_0_2_42_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = (f.libc_0_2_42.default or true);
+    libc_0_2_42.use_std =
+      (f.libc_0_2_42.use_std or false) ||
+      (f.libc_0_2_42.default or false) ||
+      (libc_0_2_42.default or false);
+  }) [];
+  libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ {
+    dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_3 crc_1_8_1 ]);
+  };
+  libflate_0_1_16_features = f: updateFeatures f (rec {
+    adler32_1_0_3.default = true;
+    byteorder_1_2_3.default = true;
+    crc_1_8_1.default = true;
+    libflate_0_1_16.default = (f.libflate_0_1_16.default or true);
+  }) [ adler32_1_0_3_features byteorder_1_2_3_features crc_1_8_1_features ];
+  log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ {
+    dependencies = mapFeatures features ([ log_0_4_3 ]);
+    features = mkFeatures (features.log_0_3_9 or {});
+  };
+  log_0_3_9_features = f: updateFeatures f (rec {
+    log_0_3_9.default = (f.log_0_3_9.default or true);
+    log_0_3_9.use_std =
+      (f.log_0_3_9.use_std or false) ||
+      (f.log_0_3_9.default or false) ||
+      (log_0_3_9.default or false);
+    log_0_4_3.default = true;
+    log_0_4_3.max_level_debug =
+      (f.log_0_4_3.max_level_debug or false) ||
+      (log_0_3_9.max_level_debug or false) ||
+      (f.log_0_3_9.max_level_debug or false);
+    log_0_4_3.max_level_error =
+      (f.log_0_4_3.max_level_error or false) ||
+      (log_0_3_9.max_level_error or false) ||
+      (f.log_0_3_9.max_level_error or false);
+    log_0_4_3.max_level_info =
+      (f.log_0_4_3.max_level_info or false) ||
+      (log_0_3_9.max_level_info or false) ||
+      (f.log_0_3_9.max_level_info or false);
+    log_0_4_3.max_level_off =
+      (f.log_0_4_3.max_level_off or false) ||
+      (log_0_3_9.max_level_off or false) ||
+      (f.log_0_3_9.max_level_off or false);
+    log_0_4_3.max_level_trace =
+      (f.log_0_4_3.max_level_trace or false) ||
+      (log_0_3_9.max_level_trace or false) ||
+      (f.log_0_3_9.max_level_trace or false);
+    log_0_4_3.max_level_warn =
+      (f.log_0_4_3.max_level_warn or false) ||
+      (log_0_3_9.max_level_warn or false) ||
+      (f.log_0_3_9.max_level_warn or false);
+    log_0_4_3.release_max_level_debug =
+      (f.log_0_4_3.release_max_level_debug or false) ||
+      (log_0_3_9.release_max_level_debug or false) ||
+      (f.log_0_3_9.release_max_level_debug or false);
+    log_0_4_3.release_max_level_error =
+      (f.log_0_4_3.release_max_level_error or false) ||
+      (log_0_3_9.release_max_level_error or false) ||
+      (f.log_0_3_9.release_max_level_error or false);
+    log_0_4_3.release_max_level_info =
+      (f.log_0_4_3.release_max_level_info or false) ||
+      (log_0_3_9.release_max_level_info or false) ||
+      (f.log_0_3_9.release_max_level_info or false);
+    log_0_4_3.release_max_level_off =
+      (f.log_0_4_3.release_max_level_off or false) ||
+      (log_0_3_9.release_max_level_off or false) ||
+      (f.log_0_3_9.release_max_level_off or false);
+    log_0_4_3.release_max_level_trace =
+      (f.log_0_4_3.release_max_level_trace or false) ||
+      (log_0_3_9.release_max_level_trace or false) ||
+      (f.log_0_3_9.release_max_level_trace or false);
+    log_0_4_3.release_max_level_warn =
+      (f.log_0_4_3.release_max_level_warn or false) ||
+      (log_0_3_9.release_max_level_warn or false) ||
+      (f.log_0_3_9.release_max_level_warn or false);
+    log_0_4_3.std =
+      (f.log_0_4_3.std or false) ||
+      (log_0_3_9.use_std or false) ||
+      (f.log_0_3_9.use_std or false);
+  }) [ log_0_4_3_features ];
+  log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.log_0_4_3 or {});
+  };
+  log_0_4_3_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    log_0_4_3.default = (f.log_0_4_3.default or true);
+  }) [ cfg_if_0_1_4_features ];
+  maplit_0_1_6 = { features?(maplit_0_1_6_features {}) }: maplit_0_1_6_ {};
+  maplit_0_1_6_features = f: updateFeatures f (rec {
+    maplit_0_1_6.default = (f.maplit_0_1_6.default or true);
+  }) [];
+  matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {};
+  matches_0_1_7_features = f: updateFeatures f (rec {
+    matches_0_1_7.default = (f.matches_0_1_7.default or true);
+  }) [];
+  memchr_0_1_11 = { features?(memchr_0_1_11_features {}) }: memchr_0_1_11_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+  };
+  memchr_0_1_11_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    memchr_0_1_11.default = (f.memchr_0_1_11.default or true);
+  }) [ libc_0_2_42_features ];
+  memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {};
+  memoffset_0_2_1_features = f: updateFeatures f (rec {
+    memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true);
+  }) [];
+  mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ {
+    dependencies = mapFeatures features ([ unicase_2_1_0 ]);
+  };
+  mime_0_3_8_features = f: updateFeatures f (rec {
+    mime_0_3_8.default = (f.mime_0_3_8.default or true);
+    unicase_2_1_0.default = true;
+  }) [ unicase_2_1_0_features ];
+  mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ {
+    dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]);
+    buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]);
+    features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {});
+  };
+  mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec {
+    mime_0_3_8.default = true;
+    mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true);
+    phf_0_7_22.default = true;
+    phf_0_7_22.unicase = true;
+    phf_codegen_0_7_22.default = true;
+    unicase_1_4_2.default = true;
+  }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ];
+  miniz_sys_0_1_10 = { features?(miniz_sys_0_1_10_features {}) }: miniz_sys_0_1_10_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+    buildDependencies = mapFeatures features ([ cc_1_0_18 ]);
+  };
+  miniz_sys_0_1_10_features = f: updateFeatures f (rec {
+    cc_1_0_18.default = true;
+    libc_0_2_42.default = true;
+    miniz_sys_0_1_10.default = (f.miniz_sys_0_1_10.default or true);
+  }) [ libc_0_2_42_features cc_1_0_18_features ];
+  mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ {
+    dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ])
+      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []);
+    features = mkFeatures (features.mio_0_6_15 or {});
+  };
+  mio_0_6_15_features = f: updateFeatures f (rec {
+    fuchsia_zircon_0_3_3.default = true;
+    fuchsia_zircon_sys_0_3_3.default = true;
+    iovec_0_1_2.default = true;
+    kernel32_sys_0_2_2.default = true;
+    lazycell_0_6_0.default = true;
+    libc_0_2_42.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = (f.mio_0_6_15.default or true);
+    mio_0_6_15.with-deprecated =
+      (f.mio_0_6_15.with-deprecated or false) ||
+      (f.mio_0_6_15.default or false) ||
+      (mio_0_6_15.default or false);
+    miow_0_2_1.default = true;
+    net2_0_2_33.default = true;
+    slab_0_4_0.default = true;
+    winapi_0_2_8.default = true;
+  }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ];
+  miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ {
+    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]);
+  };
+  miow_0_2_1_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = true;
+    miow_0_2_1.default = (f.miow_0_2_1.default or true);
+    net2_0_2_33.default = (f.net2_0_2_33.default or false);
+    winapi_0_2_8.default = true;
+    ws2_32_sys_0_2_1.default = true;
+  }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ];
+  native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ {
+    dependencies = mapFeatures features ([ lazy_static_0_2_11 ])
+      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else [])
+      ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []);
+  };
+  native_tls_0_1_5_features = f: updateFeatures f (rec {
+    lazy_static_0_2_11.default = true;
+    libc_0_2_42.default = true;
+    native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true);
+    openssl_0_9_24.default = true;
+    schannel_0_1_13.default = true;
+    security_framework_0_1_16.OSX_10_8 = true;
+    security_framework_0_1_16.default = true;
+    security_framework_sys_0_1_16.default = true;
+    tempdir_0_3_7.default = true;
+  }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ];
+  net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ])
+      ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+    features = mkFeatures (features.net2_0_2_33 or {});
+  };
+  net2_0_2_33_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    libc_0_2_42.default = true;
+    net2_0_2_33.default = (f.net2_0_2_33.default or true);
+    net2_0_2_33.duration =
+      (f.net2_0_2_33.duration or false) ||
+      (f.net2_0_2_33.default or false) ||
+      (net2_0_2_33.default or false);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.handleapi = true;
+    winapi_0_3_5.winsock2 = true;
+    winapi_0_3_5.ws2def = true;
+    winapi_0_3_5.ws2ipdef = true;
+    winapi_0_3_5.ws2tcpip = true;
+  }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ];
+  nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.nodrop_0_1_12 or {});
+  };
+  nodrop_0_1_12_features = f: updateFeatures f (rec {
+    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true);
+    nodrop_0_1_12.nodrop-union =
+      (f.nodrop_0_1_12.nodrop-union or false) ||
+      (f.nodrop_0_1_12.use_union or false) ||
+      (nodrop_0_1_12.use_union or false);
+    nodrop_0_1_12.std =
+      (f.nodrop_0_1_12.std or false) ||
+      (f.nodrop_0_1_12.default or false) ||
+      (nodrop_0_1_12.default or false);
+  }) [];
+  num_0_1_42 = { features?(num_0_1_42_features {}) }: num_0_1_42_ {
+    dependencies = mapFeatures features ([ num_integer_0_1_39 num_iter_0_1_37 num_traits_0_2_5 ]);
+    features = mkFeatures (features.num_0_1_42 or {});
+  };
+  num_0_1_42_features = f: updateFeatures f (rec {
+    num_0_1_42.bigint =
+      (f.num_0_1_42.bigint or false) ||
+      (f.num_0_1_42.default or false) ||
+      (num_0_1_42.default or false);
+    num_0_1_42.complex =
+      (f.num_0_1_42.complex or false) ||
+      (f.num_0_1_42.default or false) ||
+      (num_0_1_42.default or false);
+    num_0_1_42.default = (f.num_0_1_42.default or true);
+    num_0_1_42.num-bigint =
+      (f.num_0_1_42.num-bigint or false) ||
+      (f.num_0_1_42.bigint or false) ||
+      (num_0_1_42.bigint or false);
+    num_0_1_42.num-complex =
+      (f.num_0_1_42.num-complex or false) ||
+      (f.num_0_1_42.complex or false) ||
+      (num_0_1_42.complex or false);
+    num_0_1_42.num-rational =
+      (f.num_0_1_42.num-rational or false) ||
+      (f.num_0_1_42.rational or false) ||
+      (num_0_1_42.rational or false);
+    num_0_1_42.rational =
+      (f.num_0_1_42.rational or false) ||
+      (f.num_0_1_42.default or false) ||
+      (num_0_1_42.default or false);
+    num_0_1_42.rustc-serialize =
+      (f.num_0_1_42.rustc-serialize or false) ||
+      (f.num_0_1_42.default or false) ||
+      (num_0_1_42.default or false);
+    num_integer_0_1_39.default = true;
+    num_iter_0_1_37.default = true;
+    num_traits_0_2_5.default = true;
+  }) [ num_integer_0_1_39_features num_iter_0_1_37_features num_traits_0_2_5_features ];
+  num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ {
+    dependencies = mapFeatures features ([ num_traits_0_2_5 ]);
+    features = mkFeatures (features.num_integer_0_1_39 or {});
+  };
+  num_integer_0_1_39_features = f: updateFeatures f (rec {
+    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true);
+    num_integer_0_1_39.std =
+      (f.num_integer_0_1_39.std or false) ||
+      (f.num_integer_0_1_39.default or false) ||
+      (num_integer_0_1_39.default or false);
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
+    num_traits_0_2_5.i128 =
+      (f.num_traits_0_2_5.i128 or false) ||
+      (num_integer_0_1_39.i128 or false) ||
+      (f.num_integer_0_1_39.i128 or false);
+    num_traits_0_2_5.std =
+      (f.num_traits_0_2_5.std or false) ||
+      (num_integer_0_1_39.std or false) ||
+      (f.num_integer_0_1_39.std or false);
+  }) [ num_traits_0_2_5_features ];
+  num_iter_0_1_37 = { features?(num_iter_0_1_37_features {}) }: num_iter_0_1_37_ {
+    dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ]);
+    features = mkFeatures (features.num_iter_0_1_37 or {});
+  };
+  num_iter_0_1_37_features = f: updateFeatures f (rec {
+    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false);
+    num_integer_0_1_39.i128 =
+      (f.num_integer_0_1_39.i128 or false) ||
+      (num_iter_0_1_37.i128 or false) ||
+      (f.num_iter_0_1_37.i128 or false);
+    num_integer_0_1_39.std =
+      (f.num_integer_0_1_39.std or false) ||
+      (num_iter_0_1_37.std or false) ||
+      (f.num_iter_0_1_37.std or false);
+    num_iter_0_1_37.default = (f.num_iter_0_1_37.default or true);
+    num_iter_0_1_37.std =
+      (f.num_iter_0_1_37.std or false) ||
+      (f.num_iter_0_1_37.default or false) ||
+      (num_iter_0_1_37.default or false);
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
+    num_traits_0_2_5.i128 =
+      (f.num_traits_0_2_5.i128 or false) ||
+      (num_iter_0_1_37.i128 or false) ||
+      (f.num_iter_0_1_37.i128 or false);
+    num_traits_0_2_5.std =
+      (f.num_traits_0_2_5.std or false) ||
+      (num_iter_0_1_37.std or false) ||
+      (f.num_iter_0_1_37.std or false);
+  }) [ num_integer_0_1_39_features num_traits_0_2_5_features ];
+  num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ {
+    features = mkFeatures (features.num_traits_0_2_5 or {});
+  };
+  num_traits_0_2_5_features = f: updateFeatures f (rec {
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true);
+    num_traits_0_2_5.std =
+      (f.num_traits_0_2_5.std or false) ||
+      (f.num_traits_0_2_5.default or false) ||
+      (num_traits_0_2_5.default or false);
+  }) [];
+  num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+  };
+  num_cpus_1_8_0_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true);
+  }) [ libc_0_2_42_features ];
+  openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ {
+    dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]);
+    features = mkFeatures (features.openssl_0_9_24 or {});
+  };
+  openssl_0_9_24_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = true;
+    foreign_types_0_3_2.default = true;
+    lazy_static_1_0_2.default = true;
+    libc_0_2_42.default = true;
+    openssl_0_9_24.default = (f.openssl_0_9_24.default or true);
+    openssl_sys_0_9_33.default = true;
+  }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ];
+  openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ])
+      ++ (if abi == "msvc" then mapFeatures features ([]) else []);
+    buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]);
+  };
+  openssl_sys_0_9_33_features = f: updateFeatures f (rec {
+    cc_1_0_18.default = true;
+    libc_0_2_42.default = true;
+    openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true);
+    pkg_config_0_3_12.default = true;
+  }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ];
+  percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
+  percent_encoding_1_0_1_features = f: updateFeatures f (rec {
+    percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
+  }) [];
+  phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_shared_0_7_22 ]);
+    features = mkFeatures (features.phf_0_7_22 or {});
+  };
+  phf_0_7_22_features = f: updateFeatures f (rec {
+    phf_0_7_22.default = (f.phf_0_7_22.default or true);
+    phf_shared_0_7_22.core =
+      (f.phf_shared_0_7_22.core or false) ||
+      (phf_0_7_22.core or false) ||
+      (f.phf_0_7_22.core or false);
+    phf_shared_0_7_22.default = true;
+    phf_shared_0_7_22.unicase =
+      (f.phf_shared_0_7_22.unicase or false) ||
+      (phf_0_7_22.unicase or false) ||
+      (f.phf_0_7_22.unicase or false);
+  }) [ phf_shared_0_7_22_features ];
+  phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]);
+  };
+  phf_codegen_0_7_22_features = f: updateFeatures f (rec {
+    phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true);
+    phf_generator_0_7_22.default = true;
+    phf_shared_0_7_22.default = true;
+  }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ];
+  phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]);
+  };
+  phf_generator_0_7_22_features = f: updateFeatures f (rec {
+    phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true);
+    phf_shared_0_7_22.default = true;
+    rand_0_4_2.default = true;
+  }) [ phf_shared_0_7_22_features rand_0_4_2_features ];
+  phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ {
+    dependencies = mapFeatures features ([ siphasher_0_2_2 ]
+      ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else []));
+    features = mkFeatures (features.phf_shared_0_7_22 or {});
+  };
+  phf_shared_0_7_22_features = f: updateFeatures f (rec {
+    phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true);
+    siphasher_0_2_2.default = true;
+    unicase_1_4_2.default = true;
+  }) [ siphasher_0_2_2_features unicase_1_4_2_features ];
+  pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {};
+  pkg_config_0_3_12_features = f: updateFeatures f (rec {
+    pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true);
+  }) [];
+  quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
+  quote_0_3_15_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = (f.quote_0_3_15.default or true);
+  }) [];
+  rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 rand_0_4_2 ])
+      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []);
+    features = mkFeatures (features.rand_0_3_22 or {});
+  };
+  rand_0_3_22_features = f: updateFeatures f (rec {
+    fuchsia_zircon_0_3_3.default = true;
+    libc_0_2_42.default = true;
+    rand_0_3_22.default = (f.rand_0_3_22.default or true);
+    rand_0_3_22.i128_support =
+      (f.rand_0_3_22.i128_support or false) ||
+      (f.rand_0_3_22.nightly or false) ||
+      (rand_0_3_22.nightly or false);
+    rand_0_4_2.default = true;
+  }) [ libc_0_2_42_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ];
+  rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
+    dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
+      ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+    features = mkFeatures (features.rand_0_4_2 or {});
+  };
+  rand_0_4_2_features = f: updateFeatures f (rec {
+    fuchsia_zircon_0_3_3.default = true;
+    libc_0_2_42.default = true;
+    rand_0_4_2.default = (f.rand_0_4_2.default or true);
+    rand_0_4_2.i128_support =
+      (f.rand_0_4_2.i128_support or false) ||
+      (f.rand_0_4_2.nightly or false) ||
+      (rand_0_4_2.nightly or false);
+    rand_0_4_2.libc =
+      (f.rand_0_4_2.libc or false) ||
+      (f.rand_0_4_2.std or false) ||
+      (rand_0_4_2.std or false);
+    rand_0_4_2.std =
+      (f.rand_0_4_2.std or false) ||
+      (f.rand_0_4_2.default or false) ||
+      (rand_0_4_2.default or false);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.ntsecapi = true;
+    winapi_0_3_5.profileapi = true;
+    winapi_0_3_5.winnt = true;
+  }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ];
+  redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {};
+  redox_syscall_0_1_40_features = f: updateFeatures f (rec {
+    redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true);
+  }) [];
+  redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
+    dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]);
+  };
+  redox_termios_0_1_1_features = f: updateFeatures f (rec {
+    redox_syscall_0_1_40.default = true;
+    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
+  }) [ redox_syscall_0_1_40_features ];
+  regex_0_1_80 = { features?(regex_0_1_80_features {}) }: regex_0_1_80_ {
+    dependencies = mapFeatures features ([ aho_corasick_0_5_3 memchr_0_1_11 regex_syntax_0_3_9 thread_local_0_2_7 utf8_ranges_0_1_3 ]);
+    features = mkFeatures (features.regex_0_1_80 or {});
+  };
+  regex_0_1_80_features = f: updateFeatures f (rec {
+    aho_corasick_0_5_3.default = true;
+    memchr_0_1_11.default = true;
+    regex_0_1_80.default = (f.regex_0_1_80.default or true);
+    regex_0_1_80.simd =
+      (f.regex_0_1_80.simd or false) ||
+      (f.regex_0_1_80.simd-accel or false) ||
+      (regex_0_1_80.simd-accel or false);
+    regex_syntax_0_3_9.default = true;
+    thread_local_0_2_7.default = true;
+    utf8_ranges_0_1_3.default = true;
+  }) [ aho_corasick_0_5_3_features memchr_0_1_11_features regex_syntax_0_3_9_features thread_local_0_2_7_features utf8_ranges_0_1_3_features ];
+  regex_syntax_0_3_9 = { features?(regex_syntax_0_3_9_features {}) }: regex_syntax_0_3_9_ {};
+  regex_syntax_0_3_9_features = f: updateFeatures f (rec {
+    regex_syntax_0_3_9.default = (f.regex_syntax_0_3_9.default or true);
+  }) [];
+  relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+  };
+  relay_0_1_1_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    relay_0_1_1.default = (f.relay_0_1_1.default or true);
+  }) [ futures_0_1_23_features ];
+  remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ {
+    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  remove_dir_all_0_5_1_features = f: updateFeatures f (rec {
+    remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.errhandlingapi = true;
+    winapi_0_3_5.fileapi = true;
+    winapi_0_3_5.std = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.winerror = true;
+  }) [ winapi_0_3_5_features ];
+  reqwest_0_8_6 = { features?(reqwest_0_8_6_features {}) }: reqwest_0_8_6_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_3 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]);
+    features = mkFeatures (features.reqwest_0_8_6 or {});
+  };
+  reqwest_0_8_6_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    encoding_rs_0_7_2.default = true;
+    futures_0_1_23.default = true;
+    hyper_0_11_27.default = true;
+    hyper_tls_0_1_3.default = true;
+    libflate_0_1_16.default = true;
+    log_0_4_3.default = true;
+    mime_guess_2_0_0_alpha_6.default = true;
+    native_tls_0_1_5.default = true;
+    reqwest_0_8_6.default = (f.reqwest_0_8_6.default or true);
+    serde_1_0_70.default = true;
+    serde_json_1_0_24.default = true;
+    serde_urlencoded_0_5_2.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_tls_0_1_4.default = true;
+    url_1_7_1.default = true;
+    uuid_0_6_5.default = true;
+    uuid_0_6_5.v4 = true;
+  }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_3_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ];
+  safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {};
+  safemem_0_2_0_features = f: updateFeatures f (rec {
+    safemem_0_2_0.default = (f.safemem_0_2_0.default or true);
+  }) [];
+  schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]);
+  };
+  schannel_0_1_13_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = true;
+    schannel_0_1_13.default = (f.schannel_0_1_13.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.lmcons = true;
+    winapi_0_3_5.minschannel = true;
+    winapi_0_3_5.schannel = true;
+    winapi_0_3_5.securitybaseapi = true;
+    winapi_0_3_5.sysinfoapi = true;
+    winapi_0_3_5.timezoneapi = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.wincrypt = true;
+    winapi_0_3_5.winerror = true;
+  }) [ lazy_static_1_0_2_features winapi_0_3_5_features ];
+  scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ {
+    features = mkFeatures (features.scoped_tls_0_1_2 or {});
+  };
+  scoped_tls_0_1_2_features = f: updateFeatures f (rec {
+    scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true);
+  }) [];
+  scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ {
+    features = mkFeatures (features.scopeguard_0_3_3 or {});
+  };
+  scopeguard_0_3_3_features = f: updateFeatures f (rec {
+    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true);
+    scopeguard_0_3_3.use_std =
+      (f.scopeguard_0_3_3.use_std or false) ||
+      (f.scopeguard_0_3_3.default or false) ||
+      (scopeguard_0_3_3.default or false);
+  }) [];
+  security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ {
+    dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]);
+    features = mkFeatures (features.security_framework_0_1_16 or {});
+  };
+  security_framework_0_1_16_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = true;
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+    security_framework_0_1_16.OSX_10_10 =
+      (f.security_framework_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_11 or false);
+    security_framework_0_1_16.OSX_10_11 =
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_0_1_16.OSX_10_12 or false) ||
+      (security_framework_0_1_16.OSX_10_12 or false);
+    security_framework_0_1_16.OSX_10_8 =
+      (f.security_framework_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_0_1_16.OSX_10_9 or false) ||
+      (security_framework_0_1_16.OSX_10_9 or false);
+    security_framework_0_1_16.OSX_10_9 =
+      (f.security_framework_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_0_1_16.OSX_10_10 or false) ||
+      (security_framework_0_1_16.OSX_10_10 or false);
+    security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true);
+    security_framework_sys_0_1_16.OSX_10_10 =
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (security_framework_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_0_1_16.OSX_10_10 or false);
+    security_framework_sys_0_1_16.OSX_10_11 =
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_12 or false) ||
+      (f.security_framework_0_1_16.OSX_10_12 or false);
+    security_framework_sys_0_1_16.OSX_10_8 =
+      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
+      (security_framework_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_0_1_16.OSX_10_8 or false);
+    security_framework_sys_0_1_16.OSX_10_9 =
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (security_framework_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_0_1_16.OSX_10_9 or false);
+    security_framework_sys_0_1_16.default = true;
+  }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ];
+  security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
+    features = mkFeatures (features.security_framework_sys_0_1_16 or {});
+  };
+  security_framework_sys_0_1_16_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+    security_framework_sys_0_1_16.OSX_10_10 =
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_11 or false);
+    security_framework_sys_0_1_16.OSX_10_11 =
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_12 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_12 or false);
+    security_framework_sys_0_1_16.OSX_10_8 =
+      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_9 or false);
+    security_framework_sys_0_1_16.OSX_10_9 =
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_10 or false);
+    security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true);
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
+  semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ {
+    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]);
+    features = mkFeatures (features.semver_0_9_0 or {});
+  };
+  semver_0_9_0_features = f: updateFeatures f (rec {
+    semver_0_9_0.default = (f.semver_0_9_0.default or true);
+    semver_0_9_0.serde =
+      (f.semver_0_9_0.serde or false) ||
+      (f.semver_0_9_0.ci or false) ||
+      (semver_0_9_0.ci or false);
+    semver_parser_0_7_0.default = true;
+  }) [ semver_parser_0_7_0_features ];
+  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
+  semver_parser_0_7_0_features = f: updateFeatures f (rec {
+    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
+  }) [];
+  serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.serde_1_0_70 or {});
+  };
+  serde_1_0_70_features = f: updateFeatures f (rec {
+    serde_1_0_70.default = (f.serde_1_0_70.default or true);
+    serde_1_0_70.serde_derive =
+      (f.serde_1_0_70.serde_derive or false) ||
+      (f.serde_1_0_70.derive or false) ||
+      (serde_1_0_70.derive or false);
+    serde_1_0_70.std =
+      (f.serde_1_0_70.std or false) ||
+      (f.serde_1_0_70.default or false) ||
+      (serde_1_0_70.default or false);
+    serde_1_0_70.unstable =
+      (f.serde_1_0_70.unstable or false) ||
+      (f.serde_1_0_70.alloc or false) ||
+      (serde_1_0_70.alloc or false);
+  }) [];
+  serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]);
+    features = mkFeatures (features.serde_json_1_0_24 or {});
+  };
+  serde_json_1_0_24_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = true;
+    itoa_0_4_2.default = true;
+    serde_1_0_70.default = true;
+    serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true);
+    serde_json_1_0_24.indexmap =
+      (f.serde_json_1_0_24.indexmap or false) ||
+      (f.serde_json_1_0_24.preserve_order or false) ||
+      (serde_json_1_0_24.preserve_order or false);
+  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ];
+  serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]);
+  };
+  serde_urlencoded_0_5_2_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = true;
+    itoa_0_4_2.default = true;
+    serde_1_0_70.default = true;
+    serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true);
+    url_1_7_1.default = true;
+  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ];
+  siphasher_0_2_2 = { features?(siphasher_0_2_2_features {}) }: siphasher_0_2_2_ {
+    dependencies = mapFeatures features ([]);
+  };
+  siphasher_0_2_2_features = f: updateFeatures f (rec {
+    siphasher_0_2_2.default = (f.siphasher_0_2_2.default or true);
+  }) [];
+  slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {};
+  slab_0_3_0_features = f: updateFeatures f (rec {
+    slab_0_3_0.default = (f.slab_0_3_0.default or true);
+  }) [];
+  slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {};
+  slab_0_4_0_features = f: updateFeatures f (rec {
+    slab_0_4_0.default = (f.slab_0_4_0.default or true);
+  }) [];
+  slog_1_7_1 = { features?(slog_1_7_1_features {}) }: slog_1_7_1_ {
+    features = mkFeatures (features.slog_1_7_1 or {});
+  };
+  slog_1_7_1_features = f: updateFeatures f (rec {
+    slog_1_7_1.default = (f.slog_1_7_1.default or true);
+    slog_1_7_1.std =
+      (f.slog_1_7_1.std or false) ||
+      (f.slog_1_7_1.default or false) ||
+      (slog_1_7_1.default or false);
+  }) [];
+  slog_envlogger_0_5_0 = { features?(slog_envlogger_0_5_0_features {}) }: slog_envlogger_0_5_0_ {
+    dependencies = mapFeatures features ([ log_0_3_9 regex_0_1_80 slog_1_7_1 slog_stdlog_1_1_0 slog_term_1_5_0 ]);
+  };
+  slog_envlogger_0_5_0_features = f: updateFeatures f (rec {
+    log_0_3_9.default = true;
+    regex_0_1_80.default = true;
+    slog_1_7_1.default = true;
+    slog_envlogger_0_5_0.default = (f.slog_envlogger_0_5_0.default or true);
+    slog_stdlog_1_1_0.default = true;
+    slog_term_1_5_0.default = true;
+  }) [ log_0_3_9_features regex_0_1_80_features slog_1_7_1_features slog_stdlog_1_1_0_features slog_term_1_5_0_features ];
+  slog_extra_0_1_2 = { features?(slog_extra_0_1_2_features {}) }: slog_extra_0_1_2_ {
+    dependencies = mapFeatures features ([ slog_1_7_1 thread_local_0_3_5 ]);
+  };
+  slog_extra_0_1_2_features = f: updateFeatures f (rec {
+    slog_1_7_1.default = true;
+    slog_extra_0_1_2.default = (f.slog_extra_0_1_2.default or true);
+    thread_local_0_3_5.default = true;
+  }) [ slog_1_7_1_features thread_local_0_3_5_features ];
+  slog_stdlog_1_1_0 = { features?(slog_stdlog_1_1_0_features {}) }: slog_stdlog_1_1_0_ {
+    dependencies = mapFeatures features ([ crossbeam_0_2_12 lazy_static_0_2_11 log_0_3_9 slog_1_7_1 slog_term_1_5_0 ]);
+  };
+  slog_stdlog_1_1_0_features = f: updateFeatures f (rec {
+    crossbeam_0_2_12.default = true;
+    lazy_static_0_2_11.default = true;
+    log_0_3_9.default = true;
+    slog_1_7_1.default = true;
+    slog_stdlog_1_1_0.default = (f.slog_stdlog_1_1_0.default or true);
+    slog_term_1_5_0.default = true;
+  }) [ crossbeam_0_2_12_features lazy_static_0_2_11_features log_0_3_9_features slog_1_7_1_features slog_term_1_5_0_features ];
+  slog_stream_1_2_1 = { features?(slog_stream_1_2_1_features {}) }: slog_stream_1_2_1_ {
+    dependencies = mapFeatures features ([ slog_1_7_1 slog_extra_0_1_2 thread_local_0_3_5 ]);
+  };
+  slog_stream_1_2_1_features = f: updateFeatures f (rec {
+    slog_1_7_1.default = true;
+    slog_extra_0_1_2.default = true;
+    slog_stream_1_2_1.default = (f.slog_stream_1_2_1.default or true);
+    thread_local_0_3_5.default = true;
+  }) [ slog_1_7_1_features slog_extra_0_1_2_features thread_local_0_3_5_features ];
+  slog_term_1_5_0 = { features?(slog_term_1_5_0_features {}) }: slog_term_1_5_0_ {
+    dependencies = mapFeatures features ([ chrono_0_2_25 isatty_0_1_8 slog_1_7_1 slog_stream_1_2_1 thread_local_0_3_5 ]);
+  };
+  slog_term_1_5_0_features = f: updateFeatures f (rec {
+    chrono_0_2_25.default = true;
+    isatty_0_1_8.default = true;
+    slog_1_7_1.default = true;
+    slog_stream_1_2_1.default = true;
+    slog_term_1_5_0.default = (f.slog_term_1_5_0.default or true);
+    thread_local_0_3_5.default = true;
+  }) [ chrono_0_2_25_features isatty_0_1_8_features slog_1_7_1_features slog_stream_1_2_1_features thread_local_0_3_5_features ];
+  smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {};
+  smallvec_0_2_1_features = f: updateFeatures f (rec {
+    smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true);
+  }) [];
+  strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
+  strsim_0_7_0_features = f: updateFeatures f (rec {
+    strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
+  }) [];
+  syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
+      ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
+      ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
+    features = mkFeatures (features.syn_0_11_11 or {});
+  };
+  syn_0_11_11_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = (f.syn_0_11_11.default or true);
+    syn_0_11_11.parsing =
+      (f.syn_0_11_11.parsing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.printing =
+      (f.syn_0_11_11.printing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.quote =
+      (f.syn_0_11_11.quote or false) ||
+      (f.syn_0_11_11.printing or false) ||
+      (syn_0_11_11.printing or false);
+    syn_0_11_11.synom =
+      (f.syn_0_11_11.synom or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    syn_0_11_11.unicode-xid =
+      (f.syn_0_11_11.unicode-xid or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    synom_0_11_3.default = true;
+    unicode_xid_0_0_4.default = true;
+  }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
+  synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
+    dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
+  };
+  synom_0_11_3_features = f: updateFeatures f (rec {
+    synom_0_11_3.default = (f.synom_0_11_3.default or true);
+    unicode_xid_0_0_4.default = true;
+  }) [ unicode_xid_0_0_4_features ];
+  take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {};
+  take_0_1_0_features = f: updateFeatures f (rec {
+    take_0_1_0.default = (f.take_0_1_0.default or true);
+  }) [];
+  tar_0_4_16 = { features?(tar_0_4_16_features {}) }: tar_0_4_16_ {
+    dependencies = mapFeatures features ([ filetime_0_2_1 ])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]
+      ++ (if features.tar_0_4_16.xattr or false then [ xattr_0_2_2 ] else [])) else []);
+    features = mkFeatures (features.tar_0_4_16 or {});
+  };
+  tar_0_4_16_features = f: updateFeatures f (rec {
+    filetime_0_2_1.default = true;
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    tar_0_4_16.default = (f.tar_0_4_16.default or true);
+    tar_0_4_16.xattr =
+      (f.tar_0_4_16.xattr or false) ||
+      (f.tar_0_4_16.default or false) ||
+      (tar_0_4_16.default or false);
+    xattr_0_2_2.default = true;
+  }) [ filetime_0_2_1_features redox_syscall_0_1_40_features libc_0_2_42_features xattr_0_2_2_features ];
+  tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
+    dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]);
+  };
+  tempdir_0_3_7_features = f: updateFeatures f (rec {
+    rand_0_4_2.default = true;
+    remove_dir_all_0_5_1.default = true;
+    tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
+  }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ];
+  termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
+    dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []);
+  };
+  termion_1_5_1_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    redox_termios_0_1_1.default = true;
+    termion_1_5_1.default = (f.termion_1_5_1.default or true);
+  }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ];
+  textwrap_0_10_0 = { features?(textwrap_0_10_0_features {}) }: textwrap_0_10_0_ {
+    dependencies = mapFeatures features ([ unicode_width_0_1_5 ]);
+  };
+  textwrap_0_10_0_features = f: updateFeatures f (rec {
+    textwrap_0_10_0.default = (f.textwrap_0_10_0.default or true);
+    unicode_width_0_1_5.default = true;
+  }) [ unicode_width_0_1_5_features ];
+  thread_id_2_0_0 = { features?(thread_id_2_0_0_features {}) }: thread_id_2_0_0_ {
+    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 libc_0_2_42 ]);
+  };
+  thread_id_2_0_0_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = true;
+    libc_0_2_42.default = true;
+    thread_id_2_0_0.default = (f.thread_id_2_0_0.default or true);
+  }) [ kernel32_sys_0_2_2_features libc_0_2_42_features ];
+  thread_local_0_2_7 = { features?(thread_local_0_2_7_features {}) }: thread_local_0_2_7_ {
+    dependencies = mapFeatures features ([ thread_id_2_0_0 ]);
+  };
+  thread_local_0_2_7_features = f: updateFeatures f (rec {
+    thread_id_2_0_0.default = true;
+    thread_local_0_2_7.default = (f.thread_local_0_2_7.default or true);
+  }) [ thread_id_2_0_0_features ];
+  thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 unreachable_1_0_0 ]);
+  };
+  thread_local_0_3_5_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = true;
+    thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
+    unreachable_1_0_0.default = true;
+  }) [ lazy_static_1_0_2_features unreachable_1_0_0_features ];
+  time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  time_0_1_40_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    time_0_1_40.default = (f.time_0_1_40.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwinbase = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.ntdef = true;
+    winapi_0_3_5.profileapi = true;
+    winapi_0_3_5.std = true;
+    winapi_0_3_5.sysinfoapi = true;
+    winapi_0_3_5.timezoneapi = true;
+  }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ];
+  tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]);
+  };
+  tokio_0_1_7_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    mio_0_6_15.default = true;
+    tokio_0_1_7.default = (f.tokio_0_1_7.default or true);
+    tokio_executor_0_1_2.default = true;
+    tokio_fs_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_tcp_0_1_0.default = true;
+    tokio_threadpool_0_1_5.default = true;
+    tokio_timer_0_2_4.default = true;
+    tokio_udp_0_1_1.default = true;
+  }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ];
+  tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]);
+  };
+  tokio_codec_0_1_0_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true);
+    tokio_io_0_1_7.default = true;
+  }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ];
+  tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]);
+  };
+  tokio_core_0_1_17_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    iovec_0_1_2.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    scoped_tls_0_1_2.default = true;
+    tokio_0_1_7.default = true;
+    tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true);
+    tokio_executor_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_timer_0_2_4.default = true;
+  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ];
+  tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+    features = mkFeatures (features.tokio_executor_0_1_2 or {});
+  };
+  tokio_executor_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true);
+    tokio_executor_0_1_2.futures2 =
+      (f.tokio_executor_0_1_2.futures2 or false) ||
+      (f.tokio_executor_0_1_2.unstable-futures or false) ||
+      (tokio_executor_0_1_2.unstable-futures or false);
+  }) [ futures_0_1_23_features ];
+  tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]);
+  };
+  tokio_fs_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true);
+    tokio_io_0_1_7.default = true;
+    tokio_threadpool_0_1_5.default = true;
+  }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ];
+  tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]);
+  };
+  tokio_io_0_1_7_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true);
+  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ];
+  tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 log_0_3_9 net2_0_2_33 rand_0_3_22 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 ]);
+  };
+  tokio_proto_0_1_1_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    log_0_3_9.default = true;
+    net2_0_2_33.default = true;
+    rand_0_3_22.default = true;
+    slab_0_3_0.default = true;
+    smallvec_0_2_1.default = true;
+    take_0_1_0.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true);
+    tokio_service_0_1_0.default = true;
+  }) [ futures_0_1_23_features log_0_3_9_features net2_0_2_33_features rand_0_3_22_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features ];
+  tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]);
+  };
+  tokio_reactor_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    slab_0_4_0.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true);
+  }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ];
+  tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+  };
+  tokio_service_0_1_0_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true);
+  }) [ futures_0_1_23_features ];
+  tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
+    features = mkFeatures (features.tokio_tcp_0_1_0 or {});
+  };
+  tokio_tcp_0_1_0_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    iovec_0_1_2.default = true;
+    mio_0_6_15.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true);
+    tokio_tcp_0_1_0.futures2 =
+      (f.tokio_tcp_0_1_0.futures2 or false) ||
+      (f.tokio_tcp_0_1_0.unstable-futures or false) ||
+      (tokio_tcp_0_1_0.unstable-futures or false);
+  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
+  tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ {
+    dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]);
+  };
+  tokio_threadpool_0_1_5_features = f: updateFeatures f (rec {
+    crossbeam_deque_0_3_1.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    num_cpus_1_8_0.default = true;
+    rand_0_4_2.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true);
+  }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ];
+  tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]);
+  };
+  tokio_timer_0_2_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true);
+  }) [ futures_0_1_23_features tokio_executor_0_1_2_features ];
+  tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ])
+      ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else [])
+      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([]) else []);
+  };
+  tokio_tls_0_1_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    native_tls_0_1_5.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true);
+  }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ];
+  tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
+  };
+  tokio_udp_0_1_1_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    tokio_codec_0_1_0.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true);
+  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
+  try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {};
+  try_lock_0_1_0_features = f: updateFeatures f (rec {
+    try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true);
+  }) [];
+  unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ {
+    dependencies = mapFeatures features ([]);
+    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
+    features = mkFeatures (features.unicase_1_4_2 or {});
+  };
+  unicase_1_4_2_features = f: updateFeatures f (rec {
+    unicase_1_4_2.default = (f.unicase_1_4_2.default or true);
+    unicase_1_4_2.heapsize =
+      (f.unicase_1_4_2.heapsize or false) ||
+      (f.unicase_1_4_2.heap_size or false) ||
+      (unicase_1_4_2.heap_size or false);
+    unicase_1_4_2.heapsize_plugin =
+      (f.unicase_1_4_2.heapsize_plugin or false) ||
+      (f.unicase_1_4_2.heap_size or false) ||
+      (unicase_1_4_2.heap_size or false);
+    version_check_0_1_4.default = true;
+  }) [ version_check_0_1_4_features ];
+  unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ {
+    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
+    features = mkFeatures (features.unicase_2_1_0 or {});
+  };
+  unicase_2_1_0_features = f: updateFeatures f (rec {
+    unicase_2_1_0.default = (f.unicase_2_1_0.default or true);
+    version_check_0_1_4.default = true;
+  }) [ version_check_0_1_4_features ];
+  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
+    dependencies = mapFeatures features ([ matches_0_1_7 ]);
+    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
+  };
+  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
+    matches_0_1_7.default = true;
+    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
+    unicode_bidi_0_3_4.flame =
+      (f.unicode_bidi_0_3_4.flame or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.flamer =
+      (f.unicode_bidi_0_3_4.flamer or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.serde =
+      (f.unicode_bidi_0_3_4.serde or false) ||
+      (f.unicode_bidi_0_3_4.with_serde or false) ||
+      (unicode_bidi_0_3_4.with_serde or false);
+  }) [ matches_0_1_7_features ];
+  unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
+  unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
+    unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
+  }) [];
+  unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ {
+    features = mkFeatures (features.unicode_width_0_1_5 or {});
+  };
+  unicode_width_0_1_5_features = f: updateFeatures f (rec {
+    unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true);
+  }) [];
+  unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
+    features = mkFeatures (features.unicode_xid_0_0_4 or {});
+  };
+  unicode_xid_0_0_4_features = f: updateFeatures f (rec {
+    unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
+  }) [];
+  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
+    dependencies = mapFeatures features ([ void_1_0_2 ]);
+  };
+  unreachable_1_0_0_features = f: updateFeatures f (rec {
+    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
+    void_1_0_2.default = (f.void_1_0_2.default or false);
+  }) [ void_1_0_2_features ];
+  url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ {
+    dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]);
+    features = mkFeatures (features.url_1_7_1 or {});
+  };
+  url_1_7_1_features = f: updateFeatures f (rec {
+    idna_0_1_5.default = true;
+    matches_0_1_7.default = true;
+    percent_encoding_1_0_1.default = true;
+    url_1_7_1.default = (f.url_1_7_1.default or true);
+    url_1_7_1.encoding =
+      (f.url_1_7_1.encoding or false) ||
+      (f.url_1_7_1.query_encoding or false) ||
+      (url_1_7_1.query_encoding or false);
+    url_1_7_1.heapsize =
+      (f.url_1_7_1.heapsize or false) ||
+      (f.url_1_7_1.heap_size or false) ||
+      (url_1_7_1.heap_size or false);
+  }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ];
+  utf8_ranges_0_1_3 = { features?(utf8_ranges_0_1_3_features {}) }: utf8_ranges_0_1_3_ {};
+  utf8_ranges_0_1_3_features = f: updateFeatures f (rec {
+    utf8_ranges_0_1_3.default = (f.utf8_ranges_0_1_3.default or true);
+  }) [];
+  uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]
+      ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else []));
+    features = mkFeatures (features.uuid_0_6_5 or {});
+  };
+  uuid_0_6_5_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    rand_0_4_2.default = true;
+    uuid_0_6_5.byteorder =
+      (f.uuid_0_6_5.byteorder or false) ||
+      (f.uuid_0_6_5.u128 or false) ||
+      (uuid_0_6_5.u128 or false);
+    uuid_0_6_5.default = (f.uuid_0_6_5.default or true);
+    uuid_0_6_5.md5 =
+      (f.uuid_0_6_5.md5 or false) ||
+      (f.uuid_0_6_5.v3 or false) ||
+      (uuid_0_6_5.v3 or false);
+    uuid_0_6_5.nightly =
+      (f.uuid_0_6_5.nightly or false) ||
+      (f.uuid_0_6_5.const_fn or false) ||
+      (uuid_0_6_5.const_fn or false);
+    uuid_0_6_5.rand =
+      (f.uuid_0_6_5.rand or false) ||
+      (f.uuid_0_6_5.v3 or false) ||
+      (uuid_0_6_5.v3 or false) ||
+      (f.uuid_0_6_5.v4 or false) ||
+      (uuid_0_6_5.v4 or false) ||
+      (f.uuid_0_6_5.v5 or false) ||
+      (uuid_0_6_5.v5 or false);
+    uuid_0_6_5.sha1 =
+      (f.uuid_0_6_5.sha1 or false) ||
+      (f.uuid_0_6_5.v5 or false) ||
+      (uuid_0_6_5.v5 or false);
+    uuid_0_6_5.std =
+      (f.uuid_0_6_5.std or false) ||
+      (f.uuid_0_6_5.default or false) ||
+      (uuid_0_6_5.default or false) ||
+      (f.uuid_0_6_5.use_std or false) ||
+      (uuid_0_6_5.use_std or false);
+  }) [ cfg_if_0_1_4_features rand_0_4_2_features ];
+  vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {};
+  vcpkg_0_2_4_features = f: updateFeatures f (rec {
+    vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true);
+  }) [];
+  vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.vec_map_0_8_1 or {});
+  };
+  vec_map_0_8_1_features = f: updateFeatures f (rec {
+    vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true);
+    vec_map_0_8_1.serde =
+      (f.vec_map_0_8_1.serde or false) ||
+      (f.vec_map_0_8_1.eders or false) ||
+      (vec_map_0_8_1.eders or false);
+  }) [];
+  version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {};
+  version_check_0_1_4_features = f: updateFeatures f (rec {
+    version_check_0_1_4.default = (f.version_check_0_1_4.default or true);
+  }) [];
+  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
+    features = mkFeatures (features.void_1_0_2 or {});
+  };
+  void_1_0_2_features = f: updateFeatures f (rec {
+    void_1_0_2.default = (f.void_1_0_2.default or true);
+    void_1_0_2.std =
+      (f.void_1_0_2.std or false) ||
+      (f.void_1_0_2.default or false) ||
+      (void_1_0_2.default or false);
+  }) [];
+  want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]);
+  };
+  want_0_0_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    try_lock_0_1_0.default = true;
+    want_0_0_4.default = (f.want_0_0_4.default or true);
+  }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ];
+  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
+  winapi_0_2_8_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
+  }) [];
+  winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ {
+    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
+      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
+    features = mkFeatures (features.winapi_0_3_5 or {});
+  };
+  winapi_0_3_5_features = f: updateFeatures f (rec {
+    winapi_0_3_5.default = (f.winapi_0_3_5.default or true);
+    winapi_i686_pc_windows_gnu_0_4_0.default = true;
+    winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
+  }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
+  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
+  winapi_build_0_1_1_features = f: updateFeatures f (rec {
+    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
+  }) [];
+  winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
+  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+    winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
+  }) [];
+  winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
+  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+    winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
+  }) [];
+  ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  ws2_32_sys_0_2_1_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+    ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true);
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  xattr_0_2_2 = { features?(xattr_0_2_2_features {}) }: xattr_0_2_2_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+    features = mkFeatures (features.xattr_0_2_2 or {});
+  };
+  xattr_0_2_2_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    xattr_0_2_2.default = (f.xattr_0_2_2.default or true);
+    xattr_0_2_2.unsupported =
+      (f.xattr_0_2_2.unsupported or false) ||
+      (f.xattr_0_2_2.default or false) ||
+      (xattr_0_2_2.default or false);
+  }) [ libc_0_2_42_features ];
+}
diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/tools/package-management/cargo-download/default.nix
new file mode 100644
index 000000000000..3459f1db553c
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-download/default.nix
@@ -0,0 +1,5 @@
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+
+((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_download {}).override {
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae8b67081225..c80920932dd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7099,6 +7099,7 @@ with pkgs;
       };
     });
 
+  cargo-download = callPackage ../tools/package-management/cargo-download { };
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
   cargo-release = callPackage ../tools/package-management/cargo-release { };
   cargo-tree = callPackage ../tools/package-management/cargo-tree { };

From 2d1ecc482d12fb55b9fbfbe60c8140695191496e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 11 Aug 2018 22:13:14 -0400
Subject: [PATCH 0044/3253] lightdm-enso-os-greeter: init at 0.2.1

---
 .../lightdm-greeters/enso-os.nix              | 159 ++++++++++++++++++
 .../services/x11/display-managers/lightdm.nix |   1 +
 .../lightdm-enso-os-greeter/default.nix       |  71 ++++++++
 pkgs/top-level/all-packages.nix               |   5 +
 4 files changed, 236 insertions(+)
 create mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
 create mode 100644 pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
new file mode 100644
index 000000000000..7c794b1ba175
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix
@@ -0,0 +1,159 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  dmcfg = config.services.xserver.displayManager;
+  ldmcfg = dmcfg.lightdm;
+  cfg = ldmcfg.greeters.enso;
+
+  theme = cfg.theme.package;
+  icons = cfg.iconTheme.package;
+  cursors = cfg.cursorTheme.package;
+
+  # We need a few things in the environment for the greeter to run with
+  # fonts/icons.
+  wrappedEnsoGreeter = pkgs.runCommand "lightdm-enso-os-greeter"
+    { buildInputs = [ pkgs.makeWrapper ]; }
+    ''
+      # This wrapper ensures that we actually get themes
+      makeWrapper ${pkgs.lightdm-enso-os-greeter}/bin/pantheon-greeter \
+        $out/greeter \
+        --prefix PATH : "${pkgs.glibc.bin}/bin" \
+        --set GDK_PIXBUF_MODULE_FILE "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
+        --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
+        --set GTK_EXE_PREFIX "${theme}" \
+        --set GTK_DATA_PREFIX "${theme}" \
+        --set XDG_DATA_DIRS "${theme}/share:${icons}/share:${cursors}/share" \
+        --set XDG_CONFIG_HOME "${theme}/share"
+
+      cat - > $out/lightdm-enso-os-greeter.desktop << EOF
+      [Desktop Entry]
+      Name=LightDM Greeter
+      Comment=This runs the LightDM Greeter
+      Exec=$out/greeter
+      Type=Application
+      EOF
+    '';
+
+  ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" ''
+    [greeter]
+    default-wallpaper=${ldmcfg.background}
+    gtk-theme=${cfg.theme.name}
+    icon-theme=${cfg.iconTheme.name}
+    cursor-theme=${cfg.cursorTheme.name}
+    blur=${toString cfg.blur}
+    brightness=${toString cfg.brightness}
+    ${cfg.extraConfig}
+  '';
+in {
+  options = {
+    services.xserver.displayManager.lightdm.greeters.enso = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable enso-os-greeter as the lightdm greeter
+        '';
+      };
+
+      theme = {
+        package = mkOption {
+          type = types.package;
+          default = pkgs.gnome3.gnome-themes-extra;
+          defaultText = "pkgs.gnome3.gnome-themes-extra";
+          description = ''
+            The package path that contains the theme given in the name option.
+          '';
+        };
+
+        name = mkOption {
+          type = types.str;
+          default = "Adwaita";
+          description = ''
+            Name of the theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      iconTheme = {
+        package = mkOption {
+          type = types.package;
+          default = pkgs.papirus-icon-theme;
+          defaultText = "pkgs.papirus-icon-theme";
+          description = ''
+            The package path that contains the icon theme given in the name option.
+          '';
+        };
+
+        name = mkOption {
+          type = types.str;
+          default = "ePapirus";
+          description = ''
+            Name of the icon theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      cursorTheme = {
+        package = mkOption {
+          type = types.package;
+          default = pkgs.capitaine-cursors;
+          defaultText = "pkgs.capitaine-cursors";
+          description = ''
+            The package path that contains the cursor theme given in the name option.
+          '';
+        };
+
+        name = mkOption {
+          type = types.str;
+          default = "capitane-cursors";
+          description = ''
+            Name of the cursor theme to use for the lightdm-enso-os-greeter
+          '';
+        };
+      };
+
+      blur = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether or not to enable blur
+        '';
+      };
+
+      brightness = mkOption {
+        type = types.int;
+        default = 7;
+        description = ''
+          Brightness
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the greeter.conf
+          configuration file
+        '';
+      };
+    };
+  };
+
+  config = mkIf (ldmcfg.enable && cfg.enable) {
+    environment.etc."lightdm/greeter.conf".source = ensoGreeterConf;
+
+    services.xserver.displayManager.lightdm = {
+      greeter = mkDefault {
+        package = wrappedEnsoGreeter;
+        name = "lightdm-enso-os-greeter";
+      };
+
+      greeters = {
+        gtk = {
+          enable = mkDefault false;
+        };
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 6be15d8cdf46..57a92e697015 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -73,6 +73,7 @@ in
   imports = [
     ./lightdm-greeters/gtk.nix
     ./lightdm-greeters/mini.nix
+    ./lightdm-greeters/enso-os.nix
   ];
 
   options = {
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
new file mode 100644
index 000000000000..38270a25c9c9
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchgit, pkgconfig
+, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
+, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.1";
+  name = "lightdm-enso-os-greeter-${version}";
+
+  src = fetchgit {
+    url = https://github.com/nick92/Enso-OS;
+    rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427";
+    sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz";
+  };
+
+  buildInputs = [
+    dbus
+    gtk3
+    pcre
+    vala
+    cmake
+    epoxy
+    libgee
+    libX11
+    lightdm
+    libXdmcp
+    gdk_pixbuf
+    clutter-gtk
+    libxklavier
+    at-spi2-core
+    libxkbcommon
+    libpthreadstubs
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  postPatch = ''
+    sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt
+  '';
+
+  preConfigure = ''
+    cd greeter
+  '';
+
+  installFlags = [
+    "DESTDIR=$(out)"
+  ];
+
+  preFixup = ''
+    mv $out/usr/* $out
+    rm -r $out/usr
+  '';
+
+  postFixup = ''
+    rm -r $out/sbin
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      A fork of pantheon greeter that positions elements in a central and
+      vertigal manner and adds a blur effect to the background
+    '';
+    homepage = https://github.com/nick92/Enso-OS;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [
+      eadwu
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c29238170a49..8a268669a379 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18326,6 +18326,11 @@ with pkgs;
 
   lightdm_qt = lightdm.override { withQt5 = true; };
 
+  lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter {
+    inherit (gnome3) libgee;
+    inherit (xorg) libX11 libXdmcp libpthreadstubs;
+  };
+
   lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
     inherit (xfce) exo;
   };

From 86b966f10862862f77f44ac7bc25d786d148a6f2 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 15 Aug 2018 09:10:28 +0100
Subject: [PATCH 0045/3253] Patches for saga-6.3.0

---
 pkgs/applications/gis/saga/default.nix        |  9 ++-
 pkgs/applications/gis/saga/finite-6.3.0.patch | 55 +++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/gis/saga/finite-6.3.0.patch

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index b1ad81a6a3ff..10cec193cc0d 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,18 +1,23 @@
 { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
   libharu, opencv, vigra, postgresql, Cocoa,
-  unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull }:
+  unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
 
 stdenv.mkDerivation rec {
   name = "saga-6.3.0";
 
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
-  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper qhull ]
+  buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma
+                  jasper qhull giflib ]
                 ++ stdenv.lib.optionals stdenv.isDarwin
                   [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
 
   enableParallelBuilding = true;
 
+  patches = [ ./finite-6.3.0.patch];
+
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+
   src = fetchurl {
     url = "mirror://sourceforge/project/saga-gis/SAGA%20-%206/SAGA%20-%206.3.0/saga-6.3.0.tar.gz";
     sha256 = "0hyjim8fcp3mna1hig22nnn4ki3j6b7096am2amcs99sdr09jjxv";
diff --git a/pkgs/applications/gis/saga/finite-6.3.0.patch b/pkgs/applications/gis/saga/finite-6.3.0.patch
new file mode 100644
index 000000000000..91c9543edfda
--- /dev/null
+++ b/pkgs/applications/gis/saga/finite-6.3.0.patch
@@ -0,0 +1,55 @@
+diff --git a/src/tools/imagery/imagery_maxent/me.cpp b/src/tools/imagery/imagery_maxent/me.cpp
+index c5da854..d3e9cff 100755
+--- a/src/tools/imagery/imagery_maxent/me.cpp
++++ b/src/tools/imagery/imagery_maxent/me.cpp
+@@ -21,7 +21,7 @@
+ #ifdef _SAGA_MSW
+ #define isinf(x) (!_finite(x))
+ #else
+-#define isinf(x) (!finite(x))
++#define isinf(x) (!isfinite(x))
+ #endif
+ 
+ /** The input array contains a set of log probabilities lp1, lp2, lp3
+@@ -47,7 +47,7 @@ double sumLogProb(vector<double>& logprobs)
+ /** returns log (e^logprob1 + e^logprob2). */
+ double sumLogProb(double logprob1, double logprob2)
+ {
+-  if (isinf(logprob1) && isinf(logprob2)) 
++  if (isinf(logprob1) && isinf(logprob2))
+     return logprob1; // both prob1 and prob2 are 0, return log 0.
+   if (logprob1>logprob2)
+     return logprob1+log(1+exp(logprob2-logprob1));
+@@ -70,8 +70,8 @@ void MaxEntModel::print(ostream& ostrm, MaxEntTrainer& trainer)
+   for (FtMap::iterator it = _index.begin(); it!=_index.end(); it++) {
+     unsigned long i = it->second;
+     for (unsigned long c = 0; c<_classes; c++) {
+-      ostrm << "lambda(" << trainer.className(c) << ", " 
+-	    << trainer.getStr(it->first) << ")=" 
++      ostrm << "lambda(" << trainer.className(c) << ", "
++	    << trainer.getStr(it->first) << ")="
+ 	    << _lambda[i+c] << endl;
+     }
+   }
+@@ -86,7 +86,7 @@ int MaxEntModel::getProbs(MaxEntEvent& event, vector<double>& probs)
+     double s = 0;
+     for (unsigned int f = 0; f<event.size(); f++) {
+       FtMap::iterator it = _index.find(event[f]);
+-      if (it!=_index.end()) 
++      if (it!=_index.end())
+ 	s += _lambda[it->second+c];
+     }
+     probs[c] = s;
+@@ -142,10 +142,10 @@ double MaxEntModel::getObsCounts(EventSet& events, vector<double>& obsCounts)
+     double ftSum = 0;
+     for (unsigned long j=0; j<e.size(); j++) {
+       FtMap::iterator it = _index.find(e[j]);
+-      if (it!=_index.end()) 
++      if (it!=_index.end())
+ 	obsCounts[it->second+c] += count;
+       else { // new feature, need to expand obsCounts and _lambda
+-	for (unsigned int k = 0; k<_classes; k++) 
++	for (unsigned int k = 0; k<_classes; k++)
+ 	  obsCounts.push_back(0);
+ 	obsCounts[_lambda.size()+c] += count;
+ 	addFeature(e[j]);

From 1c9af2d89cdeb62eef0c9d3798fdd2203f21f221 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 15 Aug 2018 09:10:42 +0100
Subject: [PATCH 0046/3253] Remove unecessary option

---
 pkgs/applications/gis/saga/lts.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/gis/saga/lts.nix b/pkgs/applications/gis/saga/lts.nix
index e69d52701be7..ca0034aa9708 100644
--- a/pkgs/applications/gis/saga/lts.nix
+++ b/pkgs/applications/gis/saga/lts.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  GDAL_CFLAGS = "-std=c++11";
-
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
 
   sourceRoot = "code-b6f474f/saga-gis";

From 58a2632148e754b3dd52cf74b736b03d8e6a9589 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 16 Aug 2018 10:56:42 +0200
Subject: [PATCH 0047/3253] triggerhappy: build with systemd socket support

---
 .../inputmethods/triggerhappy/default.nix     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix
index 719d86b3a389..ec8ac8845597 100644
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
 
 stdenv.mkDerivation rec {
   name = "triggerhappy-${version}";
   version = "0.5.0";
 
-  src = fetchurl {
-    url = "https://github.com/wertarbyte/triggerhappy/archive/release/${version}.tar.gz";
-    sha256 = "af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c";
+  src = fetchFromGitHub {
+    owner = "wertarbyte";
+    repo = "triggerhappy";
+    rev = "release/${version}";
+    sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90";
   };
 
-  buildInputs = [ perl ];
-  installFlags = [ "DESTDIR=$(out)" ];  
+  nativeBuildInputs = [ pkgconfig perl ];
+  buildInputs = [ systemd ];
 
-  postPatch = ''
-    substituteInPlace Makefile --replace "/usr/" "/"
-    substituteInPlace Makefile --replace "/sbin/" "/bin/"
-  '';
+  makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ];
 
   postInstall = ''
     install -D -m 644 -t "$out/etc/triggerhappy/triggers.d" "triggerhappy.conf.examples"
-    install -D -m 644 -t "$out/usr/lib/systemd/system" "systemd/triggerhappy.service" "systemd/triggerhappy.socket"
-    install -D -m 644 -t "$out/usr/lib/udev/rules.d" "udev/triggerhappy-udev.rules"
   '';
 
   meta = with stdenv.lib; {
@@ -34,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/wertarbyte/triggerhappy/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.taha ];
+    maintainers = with maintainers; [ jfrankenau taha ];
   };
 }

From f9129251ea633ccf94ba4699a3ce5694c2e0c3b9 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 16 Aug 2018 11:00:29 +0200
Subject: [PATCH 0048/3253] nixos/triggerhappy: init

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/hardware/triggerhappy.nix        | 114 ++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 nixos/modules/services/hardware/triggerhappy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e19853efd73c..2fc5e274906b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -274,6 +274,7 @@
   ./services/hardware/tlp.nix
   ./services/hardware/thinkfan.nix
   ./services/hardware/trezord.nix
+  ./services/hardware/triggerhappy.nix
   ./services/hardware/u2f.nix
   ./services/hardware/udev.nix
   ./services/hardware/udisks2.nix
diff --git a/nixos/modules/services/hardware/triggerhappy.nix b/nixos/modules/services/hardware/triggerhappy.nix
new file mode 100644
index 000000000000..81d4a1ae65bf
--- /dev/null
+++ b/nixos/modules/services/hardware/triggerhappy.nix
@@ -0,0 +1,114 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.triggerhappy;
+
+  socket = "/run/thd.socket";
+
+  configFile = pkgs.writeText "triggerhappy.conf" ''
+    ${concatMapStringsSep "\n"
+      ({ keys, event, cmd, ... }:
+        ''${concatMapStringsSep "+" (x: "KEY_" + x) keys} ${toString { press = 1; hold = 2; release = 0; }.${event}} ${cmd}''
+      )
+      cfg.bindings}
+    ${cfg.extraConfig}
+  '';
+
+  bindingCfg = { config, ... }: {
+    options = {
+
+      keys = mkOption {
+        type = types.listOf types.str;
+        description = "List of keys to match.  Key names as defined in linux/input-event-codes.h";
+      };
+
+      event = mkOption {
+        type = types.enum ["press" "hold" "release"];
+        default = "press";
+        description = "Event to match.";
+      };
+
+      cmd = mkOption {
+        type = types.str;
+        description = "What to run.";
+      };
+
+    };
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.triggerhappy = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the <command>triggerhappy</command> hotkey daemon.
+        '';
+      };
+
+      bindings = mkOption {
+        type = types.listOf (types.submodule bindingCfg);
+        default = [];
+        example = lib.literalExample ''
+          [ { keys = ["PLAYPAUSE"];  cmd = "''${pkgs.mpc_cli}/bin/mpc -q toggle"; } ]
+        '';
+        description = ''
+          Key bindings for <command>triggerhappy</command>.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Literal contents to append to the end of <command>triggerhappy</command> configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.sockets.triggerhappy = {
+      description = "Triggerhappy Socket";
+      wantedBy = [ "sockets.target" ];
+      socketConfig.ListenDatagram = socket;
+    };
+
+    systemd.services.triggerhappy = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "local-fs.target" ];
+      description = "Global hotkey daemon";
+      serviceConfig = {
+        ExecStart = "${pkgs.triggerhappy}/bin/thd --user nobody --socket ${socket} --triggers ${configFile} --deviceglob /dev/input/event*";
+      };
+    };
+
+    services.udev.packages = lib.singleton (pkgs.writeTextFile {
+      name = "triggerhappy-udev-rules";
+      destination = "/etc/udev/rules.d/61-triggerhappy.rules";
+      text = ''
+        ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{name}!="triggerhappy", \
+          RUN+="${pkgs.triggerhappy}/bin/th-cmd --socket ${socket} --passfd --udev"
+      '';
+    });
+
+  };
+
+}

From ca3e9a70968c89d26293b8d83f3dc7cacd6f7d23 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Fri, 17 Aug 2018 00:08:21 +0200
Subject: [PATCH 0049/3253] teamspeak_server: 3.0.13.6 -> 3.3.0

---
 nixos/modules/services/networking/teamspeak3.nix          | 2 +-
 .../networking/instant-messengers/teamspeak/server.nix    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
index 3703921ff703..410d650b1f64 100644
--- a/nixos/modules/services/networking/teamspeak3.nix
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -124,7 +124,7 @@ in
             dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \
             voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \
             filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \
-            query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort}
+            query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort} license_accepted=1
         '';
         WorkingDirectory = cfg.dataDir;
         User = user;
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index c86de07bc842..bd1346b12194 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 let
-  version = "3.0.13.6";
+  version = "3.3.0";
   arch = if stdenv.is64bit then "amd64" else "x86";
   libDir = if stdenv.is64bit then "lib64" else "lib";
 in
@@ -14,9 +14,9 @@ stdenv.mkDerivation {
       "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
     ];
-    sha256 = if stdenv.is64bit 
-      then "19ccd8db5427758d972a864b70d4a1263ebb9628fcc42c3de75ba87de105d179"
-      else "2f70b3e70a3d9bf86106fab67a938922c8d27fec24e66e229913f78a0791b967";
+    sha256 = if stdenv.is64bit
+      then "1jv5c1br3ypxz8px7fl5rg75j0kfdg8mqasdk2gka6yvgf7qc97i"
+      else "0m889xl9iz3fmq7wyjjn42swprpspagbkn52a82nzkhgvagd45bz";
   };
 
   buildInputs = [ makeWrapper ];

From 9bd7a4f5208cfa92c0ae8cca1ae6f69f0f8f242d Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Thu, 16 Aug 2018 17:23:14 +1000
Subject: [PATCH 0050/3253] hisat2: init 2.1.0

---
 .../science/biology/hisat2/default.nix        | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/science/biology/hisat2/default.nix

diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
new file mode 100644
index 000000000000..9ccf54a81133
--- /dev/null
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -0,0 +1,49 @@
+{stdenv, fetchurl, unzip, which, python}:
+
+stdenv.mkDerivation rec {
+  name = "hisat2-${version}";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-${version}-source.zip";
+    sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9";
+  };
+
+  buildInputs = [ unzip  which python ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp hisat2 \
+       hisat2-inspect-l \
+       hisat2-build-s \
+       hisat2-align-l \
+       hisat2-inspect \
+       hisat2-align-s \
+       hisat2-inspect-s \
+       hisat2-build-l \
+       hisat2-build \
+       extract_exons.py \
+       extract_splice_sites.py \
+       hisat2_extract_exons.py \
+       hisat2_extract_snps_haplotypes_UCSC.py \
+       hisat2_extract_snps_haplotypes_VCF.py \
+       hisat2_extract_splice_sites.py \
+       hisat2_simulate_reads.py \
+       hisatgenotype_build_genome.py \
+       hisatgenotype_extract_reads.py \
+       hisatgenotype_extract_vars.py \
+       hisatgenotype_hla_cyp.py \
+       hisatgenotype_locus.py \
+       hisatgenotype.py \
+       $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Graph based aligner";
+    license = licenses.gpl3;
+    homepage = https://ccb.jhu.edu/software/hisat2/index.shtml;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2846bf49eb82..48eae4eb6c11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20377,6 +20377,8 @@ with pkgs;
 
   ezminc = callPackage ../applications/science/biology/EZminc { };
 
+  hisat2 = callPackage ../applications/science/biology/hisat2 { };
+
   htslib = callPackage ../development/libraries/science/biology/htslib { };
 
   igv = callPackage ../applications/science/biology/igv { };

From 17de73a383407b9e326bf969094ccce8938d9976 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 19 Aug 2018 10:40:04 -0400
Subject: [PATCH 0051/3253] kernel-headers: 4.15 -> 4.18.3

---
 pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 677bb076b0c8..c135a88dd497 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -48,7 +48,7 @@ let
 in {
 
   linuxHeaders = common {
-    version = "4.15";
-    sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js";
+    version = "4.18.3";
+    sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1";
   };
 }

From e12871912ec630597eecd4983f6f33c444e836b4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Aug 2018 16:58:13 -0500
Subject: [PATCH 0052/3253] patchelf: 0.10-pre-20180108 -> 0.10-pre-20180509,
 minor touchup

Useful update-- adds support for accepting multiple files as arguments
and fixes handling of large executables (>2Gb).

While touching this, modify version to include more info.

Preserving version format previously used, although not usual style.
---
 pkgs/development/tools/misc/patchelf/unstable.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index de68a4066d7d..8f4194d8973b 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,19 +1,24 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.10-pre-20180108";
+  name = "patchelf-${version}";
+  version = "0.10-pre-20180509";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "patchelf";
-    rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1";
-    sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb";
+    rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69";
+    sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr";
   };
 
   # Drop test that fails on musl (?)
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace tests/Makefile.am \
       --replace "set-rpath-library.sh" ""
+  '' +
+  # extend version identifier to more informative than "0.10".
+  ''
+    echo -n ${version} > version
   '';
 
   setupHook = [ ./setup-hook.sh ];

From 7bf9b4256e1f0d9d0d7f82c0b85a5afc3a002748 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 21 Aug 2018 19:06:45 -0500
Subject: [PATCH 0053/3253] patchelfUnstable: disable tests on Darwin since
 they've long failed

Bit of context/discussion:
https://github.com/NixOS/nixpkgs/pull/45449#issuecomment-414844592
---
 pkgs/development/tools/misc/patchelf/unstable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 8f4194d8973b..0c5ec6404260 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ];
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   meta = {
     homepage = https://nixos.org/patchelf.html;

From 5a95b0b440f277fba0b8b9c744b921711fe5c122 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 24 Aug 2018 02:11:55 -0700
Subject: [PATCH 0054/3253] libuv: 1.21.0 -> 1.23.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions.
---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index a0ace84bc67d..9ee934cd78bb 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.21.0";
+  version = "1.23.0";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b";
+    sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0";
   };
 
   patches = [

From de61d0da203889a6ebd07085a406ac8d3e90ee30 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 19 Aug 2018 09:33:14 +0200
Subject: [PATCH 0055/3253] ydiff: init at 1.1

---
 pkgs/development/tools/ydiff/default.nix | 45 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/tools/ydiff/default.nix

diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix
new file mode 100644
index 000000000000..c2f72138db5f
--- /dev/null
+++ b/pkgs/development/tools/ydiff/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git
+, subversion, coreutils, which }:
+
+with pythonPackages;
+
+buildPythonApplication rec {
+  pname = "ydiff";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf";
+  };
+
+  patchPhase = ''
+    substituteInPlace tests/test_ydiff.py \
+      --replace /bin/rm ${coreutils}/bin/rm \
+      --replace /bin/sh ${stdenv.shell}
+    substituteInPlace Makefile \
+      --replace "pep8 --ignore" "# pep8 --ignore" \
+      --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \
+      --replace /bin/sh ${stdenv.shell} \
+      --replace tests/regression.sh "${stdenv.shell} tests/regression.sh"
+    patchShebangs tests/*.sh
+  '';
+
+  buildInputs = [ docutils pygments ];
+  propagatedBuildInputs = [ less patchutils ];
+  checkInputs = [ coverage coreutils git subversion which ];
+
+  checkTarget = if isPy3k then "test3" else "test";
+
+  meta = {
+    homepage = https://github.com/ymattw/ydiff;
+    description = "View colored, incremental diff in workspace or from stdin";
+    longDescription = ''
+      Term based tool to view colored, incremental diff in a version
+      controlled workspace (supports Git, Mercurial, Perforce and Svn
+      so far) or from stdin, with side by side (similar to diff -y)
+      and auto pager support.
+    '';
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81841abdddf8..2758719a93e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19416,6 +19416,8 @@ with pkgs;
 
   yate = callPackage ../applications/misc/yate { };
 
+  ydiff = callPackage ../development/tools/ydiff { };
+
   yed = callPackage ../applications/graphics/yed {};
 
   inherit (gnome3) yelp;

From 16879e2f6ac4d98b4c4e94c940ec535168075327 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 25 Aug 2018 15:53:30 -0500
Subject: [PATCH 0056/3253] mesa: remove darwin-specific derivations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ‘mesa-darwin’ stuff was very out of date (2012). This moves darwin
to use the newer mesa. Stuff seems to build okay. Needs more testing
on other stuff though (libraries work). No drivers build but that is
how it should work on macOS.

/cc @cstrahan @Anton-Latukha
---
 .../libraries/mesa-darwin/default.nix         |  73 ---------
 ...evel-max-texture-size-error-checking.patch | 147 ------------------
 ...const-force-glsl-extension-warning-i.patch |  33 ----
 ..._EXT_framebuffer_sRGB-in-glPopAttrib.patch |  28 ----
 ...-is-not-needed-with-CGLFlushDrawable.patch |  29 ----
 ...void-heap-corruption-in-_glapi_table.patch |  28 ----
 ...for-kCGLPFAOpenGLProfile-support-at-.patch |  40 -----
 ...-error-reporting-if-CGLChoosePixelFo.patch |  30 ----
 ...ors-in-choosing-the-pixel-format-to-.patch |  55 -------
 ...e-Profile-usage-behind-a-testing-env.patch |  69 --------
 .../patch-src-mapi-vgapi-Makefile.diff        |  11 --
 .../libraries/mesa/darwin-clock-gettime.patch |  76 +++++++++
 pkgs/development/libraries/mesa/default.nix   |  78 +++++-----
 pkgs/top-level/all-packages.nix               |  21 +--
 14 files changed, 125 insertions(+), 593 deletions(-)
 delete mode 100644 pkgs/development/libraries/mesa-darwin/default.nix
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
 delete mode 100644 pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
 create mode 100644 pkgs/development/libraries/mesa/darwin-clock-gettime.patch

diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
deleted file mode 100644
index 2bfdb679156c..000000000000
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, flex, bison
-, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau
-, OpenGL, apple_sdk, Xplugin
-}:
-
-let
-  version = "8.0.5";
-  self = stdenv.mkDerivation rec {
-    name = "mesa-${version}";
-
-    src =  fetchurl {
-      url = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${version}/MesaLib-${version}.tar.bz2";
-      sha256 = "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si";
-    };
-
-    nativeBuildInputs = [ pkgconfig python makedepend flex bison ];
-
-    buildInputs = with xorg; [
-      glproto dri2proto libXfixes libXi libXmu
-      intltool expat libxml2Python llvm
-      presentproto
-      libX11 libXext libxcb libXt libxshmfence
-      libffi libvdpau
-    ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ];
-
-    propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
-
-    postUnpack = ''
-      ln -s darwin $sourceRoot/configs/current
-    '';
-
-    preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace bin/mklib --replace g++ clang++
-    '';
-
-    patches = [
-      ./patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
-      ./patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
-      ./patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
-      ./patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
-      ./patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
-      ./patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
-      ./patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
-      ./patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
-      ./patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
-      ./patches/patch-src-mapi-vgapi-Makefile.diff
-    ];
-
-    postPatch = "patchShebangs .";
-
-    configurePhase = ":";
-
-    configureFlags = [
-      # NOTE: Patents expired on June 17 2018.
-      # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed
-      "texture-float"
-    ];
-
-    makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++";
-
-    enableParallelBuilding = true;
-
-    passthru = { inherit version; };
-
-    meta = {
-      description = "An open source implementation of OpenGL";
-      homepage = http://www.mesa3d.org/;
-      license = "bsd";
-      platforms = stdenv.lib.platforms.darwin;
-      maintainers = with stdenv.lib.maintainers; [ cstrahan ];
-    };
-  };
-in self // { driverLink = self; }
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch b/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
deleted file mode 100644
index 5466ffc90858..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 9cf1afbf8ae87ddbb29b24a0f9f2724e9e2935c1 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Tue, 4 Sep 2012 20:17:15 -0600
-Subject: [PATCH 03/13] mesa: fix per-level max texture size error checking
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a long-standing omission in Mesa's texture image size checking.
-We need to take the mipmap level into consideration when checking if the
-width, height and depth are too large.
-
-Fixes the new piglit max-texture-size-level test.
-Thanks to Stéphane Marchesin for finding this problem.
-
-Note: This is a candidate for the stable branches.
-
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-(cherry picked from commit 771e7b6d884bb4294a89f276a904d90b28efb90a)
----
- src/mesa/main/teximage.c | 36 +++++++++++++++++++++---------------
- 1 file changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 3aecc0f..ed22fa9 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -1251,11 +1251,12 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- 
-    switch (target) {
-    case GL_PROXY_TEXTURE_1D:
--      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
--      if (width < 2 * border || width > 2 * border + maxSize)
--         return GL_FALSE;
-       if (level >= ctx->Const.MaxTextureLevels)
-          return GL_FALSE;
-+      maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); /* level zero size */
-+      maxSize >>= level;  /* level size */
-+      if (width < 2 * border || width > 2 * border + maxSize)
-+         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1263,13 +1264,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_2D:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1279,15 +1281,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_3D:
-+      if (level >= ctx->Const.Max3DTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
-       if (depth < 2 * border || depth > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.Max3DTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1299,23 +1302,24 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_RECTANGLE_NV:
-+      if (level != 0)
-+         return GL_FALSE;
-       maxSize = ctx->Const.MaxTextureRectSize;
-       if (width < 0 || width > maxSize)
-          return GL_FALSE;
-       if (height < 0 || height > maxSize)
-          return GL_FALSE;
--      if (level != 0)
--         return GL_FALSE;
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-+      if (level >= ctx->Const.MaxCubeTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxCubeTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1325,13 +1329,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
-@@ -1339,15 +1344,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-       return GL_TRUE;
- 
-    case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-+      if (level >= ctx->Const.MaxTextureLevels)
-+         return GL_FALSE;
-       maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+      maxSize >>= level;
-       if (width < 2 * border || width > 2 * border + maxSize)
-          return GL_FALSE;
-       if (height < 2 * border || height > 2 * border + maxSize)
-          return GL_FALSE;
-       if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
-          return GL_FALSE;
--      if (level >= ctx->Const.MaxTextureLevels)
--         return GL_FALSE;
-       if (!ctx->Extensions.ARB_texture_non_power_of_two) {
-          if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
-             return GL_FALSE;
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch b/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
deleted file mode 100644
index ff933b2ec284..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db8cb2250335a93cad6e877e634116e5cd6b42fc Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 13 Mar 2012 14:53:25 +0000
-Subject: [PATCH 08/13] glsl: initialise const force glsl extension warning in
- fake ctx
-
-valgrind complained about an uninitialised value being used in
-glsl_parser_extras.cpp, and this was the one it was giving out about.
-
-Just initialise the value in the fakectx.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48057
-(cherry picked from commit b78a77f979b21a84aecb6fa4f19a2ed51a48c306)
----
- src/glsl/builtins/tools/generate_builtins.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
-index 72d12bb..bd15c4d 100755
---- a/src/glsl/builtins/tools/generate_builtins.py
-+++ b/src/glsl/builtins/tools/generate_builtins.py
-@@ -156,6 +156,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
-    fakeCtx.API = API_OPENGL;
-    fakeCtx.Const.GLSLVersion = 130;
-    fakeCtx.Extensions.ARB_ES2_compatibility = true;
-+   fakeCtx.Const.ForceGLSLExtensionsWarn = false;
-    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
-    struct _mesa_glsl_parse_state *st =
-       new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch b/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
deleted file mode 100644
index 919443045e46..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2286bd68a832a4d4908d50e1a4496853e1f3305a Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Mon, 27 Aug 2012 21:52:07 -0600
-Subject: [PATCH 09/13] mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()
-
-To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
-(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
----
- src/mesa/main/attrib.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
-index 225ac89..cc384c7 100644
---- a/src/mesa/main/attrib.c
-+++ b/src/mesa/main/attrib.c
-@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
-                _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
- 
-                /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
--               _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-+               if (ctx->Extensions.EXT_framebuffer_sRGB)
-+                  _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-             }
-             break;
-          case GL_CURRENT_BIT:
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch b/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
deleted file mode 100644
index 565d5e6c2737..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9c50093adff0c7531ab32a7ec9ce3b91712b4d20 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 20 Jul 2013 10:25:28 -0700
-Subject: [PATCH 11/13] Apple: glFlush() is not needed with CGLFlushDrawable()
-
-<rdar://problem/14496373>
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit fa5ed99d8e809fb86e486a40273a4a6971055398)
----
- src/glx/apple/apple_glx.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
-index 56cff64..4e2aa33 100644
---- a/src/glx/apple/apple_glx.c
-+++ b/src/glx/apple/apple_glx.c
-@@ -132,8 +132,6 @@ apple_glx_swap_buffers(void *ptr)
- {
-    struct apple_glx_context *ac = ptr;
- 
--   /* This may not be needed with CGLFlushDrawable: */
--   glFlush();
-    apple_cgl.flush_drawable(ac->context_obj);
- }
- 
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch b/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
deleted file mode 100644
index 58ac66bd5511..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 629600450b3845a768c0edc92ea3f444d03a2738 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 20 May 2014 01:37:58 -0700
-Subject: [PATCH 12/13] glapi: Avoid heap corruption in _glapi_table
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Reviewed-by: Chia-I Wu <olv@lunarg.com>
-(cherry picked from commit ff5456d1acf6f627a6837be3f3f37c6a268c9e8e)
----
- src/mapi/glapi/gen/gl_gentable.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
-index 5657e32..0d0a02d 100644
---- a/src/mapi/glapi/gen/gl_gentable.py
-+++ b/src/mapi/glapi/gen/gl_gentable.py
-@@ -111,7 +111,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
- 
- struct _glapi_table *
- _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
--    struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table));
-+    struct _glapi_table *disp = calloc(1, _glapi_get_dispatch_table_size() * sizeof(_glapi_proc));
-     char symboln[512];
- 
-     if(!disp)
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch b/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
deleted file mode 100644
index 5ec0d9024eff..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ba59a779ed41e08fa16805c1c60da39885546d0e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 20 May 2014 10:53:00 -0700
-Subject: [PATCH 13/13] darwin: Fix test for kCGLPFAOpenGLProfile support at
- runtime
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 7a109268ab5b3544e7f7b99e84ef1fdf54023fb4)
----
- src/glx/apple/apple_visual.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 282934f..238c248 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -73,11 +73,15 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    GLint vsref = 0;
-    CGLError error = 0;
- 
--   /* Request an OpenGL 3.2 profile if one is available */
--   if(apple_cgl.version_major > 1 || (apple_cgl.version_major == 1 && apple_cgl.version_minor >= 3)) {
--      attr[numattr++] = kCGLPFAOpenGLProfile;
--      attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--   }
-+   /* Request an OpenGL 3.2 profile if one is available and supported */
-+   attr[numattr++] = kCGLPFAOpenGLProfile;
-+   attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+
-+   /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-+   attr[numattr] = 0;
-+   error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+   if (error == kCGLBadAttribute)
-+      numattr -= 2;
- 
-    if (offscreen) {
-       apple_glx_diagnostic
--- 
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch b/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
deleted file mode 100644
index 372ce4a27a39..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
-From: Jon TURNEY <jon.turney@dronecode.org.uk>
-Date: Mon, 12 May 2014 15:38:26 +0100
-Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
- CGLChoosePixelFormat() didn't find any matching pixel formats.
-
-Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
----
- src/glx/apple/apple_visual.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 238c248..c6ede51 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-       fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-       abort();
-    }
-+
-+   if (!*pfobj) {
-+      fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      abort();
-+   }
- }
--- 
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch b/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
deleted file mode 100644
index 4818ee63d4c9..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 24 May 2014 14:13:33 -0700
-Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
- to the crash log
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
----
- src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index c6ede51..951b213 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -63,6 +63,16 @@ enum
-    MAX_ATTR = 60
- };
- 
-+static char __crashreporter_info_buff__[4096] = { 0 };
-+static const char *__crashreporter_info__ __attribute__((__used__)) =
-+    &__crashreporter_info_buff__[0];
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+// This is actually a toolchain requirement, but I'm not sure the correct check,
-+// but it should be fine to just only include it for Leopard and later.  This line
-+// just tells the linker to never strip this symbol (such as for space optimization)
-+__asm__ (".desc ___crashreporter_info__, 0x10");
-+#endif
-+
- void
- apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
-                           bool * double_buffered, bool * uses_stereo,
-@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
- 
-    if (error) {
--      fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-+      snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+               "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
-+      fprintf(stderr, "%s", __crashreporter_info_buff__);
-       abort();
-    }
- 
-    if (!*pfobj) {
--      fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+               "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+      fprintf(stderr, "%s", __crashreporter_info_buff__);
-       abort();
-    }
- }
--- 
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch b/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
deleted file mode 100644
index 72841e2a2cce..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 24 May 2014 14:08:16 -0700
-Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
- envvar
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
----
- src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 951b213..046581b 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-    int numattr = 0;
-    GLint vsref = 0;
-    CGLError error = 0;
--
--   /* Request an OpenGL 3.2 profile if one is available and supported */
--   attr[numattr++] = kCGLPFAOpenGLProfile;
--   attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--
--   /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
--   attr[numattr] = 0;
--   error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
--   if (error == kCGLBadAttribute)
--      numattr -= 2;
-+   bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
- 
-    if (offscreen) {
-       apple_glx_diagnostic
-@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
-       attr[numattr++] = mode->samples;
-    }
- 
-+   /* Debugging support for Core profiles to support newer versions of OpenGL */
-+   if (use_core_profile) {
-+      attr[numattr++] = kCGLPFAOpenGLProfile;
-+      attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+   }
-+
-    attr[numattr++] = 0;
- 
-    assert(numattr < MAX_ATTR);
- 
-    error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
- 
-+   if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
-+      apple_glx_diagnostic
-+         ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
-+
-+      if (!error)
-+         apple_cgl.destroy_pixel_format(*pfobj);
-+
-+      numattr -= 3;
-+      attr[numattr++] = 0;
-+
-+      error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+   }
-+
-    if (error) {
-       snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-                "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
--- 
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff b/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
deleted file mode 100644
index e29a8464076d..000000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mapi/vgapi/Makefile	2012-11-30 12:06:24.000000000 -0500
-+++ b/src/mapi/vgapi/Makefile	2012-11-30 12:06:52.000000000 -0500
-@@ -75,6 +75,8 @@
- install-headers:
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/VG
- 	$(INSTALL) -m 644 $(TOP)/include/VG/*.h $(DESTDIR)$(INSTALL_INC_DIR)/VG
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-+	$(INSTALL) -m 644 $(TOP)/include/KHR/*.h $(DESTDIR)$(INSTALL_INC_DIR)/KHR
- 
- install: default install-headers install-pc
- 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
diff --git a/pkgs/development/libraries/mesa/darwin-clock-gettime.patch b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
new file mode 100644
index 000000000000..94e90a1c5871
--- /dev/null
+++ b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
@@ -0,0 +1,76 @@
+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
+index 45cb6075e6..62937311b9 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -36,6 +36,11 @@
+ #include <sched.h>
+ #include <stdint.h> /* for intptr_t */
+ 
++#ifdef __MACH__
++#include <mach/clock.h>
++#include <mach/mach.h>
++#endif
++
+ /*
+ Configuration macro:
+ 
+@@ -383,12 +388,25 @@ tss_set(tss_t key, void *val)
+ /*-------------------- 7.25.7 Time functions --------------------*/
+ // 7.25.6.1
+ #ifndef HAVE_TIMESPEC_GET
++
+ static inline int
+ timespec_get(struct timespec *ts, int base)
+ {
+     if (!ts) return 0;
+     if (base == TIME_UTC) {
++#ifdef __MACH__
++        if (ts != NULL) {
++            clock_serv_t cclock;
++            mach_timespec_t mts;
++            host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++            clock_get_time(cclock, &mts);
++            mach_port_deallocate(mach_task_self(), cclock);
++            ts->tv_sec = mts.tv_sec;
++            ts->tv_nsec = mts.tv_nsec;
++        }
++#else
+         clock_gettime(CLOCK_REALTIME, ts);
++#endif
+         return base;
+     }
+     return 0;
+diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
+index 1208ebb315..e1378fb1f0 100644
+--- a/src/egl/drivers/dri2/egl_dri2.c
++++ b/src/egl/drivers/dri2/egl_dri2.c
+@@ -65,6 +65,11 @@
+ #include "util/u_vector.h"
+ #include "mapi/glapi/glapi.h"
+ 
++#ifdef __MACH__
++#include <mach/clock.h>
++#include <mach/mach.h>
++#endif
++
+ #define NUM_ATTRIBS 12
+ 
+ static void
+@@ -3092,7 +3097,17 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
+ 
+             /* We override the clock to monotonic when creating the condition
+              * variable. */
++#ifdef __MACH__
++            clock_serv_t cclock;
++            mach_timespec_t mts;
++            host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++            clock_get_time(cclock, &mts);
++            mach_port_deallocate(mach_task_self(), cclock);
++            current.tv_sec = mts.tv_sec;
++            current.tv_nsec = mts.tv_nsec;
++#else
+             clock_gettime(CLOCK_MONOTONIC, &current);
++#endif
+ 
+             /* calculating when to expire */
+             expire.tv_nsec = timeout % 1000000000L;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e1a9477dcd63..d771ba7ee8fc 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,6 +8,8 @@
 , galliumDrivers ? null
 , driDrivers ? null
 , vulkanDrivers ? null
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, OpenGL, Xplugin
 }:
 
 /** Packaging design:
@@ -29,19 +31,21 @@ else
 
 let
   defaultGalliumDrivers =
-    if stdenv.isAarch32
+    optionals (builtins.elem "drm" eglPlatforms)
+    (if stdenv.isAarch32
     then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
     then ["virgl" "nouveau" "vc4" ]
-    else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
+    else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
   defaultDriDrivers =
-    if (stdenv.isAarch32 || stdenv.isAarch64)
+    optionals (builtins.elem "drm" eglPlatforms)
+    (if (stdenv.isAarch32 || stdenv.isAarch64)
     then ["nouveau"]
-    else ["i915" "i965" "nouveau" "radeon" "r200"];
+    else ["i915" "i965" "nouveau" "radeon" "r200"]);
   defaultVulkanDrivers =
-    if (stdenv.isAarch32 || stdenv.isAarch64)
+    optionals stdenv.isLinux (if (stdenv.isAarch32 || stdenv.isAarch64)
     then []
-    else ["intel"] ++ lib.optional enableRadv "radeon";
+    else ["intel"] ++ lib.optional enableRadv "radeon");
 in
 
 let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
@@ -51,11 +55,11 @@ let
     (if gallium_ == null
           then defaultGalliumDrivers
           else gallium_)
-    ++ ["swrast" "virgl"];
+    ++ lib.optional stdenv.isLinux "swrast";
   driDrivers =
     (if dri_ == null
-      then defaultDriDrivers
-      else dri_) ++ ["swrast"];
+      then optionals (elem "drm" eglPlatforms) defaultDriDrivers
+      else dri_) ++ lib.optional stdenv.isLinux "swrast";
   vulkanDrivers =
     if vulkan_ == null
     then defaultVulkanDrivers
@@ -89,9 +93,10 @@ let self = stdenv.mkDerivation {
     ./symlink-drivers.patch
     ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
     ./disk_cache-include-dri-driver-path-in-cache-key.patch
-  ];
+  ] ++ lib.optional stdenv.isDarwin ./darwin-clock-gettime.patch;
 
-  outputs = [ "out" "dev" "drivers" "osmesa" ];
+  outputs = [ "out" "dev" "drivers" ]
+            ++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
 
   # TODO: Figure out how to enable opencl without having a runtime dependency on clang
   configureFlags = [
@@ -99,18 +104,10 @@ let self = stdenv.mkDerivation {
     "--localstatedir=/var"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
-    "--with-platforms=x11,wayland,drm"
-  ]
-  ++ (optional (galliumDrivers != [])
-      ("--with-gallium-drivers=" +
-        builtins.concatStringsSep "," galliumDrivers))
-  ++ (optional (driDrivers != [])
-      ("--with-dri-drivers=" +
-        builtins.concatStringsSep "," driDrivers))
-  ++ (optional (vulkanDrivers != [])
-      ("--with-vulkan-drivers=" +
-        builtins.concatStringsSep "," vulkanDrivers))
-  ++ [
+    "--with-platforms=${concatStringsSep "," eglPlatforms}"
+    "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}"
+    "--with-dri-drivers=${concatStringsSep "," driDrivers}"
+    "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}"
     (enableFeature stdenv.isLinux "dri3")
     (enableFeature stdenv.isLinux "nine") # Direct3D in Wine
     "--enable-libglvnd"
@@ -121,17 +118,18 @@ let self = stdenv.mkDerivation {
     "--enable-glx"
     # https://bugs.freedesktop.org/show_bug.cgi?id=35268
     (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
-    "--enable-gallium-osmesa" # used by wine
+    # used by wine
+    (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa")
     "--enable-llvm"
-    "--enable-egl"
-    "--enable-xa" # used in vmware driver
-    "--enable-gbm"
+    (enableFeature stdenv.isLinux "egl")
+    (enableFeature stdenv.isLinux "xa") # used in vmware driver
+    (enableFeature stdenv.isLinux "gbm")
     "--enable-xvmc"
     "--enable-vdpau"
     "--enable-shared-glapi"
     "--enable-llvm-shared-libs"
-    "--enable-omx-bellagio"
-    "--enable-va"
+    (enableFeature stdenv.isLinux "omx-bellagio")
+    (enableFeature stdenv.isLinux "va")
     "--disable-opencl"
   ];
 
@@ -139,16 +137,18 @@ let self = stdenv.mkDerivation {
 
   propagatedBuildInputs = with xorg;
     [ libXdamage libXxf86vm ]
-    ++ optional stdenv.isLinux libdrm;
+    ++ optional stdenv.isLinux libdrm
+    ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
 
   buildInputs = with xorg; [
     expat llvmPackages.llvm libglvnd
     glproto dri2proto dri3proto presentproto
     libX11 libXext libxcb libXt libXfixes libxshmfence
-    libffi wayland wayland-protocols libvdpau libelf libXvMC
-    libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/
+    libffi libvdpau libelf libXvMC
+    libpthreadstubs openssl/*or another sha1 provider*/
     valgrind-light python2 python2.pkgs.Mako
-  ];
+  ] ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols
+                                      libomxil-bellagio libva-minimal ];
 
   enableParallelBuilding = true;
   doCheck = false;
@@ -160,7 +160,7 @@ let self = stdenv.mkDerivation {
   ];
 
   # TODO: probably not all .la files are completely fixed, but it shouldn't matter;
-  postInstall = ''
+  postInstall = optionalString (galliumDrivers != []) ''
     # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
     mv -t "$drivers/lib/"    \
       $out/lib/libXvMC*      \
@@ -214,7 +214,7 @@ let self = stdenv.mkDerivation {
   # TODO:
   #  check $out doesn't depend on llvm: builder failures are ignored
   #  for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
-  postFixup = ''
+  postFixup = optionalString (galliumDrivers != []) ''
     # add RPATH so the drivers can find the moved libgallium and libdricore9
     # moved here to avoid problems with stripping patchelfed files
     for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
@@ -234,7 +234,9 @@ let self = stdenv.mkDerivation {
 
       # Use stub libraries from libglvnd and headers from Mesa.
       buildCommand = ''
-        ln -s ${libglvnd.out} $out
+        mkdir -p $out/nix-support
+        ln -s ${libglvnd.out}/lib $out/lib
+
         mkdir -p $dev/{,lib/pkgconfig,nix-support}
         echo "$out" > $dev/nix-support/propagated-build-inputs
         ln -s ${self.dev}/include $dev/include
@@ -256,6 +258,8 @@ let self = stdenv.mkDerivation {
         genPkgConfig egl EGL
         genPkgConfig glesv1_cm GLESv1_CM
         genPkgConfig glesv2 GLESv2
+      '' + lib.optionalString stdenv.isDarwin ''
+        echo ${OpenGL} > $out/nix-support/propagated-build-inputs
       '';
     };
   };
@@ -264,7 +268,7 @@ let self = stdenv.mkDerivation {
     description = "An open source implementation of OpenGL";
     homepage = https://www.mesa3d.org/;
     license = licenses.mit; # X11 variant, in most files
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ vcunat ];
   };
 };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cce255e3728a..245eef1bbafd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11079,37 +11079,32 @@ with pkgs;
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them
-  libGL = libGLDarwinOr mesa_noglu.stubs;
+  libGL = mesa_noglu.stubs;
 
   # Default libGLU
-  libGLU = libGLDarwinOr mesa_glu;
+  libGLU = mesa_glu;
 
   # Combined derivation, contains both libGL and libGLU
   # Please, avoid using this attribute.  It was meant as transitional hack
   # for packages that assume that libGLU and libGL live in the same prefix.
   # libGLU_combined propagates both libGL and libGLU
-  libGLU_combined = libGLDarwinOr (buildEnv {
+  libGLU_combined = buildEnv {
     name = "libGLU-combined";
     paths = [ libGL libGLU ];
     extraOutputsToInstall = [ "dev" ];
-  });
+  };
 
   # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need)
-  libGL_driver = libGLDarwinOr mesa_drivers;
+  libGL_driver = mesa_drivers;
 
   libGLSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  libGLDarwin = callPackage ../development/libraries/mesa-darwin {
-    inherit (darwin.apple_sdk.frameworks) OpenGL;
-    inherit (darwin.apple_sdk.libs) Xplugin;
-    inherit (darwin) apple_sdk;
-  };
-
-  libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative;
-
   mesa_noglu = callPackage ../development/libraries/mesa {
     llvmPackages = llvmPackages_6;
+    inherit (darwin.apple_sdk.frameworks) OpenGL;
+    inherit (darwin.apple_sdk.libs) Xplugin;
   };
+  mesa = mesa_noglu;
 
   mesa_glu =  callPackage ../development/libraries/mesa-glu { };
 

From f086c4bb339ed006252876f43247f63406c86769 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 27 Aug 2018 19:03:42 +0300
Subject: [PATCH 0057/3253] vk-messenger: init

---
 .../vk-messenger/default.nix                  | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/vk-messenger/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
new file mode 100644
index 000000000000..5642d254295e
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, rpmextract, autoPatchelfHook
+, xorg, gtk2, gnome2, nss, alsaLib, udev, libnotify }:
+
+let
+  version = "3.9.0";
+in stdenv.mkDerivation {
+  name = "vk-messenger-${version}";
+  src = {
+    i686-linux = fetchurl {
+      url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
+      sha256 = "150qjj6ccbdp3gxs99jbzp27in1y8qkngn7jgb9za61pm4j70va3";
+    };
+    x86_64-linux = fetchurl {
+      url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
+      sha256 = "04lavv614qhj17zccpdih4k6ghj21nd0s8qxbkxkqb1jb0z8dfz9";
+    };
+  }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
+
+  nativeBuildInputs = [ rpmextract autoPatchelfHook ];
+  buildInputs = (with xorg; [
+    libXdamage libXtst libXScrnSaver libxkbfile
+  ]) ++ [
+    gtk2 gnome2.GConf nss alsaLib
+  ];
+  runtimeDependencies = [ udev.lib libnotify ];
+
+  unpackPhase = ''
+    rpmextract $src
+  '';
+
+  buildPhase = ''
+    substituteInPlace usr/share/applications/vk.desktop \
+      --replace /usr/share/pixmaps/vk.png vk
+  '';
+
+  installPhase = ''
+    mkdir $out
+    cd usr
+    cp -r --parents bin $out
+    cp -r --parents share/vk $out
+    cp -r --parents share/applications $out
+    cp -r --parents share/pixmaps $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple and Convenient Messaging App for VK";
+    homepage = https://vk.com/messenger;
+    license = licenses.unfree;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = ["i686-linux" "x86_64-linux"];
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86de6b193186..f8a09cd9f60c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5682,6 +5682,8 @@ with pkgs;
 
   vampire = callPackage ../applications/science/logic/vampire {};
 
+  vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {};
+
   volatility = callPackage ../tools/security/volatility { };
 
   vbetool = callPackage ../tools/system/vbetool { };

From 7e405b950b13fafedd1c1e53214b5324ecb4370c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 27 Aug 2018 16:29:30 -0400
Subject: [PATCH 0058/3253] nvidia_x11: 390.77 -> 390.87

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 16bab9979d03..d9f24874058b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -17,11 +17,11 @@ in
 rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "390.77";
-    sha256_32bit = "1yd313ghh2qbn07d5wbkshfwgkm4mh49vcqkydds3b3xk0mx4i8l";
-    sha256_64bit = "10kjccrkdn360035lh985cadhwy6lk9xrw3wlmww2wqfaa25f775";
-    settingsSha256 = "1wvxldpjkrx0ldjm5l6ycm6paxpcw89h0n6hfkznfkahkq7fwxdj";
-    persistencedSha256 = "1gklmc0v17m018cwpdlzwdyd45y4sjvjhj8a3l44baygix5zn30f";
+    version = "390.87";
+    sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw";
+    sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
+    settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r";
+    persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58";
   };
 
   beta = stable; # not enough interest to maintain beta ATM

From 775d1ecf578bed07b22f5780feae60f6272b4f1e Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Mon, 27 Aug 2018 11:44:07 -0700
Subject: [PATCH 0059/3253] boost: disable python explicitly in b2Args (#45679)

(cherry picked from commit 3b862a638952c814c49291ca3efa13e8363c77a2)
---
 pkgs/development/libraries/boost/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index dab6fac6f0cc..d2b70ebe6910 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -74,6 +74,7 @@ let
   ] ++ optional (link != "static") "runtime-link=${runtime-link}"
     ++ optional (variant == "release") "debug-symbols=off"
     ++ optional (toolset != null) "toolset=${toolset}"
+    ++ optional (!enablePython) "--without-python"
     ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
     ++ optionals (hostPlatform.libc == "msvcrt") [
     "threadapi=win32"

From a3f8a2c56f8e40be638d6b5b9df54dab1d8b4ba4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 28 Aug 2018 06:45:52 -0500
Subject: [PATCH 0060/3253] e2fsprogs: fix w/musl, __GNUC_PREREQ is glibc-ism

Fixes compilation on non-glibc at minor cost since these are only
used to guard the use of pragmas selectively disabling warnings
based on the GCC version used.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index d5f43e317024..e2b87007b09f 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig texinfo ];
   buildInputs = [ libuuid gettext ];
 
+  # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
+  NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")
+    "-D__GNUC_PREREQ(maj,min)=0";
+
   configureFlags =
     if stdenv.isLinux then [
       "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"

From 85facc4a7002ca04c8e2ac365e0cd1a80a633373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Aug 2018 21:46:19 +0200
Subject: [PATCH 0061/3253] coreutils nitpick: add --with-packager

`tool --version` now gets additional line:
Packaged by https://NixOS.org
---
 pkgs/tools/misc/coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 69d751a629ea..ee1ac7c5d183 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ];
 
   nativeBuildInputs = [ perl xz.bin ];
-  configureFlags =
-    optional (singleBinary != false)
+  configureFlags = [ "--with-packager=https://NixOS.org" ]
+    ++ optional (singleBinary != false)
       ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
     ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
     ++ optional withPrefix "--program-prefix=g"

From fd3927ac29fdae933d3007943ad73a5dc81335dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Aug 2018 22:05:53 +0200
Subject: [PATCH 0062/3253] coreutils: split a coreutils-full version

- default coreutils is stripped of /share/ (11 -> 2 MiB)
- coreutils-full retains /share/ and adds openssl for faster *sum tools
- NixOS systemPackages contains coreutils-full
- *Support parameter defaults are moved inside
  (it seemed confusing to have `? false` and "at once" with `? isLinux`)

Closure considerations:
+ typical build-time closure will get lighter by ~9 MiB
- typical closure of NixOS installation will grow by ~2 MiB,
  due to referring to both versions.  I think it would be possible to
  re-use most of the utils between the two versions, but the expression
  would get much more complex.

I considered having stdenv with minimal coreutils and the default
`coreutils` attribute being full, but it turned out there were too many
trivial references in nixpkgs, so it didn't seem easy to keep rebuild
impact of openssl from growing significantly.
---
 nixos/modules/config/system-path.nix  |  2 +-
 pkgs/tools/misc/coreutils/default.nix | 15 ++++++++++++---
 pkgs/top-level/all-packages.nix       |  7 ++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 361151665018..19c7b7cabfcc 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -13,7 +13,7 @@ let
       pkgs.attr
       pkgs.bashInteractive # bash with ncurses support
       pkgs.bzip2
-      pkgs.coreutils
+      pkgs.coreutils-full
       pkgs.cpio
       pkgs.curl
       pkgs.diffutils
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index ee1ac7c5d183..44745454f027 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,9 +1,12 @@
 { stdenv, lib, buildPackages
 , autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
 , hostPlatform, buildPlatform
-, aclSupport ? false, acl ? null
-, attrSupport ? false, attr ? null
+, aclSupport ? stdenv.isLinux, acl ? null
+, attrSupport ? stdenv.isLinux, attr ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
+# No openssl in default version, so openssl-induced rebuilds aren't too big.
+# It makes *sum functions significantly faster.
+, minimal ? true, withOpenssl ? !minimal, openssl ? null
 , withPrefix ? false
 , singleBinary ? "symlinks" # you can also pass "shebangs" or false
 }:
@@ -40,6 +43,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-packager=https://NixOS.org" ]
     ++ optional (singleBinary != false)
       ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
+    ++ optional withOpenssl "--with-openssl"
     ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
     ++ optional withPrefix "--program-prefix=g"
     ++ optionals (hostPlatform != buildPlatform && hostPlatform.libc == "glibc") [
@@ -52,6 +56,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gmp ]
     ++ optional aclSupport acl
     ++ optional attrSupport attr
+    ++ optional withOpenssl openssl
     ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ]   # due to patch
     ++ optionals selinuxSupport [ libselinux libsepol ]
        # TODO(@Ericson2314): Investigate whether Darwin could benefit too
@@ -82,9 +87,13 @@ stdenv.mkDerivation rec {
     sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
   '';
 
-  postInstall = optionalString (hostPlatform != buildPlatform) ''
+  postInstall = optionalString (hostPlatform != buildPlatform && !minimal) ''
     rm $out/share/man/man1/*
     cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
+  ''
+  # du: 8.7 M locale + 0.4 M man pages
+  + optionalString minimal ''
+    rm -r "$out/share"
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f48d65c11b4..0cf5bac9d8a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1945,11 +1945,8 @@ with pkgs;
 
   cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { };
 
-  coreutils = callPackage ../tools/misc/coreutils {
-    aclSupport = stdenv.isLinux;
-    attrSupport = stdenv.isLinux;
-  };
-
+  coreutils = callPackage ../tools/misc/coreutils { };
+  coreutils-full = coreutils.override { minimal = false; };
   coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
 
   corkscrew = callPackage ../tools/networking/corkscrew { };

From c52174030e973fa25c216fbc5ce9ab339a9f9b4f Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 21 Aug 2018 18:13:33 +0200
Subject: [PATCH 0063/3253] poppler_min: 0.61 -> 0.67

currently only used for texlive
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f48d65c11b4..53045fff4716 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11500,10 +11500,8 @@ with pkgs;
     introspectionSupport = true;
   });
 
-  poppler_min = poppler_0_61.override { # TODO: maybe reduce even more
+  poppler_min = poppler.override { # TODO: maybe reduce even more
     # this is currently only used by texlive.bin.
-    # pinned to 0.61 because texlive 2017 doesn't build w/poppler 0.64
-    # TODO: review poppler version for texlive 2018
     minimal = true;
     suffix = "min";
   };

From 149b180f180df8087f6559a0e7fc4ee37aa2dcf5 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 21 Aug 2018 18:18:30 +0200
Subject: [PATCH 0064/3253] texlive.bin: 20170524 -> 20180414

---
 pkgs/tools/typesetting/tex/texlive/bin.nix    | 30 +++++++++----------
 .../typesetting/tex/texlive/luatex-gcc7.patch | 30 -------------------
 2 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index b313fc0b53de..2975e1007ab0 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -14,25 +14,23 @@
 let
   withSystemLibs = map (libname: "--with-system-${libname}");
 
-  year = "2017";
+  year = "2018";
   version = year; # keep names simple for now
 
   common = rec {
     src = fetchurl {
-      url = # "ftp://tug.org/historic/systems/texlive/${year}/"
-      #"http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016"
-      # FIXME: a proper mirror, though tarballs.nixos.org saves this case ATM
-      # http://146.185.144.154/texlive-2016
-      # + "/texlive-${year}0523b-source.tar.xz";
-        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0524-source.tar.xz";
-      sha256 = "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81";
+      urls = [
+        "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz"
+              "ftp://tug.ctan.org/pub/tex/historic/systems/texlive/${year}/texlive-${year}0414-source.tar.xz"
+      ];
+      sha256 = "0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y";
     };
 
     patches = [
       (fetchurl {
-        name = "texlive-poppler-0.59.patch";
-        url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin&id=6308ec39bce2a4d735f6ff8a4e94473748d7b450;
-        sha256 = "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n";
+        name = "texlive-poppler-0.64.patch";
+        url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin;
+        sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w";
       })
     ];
 
@@ -83,6 +81,8 @@ core = stdenv.mkDerivation rec {
     for i in texk/kpathsea/mktex*; do
       sed -i '/^mydir=/d' "$i"
     done
+    cp -pv texk/web2c/pdftexdir/pdftoepdf{-newpoppler.cc,.cc}
+    cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler.cc,.cc}
   '';
 
   preConfigure = ''
@@ -165,7 +165,7 @@ inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
   name = "texlive-core-big.bin-${version}";
 
-  inherit (common) src;
+  inherit (common) src patches;
 
   hardeningDisable = [ "format" ];
 
@@ -180,16 +180,14 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
         # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
       ];
 
-  patches = common.patches ++ [ ./luatex-gcc7.patch ];
-
   configureScript = ":";
 
   # we use static libtexlua, because it's only used by a single binary
   postConfigure = ''
     mkdir ./WorkDir && cd ./WorkDir
-    for path in libs/{teckit,lua52} texk/web2c; do
+    for path in libs/{teckit,lua52,lua53} texk/web2c; do
       (
-        if [[ "$path" == "libs/lua52" ]]; then
+        if [[ "$path" =~ "libs/lua5" ]]; then
           extraConfig="--enable-static --disable-shared"
         else
           extraConfig=""
diff --git a/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch b/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
deleted file mode 100644
index cdaa968bd421..000000000000
--- a/pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://www.tug.org/pipermail/tex-live/2017-June/040192.html
----
- texk/web2c/luatexdir/luaffi/ctype.c |    4 ++++
- texk/web2c/luatexdir/luaffi/ffi.h   |    2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/texk/web2c/luatexdir/luaffi/ctype.c
-+++ b/texk/web2c/luatexdir/luaffi/ctype.c       2017-05-31 13:08:25.421741873 +0000
-@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
- 
-     lua_pop(L, 1); /* mt */
-     cd = (struct cdata*) lua_touserdata(L, idx);
-+    if (!cd) {
-+        lua_pushnil(L);
-+        return NULL;
-+    }
-     *ct = cd->type;
-     lua_getuservalue(L, idx);
- 
---- a/texk/web2c/luatexdir/luaffi/ffi.h
-+++ b/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000
-@@ -370,7 +370,7 @@ __declspec(align(16))
- #endif
- struct cdata {
-     const struct ctype type
--#ifdef __GNUC__
-+#if 0 /* def __GNUC__ */
-       __attribute__ ((aligned(16)))
- #endif
-       ;

From d5816c9bcb170281ba2b13acb0f19edf4b3cd1c4 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 22 Aug 2018 02:26:00 +0200
Subject: [PATCH 0065/3253] texlive: update server URLs

---
 .../tools/typesetting/tex/texlive/default.nix | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index ba03956ac325..e4799e39c434 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -121,18 +121,27 @@ let
               map (up: "${up}/${urlName}.tar.xz") urlPrefixes
             );
 
-      # Upstream refuses to distribute stable tarballs, so we host snapshots on IPFS.
+      # Upstream refuses to distribute stable tarballs,
+      # so we host snapshots on IPFS or on our own servers.
       # Common packages should get served from the binary cache anyway.
       # See discussions, e.g. https://github.com/NixOS/nixpkgs/issues/24683
       urlPrefixes = args.urlPrefixes or [
-        # Should be stable for historic, archived releases
-        http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2017/tlnet-final/archive
+        # A snapshot temporarily hosted by @xeji.
+        # TODO: remove when there is a reliable long-term solution
+        https://cat3.de/texlive-2018/tlnet/archive
 
-        # TODO: Add IPFS and see if @veprbl is willing to add a texlive-2017-final mirror,
-        # or if we should just dump it and go to 2018.
+        # TODO: Add another snapshot mirror
+
+        # TODO: Add IPFS storage or host snapshot elsewhere,
+        # maybe on one of our project's servers
 
         # The canonical source moves quickly and will be broken almost immediately
-        # http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/archive
+        http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/archive
+
+        # Should be stable for historic, archived releases
+        # http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2018/tlnet-final/archive
+        # TODO: use this later when 2018 is archived
+
       ];
 
       src = fetchurl { inherit urls sha512; };

From 738bae4ec2a73c16fa8d4f76b0a41474937a366c Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 27 Aug 2018 14:04:43 +0200
Subject: [PATCH 0066/3253] texlive: make packages fixed-output derivations

This reverts a part of the changes made in #40826.
Fixed-output derivations save time and space on rebuilds.
---
 .../tools/typesetting/tex/texlive/default.nix | 35 ++++++++++++++++---
 .../typesetting/tex/texlive/fixHashes.sh      | 10 ++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100755 pkgs/tools/typesetting/tex/texlive/fixHashes.sh

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index e4799e39c434..c10b9c992968 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -29,6 +29,7 @@
 { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
 , callPackage, ghostscriptX, harfbuzz, poppler_min
 , makeWrapper, python, ruby, perl
+, useFixedHashes ? true
 , recurseIntoAttrs
 }:
 let
@@ -41,6 +42,10 @@ let
     };
   };
 
+  # map: name -> fixed-output hash
+  # sha1 in base32 was chosen as a compromise between security and length
+  fixedHashes = lib.optionalAttrs useFixedHashes (import ./fixedHashes.nix);
+
   # function for creating a working environment from a set of TL packages
   combine = import ./combine.nix {
     inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText
@@ -116,6 +121,7 @@ let
       # the basename used by upstream (without ".tar.xz" suffix)
       urlName = pname + lib.optionalString (tlType != "run") ".${tlType}";
       tlName = urlName + "-${version}";
+      fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes
 
       urls = args.urls or (if args ? url then [ args.url ] else
               map (up: "${up}/${urlName}.tar.xz") urlPrefixes
@@ -155,11 +161,30 @@ let
           -C "$out" --anchored --exclude=tlpkg --keep-old-files
       '' + postUnpack;
 
-    in runCommand "texlive-${tlName}" {
-        # lots of derivations, not meant to be cached
-        preferLocalBuild = true; allowSubstitutes = false;
-        inherit passthru;
-      }
+    in if sha512 == "" then
+      # hash stripped from pkgs.nix to save space -> fetch&unpack in a single step
+      fetchurl {
+        inherit urls;
+        sha1 = if fixedHash == null then throw "TeX Live package ${tlName} is missing hash!"
+          else fixedHash;
+        name = tlName;
+        recursiveHash = true;
+        downloadToTemp = true;
+        postFetch = ''mkdir "$out";'' + unpackCmd "$downloadedFile";
+        # TODO: perhaps override preferHashedMirrors and allowSubstitutes
+     }
+        // passthru
+
+    else runCommand "texlive-${tlName}"
+      ( { # lots of derivations, not meant to be cached
+          preferLocalBuild = true; allowSubstitutes = false;
+          inherit passthru;
+        } // lib.optionalAttrs (fixedHash != null) {
+          outputHash = fixedHash;
+          outputHashAlgo = "sha1";
+          outputHashMode = "recursive";
+        }
+      )
       ( ''
           mkdir "$out"
         '' + unpackCmd "'${src}'"
diff --git a/pkgs/tools/typesetting/tex/texlive/fixHashes.sh b/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
new file mode 100755
index 000000000000..439660682e2e
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "{"
+grep -v -F '.bin-' | while read path; do
+    hash=`nix-hash --type sha1 --base32 "$path"`
+    echo -n "$path" | sed -E 's/[^-]*-texlive-(.*)/"\1"/'
+    echo "=\"$hash\";"
+done
+echo "}"
+

From f3961e5daee83351ea5891362e47413212079b18 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 22 Aug 2018 02:06:00 +0200
Subject: [PATCH 0067/3253] texlive-packages: snapshot 2017-final -> 20180827

and use fixed hashes
---
 .../typesetting/tex/texlive/fixedHashes.nix   |  7953 +++++++
 pkgs/tools/typesetting/tex/texlive/pkgs.nix   | 17286 ++++++++--------
 2 files changed, 16972 insertions(+), 8267 deletions(-)
 create mode 100644 pkgs/tools/typesetting/tex/texlive/fixedHashes.nix

diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
new file mode 100644
index 000000000000..344a91320fee
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
@@ -0,0 +1,7953 @@
+{
+"amsfonts-3.04"="hi87s0fxrkcq0w2389kwpxd3zzwsk1zf";
+"amsfonts.doc-3.04"="ch872rwfiar58praz8f880rcspy4mjxa";
+"amsfonts.source-3.04"="vjiw3vdxv44nl4yvaxqfy4b78girpjs7";
+"bibtex-0.99d"="ybimfc49fzmgpy88wagy0z55sdsshr50";
+"bibtex.doc-0.99d"="mh3fa2hn9gnyjgi16ald9fchd744f3vr";
+"kpathsea-2018"="9b90lrw78jjk538ksbg40dz3nr2q6lx8";
+"kpathsea.doc-2018"="6i8nvbq3zadqmw10nvp3yilv2viwpypi";
+"cm-2018"="l9569zwsmq1bxh4qnr5wj5nxy3dwrgc6";
+"cm.doc-2018"="36wag31jc0lrgncaxhcspiaqpwnw7xvy";
+"dvipdfmx-2018"="ijnr5k9wvwq8lnd22qjrrjmm962la5f4";
+"dvipdfmx.doc-2018"="lxrxnqzb6pchs4xvpz6jmzy0n10k8lb7";
+"glyphlist-2018"="i4nay4q38l3367hlc93rhkgxvrkcmyjb";
+"dvips-2018"="92wx71n0k4ia02l5m44xkmw5z1q22pbg";
+"dvips.doc-2018"="yvb21ygiq9ra39qhwyrnx6rr8gnch3jr";
+"enctex-2018"="j6lf040j733q0aj90wvx2vwq0x61zwdm";
+"enctex.doc-2018"="p2pad1ncy8izfag44p0pndyvgckfngvv";
+"etex-2018"="mdrs8yrrjf03pcndsr5azzxz7lvk08jp";
+"etex.doc-2018"="xdmkddsi3lykqy5hm03xamxsmmwplmnb";
+"etex-pkg-2.7"="2p6j6s4jm1y7k82jhh9lrfgcbph03h1a";
+"etex-pkg.doc-2.7"="0xlalpljqrcinaazh35yv9vc2a925h90";
+"graphics-def-2018"="yvcmr3xc5jflyh8fhaw0hgm68h3x5sk7";
+"graphics-def.doc-2018"="vykac1brcska9rhk2kni4krgjqwmcb7j";
+"gsftopk-1.19.2"="8fc88z3281crv5743qh5rzr0b51a2l8i";
+"gsftopk.doc-1.19.2"="mjyqyn0ydiwp1k3zwx2r4fc5vx0zxrzs";
+"hyph-utf8-2018"="7blj7akm7vnbqdixack7ijcms80byvwk";
+"hyph-utf8.doc-2018"="n782q211dnsvadl218qdv90s9zwbn7x8";
+"hyph-utf8.source-2018"="y0x4ri1aljc6q37zlq4rca0kla611ymf";
+"hyphen-base-2018"="my6s9cz4f5ffpwya4xgkwlaxyac8rxg0";
+"ifluatex-1.4"="ccsyxfkf1qb03cxnkfs6gy7iinz89dwc";
+"ifluatex.doc-1.4"="q5hxbffg8lk3qd2lw481frlhcfkc5v6h";
+"ifluatex.source-1.4"="8jqb26x3nmbh05ysd93cjklcsj1y5hw3";
+"ifxetex-0.6"="llq1x3f5fykh5mg6avzb1a21x1vh2mxz";
+"ifxetex.doc-0.6"="1iy2bgx7adrh6dbbrhraskqggr65f7f2";
+"ifxetex.source-0.6"="dl81ang1gw395giysn3vk6lv4v5h9xr2";
+"knuth-lib-2018"="cvjgvw8rwhmr98sz0y3azsyawzswcv3n";
+"knuth-local-2018"="g5vihblw8w8p8k8s14nakk959vpdgnh4";
+"lua-alt-getopt-0.7.0"="s2qkgq8dv65ib6chsah4xcargxh26bml";
+"lua-alt-getopt.doc-0.7.0"="xv8zqch612n2ww2pnpfranafcf7jhl96";
+"luatex-2018"="637hdgqiq1bdrm6whkgdmfh7fvag9v7l";
+"luatex.doc-2018"="pf47z05j4w0ng39rcfp49c450r13pfrs";
+"plain-3.141592653"="my32apfgd55b14vf8bsldaqwdd931gcg";
+"tex-ini-files-2018"="831h7dslin8dnan7llz8mki6zibqfglj";
+"tex-ini-files.doc-2018"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic";
+"unicode-data-1.7"="f7a8b4z76dgj38ql9ihsp5x26kcah09g";
+"unicode-data.doc-1.7"="fjhq1ix98k71xm4v6fqk43dr9fxsy9ry";
+"makeindex-2018"="yzy90d3n087yrdsawabd0bn7iwz3m1i6";
+"makeindex.doc-2018"="hzvip1ni9pcsdip58sfzb5a5l6avv8z5";
+"mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4";
+"mflogo.doc-2.0"="rdirf33m53y719b35aby2d98v1i0jhh5";
+"mflogo.source-2.0"="hl5rzcmk83lpc5rxcvy31kzm6qbwx3g5";
+"mfware-2018"="7mwvvyrb9cz2d3k5jl8r1fl238m3gl6n";
+"mfware.doc-2018"="gn08m3g32srfjwsyma8m375vzg7sb7ax";
+"pdftex-2018"="s8xr2haf4kzy877b5x4q86hcq4jqg5m4";
+"pdftex.doc-2018"="41dr04hkcxxjipvv53myzfsm30zyjb5q";
+"tetex-3.0"="i0ifc3ajz7c8qpcm03xb9aspv587569b";
+"tetex.doc-3.0"="v56ghpn9mw9y8d8bi2h3dj1qzj62i0xn";
+"tex.doc-3.14159265"="2ra9a532d58i270l6mkazbrjvsh0qhgb";
+"texlive-common.doc-2018"="1rpzarhhrni1mzkgrvijlkk46zyk08nk";
+"texlive-docindex-2018"="5j5z0j2qwdlg2v7wxwz8ndmbwql2s0vk";
+"texlive-docindex.doc-2018"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb";
+"texlive-en.doc-2018"="0cvrbfgwhl9i7b944ir9ykgjkqffq5s6";
+"texlive-scripts-2018"="4slnm2lcj74cbda5ilf6qspc66zw2f7s";
+"texlive-scripts.doc-2018"="wxw27zg88kf55bzlsp4bcbfvzlx11mgb";
+"updmap-map-2018"="s2zs5fapwpgqhwd67g6xdkkihcgnr73b";
+"aichej-2018"="rmm8q17dvb470lyarcvgbpgip24a4fxb";
+"ajl-2018"="j0z05x267dbbw5r8s0ybvlj0hwky6sg5";
+"amsrefs-2.14"="crmn3pm2zy2fcr5d82dwwwxjm42na6j3";
+"amsrefs.doc-2.14"="r45n92fihia786v5nsab5vgjvwgmij6d";
+"amsrefs.source-2.14"="k1rzn2d509i2nkfwclpbpir3q6a41ya9";
+"apacite-6.03"="sj9k6bnr8qhfddlzk7wd0daf12458yi9";
+"apacite.doc-6.03"="cbhyw6lwyg7mnx8h421y0hxf3h5m6n4y";
+"apacite.source-6.03"="cby7n3f9rzm83736nm4rn1m77km3lr9y";
+"apalike2-2018"="vf25kvilm8g379d8c5mkzv749nd9p8ap";
+"archaeologie-2.3.7"="n9y6kf0qg7nys6fcchpmnlx91d3s1kxg";
+"archaeologie.doc-2.3.7"="h9c8xi5dlxdnibzcyz4klm0d510prpcp";
+"beebe-2018"="9c4sq47c87cnhl29ala14jay8gwbf3wr";
+"besjournals-2018"="n3ljrkamca5v9w0rk3m38nqw86s1izc8";
+"besjournals.doc-2018"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77";
+"bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq";
+"bestpapers.doc-1.0"="mmlnsl83sil5zbdhwq16b6025sxdh9s6";
+"bib2gls-1.7"="271m8ipniy2126gn0jdmw70kbclknc3n";
+"bib2gls.doc-1.7"="vf8lgf1fr1sdglylp9lw35ccwsd3gss8";
+"bib2gls.source-1.7"="wkxjg942yvra6gjkqaaqjd3ff3n59l5j";
+"bibarts-2.1"="a7wcn8rhgh4irszdqk86ls1p8hpdnr7l";
+"bibarts.doc-2.1"="v2ibi8mncd5sf5x50hwj3gs6yilh1znp";
+"bibarts.source-2.1"="x52hqh053yzn25n75z1fr3siqdh7qkwn";
+"biber.doc-2.11"="3ajwx5dn05ncxj3yjciig97h55sipq9l";
+"biber.source-2.11"="54r0gnwivkr1bawb29awlvsqwg45pzbs";
+"bibexport-3.02"="6gc6r95ph3rkjzq038zk6w12k733qzwr";
+"bibexport.doc-3.02"="qapijzk1s6y6z02s4wnlw4vr6p96djxv";
+"bibexport.source-3.02"="iqp7q4fagafj6nfclsmj68lxljb8siw7";
+"bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv";
+"bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4";
+"biblatex-3.11"="x1f0j6dz4892anzvz7f90ryalj740l3v";
+"biblatex.doc-3.11"="kvlwjqca35lvjfakb8bd47swnav754l8";
+"biblatex-abnt-3.3"="nh9lrcz75k7badwfcj0iiiyiwymjlfvl";
+"biblatex-abnt.doc-3.3"="vay0vj186scg1r96gvznpplvzxp6k09w";
+"biblatex-anonymous-2.6.1"="1i0b23sqa1140jwh9b8xs2ia56jq5fn2";
+"biblatex-anonymous.doc-2.6.1"="vy0d6diwqxl6a960wfv4vi8wsilklhh4";
+"biblatex-apa-7.7"="ipnqgjkim3pbwknxmmmpkfyanva0whlm";
+"biblatex-apa.doc-7.7"="cbyngxhks9lc4mjy7drml5r7lmqik3h7";
+"biblatex-archaeology-2.0"="myfnjlj5654i20hqgkz977drwl24300k";
+"biblatex-archaeology.doc-2.0"="abv7mpp0vcnddpq37d1k8prahfybysgy";
+"biblatex-archaeology.source-2.0"="p8f9lm474wkphdd2xc6qn08kajfcwdpa";
+"biblatex-arthistory-bonn-1.2"="298lp84p62rlsin8y7spz0ig2g8wla3b";
+"biblatex-arthistory-bonn.doc-1.2"="bkssng4czmqvimlv8f2bdh4sxdrag13i";
+"biblatex-bookinarticle-1.3.1a"="bnx6iravlnrkkyqb3ah21p0ikq00ab57";
+"biblatex-bookinarticle.doc-1.3.1a"="6shjhb1lajkivsh3mrr2whli5hcsb8b4";
+"biblatex-bookinother-2.3.1"="r1bfwp8rzwmkbn47yi7m5lv5z4q439ch";
+"biblatex-bookinother.doc-2.3.1"="98cz0hzxvjs7qvc25hj4snm2cy6xqw9f";
+"biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w";
+"biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq";
+"biblatex-caspervector-0.3.3"="lpdqh2pgsaz1rm3zkpm07pgrac1hqxpn";
+"biblatex-caspervector.doc-0.3.3"="3c2lhsgv6ywx3q48iw2wc39ib9c4rgaf";
+"biblatex-chem-1.1u"="9kzj8k9k4lh0ksn182nfgaawzx4r7rrf";
+"biblatex-chem.doc-1.1u"="q5z0i2hrfb2lk25dbwsr22c95nkll9g9";
+"biblatex-chicago-1.0rc5"="0m7wf9glvcqm20cfn6xgpciz6nvg8vib";
+"biblatex-chicago.doc-1.0rc5"="zr7fqjvzg0i8nmzldwsidq8r58xcbhlx";
+"biblatex-claves-1.2.1"="yq5s9plvimz4w9san81swl08g2v6pa6q";
+"biblatex-claves.doc-1.2.1"="36qjs0m893389s9wkw5wxai04qp8zxs6";
+"biblatex-dw-1.7"="9nf2hg43q6if3v5hdrfxnpbdww7y06jv";
+"biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m";
+"biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg";
+"biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y";
+"biblatex-ext-0.4"="787r9401zk4w1i9m147zxqq5mw9c6bi7";
+"biblatex-ext.doc-0.4"="kbnramqk2a59041lcjwmjbs316cq2jjg";
+"biblatex-fiwi-1.7"="xwb00mw95l90bba4fc31kw62p43cxjz1";
+"biblatex-fiwi.doc-1.7"="y5hpi0gwp2s7hgqir2qw2yam9l3aqzdw";
+"biblatex-gb7714-2015-1.0m"="fqlfgjhmjv1p6mngxf73i9gf2snhqymb";
+"biblatex-gb7714-2015.doc-1.0m"="yps7q86kzsfm9b83k1rj70928kg811vl";
+"biblatex-gb7714-2015.source-1.0m"="754pspkv645430slq4dmxwn2nq5fjz61";
+"biblatex-gost-1.17"="db6rrz6vh7bhn8mi21lqii2r0ha8ii26";
+"biblatex-gost.doc-1.17"="2n6ghdccgmqgpd0rj53zhaja1p4dimd8";
+"biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8";
+"biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb";
+"biblatex-ieee-1.3"="281hd9qianiq4dcq4hzk49dxjiyx5jfv";
+"biblatex-ieee.doc-1.3"="xjbyag9x6jxgfzay00a91fr4dzw4wcaq";
+"biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf";
+"biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki";
+"biblatex-iso690-0.3.2"="y5032mfrc8djxnwsawcpa611rpdhmas3";
+"biblatex-iso690.doc-0.3.2"="rsv82pgp6f8prdw2yqw6zw7q94wk1sax";
+"biblatex-juradiss-0.1g"="0smwgi3vg97aiy6w8ya68zmaz711drlp";
+"biblatex-juradiss.doc-0.1g"="d4dp9hld95b70k8b5qxlmvcgcsxpv0g8";
+"biblatex-lni-0.4"="zdvp9ryfiqp1lwpd7wykvf35930m8dgl";
+"biblatex-lni.doc-0.4"="03p51dcn30nzhckd6qhl452f8jv670b3";
+"biblatex-luh-ipw-0.3"="83gar343q3h1h96h8lzs2bmsp1ba82n0";
+"biblatex-luh-ipw.doc-0.3"="yxcknwckw9s58qhrbdd70jz5yrpnyip2";
+"biblatex-manuscripts-philology-1.12.3"="k8v4hc5l13nn4v5q9ls14sk4gzwvbql4";
+"biblatex-manuscripts-philology.doc-1.12.3"="4c4hqjh6h56ipbjjgyjcr683lj8y1kiy";
+"biblatex-mla-1.9"="1m10jmh42x7qahq16bzi2rwvv7j7biq5";
+"biblatex-mla.doc-1.9"="f6b9nj6xj93vikp4agvkrjddrrgfvjc2";
+"biblatex-morenames-1.3.1"="vbcnaicg2pa0jrqd170cs31wim08yk07";
+"biblatex-morenames.doc-1.3.1"="ksn965q79yv6badima68frbgmycjz9pn";
+"biblatex-multiple-dm-1.0.1"="6c7h8i04ksazrq2lbc6hbpcxkjdvih07";
+"biblatex-multiple-dm.doc-1.0.1"="j1hb0xn9gz6mywx018i4rq4g5xwi7af4";
+"biblatex-musuos-1.0"="dj5nsyf90mbi4dlghyh8aklqr28jvx76";
+"biblatex-musuos.doc-1.0"="ypw7naafkwm22kfq1hd4b0z665g4jz9p";
+"biblatex-nature-1.3b"="y20xyps9q45qlg8yrqr690az3w0kw008";
+"biblatex-nature.doc-1.3b"="7vpc38g1zy7jxw074063x57n1v72h7hw";
+"biblatex-nejm-0.4"="3sb2kazf4ch1yp415iqjnq30ykn7jd35";
+"biblatex-nejm.doc-0.4"="m8km67d5x860465qiwdjxx3vxh8fb7iw";
+"biblatex-nottsclassic-0.1"="gyisgdfsns506vcbhyr7a20mnbhmldr9";
+"biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh";
+"biblatex-opcit-booktitle-1.8.0"="0lywwxk0m89lf344lhvif3281b8grj31";
+"biblatex-opcit-booktitle.doc-1.8.0"="1l3m97j1dbiy6sbffhivlsqlrhnzkzz9";
+"biblatex-oxref-0.12"="hfkqmbyazl85nsz0n3rfgy6kllfygpcq";
+"biblatex-oxref.doc-0.12"="d8pggijn7xck4pfmrll7n8x44b1n8phb";
+"biblatex-oxref.source-0.12"="bizsgj5528gflj8af0p939kgn5vhg1iv";
+"biblatex-philosophy-1.9.8a"="kha09gq8n5db4fxh2w6s5690vms39hlw";
+"biblatex-philosophy.doc-1.9.8a"="3m8nl72q1q3hfv3xxdj978pmxjvn43s2";
+"biblatex-philosophy.source-1.9.8a"="3102fdih2bxplhadmwvi09lns9agflcz";
+"biblatex-phys-1.0b"="zhp8wd9n07mqvniay7339c6lfv5nhlws";
+"biblatex-phys.doc-1.0b"="pi77vmsc3l3p0y7d17x4rzkz9z6nz1j3";
+"biblatex-publist-1.10"="nznf05xfmpg0hgf9hgc37c84794nr5aa";
+"biblatex-publist.doc-1.10"="ycxrsh2h4xwip87j1fhalgqvnq5gbf29";
+"biblatex-realauthor-2.7.1a"="6qb576bh9x616f02msiq3xz83xzaa047";
+"biblatex-realauthor.doc-2.7.1a"="9pbd2aixmwj8as9lrmivkkfl4081820q";
+"biblatex-sbl-0.10"="7lqir3r3mz7a8ia274nyk2mwiips4ib4";
+"biblatex-sbl.doc-0.10"="40ip0h61fykbj4g4dpx5jbph1rm4yrkk";
+"biblatex-science-1.1g"="a9c3rbxpjgmh94052kn89xfpy9hh5wrb";
+"biblatex-science.doc-1.1g"="yrk1nxnzvwd03ng70al47qvvxfrgc086";
+"biblatex-shortfields-1.0.1"="ji0p9w4dzyf4mi46nbcpvswas9r40xij";
+"biblatex-shortfields.doc-1.0.1"="4lq9x8wydvl7vmnl7wvz3x3zarnjgld0";
+"biblatex-socialscienceshuberlin-0.0.1"="63ccn3japdafc8mdxncldds97zvkwa64";
+"biblatex-socialscienceshuberlin.doc-0.0.1"="08n3z5lxx9sjrlwf747h9z38a1nk1wdp";
+"biblatex-source-division-2.4.2"="kdxm789jnmvyzkx7pi9983jq25p30iib";
+"biblatex-source-division.doc-2.4.2"="4j6h8k98v95n05lzfzp8804gir24vbmc";
+"biblatex-subseries-1.2.0"="v7rfg6wqkqgzm8fwrg0ncwinjzsibcdf";
+"biblatex-subseries.doc-1.2.0"="hgqxbs3qjqya9pxs1spylh2m1clfg5zk";
+"biblatex-swiss-legal-1.1.2a"="lp3jw955jpyfjyn6mp6wna8rqwbhsvfj";
+"biblatex-swiss-legal.doc-1.1.2a"="23bam0vm3zqrcj1cd10g8bml0jsyvmcq";
+"biblatex-trad-0.4a"="56an46jjpvfzrxsif262x8zm81m6ly4i";
+"biblatex-trad.doc-0.4a"="i3b3iybys9x78z52bal216qi3p6xr83z";
+"biblatex-true-citepages-omit-2.0.0"="y7mg4jqb3fl9mzy93xcpxz3y0l5fw3kc";
+"biblatex-true-citepages-omit.doc-2.0.0"="7cxbqdyazdfp0masgk6a31rr3h9606xd";
+"biblist-2018"="b565jl60ysccd5qkzgidjb188i509y9l";
+"biblist.doc-2018"="50kjqxwhdncn09c7cx0abkcihvhfzzpl";
+"bibtexperllibs-1.5"="nnb90d3rqwa1vcc92fmmbnhs7di0rkgv";
+"bibtexperllibs.doc-1.5"="mzvrc7zyrq6agqb5vhxy743brp57yf4j";
+"bibtexperllibs.source-1.5"="ailmqz0d71gscxa584pkb6jpvvzish9r";
+"bibtopic-1.1a"="r3rbv97qik2ikmkp3vx6srw7qf5v704c";
+"bibtopic.doc-1.1a"="anrfs022bvwbfwsm05hxl10zgwckidn6";
+"bibtopic.source-1.1a"="s32v3bwk7a1aqfkmp1scaf812x6ra9rx";
+"bibtopicprefix-1.10"="88rj42z15zlp4x439faf8x8qm062vqmw";
+"bibtopicprefix.doc-1.10"="km3hfa44kxwjbf0d1np34vsc0n7qkn9b";
+"bibtopicprefix.source-1.10"="9al2wqnk8affigq30j4zb70ds2hgzqmd";
+"bibunits-2.2"="vkahqz7zjn0g4dkpffvg8rfhjlynvmnf";
+"bibunits.doc-2.2"="d6xcf9xdkabjg3jrnyklla7kpbylrg61";
+"bibunits.source-2.2"="1hxc8yqjpri8pn512pfvcq7b2m9qnwib";
+"biolett-bst-2018"="c2iw962bwa5815qk2sbhhqjd7z4ygmns";
+"biolett-bst.doc-2018"="7w39z3hdps980l2g1yqbzy8384w4vbqr";
+"bookdb-0.2"="b4mqk50dn86zf30w2z8953ms8m8v9lrs";
+"bookdb.doc-0.2"="y5sdn2fijycnyx9is1cqc5vx6zkyav62";
+"breakcites-2018"="cvqm5ljgdl47idyjvfs2hg98xmkscfj9";
+"breakcites.doc-2018"="jjqimy63648q6n4mzlwrd7p723m09cbw";
+"cell-2018"="qlg2sy9fj9cv6c8jbdmwzysadl8fhw8b";
+"cell.doc-2018"="61a0456g9i76nxwhpv18fw532nimk2l4";
+"chbibref-1.0"="7d51sy03z9ww5ns8x0mfiplyk00dgb00";
+"chbibref.doc-1.0"="xyypa6w4gx297hpp1ixg8g431rz436qf";
+"chembst-0.2.5"="08b5a38p2x2xgv5nw1ibi0xpc4xqixnn";
+"chembst.doc-0.2.5"="wgbb4bcl51wnixp4rb94qqqn880mxm7f";
+"chembst.source-0.2.5"="360yyds5c6mbcsm60mm3jq8xfxcpnw5v";
+"chicago-2018"="k9y76g5a4nfy88igklw08n27zvnnap2b";
+"chicago-annote-2018"="nyasy7sal5vikd1jysdvhg0ym7hs6q0p";
+"chicago-annote.doc-2018"="8qhd3kj016s9laavhg1wvimy4325zz0g";
+"chscite-2.9999"="yc7v9v66md3dy5k2gjswzh58xzxdhwp4";
+"chscite.doc-2.9999"="fbcykh46rifs4kvn728sav04fnshr6br";
+"chscite.source-2.9999"="vsii846cdlrd9fdmf4npwy8jxh0fcafb";
+"citeall-1.4"="q68vpb470x12izyjbf7ax4ni71hvwpr4";
+"citeall.doc-1.4"="246v29kz1slb8m3ib5rhnp74lhyn761j";
+"citeref-1.1"="hs7rw9cynm2zbr8s7455l1hakvr2nz2r";
+"citeref.doc-1.1"="fifrx8d8fq9msajvpg2wwj7xhv6l4h20";
+"ae-1.4"="zx6mlxrdhfvp0a5ql61jhlj97pcxazwz";
+"ae.doc-1.4"="pgvyvlql6hncc8bv2wdf8ja6xxqjjqs7";
+"ae.source-1.4"="jzwswwwsb988mvhiiyb7p43g33985n8p";
+"amscls-2.20.4"="hjr4w21h3fp0y6m5gb30p6f54ybv0l0j";
+"amscls.doc-2.20.4"="zyf0gsqks7yvszlngwzjbjiigc0943cd";
+"amscls.source-2.20.4"="8lgim0r54srk961ys2q7v80dq5w04i9b";
+"amsmath-2018"="zn4jrbn7g5g2x2syj3qf3464b4vwhzrb";
+"amsmath.doc-2018"="7nqv62qf2llyyjw65g8h6j6qysr1w3lq";
+"amsmath.source-2018"="4y9hzn1h7k4hapz6r43zdmqdqnrwrznw";
+"babel-3.22"="krx7nwrdzpbbvghk2wnp986hqr5wgy65";
+"babel.doc-3.22"="14qmwykr9k1irkxk1vw6mnm18ibjrqyf";
+"babel.source-3.22"="i1an6i7wjs71l9li4glvlk2ssci80w6s";
+"babel-english-3.3r"="lrsz299wwvr17sshfjvsvrzs0s9y2acs";
+"babel-english.doc-3.3r"="y7rp46lrpxsp8z1ridc6msxnbb008k0c";
+"babel-english.source-3.3r"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9";
+"babelbib-1.31"="amkn9a5k0ggifkz1yczzlgl6lxklb1rn";
+"babelbib.doc-1.31"="82pbrcmmfxzpzb4aid7a7gq4wd4y0d5g";
+"carlisle-2018"="wlkxgqdq20dlbinabdia2n1af9nhz5vm";
+"carlisle.doc-2018"="i2mg4zqlcsipqcz4wa9y9p89nnfzvavf";
+"carlisle.source-2018"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv";
+"colortbl-1.0c"="q4rjy2g8c6gnxgf8vp9kb3gzlaxyjwv6";
+"colortbl.doc-1.0c"="ych8avxp4ddrk3acvi8qyrpyr5hgi7ps";
+"colortbl.source-1.0c"="44216329y627fali8bcqdvsric61rd2k";
+"fancyhdr-3.9a"="idiiqa9l63m9b3fl8pkf684jwfycadbk";
+"fancyhdr.doc-3.9a"="957y2whhqcyyyqrdyn93xrigryh9shjf";
+"fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83";
+"fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng";
+"fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p";
+"geometry-5.8"="3xdzw74y7vizrlzxrcb5xbqzs67v8g02";
+"geometry.doc-5.8"="w0ldwyyv86y0d8ghpg9x603ldmqa33gw";
+"geometry.source-5.8"="x0dgg7kpn2apxabf2clw02ba8ci83pvk";
+"graphics-2018"="4n0jknkfdlb4wn4rhdvd9mb2qwbphm67";
+"graphics.doc-2018"="kd2f457spavjh20mm4as67ndk0vyy0gd";
+"graphics.source-2018"="2j3h2ql32np0wfhqhzvkqchxw1f03fsp";
+"graphics-cfg-2018"="j73na78ajl4n50wn2is5wvw7mf27da86";
+"graphics-cfg.doc-2018"="nzdjyk00lx0xhflm04d2kmyn5ya2v487";
+"hyperref-6.86b"="7207gxmjryyxlh8krjz50w7yzk5n709b";
+"hyperref.doc-6.86b"="sk4myys4mh4kv30kz3c3ih7pw80flxmd";
+"hyperref.source-6.86b"="chhn2vbvzhms155skm8h90s4nsa42p5x";
+"latex-PL_5"="kiswr84j4w7lm5353qzzjc4ljcgv9ann";
+"latex.doc-PL_5"="m2p84w03bsxlnmlr868rfgmkrqis26z5";
+"latex.source-PL_5"="2xny2g3ii8xs0cvd31g3w6vglkddrq49";
+"latex-fonts-2018"="pw97wy7b4hhzm28r0wl44lacn7nx41ia";
+"latex-fonts.doc-2018"="mv9ivpdxgyjj92fq9141bsw5s306mg83";
+"latexconfig-2018"="rpwazy1znnhn7bdbnrcckqkddmxxqzqv";
+"latex-bin.doc-2018"="4jd2pggj1zf9jjgvbxvyn5p926vlkm7s";
+"ltxmisc-2018"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x";
+"mfnfss-2018"="52p8xnxca0ypcxbbjakx42mljjwv5jjj";
+"mfnfss.doc-2018"="0c2hn0h964j1c0kzn0aq19cvff0n87hs";
+"mfnfss.source-2018"="829y6cng0z45bdsb2vdrs4wkq2pp0cxz";
+"mptopdf-2018"="8a9cp2fz1ayhq8x7c3c609fzjd6dxz1x";
+"mptopdf.doc-2018"="8wb8ykq4zb9hq4gls0kimhbs1j1rhd82";
+"natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj";
+"natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg";
+"natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj";
+"oberdiek-2018"="c3pld21gdcxkjfmjd6mgsdbiz8pbq5cf";
+"oberdiek.doc-2018"="mijl168dd1qjlazjibsspd2jnsa59bjs";
+"oberdiek.source-2018"="npppg3wng6bxsj17722awzn6kqnpampa";
+"pslatex-2018"="7apd53ad70mr9pf8ja87iz4cfm41qs9p";
+"pslatex.source-2018"="cqc3yah7p9cgbbsj6var19b4xzyqj01l";
+"psnfss-9.2a"="a4gfps30ywrjdah9m5dknsv5yl80h0gz";
+"psnfss.doc-9.2a"="pbiaqsf1gqrwic9pf499k89aw757wr9m";
+"psnfss.source-9.2a"="vi285d52bbvq01x4yan9md3cck4dc1lh";
+"pspicture-2018"="siqi85kfmyg91cf7nggs71jh38g2aicl";
+"pspicture.doc-2018"="h26v6akzzgg6hn4ay096fvg2qw6l2ww8";
+"pspicture.source-2018"="fclpkng5q7dhd1vfzv2031r4l3f3vh5y";
+"tools-2018"="hfjqnxf3wvb02xnc5mrrrwk32k1xw8p2";
+"tools.doc-2018"="65ny1nbrh1v9mr868dir1pvwqcvb8n2c";
+"tools.source-2018"="gpsssf643sahl8crcwnz160q2l8riv1v";
+"url-3.4"="vf34zjwlv43kcw53sdla9052x7x0kn7y";
+"url.doc-3.4"="ii3z3l7xkmrkxb8dkgk6lcqyb34niirc";
+"collref-2.0c"="xxcnjj8qnbb06zkmh5kqysdm6k5yf4z4";
+"collref.doc-2.0c"="5a9ns23lv1n780ll3kp969dhi0mx93gb";
+"collref.source-2.0c"="7msfby8bxs89i87jiibpbnp97byjs6p5";
+"compactbib-2018"="5365y0lxziirnp7rraxwbcksrky9hr1m";
+"crossrefware-2018"="qb2vwvcmvb0xmsj75vxgd7fn26c5npmf";
+"crossrefware.doc-2018"="69qdw8b3xrqnydxih94sjpj7pd8jpy5x";
+"custom-bib-4.33"="9vqjbilzlsqg3f609hnz27pwmrl5gfg5";
+"custom-bib.doc-4.33"="nz1gxi8ixypxpf4cv7nilabq1ivr6fiz";
+"custom-bib.source-4.33"="vmak3xkin0hmg92mmpxj53dgs2f2yihg";
+"din1505-2018"="dc7lv2c8zid1c6pklllsiac390hx0v4c";
+"din1505.doc-2018"="fhdc3badjmz3zylmgahy34fbzjgkss0m";
+"dk-bib-0.6"="yvbpqypgxkh6i47yvkk0cp7qsfy083gr";
+"dk-bib.doc-0.6"="px69q4pi9444kwmw6fpmajvdwl8ivw9i";
+"dk-bib.source-0.6"="1jmv0pg8x913y6y0xjb888s0zg91iw1l";
+"doipubmed-1.01"="wcw6jjj2y6mikmx8a4if14277szjqzak";
+"doipubmed.doc-1.01"="yiws3r5cbfhdws0s74sn314q4iq4hxjf";
+"doipubmed.source-1.01"="mz2ld43x7sp8np0qmcs86p5lc09nl4dr";
+"ecobiblatex-1.0"="ikxp3jlzlsnc7jh7vcxcfq8wvpd5r8ll";
+"ecobiblatex.doc-1.0"="y5hifg3r0xkgv6zklw7l9j7shl87fnf0";
+"economic-2018"="xw85nd7v6i1d2ma0airnc7bwf1fdsipp";
+"economic.doc-2018"="pv3irnv3gj70q22ac3kr858hac50vrbz";
+"fbs-2018"="h6ghp5i14cqy46hzp9i481c8gvk2ddza";
+"figbib-2018"="imp65i6ddqyw5xck7k6gzb976glq9xj8";
+"figbib.doc-2018"="6v3sj56vg039mrm7kk71wdjhp04h1rf6";
+"footbib-2.0.7"="xhrwnw5kvs3rxp32a8awv8ma7098cv6h";
+"footbib.doc-2.0.7"="dzyra0rwf5hl2g6f7c2pw88d78f7yls1";
+"footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm";
+"francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia";
+"francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd";
+"gbt7714-1.0.9"="g9sjibxccn227yv5gjg4xa7vi5jvrplg";
+"gbt7714.doc-1.0.9"="2vid9662wbyiq05lwlis2nnqvvyyx00v";
+"gbt7714.source-1.0.9"="975jm1lmx6g3g3hl98mjkr55vzp3006m";
+"geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6";
+"geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm";
+"geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1";
+"harvard-2.0.5"="yhk8zvlhgd1knzfdndba31whwj7ixh1j";
+"harvard.doc-2.0.5"="c3jps721d0cndqjqgqkhcz4n7xvaj1f2";
+"harvard.source-2.0.5"="kjg78fvynjjna03hh2xzcrqvsm8d9yjw";
+"harvmac-2018"="30iiq3zikvmyy87j98knxbc9iak232bb";
+"harvmac.doc-2018"="3q1j6s2rdz18fg3hknp7ifyzixgmwr8h";
+"historische-zeitschrift-1.2"="6zli1x9hz1dsy8p4hpi9rdb0hs35vka9";
+"historische-zeitschrift.doc-1.2"="y76j031x8zym5i6sqr0r67ws0z49q306";
+"ietfbibs.doc-1.0.0"="mqqb9qjrk1lg7w85w8jbhizmh1qh4zqa";
+"ijqc-1.2"="ry2ydiqc71zjfkb46l4fvlxa1h6wnq1c";
+"ijqc.doc-1.2"="zz9ai19qd2rxvpw5kx1k1rd3ndndjv6v";
+"inlinebib-2018"="gkr44f3f9m92bx42gcvwgzclbjya5gdm";
+"inlinebib.doc-2018"="bpfx7h4w0zqr7xdxn51glllzf20qj24y";
+"iopart-num-2.1"="92jbzj605pi9chj3ymfxm9ii2dh62haz";
+"iopart-num.doc-2.1"="smix69mc1n89q45nw3rl18lasn2c2kwa";
+"jneurosci-1.00"="r5k91lza98jn52s8fmgrbclslb6zps08";
+"jneurosci.doc-1.00"="z01ga0ccmahx9i6p2bvvl7mr8676ki7p";
+"jurabib-0.6"="xlxc8i2x6ddydrb6n8myqkh0j5acn9y1";
+"jurabib.doc-0.6"="jgf4mbfd2vy1ihxa2fm7h90s75wp8mjz";
+"jurabib.source-0.6"="2ihyirxdbfz55js8nb8fjnzj4fwr5fji";
+"ksfh_nat-1.1"="9rsf0xfzd2am2ap7skhj4nrs6nkyxpp7";
+"listbib-2.2"="h7sl4g92wc0h56k7a13crhnj9g0xlb3g";
+"listbib.doc-2.2"="jgdniqxy4x1awiyls70z9lsycy61fb0l";
+"listbib.source-2.2"="266hzszszrdwa0x6hk5xrz9gjs1srsb8";
+"logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0";
+"logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv";
+"ltb2bib-0.01"="mid475rg33jg29rxq0ci49vq4y81j4ng";
+"ltb2bib.doc-0.01"="7k2q8zzzhf5zf71fw0yinyghlb1kwqy7";
+"ltb2bib.source-0.01"="8py2zhz04b0hals44ypv67m2c71b1j0p";
+"luabibentry-0.1a"="lm4x9gqyj8ha0cjwmmy7h4yffnd8wymx";
+"luabibentry.doc-0.1a"="psn62xnv0l494i67jzsc0sbij0r2kcvb";
+"luabibentry.source-0.1a"="9l96kjwd1kwkj7rjcrlq3vcyiylbawrl";
+"margbib-1.0c"="315vswcfl035s528hmj5wvl43iar5d0p";
+"margbib.doc-1.0c"="lix6xbc2in8r6cc1yvdb565nky1f6jq3";
+"margbib.source-1.0c"="gnjk0pwcdim1mnbsyq9mmkmrqw75a771";
+"multibib-1.4"="6sjcmriv5y27z54i0q6nb4c0wxyqc06f";
+"multibib.doc-1.4"="gwyxcbw8csmiyid8ck2sjgkq9hmx0k6m";
+"multibib.source-1.4"="kp5q2hjb64a1vhj4zbb0ah0c9c5cc0xw";
+"multibibliography-1.03"="3svp5l6al4k7adk99d6fcy7m54qbfbqy";
+"multibibliography.doc-1.03"="1bl112qsviy7jzhm1qdvn42x0lvcnjkd";
+"multibibliography.source-1.03"="65bvyr4gr7sdwhsraq9rmbv16d4fi6qc";
+"munich-2018"="0a6hgpvjyd8hzvmrf5bjc6rniwj39bx8";
+"munich.doc-2018"="22c6rhm479c1gg7df9mzza2vl7jgb3ij";
+"nar-3.19"="iaann8dbnvignc32m1wnlz4j77i7ngx8";
+"nmbib-1.04"="mbz1wjyaxsx3cn4wymvz4w9wf10580da";
+"nmbib.doc-1.04"="s6bbxc8lyp7kbrpsi0i4jrvda00260ks";
+"nmbib.source-1.04"="x0gvyn54csgywd7wlmbi0c8djkwrp4xq";
+"notes2bib-2.0k"="q8dvcbf4dla1x8lrpsr6lmd4racfkfps";
+"notes2bib.doc-2.0k"="mw3vsv53vpng36nqwiwdw4aj49gq6rq1";
+"notes2bib.source-2.0k"="zllxh9jj5yakjw8pswdj5mv7cmm99lf8";
+"notex-bst-2018"="x4042ry48i6p1qr2l4yv0d52x4wmjarg";
+"oscola-1.5"="v2cq7pnq79yc15iha9mb4q9avcywfga4";
+"oscola.doc-1.5"="0a1yd9jz5snmzjydnawr6d154ad1ylbz";
+"perception-2018"="pcwr35lpv0zksvw7nw9hk08m81xq6mgx";
+"perception.doc-2018"="sn4m1gc1s04h1crw3gbaahbxa6b76npy";
+"pnas2009-1.0"="k4xy9dabg8i4mf18317wf8mp3hrlpmqy";
+"rsc-3.1f"="4hhv7zw4v3w8sslxwj14pk4azil1cdhh";
+"rsc.doc-3.1f"="d20wkd2qw8dabh30gdpasxqacn193f1b";
+"rsc.source-3.1f"="rfsxjn597ylr3m2vl72dh7fa8x2a08yw";
+"showtags-1.05"="hbxk7ijniaffjnk02hkjwgw8gwgnx5qb";
+"showtags.doc-1.05"="q22k5ckq0q4228ssvqnz9n139x32a5iq";
+"sort-by-letters-2018"="4m8cm6rnhgsc40liy2yhfc4r76zpdnsq";
+"sort-by-letters.doc-2018"="3z4kw7hvnjmp7hlfjw2gchraw69zyx09";
+"splitbib-1.17"="az1n021wdajs8dc0q93wgfb1r0jcr2h2";
+"splitbib.doc-1.17"="qsb89h2ch89qhbxir7f90xx5sqvgm1px";
+"splitbib.source-1.17"="c9m7hp7fh86qj53qwaqxh8xj8yf3gxdy";
+"turabian-formatting-2018"="dcm9mzg25w818sqjfhd7ih3azvydv0qy";
+"turabian-formatting.doc-2018"="2qhbgk9x91k0r4ar0hc3jydw1raaf3z0";
+"uni-wtal-ger-0.2"="i4nr7hq5gym5rcs2pc43qclci7jy9y4m";
+"uni-wtal-ger.doc-0.2"="a4r7w5m71h1kfgzxgpmb84hndnhrxhhy";
+"uni-wtal-lin-0.2"="8cdd4qcy3i5bvf25nn89kdaqph3a6fan";
+"uni-wtal-lin.doc-0.2"="cmaxr111gp38f9s5n42lg66c4i7iyz2l";
+"urlbst-0.7"="gpzjqqbgn0c8nx2w9dmbq1imgvdqym49";
+"urlbst.doc-0.7"="zn0qpl0y989d5489haj0cxi5dhvx8fgk";
+"urlbst.source-0.7"="5zckw24fv8ws9dbzmyvd4xsb5bl0vb0q";
+"usebib-1.0a"="4b8sv3fknxfaz9cgnvn3l5wf9c8c76wx";
+"usebib.doc-1.0a"="ba1nqv90zkfzi8n17xlk7rkx2s92lkd9";
+"usebib.source-1.0a"="967j287dsb1j4wa5k9sxsv4xp7194q3b";
+"vak-2018"="7ar45am5q9mhv8liz1zvix9wgcwqgjhl";
+"vak.doc-2018"="sr1gi7csll74iw13j24r1hdwn3gql9ak";
+"xcite-1.0"="fpgsqqg3rliap6chn99xzlj676ll25hd";
+"xcite.doc-1.0"="wvhx1d2wkws7fcrplh55v9fsq1r8a3hw";
+"xcite.source-1.0"="8n5kfjr7xfjicd1hw6hlhcrn8dzicp5q";
+"a2ping-2.83p"="m21nz62sqww6qr7nivlp4navy43gzlig";
+"a2ping.doc-2.83p"="wm8grjzd0hxifxana5dkdickv6b0ji4v";
+"adhocfilelist-2018"="l8ayz7mqaa5lma2bvqb2brc879y0viij";
+"adhocfilelist.doc-2018"="gm20nhwq88s1cmch3pcgkqnyahb5gnri";
+"adhocfilelist.source-2018"="3qx23im0z07cnk2bd5vrskl153zxy6ff";
+"arara-4.0.3"="14xy2ys8949h11h4b5zvwj5g4ydji01q";
+"arara.doc-4.0.3"="qwc6mma531i9idja3zw0dgs7w86a5ab2";
+"arara.source-4.0.3"="k7gcbcvgmik70a4i7xaa6a36sccwl167";
+"asymptote-2.44"="mgrlxp24znrbvqh449bjc4z6mm85lwfh";
+"asymptote.doc-2.44"="ngsvz2afsiv53yrhaf74xqsb8vcqxiy6";
+"bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1";
+"bibtex8.doc-3.71"="glkl9d9h57q9q6dpyszcqc3axcxbw888";
+"bibtexu.doc-2018"="yppzw0banxngki9dzgm7dlm8cr9vnxya";
+"bundledoc-3.3"="l8hik9610hiabab94q3nwiyxc465rjsh";
+"bundledoc.doc-3.3"="w5f7l7n74hdmyc5idbfs9pgl1nas2azs";
+"checklistings-1.0"="a2gvh85pcmrc82wq4h6n9ycqj86z9f8d";
+"checklistings.doc-1.0"="ymkplhp7331fs0kq4qcpmh9la0wxj5lq";
+"checklistings.source-1.0"="8ya9yd2by50zppk7rrqjkc34ans6ffb0";
+"chktex-1.7.6"="4khiza97qvhdbzdlz7pacnr16zmi9b9d";
+"chktex.doc-1.7.6"="1f1dbhlq7m6d14ncmp1z080nzn7cawn5";
+"ctan-o-mat-1.2"="jgbscps642n6xss5m0nwp689q5znrgij";
+"ctan-o-mat.doc-1.2"="iyrk7zg661fdjapxqiwsgd5afiwf5ijh";
+"ctan_chk.doc-1.0"="m4i1vj19h48zyk9pxadfq1qrwmvqy3i1";
+"ctanbib-0.1a"="h1139k4438fxfj9mh469wssasbvbw08c";
+"ctanbib.doc-0.1a"="k31mb4pkhh2s8l4gkhjyhw42a6j2gfc7";
+"ctanify-1.9.1"="y939628500ks8apq2qdzcbj490y0c4bb";
+"ctanify.doc-1.9.1"="dfah3y6kn3r18mjj39p13mq7y6zpalqb";
+"ctanupload-1.2c"="jmvh3rrdy0hyvdxz55gydlgsh7xzp4vv";
+"ctanupload.doc-1.2c"="38wlhcxvvpbk01sj6vhwjs9mccw1xs14";
+"ctie.doc-1.1"="af2mrxy0q5bw0lbahcgdajgfyjd8zi5d";
+"cweb-3.64b"="dn4jxisghqqp3skrd0f8s6wm57n6cakn";
+"cweb.doc-3.64b"="aphwd72i8j9z7qxqnldhr2cdjj58yh2w";
+"de-macro-1.3"="mscrdz5y4zdxszz37dnh6kw4hmwm185q";
+"de-macro.doc-1.3"="hdmn9ds4kiqsalhx5r2l4adv19ijf5f2";
+"detex.doc-2018"="6w5lilq5ci01pq7x2bv6gyihm55kc75n";
+"dtl.doc-0.6.1"="cij54ziw2awway2hjjff72r6l3h8kigz";
+"dtxgen-1.07"="nl5dq5v54hww8rwyxrq6l6vrimzh352q";
+"dtxgen.doc-1.07"="n9c7x9ga79p3gvgb6g3mhn3j3xxy63zw";
+"dvi2tty.doc-6.0.0"="wd8i2fsxc5brrj3shsr7jc6kbpyv08x3";
+"dviasm-2018"="067hdpnlygz61wqwami0yykml0hmnbk6";
+"dviasm.doc-2018"="wj8a3skfwd5i6d1hb8v3dghijlgmbmdc";
+"dvicopy.doc-1.5"="py5hcd21sh89vqmq8rps4x6qzp6bi410";
+"dvidvi.doc-2018"="5ah8ppyjp4m5ki7rvj1p0rpaazjlchrz";
+"dviinfox-1.04"="zjbfw4kzwfqnvlwzvjibsgim855fc30c";
+"dviinfox.doc-1.04"="1n52la52nchv27j82lisrh8q7wygx6lp";
+"dviljk.doc-2018"="q5cciai4i11m07cq1qlyasf2qwjsmzvr";
+"dvipng.doc-1.15"="68fh0x7arqdrp8gia0nsb7ax8rssqpnh";
+"dvipos.doc-2018"="18kdd3yga3lldafpn2ij28kddkr09rd3";
+"dvisvgm.doc-2.3"="qsrmvbj87di5rpalvbd97csyb2jyahh5";
+"findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv";
+"findhyph.doc-3.4"="ivpfnjybcl80xzda2jlrplaglqhf9adc";
+"fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir";
+"fragmaster.doc-1.6"="vwmmc7jmhxfvblz3fpdj0saxjs75bgia";
+"hook-pre-commit-pkg.doc-1.1.2"="0rf4zqwdix7npi9g6nlcpp95mdpxana5";
+"hyphenex-2018"="1ak1ymbmsfx7z8kh09jzkr3a4dvkrfjw";
+"hyphenex.source-2018"="n4rvv61jcw6s91mydy65qq90clva5zrs";
+"installfont-1.7"="ds2zbs2f6kasda98jn1k8i0ym5168ax8";
+"installfont.doc-1.7"="jmwwjkliwr7wl1gyx8fzpyslscsnlqlx";
+"ketcindy-20180617.0"="cm4iqk7sb1la7qrdrz07h2vrdrx6cbdn";
+"ketcindy.doc-20180617.0"="4fmafv1c9p9pwp2f4khw21gkc9qfii7k";
+"lacheck.doc-2018"="wjp0q1brla963wdyjh1m81alxm7knjvc";
+"latex-git-log-0.9"="samiv870lgj4smwh80l5ck8q6q8m1yqm";
+"latex-git-log.doc-0.9"="1hjp3dx0d0yhj2c3n02cdk4fdg6iv6nc";
+"latex-papersize-1.62"="c2qx25bgknw9350pi7vr5hdnnj3i2ak6";
+"latex-papersize.doc-1.62"="8w0cczb884w53zzv3dwra31zcvjh4jzf";
+"latex2man-1.27"="3k62b9rbivg1h3xznwxfys7nls42fvya";
+"latex2man.doc-1.27"="10lia6pfksgpwmnvb3ygvyi6s6258kfv";
+"latex2nemeth-1.0.1"="isj2xl6s5liv6q12knhl4dsyihc9j593";
+"latex2nemeth.doc-1.0.1"="qpvqm76bb09nn4s42yhi1i6lf7ji4bhv";
+"latexdiff-1.2.1"="ifd6bq1ndzrcrx21rv9xrx0556z3zav5";
+"latexdiff.doc-1.2.1"="gr2r3r3s4aaldg8ghxpcbz0pn3585k5w";
+"latexfileversion-0.3"="79yrcgv4lj33pavgn48ycvsd9a1x49s3";
+"latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8";
+"latexindent-3.5"="vn76zyab4vlw8h3p3s5jysslrfjv2mlp";
+"latexindent.doc-3.5"="vrkw2iphfgknagayswmhfa7fnhj0g3f7";
+"latexmk-4.59"="g38qzcpps0xia3lma1zaihklp6lhdl18";
+"latexmk.doc-4.59"="db274xj7pr36s0ah5lhbb920b23x4mhm";
+"latexmk.source-4.59"="m32pbzkr0my5gv38jw54bancbk66r15c";
+"latexpand-1.4-1-gb32a776"="jabaskih77s40g0w9hbwjk3iq1psqw7r";
+"latexpand.doc-1.4-1-gb32a776"="ynnh4xyxr50rxy4xbcb2k1pf1fxhjcgs";
+"listings-ext-67"="zbinp0czaglig761svs0s13np81qpsr6";
+"listings-ext.doc-67"="slcbwzsy505nhjriszn993pgqlmdlfib";
+"listings-ext.source-67"="95y2zv6bcfkvqmwf6cpa4piaydlkjwz5";
+"ltxfileinfo-2.04"="fqka5xkp7758sr7hyiyy18nns1dir95f";
+"ltxfileinfo.doc-2.04"="rbqwgb89q514rih3hf5bv613xqw1gbci";
+"ltximg-1.5"="yrrcj5f8pffzpd49d7svwsd20669srh8";
+"ltximg.doc-1.5"="3hrdxbrn8r5220h2i8zzwg08v6rwngip";
+"ltximg.source-1.5"="5xl1avlrs14c4lsmjb6x5793virxhlmw";
+"make4ht-0.2c"="f06g1dfdx7vq6pzikdc5jwd74q5hld3r";
+"make4ht.doc-0.2c"="3s6b8a7q1b6p2bpmbz5yf04s024d7n5n";
+"match_parens-1.43"="hahwx0ca506ykknc9plsnrfg6fsb5rs4";
+"match_parens.doc-1.43"="1h445p7nl5n70rskvq4d10b15kb8058k";
+"mflua-2018"="5l61gh5fwi3kqilawfhzp77y8qq9zb9r";
+"metafont-2.7182818"="sxdr5v17hpv8g1562g06lhn26c1wbs8f";
+"metafont.doc-2.7182818"="49w14vkdspg2pnfj59z2h3fs08qnyamd";
+"mkjobtexmf-0.8"="raq7ql17c3fdqqpaqbd53r0dg7kjrvh2";
+"mkjobtexmf.doc-0.8"="3cgxbgxpha9139jfz4v3478ny7yv3xm1";
+"mkjobtexmf.source-0.8"="dky5rv3xrbjqj7pg8spdjsllggpq61k9";
+"patgen.doc-2.3"="y6z5ck7zpny3h23g1wy044ynrdf1km2l";
+"pdfbook2-1.2"="nkfll8ynix954j2rplv72avzq9pw93f1";
+"pdfbook2.doc-1.2"="7wi87df5sfhk1pxk3i8kkk3w1ym3z2pd";
+"pdfcrop-1.37"="mr2zg2ji7gqm14zq5xsf8wk081fbdwdn";
+"pdfcrop.doc-1.37"="28jgvjwk6v7dvldqgqd4ry32ccd8avgn";
+"pdfjam-2.02"="p9l1q18vqf1yjaxxdyizz9b9rgr1kv4w";
+"pdfjam.doc-2.02"="c6aawcwvnijzmjakmlnlzbnhq0yx2vmx";
+"pdflatexpicscale-0.32"="sc7xcy0agdg458w49n72q6sd8sk8zqn4";
+"pdflatexpicscale.doc-0.32"="ria6cfi0nvviddn0gmylwcjw53v6ryqy";
+"pdftools-0.86"="a8nv2mqs26gb1dinymxa9kwk4baqch7l";
+"pdftools.doc-0.86"="sqdwc3ajka1gig9zj6x0xj50s9g3vybh";
+"pdfxup-1.30"="r29ka6pw53vdscrpxbaar5g8x171c0l2";
+"pdfxup.doc-1.30"="kc5qc6a8q4f8yn2xa7cbabidk9gxg6sh";
+"pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435";
+"pfarrei.doc-r36"="bi4wqwx32x2498kr0k1rmkmslyz134x0";
+"pfarrei.source-r36"="zrdbqakfqkm5kwbpwpy5d1pqp4w5sz42";
+"pkfix-1.7"="gmnyddib832v8lxj6j0w73z2xcars3kv";
+"pkfix.doc-1.7"="r2lyi06ra63icn8b63l3hzkfv8min1w8";
+"pkfix-helper-1.4"="3pqfismv6absn1ll9jqhllmz6hnjsn1f";
+"pkfix-helper.doc-1.4"="gljfwywrvwin5fl5szfnpa095cr2r0m5";
+"purifyeps-1.1"="qmwy8zk8h0kzpsknp0430gdxq0zqj4hf";
+"purifyeps.doc-1.1"="4fj0jj42mjldhg90pkvj7bsd1b682x0c";
+"pythontex-0.16"="pzh8qkl7j7s5431cvifd70r5lywhzrqc";
+"pythontex.doc-0.16"="ifnkz8rfy2mb0hff6rv6ngp8fivr6v73";
+"pythontex.source-0.16"="wnszvmjiwgfppnxw5aq0lxd3mfdwi6l7";
+"seetexk.doc-2018"="0hzinznywrgax3nfg5hn5dxwfs5g6c7z";
+"srcredact-1.0"="dzxdwnn9l06gngyvaarf10h6ws8aa73y";
+"srcredact.doc-1.0"="m028dd5fqv2x9xcxq7vhdsaz2xcyxwl1";
+"sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib";
+"sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65";
+"synctex.doc-2018"="a6jqg7vmbjian357kf1q4w9hmf76qmzp";
+"tex4ebook-0.2a"="kc2slfjkjwpv47nhsmysr38xv55pzhxf";
+"tex4ebook.doc-0.2a"="cm6ba8qlqvy3i1ncklhhyq4vw7xqrwmj";
+"texcount-3.1"="1aqqrw4nhnqimpfnbfypadfny68v9mbm";
+"texcount.doc-3.1"="ip2s9f7ifgrdnr2mfa37mx5wl15ich26";
+"texdef-1.8a"="iyiqbv4h91h6qchgcddj251sas6ayf93";
+"texdef.doc-1.8a"="1d01vr68i8zcbpr1113vq1zmfkhm9ylr";
+"texdef.source-1.8a"="5j1accwlb84bk99g7vm2p9xjfwvshny6";
+"texdiff-0.4"="83vghxcac89m0kji1rr4ry3fy55im9sa";
+"texdiff.doc-0.4"="r9wsmivjyiwdnav7qc35kydk9b8pbcz8";
+"texdirflatten-1.3"="135358h2mb608wg3ni93rrsvvqgxm4ya";
+"texdirflatten.doc-1.3"="n9jxdwjiylvwy6n55vgci9a32qi10xhl";
+"texdoc-3.0"="j5jwnlcjd07mdsbpicnmq7w80a829alw";
+"texdoc.doc-3.0"="w18adf2pr1wzjk9v1iamh3zria4xfcz1";
+"texdoctk-0.6.0"="r49h79z4hpxxffi755kw1qpnlv38pxbs";
+"texdoctk.doc-0.6.0"="qyi26gnnkc71x552npkl8qijpcx90j7f";
+"texfot-1.37"="fbpbc24dbh8wvzyybjwb3vgc6w7mhlxw";
+"texfot.doc-1.37"="7vdbypvsmllg0frxh59rsb4iig3lvg5l";
+"texliveonfly-2018"="8csnp69s8i4bs18r18qqr2cmkqhgx437";
+"texliveonfly.doc-2018"="ic6vdfmbvl34zjqrn0lvp59armsin54n";
+"texloganalyser-0.9"="8dlsnkjvsic0xyaxjwixrgm4pf40snpz";
+"texloganalyser.doc-0.9"="yh3y429s0fbkjai3kmh3z1q4f1pja6g3";
+"texosquery-1.6"="8f8lapbim73bxwfmzgi07jl5qg5d0n6g";
+"texosquery.doc-1.6"="rph058iy26cxdk6n0i7kbgxv43rkmfx7";
+"texosquery.source-1.6"="6r8grnnhqr2jcmns2vrcxq6gai939nhb";
+"texware.doc-2018"="8r064nlbcnlf0n78lbsypvi3036w9hcn";
+"tie.doc-2.4"="14qgnsdkx2vp8lj0lskvnxp9cylk4qfx";
+"tlcockpit-2018"="minb2gwddl77msli25szyfh77mcn4w7y";
+"tlcockpit.doc-2018"="gn2jjaafvwk1b2yy8vlrh2b9g49nlddy";
+"tlcockpit.source-2018"="fsb772m4lipd9sgvzbc25r3p5myzlng1";
+"tlshell-2018"="9v2vg61g5himzszgh1grz7x7cflrxr2l";
+"tlshell.doc-2018"="bfk5yhh81yyhdim9pjj8kp3x2z9j7xi7";
+"tpic2pdftex.doc-2018"="vgl97k9smbwxvbgfkz2fx3x06afy4lf2";
+"typeoutfileinfo-0.31"="vjs333wmdxb9s1vd215af0vryplvb8hl";
+"typeoutfileinfo.doc-0.31"="qdrwm9hi7qk7hxzcz0grv7cfl4r9k4v6";
+"web.doc-4.5"="3ifa6s0gz7h0dyjcg6dfvnmfwy67vji9";
+"xindy-2.5.1"="rp60v85lrsbllzkwvhhz5sprxalf6kxp";
+"xindy.doc-2.5.1"="akx5bx8m387zsaxd7v6xh97nglbzd9k6";
+"context-2018"="jyx1m6v90l9gv2wmcsd5z7y9dr5dkjsq";
+"context.doc-2018"="bdr24r8l5s6nvskbdcqb2w1wddz9zwyd";
+"lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g";
+"lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02";
+"lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n";
+"lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7";
+"lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq";
+"manfnt-font-2018"="isk7hkf6lfg41mjli9sgn77kvn6fkl96";
+"metapost-2018"="jl9jq1d4q6713wf0grl3wm0s6ynr5gig";
+"metapost.doc-2018"="fwn7p456ahb2036nfkwpvxznmnfj1ska";
+"mflogo-font-1.002"="m5lb3rhr5yighsixjb0k6zp2hx8fxvr9";
+"mflogo-font.doc-1.002"="va6f9qjbh5ah4zvlmc4wi9m395x3bhpr";
+"stmaryrd-2018"="shivgpyz8sa63sqkmpgqvw1v1iyc0g35";
+"stmaryrd.doc-2018"="r91xmqmmm6i6jka78qyaiilas94xc5hi";
+"stmaryrd.source-2018"="ch2gj89jxrqysjsl24s40za3y5z03yan";
+"xetex-2018"="5mai30qjzqsc5hdmzavbsgchlarv6gfh";
+"xetex.doc-2018"="irmhb20z4x0dchaj0gcpq82s0w2kdavg";
+"xetexconfig-2018"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp";
+"context-account-2018"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr";
+"context-account.doc-2018"="lms208c3s9clga2ymi1j2i5whyz2dffy";
+"context-algorithmic-2018"="zvjfp5dzy3saz67hcfl2n1haxjdkavml";
+"context-algorithmic.doc-2018"="gsckrj1g30x8lq52cil2z9bq7zf5vaba";
+"context-animation-2018"="lg4cn50cshxd9qg2i7hd54lcgsy8zwyz";
+"context-animation.doc-2018"="lazsfqd8djbbkn4byqrgl93nnvygm8xd";
+"context-annotation-2013.05.27"="vgnpr8wv2l93qcwifsyslyanyd9hp1vz";
+"context-annotation.doc-2013.05.27"="05lrbacq308akhvdbdpwlwg9b0dhsghp";
+"context-bnf-2018"="pzpk8q0zc179zbpj2l9w5fw3r8gmhq82";
+"context-bnf.doc-2018"="jyvr2yk2shkzj122v53khmxx4skbasn0";
+"context-chromato-2018"="721l06z298fqfaj6rcz9sh66jshq447s";
+"context-chromato.doc-2018"="lwbqab6vnyipsjq0xlfgl15iag6h27nj";
+"context-cmscbf-2018"="nwk7dqb2kxbj9y6ijlpa3ack1an9d5f8";
+"context-cmscbf.doc-2018"="s09578i62xh352zmd1rssg0rd1qjpc7q";
+"context-cmttbf-2018"="dgrblidva7k2q8yvmkdb0kg2n4bzln1k";
+"context-cmttbf.doc-2018"="fp7blzzh8p24bpab0vnlyc336kildj4b";
+"context-construction-plan-2018"="b42ncfcmywfwwnvzy2z58pig0spz39g2";
+"context-construction-plan.doc-2018"="x76mm90ba9lwvjb3dkhmbv6ajc93444z";
+"context-cyrillicnumbers-2018"="iwzzhbrrkf377k54rfbna7zfbhdal6g6";
+"context-cyrillicnumbers.doc-2018"="4q6ba2gxc5apykkirfjhyn29n387ifq1";
+"context-degrade-2018"="d7fvjlrj0gya4ycpy01b3xw96cqpgmw7";
+"context-degrade.doc-2018"="nkal1h165g0mnf0h677b22c7r5q89sbp";
+"context-fancybreak-2018"="dkqfx16sjcxdl8a50al6x87rhwbrz61z";
+"context-fancybreak.doc-2018"="vqgypbxyr7ay3qasrnfsxsvnzg1rddfc";
+"context-filter-2018"="kjyrcq6p1hw9gi95zpmrvpbni1dn3l8w";
+"context-filter.doc-2018"="1dz0rmsac0f2nvnd83qaxwdhibbkq42v";
+"context-french-2018"="f44vj4in9b4kry17a7cw7ad11ygmnvkr";
+"context-french.doc-2018"="pnndx81zpi4625r2bpk3nyz7x1md9l6v";
+"context-fullpage-2018"="cjfrxynfxahlz5pc60jq27fprlg9jwac";
+"context-fullpage.doc-2018"="4xh4v0zq3wqdaf25jnjpkl73d72h5100";
+"context-gantt-2018"="v50p405xz9ddwlqb0q1hi9m8wbx0c01g";
+"context-gantt.doc-2018"="6600xvqy3ayzn81z6agxpdg6xac1mf90";
+"hatching-0.11"="kngng0rbi2q99417zr3vv3jl0zzjwh6l";
+"hatching.doc-0.11"="5c0n8fhchwpa3vgby9v6dzcg9v834xgr";
+"context-gnuplot-2018"="21gc0nq12aps3d3333yxll6xllnlw0x2";
+"context-gnuplot.doc-2018"="53y32f428jh6lii2zcl4csh8yzfs2ij5";
+"context-handlecsv-2018.02.14"="90lgili35hpia2d4ysl21a5dcdm3kk1p";
+"context-handlecsv.doc-2018.02.14"="214ag585ddjdyirfsxnxigjsk3c9rlr7";
+"context-inifile-2018"="fmf14m6wz9ya4lxy3w6mxjzqk491jdd4";
+"context-inifile.doc-2018"="acx93f08cc2z4x4jwwchd8njnkil3bfq";
+"context-layout-2018"="438mv86y37wbxdv9js2s3clnkl7866ff";
+"context-layout.doc-2018"="adh7d3hmcjqqgh69nr8agxznzwijkggk";
+"context-letter-2018"="y43dmsc49337n5mn0axqsa5rln68zg6r";
+"context-letter.doc-2018"="knw1pz7vdmqjf82aiznpqb2hc5y198i4";
+"context-lettrine-2018"="wmfy4c9c13jj525hmrf742kzkiqqmwgk";
+"context-lettrine.doc-2018"="xf4mr1w0z7ybcas306959nmgxih59082";
+"context-mathsets-2018"="5gxx8rbkp1znjh8ycd0k8nflhjcm25kw";
+"context-mathsets.doc-2018"="jjc6lkfrw2a84n4cwvpdnn92wv59pvis";
+"context-notes-zh-cn.doc-2018"="x85l6d8ydz6nw51z8ak3a7cvpc6c45lz";
+"context-rst-0.6c"="5mwhydc35iywmkdz759sdpz53wkqa64x";
+"context-rst.doc-0.6c"="c8khxkv5vs9wzfb6l7116iglnwng98gd";
+"context-ruby-2018"="jrwrrwhcvb4bbia0g2lnl6rr0yydh6ix";
+"context-ruby.doc-2018"="s8s9kmgim38l2x08a6cq2n9jjz9hbw6p";
+"context-simplefonts-2018"="5h1qrkcjlkdbd5rc888xrp2nfksyf7x5";
+"context-simplefonts.doc-2018"="xfdzrvfp6kr1abbnsja6grxnvcnbj2wl";
+"context-simpleslides-2018"="idd4q63cvh7qqiv5wzkq3xgrxwhm9z87";
+"context-simpleslides.doc-2018"="smx89kphvq9qjl4mzd2nd2j3nasv6vfj";
+"context-title-2012.04.11"="ywgzzyzyvd02qwffkzxpymwhpb548g3k";
+"context-title.doc-2012.04.11"="d3m29w07jmdkxhb3g8254ry27j3y5qri";
+"context-transliterator-2018"="q0klk1fqlky9drg0ak4xlcn3xpsi4kyr";
+"context-transliterator.doc-2018"="xik3slvbsnrmjcjd9ypmwxhbslyank86";
+"context-typearea-2018"="ck1fbjmlyq93id8a15nrn81cd10jlcib";
+"context-typearea.doc-2018"="yvf0njazm748j5d40dsyk9l3p4is0g8x";
+"context-typescripts-2018"="q33whgk69qflc06i9q8jpb5lnwvdbhr5";
+"context-typescripts.doc-2018"="gxsm980lz4ddjnnj61yj4yv2vdnck1x9";
+"context-vim-2018"="j1qzdclsyzhrp0x8gkhkzw2s1i9a4xwf";
+"context-vim.doc-2018"="ggyhlwmqw4v4mlgfrh6jwanjkgfsaky7";
+"context-visualcounter-2013.04.01"="sh6jnhkfbi4rpw34zw489148rgwsb14r";
+"context-visualcounter.doc-2013.04.01"="hbainxhhkx26imhab5kl4k1f7ljhifqv";
+"context-visualcounter.source-2013.04.01"="7wbyascsdwh2m9hpwm3c7sd0q5940fd1";
+"jmn-2018"="sxkb92pakb4lx5d9pjpang6mhfrgm4b5";
+"npp-for-context.doc-0.98"="ykvfribj17bby5nh2m2m731955p8rbph";
+"Asana-Math-000.955"="qvk5bdn6hq6ci0v4l45rbwd3s4nazmsd";
+"Asana-Math.doc-000.955"="q0c7d8fs11sqdxs0drjd9g6l0bkbnvln";
+"academicons-1.8.6-2"="ibr3rgpdjalz09gcs8fg31gkasb48qvv";
+"academicons.doc-1.8.6-2"="607w87c6bbhfw1q8jibfkpczgf29f342";
+"accanthis-2018"="3ai0zz1fwlq9v25dsfz63if6i7wgrhp3";
+"accanthis.doc-2018"="zlxlfbawiicbkminjw2laximsn07zpi0";
+"adforn-1.001-b-2"="ykyh10gfssql3zh4845gw8g8ayijvlla";
+"adforn.doc-1.001-b-2"="idfbpikb68y2n424xjdf3nppbz5cziib";
+"adfsymbols-1.001"="ijgwy7svr9pn69r2vwi5pzkdbc7q0p3h";
+"adfsymbols.doc-1.001"="kb61cwldva4ziv006ja9y66a27926508";
+"aecc-1.0"="0vpb9yz2qx0sc15kxzhgqadkcjyr27c5";
+"aecc.doc-1.0"="mn7j1f7j3z5d6pnss9mlhvbw4ahn94ka";
+"alegreya-2018"="sa46fbw1wj69jhhmql3yz2rs5518x1vj";
+"alegreya.doc-2018"="h5zfivxs9misj4l9zag70ih8ic35aj9a";
+"algolrevived-1.01"="81kfc6aj2fg7db11sxb5w3a0zw2p25f8";
+"algolrevived.doc-1.01"="yxd16nwxlz4jlcqbim2w1kvhdfs9145b";
+"allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr";
+"allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv";
+"allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy";
+"almfixed-0.92"="kcaraz14gg5k8ws8zkrjfvvn22njv759";
+"almfixed.doc-0.92"="34f4a82gsr0vq47bp9wbdd4wkhhr984j";
+"anonymouspro-2.1"="5396jmzi4ihjdiwpgm8ghi669ipk6dzd";
+"anonymouspro.doc-2.1"="xjsrm5wsyq7cip27kffdmvl7mcwcz7pv";
+"anonymouspro.source-2.1"="r2j6c96ym5bm4xgxdkppg5v5d71nav6s";
+"antiqua-001.003"="131gc30l7jaj79zkc37if3w70nr8w6ic";
+"antiqua.doc-001.003"="36kkp06c9grcgz7py0k7fnr5a56cvsgk";
+"antt-2.08"="ln7vvpz0p5lz4sikwky7f7zmkg08zmcv";
+"antt.doc-2.08"="2449s2gpspkwfmyhvvl8g5h1dqn8bg72";
+"archaic-2018"="jvj1s2dcgkwgi9ywg48vw7i14gmlmq7n";
+"archaic.doc-2018"="mb0z3xq325y48yv0bx4xsz8x5f790c60";
+"archaic.source-2018"="j05dan5d8xxzg43iay4v76vbcdscc6zn";
+"arev-2018"="xc3i2264d5w0ijv10n6ka53311bgnib0";
+"arev.doc-2018"="s39jgnizjbpnh1czr3ck5yd32bxks476";
+"arev.source-2018"="msk58av5fwg6hi4mzpz8abgzigqyskf2";
+"arimo-2018"="1z5ij30qfbd4y2c0292aai2dsg87n1rm";
+"arimo.doc-2018"="2fr1vjv5386lvixzs8idr0wyf9ghlg1f";
+"asapsym-1.0"="gbn04lk9k66wj689vna4kgxq8gddhwca";
+"asapsym.doc-1.0"="qfbaary485cs3q5azl6d650z53kd9s73";
+"asapsym.source-1.0"="g9m2vwmd438fwfczm8xwhv4wdp2aj114";
+"ascii-font-2.0"="xagip7afzxinz33nlz8pf8vbcvbj1qa7";
+"ascii-font.doc-2.0"="8r3hq592fxf4hd5n6dphfv7ggd7chhcj";
+"ascii-font.source-2.0"="ackrvh7723ifwjhl2pzf3mynk3c947f4";
+"aspectratio-2.0"="jhfd7l8dwy9mwi3qa5md8nzraf0fkajj";
+"aspectratio.doc-2.0"="xv7z3aa40dn6fzchrhqwg03356r2znjf";
+"astro-2.20"="isnx9q009wchs33xq4bphi4cp4cnb2m9";
+"astro.doc-2.20"="xa1szbc33k2yyahgwy294mgiiyi5yiy4";
+"augie-2018"="w863x04n1ks9jkmaw8fm4hd6a1390s3x";
+"augie.doc-2018"="dlmy9i2fh0db4aghd8dqsv9227cqk4d9";
+"auncial-new-2.0"="nnaar0yvi6r1fynyzxmqhw7mnify474d";
+"auncial-new.doc-2.0"="jvyica87kxg5gm3zb8kmka9ja87f28si";
+"auncial-new.source-2.0"="hfdl71c7lx3lpb9rkwfz5vpaq0s19bh6";
+"aurical-1.5"="nsq6vfvs11v1z0jyrhizbd29fkn1jp9w";
+"aurical.doc-1.5"="3glvxhpb6l2y06kz1icv2cpgrxacl998";
+"b1encoding-1.0"="cxsgg97c3bsw9dl2aj9c9rb8vlpyn4s4";
+"b1encoding.doc-1.0"="mcm5yr55av0rj342bxdljkdid5qxyv97";
+"b1encoding.source-1.0"="jdnzzki5929xpzvpfvx5a9z51dk40pvs";
+"barcodes-2018"="8j88bc82j5a0xhm46671mj0k439zm5da";
+"barcodes.doc-2018"="7729a4f9hn4qzx2cndyxv04wwpchpjax";
+"barcodes.source-2018"="yh5ci4axi82ps6hbm6f0a08alrnapxiv";
+"baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs";
+"baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk";
+"baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1";
+"baskervaldx-1.072"="jjwb2m99l3vwzcpr7dzd8z360cv4qib6";
+"baskervaldx.doc-1.072"="bprkagqwmczadxymgadg1d98d6g2l4xq";
+"baskervillef-1.045"="dzpa83hr8jpz979mg8j2bvvpxrrn5amy";
+"baskervillef.doc-1.045"="9cqmpns542gn7cm8f0a2kih29nl9sjz3";
+"bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g";
+"bbding.doc-1.01"="zjngi582jrb99j6w1amwbyvjmfvsk40d";
+"bbding.source-1.01"="axvp8f0zag6bkr9v3fg22j4h5gcbcgzx";
+"bbm-2018"="ayg703c4frfpv9mhahz36f9zs11y9vxc";
+"bbm.doc-2018"="bzfab62k5j167p5qzs79gps14hbpq7nq";
+"bbm-macros-2018"="lbvpxxa0rzhl0z0081s6wfdvmx3vlhv4";
+"bbm-macros.doc-2018"="ncijdxbxfk9xkrnvvsk937ji5nd60z1s";
+"bbm-macros.source-2018"="39wj6mqzn9qcvavqr8p5ny4ajjxm9m8w";
+"bbold-1.01"="s88rwky3f2jjcg6w00g7s5lkvviqkwpm";
+"bbold.doc-1.01"="sa83x4g1n5b2lafj9n61cggkyk7h1z5v";
+"bbold.source-1.01"="ki3gxl970iirhkckqblr490jlznl0kc7";
+"bbold-type1-2018"="00rizb6fky3rsyn1id4p1dik8963bhwr";
+"bbold-type1.doc-2018"="lnpyln41q3qdsmzdkini0q1wqx7v2n7h";
+"belleek-2018"="8y1nbwn46cgyzfyd3and8aws7mqclsfa";
+"belleek.doc-2018"="8d258516ak2b5va5smkfc87ipyj329f9";
+"belleek.source-2018"="n6fypvkn7cq1c1l7jqvjb6cfjyqrq0wv";
+"bera-2018"="mq0j1sn7fg1qk7qd7x1l4ixqddyp3rjg";
+"bera.doc-2018"="6iv3gc8kfqcw909sa4x7msc7dsxndy8i";
+"berenisadf-1.004"="2ci0vxfqyc18anpy68r6anbdz76nrf2b";
+"berenisadf.doc-1.004"="00vx76lkvv0vf68a7sck05ls3l5va5gj";
+"beuron-1.3"="c04r71cvsva6yr9gvj1jrmix7q8n1i94";
+"beuron.doc-1.3"="6iihw343dcgq64505br49lkllnjxn8lw";
+"bguq-0.4"="cgq4fhairknzbp65cmhv0m19zn0cnkgp";
+"bguq.doc-0.4"="9rwhzxijcyl4zzrc88dg8730p11hkm4q";
+"bguq.source-0.4"="7856n14czw3z30maxv7m4xz6js47rkbj";
+"blacklettert1-2018"="hzd441k3wi58rrysk0h48yklnp5i776p";
+"blacklettert1.doc-2018"="8n61621w6273ik991i2asvsm4w8xlimx";
+"blacklettert1.source-2018"="ir0cn80nw9jgchx4kisv9j27gpgykhvc";
+"boisik-0.5"="xz0hk8fwnrwnydy9dglm93c4gzrqpz87";
+"boisik.doc-0.5"="wsssy9bh8wi35x67ifgnj9wrjx0vpmvy";
+"bookhands-2018"="6dgc2p6zs8hxjx4b3xa317ni1pglza7c";
+"bookhands.doc-2018"="l8mlzpwi0bh220ag4ip8qzxq6vxz9s5g";
+"bookhands.source-2018"="xx98dvqz312dbb4fm57fmh3yp3krq7wj";
+"boondox-1.02d"="i1hwfxc7ji83724177ir5hdgfn6cbcqr";
+"boondox.doc-1.02d"="wwa8ar557myv3rfjkw9jlw1pxs26vwbh";
+"braille-2018"="slk0qzcahb3qkmq91jcrm5gakcwa7czv";
+"braille.doc-2018"="00dv14s64fm8g5jy8b30dx813a304nlh";
+"brushscr-2018"="342p5p6h8v377mnbrv1f56kicbbjfcdx";
+"brushscr.doc-2018"="hikb5s9iv60pfq2kjdbfiq1216d3rabk";
+"cabin-2018"="cdqp8n971zc5rih2903kq97sbklh1gb4";
+"cabin.doc-2018"="v3rlr3vfyppg32nsvdq3gz5z46wcm5lf";
+"caladea-2018"="1rb8sq2yh4hizlcjp8zd68ayb7cx6275";
+"caladea.doc-2018"="9qr79slzxmnnvvh2iy310ypqj9g11s4b";
+"calligra-2018"="cisw7fvdys863szqvsxzm164vina8al3";
+"calligra.doc-2018"="36bzakyiw9awp36v7c6dyb3vwl01shb0";
+"calligra-type1-001.000"="2bl0g899jhyspyhyzh45xdkkis88ja46";
+"calligra-type1.doc-001.000"="3zza4sgsnvcg2asdv27gd7y6jmab5j4y";
+"cantarell-2.4"="sy4spxn3hfp0wqs5imhnm5bkw42qfnxn";
+"cantarell.doc-2.4"="dwd1ndl5ghz9rcgmjrl6zmaxzbaxr3rd";
+"cantarell.source-2.4"="vdz4m82y34lb60vx066j68l0kgc2clvc";
+"carlito-2018"="7v0571swhiw0pbsqcb1a4sj7izdincb0";
+"carlito.doc-2018"="bs67zjydc9fcigiaaf9y9lm05lkgw68a";
+"carolmin-ps-2018"="rx6y9nb8l3cslla44c422jzwjlqw7ilz";
+"carolmin-ps.doc-2018"="hq8477r3q2cg2laafi8ryvjan90wxjcg";
+"ccicons-1.6"="g89dzfgas16vgx8ydp43ihina82z8df8";
+"ccicons.doc-1.6"="sphr2i8d6yf8xz5rkr0ib5ji6x6w428l";
+"ccicons.source-1.6"="1rkyqlpvm3v01cswmjmycayxh0kbgin6";
+"cfr-initials-1.01"="piy7c7f39bjqk0igmqcvrjk0pg86lw6z";
+"cfr-initials.doc-1.01"="4grvqnf5f5ga3d8jdsmanfgiwpp5gygc";
+"cfr-lm-1.5"="7y9qg3jnq6xnlq0f1wqm6493qax92cc3";
+"cfr-lm.doc-1.5"="cfshavfcmpkig5p9kypglmrs55rl5lsb";
+"cfr-lm.source-1.5"="nglav2q22aybb23snhm6x17dxz3976sc";
+"cherokee-2018"="hmmaav3k7vd1rh6rm26l2nal48r1wxz3";
+"cherokee.doc-2018"="zaq092r56asdcf62a7zscfp4zp7a5lwq";
+"chivo-1.0"="96gxnm243xbkrhx8mcs4vip8qaj1q5f5";
+"chivo.doc-1.0"="f9ibwq6r1y2i5n5bp9s5v91mw32hkl5m";
+"chivo.source-1.0"="ssqn1c68z13ap31rahx8c0m00n2jwbs6";
+"cinzel-2018"="zd9fzvkabmdz25gmi2zj0aj0c7fp89kf";
+"cinzel.doc-2018"="82f080qw29yir7z12zjx6ibjfrfgnm9b";
+"clearsans-2018"="x3dasd6qdqjdw2v99kkh00srz44pz6ma";
+"clearsans.doc-2018"="bbfm2zw5czzwm3msr112wzlg686bh8jj";
+"cm-lgc-0.5"="wnmmrhnlldps15r2v360bdvlfyjd1fpn";
+"cm-lgc.doc-0.5"="wb18g3w86wfb7fv2iaaxm0j2amrws9yf";
+"cm-mf-extra-bold-2018"="87n4wnhy5wylwl1qw8i0nq4jj7jfr5fs";
+"cm-unicode-0.7.0"="wmmgwafdisxnkgdh571y2mlcybjlnvf6";
+"cm-unicode.doc-0.7.0"="6nykmggl860gvrzr1v9xahvl6gpy7phg";
+"cmbright-8.1"="rjlqiwya67ispglypa4gmix8hyk6f2h3";
+"cmbright.doc-8.1"="wsjakpl6b7zyv3j9yx50v9hjm3sgx317";
+"cmbright.source-8.1"="vwgnzs47an6mjgw898scvdp8dc3m1w0w";
+"cmexb-2018"="jxb62ixs1vqaqscv1ixg27vv1p7na0p1";
+"cmexb.doc-2018"="92888gd06jfx2q4xd01n45c1yyhnp03l";
+"cmll-2018"="bipbbgh6jc5r1imk467r5pvj4m62a85k";
+"cmll.doc-2018"="k2sshj6rp40m29fm29jd7jy492gcrwcf";
+"cmll.source-2018"="lbaw2209cz5ymklza36486jzfpq1cqc5";
+"cmpica-2018"="z5mc7yl40mzwk5bcjs3lb1ifqsr7x4s1";
+"cmpica.doc-2018"="9bl7bhpb9dhp58p9hxay8xka0nz2cg2l";
+"cmsrb-1.1"="8sf08jdcqgr2kqqkyrqarabffs3shg9a";
+"cmsrb.doc-1.1"="kfgrppypl3c6darz7pv6983nxbppnh49";
+"cmtiup-2.1"="k6sk5isdzms460hm17lkx5b6p6p9wz1g";
+"cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h";
+"cochineal-1.046"="33851mba464xvzmxalqp5vnmcjbhp5gx";
+"cochineal.doc-1.046"="j3z1b17v9i2xn28p5rbbz2fh3w6z6c2l";
+"coelacanth-2018"="98nhwkyx82x0q39b7d4f9bq8g8hmhjzs";
+"coelacanth.doc-2018"="2v7chnqn5pw6h9x9k01h218cwp0z9lyw";
+"comfortaa-2.3"="k4w8lzk1lbd0hlrvkr83p4s737410vk3";
+"comfortaa.doc-2.3"="cmh2d3939a515h60ajmhbivqmbn2xmw4";
+"comfortaa.source-2.3"="jp7dh6r0zcpz3mkfkgafjays8jx9hbqf";
+"comicneue-1.1"="zsv445k74adkzqnas2g8p3i6c49bccqf";
+"comicneue.doc-1.1"="9il2nyy63bx62n603j1kwaagvplwndps";
+"concmath-fonts-2018"="875viaxzrrljcarkg11cb830fmq5321f";
+"concmath-fonts.doc-2018"="q2wyl5cw03rbk4602vg18jrxg3j133lj";
+"cookingsymbols-1.1"="qhjzkivpxbk3rk6pricxsxpdk7c40rxc";
+"cookingsymbols.doc-1.1"="8l7yii9vvmaxfnf0h2snis7476k18mlc";
+"cookingsymbols.source-1.1"="z7r8n2lhgaqzgpx0jz8xq4sd4zzigbs9";
+"cormorantgaramond-3.00"="n1zswym4jgqhsj65z8kngkfad1djyba5";
+"cormorantgaramond.doc-3.00"="ph1qspmc6h6axlhvw5rb4c1kb6znigzk";
+"countriesofeurope-0.21"="va17md98pqibrig3nznlipv9rypqm6bg";
+"countriesofeurope.doc-0.21"="2hbp9xshmfm0k2izqbds1h2835yldznh";
+"courier-scaled-2018"="qrm6a468azlw2s89v7j992wxs2mkqfv9";
+"courier-scaled.doc-2018"="1bwlrdxpl1fj4f9ml688ybimig5ylxwv";
+"crimson-2018"="wwvxgknvkd3ycswpp9wnlp9dlkilj7wz";
+"crimson.doc-2018"="wnxfzc5llkk38ky7bf8hkn7zsdawpr2x";
+"cryst-2018"="56jlp0hk9vrfxbhlfjnpim398ggxccjg";
+"cryst.doc-2018"="qazhz2hzgpqlghbg67fnmf8adba1wl5d";
+"cyklop-0.915"="5ksv3v36mc6557jckr5gk22pbqr30wnr";
+"cyklop.doc-0.915"="d85643zgnh0r0j53gfpi84qsx4694xpv";
+"dancers-2018"="qlpshkppzr84rr3smqpwch5j11klm3a7";
+"dantelogo-0.03"="iiqbbimigxpj8kg628sj694xha98q0fw";
+"dantelogo.doc-0.03"="d42k8bqdvp20af1wzilbcjfd1b7ywim5";
+"dejavu-2.34"="90lkxdpj8ihrs68355fal0h0a1dp3v67";
+"dejavu.doc-2.34"="2v6nhxrkny5haczrpvqjzcal7bixngas";
+"dejavu-otf-0.04"="ssbkk7plshbikfmxsm8fhs860c921ri8";
+"dejavu-otf.doc-0.04"="h5xkf02syyclkizh6xhxha96ay14f3kb";
+"dice-2018"="916yfiq60a1qz7d0jn1jd9slck7rjwy1";
+"dice.doc-2018"="rfkm493k3g4slyjsy6bcgljxjsy88z76";
+"dictsym-2018"="lc5sz8d50hirk5yqg9baj2vhj4f7cf8x";
+"dictsym.doc-2018"="d13rhwg29k9gd4ymlipbp5ink908sdnn";
+"dingbat-1.0"="9yc0zy6qlxi9zmpyi3wd5irgq89shanr";
+"dingbat.doc-1.0"="z4km9f9xrw1n44ylh16872lzq8r4zvy4";
+"dingbat.source-1.0"="rq7v2cny05d4f8bkxbs2z6kj36q5bwfd";
+"doublestroke-1.111"="z58ah73655dsas48b432ahkkags5n8wv";
+"doublestroke.doc-1.111"="403diym6rx34bwmrh63zaka3xdhzs2dp";
+"dozenal-7.2"="6d1mbaf4l9yk7admwg05a6ix98cq5h97";
+"dozenal.doc-7.2"="5qfx3qa1dnadw5qc1fxq156xhh9wrjws";
+"dozenal.source-7.2"="w7i42zvkj2ln8z9m4r8p5371jbjn56kp";
+"drm-4.4"="i8782x71pbzgag927fqjqgw2w7zdisvj";
+"drm.doc-4.4"="vs4rq0w6c2yyyzv4g4qk1pn25z0czs8l";
+"drm.source-4.4"="g1n0k02ma60mrb12cdq20qfw8khgdpmm";
+"droid-2.1"="0l4lmkxp92l2a36n7hy75hsl3iafdxjd";
+"droid.doc-2.1"="0pd2n8l6rsxv4m3ni74q5xzqiaiph133";
+"droid.source-2.1"="mfz3ac4jrl5x53ak5473ri39srd9gvkr";
+"dsserif-1.00"="8iq2vinr2pnpasv54rih1fy8majnq0x6";
+"dsserif.doc-1.00"="0a4vccbhpq9amjcc005v1z3ilipr2d9g";
+"dsserif.source-1.00"="yawadjy2742rvvkp232zadkjsij8ja3m";
+"duerer-2018"="vbldf1vbzs3if3mp2lcl65afgiqa54j4";
+"duerer.doc-2018"="75dd80vmi5wx804zkrq48z12y3alihqc";
+"duerer-latex-1.1"="nwigxc3gb4phmv584bma819dcrrafsmx";
+"duerer-latex.doc-1.1"="9nkvhaa662x9la2spm3iwmni9bj86kll";
+"dutchcal-1.0"="6gpi804yy8xyiznzwyy2nqg7qvq6q2rd";
+"dutchcal.doc-1.0"="s0m4n06xg8h0jmlj31w27la569vkl1im";
+"ean-2018"="m0gkapni85n6zw1armbn1y770n8aj0rm";
+"ean.doc-2018"="1b7rkp30r8k0dgk9clz71jp8dlsvhrqc";
+"ebgaramond-0.16"="dxr5fag5sy6nyy492cw8w8cld7ac00cb";
+"ebgaramond.doc-0.16"="99fx6j9qd77xi16z6rh4hd174jmniahi";
+"ebgaramond-maths-1.1"="gkmdw2r9w43z1yfl1gp0cbsm0s2wi4a0";
+"ebgaramond-maths.doc-1.1"="x80h1zs21mnipvpzkcg72g2sjvib1zvz";
+"ecc-2018"="0g013kqml9jfkqq94v7zi46mhrwdzdck";
+"ecc.doc-2018"="v9al4v4j1qlrc9w7ph6ww1h1mc6flqsz";
+"eco-1.3"="7ycccps2kab77rr3cpwsbpi2cpl40kl7";
+"eco.doc-1.3"="1r1jxijx9wk6q2124xjwrmsjps7446fp";
+"eco.source-1.3"="4kcml0rm4pkg827qpfvhywnzrrx5p7dz";
+"eiad-2018"="m3n9a3rawxsj5gm64vggw7xvrq4cy4ry";
+"eiad.doc-2018"="z3wss8sc5vnawaqkz7kagwm1gv4l1czv";
+"eiad-ltx-1.0"="0zq83567n75h8zxlag2qas2q8li6vyqn";
+"eiad-ltx.doc-1.0"="7kymr597yg8j8291gy7jz16a89aqmqny";
+"eiad-ltx.source-1.0"="illi6i1hp4lmx7ylxazrmmzi89ymh9cs";
+"electrum-1.005-b"="6hdyjv1dakcj5zxn6p8rrksdvc7jl0sb";
+"electrum.doc-1.005-b"="c11jl0zjq8nva5nl96p9qyq3nrvgx0zn";
+"electrum.source-1.005-b"="67i1gwyiwwarncpbnj47fmws4dc42bii";
+"elvish-2018"="wp858zclk17yrhpf1yrgd3c4srh07vcj";
+"elvish.doc-2018"="mwgvj8fzb806dsjcx01zs6lhdygx35r8";
+"epigrafica-1.01"="mc08k5ajn2lr4k30lzhsn2si922frq9c";
+"epigrafica.doc-1.01"="vv1fqij6w2fir3myffcafyyrdckvvi4q";
+"epsdice-2.1"="xbz7jkdzzsqrskdi4vhb0ra7m62hk9q1";
+"epsdice.doc-2.1"="7lc7wwfxwxnjfgf13br3wa6n8j25ml6w";
+"epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3";
+"erewhon-1.08"="sg3iqrvlrxlqkvpziyibhm45yxy2x815";
+"erewhon.doc-1.08"="c1x91p3ydy3yw9q32x13idpwds8rfjrv";
+"esrelation-2018"="zhs9fa75r0wr060cfsk4gmmvn06mywmy";
+"esrelation.doc-2018"="08i1bczpz8sccj5lf32axfl3c5ix1sri";
+"esrelation.source-2018"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv";
+"esstix-1.0"="0ddmfrgh39pwcd2n8rggma4pqwgamp7s";
+"esstix.doc-1.0"="5pf3r0xhssrgkp779n06a63yjb5cdg6a";
+"esvect-1.3"="dd9wb3zgs99s93z0jig2z5pwccxh3vvk";
+"esvect.doc-1.3"="c9x8najv8ihx22n1kfd9hbqba40ilz3x";
+"esvect.source-1.3"="170376cm3v7mzlh5909qyzw6y18m5rjm";
+"eulervm-4.0"="ica20j8a3ljzxrmp03k60y6f4kpcbiy2";
+"eulervm.doc-4.0"="g5fxzw7dvnff2w9ys2gpgnvr2x8dabx6";
+"eulervm.source-4.0"="ifvn5n0dvcr4qpcv1yp4xvnx9lj26krg";
+"euxm-2018"="pb3kg627b3skhbi0prgik6y9n9zgk8s0";
+"fbb-1.14"="ai9024x530swbm9r2lnfps5qijy0rvsq";
+"fbb.doc-1.14"="34dvrfj52ylz45x9kj80p1i61iyyffvc";
+"fdsymbol-0.8"="hx8wp66hsznj0sj8jkz0vdah0bp9vvyb";
+"fdsymbol.doc-0.8"="n457nji3718qh1nrjr9wbj9zqj21nkw0";
+"fdsymbol.source-0.8"="3n6d2j9wh5cxakdmxg087mznnrdkjw27";
+"fetamont-2018"="4b0n4awl8k1zz1pn0pnc2hic5shsyb2h";
+"fetamont.doc-2018"="vq97fpky2mf9p09zwqvk6vkl5k9swkbb";
+"fetamont.source-2018"="j6zizdhly6lam1y4f37sy8py5ibaz4xz";
+"feyn-0.4.1"="mb9rzhjkx06m1yv6knnfx59if98wda3n";
+"feyn.doc-0.4.1"="hz41vacil1r726v0f6k2fjpn7zky7xrz";
+"feyn.source-0.4.1"="lqz2b6w4z325ba7mq42aj0brw2hpx01z";
+"fge-1.25"="59jqqyl11vinxa29f6gmalv30q6zfbzi";
+"fge.doc-1.25"="49bgdsclk4zlpdfj9pimffpr4qkd2z7q";
+"fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl";
+"fira-4.2"="8xshjg5hqnb0imcwl07hmjw814y3q6by";
+"fira.doc-4.2"="sy0k4n6gi080pcjsz665jk8213vivhw4";
+"foekfont-2018"="wha0shrvr3lv9ll9d3gv60mcav605vcc";
+"foekfont.doc-2018"="n91sl0xzglqfbdyb9mzv7wav3y4zv9sx";
+"fonetika-2018"="firgrcsksy4jdk632aqfwlaki3xxgmak";
+"fonetika.doc-2018"="ahz61pg6qnn2dpi3c9iz2kh2f4fvywbl";
+"fontawesome-4.6.3.2"="0n13dha58d0w511pzzckcq51fal6zxgl";
+"fontawesome.doc-4.6.3.2"="x7hzlyxv5k2zjz5lk8hy15pnvbhhhijj";
+"fontawesome5-5.2.0.1"="vkcywdcrs0mbdpzhgn84b374xdvb4xd5";
+"fontawesome5.doc-5.2.0.1"="v0x3g5xfizlh6nzibv519ivl6lini7d2";
+"fontmfizz-2018"="rkf93c9imj2wd7aps85m6450zbd9p3yl";
+"fontmfizz.doc-2018"="y70dshapwj7xp7h9b6sbjipv6v9k02wg";
+"fonts-churchslavonic-1.1"="3d67nxsgrrv480997rlbrzz5siyb2gvj";
+"fonts-churchslavonic.doc-1.1"="arcilr5n1w0rg97zkxy162kx21ygns31";
+"fourier-1.3"="rl6alzjlkyyhhk0gbra08b99fb3aax85";
+"fourier.doc-1.3"="6b2bnjvp45lqxmjbp0pj5yd4m39kgg6y";
+"fourier.source-1.3"="dcl6cw6vfsd0xjpic29161iswkv52gm4";
+"fouriernc-2018"="9pxp21fllg7yh9jfa8nzpy6ifa3w6y18";
+"fouriernc.doc-2018"="dn9wfy53asfp1bbxnfa9nxvnfy3z9nn1";
+"frcursive-2018"="fs9aw12gfd5gs55fhqxg2p06c50i9s1v";
+"frcursive.doc-2018"="r0bj4g91m2w3yl8q8kim6ldm4d8lyziy";
+"frederika2016-1.000_2016_initial_release"="bl8g27dfv6xsqfwlr2i6w9yar7916qnn";
+"frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6";
+"genealogy-2018"="hdl046d3paihjmlkh2q3crfj1n88fsyv";
+"genealogy.doc-2018"="7115cwa2l6nsnyijcdik7kw513q3a41h";
+"gentium-tug-1.1"="icijmw31g5lsgqlkam4d6z33fzprpxi8";
+"gentium-tug.doc-1.1"="i9l2xy7kwymvrzhzd1p17qgq3n3s4ay0";
+"gentium-tug.source-1.1"="fjd2j35fn1jbl3zw6nix2hz6mbbcr6m5";
+"gfsartemisia-1.0"="98gdcspx1jqdry7iiq7mgxxmicl57zz0";
+"gfsartemisia.doc-1.0"="drbwq4z57xl8748mwmy86j97ycs3b16a";
+"gfsbodoni-1.01"="dzcgyjfwabmywpi5zkac7lbf88jzsbpj";
+"gfsbodoni.doc-1.01"="cbw698q7jmg09k301zwbnnqig853c14i";
+"gfscomplutum-1.0"="bic1cr1c3dii9nlfmhlgsm6rpj3g0im7";
+"gfscomplutum.doc-1.0"="ddz279xl7glgi201dizr2gdkcgiy77qz";
+"gfsdidot-2018"="j0mg1pn4n9dfy9hdia5v88hds4j2h2d2";
+"gfsdidot.doc-2018"="xrnlqx0gkb79g50mwzsmi9g6ib1pa92y";
+"gfsneohellenic-2018"="az5rq4d44zysnvcqlky0hr5qb7bh3nza";
+"gfsneohellenic.doc-2018"="04y313wjm59sgg4xlnili0kfw3dwljp9";
+"gfsneohellenicmath-1.0"="l1san6zqbd1r2r2j0zp81i723jpqyqzf";
+"gfsneohellenicmath.doc-1.0"="pj6lv282l62rz9yb4mlk6w07n0ncz0vn";
+"gfssolomos-1.0"="wq24prphxxnn94n0nd4xmrf23f5yqchp";
+"gfssolomos.doc-1.0"="rq87k1bymgyb837k103ps50w9krmxca8";
+"gillcm-1.1"="42vc5sx8shjzqkc10qv7gyq9689bzlgq";
+"gillcm.doc-1.1"="4rmm7nn5z0bw3qgn8gfkl86bblkvkh6g";
+"gillius-2018"="fw49hi1cvp9zknv23xccgffkxyqwimqv";
+"gillius.doc-2018"="dhkvy2y5v117xzm4lan27k7q2rcdvs5p";
+"gnu-freefont-2018"="1zqn27grz5h290g4fk4q8kd9pf4l05ag";
+"gnu-freefont.doc-2018"="3saxb0d0h7dn8a1f7l8ax0dj5ic8piib";
+"gnu-freefont.source-2018"="716drmmfwyq7pabpgagk0zwkj77lrhda";
+"gofonts-2018"="zpgjyb4435mfsjdk5n2c1c2nyqqix88f";
+"gofonts.doc-2018"="dzy2jb8iyr227sil5wj14sxv5v1w95bc";
+"gothic-2018"="6wx2xl7wrgnai3wwqgpggwyggyg5hid1";
+"gothic.doc-2018"="1cpvmj3vn26ji5cl1sfxvdh6qv7ix92f";
+"gothic.source-2018"="6gh7hma17066gk20ri4qjvml8d424c1h";
+"greenpoint-2018"="qlqfkgcn8gc1hy7gmfajqliriilf68ck";
+"greenpoint.doc-2018"="xf889ii8gmck30vlpwkfp7d9242ivffr";
+"grotesq-2018"="rqv47whzwig31vfd8581ncd87ja7pb82";
+"grotesq.doc-2018"="rim68sz4x0r1m6j69zryv98gfgvpkbz0";
+"hacm-0.1"="jvhbypj31pcc0imgwlmzpv8nmb1n9dxk";
+"hacm.doc-0.1"="0dys4q83mfgxlwrz16fsm2cx2vgcn5ly";
+"hands-2018"="570kl4m7mximvq87lfqa6fim30hmjjqz";
+"heuristica-1.09"="s1khk82w1g5q53iaj29viqgi1bssfvx2";
+"heuristica.doc-1.09"="vlm8a9a4g4vbqiana67r4dfyv3g1fk0b";
+"hfbright-2018"="j8vk71r5c8iyhfmfwqspj1c4iczl2p0f";
+"hfbright.doc-2018"="wqqxw523sh1yjl0hnh31902wap7xcjwm";
+"hfoldsty-1.15"="79zmah1m2xg56m7cvfybzw68kbfcf5c5";
+"hfoldsty.doc-1.15"="16gmfqd9kwg0isf4wp1nlndfwn5132ph";
+"hfoldsty.source-1.15"="vyly65j4d7wl49gmm8wgpxrnv1s2ygq2";
+"ifsym-2018"="qy3w8h8slb44vg4s7q7ddb9db2fd9s06";
+"ifsym.doc-2018"="wpnp4ykxz7qa1ycwzkfpp5sjrs49np12";
+"imfellenglish-2018"="y1vkapnwlqxwb3via4yhpszgfmlyqa9q";
+"imfellenglish.doc-2018"="g7r6rv584d412gqassqba30jfg3i1490";
+"inconsolata-1.114"="r6sxw4pcb3vf4fh08kcima6r18rk53cl";
+"inconsolata.doc-1.114"="277jxifzxdi2dvxxcbxa5hkpiq03af1z";
+"initials-2018"="sd0v18xidrmnllf1ihmgk02jz3v2qw8j";
+"initials.doc-2018"="6nhvprdk8nd8gxmhq2hb8s41rpjwmv4g";
+"ipaex-type1-0.5"="pzqc88hkzspswvgps1bswsn6khablb87";
+"ipaex-type1.doc-0.5"="xls1iggs58i1mnpc79fp15v1f1i59h3y";
+"iwona-0.995b"="l8pylg2zq5pvxs7czq17b3v1xpar4qkr";
+"iwona.doc-0.995b"="piyd7fk40bqwdb3fxshkcwwrdi8gra32";
+"jablantile-2018"="7fh0mnp320r5b8740vs3z19dg1l0i4ds";
+"jablantile.doc-2018"="yml29hq7xcawh3zkd6b32dbsk0aj024q";
+"jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9";
+"jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0";
+"junicode-0.7.7"="s9grb6y7k5mxsfaxxyp1aj8c289cdb2r";
+"junicode.doc-0.7.7"="b66ag5n2apfdkwlhqsvg6aq1p8pdbiyn";
+"kixfont-2018"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40";
+"kixfont.doc-2018"="xp8ai67z856fmkzcssavksidg7n7j2yj";
+"kpfonts-3.33"="rsl5v8zsm8pblyjryw3f14svxjzhnchm";
+"kpfonts.doc-3.33"="rr7q8ww1nkpzqy29xmxhsyizszf59mqx";
+"kpfonts.source-3.33"="448xjy1djbz9l9wbhmq7r6fpgvsn9dyy";
+"kurier-0.995b"="dadp8vkzvblj60424k75bchravcr0338";
+"kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b";
+"lato-3.0"="cay4x21jfm7mzs18f21ymwaa3gbqpdiz";
+"lato.doc-3.0"="kh4a3qzwkrvx3my0qx0vxk4c5ixfz3ag";
+"lfb-1.0"="kqspj6w9i4bzbxcngqdfk8rnw33j0yyd";
+"lfb.doc-1.0"="ikbhi6ahzxlplvizphmpimf9ah2ninqg";
+"libertine-5.3.0"="fli1yd0pyv6lrw407bsk2hvn6dhzch0c";
+"libertine.doc-5.3.0"="5xbcjdvjdby67zdkdk3g9lglbfar8bnl";
+"libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7";
+"libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857";
+"libertinus-6.6"="15h8x8i2kyb0pphvwydmg32ahw4rddpi";
+"libertinus.doc-6.6"="qnsbq20zfk74q2smd8r2dkacicbxf6ns";
+"libertinus-otf-0.11"="kn4ag1whhhh2kv9am234wdab5jqg6qjb";
+"libertinus-otf.doc-0.11"="mixcz9i4bfric6jzksfi4jlysimz2nml";
+"libertinust1math-1.1.7"="98ry7qyv2vx70l0dbwnz9x26bpwl17l6";
+"libertinust1math.doc-1.1.7"="0lf8l4w2yhmpli9wy7hqwwbl01vn0yx5";
+"librebaskerville-2018"="2dc8cilcgmmp0wrla8ayyyh4khhh7lfl";
+"librebaskerville.doc-2018"="5yargvzlnq9sckyy629jzsmi17gb8h7n";
+"librebodoni-2018"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5";
+"librebodoni.doc-2018"="hzihx71p9ggdp2pxrjvck7lhx2mrgdmj";
+"librecaslon-2018"="rpnd5xnxi48r8xy7jiqaw0z62j2bgnsr";
+"librecaslon.doc-2018"="6n2yvfsmqybr3baq7njvdk4hv0rgwfll";
+"libris-1.007"="fi5cn5ag6zgprgc0iqgk4iln6kb8knv8";
+"libris.doc-1.007"="82p29lh7cbavrshdx4s0pvqpgbvb21d4";
+"libris.source-1.007"="gd4aiv3pxy5as8cwfy9m1f4a8jp7v6d1";
+"linearA-2018"="fs5s95s31qczmlr0m3dk16c7gl4kpn3z";
+"linearA.doc-2018"="6b5jz6pfmv5f88gkwj5642jvd35ga3gm";
+"linearA.source-2018"="zdfpl9gwgrxwvs9ymj3vngfxdc23vv0q";
+"lobster2-2018"="lx95j46k68gz8jbcxam8a3xy4jgxy9jk";
+"lobster2.doc-2018"="psr2bid2fjynzfvwb4s86biamv1r6q9l";
+"lxfonts-2.0b"="3s303f06r7561x3x38sy3c9nr80x8gdq";
+"lxfonts.doc-2.0b"="swgvazf325j99kjrcb94r8611fs6jmqv";
+"lxfonts.source-2.0b"="sxn1hl96bsg6ai8fafskxj8palg8vpk7";
+"ly1-2018"="ry7x1505pv1szprb9fi2x21s97m23ln2";
+"ly1.doc-2018"="iw3amhkw5vjcmrq43cwqg653nyc3ks1p";
+"mathabx-2018"="qgy1qqn1bk43nk938d7bvbyj75v4fz57";
+"mathabx.doc-2018"="q0n88v61h3bqf0vvldd1lb03d6i1z8mc";
+"mathabx-type1-2018"="z96jirmwabbav354qlyphhjvxnsgjqxl";
+"mathabx-type1.doc-2018"="yq8n84cpw8kqvqivham4pqxq1740z36w";
+"mathdesign-2.31"="30x7w3a7v1654a9n5mcj5kdak8i2qxw2";
+"mathdesign.doc-2.31"="sgp7bi4m5480jvsdj9n2pq933cfjkiqr";
+"mdputu-1.2"="6wr48jgiyfprwwrla53qshm2817zrmm2";
+"mdputu.doc-1.2"="9lfn1jh6370mv6ic1gg36nlannbv73pf";
+"mdsymbol-0.5"="hjaz8ph3zrnl7x0545k3937yl5a0ghqh";
+"mdsymbol.doc-0.5"="g8m1964gq8gnn3cc3ij1iqhc4akwmc3q";
+"mdsymbol.source-0.5"="7hy2zpaw41c46i7kd4m65lhzgbpkn5xv";
+"merriweather-2018"="57d530k5j2lngknni5abyzls4nlaadpk";
+"merriweather.doc-2018"="wfsrrdn7gfh7ih5fqsd4lxy55hmc9wwh";
+"miama-1.0"="v8l2d3rkr08hpxbvb1yw18afbcr3mqb3";
+"miama.doc-1.0"="xwqi0jxadac5vxcv1zcn8irfmfi3c34r";
+"miama.source-1.0"="9qf3ffnir6bn31gcdzrp00bryijrmw5l";
+"mintspirit-2018"="wc4wyi1dfc7ql5sdcyycyqxjfir4g97r";
+"mintspirit.doc-2018"="w1ld9009591p4inkky5jfppjaiy0ja8s";
+"missaali-1.004"="yv5k1an5kf5fygdjphwyg34k7yxzhvfm";
+"missaali.doc-1.004"="dwrqnc25398agbnc9nqmmiviray9fgw3";
+"mnsymbol-1.4"="gmjs2ra3yb01bxw90gjdri3p6n7kbc6l";
+"mnsymbol.doc-1.4"="7ngazrr147x9gdadm651fv9hjr1f87i2";
+"mnsymbol.source-1.4"="7bf82bljx9w783jg3kibc5rn2l9j0ym2";
+"montserrat-1.01"="69sgwbg4w8kxgl2sixbx2p5l8x09m95i";
+"montserrat.doc-1.01"="qs93cxc3d97zzny9702zm5gydz9p45f9";
+"mweights-2018"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq";
+"mweights.doc-2018"="w719n3h6cg10izpzgcqd4n0i5gbm644a";
+"newpx-1.321"="d12yaqn9jk8z82rl50z1i2q507snsdvs";
+"newpx.doc-1.321"="4q8cyg65h9biyizjszazbyb8j6fyfgwc";
+"newtx-1.554"="1lfwad5qwdz6jhbzfzgyzbw5dycibi3x";
+"newtx.doc-1.554"="zvalvkaa1bq8ncx4lwprm018dlh3w3fz";
+"kastrup-2018"="qdr5cacl37ans3zd5jlzwr2356xxgswy";
+"kastrup.doc-2018"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw";
+"kastrup.source-2018"="13vj32k48f0ahs5694zrsvk953kxjrwc";
+"newtxsf-1.051"="k228m8b49w8pxij91bgw6xb8ikwa5q6b";
+"newtxsf.doc-1.051"="4mn23hq7waqwd7n1b6p67pjgbck0vlaa";
+"newtxtt-1.055"="7v1rd11ryiynfmwzrmwywd2m9qc5i3fh";
+"newtxtt.doc-1.055"="zblj8j85biikhm989slz2hwbvkhq5yf2";
+"niceframe-type1-2018"="0kr9sg5vnawjrd2aw8vbf8mg975sifl1";
+"niceframe-type1.doc-2018"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a";
+"nimbus15-1.00"="wrnw56g5wf7g0443fwdbv05cca3yr9gl";
+"nimbus15.doc-1.00"="q2qwgrdmc69r2yq7kf8nak62smz536ay";
+"nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd";
+"nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff";
+"nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279";
+"noto-2018"="ngbbgzr1yqkyqqwh80304l772py44bim";
+"noto.doc-2018"="3siz388nmc0acmb2qndnz56spr1h0740";
+"obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh";
+"obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl";
+"ocherokee-2018"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a";
+"ocherokee.doc-2018"="p9lx15xl112908b004y0y6nlfxzgam24";
+"ocr-b-2018"="q1id788vglvlc7lsfr35gvzf0xmgr22n";
+"ocr-b.doc-2018"="lgwx91waimda6cdr05fi2jdwh4x18fqf";
+"ocr-b-outline-2018"="b8hhnggqxzs8285f55ixpwcpd7hb2dym";
+"ocr-b-outline.doc-2018"="bl1m2hny1zvs3wy4i4pndd2vxq7jhd9j";
+"ocr-b-outline.source-2018"="pf5dql2llykwb6x5a2s3scg4kc5r2f77";
+"ogham-2018"="22q1nc2fd6vv7hr7l4iryxi5bp6hqfnb";
+"ogham.doc-2018"="awnlhhzp2ch289lpnwybhz1k3zqwqq5d";
+"oinuit-2018"="n4di43fhkw1zcmy9xgxn7g4wl23qinyi";
+"oinuit.doc-2018"="s5hi4bk5yc19fb5lhmnc2vvxpr3ahd2k";
+"oinuit.source-2018"="caij5pbyylnhlhx149kl2h5sj4qda57z";
+"old-arrows-2.0"="7s0s5g2vif8hkzj768a0zgg46xjh57y6";
+"old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb";
+"oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd";
+"oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda";
+"oldstandard-2.2"="iqi5gsgi0n4hzwaxwz00vz2wq43xhfgk";
+"oldstandard.doc-2.2"="vh7gsp5wf33yzfmdklh41nl0dlrn9vwb";
+"opensans-1.2"="96p8jrsz9bp7lmyvi1yyq8k6g8x7041h";
+"opensans.doc-1.2"="6wh2f3idlc9s717la12bhj92xwniyd1j";
+"opensans.source-1.2"="4idpv3dnr2p81jrbdfxqxanyyzgaxbrc";
+"orkhun-2018"="fmazxvhmc0r0m96ms6a234wj139g00iy";
+"orkhun.doc-2018"="mgamvmayvdi43vxfqmxgbgzfahpn3d2l";
+"overlock-2018"="xnfcanjszrd5bdrdszdy0lj4d73wb7jg";
+"overlock.doc-2018"="08zkifgzjdfcb9q85dz0xi7q5q558aq0";
+"pacioli-2018"="ka7a174yd3q3mymkbfyqbi7hhzpbhgvv";
+"pacioli.doc-2018"="5pzk9mjcdlzcnxwfkba4hzn23bzlhfh9";
+"pacioli.source-2018"="wwvfswngg0rrng6f3xck0f4qyg5m3shk";
+"paratype-2018"="877hrpz9vdgw6hsi6zf9d44bwnqjd6cb";
+"paratype.doc-2018"="12a3wq98sk2sb66rd08sx3f3vqvyqsr3";
+"phaistos-1.0"="5vv58ibkgjmpih67p2qgm9vdiqh4ag6m";
+"phaistos.doc-1.0"="z69jyiz7nm44yg9qy5vfhrzwby903g3s";
+"phaistos.source-1.0"="clhmyfpd5l1zx29352smmnyhal3lpa5q";
+"phonetic-2018"="1ha5wc46jqc3r9ziq7wmx0va8svybyjk";
+"phonetic.doc-2018"="xa7kxz7lh1sqmb6x9n4sh7bjpr9mvzqp";
+"pigpen-0.2"="d6rr06gpzr27134dqh8rv6h6g4i9hg4x";
+"pigpen.doc-0.2"="gqnp68lkhnnyh1ib0sa34cxjg52jj0rs";
+"playfair-2018"="1rmwab0wdfbivgzkjkdlnkm57bvccgw7";
+"playfair.doc-2018"="2aaqnm4gmjl2g1v4a046hlx90xjwb8jf";
+"plex-2018"="yfvy5kvgvdkwbarh2d08rglk76lv5phj";
+"plex.doc-2018"="0zfb4in1l2yaxyl0vahrqwmbkz8fq9xx";
+"plex-otf-0.07a"="2k3j1snsf3d414k4pjq56d9b1vn2vh1x";
+"plex-otf.doc-0.07a"="z6clw20q3nfwzn087f3c3ifc4g2yr4kp";
+"poltawski-1.101"="ipqjw12syp38hj1pw4b9g03kx07l40vn";
+"poltawski.doc-1.101"="g3shi2lp499x96az1f77y5bf8mhrgzl2";
+"prodint-2018"="vgqm1rmgqqvn7d4akab3x7jqz89kb0hq";
+"prodint.doc-2018"="fclf35r9hmfq76bvxwz5df0q18zms1sm";
+"punk-2018"="1bqwz8g3apk49mhg7m63qsynrxjxg76x";
+"punk.doc-2018"="1gc59v1xvh9sls0nr2ypmifripdspd1l";
+"punk-latex-1.1"="i1gqgbivxd8yl1rwjbssf2g0ib9nvb57";
+"punk-latex.doc-1.1"="8nzibnm4247rapxb9kfkyv5i49w19ipk";
+"punknova-1.003"="0q3dx65cyb1kh2iwbs9if8p6943m3gw8";
+"punknova.doc-1.003"="hjlldk6yr4hjh4chwcxmzq761h1ygwnq";
+"pxtxalfa-1"="rapvsla1cgyinabn1w9cshpm3y5af13r";
+"pxtxalfa.doc-1"="fg8arijrsm7gc3liyf3036pj014w0243";
+"quattrocento-2018"="49ifrqysm27xbwqmy4k0h7k65gxk4c9w";
+"quattrocento.doc-2018"="3rbp50ihgm2bhv78xa7839j99m4q45qr";
+"raleway-1.4"="qyqkxw2r0kjdc5ccq6ixlsjgv75gcmhv";
+"raleway.doc-1.4"="kw13y1533fwj7lgjc986ydb97plij1vh";
+"recycle-2018"="4fgfdk09nzljd5a6vz52nvv8b23xk8rw";
+"recycle.doc-2018"="3wazkwncn9gh1lpcax4hb8x38jr6ynxd";
+"roboto-2018"="iv2x04afqkrbfjswxg4hgvba3hg6r2m4";
+"roboto.doc-2018"="qr7xcf2bia0v9d5l5c30xs8z5rr5lfxa";
+"romande-1.008-v7-sc"="v5sf9cqkvd7wmbrrb48dffi59m048kal";
+"romande.doc-1.008-v7-sc"="bf5a3jzcqr74l7qp2im80r9x73rk3asy";
+"romande.source-1.008-v7-sc"="g2p0didwlqqf9gsdzrhmh0f9543wdwwz";
+"rosario-1.0"="c9jlarr5wz2fyyhkndgxvq7npk59xk5m";
+"rosario.doc-1.0"="v521ckdibqy21cm5aagyiwfbzj63469v";
+"rosario.source-1.0"="zy5bkfdxj9j0gca23hk0d0vmbrnwv8h2";
+"rsfso-1.02"="3n75qwpji7z995wb2r3dqwrszkw6m61m";
+"rsfso.doc-1.02"="vga3jyv3s730mgx97mqw92igvvypbyb4";
+"sansmathaccent-2018"="i74c6yiwx5g1ilgjw2i0wsf2ip5ym9dp";
+"sansmathaccent.doc-2018"="dxbr7vs0j710wz9ym4n7wb3930kcrccj";
+"sansmathfonts-2018"="27328mjiv4hp1d24c3yf9bw02602x3r2";
+"sansmathfonts.doc-2018"="wbkv1hkr1l7gdk3kxfjx4dxmzgjjin38";
+"sauter-2.4"="flw49y2l5355jpvq7f3q3vannwcfni3f";
+"sauterfonts-2018"="kciqmij0w173na214ix5yhngc18likch";
+"sauterfonts.doc-2018"="x2lc53r2wnwrjfainmngafdsg39zyf48";
+"sauterfonts.source-2018"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m";
+"schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807";
+"schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81";
+"semaphor-2018"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35";
+"semaphor.doc-2018"="5lc0796kh9slmk1hrm3720mcnqjlqrcv";
+"shobhika-1.04"="1iqj5p7vljw0yv43i6y54s4ghbx3f662";
+"shobhika.doc-1.04"="5kn3dz79s0z5mr9k6an01j2p14bpfms2";
+"skull-0.1"="hv1lxixs6dv2sagmj4rnjpkhc4s2i3mj";
+"skull.source-0.1"="szzd5b98j04aj4f4aq5av7fs7316156m";
+"sourcecodepro-2.6"="md57f5a305c6w98036ll1lpi7qh84qq1";
+"sourcecodepro.doc-2.6"="bksqxgy7iax59nisn8zs6a1b5ig76r7q";
+"sourcesanspro-2.6"="z54yjkharb2lcq260in8q07d2d1s5w8n";
+"sourcesanspro.doc-2.6"="cwyk6i4sdl4iag4ggdxm0c3l8ndz7cd7";
+"sourceserifpro-1.2"="zjimb4v67h1nf7rcnxxxwzjc5906ik8d";
+"sourceserifpro.doc-1.2"="p92ynwbxnbij2s8nr12p4hvyycvfy405";
+"starfont-1.2"="phdad9yy6nvcxi7ym1chdvz0vvb309ag";
+"starfont.doc-1.2"="96h183mv5rmxmnkgy6766519cz5nff6g";
+"staves-2018"="9vcnfl7q4czfhyl3zxadig3nzdxg900r";
+"staves.doc-2018"="rn25a0syl0d0n89jp09906y30679mr7v";
+"staves.source-2018"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3";
+"stickstoo-1.031"="ma2xdqrncr72j3kvw0kzr5gp584vhs83";
+"stickstoo.doc-1.031"="j89hnynsnh38y3vj24l8w9zplzhmvjnc";
+"stix-1.1.3"="sxfvkk30xb94rfby1kli4xny57xsbqv8";
+"stix.doc-1.1.3"="xa4z5gssrb74xsdc392ni8rww37c2phd";
+"stix.source-1.1.3"="m4csxq0wlzy246f1kgbd4n0sfgrcbnri";
+"stix2-otf-2.0.0"="v943m4w9f4yxkicccrr3zzggkjixgk76";
+"stix2-otf.doc-2.0.0"="jcd2cxyrfiak8zxs5zsq2fynsrjdhi82";
+"stix2-type1-2.0.0"="ni9mkzfp0f7f2nhvzcll5mzimfwlxcn9";
+"stix2-type1.doc-2.0.0"="dbr68916dyxfhglg00d5mrxz40p1cfzm";
+"stix2-type1.source-2.0.0"="c9ajhq2dinxzps5kb0h3czz0jjk6gy8q";
+"superiors-1.05"="yr7dyyyy1nd25d29i20yq0mpcxb9zj73";
+"superiors.doc-1.05"="bjisssimbzj3hc2l9qf91550kcq9d0r0";
+"svrsymbols-2.0a"="j2ds4nc4zvmyyllhq57djqmmvq389zhz";
+"svrsymbols.doc-2.0a"="c6lf30h2n585pgigx3fhb86scmqv12fw";
+"svrsymbols.source-2.0a"="q3xs00frbb5a21rrb8plfis0b3vhnfaz";
+"tapir-0.2"="sawmv4raa4l1x5sb5df85ds4l4w14ly6";
+"tapir.doc-0.2"="4kn8pfirjbny0k07r1vp1vqyb0r69rqi";
+"tempora-1.05"="b3l8kqm33s3f24smwljks341214ljsz8";
+"tempora.doc-1.05"="62ib93cvg5q0gvdi6bjv9xzg7x9q31jz";
+"tengwarscript-1.3.1"="krhlp4pdfk21rkn0bfm4ghg9sl6hh8qd";
+"tengwarscript.doc-1.3.1"="rj77kc9g6cpy4xnmn8gyl0c68wnrzirf";
+"tengwarscript.source-1.3.1"="8pkcc064pbw50jcn40hzzcrpkvd5hvn5";
+"tfrupee-1.02"="2srhr23mwajngahy1hcihhivix7x6af3";
+"tfrupee.doc-1.02"="pvmd0anqdv38a904hhafsr9mq5hy7f5d";
+"tfrupee.source-1.02"="sz4z2j5kzk9431pvdhj2l11b8qsw3mlv";
+"tinos-2018"="c1b84zg78hqp8fm15cgr59qrksqd5prp";
+"tinos.doc-2018"="09w8iyqc8538x1d7cm8jcwk1mkmv93vx";
+"tpslifonts-0.6"="6d6zngl99bgbzqidn4249bv3p3ykz5pb";
+"tpslifonts.doc-0.6"="64fr89dkcr0zzxcmshmhpczvbc4byp22";
+"tpslifonts.source-0.6"="0267nah6ffiwph29ay6cpfl9zqm4vgbh";
+"trajan-1.1"="j8dsrxip2s58sgw90hl98v2w9r106cz6";
+"trajan.doc-1.1"="kwiwf13cr6c6v10vd1irq5srl82kvl58";
+"trajan.source-1.1"="nm5fpl91wscxri9bgcvfhmyfqrryvdil";
+"txfontsb-1.1"="lspmvs805a2sjf5my3py4dkai740n05k";
+"txfontsb.doc-1.1"="cgi4jnv4ks21p7m4y4ry4wajzcgkws8g";
+"txfontsb.source-1.1"="4zypgg4dchni1zh8sx4wh4sb5fdh8x98";
+"txuprcal-1.00"="8yk9lvdxj1ap0lcnywllxhzdz8hplk78";
+"txuprcal.doc-1.00"="pmlz2hhjd7a2q3bdbz01yd61w3hf2i79";
+"typicons-2.0.7"="0mmcwr2xcx7hdb4yllndrzq7bxava3yb";
+"typicons.doc-2.0.7"="6bcmldiywvwfhknmdvpj8fdz0fmdizkp";
+"umtypewriter-001.002"="4k8n89mabkcc3pyc6vhj47hvxncz40zm";
+"universa-2.0"="m43cqqy103c1rh5yb8i756mm4nrmrizp";
+"universa.doc-2.0"="a5nmwpyz7v6zbk7s1pq883nb9mhn6ann";
+"universa.source-2.0"="5h127gz30jy4plcbhz11zk2az782v629";
+"universalis-2018"="fwhl8bzgbw53ka6j71zbpc2fxsb20896";
+"universalis.doc-2018"="4w17vpjjhk2wwmc4m6z2n67814fdlrdx";
+"uppunctlm-0.1"="snyyw4gj0736fqykkf94fhkp9d31ml9q";
+"uppunctlm.doc-0.1"="h6cblhxd6xb6nnp3szb0fwv1r7pdwg99";
+"urwchancal-1"="kk9r6rk48qqq9s8l4k42fgj6c84912bw";
+"urwchancal.doc-1"="z0p6cn21n3cxi4mjijy39z9hacfhkk5l";
+"venturisadf-1.005"="nnn3pq2sx0rayjhhsh2pyavkf7c4i7jw";
+"venturisadf.doc-1.005"="gjzclw11zah2cpmgjdpknflrfsaahq9h";
+"venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g";
+"wsuipa-2018"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz";
+"wsuipa.doc-2018"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm";
+"xcharter-1.115"="4hyl037i0k580xkwb3azax39498phhfz";
+"xcharter.doc-1.115"="kshvbhdvj6vw4n8pf0cdr4c2criahsdc";
+"xits-1.108"="dgkldqj163pdlfy3gmjza6hb8lcanzbn";
+"xits.doc-1.108"="bnvwmf9q9r8z9f1w338xadknd9hpywcm";
+"xits.source-1.108"="zpy513c9qwxjdk7rg0qqkq69j719fx35";
+"yfonts-1.3"="qfpb2c6anayf3k3bg105apscs3dj1xj9";
+"yfonts.doc-1.3"="z0rzdfjpqdj9q0bixf77j9jb95nix8bm";
+"yfonts.source-1.3"="cjh6cb3zhdsljlwdzd7yr6axbnc0v1fb";
+"yfonts-t1-1.0"="b1j2a6sc3npjli2k0y02fgl87k5kq7xb";
+"yfonts-t1.doc-1.0"="say9m82dcmna0f9g1h4ng5ihjkpzwh00";
+"yinit-otf-1.0"="8dd8yhd7fy5wvsl9qnshkvm69g9wx1fj";
+"yinit-otf.doc-1.0"="7rhfxzlfdwl3g0bdlxwsyzzf83f24xx2";
+"zlmtt-1.01"="s9fvrrpb7d5d0590p37xzkky0x9536vd";
+"zlmtt.doc-1.01"="psz0nrmif6hfl96kjmqi0mpbdw1i710v";
+"avantgar-2018"="6x48hsg7wdw4qmf0pyqvb7zmqpn6izqr";
+"bookman-2018"="r9bkd40g0hwcbjhfa2n637i0qyk6ahyf";
+"charter-2018"="1iha6fak3i1mwa6pa6fps80vzik65a4c";
+"charter.doc-2018"="fvn827jh9gfdbs6gnnm83s2yialawz7l";
+"cm-super-2018"="wqamwks565frzn4nf6pq9skasdx5jbmy";
+"cm-super.doc-2018"="246p6vn62gq68n7bnxh1iz258gn3wi85";
+"cmextra-2018"="kqywbrwmg5w0xj0r0qffh1y9z9hlvlaf";
+"courier-2018"="f3rhv0jy01gfhn1rdnai7693y2xy90d4";
+"ec-1.0"="kjq23jms9m9h5af2ri4bxd65w82lli3v";
+"ec.doc-1.0"="a8mvwdx6s8swxhagcc1p36dsy335fhby";
+"euro-1.1"="mpzw5yyqlyb864cqx4wczdnbln4sv4b2";
+"euro.doc-1.1"="82srlwf5vlsmfpwn0l7c7j4wd9fmvbqa";
+"euro.source-1.1"="v5w06s1hfni20mg1flnwgpkr5m49vqvf";
+"euro-ce-3.0b"="csi0m4qrppaz6n7pj6kn8ph63d8m24va";
+"euro-ce.doc-3.0b"="dw6qxpnmbr27k6vzv9gx9i06wgc28rhq";
+"eurosym-1.4-subrfix"="rqclyanzsn8f4ylbhvh9garshg0fzf3w";
+"eurosym.doc-1.4-subrfix"="7abbwvvm5riykgm6mq7hhjxd2gz0ljz3";
+"fpl-1.002"="4005wr24r6a2n90469fzz547kid3271a";
+"fpl.doc-1.002"="d7577p5pki08lnv8w6qrcw5qq6kq28hp";
+"fpl.source-1.002"="62kfl70bai91q9zl65pgcpbcmf45nibv";
+"helvetic-2018"="q4xi3bdpp7195sqlkbfgnnccq879v86f";
+"marvosym-2.2a"="pn8zahcj87ab0rgiz9inp97randgz890";
+"marvosym.doc-2.2a"="wqd4660d0s4kxgasi3gv09fbjnbqmwsq";
+"marvosym.source-2.2a"="zygnnzkxxsfxvhnkvkq4v6gis1k7lc6h";
+"mathpazo-1.003"="d950j9d7ywwx0air9b1awwxr0a7486qz";
+"mathpazo.doc-1.003"="zna30q1bzd255h9yjnf35ldaiql0b142";
+"mathpazo.source-1.003"="0ly3fqq1s2sf0zva0jx3llbwkqjm0jv4";
+"ncntrsbk-2018"="r2sgybivplsnj8iqwd62wr0ixhlc8x13";
+"palatino-2018"="xp5kg58y1lzsqba3bv9dz4f8rqi3xysd";
+"pxfonts-2018"="9lxhr2mzcx8qkbhqgqx3y8a4pyhfad5a";
+"pxfonts.doc-2018"="q0zqikbb5d4d8wma6xspga1k20bjx8dz";
+"rsfs-2018"="c6wq6zd58x1dqi2l6p4ljkj3p30lfh1y";
+"rsfs.doc-2018"="2rq51dizzivym4mjl4x7lhw7mg6xmcgy";
+"symbol-2018"="3w7a6aib8mdrap257pxjw8x39lck4nyc";
+"tex-gyre-2.501"="bh1inc34f90vb7wh0r9drdjalhwa71cw";
+"tex-gyre.doc-2.501"="8mvblk061marhxqwf21jssgpn9mgvqs2";
+"tex-gyre.source-2.501"="lqv1gkn02k8yr5n4c3h80sq30f9iggxf";
+"tex-gyre-math-2018"="z84v3wzsjwjx7b6wnwnpqmz7xy5v2bic";
+"tex-gyre-math.doc-2018"="41g7sn49g1kxa1dmy5vrv0fzk3rd4915";
+"tex-gyre-math.source-2018"="0wkvmjwxy9ws1h9j1rn0j57dah6z9jvm";
+"times-2018"="jjlr4lksbyjb8z2v21yy9ig0w6x246vk";
+"tipa-1.3"="h92fnvz5cv34vdyrpq52pn79z9lq6s0l";
+"tipa.doc-1.3"="s923q6n8h73f74y77cf171xj9w3mrd69";
+"txfonts-2018"="5fbs9mb86nll7k3j9d37p0bfa08b8nb1";
+"txfonts.doc-2018"="80fli8zzv88yh6rbv99dzsihxbrhmxkp";
+"utopia-2018"="cq5h07i2v6n1d5l4x2gjb0qn7594w5f9";
+"utopia.doc-2018"="sla3qhf9ks0020wq82iv1d3mivpbx79v";
+"wasy-2018"="m5fy0m7fkc0rb3alrvy7hv72659szlsi";
+"wasy.doc-2018"="ig05zmll75wy50l3cwpz51cl8p6prpba";
+"wasy2-ps-2018"="rfx65vba7w8kqvmf0ld02ydr7flyl17f";
+"wasy2-ps.doc-2018"="1ac408160y6br39063cswn8ahp2c9rq4";
+"wasysym-2.0"="zmiwhd64zrf8fa9v2iqch0ksj81q5r1n";
+"wasysym.doc-2.0"="a1qr9h6d7s46a074ckxygm9iwyycbyw9";
+"wasysym.source-2.0"="r9iq0wx65zmc2kp7880hw3ws73xb63xf";
+"zapfchan-2018"="4saylq91v4il4ch3cp3lw7dv8x6sf296";
+"zapfding-2018"="6prjnqim0yrvzj1ary8i5761byqi0ca9";
+"accfonts-0.25"="vnff63f9g4z5bsgrila75lr6lhdl3jhn";
+"accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab";
+"afm2pl-2018"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y";
+"afm2pl.doc-2018"="b6bcs2lmsj2xh4lkrh3mfvczkhk4x9hp";
+"dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9";
+"dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x";
+"dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk";
+"dvipsconfig-1.6"="llmyk9rhvxs90j3jbjrqz76dxxvzdyp4";
+"epstopdf-2.27"="skajgh4yy7v22v5id7j71x969b38a5gq";
+"epstopdf.doc-2.27"="w27k85cm2c6ia0mh2vdwr1sf32ixmvii";
+"fontinst-1.933"="ynk1l44cw00x0cxmfxvn0kwixgnaah4d";
+"fontinst.doc-1.933"="nc19g8lv38il2mdsapscni5wjdd0x0qh";
+"fontinst.source-1.933"="cvbp2ml5kiq35qjnyzbpi8p7h1n5m2l6";
+"fontools-2018"="8fi57kgb17ra1jnmhlajfcrvq7n3jvm4";
+"fontools.doc-2018"="fv8xy2s78bjli4r2982hpfnmindrixp9";
+"fontware.doc-2018"="r6p049yn0yqiaar1jbsgiwhp267z3gvz";
+"lcdftypetools.doc-2018"="0bkwlj80cbl7abmy2qpwaapxdk3z2lz0";
+"metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq";
+"mf2pt1-2.5a"="d57jv2y04fsln3q3znw2qi16j7dfq3ap";
+"mf2pt1.doc-2.5a"="gc2i9fp30877ycz5l3wgphwlg9kpfqp7";
+"ps2pk.doc-2018"="9nj49s76mr2ipx6jz8ylcaqdyykdfdr1";
+"pstools-1.68"="pqsq3y183pf9330bk78l7v42jxiywkga";
+"pstools.doc-1.68"="0hj3l8dxj5cvxnvz749c2x3mglbakg1q";
+"psutils-p17"="g8ci3q98i9cvpw1s7l3mqsv39wqx3gac";
+"psutils.doc-p17"="gc9r6cjrdyij203ja3bb307p9klvcaaj";
+"t1utils.doc-2018"="3mm2nd5paz5hs8rgv4yrf52v8k2cjdrp";
+"ttfutils-2018"="hzj3dljvfr9ypzpjgpwxadxf225yi8zj";
+"ttfutils.doc-2018"="6k8ymd6lcnfdqgzndwqdq8qrvcjp37xd";
+"aleph.doc-2018"="1q20qyl154s5ysn0zi0mr16rgdlnzlsa";
+"antomega-0.8"="jxriw18jifvf24fz8nqql5izp67p8z5a";
+"antomega.doc-0.8"="q9jb5ks7gfxg5gjhkpng5bl0wwbwp2ph";
+"antomega.source-0.8"="l2gs7sapppwxiy712i8vkwfmmc96ch1s";
+"omega-2018"="0v7wvg0vkrwbarcxfnp8k6w09j86y1pv";
+"omega.doc-2018"="zily3hjd30g14zrvj67hdp8nkxk9l5g2";
+"lambda-2018"="ykxajgkmkbqp7l79c4bcm5qg4xnyilxp";
+"edmac-3.17"="29h8y4lna3sv0k7wqmbgrb0mvdxwz330";
+"edmac.doc-3.17"="il4k6vswcqp00005n0084nf99bwxp809";
+"edmac.source-3.17"="90wdkd3rhm8ymi2w9hb64acsy2bzqgg6";
+"eplain-3.8"="s7f9x73rzb5yf4b4hh5z74s8fymilfck";
+"eplain.doc-3.8"="77i8dzdl4pijzdxmv45nqlj61skvyqqd";
+"eplain.source-3.8"="xwq0gc7jb427nf5yjm77gfng5z56bpiy";
+"jadetex-3.13"="79dd0y9m791m62b48pnkyw4352271a6d";
+"jadetex.doc-3.13"="ix7992xnb7xb1789n6d48dv98imfc4m2";
+"jadetex.source-3.13"="3716mhagkrr60rjj9whznfh3v5qwvyv9";
+"cyrillic-2018"="zax5fp5a3p2zd3bhbpng70sydjxm9i1p";
+"cyrillic.doc-2018"="3risjsh9kgr6pk9d0f082a5ipq1827f9";
+"cyrillic.source-2018"="cmq6669b4zjhvhxn0lxq35h4b606yhkb";
+"cyrillic-bin-2018"="h64b7gacxv96hbs0mjxx0s65s4z5znrh";
+"cyrillic-bin.doc-2018"="yjrn9kz1g0v8sz83l406mpk4fprxln0k";
+"passivetex-2018"="arr43134jllipw1jl9cbrgnnk1gav4d9";
+"ulem-2018"="cissyhv0gisjf9lpwzxm18ffwxmlnndy";
+"ulem.doc-2018"="b2hvc7p6b57q1qqn44pfrchxrb5ybzas";
+"lollipop-1.07"="c71n12rvjhafkq26bca7q7hxjy5b9xdv";
+"lollipop.doc-1.07"="18wdsl5kq7xwsqhr6v6ldwz66b8xk60z";
+"mltex-2.2"="kkc5ssb6rd3f4kig16sc30npjayw4ab2";
+"mltex.doc-2.2"="qqr7ia4wp66zgasb8sm0bd0qclw6zn7l";
+"mxedruli-3.3c"="f866q8w776cr7k7mxll72va7zb0avsl3";
+"mxedruli.doc-3.3c"="vhcvl3k5lzb1f0g0ghz1rf3cnsy0cp58";
+"omegaware.doc-2018"="kl4ws1z3avxn6hfcmf69q52dw7rppfi9";
+"otibet-2018"="66pn5bmsfw3d7l1prcr8p5v6w93lqfrm";
+"otibet.doc-2018"="i308lrxhgqi1gpsh5b5961xisbb9i3si";
+"otibet.source-2018"="hspwgiv9bs4ncmy1yi02jw8ghw2lxcpm";
+"psizzl-0.35"="qx0mhll90g0l0aqzfsjqbn43gxfincyp";
+"psizzl.doc-0.35"="pd8v22iq76j5gkkv9k286yz9i71j8xcn";
+"psizzl.source-0.35"="9i1m36bp80bif8k74q7572j311xxbjlq";
+"startex-1.04"="8fn0wix7vb3xqi2b123z0xlxfvszfbfm";
+"startex.doc-1.04"="mp7rx9aha0622yfrpnm1w2f5pij89nim";
+"startex.source-1.04"="x6bhcd76532n0sfy3cs74whhyw6gy3p3";
+"texsis-2.18"="0mlgxg5a7q80hvpigvz6sl2f6lnkfmls";
+"texsis.doc-2.18"="wawynbj4gxlxbcg8wddrwdlicnlhia14";
+"xmltex-0.8"="0i9h1jakwdh439bi4wq5i4mzfcgmyd8p";
+"xmltex.doc-0.8"="7xl5q081558wnfdyb2r225kckb0wd32x";
+"xmltexconfig-2018"="bm9ibaf0skn5g3ykwpn8gyg8hr80v59v";
+"bartel-chess-fonts-2018"="2mdy450109a2lz95qv50y6wxhhif4nr5";
+"bartel-chess-fonts.doc-2018"="xj41i6y3ssxdpqy3j60pdx2scsf3qx35";
+"chess-1.2"="j9hxdp5kz4dv6wwgy6azrw6yjhdq7384";
+"chess.doc-1.2"="n9xxs3zgzz1vhl7y1d8qxk4cj8fglhpx";
+"chess-problem-diagrams-1.12"="l704rprn6ybj2x2gn469z8zj1kyw8gas";
+"chess-problem-diagrams.doc-1.12"="k3dg6fjx2zmxcj29whrj41awvpmyb7qy";
+"chess-problem-diagrams.source-1.12"="k1kqz5gdj6k6pkbajmpj0qha6lm1gapq";
+"chessboard-1.7"="gbyh69ypw7gc06g9xpj5mwl4bnnfmlqf";
+"chessboard.doc-1.7"="1xmnsc1q44ykjz2rqg3ar3a4dzb6mk30";
+"chessboard.source-1.7"="5qq8g3985wnvbkp8h0nxfmvg1hc4v0g8";
+"chessfss-1.2a"="is60vi3pamq0qzj8pw0jvj4prvgbzxp2";
+"chessfss.doc-1.2a"="1ia29r7y1ja9d5hx7z17bk0qw7lgz2mf";
+"chessfss.source-1.2a"="r4dzyg9nx44ajf01kbj0qyfg2r4dawc5";
+"crossword-1.9"="k1x6xa5g095ik7rsziladzypsislz1ai";
+"crossword.doc-1.9"="sfqks9j5lypqs02dryhcpjf8hdvkwr6c";
+"crossword.source-1.9"="204s0nxrj1ggqxshkks9inaraskr4mbn";
+"crosswrd-3.0"="66h0iyrwlpkjnasfa6yrc9wsia5cabj6";
+"crosswrd.doc-3.0"="2zik63fs6fqan2z5nxhwz081zpxg04y8";
+"crosswrd.source-3.0"="mi1kqgw3qcy4bj60pz8wl6ym6rf1i8z9";
+"egameps-1.1"="i50d5ijmgapcxf1g1zp7gzv6llx9m68k";
+"egameps.doc-1.1"="8rz7w6n2ip64xgs7i4qrvgc14q1z4p5c";
+"gamebook-1.0"="wnylf38d512bq82hi5jwsf9gxdlb9gai";
+"gamebook.doc-1.0"="f7p5nzs88ps42vwnhcph7vd36s5xfrxg";
+"gamebook.source-1.0"="hgbz9v0wg5kni2lc43yb179b8xqh8mmr";
+"go-2018"="an0cdspxjbbirkz0isbyvknics2pmkmg";
+"go.doc-2018"="17frpsmqhyai4y23xb2zm9qsl18xmynf";
+"go.source-2018"="lw82s14fw0y1yfdhvmmhwy0msyawbcal";
+"hanoi-20120101"="ini1mf0dqm44vabqlqqiw52wpcx3qimh";
+"havannah-2018"="ypcxnwirfyjp28wypyz8gp6zysb26cn7";
+"havannah.doc-2018"="4spiw588y9cw8vvr2b81qp0q61kfbjjf";
+"havannah.source-2018"="jkbnv839cn0i9dnl2v0v9djp630cdzdk";
+"hexgame-1.0"="w9isbb0mqra4kkg0cflryikhm172b7yb";
+"hexgame.doc-1.0"="5xr1vlivrwzhk0zrb2ri8lfc5n1i3zcq";
+"horoscop-0.92"="xw7yniakff9y6f8vsp3rjh9dpx4lidym";
+"horoscop.doc-0.92"="1kzjnm3b51kh9li5p6pmg3a49y47brkh";
+"horoscop.source-0.92"="2ypc7g86drcywds2mj9d9lj1p6zpfnzw";
+"labyrinth-1.0"="yafwn22imcs3827ilqkwh5kggfsvsk0s";
+"labyrinth.doc-1.0"="xm6sjrs773g8l7x04m6k16a8vzb8nfd4";
+"logicpuzzle-2.5"="7ynzg0ycgp17rqxf4wv3vkxbkwwyh9c3";
+"logicpuzzle.doc-2.5"="snzhcidhpnkjwbrb25lb9g18bc13bl5w";
+"musikui-1"="888sbpw1xvg39606w7xl7qy1f32n9vpc";
+"musikui.doc-1"="v9fa4l7bl6d4dcvcqz6nbpmz3js0jbvm";
+"onedown-1.0"="9jvq2kc7ycnlbnim03bv0gl8cjc4m9jc";
+"onedown.doc-1.0"="v80y2a90y1gjzp88l71fppmw2s24xjb3";
+"onedown.source-1.0"="myzf4y5zljyszym7bfyx8lhzwwb0hnnp";
+"othello-2018"="fp9s19jk73qrplyhjnicv8q066a98jli";
+"othello.doc-2018"="q1dqp0zdi9ixxchxnlk60zwfyszbx0ry";
+"othelloboard-1.2"="ymadc4vpkzc0lkl2ws340jf5vzjiq1i9";
+"othelloboard.doc-1.2"="1vi1lc9c75r9qqrhmjp2j7d7p94asbv6";
+"pas-crosswords-1.03"="90v61cxl5ab12bvgnj4k9dc5q6v3zg72";
+"pas-crosswords.doc-1.03"="pm76nswngl127k5c2vwm9nwscci1dcng";
+"psgo-0.17"="487m1ggdz7a554viflmp4cg2kgdw9ghv";
+"psgo.doc-0.17"="cw2v9zzpbmqqw8k8hdq0la2dhdggip3d";
+"reverxii.doc-2018"="2w8l7rs761h556il3d875k0sc86xll98";
+"rubik-5.0"="9wi8kxm1rfbqdmgd08bkfmmcrxh6qglv";
+"rubik.doc-5.0"="byp3r482d99yvd7wj0gw7sy8azki6srs";
+"rubik.source-5.0"="p25x3gpqgyq4hsvgksdspy16w6h593kr";
+"schwalbe-chess-2.2"="40f3q3pv9kbjf9zr693wcqslf9han3sk";
+"schwalbe-chess.doc-2.2"="3i1wbac0bv70k5ls6sry9vxvjq4c9ism";
+"schwalbe-chess.source-2.2"="rqlz4yk36qy4p39q4kqjff5kyjpgi11k";
+"sgame-2.15"="36xmv070y7wzwj8qj24y5q063v2c1l7f";
+"sgame.doc-2.15"="pm7psgqwg5prx0qfj6wh234raqw849wa";
+"skak-1.5.3"="0wa6kcvgwqz6cnjrf64x03hlbd7yppax";
+"skak.doc-1.5.3"="p8p72b9f2jll6hym1fzrymj7c122z42w";
+"skaknew-2018"="8by6yv9rgn4zbzlq0szcm4yvg8pqfaf6";
+"skaknew.doc-2018"="0p383qca6f0f56skhgvjcwprpb04gldj";
+"soup-1.0"="q2i8ygqvpl9mjmcc41ramm2f51h2hp7v";
+"soup.doc-1.0"="sdh5hcm7sl6slkl45pnahimcbfr7f97p";
+"soup.source-1.0"="qarjlwwpzgr3ih2dskaqa83dy2zdgka2";
+"sudoku-1.0"="584gyns58jqsm1ya8l1z63a1wifrgnlj";
+"sudoku.doc-1.0"="rsn0w51h0s7j9w988mmh2q455cx7amqw";
+"sudoku.source-1.0"="cpylv1bwk5yjjfzx8kfz3nha8yfjj2x7";
+"sudokubundle-1.0a"="glfg93s63j960dkz46l4piy8bbs6vjsh";
+"sudokubundle.doc-1.0a"="idw39v50081qhj62hd4w3ylgs6hrvvc3";
+"sudokubundle.source-1.0a"="lih9zbgw5l891hmifvpbdjwaqx70r8dj";
+"xq-0.4"="l2fd2aag0av7znzaw56qbwyp024yx9ql";
+"xq.doc-0.4"="rlabrx8297ad8p4sb4pqkv1lzxiihmyv";
+"xskak-1.4"="was0g67s4bifg8ykdbf4a53p0g6486gx";
+"xskak.doc-1.4"="4jnczqr0bqxchwmaibg5i23vja39hrjj";
+"xskak.source-1.4"="x0ab6f461xbcw6k3dydxaif29rdzc0s5";
+"adtrees-1.0"="1x6lr97397fgi6gapxaa99m9d1a095si";
+"adtrees.doc-1.0"="9rpilrcmiz6js9r3mf3d574aflbbq9pj";
+"bibleref-1.20"="cl6dva45l41c8r1vj83x8id90a80bsy1";
+"bibleref.doc-1.20"="a34ahq2fwhz2sc6yd2mbhjx63axrmc4l";
+"bibleref.source-1.20"="grz8irvssn1wqkq5ndfaipldsl3s3jna";
+"bibleref-lds-1.0"="adlzl3qk74vn1z0zdqn9cm6xqbwd8j6x";
+"bibleref-lds.doc-1.0"="cxvgzvgkicpnam43l53vfw9za8gigszv";
+"bibleref-lds.source-1.0"="8ndhf2vnjjii0xywr848janqh7xzdhn3";
+"bibleref-mouth-1.0"="nlxylwgj6nmzf4ky26hamhvsnm3g4h2z";
+"bibleref-mouth.doc-1.0"="by1z7x2h6xmjgnkj302bjgds4jzrjf7y";
+"bibleref-mouth.source-1.0"="drlwpv0xvyrb259ipq71p68929cmp6ka";
+"bibleref-parse-1.1"="ddxzanvw07cnj984ylsmjybwvyl41sg3";
+"bibleref-parse.doc-1.1"="jcsy831ih2d4scdsydj4m9mzlyahqlip";
+"covington-1.5"="n31q20a26pbc6snsaabl3gnsfw301pv5";
+"covington.doc-1.5"="a9aq52gg379fwcpg0k77mh49c0ycag0j";
+"diadia-1.1"="p95dkjaf17pn4qm3syrd2wm4680qxa86";
+"diadia.doc-1.1"="s8q9nnwajrravg7418bldainfxpm874j";
+"dramatist-1.2e"="r8ldaql5igwpsv1bm35jgcgpnlr817m1";
+"dramatist.doc-1.2e"="15bnkrhgbs4jpsk04y9fib7yvvsb83kq";
+"dramatist.source-1.2e"="h52a16aza42dx50gx6lagzahm1n20xx8";
+"dvgloss-0.1"="57wp58gxcs0hv560zj1g4clhlh0k7ssc";
+"dvgloss.doc-0.1"="kr2ndi6s5i1k7grvwmkxzhdrmqwzrkw4";
+"dvgloss.source-0.1"="j6kcgrvqainc1z88amsl8lnym06kw3lx";
+"ecltree-1.1a"="iphdmz9nnnmyvwvvq5hflvbi0xf50wxd";
+"ecltree.doc-1.1a"="qkdycpbl0616mn6495300qcc50a6w05a";
+"edfnotes-0.6b"="dlhivqz4bniprmv8900wh88piiv58cxw";
+"edfnotes.doc-0.6b"="kfkm4q1zf83gipgzb00r4d5fghy9zq2s";
+"edfnotes.source-0.6b"="n5dyvim1rvv5dmnpl8jsmc1r43nll8vp";
+"ednotes-1.3a"="dmv7mq84rw9y8fcvnyj4jspb3qn74h2y";
+"ednotes.doc-1.3a"="bivfyfj5g56m38z4b8wnzd34q2ks4lxg";
+"ncctools-3.5.2"="s9iz6jy94nk73zcc039rrnn70ccwzsf4";
+"ncctools.doc-3.5.2"="4hpj1hh04yi7a5p8ycylk388fxwzgl5c";
+"ncctools.source-3.5.2"="1m07iwm83lq29g9g65kavwvz31csbbdh";
+"eledform-1.1a"="34050azcglr1nl4ppvq8f01dffc3hlpm";
+"eledform.doc-1.1a"="qdp4sms5cf7wzi1kdm49fgifs3845whs";
+"eledform.source-1.1a"="53dda59p3czslircl0a23d1dqfh2r45k";
+"eledmac-1.24.12"="327rpi6mzwx3h2nln4zra3pnyfnmg92a";
+"eledmac.doc-1.24.12"="3hygl6qp9sf8gnn02p78bny40bnnmgc5";
+"eledmac.source-1.24.12"="kiqy5wz8qyzxxszhf6k37ricjh13asca";
+"expex-5.1b"="xl0jyizia4cwch1z399dl0r5xz4anxgy";
+"expex.doc-5.1b"="a903i8yj7kqr49jf3f40rrf74j4bn1cb";
+"gb4e-2018"="bzbpagrikdh6z5pbs416l090s559v7i5";
+"gb4e.doc-2018"="72mcbwb79gj584p24lpxbvvqj3pbr77x";
+"gmverse-0.73"="9cx4zlykh23lwblr7q2hbd8d5dffvw8q";
+"gmverse.doc-0.73"="zbq9drljrrh0ms8k5z7ndldilzgd2l0w";
+"jura-4.3"="bparkzmzy3lj0ddqiaw3696msam3v0b4";
+"jura.doc-4.3"="hzgy1v1yl2yrnvi91j2hbs8jhd1x3djh";
+"jura.source-4.3"="0z6qb08mpblnl0jhjx8cmhk0vrciz0f8";
+"juraabbrev-2018"="mb4ikhwg3fjpdrsf8azzvy964gihs0ja";
+"juraabbrev.doc-2018"="i9w4ykaf8q152pc6zag4wykdlfvnkl0l";
+"juraabbrev.source-2018"="9ixz4m7y6cslk2977n0nh792nhqa6l6s";
+"juramisc-0.91"="w2nzviyg6498v4x8vqqp8kc9p2cr2fyb";
+"juramisc.doc-0.91"="0yczb9jcva6i9wvkdpwfd0l9c522krnc";
+"jurarsp-0.52"="bwldii418vmf3b37gnm56f65bzyjrfhj";
+"jurarsp.doc-0.52"="2rqnnrbk56p5i1bi7r9l5y9q8mbdmiip";
+"jurarsp.source-0.52"="0gwifinaym6yjkimyf2m3dg10pld0i4z";
+"ledmac-0.19.4"="kxh78l0ap8zr2rncqg5j4vl7h2f7ajb1";
+"ledmac.doc-0.19.4"="qqziv44yv5fzpk5dnfhjrzdfi4v63558";
+"ledmac.source-0.19.4"="z6n9h86q7yk9rfq87v6ks03b5kqw7cyg";
+"lexikon-1.0c"="ifdy5rb6ggar6w643y94y729bbn75h41";
+"lexikon.doc-1.0c"="52hidkd52nx6dz7ga1lipv6r9l3kcnnh";
+"lexref-1.1a"="4av5iad393sb2vqplzfra63wl1g3pwpd";
+"lexref.doc-1.1a"="3nzknrs8c80yxhw9hf0qpzgx3lpj4hsg";
+"ling-macros-2018"="166zs29qcy5bs1ml9bl5q4ydvx15yhlz";
+"ling-macros.doc-2018"="7b31g3wp6vks8b3h01pf2ifnqgr1r1rn";
+"linguex-4.3"="srm8cr4dr0s29ydpvwf2mhm5gplgv18q";
+"linguex.doc-4.3"="w7jgr0hkj6m368p6x2l3b37m9px04b4f";
+"liturg-1.0"="73vvqhnk6ll3ibzl2gk7znkfm57k0286";
+"liturg.doc-1.0"="r0i6252kbg724crlphqc9rii0xq45jzx";
+"liturg.source-1.0"="8q74i94hbnswf7iscpdm889w3wqvcbz6";
+"metrix-1.3"="9k344dp2nr280nwyk9h2pl5s0jncil9q";
+"metrix.doc-1.3"="y4v418yjxn4c1468i822ms96wlnp1m7c";
+"metrix.source-1.3"="bzri3z7xy4k63z4wsy5yri6cfc4m3hng";
+"parallel-2018"="d8gik6iva6h6l2imix4bxb5w9p8j87ka";
+"parallel.doc-2018"="n3dww00ms1a2m3v6fflm637hiazdrqrs";
+"parallel.source-2018"="vkx4q8liyqx0n70dpq6pqv515x1gbr7f";
+"parrun-2018"="3b2gnwqll6qf6x5f6gzh9ym1vsba6522";
+"parrun.doc-2018"="8v8338i5c6lcdgcdcwhfkb0d5brc3n2z";
+"parrun.source-2018"="2bvqjwsq7ngr7n11vnqnwhqzldrb73ri";
+"phonrule-1.3.2"="7gxkh4k5g2znwdrrdy394iw08khwnkvd";
+"phonrule.doc-1.3.2"="h353x4isnarn0bja89cb7104n4wda95l";
+"plari-2018"="nhdf38fv3h24zqq0bzwax05bfvrzmx5z";
+"plari.doc-2018"="i09il1b9f8cchmhc9pj6ndngyym5vd4w";
+"plari.source-2018"="5n2x3k1mf9palhxxlqpqkffd3ms3zrfz";
+"play-2018"="r6ryb6v6svlfv9i9j6r2a7ciks2k53bv";
+"play.doc-2018"="b5kjgd2gvgz5228m98l3lhaawmdfp40h";
+"play.source-2018"="jk04llsraw9d9gl5grvr019rjnkha1h3";
+"poemscol-2.97"="agr0bnzi24734dimffxavg5n1ds62w2z";
+"poemscol.doc-2.97"="6bns541wwmpv823kn9d5gnv7ziclgj59";
+"poemscol.source-2.97"="kia44i5a9yc5m7hf2v8aiw8kvkmwhvcw";
+"poetry-1.0"="ckm7xicsk5caj917wd5fvhxv7pjy9mpn";
+"poetry.doc-1.0"="7ywichrisj21yrc3h88wrxq1l8amjixr";
+"poetry.source-1.0"="g5aqwyc0r4f1qsnj4lzc2k559jh3knq9";
+"poetrytex-3.0.1"="a7a68naj2vngygl078qcy6qpyvgjqp87";
+"poetrytex.doc-3.0.1"="d7vp6y5vm8sw1vq3j723ksvivdk3v2a2";
+"poetrytex.source-3.0.1"="v4ynl1n0sgg2n5g0ya2ncm7k1fibfmgg";
+"qobitree-2018"="jxxsb3s665887m15a2v9q4ybdzc86x9k";
+"qobitree.doc-2018"="xi15qg62q42sgh4115gp2mcnv7nriwiz";
+"qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp";
+"qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg";
+"reledmac-2.26.12"="jbfys2bxcc5s2v3i8sb5q46k26gpz54c";
+"reledmac.doc-2.26.12"="r0zly9rr3bihsb2fbx5ym63yhp0chg5f";
+"reledmac.source-2.26.12"="r01jvzns9p7p5vw9w8rkkyws8b4ks43x";
+"rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5";
+"rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq";
+"rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y";
+"rtklage-2018"="j7v1rhi19ly8i5h2j306nvhnhp3wjx8p";
+"rtklage.doc-2018"="02dpc8m2pyxqmpvlls86k2gy0yp8gqyp";
+"screenplay-1.6"="c4jv8c3zrqqjp25nxv1wwp47jy26vdd0";
+"screenplay.doc-1.6"="7vlv28kmw3pag35r1p9q1mhvz005gwv8";
+"screenplay.source-1.6"="88zp5a7raa7ic4474yghk67jj31k3377";
+"screenplay-pkg-1.1"="567syh6jgvm16ch9hhlirgxav4k424ns";
+"screenplay-pkg.doc-1.1"="gvd3ma5bmmcpiq1jpi8081lcvk6zpfgi";
+"sides-2018"="4by0j8k8xj6baip7kdvjr5x3srvz4wbf";
+"sides.doc-2018"="7kcin18x8z42axnrmlqldkzqqbvsjzvl";
+"stage-1.00"="bi5p7sggcnkfmzmjj4535qbraan5yfdm";
+"stage.doc-1.00"="hwjzdlnzybkv0jvgbldansab25ixggnj";
+"textglos-1.0"="lfdr25rxphjmck47gv10zr6dwiwyczla";
+"textglos.doc-1.0"="k8945zjmlx6n8szzighhs4fa1z8zc340";
+"textglos.source-1.0"="mvxkgnsda7v23v765zh7mzg1fzcn0hdn";
+"thalie-0.9b"="f2022r23gjdy0pbl4xa72whzciclqwbr";
+"thalie.doc-0.9b"="74w8j84cfkv34jr3xw4lsc7z6vmwfdwm";
+"thalie.source-0.9b"="34xmqafgkjg0si9z84znva7nbhpygvgk";
+"theatre.doc-0.1"="lrajd4fl8ib6kabsjpxjr38pdb2gr83q";
+"tree-dvips-.91"="rh2g20j87hg69iym0in6b1jdg5icgina";
+"tree-dvips.doc-.91"="5lwva5wns5mwp1yq94pd31q165gianwp";
+"verse-2.4b"="ip7glx9gvf1c1ggjvkn1ip1vdxycn7wc";
+"verse.doc-2.4b"="vf7lvv27b351xxi81svdqb8hdzcyn9i1";
+"verse.source-2.4b"="9yx8ry4p1d0nvzwzh360xa8828mhgfwn";
+"xyling-1.1"="rxnynyg4j3xzzh27zb23q4qh3w2gy5r6";
+"xyling.doc-1.1"="k41kmgmzw7358f3nhq2ixbxafiq5kir4";
+"alkalami-1.000"="v7sl553x9mw57qsnh66rf7mba26h6m8x";
+"alkalami.doc-1.000"="kg4kz16hp3sylfwrprr4ilc2y4rzrji6";
+"amiri-0.110"="a48i1gmbvc9vmy4x6vpy0pkvrxihx5gf";
+"amiri.doc-0.110"="yxrvjg7rhrda3p6n0xy2wy1xlqzsmy82";
+"arabi-1.1"="rr1si2q0lih2l2qpascr4kyzy313zyba";
+"arabi.doc-1.1"="cpsn1fgrlivbwqb4n9qrpq3q69kdy3nj";
+"arabi-add-1.0"="djln5r1i53rqvih7wp016j8ga2wqc7dn";
+"arabi-add.doc-1.0"="vwbgh52x3yh6yxhfx6p7m0ljmsrmr4qz";
+"arabluatex-1.12"="nca1nnylhlbvrdnnpxpiz45rmbf8qma5";
+"arabluatex.doc-1.12"="zvghv04zwgrccn5b37y2al93hi3560ha";
+"arabluatex.source-1.12"="gdj4b1b6ya69p16n86ykpa2xbfn5b8wl";
+"arabtex-3.17"="fr7avfkwpdbx619kq7h1y31bx4nmkp5v";
+"arabtex.doc-3.17"="b5ng3w5g40m9c3x87nih862msx5nw292";
+"bidi-33.1"="mp8c46yvi4vp3zlz9f128ijhzphzdbwx";
+"bidi.doc-33.1"="l1rb0z09n1scdmy8mbf3wyry65ydr59i";
+"bidi.source-33.1"="zpgbkhj7vx5wqkpf0nk8xda0pch8n1ar";
+"bidihl-0.1c"="kwa5li9yi8wb452g12y2h0ar6lpqdmmr";
+"bidihl.doc-0.1c"="558l7z4b7giwqqzj5496r7nkzv1wrnqq";
+"dad-1.2"="ivwjd7fhzgk4kl0iwzs49jvhqsb44ysr";
+"dad.doc-1.2"="6sy939pdqxsz24lpfqvb5wx1914nc38h";
+"ghab-0.5"="xlrv9p05w3vm0vyzay9q16rzh1x8lk4a";
+"ghab.doc-0.5"="vhpydw0spag5nlqyr36iy2v70db2hmpx";
+"imsproc-0.1"="ylf3kd1bc5rafzfyil4y7wxp6vd9nsm3";
+"imsproc.doc-0.1"="3kv8qk7pnfg2w7xm3lqcimi8vhx8jwf8";
+"kurdishlipsum-1.1"="8frakqhm5sfw4f9j514zh63la69nwnnr";
+"kurdishlipsum.doc-1.1"="1spiraw1mpli2hyyxdh43r72dkr0446a";
+"lshort-persian.doc-5.01"="hba2q0ni1c873gpg2qp835csinw78yi8";
+"luabidi-0.2"="8af0f67k7hj72wsfrxxdxzl1p39byasy";
+"luabidi.doc-0.2"="9fdkj79aasj5vskrqqnr7c9zdy8vb8c7";
+"na-box-1.0"="vfrchq5jqb5s18zgngk2qsb0svmnc7p9";
+"na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9";
+"persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm";
+"persian-bib.doc-0.9"="q8vjf93qjdkm6qz099464mwdl4w4gjqi";
+"sexam-1"="jlh6d5mzxqbnkn6yy963fnhc6rmggigl";
+"sexam.doc-1"="532l18ix2czx5r80ar4g7mqgdij4r5xx";
+"simurgh-0.01b"="n8bv87n12x5xv3h41487vyqpbigv3qkc";
+"simurgh.doc-0.01b"="z3qq4jx25qyxqmnfbpsdsayi59fkaff6";
+"tram-0.2"="7wcas9syxfvm8pc7wnp817zd9y4q941l";
+"tram.doc-0.2"="ppbq1g4k1swjv7y9qkqhcr0m25knssk5";
+"xepersian-21.3"="j72ki69m173yrqgvazl5h07zi4p2rxwx";
+"xepersian.doc-21.3"="rrh0j2askmbvawrg2ng7m7psh12vfglb";
+"xepersian.source-21.3"="cpviln7alvg501m018q3wgh17xbmbgrh";
+"arphic-2018"="zfax00567h7mdlfkpxihy379cwqmy8ng";
+"arphic.doc-2018"="55lcjk7s78qa39dqd0wj0za5f6hcnkxd";
+"arphic-ttf-2018"="s5kckgwzz84bm3px9cmnw2zgvmaq27yh";
+"arphic-ttf.doc-2018"="s7y95hay8ygbb1viv250vkzf0wbm9s3b";
+"asymptote-by-example-zh-cn.doc-2018"="czm77scbklkpdjgk93w1g8ilchpx3vpr";
+"asymptote-faq-zh-cn.doc-2018"="yzyywm1hv1hs9ngddhdgk7frrpnrbsr8";
+"asymptote-manual-zh-cn.doc-2018"="86bz3am5w7xx9si2a09s432xh882ix9a";
+"cns-4.2.0"="3m0fbs91x53iiqvzl0hs68cks7y3m3q7";
+"cns.doc-4.2.0"="1ddyimvshda2zf3mcs6rk1n4py2aglfq";
+"adobemapping-2018"="kw8bf62lvavy1pzn6acvlz0dsd17dwc8";
+"c90-2018"="jfyd605szid7j3a757fihxhlvaqvprdd";
+"c90.doc-2018"="1v14l7vqrdbc6nhg2k2gshq7p7cqzyk7";
+"c90.source-2018"="l4kfmrrqbnq3y6xbs0izdccvikpsw314";
+"cjk-4.8.4"="zdw3lfngj5zg5d118xjndaj5gg7r0wy2";
+"cjk.doc-4.8.4"="rlwcxn7lnyxc28v9gjscp3p7p9mgzwhs";
+"cjk.source-4.8.4"="i9g2nbr71gnvx71a55aj07qrgw67vhs8";
+"garuda-c90-2018"="d9m07vl6glf3zjb44whqb3flsirwwcx1";
+"garuda-c90.source-2018"="rjy95hqlvbds6pn29r26kh8sshxnd21a";
+"fonts-tlwg-0.6.5"="bry0ji16xvs40qasn2kcmzds6ri87fhw";
+"fonts-tlwg.doc-0.6.5"="xc4wi0yfws579n2z42wssk8cg7m0ildc";
+"fonts-tlwg.source-0.6.5"="v7diz715n0gimx354ng8jyplv4fd1x6b";
+"norasi-c90-2018"="d0972qmh7nk9isx54d46f7jscg6mwcrz";
+"norasi-c90.source-2018"="f0z1ppqy8szazpnwmg2ml8cgasdf5ivs";
+"uhc-2018"="viphfgiqfb1w9kb8103znmzy09n6i45n";
+"uhc.doc-2018"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z";
+"wadalab-2018"="cpc689ywzaqil8xz78nkzwx30qmqixh5";
+"wadalab.doc-2018"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j";
+"cjk-gs-integrate-20180306.0"="mamw4jg0sdidhk82gbnkg9j2grgc7pxm";
+"cjk-gs-integrate.doc-20180306.0"="8hlvy8qra0lhwqcwda3zbza0a7i5dxy1";
+"cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss";
+"cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9";
+"cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k";
+"cjkutils-4.8.4"="8w069zvnnpkr2qcmsqxh6p64db57b82g";
+"cjkutils.doc-4.8.4"="1kzwqhngn88vk4gnh8c7nn8v9mp7cfai";
+"dnp-2018"="jf1zsbg60d074ksrz0xk9ihybbabda1f";
+"fixjfm-0.8"="r24s5c53wvxaacm4fmnmp10nl8096nlf";
+"fixjfm.doc-0.8"="inhixa1d1hr6s2473qp0hfchvcn84y45";
+"jfmutil-1.1.1"="w3gybz8cr3bg1sirplkf5yw2pidm6d88";
+"jfmutil.doc-1.1.1"="8sma5crx9mpkf1wcx37nvkj433zl3vav";
+"pxtatescale-0.4"="psd9rlxh4i4rqxgii61r2s43sqy3kibx";
+"pxtatescale.doc-0.4"="bfd49446kr82v3h06mq5hsm1ji2jwzck";
+"xcjk2uni-0.7"="d0h2b2l69qfb6xvg179pnzj3lcwzxpn6";
+"xcjk2uni.doc-0.7"="q90l5vhln5gcj0jzypm4ymn059flxa80";
+"xcjk2uni.source-0.7"="skj3gwb9fy81pcgbfhjlgr1vfdrr61i0";
+"zxjafont-0.4"="5ycdha9qzav4vvdy6jqkdvyqq8wpcija";
+"zxjafont.doc-0.4"="qvn5dllha3faq0vy5lgb52ydzi261n3i";
+"ctex-2.4.14"="0f4ak682lx1a02ppjb0z7bqanp706rp0";
+"ctex.doc-2.4.14"="2xni7gnajm5sbsm5qgwyydyll5075ak9";
+"ctex.source-2.4.14"="gz3cipz11dnlxikvi4iwa5ql8l1y30ay";
+"ctex-faq.doc-2018"="vjxcdrg7i6p9fgrgzfvykibjghpigrz3";
+"fandol-0.3"="lxnjp8m4fcj3pv2hnhib6gjdh90q1ncz";
+"fandol.doc-0.3"="fm0ac37apm0dh1073lp1frja9xbsrv4l";
+"fduthesis-0.7b"="p3k5gj6a0vby14z0jf88ni27icbdhm3y";
+"fduthesis.doc-0.7b"="dmyplx168bgkvqyjny1fc0fsxwpqpzjq";
+"fduthesis.source-0.7b"="9v8wjy3c0g3s4gpfpp2875ng091ir712";
+"hyphen-chinese-2018"="bb5vy7sg5vdimz5zy225syns093jv15g";
+"impatient-cn.doc-2018"="8k1gcnqs5gghbarikj17ykh4vgahpqbw";
+"latex-notes-zh-cn.doc-1.20"="qx777fwi8k06qvknnll3crc1j0yvraxs";
+"lshort-chinese.doc-5.11"="8iavbjpgy14jzdgw3011wmpbrwj62fmk";
+"pgfornament-han-2018"="b3ldakf2h3zz0npmqizqdh65pimricxv";
+"pgfornament-han.doc-2018"="w1cs02w8z3y9qiznsaw2yy9fx7r7ybvm";
+"texlive-zh-cn.doc-2018"="gm01ik0699sbsjg39xgx6w82n7d79srl";
+"texproposal.doc-1.4"="8fnrxmyg4wd11kmdh4jw8l1313h0sgqr";
+"upzhkinsoku-0.5"="0yhh0ab2sq4fszra362z9m2md8ycydvk";
+"upzhkinsoku.doc-0.5"="1ijm19cqsdsm9q6a7rknl0zsfa13g28g";
+"xpinyin-2.6"="d89l7kjql87z4xik19vj2fxix10blz7a";
+"xpinyin.doc-2.6"="yp7xa1d219p87y94ncgai4m71jfaq41i";
+"xpinyin.source-2.6"="b3p4viab0px4wjnjc1llf799vk43afx0";
+"xtuthesis-1.0"="0lmkzfvp34aiixjir2l8qs9nfpbjb3gn";
+"xtuthesis.doc-1.0"="vvqmvgjjinj3pm8r3kp48bbxs8kzgs31";
+"zhlipsum-1.1.0"="z66508fcrrfg2djydyyrp3sjwjc5hdlp";
+"zhlipsum.doc-1.1.0"="399r96xqy0588h2658l42vjpdxp33qb1";
+"zhlipsum.source-1.1.0"="1cry8v4zfnw62qx4hw1vx8zvapdblfy6";
+"zhmetrics-r206"="2li2anrf74242blfd59cxfyn13iwmfxs";
+"zhmetrics.doc-r206"="njh801caaxkfyw5nsfv3q36gkcql14pj";
+"zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm";
+"zhmetrics-uptex-1.0"="d3r2n6ndjd8zsmlq4hgm1x3gvyvrfnc1";
+"zhmetrics-uptex.doc-1.0"="qqzvr4mf5fg5r8bg6j87yk94nznhrscl";
+"zhnumber-2.6"="hcv0gs0yx1dmbr9qr278b3vpl7sbda2a";
+"zhnumber.doc-2.6"="7j7hf9vbsf56iamv3csf0x664x5s0cya";
+"zhnumber.source-2.6"="f8hdc8nv71dqv73h7z5lif9shjpizi6q";
+"zhspacing-2018"="p7w7cisgid16ndk1mipdmpn5v7nc1kzf";
+"zhspacing.doc-2018"="kjnyalnxmb2f0kj8w52nvm97a9m1dfsa";
+"babel-belarusian-1.4"="zr7ykr7l7c5s66w34ddv61d2yxh84lr3";
+"babel-belarusian.doc-1.4"="pv2dffvz9zli5c22x07a41mz87lk77b2";
+"babel-belarusian.source-1.4"="xmic60qycam0qij5a5g9fh2bkikg095v";
+"babel-bulgarian-1.2g"="4c5cdn8lijfw1qhkfz69pvlvl2hcg5hz";
+"babel-bulgarian.doc-1.2g"="pyikwcg47yj8nh416g6wdzwk7a7f460p";
+"babel-bulgarian.source-1.2g"="km3vz4iykb1pckz9bgllgd6xxc77k2c9";
+"babel-russian-1.3j"="chw7lj98rp10jkin4l03d1gx12a8ki5h";
+"babel-russian.doc-1.3j"="i56cj5h3h40ml8an2sbbj8dzyazacwd9";
+"babel-russian.source-1.3j"="cnwygpq3mb5y2araady6kr86wl2bbgdn";
+"babel-serbian-1.0d"="8acj740xh1syd4ch9jpfkpx3sclddqw4";
+"babel-serbian.doc-1.0d"="5jh97wmn4nhjbwaxdbrazk4dxsddx9q2";
+"babel-serbian.source-1.0d"="fcwf73qgjrdrc2vhzkhiaf7kj19n72vf";
+"babel-serbianc-2.2"="prhig05xnqc5hqqm3hf0bjhv2qzj02yw";
+"babel-serbianc.doc-2.2"="w6d72ix2a6gk6zcxbrx5nm9rin7b6i20";
+"babel-serbianc.source-2.2"="lp9zcsmpqk0l5ai17wy4cwbivyq2703w";
+"babel-ukrainian-1.4c"="zkrzqv0a32c8dm30bin1axbkd1i7fxlm";
+"babel-ukrainian.doc-1.4c"="vj7acrkzm3cdby2aczcancag1y6swvl0";
+"babel-ukrainian.source-1.4c"="yh5qaricqrn5lmvrz9vdycbr5y2lpmr2";
+"churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp";
+"churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw";
+"etoolbox-2.5f"="8mjnm9fwd455qa69548mmnpapa2qaark";
+"etoolbox.doc-2.5f"="65lmva7ri6bn37p4wr8q12c21wl6kz1y";
+"hyphen-churchslavonic-2018"="dbbg7zzqhy49qgvklp1kakaq1w7grpff";
+"xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg";
+"xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6";
+"xcolor.source-2.12"="zgpsq8x4n6m23a9d1m5m06davpxv76id";
+"cmcyr-2018"="ba4hsn5a22k73rhiaip6dv560wk5sxv1";
+"cmcyr.doc-2018"="1j63xbl85z8izha2jl2klagny3hk5wf3";
+"cyrplain-2018"="dh1vcz2wdwddkjdqihpc2rlsqjzm4cmm";
+"disser-1.5.0"="m0gldqzdx2idh4ivy43jd13fgmgcsr94";
+"disser.doc-1.5.0"="6s5g533qr53rg2ha6a7p7xr4phcn11iy";
+"disser.source-1.5.0"="h4f1z0azxfnbv1cba1f8z5wfy25hfvg0";
+"eskd-2018"="63ack7kfjg5gf6xv76yfla2z0k9cxzv7";
+"eskd.doc-2018"="g3wsmrvwfz2lm30w2fys9md9nqv5k8jq";
+"eskd.source-2018"="q70i7jl8dkf9vakj558fgwqfbn8230q0";
+"eskdx-0.98"="b2dx9jv2rg97hmlf3gx4h4l3ci16chr2";
+"eskdx.doc-0.98"="l1r5bapnlsz61yasg9gyrzp6za8iw0nf";
+"gost-1.2i"="i4ymhad9kyybwc4072yhc204pr9hfw3p";
+"gost.doc-1.2i"="vwsvpn0p9d4888107r2qj7rghl3l50xg";
+"gost.source-1.2i"="fawqr3q9mk5ki6qgqzv3xa4kz5ak2srq";
+"hyphen-belarusian-2018"="rzsbxs89fqwqp7dsqpmqw13lj0bl3bd4";
+"hyphen-bulgarian-2018"="3ihvwydq1wpkmkcscsw8kcfpd2s5wnkm";
+"hyphen-bulgarian.doc-2018"="73rgmlh3pbp2b534ln4avz8knspyjzhs";
+"hyphen-mongolian-2018"="x0q9kl6x25slrxdmm64b2j8ah7k83krm";
+"hyphen-russian-2018"="36r2dwl04v8yv5lci4gasyr2ylw9x6fa";
+"ruhyphen-1.6"="3d6lyf95cgi2yc8lsy9dz6z5vmvcx1l9";
+"ruhyphen.source-1.6"="i6x3fiidyvl2zkly1p4s7qzgzzza1in7";
+"hyphen-serbian-1.0a"="8mn7gqfqnbhpsszhg3048qrf2ar1vkch";
+"hyphen-ukrainian-2018"="fsqvhakdhhcnwz2ld469n9g38iw4nad5";
+"ukrhyph-2018"="l60kvxf1mii3imnl0swqskcrz0bizb5v";
+"ukrhyph.doc-2018"="4mycq4cykkinm5h946xmrng59jghvbp4";
+"lcyw-1.1"="0bxzb7w4z0w04b9c1cvak8i2cp3f4h74";
+"lcyw.doc-1.1"="5kk74h4902f2zjlid26h1rg3fvw0sq9z";
+"lcyw.source-1.1"="3jq3gmm85lr494mm8j61z7shr3c11jg5";
+"lh-3.5g"="h0kq2pb7iay15i1b3sjx3q2yk63pycp7";
+"lh.doc-3.5g"="xzbkgxqjzbr2cx6q5xqqzgynk25jvkvh";
+"lh.source-3.5g"="mh8zzabsf553ml0al618ycym6igh9qyg";
+"lhcyr-2018"="3nj4zxpcahn2ryz47v7nh4k05j1lv6di";
+"lhcyr.source-2018"="kvid1h3vgbzmpn65sdjs0b8dspm5xvyh";
+"lshort-bulgarian.doc-2018"="r2yc6zzq44wddndp762a3hg78ihv013l";
+"lshort-mongol.doc-4.26"="5pj0i8wxlyd35sd3z7npwypicklc0nl3";
+"lshort-russian.doc-2018"="d2sgyyi8aic1j35fqrniim2bcpgk4q0a";
+"lshort-ukr.doc-4.00"="4g85cmgwa4y64rbc51zdw42m2f3m55ps";
+"mongolian-babel-1.2"="2bjw94a6r5wyn2i5gsclrn5fadh60jfg";
+"mongolian-babel.doc-1.2"="darkanaxxhcx7r7nd4mph37m3r29y7gl";
+"mongolian-babel.source-1.2"="cfdxndayfrj10xn000ckxhiaa1qdvypd";
+"montex-IVu.04.092"="ig3y6y6vksci0567g91hkgf8pkn5x56v";
+"montex.doc-IVu.04.092"="phm1049anhqvppklp4cwczfadjmakda3";
+"cbfonts-2018"="bzgl9s6zv9fqpg5m9gicxmpscw7m3z1d";
+"cbfonts.doc-2018"="6cj35wgyk4ss36wc0szhfyqcj3diyd50";
+"cbfonts-fd-1.2"="mybny72ksiflq3lq2y23059lzxidwz70";
+"cbfonts-fd.doc-1.2"="rsxf6gy62snszkcpdzry9gy44falx6ml";
+"cbfonts-fd.source-1.2"="73f27d7a4c2frvvhp1r2z4ia84qrh1cw";
+"mpman-ru.doc-1.004"="6l3vqm4sxcvb5nxy582g2nbr9mwvz1dz";
+"numnameru-2018"="c3fn4n2asbh2lqrn9y44g6yxad9f7469";
+"numnameru.doc-2018"="ibrlw13zibhvhr8mipw7hs2ik1f96z73";
+"pst-eucl-translation-bg.doc-1.3.2"="cqxppyh4546ybhnlk1z4fjkdyw9ij5x7";
+"russ-2018"="981kkq2xmx0r6k095308270hjvmdsm3h";
+"russ.doc-2018"="878fl0cyka7jj5cvdvq19fvlfic3izi9";
+"serbian-apostrophe-2018"="q4n9k2fn70hxcf9chy6a5jw07pq2cllp";
+"serbian-apostrophe.doc-2018"="0yxbbv3xz0jf63g0kvq5dbdv2myc4rks";
+"serbian-date-lat-2018"="3s5yc0xcg6fsaisn7aq0nv16fj69wmws";
+"serbian-date-lat.doc-2018"="pa9rvzpbczmfm4w0977xx05c5sbl6mxg";
+"serbian-def-cyr-2018"="k46ahhqbdg23mx4ld0953dnsws1imhwm";
+"serbian-def-cyr.doc-2018"="zl8x855zmhry6n754l5x9fz8hjn27bls";
+"serbian-lig-2018"="63mjkszwsr22mki4cd6qcskdkk1bg3fq";
+"serbian-lig.doc-2018"="q07af05smgmj1k3a4mba75brqrxxhx3i";
+"t2-2018"="ihwn58py69fx1fx2bjqwyg8caiwwlpy6";
+"t2.doc-2018"="gsqrf898i59wsxcm8b06qfrasfw335r4";
+"texlive-ru.doc-2018"="3jwr83k139bsbhqdmwxl3pv1n30y4lli";
+"texlive-sr.doc-2018"="r7mj30njj30ymq22hhwmdvz145qbkz25";
+"babel-czech-3.1a"="gdcs2xpcgblb3v0m6jf3ppx643s3cj6r";
+"babel-czech.doc-3.1a"="g2km6r7d90d3f60mfhw4a7m9s0090sg5";
+"babel-czech.source-3.1a"="5s1n9fykrbzppgb36pvybjn9jmj7cxxf";
+"babel-slovak-3.1a"="cl43hp1pnxc1gp4ndrqwv1cv3fh0h47c";
+"babel-slovak.doc-3.1a"="igrg8syk1kd3mq4sm4jrdgsmsr1y9jb1";
+"babel-slovak.source-3.1a"="gvlkvq0zmhdf57a6vpfxlvmvz7ma48af";
+"cnbwp-2018"="whwdam81dc6g8pq664mrmnbxz4f0iwdj";
+"cnbwp.doc-2018"="qv1fxhmq1pig9rq3swhvwlwpm4lmwrjy";
+"cs-2018"="ks76xw08rrkrcxg7rv72w18glx2vncfk";
+"csbulletin-1.1"="m9d1x0828b0bkkwwz7pp7vncj5mjc9zy";
+"csbulletin.doc-1.1"="pf2nrqiwk3jag8gyn429f1d867xg2v9d";
+"cslatex-2018"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh";
+"cslatex.doc-2018"="xn40wcrp11ni73wbbzslyndahrxf2d0y";
+"cslatex.source-2018"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq";
+"csplain-2018"="cl8kv51sny15ajqv5s5956rpm396y4vc";
+"luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1";
+"luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw";
+"luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8";
+"cstex.doc-2018"="nsrj5l85ssj18x5wjd1i8pwvakmj1fnr";
+"hyphen-czech-2018"="hgqj7s2x8307ap6bbw0i7nmw95w84i8k";
+"hyphen-slovak-2018"="4v3xn4ap1yhfgrvlh9ypmdwvj7yii077";
+"lshort-czech.doc-4.27"="2z8dygvm9ilvahsx005zb7z5ss8hxbsf";
+"lshort-slovak.doc-2018"="qnj433q5hfg9cpy0z281zq17z7dr5vh9";
+"texlive-cz.doc-2018"="9dvz2cz8nxgvyjbk7lscbashm0jjwlmd";
+"vlna.doc-2018"="lzjr26l3kssjshgxhbvj2fifai8n97md";
+"FAQ-en.doc-3.28"="vvzrv99q1hxcck399g2n96qfl1dc0fln";
+"MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn";
+"Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl";
+"amscls-doc.doc-2018"="4hsr68pmd3v06fnxiynmp4xpgik6v8g2";
+"amslatex-primer.doc-2.3"="9d9pxr0jbjm6zwqd51f7m2bzysdq5gv7";
+"around-the-bend.doc-2018"="a6jilpw0nw27vlj1shnhxfv92yn86ys2";
+"ascii-chart.doc-2018"="9x2srgi2sjd6zjjz27p6hs1w9sj73bcx";
+"biblatex-cheatsheet.doc-2018"="vcmb6x1w0cfgvyx0hl8fsv1nh2ffhg6g";
+"components-of-TeX.doc-2018"="7sc5ryfj785jifvw9b44yni2ifmssr7f";
+"comprehensive.doc-12.3"="bn5nyhw62ks4zrhg2gk6m05v1s051921";
+"dickimaw.doc-2018"="jqva0skw6ivc4ikc8m7awd7pgfaxgci7";
+"docsurvey.doc-2018"="y290y19159hjbi81r63d6qzxzd8va25z";
+"dtxtut.doc-2.1"="108k3lyvja5wmg8gxyvqskbz8wwh0cyw";
+"first-latex-doc.doc-2018"="8vcday36pq5hlr075kjk6hb82ypazjd9";
+"forest-quickstart.doc-2018"="gyacc77yw1l6kksi62y5plxsvkqbf6yv";
+"gentle.doc-2018"="mpxhsl7g4za410b65awmbb5zlc58h24n";
+"guide-to-latex.doc-2018"="8lw0kcinfq2yd6vkbd531zakby60k2wf";
+"happy4th.doc-20120102"="svmy37c032cvip73n4b98c8kh4hvnh9g";
+"hyphen-english-2018"="4vjl8scc743bbjbjzhprgpmxnz58ph29";
+"impatient.doc-2018"="172g4hvk6d4z4013h44nr5may3a51gb4";
+"intro-scientific.doc-5th_edition"="qx170vpq4ahipljnmhkvbrxv1xdbbii6";
+"knuth.doc-2018"="2w5hzwaxcl1i2pp3ms0kshmza0p5nqi6";
+"knuth.source-2018"="6dr6qqw0ih676vxc0rj6qgjc0zpac89p";
+"l2tabu-english.doc-1.8.5.7"="j7m684bvmpv1jaa6s856dj9aknrwlqiq";
+"latex-brochure.doc-2018"="azp69yf9xkksqan9n096wabgxlk9hgsn";
+"latex-course.doc-2"="km59hhadaad0hlpa07rqmx91036h123r";
+"latex-doc-ptr.doc-2018"="1dsc8ym34nlj315aln3npfibx37n9c3z";
+"latex-graphics-companion.doc-2018"="70mixdsyyx6jf6dc46qp5kgyx9qwkma2";
+"latex-refsheet.doc-1.2"="9gvmiiqg78xn8348cymz3wfzi45mf8xz";
+"latex-veryshortguide.doc-2018"="mil8qpv4ka19wym6cqz3r5np3n7nzw5r";
+"latex-web-companion.doc-2018"="wzj6qw8bhwr82ipsph640ya62mpj6k3r";
+"latex2e-help-texinfo.doc-2018"="69xcvykwh4l2c8s5lvn126zpn5n3mr6j";
+"latex4wp.doc-1.0.10"="bxffry3cy7vkcjhdm5yzn4hipma74jdp";
+"latexcheat.doc-1.13"="iav6gzdcadndwli0jar6d7i1711ssq41";
+"latexcourse-rug.doc-1.1"="fxz46xn5hazqy707qrf2mkgk121m6ywv";
+"latexfileinfo-pkgs-0.22"="1hjiwxdk07hl42nyb14azh2w8jyyljil";
+"latexfileinfo-pkgs.doc-0.22"="4y6qxvdwzifa0xj1r2xrp2g5xi7q2ssr";
+"latexfileinfo-pkgs.source-0.22"="b7h771sg8f6c8fq8j7vjbq0yhsp836a5";
+"lshort-english.doc-6.2"="v03zj1nwy584c6idp2d42n9mm7prnqz2";
+"macros2e-0.4a"="5kjjl3wkq04kshrlrrz4qqb4m61mz4lf";
+"macros2e.doc-0.4a"="9rgjs3scm8wavsbgljxy7rpgdwy3nsl7";
+"math-e.doc-2018"="jl3c0l594dii8wjylbc9nmaw6bqkmxvy";
+"math-into-latex-4.doc-2018"="0k2w8mjvn4h6jplrks9mxj6m1bnfmlz0";
+"maths-symbols.doc-3.4"="xi1pjz6rhyw79b10fpdfaa8vc5sf1wlf";
+"memdesign.doc-2018"="wiphi37w652d45ikn5kgd1qzh358rj3r";
+"metafont-beginners.doc-2018"="7ql41977dp698l2fjlq2xyf221y6xn2f";
+"metapost-examples.doc-2018"="ljbvw9v7xilmkzmifm1vx18dfvqlw6k6";
+"patgen2-tutorial.doc-2018"="3wv4sk7yw0mpy0rsd1j04m8mqsbi465n";
+"pictexsum.doc-2018"="mcxxxznqh0a94sip9vpdbjv5nv83j66s";
+"plain-doc.doc-2018"="5bqxdfbl4fvgvw42033vg9w3kjn7pn49";
+"presentations-en.doc-2018"="b2j47x2qg2rhn4d5pv7413fca2jd7fb9";
+"short-math-guide.doc-2.0"="34mdd47c63946iz86c2r0g2jx11q4mhc";
+"simplified-latex.doc-2018"="mmxjkyv4x0am911mkxmjs1l5ql5z19h9";
+"svg-inkscape.doc-2018"="l8vizn8al3rzgxxamdfqm6hsrh46xm8m";
+"tabulars-e.doc-1.0"="3vrlw3x3h5k0awnns1q06bwzl3ff6mpw";
+"tamethebeast.doc-1.4"="14cs89g2l3bn3xhfrhrw9pfdf65c2xcy";
+"tds.doc-1.1"="fmmdgblpf26x9ajn16g024sn5sbwwy0s";
+"tex-font-errors-cheatsheet.doc-0.1"="4a38bjpzdbj91msw8kaxmk3c6qahq1r5";
+"tex-overview.doc-0.2"="bj9pak1z31fwblcv5bj2imd4p33bi79s";
+"tex-refs.doc-0.4.8"="ad80b3r5rgj7n4m2hc5r6ccjczikff3v";
+"texbytopic.doc-2018"="vcr4rwfg8m85mrlsp0hg3ic0gmd0zcdw";
+"titlepages.doc-2018"="g0fvssp703yk3c2icdb8qgalxikm0xq9";
+"tlc2.doc-2018"="k8qb9ak5wx7k4c4j5g5i681di8cc8p5s";
+"undergradmath.doc-2018"="kp1xxp209mbvyhpmh62yp53c6q8ppnwk";
+"visualfaq.doc-2018"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m";
+"webguide.doc-2018"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8";
+"xetexref.doc-2018"="ng54q8km6dahcmh77lwwkz9qplw2d46l";
+"armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq";
+"armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz";
+"babel-albanian-1.0c"="1dasgklnjx05y74bk0pcwn1ivghswmvs";
+"babel-albanian.doc-1.0c"="vsgwp4d6skqm7v0i0d0bvb32zpylk7a9";
+"babel-albanian.source-1.0c"="yar9fs7vp71nsjmjp7hppgwpyd16w7xa";
+"babel-bosnian-1.1"="l6pdr8hm15swhzxx5ly2rd24jnscsyiz";
+"babel-bosnian.doc-1.1"="gahvgi7r3rs553pi00l1q33k3bz59pqa";
+"babel-bosnian.source-1.1"="idi2fhr3wfq31pz63d3fi0zkjm58gzxi";
+"babel-breton-1.0h"="xx0vkazacywgvv0p8yrngvxwk4pmmhi7";
+"babel-breton.doc-1.0h"="jq8477sjlkv398r3r4w0f1r5f35bq8x7";
+"babel-breton.source-1.0h"="pdrxwqva0cm48qpz6q7g6ajcy5kn6s1r";
+"babel-croatian-1.3l"="phasgq7qfxxhvcprkyc0r6wy68q4yls2";
+"babel-croatian.doc-1.3l"="csmz7g2gzm4nr5zmw3z1s9fwwk2r7fk7";
+"babel-croatian.source-1.3l"="2x239jcr4qky01xf2ddhf9pbj79s8xim";
+"babel-danish-1.3r"="j5ndb7h4jwgkk2ianlqy45sa8f59djd9";
+"babel-danish.doc-1.3r"="9y9h8n6g2rwi004chcm8frm60hv16afi";
+"babel-danish.source-1.3r"="slb1z6vbrhf23x471ivngv28mik8n3ir";
+"babel-dutch-3.8i"="5x891i0b2d78xsh61a96cshjncsshmki";
+"babel-dutch.doc-3.8i"="z93rpjg49q22ixnmvv8n4hy1nip4gv5w";
+"babel-dutch.source-3.8i"="3bwgdf7nzmwdrbfwglf6xm5bnf3nxqz2";
+"babel-estonian-1.1a"="pn52pj8gprmsqf7f7i97vllrkjjm2bbh";
+"babel-estonian.doc-1.1a"="nchqv4ahbhjrh6g49fj8xpjv1ghlqzn9";
+"babel-estonian.source-1.1a"="8d3nvwgv9bvhhxsgdicdlf3gsrscaxsi";
+"babel-finnish-1.3q"="j5w0s8qa0jnwgrw5z208bh3afalx7vzy";
+"babel-finnish.doc-1.3q"="3fajpl6c9jaxnm2bf7ccls1nqdhva2jg";
+"babel-finnish.source-1.3q"="gyss1ciz8xazmhfg67yz6z2s9g63p190";
+"babel-friulan-1.3"="xjbsgl2xyfqfrdyv83c6g5h2qnjzw7vf";
+"babel-friulan.doc-1.3"="m4n4fysx9qxf13c39jm4xq624y6jkagd";
+"babel-friulan.source-1.3"="yf6xqza856qdbxdysw08v707h0pcj7sq";
+"babel-hungarian-1.5c"="ziiivvv3n2allw091gzqkd35af46r5nl";
+"babel-hungarian.doc-1.5c"="czi272jfp95lckd97gkq46lrvz3r63wl";
+"babel-icelandic-1.2b"="bv8jkqsb9ikbk4g861n0hn00j7dh87kw";
+"babel-icelandic.doc-1.2b"="b2pxcd5sczr0a3a8ww2rjfyw3r1783jc";
+"babel-icelandic.source-1.2b"="37xz4jan0xjrz8aj2sci17x8m8h8f613";
+"babel-irish-1.0h"="1y1j2vrdl4piipf9p57028dkmd05y5rv";
+"babel-irish.doc-1.0h"="3kz3sk14j8kfrym9wlvqkgzvik1xjs4h";
+"babel-irish.source-1.0h"="s1g9x340z49y1kgi8b5b1jql1ri2ckby";
+"babel-kurmanji-1.1"="fj2i35f0i3s7gc1qz6jlx68ygnyd4jrk";
+"babel-kurmanji.doc-1.1"="0ys7iva1xqyk72bz0clk7c822wwxsrbj";
+"babel-kurmanji.source-1.1"="wlnp3c18xhb6n8272jq1pp30h6dfqsfz";
+"babel-latin-3.5"="6y97fgf0ivppj9aq77dd4cfgdgzz0gdw";
+"babel-latin.doc-3.5"="dm7bj4snbnf6vxajv9ayz5x7rp4dc6fl";
+"babel-latin.source-3.5"="8cbyxf31qxs6a0pa0xlc2hdxdqxmhlj5";
+"babel-latvian-2.0b"="7m0a5mr8mwxn3hm88ky0nrv88vzqrfsd";
+"babel-latvian.doc-2.0b"="b5zrhmss194cr40s38rmdh58l7y7zp9k";
+"babel-latvian.source-2.0b"="4k79lcf0rafnkk0qzz4qj15wg3hh46j1";
+"babel-macedonian-2018"="y443c0n5dygb6pf923kwj4fv8y991gg7";
+"babel-macedonian.doc-2018"="gk8d4ijhz5dhnlv9jdc6v48fm9zfcai6";
+"babel-macedonian.source-2018"="jfr605jrv1sywgpkhi05v6n6s96vfyq2";
+"babel-norsk-2.0i"="3a2xqwwyj2pv7ndgaxk11wvb7qanc9qk";
+"babel-norsk.doc-2.0i"="dhi39fgchh0ll1hl2si5qgygi2qsg8bj";
+"babel-norsk.source-2.0i"="qyx1rcxw0zghnc8wrh94yr9i5jkh142k";
+"babel-occitan-0.2"="yzlkm8lf34x1c1q6lvc5shf6fcazz678";
+"babel-occitan.doc-0.2"="ins60sfci09fssxs30mr4kj5c2pj8q02";
+"babel-occitan.source-0.2"="k2s35hvvw47kg5xmqvd63a590y6xhp7c";
+"babel-piedmontese-1.0"="5w9k0d2acxvdsz2p641y5hs96ck0y96w";
+"babel-piedmontese.doc-1.0"="77l935hchidfp11cxwa0zr9wbh3qmbz3";
+"babel-piedmontese.source-1.0"="8pmfjyqsrzxxwqh032dxgs1mdj6siwgj";
+"babel-romanian-1.2l"="76cg7sfsq7lg72c4lqfinv3gjpbwpvri";
+"babel-romanian.doc-1.2l"="5i46fii2472x7ka1xxng45s7n0rgl2s9";
+"babel-romanian.source-1.2l"="pm44w7529qaa4s9n7jyc33qwsfj6vwsb";
+"babel-romansh-2018"="2k6ik89i06j3l29bl8yp7dbm79qgzcb3";
+"babel-romansh.doc-2018"="risjnmxysc7r7va4f3mapz7kvxi01xc9";
+"babel-romansh.source-2018"="hnlwwjxzrv9fsanajh23pr8wirlp87gh";
+"babel-samin-1.0c"="2vg2wrjl0pllgbppkx4bcykcjil8driw";
+"babel-samin.doc-1.0c"="k69nnc0vsw2xhrkqilhqzqv9v4h5fy99";
+"babel-samin.source-1.0c"="p7ywdk038cryll8rr2sy8d8m4qb09k5l";
+"babel-scottish-1.0g"="r9zphrdcdd213xi2sw11mqa1l9hj86c2";
+"babel-scottish.doc-1.0g"="c97pnx5fq4yr02q4ddp7g15h0d5yw838";
+"babel-scottish.source-1.0g"="awb6gq1m0hcya2zfw9dwqddhvwkww1mv";
+"babel-slovenian-1.2i"="0617vvjda9wz2ii59qymfpdfkr6vqmg6";
+"babel-slovenian.doc-1.2i"="586n3l113jndybs2f83pby118m9xsm5g";
+"babel-slovenian.source-1.2i"="azszs37qw3q2rixbyjzs7qk8yq2005ph";
+"babel-swedish-2.3d"="06670d5rm2abf8j7pfm7n6qfapkqnx51";
+"babel-swedish.doc-2.3d"="qi68h0m500mm2lhd5gcns8wkdzwj4vz9";
+"babel-swedish.source-2.3d"="i268zav90a89qacmf2s2dlchag0qby4d";
+"babel-turkish-1.3b"="2bxzkr4ybbjxq47y5a6jnwd9pifh1jk5";
+"babel-turkish.doc-1.3b"="s2a0g0qylhnmlln8l78m49avx9f4g6hi";
+"babel-turkish.source-1.3b"="nz74yb3dky7sg5vss27hw3zb085lvdsj";
+"babel-welsh-1.1a"="dcjbzz80i41bpzb99wdhb84h60y5qg1r";
+"babel-welsh.doc-1.1a"="5p0mqvs4npnz3g6a08hqkf03n2w4pdc1";
+"babel-welsh.source-1.1a"="9fx2i5lxyf8qc0brlrgas2ajzf013m6j";
+"finbib-2018"="aja1ihjvva3aa86xi1f8d563xvlcj5mb";
+"gloss-occitan-0.1"="sha467dmibkfwwdnwrq5da744vfz3p5g";
+"gloss-occitan.doc-0.1"="8wfn7as272hvm7nxz0i5m48bf94b5m0z";
+"gloss-occitan.source-0.1"="qv9zd6r6rmjbfsndm7qgsz7x6xkr14ms";
+"hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x";
+"hrlatex.doc-0.23"="lrx3m4bg9wlqlrcd08mh90wal16fvilg";
+"hrlatex.source-0.23"="s5ajy6yi6nzivfwafk5ymav4j2dcgif4";
+"hulipsum-1.0"="8pqz5vilzli6in81d604dnkz9024i5s7";
+"hulipsum.doc-1.0"="3sqiw98n02kg8752hzv7vp1r5xysrw0m";
+"hulipsum.source-1.0"="dv9wyvy9cbkvjlc9awaz0mv4vaanz7jn";
+"hyphen-croatian-2018"="3ncl8rzkilf9v25d3knjpv05s23366rw";
+"hyphen-danish-2018"="cb0mgkx8v9zb9xpm23ys4cykdx81fm8y";
+"hyphen-dutch-1.1"="yad9a54d57s5fqaw203z8p587am163pg";
+"hyphen-estonian-2018"="kxvkppf091jzvq35f1694s8zwws8smy5";
+"hyphen-finnish-2018"="34sljx5z5frjbdmdjfk0gby66lrsk8d5";
+"hyphen-friulan-2018"="cqkjqpaajflmjxmbb010nf6b6qhx291d";
+"hyphen-hungarian-2018"="rjcm5vh5imrvhq5vm67ldrx4vpwfyj0c";
+"hyphen-hungarian.doc-2018"="a9fpid878wd5s3qadgxg8acv6jwl86ca";
+"hyphen-icelandic-2018"="p0nh6hmjsq8qz9bq2jr94aivygc74k3p";
+"hyphen-irish-2018"="8pgd00kg1280xb3nf238z95vjca579n1";
+"hyphen-kurmanji-2018"="s8x6afi0m4p7ypdd59bv48p5wdpc230i";
+"hyphen-latin-3.1"="fwx28jpj320ykvy0vwvhab6vk6068mlf";
+"hyphen-latvian-2018"="ysdrd68nsbqcahr1sxdaf5swlibi9zym";
+"hyphen-lithuanian-2018"="a466wij0mk9h82h6dkl4a048zwc8iwci";
+"hyphen-norwegian-2018"="5a71qrcnmaq9d9yk25p8i47cdz8kw830";
+"hyphen-occitan-2018"="rpqyqccljn7sfzkc1q8cil6ihc86d5qm";
+"hyphen-piedmontese-2018"="785rz1pgg937vbvry6l5a6m1ibvla7vf";
+"hyphen-romanian-2018"="5mby6h9g3rdbw6sw0nbrl5ig2kdjzjwg";
+"hyphen-romansh-2018"="m2d5ilq6nrn7v02xfm64y0p9a68fnnzx";
+"hyphen-slovenian-2018"="h7mqlrlpxrs7vcf357myvxdjj40xvja9";
+"hyphen-swedish-2018"="0lhl6pgggkp4hirzakbcpc167dv6klcd";
+"hyphen-turkish-2018"="q4p56y47qx2c7mjvkj945qgacblj13sr";
+"hyphen-turkish.source-2018"="4xv9azgkq91m4afsp9kvsq0f9ajxqfvl";
+"hyphen-uppersorbian-2018"="rr9kvhrf60s2rpq7478mbd751kwzl0w2";
+"hyphen-welsh-2018"="g3hsz81k297agiclv8ms1zb2hgkmlqcf";
+"lithuanian-2018"="p7vd2rv8md0a1gnyd9jj1ill09dfxmk1";
+"lithuanian.doc-2018"="x4nf13nhkbrn2cnn9gi06zavch8hjr4r";
+"lshort-dutch.doc-1.3"="rswbmzd9fkb0bwbc054pb0raa8zv2lfx";
+"lshort-estonian.doc-5.05"="2xqk5n14f2lizqdisir199mark4y5v2k";
+"lshort-finnish.doc-2018"="5jp8rkaw7qvrv8mpdnbmhg0m53566n8c";
+"lshort-slovenian.doc-4.20"="1w0g2p1l4p456wsx86ihdpadm8lhhcgn";
+"lshort-turkish.doc-4.20"="py0d16ij5gswbli1bgi4z63vajsahwjp";
+"nevelok-1.03"="v5hds3a09c91d79iac1qsyf0mr6lpaqg";
+"nevelok.doc-1.03"="biq2dbyv6mak992s0cqb834k119xfa0p";
+"nevelok.source-1.03"="5c03z6r25gidf0bncaanw1259n1hcdw0";
+"swebib-2018"="5z0719m62712flc3ylrnp5223gbsk98n";
+"swebib.doc-2018"="m23nfcdd5ddlgicd8hzlyfnr042y3bjp";
+"turkmen-0.2"="r8ryr694sxginv96wy2ibwg7mjwckmy0";
+"turkmen.doc-0.2"="ry7di8dm2nk9gbylnm58zrmlpilbch55";
+"turkmen.source-0.2"="jab2389x3cj6hhg0imkfbjcglclqap2s";
+"aeguill-2018"="2qlipazg1v8pj58aym9zwqqzfvprw29f";
+"aeguill.doc-2018"="q4gvvin01hkwmcc2llrkd61pr6dsmwp8";
+"apprends-latex.doc-4.02"="fy3lj0gsk1nkcfp2ssyfm26a7ih2ysf5";
+"babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa";
+"babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk";
+"babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33";
+"babel-french-3.5b"="vqr3dcwj5w2sxly9xrsgk084p85l454c";
+"babel-french.doc-3.5b"="cd96pvnfhdx63d70iryk1ac4crfbbk7a";
+"babel-french.source-3.5b"="w22gmsm3wa8hg47mycws3nq6sz9506lp";
+"basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj";
+"basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n";
+"basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f";
+"basque-date-1.05"="yj2akqid1c810hqjl3giy4yd6dmcz8jh";
+"basque-date.doc-1.05"="kg7m3skhba5kp2iwf6s687l9r0n4yq8k";
+"basque-date.source-1.05"="j1ad62kaxq7yf7bm1l4vgzzwjswhrxj2";
+"bib-fr-1.5"="d2v9lhayizx8carld94ica03ig34mjsi";
+"bib-fr.doc-1.5"="21c1p7mka1a4y2qc5b8wqj25h4il9pjs";
+"bibleref-french-2.3.1"="sif2z3qyf301ck27gbqmri7y1h936sln";
+"bibleref-french.doc-2.3.1"="jv8bwzyfclr5anv5hddfdfvk419vl4sr";
+"bibleref-french.source-2.3.1"="mlh3c7k4apc7qdwlh2ni27i5jb611f0n";
+"booktabs-fr.doc-1.00"="8nmky9zjr4s9s8kikir9l4w6y69yk1vr";
+"droit-fr-1.2"="kqd2m29if8y21y5l72z5k0f6dafm95sj";
+"droit-fr.doc-1.2"="ss2xw9f26frzv9m2xvwbmvgagdhabc69";
+"e-french-6.01"="w0gb3mb4i7yp73ammlwpd515q2hyxgni";
+"e-french.doc-6.01"="lvxzb7rnp45ylj2jk32qaccyg73xmza0";
+"epslatex-fr.doc-2018"="7kqdhx5drijbah1yl3vrwax3cnxg5zdk";
+"facture-1.2.2"="ys1fq6vkml8gnfc6bjkx2lkbdw2w0fsn";
+"facture.doc-1.2.2"="ij99my45fi9m1lcc79rj6kyxggmv4v3r";
+"facture.source-1.2.2"="aywgffiyigrwxv9lipf7a131mycjp839";
+"formation-latex-ul.doc-2016.11-3"="rs68mnwbwwgn4gs8z4w8cr3w04indrf4";
+"formation-latex-ul.source-2016.11-3"="lrk1fnmfi50ihqr6bi5s3896qf0gqvr0";
+"frletter-2018"="4vqb93fvw2jmyxv1f269f6icnk4wbwpl";
+"frletter.doc-2018"="pg2pg5gsjpp0iyzapm6k1m4p95fkbi4h";
+"hyphen-basque-2018"="cf8qx0sgavyb7y615yrxh5is1nzfd6lq";
+"hyphen-basque.source-2018"="vq3bxdrcsgdmiqfjxfcy9w5jihxf78qf";
+"hyphen-french-2018"="ilb1im99f9qr7nzgk4daw3zc262wr3q3";
+"impatient-fr.doc-2018"="sjzbiaxr5cvnqxn7bylr5zhrkq46l1v8";
+"impnattypo-1.4"="yi9xrsbs2crfwwjjgnxg0sybn8ygjr32";
+"impnattypo.doc-1.4"="cai1yyf5ipgjips10l1nsid8dz09kvg8";
+"impnattypo.source-1.4"="r7n5sihj35zm708k6cxs4xs71gz4msvn";
+"l2tabu-french.doc-2.3"="ncl8is1rmnk3n9ybrsav882w5qsb1w2k";
+"latex2e-help-texinfo-fr.doc-2018"="0n3q8gzd8xjhl92yyq2526sjsgl3jhid";
+"lshort-french.doc-5.01fr-0"="33vkjmz23zk2jrzyw99zri58jm0cpxax";
+"mafr-1.0"="vl6jgzlqqyn70cndvj91nnkmcxas15j8";
+"mafr.doc-1.0"="v44yahqn2gnnfbnf1ayqr96va6y49aij";
+"tabvar-1.7"="2advqwyg0ahn8xfid3639ivz56rpgkq4";
+"tabvar.doc-1.7"="7zcvqmdzaj9cg0nwyns5720g5jsvhr84";
+"tabvar.source-1.7"="wr3y7w9bb7zdjapiv3w3g1bxndrlirfr";
+"tdsfrmath-1.3"="5nz3qrfq13xyhabzww6092mb13014rhj";
+"tdsfrmath.doc-1.3"="8nnvlh3hw79z3k6c6vsvgnvkq814ldsv";
+"tdsfrmath.source-1.3"="3hfid9ih338p675pz6440f3ds5r3s646";
+"texlive-fr.doc-2018"="24v9rcrb35c421snyzbdg3cygfmya9wa";
+"translation-array-fr.doc-2018"="yia92yfpyrwv26vh12kks8arbsda05z4";
+"translation-dcolumn-fr.doc-2018"="acapy2zx06rsxwg810avmphyjjxca6gi";
+"translation-natbib-fr.doc-2018"="8yvcb3s928s5lldgy65idpfw23pb46z2";
+"translation-tabbing-fr.doc-2018"="64ix6i3bvaniiw7xj42bhqqmzv474lfy";
+"variations-0.3"="md5bnc4jaiva00gkdjyd63x67hyd09si";
+"variations.doc-0.3"="pxbpjpnsfz728czc4pjfy2nfr88dzmr8";
+"visualtikz.doc-0.65"="2rc26mlib7xnlpgc2l82ky4fcpyv7013";
+"apalike-german-2018"="hyclqnv85va4qmrr89zz8fhsfyqkqx3z";
+"apalike-german.doc-2018"="gqfzgv3kxzskvw0j6n23vsrs8b70vavv";
+"babel-german-2.10"="3dx5b1ph7chfvfb8hmf2cm1x102ab0mc";
+"babel-german.doc-2.10"="mf073dp8bgxffs36lr247h19hljklany";
+"babel-german.source-2.10"="hladbfwysp2bv4j92zk521b22dxla23i";
+"bibleref-german-1.0a"="wd8gzs1hrjyq9dmsjy6ss1qg0krlrzyd";
+"bibleref-german.doc-1.0a"="yc6vn69gsdsl3vxhg6klip8m6wkffyy0";
+"booktabs-de.doc-1.61803"="wcz4xqg22sijz3rczwk6nfnb0pk074ih";
+"csquotes-de.doc-1.01"="bksp4f2zywwkv5qw4njincxbpgcvz7dg";
+"dehyph-exptl-0.5"="hra8cm76i1iz138sghrapbfw04xcng64";
+"dehyph-exptl.doc-0.5"="451h6rzy02p5fy97ms90h8gbz6kzvh6w";
+"dhua-0.11"="4n8cvm61marrsbxd7308xw089j0q2wlj";
+"dhua.doc-0.11"="kisr6kymm9v5kk9nfxi0ckdf6k8mhr91";
+"dhua.source-0.11"="a9ap1rwrqqwh394c6hjqx5nlw070iwp6";
+"einfuehrung.doc-2018"="x668r5llhw28bqdr3k32yynf3720bdna";
+"einfuehrung2.doc-2018"="mwzp79i9w8ci8dxpnk4z4k6l9akj1qf8";
+"etdipa.doc-2.6"="cid5wjvbs4hl5lwczp1s1wbdwxfwr24n";
+"etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx";
+"fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py";
+"fifinddo-info.source-1.1b"="dpl4j9iigb7q8dqi5srykpkr1syvcnpm";
+"geometry-de.doc-1.1"="ncrm0zcrf2mmv3nynzydvd0vb4zbdv84";
+"german-2.5e"="mwin3zb743v74c97aizyiy86zj1pmdi2";
+"german.doc-2.5e"="invdh78rq8chiirzdlvijssdah8hsyk2";
+"german.source-2.5e"="zs1qxbd8r3bfyq77vaak9srxjxxn213v";
+"germbib-2018"="g11ayb7d5hj8s77kn9zvkvgfhdb0f4nf";
+"germbib.doc-2018"="vskc1hanqpmdm6p0v2np2slblpy8cf70";
+"germkorr-1.0"="szywjh1bj2jqc6zqs5d1y1dwxq9h8540";
+"germkorr.doc-1.0"="bycbcbfrqs1r8l939kdm9f6s395rc5fh";
+"hausarbeit-jura-1.5"="0pifqdiq22zs94z9ywfdirgljp11a2g8";
+"hausarbeit-jura.doc-1.5"="9vvkmp35qa1ygwj0isib5wsf12nnfs4f";
+"hausarbeit-jura.source-1.5"="zc6g0yd997syp0j8dlkbzkvk29syph7b";
+"hyphen-german-2018"="a3q43n1qk99h95kjajd34pkd1raccs4q";
+"koma-script-examples.doc-2018"="rzy2nsllyfdm00lrllk3k8i8yxgvppfk";
+"l2picfaq.doc-1.50"="35c7cwi94qazkf5351kj5hl58xil9nms";
+"l2tabu.doc-2.4"="4sab9w752r7xr6l9a6sxig4q0sdfvfxr";
+"latex-bib-ex.doc-2018"="51d5jw2dmp9rvy8bqxzw6clls5aqi189";
+"latex-bib2-ex.doc-2018"="rggjiidvpwxfd978rkmkwmg70w7amnpi";
+"latex-referenz.doc-2"="463iyb1dhx6kdsqqb4crgdh0xgmrckpp";
+"latex-tabellen.doc-2018"="9y8yqyrkv49pj1v58nmf5qyibyphnias";
+"latexcheat-de.doc-2018"="fjpnrnl8fkv5lnvhg6rmijic0k2yshrf";
+"lshort-german.doc-3.0c"="aplln16lhlxfrck1lgjgsrng7zbgpsqr";
+"lualatex-doc-de.doc-1.0"="9l7ac63knl5cd6lxmrbnmjj8s0nwp5bh";
+"microtype-de.doc-2.4"="22zsps3wqlz58x3x1i3wadbn5jp9mba7";
+"milog-1.0"="lz3w4rhsgbl699hh8431yw6a9si6y9yy";
+"milog.doc-1.0"="zf9qx558g8z5xl906x391c6hylz57x8x";
+"presentations.doc-2018"="rczfpy5ayw0h07xlqhw4k2isp080g2ar";
+"r_und_s-1.3i"="8vn7cjc42dvny30pkgp768yy87z9d2b8";
+"r_und_s.doc-1.3i"="pk63m1jl1yzz2xqiwynpph3nrlri1hkl";
+"templates-fenn.doc-2018"="yy9rn7m9r0paxvya3icnbqwccpjkkbij";
+"templates-sommer.doc-2018"="6n6saza6xd8mjys1ckfy0362sdya4616";
+"termcal-de-2.0"="pql7q4dqaqgg0arqgg7l8iz4hwxrxd7x";
+"termcal-de.doc-2.0"="fpjnpzi59rrqg44j513w4d6f9cqi7ik0";
+"termcal-de.source-2.0"="myc9fjxig0z3dirj1brla1q70ryrczrr";
+"texlive-de.doc-2018"="5xnd0gii9rd1z09xwkc884s73ycc6mpj";
+"tipa-de.doc-1.3"="aa0msh91ynxxigmbxwy72i05g095fwxg";
+"translation-arsclassica-de.doc-2018"="xayn50bvfkyf5fh93426fg2m6mmvpdwc";
+"translation-biblatex-de.doc-3.0"="0wan8bpq95jpa0bsx79hfhi9882vbrr3";
+"translation-chemsym-de.doc-2018"="khd057lr5p42wqz3p6n58d2z25jdknrp";
+"translation-ecv-de.doc-2018"="7yrn8n7071yasf0lpswz8dis0vkjg33g";
+"translation-enumitem-de.doc-2018"="8c46h1y6mpz736w2nh01jkh96n0ar2jx";
+"translation-europecv-de.doc-2018"="541qkhphqn2f3bba6prrf2npqxl022ah";
+"translation-filecontents-de.doc-2018"="9c59fnc6krcsswc3hsd4aimzfvycqp59";
+"translation-moreverb-de.doc-2018"="1j0hyf240k1q27li0dnnw0cs4mi2j86w";
+"udesoftec-1.6.2"="wr18qlcg3fmqhfh9sji9qzxg4m3jn9fb";
+"udesoftec.doc-1.6.2"="snycjxc23rmgkdydpxjyqkzvq8qkklq3";
+"udesoftec.source-1.6.2"="b9y4rrqycqayx419ck7ni9y5fvhbjymz";
+"uhrzeit-0.2c"="5fwbnq0kjdcd88bmf0yscqvz1q47rlgx";
+"uhrzeit.doc-0.2c"="22iimwpxs90xz0c6l9v7aq6l4wqm39bl";
+"umlaute-2.1"="097i2xib6dk7g0pbn7h5blv9jnny07b0";
+"umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9";
+"umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w";
+"voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v";
+"babel-greek-1.9g"="bm4k91lz9a1pfnl4jpn04idl2c08lyd0";
+"babel-greek.doc-1.9g"="y7jwlw980gigm0n059d2xsq1f93v2h9k";
+"babel-greek.source-1.9g"="qm52xxg59kdwbn680zrr9qdziagr69jk";
+"begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i";
+"begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc";
+"begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5";
+"betababel-0.5"="0sk4kkbjx7swjxgrb3xiy1m7933avcz8";
+"betababel.doc-0.5"="3pd2x8h9mybnwkg71irzkn0n2rd0a8rc";
+"bgreek-0.3"="i1afn21yqrz4ykarvfvvn0jai9daldaz";
+"bgreek.doc-0.3"="w582b5mchimv0v1bgmqbi0n8sh5779gv";
+"gfsbaskerville-1.0"="vjawsy59q3xnr1hmzpjr1myqyb6f7gzf";
+"gfsbaskerville.doc-1.0"="7sx91lqgpn4w4xgbdbpsk41i5mxixqf2";
+"gfsporson-1.01"="k6gimiba8zfbnf4wc4zjrmwwc7ggnxkg";
+"gfsporson.doc-1.01"="6i47g0k5ys9q394g6q0a3686q4h75gz3";
+"greek-fontenc-0.13.2"="2hc7j372kndq25ygcbyp0d18wmvsdkcl";
+"greek-fontenc.doc-0.13.2"="5mid6q0ffbj3fdnsy4477wbcj2jxcmmz";
+"greek-inputenc-1.6"="nn3hvxmpgpr5jhj5l90dhl2c5lxg7q24";
+"greek-inputenc.doc-1.6"="16qrcffmf30w69vrgjd8ahdnhvap4nri";
+"greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v";
+"greekdates.doc-1.0"="lyhisq5vmvxpmc1g59dxnpkxnvziddzk";
+"greekdates.source-1.0"="dy4cbvglp6fv0fd13mlm4x5wjfg97889";
+"greektex-2018"="zmms6d4vix6nzw6jc06iir73wj9swvir";
+"greektex.doc-2018"="p5f90xphw0ck7p6iw2gz6anki05v2b9y";
+"greektonoi-2018"="agnjlz6cdb3figh8g8kfnqah4ppzqqci";
+"greektonoi.doc-2018"="8mh04p3y9jizn5zdm63vr50nzk0rjcyv";
+"hyphen-ancientgreek-2018"="y52jhwd37cwc0fnvn1zrhqb7hxklsjlm";
+"hyphen-greek-5"="b8drw54lc48kn8dwwyr4bpfsv5cxarjp";
+"hyphen-greek.doc-5"="r6v8qyqkrvnqn6729i7p3ah3vmgxnzrn";
+"ibycus-babel-3.0"="m0m76cgm1k930h85s6hi9qnlh86gf8z9";
+"ibycus-babel.doc-3.0"="fyc9gdakl47jq7p76pxi9l3ggqsqfwqg";
+"ibycus-babel.source-3.0"="samw380w28p4621z2f9fav06i9dzj3b0";
+"ibygrk-4.5"="3xwia8yqznfai0wjz7rc63dizdfc3n94";
+"ibygrk.doc-4.5"="ydy3swiwjr9r1j40fhkwhd2d7z614ipa";
+"kerkis-2018"="ydv39ycvib03pkw5pvvnv6mjyvrij0rc";
+"kerkis.doc-2018"="admp7blm0nd44qcnqqxd0bpwxskz7dqm";
+"levy-2018"="isfhykz3fkajjygnpl7psd2n9n9lzfwy";
+"levy.doc-2018"="y92455xr0yq62ppxd650vvxaknkb5qym";
+"lgreek-2018"="64pdy6vj1q7sg23xg31pw0mfznahcvzw";
+"lgreek.doc-2018"="iwa1xfg3sawwblifpgkc3na1r3hld02r";
+"mkgrkindex-2.0"="v5hb36lspx6xyzzpm8ryprr7mwwpcrm5";
+"mkgrkindex.doc-2.0"="mfpkm8mm8n0nqhzgnm70yjy16lzjvvhd";
+"teubner-4.8"="7h0mh95kwrp8l3im9fq4m4my65hxcwpd";
+"teubner.doc-4.8"="w0ygcfsjgrw6r5z49ciwxfwyxzpf6gfg";
+"teubner.source-4.8"="l0syr53r8jk5cjh3lx8bf279hlgwsps1";
+"xgreek-3.0.1"="742vxyljmp433rk26ap2rjqbfd7802ys";
+"xgreek.doc-3.0.1"="qdgh9jnqimis40pf5gj383j01ynx4cqb";
+"xgreek.source-3.0.1"="33imiba9m0sxmjxilflqzsysgr7vdv1q";
+"yannisgr-2018"="0pjpl0qghjh6qdgy7snalxyxw6ca6cwk";
+"yannisgr.doc-2018"="jx7mj6aw24ff9k4qcr51kdlk7xwpiflc";
+"amsldoc-it.doc-2018"="3xqg4bjhsk0r27g7absrq84nwy6zy265";
+"amsmath-it.doc-2018"="mrz7iav2jpify9h3vz703x863km3vb9r";
+"amsthdoc-it.doc-2018"="bpi907wji0gimbc22s86vg3fwv6fkpsq";
+"babel-italian-1.3n"="zc8zwrjbpcjp57il9zjpqs5hhzrk0y1a";
+"babel-italian.doc-1.3n"="z8gv41rw62chkmxvkw5a83i7vznsbsqv";
+"babel-italian.source-1.3n"="9gyf05wa96w7xhwh1xyfs4rnl2iax3lc";
+"codicefiscaleitaliano-1.2"="gqzlc6agkwysk75lzdxbkz4azawzyrjh";
+"codicefiscaleitaliano.doc-1.2"="c7spaihgf2fdimihsg5cf7xn5bczkw97";
+"codicefiscaleitaliano.source-1.2"="vxi0halq6yx9gwd0vkcmjx6am7dnjjg1";
+"fancyhdr-it.doc-2018"="nl2xsg3mppyni8ns9zij452dkkw4ayj0";
+"fixltxhyph-0.4"="gkadi0h5794bxkkb809162a1z7aicw78";
+"fixltxhyph.doc-0.4"="l2xq1rsc95fbk3saqnx86l9d73mvm92v";
+"fixltxhyph.source-0.4"="4nhcwfdf5gs7fc5iy5fph8yiq4wavjp3";
+"frontespizio-1.4a"="mqcrdj4b2abhq70zx1alxdm6hs3n4xnz";
+"frontespizio.doc-1.4a"="g6i79280jdkwhp4q9l69h7icm11l78bl";
+"frontespizio.source-1.4a"="gmdqk3hajrn0k5dhcdmyn1a7vxz6f3y7";
+"hyphen-italian-4.8g"="vsrnf2kcfixkcb2fgswdf00j8b2a13f8";
+"itnumpar-1.0"="39ydhr855c2sb1xwfd12v61pphzmbc7g";
+"itnumpar.doc-1.0"="2qdpfrsffqfqvd42nn8yhicp8p3vvzk5";
+"itnumpar.source-1.0"="xd2bbq62fn23gbii6147m3n1c16pcgjb";
+"l2tabu-italian.doc-2.3"="p067k2azmr27v0dqbs6vkjl0dbbxywds";
+"latex4wp-it.doc-1.0.10"="7skz5gny3wm7s5h1sxqxjwgk5w5qr45c";
+"layaureo-0.2"="7qqhm139n1afxdpsmikzdyn7pn09hv9x";
+"layaureo.doc-0.2"="pf22ypfazq7hwxpfiidcvkd24zs1gys3";
+"layaureo.source-0.2"="3q0ixl7rw7sz7n2bfd8gyfnglfcq2hcs";
+"lshort-italian.doc-2018"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid";
+"psfrag-italian.doc-2018"="xb8qlcz7f0za963yybhjvbyjq37z516f";
+"texlive-it.doc-2018"="kdjyd81g1ihnswgja038hywk1hi8q987";
+"ascmac-2.0h"="vg8n2gvl9s08xkmhj2jf617fc18b3mzw";
+"ascmac.doc-2.0h"="xi9mjz1aip4x366d3dj71x7bjsznbxk3";
+"ascmac.source-2.0h"="7v01dn2p724l7qh0xhqi7gflxrrcd561";
+"babel-japanese-2.1"="jvwjzk00mbywd64cjgchn58lcvvdm2lz";
+"babel-japanese.doc-2.1"="xy5s8j84q60va5jm7b39lmncjrxyr4c1";
+"babel-japanese.source-2.1"="mi0ahdg238r2ra2l91vp4wpfad32ahsa";
+"bxbase-1.1"="9qcjdyngscll1bkc1g0i9d50hjrvnbjv";
+"bxbase.doc-1.1"="icyayz4cr8p3zgbby8zaypclximpiyqf";
+"bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z";
+"bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx";
+"bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c";
+"bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh";
+"bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l";
+"bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc";
+"bxjscls-1.9b"="iprm50jgqr61f59wp20cimd30fbx8dhf";
+"bxjscls.doc-1.9b"="da99ydfb39f7saj91nd8d7v26lcb1dbx";
+"bxjscls.source-1.9b"="7ihqka9p4s29j4jf8649si8q82dwznsh";
+"bxorigcapt-0.2a"="16ri8j6fyqc1rf8jmjja41vdxpqnvckq";
+"bxorigcapt.doc-0.2a"="i91ilxpc4f37qihbn9wa6ajvn00ya60r";
+"convbkmk-0.10a"="nzdsi8as7xpp83w064r6hwv9lv41fiq7";
+"convbkmk.doc-0.10a"="481fahf0p919gl9rl46qpp4xi9s9xbqm";
+"endnotesj-3.0"="p1524a2l6zsh2gl28im4rxzr7afy323b";
+"endnotesj.doc-3.0"="ksn1n0s90shsi65kgw4bppanfsbxrq0z";
+"gentombow-2018"="qkiwldsqb2x6rb6m4rlqb6m0bdvfryy0";
+"gentombow.doc-2018"="zwnfdyldkvwkl9966kw5absxqdd0mcjx";
+"ifptex-1.2c"="g067kqkal711mapnw2lfqspj557ddr9j";
+"ifptex.doc-1.2c"="x22bmp95nh3g718b8b9ls535vv1nkzck";
+"ifxptex-0.2"="db7waqqfn8nrn8b3z4dh7dy846f2zxad";
+"ifxptex.doc-0.2"="y1039vpyrh9k2dyi1xws45a1gj3b6dv1";
+"ipaex-2018"="ib3p210rjr3h73257p7swchy3w1in5bh";
+"ipaex.doc-2018"="1rvvg102vks3ai8pf8yykckd3c9jhmz1";
+"japanese-otf-1.7b7"="dcsxgzfmjbwad1i7shnwncmjjsnqfz85";
+"japanese-otf.doc-1.7b7"="lqsy2p1mkbn8qn5i7bs3ssxacisa98lz";
+"japanese-otf.source-1.7b7"="xqyac57c0ldg3fq2qiws6wz9yaxkgy71";
+"japanese-otf-uptex-0.21"="73kyxgv6s0f4575dn2hzijxghzfh83bv";
+"japanese-otf-uptex.doc-0.21"="nqjq5sv81v7jmr8sri90cd3qr040smch";
+"japanese-otf-uptex.source-0.21"="w3p1d3gax2f5wyqw35rgbj224vz8a9ri";
+"jlreq-2018"="18p6d9crd26l75zpflawm6k6gsgpwd3z";
+"jlreq.doc-2018"="nxhx3m6vsiv6j1gscvcbgfbrqsmzagfy";
+"jsclasses-2018"="iwrcgx7xkdw9vwnk1x9k326dwc1w85fg";
+"jsclasses.doc-2018"="7ma1r7n26qspnah8q6zp1qsbfpz2al4v";
+"jsclasses.source-2018"="sd3fxvi7qny7r4nym5px600z6rf6y0lf";
+"lshort-japanese.doc-2018"="5b8svqq4w1ipn3737s73pk969s8yv63d";
+"luatexja-20180825.0"="zkz2fdgvvvijjqd15d3dh44hisr0hypl";
+"luatexja.doc-20180825.0"="5lqyiz3lc4vim72v0gzmj87lh1qz274y";
+"luatexja.source-20180825.0"="br75j9mgc1cjxjbbabvpgfcfnhrrks5j";
+"mendex-doc.doc-2018"="4wkds7kkvz3mhbvs8xzh4ngrm0r0yx77";
+"morisawa-2018"="41dcbs61zpdhqnc6qbzcfkq0nrfgfirl";
+"morisawa.doc-2018"="cy0li43jphfx3x8x2ddf57f040s8ygim";
+"morisawa.source-2018"="jhdr4xfya5m21376a8cmnzz4xfr8qh9i";
+"pbibtex-base-2018"="nix33k8m51bymsgnmfz69mwpllkk9rhq";
+"pbibtex-base.doc-2018"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n";
+"platex-2018"="lbznpx1c56h74yav45zxakvigrk3m3rj";
+"platex.doc-2018"="nlncxghxbr78vffx5vfvshh1zin73qny";
+"platex.source-2018"="nk3j8xawhw6iqqi1ci5g1gw2pkzp651f";
+"ptex.doc-2018"="i71l58533az6ihp6pg3ghyzz70k4waml";
+"ptex-base-2018"="kd45yx6zdsks4iyq60rqmjd0vkv3xsv5";
+"ptex-base.doc-2018"="jjc6f6k0sy2ibdpq9lvzld2wiha4hqqc";
+"ptex-fonts-2018"="iqch8gk4nianpr01y03nl0zwp49bw1b4";
+"ptex-fonts.doc-2018"="ln071z7k84vqpdf72ngcn7s24hpkhazc";
+"platex-tools-2018"="iiihdm5hmmvn33ki8022x88iag2wzyjd";
+"platex-tools.doc-2018"="h1pk2yv5hcwvwc4d9xpk0lfj8vq9gnj5";
+"platexcheat.doc-3.0"="yfvx41pna2bmfngr8d38q1k93wnx4hj1";
+"plautopatch-0.3"="gbbkvgz86791jb4ykh184k2wbzi610sq";
+"plautopatch.doc-0.3"="xs8zdm6fylxwsya5difrs95fni5898vl";
+"ptex-fontmaps-20180328.0"="v1kkxb7ai7pnrd1v1by3i0146248cbwb";
+"ptex-fontmaps.doc-20180328.0"="ifhpa5i1zni6q6rgiciajkdw2hv10pss";
+"ptex-fontmaps.source-20180328.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq";
+"baekmuk-2.2"="5rhc42dabpd99i92hkdmkjzgr3jqhg16";
+"baekmuk.doc-2.2"="4syhh948m1jw14xlhq6dbpdw5p5p198h";
+"ptex2pdf-20180514.0"="l8f4959s35dxiw9n4phwdkicb0r3d0iq";
+"ptex2pdf.doc-20180514.0"="qlq0f8zg1gkgwv2wj45rd4na3knqgcds";
+"pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa";
+"pxbase.doc-1.1b"="n5ns9b3vpa52b78hhgbvg0114faw0dgi";
+"pxchfon-1.2"="w7wh693l8p3wmml6l02bn38sgabjq031";
+"pxchfon.doc-1.2"="jmc4hkws1wj12b44572ifhzrd7bnk15j";
+"pxcjkcat-1.1"="i368i8r85baiimnwh2rfqd0hfrklw8hs";
+"pxcjkcat.doc-1.1"="hcxxg9rg6d64hwysf6nlvfhv8h360168";
+"pxjahyper-0.3d"="pm4vx5bw2si5xnpyqz69sa7lm0f67ah2";
+"pxjahyper.doc-0.3d"="r0r9gk1kk80h1swsljqpdpkapvjccy12";
+"pxrubrica-1.3c"="p6ych4fz68bzhg7nmb0456jr32qhg20g";
+"pxrubrica.doc-1.3c"="mn4xnfbybrmq49w2r11q18k8q4q7mark";
+"pxrubrica.source-1.3c"="5w4m8vac151lxkp76llm5ycvi7818vps";
+"pxufont-0.3"="9cvf0yzn10qsfzwymqgzjc6va01yxrvg";
+"pxufont.doc-0.3"="mfxsqffbf5fdipm4cfzmxk0c51kkncxk";
+"uplatex-2018"="h23651z47mgh8knb7x229729aqcqb82g";
+"uplatex.doc-2018"="6qshnh73pqknyhd07a93p847nwslnbgc";
+"uplatex.source-2018"="ab6ilczx3pp8jgikph61cqwgg6kz2w6w";
+"uptex.doc-1.20"="qpv93c3zhzxl51z156qzz2iqi2wrv0pm";
+"uptex-base-2018"="0hhjg05brrjz0vid7jfl8rbqf3wzcdq8";
+"uptex-base.doc-2018"="rc279mr4zk82jvvyf0wv5ix5qgzs52v6";
+"uptex-fonts-2018"="ijli9yj4yn0cy6wbk7i2a3iqfzcl21wq";
+"uptex-fonts.doc-2018"="9rvy5dsdj0vih0i3g11z5qr5fy4vrcb9";
+"zxjafbfont-0.2"="gqmmwcbw81z91mwqf731jk0mgdfiw8d5";
+"zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh";
+"zxjatype-0.6c"="8hllbrldhybkwhnzzvawmn9r6clr85nn";
+"zxjatype.doc-0.6c"="ycymhyq31rb8jph0pwmns5bm5lxm7c2w";
+"cjk-ko-1.8"="bzihr3wa6c0rp7jrj89483w2xlapj6jv";
+"cjk-ko.doc-1.8"="avb0cwq3p97yj94gsfwj29bwdixv2lyg";
+"kotex-oblivoir-2.1.8"="wq598w1jbvbczmznn97basmrybz42zxq";
+"kotex-oblivoir.doc-2.1.8"="inqj292cqra8rxpa11vwkpjx7wcpx3zr";
+"kotex-utf-2.1.2"="x3j8gcy8ylvgpiwyrwrgl8wjj9gdrp63";
+"kotex-utf.doc-2.1.2"="r61iwnwwvwh1999l4ylczvz0d6l9ff1f";
+"memoir-3.7g"="axgnv2bcmbw8spddwbxixg12a0mfvz7s";
+"memoir.doc-3.7g"="ncq37byg6cp18vmvllwdgpz3iwnqh3wl";
+"memoir.source-3.7g"="p9d198p8hn28zr5m5imzc59vi6bxmx1z";
+"kotex-plain-2.1.1a"="wa5ifv962vi96ikyv53b6x7wg1fi67c5";
+"kotex-plain.doc-2.1.1a"="drkcvf3nb3kkvp63mw3xdz80lvn92w0j";
+"kotex-utils-2.1.0"="gvq7vg419f2wqzl6xp9mcffclvh65hs6";
+"kotex-utils.doc-2.1.0"="xl1v4i3j2wlhdp0rkjkn0d9b11bwlf4b";
+"lshort-korean.doc-4.17"="1g5islw4v6x4s50zxb0zgc3nhk83yf06";
+"nanumtype1-3.0"="b1wscjlknaslwhpaxxfi8w2drxg1m770";
+"nanumtype1.doc-3.0"="4jpi6pmfq42sbcfzl403niskxg6qnxfp";
+"unfonts-core-2018"="ms70r9bpx59vj59mgrg9366idfzr17hf";
+"unfonts-core.doc-2018"="15lirjd8hw6kajqalrbjda9fzbgzs7c2";
+"unfonts-extra-2018"="ib9sxr60ylsw9vyvr3wxya8xhq6hv0ix";
+"unfonts-extra.doc-2018"="2r7sls3pa7a3fq9q74dlzhp7yjbwdsni";
+"amsldoc-vn.doc-2.0"="09zv7q83wc6zg9an9b1x1nvsnqx8bpcr";
+"aramaic-serto-1.0"="mcxkjm533zpz4srgqqbd1asax309lhmk";
+"aramaic-serto.doc-1.0"="2717wqsb2bzap0cjgw8d1rsryjyil57n";
+"babel-azerbaijani-1.0a"="hyp5q2f1i53nwc2fpzrvg73sig4cidi3";
+"babel-azerbaijani.doc-1.0a"="hii173fm6g5kdiai6d26f3zfg1p5bay3";
+"babel-azerbaijani.source-1.0a"="x887igvkinyx05lnir925xva5snhmsvf";
+"babel-esperanto-1.4t"="0zwr18503la5x4gw11ic8x2gbhb5ic06";
+"babel-esperanto.doc-1.4t"="vyjxr4qb3w2nj8a0d51n9k0zrdy56brn";
+"babel-esperanto.source-1.4t"="ngrcz6ixvk4mbpg41jgp38py5ynfqssw";
+"babel-georgian-2.2"="slz23swln354rfmjk3qrf3m6gflcqb1y";
+"babel-georgian.doc-2.2"="zknj2vi3b55gdzq66mxjx4q7j4x3v0hz";
+"babel-hebrew-2.3h"="4mbg393m14m3j2i5sxfznnr486jw83b0";
+"babel-hebrew.doc-2.3h"="arlh4cs388rna2cj734yfi4vjrfli6bd";
+"babel-hebrew.source-2.3h"="8g78490s5lnmgi3h4rxw30cprmqv5mkz";
+"babel-indonesian-1.0m"="q9v0zfb6xbw2q4wa0pa0bray3knhxpm4";
+"babel-indonesian.doc-1.0m"="b9f34f8r7nvdby8z00xw1z56kmd92p2m";
+"babel-indonesian.source-1.0m"="rdb6dd4h5qjsgzqwx71g0n1h41ldfh9n";
+"babel-interlingua-1.6"="sq1l1svm80rfm09l1ys2ha7x0cyg4h3v";
+"babel-interlingua.doc-1.6"="q0zmjgrk58m7ivyi952jr3l0hnicpbxa";
+"babel-interlingua.source-1.6"="v04rpx7bwxjvdl8psjhc8w38krsv837c";
+"babel-malay-1.0m"="72z6yjhaxbkvnvs3x98bp3jrkkyk2ihv";
+"babel-malay.doc-1.0m"="8x81zjk3fmbnl5mq1dzxphhk6ap9sfq8";
+"babel-malay.source-1.0m"="npqm8jnnh4i4kjjsz228ccy6mzg1q5mc";
+"babel-sorbian-lower_sorbian1.0g_upper1.0k"="7vc0b3cfj4j9b1wjim0h68lnr941yarq";
+"babel-sorbian.doc-lower_sorbian1.0g_upper1.0k"="vvpq6ah1mapvcg8mbjm68layvcbhp05d";
+"babel-sorbian.source-lower_sorbian1.0g_upper1.0k"="yi38218h67326i4swrj94ma5pjax5krc";
+"babel-thai-1.0.0"="s3h479l6qbpm7ymfmg6v2y7d4cyi2ga5";
+"babel-thai.doc-1.0.0"="yk77akss918d2yfn1halnvfa5635ikyg";
+"babel-thai.source-1.0.0"="s0cvg8q806xl02n8m647a7wl4yvspl66";
+"babel-vietnamese-1.4"="pi8gc005y8hn42hyxrn7p23kbashsv1c";
+"babel-vietnamese.doc-1.4"="5l7qyvppvihhdzcszaxskiscp8xm686h";
+"babel-vietnamese.source-1.4"="y9wmbn3j1f614p6dfciwnvig3v5r9q39";
+"bangtex-2018"="cn3ss5r73gr19dbjlrnvb7icfpbb2aig";
+"bangtex.doc-2018"="7dwz3jgliyn649ns4iqmgjnqn80bv3xr";
+"bengali-2018"="xv6b2ya4hn8bhhfwmi7sziq9qwmhx6qb";
+"bengali.doc-2018"="f6c5pyzrih551k2p50vqy9jfx4ar3svx";
+"bengali.source-2018"="s77yi86avqzhp5lin4dwhbavb41g4q0n";
+"burmese-2018"="gymkq1rr5pmwaaid3dpks3f8ngz3525f";
+"burmese.doc-2018"="yirjf8crgj2a89451jh8iv66qhdqdrr7";
+"burmese.source-2018"="ixz9y2ck9awijs6w9rz005nkvl613811";
+"cjhebrew-0.2a"="nkca25dwl8i1li6q63sv4w2n35z28bdn";
+"cjhebrew.doc-0.2a"="w8jqlvv6cm125d68dhfsar5y7xynac7d";
+"ctib-2018"="gdfzyzhwfcwi275xdrvah86459bsfxx7";
+"ctib.doc-2018"="jy7r4mkpncfmy0djcxvpcvkwjaqxv7s5";
+"ctib.source-2018"="3pfn4qglvw3wjjw4f3jlk5vzq3ci4zj6";
+"ebong-2018"="mhlr9r7i2zf3rm905m527hbnydppaiar";
+"ebong.doc-2018"="pqr96lyawpif4fzp0izw8j0506gnf06f";
+"ethiop-0.7"="fd4kynb70wkja5fxhi10n52mff3s2a8q";
+"ethiop.doc-0.7"="cabq6vprpklsmzi68af6nb4qiwbrwmzf";
+"ethiop.source-0.7"="yv6pwmbkvahpy2h4vnijnqag2rv09k5l";
+"ethiop-t1-2018"="f73j35aqlr29gmh9k00d3s0jzkmk6zq3";
+"ethiop-t1.doc-2018"="92ly98mz1iim1gfh4cm8hjwc17j9kjhl";
+"fc-1.4"="iyjlb5q55khnp515n1snhpnfrrmfn1pm";
+"fc.doc-1.4"="wd9bn967d6nzzvdrvim470l711v1jkg6";
+"hyphen-afrikaans-2018"="whfr6hv11bax9c0crb7fm29xs9m2qb0w";
+"hyphen-armenian-2018"="mdffnpk1ry6sw0xs8h5adzzz11dr7d8z";
+"hyphen-armenian.source-2018"="0b2gny5672fkb5sd8vb2g3fapx9pl7z2";
+"hyphen-coptic-2018"="p47kp3hkkwz9ihxh3ijac8gx4maqbmlp";
+"hyphen-esperanto-2018"="7jmj4q99wjl0ia2s0wzkm0m5jwh3bzkh";
+"hyphen-ethiopic-2018"="nixwv8azmh1p1av7alhrzbxqqihcgndy";
+"hyphen-ethiopic.source-2018"="dg6qij9y5la6kr6izwb2ap1mih84bcdd";
+"hyphen-georgian-2018"="2qsb2ivmvmj13pw8z4xa6kv51209nnfm";
+"hyphen-indic-2018"="p6yx4r666y5dzvz1arkh10vihlq84spr";
+"hyphen-indonesian-2018"="nkrgjmp62s8wq32qbvfginx0fgzgn2m5";
+"hyphen-interlingua-2018"="7zichfacqkg5vrzb4ps6327p8lsxdjq0";
+"hyphen-sanskrit-2018"="smb3iyryyb5p0fcrb083q6cnzh362ps8";
+"hyphen-sanskrit.doc-2018"="a2pncv9fz35p3bbj6mll93vqcyagsmbq";
+"hyphen-thai-2018"="f89k86fi0czj17cn14i9pclky0wmwddw";
+"hyphen-turkmen-2018"="1mn76d4axhk2hz29qdla7f18kwf3y0kq";
+"hyphen-turkmen.source-2018"="c7md4qrdh7hms3vzkpcams5hwl8qy953";
+"latex-mr.doc-1.0"="vwb062hbn3371czg99plccbvxw1a7gjh";
+"latexbangla-0.2"="6ix7rfgj51z585jry3i1g68x4wvm4xxz";
+"latexbangla.doc-0.2"="iw79gb4sk4hys6xbc8j86lpzyji8h7r9";
+"lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2";
+"lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx";
+"ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni";
+"padauk-3.002"="dwdgm603clk71s9gcjx9ghzwlkh6k2gd";
+"padauk.doc-3.002"="zarib60py4ddx2axyrm695pkikxih70z";
+"sanskrit-2.2.1"="scnnwa1xsfnpv0w7xp8ry49ps6s5pw8w";
+"sanskrit.doc-2.2.1"="0ps1lrlzdhq7gaagjqb3m4yygpz4g7p0";
+"sanskrit.source-2.2.1"="dp3nk8wbjrvb3hg4xdxl8s8m1wfcwny5";
+"sanskrit-t1-2018"="lwnbgg4flg35ndf7p0iii468sf6avylv";
+"sanskrit-t1.doc-2018"="h7licx4ivjwnvbym7724rdj3vrcaak5i";
+"thaienum-0.2"="acsj56dxkcqi83yajkm4rjxm99p6r10a";
+"thaienum.doc-0.2"="55zcsq659l2wki581xvcdy3ssljgk9s5";
+"thaispec-0.3"="f2yb8iqhzia8b3mpn0q9ywjz9nardqfm";
+"thaispec.doc-0.3"="s8ggidsvyhplw6a7pdqhpfvfvbncxd8x";
+"thaispec.source-0.3"="jh62vil1vdgvah07wrniw2ncxanjbzr3";
+"velthuis-2.17"="10lr5jgiy28w3diqwwj9qlmfrlhicg17";
+"velthuis.doc-2.17"="hh24rcz9098hpi3prppy0nrjvnicjqm2";
+"xetex-devanagari-0.5"="v4gi0agfvxz808s3mapzf2ylxhv5n8a7";
+"xetex-devanagari.doc-0.5"="b3kz558m6h9avjwalwpw1nnr68q47sjr";
+"vntex-3.2"="vzdcn6z7knkzsj8gxwj8zda00dq6w8is";
+"vntex.doc-3.2"="5ix8dldkd2qmmbwn731ii4ffng7d3fgr";
+"vntex.source-3.2"="72m9wqbqrsam0b6a15lqq4yq5hbcx0kj";
+"wnri-2018"="z6010l0pydl50vy5jnrg5fh2xki5fi6a";
+"wnri.doc-2018"="clpx7kcx1hp0qy30v5nlfz10kd5hmqcl";
+"wnri-latex-1.0b"="y9n4dac8cbzm2gwhcfan32rbv3dyhr0s";
+"wnri-latex.doc-1.0b"="f1m11fnp49h90f3djiml0awlxqcnxkdp";
+"wnri-latex.source-1.0b"="zd4smslq18sp693fgay24m503v01v3bk";
+"babel-polish-1.2l"="k73wcwg7ab64nwjyq9rb78pmgkapy4xq";
+"babel-polish.doc-1.2l"="720j9r3c7y7yak2j3qbgx2baanwl6az5";
+"babel-polish.source-1.2l"="65j5b50flchq2kw6wi8g3i4jz9n9h7w3";
+"bredzenie-1.0"="dhjq0ccgxxin5a6fmwb95275d1i11xkh";
+"bredzenie.doc-1.0"="br35cfyn2zq2qb44mss225ylw16sz0jq";
+"cc-pl-1.02.2"="d0vdpawzrgwsxj9sff3y83mf1xrs891y";
+"cc-pl.doc-1.02.2"="wqnvmgzzh65fhrgwbrmpa307qa7xbh21";
+"gustlib-2018"="x6dscxji10p04msr31f3vsaf6pfpzhsg";
+"gustlib.doc-2018"="07x28ysinfhv15jlkpyfsv7cjyzwbdg7";
+"gustprog.doc-2018"="v1mb66z2nc7vwhy2yg5rk699mvqkpqs3";
+"hyphen-polish-3.0a"="pdmrgcp1gnms1yqnscrk977xzg2b2rpr";
+"lshort-polish.doc-2018"="7fr1g9j932xjam26nnf6b6zc47m1i9g8";
+"mex-1.05"="z7m8kmw19bg4yw3p99fvpvhhclkj5ff2";
+"mex.doc-1.05"="qajd1x35x1mbkvs39hbxs3qd8df3hp5s";
+"mex.source-1.05"="kf6k037zqvlad7sm8z4a2gkg2xlf01j3";
+"pl-1.09"="glzasf47dgz69y9gkr4amiffpl7wwx8j";
+"pl.doc-1.09"="1p5zh9jmllvddgsnnafm2vabqhwdqq3f";
+"utf8mex-2018"="d8314s7lhlafhspi1qf8hiqzx61n439a";
+"utf8mex.doc-2018"="svpkpbc0caxbynjnjjynng11fdg3dgid";
+"mwcls-0.75"="nldix3j60gjybkg60qdbi1wrdarqggqb";
+"mwcls.doc-0.75"="16cqcaliy99s6dqnb507hcncxbjlhgmq";
+"mwcls.source-0.75"="x6jn9m23ickiy79sk1w1jsgiqpk2jh9v";
+"polski-1.3.4"="j98gsw0v3vf0a9j8bfjbynmrv47fcd34";
+"polski.doc-1.3.4"="zldgln4yhr6qkmay2aqrlv0bbbwqdyyl";
+"polski.source-1.3.4"="a7ig2cy5jamdgk3dxigyz4qa0kjrd36z";
+"przechlewski-book-2018"="qid42vb23l6fzc6dgmx3bflwz7z0mdb5";
+"przechlewski-book.doc-2018"="23zvnv9pcvl5n68js39l4hrcli608qck";
+"qpxqtx-2018"="wxccyd4si0x6338hwmwdaxmjj3brm7p8";
+"qpxqtx.doc-2018"="xvxsnjfajz7zfvgfih7v3mfca5b36qda";
+"tap-0.77"="mgr2m41yv0y4dcf4myk7020hkmqrd5z6";
+"tap.doc-0.77"="mr27kjalpicyv8915p32yyya5imm3m8v";
+"tex-virtual-academy-pl.doc-2018"="rr38v1syb2b4ji3psf47pmwr562zv59n";
+"texlive-pl.doc-2018"="nfyjwk56cmbla6zn8imndl8bmmi0k4rf";
+"babel-portuges-1.2q"="n9im1w2dz7yfqqq4k8pfmqmxjg5mfl0s";
+"babel-portuges.doc-1.2q"="d5r7vabmr3lhrfcrji8rayi6xx6q6hqy";
+"babel-portuges.source-1.2q"="rgi4li2frm84fbdi0sfhqvmpijlx64lp";
+"beamer-tut-pt.doc-2018"="kxpy2m4hbwm3sfj7ix9x249df3dgmvfm";
+"cursolatex.doc-2018"="arfkwqkjw5kfv2rcfhkvxjq603wdsq3y";
+"feupphdteses-4.0"="696my85w1ngcar81vacyj8nr7m4dn0wd";
+"feupphdteses.doc-4.0"="9nm4793nyfp5v2rjd5297sbyw2b29bqi";
+"hyphen-portuguese-2018"="373150snca1vkvj58s0kdv6q044akcsq";
+"latex-via-exemplos.doc-0.5.2"="aicbfd1zjizlh2fx9fq5xc1ppaz8yffw";
+"latexcheat-ptbr.doc-1.13"="qzgl6v54k07i6lc3ps84s9mj11j1qqqf";
+"lshort-portuguese.doc-5.01.0"="m3r2gbq4v09p9svs0mxsw3s3yc7has5y";
+"ordinalpt-2.1"="ds49jf4pvghzwn5nqwjbzz6dhp0cdn80";
+"ordinalpt.doc-2.1"="4hg5jx7bnx1j13s1mq8xscr3jfajl6by";
+"ordinalpt.source-2.1"="cc2f6xias35ac0c0kxan2cvcmyjq7l6k";
+"xypic-tut-pt.doc-2018"="2rj58kib26w8jnfzpd9bsm0nf2ladv4i";
+"babel-catalan-2.2p"="18ngggp3v707j48vac5grpqw342jwg3f";
+"babel-catalan.doc-2.2p"="19hc8i6d64n8dfk6hmgpgm03kg5r7wx0";
+"babel-catalan.source-2.2p"="v2750fsyzjlc6iqk44s31idwybz2jvfz";
+"babel-galician-4.3c"="xczl3malfygp6w1fd3rpd26rifcgj3j8";
+"babel-galician.doc-4.3c"="i7r7rp46vmhmf18dgzsac2ay1pwanlxz";
+"babel-galician.source-4.3c"="ix6vzvf936s019948pz5bls7nfca9xng";
+"babel-spanglish-0.3"="17nhdd8za144n05vhvd50kr6bss0swaw";
+"babel-spanglish.doc-0.3"="sfjf3dfj841772k5ipvf0r4qr3zayhak";
+"babel-spanish-5.0p"="lxsy4aq5mwizmif2r3i9h97mccim0ljv";
+"babel-spanish.doc-5.0p"="2aa12l6ndp4r6rdv6v0z405y3hpsmgnx";
+"babel-spanish.source-5.0p"="ad9wxx0qp6kp4r8ri1vwycgf2gpdj6xw";
+"es-tex-faq.doc-1.97"="v9brqkql6xbb1zdk5m6xhff1dxm36nhf";
+"hyphen-catalan-2018"="0z92n1kivwrihxn1vi7hcm046drhw9c8";
+"hyphen-galician-2018"="8shj0dvmbcma4y9b8sj192x7za67ciig";
+"hyphen-galician.source-2018"="ivmw5irkn7vfp4k6ldn5jn9ra43cjlcs";
+"hyphen-spanish-4.5"="b6d0bh9xrr1091idjs1dmjjicgsk97l3";
+"hyphen-spanish.doc-4.5"="416kb8avd7nb048aia9rgbvjbh6bbh7k";
+"hyphen-spanish.source-4.5"="lia19yzmwyz4fsbnrca8al43hfc46i55";
+"l2tabu-spanish.doc-1.1"="rc7058j31za1cg1ik27b6gcgscir9bfk";
+"latex2e-help-texinfo-spanish.doc-2018"="cfjmdjk3pj8wqbvxmxd5i5lidcajz0ay";
+"latexcheat-esmx.doc-2.00"="bzjjilpj8rmp1cc93bs32568dc8dvgic";
+"lshort-spanish.doc-0.5"="3gmql5wpqh3h5mhr0pjcs6v0a5jqc1c8";
+"spanish-mx-1.1a"="ipghkbmay6pmwisxrnpkrhnlrlgsr9zz";
+"spanish-mx.doc-1.1a"="4qrhsw2wnpdmq7i3j30vfb04njyhldi3";
+"texlive-es.doc-2018"="ak9l8imng24ghb9l7xhlra3cknimrl72";
+"2up-1.2"="qd90xqk7f4p9mgp53yid9rixhhs11ns3";
+"2up.doc-1.2"="gv5blpi2xdbjdi1i2p9j6gz2qzr14d9p";
+"ESIEEcv-2018"="w5zhmx6kk19kwf98gdm7rlp7l3i9k93y";
+"ESIEEcv.doc-2018"="4ci8yn36m2fz6v6n7iqb071291rl23zw";
+"ESIEEcv.source-2018"="kvh03awwlhwd8wn69h32sdjxmcpa6lmn";
+"GS1-22"="2fvvg7l5g84vhg88mzaa6x16p13pp34c";
+"GS1.doc-22"="bsdamqnalwikpldq94f035nh849vjb2h";
+"GS1.source-22"="gzg5ynawvwr24sl31f85q7ksinaks3a8";
+"HA-prosper-4.21"="kbj26h7zvc9v5l330s2hp63l44vrn09r";
+"HA-prosper.doc-4.21"="hpj2qljnhi7x2prcwnra1ycfzazhnqsz";
+"HA-prosper.source-4.21"="wlzyr02pardayic4598mc0v6mks9dcx0";
+"Tabbing-2018"="1ffaxfww9l073hvjvgp4vkxzfdmmgb8l";
+"Tabbing.doc-2018"="gyhcdih64zw18s44f5s1h8ccr2ndd0qs";
+"Tabbing.source-2018"="pifazcagjavajck7h6a0kyvnxxk90k8y";
+"a0poster-1.22b"="dkwb9gdxv3jxnw07ji0ydmpqa0fgy6mh";
+"a0poster.doc-1.22b"="bn6j9nsmcri2irby7njhbdlpgqqaic0x";
+"a4wide-2018"="lsss6h32r10x1v8k9wwdp7ind09y6x5h";
+"a4wide.doc-2018"="vb90v0v79l34fr86i7hzx787ndyq271w";
+"a5comb-4"="sc874hfilkfjjv1aw8qnf36v5jkhd6s2";
+"a5comb.doc-4"="gsp7dsbhk6r2q332apbqrx29mna85dhs";
+"abraces-1.-"="54c3kj96d3symq8nbzrns0pf1200jm5z";
+"abraces.doc-1.-"="78wfnwn3ni90izh9nyqhmjk6jyqrvax0";
+"abstract-1.2a"="qd0czw54z49h3mxnxlk6drblpbl47sln";
+"abstract.doc-1.2a"="qd4dggpq9076j7cma12mkhy238ni4w3z";
+"abstract.source-1.2a"="819fv5rryh634fmqic8fqagdfi9h04wj";
+"achemso-3.11b"="c4xdczqhzfs10h9pb5wa77y1fgyggifs";
+"achemso.doc-3.11b"="3sf38nqrkihwdxxyxrbkjank72w0dhrk";
+"achemso.source-3.11b"="xxpsymzmidbd24pq1k3qhxkh9vc7k3zc";
+"acro-2.8"="65bn1ii2h45vvjy94dv7jl4xi5slbvfi";
+"acro.doc-2.8"="h4sgkbp351gs82bzq98nqpw4a70psy1i";
+"acronym-1.41"="2spcw1vwwm6mwpl2dvv7wybxvndbsqn5";
+"acronym.doc-1.41"="izmrdd0rscib9xa10xm33vvh7bvgzdly";
+"acronym.source-1.41"="1l7ca4pd0nx499pv45sv1092bilsxfkg";
+"acroterm-0.1"="04m91cky6cj3jv546mdf6461bdg6sfkk";
+"acroterm.doc-0.1"="jnxcd65y58xrqg0cfg7y0m8yslbj7xi8";
+"acroterm.source-0.1"="w99kkypzq7c73rx4rv4m917c68vnan00";
+"actuarialangle-2.0"="ff4khzc793za2vl8ghg9k3jzh21npa4b";
+"actuarialangle.doc-2.0"="blrrabd60rlmly07kh83wwa88nkw7mb8";
+"actuarialangle.source-2.0"="naxi069bqfb3w7bx5g1zwj4iy5b8kq54";
+"actuarialsymbol-1.0a"="46rajcg49v84amgxarr8d24z1ilzgzjs";
+"actuarialsymbol.doc-1.0a"="7pzwnc70kgqh5lq6wni6lhyij6ydbzh8";
+"actuarialsymbol.source-1.0a"="39chg76j3ahyny2m16wq77y1rcs0jsxb";
+"addfont-1"="16jk4kypw619n5fy7j0hvfiydk5k3mbk";
+"addfont.doc-1"="r6jy27nla35rjdsbcqfb7ckc7hfszngi";
+"addlines-0.2a"="2v5gfg9w6p4p6849lgipiql9x73d5a41";
+"addlines.doc-0.2a"="wrd21fcqv7nd225xb85v13dgsbfk18lv";
+"addlines.source-0.2a"="l5dv40igkq2wphl1g6ni1g7fii9qkp26";
+"adjmulticol-1.1"="pql48y74ir0kniq2zyygqb9yapjj226d";
+"adjmulticol.doc-1.1"="23awvvvy86j9vwzw52yn4404s8acq7wl";
+"adjmulticol.source-1.1"="svlpk0df2c9nh50p8a9fl15bh4an3g05";
+"adjustbox-1.1"="5159jf6970gifhy8y8gq9r5hq5bh4g3n";
+"adjustbox.doc-1.1"="i0yin9qflpyjrsiadcxy67vnjcs1ir2n";
+"adjustbox.source-1.1"="kga0m6xx519qk71kb3pk9829w8l4is76";
+"adrconv-1.4"="jm0wy6794p7idv2f1ryhsm2v9wr9d5ar";
+"adrconv.doc-1.4"="jyn0sjir5pp69zvlabyamihnlsav24z4";
+"adrconv.source-1.4"="v31vh22mrhxqq4h88rvj97a9n0wc9bmw";
+"advdate-2018"="f0awsj80hyiv2vkjizidk3na8yvfm6i4";
+"advdate.doc-2018"="0yx83g0jz771kjqq6rf07wlmzs4h68x3";
+"akktex-0.3.2"="6mhzn5d98q6vmxp8vjbmb6i26x9zja3g";
+"akktex.doc-0.3.2"="z43q786v20515sgsp4dh5lii0pfa620r";
+"akletter-1.5i"="7i7x6692i5zicjsrp51cvx8sivm1arpw";
+"akletter.doc-1.5i"="lx2pcnwy9zslh99dvrak5j9lzk7gxmra";
+"alertmessage-1.1"="xczq5v43zbpqkhia8dzk9q6918w6h7y0";
+"alertmessage.doc-1.1"="676ky2mwjrvjkx0bd3pqdgisdfxjzr4l";
+"alertmessage.source-1.1"="g3n5rz7j3ldhkviw267rwwd0lfgbf9a4";
+"alnumsec-0.03"="wmcb661yih7nnlwpshx0ahp45hg2b2qj";
+"alnumsec.doc-0.03"="q89lqn201amhxmpqfznyv7vsp40a8az7";
+"alnumsec.source-0.03"="zin3hkq6fr67rz2df7qqfnki4kar8k1n";
+"alterqcm-3.7c"="4iq919l9gvcpphbhz74hfwqzv5905mrr";
+"alterqcm.doc-3.7c"="5ldngzl9qyzmnd1gx8p31h1k2qigdgbi";
+"altfont-1.1"="cickjccw7xjpa3q2hpm1cyzs2jvkx1wy";
+"altfont.doc-1.1"="f8x27hdfap8pz6f96s7jvvaldsjaxwml";
+"altfont.source-1.1"="q75lvhzwgyqxlj9h56i43hwb7v8lq6rl";
+"amsaddr-1.1"="6sf35pmlda97q2dhi5h7cwan25gi9nij";
+"amsaddr.doc-1.1"="m5wxpa9vd09pja40i6lzzrlw62ml5zvm";
+"amsaddr.source-1.1"="b66925k432cw6rqwqapcg1h8gjgnvry7";
+"animate-2018"="0pwxij2sbhqdkn3k3xlqsj68jpwns1zj";
+"animate.doc-2018"="s3anzs4d00q9k4sbpfb9ys46z10ssmla";
+"animate.source-2018"="mqpx43dmzhz3piic3y4i42n87j3d1ais";
+"anonchap-1.1a"="qpazykls2jy7nqpqkaqvyi35c2ajz0qg";
+"anonchap.doc-1.1a"="3xy9r4p9f22fjdvznba1jjp09gbkvvlr";
+"answers-2.16"="isadn9v17ma5krfq4hm304nrdc8kx7dd";
+"answers.doc-2.16"="3ma0j6diq2zp7k547zp6ilbynsrkw59d";
+"answers.source-2.16"="7w1nvr73ndj7c545xps8h969q4z58gji";
+"anyfontsize-2018"="z7d08jdfvq55ls4va5f5iyixxyp6xjv6";
+"anyfontsize.doc-2018"="fxvax04n8dj9haksiqx0jddi47mb8q1n";
+"appendix-1.2b"="vv6787vrvnmwm8mg85aq1bii0lgprzc3";
+"appendix.doc-1.2b"="095s7b98s2n14xsf2ffv9v6fvsdvl6zz";
+"appendix.source-1.2b"="5ivln5wysazp8nllz5k3z5vh9ivzwwl0";
+"appendixnumberbeamer-1.2"="zrx31sicdmcv1mvv2jsmqb49ykwgxdgd";
+"appendixnumberbeamer.doc-1.2"="ql9zi0i3r3jcc788qx6zrbgfgmrv4pj6";
+"apptools-1.0"="v2ag8kbf87fm4rf66z1a3z93pfs1j6gj";
+"apptools.doc-1.0"="a8mjxckcrk06xajadqf2124k5k0ra2qi";
+"apptools.source-1.0"="q37a0dpqnw1vbqih6p7lbi70a1f58yl3";
+"arcs-1"="b0qh2cpybhqd0d0d8a183hhv7xlx13di";
+"arcs.doc-1"="x9xzx0p7wmn5mh61lkmlycfcybzfasz5";
+"arcs.source-1"="jbx1wd4pyp8682lbz3mw00ha114adrad";
+"arrayjobx-1.04"="zxqamnkgiq8c9p1z3w89rlgqv61bp2n6";
+"arrayjobx.doc-1.04"="fyx7869qi432q3g06i3xyg92jqh29fbr";
+"arraysort-1.0"="h5gbw2lvn0zfvhz0s5lmc495yz49bdds";
+"arraysort.doc-1.0"="fx9j9a4nhjlfmxvsnqqcxxh7220s1rsg";
+"arraysort.source-1.0"="0xdix5q42gnib80gi1pbaxx9yixbjm61";
+"arydshln-1.73"="jabn629x5r4sj0na9p3jfqwi2s1yh3n4";
+"arydshln.doc-1.73"="90zccvpp98lkj787ihr1vpvcaps8i4rs";
+"arydshln.source-1.73"="pyjvg1hzp8am78djv0kw121sgfyrl37q";
+"asciilist-2.2"="cx4yfvy3r2cr9kskf9drbcl919np05nl";
+"asciilist.doc-2.2"="f8hnsjyks2f5qjnya4v6b23px0f304dn";
+"asciilist.source-2.2"="10pkhmrfp0d4qw56x2nk296rn2j436gd";
+"assignment-2018"="f5a0sprx94bby245g2cfycrrazgp00k7";
+"assignment.doc-2018"="0d0cafwd56gqn5dacsq4fdgzz8jqks19";
+"assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6";
+"assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9";
+"attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql";
+"attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs";
+"attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4";
+"aurl-2018"="8nnjg9zwrc6p5qy2mq32jirxz29wpa0c";
+"aurl.doc-2018"="13g1jz1510lipg3v2m4zpcz2pzi04fyc";
+"authoraftertitle-0.9"="6mqbsmy9gg6qkwgihzapa0xnlqyscz4z";
+"authoraftertitle.doc-0.9"="64j4gkrz0i7bwah7s3dazi1nanw6dfby";
+"authorarchive-1.0.0"="j3wmp3gk3460gwyfq0d8dlqsx6hwnyik";
+"authorarchive.doc-1.0.0"="k165v6r0jwi5xz23la4kz542rr5b9vrq";
+"authorindex-2018"="khcqpf8rh3cqb9fk2wl35lvp1fs3k2nw";
+"authorindex.doc-2018"="vrlqni24vz4wixqr83pkin6j02vxgz5r";
+"autonum-0.3.11"="z0mz6nrw3s9661lc5s983bj7qpfg9ns3";
+"autonum.doc-0.3.11"="ghxpr5ayzxq1w6v3wy0hqvkfy28n9slp";
+"autonum.source-0.3.11"="5fm5vfmi11jqdgqklj6zmc90vw3vqiqp";
+"autopdf-1.1"="01rm3dax4wa3pbj51d8ryvixmdy2rcp7";
+"autopdf.doc-1.1"="dal0kcyj8y2ki3w0cprjalkb4770kyiy";
+"autopdf.source-1.1"="5pja5c4la5zvg8mvv9155y1rmljnk7j2";
+"avremu-0.1"="xk59ssazl5122hy7cw9h8l8ky47ac58m";
+"avremu.doc-0.1"="sp38mldllwslwxq2rvizcx1dcpfaava7";
+"avremu.source-0.1"="inwrrgrds8ympmhzgrk3m82x544x8nhi";
+"axessibility-1.0"="gb0qqf6a9al9hc8bpzsycf5z5cpkz6ch";
+"axessibility.doc-1.0"="k85q40a4sx6kvaswn7wmc97ijcs0v32n";
+"axessibility.source-1.0"="s80jv7nh2wcpbff2k5bshv8144pa7q60";
+"background-2.1"="akcsb7n8iyy4zlcgfp0ikwb5awzdnh9d";
+"background.doc-2.1"="inm76hq9brwc39n6bhp9782766mmgwpx";
+"background.source-2.1"="54l8p1yj06wlcwxrrmjqjhgmxai9l9s2";
+"bankstatement-0.9.2"="gz4wcynn22a2bg7hbdfa3j5iab5ak957";
+"bankstatement.doc-0.9.2"="4q9drl2qzrhqn5xg69sc4x6x6d9rk774";
+"bashful-0.93"="4xa5zrj0cfwm628cycqi053irhdybdj6";
+"bashful.doc-0.93"="d9132bwcay35ssw31rsrraq6b15wrzaa";
+"basicarith-1.1"="81hlw6p432i5ln72shhg2k976as1w1l5";
+"basicarith.doc-1.1"="3hskpplbm89xpzx8q0bajn7i3kxncig8";
+"basicarith.source-1.1"="x4qnlbc6v2dfq23ijrjhk5rcfjc1c2a1";
+"bchart-0.1.3"="4xxv8n13igfgl0n89wmxncp8662fx941";
+"bchart.doc-0.1.3"="11b1xlxkxzayb2a96w1svhba4pkchanx";
+"beamer2thesis-2.2"="64a0v9a7xr9yi4ffsbm98s058hkmq9wg";
+"beamer2thesis.doc-2.2"="5ypn90w572jlw04xi4vzk7pxxsf7ciwy";
+"beameraudience-0.1"="3zc39f4qsyqi4204k4a5n9pksf6gk3xl";
+"beameraudience.doc-0.1"="wkgcr8dyl8ywxwpdc5h8p96dsw9l229y";
+"beamercolorthemeowl-0.1.1"="7b8qfnqjliwvms89bn4mxhjqf8sppadi";
+"beamercolorthemeowl.doc-0.1.1"="dh55h6vzmjlxlwn7wz2b6c2c27c4qjki";
+"beamercolorthemeowl.source-0.1.1"="ppxb50mii9mgch0rzm26npxl99a93c42";
+"beamerdarkthemes-0.4.1"="nw30s7g9lid7b9vmabvnj3z5g22nxgv6";
+"beamerdarkthemes.doc-0.4.1"="kygvsh50b3zi88h51ajnzc3c0xyzb5mh";
+"beamerposter-1.13"="cd6wdcxrci6lc2kj195bwsi5yfddk3zw";
+"beamerposter.doc-1.13"="1hp6dbynh3gbrn6gsz54rihdzzr8pjii";
+"beamersubframe-0.2"="m8capqp9nc8mbi9xdzkz89nnz41972v4";
+"beamersubframe.doc-0.2"="y5m8y5zkbzi553hp8maav6g6a42iklfr";
+"beamersubframe.source-0.2"="kw2rnly2zyqw1ap5g9gkv2xchpvbk7gr";
+"beamertheme-cuerna-2018"="vrgqfiwzbf1082zbj8pvn53dmx77qi4f";
+"beamertheme-cuerna.doc-2018"="jcxa5vs5g4nwgck7913jb2jnxccx2y3f";
+"beamertheme-cuerna.source-2018"="lrn8am3h8x2ic39ghpkdl9bxsp07pdf6";
+"beamertheme-detlevcm-1.02"="25f0c66nnhq9r0qrqf186rwqvifzi4nj";
+"beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047";
+"beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b";
+"beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy";
+"beamertheme-focus-2.2"="r9vhg91kvzg4n3998szv58haqq0g5klk";
+"beamertheme-focus.doc-2.2"="nn7p6vy5b44z58pva5kd9x3f41d7d6bk";
+"beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk";
+"beamertheme-metropolis.doc-1.2"="xvapcphzmylh2s3551bglqw712q82bxn";
+"beamertheme-metropolis.source-1.2"="5gmm1q6xagbavzzxhc9750yb3bhxf3zv";
+"beamertheme-npbt-4.1"="7f7y7bijlp1p9pzdw9vv64qb03256zqx";
+"beamertheme-npbt.doc-4.1"="dzjby8rnpsgll6gvab9cslziqszhd4zf";
+"beamertheme-phnompenh-1.0"="01nbk38jh4hxk8vykf37x6bhnb55ijdb";
+"beamertheme-phnompenh.doc-1.0"="p0nj4cqg4vaaq6wlycicz0xbl7391lwp";
+"beamertheme-saintpetersburg-2018"="jkhmvyc96zm66cmfjl1fvrnz86a81zbp";
+"beamertheme-saintpetersburg.doc-2018"="9msrd7ylkwfg6ijdx3rddcl143p17383";
+"beamertheme-saintpetersburg.source-2018"="16hmcal8wb74z1qdi5r46w36w3n87n6z";
+"beamertheme-upenn-bc-1.0"="i535al38gpn0j6mhixm5g6vnlj7gi957";
+"beamertheme-upenn-bc.doc-1.0"="s7wxbnlgqxwpabb06jc5nawxm40bnia7";
+"beamerthemejltree-1.1"="iqjiwv4v9vp84a3cjjmv5gxygyclw5c5";
+"beamerthemenirma-0.1"="jix18byykz4n2mqcipf60pskfjlj3ini";
+"beamerthemenirma.doc-0.1"="llvppchvbd0zz9cl3lpswghs8hjm78rq";
+"beton-2018"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j";
+"beton.doc-2018"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5";
+"beton.source-2018"="znwrdd877gdwmsiaxc9v8pczdw21wrb8";
+"bewerbung-1.1"="kb947mnv03wjc8ja8k402inijnplk1vy";
+"bewerbung.doc-1.1"="mv9vrqp8g689cvbwpm3xkczk98s1blas";
+"bewerbung.source-1.1"="w8z7h0w0ld2dd88a0yhp6p6md8hn7kkh";
+"bez123-1.1b"="9lx6fqcskk9lj28vcfhfnkmjb9dhlqdh";
+"bez123.doc-1.1b"="s5s834dhxqlqc5i8dswvayhf62chrqbh";
+"bez123.source-1.1b"="fsc7gqwcbpfjlhn0bljq7l0jd8g6zapd";
+"bezos-2018"="xfvg3ykycr5dkmi1xc6h66g0a9fiah5z";
+"bezos.doc-2018"="6g6lwlra53qn9jh13sy28gzjxn5gcyr4";
+"bhcexam-0.4"="1px8zypnmrvi26ysrplj54pdz67ajcs5";
+"bhcexam.doc-0.4"="ksq01g78a489prh8lrrs0nn9k5jqasvr";
+"bhcexam.source-0.4"="ra3418l0mjj31jrkss9fysd4q1h3bdqn";
+"bibletext-0.1.2"="l1xjz1y65n8788jhskhb7z74fs8azjxr";
+"bibletext.doc-0.1.2"="z37aix7i7hm3rg581np1mi67dn5agl7x";
+"bigfoot-2.1"="i4hdv09y0blcrbhk554ilzc70fv19242";
+"bigfoot.doc-2.1"="ixi0hkjrzg740q3pkp9lwrq43ab1f006";
+"bigfoot.source-2.1"="jp9h2p1j46ha7ksxvh3d6rmxr0832r1w";
+"bigints-2018"="6ig6fmxy6wj6k3yc4x9s7b18xbfxj4kp";
+"bigints.doc-2018"="jyxj3risms61j5aazx9hkxxfwbg6nyzr";
+"biochemistry-colors-1.00"="fvz3nlqi6y12g5pcyh118l6vjbw5kz2i";
+"biochemistry-colors.doc-1.00"="r7n07xkk4ixxk9zhz3ffkg7kqsz0i8fc";
+"bizcard-1.1"="l59w5wy3djx28g5yw2ywagi5am258bry";
+"bizcard.doc-1.1"="yallp1mh43m9224sqhzg85ylymiib9v2";
+"bizcard.source-1.1"="z70q003l3pmi9p0z0a99f2bz0lxkq2y9";
+"blindtext-2.0"="5xyi3x46b5mvl2zr925m0dz7z9qqgvn8";
+"blindtext.doc-2.0"="h3p5d9pr9h362d8jqq4lv3dahcfs2rnq";
+"blindtext.source-2.0"="dr68k54p44vgwp3rw9d1khc733k4apah";
+"blkarray-0.07"="djcla33mmskp42qbf8qg053p34515x1a";
+"blkarray.doc-0.07"="7iy0ssb4spk30f5janvknnhl91csvmyk";
+"block-2018"="b75bd0f6imd8svp869g4j3q2q02pilpp";
+"block.doc-2018"="gza7j45w5qixk19px05wr4q67m4lzhkl";
+"blowup-1.0"="zhslxr7v04yhkdssranpiwpql9z7xsrf";
+"blowup.doc-1.0"="paw88yvcal35rq5wpfxm5s9hlsyz6z86";
+"blowup.source-1.0"="kmbxfjca3pwppfhklyhg8k5ddkxg8r43";
+"bnumexpr-1.2c"="0yvkvlhmgizwlw72ir99c3sbfmba3s3p";
+"bnumexpr.doc-1.2c"="qnnibyb1085vhvbfa403frfnsksfg4kv";
+"bnumexpr.source-1.2c"="dsivxd8fcjy3bgj77a4wr1jc8zhs4fmp";
+"boites-1.1"="nccwd0yxdm5cr6razvwlkrrb5wxxj1i2";
+"boites.doc-1.1"="q3mcdfg2afqm3w1zhbcb1bxzwqgp4s3n";
+"boites.source-1.1"="vcfgm806kvw3z466j5kimj5wzgaywv0f";
+"bold-extra-0.1"="0kr4p0z1bfng2sindvkk7rkfzm863qmx";
+"bold-extra.doc-0.1"="czal2y2szfldrzkn4h0aj6iwjk7gpifk";
+"bookcover-2.3"="mcs63f0cb9qvma487xqrym0a0p5mfli6";
+"bookcover.doc-2.3"="9zwjwl5k3i02cgizw0gf0j0ig46l5jc8";
+"bookcover.source-2.3"="jw98c4wikxgaj2vaykw25azy189q877s";
+"bookest-1.1"="70j4zrqfn4cr0qg7dhdqainy3pxxilg0";
+"bookest.doc-1.1"="3cbqgyzvm6zvzib6jhgdyy7mcw5p75nc";
+"booklet-0.7b"="fkicb41vlz1m3spn6jf9g1dk28f22v7i";
+"booklet.doc-0.7b"="c8y8mxy7hv7qmp7a8bib37vi3xy2pfxx";
+"booklet.source-0.7b"="h46d62nvn4gnnj26bkd5h8m22s0jld8s";
+"boolexpr-3.14"="acxia88jpd7222wvkr2fwxr48vl33nzz";
+"boolexpr.doc-3.14"="n6rs3hgfaz36fblsz28pshnlhvj6l51r";
+"boolexpr.source-3.14"="gbggikjrx8p47w9zs921k16qx8jq6gd8";
+"bophook-0.02"="l3ljpnwkgsrb646j19kxb3qk51azvzz5";
+"bophook.doc-0.02"="nkpvwq471wzz69vlrwhpvsfcz6w9fbbc";
+"bophook.source-0.02"="s9ybhy14wz90vlffn96y0bzh9f9202p0";
+"boxedminipage-2"="rafdlhvk5v8c9r4ajh4iy32x2r2lpv3p";
+"boxedminipage.doc-2"="6bjh7glkpkpfzsmn9np9ldhk5gsv93cn";
+"boxedminipage2e-1.0"="vrria5lbnyz2gywww0hg7cqm14mzwjmi";
+"boxedminipage2e.doc-1.0"="hmdvly5576aynqybq3p47520x3cjjkgj";
+"boxedminipage2e.source-1.0"="qywgphrh766880xy4xsfs0p1g0fvkpxj";
+"boxhandler-1.30"="j2q8bm858c8qm335w67g0kr82vnigjjl";
+"boxhandler.doc-1.30"="08260asli77clnhfnj1fxff5bbgicac7";
+"boxhandler.source-1.30"="0s647gs05wi22qcrv2zsb8x1713yhf1w";
+"bracketkey-1.0"="4l5l8s1xcwhlkaq50spccp2z90lm161f";
+"bracketkey.doc-1.0"="500h9kzvrkkqj22622hr4a78d6mz94jm";
+"braket-2018"="ck5gh00qn839wsxy2qili0184vswy0br";
+"braket.doc-2018"="mqckibrwr123hhda3fnbf8wrh1d16bxy";
+"breakurl-1.40"="lsl2j1iflzhwwapb03s5hg137rynjjhl";
+"breakurl.doc-1.40"="rjyrmhd32w912qg9wd4qxc9q46kg8qc3";
+"breakurl.source-1.40"="lpxb827p465qc14c38rk14jrzag7jfq6";
+"bullcntr-0.04"="w4fxp9fvpbg882yb855sl4b6w8fypiyy";
+"bullcntr.doc-0.04"="l1p8zz226qbnzmx4n78xhjsrc26z7jxw";
+"bullcntr.source-0.04"="6lw02qi8iyp3qph7yaycfm5p1q6l71r3";
+"bussproofs-1.1"="v0s3q29bdab23xi07f123bq7gzc2i185";
+"bussproofs.doc-1.1"="6cnd5akpxdcq2q82n7ph5lvmb94ql8sa";
+"bxcalc-1.0a"="2rp7llfsbmsq521zm6kg9y0adrg5vq0b";
+"bxcalc.doc-1.0a"="8ha2i73lx8zhzgwb94wk3y30y6s1c393";
+"bxdpx-beamer-0.3"="q07kpnmln2v70w83z91vsk53c0i63x02";
+"bxdpx-beamer.doc-0.3"="8ynjsgbyifkvz27qp8j4nrfk3pryphdf";
+"bxdvidriver-0.2a"="f6ndmagn10ax4hpmlia649f7c14hjkgx";
+"bxdvidriver.doc-0.2a"="lg3m3lw08iizdhdfjqkh91wk5ma43825";
+"bxenclose-0.2"="h4cay0x5nq4xwqpaihbvyzhjxgsp5fwn";
+"bxenclose.doc-0.2"="9i72bmx63c76m7gc7qavv228g1afrnq7";
+"bxnewfont-0.2b"="42kvrm0ag8zrxavfijin59k9sg3akhhp";
+"bxnewfont.doc-0.2b"="wxkcv5hklkzxs3xsw28z0bknq0sjjhsy";
+"bxpapersize-0.3b"="41garkjgw98adpn761lrj849y4rzzi2x";
+"bxpapersize.doc-0.3b"="j6scsfx0fn9yd5illwnw41j8f17k18ba";
+"bxpdfver-0.4"="rcizp6hg0bir8rf3njqc66kjcm7c9nic";
+"bxpdfver.doc-0.4"="nj6cpbjw4paw12ggkxg28nm1wj076dlb";
+"bxtexlogo-0.4"="5czz5b638x3h3gpyb2n5si8py53gwl9v";
+"bxtexlogo.doc-0.4"="51msprgb7p49x3lhk4cr65ay7dpzq5d6";
+"calcage-0.90"="4yzr1l7jhng80xs4n1vavaks3d8cjr49";
+"calcage.doc-0.90"="b4vjy0d8rz4jhhw4vimfdfwhpqx7sgck";
+"calcage.source-0.90"="x42rcz3r7lphziii9v8vgv0lm43ymj8z";
+"calctab-0.6.1"="vmm4595955mrf96s3i77mk120yj527y6";
+"calctab.doc-0.6.1"="98qbw092f77rrsk5w8vbzm4hln0klzvk";
+"calculator-2.0"="z44sdp5jlkqywi01c1x7ly2yvzkx1h9w";
+"calculator.doc-2.0"="dwb0bhngsn0xk56gnil8wbaj5dv7v0yr";
+"calculator.source-2.0"="3m4b364wkgfvxyc8y20rg8c7rh22rhyd";
+"calrsfs-2018"="cq6j9glbxrl31xwx7k5s8ayispn82vfx";
+"calrsfs.doc-2018"="avw2hw984yx1vsxayn96nzhgqcfpz90r";
+"cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188";
+"cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd";
+"cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86";
+"calxxxx-yyyy-20.18a"="p47zqkgg9niym39xr36yk1d6cl6yni5b";
+"calxxxx-yyyy.doc-20.18a"="7fn8c7smvn0hhkkgi0svm098wi3jpazx";
+"cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn";
+"cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf";
+"canoniclayout-0.4"="hk30976j3lql00w0rj481p8j6z5v69yk";
+"canoniclayout.doc-0.4"="gyr8yvdm21p45qqdjin8abq3v0kbh1lw";
+"canoniclayout.source-0.4"="0bqpq8mn7n7223ay0gfrq3dcpfzkxalc";
+"capt-of-2018"="qmph3ai6555l904xk4q6sy4jml5l6nqb";
+"capt-of.doc-2018"="bpa4ll7afaz43ysz8m7q8fs8klvv4h4k";
+"capt-of.source-2018"="9rjjpf1v8qg3v8j27rn8x3b495lddicd";
+"captcont-2.0"="5s81zvby8iq2l0j4bkz99s56w0kvc5pf";
+"captcont.doc-2.0"="ivp30a2jxrnp8zivmdm61nn0i25kiarz";
+"captcont.source-2.0"="bgy7jzbckqnajp42hy4x31dvb01cjm7s";
+"captdef-2018"="gx42x6flbn7jdbrbqzsn8csgi07ij4k0";
+"captdef.doc-2018"="fykmdpzxx24x66iph3rrzj0sc755y4nh";
+"carbohydrates-0.1"="x4rj3x70sfcdgq8sd8yv2486khxip4wz";
+"carbohydrates.doc-0.1"="lp5y1sx5s74px1x03366lpn676vhl6c9";
+"cases-2.5"="jlc3flcfb7ckwr4320n9gxmv2y7l4d2f";
+"cases.doc-2.5"="rx6wbfbbkrx0gjx1dnpfx836wk9r9jdx";
+"casyl-2.0"="4px818jfrl4q6fs2p7sabq1pihzvnsw9";
+"casyl.doc-2.0"="dcw7gljkwgkgsv1l6g6680mawm0x8sby";
+"catchfilebetweentags-1.1"="4yhcz4rv10s3si8vrbn4ac1yikmvgamk";
+"catchfilebetweentags.doc-1.1"="w4zpyb3a2gwlws0as6ifmi0wcnladgi4";
+"catchfilebetweentags.source-1.1"="819f4z3q4hnbng7hbifk1kd4m88xgfnj";
+"catechis-2.2"="5sd1m14g0pnpyakyqkyr1ckh59al848a";
+"catechis.doc-2.2"="krjvj34nhbwckdnpjd5gi1hy0hq0b72f";
+"catechis.source-2.2"="4fdirxwslp6d5n4kbwk752dwajlxbyv3";
+"catoptions-0.2.7h"="40b95bmcg7bw5ndk3pmqqxjq5j8gy1fp";
+"catoptions.doc-0.2.7h"="3yvgf5pzh121hwzlfqjqmylassr8h6cb";
+"cbcoptic-0.2"="rqw0wq5w1hxq7241skb9b26ixnr67aff";
+"cbcoptic.doc-0.2"="b818cvyjz7x0a05b5k36815w4n5ij43r";
+"ccaption-3.2c"="4l3kxgc46z9i4lrm479ghpv7d0077l07";
+"ccaption.doc-3.2c"="qm6lh4nrdndp4vivy815ajpj9jj4w433";
+"ccaption.source-3.2c"="fdfpz99x7z4avqx1q4nrydg3r4csq4fr";
+"cclicenses-2018"="scxyv1a4lh05mfgbs55rcg40vbfyvvij";
+"cclicenses.doc-2018"="17zr0mgalzfnpayvzym8hri1yfz8c6xa";
+"cclicenses.source-2018"="hgm5y1054596k129p6j4s86kv0m0ky76";
+"cd-1.4"="34nj75mgz2mzxjbmpik2kvqhmwdmbw71";
+"cd.doc-1.4"="i7230mqkczs0b3nczmf3gkv8z0bx61mc";
+"cd.source-1.4"="h5plih2dk6kk9klc7lwv5gpx88apljlj";
+"cd-cover-1.0"="vl1q321ziyyiybwjsvaq9h11b69xxi72";
+"cd-cover.doc-1.0"="06rjy67nvlvlnlz9dr9xa3cg22ndgm3j";
+"cd-cover.source-1.0"="kyc8pdbwj8r1dzri0wwqss5fmqkci6cf";
+"cdpbundl-0.36d"="hf7h2yz4c0nydnrhdwl5jwxbzhqxv7mk";
+"cdpbundl.doc-0.36d"="5csmnns276bpm80l1iipvanggljgjq6m";
+"cdpbundl.source-0.36d"="hzg9ax2jn65b0rq2afqfxh1pk1rcvlg9";
+"cellprops-1.4"="fa9k7sirw5w4dfki3dc0sg3q769xf3qn";
+"cellprops.doc-1.4"="dfvh3lasmqxms1v410gnbzrdcqlsqa1l";
+"cellprops.source-1.4"="4ffh744gg8b0ba5rxkfbcdhnib0fcs7a";
+"cellspace-1.7"="0grnmj8yywvqmzvil5qdqqz86p0pxsch";
+"cellspace.doc-1.7"="00nzspr8m16s0wqs6q1v82gn40yj45jk";
+"censor-3.21"="a5anc6g425g9f6x6ag4d824y659dlw16";
+"censor.doc-3.21"="29ayn0qp9hhc1zx54xicn4k56xhkj6y9";
+"changebar-3.6c"="76f70hw5065zfzmvbkrkia3ih5jhhkjq";
+"changebar.doc-3.6c"="310sfxf3nzqrrkcp2n794kpn4bzv9b3b";
+"changebar.source-3.6c"="xi3ldcm33mq6aa4jad2sfv7g58kwg0p3";
+"changelayout-1.0"="sx1afd6zrrl7jk40van0mwbf1ks7z6fk";
+"changelayout.doc-1.0"="lw4yjf3h1r2qr24b3s98rkm0r3ybdwgi";
+"changepage-1.0c"="s3dd0v3z0g8v74i6cnasyaa70wnqiimk";
+"changepage.doc-1.0c"="g63jqnyrkc74dd9ksi0s7pbxq7s4dzwb";
+"changepage.source-1.0c"="0ck3lyl2kzvm1182hmw88ni48paff7aq";
+"changes-2.0.4"="2v7wbkgk8n9pafgapjs6glqbx943s257";
+"changes.doc-2.0.4"="zgsp981wnjs758wwf15l8hlh5vrd7zx6";
+"changes.source-2.0.4"="74ahc6k7qb1vyackh39xv57ak0pzn9z6";
+"chappg-2.1b"="231kpsvxwdnmakq4mkca0nisqdl622n2";
+"chappg.doc-2.1b"="nhh2f6k2z5gh449b91fmxnvh359n9adw";
+"chappg.source-2.1b"="74f8nr6m6ssdqxynrxl2y4za3rmj9sd2";
+"chapterfolder-2.0.1"="n1iyz86gz5mb7ixn2kd48i0rgj28d7sr";
+"chapterfolder.doc-2.0.1"="cq3fgi89g5j3l8pjmgb9f76ly6ykdviz";
+"chapterfolder.source-2.0.1"="v9hlnak7v7s4bi4942gc43hh03zy33d7";
+"cheatsheet-0.8"="dbp6g9c967pc45wn345qm95zns815kl0";
+"cheatsheet.doc-0.8"="s3h23qpv0l6hn9bqnrzyiqx2mv4bzxch";
+"cheatsheet.source-0.8"="4x8njfgq1scmiqnkx4xvgxinc133a4vf";
+"chet-2.2"="g654s58dhkxsnzbg59zydmncldn3qklv";
+"chet.doc-2.2"="4wc8nmj6lprpqhm5a067nsm00y56pzmi";
+"chextras-1.01"="mc1ymd3wfbwash00ly9gxk6hcx9rl4lk";
+"chextras.doc-1.01"="9rl2yhjmafyp430avjf0dmdmmgb45x01";
+"chextras.source-1.01"="5a4dqp8jyaq0bi98q26mskbpmp1avb35";
+"childdoc-1.6"="ry200jlj7l705szckaapmi8bg9j0wmda";
+"childdoc.doc-1.6"="m4fh5c8payci78q3bs8acrasy5fzssxf";
+"childdoc.source-1.6"="695q8z2dgdskaxjh1cqz9cac1yfb0na0";
+"chkfloat-0.1"="m48shpd6qvgscba8rz3dpkx0blzfiw13";
+"chkfloat.doc-0.1"="1l3anr2pkpq0h4wpshscrxmcdj80q6i4";
+"chletter-2.0"="9nvpbffnfn080w6pkf4xv18vwsvrc2z6";
+"chletter.doc-2.0"="h2qv6i4cc4yss3iv9jxwfa3w08h9gsk2";
+"chletter.source-2.0"="q76hqgvq8mjc9zqnxjxlk379gqlm0jgr";
+"chngcntr-1.1a"="pn9hpnfznijphqk5qb064ksyxabhhcqp";
+"chngcntr.doc-1.1a"="7612bvrx1f1ai3q5pwgmkpc33ip4adhh";
+"chronology-1.1.1"="jsrsagv2imvc5hz7mgbqdkdqjih66rd4";
+"chronology.doc-1.1.1"="m8psr1bcvmmi1qyyw0j8pyhy0bsgsvdj";
+"circ-1.1"="i0wnc7sxhx96v3jnnsv5l6i5nzvp94jv";
+"circ.doc-1.1"="v5g8hhvdn9xhqp9r1k9xahrnc0yd2a3l";
+"circ.source-1.1"="j3hksz3r2pa1y4m7kw2qwzm11j7a4za3";
+"classics-0.1"="kpskmb202fj06y3glw5f7m625q6zp4c2";
+"classics.doc-0.1"="ysdwq12pmmxanivxl1j5nxbfh1aw0vz2";
+"classpack-0.77"="dybfkvi6ykzw4s03xgz8r7n88xir9zzb";
+"classpack.doc-0.77"="390v2v6vabq679gr2yqvmyq26x6l6lz0";
+"classpack.source-0.77"="mr188ykwygc0gsznl43vlbx33wa2imyd";
+"clefval-0"="291n2xdsripyiq6zskxqdca5gn3ajfj5";
+"clefval.doc-0"="s9mvnhb1w1q61igbrvbn4fi4hannpx2v";
+"clefval.source-0"="l73m1k6wksnfqwd1jiqjksvdpwwp9k1q";
+"cleveref-0.21.4"="cl7sns14fh7jw87sz45rf4v2yrwqyh2g";
+"cleveref.doc-0.21.4"="9bz4rlbh25z2csnngs9ij9mrqazfq2wr";
+"cleveref.source-0.21.4"="7kvgpyz07knv09q52aplizs5zk455csy";
+"clipboard-0.3"="flll7lf5hy4hysxg3ppaq8ygzqsan82y";
+"clipboard.doc-0.3"="n4lc7mbwwxahicb51214fzgh5j2iyqhs";
+"clock-2018"="bcsbr112z4np0wszh3dwv9h5l8w11bvd";
+"clock.doc-2018"="prj65yh580yg74pckacsr432rki2nsl6";
+"cloze-1.2"="6aawammcpq8n2igbncbkip67ph5mapc8";
+"cloze.doc-1.2"="5lsz6hfblnzj9wjs7j43c07drsgv5mdc";
+"cloze.source-1.2"="x6gbbdxnvgfysjhv3xad83lfs9khg4f9";
+"clrdblpg-1.0"="rw9bphdh47x4kpwzil4pxvlpks1s4hz0";
+"clrdblpg.doc-1.0"="0brjv2dy10l0gy3sx6vjw3f5xq9h67bw";
+"clrdblpg.source-1.0"="7pcjrddv97fdsljj752n5gh9mygyl1ph";
+"clrstrip-2018"="4iny2cwcp8aax80z280naj91s9kqvddi";
+"clrstrip.doc-2018"="3klsbh6mz9gk43b797yd5mbrd8h0k0i2";
+"clrstrip.source-2018"="cz8pp48i9bz8xkdfzw7jav00r2sl899l";
+"cmdstring-1.1"="mzw3hf7xhy01j9irvvlba90hb0065p1r";
+"cmdstring.doc-1.1"="l2hjd47d6wmd07rnciadrbir01887nd0";
+"cmdtrack-2018"="1jw2c4hx9xmalis8lkz7lr4b38h6srlq";
+"cmdtrack.doc-2018"="0fniwn5zccpkypjn9v5hjl0baxscpc8a";
+"cmdtrack.source-2018"="hlqnd8ar2w2wyjr7rxi6qbi3mw2ppgsn";
+"cmsd-2018"="4b40ccv8788hg71xh6sv12gnzyy2q4rb";
+"cmsd.doc-2018"="j3bvhldqzjqf1snv9pbg7k39sbwl2ccj";
+"cnltx-0.13"="i7agvf6p3zbmpp0yy54jcz30yk5wgndb";
+"cnltx.doc-0.13"="bfzwcspv6kaizp2cngdbgps61w40a61l";
+"cntformats-0.7"="v6xl1mkldlf6265h96m2q0bylifxhl33";
+"cntformats.doc-0.7"="rdam48ljhih6v72gaa3394zlg8cwsb50";
+"cntperchap-0.3"="xgdrhbyll67dbw0xabqmrl2livxcfsbx";
+"cntperchap.doc-0.3"="y2jdwmpp6r1w17svqw9iww07pi3blbah";
+"codedoc-0.3"="gva56ykkkr58q9gxkff6ng0wd5bk9by7";
+"codedoc.doc-0.3"="8w9r3z61w026a0zqmbsilmf4q382bvd2";
+"codepage-2018"="y9xv0i4lq1nh9nav86b5j34rws8lln53";
+"codepage.doc-2018"="7rwl8dagypzj93xim0qj3gm56a24f8y5";
+"codepage.source-2018"="4955x5b5ddysnx8bksmwsqhj1jy83991";
+"codesection-0.1"="mnsfhjy6j2ypxiwmwx85w2k2zyw928pi";
+"codesection.doc-0.1"="s2kwd6brlwa42pvhpjasx84s87vmbz8j";
+"codesection.source-0.1"="j94xngba5c8r55idfqgy7ra3imzkmg8x";
+"collcell-0.5"="vw1ir7qzfyc8pc1z89y8zfhj7cs5yxz4";
+"collcell.doc-0.5"="86mkb3wz8zjsgpqgrn4azls054j27rcy";
+"collcell.source-0.5"="vv91p9mc1ig82bjw4cfd96ir1ndjx82x";
+"collectbox-0.4b"="2kxzzkgkgcjw80ff9n2mjnnfpxaxcdhj";
+"collectbox.doc-0.4b"="2xgqgni67w7q4ad0jqy4vr9wki08kn1g";
+"collectbox.source-0.4b"="szy9gprjqnkx357dca60120lvaiyyy8f";
+"anysize-2018"="0phqi21d8qz3ifadzfzyfb04v10xc46n";
+"anysize.doc-2018"="4as0n5cw5g21j1wy094gdrbw8pzdm460";
+"beamer-3.51"="6g82vzs3f6hrp3ws0d11ligibk2l4bf6";
+"beamer.doc-3.51"="csjkcbwj0iy5xsqmv24dnmldvjc10hfx";
+"pgf-3.0.1a"="2j88yrmw9ss4c39j1r7s5nfhpkf7x3vc";
+"pgf.doc-3.0.1a"="4c2fgj2lxmhw85ad2hnc5bajzxjg6v6x";
+"pgf.source-3.0.1a"="0fvi39isxzyyndb9x7awjv3qmc0bhb5g";
+"ms-2018"="ffg55s4fwk1r5lfv94wjw4f7npbvjpi9";
+"ms.doc-2018"="980rqpzi9zf2dn8aa891k4538rpzlq2z";
+"ms.source-2018"="ybpn3z6c8gw2jlbj3161l1gm6xxy85g4";
+"booktabs-1.618033"="5pj973c5lps8fzz4skmgik3892jii5vb";
+"booktabs.doc-1.618033"="kv5d1vbz28n5ifi1xnd4213q3dp55qgh";
+"booktabs.source-1.618033"="siz5pfb2skr927lz92dhhxirx44wsc8i";
+"breqn-0.98e"="6qavw7nbx6wsm84qxfilj9ah76isisrn";
+"breqn.doc-0.98e"="5b6s35kmasnhrnyzmqg2d04k2448nipx";
+"breqn.source-0.98e"="gmqymf8lwcig4sb897ba3acwd4i316dj";
+"caption-2018"="rglbcqx4cbb22a42jd9fg0d2dn13crba";
+"caption.doc-2018"="1nzsvqngp8jz9lk6dyscs5zw2q4p15hd";
+"caption.source-2018"="6kn48hbxn6l9zh6ngnrwixngcwi3ycid";
+"cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj";
+"cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx";
+"cmap-1.0h"="bky8rw1a9f00x6fzx611hgfcyf7d115f";
+"cmap.doc-1.0h"="c4d9810xs1va8kpbwaz53yb8111h7lq1";
+"crop-1.5"="kz5lcgz423v0gqbc07saa30623ah1bv5";
+"crop.doc-1.5"="k9prc7248mi5lrmjbzl0g7mkw4yafrz3";
+"crop.source-1.5"="nlpgsplmw5cckdd4ribmsdaa6jchjrwx";
+"ctable-1.31"="wd1f4k8s98g3lcfn825snbj9pvsr6s2j";
+"ctable.doc-1.31"="sjikmhs468fpx52r50s7qyjc4rkfb9r0";
+"ctable.source-1.31"="a3danbgiabx2z87nxkkcbvdb0l7fs0s8";
+"eso-pic-2.0h"="6wfvn1q4cg1ihjdpjbf9mfl07jmqayjw";
+"eso-pic.doc-2.0h"="3nyp8wi16hnbsnhq1mc96bdrnv10ma1k";
+"eso-pic.source-2.0h"="kyz7rkg9l117m0xbn1s8xyd0rd20722n";
+"euenc-0.1h"="fxp7k516ws4khaccirjxi8xszlif27y0";
+"euenc.doc-0.1h"="28lmb3y1m8dhl0n2r1gprmkrpxfmq134";
+"euenc.source-0.1h"="amsw2lpbcm2grnfch6cag6hyn957acv6";
+"euler-2.5"="32y9kxnr7zw4byr1zxsd2iqcfyzjvn42";
+"euler.doc-2.5"="g4bxh88pzc2872qk0w0sgapcaglal808";
+"euler.source-2.5"="8h1ahs9sbijdsc3xiv1rwv6k0vm9m858";
+"extsizes-1.4a"="g3j8wf0886xf7ww65zi6h8gmc6x4mk3v";
+"extsizes.doc-1.4a"="xb8w2wf5i3lvcmppbklpp1hxc12acj5m";
+"fancybox-1.4"="xlk6adym8ans599d0hrs0x5nbaadkls3";
+"fancybox.doc-1.4"="iwsrzmm34bfmddlg33mrmnwjy88rbcfj";
+"fancyref-0.9c"="0417hndq96cnldfbpc3hc1f7pyfqlscw";
+"fancyref.doc-0.9c"="wr3q5g6hjznnfcr9l5lvl8z07ixm1m8i";
+"fancyref.source-0.9c"="54cyla9pjr00km1djk4jc0h8ly50c8d0";
+"fancyvrb-2.8"="p2lpk6f8lrwa8gv07j1l0m83sqkdrdx2";
+"fancyvrb.doc-2.8"="1np0vw5dyrzz6a3d59jvrzbvvwi6ix6h";
+"fancyvrb.source-2.8"="g38dv0ix1c8dg3ijahs20kcwzw1lzdf4";
+"filehook-0.5d"="95km0y68ldra3ha3c3j83zlchg7d6xn6";
+"filehook.doc-0.5d"="xvrasdz1m52dsjzn3wv5hy1pdwka3msk";
+"filehook.source-0.5d"="il5yprd7hw76wmbb6xmqz9njhkqjqkz6";
+"float-1.3d"="dqksfsgqpc0vprkhfc6c9vfxlbrnn8sw";
+"float.doc-1.3d"="88hpzqh1011kwvwwm5bppb2gx6c9qqrv";
+"float.source-1.3d"="j1vp24g1lvwniahnd9vlw32c61cjswn9";
+"fontspec-2.6h"="d5a2icwhjh4m2h30516v5dgpn7zq50a4";
+"fontspec.doc-2.6h"="rw218c57rs5ny86whf3vfsyirxmy5m1a";
+"fontspec.source-2.6h"="fvrf2hhkn552b95y95i6fxl7kbxq3rz5";
+"iftex-0.2"="3amzn5jjz9l90w90rhrrq75shl1v731z";
+"iftex.doc-0.2"="n514jbc0x2jxsk39lhayr74xpzfgqvn1";
+"l3kernel-2018"="7pw66gn23ls4r2w98sa063iw9jv51icf";
+"l3kernel.doc-2018"="pvdw28i9hsssmjv5023flhrbwml8als5";
+"l3kernel.source-2018"="2wjdd159b888k3gl6a97kpgrd5a63c69";
+"l3packages-2018"="j7jm1caznagp7mdm9bls7p1zl6l74mcr";
+"l3packages.doc-2018"="1pgax9b4bs4h3jl08jgshbq9mjr7zzfm";
+"l3packages.source-2018"="mpbf5p96k96ic84kgkrc8ddnmjihxnbi";
+"xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4";
+"xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf";
+"fp-2018"="5nb3zlqbvs9n2i59y5rw7b5v4ypa6dj4";
+"fp.doc-2018"="cx0qn4l16ir6k92rjjxjxy9n38agfxii";
+"index-4.1beta"="qbh9vs69mrp2czw492icb71wbx4nzshx";
+"index.doc-4.1beta"="l3476by3qz0r0cn3lcbw006ay5p11naz";
+"index.source-4.1beta"="0i38dyjh6278hxgkdzy0wvlcbn2w0k7n";
+"jknapltx-2018"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp";
+"jknapltx.doc-2018"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3";
+"koma-script-3.25"="rh68miy3ais4iqhh79yw7vqlz7sbm4kk";
+"l3experimental-2018"="l0jjpfgfax2wr85dardf0l92wn3s20xl";
+"l3experimental.doc-2018"="848zpxx4259jhr3iy346gwsfx0s8kcia";
+"l3experimental.source-2018"="adf3pn715awli69v7f2ggj5hz5rdiarq";
+"latexbug-1.0d"="zfxinlwjxxz1rqb5ryfh87yfgd27g2ax";
+"latexbug.doc-1.0d"="cwsa9c4pp9q6w0kb003aqz72ydz3r5bn";
+"latexbug.source-1.0d"="lkf2ykr7yj8aw7g7322ivhr9a7qcv2d6";
+"lineno-4.41"="kvbdigwxw4db752kssgdb8rlxhljkkpm";
+"lineno.doc-4.41"="cfnil0v0isahd65d1sly2kr29w38h535";
+"lineno.source-4.41"="w30n8z3rnrvzpfa1d1s7mn3rcj03s892";
+"listings-1.6"="r7c966s9wlhjz29xgpfb4v17s07kwbsm";
+"listings.doc-1.6"="xc3xnzdv0vxhw7zgpxi6yk52bbmk271y";
+"listings.source-1.6"="l4a55gc3ilikmsfcc45x8faa78938303";
+"lwarp-0.58"="2xmfdagidcmhsiwhdy0dydw9qggdip4w";
+"lwarp.doc-0.58"="bn58h83apsr7vvf95xh8s253fhy3vbsf";
+"lwarp.source-0.58"="ii1ibxf8q0vm1chyhnc8fkbyvc8dd0b2";
+"mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0";
+"mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh";
+"mathtools-1.21"="j83lp7dmvyrmrmb1ii9xvfgnxjciqq5a";
+"mathtools.doc-1.21"="0hphh6ki9ndmn3kwxyn9xw3qqacs6k2j";
+"mathtools.source-1.21"="nwzvsz16kynk9ir83fgxm9j0s754dfh2";
+"mdwtools-1.05.4"="fbp8vrgdzc2g4i27m9f4qcsr8yjlbzg3";
+"mdwtools.doc-1.05.4"="jb5r95gmlqj1bx19gbkvcm372ina3bdy";
+"mdwtools.source-1.05.4"="kcm853bwwv69vb5zcmikd1gmpcnhz9pw";
+"metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv";
+"metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh";
+"metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm";
+"microtype-2.7a"="cqjymkpz9b5h7m1dpc9srxqg96w2fakj";
+"microtype.doc-2.7a"="2ggf95cm8dihlzyh6wqxxckqhp81rh1w";
+"microtype.source-2.7a"="ii2rh93cl284ci6l75rkgrz6jgirhv3c";
+"ntgclass-2.1a"="z5fz8hxig5gp5ii9780b8filsbk7qxyq";
+"ntgclass.doc-2.1a"="900yw3bcc4mdycknaspf867wm8fc3g7b";
+"ntgclass.source-2.1a"="rqd773gdvwmrz54igqz6qz54z4irajvg";
+"parskip-2.0"="93zjzx0cifz9lzdsdlwy3z46psp6nfzn";
+"parskip.doc-2.0"="v4ddahrdxf1qf7xsqvfqkzrzg3pj7zgg";
+"pdfpages-0.5l"="sb8n59whchnf3xl3gz8hwwgmihpvpz68";
+"pdfpages.doc-0.5l"="qgignjcc966a6gbx967js7lqx10fr230";
+"pdfpages.source-0.5l"="vv4r7sr23rlhp9jiihajiys8w87fxci0";
+"polyglossia-1.43"="r9rsxi11483kib89mynp5wjjp90f58qf";
+"polyglossia.doc-1.43"="2isfbzn41hz4pk5hdrpkpyj0cam8cdvm";
+"polyglossia.source-1.43"="7sn9bkz24275nxqa92d28y0xj6c3xpny";
+"makecmds-2018"="anpaqglvl5rmcy8r2q0ap8m117nsx89q";
+"makecmds.doc-2018"="39zxaxxqlmps1wd4rjy42a1hk027n06v";
+"makecmds.source-2018"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6";
+"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4";
+"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc";
+"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f";
+"powerdot-1.5c"="dq53xc4c6n4qpxcqkdazwn6b8v8z94f7";
+"powerdot.doc-1.5c"="ph5p9y3knn1w1hkzb79kdxcwkg6fhrbs";
+"powerdot.source-1.5c"="245bf49s69vlxk1f1mlbdyfhx68icgpj";
+"psfrag-3.04"="k8qyr0l3fsc4insyy1r6q596dq4gf23a";
+"psfrag.doc-3.04"="ybb4r3w20w1pcjwzaw0srpkx5c19rqg7";
+"psfrag.source-3.04"="xk135sb77fk6l9wz6fzifsjvchcqyj0f";
+"rcs-2018"="4lkd02hz1x9zkxnh247wmwy6n9pg4pyw";
+"rcs.doc-2018"="m1lw85b793n2nxywdi39fg438i6kif7x";
+"rcs.source-2018"="iw4nn20q54s2d4wdyby7n03ljcqrjmig";
+"sansmath-1.1"="yxyny4949h4hm4ajn673nzzw8wn8cba8";
+"sansmath.doc-1.1"="b8vzdmm1l2x7cyc15xzhmwjkszlsp2j3";
+"section-2018"="69anwmylbk95jbgr8645abp07ygv9f9g";
+"section.doc-2018"="ri1gsrpfp94rp0dc90djj1kgpka2p5gl";
+"seminar-1.62"="z9nzymppz6hz3lxy0nliqvy5szq6jk4c";
+"seminar.doc-1.62"="23fz6p4ybl42rmr1m3fllg7qn1zbmfki";
+"sepnum-2.0"="x64bd0f3g1x0bcpdgd2lfspr13jyxvcf";
+"sepnum.doc-2.0"="l26xmi7n5vabfpn0lfn3cjzn1wj6lj5n";
+"setspace-6.7a"="jyy54q9bmx158j0cnpwqa43rzvkm4wq6";
+"setspace.doc-6.7a"="xzz3kqsp4ywxmjdnchkmdv2jy4mkbfvc";
+"subfig-1.3"="sbdadp9ya32w2h8f484zwpmpln2zi4l0";
+"subfig.doc-1.3"="y5g4iadgvkfi144zk37fww79r0smsfk4";
+"subfig.source-1.3"="3xn4yhi29m77001w2hy0s04svik5z5xx";
+"textcase-2018"="5a82axcc916n61755cafcqcz3vb7w27h";
+"textcase.doc-2018"="b8iq4xf229k6p8s0b38br9gncyqhrlxl";
+"textcase.source-2018"="xlgxjkf93zrwdhk44zmxazfqg1yw88pa";
+"thumbpdf-3.16"="h8ssy495zrgwx10wsb9bypapmhdnvn5k";
+"thumbpdf.doc-3.16"="fqbyfy2ip2ayd0a0fwkg25jdjcyprkdv";
+"translator-1.12"="zywqgzzdv9iq5qh14himidbswp4rg553";
+"translator.doc-1.12"="cwf0r8gq3ivpyiclm76dnyc42zzkjzm9";
+"typehtml-2018"="rk5lpbaikavkp0shg38cdk5b209wx3kh";
+"typehtml.doc-2018"="292x26pw24azh4zdwpy6sh3f1ksk8r2x";
+"typehtml.source-2018"="96p79dyy553b4mc01ihk7qgr11396drn";
+"ucharcat-0.03"="d445ic6gwl7d5d31s691vr63f4hn76dz";
+"ucharcat.doc-0.03"="ma6rz3djr9v3q5p8ffqyznjb91gjj5li";
+"ucharcat.source-0.03"="kh9cnzg1pn8c51bbph2amp5y1j85q38h";
+"underscore-2018"="b7kwk1zddr5a19mcw3yxrp9pffc604x0";
+"underscore.doc-2018"="gwqnbwqn6vjizs1xqnmbv8fmcrs274fr";
+"unicode-math-0.8m"="1frq3m8d343h31nafm18nz6xyj5vz6jn";
+"unicode-math.doc-0.8m"="3hzkavhl9pqswcb5nwk6anpgcpqcx0vb";
+"unicode-math.source-0.8m"="ji8xpw0n8h0kwsksrbqblmpjrzk0ipfm";
+"xltxtra-0.6"="gr3v05m1pm9j55smbfy71vfn3kg1kpz4";
+"xltxtra.doc-0.6"="0zsznrgvzqcfi0ypxkbk3vqslwyap7l9";
+"xltxtra.source-0.6"="cw6kmfdgyz9ds3gdjlgy2bh16i6fxip7";
+"adigraph-1.5.1"="sh7y23kpqm0p4xgxyxdaandy2h89p8x2";
+"adigraph.doc-1.5.1"="73dbwyf9blp8s0d7r3yarmb6r1ifl90r";
+"aobs-tikz-1.0"="klfbwfabfx6lv1pk6kz3vayabsnphvrh";
+"aobs-tikz.doc-1.0"="qh43c30d1xpyl4rbazp4kj8p850rdxwb";
+"aobs-tikz.source-1.0"="xgmck3vrplx5q6blkm6yg2njgkk4k5bz";
+"askmaps-0.1"="4bm7q1w9sz28mj7v79gphh13rlz1ny3d";
+"askmaps.doc-0.1"="dp5c0n7vk509bhwhmxi6wvshz45s3fix";
+"asyfig-0.1c"="61q9dbbmirr3q1fncz10fpvqr68kj3zb";
+"asyfig.doc-0.1c"="1ynfgvq1hvwl8dflmf5vchv2xhmr8511";
+"asyfig.source-0.1c"="2403n3a1pa3gbrrs919rj56jcy4klyz0";
+"asypictureb-0.3"="gl1hc876saxilin18y249r7zz496yk6l";
+"asypictureb.doc-0.3"="9fn9i5plddqx2gxpjhx2m5n7jrwrk9x2";
+"asypictureb.source-0.3"="mskj52di031bhfjir3f7cd5aqwwz7cn4";
+"autoarea-0.3a"="navp9i0m8kf8zqhk4x1avirazzrsgf83";
+"autoarea.doc-0.3a"="zh69glasmj251qwrw6pjrshprd6x4hsh";
+"bardiag-0.4a"="vh54valkzncvzlx8y58gzs3k5jq66s69";
+"bardiag.doc-0.4a"="576s5nnqvq13rjnnn4l2d1g1rnd64vvn";
+"beamerswitch-1.3"="vjpk70y48n934pclwbqpwwad0si60ix6";
+"beamerswitch.doc-1.3"="iqlvlh2jkhcb5sbj0iq2wrscil064gka";
+"beamerswitch.source-1.3"="kn31rfw214zrs3vn7k45pk4m8hn6a7wc";
+"binarytree-1.01"="xl1rqgn286y7hpv69bwja6c5rrbx29g9";
+"binarytree.doc-1.01"="7ihijqc33m3ydk77aw0qqqhf94yyrz21";
+"binarytree.source-1.01"="lk7v0gr502ck4z0d605z6mwkswqpmfyk";
+"blochsphere-1.1"="8sagm09ymgd1b2ls78rzrcbn6k0m63rr";
+"blochsphere.doc-1.1"="sj294bshvzlc77wi6mwv4pl0y73j311p";
+"blochsphere.source-1.1"="4kr6ra2cp6fm7r6xfrln38v06iwxqzaf";
+"bloques-1.0"="azx9imhipx08s8zyky9hzkwandvxwyya";
+"bloques.doc-1.0"="8jb9hv62wj4hi9scr78szdm990cqprvs";
+"blox-2.5"="0nv9zh53j52xnly5n28kywznagiy0crf";
+"blox.doc-2.5"="691idhcw777z46rw0azm7jplr6k0fhsm";
+"blox.source-2.5"="0w4dkcqnb09k93zjqslnzf44w7smlp4n";
+"bodegraph-1.4"="h09jfqdgsgfbhakfxqbwz9wa9sdrwkip";
+"bodegraph.doc-1.4"="hwwfy0n7b2a54kywm1jq5nrs6fxbk1xd";
+"bondgraph-1.0"="xaviazf8k9kn6qckni79kxksf7r7mr00";
+"bondgraph.doc-1.0"="f0089d1jj935472sxdjkbnmz4inydkng";
+"bondgraphs-1.0.1"="grfahi07937nnb8nm3b14csxv6bf3w7w";
+"bondgraphs.doc-1.0.1"="dky0vgbx6hfik4xjavvpvvm269hgsqcv";
+"bondgraphs.source-1.0.1"="zmcw2pr67zm6my8021slkbg8zvmbkxic";
+"braids-1.0"="pr84ska1cwhirfxq0g79bibzhhqr409q";
+"braids.doc-1.0"="yidgzx4j4n9d2zfs9y9brvnm6696m3f8";
+"braids.source-1.0"="2d9har9yfm1qxgnf08zdfpsndnr8grzq";
+"bxeepic-0.2"="dwf6rg63vzmlcyaxjzwjr8haihfxwv6f";
+"bxeepic.doc-0.2"="qkfwmg27v6ygkp3d9d1l18zrpribbx3q";
+"cachepic-1.0"="hr0pnmjxny590gzhqbwq9qiqd1vcpwrq";
+"cachepic.doc-1.0"="myyjxkc21qrwmvx2nvbg2smvzfzi5f5l";
+"callouts-2018"="i91ky84hjizrxkhb5k6281iq3fkifrsg";
+"callouts.doc-2018"="k4rca9nia095sgskhv0kzp1qqw0ydf8l";
+"celtic-1.1"="mr86xyd6md9n5b17a6wga40k8z98dq7b";
+"celtic.doc-1.1"="3mwjjxnv079m8ginlv5my50jj1cmpjv0";
+"celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd";
+"chemfig-1.32"="ipml2gc8wpfx0vj2zb6bppxpxi6a71d2";
+"chemfig.doc-1.32"="28dy43zspxcy8g1ss6cs3r4p6x7zzzfv";
+"circuitikz-0.8.3"="krbwmn8nd6adhbjm4pg7rfxj9aff15cw";
+"circuitikz.doc-0.8.3"="sa8797nhxww4z85k37kmr5ipnyqa3k1s";
+"combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a";
+"combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg";
+"combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q";
+"curve-1.16"="w4a3qv419x68y5ydvi1dk6pnm6ni82ci";
+"curve.doc-1.16"="f4n85j7dlkp12vm17vqac8d4hzm1jvd9";
+"curve.source-1.16"="gkfbyzhsaknlrhm3ni81jxswdjv5z9ij";
+"curve2e-1.60"="gy48z045rdfrzda6vsy0ybwgaynvf78b";
+"curve2e.doc-1.60"="8gsmvy2s3s1xk0qrmqnv3w7z0h3g0xwn";
+"curve2e.source-1.60"="zjxzgxgi1p6lbq521dbg92xylk90kgpd";
+"curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b";
+"curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv";
+"curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw";
+"dcpic-5.0.0"="vw8yp87w2arykklgfbi4sjpqq68nkxl4";
+"dcpic.doc-5.0.0"="0shw5fqn8pmzs2s98yxa12jp6lf23c4b";
+"diagmac2-2.1"="4q9fi0lsnriy4szlgdlg0w302q1gmbrs";
+"diagmac2.doc-2.1"="dfp1br71r19b0pzjzln61wjdn30qy0n7";
+"doc-pictex.doc-2018"="770vj0w7dzrw6n4jf1dfds5ngk11cf6m";
+"dot2texi-3.0"="igh08hai8lpcr0pn4lcfx5b6kgymw4sp";
+"dot2texi.doc-3.0"="r038r86xd4csibgk9n3h76qc5ak1zpl5";
+"dottex-0.6"="yvd132700sxd7hnngskg6w30r1cpx3m3";
+"dottex.doc-0.6"="67dpg655j83k809rs0ybc3cxpy2lvvqb";
+"dottex.source-0.6"="fz625gq3shyvx3wk5jk4hvr33wls038a";
+"dratex-2018"="ydbymdy490gw405n0gn3amd771knss83";
+"dratex.doc-2018"="7z5sxm5li3by76x7sw9hq83gl34f6gkr";
+"drs-1.1b"="h9fz09xdgwgnbif1vxa1k7rxj8v9ri5h";
+"drs.doc-1.1b"="aq84i4xdklf4wcripj60cc9fd4w3zhhc";
+"duotenzor-1.00"="fx9ljkzzp09x8iajbwjlrzcjxf382k9x";
+"duotenzor.doc-1.00"="x6y62df7hjrp64r4w1qvdikqdg6ph8l2";
+"dynkin-diagrams-3.14"="xwzqcl2ww73q4ai57lg50yf6j3mz075y";
+"dynkin-diagrams.doc-3.14"="2lb66p10xik8fklmxd1vvhi1k5inspdq";
+"ecgdraw-0.1"="py3xjb8hz3mdsh42hnjww7i4ndxgkwnc";
+"ecgdraw.doc-0.1"="a9ggi8ivc4wcnqv9gd28lhdw56w4zg8a";
+"ecgdraw.source-0.1"="77vlnnhs178s19gaa4n7wa82lcvyp0s1";
+"eepic-1.1e"="vdbwj455076cwr4fwmx0lmf00nzka9vs";
+"eepic.doc-1.1e"="ngcq5bdryv79z4wazbzibf8fybc2mhb0";
+"ellipse-1.0"="8whg820p9jrqn4nfb7lc3w8d1a2cyfvn";
+"ellipse.doc-1.0"="i9njlr8m3jb9pcrwqsbcjbsb26993p8n";
+"ellipse.source-1.0"="25xhi22s1cvkyzbjwchd50ixsx6awfk5";
+"endofproofwd-2018"="xn4xfhhr3k5cq53ab6rkjwvxqs877kq8";
+"endofproofwd.doc-2018"="q8zg1zy1909bsif59caj8rmmjj4g3v4i";
+"epspdf-0.6.3"="hz6676iggzrqrgzdr612p75vzsjhxx8d";
+"epspdf.doc-0.6.3"="6icfcsk9gq46lfhq975g6sq5r3g77812";
+"epspdfconversion-0.61"="4dsfb50v8zqbx8nqlzlj712jiq9hchwz";
+"epspdfconversion.doc-0.61"="bxc42asj3as5dx1qq4axdvfs30lfm24b";
+"esk-1.0"="1hsqxgyh6nbwdw4fl5lsivg6wh1v2s1r";
+"esk.doc-1.0"="14qzisxfrysqh66dn3irf2c39jjazl1j";
+"esk.source-1.0"="yaq1hdjjgl4j06rvz25liay9p054n1sr";
+"fast-diagram-1.1"="sdzr4ya21gayk528rk4zli01l8ywnqm6";
+"fast-diagram.doc-1.1"="anbp06v1p1bczyiij9d2z0li6yski394";
+"fig4latex-0.2"="mwf75sk2i52q6j3gb4pjmw5rlyyihq5g";
+"fig4latex.doc-0.2"="c6qz809776x0rblq5d6l7xcy35bz540v";
+"fitbox-1.00"="s0gkyv18klk5dipymmx7b7as5ajjpcsm";
+"fitbox.doc-1.00"="dmvm1c5akk4cakc3rv573lj5r2qnidsi";
+"fitbox.source-1.00"="9m6pnfky8vs4f5m2vhwf7yfc89yncyiz";
+"flowchart-3.3"="63krabbf5sfqxf0rjb2h4mjksvb9vgcd";
+"flowchart.doc-3.3"="697hizfchfd691kx07sl1y84p8l6196d";
+"flowchart.source-3.3"="zgn96fhr4z67gpz85717hwwfvkfz2hlx";
+"forest-2.1.5"="zl86yn0am5c7v9c471ai0g4spp3lfc4k";
+"forest.doc-2.1.5"="9sfpasybcfbs0v2afcmhxwpcmdxjpv42";
+"forest.source-2.1.5"="n53yzm6p3nwbxrjj999yvcic58p4iv6z";
+"elocalloc-0.03"="mk2cs80z0gh4dx409y2n3h9cr8ls1la8";
+"elocalloc.doc-0.03"="0p4f0hwr11xvn57adggbbssn9iiynsyf";
+"elocalloc.source-0.03"="spa5lrwk7nikx08v1pgp0xrx4c2gbahk";
+"genealogytree-1.31"="kiqk2g93pzz3l5ql1n79hwl75lxk0qfp";
+"genealogytree.doc-1.31"="bhhr7740m764zqj1iw3c397clb1c3pby";
+"getmap-1.10"="hhsp0nkp3260mx30bxnm0ni23p5yx3ps";
+"getmap.doc-1.10"="mi6nzjb83aswg8cl0bl60qvs8g250kgv";
+"gincltex-0.3"="sqimpp1pb3c7mqcm4jnd40jlahpcnr30";
+"gincltex.doc-0.3"="mpr0nv6ldvvc7wgq35qh34csxhxnknmf";
+"gincltex.source-0.3"="s0dq3s33c04fqmzi9q9wp09vgfm7qh9h";
+"gnuplottex-0.9.2"="mbk6yk5147w2rx00503pxmhmldykggdy";
+"gnuplottex.doc-0.9.2"="i0450hl7wd09618hy9igkz3g80zzklwl";
+"gnuplottex.source-0.9.2"="dzmxjcpajp5ylmj1hqn6zqvl5b0c5vlz";
+"gradientframe-0.2"="x80zlqzx72n55qpazclikrafwzny8ss5";
+"gradientframe.doc-0.2"="pgy0vrx4nvys3wki3202r377nryd0r1h";
+"gradientframe.source-0.2"="10dx55zpi0j7xzdkry3dh41ax873mmmk";
+"grafcet-1.3.5"="9yyjgwccj41q284v8cxfhj2l80x95ygs";
+"grafcet.doc-1.3.5"="6k9w774q9japk0n05f45wdqm95n9n71r";
+"graph35-0.1.1"="x18xxd2x7yb5ckpild1s64w9f9rpi5n7";
+"graph35.doc-0.1.1"="qza5xy7xdsncal55gyqs8ay9z1h5rp49";
+"graph35.source-0.1.1"="gaabqpc5jr86g3jbd4sm6df0633c65y3";
+"graphicxpsd-1.1"="1lnxx7fjgam8dyjyay2ws6la9wjhbkn2";
+"graphicxpsd.doc-1.1"="rx8yz6raa7cyyqr37jr41wkgpgljdhr8";
+"graphviz-0.94"="gicmf9qslgbamr7qkac4y3x0wajkbhw1";
+"graphviz.doc-0.94"="xxyyxpgr81jv00v48zv7vxkm9sa4hjsn";
+"graphviz.source-0.94"="kqv26abzy2ff31a3f0aval7lskvk5nql";
+"gtrlib-largetrees-2018"="4chnakm8ava1r34m27p526zjda26671m";
+"gtrlib-largetrees.doc-2018"="yhvmg7p40bvwq04xpbwnb41k74xy9mwd";
+"gtrlib-largetrees.source-2018"="jlmhx0507vard05bp7b0np4q5fz1qqn9";
+"harveyballs-1.1"="axddj0mvqck1gmg0b7s43q7gi9hm1327";
+"harveyballs.doc-1.1"="rpsz7hqyyp9h5sa0hxmxnlrs6na0imbn";
+"here-2018"="3jh68lc8arqbg7kb8ixc87i12qlrnh23";
+"here.doc-2018"="445zak4q5zdlbhvkb8gvkg20wpmwjmgs";
+"hf-tikz-0.3a"="hfdmzpnpak33573ldllk90rywqz3ngqi";
+"hf-tikz.doc-0.3a"="dy6jw7rgbclhb6c94rm3c1bxz0gznqn4";
+"hf-tikz.source-0.3a"="jn1iy5nysj2y94ar0s2491l97m1y2rw8";
+"hobby-1.8"="kmk2l2ik0anclivgqk6alx1v44j6g8pk";
+"hobby.doc-1.8"="8bdi0hrpyxyczql8rhqfiqlrza5y2g56";
+"hobby.source-1.8"="99k7q3r58r1v7vqh3hv08qbb5s1r552p";
+"hvfloat-1.2b"="bwsjy123hc62a1h4v0mj696jf4rjrizn";
+"hvfloat.doc-1.2b"="4hbmh1nfyp7xf78mshh7s0h38mfvqqa4";
+"istgame-1.0"="82zni4rq7gvblfvr3x0b74634ly161rd";
+"istgame.doc-1.0"="yiksd9zn2y8p0b6nciz4svg7mfb71bsa";
+"knitting-2.0"="qam4lj8q2acrb4pl4yqapl2d49hjacvp";
+"knitting.doc-2.0"="1kl1yx9iw11zig2pclzr7y3g290ma2bd";
+"knittingpattern-2018"="8xvccf07iwn71kfnj9f3pnni3imwd9kb";
+"knittingpattern.doc-2018"="bq96pr4hd9mg70qqfwjynhix7ljabbk8";
+"ladder-2018"="wgw0drkb53daslzwsvg48dfznndrz6dp";
+"ladder.doc-2018"="32b2x9zydsp7b2zncs2lg6ldz5cs7gpa";
+"lapdf-1.1"="g5x8axkiscl5796b82is201vcbdxvc3f";
+"lapdf.doc-1.1"="3lpf17r6yqaa7ld8742cp8a7crafpc9x";
+"latex-make-2.2.4"="d545pxklbcazhnnp9saa4wjjl8i2bvca";
+"latex-make.doc-2.2.4"="xnim8byzbrf16w8fgfqif61cwigxbhrk";
+"latex-make.source-2.2.4"="hqhzlnj64r8aw7aqvd8a0i70kbgk88sa";
+"lpic-0.8"="74wchk7ljfacnfqy6wn0j9ns5bqzhkv1";
+"lpic.doc-0.8"="yqsjlvnfzgj180kssqhp1i11gq8d9c9q";
+"lroundrect-1.0"="x8g1sz9w4xaj9da4y1xy58hrdblmdx4g";
+"lroundrect.doc-1.0"="2pw71ykcm2w7ki2xx5fvhlfk5xgi410a";
+"lroundrect.source-1.0"="4ad9gr28lqir9g0a15pa31wybbc9m935";
+"luamesh-0.51"="h9iynwv9kpydaizfmn51kfvinqnmlixq";
+"luamesh.doc-0.51"="jmg6frxjcmpn3s4wkv11s2kbpb8aaidh";
+"luasseq-2018"="k07ymsxywmasi0nkdd2ldk164lf36z9d";
+"luasseq.doc-2018"="vnqisa721w2nx11wxb3zsk070b3dzm1b";
+"luasseq.source-2018"="341ldjdwdvjin4rq8ica4f69hb5kbwr1";
+"maker-1.0"="88vzniwk6x9fqhp4y3g32a1cj6nb57g3";
+"maker.doc-1.0"="5w3rag10kbzp8whk0hjrl1ic7iqrna8f";
+"makeshape-2.1"="y9d0868x2s8950zphcf6sdz3l7a1sw9s";
+"makeshape.doc-2.1"="wdhhbk50rqxnm4iqd0gvnfzgy17knvqd";
+"makeshape.source-2.1"="5ddzsj9xakk5hwhg54snvv7bp0vlmjd1";
+"mathspic-1.13"="x4m5r6mv0y3cc4vx1qb6anrparbgdvlq";
+"mathspic.doc-1.13"="qh2ycvh04kxfihxnri5fr5zxdkk04ppa";
+"milsymb-1.0"="3p1nz0lkags3gdlpqlvsifm1d06aysj4";
+"milsymb.doc-1.0"="zk68hivzcmqvj57csg1rvr633s85ga6w";
+"miniplot-2018"="3myl55b3q359l0aillyxg7pisii3llpj";
+"miniplot.doc-2018"="hi57wciv475ix91zl4rh30lv5pffns1p";
+"mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b";
+"mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3";
+"modiagram-0.2g"="g2syxjg96d46hkn75ym5p3pszq92kn9y";
+"modiagram.doc-0.2g"="4jdcw6fidn5kds9b31y3nq9czmw42sxd";
+"neuralnetwork-1.0"="3scaqj2kvqri7x23chqymfkg534298ik";
+"neuralnetwork.doc-1.0"="xxsvv8bh5174ihqmaxgy5072z92glvhd";
+"numericplots-2.0.2"="c6kqacnf4qlhx7lkbnrp4xji5xg9nzib";
+"numericplots.doc-2.0.2"="9dlfmdqslpzhsf8zyfnsqy41qmcgzf1x";
+"pb-diagram-5.0"="34vlhfdhm7glvpzprr99v7z7lc8rc8pd";
+"pb-diagram.doc-5.0"="8a36mfpszgjyzddfmmz2qrg9fv03r9vh";
+"penrose-1.0"="k6jlwvn60krdxcf7dj61nydhvf4smmfz";
+"penrose.doc-1.0"="yyv1mdclnrrvb52b68akbah0nd9jr68i";
+"penrose.source-1.0"="brmpi34mmx9b7vs1vl1gb2mbz4mxcnlm";
+"petri-nets-2018"="0yny9mc10syfx1a716sjw3768bf1a51z";
+"petri-nets.doc-2018"="3m0f4r65jhnq3la2qyp0xa7ra66iyahs";
+"pgf-blur-1.02"="30lr14qkrz1ah9kvgadknb9a7yyhv625";
+"pgf-blur.doc-1.02"="x4phrny12czndwvsrml45i6a5ymfncf0";
+"pgf-blur.source-1.02"="hdg79rv84byqmnyahvi65v3ca3h3j14r";
+"pgf-soroban-1.1"="1l6ifq09crmg68d174y2ms66jjhgklql";
+"pgf-soroban.doc-1.1"="ajlhmwd0fgmamsgnnzr3s15z6irx579s";
+"pgf-spectra-1.0"="w2w6z4fj2g5z77i72q7l5fzrz3hbrb0p";
+"pgf-spectra.doc-1.0"="d9v7k3fbf4hl2yz91q8n5sccn7bfq2v3";
+"pgf-umlcd-0.2.1.1"="h2syv4fn0svppahm66gpwb4jnrl7jdl8";
+"pgf-umlcd.doc-0.2.1.1"="yn8vn90qgh34r1i91cg7k5n81v47i6ni";
+"pgf-umlsd-0.7"="f6lyf7ph9a6ayc082h8bd1hrwjx1jw2y";
+"pgf-umlsd.doc-0.7"="6x7xzfz7zcd43fscprh7s4gniya05nbs";
+"pgfgantt-5.0"="vbi8jb5870r16w4dd7zdw26arrcbbv6x";
+"pgfgantt.doc-5.0"="62rp2q84amm7kgvan2jw00si5fdkq226";
+"pgfgantt.source-5.0"="6r8nhidc0kwxra3p3aywh9y2kcv7zwiq";
+"pgfkeyx-0.0.1"="z2s0v4qmhqbbw3v7bx27i1i454zvzidz";
+"pgfkeyx.doc-0.0.1"="znjsk9dvxksykikfmm69z1kizgpqnpl8";
+"pgfmolbio-0.21"="987pnzviy9l6fbqgkbq8xhjn18w4dpqi";
+"pgfmolbio.doc-0.21"="ckwm7mnw5qhp47vfxmbc5xjvnysp8jxq";
+"pgfmolbio.source-0.21"="l3rs43l6g8bg4l4y7gbf8ji8vpj9pwca";
+"pgfopts-2.1a"="r3hmv29kc7hfcmx1j2kirk27q4y2r5a9";
+"pgfopts.doc-2.1a"="qb2q273gcqw9p1wjzw8hq7z13f689zkg";
+"pgfopts.source-2.1a"="g9ya18k22lcd5f8aq3anl152d98h6b7z";
+"pgfornament-0.21"="v3jz47bv6awc3fq6fq81ybvmsigm8wmq";
+"pgfornament.doc-0.21"="amyhh0pq8p7x6f4ldyf2sgcqfs0qgm5a";
+"pgfplots-1.16"="nwgyxvygiw0lqhh7lz9ykbc5lscmy7lf";
+"pgfplots.doc-1.16"="cdjfvyz34yfbjavxz6hsmmpl49gi9q0p";
+"pgfplots.source-1.16"="m6vxsbqzqmjq6p4n2kxzygdhvxqpdaz9";
+"picinpar-1.2a"="wvxa8vjglc2v1k8dcszj32wx5jgmsm3w";
+"picinpar.doc-1.2a"="ix8d6091agdxivkq3pj0xv5afksr16xj";
+"pict2e-0.3b"="rmhf7g2w9a3qv2a4il24y0905swisx5p";
+"pict2e.doc-0.3b"="zyvajy5r8ph2ns8hphm3fnq0wzsz2sdr";
+"pict2e.source-0.3b"="rmx8qv2f1a170bcy1j2x1pjbq4r8js9l";
+"pictex-1.1"="3wr03wxjs0nbpncsyzzz2flz5h383a30";
+"pictex.doc-1.1"="d96f4qc758wqc5pifjspr2cfhkj3j44q";
+"pictex2-2018"="fmvr7pqdpq2lnigzzbshgwmrjf03kj6h";
+"pinlabel-1.2"="5bshz2446a2c3mgc79b1znaw07n54cck";
+"pinlabel.doc-1.2"="a23kw5gn0cwsg5fzldlq5a9rj03wg1la";
+"pixelart-0.2.0"="hq6wmp9dgfzzqxwn11a3isf2jnzm2b7v";
+"pixelart.doc-0.2.0"="xk2xnxmgcb2i26qnim31dvq7qm209715";
+"pixelart.source-0.2.0"="64lb31p15a52jvprjk61dfg5a9njjkim";
+"pmgraph-1.0"="hp6991d3dq131lsjr5675igjkgnp1hr6";
+"pmgraph.doc-1.0"="yi2b6kiybj2mivsjp7jw0zy895zj7731";
+"postage-1.0"="7n4w4vhx3ck8pvfp69l95yn45f7qbmpp";
+"postage.doc-1.0"="h40jv63ikgmcd83xmvkz3vdc700j5myy";
+"postage.source-1.0"="x0f20a02h113a5z6cppvhrqcq2lmlh8c";
+"prerex-a"="kzqmlwvyiz4gcqfl6jf7gafgxnbz7jf7";
+"prerex.doc-a"="p0c5qjq63scw8bfk0f9v5jid1bnijp5m";
+"productbox-1.1"="7l9nqp2nxybrl35q1slpz9jhn70las0b";
+"productbox.doc-1.1"="j713za0sjbr7plb4xdis6zwvi7bg1n1q";
+"productbox.source-1.1"="aqhyalz52l2nz9v46bi0jn21vqw68w6g";
+"pxpgfmark-0.2"="sy9cs1y4gf9xr7jfiyp8zkr1r8di00hc";
+"pxpgfmark.doc-0.2"="25vgpjc0zr0wjny4snksr3yzk908s2mq";
+"qcircuit-2.6.0"="va7w4d1n5djxqa4fis7m409aapx7hqa4";
+"qcircuit.doc-2.6.0"="vibn2wypk17d73k72ab6grqaw1irck68";
+"qrcode-1.51"="x2mibdysf003dgl6i1zq3h68a1km3j2a";
+"qrcode.doc-1.51"="y97sa2ha89kmhfj5kq55qk57sf6yf3h8";
+"qrcode.source-1.51"="f4mxn89cz4f6wvnvxqfxdq411nnz4z44";
+"randbild-0.2"="bkb9mlnckwhxirdsck7pzqki670mgns4";
+"randbild.doc-0.2"="v89kxn1iiw9spvinn8xcazp81w9a0nb3";
+"randbild.source-0.2"="la433aq038bqyjdv40rvdkinsiq7bf07";
+"randomwalk-0.5"="ww9gaa7gc4c5ziplm2kd70hm1mx3vavj";
+"randomwalk.doc-0.5"="5vyvv0bjbi56mxkqvg83sw4bl12gykgp";
+"randomwalk.source-0.5"="66dr6gi8ph8r223qx1wglx2zx6q7wkqi";
+"reotex-1.1"="yzydkc30vf6csv388xyf4lm9mn894781";
+"reotex.doc-1.1"="63p2w1vjpannypp8izsn8qis0f7zcngg";
+"rviewport-1.0"="c1flf8nck97sgi4994izzh0vwh8np9z2";
+"rviewport.doc-1.0"="jmr9vbj9690mrw18gg9nkilrkld8r4kj";
+"rviewport.source-1.0"="czi8b9lr7ldxh657jirgsvcy3l5m9ybp";
+"sa-tikz-0.7a"="dcl4gm1658qdh6bs082bijsd0fq2p2wv";
+"sa-tikz.doc-0.7a"="27fh1xd288pwk62lngyy91f97rl4ag7h";
+"schemabloc-1.5"="7pm30f9wazndg4cnxv31m616di90d0p4";
+"schemabloc.doc-1.5"="2020d2ivq6qccq1s7fk161pmarznn6ss";
+"scratch-0.4"="g1m0q14c9asnm3lrwnl2zzqb5ww90jxb";
+"scratch.doc-0.4"="36fqppczvh4kw1r3ja62i3g28iyi4kaa";
+"scsnowman-1.2d"="vmlm0ilz9v7hxsz6111w8596xajzg2ly";
+"scsnowman.doc-1.2d"="l1svi3nmdzpfnad0w8dzxxzh8c4n2v9j";
+"setdeck-0.1"="jhxxygy339baxmfl252kjjyhw2zbhf8n";
+"setdeck.doc-0.1"="0h0bv2ywm46jj8g1r26scn8r3pc0a2k5";
+"signchart-1.01"="y2yc5dcfwbpicxf3w7kp6lxjgwxz4dsx";
+"signchart.doc-1.01"="r2zsa7zazg4l0z4x18hwzkisqaympv1f";
+"signchart.source-1.01"="81p9ykfplbsb51lnx3wb00zrsrmsd9qr";
+"smartdiagram-0.3b"="2ap0zqyxnbs2lkdgx70rrpm2b6d9gslr";
+"smartdiagram.doc-0.3b"="p0q92dnkzxz2i5zb8837353j4ainabxb";
+"smartdiagram.source-0.3b"="lqy3sqf14w7fxzrfim7mb1y7rmsbln1f";
+"spath3-1.1"="gcf13xh7ibd3pn63wz9ffzf9bary3ipx";
+"spath3.doc-1.1"="1dw393fzkzjh1yxxq7wb37wj60rfa3bi";
+"spath3.source-1.1"="ss89g9nx5f6lq8xcn1zy0g1hc7yp6dbw";
+"spectralsequences-1.2.0"="6kis64ya81yjzrl17af67r8lwni0q77d";
+"spectralsequences.doc-1.2.0"="9dd1rg1cwl3p3s5slcdmcmmr3s8icm5g";
+"swimgraf-2018"="x77prbkrnadhj57fbh68hqsmrbk2qsis";
+"swimgraf.doc-2018"="hfrhqz5pj6g0mdyp1fbbfbnasph11pwi";
+"table-fct-1.1"="b7wz94n1h3wpq9mi40zdl3v4m9hi1wxk";
+"table-fct.doc-1.1"="1k2sa9bsygbw1ib85x7yqda1jbzbg05f";
+"texdraw-2018"="iwrv8alhsxxawklhgxbnsncn6plr9mfx";
+"texdraw.doc-2018"="awprn6s3sq5ighgqgbh2gzcbai1iwxd3";
+"ticollege-1.0"="bznj0maq6a1b7m6p18dhq0fnssx06bwj";
+"ticollege.doc-1.0"="7n7nyn8zrp9za6l355797gq96vxp2d78";
+"tikz-3dplot-2018"="kl827mar9jlbjpwxl90z3fml8i3zabb9";
+"tikz-3dplot.doc-2018"="y736rbqkbjg7nnly25d0jl72z9gyx17w";
+"tikz-bayesnet-0.1"="w9x9vf5hgmv18ljz0kx7rby1dig63539";
+"tikz-bayesnet.doc-0.1"="g7dkg4gg6729jbscb7cf3fsay2dfqv42";
+"tikz-cd-0.9e"="6mql3sca8l0r784yxgxllsl8asw065yl";
+"tikz-cd.doc-0.9e"="6phhv8sdlz57n7yd9qhnnd19hdz1sffw";
+"tikz-dependency-1.2"="yqnd9843awmwy61pd310krnfhyf3867k";
+"tikz-dependency.doc-1.2"="n3rk72ln03anvylh5pc5gyajkvgm6cff";
+"tikz-dimline-1.0"="q2wyvka6vafwaj58iawrrl3capkzvvfj";
+"tikz-dimline.doc-1.0"="gbfqnslkm9piq4jmhcivpyb9y2cjra2j";
+"tikz-feynhand-1.0.0"="2ah6vkpd7qiy4ymg6dpnlqjv6ab7zhvx";
+"tikz-feynhand.doc-1.0.0"="mpc844n8z08l4vk0ln2ki9sybmc85iz2";
+"tikz-feynman-1.1.0"="icrxa2hwmgnrah6x7br5sqsky8r47v38";
+"tikz-feynman.doc-1.1.0"="afnpl0m1fkwp7cip0ia10z0lgq2vnpwj";
+"tikz-inet-0.1"="mkhy91a9633a5hbqcckgppy43ri13wy0";
+"tikz-inet.doc-0.1"="c62lz4nmz4cw48rjmfl3vn913smpxzcb";
+"tikz-kalender-0.4b"="zs265bmajn1yn84p4x3qj7nx3nc8ydwm";
+"tikz-kalender.doc-0.4b"="3999dmmsp3iyal98prf70yyq5r0qmw0i";
+"tikz-karnaugh-1.2"="szdj3jvq9704zzzrmmm7kr67f9scc5vs";
+"tikz-karnaugh.doc-1.2"="4v7jmjk6kczigziblmaphpxl1xkr2ylp";
+"tikz-ladder-1.1"="ika5n5wsldxr4fk6qfjr6p9i94iydplp";
+"tikz-ladder.doc-1.1"="33yyhiz2knjssmpvz90n63n3dgh3g57g";
+"tikz-layers-0.9"="fbjyhacy9k7yhpyfg8viqdfb9z5d4dy3";
+"tikz-layers.doc-0.9"="d3q51sfsprqfa0m0plhghgcb3j63fn60";
+"tikz-nef-0.1"="88fk1n97w3dpajkw85ww9mw93p3wmv3q";
+"tikz-nef.doc-0.1"="xf8xsf1qxy0493zwx9nr2rsxnxavyzy9";
+"tikz-network-1.0"="5farvg4g7138lyipw3hqngpjd8vc75xm";
+"tikz-network.doc-1.0"="hfkqcpz72r5fy0prcjzzy2yx2j0imkxz";
+"tikz-opm-0.1.1"="5hgjh2kg1ynxp4vn8x47wfkcxz27ahra";
+"tikz-opm.doc-0.1.1"="4jqackkzg26vkvrkwflljvxx6ikx1jbf";
+"tikz-optics-0.2.3"="lc3znr18mmhw9v5d7wc8s5hs83bm20bv";
+"tikz-optics.doc-0.2.3"="9fhp84w25nsi4hxq2rys1y6vc03f4nlf";
+"tikz-page-1.0"="zv2wzvv8xzs4s5cf5vs8w9ffsz8sq4rf";
+"tikz-page.doc-1.0"="vgszrg09v23lc7yj3j0h9hwnyvdhsck0";
+"tikz-page.source-1.0"="2x6hmyi5739qskj8wf1k1636kbzns9b7";
+"tikz-palattice-2.3"="l8q247mbkx3qyywwb6sif0if3jv5ykjk";
+"tikz-palattice.doc-2.3"="j7y3y3r0mgm8limkgfljmn3i8dcnj0m3";
+"tikz-qtree-1.2"="vl2jq8b492p7dznrx63mi2zxcpax8a1l";
+"tikz-qtree.doc-1.2"="01bkpz1f0pm7plpkh6a2kx3c93iwcfwa";
+"tikz-relay.doc-1.2"="k54pyp94zlixi0v9c5xlvsbzasjd7ajr";
+"tikz-sfc-1.0"="sszciq6cd5l3sjjfa4g8c28q0fwhpkjz";
+"tikz-sfc.doc-1.0"="13y2ck4rjn9pnix56s0iycd867jdpk6p";
+"tikz-timing-0.7f"="phaw9fm5dzq5xr4klpnw2dhnrq3lcam0";
+"tikz-timing.doc-0.7f"="cc5mlz7linvwb3ki8bnhhs6qz9xmkkb4";
+"tikz-timing.source-0.7f"="8lpjas5dgvpl8dcxf1549m8nh0vn20fw";
+"svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i";
+"svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj";
+"svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4";
+"tikzcodeblocks-0.12"="1g5p5x26xi87pgk6wsmrc8jfr5zbai1z";
+"tikzcodeblocks.doc-0.12"="anwa5r1dzd81pryrgy79cgcnyhr0p6ri";
+"tikzducks-0.7"="226ra55vkcykkglf2d78ndx8dj8lcivw";
+"tikzducks.doc-0.7"="y8xqmangnvrx6hh0864wnmxfxqr4xnxn";
+"tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a";
+"tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9";
+"tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf";
+"tikzmark-1.3"="zzc5vb7vh8p5q4l1p9hbfbvxiwyqxj3h";
+"tikzmark.doc-1.3"="q5z9wc07ldjcrvi2yq86rwl4nibg3s1b";
+"tikzmark.source-1.3"="gibic4bss01ih9dcwrn42cg782dn8d2z";
+"tikzmarmots-0.1"="vv9rrsfzfa5hi6is14nv1rc7fw1rmk8d";
+"tikzmarmots.doc-0.1"="ch29ymv26m1vk401a41j1l6dakgv67aj";
+"tikzorbital-2018"="0jand3q2rnj1l71kiqc5wx9br6iqa8h6";
+"tikzorbital.doc-2018"="8w7za38r9lqh6hjyrx51mhxljlwbr13d";
+"tikzpagenodes-1.1"="bbppcjhxjza1vhld9n9kjdm5jf03by5f";
+"tikzpagenodes.doc-1.1"="qds77qax9drbdmnw93lsg9lzkd7kjmnj";
+"tikzpagenodes.source-1.1"="bm54xhdx003f6j5j2csj6272d6pqxbmd";
+"tikzpeople-0.4"="9cjdrp8gw59kkklf92fmpq8wlflaavxg";
+"tikzpeople.doc-0.4"="fpwfczmdq8qad1c637rcxjzqy2r6gi7f";
+"tikzpfeile-1.0"="ay059ccg53rz4q39dy1cls80g1yi2mq2";
+"tikzpfeile.doc-1.0"="f97bldn28br9f6dfr88b81w8g683xvgq";
+"tikzpfeile.source-1.0"="hcsmvxfza3qg128nsj2n48v7fr12viqg";
+"tikzposter-2.0"="ir2kg1wfppny43rywlc1z8fbc9gnwpp1";
+"tikzposter.doc-2.0"="8bjc46kfilm5jv3z87kpzq5fk1rs1ihr";
+"tikzposter.source-2.0"="s0nhs6jvz6zn6kn7kr8srvwynh8vvfaf";
+"tikzscale-0.2.6"="7cc4pbv23n95rb1b80p1y7w8m55z59yl";
+"tikzscale.doc-0.2.6"="qb6yk80pbipaq95cgasija63px2v836w";
+"tikzscale.source-0.2.6"="2spzfhaff1wn11brhjcx881jmql261ad";
+"tikzsymbols-4.10a"="cxfp2r1asarm5ig2wn8xya7y8zdc519s";
+"tikzsymbols.doc-4.10a"="wm7d2vg7db5wqwpzb69b7vrq97gywa5z";
+"tikzsymbols.source-4.10a"="vg491ilbl5rq5wxckdhillayid29qhhk";
+"timing-diagrams-2018"="89d8m3lh174y7p3xx2iqdkxnq71s7fzq";
+"timing-diagrams.doc-2018"="r8xz0yb362glmkcaadipa5v8jsf3w5py";
+"tipfr-1.5"="dd5jgd6y7rzspj6shr5mbqcbbzyncv2b";
+"tipfr.doc-1.5"="w5mslbn2d53wzdkaynxigaw4344psp9j";
+"tkz-base-1.16"="q2wyxd4r38873irmj30lck29x2d504b6";
+"tkz-base.doc-1.16"="drycyx7rwk4dk5bmagpdq38ab144vyv1";
+"tkz-berge-1.00c"="jgkikvl8nnvmhqkkqivl57zc175cp2kk";
+"tkz-berge.doc-1.00c"="dk8ip06kr5rijf38ljwz8ik46zfkg083";
+"tkz-doc-1.1c"="hp0k8mhga84bc05151vnc7j9508vc7d8";
+"tkz-doc.doc-1.1c"="ic4vldvxdlq9zqx7disw9m872zv28mwq";
+"tkz-euclide-1.16c"="a7aldarmq49sd3kv5glmiwk7j5knzcdc";
+"tkz-euclide.doc-1.16c"="vj3mr7y6s5nyzy7akbn8f8iqbpaxs1r8";
+"tkz-fct-1.16c"="6nf7cazsna57aariv60jf2gcx321wkmm";
+"tkz-fct.doc-1.16c"="dawp55i6vgfhssqn9bs0h3amvh7bzasa";
+"tkz-graph-1.00"="khn49n47wmdfxlxwflm8rwsny0jfdlz8";
+"tkz-graph.doc-1.00"="caagk23fkfhijyji2r9iad5nzr27hgg8";
+"tkz-kiviat-0.1"="62756q87hqqa21gxy1xak7lkr4yksnal";
+"tkz-kiviat.doc-0.1"="vqm5px5ydhyxqfl5p9igi6smc71wvdj6";
+"tkz-linknodes-1.0c"="zhpwsq9xpjhpr0spjlxg8pjfqcgk8l0d";
+"tkz-linknodes.doc-1.0c"="n29zmirvb2zdmx7dvnfr51abwfwlfp28";
+"tkz-orm-0.1.4"="kvjkkbbapnd2f03g4h48ic729s8yvn5z";
+"tkz-orm.doc-0.1.4"="20ccyjaxz59v4yvbrz18ql5dz05nqxj8";
+"tkz-tab-1.3c"="9nbbbpgvmr118ww6a70vdz7xzqzwdpg4";
+"tkz-tab.doc-1.3c"="fz6yxgwm70plmff6ga99x5y31mrn0wk8";
+"tqft-2.1"="jg1k2p45j027wivwykric03v8vgfgaaw";
+"tqft.doc-2.1"="0qc7pjywc0dwxkw750xsqb67f6cpzka2";
+"tqft.source-2.1"="2kasg0q4bb70r80kaxm5hykahynk7vbf";
+"tsemlines-1.0"="qd021jr57lay3xa2hwms13x49y9f3q7v";
+"tufte-latex-3.5.2"="fagszla48gaakgcvvynmhcmk8c2qvbf8";
+"tufte-latex.doc-3.5.2"="nqqzq6qbgcq8w5ih3fns8wibvfdn5df0";
+"ifmtarg-1.2b"="7sq7fspjvzn5f3yvsmwxm9h9xb4y8dkw";
+"ifmtarg.doc-1.2b"="3azjs21rb4iyw6qp6vikgjb5an4b2pam";
+"ifmtarg.source-1.2b"="89na1sf5dvfxw6ajyx2xrh4wmlyymxyb";
+"paralist-2.7"="9x62lrvmw3pkvlrkhrcpm2mk90s23a1p";
+"paralist.doc-2.7"="8jww1j8k4rf6jfnal0dlqv4abcjyz5n5";
+"paralist.source-2.7"="vs1jw2rijrnym49vd3w1nxswq52lvf9g";
+"placeins-2.2"="ac0ckzyrg9k2akv26dg4hck4q3w3z141";
+"placeins.doc-2.2"="ab3faqlwqspnnrvigdsljl9ykqyi2gfm";
+"sauerj-2018"="9x0hghvh5wh6jljwpyf61c6pc4rl9jaa";
+"sauerj.doc-2018"="zk8dghf07j3ijvnr3zxw2bajqx49nbaj";
+"sauerj.source-2018"="j1bdzs9ky0ycfh00sdynswv2vfvx7nmh";
+"xifthen-1.4.0"="4d6x7yb6hdr4xg2dn572gwpfnykppsph";
+"xifthen.doc-1.4.0"="364kifdxmk5ak2flyqcfzjgv0dbsykax";
+"venndiagram-1.2"="pxwyrzjwbkkyhfm22v13p2mm5l9s2bqp";
+"venndiagram.doc-1.2"="xn6lk2l6vjwjirm9s0vmcsqna9q096zv";
+"venndiagram.source-1.2"="aj2hp4pyi0jhirjbsrv8cpajh42q64ai";
+"visualpstricks.doc-2.3"="qml7ki3mr0fj18gxz20j88il4i0d4fbx";
+"xpicture-1.2a"="b3daw2s1dzkvrpa1lywjgqnrahnn539g";
+"xpicture.doc-1.2a"="h5xg50jzdi44vigcgqpc61hmxa8q8ggy";
+"xpicture.source-1.2a"="a0bq9s39fb1askk6bb5yy69bmv3ii59l";
+"xypic-3.8.9"="rh7ahdwsnxzsk42imv3qqa0q2cb15ng1";
+"xypic.doc-3.8.9"="9vnm1j6g180slvahaq3mgdlsjnnllhnh";
+"colophon-1.1"="7naibja70d1kb637ydb5jbj3xbgxa4l5";
+"colophon.doc-1.1"="m0y1dcw2ymnr8a09a8wzj6vw00ns055g";
+"colophon.source-1.1"="xfrkdkkk54q9zbhv9jzwm2bf43czj0na";
+"colordoc-2018"="sb31vsh0mzzd16vrf3gpvs9c50zcjbgx";
+"colordoc.doc-2018"="2sw71l3579qkh4z3hqirvv0y3d79sssh";
+"colordoc.source-2018"="3p7baf59n87p34sxwdm9lf761dmh8w0b";
+"colorinfo-0.3c"="x5wwpzhcm3ppfg6hh0dcr3rl7cjs23zn";
+"colorinfo.doc-0.3c"="ppz8wrqzph8cq5dggikgi0gphmg0y1hj";
+"coloring-0.2"="qdjj8va77wpin0pw6izv2lhjj0cm8zfd";
+"coloring.doc-0.2"="v7z4bnnpghfi39b8jmzpwq496swhwndh";
+"colorspace-1.2.0"="33j69sadgpsmz3ji7163p9rx9bpvyxk8";
+"colorspace.doc-1.2.0"="mf7rdcflp40zwvqr249wyv87q90y8fxa";
+"colortab-1.0"="4bqbx02c34g7271mg6y1gw1nyqmj6vwq";
+"colortab.doc-1.0"="qm51gjkcfq5gjimr5pp3svfj1xaqshbd";
+"colorwav-1.0"="ilrircjl70f9pv8g89d8dzjdsipjfbmj";
+"colorwav.doc-1.0"="jzgmaadlkkbb8f94kfzxdkywh1pbviif";
+"colorwav.source-1.0"="m488q2p0lkrf6rs6vy7nfi86778zi66k";
+"colorweb-1.3"="4b0qbipxl6if0adrfblqzpzs48aa2fsb";
+"colorweb.doc-1.3"="9qi2i5x35aq0ks14c1pbvn11b91pdqm1";
+"colorweb.source-1.3"="c207mjpwnn9dwd9yc4wlq414sl2gjbz2";
+"colourchange-1.22"="gy8kllnhrg7i10yl0nrhvyyik5j13vkc";
+"colourchange.doc-1.22"="vjvp7zji8zc7bv2yghvy2zv2d1y2nz2p";
+"combelow-0.99f"="2gm5s37dfs6h0gxjpa221sv38vdpvzs2";
+"combelow.doc-0.99f"="r2dmygqgwcx9ma8frgm3ragqrb198c8x";
+"combine-0.7a"="mnzy6xk1nxfsybm2nxy9qb4k7shrwank";
+"combine.doc-0.7a"="b54dmdzcnpffyws5sbhwrm46hh7gj5wj";
+"combine.source-0.7a"="j9i3psfzvamyz2imf8mmcf4970j9k9gf";
+"comma-1.2"="ai1p7vnnzvazd950aav3xnjggmzh5xac";
+"comma.doc-1.2"="3dkfkh89fy2jy02amwg7kh18hyh7v396";
+"commado-r0.11a"="7jd82pb66a5hapcrqk19bvnszkgs649j";
+"commado.doc-r0.11a"="rg7zy4zsbmvan3vln93y2crrmc11c5dd";
+"commado.source-r0.11a"="2z09138429p7bxlq4392bd8psznnsyib";
+"comment-3.8"="dalw0d3w4mg1i8pg530ji0c5nmyrjvcb";
+"comment.doc-3.8"="hsk8kvj5arq1xznsmv8p6iglrj5f95kh";
+"competences-1.0"="kqk5mzm2c12dydifc1naxhfz0kpykkfk";
+"competences.doc-1.0"="kxhlvgv62b2sqf36qpq45pfab730l43y";
+"competences.source-1.0"="hlmzbgb3fd33miycrryvs4pb3sglrgis";
+"concepts-0.0.5-r1"="n6f2szv53cszq0ybd93wcggz3jl0wf00";
+"concepts.doc-0.0.5-r1"="xww0baz5rff17j0c56d1d0j1mh2zfpqs";
+"concprog-2018"="fy8virjhfw7d1y1l0vg6fgzmxkc4f7gb";
+"concprog.doc-2018"="sm3fl60ymv5z649frky6xck3hd9rr8yb";
+"constants-1.0"="p22vxmnw3a68jgrwxzvs90x1ads7vy08";
+"constants.doc-1.0"="0d8avlpp7ra6jin7rq92vrpa6c97q5g4";
+"constants.source-1.0"="44ajza7nr171n3nlbj0lqqq7bld53i1a";
+"continue-0.1"="d9ynm5jradscrzyag8kbh2bgvv6v0579";
+"continue.doc-0.1"="x9cvy2klpk537frhz3ywjsxn9j7hax4f";
+"continue.source-0.1"="k8dnyipf4w9jaj28hs3s7ni3cd8422wf";
+"contour-2.14"="nqc3i7nqzk5svszlgb0glkr9m9n3sgvg";
+"contour.doc-2.14"="8kjg0zsy2i6nkvxq4xjcaaqd2by1wq5s";
+"contour.source-2.14"="jx3fc5lngqrdhcwy2dga2ynw64pfvwk2";
+"contracard-1.1.0"="syk0yvajva7nhdhsrk6nn3z7mwg4sa5r";
+"contracard.doc-1.1.0"="2a8qav861gb4rh141a1pfr50sbr7lypv";
+"contracard.source-1.1.0"="ld16pjizk0asaq6kkpd2imdmyz7ay4jd";
+"conv-xkv-2018"="irm1jvqddc4a7jfl1qraxkii8gmmmh63";
+"conv-xkv.doc-2018"="vs1dc6np4zd01fkq95a0kqwm72h9snli";
+"conv-xkv.source-2018"="8gj6sqrsbxknfpvrfalflkrnhncjhbfz";
+"cooking-0.9b"="sp0gxpgc190gn2wngw7nqzay88hykl4x";
+"cooking.doc-0.9b"="15mncbdsswn8q6914ijlhzlg5ch6schl";
+"cooking.source-0.9b"="n6pvjf2lx012s5y29qc5mjkiz8dinkjr";
+"cooking-units-1.40"="jyw34d28vhhy7iddh2pgvi3s9vdhrgch";
+"cooking-units.doc-1.40"="inaxb2wb6dck2zsmx41jj6mjvxn680wc";
+"cooking-units.source-1.40"="pqs3mi3bik4rjrb2whb9qyrfx3rmy1xp";
+"cool-1.35"="djbl4kj33wlqqnj6sl31f57viw5sacvf";
+"cool.doc-1.35"="3l8iy5landcaybfhvb1inj773r55k7hw";
+"cool.source-1.35"="hfd759pc6m30sxnmchmv59nl8xr3hwrm";
+"coollist-1.4"="zvmxdr2hvnis0p8asjqsw67m6j0gv0wy";
+"coollist.doc-1.4"="z2lv3naa383vdbhyccpzs9khbbdzg8fc";
+"coollist.source-1.4"="2p080664dwgg1623jx2x8hd3b8m1k9wv";
+"coolstr-2.2"="7rsqq7nbw6c1z5shk0zcmkhnhqh6mcdq";
+"coolstr.doc-2.2"="sgbapr8y7xrh41ppzhkw9s91npbnnnll";
+"coolstr.source-2.2"="mh1biqrlg5f1gkpy5q9ml82xh0jb4bxa";
+"coolthms-1.2"="bkbjhkhdh1d0zbwz7kn2gx98jp0i1wfd";
+"coolthms.doc-1.2"="xvzlcxf0iijhqshnf10ll3pw1hki8qyb";
+"coolthms.source-1.2"="abpv22k723v32mjxzzfil36yd37p945n";
+"cooltooltips-1.0"="dyya1q998zi4g33qmgkcrzin8d31lmw5";
+"cooltooltips.doc-1.0"="z7fsfbm4rc0amfkw5ry8j2svcmv1q2lh";
+"cooltooltips.source-1.0"="cpan4qfa969dihkaa28rcg8ka9s63xa6";
+"coordsys-1.4"="6x2zn29g7p90x4cgwyclza1xphqfb3lg";
+"coordsys.doc-1.4"="2j52rr9hwa03wsdg21dnn7q56sp265da";
+"coordsys.source-1.4"="is64wqbszsrl7lnzwpgv2z6mjpz99n7v";
+"copyedit-1.6"="dyalfcbrp1wdxym0d31s3ijrbhq6qz7i";
+"copyedit.doc-1.6"="knh4a1w8vapj27rs7b0d703ph3vp94av";
+"copyedit.source-1.6"="b3kpsi78z2rja51lbj3fby031kjr08w5";
+"copyrightbox-0.1"="90am6yc3v6a2syw9q97qgll8dhpl9v8y";
+"copyrightbox.doc-0.1"="6133545797rkbwspbd7c91dbc0mds4wn";
+"coseoul-1.1"="qf1knif80pc43y8qjymya8ry3564gcc9";
+"coseoul.doc-1.1"="3zfkpycv6hz8jhvlfycjn20g2jbddars";
+"counttexruns-1.00a"="chaflhn60my7x9ijf2dj4ja8i3xdpcac";
+"counttexruns.doc-1.00a"="24wzb89912cb3f3gbfhcdz2p1w7gqns0";
+"counttexruns.source-1.00a"="9asga1rjq6c6sd7407f43p3w4d2hwkfy";
+"courseoutline-1.0"="r8syx9ag00aszr89zibwl760ml5fc40h";
+"courseoutline.doc-1.0"="jhrk85cgmca0vhk99l4xq6yhhw2kkpw7";
+"coursepaper-2.0"="222rs2hqsri87xi4zd87m0bi314g76br";
+"coursepaper.doc-2.0"="y7ml6w9cnxy78dld8m24m2p4xvv2in71";
+"coverpage-1.01"="j946qwgfdzx2y6myvj2zb927i04n29vn";
+"coverpage.doc-1.01"="h7krnkyf2nixh2227hfz5ibhjig2d9cs";
+"coverpage.source-1.01"="hxdqs2wzbsb5yjpj15fva764n1qgy19c";
+"cprotect-1.0e"="gsd9ndg4b5fb9s0435ly9pnlvwp5rvwg";
+"cprotect.doc-1.0e"="4q4rzd43yirs522861kk825v8d3avm4v";
+"cprotect.source-1.0e"="lzyx2nvma23d6ds8cl52zfxhsdjjshnc";
+"crbox-0.1"="y7zkz2wszr0iv7y3bhcgcaddsw3d54hp";
+"crbox.doc-0.1"="64zk4z35xzpxa2dmb4am67dnilqs8mqa";
+"crossreference-2018"="rghmvk4vfk0la5kygcm5wmnrrzxag6ff";
+"crossreference.doc-2018"="p589qj9h7vi563dgh5lp2l1gmpzfkyrm";
+"crossreference.source-2018"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6";
+"crossreftools-0.6"="cc3q8liqzkqlik5ah22va24b8bdflzqi";
+"crossreftools.doc-0.6"="615l0i2pqm2kbs432z6plcjh3p806km7";
+"csquotes-5.2d"="wx2z3i0yhj91xf1xz89sk5ryfjjn3jg3";
+"csquotes.doc-5.2d"="zk095wb3qdl73c1xgqpx2xsl46p88nz4";
+"css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x";
+"css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b";
+"csvsimple-1.20"="i6qsbbiqd7520p3nclaq59r99f0rwz6c";
+"csvsimple.doc-1.20"="lj0s0945ydzqqgqdzph3rbfv49kawwpj";
+"cuisine-0.7"="nj3ryfmy997y6llg5b3l1lp84jw3vg54";
+"cuisine.doc-0.7"="50wqmjcv6v117qxi0dkgyzs293y6jx1v";
+"cuisine.source-0.7"="n6zv4r2yz1fcgswbshvyfzji7jga7m3r";
+"currency-0.1"="0zjamg4hcz845l1zlf5iyggkqa50d678";
+"currency.doc-0.1"="h25dvr7yv0z7z7yap10l9q8v6mn6zrpd";
+"currency.source-0.1"="160vxy8c7xs7q1w5gi0q6b6i0al19v3f";
+"currfile-0.7c"="8zm55f76nvvsgyjj4fck1jzqxfgv389q";
+"currfile.doc-0.7c"="y1cdz8qj6n4327smxxbp5fzmn7apg2cp";
+"currfile.source-0.7c"="bfsbb72fld42c15qq3zddgr0agfigc14";
+"currvita-2018"="119xrbrr7d5i8xlvzf15azymj8znxy2r";
+"currvita.doc-2018"="fc8s69xdfiir0a8g7594l7y0m7b5qsiq";
+"currvita.source-2018"="2m1krjlgi5ihm32cfr3ayxmz324zpsxp";
+"cutwin-0.1"="q1c752nzdf2jw9agyb3aj6ishnk3yy7c";
+"cutwin.doc-0.1"="pawz3k75s1nws5nd0ilhgvy3g5ndfwvp";
+"cutwin.source-0.1"="c9aw3vjaxldf082z61m61d7p7rsaynfb";
+"cv-2018"="xpyr31xcphpydv1iyqaalwxfqhs99cg6";
+"cv.doc-2018"="f3xak6320ql3rmbj3fvjsgcsq4mp1vql";
+"cv4tw-0.2"="zw6g6n1l4mcnjdbpfx36h1l7ix8gj6sv";
+"cv4tw.doc-0.2"="49ghjsydw5i13nwglc69xmm1z0ypxlyd";
+"cweb-latex-2018"="w87x1irky7jm1ixvs8m2ig97pk07m19m";
+"cweb-latex.doc-2018"="r4xzcb98w8khj070k9q23ygmq84pxqd5";
+"cyber-2.2"="qw2kap0b32i1zm67s9lz70mxc8v8smrs";
+"cyber.doc-2.2"="9fqzmqyaiclmpl947xwj5kjcp6fic9md";
+"cyber.source-2.2"="jkylpl3n1m87qch68sqm7njxgp8wv86p";
+"cybercic-2.1"="4j6x3ncl6dhbjmbsr75fp28k9p87lj48";
+"cybercic.doc-2.1"="6qzfny1ilk48mhh67pa12rn30v7r8b10";
+"cybercic.source-2.1"="9gxkmwvrrjg0h9jvj1g46hxd79i2pkka";
+"dashbox-1.14"="k72p9zmp5197sh13x688gaaxynj6ra3b";
+"dashbox.doc-1.14"="1igq59rchfjkn3clgbycq3q5h6ablwvv";
+"dashbox.source-1.14"="kh2n6zrij6b14rilncsp9xjnbcd73l7a";
+"dashrule-1.3"="bqc33kv2bljifdybb0qn7wvx48rb9xgs";
+"dashrule.doc-1.3"="vxa8hx7khicjjdjd8p5frwrv4b41fv1x";
+"dashrule.source-1.3"="94ga7n7xpk7wm3j37gp8innc0c0irdz5";
+"dashundergaps-2.0a"="vafhi12yxbjqhb4bgp2gi89cpjf80qq2";
+"dashundergaps.doc-2.0a"="r4a1xafim771asrn65cykzksyy166i55";
+"dashundergaps.source-2.0a"="a2m78ghiarpdvm045k9n0kiabsgixj51";
+"dataref-0.6"="s46my6g3mkk7d5g7fm90xxpn2d1h4gmv";
+"dataref.doc-0.6"="ap8c1b9ljp1zg3wpzfbp827kwqcjdp0j";
+"datatool-2.30"="4yrvl6vfhhg98b44m3fb2x30inxhilas";
+"datatool.doc-2.30"="np5m6z9wi6zypj8isx7wmph223bk5874";
+"datatool.source-2.30"="hl61mffpbbj450263wf8kp0p539s6m51";
+"dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6";
+"dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx";
+"dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy";
+"datenumber-0.02"="byp175cz7kzl8rpg8yyfxlcqfgqr2yfk";
+"datenumber.doc-0.02"="qp66n8ppip85lg6lfmmah86ilxygb5f9";
+"datenumber.source-0.02"="pfirq4wg801vxmbp24s059l8ip1w01r3";
+"datetime-2.60"="59y83sl151h396xz62kp975q9vplg195";
+"datetime.doc-2.60"="dzj8ihkcdv1hcxxi5vrqbv8ga05mx6l1";
+"datetime.source-2.60"="b5x1cfqxg3rlbmdzc1g18i76rk7m1323";
+"datetime2-1.5.3"="1q7rz88d9g4cpi9r1c42mq8wdnxhv8b9";
+"datetime2.doc-1.5.3"="yydvpzhqm5a4yl5cxbr872xhzj10b3gl";
+"datetime2.source-1.5.3"="pkdwwms3zv1dll96nfbb7hj348wiyc5y";
+"datetime2-bahasai-1.01"="avsk4v66gfbscliygrhgk7jvfrv5vyrq";
+"datetime2-bahasai.doc-1.01"="km12sq45cjy831csfq3j0gvy6458j86h";
+"datetime2-bahasai.source-1.01"="y87vz4sib2zw70643lm50cfsknzxnydm";
+"datetime2-basque-1.2a"="hd28pvhxgxxdv9swsnkxvk0d0kmaklxp";
+"datetime2-basque.doc-1.2a"="4ad1pps70dfj98vara5i40fxhk7wsdbc";
+"datetime2-basque.source-1.2a"="8k9957zfg160fs11y3in9js5sabnv0nv";
+"datetime2-breton-1.1"="qr562jcbrvfb4dg45bvxhwng6np7afj8";
+"datetime2-breton.doc-1.1"="x87alkc8bcclzw83f2wxkijms2bi511q";
+"datetime2-breton.source-1.1"="ljrz1n10pl21j7psza4wrvq3qsyvm4cz";
+"datetime2-bulgarian-1.1"="2mlgshnfxai3cpyfy841gm5r07549b9n";
+"datetime2-bulgarian.doc-1.1"="9bnrpw5xshwk7ab59i6argivzd6rnajs";
+"datetime2-bulgarian.source-1.1"="q3jlh85lc1gvp5bxrgh157q88qd56dz1";
+"datetime2-catalan-1.1"="08ckh0hp6lfnm6qvzabn0vfmvpyl8vm0";
+"datetime2-catalan.doc-1.1"="d48asmv26bwgj3zrmp3qdd1z3mld36rr";
+"datetime2-catalan.source-1.1"="mhqp7hh372ngmqv2crrwbhgkkbff7phi";
+"datetime2-croatian-1.0"="7mgjrg95fhf0ymsd2qh68vqqpnw7zpsb";
+"datetime2-croatian.doc-1.0"="x1iac95ydc1sfl5pyy43rrcq9kfa0x29";
+"datetime2-croatian.source-1.0"="sjxvyxph076ciplf0x4274cs6v25z1p3";
+"datetime2-czech-1.1"="481xwx5sfb639j02pz7q3fyzlw4h1xyr";
+"datetime2-czech.doc-1.1"="r9vmd6q4gpm64bglx5n8s6ihl0vm4k02";
+"datetime2-czech.source-1.1"="r8r5q7xy77b0q3krh6rdnc8kq98nwgiw";
+"datetime2-danish-1.1"="maqjjmvq99nxzs36an7fsym8wx884ra5";
+"datetime2-danish.doc-1.1"="qlbz9mfg4z54k9q3qx8xjq3wlz2adczn";
+"datetime2-danish.source-1.1"="zby5mapa0jrx7jhcci00c5p7bqr6crn0";
+"datetime2-dutch-1.1"="rfaajlb5k6y5fk5sphbqkyym5pfqmykm";
+"datetime2-dutch.doc-1.1"="fy3a9l5gk06dm0l5qfq2bm7djl6n6a23";
+"datetime2-dutch.source-1.1"="hfy19bpgiszqawykzqk15724ixlbs9ks";
+"datetime2-en-fulltext-1.0"="j2vw6akprfz3kwsjy5rnb6qnlnmxp9ws";
+"datetime2-en-fulltext.doc-1.0"="q954riws1f9b7ij9c8h0kg3n8zqdhgk8";
+"datetime2-en-fulltext.source-1.0"="54ky0fywkli0nld3ydyqm4k2nnvzl280";
+"datetime2-english-1.04"="g7v24hvkfxnqb43y0vz7v69nkivf3v9g";
+"datetime2-english.doc-1.04"="n6pvkr88fwq9pbhi4lzf2757mrb2dpfn";
+"datetime2-english.source-1.04"="b16bvzwmpqq5z9vgbcsijs1xj4q2hjgg";
+"datetime2-esperanto-1.1"="sf619gxrxm602kjrlslmzd271v5aynw2";
+"datetime2-esperanto.doc-1.1"="pn0jcv342fvczyn2lq6kyi1pbvk689d4";
+"datetime2-esperanto.source-1.1"="91kz15x4skcwsis3c0qjr751vyvdsmpd";
+"datetime2-estonian-1.1"="3x0q23w9xzh48brrkyriqah92488m03v";
+"datetime2-estonian.doc-1.1"="pq4p7wkvmq1z815nk92dcphmya6cska2";
+"datetime2-estonian.source-1.1"="a3dmirap9z4b3cw83y2z7y1dxjlxkibs";
+"datetime2-finnish-1.1"="xsrppqvhgv3agc5d1vgsql812rzfc7m7";
+"datetime2-finnish.doc-1.1"="058m3p472vmra4r5i5f3yjyvrga1f63k";
+"datetime2-finnish.source-1.1"="kxcfwal2hw8hh1niyj0zsghihx3cinpa";
+"datetime2-french-1.02"="0n2l9y4431i1092wkk8h2fkmk2pj1lmx";
+"datetime2-french.doc-1.02"="gc0pp2rnx16vgc4qq359ch6i61a8mbsm";
+"datetime2-french.source-1.02"="97fxzb9swgq0nwisql0fngik9c203pkc";
+"datetime2-galician-1.0"="jdzbi8dkc958r8fvpb5xqjmz7i5iiffz";
+"datetime2-galician.doc-1.0"="kanyn2kcrxp309crnj0wg3v34w93jndg";
+"datetime2-galician.source-1.0"="qjnph2vad7hl5d3jzzn58mz90jyvpgw2";
+"datetime2-german-2.1"="g1wcr457pvxv9ld9qq6b6av5z25dnrsl";
+"datetime2-german.doc-2.1"="6nmwahh375c3hw4jizqh4igdv4k0gfvj";
+"datetime2-german.source-2.1"="x3g3i850vj5zkp3103rjzniwrqy750zs";
+"datetime2-greek-1.1"="0yigs9ycc8ncyyjwzs1vhxgmvzr93rqk";
+"datetime2-greek.doc-1.1"="4w2gjy95fh4m73w46fm86gq8iqrrxwxn";
+"datetime2-greek.source-1.1"="fclkgy9d60pz0m6pfmirgrw0bdb2dwqk";
+"datetime2-hebrew-1.1"="w1dcd2wy5bdgcrchmwiqbwr9rpbabkcs";
+"datetime2-hebrew.doc-1.1"="xyvnscz0f83bzdk274acf4zqp74pdhm6";
+"datetime2-hebrew.source-1.1"="yx2kaxa35r99whh2yrzhiydmis89c5wv";
+"datetime2-icelandic-1.1"="p1qxpalqhyvs0gvwk55y0gz6f2q9sw4m";
+"datetime2-icelandic.doc-1.1"="za1d739glm25a6vm9yyyqsbhjc59lb5v";
+"datetime2-icelandic.source-1.1"="ngqx44p3nr2pw4awwwd9sdpjd3jwr0ai";
+"datetime2-irish-1.1"="c2rxvcqppd332k261a466wsbabfkklml";
+"datetime2-irish.doc-1.1"="yi5v86mssgpf4bvajvmf6l0hmahkcm36";
+"datetime2-irish.source-1.1"="g2q4nz3xrviqzzq88q7jljcv1dl8cjil";
+"datetime2-it-fulltext-1.6"="36m93xw965mj6dn75iwlls9nwzilr3bj";
+"datetime2-it-fulltext.doc-1.6"="7m7hh8w9cl1amldgbh9nkxxadvnvrdkw";
+"datetime2-it-fulltext.source-1.6"="x6ycnnq13kqphgfiihrhcjmg9ij4adl3";
+"datetime2-italian-1.3"="q26yh7zchpfg5gb8xraflh4vp7sa09k3";
+"datetime2-italian.doc-1.3"="rg34p52lxgj6s6cvi8r168psyknkgdb0";
+"datetime2-italian.source-1.3"="lryqdqsg9yk1d9xj866xf8fj0dpwyh3c";
+"datetime2-latin-1.0"="sriib5ngxy04w6xm5ii13a1l6safqsa7";
+"datetime2-latin.doc-1.0"="kls2lc68c3j7f2si0pdx1rsw24rgga42";
+"datetime2-latin.source-1.0"="07cw09layjkvklwy1ndvkai1aglbplz0";
+"datetime2-lsorbian-1.1"="ggcqlpw3b3rvb3blyw9p39gyj3n9ixki";
+"datetime2-lsorbian.doc-1.1"="nqkh7fk0l7zkgi07n7q9x0wl3mcqcf40";
+"datetime2-lsorbian.source-1.1"="q7bj5qd85b4nwgz3gfypsln5x0rj467c";
+"datetime2-magyar-1.1"="da1qjb06hcwmp0qw9hrrhiwl4rfxji5a";
+"datetime2-magyar.doc-1.1"="v2gzjv7nj4sgzym8bar1gz9rpjwbnf3y";
+"datetime2-magyar.source-1.1"="l052vx4a1zsdkbfwqmixi7ad6rz6277g";
+"datetime2-norsk-1.1"="9x884mr1av0xa2acb44cl38arn274z8i";
+"datetime2-norsk.doc-1.1"="4w6bjaid66pf5bnx7ya5vr023mi0bc3x";
+"datetime2-norsk.source-1.1"="r8bbhi1n1k6i635nwrs7hgglgf4sdwal";
+"datetime2-polish-1.1"="i8b07wq5ki25wh7j75gvimwdkd4psipi";
+"datetime2-polish.doc-1.1"="aqarbr89imdgdvqgnw5ggvp09r2dvmc3";
+"datetime2-polish.source-1.1"="hhvb5n65n0n8jv6anqmxrps42p00cvd8";
+"datetime2-portuges-1.1"="pbj76lwnghjjw5vglf9s05jqzkfc4gsf";
+"datetime2-portuges.doc-1.1"="mpg9vz4wd4b3vb3ksyxl21j0wsr2n6dh";
+"datetime2-portuges.source-1.1"="fcjicqpvz5cbshrq1w9y2a19sz0hqifq";
+"datetime2-romanian-1.01"="4cf2q7zs9wccx1cg2an0gfr3pgbfgvld";
+"datetime2-romanian.doc-1.01"="wzjqwrn0xrwhvz5yqdw1v9942h6f1s4b";
+"datetime2-romanian.source-1.01"="9apbkgyiy21r9lahbrffpnn3l1b6z7fg";
+"datetime2-russian-1.0"="dakjxs08ikkmwmw1qwyb8a8p811g1vwh";
+"datetime2-russian.doc-1.0"="dav2bsbdv9v5b59czrsv601njxysf51v";
+"datetime2-russian.source-1.0"="vmfldg1sdbk8yb3p4fikd58fglvyg24g";
+"datetime2-samin-1.0"="w129asz06xl1j98npnpcflwmw6pjih0j";
+"datetime2-samin.doc-1.0"="p084xf6zh9hl19q7j5kbjqvrh22xgnjx";
+"datetime2-samin.source-1.0"="b0xi07ag8ifj9b2wxjzas82103d11mbb";
+"datetime2-scottish-1.0"="haf8z2vcwv70wavrj1skkxqly9rxv65p";
+"datetime2-scottish.doc-1.0"="gasr5azq08139ml2fvph01ikxpcrdlpp";
+"datetime2-scottish.source-1.0"="zjhfiihijw81rvacw8kjwq4bil6hi2fc";
+"datetime2-serbian-1.0"="nx5gf5inr1p1sf1knfsshi6ppljvqjbr";
+"datetime2-serbian.doc-1.0"="d787l63hi3qziiwrn4ddp25k7747p998";
+"datetime2-serbian.source-1.0"="22sxpklg0mggizc8bicy7x8hyx9vqn3d";
+"datetime2-slovak-1.0"="7m9d038l0zr0npb8fy9fh6n1v0lswgzi";
+"datetime2-slovak.doc-1.0"="m5j1zgplxa368k45rib1nqx6sd2ipcgn";
+"datetime2-slovak.source-1.0"="mqmhxsh32bknr3w2nv7mrl1ls7sn6xqd";
+"datetime2-slovene-1.0"="hn5z7ka761lq4xy2gz3idsrqkbkdqrf0";
+"datetime2-slovene.doc-1.0"="55rrnajlm7rhrlyirrdxw699gd4x4lr1";
+"datetime2-slovene.source-1.0"="4pc9aii99chcdigi8c5vh9sfyyjly22d";
+"datetime2-spanish-1.1"="x6mlabgqr35m0dw6zkgj7czgxs3kqj01";
+"datetime2-spanish.doc-1.1"="8szzfhyvgppifac3m38s2r57w4dkajdq";
+"datetime2-spanish.source-1.1"="h287bxi9k4xx909qvkrsywyr86nh1qjx";
+"datetime2-swedish-1.0"="kmnrfgqk01ygpd1m25q8s6da0wm39bdy";
+"datetime2-swedish.doc-1.0"="r2scfwnn257vximpv7a88qbmrj2v2554";
+"datetime2-swedish.source-1.0"="swif8xn3c7p4w00cyxxlwvwjh4k82789";
+"datetime2-turkish-1.0"="lk7wm07qz96rfzi5g12hzcfwbdqnxmi7";
+"datetime2-turkish.doc-1.0"="86yp3mb4x7sl9im3cvxvfykfljc0cd8j";
+"datetime2-turkish.source-1.0"="4bzavnlmpy63vcfhjygjmhl4lf233m6x";
+"datetime2-ukrainian-1.2a"="wmslcc8x7xkdzfd31psz7l7mfdpg5r14";
+"datetime2-ukrainian.doc-1.2a"="cyjjb5bmdwqp5by504r3s9s9h29r1bnq";
+"datetime2-ukrainian.source-1.2a"="3lj7rpa4qvljhvwgy6nlb0abmydgvqyy";
+"datetime2-usorbian-1.0"="i5kdakk028r0jrim2pc65gjj38501dzs";
+"datetime2-usorbian.doc-1.0"="ab6bfr9w1ybl26abk2vac5baffgsx8ib";
+"datetime2-usorbian.source-1.0"="p3xf2vlz24av6j4zihdig8jkf9xf328v";
+"datetime2-welsh-1.0"="csy75jcm6aqad69jxhm7m01j04802pff";
+"datetime2-welsh.doc-1.0"="5qfzf2lglwj0399cj5y81f8a1y3rdv33";
+"datetime2-welsh.source-1.0"="2a3pn8nifx6bc81zk45cg8p0vdnwhfw4";
+"dblfloatfix-1.0a"="d1796nn206cs1jsas8kc05p0bfcb80rm";
+"dblfloatfix.doc-1.0a"="2rgw8lakmgyv5abzbpcngs9g1lrfdps1";
+"decimal-2018"="a7xks9vjp0pa09i5dbwz78n28a8fg83d";
+"decimal.doc-2018"="ib5j82aqc5l2rkggx5s3i7h0vz81sw01";
+"decimal.source-2018"="znw0p5x4xyg8nbaa0840lw7i27bczkf8";
+"decorule-0.6"="pia1d0196sj7qkdyzximhpf0bidqv7pg";
+"decorule.doc-0.6"="p42gqybrsy773lypbb1nrjcigycf1ilm";
+"decorule.source-0.6"="q90xhppxnggj3gqx9vaf5qvc4aknfbx1";
+"delimtxt-2018"="akp06kcf04g4dx2ph7bs5cg4byld136r";
+"delimtxt.doc-2018"="ddxva98pp4ar0bxdlpbh6v2rxlai5d1n";
+"delimtxt.source-2018"="j788dpwxgryml7ny68nzab9c3dy0322z";
+"denisbdoc-0.7"="fxcj67mah72g8w5xmrwb10vm1hxmciix";
+"denisbdoc.doc-0.7"="k4qq3apgqk0xgxgmrmqpl039hwzb478p";
+"denisbdoc.source-0.7"="45fl1pbbkiwk3b5cwl9ylcs1vxpdz8m5";
+"diagbox-2.2"="mcmg51aism26pvqhs198yngx4sq7hpcs";
+"diagbox.doc-2.2"="p1vln62lkw76jldxxcgr0wkraidcd3fr";
+"diagbox.source-2.2"="a6m49qkh7w30xgg342dd4vs7kpcf8kkx";
+"diagnose-0.2"="dbkvix4h3jhwq9pd2g9ydknc87z3zlr3";
+"diagnose.doc-0.2"="0b0ajzf5gvv3901szcwnkb7938sgqqr9";
+"dialogl-2018"="qn4qmw5yrhvim6fdl2gff1vl0ca4dfs2";
+"dialogl.doc-2018"="bh2vp79kq5adw6smmn0kbkhgk27qqq71";
+"dialogl.source-2018"="zqjq4a7kp63s0m7aq57ragybmigrf05z";
+"dichokey-2018"="0gjqadln2d38gclhy9ggf3i8vcnf2bfm";
+"dichokey.doc-2018"="af0pz0ixx95k8abfhximgla5jjly9ddf";
+"dinbrief-2018"="49584j24lg6vxazw8rqbhzcf0c7anbqy";
+"dinbrief.doc-2018"="i1dwsv81v87ll6wipvd7idsg8vym61k6";
+"dinbrief.source-2018"="b3hcmv6mjq48yhjl7g32yv9s1p3d0hkw";
+"directory-1.20"="7r6n8s393idf94madvzpfz70qvmy9n5z";
+"directory.doc-1.20"="shvbxhb02d3lw1sn3ayvx5xs6qayxjkh";
+"dirtytalk-1.0"="1a6r7pzqjy14f4f7vnlqgqdb6r0yfm1g";
+"dirtytalk.doc-1.0"="h383wrcj7pxb3mnqnssb48qx0zzw61gx";
+"dirtytalk.source-1.0"="dzvypzk6yrjli5zmr06xc2mqyajrvz1j";
+"dlfltxb-2018"="ms6423aqc91c34fmxw8l47d5kbk9yc6b";
+"dlfltxb.doc-2018"="kb0p5vzgr45gzbmwzc9mrk8hpg1z6x0h";
+"dnaseq-0.01"="719cl1bfw7c1psv115pmrn7bijd0kxsr";
+"dnaseq.doc-0.01"="f8yw32bkw0chrk221qga668jpfnb3rk0";
+"dnaseq.source-0.01"="7aw7332aklsigpg8fazvv7ips2a236x6";
+"doclicense-1.8.0"="iykpppjmrwbgwdy62lfnm011ha2plkfk";
+"doclicense.doc-1.8.0"="1gvlh4ya6xzvwqyffjwzvmwk84qybhjc";
+"doclicense.source-1.8.0"="amnmxjfsdcaj1z7450dq7zlp0ciisxg7";
+"docmfp-1.2d"="5az4cgljj1gmc28z6kwy9g4h49gzkplf";
+"docmfp.doc-1.2d"="rn7s95z09ijvddynz2dda2lpqidzbbnw";
+"docmfp.source-1.2d"="c6swy2dkxzrprrl0zjbphcf15x6my5l2";
+"docmute-1.4"="ijpgwid57874xk9w7p4g4m14j770awwi";
+"docmute.doc-1.4"="w8i5cy5mp1780bglwn08kcywk3q1qqfp";
+"docmute.source-1.4"="qqarpddqxfb4lk6cjsz4d68wvkvqrdn9";
+"doctools-0.1"="xddfhcsq7f0la61bmdv474avf8vm7pgg";
+"doctools.doc-0.1"="zhwqm1k0dl068scr7sfypcii7nkjp01p";
+"doctools.source-0.1"="sfrjlg9h1icqa2wa9m3z2ciqc8j4fzc2";
+"documentation-0.1"="kji3s9vf00jpl198nm49dxfxw8yh3xkh";
+"documentation.doc-0.1"="ir7a948d9yliinmb3y55vx8wa2zi4ada";
+"documentation.source-0.1"="gjlkrc2a087589g9lrk9sh8g4q0l03vq";
+"doi-2018"="g36rm3hngqxngcvb0yiavp760ln0z88j";
+"doi.doc-2018"="bvpm72vndaq1rywjrpa9xv6x3pryqk69";
+"dotarrow-0.01a"="an0dsydrk9bfcahzi356nrfq9fw0i9fs";
+"dotarrow.doc-0.01a"="ay137znk96s545wq4sligy3q832m4g91";
+"dotarrow.source-0.01a"="g5krgdbp4bdfhk40s759qw2j6f7n6ss7";
+"dotseqn-1.1"="pvfjw24r81j8403qav5bfd3i6xfk3xr1";
+"dotseqn.doc-1.1"="7iq10vxjnn14rvlpy10clnrq0kcs0a5q";
+"dotseqn.source-1.1"="fpkmmkp37gnl7cg75i820ry92s13vkx2";
+"download-1.1"="mrhh5hmhypwk95rzjgzp59wjx1alvqf3";
+"download.doc-1.1"="plal7xhskmrylmkpra45xmw0vf4sgd46";
+"download.source-1.1"="r5lrlmp4ccxlmzm1h7l57d17cmgdsmww";
+"dox-2.4"="vmv0sf0gjb0hgimhyyxah2n9z7kfc60r";
+"dox.doc-2.4"="mjc4chfbw9nnq06h6sr9v5q7mx0yf3w5";
+"dox.source-2.4"="6pwhbz64rwylp60nhay1ij6bls33aqcx";
+"dpfloat-2018"="lad2kjr2qljjmnrygdlhgqbhpj8cxqb2";
+"dpfloat.doc-2018"="j3mxi39ar6vsyz51w7dj3nsnrrcsqjpy";
+"dprogress-0.1"="6bz0iy8fa34famjb67k3q1xhsca311k3";
+"dprogress.doc-0.1"="9x4n68z2vp63dvhc4g30yar4z70xkxbb";
+"dprogress.source-0.1"="g0d00q6x7wagml9hphd9b2ddg7zn887a";
+"drac-1"="kswhsywlysyj2k87dxad6wyjl2zxj584";
+"drac.doc-1"="23j8r0v8wyivwydi9ij6783d91nd6r00";
+"drac.source-1"="hi0yz77sqs9lj3dqvj2h0zgkmwac3r16";
+"draftcopy-2.16"="jpi5kv4l4r74ahxh9m4nw338hlx9qjxc";
+"draftcopy.doc-2.16"="x49fj5rzavabrdw8c8j05nnqxkdjlhpp";
+"draftcopy.source-2.16"="b6319hjnccfx3xxfrxz1kmx9813aik0a";
+"draftfigure-0.2"="w154bzgm94wzqs4shyi3vir6vzfd7324";
+"draftfigure.doc-0.2"="n3cvgb3mn0a0asrk5wng4f5pnr36k337";
+"draftwatermark-1.2"="r78p4n8jbzjvx8p7gx1fj7fp4h56x4xq";
+"draftwatermark.doc-1.2"="6mzqbw0grmivgby8vqiqf04i9dnvvimb";
+"draftwatermark.source-1.2"="6p47ci9wfjq7svn09df09p4jxwvyfzxa";
+"dtk-2.07a"="ygp8d66wn5xna4hlb3r8x7ycp652xqmz";
+"dtk.doc-2.07a"="7f2zzwfwcb6x4a7yg79d12yf63k0n7ly";
+"dtxdescribe-0.11"="fnbz0bz9zkpfgdjfljiq2g2gkp9i8s8i";
+"dtxdescribe.doc-0.11"="ywlcqzi188v7n7k53c67dlban9yzlri7";
+"dtxdescribe.source-0.11"="bi5h6lc33ay8mjhhcgxv9j27qahspq55";
+"dtxgallery.doc-1"="fsbqzc353dbd3705kp716446mghsnn19";
+"dtxgallery.source-1"="74z8aaywbl3hhfk0lpw3mgw9sinxj01m";
+"ducksay-1.2"="wn5aya3fgplfkglrhjhsclqjpvrr6zjv";
+"ducksay.doc-1.2"="0vri3yh7qn9pffwdgigv3gxbzgqb0253";
+"duckuments-0.3"="1pi6vsfrmmskij2w6gl5iwfwsk10r1hx";
+"duckuments.doc-0.3"="47xmzsszi3vr0qb35a5q4kfhk2610a8j";
+"duckuments.source-0.3"="pm02cpxiw87aqzcyjv5vpwn77xij7mzp";
+"dvdcoll-1.1a"="x9xdlwqrbq8wflwbwkabwyi9bg8rakqz";
+"dvdcoll.doc-1.1a"="m88326jypnn2i1bqgv458cyjdzdn320i";
+"dynamicnumber-0.1.3"="p6s0hyavqqz8hsfca8ymfqd63ajpbgam";
+"dynamicnumber.doc-0.1.3"="28i12f55m00ma06xi4575m9mxlzlk5j5";
+"dynamicnumber.source-0.1.3"="1s5p8px5hk951cifga7as2cys5p9v9g8";
+"dynblocks-0.2b"="svrn2iyvz97vsdz7zf2npfjjmj1hiiwd";
+"dynblocks.doc-0.2b"="vbfwn0p5rpddhfbj5dzzg8y777i69s62";
+"ean13isbn-2018"="mc1jwh057knlvcn9rh4z55xf23cx3lnn";
+"ean13isbn.doc-2018"="bdnaafy3hkiz4prf7q3fkn00gsf1fw47";
+"easy-0.99"="jb9dranvwd0ngzigpq8kla53wnd99fiz";
+"easy.doc-0.99"="m4hx4j5snaiip3mzz1hnakcqjdmhmy4z";
+"easy-todo-2018"="303p58si7jhry6gzkiqjcdhkgdxdj8yn";
+"easy-todo.doc-2018"="19xs0lb6swakg1f9ci5gfmmfbddcirvp";
+"easyfig-1.2a"="l6pbmvwsjjnrpxl6d9v6askvk0fvqpyn";
+"easyfig.doc-1.2a"="glg4115m5lkacjxdq29my9a01xn5mj13";
+"easyfig.source-1.2a"="szidzjjq2h8aiqh995xcd37460xx5lbz";
+"easyformat-1.4.0"="x6ad1pxvbj09q2kypdg6z5js8q11a7k4";
+"easyformat.doc-1.4.0"="1g0wbnrc4snik4hbzldn9c015ry80n50";
+"easylist-1.3"="3mri8pvv7jc5lkqkmzh8h5a4x8agh702";
+"easylist.doc-1.3"="7ak9lbazspcv1k8yi2j3shf106v4spjx";
+"easyreview-1.0"="gc6ml3qw7j723r20jxc9lvrfm5ll2ljl";
+"easyreview.doc-1.0"="j2jxwz2fimhqyd5j6hzrgamn5cjs4azf";
+"easyreview.source-1.0"="8x8h7c1lldi9mzmwrgcvi3114gh8y3s6";
+"ebezier-4"="m8m99zabbk55zn8l16z2qjpaw2vilfy8";
+"ebezier.doc-4"="mybqgr1ksi07qkwjgr014nbgx47q6rvy";
+"ebezier.source-4"="rpwm8s3jxc47d28595qx4gdgipc9aj45";
+"ecclesiastic-0.3"="mw0n2vbpdvh26xpjh29avdz7lf2jhhx5";
+"ecclesiastic.doc-0.3"="2qblfhxs7h9p9wnrx6m73drlgvwnk6ql";
+"ecclesiastic.source-0.3"="0cv2d5838jv4ra4slgvfp2fkl1v2kv7j";
+"ecv-0.3"="hb27xhgd224h3rwx0bmrkrf3fyjgcsc9";
+"ecv.doc-0.3"="dmf8p191d4s0dvsdyiv1850dzxxg86n4";
+"ecv.source-0.3"="wn8c1zrx28k418cmj93b7ngbg6mrg0q8";
+"ed-1.8"="i6pnwa7a3fvvlsc6cfdzm73c8zh2wjf2";
+"ed.doc-1.8"="bxhdx8i27bjbxybz2lfwk4wjl597mgdk";
+"ed.source-1.8"="3lq35kmqyxqrrj9rznwlj922iwbxr6qc";
+"edmargin-1.2"="crg5k7p997nxfxjhlrv2wcmvb673g0ry";
+"edmargin.doc-1.2"="wfdkbmlhvmwcba9jkg3p83vsqj4k3dxh";
+"edmargin.source-1.2"="j439fzcg8r3rcwr9kadrlx9rp4wvxs9r";
+"eemeir-1.1b"="3d02h2i8l1dz6rljyx5my514qhw1w35p";
+"eemeir.doc-1.1b"="y315ys2zhrnrpfdw1yz0ciay8wsncmvb";
+"eemeir.source-1.1b"="0v0yqby3x8cgldrz67qlkqd5hp4xfh97";
+"efbox-1.0"="lc1r9y6znpl59qq6j0dwksxgnkrwh985";
+"efbox.doc-1.0"="jgi7nzhs6x37syhlpizfc8nnnwqamnqf";
+"efbox.source-1.0"="94p7n1nxcpax59q64i4hygr4gz6z7qjg";
+"egplot-1.02a"="wjw51hmdhl76wqrgj9ylhyb656rfqmg9";
+"egplot.doc-1.02a"="3ybfma3qjwnmd9djk0ckr22kvln7ksgi";
+"egplot.source-1.02a"="lpd8c8hpz0vpln7hq4ck2xm896hhkjz5";
+"elements-0.2c"="abndi4qwsp7wf4d4df62z9fb1nsp5qga";
+"elements.doc-0.2c"="wpa8dz8d8l3kj03x5v4pv44m96rbjq1s";
+"ellipsis-2018"="cnpqy3kavs6v3r35x6hp9cny47lp47vq";
+"ellipsis.doc-2018"="pl4c26az5319bjkqmp0byyjh6m2ghxnf";
+"ellipsis.source-2018"="s1vmh5xsvqrwhd0c4qqk4qw9pgmm62ms";
+"elmath-1.2"="pljnyyb5wp8n5f7g5wp2hb0f7aizxwyd";
+"elmath.doc-1.2"="9rrybpg3pziqa42bkhblp14jjz6zgm2v";
+"elmath.source-1.2"="fnw5k3ck3nbphv71xqlyq6yisgq04xjc";
+"elpres-0.4a"="mqyj4aylv6lah36gxkqrdcl2a4jgvnlk";
+"elpres.doc-0.4a"="fs5jy5zzc8jg2v0gbvqr5nwdad9bmz21";
+"elzcards-1.23"="p6nlzsxv09zr1g0pw4y4ldmlmvsi09wz";
+"elzcards.doc-1.23"="lmgv45bh0c4ka1a2yc4xkz08dxby4hfj";
+"elzcards.source-1.23"="y17rrin365qx9zrx5ja7k9bwws1ar92h";
+"emarks-1.0"="98dkcqyxwjzmy7r7piap7kmf3di5xjqg";
+"emarks.doc-1.0"="caipsh0fic83rak0dbdjfmgkvppj5ini";
+"emarks.source-1.0"="06wmqv5p4nhaqhcb0i8byf6s600bq7in";
+"embedall-1.0"="z335nw0mjz6g6gjn2xhifqa3ab9i20sc";
+"embedall.doc-1.0"="xbw4wwbl2ri0mmikx2vfqz557pq8ilr8";
+"embedall.source-1.0"="2xz175j1v7zvc3ndvgnwp5kvqpni6vs2";
+"embrac-0.7"="80kckrxa5bbw60nrx7c2smx26ldlb6l1";
+"embrac.doc-0.7"="d3kv5937wvw26jlz66wnf272iiidql0p";
+"emptypage-1.2"="lbjvj1gf2jiy15yj86d6jxlhrk66zmrm";
+"emptypage.doc-1.2"="07fnrxjidk9b42610wx6696cah8p1zdi";
+"emptypage.source-1.2"="svha86185zhrvab827x8nbn02vlp027l";
+"emulateapj-2018"="2ywrmmrvlkygp6a86i56rn9bm6wzqqki";
+"emulateapj.doc-2018"="ij4q6ixvmmh8xwq7kgb0hzvhz5pcsy68";
+"endfloat-2.6"="00fwiy7qr2gmw0890bwh56cpkzgngmak";
+"endfloat.doc-2.6"="lj3858d0f57sbrnm1f35bhfcb2afmv9b";
+"endfloat.source-2.6"="rfvjryrql4n1ihvkbvhbnyx7992pg2pg";
+"endheads-1.6"="0gjn1xldvixl6lh9n2g9gyly9va84sp4";
+"endheads.doc-1.6"="y0phz9mfklcq56h6mwkx2jd535v94r72";
+"endheads.source-1.6"="x01kj0pd2b1ljs3457l1b7880vp8amdx";
+"endnotes-2018"="mwf7b44kh21vis4mjglri12m2ji0fkyq";
+"endnotes.doc-2018"="ksik52m1c5n390015awpj4hszf621ih7";
+"engpron-2"="d0k5j6bdrzm418x90n8858cyw85i439m";
+"engpron.doc-2"="4mhw0220r7x85dshmar87b3jydn2jxdd";
+"engpron.source-2"="3rdxi48m3h33kn1z81md9izji6my7sdk";
+"engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy";
+"engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk";
+"engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp";
+"enotez-0.9a"="saxj59f54nz8jpg1bcacx3izk6ijbbfy";
+"enotez.doc-0.9a"="f16i6ia9mvylja841x3s2z3nhwpvriaj";
+"enumitem-3.5.2"="0rjr25bj1ymnpq332cvmmmscrwgjc0cr";
+"enumitem.doc-3.5.2"="a4f9yp8sgbxgxvsg6mz3p71pshjm76h2";
+"enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4";
+"enumitem-zref.doc-1.8"="nq73212kl36wimf8k4m37xzb5pr6qqdh";
+"enumitem-zref.source-1.8"="3l875sm2v3c2frxhr17rv80q36n19a9h";
+"envbig-2018"="9jl4id16g9bmsqwwdbcdp2925m5c381k";
+"envbig.doc-2018"="5302z09wsidh1fvnfs5d7zf3fzd9z967";
+"environ-0.3"="abj66v6h73l8sj7rll1v0czlx99j5z8k";
+"environ.doc-0.3"="rq5cywlfalfd6c2585ihs8mabnadp2n0";
+"environ.source-0.3"="r3bq7ppaqwidvilrf1hyniqfk1fdh4d8";
+"envlab-1.2"="iqf24bqqcnpp7kiysfb5dy4ksw2ni0pn";
+"envlab.doc-1.2"="5xscix7j6x6fbscw6hk22r4qz864y654";
+"envlab.source-1.2"="ndl09cfzl24rbp7rw71lcv2q6dn9pdih";
+"epigraph-1.5c"="6fjixgh32n7mlygm6dz3xdiv4bzd1p70";
+"epigraph.doc-1.5c"="mmk8d73w2mkhya560hvdz56nvw8l5vz2";
+"epigraph.source-1.5c"="6zj62nlmzvi5pagymipk9611glql8pnx";
+"epiolmec-2018"="hpmg6yy63c52078mqmp861418xi07rgk";
+"epiolmec.doc-2018"="vl11cbnw0avwvjf8ad01fziya1dzrbh8";
+"epiolmec.source-2018"="1b7as37h0ncqjvsypwc9wdzzjhs0sfhs";
+"eqell-2018"="24n6gsirzxiyv3avcm27hll6nwrybkk5";
+"eqell.doc-2018"="xwz1qv3l0345p2al1p02dc5k3f77k48h";
+"eqlist-2.1"="jajr72vgjddrwagibq1nmhf9lqqsk66n";
+"eqlist.doc-2.1"="ln486bm8phd0pmdfa75rjy6p1bwqzgmd";
+"eqlist.source-2.1"="r07gp9r0wb57knv1gy35kwkvksz9bxd2";
+"eqnalign-1.0a"="lcg6zvxcnzmljvqfv6lh1majiywkwnyq";
+"eqnalign.doc-1.0a"="h21nzl5g0hqh3513gbipm4fr79i6pljk";
+"eqnalign.source-1.0a"="m8i3vxkn3ciab2p86shkzzzx2ckp9d7v";
+"eqname-2018"="mjcyi6q46c5jd44m8m9wzx12lhqir4a2";
+"eqparbox-4.1"="c3v8vdwcjfhn85751995viymlfgwpwr1";
+"eqparbox.doc-4.1"="9mn192afkzc3pzxp5xxsm7kxpaa3yis1";
+"eqparbox.source-4.1"="s206q1m2wkjsvjz23xlsx1yy603jjisa";
+"errata-0.3"="kgx1zy8j3g12czpg8hhnjq6dwa3m8xqn";
+"errata.doc-0.3"="518rdbnh3w5jsk4vlfp93cnag3kaiwmy";
+"errata.source-0.3"="p27pa3b4plzwhxl8vpr7qigbnr8aqv11";
+"erw-l3-0.1.3"="481cp6s0xfl52mrsalwrx2k3vzl4xl9h";
+"erw-l3.doc-0.1.3"="axjq9h5zgjvnnx2ccncf2sczgq73m315";
+"erw-l3.source-0.1.3"="2z3s0cf7f2nqjk12sgirrdrg3ajj4d3h";
+"esami-2.5"="8b9bvz0jsn56nq9d27l05kfmwhggm6sw";
+"esami.doc-2.5"="y2n8zs9pk1a3zn1ag5sw4sm0kbaclqr2";
+"esdiff-1.2"="q26sgf5s4ans9qv984p9s04pginqby9z";
+"esdiff.doc-1.2"="67vh3nycsw9h9vv7k25agixsmrdg0068";
+"esdiff.source-1.2"="xy6y4za3k53myl7dxbjxm21rcskb1mqz";
+"esint-1.1"="gl1f53zj32cqf3vy7rrhj1l5g5lb0vvq";
+"esint.doc-1.1"="rnlcq3gjvqz0728pydxz3q5cpbgch5fy";
+"esint.source-1.1"="sw4zxm0z19980pq7f9fxkf0b0v7yp9nf";
+"esint-type1-2018"="0fwcq5cpsqzajzlp2rc9ffmcwg5fb5ja";
+"esint-type1.doc-2018"="vmamlk0v1w4ffks6cp9f0gg09rkr37vf";
+"etaremune-1.2"="1x3604jqbswjza4ryv49l2cs63iqcv3r";
+"etaremune.doc-1.2"="6k8qah3w1ksn77is2i8kh1nilr6qgm34";
+"etaremune.source-1.2"="5a4n5d9l39nb0v3affwx0sswnp6sv2yf";
+"etextools-3.1415926"="w78v5hb43si3j8p38simfzscyh6lglsm";
+"etextools.doc-3.1415926"="16fq8y3c226wsf57dkny9484440i61zv";
+"etextools.source-3.1415926"="ch6lsyh0nlzkdrwzsxgf87srsb40x56k";
+"etoc-1.08p"="973rvhnq8bg87y05cd8h5g8inh2w6k76";
+"etoc.doc-1.08p"="s4j9pnzam9q8digsb1w82932lc6awgr2";
+"etoc.source-1.08p"="6l1n82428grarlj9pz4pgmxq0zw21x2y";
+"eukdate-1.04"="5lql99zq8izsri87dhqf28nnchrjkyhq";
+"eukdate.doc-1.04"="f3xl3nllsr8299rjnxnhpksv7rz8pdq0";
+"eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis";
+"eulerpx-0.2.1"="1kvqcqfjh77lg1d1jzwj6mr2rchjpnyb";
+"eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93";
+"europasscv-2018"="kzq8a90ys58hbjdiv6ayb6mcj6q1s3h2";
+"europasscv.doc-2018"="y86fbkh9qav7q78h3qgvxjkm4q6hlrn9";
+"europecv-2018"="vixn431ahbq41asfc5sgaz5as21pibfh";
+"europecv.doc-2018"="lwwqmy57wrwmr7vspnpyv5bs4r06mxyl";
+"everyhook-1.2"="ndig4g0nsbqla2i2p1n6skjjxsr3qjhv";
+"everyhook.doc-1.2"="690qpw68wri4cr4ahv1xfqibm3flc5mr";
+"everyhook.source-1.2"="rvh60i8j1gbyal0pjpdgld9l5g20zilf";
+"everypage-1.1"="ds2s326xkr4qvzz1pd3ln8j6841pgndq";
+"everypage.doc-1.1"="8d3v8gk3mmw9vyk9slxwwf8gshq4pcd2";
+"everypage.source-1.1"="v920b95jn03slad6q3w3fr97ricjvd3f";
+"exam-2.603"="c9bgf04s696pqwzvf69w42xqay2wzjjn";
+"exam.doc-2.603"="n4ly7a6sc6vk3n1lc87rs9gqj4yyz5sq";
+"exam-n-1.1.4"="nhyripks5spkljgi7js9mva03lgam717";
+"exam-n.doc-1.1.4"="s5zg21xsdrxmyr4v4fj9gjp5gkcm27wj";
+"exam-n.source-1.1.4"="yfj6g9n8q1i7x9037cmvghzyhm4i28rl";
+"examdesign-1.101"="58mxkjnnwz8z68lvxdc43gn14v6i9ysx";
+"examdesign.doc-1.101"="vr8j3mhp28h6d9zvcg6akfx9sx756zh0";
+"examdesign.source-1.101"="51c9vyfhwcp9vmhsrsvzd47q93ckw2f1";
+"example-2018"="rpbgsy66fj5nxcf2j2kg6mmkb46hq4ir";
+"examplep-0.04"="jnd218glfcwkbz8qprkac3nykm86lhsx";
+"examplep.doc-0.04"="lgm123fsn5wpdgbfx3kqm9h5q92qss83";
+"exceltex-0.5.1"="2zx6110fa87f5f3fabp4a163ybxd8mpv";
+"exceltex.doc-0.5.1"="b1ga5yh8hj9zqzm9axzdmryairv6avs1";
+"excludeonly-1.0"="i8iyqw7gylk4jh4xkrvlycpy554iinyn";
+"excludeonly.doc-1.0"="4i3z8xj3prbb8wmb469wp54pal0y545a";
+"exercise-1.6"="x4m7z83dk9yg068fgv9580gpg32fin6y";
+"exercise.doc-1.6"="bcrzrs23c8rrkax8w03yhlmr9sgqw3kq";
+"exercise.source-1.6"="fw34bm9v1gqh9x7vgih6axanakwj523h";
+"exercisebank-0.2.0"="l4qbjd057wxgwcpqypiwxdd3fyi6y1bz";
+"exercisebank.doc-0.2.0"="7pb9wpc4k7043ails37g2ld582qi3c6r";
+"exercises-1.0"="hghjlb5lksvs5nwqdipf0sbfxblqkr8n";
+"exercises.doc-1.0"="2xwg0g0li01d2h27alvm667nz56cz2r1";
+"exercises.source-1.0"="fbq0d5cp7lmgikxgrizj3vs75gxdg4qz";
+"exp-testopt-0.3"="rz188mfdr0hfnrcndv0ncany2g20hv34";
+"exp-testopt.doc-0.3"="icxvqjnip0g92k1hngpvas7f7ii895pa";
+"exp-testopt.source-0.3"="9gq43v996qrrrxjgi28fqf9c8qval8ln";
+"expdlist-2.4"="3l7s7wynbhvmmxlpsvzma7k0fmsrgha0";
+"expdlist.doc-2.4"="pv6g612sac208kk4il3v43ir008916lg";
+"expdlist.source-2.4"="nfs4val465iw3h4x5ggg8606k2nl4n88";
+"export-1.8"="c2cd44yhfphk0wnyaq0db2y5rfjmcvfv";
+"export.doc-1.8"="ijjjprbcnjwwj5hf13b61165mx8xdqn5";
+"export.source-1.8"="0wz3raz7mf5cqz0j0g977b7ghznxgxxs";
+"exsheets-0.21i"="msii7pvzxyz9ja3yk2jagiyha66v2idg";
+"exsheets.doc-0.21i"="nd45sx9nz98h2xr3ki1h4v5cnrqbh5s1";
+"exsol-1.2"="cj4l4d5p8mbr97yqd58mf2c6ki72qgad";
+"exsol.doc-1.2"="qx2gpla4idab9jkjzg45q16pviy6na6k";
+"exsol.source-1.2"="sp93yxr1favjifgzh0q02d7p8xhv73lq";
+"extract-1.8"="qb6arhvwmjpycprhbjfbhvfip3wsr3a3";
+"extract.doc-1.8"="xah1bafcvc4m9z785qyyl8r4an2a6531";
+"extract.source-1.8"="w6dbkpm7kyjgdad61mbvam0q02kyxf8v";
+"facsimile-1.0"="mhx5jbh4rwv10z6hd3b2w5haj02bjz0y";
+"facsimile.doc-1.0"="pb8sj68gxph376h1ph6yb65ncyblxbdw";
+"facsimile.source-1.0"="dvjli6r3pr4w74n9mnm2ix30jva6yysc";
+"factura-3.57"="lfhm1sbhh298w5lvj1kr0vclk0v2zj1g";
+"factura.doc-3.57"="zivwisvbyqrp5n90sk3m92ksp69hx1vq";
+"factura.source-3.57"="npc337y47zyn46afa9d3laqk26839xcf";
+"fancyhandout-2018"="d1l30rd3z334px9zyw74l4x5vjyki6zi";
+"fancyhandout.doc-2018"="y4vl6xw99i4q8j9nr369isqzs9vl39z1";
+"fancylabel-1.1"="fvnw8s5y8rr4sfpff9ay2y1yqqgrwysk";
+"fancylabel.doc-1.1"="xsq1b17afxx971wfyrdgwnq2fkyqsxc7";
+"fancylabel.source-1.1"="rwq6gd28j5m49xv2h91sav2b5pf9cyvn";
+"fancynum-0.92"="5asi7143x3h151vhxxjjyy73nd39zj2s";
+"fancynum.doc-0.92"="54f1hxykwv7k34dpsvg0l6mlz9jia60z";
+"fancynum.source-0.92"="hfgqgx52wiqfw9h4440hwha1zagvw45p";
+"fancypar-1.1"="bb2s9zgrjf298h1qpcm41bgh4wi52qxs";
+"fancypar.doc-1.1"="8f2c3psg2nr6jqgwm6z5pvaa07d4f95d";
+"fancypar.source-1.1"="nbdd6vssivv5lkpjwdyc5pqw6d64hzg9";
+"fancyslides-1.0"="1rm0ay1lphh034nxw2ww5w4jkyz0a8vg";
+"fancyslides.doc-1.0"="h8cl20k630ccmwjxvnkns9yqzv2gx6i6";
+"fancytabs-1.9"="198b3fl0x7n2mghw2f667pxr4dzsyq0h";
+"fancytabs.doc-1.9"="m0fyacjfsm4rc2shbar55bwi6nrf5f12";
+"fancytabs.source-1.9"="4a3il9l6rj6wkxd489q9vxdjihk9c79s";
+"fancytooltips-1.8"="92mbrk8gn6np54fx90qzcgkps3v6k54y";
+"fancytooltips.doc-1.8"="v90g2vxn8yqy9lvibqhldwm23cpvv53j";
+"fancytooltips.source-1.8"="cgj7harpp7wxh1fvh1wfx3pc0c34nhd5";
+"fcolumn-1.1.1"="3as7qnpb697lii964wfb6zq06g4cp3ai";
+"fcolumn.doc-1.1.1"="4grdm663fznflgh8c0kydq4h6bq2sy96";
+"fcolumn.source-1.1.1"="srfg8sq0spa6rwika7aq7ylqpl6yc8kx";
+"fetchcls-1.0"="hjmchh00z9pl5bhdxdb491f4grb4hvri";
+"fetchcls.doc-1.0"="2p0k1bx3y1b9b8lw2j25ybcaz1gwyyfa";
+"fetchcls.source-1.0"="xzc8psnl98xfsj7hy37f1qgln8hx25pn";
+"ffslides-2018"="v88vqphgndyc8bznnkpc17pcgc4f429f";
+"ffslides.doc-2018"="1378bj25gqxr8mhdwf99rw2q61kbakqd";
+"fgruler-1.0"="z5k7w4nncv381nbznr8c7bwq0a9k9l5m";
+"fgruler.doc-1.0"="rm6g865195d2lm97v9pbaim7jrgsnjyz";
+"fgruler.source-1.0"="67chz0f0pjn70xrxzmw7jvzgskjl9vlv";
+"fibeamer-1.1.7"="39kjk30dpdvclh0zy23x12jiycik3xgn";
+"fibeamer.doc-1.1.7"="qcvd0xn9h1j3dgjdk4kdyh6iy0q0kvl9";
+"fibeamer.source-1.1.7"="kzw9lj7jxl4kp2qqk8lcvbjhsdl3qnrf";
+"fifo-stack-1.0"="dfyb5qmw70jy72ass9iy0k89criyybwh";
+"fifo-stack.doc-1.0"="a5qh0b6zcxnfplc2xf0dy4384rvb8ggf";
+"fifo-stack.source-1.0"="67n2h94p29l1j6dar7s1q8gz1cxg1zxh";
+"figsize-0.1"="hmj352dqpk23wfjhvs58r5rj47gcixj3";
+"figsize.doc-0.1"="sxblgd4i3mklznz336yy925l7xgdnb82";
+"filecontents-1.4"="c1zirlczq60radl8n75ij4n1x808938n";
+"filecontents.doc-1.4"="qfv0cw5z7ad3qqaynhif2cbwc5hx8xzk";
+"filecontents.source-1.4"="a2cazsy0zwy1vdz1zwc3nqfyscqakf79";
+"filecontentsdef-1.2"="6cmzpvqjr5dcbd865aj4333n3ha5p2qy";
+"filecontentsdef.doc-1.2"="qqlpd7b3fyvj35rnikqilvxbn199wzlv";
+"filecontentsdef.source-1.2"="h94zcfjld2z8vblaw0ka1wisj5kx72wg";
+"filedate-2018"="krqs9ry6gpmk5xi9a2ijkrd90y7v6q5h";
+"filedate.doc-2018"="dq7487rvj7vai1j80j9sgi7hsldg433m";
+"filedate.source-2018"="qq7zspqhd6zl4w5lyy9gxw927ph31sp4";
+"fileinfo-0.81a"="gbv2pynx74765fc966q0l4wpflxyi0cz";
+"fileinfo.doc-0.81a"="5y2xniw8nwg8iw11g49w04xl9fp4zyv3";
+"fileinfo.source-0.81a"="lgcw481ya8a6ag2gzd0g589sm3ndsqys";
+"filemod-1.2"="kgjfr4lx9rpw39aqp3w72hkj9kyfbx8p";
+"filemod.doc-1.2"="cid89p79bmmyb8hp230g9zfl5wxl3gwq";
+"fink-2.2.1"="l8xgqw4b1pc40z8zvhj4x5vd3arirrss";
+"fink.doc-2.2.1"="d78cggifb9b0y730zx116mv90xlcl47w";
+"fink.source-2.2.1"="mb1qfcb5ils48npb6zn10d3dd9781abh";
+"finstrut-0.5"="adqypjvkvnkydw403q2wab9xzpvavhzz";
+"finstrut.doc-0.5"="lcyklm3jkz5nq6j956dv55n0nfyaprkx";
+"finstrut.source-0.5"="54slgzkfps6q4z7x49a5jqpc1j3p98hw";
+"fithesis-0.3.50"="y94p03g5da8ffsj5znr4v57h6d6kd2wq";
+"fithesis.doc-0.3.50"="a63mxxbhw59ywhni4c3si0y3hpxh1fsq";
+"fithesis.source-0.3.50"="25kfd698n7f5ajwz4b8sdxkl84cc8dm8";
+"fixcmex-1.0"="wbmzc4wl601mg09pam4bnykh1dcnnlkr";
+"fixcmex.doc-1.0"="0fy46qvzvp2zlwjbpm6pmwhydssw29kz";
+"fixcmex.source-1.0"="06g7vgpdih9iks8q11v1ag68nib40d40";
+"fixfoot-0.3a"="ci2h09kyh2k0w0d8mbmcw57i4cqirz2i";
+"fixfoot.doc-0.3a"="5510blbn341f70ic646ad9jay6sfiilq";
+"fixme-4.4"="j60hw7cgyk6777s1j70gidbs24rnzwfa";
+"fixme.doc-4.4"="dn3zcsjng4hnx627x3c49589zzawndkx";
+"fixme.source-4.4"="d6csn850lb0vbwcvll3cryks1hzmr3n3";
+"fixmetodonotes-0.2.2"="8bzda1486sb6l1miw9fwc4gag8l86pld";
+"fixmetodonotes.doc-0.2.2"="kwvshr4l5r8zgjia62ac04bpc7cy5n8w";
+"fixmetodonotes.source-0.2.2"="c3v82mnqbxnz0b2yy1g5l9yfxh1y41vd";
+"fjodor-2018"="c6ya1a7zfddfil9y5f30af7d0jm8ikij";
+"fjodor.doc-2018"="ba4cxg0czxij6lwkl9w1kzmrcli6s3jm";
+"flabels-1.0"="pphsynfbbj4vxl9g3rklfj0igp6pzliy";
+"flabels.doc-1.0"="hpsnqln41r0ybmv2vjycd0zrxi6mwrcx";
+"flabels.source-1.0"="2x4jjggfjxvqby3yv13k0y1cgcrd0jcq";
+"flacards-0.1.1b"="mysbkp5ascapm70fcnb08ldmskay3c7g";
+"flacards.doc-0.1.1b"="ipa0bk1dr9hlhj5sbfkm1fgyddzrchd5";
+"flagderiv-0.10"="xcwh87j3789v5pbs65xw4kld1k6mwk3a";
+"flagderiv.doc-0.10"="g9zz7g3kqa2jfcwnj1c61fvzfxxkf9lz";
+"flagderiv.source-0.10"="2r4c1f141xqnfav3klxfdh3i5xx4mc2p";
+"flashcards-1.0.1"="wlkf4s8qqhbql2b7jv0h2g6mming75b5";
+"flashcards.doc-1.0.1"="c6j54a7zjc24m6wv71rq43xjxklwgj0g";
+"flashcards.source-1.0.1"="0nwdgq4r431r55k8aa7k46fkxz3c4c0n";
+"flashmovie-0.4"="jb3lv2gg2w8krqzqypkipq4rsygddkv3";
+"flashmovie.doc-0.4"="n1iz704bdaxj2k26m4125h6aqna0g25i";
+"flipbook-0.2"="6mlbadxnf64k383jr2b2phh2ybkk1m81";
+"flipbook.doc-0.2"="j9a1rvi85n2hmhr7233zzz9a5qylb6pl";
+"flippdf-1.0"="g4pw7i38h9ypal2wkqfvchwbr9wn6v5r";
+"flippdf.doc-1.0"="s9xvjdfjxxz1dag35lcbw8dznlx43305";
+"flippdf.source-1.0"="vqjf15dsa1nvx8cw0qbam1zvr2qr171y";
+"floatflt-1.31"="ppv98lki1x3s6xklksd69n5cr8vrd6pd";
+"floatflt.doc-1.31"="7n9r2sl31qx9jnw802mhykidjldhx4hl";
+"floatflt.source-1.31"="byz5ymxby208lx8am35lz229dibcn4ic";
+"floatrow-0.3b"="mk0srwmdcdm8g9i0ncmndkxavsknm2jr";
+"floatrow.doc-0.3b"="xw3x5mm1vlq877jdm537h2cc69q403c8";
+"floatrow.source-0.3b"="qqa4j2hidyh6bb8y5y9hz4mmb4j1i732";
+"flowfram-1.17"="lr7jldig88wv8gsvp8aphxsvc6sv4cax";
+"flowfram.doc-1.17"="3f550irxijq1vdvyxs6fyhpj5w1lw4jq";
+"flowfram.source-1.17"="66z844imyrl7bsi22vrff1f05dqlmr8p";
+"fmp-2018"="3m6zqb7jl5rn5zgy0dbys5r8y1sp20x5";
+"fmp.doc-2018"="3hvfiw6yizjkxnx5h7xlzfig11diglpm";
+"fmp.source-2018"="44cqcijnqc5235rjqsmkj4vhmrs9j7hq";
+"fmtcount-3.05"="lgf2i3g3dqna8nf2apjmim4dsrgr4v1c";
+"fmtcount.doc-3.05"="1cxr7nbb8wc3gyiy8h6vb3lcnlq56cxg";
+"fmtcount.source-3.05"="bsypsb0pa2wjvacpyi0jri32j3y99vfa";
+"fn2end-1.1"="qw34b3ki30fqs4dj4fkj6f46aygw0ylw";
+"fn2end.doc-1.1"="anwhkba91c48wl5p1ch35iplw974sdiq";
+"fnbreak-1.30"="aiwqr078mw2127lbphc0lhmh90m5ddgg";
+"fnbreak.doc-1.30"="5v0ijwzjxmll7ayaihqhgk1dnk2rzp76";
+"fnbreak.source-1.30"="jwyh3gnmafpdr53xg4jy4hz6x8y7vhm2";
+"fncychap-1.34"="pg593a0zc9ycpg6cc3d7bjz92r7grwix";
+"fncychap.doc-1.34"="rncjjlyrjy916hn3ka9yaydjq6pdvn09";
+"fncylab-1.0"="i7qfcb82d8b71j6qjn0szpxchw0xa0yc";
+"fncylab.doc-1.0"="95kh740jadwxy6xszs7ia6v99rc6aj94";
+"fnpara-2018"="bwgyxjk2k7p76mw5ahsf2b0nm464rvi6";
+"fnpara.doc-2018"="h92c0g634x7n1qcdv6vqp5pnw9ykba0y";
+"fnpct-0.4e"="lci9d0d1amlpxgfbbf6h2fv5kxck0cdj";
+"fnpct.doc-0.4e"="hknasw4n1gfz7vm6bb4yvzippj4g8dw3";
+"fnumprint-1.1a"="vhhc4n3xvlkb2a31kjpkxbwrwc30r62y";
+"fnumprint.doc-1.1a"="gyllsixn381a8p0rpr90n31h3qb0ganp";
+"fnumprint.source-1.1a"="kp99n8b3y30ilnih7bk867bf3d93xf3m";
+"foilhtml-1.2"="78dmna552hnh9i11v9zgg6l68hmla7bc";
+"foilhtml.doc-1.2"="a2bsh99xh1lfpssggzxhiz9ipwz6bijd";
+"foilhtml.source-1.2"="lrjc6lj49c8knfh4bh9jx7vzpddxsh71";
+"fontaxes-1.0d"="aaqzfxbcd9fdggw8lmj6syc1ff00m43p";
+"fontaxes.doc-1.0d"="q1qsz0gigyg3x462k337crqng7njvakk";
+"fontaxes.source-1.0d"="6xacssljffql809gpbhl8qdrs944v6cs";
+"fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d";
+"fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan";
+"fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y";
+"footmisc-5.5b"="ha2palj23dq2c3j4fb1j5s6cjjzisilv";
+"footmisc.doc-5.5b"="22bx6glng885275x22z99lwwhwd3g5xq";
+"footmisc.source-5.5b"="ii8ra20y2k8fzklf2cld2z6hjv8i1fha";
+"footmisx-20161201"="5pcwf6k39ybd84nnhzpc4py1sn3bsch4";
+"footmisx.doc-20161201"="0qniys4b74hs2d420k0xafys1578l2wj";
+"footmisx.source-20161201"="m3510nfdmbc96v66r54ikzkfcfffrxfg";
+"footnotebackref-1.0"="8c8gdjzn36nfxjmpn521548334gbn86h";
+"footnotebackref.doc-1.0"="fzjm17j06la934js2q0sn92l5d8g5z1i";
+"footnotehyper-1.1"="3rx9cwmnz90z60lh97lafxidphh5hivv";
+"footnotehyper.doc-1.1"="y1n4fhq1gk9fcdbhl0qdk7qfrbpsm5f6";
+"footnotehyper.source-1.1"="nsq8cwpdz3fljgq6hn1flag38g2fbpv7";
+"footnoterange-1.0a"="akznm9pld182b9c2nyqwsjc1d8p88qk1";
+"footnoterange.doc-1.0a"="sywjz9s41xpsmmclmy1jrgv08491s5sl";
+"footnoterange.source-1.0a"="hcyjz5xm3vs6d2bdcbm5ns3wj9n5nzdg";
+"footnpag-2018"="ym18m0gmmk7800dd1c4vrar53q66hm7g";
+"footnpag.doc-2018"="8kar3xxxjlrsjascd28122y5rckyv5lf";
+"footnpag.source-2018"="51nmvyy96mjbr46ar058jb7jhpsqz17q";
+"forarray-1.01"="682slfwbrz58fhqj0c07lv1xwab861ks";
+"forarray.doc-1.01"="i7v5q2pjc3sjmcv3mcpdi3sffm4qs4kb";
+"forarray.source-1.01"="q23rvw19x2rk8nv6yhgg76jxfs30qfys";
+"foreign-2.7"="lm3i89k3l6yjajvihjc98kcix3fsa3bb";
+"foreign.doc-2.7"="lbi21kkbscf91yswn2v3jam11615jhpb";
+"foreign.source-2.7"="imrc9f5zvkqj5acfqbzpdvxgvdcf9q51";
+"forloop-3.0"="28l30q6cdvwand7yyg04xzb49kl21zm8";
+"forloop.doc-3.0"="k6pmk3ligld7hxal5vsq8ccjw6d1k1ax";
+"forloop.source-3.0"="9rq5r8x9wv473bw97hyh21ihqzxd1w18";
+"formlett-2.3"="ccr4iqh9ii22b0xkdl0j2rhp6q6cisd6";
+"formlett.doc-2.3"="cwpzl5rhracg51x0lvqxxkbz4id1plml";
+"forms16be-1.2"="fl2lvzfwg6k8y6p5g351hnc6yx3l3x2r";
+"forms16be.doc-1.2"="p6dhrh7fjr9whcjcnkhbr7b2a59bh69a";
+"forms16be.source-1.2"="64w9r9hgmdwk0mmm80p5b2d0mggvixl0";
+"formular-1.0a"="1ccyslvhjbzqyqyk4m3zh761kw2v45xk";
+"formular.doc-1.0a"="lap9j51p3dsh02ym644576gnzm3a845i";
+"formular.source-1.0a"="v80wnhg3xsl24a6bbsj4xfn82cv7ajd8";
+"fragments-2018"="jjblkk9dj72nvr2gday7p509pnlpwy16";
+"fragments.doc-2018"="z8rmyhlpsv68qbnr6h3sy08gcy6shiac";
+"frame-1.0"="9bdydjkb9dsdvryibfq2p1q071zhhpxb";
+"frame.doc-1.0"="fnv3ssnby17l7zmbgkc1rf4b5hysw7a1";
+"framed-0.96"="n9an7cs91wwfnkalc4j9ccd0p0dg485w";
+"framed.doc-0.96"="bwmgdv9r6rffibrm0wabw95vqdkiryfh";
+"frankenstein-2018"="ldv1sc8j6nxhd9cd95jf934pyz6s8lxs";
+"frankenstein.doc-2018"="j03cxxv0hw0c1j4afrfprgc2ia6nc5c9";
+"frankenstein.source-2018"="zc3nzdkbjrfgv241wj4xxlq6042xv9nb";
+"frege-1.3"="vczq96wx0icl69c5xqcqmfsy2wdw1ncn";
+"frege.doc-1.3"="h07nnplqxq2fyh6f0wh03jpism89ji0d";
+"ftcap-1.4"="7srhgl4z3zpicxv7aakm970xy2yxnpns";
+"ftcap.doc-1.4"="1y7r73w8r779pdchcgwmlvcd2sq8hyfj";
+"ftnxtra-0.1"="8iicyf847h3xf4jvn1y8nzyjk3dw7jng";
+"ftnxtra.doc-0.1"="sna4k84xb01ikgp5aivxlrf8qzbp0gcc";
+"ftnxtra.source-0.1"="60xpxaqbgyzrfxb97zrhdb9rihy2cc6f";
+"fullblck-1.03"="3dzz4aiajr3i1ns3xhh9vl1s5ins4s1h";
+"fullblck.doc-1.03"="xczvd1gvp5s5rvf4n4bxrj7l7c3pxhg9";
+"fullblck.source-1.03"="y7clrinyakc2zm8933j7b6ng7lsl0f7z";
+"fullminipage-0.1.1"="s3rajpd52w578wrvd1rq4dqgp4b1kh36";
+"fullminipage.doc-0.1.1"="ls3zg7gw0lmncmy096f5vzpqi9l9linb";
+"fullminipage.source-0.1.1"="2j6l66kmb8bg04h60001kskyfbbclcnz";
+"fullwidth-0.1"="0m9q9s3ng1gqji2vjs9z14vzri24sap0";
+"fullwidth.doc-0.1"="qyswh8vcacvp9nmhvviq4xm9ariq2aq8";
+"fundus-calligra-1.2"="5jn0qbj8zgi1c0166c2vdwzs1a5i8qm1";
+"fundus-calligra.doc-1.2"="dd87040kysj4av2sq7grslyjv0gx4rmd";
+"fundus-calligra.source-1.2"="s4s97ga289ncgv0rpd90b8i7qh4n7jfj";
+"fundus-cyr-2018"="fjyzn069q34z3ypaj0qwjq3f5zjm7y8k";
+"fundus-sueterlin-1.2"="4xlq7i6k1pqmq8vc6aq8h50gs1f02l3d";
+"fundus-sueterlin.doc-1.2"="i8q42q2rzmby64v4il8jkpk7azfcrrip";
+"fundus-sueterlin.source-1.2"="rl5n5rh9akf41ls7m2gi5l9hqq6wv8j5";
+"fvextra-1.3.1"="apbi2ar2ajfmjr1mfxygj4ai5v5inia3";
+"fvextra.doc-1.3.1"="xg4krzxkc2w6lysdimaj78n1b0jximsq";
+"fvextra.source-1.3.1"="g96f98xfk115phmd2ik4ygvz982va0n0";
+"fwlw-2018"="887p12xhlcgydw4pddr0npyvp4xr1azf";
+"fwlw.doc-2018"="2di5y3hhm865frn42j1sh87hflxlpc1n";
+"g-brief-4.0.2"="gqak9cc04cklmsg6xlar9l0s81027wgm";
+"g-brief.doc-4.0.2"="bdkjz2wyh4wpgs0wlp9knfbj48fnj9g4";
+"g-brief.source-4.0.2"="7kl0a76ylpcn4dixxd5ch603h4m9y7c2";
+"gatherenum-1.7"="zpjdak4z9vr2719sszjiapnbipsxksm2";
+"gatherenum.doc-1.7"="zsz7rwvpdgxgzksf0ziscass4riakc2d";
+"gatherenum.source-1.7"="v15bkfxani8kdna1mlz10qq1mxdsvc4m";
+"gauss-2018"="rm0hzy2h1msxkfp2lxm2k881y4iaw773";
+"gauss.doc-2018"="1d71g6781ar41gk3rjjy48bbkdkxx4id";
+"gcard-2018"="vrmrds4xh35bqjq4qaqj8rrvfd7fdykm";
+"gcard.doc-2018"="lxpbgqbbcldhlpwjkj531yh2bm3l2n3v";
+"gcite-1.0.1"="z7ha969s3ry7g9ibv521f2d6vr9lcxx7";
+"gcite.doc-1.0.1"="3bb2z8jbygadc7qzmjz024dqzphncy4f";
+"gcite.source-1.0.1"="v3fbj2j823jh4gy1vrc4f74qsdbfqnpa";
+"gender-1.0"="v985mqnxvb7ymdlzs1j4y3pvbygrkizz";
+"gender.doc-1.0"="d8ickvclnl5647xpq7jz3qh2i9l9hw97";
+"gender.source-1.0"="iiq2vb35q3lqvd49f5gzsz6fa52s0nlj";
+"genmpage-0.3.1"="r91a3wqjc9w7l3dh98j429ja8ymvbb34";
+"genmpage.doc-0.3.1"="midc310i26fannfywf0cl7kp014y9ax4";
+"genmpage.source-0.3.1"="riqs209lh1jip1dypvdhzq05i7n1kh7h";
+"getfiledate-1.2"="jxr6fwmy8lc03cqchndg1dps8vjjfqz8";
+"getfiledate.doc-1.2"="k0r2fr1q7cq0x7lrbk38ik8bqdngsq71";
+"getitems-1.0"="8qdph1kdihdkqyd8rkn4n2i3wd5kfq0g";
+"getitems.doc-1.0"="yhr7vskgqfhij12vrcyl7a9v60nipd32";
+"getitems.source-1.0"="89vcxsad2qxdl0kw2crb0r1ibn4acwpc";
+"ginpenc-1.0"="gy74qjz23cw3lbmb0nc205qfp1a0ggib";
+"ginpenc.doc-1.0"="9iln48gnlcshrhkk3mbpgqk06sj4bl39";
+"ginpenc.source-1.0"="dkkxzw412c81hrhwnmjw1jgvhz5rrjhk";
+"gitfile-info-0.3"="dhkr443nnylzz5pmb4zwbygg1rznv9vd";
+"gitfile-info.doc-0.3"="a912kp1s2icfr4fhzczdl729jniza5dj";
+"gitfile-info.source-0.3"="q2knkm9xl1i1b8v9cdhdiivviny4vjdn";
+"gitinfo-1.0"="a7mcfsqzwi88fsrdbqkwh8p3rd7w51ri";
+"gitinfo.doc-1.0"="5dh5bifav6w87hq29ph7ls65yxjhk7c3";
+"gitinfo2-2.0.7"="dsxgwrlg9j367wxxisxm2wv595xny8x0";
+"gitinfo2.doc-2.0.7"="l2rsxd08m2y44wg53q2adl7d084r14cf";
+"gitlog-0.0.beta"="q64k3v3pwcvg8abw382rijglrgllfvwx";
+"gitlog.doc-0.0.beta"="29ysf5jz8cvwanmhad4ka66jcwxn9a1i";
+"gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs";
+"gloss.doc-1.5.2"="4qial5a0p7ip784xgpqgkl6cmabd9hlq";
+"glossaries-4.41"="g4mfa7aaiwcxd9vk5j02r53ybk4qmyr3";
+"glossaries.doc-4.41"="6b0fj4byhpghb0dndvq2kg5c9fdw5x0b";
+"glossaries.source-4.41"="1favkbd8wi2fan714rdzc9naf4sri3ap";
+"glossaries-danish-1.0"="hmaay0viwacnrz7bfz6xlpb03cmsphcc";
+"glossaries-danish.doc-1.0"="mxgh9b6vc63llhmfildmhkhjxd1s9kbq";
+"glossaries-danish.source-1.0"="s5ayfh10z40cpi9amn2d1wwpnby0qgaw";
+"glossaries-dutch-1.1"="diqdj2nm0yzvdkkxv243pgrwhk4nxayx";
+"glossaries-dutch.doc-1.1"="irbpwmyxxm13fas8fg1kdn5x6assgf75";
+"glossaries-dutch.source-1.1"="hlj6vbl82r5h0ngvr5b7h33k1q54b29f";
+"glossaries-english-1.0"="ydbz6ls58gnxf3wmay4157516ggzsc1f";
+"glossaries-english.doc-1.0"="53w4fzz52hh9jyik6384limy6633l8aa";
+"glossaries-english.source-1.0"="dpc58cbb3snzsjxkz0c82yksx6c60h6h";
+"glossaries-extra-1.36"="77y8m2in1f7v2rffnrv8b5d44dvwnvfb";
+"glossaries-extra.doc-1.36"="scka9h6b5xrdjdvch2ln8wr356ybia40";
+"glossaries-extra.source-1.36"="ghdqyw8zzkby143kynvqgcrvd882bi2d";
+"glossaries-finnish-1.0"="rq7ymhc4ispv4j1zpv5iy6mbn66wr3j4";
+"glossaries-finnish.doc-1.0"="f8rj41dbpqrdxbl7h94rxnbiqm77xcj4";
+"glossaries-finnish.source-1.0"="gnj8dlxpzapvi9yvzy04rhmrs5z7hmid";
+"glossaries-french-1.1"="zkndbp5cq242l196fc6s35yib6ay4mnf";
+"glossaries-french.doc-1.1"="0bj95z10psabgwi3gg65jbmjfjr5jn36";
+"glossaries-french.source-1.1"="87wiw0b01wpqikz8r7wfrkmq8lylviq6";
+"glossaries-german-1.0"="dhfan1gzz50rlg7q2y9x5lg1dgl2cacr";
+"glossaries-german.doc-1.0"="8kajajbjllgcz3h1q6nhs0jh25pv9xdm";
+"glossaries-german.source-1.0"="254c5j11d1xigfcfn5s89bv2i6si8cfr";
+"glossaries-irish-1.0"="ahbzvng9phrhcfiwiam6n2rf76p9i7kl";
+"glossaries-irish.doc-1.0"="4ffcaqrn4a7w66wghvl5vghyn2v5gvzd";
+"glossaries-irish.source-1.0"="qfl7ngfb7cjiif21q38d1r9lwj9nddjw";
+"glossaries-italian-1.0"="sss93i9s603bsmx18w06lpvgk9ldclcz";
+"glossaries-italian.doc-1.0"="8k3ys38zjig011j7xgnhxk7yr2vabrs0";
+"glossaries-italian.source-1.0"="bhz5xknfcddwc6wan5d01hq33v4ilh8r";
+"glossaries-magyar-1.0"="fqbsz09snqw5j0zlail5bh3a13nmnhy1";
+"glossaries-magyar.doc-1.0"="zd4idxawfa6rm2j353dhyak90bq2jd5y";
+"glossaries-magyar.source-1.0"="s8xxg7bh6zgxq6rvzp5lv6sp6h8ywvr3";
+"glossaries-polish-1.0"="7alkf3zirdbg0mgv66grfaa6szhjy806";
+"glossaries-polish.doc-1.0"="hhzkv01s7m4f1cyib722liyaqchxs31r";
+"glossaries-polish.source-1.0"="6pkd4wg9srcd5m92mlaa1vniyh67ahvr";
+"glossaries-portuges-1.1"="z5qc3w9n0fv2x5afsv5k7nl2652byx0v";
+"glossaries-portuges.doc-1.1"="ywr0afkdqfmk6r867pghf07wpwc8sq92";
+"glossaries-portuges.source-1.1"="zzd6nlfq11zc152af3p62bshnh0j8rwh";
+"glossaries-serbian-1.0"="b4p3iy3d6ziqh38r27b0lcqm9clcf8gb";
+"glossaries-serbian.doc-1.0"="h36h8811dfndykwh6q24haghsgy4jl2s";
+"glossaries-serbian.source-1.0"="wf3wbvbaim0w86695crqc0l1dv006ydc";
+"glossaries-spanish-1.0"="aygzxhw0cr8prirvcbsrc1xr11ac6fpz";
+"glossaries-spanish.doc-1.0"="da0ysgd3c6k336sc52pg4w76bj8lamgm";
+"glossaries-spanish.source-1.0"="cij28c7mhivbkwa5lwg7pvmr8h4ymrcd";
+"gmdoc-0.993"="7acw3iajf16bq7vmddr2j7z5apizxj3x";
+"gmdoc.doc-0.993"="zn90pbf45d4fz5d4k8q545fp3jshn0cf";
+"gmdoc-enhance-0.2"="0gc7975jin3dszblbn2zgzm22blk5y3z";
+"gmdoc-enhance.doc-0.2"="gyv8r700rhfigpl57xsj5dmzwb1in6rm";
+"gmdoc-enhance.source-0.2"="vkbi6ys95j5v7nyv3il8mrxins0z743x";
+"gmiflink-0.97"="rxnvc039bqhcq7qna523c2s1hyp7khya";
+"gmiflink.doc-0.97"="59n276lia63cb5n3aicqvwv0njcml1fi";
+"gmutils-0.996"="56895j8b4i9nghfc5w2b2ysgk838dp9j";
+"gmutils.doc-0.996"="2w4257wz5vjp1lwzf3gzhbyyaki5d4x7";
+"gmverb-0.98"="z9il1jbnblh5vqzjz13xkfjsva6xqa1v";
+"gmverb.doc-0.98"="bh1ckqnp1vkqj9qb3fwfk1xszfphvma6";
+"graphbox-1.1"="x0ckk1yx2f9ks1g70g32f4a683rpf4nx";
+"graphbox.doc-1.1"="b4m3rss283l9gfk0vc0apg05biifhpfj";
+"graphbox.source-1.1"="p7vnvaxz5a2grh651f3gld07pj7lcxp9";
+"graphicx-psmin-1.1"="bp0jkvi4zbl88zpfh6zfvmqw9nw56akc";
+"graphicx-psmin.doc-1.1"="rrh6zwqmg0d4qz2r0wa97p0ql3xp982j";
+"graphicx-psmin.source-1.1"="nx2ga2h4xz7qsczgnh3d0y9bjrl2dka5";
+"graphicxbox-1.0"="6grrmcmr2wlpx8dbj1k1nggs2b6z7qh4";
+"graphicxbox.doc-1.0"="2blrwzsralqjrvlx6xjvyaqvsi764nmx";
+"graphicxbox.source-1.0"="1vl41sp02d8byjrapj58v5pg6i2g989l";
+"grayhints-2018"="xsxznm4jw3shsb5xh39q3hqarbrrj9nm";
+"grayhints.doc-2018"="6bjldw8aiddlv1swvvvck43r1lz8f7ga";
+"grayhints.source-2018"="cc126l1zsjsq7vackhd9z4999pcdj2wp";
+"grfpaste-0.2"="wi95wbrs7k37di2dkqnix5h21p84cb1c";
+"grfpaste.doc-0.2"="7hn9vs80ksnpaa0aqdmbv7qzhrdxwr88";
+"grid-1.0"="hf1jfkwc5j27mhxi2skf3wjwq2y1ca0w";
+"grid.doc-1.0"="39h5w3sw4yi3jb35018rd2r847zzf4yr";
+"grid.source-1.0"="pr4xl73p825jibzhj2h8i4f6f0lbrv2y";
+"grid-system-0.3.0"="a2b7690j7d03zk4d4yzdr2nwjm6bm7sw";
+"grid-system.doc-0.3.0"="qddlxnpnyjjjv1z1irzch3ypv2amlb9y";
+"gridset-0.1"="3cnrwcpmlby1i8b2zxx8hwjrqjs0ylbg";
+"gridset.doc-0.1"="yhwrqdv5rcbxm0j9lanm6x5g38mw8amc";
+"gridset.source-0.1"="bb1kbccwzc806sc9sp7b3dgp0flfamrb";
+"gridslides-0.1.1"="r9lxxzf51dpfaprn6kvv3n1j9hf54xa8";
+"gridslides.doc-0.1.1"="jkri2k8k8nzvchpk11pgig98kw327c3m";
+"guitlogo-0.9.2"="7lfy6i5pq8cg24n5rh2aizbrv5s2815i";
+"guitlogo.doc-0.9.2"="lrfcbc5mfy6qfji2c36zqkrva983c42v";
+"guitlogo.source-0.9.2"="q5bdflg33yc271228jknv297i0fzq227";
+"hackthefootline-2018"="kih3c9nczylrh74x0vc4m7g4bzahps5v";
+"hackthefootline.doc-2018"="vp6qn8s2g5d34v44anyr2jd5c0l5b4nb";
+"halloweenmath-0.10a"="mr8nvi7ynzngvgxp0i74wjkxwp77i7p0";
+"halloweenmath.doc-0.10a"="xamcznycdz08kgvbph8pi64h2v9j9j25";
+"halloweenmath.source-0.10a"="hr249rdkmmkm1v7z4cf7ymdwrshz0by3";
+"handin-0.1.1"="gdn6by4gg87043wdz597h9mxr9rzj4jn";
+"handin.doc-0.1.1"="xybg0ai1im3595s07039sklcjbqjdfnz";
+"handout-1.6.0"="jz5qp5n1dij11nyrgmb3x4rl41mnggyl";
+"handout.doc-1.6.0"="xsc8qd00v663bgbpfp4kwjd1ndc47q8y";
+"hang-2.1"="ncymr7c9lsbbxm6z2q3210k185bkkxq0";
+"hang.doc-2.1"="rqlq0rkbqj3vcfpm93m46w40b7llalvg";
+"hanging-1.2b"="48vqvdis9l05842lr3wp64x14qacr9ag";
+"hanging.doc-1.2b"="sicdi70h8j7nnw4p7bj4j3wj2bxzrwhx";
+"hanging.source-1.2b"="hhzby1cywgn7vdcn0b50lhpq0lkxpf53";
+"hardwrap-0.2"="sgzpnlk5kmxxmz5ilipmnns9bi4cd8m3";
+"hardwrap.doc-0.2"="zxy2s0j0lwl7mrl7xpcfw78j77zfz179";
+"hardwrap.source-0.2"="522jg055dil0qq23wd6z8rsf4dxcjzyp";
+"harnon-cv-1.0"="53gnsi8hs4wf9xzdmn3p3n1rfl0xy7z2";
+"harnon-cv.doc-1.0"="a7012x0ckxnym7cpbj8m12ak993bz7nc";
+"harpoon-1.0"="88cndn21h4fshiq6yvd8p68gwl2d2nd9";
+"harpoon.doc-1.0"="z21q49fw0a7wwwr6chwdd73ypkwqz1x3";
+"hc-2018"="vibhz5h2dnzdkwrxgadrwy8crfaa505s";
+"hc.doc-2018"="mhva92gfr4jn40d4sdnh0331iy19a4vi";
+"hc.source-2018"="dfmq6gax4mfq8z074sm76b6k7385d2nc";
+"he-she-1.3"="6rnp8qmascvlz9p0hgacblpx8svapf65";
+"he-she.doc-1.3"="xl7nf17g73pn4jc3z6nc6fknr11lsf3l";
+"hhtensor-0.61"="vnl54f4l78n4x9pllg95fr5dm79qs0jg";
+"hhtensor.doc-0.61"="nlrhij6qgl3y0zq2ija0m1gj4xxhyr06";
+"hhtensor.source-0.61"="kpmhfisxrh5n1j7l5qns4m51fr8vs6as";
+"histogr-1.01"="lykdh22sggl9qgnr3shki4dpp6716iss";
+"histogr.doc-1.01"="dnc1n1fpnhyyah7gkkbzphbxkv7rbwcv";
+"histogr.source-1.01"="k1n6vsnwpayx81ygapkccaw8g3n2yb7c";
+"hitec-0.0beta"="c6fqbzcgn7hlaxpwfcz08c11j6a8i32r";
+"hitec.doc-0.0beta"="c635j2194izgji0aqily4ha7slkzghkl";
+"hletter-4.2"="mq30k7g1v6cwmcfyizfzy3hmbxa74p5g";
+"hletter.doc-4.2"="rz2hrha5xf10050hfnm05r6f4b3mx53z";
+"hpsdiss-1.0"="9hca9lq9r7zs3frqj6lk6hybkpgcdfmb";
+"hpsdiss.doc-1.0"="2mxarcx6cm2v2bsab8gr7ks1mj5danvl";
+"hpsdiss.source-1.0"="k3k828ddx8vv2sr8lw644ny3z5kcl59h";
+"hrefhide-1.0f"="1pr0sfiwb8hdby12fsj59gqi6s05j0sm";
+"hrefhide.doc-1.0f"="ldsnb62r12628qsnwssndmf39b39zf5d";
+"hrefhide.source-1.0f"="42s1cx0nwj58cfhb2d22nsdqzidknwpv";
+"hvindex-0.04"="90sdf5j0a5qr2xp8qzryrvhnsvaz4fs7";
+"hvindex.doc-0.04"="9r6a8mfj7y9kyc2dbc79vf86aw73n6l0";
+"hypdvips-3.02"="mfy4cnl5pysfvkfjz8swk3qqvbmxx20l";
+"hypdvips.doc-3.02"="hidxdyxszb7a32apmnh5vjgrar4l7piz";
+"hyper-4.2d"="xpwylfxrx74x9aw96ridad40im7xanw1";
+"hyper.doc-4.2d"="fcllxx04lprzhbna8rk4ycwbw0w6xnq1";
+"hyper.source-4.2d"="v03bmxbg7hqjpl8vfp0l8z81mi2db2hz";
+"hyperbar-0.1"="7mydsb4p7mdy3dd16fdgh7ln5dlia00h";
+"hyperbar.doc-0.1"="5cd4zznxxi8arkdzzkh17yfm1ghmpybf";
+"hyperbar.source-0.1"="iydbmx9cvsd986n970lvc3k6m28ix2rk";
+"hypernat-1.0b"="25v0a423yhy68vf125ys0n6p0qhvr088";
+"hypernat.doc-1.0b"="0n4qzpmvhks66d0g9gnyizpl44jbh4pf";
+"hyperxmp-3.4"="w24vald61lnvi2zs7fs9k1h894w7y065";
+"hyperxmp.doc-3.4"="bcrblw1nanja1054aa1sksnyhf3ggd27";
+"hyperxmp.source-3.4"="im1d7slzsk23007f9xky2703fhadpf0g";
+"hyphenat-2.3c"="wr2lhsafb13b0zira7190bx5s68fak45";
+"hyphenat.doc-2.3c"="z1sj3r1ny1lgixr2fcmsglz55b23f5lm";
+"hyphenat.source-2.3c"="x70g8xiz9ss4pw775lz82yncq0x7lxf1";
+"idxcmds-0.2c"="gh879f4j62vmymyiag89if5k6slra032";
+"idxcmds.doc-0.2c"="040nd6hmrhvhw3nkwikr2s1b2wzw9a8x";
+"idxlayout-0.4d"="klk75b8291j9b1j1irbn1xai2m9712vv";
+"idxlayout.doc-0.4d"="a8i9vf4rlscys8ig0gls0kllahrf7f9m";
+"idxlayout.source-0.4d"="nn6h2msgyj85inpa4gz3qx4da741hi7y";
+"iffont-1.0.0"="xr9jmyz2563jc2nwrr9ykh040dxjad2l";
+"iffont.doc-1.0.0"="4jm8bvp06wm88695jhggd5rhjfv7qk0q";
+"iffont.source-1.0.0"="rrjx3hqrjff5bc8hk99ddxxpbhqqfy3b";
+"ifmslide-0.47"="i0psadvk32l38kx0i47avl03cg76bx8z";
+"ifmslide.doc-0.47"="d44i3i8nx1if9h04xjv0mb781ybyryc8";
+"ifnextok-0.3"="1nss6fp77hcggpr87drfbmggs6fg0riq";
+"ifnextok.doc-0.3"="mwvvllpwbmdhqiwp684hkdk5aw24pgyd";
+"ifnextok.source-0.3"="kcv0c25ga9bls8bpf3qccb8fsarwics3";
+"ifoddpage-1.1"="6f52apknfsjpswzikk3nfi9by5iip7gy";
+"ifoddpage.doc-1.1"="7l75021f0gk7nrpiq2axr88pbnzjq50g";
+"ifoddpage.source-1.1"="njqd27ax6313q2w063xbmw3mnfiajx98";
+"ifplatform-0.4a"="sfnfrx7iqg6kikiqd44yx8004l2mqkza";
+"ifplatform.doc-0.4a"="sab580hpgp0nw6gq5li9vvv3x5gxp50b";
+"ifplatform.source-0.4a"="nkwc32c56f1s585rr18r54ib1xa9hn4z";
+"ifthenx-0.1a"="2ah86wn9m3zc1f7hf1yzwyv26xbay35s";
+"ifthenx.doc-0.1a"="2zrlnl6s8fbs3ndyfi21bdqsfx7n6fc6";
+"iitem-1.0"="k0gdz2py6spiqrj4djhwbys9vkar3p88";
+"iitem.doc-1.0"="19wnj2spnjlvhb09y4i52wzix4wwyz6m";
+"iitem.source-1.0"="8xp0919wakx5r9xd21mbm4qwvd0l66fv";
+"image-gallery-1.0j"="3skl1kln38c9g31pa8sbx370kw4jp23r";
+"image-gallery.doc-1.0j"="gq0ngnivnwh35m29qimn54l0gigv79fx";
+"imakeidx-1.3e"="vgspaw7w4kjbm38vzdga08j12aaqf3ad";
+"imakeidx.doc-1.3e"="p39pl4z0xkr2029czqq9nkaxz3dwdypx";
+"imakeidx.source-1.3e"="cn51y6d129cc0kzw3yx3ybziwmxy9mbs";
+"import-5.1"="7i3h4z647jmm3scb0nringfljzk9vv6z";
+"import.doc-5.1"="0sl784aip6r53fdas8xyqhjz5vcs6xpd";
+"incgraph-1.12"="n14gyn5g1am9dyfqvxyxrqsfxdkg39xv";
+"incgraph.doc-1.12"="sp235w68gh5k1d4xg2cxv7dadyjwqyiv";
+"indextools-1.5.1"="sb2fdlrh7xlfhd61g9n3h3s9if9n6wm0";
+"indextools.doc-1.5.1"="1cfxahy568ikv2iwp5kk1dh9ffsi32r2";
+"indextools.source-1.5.1"="dj4fjqppc6d1qnz11p20dgbs258gj25c";
+"inline-images-1.0"="7g2ci2kiwk28qcj7qmphxs93fpmk9jyp";
+"inline-images.doc-1.0"="043q0hshgzprif0a5pvlmxnmidk8zp9g";
+"inlinedef-1.0"="x9ayxzl60mwgv8w3ispv1xc3qxwylij4";
+"inlinedef.doc-1.0"="g5fqhrp1vf6pky2wq3bq1hd2h0jrml8w";
+"inlinedef.source-1.0"="c5qr2b5029bkpgqhahv4licfp89l0k9v";
+"inputtrc-0.3"="vmk80jzg9sllpw28csmhsyjd13amp567";
+"inputtrc.doc-0.3"="dl0qs37bjj4aam7ijfdg64fpl135k7b4";
+"inputtrc.source-0.3"="1nx2jv4m63gc83iy3qp46gxr3v6wyw6h";
+"interactiveworkbook-2018"="4a6mi66i2z1sjzxjddvwajpvxl6i2c6m";
+"interactiveworkbook.doc-2018"="ldph57php6irhdbj9w497xk31n5ggxbz";
+"interfaces-3.1"="pja00rv19b492fv0d1afkj1cmmi09wm4";
+"interfaces.doc-3.1"="bj6l95whavxkrsa5rb8791d2ib4n5gal";
+"interfaces.source-3.1"="f7gxq1s477zab7wh212nyad94kcdacqn";
+"intopdf-0.1.0"="b01rwg0jgb7sg23i5hnvqnv2zq400fh4";
+"intopdf.doc-0.1.0"="9k4fcw8v70v1grdzldhm7v6pwb8w7fir";
+"intopdf.source-0.1.0"="midqvsvsn70lwchzg5jy58p4kiwfpx6g";
+"inversepath-0.2"="8csfwygw95dd5wrawwj7hs4gmpxhdwd8";
+"inversepath.doc-0.2"="b3z6dkfmk19n96dklslzszn7vfrnlcn4";
+"inversepath.source-0.2"="zpg2i1sqr76xvi6jn5vrgxvs44dlfx9z";
+"invoice-2018"="bjzw59mdvxqc2fyc5mpqg964a041zi2m";
+"invoice.doc-2018"="4g5fd3ry648n0i7nbkrl4c8ln7rdbpp0";
+"invoice2-2018"="x6kdjp7i7rgy4qqs8q0f7hv8bdnbs3h7";
+"invoice2.doc-2018"="cjarambfqlfz664z498dpi142ik5l12l";
+"invoice2.source-2018"="km7fcfxzdd9y5lvwyg4m729asqm04pcp";
+"iso-2.4"="p6yl8v4jyvzq5fh3qw31kgalhrv1qv22";
+"iso.doc-2.4"="xs5sw6aw59hr3xlk187dhwkg223vycsl";
+"iso.source-2.4"="vrgvl97kvsb6n82w4acm2wfjsqq00cxr";
+"iso10303-1.5"="0y5mrx8f05gl2brzky6gdgf0rzamfsxg";
+"iso10303.doc-1.5"="l6x3gviwqf8jkp2lwdy10ycp3577fk5f";
+"iso10303.source-1.5"="1ljgzik0791d8qdix5nd2151ahm67w1n";
+"isodate-2.28"="chng6rcfh1gy25mwsg30ynxkb87lxv0i";
+"isodate.doc-2.28"="mh1wrizl78fgn2xzqd5brm9hwb8zldhl";
+"isodate.source-2.28"="81a6l211jzdxbf84x0haybl0w0pifjag";
+"isodoc-1.10"="kkbx31k2jizwydv67ahh0zlm9iiard4n";
+"isodoc.doc-1.10"="ym2b7c1yar7h995m2ykrgrghf4i1h405";
+"isodoc.source-1.10"="618ibayyh4kp273h7jcl6zp8wl7i0mai";
+"isonums-1.0"="50diljpihfk6390ak54ml6gxg6h3qarr";
+"isonums.doc-1.0"="qbnvabarywnwbfaxqjr1afkic152hhsf";
+"isopt-0.01"="0gyj9ri30pid0xymfv457g9r0nycy6qm";
+"isopt.doc-0.01"="q8srwcqk4w0mblrqzpy70wbqqrds2k9c";
+"isorot-2018"="pzs5xd3c9n1m3r4m5g82702s0slq0kl8";
+"isorot.doc-2018"="760dh5j78kcgn2zxp6jhghmzxhyplavx";
+"isorot.source-2018"="35mi9l5bcbqmrixngyvb7g780ns0vjg5";
+"isotope-0.3"="paqbsfz0w4sl82imkw2zqsdwg3nlzd9c";
+"isotope.doc-0.3"="f5mylfd5fga3jy0fsdvw1z5kya7kcg6b";
+"isotope.source-0.3"="sc8npgj5397qvqwvfrz2bq51xj5840l4";
+"issuulinks-1.1"="lw4b111230hkhdif9xfvdrryks1cp8k0";
+"issuulinks.doc-1.1"="lcm1rfc9mcx3k7cn1ia3ldfwbv5r36kl";
+"issuulinks.source-1.1"="hmn5nsszd3vf27863sbk647fgfh5gxmd";
+"iwhdp-0.50"="j4m15vz6ky21yk2m95kjz1is1z91vxxy";
+"iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l";
+"jlabels-2018"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d";
+"jlabels.doc-2018"="fndgg419y1rp47d5qifv0k304b5iymab";
+"jslectureplanner-1.5"="axyi8j1yfabj1394v0skwrdmsvyqdbxc";
+"jslectureplanner.doc-1.5"="d4pia762mzbgiz5wng5vfz0xggy2j6wm";
+"jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr";
+"jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil";
+"jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl";
+"jvlisting.doc-0.7"="gfsf50mnhfqjcqb8bmkfig0n86cmhngz";
+"jvlisting.source-0.7"="dj1g56jiw22kabhhvcdrrjipjnf17k4v";
+"kantlipsum-0.7"="dqrhxbz33va8b2g76cnslw215vszc00f";
+"kantlipsum.doc-0.7"="xky6acsmba89zfz5qd6ilbfmy3i8n6fg";
+"kantlipsum.source-0.7"="n790p7vj9aliynhgzp5yybirk13bp0vg";
+"kerntest-1.32"="r64kkdp6nnkv7qk07lm2p1943q0a92ci";
+"kerntest.doc-1.32"="2py5b3pyrnddfs5cmfp4fgbqd8wc9iag";
+"kerntest.source-1.32"="nfs63gz8wfhdslfiswngxdrdk2rpzijq";
+"keycommand-3.1415"="sq6188m8lc3wl201phjx2qh3vwxf2mrs";
+"keycommand.doc-3.1415"="q9lkdcggi17v7gl8hibk2qn5dm6h07f8";
+"keycommand.source-3.1415"="k1fa9w6r1n1qhz428ipwflj6d6m5ap7k";
+"keyfloat-0.15"="x377cdsrx9gh5j8m6xz23z0i81cngjx7";
+"keyfloat.doc-0.15"="v630qlmdxhwr78j1ws86xaacl4vga1z7";
+"keyfloat.source-0.15"="gm2zjglwbxw209nf5k83nn9f7mcp4h6a";
+"keyreader-0.5b"="wk5kgrrx4c8682j6a01n57ab33ww2j23";
+"keyreader.doc-0.5b"="fy37315azfr09wzl71wdby8ry1dd40yn";
+"keystroke-1.6"="vi7r9aac2w8jggbxpk5593nsapasmm18";
+"keystroke.doc-1.6"="rlm1i14lgk00yj7hn6mp2njdmjanh1q0";
+"keyval2e-0.0.2"="cbm4pby81d33ldf01h348daihf05hwd6";
+"keyval2e.doc-0.0.2"="7d1mpnzh474k9pc293lh8v94fmy5x6gv";
+"keyvaltable-0.2"="njidjg64cv333s0j2djaycy1jmhn5h6q";
+"keyvaltable.doc-0.2"="bfym53arpfh1a0zfji1b3f0giwg1kxni";
+"keyvaltable.source-0.2"="dlgbjs6pq852xk6jbz7dxwd7jkf91rgi";
+"kix-2018"="lzdrca007a0r5rsm8f14ljx6v8yyg8xz";
+"kix.doc-2018"="jallvk311vqcjc3wrkxqv03ckbc9k1gi";
+"knowledge-1.12"="cqalfax0fr19kgkl5q4p3k7xgnniq5n3";
+"knowledge.doc-1.12"="f0c1bipi5scgwkz85xf47pdjknqr6k9a";
+"knowledge.source-1.12"="g9r7j91h0i8jnwzsyxmywwhihywp0i5l";
+"koma-moderncvclassic-0.5"="s33qvgji09s9glq93mdxzs3smnzlamv5";
+"koma-moderncvclassic.doc-0.5"="dvzcb032fmh5xs804d9mbx6q0afm25r0";
+"koma-script-sfs-1.0"="s9dryf4f0zgcij3v5v93zppqs876p2nq";
+"koma-script-sfs.doc-1.0"="dxm4lfz50b0635g2dg24lzp3fgnlvkgn";
+"komacv-1.1.1"="983485nkvn4jqxsh8mf8lsrlq6dqk6km";
+"komacv.doc-1.1.1"="sqdh6zbs97agsxd051w4g1m2b09hgmhr";
+"komacv.source-1.1.1"="1k5z0bk4hk2g1w88pmd3wgpdxal60qwi";
+"komacv-rg-0.9.1"="b4qhxayi6az6xcx4f3zkx741kx8vvqd5";
+"komacv-rg.doc-0.9.1"="lp0qk1b5vnwrcq3hhyfzmb5zimz84yah";
+"komacv-rg.source-0.9.1"="0bw2m1s7np998jaykv723xiccfvn5j85";
+"ktv-texdata-05.34"="fdwnms9v43cjsjypsnlq6rw1j3c6zz93";
+"ktv-texdata.doc-05.34"="896wnbqpxncc640x8rsi6gia2wh5njxg";
+"ktv-texdata.source-05.34"="7wq3pi1mm3r1g209vq31im4n4ib21zv2";
+"l3build-2018"="2j8x2523cg18ilw52dykw9549676zmar";
+"l3build.doc-2018"="f8pjy1blvjgw8v5ah6ypmngmlp51kzk6";
+"l3build.source-2018"="0vz4zsqg7cj34grj4j2k35a6bdr537n5";
+"labbook-2018"="x7i28cyfski7ssm9hv28zrlac3inky0c";
+"labbook.doc-2018"="5qs95wc8ms4162nwd7q4lvh7rc62s2h4";
+"labbook.source-2018"="rrybnds4laxyariqq5c2sh1zm9jzvk7f";
+"labels-.13"="rxcv9zw5jal0kr4kw0vlswjc87clgh8p";
+"labels.doc-.13"="70hfinn9fsd8r14bk23fmdc0px7n4x5w";
+"labels.source-.13"="7hps59wlxkqqjm9432dg15ml63n44x3g";
+"labelschanged-1.0"="k8z64p2cxhizszln06g5736zvf3m4d6z";
+"labelschanged.doc-1.0"="f1g5fxmi61q5an38k6g63gwc93znisyb";
+"labelschanged.source-1.0"="208xinzlpnpsqb3yvh98p02kmn34ai6x";
+"lastpackage-0.1"="mxy23m1fcp4gsypc3mj9327zcvpa36r6";
+"lastpackage.doc-0.1"="940qvlc9v5kaj9s7w6xyjh87l9rqc22q";
+"lastpackage.source-0.1"="g1zqchhc12fw8ja7a8raqrwcyjc1y10z";
+"lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4";
+"lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr";
+"lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8";
+"latex-tds.doc-2018"="m38f5gncr9c56sg2cjs0mfgd57wik7pd";
+"latex-tds.source-2018"="xdigsidx76bs121jl0m42wavzf4y88qj";
+"latexdemo-0.1"="qjb630j87mqsczjbhvjgr4a187rg6wzy";
+"latexdemo.doc-0.1"="p14qs32q48w1f8fq0xmwz1maiijhw44z";
+"latexdemo.source-0.1"="vldkpqrsdaa84s356w6nd5a0q0gv40ki";
+"latexgit-2018"="fymcvzwl1sl173r3jgf0298hxzrv66fa";
+"latexgit.doc-2018"="sxi90m4zcf03fym5d2mmyycd9p8f1k0l";
+"latexgit.source-2018"="jgvdi7lnqw37v9c4w7ybl5424sxkzgsf";
+"layouts-2.6d"="j5bph4p5drbgidk6k74k72n6ckzin1qq";
+"layouts.doc-2.6d"="4440l4n1kwphf99pkms09mk8ilbyd416";
+"layouts.source-2.6d"="hay5rjr1crxj98zqj1qm841dkxx55azg";
+"lazylist-1.0a"="324xcbk0vwjfa3950djx17shj5n6xfw5";
+"lazylist.doc-1.0a"="mkdn2aw3hnqpp82l0jdl1jrhca2206ff";
+"lccaps-1.0"="i30xx77l0zxdx1md96pjk4dxpgngj85a";
+"lccaps.doc-1.0"="xibcr632dg2910y05bcl4ysvwgqy7s6g";
+"lccaps.source-1.0"="nni2x4jc8dkmrwa7avbdjjlbabp460hp";
+"lcd-0.3"="y4w0h69pzqkm3wjglzy7qmsg9rrpnx2w";
+"lcd.doc-0.3"="m0l7k241a9i8ny8gky3d3v3b1srlccx0";
+"lcd.source-0.3"="xgvspw8xx0020zl9pl44sbg7fk2ifvsc";
+"lcg-1.3"="idrfim5pvwkppfnrz7mla3m0k1raw0il";
+"lcg.doc-1.3"="wscv34jlkglix6yr8c8c52j6v8qx0wi0";
+"lcg.source-1.3"="9k1mwlgj1bxhbpz75lh4vbhjmxs51qai";
+"leading-0.3"="m10kyvg2pjysh33gajn8a8hisfc74ii1";
+"leading.doc-0.3"="5bc58zdia3qp0742p1hwmxaw13qdgnxw";
+"leading.source-0.3"="ks8sv07mg6n12g60aj3s33siha865chp";
+"leaflet-1.1b"="jaqjjxvh2wb6bg7c608cn6rg9d67pkv4";
+"leaflet.doc-1.1b"="5vgkqz1bw0qlxzz5fczsqf873dqsq50g";
+"leaflet.source-1.1b"="l8g4n75f5d85dj4mfwbrc19bh87jzr81";
+"leftidx-2018"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh";
+"leftidx.doc-2018"="db75s45b0v3lqkw9dx09m7zs7zhmng7y";
+"leftidx.source-2018"="whmdclngd2dpahpsmz5s3rahk1bvf7sq";
+"leipzig-2.0"="vasv42gq76m6bqc0kd3rhdjqm3jfbgzw";
+"leipzig.doc-2.0"="mwiqrvnz9dpar8yxz632anah37795px4";
+"leipzig.source-2.0"="8d88fsk8faxw58zrp0any6ld256jiqda";
+"lengthconvert-1.0a"="7rfvx4n625g3rwinbxci25b0xpxrb2sk";
+"lengthconvert.doc-1.0a"="ngl9jfvcplmd9z7kwzfd90m45jp9lbpc";
+"lengthconvert.source-1.0a"="r2lh184znd42l741g816y2ljrsrbncha";
+"lettre-3.000"="cji81arz9mmmd0n31k9zh7pacq0w7df5";
+"lettre.doc-3.000"="szid42pk7qyrimafvma6z62407npv9dj";
+"lettrine-2.2"="ns9qqlhln1x8jj6d18mkdlx7hn9dg7w0";
+"lettrine.doc-2.2"="crn7a30zl1rmpid1267416gvlx2xzk56";
+"lettrine.source-2.2"="wcspx3zmb2pzq6p9665q4ckr7r88jxgf";
+"lewis-0.1"="dc7cw320gc531z7m47z3pgby0zl5l6nj";
+"lewis.doc-0.1"="di515hv7q93g3mb76d9i4xdm7v35qabs";
+"lhelp-2.0"="47yixr326p1aaxdfbc8y8f051yk4blfs";
+"lhelp.doc-2.0"="drv0y9qml4fw44zmyx91gddbsrlv9x5l";
+"lhelp.source-2.0"="5z2hrf88v8ydgl2savdn68ial9zy6i4b";
+"libgreek-1.0"="dsf5z1fq4y0agzyyv6yi0vjwl233d8d4";
+"libgreek.doc-1.0"="g2bs55qw4b3caw4paxrnapy67n0ha9ri";
+"libgreek.source-1.0"="1fzq025r679gwbakqw9av95ycxj5zlmp";
+"limap-2.2"="kv5hncahb5nmmvrk1rn9j6ikj5i0qvs3";
+"limap.doc-2.2"="531jnlrzb50nsqzbm0amybf98crl0l7f";
+"limap.source-2.2"="djbm84g3cwpypc44slyscyacm1wmpl7n";
+"linegoal-2.9"="amvia15hibyyc6n80wx6lzsdg3rk8h4p";
+"linegoal.doc-2.9"="inrrzzhlascib9kbyjxs4f34xkj6djcg";
+"linegoal.source-2.9"="9207gnjmj07pywp2ikhjhnk6am2i2r1l";
+"linop-0.1"="jspi9l83p1rpndkj55ypbqc1g2myf220";
+"linop.doc-0.1"="l4gampl4ib7ld5pcys9sdw5v5r5x4zfy";
+"lipsum-1.3"="pcz1hrzisk3nkkcdddy5cm0maq2q3in6";
+"lipsum.doc-1.3"="pq2pnq63l6k34z2kskczpgyspflj3f7v";
+"lipsum.source-1.3"="3md0ig63828z8mw36cas7p6rwlrkm59q";
+"lisp-on-tex-2.0"="8a4xfpnjajjpck9c9i6qp72r08priknp";
+"lisp-on-tex.doc-2.0"="ppwjpd8djndd49xh2faspmpial9qy8b9";
+"listing-1.2"="y8ymrx2bxzhz1l0lkjb2nhk6j97q9v09";
+"listing.doc-1.2"="i5bgnc303kwqnzkxr7yn0938y0h2nwpl";
+"listlbls-1.03"="hmdaqr5466rlpkkrq78d4p5rfzm4fyxa";
+"listlbls.doc-1.03"="gmdiwdbadf66b6cchmxv1swlngdw6y5g";
+"listlbls.source-1.03"="8l3lzr022qmx9pw4jgp1n2fkacyl94vb";
+"listliketab-2018"="8d6nwla5nj3m47r2nw7pqhv5kpc9dlmf";
+"listliketab.doc-2018"="7j02b3ng311y78pw6k0q4zjya5gs7zhz";
+"listliketab.source-2018"="vk9ar9i94brrf3csjh9ncp2r5z48glwc";
+"listofsymbols-0.2"="9xg173d0qs233kqf04vm7qdl7ajha3w2";
+"listofsymbols.doc-0.2"="4vhmgkz6wrk2ad9bnzdv3sv3ii1np14p";
+"listofsymbols.source-0.2"="4g49piirj1spdl9hg02n9m1c8b5ql1k5";
+"lkproof-3.1"="ai3j1kpzr6ywlw9hfi3q3ld529kkzbkj";
+"lkproof.doc-3.1"="4h957l6vwp6v4x84ail94w3bfm8yc83l";
+"lmake-1.0"="hwb5nrisk72922zx1v5nqy8kcdqlgg0w";
+"lmake.doc-1.0"="hgdq7lwfi842pcpbk9dvxah687hawzj0";
+"lmake.source-1.0"="0cxjrqd9rysw8s4x0qk34yf1bczg8hj9";
+"locality-0.2"="mr4032njdjyscsy5p9xax5lw5kdbhnnq";
+"locality.doc-0.2"="98r82nbryc9zf5xyhwfnbkgrcybf7fr5";
+"locality.source-0.2"="4g29gqbn9n7kp36x0s44211p8bbmcfi6";
+"localloc-2018"="jjmgwbaj9v9503wkm5x3mr008f3llvls";
+"localloc.doc-2018"="jn8x4qwci949zci0bk1ldrkr192kasgb";
+"localloc.source-2018"="2hhfkp3qb0p6qphv2fq5cyigyrx41iah";
+"logbox-1.0"="6hm79ady9adc3i3c4p0jzmx7fwavbzqj";
+"logbox.doc-1.0"="mxpkm6s6x6zngdy8jgj801vhq3h7mlxr";
+"logbox.source-1.0"="a1q1w9s8pj9aqshkyla8cc1p3g2z9w8z";
+"logical-markup-utils-2018"="zbnw20yl4fjaj4vfmqa5zp4146yq2a84";
+"logical-markup-utils.doc-2018"="gwklf7w5nqlxiwy7avg5nwx514l2ryaz";
+"logpap-0.6"="dhd61y6riva220cjnb193v9cjbjz33bi";
+"logpap.doc-0.6"="pps9ipn239h1vw0d8p2jlzbkmcd12czb";
+"logpap.source-0.6"="6y6gv7qgh503f3n8zrpqddyghkdvzngh";
+"longfbox-1.0"="vdrqzc7ja3xh9hskvq6wby57ijnh8lhb";
+"longfbox.doc-1.0"="z165w26x5hp514f8pgb0v6cm5q1dxaz7";
+"longfigure-1.0"="1s3wdjf4wsjyp8a532a5nnaj2mkdrlsj";
+"longfigure.doc-1.0"="n4m39wdyv2i8lhgwd5756c9yv6hi33xv";
+"longfigure.source-1.0"="9rc80adbzmk2jiw5si7arqfshwg7a74p";
+"longnamefilelist-0.2"="dlicjdpj09c3dhzxv5pvfgw1029rxdrw";
+"longnamefilelist.doc-0.2"="46hypvsg0xpnil02lk942lnp3d22rvdw";
+"longnamefilelist.source-0.2"="3ph503yw35mliqir4k60hv3i8lah3q7v";
+"loops-1.3"="0f0xz58wdvx6cvkynx3xmyxm08x823jh";
+"loops.doc-1.3"="6v1ghg77l3nrab23by4cwqwr014jjwq6";
+"lsc-2018"="m875c3d6lpgh92sym2hav1n0lll6f7nz";
+"lsc.doc-2018"="ajdphikngmbihczhfyarwa94i9r3mg6p";
+"lstaddons-0.1"="n797dx657x03zpkhb1fc2ygd0ppb023g";
+"lstaddons.doc-0.1"="w57l66903jqsb827q96f05as16fr5wf2";
+"lstaddons.source-0.1"="35c9b9n0qi3rjl2gg9dr158v21rh5cq6";
+"lt3graph-0.1.9"="j25yxznhs8n6c6yl1bf24mvx202av5vy";
+"lt3graph.doc-0.1.9"="zj5lqwnd7mm5rv3ply8l4y8jabfcq41g";
+"ltablex-1.1"="a9hh7jiwaw9k0zkmb5yy7halay61g1x9";
+"ltablex.doc-1.1"="40lyll74mnj18w4fn69a2gnan846v4s6";
+"ltabptch-1.74d"="z6ikfwfzq7wsnnr6acv0fnqmvq37cbnn";
+"ltabptch.doc-1.74d"="aa6psxhjpb4n2cn73asiqnycv9g5gnis";
+"ltxdockit-1.2d"="md2zz844hk8w5jirc633l6jzix82dlwd";
+"ltxdockit.doc-1.2d"="v442rbm6y5ncm6ijzx9b7xwdf0dx28pg";
+"ltxindex-0.1c"="1lys1zfka0z2qjnwj8ghak8xhzkzh4bw";
+"ltxindex.doc-0.1c"="90k7xf0b9qiawqf4nm4fx5hkacx33ymz";
+"ltxindex.source-0.1c"="x9ifr8r7ihl5yh8y7sbpxz2hc2y296g6";
+"ltxkeys-0.0.3c"="kg0228ksc3vh9js3bgknkciga0dgip2c";
+"ltxkeys.doc-0.0.3c"="27k3rl3wvxk8a7qys8lmk2vzsgck80a9";
+"ltxnew-1.3"="xap2rn5bk0pjdrpyvfi47zad1i2r0jf6";
+"ltxnew.doc-1.3"="2j8nvnzdjxan23jrky53h6aj3bcn34z2";
+"ltxnew.source-1.3"="30hsnd2yrpqdqxczsza02v4rkqa4fiwa";
+"ltxtools-0.0.1a"="xml1xbh8w9gqi8gim7wps9vmadhmrf3r";
+"ltxtools.doc-0.0.1a"="hdmpfrkdycgs0qh3mcxgydcscilacfr0";
+"lua-check-hyphen-0.7a"="9lmqby4bc5pcfbfib7f45742x7jcxjmx";
+"lua-check-hyphen.doc-0.7a"="36n5ni2jzkydxwi4x4akv21109y0qmsy";
+"luatodonotes-0.4"="pn42k5rx83hibk0aayaydb2z0zkfi1al";
+"luatodonotes.doc-0.4"="9615fx7r9nlvlld7jn47jlgb380jmrxf";
+"luatodonotes.source-0.4"="k8919986lx5jwq3qmwyjpg62qjjpa9gw";
+"macroswap-1.1"="19xdcyrfd1z77ld3isdzxjhvsijifmk3";
+"macroswap.doc-1.1"="dkpw0kw0a0d8cwp237xy5c1a9ab0s0p3";
+"macroswap.source-1.1"="wirvpfkv8zjyqghlabclnvnmb4w8i2rh";
+"magaz-0.4"="zd02izsnb56wz1wcfqfj6p9p7pycwd3g";
+"magaz.doc-0.4"="cdylbzidxq2abda3np8ia16m3lbga9w3";
+"mailing-2018"="4v4vxr5i84yphwj7ff6s3vi0n2wx1jaj";
+"mailing.doc-2018"="fw87jd6gkc88g5a5z17gm7fw3nk6pana";
+"mailing.source-2018"="1zmcm4sg1p3vlgb76yf7gz0ds1958s6b";
+"mailmerge-1.0"="6zixn5f5rjq4fd65bbhkzwgijfhw262i";
+"mailmerge.doc-1.0"="wpim80lnxbf01an1ds6ksasm2271f54w";
+"mailmerge.source-1.0"="00r71m4cliyz9870yfxd5nl0b7b2px0r";
+"makebarcode-1.0"="m3wi7hglpq3ajgldkjipnddl56z1cp09";
+"makebarcode.doc-1.0"="29bd2af0rk7bdy7yiphxjy2x4ixpy9wh";
+"makebase-0.2"="hzw2dp6xmjzjblgbzm1j6qqmbayvzzlw";
+"makebase.doc-0.2"="0nnwh21wv9zl6cvf8a8h123ssys0p9ih";
+"makebase.source-0.2"="nrvlr5z3iwf8w7hy0fja6vki9l1xknby";
+"makebox-0.1"="iqvm1iwwrpnrdyjam0ca2wl6s2n02sx6";
+"makebox.doc-0.1"="i5bdjmv81skcvjjzy4yq8p2cim2vnmm8";
+"makebox.source-0.1"="v8lsifwcglwjacxij0kak54028h7gqrh";
+"makecell-0.1e"="073c9wfpc83jhcbkmjlkpfbpmy082xyv";
+"makecell.doc-0.1e"="irl3sf564yjdnx538vbqbw6ji0x65m56";
+"makecell.source-0.1e"="qaw6f6hmvj4125v30wr0drnlq0piim3k";
+"makecirc-2018"="m4xbci3109krv6agm0nhvry9kd7wjs43";
+"makecirc.doc-2018"="w7jd6g686b8iqqbmyipml4c1rjry4bax";
+"makedtx-1.2"="1k3yp8ylmvcfx4xcf1kgmpnnrrin2nsk";
+"makedtx.doc-1.2"="shcl10mxk7f7g0i4y2n6fppjjs33g5i0";
+"makedtx.source-1.2"="blsivri3lnfa4grmk46wxlr2yz87djb4";
+"makeglos-2018"="6bgdfjbhxvfj2my954iinjp1xcxnyq4s";
+"makeglos.doc-2018"="g4w2560v1pxm38dj5dsb3irgijzh221g";
+"mandi-2.7.2"="ypwfwm1wnn2h6qyr1a4v8y6my1dj0y5m";
+"mandi.doc-2.7.2"="jcw3bavd2wpd6jiqvijrarwwf173jw8p";
+"mandi.source-2.7.2"="r0455y5pk2xazna8d3imj6y3ms4lhzv4";
+"manfnt-2018"="1nl2yh0i4qbxg0js1q4h566vbhh9szlr";
+"manfnt.source-2018"="3vzdqcfcmcmi75xgy4787fqacrsa12ay";
+"manuscript-1.7"="h6a06qa8wdg942c9l85xk2drlc07k340";
+"manuscript.doc-1.7"="9lfydjsxnci0b6nfdmayjigm8gfvbiaf";
+"manuscript.source-1.7"="7s5sj7f198rxkggz1j96kk6fgr5s88ci";
+"manyind-2018"="virrlmy0ip4xw9w34n6bzih79nbsvq39";
+"manyind.doc-2018"="v6ch0h999j7v84q0m9b0l1z2vbcr1jmn";
+"marginfit-1.1"="a1cpx8n1camjfznxf5lqcjfaaji46gq8";
+"marginfit.doc-1.1"="c5rk8f7ac1xi00rz2xkh708s242wzfq8";
+"marginfit.source-1.1"="r5a53yzalhc6gmbsxk9z7bba5ns0552k";
+"marginfix-1.1"="00sy5lr6gy3r8nvfqk6pry6rcipvkvpk";
+"marginfix.doc-1.1"="hfaiqs9h55v4c896b6grnhj4xaqsawhz";
+"marginfix.source-1.1"="18sbg2vngagcka14wdl3xsx9iwy08q2a";
+"marginnote-1.4b"="98qa9kfiaiw6lbm0jsblq68vxla8a3z2";
+"marginnote.doc-1.4b"="k5mxj5j1ws3q1a71fj9k4f06n7vrj49h";
+"marginnote.source-1.4b"="i33692nz19pddmvmqw20xx3i04grxn7l";
+"markdown-2.5.6"="mm4wv2cpxi74p1vcx5p873zc4a0c25cn";
+"markdown.doc-2.5.6"="nssb0i8yhq2a1whhdxvqnm76mf51lza1";
+"markdown.source-2.5.6"="a5w3a29jr2f78mwh5rlmim1wbpx2c4lc";
+"mathalfa-1.10"="lsvxxiivlph8qh81zqpxxfhh295jj7pz";
+"mathalfa.doc-1.10"="411j4lngsrh5baqs20i3jcl57yjr792q";
+"mathastext-1.3t"="d569vymh2ih1ps1wka6f1gzkn8nrqd7a";
+"mathastext.doc-1.3t"="gm6i1rb34ljpghw0ibvddhbg1npa5hdz";
+"mathastext.source-1.3t"="mk222f5b8f5yq3vylssswgfn7b941xn6";
+"mathexam-1.00"="4rhl11na8mqzbl9l7wjk53fdhdpzbgih";
+"mathexam.doc-1.00"="7bhcdnalaakml3rx50sgb0799b9883cp";
+"mathexam.source-1.00"="mcs3csvr3ayvjijs6sh67mk0mrp5zawc";
+"mathfam256-0.2"="6kf6b8zawrdz4g73gw6m18m85h1mz9zi";
+"mathfam256.doc-0.2"="hbx4kkw9s86cq2qbx2g851cbp4s7f7w4";
+"mathfont-1.2"="mrnsvkb2xblkfnk0pfsi47hz58yyh310";
+"mathfont.doc-1.2"="hb38gi6dbrwyk13v0gkx7qxxbfywnndr";
+"mathfont.source-1.2"="8q6zzxvninymaq5hd2p1kncbnw7q7pn9";
+"maybemath-2018"="b7n8bgmz0vizghas19svaf1asi7633ck";
+"maybemath.doc-2018"="7scmh5q3xpjd6gdlq07kf59sn5bbflxc";
+"mbenotes-2"="7nxdmwq8pxxkxh07x26nhxr4fy1mymif";
+"mbenotes.doc-2"="bswvjyq6cy2vbfc1x2cmjcnr2jlcv90g";
+"mcaption-3.0"="bxgcc1lkr9p5ghd80mh2ixnc1g4g49f5";
+"mcaption.doc-3.0"="mzbfyspjjjq3mhm2m06jmf9fic78i6bm";
+"mcaption.source-3.0"="ix6v7ldrgqw2kyb8mxppiw47p1fsxj29";
+"mceinleger-2018"="n5kag86y4a1q3m4d2kgc1k4xbbchv1hk";
+"mceinleger.doc-2018"="g3ldzbnb7jl4ii7pvc518va6x8ahlrh1";
+"mcexam-0.4"="3r3kn0mpzsx4p8scl2zf57sj54q6q6n8";
+"mcexam.doc-0.4"="c2hpirn5sl7m6cdf7mw66l7nrpcmz1i9";
+"mcite-1.6"="q16a807pfbxbcqyw1s5f3vrj0yym2z86";
+"mcite.doc-1.6"="6ak2czh685l6gxam0p0vdl8blq8z260r";
+"mcite.source-1.6"="pjqx07klaqvpxxf8xqqgad92h8rgvkb5";
+"mciteplus-1.2"="gxg0f6vk8c4bqcr5zczmwhymnp2hj4md";
+"mciteplus.doc-1.2"="wjdym32052k8qm02dr13qhclbry9r3py";
+"mdframed-1.9b"="kc60c77k0qwqhdmpbk3r777k4q857jx1";
+"mdframed.doc-1.9b"="pr5d7iqc4akn0arxjl7ynqsl6dlh64sy";
+"mdframed.source-1.9b"="xnqih0l0zng5bmrjfrprr43k6l645kvi";
+"media9-0.93"="r0w3vhgdiz6c572fmvm4y11z2w2v3wbw";
+"media9.doc-0.93"="0xlfmgp42bmwfnf5m849sdh3br0pcxh1";
+"media9.source-0.93"="dd0gcs0nbmsvy7ha8l2lnajwrvzrp6s1";
+"medstarbeamer-2018"="vplzcqcrgag8dvin3yj0prlcm9gsb2yh";
+"medstarbeamer.doc-2018"="7i4skhq9pj4k3aswbzbpjqqgdj0s69gd";
+"meetingmins-1.6"="d5x8znpkqcghi9lv4gby2l97smw6kddb";
+"meetingmins.doc-1.6"="mkxz4zi4a7rgq8sgwaqsc35n888gzs4g";
+"meetingmins.source-1.6"="5xridwnlmxkws7h293a1pg373mcb3gwv";
+"memexsupp-0.1"="7i8inx1l5wmljf6jil3zjiyfs6p4hqpg";
+"memexsupp.doc-0.1"="2rkln5mprxhm81v54jhd8a777h1n1bzz";
+"memory-1.2"="xbyqh88hgszrma77r32dzly4k928vwpd";
+"memory.doc-1.2"="97n5y37w8k1b1dghkjmdny2lgc2b0z4b";
+"memory.source-1.2"="xj785y1h8zncgikinri52ri4sp7av9cr";
+"mensa-tex-2018"="k0v2gr8sk5lxj658b62h6rnr3iwik4kk";
+"mensa-tex.doc-2018"="cbym06lj2jif90dpqddc2sl36glwlm6k";
+"menu-0.994"="601vvx1mrqc5l4ig4j65bq88yjzcc08g";
+"menu.doc-0.994"="s9wj7viflx78y49dbs3scapk5vslf5xg";
+"menu.source-0.994"="n1pq98wjrfr476cwy442c8l99n1k9f6s";
+"menukeys-1.5"="4paqhdrsa9n9vnlcih3lwbs7ig1cvpxb";
+"menukeys.doc-1.5"="vqip96fgdq26ypfs2xpp947qmjybxpxm";
+"menukeys.source-1.5"="g0i476r5ajhpj65sq4m3h92c236plbkw";
+"method-2.0b"="6lpy1619i1m75cvsi9c2vzjxbcs9ia5a";
+"method.doc-2.0b"="c54snw0hl1agj2fs4r3jqnk9gblxpvhp";
+"method.source-2.0b"="y3rnwdcn8d1zs9s74nsza1zscmfbskq5";
+"metre-1.0"="mf4m9vxkjfkwhv1fqjw051kfb5rz44ml";
+"metre.doc-1.0"="bd500sp1di947i1rll56h80k0pm6312x";
+"metre.source-1.0"="44qm1832z64vxp1kmj3fg5zyv1jvjpb7";
+"mfirstuc-2.06"="rlg93z5nq69rfqjka4r35zn2w20x7d6f";
+"mfirstuc.doc-2.06"="y1j1a3qry6bq4lyfji70sx5jca5kk7fh";
+"mfirstuc.source-2.06"="0w7yc9h4091i7h6ihm5h14ay0hvx5smm";
+"mftinc-1.0a"="ckn9lv76yrkzpbi965rl9zvgcqg8alzg";
+"mftinc.doc-1.0a"="2qb409wrm8pf6nj53fbf16pwjrp7h3n2";
+"mftinc.source-1.0a"="s4kaysarmk404dx4pf1xlanckix06jgg";
+"midpage-1.1a"="k6zlxyg3y73s0npss5d14nizzzf6bl27";
+"midpage.doc-1.1a"="7rbxbq2sy6h6lk25kl4sn2hfr87kjhcx";
+"minibox-0.2a"="4fhpgzi7wc6jh7n8rf2n9s0cpvljwwc9";
+"minibox.doc-0.2a"="sviimirqdwfgk14my3w0zr2qycccckf4";
+"minibox.source-0.2a"="q704gpig53qmnbsvy9kcwl6nm161nak7";
+"minidocument-1.0"="q06hnvnkj19habs189lgsx35srq63g3b";
+"minidocument.doc-1.0"="lccwy6b0j7z28w8zp9gsvassa240xc1p";
+"minidocument.source-1.0"="ksir0ia0gyc7qzr4pfjxzx2hcnzpc0b0";
+"minifp-0.96"="28njw4zhz6fagd3wwk7ybah5c6nx4lrc";
+"minifp.doc-0.96"="xci52b9lqvfx748z6y3a5f6spwqnc9qz";
+"minifp.source-0.96"="y3lmhlpkdcrix3kk3kv7rpqmnb9hlz56";
+"minipage-marginpar-0.2"="39mkfjhflkvby43487kqpwagi8mfb1dr";
+"minipage-marginpar.doc-0.2"="ca67m5ikd0ka529wbi2s22zq5r5cr648";
+"minipage-marginpar.source-0.2"="db4g8ckwnbk7pspwfz9jbvndnzqbmfdf";
+"minitoc-62"="nm22vk0d9n4qsxg30qdg670q2ary85qh";
+"minitoc.doc-62"="i5pyp0xwkd9601vjmmnmsdzhm23bpkfs";
+"minorrevision-1.1"="svc8nrmpcahd95mzyggc6vmpfhmd9917";
+"minorrevision.doc-1.1"="x12xlc4ja8ksnd9rpnic0c0hymj1sdwn";
+"minted-2.5"="4d3kkhjjlhqb1nmp43wwsrw3z0mv94xy";
+"minted.doc-2.5"="pf8yy80fj73nibdnljhlisc18cs1x1cw";
+"minted.source-2.5"="wl128ack6c90ij18fmvf27hnxm6y9gf6";
+"minutes-1.8f"="c864pfgi1a853n93jddnndgsp325sr1i";
+"minutes.doc-1.8f"="z3z8rxzrkwz7k6756b654v6wclx4f6rb";
+"minutes.source-1.8f"="w4skq6nprvgxhvqrf4xa2afccr1hsz6g";
+"mla-paper-2018"="7rh7dh7mzybc5wzzbibh1lc10kyc99p8";
+"mla-paper.doc-2018"="3csgrsb6bh3sbqdzfx6y84i7ph8lwnhc";
+"mlist-0.6a"="5yh180f4d4dsrfzin6cjmshad8w7fi6g";
+"mlist.doc-0.6a"="wqscsdlyx7zqyq1g5hcfcp0cs5w5dxxc";
+"mlist.source-0.6a"="hlnmvms7n3csa2v0ixwz82wp2dlc7jy1";
+"mmap-1.03"="3yv1ma0qa2qw6lnaq3q98g4blg5s287p";
+"mmap.doc-1.03"="w9894wmjjay6c52wks4i80cvk0baba2l";
+"mnotes-0.8"="n7d22a7hh42vdiy9j2mn0x3dw86s81gs";
+"mnotes.doc-0.8"="lk3cmdx93g8vl58b32qc9zdwl6c3mh2y";
+"mnotes.source-0.8"="cz8303fpgl3h17lvncqbpj1xz490waax";
+"moderncv-2.0.0"="879a5m6h3phx4dfiv0pkw5f5pvr49zgc";
+"moderncv.doc-2.0.0"="siyfv7qm8gbqwx21rqm1hq2l0fkq5zad";
+"modernposter-1.03.1"="hlb03arz5iv98iakvimihvcnb50zdf0k";
+"modernposter.doc-1.03.1"="qb4pglm91r4w85lbp7jdvgr8b9nqkmh4";
+"moderntimeline-0.9"="iim54njrwrmgx5l6q256qghpg61xdfn2";
+"moderntimeline.doc-0.9"="r01hn888b16196br6vpwkhqklk5fjfz2";
+"moderntimeline.source-0.9"="1m966j7kwkm3z9b6r5c35pc6jm6c4g7d";
+"modref-1.0"="66l3h642swhw1maq3gd0l3bc59dlb9f3";
+"modref.doc-1.0"="qywhydcrg4qw4lkxa2gkdqdzjzsjc0j0";
+"modref.source-1.0"="a362js5xq7a69k1zawmyfj9f4p6254v0";
+"modroman-1"="yvhwr314ymch4fhvr9zq8l1rsp3jfinn";
+"modroman.doc-1"="2is4g9r40gr23cy469q2vk2kjj2jbkm6";
+"modroman.source-1"="1kddwifbglz7hlhxndcrr28dfgd0bdy5";
+"modular-2018"="gp555cnfp2izjp81bg1l1aij466vcfxr";
+"modular.doc-2018"="5yxpl169qqnh3p4zhwx6glnagv6a210y";
+"monofill-0.2"="jnv36mj3w2vihnq2f17pbm1yzrz2176w";
+"monofill.doc-0.2"="gr0mhc8f2w3dnd9r6flqvq5yyb388h4p";
+"monofill.source-0.2"="gmdpp4qn9x5bxk24afqs4xg7vzvaqkp4";
+"moodle-0.5"="256bfwnph8m38q5y917zfs7fcwzlxijk";
+"moodle.doc-0.5"="574wp6sh5cnn4r3nggvpk1xv06fi2haw";
+"moodle.source-0.5"="y0njw4q1m03x2wd83d64ph0i3vha42rm";
+"moreenum-1.03"="q6a3sxik7whl9zif8j5bs1bgxcp611rr";
+"moreenum.doc-1.03"="f0vzqhha6bbsvwnsgq3ng5v4qg3vkbgr";
+"morefloats-1.0h"="dzx390854qkxvhcas8krahqfg2pkg93y";
+"morefloats.doc-1.0h"="fwyzwvgdmwqdsgl2lwyqxdq0mlbrhxsm";
+"morefloats.source-1.0h"="hvakfpqk8j2r6r4fmrrhx3lrncpb35l1";
+"morehype-r0.83"="7wdy8cw7wk428yy79ca20jlikk3q06ap";
+"morehype.doc-r0.83"="nbm1bmcdi42xn7nyf4p0nlgy5qsrx4iv";
+"morehype.source-r0.83"="wafhphln91wfmqcn7zz0gcpaan0lbz9n";
+"moresize-1.9"="mrny3a5x1zkhbxrfqi4px8izf62axxxv";
+"moresize.doc-1.9"="jgc4rbzb7qyx91k9k7m4mp05m0nhrvkr";
+"moresize.source-1.9"="pglcf851fgiqzx76kihws0c5r8c9gmhb";
+"moreverb-2.3a"="w1rxv8g11dkpi1zyfq7xblgjjwi2dkw6";
+"moreverb.doc-2.3a"="70m0wiik9lqc2r4pi4nrdmm0rsx9d8cp";
+"moreverb.source-2.3a"="zxqcx8a12s33gklfq4zv3mci70nimpir";
+"morewrites-2018"="chh4khjjv76pnz179ganjrk5xz2l9i0m";
+"morewrites.doc-2018"="l899vgbra14rf05lhx497s9qf9wfj4gn";
+"morewrites.source-2018"="cv3k7jzqdlri0jla3acz8iy81dh9nwhp";
+"movie15-2018"="c2vppl6yv82s4n3kqjfp75qby2rwfxkv";
+"movie15.doc-2018"="1kn8iwx5x1gc978p0gjj2rwy4ablkdvg";
+"mparhack-1.4"="5sq75r9p6laimfxiz9kl1j5cgplkzin7";
+"mparhack.doc-1.4"="6i835nghib094n03i095dc0p7zq30znm";
+"mparhack.source-1.4"="07xwzd4pvppkb7ywwzdrip3yk41d5wl0";
+"mpostinl-1.4"="x2gf20b5d5983pzwn488z3dd9xfcgzdc";
+"mpostinl.doc-1.4"="6zgsz5j1v6d11v7yd0j0mk8g47jmqgaz";
+"mpostinl.source-1.4"="scinnrn3fl9bvr8jnflqcr8y8iw3j05k";
+"msc-1.16"="fa7ja4f7a2qpc08q656711qdxlgsjqdq";
+"msc.doc-1.16"="b6mcb2izb71p267zcfhj3l0x7rc2sihf";
+"msg-0.40"="mi7ihvy6gmkfdi2m57125cq9c446q5d7";
+"msg.doc-0.40"="q4fq11pxgvj9d37jpf5j1kigr740zmlp";
+"msg.source-0.40"="bnclkshd9vm1ma3kwwskk5qq7s0n7lz8";
+"mslapa-2018"="xmci0mddxivrp23hxp50wnlyvl9kir04";
+"mslapa.doc-2018"="dpvra8ngic2ydqxs8y59zd0jffy2q4ai";
+"mtgreek-1.1+"="afbh9ydcsnf1k0c714ypmqrf0qjcas6a";
+"mtgreek.doc-1.1+"="pq9303jyrj7nq8rwgi5d7njbc2x3jn58";
+"mtgreek.source-1.1+"="6whrwjvzz5jrhirhgr7kymc3jczn2zmf";
+"multenum-2018"="f1d7s8hafvsk4dic8ss1cqdjqvn8dlih";
+"multenum.doc-2018"="w65nsjanh13fxbkwhiinwzyhq0ra2m54";
+"multiaudience-1.03"="dcqxnkwsqd6vyk9wnwmac5b832dzb4ns";
+"multiaudience.doc-1.03"="8z6mbzi6yyv5cmp6pn2fsg5vlagyrlwn";
+"multiaudience.source-1.03"="5v4r06mydnjvq7hksjgdqd17m47b0g1z";
+"multibbl-1.1"="7nvyshlsgfcmlxc0gdn8b353sc6g3qw2";
+"multibbl.doc-1.1"="isxh2fz1yaz86acvpcv8k1hmwnazck6m";
+"multibbl.source-1.1"="z6wbxacy1rzz1l7wx6ppi8dsbipvc5s0";
+"multicap-2018"="9ja1cljsr31lw6rjvph8gi154z8bpl8j";
+"multicap.doc-2018"="z17yw0id2vdhckvirlrq3npkdpxk5hrf";
+"multicap.source-2018"="yv4rw5hjfj5fj0xyh2p3glmz0887x105";
+"multidef-1.10"="5wsklk9lvznmwisl7jyhiai2zz8iizhb";
+"multidef.doc-1.10"="sq7a72nhiyd5384dx9y6k1c72gl8ia2n";
+"multidef.source-1.10"="hx6fbjirp5gmpn9bglp0hcmmhdjn1rsb";
+"multienv-1.0"="r4q7rsyn58q4scrv790dn1jwy2l0w0c7";
+"multienv.doc-1.0"="jpvk0s1crqx5y739hr40ajzkc960mjr0";
+"multienv.source-1.0"="x75lc8vbar75g490rdpjplwi4fr41ff3";
+"multiexpand-1.5"="q49fs09lmw9s8bz91k2iis3q1sa5qnln";
+"multiexpand.doc-1.5"="98kgaaxbfnbhc7rvagk2w2qjscaymaji";
+"multiexpand.source-1.5"="88gj4rql48wvni5la1xbzrpyxcrm2dx4";
+"multilang-0.9"="2zi01a8mbsngarlk4ry5dflyzwz66wkr";
+"multilang.doc-0.9"="8vmjg13chfm72c6314majamh66qccpiq";
+"multilang.source-0.9"="xis5mdr5i3k25sgng4kkswls32w4vdbp";
+"multirow-2.3"="7drmja2v03mvpfxcy6mfhwclf4j2gql9";
+"multirow.doc-2.3"="d1mbsdmxj2jw96jxmcawk7x5sim2lqd9";
+"multirow.source-2.3"="cpw54q48axq1ik9ynipadr8qi186gzgc";
+"mversion-1.0.1"="7vpmmb88cjk92m2a2hz10cijkxf44bmy";
+"mversion.doc-1.0.1"="a2fx7phvl0i1nyhb5h0w6ld1n9kvcgcv";
+"mversion.source-1.0.1"="zhbd3j6kxsdyznx9haqqh4vk7b8nrl09";
+"mwe-0.5"="dx1fdq96hyssx4pssbww55fqwcx71nys";
+"mwe.doc-0.5"="777ybf035b85yxs1iliv0vs4rd1nzqrb";
+"mwe.source-0.5"="gbqq17i9rnxwh0r2wjg2pcp9x3jzwyql";
+"mycv-1.5.6"="am1khnlv1w5w9732q2azpsjqjp7xd96b";
+"mycv.doc-1.5.6"="gd3fqxrg0y28fw4093g50a9fl5qpb0l8";
+"mycv.source-1.5.6"="9jvb2232smja8fb39hlxnh813vlvs47v";
+"mylatexformat-3.4"="j9yz4p89ln68ra05iyl46vnsia9c2m83";
+"mylatexformat.doc-3.4"="jv51r001b567qdpj04srhpinqza2cbrx";
+"mylatexformat.source-3.4"="27n04f9m812jsgwpr47sk2k39anbk264";
+"nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0";
+"nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip";
+"nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d";
+"nameauth-3.2"="8mchkgj0v2f3qcvrya80vbx2c55gwjcq";
+"nameauth.doc-3.2"="hq4wywajcb2h28zy4alj8di8ap12c3r0";
+"nameauth.source-3.2"="g1p0ddh1x8g4w2qwc5kvj3p92g8s3js6";
+"namespc-2018"="6f7x6ldx008l8w5ziahgwl42hb5bws4k";
+"namespc.doc-2018"="6aqpn007i8s488j4qi8xhbx9zsyvafbs";
+"namespc.source-2018"="s5ws2rny22j23bqy5cn2mz23qn91ssfj";
+"ncclatex-1.5"="vyc62gppwksnghphh3fch8ac3wji38qv";
+"ncclatex.doc-1.5"="i5klzg6hjqk8gq73g7ck9za6arh58rwx";
+"needspace-1.3d"="n3bhzw4qj1q1pml8yw40q3p8nzncygia";
+"needspace.doc-1.3d"="p8ahld3my116ynhgip3xfgxd58n4w36v";
+"needspace.source-1.3d"="2i7mdcxrdh8p54l31qqcfsdbrwjfiw87";
+"nestquot-2018"="f9rwiwxi2xksi75wfwmsq9gmrj78scg4";
+"newcommand.doc-2.0"="cdy7kzxpazx56gc6a0s62nx1bq3x1kz3";
+"newenviron-1.0"="s27wb3f7q3qk5lv6ficrjs6kkxqal7hi";
+"newenviron.doc-1.0"="j20cd7xar8jxbx17dv9sqpsrck6cydd9";
+"newfile-1.0c"="fc360fhzp2yxcpssdvgwp1fi20w91k2b";
+"newfile.doc-1.0c"="4d3gk4w2jbh96d98qpjh7r329hb11c0l";
+"newfile.source-1.0c"="1dyv1z8dl3hlwd0x3d9jy6kvfyag3klx";
+"newlfm-9.4"="74aqk6qvmq6c226n5m6s0jgf1rb91712";
+"newlfm.doc-9.4"="snw60agnpwxi52h20anf911x3qx0509n";
+"newlfm.source-9.4"="kywnhr9air3kqjqa0hj0ij7605a50qbd";
+"newspaper-1.0"="sp89yvm13f900xrbsn6p097b4dspyxb2";
+"newspaper.doc-1.0"="7gjmij59wric29v4kbwyi0hxlhgkbnm9";
+"newspaper.source-1.0"="r8918czada36fb9bgzddaq9c4vaak5i5";
+"newunicodechar-1.2"="8wfz9yyzv5zphqrwp92i9cci08chh9gr";
+"newunicodechar.doc-1.2"="bj9wp3x1hqj0yfqa13yf7f21svm9sxmy";
+"newunicodechar.source-1.2"="mmv56hgbrkwxca2l3a4kxhpzmrjjm68m";
+"newvbtm-1.1"="2khz8c8b8a5946h97w2rf2gmp6z8wvh0";
+"newvbtm.doc-1.1"="y1rlqvpv8y77ns1a35q6raksa88qqdnd";
+"newvbtm.source-1.1"="1ws90wkmj308mz4qa3hham4mxm3lrl5i";
+"newverbs-1.3a"="knwjy0hwrikxfa52lzddb7p5zqgzq1nq";
+"newverbs.doc-1.3a"="884wh81zgssy9r9f2h70kank1kdv82mx";
+"newverbs.source-1.3a"="d2fvf7fsx5xj7rfmi8wl0g902drq59gd";
+"nextpage-1.1a"="b7b41bpr8zk2z6m5il51q9vxb3c8h67j";
+"nfssext-cfr-2018"="isp9rw94ck4a9ckl4b5hd8ma3cmlkdwd";
+"nfssext-cfr.doc-2018"="si6j8b4314s0gbnjxwymqbzcajclqn2w";
+"nicefilelist-0.7a"="crqgn906x51nq1d3z0s15f9kl29lbg3b";
+"nicefilelist.doc-0.7a"="a77wbb5ajkj4ab3dy1zzs3hchac77cwh";
+"nicefilelist.source-0.7a"="ng7drfgz7w69za7hmfzm4cv0m2awdx7l";
+"niceframe-1.1c"="dvds5bwfmca1phblf3jzzgj8rxq6va5g";
+"niceframe.doc-1.1c"="lkhliswdxfq68asjbrxal2k38311h9ld";
+"niceframe.source-1.1c"="qyrv98xhjmv852cmzrzrban7dj742n19";
+"nicetext-r0.67"="i3lvy4awa0igc272xv8mn7n4dfaxm9iq";
+"nicetext.doc-r0.67"="iacnv3pa0a676wy34s3s261ypjpcl9gd";
+"nicetext.source-r0.67"="6d0mm3ghwivk44g63875mpq6pafbll8b";
+"nidanfloat-2018"="f9691yflmmv0ziyfj4a65b186gj0ppn3";
+"nidanfloat.doc-2018"="h468vsrcmc06awhvkg8f3bgmc7dwsgy1";
+"nidanfloat.source-2018"="x92x0jk3ab50yd3gyjgqyb21iq0v7g6h";
+"nlctdoc-1.06"="2k3r9a400asfix3n8j3f7lgghr57imrb";
+"nlctdoc.doc-1.06"="3axalhgmiz8f9rikjwbkhckw0hshnpyk";
+"noconflict-1.0"="df9gs1xx7gymaadn2ji4dzir36z6r897";
+"noconflict.doc-1.0"="irvdqh1iyghgs73l3lv2jnrs2gj9jxcd";
+"noindentafter-0.2.2"="w1kg4gv0dpfak1s7xshs04ariccpnx0q";
+"noindentafter.doc-0.2.2"="d94gk5jrfmhpz7b1qha13wi8kmb73nf7";
+"noitcrul-0.2"="y2kmn4b9b37y79c739afhyhk7mindzih";
+"noitcrul.doc-0.2"="fz1jhgv1apc206vwzf1hc25pr5fhklhs";
+"noitcrul.source-0.2"="b8s8g15qwdsxm7ywvgj9g6307ws3hg0d";
+"nolbreaks-1.2"="1603r89wi8sninjv541na8k2islfk4sc";
+"nolbreaks.doc-1.2"="g0nm3i09kzxqqcrycrz2cak05d8qlvqs";
+"nomencl-3.1a"="sg0n0gmn5b2yg3md2rrbhcr2awa403zf";
+"nomencl.doc-3.1a"="hhnir0xxsk205g35n98xmizqnq84yd3r";
+"nomencl.source-3.1a"="kja4viam3f0lgb8lnf0sz8ia4lzz7bzi";
+"nomentbl-0.4"="k74vk3a9kl3sbrkmpyav1snh0cd16np9";
+"nomentbl.doc-0.4"="k2ggwchfqa253i96whp2lh4s3p8vbysk";
+"nomentbl.source-0.4"="al9s24x1ivpw91bbnn9sqrjp3rb5h0ni";
+"nonfloat-1.0"="yry0kys2irxfx7ril0qv6l7is7nm0fji";
+"nonfloat.doc-1.0"="yr85gza4l0wcybg4zwi004ndkl50p2ki";
+"nonfloat.source-1.0"="2zwd1bxb5niyr8higb5y2bipyqa7f3zn";
+"nonumonpart-1"="a121f2i1n005xp51qn642vx30ij74zgs";
+"nonumonpart.doc-1"="wcbvd9c2cv5ydbma4xxb6g2b2bihi0lh";
+"nonumonpart.source-1"="j2jy48jw8hgcs830h187s9rg85kd3rfa";
+"nopageno-2018"="59l05x89jv7q4mm7k73i06rmv467iimz";
+"nopageno.doc-2018"="bn5vq6kzp69p03pfjx9s34ckf4h3q6iq";
+"normalcolor-r11"="jfpqlz85fphm063mb51q9q2s61fcbnmh";
+"normalcolor.doc-r11"="vz9557sxw9c6l8m66aaagcv39x1vkfzz";
+"normalcolor.source-r11"="vs4y1p0zarr6nppqadcdcp03lc6nd2zd";
+"notes-1.0.1"="w3rp5aas5n6sks7d5j7b27s11zi4lx3v";
+"notes.doc-1.0.1"="hn20w72lj73didm46kkay056msa4cr8h";
+"notes.source-1.0.1"="23qrfsbbmyds189kcnq09jbmd23mi50f";
+"notespages-0.8.1"="3cx726w1pbmdiammpbzp0rmcahhza7p8";
+"notespages.doc-0.8.1"="rql7rmn1c85r1rb2jpmwd2h29m7b4gmx";
+"notespages.source-0.8.1"="sskq21wj4vhqyq8xzhrbsh7p8c701r7x";
+"notestex-1.0"="innwzn87vplj094lxw9w48ck6s5hmb5v";
+"notestex.doc-1.0"="p4lyxlar4125y9x3pb6sd5ysdn7w3vqr";
+"notoccite-2018"="ifpkassfd9j5926gsnq00954clc52sbv";
+"notoccite.doc-2018"="5ggqh1mvc03xgyipc6c49ssmlaywh83f";
+"nowidow-1.0"="hf3wjpkn1j2yksdl8mryssv6cxqjn3si";
+"nowidow.doc-1.0"="w1an9iayppa59h2iprjr515w8g72qkg5";
+"nowidow.source-1.0"="b6i3ypchipa228x0s6i66vrvf7zc3hgc";
+"nox-1.0"="dg0znk2gi1j87il21s7gnjpm79xv4plj";
+"nox.doc-1.0"="alyzx228zmwgpcrinv3xy6v569pcmq1r";
+"ntheorem-1.33"="2hhpj2gkad3jbmh0df7hhfy1nr39hkxs";
+"ntheorem.doc-1.33"="1ac6yj6f3c4brkgzy9xkwqmzhy2q2qy9";
+"ntheorem.source-1.33"="fc0wyfgjnckzqrd7lf3a4n6yvbhwaal8";
+"numberedblock-1.10"="x1wlbk0d8xbl0b3mx0bxgymc9jd3vv5y";
+"numberedblock.doc-1.10"="866z5if0xryr7mmi70any7p9l93f0d38";
+"numname-2018"="7gl7dp9c1wj7phv8ys39kxnarifbqfd2";
+"numname.doc-2018"="pfp7zzapdvlfbs9jd5vc2x977nxs3yfw";
+"numprint-1.39"="7fd6ja6vw3c7yg824y30xrqrmrk3qkwx";
+"numprint.doc-1.39"="bbfg2cyh8cykgl3zk9c53wk3q3vbb8pn";
+"numprint.source-1.39"="cr7xjw77r8h4bcjihxc68iraxd760gh2";
+"numspell-1.2"="xv0c8dxm8yncknrmarqy0nhjcqdaq8fv";
+"numspell.doc-1.2"="b6sfqk9wnbrg0l3p0hwff0nkskw13rcl";
+"ocg-p-0.4"="lxy3nprj8j37b2c7aylxzgm17221wscx";
+"ocg-p.doc-0.4"="qg16xjfjp36s3jxm1m75ln2nrl1rlama";
+"ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5";
+"ocgx.doc-0.5"="6vx8iiz0zfipwj45xrk1gv9cvifv4y1r";
+"ocgx.source-0.5"="5bm25s1rgsky2qc14nrgg6v3n0ywwcb6";
+"ocgx2-0.36"="dfxzfs7fsyv8p3vm3q3hq9hpggg7cm5z";
+"ocgx2.doc-0.36"="342av081lhhaffvj6g35i26v8zl40rpf";
+"ocr-latex-2018"="7mi6izsnwk6dksgmscyn45w72n1bgk2h";
+"ocr-latex.doc-2018"="9cz06542a64k4ns92qgkx1hzm5sd275w";
+"octavo-1.2"="fpv1fcrym9gplxjs0zsrrv4iziizqzxy";
+"octavo.doc-1.2"="wcd4cj4ihgmm1d0i36l66bf8dpw5cm58";
+"octavo.source-1.2"="30dsp7266fzc2l2kn98pqwwv6sdb75hr";
+"oldstyle-0.2"="3910vncyk04awikr4g0afgyfqa6dqxa3";
+"oldstyle.doc-0.2"="picdnpvv6c53j0mg8gn3l89c4ydph9s8";
+"oldstyle.source-0.2"="dwsgqd631bncikps4m9fvr7l7y428w5b";
+"onlyamsmath-0.20"="z12vjq71xjihl30fwfhqqm4wimb1dkwr";
+"onlyamsmath.doc-0.20"="h2whk4751icqb332z3h346vcjqrbgjiq";
+"onlyamsmath.source-0.20"="w3yqdsdbhx5m6briw33a0mh8jhyx25kr";
+"opcit-1.1"="59ykfp525lby8p0y5y1b5wk8ab9dvznz";
+"opcit.doc-1.1"="h74vnsw6lf4iaca46r07x0i05rhrq4m8";
+"opcit.source-1.1"="xsw3nb19li1hxnfpr4xhkb2s8qg3ap1w";
+"optidef-3.0"="innl6jr76kkblgsxys394q2prgcra9bb";
+"optidef.doc-3.0"="2c8sgr8zzd9q89b7qwizwnhb7fkjiwks";
+"optional-2.2b"="akjbm6gzli451ll82zbrwhpcajdn1b15";
+"optional.doc-2.2b"="jg81vzayz3a2pvlxhvyrx8j3w1sw65xg";
+"options-1.0"="5xy1cf8yq8awm7bspjj23nywhbs7ww67";
+"options.doc-1.0"="gy13y93wl0im19p5jc011fjnr49afgsp";
+"outline-2018"="m192v07lmcfzq3zbv87cbckz8jwanbha";
+"outline.doc-2018"="wcm9psb6ap1a5xy16fp91bwpxkhqxmh1";
+"outliner-0.94"="24bsa0d5zxz2i50i4bz0b3zsc5v7hp8d";
+"outliner.doc-0.94"="qgvvmjxq75fq907z1ya4vkir6iq7sbmq";
+"outlines-1.1"="0yh26641p29qj71w6zsx1z6hsr663q1k";
+"outlines.doc-1.1"="zg8b8617kq2vbf6inn2ms6x4a27j8yf5";
+"outlining-0.1"="c5xzw92b42pfbxmzmwrbiy4r879d3ja2";
+"outlining.doc-0.1"="rgikl4vfy01hgv90nip0iwx808iazvfx";
+"outlining.source-0.1"="miidkl85jpy5y6a7n71vilxaissip8c0";
+"overlays-2.10"="gywmsz5lbrp1jz4lp21gdb1s01ggsdxf";
+"overlays.doc-2.10"="vyz8aa3j0hgh7yjw78y8ng5xnsy4qczz";
+"overpic-1.0"="gpa3ldn6rh31llvwzj1xg3gfzm18xwzk";
+"overpic.doc-1.0"="z00m8pacqjjx7kkfharhxs20k5c5czcy";
+"overpic.source-1.0"="55c5329ladpygp3748lh5vw9h91v3k3r";
+"padcount-1.0"="am7s242sajkic0xz62kd1blgvbssgymr";
+"padcount.doc-1.0"="790smfw5i39mn1i8kfgd1dq14mgc3v7w";
+"padcount.source-1.0"="1p1pl9s3cdjjd519w8djbx7wnnl6sszd";
+"pagecolor-1.0i"="sllb6vybrngchz5k569b7pl3w13h6qfn";
+"pagecolor.doc-1.0i"="gm3l4g745mp6910pfv5201k63v44yr83";
+"pagecolor.source-1.0i"="ycqzawzck2jisybmxs7yfrr8v2h3vhy0";
+"pagecont-1.0"="8n68c03h2ckbvv11jj3cdv771ih60s4c";
+"pagecont.doc-1.0"="xkbrxr2gk65wgg5zf4cklsyzlgb03fz3";
+"pagecont.source-1.0"="74vmzb28in78lnkb7gjb8pg626vff0za";
+"pagenote-1.1a"="qnzjzijqrg65slkh5963cl1mxy8zr3b0";
+"pagenote.doc-1.1a"="pscbm0bglyryz5y4ghqgh0kkkyqw20ln";
+"pagenote.source-1.1a"="wkgw90mb45sq6baprpygc3qm5acnqrjj";
+"pagerange-0.5"="8w6mqbd385ma3m67h7v1h71mrlgkhqli";
+"pagerange.doc-0.5"="2kz3fnznp92cjp7b1lwpxvggn1q6hs05";
+"pageslts-1.2f"="axyv179gvcnvr6kv8hddpbyzj9prg0aj";
+"pageslts.doc-1.2f"="g0pir7bhi5dy6v1h2l3fzaskyba6kqrp";
+"pageslts.source-1.2f"="6a1az2z2h17z71k1bd8ziawn9ay9nrvb";
+"paper-1.0l"="wxk3akaqvdbc0q5whlwd2jpw0nvccwmn";
+"paper.doc-1.0l"="pppdcafd1gw0y9d5j91b2smzdssvvwyi";
+"paper.source-1.0l"="g5np7r4ncm9pyzpqm3f0h60cihmfbfsf";
+"papercdcase-2018"="dncf3im483zf3ix2ycp8d07bdpdqnfqd";
+"papercdcase.doc-2018"="cv4gkmg3rljv2j0pb0xjw6xzbqdii5cj";
+"papercdcase.source-2018"="qlbxx0dxb9vj7939sr3pl8cam98bc619";
+"papermas-1.0h"="xrl9ldvps0ffrygpgj501bvi4yb6cz2w";
+"papermas.doc-1.0h"="1p87yvwnn29mi2n2q4z1jsxfnq8gd73p";
+"papermas.source-1.0h"="6i3yx6ygswgf7yp1c0grv7gr6qc77r1l";
+"papertex-1.2b"="qq8m5fiyahg69aw4ajb01jg9k8x67kx8";
+"papertex.doc-1.2b"="x0s08fx3x24s5rgbsana1q0k06khczhc";
+"papertex.source-1.2b"="pzlnd4a3gkkdir8il99pkn6iw11w6bjx";
+"paracol-1.34"="rpikjdbkazixaj37i3rxhd3wixxqzlvx";
+"paracol.doc-1.34"="04wp8078vd8fby89qsz249n28bczqzhs";
+"paracol.source-1.34"="sfxvknmy374qykckaf2ib3ggkmlvim3k";
+"parades-2018"="bkr92ffb7s3zzl845jjkj1777517dwk1";
+"parades.doc-2018"="sfmlhp1idjhvy6cldh2v2k5bl5lp7s58";
+"paresse-4.1"="mjz05a7z528h2j2svmk4d8ycc6zfzbh0";
+"paresse.doc-4.1"="yahsg4ij3mnck53fl3mgcywibmnq7nhw";
+"paresse.source-4.1"="ydzd3zya07nc2kpvq3w1bjg5nbq4l37z";
+"parnotes-3"="fhk85w9ldd4x7l9d2vma4jkrgiaybydg";
+"parnotes.doc-3"="61w2ijkfwd2ww81h39m8wydl957g8hxy";
+"parselines-1.4"="krgfsp0vcnpgwgw70aw8iwbi9r9fnwsm";
+"parselines.doc-1.4"="ahspn4rw6wdwlk9sgd8f2jajb2cbm33n";
+"parselines.source-1.4"="n652xalrpp0s7yy0dvcdz24khybsm1cw";
+"pas-cours-1.6"="2dkbzp14iv265qbbpa5i9s4ir54ihf9c";
+"pas-cours.doc-1.6"="s7d7lps8aay695www7xh7sxpscg26dfd";
+"pas-cv-2.01"="zdvf8flk3kjln11sn5rs3cb265q8fgzv";
+"pas-cv.doc-2.01"="am16i8cjhh2jadlhqsmfx8vb2jyrj8fn";
+"pas-tableur-2.01"="ggwlvzkwdv3qhljir7c8v8fwivi9h7lp";
+"pas-tableur.doc-2.01"="942prkpjhj4zpvdg2d2k27ibvchw2mbz";
+"patch.source-2018"="6k92ah4ka1ljyxwgg9n91m5aj6nwvnq8";
+"patchcmd-1.05"="asi7jsa5gwd1i2k0arh2p24wprnqfb2h";
+"patchcmd.doc-1.05"="8nxwjfkxc3nbj39wfvqm8bkxm4qs1y66";
+"patchcmd.source-1.05"="bpb3vc5kdmhiwh0s6sjvxjshvmgr7hrs";
+"pauldoc-0.5"="jmvlwadvci0ha513vxih3myaq6fzz5q0";
+"pauldoc.doc-0.5"="3zflmnljccqsla1ng0rjkgnmiys81r44";
+"pauldoc.source-0.5"="7q1bzfpfrxq3mfmk4p0w58ri9w1iymks";
+"pawpict-1.0"="spbcprlcpyxh9yd98rfd8vy7ydxyk552";
+"pawpict.doc-1.0"="wrpl43c4g89pgnrpcjky42h1ckhc4dgr";
+"pawpict.source-1.0"="qfmjx2x9vrlm3zq8msph0c30py1n2x96";
+"pax-0.1l"="iqmsy6p191p8bn2bs642zclq3q42n89p";
+"pax.doc-0.1l"="cjppdms9xlc6hsj0mk324ndpjqg2px93";
+"pax.source-0.1l"="harabcx553nchhf8hh9m3wqwic4l80fc";
+"pbox-1.2"="9y4p69w5nskv8j5i8a2pxmhswxz8nc50";
+"pbox.doc-1.2"="hjv8mqhlfa9ggqypr7nwzzf03rgm7cry";
+"pbox.source-1.2"="pk6hx6w8szi4dbb7irkr0wy3xwjjdpxg";
+"pbsheet-0.1"="ph2vnjalj2imlyb1nj1rq5cv84x5a4gp";
+"pbsheet.doc-0.1"="kc5rypxy3ksbhcyh3rkxv572z8r1rmp9";
+"pbsheet.source-0.1"="3lqxvqw0cm5ibnlq16zq2drbd4gcjwmk";
+"pdf14-0.1"="nc5xwg94y7na253fjpk9wv8n9qvsk7b0";
+"pdf14.doc-0.1"="lr3ls4m5rz8fwf37j5zw6prrn5kd4dkf";
+"pdf14.source-0.1"="0y28fgs01xpfadwxc3bfq8y42vh87jkf";
+"pdfcomment-2.4"="cfplvnfr3l3j0yqx0f3a0pgmblbhvvpq";
+"pdfcomment.doc-2.4"="cc4212x1ffiw04kmal73hqsyirf5nzpb";
+"pdfcprot-1.7a"="qsbfyac2h2qqbk805q72v4v8vpzn3myp";
+"pdfcprot.doc-1.7a"="ri7rfypz9240jkmvfvlza821k9m2ana8";
+"pdfcprot.source-1.7a"="95cr49yywd59mcyj7qvqkfc9bhj63hxh";
+"pdfmarginpar-0.92"="pra0y1df005b6br3n93zpi7wrvgk2h6d";
+"pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4";
+"pdfoverlay-1.0"="chlr6244jp83vwz6parhh39js451ia65";
+"pdfoverlay.doc-1.0"="jvhhg2ajy75g3qxa2npmqrgsa1f77ddk";
+"pdfoverlay.source-1.0"="d0j8n61jvqpzrcycv4mczhp7wxvzirgd";
+"pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5";
+"pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h";
+"pdfpc-movie-1.0"="la1blfvhk9kwfy2q0sp6x1ybw5c2i7jh";
+"pdfpc-movie.doc-1.0"="5qc0gdmlgspl5696zvng96nbhgr0j0m4";
+"pdfpc-movie.source-1.0"="2d4v3bwnsws65w57arhbs2j5gvm3w5f4";
+"pdfprivacy-1.0"="0nsgnfid0rp2xkmfvfxnjp7v7dikkxbv";
+"pdfprivacy.doc-1.0"="1wr2s6qkmp8knplyvqwx0micqgal3sw7";
+"pdfprivacy.source-1.0"="jr4iilr7yiknx21fapgzkkgy4mc15r6a";
+"pdfreview-1.1"="vbvpls5iy7q63snxkmn2ry1j8k1wmmhl";
+"pdfreview.doc-1.1"="8zpxlnz72x0x7wg5canh27y4qcq11l1p";
+"pdfscreen-1.5"="5lwdmn4lxkq9hgn6fmr4rc2gdk3ms583";
+"pdfscreen.doc-1.5"="bcg3kviqc0jr3s5h5xa3in5g1hj46zkv";
+"pdfslide-2018"="78wynlp5vyc14zn93gwy73yyykk0yh0i";
+"pdfslide.doc-2018"="j8krgspjlvn4ja9dww3mc0g3zg7qhlmb";
+"pdfsync-2018"="xqg7my569gq36snly1kpii240byrpx7s";
+"pdfsync.doc-2018"="y6am07gh7iwgmgkwq7sg9z704waxgqai";
+"pdfwin-2018"="yfdlssqwsa253r0qzvy5xbgbgwpmmxpm";
+"pdfwin.doc-2018"="7k1kqy2rpr93q4nvdvwcrspqjbzz1h4i";
+"pdfx-1.5.84"="3v3sjs8q7lq3vpl0pkax47nhs5pak7im";
+"pdfx.doc-1.5.84"="fi7wnhab781dn6prnr9a2fh0m5qpq56y";
+"pdfx.source-1.5.84"="zrw1pz18hh5msx2q3w15k7p5l4jdjwc1";
+"pecha-0.1"="8bir75jmi5y33ids3wixm0sr7zjd66zq";
+"pecha.doc-0.1"="lhdivjzja3syzm6ksfcckx4a9q3pp8ph";
+"perltex-2.1"="2f79yiqssyigfci17gazdnvcms6kid3y";
+"perltex.doc-2.1"="hn1salkk7b3f371y3l3nby3lzih2pb7j";
+"perltex.source-2.1"="wfz5j1yi8qls7n7jfkip9s215s6jvvgz";
+"permute-2018"="anxvxdpnmr31a50r7anwj21vci3dxvg0";
+"permute.doc-2018"="rz1569972rz72laqrxnkphxr3bdx1pxl";
+"permute.source-2018"="va01wn3pv0j0cxqmgh8cjricj4m2vjxv";
+"petiteannonce-1.0001"="xv2yjs519vz0inbcy7m2a201ysjl3gwj";
+"petiteannonce.doc-1.0001"="9xvfy2ivdmlamj4fr1q5i1mfh6diys8s";
+"phffullpagefigure-1.0"="hp51s42ycsary7n2qngls1bm6j6mi5ab";
+"phffullpagefigure.doc-1.0"="wvbhkw4axm3bkx3jyi32iy0g3bbbfc6w";
+"phffullpagefigure.source-1.0"="z0wwcy1cjs0kv9lwxdl7waidccaa9w2x";
+"phfnote-1.0"="77if36imrvp4g43h3vfd6j9qzsd7gv3c";
+"phfnote.doc-1.0"="i0vc3q353aa2f1xjhmddlq273x9jngp9";
+"phfnote.source-1.0"="0c893r2vi32kp5cx0ncwa23zryyy6j3m";
+"phfparen-1.0"="jj8lpyhs4h7li0dmc70xhf2h17vgqrwm";
+"phfparen.doc-1.0"="73rcrl7hp843q2fjgis48raf9hh4yaqg";
+"phfparen.source-1.0"="zqdkqbjn75g379gsw0jvlzbyz5qpr1xp";
+"phfqit-2.0"="yln8ifsblmbsp34na3jfi2j5z9az00y1";
+"phfqit.doc-2.0"="ll95cj7p15xx79q024p6xdf3wsjzlamv";
+"phfqit.source-2.0"="xqiygbddiwvl3l1x9xdqcd6zqdbc4xj3";
+"phfquotetext-1.0"="52h9qw8xvldzr7smwbg7njr8acxf4hp3";
+"phfquotetext.doc-1.0"="gk5008b5k8qbi3q2i7bjk57ipwz0vyhg";
+"phfquotetext.source-1.0"="wl18lww4jvg1k8361ra2jqc5z3drs4vf";
+"phfsvnwatermark-1.0"="11rqnm8ag7p0iv2bziy89w66j9cjv4vk";
+"phfsvnwatermark.doc-1.0"="rd3y1kns876788nmbkm7r95wml31yvg8";
+"phfsvnwatermark.source-1.0"="666y9zym40h351a9fbnwy24aangwswkd";
+"phfthm-1.0"="a1g65ldp21rjb5nk19ygpijbs0xfriqq";
+"phfthm.doc-1.0"="ad1m16cjb9kyi6jk6jnvgxcm2ci8pxqg";
+"phfthm.source-1.0"="lbd9qwdv67spq7v1dy78012a874wg9mv";
+"philex-1.3"="766zmr2yzy48mmdakjhvvy56ck2g5zhf";
+"philex.doc-1.3"="r94769rncbhw6cdvzwm0s9fhwa57z7xx";
+"phonenumbers-2.1"="ypw54dphr5imy4gjcyy7ad5fin3zalz8";
+"phonenumbers.doc-2.1"="n7nww57xajrmwv25c4j3kcgwlr790xyy";
+"photo-2018"="d2rv82rm7jyd2fvgzs545kz32nb7fn6l";
+"photo.doc-2018"="1gn03gddjcbfmidsn9snhbr9nsmlbsmq";
+"photo.source-2018"="70n1vi9qla3kl592hgay45af9m078l58";
+"piff-2018"="xz2idyqgwg5y7r9ac0bykvfx533rd29p";
+"piff.doc-2018"="xwlsyrk4mczbchklsx5x8ip08zc5jk6a";
+"pkgloader-0.7.0"="15p6m1152qc334ljqhnzdagic2ylvpgs";
+"pkgloader.doc-0.7.0"="k6qdk7x5pr11qspbx9ggabp18n88hlmx";
+"plantslabels-1.0"="yi1s2470aj75chj1f5mi9961w9if1mpd";
+"plantslabels.doc-1.0"="m9h0zjyk3jf0ksc6dz4zgw9niha0qkm4";
+"plates-0.1"="chankj3114snam38fsi9nc4zap0b86sh";
+"plates.doc-0.1"="wz1xqxldn325p4c87b16ns4xxx7l5bcz";
+"plweb-3.0"="9d5dh5afrcjlcx279s7hkrsi0xja0fg0";
+"plweb.doc-3.0"="519cpfwspp2kxprill50lqhzimdi26jc";
+"plweb.source-3.0"="2ikq5nka9npdkr8gqkj8lyi1hqmxihzr";
+"polynom-0.19"="lhl6cw071xb7ivyzhdylq48ja6dqq377";
+"polynom.doc-0.19"="6sj89ph1gnbd0xa2f8sp457ip6v8sadb";
+"polynom.source-0.19"="9z3hzyf19ksy521v28p47h1dxh3c9n67";
+"polynomial-1.0"="k11f7cmzycx5q6ww5vnrxfp7xf3238r1";
+"polynomial.doc-1.0"="ffr0i9z96w9ahr8k1jx8klk1kddd1zm0";
+"polynomial.source-1.0"="m844kmijznga9r259cm2h977w4zdmi3d";
+"polytable-0.8.2"="qzfi66r74yb3cvgd5aicyflm4b25f6li";
+"polytable.doc-0.8.2"="36frl3y5hmlbh3cz9s17qnl4rjda1l5w";
+"polytable.source-0.8.2"="768zbijzmx54yrz1j8qvg8an6xis2hmc";
+"postcards-2018"="zvcijbngj8m505fcx22y1hs7y5jmn1kc";
+"postcards.doc-2018"="d1v423a7xl8pi8nqqzbr9y5ag8d2pkkj";
+"poster-mac-1.1"="vjpg0bc2f1qv0hr0kcxasymrchpwzn05";
+"poster-mac.doc-1.1"="8m0bk06l7y5bps6hn3xd40s6yb0m8c19";
+"ppr-prv-0.13c"="8znyclbgzli74aiciayqn88dp4p7mvsl";
+"ppr-prv.doc-0.13c"="x2mvhsnrb56nm2s431xlb7fi9g8irbzx";
+"ppr-prv.source-0.13c"="g4r673h9bqfxkh1ih2qp9shhf40cbz95";
+"preprint-2011"="z8qdsshgjd3dav562qnyx4vh9gdyga27";
+"preprint.doc-2011"="78x9z1vyl7vpcv39nj167bawb4z8fsnf";
+"preprint.source-2011"="i09zkvcpvapyf2jj7yhabmyrpxyf0gp0";
+"pressrelease-1.0"="7bxy141i0a7n3r2z4qnx309ijsi14dka";
+"pressrelease.doc-1.0"="y5pnw0xv53mp7skrjrjrcsr3r7hvwylz";
+"pressrelease.source-1.0"="bqj7qnacxv8mnjqjwdspm5zi5xg10im7";
+"prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2";
+"prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7";
+"prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0";
+"preview-11.91"="hw31xlmv5xplpnz3gjcmdf4vbmhvy87a";
+"preview.doc-11.91"="zmkw5whmxh98mrc705lcmqw7wj6k5h04";
+"preview.source-11.91"="67s0y9mv40fs0dgvm6zlkfs4ivhh9vrm";
+"printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim";
+"printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv";
+"probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl";
+"probsoln.doc-3.05"="n81pf053v27m4xj6cjnjmd8r0sb8lv5k";
+"probsoln.source-3.05"="k8gwixn5ssp97d05ml01k8f9z6ijspq5";
+"program-3.3.14"="fxq3hls6cibrc92g1dyavcr8s2qjxsr8";
+"program.doc-3.3.14"="qvhjjfq3msq1i9h5jf2nx54cp87b3bl8";
+"progress-1.10"="zf7iqvmc357pfg7phrc9gggwyb8rb0hw";
+"progress.doc-1.10"="2pylrgmyscf4p6ndba4jf87vfglxydrd";
+"progressbar-1.0b-4"="6zvflmdsm1vxkm3sjgmxpvl6jsw6vy82";
+"progressbar.doc-1.0b-4"="ahkr6nf44xv8czg4ffpx2qbxzwn7b24f";
+"proofread-1.03"="lix25w5bnlz5i6bphfh6zfckar476gmw";
+"proofread.doc-1.03"="jysqwnzqwa0km7bshh8w0fnbzy7zz00r";
+"proofread.source-1.03"="1k00cfxfza6dpsqkhn9qk9vzs054ksp9";
+"properties-0.2"="is4zxlnpayim96h9vifb3wazi4hcl018";
+"properties.doc-0.2"="pdpdn0rbg28dq9qgry9w9j2wvzrl9sxx";
+"prosper-1.0h"="kwjg42wqipj8w4rmilmrpsl5spr8hzmp";
+"prosper.doc-1.0h"="9bfspx1labf3y4hhy7a7sv8ccfmqw4mx";
+"protex-2018"="ajf4lsibbzcr2ynvfpx2n4pnazfkng2k";
+"protex.doc-2018"="j9v7mdk5dnlhdrj5sl3afbvgqgpk0bbq";
+"protocol-1.13"="2mpbqs6r1sl8x79dbkzgg0vh0xxs89pi";
+"protocol.doc-1.13"="fzvldl69vw5kxljg5jm4qwcar1k2zg8q";
+"protocol.source-1.13"="x52qwan5dahs53bdm8dm450h2ljr7lsp";
+"psfragx-1.1"="pb5q4bhhn2zxm0vni6xwcyxq76wj85l1";
+"psfragx.doc-1.1"="bfx58if7s6z0sb5faslismic7jbx4ycf";
+"psfragx.source-1.1"="6ikq1jhicgf6109gdnd3ldng0ycy920w";
+"pstool-1.5e"="1niq51k7cvq7kqlxymixhrhrg811rs3q";
+"pstool.doc-1.5e"="y68jbyp1rzd3wkpwvg17kiz5fsfczmi0";
+"pstring-2018"="whkbcsicbqlvz1pwjfypnvwwbbwqpwfr";
+"pstring.doc-2018"="gf1pmfhczjrkjgpawxbk6zqrwindadnr";
+"pxgreeks-1.0"="hdqmxzcwyd5llq80fakhjvx8whjxs8mr";
+"pxgreeks.doc-1.0"="hdm2s76j6vya85lid9lrkzhaj6bkvlda";
+"pxgreeks.source-1.0"="1i5jmxhyphz2mdhl742ydrzam336ix5w";
+"pygmentex-0.8"="bnyslpaj6qfdmak1k1bjyrk0jvflvg1l";
+"pygmentex.doc-0.8"="crqmqfjxlpwibbb9s7sp9qkafnk38f8c";
+"python-0.21"="a7v60025926j1nf783w765d773zla60r";
+"python.doc-0.21"="901hkhiwnx89si1rx242wa3gx2mx5kkg";
+"qcm-2.1"="d9xas7ra5n0hzkc22s6ky3qr752i1i2k";
+"qcm.doc-2.1"="ljb5bhy71jscf6hdw6xmxxyy3jyfa8py";
+"qcm.source-2.1"="zywcw16m4hk75ialbg92bx98snk64hpf";
+"qstest-2018"="girz5x7dqmr96mqyviwld4i06s1h4ldd";
+"qstest.doc-2018"="0w3r2f745k9kj4ig8yrq1w1l1dhdblcs";
+"qstest.source-2018"="z067nizm6rcjm6yz1141pxa7gm5yyfs1";
+"qsymbols-2018"="w1c7ni9qmy255nyg3hb0yf94p1b924n7";
+"qsymbols.doc-2018"="pfhp65iz5ybxccd7yjxg2rww0j9z2xhf";
+"qsymbols.source-2018"="mk7daalfvk3wyyhnlvbhb5144g6qm8xs";
+"quicktype-0.1"="40znnh6yxbhx1i7gsr0icvy5avhm68nk";
+"quicktype.doc-0.1"="ljcdha8k0ngr0ymwqbqbblgyslybvcgp";
+"quotchap-1.1"="0w1mp53lag54byxcb4jmkxmyd015jkpa";
+"quotchap.doc-1.1"="mp5shidfjdswgg1nwp918ijn6fnf0l31";
+"quotchap.source-1.1"="9wdm00jz0za5w1v1cv6k3nbi555mviab";
+"quoting-0.1c"="jmw5a88k3r137dxxrvznxx9xqwh9yvlw";
+"quoting.doc-0.1c"="2a4d2w7b4jshz79hhz57fpq6vzgdvb34";
+"quoting.source-0.1c"="g238v3pr075wgknaj82ivn70z6fbf0gp";
+"quotmark-1.0"="8inn8x79cps7g1iw3pfmc7lyky20vyxx";
+"quotmark.doc-1.0"="nkjdi0xl5yvvscs63kjdy7pk3dcvgvxs";
+"quotmark.source-1.0"="nhinvh37dw0n8wk1gvpqnp5l3fmaq3v5";
+"ran_toks-1.1"="075bz1afn45n2klczxlj38jzl27ihxk2";
+"ran_toks.doc-1.1"="av9qzf5q7524xncg54dqiq5skgvqxdbk";
+"ran_toks.source-1.1"="qzsgi73xl8kkccb4rmv8hmhq3l83c8gq";
+"randtext-2018"="bnb1sk549kzmljwjyb9gc45xr2ndckcz";
+"randtext.doc-2018"="9mpim50akqiqp54x6kpz8w4wdv9d12dp";
+"rccol-1.2c"="31w19kr365k8wkvkx91qqcw46fnl0sbk";
+"rccol.doc-1.2c"="80zx3h1b0wjw8qgv81kb4la3zd9hh9m6";
+"rccol.source-1.2c"="sqkkyhka856h4iirnvy4s8bdqlailgxa";
+"rcs-multi-0.1a"="ynh0m6il06lpc6cldc47hvk13n0jhpjy";
+"rcs-multi.doc-0.1a"="p5gwxj7airn6302zk05j32lhhnaxxy0p";
+"rcs-multi.source-0.1a"="6pc8wyv9fgazi1a240fxffwmyslir86p";
+"rcsinfo-1.11"="y7cymhiac6wvahhzkmsrkchrp2i5i9fn";
+"rcsinfo.doc-1.11"="v6wc6q5xv5rwbcgcvfrlkbk8lw3h4qz0";
+"rcsinfo.source-1.11"="86ss0sk5rzss6m4b5n96dwfd0vjh2acs";
+"readarray-2.0"="6f0daia3lp0ipi8swprpgl1pzh44hwc9";
+"readarray.doc-2.0"="bgfhvri7xh8kq5y1qykhzhjrv0vcss2m";
+"realboxes-0.2"="frdrijzjm4yi20fddhxb6gp314qg6bsx";
+"realboxes.doc-0.2"="95b3g7v3hnns9n8l1gv69a9b1jnl4za0";
+"realboxes.source-0.2"="2sj5y6k08cwcp8fs0ay7z7ik02is7vly";
+"recipe-0.9"="ya2zz3axlaax8f7qkz3rwkfwl6kc7hqw";
+"recipe.doc-0.9"="nrgg002rpx1gw16yx9pl4xfiyjg2lk16";
+"recipebook-2018"="z2m105warknssz9d0b5f0fg13mdjrwqv";
+"recipebook.doc-2018"="1w359b6rbd8cfvfa3z140hzsk7515m9m";
+"recipecard-2.0"="ywrn03f3hy5hyzszpghn9rnjkj9a3kqr";
+"recipecard.doc-2.0"="1g67mikrdxmhpn4xgpnlriapp4als1wx";
+"recipecard.source-2.0"="7g35xa8kbcsrxxmp9xxk3rgvas158m9h";
+"rectopma-2018"="j8pxsc46j0m799x9srd74d7q4jjxjdwv";
+"rectopma.doc-2018"="7h3v5rpkvxcmv1nj0wzxpgn4whs1gk4b";
+"refcheck-1.9.1"="llb529mc4gj9wf4zzs7jz9p2qgngwxy6";
+"refcheck.doc-1.9.1"="hvcfjpx9g9wiaqr70vmrpkgqy4i7xikg";
+"refenums-1.1.2"="8zxc6yyp3c597ydikw4zc36ri5xhlpid";
+"refenums.doc-1.1.2"="jqqqwvr0bd163njgkfgz2aj1jlgmlnxk";
+"reflectgraphics-0.2c"="bbpagcn17kwhp9jzp3r6kp23qbr3gqs0";
+"reflectgraphics.doc-0.2c"="klwad1c3lbcf9dga240cipdhf8vm4q0h";
+"reflectgraphics.source-0.2c"="1pwn5m9mclwsmwalal0bcfvi5sq1jh37";
+"refman-2.0e"="32g63hz11bkfsdh6n6jcl84wyjjpq6nj";
+"refman.doc-2.0e"="scp335xnhndrhgfvpd5l1372jn3qashm";
+"refman.source-2.0e"="c1d1va229zsmx2xi1gka45haqc2714s0";
+"refstyle-0.5"="5k4yj6qqvg0xph423q8cfq9yp3m57c11";
+"refstyle.doc-0.5"="w5jaccslhd2ksxq421q6zxj8lddrad45";
+"refstyle.source-0.5"="g5sfid23vsvy6b99hi1jkwcshgcgv5wi";
+"regcount-1.0"="bxa9jg03phjn6ibwfils5jkl9p6r427x";
+"regcount.doc-1.0"="knh85nxr5m3g1ljcmp7z58q0xi4rc46g";
+"regcount.source-1.0"="gr39ifiwslrh971xgq7lz5r81cx4vh6h";
+"regexpatch-0.2d"="ly17zaklhj63kiwpak0h0jn3ci6kfzrj";
+"regexpatch.doc-0.2d"="z576gsq7a8dbxpz8072n24wh4nqqnbmd";
+"regexpatch.source-0.2d"="d0vyjn4ywkcmf876mxqyps2ps4grqbl0";
+"register-1.7"="q0s9j5ypxgs1426sn1slnhfjnhs4kbla";
+"register.doc-1.7"="hrzb4c0g7k5g3kpnlw3kmsz4qhhgzsm6";
+"register.source-1.7"="ni21gmiz7ykgz8vxd77rmwn04izkpxrp";
+"regstats-1.0h"="zkxc3cbq3fr5rpwv3lw3znrs9sn1ajmc";
+"regstats.doc-1.0h"="5ddawlcn7rqzs7i7mjjj8zi3q60qpal9";
+"regstats.source-1.0h"="kafv0h7yl5qhzgq4j4ay54cm9lqgd1w3";
+"relenc-2018"="0ksy9dhzxf7dh2sgnais817krjdrnyip";
+"relenc.doc-2018"="w2s26knmf0pfnbvxbj3f2xmcvjf8mgkl";
+"relenc.source-2018"="vhwmn0hxlv5njl4v2ljz5z4kbi5n4a8g";
+"relsize-4.1"="l9n0cv3vjwqlhxw58bnj4gh1qr0mbkh9";
+"relsize.doc-4.1"="bmv72xvd2n40rclz0a5cw128a4m1khl2";
+"repeatindex-0.01"="6zzlr3miqb7p0q3h1kyaly6ykzwjlq0k";
+"repeatindex.doc-0.01"="gjkm3why0hf1269kqbpg70bwwmcagdwb";
+"repltext-1.0"="l85dk7256ydw2j7hihvjrbl2s70izgns";
+"repltext.doc-1.0"="qggf1dm3xwpz8p0yyy0b2gnw4zxa0bjc";
+"repltext.source-1.0"="rnsd3hg4mcyqj903igcsalp56pvg6g32";
+"returntogrid-0.2"="qvyji03hqf95f50pkv4jj773a8ryv694";
+"returntogrid.doc-0.2"="8s3dy7s20sl37qhayb7vz949k3nsz2k4";
+"rjlparshap-1.0"="584zbnkzrqjydg9hz42ayl9r806sd4cw";
+"rjlparshap.doc-1.0"="g4bkg84j236faakga1kl593bjw1p9wq6";
+"rjlparshap.source-1.0"="gys3kddji7j89c63a2kzz7z8xjdakpg5";
+"rlepsf-2018"="zvgnjwbrznazfy89cwbk9injrg0hk19b";
+"rlepsf.doc-2018"="q4jpki613c0b9kx9bxzqw3v7m5ggj4w9";
+"rmpage-0.92"="iqvgmj8ygy8mcqffj9wl5xr3l4g19w7f";
+"rmpage.doc-0.92"="nzm10y262ql87jqmlvbx8s5izflz8nk7";
+"robustcommand-0.1"="pclwgpigb6jf5myrirrgb35jdsrc1r54";
+"robustcommand.doc-0.1"="8236m9s2klnlvii7733r9vkr28ma0758";
+"robustcommand.source-0.1"="a6wczmjbnvfqfqg0cxbnq7srr71w3l6c";
+"robustindex-2018"="07x7k9mz0sca9wm3jrgdlak3i3kdd25a";
+"robustindex.doc-2018"="ynqqnzlpm92mb71xzg1zg538x6cl2xy9";
+"romanbar-1.0f"="77m3d5fv4abc2xx6nx5cvzpkshnbkmr8";
+"romanbar.doc-1.0f"="7ha3ybbzivbkc7fllhfjv1mlvq20k6i0";
+"romanbar.source-1.0f"="3jn06jd260yipslvs8xjflwd49pzrcqb";
+"romanbarpagenumber-1.0"="x8gs1z6nn976praar888l74avfd1ha6q";
+"romanbarpagenumber.doc-1.0"="cyfpy1g5g14jlxl83a7ngcl631297a58";
+"romanbarpagenumber.source-1.0"="qs1ia3flkqsd1psbha7bfms1anfg336v";
+"romanneg-2018"="7w6wmvkyzy4jzs8akhaswqjpv1lh9lxz";
+"romanneg.doc-2018"="m7rc0j7xbkly1zh63lrym8pzgp1g3ivh";
+"romannum-1.0b"="8l5hrx8svnn1pv9qd3c7y6gxy25fr5r8";
+"romannum.doc-1.0b"="1wlc0m18vg6vl8sgxvj4i3ca4kyfl9c0";
+"romannum.source-1.0b"="h9rkrds6v7b0pvgap090ja271k5jnc7h";
+"rotfloat-1.2"="v9iaw0lv3vc6chkic1dracvgksxrsgqs";
+"rotfloat.doc-1.2"="dmfn4f6nkq621adf18xqy9vdgqn5c68p";
+"rotfloat.source-1.2"="0c3i14195xq03r4nzk58yrdxybk2yl8l";
+"rotpages-3.0"="rzayzgap6j40817pn95w8pmryqi4a3kb";
+"rotpages.doc-3.0"="fh2a3xcl4f5mq95d2ibsgmml6pq95cd1";
+"roundbox-0.2"="g1k35s2jqgfm0ih16zf59w470kzv450f";
+"roundbox.doc-0.2"="97dr0pg7689mm504pld75cmnd3vq61rb";
+"rterface-2018"="l7szd2dbrky3idmzkx724b1ks8d9crwm";
+"rterface.doc-2018"="3hkrf5qycaq84dawxyv5a829bv8vz0qg";
+"rtkinenc-1.0"="bgvb6v03sbayxss84awkaa98i1hza4rm";
+"rtkinenc.doc-1.0"="ggkmbwp3kxa1zs4c5f7v3r5lk5v8pdjr";
+"rtkinenc.source-1.0"="iavp7gzq742v267gf3hjq8vwi1ywqfbj";
+"rulercompass-1"="bhgf5s2zj8xdxg5jhh3c4wdfyv87p9j4";
+"rulercompass.doc-1"="bc9m9y239rjdnmbrj6s6rmqadmd32mvd";
+"rulercompass.source-1"="9l57jpav5vpsvsg42gw79mym778q7623";
+"rvwrite-1.2"="fmxfnps659r2swx7gr9bdxcij2s7vdn5";
+"rvwrite.doc-1.2"="c1wrdxjnjn345siv4xivjxcw8gd5fi8p";
+"sanitize-umlaut-1.00"="fwbjpppg156xfnph18fyhjwg9k6y5dfd";
+"sanitize-umlaut.doc-1.00"="xs52mf005x6v04141qlan3wb314m8dxx";
+"savefnmark-1.0"="jb8wz370wj5gci7mp809d60qwn441cb8";
+"savefnmark.doc-1.0"="lzip7g8z26c8vgfni9n058dk9jvskkck";
+"savefnmark.source-1.0"="sv58x02n2rd7gv7mkd6hjym7sqbxlfsx";
+"savesym-1.2"="gl0rbarz94wa6qqzgza73mdmz7058zlf";
+"savetrees-2.4"="w0mxfybvqjbrqinqc8r3xhapxq80s4mg";
+"savetrees.doc-2.4"="g0zk0ijym5m753jss68ijanks42201wi";
+"savetrees.source-2.4"="8y15qzcspmi19sskifg53agnacylid1d";
+"scale-1.1.2"="v8s6izx8nzpnjd6x39yfz11l7f9rrnwv";
+"scale.doc-1.1.2"="ifyf91yd8avqh90jxa6ih9xg5bzy6a3v";
+"scale.source-1.1.2"="6r1dvrbkdkw418pwagkn2djrzswd28r5";
+"scalebar-1.0"="107wyhbx5wzliqmncsqlaykg7qw5ldwa";
+"scalebar.doc-1.0"="a4krk1zpi2yiyri88r96363l5k5kcjf5";
+"scalebar.source-1.0"="5f555kz7b0rbxh4vsmqa8hfqlv7790cf";
+"scalerel-1.8"="bnzdi8d0mf0ppkvwypxvb6wl2lyw4mpq";
+"scalerel.doc-1.8"="bpamgzs7nr8gfam69mad8qmgjs6hy909";
+"scanpages-1.05a"="vl8kzqsj7dlc21h9148c4cgbrwg92k2w";
+"scanpages.doc-1.05a"="8rc3sz2jw47xz3rz25dfw7g3gssndz7b";
+"scrlttr2copy-0.1d"="jw87bnb7phfp7nmvp4gvbi6nhfwifqph";
+"scrlttr2copy.doc-0.1d"="6pfnhhnjm97ap2zbi5bjj011wqbr2yg4";
+"sdrt-1.0"="2pcbwfywj14n08187899xjdhrjr3zzlr";
+"sdrt.doc-1.0"="85y00dj8k3xd2dkd42rzwscq70rhhxny";
+"secdot-1.0"="xb2kkwqh8dwdly3pcd20k3w2y68avkg9";
+"secdot.doc-1.0"="ngfan1hhwcnppgfpvkm0y0a3bjab1fz3";
+"sectionbox-1.01"="mxhi294c4y7knbwiz1i0h4akmlgi0v6d";
+"sectionbox.doc-1.01"="2gapb7fvm8l7m021gp281j5vdq61s1if";
+"sectionbreak-0.1c"="lg9s5shx46mmzv9kvkip05c55d4v0ca8";
+"sectionbreak.doc-0.1c"="9sfr303lfdslpddyqxlvc4b8c0hazqrd";
+"sectsty-2.0.2"="7677w338qg7wxalski08070328f4yjcc";
+"sectsty.doc-2.0.2"="plwwncg7vkhqrkkh2b1a6wpp57h6x64q";
+"sectsty.source-2.0.2"="r3z90f7w1nw4hpn61fcrn8iy5m1867jk";
+"seealso-1.2"="2ndffdja6sdc1zgi9ayhfgcfa4ihrqjs";
+"seealso.doc-1.2"="95n5alxkf7brg6dcad5jz0mfnn7w42fy";
+"seealso.source-1.2"="511kb0ka070b9q0973c1khain6yslqmq";
+"selectp-1.0"="fp7iiqkb6xqw55v28rs80in6p47li70c";
+"selectp.doc-1.0"="wy83q63fdm33il8rvia43y1kq51rkc07";
+"semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp";
+"semantic.doc-2.0"="b1hyb592d0xx35p5dqppyfgykg37xx4s";
+"semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p";
+"semantic-markup-2018"="iclw8kk8b8y3hz5j1jq8n4daa5fpnzh9";
+"semantic-markup.doc-2018"="1g78rz3l215812hr2xvbxf804lzq0id4";
+"semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn";
+"semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a";
+"semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv";
+"semproc-0.1"="gsf23afimbq3nhqka6vdbxjdasqc9f5j";
+"semproc.doc-0.1"="iki2yxxxmq90xn2bbvxv942rl3lbfi0c";
+"semproc.source-0.1"="rdzjw86dk757ddhwzw3z163zjigjnd9b";
+"sepfootnotes-0.3c"="chdd6rfn5v91c7sc3anf8rq1w7i49g47";
+"sepfootnotes.doc-0.3c"="h9k1nlwdgxynifqcllbplw29hhakzsfx";
+"seqsplit-0.1"="zc3fmzgnaxlx4jvbmqr4g22xqqr46qm5";
+"seqsplit.doc-0.1"="ans9jwdygk6j84fiwxjwr4z07rsswsw4";
+"seqsplit.source-0.1"="syxc6bkp4i55zvrs8sxg8ncq5gmq74xh";
+"sesstime-1.11"="gvl0ii8z7db01x2mka8xfizv9ac9grly";
+"sesstime.doc-1.11"="4klj8m87zavd3pi0k67mdqncihlkawhy";
+"sesstime.source-1.11"="fkh5y8nhd2wvvf5pck4nn4hlhc2cdfc7";
+"sf298-1.3"="nvb0bxh78nzvjk3x4d69mmcdbhfxnm03";
+"sf298.doc-1.3"="hdnvzghnkkgy79q6r2b9qqx9gda162mc";
+"sf298.source-1.3"="ixwa6c8c44ph14b5a0rz0js00jac9kpv";
+"sffms-2.0"="jaarxw1lmdgsac04fzdggq0pkaqp0y8f";
+"sffms.doc-2.0"="kqfjz0yn615f068v6349lgdp72gw2wkk";
+"sffms.source-2.0"="h5sazi91347l3qdkn6ghw6ywyp5ddryh";
+"sfmath-0.8"="mkmjhc5jg8ylbjdzx3yal2r3spxv3npz";
+"shadethm-2018"="6d2vr8xkis6ah0032nrbpbh3rs29xh2r";
+"shadethm.doc-2018"="ddw9pngafxfcx4cl0fh4dmnaqcfqnyfn";
+"shadow-2018"="xifs7y18wdkg1kj656swlvx7cpswmgma";
+"shadow.doc-2018"="ppc90h7d8qm8382lp2vzn5piy0mb7d4x";
+"shadowtext-0.3"="m2qsn137ij2l4lq4h0s5mpw1vvic0k4l";
+"shadowtext.doc-0.3"="894a2s4awyxc0vc7d94fp0dfahjq4021";
+"shapepar-2.2"="hps8xx8z0vviywd61vhkh8l758c0gndd";
+"shapepar.doc-2.2"="6i0vwmvrphkjrqphk7vmxphhcvj89f0n";
+"shdoc-2.1b"="grva4fsbp32pq2x7g4wb415y5cmf4cnx";
+"shdoc.doc-2.1b"="ba16nzmjm53zjq81w2zb6npd21wjfg31";
+"shdoc.source-2.1b"="mqn7081yqr3l1yhv3cxxrq6jwnd2h6sq";
+"shipunov-1.1"="1k15najivxdmqvb3a6lm4wky5mi31a2r";
+"shipunov.doc-1.1"="x0hc94hmncixvhicnja1kpd6y3gqg59w";
+"shorttoc-1.3"="win5ajcivg0ipf38dx85vhhmfjfl1scq";
+"shorttoc.doc-1.3"="9msyjwld245v4a3qvl87q9wxl33rdyg4";
+"shorttoc.source-1.3"="frmzabjdlmlg6n8ds6g45wcm1qackwxw";
+"show2e-1.0"="4gp9cvjx4s9zvsg6ygvpggy35f2qpgxk";
+"show2e.doc-1.0"="zbffqf6nvy9r3ghn718xz2w5piyjqvxy";
+"show2e.source-1.0"="ikfkd1bw7v2s1jv2lzcv5cpbxx72w0f1";
+"showcharinbox-0.1"="282ndmd5991sj7s7znbp3w6sfrl42dmy";
+"showcharinbox.doc-0.1"="xc0lm97nc2j5qs6qa45gh12g4866pdzh";
+"showcharinbox.source-0.1"="v0mn2l95n4mhmxglwrqzwcs9h31hb99j";
+"showdim-1.2"="8pk9x9rwpa46lxxxcrdrj8qvifs30x19";
+"showdim.doc-1.2"="g9zbjc1awcan45gik1czyz2ggnygzzpy";
+"showexpl-0.3o"="d6w2jrriv8w2vplqpgdi67wyl6wfaf7g";
+"showexpl.doc-0.3o"="v8jfqrzrsjxfvxw26qfw7ifj6n56q1cm";
+"showexpl.source-0.3o"="fir737kinjxq1w6igrsncks7bj2asxy6";
+"showhyphens-0.5c"="fcmfcmzkv9k6k2d6l2brhwwvffzz3bcd";
+"showhyphens.doc-0.5c"="451qz6c2k3mvnr488s138m8wmgsf1zvs";
+"showlabels-1.8"="qpsrz097whnqv7phnrpff1j4spc0ccrx";
+"showlabels.doc-1.8"="7pi69s9qfv69piak041lxa0vy3swg91b";
+"showlabels.source-1.8"="raf4jncf7q4i31g7pswqriafllv6rw3c";
+"sidecap-1.6f"="2fcmjz54dxmvynqhmyp5wjlim72rmd7h";
+"sidecap.doc-1.6f"="c4j5qlprbhhki237x3ribn1hhwjiznz5";
+"sidecap.source-1.6f"="22q6s65b782lb9pxqi5iplf6nmf5ni8y";
+"sidenotes-1.00"="28y9hy8h1sfpz19s2d8lxbp292fnlrxy";
+"sidenotes.doc-1.00"="5ikghxxbd0ap3lwr2gqnsia0916ygnj0";
+"sidenotes.source-1.00"="dq548cxifbq345z7ky4xi4nan76c57j7";
+"silence-1.5b"="nabq9i9ix7b42zkk5zq38bl47fhc46vi";
+"silence.doc-1.5b"="9rb3mgnavsarwar2i58s9fp4m13pckrs";
+"silence.source-1.5b"="i3siq83ph2lkjfrvc2zbmn5l2i5ssxkc";
+"simplecd-1.4"="i1cpvz6cd0jp6jw2r10s9qlyqig991h9";
+"simplecd.doc-1.4"="5q6wvnkcx16vpfpzngc194f107fjmbnv";
+"simplecd.source-1.4"="vwb34fhkimk2zsz5cqg8hslvqwsi53s7";
+"simplecv-1.6a"="yif1v302airw953py87hf8xw4vdvcrh1";
+"simplecv.doc-1.6a"="172h9r26s8zjpla2g0ah86z1r9k06cy7";
+"simplecv.source-1.6a"="rqyp3gq1k6mbbfmvxi437dxh50qrp7n2";
+"simpleinvoice-2018"="kib8y509s61mzcg5rzcc7s30ii39f88y";
+"simpleinvoice.doc-2018"="47f3zyl0g351p2xihryq6p21qrphi62i";
+"sitem-1.0"="vkdrrirvcya04rdwr05q5ah2r8qz68d9";
+"sitem.doc-1.0"="asga3xfkxjg1f7zc6jlnmra2bjaxw00k";
+"sitem.source-1.0"="9i52d6r144z0067v8skq23774dg8fk1c";
+"skb-0.52"="4abwsdqy977aj45v4frjhf5p4kqi08aa";
+"skb.doc-0.52"="hgwacvlqab84b3nv6rnmd79irl1ilzkn";
+"skb.source-0.52"="v3b3ggy38vp9z5b9n802dg0xi22yjpwz";
+"skdoc-1.5a"="1pn4wy7wgcfp5qywyh1b78ry18dydwzi";
+"skdoc.doc-1.5a"="n8syc29cmi7bn5j26apq918j617r9q62";
+"skdoc.source-1.5a"="z98rhl8d51cvwb8xydpixv11naz75gpm";
+"skeycommand-0.4"="w3sqnw1xyx8l1qb9h7j8jg8z3f6xsnvi";
+"skeycommand.doc-0.4"="y8kcbdpydw0an53vfw75nvs8f5rhp5f9";
+"skeyval-1.3"="r39dajvb7hh6437jbq3gly44i22im66z";
+"skeyval.doc-1.3"="g9gr3bwzslymzx3a5kja4n4s1n0ns5lm";
+"skrapport-0.12h"="i1vk1q4342k1vsxw251ky6gf7lmp8bcq";
+"skrapport.doc-0.12h"="r5rhlrl332zv18ssymapb95cfmlbgl2z";
+"skrapport.source-0.12h"="6dmc35ld656ikjiy38lm4w59yhb6f22q";
+"slantsc-2.11"="mnqakna7b6f0pygw4c66jmxy2r2srpyq";
+"slantsc.doc-2.11"="p4z9p7p33xchy1vqjqpiyw38is5irja2";
+"slantsc.source-2.11"="8c2vrhsrgfpqb47wxik1inq8xpa5r50g";
+"smalltableof-2018"="a0sx95bj2ampjw3b7g4p56ji7fqwmdiq";
+"smalltableof.doc-2018"="1qrbnkki1in5kv142d0qzl3rxmrclm69";
+"smartref-1.9"="7pvgdpjcdvdxbkb1ag4dal46c1hg4d53";
+"smartref.doc-1.9"="hj0c7i3climwjy64h98ddab5skczf3mh";
+"smartunits-1.2"="z3kj39xpdk8pa7bzqdjd6g6qlhwx2vhx";
+"smartunits.doc-1.2"="r72h43bvig293769q6s8glhdlrcg9836";
+"snapshot-1.14"="iysapgyh7p2y0knll3x6d1xqd15xh8hz";
+"snapshot.doc-1.14"="1ivfld35ix1qs6qdfrpkjxxgljzh1qz2";
+"snapshot.source-1.14"="nr79crz9xys513rdpv5ikd0dq18gmbsx";
+"snotez-0.3"="vwnz8rgz6lkw0dvpq1m8xygq1qwrgn62";
+"snotez.doc-0.3"="8gxvxc7x918mf5b63b7n3wvp99ix5ka8";
+"soul-2.4"="161jbj81y5m8rclwl6z8pwpbpc0axy56";
+"soul.doc-2.4"="lssr7w6ry8p02mzmwyx7a2zzss2vmbkb";
+"soul.source-2.4"="9w0g3y2pqkzsbg8jdr1vkmn4wlrx1b2i";
+"spark-otf-0.04"="ffinni2ipxnxx47dzwpd2flvqfibqzhk";
+"spark-otf.doc-0.04"="i4jmg2h3nj27y585znj2mmdfgj231hh3";
+"sparklines-1.7"="swn54z70rhmbk917dpl37mfr3sx21525";
+"sparklines.doc-1.7"="mjpd57symvhnv6jjzynalmpqy3l4szfa";
+"sphack-2018"="gdrva3zalq63d7j737247ja9a22abdxq";
+"sphack.doc-2018"="3rzyc3sxq2bnlx5pw5xz1kb2gb36brgy";
+"splitindex-1.2c"="72wrcsz1vmka4qal90la093asf12hs6j";
+"splitindex.doc-1.2c"="gf9j1mi46ih0xanr4lzl43gpfjpjws14";
+"splitindex.source-1.2c"="1y60d6s6ws70dgjhn239h4x8c77hjmdz";
+"spot-1.1"="bfwxb7c1lmbvy4g1q7k6syz7yk8wq0zl";
+"spot.doc-1.1"="68spn95gq3irq4rk4p0aw6z7kghriyw1";
+"spot.source-1.1"="hgsxqd8czj5vmy43g4mvvc3954vsmdi9";
+"spotcolor-1.2"="rz2zax5g35slfai6rqmnqslib7wsi14m";
+"spotcolor.doc-1.2"="yhcw8r48q7vi0iryn18d1z746ij1wpkp";
+"spreadtab-0.4d"="81i7rnrzj35f1y1i25m8z2zmknf61m5d";
+"spreadtab.doc-0.4d"="3xjp4amyd1lbj2j2vbq55gjl27f361im";
+"spverbatim-1.0"="cpn7cc2f4ila3xfq8yrr5456y2p5navw";
+"spverbatim.doc-1.0"="bnw2p20z8ga1zynk3v8khpgfgbjb5jpx";
+"spverbatim.source-1.0"="ivjx22khzgn0xgzbkb5y8q36i9wh3n49";
+"srbook-mem-2018"="30fmldc7ygh6c4a64z9cb5qcr1z400vs";
+"srbook-mem.doc-2018"="mfn2i8vs1h646gn5fcs3zh7lrn6gj2si";
+"srcltx-1.6"="pamgi7alvxixzd4dy68p502ifdlnz7fa";
+"srcltx.doc-1.6"="1lja1az3vfzxkf2d7pl4cyxbliqml0hc";
+"srcltx.source-1.6"="wk74304mhb77p653l52gmhc990ic0dfh";
+"sseq-2.01"="rypda83sq8zgcnd6fmip2nw85dpqkb2h";
+"sseq.doc-2.01"="2zw94ka78zap6914m7r3xc9slzjr0vig";
+"sseq.source-2.01"="1fw0mc1crac3fps3s62rskzhn946zffb";
+"sslides-2018"="5j8zx3q4f3cm4c78q4vn8cbvp33frz1q";
+"sslides.doc-2018"="xsh6d0caydlgs3kfc0zgw4m79j1vkrxs";
+"stack-1.00"="p32bbliciimyyfpizvi0cdrw7nzkmlx6";
+"stack.source-1.00"="x3hkdwa9hip4zp8paipd8yjjz10pysn6";
+"stackengine-4.01"="nivan4carz07sqpiymvlkjxswkqa9mjd";
+"stackengine.doc-4.01"="1xfhqhhl578sbpgp0s3d2nhddv85dlwl";
+"standalone-1.3a"="clgfqy3aqzn2pcalpfpmi70awz221pbl";
+"standalone.doc-1.3a"="q20i0dkgyfksm7npkiflphr7h2apzqc9";
+"standalone.source-1.3a"="lmqvfd3km9l0gbk05inz2ap09k5v8g0w";
+"stdclsdv-1.1a"="8dj2rvbpc7jbmn7bbxyvwpwmwpv9i1y7";
+"stdclsdv.doc-1.1a"="7rm7mkigckvag58agc7swy3yrg3jgpkg";
+"stdclsdv.source-1.1a"="3pkb3241arg1hl2gwh7ijr7wjy6naszs";
+"stdpage-0.6"="1vx4hlfyz6s89qxqk8kssq2z4j4bv7x4";
+"stdpage.doc-0.6"="qqh8y677jzbamylbm9jyx679sykp21ar";
+"stdpage.source-0.6"="asizav9m4vbfcrgl6c2qhnzsvl4ngmzv";
+"stealcaps-1.0"="8q97ghfyfnsmjp2jw2brp925hr82sprn";
+"stealcaps.doc-1.0"="3sdy3dqpi4axamhvshixk7hdqmspv446";
+"stealcaps.source-1.0"="xzysv6jy1bzcp1dww6imz9358id28lqf";
+"stex-2018"="rnkv33n0w6nhfz91qls1a7nb2xjc7i6w";
+"stex.doc-2018"="l7fpwhdxi3q4qgbsi3wb303hifwz96kl";
+"stex.source-2018"="vcvwm90hc222rm3b2z2iryfz869fzaf7";
+"storebox-1.3a"="kc1a9kwyd31s1376b16hidk21cz2q2zv";
+"storebox.doc-1.3a"="qhjcw6fzxlkzpgnk0ra7l6fqp10byiv6";
+"storebox.source-1.3a"="6zzmya7fcjajy73i8iys9584bldh18z2";
+"storecmd-0.0.2"="k2y4zjx31k7014wpb0kvg3ivm3ssp1kv";
+"storecmd.doc-0.0.2"="8iskfkck7dgqj3i0knwhzqfvhmv1pr74";
+"stringstrings-1.23"="3jyx0rjn2y5s3i7mdwgmbfygfqmph5v9";
+"stringstrings.doc-1.23"="iwlccyqlbypigdzw8dmpfif08wq8nv2g";
+"stringstrings.source-1.23"="lfm6lqdy2r3lazymqcca7padzmcvb0a6";
+"sttools-2.0"="hhzhgswnm5a26ivlaskdzmma472vsl11";
+"sttools.doc-2.0"="rdvrvdri5g9pb2pm6m95sibp73a73d9w";
+"sttools.source-2.0"="95j75a9qmcpqi8b8fm2hagdmw3fzcn50";
+"stubs-0.1.1"="5ia769ndpi4pcrbg6cljdbpxsx353qlj";
+"stubs.doc-0.1.1"="apc0wxqj03fhbab6nwwh5rvzc6i9la8y";
+"studenthandouts-1.0"="3gss3z8gv8fyyj3qygmwmbp1jxs7k7dn";
+"studenthandouts.doc-1.0"="qjih5qdi7861v2mafv4bga62i0lmss3z";
+"subdepth-0.1"="p59zl1bmd52xsf51l1qf4ij5j7qj9f8w";
+"subdepth.doc-0.1"="973874d1ri46l5ixgzrlqxf09lxbhq3x";
+"subdepth.source-0.1"="sdij1y3j4dy8y19pb4aw2azb48i5rssi";
+"subeqn-2.0b"="26vzla83zaqnkwf1llwly1jnmb9dvgnp";
+"subeqn.doc-2.0b"="121c3hsq5lnfx05k85kkgym9a6554ilx";
+"subeqn.source-2.0b"="17dmj6k881xy7cjmx62ranh04x1j946b";
+"subeqnarray-2.1c"="6gn9rmk6b4ssblawa0q1ghhc0pj3d75y";
+"subeqnarray.doc-2.1c"="jx8qb5fyfv0dvkrxiw3dvc2x3hq2ik7g";
+"subeqnarray.source-2.1c"="17950bjzifqhmq4nbm0b3p1dva50nwjs";
+"subfigmat-1.0"="gzki9wj6fvc1rlq1izvbcrmbqqr7w78h";
+"subfigmat.doc-1.0"="kmrf6v742z4wvbrvnjxkzh0kvqnw356y";
+"subfigure-2.1.5"="rnd1mc9gr078d2vna7vwnhv420mnndch";
+"subfigure.doc-2.1.5"="zpsn8d5b6h8s9cwbl4fd9iv6w7hypmc4";
+"subfigure.source-2.1.5"="10lv7vivb3hggcyv8hkygjhhly6ixxlf";
+"subfiles-1.2"="l6qiqpx5avdd2hvfair8kcl88kambnq9";
+"subfiles.doc-1.2"="18d3d5illkyarf90hhsbv62426gp32qh";
+"subfiles.source-1.2"="2pn71xj9k0493xdcgv2f88kw9hxvr09s";
+"subfloat-2.14"="l7d8iz54q7zfi5764jfl8v786wihisw3";
+"subfloat.doc-2.14"="rx97nj1mh981n89pby4prni2wfmqisj9";
+"subfloat.source-2.14"="3a8hj83wyvwrsfk0v6ibzmz4ahzvbkv7";
+"substitutefont-0.1.4"="rga587cq7pkf8b6w35pz76ifpb9h674i";
+"substitutefont.doc-0.1.4"="scmkff0sh6wypcq03sz2prsj7qx362ak";
+"substr-1.2"="qahdkj07s8nl7fnbqgwhsni6w8bn69ch";
+"substr.doc-1.2"="nvjl7r3a8r697gn8p3n81yaamr8jrfs5";
+"supertabular-4.1e"="51mc5fbbk13mmpya5n8lrx5yyk4k1167";
+"supertabular.doc-4.1e"="jmm0dxfps5p36r6ds1fpx00spx10rrv5";
+"supertabular.source-4.1e"="0wa3rcn787hn4707zbdm0jdfflp0dyf7";
+"svg-2.01"="xdrcpszl2qx5vlkbvvcv3l2cavaxq2v9";
+"svg.doc-2.01"="x1zpw768f53pvl5vwvacrd98j4kh9fc3";
+"svg.source-2.01"="2xfz37z6kjip4ypz6n0a7ghjma5chm6d";
+"svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2";
+"svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r";
+"svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic";
+"svn.doc-43"="94872fxawm8m49wk0maxvgxzhy000v90";
+"svn.source-43"="08x25isf3p3ixrmc3vy7bdq7kzx72v7k";
+"svn-multi-2.4d"="44fslkzz4ivgq4j3svwhyh1hy7vrzciw";
+"svn-multi.doc-2.4d"="8yayqnji00qcgjah49ffbvwhhdiy9b15";
+"svn-multi.source-2.4d"="4pacxngn9zj7p0hynj1nd3dync6cgaaf";
+"svninfo-0.7.4"="761kpr460h6nfczsf1vakdj9r947in1s";
+"svninfo.doc-0.7.4"="qlhr7rj98m7g55kgrms1jjw3wp3k7z4v";
+"svninfo.source-0.7.4"="xsf1rs0ar8ris0dh8qbslxwx5i0ci6ck";
+"syntax-2018"="1bvja2hjsw8p68202f84sbzcrs0f7d27";
+"syntax.doc-2018"="pkf7w0xwcnl7cm74z99bb32v4ycn4wmr";
+"syntrace-1.1"="02njfsdqh7ssnjcsnpmzi3iwxz2yfj9f";
+"syntrace.doc-1.1"="v5q7643l6spib4kf6mma67pl7xm8aaqc";
+"syntrace.source-1.1"="qqmfivdpilm8qp26v7kf3lcvfp582jv0";
+"synttree-1.4.2"="h94gmy3p4vdg2w1qffsdj02yc0zf04hr";
+"synttree.doc-1.4.2"="vcvl56r20md61vdwphvwncp0mn1105sw";
+"synttree.source-1.4.2"="wc8sjvp0fkvsw9ayybf68ka7c7pz7gj1";
+"tabfigures-1.1"="spwphj1m563rip8gq09fb97mz85yqwiw";
+"tabfigures.doc-1.1"="l68l551i2skm8yns6r2f1ji0kgxhx56a";
+"tabfigures.source-1.1"="6r4li6abzpgpv008xhy0x3lyywpy2w5d";
+"tableaux-2018"="b4zz5qhahr3kxwi68l2hh92w3v29gdry";
+"tableaux.doc-2018"="g4v3wbms4yw4wmzkm6v9aj3l46l4fcxy";
+"tablefootnote-1.1c"="axmzyplpbyfmhfx7jsijk3aaqcyc7c9k";
+"tablefootnote.doc-1.1c"="z65aphzdy953r1r3a5lzpvizmhs638g7";
+"tablefootnote.source-1.1c"="a1qbk028v26pld26654hsl3j3fc90js3";
+"tableof-1.4a"="p1z06zg544y0rkgbf32brizn4mlzwcc0";
+"tableof.doc-1.4a"="gcxvm0qp1wkr13l7770cdhb73za4dq67";
+"tableof.source-1.4a"="kxwaxxm6596mv3vpbzwav1kb7g6irvfl";
+"tablestyles-0.1"="91l6ysgskdcijj4zh756956i9s4cmlhp";
+"tablestyles.doc-0.1"="8j8dyc0fxj53xi6jq8vabn7hzrd8krsf";
+"tablestyles.source-0.1"="5kdg1v2s60j7cmrr0w0q2qv58jznkxk4";
+"tablists-0.0e"="5f0qad58xlf65y5204jsg3ajlrmgga3y";
+"tablists.doc-0.0e"="2p6b5b3b693cicbsid4zfr4lqvyiw0z0";
+"tablists.source-0.0e"="jwabyps9hwly3s2xx4l0vs3xwkhg0a33";
+"tabls-3.5"="gdkxv2mfqga5w7pmc8dszx9csma95imb";
+"tabls.doc-3.5"="dg078n18gai6glbgwh0p45560s4zjs4y";
+"tabstackengine-2.10"="df71gwvw34lf6xmarwwmpl897zyar75j";
+"tabstackengine.doc-2.10"="yi5yn8dj15sihk5hdwrjj8vmh3kgkgz1";
+"tabto-ltx-1.3"="cgxvfk7sdxxpczv7x1jw5460lwg7bak6";
+"tabto-ltx.doc-1.3"="irjpmicaxpxw947w4p3520g18cg27nmn";
+"tabu-2.8"="mpb7wm2l1apzi7hygr6v0nywm77z1k9b";
+"tabu.doc-2.8"="p8xmvd5mvpgi0a854v28r1l74fv9i8yj";
+"tabu.source-2.8"="dkrydr6mrp4xljvz9vy9bqz6z3ws469a";
+"tabularborder-1.0a"="cfbcq6f60xjzsdwdcxnf9alsgdwcgi25";
+"tabularborder.doc-1.0a"="wgd2b7s6bc3349rbhhafcg9iz3wwky33";
+"tabularborder.source-1.0a"="7dchkfap6l9ff49i0xwlpxd04yvh672a";
+"tabularcalc-0.2"="6yz4wvk7638prhnwiwc8bs6fm860ck9x";
+"tabularcalc.doc-0.2"="clkpjkck0zxy4mw71hmm1alysdxjbrl9";
+"tabularew-0.1"="jzndhmbh4fnsksf70wbn4cylp935csa5";
+"tabularew.doc-0.1"="m1jnxhfd882nzayknxwmxl8n535j3by5";
+"tabularew.source-0.1"="1438gnd88289q786gddq2i5jf1gbagxa";
+"tabulary-0.10"="4lnwhfr4bnawqgc5hvmp9m5gi6dmw679";
+"tabulary.doc-0.10"="439yc9m6b5na2i8kg8axqgx2pwhlv2aa";
+"tabulary.source-0.10"="x6a4q2rfm6z97ylwh2skqcpjlf7kap5s";
+"tagging-2018"="hai0v2rkgjvzxg7f35blqchqpvax05h4";
+"tagging.doc-2018"="nkfw3b02dgag42a8zan5dvlj0dlkzb0k";
+"tagpair-1.1"="cw696a7ccw159f38sa6av7f2cr2w5mcl";
+"tagpair.doc-1.1"="n06xlqq579by3hq5rwsmh0l6x1damdrs";
+"tagpdf-0.3"="nj64qvi9ai7pfbi5fzznsh0scvlgvj61";
+"tagpdf.doc-0.3"="jfnij0729j710xl7vjb7fxqmlw78brsx";
+"talk-1.1"="w3vffx02kp18gxkk2khsnhcpzhd6kvjq";
+"talk.doc-1.1"="1hcv41gh3rcxncfqv75w92a2hdnb55nq";
+"talk.source-1.1"="mvqbaz1vwya42g0idhhp948dxmb5z0q8";
+"tamefloats-0.42"="biipxghplzwd03drjpiisijhdzr4i04i";
+"tamefloats.doc-0.42"="mnmrchq7k8n04dx35r1plzxcw46hx4cj";
+"tasks-0.12"="a58wppbccpfxnmsc5g04qvpf0zyv06gk";
+"tasks.doc-0.12"="pqz2is810r3nypqn63w74xi8fg8vp2ap";
+"tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr";
+"tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40";
+"tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9";
+"tcolorbox-4.14"="jqdym9kcljxiaizdan1i8k9h0w6divm6";
+"tcolorbox.doc-4.14"="wsgmxc7j7vbvhafcxrxh1zhq34w0n035";
+"tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8";
+"tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg";
+"technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh";
+"technics.doc-1.0"="ljp1qfv5zl1mzgyg5cxb5bgsdm2bdbnl";
+"ted-1.06"="2rd9qzrp0i0yk9qzz4g2zsjafswd6m91";
+"ted.doc-1.06"="02zyzvjncgpgm4iy2nxkx209l8dhgkm2";
+"ted.source-1.06"="isk5yz52jxsdqq8vzcvr99xjcg5sy7pz";
+"templatetools-2018"="byxkf3ad6nbxsjvmqda6iv4qxwh9r66z";
+"templatetools.doc-2018"="yv7q44lxn02yn1fawm3rkcdia11hq99s";
+"templatetools.source-2018"="4cvfpn19a3cqhx9sx2jin35ycakq4wi8";
+"termcal-1.8"="brb1gf3h9zaa07s0ppbvgjiava0yh9k9";
+"termcal.doc-1.8"="3k8kgf7fy8b24n2jbx79a55awzs54far";
+"termcal.source-1.8"="k680hlhzp03wfxnxld82sgsnaggfw38g";
+"termlist-1.1"="150mm3428j9yxvl6jf2y6l66wcymnx1h";
+"termlist.doc-1.1"="b8kdav6vj2hxhfas9s69njvg61263qla";
+"termlist.source-1.1"="c3bvnl6srxclx3fwhrkn9kk1wb08g1p5";
+"testhyphens-0.7"="xn9idcggd15gxl0iaphmlafpwq8ywilj";
+"testhyphens.doc-0.7"="fpkvgpd63hz8zyra7l22rgb9cr4yiz3a";
+"testhyphens.source-0.7"="fg7vps18xgf21gknlbcdikxn1yswafx1";
+"testidx-1.1"="2xv4ikmbq3d7njx8bd658hfmbn3y98i9";
+"testidx.doc-1.1"="6xdn43y612rixkk7v6f44c47znvrp3d0";
+"testidx.source-1.1"="3pnn4igzpbkgc7n1zgiq67wm0yf4f7l9";
+"tex-label-2018"="wc2rqwp08adm869xmk7a6wkyzhfkbv6n";
+"tex-label.doc-2018"="lf9ff6q6n9rqng6akvbds9f1c6xiq5m4";
+"tex-label.source-2018"="vg5180hyadc0bl0hci4wzx90fvpxa2h9";
+"texlogos-1.3.1"="la6b3lzn1c4gw025npmz5xdm5rnq9n0c";
+"texmate-2"="0i38p40p8maw2v0lypaph7fad88dar56";
+"texmate.doc-2"="vaq40vr5526ic3fjdb2n1fr1q9s58wkv";
+"texmate.source-2"="ngmx2xsnp23cb9qg9n9vh9bl15jgyc3m";
+"texments-0.2.0"="sxnhbqflb88xcmnikjnp1g06zirwc5yz";
+"texments.doc-0.2.0"="lrf50hzpikrzd42q3ihrr1j7sv5prlzq";
+"texments.source-0.2.0"="hb7da3zhw9gs8kr50r6afq7jzs1ybqp3";
+"texpower-0.2"="i05qrli5978ydqd8hax9p81disb96n22";
+"texpower.doc-0.2"="qhdk9dhzlb9kb7ns98c6k5p105kdi4pb";
+"texpower.source-0.2"="4f9jhvif763mqkmkazzalwxilnvgw7mg";
+"texshade-1.25"="b1amaw79k0l8vk85pxkj9r0qzbhrl5kl";
+"texshade.doc-1.25"="b09yid08yxw3cc8bry9ka6w0rbsd8qi9";
+"texshade.source-1.25"="1bw37kwiqgj88qp5g6wd7ckgglf3x2wc";
+"textfit-5"="cik0z02pjb3a4xsbrfqjzva9m8cyab91";
+"textfit.doc-5"="qzr9w01bk6ia7hv5r21m2nbfz2hldc4q";
+"textfit.source-5"="g7ij0x5yghxq9jfr5vxq7vf5h8py3jx0";
+"textmerg-2.01"="k9zrf9l5a75pzf1c30fxx48kly07m2rj";
+"textmerg.doc-2.01"="bjgcbyn95fi8kpq91kkhhxbarw5dn526";
+"textmerg.source-2.01"="4kws4jyfmh7w7z258clr3dd4x7k98iqj";
+"textpos-1.8"="hfaks20dxsil769n9s0kw2qvsfgvxn5q";
+"textpos.doc-1.8"="rnzjn5x53vvdm3almzs2zyd31z112hzc";
+"textpos.source-1.8"="pxmp47fyy20ni0m5i9iinw20vjl07jlw";
+"textualicomma-1.1"="99h4pfsjnfy89xpwh4djj8fnhkwwxi3z";
+"textualicomma.doc-1.1"="10pyym40s0jszs7632hqxna94x3czwrm";
+"textualicomma.source-1.1"="14fqq28b54pw4b65kv1kwxif9fcr175p";
+"texvc-1.1"="x48959hg957jqqqf4ijb6wiifbrm71sj";
+"texvc.doc-1.1"="pxgl51bvjh0dq9mbs3p65v8giqz5p4zd";
+"texvc.source-1.1"="snic6z1hg65qvljsg4c5faqrjy7hk9qg";
+"theoremref-2018"="1md9iqkfgbhg6v64sgm94lp66x085rwr";
+"theoremref.doc-2018"="846wd88w325ganigw2g9rvhcs9is6ziv";
+"thinsp-0.2"="flil5f3fr9ghxa0bffvqy7wackrg7q27";
+"thinsp.doc-0.2"="pk93sirkywa7hmqggnapklyz0bqy04c2";
+"thmtools-66"="qy4wdqkznn7cg4jpvqi4mjbnqmb2258z";
+"thmtools.doc-66"="mksaav3wkw6z13hz1y0idzh5yzjp6kx1";
+"thmtools.source-66"="znn6rd3fxncja9cr8syivv89r14zpwpd";
+"threadcol-1.0"="jwbi62xbc0cmzv65spvx1i6dijg34w6n";
+"threadcol.doc-1.0"="j6v3gi6c2cnhs8z5pm0j1cwg7ayi4hxj";
+"threadcol.source-1.0"="0irgk3ajakrjf1bgbfd71qvpy35fklmb";
+"threeparttable-2018"="1fmr9sbssycx23ql343hvvk4k0n90bgj";
+"threeparttable.doc-2018"="4y119m8549dk5kv4sbhh614nijlv0vx5";
+"threeparttablex-0.3"="7slkq5cfxlah9ckr408l1wqxxc9x5hkh";
+"threeparttablex.doc-0.3"="46r8874q74dgja9ivs4i3wcg35lwlv0b";
+"thumb-1.0"="knz4ixhqam9i803vpaq6qmghx6n7h9hq";
+"thumb.doc-1.0"="mk0751c3mjb5fmw2yxjjk7az8d4ay6qh";
+"thumb.source-1.0"="nqdrk52fc7yrzqfk3bjxxrfyffxa3pjj";
+"thumbs-1.0q"="5ygdz2db68fdz929bqdj60yi8wnnb48k";
+"thumbs.doc-1.0q"="28cswirpmah87x2ll9bld2q95hyn9af1";
+"thumbs.source-1.0q"="pqgs9730gibbg66f9cspb9qlkqraic52";
+"thumby-0.1"="15knwd9cgdmai53kdckgwap67qz0fmn5";
+"thumby.doc-0.1"="6k49q0bwkajwd7wf5wkr0028a7c6p4h7";
+"ticket-0.4d"="skfs956s0lzbxac4ydds9ynam475zk1y";
+"ticket.doc-0.4d"="c6d6arnzv37pczxs39h99s1isldk36fi";
+"titlecaps-1.2"="lf0q66qrj3kw5hs90fbhr93dz7ik1gx8";
+"titlecaps.doc-1.2"="qb1mj8p7srqz37f77wqs1igfcpl8wsg8";
+"titlefoot-2018"="1ggjs95rzvlmznqb8s67f7f3cjid5ynb";
+"titlepic-1.2"="psapnhni7mhwd94s2qmki4hdlpbq3dbs";
+"titlepic.doc-1.2"="c363symm32mhjg8cxw9j4xsmyhdl58kg";
+"titleref-3.1"="1ai0w05ipy1dlxm0n78jzvpdgp42j19j";
+"titleref.doc-3.1"="6rgspvqn51kiw9gpp9bc59jxlyk654f6";
+"titlesec-2.10.2"="25z9zccw5pikdak7045kw5651iz82vb8";
+"titlesec.doc-2.10.2"="g8gx5alx5k8x4hf5vls0hg4w0jlg736r";
+"titling-2.1d"="hzs20qk476wwff6ammqfv863zc50qnib";
+"titling.doc-2.1d"="m84ffgjikqkxfa4x86g7gljhpq1snxva";
+"titling.source-2.1d"="kr5gx6mfggxyxyh0c2pv1y9fzhzw6dq7";
+"tocbibind-1.5k"="f5kf8lxqhg6hn7qjnxxmrwphi11ndgk6";
+"tocbibind.doc-1.5k"="v5vwh1sm8bzqky6lbabvk6j3gjp8bxx6";
+"tocbibind.source-1.5k"="xq2f0iby2zafyghn0a9pjbvv1hw6z6fb";
+"tocdata-0.12"="f8vsai2s3zp099254lq768j2dxrzciqi";
+"tocdata.doc-0.12"="726bz84j6ayvwjbrp7h1pwxf46b2p0j4";
+"tocdata.source-0.12"="36nc5nkl2jradqj6y7y6gsqfv1zmkfpl";
+"tocloft-2.3i"="yjmv81gig4vic5qsvg5mlnzgksspjgyj";
+"tocloft.doc-2.3i"="nh0fvc66rrd9ckyxv9gyackd180kikni";
+"tocloft.source-2.3i"="3mcnwnx824kls2j5ln3b80hcvdk8ch51";
+"tocvsec2-1.3a"="xwl43cb8m7y9vf9bbkc1lb198mh0yg9k";
+"tocvsec2.doc-1.3a"="pqvg5ky3w445h7i4hf1v1mcq5mpl3znm";
+"tocvsec2.source-1.3a"="8q0df51x5bbj1xphln6skb4cjdicfynm";
+"todo-2.142"="2ydakqj3py3dsviz4npq41s593blhag2";
+"todo.doc-2.142"="hs7ghig9yh4xhyr1y6n570vkiwmimv8r";
+"todo.source-2.142"="3gwsvfv1rhr1c6jb1xdgm9ycws6q8m2r";
+"todonotes-1.0.7"="bylbdvs1fyn9f8h9r8svkwv7lzzz4vzn";
+"todonotes.doc-1.0.7"="8g9wv3ymlvhyi4sb6j9za3cagjvpp5aq";
+"todonotes.source-1.0.7"="8wc3drbl53z2qy62df076jm5fqk8vbkd";
+"tokenizer-1.1.0"="k1ixh9ndc7r9cna3q86cccz4ibja32cs";
+"tokenizer.doc-1.1.0"="yvz9x41xdnf5449k2ixpbwrpgyhwpr5y";
+"toolbox-5.1"="czvh3swrgna1q4bf7dvbi6vqvaaja1z4";
+"toolbox.doc-5.1"="xl7w44azdaxsr34cz9fpy63pzfgz1pm6";
+"toolbox.source-5.1"="72cwzx2fbbqb0q7n8s2r8rwckfrfc8vj";
+"topfloat-2018"="a6wpasrna61fbpcb35m1gighj3xshfrp";
+"topfloat.doc-2018"="1gqq1kwkhj4s99vrqc3hys2pzr691k0d";
+"totcount-1.2"="mjp1wrksnwg89cj9si72fj1zjyrw9szn";
+"totcount.doc-1.2"="q1j4ja1xiqc4aahh7d02cnm8pvb356r6";
+"totcount.source-1.2"="g56d6lcx4g79iqg8af4nazv3lf3973ic";
+"totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f";
+"totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj";
+"totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj";
+"translations-1.7a"="lf9q67l2kyl24hbhr3ir66rq078dydrj";
+"translations.doc-1.7a"="adqaxzgjhsjn0hcryjgbib4f1n6yii0f";
+"trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa";
+"trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f";
+"trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8";
+"trimspaces-1.1"="cbpq1iybp4vqb3mrbi457gfrfiy4mx5r";
+"trimspaces.doc-1.1"="b2phanji8899yl7ihwrshdqixkmir62q";
+"trimspaces.source-1.1"="07ckjn7k7rwmvr2wji8y72rs9q3nwm0g";
+"trivfloat-1.3b"="vwnj2bh21crx1dkyhq36g4bxpiyjwany";
+"trivfloat.doc-1.3b"="dg12fam23s6510jskihm7hbwvf22p442";
+"trivfloat.source-1.3b"="dr1x8k6sx8rzfglz91clqwfyzl202sai";
+"trsym-1.0"="cxghw734kqq91crnbdrjx6dva71n13zq";
+"trsym.doc-1.0"="c9sygxys9bmz0j9a4w5lalhzggalayax";
+"trsym.source-1.0"="ybdjpd5m7l20jbzf3bxg302fh0r0g6sc";
+"truncate-3.6"="lxlfhy1bngnws701wa0c6zm10fi6b4d0";
+"truncate.doc-3.6"="1bgd0gxv4dhd4syr5cylb2gi2z4wcplv";
+"tucv-1.0"="74q08ki5qlbm4pvc5x9237sz648xy7b4";
+"tucv.doc-1.0"="vnqr21nhz99w92hwc2mjkr8618f1xk24";
+"tucv.source-1.0"="85rsysj0whl6f07njaxigyk14ij204gc";
+"turnthepage-1.3a"="kiaa5nrr0q0zdgbl22349ilfl23hlzvl";
+"turnthepage.doc-1.3a"="akqb1g5iyf9f7shvsm0v5wqzi43w8974";
+"twoinone-2018"="mg0zc3lsfzqfcj9w6qgqiynjkqki9h92";
+"twoinone.doc-2018"="8shpm77vq1ir8f18ix6ddz80jn0qg0ni";
+"twoup-1.3"="9zz59lr969ia2fr0kawfiibwfvjz8803";
+"twoup.doc-1.3"="scznf4yfaq02nd7yq3fkjxn2cnzhd0s8";
+"twoup.source-1.3"="rksz35jmn56sd5s5m3fmsp7a33rgk0c0";
+"txgreeks-1.0"="6g3vnp9prv91yjr054dshpgdl2f62w2x";
+"txgreeks.doc-1.0"="rvca7hs2rrssy46nd855knh10jkav8s0";
+"txgreeks.source-1.0"="aifnmmsvmda0vs6xvw2xrl3dyvr6sxkn";
+"type1cm-2018"="fnxv8a4anvnhl4a2hm1fx45hpdns24mh";
+"type1cm.doc-2018"="fly8yjqm52klwal3cpiw5c3c8pmy75n1";
+"type1cm.source-2018"="735jsqhiaa26wlbbwq764rl18s3j1s7v";
+"typed-checklist-1.4"="cpp5vq1jjm6j10cs8kd0pgm4zfjc9c6k";
+"typed-checklist.doc-1.4"="pl26829sbpz8dp1yj6rqac7hdzrkahw4";
+"typed-checklist.source-1.4"="jr53p2li6f3a00kfikz9fr20bphcr0ha";
+"typeface-0.1"="cfgy9wb6gcjvx6ki1paf42l8qwsh7glc";
+"typeface.doc-0.1"="60y2dvas00811spzl8bjwjzm6hz1plvj";
+"typeface.source-0.1"="v0i8v4sgr0df953cfp39d20shiyk69c5";
+"typoaid-0.4.7"="ab2akk0hicpkgis255a91bqzn67awvba";
+"typoaid.doc-0.4.7"="ab6c2n162jl25cmynkks5z0978ki0myn";
+"typogrid-0.21"="av412ig7qlf5bq7rdwvsg4ik5rsx94dm";
+"typogrid.doc-0.21"="assax9xx3pfnb27qal4q5g2wgxa87mwn";
+"typogrid.source-0.21"="nqrxi01vw8mia4pswp68yvj1rxnya86v";
+"uassign-1.01"="ik7140q4g30a15p6pk9lr09xzvpk9wr8";
+"uassign.doc-1.01"="774bv0pld1aswbmfddl40bxh55x2llk4";
+"ucs-2.2"="7czg37dhlnzl686gaf2fzl0khkl9cca8";
+"ucs.doc-2.2"="z3jxd58nlj0lkch4gc3jg4nwc2aqgzwr";
+"uebungsblatt-1.5.0"="9z0cwx5jfib1mfyq49bq2yl0yfacwg89";
+"uebungsblatt.doc-1.5.0"="vps5ya9a8z6hv7lynd0fwizwxdxyb52j";
+"umoline-2018"="2vm0z3pykwnz31pyxxpmgdl3bbpzxi0x";
+"umoline.doc-2018"="i3rs7g3iqdqnkhicadrnfr981fwkmw8x";
+"umoline.source-2018"="rsd9s0gqx20dvf6sk91gwzlsx4mq6299";
+"underlin-1.01"="vp1wvsy871d28x0z1rw4pgxw9abkr8yg";
+"underlin.doc-1.01"="8cbapdd7sbqfxs6s2fx6pv0d8x6b0sjs";
+"underlin.source-1.01"="52j0xlhajihpgw5mp5zgpnsaiqkyfr62";
+"underoverlap-0.0.1-r1"="k0if1va0b85k80mksnr14lrrgwbsjwf8";
+"underoverlap.doc-0.0.1-r1"="yb4cdch2c1n2hgcs552cjzpp2kiyk2r2";
+"undolabl-1.0l"="d93inn1bzkj056nz3syf6zplallmmjy5";
+"undolabl.doc-1.0l"="qjjvwf6sn52vcnsdqz8my9ahbvv6h26j";
+"undolabl.source-1.0l"="1cjwgz2bwq3rwmqq1q23jbk6dzzawfl1";
+"units-0.9b"="b92vh3z7cr8q1lp5cqzkiw2dhfbla7cg";
+"units.doc-0.9b"="3c1a9x0y99lb2qw8scb0x70jzbh5kjkl";
+"units.source-0.9b"="ha3bz0p0xanqznz0nyfsa02j32wjdl88";
+"unravel-0.2e"="2grn9q4d2v4gv7jq01zrlk5rl2prg3lr";
+"unravel.doc-0.2e"="mcskfncjhl5pmahkavaslxzv8d83509x";
+"unravel.source-0.2e"="p799v52n2fiqgzcbcivx763wdxcglvb7";
+"upmethodology-20171210"="a3rgddri984rakfas1ggrxggpii665xy";
+"upmethodology.doc-20171210"="jlvh2iyqj2h7yicgbxi8z8188xjzgfi9";
+"upquote-1.3"="3pr0j9wkyd8fzk026qk6vzsv5hlyccy7";
+"upquote.doc-1.3"="ilclzgj5m6nxhnz4398f5nwypf4jp2gh";
+"upquote.source-1.3"="4j1q8nck1g1cg4paz65l2zpvyimkf31r";
+"uri-1.0a"="dyczrci539yp7fqiim49hd5xv9pkg392";
+"uri.doc-1.0a"="f8hgfyi5wfi2r7fpxbx0h1lcycxax1x9";
+"uri.source-1.0a"="fvk9bbhxfnc4mjpvc84sdbk0r74i8dv9";
+"ushort-2.2"="p1yyh90qr3whijp18yjv9d6aqxp519k3";
+"ushort.doc-2.2"="p7n00vh408fnmq7j619v8dnj08fw5x18";
+"ushort.source-2.2"="jhn6sxdjyff94x69jhax021qfx39dca7";
+"uspace-0.04"="mc9j21cj64djdxspryc0knx00xm2krvm";
+"uspace.doc-0.04"="72420339xc9l7a1xaz1pdkn7clkdrm7w";
+"uwmslide-2018"="zf5gky1nzsjd1jp5kq843in2prllnk36";
+"uwmslide.doc-2018"="m67bshz8bpzw4vcsj1klgh8sz3mnbx8n";
+"variablelm-1.1.2"="gmqg9y7mmqmzl04n1zh8gfxzglhh4afx";
+"variablelm.doc-1.1.2"="d12x54ynkf2lq50m97p9s3wh2jr1y5jr";
+"varindex-2.3"="isp8j60q76fms3g4nlgf6d6da6f2y0xg";
+"varindex.doc-2.3"="k6f0ji2kbz2slr8cbsbyifb4j19wpx0s";
+"varindex.source-2.3"="g260r972d5dicmhzdch9kp77fxxakpqd";
+"varsfromjobname-1.0"="hy3mbsrrdd55ky6ilrmqfgc5dsx3kdl8";
+"varsfromjobname.doc-1.0"="inwn7n9dn0lym3nfh2szc3vfszhns7vn";
+"varwidth-0.92"="z2p07dqsj6pmdk6wm7snd0bih1s1q2dr";
+"varwidth.doc-0.92"="i4p58c787avqjqn5qqlcd19k8chxpp96";
+"vdmlisting-1.0"="8kkhifiignvk7ilb9ka1b0bssgc7vv1v";
+"vdmlisting.doc-1.0"="aqw59yhbm5sxfp4kmhy63npmlywh31dq";
+"verbasef-1.1"="i92bhi5drkn26s6lc8kwdm2z5f2qr0y0";
+"verbasef.doc-1.1"="qnn12d8793pgj92wfi0254n1kgi96r4x";
+"verbatimbox-3.13"="zb6kvwdpd9a4s4d7wcax8j6c43f3dy7d";
+"verbatimbox.doc-3.13"="sjns6967xicryfcpg4jhwfplsw1sl6nb";
+"verbatimcopy-0.06"="jf7rbdzhqlssq6nk5pnn79dr7a1gjxjh";
+"verbatimcopy.doc-0.06"="2rgg2n7mb1gywp8npzrz8qvc3kfw02f6";
+"verbdef-0.2"="pc0nq3s0vzl7jdw8ncp0fgbs7fps6257";
+"verbdef.doc-0.2"="dak1qyfi1gpb4j16nklvyjh7gldb4b2g";
+"verbments-1.2"="wvi7plkxcf920mdw7qrhbi2fjph1fxa4";
+"verbments.doc-1.2"="3zc8bfvz8a707jzh7zdbmb3rkxwfv2yq";
+"version-2.0"="q06mavcr844zm0dlnk2fm43np58nvjlj";
+"version.doc-2.0"="7hcfbpwhb2ifxy3y84g6rgw2f7465hgj";
+"versions-0.55"="c1vn4pw5im1a93xpp59i3xcf5az1n326";
+"versions.doc-0.55"="l4znzf6z7qwpskdsdnhsdx264a07wvmg";
+"versonotes-0.3"="v1lfi4z19w77a8ydn9sqh17q1mnjdc9g";
+"versonotes.doc-0.3"="8id9yn2rflg2h7r72ax0b7pbf7rqh8di";
+"versonotes.source-0.3"="68kgk661209cslywdrrc1mxampz5z3pl";
+"vertbars-1.0b"="ay3argjxpfngk3q24vfi0r440j053x27";
+"vertbars.doc-1.0b"="qy8zwncs17mv4k40wcraywknbl404sbv";
+"vertbars.source-1.0b"="k5q5j7adj06fgql28snszf44vc9pry46";
+"vgrid-0.1"="5qfb52ndm5lf20ya2w4vrhivn7p6vkaf";
+"vgrid.doc-0.1"="s0rr15ll7fy2s03va6kxlgf4ng0dmdrp";
+"vgrid.source-0.1"="2fql0w1qmni7dii9qdn976j6xnypj8yk";
+"vhistory-1.6.1"="mdp8h17cxsj1pvi8q18m4lqn7109q26p";
+"vhistory.doc-1.6.1"="dfvbnfvrfz2k6fgyqdlvh4g8dzz5lq1j";
+"vmargin-2.5"="9zh2l4idqdwpzanfd1z47g6561pfznh5";
+"vmargin.doc-2.5"="3ngc0z34mhrpsv73yw9bm065msqllqwz";
+"vmargin.source-2.5"="yj7f5bq4wlrbynfbcq19534wlh06g6hc";
+"volumes-1.0"="vid094d44cn1lwq7l72718pcz71l60b6";
+"volumes.doc-1.0"="3xgxlj53yay13gxbrx7l5i8rfxn6391p";
+"volumes.source-1.0"="r5ks99pb362xrxfvafl35s1v2n1kj36w";
+"vpe-0.2"="pzaqk160w9401v9vw3zs9kg2kjpmcynf";
+"vpe.doc-0.2"="yr38k5mpbpd8jxvcycvpj0zhl1f75lv1";
+"vruler-2.3"="bw7zccv90946wxjbms3hclxahpxkcpfp";
+"vruler.doc-2.3"="kffmrjhmahvd1pyk1ha5slz34y8g5j9d";
+"vwcol-0.2"="hff0d1za1i8jqaa5bd7r94g4zvsxrmcf";
+"vwcol.doc-0.2"="68p9iv66i4mx5l8s90ivl3w1pdmx9fim";
+"vwcol.source-0.2"="x7qa2d5f1hxxbiabgym4g1n1n0g92x1w";
+"wallcalendar-1.3.1"="9ydbcsxj9n0nmrkr4drlbqwarpsa3lsq";
+"wallcalendar.doc-1.3.1"="cpsswrvazx036hyj0b2mfakfhziplm70";
+"wallpaper-1.10"="hj7n1ajpapmwk51fnrhxawmgq6k9cxdv";
+"wallpaper.doc-1.10"="751a0gq1m6px853zvyvbxv8migdm1pkb";
+"warning-0.01"="a4agj71acw6kc20ikk8in8m27fcq7rld";
+"warning.doc-0.01"="pph8n9h9mqgh0qqcv3jb1v89ds8f1qf5";
+"warpcol-1.0c"="91kcbm5m59ym7kfjbhzdq20p9rhi7ci4";
+"warpcol.doc-1.0c"="q72m3zkgkm7fxfq1453jsmqidgacb2bh";
+"warpcol.source-1.0c"="lmr3rlbqz9q7j05glz4s8fyfrlm6ah43";
+"was-2018"="gw9043kq2ai4mkbcca20x5f10wnv8czz";
+"was.doc-2018"="y83pwhhkxlh92cr9b0hmps0izg2cjhmg";
+"was.source-2018"="cwqcmdh86sm58073zm929dxibw3flc02";
+"widetable-1.4"="1hbr1fdq4ssp796zm1j21lqqlv599jml";
+"widetable.doc-1.4"="5pxhchaigkbjblkp62p8i0kg27c2bhv7";
+"widetable.source-1.4"="3c54f8shs2ndrrqdxw6xp4bmy0isbv9g";
+"williams-2018"="9xzcvf4nblyp6vl0vhnwi6lbbmp4lagm";
+"williams.doc-2018"="0fr8h1zsj1h1cf3qpjvdkg3yz4fcjdsk";
+"withargs-0.2.0"="ahb75dczlyy8shzql034xqjq72ll0yvx";
+"withargs.doc-0.2.0"="6sr29bzbhwzcf77pjzhqb21fsp0541dj";
+"wordcount-1.7"="wn4d84kxf5phfn6f5imv91draca4wxap";
+"wordcount.doc-1.7"="hsddvb5521vmj65yns8f9d69nnwhh6iq";
+"wordlike-1.2b"="l4ma5j7ga4b3r6f627vf1vwcb872n3jr";
+"wordlike.doc-1.2b"="wywmq3nr85c130ag5vqi0hpcgq8vh2f6";
+"wordlike.source-1.2b"="3zrpdarw3brnc5w1c5bgvxj37qlpc9cd";
+"worksheet-1.1"="1ll03k444qn8zvji2h9xd75ywik46prm";
+"worksheet.doc-1.1"="dwab8sjshckkcm8vmrxr80rmrd31jih6";
+"wrapfig-3.6"="0r2wm95j00mxbiqgyk2d5vsb4l013zdw";
+"wrapfig.doc-3.6"="bb3z98p5kkhh2cw6qm0as75xv914l84d";
+"wtref-0.3.2"="427q1xixm8dz8wfh9z2bny6brs3s9i3j";
+"wtref.doc-0.3.2"="s02aiynd81ksydrfxlksamrdfkhhhfqn";
+"xargs-1.1"="s6g70azr1g9mg42k7lgii1ngmyjad657";
+"xargs.doc-1.1"="d8y9n347qlv5ybr4ahfqf51yb4g9wjzy";
+"xargs.source-1.1"="zvlns27k99jmi1iy7nyc03kyyy8kaycs";
+"xassoccnt-1.6a"="iz5rixsg7g9l3xqqrqi5wb764g0mmsxq";
+"xassoccnt.doc-1.6a"="1zm67xzzkrwmrfhxxs39lknpf266cz0s";
+"xbmks-2018"="3rzl0pi5vajgj80rlwj9s5hxx1lwfq6c";
+"xbmks.doc-2018"="nfcmv5k07kdhily4m4iivg3i3ln7d294";
+"xbmks.source-2018"="xswwxiw3ksa35mism6ib1mqpr8vrisl6";
+"xcntperchap-0.5"="qbrmbcwfdhy1as9i732naj5xnqd8zl7r";
+"xcntperchap.doc-0.5"="ql3z0qizhd2nxxjb5i4hhxvb43951rs1";
+"xcolor-material-0.1"="08zazp49lpmm92ang9i2q34kvx7v4rli";
+"xcolor-material.doc-0.1"="r646x6g0hwsi91hrxzz6b8l6nbbh3gig";
+"xcolor-material.source-0.1"="98z6j5l2iw9j1pyxmglm6b0gjdjyb2l8";
+"xcolor-solarized-0.4"="zwng9y8319hj7khamri46ppb0bcybpwz";
+"xcolor-solarized.doc-0.4"="c83zvv123bjwr6z10dgfih1k6b9wk4k8";
+"xcolor-solarized.source-0.4"="5p141gbzdasinppirw4wyb0mm9875bcw";
+"xcomment-1.3"="qnmk0vpj33sszbi3hfndscjwcmg1gf5h";
+"xcomment.doc-1.3"="m5a8wm984ff59mg0jsf4f402zbjqf0b8";
+"xdoc-prot2.5"="awz55rah1196cknc1qsy0dc8ra91dvjn";
+"xdoc.doc-prot2.5"="zx0nabzias47jm6270rmw9wqr117mb75";
+"xdoc.source-prot2.5"="51sid2ab4iwhybxhkwf5wwxflabqy4v9";
+"xellipsis-2.0"="x7m9da1658cxs5896bhn8cjdj0va03xr";
+"xellipsis.doc-2.0"="332vcqlqjbpm5hsqbcfq23avmmgjl837";
+"xellipsis.source-2.0"="3r007qgvxxcfvnd7942yafsznza0jdk0";
+"xfakebold-0.04"="a4b1sc00bjcmkhisfmg859r91gawnb2y";
+"xfakebold.doc-0.04"="72p0jj5pb2l4bxyyqnbqhxqalssly5vn";
+"xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms";
+"xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar";
+"xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm";
+"xhfill-1.01"="6c09h61nlwbviwc1vfvmr4jhbrw2fs24";
+"xhfill.doc-1.01"="cw2rx4v66138fsh1vwxhq9smyai1xlr4";
+"xint-1.3c"="7hzch735npj5kxy4yc52rsf0n8m3495b";
+"xint.doc-1.3c"="2gs629m7jssf9ni4w9kdcj3k4k5y1hfg";
+"xint.source-1.3c"="kshbia5k8npn6shllxiyp4bba7iag0ly";
+"xltabular-0.1a"="b64f89ir6j571yr2f1wwampirrqalx4h";
+"xltabular.doc-0.1a"="w40ywdh24ybnjqqcybxzjfbwpyrdy8cc";
+"xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6";
+"xmpincl.doc-2.2"="dczhfj7g5h3gf3vg7wncvccn1q3xavqp";
+"xmpincl.source-2.2"="0pfma5c8agil5jamikja0qh5fnyd9wn0";
+"xnewcommand-1.2"="gc7n5467awcrcwyals55mclkx2ighp3b";
+"xnewcommand.doc-1.2"="i6hx2x96hwjs712zzrp5h8l020b7j0yh";
+"xoptarg-1.0"="dpvgxh3j4vz7k25vbi1a6936pxsg901p";
+"xoptarg.doc-1.0"="hlx9h66iaychpvzkxnwldkffj7fdn45m";
+"xpatch-0.2"="8yzw0fgd1yk8cg1x5dljlywpzbijz485";
+"xpatch.doc-0.2"="zi1mwf1l3li8gghz99408f5v31jnfrm4";
+"xpatch.source-0.2"="wb88mjd06mbw0k8q0ha242zjyy6fr31l";
+"xpeek-0.2"="3dbw2vm05dirfvskchrmgdlv7l3n46nw";
+"xpeek.doc-0.2"="vr8bhx79vb9d4nb8ik4aa5xgiyr8sfp8";
+"xpeek.source-0.2"="cr6cxj638iwax50pkn60az0mawpx7m86";
+"xprintlen-1.0"="icyd4h8hs5yap04snj442adcw8kiknjm";
+"xprintlen.doc-1.0"="lrz20zfh7j4px543jqxy3ljm803mnlf0";
+"xpunctuate-1.0"="n3mxrha0440l5ngic93idrqw2agmisah";
+"xpunctuate.doc-1.0"="lrvqrndq151vfz34ycvjnh3sw77v58lz";
+"xpunctuate.source-1.0"="cmmzrijia2ir3mrhcq4s531la5kx18fj";
+"xsavebox-0.12"="fnpr8zjdih152bdb07a8cz2xmcs5y91s";
+"xsavebox.doc-0.12"="sc2ddzx46wndknv9rbr1nsjnxygsaz8i";
+"xsavebox.source-0.12"="b1bdhpkbgan1m393yfk87knqvbb57gkx";
+"xsim-0.11"="lqklbv5cd9ii4zi5a024cfczvhc2xasb";
+"xsim.doc-0.11"="9whj9hd6xpfmc8vqwynw40c6r1mm8ni9";
+"xstring-1.7c"="yykas5nwn259cnpaxjgijvv1z0s1xd25";
+"xstring.doc-1.7c"="xawlbcagd4a1sd0ndzm12d8h80fm5zy8";
+"xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm";
+"xtab.doc-2.3f"="pmhfig6nmfimb0didacw2sja2kc1nik7";
+"xtab.source-2.3f"="78m8pqm3r7jhxy1p5cvqy7p0clpzwi6q";
+"xurl-0.04"="3g8mp4rk47m5bawm8280w2a6xqmmij1i";
+"xurl.doc-0.04"="zwsx56vdzkizar9j7z470ysq7wcyz52a";
+"xwatermark-1.5.2d"="5c0z0yvlrs562482lkz70w6n7i80mkqi";
+"xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj";
+"xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf";
+"xytree.doc-1.5"="05af0l0bbcbr5gav843zs69p917cx3xy";
+"yafoot-2018"="nb46q5csnys171p4y07ifbp4il4g6qn7";
+"yafoot.doc-2018"="6866y5zf5dhvk90kw03s7xi0kdwrs10l";
+"yafoot.source-2018"="mm2a4gpd3llkfz3ifvi96jvz8xl82az7";
+"yagusylo-1.2"="rbhp05f6y6zw687pdw1mbjvaf99v7qy3";
+"yagusylo.doc-1.2"="av3jf7zqa6rprfip5lm173xj2f1rffb4";
+"yagusylo.source-1.2"="6z69ljv1xpv2cn81l63d8xrbwrk8am5m";
+"yaletter-1.1"="br7r3x3n8h5nlfy36csx8a5ji3cf12wl";
+"yaletter.doc-1.1"="x5mhsm4pxjc2klcnwqyrz10gbq4kzw0x";
+"yaletter.source-1.1"="c1la5n24hxfi3paxwxd8m7lxpd083k0h";
+"ycbook-2018"="62sm9jbqxgqdwwm4w39kh5lax93lycc4";
+"ycbook.doc-2018"="piy9cpdcikzknnrdp27dfrciidcjspzz";
+"ydoc-0.6alpha"="4di93jv5wpv4bdng1ibkf0ma6m0bknz9";
+"ydoc.doc-0.6alpha"="80hq2xznj76kgj0zb6zv6li578kc3r2i";
+"ydoc.source-0.6alpha"="39128wyw2py0j8f334r7drff849ad2sv";
+"yplan-2018"="rm8ln7pvl6i672107i8hxic85s994g6g";
+"yplan.doc-2018"="0h0wa59ackd645spdqk9vqy0gzzp8f8y";
+"zebra-goodies-0.3.0"="84j6fzsvhfqqs0i1jsi64ikdbkcn1x46";
+"zebra-goodies.doc-0.3.0"="sl3l8bcxiv1symmla5f32am1skd3ab9s";
+"zed-csp-2018"="ggjqzwn3zi9x8ziddkh7xizgw80qqlrv";
+"zed-csp.doc-2018"="5p8s701yk431qyngw010qws6b9shx588";
+"ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04";
+"ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm";
+"zwgetfdate-2018"="ibagqadgb3nbq8y72lzhrbamv5xcipk1";
+"zwgetfdate.doc-2018"="idw9limrda31c7h0xd3j6v23xqbd2nn3";
+"zwpagelayout-1.4d"="6wskn5h4bxigry3bjdf90ibdfrkinln3";
+"zwpagelayout.doc-1.4d"="rr3q6ypq18rkaa77ikr0j2sd80pp322j";
+"auto-pst-pdf-lua-0.02"="fwlxrxngsh628g4fyvih8w88jfsjihss";
+"auto-pst-pdf-lua.doc-0.02"="2gbzjzxb7x59bid9iqadfi2vv39a4y4r";
+"bezierplot-1.2"="80rg17wbwzpk44cyylz47ys038hf9al7";
+"bezierplot.doc-1.2"="f8500xn617n00p5mcjnq1821gs455nz7";
+"checkcites-2.0"="sl7bgm1kvqvl8q5ykbkxpin78pn6ivb3";
+"checkcites.doc-2.0"="5k7dlp98z1dr1vlir72f0r78vmaxl4ps";
+"chickenize-0.2.5"="bh3kdbw0yvz28izgmxxw3psmirwmfcd5";
+"chickenize.doc-0.2.5"="hqyyggfs1is65gfl4ck1mki9wgm6238v";
+"chickenize.source-0.2.5"="xhybj8jxyv1fghx7955dcgfcl9kjgbkw";
+"combofont-0.2"="3fkzcqjwxkciacvpvncnvzknf6mrrgh6";
+"combofont.doc-0.2"="c49bkqad9gw6lghaqkl4jp53501wfcgc";
+"cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp";
+"cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9";
+"ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh";
+"ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq";
+"ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy";
+"enigma-0.1"="1d9g45cwjgz5imk677zrza79fhwvz3cz";
+"enigma.doc-0.1"="57pmvf7xx9hp23jxaj4sfam0526y652q";
+"fontloader-luaotfload-1.0"="vg98ak3japxis0z4cawqch4ibpiz772d";
+"fontloader-luaotfload.doc-1.0"="116ayy7677jgdyxikhpi540c6hxapx8l";
+"interpreter-1.2"="pk1rbxzpaf3gida3dcshcgl5c12rgxzi";
+"interpreter.doc-1.2"="p249plg4a7qmq65rm84qfs5xvjwywnw4";
+"kanaparser-1.0"="klyk8bqv233cxpg18q10nyzkhql9pqiw";
+"kanaparser.doc-1.0"="kvcxqykqyjdvca2zcga0p6hxiv17vhhj";
+"lua-visual-debug-0.5"="a728vzfhwg0bq8jhnznyxl59gaf9dfwk";
+"lua-visual-debug.doc-0.5"="nsaxcsri49qpjj878k6l4yva2k5vf6m0";
+"lua2dox-0.2"="f8nhx5l1x2vqsrnh0amwa4nrf77b6zjl";
+"lua2dox.doc-0.2"="af422a39m2llgqkjghlhh9ix120jdrbi";
+"luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl";
+"luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f";
+"luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7";
+"luahyphenrules-1.0"="lpkklcbarmvfm4y9d5zgm9is55y66f56";
+"luahyphenrules.doc-1.0"="ch7vc8skad88crgb1blh85ig9sn97l3f";
+"luaindex-0.1b"="hlzsr82cp5vs41bvnp22f8jc3kkwyk4y";
+"luaindex.doc-0.1b"="k1nz25w1nrxbfcg8g9lrb4gm22i3m7ih";
+"luaindex.source-0.1b"="7pg6v1phdz96x5nmwsnf5bd976s2magv";
+"luainputenc-0.973"="a1q2xrryvsn271605s6ir0iymym4qjd7";
+"luainputenc.doc-0.973"="jyiy6f96v5nvrr4lp765vpvhrl96j67q";
+"luainputenc.source-0.973"="5v1n89k8wg4g43fnx0wz53gdxp7cvgji";
+"luaintro.doc-0.03"="gcz5ihcqinbpnqza158xsgw65h17lgi5";
+"lualatex-doc.doc-2018"="9vq4qxdsf4gfskrqpb45wj9m0jdkcykh";
+"lualatex-doc.source-2018"="jnrcirfvz7w28pcq3cvwb8g8khd3gzh2";
+"lualatex-math-1.7"="psliwjmyjf7rf1zxqfinpw6xjcijj906";
+"lualatex-math.doc-1.7"="i3a93gp6s6k1qlchh9wjlzxjnsfa8qm6";
+"lualatex-math.source-1.7"="bxf60i66c2dalirywzyq6qr9vw4gv8kd";
+"lualatex-truncate-1.1"="imd10qn2sh19fdz4zp8qz57rqs0kh2n9";
+"lualatex-truncate.doc-1.1"="xfanw53qhm8qhqg45ykvvf213j3q5dy9";
+"lualatex-truncate.source-1.1"="sv3j09xlab2gfqn670wd41xgdk3rjc84";
+"lualibs-2.5"="p975fbb74h2gbkwsqd2gqpmn7knklrry";
+"lualibs.doc-2.5"="jkfd05nmmm2p8bdqf1dz1kbsc77428c2";
+"lualibs.source-2.5"="bf55j3qmny5m91vm2fp7vqzx06kdf3q1";
+"luamplib-2.12.4"="4wfa5fj8kz956f0ch1nxpk5x2r5lc5ip";
+"luamplib.doc-2.12.4"="5wsls71g593lwig6xvhwazlp79bn5bja";
+"luamplib.source-2.12.4"="8a3djckji66ybaw1nd8xh3pa2c644aj5";
+"luaotfload-2.8-fix-2"="sp53ks2p5pbppdsanrgi0zdz4jdm1197";
+"luaotfload.doc-2.8-fix-2"="wddhqq6ks7bviwfjdnjykcifx4n9j49m";
+"luaotfload.source-2.8-fix-2"="hx4zfc8xwya9qvg69jgl2dv2ab31sjy2";
+"luapackageloader-0.1"="rc85q0c3lyjd3c4mhjjbqlcywycwxcgj";
+"luapackageloader.doc-0.1"="dkccp3n7nwkwv9scga2xa1aqqplsird6";
+"luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4";
+"luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0";
+"luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp";
+"luatexko-1.21"="0ks8dachil9iyiy6qyagb5abn2v2nj5v";
+"luatexko.doc-1.21"="mc6zg284ss0lficj7yjvz2jxx2zy5sqb";
+"luatextra-1.0.1"="xb3dbgfnm7ww87n60ydpilkwqczj77lz";
+"luatextra.doc-1.0.1"="4pfnnxaynvw166pp1ivb5pjp061n2bvi";
+"luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd";
+"luavlna-0.1b"="nk9smk0wqrq7m82mxlw5jyxdihkz665v";
+"luavlna.doc-0.1b"="qaridqid784hcvlskps2fgaza3a5mpa2";
+"luaxml-0.1e"="qp4pyb274fmmg93x2zm55628pdlsq435";
+"luaxml.doc-0.1e"="jh48hc7i6nd4w5gwnhsjkpxbpcy5v6wa";
+"nodetree-1.2"="7x6x6xjd3aqhvz1nchhxckfhzjllfr21";
+"nodetree.doc-1.2"="jnpfcdpwafza66wmlvgv4jkmisfc9k46";
+"nodetree.source-1.2"="877wmvyrnhma4v3qdlq4r1pbk1bldlv0";
+"odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl";
+"odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp";
+"placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy";
+"placeat.doc-0.1d1"="x954mm7qhyffqbh9hrgrxa5khh5h70p3";
+"placeat.source-0.1d1"="l19sqs0ipd1pgpl6kzggfizxvc1cb1p3";
+"plantuml-0.2.3"="mp83hmniy24qygdfbqyf4jf53pjrby00";
+"plantuml.doc-0.2.3"="pv659c4yw6gbkrzw7az73lpc28ni3788";
+"selnolig-0.302"="gw2nwscxyg2p83bs90nnbg47wddkh0i1";
+"selnolig.doc-0.302"="d73jxs6xck7m5y95hx6nfls1572za6qh";
+"spelling-0.41"="kajpixvypcfl8ivqqnscfcd1fb1vv78x";
+"spelling.doc-0.41"="r0sqb4qz4n2w8n0092qik847f3dziq0a";
+"typewriter-1.1"="4xbzb4igw0cd0p9ry0xxii4p8gj7y8w3";
+"typewriter.doc-1.1"="vk3rzpx4vpgs5mwq8hmys9m0vv6gmmdj";
+"12many-0.3"="kzixh8p9qmbz0hxczir6pixx8k6zc1an";
+"12many.doc-0.3"="v5qw194xha1w7mr6x3zcwp9a0gpi4w4n";
+"12many.source-0.3"="wqc3q5hqwg09g0sz7l5va9xazvmqbbrv";
+"SIstyle-2.3a"="35jza92m3n8nhfnqxpi4yx5xi90hf5mb";
+"SIstyle.doc-2.3a"="7y6y0ks7aa4yvqcw4jzh7rrrajm5lyfz";
+"SIstyle.source-2.3a"="i5kmfn2pan7a6bvl7saij0wbfq7xsx8g";
+"SIunits-1.36"="jpghwsag31g9f2lnzdzmfg1rg1vjxihs";
+"SIunits.doc-1.36"="1qalyh0q4lvlxxmwykaq3bp3sw76sscg";
+"SIunits.source-1.36"="6v2lr8gjm3f2kyqh7pc06ay5iswbi7p2";
+"alg-2018"="2z4gi58401dsjwivwji0b169ihz3assx";
+"alg.doc-2018"="43bcrdwkqnx6rharxz9l106cxycm408z";
+"alg.source-2018"="yq6bvw0bwwqq8c367ml9p9cbimqhkr1v";
+"algobox-1.2a"="ykmx4b4yz0vbbzw5pkabkq23da5ab2nj";
+"algobox.doc-1.2a"="slrgkjc160aasdqly9n72inxxs20p7dw";
+"algobox.source-1.2a"="1jk7jr14qb3sx1vffwazmvdhmnxswpjv";
+"algorithm2e-5.2"="w36nldd3zkmg3v74jzg22kwkw0vhja5b";
+"algorithm2e.doc-5.2"="b2g0vk8jb1yqqi9fnkvxizpdhlaqjn04";
+"algorithmicx-2018"="8hvwf9c6b51yc623g8ivxqzwd10c1j7s";
+"algorithmicx.doc-2018"="1xcga5bk7fgqq2dad5mzv2v2x0m6hqrd";
+"algorithms-0.1"="s07h59vabig8jdk2d7r98hdnxpyq52sm";
+"algorithms.doc-0.1"="vwq0lnznxpwi4zpp4hjaljdfc3c2h6yw";
+"algorithms.source-0.1"="cskf3mpv2rk435przyidljaijx46fiy9";
+"aligned-overset-0.1.0"="ghkj6baw3sppp8vi9msny8ffaf3f0mb9";
+"aligned-overset.doc-0.1.0"="falszy2yd14yzy1gzscp7d3arsb02pv1";
+"aligned-overset.source-0.1.0"="gcapvfxcx8s1qgzcf8f52l4w0dd33b5q";
+"amstex-2.2"="lpqwc8f3c8iv9691yxqs6r00dkjp9mh2";
+"amstex.doc-2.2"="08khpv61x80mirar56yk9s09r52czwby";
+"apxproof-1.1.0"="4vdvkbj6c043vnzv695h5nydkalf3vsr";
+"apxproof.doc-1.1.0"="45x785q9y81qdyzc2dwikbb6l89ac92p";
+"apxproof.source-1.1.0"="7drjz0jfcck52zml7kqkw440a3gmvzyk";
+"autobreak-0.3"="61yyi2p6gf0sjydn5kr8h8qvpxgmvbin";
+"autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv";
+"autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la";
+"axodraw2-2.1.1"="pyy2pdw8k4kmfr93qg4sjpddgf6xpzs9";
+"axodraw2.doc-2.1.1"="npxs78ipbkmw5xzw2l477swkqr064fiq";
+"axodraw2.source-2.1.1"="hzq1vjkrrkna23lq9gpxfc6dhpj359ds";
+"backnaur-1.1"="f74p150lbyc7bpvfg0cksv6g3and4qm2";
+"backnaur.doc-1.1"="4kd67srbm2bxwrjj3rdd8k56g108bj5p";
+"backnaur.source-1.1"="25zm2sxfdijfvbbcckim8glqfgidrc60";
+"begriff-1.6"="w5mcpc6qsm8np9n4lzqbq642frp73szn";
+"begriff.doc-1.6"="wwsqgp4ah07a8z28l8ji33mvj0w16l3g";
+"binomexp-1.0"="5jlh0g22c7b1i94n2qicn0j6k4zmami9";
+"binomexp.doc-1.0"="vh653aqsqkvcsmrvzhw1h4sqvirxg3yv";
+"binomexp.source-1.0"="jairxsdavf3ll4160dlbc39hriyyyrdr";
+"biocon-2018"="d5164k5f9rh092j3yd5vysfzcp6qbvc7";
+"biocon.doc-2018"="w3c6g9qr6s5pm76jq7v0fk4fs90p5d20";
+"bitpattern-2018"="s1gn3l5lfz24xgg768032s318gzx96zy";
+"bitpattern.doc-2018"="8nq9nd4qsrixnnw32saxp6272d26w040";
+"bitpattern.source-2018"="1xa4jib8aihzccs6lrijw5x0cvhlrkcl";
+"bohr-1.0"="5r65jri672mlqzhd26dmys54sj19c8kz";
+"bohr.doc-1.0"="8gsrm5xrxfqqgpljlyizlcdz4lw3xk9h";
+"boldtensors-2018"="ivpsy3mgqghbw4qv325j9rc6nwwmh9ya";
+"boldtensors.doc-2018"="nbg1ilwbjn61g6g93bnqhfm5xgrgqzgk";
+"bosisio-2018"="dinsh8vlzgch7mvajkqmikbpgmzryqld";
+"bosisio.doc-2018"="asd7h31zda58mwykhc4jfp5nwv21y7b2";
+"bosisio.source-2018"="m2y96hhgypgcsli8v19w6jn7y39d23vy";
+"bpchem-1.1"="c1qr5s3jp7zg06sis026ll5b38axvni2";
+"bpchem.doc-1.1"="54qyy00y03jbbhg00az5as1bc5h9i2fr";
+"bpchem.source-1.1"="r4bya1mqkjjnmzc14jlbv676ls312ynl";
+"bropd-1.2"="zhrvx29z8y1gs88y8lx7wvi0dlhamkmq";
+"bropd.doc-1.2"="1k5254jbhikwqrx5wv61qmznkhp41mqw";
+"bropd.source-1.2"="8hny5cxa57186p4brdriyp3hrmmqr9ww";
+"bytefield-2.4"="whxn5qk2z4pia4hpafbzggp6q6zai2c0";
+"bytefield.doc-2.4"="ixgwy7pi37anjp4nmm765hc6hh484gxz";
+"bytefield.source-2.4"="mmnbxv3g3c6i858xs5dazi1nkfvrxsjs";
+"calculation-1.0"="sss6l897zlki1lidr2s5vp60rv1jfm0f";
+"calculation.doc-1.0"="zwcix1a11s0s1hh7ccy28gbdxylz1n3k";
+"calculation.source-1.0"="asdip95ln7gna99vk7hjiq8n1hfcqg1x";
+"cascade-1.01"="8jvsrpg9rf2471bymqmkgf7gwlzdh18p";
+"cascade.doc-1.01"="cnc5din98sb97037mdjy4i6zsjgwh1gi";
+"cascade.source-1.01"="f0v9m4xm3lj2pmjz7b7a1whgmksl94sm";
+"ccfonts-1.1"="11ghrz5bz02nw40srb3ih2v3r6pmsvq5";
+"ccfonts.doc-1.1"="vz7iqli9bwplwd20xvpdkpswc7r5zvlc";
+"ccfonts.source-1.1"="iylfqg59y0yadrzjb1xcb6nbw7rkjfr0";
+"chemarrow-0.9"="mb0i68z92909632g3xd1m3ahvmg0nj72";
+"chemarrow.doc-0.9"="h7g7ldb9837ngsxbmxm2c902bk0k2wdg";
+"chemarrow.source-0.9"="05g345ir5pvd4wik23yykarizwp0l506";
+"chemcompounds-2018"="7m2snwdxnachamq617zap92fsgdqhay3";
+"chemcompounds.doc-2018"="imzf21bm33j290wmy96hx88ahf5zgbff";
+"chemcompounds.source-2018"="nwcxbn1ivdiswdqyr319y93l76527amj";
+"chemcono-1.3"="kppxwgnwc7f62n7bwi2gnb6zndxv4bag";
+"chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp";
+"chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck";
+"chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1";
+"chemformula-4.15e"="pikmiqhp7658vggw4pdpip304s00jlf2";
+"chemformula.doc-4.15e"="vfw8hi8y9ysbp0ssaqiiphnlgyrjz5l5";
+"chemgreek-1.1"="6yfyrii5xkc1nz5bniqn134rqa2cdv6a";
+"chemgreek.doc-1.1"="x15bq2wwjyplpwpbj8hpz21zhzwjwryk";
+"chemmacros-5.8b"="8993jvwy5blsph2dckvh7g8y6154m33q";
+"chemmacros.doc-5.8b"="hqc6pskqgwdg9c9m83dapqgzz3nbfc05";
+"chemnum-1.2"="nk857am82h2zfh8f5l81sm3xrrg0vawm";
+"chemnum.doc-1.2"="awwrxj67jwai17nvgpgl2lx10n8wm741";
+"chemschemex-1.2"="w3v5w049p0g28v8wx70ah804wp3map2v";
+"chemschemex.doc-1.2"="gg19d9gs2fc97f7rh9vs586v6i744a6n";
+"chemschemex.source-1.2"="czw2fh4251yhq1i703zf1nnkd0pjr74x";
+"chemsec-1.12a"="ikf1jvrivixpi5cf51pgryxrlnyh79p6";
+"chemsec.doc-1.12a"="9z5r91ghrdvaq6rsiyccs4g2a484kms5";
+"chemsec.source-1.12a"="m92vrndcyyj3sz7rag3jg6zwjl47jvh0";
+"chemstyle-2.0m"="lzbqwhh58y559q5lbxnbbz21rfxp1rcn";
+"chemstyle.doc-2.0m"="zv454b37y12fspkcphm6qs0yy7x7768s";
+"chemstyle.source-2.0m"="v52wrccz5gh3pswpfilm4qs48bplws5s";
+"clrscode-1.7"="6w0y1xknbskhhahx05688943y4pqr22s";
+"clrscode.doc-1.7"="m1syqr9a0x2546s5qpslia4ic5zmf961";
+"clrscode3e-2018"="0fz3frh68k47pdn3way6fbpiagyillgk";
+"clrscode3e.doc-2018"="91b116aqyihwlizzw1apmvd8kaaia407";
+"commath-0.3"="qgkl9s5w0dadgirg3aqg0si0zm8swxss";
+"commath.doc-0.3"="ririan3s31h8cwcamjlwglbj4fyvc8b9";
+"complexity-0.81a"="id7q2in24z1r6mi47jdh98r7d9gkxdxh";
+"complexity.doc-0.81a"="jppdvfvs5wy2vbkzvizzirgrhf9k6sy5";
+"computational-complexity-2.25f"="hs6ja0ghmdhvkm2m5zk4bsyhr0z0z8b0";
+"computational-complexity.doc-2.25f"="nr5kmmq6nd2ppdyy3pygb2fj6ilz9gfr";
+"computational-complexity.source-2.25f"="br0rz33ycmvpsn5fdhvcjlpffhssnw08";
+"concmath-2018"="7qqfg14ka9d6j0ccb3bswg0jhzg8gvjv";
+"concmath.doc-2018"="rw4q8bbj0jyv9fs9vvxv9iksi39mrjm3";
+"concmath.source-2018"="h0akd4lxynf1anylxfv0dibvpkkgb0f0";
+"concrete-2018"="8076kds0h67rl93yygsicgp8hpk6cfz0";
+"concrete.doc-2018"="xddpal4gfl1km582kqvn79q925mixskv";
+"conteq-0.1.1"="r5vmidbf2afm771ijgph43qc66safd3r";
+"conteq.doc-0.1.1"="6ki2nz31r0b86kd2p9w9a5ph8g5dnj8f";
+"conteq.source-0.1.1"="6sd4m9i6zv68gr0b8r80r477qcj6cbpx";
+"correctmathalign-1.1"="vip10w09k4kq9a67pfp73r64mk75095h";
+"correctmathalign.doc-1.1"="51qjv6v507ahi1jhxd9sp406bd93vkdz";
+"cryptocode-0.1"="a8n95hv90vi0bx2azmdxlvhvq5jx3384";
+"cryptocode.doc-0.1"="fz2j47nnxvzn5hymz7r66cq43pw859dv";
+"delim-1.0"="q2f4p0f8bg1nwim31i272i5rpnjibxks";
+"delim.doc-1.0"="5k874svcycyk4y5qalbs4h0x4zkviwc4";
+"delim.source-1.0"="bglajqs1gdzhpjayh5d4afw7h09wln22";
+"delimseasy-2.0"="nv8vysx58m3cgljms4fzrbpqms5wsb7h";
+"delimseasy.doc-2.0"="jgsz6apzs5flbf717bmfgc9p07mfn16p";
+"delimset-1.01"="bwx9gxy4wzabzfc8q0jgvzrv08hdi0r2";
+"delimset.doc-1.01"="gnh6j224qfdbcgvzd65l9z73h404pp63";
+"delimset.source-1.01"="5yj18w2qwcg6smdij3dsk08zwc8g5lvv";
+"diffcoeff-1.0"="pz1h8lxq1j5js0gcgl27aghy5kz59mbg";
+"diffcoeff.doc-1.0"="nfp3a4dv00fp6xcgvc735zlsg792p5l4";
+"digiconfigs-0.5"="r2ph2xkdaslj50qk54n7a1xx37n8pq19";
+"digiconfigs.doc-0.5"="vignfzc0zrhrx0jgybwmfcgyfcgaqhim";
+"dijkstra-0.11"="25p95xl60c29w1b8z1ggvys4fs3szv9q";
+"dijkstra.doc-0.11"="xn84bb3zgv8jk4slwrr314680l5xybmb";
+"drawmatrix-1.5.0"="pl0mscrd3i4h9m8zq947ajh45apms3fj";
+"drawmatrix.doc-1.5.0"="qxljjk2vh5cc7l9xxn6kicknw2csdk4p";
+"drawmatrix.source-1.5.0"="89lglkdc257iwip9aiwnshzqwhvcqz5b";
+"drawstack-2018"="kdcvc0kd9lm3zxd2zszwriab31p26wrv";
+"drawstack.doc-2018"="plmy162h6z23pzimj4i5wjpih0m21z3p";
+"dyntree-1.0"="820wp3d1dcdm5vxihmk93wqc8qw4rqf4";
+"dyntree.doc-1.0"="j334vdgmzrhlv3x0ihzpa9j2rbbd9xhz";
+"dyntree.source-1.0"="ha5c29s0f6j3r5f3b2v7v7bgxaks28b2";
+"ebproof-2.0"="5ic2h08ff6km04b5j7ya8grg66q00a9j";
+"ebproof.doc-2.0"="3hc5hiis4cssjh2l5a89df29yhjg3h69";
+"econometrics-1.0"="4b5wmgy2zn8mflr9zdfhyc0pcw707h9j";
+"econometrics.doc-1.0"="5rm8ml9qmmq9nnyx9b5x7cfm54qdmqpz";
+"eltex-2.0"="n3kq7kl8i0b1k89i94i4k30qcy31lhfz";
+"eltex.doc-2.0"="pnvsk55d11vh82nn0a77lskyma1mqmpw";
+"emf-1"="l7l1rzphl87qvgldxpdal5pjvlxx834f";
+"emf.doc-1"="sbp51vc20b7m91r43ck9f4czblqa6gfy";
+"endiagram-0.1d"="lvncrih9fmmsd6571dklnq2vzh7jdxv5";
+"endiagram.doc-0.1d"="7nqf9zgjslck0853xy6r6i938k9pd76z";
+"engtlc-3.2"="dc257zhqmzl7yymbv9prpiam1mvznhnm";
+"engtlc.doc-3.2"="d6mmmsi3kr2dlz2g6iwynabjlw1jyp46";
+"eqnarray-1.3"="iprdk3kp9cbmi01r29rmnjrfzifhiw5m";
+"eqnarray.doc-1.3"="v7l4q95sjrh3kd92xgbqazd7dgq8kaq4";
+"eqnarray.source-1.3"="bwkjz77mw47z33bwbgsx81wbw9i4n2n5";
+"eqnnumwarn-1.0"="vz6kiciv5zhrh16ddisfrik5y9g2qr8h";
+"eqnnumwarn.doc-1.0"="py5m5187p7i643k6wgsm7zyznh6awp4s";
+"extarrows-1.0b"="6fa3hrvqa3qf7wqahhb7k168sz6pzmqd";
+"extarrows.doc-1.0b"="dxnpkgk5iirpmzhznidklfk0xy1y5l3v";
+"extpfeil-0.4"="0yaa2siwn8yvcsd1xy6q3shswdzfzq8j";
+"extpfeil.doc-0.4"="1c0q3h8z0vfy05gmgvi5gbk628xw2pwm";
+"extpfeil.source-0.4"="fly5cib65ppxgrbgq1h8vcxx7m6340bb";
+"faktor-0.1b"="bjbmkxvqgl81pnq0v7hm0a1ija9vwgyi";
+"faktor.doc-0.1b"="mf571k3a23bdizhirzmkr1xwvm5y3fxw";
+"faktor.source-0.1b"="l1lqrdj9dr1waq7dymzij0m1vvhzvw7b";
+"fnspe-1.2a"="firv6p5c69ljcf2bw8bqpjd6jjsgy8fq";
+"fnspe.doc-1.2a"="kq29lk89jw7wi84h5dgwvpi5vwqj69c2";
+"fouridx-2.00"="lxj3924da4bfn7605g2akgd3ccynizqc";
+"fouridx.doc-2.00"="ic4hkzvwc05qm91h90cx645gpskcm8f4";
+"fouridx.source-2.00"="zgb2xfg0wl5ld4b5v8rn72mxmfy3qy38";
+"functan-2018"="68wga1s4yiamylxfjma76hirgk867yym";
+"functan.doc-2018"="h6jwmv7wp2a8whhi34r62xvi1qll0vb7";
+"functan.source-2018"="rk42vz9n59n31xx5my1ahlnxmagzap7a";
+"galois-1.5"="b8khw120ihwg30l5wiyrpigb0n76j4pg";
+"galois.doc-1.5"="pl6jyfxfim7igp5lhhsdghiz6awrsf42";
+"galois.source-1.5"="pf7dxm40jcipslw88sqascls74wnvhyn";
+"gastex-2.8"="7ncqqh3yaip7f6fpv1cs57wlsw4krkzk";
+"gastex.doc-2.8"="y3ybpis1prha863r0486c1wr24wfy0y8";
+"gene-logic-1.4"="w7b16bvypbh9l3kiwbgha3dyh4dlqpq4";
+"gene-logic.doc-1.4"="nzraabszgvj8b0j503f7h892grbqjjrp";
+"ghsystem-4.8"="1ka9bn3qfxa1cq1f486n4gn596315gd2";
+"ghsystem.doc-4.8"="75554yiry6a6riz7m9mwpbzq801a0bl4";
+"gotoh-1.1"="lmsc2xb42i0w7ysmq1b7v69798xz6061";
+"gotoh.doc-1.1"="2nh9cbc9jvlwxlg3rhayjx63xyjcq0c9";
+"gotoh.source-1.1"="mbdzb4047z6wzr4gam5dfs5199hq02c6";
+"grundgesetze-1.02"="cd0rxykb2favdbw1f945aalhy0shxcih";
+"grundgesetze.doc-1.02"="7h4rhzzj2jak20jrgv9nnjri35iiyvdb";
+"grundgesetze.source-1.02"="dqxmkagx54l3zhsqm2iixizzqmcwqabv";
+"gu-2018"="4m173j1ac2aiji1xjpxccd5bnasv68hd";
+"gu.doc-2018"="vkm8qnzqcdqh4xv4axh9sfy65bx2jji2";
+"hep-1.0"="f70qsf585a6rw0lzizd5ps7lcv2qqsl9";
+"hep.doc-1.0"="aqaxn42inmw854cm1qps4fkcijc11fm8";
+"hepnames-2.0"="3f4dycnxwd41da8gh67gs89xcb3l7zl7";
+"hepnames.doc-2.0"="99jvklmwjkmrlmr9jfgdax0j9ikr7b60";
+"hepparticles-2.0"="m5541j0ip82ygflxc174k8xzr2kx4fh1";
+"hepparticles.doc-2.0"="34viq0myldrs90f8y0dflrjxhimnzkq7";
+"hepthesis-1.5.2"="2r81h1qwl4g5gh8xbmkqycmxcsaralmd";
+"hepthesis.doc-1.5.2"="l6il72x8l8c3jj81yjaci4fbbi080aj9";
+"hepunits-1.1.1"="a3yzdj6ykcd4522cknwng48wbig08kg0";
+"hepunits.doc-1.1.1"="x8d9hwb5z12ng0ndny3b9vgja741bg9z";
+"includernw-0.1.0"="wdc8hhcr4fciy57k7sg28rkli26ybbq7";
+"includernw.doc-0.1.0"="xl68qyik71z5mhzvv2wzh8k6shk4mzbd";
+"interval-0.3"="kvyvv28dqv49nxdspbhayc8bbvigs6n3";
+"interval.doc-0.3"="iq5iw643gmd90xmzq9mkmkzf4ws2yxqn";
+"ionumbers-0.3.3"="rcar5imwp2v1vbkx3vxbq4zika5q8psm";
+"ionumbers.doc-0.3.3"="gsy4yhir7i0gwr0v1x46csqfyxa845r8";
+"ionumbers.source-0.3.3"="vd55vb8qai0kfy0mijzwzgdr52sa5a6v";
+"isomath-0.6.1"="s9cgjw007kx4vcz5f8b51hbiqjmi68w7";
+"isomath.doc-0.6.1"="nhpi08b738hs457jqv7139b44z35xy5j";
+"jkmath-0.1"="l4nykjpkg2p19fdvy4a6h32ik4hcimdq";
+"jkmath.doc-0.1"="79bfybh585f88gcyc82b3ds7nx92jng6";
+"karnaugh-2018"="8s95y2qxd4i5g5q1x0a7h8iwsci6dls2";
+"karnaugh.doc-2018"="85z4avy6yfziaqd7b4w077ys394a3y4z";
+"karnaugh-map-1.1"="mryi5vdfqia142b35n97pwzvh267y6bh";
+"karnaugh-map.doc-1.1"="3zmcy9jclc8q01d3jz642w6j96ksrpx7";
+"karnaugh-map.source-1.1"="8zpvpcrxb35311nynqsxdpz4iqjai964";
+"karnaughmap-2.0"="52mx0flzri3z9y5fc1rgg665z2rpk01n";
+"karnaughmap.doc-2.0"="8m2xi7580kgrxq9v5dkcfcxhn757i7zm";
+"karnaughmap.source-2.0"="47f879r3821kwn8pwpyhh5874adx6f3i";
+"logicproof-2018"="24sbq01252ij7ldzb8achg4m73fakhas";
+"logicproof.doc-2018"="ldn1c2fdmnikc8fzklp5vzwkx73d91jc";
+"logicproof.source-2018"="745pxgmypzv7a1vf8gjm6r28khxk0s3k";
+"longdivision-1.0"="12d362pdsx3kjb0rbkv1qhnh0gkpp3xz";
+"longdivision.doc-1.0"="qlha7k5qp6rwhcz4c97kv0zighjy2jrl";
+"lpform-2018"="ga25ijvkw3cvzkag08jj7w8pv8d8mdj2";
+"lpform.doc-2018"="2pq3d2fni3nc4paaijygb6k5plky9wx5";
+"lplfitch-0.9"="wxiv9ihwv4jdmr4ij0kvggbbnhbkh19c";
+"lplfitch.doc-0.9"="lzz01n3w8zq7p9bn7lpb6rp6zkgmmxjs";
+"lplfitch.source-0.9"="4lxhwsf7366gs7dkq9qk4pyphjv13ya7";
+"lstbayes-2018"="7lfk7lrqr07my6v1qqni2rz39j5wwgpm";
+"lstbayes.doc-2018"="y00fm320wqy608v16idmzc27n8z4q4p0";
+"lstbayes.source-2018"="kzi9c2z11zpwb4lgy87vwyi0qjlmbyr3";
+"mathcomp-0.1f"="rjxadz6409wc6g4ffb2jw40rw52rpwml";
+"mathcomp.doc-0.1f"="098xybrmriwyh7dl5vsxxxy4v7nf4bdj";
+"mathcomp.source-0.1f"="m3y8gisljqfy405d7cffqkda0mlz8rkc";
+"mathfixs-1.0"="c6qmc8pdbwqw3gd789pb82bkswr06raa";
+"mathfixs.doc-1.0"="isic58c4jwf69j8mfamb5c3xib9yhnrj";
+"mathfixs.source-1.0"="d5kr28d3x9zfblhv0fgg4gp8hasl57bh";
+"mathpartir-1.3.2"="ka1crqmcwlidnxb6n91dlfnf16hir45r";
+"mathpartir.doc-1.3.2"="0qn7ym4gl6m9g7vvx0mjnwyq2fjvy9cj";
+"mathpartir.source-1.3.2"="vx38w09k1cfrprj4yr0vy1gkwkssw6yw";
+"mathpunctspace-1.1"="b3cksmp6rs8rf09qvab3fxs525mf9gbh";
+"mathpunctspace.doc-1.1"="9bnslk1yyrab13x6sn6sklkmlpd5q417";
+"matlab-prettifier-0.3"="j5p21f3rgbx8hyf7rdjbpn845mw8fgih";
+"matlab-prettifier.doc-0.3"="zssm3k92kxa3mjja3r4sq2574f7byspr";
+"matlab-prettifier.source-0.3"="nkp80iyfa519dkk8gh7pk7fxbj4yn1lj";
+"mattens-1.3"="v9rf7qmiardpzq3zzqzz0p3qnh4lp1ck";
+"mattens.doc-1.3"="dnnzxlvc6vrfy4rrm4vw5w0g85fr886d";
+"mattens.source-1.3"="dw4c26cwsg1hz3wvldlyi8q4f60h3szk";
+"mgltex-4.2"="99vi0f32fla2hmsabmf0d2d3c93kay29";
+"mgltex.doc-4.2"="m4m59xlcjgnd6pbsjsa36da37b61ydlx";
+"mgltex.source-4.2"="k3yw9bfjgkqha34712n3mplxsaqg6j79";
+"mhchem-2018"="1jdqxhaq185m8lpk48mkdmd5yf0msw43";
+"mhchem.doc-2018"="4pw8z3lcy6wgx0lmyb9wwi46zhby3hng";
+"mhequ-1.7"="a6dc7zsnfim8vbrwy8jzbhqhphwzh29j";
+"mhequ.doc-1.7"="im348hlavjvbkg67akz24kcx6hxa8w2h";
+"miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb";
+"miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51";
+"miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3";
+"multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz";
+"multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731";
+"multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6";
+"mychemistry-1.99b"="8swklvjnvwzm43kg3q8ydiczfl8l75xy";
+"mychemistry.doc-1.99b"="immlivqi6jjsf5g4mkkr1nls63hb5nqm";
+"natded-0.1"="q4nx9b58zsmfmpap3h2qs8pr28vap5v0";
+"natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk";
+"nath-2018"="7x3cdih5q3i8dg25h6737vaphmrdxvbp";
+"nath.doc-2018"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg";
+"nicematrix-2.1"="21dcdnij50r2pi5ffh60kznaq0gz39m9";
+"nicematrix.doc-2.1"="cxl1pgqn1ns6mwr5gyqn7gvm3ixqbs3v";
+"nicematrix.source-2.1"="6hg0cmhdfb9wryr3k0j6zwnz3ccc6blp";
+"nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma";
+"nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30";
+"nucleardata-1.1"="b76hnd5fpl3f1hfh8pwgrsnqkadqi2zn";
+"nucleardata.doc-1.1"="vm4jq8b5fs0jx5k2vb8pii7dk548r4vs";
+"nucleardata.source-1.1"="0zzzwn1vrb841l2264mz4cip65va3lha";
+"objectz-2018"="jxzqzh7y1nihr8m7jrsnbw7jh187031h";
+"objectz.doc-2018"="d8rk9nql7l67xn6hyvwg4x3xxkpb407i";
+"objectz.source-2018"="62cr53ff66gqjf6y2i01gr70bblhn18z";
+"oplotsymbl-1.4"="xzbszdakjgy7svbksd8w1csc7akwbg8p";
+"oplotsymbl.doc-1.4"="g6zpsvgp1kar3i9rmig6g7y60a5mmk0g";
+"ot-tableau-2018"="mdvqwhal8vq8bqxqi73p4fyc6qpaskkn";
+"ot-tableau.doc-2018"="gcfni2sp25f6qswns4bfl585gfi36vy8";
+"oubraces-2018"="sm7cbapl8cv51d41dgc46gjckv3icx3z";
+"oubraces.doc-2018"="yfvkv4vgc6ycvsd2sixyph039nm4gzvl";
+"perfectcut-2.2"="6hp6k3kq4y44ky1n7xvxp9zs41v0154i";
+"perfectcut.doc-2.2"="ijp8qchgj2vj0ivcvjhi11ckv1iqxq02";
+"physics-1.3"="y7b93d3qrc6674j33cy58v5c6fhlg3dy";
+"physics.doc-1.3"="ksf5jd2gfrq4dj2p1x2iwpgik5vb4pl6";
+"pm-isomath-1.0.04"="a768qpbak06xs38g804s8rr4lc9ad4kq";
+"pm-isomath.doc-1.0.04"="3ahd6gy58lc04pirlz20fvyhpd5qw4nd";
+"pm-isomath.source-1.0.04"="d2mkfbifgmjm56i9vbrhwkvhyn2pj6bm";
+"polexpr-0.5.1"="b1zjaq7k1iggp3djvc7i3mg351r842zh";
+"polexpr.doc-0.5.1"="nn2d1i7r5dshbbywfrks9a62gxrgnb4v";
+"prftree-1.5"="90ydfx91y6rdn1sl1i4sxhf0z3gigm5m";
+"prftree.doc-1.5"="ssg7xvni36l7c69mcvf1ly55zxid9c1s";
+"proba-2018"="k6j2r5kacbcl25i7zwb71a2mlyn17dap";
+"proba.doc-2018"="a30lrji3wrd9rb8aa7hzflch7cwlybdq";
+"proba.source-2018"="7grfmfi6hwyqzhi0aynjq9cl65yqh5id";
+"prooftrees-0.6"="f2p9ln64cc1wqimqa47w3hzgpdw054xr";
+"prooftrees.doc-0.6"="0g5fbbd7fh9inwmgq3c6cbk8ws4y19bw";
+"pseudocode-2018"="bmn68g4pm7wga21yf97mrnmwc588gn6h";
+"pseudocode.doc-2018"="1hm6d3af5zjrpvx9h5ihd6qqyg2384xl";
+"pythonhighlight-2018"="wyvy6ms2blns0nffsf2lzjs4gwivgh97";
+"pythonhighlight.doc-2018"="9g7wy34pzzhdwsaa4rvn41iblnynvxz4";
+"rec-thy-2.4.1"="10idyaix5fd6zgmvvabxk6w8b77sylgs";
+"rec-thy.doc-2.4.1"="bdp2i8ghy42wj7jvb7q996y0p8xs6adh";
+"revquantum-0.11"="ciws2fb27v2jkmvacgxx5f5rjypxwhxj";
+"revquantum.doc-0.11"="3yx0fd96b5sxmf0950wy2yfswfn5k5j2";
+"revquantum.source-0.11"="a3lxg56ihykvv3wy0az60hbd3n721grf";
+"ribbonproofs-1.0"="7r52zy2n48hichyvyxnhvzcn10v6bm3l";
+"ribbonproofs.doc-1.0"="15wcmvid4xbflmy4lv1njbnvbz5svk41";
+"rmathbr-1.0.3"="fv88qckj67imsc8a7v0y9pgzqdlzcbmz";
+"rmathbr.doc-1.0.3"="giw002mrgbyjbm5mfsxy2aan7mgiqmv6";
+"rmathbr.source-1.0.3"="iq3id8a5cyskh3adf20nxwfwjxbb32ib";
+"sasnrdisplay-0.95"="9yvwv7a6iw8a7g58w0zlgmfaz2zy8nxj";
+"sasnrdisplay.doc-0.95"="0dc8ai8f6b0dn05ljdlnx2dykbhil5xh";
+"sciposter-1.18"="mi8zk7ik6q8rvncwp5m0ch6mfysil8fh";
+"sciposter.doc-1.18"="wan5jxr0084sid3zv4cdhr5kmdv1rjh6";
+"sclang-prettifier-0.1"="594wn96i6q9wgshyqmy7211c2x4j1fih";
+"sclang-prettifier.doc-0.1"="zy33dy1dq1lh9zzqvxh3zwqv53yw2xn6";
+"sclang-prettifier.source-0.1"="0k4nc1bkrw4l66wr47pd6dgigdgs5i0s";
+"scratchx-1.1"="fwylqfph2bpwqd8rl4jq8hi682cd1cw0";
+"scratchx.doc-1.1"="w1x4cg20frqfs889sk91xd5j822ja27x";
+"sesamanuel-0.6"="zivl33hp7zrzz0996fs4822xsbd5pb0g";
+"sesamanuel.doc-0.6"="h4dlbjwcrjk13lnvqxxjmm94pk083zv4";
+"sesamanuel.source-0.6"="fjp5657m4v2qzf4bxzrms7v42ghl861m";
+"sfg-0.91"="5j8965gkq0p9s9ryvy8ym22qz206igqh";
+"sfg.doc-0.91"="ydamww1x4qxpg5bsrcacmfwkkv9c876p";
+"shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a";
+"shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld";
+"shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm";
+"simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3";
+"simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z";
+"simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67";
+"simplewick.doc-1.2a"="kxfipc2w97479is7sdd9fmahrbwfk2l7";
+"simplewick.source-1.2a"="48db2ywp9dg6nd5xbclw2w85id3mf97r";
+"siunitx-2.7s"="s7wn6sk9mzgk192avn2vsv7hhqjsplj9";
+"siunitx.doc-2.7s"="84gfibh266cf463b0xzwaigfb0v7gl78";
+"siunitx.source-2.7s"="311lawimcw2jfn4nl26mx10brxid96j9";
+"skmath-0.4b"="5ci5mzndbip008nmsjbcc5fq692mf9y1";
+"skmath.doc-0.4b"="gach5kwqg8k1khf43jbdbiybdz0fvnka";
+"skmath.source-0.4b"="ch2aknzr0lr1zav15zss8sv7j99afsf4";
+"spalign-2018"="if8r1d1xwq1as1147m3ixkxgyni8yb9q";
+"spalign.doc-2018"="s49kpxsa940l85yc6wzmb71i789874qw";
+"spalign.source-2018"="ahwv44vd19kn8vzbx7ya6275ysnp3q25";
+"stanli-3.0"="6ws3b75qs69jhag24aki76ndgryb9f9s";
+"stanli.doc-3.0"="iygalq6h7fdik4cfjyv5i62mid9gdr1k";
+"statex-1.6"="h8y1sw298ilqajy8vmi00yl9wpklf5fa";
+"statex.doc-1.6"="ksf4vra9673l5ycl8np7l55rxpj1xazg";
+"statex2-2.1"="a7h5agdmh5xw1646faxxwd1n1ajci53h";
+"statex2.doc-2.1"="cpiw77bl9p7y9vd6dwg4lnlk2n8lmmcj";
+"statistics-2.0"="384198ff1qvjya61wj6lgc28s39wwc5y";
+"statistics.doc-2.0"="id2796f8rd5li616p354hbn7l96r2dj1";
+"statistics.source-2.0"="z8i5axapmf586qndlpl83bdwc7l5zfcv";
+"statistik-0.03"="2kynwfkkx5b782l4znp1f3vml1lwiihh";
+"statistik.doc-0.03"="m8749zwgm8vz29d24idrsimd6dizdjlf";
+"statistik.source-0.03"="bjfb31dxs4jylym9qc03rp9qjvmm6dn6";
+"statmath-0.1"="464gz51kwvfyy8fp1l69khkgdnbfvl5p";
+"statmath.doc-0.1"="6kdz4g7w763fc6zs1g4xqjvbxlvi4sv0";
+"statmath.source-0.1"="71y6fd8bid5zymcsc8c8j9ik2jyrbpki";
+"steinmetz-1.0"="v8vskhmyjdhc7yi21b9i11j4lfzmhypm";
+"steinmetz.doc-1.0"="5y0xh86b75lm16kjjl4cjs7vvylr6wn3";
+"steinmetz.source-1.0"="m31y5wd20vck85yj3zps711zi6bpcdym";
+"structmech.doc-1.0"="76ngar60cl37ya107zrp1cgbim7zsxgp";
+"struktex-2.3c-0-g7d3fc5b"="22jc8j377rqradvm23ymvmxnsxwnrwqb";
+"struktex.doc-2.3c-0-g7d3fc5b"="bs9vx2xk7yd88v4h22r0v0i7b2cb06ri";
+"struktex.source-2.3c-0-g7d3fc5b"="r4nqs4y6gspbx1yizl4pmarb672x96ph";
+"substances-0.2a"="wwjn0lkspnwgla7j46j2iwlvdrsvdyzs";
+"substances.doc-0.2a"="apg59a7fh980vddnfzjspsyq1jfnvsn7";
+"subsupscripts-1.0"="1nyf4q1szg0q649jmqlzd5p8j9h1fjkh";
+"subsupscripts.doc-1.0"="9yhhgbj7i83v21flfr3gkr35vkdxpx6m";
+"susy-2018"="xiv8s7m8lahyc17qdp7vhdnriqcz2gzl";
+"susy.doc-2018"="51apv9rzw9q1aa390a7p6w0d4y5amkms";
+"syllogism-1.2"="gx6hjs32rq3d1sk28cs8ng8m2i1xwgrf";
+"syllogism.doc-1.2"="m6nv4hcwmh5qa7m411vwm8c6s1xbdbx4";
+"sympytexpackage-0.3"="x7b456c7l5nkwaf19g29rpc4m6qz27h2";
+"sympytexpackage.doc-0.3"="klh09byy7h38j068d9qrgyhawcfjknji";
+"sympytexpackage.source-0.3"="lzsz5ly9rnzph5nxnaqbf9nf5abm302c";
+"synproof-1.0"="bv32jflr6n3jdm93xxpbvhz1lrhc3i9v";
+"synproof.doc-1.0"="i74i5km7n20hglq2icb62xcc2pl1fawc";
+"t-angles-2018"="an3w3nw07gc6hyzfjk4bd0j4swj8qr4p";
+"t-angles.doc-2018"="68ylwxvywabhyfqzlb7d642cmhdj3g2j";
+"tablor-4.07-g"="fs9vl9gi63j8bqgiv06dbhbgs2vl1c8r";
+"tablor.doc-4.07-g"="k3d87x83igkq78j1yvav6b08y818qgz9";
+"tensor-2.1"="4gzhhxr2w1bbwb0yf799siazn5d6538j";
+"tensor.doc-2.1"="j4hxlj9f804ffrdp8pf06mj79yb8j6qy";
+"tensor.source-2.1"="89fmh96xlj21pm07c80q9cgiaj2a3c3r";
+"tex-ewd-2018"="725h0x4azacxb6pi7bnrvb5gb2b6rb8l";
+"tex-ewd.doc-2018"="npk74dnjx7jy9392pz0m4fzxcxqqsqq5";
+"textgreek-0.7"="m1b05a740x322la70k6ib44sk6cky167";
+"textgreek.doc-0.7"="vah190cds1677yv86nfcyriccln296yd";
+"textgreek.source-0.7"="cqc5zj4ck54rayydvml5m3n4hfnykglx";
+"textopo-1.5"="rvcbhsz8win1g08s6az11ji6ryd9b1fl";
+"textopo.doc-1.5"="3f9w8nbyyjismgdxb5daijc88hfp8m8k";
+"textopo.source-1.5"="4h2x01rkf91dha2yxqpdfgv5qsmz34sx";
+"thmbox-2018"="5b8zyq68dw8c7cylg28k9bmx261k8d5p";
+"thmbox.doc-2018"="rpd99zkmrb85kgldsyi2iwr70q9n8y35";
+"thmbox.source-2018"="hnjviz4vyw78mg6lbcdyv88qajhjdh6w";
+"turnstile-1.0"="c4nm39zwakha4bk75092371db2n0nx4m";
+"turnstile.doc-1.0"="w2hv466gzdsc7vp0al5xk7bwa83szvr2";
+"turnstile.source-1.0"="8p5g2w1pcaxhg2a54rq2h23zd7cbj60h";
+"ulqda-1.1"="llh5ji3r34m637hzb9qi4z0d6hap8fcy";
+"ulqda.doc-1.1"="w5anmbpapkg5r1bi0gvh1wqrqjivgmz1";
+"ulqda.source-1.1"="pl71x58ifcpllalxfw1snj2r464qvx3w";
+"unitsdef-0.2"="j5dhzwnaizymvvj0cvvn8hcjgpiaw3xj";
+"unitsdef.doc-0.2"="m3n8c9wpk9m0il8yn3ip4kwvlbyzfndw";
+"unitsdef.source-0.2"="rpwd7p723jsqcmcl28kkfg3fg9dmyfxa";
+"venn-2018"="vxgbc1jmchjsq3aq1wklgla50p1smqnz";
+"venn.doc-2018"="3z1kgbyilhajm6przv2a1rbdl55fzhqj";
+"witharrows-1.9"="kka7znq0638qzr9fvz17pfznb9qm0mkn";
+"witharrows.doc-1.9"="iaimvnyz1lq91hcayszxmbg6ki3xqsa7";
+"witharrows.source-1.9"="l2yxp0shlcf99qdh3rrcc7bs92jh5n6w";
+"xymtex-5.06"="lh5pr87m1xhyaj74pmwc8vx3an7gppxw";
+"xymtex.doc-5.06"="bbknma6166kqvxhj3523p85lq7qn1ydc";
+"xymtex.source-5.06"="is60w9mjif26y9s3vv8c0v26z16m97g3";
+"yhmath-1.3"="6ykyclj35fd23c7nnqxr8x5a6dzpdya7";
+"yhmath.doc-1.3"="8hyf8qcvdqhg120jpsqpnmv615yfgl33";
+"yhmath.source-1.3"="xvi8ixwgm1k4122npd21g45alaj02nrv";
+"youngtab-1.1"="jknzzzxpa549x22gcar9aq433zwidbm4";
+"youngtab.doc-1.1"="1vrl9pqjlxs1izrw4a5d922v9ll8rv3h";
+"youngtab.source-1.1"="dbcchlqr498s741q1990aal2gm39bljz";
+"ytableau-1.3"="37wsbj7an7fvsrh4w5kvjiibhq0abn9j";
+"ytableau.doc-1.3"="wbgandbbk6zgms4jz2ird33kyg9yg19b";
+"ytableau.source-1.3"="2rblxwykvkrljn1xqz7zw9dz1wyib686";
+"automata-0.3"="7v2smy8hlz3yyqwcw11mjgh35z81n22w";
+"automata.doc-0.3"="49q82z2aa5xqgz3wsgcyix4a9hqfh5q6";
+"bbcard-2018"="b26d8663qv8x23sp8q04c8jzdw49f2i5";
+"bbcard.doc-2018"="99jqw22g1xcqdn4q5f408gvlzwnl7wbm";
+"blockdraw_mp-2018"="al2d83amvpz7z19a14zxn4ib8ayc7b9y";
+"blockdraw_mp.doc-2018"="n0a85bchn27q09771kx4idy7hic8iq42";
+"bpolynomial-0.5"="rwijp2lyphgyixi6l1d4j9vrwchr2m8k";
+"bpolynomial.doc-0.5"="1561z658ar885xsbg15psi82qjzc4zbn";
+"cmarrows-0.9"="03hcqmzx16n3y4vvh8aj6vrvpn6minmk";
+"cmarrows.doc-0.9"="vhdy6d8cpv29xp8qc72fr678qh9yi01x";
+"drv-0.97"="ry5vbwf27bm31byj37d34shzrdaf8hjg";
+"drv.doc-0.97"="3sw31jvb9l0n124h9kq9byzmy3ay1wxd";
+"dviincl-1.00"="gf980a6jm4ar28h7464qx1nayjqvi1xx";
+"dviincl.doc-1.00"="sxmj8rcvwj2q4g3c8ha9a84avsn4w1aq";
+"emp-2018"="brxc803kbnrd6qa1jfag6qxgb7f5j39g";
+"emp.doc-2018"="x8lkwbk13jq48h8ml7a0fzlyn4m8qlxl";
+"emp.source-2018"="ir1ng5an1jbffb2pd5rv412dcfzv84r1";
+"epsincl-0.2"="srznlzss5ag3br4pmwny7aqq7gjmqv98";
+"epsincl.doc-0.2"="993m24spzl4jymn69sczm7a8d1ix0zcc";
+"expressg-1.5"="yd8jja79lbjibls84q1r2iqls9hgfp3d";
+"expressg.doc-1.5"="ly3cj040ng9ahdl24yw3fgxfix2vimhc";
+"expressg.source-1.5"="fbdj06ca74j5cabgr1v0x7f15z53fr3c";
+"exteps-0.41"="q3nkzx07ckc0ydw909gliknkmm992lpd";
+"exteps.doc-0.41"="2y57ba9glchpbyyr2xy7kk1y3pvicj72";
+"featpost-0.8.8"="8dafiyq66jwcg8aq919aia13nlyyp73a";
+"featpost.doc-0.8.8"="jankbccig4n7c32970l0p4y9dnvapxvx";
+"feynmf-1.08"="22lldffd38r661ziq9p6fp43xc6595yg";
+"feynmf.doc-1.08"="1wif6ik3s9b4z7h75jxixyakgxf402kj";
+"feynmf.source-1.08"="2zf6gfg0vzz5k51d0aqlb2yg3w4lax1n";
+"feynmp-auto-1.1"="ps9nijgd6kcnsgvg3gq9gn53mf42xdwk";
+"feynmp-auto.doc-1.1"="a1i2ay1mvkpdicyzmcapvpv3fkz6pk3c";
+"feynmp-auto.source-1.1"="2iirzys42l2k5fmpjxxsn31wpfzv02d8";
+"garrigues-2018"="b6kfrr0zhmbnb1rh93wy5pxq31kspbmf";
+"garrigues.doc-2018"="zk53ay759rgd40fmf7byqpqmibw7rrza";
+"gmp-1.0"="pzdcapvcjvbn48n6jnl1hs9mbycrccyx";
+"gmp.doc-1.0"="6ir5fj3s209rk3k9r2wbsz46kij8kw9q";
+"gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg";
+"latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb";
+"latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf";
+"mcf2graph-4.33"="7p30amkhcssqdrf9d18682ivmpppvcm3";
+"mcf2graph.doc-4.33"="sxrdkiflnai8y7qd48rl298x8gqjf12h";
+"metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z";
+"metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g";
+"metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb";
+"metaobj.doc-0.93"="cqzsavf652pmgg7v3isv80szkc3s162z";
+"metaplot-0.91"="jmp99vj4w825s9qx6m8bb7q62l3jp5bk";
+"metaplot.doc-0.91"="jzdw7b2kh7a49vngbwb0xm69kwfl288z";
+"metauml-0.2.5"="x4n68p13ycmb4l3dawlkqbdibdj30c38";
+"metauml.doc-0.2.5"="q2l8gl8v89ksl5x96yfagb9is884x4l1";
+"mfpic-1.10"="lslzdy39sbfb1xa5rv3j0whpg1c8vkj6";
+"mfpic.doc-1.10"="cpqqf9cdd3wcd36zjdps0692439zywqr";
+"mfpic.source-1.10"="fwlv0my4cgmbvbv62l8nkzaqz5p7br8q";
+"mfpic4ode-0.4"="83bv2qprp0cankrd54v8vgz58m1xbjdc";
+"mfpic4ode.doc-0.4"="5pjmcvwhz2j8zppx1d98a3lh9fcpa4d9";
+"mfpic4ode.source-0.4"="phmq4zdgz3ikz4ind46w2j0d8jvv4k0k";
+"mp3d-1.34"="sd36lsc5b38ahnf4i1b8a8a5bgw854p7";
+"mp3d.doc-1.34"="gkjwsbz7sgdj5k6vzvswb4k4yb8xkhld";
+"mparrows-0.1"="d1v4j0hrr4cxm42vwlclvccp1wmvbbyh";
+"mparrows.doc-0.1"="jcf975s8ianx9dmiqa9lvv9ywj62rmap";
+"mpattern-2018"="9ym77kwd2kgw46lck4vbfrbbiwps8g6x";
+"mpattern.doc-2018"="vknyl0b4d4sx2c6l7qhwr4rdmx0ncpja";
+"mpcolornames-0.20"="j7qagfiggfwjqapdrh1z23n0paj54bgc";
+"mpcolornames.doc-0.20"="jd5ai6f2ask0pbhrw46bdw8cfsrfpmps";
+"mpcolornames.source-0.20"="1f0wy1lrg0733vnq5mjwcgdi5rnprbis";
+"mpgraphics-0.3"="jad28la9l7z0jwiml56x849d8zwgsh3r";
+"mpgraphics.doc-0.3"="51y5shq3bamhqhpm2hbdki09b9xil2dr";
+"mpgraphics.source-0.3"="2gb71444b968ap0wvw461xskcgxgy519";
+"mptrees-17.06"="lqn20z9inh6qylgljn9k6z398b0vicws";
+"mptrees.doc-17.06"="50ggxw3jc63clpnz0fnxv2p2h4cgwjhl";
+"piechartmp-0.3.0"="k15blq7m78skmi2q46gnazh4qhpfhggs";
+"piechartmp.doc-0.3.0"="xcn16bgnyi4h8pqaisjivmywg234shgm";
+"repere-17.11.2"="b3xk63619ck4b1j6c1kwinm7ih0h1il4";
+"repere.doc-17.11.2"="r4hyv0myqbh20gssm6bzlrlqrhxgjby2";
+"roex-2018"="3dp1ank88mbkx9zd4gl8v6nxa7hjvck6";
+"roex.source-2018"="fbyyci2hg9bvdbxxv09q9h37q98gzzxb";
+"roundrect-2.2"="zihpsds4r0v44h4bbmmpjgx28y3knqc8";
+"roundrect.doc-2.2"="g6kih4vjqjg4v4qxlxkkxgwhqv0x0pdx";
+"roundrect.source-2.2"="rdydd5cwvnbzjlhdd4kcfjq54rzw9k81";
+"shapes-1.1"="cd8q8cgz2c62jla12q136j6wq153k6qn";
+"shapes.doc-1.1"="9w1flaybygr8spm0a104cpwn4bzvg9nq";
+"shapes.source-1.1"="1p66bnb05fsk5fwzj6dd6ykn0229g7hq";
+"slideshow-1.0"="qjdwj7288b4rk5lqj6sxq6cznkaylpd0";
+"slideshow.doc-1.0"="fqp6p6xsw4r87r4vi0j2pani3rx1jbmf";
+"splines-0.2"="bn6gc1n3vbzrns1pzdjc4hf647g6pgj5";
+"splines.doc-0.2"="91g13liz4sfn16vzcvlpqhm388wwvs02";
+"splines.source-0.2"="p527173paps7gqz8wq02jkl6nbx8vw6z";
+"suanpan-2018"="vnglmgbg19g42b79q34fzqr4hjzy7dmc";
+"suanpan.doc-2018"="lvbx0yizc42hgqymw9yscja667h4mz1a";
+"textpath-1.6"="97b12i6v4bz6095z7i7yjf7c3fqg232d";
+"textpath.doc-1.6"="zliwrx3n2r3xjhdi0c80rncxwk5whg76";
+"threeddice-1.0"="91chpiy1n4mg3vcabcm8li91q9lnkcvc";
+"threeddice.doc-1.0"="f9anwvpf5qy57b6g4d71cdjjkkrsc1ky";
+"abc-2.0b"="pmaw58frrdbnj81n21mg15yiz7sp0rci";
+"abc.doc-2.0b"="gild9nm8zph2kr6mj9w0sans8r1jz114";
+"abc.source-2.0b"="g8a921yi51lvw6mqj1hxmkwqqh9fkl03";
+"autosp.doc-2018"="iv0ai0q58p058x4y27b5jny5gdk53p3v";
+"bagpipe-3.02"="z9akwcd2fdwzps3bws9vamik64pyyl73";
+"bagpipe.doc-3.02"="6ssnq5756qnhlbyn08pncriz5la8hpzy";
+"figbas-1.0.3"="xkm3zvkdi7512qnk4kfrb875c3q2gfr0";
+"figbas.doc-1.0.3"="pal9rb3bmrypdk6icdv7fyhdfn48qfsy";
+"gchords-1.20"="06q4p9d1j06dz7sqmjyka4k6r2x3l7nd";
+"gchords.doc-1.20"="icn914698j8gkir78wqnjqw08n2zhsdx";
+"gregoriotex-5.1.1"="qg9nr7v2nmiwq65qvlllxnh86swacsxf";
+"gregoriotex.doc-5.1.1"="94i10450xscqck6plvwwl4y4mz58kiw9";
+"gtrcrd-1.1"="mqaamg8ick2z265cwl1yd6n81f76y8b8";
+"gtrcrd.doc-1.1"="scx1xk6y85zfbn82aqf3cw1sx0prfmgh";
+"guitar-1.6"="xw88497a60kkbh8pribpsi80bj2wdvw2";
+"guitar.doc-1.6"="5y7s8gbahfqzm50z6dgr667f1rgswvzh";
+"guitar.source-1.6"="7i8ma18fm6piiwsccj8lq6nn446mvqrw";
+"guitarchordschemes-0.7"="snccmsq130kvjn2ly56cjck56df5mdzx";
+"guitarchordschemes.doc-0.7"="p74vljfafyj0ap707aydgpf4xs2pabr8";
+"guitartabs-2018"="zl4w2llxyb1173b4asgk93bh70rxil42";
+"guitartabs.doc-2018"="a9rmk3gr37pp0p4fbfasndjglbbwsgck";
+"harmony-2018"="isfyzam48q2f90vyh78rp5df93wzdfq4";
+"harmony.doc-2018"="5zy2cf5afrxlmmxlsycqg3crcl5irkb1";
+"leadsheets-0.5b"="j73sldpahwci9i8yc04dpwn9l4jcvbn2";
+"leadsheets.doc-0.5b"="6wvwwqq7zsb3mkjw24yhz87g8agnafil";
+"lilyglyphs-0.2.3"="qn7pjnhq8aaynk7s8mis9g0y0m16fbnh";
+"lilyglyphs.doc-0.2.3"="89k4bzc0jy0yx59y8ssiqvjgqspsfyry";
+"lilyglyphs.source-0.2.3"="30yzqq1pw4mh74c87xxk12n834vpq8m6";
+"lyluatex-1.0b"="pmh6ggpa31bg09j8xs1ihfx42mcbaihh";
+"lyluatex.doc-1.0b"="5skl26gg3ypzlccyi84yccmw2a2wnb0h";
+"m-tx-0.63a"="pmf3p9sm6wmbaw643agkf9vszihzmy2h";
+"m-tx.doc-0.63a"="w88bsmpknkpccdzgfdj7164qxdn78706";
+"musicography-2018"="hlsnh2b22rxk1i9vq5la2igc4jmvp9b3";
+"musicography.doc-2018"="6b2pfy92ib43gmrcf4bzr02s2qq3yn2j";
+"musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1";
+"musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf";
+"musixtex-1.29"="si9nrmj1g186af47kyfsrv41h3p3irsf";
+"musixtex.doc-1.29"="ls2sq1mynqa6a8z3dxjblla277ml7wr2";
+"musixtex.source-1.29"="kb90c2jhgmx77d12x4rg6yivpiq5rxq1";
+"musixtex-fonts-2018"="a8kdi135xis6qcwy90yisg4wafklmw2y";
+"musixtex-fonts.doc-2018"="91fl3b700pvjqkwsl6h29f0z5i5781s3";
+"musixtnt-2018"="6412y8lh8awml9xs7ybcnhkgyjrc08vx";
+"musixtnt.doc-2018"="44c1fndj5grvw5q4jxyk0dgqxr56lzvd";
+"octave-2018"="6yb1bajc26k0pbr0a02zx2zqg7y0rnj8";
+"octave.doc-2018"="152jq3brzf99xwq983k2afrdlq5lhazb";
+"piano-1.0"="vbbcddqx5sk4gg9w1882g4a8lrnnqn2d";
+"piano.doc-1.0"="bn1c29lffw62jsyiygh3i0biaaz0asmv";
+"pmx-2.84"="hamhslbh8fhjjvzvksg0c9xkjwv4kajw";
+"pmx.doc-2.84"="1xm3b6ywqzn0z79yjncp0104ap1dhqkg";
+"pmxchords-2.0.2"="wwn3da9f9br7dpfhq7yg9j2f64bb9183";
+"pmxchords.doc-2.0.2"="f33mk2mv8pjl4ikg3kvig5lr94iwrm4m";
+"songbook-4.5"="jimhdkxsiqzkwnsjsw1rynkrfhhh5n0d";
+"songbook.doc-4.5"="62n794w3gxyivisl16xrz9lg2r0a0s38";
+"songbook.source-4.5"="nyn7mkdylkpywca50izj2czf485s8sm5";
+"songs-3.0"="sdy6ynmyz3w3y0ss1yiaindzmwpadqwi";
+"songs.doc-3.0"="zpkiq08d6igq9wvg4qhl02b7mk5zfj6y";
+"songs.source-3.0"="0lab84qhskdc7fvf8my7g3lcs9ikblh1";
+"xpiano-1.0"="ha9dpa3kpmhbzy3f16d7s6mlvh563mgj";
+"xpiano.doc-1.0"="x579hyy5sibzsn9ldrkwsqrjjrji0xak";
+"xpiano.source-1.0"="77wwb6wxd7c9cqmjlq9cij6p4ibr3r3r";
+"abbr-2018"="n55llxl7fjmx6p1z3ckjfj94dxkg1n0v";
+"abbr.doc-2018"="9lgcwpp4fw2zjx2rsp9w5szi6v2pdsn4";
+"abstyles-2018"="2zmzwsgwh4rv6ysnjjk35cihbifs0jir";
+"abstyles.doc-2018"="xba8x95rimsa16xhr7nziglk7djzv6w8";
+"apnum-1.7"="hvw4fwjm3n7hfj08ik7nkg5w51zg9mbx";
+"apnum.doc-1.7"="isai4pdly4pkhhjnh3afijlrm9mw2i0q";
+"autoaligne-1.3"="r7iil28qiajpx846ml1h5d192s3k4g9g";
+"autoaligne.doc-1.3"="ajr6zrx9nspbmy29vdhyi5hnzf26zyif";
+"barr-2018"="rsgsgzki68jgx8d4r05qj1awvi02rm33";
+"barr.doc-2018"="jfhxfjazvlpcvrl6zjd1sw2ghmcsscmr";
+"bitelist-0.1"="22q3ivacwl5p0c8plgg1gjz8413l601b";
+"bitelist.doc-0.1"="n00mlj88l6djwcxzj0l6pxiiba94kpl3";
+"bitelist.source-0.1"="w38ccrprx1rn0pc34mr29bnx7gaxa7k8";
+"borceux-2018"="ls6xjxrggjzphr4pl71m2va9mndh1r7v";
+"borceux.doc-2018"="zdg5n9rxc2sfkyi1am8jka05avi7hyng";
+"c-pascal-1.2"="m4x5kfq1vm6vzv0ic910fqi1qijn7g34";
+"c-pascal.doc-1.2"="v6wqph0gaibfv4cwph5w0axp5sf70m6w";
+"catcodes-r0.2"="haljpnhhzvyhmnda9vgk77md5zm88773";
+"catcodes.doc-r0.2"="4227wyg04xryg33b39d81nlh6aaja1lq";
+"catcodes.source-r0.2"="6ljn2lwg4bzr9c02d01vh0saja9sz9yf";
+"chronosys-1.2"="qswnnwyghvsbjf3ddvbl7nl00qxwhs6h";
+"chronosys.doc-1.2"="m11jpa7crg095qf03qx7gcrvcb41f83a";
+"colorsep-2018"="il1sig8hzmvq8q0hlbh6fir15rrl5zc7";
+"dinat-2.5"="a1gcgwkj0pd1lqdm20356fbjram3wpa0";
+"dinat.doc-2.5"="6dzss5231fdqjzs8j7z4gfx5iga4m895";
+"dirtree-0.32"="xgxmz79hj1q6qyfkdvgj5nm26865dfmm";
+"dirtree.doc-0.32"="im2rhm2fmqk1snrhvrsm112jw1hwcyw8";
+"dirtree.source-0.32"="pyfcid8hir7vvm6fpwimlfgs65dgzfm1";
+"docbytex-2018"="m4jkx2gf05q3ffwfkrk4x9bcwf9f3dmw";
+"docbytex.doc-2018"="01w9mkddxm1l9i12i5n5i5ar81xfn9b5";
+"dowith-r0.32"="vdgkjxphpmycfcsimxih7gnhv58hd9vs";
+"dowith.doc-r0.32"="ql8hdyxcgss7rvlp1913rp52wn4wjvxn";
+"dowith.source-r0.32"="xq0r5c58clz8qzbhz01gv2ph1rs9wg1n";
+"eijkhout-2018"="hdb3ag2knc67ksx39hmax8x83l0d41kl";
+"encxvlna-1.1"="kz3nvz29czk573cxbi5a5l3mbjs3vfkh";
+"encxvlna.doc-1.1"="gv5k36s89g2zslq75s2j7ffvwdiz4lkb";
+"epigram-2018"="0mg36ybg934n4jxgpf88lnvvc0za59ya";
+"epsf-2.7.4"="55vrh3nmvb5p1nkkpwhrq9glsf64bc3k";
+"epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg";
+"epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p";
+"epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a";
+"fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96";
+"fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb";
+"figflow-2018"="166qngk7yy25v0rbjavi53m0sazk90gn";
+"figflow.doc-2018"="l92iyzsg4fwkc3nalswwpnz99kfcm1q9";
+"fixpdfmag-2018"="8djdk0baqcg84v6qrmdzckq7k97h4nkv";
+"fltpoint-1.1b"="q48n0d38d8y8m4z6lgmfza4gh1mrzkjn";
+"fltpoint.doc-1.1b"="6ljc5c3g53ig6yj7blcfqy43yvlw5fqf";
+"fltpoint.source-1.1b"="l5ybd1xn6abfhq5kjhvig8zsp721ldzg";
+"fntproof-2018"="bkh1b1j8zlbzmhpif5ji82gwmvg0aprj";
+"fntproof.doc-2018"="hhhxpfkwqpdj0wz78pzg4nbfyzh3j82f";
+"font-change-2015.2"="rvxfsxkwag1pzhh448n737b6ngadrlyg";
+"font-change.doc-2015.2"="14ck6s61lx6gyqmf6i9659lvwd3zh6hs";
+"fontch-2.2"="0h81qy37h3jb2m6g18969189a1jbi73a";
+"fontch.doc-2.2"="csygimfjbm36zfm403jz4kw39zv23zzb";
+"fontname-2018"="p97hi0yx6kka7s80j9cazhpxvhfnf8v2";
+"fontname.doc-2018"="vg79z64v459vl42ba50sar4dhafwr1f0";
+"gates-0.2"="awaxppd6dhv239x03vpwy2hn2zwldmna";
+"gates.doc-0.2"="qqmjk1276kdv0rvsv86gi7ysl3warg95";
+"genmisc-2018"="wyk31w93k04bqfqik1ad1q7bx88m6v4b";
+"getoptk-1.0"="2crphpdvd2wcnqrxm180im84ask9hcq3";
+"getoptk.doc-1.0"="vcj36dsv4y0k8czii5fb5b51c57c7rsd";
+"gfnotation-2.9"="3gkmqmawpzqvqsqcmrfc50261mqv8nmm";
+"gfnotation.doc-2.9"="rwivp94nr9a35q0ram2d4wmwj8gzbhk6";
+"gobble-0.1"="6hlqjaz609rn1q7v2vacb428m3prpdq3";
+"gobble.doc-0.1"="5h4fnic16yz5x517wsfr5l0wna69an8z";
+"gobble.source-0.1"="mxi6gci6g3y41ywya5cq1vrdqzc83jab";
+"graphics-pln-2018"="xgwh2sl1l9ckm86ng0pkk49iiajvpvkz";
+"graphics-pln.doc-2018"="0f496bqsp8ar70sw10kkspqpwldwabj6";
+"gtl-0.4"="49iqvb345f7i2ciz3lzrn4s0m9s7a5d5";
+"gtl.doc-0.4"="3xlxsq2gl5yk4abza4l0y2r168d66fl5";
+"gtl.source-0.4"="l8cvil5xy1bf766cp62qr9sg6s2i88pb";
+"hlist-0.11"="zxglyva456i86zmawizc4scm5cjgw89n";
+"hlist.doc-0.11"="0k1ysa58wbhw02564py59gcwzhlaiffr";
+"hyplain-1.0"="cdn3m5p0va7v16wfr2hxi7sbbkvai0h4";
+"hyplain.doc-1.0"="37fvn4xi8ibli2622n1adyzgnnhrs05n";
+"ifetex-1.2a"="rf6dcxybcj2iaza71yrrl4rhqzgq5jcg";
+"ifetex.doc-1.2a"="cv3s6q4cjv23fi31wavygv6l0f0r1y5l";
+"ifetex.source-1.2a"="17yyam712knw6h46kd7q44gzkbbg9r5p";
+"insbox-2.2"="n1wbssqq7h2g00jmvy1g9cx2pb8lp8n3";
+"insbox.doc-2.2"="i5c06kh17g5ghsjivlxsipgkd0ab05x9";
+"js-misc-2018"="shwn2dwi83plybk71sjp3i1drw7xxd18";
+"js-misc.doc-2018"="ppwwslknxds8l1spalpgj950n9amsinz";
+"lambda-lists-2018"="kpvnf57b1s1whhrrrng7j0zvf0cka90v";
+"lambda-lists.doc-2018"="ai0gzwilj0cm1129pl5nlwc9ddsgpchk";
+"langcode-0.2"="6fwjx029l2nalfz81qfn1k7yp0z7iycb";
+"langcode.doc-0.2"="vq8m73ckjicm53q7v8q5k0rhldq55hkc";
+"langcode.source-0.2"="nk07pqb0mfq3vzpdddhb8w3w85svpbq9";
+"lecturer-2018"="4014kfbhxnf4wb9ndfh0qfwbbrvz0wwa";
+"lecturer.doc-2018"="avsvzihsa6jn0abvd4122k358w5sf4y0";
+"librarian-1.0"="5siy7c2xclp1c305vqiayp0n5dzil1gh";
+"librarian.doc-1.0"="8nxz7ac5hdp9820nsfkvhvv0bn55idq2";
+"listofitems-1.53"="d3c5p72vw331xgavis8yhx96airzwjv7";
+"listofitems.doc-1.53"="5cg66gd2cap6d7s8gxwb2bjyms101g4n";
+"mathdots-0.9"="6avfq6dlhbqw1i3jrjgcdbdzx2a0w5nq";
+"mathdots.doc-0.9"="syy0i8rjssr81sy26xcx43jbripqx9d9";
+"mathdots.source-0.9"="zpl4xjhcq4hs18hqiyljy3lfyx9xbng3";
+"metatex-1.1"="jidirfi30wf0b4aq279lim2pylirmv3r";
+"metatex.doc-1.1"="b0rgim8d9dns88zvf283czk4zgsvvi3b";
+"midnight-2018"="5zah5lcyxgq6zxdpazqy3lqv7vxl9dcr";
+"midnight.doc-2018"="cl4ff07jfflwqpmbi7d1phc65hvhaif7";
+"mkpattern-1.2"="q3wl8iaijlhsg5qx35f5gcmz6gwj543g";
+"mkpattern.doc-1.2"="8hx2z63klm8dmyiyfg069qy4vf5qzc4f";
+"modulus-1.0"="ia3l2fxzy8dvm42nil9c3c3hgpg65kj7";
+"modulus.doc-1.0"="mls645yi6yafadq1fbv0qx8smj5sm1cq";
+"modulus.source-1.0"="rw91xw2dsgzphvq3sjxx507kfx7x3qkp";
+"multido-1.42"="xvw8537j730srqyigrb1q367g73zh29q";
+"multido.doc-1.42"="qp7jdx0jca995df559f1ji2l32jz2h12";
+"multido.source-1.42"="qc1473wf17ppqxy11xgz226w4d8zrxk8";
+"navigator-1.1"="0q23aqjf31y78hxmlhx4mf04c95rwdn3";
+"navigator.doc-1.1"="vxgrfimg900qa0ibwpbwcbv63rbaplp3";
+"newsletr-2018"="1hrni43c6y624w9nryc8q8rd4w6jjap3";
+"newsletr.doc-2018"="p8jfq33i8ah2a35a7d1rb0s3dz0nicvd";
+"ofs-2018"="1vqjznrdyjqn6ygq61h8rnwjymkx5kpj";
+"ofs.doc-2018"="8i8acpk75frksj5wshpjpcazbd93whzy";
+"olsak-misc-2018"="vipxn7qlib4hmx4043jgrcp159j1gbjg";
+"olsak-misc.doc-2018"="wd8fi2c7arsvhdy7372gw7vkvpc9mv6f";
+"path-3.05"="gxlifrd0kfxajy8viylk3wsfkycd96xv";
+"path.doc-3.05"="0pbd67di200vghv2a4bp7vwss7bsbkjv";
+"pdf-trans-2.4"="f2qw1mx9qql6xqsnnwcvqx59baz3gzyl";
+"pdf-trans.doc-2.4"="vbg7kp37w1p727nia0p1imyvxhqgzgna";
+"pitex-2018"="6hpvvpnw3bp3sa442b33xsphhyx0vk4b";
+"pitex.doc-2018"="b1y9bprx9harpgqmbchh33gwnc8khzsa";
+"placeins-plain-2.0"="b0dxmvbqfwm4cycyqm9ir7dl7dbgq37x";
+"plainpkg-0.4a"="xsvwz9z9f2jirfyzggiv49y0rfmhmnaj";
+"plainpkg.doc-0.4a"="b0c8mi4mr6bjdhrwbcplwjw920l4zmbc";
+"plainpkg.source-0.4a"="lcrm6734c3dv44wqcf4sp1c1aic0vqqw";
+"plipsum-4.3"="8jq9bahjflimbxs6vmwz2nl50jsy6ygh";
+"plipsum.doc-4.3"="9jp6ipn24yrl486b96ln2nk8i15h9fjs";
+"plnfss-1.1"="wkcli3ca9m6grq1ccbc5jjychw9sdrzx";
+"plnfss.doc-1.1"="smry2whkwygg9v4vgf4xfvpnfxc76b93";
+"plstmary-0.5c"="5qs8clnk15735j0r9id1vxyqabskbxcg";
+"plstmary.doc-0.5c"="jp2lgn5yq10g0jj5hihbcl77hpy2ryfr";
+"present-2.2"="w9872dq3x09s66fmaxhv0ad27y9f48in";
+"present.doc-2.2"="g4wqrsc8jgsjkwmrp3z6xmhpd0k1xg1m";
+"randomlist-1.3"="nfdsmsl3s1wj8p236s3hmwhwfdx289wb";
+"randomlist.doc-1.3"="c6zlhgw9k14wrqffy277jwj3nqp8vsl2";
+"randomlist.source-1.3"="w61n9d30k1gjjrykxps0ssap7xncdfh2";
+"resumemac-2018"="8kydfyx795317240qryrp7zjvpbcd43r";
+"resumemac.doc-2018"="avh8y1vj230yn8bq0mb0mngrki4h0czy";
+"schemata-0.8"="3qik2nhhwhpgkwnay4rsmglh6kffm1pz";
+"schemata.doc-0.8"="7rggpri0l5pj9rppz8ynd8d6jz0v7ssp";
+"schemata.source-0.8"="qixmvsyiaj3yl78053y2s8xgp8ba06f5";
+"shade-1"="4ywc6gkvkgm5fiq6avik748vzj7f23g2";
+"shade.doc-1"="ax6w6sfryrzmjdff803hp6qfc9x7knkf";
+"simplekv-0.1"="hzrb8zzk62jc89bn9hmsg8xskkf7jnyl";
+"simplekv.doc-0.1"="fygasbjw3slr4d11asghdnw57i0r4qqp";
+"systeme-0.31"="jhh9fac3s6q3k3jizyiv9z498af5rhr8";
+"systeme.doc-0.31"="2n47zjhvy9sf21yi7ji1qi5mp57iwcd6";
+"tabto-generic-2018"="libhmc3f9mcs93xzi22qhk8nyy0vzv4x";
+"termmenu-2018"="b9z1s2xibg6vcrd5qv1n1zlparqlwf3h";
+"termmenu.doc-2018"="0fqaygp9h3wr9x8ghfkxnsi9w1wfjis6";
+"termmenu.source-2018"="xygav2l9gll238dyqa8126sn9hc1n1w2";
+"tex-ps-2018"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp";
+"tex-ps.doc-2018"="g377qq7n63mqil18vlfgimfd589pa1qm";
+"tex4ht-2018"="sak42ilm3zz3g7qi295a4smi98ddp5xq";
+"tex4ht.doc-2018"="hi6p91idcncr8n8hiz6vb4fpwggm1d78";
+"texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd";
+"texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx";
+"texdate-1.0"="5vwzmnz3i8gk63zf721b7vbvmhdsppmp";
+"texdate.doc-1.0"="k63wclwib84sjdah9gmig2lcjk1zz9wx";
+"texdate.source-1.0"="33hbh4chn606rk71c1r007b6cgm6i54d";
+"texinfo-5.1"="dq24mpwkc7jacni9cn3jppy79s057s9w";
+"timetable-2018"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb";
+"tracklang-1.3.5"="n2rshp0wa7ma5ccxyy5f7vr1b0agp3x8";
+"tracklang.doc-1.3.5"="7w6grhayvifyz0vxvclv982mbgq3dwf8";
+"tracklang.source-1.3.5"="ipmpkq09r8zgddxa56bgc1jknwnz7x1j";
+"treetex-2018"="gkvpkgqggl2s86h7rmad9z3ax6wrq3hk";
+"treetex.doc-2018"="5r9rz97y0r280vn642x65xgcffb073gx";
+"trigonometry-2018"="ji2axcciqhac3aaly221w3bja28yb2nw";
+"trigonometry.doc-2018"="drmmcz6w0mvdzmf10dpikm8iagq3hjyf";
+"upca-2018"="hfay60269pv5n1r64q1r9d0lqljih70w";
+"upca.doc-2018"="czzbjifd9bdw0g9c8s2b76sq1cmw3hjp";
+"varisize-2018"="h0jdsw1dapsq7ml9hibgg9571da7lipy";
+"varisize.doc-2018"="af8xf6nzd3h9fm52gn6xpa886lzdpz8h";
+"xdvi-22.87.03"="g5irfc0gf7bra3vngv6kdbkhbyicdz84";
+"xdvi.doc-22.87.03"="zd7shbix0926rvj3ywbhazmqaa7w6ydn";
+"xii.doc-2018"="p1ijdgk0mch86gs858rvkjzjh2yn35d8";
+"xii-lat.doc-2018"="8ilsp524wb5anl3shmdhbnn1nl2c8sav";
+"xlop-0.26"="vjjxxxwsq6pshgia7z796rwmhc5sjqnn";
+"xlop.doc-0.26"="gl0qca1pp05fh8a1baylvl2a26s549y2";
+"xlop.source-0.26"="hdfdp7jn8hch5fydl1zddlfh1av08dxp";
+"yax-1.03"="7kwmcvp6dlxj4jp0xp599f6469zhwnwl";
+"yax.doc-1.03"="4fh5pdqkifpv1zynkl1ycw0xi817wy5h";
+"auto-pst-pdf-0.6"="64qw6a4r38bsb4z3giwdvx18k60x0bch";
+"auto-pst-pdf.doc-0.6"="syhgg4sidch19kh1l9nda10dq7kvyvjq";
+"auto-pst-pdf.source-0.6"="j5n1kpkc88ry8nmb9hd3g382dm1x8c9x";
+"bclogo-3.1"="2j9mb9p1n575pvisvpy7zxhsw8940n2b";
+"bclogo.doc-3.1"="rjmzjjww5vmdzz5qfbsxjmnzz4fmn1gp";
+"dsptricks-1.0"="jrn51r2zwccvvy2dasq0zbf4cls15vy8";
+"dsptricks.doc-1.0"="m018nyxpwvxina15zyhwalzfiqb3ryxx";
+"makeplot-1.0.6"="2l1i1z41gpxaisbcp5qqazff2ff8nyfm";
+"makeplot.doc-1.0.6"="r0cb4v76cf0kcjc8hbik9wv3rkrpxznn";
+"makeplot.source-1.0.6"="f2y39dvyj8i8j7jfgqd8hf52v44k8rwb";
+"pdftricks-1.16"="5886wczqinvi86gby90fwbp36chikia3";
+"pdftricks.doc-1.16"="0q95d84knvpyp44pyv6hpp827m9cw5k8";
+"pdftricks2-1.01"="lqjpqma2f0zc9bvf8hgp73yhf2pgkwc5";
+"pdftricks2.doc-1.01"="311ws9zf7fpc91407lm28mjcckvz4mmg";
+"pedigree-perl-1.0"="2wwngnzbxbdypw4mg5wqr4vlmz770llg";
+"pedigree-perl.doc-1.0"="l3v4vhrvkkiz8av3l0abb4w5v0fizbpn";
+"psbao-0.17"="ma3dzpsa8kxqcjm72s217g3rk8i46pv8";
+"psbao.doc-0.17"="1r5r8xcwizzkbm5nb3xpv1ma58v8hgh6";
+"pst-2dplot-1.5"="krwawa7h5jd8sdsq3axq5wvn1im8k1zq";
+"pst-2dplot.doc-1.5"="gbmabgk6i8q9mi397ny0r8kqzk0hyc0y";
+"pst-3d-1.10"="pg6n52kv7lk6i6rfqyzijfrxdbv7ym5x";
+"pst-3d.doc-1.10"="x7bl3prki06ki517r33ab7pz72n0ycz0";
+"pst-3d.source-1.10"="xchbmh6g5zwja9xgxlkdb04qx4kplclx";
+"pst-3dplot-2.04"="m0ww4lfmigs5knn6i9x5qnd1hw1cvcb9";
+"pst-3dplot.doc-2.04"="jd1vzccssibgymacp05maz256a6iif2v";
+"pst-abspos-0.2"="bbag5d5l1pad71rrc51lbd8k11jm7nn2";
+"pst-abspos.doc-0.2"="70m0f6dbxy9j9iwxx92kj2k4vwqsbrc8";
+"pst-abspos.source-0.2"="3bnsfp2rj4rviirll63zljd7wady41q5";
+"pst-am-1.02"="pydkanpjfkw4s25m2rnxxmx2nq94rsk9";
+"pst-am.doc-1.02"="5sy24k5ivs70h1zg0knnfxyw0k0244nr";
+"pst-am.source-1.02"="ay1y6q7kmpib5bslmylx5xag413a425z";
+"pst-antiprism-0.02"="d79wzkbpk9q3n15qw83svf850x2y08wa";
+"pst-antiprism.doc-0.02"="sgb8fs7xl1szmnlmdpjbp7b8pnd02xln";
+"pst-arrow-0.01"="13pfic6an180whl8c9flfsw83ldrgj39";
+"pst-arrow.doc-0.01"="60rhkqwp0mbrn1ddp4n5akj3b6w03pjs";
+"pst-asr-1.3"="78h56zzm2yq7nv40l2aql6ihrx7da5gk";
+"pst-asr.doc-1.3"="qx4jpg74zpjjjh01bwxmw7lyip0nwxfc";
+"pst-bar-0.92"="a5456vc3299z2n5di8kfv5q07bnp7fvz";
+"pst-bar.doc-0.92"="6p7ag1iq37p5rkvd3a6b32cxnj8jqkz0";
+"pst-bar.source-0.92"="grywxwwpmwyf94rwa8pmcxvbf0r0xanz";
+"pst-barcode-0.18"="mvdpfn6iwpyycb8sfa91jw0mxyq6ai5d";
+"pst-barcode.doc-0.18"="xbyg4yj85i4pj46b8bxha5w8268j1k7f";
+"pst-bezier-0.03"="7gw43wmghlvfv0vmbxb9m75wki7k90ij";
+"pst-bezier.doc-0.03"="1dldcqv70p1iscmp22jh0gkvg9c2z112";
+"pst-blur-2.0"="xlvdgcpxbaqdw7qfp36xx9brl93gknak";
+"pst-blur.doc-2.0"="s2nqfv19ihhsx64hixcj74b9314q0r4v";
+"pst-blur.source-2.0"="km82lbn5chcrqzg19kyyczzzrladh5yy";
+"pst-bspline-1.62"="3l0nwn486w6wfac9g6rjf1rn7bf7cxgj";
+"pst-bspline.doc-1.62"="vk4iq1imd58w0f8a93c7zf56yb0hkr91";
+"pst-calculate-0.01"="qjxx5ixjkcgsjw61kymkfx3bjing1m2r";
+"pst-calculate.doc-0.01"="awqmvx6j1gb2lrzbkkg8nd1jbinvim9l";
+"pst-calendar-0.47"="nsnyxxld6q4jzvc8kwysbwn9y6fxi9g1";
+"pst-calendar.doc-0.47"="jvwhyiz2cfzcx6mpwkahmpcb3fyl6yqq";
+"pst-cie-1.06"="gxxwapvfgmfvbc2xk0j51jj1br0v9ssb";
+"pst-cie.doc-1.06"="1sfdjwhw8fss94m00bsgdbsdhn0rnf04";
+"pst-circ-2.15"="q4k0z76y8p0x7050awsw224f6jjrmc99";
+"pst-circ.doc-2.15"="399p8cxh7x0sl0lxqav2w6yhxhkhfj2b";
+"pst-coil-1.07"="2ai64805vflnfx112c8p0jqf1ad477wn";
+"pst-coil.doc-1.07"="209y878cmqrykmakyy38075dkdfff6nb";
+"pst-contourplot-0.6"="8giwlz62qcmrl9mddfwk9yqp51c01r0k";
+"pst-contourplot.doc-0.6"="4agf1dx03x2jkxjh3v55nj4bns22563m";
+"pst-cox-0.98_Beta"="c03maichp45vxcy6n3p210gpvypr5v2p";
+"pst-cox.doc-0.98_Beta"="8x10b6xh12f1fssbyf8aggprnn7cm6i9";
+"pst-dart-0.02"="q9b7prnysx2xzw6i643ihjyn5ds1ds30";
+"pst-dart.doc-0.02"="hnwnh7aw3rjq1ny6fz4q0cp98j5lk59s";
+"pst-dbicons-0.16"="il8pxplbwqjhr3714g7n3476dyav3sby";
+"pst-dbicons.doc-0.16"="isaxq5v1rnnllahq6zzcd420yzfzc5j3";
+"pst-dbicons.source-0.16"="q70fjninffvwslibi5rwwsnay6jpi14c";
+"pst-diffraction-2.03"="amf1cak741kvz4a2ddz7hxlna2137akz";
+"pst-diffraction.doc-2.03"="iz4aizfbck2z3lgna1lxl3dagvmbnm1b";
+"pst-diffraction.source-2.03"="5v7nl5sf2fsja46jh36w48prx0l5cnsi";
+"pst-electricfield-0.14"="yq6r4m5q162j5y62vbrzgg0ilnk5blym";
+"pst-electricfield.doc-0.14"="7k6gx1q68lzsh4jayxhh1shvrj1ci81m";
+"pst-electricfield.source-0.14"="js2bqzmv8fkyd4j1pj8yzb6x7xlj2fvm";
+"pst-eps-1.0"="djkk1cq45fzh2q1pvl23aiqi8b2znqrk";
+"pst-eps.doc-1.0"="i903x3p9wwb1jjf5al8azqr3iasmxkyk";
+"pst-eps.source-1.0"="r6jcjqy0f5mnkkahzqf9qnfrgwqh52h8";
+"pst-eucl-1.56"="rb1769g6vgjrq6vx79s4c6z6cy58898r";
+"pst-eucl.doc-1.56"="cwizlv632bcddknihhwbf4kiqxs13ka7";
+"pst-exa-0.06"="1jqv019148d2s5n7cmlclldqd3mzk08w";
+"pst-exa.doc-0.06"="v45ljmsk7y4p256vikzyk7w0z1vnybqz";
+"pst-fill-1.01"="llnpvgwf57n20wh4p9xfbwcxzlwky62z";
+"pst-fill.doc-1.01"="2wyyhm91dszgjzpvfsyyz7wk3z8k345w";
+"pst-fill.source-1.01"="yg27p6nlmkzbkjrygc2kc6bxj6hm9fdk";
+"pst-fit-0.02"="glmix9zjghzn0pa092yf6qppyax0grf3";
+"pst-fit.doc-0.02"="d2ilipqghmv5i4jmjh63199kn78i4brk";
+"pst-fr3d-1.10"="wcwbrmyh4mn9af5skqaj9pljkc79chwq";
+"pst-fr3d.doc-1.10"="hcf0909wnb4qdhrcy5bsgi7bjhkd3rs3";
+"pst-fr3d.source-1.10"="fyqkqk6p5m83q133ngw9a3j6gpzy8aii";
+"pst-fractal-0.09"="s7wlzibbasxv784n0r6yamnlgrisbzdg";
+"pst-fractal.doc-0.09"="559nd8bz2xc0g4rq1z3vbh1ymg574zh8";
+"pst-fun-0.04"="klmswb8gqb538ghlay62dwg1asiq8l13";
+"pst-fun.doc-0.04"="xafzv4wa5hzqmclbv7s7xh0ba2kaay69";
+"pst-fun.source-0.04"="s7173q9a44aqd43d8bwcrskc9bsh1c1r";
+"pst-func-0.89"="37iyq995v3xzkdih8v3hyjwdyz3bpb2v";
+"pst-func.doc-0.89"="s64ca10yxpwjcaadcmnrk2fgfchch5ij";
+"pst-gantt-0.22a"="ghji2bp2wz4xgkmh2vrfyxh933r8dr3q";
+"pst-gantt.doc-0.22a"="zvdlzyll48hrl970ms6j7pgwp2f2vmy3";
+"pst-geo-0.06"="p2q2w8rl3z8xvdylc8inm2i4zbh8jxc8";
+"pst-geo.doc-0.06"="q8fwd5i5fvxchs8hz9l7zml2xqv337sd";
+"pst-geometrictools-1.1"="rx8v1nyhqrny92sqsrwzsra4mhrh7xnh";
+"pst-geometrictools.doc-1.1"="20k0sg2qkfzkcpq1qa42195dw9swjx3h";
+"pst-ghsb-2018"="rzy3vznyr6jd0b0vr9h6ajlqc11bp9rz";
+"pst-ghsb.doc-2018"="5w079f1q4w8yxs4546qzx2c21vrhm2ym";
+"pst-gr3d-1.34"="wpbib4n4j2fmgbirhq8xha4di6f3w1xa";
+"pst-gr3d.doc-1.34"="ipap5gil3j6hkdcl1l1y0a6fnj754zq9";
+"pst-gr3d.source-1.34"="l6i8dnqgpl8iwsmbhiw3a043pbxb3k7m";
+"pst-grad-1.06"="7yprfjpsyszw1wndfkwingz1vncvy1ng";
+"pst-grad.doc-1.06"="da27kdibqih9pbbj4366bin38zznfsis";
+"pst-graphicx-0.02"="pq6a58d7i0bpbzq0wrh54vlyz5hwjb2r";
+"pst-graphicx.doc-0.02"="xq7j614zxh5m9mr5zbfbr7q1ds0f528g";
+"pst-infixplot-0.11"="cpck9sg68imi2ddiaafw7k89hhz8i4ar";
+"pst-infixplot.doc-0.11"="xa4vw2bzwdqm4y46ljqpx3d6n2ff02yq";
+"pst-intersect-0.4"="az34g553vdj45pa35s8ymk0901njq262";
+"pst-intersect.doc-0.4"="756ih3z05zxw0igclcmx7l8r7n6c9n85";
+"pst-intersect.source-0.4"="2fbzddwq4bib97214qq0cqrhraxvc5dp";
+"pst-jtree-2.6"="pcgjwxpmr4356pysfc4jgn5f7wvif4n2";
+"pst-jtree.doc-2.6"="i9qmlbn7apzimcsmxls2vwh5gniizyrc";
+"pst-knot-0.2"="y69z6hv29f73scygpzg5qr0p3yf8cvlp";
+"pst-knot.doc-0.2"="7jbx6gjfjglggmnfgpj0rzf67wp0s549";
+"pst-labo-2.04"="h5lyw06d0i2r5ghn4ljymyy3s9bglmcz";
+"pst-labo.doc-2.04"="8diz0gbmd09is6w4qyicizjbq4gf7lxs";
+"pst-layout-.95"="vwhvczg3rwlvz8r7x4y4n537bwb3x6f3";
+"pst-layout.doc-.95"="y5pl5paib75knak0gamgp31mph6dnpkb";
+"pst-lens-1.02"="y5a0bhzbyh4ncg26rh3k3w7xc2mmw2df";
+"pst-lens.doc-1.02"="f8qa04lxfwy1ic6dl6s4bc3k66b2sjy2";
+"pst-lens.source-1.02"="371k1kh1ryb46asc37r40vbi5i35icfz";
+"pst-light3d-0.12"="p4nppgfa4qw8l2gj23k1rhhfb7vdkq2s";
+"pst-light3d.doc-0.12"="p688y0b5pc29l63dpmrx342m4hmpilxs";
+"pst-light3d.source-0.12"="ic2f2b81hsyhh8pp57ywda8pngw9g0m6";
+"pst-magneticfield-1.13"="6pcajgzqp3j0vw40zaqk53xwjw8wvxll";
+"pst-magneticfield.doc-1.13"="94dsx0pzxrs242a76h7h1b503dbggv16";
+"pst-magneticfield.source-1.13"="qp1il0apr1dwk903r65a8zz029zk1jil";
+"pst-math-0.63"="d9r69wp0179mmlnbng0w7jkr2h0ba2c7";
+"pst-math.doc-0.63"="0ad7biw2p83k17sy74drsl8daw716pk2";
+"pst-mirror-1.01"="l1qs4938r324dv9w1ij2xfwk16nslyhk";
+"pst-mirror.doc-1.01"="varxk1wyh1lc7yv5n3ad1yp583rchj3l";
+"pst-node-1.41"="kgq5kc4r1179an3v8n35p7ks6p3gv21c";
+"pst-node.doc-1.41"="ih90x5a8qqfbk30n2yxypkqck6iaakxn";
+"pst-ob3d-0.21"="b133mvl37zxxqny148r3mnwijp69jzc2";
+"pst-ob3d.doc-0.21"="v0d9mrz4dvpk0qix4fiy632jfhfhqy4l";
+"pst-ob3d.source-0.21"="yqjb2ifyxj2mvs11lxq32dgdr74af9p3";
+"pst-ode-0.12"="qbfc4q6k4chpxvwcbvdqrl7jnpgqs5kc";
+"pst-ode.doc-0.12"="l5w1n8x5vipp5n03m5av3gw90x6dsw32";
+"pst-optexp-5.2"="6k171kswlvjz2qrgsr43llpn8a8fx2b9";
+"pst-optexp.doc-5.2"="8nfgcfs6614n1szf9c8b7mjk43f2vqah";
+"pst-optexp.source-5.2"="krh33kab76gxw3vjcaja3y8vk2xjpgla";
+"pst-optic-1.02"="fmp70zsr3gfcxc9d7mik8y7fdq9bhv9z";
+"pst-optic.doc-1.02"="bw2k4jbxfdwyn7pfn708wd3ff8nr14ww";
+"pst-osci-2.82"="5rwmmzwp7jwfv40cg66gi0n75mlvn851";
+"pst-osci.doc-2.82"="nmgp00q4xifasnxnckw04kmd8qxxdd7k";
+"pst-ovl-0.07a"="g6sni4112p1kyribk7p6rv1mwwjb7xb4";
+"pst-ovl.doc-0.07a"="n23m8iv4lv4009x9l6sa177jyfjkp0pi";
+"pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k";
+"pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg";
+"pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av";
+"pst-pdf-1.2d"="av5rd425773zxnzlwdk4x5sf8wp9w7in";
+"pst-pdf.doc-1.2d"="k2zssqg4qf151a5iiw2nvk8lyrlh7md7";
+"pst-pdf.source-1.2d"="1lswqfmczya2gdhxi28czpznic888yf5";
+"pst-pdgr-0.4"="cijfx5hq5ygnchsgdw7ly5a43a5v6cqb";
+"pst-pdgr.doc-0.4"="s94gqhws251skwh2ap0b3hlvpp818y0z";
+"pst-pdgr.source-0.4"="s2zbikk5v94207zmrmnlpr5bx3jjzc5i";
+"pst-perspective-1.05"="iaq5j9cbgyr5p4np1fn5dqv8m8mv29qc";
+"pst-perspective.doc-1.05"="kvvjyfxnxvzxgjrfv3ysw2qd3bafh5jk";
+"pst-platon-0.01"="c1crbkzj0vvblf8n894g91q7qig185w5";
+"pst-platon.doc-0.01"="54icmvjwsbljdbq03j3npmwr9j85cdpg";
+"pst-platon.source-0.01"="bs136jlsz9yxiw062dlck6km6fsapgjv";
+"pst-plot-1.90"="y1d69nspq4xpaacqmxpnmrwyn0s15lzr";
+"pst-plot.doc-1.90"="jpp9hcj8l36z5sk75vzjxj2bsk40mk25";
+"pst-poker-0.03"="8ny6asww2zmrbm4aqilmhn3wh5rlx4jj";
+"pst-poker.doc-0.03"="icmvyk2m0yn1cqgmfplp6r271ipsnnqf";
+"pst-poly-1.63"="caj343wmgfxzbzchalw7w14jazj3xb3n";
+"pst-poly.doc-1.63"="gq61g8l852k4m8n69kzqdx1sii0jr41n";
+"pst-pulley-0.02"="d7y0xspcv55vq4xhhpwhl9a3q33fpyga";
+"pst-pulley.doc-0.02"="6g5jnm4i5lrxqb45mn60g7nlc9xq13cg";
+"pst-qtree-2018"="6slxqgzm8pzscdf79x1y4zp3rav425g3";
+"pst-qtree.doc-2018"="9bp342h5rimv9wyjncj9m9bb3x2pb77p";
+"pst-rputover-1.0"="39c8h8wq8rcby34dnpq8f9d87zlfd0p8";
+"pst-rputover.doc-1.0"="apm70lr0xn7hgj16acpcll9wd3jcxqbn";
+"pst-rubans-1.2"="akzd33l39b9gh53hkqzaznb6j6rrbif5";
+"pst-rubans.doc-1.2"="sa01cv2q19w3rxlib2j2wppvbjcbn6z8";
+"pst-rubans.source-1.2"="vanr4y960njpckxcy8i10jh8fxmdd94m";
+"pst-shell-0.03"="kllra0m3v64wiw4mg1wjqwcwapgbqw34";
+"pst-shell.doc-0.03"="j8j9vfqbw1bzbncflx0wk7awr599pp2m";
+"pst-shell.source-0.03"="4zzi02gy69lscpmwmsy5i6dzck63ql10";
+"pst-sigsys-1.4"="89mhw4a91vxvm6jr2806w7sdgm0sldzq";
+"pst-sigsys.doc-1.4"="1x1s3l6z4rr8s1s8smck8x8vkg9sb7k5";
+"pst-slpe-1.31"="i8wqm7c5rr1gvrcqdhzgc3wjsnvhxnaq";
+"pst-slpe.doc-1.31"="d63x21a81b3chx59ygn3niagb12lq0vq";
+"pst-slpe.source-1.31"="b8pbhx17ad49g92il07bx2347lim9kr7";
+"pst-solarsystem-0.13"="k3gvgdnwv5054qph6ljijgwlr4mhrsmy";
+"pst-solarsystem.doc-0.13"="sh4if86rr6p8bmjrfndh8lfsibjmlj8l";
+"pst-solides3d-4.34"="j69csa2fcbv1ih3ay93n0qd8wv04q6di";
+"pst-solides3d.doc-4.34"="mqhqa0qzn96gkrjcaywszpikz8klpc5d";
+"pst-soroban-1.0"="q71r7bilwmgxxvcqngmn9w63cqwh526i";
+"pst-soroban.doc-1.0"="ds57w9f3d4dy5c17xsvrmzs09iccanh7";
+"pst-soroban.source-1.0"="sj27j1n05dfq3szxyifzd24i44c4ls40";
+"pst-spectra-0.91"="7h48zv55xaxbgccdp7710lh3y2s334sn";
+"pst-spectra.doc-0.91"="sc2zbs93vbzp4jqgwwxh7pga2ngrwxnz";
+"pst-spinner-1.02"="c25gya6x35s07ki87x3f8jm85a0hsdqb";
+"pst-spinner.doc-1.02"="b15zdksxzk1dr3rmgi5qfkqwq131qnv2";
+"pst-spirograph-0.41"="2mkxc7vrmv5xa7aggmpc27wss9gw8zzr";
+"pst-spirograph.doc-0.41"="4q5pbwicrqkpmfr7zwa0ykmfy32y4iks";
+"pst-stru-0.13"="9xzgq9yp4wh3939dxg4wvkzsvq8za3vw";
+"pst-stru.doc-0.13"="pm4nj6rck0s7gjhkfjg3i4xa8qd1dihi";
+"pst-support.doc-2018"="z97cka1jrk6jji8lczqfxc09cqj7f34x";
+"pst-text-1.00"="cz2rwirb2xh5yp257rn8i6s0vdns1cpl";
+"pst-text.doc-1.00"="xmxlml48x6y95arijiba41m9i201hy3q";
+"pst-text.source-1.00"="kzl944rkvz2bjwv6dgq8qhmmmfqxchc2";
+"pst-thick-1.0"="b2dnjagm4kkgxfjilahizzyq6mb1cx5f";
+"pst-thick.doc-1.0"="jkybjsqnnavyazal3bf4z54ldqnw1gw5";
+"pst-thick.source-1.0"="1kjjkqgz4fwghaialrqvgnfq57vl13k5";
+"pst-tools-0.09b"="m4bc24jncfjd32n3b4zmkba3nkk8a0az";
+"pst-tools.doc-0.09b"="5jh948lwnk951jpa6wwgkqc6hx49l0q0";
+"pst-tree-1.13"="l1m6c66jv4v02n4mjv9ddgh84qbyllqw";
+"pst-tree.doc-1.13"="jgcx73vrpiwvlq9rg1iszm57bj1qsr73";
+"pst-tvz-1.01"="0xky3nd1q8kv7vbs73dcbwgjqbysrwi8";
+"pst-tvz.doc-1.01"="hrigaq1rz3hd5l4969913apdwayy1ifr";
+"pst-tvz.source-1.01"="zs1dh6kiphzy0p7nj7i1faldamjsc1j0";
+"pst-uml-0.83"="0rfbyzqd6xk0aiwrmavfnkr6bmawkrdg";
+"pst-uml.doc-0.83"="jvyfkj9r0zknfbpway8zwl5l81zwfq6n";
+"pst-uml.source-0.83"="50n69kfybcg2qlxjy9d0f330rxy23sv6";
+"pst-vectorian-0.4"="45j3kc2ma7yvpk73724419zxzajyyc0p";
+"pst-vectorian.doc-0.4"="kr9cw6fs2rra7ymmza9mf3winvj17c0j";
+"pst-vehicle-1.2"="fzkkfjzb0s227y1942p89g2s3qn5bgdr";
+"pst-vehicle.doc-1.2"="152w1jskf5ninr660a9cjbyh9q4bhphj";
+"pst-vowel-1.0"="aq45bsp7d1rdflxvs1aga0kqmn9b3zd8";
+"pst-vowel.doc-1.0"="zm075772viyjnm1akx6ixk61gb33nq8m";
+"pst-vue3d-1.24"="kdnn3bssm9xrfr42ni1n8kg04r899624";
+"pst-vue3d.doc-1.24"="qg9v649wjxjfrp14f3ac4shp5nfad89m";
+"pst-vue3d.source-1.24"="zxk7phlcdh2g1x9l4mps6ncwxc8ydryi";
+"pst2pdf-0.18"="rafm5fyifzzz21336l2yvnqs1ynrcrh4";
+"pst2pdf.doc-0.18"="hpjd3gxsk0lmajf2fpac7ykhrznzsily";
+"pstricks-2.86"="mzqccqjv8b3m5n8j84rvy47d5hay0vrb";
+"pstricks.doc-2.86"="d9xnsrd64bnn7fgqp2sxphf3hyhzpszz";
+"pstricks-add-3.85a"="xxikppbna9jc6cnlr77y7szkp6fiwx18";
+"pstricks-add.doc-3.85a"="qr9b291fqjl7alv2zx6bbi0c6n2bdsg5";
+"pstricks_calcnotes.doc-1.2"="4q48najl98h9lb1866avfw6c5ir7p4bj";
+"uml-0.11"="ggl1iw3qhzysy0fza2dbl3igwlcq3i0n";
+"uml.doc-0.11"="rhj5ivlvx43d8c700117lklmgardm76a";
+"uml.source-0.11"="nfmc770r8bp35av4n0x1nml5h23y3whd";
+"vaucanson-g-0.4"="qvnklg80m4p0235g3wx2ln1gk5myd1i9";
+"vaucanson-g.doc-0.4"="iwldpyzbgygg73gyidpj3vgw60jdid9l";
+"vocaltract-1"="dzjd6v5mhb2mcdgrk66dc0wc4hdihsnw";
+"vocaltract.doc-1"="kgb45nb45fmc2hnyg31m92cg74mybnvq";
+"IEEEconf-1.4"="y7pcvgybgsj94x4r1b3p79w2bwrja38s";
+"IEEEconf.doc-1.4"="6pyp532mjalspmalr2ia8nm58fjj5fwj";
+"IEEEconf.source-1.4"="h16jq4q6bvb1wpwjxnyhhp43frcjmnym";
+"IEEEtran-1.8b"="96gd4zxcmg6c2mma4d8z0wganf9ml7d9";
+"IEEEtran.doc-1.8b"="zdc3y0lkjpis1fdkshd6bwsmkxr6w2aj";
+"aastex-6.2"="vsyj9chprljrl3ybzsfbiwjvjvs502ss";
+"aastex.doc-6.2"="iz8flgxhn6y8qzv32v1sf418gyff6c4g";
+"abnt-2018"="90r9j1lfsaiaw5gcxgnksza92w1pxbgj";
+"abnt.doc-2018"="c0yrnnhkq7vkjq04ckj878bdjm51lzha";
+"abntex2-1.9.6"="asw2qc8f7hg5ziyp6xw7n0zz2wyxlr68";
+"abntex2.doc-1.9.6"="mswyx4k6c3n31h69arb4385066dhblpj";
+"acmart-1.54"="0gbyhy780vsnfd2j40aqji291alrax9j";
+"acmart.doc-1.54"="6rz2f6ffmhlppbj2i2hcmc0w0ybp9x6x";
+"acmart.source-1.54"="z5bqmbcvgvvdqqr4dr2h3p0nrr65za4h";
+"acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5";
+"acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23";
+"acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik";
+"active-conf-0.3a"="k1b3ykxr34j6mz7qnhl442kiw5mi044k";
+"active-conf.doc-0.3a"="smq9rd7vgsdm8q0mkgrvwifrdjirsi3n";
+"active-conf.source-0.3a"="j59z6864ndi1pvrfdcj1g7h28bb0zs59";
+"adfathesis-2.42"="kipd97l80csijf6nwf4qh9dqs7481gpv";
+"adfathesis.doc-2.42"="1a45imkqk01xwsn8w0sgi04kq9lkjfsm";
+"adfathesis.source-2.42"="wsyrxaljzn15z0mg9fkv7qqbcxfgv7ri";
+"afparticle-1.3"="a47yf3q2kr9imhrr9520gm0xzrbxijpl";
+"afparticle.doc-1.3"="jwrcq8p5jlda9bs8xq364748p9xr3hyk";
+"afparticle.source-1.3"="3j3wg5g8qbrm1lycdd5g49sva0rshjqc";
+"afthesis-2.7"="s423mnyllrn49bbhas0r4nmks9nk4nrh";
+"afthesis.doc-2.7"="8cac60kzq0srba12qa1sdk4fkqxvwjvi";
+"aguplus-1.6b"="92nfqnrbjsfcw7aym6qahl2rsl75kl55";
+"aguplus.doc-1.6b"="8nams9f6dwbv45ad46lxh7c4wspl0hcl";
+"aiaa-3.6"="x8hag1q2jh49y6ad5k774y573zas97c4";
+"aiaa.doc-3.6"="ipldvi4g05v26gzvp2wp71n0xv5mkdd1";
+"aiaa.source-3.6"="wllq5qv20bc4f7m098yn1f5slyrdxazz";
+"ametsoc-4.3.2"="4v5ya7z7mbbxqxkjp5madwpn3m456gpp";
+"ametsoc.doc-4.3.2"="nzphxaasrrgxhiwixz6k6qikbg6z45gi";
+"anufinalexam.doc-2018"="qb1dvx5ryz6p5dia1z13aa0h0822f814";
+"aomart-1.21"="szg9dma84y66pdh8p32kq36fxhnn0lzs";
+"aomart.doc-1.21"="00i2qqh5hlfpiqqp75ri023wlvsj4r9z";
+"aomart.source-1.21"="xf9126s1w02lxbllbzblzd405qg0ydsy";
+"apa-1.3.4"="g7ywm2jp0b70qdwmm59m4rr8glx3wc66";
+"apa.doc-1.3.4"="vjg7gj1wi6mb9b1qyfsznhgcbvivdn1c";
+"apa6-2.32"="8b479v28qw8k5hxpfc1vhkyf44f6wxbs";
+"apa6.doc-2.32"="hmb1y0jdxnz23azfaphhlzkxcs50krhp";
+"apa6.source-2.32"="lvjgha718vdc0d4a9xg568n3nfdah16j";
+"apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z";
+"apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw";
+"apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk";
+"arsclassica-2018"="pk5gn6ifrhj5c33f78d619hq4j3d7nmg";
+"arsclassica.doc-2018"="z21lmz2x0sc7g6gc50j1x0hhzz96ra7b";
+"articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l";
+"articleingud.doc-0.3"="00653rqfzjv2f4wl77vznk2p1pi6f2fd";
+"articleingud.source-0.3"="24wwfplzs8477i5kl1ks5fvkd8w1lv76";
+"asaetr-1.0a"="wkch5k1hxw65dfdkyghyzpcibmnj0zyj";
+"asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1";
+"ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3";
+"ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623";
+"aucklandthesis-2018"="gqqynyfp4l80jc7a90by84wjmn22s0br";
+"aucklandthesis.doc-2018"="jr76ykx7f98jvfjy7dr767xspb50rsnw";
+"bangorcsthesis-1.5.2"="ky8ixx69nxccn4a343bs2g2bqzwbxkyy";
+"bangorcsthesis.doc-1.5.2"="qa5s7byik9gmrf7b6amx1l3d50qakmhh";
+"bangorcsthesis.source-1.5.2"="cjriqlf0zm0jw6l9g53j3msy14r4j62s";
+"bangorexam-1.4.0"="6s8rc4pgza915qgldk95ykqmxhf2czxf";
+"bangorexam.doc-1.4.0"="kxjxdnfljg1pracpx514adjp7ynbvvll";
+"bangorexam.source-1.4.0"="rf9s69qaaw2qrbyljcsj9pmg5qw4m18b";
+"bath-bst-2.0"="49z7vh3bxddgf6gp5p76xi9drj9wxxjl";
+"bath-bst.doc-2.0"="qia52b68dahs9qb8830px6kj480g3cmb";
+"bath-bst.source-2.0"="qd3490knx1z1yg5gfslvm2a323vbhin0";
+"beamer-FUBerlin.doc-0.02b"="k09b82znxfk7gi7cxpkffs65v3q5siph";
+"beamer-verona-0.2"="jgqm1267x276xsdikvc586h946xfzhcv";
+"beamer-verona.doc-0.2"="skxiv6nxw4vk3c7ppl2bripmlkada52x";
+"beilstein-1.4"="v59d234rg06vkwrqqcd58jkyc008qj6k";
+"beilstein.doc-1.4"="ysg1dalzi5mzznrfwmcirz0593d9pfmv";
+"beilstein.source-1.4"="vacm0gshx6r8lp12jc40wj97lwwsdw4r";
+"bgteubner-2.11"="kjykk4kfr7iig49zpd26kga2p4kki4gq";
+"bgteubner.doc-2.11"="wi654djqdqp0hff6cshv1hfkhmgcacs7";
+"bgteubner.source-2.11"="jhqhmr6bb4ldma4dscl9l4csan3qrv6q";
+"br-lex-2018"="ipw7gwrsdv691vnv257w9i15f465irnv";
+"br-lex.doc-2018"="kai74ysi41iw5bc9rjv8saj7qh7n0s12";
+"brandeis-dissertation-2.0"="8nqvv44ahsf5nxn6m4qrd5yiarim1zr9";
+"brandeis-dissertation.doc-2.0"="lfpykcdb4yrf7pz7b1ljrissjlk4v20v";
+"brandeis-dissertation.source-2.0"="xnp41jb8wf2zlrcqikp6qxnhw9k6j1z6";
+"cascadilla-1.8.2"="03g1znhjzcvxvclzwb33lrm6703j1xxw";
+"cascadilla.doc-1.8.2"="njy3lpaw3lch5x3p1mm07zis50z38ps1";
+"cesenaexam-0.2"="0n58an00m7xywgjxd4mk4jvr3wkla1sg";
+"cesenaexam.doc-0.2"="1cq9yg0f3j9s40jrkzgxnpk2ya88jgiv";
+"cesenaexam.source-0.2"="213fs3j3x9f0330jy9hfxmq3dhpl1lgf";
+"chem-journal-2018"="8rsrybpvzqr389ip3lfkjna1vy6lclv1";
+"cje-1.06"="s4l2hjnfw2s0l19hbzf5249igprbhw7a";
+"cje.doc-1.06"="hyw2lcxsbm0v95l1161v2sh2bprsg421";
+"classicthesis-4.6"="1mdqrwxmh218ni62g9bfgq7v1jx20ilc";
+"classicthesis.doc-4.6"="d0nd57qpb4ya46ipz6c2jwark5sdghfl";
+"cleanthesis-0.3.1"="rs5scswkmbikw0r4xs8wc86js9fsfaa3";
+"cleanthesis.doc-0.3.1"="640j45873rghdx1c5h0n08a3z3ca5q17";
+"cmpj-3.01"="4imggckmccyqhm3fdl7v8kwsakfjknmd";
+"cmpj.doc-3.01"="3r41m4byz5qrlhng3sajvnwqf8zqjxfy";
+"confproc-0.8"="6anwdx64g1yfr109jrnqfml6bqj8l98a";
+"confproc.doc-0.8"="qczsp87rylnxkd8nsi14kjahnkh57i6m";
+"confproc.source-0.8"="f8yczf6glbb74hvfga786qvamllnza9c";
+"cquthesis-1.30"="x5ybra1c1snfcdzqpgkzh72wyk24lmsd";
+"cquthesis.doc-1.30"="5l0y7h5dzh8csclspqsdbc21j5lwafp3";
+"cquthesis.source-1.30"="n7xqxgkxdvy7pki3wv5cl2pmwpjrv7w0";
+"dccpaper-1.7.1"="6ky9m4rh8dn01rffh44v1ff5vh2igkc7";
+"dccpaper.doc-1.7.1"="7wpyahkvp59a0l0lfyw5ssrpjk9cg53c";
+"dccpaper.source-1.7.1"="zzcscajfm6dlrzam0d03imfhch41f1pl";
+"dithesis-0.2"="y0xrpjxnblvgahdwyfhm2hag5hss6qzv";
+"dithesis.doc-0.2"="b7ka35ywbrn2m3a6b8cyzyvajwxyvdkl";
+"ebook-2018"="08y1g19fvjskwm55g1av1x8bs95vmc6y";
+"ebook.doc-2018"="kw04pn3a7pbkgxjrn1p12z65j8k4n3fk";
+"ebsthesis-1.0"="3f8i1srqx6hh10rrjshsispqr3wdhm0m";
+"ebsthesis.doc-1.0"="wic4wfgihf2yyk40937hr2g59933cyy5";
+"ebsthesis.source-1.0"="q1lhixwgkc6zis1sgsnwzsd0p7spp0zz";
+"ecothesis.doc-1.2"="92jxgiddwpj5g62zwg50wm681h2z1ixf";
+"ejpecp-1.5"="vzfnvl9rxwbkfyv5pd759d2pgn1gr4qz";
+"ejpecp.doc-1.5"="4449msv5iq090x7r41q1m4l6dnvi7fzp";
+"ejpecp.source-1.5"="sqklvmybkamm25bavxc232grpjv58wmh";
+"ekaia-1.04"="9nf7f8bpgwlwvi7q7fm0k3q0kxbmqxf8";
+"ekaia.doc-1.04"="m3bjh6g13dv06w2p1jqls18cck4gzwf4";
+"ekaia.source-1.04"="gr1gbgpy03z7j1s8bcapf6nqzyjxbzx9";
+"elbioimp-1.2"="wp7pv78ijjgb48majhg8pjqcmkq29jbl";
+"elbioimp.doc-1.2"="0515vzg1miiljb8grlb8idsb2y9gfcdc";
+"elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4";
+"elsarticle-3.0"="sys13f2zlgn6ynf81vj1qa6xbbv3snkp";
+"elsarticle.doc-3.0"="n218xpdc4j3yc9i5fxxr68zxl615ls2w";
+"elsarticle.source-3.0"="vlcpfdh95dsdkx4l02s07miccp4b5xr5";
+"elteikthesis-1.2"="fq911ak06fd2h6brn2zsb20pkqgl4kb4";
+"elteikthesis.doc-1.2"="b5ja8g2vrf7gxpsfwshly6h3i0h0kw7d";
+"elteikthesis.source-1.2"="iyrmq8s585am0kb3ixgbi2g3n7aqxwr2";
+"emisa-2.2.0"="5ap5gagakjpx889lpiz1knpd3z8fcff3";
+"emisa.doc-2.2.0"="x1qp5j19svjw388qkmccwlh6by9r5a1r";
+"emisa.source-2.2.0"="i3zqwl03w9ff9caf1nafflv8a3gvbdjm";
+"erdc-1.1"="pmxparxijq91mlqb2z2ci0mk9as4r1nz";
+"erdc.doc-1.1"="a7f0jw1j2l0md2s4hdzv6gb1v867nk8n";
+"erdc.source-1.1"="5rf897hybsib6915bvyp0nai8j7bszgb";
+"estcpmm-0.4"="30s2wysjnicdxnfwliinz0s3xgjz65an";
+"estcpmm.doc-0.4"="kmrdd36g036c2rd86i9lc9n73rcfhwy7";
+"estcpmm.source-0.4"="7pn247fkf44679vcgbf62ishd70sgr8p";
+"etsvthor-1.0"="i9p7vf52g9pxrczw1sfvipk71xjbw2pa";
+"etsvthor.doc-1.0"="jp6bpcx2mwjzs07p16w0ncjfw1kb9kzd";
+"fbithesis-1.2m"="1fdf0shkpyjfwikv3raz4a27wssg7j8q";
+"fbithesis.doc-1.2m"="wjh25w45lkz3dg1900qvpvn3r137dw8m";
+"fbithesis.source-1.2m"="qa99zpjzb2q48x55nq9cfsv7gf6ggyjb";
+"fcavtex-1.1"="kh7y3795flgarmi9izzzgq6g7z294jj4";
+"fcavtex.doc-1.1"="qr05ymcfxx8vwm572rd0pa6yq0fam2n2";
+"fcltxdoc-1.0"="gr5vxdra4lcsljhm591xs1b6z4ci2ddc";
+"fcltxdoc.doc-1.0"="mibli0mi846flzm0id9z0cr8x90rivgw";
+"fcltxdoc.source-1.0"="yn567l5sbbrrdbcmiqdpyq8kq5y1ni1v";
+"fei-4.1.1"="3gxdiknhl2548z1n0i6zvvhsk85l3ww4";
+"fei.doc-4.1.1"="s5fi1ypvxza43k6l62v7m0kqz6b5fmsn";
+"fei.source-4.1.1"="3crhd5mdgrfz0g3i4r7bwr3536yzba1k";
+"gaceta-1.06"="gkwy4pkpzmykxm2rqldpjfh5q5m87ca1";
+"gaceta.doc-1.06"="zbxs7kz33kbvx4g5zykh33zn2g9z2cp1";
+"gatech-thesis-1.8"="q85fv2ikl3ikw9ja5j7sgygyi6v1x2kp";
+"gatech-thesis.doc-1.8"="q97libi0drg6plfjps8p9fd7fxbxg34n";
+"gradstudentresume-2018"="bmmfv6i9zhk617r9a59yz4m0g14s1q1b";
+"gradstudentresume.doc-2018"="xw0w9hwnyhb6xszynfvz489c9j0vyxsk";
+"grant-0.0.3"="a9bjc5a9i24mymq11dsw78gck3pdb16n";
+"grant.doc-0.0.3"="39g10k0rwfx678fnc8vx6j77wvn8f5c0";
+"grant.source-0.0.3"="4cfhdbqmffiypcs88iij2fxc5lmylxfk";
+"gsemthesis-0.9.4"="jhw29zl7f93xh641ws6ydqh62cv1kbbj";
+"gsemthesis.doc-0.9.4"="3nw8q8pxsfdbd4gmly0bg8ig15ccpy1q";
+"gsemthesis.source-0.9.4"="w1k5h97pgahsar4r1sbg6i2dj4npr6y0";
+"gzt-0.98"="1ji92870bm9rkc0llvmhyqw8brxb9kwl";
+"gzt.doc-0.98"="zip7fdsd96fjgmsyaj43b4zd5i5vw331";
+"gzt.source-0.98"="0jm3vmpy2z28fzk1q5cnw4d3ga13czj8";
+"h2020proposal-1.0"="sdm13gcvhga8q32ai16mnz2rfsnwb7bz";
+"h2020proposal.doc-1.0"="8nsjvgzyw9137ncq9v48dhlncb10snyn";
+"hagenberg-thesis-2018"="wc3vcl379w736kiyxyll8qmhzs4znjih";
+"hagenberg-thesis.doc-2018"="gbvv3fdp84dsszf7g3kvaik93qcmy8na";
+"har2nat-1.0"="yn5d36r1lnx5xhrk46laka9crikcd5yl";
+"har2nat.doc-1.0"="8gh35w4a8j117z6dzy9p7mmbxsh789zf";
+"hecthese-1.3"="n5x4vh6psl8n8382bd7r822x49qs9sx3";
+"hecthese.doc-1.3"="r83ixlw8i78cfjipycpv5y6bvljhfq4v";
+"hecthese.source-1.3"="dl1x6wwmxr5yzg4almb52salyifw7i5r";
+"hithesis-1.0.9"="zxkjibspp3ybis5d04wawwpmcjyvrzpl";
+"hithesis.doc-1.0.9"="rzr600zg521m8arpcsp284r3rn9nhkln";
+"hithesis.source-1.0.9"="paiy4bmi9xg5lmpli1p8ck53k4v6c8d9";
+"hobete-2018"="k2agw9n4s8imsfi399r1n3v80sdxc41s";
+"hobete.doc-2018"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g";
+"hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs";
+"hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w";
+"hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2";
+"icsv-0.2"="3k7if2nxgb8zcyr7j29v3pxcqcyygg3k";
+"icsv.doc-0.2"="n714ksda39kc8zsqd1x7lnq3crg2w6fi";
+"icsv.source-0.2"="h08pzrpgwn88gz0d6kyrvnyjrra6f3vz";
+"ieeepes-4.0"="xljj9w5kx7mxhv9q6dgmn23wkijvjyqg";
+"ieeepes.doc-4.0"="n7wpz8946kfcd7a4dnx901y40vjbynxi";
+"ijmart-1.7"="nh0kksmb0z5k95s15bwxrbqxxnlq81l2";
+"ijmart.doc-1.7"="b88j6a249p8f9bp35a8p019l02s7lbfc";
+"ijmart.source-1.7"="y5wyzz6jr5lp0syjywlvdpb3s02cb7ks";
+"ijsra-1.1"="zj3pf34flbmdy98fzmshxdwhsm9gypb3";
+"ijsra.doc-1.1"="pmw844flk212zpdvcp026c63snmasbsf";
+"imac-2018"="w4g9hwgh6wvbhf5v8xfjcba6chqlp32z";
+"imac.doc-2018"="5qid3adma0486l4li4mmrgxl9lykzfz3";
+"imtekda-1.7"="rm2w2mx8mxzxjwgsw6gk0i64c2wb0yxa";
+"imtekda.doc-1.7"="m50cfbqcjz4ylda5myzz4idaqfv40nay";
+"imtekda.source-1.7"="wrx5ndn59k0rlz19iq8r4fzb4yly9hr2";
+"iscram-1.1"="2pywqaa72mb216nmzl0w8cr74vf200cg";
+"iscram.doc-1.1"="0bd1j3dqs4kgsdaag5wkv7n9zci8qgda";
+"jacow-2.2"="7a1fcrpsp78iif3cvpmzlb2lx71lkdsc";
+"jacow.doc-2.2"="a2c4bkrrn1hrig4pidj1f10llcnxnh6i";
+"jmlr-1.24"="rnmwix9b0hfdm6zys2zbzy2rx1rfas98";
+"jmlr.doc-1.24"="b7aj9p4s5xzpv2jkih803zx713lp212g";
+"jmlr.source-1.24"="bncl60ks6g38pj64ig53q0s3kr3fpws9";
+"jnuexam-0.3"="cxlnb3l0x0rf363xch1jl1d2kfw11afs";
+"jnuexam.doc-0.3"="ad83n0fwz7wq8k03vnr6ckpqshjb7z5m";
+"jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x";
+"jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b";
+"kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr";
+"kdgdocs.doc-1.0"="0gfi3rfrsjaw25g7mxk7mai8mxy968m1";
+"kdgdocs.source-1.0"="dcafx36f7id055kdwvfsci6wq2ya50c8";
+"kluwer-2018"="y63q5nz0rhxlj362cbj5a4x3wm8imiri";
+"kluwer.doc-2018"="q85mq4id3y04wwq7f8is8lwh7gbzyxxn";
+"kluwer.source-2018"="q4k0f4qgzcxgnxblw1776dhk57i2zq6d";
+"ksp-thesis-1.0.2"="244sggimcsxbqkh6g9nndxvdvr6agqvv";
+"ksp-thesis.doc-1.0.2"="jngi4gfc4r6dkp6xggyg2s05zj38s1vz";
+"ku-template-0.02"="9b1vsd98aqc0b5s33r3z6ayj7ph0lcj3";
+"ku-template.doc-0.02"="067zqymqvljm9ras3a48glc0clfkfwkk";
+"langsci-2018"="1pv0kmn0pj1lzp5z024l2p1i46lh0zlw";
+"langsci.doc-2018"="cnjj2d2m05cgh3412b6yp8i715lwxkr3";
+"limecv-0.1.3"="kvjmm481ihl7idl0z0k2a7qd1f83b2bg";
+"limecv.doc-0.1.3"="9lxwfgxfgpnkmm5pmikrgsp9kf4vfhvh";
+"limecv.source-0.1.3"="5fcyq9gad359zzhpara50rclrqm62qzh";
+"lion-msc-0.27"="6b6bg86gr57ldh3giniicp6j41bpqx5a";
+"lion-msc.doc-0.27"="q9jflbrgsf7qhbqm5sl6w6qbaz1jv7yk";
+"llncsconf-1.0.0"="w9rc61m4yijyf6mb4h78xhr0h7mf3p9g";
+"llncsconf.doc-1.0.0"="8p4z5cm4pp2f3iqmjnhqb8n2fcgx8gxz";
+"lni-1.4"="bpb6rs0znz4q3kkq2f33z9fn2ivndrd8";
+"lni.doc-1.4"="zx79qgmpb96mkfpvsngvqkz63s4rxgmd";
+"lni.source-1.4"="hgmnsbd4i6w031l3wqvx4xy305dwjqb2";
+"lps-0.7"="njaym8455i99rr0vplxlpn95cbp8sv9h";
+"lps.doc-0.7"="9qg688yrg4lfkb284shpgan08vfi5sxn";
+"lps.source-0.7"="d2jid2g08c51lpixvbqp13hkvmbhw2f2";
+"matc3-1.0.1"="1r8svk9xpxv518j58xxrkfpy3lzh3gs6";
+"matc3.doc-1.0.1"="9kwpm6ah02zhwgd5gfhqkk0csba5h401";
+"matc3.source-1.0.1"="cnlk2ffrjczw23mssgwv7i63dg7w3j19";
+"matc3mem-1.1"="1w8m977ngbqivnhlaqsf6bvn7yngg3hg";
+"matc3mem.doc-1.1"="y6b8v00dhz5xg56kz04jql3rdrl0v5n1";
+"matc3mem.source-1.1"="3n9x1jfgrc8jigj8w2bmngk7pxqz9v29";
+"mcmthesis-6.2"="64qi8gzjxbkrgaz5kmhw8y0p8a5a9psy";
+"mcmthesis.doc-6.2"="wsg9cpf8cad4nnxa2idr12maganmxns1";
+"mcmthesis.source-6.2"="4y6jriqrf4643g1xwxkgc29d31iksc2r";
+"mentis-1.5"="nfpcmyxlg0gadqj33jnxji3nvs5fni9l";
+"mentis.doc-1.5"="vnj4lk1vxc0c0710jb21x3vskppk9c86";
+"mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g";
+"mnras-3.0"="ib7iykfq2gzv7iljfpqnncwdha05sv36";
+"mnras.doc-3.0"="jns5g8cd4c28jqy106ard1pca1pl0p4k";
+"msu-thesis-2.8"="0d0607nv2nq2s2cw64pmkmkhkmnglv8k";
+"msu-thesis.doc-2.8"="lq84fa70s7gpvnllfwrn4w9cgxmgzcpw";
+"mucproc-1.02"="d1xzqp0nvkk4zdf1zcrhngvlc0q412gp";
+"mucproc.doc-1.02"="zpky6iahkhynyv72lg94ankg9wn7gwd7";
+"mucproc.source-1.02"="pxysp457kvf603nz6lwaj55cmlc41n0m";
+"mugsthesis-2018"="cfkw21f3xy6pchbq7ryw2df8bdssilc5";
+"mugsthesis.doc-2018"="xqm757zbzxi9ag50dd22274bk5n1897h";
+"mugsthesis.source-2018"="6awfcfhsqggxvxxxmfbi77pa6bwchg79";
+"musuos-1.1d"="v0bx55bnw5lcpq1w0zxfkf1hlxahxj0x";
+"musuos.doc-1.1d"="iqviyy26inh9bw04maby457bvxip69xw";
+"musuos.source-1.1d"="rx3zcmp2mw88f3jxa0igajz4dzvx135m";
+"muthesis-2018"="w6llbyp3d615mpjazf9i746acl0hqvpb";
+"muthesis.doc-2018"="776dszqb0k9nffhnln310dg20n4z0dlr";
+"mynsfc-1.01"="j3jb9xyv9javnbk9r6fb11ygnd9ygpfx";
+"mynsfc.doc-1.01"="5zlf94gdmkxg37zdwq04w4pzfgransf1";
+"mynsfc.source-1.01"="zzmxbw2xfk91lv6isc6raqnqmvk4da6x";
+"nature-1.0"="147ghy9qhv5w2p0rh84wrpdgk5cwrd1y";
+"nature.doc-1.0"="lvavrpl6wrkxpsidgbzil8g117kkwdf6";
+"navydocs-1.1"="kn549s2m1h0i9ir8q01il9ww3yw05wx0";
+"navydocs.doc-1.1"="72l419vyq79lrhlflxnivg66b9vkbx5m";
+"navydocs.source-1.1"="xcwc5yyvhjhrdjrj9w9prp72mpqlvq3r";
+"nddiss-3.2017.2"="gsqqnmrgc27i78c6s4y1zy7i5yi66yix";
+"nddiss.doc-3.2017.2"="p28y66qyk1zkhmp6f11rkidfjmvpnlgx";
+"nddiss.source-3.2017.2"="7kbka2v5nsdg4wfrv69zsx92rrlax0zw";
+"ndsu-thesis-2018"="l4dsamss5kpl272pbmj720jc6zlb4lij";
+"ndsu-thesis.doc-2018"="6hbh7hl0nwsijq545vym7il5wvrzlbr1";
+"nih-2018"="cv6rcwrnq8rpwmmxva32233isckys2md";
+"nih.doc-2018"="n3j1f7kbygyh0ljz1796b0ywkifvykbh";
+"nihbiosketch-2018"="da0kk90h0paw6wp0x43cqcfm18bh9ajz";
+"nihbiosketch.doc-2018"="l6nx5x7lb8sqfbmac215xbrn36ifx6fc";
+"nostarch-1.3"="5ir7wwqflr7ac9wdz3qq50232lrxk79r";
+"nostarch.doc-1.3"="l4v9sg6lhii6m7z83ap9fghjkzhc1d6k";
+"nostarch.source-1.3"="sn4i3aqmh4r4yfj1dq5ipqyy4424kns6";
+"novel-1.52"="pg1ib5l593diyyb06v6wwvhqny32qm7z";
+"novel.doc-1.52"="1dz1pcpd89kkcbzdqacyk8ck0ik75qra";
+"nrc-2.01a"="pwgmkqwj9nh6c5ibhgz0gx4fha8y4mfa";
+"nrc.doc-2.01a"="y8ga6db77g42jblz5hpvk3vhcsj6zczs";
+"nrc.source-2.01a"="14br9wclpq3sfj0gcb8q3ws6nz3ws7jw";
+"nwejm-0.98e"="xmdi704s6l7g90d59mpv8l2p1h228fjq";
+"nwejm.doc-0.98e"="x47qqh9myqfqipfzbwpbrs4ijx6liyyq";
+"nwejm.source-0.98e"="hqkdhbwmp7sh4y917rr0yf7393jrq5qs";
+"onrannual-1.1"="zfqaz0fi36py1y5izbphl677ny5mcrl6";
+"onrannual.doc-1.1"="hxdcfp7y4lcpc2j1d25sx3p0nga1435h";
+"opteng-1.0"="fnx8hnwcpahlkw6h2q1hbnkwa3kfr477";
+"opteng.doc-1.0"="24dy7xc4wlz223svmhsv4k05bw6b12af";
+"philosophersimprint-1.4"="cdw4cms8w2z5lvj17ayb1yg3075qfpik";
+"philosophersimprint.doc-1.4"="j5ri2kgr97c4z3mzf5kilcwjlqliibjp";
+"philosophersimprint.source-1.4"="i6h47warmh5zlaswpq62mvbc6nkl3hij";
+"pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5";
+"pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4";
+"pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469";
+"pkuthss-1.8.0"="kkhdsrrj8h227xbg7mifxgc63628c5rd";
+"pkuthss.doc-1.8.0"="1pp01q7aakicnjd2187vn2z52wp433im";
+"powerdot-FUBerlin-0.01"="r89y2lmmzzyln4jx6kzdn4rb84jz7w15";
+"powerdot-FUBerlin.doc-0.01"="gy9ianzkp3a81sga5i1xp4kzsnyppzb2";
+"powerdot-tuliplab-1.0.0"="x7ygn34dsmvncmaps2skxfqdakqkp4rz";
+"powerdot-tuliplab.doc-1.0.0"="s41i6f75xbl8wmnsblyrpvdbf1awbanr";
+"pracjourn-0.4n"="iv8vll5az565ki1vcjpacrcb369z2g4c";
+"pracjourn.doc-0.4n"="kvvb2vn1z5phqxy9jiwgj9rgc1fpabhj";
+"pracjourn.source-0.4n"="vl8rarvx6whc3ph6pw892ldwiwzvc78x";
+"procIAGssymp-2018"="cvcsi5gr6ndjlvabqwkk4spmd8y9fqz1";
+"procIAGssymp.doc-2018"="y08ng1769j9ffib4fpi6rb86dvj4y0a8";
+"proposal-2018"="3nnzzlv4rcr3v671fipw679yq7ndbw9j";
+"proposal.doc-2018"="hx9nsm0fidsia9v6iki5l4cb500kjm2k";
+"proposal.source-2018"="3md53b23cqzdhjyzk2hw4gsjr5flngfw";
+"psu-thesis-1.1"="mfm31zjkdhv8g59fzcnxiwrj5l3im13a";
+"psu-thesis.doc-1.1"="xqrlld1bn1kyqymprpchwp525n1jbmhd";
+"ptptex-0.91"="w61zrgirw5as67kcbi3yrx5pzpw7dj36";
+"ptptex.doc-0.91"="h0fi9wq2asps1aiwkvrwj93dkzzhclsy";
+"resphilosophica-1.32"="gsk94k6c9f53ml3smlwddkb86bad0f78";
+"resphilosophica.doc-1.32"="0blmi1bx37jl0a99kfrjws0slpqvjiza";
+"resphilosophica.source-1.32"="pyfass4f4z5d98xkid8sx174hy0k1i6h";
+"resumecls-0.3.2"="niqlfjipn9h1dchnx63w89i097kf58il";
+"resumecls.doc-0.3.2"="7jcdgicys21bhfhyn1aflyvry0yy7sxk";
+"resumecls.source-0.3.2"="wpgzwjw6nmg6dq02jdxq12fx7hnmff29";
+"revtex-4.1r"="bk25w1asnzgz3m3hbz9vq4wha12xs41h";
+"revtex.doc-4.1r"="lcbzvj00nnrnrjja5vcpzdmc6dmk3k56";
+"revtex.source-4.1r"="32rs8695805n82m58hqf0bww2mqnvynw";
+"revtex4-4.0"="sa5r7jsw4kqqwzzxalj04wcflcawl2xs";
+"revtex4.doc-4.0"="3bki1hg7jr60q7x07w0i8d0a6zkp9qnr";
+"revtex4.source-4.0"="0pq58vkvfc191123k78zaiyy3mxk1m1h";
+"rutitlepage-1.0"="a1n4m7cac5knv65x53rlvba61hpadmvb";
+"rutitlepage.doc-1.0"="y797dhmlp9nd1sws91ixz30n0rv3ga57";
+"rutitlepage.source-1.0"="425dvih79kx8ddzb4as308f796bi7m1p";
+"ryethesis-1.36"="vvsqlw02q3ivwlzw3rp0x6vhfdqvfhda";
+"ryethesis.doc-1.36"="xpba1bqp48y0q99kn8w504pzj3176nf7";
+"ryethesis.source-1.36"="4dddvz7f28pbzyymssgsilsyig9rzp45";
+"sageep-1.0"="3jzsiq3wj7wwhlhzyqmi78lv6vin2kk8";
+"sageep.doc-1.0"="px3f2qx88xijb5jyd75v3sxkss671ppa";
+"sageep.source-1.0"="j5qj2vr800891ccgbvgdqbnfa0mxj4n3";
+"sapthesis-4.1"="63dcp1gxf0dhdrlzljj5267j83q97pd5";
+"sapthesis.doc-4.1"="mra57v29ah4bjcmngl3h1vyg5c2z9imd";
+"schule-0.8.1"="0bskmm375d4kvnpnl7askk78ni06k4ds";
+"schule.doc-0.8.1"="b3kmlg0khjb1239nb6myl1w5kxpp9175";
+"scientific-thesis-cover-4.0.2"="g3c3y6l5nb34vmla06bry9nipwjwcxcs";
+"scientific-thesis-cover.doc-4.0.2"="zzlsbapfhvlfgry78cc63a1l9d6gf66c";
+"scientific-thesis-cover.source-4.0.2"="29sksgy5611i9gwmckxmyypkkk1r0vpv";
+"scrjrnl-0.1"="q5rd79j19g0jgafhxj3wc62x6y16378w";
+"scrjrnl.doc-0.1"="s45malh0680ffbg9x0gwfah9c930036w";
+"scrjrnl.source-0.1"="kif8v92z8sn21h0ddw05rm16q7dbz5iq";
+"sduthesis-1.2.1"="dj4596idsn0am4yjhvknm7n70hzdyzqi";
+"sduthesis.doc-1.2.1"="xmznlf85vkps6cwk7sfc4g5arkcs6iaj";
+"sduthesis.source-1.2.1"="bz1cx41qazpy7bfpcgb5xnhk4wzhkcif";
+"seuthesis-2.1.2"="f8djm6sdhwky5kk6vmfrc647rvl3vd70";
+"seuthesis.doc-2.1.2"="kbn5zb8qx89sp8m2q99caf1qn8v29hd3";
+"seuthesis.source-2.1.2"="8r9akmgz64d70bf1mdpq856xw6w9h8jn";
+"seuthesix-1.0.1"="mh346k6d64d1bhhznzsrww66sppysbrh";
+"seuthesix.doc-1.0.1"="a2mghdhdxd7l2rsd5midfibcwsrn7n4z";
+"seuthesix.source-1.0.1"="skmm8a9h0jvgdwn0bsx9fnvwmyf94mz3";
+"soton-0.1"="25iyg10d05ahygjbhfc6g6ydiij3isw9";
+"soton.doc-0.1"="5irwl7khvqcx0siw7wcasicpxzj94cgb";
+"sphdthesis-1.0"="i5i9nf7bky3095bhxvmmvxwca4mf7ai7";
+"sphdthesis.doc-1.0"="nx5kpi9s03jwv5g8adqrn5l55lyqc9hd";
+"spie-3.25"="fj1biarxwagah3b4l5r9p498qwd70yar";
+"spie.doc-3.25"="dgp3in09igj011041akydwgnsw10m927";
+"sr-vorl-1.1"="aspxka23zd8rlwxlvjvw6wlwkg38rj66";
+"sr-vorl.doc-1.1"="y9m89lwhx9rwd1k0w2bgwh5ip64awx41";
+"sr-vorl.source-1.1"="5zsgq5m3fkjip7qr4zkx51j54j4q5qpq";
+"stellenbosch-11a"="s0wddhmfp77y6v54qq4jsmqidjq3bkqh";
+"stellenbosch.doc-11a"="97wbyj0mg7phb66ngkf82ziiy8v624b1";
+"stellenbosch.source-11a"="0raanzzc5qjay7gz94himx8np0437pgb";
+"suftesi-2.9"="h9bfwxab3hg48q45qpkfm1f23igr073v";
+"suftesi.doc-2.9"="sjlghwc1j7mbk103wk4nb817z1m46rkm";
+"suftesi.source-2.9"="0b7ji3a3pxs6wrc9mx7791gsb6bcmjzl";
+"sugconf-2018"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d";
+"sugconf.doc-2018"="siyxf3blr7z953fm4xy61z4jfx589bcb";
+"tabriz-thesis-1.1"="9k4d01w35206y8gw5f76ffx6abvdhgwf";
+"tabriz-thesis.doc-1.1"="cga6sdf865mjmzaa39173gy5vinshqpv";
+"texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l";
+"texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl";
+"thesis-ekf-2.2"="zyn83db8ypzvy5na7j29hyp9w26aqr7m";
+"thesis-ekf.doc-2.2"="1qjvck3asw4hfrs7wr9p5vmpaflxk7bc";
+"thesis-ekf.source-2.2"="z7xq3i71bh76pbhar6d7c853hiyr89jm";
+"thesis-gwu-1.6.0"="rfkv3pcc6kba9nif6bpjdij362xgjwlh";
+"thesis-gwu.doc-1.6.0"="mwpj2j3hvdfpafz38pwhj6d4vikpprla";
+"thesis-titlepage-fhac-0.1"="dmyydjxrj16hf8gh7qyp564d195kzmwp";
+"thesis-titlepage-fhac.doc-0.1"="g4jw0jyl09vq4hglb14jx355v9kli1bx";
+"thesis-titlepage-fhac.source-0.1"="zp492p2j40bpphwr3zhjcqiwnj18yk56";
+"thucoursework-2.5"="0dfnpgz9k0rnfcxd84978j40q9ybqip3";
+"thucoursework.doc-2.5"="2g1mix0k6jas8pwg3gayc3rwhp3bg1bz";
+"thucoursework.source-2.5"="g1503caaz9sfmxdvfkd1ia4hhlalcz61";
+"thuthesis-5.4.5"="93rq3f84hgx20499qj0b1h2jy7qiwyyz";
+"thuthesis.doc-5.4.5"="02kh9gzv7ckjhp815z4crvzpnx1nk4rg";
+"thuthesis.source-5.4.5"="lq084av4p4m77cmi462m210zi9nchx94";
+"timbreicmc-1.2"="5wmk4wdbxw94iplf2ixqqmvij6j3zsjw";
+"timbreicmc.doc-1.2"="6ii5zzl9wzx09gdx2fjw8kfma8pyanri";
+"timbreicmc.source-1.2"="3mlgin89y0wl2las9hylvczp981r6497";
+"tlc-article-1.0.10"="kranwsdzsh6vwrcwd2lmhmya9nc16rkh";
+"tlc-article.doc-1.0.10"="jjc3i294hyxryz62w2kzaf6fjdvfhvzf";
+"topletter-0.3.0"="01cmbaxzr5fsmwsz8y5l9xfdi43219zg";
+"topletter.doc-0.3.0"="ygpvdw145lnyllcwh8yv4pcc0ssydpwm";
+"topletter.source-0.3.0"="f4lvw616czlsqw7ic5mlwq583097j7ls";
+"toptesi-6.2.04"="6n7r8inyv95qn8spr4mpvqmvnpvgxpbs";
+"toptesi.doc-6.2.04"="f1w6mj2wa6jfnd4vphh064g3p7zslblk";
+"toptesi.source-6.2.04"="pfgjil080fx8pzqjf9yqawc8026lbwam";
+"tudscr-2.05m"="rlfxi0lf0yy473933ds0w4f88iaxs2by";
+"tudscr.doc-2.05m"="zf1a6mamshb3h9ijkcf13191bp5yra8q";
+"tudscr.source-2.05m"="rblvasxg57wsh98wiykpsfsb9xdk9nds";
+"tugboat-2.19"="5wj4n4w3s7fhcgri0bxhfdvdpyzyilyj";
+"tugboat.doc-2.19"="f3h49sd5372xgxv1fs2a7mzahjxrzyxd";
+"tugboat.source-2.19"="j6gasjnm5php0fsdmp0njifajsg79q27";
+"tugboat-plain-1.23"="5gg97ya5rlspsjgxp6h6sl75bgy4krpa";
+"tugboat-plain.doc-1.23"="5wndvzkgnq5p1bnkzlbxkadwi2gpc2lc";
+"tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw";
+"tui.doc-1.9"="ddway3iy2gx447ypp2cd4vlvhjvnlh0l";
+"turabian-0.1.0"="mkjjkq2fpg1lipzwqn7k0p77j2i3znm0";
+"turabian.doc-0.1.0"="b1pxcnzj5k4l9r571yi924kykw4wk7vd";
+"uaclasses-2018"="d8zwjxcvgb1rnfv239xwf1qblqpzk32c";
+"uaclasses.doc-2018"="mv9hypafmsgnh5pxl2n0929ib8zgrda0";
+"uaclasses.source-2018"="mzvrcc6gvds2bw1a7cdkjd5n9dm3gczq";
+"uafthesis-12.12"="8qdm4v22s3r9g8q16sjnw3bzx1j9w16a";
+"uafthesis.doc-12.12"="d1nns5qzwkrywy9cghr19i70bp16fvw2";
+"uantwerpendocs-2.1"="q9nkzfzdryckilz4rl0g29sr9smxs34x";
+"uantwerpendocs.doc-2.1"="0i43lbngx7782dd6xb91vd1layvzl4dn";
+"uantwerpendocs.source-2.1"="dsvq1614vw8sjmr8gd3l5mxx4ljr2rdb";
+"ucbthesis-3.5"="zagmch6rnvnjiy9y0nacc5ciwqv5xsad";
+"ucbthesis.doc-3.5"="xzypd8jcnsipjflhcjvznd9y7fcqmm51";
+"ucdavisthesis-1.3"="naibrb9h1lg8y22j26wygm9zxcv3rfc2";
+"ucdavisthesis.doc-1.3"="0mgnn8l7wwi7mhaqanfsrkjwydm8m2gz";
+"ucdavisthesis.source-1.3"="nkag4al3xvv8xnns5gspsq1ix6bii31p";
+"ucsmonograph-1.1.0"="2kfx5jzqq1n8zag7rprl6s0y0hbkpxaj";
+"ucsmonograph.doc-1.1.0"="2b8qs6hgxkaavys7sz8srxrlyydgsh1x";
+"ucsmonograph.source-1.1.0"="ah1gxcmvgi6f6mw79fgfvaynapzn06vx";
+"ucthesis-3.2"="kbq1nnk6d3vk378kk5wcwpzh93y8xv08";
+"ucthesis.doc-3.2"="515r7ha1aq9f0zxlgiz2zv2aph460aad";
+"uestcthesis-1.1.0"="h0cz0i3vnalcc3i77qhb941yymg6bl2q";
+"uestcthesis.doc-1.1.0"="7w5wa8z24nrcsd9gfba6ixwq5wi4jp23";
+"uhhassignment-1.0"="0dv6x7f2zzvgqd104aak9j360pqwfy1r";
+"uhhassignment.doc-1.0"="c0impmampnwvrisg300yrmc4zh891r15";
+"uhhassignment.source-1.0"="59yahjzr20xn4j3lnjxf17dwr4vsyy1m";
+"uiucredborder-1.00"="qmpx3zbgnl6224cyigggmsp8a2vndjxv";
+"uiucredborder.doc-1.00"="vc4l9nvnvlfsn44vr48s4irjwaifg8wr";
+"uiucredborder.source-1.00"="l9b35lm36c8gnl1jd9mpxqk07j22b8d3";
+"uiucthesis-2.25"="62smailyn66fyhpdgrmjx0p9m0j0n12y";
+"uiucthesis.doc-2.25"="ygqpzgk5jslsnqa813k0l2nvw2j8gnwq";
+"uiucthesis.source-2.25"="lkq6bvdvm6ya5q5wp263zqkk7y4ig57a";
+"ulthese-4.4"="dlcv9nkbqjcxyb7fvcl8mg6nfsy1v93r";
+"ulthese.doc-4.4"="r04ssdfdkza8n6syri5r09b3x7d22m26";
+"ulthese.source-4.4"="x26g2kavc5jv5a3p5nrpsy6idvpmnmi0";
+"umbclegislation-2016-6-8"="wjkna9qn6g0w0axsgpa80vc8d8jsl94y";
+"umbclegislation.doc-2016-6-8"="44hd3iax5vblcr03xxgxccmbrf4y5sma";
+"umich-thesis-1.20"="mgwbc9lzd25w17fm9j2098r6y0q1k688";
+"umich-thesis.doc-1.20"="726jjvvq6ps0wxlrh74wnj9gjlqf2d8f";
+"umthesis-0.2"="xsgr2p3cw7q2gv7b2sr6xvcp186cvsy1";
+"umthesis.doc-0.2"="p64jg8jns4xp4y400hwbbbzz2wbpsmas";
+"unamth-template.doc-2.0"="jn6hykpgd53yn4px4rp9yk0sp688dqi8";
+"unamthesis-2.1"="jvpbqfbpvrzbvs67r0phdrkrvxxjjcyz";
+"unamthesis.doc-2.1"="jfqnn8prn8x9p68k70b64zd1759v92ak";
+"unitn-bimrep-2018"="s3x065jkvzazjx24an10jbwj47903gjl";
+"unitn-bimrep.doc-2018"="k2iakhx4fkiz9ckglr1pvnrqday0sbnp";
+"univie-ling-1.4"="bqwqh5rx8snds6pbwzvj7xs0d4c9lz3z";
+"univie-ling.doc-1.4"="i7y9kgq155k0g8p1g91birj4rad3cs0i";
+"unswcover-1.0"="5bqxws27nxyhgrlc6c9k9v5pm8jvdhzc";
+"unswcover.doc-1.0"="9c32r1x4094k8saz0w3bcbca28vgl3zj";
+"uothesis-2.5.6"="zbf8swc2haqsdr7sibm4lz9sqyhbfaqs";
+"uothesis.doc-2.5.6"="fa35vj968ywcnj2vcbszrajxi92sh4il";
+"uothesis.source-2.5.6"="ppxr7m777ymzzcl34i9qsil0z859wdxl";
+"uowthesis-1.0a"="g346f0s4phiqykd0n27hgy7f3vh9vp6l";
+"uowthesis.doc-1.0a"="h9g1mwp55hj3jsqmn0fmpjm95g4139rn";
+"uowthesistitlepage-3.0.1"="27sk8zllk19qflnr5am2r0cjrx4n89r2";
+"uowthesistitlepage.doc-3.0.1"="wyz7yz7j3jp1v2z5vildp8lb0li8786p";
+"urcls-2.0"="cijzaxab03vy218s758w4xb0r5vwb65s";
+"urcls.doc-2.0"="z4v3vq1gcr0cxx8ar4pcw03pk5n8mc7m";
+"uspatent-1.0"="lqv4zrqgwdhav1075ym1wp3cmy7r3ahw";
+"uspatent.doc-1.0"="0pa1qihx7vyc5lfkzr7bbakkphzmxp2p";
+"ut-thesis-2.1"="wz086qs6isll7wfa16yf154zqdbwz7zw";
+"ut-thesis.doc-2.1"="yqaa6h1yz1401ljb6wxnlz3rqmlr7fy0";
+"uwthesis-6.13"="1z7cpyrzcb9ga77d9a58jm9234w2zafy";
+"uwthesis.doc-6.13"="w30d568jxqqwdfbrpm8s1i7ylssiz3gc";
+"vancouver-2018"="2yp7l10k8yz7nr3nh9sj0ix8s9q79b5i";
+"vancouver.doc-2018"="gan4b1yrhwvqxnywn8rb6ckqvgv9m9m5";
+"wsemclassic-1.0.1"="8rl3dlv1f1vrklknkssldjnkgdwdcipd";
+"wsemclassic.doc-1.0.1"="n0wnf463jpcq8lbgk45h3924c4qm2r2z";
+"wsemclassic.source-1.0.1"="l4db45ax258zsrgvnw5gq0knflxx2nb5";
+"xcookybooky-1.5"="00gb5f064lmiwlhqz979cx5n8d2rxkad";
+"xcookybooky.doc-1.5"="02wq92szswqj8mj94drhgcpqw8px6j8a";
+"xcookybooky.source-1.5"="cky4lpad42pkh175nfddkz76nhl3q0bl";
+"xduthesis-1.00"="qxvczdxndgw1n1hxzrr5scvnrgcl3q3f";
+"xduthesis.doc-1.00"="a58xwk250qq99pyz4rj2br4dqfzhhmxv";
+"xduthesis.source-1.00"="nw0j5z9vd83a3idksbq2338j8ir01fr6";
+"yathesis-0.99t"="fgngqy9c9ss4ls1c27f4h6cfs24g9vh7";
+"yathesis.doc-0.99t"="8fpr4vy377s74xw5s7r3d5cs3bw6yhk3";
+"yathesis.source-0.99t"="ib3wkx9pdjhnazss99xhamd34296c6g7";
+"york-thesis-3.6"="rm9hh3b6cq902rr4crmv6c3z3ll2680b";
+"york-thesis.doc-3.6"="fa7z6lks54czsfd04igviykcij1h5lih";
+"york-thesis.source-3.6"="83mnkcdmb930lfh4130vcr82d5lp3f3h";
+"texworks.doc-2018"="gphjjma2ws68drzz6rmmj1hjb7bxc7ma";
+"arabxetex-1.2.1"="yfvy3m6rz45z7frgsw6cg8hk8kqdxfs4";
+"arabxetex.doc-1.2.1"="f8rpfy5hna1b6flvq6y2balxypjm6280";
+"arabxetex.source-1.2.1"="n7qncmdmzvkjxwn5d5nhwy3660ymvwx8";
+"awesomebox-0.2"="v9gkndyhdimy2lyl8bh846p8lb82zxbl";
+"awesomebox.doc-0.2"="gz6q7kp9rgk3ipjjs3m8y7zrqaf14wv5";
+"bidi-atbegshi-0.1"="qm4zcsccvzxixab9dalzvlwkniwckpjw";
+"bidi-atbegshi.doc-0.1"="lgp4qynjnz73qdhy543halrvx52gs2xj";
+"bidicontour-0.2"="dayiq858hr4ln8503y0xw8vqvfjjb91m";
+"bidicontour.doc-0.2"="mskxjm50p6r7zlfc40qbylycknyyr1x0";
+"bidipagegrid-0.2"="wipsldvij5v86c4hqw3afsxm2ydqsbwx";
+"bidipagegrid.doc-0.2"="57xmh27vfxi9ijr6rzv2d17vwk2pkdhb";
+"bidipresentation-0.3"="r3l1ac0kryn5mpx4029gwpaz2mjhj5ba";
+"bidipresentation.doc-0.3"="fvqx0rc6cn52lsi3adgllwp97mm5kr8y";
+"bidishadowtext-0.1"="fbx3svc7vx6f1kpvd4ws744gxp9gi6w6";
+"bidishadowtext.doc-0.1"="9amilyh1zz17z7x6hnhsvgvli0dp6mrf";
+"businesscard-qrcode-1.2"="9y9q6p5cnddbfdmjnyzrcy47hmaly538";
+"businesscard-qrcode.doc-1.2"="86l3021yvkp9sps2fiiv4073pzv8is33";
+"cqubeamer-1.0"="1ils8i2scbpka22n09ygmkwbx7d01sm2";
+"cqubeamer.doc-1.0"="ncgd5mcghdncvn1jdghrl263m9h1g85m";
+"fixlatvian-1a"="w8dpi3vx0iwfmq09h5gmqaia0a4nr94m";
+"fixlatvian.doc-1a"="nbnwr1icckqpsxdmmwa817a56zkfy17i";
+"fixlatvian.source-1a"="nvdlbmqyg7j8gx3cn48iqq5rmhcnncal";
+"font-change-xetex-2016.1"="qy2c5wdr14i5hhaxm764j3v6b4ycs6f1";
+"font-change-xetex.doc-2016.1"="ahkzrzvpc1syc7x3mm9jq02c1r75jqdr";
+"fontbook-0.2"="af0x6y47qcbfhzs3ngyazacn289x99y4";
+"fontbook.doc-0.2"="yvq7kxismw59wayzyv379hjd0kw048k2";
+"fontbook.source-0.2"="46vhgm8k7pxwxpb654fg3aj96555fanw";
+"fontwrap-2018"="ap8pwxj94larm8p1dngr1mhdavncplq6";
+"fontwrap.doc-2018"="p3m3czhwc1i2psby8dkm5zkpmzzkk91m";
+"interchar-0.2"="mphh4cmn49y1fr2klr1n5c2mjxryyjzm";
+"interchar.doc-0.2"="077lc5c3w5gq2cm2983fqlbhizjssgyy";
+"na-position-1.1"="gmc7vb0cp4c8qp4p99vpvpv0xxbgzhhq";
+"na-position.doc-1.1"="zwcm5ikxlaz2jla53nxbrfs3yva37m6g";
+"philokalia-1.2"="6lcrild0p9jahhgpc1xzz445hh2s1cxy";
+"philokalia.doc-1.2"="k1mn8vwlhrs9bwy87gx2zpn2viidlh0p";
+"philokalia.source-1.2"="80nd8ig65k3xjn92rv7n8g17qq0k4q7p";
+"ptext-1.1"="zy9vq5spxci68zhbfa947x5gmr90ckzf";
+"ptext.doc-1.1"="3dsbqbc9n66hhw8nk4l7rlcbfw5b9pvm";
+"quran-1.42a"="j2d2gj1wp8r7fxqmwp04b2vrl7vk631j";
+"quran.doc-1.42a"="jpfrkrsl73gsigli5rxqhzrp1njc61bh";
+"realscripts-0.3d"="h3nl45fx6790wmrfqgnxsy0v46i7gfmy";
+"realscripts.doc-0.3d"="4mm7a354ll0wca7q9nkazx29qbdah3ca";
+"realscripts.source-0.3d"="ngb2fqcmc4j1ijax0qrrdpf0g4587qb5";
+"simple-resume-cv-2018"="vjigpisca1m0lvq3rdc8148lc2in4zmh";
+"simple-resume-cv.doc-2018"="aaxl68aklgpv8996xzd0jgc5gw3859ar";
+"simple-thesis-dissertation-2018"="p1bspb2n9dc7zk0myww59v973rjshfy0";
+"simple-thesis-dissertation.doc-2018"="hrb22ycqxdy8ndw4x6ifl6jifswb7mgw";
+"ucharclasses-2.3.0"="ss0jlhd052vay3g42nys4mj4mcf5iqgn";
+"ucharclasses.doc-2.3.0"="v76523pb2c60ppcz26pywk8jzipshr9x";
+"unicode-bidi-0.01"="mix51h9rwgjic1g32jx0mv8hh574yn69";
+"unicode-bidi.doc-0.01"="8x4zk0spvhmq3sc8ygvidk03gfzm2875";
+"unisugar-0.92"="wfr974a1y4wzlbw0wwzfr6r0yp9nyasl";
+"unisugar.doc-0.92"="hcnqifbhpj44cwbr8sh4c71phg4i5327";
+"xebaposter-2.51"="glxmnnhjpy8wjab9avncl4v0wmdf0pv7";
+"xebaposter.doc-2.51"="sbpqsj7cqhhhs9gq8jia92hxrdgnhzkk";
+"xechangebar-1.0"="1f2zszj2l5mkqv5zs5bs8g5w4c8rirpv";
+"xechangebar.doc-1.0"="xbirklnxaljhxxghr1prqq7zb9l0mgzm";
+"xecjk-3.7.1"="mg55mr9bzw9kbfagrsbhrpcnl9gafqd7";
+"xecjk.doc-3.7.1"="f7cys2csrkap7qqy6b5cb2m57bq0havp";
+"xecjk.source-3.7.1"="7z4rrvr8ixmzjm9yhivsy5whcfx4wdhd";
+"xecolor-0.1"="pdybpn00rxsb5ipxx377a77xnmmf5i43";
+"xecolor.doc-0.1"="vl2lpda4kkr2q8gzj6ii2rjfccx6qvl0";
+"xecyr-1.1"="m8yhfaydf5s8357m1hkd2hv267zvwnax";
+"xecyr.doc-1.1"="pw3llm228dnfs7in0vajnf8skb99c9wv";
+"xeindex-0.3"="85d9z28381jg0jbkwrjrqlcifp23qsxh";
+"xeindex.doc-0.3"="7q7gxhy5zx11dmwvlfivg91v0gbp8pgw";
+"xesearch-2018"="0155d7ag68wpw66xqql0as3ldig0vx2s";
+"xesearch.doc-2018"="9nhi7api073chyc59c6i3wd6gvzmrm32";
+"xespotcolor-2.0a"="vsdrrcvm377salld5myd4aknid3phcvl";
+"xespotcolor.doc-2.0a"="mzibfcv18iwwwd71id0qajhk55kvnn39";
+"xespotcolor.source-2.0a"="lpc06f6qc8sff0jn78jsvmd43az18vgy";
+"xetex-itrans-4.2"="m9f0xqxgxpqsi5bml6mpgxvqjjpz1fkf";
+"xetex-itrans.doc-4.2"="nlixz1jqx1al7xks2bp723yl63whrhzh";
+"xetex-pstricks-2018"="4vaa9mkycwc7kwaxbzjfypk3xx7nyxqh";
+"xetex-pstricks.doc-2018"="lqs6hni0df78jwiy8k0hxzpwlpn0kfd0";
+"xetex-tibetan-0.1"="yzps4y2frsplnawgai9s9xb6vpk9h4zf";
+"xetex-tibetan.doc-0.1"="m49lmg8669bbir9hcj33clc2v811xdvb";
+"xetexfontinfo-2018"="jzx2is0hbcggma6s0pdzq21hcb5j8vgi";
+"xetexfontinfo.doc-2018"="h4i3q0c5rpbw8pssb7d6nyy7kqvkkj98";
+"xetexko-2.21"="xi7pi65x4bkjzrsfyqj8iwcmyh4fv726";
+"xetexko.doc-2.21"="flqfvmaajg0w96farbiwipyi59vf3ah8";
+"xevlna-1.1"="jwpjj1b3y45n3lksn9wvsh3hyccy1i00";
+"xevlna.doc-1.1"="4559f3ddvnis97px7180q0is9n4aqq2h";
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index d09bfade3bee..5c35627f6779 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -1,451 +1,452 @@
 tl: { # no indentation
 "12many" = {
   stripPrefix = 0;
-  sha512.run = "06c8c1fff8b025f6f55f8629af6e41a6dd695e13bbdfe8b78b678e9cb0cfa509826355f4ece20d8a99b49bcee3c5931b8d766f0fc3dae0d6a645303d487600b0";
-  sha512.doc = "884caef2a2131e1de1a1ef9663f9bce7a520ce7842eb55d905d64e65656e07de7865a4d182ee39782e8a2c1897d394367e93d74b26bc0f9bd8721e6e6e891ee0";
-  sha512.source = "8c1304f8443942302ae7b072e6b47d8933312c202ccc967eb7d2aabd6bf1ade337ba44569229ffdc6360667b697a2ed5c328354c4af41e484f71e6b9f7123433";
+  sha512.run = "400c4de374d02934965b5488f37c1b052ade07c2acfae957c9846390b2b78315c6aed2b533a2271bbacabd77c40536b63973bd42e2686f4c6d25d1f4c5b4709e";
+  sha512.doc = "2d959b52c8a636f1a72324b5c94e1bf150d00ced12493b8e58b005aa896c6f968dfa48d18abef253f09ebd123cf6b872253cb4962f26322d5f8648fe3a71840c";
+  sha512.source = "cb681167a26e813bb7d0cdc4769f5f2d4f5be629ec3bf564a36a53473a491f60702daee655e144fbac08b1361ef35342846e6e192b117f9ab76cfc37f74166a9";
   hasRunfiles = true;
   version = "0.3";
 };
 "2up" = {
   stripPrefix = 0;
-  sha512.run = "e52891317a58f1017a5822185862bbc84ca1039b1d247f281e5791233cbf11a400725cc1a76139d4bf34ff1bb274ce10193e1ea96ad058cc0cb361c33e286349";
-  sha512.doc = "d3ac2a2504fb7ab7668f47c53550bf24e2d5befb698f9276488f3285351cd3c47c95e894f6fc4febccb6dac2875cda22eaeac7931b388477e15ee85cf52aad52";
+  sha512.run = "e7ff5c56c25b1aee2a6bce971885bb9e63473e7c86f07137358becc478f5485af0d629305efc4e490be49ef00a15f7ceeec9df2c9237f8ee3a2e419587f44782";
+  sha512.doc = "ead6134de47576dddd7dda1085cf1cd07acc877530d918b66226d67cf5bd50bc5cc3a078519e5f3148dc1b131618b175a2ffb0b573632bc14ef44f63a3e0a665";
   hasRunfiles = true;
   version = "1.2";
 };
 "Asana-Math" = {
   stripPrefix = 0;
-  sha512.run = "eddbc8b3e9bb1c1eea2fed0650f14d4371f3014cac82a28452ccdf6accad44f04ef74ad353d5af8b2d2fba263e67798e2f7d1d31997c718b40564f1fcef0fd21";
-  sha512.doc = "3be871d4f9d094b750a4fb7c8eb0c7a72448370f59b9b0f80901c17dbf8fdd48d0d7fcffbb322b8ae3d6715bbe9f99eef719ccaf60909f0c3718fb19d12189f4";
+  sha512.run = "84d6ddd0e598a11ff30df3e0bfcf6bc0ada4e4d0585c0506cef557f697ee543d4279e2024d71e6812eeda746d6b979a36e9beba1e78774b37c7eff027d4285e7";
+  sha512.doc = "4386e190f68aaa8c11e6eefbc593a318b179b6592ec5bec8f72da5fee7c548057e4a9e09c98155b6d6796f08e1ee8fa4fc9676331332fdd0d377b49eb4ac1d88";
   hasRunfiles = true;
   version = "000.955";
 };
 "ESIEEcv" = {
   stripPrefix = 0;
-  sha512.run = "7ae7879ca7495e8548293f9479150c5060ac19d5a969f3a087bc89f4f58cbbdac7f14d2a27728dd8d0929f54ae1387b48ceb6227c459bb5cf59189b38a34b042";
-  sha512.doc = "d428f1a4cd29195f5da7e919b8b41a0e404416d3d9dd3dd5a43be1a327d8edc15fea88d1adeac5c3fcb8d3679aa4a09e54dec3f5aeae587fe1de56a5cef33705";
-  sha512.source = "e715841c3f883d98c0c9b006da2f21cc7f3247796f3b5b00af0670f621808fac507d9f8d17d96b01f241e6bb995cda0dab68f6ec5541db2387af40cd7ba94a44";
+  sha512.run = "7476dac2ca91327d11c23737479fc4265e7227b9518ab2d3499d0ba848cde85a91c1db83f0876a06f28bbe4168a7008b66d15de32e015f8b8e5c6fefb6a34a31";
+  sha512.doc = "aa272672706cf5af939f6341e0c7a0d1a0c48afd512e068819ff0dd767f42df8e662cba8ff34ed28513f2ef271f3a4968d5157006fe2b73c47989cb845c5e6d5";
+  sha512.source = "2b2ca74e8d3bf58f596a918b4787a1183b7afc78428ce1c7159bee5bcf9b2b6ef702449df4580e87058dbfa8e920e5aa17ad4e9dc6fe26abba0b47d1b84389f1";
   hasRunfiles = true;
 };
 "FAQ-en" = {
   stripPrefix = 0;
-  sha512.run = "96745089370efa3069d6d0701046f4f5df801fd435b9e7823c46498399da09ecbc21c1a36949578c807a5195a1418063370ffd3eb6795ef4f5ab60c2201653e8";
-  sha512.doc = "4854873a89d02d135256ca35a26093fa45e540306fcde2fef7e92cf12e5345000230784e7e6be1b1075e052a7f666edc49b5a5be5c2b9cfefa3c9dd4e507303b";
+  sha512.run = "c98c84b11cb234b7d51f5c9a031013809eb1098e2d72a672e866103d1b41e477a295be79099b8bdaac8c467406cd898f7f5962fe604bdf1125cf6f2166c9aca5";
+  sha512.doc = "bf93b4a044dc59221194dcee1d78208c509b532fb036ae4fc9f4370d538a3911fb6beacb6afdef249263e8eae2dda3b90b2fa86fb2e413d17defe38a9c4119be";
   version = "3.28";
 };
 "GS1" = {
   stripPrefix = 0;
-  sha512.run = "fc82691fbc0a0a19c8547bd1cdeace44c4b2fcbb41932f28da48b977dfcd7437d1013449c36de5c760cb31d8b4fe7c7d6c085fbe38f7717c9ac7e2aae45ba322";
-  sha512.doc = "ff702810b4d651ad7fd04d47a568aca9a8e08a93ed023aad20b6fce0a5dbd49ebd04fe2f05afd3f38d5051400347e72dcfa14eb6af8ef06b74044786c2ed3675";
-  sha512.source = "800cf3740b43fffcad175ed644cf6d8306fb38ca0c5b9b7d6237306037d143b1178bdfc5adfc0e262e53ef48b11b52e7cd602f18ac80663fc1604c6c528ff8fc";
+  sha512.run = "353d242edb0379e0af6fce8dcf9c9d03386272e937623acbb960101f2bb9a195908eeb649845f27bac8e5e8bf0fed00f41cff70b03202f0093981e9e4c3a8eee";
+  sha512.doc = "20c0226940fd057b921ef6871bd495178a7fe02e1a3af346f605676203c1226be4f21569666cdcd277f7448414b5e8a4cf68c8c31d08494e880f04ae7701663c";
+  sha512.source = "199ca3eb77153f7232cb5ce8d0dc733d43f6ca4449f83b773bc7643d93561b18be2bfe5e908be5cb60ff03c9dbbc2ab4c0d9ccf733e73f1c9585edfc99991fe5";
   hasRunfiles = true;
   version = "22";
 };
 "HA-prosper" = {
   stripPrefix = 0;
-  sha512.run = "4d9247414c7b170f330a6cab81f689b07f92f2cb1a7a0e241286f1a2122f82e4bdbd94102199ce175197fe9dc77ffd3d46839a9aa1c5b7b8ac2879997987790b";
-  sha512.doc = "b4f627e9e5c98547a90830435949e8b409b00b00301289aec4086e93bdcb5d3a42b1daf3004414fa93feb71d6ae9f2f2e7b008338d498d59c4bb3254680f12e3";
-  sha512.source = "bd5028adc611898c266b2c2f302200917ce03d6ef839b3d7eb8857612ba68a2eea62d3727c254f58acc20afcba2b6b92230df3b0e34db088343e08b506abd6f5";
+  sha512.run = "90c5ac57e11997c7ef9946e33c209500d368568eec5174ef681fe64eee7906dc1614099922286fe32893e75398b9451d6e0c38e7f1b88116d0338d74f58607ef";
+  sha512.doc = "6ac2f4aabbba5326bb76d602fddf50dd7577845047dde64a23596ed6ef3433ce07a0abcabfbc3a5a86b9a0738101619e8108660bb1ecb0d9196834ca62515fa1";
+  sha512.source = "ba1ccb49b0341425b7916adb395bf097ed02b840f802cac59e9902242196c3f394e7a6367c376716e098cb8dfa1f78cb36dd5cfdf282ec6cdd326fcf2d2a8051";
   hasRunfiles = true;
   version = "4.21";
 };
 "IEEEconf" = {
   stripPrefix = 0;
-  sha512.run = "987f7459c317cbefccff416f8b0aafa997cf246d21fc38d327705034dfabfd1903a23e42b93492b9230205d7868968fa48ab9669d78d3361bd7554a69d384e39";
-  sha512.doc = "fcb98af9ad5e66f887d1cb10db30a9cae0df9e30823b49f9363647b40ae877dcdded83f248b19c49d894c6fe90a8e29169ec8267165a92d03b1c0f537e79e7a0";
-  sha512.source = "4a21331c7bcbe09be1bbff56c96ef389c77dc7ccf05670c1af7bd52b2757c90f611e6066eb6de4bd2a2f10f7053a5acb3cedea4e0f2a90f55d3912e7b5302ebf";
+  sha512.run = "71cf1c1865fd2844b174399a66e104685a335779f262439bed21e93069f005139746a8c0e1ab741e3b6dd0bfe02a6782e24151c0493b53b03a126dfab69a4713";
+  sha512.doc = "17235ed47913b213b52abe241e93ebf8206e0e9bd6390bb1e1c1c757f41a03f6f6b3c1c19df05d8ce2cc3102c1304d0cef6c11926f2f0ac64f4dba95f3054acc";
+  sha512.source = "47ecf7781579e77f39ef7c7b737e672f27e49c93b0f4c83a45c9f52562d410e00584422f7f40f0da4cf9d259f92d3e8992cee717886ad2cb4cbdc72849476b14";
   hasRunfiles = true;
   version = "1.4";
 };
 "IEEEtran" = {
   stripPrefix = 0;
-  sha512.run = "df03dadaacc0095f4d3ed2d99fa2a83c016ef5d4a15e796e00bb59e3bf5cdb2d0a2f730c994a27a3dcdad0a2055214db69495c813d21208b7c54bee948a188e0";
-  sha512.doc = "8ebe61d4918f2c4e191a1e783b6d63b71fa28ba4ba7e4f4332b0aace0904bc8b18461d4b766ba9159bf53921b2744f531b212feafe196c9977cf06e3ac712b91";
+  sha512.run = "f18cd628213553ac5ede282409e529c38a6fb2caaa5b09b37f145e2a8b7101a8bfe8ad7e70cb119b41045cf6cec3169ec862484f402017536045eba5b5c74f9b";
+  sha512.doc = "b6ec01292fef6e3000f57b9ee482654c5f421cfea479bedc20a8ffd668c5d04a75d7d86868a040d62361e12e7694d0e3a6d1897f592023aeb6579e10fd7c23bf";
   hasRunfiles = true;
   version = "1.8b";
 };
 "MemoirChapStyles" = {
   stripPrefix = 0;
-  sha512.run = "027d0d732fd8c41dd446fcc63930359b14dab2354cd557c07cd58c824e18ef04c3524dc752a0895c41f54b032836a1f22c78f1517b90fb4c50140f55208ce6e6";
-  sha512.doc = "24fc346c3393b92675c5943e8cd677d2110bdee39d455152fbc865fe20462ec3b07f2c72ca326e521d45fe0fd910ac8a88332a85b2e27733ad0a250553954cc1";
+  sha512.run = "143b0f66d4801eccee51a561cd7b4813553483a367900c2898d48a127cd032de87968cb53b6610c89ff4df005efd0624c502d8c78c4e0d630a50573da6ebe470";
+  sha512.doc = "ff3b7ead446cd0e8529e41c6248f124f5695fad04816977fffb83d3a1ef8a800a357927b1ab3303819e8a8c230bb26965f3d1eff0dec7a4c041ac19e66dfd1b5";
   version = "1.7e";
 };
 "SIstyle" = {
   stripPrefix = 0;
-  sha512.run = "3018aa3f46ddabb5a90b4362fbb4ddab131a4fc0048497c343b61f9ea7624cefd022da306f006dd2d44c2ae0a957fdafab8dfab645dc74ebb0e765e429ae2faa";
-  sha512.doc = "da9b7631a25b23b0d6a5f100a8aaa933094b0a0c3646cf1ab49054dc2fc0b443cd6665e340299c1c85dbeec429c88ce56755ee64da93f8ef3bf6f3b660e6fab0";
-  sha512.source = "9c6f3d9baab293759afea94d0393e60eac75b2c52090a54df0e079f7624bad0f5e5b28753c5d48c451187ab88c4e81bba78b819bc9ecb9b857601145072d7e55";
+  sha512.run = "ef064c140f4c3cb71ead2e3fc0a9a787a4a454725c67c25fa26b2bdca2772198b7e7b026cd6533cd3d41a1d81919727386d4c1cbd394168c7fba152c17ee1fe0";
+  sha512.doc = "ebf6b9f40371a78b61292bb42ddf1fd0d01c178d7eb0b87aab13d94af96eac00de0045ce7ed69521b0d9fde03cb6664d2bfedde2adafd7b2c21eee2d542fd180";
+  sha512.source = "17dc56f252b4ae6025177747bafe6cc4453b69cea747834914693b372cad0b60d4b9e58e16bd8b50332d6d23f6eb1c628541161959f90ff24751386b0275a171";
   hasRunfiles = true;
   version = "2.3a";
 };
 "SIunits" = {
   stripPrefix = 0;
-  sha512.run = "b578b31a610fa9cf2847439e52a9a26e87b3ffe214104a7f69bd6ab9793ed5a592d5eeee5575120547d30bf5ebbcd64057dad7e0c43ee6dbe223c2646342cbd2";
-  sha512.doc = "50f3ddd311e2576d2f22ba13c5b2f5b97cb79285143939e0c6e142c0f6f40390542a0935270c47b344abb9a31afb148f50e661c0031eb82ccf1257718c3c8fbf";
-  sha512.source = "b7d28b0b2b4c78cb8ea588c0a0b0134556f0bbd3f31e948fcd0b13e8ac74e625105e16347df515a8665b9e85caa47728544b717b6945b4b1af993dcee6c9a0d5";
+  sha512.run = "f82c11278447de91742353575da84c955307b245dbfd44b0b54b24dbfa8b870f682971ef57efac44d150f84e0491c4bed1ef7484ca171a29b579a9fbd9f55b64";
+  sha512.doc = "1e9fe6bab2bc93db0fab3af91199b278e857b286803859a27caffa7c7c305f08210b11710f93a694dfe7a10a0eb66bcf13742c75539cd2e7b54af4f30f495f77";
+  sha512.source = "8ba4d7b440ce99ba0496bb13da1a3da89d8cadad1f53ed70895bc1a61efc1288c3e96fcb2cf074cc9235cccf7d5bf12d964e25fb5fd6a63c8c913dd52ee383d5";
   hasRunfiles = true;
   version = "1.36";
 };
 "Tabbing" = {
   stripPrefix = 0;
-  sha512.run = "a5d396d3ed9768735e74adfa96d313aa4cd3ba5505e2705d34b0c1570c66b4311cd6da330b09712a3e7217abb11672bfffc8ba71dec6d114a9c2b6acedcc7c8b";
-  sha512.doc = "0da2cc841d9c95c515cfa773079e8aa44c133a8645ffd551bafde4e3a48d67e9dd2840b221a84494af73d9b9bceb2143605dffedcaee353d3bb1dfde5b8cc1f2";
-  sha512.source = "6fb89e6792023255123be6e7a19157cded0803a182f3915ba2674aad0616cc0843acdc2c8336336100e175fc00aaa9cae6cad0e8085bc07174d8df738ceeb09d";
+  sha512.run = "3100d39961501a8de334b2438c37d8e67eecc7e5e4c309e78efd76d0f94ff4b5d0358780ea2e674a9d7a79ead0de370bcb02d62c137b420a9629db4e699b8fa5";
+  sha512.doc = "783e833b99c0c928cc539105b91795090303c626f6ba21a035e2bfa744fb007c94a9a21a8677b4085a924a825fed3dae30fc0b994d2c00c9a410b1ef2c148301";
+  sha512.source = "09ae2782e7aa169060e710e7d24425d5f913f03cedb81c0b231744324b1c820c37b4e67799bb7bbc13907de229d163e70733788d20eac5f48be1e6378680035a";
   hasRunfiles = true;
 };
 "Type1fonts" = {
   stripPrefix = 0;
-  sha512.run = "c54406b383d3cf171f85b601ba4e4fff22717750f356853504683e5cd054b13a2d66597bcf07a2edfa173fb2d36ef9dae621a950e3249390089c7a7525eb78fa";
-  sha512.doc = "95571958c747ab7cadb3e36858bf1f6548180e479e5a85e84adb82a5bbc18a65957ed327e65e3915962adcd2ecea3da030e59ad7f61b30770b51103ca31967ee";
+  sha512.run = "89255f3388f0413b488d2245167b5ad94cc5f1245fc67e57c718c809129b6831896979edfe8ab1c022fdbcb1f32b6881c281bf06dfda9254419c546677a72718";
+  sha512.doc = "69dc7375424de9f884ea7bfa230f626bc8b0c49f00043aeca6d9f1057ca5bc5e442c94051d1ce2b89b9734d35adc45c11280d779d9ddffa2d98af6a318297cf2";
   version = "2.14";
 };
 "a0poster" = {
   stripPrefix = 0;
-  sha512.run = "ae64c50c9fd2960f8cf0d0d2d97dc4fb9e4030364c7a7604002e390bcf7244c7221355817bfbfa25cdedff70d5457a8bd113f78ba310500960e867ba3fba8d10";
-  sha512.doc = "fd28b619268701ecc7ab68bf52040988539da91afb76c750d454354d5bf46e076ac87a91640cf5d1eef6fac3609e982d3c6a1667f29cdb16b265b27c5814f75d";
+  sha512.run = "ee50d613ab884611a263e854f16a42bd3c31d9ff7ec8d9f180c3d6ab10e336f15eeb248daa5d68c60b56bc25fb7783ccc7bd581b4da3576da72b00f6814bab2a";
+  sha512.doc = "2f6ecc701483110f1806bd4a5353ae928352be33832eca18c1d66cbfacb1dabf283644d89ad0841e7d809c621dffe463e58e5a0a611cee3e605bc36135600a13";
   hasRunfiles = true;
   version = "1.22b";
 };
 "a2ping" = {
-  sha512.run = "0d4f90f9bd769b4bb7314abf968364455491e07c2f66e5689efc08d2b6a0f6bd1caf15ec976aeb11c963fab65c3017e88a43ae175f736861b48967933deb4e8a";
-  sha512.doc = "3e4850f5df6a9ccf4fbdd25b4a652f0d2dab75e53c1ea7c5f2cacfa41dc28f202eefc3a83fa0472facfbc99e6dd9568aee51d90dfa47a2334f8c321e1cacbe86";
+  sha512.run = "f6570f81a87ecf8e93996685843752737743809bd80294a819f75ac0a0e733fbfa4645b2b88996c9d0ecc620c9452156d2d504b6fde6b648c9413159385b9cad";
+  sha512.doc = "f1db97d31fafb446d81f17498f5acfec931754e7282be9e1d6d7acbef8d4fc2938d385442d45fa955208d389ab5813e25702e9f5d3bca8eb0d8d5fe5104695ec";
   hasRunfiles = true;
+  version = "2.83p";
 };
 "a4wide" = {
   stripPrefix = 0;
-  sha512.run = "144b0190c9b0a6b42e6142640e6694d8ad1a0dab0b068bc4c64b7aeff907e654983cdcb02229ff8f342cd247049582597df8dfaeaf59137206791a079e8b5b19";
-  sha512.doc = "fe2416bdadb8bf5a480673573d6e8c71f5cf26992d778cf423c44db693d5e5a2d9724e403d41550cbf343d848bbd7d5f71a667ac369707f4eabaf81ef10161aa";
+  sha512.run = "2d397de87107b8a6488ba16c11a339a2c0b0a452601acc5543ab6342441a1494b894236581b0cf1585a08a596ddfad22403a7d69eab5845b47b724c108449df8";
+  sha512.doc = "6bd5498f18e83eff3ca4f3b88d7cc4ae111cb5f1ebf2cdedf51783e51ae9f99a45eec7ecd3d8f8ca8ac8fbb075b452bf2a782e82ce6f6baf4b8082ed13dd2ef3";
   hasRunfiles = true;
 };
 "a5comb" = {
   stripPrefix = 0;
-  sha512.run = "ec543ec572d138761ef7ef306f2e1afb72219a74fb6526c4a04d359b43d9e77968075f8ebc0649482e5150587d391cf01235eb08a5aeb709fd7d30d4164376c8";
-  sha512.doc = "66891ae00a4410afdce5e1699e6c189fce720378e18863ff5794b0617f9baaeee654f1627b011e3dcbc850672c5c860fdc5438382a592e0b6313bf7db834d55e";
+  sha512.run = "6937bb7c1bd36b18a24fab2a3e5668e09bde9731e384eb6a464686994d7baa428480be79efdb96369261a5c1e399184a70955c7aa62a88e876cda204125f16fd";
+  sha512.doc = "65e076bffeeb64cf048261ad4806eb4233e067ec29010c435c48b0d0824dcd533525fcbb0af3dbac6b3a63bf13da43564a24bd6be56b24054073a7656534c0e6";
   hasRunfiles = true;
   version = "4";
 };
 "aastex" = {
   stripPrefix = 0;
-  sha512.run = "0f34cb45c59f08a2841796ce980fa9462da73a862b27dcf0af96fb02a2eb79952e5a7662e3aac0123aa3c6380440023f91d0fae31e71ae9948e6651c931e2690";
-  sha512.doc = "91f93ffc77b00faf4574868926504ffd840104f34c27060a3e1870d4488b05c2037dcfe1c34d4604e8634a58d64a33ba5a5c6d2872a6a734c4b4cdf931b9aea7";
+  sha512.run = "03c1bfe72cd452542c114db9d3c388ef338a8722d78fff6b9369c2d8a43b057babf01e25f0c9e5908c14762a8d7717586b05a02b8446d098ec5b7885144e4ac2";
+  sha512.doc = "8e0afa427a7b7b3f88b2edb1b25456670e7c9b9f9e478439c93ce0689680290e497b41c392f1aab12687c0498b74f15e406418b99d49850774cfcbadb3888471";
   hasRunfiles = true;
-  version = "6.0";
+  version = "6.2";
 };
 "abbr" = {
   stripPrefix = 0;
-  sha512.run = "920ebf756da92ea7d32b058b8be8fb101860a23ad35964b908096018279c32ec0782d19e1dd67407675fb225e4fc7a490597e4652a14383c116a6953b160ec53";
-  sha512.doc = "1023bb95a0a69aa5c9f5cfbccdf72dad6e665dd9850079c78eb2ac8a98c809416307309c16772cd1231aa9780b136cf2c02d3869649f5133895983fa040d6f01";
+  sha512.run = "314461929fe072b426700a4c73f1a123ed9f0dab9ab415f34433582f19314dbd70dfef9b26628fb6220f8be97990417a1e40cf439033e422876b55d565fac3eb";
+  sha512.doc = "be2b78976ca53d9c8d3b0ac56e2e2fab14b09a0e67f64c9fd243cadda768193314925b16a278911aea40c74978676a40434027e99b7d674596ce1241f27a677f";
   hasRunfiles = true;
 };
 "abc" = {
   stripPrefix = 0;
-  sha512.run = "c1b05cc635ef4271bef1568197b026b1572a2abfda9315825c644b3ffb1f380eab439d807a244aa3ec2fa93ff2ec2b1483edf0ba0384001193ebb77727de3edd";
-  sha512.doc = "c435832d41b23f052b3b591d03c0cceeb5639ffb347761107717d871882fe116e3da55a17eac57f6edf2e866c816dc0c1ade4328a75c33b558f060c450394937";
-  sha512.source = "7652fa7169f813c286397211e7e4d0631bc79b07f4c0a80bd70c32267a311305af83f5ba5e7f87eca5c4cd8f223c831080fc50ac0ed6ff7c7803ce375fa3ccba";
+  sha512.run = "ed8a2f56e8f02bef2875a7b90eaebc7e70764c1feab945cdb6c1521be16e9f63d6d830bec57cccfef7b02edc1958f9ee48957a5f5b0e34c091c4c020bb2a69bb";
+  sha512.doc = "1b641a4b56ccf02c8f0db3a169f1c734a56dc28c09303f9d49604bb1c53f5f1283850542af8233149fc9bf4269b8e10b5921b7b06a3440d32c044a80092d637e";
+  sha512.source = "b5ca042547ee5df312c25c0927a64bb2927c9edfbe40264b02b5d06174ee7c2eb7e20bbfe86d027bfc3290f214b9cab0f5f31924e24f31efe31240b6d70ea85e";
   hasRunfiles = true;
   version = "2.0b";
 };
 "abnt" = {
   stripPrefix = 0;
-  sha512.run = "0d5754965b693a50dff9ec956e137e831ff0bfa847473b019d2be5fdcf68fbf3ea7ad3d987da59ca24090afe99fd0757303cd98e4787c82ad3db53fb5ea4b1b4";
-  sha512.doc = "6d49d9ba0463f977e1fa6aa905598f795a944e477684fe94e7287845782d9bde2e877715f5daeaa4d0dd28fc4b49b6b295b1aafff6c5a26c6990465d9117f59e";
+  sha512.run = "6b2007e2f6371717b54247348eee64eac17dcecc95e066d44e34ea61dfabcadbf0d4037585ce30b12b8977e2a40c0f3cefb45f7867330ff37a5f7d7676ba5d07";
+  sha512.doc = "8067f473580e57fb9d4786bd29a4a6edc564f1154a59186b9eec9c6e7edd3183432075efaf7af45cded4c8a2393a4307e4a2756acb4e7950851bb562aa8d988c";
   hasRunfiles = true;
 };
 "abntex2" = {
   stripPrefix = 0;
-  sha512.run = "b032066be81c03799567a14d10e30d3768f2c8a605493708e65541582c968ed644a773473690f9a86bc26271482a0a487f7412722775a1527e68e55f0b86e7a6";
-  sha512.doc = "8bb3810d9b522dfe6f71d825cf95c830a5b343887d0d8582c18d33a561842d6e8859fc4903f85c93423f28ce927e83f9f88bfb32b3993a1057a1d086666cfef9";
+  sha512.run = "2bb70956abef68e7d86788ac22bafe7857afd73256654b0c80a5d31198a20839e3d9c83e192c9612b4cf675fad81f5085fac4b257b056e14f32c28af680ae90a";
+  sha512.doc = "7a2c141b5336bc2558e45aa2e0c3e0e644da94a89bde6ab33a3100141fe43550470a62e4c0aef3daeb594ea4b19d1ef0c1bdb61c4b6bb623e02885ab747be549";
   hasRunfiles = true;
   version = "1.9.6";
 };
 "abraces" = {
   stripPrefix = 0;
-  sha512.run = "9d7753b3a81a6de4e1d78589d835a50a3740257131b14d2de9181f66efea538b2af074e37a30251c849052fbd0f5577d12113ee0ae07ef2ca6030ea9c77f1031";
-  sha512.doc = "942968c6e42bf99bf17d4d8aaf159a8925a481243690349a284560b7c3318e4ef5051e6d6840e162ecc85e9762782bed4a2b70db8c5ebf86b26e399b7b3570f7";
+  sha512.run = "f1cea8911586725831da78c7bd4bd899d320438af1a3793265cdb5502973df5cbefe096b21673ecd0ae4008d687d2dfb8c6f5821a9cddccc57efdef24c4f4082";
+  sha512.doc = "43e4588ec9132de7de88c7e538f2c4797929c5a6202080682b26bd008638497a1aa8ff111f0963550763eb1d6bfbbaa44ea5f8381515025ca6b1e7368dd8869f";
   hasRunfiles = true;
   version = "1.-";
 };
 "abstract" = {
   stripPrefix = 0;
-  sha512.run = "419cc9d6414d3a58dd74fe7bcbd6bb82ddadfb2d3231e8736c8847cbf2c8cb8731b5fce169d4d486e5d9433798d699cdd91b814397da890ddc78f98019c6a831";
-  sha512.doc = "1a8fd22f252eff371d706feefd53241193596093a8f12b2dd53bda691099f727e75f68e429a8d7b32122fec05465521a8bc26442330c6029aa419c373de82a9b";
-  sha512.source = "aa3ed16a7ec24e6787601b166074cc06c928b1ba5aa50de415bd0615ae299f8b4a446b1b70970c9a259daffd648e5952a8c0201ab964d30878256f5f4bd0e854";
+  sha512.run = "f793a7b5e51b588cdaab8565bf14c39848d44e7d085ddc6ecc5fdd6bc9ae0fafb5cec3c98a0ac5657e741d6f92fffa8fb53e7a371a657eea7c04dcece530677f";
+  sha512.doc = "a56de87bb9ca72201ef854935d49dfe9d855636573ef37366e679748cd7d9f0a65e6c7629af332f764c6afd811875f5d65e0472440ce233b5fa4ffd990c67d8a";
+  sha512.source = "38f9685facc7c14c2c0387894aeee66d32d4fa351337628b5b222afbe3dde5783ff47a0755f69d52426bd0d3a6b74ed0e87d9fdc20ea68c8f9156e73aac309bb";
   hasRunfiles = true;
   version = "1.2a";
 };
 "abstyles" = {
   stripPrefix = 0;
-  sha512.run = "d770685a1027bd7934236e6b02a7fbbdd360b235615d53df1d03730355dc509ed867c93504d073e2c123db3b9c94bb2d8b307c8c82207b25ba0988ec991efdac";
-  sha512.doc = "c947863543cb4e75469ae14c4392a7af5bf9e2edf88c0e6b702ecad11d40e3c36d5fc6a96344173319d59bda3920af74df817e2bf10322306ea3bbab04457166";
+  sha512.run = "c74147665d96894578117d4622bff3267162dc241132004068b2b143785c9741f537a57cb5e700d7204293e71414e7e162eaf89253970910e3aa9283b7b0f42b";
+  sha512.doc = "bc59a02f0a348aced95cd3830f9c89860f284fb654727b39e8aed2b0c7f3cdb7136c6644c55be92cd2707018ed0b0f95835d2bd010422a503cfc150a6463d51b";
   hasRunfiles = true;
 };
 "academicons" = {
   stripPrefix = 0;
-  sha512.run = "936acc69013f54a690d5740218b08ae5ba5bb993bbca01a6be33f88974d669ca8b3ba96c914d06562616258c415cbe2687568ffc8ae81e6bc4c1c116613cf4b9";
-  sha512.doc = "05cee6973727197bb953a98d156a7902b0215e2d1aa640d42ac9551df18c76b8f8f953d3ab6f1f781288f6e4f9fb1a1844da66e508ab78031f49c2511b33f77b";
+  sha512.run = "f23056755a69d7577278c5a7784387af6c5f1699dc2b20530e0c5a24e42c3b3e855ac0d85de0632b031013c46c3bc77b5499e83c97dad91ab1aec0448768c872";
+  sha512.doc = "94371d410b3a064fcdcbabade35218a0b1da6dd0c266f855273048b7dc4facd85ea158d791ec54814267c3af133bbd0443a2ac1262678e690722e1896093c1d8";
   hasRunfiles = true;
-  version = "1.8.0";
+  version = "1.8.6-2";
 };
 "accanthis" = {
   stripPrefix = 0;
-  sha512.run = "819afe1b0bba7370bb75caf4b2fc526074b04ed3150099c7a7717dfe22387de419a680060030fcf0efb5e0e5b1bb2000aeafd05c4bb9fd5c5eab4d469b9dcc53";
-  sha512.doc = "0079dee9679464ebfb6d78e33aba6f27aa470487500127d4b0846278db255f8ff1f85c9fd630bd13f1c0ed7252167b2cf694df9c1e80749a8b980069dac64fb7";
+  sha512.run = "22de40e0d3b39d0892824ad41cea2f9065ed7067977d59c5b14c26c82bcb76dd6679cf01edad7f8853b9af13ea5344f9632eaafa54f225f19534091f2d390968";
+  sha512.doc = "a0b9054078d2452c93e0ad20f4e4bba5e3e2e47b5676e2dda70bda9008f6a6135460d5d4be1eff3848432132dfbc9818310c74a75e53c423a2098febb6df875c";
   hasRunfiles = true;
 };
 "accfonts" = {
-  sha512.run = "112ada9d58665c7c493b49d6b85ac5efa182034cf257dae8bf70a0e17dce92e6f5cae799b5afb379e17c2ee62df40d5d29fef21f99dc5512af0fdbbebe8ffdfc";
-  sha512.doc = "e88b8accf85aced9cc135a749078b690795c5d79bbeb55b5cea858c3f986d12e9381b099953552fe12dac7729b9d9aff43b8ad96802388cf9391eb879831c820";
+  sha512.run = "a985a0bbdde6aa837ed1b02b23166f393fd33ad536a6efe3c6c42f681ebaa4b83ed29da4e21d53eb8bf3c2d0f8dc7f817498b44dc3409bd0ad761e1178275643";
+  sha512.doc = "c7aad3379cb789eaea0ec4944542edf67da32ae9190e6ce50c62c011d68a9d70e8c18affe7043ffae1df861bcc868fd97ae1eed50b56d54b18e1f378d519140d";
   hasRunfiles = true;
   version = "0.25";
 };
 "achemso" = {
   stripPrefix = 0;
-  sha512.run = "0013cc836f58fd82f603868b2fda4780070a0d64601a7bbcb96ce9fe253e1af0ba25eaf00947b1943544abd0030506c1b4d2ba35fdedbd9a83b8f7123e3129b0";
-  sha512.doc = "a2f6b11b13d482e567fea584a8e506457cdf03985c05b9e1297dd2f570817b557d6297890f74c896fbaf0afb370c21cf5e85047ef1b2e5b3681b7ea8eb344ce9";
-  sha512.source = "9ca2a9304f64c4a6856291e0e8fe3e05184e81997542a7aeb89a39a80a0f1fc987032aff6ec63e869d0039c471024bffd7c34ae262b1ea057cf54c3764586084";
+  sha512.run = "8d844e3de3395be9890b917dcf6ba1bd883fa6957ea321ceeb89c6365ad4d31bb8ed16accbd4ce69cc1f023f7ac7c4c28478815be0e211a134ef70e5ba5cbe5b";
+  sha512.doc = "f7027bfd1a5b8c1ed8ebbd145a78fc5b2f709d32ba22918ae6afb8d4b467a0ecf7e60ec965a81c5e1f6b9b6fe1b82c269f3347f321812835cd81c12626c0e533";
+  sha512.source = "e5c708e4d0b888b6862afa3169be0299cc9d024fb5ce7c5f3fcc5b8fa71706bb5c6dc58f4bf765336d44d6464b3c91687e77a9b3e2af5ab6ae01f3eb7bbdf6f9";
   hasRunfiles = true;
-  version = "3.11a";
+  version = "3.11b";
 };
 "acmart" = {
   stripPrefix = 0;
-  sha512.run = "d20ae8c49a23f90832a4e5ec7c436233f1d8ac6ec4ee03b48f6e1456dacee9000a32e2064e8760313052c83f2de72ea74db916f4566c4ef22c71807dc496bdba";
-  sha512.doc = "31d8e98a0a09e8a34f35a0da0dcb1468836c7fa7b8a09b0c9c44efe42fa5096796a2a8f72f491a2aca3c3827ee90854276b0b8bb1374840b90d76d5898677ec9";
-  sha512.source = "6034fecb2ad19a474444017f0d71c5cf40f133dedac1ee367077a33e0c07a04b740011911b32f59d4fc1922d962edb57550332c28ff0cc8e19fa1caa67e76711";
+  sha512.run = "9f8df569cda289f739c1b958b51fd769b5ea0b48757033f6d7864344a0f16b97d158b502b3f055c96c1b0d2c257eecd73ad6fa65693bce41dbe9e7d7660d3375";
+  sha512.doc = "7e86d8aa304970b5d7ed565ca1346bba3487b7e026f877df36edc1775083748a9d590180e568341c0f0fa8a4c3510c77135c551f010c8a3c51d605b5ec45b98e";
+  sha512.source = "1c9af22a2b0a7448c01839b3f063692a4b5a88cefe808d55cfa442f05ac7faa1ed9edde5ae7f490915100ac3f05160b58e5279c77f1247c67042c20e1daba879";
   hasRunfiles = true;
-  version = "1.50";
+  version = "1.54";
 };
 "acmconf" = {
   stripPrefix = 0;
-  sha512.run = "d636bdd29309d7245a95960abd5cda09a833da16ae2f86714b5f7f464903279cb6c6d769db44c1396472c1be706151844a3406b6bf5769bf93490fcc1e964177";
-  sha512.doc = "6f7b52123e96fcc8b9a01ad65850dd3b3addecf02854059e3aade0a7356970a353517168427c12caab041630cb5edb1c248471c456e2c9d782ab68cb995da399";
-  sha512.source = "b6a0a4e171870ff7df1c33dd958c94dc27a1a2e01f03d66dba04fdfbc92c8c6eb9bc1c16a9aa2b640d6fca3b8795b3b2020d10aacdf321d8a6d245654456d0b0";
+  sha512.run = "6e27169556b062f24c1e18f387ac87e545b193d00d9ce84343a087b9fba4a8cc166ebee20f52a72df1709fba30c9f04865ad751e332eaa1d10e682674fed87b5";
+  sha512.doc = "a1ccfc2fd4c954d37e5e45bd2ea25812bf53cf233d2536498affb795b7065f65dd91099159a09ba180c6d3d884b3a90bfa83d2845ece779f057372a6cc6e39cc";
+  sha512.source = "550987b618ba42e052a80478253cc4f7813122164f5257cc954c65f51d86e2a284cc6c5c28691385bf054a7e93de9f6af6d0ae8b6417815cab6ba0d769f3ae1e";
   hasRunfiles = true;
   version = "1.3";
 };
 "acro" = {
   stripPrefix = 0;
-  sha512.run = "cf5bf057e43d563fd3519f5c884666a63841c6314c3db1a8206b1b51ce2ae3399527077f55b9832685ee5f23d60008b3ba9c8675398ea3542cc1fa103da212e7";
-  sha512.doc = "144eb134db3d24c675688719e18a9c837e8de80e537a170f4b155ce0c9337ac88fd546a7bd8eb0ac3897bb44d882785e5b5297e8c36e2600c1f51dd36accfec5";
+  sha512.run = "4ad7fc8f78658d4d58bdde1cac67d88a5d860aed57d51251d7b0fd1fbbd382f5d81ace0b759f3461bc2882a0933b2c794bc121a0862821ab48a25ff271b53269";
+  sha512.doc = "4a88e27d2eb211c9a8decd1ed417d39dc4fab82216064dce6d2fb134c3d21cbfe1cc6c8ec24d924324d2eebdde82adbd706b6d6a40c466140cfca38005c92b6a";
   hasRunfiles = true;
   version = "2.8";
 };
 "acronym" = {
   stripPrefix = 0;
-  sha512.run = "f220844b39ac391a5e3a6afd63ea4e8791b4517cdfd760f724e2d072e8fe8edf907c4eb92bce211ab768f8d5839faf3093284e2328889f6c754da004a85f1668";
-  sha512.doc = "8007d586ef44a4d2853d96b30b5fc4ea9af62fabf49352f923758b0880940c8d2e4168cace476a226a4ab7cf713a3fe2dc80e9cccac95afeaacc215acef393a6";
-  sha512.source = "d6cd02a3d306c58eea64f6f8bac0349af841d24eeddea7c4b6cc3bf3a809c02dc3e5649233d63f996adf99c4e44cd4faef31fef88433ce6944170bd4648e82c6";
+  sha512.run = "e877ed2525464b2be1879faf8c2ccd3f2bcfa6b978c988efce3b8f4b84fe8dbe2c79797b458dbb7570e44fe3d6e37d6932771a3565ada4bc42677c4d220312e9";
+  sha512.doc = "26112b4b836181c98d744b8c7e95dec34d75314a3a889703e76624748611cdaaa090d7cf91d5b58d8301ae00a87359181086d9abe9a9b5e545788b31486e71c6";
+  sha512.source = "3c899df1e149b2d9f87b8247edceefad142d848b2acfa836849569fd8edec47286ccddacbd301f66f5c028c1002a8fe80478b8045b7cc1a42e8794c5ad5b6abc";
   hasRunfiles = true;
   version = "1.41";
 };
 "acroterm" = {
   stripPrefix = 0;
-  sha512.run = "1bccd13f996da989e59a7a79720c33151b68ea865616b7110e95a2f59f220c97091e7f3d4e32af9a484dae0dceb43ffb6f4fe7358596a7d2722fe99bcfd32bc1";
-  sha512.doc = "ebf718289bbf917b3885d17df911db6d967f900381f5dd77d4077f7dbbe9400a7ee31a7c08b05ab6247c759ad3af8f87c7827e4e2f8b10b222d2bfd22e9cbd3a";
-  sha512.source = "9f2c64afd723b8de86966f6f075266f0308927261315dba89c8baac7d35e69133ff219d6709d7951a87021d9d6aba812e0637b65ec8e87f055ffc7d12746da05";
+  sha512.run = "e354edfe516022a04f028db559cfbd450b2dc8c4983a5e2f7a1e90f06adc510925ec5e806d371d53a54499f355c80391ffd244e438ec277f298d1af0f6829d66";
+  sha512.doc = "805f287a98b001d5a3b408646fe66bd3ff8da003ae6e0cbdd5801c9515f5b531e7a7311ae6fbf6e4d273bc3c4b443167f3f9df0dfc159920ea9aa5b88822a718";
+  sha512.source = "17161f16da8c1e05cd29053e575f4d92685c1fb77c1168bf63939cad235cb1e198545f755c2e967498ad64965b7dcccf80f3ac6154fee95fd09e2eff65bfa825";
   hasRunfiles = true;
   version = "0.1";
 };
 "active-conf" = {
   stripPrefix = 0;
-  sha512.run = "983c992ef1a0cecab61dfbcf36a74b4881cb6325cda345da4fc4e605f7763d621f8d04cad3dc4a4fd2ceba517ab6d0c6a07070b1644810dca2c545b02babb5d7";
-  sha512.doc = "746ee473e9c25777dc4f8a26fddf3b165c944fbbb5ed7e56bcd6e4925ca3224ecc1a30707f7cc1c33dce18f705d955bcdc09da58abe6f804d982ab3cb4349707";
-  sha512.source = "c51e93f957fe9b74b0d479cfbf43eb0b8b85560d0ba877f71a25e6fb7808c4fc85e4016cfdc2cb50e888a3bbcc70408ca924fc6de4ec5fea3953cd5c6c787bd4";
+  sha512.run = "7f55a2e7b31dc2d04250d9d27d8346d454824e660bf93c36a4bc369d12b55e8fa57759621c6f44dbad813382a2377b2ce00e4528583b52107a1a79d96e54061e";
+  sha512.doc = "a1eb9058b2160a568aa6bf01c5a77372655d76734f8ea95b6beeff06c6b4fe4af26f418621c2ce33100c7e7125ccf6008ace16bc92ed0888553a4befbdc8b37e";
+  sha512.source = "eaa01808b38d8b9cd8f98b2c33a98f84b5119abe7ebdde2defa64f58deae7b2d1df15ff364caeb3f4e4dedfc6318b3b8df79755303031bd7e99dab0660875e56";
   hasRunfiles = true;
   version = "0.3a";
 };
 "actuarialangle" = {
   stripPrefix = 0;
-  sha512.run = "6a850172ee322391d621d46b81a073879252aa303fe5e34ffc4ddaba050ef7b1c2312957d2536d7e9e7c4a8592f2cbd6c99c3e73f7b4041eb4565f55fe0e6055";
-  sha512.doc = "d2688ff2ea206edee529b2e35f7a647df9cb44f7a94bcde6bdde5243268aed50c6fc29b35db3b60ffc6aa3aae6c4aa9f8dbf4c73316301410286b6e143c74e3b";
-  sha512.source = "3ccd31b5714dfd559fa1bacee25d7b932ab40793daa7d5a22d3c09b7fed96cc0330cc463621d4ebbc3622c6939643444cb33e49e97b21384ab64081d0650e214";
+  sha512.run = "c4fa0a70038b4cc5fa56f530b54369db43de1e7161f25b48800339f9bf2cfeb42d5960153e4af822935760991d4bbb419f3c9bc2c5fec7ea589ab713240e5916";
+  sha512.doc = "4d1a86aaf4e95e7e23745dc655e997419069c2e8760aea63df38286f3f21954519cba054ab96ca45afcee9273da1eb6e1cc3ed76630a45d4e6d73f1257d881e7";
+  sha512.source = "3939ed0809c4668a4699a4f9792ad6dceca3f189ec6195357aa1ca02115ed1267a1c08ab24ab6e0da41d22b5f027546453416aa8b60938bc5ba7944dab24d96d";
   hasRunfiles = true;
   version = "2.0";
 };
 "actuarialsymbol" = {
   stripPrefix = 0;
-  sha512.run = "5cacdcd62bf6b24fb150089bb2dfc02f7c1f0bb8f426ad7aba136072cf93ec9c36f6e4f1ef329a086904565e1aabe3bfd9875a279a0a646f2820dc6be79a422e";
-  sha512.doc = "f091d180010d69aca8f692a7b3a319c7f7cd25e26bceb66bbadadc2ff0eda7dabbb7d6dcc0886b7a6d473d98a435684b519301177746a10425628a707b1d546c";
-  sha512.source = "cd830476795f6b2cdea039bc686bb44a92a5cedc1f53d62f0fdb37edca1cc0c098e40ffed2c3d0674cc682af36ef33a6298f8428f6ee4b49bc457d98c55da5c9";
+  sha512.run = "65550aa3d04db62924fcae1721ed41a7eb1194aa650f0133d57ce295922cc68c5668267a1bfe96f637f14563fbf3e19d31c6508c37ec613e8dd9800160a2a290";
+  sha512.doc = "acc4eadf44ca0dc7084060ec30fdf93d2fe6c51adce499e1c63e87c777e0c8b4559b5b954e1478c6b38ada5903f0b4e4f3e2e2d8f70f5f00012ce0daa462f11c";
+  sha512.source = "4ffd0338b94fd229a81344048111e7ae4f465e39dd29b1073988a5f59d648b1078b932540a5cea14558fa9d7d06f5a2ffd8f9bbf2385784d97c8fb4604a7e297";
   hasRunfiles = true;
   version = "1.0a";
 };
 "addfont" = {
   stripPrefix = 0;
-  sha512.run = "702256b34694b8797e10ec2a7a5679c86fd66805cb6173c79d8423f6649e8d0f993e230b6092bf534078e218834ad3c58682e3e06bd1a341fe3888e9072cfbc2";
-  sha512.doc = "922f58a4d0bce51cd4061b9dabdd11eccabf651e33d828fe637e9b1ca5e74fc460d47b2c6f50c7bec45b6b39f1479b2fa89b793b6632df0eec2553a53653f1a9";
+  sha512.run = "e445823cfac0b1eb1f65a6d998c413a961ff43a4e3667b7c63a31d166cc539e78d4d8dd31fb21960c63ae0cd67ded74b0a4d4642bc0a225c0a9659854d6e6449";
+  sha512.doc = "c8627e1b6d1018137c1463dd8263e0e1766f8dc6c31b2135fd79d7848c161005bf8e6ec7b01ab7085ad502c70dd15d5bfd6750139afddd598f0f2171ff840d68";
   hasRunfiles = true;
   version = "1";
 };
 "addlines" = {
   stripPrefix = 0;
-  sha512.run = "ea2ef768be7831eb1128337f32fbcd84f9109e70f343c5b0ac33b6fe2d084938ec57e7d160ce06bc52d00c068ad79406955b16f5a2669381113137501f78f9f5";
-  sha512.doc = "3153c6633f7dae049c74d411fcd914549ecf5cabf81f4596ecae580ad89a0e1d115a939118e47dc057ea7a212c9065c129a0fcc4c245eade322765a4f395606e";
-  sha512.source = "e993d97d3f1c191404f532ca79a7385fc5996485732914aeb44b01df2e7f208c2408e397c85eb44f4a8daddbc3cd184ddbab73cd235abab1ee6a176a6e3d351d";
+  sha512.run = "f82c94f79bf0f13a9430f5de58e694be09db5bec1c8da4244c2ae29570f1fa69dc90a6ea07f7d14306455af953f7fdd4394bd73aff109f200b73e484a66a0377";
+  sha512.doc = "b78b269357667004a6d1129ab289c1e5a64eb5a2a3ca372a0acd886b5505c28da497ddaa93b4240f1cb24586b955361161b868c3ccd8ddfc9c753377a052a9e1";
+  sha512.source = "3f6bda8e8e2242ebdd1164eb9e88b3f578e3941939328060e752eed2ef31d58f58637c509669b491087f8f0fc1d76c6838551c83d2cfa108044d4394795b44aa";
   hasRunfiles = true;
   version = "0.2a";
 };
 "adfathesis" = {
   stripPrefix = 0;
-  sha512.run = "1bd215c1abdcfa6cbc4e985087b7fa8de318fba48a8699cac6c3ef3de41509502997f0261beb445d28465f29f120c40e3d966520f51cbf3843a2030fb278b5d1";
-  sha512.doc = "ff472b5c62305edefc17017b3a7c554ff3cc8ed914f8ec0e8c9f8a4034700f103fffe4e20fa6eec1232329239cb021ac21c5884eac0d3d4043932f4de30c623d";
-  sha512.source = "3fb44b5ccfa6850ae8a220464c745a3cce5e0711dd89f31c6421330004ce46b964cc2e086753a80240881332a2a8b5c11559793d23709b7b242ac7f67e8a2d87";
+  sha512.run = "6377c2ca35a8de2441f2aba38bc3a253d903e51ec2aa34fe1f5f28bac2c7a35911e41604e8081df33e80c2b2ca14b011dd379fa698c5b658753fd0969834f8bf";
+  sha512.doc = "5114ebeac5c7b44ac2af4aff11baff3e8c549cde31d6082b1149a43a0cd2f7fdb50f0e78832059c13e06a4867eed8d7ac8c2eab7df930f9a110f1f2c6615f395";
+  sha512.source = "597b4199bd00cede73ffa0c527413930cf58d6c05f903ca7f2ef16b8d6f560b6b7689a32391ebefc832ebec80ac99955905f6df7b852c3d46ba4f6cf62f1696e";
   hasRunfiles = true;
   version = "2.42";
 };
 "adforn" = {
   stripPrefix = 0;
-  sha512.run = "82afa2b32f22c2a71ceb228c20d6f15e11fef9b19e287b14b821df59f48d360a2d60db69832c236ad960426a505f21c35d45fa46711cd5a14db1445622350c03";
-  sha512.doc = "cb4cce47693f5e0b6c86d2ee12cad6ff6abbdb8bfb79564e4bd3ad2dd60451e84978782b8beedb12e64d9cbb0e6a221be2fdc867508229805776cf03b23044b5";
+  sha512.run = "e0a62aff28d3aa7742cd82f63e3b4e0828b6c077a2acf5fca8d981b3432d6c2ba755b1f4b916deea9ecff45f5f65e82ec61b563d9bafbd8ffda99d78146ce2fe";
+  sha512.doc = "fc683fa19d47defd2b0dbdc02dfc7d00d2f4ba71f8fd6758fde456b54d90dfad7adeb8e61db46fc997fefb2bed51898d54490111be8be898b27ab9f6bc6e42d3";
   hasRunfiles = true;
   version = "1.001-b-2";
 };
 "adfsymbols" = {
   stripPrefix = 0;
-  sha512.run = "3ff0d6f980f51e4bf85440c97d29e1d6f275d48300f5f1471e7a801cd194f3044b5ac4eac811b26eca66f2e661b19fc773c0c9e9b0e572f1566112abc4f1137b";
-  sha512.doc = "29f92bfd74b351f8d04a52720b3ba9e10234d06f1aa471305a3c9a4ce58a8e76bc5aa7b6fa0934d97928ea837fac4460f8eb3bf6b533e8c88e942dcc752a29c7";
+  sha512.run = "cad53473a3b7fc1ece10622bd7a0e11e751d3572ca834b47a26f8739517be859a825a93e5de5b243da2f9678b344ba76a724dafc1231e3776f546ca7e0201aaa";
+  sha512.doc = "8fdbd3846befd3fd7b6bbab801a781df70e3e08ecc0249f6dd1c557175e3b776d79653089b9a3d45b6ccb2162ef5987a44c009650dc1a35c64db2dc928375c64";
   hasRunfiles = true;
   version = "1.001";
 };
 "adhocfilelist" = {
-  sha512.run = "9f18cf5e7d7c3a6ecc9b401c1486ad9611c2aa334b5c47f0281fe1ec0e16bf0d619ffb2125925c5d00a77eb0b2002b5d7af4e38151fa721baf2e38257f7409fd";
-  sha512.doc = "4be8a9b5fee5fb785ab50b2be46d074913c9f62d0f24d29edb02e4958c3ef4262b7c8f75260883b6e185b0e73ff99d5f5f7a4993f79fbc82886eb3d485000476";
-  sha512.source = "9c21f7f287cbea4659e200c8b4dec2f411a234be5dec2df16dfc8674a4a3999b3d7835b529c9ffdb80bf4430469f98525107a8a0584084143d707284a4690285";
+  sha512.run = "aad74515080b909cae80d676304c31c63c0e2163aee55e8636b8da187e4792a0a02b1b7b6e2953ac2117e28e5df6ef6ba1a5873817912422aa672fdf9a4d71a6";
+  sha512.doc = "71c3e54051e5e5ec1de97ec79f0bcaf216a4f107ae70a7d99f27b0f2de2b655b95e3fc3a438bbcb7a36210f29b4a89df91af04b8ac5cb824d66a700e2e24ec19";
+  sha512.source = "cebc6f27a0d56301efb118b01c95cf60e7b6af42e23c43a583a23a1785e99adf7426daba5d83e27d9640560889826a93ae6296523f1eaac42ce5a4f44d01b8f6";
   hasRunfiles = true;
 };
 "adigraph" = {
   stripPrefix = 0;
-  sha512.run = "b8c8c54e7a51a90a4451d779b77489a187aa71acced0d4affb94053ea446e870ddd97d70f4e17628f03e1e03e64b67319738bed56dcbefa3390af552a92b1de0";
-  sha512.doc = "60cd4a3df946cab7eddf0fd2158e34b3b19967c9940930dbc4e9ceca923f527fefb12e1f420d37540cb170caf23b9cef3762bfdfd9250fc74d3763c0cce2a6d1";
+  sha512.run = "ee497a72da4b90df4d80760f571298647550c06c4ab01868d01b5fbd6e30b0076220678ba49cc498f1bff0537cb66acdeb391c129c02c6f511d01a599e81fcd6";
+  sha512.doc = "c35da87ba2340743528f756ad0cbd646bc3150e77214be6a5b16e3eaeeaa6e92ee2ef13f0d44fdab02253759aad372d17071b1b665fddf244116e5b9bc04709f";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.5.1";
 };
 "adjmulticol" = {
   stripPrefix = 0;
-  sha512.run = "25cff3a74376b7bf943e350d61cb770b62edbae599475df31b2391b39e5c3e45c3cf174b4931180bd9053a9c855925adda2544ba4fe12031192e8fe3e9558ee2";
-  sha512.doc = "09eee6ad6fbe6a301a941001c92778c087f9f0be1842c8030a22e3798659eb37ac565f950a135f25a876f5a6135f04cd170d1faf80bc651f51e6e76588cca555";
-  sha512.source = "415f4ae7f53a081fc930c1ebd69ef8d49e0bfcbe294d40ad2ffc153aa3cfdcf91ecac8d50830a583fa96aee8687562fd41565888ef75dd80432c4a688a0f7fd5";
+  sha512.run = "74440ea2b2c3c29a33a5d39d43680a29709397c1734484a02b215eadadd73d146dc824e4219a9ceaf56fedfd6b303ce98d2775cabf6d54895fe7aa61b7edbe7d";
+  sha512.doc = "b649b554576e886b8d4e9f54bd6ad7608ddc5c4236fa46c0b5f7ba77b53f85d08f5c52ed61b8f35f2854c5eeccd34f1c2f14266e6c8c6ae4874cfa6f3fae28d2";
+  sha512.source = "4bc36ffb6b4f0943d2e96b84c6fb2413b50900929f68ce39bcac7eefd184331bea3b3ead70290097c4d212f0e7c5d77b6930533ed8f8f9fc8539f65ccaeef937";
   hasRunfiles = true;
   version = "1.1";
 };
 "adjustbox" = {
   stripPrefix = 0;
-  sha512.run = "750151207e064775b2d65462fd165ae85b2a29eba8f99e73b3b7d7a95b995558b7197f556973d4ce46ba0992dab905edddbdb9d757eeb34366dcadcd8c90693c";
-  sha512.doc = "77f57c0b46f7fa227a981dc5cfee562e409ef6c5a742005bcf37ae5bbf4f12fccd43ba6aafc2474d7612ade3fdbc5cb76475aa5a4da29ffff80902ea291e3384";
-  sha512.source = "81438aa5e415d0768a9651eb3bc9e3b7a642684d6c423b926be8211cd49673e00f4884b9aacb863bb1923a91af7c7d49f3250523f8b6284997b48073fa4d5cce";
+  sha512.run = "1d8e368436ea82c87b973c514e013bceae6bed0a4ea73ec79307ccb8d6767a1f4e903172ff12be4c7288acfd9b97b7574e781571f35fc5136f9a2cef26bd3287";
+  sha512.doc = "0881232de9bfeca8e909989ad4468425495c21a573f2f68b517645d3976dbfd0da5fdfaa38c2bdb8d59a17083b516f0611b1a8c438ddde0f45d00646c008cc06";
+  sha512.source = "78b0cb141479eea5f7f02e3d3d8e701c4cbdcadf8ae83074dfb1415413888dd5204b01b29b8e5f026c7208228aa068eaae935e4ea74f1b29857b95e2d7af7d7b";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "adobemapping" = {
   stripPrefix = 0;
-  sha512.run = "8ee35c9d1d5d6a7aa6c6742b76caf8139a1e8eea457913aa36b8aefec88e1344f481a26ba603ae4c5e8eb0db81ec96574c2703e2d4755fa82b5773cef60d97ad";
+  sha512.run = "69ce8ace28f57802822ef101bfe905b13ea5d501c0f0ad9832ccb4806d71e7133619f50f7da2c029f97386de684407cf7f78b87f3acc4cddfddd0e888bfd7aaa";
   hasRunfiles = true;
 };
 "adrconv" = {
   stripPrefix = 0;
-  sha512.run = "146a110130b619df58b30bc59ba09089a681749deaf92c099e9c6d7ad9103e57e569bca1232524353d117d1acd572c9637abe7f74724fa40b7ff42259c411d54";
-  sha512.doc = "120a0053a072bd780f09ba6b0a75c013bfe1e7f2ec3b8c39600408237daa4f15e2e2ad608f0b8170c6d768b97496e0a8a5fe4dedcc38656279f3491886f49bb5";
-  sha512.source = "9b8414c720bb61e588ed2d47d0a1c5e74fef057290d1c000de7f0eeb7d35db1e251bd30c5689ec46175bb60441d07accbb7b041aea098379ef38247ea52c38b5";
+  sha512.run = "623d8782ef34f12ed89e8e621c52e07e246352f6e6a397eb587379ebc1d7dd44a44384a0ce03bf0fae36bb1c885f6b132cf775c6f65ae921df908ff8253e4bbc";
+  sha512.doc = "45fa639a27149e92266c8ff3a99aebc284a394720ef5bdb2af6c664f3a085eff555b8dd8076539c1493cb4206667453f51bfc0c74130fed67667ac1d514de05c";
+  sha512.source = "50591b2b3999ef456bc4ffe4f16f4ea76c76d1fc86aa69695e86e98997b57b6c30d722a83602206849054b87bd6e055129ba414e5cc8ca4634c4483039190b7b";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4";
 };
 "adtrees" = {
   stripPrefix = 0;
-  sha512.run = "5b252f09050690ca3c61a0aa6cfd7415edc3d4f6b865328a6f0a216d4267a2c97b735ceb4ef8eab19eb24db2eca00ede43d59988b8f46d95ad91d96f4659b8b6";
-  sha512.doc = "011b9c38623d4473f25be2d4798625cc7e0be094e6e299e04adf69a6773652319ba5d55ca85e01fe5e36c5f878789b485719202b844801f37bb887b688f0e865";
+  sha512.run = "00ef0d06277d0ce61754ecaba55547601a58d5033cf7ee82ffb2d2cba47f5c3bb04eec5ce4f2c8e0429cdf77c21e0e84488352f9862378dc30d70627ea2f8db8";
+  sha512.doc = "a7af294044e9d6e1e1842cab4eae5536b3ad1cdbcc7c9d8c779472a8d02902fe94e0dc965d1d92d8a84c7065a9ecc415db78724f75a163a10fa88f0d570217e7";
   hasRunfiles = true;
   version = "1.0";
 };
 "advdate" = {
   stripPrefix = 0;
-  sha512.run = "d880e9644f1db7863519114486cec233a3cdd18848c3cf6166e3616ed813b7628ef0d82076ba89c7ecf5a62fb4a69f169cf533f0cc7a7a77ebb118ab0e04867a";
-  sha512.doc = "e0c79bafc44b1f6150a23530be950493d859d6d947c3c5fabdcefde81049d4989de9cfca1986aa198457451dbf20dffb0751a94646ed1ea1157f3ebc02fe9f48";
+  sha512.run = "7a3cd228493a6961513ec06f0380db494a9b6c3a970d2b67a152626811c13808be421d1512d5857847053408395056870b5c319399743eba51d86eb78149d651";
+  sha512.doc = "250abd6118b5fec45f9bec163af27df20c763fe0d732d2aedecb0a080d9a075dc923dea9c21ea6b4db2f8ed611ce167f2881d3529bff76653f9ce09d33d5bf30";
   hasRunfiles = true;
 };
 "ae" = {
   stripPrefix = 0;
-  sha512.run = "67f6eb9cb8fff73c75b49c965694739d9335391067c7892ded358db33e1dc67f1d193367c5b2d322c322fe85625c31b933cd56f5a86b74a15839832e08a2cd68";
-  sha512.doc = "08a93502582575328c5dfdb05f9a30b0a534db9c1ef480f7edbb8b6b4cdb5ad00039671a1d437944543dd4c2f1f6bd466f85e5b306274afe05e66471ca1188c4";
-  sha512.source = "fe8c0738909aa79cfd3d33ca316e808cc0da7de9d272dc8614683d7dfc2ba7b4d7c015f561cba9cd827c9b79b0aef2264e8dd80301227bad5c3a9a6b9b64f38d";
+  sha512.run = "a7b76d3ac96778aaa572b534f7cf2179ce89f90c67fae167754b89842ea25d20e83daaf9898bd15c97a65e83eea6a9c39affb64134c52af099d2a0496f17b591";
+  sha512.doc = "556e1cb096c22c673c10d9eae7302ef266080027db5a357042e02fd4052813ec77ca62c78526f68940ed4ef2d9a4e7049ef11917ab489cd8f1296475f273e5da";
+  sha512.source = "644a3b28a39014f35789dafdb34bf90db598ceaa4440d04ad972abd1f79c6c3595e778cb40760d9231bcc3c13f1ffdba2c5b8f2e30569d51dd91e8a5fe2b83ee";
   hasRunfiles = true;
   version = "1.4";
 };
 "aecc" = {
   stripPrefix = 0;
-  sha512.run = "02197ba9b402019df7840a1fea991e318c6f349014625260cc59f5c68f7afe2609c720f9b2356af25eeb511d0c6c0e56fee61b6e5a0b6f1302ab499b2524bef4";
-  sha512.doc = "968c6216f157917b1179352ab945154cf726acb113cf3d8276fd70ee2fc3537fd0430f7cc68d35e5bc8df66885a78df807b0720888716cebe963370829609cab";
+  sha512.run = "bc2c3dc3bc1398d9bcf3714a9c31a7474ef95206cbe7c0ad14520b474191a3eaadf94c0e345eeb7e86b651eca1d5c7d93a91657ed3c5f8cccd7c87e71d06f4aa";
+  sha512.doc = "ab371cb7380bd008d5e977ba78ad1d170c34c4eae4b2ddff92d412bea7dd866055f9c5c639e4b93ff6c64278d60b0ded783941a114e6f7d9f92cb54c02d25ee2";
   hasRunfiles = true;
   version = "1.0";
 };
 "aeguill" = {
   stripPrefix = 0;
-  sha512.run = "82ac6c09017d6b1d3aae4ce54e2fda478f99b1d89de070fc1c30c87cb1c7fe4d827a43ca5c1bcbdf3c7ac107de9ba6acf4b1e6a611ce61ec953f2a4196c6b76c";
-  sha512.doc = "087f0d1767a0fa33cfcf167b2577919958d22f7b76c70025bb1ef0ee50bffabe3fb7ee56c9d4c19b59094b4a1af7439fe517b88888da355c67615e43c03a55d2";
+  sha512.run = "51b75d25fbb0ca70d80533e968578e893cfff8aa838d7d458a190c97a5a95bef000729ee856704ced1839ff9a9f18e54aeeed0aadb71c77baeb6595ca4b5b705";
+  sha512.doc = "5030285bcc9412fd2ff552cf692ddb611dde958f58a5119f501656062cd13f580a193c8b6214b051cde68ff7ce111ca3bb5cc512068ab057a874b8a989dddb82";
   hasRunfiles = true;
 };
 "afm2pl" = {
-  sha512.run = "d2916d3e1c3fffc14322443d891c1f1155673adee0648dc26d07fa689b073d0baf503060d10f9b0793b86d556d4920a66fe5286d126862fc8b9f6119b07ca8b2";
-  sha512.doc = "553623944220dc4b0b8e3c43c9706afe2584545ad92ade4e49b141ab0b1c0eb76daaefee899a47710634a39afa4e0c7b4790aeaa952af6b1000068321ce5ab34";
+  sha512.run = "75dd7db0aa266f770619188deb52803e916d729dd27b151d5c47b2b9142b8f2c8cb508162012849b673d161efaf2c31f560da17ae38a69e3176903144683e4f1";
+  sha512.doc = "3665ac847b89eea90bd5cef211a8e955ba7c520340adc837fc00cb0d94bb87b94d4a3df0376528062450a8c17466e6f02fb0e86842f7b58e0b77c5bb66c86830";
   hasRunfiles = true;
 };
 "afparticle" = {
   stripPrefix = 0;
-  sha512.run = "7d3f23b26557deccc82bdab67d9e60e21b7f326fa66e5f88eccd49bdea59f103a91882544520fe5835d1fea2d553f93f3caba812d6de76b70f6163cb8a817b00";
-  sha512.doc = "92f1bd20dff7ab64b15e45fca1d4bf1f3b92a90d79808a438f2d3713643f7f719fe44b57dbd02c1e76c8d486341975f3318bcff10c196e8b465efeb80454167d";
-  sha512.source = "fa750c3b7273b7ec28052f1f72f51364185703cb66834aa20b9af3e2e3522642b435484b4c7686412f22f1fff8872edcec0e159d135a5d962966b94d32cc8395";
+  sha512.run = "b4cf56b8062e05d712d8e70998cc502a38d4bb88c72cc489f9d299470ae225ff1c14ff0cf7c71b83eb244ade40e683014ab3d748ac6eac35c77f6813fe5d7fad";
+  sha512.doc = "ae93b1392ff2fc4fb354759919386dbdb1b3368d595babedbdc011b05f18730350d7e10f239a639652b1019b110d981e10fa1a692615b0e3a253394d1d2511d1";
+  sha512.source = "caf0f30c7cd74311dcbbac8886b96464414f8d4f204c2b2866484b66beccdbff5e703c7324cb447e906cdd67108e1912ceb0f7739d09dc890b5092b98266a63a";
   hasRunfiles = true;
   version = "1.3";
 };
 "afthesis" = {
   stripPrefix = 0;
-  sha512.run = "052556c0b9e02823ff3018baa0b35f58caf348092632f22629e9720290833b397053d69d668740ac9493b07df175b39a1164e802d6ca6c9c1c2796323688351e";
-  sha512.doc = "4c11acdbe6b5d5eddabb06ba5dd9433c48d61f777489fb153e1984dfc4f69c808c14ba0e7d6f4c269753e44f43e0ea887dfc9c892141368b0be78888d9c5beb9";
+  sha512.run = "32df1f2fdf4dd1beabb634eb8376d7de1c511aab2d53173bfe8861a278d67d91d27d392ae2969ca88583f33d1194f79b692cd9369e0599490ec44785b7c0dda9";
+  sha512.doc = "e2c3077518967e8b4dd9d25f3f7e8cbfdd6b7bfcb5b0a173d6462536032394efffa5eb11582c63853b3ad234cf25cba966bc21dbc13c255543e3274751a76aff";
   hasRunfiles = true;
   version = "2.7";
 };
 "aguplus" = {
   stripPrefix = 0;
-  sha512.run = "098df1d065a1e25ea2ddea21e476e431d0d4e81a8bd62cc06ebe14f87691891348f6fe0b5d31da07d3e46d9eacd1d92ce6f09f543a742a7d80e8ce53c2a0ae91";
-  sha512.doc = "6853c6a1a7874279921ea6f1746879b6449a823e6a7b7060db82e6fb9886a47bae082bff4428729662fec1ea8f163c58c6b0083dbad5d2e42d9fb9304ea3940d";
+  sha512.run = "0d5183d3d27849702848e61aeb18be44dcac8dd71f30a6dae5b72984cb0b77cd6682831c08442bc48838be2770b0b95056a7f11cb0ab81832578bac62397f4e1";
+  sha512.doc = "ec19bffdfc2ab898052a4988ae3335631609469ad8cca47b719487a849ccafc5bd6f65709e2c7dcf69884e2e886b94bbf8da1f4f7b337dc8b8c3a8b204b02134";
   hasRunfiles = true;
   version = "1.6b";
 };
 "aiaa" = {
   stripPrefix = 0;
-  sha512.run = "d49587bd364a1814103c43aebe9a1d418e02cedd124defd4ac5b219f491812fd3769bc71aaf133d76ef0cae742a57e2f23672bdefd811d578b49b716f2d2f2d1";
-  sha512.doc = "9a10d5e5f66d4d68b3d9d58e367b9046695b604b5d50c7bdb65e5bb3291cefcaacf59282a64bf66d58e0c527b6c72f89b1ce72b2b1a85d22fb6d5a1e3ac381e3";
-  sha512.source = "fc733eeea7d1737d5565fcf090aaa306a471f73adee7285417f5e9df92eefc2fa73afa964a479d6edc364c5004eb80cb6372b8bb97095b56b7d9d62295a28f5d";
+  sha512.run = "9f066ebbbb1ab9eea1f8b9d9033ce0c600ed9536d0e4216a09c765100437c78f2a237115a3446cf0c23bfb1efb3aa1a301a838034072398cfc98334262626b86";
+  sha512.doc = "5d275edfdedd82ae68b52be48f13cfb351754a9d3a6a45e3e73a3008c195e49953c28bce6af5360d69a940f5bb137361c30b88b1fe3ab4ab1da5634f391df23b";
+  sha512.source = "9687e3892a5e8a5b3a3e329e0de0063637dbbc25e9ec4961c807113a919acdbbf6bab131b02bec2669787725da7f544e0bf67e026a2c2747274c68e658118071";
   hasRunfiles = true;
   version = "3.6";
 };
 "aichej" = {
   stripPrefix = 0;
-  sha512.run = "d95b339d737f6f186f20c661e085254a5970934a84d85e93b872af5353195c23aa2bf116252b404f59ced261cb46a43067f7d633c650252655466c4ff9559210";
+  sha512.run = "77553b01d4f793d3e5baeaa971228fc9252b2dc36a806fc391494da08ba855f9dff1a158a37b3031e0403bd6df4daf0b04cb8916968db901b02b2ad8894568ab";
   hasRunfiles = true;
 };
 "ajl" = {
   stripPrefix = 0;
-  sha512.run = "a25b4dda861a9e217084ddd43e96aca952d11e1ab60e73d2e8fd9e185dce1d2e6dbdc2d0ee9933a5d8ba553254c70d029895df4b6efce462ab27134f430a6740";
+  sha512.run = "fffa97d1a2d0c81d2339709dfebe0e267869ee4927a5a4204b585e6cc6ebd40151079c2682e6e7c6b22465a574edbd769549106cbd2f122942474df1254a4c86";
   hasRunfiles = true;
 };
 "akktex" = {
   stripPrefix = 0;
-  sha512.run = "f9ab45eac766bb9c4a0e86b3f26cbfeb488c85a3b9c7dcb557c3dcf8e5ac94fbdd60cf71c2a322db9b132a2c499ca756a9c4f2d037b4cfe9f413700b2d99794d";
-  sha512.doc = "3271ba70ad4900e5a127db685c60ee8c2f37bc5d7ab973becb3a1a200051acb7e6c253a3521f64b45c6973cf4e2182e1621591be5d69d32fa6509b640ad112ba";
+  sha512.run = "edd2cb3ada114292619ce3ba5dde40d3d78587c63c3fd39de592f4fd39e405677b4075045788b614940d574ecc41fee145bbbec5985327eea71bd53bd5c8c1b2";
+  sha512.doc = "ba75e400c4bcbe850e13656e040ebe780de672a0aab3e02791eb55484487b4d12b4cc2f64652e4103f61d4b770418240ce7bcdd32651da79b1a18efd8ec5883f";
   hasRunfiles = true;
   version = "0.3.2";
 };
 "akletter" = {
   stripPrefix = 0;
-  sha512.run = "fd287ab9194ebba8dbf5ef47003480e7e5828bd4f090de3a4e2806076778237b3031fc6a8b60b66b4710dd3ad26d2f9a9e815d0680d49896422a85b08cb362d5";
-  sha512.doc = "560e915d1d626970a3f7d04ea7adbe965602f97579ac23bcc9764f6edb2c07a14c65a251575cafdfae19df9efe8c8688dc691617cdf099f92752c00748cafd00";
+  sha512.run = "7711ddeee3cc416da6b743cc296f9045cda05ff524fbc4f34e34b1ef018756a8d679eb8e35f3dc8fbcee496c882cf160463398e52142d74b63d45b09fb9e15b7";
+  sha512.doc = "d57ef4c344e426e493ffbcee35f43bd230e2c2974761d71c3ead5d530ebb1c03515523edc2db8a9e49bfafcf9ce82cf67a118b0a3531c043d6b358f50432ec05";
   hasRunfiles = true;
   version = "1.5i";
 };
 "alegreya" = {
   stripPrefix = 0;
-  sha512.run = "f7bbcb274469c5c4dcc9192c4bfb99d8f4909ead19d45f2a8ef146b0a7272a41da0d6b952bbd499844ec8fee16472e6c949fd2c5845ff0ef2fd1e1cdecadb6d3";
-  sha512.doc = "26fda41527ab0b9ae7ef39846b753f08fbf723897e9f79378e8d54c18d0ae760add0386478717d4382f606058d0503ab27f664b576cbaed106677a5abbc97631";
+  sha512.run = "af63f3fa81e656be9014b066f90265ddc0ecdc985f5d171361bc447cacc264f72a9438146f06c30c270dc27cd4fff768dd4412d73bca34a4a15a3aa9879d2ef8";
+  sha512.doc = "a70ff6d31b328da403ce40d2fc71066e0c884843ec2572253b48710f1a76d3aca263d65619d91027e3fc41c1924561011e4814fe518ec396ef2692f2b9c40e25";
   hasRunfiles = true;
 };
 "aleph" = {
@@ -458,190 +459,190 @@ tl: { # no indentation
   deps."antomega" = tl."antomega";
   deps."latex-fonts" = tl."latex-fonts";
   deps."omega" = tl."omega";
-  sha512.run = "a04aa6a10f3036c2d760c39235fc44fbaf3bf74544a2335d956579d54596c4320095c4b9c700458de123060731b02913480e802b75d7519d308599e669f96bf5";
-  sha512.doc = "e0dd64d446d6f7b5b5afe6a30857ec76a75da365b588043f8a3c9b0b59f08e76caf8c4d3e65ee15e0763c8946d1941d26b45797a856399f5ad6fc65c61407200";
+  sha512.run = "a0718ac964a69e66d5803208d8ec1258dbb47982b1fc8848dda009e9de4c442f069bcc64ca76d4db4b8cb69bbbede420a00df1cc622678c7100f3bacfe42ceac";
+  sha512.doc = "d5d07a1927c13ede9aafd1a4ce14b3fb2fee451988ca350c5a1ea3eb9f7c525445bd8f7af425873352f2ae470a6e62c4ef15a18939ca38553f196dc76cb770d4";
 };
 "alertmessage" = {
   stripPrefix = 0;
-  sha512.run = "88d3ade030bf62b2c047730e3677db8726a135cbf9121f943051fcaef229b9c1795eee46dafa8a45a149cd3d6c54fd82bbcc28ac2c47b35aaa2c5d5f43d4777a";
-  sha512.doc = "dfe3b9e0e8b7ceff17c0537881920c911b7cb3daa754b694ba5d887b6d9da1c1d20d3cbd2fe8e0861222b5fd0d4dfdf8dbfa6e114d163c9e6add96f58ed459f3";
-  sha512.source = "1012dfd1658fbb8ba3cf9e184739e2c40ff34eaee1a31412c0c8e04e63d7acfa08c8f3b9341aa85efe80427b6da253e80e547b773bd896cd436cbc67a9525d00";
+  sha512.run = "a3aab4e15b75b9aca6052785a03b78317fb0da12ed6a38d4cbe3d905c2c2577434c3db67f96912329bd8109e4e28d56db097c50bdb963174d6109e3ece65123b";
+  sha512.doc = "467b5b0e5ce316483be5de3c4ccd82f9b61606df60e926ba2e8c169cc76f7ffaa6c2d49f7c2f188248b61c872061e53edb836702971931dc83409a7dde49e909";
+  sha512.source = "f2b8cf33e5c95f519adb940e6499ef86ad9532c062bc855032953fd811f8cba86813f7a04e00c28cda33234ffdcd484fbe81b93f4292e8b9834b27209f983b66";
   hasRunfiles = true;
   version = "1.1";
 };
 "alg" = {
   stripPrefix = 0;
-  sha512.run = "599557f674498e37c9d19baff442321c234d5172191b90fb842db1f8dac1e5b4865129300218ed915dd0e66269dfb3c5116bd7ba8229b0ebf3f6de066b2bb764";
-  sha512.doc = "4474712ae3222f4921a45a19a71cca0706d43d9f73304afee783507a2b28227cd1b2108bf1914a081be88b65af2f77d33b65acfe425a954446e9508687bc0647";
-  sha512.source = "40d705f9c8ad763103f5a64e1594ccc470940b8c7bae66e3ead73981145032fdfc49af2aee81879a30f538ed1ea960cafdb483a6c31db444f75b6ade8372c796";
+  sha512.run = "6ef98e4db425d18bd9bf44b6b488adc5f32b11b63407f21aa866f62aeb4f4429fc260a09c09c3b66141edb63a692e6564759fead69453b980bb377ce17e0abcc";
+  sha512.doc = "da7f1ac871866d94ef68b2af2fcfd1e45d4c722eaa60e21d8ea2d883305144e5f9fc1177d3db8e2d4fbe2739ee5b4ed99865654cb5607de6e9c7b3552c7e8384";
+  sha512.source = "3954d41bf6c04c4f840bb4f0558a31341a6c6ecacae27f926813adae3a921c1cdc44d1f37bc50eca9c9ab8ad5f44ef251a59b0c95a9d7189334dfc424ede6872";
   hasRunfiles = true;
 };
 "algobox" = {
   stripPrefix = 0;
-  sha512.run = "fb00d4fb8bbf7672719088a137b8d88b4d309c665d3ce8adbd1d5ef22c837e29c01181edf090edfd00cd4bc56566167d987595847b20fa32a5b4bde8cdca9494";
-  sha512.doc = "ede833a2f67e5ee32854903dad2b129e5d28226a5c3b6174ac887aa9ce8fd1ee2c180d976b876f6a4c4eb0eaa4877e703d11ce835089691c71b934012fd4e8cc";
-  sha512.source = "242d02032b0cc19011ea0d545e3aa66ebb3b493cb4ba135e8cff80267fffcf3cc894e2322ca1427e978287c73ee85d1b58b89fb9377aedbd382d90497e32da3c";
+  sha512.run = "c1707fbca0737a0b24a751cccbe9f08e428cb4cac62c190200e3f24bebc2af0100459f677e37115b77e84b95f1fef5d1c939de668ecb57928384a981f8ba305b";
+  sha512.doc = "a9a8a1fb0117ee2b80387b68cf1275d2ec274ceefff1d2feb38f04287a6110a5f58e217d65891106dd552c293a3a0d945b53528e9f964da2fc8d893de2e757e4";
+  sha512.source = "3b11a289c523ce0cd91f6c586b8e67098550efa2bcb20c46a0316fba21a68313400649a2775bcb410bfb477d0c93ccc3c9861092b611f5f459131110f51de096";
   hasRunfiles = true;
   version = "1.2a";
 };
 "algolrevived" = {
   stripPrefix = 0;
-  sha512.run = "91209e6fb15bfd0755c0ce090ebefdfb9b85af7cbf8d5153a3cfeb28dce36ad38d2b80838a7d2361670ec5aafda5c5182c980ce0f2a9a33551d52478aa688168";
-  sha512.doc = "e373b09a1382624e33d1c20395cfcf7f9b598aa65a205c1509a1dd1917a6afc9ba0cf769a35445236073a36d95214daeb32917614c3dc63a45db9ba61165543d";
+  sha512.run = "ab0c0832fb1d77883b880032daf884d4ae18c0a3f7717b643ba74785eab02b5d15a26def97b37a26918b9f803c915103505f018e584962ae097820cab2cdf2cf";
+  sha512.doc = "92c0533d626d88e798948bca5fcf138fb1630cb3dbc329a2432eb084c18990de71f37e04746d6aa1a1e4eb19abd129ce20e39b7cda9ebe4056ed8de0440f7cf4";
   hasRunfiles = true;
   version = "1.01";
 };
 "algorithm2e" = {
   stripPrefix = 0;
-  sha512.run = "1ca0fc68bf709013371c4ee11c802c9aa89808da7313ed0542d7f511705180f2d23cfb9f06a775745a280d929da65af67e5b4b8b712663753454fa5e3b70de2c";
-  sha512.doc = "3093ed074f20d67e07e42bd6a7d519bd68b8c6ed6e12601e5305fd37ad4711e71d2de25497a10ba2201fbb381e62486af54ee76cf5cf903400d89fc912aa91cb";
+  sha512.run = "e16a3b8053447d5a084506944959e2ed2842afe5c45f675ba05267603632c1758299640417dfe2360c75ca5a7e1f6d50289076c041f2c44b3a4b6b1c0b3adfc8";
+  sha512.doc = "ccdb0b8cb179dea4a87d6bcae9d4d4dc755e9e95ac84ff597382fc26a7708f3bf8b0cc4b3d8d13cdab2690bd0ea8267eb7d6d48a796c4321f249e8f45759cbd0";
   hasRunfiles = true;
   version = "5.2";
 };
 "algorithmicx" = {
   stripPrefix = 0;
-  sha512.run = "7b784d795ae18f76de8e241da0ffacbf6a024d60377fbd4d0cbde7f0938f3b852ebf8f35ced1d11eae8f3740ed2971831ed77f4bd3c41df9e28f162d32ba7939";
-  sha512.doc = "042c813ff40eb9b7535daa9dcdc3f4bdac6c6ad8da43532825c58862a9d701bcfcd63b3b25846cc8b8288d4d2752a0de7445a6a63d381f9ed25adffaaa2eac3e";
+  sha512.run = "a399beba07b746a6490f0bb584b1d89ce877de3ff0fcaa9846ada2efb4afe1631f0cb00f19cb918a76a99af8e47008ee3dd1a3a05d8850454054d62dea1ae075";
+  sha512.doc = "d143a543eddf18fb93f2a8d8387aa91efeac5728bdb2df5f96c2a6158aebd1d2759966be2bd867f7d63cca31b19aa279270419db5612820b389c0d75feea4295";
   hasRunfiles = true;
 };
 "algorithms" = {
   stripPrefix = 0;
-  sha512.run = "273fed0a4891b8cd472856f627926184b30e25ecfd385204b16c5ccc5557084c9e04093874d06b83193707bc89ffa4f778f29db5f7b52fa58d83dd288e2b8a94";
-  sha512.doc = "d0ed9e5505b62e9fd88c25d85e5d8ab17fc4d06ea4b60ab02e89ebb470b21aad879ac9bbc93057855e194f90e54e7f46cc6cf2e327d33dfa37c4e1a7050930a2";
-  sha512.source = "da080053d86c03393bdf5761eb71d09b7341c507acd99fd9d3bce53aa99340120a708179f2ec20311017ebbc6a7c0e87c9a013121cb5322a99addc049d56a07c";
+  sha512.run = "914ffb9d54d83aa1c6c753ecabd3ed8c42c771e7c1dd7e04934645e41f00656cdfd8aa9d18cba4d04792589023665dd4695c50aa3618858d7028b10db8961e43";
+  sha512.doc = "8bab28a11c8d977b1e837ac6dff57a888a3856f790d990f8d8667a204850c5d558009bd01c3c253073ec468333a0abc4fe644adb40371b618de4efdaac015690";
+  sha512.source = "86996ff34e5137efe0f64a20b5510368c6d1540e3dce4dcb23f625f1744e99c0c261518dfbaf803b85ed9f43b2872e7ac1cfaf7c28be420f36d451a0ec3ed96d";
   hasRunfiles = true;
   version = "0.1";
 };
 "aligned-overset" = {
   stripPrefix = 0;
-  sha512.run = "78234f08c00b8b1b5782893dfc1a10318707bb022494699e47d0cc15f0511eadd1efb4bdbd36285adc628cbf8343136703d6750df309ff0d266537a080c47c21";
-  sha512.doc = "1d1e979151dfc8ff908d414f9828ccd28f233333ffbf96980ec4c30078d750532db39208c0fc41be9ff5e06a3e0e0cbae21d1c90d4f019a76eb56a2fafa89e27";
-  sha512.source = "eadfd3bbe1881b30bb1decbd79d043f5f50bbdfd094c3e3dd72c466b16dc025d0fce354b10db67ecf84e448c890bff023e9429425f791cf3a31279e202111030";
+  sha512.run = "d5e863d012c4663d4e68aba4126e950ab42d87f585d6ccf30635a539341e6b49e5f3b2efea54af5b0f7f455b8d930592e605d942b8a7b9872cffce98c0059f1e";
+  sha512.doc = "7d1607ae5324be8c734512a6a84773d63add345eb2d5aec8f2c4e7a70277790cb737c9fcbd18089ffc56d3fe893610811b42c4bf1c0d556bcc98630644d5dadf";
+  sha512.source = "79f6f053eddc36efa3702912301e104c58ac9e89e120bef27ad37bcfe5bbfdf7d5753d6ba7754794b19b12086adfaa1dd447943c98c75f227ec9710c3211742c";
   hasRunfiles = true;
-  version = "0.0.1";
+  version = "0.1.0";
 };
 "alkalami" = {
   stripPrefix = 0;
-  sha512.run = "4d208f574a3567058932eb172da13889ad68ba2b0b0dd595731c61a6bc6bd8027702d33c7b5b23a38848ddf2e5a58d5adb217c8568407efcf978f121fa4a58e7";
-  sha512.doc = "13437bb5233d5abdb89e2380f19b5590dbfb44e4ece82f0758455dfda769129553599019bfe032f2a3ddbc3e629b3371aaad29959acd28ab9284480dbdb0bc6c";
+  sha512.run = "d447c394a6ab5e09c86a7684f02fa9db7ffe2c5f40b48afebe2510203298ee91914f7d5e40c5de43a90e101a29ed16d736d0554938d0c042e30691ec8a92bc14";
+  sha512.doc = "f17ab9146c0dda1026bcff50d00efdf3f9f5325c7dd4df2248c7a74b1195bdf082f01536b8347f7e1ab2455c1ee7d4d94d86cf344c236064775e0c280edad56d";
   hasRunfiles = true;
   version = "1.000";
 };
 "allrunes" = {
   stripPrefix = 0;
-  sha512.run = "b2ae160169026ea8d3dc7585689690e4064c4c9fefa16afa66a694e50deea39c2908959222c403e5f0822de59d2e82f80b0c82244d998f2399f3792dc20b826c";
-  sha512.doc = "16e1e6afd428abc6099281715f08c0f2539e983af49caf81992232fd6ec51896a7b4150226139b747b5a13a19b445c5c61cc13ffe616854012a0c9bfe1393d57";
-  sha512.source = "106c8a5b10bf6a68167cabf0f9a4bd2ecb7332cea5c3f301c5ede02431a74370cf2a59f7b2a9e6e6db11dbb6be9adcef392ef5157d820eddd49bf61449ad9a55";
+  sha512.run = "287a2d0320cfce181e9313b4a7da0d063818fec6f441f0b9ea02d51cb579d7385d5e1f5820fe35d228f11fd7b56d1d5324a90b4ae0980ec9a21c76f4a0e56040";
+  sha512.doc = "54cdd917966c822b009755546b5ba93b7a81655230e811f11c14e0f727d937f60fd12d6f9bb27f5e720624eedb502b1949828f573a27a3df48a5cef999ea0201";
+  sha512.source = "42777573447457ed04b308312efe096b726a4bef375113327f04782b13775b4cd8e11bcc78a664b5009788aabb207a76104678494aefbbc93cf24bf286a7e5a2";
   hasRunfiles = true;
   version = "2.1.1";
 };
 "almfixed" = {
   stripPrefix = 0;
-  sha512.run = "a175908c46b08d017c5e60bb5c276ba63cfbdc29f26a5d51db17ac22089a326573742d72967bf751f159993f46a58f6824bd47ae2958ffadf913bd8fa3498cec";
-  sha512.doc = "113082b78b0dcb4b1feb6455114261ef81701a32c45bec055b440af2f8978fc3c5bb76bd1a369e4074a77edf234785f538c38dbca3ac94dfb894bee3026ea3fc";
+  sha512.run = "414208577d27dec487dbe9c84ee1cd766d5e5a06ee969333c0409af50c2aea7e0fb20ba0fd0956a0f3d7b71656fb6ac9063d6832e2a924d01413521cb39d3b5c";
+  sha512.doc = "2dea42bfd4b82f81ea4958a2f1336dd1cf53a0e8ab42371c460c0eb3f87f0c83a7ce658dbbef0201bf14f5d18ecb9beb519cdd0c4979cb7f4131e5a8ce2f52e4";
   hasRunfiles = true;
   version = "0.92";
 };
 "alnumsec" = {
   stripPrefix = 0;
-  sha512.run = "d26c3b9bee82b685eab4494b28f15e56379cc347408741f73184d5b919ffc3f2b8de0f4377385655498adbac9300e934d0626156a4c356b6b5d79263aa6e8a41";
-  sha512.doc = "b3796af211bd9f1f61b42c05eee10fe6427cf0b67e06fdfb03a7a34d68c9c1ce648098a0eede115b8af7941f3779c46d0a3f7728947d98ed5ef7b4816b0f4103";
-  sha512.source = "2788405659b5bb68c161665df53fd7bafbf4e770b06b75564664e5f32f01c657f2aff8bd5838d96fa40283a925a08f755a49397f7b716898f7733a99158e6aa4";
+  sha512.run = "d098b95aaf5e3157e08164ce2de43bd8297ebb478e3b58aa3254470810f86118529b959a8a4e437d1eb123563ced9d2a4faa7af55004713a99c72bba38a735fa";
+  sha512.doc = "6a2ebce30d68e912aa648a2fb6b06b704ee8788dbab58f7f317ba017014734f2add4d813cda2d62ce515f1971ae26aaedd7cad0210b17d62898bdcdae09acfaa";
+  sha512.source = "47842ee64a6a8f0dd6ef89062f87ae42aa0d14014f186abff46f15bcdb848a6b8d6d2822c48585445ab6d9fb2fd380056dcf90445ee067504601e695d7fb96f1";
   hasRunfiles = true;
   version = "0.03";
 };
 "alterqcm" = {
   stripPrefix = 0;
-  sha512.run = "188ecf1eed1778c9f8bcf6228f2ac8b57ac769c0bbcd598b4c5b96f0c4f91ac38edbc1d399ef080b5d2a4830b8fd976e29a462227037edaeedf65cf2c5dd9e80";
-  sha512.doc = "c43c541a8c556c6b9539a9fa2ccec542dd3ae12400321ab9d84c12ece3919ccc0ffd2e0feff2b4431d7663410dc5339419471a8e17d7b9f21566bff0acd71218";
+  sha512.run = "a77ecd3154b1c19994442efb474975f4a42baffa2f7f3272a2b56f25dcb6c79b9dc060bfa2faf36530706f01b2bbc6c8dbbc093f9d4e617fd079e827b799fd8a";
+  sha512.doc = "245ff1e04e8646fa11f0fceb6736dd4e15021e2bf86c67d96c901f0e7a297b5beb5c5a9aabfaa0f974b5de5eec434fc6af5b81370ad7578587f7715ca41330ad";
   hasRunfiles = true;
   version = "3.7c";
 };
 "altfont" = {
   stripPrefix = 0;
-  sha512.run = "916374918fe94e33a77cdc6bedc41451d8fef448d7ed8abe5ca5dafcc11c23c828015ade8bc38b825986f5934aba5f6cd62d888f757f57b5e5e493df27193967";
-  sha512.doc = "07aeeec6f27df09db0eb0c7a39eebd8337ce86170dc576da5389b26f0845865f6b29789efa760bb2119d0d7a2e03a04dbdd16df3f69570f8e85d041bd1f1d755";
-  sha512.source = "57d7007c366657c7a2a0dcd86791227ce7076f06dfb0ee9341a8e9f7b3df204047f1b6e37b438e12f97f5990bca7c5eb12175aeb793ddf5e0fac4b00934053ef";
+  sha512.run = "9842af363cfb936ca831440a3e33b1653dd06eb04f32878249b43ebf2d750657b23aa27cd842bbe6de0ff8b128b9fd2b07e567f34f573b21c54d39389722fa2d";
+  sha512.doc = "c5f80f19a65fd8f3438bfc23c1a16e6bdd0c4a8e8d6e2d88f1c7ce3ace498b95cf0a09f4e8ac4edc42c1570d94bd711ffccf33d99896e692e79812d4ce97f687";
+  sha512.source = "8c04943fffdf66f8ddc3f26f497c29e6eae0fed7638ac5459c2f0874e4df3d7fa50d44c22b0931774dc219ba1e76fd87924af54179c8b36e8e097144caccb878";
   hasRunfiles = true;
   version = "1.1";
 };
 "ametsoc" = {
   stripPrefix = 0;
-  sha512.run = "a2f2168b9cdd76ffeb0bf52872f793fdeb1601d7901b1b085bfd82f5d46d8802dd6e44e059a9d5448e21b0ed7bb38e0565b8f502038b47e515d320bed13881cd";
-  sha512.doc = "604812b82d19f82c27292f235e62e489428fedd385e159120e23afa03a8d76a0ae1a397247f305139db8187dbcd6a028b5fa129f0f1aa174c98f0059029a527c";
+  sha512.run = "49515d4d06ad3ee02e54e913f606cd0c94aa9347414a290aa9b48f7547a682d6fad483bd8f1874d30548abff9de2d09d7f990ef14abd795cbc36ad640109c678";
+  sha512.doc = "e2ed56999fe06710855fc564001acf1e998119536b84c4126b42289d02f55fa672833420ab04c58ee4e2e62df6aa8b328df60e559f26f7a7447f2ee5bbee4ef8";
   hasRunfiles = true;
   version = "4.3.2";
 };
 "amiri" = {
   stripPrefix = 0;
-  sha512.run = "911f705812e7c598c9c58c85887cea81a5a5be8c0de8a2c9ed80569d4a065e5ae6dc1bad845f6ee9b4edba15f3a47164ec1cc9476e4e0a67c584f1632c3f6907";
-  sha512.doc = "ff8eac68e75d91ae79f93066ad745ed11081b9a31eaddf57849ee022caddf78b1fe47c974654195786bb42080be8d5d8382db081559c696018c5715383c9d8ec";
+  sha512.run = "e4e0cfc39d141adc85c50530d2fe3bc7b70bd7de50aa70d0f91f10237669f46e83064cb06f8bce6b15c0f468ee0a0afd38b96e74350bdd25e8e5bcfc8ad91e5e";
+  sha512.doc = "33ab9a7ecb9463b5de30392aa47fb90689bd3a64d8428c26f6ab25fce664d31ef994445d23730468a7600b1e83be1f26e9832bc216e48d1f1b06ebc55be18ad8";
   hasRunfiles = true;
   version = "0.110";
 };
 "amsaddr" = {
   stripPrefix = 0;
-  sha512.run = "adcb8024173c7f3fe1d6cf27f139855e7870a51d949a4e246caf19f5f1c57aeaedffd6fb10e4b162f7c8ff7e6a7bbfcccb106ecf038dfed556b0b9e79b25fd06";
-  sha512.doc = "314f311b76903a74ba7e98479ee20567f7657b6cf24e38119c7f9db5ad7fbd1ee962c214115a072f4beb27c68cfa9d29d2c97c3b7b396a61f8c0d309d76b10a1";
-  sha512.source = "44a64c5bdea95f476a63e125efdfde2eeb9cc620e4b3b8d6b2f5c76b73cbe832e9d6243637058220c285a567099208823b8b9bb9d1785ee3fa14c7ede0cd44e7";
+  sha512.run = "5ece0dd85e796ad4f65d49c09a7e101dc9721311ec349fd28a4b2a9a949124efd68a67236e44f99cfc59b75da6445d62a933bb04cf1314fd53bf8ae09852dfe2";
+  sha512.doc = "d67f69d20823166add328be807e67eda17470a22488d92ef314d735951345d9503e8ab684adaffeaa52fa5ed751a1ebf901c414e74f45b6f4a16f99c502f0ae1";
+  sha512.source = "7b1b195fb0a3fed6832a8b79931cb4c7a3d9748176a5c9601a753b50dfb38e89fab8cc5fc835c540cdd61fc57ae23b0cba3f9212f2e4e555837c585d8a69b722";
   hasRunfiles = true;
   version = "1.1";
 };
 "amscls" = {
   stripPrefix = 0;
-  sha512.run = "9a1aa9cd5c90bb379b13c2cefbb191df5d28be99289a54cde69d8aaf5d7425c5cbec407b35673875eb3a9bfad7e4e906f5279a891e155815e1243e51bd3a5747";
-  sha512.doc = "3787660192346db957ca118dc26a572119310c954e544ce5fcd4119e77c8d67718543abb2d62a6b78e54fffb0e325b97eebe0cbb37805e332a7bbee0e3173ec2";
-  sha512.source = "317819d1f48229e5a93112c7d419edc28bb161ae72ba95637b4d39344617aa4e6ab4c7a912a554c28880af8d531f2e661a8f0eadc03bc17cb15d4a4dc834d367";
+  sha512.run = "672f485ff78fc120e77f76c6cea5992f0e189dc3209ae2182a645ba462de4c878fb0cb482d55fce292eb118b86946d4f41016258c854e654c0cb45d49a6ca55d";
+  sha512.doc = "151c103d620548d4dcfae4c1a4310da3752fd580f3e1ee6347983c00df34ab3ead6d41fdf926fa6cc36304ab1909781c133ec8b183a17d5d4d3d97b13c79a58c";
+  sha512.source = "5fff9777b88908a7c82cd32b968432ac3afcac598b3e3c8c82a5220a99b5b3cf6e34225c99427b34affbff0e82ed9bee034f116a047f1e7cd2e73fdbb60e55e2";
   hasRunfiles = true;
   version = "2.20.4";
 };
 "amscls-doc" = {
   stripPrefix = 0;
-  sha512.run = "1192c4b0ed01e1f0a01567337f44745cb112be2c624353d5c49b313bfcc5a11d1cdda66f2c589af6b3f3010654128e8aad3a4c408555f1e6a1bfa62cc2266da5";
-  sha512.doc = "6792a84841b51e7546c6412ad395b71ddbbdbb099514b9008e1a886a90920f4a34ca13540d0f6bd17869e73cb7cbe93ebecf3c2f8f55feec7fd820f656fd5f70";
+  sha512.run = "ae64c51730acc11d98bd83758585d9cca9966e32fdac3e2407a77972f67a0ab30680d263696793299cb2714f063d4cddf8bad2424eff7b9b0977d2f1e79b6a5e";
+  sha512.doc = "d41ec70252a4fc8cc131542e3e5d1c481e57c1603013bd5e772e70e7a7d1544523041f73e488c5a902b45f22b5a14ccb491ff699b142d772dcdc66c4c410360a";
 };
 "amsfonts" = {
   stripPrefix = 0;
-  sha512.run = "560f09c92ac09d42e187b1ba4cfc89eda7446fa53c24f9d5034467de24d75e2268e0979b854693b5d4f851c49eeb674046754c526bf5fde15cf048e728876382";
-  sha512.doc = "3d00a6ac0dd61991de8904c11405bcbdf9198b0139a5631bfa45dd997c33a23741c06642d29453cb8db50821785a26d2b35f83cdf9c589f59dc33c0970a6cff0";
-  sha512.source = "947f5ee0a289d9437cf4b449ba3882d9c0f2f83874683d3f3c2a442ba00e4eacc62c35b36be6d41d07106211d4ead6d9ece9fbcad3c23ff4929affdab51d7c79";
+  sha512.run = "8f492d3b5a0969543ef11d5f7edd76e9b3c5976cfd31cee976e0929cbbb4587f16b27fc161e168c013061991e1f7730df906c181027f13732639e02a983d9abf";
+  sha512.doc = "3bda6d839835dace02209e897be9648df59c6e4f11fc1be7f7e78646edac14c5f86482953f839a2afd1015877345aeca11d5a5bb03963b9b519230fcd50f3623";
+  sha512.source = "21fddd7a206265c5a9167b0d9f192c27f74cd10b49c0bf1d1a1e4d8534196155784c312707fe4294b8e6a1f1064c3f5cd76ea1907ce51a65088bfa2c9dc78bac";
   hasRunfiles = true;
   version = "3.04";
 };
 "amslatex-primer" = {
   stripPrefix = 0;
-  sha512.run = "0781dd1ea764c72c9e31ee2c1aa16636eb26482ca679a9cdea1bd4dd466c82348297372aff2db21bd86fe3fa3210562868d0fcd2bce11c951b37195b3e94fce9";
-  sha512.doc = "fde7e1dabb245bd636a3853be88b8dcaeb14d85bad27a7962dae17448129fe34ff2bc7c2efb58b6a6082a14a925443ec5f23a328dedf071e61b1c48f0c8b5542";
+  sha512.run = "050cdfc69994c7bfa31c230fed7065f51de92c9765d9a601bd74976dd3311bfe688d5e99b8904ed5f8e94b9f7827b9850678f1feeaa1f573f4490b1ba189611f";
+  sha512.doc = "fe824ad81efc57730a26e4269700a397cb7bed12dc90c8e3bd6f07175b340a606d856444580c67396e3809dc774216983104110351839da830675a360fc1310e";
   version = "2.3";
 };
 "amsldoc-it" = {
   stripPrefix = 0;
-  sha512.run = "d116d65a518f806cce7afc0b841b076d7500c9a0d0a9c003ed4653cb06a663a0339dee20e9ef690d6810fe97b50b2f17065c339292d407a887f7ebb2326fbf0d";
-  sha512.doc = "0422234997f8f784fdbfc4a73772a4b8111ee4d5ae5acd35001f18d04f1c3732fdce08a8322e57b29bf9f28ba622e2775b748c33b6b87028c68e99751223346a";
+  sha512.run = "5426dace3a5412ecdf225f5121e93dec1d8d9cfc82eaa97a3543e74b3b7d08495711b5e32a204d411a3bd924b7711695f0d7ef0bc78bcef627630d68d47613b4";
+  sha512.doc = "a7b58aed7934ad1ccc06dd5205d84deab71e7927b97116f5422357314d3aa388e474fb595482ab7f614cc6f2260a6be12c1e98ebdd3b798eef28e039cfd87f58";
 };
 "amsldoc-vn" = {
   stripPrefix = 0;
-  sha512.run = "d1c5f0fdb30a1af989aae63b5242318b2903cfcc5f96eabefb90bed8709d5e959010d3239e63e0b89622a963ebc9b7478fd669657daaa803013af667e1c27017";
-  sha512.doc = "02b6e4ef7d183d80465035af9cb535f40e255cdb9b690d7f0a1a9cdc975f02d8ac05a5bd090adbd0d369d5ae59baf7b94f643f301339c0526fb907f362a889a4";
+  sha512.run = "8b6d56d3099a536f4091ff70dd95819d0c8ac070d21331fcb1667655648524c84fa4f9d03fb7f16ef58ae4a6b842b73875466be19c469b6bac887a00c41313ba";
+  sha512.doc = "b38b11278a5d24bc9e8964c48cc234899a2f8170e8da45be566e9d91e528aea62cbfb277377e18ca3944d3bbbdcebec919b8a476ad7efd74309421cc45ad5a5f";
   version = "2.0";
 };
 "amsmath" = {
   stripPrefix = 0;
-  sha512.run = "a046ca93ab94c97252364a3f3c9247852f2b039d0f8ff7c9cc3084a9cf6d43e06418cf8a1dfee26552ef6fd41f4cc0782d1a27135f91f9feeca4f1a54f9bf331";
-  sha512.doc = "fcf9a784fee79c5e4d39083600fb7d71388a512a1cb9ee41d6a53785d966bc5699a1cdaba5c28243850841de68fce182944d83f390cae2e807d9b17e2134173e";
-  sha512.source = "1c266de789f0f963edeb350f0b2458283f67c3d8ca74e496bb53ba145ab73112c1f717a39d43bf055ea60114c888e0e8832b562fab651a1de473ce6f5e6ab973";
+  sha512.run = "30a89596017610a04cc3d8ac133f7ce2ecc90de1a9f1dc20a89a7be018f54737b56e8c56677dc3f687c710d2a818d24c22948e94c842aaab308137185567a493";
+  sha512.doc = "8fa29173d38c542821a6ea806e546ca717b3ef5da3c19265c8a10c416d00c8efa59e32f3e14106402f7123122882c383898859879881c833c966444e9a528195";
+  sha512.source = "2276048a9be00669865c488314420084b14e89ac0e96177b138897f746227dfcee13eff71ff4bd1670a4ad660a11dc603ec5e1ea94d88ba7c1d75c349182a7ef";
   hasRunfiles = true;
 };
 "amsmath-it" = {
   stripPrefix = 0;
-  sha512.run = "39cd25356dabc2f78c76c809c2f38e2ff54922a6455fd4d5e73a4a21777e8cefe881e21a61767372db4869ebe00c005774d3bce8a47926fd0fb46eb5c468175e";
-  sha512.doc = "80231d7edec8ad3c66f2ff9890cbf2643816ee6acfe565af6a21b0f6a5d1edf670440738f8eea83ea61bc8857108aadbbad7907f405826e874a7984603529f98";
+  sha512.run = "94a2b6c421a5eae2b2529eeb95857a495d9dabe7077360860d8b445df5bfbaf17f64e20dc7b053cbd8b0d1088b1eff8fb751aa73e9065bd32fd08a64ad49c6b1";
+  sha512.doc = "633572ac00cd64555f4cc8a6a968d7db025f0554c2e10d8def6b247b7ac43ba01c767ed0eb3de1e1b3a01a175d07a88dc12a84b9f00d06495d5c002db3919466";
 };
 "amsrefs" = {
   stripPrefix = 0;
-  sha512.run = "3be96907029c9a3a98adfd1cf49e839a9dfd0601844e165c0f9471fa31e4597cf0207230c52ba978db50323612917c3e28d80660e32ce29332faebec58f85aa2";
-  sha512.doc = "835576b60613e1daf6f25757846f42d1cebd6fe205b395632ecc12a710e56c8a5e9d96dd238f73692979ff661bca8df8a73b5818e16a8dcc7f9c00c305b88047";
-  sha512.source = "0ceecdfb523b602cfa6a1142e0fb45ec907400eeeb9c9dd1b695cbe26106a57eac98ca25e3643d9269dcb24924f2373205cce35461e1853b9afc3687802aa902";
+  sha512.run = "a2533b00ef1ac570037c7205cff85b159d4f78bc3b2c35c15a4a872117c0c51bdc125c25875841b5e9955229d48ceb4d3348874db60e5e0bac1a4d90486fbe1b";
+  sha512.doc = "74ead56be6f1cf779bd5d5a1808698d9e5ae127df2e2df0c545c959e61fb1d44ba0eff003077be53153904bc3f24cd58cc23a26a655fa9b1a9b235cb3dc4f8ab";
+  sha512.source = "d6d1c8c9e4bcd3d114f051841e78e7a88a1fec3a715d51628cc9d9b5e8035daf45158e310900cf99797ee2a323d427954a63f1108932fedf7ab62eb13fa09e6c";
   hasRunfiles = true;
   version = "2.14";
 };
@@ -652,1266 +653,1296 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
-  sha512.run = "04c855c8674aae7e06319093aed1353e15b3476e0216fd539c58af2987033bb64f6e1d513a7980f567ced0b399a883baddae90dfd9547905909bf2e8be73aafb";
-  sha512.doc = "42e88e5e3b77cc3b49f0d8ae60b626d9a7e95f11c675a5bdbc8ed9a3f3c9143480d663a75fa7d6a20bf03c1c11853aa53f886d839e2b32576854d09d4eb6449d";
+  sha512.run = "7587f80a94acdabbb99dd78d9a424c640d76341f41d8f62ecfc3f858f7d7b3acd9421bdbefd1fbdb259f306a8a4097b1c6f5c339d1ee78a3221cd2419a1a06de";
+  sha512.doc = "1d352f37742ce3bcb1a8596cfc2e8da97f467a45ec1cf4ecb4fd6e837938f1ad3a721b6ffa85d878dd1747f1480e87e6b75180807fe0834b8e2de0f6d53e8f27";
   hasRunfiles = true;
   version = "2.2";
 };
 "amsthdoc-it" = {
   stripPrefix = 0;
-  sha512.run = "b6e7ec9197235774e409c7682e296f7af80d5fadcb4bebd419b60d193e908dd02254357614b915841ee768923aa6193ec7c0a63badd63f6ea3228a89b1d13cdc";
-  sha512.doc = "abe3b55486abbfdb44c4b45d4d42da63f13c0a331bea1c5f6f6bdcb5189b20eefad1ae7b690ca065e5ea3d63e9f9f8d1f1260238314db0c6dfff582baafc9e32";
+  sha512.run = "89550e5f973ea1c33ee0ee0bd32a38647c25e7ee2cc4b90249436e331adca3260b9215ed0fc736a4caa93b63be58e2959a5e5579756581f4b17d5fd8a3418db0";
+  sha512.doc = "389a47016ab7b5ac80109b8c46665b4a9ea9906414112fbb641e2c0f6a01907b03a6a377979686b32e6f41a718d14aa0a90993727e82391514a869b52bc4201b";
 };
 "animate" = {
   stripPrefix = 0;
-  sha512.run = "3b2fd64446dc46c5fd30129d79b464b27efc45337c9b62797a74c9a375137632158cdc2578ddcb3f4c81fdfa979f8c7f3e2a1d6086690f1427ecb53b63f0784e";
-  sha512.doc = "11a4f8a64ddfdac5b8db24e925a7ada41d2d4594d8bc089d6e57cc3deb306f5e4b7ac86cbe5ebfb49150954fe1c943744f8bb18815938b34ff8db371a63eed52";
-  sha512.source = "698d048056d613c9c1085f06b7109420159d8f95e26be03ee35db20c3a662aa23746c04b987b64247fc18dc518cf1b0494e0a910ad33f1bd071a97903fa0e574";
+  sha512.run = "6438d8c16a0807cb72cb025806236d293517c16472eb0dd2a03215d3fb3d06dd6f3c833833d9beb8c94cbf658943d3ef8f36bf83904a83f209959c432c117d86";
+  sha512.doc = "0019e09199861cd9180112ae2d5dc03c600f53341d9a86094a6f85975408bc80598a0f6907a41d2836721fb23cf6e4054ae3f7d46a0fd22b995662e888d0bd96";
+  sha512.source = "a8afc92f381cdd62727a3b60a498c92e980de4f57cee05e45ed70cee6ed58107e4fa26ca9a4ce7b1151eff1109b65b2f6c9d41d3b0566df68b4694606186bda7";
   hasRunfiles = true;
 };
 "anonchap" = {
   stripPrefix = 0;
-  sha512.run = "184d222be68e5bc71875a6f2afc9c174960e3d30471405fb9685b5b85ae41dc918f0544d09564b15720fc521547cc36ca3919c5a0a06dadc0f44b914d1235bd7";
-  sha512.doc = "f7216c265428f2772e514c28a1a6457e14550dd6c86073b4574a6c22de35ecf71c97f1f4ceac5ed3881763feb609dabf0cf40651fd6b989e4e68ad58784772d1";
+  sha512.run = "ca9b0dddab3401b2c3531e32273c02e610f56ba19746e5f0bef0b92909242b3c9ede1438d9e94771653855d87d265b0f6f7d7ef5901a97d77dcc2c347735fff9";
+  sha512.doc = "746fa120e8bab79ecc5b63621adee336d6fd2074287f9b1cc287cf0cd151d3de5aa2be07b0c2357d3ddb902c63b4444b08fca28bba01097568cac2ece9cdc0bd";
   hasRunfiles = true;
   version = "1.1a";
 };
 "anonymouspro" = {
   stripPrefix = 0;
-  sha512.run = "ff2a2f8696258b5e5d443972fcaf07bdc2cfffd2d8afc7192ef65b47ebc8e0043cad8ffaf62f7fd884a0f1587cf41d9bd5846daacc79beb1d0ea4b1dbcbdf62e";
-  sha512.doc = "91fd689f664cdb1823615304fff6173ad9ddb5b4d51a10d929fd773685894ee58a01c0a300a317d0c21c172bbe94f3d1799cfe843566fa7d3a6b8d8644e52afc";
-  sha512.source = "98e6d9b66697e1e0d9dc4cecc4b04fa308d3aafc5664beb8be2d3e2b52bad0f32c7d3be755632a0f54939f952e324cb7eed233d37920c5ce4a43318f132edff0";
+  sha512.run = "eeeda26078df7a2646835061423119ea7f19e25476568351b7ff457b367695c9cde66ab2e7e50655481b78e214d45016233eea344c39968a585a70acde56f10b";
+  sha512.doc = "d97b82b8918ab52c13eeb1f0791977355bf6c72261a5529dd12f392aa9a81b7d441a6d619004f848829d4b647bd8cd77df46bae0487cd05df499e7f53a1b801e";
+  sha512.source = "f0d93b7d37b4f420c21a65254b27d7390df19ebed915a9a8a33100cae179f6e6c290302c658dbba8cd8b0487f861cc4d2eac17af6590126a0a24e934e6acc5b4";
   hasRunfiles = true;
   version = "2.1";
 };
 "answers" = {
   stripPrefix = 0;
-  sha512.run = "02ec8b4b945ffc859fd6a41cdd75ed792529fbb6c0e01d84db13f3f13be01497d5dbe1c9c685bfa3b41fe750c1d0ea57e0e1cb78ef851f35fcbe1eb975b3a252";
-  sha512.doc = "d747463e238d32520142edfc0725995d719ee1418205a76e7c8ca000979783e1486d5ecf1c8b9317736a453797aad5ea8343ce82e9b8021d2891575217e0a0c3";
-  sha512.source = "09886e77e8114e8f7e0b2d1e49b4bd934826c9ff4e63da214c27b5e32f53b3f03713f931fca385b0cfa8eed17709c0d5c772081066682d867e5cd6873436df16";
+  sha512.run = "83af1263901b65b641bb2087406e7c0e13a1f64c99e56911aa4fd6c4a09bf4d4d8f60b906fc7717b265e12d95da2a34d7688c72d3cd94a23026876e4c13d4ee2";
+  sha512.doc = "a562f7b6d377edb1a711bfa8975dcfbf4d969af69ee6e9b1fe793bda96d6681a57fb8469677f3ff6251faa7e96a02fa067e07ca39d7c2c583cdde239b729b6de";
+  sha512.source = "e9f8b7b288cff9cd0ee86bd7d29dc8e0b70837377e1b25b640c93c2b075a4b9380f4d0d22bceefba3f8dfd282de99a8647fe7bd22669469c734921f5c6a7ba0d";
   hasRunfiles = true;
   version = "2.16";
 };
 "antiqua" = {
   stripPrefix = 0;
-  sha512.run = "3dad854f28194b37bdceb074fbc89edc8159a7192990624d27d6cbb703fa9114a419f9ae23e5c8a7ff5b33cb76832ae715bed842dd60438529971f9529ab2ce2";
-  sha512.doc = "c99f99c59c458bbd73f9a73e962297e29183dd527726bcd033f4cb0f96c645eaec6a6ed887bcbd2481f26c89d93b22545d83a1992d4cb74b10e25ab10395cff1";
+  sha512.run = "cb0343ef76adcffbf502c202646ef1754319eba46e7190f88f466df233f962ba07e145f2ac3c7a2702387d3174198135eefd9677737481ef156f76261f92fac6";
+  sha512.doc = "9d13d648f5a7c87c75a69958cb4cad9167b8abb2a8a46be4905052adf88e1ec73e230d075c0a8a60fd5c66ed1e00d7fceb016c2dc557cb1dcf5a1414c3cd7699";
   hasRunfiles = true;
   version = "001.003";
 };
 "antomega" = {
   stripPrefix = 0;
   deps."omega" = tl."omega";
-  sha512.run = "b05d90a28121b03f32eb54218fb7e898a5f0f44cb3ee825cb393a32a3b1d94a7e2563e7c447f3d1cdb1f23b58f809a660ce6dc1eba228ff5c789cc120575ec7a";
-  sha512.doc = "7817d64347cb59b756d2daee581666d441c595487cafb8351b64db6552714988862653b7c814d7596aae9bee986be334bdf96fb3b6854328c8465d9cf8d149fb";
-  sha512.source = "01a06dddc3ff94503cfb772c478c033df5ae8f3a101e866178c542f9aa28aa282e2319db7a119ab1b4dc3304467329caa1011b1b81e9e29213963576fd132fb0";
+  sha512.run = "171115db2b78496013b8e2025aaac59dbd40c819600881932a00efae59052eff91ffa393ace0e14df1a62965601b03bfb354be0be82bfedc1a3f74c8f01ff78d";
+  sha512.doc = "bb84084e2f65580438dedcdf16b869233e3cbf5944ee01393e3b4f90642cb530fb66f4b27d7491c42058205383a261b89f9e4859de136327a12c5f6b316a89f2";
+  sha512.source = "f2a3288943811fd73cc7a64b08ef27067f1d61c10193194112f1694fb6d19fcc32c1b97eb48c0176557ce9005e31677aeed72ed041d8c5706c131d92ffcae003";
   hasRunfiles = true;
   version = "0.8";
 };
 "antt" = {
   stripPrefix = 0;
-  sha512.run = "3ed352688d989067237d44516bc71a5f583e7fe5ccf7fb141a5f6711d2d11e6359315205523aa46ae85c909a88ee02d0bc7fceed0f1f15b6af5de976d613cab2";
-  sha512.doc = "548c8c8381c165663df051e287990ce01ce5cbafbf21bacb9aeef757a818c04275dfcf08daf5cbca6db686f258dba19c9aa5c69464e91b53d815769a6dfe1fd3";
+  sha512.run = "3f6e9a64085bbc399c6c629947e4e4a6eb161f6220343910db4af6b189d0af14a33d38c2d6fb30abc0f8d97dbaa004aaafc35064d67bd9ccf6118a1f09889d19";
+  sha512.doc = "b49a487e18828cbcf6ebc03bce0967d0ce2ad0d7ac4bbba8ddc3810cd539fe3d4692400cb5f94df38b704b20d63bfed9cf0b26034663edcc4e45c902ed265921";
   hasRunfiles = true;
   version = "2.08";
 };
 "anufinalexam" = {
   stripPrefix = 0;
-  sha512.run = "16ef3519afb83f4756dbf30bc656ad42fe637186aecf5f43c097c1b06fff80829f7f3447ff828e44f0c2035b347377718bae2fba67ae1212488b6bc78270273d";
-  sha512.doc = "c16b13f1065a9b4bb6555785a740e95036e43e224432b3f42f5e4133c59eec5910cfdca520bc2fea90785cd0ee0937c3d615e1a48db5e707cdaf1f5c8cd6fe4b";
+  sha512.run = "bffcaaf0b9062d072fd111d2a72d2798bc61badf57a9e7c4a9268827957281254aa5817cc379a6b7ba22d89afba9b9c0c6d4e9d1f3e75633cc42d81c168c3dae";
+  sha512.doc = "cf17209d293c8fb50b2fc4a2fb581fc20d985b9fec1080c4a6c00db9a3e0872361675e7d6cce8c8be2bfa63a8785da661322c2507d9f92ca4ce8d3e5a6d2bfad";
 };
 "anyfontsize" = {
   stripPrefix = 0;
-  sha512.run = "fcffe24d6404a12f9178ba4ca84bfe535c707f2f23a07ac50815932498ad5edc3d4a36cb3e7a5b60179c4614ed522e7b435f4b21a95a470b58f2c91509bb1280";
-  sha512.doc = "6aa6474b5cabb85a2fe39412bbfbda6f1c021adef97840a4c825872ea5096ba79ea1e8f8da6ccb4e20920d2f84c1e1acd66ed45512fbbd5b4b151b9bb6ceefdc";
+  sha512.run = "d2bdfab0b0b3acbf22b5c23b5f5407c6f6ab3ab2357138c5bb6672f0e3e0428d33f8aaee9c015a3f2222545d236dc55e8260fc7bab6e4e5c62fc52973f7c7d39";
+  sha512.doc = "f7a14a5fcf333b2a04f6badf3b198ea67e2ff16b7aee9a1432742f982645f1c2916d06924e80366533ec42fd9a0861c5ce60834ea63dc4a41e0af255f17fff7b";
   hasRunfiles = true;
 };
 "anysize" = {
   stripPrefix = 0;
-  sha512.run = "386243f854d08a697f20dc00838bd38eb1609934d5f2ed3f33acb9ab65c3d4363e25ed7233f3092f91f7c10565e39fd6db27645cd10f4cad6f4347cd1b9761dc";
-  sha512.doc = "e20de7281a26fadaa5bea3b2a087eae944f76922c9e25f77fc133c849d8c0da7f2b1f312ec75cccd24649ec346cbc1da60e004b6f5ac670e3215dbb3da38116a";
+  sha512.run = "122b7e9aa4bf7144c23eb2b71f66ae98cc59188334b685579e41fed26a72202b28632c98c570a6993771cd30e9e36da6625ecc199ef8a5da920a5fcf0e055bd6";
+  sha512.doc = "631dc7ba37f2afec300da94d0bf3d9ae0fc17d0aeb9e4025859b8330abfab06b7acf7728f558291e5235ba55b041b8cb4fa07b38a6c15ce9a486ff4d50f8e7e5";
   hasRunfiles = true;
 };
 "aobs-tikz" = {
   stripPrefix = 0;
-  sha512.run = "730873103dc782a8e907dd85d857233b3129c004cc9950b9131d1b98265a4c4adeae90fbcf384fd9a8c1d52e3ac6c5702bdf005ee719119c91886b2b1fc7db06";
-  sha512.doc = "7e71642627b4fb4e187f95f006161882eef3215adccdf9cd92d315f4a917174a17db8b152208b3d634094bb9a618e15376da2c7ec4eecf87562dac51235fef6e";
-  sha512.source = "3789bd1a28bc3d3daefeaae736aa9a7841fd3297f6eb796b149c57c0e6cec52d571e93b71222ff1e97586f7daad9ac490c326975031d4cb59e062ef074990a16";
+  sha512.run = "ad27c30f72cf02dc954aa53840b61973386469b151f452ae566dccae4fb751d0d22c002ebd8656479563cc192334da18ed4219be1e2484f640e45db0650d5589";
+  sha512.doc = "3289ba8ed37a622c73d642b77a45a9e74c78276989511107794c191ccae7d000f4c4c211e60cfb512f4c241b4b434fb652c78178e07ee3e658de15069b2b8857";
+  sha512.source = "4c91ec222f0110e8f3bab48dd94b28280cfe701d8d6ff3d7c9b40f149f41360ca713385ba13deba7d92b1c8b42aa2a115b4d0ea48b08cfab0708d87679b93b96";
   hasRunfiles = true;
   version = "1.0";
 };
 "aomart" = {
   stripPrefix = 0;
-  sha512.run = "4f27203e3c235dada16b16c3173ae5ec2ae17bc935c79240bb13547f3f1e9c57116bfb4bd7c606f58783d03c50a94723090119a09e6c1fe13e0a6614a3b861b9";
-  sha512.doc = "bba3d4eb038365d6daf7a42e1e250f76d8f7b9d744a63dc8dfd2b7dffa4f71e9e49ce25241e83548e433f4e98d28333280547b535973d1be05d5134ccc1eaf13";
-  sha512.source = "f9010191e14da311d79c79112995ffc4fbbf12e61791bd5f8dcf80f1e3111c0e30d2fd1de1983cafc10a14b38d4156a15640a254ac1bbaf3caeb19b3235242ea";
+  sha512.run = "2f1f1f7b3cd6948a89279486ce527b8c1bff960b975a095df9b0e8ff9d2571dc086754aa1689aca339825a767e6685fc0c214a68ed1b599fade65b1ca3efe985";
+  sha512.doc = "e5aead1061276b541bdc83e6b5760281e31106004c31764ccfef19f8ea449a4fa2928e45f7b94c8118c56ebef2c7e1ad863b34f07d12a5957b96119c4194ca49";
+  sha512.source = "378ad2e41e92c85714457867ea4309acfe77ed6776ab763834c25e5e53746935ddb1be9509460fe229f44acf9c2e4041ef3946e8bd9670ba10316d1a1da7284e";
   hasRunfiles = true;
   version = "1.21";
 };
 "apa" = {
   stripPrefix = 0;
-  sha512.run = "16f242a02d5945a0031f646026aad5a7f61035308bba563e0c6ebc97c7dd3061114d01407bdd7cc1afbd0cc0f5411683c7f3382682db28e41568803856ed3a1c";
-  sha512.doc = "6a55c88c2b493dfbaa995d0d8db659e2189c149a4fb973bdef5059afcbd20e4e35845da6a55efc942eba047ad73889b3223a11e448baecaaa08d6dbce08194cf";
+  sha512.run = "a9f6847c5aa82d99ed42abd0c94e1de80a963ba16cbb4457b4c4c507541162c5e1813e32e422879a133ac4669c85f5481734885cc58e9f746e884925b1b9721d";
+  sha512.doc = "3e727947084a1192caeb3e898eaa1a99ac89147f5ebfdb6e9697ca9f0b93e7bf3cdfeeaa3c64c38ead8953b0b7d53ff000350c7079a5fd736599cf3de7aa480f";
   hasRunfiles = true;
   version = "1.3.4";
 };
 "apa6" = {
   stripPrefix = 0;
-  sha512.run = "70f2667e21d2256eba6d7bc2e6caf85e206fcfc9a92aa8dcff5f5aa29b289d5c9b5153015dec38facc56a432b004811ee0ad4e2ac99aef827f199d6ee129d3f5";
-  sha512.doc = "995477d8516c4f2148c2fdbfdf86051289c7ac5f752c7332db80e21107216374dc55696ccac5aae0e1cf003ba132ed552e285641137c8727bcd2742507b5ffff";
-  sha512.source = "aafa8b70ed3a293a89b411c841a7279feabaff0d301d3ea4f8cfcad07e1e3bceb522f52737e646f3c20297cb8ca772ad48994fd0066bffbcd5245e1ef5726f79";
+  sha512.run = "e583265d8068d8ddfb0093ba09f3bb725362eca2ddc8419f02e6f038b52886cf7d8202e9433cfdaae6accdd0a1899a5b0a4d9b3aa32609828cd27ac17a1a5515";
+  sha512.doc = "712c6f0fca0d1aa2dcaa285e961d3ebab48f16ecfbc0636a4df37bb27d067f7f63932702c3515a38e91a28b9b7e92fecd9ea1b5cd65d10cc5b809efb038367ca";
+  sha512.source = "0363bc889ab4ba0489e047df10cffa272327ccea88d7d845f04f69405baebbd3ec0361ad15a83a57f80d81cea67b37fac5c7c4c0488c0c8b0d5a0c32fc832b68";
   hasRunfiles = true;
   version = "2.32";
 };
 "apa6e" = {
   stripPrefix = 0;
-  sha512.run = "d6ebf10d7e2099f97ad0891990a3aa3445fdc201dc81a51c975fe53f6a46633e6be587fb15d9a46cbb0b11d4386d26930c5fd65fd4e7e77bdb2216110dbd2773";
-  sha512.doc = "0518ecea62ed0f6e425a38e193a447641553a8353654b18ad4b0adda3ef4c12d104f508f0e47901ffae04d56d06edc2e6d279b63a1f03fc2007888f1237c5f51";
-  sha512.source = "df385a250612c2afbb5893d1f0e3880212e3661e593600d2572b860a57044ec500f909b0d2679e5ed1fa79fa7728c52a76a7d75ea00d90f64c9a392df0e8a165";
+  sha512.run = "9a03e7cd930d3ee46a6fc41aa9bcf4aa43ef541d1229a8632664b76d54bc3c086545bfa7dbff9c8ed42f1a693ad022a30f28b0df5c8762993972cd36fd1e426b";
+  sha512.doc = "2a10b13c6a1d3c54ffb6e031b4ee9724146f5707722b0c60637b24a3e5b66ab7a0e5e5b6579d5baea3861e67db0a8c4d5da691f0473daaa121ba92b05192ec5c";
+  sha512.source = "8acf941e49930e042539098bcb935deb9af31b1fddce9959002d64abe8bf3ad430aba71eb7520365a30ec07d1b2226ab8ee8a7e21d5c414e3d81ad122b21ea86";
   hasRunfiles = true;
   version = "0.3";
 };
 "apacite" = {
   stripPrefix = 0;
-  sha512.run = "6ca6048364a2f83a2a253c89469da244bb8f5af1fcb935ce0ea1950bb0c4c80cb8f79a8c3ff81922854ec2f6242773212b43f57fd9b0b238817961e7513b353d";
-  sha512.doc = "d84b3fbca27da6a3ad8ed27da215f04d29ecaa49a369a4a1df922b953467d73639893d8d376825fbcdb1996a0a41d8c8832895383e0a185e5457610c4d127f22";
-  sha512.source = "5762703b87560a5a0473a9848371302f25f18fc8e53512feb9801388f229eb0fbb97783359ccb77725b73137a8437a8c44ec2c49e28fab224cea4d3c73748291";
+  sha512.run = "b7688147efa1100fe63383f737c86a8120676fcffe59bf7de95886e78263fcf0b1ec803b7b85a5920d875f9c5aa80ff057e3e5bedf959c794a5bdd6014fae12d";
+  sha512.doc = "0f4638bb631ac2a582088dbc1e9b11b073a0851478345f70a2c99b3f818e9ad3822d3e82f18254b0ff1810dae39d6c372dc5f03a3f24e90e214086923248d1aa";
+  sha512.source = "1d3721e2cf3c4c9b675d35d64f2160c3602a7c17ccf4db447df48f68aa42f7fe77465d5e35619ae52b7142d2b5ad44809a35d1eadd4e651eab4a119bb4f9139d";
   hasRunfiles = true;
   version = "6.03";
 };
 "apalike-german" = {
   stripPrefix = 0;
-  sha512.run = "d385280182a1e6fe16da6afd8566d797208178ccf319c64d8922674f5f74620efc9210cab349b8d024ea55256aacbcfdf10a01028fafd4e0f8279abd985e63f9";
-  sha512.doc = "714d927e30d1739e69f66806083e0e94ea955cb8b312fea44c9699356355da0c8fd4ba1fc2076ec6ebea767b3726bbb61bca8ff4b5e06c16062d509a2c6a8575";
+  sha512.run = "7fce0cf03311740a49a724f6c359b9e7c309ac02cfd318881f74c5be19be43118e6dc576f016f395e0d642241c7c4c36ad38d13e2ce91065d1bbc11590284010";
+  sha512.doc = "bfb85d3d72857191e06d6244654c0949230a09c4fcc85fe8a48f25801cf7922ad65fa51dfb8acc7355e96783b0702fd2d3dd37e9b3195120f5b772be96e2928e";
   hasRunfiles = true;
 };
 "apalike2" = {
   stripPrefix = 0;
-  sha512.run = "61a2fb61ee271ddb25971e180d84c194fa46674c9e9d245892a7cb2e07b6d592ee4b8c17e0e4909bddd6dff6974c50307668dfd1ab2c9ac844965ee210246906";
+  sha512.run = "7396544639325ec08a9df225e17fadd3ef58e67b6f329a6719bca810275074a088539f5f4f0a9da1e03082a130f36970bc9c49bbcb1eee8526b2eeb75323f6e3";
   hasRunfiles = true;
 };
 "apnum" = {
   stripPrefix = 0;
-  sha512.run = "c06acf9f91e632de4611fee84b319ac3bc679a6900875838d1281fcfba07932c76c6cc5a5abd96c5ac012e0e94f79a47e5e2c65c3b4daa4b4f9e4d916419a707";
-  sha512.doc = "ee210c885b14a06562d1263c4844f64f0ab6b20de6ca23ee67d783da100eaba78b2abf33aecd2d3d22c5ee5c4946861020645f6d66bdf5dfb8be5341acd35173";
+  sha512.run = "1718c3d4499f7c65f40553c920cc681384aeeaa489b04a656e5313cddec11c6b36be9798a35e24bb9c06932a96733f52153eff7d6ae5f6d69b8a02fef60f1464";
+  sha512.doc = "8e4929c6a39c0225770de1b9431e8eb53791171dfa6f551b2bbf8a6719a748aff46e5ee976c9385cd6de596c773c3c523366776cf09b852c425471eca4ca253e";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7";
 };
 "appendix" = {
   stripPrefix = 0;
-  sha512.run = "91d0010e19d76e7d8aa507615435f296450a5e04a46e1e81bb658c44ca2cedc01b3503eed7bf15485669fbeee0cc8ef089bac948613a25a0a5dde1d679d2ebb1";
-  sha512.doc = "b9eb150799649096997a0627675d433c3d16f185530f67b7219f96df70229301468e5aa2c891560906153510b0eceeb2c6ad3cfaf245daf62a6ee859e764f03e";
-  sha512.source = "5907fd9e3db7daafd78a59443cebeb5c6fc55e934d4b7dbb5f729d58511de8a1b5b5f3c86bf9aa353cbc717cd2f611d0fc0cdc7e621eeb5775cbe60d937c3361";
+  sha512.run = "5a3b7492ac8a1972e25710ee70ee82abed56b56cbd1c496dcbe48fb98526a29a118efecc1f05dd7e083af194134d09bc4568acdaef6d43f2aadcfe65f2706abf";
+  sha512.doc = "85002436ebed5a575b50184bf1edf9f72c4ff1878dac52991d7ff9a4ff8e1f0de22ccd7fdeaccf5cbe35ba86637f4d8b4f52783393cc3634109908c33d762d12";
+  sha512.source = "285ba3b9286866d0b5fafcdfcddb21487e98206b198417438390fdea9456547b1bfb3596c48c70d2d03eb7af8a135b3d03e9fb5d953f97eb220652bc9c30c4fe";
   hasRunfiles = true;
   version = "1.2b";
 };
 "appendixnumberbeamer" = {
   stripPrefix = 0;
-  sha512.run = "7697a23f9cfceb5d821cbb0eab4920618b179ec77306620ede9c25b81903a5e4f6d867bfb92649cb298aba14f4c74b27c9c47ae40e2717f669963ec5cc0ec1ee";
-  sha512.doc = "48f2834474d0ef42a4b5f3d71f809ddb66a97dc1608865f15e807652a76211d9f5b53d7f9ee34f85231e8564ac6aed43c24e9116e2564a61391332dc3781105c";
+  sha512.run = "a364bad32376322f383b31cfb729402d3d481aa3f427da823f57a10e6bdf1e65636ed6903fe8e05ddda5f09c39a8fb617150cca3ebdf6c1a1bd11815a0ed2d9b";
+  sha512.doc = "120fe706eaf53b8d7b8f6134618340c13614084b8058f2c3b734743a219a97867e59ec8b77aef6bb20f845ad6eeea19ecc19892604a4871f22a6daac5833d073";
   hasRunfiles = true;
   version = "1.2";
 };
 "apprends-latex" = {
   stripPrefix = 0;
-  sha512.run = "4b778609c85d26526a617e5e81996e7aac5a87745df83e3daa9ef7e7cb94ce8626016473b81b3a6e21a798f2580fd2ab0e786dae5ffb724b240941359d56efd8";
-  sha512.doc = "6acf63ca6c9458ee1e851b55e6def6c2948a969404c1fd5bda786798c2c53ae651c958281a87faaeb0602f6b0f9c23d61b9711b336fa0ca9775cf31fc506cbc6";
+  sha512.run = "692c57415ad56b5a991ff3663ccf95fbde0e57ddd26f050899d3238e3fb7f10045ead6764a9eaa3e0e3c32bc0acc8ee096ece007abab6224bcf6306a8b2b163a";
+  sha512.doc = "ba7f615ba74eef13196fafafbd965a76ca8455f8ca6f5dddd2acd9e2e8b0de21c70a6ebb7fa2c565aa2f0f534b53d32989f2b6226a48fa763cd1cf2b753cd2bf";
   version = "4.02";
 };
 "apptools" = {
   stripPrefix = 0;
-  sha512.run = "bfc1cbd665eee66474464a01a96b365892f136a9d52ab28419dfad165de33d7e574ebfd6356a73997092e0a509a362eba6a47b00d1565ab504ac7ffcde4bf7b0";
-  sha512.doc = "b71df0f1ed3cc36cef0cd5ca4fb4dc489f8fa6533f950431c99e273cd330154adf450c2f5abd5072f00dbb9131b18d6fcf32ca82262f21534d9da6c93853c0f9";
-  sha512.source = "1fc9fbafb186763f873a8fb511fc94eb1da5b5d4f0db75bf553351c18c84acc73c6a2c4c104d99de8a8349d43becb2006c36530f937a813e88d66355288ca1f3";
+  sha512.run = "8c46dfb31dcd4eb128b549f2d6630a805eb3346ec58bf00acb60604331161a11b8edd99d47deb85858b407cb7c4c68aae8874198d485d3b2a2cc9684ccd86abc";
+  sha512.doc = "09f29aedec66f18dcbea44e11662848d2af8d18f71e3d3ad8c8ce3b34e185d3ead93b0c580bd953b4bb00fc6e15452d860db42f3ff002d86cc69173afb82f66e";
+  sha512.source = "73f57d2766088e01dd3693519e71722798d7bf55fa2bf231df46430bb4310a32f1eb6e7b59c2b3dc8b5e030979134f957efcc9d34d672cccdf73bf94c0b12ac3";
   hasRunfiles = true;
   version = "1.0";
 };
 "apxproof" = {
   stripPrefix = 0;
-  sha512.run = "1a82989383358c93899b62ce27a25f4adce6d59ee0b95d1fd9b03bf3dd8331ed91207d39a9ea7079e3e432e8be7fdcf5e7e9bdf7c30b6f7870265a921d37eb39";
-  sha512.doc = "875181406ab6e1128a26964d13e877fb6857419cc0726e15069a0625a2da7fd3bda2c8664f0fd6b300f12ddcd0d06965f494a5f6f6f5409b9b85977bcd76938a";
-  sha512.source = "a5c32750fbf03f5281d352ed6cda24601556eb274c7c0be32d93310d0bb18ecf6d2ccf5f6bbc8403b84bff9acbfdca75166c8b5c7c8c4e6eb4f261c209a19eb2";
+  sha512.run = "33aefb9f9eb179501c5bb8680616706d8ee19722d6b99df045021d6ae9d20c925b190bf1871d47bed98c52fe43af9931391174807936e23f92d716e93c47d59f";
+  sha512.doc = "947994e1658490bbb080ecdf0dcf6d5df62d97a3a74420c72b5d871995bc39f397bc566f3136eec7df326b3885a1dce92c8945ac080b9d60422e96d638522ef4";
+  sha512.source = "4c928cb17570451337f33109323d06f87b043ed9e3502a260f9164f17b0182741511606ec4078f3009fd6ffd757cec742098fe48322197ccc98e06d1e43bf926";
   hasRunfiles = true;
-  version = "1.0.5";
+  version = "1.1.0";
 };
 "arabi" = {
   stripPrefix = 0;
-  sha512.run = "2a4bc6a9174425c02ad7ca396a048fe3781162b59b360fb30d74baebaf52a0df6ca83a93a57183266079d2aa7da9cd7516e92ef9e912ec34c7cc9ce161bd7e3e";
-  sha512.doc = "64636badc1a931505f7be3834d7f6f97b315a730261b32ad5afcc112a3c52e91d9f5c281190730438457e4d1100d56b0daa087ce31e9267b249e4ebaf9318ae9";
+  sha512.run = "4b7e470834905c249e2caefd1ebbbdf68635567e43b3f7b1fcf8ef3575930425f2772df96e3163eacff4c2cb951a89a12567cb679f8175f8774b18d13b067e1e";
+  sha512.doc = "5c655d904fbe3546075f07d3685d26ce12e2649bd838b53d25485152ea05c826079dcd1d9d9df750e2b5aa8cb23e69659e1d13451683038e83033de09da8b1bd";
   hasRunfiles = true;
   version = "1.1";
 };
 "arabi-add" = {
   stripPrefix = 0;
-  sha512.run = "1e50811f028b5b2d82c3093fb495d01643f7b6e93692724bbf888d191168bbb2ec8181e182c08f6d9cd0b990840d344c3c7ac11b1df51ba2f40a82fc050906d0";
-  sha512.doc = "e81106cebeb780403b21efbe692c81fc9004ae3e66e0db3fa8c438c90d0710f94db42ab848b9cb779cff91a8206331406bd12c1f8871c1cccd010cd87a50c48a";
+  sha512.run = "4668574f7e1cee77adc451a1cff7c5d49972c6ea8f40b8f14666d377678569fb91dcdc2e18488386b2fdc9416c43f2944b12436c645db6d110f58a87d0309631";
+  sha512.doc = "a75ab71a460545f8691742410fe680c63670657c805c93571c20e5aa57720c4f2c0c34363423fd6b765c32fdd32568ae3c83ce04b4b80421e055d14debd4d908";
   hasRunfiles = true;
   version = "1.0";
 };
 "arabluatex" = {
   stripPrefix = 0;
-  sha512.run = "1a14ae2a6efe815f4101356d71b4b1dd9eee8ab401b4f300beb3d0c7a640b55eda061cf64ce86d7d6fe080bff77a28054b0fc5b73614f67c6696b41b45e45937";
-  sha512.doc = "48a5b1cc6d77d763e50dff7992bfd4474094ea3b9c1563de96167dc99b667e8b4ca2620189c53d89c51c2bcdfd619d66aa94ffff12308e9eb25e9dc1bb58548f";
-  sha512.source = "15a1b2bea819ebf85ad5824ca98999bfa124eb746889a970c44b998ac7f12c7296ba0f0d29e971098749a5fceee582d57e1efeb93ed6cc0194b2f7d976d9c07e";
+  sha512.run = "00073d09acf1104278992d678d960f2476bfecd0f1a67ba905e4fd0a35c05ffb0a9674793269e06584858a10ede99c9961556c6396ba89ea8ab5d6b56dd99f5f";
+  sha512.doc = "212bb51e9dfb2b71c6a91ac0aeb18a89f9fe051a74c380e4030ecc95044e0f5f075850decb8b88aa5dcc63aa4db8b749c9e7133ecdac916af4ecc71b1924e631";
+  sha512.source = "cf82dff55c21c51b045d657951aa97084fb631f6859a88d501ab3ef599365b7492ff21d12b96525757d1af6981678d37a84d5a24e84b59ad55d2be4c06d29f69";
   hasRunfiles = true;
-  version = "1.10.3";
+  version = "1.12";
 };
 "arabtex" = {
   stripPrefix = 0;
-  sha512.run = "a7240952e6d3d7834abd13f25cb02db4c566f10e6c146b1f3ce67ecde4cd078ff5137029577b53ec462723c34a0e0e0dadb98bd486eccac2e0d46d166d9b0c8e";
-  sha512.doc = "19392bb9202abaa1d095a754bc89d3772172533f2836661cf27af93243095ca572a3f054f915c99c9541ff60da04ab52a9224cf0f965fa75d3a56a250423aac7";
+  sha512.run = "e61468f2cbc0aea1bd0dca4398a9f6a38a84774d9bba44b64eceb448adb16d4088ef7a2713d071abf8eda5b01039a41e912a14566fdcd5ec0ae04b3ed50e4eef";
+  sha512.doc = "28f2cdf8543edd3020f5f26904718b3d0cbb5b50b1422da83489b4f1aa46d4812b1df0900492459f6643cf05f1c5a08ce8940e526394b6d571c91954248adb81";
   hasRunfiles = true;
   version = "3.17";
 };
 "arabxetex" = {
   stripPrefix = 0;
-  sha512.run = "79191a9683d68058710f03dd89c50411d8ccb87c2397a0becbca4fe61d4baa3550a0c887105c44e53b3a736f81f72b395ed4b8f807374281fcfed46319b511e5";
-  sha512.doc = "495fe121e06e0b757eb3dfda3273e8a639572a10ffc856b2331d854eccbb5a0941afd157716f603e1b9a17307214fc3e478a749d64babc42157fd05468f70120";
-  sha512.source = "ba1ef20befd0b93633fbfce38bd5806daefe864d4ece5a93714adc4e1e4218e5449ab31e0219636f7267de4fe4bef7b811ec6777f0ac14e6a56351fa71bc459c";
+  sha512.run = "f9db22f63278faa0b59d1287a73775c13e4eadd16561ad9f321960756eb82ceacff092eae6e533e779e17737aaa09d895983b913178bbea98e4d829205e1deb6";
+  sha512.doc = "07e019754a2b22e41e0970287441080c4e7cade877ee5262dbbd49d60adc1d871b95ed589d7708b6b3e76ab0066b9132fe130ce71f8b8e20f5c1648cb7539d08";
+  sha512.source = "a448dc1b9cc7f759b936e77d0466d6749c186282f91c907ecb45ca334d02210f7452384f58de1733cda9928729808fd2fd7dbf39f70ef3605ecc7743fa642aa5";
   hasRunfiles = true;
   version = "1.2.1";
 };
 "aramaic-serto" = {
   stripPrefix = 0;
-  sha512.run = "b4a36f0263291ad831f9b4d26907ca25e26eb219df7f8840a30e67a01867d31208ca67c8c248c354deff9e3629d2f37d12477fcd35d4194cdca0021f703a143c";
-  sha512.doc = "3c799fe2ccc8f8e131fd5b670178c884140a1ec2e35e962a18a046c14b1ff52a2d5736c5d0f627a3ff3bd1b246497f5cd3d3b5e8338f9b796faee9938b3a53b9";
+  sha512.run = "615b28b1f9447c4d68dfaf910a02d49d3f8b6f51af29c31bbdd78b0f7c064cef57625a054e1dcd5b797ea4cc3ee6a5ab46a3e121867097839d815a36e23ca9ae";
+  sha512.doc = "15ff7aabfe9be5ce8a328b89dda88920fc6b89209d433edbd5e680a465c2546f3164ae895121389b1145e32ba414c8fa306d137e6e25fd22f2a4e649c9c0614b";
   hasRunfiles = true;
   version = "1.0";
 };
 "arara" = {
-  sha512.run = "47f9ee720a1ec579333366f1e8537ee8b5010ad878260f2f0b87183a4397ec5c0f9f0c63807daf1a30a5140703c7026417cea6ba2a79b4242b7b6322e40d4e39";
-  sha512.doc = "1625c7f3395850f5d8ab3dd349f7cad8e07aba10816c33c7bc1b6dcf0bdd1a4216d0d638f3db826b7dbcb8660ce6e0824254cf7e74749bac6c658462f5d6a9e3";
-  sha512.source = "156a1baef4967d6b50ecd3a5c0949b0b921f35d089c7c69cd6d6e9753cff2cb3c8597c182e2edc552d0418ce398436629419cc541b530e4d54402734fcac18d6";
+  sha512.run = "da5a57d077862b811b87cdd70763b13d30e7aad2926d5b1b2beec0d235837a45538a43d7e57576ce679e475067b94ed0599878baab6eb7a680bddd02a0b8b12a";
+  sha512.doc = "d358db49de1c15284a2f3ab5046256fe7899f9559896ce762691af9b30cbc600e84fa5eb4d04807341bc6e44d4284f448152dba76a60e2275cec1316a5ae4b18";
+  sha512.source = "62fe8bc03d4c942b486d868531322405e3803967fa3a38255f722e61cc8167ab9c4e81c7282ebe080c2eddc4ee1b6bd5ed32e475bad412ed510d91c7b4e1dd4a";
   hasRunfiles = true;
-  version = "3.0a";
+  version = "4.0.3";
 };
 "archaeologie" = {
   stripPrefix = 0;
-  sha512.run = "cf9cedda5b494541a93d08b14db2b354302c804177594337ef89fc4da2e74eed42acbb0f43418a53b46223aea257b928d6b69fe6557042a75adab108cbe503fe";
-  sha512.doc = "7ea10cdca79446ee0ffa84bc5ce720b86925ba5ebac757ca001fa5f9798e143d034fdd72d24b52c47aa4b44f7f341cfe502d1fff4cf117b33900c59d4bc005da";
+  sha512.run = "84ef57eeebf132fd4aa52168e9527c89836119033fbcfacc9c7e917fc986da5dcc2fb38c0a51d2a69654368d4fbaaa5ebaf581174e0cf631230c2d2a056de3d8";
+  sha512.doc = "5b9809dfa3763d8926a43bfc8155337cc1ac9c1272e285125301ba81e054deb4b57ab18820ccb85feeb33b7e4f47d9d7b00a7db63ecb549d17f79b4bf60831a1";
   hasRunfiles = true;
-  version = "2.3.6";
+  version = "2.3.7";
 };
 "archaic" = {
   stripPrefix = 0;
-  sha512.run = "9ce9cf0c5395c87461599324a85090b625a2705f88d061526af96397975e30c2218492bca5c4ada01be82bab4694c88119464eab3964054a8e795e57a7222172";
-  sha512.doc = "ae86b55ef54ad4823381249df29aa6a9a8c046b4f420387e74cc5b79b2de03d2650cdd58b4c868b4a1b72376e694475fd0a55c7264d14fa552118c57cd1a8725";
-  sha512.source = "6b09679084261b1e7527b736ffa9f370dbe175295a37ad136a67a484758e08cb9af5c8018bf5c82c711a95a7aca51a3ebcf1bab1c3da26322b56b242be7bcde3";
+  sha512.run = "a23a6739720b817993eb43962ce911604fd606e8526009e8d8190f0dd9bae6d7309511eb8d12522488d1a464af5d5cfc1d59ae8008458901cbeb37e313ab5fd1";
+  sha512.doc = "f4ca94308e24e033d7a3a9ff178a1746e16f008f4e2b1b86d957e6a2843798375360a7e96765a3c78ee12171860f26e930a39d0e81ab798d6fc0ca443e8057ae";
+  sha512.source = "48c899eeaba26c575d1227ea831ed25c389617b1dec2068871c3afa22295f9c321352bc944ba72d7e42ca0e91f570930f63ba6ecef5d19d7fa954358a2dfd8b8";
   hasRunfiles = true;
 };
 "arcs" = {
   stripPrefix = 0;
-  sha512.run = "e3be0cbc9ace262d55e283bf77ecf0c822636d2eab8605b6482c23ee0bd582f17c1cfca41c81ad739de468b6b8e2fd7db9c1e3355e1a680339dfe506e5360fdb";
-  sha512.doc = "ffbe047c0b1b4788c314e364e94edc7a0f43f52db42588b5e9e17c174b6247c590fbb4f5aa189ec68284047593fbafb057a2e82597851bbefb1e6c4b91d43e08";
-  sha512.source = "e82ce19f478ed523fc8ba17ed0e0deeba53e3dc7c554b94576bdf7a738cdc778393c993f0a88d4f51683349b5b44c5bed34a788b232f44694513e72871707087";
+  sha512.run = "916701ba766a641f4bebce5fdb994a776317769de2ebd40bbcf08bc66c5b1e04d3ad8f50121de11208aa12c0eb102fe09f411c0fb8927a9b9c023e84085a16ed";
+  sha512.doc = "0b3eb24a15d319caad0635cc699fad67a1fe39b3d0645a6596e34f6d448cc4f69a69ef0de3e497e459d350021394eaa748f286df6c0d5298d28ef266a3c8f300";
+  sha512.source = "92b928c892c4954d05d15774d33ce47a7f9e2a36258a40add3ff25c876d9c20b8c5e9ac44a04a7df1cb0e20721672982ea7bd9dd60054741816d82bbd082c6f8";
   hasRunfiles = true;
   version = "1";
 };
 "arev" = {
   stripPrefix = 0;
-  sha512.run = "c63e53b4fa13d7638dee6b4970c141c06eea2e53027f175a02416cba070bf5e92b7aa8032a69714ae00507ccc309584fc93c8d13a0052df6dd50be628f3e7ade";
-  sha512.doc = "427da783ff54ed5b0be5cb2571eb0ca012e39590e12747e74798515fb453c49107023570c1a6f9c55ab6b03c9a00d5b220d5fc66b7b4eefda095fcc136bc4539";
-  sha512.source = "362bdb45c594bee0a6a67993f58912b84bb1ce896e0d4578251676e3aeb78fff4ef4c8037a151bcf5368d40b2d12928023b74d8f330bd6cae31dc3c966d4da90";
+  sha512.run = "0bf4817d012774f5613535312f52758a7f3fc9fbcdfaddc50bb7de8646344f76aa1bddcfb9e66b7703c146b243061a27ce4bed4c7d923f96da9be40058c150c8";
+  sha512.doc = "14a7526e67a3987fe77dbe88f7cd2c42bde55c826ba10a627e83584be9a5a2b26a0461f675ce61834a664bba891930e0a642dda7bf85ac8f6f2e5b5fda20fa3e";
+  sha512.source = "f89bbf33b59bc231ea0bc617d26d69f6e57d85720c23a0d9e994e38a8695ea7b6f306d3cbbf01454739d99a8ad9d61d732ea765418c5f641156d344c37293e76";
   hasRunfiles = true;
 };
 "arimo" = {
   stripPrefix = 0;
-  sha512.run = "14356f1ac60fabfac715e446b24c242d9331b6250a669f9c7234571429f7b949a7a5403ed19102cb97137c92b1a6a40807ce9be5761c76b300c02cd32e2c31c2";
-  sha512.doc = "287d110e4fb85643173f9cf2ec7d5102618e4fe9ea14c315e5768453df4e34009c5ef1b85bf0ab3b2e1a88a1ae6caa7cb6d0cfa2d74f8ae5cebf3fb9d586f580";
+  sha512.run = "66a38b3be0b52d419382ef405e9d09cd487f0db0be9b8435001ab59cbc5e6e21a3ff631f7784d3b0306e6aab97b54ca4a39151c712c5ad29905328f3fbe289b1";
+  sha512.doc = "76a21b820c2e115a353267eb4c604b7aac36bbd47b3b90392c266efc3ad08045b78ef8c45e4084bd188ee8754bc2e59509643ec70e3da9f8da22cb11bce268ee";
   hasRunfiles = true;
 };
 "armtex" = {
   stripPrefix = 0;
-  sha512.run = "525bbd9e381e549f4ad8c45d6e3bfc34872f8e9d7a5ac621e25926d4008b92c9b33cc54209c661aef5f03d5fabde87c43aee324fc3a8170d459133edf04c52ae";
-  sha512.doc = "f6c12308e66b34d890319aef8609823d68fa2d08fdba13b868bd61e3896919a71840bf3eee65dd9bee6f9460f657844437e912dc99f221b4fd9f5754023e556b";
+  sha512.run = "501b1434100cd172ed773a1a6210a444d9497d8681ddcde9f67c0e55d533a09d8633d6e5bc2630b3073ed9edce00d98e6feb88d3e11f53b745360f814cd553a9";
+  sha512.doc = "8f293148f924e4f1ab7c6988f2ec2b68bae509de64e56d7cb960fb3fcf6a6fbfa05d0a6b568b5f6c6b540e6d66724e9cefea8ac2c650623f8d8d0d8aeb86d2e5";
   hasRunfiles = true;
   version = "3.0-beta3";
 };
 "around-the-bend" = {
   stripPrefix = 0;
-  sha512.run = "8177c30c545ceb6d20ecbd123a2968750a3be2f45be335240fc115b44031276bd38f7104c8e99990ae8f71cb958bda85662fbf89edca99e874383b7f364dbb4b";
-  sha512.doc = "1dc99c37e57aeff240df35f81fcc6c4d48b9fe8fd430c51a5b2d0581dc70b199702337ebe2f7e6420e7188a873be565f92a5fceea422b93748f707189fc54ee1";
+  sha512.run = "c5661de5ebb954c3a90606e22cda8d279702eba0fe96ce42545f162cd1d3f41029782d9eb0875e3ad9f1cbd308ae923a6f363ea1a1f4f44429760ab021e35da9";
+  sha512.doc = "7d33dd68672a080bdf95f74ab84e281242a57ed36fca8a7d8d1b7af170245c70699af241c9c687d88d2c6a9a2671d4d8424161128560ae8ac9898789894636ee";
 };
 "arphic" = {
   stripPrefix = 0;
-  sha512.run = "8121bf66f722492254177a47bc8b413fdfc8dff879e66dcd5645045e852b4ba761c9a9ac1e3a2c9092b316c7ef422fa24dcf62a1c53d998cbe95122c629eebcd";
-  sha512.doc = "15a95fb161e5c870d2ab4d905ab4c2b59dbf7f4d1dd55f12383810b137f3fb7bc579679b1bfdaf913589a95c5aa0391b2519fbfe54fef841e0af2389ad659b06";
+  sha512.run = "9fca584d410a241afb6a506cba7b0732b5515c18a4a829328522ff8675c4843cd9830573c3c85c067d58413c9572b0be51c013978a9d0c1571a301a9e6a27007";
+  sha512.doc = "d92f5f97f08cb89102b95e625937db9dab233ee2d9e9f8710b2d5d72b327dd1cb4fce0a6a1f7b4f75f43720d58c4836f446b5136aeeb9f3c5ca6f664610611f5";
   hasRunfiles = true;
 };
 "arphic-ttf" = {
   stripPrefix = 0;
-  sha512.run = "ed93e88bd0352ae18a1792f06e9490c1a0ac4c0a0f1f45b5a64de73b18e5a989ccb44b9ca229e32dcff25c7ce1c6ca970a0cd99d9d399214cb648690f0faeae2";
-  sha512.doc = "b3b03a56e7d84cbfdc396f1a5a4379febe5d705db99f4739cba7ba80a991cb9cb0c90fe2106df5315730f8243770dd97170037a70eabbe0d922de5656d3314a2";
+  sha512.run = "ab7678f75e28117a5f988e913c02daef6eb757f726a18573cb92ad1031296b486d71cf859a0b06cd19eb456b5240443563ae200db1f7642d87c161fdb793e89a";
+  sha512.doc = "df151a25da7ab8a44fe9eb5f031d1a8409abfd5af9513cf8f4e46600f7fec3aabb1f2c4c5a9e29224dca5c911b2139b235f53a2ce57927a4e599eef255c0b951";
   hasRunfiles = true;
 };
 "arrayjobx" = {
   stripPrefix = 0;
-  sha512.run = "f0e5d5dea9df30c986b1099bff67625afad205518e0bb03e3d68e4e50613b7985e4c9bbcc8ce129e293c68ebca1bac03c85b0eb10eca781f3c011fac5d4b2c66";
-  sha512.doc = "eb26f719b5f8213b5635229c2b52c1ee29665e414565f95390bd0d5390498b0042f0349576cf7841cccf07b3b9e9b2424b9bd02ef29053ecf15d4003e0d65d8a";
+  sha512.run = "e011fb45f9088afecc013c0a5cf7e12232ad5bde821782577c5994f74a03360ded041a4e2b7096e9db2f74fc21e7dd298cb5ad6e7157681cfd88b7191e21b015";
+  sha512.doc = "9d6daf32717880a8e1fb1a5bcdcd798cef5ff5f5b6cff0e26411ab64fa0307b0b462799f49ed44f8427d9ebe380668369a2771db7d7771266595cd077f813231";
   hasRunfiles = true;
   version = "1.04";
 };
 "arraysort" = {
   stripPrefix = 0;
-  sha512.run = "b52d3699390e71a5d2e3da1b892573f1e3becba3e137e677bde02b03d15318b02da43bd76e133e70e6ed443d12e1e8b2e3ef835cfd4c80de13adee33ee0ab82d";
-  sha512.doc = "f4e7a8efb87cc73a2064f485eee5130c43737b60d18f486ba7bcb4cc5eaf91b24781b5b570d73ccb5ee5380a6893df9945accbf3f88d755d993e7041d83cf271";
-  sha512.source = "6fd198902a36c60cc0ad537cf9b5f4f4ac4447c262cf228d3748e4e33f392efca82d91ac322b0d7b3ede3f156e09fe3320ce7bd722d968fdf552c3604b7be669";
+  sha512.run = "9fd89cb6fc746e8e247594343222663050d30b3c780a3571512748baa640dc358899e3015f2047e97da16e1c68db99f027418ef13f176da70162aa14f7112e43";
+  sha512.doc = "62a0ebd0eaf8c2db103866e7ffd93f64edc622e0d021dbfbef8a02a7d4905c99d500a0812ee458ee4f99e104dab8c711b5812387b1016cefe0746081469b9a2f";
+  sha512.source = "8af06ff107a6bcba4f14dc6b364ec300bc428b97ae2055211ab4c64b3de094c58344511652cb33a917210dd9b0141636a9eee174744d06f15dd0d69a2951b48e";
   hasRunfiles = true;
   version = "1.0";
 };
 "arsclassica" = {
   stripPrefix = 0;
-  sha512.run = "546912d2003851fcd4e968a98d33dae264cd71756b9b1ca5d70f3808285f136ae484baf7157b4970a0480d9926d11a4fbfb0a04b591b582e3a3ab566d4dacf6c";
-  sha512.doc = "ba76d41d3559a960d0e738ee9e398c28ad97add5b33f9c4d19cd34eae420463b01d7f615a717affb4e3ff345855ba9a59ac23935d028798f3236692d67f392b8";
+  sha512.run = "7808b77e8868ad2e4bc584408b3bfc15cb53c4b012be5ad205148a37901f98f99de7437d94b32af8254ab1cec51c7a3b442fc7bf65e40346810c4f68fa81eea3";
+  sha512.doc = "fc981473098274440a8f5695332cb811c4d07a2dacec9065993b1377d10eada02e9def40b5732b40cb686ddbe3d34257f73797db84fe1afff1ad5f630f34d62c";
   hasRunfiles = true;
 };
 "articleingud" = {
   stripPrefix = 0;
-  sha512.run = "bd0e1158142131a2465baf6ca8dac35e9b2fd2489dea6bb3b59c436e20a2bf90865a6f7db41e031bec01238dcb7d5d24f3c7607c17e20d57ffff5d78333adc2b";
-  sha512.doc = "6770dca825bd44fc7c84586dcf731b448e63301d5b05c955f9f872c5415d395e9db7b6a33b3787e38790e420fd94c1d9a03501bbf489dcdcabe3db44e874cbb2";
-  sha512.source = "508bbc84b04b526cc45beb49e0a65e47f5487b7cce01f188b3c361cc73681deda957fb0c1541f0a6c4ee86189da679cfe36ee4f68236e14bd576c85243fce5b3";
+  sha512.run = "d80aef2ac7f87f238449956025f3602e34c736ee4088958a28bde8f73c9138f4675a7460ae9670b85bac66794d8341d3a4c5ab86d787b4c92b40ddc03741a3b0";
+  sha512.doc = "d32e8afde6b6bd012662c3c1a43998a17d285a40d03b86c7d6fbb4a6238322edc5d59343e5de4934c0d64d7260c489049bea187c921b3f61f3d024d23cca79d3";
+  sha512.source = "7f9aa8e0b04c670e1a656f7cc3667eca67c19b079ef589495533d169526e46efb76deeb4aef85d749be580f97f1d1db1074ff090417d9ef87b3b443cf69cc0f9";
   hasRunfiles = true;
   version = "0.3";
 };
 "arydshln" = {
   stripPrefix = 0;
-  sha512.run = "e63c42dec653d6d1f023c6052ec40154861144c5a89fc26e6709dcc6b8c135ef714198804c7355af629bc09152c0241090cf4bc1029999d0990b2aa9726b7221";
-  sha512.doc = "0441d7bcdc8208e33d379c235e3029c32a410d8a75244cf39e828f77fca6e15ca90408180b64f7f4a4c78dea7a7436e4b33c02ca7865257f589515dc6e1b0dae";
-  sha512.source = "19da1dd472ffbe7d7805e290304a83820f1ce0b6d22647038d163f2d36ffc7d8a24f5ba090dd82dbf7d5d560ced85114d5b48f1091b102d172637eebf8372170";
+  sha512.run = "59be47cd123642fde47ec88cd72101218f78577c1c1ad3f358a39ccdc899062e305318faddd489a79bb39b755eb681bc118d2d34a3d1f211c2abaac34e567092";
+  sha512.doc = "6dc57f78d81725697d01db40242caa778a9266c0a1ef682766ea2f98b695a8d0c91686c381aef6cd13dec33981ac4d5e3c2f9be1cfe2357ea268406e174a4287";
+  sha512.source = "da82a8b7dfd10a6b80c47a65ff7d41d36a82aa800b7ce731cc621068dffcde109e06a430fa36842a0750df78873476d571da2aed53aef35bede85f3d29cb7b9c";
   hasRunfiles = true;
   version = "1.73";
 };
 "asaetr" = {
   stripPrefix = 0;
-  sha512.run = "bed3add5c29551baeb98dd660bfa2ec486d0a36ffe350b64fd2a59ee33b1ab150a7b88e2712db7e8c6f785ceec5213d91e109c8646cfc47c09b2ac9113b33026";
-  sha512.doc = "a243cbdf5a4fefff470226198b977ea7722553e0f568c8e1a4a74a481812b2b3393a6b24c2fb802c67d6551fd9a063131e2b9aa5ba2f8495538aac86b57387e7";
+  sha512.run = "bbb50b404e20bcd81cfd724368082c02114cb0b08bb6144e140a089cc0ab4e2ea1bc275be761b7aef50521a38bca98ee009a7353e7d61f547baa51639c86267b";
+  sha512.doc = "5cd6e6e755d23bdbf6794789605183dcafbfc71056b11155aed749179d823406fcc9fbb4995db8fa9c2b34db6d4047e07c2d88d4a5497229efd3c04842609c02";
   hasRunfiles = true;
   version = "1.0a";
 };
 "asapsym" = {
   stripPrefix = 0;
-  sha512.run = "0762e7d1b549d4501a0144c258484b01fee310253dce7e31264315bbddece0affb505f069170bcbeffdb2886c49b654a252adf69c234625d08199e6e8918c26f";
-  sha512.doc = "7d20b3926fbfcd6b42c21e27ae94c933ee0285430bcb0b6c26eec8b9d887e87fe772e0e85f132fc4e069dbf3c99db6c62cc31f331c1e5173f2cf6b3c161bf921";
-  sha512.source = "8d1514594da3a33db103057a84f51277c25b4d9afa68b3c796182f09ec3780dbd65f689cb0e8d63ce6e1c6efe23addd921c531b33cb39b84ab0262bcc10baeae";
+  sha512.run = "a67aa8d0e660c86475ed3a7ff4e65074e335ad607ebfa0126f7a30f234327577f5f73f490883ad6c20d2cfc755d708b6f2b341e75a59650b0de1f3610bd076c4";
+  sha512.doc = "f625e90d9e4e2ffdba31b937e4c4ba81fd800ac4f5e83f997a1913e0fa779585c722c0fcfd5e8d0c0b25529add07015789597e5f12fcaa59ac20dbd3d977cb93";
+  sha512.source = "664d199f48b9f476c952648b453cec654fc5eed3e7ee7e944105db108bb7a6fa75dfd3f92c143f6af3e8e929a3adbec1574e0e223ea712a01fc01315609b00a6";
   hasRunfiles = true;
   version = "1.0";
 };
 "ascelike" = {
   stripPrefix = 0;
-  sha512.run = "42ece1aed471dac462ff67dfa8503b04bf90e9d8ff6732f07f5d0798a8ad30fe2f639f978fa1493f83d75c281b662b7308d1da351e38a6d2d153843d91394403";
-  sha512.doc = "407ae27859bb4d104f3e2fb566f527c6c510afcbd95043f8c86f463e9d6284cf626644902ec5f8b4a022274d6babc11b64962369113c8cdc48317c9ad49905b2";
+  sha512.run = "84d6133a0caa1c12534559e7fb3288772a5609e381718fa26f4ba24ecd0133509a0080865ed30e48a99e7a2564c4a24404c8aff594e2836a53d9b789cf1351ac";
+  sha512.doc = "5a7a4e1523499e56c8aac58b607f45e281029584ed94a33bbd1d686ead5ac42493aa7ac532225b3a1fe75eee6a67def5b77f2df3922d95a06122ef74514d35c4";
   hasRunfiles = true;
   version = "2.3";
 };
 "ascii-chart" = {
   stripPrefix = 0;
-  sha512.run = "e5354faf9d7eff0c25f25ff45510813de6e1940de80d0fd74b56bb071203ac8f179429272267bec61313401e5d52ad2bd62fbe7559f6c470b02d2f731ae4f48c";
-  sha512.doc = "9ca8d0fc6a3f0164f0644a6312def8a7a5a977993b8a136edaeac1bbe91ae2cbe41ca64638c925424633255f8650f466f96df5fbf0e5a27bd687d022b629895d";
+  sha512.run = "1fd50d28e196ab222bbbde5ffe09d00ba0ef8447e3a1cda1dcc53c648acf025a3e0d8985e4d46a015264751d969a82f749feb8ab73fad7f5d2c78b7b89964fee";
+  sha512.doc = "c8fe32025603c2673feca7d703f783708d049947360b3ad9f522283cea5a3e76893d067bbd8aaf100d63361595959e75fb83292a3d805b9b01fb6f03b26773ef";
 };
 "ascii-font" = {
   stripPrefix = 0;
-  sha512.run = "efb665b1880d330eb3f919c785b74840800e785cc23df55a3cbb8cce94885bb7791fc586a5a24ae0b7257ed5013ac5d270f3a055aebba84a75874afd4d29fb09";
-  sha512.doc = "3b7300426b10b7684eb91e0e069785a41e5d9807bdab16ea82597d700508a90ba3994cc4852f16beebe09f7f23a7542d36a52ef0425fc97ec9977ba6575d8521";
-  sha512.source = "c72a4670c1d5a7bfb2d1b2b115b8f54be835d55903384d218a3d95a3fe3599b6364fd72ca7887f193c9447750833b3f13b7ffa695e86943d66975b709bad1db5";
+  sha512.run = "4855c6dcd898e54580e695f060254ece4ab878af4353ca8b380016fdc125d655dc27049005eb060189661f57e980a4b4d81ccfffbf56af4e7c62ff9822d20be4";
+  sha512.doc = "1f845a88543b4db27ed1d943563ee04b72c141cb4b5ef79e34bf8406cdcc5156153fb2f6c666542dce397a3be67895b49dc5a81891091784c3e09ba324978a5c";
+  sha512.source = "0ac560a38a113f12378f20fa2cd1391c93554e4be30f04eb55c54835843febd5f47d43cc7ee33b68d47cb165cf3a5ffaa4260dca9d01e11f5809374062d2f65c";
   hasRunfiles = true;
   version = "2.0";
 };
 "asciilist" = {
   stripPrefix = 0;
-  sha512.run = "78b4df719e29ad06c749d6e74e8e06132760411e2d5a90293b09beaae7c87a8d139835243e9861a4ad8ff4e103f361e15179b693c66280701bfbdd896e791b9d";
-  sha512.doc = "e5b1b189fb729efe04ec3f9c9df71ee6debe230e066a558e34ce7414af71c93690fb0e3c4e7f46fca96837c11b09924ce1ab4bbc90beb0900a6bfff091b8eb8a";
-  sha512.source = "080f09803665f71747f8fe5ad9424d4feed61e6f97cd3021bafaf04d59b3c153fcdf9083df909d0847dd56dd6cbb6b68bf82ee5121d78659130302620f5fd488";
+  sha512.run = "7f7760ac5354fd1b18d905a830864efea31197b54aa476f251eb1800312bec4f72cdf0a94784fccc82ac97a930047205cc7890ea191050ab122df96a8ec3396e";
+  sha512.doc = "eb16899bd0f7852658967fb6b68c754bf86de289534185d6a1c66231f94cc1ff51db9ee8fad831f471b4f520c9d37531de8215262fef829d24b7a0564839a965";
+  sha512.source = "cf8fda71a8492a16d272ce2ef5c99db7800f94451d821fedc8bf3989f1d9611e84e5ca571436918d3b878376f41fa7fabe565ab52b72add3713ba5205c5764f7";
   hasRunfiles = true;
   version = "2.2";
 };
+"ascmac" = {
+  stripPrefix = 0;
+  sha512.run = "a7d334d650dd49db2fa008d402cb965f39423c31b5b31d7523c6f84f0658222ee4ec0bf1c36af3ba72a04c843b28bfa584a1c1c5ab2621d2254614130f5d822f";
+  sha512.doc = "cd0224f5f4c8fb4e1c2c93fa52003f59a1626868e836274fb0583518f936f076f82624a78d336e2bb8c3dff85bfa27f4a38d84313ea6a5a6d5ccf8f0656bf074";
+  sha512.source = "6534c82e006b16e87fb959f9d183b8a79a516b0c800c0fbe824fc7417cf87af6ece71cd384700881825ee0d983c9e7e6e058bd00dbc7aae1ba8f8dc802f893a8";
+  hasRunfiles = true;
+  version = "2.0h";
+};
 "askmaps" = {
   stripPrefix = 0;
-  sha512.run = "96307d620864eb12d5bc2bb9d37450c3d4b81ec7824fbc95711a50ef94e4a5f2aa98dfa1522dba660ecb048e9be73042f6f55000680f9bca8f2a8d870379c12d";
-  sha512.doc = "512c0f481232aee50b4198fc3ebbe1fe4ece2d13b3aebf0d257963241d4bd73f7ed81509a1daf394823b39f7a0f390b0596e029267afe96c23cb15535e3ad416";
+  sha512.run = "e863a74e09f62766c732d5eab5f0fa51c0801db091814ec4de20e4950c9e496322a2244a755a10c838f1efca8405bcb37041728b5b5a90e26557d42ce7593eb6";
+  sha512.doc = "38f24177c03adaa0a2d88a4efd6ff4a2fa4044a70f07589870aa5c7a200be6e2f15d681fa655fe165c9064f775efadb0dfb96d9dee8a644cc9ea00bb6a610bac";
   hasRunfiles = true;
   version = "0.1";
 };
 "aspectratio" = {
   stripPrefix = 0;
-  sha512.run = "194645cdeb0c2f1c753166d79662bc46f6894e51003a9f687b0ff3160d22ccaa2ca8d5a75baf0080baea9d1222607eda668e34f37bc6647c8c843e664c39a67e";
-  sha512.doc = "32ba235a219017c2dcf7c9de149ba424ee40173914d694cd31ad8412e1e22d4397cc67592f608b2f23f7fcf4d806a74a3d6df39d77ee2789cbab5bc149ae05cd";
+  sha512.run = "afc4ba58fa7da75f6e326e716a182ea380356232b043dbd9f146110687a5f1744276028153648b71d0552deaca53fb0f546c026301087e05b82f0be09171b9ce";
+  sha512.doc = "c95a99adefb2f6b3c0a28b556095f0de4eadde42c91a2b29a6fb2e9713f3c2ec05ef56fdd1e49da9a46ddfc042d62445db622eb04eccda97c4e337c1a76cce20";
   hasRunfiles = true;
   version = "2.0";
 };
 "assignment" = {
   stripPrefix = 0;
-  sha512.run = "b4db22b5a9dc13075e5ca8527be818658cb3cfaa2451b536aa70d1e45acef01d09760e22e3c8ee40b64a7699bd2d02567dbc85443e0f8e769c45d5948286e631";
-  sha512.doc = "a301c1d132bce5bed6a1d69f4909c85640516b36ee347d2039a2cd1138b0777a7aae86aca29d3e8b78a45342b389406230f7f603a2ebb3e9f2d04b13d8508d91";
+  sha512.run = "52c950cbbbba2eebef48051d67d89823df2e8789bf222ecd96ee6481fecc87437c3f095cd22c02af4e6dcd8b2d224ba3b739f303488437cb7b05dabeb41e0160";
+  sha512.doc = "670fc6ac24ef208a99a20117a392c799057f6324f925a1a848151aae385ad0542943d078b1cdf6967b217c9826c5941faea0e5e10888374b3782cb26543cdce5";
   hasRunfiles = true;
 };
 "assoccnt" = {
   stripPrefix = 0;
-  sha512.run = "2065d6fad069a64c351bbd14f5eabe7b5a7f4b556928c618bf89b38848c68cabe7683196bb7d530d34ec24aaf2a991f000375f40759c25829d8c01d1bd2a040d";
-  sha512.doc = "9074b055a623650228899c4a621725d76d2d950af46f421fbe6eaffe6c3edc01a1e6583042d63cb8569d57fd2bd553730de17b15db25a34bcd8d27218c9c4066";
+  sha512.run = "b18ca8b8b472b05c2df140e44c3366548dd6d3ff1424292b34d99319778874516ceea47b18a35d8bb0dc18c79d01560d53c36af0dc3730f9118ee73278c7569e";
+  sha512.doc = "8eb4efe8046664fab0f94857cf69feb1277d227825e65758f651ae2bec22c7a8d81395051f42f3121b07a7ff0d7926f82f0cae25dbe1edc29d7b6739533a78da";
   hasRunfiles = true;
   version = "0.8";
 };
 "astro" = {
   stripPrefix = 0;
-  sha512.run = "37406c86682341844efb18a1f2c936ab7ba5c10baa2d27ffae5fe5ff33954cd6865cd36391c14f69f37fab664c51cacbfd16f78768781936b6eebbfdecd84caf";
-  sha512.doc = "f6e9a91dc42b4fb6843af47efe3253557ad225bfc215aa6b0fcbb886a8b8b921fd8f227aded0d29a62510ae5fe9bcabd59c9e2a0228dad4c181da7e7983354bb";
+  sha512.run = "38d9b3c5850da7f2e80172fb46a4a1cb1797bb83570d73b17d6b16ec171bfde42cc838b9dfee6020c36210d36fec738e8750514ee0ba999d4d632601dbbb641b";
+  sha512.doc = "c4d662b1b8bc1ced4acf81fe4c3ed2c305517faa46ae43915e83e07fd5bc945dc20953120d6745bba845210ab12b67b75c85a8c860f6160e9ef009fe7812541c";
   hasRunfiles = true;
   version = "2.20";
 };
 "asyfig" = {
   stripPrefix = 0;
-  sha512.run = "e02e5d9df44ebfed360488d7cca4c3c3cff6b7c77c8f3d84ec6395289998f78f1019b62ebb6bd600a9a1b6d13b0c51fe0490f94f252d99440cb18994e42de291";
-  sha512.doc = "7a073c38ca7b9969d5e3b07b766257abad7fb71ce570cb5f9622301ab46cbdab7364794f9d7ad9cff52cb8357bb9a6b24a57f36c7cabeee423b981d0ed23f138";
-  sha512.source = "4afb65d201bdd8fc17da6424bd0c247d02880b3fa9d4c75e3d1defc0627a76532b112c6c7e197e5c6d90ec3eaa8aefeb435cb87a1a0133b25da34758da82b56a";
+  sha512.run = "c3780a1a2a5219be9844c69a73ca0a4b499684824101a2cf6718ec2dc6ca59c5da71b796374fffaf04c79814fde104d81729416deb668cfaf426b8b39b49d887";
+  sha512.doc = "592e6d8213c2ea232a159084fe8e721f32b9dfe62ffdd664499cb0dc07c69dbee0ad609e88cd4ac329cb5640b732e24c327f3a8eeadbc00e78c2e8f878949bec";
+  sha512.source = "5c884786d2b42aa858a11526e930650e8d70c9c59a263e98e3cc8562a7c83dd5640cf321ed51156c264baf47cd5cd7094a266812515f8cf3df5057fc4039d70c";
   hasRunfiles = true;
   version = "0.1c";
 };
 "asymptote" = {
-  sha512.run = "184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9";
-  sha512.doc = "50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca";
+  sha512.run = "8b59311bc3e87206c873d8d95f0448c5b644dc9624e34ee43bee990bbbfb76fcaafa7fb4f792619e0c00ed4c8ec12b35e3fb0612c48dfbd8e1903f24602a27f1";
+  sha512.doc = "95a9a635d8d769068762ead450a7afbf62159cb4f6c18ab080db4ed40b8f642496c18597ad31112cdb8582461c1505de5723db4b2f7e8354e42f2a0a36bf5fbd";
   hasRunfiles = true;
-  version = "2.41";
+  version = "2.44";
 };
 "asymptote-by-example-zh-cn" = {
   stripPrefix = 0;
-  sha512.run = "e9706ca4dc7a19eaea73a5166570eea8d4508328be6c061e0f5a4c625286870208f80f257a9ff7a6301acdb7c87a2bed4bc5197a994e9a27b9a13c287f9e6e51";
-  sha512.doc = "7a771c3fec977ac60a1c2a97f16b3d886446a8fb7124a2d2e2fc99639afbe19600c207546df1b0057459ff76bcb88b3b6ef887f823f62c404ad1052df07a15f8";
+  sha512.run = "a6dec09be14b4aedad42b36ec450568ab7ab28f3470c1e2f1250aa321bbf3aeeb1ab65749ae8e80c8edcbd9ac4de3714ebce3f0e8d161b81f83d2eaa7ee9468f";
+  sha512.doc = "4c2f70caaec42c2b8849dbcf4cb6e22d6dbb58d6658bbbdbc25f95325da179cc4fcd8e162be4110161884fe1848999a226fa5e32c1df3379e283c46cf3352b37";
 };
 "asymptote-faq-zh-cn" = {
   stripPrefix = 0;
-  sha512.run = "027d7706341ae36ba4849dfcdbe92c58e35011d4c16d9d02acdbeba2b9b254712bc84e4abedf4a0e85d1e5b773dbe66c6cf07ea8b600fac5784b9d2d69b35b61";
-  sha512.doc = "ee89ded99eb0a0ee133ff3b12828e7eba68012c1d561ae5e30ac8cbbfc2aa7d231f4c42415886798365068e8e5c616472f027be80787ded7abd3d82b4267dedb";
+  sha512.run = "870699bd0f11ecd0e8802317a4a53821131f78e318786e0b91f5a20cdf6e30a34965e86c5e49ccd847437d05ce0ef3d85fa4f9146d9e9e42d6f6a3f5691e1d81";
+  sha512.doc = "7149c09b2271ab76bdcea2cd73b588c4d7deeeb75ec1623c620216bc567ab582a1b23596a24b31adbe82b0fab908ab4679f42d7f75cbda43d002affa0557694d";
 };
 "asymptote-manual-zh-cn" = {
   stripPrefix = 0;
-  sha512.run = "86461afdeab420073c9497994b2be9ca7a41d23cf3ec65de02762be86f42648a1ea45a2435fef6b8fab3a37fb5d9748f46817db56642fcbb190bf2061602ed51";
-  sha512.doc = "44a127e89a1063c46b558224b096b2680d3b3c717ce4cca0c91eb5d5454eb2c8a230300ddba0e2db7eee336ac852927450802acb0a19fd1d9465c203da697c95";
+  sha512.run = "52e0b7154affa1a80affeed9d05ee738f3686412ecc76f7fe375fe4389cc4cb2fb872807995cd396a1613d38924ceb67205485300ca06660a461520463a213b7";
+  sha512.doc = "2cef7ee757860765447c3a4e17d1339bfc48f67957dfe46cbebc9228b37969076f87ed44b1893edd779a234b4848b74051f281d5c210770893481a12f5c5dd34";
 };
 "asypictureb" = {
   stripPrefix = 0;
-  sha512.run = "ababb572c0f7db6c7de468032fd80e25970f31482e29e02dd046f4d362ac6f9dd1c15149b8a773320bb0ae8f2f2290438006a243b2409564c6779322cab3268a";
-  sha512.doc = "0d700266dc4dd0239bafa7a58b4808f38c7505906425e2be886de4f396c4a545634a9af3d5f877a8ba5859dfb4181b4d468181ac279d3c86033f41f049da4d79";
-  sha512.source = "ee8d6c4820ecc9bc6663002841b0f9609024c26c0df923060a756691b4b87da7d0dfaa0ef8b53e8be534f1fbd2e8de2de0259ad8377f261363269d516a45ae68";
+  sha512.run = "e7e4d9498c41f3f130c159c08ab0102038c86131ea20125a1e2351855308dd8f102916967675fad3cc4a02e6e78359f2fdb6f84cc1d4f3cf388e99b9eb8b5461";
+  sha512.doc = "0e2b44453afe7fb363af9149d728404204ace89634b2484b8820529344bff354b77a6eeb395c9889bf8f41c27463c71a35fe87e2dbbc6c73dc055833a3392fb4";
+  sha512.source = "9ac413dba29f8687553f1f4c1e5fab4a5174cc2d5c1b930ec121464d40d02bf1e00d223fc5e950ab14ed9fefb18889b7eaa641dbacf4d5eb64c7d97a25a890e6";
   hasRunfiles = true;
   version = "0.3";
 };
 "attachfile" = {
   stripPrefix = 0;
-  sha512.run = "218ff20201b1c7cb06c914251cb1078f827dc79dce6bd06edd399f61c02afe311276b8fbfaef4c0ec0177e175b1eb9c61185c741ff72fdcf792befd8b706be6c";
-  sha512.doc = "0be32d7df130ad458eb5f83e3d810840d8b2402736de4b0431c9cefa769cb89778a9914f104cb7b6cf210365063347433bb406a025cabfc464e808144e8a04c1";
-  sha512.source = "1b6f20fe012e8640f80a489c0e9244df54d274fb6e061259aa2a841ff66e7dedf15e41d98c86e23f19179aa662770de3951bf2100ce3013b0e824a30403d0872";
+  sha512.run = "d3822454303b56dea07b70d13ba0f6ee028b975702ae2fca1aa30cf4301c2aec63d04b4402abbb1cc8afe428abefd8962f6066909442a7a721adaef536f4178a";
+  sha512.doc = "978203a446919d6dfffc112255efbf622813f7fc31c29b1be4c43dbacf131da65d18fd319678dc1985b2409cd39beac9c19eb7d7d37a7c83e05f86bab93859bd";
+  sha512.source = "93c6490abe9dfbe2eaf47f6e4ecc75597ae438569eb1b46e0d2174349a647055a3e4327edeadcbac048c08ee477998da5618e21dc970301ffc51910cac8502ec";
   hasRunfiles = true;
   version = "1.9";
 };
 "aucklandthesis" = {
   stripPrefix = 0;
-  sha512.run = "34a4ce830313e6e70b51f04c98487b9f71d37c8fc1b6c6dc43df5af531eb7b87c49ff4062dca6fa1d071e66e78f2481d9e827a54a5fdf933aade54fcfdaa4a8f";
-  sha512.doc = "81f5d9ce9ecf047781ee569b07b8ae9aebd8cd675a7e4384fd1283631e1d0d0a0d5d1fb2a43168634621c1d3663f7e8e008b9211b726b02183e1132bed5439fe";
+  sha512.run = "8fc87d1d8051104f8b04120b21345f012c561be17fb55318e0f5271f1e733f90c47ff8bd9d3a9abfe2f1700ed7aaece80b56e3f6686d764dc0671baab558c379";
+  sha512.doc = "5cb21d7b1f6af55647aa18ee873956acabf3997ab42a8438bcc0ccdf4d750cd1ab5b1f649a9c352e8e8611c597b85d89a048e0673da9a060fda30d5760ced120";
   hasRunfiles = true;
 };
 "augie" = {
   stripPrefix = 0;
-  sha512.run = "f90947ffa7bbae0fb53c2975a7854d46b1f6cc7f6cc3569a791dc42d60bcb0644f4b7c481e66a97119f683457e36fca0409099ea085f470359f8f4e8847ac2cc";
-  sha512.doc = "a5a6208f9f34e1b977812872e7d6fb2c355b4683233ba2561bf2b703019a156f37b102a8b7f20365bb9e6e0a3eb5bee8a85a24ea57e6b37e573aa2264314c4a2";
+  sha512.run = "e0730f825609cdaf710e1e690fa0e1d2f9d221eb613bbdc048e7a76ea53cf300f1a6c76132428cf703841d869161e9511e19260c81d0f8d16bff2192a58c3c28";
+  sha512.doc = "4f67effe73e1a3f808db40ac511c7eafbc571bc75071635cc2e4e5c438ff37529b79795aece4ebec85ef3a1033aeae50c8220f9c37e0f293fb96794b5df9ad9d";
   hasRunfiles = true;
 };
 "auncial-new" = {
   stripPrefix = 0;
-  sha512.run = "d7afc0b4c4fe999042fa3916ce1db5d0f9e907e841005ac1ee54ef65923f42c8829307b3f88bb706ee1ec52d177b5b91ea7b79417557ae9854888196a8dbaae3";
-  sha512.doc = "f71bfe39684f7a8d6c7fdb3f1131dc9021468c8f2371e83853b3403c25fb15004eb5b3ed6163ff8bda39c69ecececf2107885b66600c7c60172996d2bedf2362";
-  sha512.source = "b134606892b4e6c099abd524a4ccfe571c0a28de6d62207e74b7b96c674ef6002d02bd1e4c1b4abac793702a040b0e727ec0972b19cc2de6f32fde59735f5eb3";
+  sha512.run = "fc20d541f0d72adec1faa1ebbbbb7e97daca725b1484b5e671194ed54edf01cb4641092e5e912e3a4c83a0ea4468c4439c468a3fc313d1327ed1200bc8cf38c4";
+  sha512.doc = "502f991b9ad1057b56f6b339418a3b4f24d859221b9487322ec9c32e81ee4d2179331e36a746aef5cad4d6e5d7ca24ebdcd9a1739d876d0ea946c21e1fe6c2ee";
+  sha512.source = "f43a8f249a0992edd328aa2d790dfb901d98feacb816e836d7babb7c4a6ce5a935a5835efd855f5c910ef0831eed84f725a12b63cc7b203d9d621caf2cadf467";
   hasRunfiles = true;
   version = "2.0";
 };
 "aurical" = {
   stripPrefix = 0;
-  sha512.run = "a8e0bc85d3247d77dec35ceac48bfc7e9b6ed001f0f6cd3b7bf968c411c907c7ec59942545d76b6c6c6c06fb2640336327c6fd83a10799c5332fcfd4d24062d8";
-  sha512.doc = "a8584feaab3a8bb3a2a0a5fda576868e6edef726c5071f7f24196a61208c0a511657ae073e4be1349992e3baf89bb63d519b4650fbf10fd3790c159babd5df18";
+  sha512.run = "189e1cf6e3e020129190305c0001cc6c4c53905f35dd3d6700b7890d6e17f639b3e73201a19ca9a776bcfa9cbaca23b4317de93b15ca6d4b8c58387911cb3594";
+  sha512.doc = "d143b4c7aff62a1f937859ec1c2bf2695b620ae6630f5d6f79045dd9a8af031e053ed5999d5e7af2e621e07644e13b7e62177846685bb6c82169adb79e49972f";
   hasRunfiles = true;
   version = "1.5";
 };
 "aurl" = {
   stripPrefix = 0;
-  sha512.run = "e893d36bd2ea43c5b8cb787c5d45648a5d793babc0c6409e8e6a9d48ac90dfdc0b368857ff0214bf8273d38bc24ddb59ecb8c0d3dfa5d860f9d8580c53b7d863";
-  sha512.doc = "983c117b5b768ce1212b73f9bdb5384db66e83cc5b20110e8f8f1691f15b67889711859c30b073e3911f7177d42856b0f800efd6ecb45590beafdbcd4a51432c";
+  sha512.run = "72f8ec9390d5ef41ff638813af3918e5720efdd5304ea0cad671c50d583022f63b7b5d5e95333a8d956ede34cb1f2ded7f4823f5988b78b0e47614f14d2a38b8";
+  sha512.doc = "4a22e98fb56441a8c24bacd4272aa75c28f253bf0a95c7c2805747c74e90dbf4a9ffd00b118936af94485c8a8832e3eceb434f312b9fb064bd03ae08f3d6165a";
   hasRunfiles = true;
 };
 "authoraftertitle" = {
   stripPrefix = 0;
-  sha512.run = "c387517bf82d702446b2c218db55aa61ffea652b2fdfd50ed35f8a89ada5e916c52b6d1a5fb029e8044cad21d70fa238140a90a9b59a4679c0504820fa30a0aa";
-  sha512.doc = "4eb3f787294602923ef0daceb81621520ec8e824e8d793d1fd023a02fbc1998387a050761a9a98c40be29fbd5cc16f2c2e28c5cf2d6bf1e11257fafd5efa1b70";
+  sha512.run = "ccb3ad94a19d5ae7dd8458301e64359009750ba4a2691160aef27cab0541e85be199ceb54ced34039b1a4fd9333e8ef31ba586e813793704e01a62d55297e57f";
+  sha512.doc = "c4c1e6b6d2e51b88554d77986e59633326d2c90912c2b898735fe4c7f9ff94ae2f07f48c73010d3298e0b50949719b9f7e53257e0fb4efb3b3fe4f8e7fa5f7e4";
   hasRunfiles = true;
   version = "0.9";
 };
 "authorarchive" = {
   stripPrefix = 0;
-  sha512.run = "782f4c6e88628ea12227cb5a778653452c70210c9d556382ffa261c25792841feb51932c74a21d5f9f794e472386a7fe26442328d84223ce7b8f00b52e4ad1f8";
-  sha512.doc = "a2033379e51b2a4f1404e6831368555c1bebb2e25ad9bf4b738b14a7a7bcc158be27c6082336ec287b7c0e5a862e5267bb5063c0e448bfb572bdba3b7575938e";
+  sha512.run = "115b855ebbc3c240b619b0f7c990614ebd6b41459572b987e0b61e960b09530bbe443018ee9301442230a1e3ff2cc7035fdf1916564f7e64814c7c6ad23dbc5f";
+  sha512.doc = "5456c2c482c9a93dc2b7324d7bbce4ba6dc82f6951f12cc0db5f286ccc40deb9546ab9bdc8c341d27232352636969bdfdd86b8c052b4a6180b383ef845b17943";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "authorindex" = {
-  sha512.run = "22a3d000ead808b9ae7e5b49248c06a0ae7e74c567503e7abd60ba40cbe6aefba30e118cf05a10089060ff5ec8be12750b8e2960dbe7c99bfe5b7df78453ffe2";
-  sha512.doc = "8d540a36ae7aff2518c7961972e76254b0c2669f0b020bae0589895a26a12726af95ff405f3d2a4c0783cd6a450f619d1c8cc3397163e10129a6dfb3aa5df1b7";
+  sha512.run = "6670290d8b9633702ce0ff4ea2c8c55c7ab5060b0be2c0fe48f9c04479a8524849f21fcfe96a24dcbf49b462b00604d117aafab5fb90e88f24f84fc4ba25887f";
+  sha512.doc = "208e31260df7fd2a20e0ced195e9de1ca5571b81a98ec0c6e0b6608cf15838e31239aece57d458af7be80d2b97ba95a9fd49515ff76e64dca804d4bc44ecbcbe";
   hasRunfiles = true;
 };
 "auto-pst-pdf" = {
   stripPrefix = 0;
-  sha512.run = "2e7e3840966b968cb53ca7cb61012af3cfd01838a2373e3b99a132299ac2c99b61b41c6af8500c7112730959e98e8ccad84e7c87b5fd4d398126c19c693cfb16";
-  sha512.doc = "860fa5bb033c166bae229640ab6628f08676220eacda82e175779c8cfaca9f05738a67abba1a065f028cd6798d206db91aeccfead025d2a1a21f4a20b178fe82";
-  sha512.source = "72fc493c3ea56a00e72afb292b818029abe4d2d0adf3a545ae142edcdfdd3fabcab8116cbdde2f037c400424cbac4aba6e823f5c1bf47bd3af4848c0d8bbc86b";
+  sha512.run = "da060486e85d825df484121613e0ae6aff8c53a58146af1abb11b1edcc6a2c199e7e95e071e0652e8a692b1d6405bca8d0fcfa0c7f1b96f78e699aa9cfb3b5df";
+  sha512.doc = "ad66260eb6e2350831e297d9420dbed24c0b25bc95443246bdcbb62a29393fd8ca1ca612d1cbb16af8e57a7ca9a16d371561bd166fa4af3a9dea7d51f4990786";
+  sha512.source = "cfb0f1cf0e64e5433e11f2e8b2005ea2a58d7a5e0df185631935d4e4c7c4c2f0ac950088b5cfd2c52aec1b0da18edf2b20801042640b9db4f4dbe869a91e722d";
   hasRunfiles = true;
   version = "0.6";
 };
+"auto-pst-pdf-lua" = {
+  stripPrefix = 0;
+  sha512.run = "445db94035bc1804849bbd9b460a2d50918506c0483e9b996fec0cbfa7ce2ef1672d2310d6910a974565fb978a902e0393b17a3da6b8384538f3bed6e233cd2d";
+  sha512.doc = "1f0dd8df25eb07dd4956185850cbf8f7bb4f845b0da43da77933dd5af3ecbf05d305858e23abefae6ccd239309d28e526ee43e771d1d4a40d2e79c973f07a205";
+  hasRunfiles = true;
+  version = "0.02";
+};
 "autoaligne" = {
   stripPrefix = 0;
-  sha512.run = "8009fe8d39841a46841e790b1a0ab36b0a42a11d69749c7f0b357f2d85a7f5c0dab937813e7c5bc79d5240bc0c1860fe073149ad6b6d79f60f53c27b8f36f07b";
-  sha512.doc = "0c249fcf39b290c783bd8bdf78fabe99aefe236a8295c21d9b4d554f6f6c85e8050878ae347f2bb2299a43fd22eb69360ad36795b47ad75108af728d3d395b82";
+  sha512.run = "aa5913bbad1e62ae063a4e9fe039ce9ece4ac003a17a1154c9416fdd60d38fcc706d11ab9ffb279d2ff3fa8018066944c6d2a4db7e06355fac168ac9c3426dca";
+  sha512.doc = "697acb43c273c9e0c16fa0ba15193aeb2937480d628c64aa9f9c41097305bbce99512066b08fbc0495ad81791b8b6ea6d7f9895e6e4676ef816d31410852146a";
   hasRunfiles = true;
   version = "1.3";
 };
 "autoarea" = {
   stripPrefix = 0;
-  sha512.run = "db1bcfcf7ceb8731308a7167cff1d56c963ff2eebd2ffd033d19b0438ab200cb1e886c46d2f9042122e8dcdc21f8831be8354a5061d9bef76707a4086e04634d";
-  sha512.doc = "b0aeee18eeef9a9104e7f3861d38a220357a663c7044f37ccc14a94e3025eb8d4c2c7d2e828847b7200fd9d1ba27779370c08a154812f55252fe6f5552ad0ec4";
+  sha512.run = "4e6ed4df6075d92ccd9df1a2f33b26801c037bec3f4dba41c4e7833e74b678c0755317074b2e7d5a54771eccaf698aafcaad2be3b10be2fdd46351916ae8388d";
+  sha512.doc = "f848ebf6885374e4577448fcf71710683b086f044697597c13847902f7fca41db56312cd99060b7ce70e186c2f00b2adfbdb3ad53874b9dfd8e2fb613086e569";
   hasRunfiles = true;
   version = "0.3a";
 };
 "autobreak" = {
   stripPrefix = 0;
-  sha512.run = "79931f3e40266ecf3afbe2c0e2d5c09e67ae12aec62a6ff2e8bd84811f55d28102ebc82a4785a791d8db51210561715901ab032cd62821d560e221ecd33117db";
-  sha512.doc = "879467823aaaa98e6a1065850044c06c6c1b8f7387c6bfa1197c627f42a0d270ac0be4efe166429ff596ff66432c24c7ae934782a2d8bce352b286227092b23a";
-  sha512.source = "84da64e68cf8b000bfe02b59586509cbe1dcf4f55ce64b83f56f29c654e892f0ef7a7fb3bc10a80258f1204b7dcca7cc05f19f29e206de956676cc872f70eedf";
+  sha512.run = "28ed1cb8666e429ced51c7e9b8c12521b8362a20e47f2b616369535bef51a793fa7ee7ab761cf5f14da7fea7fe4f5d5663bf866dfdfc0feff3c094b691831fea";
+  sha512.doc = "de493fe99bf70ee0f51b59a8f3ad6a26f24a4442fc4a5a33697bad1e8144c8f236b4ec5a3cdbd5d5c3bce4c7a7e107bf60951d53d8523510023239076b69c1aa";
+  sha512.source = "f3c2f9cd1d4c612e9ad5765e8c56f57a6f2d19a1d7aa9360a0d614ccc72ab2b03673b7ba7d42f1213bda23f2eee806d40f77fd7ef12516056095ac6f7bfcc976";
   hasRunfiles = true;
   version = "0.3";
 };
 "automata" = {
   stripPrefix = 0;
-  sha512.run = "aa9c215d65e2ebab36aa20500b2d2ebabd71833e128d81f876f1ec5fbb556b7721adf6658abdb58f3501a4a83cf7736c52c1e9d0f45b3ed92d62411439825500";
-  sha512.doc = "503dfe62989845823756349d9bbc5e9dc9ace35ebe5f5556abc238e7168bc1eacae902def4847f78962f124a40878279c5b66a5888634311c4c63db291cdf9ac";
+  sha512.run = "877daa2071a2e87e620d10f15a4faf9ccb056de1a8cf160943d3c8f532946f4c32a1ebdbb77ae4b059f29b6ec7f7981f328bd97a6302d29d256c314dd17b70fb";
+  sha512.doc = "21fd4d78ea7e24f456b4a35da714ed05ac920a51f274c8a382cdaf41bbedd90918ab1abdccd8bb830c1b388a127886f8a49372bd4a5c45d9addcd74614e7243e";
   hasRunfiles = true;
   version = "0.3";
 };
 "autonum" = {
   stripPrefix = 0;
-  sha512.run = "0edb009219b259a7601f8cf733a6d41e3af9c31df5ca4ccb1acba0b81a7938f94ec87214e074161076b673759262885ae71d9db661677bd7788c2fc7c60cddb2";
-  sha512.doc = "951ad069cfaf41f1bfe6ca302dea76b317e3b5ceb345600226054cc97770af4f41c361f181f377f773634c778a6f1b51546f5ca07a8722be351f84da3954521e";
-  sha512.source = "0f4c61eca8de3213336d77f69fe80363194a76b0a17735afe4c72f7fe2726a3f4382762ee86957205892fa7542ce14dcd855d7bd44a332245ecc0456bba0b326";
+  sha512.run = "db9056b150b3144bbf5308152daaf92c9f6526ff1fda1f2756752ea7fff22bc6370c5fcbde63f797fb855e8fd0d6215fb9fea64618a802552010b429772cb930";
+  sha512.doc = "6f159c3421e4deeb2d323652ba37c9994826d44c5267b9cf8ea799dc669962c6f43bc677d162bdae7e6f745533fad0b5a3579ae268f82c9a1dc67ab7eade7e82";
+  sha512.source = "b9e02ea802eaf54632d5591b565efca2a43f5d33fb0ddaa3f6dbc161118747cd37f9d3db3373a75922f7e560d9aab34b0aabfead126962e5e7cc4afb766625e1";
   hasRunfiles = true;
   version = "0.3.11";
 };
 "autopdf" = {
   stripPrefix = 0;
-  sha512.run = "43e70ab7e0c4a90ce95c387cff581d1d30e549f8c1a9d46fd204056d960c8b8802a41977191750fddbd2c2e0f1ac669b5c02ced595ed674cadc803dab5b32ab6";
-  sha512.doc = "b87584a693c5bf110deaf4d3549bc71802e24f9669cc30caad6063f876852eada690bb9c07469fdb647afbccf2103eedbcd54ea4bb3c648b1f85f50f444f4613";
-  sha512.source = "0007bbff42d313ea93f4e6300cdd1f6f5445ba088b7b99448b10148bdb3ebf3c190f1c831235fb92b8d6809416266dbb7f0b003954874433ca484d27d3eea0ea";
+  sha512.run = "86c8f4f0db169aeaa209fceb4644eaa15e278af28693760484bd31b7e694192491bdf765b69e7e25757c6d50dfa585740af4491532858e0dd6e64209c2425567";
+  sha512.doc = "344598e8228e657a98cdf940eeadb8317514ece4559ad7f0350a8f8cbb314a007ddddcf7dff6f48e442db915aa65e5ebe912a3a39d66028d8182698a365efd0f";
+  sha512.source = "7bcd4c4b60933c1cff3f74339b0f33a13f08d9b2210bc0fa430e29ded978273d0015660b3617d1af983a2f43a469366e7da6ab12080ccddcdc19f1208b8c575c";
   hasRunfiles = true;
   version = "1.1";
 };
 "autosp" = {
-  sha512.run = "51f7f7d6de238fd0e54b6a59e65a76b6f3d95d7fbbd94b536754336dd78af45951f1bb9452db536e3dac9f8e97ed593aadc623d49f825124bb82507e2112aa93";
-  sha512.doc = "a7b01320b76ddcf0ee20860550ccebc18bc2883b8c8ff897f6f7dc23612e6bbbb0551f4a4dbcae91ecb4d39fed9444dcaa3e11a5aea046c1ba69f89745c75320";
+  sha512.run = "5b4ab7caeafa71244467cf3e33f7f566e1af92f1f3668c340c5ed9b37d16a65bdd26dc55ed2608e368d98662c2850f958ae2d85232cf8dab787ef96181380a24";
+  sha512.doc = "d2ee430889b7ab16b7f680da857a645f2265d889cfe9855c1696073ac942f5a5de9f1cec09a136f8882be231e156e4342da42ba0bb49c214d26462edd5d845ca";
 };
 "avantgar" = {
   stripPrefix = 0;
-  sha512.run = "eb4735762229e2d1131e21bb92225db46c543c3fd914f579790b049585dee826c028d8cb2534badb96f42ef777871df018d8b2aff4e9342dc32752f864739358";
+  sha512.run = "1db30cc96ea57f118fdbcd25a54e19d0294d86a48bb17c8527f6a2d9f3eab275e34368bf7e409b40758398bc657cd00357030e1fb806e89032c328c9b4714081";
   hasRunfiles = true;
 };
 "avremu" = {
   stripPrefix = 0;
-  sha512.run = "20b8b7436e73ecff120c8888727b44dcf18f22ec6b708bf3d442374eaf9986227d7c2a11829974c71ea7d5f6a39c3b74c711c5c4da1538f6bc445cdb43957c6d";
-  sha512.doc = "30dee8061d1d10da69c4a14d8485a0984dbefaaa1e92241705dd6326a4769561b0ea67f50ecbf8a3de57616cf623bf0ca6a1f2a720ebf3e6f392aacd9468c600";
-  sha512.source = "d278dda10302b758327009f27ff5af88ad48d9e708d41db452828b9deea358a9a111c5f0d2956401088e0679599de23cb271305d1c7aff079f350140f57e6a5a";
+  sha512.run = "eb3e8c67a051120379399cd3560fcf20e3277cea3dac00ba8fe2e8e9f52ef1f32fef793806caae9b6f77f3b86313e09dca402acc70ee61d28ede757a6c93d78e";
+  sha512.doc = "d5de3e6775d8075ed1270dc68e9d9b1f73860fd2f5730e72704de574e1b36824d0b5c1e9171d2f0d8cfcafa64931460e95ba218cfd4f89b46a1cfec0f6460069";
+  sha512.source = "e6f5e7f3c6edc7d457161812f259d1752071c3aee31b8a53ed75a32f447c187c3af8c4003e0c09eb54fee52a67b114796c6465ed35d81350bb8a05f1696a4c90";
   hasRunfiles = true;
   version = "0.1";
 };
 "awesomebox" = {
   stripPrefix = 0;
-  sha512.run = "3a23dfc7f5354036b62725015bab3b921a1c617dc0be4e69f23c49ce9b31fc6d73daf396b3a66794d5a7aa24dbc4b41056bf04cd5700b831fc3a72523bd45356";
-  sha512.doc = "c77a3b24afc6951cdec01900257277f108597e11d0d261813e43524cc494fa41f16e2e7c945c6392c11bfcf3b2b5c041b2e3f5549075d062988a5509074f66bd";
+  sha512.run = "a18bae28362c1f78b928fede31962310fa09f96d2b94900977acc129c5ad398c97cb4a1881e46922e6aa87538f01b8f4d4969073f876705a5a594f0509d083ef";
+  sha512.doc = "2f7b3f3fb4748e35631df7c251a11d63c745856fe3338150cbdfb15eedd8e2d9cb42e7d564e3d519df92eadfbe6e9eb733daf724714207e44903e8ac300b6578";
   hasRunfiles = true;
   version = "0.2";
 };
-"axodraw2" = {
+"axessibility" = {
   stripPrefix = 0;
-  sha512.run = "a0a018b69a0913743bcb25f0473612f762ea795f0ee42bf647fabdd3ebae2548dbafa925108b6c1e23dd3bfd1237763d2906b9f4a03633b1d603b3f28bed030a";
-  sha512.doc = "139bbaabb55b37c7523e187650034769107ac6cead7bdd858f3b1fb5c1774e86d63e280605cd201b2e794367419388fa8be7082d63065867b2d1bc3e7d151ec9";
-  sha512.source = "a2feafa154aaf943a5e122ab269fe511ca28ce0e441343161758bb64b2a9344840f2a50dc3d8246641b7978165ce996bb5c6d6e45e70c7bfb006570193aa6953";
+  sha512.run = "d54c6761e8bea5d1526cd39ccf2bfa40474acc4c2351a12a983c829f1556e2a31ef35b73784d53b16ff7e46992a8f168fff66340d9c26a8631d8927e35854c10";
+  sha512.doc = "b08ed0ea4403f7de91ef1ac0ac7bd7f5bce8fe7fce801c052f96581b6e6b33046f5d8b295ed1c7de8d88763e3ad22901cc3718b8a68165f802ec4e36bab0c6af";
+  sha512.source = "da9e67ba9079e2c6f0672771c631d1be717920f36c1d0a94625ad05fa81780aed5dd69b1b114b39c3d0932ddee1c51911abb6578cd75d2a999916d8fead65fc8";
+  hasRunfiles = true;
+  version = "1.0";
+};
+"axodraw2" = {
+  sha512.run = "44f5de31e79d21bd8d9f7995a9d8e29416618141714a30e5186cd303d079f9136feea36f0ec7145a10da42e8aa0e1718fe02e90c149b966d779672744b0b6da8";
+  sha512.doc = "1258524b3d82b225d455b5a6bf71a6d39723514ed6f7c0ab359dce17380b500232b42ad222947bbd33843fe0127aac8d15f243145660c8513fbca2612bde1ef7";
+  sha512.source = "a697d13147cb93ce9d7b17b6a4ee6962645a603592edc299b34ce7622db77064daf43440afbee01913033f441c68bf13bc421499472e7969d964af4514483002";
   hasRunfiles = true;
   version = "2.1.1";
 };
 "b1encoding" = {
   stripPrefix = 0;
-  sha512.run = "8757685004cf243e8147dc47ebb415008eaf089c2d3215f8245e0b180efbfa065248f6c3b2d55e454ba452597df6b49b72c3e150425409b10f5f4a3fc1762059";
-  sha512.doc = "ea46f3bce31f967bc11340ba0dd119c4774a68ce548cadeb3ec899b458c3c19e079dc83d75edd9449283f9aaca40338861b1df39ce3ed12f5f928ac580bb0750";
-  sha512.source = "ccca22773806d2e3a785c697eef68842f49a0c9e3b38182517562119fba4ac1b227ea00f334191b8a4b6bd29e5e2626f11684def91902faacb0021617442d5f4";
+  sha512.run = "351c3f5524a31a3a95fbb791cbd607c1a07c0940291c03cab56d1025f03129b6d16b1785f30e891389c2283d7f04f9824583029cd0e8ee71cd3b9f578e4b9858";
+  sha512.doc = "5ed0bcaf581cfebcf54f98081f926cce8aa477e72a656ef1e095498d81da348473cf620a809381e667b170cd1dc239c45ccd97114a29667b38b7d505eef18f4f";
+  sha512.source = "09bc915765f3b62a25e9cfc02a87f20b62680674792147bd3dfbbcb5df998bd9f179f95222c3fa35b7aa5e4779245e6acce9319b9892fc20d12fa6c364532527";
   hasRunfiles = true;
   version = "1.0";
 };
 "babel" = {
   stripPrefix = 0;
-  sha512.run = "0efe2b377b10a1acb9ff6b064292f2d4a41eac83a01e2b2c1e9bb89cc57025687966baf191f4c26fe8dde4bcedcd0b9fa1e4dd03420fdee027097d28705cd8c9";
-  sha512.doc = "f151e25ff8f77adf534d5f4c0ad72981d23b816e9601184bb7f1090e8b4b979d37e51c4cbe62fe5fbf2d50974a29617c24ef1be20d87414e0403cfd82b936b19";
-  sha512.source = "64935f512239f5f37e6c2f131ae5a98a020afed53afebd181aaae7ce3097e91cfad0a71622ce51916c28d1927430b1e35a6c0178b800d6d6305b789dfbd5f8b8";
+  sha512.run = "b49e817720922ddf694982b028c9bc7750e04f029993744e131a9b3db1c6a5461a81b294d1562d2822dac4fb3baa12839099e69a202e0831d523b1ae4f5452bb";
+  sha512.doc = "ecca7c0b9a994d5d0cddfc919bb71f6f3ddfde1e5cc2ed4f0387fbfde8095c92b577a89930550df525fccd6e6db4d1a50df6c99f43988c749b4c4ed241a391df";
+  sha512.source = "95d5e64d8886d3178e24772e2280158944d6e6034b620e33172369153b906e081e6132a18b237a9f6e7f60a75dd71898d9eabce7f61e64fa8a552adaab93832d";
   hasRunfiles = true;
-  version = "3.18";
+  version = "3.22";
 };
 "babel-albanian" = {
   stripPrefix = 0;
-  sha512.run = "83da2a6edd9fbf0cddc2102ace91f4e268f78a6988accc47a8bb62ef9df56a20c8b5c99283d98dd4ee80ba3ee95e1cb02fe2c759ad8c4f4f19406c2cbd93c2ce";
-  sha512.doc = "69f750f291bc3dcc64d6b1ae8ccf3ed6247086ac14a085e1f86ca9e45787be87c900bb75303bc4e1695287d862b4c882c292d3fb9004505b8c767211f632e8c0";
-  sha512.source = "564a1dae7381eda267b6bfdde3cc4004ddcd1f723c95373d2053687fb93675ba7f687dd7e179ded909875e69dcca68c78b2b7570aaf8ac3b458feda5ce0b5004";
+  sha512.run = "4ded4b96f04ede479629ce0d00106f0e4a465192d05b00b02c0a2371ddfd498697bea3d5ded41e8293ee86b27d10227eb0619087b4b4fd7620b2f5fe25331364";
+  sha512.doc = "cda9366b09ff803ea627a3671572294ed9ea57e64d0601519e048e88bcf5fdc6e93fc1e8f348cd3e40464030023de80804993d085a91ca32c624bc0569a84b46";
+  sha512.source = "2c1eecf94db156b41dacee9778e6a1fa70a0c7a2daa8cf542d3a06361b17e9c30ac236e898949a2e1a28fe0a18aa7d267cfc423e3511fefd711d7c6ec8cbb4e3";
   hasRunfiles = true;
   version = "1.0c";
 };
 "babel-azerbaijani" = {
   stripPrefix = 0;
-  sha512.run = "9dcebf2be3e6959083f1533dc75630b54f8354878fa3d9a84a2f0b24dc54216c0ab2ff3ca8889bec3659f5e7dc4e92fa5fdc6db0c4ac2e58ba19bd6ecd32b791";
-  sha512.doc = "e0f7faaae791df23fedcb9ff95bc48e476095ae28b701d570a52652403587f609cf2e693a1642d9438974b8f982fd0be6f28cd9a3dd07b89c5680f3f56145c0e";
-  sha512.source = "dc4d40cc428f5f3e63e786b22d591cfd1f8928c2e8f41af38a6f09c45d1fcb462b51b435d808e1864f0ce24321d652a042435690c0d8dc84a47a32b435724388";
+  sha512.run = "ff5d20bfaf8abe1548758de9df8010c245d3378c16fd122cf017e48e8743274041b30fa162c7ab25db41118771c933cc369ac64da5050f56cb66afacf1dc218f";
+  sha512.doc = "f2f4e56a31a221187d9518deec555d845f2ccfa209b56b97a0db26c08074a50cebe3b4e72827c0e086519e4faf8c2e25f29ec840353624be53da2d2e71743677";
+  sha512.source = "610ac48a2a8af1fd568edfab12d823796d969b5bffcd386f961faaa24ce5fba80adaca4753ca942eacdc043cc1faa32a60f2ef8b079e2c009c94ec6f0122394d";
   hasRunfiles = true;
   version = "1.0a";
 };
 "babel-basque" = {
   stripPrefix = 0;
-  sha512.run = "a76c5d8f20720adfec1955f42f454aca00768ce84291ab9f5cfe7cbd6a754fc2c20c2c1ad6fa3cf71c6c386784484f8a3640142554c2b254ad4b1032ece199a7";
-  sha512.doc = "9b238482f51936bad23e944fa8a4cad522ff7684fda20020d35d2bae484166cb7d2f56d783f4f002986cbab523ac3d8226b66280fb2f673422ee2904b58af0ba";
-  sha512.source = "01f47b616b583599b71d38224d74b94843916fcf3bdb2cd260c4a5f7ec9548dd2c3e8fe19ce68a0e439d64a222de74d802796cb6ba904c2892dcba2fcc1b89de";
+  sha512.run = "6f37623cffc4e1428b1ed54336667e1520ae7340e325f72320e4ed81a95170fe90c97219e16158c3bbe396b245ae2389c5c39e4172dc18364238c4cdd5a59a97";
+  sha512.doc = "a4db9e3815c5b30a6f8db93ca272035f53c72d26d408b78c4c49f1a92038e992de081711ed75d5f6447a17ca19774e33441431da759752b0f45296f1978b84b4";
+  sha512.source = "2463bb86298d3470eef2a69b0c45919f818fe51db3700e3c688c96921280fc582c0683a24e875572d324354b67b2728233f57dd69eda14e1eddd1be03b144e6b";
   hasRunfiles = true;
   version = "1.0f";
 };
 "babel-belarusian" = {
   stripPrefix = 0;
-  sha512.run = "b29a19cf1e4ee9a2cfaf462a3f18d7a092a3708ab1db7387963508c493573996276bf8e3903da67bc996ad7f2e58f41545aba39154b4ed1c60d70e73ad354ed0";
-  sha512.doc = "2e118fc3b5c8d42c2ee35a17d2a5aa19f550ac2bfc78c388e9dacf99d923b2bf1c6e37b54e090ae16362be36484eea808e50833829688cea6d8be4bce2a32ccf";
-  sha512.source = "d367daf38e905cd58806ff3f5bc595ee3984e1ec8fd029c048a813f497b3f462e143f2da414a01a0f6b30c4a862c1df56a0a0f0e71265e3526afca986d3c86a1";
+  sha512.run = "a3326f47b11b2e533d170f98598d56daaf4e46c303e04c3861beed87a10136bd53033d9bdc3bffc38ca898da22d6e21a0c172a6aa5c48e180191377ef1061328";
+  sha512.doc = "c0468bd5f5bd8c7656f0ca80b7a6cd329b407aae943fa704d6da237fd2c26f978f7aa0f1859fa2b93decfe47cece126520fe458f284f4824b12555cd14a12418";
+  sha512.source = "cb047d5440e552b56e782f0d32395f8d32dbd2888abbe03f010bf9361258c3fdbd8eeb18b1aef11895162ed631c357cb7ca14dd1abbe93da27f426ae903db357";
   hasRunfiles = true;
-  version = "1.3h";
+  version = "1.4";
 };
 "babel-bosnian" = {
   stripPrefix = 0;
-  sha512.run = "d0bb8bd32c36948d52b1613da8f460656c0531085ccdb43e27bb534dbd0c8dbcb1074dbcdd85e860cfc1a977bf674dcbd2b12c57f1ead2b1348446b441599102";
-  sha512.doc = "e859e02e13931ee74c782a5d9780dc350fc81b0b98e3ed464e61c0cd3abf31c5162859a80dca2b8604f926484f8da772bafe3d4473967e8f6d59d6ae5c578c70";
-  sha512.source = "77c26de077a296f675bf4a19d16e0ac0ef0c779fe0a410839b49fd0361660a0830ee0a1572647c070e35f0e8553003d1ad13046459567ce8510fb8b9cdcc4851";
+  sha512.run = "4b0e663a3a1fb99e58730a1d4b4b2a1ab6194eef4004faf8a15a44232079705bfa8d4dad624a0b1daff602fc4d84bc4531910cc506d35d49be6ccdd52a976f48";
+  sha512.doc = "57ee6ed2169c6f981b9dd8173fca92e23ccc6631bb8a960f7eef0a9f4a0a6b839deafe211ce80cd1769046b0dfff4aa50491a49d42f40aa2bf9154ac8fbf51a7";
+  sha512.source = "b045fd77dbc51f60ebd5aea7a8967fcc7786b272fca7c5388af57e956d72d63ca90d6e01a58f531ab15a967a76d277941c65606bc824c6b49df5eaf4bb078bc6";
   hasRunfiles = true;
   version = "1.1";
 };
 "babel-breton" = {
   stripPrefix = 0;
-  sha512.run = "5bdc6319b57753e72f6aea72a6223764883325b0f18cc4ccde7913adc1ebfc8df5d68de1d72e3ebf54a887d135b9f82b44612906da0644e66f8f083ac04d781e";
-  sha512.doc = "a453fdaf01678c71178d41ad012220c80e3c00736d130532c5c2f8d7a5c2a64ac2b5a1d29960726b774502961839c4c49d59b41ba098ac5a57dacfe604c7d03a";
-  sha512.source = "574eee0e6f10766512d5d7818bee491edfb5d38ceaccf72ec34c9713189d3c412d548975e4e4c774120b6b48ea800bc188a26660bb8adc97fd802f68641f6eef";
+  sha512.run = "9419235cc96d61d613bf5381648fa87cec48da62fd430a0ecad2ebd729720e6e08ed70a8c44069904e4596e0b7e11dab11f70c0f0e3a0fe13b2411f56404fdbb";
+  sha512.doc = "b1fa42f226e1f7dd6ea57de3f27652f48dc75a6764be79231a9003e9adcc90b6418d948fb421c8f68d14aa27ff0826ad9a0993df23d13a8dcd49b90c6d1a5792";
+  sha512.source = "3f33649e926a66557e6a790a2f05383bea7a7da78492a0d1d55fa46780e3112b663017bd75c261cb1d3727b8b5ad1ffe57d1a4a534531bd16b93d7e28cb3bdba";
   hasRunfiles = true;
   version = "1.0h";
 };
 "babel-bulgarian" = {
   stripPrefix = 0;
-  sha512.run = "ce19e60afee6c805afc03c071075d05e3a96bcbf4ae7c2e529c8008c46e749d8a015c312491236c3fd323237517d7c84d2ce05806d647684534c75056c6e5938";
-  sha512.doc = "dfb685431cec4328c8ee233fbb3c02f295dfecf07afddae0433abcec5c4e2c430627c3c635e558e4b943ec943ee8b7626a95015703d6f1cccbca8dc6e0a13b63";
-  sha512.source = "8d05718a0da1b14a6d52d16a79059dab21158da0d0b96ad81ad7d448c1acc81d1ccfe6a26a317bfe9008b02da824f22d494ade265691566abe06a9779c8c500f";
+  sha512.run = "e810c0d8d78a5ca01fc7a1435dda1457673f1a70f5cfe1ae8da509ca3e126edbab7b0710236ba9e0b1816efcd970973e4bfc48b66c5dc130dab0284bd2ea561f";
+  sha512.doc = "e3b61430ebb0b16836e60cb394cd031a7b33fcf527d2daff4eb176702f33879bdd982e9764ad4b02184034db03cd4554b73e65f8e49c07af643870393c0085b4";
+  sha512.source = "2840b9310a55b7ec0304441a969c8d0529bb86be5c002c87ca7a51c338febf44af0970d8c8260c8c6d8c80b4653c68f40fb7084c68e8800f751acd8eea58b552";
   hasRunfiles = true;
   version = "1.2g";
 };
 "babel-catalan" = {
   stripPrefix = 0;
-  sha512.run = "8b13e9ab705ab20a9ae6a00d4b9061f053469a67ccd0c91597fe5ee17af5069e1b9b0a0f4984b5b4eae2ffdb240691f4a0fe3ad8cb2d905eb0209ee5f3ad6da3";
-  sha512.doc = "6e058f26463985f3a5ae86c0cf9d7f3caa15ba425404d93d0aa2012da884d06701ff0dd623e0d9fc1c1c8d205cb45b01ec79d80fde718e9b1dade30f0f3d32e1";
-  sha512.source = "d16795bec94e4cc4e32d965ec53f9e417299559caf55d1e531b50850add07e1b35de9d7d10e042bc1f65017ee5f9fc75bd51bbf5e68eb94ddd06d154c0b21b43";
+  sha512.run = "eeb0375046728448801a64f4e1145c6acecc4ced63b95c5a8e058de1b07d19dd62f93ee9e0150e19f28f2130a699402e127293e1ac08db966cde609a0fef3511";
+  sha512.doc = "ee4ab0ffe913c9e3f502ade176cdb9206953d60c3a65f13ed74eceb84e560d4c1aeeb463f78dfcb023a8c9847d868aa5155602892d6738233af9690fcd93d294";
+  sha512.source = "3ff53b950ec8014adf75eaf27bacf1ec72a7f8b9865b53f11c00e48390cc4f7ff7a04eb56d216fdcf23b281394c43d893fa5ea3d4b988d8d24840a4ac9a4808c";
   hasRunfiles = true;
   version = "2.2p";
 };
 "babel-croatian" = {
   stripPrefix = 0;
-  sha512.run = "3ee9b2b0be60a44904272cbab8c8430cbd89aa80fe730e695b46e6b54192bfbc81ae7ddbbab0f1788e21456685a721fcf637c4ac7f71dfee946e78ee40dc2d2a";
-  sha512.doc = "215b3adaaff5e3d0ae0ef6d53e9dcdac1a2c8ef6f8072b73f37749f977a7de624e2b6d0c98955e4ca9bc8931a1fd27101dd000819a91295c24f21edf4dfb476b";
-  sha512.source = "8825b7dc7bb4289eab44f6ef853ff6223f38a64674bd1407bc09a691df138a6bb41d54e9980d956744acd3024e304d48a34686f05083fc4570b92b796f40455f";
+  sha512.run = "8dcfb71004aa592f1d8f57e7fa815c450420ca4f7a8e3edc4210843c5ef00d12d99f0a305ce88ffc490bbac5c744abea36f2470b90fa7e4bd1e676b344e71f17";
+  sha512.doc = "38d1e17d89ce29a21f1feeed4a4d40db6e167e185e09a5dc40af657013ace9f9076ec4313d25877435b1460fc868a5d53db5ced4012e54cb088be4cb8b6e5a2b";
+  sha512.source = "d34e7f021ffdd5390d9d77217a8112b2cad811e4de719708cc2bae0e1586e3392ca5ed055ca0ed96cc362f4cb5d8522a18c0b1939c798e9d036c2e817c6a96f1";
   hasRunfiles = true;
   version = "1.3l";
 };
 "babel-czech" = {
   stripPrefix = 0;
-  sha512.run = "3d9452e98370550c94d2f24def262cc514a3ca636f5061ef18222102b52cf727db22abe9dc927ebcaf3cb2c089fe792e0617127bd16ab8a7892616c0567b5b62";
-  sha512.doc = "022f8333d186bc8a7123b2cc1636e58acb59e1996e1e5b00704da60195cf02b9b436b1e0f8cb1b7363fbfaeb4671f2e5dfc0405b633e5b0ed5cd687076cf63f3";
-  sha512.source = "82210fd84ee4ab8b4c503e2e7f47f14aa7b1f822619c7f8344a7345a7542371ea8f4525f4016d6fbd7b0edf831e780a7aa4554875cfdb340246756c2f16393e6";
+  sha512.run = "35ade1c7e7b5b9cec4b641a35d90530abc471a25f2d4846f2833b7ffcef0e1a52337743053a9c9dbec471eaa60f2417ac55a58cbf48f6c5ed7615f373fd25512";
+  sha512.doc = "d42389fc54574af7840fd294e9491a4a52e7252203b1adf151743ba8f9bc5331a4572b9f3babd2d5a626ecfacc25560fc664870379db3842358d34d4cbb5bc60";
+  sha512.source = "b2219aa3654d29cade260cad2ee484db2882c58c2021150b477a64770ee2c710467c49f1ee26e335be921bb13c49350bd8bb1c97c647d1031bea89cb8d5c988c";
   hasRunfiles = true;
   version = "3.1a";
 };
 "babel-danish" = {
   stripPrefix = 0;
-  sha512.run = "cf2db86f2039c84148103603c28b2578cb0cb48883df88a5aa0b8056fef6d773ecb0ccdf0ec43854b5c15d9f9f4a1940dc074944972194fec8e24e8212642096";
-  sha512.doc = "4596b55f385cb0b7d0e00abab4f96de1752c16fdf99a4fd480ef9136dbda8ff9fb35701e5a02255382216813c2a857f4b40bf77501ffb0b6897e8401f8977b4c";
-  sha512.source = "c7a214957fa3de1ed1ea64193789cf9e6edbb1f2f7984fadfaed70742005b7f4ac4531ec5e2ae1bb9955cdc09b261694b531da06a05fbd10e069bdbba9b2d000";
+  sha512.run = "ffc3e2b30b996813dd5696b592ca8f9da50c9e49b18a60bbbfa8727953deb1889aabb7144987a1f6dcbe15835a27e15fb5b483dc99b75122cade7b04ff0d9701";
+  sha512.doc = "5feef03dc39706498e272396722b4413354133b07a5250a38ac097e414a36d2f34b648a49d989269c6a3a031724f45928a03dd8b42bbd55db4cfdb068e3bc75a";
+  sha512.source = "ac4461a91783a0d1aca6f8bf2b27f8d8372edc55174ed37f524c0a661e70cc5a6f5de6ff433765d594f7ebcd3097f728d22dbf102cde2db2d6fa57e4222b5f08";
   hasRunfiles = true;
   version = "1.3r";
 };
 "babel-dutch" = {
   stripPrefix = 0;
-  sha512.run = "522d407a2aa3eb517d3e3612221673968d05dd7bf63b087474b57a3cc46ebf88cde3c004f3b70458549a6ac91e90453f16f03967b03f09be7a66a44ee22234fe";
-  sha512.doc = "93d95aa46d07143456c920e01fd1232d70897c491cb363a617b6eb25024d3e34f03febb2dfb4382c38f156b87f9789900b6d6d0abf7d756cad1da9e3f12dbb76";
-  sha512.source = "70c397164286481f20a1f63e605e8a6944d7535ef4ae07aa4f09d678dfda231410421f691c033d937012820d7dd9fc95edd58922ee9d416c41a7bf814af809ea";
+  sha512.run = "11e12e540cc54721ceb01cddd29bff5b1241c5d7b686b738471e7516f016b0911ae58f43200e0cb69a9efe8b7e82d6f5869838b4f1d7e55ef29a8ecd8a157c38";
+  sha512.doc = "4d9e1358239587c5f08f48957a7900d2f47f0d705ced6a7dad9d1547fc75e304fdf4431228d3c411ef6b83f8921b1037bf8885312d684cb9472a17c772b445f2";
+  sha512.source = "146d27ad2f651ea9f89c464e82a07c8caaed7a2a6cbfd64305bbaa2dd0af439f2ea04e2cc5cf931d7d8e96891306a709822a35545b4f155cb6db979d8510ea62";
   hasRunfiles = true;
   version = "3.8i";
 };
 "babel-english" = {
   stripPrefix = 0;
-  sha512.run = "44bc030e03dcece02a8873fb8973e3405ab10d1d9bf313786f8b35e5f6c3a6df7e80a7691070dfb0ca69979db0fce3b9af3d9322e065610232dfd2f6d7fc001d";
-  sha512.doc = "b8f544c55d17f27d11246c7fb50dff440124b452d271a968f590d0fd30b244b142f2f5f37fdf73f4c2b79097b077e4695e82a79f06ffaf563ce9b52b458a53f7";
-  sha512.source = "4a019c0342ed0337da36524a9d5283cd76bf409c83501ea6230924e490ff1bd93a413c70c9718d34f2b1f80000562c770e6f35cece4ab5cbe60821bcd169e888";
+  sha512.run = "4f1109e6a4b7733e67081e17540495e96d34204e90c9c8ae250e380bcb92509d551418abebdb315f2650776f024d1e2553e7f56d39e5a02eca1bc90a92dd7cc9";
+  sha512.doc = "2e2e89cfb258b47e04fc821d352543b53af526194a05b010a3b20775b8054772412f89bc1dc05f24ef73153a3edff97a1c6c0d329cdce1f8ccf0a9c1e9966d2d";
+  sha512.source = "898dec50b72091756a130dce305b512e8660a31fd22839e7a1f12ba4ed24fbac833b3f7ba11c6771ada3ec14229152a9d61ac8e398d86fd3b5eb6a9c6a0f7858";
   hasRunfiles = true;
-  version = "3.3q";
+  version = "3.3r";
 };
 "babel-esperanto" = {
   stripPrefix = 0;
-  sha512.run = "32e906a1717ac4a6a883dc2562ddacb28bbf0f83c2e8cdc5e7fc935c504cc1d736fcbaacd7131cf21188efcc4bcbfbd98c8e65245e84782191d11893872da5fb";
-  sha512.doc = "989b23898bf67a939245e6ea5feaea551e766287ffef271c79a63c81e6e956da24f024dc936e7dafdcccaf6a45344644bfcd978825f0e4de23ad54dee93a8a6f";
-  sha512.source = "8272e394ecf62cd001350b3b3f78862f1b36dba71592770ef35e2092561618664b7e242b79d649e56e8daf5ebbeb25c7fa10d58078f33148ea4d2892e0b29674";
+  sha512.run = "3b72c7f74574b44ada229656f5e04ec367c57c863919e4e6dc9e0fa8c94683f8d7cb12da02441c0ad7fca55129299e5096654e2418b67493694355ad6b049c4b";
+  sha512.doc = "1a5e7129af0ec7f0e93dd5cd8e0e6553f61dfc16b9dccc1b5d78ef9b5d13d4c5e4586264c90b8af8f95ab870d33fd7c1e60edce882c0d3093e273d64dba74510";
+  sha512.source = "d8ed70e4d50ad4ca362177b2a5b4e096a032f4734e52de26670b03be179d4f59167571d8c02bc0d9f32652a2b65c3d46c715fcc933bc0a8bede67584ee39bc66";
   hasRunfiles = true;
   version = "1.4t";
 };
 "babel-estonian" = {
   stripPrefix = 0;
-  sha512.run = "643bb65784c432d33fcfca8e869765bc35db2c3b6a9bd9944e723805d5cd8e94f3755850106fab7a1fb4e32ee9b73ce1ce53119618b507001e6c96e75f8ece34";
-  sha512.doc = "0ad800fba626657bb87db1e32d9922d5623d6c03a22f8697572b45f5f7fa9aee84672b214b0791be06ba3a7bcd81021d2c81432947eb266af4375ed9337e34d1";
-  sha512.source = "fe55efda570e235f198f0e95cf97d097752b2988b40d8a82b8d060120a3c6b51553c5e66e78c03c11652fe8b446e314518147ac8fd02a72127e51edb6774f4a6";
+  sha512.run = "e6419c5acb041e34315039deb0ef779de2bdc5b8cdc30bf12cebf79e12d7f6fc1a9b8a2dd3bf06be45ee93a3e7a155887f5eb866559e34fe2bdd612a4fa36ea6";
+  sha512.doc = "8ff726d46dfa3e7c3c94279835667afbf62163399d241737b505538fa41c2319c2913422b013909f0ab2aac8cb269e67520e27bf88dab2070c63e72ffbf6b4da";
+  sha512.source = "2b49c613f1e277660f1ea6ccc3bdee6c62adff3c72c4254ed2a7c59cc95e7370c0643d729132995ff4281da64890ff9c7a05d995d547b0d7ee1bcddc896cb245";
   hasRunfiles = true;
   version = "1.1a";
 };
 "babel-finnish" = {
   stripPrefix = 0;
-  sha512.run = "9670e3b5d5390b4f751be4b87e4c6522fdc0daa2440e574f90f3a4dd704841921e70a3fc5dbd5e3cbb2d6238ef70a7b752cc3be1b80d070a4ff26d1c86805b33";
-  sha512.doc = "2085a8e58ffcbc17f0e3d0d8fea1bfac204e5300be17cdcb8bb3cb358835b47b47169a5d1a171d6696b7d318f38c0009ab5752c4fec3d7969026c1712cc08e1e";
-  sha512.source = "59120fcce0e239251c064e0de55eb8d33d1857c0d8b32e204f8c4833eaba9d33956204704b65c1893c2e019b40ae2a516390d2d780db74c6bd245520b24efb9c";
+  sha512.run = "55f299adf7ee977d6f4a466ed85cea62e306ff11f61803a60f0c0dbbf11ed50b8b7548daaa011907653f9bbbfe23b7ec786daa51c5f017130953ebdd5b4bd7e6";
+  sha512.doc = "b2a60174362cbac3ac542a4786c266396f837f030fede09f8c13a10b6b1655380e4d396759e4a1e4cc4cfd0fdf0dddec8433f1cbd2c3c350c5c9a00e26ebf851";
+  sha512.source = "f19a6c6ca491a53ac8fa599e651818add0cc97721f2b37b7919d272878eadbfc7a560e05d4d0a060187ef89eb1fbc786f217859f8b11dfc9dad1d777cdc709ea";
   hasRunfiles = true;
   version = "1.3q";
 };
 "babel-french" = {
   stripPrefix = 0;
-  sha512.run = "cde690e80bf70da2428189886efe30ff5fe5837fc13800ec8d6016aa5611bf1540b69c32755b251055f9de1879f1b0137d7e165779b5c39347a2489cce914167";
-  sha512.doc = "3a8cbc7d40736e83199855555f88fc546e9fe9a5e6a5e201084b490097a0f5d75ef3dad21237f706bd27ee619783898193129d4824d91afb420f9867887874fb";
-  sha512.source = "f950923236959bf5ea8be8dc5be089c0a38d0ee8c9425120811939e3b7fce648192f6530c8aaa5da07474cf0557bd10af42127089a7f028e561adffe8958c5ad";
+  sha512.run = "fd55ef2474cb7b4a44d9219c13e4651a1126cee1241d4bbe57f88c5ccc95ffc1f16fe3b13378ec49d8aa19bd57ab09fce88c8dda44332f881a74b4d4dd380e8e";
+  sha512.doc = "de1281b795d5169bf9e89fdc7e2d685bc3b5b8a48e4ca390b593ce992c780dd6dddd7ecb66c3a497ad4ca13194830041a2998e938d7e47a36743bd17c796b198";
+  sha512.source = "02895266535e957d105f4f4ae50be336513679190259c191fffc5d0017febabfd07405e319237e74c9762202232c2504fb68d22b3943df37b41912cc9983dd72";
   hasRunfiles = true;
-  version = "3.4b";
+  version = "3.5b";
 };
 "babel-friulan" = {
   stripPrefix = 0;
-  sha512.run = "a3944cd703836e2af4ef6ca7416b23c03321a74c915e19fe7e9ee0eb416cebfe9c90ca1f86c59b7f167bbafe4aaf7a44734a23dd4e50d2fd07582559fbcb2ca9";
-  sha512.doc = "40317926c4915b3acc302d0e79eaabcbbd88760a41ad07327da63ced8d7c0d0668dd20bb5c8073e966b5817a4d25d771e1b032a9aa528afbee04f73dede88a84";
-  sha512.source = "be4e2a5d231b41873fc1e5519ab7d23a60322a3de9d9ff53e7fad4699dc124ca25e55a30dce01791d1e266e10b36703c079b7c8e5807ba87c5d52549af1766ae";
+  sha512.run = "8109dc48800410f612f7cb8db586c1b7167a88aa0b97c53b310a6e7df240cc0ad2b4af1ec17901fbba51ba63326ba67e3bb055661079098ac0d920e3b5e58243";
+  sha512.doc = "36a4f276b4853aad705bc7d4d91e4f83758d865a33a07f791dd4c92aa69ed7b6968a2a6c567a0005a0b2a852142aaddc8770a197af50b51ec6251ad1abe47d71";
+  sha512.source = "9e2d1e1faaf451fae88bdd2fce6aa5157e54589b2c99d107e949d5b0a76d748e01bb337a1f8602034ddf73b0775f1ee31a94669bfef791580770e1c125eb404a";
   hasRunfiles = true;
   version = "1.3";
 };
 "babel-galician" = {
   stripPrefix = 0;
-  sha512.run = "429ddde53203fb4c04da78d4527cbb437a4539335f72da4757686342fbd40889d71bdd3b73c6da5012c279ad9f3a4d5ae67422358a133383a9dd798768a1b0fe";
-  sha512.doc = "a827f35d3d9e7034b39033d0414958d241bf0d7527ddf2437e22c92efe108cb91ce2a02154d6f4f33bb8a73f51e8fb9d7b1c0d525a10d83cf5f1091169a87cd7";
-  sha512.source = "b2e6c92e10ce944f64f1f597a0b784631c4402e8b8ea1f51c15f7b1155a4c71cd9709590c94aef941a2274b8ab7185df71cb27cc7ad477e075c4b5307bcec9d1";
+  sha512.run = "6450ed91db8f9adf40f20978f01e17b33b6e642f2bbdf35c26b32c73317da16f8fe799d4ecbe81b289cdcaca6bfd7e43a64b30e9242a08d93be06d886eadd840";
+  sha512.doc = "3281b0ba42dff840b167092d608682cff85009e76ada57213339e8e072fac0f748400df7d481d588716851a19d5716520c6c684b5744c83d8fe9b3043f411b13";
+  sha512.source = "7682082366f91a48c6860264a1b1f32df121b0cb3c21d5e7790ab383d0a5f5d451f8b76e1e90eaacd3748ad6565f3e05bd80882c11328802b431ed81144c301d";
   hasRunfiles = true;
   version = "4.3c";
 };
 "babel-georgian" = {
   stripPrefix = 0;
-  sha512.run = "6af5bd0c91959704cbda8899f7c62c97ecbd7d66d3e2badfad63d32433845b0b23e1324418594891b124324c960b58095b5042f8b4e10be230b005862f0e3cd9";
-  sha512.doc = "2c95c21cc7589e486f5b49f23bd3010a883794da23b60bad502042931ed1f8569d0271aebf03fb2974e5280a688264afe5f4dbbd62baeaba56eabe92e46722e7";
+  sha512.run = "74da8bb775637709180690a5582c8cd69a663e86ec7b8b29077de469b607ec9e1c9f76739527785b83054be79b7523cd5a63b1b144e3e708b81fe86d3dafe329";
+  sha512.doc = "20df6fc5e4c5557ed2f63072e93de750049d09473eae15061d287c0cc1937922037e41cba9138e91be4bf274b3e211fc493428ec655a02eebeb4f02765381134";
   hasRunfiles = true;
   version = "2.2";
 };
 "babel-german" = {
   stripPrefix = 0;
-  sha512.run = "8bac7ab5b40833b5e46c7334ecd5a10b2100ee1c0d83f84b8fc437d05aa321d34b6288d4af79e10a605a28bffe88b68df938b605127f72b079aab58ade34eeef";
-  sha512.doc = "cd45376fe32e4f07d7684692c12684dd95b885e1723b0c5c8c699d29bd98a64401a07996877866b80738297f4f2e90d0bb3029f773c18b4d29315f0d62e1d0de";
-  sha512.source = "b6828e3a3b3daafb3f9bfa1cbbafdd18cc96cd680a7a5a2f309e46fd8da3d5172d0eb69cfd4475277b10887b5ab3b950b695ef91a2565050db8c3e4bfb0db2d9";
+  sha512.run = "c9daf4cf8288f26849834519e8854ebe48b8ad21d5ac060833abebe0e57ff2eb09950001ef0f85f952c0526c699b07d14917a876e7586eda5b9b36f3dd5200f3";
+  sha512.doc = "2cd2295e2425a5feba2e88ee2e6f34809cd28eb84f8ac192b55bbefec780aa270751e41c27f45214e2b255a502eae9f08de3bf9ca05340ac34da94d7d852613c";
+  sha512.source = "19054488bd88fdcd949b691105c0dbbdd5e5245f5ed5ca6f99eb64213def7b4492f4d9b303110200a51c60c9bcc2b36628854e1068d823ddc2222c5ed402262e";
   hasRunfiles = true;
-  version = "2.9";
+  version = "2.10";
 };
 "babel-greek" = {
   stripPrefix = 0;
-  sha512.run = "bf69d411c82043bb35d90e9e1feca8027f29c7fa930527f483b5ebae5c99235fac8f1ec77b9287eb06e818da8ecf2f8779bec438c4298f6aaeb5b2aefb1292ac";
-  sha512.doc = "66797d0d1a6366b33284b5f81a454e090335e16cb807b125c7321bdc2579b78f6b4fa8cf4c4866a3fca4a26b3f6d87a0c5aaa7829a5f09fb09dc63cfcd410bc1";
-  sha512.source = "edada1c8799050e3b58e1b24a28e6ff679386c106fed2cde204a0adcb6836c78ee18e5b0e3c49fe623365b9ae295430d9efbfbc42374a8dee04ea06c8adc23db";
+  sha512.run = "4800e215a89eb2d015615844e97bb031ab02fa2c61d800f3250c56b4e9f1c52a37d53662e6b7fc97258bd7ce37927cc51e30df5de24d5e99b75f5235992fcfb5";
+  sha512.doc = "ee38a900a60e1c65ae5e5ae29d596bc78ad17221aeaec8aeeb09483b93dabed5264668132c9347ff33fcf2cf5ee6ef5d67f9bb8d0cc588abc8bd66f22858b53e";
+  sha512.source = "bb8b266ebaedbab8d4c4e11c5bb8b866d1abd2146ec48719e3df59ae132515c5af832d30c72ffd4223469dfafd3cea20a94faa95157098f289337e7d948004c7";
   hasRunfiles = true;
   version = "1.9g";
 };
 "babel-hebrew" = {
   stripPrefix = 0;
-  sha512.run = "45e602a666d697dc4a993b4eb63fcd9515873f7c279ddd8b7e5d35b1201147c6338b663f839fb703be7c0c59244fd4ddf115f5eee47014f151694419f4b1f5c7";
-  sha512.doc = "bd3536b7c9832413e3da5c8389783751cef74deed345877d5716d5901ba1f1c4d392b333878752ce7c4f1c4f9a01a5d65e9eb0294e83fc982b8b687055f5848e";
-  sha512.source = "b74f05e3aeaf94b67057a16f50822f321ab8c82fd446531e143993983929d0a7f13212c79a28f364dd3d868079e28a8e23a444b780b2925ed445bd935cb406d1";
+  sha512.run = "2f4222611aef260b688eb706300971006bf9024127923a074a05fdb9b8ae8606210bca5b89bcd7a5cf3baed1b057e407a05d54ca40713f2b6a56de03dbe94fa4";
+  sha512.doc = "97a940d28ac2922479efde5f5a0cd7ece655fd03cc440d65c8d995ecb685c04d04a2f8c5e20b95d0df9a81b7c165d42cef74542e26ed82496896d7d008d2f174";
+  sha512.source = "4b4ec20f8bea91d21ba3ec8af7023f16d1b48feae26e14b162b03ce04d8349af13b5ffd7c63496489613fd4c437acf9656bb99a1fef317923730445ccb55e214";
   hasRunfiles = true;
   version = "2.3h";
 };
 "babel-hungarian" = {
   stripPrefix = 0;
-  sha512.run = "9cff9186f582712df3cd81bfe1fc8ab979a4a1eae10c6066f5e29152a0dcafbdc9ab79beb6a226f5003faa253df66c1b15e080215d42967d70391288a641b88c";
-  sha512.doc = "8252897104782d44afdd369bf28808b5e5b5298ba44a53d89d2e7666e5b4b0c727cae8c47f447a97b48099d1615bb8144aad79b0037c09a608d7ea5049a9111f";
+  sha512.run = "87c152d654912c106a2c79c884d12e758211a9090f649188be123042629b25ef683b831a6d95f58eaf1361a9be9b9e7c001f95cdc2d9be5c23f17c1a74b1f59e";
+  sha512.doc = "d39ee7feefd274be96529c1912f9058ff9970dc3978e47209cc4b8166141cb10179a512a41e5dd3a262da2de4de6334ca073f3cc00393c25833394fa9d038b2b";
   hasRunfiles = true;
   version = "1.5c";
 };
 "babel-icelandic" = {
   stripPrefix = 0;
-  sha512.run = "e014b00695069ff369f60a6e5207258bf0da055a4a92c649cd8528d411958e2c263d16da7831a3b121301b168ac9d4428d7c701fde48f1261f63b6bdfa940f6b";
-  sha512.doc = "4bec65cc7570ee171395de2ab28d909f991151eec313dd38c3d4121104c5d55634696a99f336d107d427aedfd111d76870e23a4835f1e342d2da49d3b98715d3";
-  sha512.source = "a872e9c9c2eed4b8dfcaf6ecef28b4f4d06c09104230ea231ade5fdb5fd9ee472cb18958ff2d37e2424d5f5490675fe7e82b55a12864212e7756831dcc577b92";
+  sha512.run = "c4ab9db602c76e347c28f3a6f024b192ac6ba3b0dbb03ee358b604a1d44e421540abb6b4576c503b9de241d75f260c2d396b8488c6bbd13e6a57e7fcb7a7f203";
+  sha512.doc = "3b6eb5d0783fb7bc10bd12e17702b6d955f77b1fa2484510f898669eceea0272defaf4fb0f5eeef0d14340d0df20aa6b43fb408fefe14fbe9bffd25aa772459b";
+  sha512.source = "4359176f0586d24ee5691de7b259f4f81c253c1d7a09cafcb6e43110308010f6388feda6a37761732b5bc26278cf58d0651e42b86c693b75e9d6f34f4abc5095";
   hasRunfiles = true;
   version = "1.2b";
 };
 "babel-indonesian" = {
   stripPrefix = 0;
-  sha512.run = "dd036de1c91e07ff3b38e0f3ef1cf76480ab6572d084d93d21c7c18202ad7ceb8ce4f1257ba43fb56d1bf1729f6812241d306449046e0d3dff5326b19fb285e3";
-  sha512.doc = "df47856fcdac0e2273c8b791716d60bb57a23576f7d5a0e2f0683d00972794a1c6fd0273fe5471ef0612ed3c38bf62a3a5bc459cd7f94b5e6763512f0ba9662a";
-  sha512.source = "d8e148c6bcd873fcf27da66412544aac55ef79c07af9bb30cdf5fb83d4c4632848b85d4e97092453188b92a89a0a0b9549e0f1d6661673d1279e31e58ee8e625";
+  sha512.run = "a3d0851d42a3585e16371a7def25e19c73a34f9bbdd0d17b48b1bcdb3c9002ce18b9dfdb845f73dba3acf8cd9a247a2abbe650a69978e16d283bcb11ec676ad4";
+  sha512.doc = "17f638e88f76f6b9a409eba259eb05a8bb9505997f2012a381f1979da9bbf468f0e55280457b079fc72e19500a7f3eeae74b6e4a1639a7c94480de67ae7cbff6";
+  sha512.source = "5914a64b195f31b3d4bb61918813a06a62bb9c1a9c4a410ecb5d8869cf06a02c8e971cfbb51c43abeec10f54f0f51f21e2570b7029ce8d7e039c68bb96fba5cb";
   hasRunfiles = true;
   version = "1.0m";
 };
 "babel-interlingua" = {
   stripPrefix = 0;
-  sha512.run = "06d6f7ca2b289972b8891c93fabc133067a3c0e4009a7060b34ea119c1e15651f80173f77c3423a550bb3290d54531cd599bf1eca0526e3bfe3dbadf1f76ed1f";
-  sha512.doc = "67b5dc6a1e2dbef2c0cbf14b209388f3835f21382183598a21f27a1648f18268ed97bfdb95610a5876f814ede1ba63b8c52d5286981740a015f79488cab71439";
-  sha512.source = "57f5f8c9a111d8699e3c1115f36dc55e55d14fbc3247292f2715772a54690ebfe573c4d764119e68f176585f5941deaa5604d0e933bafbcf6305092c49faa8bc";
+  sha512.run = "d0364273cc01871a76ea00818c719be0cbbe01c97192ff0c5628216931768ca8c637a8bf0cea45b8f8c44c11270436bae426d969806d3b2fe7b35b3000bb89c8";
+  sha512.doc = "8c8471463e7ecd7dc895589bd83ee53d27d08e662cce3b612c505df7192600bc898ce6ca5c79c3a5d6201824f6fcca72541f60591bb171c8b0f0e6f749d40d8a";
+  sha512.source = "cd34c1eed67ca6ba327216705b812db56b2f464019d83fd1ad06eebe1e0054189af93d52003f42f3f4bb3c7f6f5643b4cab67e207e211d7a4af8bff665e9063c";
   hasRunfiles = true;
   version = "1.6";
 };
 "babel-irish" = {
   stripPrefix = 0;
-  sha512.run = "a366642c7e2d590bb06c4af39868978221912b295eea9e52c5c42fed522b3f80f4f1b43750af0c932665ef54f351f3c472464a0eea03cf3d22be99602120208f";
-  sha512.doc = "9a0bc220deb1b8f91c812d1cbeb58a4b4b47532029772aab43a3957fd718bfb46267e0b94bbfd1894f442b8ecd9b097ab1b63ab2579add3766dcb6c5d90689be";
-  sha512.source = "5f80f69bfeb9e2e531c3d2368839b85f43a06ac553ffb989a8c8825b3abfa5d822b995fcb1a69f267f46dc8bb90249c54d491e6264e3dccb2d8a1d2345f2df7e";
+  sha512.run = "7b17aabb50c13d6739fad6966d5680df5631528b6deb81cfcfcde9b9cab53fb1319a9427d0754b3bea9f04d6f3c1c48cc4bf7147d3873ee5417f0b4ea5ed4a62";
+  sha512.doc = "971d8d7ffd3c4a821e9b7aa7a8c6429d9b6c1133149e74618b8f95cbfcdb930ef70c2c84680572d92b2c24072ebb85369a370b8a9e6029a1c71fcf52a0845703";
+  sha512.source = "27f24bdfb66b7d2b0c1da63b46f92160d070dba5cf65b7ba6fb3bb35b876074a51ffb78e8c9de1d69bdd385e023ae45aaed8d360dcf8c7010617a6b5f9803ec2";
   hasRunfiles = true;
   version = "1.0h";
 };
 "babel-italian" = {
   stripPrefix = 0;
-  sha512.run = "db689ec8c0e5da6371aa668842ddaa7b3d2d6fec538d63157b6846e208e925c889f99817e8909826e68f5a3e5435b872367e7ae9f365fd48494c042db9c8b6e4";
-  sha512.doc = "e991d129862ce8ec8abd7289c6e1e992c8fa3ecb04ebf4cc78a71ccd41a7249569cd0dd82c58896eb2174853e25861b72c00d494d6e9b49e104b49b7330e5d2a";
-  sha512.source = "cd42b48bcca9bb04c71c572fcaa51d537d60dfc7224fa54ad008cebbf2f69298e3e081537a5d56e59f8dd3178df2b6db2c17ee86efd63cac0c352f38aaa3a106";
+  sha512.run = "ea2627fdf73f0d3817f64108ecfcdeaeb225e5ad393cbf4ebb264d536018b8772d66a08a3e7d1d5598ac0c58ba84ff0f88ef7fdcce7dcb730e58caee19aa75c1";
+  sha512.doc = "dac6d03cf69119702071050153917f18c8fa9bfca3f83786e78f462046644b43852f5c08ff58a739daa72cae7203128e6b06968b54c81bc4c2ddb4b248176b71";
+  sha512.source = "2c491c7ce033588f11cb52589fbf03f42f7bd32723aad5ade0af801c2d30b2a3667eea767756830b5333349c3dd3f63df66cbdfd34d4188101d5bf64fd670021";
   hasRunfiles = true;
   version = "1.3n";
 };
 "babel-japanese" = {
   stripPrefix = 0;
-  sha512.run = "dee7b37698a45e0983e03b55767e17d50fe360bbb59b85fce33dc913f023312655bc94d3dc9afd07527959c4af4898135637dc4ccce20d9649bab52d841bea04";
-  sha512.doc = "250f06419bf5295048c0c04944cdaa04535bc1703468413d2d265de5444f8e9e834d1ee2d3059693335404df6925094fcdf98923ab5d2c1f7e7b9340f5229ca6";
-  sha512.source = "e0cde7eb37cac8f5589c3a86119fde6bbd006cd81ab260711ebb9512c1137dbe72154fecaa16fa3ae63a17c4a681bca41b97661e46673c1728cdb37af963a69d";
+  sha512.run = "363d8880f295bb9ab0b25b3df4958556b3532a7fc4f134aab4d218d92184a337f4908f6eb81f13a232ad350509bc2d74d9fee0b735c05cf141855902ddb38474";
+  sha512.doc = "8a73d794f125cd108dae5fe03fdfb1d4f039b4e65762475e1d74824d08d980aab0da0b8d1b7728b3465704e4ce9ad3eabe6d2b8a8b6bea4de80bbdb67be8ba6f";
+  sha512.source = "e854050ec65c00dec9b4e33fb076da77d18a72a3efdb510cfe284ec3e4fccc64acc9b816dd80cc535471093b9f245d8555a2d35b3a4989355daba510d1e9d274";
   hasRunfiles = true;
   version = "2.1";
 };
 "babel-kurmanji" = {
   stripPrefix = 0;
-  sha512.run = "8a2f4765137e1951c7aa0992c9575360bfc0e5077a55aea334d94e5b2c354418d5c4f5fa1da0a596ba3f4d33dc0a03d32912d18d6767b833973c951440d95c29";
-  sha512.doc = "8a999af9e8f9b115b22997b0ce85e9d9f4d23316d98d2877722a132023548e1b8cdead858dc56b2bb04c38b23e7d13d72a18ff362a2fc59243a88096f4d50fb7";
-  sha512.source = "084e93de56592d1abcdb9755f2b5914fc00c4457543e874ba611fa69bcf04ed817c255fd8583aefdd237cecdb3290bbd4184476c411d59658d592dca7e234df5";
+  sha512.run = "f0ac1b46c20e996f7f2bfd2c6db75c61da34d881c080bc03f28ff14b8a320abd173bfb40ec5c3fe6b343cc347c181def322ae8da43d7287e8cdd1d21af79d682";
+  sha512.doc = "d3719ebd7596dd00878811a3c804563ad7b69a919255dff545880fc0c76ff279e6d01635c7d5a4bd3afe70418d354e8484b9fa083ae7ac36445603ef103afb8d";
+  sha512.source = "2adb924ecd7234cd6a6bb39b953077a43d56059ef4bba6c3e09d233cd3080bdbc1f538419b29e79c2fa7540b50eeb38e53eea90fa7a0fa773c4b61fd6b8255d2";
   hasRunfiles = true;
   version = "1.1";
 };
 "babel-latin" = {
   stripPrefix = 0;
-  sha512.run = "e79d6fca4b038130a7bd27b5057f9a1bf3a28ac64fd0c53d6de943d80a2567adc5f49d3946785f8a20edddc913fe5155f7bba149af51c805e1c4b11b3c6cb287";
-  sha512.doc = "b957044a0b0cb9a05e3a007dff42bca5f3371156b5a1f0b72ce97007b6d9481087e85382d28be99918812d0c2cffda9a80f2915296f8b46f6a7e9c4c20e78de8";
-  sha512.source = "38240caa74c9d278091799ae4262bbd5ec9c989868705dd84255827596090cbd7fc1582b8782b407de7066e8c33b9ff9711342ea8eaf0d5bb33ef3d3b7b48e4b";
+  sha512.run = "27cf66041a001c5cad4d0f22aab1d9b160530a479b8faddd18c7a6b10373e4a951a28e8e22381f973c148bb0e90d0b89ed5fe7a11def936c8cdc0af1ac5292e9";
+  sha512.doc = "a8b46a48375e88a7183448cfde8269af27ee4086d9fe93bd984731a6403938da989bba7d9651a4b38e4dfe6f8709dc8dbdcd2bc3d8fcf94c7a87d00f91895c59";
+  sha512.source = "07ad191b618447f79d22f8332d598a17cdabfe1dec5afaad9f1adbcf05b68e439d714afa286a167cc1009c1d191d298ce7c9af7bea7dc007e314381cd7dc61c1";
   hasRunfiles = true;
   version = "3.5";
 };
 "babel-latvian" = {
   stripPrefix = 0;
-  sha512.run = "11e89decfef9ec34f03360e6ad7184ba7a1da2cc73162bfc10a0987fbbbe2cedf2ed914d2caca816c920f02ec067053140f613e02f1921bdfce3c48ad3911b47";
-  sha512.doc = "270d85a9fb09aa550ee1222c4654c2c4041c67ac322479794285b28044c60b065c2c387f42d81d26d969d65e3a747f9afe01726693b9611670e995fa33644500";
-  sha512.source = "b8f81a260844bf0a4cf532465236e2d6446761212613eddb9b2c84ab2e79498fef06bb008831bc24bb3b5af11a65c97f3d6ee3550eaa75cd9e2f1d1db0922f94";
+  sha512.run = "592b549373348ae56695c3d2494669795dcca1c0016526bd486f96b9e624afa51f9e82f3b0e0e5a77944fc3b8a3abcd6957149925c4cc50ec828893803dcb46b";
+  sha512.doc = "0a6e6bb4a063110b8863f167f258391d81d764b0ea7d408b5557f7568d79e12e0b71e5519b3ad73f2eded73a82f642cc3e8e3677fcc0f857f151988f2f12ab3b";
+  sha512.source = "99359c2b4089d17df7c1282b7fec504306eda1ee22a3750e9df5bdd67d8c1db7d0b49a9aaa1a1064115abc3848e7ed074ee7d0e4a55a7dfcced3a99be8e084e8";
   hasRunfiles = true;
   version = "2.0b";
 };
 "babel-macedonian" = {
   stripPrefix = 0;
-  sha512.run = "870ba84b887a25b89a3c36eeb7ee1b9ceaf0b49b527930412c3c63e08a6d21c6a4101048951b372b7012f73fcf807e64a6586e590ca4cbb369b2749a5b06871d";
-  sha512.doc = "0f1dc793c94ca8137d5cb7f96f75415a0b7b05812dcb349a61698f913c5d075d5fac9bff261e8c3a35aa18ffee327c7acb68f0dd3d561cb0b8cfde5e5cdfb1ee";
-  sha512.source = "53178603c452ee8252d75c3b089e6741dbb766826fa365bd7f3687fe87fe41d623673e77f3fc0f76fededbfcaaa0a145bdc99dce7ae17007ae56860f7946faf4";
+  sha512.run = "d33f9c91235b0f973d4a6f3fbf82e4ddaff08a63f69f63d9bc8ecb4dfcd2bd72681d5080cf9697470dc36b2ac902d19fccb5bd701b624cc286b1cd142a6d3329";
+  sha512.doc = "edb2de12475191bcff0d968953b64f819932c1fdb7182c0a77ab2dedfa48ad737e576b7f44f37af639d2e139d51bdac0e882289e9a1c240d0e308ef05c6fe8ec";
+  sha512.source = "63d6dc24b48d9c7949bb7a5b7a5d9a1d7eeaff2a7cba88256a9ccadcea9aa9f2bb95abfaf22da0230965ecd43253efea8b4c5c72aebf068142b58306661f3a28";
   hasRunfiles = true;
 };
 "babel-malay" = {
   stripPrefix = 0;
-  sha512.run = "6db22741a64fc616b2a7619c7cfce5a78b310c378f03db492a74aca0e5be8fe026138c20367c174d6d99a3272a4184d8554f5628b0d1c4f4e9e0857a755d8285";
-  sha512.doc = "868230593f27acea268d937887be08d6ef1160c4d27fff22ec0db83c1105e2f90f7b2d43776e81dec724d96a827dcb723d0d4be49e8ea0c15b11544f89467f8d";
-  sha512.source = "96229edc84bcbcba6d04340602c4e43faac1fc809737cfe0fa6fbed3159fcb00a1670f98596a46595fddbb93faa82e6adf34fd1828d0319806e838349c5c87a8";
+  sha512.run = "907df975685a6980ac9bd3546c122a6ad31911219cb2276941b0e181d1201300c3edcc15068e3d55bc88c2992f351cde40622bc107a2aee2b9bcaa1dec6e2488";
+  sha512.doc = "d6711e2df15dc2f9c1b99c785cbaf5e26b8fda3bccc7663cb68138627793cfdd6dfd419fa24fe7dde3d62dabbe453e271365ff51569c980f194a99ce573f68cd";
+  sha512.source = "223c9d51db759cc9d3da834f9111dd59acfa05426b7a3c7848b11c720e83605235da3d8c46c71530120e46dc6ade1181afbdc295d4806c4f4ba2e2fedb7ec8c2";
   hasRunfiles = true;
   version = "1.0m";
 };
 "babel-norsk" = {
   stripPrefix = 0;
-  sha512.run = "2a0ecd19c063a1460bbb63352ceb9f6d8af796320989e43c128e5f03b306112344263b63915733d71b12721c15f6b0a48081a7d587b14f777843fc35d35c8c55";
-  sha512.doc = "53f8e760cc6505bdf8b8ef92070e4a5f9c34bc43ea3aae7772c765697e204281b478807e95627ce77776ee4c2bd4bc898e15e7836c3227307b02ef2aaafc22d3";
-  sha512.source = "ea87599dea1708c090884d0347bcf21e43335263572f912a91694bf1a1e1d407a06db9dd406295ab86cd9d51aed45c012b2b6d80e29f78b0367aa70f76f177f1";
+  sha512.run = "6fa9c9bba02e3bb235fe5660ce5682cdc02b7ae140700779ae63f80a1da2ad8da2da5e7877b4c05dd46baf2125eb710d1ed1b99009247f61b70df14080df0009";
+  sha512.doc = "714eb44d7010ccdc923083aec563e07e3f3f4e5b25bc5d38798b527d28d463ebcfccb945dbd3002351b287d7a0b50caa70c19654956ef906424cd9c3980f6d43";
+  sha512.source = "50d982f18c9b166cba16986d5bdfd101d5e44d456561a89078028676c478d78c4d94e9457ecca8d6ca19e4dd5590e7843a97a22537a38219599f235f36b20e08";
   hasRunfiles = true;
   version = "2.0i";
 };
 "babel-occitan" = {
   stripPrefix = 0;
-  sha512.run = "6d14d81bfc73384aadd8722a4b64a20504fe972f76affc4a15d7ba657a3b361db1a214f0b9cffd5de89228e80328a654992d8ebe3c00252fafbce365bea17c31";
-  sha512.doc = "1dfccd316bb6fa20bbbc623545dd611313129e54fadf136b1d2405f42cf3cf2632eed6f1249fa46e9fe5156f96dbbd9edc43c1e373a060ba7ae29766c46a4798";
-  sha512.source = "9aa69ae556df0ee25fbc7b261813d5aed9cf4e708f7062a666672320b426b2949a74508eddf79721e295420db8b3b179bec48863341ea7c0cd8f743db0b5b1b3";
+  sha512.run = "3284e9ac0588b94e03bb09fa8ac54f7498bd0cadccc21ab54e9e3eeeff8440f96ec4628119d0fa43b733e58ff6df92c196337eaeddb37108ee6cfc65ce3c59af";
+  sha512.doc = "05f3b1966b4f1b6f108a29039ab36e2141100f1ed17120d1730975a368f206259b6ff5abe12c41d01bd94123888c299b4ad5970b7c1b7fbb308a1f5aba9b7dba";
+  sha512.source = "b6a74bbd75ef2cb9b9afe56072ff14db2b8e039f7cfb8ae22fccf17bb3b646c639fbf8ac011b944b19f6752d1d1be75f9a833872c0e9a0533f425a4374561161";
   hasRunfiles = true;
   version = "0.2";
 };
 "babel-piedmontese" = {
   stripPrefix = 0;
-  sha512.run = "46f0ca00bb0ddcf5bd541ab3bb4e83f3e53e3f4dc8c3d15d6bc841e102aada55a999322ed4411852864d53ab03bc3ca551bd7c3a6c87d08901fd029a51569e77";
-  sha512.doc = "eb9cc4906b442cffcfe2e98532262d70c0ceedc36324135008577146dd1bf7049fde188596cbe23d4767bd5b95d4f18d8eb4373d0fe1cbb5a37cb0ac3f7d5204";
-  sha512.source = "99490bdb34d7b3379bc319a3d39a7db60aca5d2b589c72f8b7c5ac2fd651cdc24d648d8b10ee070b7ad476255c97bf45e8cb3c574f5a3caec1e305a07d580da6";
+  sha512.run = "f10e33ebd7dc738d4b257fc3abd36cc1021a1fb2e6fd917081ec8ebd2beb0bae08a2e11227c8961cdb82337fe117fc355fe14019c0e9f710aaea247c5bad6d50";
+  sha512.doc = "547e02bee97c6c66a57038f6426228387fc97821ae52350126fb4f6091341500ce92a95220d64c7443af6b9e16f63da60390c0557870e6958f7ab51e52e09b56";
+  sha512.source = "64d4476157c3822f7400f8830a30e5652c23a8af158f5a73f10be5165b6dd269a0f22c54afbfdb550328d9142c2f0648388a7684e96a9659cfed757eb03d7ca4";
   hasRunfiles = true;
   version = "1.0";
 };
 "babel-polish" = {
   stripPrefix = 0;
-  sha512.run = "8a6a33961225e1ee90d6c8be21aa78b1ff165903824962b6c1f1ad9727904d759a2d975e9330b1e72c247ffe7c4c2809897da7100a00866ec1b20735f59d0894";
-  sha512.doc = "45dfc29219ff2914faab7fa7ae09efc681e9a0a7cbddcb2e0a9b56ed11bbadc83f385aac59ed8e8ca0f9f0e17e2c9f43885491587d644fb409567f1b196d53fb";
-  sha512.source = "7472b1aad0a83447332b89e1950015bc077808b3b8aff66f5073d8ca91bbfcbf77481c9b9aa20447cc7d2b699d7625e3f1b1705e563174086853273ce8384da6";
+  sha512.run = "059927f4b59c2f1e40585682bf5a75ce2c028c3f9a356579dbcfa03a7d44f17a91b7285255662e881d2c20de87c477289df9a95f10d5ddee5b71f8c28ce0d136";
+  sha512.doc = "8ae5208141bae6a5535780e9a8a885b6cb0a992e10e6f67393daf8a6a53e0094dffb80c0b03f75af286f780676d46324b0f69b7bbdf231f393fef0c56765f75f";
+  sha512.source = "050d0cb4cdaa9ae90c8c4fa08717d509953c36c03df29ee83ef48ec4ea64e3e2669caaa780c642f90cf1a5447275fd534f5e2d3679fae85c33b945582dda727d";
   hasRunfiles = true;
   version = "1.2l";
 };
 "babel-portuges" = {
   stripPrefix = 0;
-  sha512.run = "0774eaaf8fb7eef69a2a46af0aa2e070d24e134d250000e0d55e0cb822db794767b46ac789128cc1c878fab95881737c6623e979f58cf03fb04ffe99cea1eae8";
-  sha512.doc = "4f922e45aa287a8d35276dfb3e215bf5e0c32eba5561e13f85d647a251adba0dcdf6c34660f08b2dcf517e708e9ba2da75f43d642c8b51bd1eeb8c680f7f4159";
-  sha512.source = "2ed31a732d22b3d68a945008b2582981579e85a6fa8aaf7bc75585893e65dae9479508419cf8c6901720468b2930df81a67075d7438108e1d62316ebf67e6538";
+  sha512.run = "d1ecf75b45eac699c7f73d40aacaeed88a3f8ea1a53e1a07c449dca7881f5d6bf364ceece0fa9afa5aa816aa0da2086a80ed1e7bb68b42ef061f28f19429d2c1";
+  sha512.doc = "994f7488b7e0978cc2bb5564c35d4522da7bc0a3aa2bcc528e66459bcbaf9ed4c9bf91c92709c67c6e1d73d636acdfb46e870c0c3f0533e5795ccf3d5d7968da";
+  sha512.source = "a5a3559f753a75756954d684a364d9eb5ad4b74e4bf817eed7add5457d2b60f1a8ddb1b545db66ae2fd9490aea3d16bb42882de2177295070d238d1af5ac0c75";
   hasRunfiles = true;
   version = "1.2q";
 };
 "babel-romanian" = {
   stripPrefix = 0;
-  sha512.run = "7f887c543a77001f904bd459389f96f0f8b4b3abddccee0b4ab30e60e788d6e2454b50b030ed42e6338a181803bb938e9ee568035c1b2fe237842c0914b1400d";
-  sha512.doc = "85dcd9a336202c84d448f61cdb97dfe46c90ffd9bd17f66e1ccc7b998ad4a0368bdc582cedc56d59dbbdfe848c3204e0e33edd5ad3ccf897d7be00b3717dc7a1";
-  sha512.source = "90c547f8eae14d2cc822d1c786f886da349f8d5cf6428cb3916e9252765c1d394db1382087b0384507d214cc11bc4e71f6c3f9f5466303c26a12c81f76de7927";
+  sha512.run = "0889e1972d6e1a9d997c07793e9010c56289932bc294a12547873bc5a3c03598f0b136531457711ebec43d456229f1c9fd7c95234e0e3c6cb0ba8f1abec1efbf";
+  sha512.doc = "6944add08abd9b30679c4ed098d6097aa31389041d4a074f7abf6856b7c0ccfd48a9fcbff6663f0d60aa02e26e32db65dbd053b1b9855de6b6a1f6cb34051237";
+  sha512.source = "20f0575bb8b0d51302cc6b287683ca47225a226c5921def1a9c0ac2e2abae3c214e40ccc189e95f00cd22504133f3476135be531eda938442fc00e258225125d";
   hasRunfiles = true;
   version = "1.2l";
 };
 "babel-romansh" = {
   stripPrefix = 0;
-  sha512.run = "7d9d4b67ad95bad4909d636d8fc0eb622195daf36fc6468a9a72d3d56683210860d8e1698772a794f8ad26f2b84c92e9a5f00cb561286d13349442b7419cd737";
-  sha512.doc = "b2a5c21e705625d791e806795cc3c58c3284439e4e1c84e105b2791594913af48b4182072aa2f80098f11f86a721fd35e4cf8574b756f1e9aef59e66a4a22ba8";
-  sha512.source = "96662e6c5b6a34de5aad9477621824c5e0b6f678c34a867b5c1f2a6149df367c90d3da8f32bdc213e63519b10d995e57767f45dbf448e3cc3076866c28e9297f";
+  sha512.run = "7b0c7b0ceda47045b7d5a5344771acf2ff42b67d38aa563e6c05c5c6a905a68a08fb985217b96b2e7bc3ff70d1f12487e7bd869ae2fbcb40c2e717e0b2cef815";
+  sha512.doc = "42f81d9205f5d7d62ad0ec0cc28fc49b597cc4140f131288d91efeeddb38940a4bad946e33adc4824ef44e4e8db3129dd67a78e08edf9146b5dc1c08b8609ed0";
+  sha512.source = "ae6eac28aebd614ee66627a47dcc3f8a8029fe162bb46aa31b009056d9af428c58fb0e185371d3081f045027a30c1ac5c12e2ea6338f3134c4048602addb337c";
   hasRunfiles = true;
 };
 "babel-russian" = {
   stripPrefix = 0;
-  sha512.run = "1a6ded82571af9cdc2f769203ca818ee53d94e59190dfb299a43bbd21127aec3944475e5d58b0f17444da1c3018284fb6a6dcac22d78fae2c665c8f283469e1b";
-  sha512.doc = "e1f7fd6bb4f54f74c0d23c070eeebaa4e94101602e344e09e19404c4fde29920f53d1421cae632ae0418ff2a8ae0551dca5ae49a0450e0d1e3d748406224b87e";
-  sha512.source = "057663fe9d6199c7783f38f9af6a0f4e81177cefdbe7e12f5b86320878b0d5e8742329cd89e5149c55258e63873b6ff9907d380cc847c33c41bd0b223837b871";
+  sha512.run = "2e55b14504e4020c14225eb508944eaacb3f45e33da72e19f57bf7a8819d98e7648a81cd78720705a2b44d13e9b580bdeacdff3e278025a64c8f355cfa792905";
+  sha512.doc = "b78c62f31aeb02c0e62738f24bc5ca79683b295728b0b74c35a8c5f9b70a528ef075f951f7c5a082d7b56eb91b45f3cf59d45e603bdd697d9bdb37a2df5f4a66";
+  sha512.source = "4ba994b2557705c50437808583e83675c9bc4d781027fa2b1ad84c034ec787dcb2f873f145ab0066c54d1efe992f9b24bf2a4d0cd013d43e1b41210667b74fff";
   hasRunfiles = true;
   version = "1.3j";
 };
 "babel-samin" = {
   stripPrefix = 0;
-  sha512.run = "395ca0d8717790fa47b7baa8410a5d186ec582da0a5e2e698b78c62a58b085a4088a15e2f87041ef7b73beee570e68ce36976de822ebb5f34bbf4d8f173004ff";
-  sha512.doc = "57cbf242141083dae692a3d7175b233f8ef97e2dd73ac7da06963363c88f656ca4cfc678e82a0b7bea53e0f84246e18efbab25c348b763b88a6aa1237a7d3a74";
-  sha512.source = "01e03f15b886ba3528270352882ee677936f11404774fc3c7b44354937b78d58fac291a14052340e3e0599b31a01474180e981a08aa14946693dae81c44e5fb1";
+  sha512.run = "108bbd3b697c6360024867dc6ce9cd4b21d9752b3ac24676eb463e6a8b458edbea2fc66ab8b1ccae0140b84feedd776dd7a121a11a6e4c634a446e7fdba1a74d";
+  sha512.doc = "a31da319db2a310181cd548aad12ebf50b75213d504f2da3b70d728b1b67183249a4addda8d5cf49d7e390cfa6ca3c50815d2e27365ff5553c505f294763074d";
+  sha512.source = "0dd2279e5574f4ad249b35428575e04d10cf694d556ad3cdacd6a2f1e84318a60b1851df766e12c8696b5dbfb3c4de0198f972ba43203cb7696c196b9216c685";
   hasRunfiles = true;
   version = "1.0c";
 };
 "babel-scottish" = {
   stripPrefix = 0;
-  sha512.run = "0c6fd25d53db4098a8ccef92af4933c78b4d5e0a05927d7726c5e51e46d590959c54c4ff32fb4f8e286631aed2693b8aa095bf6251d0a79fb8f752a8f2a8b098";
-  sha512.doc = "116e5070c59acdb6a413a0ce0ab4e8af71731f0fb65f4855fcfb316ac41b9b67c2b4b77ba1cf210efc203e412671eab80ae86339673f5c6ac5c76d98cd3d27fc";
-  sha512.source = "85b9bf57958dc901e18a47b04b7dbb47057472e52769240aa3ab29ef1130877b0d1225c0208a3ae6ee165a1a2a5935bdc7548fb55f7293257b57fad13c71f93c";
+  sha512.run = "9ea3dee7091ace2111a1027cb0b7850849a130424a1ab9bb4f200ab851d1f159e48ffbae1d3fb7f1f0e95625fb5eeda7de20c6da260f47e59b71973e383e3d7b";
+  sha512.doc = "a722bea00816dd00017e031076a95a1a0a3e43dd91e963695d4a449db952a4b6fe26f1914aafe328009debd0fec42857b48e0fa30881c66ef44004703691cb6d";
+  sha512.source = "10ce9fa220924b731571b9db347145b0d677445ff44c2c91fc3bc8ab69df7e4e7420cdc7a84d04513fa89f0dd2f2d32b6a63cc1bf43e8c6066a0d197cafebd01";
   hasRunfiles = true;
   version = "1.0g";
 };
 "babel-serbian" = {
   stripPrefix = 0;
-  sha512.run = "93e94d1e8bab6ac713a834f5b4ac1f4822d18b053b60d75121d163784f1d52e88c92c4cbeff9440c980f0570f2a3c04fb2885bdfe210bdfc5a447390e49abac2";
-  sha512.doc = "ab832b9cb600d53ff6bfcb374309368c8b8b96139baeb4fa46874ae96d61960785338ddc1606174d8a7c0a6fcc3a1a0b028660c6a7ac939290f471a86eeca759";
-  sha512.source = "d7f0b2f662ec86ea78cd8da39dc4afb3305d0adde08062db81e4b2cd5dba3552d842075b1cfbcfbf560b2d7125d41a6abba7eb52fdb54fdd8d6d2918dff9a7e0";
+  sha512.run = "b394b7c7d53c75565000e1db85e90062980c17232570f87d38bd1e97a9525a8f06c93a57f0e5fe81209bcb91d77ead105e8f9a55a82b7661f8315dcf0538ff26";
+  sha512.doc = "1ee9f80fca3e14b25c109f18e1353ca83b05667a5d7773c3aa58e48d169f9cd82b7f757492c9b6a67544aef9048cfca75acb182da2aec5e727029c42ffcaf637";
+  sha512.source = "46186a6e9204b9d17432420a2059c8be769c3520581c92fe7033307371c3590cd4587e8e1fa2252826b6ff98985725ee0e3e1a266381fae1f5539a51a12174d3";
   hasRunfiles = true;
   version = "1.0d";
 };
 "babel-serbianc" = {
   stripPrefix = 0;
-  sha512.run = "0f9080512543bd3b39cd939132833e27af580fb679adbc191eb7dff903f278b62647131b778a0adcb4d1c97a2cab24303a80ae026cf19e128e4998dc93b3f210";
-  sha512.doc = "977b541177a13dd1bdb60e7e89b82a764efa236d31bba80855363240cbb3f5bb74f6bcd0b8e9f4c7d03a5b0d0591505520b3a31d852e07e092c50be1c916762e";
-  sha512.source = "f38b07f8a3e1df474fda99480e79109d453062ed61c35aa76e1299f6091d440e9552fc20d4dd77b0c31573aec6d8ecaa831586fa31a7c7c62686e5b681640695";
+  sha512.run = "081d5ae09fe2c99d93b302c2b251abc817d0e4f3db8a99622fdff89b38c0016a8209d6e976e89ca236baedb4f7067476da7d418634b5fe169a6c6245ebe3c202";
+  sha512.doc = "fb6fd7e931bd82b71d9cdc16c4831ba9dbcd3e9e60a46f29ce6a84b2a6251cf3ef52d9d4ba159bc288b54b3349a00530b506f5b1782931164357d625438ebcdc";
+  sha512.source = "fbf710bb9c8ac1ea4cf7c6477da3296bc1d80b47f639e5fb06942417ceb58807319c9fec9bc6ecc62ec25161c7ffb9abce026280ff95703b5ccbccbff1daf6a1";
   hasRunfiles = true;
   version = "2.2";
 };
 "babel-slovak" = {
   stripPrefix = 0;
-  sha512.run = "e25014a58775848508f897a465bb84f56dd616057772ff995132657ed57444e45f7968aad8f2cd85c561d584ca92554a9b8b0ab8784a0deac2df9b66f3b8cde2";
-  sha512.doc = "68631570c6b1d545e2011680adef6fe7ff8907449e0b4fd89485813ecc0d685ce465df2b1214a554b7cb540245e897f049ff98e93da5e28e29136dc59f4c3ec4";
-  sha512.source = "6a2f453b17f7d55fb05640b51f0969e44635c441db919b181ff07f3b4a59de12dd2768d1ba5c6539e67837263a3c28dbe0bbfea5cf5f76024f3b13d7924b4fe5";
+  sha512.run = "68991518af41e5129508184a5e2aa521693ee2dfcb246d2a20560ceb476209bc6deb722c2b8906c1a57623e3e46a0e44e2db18bfb4024359fceb1abac9a6eb5c";
+  sha512.doc = "c9caf3a5d74f8bd6f5008cce2ac301bea4c2d95936c9e9cb44bd5e39943e29eb6d8e2f8b5fd4780d9f8fa9b6a53d6e9d5c885daa1fd5afdc3cb94d13935691c6";
+  sha512.source = "ac14b57cf606d57555932f8071a0b4b9222c51901c8d1393e161913fd39c55c40bc5f7e66af83b20f1db3f7078f9a6a606c380eb7ac5691dc685c33190a3ae6c";
   hasRunfiles = true;
   version = "3.1a";
 };
 "babel-slovenian" = {
   stripPrefix = 0;
-  sha512.run = "dcd8bb1f7a65b1dd3e34713eb88f18b511f0b93bf3d8ed6bfb23d5058bbc1a404f3e98bb090592875b8047f8d933a42d419f379482aca02b594bd200e59cf39f";
-  sha512.doc = "610d7c812fd90bf7ac42dc3212ff181e48dc82f13ba0d2bef2bc12ba4af62690854b3af233cd3451c0dbeb328cd8639a4b1831655f4097e90ba90e333da74ad2";
-  sha512.source = "d83473154397f24af1db40056211ddca45584c23add004f5d29811562dd675399e8e48548269a2640052f14824550b8e33cbed373ed6d3dce5f00805e615362e";
+  sha512.run = "3990eaa8c9a3aa02bf5fac5f29ceda27da7914e31c4ccf4c62688d7c6da9ae46b139ab0ac3f7cf19121010cb58e719b31666ed2bd5d102d72bc811160221f8ed";
+  sha512.doc = "6eec06765d55061528ff6eae6f640201e3f3aa35b508665712dea0ff0049dc31df80bafbcf99bfb9e8eeda6b9a29fcf40005eff4f3bc9c06b1e48f3d7a5bbd72";
+  sha512.source = "7721f4efe7e6ad28315bc946d3a57c973d1359f45c519a811a16875ab3daf0a31006295f6d2cae436404b1cbc1c0e2f53d19aeacd297db5d5758644d5eeaefeb";
   hasRunfiles = true;
   version = "1.2i";
 };
 "babel-sorbian" = {
   stripPrefix = 0;
-  sha512.run = "624491f4f7327cfd21e2c2b2412173365fdc9a97e2285ecec3f42c165a249c9e97aa6c1ced31abd4c1292d0cb4e9ef2fdff7a0e9b6e478e6805a758a48d1dbe9";
-  sha512.doc = "6e00d1bd9844849aa89c354b6ca05bfbcadce4fe9f3086fe99c5c55a7c4c6414ec5e7956451c7215776778fee349bac5b7c608710a30ea6b0c2110c5974f5300";
-  sha512.source = "c1aa564bb36d2389556bea048d0894a9d5da35061c5ee6fbbace044fb03fb3d6bd16d729756111c408953ef3fea3e6792582cbd4e3da2ba6ef20e58c87cff673";
+  sha512.run = "d826c0f2e63d2c3f62821ab6a49f7975b7837abf53d7c478440dc044133858575d3370e0801f425f96821a45163d68006be670f7f56353e4545cb1457d57a882";
+  sha512.doc = "6ec3201b0eea33a211fb35e685f941702d8e5a9447a566b81aa51715c944bc570c6602bbb29f1df72a7758cc52edd6ce6fed55d052bde99b5a4b9c2cabae4429";
+  sha512.source = "f3eea1b7b46812bb15d6c845b4beca5e635b248d2cc2557a3310a718d01d842aee2b07670a6b3dbd250e9b37f8eb48f65de11d45121f561e794e74e0390e0e34";
   hasRunfiles = true;
   version = "lower_sorbian1.0g_upper1.0k";
 };
 "babel-spanglish" = {
   stripPrefix = 0;
-  sha512.run = "8c202267223875dd4d479c1db7d1b2b183f8f2f3b3872078c4941a35753ac761447b1d1abf058c7fa639a76b13e0d00c18aa30817302b7aa47c05761bcd949e4";
-  sha512.doc = "9d76bb51a0e42b650ab7e7f077712e4e1d14c9ff2c65cf72b53a1dfb272da17b2dbdcf19419be85f209c15ac84e984b276db5434d70f7d579c9cc32cd6c52bc5";
+  sha512.run = "7da00849d424388caa98d0b4163e862ae425aca8dc16e093077f09e38a758994c78c1dfe58c980431e0787e05a7df334b69acf7d194da2071fa1506dfc8fad75";
+  sha512.doc = "89649fa7c2e0fc23e441c46bd39ec98dd22dc9e608b386809199aaab52f961da9d62235a7311323634cfde85a53172dba404f80f622c7881838e98a1289b4e81";
   hasRunfiles = true;
   version = "0.3";
 };
 "babel-spanish" = {
   stripPrefix = 0;
-  sha512.run = "0f95c57e71f6d7d20af4cf59038c33093b0c0b2808d74ce414c2ec95e4b6cac53099b479736c01607cb93bb1d22cc9708e79c948bb914fd331ba795b6344d48d";
-  sha512.doc = "629bf9813e6696b7c8a6f9d3cabab1c8e7830e142e1d86f0bb5d4442b81719869a67ea59f9f7efd57ee5febd3e060d304763f08d35384c755fc3fc1bcb6f63ca";
-  sha512.source = "1a6d67993a31079c04f68549d3641680a2fb653dde7f8fcac7e96a1078466b4eec1de30f546b6631b5c949f3b3d10dca555f457e0ad936d10bb78082776aaf76";
+  sha512.run = "f43db6edfbe7e3eec76b3b140c70be099c682261f50c879aad4718bf1ea6dbce2c4f5889506e4d344ad60f35a8f7885a9f47f8da4e5d180136d3955793ab9e14";
+  sha512.doc = "915254f46dd9959d497350a9ada3e06f9c3c6dce34e9755c6e73aa8b45ce1751f3c3bdedc3974f6b20fd20bd5e8868910af54af7f52ab997f124e1b892e107e9";
+  sha512.source = "e628793882dd0396f58edb3814033dc924700502984386e277f087a149c2d7337c856f13e6e454d12dad2459666f17caf2514569d9db347d478f05f7877a8118";
   hasRunfiles = true;
   version = "5.0p";
 };
 "babel-swedish" = {
   stripPrefix = 0;
-  sha512.run = "8af4c1514a08666b5e1f88d6fc3b8b110205e17b83d2060f2c61536425e19a778830ec87129985ea558d43f291a3406d901895af237dc1ee58272e1093b143dc";
-  sha512.doc = "9448a437842f8af783dd38320b7f3910240f12397f37c3f112b32d51e86769b130f4e55ed701be541708a7b30e0a7a75fae7494bbe4bd657a0d4aac7584027b4";
-  sha512.source = "817415b24c364e81876193fcfeb8a75f8d925a109f6c7d2c25c30909615d73b339e5b40b813c143a316477b0be5171691e19424f6fdbe9dc6a92bd2754729792";
+  sha512.run = "f854d29e63ee15a9e57b44da411ec321c895702809234f045fe583a59eb3ad48de4be7d3008c574b71d44c67d599074beddffc8ccf3c9161d2ac832f6dc6940c";
+  sha512.doc = "a0ad2f2f5044ee3b26bf6c93f264faa459131d132b0107834faca2e6c8a8bd3b1f591ad84f1f923c55a42545ff4a128c6a0c1261ad2fec0b7e57683d195f7f2c";
+  sha512.source = "cdc6733978fa2cd0f264924465de81d3f51d03b6b21a2100bf88c570d664f942d6e47c8ca346267fe4858467a48fe8eed8054428a62183a468b147a9da60210b";
   hasRunfiles = true;
   version = "2.3d";
 };
 "babel-thai" = {
   stripPrefix = 0;
-  sha512.run = "c2e4c02ab2a3b007d3d3f2d00cb6af854ff00773ac1858fcc23a96fc5bef5de694c86630badf5b36b1c924bc2a91652192f23b6dbdf01488defd883ac93cde3f";
-  sha512.doc = "0795c076e1f3763942c7fd1266afd396902fbc936e061b7cae09638edb6b8e8623f634724d0164be49b1e698a95a7f1fc3b0761ead8f0b5a6e04dd1651007317";
-  sha512.source = "9c8f4a43323b1373eb736469ed1e905e06fb370ceeb686d733c1e0ae546c729d7254ded2780199d1c6e97f80c010719150e89658e4a67479d29961bff994e86a";
+  sha512.run = "808c661be0ddab328edd5e42e5b2c76203477b9bc2d3897ea2c7ca6ed8c6b5fa40d03c106b86167f1fdfb105ddaa7600e1cf27078d72d2c372b7333cad7ceb5b";
+  sha512.doc = "f617b1f178e91fb34526be171e9e9b71d2d797d328c068e789f1a4683fccd038b9307ea80e41ad4391f9c97bbbdf011783f6957d7957741a6d583113b6161d61";
+  sha512.source = "e93d1ca814efce84403b78b0e0e68a0cf94b747455f27399791bbc7e833fc0e65c36edb277b59c95479fd6a2652911814ac039231833d75e3f47d743af18c4eb";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "babel-turkish" = {
   stripPrefix = 0;
-  sha512.run = "6f58e169a46b555710cfda642e11e2656aadc81e8cbf78481b6e4d1542cb53a6ed20ba83ec76555e82b7dd0db8ef894aafbb831e65dccb6d7ffa312cf3fee480";
-  sha512.doc = "9c67ce21f7bd0a2ec7d913cfdeae998285035972b60ca80fb2fd9fe8f86763894ca2a179a5acb6fcabde6ed762d8fbea51fddb3805baa15c13b6354a95ee3e46";
-  sha512.source = "2786dd07c04dbe525d90a42a3fb9eaea3fb01e54ddbc47c3278cb462453799bd3dff7307704ea88c085293e2ca3231d0536998c4cbc4b1485e25b2fe332976e5";
+  sha512.run = "4bc8f55f4438befca4043ac7dd53c89a055acbc083da37ef0c4097a3f68ea61d83daa815bed797e51af822c37a00148b51e69ffe59a64424bfa920cb4116614c";
+  sha512.doc = "f59a50442ed18462c75381bc315ce319d4edd1ff3fcdf883079db79c359e7e9542a5e98082c2af3c9e80a9d22b533c5647b87ad1877232729cb990b5a86b9adb";
+  sha512.source = "a2110e30dbe04bb1cb16e4cd5e594efc32d7b95d6c80a894659a2040c6db9959306bb98ae4747818e520b275386d1aaeb6df1b036541abdb4b529e76d0862d97";
   hasRunfiles = true;
   version = "1.3b";
 };
 "babel-ukrainian" = {
   stripPrefix = 0;
-  sha512.run = "85983844190951597b504e91386ca9c68d52c19f62d4e2bfb2d1712401cd73851972413cb816945599183cea273e9fc56d77f222d24ab14ec14e1d65544eb1ae";
-  sha512.doc = "191e3db538316499cf8e7789397e22f811818dcadf95a23464d953849cae137acaa1e03dc76db03a1bb05cee277f57765414052dd04576394509f86c94619be9";
-  sha512.source = "2ee39df0c6a68c6d03244766f360785e09b0f982b41695e8937fd18a295e86c5d555c27348d2208c975c3277685257a73b02f52952a982ab662d2e00b994f148";
+  sha512.run = "268bc96bc7ab74e88bedf8d939a4f0a5b465b8cc5e855b89606b17e43d2f4be9895b416936ff3549b7d69957c26cad7532ad59ffe4830a1a236a4800792746f3";
+  sha512.doc = "d88588d7f3ad660cdff0ef2ce45999738dfc420223ec800ba409c35e40abe44f9c64816847ec6b70ea6a9646bb935cc2af1b2deeb7cf075f70f1f6e0903b48c1";
+  sha512.source = "8fe0530a469e7b90aabd3ca9bb54bcc2467ef556266b71ac1b10b2e4d3ea3a1caa999d30998cbb7ecec3dd8f6a6e62a1249cdb45b7f0834177833f316224f2a9";
   hasRunfiles = true;
-  version = "1.4b";
+  version = "1.4c";
 };
 "babel-vietnamese" = {
   stripPrefix = 0;
-  sha512.run = "ee966b67c2b1cb97e6799b9878a102efb142e3fbc05e4010e7722975c122560b8d4d3988f9979804a9f186ff5d50e333866d670a82be42657733d9f2e5a958e8";
-  sha512.doc = "ab0afc8946abb141f3a7d4248f8bf4abc028b84e75d61829597c284eee4a76b49c2b7218900ecce2a5643f440448b2d66ee365e7e99c1abd402f7ba0e2537264";
-  sha512.source = "51d43677b38211c442e1e0cc52bd5a9e535020677f32681bff76da0f3d9b1dea69a24a12d1c14bec523a91d6fe3e9f91fa6be7ee989f47489805ecda8cea94f1";
+  sha512.run = "1b94149dd0c655bea895e9b5d9612e4e644c362df8f12c22f0ec15de1415d66368987da1664582b29c861057b1c3d936aad794885d7725faf979498ce4fffc6f";
+  sha512.doc = "3837da2002026504d64a4608d927c68a164d1c23d566a7fbed239a1bcdfaaa2b2b0b4880c89071ae103d0ae8791e3528470b27bb94909077e5898a5b47e104e8";
+  sha512.source = "ecdbfebd4cd8b584e7cddcc2162293909835da23fb79121884b9618b064085755a6a1745ad826353a99557af18fa174959ac2f459ef2758f47400997c201bf02";
   hasRunfiles = true;
   version = "1.4";
 };
 "babel-welsh" = {
   stripPrefix = 0;
-  sha512.run = "ab0c69dbaa95f126c5e4cde478219e397d9ea5bd80f4bf9396144290d3bca099ca0b808e33185298a85ea343b5e008df3ec2cc16f07699edbb038a21dd27fc07";
-  sha512.doc = "f983913e95bcae1654b12ca08ff8bb98a1b72bc67165966c71ec57e6296e4c11ce0f419957276f003e64eb4abcc5b6d20a87248a4ac0ee837e5b3b754b7b36f6";
-  sha512.source = "e6ecd9685f022eedfc0dde2e3107290ee50c99cf376b156b15341955b345178ba68b3682dfc6b77462dbd6a6618d828f1ebfc8ea89263cbea9457e141be950cd";
+  sha512.run = "d81de0cc04575558c7b82bc1d43d4d2fcc21650a62d3b1274def42a22971ff071abf2374f8cf2cd31b0abdd81c28dfba8c83c6ba7199785b23d03b691d9ab418";
+  sha512.doc = "1a139f74de035bb00f40b411affd8a417bab5a80fa345463feb162920c6a322a3a9978071361762f599991fbeb092f1fcc283961da66ada5710f3dc78d74935e";
+  sha512.source = "2641b611ff311c894ac520bbcabd71ac8f3520a1ada966fd75f4e457cbbc721b9f19120751e055018c87b2550e7b61bfcc86b1de9b5e874267de4e0c6e020d2c";
   hasRunfiles = true;
   version = "1.1a";
 };
 "babelbib" = {
   stripPrefix = 0;
-  sha512.run = "dfec827b1114bf3842313514f75ea9eec652b2f25e5c68df103ec2f3a8adfd177c7744b66bf2f52aa6047d18c4643493e673f2fdf402732a2bda9c62873b4629";
-  sha512.doc = "ddb15e2624ec4924969c889aaf1fe57856c405bc603432b622db0c803a3d9cacf54a1e9f23731776e5c628b614eb47e50f31192070c90267dc44cd2077366319";
+  sha512.run = "30f2c61fdcf0caa8d5fec88fe2d09ab2f47d6120b2560dc271110fe71288763cdc131f09433010bb256d98fd7507f5afcd29b9c8800edcea316377d5c7aa58ee";
+  sha512.doc = "adeb18ec220c01ec40e1221da48b0a4b3f8d936fb5926caa3a5817a2253351866df5003e6b8fcc9cab9201ae7fb055a2c7061f90cfb4191e6ef0aef772ed0797";
   hasRunfiles = true;
   version = "1.31";
 };
 "background" = {
   stripPrefix = 0;
-  sha512.run = "9158df8127481c456ca8f5a735212f88921549f497f6cfaeeba6a4f9ea2d2c1336c86fb270e1b5e6a82e048ff9311c79e8f17aa4763c4cd0f89c56f1426576ec";
-  sha512.doc = "b561fa6174ff3306beb86cd9415fe263aa34bc6eb7fa333f33f2356242d05b77d2e7d8858d5e5ca2f33cb58309d7772079cec23e26655054a1fd6656c22d178a";
-  sha512.source = "b65ff95b8a252eda8fc51b3a4f89ae939e104514aea1ce10b87345527ed6b56a3ddc8378d06d5722709af68fc82430181ac78ffd17c3f8528850bd501cc25ba9";
+  sha512.run = "60ad601d41453184c84e49d9c740885139f3bbf0ca83e706488e724721d783f811da2d29dc34de65869f0da16156f8a74c79620a2586e9e4bc6b1c30312a9f2e";
+  sha512.doc = "60897c0d682a3270feff7343bd21720337d659c62a09ca32cd9d180826b0f7f7bbb5dfd016a8d0ab635b9e92219fbd45c4884ec4980375105a605b1afcddb2b6";
+  sha512.source = "5c71fa311303e8cc6b1c8711aaf3115f2f3d1fbfd9b5c1a4008cb1a95ba44d5fa1146b9ec89b8dc4b5f7e1d70988173b66c5560c01dbd344f2dd334ea82ec990";
   hasRunfiles = true;
   version = "2.1";
 };
 "backnaur" = {
   stripPrefix = 0;
-  sha512.run = "ed69feacf2bb919068fc42c8c3010869aed09d4a414952e5d9e6c880808feb00531f4e45de2a730ff41a076f677fca74a6472b5eeadc53aac07008d261a51733";
-  sha512.doc = "1174d190384124eb08b8abdb050f6c51f85496947bf64825c9175c571448f2f3aff13f20fcffee8866499d7b20b5722be63903e5aebc4a7e4f15b44ffa8388fd";
-  sha512.source = "919ad17ecb7ba457b41ada1953343164dd725eb2912b09058c9b11ae80ea2eec924eb805eb46e714df18d4a3d1da3e56bbc862df2e100057d0e5c0c1261f8d87";
+  sha512.run = "3b6c63887caee48b7033d25cd464783695d320baf42353bb5647ce0d37e5c729651a4914b5024940029ce272d788928cc8a8a8c1f81e9b1faf1876e825407cf5";
+  sha512.doc = "502c49cc6b63b173b55bc155c9d3425c7652fa0b999dc6c1f668e22c4114730817a3cc934381d3aa65ea3d8f729bba58c7a781d6d6331dac42524cbac36cac91";
+  sha512.source = "f583b1638c995a35bbc7a25c6428e680d8ca373f3b8fc53372769960a0c230083446262a35132ce6c42f8b34ebc4186061ea18ef9d05ef76fe08c6d64e695e99";
   hasRunfiles = true;
   version = "1.1";
 };
 "baekmuk" = {
   stripPrefix = 0;
-  sha512.run = "b992504d125e5d2d0507f1744e2381758b0f39910fdbfbbe99b436d8767c4dddbbd47374814a75b076ff6e647e2e50060099b52d3ba64e33aa0f0a31962f08ad";
-  sha512.doc = "2a5ed41f73a07d0ecc0ee68acc77966d94b2ef23aa174d88bc5bbc844fdb55da2ac147eada45805f1fc8c75b478ea2fa4b2ff3f41b25721286bdfe053a8bbadf";
+  sha512.run = "30d2cbc01b712af19ba6f113e80a633539e8ed6c60a6c86c84e3d3ab5ad488206924f00b61b95692b95910ab32f824cf6ac13ee4fc42f1c654a87b77981c4b05";
+  sha512.doc = "980f35913396bb58e18b8779e6c3b4e93ec8be011f05bbaa087b081e66f5e234a65b1295af25da32e8680b053948c70ffa4e61c7060a879122afc361974fb869";
   hasRunfiles = true;
   version = "2.2";
 };
 "bagpipe" = {
   stripPrefix = 0;
-  sha512.run = "f1f7bbc0ffcfa764b494c160d882e4e39e5894e6aa7321cfec45230a36b5515092d6c31808cdb9d95ceccf04f054d3262ac878675198a3ffcbf115f1f72576fb";
-  sha512.doc = "fed7603e632bc08fd267ef0175ad32884442dc5616a6bd7c077481d62958f66498c69400e90e25156dcabd5e5e539bb4b0f93a987a78a153070ef44b530eab7a";
+  sha512.run = "07a8097e2533484684c3bb6c2882761fa464ff33ac99145845948d1ed9b22a7b1d9001a6ab4e392a67f32b68a09b025f4af93d0ee7fdd49c2a7235a2c035100c";
+  sha512.doc = "572227611895d1b2cea0ed755da62f7c3a581b58ec33c04973dda55ceacc3aceeb32cfe264334fdc7cc35285a35d87f20c65099461354c84cb02c524c159eb36";
   hasRunfiles = true;
   version = "3.02";
 };
 "bangorcsthesis" = {
   stripPrefix = 0;
-  sha512.run = "6d4680a3e0ef767a9e5bf298ca3e393581543328b10c5a44eee9920326ba05d796b3afc32bdd1d7becdc5e651a8488122f80d0c16df036c291167dd843587c6c";
-  sha512.doc = "eb240d272c008d72bb53962774a64d7d688ed549fd2c90c71fae7e315bd2957b0b51c8c6416b4f606a4d8f871ab5e4fafc5bfc8ba4425f50efbfcf4d0b0b170c";
-  sha512.source = "906e41ec6caae3cca1517f3eaa5642712f46d2a29d426fd5fbba2f3a57b3cd09c2c645e76a0a10b3732e3fcce332feca0f2a7669e1fef1c6c2e14d7194448cf0";
+  sha512.run = "fef80840c16fdc4eb8425285825ccf9d599fab297e04f1834b87f159f76a70176a05f10aace1af814202b7cab11c02f4dea12633e8cbee2f843b1b7054d6ee6a";
+  sha512.doc = "30e0909a07a178862111eb13ed8cf5b29d6614226c9246876e893d011dec20750c65039c28306692c16f554e481480d95802b488898ad826dea9fd6ce0f84260";
+  sha512.source = "37b59e8a2a540c95b6f01c880ec8678e91a9c40ac9638a62eacb61347937af84366261beecfac75a12cf154fb9f4202ec52f9203864c56e9ec1bf7313928f791";
   hasRunfiles = true;
   version = "1.5.2";
 };
 "bangorexam" = {
   stripPrefix = 0;
-  sha512.run = "e06fc8ba1ba77d526e8348df7869aec1883af200df228a941cf0156733e0ef741b927335ea01bf5dfbeede4539b1a7c47a65f087222a9e124a2165ee69a5ff0b";
-  sha512.doc = "7db9ef7a17a57d1e86a0a2b0476af2149d1d6c8138b02746a6b10c09ecb2bcbee525a243650b5b3f6e962276b3810e1e93b20e1d302ee0de5204e5a05d6706af";
-  sha512.source = "bf4dc437dc4ee1cb29bbf3e1f283158dea620053c12892526d0c92e5c9c97156a97d66c35246f9f5a69b3f91605a8d2e732e8639ef8ec2f2178b42450a48d5bc";
+  sha512.run = "b44f83a28849713b5430373b5c88a112b5db06fbde67f87765b891645809d35c6de5f3863a9db314c4cf5574b8d5e10378c1fa79c54766b1ba7139ba93155dce";
+  sha512.doc = "301b77bcbd7b703d3afcf92b2088c5b29a42884c65f65e32ec50eec1e29d5c72e4ab7a0acfde055220469e837682368d4594a2c752470e568002d40daad43ae1";
+  sha512.source = "4e9fff8d48ffd910326bfab750933e859fa5dbd8283d9e4fac688dc6200a1b4b1077b8958474e6cc9f1b56364d9aada3d42ab59f6fd3b8baeb3105e73c15d034";
   hasRunfiles = true;
   version = "1.4.0";
 };
 "bangtex" = {
   stripPrefix = 0;
-  sha512.run = "97fc200bc3228b6061df38eac4591e714ec3c5c290b1521ccfe2b873c363208979c5c36c4b7e30ca9cf1d8ea4d8309d04d0741a0b895ea44267a563a35484ac5";
-  sha512.doc = "f12279fd5f03f18f52a8481c654902852a1c07211e4af01cb83096f96b4eb56fd94e41091144b7d2b0229763788c1175ebb563cfaf6a24b7ef2e4beb384508a3";
+  sha512.run = "fc2f8256734fd7c2fe500568993279379ae4c3bb46aa86ea3289febeb5e1c34bc86f553b353d841623711ce08378c468a3701ac35143c551cccb47bd230b23a0";
+  sha512.doc = "95531a59c5a039b0ec051f091aee686a58e2884f40109f113cb3f3dfe2654fbfd8f4184d34adb3f292b1d5db7f2edc9bfb919336cfb317715464a7ec6c8a9f81";
   hasRunfiles = true;
 };
 "bankstatement" = {
   stripPrefix = 0;
-  sha512.run = "9c01cfd2fc6fce967172945c2c4ea20ecf1203f5033758d916ac6362757da6c549b98ecb99750ff13593b2c5ad2bb11abf0c4307908c05d55ce323816d4a8a79";
-  sha512.doc = "1b257e70474da88897ef8a744142ea47877b942eb7b67ab01b18c663589ddae30e12e4d202365b78203f9e8f2ccd5b761d16dfa31119cbbabe9efce101fb83b9";
+  sha512.run = "d234d762e00d7fb86f00d1b66ac2f5c2e5f73f4f5f0fa6233942263e1b3ce4e10c75a11d9382e95cab9b4f9a9505976d42a9bc39337a0343a4d3dc8b1ca78c45";
+  sha512.doc = "97957a40e7962199b9d59a4607ecbbf116eaac5e8da74bc941171bdc60ce89060b69d0c9c3420cd0bb864fe8e7cc17c95f3134f22933690ae6dcbb30024637c4";
   hasRunfiles = true;
   version = "0.9.2";
 };
 "barcodes" = {
   stripPrefix = 0;
-  sha512.run = "d4b5128ad0926875cdb3a193da9d20d8680786b09b9eb82e80cc616a906bec81c8156b8485aa439c0a073ebf68ab6c85bc72f662ef4acebf1f9af781f3c296da";
-  sha512.doc = "2fd059703c2a6e031d5ed5a0bfe81e8a67477fc4e154ab3febd4b9c9e3adee6357d87497697ff85fd1ed73447f1f25890e1e05e98470f34dc1fde4a1e00f1d8f";
-  sha512.source = "6144f3c18e0db5e700795554f3739085461ea245b2e0c99ad1c80308b5635904ad0ea236c3c945f21affd1d204dd475fd1fab990604ed0c98566363336678b0b";
+  sha512.run = "afc30b9f9bf7c3a8ab68f764e276fe3047776b8a64e39df0c38751cfbbb6c0109f96c5ed891a41cdfb23c88853063a3005f45cd0454276c0a68d6bc00d22c39e";
+  sha512.doc = "0705fc0795185cb820d572ad4a93fe3a7603049a07658e6e0a6001258b82421b14985622cc09523e9d6815579df342d75cc0186a79e8944a59ff5197cd39c89e";
+  sha512.source = "eea53b554bbff58d167b8321db082f7f4aa7a27072f65e7ec5cffbd7fff933f2fc5fd74fe652bbcf8d725dafdfb8e90c658b8e32034d8f55b50a8d1cc04b218e";
   hasRunfiles = true;
 };
 "bardiag" = {
   stripPrefix = 0;
-  sha512.run = "31f2ee9677a62a8c39ba053040a14f5404b45e77bd7bff73337d7210c6e4c25d20ad8fa7a7fb18d2097b7f1820c547e45736e2a0abe7bf8da0deb5fda1bce69a";
-  sha512.doc = "d663a7aeee611aaee9b9836524e522314bca58b4333bae0b46b52cbfa73d8adc1b9d9c68a94fc46547a077a86124ca4f91ff2d9146348c5cc4db4fd4e23196c8";
+  sha512.run = "9f8959c543be3cf5e01f9c24b6b6dfc97933b01c3ce6e690451eaacafe6623a6158f309dd11461df29f6ce80c153e6fed04000a34de6aa6e0da45d6c4d496628";
+  sha512.doc = "2a67c66dedd84065fcbe2fc7765a1de8c0d8b564ec48503dd83b6425e80661a28e43fa1b37f4bc80d2b8bfe16d8fd1f1cd8ed01a27e13f0fe730fe7d7cb8d8c1";
   hasRunfiles = true;
   version = "0.4a";
 };
 "barr" = {
   stripPrefix = 0;
-  sha512.run = "cb879214907d9ea9ca3ced4acb68344de01c768b36787b2a7d8f3296767f23b1cc01ce7dc043e0bd924cd38c650015554146a24a75e078bd55ebe6409d92a788";
-  sha512.doc = "59fcb35c745382baab217977f5a51eb8fa4ff9671f6e5ec5677f65a341bab34b9134eb1bca40dcf5dba8ae2b38a47d919fb3cb900d3f0b5c8fb1943d338b1d3d";
+  sha512.run = "70f069eccff7a481c25455e3e21e7c8da40c458bf43c585954f6604896da01b6733f695e83aa76106afc93da5e98ce3e7dfdb0275ed8496404a33e8b458d1d5c";
+  sha512.doc = "bce2e2ee497d7b07aac79603fb973171e107594cb4d07cb7cd3d595af5cd93cf475f23667d911fcca8b4a16d9a63247a108f74481d04dfa4555f99392a1f5b81";
   hasRunfiles = true;
 };
 "bartel-chess-fonts" = {
   stripPrefix = 0;
-  sha512.run = "faeb409905cb74da55b535d5587c0f0e95546fe760ca3fc2f9a2081699d6d566285b2cd158d69b429c773fff2f37ebbf5c5a93c8f178f2b50e249a9d78e8d544";
-  sha512.doc = "ac6accb7e3fe33dc87db813c031affe613b42d6917a512b25a84a3c6e348e53ce4112d4aba0e4718aa4e80518f53e8af5d36fad296957c123cfe1fc76e0ccb4c";
+  sha512.run = "f9cc61238764fd6e7212d2e07d5a4c9f7191dcac1760fa1ee3648d578516b8dc549ed1ab6e851907d43b6a20250bd5f92d86cff1988ad43cfb6e2d12923d648b";
+  sha512.doc = "edd8aa713fa84382e04016edd9b4e5e9c4c402754966d4cf9b5f1f2520fcf1bcf1a9323fc53262955abc658000214f8cd271175ee8f19139d5b40c84552c0288";
   hasRunfiles = true;
 };
 "bashful" = {
   stripPrefix = 0;
-  sha512.run = "dbc663b5210ae71ffac8b27695187479071e10ad1e8131a9fd86000048b2c8325d684f88d793178d0f2d881e92055ad0230d6ec24eb404651dbed570a7e159b3";
-  sha512.doc = "4a49acb3ca5ae0ab9134d9e12d844cf35bb9de1e08410631125db42f51389dd52d9edbb24869a6a03b4370e445706220ae8c974272c3d8d6253cd5cef9af093b";
+  sha512.run = "d2e6228b312d6ecbe34caf9576cfd54aa550eb02ecd2d2135c7686629d45f0188bbb683f781980acc81d2d9f9892f3eb535c200bfc5802655330dba5eb4458bf";
+  sha512.doc = "0b19be7b0cd9f20df9a74670f7ab07154214dafcd4f23ecbfe790a1e5bdc98ba3b6f4573c93ad68cd5d9a4e5507b9c3fdc1c63486fe04547cd3010376f7bd203";
   hasRunfiles = true;
   version = "0.93";
 };
 "basicarith" = {
   stripPrefix = 0;
-  sha512.run = "f19f7d23c3dec7cbb70f2b890ea882a27fdb2be71b18cdbc6783ee19a2e7e2eb3cb7ca7c71311c118154eda1c955b6fabbff0dee1063eb00b1ff23e21973b43c";
-  sha512.doc = "36efb95cf7deee5c05da6712441e68c35fd42e24fc9176847f20980ef8627f8e747d79ae5e100cd776a13a56fadf50a18653fc2ac9190c894751a690043cc568";
-  sha512.source = "6ef03b3cadba30629e2ab5e45585ad0035f908da0563dd4bc23bed6f76df56953ab33717fc58f8daa23c6dcac1ccd537c2294d8efa9d8be4c794896ba58db050";
+  sha512.run = "6070aec3237f987ac02dd280b501a796483fd1ae544a97b6fc2d5a21aac25359438548471273cadf76105440bde6314452cc882a866e8dadf1143d7098c74bbd";
+  sha512.doc = "a9ebb74b859ae55ae56c488c485a1136d026b42c2635bef056df8cb2bb382607c832e14f9006274b8b6aced6a7813483d465a213bc861340ed8b0fdb08ddbb77";
+  sha512.source = "446938a7e19aee8fa0b08798803fd504d5656e5344a20fada00bddc740f0ade13626f9e00991106f381253e09194e4a628940189f2864855a4ed664fd6300092";
   hasRunfiles = true;
   version = "1.1";
 };
 "baskervald" = {
   stripPrefix = 0;
-  sha512.run = "2dec489aed8babf3bf955bd5cd1ee73bf15c10d6a25611f6dc5ca425f548f3a7a0ac2e965d75b4293c1261ef78037fef340394880cdd602e36e0196e2e701520";
-  sha512.doc = "a8cf629b5604b21b7b2a11926d35cc06d09975b593dac4d677e05ba8e4efef587b24359758c48277ecd290e2273062f01980dea079e5d0db38a7d62010a85952";
-  sha512.source = "66581195999d64610c0f5e5e374dd740a79cefc6bb72df1237ff8b8c32407e53b9a7552cde3c02fcc585ada11e94ba5a6b89d7161b6f6aa2966c2ad325a22e41";
+  sha512.run = "2873a84d59787a70e1bd1efddef2d0a97c0f2337f232d40049ef2505f3212c0ab730b573f066436d302a599bc0a33aa98683989874085a934417963a1594a614";
+  sha512.doc = "3b1606288944dda29ebc6c98119358e8d2f2903d0b90ce9361dd2f8801e26845e700d7d5ad908b32b5a814a40aec5f5bfe0ac1284c1aa249946c947f63a4963d";
+  sha512.source = "fedee67f5b6a20a0d00578666624eb00c62fcc4cdbae100157bb803eae21a905da693b770b87509ac438ce266d38b5d6d5e22f419032270542cce1f392ed36a8";
   hasRunfiles = true;
   version = "1.016";
 };
 "baskervaldx" = {
   stripPrefix = 0;
-  sha512.run = "641e9eb940ac6ddfa97bb360cdca25b53ec6f6da9ad752a755f4dc79b8facdd6a8c3fe628511f89c88eec0368a19fb3b6ce8ec9ecbd7b61d746ca105c8133d33";
-  sha512.doc = "c9a8121476011ab3ec9e3216fe0f13cac5d7607144cbe8db835e9e1b06261911493b1f18e2daf76d364433569b35519397c887e6d63af5f593d670a93d1057d3";
+  sha512.run = "20029eadc9603ef9162ad91e9b91434f573a43365f2620e9f7478941d045c801fada6a4deb0a9fbec97240899720555404b228a25e96a773168dee2e4739906f";
+  sha512.doc = "4699da375e5671ced04bf4fd7c17f45aad045ed21e99e9b310fcd5541ce0043e899aa9341d4fa2355fe8c25125112ec7d5f6270968803ad60a4a9e0d7b190e05";
   hasRunfiles = true;
   version = "1.072";
 };
 "baskervillef" = {
   stripPrefix = 0;
-  sha512.run = "1604b3d3da4c29b9bdc4bc8bf04d317460d4f98e2bdfcb6d9f59b596d385e0ccbce0ab87bff07e2c9cbb9f94988680a6f6531089fd2146a3445b44df41b7ab67";
-  sha512.doc = "ee1d548e17951c17e2468a7d7f87ce4b9916f39a9e94a67c80b63b2c580a32748578b058043e8a7f372feb66c485b12fd5dd4ebb02341fca7a2c840a244cd198";
+  sha512.run = "66c41108de2baf0ecb8baebf096ef6bbe6e1bac34ed332da83d57c70f839ab38cf3ed1c4d1e50a871ac46962f088b839c0c89bde749fbc4b701d70785098b2f1";
+  sha512.doc = "96428d64dfa42d8c5d150b7e65a95fba41d7ce361a7cb88591143c13e6018d485f3cb7984d8a8f741ae63748948a4816d7bf7cf35db7c73661cabe08306d4b82";
   hasRunfiles = true;
   version = "1.045";
 };
 "basque-book" = {
   stripPrefix = 0;
-  sha512.run = "38d4b128ce30784b733b1f62bb9f4be5e19b28547810686034d2ebc31d3166884b8bb8d44ccb623cf7bc107041a46ee12847848445a83ad09c7b7d8492ec67c6";
-  sha512.doc = "fd9f2e2fbf8d433a6f812b7d63be4bfab12e68557dbe2790b7e39a9a544c8f97499dc3724e2f7e3df4db81592e4fb424652255484e1ffd400ed4953bea8be92c";
-  sha512.source = "4f7be96e3f9edffa527bbc63bab8474486170151edc2eb28b4db86f9b08f708c74cdff8802a701f1eb95c5a513d7416fe8804f3bc993010a1ba91d022826dbfb";
+  sha512.run = "52a930d44a3b04678e6e12632e5490358922bf86e34865844fa016634eb117911eb90554dfab440113dcc30fd0531fd4a3aa81f1a54aa676e7fb806516156902";
+  sha512.doc = "95414a1445561ecd1a034264e052c607eeeb67ba6250f73a3b3a10adc99f917fd837fd352dbd6f9722be3506b109c1e151cbcb614ddaa774d3856029b71c1582";
+  sha512.source = "f0bfcd5824aad22dbe3ebc80a486fbb118c327794d626c9c72a063609a691a812b88a384494fdec04029bc508a45b4eb939fc45f51c06a17bf114c18b4ee98ed";
   hasRunfiles = true;
   version = "1.20";
 };
 "basque-date" = {
   stripPrefix = 0;
-  sha512.run = "41ec0c0b19e713017a96b811a9d8b286ded06abc0af88cc1ef55e0b69c801513ff1eca6472fa8df78b022747e38020a32c27902b06c9e259e1b1f8bc1a4b4c07";
-  sha512.doc = "2e085370a2917c379aa4b7c56f27136050faa40b53f1cd12f4e60f56a5f345040a6178573004b313b911bcb3f1e9e10d38bfc2aaaf2dcadd0a23eec9d4891f1a";
-  sha512.source = "2e46e4eaabd9a39870483bd7038f7f4158bad52f6df63283220dff7371aadf4bffcb2f9a89faedd7835e39e0c802694076217651d7571433b01b6e22c4c7c42a";
+  sha512.run = "7509dac457025d02dc8ad8ae31d45709155ba20dc7562d7516cc76753ca20975e4766029cbb843f651fd8f0e55f0a90269539eef73584deb96902405980782bb";
+  sha512.doc = "9f06128bc0957a32004ff886a2ab2d90edd507db7654cc671b140e7e3145f2278caa14e40d9149dfa8bbd2fa59aec4f2ae122d03d4eb3706e969b46699a190a7";
+  sha512.source = "80560c5a4215a55a62513585f258da5e6d0630b4295d1ac98d2eff51ef9eb19e29c483071528890421fc9fdbb0c0c3c54bc7b14f1eb8b82855e02763e188a9ee";
   hasRunfiles = true;
   version = "1.05";
 };
+"bath-bst" = {
+  stripPrefix = 0;
+  sha512.run = "d997edb1e4af5064f29b938c9c7cc0c6a5a06269f2281d383cecf0ae076db3912f4f935f615a8bc3e78416fc141a5b93ddab125ceb52dde59aaa93a96ad85aa1";
+  sha512.doc = "addd9420a2043f1d507136b42c2141c6d32af2164b96f6707b0cd4a4f1b7fcfb8475c2e748077201e1d8a1850b0edb951567b092f57238938b2c33fef950c7e7";
+  sha512.source = "9e1bd7de9a120f68f09ad822955b400daf63fd3dafc95b26a5c7124eb4ec4051d345d39e64fded45c1231b51ba0a82d9035c54b5123b10dc46fc5e35bab1b817";
+  hasRunfiles = true;
+  version = "2.0";
+};
 "bbcard" = {
   stripPrefix = 0;
-  sha512.run = "1756c7b5cf9ecef059a76f213d25bfec4ca85da965e8e05ba588c33492a65768a7e1574daf5e3774d9f46459cf567a4786bd25b3bb9da7e8c201b492e36af74e";
-  sha512.doc = "5b877cfd14162e666d7d593b32f59dbbad62b139561400f62788c95d99f231fdda072b83ab4e001e63354809b033eaf324bfcdf59eeb99423104d58e4506b7ac";
+  sha512.run = "c489b781ca2e0ec79bf33418a58333bd8acb9a92e40a09409e359805d68618926de5cc6487301405b97c852a9a97619936488b274a3fff7b5f5f505bd98f4fe3";
+  sha512.doc = "2304bbe509054f6e84a0e0c4ae9af2431762e395af27362dd4be68b8de37730b6ca1f9cb0d5e73f0985d305e76a7ceecbe29a7376bfab30dca8602e119471a86";
   hasRunfiles = true;
 };
 "bbding" = {
   stripPrefix = 0;
-  sha512.run = "a35fd4c9974600111c1a67e219c0a043ad2184099a3cb4b717631afdd80cf6f1ec7ad2902208aeb515908ea4bef7207dc55b30f0e46b411505c5676411eecd20";
-  sha512.doc = "f61330a5005145bf2b875a356d974015ebf585c11e85af8b07e397a89f155abb162eb1a0483c66fe9e10814c468c4fcc6c6ffb458010c023e3ac679169d5ae96";
-  sha512.source = "09193b19b6f0d6158b0a018f9e80b9ab50b17580a68d8a26661f4b74984ef6a9fe3b2a0d5289ebecba98faba94ef97aa207b33b8a08fa035acfae952036d941c";
+  sha512.run = "d7f7798036bf111152fa131dab6213aa9d5921f7fd5fa19b5cf266d4d7dfb54436a03961880365f1001b573fbdb74c1d108ff7b3823d4d21f64ab77c820ad88b";
+  sha512.doc = "81ae2fc56f6d4b1e4a149d21b6a80ff4141d3b4def2429380feb393aed9416204a2c6f27b38b8536b1e1527baf6a11dc3432706a5a36ed1b89d2ba2e0c787b65";
+  sha512.source = "436d562746c3172aa8063c7965f892929d52e14017b42359244ccda3263b11e42bd1ef8d00e591c9d484182ea0a1c7145be952604ef0f1be2d52edc0ab9ed7d6";
   hasRunfiles = true;
   version = "1.01";
 };
 "bbm" = {
   stripPrefix = 0;
-  sha512.run = "8756250db6aa05ba171b27ac6eda001478e8703606fd2867cfba7053fbf0c63e0df3c12353a1b37d9637e0fd54c360fedc56f986e6e88f82eaa2e873eb6b1332";
-  sha512.doc = "628181b570f1ceef7626d17b6e555c156ea32e257c9977eed33aa2db062c1a4671c6c6d08db50b0c07b19db0e7c26b66ba44f66499c236bc532ad649c6604d12";
+  sha512.run = "c3f2940f3e4419bac351830418dcf25a3ad206672071069c2c2227435a8d71a19d9295fc0339bf7db33ca9a5a524f9761fb4039c87b946bd37b2e063720aad99";
+  sha512.doc = "de376aa85034f5ba278eb596da087e6006ff680c475795b56d4eb10cc1efba6499bfdd2e0a54f4f9a8a8183b8b93b528db2055c45f89f1c0977d6b09bb2682f5";
   hasRunfiles = true;
 };
 "bbm-macros" = {
   stripPrefix = 0;
-  sha512.run = "de8b69ef4fde7ba6bee6e1297399c6d7e6b2622a7656e7a88bb74d28dd5d7bb90eda4be723410859043857dbc0b14d99c890632c23cd89eb11b0a22d6be27f69";
-  sha512.doc = "dc6552c7bbb64df03c9c0f986e29d0ad11fb651be7dff49fa0c45774675b0d0d47231c95eeffd3221482888a0aef1d90a817539c003a2d9bb6cae6d4f24ae496";
-  sha512.source = "ef359151a4aa9abc4cd4e2a014176c99885492fb16d4178136419aed64def5c25cf174bd3196432b25c84f6e620451a7c268dcc432396797abfb688e42cf5fe0";
+  sha512.run = "ef0713add2bce5736990bd147b0f4ad6940807faf0ef440cd54eef3ad08004c9461459cdcc958b761698eed2b03e18378ea17ada9049ca39c3cce862dd3fe7ea";
+  sha512.doc = "bd411e921b9ae5d57944a2f91bff45afa5bd366e650deb541cbf48bbaef3294c1f443ce2c5dea6eed7dc173ae8eedd1e0bb49e440f5410ab13956a3c49e65921";
+  sha512.source = "842c2323c4acb3bae3de46aaef15b2462c92523a44034f91d7d2a2647efe502b4bf0c7f96c679497a1eb701426a7a48698d45bef89f3543d43385f6ada530116";
   hasRunfiles = true;
 };
 "bbold" = {
   stripPrefix = 0;
-  sha512.run = "6e8a62a006e9c9e1dfc6ff5bc3b34a3abb16a332c19845d234f9250e1e36636b0749ef18cb9785199e71b28a52f36b05410c3ead754f978928b3c8de3622a978";
-  sha512.doc = "85d4626b6fe048780a75501637e867b7b1aba3cee2e81ae6e8b0797ec8eb7bd57b60c80cdb3fda76416308ebe7bcd6922b15e30591d92cdbef2de6aca556f7d7";
-  sha512.source = "c0e8eb698f241419a443a006568783d9eb5d7372945d7a274a301b122faf39ff6e0a19ee7043cfc561c49b410a30a42f4e38eebb8866b4f9ccc79c33802b0e2f";
+  sha512.run = "82cc44f0a59e8dfd0f8e06899e57f86ada638c0db9c62929bb7dd000258334cbe1ed204a51d7d5658cf7e8a9f93dcf3e34d7cba7a6d5db8a78c412c29478c875";
+  sha512.doc = "78ff60a95536123d1ed61422810fb2396c0afdc173f6bc2e6074d2f671d5a1494bb678f60e42c52c748774de8bc0490eb149485153e80ae67fd75512b72e5959";
+  sha512.source = "58ee02e3d0577df17421118724450cda0387efd98ae239e84d6e5368ebcc9b348df9b1987a23026be3343fdab14041af8552510617405e54fa8a85418b991224";
   hasRunfiles = true;
   version = "1.01";
 };
 "bbold-type1" = {
   stripPrefix = 0;
-  sha512.run = "728563935c46d3d10ba4964fd6bcea914cf6fd6c3ffd5cb0bcbc95d8b3e24f1eddfa280c92ae08017cca7c302b91237c975f1c30a957ec1be22eef8425033d33";
-  sha512.doc = "fe055ac6847c1ff599024805f3568c8d5f3ca5b5036a08f5488db74ba616bb88508e0dc470199e37fe8d1716de761514805ed994fa45e4f87007ab3d5b2faa6d";
+  sha512.run = "f0349c37f2485d2c7b25c8bc4d046e65bb40a8ef582006ef9d116acaf779d0695f77f21d398e2e0b3b29f894906f814375d2fa3786ac80b93be4a55a872b0d95";
+  sha512.doc = "96c05497f1ca3e97252e340a4fd3fe775cefa29092a5b2bf48fd204bb3ff5fa9cbdbbcbef10e5a77cad124986b40beda38ffc079298c0cbfa3bbde86bf985132";
   hasRunfiles = true;
 };
 "bchart" = {
   stripPrefix = 0;
-  sha512.run = "f24ab5a7055f64a4de6c971f992da92571bf5d4f75f2b8454b392d3da9a6399b704ed397e7f17f9acd0249d91f39f3bdbbe48e6eb05aa8da9c068f8777b387a4";
-  sha512.doc = "0a2a986e9f5536803d76a45285b53ca75e737e4da1cdf278f2e74710512c2ef500c7a21864a9982c4d91589109e603e5b636b7b187e69045a2364149bf613da0";
+  sha512.run = "e9f2ebcfe1400848747538a7e8c1d87fcaa1d2f3266d31cd48ace41b433c7c449218fd14798ecb94aa3447eac83f36916d9147fe21806233eb1110a0abfb04b2";
+  sha512.doc = "23bc80e034ebe897e38bfe8444597cdb18bba54263fa99064fa70877c89f674bbf0033a5ee887739cef6cfe1e6e9917c19cc31d22a211ee04f1710157ba48c7a";
   hasRunfiles = true;
   version = "0.1.3";
 };
 "bclogo" = {
   stripPrefix = 0;
-  sha512.run = "a2cc6d6295c4b82ad8f004d8fdb3bbd254e1e86c51973156f771ea22add113e4e02b3ea9bef811239d2555855e3572ccd0ea552b315f3b672bb7f733f3ca32dc";
-  sha512.doc = "f04c79238e025b38a559ec3374869cd724cd3eb25c45bb7f81bd1e7b814ab2ceec5a64f94d24efbb609519a8e2c203cb99d2814cb70cbdde945c80420701b12d";
+  sha512.run = "fe935cf12fba8288a53c68dade0ff81ad7395fbd757d995b5036394278e7945f42df69570815e7ccc4fbdef713e9422fd4158610c35f473a34c0f9623359fa76";
+  sha512.doc = "e7e8c0fa87e97ee88d5ac204143d6dc5635b648ffa19e8ed5151da68fe128752b6592601767b78d94b5b86b46a345cb8b244a19159d88407147bb6273d21d723";
   hasRunfiles = true;
   version = "3.1";
 };
@@ -1919,2062 +1950,2129 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
   deps."xcolor" = tl."xcolor";
-  sha512.run = "06b85908231a2d37be566cc456133d2e3ced91656b81ef049670944115247765c4040e65826884a074a08d669c727d0d07a83fe250890c21bb035c647c91353d";
-  sha512.doc = "ebe8db8ccbb499fd4b680c476e52ba1dae75cdcfa14e6f211dda440731c9843552fe02d1731ef23dd4b2ec1067fa4109bfed5a32af2a1e898846e74e9507006d";
+  sha512.run = "b2fa718a3301d9cd12c1731ca6a2e2a60d3e7ae35cd660e57522d7bcd5b5b843e4bf62659e034a2c80806a672927fc6b42f190cf0ae57c2ac0d61b72d016cd4d";
+  sha512.doc = "c828ed81d0fdc902021c58cd26a54364f9d347c1fea5960f5926ae7c607095cdfd1d42cfa1ae7607eb303cae317e641a90df76838c26c5f2af9414045fa1d96c";
   hasRunfiles = true;
-  version = "3.50";
+  version = "3.51";
 };
 "beamer-FUBerlin" = {
   stripPrefix = 0;
-  sha512.run = "116d88c35777c28ea3dfc30eeda1474fa2abdc5fd2d14db909a8c71192f8e033d6f234a2d8444f261f1deacb5059d151a12a1c43d859fe7a8b222c3ac794439b";
-  sha512.doc = "2a34703a4ff95bec79adcf302491228649fff34baf5343c997ceaafb0ffa50734349034e48a751b61d6c4cc8ac11bf0f5d6fe243fd53354abc1c2d9bc52074b0";
+  sha512.run = "6a3364865a9bdc85b86c9253b8a1bc50c2e61b2c4342fbac4e930b710a5fefc0bcf377a545a67e7ee494532d82be8f06bfe6e5f46e8b387bf7c6135e34210263";
+  sha512.doc = "420ab892abaaddca1633df4311097d6d138012780b1a4694e153520a3c8c97e76dfc9ef78df0e44472dc2cf1625f3c3f10932a9b88666fb902586b4d8579eb57";
   version = "0.02b";
 };
 "beamer-tut-pt" = {
   stripPrefix = 0;
-  sha512.run = "c14bf5c707cf3fb1b317423c09007a49994f1b2efa3020419e7090a4afe8075e998120309f9f7a8101a31e0fb8b7895fc4ee8d507b2710557d81cc1ace431aa2";
-  sha512.doc = "b2eda25918df13a82ffe97dd79699b32a31e013bb8a94cb1aac7ab9ae3ffca0fe2590176c7900f250b02854dc8420b59400de627e185ab6accf9f2300bf058b2";
+  sha512.run = "5eae5f8ad64254a3600168146bcfc0797a17be35e36376f70c3dd4b9ebba7a77ce550cc9eaf995ba6897d34fa092b8cc55ba8c6758b2a3b93dee3aa0a4737c3c";
+  sha512.doc = "50da0b7e53773e74ee7b1a4e621d1316ebaa8bebb39110ecdf5cf16f66fe30c2d7121daa75c7d7443cd3362faab4917aaca54ca372793a63da00beee5b9516eb";
 };
 "beamer-verona" = {
   stripPrefix = 0;
-  sha512.run = "2933dddf63ed3965134d5b3bc381056b6e4212794189bf757eaadb1e9e524429146b3ecbab7561e498cea24d254dfa9d7f86e725453dd0d4b31fdb3390584fcc";
-  sha512.doc = "56d4352c1944b1d27535815f61b7aba14fff3176ad3e35fe0051f71e4a37ffa594a6da0bbcd185354a3ad9f3f4d3ff3f49d83047d6e45d481b461e8b4431cb7b";
+  sha512.run = "70b5bfcec0b24a1ab1d311c34ad7b90e1b877d7a7e8fcc793b0dcd339b9823ee0d1d1bff1a7db6c4bdb686423816f0ac7206d1a6bacc05e4b099c94b5d26f193";
+  sha512.doc = "0855b72a1a89fce09179e95e5e6396732cd112b6df17f5de132a6247dcd512f51151b09b9f0518c98ce66e08ce93c90e9b47d02608a745fb1aa84aa6403c84a6";
   hasRunfiles = true;
   version = "0.2";
 };
 "beamer2thesis" = {
   stripPrefix = 0;
-  sha512.run = "9f260f0c48f92e5b6f1e4c407a039421ee10bc69a6e0e6a94858425ca8679f36469e841399f526ab29b3d73fa6d9abd264f56b2e1a7751b8e8c4aa24ff86ff48";
-  sha512.doc = "56dac4c7c077d62595f0a17b6c20d6e3f5d79c553cdab5b7c0784c7de71180aef02b9501d20cd4f882abb28c0e17d33fb161c4e9cd2627ce22545b8193df91ac";
+  sha512.run = "5f6d186802498f12d9c62e8c767fd8e42744510808b379e76f05d5390282dd205c3ab42071767bb46f8445f838ec8f18aee9e3e6a99aea32b5960120dfead357";
+  sha512.doc = "82d050397f0857325fdc1c3fde973c599323d43fc21875fb9e52c17a294edfe152ee5717f465687a7d6bcc960092fa2427bf4c67862d94fd30dab3d088fc8127";
   hasRunfiles = true;
   version = "2.2";
 };
 "beameraudience" = {
   stripPrefix = 0;
-  sha512.run = "3000c69ce1e1b905eab3091f1a63b528a24b612304d2aaed72c47973d061c48f1dec0851617313e11cd4b89877a012f0f9d3078e7c26c8764f9ab8958641b39e";
-  sha512.doc = "6a5d3a9f1c052104f213dec7c6f81595bbf818ba1efbad5d23e542bf9b5e980dcbc3ca083bbca98a7376d53891bfc752ea9f3a573b6644e19f2ed5307be43201";
+  sha512.run = "59b3e7e6119521a5384a14cbe37d82e9a6ce2d697171bc36f59d1316cf158015b1369f51d857a8423e4d58f5f1632c8dbab2c8c973a212d2d81f9229630f4c06";
+  sha512.doc = "6b4ad94b7e7ead5f57bf506cfba107704f4683c7d44c805f698d6413b0cf9771c90631331d74b8cdb3917aa58803ab22476c1d6094b85854db60e2f5bd6f0747";
   hasRunfiles = true;
   version = "0.1";
 };
 "beamercolorthemeowl" = {
   stripPrefix = 0;
-  sha512.run = "ec0ab7426016544250043829caadfd7f4e6b106538669ffd6e6ecb8dcb14420d6169f751ae7ab75af660a57eb96f12977d78cb75bde2844a33a39f43cb0eac0a";
-  sha512.doc = "5fc29384d606a70f605168847c27e8617818e03e2647f7ceb45930613f887046d0f7cb1c44c0fddc61f63090148c0b2d07727db11817f4ca49fccd5a0974928f";
-  sha512.source = "1442eed6a526e060cbaf55a63a9bd9bbeef9a66b3c84b1816dc29dd58bd7442f83d354e417bf29469b2657f9c47b01d798859da60950334f2ff333979430adce";
+  sha512.run = "1ad8c26768778584b6b57e6ddcd5c54c15b30fe1ff916d514f72877edef3e325455187c8707d504963d7e2fec90c3865f81ae95eca2d678a6c9408c6124c9969";
+  sha512.doc = "0b41369b8a65588c57a15027451e38bb445dfb0f004e808aaadab8aa7ab78db44d42d47f225929c9016f11571d8463f5109f6ca082b74d7ca5a5d361c978f828";
+  sha512.source = "8072573a2f6fd9d6c2632e5caedf6f608cfc589ed007f8065434946dd0bb65b6ff9822d286abc6d247ada411ba3235276eeb6e31d07b11f9eec989162035727a";
   hasRunfiles = true;
   version = "0.1.1";
 };
 "beamerdarkthemes" = {
   stripPrefix = 0;
-  sha512.run = "872684fafc280b0edf939b0543ba28a470466b3afdbeb946c569f6a746bd8a5b14cb30b301d9030fbb7c1a589d34a0e9d289b5f86cabdbccc5b75814f7184193";
-  sha512.doc = "220de9010a046f4e039c11d96359ca212a4b9f3f85b166bee172f720d2e7077c2e16aeab1899a5a304fc9f4d162f0ec394ffbc8fcc291d914244a7e4778a177c";
+  sha512.run = "dd36167a6c5f9bf02bd31c44657ee68506781486c7ada5819e5a926dbd1eb3c2d3307a0092094298bd2e2154d84f3251fab3c59a44a60af6f3342975555334e6";
+  sha512.doc = "9b68a9add661e492f058ef121f2b12d629e7afa86534903569037da654005dcca7707c8130ffc362ecaec99ad071044c10d24981ddd54f21777714a8a31ca981";
   hasRunfiles = true;
   version = "0.4.1";
 };
 "beamerposter" = {
   stripPrefix = 0;
-  sha512.run = "f8dc56760e0103cdfa92cb779dc7769175395ae8030f483d9e77cc8909d6c864204dcaab9c05014ae8d06843d469717181e7ea107412fb1f35cef958cb02c9cc";
-  sha512.doc = "87602b134b2c3e1e3da5b0aa516e2609bdf053352b310d3449e94a08d9dbeaad961250f330509bb4966f46a2fceab01f873b0c0ece8f69c556f44f637c6bd6b2";
+  sha512.run = "e4025f4796d1c46aeb45fec8754a9426d847fa7ee974bd4479f585bdd115ccd8bd0d42b62f2e55695aa039e93438d169b6bea664fa81a3b7e4b96d1e0d1b3cf2";
+  sha512.doc = "8f5c563335d4fee97814081ac82b2bfe855f929a14a5cc2eff1c2268236c770dd70959a4f35d41c5847c2d2aee66fba618d789a12b46f5c8cad5ea51f649e737";
   hasRunfiles = true;
-  version = "1.12";
+  version = "1.13";
 };
 "beamersubframe" = {
   stripPrefix = 0;
-  sha512.run = "10e1896a5a7a6d3a57f206bd87ce7377ca1a81c68c0ebc5cb552467222d81bfa65ad2b4bb93465ec1c037d6b890224bba2b650272d4ef4588a64a53c18320b9c";
-  sha512.doc = "a83e238ef6e513cbda4c38acba0fea52ff600dae8335428baa53f83ae3f208d43c1f34261feb4b27a1bbaccf809f50b8c17e169f3f810809b06f5e6d221b451f";
-  sha512.source = "a2a9d3e9d7cf0c59e08eda952e509138ad28f23d948b588a46ad45d5b6fbfd824539e0087e42847b7d691e7e7bdba5c2e7508614c7b0a68a6f10617f1099d05f";
+  sha512.run = "211591c795092c9549a029ce8a15249e60b6b23b66033e2db146ff6d2183a7cfd0f8cc1bd8d5e10aeed30f075d7df7a9bd4d1ca711d8f90348924793a8b3aea2";
+  sha512.doc = "fbf19e537a866bfcbbb2f03687d20d26ab989c3f6a6bf74f1d2ab97e1d3a198a485e318fa3fe05f7e06bb04deb5e7acffd881a743f8fdd56edf8adbdeb7896a3";
+  sha512.source = "27065ea9742bb24c49866cce314962db5311013e261958229e45f474cf42985bd901830f6621c29978ae06069eb8ce45e862471944780a310793e060e540a686";
   hasRunfiles = true;
   version = "0.2";
 };
 "beamerswitch" = {
   stripPrefix = 0;
-  sha512.run = "b4d4054161b9a62e7950066f56ff29aa414889f926c3d8fa3324094065c797bfadebcf16c0431aa50a8dc5a4c02175de5dade64def6df22983f00f48f3db6842";
-  sha512.doc = "0c75ad7fa3bd80341ef3a55e4a02365ad2857123635d589a978a6bc84c645a5d5e6f37bd65383dd31510424b3e856f161992f83df37a8fae18d3e6a0866a0a6e";
-  sha512.source = "e58dd3e52946d1ae6e6bacfc45227576fb8e2b6ab6205863f63d54b68150cf2519300ded377495ca53fda620273b7e9fe5dd135f6d5682288b72f1461427e37f";
+  sha512.run = "c9e8edebe7c223940287ce375d125681949a337ce9599cedd09fd2be1683a5c3b559f6595d702728d094a55a3f530ac8baafdd0cad1f0a9d15a8b779024d4936";
+  sha512.doc = "9c428b50365f457ec10c3c4b92cdd46021b2cbd0a0d116d89d2859ced175129fd973ad41a1e528b254601aef518d40085375b289a77a0a33a85056909a982a36";
+  sha512.source = "a71f8f3c5dd501058ad76b4bff05296acefc4b1ecb20f380b2b9242faa2d0045432035192001a7814e0a1f217ae4b9fd83a06401c1ac40ec2cec036a962e3fbf";
   hasRunfiles = true;
   version = "1.3";
 };
 "beamertheme-cuerna" = {
   stripPrefix = 0;
-  sha512.run = "ba554960c2ae8ca27424271f0178c67d814eb83de55a4cdbb428bc9e7ac7efaa20d8498e2fa3e9738dca22b94fc365828320d271d4bacb7b37a50b33f16319c5";
-  sha512.doc = "e212acf995b6fe33aea72edb613345915b935e2b1f24672f61725318e1c02791d512e24766c2e7443af174fc8ea500e8cea39a84f86d12d79417399ff279bbfb";
-  sha512.source = "7e1773187845d8034b95135d44c5fb50ef6986d54595f2a734485461d8f10d926a89892bd5ea67d7af8fcf81ec32991d7eaec56faa158814edb5ede9eaa39359";
+  sha512.run = "14cfff03e827a5259fbd930330bbf8e26b3ce0eef589a66088d73c26031158e69eb4dd43d85e0742156bd37551f63049461cfbbe357b8db689074807e2fb1869";
+  sha512.doc = "cbca18debf464061f0c4dc9972bdc22cf2d862b22ce401f562b6113b27a5792dce8c047c77374ac29327bad0f1a08a1a5074652cd9252b4ed2a60c5e95eb64f1";
+  sha512.source = "6adfc06b1984fcf47c011f79d25a1ddd6c9f46dd162ac9a2643d93e91ce7d9c2946af3fa2d15dddcdbd3d3538af54ec350ed825930ed98ec2c86d6b1dd657440";
   hasRunfiles = true;
 };
 "beamertheme-detlevcm" = {
   stripPrefix = 0;
-  sha512.run = "8e44a98f1bd3816dd069029035d85e938fb6689c3b5554996762198d4e74ff706fc38a5e2ff0f152c48bbeb23c3117897cabd02df8b5738c38be108fd118bf2f";
-  sha512.doc = "9efc6c75491ea5f6d670306368d372d688e6da6e98a6fce20fef6339f18f5c5f595708e13f8b02c4a0c06bc30cf5125e21229d3b98dc04c82c0825b0970b10c2";
+  sha512.run = "0d3ea01495454511d0df063c7443ab2837bc67954b4a5fec59e8ef2b78fe77b8c558bccfbe49ba685f91a58bb1f043a76b33bb75d7b7f0ba98e45090bdd4e52a";
+  sha512.doc = "03ec52be2389bb5afe87740e4e6fe7e81d589e0ee9c0f25a55ee8457782980739a41677ecfacab55200bba8a990d5abcdffa0bb7a7603a01ff050b0ae4e98500";
   hasRunfiles = true;
   version = "1.02";
 };
 "beamertheme-epyt" = {
   stripPrefix = 0;
-  sha512.run = "26a012da4a53ce82d0e5f94f18a67f6d7410b13780e2f708217c127c6fa36780d01f985f5d9c1ec9d452c37fabee5f674335536c5097b216c538836e3207668b";
-  sha512.doc = "f6c18262426d27de022dd799e5416d3530bdc5baa38ea1d52073303cc6517c105f7047cad0a2894551fa9f1215362e0ec97192a89178be209d22dbf6ac0411cd";
+  sha512.run = "3a37399028752af6ad0a3c447532cb28647f1932a55aa9228fd82a2f8579839630244e072e9c11627616048eae65f97c9a1199382f135ccda64d7851d80bd10c";
+  sha512.doc = "a39a4e39dca8a8dbbdfedc8e923e1d6d1707b3e29852ff431e14022667c7d31f5c7552b2ff1751027ef33ebfb75df123b5adf65c25044b175739818e4894b9fb";
   hasRunfiles = true;
   version = "1.0";
 };
+"beamertheme-focus" = {
+  stripPrefix = 0;
+  sha512.run = "140f0c513ad9a69114d5c9af902ede05c980fa8bb0f7a4a4cb39f05544ca1406ce8e1216d8f9efe6e7d07d3e75b694353b6b53289664cba337d442e32ef55363";
+  sha512.doc = "b323791db4eba03817fce3b04180d1321a42d44e6232a3d3783e3c2c0af9f8e86101ee35c6ea5d715f245319307292f1a011ed5d550d2e6cbfcc1a5b262f77dd";
+  hasRunfiles = true;
+  version = "2.2";
+};
 "beamertheme-metropolis" = {
   stripPrefix = 0;
-  sha512.run = "5ca625095fc184ea7de13cb7590447222fb507858d3c9d38f5549af089c72a8f9fc4409a6c84579b090f0396c1f5b263b051e711a24bbf5672d2bc56d0e2f684";
-  sha512.doc = "3d4986e6560264e2439a5d75c1aafbc7d7f30bbc454efb5b179adad51d7eccad62b6205bb3a1057860cb1bce2dcbc4a1d4156ff0c6d28f07a03c4b3d06b60673";
-  sha512.source = "0debabbdc18dea375fa0ab5c298041c76e5acba4f6fdbffd3dade488f093c55444ae9f7057565b60ae01fcc9f9127f82467fdf18f569b17dadd282c24f9d32e6";
+  sha512.run = "28a35e152e25415b3b9f4b0b18044d3538014ab07e4869167061d4a002b77acec11382a7327b6024bb17a12a58e88d6501a69cede645a62e0dd2770b7ca54379";
+  sha512.doc = "4f5718311ac81d5e92c21b01d4185959db332aa466d36b642318d50ad5f96f3fe734ec703d03638a39fa84e3c941359dd1f9c9ba033b16cee29e012c0871746a";
+  sha512.source = "d4a84769af84220daf19571397941d234d0b0e271ab87347e33618566cf9794413f758b6b5e2a12a46e2eb0c028c7afb5023f276de8e3b7978c0b302d28f09cf";
   hasRunfiles = true;
   version = "1.2";
 };
+"beamertheme-npbt" = {
+  stripPrefix = 0;
+  sha512.run = "a80e5acd243c701bc915a775c3c2934d4597222fdf10ddb6b7ce50cc97ce6d161e889445a28d77b89f7ed00f92ccd1cef42d752b28437c01e902fa5ed9235f4c";
+  sha512.doc = "41c730bdf265562c62edd3bd554629d62fc304faaa3147fda39bb242fa785d2c46ceac59421e431a51bbdf5d51a171aaffeb4b975c050c015646da202ad17d03";
+  hasRunfiles = true;
+  version = "4.1";
+};
 "beamertheme-phnompenh" = {
   stripPrefix = 0;
-  sha512.run = "30aac8f9ddfaf8870e9c89b2f4c14664a9600723036f54259b57813b8da2595309f6509fd48f3aa1975e621d70141429095ff67a202f6285a10586014044b7d0";
-  sha512.doc = "cefd5032d4dfc1a8b9bfd998969812af1ebef6e43bdc1dd3be24d63c72287999d2ec11004eb3699f811f6544ee028156cc74c0fd19084608a3f3582ac7ddf8db";
+  sha512.run = "885323e17e4f6034d524ec6515891d8ba0e1f6902e394f0cfbde6d2c48cf3d2da80c5d357b7e2234a1e127e592625c7e05c20097c1417bd8b33c37e67d4b9f77";
+  sha512.doc = "3d2976123e5cae274860186250dd641c51b83510ca459c95d914d774d2b8daf99ebdca2eedf52f07b647b48f174e674f51f077526fc62feec5d83f0088c5ab52";
   hasRunfiles = true;
   version = "1.0";
 };
 "beamertheme-saintpetersburg" = {
   stripPrefix = 0;
-  sha512.run = "d3b98e8bc8acab907326b0a38b47391d6ace87f4b5df41aee2fb520d98ab536e1188d4cbccaa361d7c0832580b2c4aa27aa2f46cfd39e66319521e45c514392e";
-  sha512.doc = "f07e3744d48b4dd24f4774756b7bc7fe04143f9c3195d074bf3376c2f825811632ea0c1ce809c64654e049b69d6d9d41df15983c608dc70f047f5e790a314d6f";
-  sha512.source = "92cf252962fca7b6471c6abf4286999c98dbf238fe70198b49c9e0e18cdaf98a5f6b8bf0fcee3adc2bed3e1aedaed164f34df4f7c4b4540505528e0ce4b598f4";
+  sha512.run = "0a8b3c740f544be730c89c0acaa67c0e63a8b3ea59b0050146ab2a4302147f8621c9401164394fb36a0b68d46198754bb433722a406394b22c0a3c4cecc5a284";
+  sha512.doc = "afda6487994ddb7fc37469bc17a00521ca0916060217939a6dc1483355ce4751fed74f11c3928d2a6b957ed2c734b5be7a425f3ce70e8c71a09d05630c74b1fd";
+  sha512.source = "76dce1c6aac1d84cfcf4efe00fbf658ed31787168caa70bb64ab37a23bcd5c8b90f666881f8eb74e655e722186fcd48091c9ab860c2b2fdf0e14c76bb836e523";
   hasRunfiles = true;
 };
 "beamertheme-upenn-bc" = {
   stripPrefix = 0;
-  sha512.run = "ad585abdd4565a6b5fd5641b24332d1519bbf0a4e5d1154758bf8dc64bfdf277315ba9e6aa5f26bc3520fd3c21a95d9e7acfa13687454a620b2d7f098642b47d";
-  sha512.doc = "6996e97f51286c70b04a468ff60ccbbe077814def9ab04d9484e0063205e771988dece3d49619798c80b4c3fd7933a41035160d5c70d304e90f53e98815b2196";
+  sha512.run = "32e62c5ba552605ad3cb7b1dce10cc49e2ff9ca7c03d0df32cc45ae2d31a9fabc1235d336a742d884d551d654e3db906d17a172a138ecd788133741210e4c984";
+  sha512.doc = "4def312d429c75968e6a303910d23cb10ae09b41e8dd4e8ba12de8f978c91bd427f363569c9187acfbf9a589377f52105346b70ba4a807da41a4ab4d543821f5";
   hasRunfiles = true;
   version = "1.0";
 };
 "beamerthemejltree" = {
   stripPrefix = 0;
-  sha512.run = "1b2cb73d80fcee3bfe2c5b5e5724b786c995d6dcf7a95e78f6a25a8414ea24ee38b50f7862da1eb6368008fbe7461687cf1b3bc4e1cca12533515483da543f95";
+  sha512.run = "84c1d8e570bc298be6c4338092c6826014ef7428b19afb5c874e117b87d3c6249e4a6c9bd14a3d63b94afe6e45fd733bb61854b56deec4dbc45edb2d6ff00f18";
   hasRunfiles = true;
   version = "1.1";
 };
 "beamerthemenirma" = {
   stripPrefix = 0;
-  sha512.run = "0ca2045b97f17bf12ecb7991efb778f68d20627abdc562cda2042498226f2abeceb2a3b393aaeaf1e78d0d66defcd2e5bdd28ad3bedebc564c7e39eed9b443b2";
-  sha512.doc = "78d03cfb3e2e42c5a0d425225aad635e1d0476c2b4ed4ef999aba1797411634d5c8c60367ba4d5c952cb0dbab1a6450bc01b27005a37ae6f41358b980a20bbb3";
+  sha512.run = "3f113b22993908b0c69ee770a808947d01a313451564cc75f82820ff1618cb5bae90fb0118a74252574eada0e0e3ed0ddf6758575bdf70c6f6e5ffe735db104d";
+  sha512.doc = "758bba0c73ce7420aea4f13c5a618ccfba1878b9fd7b5740693c73352ef12077158ce249a927e1de9f033ec1959c73946a6f9f3a1ad3e0f395ea11109a4791d3";
   hasRunfiles = true;
   version = "0.1";
 };
 "beebe" = {
   stripPrefix = 0;
-  sha512.run = "0701c6d3ac2c32970bc11629b143ff5cbae10cf663ed5d5088abef41837b15eff176e8c38fee574afcb9719a004a074ed2fe0bf0977e413980ce76e4fe956563";
+  sha512.run = "2ff74e219504c15f8f4e36fef6ea6c2cf4274cbb7292959c69143c8b4d14e661068489e6f824f05365b36f3f2c646a912db50c3ca826165fc1ff6960ed296302";
   hasRunfiles = true;
 };
 "begingreek" = {
   stripPrefix = 0;
-  sha512.run = "b46725176516a179f5596c9773f4d0a2d0acbcfce54f71f57698f67ffc783f44a1389c45f3fd034aa7aa2be0e5c3becf4b32d22fdd4c3a2451b451f554d9cce9";
-  sha512.doc = "dda6964c5f0a1ad3f6349019f012ce9a01f2b8eb22b52b874a888310c057ceec1f85953cd542f1172943824afcde926c1bdb74e1949ee61435dbc73bc6e62a23";
-  sha512.source = "80d9348a72a369ccd3f36b259fdfdb5d021852ea594dc2d9dceaff1fb957e235e93aba9761cec284381a7fb2f83ef59e37fe6f3bdafd0b0cf856739337c61933";
+  sha512.run = "e9438a534c11b031c2ec9b0bea19e6f6795728730204d9ac8754e8d68c56902d05ef7b69adde88fcec996956dfed6e80d70ca08e7ba3d4de223c180c3cc42d5e";
+  sha512.doc = "78c444d77cfdf444631199c65ea28543734d05902303d4cd7d8e2d0d2db0bdd79f0df936c254b37fe2ef52618ee5ddb33f634d09b4557296eecc03115459f957";
+  sha512.source = "aa53dab7f869cd83cff26d766f30177f981d791593b53f8f14b54e8aa4a96157a2a3f7a742739bfe0eb4c6e1e5572eef7e9691746fc8060d1907efa0a2af5eac";
   hasRunfiles = true;
   version = "1.5";
 };
 "begriff" = {
   stripPrefix = 0;
-  sha512.run = "5f24971e7dc3204e6e93d0dfbdf0fea357e1d2367fb658cb1b43b47f1524a8db224614632a4478595039fd4151bcbcbebd4d34dc9bee1e6b811d7848ca084a13";
-  sha512.doc = "710c7b947f973a4813b789774bb61355b853dbb5b43233c9527c44627f77fd0e55a7fbae818275e03a466f3e4dcaf6ddff789934cd46b83e0776e87afa3056a3";
+  sha512.run = "bcfe8cda8168d494caa91cf4343dd85e58928fdb066fc7e8e3552a58fdf74d2332afdd831e82eb33ac6cb17a19f7f31c4cc402d24c58ee5607f1af0d56b130a5";
+  sha512.doc = "fe02812c77889b7b749a8f77508ddefdae0a2209a91d9f4f78c84c30e569bb9997f5badfc1548e5a56250eef90b9f2d646dea09b9452ac4c03c31629fca0a40a";
   hasRunfiles = true;
   version = "1.6";
 };
 "beilstein" = {
   stripPrefix = 0;
-  sha512.run = "a58ce6c7c327f21c795491d9978ce95582fab431bd0f361f1c87db62b2f629300f98cd23c4db84a8b39d6ce144f82bc398b5cba876497585504d5f8e5dedd30e";
-  sha512.doc = "6e1b43f77f55a3a2461b23876ed7d0cf7fc6b3dd3ac875c5cb19fc74b381d55fa357b04905fba78f3189f77126f40183eb64d5ad6727230a66ef1fc36afebb48";
-  sha512.source = "303b5c82cc211cba4beef63257bc164a7d5328a48ed99eb1ed2a2d10c449f615e34862e2721ecccb5f969baa2bee90ea2178897dc0d9da7669f9c4adc45d0ae3";
+  sha512.run = "70bc371ef9cab18a57a591d812a3eba372e840eebd482c1863439a5cba314656682daff6bf9ec5ae96fafe62b3cbd928600161d0355fc55c3d3c77a2834b6ce5";
+  sha512.doc = "029b0c304ec47cfb48f0b865def8f947dd73ab321820ed84ef36d13f6c71efb7f80d046921467546132c98482a3bb09182a2cbd9206975d303441a3b8d3ac667";
+  sha512.source = "f1d9175620aa56b4f0f480293e54ee0d98abfd3dd19c8a4faefa7472241424723617e57bf4722cdca02b555906a8d3aa0dca0530cc61a0f6529277bb65b75d6d";
   hasRunfiles = true;
   version = "1.4";
 };
 "belleek" = {
   stripPrefix = 0;
-  sha512.run = "9fd9554454696e8119f95d5168ac210a6f4b2eab60bb2752d7e0f369d1dc86d1f7fb10c4804ace0ff5a5245916bac383e445ffb203e4c91bb44f01cdcb3155a1";
-  sha512.doc = "6d49dabede94efadb7328d28f47f6cfc1485a741c0e62872dc975ea561ce3682707721bc59048aa16d21df68016a100b1eda29c711651753f0c83e34e8117f26";
-  sha512.source = "a9efdd81f68c3a2572ea66ea97fb72a5ff5f020f27801992b4da64c0864a88dd2480c6961eff3c44f6c162619adb26e05609e01346f0e6711bd570f634d55b76";
+  sha512.run = "b23a7503b006289a4572f9106b9ab55dfa5f16fd83b5fd75cae8f7d7222233c68201e4527d27b35334d76bf69688552855e53c94a696e4b95116b44923b41f82";
+  sha512.doc = "8da8fb9d1658d30d5869d194ab4e715e7f34eef3516d3a1423f497d567a9618f66dc98856c73f85ab07be6a70154b8d579c95c6696dce701064a53eead01ddfc";
+  sha512.source = "b9807058f865fd55ac6e2df43d8c83216e8b2ac1ea6f41b5445544b9f0de8fa4e6099e165e46c44060e91b191f9ce6ac8daf719b20a490743f97c733c8320b9c";
   hasRunfiles = true;
 };
 "bengali" = {
   stripPrefix = 0;
-  sha512.run = "b56dd5532f5a085698eb1df0367ba2f9bb112bb4750cb0bda67d315962bfcd1c4462e852f2a9ecdc2abdb6f72e8bf5b30ca5a3c682a70667b074fbcac2892a02";
-  sha512.doc = "cd18aa672ed77df25753a838f73c5f18da9ca65e778a9e98cb93147e142e24fe60151df7be588cf18237fa588dcb6511b6473b82c8f4dc669d48505c23e67a30";
-  sha512.source = "1177a956838ef0367d0f495a645da1cbf47a0440b2f43b56adc497c3d140d6b3514e761c83f3209e165175f7291d88a4cc0daec812aa9dffd0b9e2cd94e51088";
+  sha512.run = "473e220cee0cfaf9682d7da8321e9a77c30f42f04c54a9e62b9558b8b3cea34a100e7d7011bb9383edf6b42d56c76d7104634952ff53a96bf69e13dec6c6767d";
+  sha512.doc = "34b1c3c5b7fdb693b6054d02b0b8c8d4aac26eb56cd143256e3dd88c796f7e5e303538bb8a69607c48ac9b19326fcfeb5e1c1d82898b9396fc3e469605f6226b";
+  sha512.source = "3933748b554032c52f2349ff6c03e45861b6394feeebdcaf3aa119c5a3dbe7886ebb4d55bd7526dd1998c662cf638d5070ef91be34d5036b92dd5e9870bad379";
   hasRunfiles = true;
 };
 "bera" = {
   stripPrefix = 0;
-  sha512.run = "77de10f020907bb8b8defaf701d721bbd6e24105668285ad5094ae30c1391c23e194aeeed79a69e2dfddba18086f40b9c31ebff4020a91e6db9c946a93f6ffd9";
-  sha512.doc = "ec722166f8c3f055cc62adb205657e49a724a0a78ce0411cb7975f7948ff9640046a0faa183a435d812c75083d26be16a8693492a77aec59e31c7843db7ab1dc";
+  sha512.run = "394647144b463a319bb5de2dc62a6b56cc17fd87b01d787cfeee2c805e576d201bec6959c4d8fcc4ae886bd261aa5146fcff8e110a56dc2622662a7dec85df1a";
+  sha512.doc = "b84a6d860bddb5f80bfea55d89d5a6304cdd05bed2421b16c31a17f6af418a1ed5a3206c68812fc2e7da1d743a33c081dc1ba5aee8a3166b002908b8e814b3d2";
   hasRunfiles = true;
 };
 "berenisadf" = {
   stripPrefix = 0;
-  sha512.run = "02c2c1c43c0bf6796067ec50e71400aac134aa945b6c65d24f45c708016a0404f28dae13ce63567d358fc338257d63420466f1ec3da8492bbd8535e325d0d876";
-  sha512.doc = "97d91d0bc5cff26079daf392e2be94a791dbf97f7e840b484f2d1ff5873852a1c3ba0456f4100012739fdbe41a83996462ef6bb185133ed3f0c8acbca903fd68";
+  sha512.run = "cdab6b1e0f40da8405a61e183ed9db5402cb3f2e677d0b207a63e8f08f56c9fa20f24d90b03e2ddfb7f9c8379a5b48767868dd51cf460b7a6ee0374cd5a885cb";
+  sha512.doc = "462f32322220362de29295c8481e6277172f7e67a3715f24e858b0e819ad7a1b2c5278faccc2c01532ee977ef7e89f294b404c7d9dfe25944268bf61d2ef89df";
   hasRunfiles = true;
   version = "1.004";
 };
 "besjournals" = {
   stripPrefix = 0;
-  sha512.run = "e2f690dfde22b7f255176a94fd250e1a67e2bba22e48f691612a1edbc4ad406ac431b4ede2638d41da685d290a9093b41a43ceb327e51a7b8676edec19409ac1";
-  sha512.doc = "30de767a7dac0cf489353aad586dad15544a5acc65af9dece87b103e9e42d5f139dea564622411aa5470925ed47f74d7d41ab9655fbe0e0421f64da29d185f06";
+  sha512.run = "71ad16b7da18d3d9db8f9874ac0fc093ea8d0a52c8d0603627dfe87cb634cb72c6efbb22e721bea3920fd431efc25621cc751eb01e056a762252846c0fe5f4c5";
+  sha512.doc = "e84cd65531127338af749d59a70b2c929f91b2097f0705f4af2e76f3ced5f0adbb3b0ef202045f69615123232e5462d1b97ff406d4c8f3a45903a998175bb190";
   hasRunfiles = true;
 };
 "bestpapers" = {
   stripPrefix = 0;
-  sha512.run = "948f12bbca7a48775c6f273e73fdf4b667f2fddcaa9c3e38888741a815a50d8250a99a4d3036fb227899c17e55cbab7785499109f83e1d225b5809cd34bffee4";
-  sha512.doc = "5d9fc2f56c67009bd3021ac31325a107d6bd560136f744cc1bb31f11e23bcfaa9259c37b3e4ba736feb24c912fcaaa79505fdba00b86b58cebf510a3c591c7a8";
+  sha512.run = "1ba9fb88ab2b58d5ae951acd64c9995b99ebcc20eb5e80ee2637b40ea909a237ddb43f000a6085295070d4fb09ea3d701ba53774665f568ddbd9425222437714";
+  sha512.doc = "e232ddaa86ca8823d2c5ae936d0aff86e2696e96781fcd52b0f21f79cc6e77a148d55e088f7446cc33e5d2ecc9ccca7e0975f0ff3bd99be9f9c89d2891c00df0";
   hasRunfiles = true;
   version = "1.0";
 };
 "betababel" = {
   stripPrefix = 0;
-  sha512.run = "4d16d7842c404265e68d39811549505260f711c22b2eead5600434b4169ea3d361a09aeb865ccdf5cebca749597b3250989ee01f8cc86ece733c5fa3f8efdd33";
-  sha512.doc = "baa79285a11a496f1970a19723b0844b869e06d1405b126cd0e6f5e4e61dc8f135a5b4bef650c15d9dec1a5a4eb761e3336ec02d20ca5c5a553d5f402e93a383";
+  sha512.run = "642900ca6b988de624ceb5de581076b1453d79e05d366f1516bdd753194385983da3a5f1dc9c4129dcd07d9f25cf7643f4434ef38049e7530caf7892533d74ea";
+  sha512.doc = "4fe464a60ea67365ec91dc2b3fd29ece0a1876418d3abfd441a51728bc220cbf94e0872e4a477cff70a16baa6f1a963591394f1c83f5fcae81680cbc6e3902b3";
   hasRunfiles = true;
   version = "0.5";
 };
 "beton" = {
   stripPrefix = 0;
-  sha512.run = "e86c09c5c7f0a6227f1632863f11292cbd33e5fb064f9860df522fdc39ccda00f388ab416cd2513edf78983bba68af8b8feaf7ce07ab38487ed06f61967c3247";
-  sha512.doc = "67fdfe609d55d34ac90e7aa1ea4ef7d90e2f6af0393183f59c21c2f7f67de645298c175edcaadcd0ad99b48924041cc2f739b400d69be4f1585690d9e50a9b56";
-  sha512.source = "2d0f3e7b7d9333bd58e79614bcc6a8229b7c7edd9feefb408cd8f647fd566f18bfe06a6506cf9ca68ac25666eb0aebf4f697e1fb2db61fa0e382cef8063b067b";
+  sha512.run = "62c3166cdad4825d4ea3158c77bd9ecc0b8408b76cc6610e01ec90b5ccacebfc8f1d7e963283f962b8ea9036209faa96e11a923b85bd88c2666b430036c4c10d";
+  sha512.doc = "fc795834407b69a59d0333d1879755a573d59ca84087293d69e05f3d52e289d2051cd769d0ddfc2619c56e2b42af94d7ac9dd529fcdf7d70c5fc153c8f0f08b2";
+  sha512.source = "32685a18a2638854f81278f50ca942ca50b4610835ceabd3d8e27b988b617eb0767c1338b50828edd6fad5a81e5ff7efef93d854b1bec05c5732692f98ec6104";
   hasRunfiles = true;
 };
 "beuron" = {
   stripPrefix = 0;
-  sha512.run = "d037cf7cf06512cacddd4290ce9670dd69cdc285d82011c5b30da878865358ffcbfd39888682dce66facc8d1484a9e329d9fb1adf2c562f4a00100929711c3da";
-  sha512.doc = "e11ba50631f02d89141933ab3cd2dd7fcdf5ae26110a0241b240167ba3cba37b1444c391e4c207fd9520504f0e9b38fc90759da5d94a7f9e810d1264b818a1e0";
+  sha512.run = "da308b98387f1594bc8ff68725249499605c97d12eadbc47297e2e142334cd32459042e446ed8bcd13690038407a0b776945e717f51c5e9109ed2fa4a3551f60";
+  sha512.doc = "4e02e575c17c7438c0a0dbf50e9153f6c589d6d264c8e56aba0b6db12f15edccd235ee50d1fce3e25a152b449fe018dd7669f0b6c5f8a491e93cbb2592795b78";
   hasRunfiles = true;
   version = "1.3";
 };
 "bewerbung" = {
   stripPrefix = 0;
-  sha512.run = "801fe37db22f8d4a3d81c6c92ad08cb528bdbf521e3ae403d7450e9702b243acdcd213733342d8bf1500fdcb04ecaad56d5005c563075f93ffbfe4409aa6b244";
-  sha512.doc = "c306e288fd4861739ae3818a47f771f6e4257a5460ca17748e2dd01d96973559f3bc5c84f3021df7f4b518f8206ab4224fe0564ca37ea1e84287369b24219a33";
-  sha512.source = "be3a6288f1b71b8a55c4af9bf1b4f203cd328a88cacd829211a6e4ee7fd5fe62d537593cfbe005d132869ffd7c726d02dd5721f8e01f2c1daf232fadfe556088";
+  sha512.run = "bf2a1fb371aa934ed6be68892383f9bfb199830c23d322f2a95d7b256c42a2d44364cda601dfdb160f6020db9afa8b657940363d0c0eb00f7fe8230af68fce44";
+  sha512.doc = "a60b5b9689c80950a981ffb7d6ff2d99248a93dd0dbca27bc486faec1226ef2e568b1a8320a1b6771e807c52c7059c34aa987007b94312310732bc85501d2c20";
+  sha512.source = "c5acbd6482dc44872f832e3ace98c364b13479df01871785b0dbd14f0fe8b17325cd892973ccf64d86be2e58bfce3babad6d8a24ecd54a8756e0c73e00edc112";
   hasRunfiles = true;
   version = "1.1";
 };
 "bez123" = {
   stripPrefix = 0;
-  sha512.run = "275f221cc649c0461ef109645666812240dcaa17cf2ebe3a47ac7be48d9dfa2191be5972246cacd77ddb1b6c163b8ce3ecdbdb90e189b0b46358ba7a80595b04";
-  sha512.doc = "394c0f272d53d375987c060e38f5f55711031e22bdefaaff469fa7b7f3bf89d84ef5f772a338b35807616005feace76c8b878f54a9995bc58302fc0bf38645a7";
-  sha512.source = "773e14e6f6435bef617e2d335448358474a124660b38961380f36b639ce0de324c00e57e65a72aaf847d3cf19ae16fb7882bf0bc0180dd01a53d992ebae07650";
+  sha512.run = "146d5d569d8551456c92b0e1650c3742e2cfc32c8b27c562e13ac875eee0ffe12244a1c86d6456291170b7362ceeff5e45eb5e3a897fc72c77f80e6c3dda3b87";
+  sha512.doc = "39514aa357341f21ef2e0c9e9792e9a372a7f9719e50d759ee8e3ea1d02113f73ee590f3461776245807af00f62bcefa1d612ffe17e3aa4bb380e80bf065d51c";
+  sha512.source = "4ed3956d6bbe7b07d5c412da0189d33f523b902ed7d025f83fafc2fabf961165cb5c3bd148aa32dcb29cc706b9097b0a8111acf5a6b5136e9b27236aa2dad3bd";
   hasRunfiles = true;
   version = "1.1b";
 };
+"bezierplot" = {
+  stripPrefix = 0;
+  sha512.run = "f3f848f84d3cff9ce10b875f5e358cd0507ffe3812979147ae96bd8a3669f63ee2f1acc033630e1d664d4ca3341e1b6182e405bb003be2ceb99e159723d251db";
+  sha512.doc = "d4df7b22bf05f53e0c9b7415f0408199004bc8877097191e3e2586c7f99668e28ecb48da858892b48d0ba992886e1771aecc2c7f47e0a952e459f62c2c5d26db";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "bezos" = {
   stripPrefix = 0;
-  sha512.run = "abee3d5674aab634f6134c1576c98f1513605e5e2e242000bfd8b2877f38e7572d73125a1fd9f74cfc684bf4b0ea5f1835944733145750db973ea52a01a528f5";
-  sha512.doc = "81c6c074e0ad72a07b8e4fbc88b225ac54aed29c79eab5259cf5a4e5a47b121bbbde32dfeaddbc6ea9a45e7d28288a97692e4e9f7302b3d133ae190add757ca3";
+  sha512.run = "eae63665e762b4087b7efe63113fc65632eeb8999df51dd96a115e1e8afd7d7480165a2549a7949ab27674e8a9ba8af17176bd63871622acbeedfecfb3f2d1e5";
+  sha512.doc = "946eccb8f267970c5f49095618bf2d9edb4139f4104c839a123669fbd82aba6ca166ce2d9b457e0628eb77a02e74dec64d3def027dd551e4ac012017ef81626b";
   hasRunfiles = true;
 };
 "bgreek" = {
   stripPrefix = 0;
-  sha512.run = "868face902561e97b20e54190707b441f33af2d5f9c5ff5cf50d825509f57f8ad146d57a960135a377cd489c9ab41e7dc2738325acfed68a02372e550d64070d";
-  sha512.doc = "d863c4cda35fb856125b03defab81f03e47f543c3f00cb80c7f06275389726863d42ac1a181cb1ebf6d7a26fc4cf5443df68bf44d300344c4c7fcd6adf4741de";
+  sha512.run = "d05691e076bb2311a4c93d81a1d16082c3271956120df1ab47c9b70f22eaf643e0ad0177d4223f9d8731f2704dc9cb126dad8582704107b2fa2a2c900f189671";
+  sha512.doc = "96cdf8e0d80cf85f1460fdc2a07414ec5f26e8e931ffcccda61c138d9a37689e09703fe44f93b66f75cf97945ddfd4d12af442cb88cbf9ee7c1e1394eeae8c13";
   hasRunfiles = true;
   version = "0.3";
 };
 "bgteubner" = {
   stripPrefix = 0;
-  sha512.run = "d586948ef0fa9a2ea0c012c3cf88d0e43db1c29c2ad988a4b1d5a8e21b04c0b8ac038dd4556310baa344fd9f48616b041404dad745c83cced36fb18b319fa59e";
-  sha512.doc = "8a488fe4ce0908719ce8077ee715ef539c4db770984de874179aad5db1104f56fbf8c9a9fe48f25f27714637e2cb26a8fc0a63320eed8eb9b506c6402a75dd95";
-  sha512.source = "ccf45ba16347492f2df18579202f56eb057a7e4cae28ecf36b9770f120fb0c66d78f567ff075c9bb7e9efe2ecd8809c6f9d29609df49e4cafcf01afeef7933f9";
+  sha512.run = "3affac191c0a3454e4436621319289bda7d8efab1db8a12dc2901e02adbb3650036a4ca36c122a84e00de644f2fb3ca1aa9521a262d2801e2e1ec0b95dd64fc2";
+  sha512.doc = "2c0b7e8ed9b150a54802978a8184be7cdc8b8389c735766f36e62e4f1f6ea58244caea773d3187a3a551476c562377d1b65dbb1226280ba8553e07152d72f346";
+  sha512.source = "591c276c3b55c669bf5308c1df0b072919c575fd62b77a0569b3cfc838e6a681377b757ea2ee18184ffda9337a43c71493f12264b5fbad40b9c806169710ec50";
   hasRunfiles = true;
   version = "2.11";
 };
 "bguq" = {
   stripPrefix = 0;
-  sha512.run = "f93e62dd9bda7f2417d00aa74430f8d41293fbebcfe2e6c5c9d0f39db512236e1b445b8fda7ca65317f85cbe79cdf692bf69b8d5fe351a53a3a4592b74814d37";
-  sha512.doc = "39d0ebd4a507a7174beb91dff8f1c985bc33a3d337b0b97a9d8095b347484d48ae27693af210c12e93bacbad566bb91c6cb8590869773f37d90c26c99342f462";
-  sha512.source = "4acf25f98f513a6ac35bb0d93c1d100e1721cb2c9b980da2175c0f986e653db433336ee9f2a11102ee11ccfe30b4c2040778869250830a946dae87bd7f879f5e";
+  sha512.run = "04737d397713765dd8ae4a0142f1263c76f38d9b966ebc7f377ba31b65cdc9b68517d6edd0234605d951e114b9659f3a4fb611a7cd8f9d2595fbc2b309f5616a";
+  sha512.doc = "682af7fc714ed4e2c33f0941a395f1de6bd8eaa5c29ffb0c27db35fcc7cf8773350dc4cb330eef1020790e669707e39a704fd5495e03ff8c6872fe43ba235126";
+  sha512.source = "792f71b5ce4ea8526a8e1b6503b721c26e9cf4320bbb68e19189a1703aa4394d5cb559308110faad6486f796759dc5de065419055d2b5ec7fabc9fd70330f20e";
   hasRunfiles = true;
   version = "0.4";
 };
 "bhcexam" = {
   stripPrefix = 0;
-  sha512.run = "2f782b381a0052694e57f6515620ade636dc393de0188852c16da0b2227905e494d416827603b8c4399ffbf4dc62d0f002844867d0a40cb1613cbbe930064315";
-  sha512.doc = "9df57b5af03bc39afbfd888b51d3a65b840230d2a7afbd79945ecf6cc886ad99caf0f83d3d501b9c9ade70438a8a979ed9cb1303215d7bb9135f32822fdb3d0e";
-  sha512.source = "89f05fa573dd380cda45db45caf0553262e10754d01b4b8e2d45dc7dc17154d72924df2789b276055ca3f3e9b3c0f5423cafda0b209bc725610a7e3cc955a6e3";
+  sha512.run = "e5ceb38b2104a29bf680f85a12e8c80b58d1791a5ef2c1475f0b00aa5967da7337e7003faf18945e16a1c748d2b3fad18b4509d6a33829661f500cc828bd6bc1";
+  sha512.doc = "7c4b19e9eb34eaf5db0ff6480ee098e7d84aeae641f7711ad8f18c07dd37f2ecda51a98639fdd97a478df42419b9613716db0434347e32bc8e64193a3e1b97fe";
+  sha512.source = "5a025592fc83cb9982108f60b194dcacdde023472c012b9667e7536c21d4e653d75cabca4c5e94306267d2d704507608eb30a9c29a1237ad61e23876bef1ae5b";
   hasRunfiles = true;
   version = "0.4";
 };
 "bib-fr" = {
   stripPrefix = 0;
-  sha512.run = "624d4806b5ed577d38d39b9ed805f950a078d942c39cac9196232b9dbbe7dd92db8da0ef1cb7be3934f619be8247fe2e4e41a1f5c7968fd7adc6482eb9e3aafb";
-  sha512.doc = "38b79d3b8fbe6f747510de4d4562dc6b291b8e3ff931c253c2e59f90a03c67492524f7b543afb454e81164b4fa2f66e46332081894f0b95ba28fdd82290afe88";
+  sha512.run = "bcfdb3fd1ad626544ad2434f544dbc3827b3e75bcb87bf32d9ae7ac8c404f6d008f14f2c3b45a928b8db8339f5f47fceebea685f848a13ebd50afda626ba16d6";
+  sha512.doc = "3b3d6d58bdca163ea215e5368291a086b6e02946309e37d0cf106f87712c0ddff57b0de49d4a5704d677016ad43ba00a4fce8962f8bcd2ef9df3f49e329c2c15";
   hasRunfiles = true;
   version = "1.5";
 };
 "bib2gls" = {
-  sha512.run = "62887640d15cf6775de18be28f7c76d936117219a43feddbb960545eb494b25b833dfcad1aa05169e5178ff2bc597fc9c8e78ee587d1a91ee1cd256693ffcafb";
-  sha512.doc = "2eca65ac52296cc8996e9399f5c7ab183f73bf33baf72ce0c2ade9a374e253ba9df62c67f3a0c3535daff55fde22105e1ba50ceb1f1d2d6435afcf7b8a4e5384";
-  sha512.source = "c2c3921631ac008cee46b22a5aab87703caba68e575fa8bbf4bb7d7af4b17b57704d46200fbda7f5ced21622024f616a2cab2068b1ba3aaca34d4ebc00431fa8";
+  sha512.run = "fbb4fca76bfde79e9555746f40776a88dd5ef9e96ef48f0e9a698c772864d42f543c32d27293ad0fd099c6b5f457ceaab70fc7a15bfe2fbc3c9f718638efc778";
+  sha512.doc = "759637d2f3e928c14b52d7d66ee6621e3121ac0f00d1071d77af79f5ea227fc4608d506d1873b0db45ce045d27d2792a72372b97698846b2bd597e37bb1036ca";
+  sha512.source = "570a62390c1ab9c38c26ef0b4dc8cd833386573ccb251625a04fb15f55147a475f072bed2fa1237694d601274dd946e08b8b262476cb2ce78b8361175081e3b0";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.7";
 };
 "bibarts" = {
   stripPrefix = 0;
-  sha512.run = "e18be04f06227b3b81b4c85cf0ade4e0f5246c8414feba8525441eea1ad52d6e7b2a59f938e3906bc903ad2010a613ad8cb34931a195fe2032664947d0f17390";
-  sha512.doc = "9749c282e1f3c5dfe5482492fbcf02c5af94bdbc99dcc4a184c60f4340f1e767acc59a6b870139b187dec0b54ed8d10ad1fba78565571fbb6edf98d2974ed64b";
-  sha512.source = "c3e3d4b912e3e0468478c87b04f1403ae02a262573d40d4e3a117ebc8ed3905b08a558edc7c66b86deaf34edb8a77dcad62f2d3db2726e2d22b780578e9f9d6f";
+  sha512.run = "70221c32f6da531243ac191c504eed7ae6c82cc62499f4d33772084d1f476a4b25cf6d67c2b9fc12a90e13d8d827634be7e175166ef3a2e4bdb9cdad721cfca6";
+  sha512.doc = "0a244b8ab4fec7db83bf2aa280af6cf437ca90f60015cba9d603cf31e805ef70149a054fbef9e04c3fccb52e9fec1c72446024c61b03809ca54c1deeed00ee2c";
+  sha512.source = "318710e37bcf1c1abb9968b06ff563883045ed601f4a93f32d02e5321ae1049d3b082dcb915a403cccf4d80ad9c3cd782e9b8e217c0e0910e876e52b99e18a3a";
   hasRunfiles = true;
   version = "2.1";
 };
 "biber" = {
-  sha512.run = "dec41092568e614d3366ca63dd4edbaf8ac602844bd8c1cfe1f7a294e701947a9da0dffa461b8b4adafd2f31ab7ac7afd8f6519afef2ed2c8d51ce60422e58fc";
-  sha512.doc = "d0d069a387b31f773ec2616a6f934138fef3029a3dad1f7fd3a49ca30d7c3177db3cd9aa5eff4b67e76092fabf1e1ce98afc3a0f4ce7800665fda818329621c6";
-  sha512.source = "a80f6a79d32f90aaf62c06535766209ff4942e950315b2c9bb3890abd2f3e06b28d3042b9e7bbc744ebc57e87c2d401f78628cabedb131d3b6169126b4fdddcd";
-  version = "2.10";
+  sha512.run = "6bb48396cb54c0e86fe7b92007caf3f3699071f82802c60334a2d53e03291eccd724fce4704c5ac0db217773fc197db118abe00608cf63feb443702b50289806";
+  sha512.doc = "fd5fb7b351c2d24c6ba824ccad6e99f17becb0ff29dcc455f1eafabba90a0d777f88bab776b51e74537a26ba8179e3016c96abfc7dddf4cc1c7b62edd5da1eaa";
+  sha512.source = "ca1de55ec99c8dbe0efd4cb16e50d60ffd395857291476fcac925ba63a43b8c94fcf8f1a59fc2a502ced201cc9eae7c3bdea13ac1a779d9b412a7d202bad11a0";
+  version = "2.11";
 };
 "bibexport" = {
-  sha512.run = "c21f901c1a0e5deecfed9a599d7780d79f071fbc18ac1e96805b9593af402d10c11738d70fa912881c0a2004e0cadc3293a013b4ee77009656e5409564915ffb";
-  sha512.doc = "cb719c6b0b54ab90f31cdf2c63ce2761962991f58d3002841794a4472eda73d77d55d22568fbd67c39ebae046cc4e9a5967276f01d3300c9faf252ca54ff847f";
-  sha512.source = "62caa2b1b22e9e13b05b809332a5d4db17827d02af9d831bd73b631f4582ce6d313735197478b96042360675453de7679097f758f19c80bde4d724cc23abfa2e";
+  sha512.run = "641bf749ed8154b2cb35f52f3cb07485a1c323e18aa0c18c8fe1d763db36297760e6eeead2258d58c77fc6c83f41141467ff6e39bd8e25d47e0dcf358c54fbd3";
+  sha512.doc = "bd847753a0a3ee5449f36ed917ecf55733d85e0a1377eac354e2202599e07b51046e34bb8f107b163e8efe0734831a8cf52132dd254c09ce886cb7526ec217ee";
+  sha512.source = "2883f82199f8794e78c9ac1c60abff192b5fe9784ee2587f571d1d776ec71df91239a6617fbf3e9a611b3a0a152d22f304a162f6b2c0dbb616915a0d2b25232e";
   hasRunfiles = true;
   version = "3.02";
 };
 "bibhtml" = {
   stripPrefix = 0;
-  sha512.run = "b8dd4f3ae4f55f657a410af5eb1c356eb3dc913f4237add42102f701de9c7c81700cbae12ae517e91fe71e110ea978ac9ccd4317d712672cf13c39a8cc2ef900";
-  sha512.doc = "f2c09392d8adcf430e6df82403bb97b649b48fc82b360cc77cd5e3b6e6efbfdb4953130fa1d76127a101e8de6a94bb5690f58fc9265a3af4121374ef1a939315";
+  sha512.run = "f472c359e3f2795d66a46cd3b8a404a467c07ae1126285910b07e66e65697c08cde092c60a8d8f6577616cdee408a3a748845fe3d5891c0d64e7c8a345c9c59a";
+  sha512.doc = "66779e3ed6b984ce73d1ad536cacfc935ecdf7ede2847d1b1b4376ef9520ab275c450b6be68b8c014d89be7539c250855b888242af3f08d8964ab64c1eb52733";
   hasRunfiles = true;
   version = "2.0.2";
 };
 "biblatex" = {
   stripPrefix = 0;
-  sha512.run = "8be106a8714ef76c64fd16ed94c9a7d90b6be5d03c28f716cb4bd2c3cd4cc4627cf4a4c4837688388167e010d6805cffadb9129f96c9937d5d4598a48437aae9";
-  sha512.doc = "97dd5cdd185d485ba7ecf692f6640e636a632517321d14de230ea79c0ca2cc55dc77217616ade1c9a8ac658f30bbdf296c2fed16cf538c0c4261547fffb0457e";
+  sha512.run = "1af3e870684f782a0128a4a6a7265de112ebd5f20379572c0f75b6c7deaac241e5bf8f1fed67a189c76c13054367ac703bce8fadafd976ae697852a778dd686b";
+  sha512.doc = "bc054f9b74616ef35be1b09160f66ab3892ed5d44330e9984e3e3862ef2d17cdce2baffb3334202c6bdd05769e6709b0b34cab4a67c1a5e5833da05dc12e76d0";
   hasRunfiles = true;
-  version = "3.10";
+  version = "3.11";
 };
 "biblatex-abnt" = {
   stripPrefix = 0;
-  sha512.run = "e7d277332f72a251c13ceb0653aad538b94b8439f72ffacb0200abd25678107b57f72c04830bdea937e7452f2670016baf5ce8e7ee366e71837024fd184690c7";
-  sha512.doc = "66cffeeea5b98bb8009a9def801028913a39e17ff7129eea988a3e734bfdcf3b97d71aa243e0c8bda2fd329aca8ebb6bd07f3b98c85b40e18c6922da4ee1dfd5";
+  sha512.run = "35051ba78a36ff912a195e5bc5baf26854a2c22827b714f227e936c16660bf9d8c3f9b8cc8995d0ade819041fad5e5df08b6b2429fc5815ad20bda1d714c2cb9";
+  sha512.doc = "908798489934897254ee92ba82c581ecfde2f6ecfbf542e3042fd3e5951bec070072bb01e075f3c2db67519adbcecd2858c48fb28d7ecdb7d415357a61e4fe7a";
   hasRunfiles = true;
-  version = "3.2";
+  version = "3.3";
 };
 "biblatex-anonymous" = {
   stripPrefix = 0;
-  sha512.run = "f208a8946ebf7730f81a529a506a69f538ff1a3b6b15bb052a4d9247a0a964252e702dd628889668a7207622dd1ad378feacfd1fded615105c2ff43237b9a7db";
-  sha512.doc = "e8b84f732032a6dac58750bbd61c10fd10604117d5a08a43eb588ff836352dd08ea6bb65249e56ed6af74a2e40cb299e76cad0bd7be61565c419c7b2f3073fdc";
+  sha512.run = "93311d20ab81c9fc864f564f5140747c7f67cf0039ffe35fa72404ba282fa3a0cdcefd0d6893c51caf8390cb64e568ac885c0ef242cb381bde988f8625046598";
+  sha512.doc = "8acec35e995e9fa4a06b97fe2467584e8664a670a1b43be89175677fd0f11f080b904b9808966c22c4834bfc2d9ee5cc5e60c7f901816580bec61b6da0f5217a";
   hasRunfiles = true;
   version = "2.6.1";
 };
 "biblatex-apa" = {
   stripPrefix = 0;
-  sha512.run = "9f15ca8aeceafd85ffb10661b5e74c382ee48e314fc9555cedde837740ac01ed786560feb0200e55ce22ac6c757a3db44817f9c7eaeb292c6580a1dc4c31bdc3";
-  sha512.doc = "e090bf1535774aa99b73ba19b455180a79cee9845908b217c4708482c0a7759a04e8fafdf793bc8a48a01f8573471a9295d9b6b8faece1663868577e80a1288a";
+  sha512.run = "d17be6a26d25fbbcc39dd73dfa7cc6df82d716081de1fa923315b0de5e5c16f42ff1a1f25af29b0ad2f4e290321d39e24de6cfcb2a49c7db212b2f56443f3ece";
+  sha512.doc = "2c4fd0032d46a816cf8f12c65406d39bfeb67e83d6753b7620e83ee247ef732814428864b7991c4fe126c5aa0bfd2d33baf4927ef3e3c18bc648f8849c016adc";
   hasRunfiles = true;
-  version = "7.5";
+  version = "7.7";
 };
 "biblatex-archaeology" = {
   stripPrefix = 0;
-  sha512.run = "6b5b2b89ff77faa8c38e7055430b69c44b876db20065240ba493e0e2f04b6e50b4fa5febcf7ed1089f5ba2ab4440747b9b84f4051b53842a34aab5bd935c4f18";
-  sha512.doc = "ef1716e15f6d470078c338ff7d8f9d8c21285dad965fdf00ed7d71a7dd1049fe7b6a7bb70e972e608fede3743e2bb5a303151df602d53989e2253ad7fd292706";
-  sha512.source = "41ae8d0dac9632e41a7c0c6ba1b54b3579aa336cfabdf43965118f30d43b400defa45090b70a48c4a00d1524e60bd15d39c9c606af41e45e2bdd99d1955861c1";
+  sha512.run = "637346739b556e74bffa324c255e9cf080b3da699bb751937b3554096e9fefd74f4ebd1884f355ad1e62a3097d30b5092da0abc18e84810e32e004590e1154ce";
+  sha512.doc = "190156cea3d4149a5860882791115931c527c879a27833308c9cfaa11aa3ef91cb6f6dea4c2b6d434a1590052c722470ce3f66987e47cccf9f5a59afd1c6ab88";
+  sha512.source = "b40e5d9431fd2f12393cd3532dfbf2c75b5916644431efb54d0e9821a72ecff3742545a855151af8bb9c96f9eba4ba99e4885abf3ccf8d28065498c398e41da8";
   hasRunfiles = true;
-  version = "1.3";
+  version = "2.0";
 };
 "biblatex-arthistory-bonn" = {
   stripPrefix = 0;
-  sha512.run = "4d3da53cdb8e934cf9ded32f847cfc335c8948e611389a8f34e59c8d9aeb00bf06996d472de1ee797f8294ced6f6c2885e6823cb21cf5c52603618c679bb752c";
-  sha512.doc = "34113f8f52d7a6cbfb61d2658acac6683ef9dba87cd60eddf9b4e2f41641e98ea24e38d4e42bd2b8639fa640c06faa54af51f3e048ec06404c203c1b4a623d2d";
+  sha512.run = "d7dd59e1e913062d8b099bf3986b201cc655d7c7bcea61d2e97567adfdc5fc308b22d97c3209134937e7ceb4f481b1da2a3b02d0d501e65a13a186e413a55f53";
+  sha512.doc = "cc4cf4266d1f02b4e4476890c855f9e64588bc73cd6a7771f93c4f61f1e9c6ed0e259775f25d2d3f29cce5141665a637fcd746d59a0bb05ca8fc0738febbb946";
   hasRunfiles = true;
   version = "1.2";
 };
 "biblatex-bookinarticle" = {
   stripPrefix = 0;
-  sha512.run = "aa630096ada1a352f61d629735805b0b7a6c178c593c6f1676cd485d7abe11f2d3d895e07c31e3b58ea01f612b007b5564b03cbaeab4a6ad7182b93141980a45";
-  sha512.doc = "d8e75446125007fd473ae38e65dd1bb0ab86869dd5d1f854680f22b9e3da531ec3c82c3b1f1dedce029c8bc3c6dfd0a08fe2cc3b094f98051fff15f2c7674126";
+  sha512.run = "8a0a0e85eb2d696157fdbf62122b7cd2fa690e5acae89314a4f1df719cbabf60c29f3529c5869235cf9058b10b4d41adb837b45fded4c645d5b63b4b856a4214";
+  sha512.doc = "27de60adf24a14ff2b2a31ea93ac0db8c549fc2e772a18cca4877a206c5438bf507e29bae2077dd37a6a02dcba7a57653d6d4906d894c6d795f656b174739296";
   hasRunfiles = true;
   version = "1.3.1a";
 };
 "biblatex-bookinother" = {
   stripPrefix = 0;
-  sha512.run = "222e0af2ac6a493ccba90884b5d1b3019da7c004e00fad3390d0e34344137925f67d484b0dd98e343976483003a78776ef045e33442b8f6573c3ab4033bc6265";
-  sha512.doc = "07346cd969b3455e92ce9fc85d7251c650db6ea60193a8b24efd0758cf6662cc8e0c345e6cf68b08c23a11ebe4475e5baf3fba98e85fd4c5edd066f5fc26702c";
+  sha512.run = "db385de0ba96f64fec635a57ee42e7259581f1968c50c08c4d92d1664f5b9e62d0b09d4c4879158d9a4544168a7494134ec7165a16713f61df46436b053bae2b";
+  sha512.doc = "63244266ba1a875770bab278f56a45dc54898e7a39c577a58e19a0c3d8daf26162d3a956b9c0f14bf190efea34605c64d0eebbb6cfaef6bcf05295d752856742";
   hasRunfiles = true;
   version = "2.3.1";
 };
 "biblatex-bwl" = {
   stripPrefix = 0;
-  sha512.run = "2e11ee32bb8694e05bf82ab9a7c061ac638f8922472e3c3790295865fac5a34c0d270416012931cc24afb20b713e195ba07fe89575acf3d9d44ebdc044eabcf2";
-  sha512.doc = "e6d8951916ada2c0223161c93b88b64bfcfcd72c8deb83ccc77c774105e11868017622f86758319fbf6d3d229141ad43f034d05938671de9d4b61efcec183bd8";
+  sha512.run = "f2d022569320fa5de519ab2801058fca0f33d186269c5aaaa5691e0ffd4c5f1bf9c1fb9bc434b9dc0145a227402cce2ec9a15505431dd6b8c679e8c277d7f459";
+  sha512.doc = "5ed1483562ec1e1f0045a8792e804ad8e90baec693d4b0e869befa0d8d42e833cdbdaea0c456628adfd1115e2c6c7b1f8775ce2e36e4e97a96d007d02e01c20b";
   hasRunfiles = true;
   version = "0.02";
 };
 "biblatex-caspervector" = {
   stripPrefix = 0;
-  sha512.run = "92ae5e8766aa1ae98865cbdbb2482c385587eea38e7bc4a2f3f97f904b6116b54a3a43b06a383437c28f354ca47c19b5fd72a8274496949f27fa669291f1b42b";
-  sha512.doc = "e9dc5298804ac3348ec9f1efdb90344cec1577bd3dc1114e60358863f786f797bf88fb63823871eaeb621dd7f51b5e5c16589fdbbe2023845b6ecf1644b9b625";
+  sha512.run = "4c8c8ee1f22204d0df7663a1f2383937e37a3290456d9f8b7f4c7bcd982ca0d18fadad63fab762c47b05b206ca36ed78788ea1b1b031ee71aef271c1dc1bc708";
+  sha512.doc = "13e12c54dc1ed30a789719753b60bee82957eade3b7cff5f017d0ed8fe1681d5add13ea14c9a687cec79c5491e15463acdc27e008d38295486387799b2958a76";
   hasRunfiles = true;
-  version = "0.2.7";
+  version = "0.3.3";
 };
 "biblatex-cheatsheet" = {
   stripPrefix = 0;
-  sha512.run = "a91177e27992dc32d727b5b2575b230c125dcc63b10cea7657cc18a4335769480dab79e1a8d710a0c7a6cee57cad7dd4cd6d23745f0316e6c36e8222cecc56d3";
-  sha512.doc = "6015bba3642252ca3d99e4573ca6628b9d9cde64f8c5a71d7ae802bc09a6c8e7652aaf5123589e0555bf79db6e1e41d427b15779a04ca94156f96b377169e53f";
+  sha512.run = "61466243d934c1b73f0cd8d41092246349848e907ef82cb24bd2470bb7a8c913e406b03dd3a8d1cd1f7f567231b986de2ac503fe8c43d1e830ca4326484c65bd";
+  sha512.doc = "eebf8d31fefb377cd7225c949459282120955a69402e5eb8fcd1571426232e875faae796211c4932f444646ec270ea9d6b8489eebc5856c372818137f88bcb85";
 };
 "biblatex-chem" = {
   stripPrefix = 0;
-  sha512.run = "0e58c9f89c4197ea50020d01ccf3fda3c20179d60f024387dd568f7597cae07661763911b38a3ed92b98ae3b04b71ee00a4b657f3660e63349f4e059b8d1b5a5";
-  sha512.doc = "6c988e4a897136c933e386f0fc00735d6fd6167acdc91d66094b68a4ce337f275652adf0606ab7b442bbae1d39e78ff739b09602e26f7692af2d61195836e0f4";
+  sha512.run = "b0ab9baa7a1afd59e9780c726bb10ac39ba11108371add26c0c27c64d73b1d2444538e3c52b7dd894ced60fd8be6a8ad28049f9902ac6bdc820dea743407fc71";
+  sha512.doc = "fa5bedd5a2330425635b24be16dc20833d5e2b6d7713dfbd8a764c57feb2043ab584a6c0ede39442e58335ea121ba4a53c5a4f91facd4128fc9194db3f8a56b4";
   hasRunfiles = true;
   version = "1.1u";
 };
 "biblatex-chicago" = {
   stripPrefix = 0;
-  sha512.run = "2a2ebfa7f97a6ebc0c55787658f9a23c52e59e92594562feab58cdee5c6deae23740f8a03ebf3dfe28b532130732dc7bcb4526b8cf85881684fb5255a0378f88";
-  sha512.doc = "b1b219135983ab99261ee39049a00266fcb091384defb844440b6709631e800024c39dbb887e47dcddf86e31eafca1df80dae9f6afd849a601510d6090aa34a4";
+  sha512.run = "d945cd648ae04cf02518e86c04e2ef8022bbbb8faed1314f166fa7331be2c3eb5b4e60b3d284e7635c50630d297ddc339c3e34ee3a6b42b87f46796c67abbd58";
+  sha512.doc = "9994435135e5ce936b96c951a22a1051ca187ef2bf6f4f202408a69cd91369614efe9da79431525789d1fe439e426e0d710b3e49969b6074a697b50e0f7c66d1";
   hasRunfiles = true;
   version = "1.0rc5";
 };
 "biblatex-claves" = {
   stripPrefix = 0;
-  sha512.run = "99ac650b2b1806b6266755d1d5f498a511d5d10210ece99f505bf2b99a31c29afe76a68b66ce1cfcfa353f2298704f871a6f9c3b4c3616860547d6fab39da6e9";
-  sha512.doc = "e767499f1632ab80d435e6d2b145ecc952463771272b7dfdc543292976986b5a540002b008e91f21fd552fd4a6be2af4ab0bf6b02563f428cf85a04d17b8327e";
+  sha512.run = "ac285d57ea40756278dec10115b7bd010931869c5e4bf609e062f1afaba391a1dbc0cd7e596e319a09b035e36469037259722c7510af726846cc2567a88d70ca";
+  sha512.doc = "08c0100250f1af5934f4a17ef0a92205c75492acb8dc29164359db764ba7588607745d893ff47b926a7be4599b67f337be6189d68c626a69290dab3d046560ca";
   hasRunfiles = true;
-  version = "1.2.0";
+  version = "1.2.1";
 };
 "biblatex-dw" = {
   stripPrefix = 0;
-  sha512.run = "055af20eccd1cbec33bfed47087f0c64be9dd06c984f0c3de55748626d19598db0d6dce282c6cf361220da5ec73bea5b4427101089de218442acd9699a27e75a";
-  sha512.doc = "13a8bce5739e1db8b99172c313ef7942531623b40e11c9abec4bedbe081f2f5d8ba2669f113e2ea6cb315c245de062dce5bb4fce3d6aa3fd51194fcee1237925";
+  sha512.run = "4b9b61fc545108a3e2a9d37ed7960074befb10147ea400413d1de47cd86e4860157c0c826c3d8855d7fc8d5c482184321487583404057654a1fed16b5340312c";
+  sha512.doc = "e7ab58892c2bb83e00929487130001427c4f70ebcbdef2bfd54c0bc444442ce6298fec06a799fecf7e4f7a639caac9b23cfd71b5b9ffdae93ea3f088dbe4a7fe";
   hasRunfiles = true;
   version = "1.7";
 };
 "biblatex-enc" = {
   stripPrefix = 0;
-  sha512.run = "66cfa162f45979e3d08536f68e394d68f6205b25f4ba3880f7023f3ab083eb674cf923538938f6ca295dae28d45c19f4ea05ab69fdfbeaef9d715e2317806904";
-  sha512.doc = "84827aef656fa348f013fe63adbcc429b55ed44df51317658024b32de7ebf7d03f896cb3ea7271cb5abb862e601d3ef762ff7d64afccf0894361c9dd783844c8";
+  sha512.run = "f3ab0311e71baf76e1f87bd39eb1bbf8a3e2df6d658c2dd6d3515f847b7bdeff898cf9cb799961c285cf103411a4d4f5531351ed98f7e7018ffd6c1cbaa0ad50";
+  sha512.doc = "d9f9ac3778042800ec783f4ebcedf0a8b4c6eefdede609175d453e8862d4d96ad4be83fab4496d54db3c7cc6c249b21943b8ce89694b1280bbfdd9994a530419";
   hasRunfiles = true;
   version = "1.0";
 };
+"biblatex-ext" = {
+  stripPrefix = 0;
+  sha512.run = "7a9e62adcfdaad7aae4afdeccd3dc962ca90be0583d6cc69dcd7761b44235edc1dd2c6ba2f902701738bb3f86420669cb3476f61aee0aee0c494d7c351807948";
+  sha512.doc = "b32e231dc73c326310dd49b2191c93b14374feddcdad5d2932919f68c7ac49d68c7a3ebf5af43297af37a4aed79eb6b43a2204d6990d8ca631bfd22026999dab";
+  hasRunfiles = true;
+  version = "0.4";
+};
 "biblatex-fiwi" = {
   stripPrefix = 0;
-  sha512.run = "357e0d6143c34803f3c1e37a0958feb7d43717e341cb62d64220b11ce4e67333cb7a3c95b3a182897b2c5206be0a55863de353441f8bb7bfa6a0e254b8376abb";
-  sha512.doc = "3a0019aa9fb60091ad12d902fa8ab8598396f3fad8a0139727bbf3ac1df53aff8b6db89628b8df7c4b8970992a6a0e93784cc5359b86e76b66c163cd47e9d2f5";
+  sha512.run = "746a5fcb296601adf0c5b1e218fce17c4b25ac9bd9e96adc792f31d8540450bc5cf529dcbdb3fbef7187c28f37686b5408d186dc03ac3d190e95a2fabdeae57b";
+  sha512.doc = "5609d95a5764ed9222c21e10cc4ee54dae6c6e69bef901aa96847a9da6cfe43f86a9c39dce5f7769980249da45b6fba96e20ad39670bf19cc317438529b6fa72";
   hasRunfiles = true;
   version = "1.7";
 };
 "biblatex-gb7714-2015" = {
   stripPrefix = 0;
-  sha512.run = "d9621efce6d55e939545e498d0c4588726c31145432d6b444b8ad9aaec96b3a3132364495c46587f2246461523b3da35ebea1c838a1940a65a7d38c7b78a159c";
-  sha512.doc = "ac4cc6d0a2d5166f88d112d8315301c2fe46deea9d397856f21fd99683cf8658b5f31b295dab0a7453df3023e873ac3755fde4653f969ac6942d6dc9806c6235";
-  sha512.source = "c8bb7082c04c5f889d131616a9cfbe5e85650067c6f85fcb348f90ec9eddb0197d57ba8a51f6aa141fea40dee66eacf5f24f8faa4a5b9b4ff2fcceb7d68e7b34";
+  sha512.run = "82327a95cbc8208a4f64302180dfbfa23af97dc2dea55c3a0d432a5bb778130f4f4d394bdf98148151fa3f000c42c077e1b44b78384ef76dc306d3e1d0d130f1";
+  sha512.doc = "fc0ef294eddf11cae7aee706167be191b401cf6d7349e9342695fb14c48712191f250ee1561362651e8a826a090f9cb8e0ae53500778f6c4a1f712d69fb0a19c";
+  sha512.source = "b089c6ba3cf63a965c9c2d0208658ff65d9498bc2bcd30fc4b892b47ef2b6bc96b3f4bbcaa42456e8dec05305964e3b0e64394af141ae950fd9820018c7fd1bc";
   hasRunfiles = true;
-  version = "1.0i";
+  version = "1.0m";
 };
 "biblatex-gost" = {
   stripPrefix = 0;
-  sha512.run = "6e5ff52521f857c0d5786b83433ca8747142661428cb4d1d0bb61dd0864fd7efce1336d4bcb3e3b924c9aee9c542facbdf18640d9391070d8472753689231cf9";
-  sha512.doc = "7c0b4b6f64988f5a3bd3ea2140b04db016cbe0ffdcfa2bc58f16766100651268004cf0d8de2d832c36fdcd15c3fdcacbcf46997d4823192a52330445f10db012";
+  sha512.run = "b6ec235b233a6584d5ec31d422b3523cff165a25af46bb27b5188fca73d828209016f424ddf1ee6709d4314f413c09a6935e68c72139a9a3ed12e2cb361386e2";
+  sha512.doc = "f0c5c01aedb0feb6371582192fd6f54eb7de81989e58cb31217c5dd8dc932b355b8b8f4976ca358f989e675506fb342c6e0823362dcfac18ecfa8047154325db";
   hasRunfiles = true;
   version = "1.17";
 };
 "biblatex-historian" = {
   stripPrefix = 0;
-  sha512.run = "eea07bc4b7c824b3045caa53289456c83b75a71692414ea88f0317f4f0efc0ad9f2c5476f97a756918c0feddded2b5608a97a32d110fddc9d7ebb5fc9d077180";
-  sha512.doc = "fcc7ce17fd12711680a4583fb040c23c78da1293a56ba4167bb513c44776e26624d5c86828dcb343d0ae71dbf203c15ba9464e1b12cff0a7c8639156c9625e1b";
+  sha512.run = "9ec184e58b387cb0c7dca1f8d7572adc87a6bb84cd39750843fd99cda4e72b40eec06b3910ec83ff5fe40c924777de989451be4524b86984e805c3aba826beae";
+  sha512.doc = "bc94e2154d1ee7315ea50e3a0637c42f21dd5654d9984344c808030328b25ae7fb0ec41825a2d7b50b50948645e018fe39aee6b740b3fd8ac194f8b3283d8e98";
   hasRunfiles = true;
   version = "0.4";
 };
 "biblatex-ieee" = {
   stripPrefix = 0;
-  sha512.run = "8d10dae095531472c83e5da44de0992220c48134e93f6a73d7d27ba13b4499e9f42f53b842292b8cad576def2d5271fbf655fb65cdc4d48375f62fac0e0dae10";
-  sha512.doc = "b5b3f6c734719f6ba77f32d2731bff93e2714ce93044e1b40f7b7508d5f745bd828949aa9c0fe323acd3e094ef37eaa78267ec5dffabacb57e75fcf0418cc803";
+  sha512.run = "5712b4ca9dde2cb5c8353840db1d8bc860d611da8a7d8c72d1961081fb165fbd39363db8369f1b8d53c02e4a05770812b50598d4f78ee95a1ba6e15abafe4420";
+  sha512.doc = "d4ba471f45649bc7c9b10b8d478d7438f76edc97fc5396281eec9a4f7ec196baaea4f423a57a05d75bca16ff153fe9d82a53db9a1be84a804671f934b78ee8d9";
   hasRunfiles = true;
-  version = "1.2d";
+  version = "1.3";
 };
 "biblatex-ijsra" = {
   stripPrefix = 0;
-  sha512.run = "760031e9403dfe5d31a99419f8b97e203f723f323b6a6ab305e7967ec42f61c5cc6098ecaf0ea572fa1feaeb871009010da8062d83ca9e67686e15895bc6eb19";
-  sha512.doc = "6fc2ca2d38ce3ce4ab85b6783f9cc09a41166a7208db3a3e172062adcadce8140e9019a0f411d3304fe97b6966a5854fc00c05e72c90b0c5e3fb34d5eb265ed7";
+  sha512.run = "aee1d70cbbd41bdd3aeb23906331d5f49efa342445c7283d7aaab28c102a37ef0b65a78f7f608ad92726a427a53a4b1a81c843cd0901be7f2edc53b8e8642426";
+  sha512.doc = "7a43890d2a2ab1e4a53aceee13de6feade768d345b4c48db9337e3982cdf7ba9f1091d9f7495255ac351cb4f3e5968d2a52a8a9794baefccc791e8db38ee1bc3";
   hasRunfiles = true;
   version = "0.1";
 };
 "biblatex-iso690" = {
   stripPrefix = 0;
-  sha512.run = "8c5d1a9e80bd120e390ab1b832b2caf9865f1dc8b8de18dfb8c7467a322d4b010a4845c1d4995848aa925cf72f4c37147df5fbbd1b909c30e0ae0338bd4e53d8";
-  sha512.doc = "fc21dc6242cda9b1288ff877d35fa294d32b4640a72a6d3cabd981171d2baa4fd795634721243106a7df133e692117d080adb4bc9953e32bebf22bab6c17e18e";
+  sha512.run = "85bdaf6d40dc82b8d2c0cef2b590b8598a25fb782b6775a02515303dff18a06cf7c7fee1c423a385989aa7aa39850313714a028f7900cbd04722a12d5b560f99";
+  sha512.doc = "4cca71e549308b8742394c34b9b59b11a57c42f6d673fee880ca8cc0f3b5c7f4bed3cbe2452d4bf2ad7d1c0e83764c2de63e697511cfdca2717b3f955d27c4e9";
   hasRunfiles = true;
   version = "0.3.2";
 };
 "biblatex-juradiss" = {
   stripPrefix = 0;
-  sha512.run = "5d87916c1ee14705b2c3f4ed077cf7040fd703acffe7e7f279a4819fdaae9bb083548f8b8a9606e9b26ea20803cfdab11dfbe9246d5652e90a32ca09e6a8aad6";
-  sha512.doc = "cea6a5a97e081a17fd35e6e6b062643bd00098196db0acbf9a080f604a487753b14fc88302b6d4501145c91de0ca2a3570b02c5b37c68da05ab5b0e786f8695c";
+  sha512.run = "5ea106dd843279837928b1c36d8ea2814095e124cfe9381b0ea9265cc6c1c6977cfe2c23ab8c973119e2bb16d749fe2903ea0961484a61b5973ece7f30438dfb";
+  sha512.doc = "e15d0c776df860a1de42f9d9794f1fac6fb30df7b5c203d980c292717279cd05d1a375d0bdfafd4f72aed364f380003d2607e5fd7c3c1f7c713375b9b106bdce";
   hasRunfiles = true;
   version = "0.1g";
 };
 "biblatex-lni" = {
   stripPrefix = 0;
-  sha512.run = "60fde02aef36ff567bfeae40b105720d28c5c4e6b4770586f6a3de72d271ee4d1f24c60442abc7f7120984b9d0df5e6fffa6ef442074beb13819c9cb62d3f250";
-  sha512.doc = "985b1f6c375674b09b4b0e4235e894df8ccb28807b180aba9d4c47054d5651cfbf601b4c1ab00ab8421e680796ff3c1f2a1904da23c86268efb87196ada0b039";
+  sha512.run = "fbfee7b807fd11776a83e751b48387fdf05a355dd864c6f2753e2acbfc945f0f9ba9dcacf70a1259107441cf2167b1d675dd89c55172aa4c3d081a47c7494a2f";
+  sha512.doc = "4e94435cd3ec5066926f5670230ade1a506f31d228056a755f6df36fc210ed764792e3d1098591d623272e9715fafb0dbc4a59d2906ed199f2053441154c65b5";
   hasRunfiles = true;
   version = "0.4";
 };
 "biblatex-luh-ipw" = {
   stripPrefix = 0;
-  sha512.run = "75d9030170cc22f1ac5b04e8417f02cada9af5190b8f47295b4f68163ec55ed2a9ed01d37c94cba5add771afd393f8347c6d956906aa095578c276acad4d4eee";
-  sha512.doc = "0235d70803050ba07056a06b8bab21e140cb90d7737b8be1ef8790091d9748decf702b9ee3a50a12e519aa86d236e44290ce281e204b080cbf7dfaf0d5c94ec5";
+  sha512.run = "2a2cc43edecf55755e904d0b215464af4b3cf36f485b37973290ba649e51fb33a63cc891840bbca7d3869984aa21b39f9340a0441548b748d6e576f761f8f126";
+  sha512.doc = "b6189701e411bbcfc7ed81ebd96ef675b2e56e5aab7975c553411f838222ce4239b2f04bbb3ded53f44eb5557cf76c72b3824f82ed69180eaed839d5463d34a7";
   hasRunfiles = true;
   version = "0.3";
 };
 "biblatex-manuscripts-philology" = {
   stripPrefix = 0;
-  sha512.run = "c6d9a099438f3d1e09cf3ffc3221b69beec521d2425c89f9527b6722e33b9591c673f2f0640b67a895300cda7cf3af168a22648b3d822539e4d2ffb7bb2b70c7";
-  sha512.doc = "3f842de28596b589061037cab6b5d44471ceb06d575563a38152250c06570d5dd19528e8829a423525c98f0c9c117eabe4cb823c5a0cc134dccc4b285e6771c1";
+  sha512.run = "3521d0e3bb29c7cba54869837a2b55c9242ec03ed2bca9d6bf7e0a3a85444175e74cc960b995cf23c3660380cb75625e5ff50299d9f9062650473f25156a5625";
+  sha512.doc = "facb1e4314428852694a716aeb74a59c5ae2cf106af042a9d2615bf62cbdd16b125a8d6b2afd6e19c6e93b819939c890704f697f11bd7e77015b7972030292d3";
   hasRunfiles = true;
   version = "1.12.3";
 };
 "biblatex-mla" = {
   stripPrefix = 0;
-  sha512.run = "4b7b58f6d9de5998c79f4bee82e93ce5dec078cc044699f5e8eef34058f98ebfd10fc1fc8e0457430e5edd2c0abb46ea1436fe16c5e309e750e4fbbc33bab69e";
-  sha512.doc = "db496f73b2cd7f504fc14cf4255106dcec5ab576f5d0d0a176d8cb8d69ca118b8668693501d81d18b60a552ac8d4cd5fc8b06fcfcc96ff81ecf4f3141500a628";
+  sha512.run = "0e72bba7cf292730eef401cbb8efb77444337d53b18593b8de05d8cdc1fb5495ade07956c2ecd8bb9867d92ba6a183b4cae089de1fd54f33fa746ff894baa77c";
+  sha512.doc = "02b794bd50d1cb82734f09d23dde506d6638879f2807d3cdaa668e5fa0fd03e3a6e6e3987c17ad52ca94910deb28f56345a665eee5c96bdeed1869d6f101f37c";
   hasRunfiles = true;
   version = "1.9";
 };
 "biblatex-morenames" = {
   stripPrefix = 0;
-  sha512.run = "60d0ff19a68c6d006f0f46f0e58b77a284357970be5bc5388e6ad064585aafbee844ad0f9031584ec59abf31344d17dee54d96eb192d667e8ec06998272e0b5f";
-  sha512.doc = "1618276a839e8282d7364e1cd05399d5b68f6a7b2811d2a5ecc22370b3c0a8d3fd7ac2ca06ceb76feda530529e33f78a587e400d5f9ab2d20738935b4d6b8793";
+  sha512.run = "61ff89fc161ca7fb740b8b7438051f4fba73f72474f49b1e6e6363800ca1fc8fc2c770c22f1d9b1e987d2adc53a0097fb309759b2de3f1f2afb62ebe10bc87d8";
+  sha512.doc = "d44922b121ad52624ff9b481c25203bbc8284ae343d5d798afae8e046e2146b451c49209b2883a7419cf878b88fa55f0462ccf84697e1c8e70f2d4213c873c51";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "biblatex-multiple-dm" = {
   stripPrefix = 0;
-  sha512.run = "528ed241a5e990ab522953b02b7c24818b910f364cb6b6404a9ceb476e88832f6c8be2a6af56a54229412d1129f922bcdc236f66de360ea8920a07fb415345bc";
-  sha512.doc = "39678a0ae8ec4491d727fe1f7d035157b1f882594415b11887a227150924c848c37bac797525df58d1fe7affae302d047215fcc52f6fa59c6394732843610c23";
+  sha512.run = "7161aed86b84e56c5d89bdc9582cc85e5b461014b1136f03981c108cdea87e4b2e015708e807b4ae359d97ae34c9ebe0f53126224bdac635f3c2c6242128a008";
+  sha512.doc = "7e7ee8bd261cea78930b575a0dc0c2f748d49e3c6ead985fdb306ab374bf40dc5f9ee7fde884844211ffe4b216b8598528b99e4fbcfbf51bc190e6204c0bac2f";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "biblatex-musuos" = {
   stripPrefix = 0;
-  sha512.run = "9a6f16bb7fa9aff14f201415341c21f1a3954f9c94fe879f8109f9969fc6ccaf711a0fb3f7cab455d0da4480f1b61e00b3e651649fb16f5e8e147a61dd97310a";
-  sha512.doc = "f7861b7f06a3d17751c71bae0d27d3565fba1232d40d81eb7b47ccd4c042d581775a4a264ebd46d4ef65b9fe584645d4268c30056a02063f7e5a7738ef1c20be";
+  sha512.run = "4ff1fcb7b8dbccc3f5efb81d689bdc248f23b5426b605398df2e43b2d48d3d7f690c1056ebd1dc509f627e9594a1fba82058bf17af972c79db0fcd6092994d25";
+  sha512.doc = "694da5a6ab21ee44b757a6c4e7fbdf9db29d808e5a3c16c926682dedc0724f3d2463acf5e257375046a8da294abe3b8da03c3b838477d49cdc3c8115c83f6203";
   hasRunfiles = true;
   version = "1.0";
 };
 "biblatex-nature" = {
   stripPrefix = 0;
-  sha512.run = "2117dcee4baaf6af9c55f4954e0bb86c4357960fccf7d4b936a6978a470b3624c752671ec274c926dfd92753b48ef0ef88df704abb99e0b731a551a2f22213a7";
-  sha512.doc = "2dae29846e29df126fd375d98dfdf3b93be6fa22c017a4b49925db79ae68f944cd0e858049d97b24cf0ae4fbc27dc3c53c2ab6ba3da6786a5e05d38694afff69";
+  sha512.run = "e6d421ef06888085df6d6821659d20e233e1c6f59c66b9a26c70aea7601c7bba792ca0a4d908b99ed29cc454e057c6db5b7cf069d5f83a8e936f4db6d2201f18";
+  sha512.doc = "ba3fef22e7c0d4154fe9a8147c7031072a25db0a534304c686179089af774bdb73ba14a7ae3ee0f7cd96ca164cc9425f2e53694f79119bf5de4fd7274f0aafc0";
   hasRunfiles = true;
   version = "1.3b";
 };
 "biblatex-nejm" = {
   stripPrefix = 0;
-  sha512.run = "0b3208efa74cbc9394890216438ed079526e228af0a4f7183c4ee661c0ed34a176c7e9467109cfbaf173badec00bde500229d56f127c55576b51ed99fa53c938";
-  sha512.doc = "5663734a8d27669d23a308c5b08b48f70772ebc8a57174f4ab23c78db1da0b3a5ca4c63501ca54f548e4d46fbb728d82ec2ac1fc2b8bb7d9dda110f8606e6a3c";
+  sha512.run = "ed70edeec9f47e066c4153ae6c997a13217aaffa83ea60757b7f43caae652e4249513e1652e87a2c42ad8f3d65bc51bb2dec3bd90289dcf3a9595fbc092a0148";
+  sha512.doc = "b1f677c608b21b0e05267e9cb8eca43902a13b81613bfe18fa1a06947ba10ef90cd055baf247cbfd6b383b09a22ab657883ac136fa67eff065c155c7b2f19fa5";
   hasRunfiles = true;
   version = "0.4";
 };
 "biblatex-nottsclassic" = {
   stripPrefix = 0;
-  sha512.run = "787bb3814ca4de2fda39416c84b776b782c06399a697b9c451412f63085bcd8b3a5673d50eed8243f0bf297044dab46b72e8a15e6fc48ce2fd0f391ac0c828d7";
-  sha512.doc = "ae3f4f8ff7123fb589ec4c8b9aab85870a4306f7bb97c9b6ef7dd0ed2443dffb463110f2ab0b0322d28ef7a41058b6fb109cc47b4f5ac2b78b026b50d7f197a2";
+  sha512.run = "dac4e1b7650d097b9e2acfbf25fe64c834f955e72d2ac0be23b37f195af17c74d0fe4da54327b980b2e767ca974d4cb718dda03fb2613234c79d6726674c4d31";
+  sha512.doc = "48adf754b1364e2e44cf2e15a84aef70673c2b31b928a37ab71fbe2ff14a6f626b63f106774a896b55ad7249f4c242f674fa138ad77535d5d01d3512eeb328ab";
   hasRunfiles = true;
   version = "0.1";
 };
 "biblatex-opcit-booktitle" = {
   stripPrefix = 0;
-  sha512.run = "bee698ec0ea3623d8a864491f974a13b004075feb09fcc8b7f84e381978bec2a6cb0e684c2afc8e25baeaf55c9ad4c0520fdc2bf760b1971c2e5dfb8af0c2854";
-  sha512.doc = "d3085f8d869900955dd47c3ed3552b3437ddc4943644cef47a9a71f2c0df717d5c205acf5df6225eb83d910a06c1b5bd7a2edc55d9263e47b642e62e367d85ec";
+  sha512.run = "d680c924a58837cb966f9a799f4db54fefb6bf6b08e4dcdaeb6d501152ae30f75d9ff6b198db3a6554cf609ee9416a669026d5a034b98a69f3a35478367c9b0f";
+  sha512.doc = "a63074b7349e712d613867feb38ffe9004529a1b31c882057a11bd0f391e8553848aa2b956867965cb3403f987587949abb7b1dcb65039e1a9e3bdd98515ef26";
   hasRunfiles = true;
   version = "1.8.0";
 };
 "biblatex-oxref" = {
   stripPrefix = 0;
-  sha512.run = "90574e2a5baede0257a4fc1e0d02df22eeb703e66b1c4fd1ac3f149070fe75663b83eaf1dafc122391979b3c9a26e40c4ebe241bbe8fe3da5f989964a00beb8e";
-  sha512.doc = "9484450b28629aefd03bca8e139c7e369e60fd43c697952c9d803fb6897c4df092e8faece9307aff627594a96648210e011eb10b15f375e37ca3ced994953156";
-  sha512.source = "7306164b7861a03063af914869594cfcf6c5bda4d9c4e3b8d2d8ecc8983d5ab4c6f74d857eb74629b9eec33d02dab8e880f596adfebe5afa0858343005027ff8";
+  sha512.run = "59ab735ee799dc9314a773fee998a12ba7242ece4e2728cbe1a9f9a68c3467a20a7871e51b26fbc9ac74668e1451c0da6d75a541fe908dc4bccabda0406ebc77";
+  sha512.doc = "64951b387e14d2acb6c1316c661981b5a284f31117c6ab4946405e78cb2913aedcd221e98df7f73435cb86bee82df80445be20f5632e4bcf85b21e5c94c40d1f";
+  sha512.source = "b1be9f50381119e287d76e56bb63d6f2f71bd5e89c1db9ec273c83330f44ffcfe087cb67460772d86aeeaee06b5f2e9872960b38e37d6013eb9f2cf7fec811b7";
   hasRunfiles = true;
-  version = "0.11.3";
+  version = "0.12";
 };
 "biblatex-philosophy" = {
   stripPrefix = 0;
-  sha512.run = "844f216eebf5e4b0cb3673d2e59b2aecab403ed7e0dd2aa11e1c962f374512905b1fea25c5e693ae5cc31a493583f8b14436b6b61b10a656f354e0d3bd72f711";
-  sha512.doc = "666f0f8b3c09ff7f2955db7f3110b3c596e71365f09dde10c903474f244bd2e1bba3683bb916c2d42e49991a380eddeef79cb33a35fb3fd1848686d3268babbb";
-  sha512.source = "e1166ec731fc96f761758e6e1e82131dc75ca876abd15c85231d00067abc0d70a39e3e405f9a363fc1750417be29d25e440faffb4ba8b168a92fc8be1ffa0385";
+  sha512.run = "0be8dc83a295554a7226e17a21a5cd8e4b8e6f518db66d47bf01ef01695147bdd01dd48cd3e81e55f62d1c554f0756349fcc8c239f4e4b6c76ede68b59f7e69c";
+  sha512.doc = "f1c3e2a5e2bf3f6db3dd07b0113d4f9bba367a32447744b0d092bcb714f93193c66dddeba12e63103f287d7748bdcd5ceafa8051be8f3114386ec467ca804399";
+  sha512.source = "7d377ce696c1388d4a930561de286d74a9019718592b70c84199690a1253470b544d123a66ceb05969732395a48bd256a54e66c87b2de68fd8982ed541ece8a1";
   hasRunfiles = true;
-  version = "1.9.8";
+  version = "1.9.8a";
 };
 "biblatex-phys" = {
   stripPrefix = 0;
-  sha512.run = "0b8bb830c61372978a409723365c932cb0476f734908ff2e7d0da563078428f5a324336f7823eb8f754f005f32ef9ac2fb575f3328cec9f0007e8efb974d8520";
-  sha512.doc = "da59131a0e5cdf1581d2cdacaf83e01606586981c2d055be65b1f0065209793c9dcbaa11162ee25249c99f313e8cfd97e7f895612b6eb620713008b5d199765e";
+  sha512.run = "2d77a5a09189cca6d894d1ea1b66932fe26ed92975624d29ece7872b0dfda3719dab3288787d875de23c0283b63155e0442124b38d749dbbce960e141fc8362a";
+  sha512.doc = "9b15f88acb84cc4d7a915aa30256ca4014c9de859066ad981dded42e2911539945fde1b50a8844184fa4aed80eede032ab6820fedd0594dafbbf0f78618f5499";
   hasRunfiles = true;
   version = "1.0b";
 };
 "biblatex-publist" = {
   stripPrefix = 0;
-  sha512.run = "dca990baba8656fb2d0a90fa38dbd34a5e7e30d6755bd2ac50f8aee6f7b6f7c2420a97cda5fa758aa4cb9c1c26cd989c596d2e298e9bcfe63118cfceda292faf";
-  sha512.doc = "0ae7741f319db018cc52920d4fc917dca59bdaf79c4be5b46cd95ec778ab8e59ac9356c5fc553d843e7be1ad9629e7566cc769bd6e11efd0c58051e08b7ae547";
+  sha512.run = "aeadb44d44b4f3a9dd28a6c2338f2110a0fe1d43a3e0ea6682f0cad89c99211c7808e689463cc3d1a7602f7345abb60abaca833fdcd6eaed1bfbeea66bc5669f";
+  sha512.doc = "92230c03ca5aa49a581776ab541b56873b9c077859409b584a8f003518748dbb4c9dcc100eae6b449bca61a37fac6e21d2a599eae53e855ac5ea473d021df716";
   hasRunfiles = true;
-  version = "1.9";
+  version = "1.10";
 };
 "biblatex-realauthor" = {
   stripPrefix = 0;
-  sha512.run = "fdd6eda3794ab9e86092c9037bc0d6914107a8605885f6001ea8f57fcc2d9ecefa3aa45850fae028cc709b12dffd79aa06c51f500f5c5c85a024f87f711f27e9";
-  sha512.doc = "9c9124fcf12e0ba002fdcf175e4f80a246eaf10461ae062016a00557b0055ded119848bcdc1b9e90767e31ef1e9a7caf5253daaaa8afe3f2f678d27d9d276055";
+  sha512.run = "f76ce568cd7283cbe2608720e3902a2b1b08442f3c317c077806469e6815faaab029cbd5037adc0378ca158b5abd37997384a8bc5e598b84195e1f0bb761c1da";
+  sha512.doc = "f18740f5d3f8929b3f5e74834097cb26d1c314ede7e14a7a41a49a75ac9845c03b43c9b25cfc299de5b7ecf6ebdff1a241d38aecc25e9e82b85a2380ce35834a";
   hasRunfiles = true;
   version = "2.7.1a";
 };
 "biblatex-sbl" = {
   stripPrefix = 0;
-  sha512.run = "ae252c2edae44bc17580e7fd421c0815aa110903e09460515310a9bd70fd0e37146970deb0a7a031449402b4b11c8fa20db902dab27812e8bf23c024e363c06f";
-  sha512.doc = "18e55b33b57f8597b5fd8b2a8f27a2fc5ec5701a8c9db1ec5db4e2665a7cae08ab55c501fb3f1b89edb0f0d929981132f4e819d5240822153cad4252a2c9999c";
+  sha512.run = "a0529dc3d6515d9cd794fd68e19c730fc56795fce0145504924ec4a554af7c77cba0ee2e125aa0d43204f99b23fd42498ca1cffa691fc6548ac6c02bce0d7244";
+  sha512.doc = "a34617842683d0de56457c5435943d4b904a65187898c69c533a0ab14b21fe141198163db4c7b440496f11dec3b3af2217ff18acdb87f3d0b2cda2fb888cfec1";
   hasRunfiles = true;
-  version = "0.8.2";
+  version = "0.10";
 };
 "biblatex-science" = {
   stripPrefix = 0;
-  sha512.run = "5fe97cd0752a870c482fded6befbed1eaeb0084421bf3f532cfbc70c8b13687050f471bfd1df5b20426459023ae06af71602e079547ad1d56a271d4b15b308e7";
-  sha512.doc = "e330bf659f60c1bbcb58b1b711c3e36ff854340aff78adea3c3f81cf3a5ee4f97ed6d913aa349db4d86d39c9fc6671d2823b1325d4ae9d260b452ed815933c71";
+  sha512.run = "d5657c33efa26419a9b699d610f511385e373cd10cbd8ebeb3fce6995f06d7cf400775d28e88b12e0133b27536c38382a75a1705f8cc291a55f959f922b4c01d";
+  sha512.doc = "9614307121cc6e831fdf925d7dcfee2f672771c21d9428e227677d68e3e54220c1fbe0cb9f71975e1fb75fae2f316423832f2d76643861df9a6d1e6f5ca47a66";
   hasRunfiles = true;
   version = "1.1g";
 };
 "biblatex-shortfields" = {
   stripPrefix = 0;
-  sha512.run = "751447ba7356c602d9fd5d58d43f8f49edc6190a76d016a1bf20edd25a0d69bfdfe6842fd7b3e0596ad21004a4116a58aae86b341a211cb7f8379d53ebdb197d";
-  sha512.doc = "69fb7a96059fdff4edbf9578a4c8be5675ccd92638303bf2aa82cd1f94ac371425094b630a60d8a7f62d14e0e4c431d5f6d563dfaab0ebc01d3dbb42fc6cc5bc";
+  sha512.run = "7f1d985550a96aef803f752f294a06d5e71bc2ccea6e193614dcf6b9bceca6b02d3c878041df190a65380e03622c12eecfbe05b42a16bccd9360435e738396b4";
+  sha512.doc = "cf91da092761af447114594da766c62572c3ea79a2cc7ed120175eed0dedd54c291cfbc7a600584f0f8226d6d949411b317ac4ac6f99143225ac67e0500583c3";
   hasRunfiles = true;
   version = "1.0.1";
 };
+"biblatex-socialscienceshuberlin" = {
+  stripPrefix = 0;
+  sha512.run = "e0b0fccb0fa2c7bbac6e89a4d0644895a91bc4eec4cb8affdd4729d55ff5c908c2d5cef4c3660427828edb5d8764d327fd6d217e227f55a4ca8db9d384a93afd";
+  sha512.doc = "5b1f5aaaacfd26b65dc5d06e77485cf15291550210f0cfbd7785dfd3e261cf65a4357b0e55761846fe58c75855f97ca31b4beac0db3c3d222beb926f6f2b4aeb";
+  hasRunfiles = true;
+  version = "0.0.1";
+};
 "biblatex-source-division" = {
   stripPrefix = 0;
-  sha512.run = "d99b85d77eaa1bd0ab73fd37d344700ae6f3d9cc113bd725fb468dc8754e5b8bde6d86090f17a4483a00da44ff9587dbf6ddb8a9fbc0fe7d0489f57c73b9f38f";
-  sha512.doc = "1bf42261ac21a514532cef80c9df285b3eeaf7ab1f24f814751504c50838377dd2d319912c216a426439e145e24ce5a4ef3449e5ca9b700ab5084130cf035f8c";
+  sha512.run = "bb07b638d1fb70bbaa20505ba6d9d0a3a628b7932087d0913bb32f4f2cff1cd0997c017943b0fc047f440a98aa6f94089a99c93a60dbd79d8c69b006b91b0587";
+  sha512.doc = "bbae4db7e946580476775e15b2ce30cc87b41ee21daf2b1cca017bf9d3449ec1ff502596d79952bf0640ac9a0cf0399ba44e3456443106d719d9374d7fb45d00";
   hasRunfiles = true;
   version = "2.4.2";
 };
 "biblatex-subseries" = {
   stripPrefix = 0;
-  sha512.run = "4acda61ce9a1b155157ac82f74154fc9841ba5e1aeb5dc9e751abdd957e33ae40ee0400936aebced5416be7a546526abf2a2c1e14a145f24450778b1a7284318";
-  sha512.doc = "ed4a41b1cf567689e3f5e5f1e00ed82b957488aba1e09a32d8b44857498a8f7269b931773e4eb8634f44293e94c539234644359ace937a1a4eeed576890f3bb1";
+  sha512.run = "12f456ac834bb7537a1cc0b1fa6eaed4090c9c034b7fda85300932a425ba1ce296517ee928230f7be08e01543ebebca615df0ac338cf08c4f132719623314b1e";
+  sha512.doc = "f0f025e3dfc9daed0463d90afc0f8cfa6da36e7a54fa2d5d10d6a994e23aed7f6b01a3e5ed2e0d867f7b08d21fc6bc9b3a41139cba9d337e91c23d8beb9110e7";
   hasRunfiles = true;
   version = "1.2.0";
 };
 "biblatex-swiss-legal" = {
   stripPrefix = 0;
-  sha512.run = "e4128719e04beeaebcbf18afb8deac94b872554b66205f64105996f2852e4dcf9b7aa11bf770c7afa903b028e13885c5c88c29a41db0772afc435c359728e4d9";
-  sha512.doc = "a7e4cae55c7406f79eff37fe992120bb5f883732f154939bd56e99f3dc10b76e9f1386527e5a4fe2f9864f13c87140465784c1f0e3d34bc672b9bd9e002cb1a1";
+  sha512.run = "31bff495e98f09827274366c20debdf2a80b5ce0d3f76ae82eec237084f42f06a09a97b81919e60430978c51c87e2de1bdf330acdeb58b759dbfda4caaddca60";
+  sha512.doc = "540c841e51f06f1ac412dab33cdd90f6dcdc2aca106126125cca313b99142ce5f0e4baa2c9ad08fcccc6b45ce0087f34d008178798c59d4eeff7878805a0f451";
   hasRunfiles = true;
   version = "1.1.2a";
 };
 "biblatex-trad" = {
   stripPrefix = 0;
-  sha512.run = "cf951719b37642d03efb34e5f23b9e2b86433fd8da5df6873b3446cd7cb5423ec08a8456066c1a9a56d9f1e44d2a14b87714b78bfdb9e74a09b095755befb0fb";
-  sha512.doc = "49ff5d562f53689f115905eb60519e7ceed7169b292821b2cdd94767cf9b9c340e5bf8e79176e75ca69baa1a51781aa6e594779ec7d6482c7ab106fa93578365";
+  sha512.run = "08cbd161c42e1f5c99d6cf3b74cf24db489bdb456eb969b86972a3d65760140fa5274901b76321f9696d2a07dec5daaa8bc81e7aa7f4e5f4fda1229b1ed74a1f";
+  sha512.doc = "17185bcd5c15250fc6791020b341b1211d8c7873cc16e752aae6ee3549bca0d44691c8944acf98d68779b01d95c8c169e9cd5ca8ce5f8bf7758258a15287bc40";
   hasRunfiles = true;
   version = "0.4a";
 };
 "biblatex-true-citepages-omit" = {
   stripPrefix = 0;
-  sha512.run = "8859d987919bb68d99b57ca8772c371a480a758244a3619875f61b16cdd72f9e1869f6fe7eaa2d901f37e9d82fae77dc4a524b448db1a82991368fe06d54786d";
-  sha512.doc = "d72a32415dbbdd0135bb0ce8ab4a6441afe5f5f077c29f95f8e252fbc7e8229e40783702c214f15af63f01a8cba52031f66fe82804f88fce2b43355c19ca39f9";
+  sha512.run = "bc7828fda0cc4395f6a3b76636f5fa41c0eea38f676f002285425ed826df26c6ecbd8a319390dbe3455d7457b2d85a22bdcba356f9e3b3446f1c47a478c1fede";
+  sha512.doc = "1cc341bf1636a3cac32e99431750aef8261f795935b2a098a240c51ebdb5294e363e020b35d83c99d88c558c6a53e4b2b784cf9016ab7cf0010111de71247374";
   hasRunfiles = true;
   version = "2.0.0";
 };
 "bibleref" = {
   stripPrefix = 0;
-  sha512.run = "48482041d11e01f9c12f632bfcd7dadf71713cc648367ff4deb685ed3e392947af9b2e1adc9b070cb9bd0fc3550d1cab0f986cd13df1a2136f69bb4145e705b2";
-  sha512.doc = "3a7bc1f13235acdc4115e5f3399e5398ac383ab7ff8aad185291d5443fd436fa81a31cd2200a610f0ae515c4c348bb79d4b9c54b489e2976c8492d1a47781735";
-  sha512.source = "02b0fee94862c475fad4d0593e627a84ec239318ca7e526b50a54515b98457dcbe63ffe6f6095cefb51a10b6aa34564d0f805c5dd63686996772dac117cfc543";
+  sha512.run = "a41ef8b973bf34c97a5c3ee135a9194fed668c356e6a52b49c9dac8f1fa4b57292e0e0e44375fb2002e6e4b80579ed44d9820c5e0698b3b740dad3e14a3bd6bf";
+  sha512.doc = "ab8ab83bc26304f710c804e207c367c0902d7592f2c109d491cd4dbb6bac72811a3e3f11dc1d4ef1c64352e601405958bdd02bb256223426b71ef3caa9a52e1a";
+  sha512.source = "3db089895c7c566e29c3c710bc72f96d570c4eaed3fce0da339ca28672f28101a0719bf5a5afa94deca1728e884ea9e7236ef693d812d1cfe1e969e1fd611159";
   hasRunfiles = true;
-  version = "1.17";
+  version = "1.20";
 };
 "bibleref-french" = {
   stripPrefix = 0;
-  sha512.run = "cb0ead32b9befa920e8513bb9f9ba2dd98057c99f841f4ac39077bb2a7d9d414c9533a3117c26d335f117851d31dbc65608fa7bfc7db1d2f18edc4f084d1abea";
-  sha512.doc = "5bb9cdf3859e4587d9eab58a98f5a8a238df746a75c2bd1b647c09d0547b08195c3274dcbf6453f438a094bd5d39abcc597df00ab7ae4e6771faa2a6a48afa06";
-  sha512.source = "763205d43ca4c94987b6abd8c3843ae5537cc871e35fe8f9f0f07503dcdcbd72ac4ee2839ebea2780d802c9d77295fe0bc0f232cc8a9dec2aab64d582b7653d1";
+  sha512.run = "66179395d45754f2ec9be7a78097787c152a959412fc2028d0704a62df91a90e0aa26bec75ba46e74d90304424d7a2463d0c1e4712b050e0274df3fcca9df509";
+  sha512.doc = "7a5d445b172e8fb4ff07f6ffbf46b5629f1e7b61cfb044b7b0ca147b65e27df6536f6e5da8199630ca29b47013bd9d3b6cf0b1f72259613885982d38ce058874";
+  sha512.source = "5feced87ae252527a7c3a8ef9bcf36e1b117c18697c05697955faab60ff3a1864f5d97c3bbd05296fdf1f340f52149286b0e78c1ed20b0f30b4989ec453a5ba8";
   hasRunfiles = true;
   version = "2.3.1";
 };
 "bibleref-german" = {
   stripPrefix = 0;
-  sha512.run = "2104f36a1d8e30f135142ba83f265853b67e8364cfc64bb22d97f3960914212a8d9244a97f10715068595b3c40746d5ce4b644efb4a854a3871f1fa7dc9460c0";
-  sha512.doc = "4b4d5b0a0d6c997514dd18dd289bcc8fa330aba118b62bf3aa431cedc320861fe47a65c98bd5b470564cc332de53daf3fb5847a65a4c8b15ea76e59e3f0478f5";
+  sha512.run = "bf8261fa3aac04721a934a645b82ea41f9fcf92d7c683f7f0aceb581134a2e4ff38c65a3100a750d0d7d9597d9853608080e67a40d58ca0c8ba7576313b753f4";
+  sha512.doc = "f20de60f57b4e2c39cdaed27c65336f18d90828abce1c42c150de7de99630c6769488d9d13ca1174e2a720e88d25d3100f38b3d5ef0211a9b23a51a34817d061";
   hasRunfiles = true;
   version = "1.0a";
 };
 "bibleref-lds" = {
   stripPrefix = 0;
-  sha512.run = "349c580f69f3de9393d59b0153f9255a4545256cb6aa71ed3cbe03dfd6f2db7aeda3e3c951063a2a4e8c4bd59fb6856be1c43ccdd97db31d20ec15e0c03d03e7";
-  sha512.doc = "6ca28281628fb6ab81a7800cd588cff4ed0c298fa81fd516705154cb31704e1b841fc46ea282c21c7e681361de4df433e144fa6c10e2f79b14a721ed5bfebed8";
-  sha512.source = "fc25c7b1cfc73c7a8d047c5a7760f22381335f8af018694592d347b18277f080544e604d9f5794902368abcbcc17342d16f34db6e3788fcdcdb5c252c2752198";
+  sha512.run = "cd2ec9e5157d8e2a0c587abafb5b3be29d0007b3866fff1914c64e0f97ffe351985cc29f12ddee4b862a43f026e8de63aec5faa7f55ec366cce389f2bd3e54d5";
+  sha512.doc = "f191e15d805a9b853f565a5adb72ce001609352a8285e9c8cfa056389a423759530a5d7669eaaf25dce17934d3a905407bc21e1299b5adb549c553d901610216";
+  sha512.source = "442c303e0a3e130e21cf5a70cfc872ab1a79b9ef0b2d5aa581b2fb58a0bdc0d4a47be906330c8ead7b2a58d092d07bd7805f5cf41fd56895c790f356fa37cfe5";
   hasRunfiles = true;
   version = "1.0";
 };
 "bibleref-mouth" = {
   stripPrefix = 0;
-  sha512.run = "ecf0ae0fd76213800ad395bfb95873e1c458d08ee7c0224a47856a43785dce931d36a3542179188d3550d3dcb3d7034ec6c190b7a66e3190d3539416bd3b5554";
-  sha512.doc = "936e13fbb2bbc6f3539f0803f52a3a63b269b0ec3393bdc9fbb2840edf3ec4b20bbab5f2faceb337bafce46108c54c5f2220473510bfba3a802b6bb3808fe19c";
-  sha512.source = "630baedef6fd1cee8108b135ba27712cd5c297b732c08cd3c13482db9bd2a3cadbfafa15646591a084c03e0171a365cf38a8db3a3af63920ca2e24aa3bc1db33";
+  sha512.run = "97975f1399dd6000cad9bd1f0c250cc4d763676416620ac1a532b4c8a6144d99c33a4109172deeccf86aebe6a54b585da86b9f8514b3bbcd9d04ef3c110605f5";
+  sha512.doc = "27dd5f6babc1341c959046d5484dfc065be7f246f476e89f0a10d9dbe57edafb43bf30c17dfe0e4cf2dd75bca5838c0260562cfdd174cf2d4f1dda55738f636a";
+  sha512.source = "4040385b61fb8459daaef533d6e186742711f7bdbb5482cd58676d150da55513651cb3b70fda2e4811ae9c730c650a3dd5dda038300ad2e770baa48cb8f9f6da";
   hasRunfiles = true;
   version = "1.0";
 };
 "bibleref-parse" = {
   stripPrefix = 0;
-  sha512.run = "29d63b0e6a39f0a3e47b39519dad41e7a78563927d292a76d16811d2355f337287e6ee2da4ade1a477db0df02d72e932f4b66a9b871fe057abc35f7a474b2922";
-  sha512.doc = "4a5dc33a0b9ceea6e43cc7da63c891e9276d626f356663f807a921e83210a7415286be07e3476bf6461abf3fcda7c956cceb49e89bfca59d7927bd92b8aa4db5";
+  sha512.run = "57ae731cd541f583db9f3dc6b967989e24603e6a720d763b144d0cc66eb87ddac93060be69bef16365bdb9da3e9be7aa5ffc2bd707669d3b1888b1304d8071d1";
+  sha512.doc = "7972a0d8500f61c97516578be1ddc081abb9987f3783e529cd0489f73ed47c2da4483e12bc4142d39f78aa9ba85de175842e6e8164634a90ff24e3c1559cfe93";
   hasRunfiles = true;
   version = "1.1";
 };
 "bibletext" = {
   stripPrefix = 0;
-  sha512.run = "1bd7f2df64bf5b200ec0c47d53a684b6b079c195632616784dcc1bfb726b774a778b1eb3ff521dd9070156ee8ee18912703d123ee0f2eeb3061925c6d576ca2c";
-  sha512.doc = "c194559447a973f2589c3ed153858c67237fe8ca604b9cbbf5206b4777b203f3709f1ece13fbf0bb35607da25b553067c1fdf2f09fd1efb4c86f389a0337611e";
+  sha512.run = "846fc7390c2120b980d35d64fe1b6f715d29f27769a969be4dcc11ac93ba7b661479261e2bd80b0ccd657e4fbbd64a0487662647aca9ba0b17d3c7a662e8d453";
+  sha512.doc = "c3921b21064b6b467971fce9f5711d9d6ba1b886d3a3d12282e6a36d0f4ea5b453f80dcb91c2a9f09936fa14ae136e1bf3fa747c05cc47f063c3c483a9e0b111";
   hasRunfiles = true;
   version = "0.1.2";
 };
 "biblist" = {
   stripPrefix = 0;
-  sha512.run = "45acfb76049c9356474abc5ec97a62d16b4c84a08b03b277d7fc1f4aaaeb5aea65461477500c090e7f200b49104605e52af14f15cbb8b8c1d36ac296a6b9222b";
-  sha512.doc = "14a31ebf08205e77c9252933e7ff3086596009529b0080162b37e749888751f98c0e15794d3b87a20737349de8808cadbf940c8cdb05a73460a1cc78ba784986";
+  sha512.run = "565d41258f55975cdf13d888868714533bdc86878235c31867d73ddd139fd8d815a0ca399022181c6d02f6546d3afe2bdc2b73dd9bf8894cf40b8a1b7cfefd8b";
+  sha512.doc = "ab49e2c31508f4b86e5103e4650d201c2d1f5ea95157fa3239436a9f228bd95f6366a85e44b988c7bd597df2bfbf722d1153338a8dabdd701c2d91d11813cb11";
   hasRunfiles = true;
 };
 "bibtex" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "5ae1e47dbe693ad73f7ba1fdf90daa7d84880ea869deb32c0a9258f48d5a87477f220820bc1ce6b3ca223313e315ea8ef04dcd2fde364c85585a4222a814c4fd";
-  sha512.doc = "f8a5ec30ba2e67a0f3b8148f0858d3393d23b942887d9ca4f1ae5cdf74b67f4227098908c3f3fb8a30cabdc7d7aaf069cca2e2c4a28d0db4e6236232a10d13cf";
+  sha512.run = "0939809e12ff25e750a9ec85e1f13c810209a9beb8cdcdb1923c1c718d7177e4398d3772c9fc773d0970a2806af912f39bb341d8fb6a51637e62db9ad19bb8d1";
+  sha512.doc = "99409261c7655f0759b17d3203283505f3791a2fe7bb3ae875a8d583250aaf16ff38f853a9d7c213cde17222b5ceef0dc3ac58b8abe7df56913f8107f77f07ba";
   hasRunfiles = true;
   version = "0.99d";
 };
 "bibtex8" = {
-  sha512.run = "b5d8b2229e63529a6f75c875da2a44fe012bdeccad18e740d50cbf1acde67b83f5912350324869b3d2392d98e658b37e3e81015a03b99921cfa6b603d8123321";
-  sha512.doc = "1b5ad06b229f6d0b1d9712eb4e35d96ca1e707040ea0981d399346f9f432821a8739ad0826df8de31de613011880a4a5a26b848c7a2c4bdd27263a297036b932";
+  sha512.run = "06cd33593de7eb7ee393f2d33de18435b0c1e57313fc24fbc23d02627650805daa9dfaf7d57dfadff56bcb5234144504f48fbf7aee51098459d9356ebfd57208";
+  sha512.doc = "b6350f310809d914d8a7a30f42d5c6d86cff901ac1145b88ddd54211d30cd02aaa5491da86cd399e5aef70a09ef7c2dc5f8d9343853bfa3cc8e00595de17334f";
   hasRunfiles = true;
   version = "3.71";
 };
 "bibtexperllibs" = {
   stripPrefix = 0;
-  sha512.run = "23a3f087326ab2b593b97c1721cd41df23fdef2db361753f38877095c42467875eef4326c759aeb9a826a03d4ea7e69720001a215736c002469b1d53ea850113";
-  sha512.doc = "354b6d3ce404e2b6391c0493682977ba8e5319872390485e74c71e29136a140907cf55e986621f8a4a37b1942da28c026248307004a1ca9ca8e2e063c33406cd";
-  sha512.source = "f50396ba7c75708379092a120fd289a3e2f5eb54dd65564da413d5b26310c1ed90ac45daddc4dca27963a660eb121b5a6d8a22d7e2e7ae673ed070854c2faf59";
+  sha512.run = "41a85300f529541407f5c1c565cc4a1ae85276c47a88ba3a089c0826afae764acb08d36a7c3b7fd8ffa32760d672553625c29f2f6cd19257936a5ff3aa689161";
+  sha512.doc = "4f619da80b6af0986a39dfb7c2f3e32e792122293bb4221d49497b636e4accf014d29175d8657eaa54519e61a06bed4b7f6d26e80585a41b15d320ab6cc4ad9e";
+  sha512.source = "bcf1c89d7712619e3af4bc6946d3dc6a3eac98d77fdb88fb6ec62b9118cf9aff76200f4296bacfd538aaa71cd8c3f2b0029d77e69ac1f252df7690fc1273491a";
   hasRunfiles = true;
-  version = "1.4";
+  version = "1.5";
 };
 "bibtexu" = {
-  sha512.run = "499f69d9d15e3031b9b6450ad10b2e46a2a6bf3fbbeba72bd79a02e9323a51bd8512af2de436ca6b08418c9842b0098ceabd8e415aa66551c45c101f1c484293";
-  sha512.doc = "dc5230f62a099952cdcc81dea59eded067f68f571b475407e4168348e49a521273e2523ea45ba0c8a43afcc16246a2902655f1a5d16b34e72b253a25112e93f9";
+  sha512.run = "66dbe9076aebcf722e55bc9cc30e80cd4541f295a544304e83f83911ace04bb4386574a0c98e818c24b781e8fb219240a59a15302f2bd55c5cc91b25c043e2ba";
+  sha512.doc = "c30230d2789e53830e09ae553e62af6ebfed4f860646e507c210e2ec56e75fe5710444add355ebfccc23d1b054467adcdb3654c8e22ec5faf11af31436da66b5";
 };
 "bibtopic" = {
   stripPrefix = 0;
-  sha512.run = "f4163a64c7252803bd3295ee4465aa7f8d52b87bd36b8398c792a3b3cf596fd394748dc22670c0361d30eba9f7d8ff21a247c13959c0767216eca572c1b35ea3";
-  sha512.doc = "9c83a8c2ecb56383b12bb33864a487c005ffd324bce1a276a1f045a4d71cd1505eef99d86024ec7b4245335fcbb21821c2fbe83aaa8b34c3b6d61b88ea71a2a5";
-  sha512.source = "e7db151638a586b581f128f29115798cbf0abeaaf8f53ff2bd52631a8408628bcbdcf57a16b4e3669542f1c0ab69a362720ab411f3aac48bda266c0804a1b9cc";
+  sha512.run = "81ed65c65d2eecd52dee69fac01c4f55aadead5747ee03f21970bc10bbd5bb63d83be09eca36cb3a6fa2e284164b561e913dacbb94bae434417620b5e07838f5";
+  sha512.doc = "6efd7659d2b460a3daad43b96e792e27b05bc066140419944f3545c460e37906f7e0d253f22fc6eb67cfd6e3de81a0c47ab50290292f25c79b5a80ff1b9553e6";
+  sha512.source = "ab2090ec566eda6274560bd73f3c0fb792853abfb52881804ccde7cadae9ffc73c980ebc2cb05859b7da304dba016a4c7e8956befbfc2ce7a424a302e92ff383";
   hasRunfiles = true;
   version = "1.1a";
 };
 "bibtopicprefix" = {
   stripPrefix = 0;
-  sha512.run = "ad3d4a28d8cbab2cfea0cd5b2cb64ccb3023a9fa466f3bf6a111ff97da21367286572156d006e61a0c4339c2c62f04f4f759c54299d2cbc23a4c392dbd485a00";
-  sha512.doc = "b89472b4943a38ec53621bbadee2ff662dc529425b1ae1474a982b4dc2eea2d064705a40b3cb8538109f68b456551c926618d650359bb288dbcf1407a4bf09b0";
-  sha512.source = "7e49586bbd8d388ae617d41e6368de7b48e8890fad86b48390784282e24ee1f354e8b1fb470a1163411855df1797d5963e7fe29c02038192427c4acbb30c8a0e";
+  sha512.run = "d31376a4ce7e1c1bab08e85844485916bcc70b8a65724fe0e94970b65fc46866cdd3b87f6dbe759f9fda1e6bc55b6b5d4bb4ad8c4d6719f1e9ede9f5b0be67be";
+  sha512.doc = "ed219949f9eb2799cd226cb23fd2342ce0b87bd6c4152b79e100a58e44997c71b56e30fdf5ad36f85600d23ac17eabef79d8ee3ae4a8a03d91c857a81686633d";
+  sha512.source = "e36118181def3b81b699d8ff757f667b06fc386e769649a7ec72bb7c784eb4eb02029cb8c53e8032a6f4d27084bcec8d2265908e26c12cd7990de154e82c0858";
   hasRunfiles = true;
   version = "1.10";
 };
 "bibunits" = {
   stripPrefix = 0;
-  sha512.run = "639bda7f0c23c18cedce11f0183bb94344f830865345ead364c2b6eb893c43b3142fec349856d611d8dfb1424a78f4137674afc055da5dba9fb97c00f058ef0a";
-  sha512.doc = "3c966ce71bdcc28cacf3442fefdde3d9b4e2c52bc11cd3284c93634d9a8f688486c39fbbff4a3f75ed31b9195dc269888d153e6a5024335ba115e478df0da4d9";
-  sha512.source = "80294cd07f4e3a5e50c2bcce5437a61003376c40b64ab45383e4dd1f3de39777dccfc8d72e9d4bfa7d898e17615897f82e4b3fec9ab7c246751df7368aefa90a";
+  sha512.run = "b99acc16b9cbf51082a6a8a22e96a335b56c42b6e8f93b26c2a89150015b7af57854b7d7f25c48875f484ef539d2309255a85673c82f572539e4dc7ade869467";
+  sha512.doc = "e506c2bb62fa1e40a88c9aa5a990e6eec633b06dfd561cc23d6e08f1d976fe80fc80ca6d98e8c167a85fe00c528f44ce0a2c9108ebd0fafad808f436de3e48ed";
+  sha512.source = "807829a907fe60bb419c87a514cdccba7f30cf63ff4dad0025ec630330b95b8af340530664272d07261b01f37efbc5e6a243173d1aed770e59d9ea66d9e509d5";
   hasRunfiles = true;
   version = "2.2";
 };
 "bidi" = {
   stripPrefix = 0;
-  sha512.run = "7da0b348e7c0a47b45059ffd05c8e45afea3b3835e0445fa9216e9fe5a5e6741d85e1f686621c5e440bd5fe47804e93aac807eaeded3e6d17f7df99867135593";
-  sha512.doc = "e5ad0a3148eed6a8b4aee7a4bb4cd52fa36ddb18a9e6ab4e7cf09bbe44f30cd25dc27aa206c1f9fa5f6fb6575853caccdc8320960fed583c3de6d60137b4c45d";
-  sha512.source = "b4d5fbc03b0f6ade60582aedff23fb61d315d58f9a896422396212efee3aedb10203358b3e8ea80940232b67d13b398ef676b29e85985a7b139f74c9c1f982f8";
+  sha512.run = "e7761fac234762df5acd4e3ded0fde78e8d919f6fe5a22868883c800b1614f0df68a3d4b62fde62fb5a8ad3406bfc482eb147b920d0cfb43fd4633ffecdd4d99";
+  sha512.doc = "78879ae760faec6b6f15416606cc4568b258249f9a350c6d6fd36633f8e0cf308f0d000f53c2ecc079cd27f28022617ebe56989596c3029d106a4496bef63d2c";
+  sha512.source = "dccead9fb2ca9c267e3d528f11138e56c2dd0823b1e9f5351c21919824780cfa38c236eb690806d588931d8b4c07777dfbb3bdc3fd928a994e1eb750dcfc028b";
   hasRunfiles = true;
-  version = "32.9";
+  version = "33.1";
 };
 "bidi-atbegshi" = {
   stripPrefix = 0;
-  sha512.run = "bcf11c88b596d9288b51c17c7089ea8af8ad36e3ec2c075f12b90e595e78fa025b69cd48ef439671b12ed07d22cf3d494bef515b2a911a1cc6b79ef236709200";
-  sha512.doc = "bc027d71eaba9bdcaeaf09d3f3637bf9ff34ea0d3cc76b3fe63757333c269c5ddd4103295cd357e6c729dd264fca534ca9ece63bcadec47752a2fd613c28662d";
+  sha512.run = "9a37c45f5b0dde87dc0c9f91257054f16b48ca25962bb46425caab8bef9eecf7221311841b731a2b677748fb33beb2da555e29dfbc538bd027f59fd42c627741";
+  sha512.doc = "a6c4de587371bd9504f3273740317a6ec95aa37d607279da56ca4c5a9139361667a8b476dd49aa9dfce25804ed9187d6f4935e39832433b40d930d7143abea04";
   hasRunfiles = true;
   version = "0.1";
 };
 "bidicontour" = {
   stripPrefix = 0;
-  sha512.run = "0d0a58d4a208a4fcb0bf03872e6a1df41c1ef4e32a4e58110308d98f529040849183ae238eae3aaecfddc052d5f5834447beba13c16aa76a81e08f47c5f90596";
-  sha512.doc = "5d8a042757fdc49520cbf8fd18db532d1c02e63a0ab6096ff620102df9202651a66eef41442e2bcb4aece3df4f259dfa7537cbb8a77464fd0d9ce84c32e063d9";
+  sha512.run = "45f488d39dcf4af1133b13d81dd365ac6650f33b0d676bef5d9ada7a95350b0ecb6599ebef989fecfe2cba26b438bb98dbf207483f81c3a457c6a31785ec64c7";
+  sha512.doc = "ff948246b9aaee4769e69961be6da6ccd51766ca3053083e89546332d9d021843a0310a5ea7ee02189d88a6a639298be13fc6ca81017ff24904501e55a49dfc8";
   hasRunfiles = true;
   version = "0.2";
 };
 "bidihl" = {
   stripPrefix = 0;
-  sha512.run = "542e47c70000a5e4faef9c31447103adaad3893548b28ea5ec546fa4845042bb44465fe121d3fe1c5783950f61bc7e1a138c266534317ee5edb2684a76b444fd";
-  sha512.doc = "c08d83a91db21b3b1ab4785150ff541125107a51425d895228637e2eb2ca08829908210481d06f2c04288cb945a9d93e2bf9bf933232dd9a3c2d09854ce7fec7";
+  sha512.run = "7a32c2fed9ce99d81bfd9b42da8ef4012ac0c614729d6eea660dac84b8b86fa74b3d1a64ba902cf30806ecf3c2e228d87b0704e4307e84f749cbdcc2e65dfc25";
+  sha512.doc = "659005e159bde62357356f2910a5775f9c48cd181f7569cd4e253897f856c0b5ed8a45c54ce43beb38d0931064bf8eea3d480d16e3a6867f6361e01baa162289";
   hasRunfiles = true;
   version = "0.1c";
 };
 "bidipagegrid" = {
   stripPrefix = 0;
-  sha512.run = "aacecd2e587be7d6c47c1ecfde4360f0816d56deab719363f8b903dedad535f2c3ceee5d030114838a1edc84af5cdb98b49d3cf71827ff6b3246323e5f4aad9b";
-  sha512.doc = "be14f43a922f118137642da2b144a026c822c11f0d15b5f0a93d1666b6ac4a5685206a2c68cdd4ca146d89cb4ec8f8d91785193034bc3e11c7d2736ced69679c";
+  sha512.run = "bc43b526dd9809e8bd9300638105d051f55428e1313d4cab0bd236a158fbbdf94004baa597b5d135e5bb3f300b42da55274bd51343c267d5ffbc05d163b93260";
+  sha512.doc = "988704e83e9537996e96d97d640d3afcb6645c61d8edf25dcfbe297493ac3c651ca02e1c3b82415cac61a9512dd357bc62f9bddf88a696f8934a28b714bc9da3";
   hasRunfiles = true;
   version = "0.2";
 };
 "bidipresentation" = {
   stripPrefix = 0;
-  sha512.run = "12dbf84e5d1a080859230b5014d2b63c9df712b5f72305fb5d6f77b0d98c9590dd84fdba06de19a1dc7a8612c785e4b86a5ea2e4c2a61689dd64e8cdd6ff6d08";
-  sha512.doc = "8484f8588f558c4788f80169883a4437ab3b2b861a994841b61e762027b96ff1238a50fe0dc34d4d51707f2b3b5dbc99749e8d7e051cf666e7a3c9362865ffef";
+  sha512.run = "39eb4b3c095a8ce36b63f38337a1132ac164cb6d0cc716e6522a35e6da51fdfebbc1b513d6e4480c087b3e938ba5ac1d079ddf8a911cffdba7cf8bff7c5d5058";
+  sha512.doc = "18b240bacd51d420a1d7ce241ce46e876dfb67fbabcef88efab29bded6089aaa17ee24d94e15219fd103eb15cf45f378c115a039af3654d1410b9fd1381064fc";
   hasRunfiles = true;
   version = "0.3";
 };
 "bidishadowtext" = {
   stripPrefix = 0;
-  sha512.run = "6a9fb988a7e0f66b48177063c99d75c4f2803066da5094949acef3c9c2a964b09f8c675babeb22c84956e6996fb6c8965a89d77cd1d724c0bf0e5f2aaf62c9cb";
-  sha512.doc = "e50da9e6c00dcd4993f48104f82e3d12fc20da239c06bc2276cc9feff6697701b70398be5353c41935981627ed61db6149ba0ed97f31434ea11f55ab19e6464e";
+  sha512.run = "6dad31243f3c236eaca6c962cb1fd6049b958a76bc02d88eea4452baba7f28e27a5294fb4a7e88140cb2f9d55939fb853eec283ab05ce53a0049e1407309b20d";
+  sha512.doc = "d74b5b095369ac659a3d51b87a966190d2d0c74d89af475f483c76cdf1af7702245451c496850406b4f52ac0f8d80048cc992e76eac888ff76f0b665bd749232";
   hasRunfiles = true;
   version = "0.1";
 };
 "bigfoot" = {
   stripPrefix = 0;
-  sha512.run = "f2b83d277c9b1b74c80daf5e0f8b63d45febe354912867e0b4b40e7ca996bd24e9136208df33d4c3ef4bca1e1b54b6f5e52c32f54e97591be9516bf6b0808aeb";
-  sha512.doc = "d8b3d858402b64e45772ca0e03ab46c81d22ac230ac4620e4490199d979c840509a7d21f9e3b2fd7a77347122953924be7cb9941dd89b256f48ee4f5b6f5ec8a";
-  sha512.source = "05177f6abf83ed7a378716ed75475b4ee90d7238789bae1db8ea472981735c570269c40c00079e22dfea26d665634aa789aff5a5aa063795561810ec43bd5a5d";
+  sha512.run = "6f3379574fec76402a368d394b695b4496f8c3eafcff8e9fb134afa86c5ee17ab1b14721bccef525b0b2a9ae71841d5befe3c62e5619e7cce897a32adc909997";
+  sha512.doc = "0da20ccbbf7d3d2fb2d34a588fb4e5d751f46aa4b6cbcedf3ee0277d3c962cfbdd3d55868077f059f3d6bd8a9bc293d004c6bb641e24c86a3224b868700decd7";
+  sha512.source = "43164ebcccb3225a97687027acd4abe6d5907ed14979cfb01da60f6c5bbad5c918a4580b50d86018502b0ccfd7a6ef712f82673a97343d4f4ad646dfd59992f0";
   hasRunfiles = true;
   version = "2.1";
 };
 "bigints" = {
   stripPrefix = 0;
-  sha512.run = "5a24d0f90cb60905dc88c80443d8041c39488fc12783f8f7f0de9d7e5523f16ff040e9aa2ea99c13463274e9908f003353f9963e46281e48bb444901ab5e3535";
-  sha512.doc = "f7a223fa044072668c1d435edd8ba00bbfd83afc273bd8446a8067bbeddd34337bbf518c86c6402e7a00233398795073545e83d699a330113aa6e488e93611e3";
+  sha512.run = "fcedbd45015adc18fc5dba5f4b3c7d6be02d3b277253081a8b5d8f2af9cb287625c6b886706a0e7e901e3c7ab1dc35ed2ed7d6540cc13df901120854a21d4f2b";
+  sha512.doc = "6da7694addaeaa7744ffab124e54a42f6f1be6cf4b8b7337e0abc413a405cff5f7f5f5303a6acca062f2c8b363e238bfb8491801343650c640a9417ca6040d78";
   hasRunfiles = true;
 };
 "binarytree" = {
   stripPrefix = 0;
-  sha512.run = "c626e3d0c578caae6ef56bfbdad7610b23a194e876db2fd46741aae7c0f7b025c9b6c7660b0401f599de533745db396fb9c236eea80e6072c9cc135b1892ad62";
-  sha512.doc = "7dc1b687aadb480da3775c25f2347eb225b5cf9234ee256c3c49506f7b209238b6a023e7bb35b6135ea14134203e3b6a27d043c1f761854f46b0ec5862f0e028";
-  sha512.source = "2ed0ff3c988b876d6d09328aa008ffe8a25b14762ef79898dbd23aa925c168b15049deeaf2c6a9271bbdccea4dbcd5d0a2fe6b4209192a9f513a67c63abe100c";
+  sha512.run = "06a640173123242f7290c439d87be8b58322d2d751dc8a1a7e455cfec9875914c4aed55cca65a6e905550f839ff9333bb6b1ae154e0da1669cef7cd0ded3dd3a";
+  sha512.doc = "ccf0403d909291fcc42cd34b6569a45a1e4a6f7acfbf0e4fc65f802cc97419e1ac289184f473f2dc78cb921f7c67ffae378a8f4d3a9c54c1827ef0f9abdcd245";
+  sha512.source = "f3260689083d568c4dbbf93581ffdef02534f886a9678c9cd2f0cbf517ed1db4372506770dd87061f70becc29b64e54aec7af887c4d9a652e9a8e27476185358";
   hasRunfiles = true;
   version = "1.01";
 };
 "binomexp" = {
   stripPrefix = 0;
-  sha512.run = "3ed3b539dfebda21ff4fadab37c896c78f1fda463e944ead4f35a84369806e01b19da86f08f862b4c60dce5d2f30c1c33d811e262c701efb2390ea351d2be098";
-  sha512.doc = "b61c931ac4416312b70740ff53f2c77e56dfad923dd0fd301b0acf4dc1293ed60b45897f6b196ab34f586dc5faa81f52705ba6cc1e35dc0ab94d45f9e82bc4fa";
-  sha512.source = "3413e2e486d96330640ebef8f2923327835851a92bc0133abc2ffca8051fe03027aa1576f26126c8cc477606d46efcb6acf834a330c0e4a14034c521f79502f8";
+  sha512.run = "dd91b4221b00dce41eb0f883887956e5b8247b0606436a47cfebfa586481cb54220eb6576c3c95f27b06dafc15d14f6dda63442c94dd77de190562f42fafd4ab";
+  sha512.doc = "860bc2750a744d9787027c6746ac4b3b8fbc2928cd1731c1ce6bdfff9e8eea89a36fac24d60499097e8f4eac9da3424983c422fe74bbacaab72c990cd4a34864";
+  sha512.source = "d53a978c1a49a00fb1bbd77ed71e9d797c8c92a761c41dcbff1ccee1edd8e2d79b925e40ebdda5be62dfcd7b361f74c2378a1b9b0c84ba07cbc27fdbce970a8b";
   hasRunfiles = true;
   version = "1.0";
 };
 "biochemistry-colors" = {
   stripPrefix = 0;
-  sha512.run = "c4978db03abddbae3085881670f6975d46f682ad9fede22d97e53b4d7c44d3c29e6e26954e4fdc4d6337ff6d93d4ab09ca161b3eaa87b8efed3f8ff055cae479";
-  sha512.doc = "9563b5d512431c2fea46aa08f0929bed7a5284fbd6f5811080f94d2973cdb8b16b5ea71945d582edfcb1857ca0f4557b6497a9c73c84c077b9760747eab4bf87";
+  sha512.run = "46ea846a5bffd16af065b654f7b1342404a95ad71051c28644d8ee756b39e6436e70afcda612503008684bf5a2e5ce5b4add8b86a1cc15f368f72f6cbbf563c4";
+  sha512.doc = "6ed12a37587220c0eac1e595f24602e49dbadf6ff42202ae4a06de5e4f3e53a8ffad4626fe1f69dec6e4d0863927ddb9b809f327e8e8ca64f1d18da70b8824de";
   hasRunfiles = true;
   version = "1.00";
 };
 "biocon" = {
   stripPrefix = 0;
-  sha512.run = "6f7f1b878da287b426bed7ae6d45c891ebec380df56b241b18fcf536dd021d095584bb948b8bd2a72f51a17964d64bc0a34d9c7498366c61c3463de84ee47dec";
-  sha512.doc = "5c21163ff77a4e2f324eb791ea06f5abc44ea29b0f914c50660e0c65b6291dfd1492fc016fb0c0d58c30c7e3c0a5ee1e187a8c3de0dd3e0a1a9e658b5a8b5f40";
+  sha512.run = "b96f8d233c235264fd2c726c4307a54e86aa25e7f07392ba4614fe4823564c873c3a7462ef118996f05bc59d4d21dda122d44073b2cfd0c81932cf9602922344";
+  sha512.doc = "8217d50b396687a60e06664ac1d07ada5fd09b37e535afcf47e9731d68fca957a169a29b5e783f7c0db0ba4703a745be49cb0269811f8003d8a103752b2159d8";
   hasRunfiles = true;
 };
 "biolett-bst" = {
   stripPrefix = 0;
-  sha512.run = "e23f3996924ffc4ba85564212cb0bbc4b0197e22e751295cca064eaf129708e1b69f382639b7c7756c9dc728385f8812f23c7b794e3d1c9dac9e2198aa0e8f9e";
-  sha512.doc = "0e29fecdfc8161504b8884252bd982ce5e492a9fa781279ac38952a4c1b9fe37f998f6e0740ed6a0225efec0e6498dd45fbd2374961ef9a3ac04556a0b9b6771";
+  sha512.run = "84810298f5942897755a78035746f5a724f8938829941730fb5b1e9769af1b44034708d856bc390c697d8860c8a7f64d6faa1fbec643b9eb7d774297657998ed";
+  sha512.doc = "b5607c948ea1985aac37c5c0f48df1a39eda6b756780de3c1aa8813465913d545cb5c3d6bf83cc223a546d8a60c260a10e2c2cc9adba088c972e36043a691163";
   hasRunfiles = true;
 };
 "bitelist" = {
   stripPrefix = 0;
-  sha512.run = "dfd19cf334d41daee07d5861a86e0734aaf19b63fd2d880a14afba36eb1b68fc5d370c05f3378f2514988daf26589758aaafeb418604a6e096d0937c3533317e";
-  sha512.doc = "90731e9ab8e8f6a461d9c9319861e499ca658875c7d486408ab90218d05cc08cf7b0f75ee26feec4236af000569961433d5e1245ac192a482caeae0e1c5a34d2";
-  sha512.source = "b309ea75e366a63de1ca4ca58866cb11a31dc69f31691d8cc14a9549d5f19b29f4b380372781364d6175b754acf6a81be37e60b8a6a7ea82e4a32e56f155133a";
+  sha512.run = "f77b9ea22902c8bf7d93561e0e96fde9c7a0ad1cd9be866b4e473092ebec949d8b7b41bfddc30c7eb4443daba5a23100579497df0028d6819ca8226726053c6f";
+  sha512.doc = "5c16bb3579d9292857f34d9072ece4204c4c41d9bb6a2421cd9db08af01671d986bf52bf12db958f6f56f891324915cc217f67891b5259a72f9656c4a3d9c201";
+  sha512.source = "a2a3c2f243f38ee48e9037ae0594ac72458d3c0114b345c7c020007c30ebe7975b56c475a9be20b6be34514040869736b34e14b4477250044fc848cf57860d49";
   hasRunfiles = true;
   version = "0.1";
 };
 "bitpattern" = {
   stripPrefix = 0;
-  sha512.run = "d45175a43ff40e527e1e4ae48972ebe04477130701c152ba1b4d36f2d5dd8e3315f9f47e832996ab6fead365fc97f5bb6d4ae264d212abf6e7d861658cd65aca";
-  sha512.doc = "0e681c57bbd23995c39b67ddd223dd45638b5e9275e0a1bb7026b4278cf763f49b86d8f4ee7a570b0c8e51d1c84b61510a73e356aa65ef033c7aa9c6f14bad9b";
-  sha512.source = "9e33ac8adde35fee35cfa8db05a348ad3dfec23845096a48c16de15043f8ff826c6b30b34313df763e36a2e48c18f3b98d924dd7c47c8ff514b4a0760b9b1c80";
+  sha512.run = "dfe9b2dc824e7484ae6e8e29a3c061656da3331503eb86abd26e629f239f240370143fe4c628aebb6e9fb4816aa8923534e00c50e1d7946e06c50d29b66d2442";
+  sha512.doc = "cc646093193e407554c4e4ec9f1f395e9a3f0abf66cf61b3e75aca2d320b1766dc9c035467c69386274cd1e95d783be350a735c4071a5b44312c62dd85a526ef";
+  sha512.source = "4d74f388490d1d17ae05d6dc127ec9aa0ba966a278afb3af519a5abfdda7a4858020f56e8bf483da79e236722c7da1d8413050d094fdc1c71c65ad7a22ba9788";
   hasRunfiles = true;
 };
 "bizcard" = {
   stripPrefix = 0;
-  sha512.run = "3bb571be5f5ee0baeefe77cc586e7d029d5d991014e72461ce9d175cc18ee455fb99a897d85cdd87f58f84f8e9737f0cac9e59a4ddd11464606ab01eb7cf254e";
-  sha512.doc = "96e20a84b9ceb4723579f94da9fe860c8fb494fadd25f2bdbf79defe0eda2009dc76b30a203ed92d5b3290d653b9cbfdeb35fef7b01ef73094e3bb6fa95fe327";
-  sha512.source = "7b0fcacf4a8ef353093df245acb2dd4056b7cb1cdd694f9db4139062745091e4d72755647cb6631a6fda100d21c6f87b04100b2ca6abf4cf98f22966e0a692f3";
+  sha512.run = "1a9df235cb4edaecaf031ba31f458e75e0d0c61cd796c9b6d631a709bf02949a29e27e9b61b759acff1cdef17f7111108d07fe8dbad72f211ff3cee0dfc250ea";
+  sha512.doc = "dbeb043a535a0d5783b1e62f6f482da505da91b45e543b3fa426da043f32297e3c42bf0ae706e881e239e31bfffd4be47f2de3590645b9ec72f7762fca6558b2";
+  sha512.source = "d385af65425dd2ab47bf158f164053f265aeb21078aefadb3fc9018a4b81e0057a1f4c923088912da9e07c2a99c0cf1b350a3ccd8a066b215d46a9aa27c3a5da";
   hasRunfiles = true;
   version = "1.1";
 };
 "blacklettert1" = {
   stripPrefix = 0;
-  sha512.run = "aba2350371818c6e5b1fb2d511acb50991a4cdd1bf3747e8eeb262a890199eedf8fb4c8046c4c823caafa44bfefce3e764f61ee001ede09e1ef1844912e894cb";
-  sha512.doc = "549a43590bf75955ece106e5d9a12667a70af8b2f4335db95e67f2cbd3ea339325498b6d23307560332739c430cb4e6ce24138e743c61d5f91144d4d639d2d96";
-  sha512.source = "aafb35977160abecb64c4068727d78a126487bb19e144458c87065de2d3fd6af0086a0f3474e4ca291813fcd2e227de8408c5e176d2f6842889670c7a9537792";
+  sha512.run = "eae5939e605120ad2d68176fab903b8f376a1ae9291ff9922492036ae9c41d7b1f650cebdc459c8475986ced21eb7732d2043fa7f9ac24dc9a4ef830cfb3e65d";
+  sha512.doc = "69247d5fedce954dcff14afdc5b930de14bde713a87f0376a073bb3acd8725d85acf36c8c899c9aeaf78abc42f2a3ef42b3d0851c498d981ecc3323fa53422d6";
+  sha512.source = "757412125e599529a02bdeaa38a3bbc3e9e19a9bd4b0c7a1e3813f88d4f4175ea6a3be8065ae846389eb362f49071df3724b5db07e1828c18b4c71bbbfa6c41e";
   hasRunfiles = true;
 };
 "blindtext" = {
   stripPrefix = 0;
-  sha512.run = "7ac4002efbd300ad4af94a1ee4fd252e8bfddd3bc4dfc300af07c11c6a06ffd49692b2ed5b070bf389b3077bc009e3ef44892fd40080cdba201d91f93c6af2d1";
-  sha512.doc = "e5ff2cc4287f3bd3b2b1b7ce9b726053a1d63efc27058a57b10b53015a519e1ee817e05bad360891a4a37076ae6c171054e02f8f8ef34df378713a57da84259b";
-  sha512.source = "86afc4e168683535491f7423980f2c871ac74f559f77ef80bd57e16363f7d5d62a00bdff511410fbba66874b93ad9f00d6660b1e832bcb6b90e271b07582cd23";
+  sha512.run = "8d133571bd5e40c5d96a8c48913a0bf32050e2d32d90d364e1a2092fdceeb988d44171834180c68837ed39343b4a355ffba44a0ec122b63bce033daeac780cb7";
+  sha512.doc = "1366fb4dd654c7717a93085be6199ce4a7e0bdd150ed57d110a1b74bc5ab7beccdd2f4c09c5df7ec184df534f002ae29747b00117d19adec301d88a669e0ff9f";
+  sha512.source = "56cdd1d6dcec00b5c8e4da0e0e8dcd07d897fcc4488b34575621a72886c6d67a6b296cd6b930f52dd9e1e538a4c8019928c77e616d7cab662cf02935fe6cf5af";
   hasRunfiles = true;
   version = "2.0";
 };
 "blkarray" = {
   stripPrefix = 0;
-  sha512.run = "8be5369e9ec61eef7eca59b7ac6666894728dc58df9028d70c71c059563bafed3394094a3d30a3dfbbb47ada0c336aa1c6400aaeef92bdab9d179a3a2bb58e09";
-  sha512.doc = "f393bac78812d13c42417206373aeb2b63e1b13ab81b475372c7b755a204ec033ada049a5cc2314fb162a92fe798869d781edfb14dd09fbb235e5c5731c2615a";
+  sha512.run = "b88ddb87d0ac727345dcff452ed59b135af2187c2b7f800cee676d02eceae6d9eee49cc4627318472b0f64d7999af3dbbcdb0b40a7fd8d4465d6b83fdef3ac23";
+  sha512.doc = "0c7d146117bcd8b9dfbab2f95a6b770bcf56229db48673d6e9fa0faadef395be7a4e4846405107c1103a5887bd10a5f74478ab0502df546f9d470044d85edb00";
   hasRunfiles = true;
   version = "0.07";
 };
 "blochsphere" = {
   stripPrefix = 0;
-  sha512.run = "f0cc6562c1f624e9b913314175bf33bc8685ac1fef6287e69c2e123db5a961c0552a618201ebdd2337227693c6e600d9c9e103d837d2cedadb2d6f306812e7f9";
-  sha512.doc = "5b5aa65cbc2464660996944fb398c981a4d78432f684736497e7228f5497e577040b3b19588e33a6534bab8681d05a7c510c2cd86790b2b99d759b488febf7f7";
-  sha512.source = "f2ef76df83c058fa8736fa5cc1ce64882a0840f24707e00eacde62dcc8667ecc1a2a15afc4ccd5fa483802c67a7b7e360c59fc7ec5e92d13bcccfc601f57ed67";
+  sha512.run = "69f18db1f2fbec11c87971ba63e95df2f8b7cab3d5096004cecf4efdd4d0ba4b91d3e8d75107dd50cae893ae8bca4f91506dd76a12d7e81b86d1e1064a92c5d6";
+  sha512.doc = "b301b5e9df5749aa3ef0086cbbe083e286f952e16ebba6aa73d39c860a38cdcaba8cb0235691577529fcc0375b71af6e0da2766521d14eea9b710bc1d72fe5ab";
+  sha512.source = "1a4e199fbd60bf9a1a670d3b1571d4668035171d095f5757359a94b2b0ea958c90220bcb59ce97f1af4a20d3ffef26cd3d3de98f92cf7b36be429f07b1a5fb41";
   hasRunfiles = true;
   version = "1.1";
 };
 "block" = {
   stripPrefix = 0;
-  sha512.run = "d86ffa5dc845864c5fc3ebbaf3c68db9a449046164160d5523c3fb6cd76b078a11d8e259a68c4ff391335e3b3fdf2cfcee1fcd05213665d2251adb6c0c521064";
-  sha512.doc = "bc26f22973b00db36d99d8eb37cfc127d5171380f35437594dee8b0578eb1adf82e2883dfcfcc830fc332e376d589794147d93f13b67d58e70e36748972f8404";
+  sha512.run = "eb47e1ba9055879ca9152b51b5448d448dd3ea69b841fa008e7f91152612b9daa19a7c181a531b892bfa6e4021b04c50b13c119334aca328cd6e913e7aff1d92";
+  sha512.doc = "f268e408d6036505c7d3088b47dc810fd9b5132d27f3ccd1e85685120524741eef01b82e9ea7a336d16aefce4b60106b348dba1ab82f93ec0fcfec52248c2e9d";
   hasRunfiles = true;
 };
 "blockdraw_mp" = {
   stripPrefix = 0;
-  sha512.run = "10cfca67a51955eca04e0fb1eb3cbf87462a09d483bdea9fe9c96241825f4d6b8f4de3adc41a8ba035d8e3d0397e2db6202a1cd84b9997ee6c87b4a2698fedfa";
-  sha512.doc = "6c5d5bbe8a10b8a9528e4344839b6674571fa6af2e2a5caf4cf07f5403d3155ce1c6112961f768ed87112df8bff81ad35cdc4def2fa688869b45158818acf910";
+  sha512.run = "f83fe3c927384d16de17a8b20449cea64fa9666b28e7dc2a69c5aa41c87f8f2dd63f719d26b9e43d603761337d249b308ca25c0ea86e843a0ce83a3dc8c80b81";
+  sha512.doc = "983c70a0a475631db0f69903f10a722702e20600cbf8702a3a12a5a1da428edbbfbb0b8122e286498988c9b1fbb3cd9683ab65d8d837abedb2383cb74baf15f8";
   hasRunfiles = true;
 };
 "bloques" = {
   stripPrefix = 0;
-  sha512.run = "5b7de6a548a28f4bdb4036f7528f3236e0c5d8179a9554407da931712cd135132218e8915d279b89f04bccb811da0039b4f5aa7a40eabca26e738a47613bd963";
-  sha512.doc = "4a43ff693d0185e1b15105c5b8629fd19bcbe72afebbc0607d359dcce75c7f46cd0e373be34d09ca319015c8d651cce43c1d345c4b80906b61612e6162d36023";
+  sha512.run = "1b8c0076629f8fce9fe6ac6e15a78010fc11fedad2ac26b7eb0b3c5d01616bb2e6aec95a2ea831e5fd3850f903b492677efb1fc49948c9cc59d2f57e888de468";
+  sha512.doc = "e263fd70740512d6c88c53fd148dc87367268d80831fa54c73eb5a352dd7d070877829ef831216e4f3f06aff27c2854211ac7379bb2f4fa813091e4ed36462c3";
   hasRunfiles = true;
   version = "1.0";
 };
 "blowup" = {
   stripPrefix = 0;
-  sha512.run = "ab2453225dac9b7f99f86f1dbdd30b58dbe5844b6a5ddd46d5dcc1c857caeb585c2d44c296a8999bfbc9adef0042740b578793ba6efd97e79d89cd8518ea2015";
-  sha512.doc = "7d76b3153f33e5876c813388703f18b517bb2f5f98110b20750932b294d90a00a7ef51e98382706bc7af000082ab1934497755900bf26d2fc6004f2d4171c436";
-  sha512.source = "5f99cd822b03ac509f0157a596a9705a8f9393f95a98fefbeced35dbb93c464396b9e1454242464ea678adac96fa9d6f453521eceb6bcbb1166a9a20a7202688";
+  sha512.run = "9f59d51b44b26317723a1353c96de944c51adcb1b12efb7b75cd1ae440f948af0b2669cd58a5caba48c50c6e9809db5ce410725cf6730d642b91ac7b65691cf3";
+  sha512.doc = "4aaff86ccaaae84e8d1a5bf7a2ce47648c10da0a9fcb8a0298cf90cd69cd734180381733a7666c0c869693264881f973e3a372776f7c15ca3460e60067ad593d";
+  sha512.source = "f2fd35108597789dbed188e92238d9511e379f4163052b0b4955c2220ed7faac231e632330cfe330186dd93abfc008998879abc1516d211adc11057357064f80";
   hasRunfiles = true;
   version = "1.0";
 };
 "blox" = {
   stripPrefix = 0;
-  sha512.run = "6c303979e8da74524dc080fa2463c0ad0aa06d8561812cf65b54a4411dd2b6093a1122efc0b259a8ef010cbc144da02ef5cb2fdabfe0d58ddddec3533b5a51ad";
-  sha512.doc = "c66ac9ee5568483a1fad4507a79a5713196dfd69bd5102d845ef0fec8cb2b9183e29531177c0f0113c7967ec0d2939b58f695c3a38aff4a4b43dfa8eccdb0277";
-  sha512.source = "878bf5a58ba1a68b8e148ea11ed0517207ef0682475a23c642786586052e4701f6abfdc5b71acde4cdc9b52663a814bd88ffc08b118edb41289a0f245ba50355";
+  sha512.run = "be8e4e834d6f671807320c20d1bad5ef2eda0042b6636f2091414a315d363851f330899da440854c9b0898d19ff561276ca4125c3eb09d1732ff46e7b29971dd";
+  sha512.doc = "a13fe8d143f9f9420c471265b2d98f1498f6a01f6c692a895c5f6fda5f6647ce90f4047356c8c1c33e90645bacdc698bc0ca0e83e00c926ead4a57de140d0196";
+  sha512.source = "0a2c5d8758bb19291c36d981853e3e042c40c60cda06cc0324c885e822bded2af2c9cd694ca863d650238a4033e0da008d462ab8939ff5242e8415147585d2a7";
   hasRunfiles = true;
   version = "2.5";
 };
 "bnumexpr" = {
   stripPrefix = 0;
-  sha512.run = "49c61eeca026097fb0dde475469a2c87c1b42d14a5fdaa82796186cc2ecfd1a71b95382b876b1bb622b239d53fac2dba685cf0ecd5bf948aa4cd64a2132890b0";
-  sha512.doc = "f083fd0ad9ff42312bd40b56041bf5cad017b5baf83b5a8f8157eba69acdc28102b5e0f8ee733d5a2e49691ada808464a83976bdac2ed4b28808aa1775f2ea5d";
-  sha512.source = "3777a6e0b96ea1f0473a7fc25bd1e2d4f08a0d68de14672b79c98dc7fdcaf7cce5b721962ab71275b2dbcff2b31d8245ea80056286b3325e988a8b6b5a843e7e";
+  sha512.run = "9d75e9fef3b609e98b48c40b9faf82a8fad1174bc1427e07df1367b7bffd6c8e1f7664d17ca13e9401b9361d24ca37c176ed3f5443db20dcb42fd8486cfa8558";
+  sha512.doc = "f24ce69026ecd99df1a066876ea02868a04795a90bccc2a7f765914b4d3665dfc4aeb0edcdad462759c471f650123ba479b367ec31ea8545eec2112d332d3d33";
+  sha512.source = "2d1b2854ae654f0a4a19067dfe27c4880a96f089007f5677009dfb7daeeb84baa5d7e9b35b35c0415e85f5451a992102415fa104f30ac92a56772183ad9ca33b";
   hasRunfiles = true;
   version = "1.2c";
 };
 "bodegraph" = {
   stripPrefix = 0;
-  sha512.run = "a91f407d7c59a03e1c24e007427fd1858244632ec743f0735fb834bda694546335e516bee2d6b18d40c6bcc3ad45b7e2ca8580f6212fb9c64de02a49cf653e1c";
-  sha512.doc = "6f6f14f0dd21d7e6c5537108ceff844b1e070b80a46c1df04752e310abf4171337e779a70469c0916fa634a232498dfa50b218762f0087628e261010ecd8fcbf";
+  sha512.run = "f06e03ce69b8caa421e4d84b4ec712436ecf554a6ccbff132e94675efb4a927694644c93110692cdf9221ad64cd59fa5dd2fe934e47cf690a6b6603dc7fff624";
+  sha512.doc = "8fa822336fbb0f409d89283f156ed9a4df20a6b77f8b71c87e216cc71dc0103cf4a683893806ed480576b6282d224ff1d3a3b47927d080c664b7dc4cf8ac49f4";
   hasRunfiles = true;
   version = "1.4";
 };
 "bohr" = {
   stripPrefix = 0;
-  sha512.run = "af525a9fae4dac4ffe21fb465ad7c186793f3b40dae60939f96d315cab30907fce46b0d0a82368849eff43cc99afb3478caf19e77385263ba1c29f78fb223735";
-  sha512.doc = "b3ccd6677b414fbd4597f5b85d97958ef82819a7d85e3971193ccb16edf069dffb251c1e3ba5dc0c634793406b25d05615dcd03261838cc7cce81cba12016377";
+  sha512.run = "a0b7322029461f45ea7d2220611a4bb7ced2d9c6a31e69d4790c531dbc4bb742ba3455a795cb5187af0e81e844d403a86db87506e164f62876f75d9ba15a45fe";
+  sha512.doc = "f1cb87508864e974c1b212e39d3358a759afcd0c339ad242c42a3bdc33ae1864d83927104ef31f125f625643bedd550448d968d9b21e5a98ecd8bb651a531363";
   hasRunfiles = true;
   version = "1.0";
 };
 "boisik" = {
   stripPrefix = 0;
-  sha512.run = "af7947c7d4db425188736da91c41d3b654b99bfaed59c52641d60191eef5be3184fe002bee6e8e9000ecbe832313344bdf8f3b308db1fd610657529bfb98db29";
-  sha512.doc = "c6f64dd6657c6fb36b998a1bd41e91d3b26dc82c27a8e2eed20ac1bcc51dd2ef81d14e582d6b9564b46c836fcc79877b557ee96bcbab9a27cf4db4e107362047";
+  sha512.run = "820826a80fbebdd6a923bf068ccbf9de14e56950a1ae2a2d71bedb443e9a6be44c9c69f250a9b1ea82233748947a416baec9a3437e76211e36f967187334fc91";
+  sha512.doc = "3d3949284bd81a58fea2df5bd051bd10f44d3e252dc9940775f0ef7821647822ba4cf64b9587059c83c542758f6afaaf0b2b645488093d91cad5b760dadf1137";
   hasRunfiles = true;
   version = "0.5";
 };
 "boites" = {
   stripPrefix = 0;
-  sha512.run = "3e01a5c2fac510ec33ddc2fdb9b73e562dae904f73294ca0527a9585cb95010d5d22301104591b0a09e2e8b5fcf0f5440f80da9899b7e2d886df2cd177c3f473";
-  sha512.doc = "8dff9ceac1e6172e788a77e801b98e2ff28a43bed41d1d7481e214cae11e9ceabc036e92bd6dc294e188458fcba73beca294618b40ce3dfbcbac893b7392aaf5";
-  sha512.source = "631b96af749cfeb1bf59dca60a6501f6ec74d7af350e1b98fc43cc42d1bdeb3019cca99c2245d526aa879ba8367701cfd4a61ab8050b4357e2591f6a0e8ec870";
+  sha512.run = "301568d1947aa8a26f1dfe3f0ad6338b67293ae24a7981a05e1c3f8f9d5e4976dbe3ea3d52028e511d7bbb94ddaa0eec01750c437ef6de638f950d4eb3b15840";
+  sha512.doc = "06163c8cb5bd35077a5f6f6300f37e5cffc259456ba9ff9d261d5726c90808960c7ff4171b6f2a25c5e47eef2f48c32ea8b6239a799b3f99b0e5e8051bb48dcf";
+  sha512.source = "42cde7d870e93cb3ea5202ca3109a5a9936b336df236906b4a0a8acc0f27a2f9779300a4c96e60226ec40bdabbd50e4679c21bb8609d142d1d4d11718069e067";
   hasRunfiles = true;
   version = "1.1";
 };
 "bold-extra" = {
   stripPrefix = 0;
-  sha512.run = "95b096234ee2806dbb9bd159d861638b84c50f90badba09d07a1e0ffa2a6c10283f8adfedcd11c3271e6dacaabf17b7bb3992680280b2f0bcb4bdd622b9eb482";
-  sha512.doc = "dd37f245e87583005116c05e497207d994d9bc78157936d85407b85d03381967fc5283b14bd6514892568ca10c20bb43213ff0dc74529650cac50410b971dd66";
+  sha512.run = "036ac67fc6d8c08de5497f5a8bd27ed0f7193f4cd44641971ffb3f2ead365f7d511b7c56f1a29684f3c7fe56ce4b896ae10e2d5ef350f85ddd18b77091996bc5";
+  sha512.doc = "061bdd07950ad574dc4a39869de858d2cc3d7f7688055949cd7b277b944d3cd574cfdd20e302001a8255afdbabb7421f67a1648ff03f4dcaa36717aa67ff1998";
   hasRunfiles = true;
   version = "0.1";
 };
 "boldtensors" = {
   stripPrefix = 0;
-  sha512.run = "e8bff29a8c64d0b219335e91e63b1b149e9f39716ea390d36bf519263d90b237755e045a7b203487da8d5810c5e2cb30217a52cb9aad4202189de3c1d6dfde64";
-  sha512.doc = "cb8f72805978557d2ec661af51754cca369fc9f9a02e8c97dbf0ef55592dd0c5a1080754609a3da297053ca4c4c17e44e12925ac170fd9e27387306b97c64f37";
+  sha512.run = "5d2ed2f5506b1eee8d5f1ab89174fca5c2a54ba6542f016bb87dc1e28b18d28decd438f1439ab9f5b10ba224b00361dcca3980dee91da6f6eba97cf5fc3a3129";
+  sha512.doc = "9f47664d1198fe7d9c20f16db8178fc116200c3c2d38f27d6d3db6e25dda857c135adcfdf67b163fcd57801e462bb84d8ed287141aef3fad649630a14a060513";
   hasRunfiles = true;
 };
 "bondgraph" = {
   stripPrefix = 0;
-  sha512.run = "98eafbccecc63d159747f4b2bb282b7ac16cf7ca1802f1e2f11227e66c2da170461a726a858dc8ad500c32a5b1afd0421a8068d9aa81722c892a570bcfd2ad37";
-  sha512.doc = "f8671e1178f7fc7668b5608e8e123059b4cef2c20a73165d69e8b113ec09f9ab7cdfeed2c11030ea3b1ce2c39bd56f11eea5e04f475dbc83e812f5f7aaa7db1a";
+  sha512.run = "97c6080e10efda61f9971fa6ee11b24f0d0e35b4e90b6fc5c3c67735cef15f071aee4803f795d0c69ea91ed8aee8c64bf3342e16b65f8e067c98dcac3b33e0cf";
+  sha512.doc = "bfc1633cb082d9d6545ffc9a3bfd6395719f96d41a7ae932763120c5990eeb8fdef91ebbf4a65b480d1abf4f018ee183f432a8518d564723305a52351e9526bf";
   hasRunfiles = true;
   version = "1.0";
 };
 "bondgraphs" = {
   stripPrefix = 0;
-  sha512.run = "8a88e42389a2c5c2df4d7cd0a2a5a69c687835696b522db9321f1dd0b3cb41311000bf941e4eb58d6120b7b345ba5c71cbb8bb893669ceb978cdc82928222089";
-  sha512.doc = "ecf02c1ebcc9d1578f961d51aad4d0d5588ab43542b20ac3280a94ae1e45b4e42fcfed4a8151834bfe39e466803ab588de37c463a5aeb92df1d879f5aadf29f4";
-  sha512.source = "fc70762ea417bd5dc7e435ec3f90fa248ec101f6efa4483bbc10c26c93fd2a3eca7cfaa56aa1f5f58ea4627e00c06b114a3bfada9f884627f6c81479ca8f045c";
+  sha512.run = "d69c003e8f8922cb5e8dfab4dac36c26347e1d16a901d3aac6a8d4b4e0419b45dadc9a8605381b31919696143ab5f7ff200875b7fb2ef47ea49427d4c39320d6";
+  sha512.doc = "13613bc1080b76835c871f85140a8297ff21a055da0abcee989da74287594a301905b4fd7c057b6e9db740f9555e4c1ac6dc8a62538b996fb5025020f6ab259e";
+  sha512.source = "c8cc44bf5993f566de6552dead6e8b24b675460b0e896028af9eddee82962b7200823949035c6a0e8cf00682ef094ff21862f28b62f4537e9fd04d9bd0d69d8b";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "bookcover" = {
   stripPrefix = 0;
-  sha512.run = "935d73587207233319267205d243cef3e951ac5d5031e866ccdb195a0e7b16d6d7726d11e3c896c16c0e434c224d6d8bf54855e06b1f08320c0599e2528202c5";
-  sha512.doc = "5d623dfa257bf72c1a9b701631ff0d0f5b2ad330baecd8eb4e4420a27a136cf3a99812f983bae4e8b0032ab0c4bf5b58a05cdceff530eda974f8764d503c8a83";
-  sha512.source = "2edbf83dc88a13fc6b50fd24125c2e5f19568089ed6d5e3892d48b83e9595ec08ef1515a0feb503079c600686809f0882a8cf9ee07d29f5a5cab418879d3ac62";
+  sha512.run = "c288f784aa6d48e78e09a18f686e41e4cca0fe831150c18cb715b65ad19809461f61d5096f7864d3915190699f519a2629f24bc0a8d5fe3b81bf07602bd551df";
+  sha512.doc = "045781793fa91a3fea8e50866934b337748c8fb5568bcd6ef6e9b080ad7705a7999e54f8f4061dc1537edc76104776374bf29655439a15fb659807a819b47cb3";
+  sha512.source = "a3553c147e7f4d7090a9c380486aaa1b3846d3a935c49f2ead7f631af01f555cd7907be392e5dd7b4219714a040136d992554c31e03ea703687180495b947caf";
   hasRunfiles = true;
   version = "2.3";
 };
 "bookdb" = {
   stripPrefix = 0;
-  sha512.run = "b205c38322a12f5f3bdb2ac6fd2c5e765bc2342f0aef06e9bd16a181f2afb88389c5d363bd576861948e3f9803a94edead7429588682b6b0874d3ad7c662d6d3";
-  sha512.doc = "b8e57e46aa6d65320b73d461a04e8198520436d7aa59e8643628a0842b072e5bb05bd3eed93936bc7cbbaaaec001beb965f0d9f51cac1c2f2ad4e1b0dd51af17";
+  sha512.run = "2df4b6b90cacbf252c7b19b42e3ca53d339053bb5ddd090c41c3720e604765416cfe88684f77129164ca2191e7dc13fd5e8b07f2be2d4a818ffb2c10e0eea186";
+  sha512.doc = "3b9efda314fa451974d6da841e039175191d6fc8fd39b95a51d2e23e6afffd7826684e90444d4128cf11de802a45de79bc90281adef81c45cd8cf530ccf1c08c";
   hasRunfiles = true;
   version = "0.2";
 };
 "bookest" = {
   stripPrefix = 0;
-  sha512.run = "9aaced0fe9adbdfc5a801af637d6a4c02a603663ae70175ea5076e87dfaaae9195a4b44112a89faa87b553f6d54dabae53e915d9e60a86790c276d2c98fa9822";
-  sha512.doc = "aa8e1260252723ddf0a807a8e1d5843167986e1960a1290c43deacc1efcd0005997fd7296d0cefa3080b305dfc25b38f7e04a1a7c4a47fd3bfbc94b2b8acc49e";
+  sha512.run = "4fe12dd9f6dec02b5a885404910a9c8f610ec3a68bd71ee8dec2eab65e6cabe2cb8ae8c470662763c559fb566f6c34242b68744338f1b7460cc0b8057b8d8bb1";
+  sha512.doc = "7007e36a1f9bc9abfa96bdb56ae669b0518ff8bf9749b1c9fafe100815fb863843dbf965f3e0041b222c7d76cfddd78def29f6f0bb5b42a4392d530770dc2910";
   hasRunfiles = true;
   version = "1.1";
 };
 "bookhands" = {
   stripPrefix = 0;
-  sha512.run = "9ec6fffb9e052ca7f10b0d99a635b4b2a2ca63659d11f3960014853203f9501d7552fb70fdb14316f5d5fa240546b2241a6700418d2bf999f3ce9db74196c1de";
-  sha512.doc = "39e95101a929736a8cb1cd45a9171d268f6acc635fcc42777b8a7310a45aaab4aa332aa8961ec77cb739e0d62005c808b828bacec2dd9da926b2f0dac68b9d34";
-  sha512.source = "8d1d2337f4a75fef12c49ba121f1337f03e4d08a48f0ec8cecb160108e5acc168ea5a33ade7df075d0b4f9cf517bc4afb26ebb100e611ba07d7028d1c9093cd9";
+  sha512.run = "8baeca1a73b00888b5978f4e4fd309e5b3d812049046ae2a35b0c31e5e4f4781c199ad7564f715f86702875ceaa8fec5f458328c41e7c7bc4271644ed7743629";
+  sha512.doc = "ef5466279149001d0fd57f545b57a21df8fef5e8cbbfbcd8477d528acf6ce1f2e00dcdd206084781bd1fc04df20783d87d212ef4c13396e9e05e4b2c9c8cf95c";
+  sha512.source = "6af2a7df10e971e457a439698607e5b783313d7618728877b94bffaaaf72bb2ace30820d761c73e4a12a82bb908787c87e9a307e7209f27c0c278381d570310f";
   hasRunfiles = true;
 };
 "booklet" = {
   stripPrefix = 0;
-  sha512.run = "90e1bb5b4c4c61dc82c96ba447b31363191f4001df620add99f1a9c94e8e902be53b7016315f06e43c5a51cd47b2556301a962013442bfff48b312dc5537ef64";
-  sha512.doc = "4b216d5a2b31d86306349c79bea67a7a281684f466555b34ad8d08b908ae2717325530368235471e531da73af2fdf3798c42a3e53d029d3f2afd07aa78834486";
-  sha512.source = "53cbb9da67b0a1bd77c41bbb8d6a06cd9d30780bc5401f8da67b8e44f0225ae347661883be9484f611e43261e32c1b25a61664d0c091c37392f4a87b71e34cd9";
+  sha512.run = "1474bb0f1490bf318199bde08bfc1ecdf5d387cb7920f8c01acf1aa1436196a48dfa7b401ae64d578656d26558c0f72fa9b0aa8750887a1f7305c7d21047fe95";
+  sha512.doc = "822ec90ee38981a9cb395076e86acfe57c3d60fe50b73a21c493dec431ade8e8bbba0a1c87feffd38cd1d63fbc401ff5a801e701caa494ae7dc8f105932eb33d";
+  sha512.source = "ad3b4e387a0fe7dae070b26ad168689e6144c53be542863e3deb3d7cab41af876ad774daaee1e6f0216166531d392764c17860c07859b065be45a2de311c3b74";
   hasRunfiles = true;
   version = "0.7b";
 };
 "bookman" = {
   stripPrefix = 0;
-  sha512.run = "c246f1e1bdf18f339ff1828b4df33f534baa92b24363116d483567c3baf299a4a5b3a7d69d2247a006823d4b9f2aa2c38bde62aefebdc02a8156021f3839c49b";
+  sha512.run = "6ee174d542e84dfb6170f2f2cdad576e99607d9c47af83fba364b2ddd14e5f6e3fae9ee94d1362f3d82b95dbe5e04870a68dafc24a716162b74cc56b6554a3ba";
   hasRunfiles = true;
 };
 "booktabs" = {
   stripPrefix = 0;
-  sha512.run = "a0ca774f630aa261b1121c074d57946ec19756c5e3712694c601a2763612c267050cb21ca9808c8dfd75fe96dc41bc2c2bf411b24544c40d5be752e9768fd619";
-  sha512.doc = "4196c4095ea861fe6590365419b3ae41d0b341cc259b4dca4ec178090c297ec3641dd8b2a33f33e062b1dd614bafea535149157e6189ec1471d3f658f54e1e2b";
-  sha512.source = "0b5baffc3cb57beed3ad5172a2926d7ce46eee42e44b73a44815d4e1d99e77aece78d7ed887aea8aae6df70622df401fc5ccf296a764586262fcaa837e3b601e";
+  sha512.run = "259d96d8efd2fe7e9e7db6ba71010b0709302b5ea83a844f44eeef463439eb46d6f6b06354f906038eb0d04381a8a5c161341146c5d5a6b73df30dcd8594a8ad";
+  sha512.doc = "9ac97bfbae35041321cb41023b35367efe0c60a23b08e487aa7f21b4f10c68fd293e15793fcfea6ab6cff624fdf1354ae33bfe570a14001ae6dc9cdc9a8fc069";
+  sha512.source = "562f7be422a28e84f1f259ec81a538674e7389593319dcb5f7a14e93731c42c04009a3d9d291e4f8e1fc113cdbea544026768e8254f2058d4fa0d48fccaaf257";
   hasRunfiles = true;
   version = "1.618033";
 };
 "booktabs-de" = {
   stripPrefix = 0;
-  sha512.run = "35fd90ae310c5abb9f87894c2bb668d04bb50f977fe5a428b1a230c3fea6a16248fa8bfce67601d41013b567b0a70d36d560d09f63b69c769d6128fa07125369";
-  sha512.doc = "a19f33a9287d706a7e44286ed97ca276357bc81dff3b6187720879f59ef8c704c95b73f066aeba9e410398432d2ef3da3cc8a719ba1dc896cdaec5745a210f08";
+  sha512.run = "eecd6f54649aa46f956695d2bc906e309b13db89f44249bca26e4d6252f0f161acedf264db18fda36318def659d3cfc8779cfdb7eb32ce49e7a9ccccc04e73f0";
+  sha512.doc = "5d8b446413e2776e40aba62f44c0e21b9c151c9f7038ed582b8eb98e08386a4f88e125fa8586ba6de1662aa2e207eea95e5fb496761c980cdc936a199220041a";
   version = "1.61803";
 };
 "booktabs-fr" = {
   stripPrefix = 0;
-  sha512.run = "bb502c6ffe69c3dd88c5df3d2e2f45f408a1ffcbd09232df5a7209feeb10f076d6f18bea6086180804a64a26e0a82c60060a5efaad134a25a35dd0084cda4356";
-  sha512.doc = "1e2607f9004de6e0ab765dd07312a98a6d72dae93ee5c3463bc5119e36ac8b564c3a23258eef82bcc9cc014224720f4cb1c0863b4cf275e7fe9095caac2915f0";
+  sha512.run = "11745f5b2af0a9acb3af99fa5393769283a9ddc61b6c8a183acae69f11a8b9232b85d7c139ff6b2fd1036237321afc0177006644f0189fcb0cc94e41f7c08d97";
+  sha512.doc = "03a399171eed37c1107220298c37cafd9188770b848b154e61cf64478fb6e4490be16891230959f6b39e84754fed7f83fe8666c73f63b7ed7909f0297b96c0a8";
   version = "1.00";
 };
 "boolexpr" = {
   stripPrefix = 0;
-  sha512.run = "95c7031c4fa7de3f9d22accb11b5ac5e5b424e51f2e6ccbc7e49afb1e15d4ed30dd9c549b026da4132de761b46730b391c044498aa83011b5fcd028e50896743";
-  sha512.doc = "ff319c71433a55b2ba67da8d1ae17a08445c893c21dd2de87fc7fe239a0d047914f518daa0e5b0fbc05fc0469cc6787aafb8d4c37262f5908a7ad53fe0fb4fd6";
-  sha512.source = "175279cd3c6d69a6605c7df2ecf05c82816f8cfdfef45fb7d82b4a36326240a700b6f36093ec5fad526b63406eed5687bee4dc7b4662380fca1ec129f12d13fd";
+  sha512.run = "42c9f48b3a156d6bb2ae54fe307f86cab9d1fafcdb0a4024de1b46f20615e2a49693f40dfcf8a469a26e7d118938ca34019cf19254671cd5915c466319ef42b7";
+  sha512.doc = "efe973b28cb4cc269267ae8750fdef043980984100e8e1011afa8867ca4399531b267dcbaa9cbb41f1bf10432185c3643aa05b314f5851d4d8056af0f5029087";
+  sha512.source = "85291a1210a1265d1b6585919fcd48ab5a7f45e6a3f65548f2325ce87cdf5af911f7bad48675d3876067436f4ada11fcee0a0a7d1b9ee470f1e26ad2931bd5a6";
   hasRunfiles = true;
   version = "3.14";
 };
 "boondox" = {
   stripPrefix = 0;
-  sha512.run = "f926883df8d882a5fa5b10bc391ea5aa23a4ef234c195c7ca1b2eb496dc706c8ce69dd6db94e49a78e62646a18d8985af097291bae90e372a7f260cba5b186c3";
-  sha512.doc = "0e2acdbf394fed52d8ef49f6110b6cc169ec681a68dd41f0be4d0040462c332a67872ea4c82d79467a8ca4a3693da585451a5f3fcd7d88f174f229c65be85b22";
+  sha512.run = "82e1808c700d160650caa70233cc1429a09cbda88ee184051879be2f4abb19c3f50d6dc25adf25f0e25fb22880e66e4ff745f9b972680d95b22be0bd2c3012ca";
+  sha512.doc = "3edde6871d612b1dbe162e8852457e6ae1898f973b5a82048478f9d33cef8b374fd0e6d2c841f4dae06d6af5470d5f287ee22e8439f3aee6d51442d379608fc9";
   hasRunfiles = true;
   version = "1.02d";
 };
 "bophook" = {
   stripPrefix = 0;
-  sha512.run = "8d2a8620989df5acb8855b92d58c4d3a52d79543d18340c0e99dd02158d41d8f0939f955fd7a0092c9e7a6e1a26caf26c4376b96f63198e1fbb009d11c44359f";
-  sha512.doc = "1effaff0399740a2f248d8d9ba1a253215db9b9f1b5c817df5d11d977bf4370fc5eee87a5369d7a5a4b7b5f54bfb7025a0b7e5023c0dd9e0a5236052f5ae4117";
-  sha512.source = "489c76354414a08639b6f27d8cc1c37c1470a8a868fc4791fea1ee5d1ec12143755051dd11a82cfbaa6c7213fc87ea6860f432ef24d1991487cb010dd64c64e1";
+  sha512.run = "79e1d8345996ae6c69443567b416877e4391c9fa89b2bfeac70a23e7d57be442e23f0a3ebc789e55f9dc2568de764b923f5e9ff21bb6adb78db2f95a183afe58";
+  sha512.doc = "5deb50e1bd70a02e313d059f2f3106e9fdc979151ec1eefdaecfa120f8eae5328b4ed981008e6e8ea14d0fb166a0dafb8b828049b8961e1d7b25e39b23b80ce4";
+  sha512.source = "1d26fe0a14977496257df7020ba2d450111653ec41deed7740f41ede7004057f4150ba947c09cddc1ecb3914680b5c66c4460159e41f07c9858cfcb8953f6f0e";
   hasRunfiles = true;
   version = "0.02";
 };
 "borceux" = {
   stripPrefix = 0;
-  sha512.run = "ed5afd17b30b733f5df1891e9f14fe6310efa0b181f3f1c3230e1caecd7c1f6bfa7bb634b2dff6923615d9a7e4e2c9a5494acfa4c34fb8fdc76163a526f19e13";
-  sha512.doc = "953a43a304ea7e7c67d4d35721db185e166c9b66b528a69cdbf7605797bea6d4f103f7c0ac6ffaee6720f1bcbd6f030578ee509f9c4ab98441682634465872bc";
+  sha512.run = "4d3d2edbc7e80d680272c6069e7fb49fb85227d8f0354b1c1065895f6c5a9686aca87054166c4a2c14e801b00beb0e7ddc98ec50317bf7fc278131a5959641ec";
+  sha512.doc = "8129e4a21449b708df9dac76dd7929bfdd16aafc7381200c6d2baf704e9adab825c128234e3be1556c3f7fc4420e9e8515296a28aca0f71577f617e0c2145789";
   hasRunfiles = true;
 };
 "bosisio" = {
   stripPrefix = 0;
-  sha512.run = "5a30504000e90093ae9c3ada7ed33bebb49840a4bf85698e0ead6313d9821b7c50157b03e845694876fdc619a95229a433f5336b996e665d30ebf7db59dc2750";
-  sha512.doc = "d8de14a53cbbd04328d911589bd7b275e88bcbc5b82ee7a126567d8069620b6ae2e7e5291982f1a4b3957fbdd233bff8a5791c27d0f665b460713437be1358c6";
-  sha512.source = "8c2186d51864ee26c4d2c2325446498b95e282919668e9c4c27bee3ba347ec4ab7d9fe927ab609beb07eaa4bc5d61b612a75bac76f703b65002c95085aa416eb";
+  sha512.run = "3fe6e854ff8f0629e49381ec3e569719f73de510f9e270904aa5f184b58edc951246bf643f2411d72d9a9612d21ff9f26218e4decf97460181024221d5e359ce";
+  sha512.doc = "4ba6dc459e5fc0847e7c63c1a39a47959141eab840fdddc8df8d524f137641016a352d130d451f1c6679bbcae9302c42562e9762f86f7c7ef9e1810c084bfd0a";
+  sha512.source = "33a369dd371ea9f12cb5b6499e2f855a4e013a25492f637e46268890a7553fe66cf48fec18d9e4245dc06869d77003e0b1972f0150241dc2b1ac8a025d698c86";
   hasRunfiles = true;
 };
 "boxedminipage" = {
   stripPrefix = 0;
-  sha512.run = "49f55f72771717c0a718b3d4ebd5b5d625566559e7435197586dd1f9e2bc9763ce7805d15b170bc47dd403ff4d83b017e4136816f1e7949eedd6f4fd467ce92c";
-  sha512.doc = "1df2ed43f4644ef198dfad14d4862cecef63e1796d7cd3697bfeec8eb4e70b91b65130366fec13bfec9faf5e07f235754e2607a0ffd6b4b82e78c8ef77c8db67";
+  sha512.run = "5a997606cea655177c0152c7d030afae83f6ce4e478f9a3d682e490fbda50e5961066764e3ce0916aa5b13607eb853945b07824f1b0a1c119b91aaece4885857";
+  sha512.doc = "3d594706d8805437f5d200ae3ec27f52ee2ebd91c36471728a9b67bb72dcd32b7a9f2be5bda39b1046312e906d6bf92ed49db5059862c4288c33c61651eed5fa";
   hasRunfiles = true;
   version = "2";
 };
 "boxedminipage2e" = {
   stripPrefix = 0;
-  sha512.run = "414418ff09c4c344e3caa0e69df8b69e41dffe9be2c4f7bd0d251a6898f1052bd37ced57f8766a27004a139aa928af63e94ec8daa20594d1e5eb865d2272886a";
-  sha512.doc = "4b803b03401f5dd4570e5d92eff96e7c1ee68fba867ed5a00776df2f373d6b1e9c435e96845e7038fb381281f2902c3f969223a38a2f5c80f2a3cc52a9c85b53";
-  sha512.source = "e7d89271bb5d63966f6d6b95028e7ea38bcbe4b15120733a7f400d229b0f203cce62ca34854156b534e3cbb5fd01716de01f67c3142408229acf142ea5d6c6e0";
+  sha512.run = "7f778cf51b4c93ff7443f1252d5e4ab5b078ca8804b1b674139c68874c7cf1027d8b895990ca931e45d7c4254565a51d6770479ef5104e70d4aa37091d4d38ab";
+  sha512.doc = "14e945324606e3ece2e00daec8dc623f2cd9b90b4f704c2c30b330a98025026d3ce87163540bc067a21fe11d0640f62bf59977adb3b85d59a8cc92ee520f8322";
+  sha512.source = "26e5d6ceaa1592488a447bf961c939b6355f26687b2ace692b63c7bedfddf1f0d26bcf6191be538e20d7b8caec0e9eeb5d6e9024f0e3b46bdc4e3ad1481ab5c6";
   hasRunfiles = true;
   version = "1.0";
 };
 "boxhandler" = {
   stripPrefix = 0;
-  sha512.run = "dbcd37e8dc0535c5328a61da4920566c125606fd15a438a1bbdfdc51e6e8cc303c3e23861d1c9af98a12ab372f4ec099063d207cd06e08a54799a9ac28bbd4a7";
-  sha512.doc = "c8c85249264d6447f0d6e841b97a9c7a733e3488fa507175e8108f09dc146ff9763314a82ce0a1aaaf79637ba09028cb7cdf04ca43e9dcf2a6343764985b986e";
-  sha512.source = "eeaaf451614ab8f16b65dcf195f31f59376a91210e693da6b371fef4547b040e32f420ba9d75162f5e4bdcc50b7d37a5b67ca2bb7c37c4b5019ddca18d6d76e3";
+  sha512.run = "b497f93810a92d5860e26c7ed5955bd2bb3926ffa031f291bcd03e9318cdad510622f33af5acd64d3f719f0b63fa140ae06a633be8d9d335a4f47a86f5448f11";
+  sha512.doc = "19628c73cf5eec9fe1b438353db475d0421a3532f60788523be3349716ef17714f3ea47cf143ce1ce2d657fcadec8707483bddc8b4d23eae1a57885d4a3ea3c9";
+  sha512.source = "7b1c552862ba9934030b182831f3326a975d3fb98b8b52f008147f730d549975b6af8c4729f29c48655099ba2b5f5e05edb3e3c136f689f257c4e25598d370be";
   hasRunfiles = true;
   version = "1.30";
 };
 "bpchem" = {
   stripPrefix = 0;
-  sha512.run = "34150964352909584bb837efcaf96432e6b96e4c3bf4b5f97b654602ac91214cb54d4bf6e691722730b90747048d62ebf7c13330a94cc7b2517424b7206751f7";
-  sha512.doc = "c6dff09e45bcb3be8f1f1a868a4267761716fbb5db8f70c79d5e64af5fbc7371bfe971e4432f6a723ed57dae80e630496f89a5509437ee37dec649849f234836";
-  sha512.source = "2305869632ed9257a19b4feac337e04417ffc48dcc611e8618397334e7572867196d61dea9f4b67fd2d804a03c54a6659626681bc19e4d644d7a7350e2cf9134";
+  sha512.run = "086d746ae3f311e6f62f8f961779a33d2cc8b27d0d16fd495c1109113156825f02c8b797e82085f9f97a04c5f7732ecc3417ccd9454cab9c79222066a1251897";
+  sha512.doc = "ac7de8aa07c0bde7e50044ac3cb4d7a067011ad93107d3867d48e7db53544d0b4f822695cb192924e22cb49c02eb44cdde2f582a8a1f0966fd0e662294ce7859";
+  sha512.source = "f95978cb613ad82cb223d67e609ce813f8ffa6008288bd0a8848d0c65baefdbb111a2bb8ab5cdec4dc27b9f7f78b4013bd4e3133bf4b31f78da4d87153872527";
   hasRunfiles = true;
   version = "1.1";
 };
 "bpolynomial" = {
   stripPrefix = 0;
-  sha512.run = "c532c4d01a16985d52f242e4aeb4c583c81cc852bf4ea300164c998209d12dcc788c87cb4378c83fc2f91d766d4d45e7f26c9eddab9a571ffe30f220bfa7dbd3";
-  sha512.doc = "8a5f6dac5cd6e2c131761892d64625d1ba92315dc6ba9cf18087be138078b35db59bb1ab814debc1199e7a7467477b8eba6a9324dfdf3d3fe0bbd713fb983e12";
+  sha512.run = "a46a74709bf797edebe1bd66388eb36b6f8be404103409f52ee6c153328ed4578689b92913ad2cc5f37b3fbfaa5d18800b3b9a59b012f956fb269e2ceec33445";
+  sha512.doc = "db2a5e35a7877136aef67d9c96367185d80406f78347ba5aec431b6573581cfa7eeaa2a26d8ef7654692ff2d695028f148d937f782fea564b43c01cb9327e20d";
   hasRunfiles = true;
   version = "0.5";
 };
 "br-lex" = {
   stripPrefix = 0;
-  sha512.run = "dc577ee630e6e83cadbc9c8885a869961fff301b0c5f7ad59eb7ab37db8bdda9bc1c187f6a7a272629318afd7aae1ef3cf21505d152f0e55ad73eb1f56af2280";
-  sha512.doc = "d782dff3cd8cdf69542b297e9bca872f664398dcabdf50f1af96ee6495b3927accc2767ec8c24027a83b195b1d16587727a33304333278073386df534cdd2c19";
+  sha512.run = "10f844e6ac92b76fd8dd93bed913f211e0a31874cb6b0265ea4928df1f776762331e1b7db48a74832f5dda6f7e0765e55ae9c4a0b68fefae5a379de6446ff4d1";
+  sha512.doc = "b2ac015f97001b420c0f4f2a2a51586ffaf9c73222ec6e2e6a1fa39efc47d81b3b25c17a3f01ce61d5f90c34c79514b34ffe06f47dbaec178e3723ea16499b78";
   hasRunfiles = true;
 };
 "bracketkey" = {
   stripPrefix = 0;
-  sha512.run = "573cc55f211c76f4823f6b67ba9baff2db81ce33f55e8e1cd17617209e8fbf0fe7d8674e2a7bb57bb69c965005f1426f01cccb58b055276f8ae1402e4356ed27";
-  sha512.doc = "ee276bf7c990cc710c638aed2eafb5f19bc33f355dc496fe4434a81f0d8661f6ba133fe0b50402e905908aec64166213987622890e4247dae301a98e05542198";
+  sha512.run = "dc243add63cb9cdce6206d1dbdfae5827d7755c6172daf97aa34984653a2b0ad56bd7969e5be14f7b73aa6f1aa495716d5f60228a6cae03067fe480ee24a35d8";
+  sha512.doc = "866c9ab1f5e25da9110c4b0130d3fb5a1ffd8c71c9a5f4213e26913709928a96e868ba2325c258f477cb026ad3a30e199e8252ea232281ce1a8e1375b3d30d7f";
   hasRunfiles = true;
   version = "1.0";
 };
 "braids" = {
   stripPrefix = 0;
-  sha512.run = "b14f0e12c7b943221ca656ec34a3d85f63587042f4e34a24efbd371a1ba0544834744c61b8af9003f59e6e16801fd34315bced008b105f23fbc58c8db4999550";
-  sha512.doc = "e6759adbfde0bfb4cbb1e28e2a85a21babdd81b60b86040e17cd705d1cce1f698b790e1049328108d35d010d33ecde254bfaa99e890c96fcfc5778b5205019b7";
-  sha512.source = "e41e3745114759de89ab4d88f138cb208e9426fd04ece69e5d22685ec776fedba3eaa0ae49d02e2bff4dcfeec2916c8caeeb92c9277b0b49db111abae9c87918";
+  sha512.run = "c23d88fcd4306fac93cb445295c04175da9c5cc72c2eef304556bcef50c1d56f81f48bbbbe8482a1141aad77ba3d3ffef1a3b1a58c5f12b995a6ab21b65aa6da";
+  sha512.doc = "2596bd1d87bd581787545b47ea650a47dbee7f5a596f3384be6670ea35410a34b5cbc14b85d5628d3fdc00f30f8e2222de9168c0def369921fc29253b33ba053";
+  sha512.source = "855d0f15d85ff16affa1dba253435f3d68e3d06cd9bff10824ddcdfb2cdbb6b20adabe471626aa93fa4b66b05ba5be7245d5677e2eb8cf0e0d737f6f5f8a8264";
   hasRunfiles = true;
   version = "1.0";
 };
 "braille" = {
   stripPrefix = 0;
-  sha512.run = "b1af5c51a586302c54459b77f455af4c3860e403bbe55d9b6f4bcf87f368aa5b9a9e2634a968a1ab8e243fc440faad47dfe7ca1d7564f51ccede15972f11091b";
-  sha512.doc = "41c66ba46c59d14fd558a9f001a0a7b29a6d99168002de84a98f1269fc116ed4404667d66aaa738cd0d889bff5258845304fa3f1b6690a79f1006a3bcf5e4e6d";
+  sha512.run = "30ef3a9506c6638fee1b8fc091d35fb1b5db0074d41c1dba69a2cc1fc1796945574d062e0fe2abff6bed0fd53b1ecfedc61b0a05b4bda3315d66fc5503fb3e2c";
+  sha512.doc = "d0be13132d06a15bdc73485ff346b6efcbbb6cbb21df22df5edd25dbe3065da5193da7559bb4b3f2af72ca6b16b99b5a5e72491fca6ee6afec4b9bf377b38c49";
   hasRunfiles = true;
 };
 "braket" = {
   stripPrefix = 0;
-  sha512.run = "5d23329dc1897a27c53e6a6cdf4dc7ec96fe8cafbc85ddb87206f2b21771c666ed6d5d5f3f39b57aa071375e98b9bfd87d50266847636a108eb07b5fdf891a4c";
-  sha512.doc = "d6284cc23913e13c94860ab303e142b4bb33f84d09f7ec835b6907c0690e18e28fcea8d7a54cedeacacce31eae00f43d77597159fdd1173609db1d33632dd695";
+  sha512.run = "fd0e8f7df5f3b8168f540e38fdfabe9719a98bd3e2f558460f93de7b64691ea9fc938da5d3f9e9cf5ca37699ebe18dddafffa4b73b6198b8df03899472b40bad";
+  sha512.doc = "dd52f1bf26c9de741b866d12084500313eca18927e5370727dc1ab0de5395ddb87367b100946791e5d7401f86e1c15d89957661f0d0a37bffcd31091bbf9882f";
   hasRunfiles = true;
 };
 "brandeis-dissertation" = {
   stripPrefix = 0;
-  sha512.run = "804cb1938dfd2a54f42800b51d0fb093c178b337a9bde1a7a1540f98f2f6ea905d9061eb75175e5aca03a44e4c57449607e9f6612388bcb3b319a611f1b2754f";
-  sha512.doc = "d99876a6f632dc22a9abbaa8f9ade998444bcbd4c4c7877925e13e618ee56d86f2b75af5795bf13ae0821feaadea328949849e4e48fb18a499196b2cbf2bf933";
-  sha512.source = "382887850b8b74df4246eb89e89d91bc93ba7caa80add35cb8f600a33490f3b9e8fe422821e7f284b38f4005abf8e55145568b469d26f7a28141259cc1fe3a19";
+  sha512.run = "f507b46bd20cfecf9eee6969c3a17082a192e94c1e3fbc440e2daeb4784d4a25ca9da2a2499383be3dae3c83a8217a27511da71436bc1e17a8924d85ba58113c";
+  sha512.doc = "698d305411dd64818899197249776e58f19d2cfcd450f74262fd27c9557165dc47bb5a8c5cd93226635c24c19f1756c7f5ff2a208c7e1797a7a405492bcd1e76";
+  sha512.source = "2b85b563364afee789fbff98994aa89df4e9d1786c3ea2971df289b3acf84dd2fea69279961a4ae35a597f1307837db455406cca5af3baac4307f4b56358b5e7";
   hasRunfiles = true;
   version = "2.0";
 };
 "breakcites" = {
   stripPrefix = 0;
-  sha512.run = "1ca64f95acf81095245c7aca050682985a6f43c9d49c51802492e7456a39bf12275aaa652edd51b0ccd1b05ca7b61d96d3fd3f8d9b68b417d3b2c2b4e0018d3f";
-  sha512.doc = "0c3e4b78df54468b9527fdc13dbb95d0c8db298dffe7a5a6ba5e6f55530f71db92534dd250a2d61984afa47ba4cfb14462e2592929266e27ca9f9365f49280a3";
+  sha512.run = "d3ecda2e42d2afce07cf2a1eecf0bd3c3ca9761f9183d278e4c345d457e6087a7e2ce51c15552cfde78222d22682112b7355d14967de62a0b9d75c1d46cbe785";
+  sha512.doc = "b6502defa2189f7c0a1b82daa495fbbfd5aa054797959d5b29af862465e1efdcfcd0a7fb75c150f5532105fcf2d51005d8c12941f97acf13c1aaf8ec6e233cb2";
   hasRunfiles = true;
 };
 "breakurl" = {
   stripPrefix = 0;
-  sha512.run = "1d31cbb25dd9578cb8756bd99a83bbd0f755316892f95ca115ba2671d66a8beb2c06e6e73389c69bd56acf15e537c3433f705586322c590f7d9792c47e9f6b36";
-  sha512.doc = "9cbc1767426f7ca60a500c4daf5cc9b70f47b14972c3821907a6f965cb7976b731d1e61eaa3aaa617aabbd58e6675b543ef5da791278bea5854e1cb2fa53d590";
-  sha512.source = "342c61300cefc738d8a774bf10446b01b1ac2de10a636d60196998ba42569f460bdf37188b9e815c1c42b2b88941253443a610f39c596bbf75ec90e49a46f914";
+  sha512.run = "ae26028d03fdb1bbbf64db4e12186e67634705e5bc5be7f9c8f030aed92522e213501ee3dd8a441e697076e9000eb8b2466f76874105ccbb22122b40bea9482a";
+  sha512.doc = "8c46c84adccb88619b22d0fcd5c6947d3efd74109d65e29d3841f051f26517e324ff3174488271550c645fb7fee407e1a9d145f22d412bbb12b03c4be3547d88";
+  sha512.source = "b174cd9abf8308cafdabf655de0654211ff8d91af163f31810b92f01e3188e378bd2ba6ec9b5d1f7a1f76ed6b994dae41aa669eaf33e2f46c11116af01e1b126";
   hasRunfiles = true;
   version = "1.40";
 };
 "bredzenie" = {
   stripPrefix = 0;
-  sha512.run = "5502d2f293f5ac6198141f459db7fb4a65e1f5feb956117c381f006259088e4e61e5b0dd9078548408d0ad126d704486c0b84d7f0d0269e781ef125a9f40a4d3";
-  sha512.doc = "476138e8952caf1501d7f82d18e321313be0b8fb26fd45d42f1a7bd81a8aa2e318bc336c1923944e24a4de1f33376fba6cdb10369e52deb0cbe0e12a392a9dd4";
+  sha512.run = "e25d3f8c35e8045850aab75a9309ae1275f4f49fe7076d9cbb29dc1f64eb976df424e6e167d6bf9e028d6f2188c4063862bf330ad83a08f918e951298221e888";
+  sha512.doc = "3755f6877a4d72251e71f5d6443cbdc478bdf00923cd2a8a16d6bfa69979f2ef3b2da2496c3c8286836c23354141667839dd5fbb94937c900395ce783cd5e094";
   hasRunfiles = true;
   version = "1.0";
 };
 "breqn" = {
   stripPrefix = 0;
-  sha512.run = "7455ca46a8cde0889e3c81cf36ea6d07f680b8bd9fddfca57c8a7496942e3d29e6778fb4c0187b16b866ac0dff7602dd74f4a86e073e8fc3d23a56822bb36da9";
-  sha512.doc = "6b29e06c4b3bbe6819d446e6716b0fd016911c8e41e305b385ece10ada3a4d850fcc7928d81a513180e902c2c661f94921223824cac192432ba89c0b4980f3ca";
-  sha512.source = "3eadaf9f916fe120c285345dfe2bdaa5e63b75ba626fa60aa5d172ec77e4e2135b9aa642ee3dade54b09c7cf8317f07ad844080a9d13170d10bc671c00f283d9";
+  sha512.run = "106529a97f8a2a97325e4767433a84ee1390629a5ff745583e85669efdf769d94fb9f10bc70b757f10f602f118ab4c5dc9c625fe8b8a457a41f5ab8fa0fef1ab";
+  sha512.doc = "5d9baaeb4cda05587294e7a61d3aa9c14a9b5be129cbc2f8f7a3dfea4640855db51f02a69a6cc5fc309ec8293c6ab54931ebd000a859f2732762f1cc532102da";
+  sha512.source = "ce9786ac520eef62133f3116a09798932126e1f43b60cdeb4f112bf76ce935032bcfbafe52ae17272878906e1d42c642682dbbccc133836b0cc8bf46f0608756";
   hasRunfiles = true;
   version = "0.98e";
 };
 "bropd" = {
   stripPrefix = 0;
-  sha512.run = "ae61502833589b06678c9386ac393565bef955a3ccdccb7e90173678e53293a93071f8cd761bee39b36c5ddf08f40491c927d87fbff4bdb8514ff7e86f504091";
-  sha512.doc = "7c7913cf46d015770356bf0dcb618f314465ef6e58b846b80d99dd85f70f8020cccfd318e604680bbaea5a8cd17fe784aa889801ea224aa8d02de7b2aa9afb86";
-  sha512.source = "55fc882c5e75e30a12e2b3c3cd98a12667436f1d715761e113701fef8da2caaddc1af1b646b113c2a3de675799c333b1456f03b95e41eee5e25d279c6230630d";
+  sha512.run = "9925762449b2a540d09777b4bdb7795a72190522ea57a9fce534a6ce76dd56bd7a7bb05e73a491c62f32027f59c87bc4e7f435ac82c31db3822a3688a7aecd54";
+  sha512.doc = "e1826f97dc012f345511f0de762bcbe7fd24b4979a46a9d6a728d5001ff9ffc6b2f5657e39505dec8334afdb7028ffa94e9491eff43cb8db9600e8de7533a04f";
+  sha512.source = "55a4e1523e609ad35ab22b90302fc1cea99158421beeb12aeefa0b9855d4a47c6ed43fed8ddb3de21e9fc76b0ed3beeaae32447ea0b2e6d3fecf19e11dd17427";
   hasRunfiles = true;
   version = "1.2";
 };
 "brushscr" = {
   stripPrefix = 0;
-  sha512.run = "19248680203438085603239c2b00f573173a887fe8b9e0ec7acbe0b62d4f950b95e144f789b155ad6f21d5d445e15c2463c55f7edcc5873b6c3c416f21619606";
-  sha512.doc = "c42b4f6664bcfc8dab12c480d5e9c1f514932cbf43b5629ee3f180ebcb430dfb6e02695f77f25b2af72f6d51c14b813c0dca1663b8c4f04d7fd53d8708f7af88";
+  sha512.run = "dd501a4caf2faf8993df2c323253f553cdcf7021152b079f8eaf129488f444356ef1aaa44417470880aa9b7696eb36813f7ed9f2cab674918163d5132d1431eb";
+  sha512.doc = "31c21c588c6f4a26f697f1bb2679d1a3ed2b1b30f1a4a511b0b0e697d0ab92a073a54f0a82f1b7a71b82c0d94af1884bf7f49f8fe8efa3fd1ea3a8300f5f8d2c";
   hasRunfiles = true;
 };
 "bullcntr" = {
   stripPrefix = 0;
-  sha512.run = "800db241bf712236da2d2b0550888a0ec1206ccdf827aa9674e157945c4a54b5f8ffae813b49d60608d1a08e7633980bdf41c7a14aa4aaac01b99bd0d94daacd";
-  sha512.doc = "568ea14f82d687be6968c89356594e08294317e0b7751524f383b160deb4b00ca56030491581a106e4eafe5d230f7c0609dd073224aa1adda4684fd6edda4eef";
-  sha512.source = "d52c7c4516fa8839be5b639c9c9c1aac9503e84793c54f3e019cf326a3b1c2e52b1a4951051afc14708a92a89b3ea067e6f9fc322ec63cc1d191eabdf91c0702";
+  sha512.run = "d549a45edfec127d7163ed5ed6b45479de344725e04459ecfe7ef5a1ab5d775dd6d205d1074421ba327314a7343c9fb1450986a50d1bab8be40a3424bc60f5d9";
+  sha512.doc = "a297b090cf53ffdaf6310a4131ca37a8d329232cff0e2569e6a14fa234c8474fcc1159c0e5f62b20ae79758c00a7876049ed557024a7c494db2396d961104329";
+  sha512.source = "be2ed8d1ab8e9ce8069f644aeb1e1b236433bc7efcd78a4b2e7ded4d9413c1c88c71f105adaca0316c012e3f1b407e2d9a90a627088f15cf2f387dd85dd1c5fb";
   hasRunfiles = true;
   version = "0.04";
 };
 "bundledoc" = {
-  sha512.run = "075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1";
-  sha512.doc = "209545bf66eda13de13275867ce42b860b6e5162c83d9712b08687b589341305e000147bf3dd383dd67f5e27c9705cc25846d65aceea5d8212ff930bdb9def4b";
+  sha512.run = "b4442d06905a9a8cfe20a92f7554eda777671a7de5d071b200aa344da1897f1a8b9c2c09f4026a4645cc9a402876211b8eec4d5f03d2b49b7b68c738fb1aa65e";
+  sha512.doc = "30423a6a3ed30a0223da0aab04c44667d10969db1114d01a36a3779bcc16eaab78ac12f54f9fac131a072a363fd8bd9c02c25ea85ef4be471f59af8f488c91d9";
   hasRunfiles = true;
-  version = "3.2";
+  version = "3.3";
 };
 "burmese" = {
   stripPrefix = 0;
-  sha512.run = "a66c4bd18c1df2344bf946070942327c92140031a8ca3ba25fa8aeefcc8f9629a7d9925430ae7e8f6e67e82d4064ffd681dc208acf58ab0fd799d6e51ae3d507";
-  sha512.doc = "381198082fcdc0f891f82fa5040f8f4a576e119560da531ebeae74848f2eb7230f879edfe7d5b09fc350cf037413b50b66252bf581071ea6c934ea532bca3833";
-  sha512.source = "934cf9575944b51311b898ff6b87983db556847a127a666bea4336921e1d415d764ea96d1c13d60c54771061466e0ae75ae56222e4b8af97a9f31da843ef10fe";
+  sha512.run = "ec6d5597c01c7d62c76390234dddb6ab0ce7771f31ce6de9ad8ef65b747dc6a06b93b07c210c49eb61897b425f85af8ed5c7a3d22b55e7381638d93803534b86";
+  sha512.doc = "62deea37a3da706ef58055c8a3d7a37c78fbe09bb133f3c08d6be7d702425f7a81db6ef904a42edb4084cedafb9a4810eba4d7c737be192aa25028e2704afc53";
+  sha512.source = "6f374addb06a8bea17036d43e270d2897e6a0e9c3d96ca8e4a3cae2bee8d6e1aa672f49b8c75898230a16bccabdc926852016cff11ac3ecfe6489c922e53fef6";
   hasRunfiles = true;
 };
+"businesscard-qrcode" = {
+  stripPrefix = 0;
+  sha512.run = "b8515a3e81041e7c230e7b1781c475e4b1d1feab3e202ec280c423e3655c6ad587689772213adb3dfdca31473461f1e18e670b3cadaa4c0afe6c70527a9bf863";
+  sha512.doc = "9b533194b712e522ea191a78027ef514a68dcbeecba67783c9515ba73842e8c1a3914f422538ebee97dac3c9201cd237a6ee2e6bed248e9a045267c1a72e5fd6";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "bussproofs" = {
   stripPrefix = 0;
-  sha512.run = "ca6033e1d5ca9e914abac1b59df6abb9dc1352e9777a9166b09c3c3797ac8119dd485ec6893f3df20fad94533b140bec7642584cd97a8ab01571c6e12b034c7f";
-  sha512.doc = "70d541598e479b460e93caa5a554e70774a142575648ecbbc6a0d8a596cb5a398068fa58bcbac268626bd54740d42bbd47592b37b2cc6544605126a5b767b68a";
+  sha512.run = "29f3f8d288d886b9631085891fd4b3046d46a5669e3f94d9cf7b05164e92060a9359ed2b96166262b66cb11562b72edd9d7ce4f64f48b410b8685f77dd2d798d";
+  sha512.doc = "226c01995140d95c5fa16a66f212e40ef232e68a85a0748cf279edccb4dd587047fda08125d250f9de04f45091789d8689f46e2c9d500b4de4b477d6834a0d94";
   hasRunfiles = true;
   version = "1.1";
 };
 "bxbase" = {
   stripPrefix = 0;
-  sha512.run = "10e6e9e19140f2a747323ad50e2f722b85e61fa7ca0ac229dd305c765c5d7ecfb0de00afbac2d403b7c4dd18782747b8ad8216772a2011267140a7532f6032ef";
-  sha512.doc = "6b6b85db262c0550582fe281c26f1d175cf0333fa7ee2509b049679beea50946aa302e067e8e022ed385ed18cb43a1be329caadaf18894a46414a6a3b72c4b4e";
+  sha512.run = "3c3ecb38c8f19d83bb0322a5076c6fd92337d918a3e5e0e11fd9e05785389d1d424baeef2656e7c388e4ff0a2f3d7676f2d7f6b72a1428f2e0da5e086b1d167d";
+  sha512.doc = "3abf3c4e02b596151c56611f78a7a0835c04c2b3f90a8ff18dd2d5c39e35519040618b8d100ea9771c165575d9d4901f0a64f2214a840c1755f14eb0b31c40de";
   hasRunfiles = true;
   version = "1.1";
 };
 "bxcalc" = {
   stripPrefix = 0;
-  sha512.run = "1e87b636d4b7f39afed05dfe2c11f29e8f4814047b28e9cf0676a29e72dfa4395cbf2674410725636d38fb6af4998a2b323bb92524d72d3489cced1ba7667fc5";
-  sha512.doc = "120d35808cb43793b37299b077bbd0a967fa76b26dbe2e4593db4e5c0988b8890cd668a694936199f08d569080f6f29845eedfff2d9b061d0d5d395cfbfb85c3";
+  sha512.run = "cb95b6f2ee48e3186c56458e60299b1bbc4665d3db3b08088dfe1be7c952e6705069948c4149ea7730ec64764490a0d16e17ffa17cb7ec11416a951fbdfae4ef";
+  sha512.doc = "cd6735309e8d1fce42aa122556661ddd322e3e7de81b0d908142290c3446ea5392413993f1c0a425006503dd934a1d9c331c8f375116ad42a9c97f0501a74abe";
   hasRunfiles = true;
   version = "1.0a";
 };
 "bxcjkjatype" = {
   stripPrefix = 0;
-  sha512.run = "48ea7175ef115c7dc9f12a720de384871cc27ea99e6228fc26740b53954e160601eb80e94e9b78cfe3fa41eea9047003ee9b5e814ae3ed6e39d3cc340b06535a";
-  sha512.doc = "7b75096f69f2358e149b2958d9fa46498e2a3d409fe8d02c8faa9adee06195c0ae925a2479e4bf5043d6ce29a650860fbe9690614c00e8f948b960adccf31db2";
+  sha512.run = "2804b33c5b260b7c9d5683f5b338cea9e9fe6704b2248b762c8382cb592b8e4ee2205983fbd9ea6c57ddeadb7d3192f177bfbf6c938f3b645228a15613e27259";
+  sha512.doc = "e079410597faaf593adb2d032dbf873ad826c917030e20ea4c332931ac974bb2e0440fea388a56b349eb694142feb0682ea0bcb8850e5b31f8719ff6cf6a4eaa";
   hasRunfiles = true;
   version = "0.3";
 };
 "bxdpx-beamer" = {
   stripPrefix = 0;
-  sha512.run = "d291ce576a7602321fe49a7fd89317ae48bc9f0c39aa92278cea826f02cb995b3033239888c2a46be2e094eea0f07d8ceaad90c9e80fa8967b479a3cb3176866";
-  sha512.doc = "560b50384c234ea621589315a1c29cfe052bf4cec5cadcd95732fdb32d67ce2c83aa5eeb45918000a4bc1965df24e26a631fdf98093e4b87951d07fad1c8ceda";
+  sha512.run = "d1c9ac9f8fd6e74b373fb75b7b2a40f107207cfc6f12fac5ddde7def389acff742123f56ce401b7a32d763eff589aaf88be03df50fe01a75c620c18feb6f23e0";
+  sha512.doc = "dce40e919e6dc261207577186088da809aec40150bb7e75888ab8c5b3ffd4da343dfb4639e22d7e7de7dc1d507d6bea5305f2ae330185dd695bd47abad71fa9c";
   hasRunfiles = true;
   version = "0.3";
 };
 "bxdvidriver" = {
   stripPrefix = 0;
-  sha512.run = "0db90ae690733e84d8ec8f6e80d62b4d83731328d162eaf8e2790a8487b23fea5177a97c8d9daaa93650cbe792f3ab9a89b50ba2b418e09d76828ac3e485a90c";
-  sha512.doc = "810840d41f07abf88ff55742ee2a12d159bf13e946cd2c364917153cae89b3092ff7d8cb5cb36bcb0e87b71d37086976e7f61ea97b4a7bf6177fc312ee3c0664";
+  sha512.run = "48840d20a0a1f316b5693ae0114ac585da6aa9f6f75f28973013f67f90117fc995b0af28f31febb52615556e216566f2a52cebb6862e6ed6f084881db3feffa1";
+  sha512.doc = "77cb30dd6e72f865be3c8b3ea42f29845dc5c1fe67ceb666e7e3dd8f36101bf34015018c93eabb3efe102d1fce998136c3e2bcb4c45427bd0cd9af5fb80ef85d";
   hasRunfiles = true;
   version = "0.2a";
 };
 "bxeepic" = {
   stripPrefix = 0;
-  sha512.run = "cd082031e31ec4036298e93cb3b55cacfdf0761f56b733ea9f22a86cf36dd25f9f19ebf27f9429883b54f610e572b9acd6e71b658bd214f75e0adfc53d668a60";
-  sha512.doc = "9603a8639628344cb08d10858376a0d33f614d32a70129b45e35b1b7a7d614000a1ebed7bc72a7361508992a07205bc0797fada1041ec4806370e268ede040dd";
+  sha512.run = "374e30e22b89ab56fac9e894029d70d5213416e5bec63b62b060758d7a194b44bd50f4c7419aae6de8ed1a57c0b7d2826e9cc9ec2527b7067da2a9af14b3260e";
+  sha512.doc = "d70e01007b6bd7bec634b5e34d52c80aaef8b583ffb61b028446a80fef3a31fcf3f369f164f9447ace2fabc75f3d89d88732b41a57e7a134ceee6157089e12ea";
   hasRunfiles = true;
   version = "0.2";
 };
 "bxenclose" = {
   stripPrefix = 0;
-  sha512.run = "3ac9f54cf7b698699f5b24a8c988ecbc309428175c434400b160c9a8f28d867795361193489be199e0dff2c8852d5f6a3332fb29fcedd79597ce3e1bb9a67632";
-  sha512.doc = "4c49e0601dfb79016cb3305b65d3fb99fd0caed8678932aa3ad2f48f9746a1b5b8ce111d0646d744f2a820b0ab0122508324e1675be5db02f85a3e8f8c275299";
+  sha512.run = "f2d1772829ecf48255a5615884ea287d8f2a8e24eac2e71958d89e0b7e3a16040a0b597eaab48fd07afa0cac98a49c722ddc7d7ac3dd2f594df4749897962b8c";
+  sha512.doc = "7e73cafb5b3e71e855fb8a32506f8ade73861d1d7becd5e902c5ab70f619269e0b5ece576320b31899f9fcf181dd7a31a020212f51cde83d9992b18f21c280f8";
   hasRunfiles = true;
   version = "0.2";
 };
 "bxjalipsum" = {
   stripPrefix = 0;
-  sha512.run = "61a5ceca85f76cde334c691557147adf7db97f1957b69639b8a3a194357ca556a91dbb4ac541bbbb28b48ef4649d79b014a35b286dbef27217416cfc9a59db18";
-  sha512.doc = "7bcdfd8f63f399aee33ff9e7b91222e41b93f068a619700766a129eed88bf641a2f0a656f8abe497607b75f857fa871fbfcf973979eeb3e68169617f756e6f3c";
+  sha512.run = "e78579572f584e26d6d18e409e9290cafaf0aa5ff1c4486f540643645679d126eae9419a961565136ea66f2a6ebf6ef7827bb6c86825e2b41beb383e57bd7655";
+  sha512.doc = "c4e2dca669584cef8a6b252412b3b231404ec0c76a976482504ff456579c7b6e617e4afbd603f577af60930662365caf997605563785c8fb537fe330d613e8f0";
   hasRunfiles = true;
   version = "0.3a";
 };
 "bxjaprnind" = {
   stripPrefix = 0;
-  sha512.run = "8fe209aaa5ea8e0dcab0f14b429ff1674b99e3dafcefdb4088dd9aeef2b5f03a8ebc574c98d634ce5db3b711369b04fc65a3fd6ef942aba29062f621303323f6";
-  sha512.doc = "d6bae3fb5ec39e7c3798dd6f9679dbb7ae447c2d4937f7a038067fd3912a924c9a4b13e7dca0fab9f15b2eab32f375b3b1f6210732c20d14269bff9eee9efa49";
+  sha512.run = "1bf5ac8baf6d3757983c4213649f911522f415a6c7351ae0aab0513bcd8a43c651bfcc25fa6a3ff52bd50a6291a0db86c549a46287017f90843280fd8deed098";
+  sha512.doc = "418c6df5c3db42c5c4f692ec09d4b8be91fdd1ffd31fa5e9f759ede61c139d20421adc8a12f4d923b5402cca9f6dba5015b7e515afa22d4146989a24a126512b";
   hasRunfiles = true;
   version = "0.3b";
 };
 "bxjscls" = {
   stripPrefix = 0;
-  sha512.run = "68279db3402d3eeee9fcba206da89fb9d007a8f05f1edbf82ae97dc6d64e648c14ab6698e64777af50c427e47a25a908971b9c02ac6ef417eaeda94294419948";
-  sha512.doc = "1252fbad0ba8a11fd00c663b4cf8b02a7a646ab8336743ed19bcc7719fa42efb3e57abbd1651fd1a53f8d615aa42ab78ce8e136791a004be003d9759662e6f93";
-  sha512.source = "35ae4eeb8832ba4136113469e820639b1573647fb67c9a09b9af4f5fe40f40cd256cd8c7f64e419f8913bbff287477e93f61b011fead5c980231dd1247ffd889";
+  sha512.run = "bf6ac17a264cfccf13f80401a3b1bea26fe33ae12b0b33e939443ea53f12f0989c145ea2c90f855814664180d589bfb73e634da0eafaa5ad620c535da5cd6b90";
+  sha512.doc = "9b1055ae2330e3d7ef89200c4dd504180f7db5d55187049bfaf59fac22825525252308f441421d09ab8214eea4b5344c7af8856b09d869fd0e068b3c81e49e92";
+  sha512.source = "a2c1339564ec0a234794732d1e7d7da530903f93205de41d1b741a30d1fa024014d9266c823ea6586cf0092140c50d2cbc797af28500a3a2b0f607e610b71913";
   hasRunfiles = true;
-  version = "1.7c";
+  version = "1.9b";
 };
 "bxnewfont" = {
   stripPrefix = 0;
-  sha512.run = "c37c74b66ea3a0ca33e7d7e09b651581279842c81bfa7a2766ff6cbe431cbd28050df33ba43140f4132f5dc7ec4795b02e9f2ea4f3ab50231a555309db28f32a";
-  sha512.doc = "31ebe7c53f68e6a7f5bfbc4695cb64e876240c9f9516d8502517044f038435dc631c43e228da869bb888e33f86c03fd841ce6f22b18cbb3b182ac54df3cf925c";
+  sha512.run = "343d6a7697f3957e97d4ad1f7dacf030b2f378d4858165307309b5c7efa14bb9871f5e44fee328a93a086a337b801a8f2901b26bc8e287b8b1eb45c765e1f8f1";
+  sha512.doc = "8f564e6fb074e35ae1810d5711af7c1983302590fd249fdb9599bd90f311d908eae0731054e67edc06bc169dff59547fc80b57f9f954abc8ced21d9b61d29767";
   hasRunfiles = true;
   version = "0.2b";
 };
 "bxorigcapt" = {
   stripPrefix = 0;
-  sha512.run = "7bf2f5b093f7988c06f075728d292f6c0fa8bf58be3af2d0eee96eec32d36842d1021ee3541b6ff2a98fbd4d7bf8194e601b63ab84fdc1a60a766e7a6edddf94";
-  sha512.doc = "f9116b5a4b47e0b707164d6a3bbdc2bcc61fa8263aea0ae3ab2563e984e329fc839317638de582e63855da49d662de2442e7e732951377e7e8eaeffb0b41af2b";
+  sha512.run = "a888e5b978e022a15b222b08876d1d5bc6d41790b68d62a8912acc7bbb38586d1a99a0afd231b0538f228507988aa25c4a80af1f0a7beb1e3bcbc1521be742da";
+  sha512.doc = "21695869f82fa732ce38081474b64a1d06718a54bf31f6af7cae942fb055f0a705149fcf4ecacc27694479ef70d08acd4934856574d13e025e5cce3b13bc86ae";
   hasRunfiles = true;
   version = "0.2a";
 };
 "bxpapersize" = {
   stripPrefix = 0;
-  sha512.run = "f72c6eba51023b9470714bf9dedf0c3e36ec74d8bca94a96a512aae482d6f56ced3b16e315cf9433aa0b13f47e83bb297d7c3cdda7d28a7a5bf7bce7f2410efd";
-  sha512.doc = "a8732d0e647a8b5438918296b3157a1354df4339a3e77b6660e16e8f4fdb02fb45a764eb9edfecf7cc1fa580115dafae49a5ff154a52f0d660cf5bf5d92e2b69";
+  sha512.run = "458f08fd1b94bb1a4b11d048255c79946170a8c2af7aea2e0c5580a690b17b6187aed926764e76e96b38d6e9dc85a18ce4cdea834f3e8062398ebc3ad4da60fe";
+  sha512.doc = "b25f095e8c33301d38d86b4b29bd64d3773fd108284bdac464159656ca78d37264e624506dbd12f242c4ff9b77f6283925f582476f5b952a785508d3780358bb";
   hasRunfiles = true;
   version = "0.3b";
 };
 "bxpdfver" = {
   stripPrefix = 0;
-  sha512.run = "4b7c773d2d9af3f2293192e06ec1b6d7080ad80ecb7acccb06b04cb026bf41154abb78c45570a34d0934b9fbb1f5f2057787d0f7567cfea27f0d520ec273b730";
-  sha512.doc = "d39f9e7e28811cba1ae40be1d7bdf410050dff12ebe8cd00033c7f15f09d1d6cdd6692d1a2751735afc5bcf513e420ac844754c2ea5c3919830e0749e1b649e2";
+  sha512.run = "4b53a48ae2dcfa01aaf9e907138370e4b5ad0bae41f7ef52370496e08eb1dfd55549646615515864dcf16002007f9afa570b9f661637547bcd86e58dec60a765";
+  sha512.doc = "dcb576742310dc1b7c9d79fabf713f3514ef819ffffa19c0d8556f2d7d2edd37a5ad8ddadaa8b4a5aa6f3e204f9941b4faf56f7731df4d5f3919ced56923815f";
   hasRunfiles = true;
   version = "0.4";
 };
 "bxtexlogo" = {
   stripPrefix = 0;
-  sha512.run = "b881ddea6cfd5a4ce1e8ccd0247732851c9c9f38f9341855f13ed386940fbc1d4e3dcee259b1bff8618c39e54aaef36c4e5f6fdc1e86cab7b1096ab4bf096f02";
-  sha512.doc = "cd6d4592c8704835efda767ee7a7383dd07c3f832038686d0e333fefe65569575892d7ead9b813550d0abc8484388ad0d0c33baeb9bced3430489676bc43cce6";
+  sha512.run = "4094bc59e086c0ab7ca409979a656624835f5e9cf0fd665d2e3058cd258349ad26f1619a77633ac8d784ed21930967e6e0ed07b3f5a29f54c6efb0eb05239e75";
+  sha512.doc = "97d6ed9f62478e078cc0f7a52a6723c3ca9f3d65e6a3f7cb24f93b95903160b7a5414fc7cce80e2a0ea7281943461751fef33a9c331b3f9b1ba9865cf51aca75";
   hasRunfiles = true;
+  version = "0.4";
 };
 "bytefield" = {
   stripPrefix = 0;
-  sha512.run = "83f85d3b6af16ad86313b77898a444b0ab8911bb4e6a36e57d6f426cade94ee3ce9927c738cfaa879a3d152f11280d6cd87fb1a451f89c76d3d3c575cd354389";
-  sha512.doc = "ae6cdfae0a36de999f20d037ed3944079bb6839e1466e2d403203f6cb3d74566bebd7dfe4bd7589902bfa21d90f4356fc44738700d75b6301b6e961a1b196eed";
-  sha512.source = "229bed92dd74322de4c73b247fcdfebc8a71d357acea004d6981ac38639a0c7ad5cf2038dc4198fbc98e232bcd7252e8fe7ede625e454fe4d864ac99e2324aaf";
+  sha512.run = "93b4b9c974c9045c686720bbb88dcccd7f721882ba2fa38821bfa960eccc7ed048cdf7b52be2f0105d83158747120f450b38f5af535443d1f7f3ac202022be4c";
+  sha512.doc = "5cec0cefd71a0911882831e97e94abba43440e41fc94c6da26a54809869ce2d34577fe1d64aadc5e08245a5501d9ac80693ef53e06425f1b5f3d46984b5a837b";
+  sha512.source = "c43584f47619446d3e1cfa32550c570009426fe9bf44e3d7daa76e2489838a9aad24a1dd984894b45fa3cac4f460e8cce3ae8d35f92d3ca44ce0022b6325c511";
   hasRunfiles = true;
   version = "2.4";
 };
 "c-pascal" = {
   stripPrefix = 0;
-  sha512.run = "0fe3344f3d8aa345eb6df162f8c4daa1296d214d56e26b3a61d2b29612c04cb4e16f447e575f8c715222565104488f158044d4eb4fd37be60532b2b4416f4db4";
-  sha512.doc = "80b573997d5a6f227786a8579867d95b23d716913587682cbcf3d6141f80998e8395f1b1a2ad2f4122a79df8734b419dca66f002b2ac53d270e4a4903901b874";
+  sha512.run = "b09d1b95a702f41c0c16bb4f8a30b25f09a9b8d03b624accd4edd6308b4b572b4b94cbc2ffc021007b2943223a001bb7f42db8bc56a03326d247da6aa49ffd9d";
+  sha512.doc = "d7c30bec9e22f37129a55d252e09265836f797b86f40e5db0ee6fb54e12bf71983cdcba45cee17d7ff6e9cfa6808b0070b43d313b3fa3e34f79ee5e9f7f4ae86";
   hasRunfiles = true;
   version = "1.2";
 };
 "c90" = {
   stripPrefix = 0;
-  sha512.run = "4b60f8e07fb16da6b88780f7857e6f9f15607d53f22028c7ad3a3c09e21ba3091198eb27bd61eb836062468a8b83ad7d7f815ea1dcf2beb4603fa06d723622f3";
-  sha512.doc = "9b902fee62f88fe81f023bed5a1c5bb1b95084ed49ba4afb7ae372ab6ac02be9866f60439a32e037dd3ab560cd1668e5e58923ea78945947b023ab7cb333175f";
-  sha512.source = "795d56542ec65844f4991850a19445d8792808a6274fb73b460e1ec105f2dbaebf4a2f3662c753a5d8d3bf2e2c3dd1cfd374fa599975f806431e35b92db49a29";
+  sha512.run = "0fa5df10cce957a0888341cce11595f6a2c0e979171b58c417b6f6e6be7e7d8d65cc3b19be52f7a4ef2a443e19849eca6e77a7ea7a22e05a3d5b9151b107b315";
+  sha512.doc = "94670225753ecdb6ab557bb506ce7821821fb87d7c6f3c71dc3be27c5fcac634f86c126ab55ee63e1f9f0d789d3236cbba81d5e9f32a0dacc2214f2f33f8c549";
+  sha512.source = "0fbd21056fb536aef671d21cd8930103ed69281952e3a6a304d30a6538db8a2805ce0d2bf57025cceef4b0abd06c788d1d005de095b41b7914b41457a142dadb";
   hasRunfiles = true;
 };
 "cabin" = {
   stripPrefix = 0;
-  sha512.run = "03ac8281945ae8c6561a351f04c9be4a40f9cc09d920bdb8b76512a35f74891762e851ddb03328f7c6e7cad7ae25f4ee1b463cdad1b319a6afd94d3cfc3de4f2";
-  sha512.doc = "bf12ad4df63ef9b800dde9e5e40acb63e09b743ec36cf0ed5f7c8045422d2f4f1fe3b40cba992fb80f5f7e83eacf01d4d16d5549ffde39086aa00633c7600de9";
+  sha512.run = "9d07b4d6cd2f2b4f38ec4334f9506a9c6c9ff0afaddee94a431e071b9dc44776330851ab36cd121232f10799c92380225f6cdde37300ddd4541a5911eda29ec3";
+  sha512.doc = "6a4a47a109741013f03c59681fc22b0dd7abb17b56ace14f7744081d2055738dfa8953dc145194862fb0532730384515245743d68010a26c798af482ac874ed0";
   hasRunfiles = true;
 };
 "cachepic" = {
-  sha512.run = "8b26d6e71616c12bb51eee2b094c96ea8c1522b6cc5d677f96a5a1c07b8374d072f4a4e7b137907c976f8b8a3fa1a5eeec33eb1b5f16b7ce915a6259d0e1b2f3";
-  sha512.doc = "8246761e4683567dad80b3e9ebfaa92032c049b043f366380082a485e3d02f067f6a99e0c293fa6ac604d61bc2d45f162d7f51b3340b993806e35fb1ff7e1740";
+  sha512.run = "fedab1832932e2d9d4225dc3e01738fb0601bba81b578d718c71471fb842a33b62603188d850111f265a474cb6343ecb624e869d8243769a535393acbd9f6c9b";
+  sha512.doc = "8ec9eede4f73c56b52df6b686fdc2d4c96714d301bca821abdee4d9cca974c5fbaa2ad0089b043224cfa3f16603813a2a2668c6b6d4405b54c5becb7a085508d";
   hasRunfiles = true;
   version = "1.0";
 };
 "caladea" = {
   stripPrefix = 0;
-  sha512.run = "91e16e0bcbcb9c7268d44ce8ed79ad363c1a3041ea4be687db3e5fab457a0aa4209e4882e4a9bda9ee9607b980bb3309c2b600862c5ac9fc3ac263570978e8da";
-  sha512.doc = "248ba3266eaddceecdfbd4ae444e791d0f7fe92e7827cdb21ff986f8d86a792e18a03048af7b267c038a202bc6dfeddd8ecbe3f7928211a7a687e49dbc3a937e";
+  sha512.run = "66c5b1225e8a52a14facb29524990f75459e95c6d7e186f87e6cb38b75746fa836528e2dae3b271f675dad767722840556e5b47401e3614f06af475b97042b17";
+  sha512.doc = "ed95f1f0c105ae08e92b54d93571451384cb057f15348afd6cde73b896a8ddf4ba4736d23ed00f367e3e07de42d69d2ebc9a0e371859e1c4a33b98b003c3d1a0";
   hasRunfiles = true;
 };
 "calcage" = {
   stripPrefix = 0;
-  sha512.run = "26e549bf658e4c7fb022efff883d2f6a76a4dbb18befe15c249746350afcaf7e872f36628e2ab9b63b002dfec0c8bb05f7a72c0c12e1256e086be2b01e1c8c38";
-  sha512.doc = "b18be5eaa0cbb9229935450eb75d8e06cc88ae4e278102cfb03b05f63e93e2c5b2b17cbf8f12821394cb0e514a8e305339105fcfbac81224f366425a7ca00efb";
-  sha512.source = "ac917d27a62501f3dd3b256ac3bcc5b58b4630bbcecc7c7a55bc04bfebd5bba62d73ab55dc7f387fa394ee34215ad7756c584cca6e1f2a253e72a11247a51b9f";
+  sha512.run = "ec5c839ee7e43c275381f241047726437cc5b4523de6b05382e6c435c00aa691cb9692ebeaf4d33a970036dcf69859cb3e29b28f7f4a8e1a9bf0db7bdf3516e8";
+  sha512.doc = "35ad9c2b753c5d10a5de3399e4c9cf4307b9e80d824f4ca6a3b9f3abaa4b4f18983cac7411303d4bd216603b987e153a5334c6655f5ae40718118be0c28560f2";
+  sha512.source = "7853e241ce6bbc68dbe810cc98c299da6605d36ebf610bd531bf654334bbaab51bbe37b533f5eaa387c3262846f9a805e73006bf4c525144e0b4ea243861a631";
   hasRunfiles = true;
   version = "0.90";
 };
 "calctab" = {
   stripPrefix = 0;
-  sha512.run = "e4faea81a03473fa5ae3f7410c8722715c428aa212d0e8aa93246a997f05c20a75c5e571a3c3eaa6c56c7003085844a1f8928b61030ee929ca709ff613cbff10";
-  sha512.doc = "16eaab48315e2d00aa9a1aa5dd695a3b387a59c196699200f5b710011f4771a1edcba365f718e32c51de0d891ebc91bccfa48c01b5cc0b62abd9e0ad52350974";
+  sha512.run = "49956033b20ddaa86ff6a4823a2797898a2b37fe89d3378f2b2616a1f16ce8911c809a3d3211b867f5d609da87fd254a1130ba70e5be342417549a677544e8ff";
+  sha512.doc = "a082fe9a8fe0c2c925cc0a7984a2c23dfe9a81ff8971e9fb59b182ed6c1814238ad6b1a208d025826d5bf5ef916ad92a113748bdc73ed2158f6fa0571467ae3b";
   hasRunfiles = true;
   version = "0.6.1";
 };
 "calculation" = {
   stripPrefix = 0;
-  sha512.run = "8588d9f0070aff0083521062991804cd1c5c3572032ff4b613749d206d6d17bbc8b28d37e2527271bb0a4907117b3c8446c432e4b1b9da5a90940575fb3eb629";
-  sha512.doc = "1ae878b91570c6aeeb9d0124eeb65bc471f052b64e3f373bd9314ca8ea192f379af08649d402408863131f6510ab99c61d5ced8b4bc6d287374d2ce6875fdc26";
-  sha512.source = "32c2849dbd05fed24c9c6bf3bbe1b9917ccedcb1d072f6b6071af18c333624fb0bfefb4439d396e20ff4439cd3ca8f9d9b62882bc6d61349ac18d709bdaac7fe";
+  sha512.run = "3368a211168efba5a80bcbba92c40101f2c1f3c5cdd68a605e4624bb6c091c11cd7cdc1795cede7b20b742fec2288aec3cc89a533bd36f0f09156e82d3674b6c";
+  sha512.doc = "cf80023b11c243ea86a22415c294465e8f318786e4039649fb3d361eb728c8db9cee2d0d7f12aa81ae12480cd4b4a5fb7f1f23baf990791ca69390a92f593e74";
+  sha512.source = "0393b1f551c11c59b67d2c2118a55f3f3a214cda6c0a9ec54a32795c45b03c22b9b07783ba2a0ed9d263002ba1cec10431e0ce19f4c557c08f12978583b7cbd4";
   hasRunfiles = true;
   version = "1.0";
 };
 "calculator" = {
   stripPrefix = 0;
-  sha512.run = "1d47ab546fec9f3da5b2bbc5f8039977aaad45323d90dd326195b76f5e510877bc45f29cb551dc14c6d6014529853dc136636cd898ac9f3cb783e091a09af008";
-  sha512.doc = "bad6b57c5979ca4742cb2a12f776d500531e5b55e1e382bf6d30abc52463b0ba9edbcbdd5ade091437eced4ccb98d655854ca0fa5e6e57a70a34248ccc8a3ac6";
-  sha512.source = "772bee8685277717d2d1fac541df15a5fc438f1315f11667eac35992be90af2dd28b4066ff73988a57f1f306d998a00635790721fa5a2dcac3f5c05e7e59f193";
+  sha512.run = "2e2160873be115de34202a8d2f261c1ff18f1b14e95e1f8a86bb270c319b4312bf01e519ac2abcaddf86bc0941cfc2cd6f9a3ea7a3245285ba20ac6cfee24f12";
+  sha512.doc = "fd213db9279bf544835a6c114e7a20e78be85fe362a008fdd5334eecaab7ca76fe9e315ca068cf4fbad7f258f3237e09f39d8fd0d5567ea76c85b6d66696cc0e";
+  sha512.source = "935b54529bc59f0dd00d90a61329aae91349126388cde4bc4bc0f2c98c30649658ae1bd79f27e4bd8faa8780fe0c103ad220224cf91e7ff590b559e80efdcd44";
   hasRunfiles = true;
   version = "2.0";
 };
 "calligra" = {
   stripPrefix = 0;
-  sha512.run = "e9e2586a71379c729f1a794b8d20e6a73e169645552cf0c982f25dbacd1ba7b9465e958dee495b9a18e6f336d945da75502a71ad8023492d290b23fa86c7165b";
-  sha512.doc = "59e46f64a1a06441f18f0f565cb1171eff4d6f124968c473e167789aa192845ce57d6ddf407e9f518f38459ff327a4469457f6b0da9b20ddfab949ac7d1be655";
+  sha512.run = "291c0e7cc4c688428a4ef6a267bb68f1abb0ebb8418189cacbfb5a55f3f95b4c4d2049866bf336532fbd5e7529b73a2a563354acab6f6c1d86c1eedd1cc890fd";
+  sha512.doc = "3856591b94ead6994944155301163ae8a434a6428b7b4717a1d26898d696f1fed28b73a7f3ae9ee1e9f7ea0801790a2284e932392902210d56d968c528af7ee5";
   hasRunfiles = true;
 };
 "calligra-type1" = {
   stripPrefix = 0;
-  sha512.run = "81a11ea4be8cb61513e029329eb967df2a81432e1500817ddb7fd4b5e16a4ae08fde9424e6841b48ff6d7a3a447230ccbe133783e897b112f22a38985ac1bd5e";
-  sha512.doc = "8e04f6009bb7e3e6093e0a4d80872aab68a3f994fbdad29ecb66d4d7abef0ad8b627e4d5790eb2fe0083d19e3abb7ed6a1630c82c0b3d486c675f9d1f913839c";
+  sha512.run = "44e1f4e77872dbe68dfe87c9cc70b5268e6db691ca278b1b43fe1f56c16a2985b9dfa2a2fdd89cbb427746ed6c3c502e65b8b778592d51ca203e3eea939936f8";
+  sha512.doc = "a0e6a8ef9b0dcf57e169d6390ad68d7a5470938e2958865b602d3c25f00f2d5a1f7ff9196bfcb6d7bf304a02dfc1f542292ac995a9586d4714444bbdf9cbd9ad";
   hasRunfiles = true;
   version = "001.000";
 };
 "callouts" = {
   stripPrefix = 0;
-  sha512.run = "e8279e8132042f488e8b952e89ddcf28e521dde4f6ebb63b3e351743407634e25363200c0f15afba8f347f5660b75a81a0fee372e2f28601d2680bac2cb739c0";
-  sha512.doc = "f0e89b99e5c482f62d996c9412cb0f94899ee0dd232fa017865bf6e2c791c2d5f3197bb1b9c170053c9aeb4aab7c7890f549b7473100227d727b759e756090d1";
+  sha512.run = "cf7543395ca1b2ba7c9fd8cbd44f720a2a896781d4465ed5e9bfb46ed003fd011e5eaac8c114fecbd3aea8a5413d2702eab937eaec4bafca3a725335f5efbca0";
+  sha512.doc = "20379990311229fbf072024a989f39738b1851f77d19cbaee2a7a9eb954bf3693751380547c5c4d327337995f3300c94c2cb199243c27b063f0643d23633571e";
   hasRunfiles = true;
 };
 "calrsfs" = {
   stripPrefix = 0;
-  sha512.run = "e99e73a484a900aff57ab098238cfaab47bfa45176ae2edc19e496f92d2de70b04f398d5fedb7a41ac9258ebdf29fa78acc159fb7481e68422d84c636678905f";
-  sha512.doc = "6ce08bacebebd8a7a3c105ad4c43319645d145c04f1167c955944016a8d816de563d0af80d42e7ae0ca42af28dc43a2e652e760d4a408e97d6f81532bbd8efdc";
+  sha512.run = "27b031ac6f663c94a76cf763f9eb014f9749165e7bbf6b51a9f0e441bb8ba94ab10125aa0e419b3d5f984234b85ad87c9f364ed0bc27e04314eeb7484f93888d";
+  sha512.doc = "f59626c195f3496b1f5ed881a95a907adb365f9f3dc309da8f7a2b6b08a01b266f4995c99728e9c0871b7b552092727f63ef0faf5bf83c092e8b765cafcf98d1";
   hasRunfiles = true;
 };
 "cals" = {
   stripPrefix = 0;
-  sha512.run = "7c6faa80e94fa3f1195618f6172fcb0fa7483dd39c77b40243362039d94c906fc31d92911006ab6a6986265f89bd7ef82b9b857c290e0d4d5f4d6eb402de8bce";
-  sha512.doc = "57b54f65d39a8a3a2244314c10090ae2b9ec7f5ec793a7411adfceb0e00952543d7e73d708f913297d02f21e902f564ab048549ff16e103a0388803df253039b";
-  sha512.source = "ba2f208defba118ca2fb964a3d00ed2f76d17fc5879ed2bc42c24e051214868a482176003777a64917cd7e18dcdc923bf2ff1d8f300b652a1969cd9cb90b069b";
+  sha512.run = "32cca18edf550c0bac6d659a706fbaf510c76e1b851a9fd10d3b17c8fc6bfcfc6f8e2d453668aaa2001e0b2d78414ca8e41a461b9bc7044d01abfd113ed3d898";
+  sha512.doc = "8235472d0384dd8f1a39d517dd22f0cf7f7ba3f6cce143849b2afeed7f4b059de026a5c743f50b5d8909b2a6d3d6218b22f2f7babb4fb029ea85175f3fb659c3";
+  sha512.source = "545abf72a592d53e09b28496878e4b4fa285c49a43fa1fd1b2979f3347530f7ffb94562d1c1a8abed833051d953f6410aeaa01f351824968f5e51f7c7924d95e";
   hasRunfiles = true;
   version = "2.4.2";
 };
 "calxxxx-yyyy" = {
   stripPrefix = 0;
-  sha512.run = "0630916a994be711f4135e2045a7804b4ff0c7bc962ac0652be82a615a62e00845bb0d3605b673b78530ffec11c8626319390038ee3ab30b1413f7113cb592fd";
-  sha512.doc = "8d3eb79ab97ad30d4dba9adf1f952b48949e7c91edec8deff645ce9d5cf063122b7b95a833dc098fdaa9320718a798826d55b7b3c4411d4a082ce3c0498af9bb";
+  sha512.run = "8bfe64987be163f612591a3cc1b9a49f2a859f1b20de53fd4a7d50da82d6281583e5fa3088bd7f9eab80bb80a4d088c0f13eba2269765ca135bb3645a5a8e85e";
+  sha512.doc = "e1687062dffae343926d844c1c51ff36bcaf8a9753ed6219300c1ba6c62c3200b8918efb7f8dd0db92f2779d97fc0d52135683631532e2fbc2f042a4f39edf1b";
   hasRunfiles = true;
   version = "20.18a";
 };
 "cancel" = {
   stripPrefix = 0;
-  sha512.run = "c7e4df2643981e310a9090286273118ea2e65c89ffca4e0c6dcd10ce0cae6159a9dedd1e9d1cd311ebde22e2f630b59d4880997e4a2c07f9939939139283deff";
-  sha512.doc = "a1758ed5fedc63c9a3be40550cb5e7fcac089c835f6a25309a0dcb85dc4b9d02e5518c6fef5bbc0df3f21012da7a67672bc39260bccfe3cac632f2310d7b5d4c";
+  sha512.run = "2b321b5e6342ba1089cf32128b4f51f4c5f2b3eb6c5f85eb4723c78a4a0f806f176522334f4a699136e53be574e89c7f31a8c505cc7ccdfe6bc79bdd37710f23";
+  sha512.doc = "ceb5721c446b0d71df0bf7ec87e87765af930653692fc84d3e1a063ca049c93da796615c4e7b7db14053cc3bf6b45f37d041ccba04a930f028c70bcd24005b07";
   hasRunfiles = true;
   version = "2.2";
 };
 "canoniclayout" = {
   stripPrefix = 0;
-  sha512.run = "0f3450b327594d699f2b551019b61783a2c97ad36770c0ed28b414a3b187e70c8d184eaa9a89994f3ff5d110ee08dab2650e0f09023dbc00fe67cf69acd7d780";
-  sha512.doc = "a272f259ae74e941b8c1ba4c659efc7a65f0c3c5c287278d5c3bc2754273e3aeec4487d8c9fa47eb10748e349b81185d8201be0a0144f51e5c0a113ed9e3bab2";
-  sha512.source = "1b338b6719a05196148f503df84e096a94f82b3eda116796004a236abffe575ea84c809fbddb386aee9f84a5f62b475e85d82df7a3ce30b8bbe11296e294b2de";
+  sha512.run = "c13cf72db887f6fb2e01e832a5ed8b2dc253d9372210fa28a5abbafba39fbd3cc8aad238c5ca9c3f2037bdc11770233dc7020c7b1b8e836e61f578a49a51e910";
+  sha512.doc = "743b17de36ff13e7f59f30b66f4835eb29643ec97b5daab986ff7e307c5efa8b3608b54d6ec2bf82ef20adcdddf0726bd4d2a338e2bc4ad51a443fe07576a561";
+  sha512.source = "b71a626ec8a2517d3834a312dd7a43cf6509a16c925f03f05622bb2e60df7e87c261accc11d63be0da046ed3782b1efa3a4790b15d4a787972c5ae41c625dc23";
   hasRunfiles = true;
   version = "0.4";
 };
 "cantarell" = {
   stripPrefix = 0;
-  sha512.run = "38ec28a80e7a895706c926766259b2c056e2f44e481c6bbdbc36d0a6bda1b3736f968b10f15d106b08da1a83e0da2698590acf4da3c585a32f842d1bfc5888b2";
-  sha512.doc = "f8f7c5184697be812e8315f142b3c713bf58e03dbe90408556f091f68f5190b1e993617ca0df85abee499a6b9d5bfb177c1a2dc63c8e85268d4d16322987b077";
-  sha512.source = "cd4163c9ef1f57983329cf17db63d6c2512084d28bc098da702639e8395a9daa2a1a0494c97556e6315878abf74e58d93ba545ebbb530d7b6648938ae637b517";
+  sha512.run = "70485f4c80b6e5590c2a7e94b0e874e612a78f41f6d0aa4a7cdd82046074322a1ae1dad61ae734f270db73db812d6e4cdfacffc5b15816d2fe385b1a147359e1";
+  sha512.doc = "2e34510a95508a5d9708558aebb4b0bf0610d83fdbaf6b53438c354b49857e7f2aab1b57cb5f29b097aeb0092933016b63d27808a210ff4d8916ea6274559772";
+  sha512.source = "1665ccd34ffbbdf1163c624c49fbc30447355b1974667e794b01115516d9d45b2ce59dbb44fb961d553f0f56fae612d20670d081816c2ff3cbbd4a99f062c230";
   hasRunfiles = true;
   version = "2.4";
 };
 "capt-of" = {
   stripPrefix = 0;
-  sha512.run = "1ee5b6f50ec473f291f0fe4a785d24dcfdbfc4ef65bfc9226eb1ee66ccf7b43ae196bdbd100451f853519c90015cd207bddccac88e538e90d27c9a465f5e30d1";
-  sha512.doc = "05c352108fa1e14d0601caa91a2a8b3da978f9f4444c5bbe0fc7478c049b589d3f682f6f99109e0174dc7613a91ce91cd2b645d20f538cc676c31207f50f9899";
-  sha512.source = "234136dcb0d6ab3a2fa5c2e975b8a021ac877c1e578d371f3cd2936dac0bc4291845da4aef394b91fb5d570ce9d6ef578561b148d2735fbf1c85fedcab4b2c21";
+  sha512.run = "a5f19701878ac0fbd2fc38fe6dcbb984073346a991bd1f34e51b4f07ecd34baed89aab19ef80208915a659d3a15a2c81b3dd09f214818f9c8a2bff14a008068e";
+  sha512.doc = "1a834571097a5304395b86fc5d9a5c3a49d1701b336330c996ada0ffa71a08fbbcbb7aaf381514854f914f8c49b989d35c870e4bd76e403503abf7106108ffd2";
+  sha512.source = "58854151a1e4af85661c70964568c0d61f47f28923930c40dd8a11785f47e6bbf2f3259e0cf21d201b63abf6ee2f3fee5b60d48b2cca945e869fbb95193ba9b9";
   hasRunfiles = true;
 };
 "captcont" = {
   stripPrefix = 0;
-  sha512.run = "ab39181798f82c70fe9fc3e4fe1c47936e6f77df078e6d3f08369a81570328b05dbf80c50e544a4dbe2c765fcaa0ae0d200c2dbf641346ae4eea6a4ce4a64787";
-  sha512.doc = "62b2cfe89a39b7b446336281f18fdd29ece0e05560f5e6e88b71ec8066cfc9ce91fa0090e2c341448268a8908649a89cb398a390cabdb7a1b4895fe479d611c3";
-  sha512.source = "08aaecc00a46edeb6d4e79252b8670e469d1036b1b5e13e7e761a17f7299b65ed818ce5c7331e46d628f85d9e809e2f31607ddf928066e165f67eecb7c969b37";
+  sha512.run = "5fa23b3c6fc6abc25fb1321da15252a5a6381858138285057512c9208faf1b1f754b5ee5beafbec66ab3ac9f4944b3d129bb7f5a84c895b0ca5a194003458558";
+  sha512.doc = "222ee43beeaf8ebeab885b4123b92fbe48a5bc6784e1878ee84df3187b6f9fe2c25ac04616b20d3ef0a892bb20501bc8a8a88d059af49d8a83c9ff1fce09b9c1";
+  sha512.source = "e2b20f5ae53bc6190024013daecb6a04b39f3700e0a881a96f0ad60ae8142b045bf88886c040cde872d6a113bd93ddb22cff8d2274b7c4500327521dad76c60a";
   hasRunfiles = true;
   version = "2.0";
 };
 "captdef" = {
   stripPrefix = 0;
-  sha512.run = "454d8c7cb676b4f296675f79410031457b03e9af421db26b80a5323af3f57e980725897de63544da96d482600a6871f1f2ed7d3d12cbe3760918859d6dff5ebe";
-  sha512.doc = "04446a9bc9b6b3acad1131d9e09cfa9c353e6e1586f2e7aa036e0a3096d1630ae4cf6a6ed3126fe6adf1d882e3bbd8b00419b8b0c1cf9ad4395ddcd8ec82ae70";
+  sha512.run = "a5376f7f5b1d4a751971b4210fdd32041009ec30d3e5bb8fd5cf8ace76a52ed4b74d11482beeaa6acdbeebdfc2b41cc714000c4383acd8112323fc71333f3aec";
+  sha512.doc = "9324e6ce581b7726681da2260e998312537153fa4c3df425bc50100bc3ab563f3b34ca7b5467227c3bcf5eac50f3ccf91e38e9e862fe04bd950cfb9335ef5b98";
   hasRunfiles = true;
 };
 "caption" = {
   stripPrefix = 0;
-  sha512.run = "63875059c9431dec3c3345886471f9e69201d3cd3516cf15ce63cfb4f17cf207042355b07c0ade7408e3f4966437c6e4e9055b517c63f06d02403ffcead5b56e";
-  sha512.doc = "12554b272ef47f80f2720fb350e93750f4afe27457623f75a4a8e1495acd6a545d61abcae5f41ff297941e72eb2da340057a3ff05ba87758b3f26e0d1c401727";
-  sha512.source = "d3753dbb78664c715176d31a568aa9aa10cbfb612c8007391c8b616e86ebd03afede5cb585c4b1657f53bac34e67cb34398d27b73c64e765a1717d33daa5ea32";
+  sha512.run = "dcbc4072d8e7096e55d41b21c4e5e55acd17761271ed843d10740bcbad2752e1ec6b6d888cbb5c3b14a5a8bc132689be11fa3730c149a4a6d7ccf02004d15562";
+  sha512.doc = "f2adf9d598d716ce3aa9381f10902983643fed17a1e2a5d338db0b498a0a78f75ed8c139ab860bddfef14906504740213bda9bd3efbacb83321d238065002e1c";
+  sha512.source = "df033d17a6de253202213afa498f027c4cf9899bda957e235de9ed4eaa11edee0980781c98f48a4ee0a8c96b56bd8bd8d3a3952bf5eba24f8d0f0ce7c093cd2d";
   hasRunfiles = true;
 };
 "carbohydrates" = {
   stripPrefix = 0;
-  sha512.run = "84ece3c315e46f778f1eaebfe253927c107def981016073493ec0f13a28be0583f96fb6fdc2ec84de647f1192d37d73b28e78aed7827d4ea027a31b7ee11e0b3";
-  sha512.doc = "a439419e3c800df1696e478b2b3feb2ad917bbaff92836105894cafd1dedc6324a4a38b6384b7ad51bef7cc9c0887950a8920691f4811ac8942cb397aabbb7ef";
+  sha512.run = "600d248e5089ba077be105c7d8f8e03c508b15dca7c65628307b91aa736377ef2b7b43bffd3816021ba4bf1e26697882db52c1355d8674ccfa0dc7992c099ad8";
+  sha512.doc = "f9e0cd4372b40ff1f065d68a27f131007e3a22a801f1e7d6ce9235de71574bb4387540413175309e30c5b4953e13f1e6bfafb42f79778437e7901d346d4513e9";
   hasRunfiles = true;
   version = "0.1";
 };
 "carlisle" = {
   stripPrefix = 0;
-  sha512.run = "b0ff8262182be519ae872b1f81f55fbc1367466481dc04caf1d582e7487ef11f24c8d1841ebf5ee001f60b220685b90e664e173236e28b0c3ed9e8045120eafc";
-  sha512.doc = "03dda7dd2097e51aef83f5ce9eb6ddaf1a5093ddd117466210e6bd17ef7ab240e1cddd6f93b1e2bbf69190118b746f7c0b4891455c3714821ffa0099bfcd683d";
-  sha512.source = "f69cccc2819d9b1e26d3586bd7df937384dbc89d890a9d50eb6ace70f8fb87e65388121adadb86dfe4943973c3ceed4f9752ad7cefe1fd8727c841a63180aca6";
+  sha512.run = "3734bc331f78e4bd8b85dd2df238b4dbed76c6c1c7bea71768b1e9c7c62ec7d277194e54997b834931221023768af085e1c65c3d7688b77678e8d3d7465c4e1f";
+  sha512.doc = "91400a8a7119bfda80ffbd6e20c67dfae45fb7f430396f37bbac8c0f005b60bc82c0d502cc93fd58adf87fc880c8a958907fc1b3edb1d55915379c2eb2269c47";
+  sha512.source = "6e69b406b71462fb97a24e1d20deeeb1c814dc7dad196c97de4e92ff568734c273726708feecf58dd913c6b3d638aeee9d5f300d1b971bddbd70f5b6fcb2bfda";
   hasRunfiles = true;
 };
 "carlito" = {
   stripPrefix = 0;
-  sha512.run = "395c5c6dc439a79678d29df10a564cab73551de5e8bcb160a3cb86445ab8e59abe78258654877f8e6b5a3130e20ab23f2585488432ba12f807d398b64f9e824d";
-  sha512.doc = "37dcf1bc5b20b9d5a45cf297b17961e722477449843b98097395e852bf41b7622a7983477bfca5e16d2fbf7e069b1adf3a2e988fabec022ebc2a147167d5ae08";
+  sha512.run = "f47d0ffd4bab7d892e6c646f3a4eb392c295b8f8a9ecd63ef45fd9ad891c33db8e66ec3e6d455649c2a8f8795693bff105e5ec48ae7c8d2fb0bf79d32e078bc9";
+  sha512.doc = "ff4a566ea7ceca1d2d095b3e99acdd65ceca96671eddb2d98bef69310d69e31435acab70272ab3f421cee5c37ba42c3aeaa230cda7e95559744a40080b9c1547";
   hasRunfiles = true;
 };
 "carolmin-ps" = {
   stripPrefix = 0;
-  sha512.run = "f8e47e9d4543b32e4f3b8ebf366b140ee588bed0afe9e2062f2e335ee65d98e9ac698aa237b7c5a20ff5d097a2d0fe64859900b6df34890a528b79ba18e2f19c";
-  sha512.doc = "e250d7037f97770318e86fc7dfcf3d2607466a957c9d016936243f6db2f151363c09459567f82f48d4d42cace96256e978b83c892af8fcefcc75a12332d5057e";
+  sha512.run = "1802e7fe2835863ac0859bbfdf21724ca77cfb56418e2b070a7f420a739b0324458c5e12b2705b03e9526a6a87fd4a9bdc49ba066960f3d3159b01636c6ddbb0";
+  sha512.doc = "70bbb0cee83468531ea86d841906c7d47d3ab95067aa03d4485bec644653e9d110619a0e643a6463685e50ef1cf7c311c64319522fe4cbc1201b77f37ae4e78a";
   hasRunfiles = true;
 };
+"cascade" = {
+  stripPrefix = 0;
+  sha512.run = "f45bbabf4c603aa16851745771d983a0f58fdfbc4bb738d57f81bfe43638cc36a40f5e21a5513d827f25895bd3269db92b9d0f5e2d1f6e5f92684d781866589e";
+  sha512.doc = "e7d688ddb0d9d22e67170c7f250737f1fe2a4fb722dfa659ba1716a2c83fbe51e621ee2880902d92dd551cbc6110b84ff2ac9b56a50cd6ce98ff37f9b090d2e9";
+  sha512.source = "6e29cf674695fdc589ddbf674f0acdbf1c64ca6c1cf8ff3454e3ab33f496778a1ccc5eb3064fff2ccaa2ca16ed30bd174663e10b8b6320c3f56df97b80a83b0f";
+  hasRunfiles = true;
+  version = "1.01";
+};
 "cascadilla" = {
   stripPrefix = 0;
-  sha512.run = "4dda2e0c8c02404530d5f2d6813947dc266faaaaa80737a2dab44052d46c2115f3611f68fb5e6d0dbae9031649701c483f8ae68f4a1ffbc0f4c7d8fd7c199a73";
-  sha512.doc = "acbdcb31855389c42bb620a82384700857ea5791f2435903fd9377d7c33471908abc5a366dc362d161efeed611b9ce73bf2d7a470145605219fb2e3f3fa2189c";
+  sha512.run = "e9a32539283dafbcc1cf676127308edf6a54c6d0558dd31de32601cceeb22ba213c30b4ddbe6f4007c6e1e8f3810ac47b2527d379d719f3cbf7ebc35f5907a87";
+  sha512.doc = "58b9111f86085c066f18363d4e168abdd1cb7ff74fd53dd34ddc537ea320e4ad2ec2450af0ff031f2d43325676c921a8ecbe008297f11170bc387fe21dc12745";
   hasRunfiles = true;
   version = "1.8.2";
 };
 "cases" = {
   stripPrefix = 0;
-  sha512.run = "53c1a2f9b4106c8de8ce8bbb7c5814d8da34d2332b95bbc94d26a1ced6411491ec6c3abaa1f0e4fe52e88115ca62a084bcc674c0337940f82cacdafde221bc1c";
-  sha512.doc = "eac0633c16bf95fa5cb32e349c058f42f4b72a304d404f0cbaa97448c7daed1c0fa6430c641c07fdb82e742de7007f93fd777116ac71dc60d0849ef5705a5d1f";
+  sha512.run = "0c33b5791952a315c72b18225f0ad0e3f6f331fceb5c3403db4c0da089acffd53ef2b957c13bf3480dd02bb6669135f96e786b32955fcb374e2d9a8f5ebcf629";
+  sha512.doc = "b747d1ec39c816a90c665be10a8721ff612cb379349213bc2e470236afa80978f968bd2ec99349a9f40233bcffea87bd53c73f1155eb13ed5c2b0fbaedde83ff";
   hasRunfiles = true;
   version = "2.5";
 };
 "casyl" = {
   stripPrefix = 0;
-  sha512.run = "ec6b463859334c324899f7ca19a0557015a191489bcccf1982bc99c2ce4c6d247eb144fa72c2427eff45bb80e137fee889d41e17e9c480b5257b9473098624bd";
-  sha512.doc = "18c7e60a1ac400e8fc7407eb4b081f853cf0608b4fb0c33666ea17bcf4380c0eb851a044e19904ab27776edee16bb659d782bc1074396e22c0e24aad4f2ed8f7";
+  sha512.run = "b74ac52b7bfc964e19a97f1be41c240a41b67182ea08a05021e5ff1f16c87546f9e216721c1b6184d8ce86c0855d49c93b4eeeb575d61b79c5f6df12a85252c9";
+  sha512.doc = "691541ceb4ef0f0c021dbbfe1fe6b75c27aafba752dfb105f9511237871d5db11d434b6d98f2d94fa70521472f850ee754f611c395263ca1d42d1584f3d2ca55";
   hasRunfiles = true;
   version = "2.0";
 };
 "catchfilebetweentags" = {
   stripPrefix = 0;
-  sha512.run = "3365e617ba0b1b2da47596516de3106a151ca020da4f87ad1255dc9f4eae0a221686d292797a9e51cae7ef956b57960e1e6b46dbc5eca8cf601c127baf5016c2";
-  sha512.doc = "7703d1e96f0fc8565a3625bf15eef4a6f83f9df3c29f5b39a058c0415eb970526418cdd1fef55fccd7ed0708010c6b050d8b05194792e51ef03daa66ef770e7f";
-  sha512.source = "4ace1c3858265c47784ba067a187728951eb13abb6bfe4ee5b4cd53017361ff5db4a40be65b826bbdc22d8e3fe73ff7cb957d57e392e0e7682d5057c83df2099";
+  sha512.run = "b6437c502cb5e14cc42648d80c7c7b16faa1a68d2d693f67b319fba5375e4c2db9ddbf2379ce50871e3211cb80b5c161f7027a27174c671a1c0f300697d36b12";
+  sha512.doc = "bdbe1fe7e88e0c9456b050ea600669072e38a149c9f31057686e3fe72186c900280fb454bc8bd0bd2e76e52df9f65b8cddbe28ccc034530aa33ea2eaa7855fc6";
+  sha512.source = "ac7a983d840bbf46e372fbc842941fdfd6b632c35a15e37cb9d1067fbb07b96da21f991dc868c583b2578dea5cb6a7e04c2f4cf99d0c8731b476a2881da46e10";
   hasRunfiles = true;
   version = "1.1";
 };
 "catcodes" = {
   stripPrefix = 0;
-  sha512.run = "42a953ae440b4afa189d1fa8afbc5430d0f02a9f77650955dd3d454570de01d4989e25ab1b86e59e2de8bb853878bb11d885c688e1558b47d9724655f1f93f1a";
-  sha512.doc = "60e7147325cf567bc63aeb532338c261dc13b38596a0fe0b528e4841d9b84fcd51c4266d1c56785631c3da5affc57fab4ac2697ff7a90f83697b9d94228c9346";
-  sha512.source = "c59ccda3823955897f3fbba08023caa197f6ff70bdbd3ed792987f1dacbe957c8fb2f82c60fdeb08eefd396ef1bc08a7871c0653c83101a2109742d04ba68892";
+  sha512.run = "5fa20d32839ef18037c58361812588f2597eb8ea1872513a53a481a23955b306b64f0385b082a631d3b859e9f3e434a72a804c6fafd57c670650106b9289d6f1";
+  sha512.doc = "dd3eb46f3b9fdc1ed216c3594cb57264d60a2006bc36f103f3de844c846c7ab90cca09a8ae5de6d1c1559769e1b7d0814c5a506ef142eee1e739c7511ebbd6ee";
+  sha512.source = "c9625e787b87613032c5c6f1c47ed24558a3668d10938e4fafe3b28384699891e5cacf42f965f34f9e57459d6238e1d5e5a55da5a6d021cd7e9ba10c929d6b6b";
   hasRunfiles = true;
   version = "r0.2";
 };
 "catechis" = {
   stripPrefix = 0;
-  sha512.run = "0fb6bb097b897cb000a8cc02b07551d758e17ca4697e3df04761df1b54dddb723f572ad06ecde3e73ef9c248c5fb8ddb4abd5e3605e60a7ac2c1aa3b34e58f2f";
-  sha512.doc = "23ae2cd7a749944f0473f68eb0bf7c3ec5aee7f6339db788bd0a11387ee2f584065980a67b415ddef2b17c7c9281628a9c5b1f35f5d60b40e827c5934e6274ea";
-  sha512.source = "53150c755adfe49fc54b07fe272e5683972916fbf281fb176adfda41cef2c6b9964b49bde18310f3f7bdfc38ff806628212d0de9a31d8748b97b699c5171d8c2";
+  sha512.run = "984f1aff5076e64ca09d79bfedb2e65754d10edbdc988f9bb500fb24fbcea51e30d914dba57d2b278bfc3bf09b4c0b24e0f9f9222cb24d55207160339d072844";
+  sha512.doc = "7c48c99bafbf1020ff75a9ca9279bf0ccc3986dc12b460a28679334a2d57ea10752f521d8ef47e656a29ad11e33344f336b4517fe95a6c1f6b845ab795f9ee5a";
+  sha512.source = "5b03b098cc1bc0c715a997c778a39c3c001826d53b5dd35de6493f7f8192a8ebe3e10ecba0cc6674d3e54ddd782d1c6dd40b5740b29b4dd3ffc590cbb026b69a";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.2";
 };
 "catoptions" = {
   stripPrefix = 0;
-  sha512.run = "40746c7659d762901797f1ef6a4e40bd04edc0a7f5f53b8c1e20035b63a940f83149aec3c3b881ec8b3f27a237e392c4749385d4e67c1b1b1502948b16b7c0ec";
-  sha512.doc = "e46a9e6dc73ea3825937de5b9100462325a906715e83cf969b8714cbda4b6a69f6df9acce98b5213e24036c2ff6b0aade0292a70ce1078aad9d9e5083ba9912e";
+  sha512.run = "e89c0a434ec726691bca40b45275e13b2121d048d7b9d35c1594e6b44a957df740d9bae89f8d6f3c477d57f62774dbbc5a8cf6d8b5c3622d81ba82bcc640bd02";
+  sha512.doc = "0bfc8457a7f85dffda964a944d2fdd423943e46d7d043ed01a3726a5a42a47cf96e801c35324c5fbb4949ee452cfc175f231465cfd84b4f30dca28ba203001d9";
   hasRunfiles = true;
   version = "0.2.7h";
 };
 "cbcoptic" = {
   stripPrefix = 0;
-  sha512.run = "29e5f2a23fac58968927f0c820f6f7ceca73abb2ff69b6c9b23aded952bf9c75eaa33ca3a3c4933be155a95113650a2831c918ed79c8fc54d58633323738c31d";
-  sha512.doc = "3460f22a4d5ccdf4bf9e510c50e6b2e567533a1dad34dc5d933e86b0d8bf285b94af7a25d3fbdbd8befd1693c1f88c39a4aa1ebe8eecd09d86ed3450941628ab";
+  sha512.run = "d4d85998e0035d3498580f6bc4a4304c11493a6206ec19ab899b645a818e760fe5bccedabdd000c47c84a5f0ebd1f91dd5e99105a563e5856ed3b65e57d155d2";
+  sha512.doc = "89501567aa9b40ffa0ce1d16e4bae7a61305ea2a832f3e591f336e76c0f743a0232bc4fc953ed6e9eb9fde633132b8a750446d7d86a510131687577fbefd842b";
   hasRunfiles = true;
   version = "0.2";
 };
 "cbfonts" = {
   stripPrefix = 0;
   deps."cbfonts-fd" = tl."cbfonts-fd";
-  sha512.run = "7a258c834623bd653926518beff97a8fe4528e8c9eab1bf2f1e37e808dba6e5f478853d00681ce8b80a1f2e3ed85a60894c2dd86f10234faa1b79627c1180bb6";
-  sha512.doc = "00399324cd89cf49a5ba027615e9926f7067f01d237285ade8fcd7ecc7677a8caf58052bbf4298658cb28a49bbcc192d5751fa30a281944e3f1a7bb84589724a";
+  sha512.run = "e78dc2d81c28bd20ef703375d0631623f594430c79e79d89390aedb975e2d42ca93fff3eeb5ba7641b05163a423401f0ffedc657f5b76c9732e9fa66963a12cb";
+  sha512.doc = "668467e02d5f7099609c7f5944b07156777f9e84cebc320c0f7dfe9b36903170aee5e7b3b9205d59e5865a3514caf45da238cfcd1e378dae3d76f4822a14cf74";
   hasRunfiles = true;
 };
 "cbfonts-fd" = {
   stripPrefix = 0;
-  sha512.run = "47da74fc10763b78a1975f68840d0f92dd27c4bac67304ea6bba5a8522dabdcb21ce628b2083f5487d450960d4d9f7e9745dfa883544b8439655bf151a3aa73c";
-  sha512.doc = "f66162e3b3ac706698c30a60c664a1a922d30e6c3e4b34da53858443e5d66bf09df96725901e31ad0cc39a2c42eb15571c6d73e9a0451956c8e6ace84b31a3dd";
-  sha512.source = "b61c59021e7e33400b1d69d7317e6d07f3253af6aa621126186f630cb65d2d09f86c40968862ffb33369648aadff3c6b5138a7b711808c72a329fd9e6e72ba80";
+  sha512.run = "43b610537bdc7f0e5a5656f20024fda260bf53fab34a789db731d35cead1c2e97e9d90ba26df239d346e2f7a3ca7f915fa81c95334401fa6153d6430ff2d6a9a";
+  sha512.doc = "4c3cb2cadedd15023209ae5002fc95c905b7fc84833884e3114ed99111ce393cc470e729ac984a401f9631bb39fd445fd7422d11a3c0d992010d4a39ed8b8c7c";
+  sha512.source = "d4b4ad9cd84b283b5ee2688af7110ae9259d24179074f0328923c9c8ca460fb63a8b805a6596011b77368986e4ec285d7748a42b5ccb7c39b8cd3d8f5d81211d";
   hasRunfiles = true;
   version = "1.2";
 };
 "cc-pl" = {
   stripPrefix = 0;
-  sha512.run = "3d07dbbf626811cc55d5602ffc2492bd1d1fbd18364d01b9f38909d3eba5f5f5a46c290583b193ad1b1b1cc9ea5f91d201e12be75e2ac268588be247800f571b";
-  sha512.doc = "2b3539e2ff9dabbfd0f54f8e8fcc8d088bb4a8c49f42d1a2cf58153dc970a177c534860b2992d0a9db9c6cdb76d82d0b47a4d633095192a408a225d0c50333ca";
+  sha512.run = "62f28fdf7a2592b5e757857468ebdf0297258a21a52396873e3a374a711105f4e0450326fa01c427cf03463fc69ffde2cf3ebf811531bdb1b5c9bb6f8057cc94";
+  sha512.doc = "723aa12aaff52c98de2d8db38608a88c1ebd77f29512a2851dac1e9b1d975f0d99401143a7e3e2bbfc7fec1581ff655da115227c51276cb238dad7495e6ff0e2";
   hasRunfiles = true;
   version = "1.02.2";
 };
 "ccaption" = {
   stripPrefix = 0;
-  sha512.run = "9e1e34cc30ccd318b021561906c2fbbec54d586aec35e7249818d62d6e32b01d6758cfe0903cface1404804d4b7a143ee6ae4eb04ead4435fd5289fcbbc53c97";
-  sha512.doc = "a881ea7992708f820ae0040e0023372c2a1aed7a3942381f0d3e5da7c9f028ef7ac4792d511f0b28fde634e5c096423db4a9bd17ab8e380f29346f4fd4edfedc";
-  sha512.source = "da4e5615e6a14762fd1a7f175451539f4e55f99ed210423342019e3f9bd0cbca6336fb1d92e855848e5e6814e566b7b0377c4221faa1fb680f7e619807ee588d";
+  sha512.run = "cd94324f5e8a44d1690a9f7f03d84ab5496cef9ea3db0d6490211f60e819c0a197d75d3e49cb02e2d284fa7ce4590e603eb172fa921e3b427e02061f507e3347";
+  sha512.doc = "7ff9a5e3b1d7a9a22d33f4aea36e075fdaf58b555f71cb4b1d92ea676b9c87cd7320a710d25976d16427c0c12e76587b3660ec75a341de0a1be13045033a1b7e";
+  sha512.source = "ec393eaa90c5f9ae882c8bafc0539e32a7d8acdf321bfbc490bf3cb30131f96585b0bc15d951a9bcb6cdb4bff5195d495cc760e76106316a0b9c5a06099aaa01";
   hasRunfiles = true;
   version = "3.2c";
 };
 "ccfonts" = {
   stripPrefix = 0;
-  sha512.run = "1a1847e139b6336fd758725afec102c498f42b1770fc161434b1360d252c56a6b5eda03909fe88de4ef719f7a0a61cb6fc462831f5ab24b2c021870f498820a9";
-  sha512.doc = "289b5cb80dbca5726b39889b08f854d6d5935bf1682073efc99c9d2614fdfe404b8d9176705443eb75542f022f8ead861b3dc43b35f1cbe482e33194ca34db31";
-  sha512.source = "1c6418e4ffa78b3775b44ea7695ceec877f8dfa1d373d8f91f7c3403d0de476cfe6f07a84a01112a179d70bdbc4f36fc76ff7bc892d9bdc43ba3f07789fa34da";
+  sha512.run = "5d187aaa358360c87c1b5ea9c4345c93c6d13c6874859f2b11d706d9392b91d0ebb3b7941d10e12be5502357a3ab8c8ee1490d6c3c13eb52d2b22256c81cc6ab";
+  sha512.doc = "852f16671971b2171e6ebe8e56b236697f9883381d4fa0f3fe31ad7e7c4b8f429ec64c7dc5a21d2f5697be6744eef055b426179fddbe4e6aafc9b92ebdd6dd3f";
+  sha512.source = "28b64907c4d79bda5b228086051d6200e3e704335d994cdd092a3a9e78449cd3b52cd94bfbf5ec9009dce3f808936ce09bac593d2d67b06a45ae40d71706741e";
   hasRunfiles = true;
   version = "1.1";
 };
 "ccicons" = {
   stripPrefix = 0;
-  sha512.run = "782db0a4dd9eb03107bef2426ea7a2e7d0baa9dd7c95de6d2a4b54801bd5f2cd3cd7943688676bcec0773eece34773ebfd38782ac68c7cafb229a8e0b5bf6a5e";
-  sha512.doc = "5e5f6057d20c580c5fff55d92c049ade96c22fe4dcd9ff9c081d80bdc22e72f490ddfe07a6e6550b04c2a821c0231e3e3f8c4affe581b914feae20a8e65a80fc";
-  sha512.source = "66526a8e3fdecc7e922fd94e74a976588abf1da7c555b88c0fc11276dff1764348e59f3c3c232ded2843a3cc388b496f7af7926201e6ead7a83e41eb272c8874";
+  sha512.run = "bfb807e2140e4e0a65c6c43b62cd2c99cf80bb596ec8365685d1a81f7057f423935e2a57e70814d9fb092d8c1b4a7d3f47301e4db31bb51352f5d266572791db";
+  sha512.doc = "0262d79404416a037a13fdf77bd0144527ad0ccb69d5c12487edced63262741e64b0780e3e37cd9a149fd719c414716c347b06428c4bd93f525e76d62e4a6533";
+  sha512.source = "d8be599cc5fa07d33703b3050916d33dc4601716f8af7304dfe7ffab05c179dc45737b252f091c1dfc7c0f264da83ebcbf56ee82fb23634be279a9ae09f36ee2";
   hasRunfiles = true;
   version = "1.6";
 };
 "cclicenses" = {
   stripPrefix = 0;
-  sha512.run = "75fbfe57385f8382f923f1241fdff9b42bd0717535c5a7e124577094f1d2cf82f883a940ea1c128abf430199c3c399afa6196b214cb66e5000c0e0bedb9563db";
-  sha512.doc = "f22b292f3bd60a37659e3c990911ba79cfe1307ca63c368bede33b487a4932f21870b9bc1d721d7f6d3fbf87d626c9c1662e59e83459ce5018c9d5232c5772b4";
-  sha512.source = "8f537e495ae46220f45ef86fde2c19affcd8d9158667fd744807312ab2509a77558733f85f192244b9af0e8e127271c0458c821f53f74bea37caf89517ba9a87";
+  sha512.run = "317531aafd486a08dc1d4fad2be01d4d4d3bee4fd7b5f4220ff1e8fdca5cfc33048125cb7f4ea999b794086238db756bd9e6da69e48dcb34cd497c4c1b97838d";
+  sha512.doc = "2ec7804b8251a4f21652b6d840226fde0e9f6cd51b27e465bfa9261080f8169cd6df2b734a8ec8d2190affb630dcea7abcb3f417926edad39921584f41972562";
+  sha512.source = "0fb104f1d69a072c3b1c31d761e64938de21932e9831dbd88b29fd0a938eddc03b4179bd30ab548e58e09f40d72657160058e0d66d8ba10e5c991f047d417705";
   hasRunfiles = true;
 };
 "cd" = {
   stripPrefix = 0;
-  sha512.run = "95bda08e18b12d15129472b16a693e83df2432f264c4b408b9372665e7ec484eece423a5a6380e950cc9db208de4ed501f2f51eaf5849ded97c141312c8089fd";
-  sha512.doc = "99cd93ea1a7a738ae0e326b551ae7e8a4e60f5c8e32a659322630718da07f1ce758a134eea17e96d5c3cfe80b676b075c20a970013a1b99093c756b621e98b87";
-  sha512.source = "bf11f9c906f8f4d2d9d28a7be3aa3660bbbd2af524c9b573f6d9eecb8d3d4a46107adbfefdeea538b7588db6424cfb53b68150fb847d8fc1f23ae012ef9d4fe9";
+  sha512.run = "b0e8d4912487c57e87859f1e3c0f1b0db08e53dbd56591647d4f681f063519b9ca91a8e0b942fe344f9220e53d97297f032047655582341c150db7924cfcf241";
+  sha512.doc = "5347ed2a8ea9f94b857888c3411aaeb8a82ccb32952900c46fb2df6ade063b339a402f5fe204b0949a8df0960464848a638de8979206bbcdb986a31c4316a50c";
+  sha512.source = "7d6512bca59bee54880effe0a1055ba44a85020b375dcac36892f803f56ebdfc9841f28d25481de0db8eb2743736251780d9e33899dae97beebc7e03688ff2d4";
   hasRunfiles = true;
   version = "1.4";
 };
 "cd-cover" = {
   stripPrefix = 0;
-  sha512.run = "b625b34a34b20ad1c28fc6b8c31584cae7f94a7762914fd3dab96a0d9611b1e18a934d7a880aa25a45ab2e466b7c749c6570d8489d3dd3f3a213602c180c4a7a";
-  sha512.doc = "759a58aff64993df9f907b7b284c4646fbbf140fc9a3629735d2b6e86c2c7af4006dd393e6480a861912bd72f3d82fd143c1f98470df22b5bd0d47c66cb157b1";
-  sha512.source = "c0f0960dcd617075ec1c2ac9b7bb588bfde2a4314a1f9c2b99a9b98fe04b764b1f3bd9eb4c39ca27baa2e4506db24d404c8ae6d66d57b5b259499bcb955c2445";
+  sha512.run = "b0dceca272a0e0b1b096598c3b2b5dfa35f3bdf80c74be5820a9fc2dc7e7887a040120609fb7b3512ebb1d81312bc5c2d43b0fe4ab3500bd34292ee0375671ea";
+  sha512.doc = "06ff6ffed76e4790b98b2b6d103beeff362901ffe2ea809ce6f028d8dc09b53d71434b68e15d158de2e37f34cb7d30c9fdaccb11d16f1d495fd3faef15ed4295";
+  sha512.source = "da062c3184504f2616c5d8fa430cf5ae6e6564b24803cd450115073f48aa6e09dcb550d4d044446d4d79bc4056f4c79a67f43ab2532efeacbde3d38b15686701";
   hasRunfiles = true;
   version = "1.0";
 };
 "cdpbundl" = {
   stripPrefix = 0;
-  sha512.run = "9219fef0e90f20d007dc5681b5508b7d180d64e02763230a24fc95e2056683f64c4498237c1859cd7e91a9ce880bb99e8b95dcdf2f88b538c53bb1a4636dd37b";
-  sha512.doc = "6a1d621c475f8bd275c55221b3878017de8f0831fe91ba10339d7ca9e60e588f2ae16fe3b7c5d6741293865bc385f32af053776d8b4d13025409c2002785bfd5";
-  sha512.source = "eb273661634083910d43af415385b6f7d14e3efb138391f8d23cc0ee628f7409f6f568bdcce1aba57946790e6da39fc119788b111f4e51a57e25ca660b2c4c1a";
+  sha512.run = "10d779e3f6c2b813344b92f14bdf7f338b0d6813835a4500f6c17884edf246deae7ac8b7255f3b0070656dab69d01158db7a02462db7534dcff11d2eb63c912c";
+  sha512.doc = "147d3776ca85c4a06f4a6fc6e51f18c961ff1d09d58c5d8c33c855c0f698a8011da3d27f26b2d9d816518b371c48243d86440df980a94b47a582f6c5f7ae62f0";
+  sha512.source = "4715d2c1da9fb1792932f09c70506c047bf0e559bde32e709abee247febebd5d66ff6935de06704b99c6a69822120c807a8ef7c20336e0398af7f76d251cd66d";
   hasRunfiles = true;
   version = "0.36d";
 };
 "cell" = {
   stripPrefix = 0;
-  sha512.run = "46d82331cd5a6888f2925cc0624bcb5a0e69c1af0701a0649aeb556a6ab55a073ed11f82f34bba2ba694c22c6896abeaefce7c8e0acb76115b8e7252d342788a";
-  sha512.doc = "b4993741eacce22ab6080ee5799e0466a609caffe2181e0e306f4ed288ba9812d07944f3647d030a2b4cb5c8d3b3a2b4c430accf8d62965ce77fadfb85be4ad5";
+  sha512.run = "b9507f1a6dd13964381aa2b77054059ab6fdf48834edd7f358c773271bfbd66aeee824c8b6ff2d775fca40c67639f23ea015a110421f4fcba021fd03f187066f";
+  sha512.doc = "6aedf30a501b74c7dc9a520d371622536feca8c8f4aacc2aaa45488456937b5498da7b8c301c3897a7032ab2f54213e632cc67db8009bce85848aa3c3b9d9411";
   hasRunfiles = true;
 };
+"cellprops" = {
+  stripPrefix = 0;
+  sha512.run = "77b58c78d3d3a5e4cb81245ebd24eb217e14f6652f3f162d3e02189e57aba0911c751c2af9048a642b75589458b59593b77fb030d7811930fb3fcdc315da88b9";
+  sha512.doc = "34c1ea98295d9cb7448d331418a9ae9d542b44285e70c21e590d118a6e4a813a52bde29dc60c3cdf6c5fad677c18678a7207a9e49f0c41de8abfcd5d3d338279";
+  sha512.source = "39a183cb50f4b164045da20a7de4d12a7464237a021cfbb9d772c7cc7779985c7c6dc017ca0165e28011e9430465ca1175c39ceb9bb380c785879f682143c6a2";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "cellspace" = {
   stripPrefix = 0;
-  sha512.run = "4befb0bf6b0911d4950bd0e5d14d5f1e2d08cabcada080d21ec682a85a5ec2a81fcb158563fdf0df3fa21925a6474bd86e999de82329c109e96499d2c03e5708";
-  sha512.doc = "d92867bd6b4e108fb3b233f27a1f8b152de5e689f03cbc984e2f75ee2b33cebddbd6825220b634059a53fb4934846f4cbcc8ea226d8b07a9cc70a3c0af6b7cef";
+  sha512.run = "e337020908bbf0f880cb1293730c8dbb2e85fd044d112cd970f623e30d2ceea89763f8ebf904f1c24c256e719a244570e86e193031f65d59c8d8d1ad4f335e7b";
+  sha512.doc = "24b439cac51e0ab77e87172885861adf06db2eed3892fafd7e60ed2ceef7f9c6945ff5dddac94864cda2df00ae3ccc49a009ce61928a3098e6e76138ae4e6e31";
   hasRunfiles = true;
   version = "1.7";
 };
 "celtic" = {
   stripPrefix = 0;
-  sha512.run = "04c516a24227de95fc2183f989ea1bcb5b4bb26bfb44b83a24fd93f262b5f9928bcc7ab0f358a2a0d9724553c485a803b36e3519779c93dda522a6c15390c855";
-  sha512.doc = "53de8c2ed611d5436e42c423e5db7c4e78ee22ee7af24f00c9830f6a142fe84bf81d8471ca1074e0381a1d0a5df04bc94323bbf266c3d037d0b453b23840d42a";
-  sha512.source = "68447067d617e12112281fdf8cbd83a1e70233c369eb018a0c4b8c4a476dd99a34092798c7cd804ada824fe9ed6894791ea4fd83bf1c74b9e31abb5bc261fce5";
+  sha512.run = "ada569cc630b386f279fcd67861af564c34d8b2be4517c585adbb39392c0f84ec689e3e30574539d9d3de9a382116dc8e37b3259894128a7b3f26bcfa77f1bf2";
+  sha512.doc = "85b6a294fef592407f2aeb37bed2c8d6dc246e7e438b066d71ffc91f7c2c05772f1edbd4408e23683eeda3a0f4c8dff196fda4e1cad5023ace0c7c26ad23fb45";
+  sha512.source = "76f06805d6012915a22611076056ccba0eb9a88ec03c41ff773e04dcf538a79e9cbcb9d9a87d5550679d112abbd6f22e18094e428eaa37df637104db97eb943c";
   hasRunfiles = true;
   version = "1.1";
 };
 "censor" = {
   stripPrefix = 0;
-  sha512.run = "f2ac9f64a46cb2a402fb49d80d987c1c81591517e97ab88455b1e3553df746e1c6631ea43e8111fd84e20a963d9cdcf2ed3ccce397e1438c29960c5181ef2d1d";
-  sha512.doc = "fb179abfd79ae1951386fb2f99a56b060ec82a7d91d3b4ac492deba7a7630958a378a0718538c344bf816cbf85ba1a1e42d4988adc17b14635bf2324310a5dc8";
+  sha512.run = "e64d6ad7d9c4af4e2e346d87b3c988e26bda690b75c831d9d380303f7ab1def1742b0430f0e0f0549d58b5baac6ab6d6e9152c4ec4a4e12bb794389c7909df47";
+  sha512.doc = "0e4203cebb94e04202a3d19ad525215b44377d1e1e7f0c7ec4f88267efdbb8968411eba2781a44bdcc9b33010d589b2f1cf5caca61aa47715e9a713ca33fcd01";
   hasRunfiles = true;
   version = "3.21";
 };
 "cesenaexam" = {
   stripPrefix = 0;
-  sha512.run = "6d8ae4a7525e66b582fa9a87cd2a326392365234e2402feb20f6955ed682cdabb4f938b7a69ff4bf07981dfa96f05676082f9a6386f79888ae091ecff1bb1d25";
-  sha512.doc = "2de4f202b5e4a9d3666047c6cb84d0c09dbc7a1354ea463b3a0b51478b9d5ba7dfb70a854eefdacdfb69b83a0694fec7b1493c112b03fbf2242a34aa9a08f07e";
-  sha512.source = "4a134bd8b6c34d0b78b9fa612c7175ce6a2279e0cdd88034188bfdea1bf1f9ce3724bc0635e8af450e5af65191ca71eecb830b023171dcec55bcf6b7a9e0cb3a";
+  sha512.run = "8d8f972240f2278ee8f2b22edf133342107c08538d079511d579258a8efb8364a00c3a0e7484e303a5e9a2430ddcb309fd553be8fe8dd6c2a183c3f9a81de82f";
+  sha512.doc = "67992c61ecaad9e5e26d2854d7f7062ee887070bad9bc2488b760a7a4866c3a8d0766e2f6993e04a62b4c9fb12772ca31bc4bf800f669ee1eb7135289d0fbe42";
+  sha512.source = "b61e2c52560310a8c9c3833ba0b4933184489155dd363251281e4931aa298d75a4abdd5345aee222374e8f5291909e66d61f7f540638cab1a98dceea900ca106";
   hasRunfiles = true;
   version = "0.2";
 };
 "cfr-initials" = {
   stripPrefix = 0;
-  sha512.run = "306b0a288f21e55e4d85f2d86dfe5602b36e6dfad11ed692fe699909954722c853b9e57417eb2954b128935ff856dd418a6e796a4fa58ecf8b4387a44a28adf5";
-  sha512.doc = "d8802038e9f720a996637fe9dfce5672750d4b82944209c7f4312b283a4cfeeeb1bfd47ece3ec2a9bfa8c3d9927a88509c1798de99539b79c90f30573df55669";
+  sha512.run = "38e67dacdfae1cca9cdc4b83ac4cda7f2e52cf2fc4c6cc6a440688f02c094b080f44dfca5f5803280d9b4c9f2bb2d872b6a9a43cc1dbee3f2c2b39d9195fb63b";
+  sha512.doc = "d5385dfeb1fdec3f4b2794ef08ddafcab9e2271aeea787e944e08fc4ee4ca6da47282a1850f09e56ba2b870e8d1833c1c2bdf9164fabced83bcb5506f67edc83";
   hasRunfiles = true;
   version = "1.01";
 };
 "cfr-lm" = {
   stripPrefix = 0;
-  sha512.run = "272d70e1132713559dfdc7fab8e45fb80f1ef1044c98f1bf41a91651eb86973f4a78f892d2733c2aebba6fe097d227f419e18b76b59410f6ae33a22dc0833cda";
-  sha512.doc = "1841979926d6563f939308fa9045aa71eac92cec41db3a0a137894741a12fcf159a4bd7d96d80f2785fa3b5ee79e8a4ee6a489fc8c7be11e86ee4eb35dfbbbdc";
-  sha512.source = "4320bfca0a319f9d643721321dbed0c7f9e1801ef1a8d866da6cfe24e823b8f0235b58b01104f32aef9573a565b3721a7ef363e51611b23da7b6da87a482d377";
+  sha512.run = "959c0f99eed1914f2e04a2433b7fa4e2a7bedf6dad1bd5d16dd7661e3bfaee8642cf95d9aef7077e37c1e57ef2841137c768e8c31c392ed10a9540dabe87cfbd";
+  sha512.doc = "354bc54474d53172a0fc7dd48fbd000067dabaf21a4cb8da37c03b69901c3d28ba6006061702e058be38dccc6b9941ac5981ac8c79df27e9449a6946482cc859";
+  sha512.source = "2f8e361c4cbe991aaee880ea1f1169c1bda00882282d696337192212cf9efe0cc3c3c131ffe96630787806eeb9430cc8f8d552aa372f8ab12d6bcc8a625ee5f3";
   hasRunfiles = true;
   version = "1.5";
 };
 "changebar" = {
   stripPrefix = 0;
-  sha512.run = "75f1a79d54277390c013e687a8b147026cca2aa64f7808698dbda62d53ff05833c0765ebbb3bcd65b653b09b4ec25f23fbf3b4bee38b724f859dca0f0419b1a4";
-  sha512.doc = "8bb98ecd9715a5a288a5d86aa1e49df5bb819510e87d1ee6b615389d0632dc167ae0ec6048243797ec1957de465447007dea46a8167341d48999a7a6b620f8f9";
-  sha512.source = "6ad3fea1d149fbe861b68d36641366d13b24d5bdf0124ce502bc377782825b80d546a370c95ed9430e839559b48a6dd8a0d0e71bcd112685ef155a2a4d4ca57b";
+  sha512.run = "683bace5dd64bc747459274f22f995d34d1bb836a493ae39542d688f10222e258ae8c0b293596cfc3f9aba0f311291bd24e2858dac1bf6ad6dff1cb9d47f3078";
+  sha512.doc = "e3d83058bb12b1fc2f6ce3c454f9d2886dd57778b71e249ab300130c41092a486e23da7dcade992ec48768abfcb113f67261f8e17f450d47d827c5ec45855d74";
+  sha512.source = "eda920eab1badabcdf89ff3d176839ae873b137e5fd34e585d716dd1cba7b88e09634d9f49e4018bfffe72710fd030967529493d396c236aacb56ab9cac14766";
   hasRunfiles = true;
-  version = "3.6b";
+  version = "3.6c";
 };
 "changelayout" = {
   stripPrefix = 0;
-  sha512.run = "ce11edb3f73f76a8d3d68f597f862b4fa149ed52db72d68976fc17fc5dcd929930e20d845ddc5334e442da66f4b3b5b28e73dd3e40dad22b34db41d5a9da9db0";
-  sha512.doc = "8847b027eb0161bfff6bdde105f3aef794b560c9b7bdddf45b4810a00e928239a4968db6e7db61f0a65f64bf046ae26c85ca705f1ef64bcd9f77959ea9b3e44c";
+  sha512.run = "610e88430adafe87435980d6b1c6676570a5970633aa30ca42b112f743dcbabd2237e5bb6b4208cf1146171dc3a527e66e3fb628615e684052946edc05dcb243";
+  sha512.doc = "9b43f6137f06e5762186ab9fe78b2d45f1dfdfee413ccafe1f5468b69516a8238218f24fe4f0cfa18c93dfb7adcde706d84ef4ecb48f7af02b1af459dc8c7cae";
   hasRunfiles = true;
   version = "1.0";
 };
 "changepage" = {
   stripPrefix = 0;
-  sha512.run = "c2d608927afbc8765400a23070ef5c6ea1da7e78fb3bbd6e41ca5a94d7597a6ec19f19cd15337edd98004d831126f6d111afc4e981f95488e5a1431a5e88e80b";
-  sha512.doc = "79e427e43aafa6fdb1d2f053d657cdb8fdc36dec28ccde5e5c9679d814a9951889209b287d802f8613d41d92886eb5e78abf0f8b89e23a1648edc191aee66b1a";
-  sha512.source = "1b1a7b2a7f1cc4faec6bb145d01734494325dc1f5c5bebe0bd94c6c7fbb0a4e3c5a34828dd118eef19652a175716d02c8cfcc00d949f3931049039ede2adab4b";
+  sha512.run = "ddf6c6973809fa47a49d93afb1dcf68eece4f051fe77c2330a25f3113a48d2abd5016e2d36a4919dcc2150660db155ae1c6d106354a901eb45dcfdb823afd545";
+  sha512.doc = "28f43213a5120345e7f7287092bd5e48ede32e8d088ed7fe9c590a07ed13211599678cadb26533df9afc234c0aea8e99cb724c7d4e4449ee84ec552b4a84f715";
+  sha512.source = "798b76e1f020080a965f0f7c4fc04beab86218aee8dcc590d20b9d1657e641fc4923e6aa15788440e26d11b71e11c24ea857f21ec0c1b9cd9f50a46c7c6d0ed5";
   hasRunfiles = true;
   version = "1.0c";
 };
 "changes" = {
   stripPrefix = 0;
-  sha512.run = "c67b1600ade36c8e918cc622ab0134da7ff08b90ea46d68aa37c878ec76f0a362164499b11f3f8d73c733d2d25be40bf0193ed1a548e5ab826b08a587c743549";
-  sha512.doc = "5020f413ea5c5a5401dad1fb54d9ceb0eda5e4ba79bdc3c4e4e0843aaf04b9a137441c62b1c1b0c18cddb5f91d21f268814270880fef2ceaae8a432f6d04a324";
-  sha512.source = "4023d189792c346784610f9d6974ef6ea665eb2da65a603aa1a74a11f127a70b729b870ad81d4c4f16986269bffd11eb5206c70322715cb45930047cd0c962fb";
+  sha512.run = "70e2e6fbf46227e8146ee10c557870374c0978c356872957b60a64bff7f75cbc49ff9ac0f8b86e674191d6b49ad4711d0f6a5485cdc98fd517f119aa53aa125e";
+  sha512.doc = "0da26b74ad631c06ed641e95db75dfe0ca626ce8dbc0a496d10b6314a0ada134697534ce47e522904ce6d1c9ef8a83ee921fb3643736832f24739cb6c1b73007";
+  sha512.source = "3268c9327dc604723eb4dfd6da6bb44cd72770d225563c12efc11750605a07b610700231917a1d98c609ab2252dcd6bdbff2f8c2fa8856b95a2907b2f909f1ec";
   hasRunfiles = true;
   version = "2.0.4";
 };
 "chappg" = {
   stripPrefix = 0;
-  sha512.run = "910a8aa6bb7439affd7ec660c9341dc27381ae48735fa5b5d070f92b455d6baae3134d9c6d025518af5e3bb33b34e4253796f00fc4ea2cb5b7b4a4a4d34ec58f";
-  sha512.doc = "5aa65bbee5b9bdbbf487b038180f2d7c39babd5fa8c62d1d1dc0a52eed5d98c92949c0388610c2182545ad1707460313123eb3a399012b1915d11dd9853c33fd";
-  sha512.source = "23d56d9a7a7e34cb34fda9b51eb4b9bbbcd86997ddb81fefa7044646604382bf8a254ded2bb11cdc8fd9049c6a32c4dc9d1b22137a400133d5987d97bcefeae1";
+  sha512.run = "44d1edf10347760f9abdaf829b766799acb5c795cc10aeb814bcc2099038245ed16a88821268d1e6897eeb0ef5e9247c46d2c8375ead6c91d3971984f6515f61";
+  sha512.doc = "be3706c87b0dc7eed95e0458d008e6cc8db2c61bb39225ffc1a949273003d469e7b4b750574eda2a3e2432089b704d33bdaf3d06a7d189ced600a1cae07b28fe";
+  sha512.source = "de19f94cf698b44d6cacf463da3d7f7682216145acc9b2c40bad2e1379f6a029f1205ec4bf3f6511848b5507d342741d8a164bae7e8e0b105d4a0cdcb5a88ad8";
   hasRunfiles = true;
   version = "2.1b";
 };
 "chapterfolder" = {
   stripPrefix = 0;
-  sha512.run = "a0b341f17dbc5a153825ba154f0a114c2feedb29e4d4bf40a3054f9eabec59597584c2c1c62425592676122bdcb47138d3f95966758889bd7a60dd9fffc6ed4f";
-  sha512.doc = "3ca6789d590906d15fa3fec3ddfaf3d7cd535b257f4892894e475361c65be34c748c035240b8401b851e35dd5ee164d24477cc044b08f6221787a139343779e9";
-  sha512.source = "ecc3a985ce330549c01e9e25bbaf0b3fea02981a5c660688f960b92b92c29f9d9ccc48aed04eee0f0f30ac6b72fad7d4a5e70cd6825597cb857aad0e2c1bd1c9";
+  sha512.run = "80af283bcbc0fb84d899554777b56af3c529630d8a3ccea3df873acc8f28428b8264bd61c47fda119ccbfddd942168a4c9b508f3ac2936d69bdda4432fe7ed74";
+  sha512.doc = "c66e991cd5eab1b76ee7f84ac28ff95d2475b6c5969f8dab42057d9dad71d10dd5104d842011ff24edbd2ccf925d0e650c7a26ddea12ee2831648fce8921574d";
+  sha512.source = "ebc7e66b017475a3b6d0799c816debcab6ba82c517bd839b80c6401e395d938c3dacb112b6d2a2305aeca79e2f5e7248056f4433e7e040defbfd753682113bba";
   hasRunfiles = true;
   version = "2.0.1";
 };
 "charter" = {
   stripPrefix = 0;
-  sha512.run = "3d3b3ff98de156d8135a7befb4982ac0da4efaad32329119094794d0a7a9387c56b58d870e076a20ee5a70858cc8e15b81ceb73525afc92a9dd080de46fdbf38";
-  sha512.doc = "98c82aa7200524e405c0e244be512c49c3d114e2a718a107e7fe6f6ff9ce8700e8e8b0f70d2a880367e185781268345aad678108d7eb20293edb4a9d142d3a92";
+  sha512.run = "b637c4b6a0ac3214974ec6139405eb389469d9f791f433b2ff12b1b8b973938c8f9894972ffed65eda37fa8f0180b2f35041f3e80dd4f636368f6be2e01797bc";
+  sha512.doc = "fccb8cedcb662fefa46583926693556960801b53a3761e0d89579765f4ec97cb2c51c4d1cd5fdad3a332628d00c52bd4f4e1dd2155acd0fa28176959b99ca4ae";
   hasRunfiles = true;
 };
 "chbibref" = {
   stripPrefix = 0;
-  sha512.run = "d8eac6820ccbc5af1f90ef06a3dfa512d9073b4373fc92851b4b7a505d550133c370e6996bff2beb37e0a47f1bdaf5cd1f6fe527c4adb30e4d91a7962d5ac895";
-  sha512.doc = "837a63d9e18de02788e16d8c4831229709581e8fab60ff71e152cacf0b22db7885954baeac18ae265be649901140353f57bf1d6ac1aab319f7768b324f558543";
+  sha512.run = "de885f3e253b3bef43aa68b6e391f437dd6ba0daa5f3119e542368a49f38e42b33a88c9b331cad4b98117814fcc87efdac8c8b3176c4feb675e291d9837f8239";
+  sha512.doc = "40fe01905e69ca135d64fdf5e61f6b69e3ffc86e389ee83aa0357f7deb0268c18cc155ce34161036be980e10c00ed5506f69210cc634abf7690cf72ae4d95e8d";
   hasRunfiles = true;
   version = "1.0";
 };
 "cheatsheet" = {
   stripPrefix = 0;
-  sha512.run = "5bcaa23b09f95e0b8b88d3d4dff6f77b58c0fb84009c16b0c2b967b7ab03a8c87e99eeea1dba31a6ebaa6204f3fc4792df7a3d780db252f5dc26a1adfeaad39a";
-  sha512.doc = "44151468209cdb30982bf1b2aaadde0797dd72580cb0a13bb17d36e11bcf193c1d3a3ce6266864383766c22e2e0135636f20284b0ac941953d512883694c4f27";
-  sha512.source = "5be005bf087a16c9b14bde2755f11b8771a955bc0d129567b53b5cf0a930e8bb98d90ca04f7d3334e778d8d14c60b292a61c525c4bfe3bf3f7c9cd6cc6be5afc";
+  sha512.run = "39950866cbe1e27a9b38801240c3061a607b5aa00f2b79dd4c3d6fd1cbb17c03c7a88870741873c13b36bb6f45549debcb501379a797428ba1712605d1f01b55";
+  sha512.doc = "7cfaae5cd40f6fa83801292c9a666793ab1a1bef35d5460cbca216eea7f6d074c6466e5cdf5bf5e1de6388fc27d7c5260d327e30c91014675bf3a67dca3a5792";
+  sha512.source = "02fc1832ff6298a10aad49a69a2a3b6cde20808f6ee380a224cbc1382c592bc1f0a1afe8a246de9174634b52db9a283ef8108305447ed205cf4a3eb21adcadb5";
   hasRunfiles = true;
   version = "0.8";
 };
 "checkcites" = {
-  sha512.run = "76600f1ba2152b55640b334bb542418c0d69cea1feeff72841e4298bbf5acd833c172fe298bfe47aa69dfc0cb77073dd8c3a88b458ac4d86e5cfdaf045b1451b";
-  sha512.doc = "f030a94397ed1b2db7ce2d36dbfd16d67c5e75507cef0f5ba7992195cfaf3f24fa999789ad95def778001234df6635b9307cb3fec1472da8414035d4341ce6e7";
+  sha512.run = "b7c2ed45a32ebf117546ab44565e30eca0d3496f89df6deb50b1cd83ee43052b266fc07dc1638c365d5599d678f10a067b222c04d4a2075c2d8d1a02b57aa5c1";
+  sha512.doc = "88c46aa667f8c385a4d668d0be68e40d21f6df64f33a9ae9d6c0e8fb8e653bb004c270ba2c6ac7fdc7c3b555947353f09501ee5b48fb8ecd63ec7ccdc369a602";
   hasRunfiles = true;
   version = "2.0";
 };
 "checklistings" = {
-  sha512.run = "c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548";
-  sha512.doc = "771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40";
-  sha512.source = "8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818";
+  sha512.run = "20613c10a0b1a5f825ba975df30efa796dd662c90b330ca233c0e7d83b50127cd5907400860f714d395595ec5e6054ff4a5691ebb8a85d51172358f610d50287";
+  sha512.doc = "73b53c42d47564df296d3c289acf4bc790729216a61a9dc6630cfac87c4529b63a3e32e40b62204546968cf386c481081c0633b07a09851f01114a81b25d7f80";
+  sha512.source = "3433697eabc54ca3253976575c12a005677cf5ef1617d52e0b136b16ecf63a543dd3712155671fa3465c823bb11cfe5bf5f06730f2cf79382e23cf627f3ffc35";
   hasRunfiles = true;
   version = "1.0";
 };
 "chem-journal" = {
   stripPrefix = 0;
-  sha512.run = "d637bffe8b905ba45666d43b70e32311d9197e83e3b5fb8942b2ae60f8aee06986972a6eb9586ac244361dd523969b1736c27a968e9d19cfd0a5ec6292ef6ea1";
+  sha512.run = "aa6cd185aafbc10935ad8f430e21e59756ddd2c664efe4cce40c2bfa6b8838a5febafbd613215609ce1e6fbedc7d1cddd545a570dc9b0684e0d77ad1b8dfbfdd";
   hasRunfiles = true;
 };
 "chemarrow" = {
   stripPrefix = 0;
-  sha512.run = "f0f723de60100fb0a6813e55c8664afd213c3817d12126f8ddb46f3301bb6c4987616c734b7017cc45c9aa909c3ab1369fb87885eaff28deee3524b352e83c2c";
-  sha512.doc = "dc214722a98098ad37dddc92451190e1134cae8c2adae74d9ecf2678d74d28f59f6074bf8bea9a58862d214e8fd7ed64193f31aa86ad43d8dd6628feda2a0291";
-  sha512.source = "382db706acbb63cb7b265b6ed3fd1aac5f028e224a83a204cacf1da1ee95258a44af9abae1211a0c3c9e558d37a61936b79efcf53e353e389cb4ee411b889009";
+  sha512.run = "f35fe7f7b18cda788e33a3b4d8f4c9034fb951f11bb140a013b4726e2322b1db74233d97f2af154e99ccea21e1d25bbfe6d7553556e6315842d6ccd5d179286e";
+  sha512.doc = "794515c982b43c471382c97010f3f17a5b2d80f008783ec2d94051e4fcb4a37284d7b3d19f61b24c267f679a31c3b6c7463304489b9f8a606155a90e287be832";
+  sha512.source = "31241cc5ef5ba486bf5b9ee663df7747d12772c8a8f05128d2ae19d140bbf1cc7de7f56cb31d39a2e04a2a4cd6522a6b93781d872de57032dabd5f71b2ecd502";
   hasRunfiles = true;
   version = "0.9";
 };
 "chembst" = {
   stripPrefix = 0;
-  sha512.run = "f4f770c745a0b456e2189921548a7674e3d6fec98933a162933bcacd62d67e1364536db172e72afc2b3d7baa571f7e22a1f512e2a349a7aa1a03e30d0073c453";
-  sha512.doc = "77710f711906776a9f7ad2d0c02907e4de2a20a39e5d43b54fb43b5378c1c9b5ba6e1eee9d7844381efaa2740dff48e1d6c7cb65a70a9c2a5eccf0cc2b26f3fc";
-  sha512.source = "ab3384b3489ef16f45d1fcf840d8566cedbb51147a4bedadf950d14dd96770c8746e031bcd295b1aa76c56aaef19671edf0edf78b1e03c015f96b6f845f7b0e1";
+  sha512.run = "93aa25688e7647cf1a0172ade332bf3ae99b6b994bcd1e258abe973829818c08f3db860e7dcb7be07f8a5a30589135d35d46dd77e3f2a4b73bc85ef15c98f581";
+  sha512.doc = "c89f50f9acb10746928c11c01f77c30f8c41ad6ad0d079a58d0456a297a73dc11a9bc69d9cf299d770e775628dea70b677c8583d68e2ad2289057071db417dcc";
+  sha512.source = "27c1203413fb8d0d86483ec5a6c779a1e207a4ad66e07aab39276f40bcc33915f72a7dc29ce887912c6a48af6262b450ac90e7ace98373b79fd0265f8de0fdef";
   hasRunfiles = true;
   version = "0.2.5";
 };
 "chemcompounds" = {
   stripPrefix = 0;
-  sha512.run = "c2505bb8f50b693d6d5fad24251f2874873cf50de3cdbcea5442441633bc0660300f5b007d29f349c3682c8a303b4c705faab2602d70d47ef4669679c68f9338";
-  sha512.doc = "784884bcdee618314a1479dd652bd6e83f55a29b7e1633f935cb9dda834f1f3fca51d8c5d371be941cd163cedbf3d70bc7727fb83f35a20ad223e726ada61f62";
-  sha512.source = "a67bb0f03a508864b448b33b0dc2c4f03054466ec3da3e651ff306db5b7ed32122bacb9aad54c6c57572ed0edff9e6cb37931231cc8ab74b3d238215d2aace53";
+  sha512.run = "73d239ff027a51e5fc65263f8244fdbbbc859ad0562303657b4441faba8701cba993e5f5b94d609a6e06e4d6723ff81bd41ac33413014c2fbb4d24a932540817";
+  sha512.doc = "5b8699f6881605e26e68ab85841b3a32072fcf5decf5437c4e4fc650d79d9fcf960f337950aed5ba2b68cb53cc10785374488190fe3d9129d7d3baa313947583";
+  sha512.source = "807ea343b4b9dc910167c0445a70ff16caed25e31eeacf6f019292d981661096733b79a3a6abcc208ef6777c8967f9d468ebf11db557e5f92dc58765af591c4a";
   hasRunfiles = true;
 };
 "chemcono" = {
   stripPrefix = 0;
-  sha512.run = "30679baed109922aa28b585c535228893095bc37b7a95e8116c4df642d7651bd4ff5df360b92a4ea2574881de5b8defb88e74d1a729ed6c7c058ff2fe7786ef3";
-  sha512.doc = "884e8869844a60b3febdf903f41c94a7f64f6fc07e3f925c4c66d54514da5ef4b94986babb695129ea11eba544f229d1c4bef80e1c720d6a37a3c03c95041e1a";
+  sha512.run = "6f38750d0c3bd5459e38f6d5f2467abb294b6df881c278500f62dc53c4235b8fa8420b814cc5b008cf711796453733f312fd8fc7867fb2f422def16ef8481095";
+  sha512.doc = "ab7800a89efc97367068486793bef9b50bce827b962854bdc2a684c975821cd7000055de3b49ce807db8e993ef7b53bf6d54c52455a3961ff971b11bc9c18b11";
   hasRunfiles = true;
   version = "1.3";
 };
 "chemexec" = {
   stripPrefix = 0;
-  sha512.run = "d566267bb882baf449741151f4f50b73962bf02c9876a18db626f834b58d69069311c780bc07562af31ff9cadccd34f7cc9a41a9ab698dbeda1387c40fc2ba61";
-  sha512.doc = "5a706bc2dc2646fbfb63baedc5db475707fffa1bb6a8c997fb9f4e68725b2518dc566c0f7218e435d4f78821f8396af217f756be72ee6ff51c0eb3e31936c319";
+  sha512.run = "b5b08c513e9d4295b08bb6a008eb21b3a79ec89467c00d265f44f142d40caf56a48b421a64580497308c3a3ad2a36334f148129930b429509e9506645c5dd28a";
+  sha512.doc = "5eff13e4cfdfd9e0883de0a721da04b3b44648fd4db8e86b4ded3958299ce3c887a9b87fa78bda5c292288e0400125ee406134442fc2f119c048224f65db3861";
   hasRunfiles = true;
   version = "1.0";
 };
 "chemfig" = {
   stripPrefix = 0;
-  sha512.run = "b68cd4f1a5f257eb480bd67586eb9d400e63f01e738d7153b424ec6e2c6f14dbccab5b93a4c47e680e81398cb68403dfee8a4a67d762642489a65e4395ded9ec";
-  sha512.doc = "26750bb1e9373033ba4c24f562b9b3de9daeaa9077ff78167b82be8336c9627f8daaa720aa7327696128df80c7be2234b1ad14b0e380d9fa564f62c8defeb3f6";
+  sha512.run = "b90471170eb25263aaccad0747ece05d50a2de5dc71be55da19766ebdf0a48e849852ccc96dc97349592e0f0e012264eca2292d5e2a25a90a624be38986f6248";
+  sha512.doc = "fadbd54df60a693ed18209d924013171d1567731c702d6fd0e7103eb5332c3d23d9a737a65b59a86756a7bfc97709dc464daf1b81ead8a2cb032e3cec8c3ec3b";
   hasRunfiles = true;
-  version = "1.2e";
+  version = "1.32";
 };
 "chemformula" = {
   stripPrefix = 0;
-  sha512.run = "0397d95581531f1dbf16191a723ca611dce5931c604cc8c5023d920126bb1d3776b8c6ff342780f1b755b11b449b94d665c634789776a4db95d44200f6e14219";
-  sha512.doc = "82433ead0f70c00be8dd29536e4c1be3111f702a81d3b315def6ac267ba916fc8c70e23d05b91dfac65f705ab8560c1a106c06567638d64786a127247fa4815b";
+  sha512.run = "fcd15ebaba462a846c8492ea8f1a96abb83fbf7b36bb4546b918acfd4522d576b7ee4690a19fe0f68a45aef5fd811ab7cdb40aefec9b5b0fb60df5a037ef7c40";
+  sha512.doc = "0973cce31941659488426a9f66f50dec07fe46f0abb347268efec6c72351afcd50601d6b339fc3bb2c0c7c697e2e4ad4ef44351bc6576cfc642d76fe3a6a8bf2";
   hasRunfiles = true;
   version = "4.15e";
 };
 "chemgreek" = {
   stripPrefix = 0;
-  sha512.run = "3a836f3faea22932eabfe41c02788f21fd289f41f22423fa7d539a654f77885a0a0b78fd601fd4d454cf2e2760c68c4fcd4ecf3edc31163461c504d2c464a309";
-  sha512.doc = "c478af32b2a8631bd8d285f2ae16e3df61190363837994e6a86bdee385e6d93b186aceddd7e01fa2f2a01be3557673d76892e13007870f8dc11cb9c5c74ce586";
+  sha512.run = "10e0122f032c852b5e4ac1b8ab3c8ab5da9d9af9ed27501d387ca309dc6443a392f970f98a9d39af0d310b4bce18b908b7fc8f9dd7f23d40a22b500e3bb5a04e";
+  sha512.doc = "707aaac95e734cfddad8ab12c0c564e6f1ee4816787e909250884331b60b0b1464e435ffe15c5ca711a03b97e51d96e253442cdc93630275ab80e23936cde110";
   hasRunfiles = true;
   version = "1.1";
 };
 "chemmacros" = {
   stripPrefix = 0;
-  sha512.run = "b5e77e29adbb655d56c037c1e01db51889b1073ab9b45e11295f84980ee7b26ce46fc7f3d504da58e99c4e0fd8e4a9c6128b74cb46f0f1942c3743069d76ff23";
-  sha512.doc = "a19c3626c1d591452c21c1357f518687e9c96b1e09369a79704d0a13c9b1b2e292b0239060f1fe714a58bbbb7649f52cc975e255151501060ddefb755865524e";
+  sha512.run = "e9ec0fae61e67c077e88cfe77a42db93c65f7ba522c0e2400fb2005eed84e3fa16dd0c1194119629564bb1598fb605ff23e1ac17557af8c3f60419696545995f";
+  sha512.doc = "9ee87391f7da9f9142130f30cfafb09fe672ea2c3c4c2df061a83a84fcab442232eb467172045ad66c2147f4e8f6971bf47c5e71ed6c1cd8393d0c69e028488b";
   hasRunfiles = true;
   version = "5.8b";
 };
 "chemnum" = {
   stripPrefix = 0;
-  sha512.run = "891616ab44a43876eeeb02d835c7da64aa7b1c35dbe60ecbd49961421b3f57245e75100a570b367d7e60e7f07e4d151ff205c212425fe09631f00a8cb397e96a";
-  sha512.doc = "a504b6605e57e6a9b8c1dcbc9be5c1cfd8c1091ecfd6efc96622722ed924d5adb7a1022e090803905abd4ae35346eeb03df4b96d023067567444b984d609b39e";
+  sha512.run = "79f5a6bb8096ce69792464b224d633527f4a0c59b0134c133e532d6dc314c833b951c59ee425451d3796709936e60c13c26cd745eaeb79ffa580d29018b9ad41";
+  sha512.doc = "573278841e9174e38265020678667b7487edd573c259372ff9a77bd296929e807a7819ecf803b7962d43497aaac6a8c46a474a8fb41ef5a0bda1f50b626c96f0";
   hasRunfiles = true;
   version = "1.2";
 };
 "chemschemex" = {
   stripPrefix = 0;
-  sha512.run = "8921b3932e2e547445097afaca1d01b3e765160faee978dd869d955d06de72f1cfcc52814f39bab2f9c9790cdd64c0f70cb205eb68c6604cebeda302b568f225";
-  sha512.doc = "d3bbdcd218fdf2a5ec1e3647a5e42d8edb605514331030059371cfda6714554981a08d84558f6a0577a0a4efcc25b706d052ba7e72d7c906267cc8ff85a32df8";
-  sha512.source = "8fa47d5ca624ab42a69a29949e2798957dad407f279858a05323bd758ff3621ff0e861286ba0130651d36f6da4118d176f1f9cfe583f28a43b70a362b4eb5b6f";
+  sha512.run = "594671e855bb5bab78a42bb7dcd1bea30947d61e6c480fef8d06a21bd8d0f6630382b429364f1475f4a9ae8308a4f655f1389e59b3ee5f0be64f702d4437405b";
+  sha512.doc = "bf76f5e7d65f9b59c1b388464430157e9b4fd55a6bdbf10395845c347d3034fffcb0b18cdc56d769850638e8aee67c01911dfc1c6d96cb8d4ee99b1ea7100a24";
+  sha512.source = "e93b9c715433d3a92dad9926acc814d0d81eff274cff1a866fb28b8dce547ce46e146e5064ccdb683d8ad084d64d079175bc110223c47b57ae066cbe5aa7c16f";
   hasRunfiles = true;
   version = "1.2";
 };
+"chemsec" = {
+  stripPrefix = 0;
+  sha512.run = "6064af339a0a4b364ecbbb2b6c78cd16b71ead0d8f08d08ade479b003bae60a4a94e655c46f3d536b83d39c63a281a93aa604a26feb88811810e0ccb8071d425";
+  sha512.doc = "7a5c7eb943c00cb474603955557bb1162cf251a422b74360d49228e794dd46a9874515a179601ff3d5178d0d5980a074c08425395ff02811b22443c85bae15f0";
+  sha512.source = "147f2b8b44f8d40a6defdb11e70b74acf05f3085536b6bc70c9890459bb28a44a782baf438b2a4b53820a13462c53c691c250e7b4f790d182c6310543b19191c";
+  hasRunfiles = true;
+  version = "1.12a";
+};
 "chemstyle" = {
   stripPrefix = 0;
-  sha512.run = "0e2f2021813accd10d50811b9c19e2af05eb0e558b04fa51724b34c0eb7b1da239c980e8508c0a818d71b79bde8db25131603933c3fabd99fc674d1ffbe75e05";
-  sha512.doc = "408cabe25844840bbf30beeec129bcee8fbad100703f750b68afc232e3dc7c36b7aedd24a418501c5333e15174d3542ad21344cbd034e49325eea28d6700bb0f";
-  sha512.source = "1aedadbfb783a6ff4edc914e188ff6aa1f519d51eb28bcb9f148bdcdaf0569d947407e9cf6c8d63f9b2570014543cf82d9db65b97dd24e7a49d4de0d473a9dde";
+  sha512.run = "d826015964ca505befc7bd6f6460c23e9621c46c9fb17cf9ee02ba1c799a4ac1c0a34501e2d2b852df4387f6d06848e04d3142fa32276966ce059c7ab075ff24";
+  sha512.doc = "515f3ab082674073b128ce428ad79b50ac0a171ac07b56a2ade977f80477028e51f5347260b66c07f569705609f84ade59cb3f09fecb5d5668531836278d80fd";
+  sha512.source = "9f79dc5e7c57d71f97117f3432b48215ded78abbca9b0e0478abe365bb8791adf16c0eaff67e7e1f51d8430d2b1e8dc7053b1dab06eabcea19e5d48616880f73";
   hasRunfiles = true;
   version = "2.0m";
 };
 "cherokee" = {
   stripPrefix = 0;
-  sha512.run = "9d1496fcdeb12ede3b137aa3cae652b1a3cfc48dddfe38142bc889e9b09c5b89c3146bebdc5d356d98e54e1dad815338e9bd123d5058478433b391eeca9e02a5";
-  sha512.doc = "e1f926500b4dc47580d47e2ea582262ad61b11427235a9d5a71f66bded08b7524ac49c1be8b94a45f1406d84c0e7d751d28b67f16cb7742cd3e3d6ed3002644b";
+  sha512.run = "5a5225351f68dc0d73dfd16480c4aab886e9cdd563d01533b3c44b8a06570757aed12444f55f540c1d534fce66518a976a501287ddfb9c328e4690e12aa7f9ec";
+  sha512.doc = "d7d95347bab9915ead1f2e477baaa49495979b82be7116139c00d1525b09d1329084228fa35b053a8db11787b51006fc165bbd132ba4dc10b1b6ec21bdba6034";
   hasRunfiles = true;
 };
 "chess" = {
   stripPrefix = 0;
-  sha512.run = "48c399e9bfe51df765e8995a225df29fca21ba5f128b671dbaabe46fede7294ef4f4aa938a87cead155b130cc52461cc7b0624124004cfaf0b411470e1d5fa23";
-  sha512.doc = "7d406ed2348450866eab8d505ab873d6283b10c07c9459dd46e3754af6ddb7c29b5bb4894a3cea3010e53de146e06c74dfcb54414ed6e47156a16b076edba891";
+  sha512.run = "490af1195568c6588cf521da29eea488f6ec19044d48746c54c044144f73a948a938b6dbdd7be69b3ddc14252c76aaa22094471b2f8d3d0926086ff1520ce76f";
+  sha512.doc = "7a21923fb64b8f7c65be9eb508d662d8760329c7ce43704dd5bc852ad0c621f93920fc5b19024d73a7348ff98338ccbaaa3cf6745245e838863a6b7e7be1365a";
   hasRunfiles = true;
   version = "1.2";
 };
 "chess-problem-diagrams" = {
   stripPrefix = 0;
-  sha512.run = "4a17b212608aa615903809dc49d554ba424cc468647a52dd617df48fd7f41d6c4a6349db8f185a80764c873cd4d01f9d54acd0bfb7a48253c36d0f6a4165b6cb";
-  sha512.doc = "29c98393bfb0d42a6bcd2b4f9b5083860564d89fbaaced8269c1470693e2d3ec3f5b64020c4264b20d8c30d11998b17faeb517672082719216569373922254a0";
-  sha512.source = "5900304055158e76b68e35c05ef671690ce1288b7372446e717fab93b3beb473731653be9c69e979e0e0f60ef48e34cc6f62b5731f415dfe549fe6b6b563fcdf";
+  sha512.run = "1368f408f360bed5d7c21997f1e75cdf838bfce454a40de4d11fbdb88fda9063616d692de29aaf36feee92364ac96b977af2622b4f500755472cd6cef2ace0f5";
+  sha512.doc = "b702188a31b369ea887db7426d9d99d7fff1302dff2bc9694141bb7bf1a1803d99b820dd46cfe2efe0bec979c1e0a97086900d6df3af4e44764b4ffd470067f6";
+  sha512.source = "e64412d79b0f79d49734a0135be2104ad2ee753471beac6ac84cb84c4716aa28868ddc20a830d148854d8c1c5eada15d9526591d5fbfd2d1ef53f05e962fe280";
   hasRunfiles = true;
   version = "1.12";
 };
 "chessboard" = {
   stripPrefix = 0;
-  sha512.run = "1b6a6bd933dadfdf6d00dfd56c26a3b3800dada955fb26e05be58138e03be7a494bd3da277444878ea4f0e5d924fd27f2e2db242205d7c38719f6338b3c0f896";
-  sha512.doc = "8643d99327f963d2c93c7063dd4aa2ade3a4838ed0412763d48dbc95f5d41a925f4fca95fa678868282ab8fce56a09bbbe47a41c4713e4534092f17ff5f886bc";
-  sha512.source = "0a6f7a3b7b5827597ff2db0e83d42e42a61ac657f77c11b66f9f1b7cf00ed0312e5423924428e53b0f72ddc02063389f380f451bdb1f58cb691607033567f821";
+  sha512.run = "802e410fb61b63d92ceca09292a1ee587161964dbe1ff6a6a24e1a8e7c3bf855b837b674646b276046679f9184cbf501677286f44d6a2c8fe266b7c2b876626a";
+  sha512.doc = "dfa9e4e0c848759dd31ab8843803eda12869591ccc701796fe1e9ac1f6d26b417689accb9b81ad0e4a03384bc304319df4f7168af3338d06bf0e6861de8d9252";
+  sha512.source = "d469b8572424a1e5810d8e2211efef7e30a5ecea8be06f4a242706179ca3942acb9304c77fb6888c97e1f969fd9463710a7e35fd2fddf060b6872fac8f541690";
   hasRunfiles = true;
   version = "1.7";
 };
 "chessfss" = {
   stripPrefix = 0;
-  sha512.run = "0193fb4633517f7a801a4b555ffa28912e219f622bec27e032d12407ad6723d7971d2fa503ee5ad0c5c34a7120d84ebd8f4c218f3c6fcf2a8c1f9665ad4961ba";
-  sha512.doc = "866e8d1f0348a11f14427c600c0110b3bcab056c195ca7ff0a4aa4cf18814eb854d97e2c1ee5e9a5f3b3132388f3b66714aa171a1738c5302b005c6c636d9db9";
-  sha512.source = "7b04a9b78e58821d9f93f273da029cde483cc0c5c51a966a9a40562a3bee25788056169044e0c530d2cc2232069387d8631f0b0642ca5ea4c0857b634c475a4a";
+  sha512.run = "0016c59a8e2857166ccba3b4be3fc13a5a19b180837136edc60eb95be920b23d0d97cedf9fb15193431d9c5f6ab673107d77745b85e9ef32463b5eff056cf5f9";
+  sha512.doc = "9b19a27a91b7fabe25b98464f9ad7f258d28966fdea0fc446684f66f77500ed33fc641a5675d1ce479b2f35a0a3edc8071bc34b6ae72982a3dcb9fcd1bbf1060";
+  sha512.source = "5b1c160574e8d41d9d58c0e8865615edbb36acc7987d6386e86ece6194b0193fa44e483991cdb0cd7c82e742622d6017e4cae178334b5f1ee201df6c7d767aef";
   hasRunfiles = true;
   version = "1.2a";
 };
 "chet" = {
   stripPrefix = 0;
-  sha512.run = "296e3d6856038f7463fd5fa5bddd9351c5cc000731c3efc302d516a8f85e5f4ea6089d33e291823eac733b026754f050de61b5fa1b20346d9758ec5dd1269c78";
-  sha512.doc = "08498592b79c05bae257e0700aed5cc607d68c06235943e3620f3e767eda4ade84069b881ba6134926439a346ae78415ccc08608a42d7b181fe7f7ec11311a79";
+  sha512.run = "9a7a824be07b6fbfda73b05d6afe17cd0bdee515d4fd2a26916bf3d2afc22df0f5b826bf4006af646303177d7d214efdd54fc2526dfa5c23446d905e059149cd";
+  sha512.doc = "3d80a9b1478d29b489ddd795ac6eb0178224daf15e6f98036bf3aeb3ff3f7be59c5793060b82e84e246a64f6562e217280ec8ad27a5807b77cf8e34b037ee476";
   hasRunfiles = true;
   version = "2.2";
 };
 "chextras" = {
   stripPrefix = 0;
-  sha512.run = "5ef25d1b6388e18711ab95fa1ac16cb68d1c939bb8e3a441b1b0871c06291c6a048e463d5c366cf04927e238c145c35057caa20e8ad2f1c0ed6d006921d95a4a";
-  sha512.doc = "f9aa8a04c93fbd609e149e71b5be1b80a8a7ff90d30c47e2db06be8ca4e4648dd119f45224c492cc5bd96efe5f9328a16f955a5588da5c277e42e4cd967fe823";
-  sha512.source = "0b7ff2891300601d2cb7ed327afb68a0ae70033c6ef8c9a3093825cde80508734bab13739f98c29b61ff1c993d97c5fbe3165aff9e7bc67ea10bd6f1b925b999";
+  sha512.run = "e01ee6b48f446ec0a9bb4bb9ca29487652e1ff5b4522c8e7fcd74fa73cc1bff8d4cf7a77d38ac4cb33c23e9dbeec5033115e237ee828c905cb54cd9adaba4671";
+  sha512.doc = "19910b1f06ab7e2b66331067c787fe61ff79875441aaa24e21d8b9932563bd57e5cabf33e02dfffa51eef290d6e4e70a447f594b35c1b998b0467a56d36976d4";
+  sha512.source = "c397ca7fb4c770ac249cdfb081dcc36c3da0bde8a6df781cff5371b997e3010a6c3b8e2c7c7883d7262c0e51bce4e8b8e9255d4e181a1e071621095c520a651f";
   hasRunfiles = true;
   version = "1.01";
 };
 "chicago" = {
   stripPrefix = 0;
-  sha512.run = "08867df04a55b04a55a1f7551b5ded3171b80356a2b779e6675a43a3de79ed781faa4ff7fd1fc8ca573d75f3c7b510941dbc74312e9d082225b2339ab6c66889";
+  sha512.run = "3823c71849582a322466df9bf8ee35d786d6b37c2acc98b6693807075e4134739001c9cadbfb0197294a6ef943309adaac1e2ea2fa1dd73eeafbf0d84b838465";
   hasRunfiles = true;
 };
 "chicago-annote" = {
   stripPrefix = 0;
-  sha512.run = "2948b0b70b6d3965367bfce3d9561296c319fb64546956570107c0f85544b458601c4c46a7c54aa36afd2c87decc66b89c868996d83a68b32a6eca29d69c98bd";
-  sha512.doc = "ce5f770561b71ce5253f0e1f04caa65189911b5aaf50b6fb12f26c1d2aadc0b60548cd443fe70b151bfb15b48bcdc9c2efb00d447b5ddea3ad7f4c491148605f";
+  sha512.run = "273f4e919537517ad0919da30264360c05dbdabc45ad57cd2ff1c6dca820ff5320958f61a622e6641f2393a69c14da53a64c0ced16fe1ebf2ed376bab1a8fce3";
+  sha512.doc = "7fc3be286d55b5f612bd6bd34f5fcf2d98506b1fe5654b90107e3b7762a73e35f2cff20011d3715719521a8269334a31475df7d7c362cc065acf7cfa9657e422";
   hasRunfiles = true;
 };
 "chickenize" = {
   stripPrefix = 0;
-  sha512.run = "2dfa97b871f1acd8ee15114c7484cfce2ba025c8385b6a748a7ee9d33582bb6eb59ee7aeab25d9d173554d04ecffe931db1e77639a988ea2f289ed45534bf215";
-  sha512.doc = "d49a68d1141db2e894b778577ebe6e94df426222bb732d176cb403ebc96ea1b481bc66d5813f96c045efb19f062fe10e54ee77028810563cb0dcc3176bb795e3";
-  sha512.source = "351d749e39542b66f1a1ea0fe0254cf66e1a37c0bb10a8c4585153adad922e56ba42a696b9f5a3af243f2161bbb5996502a8b80d909072d0a1d0dea8f9081122";
+  sha512.run = "56a3a02fb791aacd83d26627c710dd9928270d8fe803984607e6d0735253083ab37b24cb1879c5ce1fc6e09a4d5194e466a5a6a262b463ebc3d019150bd4d3a6";
+  sha512.doc = "5168fd820e4a376ec363511dc114469091e1ec9675b874a74ebefe4a387c9870edcf4a25f7f561de21d76e8d3d4f788d054eb28937f711a75f611d3ccbc4186b";
+  sha512.source = "0f01520d20c1e0510ba02a83654528a045f24638205abae4be38fcb0e03c3691c03f2ef876042c9138937e0c1b8c27032c4e94892e9cb1940f9aa8cee3cd870c";
   hasRunfiles = true;
   version = "0.2.5";
 };
 "childdoc" = {
   stripPrefix = 0;
-  sha512.run = "a00a9c9cff4ee76d8f98e9145ce689891b931a22551f27c1f50f28bada7e5f283aced34050d9552a2d9b3e33c4081c511b8ef99f343a31356010b30d85365c44";
-  sha512.doc = "aec4a6c3e0a9fa99445fcca42523f586e025bc66bd12d98e71dacfd6d584c9f537f690a2ea5ee4574745bdabe941ab689cf36c25583f363ce8a15b633c8756e1";
-  sha512.source = "46e31a179bccd0dfd808b8adbdcc20aec84a8881e5b3fc7de1a27e42e9622b04827ee74b09da7971bec659233c291cee8e5d4de48b5be374235b6ee622cef486";
+  sha512.run = "8d6f77764cf04eee0b9247aefe0f13ba64eac64ace0e89bc2d9be931a5562d45ad2ce5c2889c1b030033f05eae4b42d5ab0a5a82eaec9a2433575f6b2e98a358";
+  sha512.doc = "0408eaae9b8a5682543baaddf30b04c0bc162328b4bc5aa319d7e78ff59a16c95320734267ba2106f9e88103d77f76c096c74e11369140cf736fddf169837cca";
+  sha512.source = "caebe4b0a80b092064f4375312c9f9f19e15b5235962b3a496d1ea34f1a4c77fab040383ca6ca1cbcaf4113b8d554f171400206a305e60cd974df90c9130f22e";
   hasRunfiles = true;
   version = "1.6";
 };
 "chivo" = {
   stripPrefix = 0;
-  sha512.run = "917e8685ef232eb09ec27dc46aa16b655541c8f4d41c8562fa7c7a3dd4716d7fada59bf4e0307b2cca3c258befa2e58324e04ec824280594df12ec43675c7e7d";
-  sha512.doc = "344999e996ffdc577ea5ad8edd633c4e23ad07e43f327a6b8642c12cdcc5ee6b42e4edbb62612c3145ca82df3a5f5757109eaae9b1ff6a19eefc2017fa4a700a";
-  sha512.source = "62fdde82dfb0c6e3e9c446869a03706210884ff3cce649aa2f367020bdf0200f675e7208899cb0100b7ae2ce66d7e605467bd54a88d5b2136a0ccde00612dd8a";
+  sha512.run = "e4993b185bf9595c389585f31738072728de027fda5689b00b8dd8435c7556f7190a2aaee0d91303e00f0d0ee01dfecebef7de084dedfb897f766c31392bef49";
+  sha512.doc = "9f360134bb7b4c315fd41d860415fe761747eb15785ec67101071738d08ba8f21b82d7f32fa50e91efdda65254d5d9c8a0091412d47045185e6798657598c6a9";
+  sha512.source = "ff4dee28c226cebf516381154863c6e42b5d5eb0b2d70b94a3e399bd01aeb30105e8a635e9551c97370472b39ce2e130ca8c698ca96ffdcff65d1d04011f18ff";
   hasRunfiles = true;
   version = "1.0";
 };
 "chkfloat" = {
   stripPrefix = 0;
-  sha512.run = "03df96555d853c826543941ba770a3b5adda50c2dd01559910ab957ae901f20cba813bf4e4f97abca907476ba111e1638f9142460c510e5f26a6fab83bf3c12c";
-  sha512.doc = "a4e0b552b6b38f618ab21f02417731955d729fd56c94aabaf08932ce497a30e4e922f63bdaf70aedbfdae5da19d06bb93e6945125340516d20ad8cd1a60cd5b7";
+  sha512.run = "f89d84adf2e72facc950770f4c8df8f179d23ef515df9f75da0d8c5a29c6f159576d77e1a5e11433ef7aca9a1ca968a133539874e6d517843381a6dba719cd7f";
+  sha512.doc = "2a146a619aeae54577db53b8b1fd564b9de9ab7dfd8615504a61687e575d513918e9e1a9d88bb9d0638c8dd72d2b4d2c2ceacefffdc04d224b11389181d8fdb9";
   hasRunfiles = true;
   version = "0.1";
 };
 "chktex" = {
-  sha512.run = "026de1fb692a00a81f0f67dea470dc563e56be93c7cb0d721ef48c65a9e6a03b947f58e8c4894a36a2873a99ce6da61f60d98da676116506a9eec7328e473e35";
-  sha512.doc = "e9a08af5146b5fd8c6aecb568e23734ec01445d92d8ac4f222ef5989435896d554feb9bf2bcfc058ce1e86e87e95ec0d0a12e4e939ed460722a176fca7bb8b8a";
+  sha512.run = "f3ede4ae8c4f56c0a3f9ce241617a2d27650e4dc2ed260a8b13be42528f045e2d333e84d33aa367d215a4f500af01f77764f61a73f2370d42e130debaac1335a";
+  sha512.doc = "5259ae0c5f186978cb5392df7484a6fd83fdc75bff5e840f3132a57a49bb0d0e18fec16017309e1ef1ec395422a1077248157ad57febb3bc5744f10f9a3dcb7d";
   hasRunfiles = true;
   version = "1.7.6";
 };
 "chletter" = {
   stripPrefix = 0;
-  sha512.run = "62f20d908c761fe289d0d0a18472e577675f242766dfc885a3386906b871baa5a8575b26c609de84c31c39e57ad5623c4246d56727a47612b41d4d0793c45b60";
-  sha512.doc = "5a02701e2f07569d0903414a111eb62931fb6c2b7223812290708cde241a731e3b3c14d1966f68f6318aa0767953c0438e513fa4850269c0b450fd7c708659e0";
-  sha512.source = "e068f1d6e7253203f53205eba99bf240c0f02fbedd895ed260271d55b6eb97e683639e33083b77dab408bf72a09197049b7e85fd85a7c8708badef287b8dc95f";
+  sha512.run = "bc5c46f79fe158ea19c68ca51f0c2f54dbcc9c65fdae40ac8206b4ee965ddc816100010e538d028734cce9df7802b9e16ad166d7fc6ed3c122e63ca18f253901";
+  sha512.doc = "81a79263b019ec7717727d4ac3fb6beaf3c7cad6b8efc9193504463b3a481d4fe20361489f07cee542947281751fd841db48c506ae7afa0e1fe9b885ce1cc162";
+  sha512.source = "e450609d0f8957ff3294f12997b83333e431ce9b1f6484568089d17fa2283645baa039f247d0a14192eba109ba5aebcd063a939f10cfae852a2fb7bbcc26d540";
   hasRunfiles = true;
   version = "2.0";
 };
 "chngcntr" = {
   stripPrefix = 0;
-  sha512.run = "1443e02aa816e724f6ad50e3ef4144afa3adc71529f5c97dd461c9c79ac4ff4422ef4c4da1ef163118f4391d3952fe8a57a56dc83f9c6d4ecb002e5f28e86ff8";
-  sha512.doc = "444dc34d1aa71dbec4e562cd06cc0d0d4a2a11d271ac7db05f5a53a33db271d289b4b5ea8190c5f24eb71a9532c99bfca86d7360866695c2ffdc51cb6e4ae59b";
+  sha512.run = "0e902dc742afde8cde229cf17d20cc6bf47f042d4c03c3771ee544bd8af84e4670c3fe41d523703db0c38c38f1867009b39a9495f0e4a52187bbf222dcacbf8b";
+  sha512.doc = "671e6032ff720f7febe20b2aea8977d57f108f3c80aab5d7a6376c79cb53b4ff88a9e5ebd31883b3a3adbb5321912677c023329f623c6dfef83b227ff5ebd0d9";
   hasRunfiles = true;
-  version = "1.0a";
+  version = "1.1a";
 };
 "chronology" = {
   stripPrefix = 0;
-  sha512.run = "85443ce827532b4213aea846526443f02aacd4a820fdef232942e3da54aa22123a41e881b379dd087b66523d22ef81e00fffaa5e747324095cff6815a0c9c94a";
-  sha512.doc = "c81438e09f4669dcb49afcb8f98d14fb23853d996e6103d58c8acc7e72d9d24819ef6e2bfaf31edfcbf088649b022d983eb5a542e0833efdb9e4fc7cd72d08a1";
+  sha512.run = "46345319ca67ea1c201b80cc527c37e0687fc537b2861587891d7cafd72e14b89ac8e7b589ea8e3fe62a7c94d538844325abe64fc9f2a6f035dbb249f3a96a7c";
+  sha512.doc = "18028e4013c272e94316fec67933e8c674716a07d745430c3dce239e34513cc0b9f3d134ef7aa7da0c0009253be5da5a59513be29dfc8763852a9a1797910957";
   hasRunfiles = true;
   version = "1.1.1";
 };
 "chronosys" = {
   stripPrefix = 0;
-  sha512.run = "0a0f9610c9f870684c54aff0fba424efb3cd6bad7eb0fcd766eb8900b275550a54dbf9337a459e10cc972a0c8c54e05d6304bec5ad7355b5704ef58f074e5cfb";
-  sha512.doc = "0916e4068bc44fc87e3bf92615f7869fa645df534bebfdbc3a20da492c3a2fb06508b212b14a1df69678f7189b7cf4409355f5d6aa09bd96fdc2e4855afa049e";
+  sha512.run = "f9a53feb88c5a2f5aad738b3c1550c4161d32b3eb35a67654f3ad44c9ba2795e7d5f147503a8bbc729893026d1da642301675825218625b155a882efc1862db9";
+  sha512.doc = "7716b7c4f97df7ea58446413cd5f1e3c15e75228ea6fa8783e06be57982955f1a4e467ce939c95827452f7edc9634616d0eac9c617a80b75a4538b75b1f625eb";
   hasRunfiles = true;
   version = "1.2";
 };
 "chscite" = {
   stripPrefix = 0;
-  sha512.run = "c468478dfa329220fb483fc6aa829b8f0698c1522c9fe30ede9e6805fe8feb558df0901da225c36ab0acf9db4472f91a56156dc7877af6aa135e58d408e51248";
-  sha512.doc = "07a8a1cedc93de22bdc7e76927fbbbc5426f1ce4bffef469024e6365c5373640f4351aa973466f05b2685f31c56522f3115d70b578e991c63b45e00206ead248";
-  sha512.source = "93f5a7c24b94985c4317d2ad652acf05266e73fcd81b4a1ff123402e4415a244e94eabc7af4689e8c300bfbc002a2758dff911be50d8d27aae72631f3d70dc8e";
+  sha512.run = "35ce1c67edc19ad4baba1aefe66c8369f97a247fa51ebd692e8c0ab7f2ba0d58de625f92d2856b865476211fdfb4768b5b51de50a2cac90d8f1952e4bbfcae54";
+  sha512.doc = "a8180c2e40ea23335f91b5f66829e90c6c405d845be88b5987c485ffcd15e67a866e420149a97393e22db9f58d178d3e449614774081ad548e0bc78a41d8fc0f";
+  sha512.source = "6b6f08a53a98301c7478506174d92ece0c05600c9de5f9656625d115daf16f3a88c28f8264c85366d530963b95065759a2f6dc69ab7cd4009f1c25bafb7d87e1";
   hasRunfiles = true;
   version = "2.9999";
 };
@@ -3985,57 +4083,64 @@ tl: { # no indentation
   deps."etoolbox" = tl."etoolbox";
   deps."oberdiek" = tl."oberdiek";
   deps."xcolor" = tl."xcolor";
-  sha512.run = "b0e89655217af82d65f20abae5fb98eaea91e60171ae6f14552b495ad31b1301748f0f65ba9c168c629f4cc53ad153c7b141051ed5748a008686abbd78d6717b";
-  sha512.doc = "1d22af84504e5c148e08f6a7cc58c1da34f740fd31957ac82427a8ecaa90f112568ed1d142e055988d7de5f2d9b3ff2531369c92cf97e219b09ead3d892a1c87";
+  sha512.run = "1b94bb78271baf9a32c0fe5290e740bc46a001d5c5f86c79a282aef0019995fde286d045addfa1ba39452888a98d06cc1da755faa806166b38f48f3687459662";
+  sha512.doc = "1be5c9f2b6a9d3fbffe98e76c0c4ba094f61a7e8f79bc541bf9c32928077094d0e814353eb87782457cc9c7ce0c0c2731237f6843aaa776d742b60d086a36032";
   hasRunfiles = true;
   version = "0.2.1";
 };
 "cinzel" = {
   stripPrefix = 0;
-  sha512.run = "7f3730fe79ccd93beb93db4c4a4553dc6c067c96ffb4310ead318558a87f97579d9728b5ae56117ab90536f3046563ba1f5399f8e087f30023430eef68f9eb75";
-  sha512.doc = "82eebcfb9468092ba427ef49b892bd412288b23751274d6d1b7735c05de76bf3926ac7464a87c4985f1fdd472591d2d457591d3eceeaac0d003184f6fa5be203";
+  sha512.run = "4e274d4ef5a5cd33059b3362d87c96cf3a8fc4dfe190239e4bcbae7c651c062b1b2e5e921363c668bb28b0610431bd269c1b16357de924868f247da7743a1f20";
+  sha512.doc = "52f321c7b2c33410e39ce1a9fe780ce7308df96b93bb991383f16badd761cedffdbeb68a5fbfdb123f2308cdf8383931f7be0b04576d64642cafca2e60fa3578";
   hasRunfiles = true;
 };
 "circ" = {
   stripPrefix = 0;
-  sha512.run = "414ba047b68dc49b6603c77667a7321a5774153b2687b777190d2b4ed58805ef714e4a1d2a20693beeac90cdc970d9280428cec2ee0e32589bfa489bff98242d";
-  sha512.doc = "16c5bc14e392ab703dab26aa235715a88001727907f21d79160423e1d5c8aace9066ea2bd1ed7791d8b719a8a3ab3fa4933c745ced8ba699c234792c4965d800";
-  sha512.source = "ce91e2af5183e1d904e7e4e60ecc57b4529785e3e337b51d64199c2c246401c0d8b18288222087aaa4e470c663c83d40b793130aa3b74381c8c3babbdcf67bc6";
+  sha512.run = "327b481fe266899b0c4beb805e0180b8b5a6ebb27e1bba8cea2a57a48f5c58945624faf6bb46e67ca00ebe20ef9f1920300d99d0ec2bfee594138ecb64f24db6";
+  sha512.doc = "64b626f8b7e17e96b2fc6f83cc0e41954d329d01742d6d5c4aeaa50e5a95c2e165160785657d8d8518996f9da8382bc3b6ed994542ab003619239c458a40593e";
+  sha512.source = "777fd7a8137e3f23c85a9ba1ade1c4d3926ecb2a5f16bff1c39a5a3ce22a22b5a4bd5993c853f899c770974dcc3000abe418ea19e6b5c5c0cb7b9070774f1846";
   hasRunfiles = true;
   version = "1.1";
 };
 "circuitikz" = {
   stripPrefix = 0;
-  sha512.run = "c30e904cf4b827323a91ef94157361564cffed12fb9aabe9fc566ae216fde0d419290c193b4a6f63a7204bd8ad24b3c3564ee9a8f23819cc00cb5318e3ac9bd6";
-  sha512.doc = "6cdd0239f4649ba5c1c975ffd597067213799d8957cd4d00472e80d36831e89db41e54a255a8e154d7ac257e61e7f3a8ecb4fe12e4a6c34fe8f7c4a0957f6510";
+  sha512.run = "47b56b86e6f2f64bcf588bea145a2ebc4fb4995123cd699cd730fb9160a0211242b56b3ec92d65d10078bca4f96711ccaa72d82ac934a08f7cd8f30170bb315b";
+  sha512.doc = "920c8dda8ed779bde4cad7d1fe7dd0f5eae048325c9e282646d60ddaa095a47d34062a177a0da60459d1a5bef6064e8fc9331fcfa6fb43cb6b9201bea643f9f3";
   hasRunfiles = true;
   version = "0.8.3";
 };
 "cite" = {
   stripPrefix = 0;
-  sha512.run = "3c4bb7a6d11b6361cfa7ddef0ddbae35fca232d63bdc0e99e06169caec61b288c037930056006550e6f151d0c3b01b26712f3b099d3e366e5c346227fd782f70";
-  sha512.doc = "7ead26735886f26ab8b006b080c55a390808037e24d640e6be6f625b1ea7a4738efae8e2f02b8597ca7a1ca2b0b90b201cb2f0667054a2ca406e66358e942c7d";
+  sha512.run = "43bbc63bc0036041ae949454e28e7f44cb6aa200d4cfc8573288f00a51de4a30667ca91c0850e201792f9fff47c37034ccbfbd1f4e72d1a6eb659112ccbc82dd";
+  sha512.doc = "77feeb9de2b82a049f72c57c0c3ddc39d9b7d5e49e3902ae89f315cd105a49ab5cd79ac9214f54b90129eed3a59aaf75d27ee22052d3d0b16ec4128c21b1066f";
   hasRunfiles = true;
   version = "5.5";
 };
 "citeall" = {
   stripPrefix = 0;
-  sha512.run = "89b96357ae159f9d9f0ad21343bb3131a2cdf3d84d54de6ef72937bea120c7e7feb783fe29170a3c5c84b8f6c7ad64cc98dee6df0e021f6867a677719f973769";
-  sha512.doc = "1a22dcf0ed7d6bc880dffe963951e7a03fd4ccfc8aa94d6062e86386046c052073cb2e0bdd3083093a3ca55a445a8ad6fc1072518924e7a6e41a5846bbdbdb99";
+  sha512.run = "743e65140469f9dc7074fe835f4bc323fba06c7c9425eab1514dd71cace902695cf7b5900e06e7db6ba1a25bcdc380f19c118244d069c30dd562518d7eaf5e06";
+  sha512.doc = "33fdedadc830e57834570446ccb0133439da38f8e85010708e0d9afe6257c44b35f4f109e647a3fab67adf0ecce2a0cf6e2fd5894b4eda723075be5e966f7c4f";
   hasRunfiles = true;
   version = "1.4";
 };
+"citeref" = {
+  stripPrefix = 0;
+  sha512.run = "6472fe09c8b5b1c56ac5f4b3a40f9a7607caaa9c39c06a6c2663fbfaefa196e609870af36c58add97da33fd831387bf5ead6cf4e4acf1de0807dd32fee63415e";
+  sha512.doc = "5e12ae0e1b43c5def78a50082695c051584fe82bff927bacf82c929d1269278b099cd7fb6391963b4cbb509c0f1ed6157f46124b869b1fde7fd406f050a32752";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "cje" = {
   stripPrefix = 0;
-  sha512.run = "fb25a777305aa7e4e56413c44c21511c1e504113c8f87827efecd64fd07e3f8933c75a333a969e27ac7017479d2d0fa56f6aa1bad8a72227a9afc9f7c645786b";
-  sha512.doc = "c540d7b07d3fafd564f06b4008758edffcee4de17afcea84646d3fa7b71aabb0bd97252fec7af5816f724d3492e0f9a5992a8fae005c2574c09ddcca8edb9e9d";
+  sha512.run = "c1a797b4f3664b47030c1d8b91ff5ba7bedfe0754cf81494d8e76646b447eddba2058c75acf40da9107c31093974b3df96d9a01b9cbfdf5c8944be8b881ef058";
+  sha512.doc = "f447dc2c2bdc42048fb2c37899e5bd28dccd616727df5604d482008b843bc12f1be21cc26542bd92140f0618a8618792ab97c7f262abce9d86974ba152d430d3";
   hasRunfiles = true;
   version = "1.06";
 };
 "cjhebrew" = {
   stripPrefix = 0;
-  sha512.run = "4e9c1dc4f3e47f59fd0c6cba768a1e50f1991f42e26344c28ea77aa0a331aee1ad69690ecf815fa61b31f19e41cd6c12b093fc32b26ea6f372ed282106e41fd0";
-  sha512.doc = "3e8906fa221ea536039e904fae497f0b686400ea749cedd204151d97906042f24f812482f057394ec987e75c697422ea3daf581e318f9f5cdea359ab9224e5d6";
+  sha512.run = "738a599059bbf99602bc8c542e5ffc70a47f6e446ffd8d678dbf507ce36e2ea9070af64d743ed1b3a3fe6d2eade960a6e7a3861a27edaaab3b0ce1d9c58d87bf";
+  sha512.doc = "c18851dd111b353c6412a1e60c3ad934af5e5ca3039f0cb70147a5973b37c561c88032100e4b848b8629246718359644193c9ef19a2e61c70202a01615547572";
   hasRunfiles = true;
   version = "0.2a";
 };
@@ -4047,338 +4152,353 @@ tl: { # no indentation
   deps."norasi-c90" = tl."norasi-c90";
   deps."uhc" = tl."uhc";
   deps."wadalab" = tl."wadalab";
-  sha512.run = "d4990c3b2b35ab4fd24f7ede6ae9a4c71a8e277351411a53f3c1254b4a09848cf6b6e87e11977448c0fc5b7b23a99e40df9e8621b1faaa31665fca91417394e3";
-  sha512.doc = "55b5adccae4a10bf3d8d57f374ae0951b990be90016c187cc53dc8b528cf6b5b4730b653cf8c2a7c36fe5afef98532112ba28f959e4553d9f8bce7d1fb406699";
-  sha512.source = "4d1758755c2dbc98d12795fbb364d1d1b678ca205e7f6e19501d47354fdf271f8651929faf229f8742167c55b22f023bd1e8ec53794ec30306a535764b9dd704";
+  sha512.run = "26bf5b97178f947769669d4b39e5b3a9c14b56e535b1d9143a0628d305ea20dbbf017850db70e98ed45a4b5b3c5fea23bc7fe95dc50002bb52648658669a6144";
+  sha512.doc = "12e668018eb51b9864320784ed5aa14845b67aef84ff4c13eb7734fe80ecf2fc4beeb70ef6ad234382d942f64590a0b11389e520011aab7ec5d3f1b548048bd2";
+  sha512.source = "aadf032e1e15513bdec19bd08f0bf1f94d5d819b0ddb0eb821086902cccc23d304171991cbed7a934441341eeabce4d5dc54234414c16ae419d8fa5775b9b943";
   hasRunfiles = true;
   version = "4.8.4";
 };
 "cjk-gs-integrate" = {
-  sha512.run = "8cd19007ba0ad404d28b6af5dfb6e06906f68c89f901f74501365781c39de4d2eef5561e5934d94c2767f69006b9b5cbdb111c73108ad7378457794b9bb1a57c";
-  sha512.doc = "26302545ca60a093759278824216d3d4343ad492824a644c36860308e0ff1c55d8242e28219744d741a6a78cd3c0afbfa5e41328c45aec232e39aa84f973baf7";
+  sha512.run = "e20cc91b52f009daad8a70b2c43f51d9703489f3d923d12135da8e9386ef5fb467e3e98d100182c5cfdb0c2412090386c18f6270e2e0c08db4e7c761b94cadcc";
+  sha512.doc = "0eb81c03b316eefab4508775813c9ecfeb06e81b841fe9dc5346f2cfc6e0c083a1f84843b782f913f72a05f890bda17be9e35ad613cf91f9b1222cf4707397cd";
   hasRunfiles = true;
-  version = "20170624.0";
+  version = "20180306.0";
 };
 "cjk-ko" = {
   stripPrefix = 0;
-  sha512.run = "3e3e8db8b1dfd82797cd55e9c7cdba41a845ac6bd99001a123fe8ccd5ed5292f615a3e2df39648ac470d28da32d7c790e161cb8a08e4addc56d101adc76f5c6e";
-  sha512.doc = "fc7382babfa7daa6f56d7975dfb3b10b420b64b2834f9918f85ba5d1b1ffcebe1117ee0f94ef4871f6f7db5d9e6b8f20796449318d8363b811d8bc3d137cd253";
+  sha512.run = "038b2b4730908ab4dc2ab2a51213ef82cdfdad9b169a319d9daca7163b61345a5388ec446a60d0227414cb4c2444c1881db3a651afc661327257fe3cc47135d8";
+  sha512.doc = "e8a30e1c77469bb60c4789f07cd69393460b1b14b75245fae21dfc1d443ef04be71d7bfcec80a14fb5847a172d7518ffc081e4248fc41593c54505b112372465";
   hasRunfiles = true;
   version = "1.8";
 };
 "cjkpunct" = {
   stripPrefix = 0;
-  sha512.run = "60607a26c9792322fe40411c83850df467e6160956fe370b9a30c5f8f63fa31f2382385dd47d9ce3871cce5682a81d0ebda9d0193aecffd857e3ceafe89b7e3b";
-  sha512.doc = "84cf20d4b11e84e536f80f4e9e145a326a21baf851e56e84bf8462cf0a90a59007678e9a4e24ceb266eb3174a7a3f1a50a96f4346e9818e0eef4edc76a887a75";
-  sha512.source = "46dd8bffcba395dc267db23d0cc00b02439507cfa63c8da69593d593fcf880ed41913d4262c0c0f24c89f597b7186297b161ef8e0f2663b682ae01a09754bf61";
+  sha512.run = "f40d96dfe648847e220eb5b594101e390a4d1b0e863a1259758ca4d971f82bc3a3477397f64f49f948ad948a1f26ea59e8582a8be9ed4266061a5c34d8928e7e";
+  sha512.doc = "ce245e6b941f527d920d1a9c779e1bfc9ea200b4229b8b0b416801e234fe859dcfb148aa0db1d2a9f4940239e0238e0d24800c3a6478af85d6f34a544a3f9503";
+  sha512.source = "e0045810c446280956acabf9e85d37cffd73a436b58db977715adff54f789814b66d085423d78aa9db32846bb52e100dbfebebb580a9258fae2211ac531342d3";
   hasRunfiles = true;
   version = "4.8.4";
 };
 "cjkutils" = {
-  sha512.run = "134cd36da86067d54ec6857cca1bb2d348adbdcc3c5ee82bb6d9c41bcfc6a91ec002bdee03b5922c96f07a983e8f09d23637d5de305bcaba851edf1046a64cdd";
-  sha512.doc = "d3b5777529ea068438294fab1293be1d8a781f64e88fcd2cd11b7d9f3d59fe6d45d9b3d33ddffd8039d0aaeaf563a8e65a92464f46cf2a4dffd2cd74a7a790d1";
+  sha512.run = "550177f316936cc107ae6902b334fa3b41f4955a51393ec2243dae92f8dc1a0547b3b181d6048bf171ef843daa2563b6431f5520b382757b4ce80795c5d02c76";
+  sha512.doc = "036a708dc3e7478ac47f479fc84de4130966b35bd6a8c57b5085356b5fd8a31f5397e5c67e60383fc2c7f8c3707d6b712afb9fcf094dbbd3d7e9f62271bd8683";
   hasRunfiles = true;
   version = "4.8.4";
 };
 "classics" = {
   stripPrefix = 0;
-  sha512.run = "8319917f3786b3d5538954d06f2eaf76f33ff27efb4697c1bc405fb5b7403a8c1ae2e96195ed689f5a105e03a954ed8cd56860aa97711142c7090ab1294f3a71";
-  sha512.doc = "435f82a7d64adc25d01a890571fc5df4698e51d2fa57498f10271c88e5dda1947d24ec5c677f444136065245631ed04d258efb5665ddb9df50b920f586c3cf89";
+  sha512.run = "1c7a689bb539df3adabb0da186f6d84382c9e0c682ba7e03fb279996e715ee1b748bf8aa0a5cca5fdfc465091dd4b7dd1f56cbf88638d656b85e5bbd6c02219f";
+  sha512.doc = "9202252352fbc2f3447d19ba53bb2a64c0d5c26ac6868a52f03a0cab52cd3fa208d2a0d2216af145f23d033e917670ae0d87b0e107e03f4ecd5f7bb29651927d";
   hasRunfiles = true;
   version = "0.1";
 };
 "classicthesis" = {
   stripPrefix = 0;
-  sha512.run = "6eeaa0c584439bbdb574a21444bb2f3eb19f440ea3f94f708c511925a8a7c34b2305f8eda279732937e81aa41c366f35cd950deca49ab39f7c775790b5181029";
-  sha512.doc = "4252a2d277c10b82c07ed8e0844350ef28d5391d00f6a42eb16009481e61b93f17420984ee14344f7cdd1944d3fa8e086ef5d0d1effb156935451da54712e072";
+  sha512.run = "cfeb589850bf340ffd5ee61cada1e153a9253b0fbc59fc5a43279d5c777e836face27d591ee9510262a197bcbacc8e1fbf86614517fd4bd61cf4364f07d2334c";
+  sha512.doc = "5a4a85ca2a1a5485b7b33187432e4e602758e88da31a6cf77ad769aea14c2ca58363c7d1808f04c75316fbc92ce8715c75cbf8034b85dab4c76ed75c495d7adb";
   hasRunfiles = true;
-  version = "4.4";
+  version = "4.6";
 };
 "classpack" = {
   stripPrefix = 0;
-  sha512.run = "121b2da7e169790a4ad79cd641ca08c7d237fd1019776807e146e8c1acf5036775ff611fad29496398379a05214a41d0445231e903c6bca94ffb702bf48f46b1";
-  sha512.doc = "11bd761f7dd4d225dd98bbdeaa8dffe735c4ac5d5f8258c4fc1fa2ce19661b75379d0321da7f173fc1eae9a583dc137206c1dc341a4317b59bc7a9424e43ddfb";
-  sha512.source = "e53fb2e813f8749b58bccf5a4468d5d2d07a08e51912fc9a8cde4c1b7319043d864b7517a656d4ac6b7c8043245c505dd3dbd00e017ad948901284659294b7b6";
+  sha512.run = "66aa1ebaa197c6a01dae5f891855b9983f231ed1bb231616e230d37f03175b2cc238c1e4ca60e0765e629fee6f4401606269957a76070c810be6d191726a4aba";
+  sha512.doc = "a141d52ca86b9d5f9aaeaabedc4fa61568a329ac5bcfa56bf3a0d4d15c806c4b47b97372ae44e58b24e48d71d4e560a38ac012853badc47cc352705e96c3d930";
+  sha512.source = "77192f6ab8a07009f3d006489575eed66cd53c9c171efca060404df11ee26e053856e497bd2fc128899adddc9ac4f2fef80c569faa3ec67350ec80b8b111c4f3";
   hasRunfiles = true;
   version = "0.77";
 };
 "cleanthesis" = {
   stripPrefix = 0;
-  sha512.run = "fbaf21bb0639a20a075db655a2a637692e8a297d1e3f9272bdde11fadd5471381f74be79d74bdba357ea4619cc5cf9072354155130aebed04a9ca938756258b1";
-  sha512.doc = "8bb60787bd14d21630ab64e6a682e08c88bcb04f625a3220dc49215d6b7a6f753e7fb01752eb6f2ac7efbaaaa381d2bca2b639c4b59028d61d0e5c9c24d3bf20";
+  sha512.run = "7d60dacfbc66ae1305e58497871d1895734288d932744eabd59974221f7ee5d9f52eb4b9ffe8f722714128d332c85b92deaed0cab27a70c25042d0a3b142c63a";
+  sha512.doc = "46da07fcfcde56d4b8ace8aaa204a58129407a19648ccaaa7e309bcfe4cc9a08299fea22184cc91011bfd844e6f06dffa8564c927159107c00f1fef57bb643e7";
   hasRunfiles = true;
   version = "0.3.1";
 };
 "clearsans" = {
   stripPrefix = 0;
-  sha512.run = "73479131fa65b1c3cbe008be234b38cae688b8e7eb156cfda8247803e08843f7f9a92e67abbf837d92dd2cde551d46289e930c585f136048cdf92bc8a43a1c09";
-  sha512.doc = "941012b55a719648fec013590f4527b369a68cb8224707904ece6451f76a0c179125abce054bc13933c619f3626f48f17265751cc70c22c925514fdd3f708bf9";
+  sha512.run = "e0e8f2a05748cc6cf5ab97d4be02d2694684a74fbeda56fca3ffc4210422d348c57936aee9b399edfb53fbbdad64168fcd58ab28141e472a618d2eedbb117e36";
+  sha512.doc = "4f6589aab2b4d84131c6ab2f7c158e42ed75b6950d7a7dd41d0028c939a1e0659603f33a6fcb802333db030a0216b89326f946dd9d642693d66f4566f9e5d96d";
   hasRunfiles = true;
 };
 "clefval" = {
   stripPrefix = 0;
-  sha512.run = "3623e04d3da96d17a6368341974a5eb6214b51d0ccf663bceefcbb079e7e55f03f308e3f4ed6a99047219a36e7049172d7e613bd4c8fac244a456ca71d149a9c";
-  sha512.doc = "4cc34a80c015024d3b0b81159265123cb592089e1dd28462c81a685fdb2db3fb926e0f3d9566ef0bbaad691e072f19a3220b866bfc671950638453e6707b0ca5";
-  sha512.source = "df3149c3263bc9a85ef7d87b2578293d02177066f04a242226a417c16a6445628474bd0108009cd68aa78f3abe7b4a49ca1296a8134f2f602a173379f0ecedb7";
+  sha512.run = "6ee265323f21486a57975543d431b036bc0347cc598232d96334bb1649cf3850e773e1108210212f2e0b440b8a4a39d6d8f0f5835ea930e4f3e5a407cbc54c36";
+  sha512.doc = "270e7e78fc901fc74622c77f86079e042bc4a035e07121e4e81f9e06dadb2d82fe4b6402c636f5be0348fe2ce1a49cfba8bb7f353914a9ebcaf67e73425c96cd";
+  sha512.source = "aa89dfd1e6c6426e6ce6df27c4890501fd82401b8d7a455cebcdbed3205f361af8c417ed9d05bc554931608becbdf066254195eaa89c68e21ecc9abbaa92ec38";
   hasRunfiles = true;
   version = "0";
 };
 "cleveref" = {
   stripPrefix = 0;
-  sha512.run = "851ac87467a7ed8906a564cbf10b211a43a35aa95bd8fcc03789be6856bdb1299e0907e26f3a085d28f5cd357bda98b782d1b5cf41c0a0a2c81193dc23868913";
-  sha512.doc = "8ef77b459b05b60f52e7d5561acc0aa5541c30f598c158f4406344d4790be972b978bce4c41fe190b9db9df59e89aa32be8a9df8bd6f7433a20fa9c98d7972d5";
-  sha512.source = "5b654f417f4677a4fd60c293e281c986a5a2aaf8884820c20d43894d2f36291d9b1d576fca64d55e89c8ea5d0c8cf732dfef79976a750499da7bc44bd0370cd2";
+  sha512.run = "1c5402b743e035fc2b903f4a3890c82d108932cd302ac54165ae17b2a3231e97c30fa6840833bf5c89c408a667a69f73e0e8fe614e7f8e05b986998aee5c6278";
+  sha512.doc = "da89a6208341219e452f56ec0c1bf669e85bc8628e5ff0222887efddfbd702a2c1cd492a8711ca70a2ead820144efbff3830ed10f4d600984f5de97a7aba29dc";
+  sha512.source = "ee718abdc24945923284bdf4a16ad7dc29ac8185cdc3f35e180b3847af2646d757ac8022315f133864afe1537b10588080195fcaea785166b081eb58c8288bcd";
   hasRunfiles = true;
-  version = "0.21.1";
+  version = "0.21.4";
 };
 "clipboard" = {
   stripPrefix = 0;
-  sha512.run = "456749a2137c38e1049145e1176d29ed3529767a5cf7d43a59c58371bc4e1341490add7be21d0d4bf7fb5ed39844ebc4207f79b760ad377bb61713c72f4b8609";
-  sha512.doc = "f2deb6bde88d67d04b6abeaa760d6fd3d919a15c244d9a824dd48c893c6ab4156a6e418c2652b4afb3c048c620bf156fbab074a717fd6b6b0a6985e73a2e76bf";
+  sha512.run = "f0b8c271c286237b90e3b10645e906735b78bae879154b184c7ce32554958148b42550a4a416f68ddb494cd788565e79ef65e9eb76c3eba97a82cafd93ed49e3";
+  sha512.doc = "d3082aec1a2090c2d2a9260d367465d7381af526510ef59dbadce2039ae1c0e4b9a95519f2a4f1055a85381645c88a72d14133eba5c51b2e582c26f5b7a2a35d";
   hasRunfiles = true;
-  version = "0.2";
+  version = "0.3";
 };
 "clock" = {
   stripPrefix = 0;
-  sha512.run = "ffdf90cc585d1c2873f567b570d1ac067753d9c51eaceaaf82ec14c86b441500ded09511a946cc65343c52f02db4bfd549be1db5d1ace07bcf5eead9e0cc7f79";
-  sha512.doc = "c82e981b24c3a124dd06c74fb448a56d489d998ff3b5e2942a306d96d190244133fdf5f729a8bdb51cb3fad887cb1872efb6cd6dff43632b6e0821e8b89fc853";
+  sha512.run = "03dfd63d161abc344749c42a97ee6579726866614f1e65d0e47e96eb016b4e8b763c3626ae74300ecb3b34545c41b94c211fcea13abba5392cf0d40caa7ad22a";
+  sha512.doc = "1dddd2b6c80c7badd7a10ec93c5908c7395207505242cd2a4c826d9e4e00767c9f79bd701e016d6bd8c6e9015306a02311460263d4b08e349e40147bd49d336c";
   hasRunfiles = true;
 };
 "cloze" = {
   stripPrefix = 0;
-  sha512.run = "da89c46a87067b1b7135ee3b75d34543912ed208823277f43bd82b233dd8f208714eda04b2bed90d38447c594a3f81ae8b7f742e17be6b962ce65a002b3e537c";
-  sha512.doc = "d01b30b810545fca6d3eb5a88f3022533158ea242d4cc289689c2d487ee98d50dadceb30f12747a5fc4a8014dd3bfb954fa80d96d0ec4bff0cb6f6e32239c8c6";
-  sha512.source = "b62d70834f9676cb5106737964d966a62c81f8030513706078503cc9496ff6dcfb5994a70d0c548d0d6012f51df9a048506ec52c00f3f6f61074c19d9c0fcf46";
+  sha512.run = "15bb91a94ce187d17a3dd8d714005689cf9fcdd3f0994ed31f931927f79b9e7b01c7121801f80423f3883ce5cb1e76c8876d97e72e43b017ee678a4f11a006bb";
+  sha512.doc = "66aac2115c6407af6642fee3d5386995b3c32efac87f8c013464ebd9537f4e08b7d084084477d387d0de7d0e5b933cfd121098a13c64816bd64e8a9f93863532";
+  sha512.source = "6e84a3b7b0d7dbc35e84678df95f6d8bb1580c8ff9a816e5906091136a64abccd063a82781d6d3aeaa9917072a24ce157c1ca5f8aa331b809be02a4a1ee6cf1f";
   hasRunfiles = true;
   version = "1.2";
 };
+"clrdblpg" = {
+  stripPrefix = 0;
+  sha512.run = "21bd4e41fe6d526bc2a31c64f52f784159bbdf1f57f9051c1180c22541483030f74b41beaa1cebb9315da063c3dc8ae58b7ce42e9b14d06e81d1bbbf87790166";
+  sha512.doc = "395028b9f523e06fd61688e3f6a31a1b84e4b32d5c5f66a5fd8d112555f7a13458bc6b32798b4a9c9d6670f85f44f73f925a0c63866f1ebe351eea239e912c1d";
+  sha512.source = "8fe423e789d79401be5d15d486c1d770c342ed31d944cdaff6f1c96c0485be580685fc9f378e14f8d518587161efa8c8373328e4a485e8788e3a3e5eef883cfe";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "clrscode" = {
   stripPrefix = 0;
-  sha512.run = "66cc8c7ff68b3428d1b92d91fb9fa5d1bb5513602dcf92113a4cb14d1ccb2307340dca0add5f67cdcf532e4948c17d4e4b11f5cff9e1204041184d8f54b1f0c2";
-  sha512.doc = "6674320e6485e22a5a6511841e51667e44c5a70ed23a74223aac0bf34da051a07478f68b2f911e13a4b2d1ce3c21cba59c7b66b36c0a831d74e560903ebb40d0";
+  sha512.run = "78e77750e9d78061506e6234f5132b1d2e38c4737c1925aef8e50c3da3720d219bed1bfdcc2448413ae22a237b3cb9917ec57ab63a2a9cb60a4f7ff7459a7e41";
+  sha512.doc = "c01b6a52de1ffb9bd13edb0dee69be08858d0aff29ce80a49ffc087b522df2be60c8e77ec4844e938b05de4bffd0f40b789d0aa48de0731b5c696170a863d7da";
   hasRunfiles = true;
   version = "1.7";
 };
 "clrscode3e" = {
   stripPrefix = 0;
-  sha512.run = "00f44bc3cd40aedd428e7ba2e99009fa4f7b7aa3a0b675d5389f673dd227de76312de79a9c7cc660781b8e7e65cca60e97cfb9bd9507cbc1685fbb2f32e4f33b";
-  sha512.doc = "c11d7b9320277a473b39ea899431ecc5e33fdf8a079498734df0fdde85a7a76e65a2a5ad7bce32c19351ef9749f42f7e1c14964758d37e0eeb1c9d2d6052397f";
+  sha512.run = "1ac50ca797a0866fed9398dd71cd2cd7d57fcf9480e06bb18926bca216bf6c13e7304ce1f9b8939ac4883bd7c385b0834b1e90318a7325a7ac81024fe543191a";
+  sha512.doc = "927de54698852def8741ba1cc1b104aaa90effa6cae0915f4bb7e3cb86a0ad94beae349c36aecd4c25f15df0c21035cb699bfbcf49579cb9815a99068d52cea9";
+  hasRunfiles = true;
+};
+"clrstrip" = {
+  stripPrefix = 0;
+  sha512.run = "9d85f504bf1f7ab9b801e41f82957e65b76f79452595ea043bd11a9cdaec90502caf630694c83bf900489e4361440458cea31743e0fa4f6ed92b1184ff2a324c";
+  sha512.doc = "7343cc6710da3127ae4a32e0d7cc2b4ce255f890196b0434b670afb4d7a847faa4506f83f7e071085da281ab57ef083eb975fb14544cc3d0d9e813e2dd28e86a";
+  sha512.source = "47a8dec3e683350fca158373fa3eb44878ea0c27737d34795c960db2b744d6da922840d7d6db4fce8757c163b94fac2e39c1549346e2a3a51c7c8a7285a1f670";
   hasRunfiles = true;
 };
 "cm" = {
   stripPrefix = 0;
-  sha512.run = "99f2d5e27e12a039f64d26a807bf68773edd5c40f2d672d86bac6d7db61e79e5a8c87b6252324353585287d4aca6d9de7ed491ab7e8ab9fba78927367f645943";
-  sha512.doc = "ab294bfa7e4adadd0b08665e7c46136fade4ea3d3d2528847f4db3c389cc02c9f5c33c4cc801f750b33e932657ae1b522e207f80272be33d7a32634f20e89bcc";
+  sha512.run = "7504a2edcd495ced18dba96b0a7e90e7f0cbee7cf4da54cec75dabe910eb5ae5079f5a6be93422ff52b0459abbf66cf744e1498a05c6703d668582761e13a0ec";
+  sha512.doc = "4b3b04c6015e3e5ed787e4cadab6e4d5467eca8d0586427a58a9e540fa58da39a8d91d5bb798142828981405232dd483cbd1102083c904c0ed86f6ba6bac7ca7";
   hasRunfiles = true;
 };
 "cm-lgc" = {
   stripPrefix = 0;
-  sha512.run = "7130e2c587af950f09cad4cdb043f111daa597ef7a7b6c2ff6ec15b6f1359345d1d30be71ad727cc2f68a3ac4194d333c409413c33e8f7473f1427e04608af96";
-  sha512.doc = "9a41e63c477dddf335dd5e936a65b91a23d855ea7d2a47dc902b9bebab118249d095d99243b4cc4eab9775a2b63178f370469ea190dc5e43981203ec1f4a16d0";
+  sha512.run = "81bb2ff1e126d5e4d4dda698885ea65a2931bdfe0d2b2f504e0af4d4b40f95d8d2cabc655dab5ae0659db4efb2c298b27698368871a4b4326ed47ca4b947f949";
+  sha512.doc = "d2b09136f219bbbba192e68c520ef9e504fdcc5d9d2d60ce00f6a8554882c747b026b6e3049a877d537c351dfafe0c4b24c7b4b047fc88d5c5d1feeaf5c6f163";
   hasRunfiles = true;
   version = "0.5";
 };
 "cm-mf-extra-bold" = {
   stripPrefix = 0;
-  sha512.run = "c792e196e54fa93f2e1daba16d06fb53410af11d61f96a3cded008ac4ae1df3ede5ea47945759ea6f1ec761411a45761430c982c0352f65f3d2fa37263eeab5f";
+  sha512.run = "08e326e1d9a550083459f1aaa3d17330509565f7bc9a42955a05def87335815dca713592ce77a181894a0e3846cc30c913b0c4976335c98991f1ad322e3bc85e";
   hasRunfiles = true;
 };
 "cm-super" = {
   stripPrefix = 0;
-  sha512.run = "8ad0ad8119cff2d8bc6e5eda4a214fed1c28f5c645f815c895c92055c622fc8c46bfec130d49e972e800128c57e7ace3e61c516915afb1284c0fdd5b5005f97b";
-  sha512.doc = "faea0c6d286f475501326a55f159e7c42673daa1f69d5035bafe50d398220c6361114dc3e6967b8fc993fa645bea2167e69fb9a3f1f190609ab28c292930bf32";
+  sha512.run = "e779df1211337be41aaa36c25881744f94c9aa57fa87d854c9edc965cbb65579818aa9129dceec9d747f3740ead0c591c4f93d0a4609e59376ad53234df37ede";
+  sha512.doc = "8b12ff0a2fe86e7daa85f278cbad6014f2ddb2f8e8a7831b6d86ee2d550bd6ea437ef9fe68b6815a3ddeb4fa2304178d08122c197951a5e739009746ae072d7d";
   hasRunfiles = true;
 };
 "cm-unicode" = {
   stripPrefix = 0;
-  sha512.run = "307548899e2b772083fbd9fc491b123634739a6069ee78dd70158ffe4a8256a1e838b112c7eb3dd95a247d385c7d25373ab7a9e58f762a8c0c509df351177207";
-  sha512.doc = "9e2022da409d461f8db20eed69affc1067de0603b8c1e287285eca3c1242e20885958b55fbca2519dcb255852ab6ea0a94790da0da4a5ad781d9283c47e938ca";
+  sha512.run = "b1b48d8b0ad636cdbd2d8d9b24d2d83cf223df5b16bea3f3935ef2233120ea7e77261baa17436b0e3281c9e6a285d180fed4c6f566e0b132efd90489021158f1";
+  sha512.doc = "d2efbc103e829246d5e771f0788bfd491c6b227927bcff6d664acaeb14763a7b83b9bf1c0e8690356f57723488cc9c861e6c3e401f6760109f6e6763485e930b";
   hasRunfiles = true;
   version = "0.7.0";
 };
 "cmap" = {
   stripPrefix = 0;
-  sha512.run = "19dab15cc84badf142eb88ff1716161eb6f99cea1375732d64d3466565c81506c09ebeca46d5c35b66e54acd6642c1f8e19f0cf8a2c2cbdbfa298ba580eea901";
-  sha512.doc = "e4605053a9540ed11b33937f2c339d7c1f3da8f2c406f7e10afc78d8b5fffa5720d265eee916c48ee4171180fbc82def9aaea3cccaf20fcfe76ef1f0dca7d0e3";
+  sha512.run = "0cdabf9c300accc209c4632683f0561158d79bd78d2dc24b26a49ed074647ef5e0c4fde5270a44bd038138dddf8ca63263f62e55f7236dc106e47aca2311bc44";
+  sha512.doc = "050904224936e112f17e11d67a3476cc817e8bb5b4ecdbda3a6ca2600a92e94a416c9635ec071f779910695eba64b6f1ba1028cea6b00070e69d51c731bf6d09";
   hasRunfiles = true;
   version = "1.0h";
 };
 "cmarrows" = {
   stripPrefix = 0;
-  sha512.run = "d2fb40c926281d43b86501da997378857fe6d62d9d9ca5c1f384d9440474feb5fba812085efd168726b9957a60dc1732b78422671d42bbc122f706e0d55615e9";
-  sha512.doc = "41e15755f28f8f352d675a7e698c311dc23e0442d96673624b03e8089c77fc29ffb87012fba663d7d6f483e19fcdcb53704892f6912fafaaaa4c268b842cf903";
+  sha512.run = "ca8293dcfdbe54b240e20f59981edf36f67de9c28ddefe968bf344bb2e9025dba3aa9ae080d9e57a615590c611daccdfa5cbd069e363ffa45acfb33f3c31b560";
+  sha512.doc = "548f581bdf1b440e1c558c0589bcc9d7cafebb65c6cac470a29c6fa46a6734711709d8258e532bec9892b16b4772828fb1985655b2af34aa03f03dfb1c27e650";
   hasRunfiles = true;
   version = "0.9";
 };
 "cmbright" = {
   stripPrefix = 0;
-  sha512.run = "335d16cf2ead806671149034986f861365aa899f0016970d20024bc27c9ec78ddb848f141e3d5aeebdb3b368b8857e09fb797afab3410a3a3101b070446d607f";
-  sha512.doc = "81d4b85323c36261f9a67dc56653b226747eb46091d410d9e5af67d34a8b6411e130b0af31435e303f8d131bc2e63ec29463dd2d87b4d920ece4b21caa991aed";
-  sha512.source = "a55eae7cf4d5f7d8d6d94a24ab022b74497b58ce4c7d6e8636f4fa093588aa76383aa8a815f8fe9b18d7e4153613917179420b243d8b4d0550d4caa2e92ffe7e";
+  sha512.run = "9d935fc8714aa891367f8dc8655add435337fdbfad83eb3b3b7cd5a5a797133e2a41ef0d8ea1a4a839e2c92c9f81f0959c37a2ca3ca3354740a85de407204241";
+  sha512.doc = "eefdb387f8abd7941ed945d5ce74cdd7614dfde26a5c0af52b8711280f9beecadde5e130985c9f6abdb663ab0e683d80f905c93c86cdd130d8004178b173205a";
+  sha512.source = "246e4f17c133af66ad84d95d78836cf34472227908ca62c55ebb2c81a1ec94ff16cfe850885c40e893f8d5b4ca3adb0126a9ba4e4b4ab2420851a1a4615ae4d1";
   hasRunfiles = true;
   version = "8.1";
 };
 "cmcyr" = {
   stripPrefix = 0;
-  sha512.run = "ab8fa41ff4ffca003f71154f18c1ef05fbe5008b41a4d80b486ba972b0189f44faa54e74388a8bdd3e764c5c86ef0e8b425df3a8e343886d0b59797952cadb43";
-  sha512.doc = "5d10d32106966dfef36d65f1b8cc06752ec896f007198d48c591ae59c8c02acbf00d598507931c4fff0a6e563fbd52bbf3281ac3e6e847b30388df3a2a4e103e";
+  sha512.run = "52f0e727f4b1d53b5adc196d20419e9b97d70cbba2fe477aae86480c26d835bc3254e9eb402b4bcb03f0e622a30734a3d99e530c7e15a137493ce48ca5ec8614";
+  sha512.doc = "1c620d7bff899141fc6ba221be566a059ec412b4bbeab3e7a3f23c8efad36bb5eff460ea5ab07f0d507124ea72d318489a5187302815d7a11e9454b9fdad6a13";
   hasRunfiles = true;
 };
 "cmdstring" = {
   stripPrefix = 0;
-  sha512.run = "10419fc0a336acadf05871cb37fe8c2c36b9b3929a81286624561e3f66f2ee6c1239293d5583b3dc3fb77e79857e4a7394b797b7dca54475fe9f5938a85fba41";
-  sha512.doc = "f42200b78a1b0606a69bb5a72d91010ee12a6ced518250956cce8e3ca9f5c5c449e554a4e7803e5d890b965dc76c37616cf72aabb81dcfc137c9857229ac70c6";
+  sha512.run = "b9c97612aab11be19f4e4e2cc6bec679351c6ef9f7ab98f8eb5f7dee1a6a2086dcab59298a81e11ba027de7405f56bd123d81eed8464646813406b22cfa54243";
+  sha512.doc = "899f447a252751fd4e5101d8e0544f4b5539b3dae10f8447ba3055b33a3dcd99b4040d266033be0459d5d3fca9cb349e851d07d45771ff31b9fc1bc9a72b9d18";
   hasRunfiles = true;
   version = "1.1";
 };
 "cmdtrack" = {
   stripPrefix = 0;
-  sha512.run = "07215f36e74487935d1e9b65e24e5aa3b6ac276714ed61c6d801784ff955c4b4685d8905521749906cd216d5cf4a2b0e688d9a95ff073025ae08ca5fa0804963";
-  sha512.doc = "01d60c452147b6e9fd75fff3b8ef127dc12eaebb5198475806ba7fcd58489a2092d14eb708f6dcac8f46de9ebb9c74b8e2b3c9d6f850b19950011e5364a843c3";
-  sha512.source = "7e1de0fdd346878e503d915aac905247124dc8d52714347c543996625f973348bd52778218ef7ef6934ab82dd43ac32585849afaa6bdfaf25a38723eb6b1e7f2";
+  sha512.run = "bc0742c601e2870fb361db3cef7a334307b41205a17e681c63c783e0ef17f2f86477611d7b9b54a975c2fe136d5ec9577a1a8b7334f8f9d7e4e0b44f9229ab97";
+  sha512.doc = "5a63edcc2cbfdc77eace7fa874d553af1fb514dba4b0826643a1e536d509c847090b0390b61b3e1d87757ecf123afdd7e5528f25b3fe3300061db5261811b97c";
+  sha512.source = "c4d7128340c8d05649e4274eb8eeae5c9d550350ab58bf9cbff8e4ce074698c4c782a107418b2d1e7e6d7568ad70353cb8a0da367d1066b4a0e862e0c844dd4c";
   hasRunfiles = true;
 };
 "cmexb" = {
   stripPrefix = 0;
-  sha512.run = "795743748537f19e13a3f2177788b94e701d22534ece1e0eb6768b38297869fc43856dcdf082338bdbb855b5ac7e9c5fd96dae734a1c42230b522e56d309e2e6";
-  sha512.doc = "31529f0b3afe42badbaf81c0171088c0c7085fc0cb036423fdd489305a3062f4dc20771f46202e7101cf355af8795bcf84470d22375bd878f3e72ef83723afe0";
+  sha512.run = "7c03e073ab795f009aba3891bca161576da870076552d4f41922053875fa0f980dbe04708d0487eb3338799c0e2070ea8f8e0ea74e7422b60c03e39d9c88cac6";
+  sha512.doc = "d63d244445426262c2ff79ef7267d78f2e24d1f884b4f5df8884061b496091917c58aebe74ee198cd11e16653627068a68cebe123d93606adb9e555219831043";
   hasRunfiles = true;
 };
 "cmextra" = {
   stripPrefix = 0;
-  sha512.run = "9765fd4837ee6b2a7a988d3e55dc88009848b255b093a1dedd4554138f0f1011a13fd20b53197ab48bb487609c8484524b995e4e8dece3cb8ffd9929a6b7d9fd";
+  sha512.run = "e826041c56126c2ae2575c387c80b683da50bdf2e8ab4e74be708a4d57e9d0d37e66ddde750acc26f9765308a6a2582e51281ac0969d1487a53ae6e9e02b1788";
   hasRunfiles = true;
 };
 "cmll" = {
   stripPrefix = 0;
-  sha512.run = "fc0e4dce55f957049cd03e79ecc2cbbed77321ba1f3f68f9879a7fa130c3ff39a1da4c3e150891d2420a6d765485d5b4fe7509facd4caeb5f879fcd2b33ee439";
-  sha512.doc = "ffe3267a29d706cb27f939dc5358f5271591e633aa6b2e239e6aa2cd5bbb2ecccf208e2154281665b5042ffd873c7a0368ffd98b8e1b1ec3b40e6389eecbb254";
-  sha512.source = "318060cbb903bcda08eaac34ab3f33938c72314933745cb41a9e4a13adfc67725a9787fae9717e094bc83d2549581f8abc3d1e98b842973fba9d7be52a784701";
+  sha512.run = "24d78402c511735555cff903a001c92d6aae431e902f9ef31e8412303e9f13017483e65afd02edfa2cbf22b51081c0df7ad453e154432abe4226e9cd8d7ba649";
+  sha512.doc = "dfc86f56d8d5c82ba82b27e9ccf00d77dbf0a0c0682a94c7bea1279894dc3aeb5180d5e1e20942aa50d1b0b52f89a42fb588d37cfac7d8063633ee9e87613391";
+  sha512.source = "9c423b757856b6ad928be40fe0caf9bd20eb78b882cf0e95abfdcb9b7a77812bb90a2484fbe6c071c4c6dc0f2cbf0fec7d7117039f25670122e999cb092a9642";
   hasRunfiles = true;
 };
 "cmpica" = {
   stripPrefix = 0;
-  sha512.run = "80ad36fb4feb15752e9b1dd3e92c2f9dbce5ff77f633921b87541da83d1da39b9595baf3c3a089f9cd38cbfc33e423283021ccc8460a4bbf5dfdb3b778ace7c1";
-  sha512.doc = "a522a90000e91070fb852d3bb0732e8de9af8ec075821de4b3dbabddedc0c32fcee7ea9e892b944956a070a069c4032348b4be13031c25cd0d92a4888d0a8f09";
+  sha512.run = "c389a7f4c9843c8a3d93d405f0bbe670646b8d3c058ed9e18ea6206b58692e27e40455d22824f5e48826943585189415ae7a092b5704b71ec86f9b41ddc068b6";
+  sha512.doc = "60234a925b7bc6621d5608172616662b1a54da0139af055ed06ad29dc17385d631c8ae616e5d8c06f54143c371cdcfbb2b9f50f7a3703ffdeebacdc6b3d733d5";
   hasRunfiles = true;
 };
 "cmpj" = {
   stripPrefix = 0;
-  sha512.run = "987481f37d6cfb7ccd3240302e52574a517c7da53e0b15a3e449a5d481aea534c5b59729721e7327f0020ed266a0492ed44128a3bc6a442dc18c66659ec4a172";
-  sha512.doc = "ab4b48d1ecbe5b5943db8f7a7465b895ff4f45ed827de22f9d0744767867425f4260d2676a82edb1e937028528f8dcdf589be40b4b6a6aa66d6dc848a55bdde1";
+  sha512.run = "d73ade0f5827de80915d898085283504f418e54188a48de0372fcfda69f523591725e880dc7eaaa1e3b42edf734f9ff7a72592f8e816eee4697e8b83c270133f";
+  sha512.doc = "7c41b1cec435f83e5752be493dfb81aa9795caedf09c00d7edc206a51286b9f3e35f35ca58f99d185066201fc1a6e8adf3da04826efa2b7a9dbee36bbe7f6581";
   hasRunfiles = true;
   version = "3.01";
 };
 "cmsd" = {
   stripPrefix = 0;
-  sha512.run = "1fe2832d7e06051b8a923236f6e60dcdf8c85dc5f8fb8a194ba08f537160bf8909a7408301b943bf9457c7fc56990c9735c624f1a93f193256074007dab7704c";
-  sha512.doc = "2eb27cd1d85f5ad8ec533a9b7f7977f0cb8e65b024d3e02022f4b340cf825d6db66a7c598e39fbf0f7a7796d42fceadf27acef811a7ddf44d25654395a52a714";
+  sha512.run = "1e294d125e21a242fa9a9a4b8f77fb55eb24f8f587a2a76014bef7a38f0989a26cbc6fc2085c504c99599eec9fd85ed17453ce874b72be1b969971b3861128b1";
+  sha512.doc = "2ca506522bada7c003894be5e39ccec8770942f99086a231e928a69866917c64a0d7073ca0d6ccef7d6f81117a25bf616b90a853b3be13e61066cfd72f3ea2d7";
   hasRunfiles = true;
 };
 "cmsrb" = {
   stripPrefix = 0;
-  sha512.run = "66342051d54f06e9f31d8cd7067fad8250f23cbe32283643bd3a99aee8d5995b161e58c8d5b9965d0b71d010143eb4684d4bd226b855f8a53d38551b3a076cc0";
-  sha512.doc = "b7cba11e4dc1dfd86a4644fec9a96fe510191331344ac8ab0cff6a71793749b931679a26db753be2f19102123f78daef84fd8e94688427fe02015a29920156cd";
+  sha512.run = "94a9a50c19d6c0698a2d107a55640a3b59d1229269c3aaa3317b53714639e0f4cd2b479f14952848bf7938b869b3455ab9589c1785677d5c097be418b0a81346";
+  sha512.doc = "58bc3c342ba6e76f41e6d402e1a3537d7f2767f858d403adea5a77a637c1975c9479102034fd29c4c8b888f8747bc660787f35563971a5c7452d93a1b8720db1";
   hasRunfiles = true;
   version = "1.1";
 };
 "cmtiup" = {
   stripPrefix = 0;
-  sha512.run = "70a25099d3a15e19804e3a2a5b1ddade4ca755835b05efa909a4fee0bf020cb24fc5f97192214efb58537b523bf7f1235830f6b7c26c494adf021fd7666e7755";
-  sha512.doc = "b4edb1f473cb06289d394677bc9a224ae1c479b3f5039311a8ebfcd7a8a33877a9240713e6f7e01c6704446f57fa42cf6e4b3113fcb1a69137e21f939a261e03";
+  sha512.run = "1c274436a9ab1d3ec8bcf73f48c6da7874ba2bfa3e3a2135366a1dbf9a68b1ac30245ad7ce8c10c277be44276717aca04b2061a3643debd22d6a6d9722f85977";
+  sha512.doc = "e96081797ddaab898159e3dcfc68a3ae291a87bc7f1ff03a414d783782ed356c8392269466c35e49e011d7f0d5265d0185720825dbe7bd0aff76432b6f61663a";
   hasRunfiles = true;
   version = "2.1";
 };
 "cnbwp" = {
   stripPrefix = 0;
-  sha512.run = "6563560ede8133ce96a730094240400631d14876f5430631f152821151c6b7ac51629730c498871c31fceb7747b016727b4a61beb0dbf224c83292d225938a40";
-  sha512.doc = "5bc70d4d8b8ff2d579a310e5b5f949b32221168c16b108db195532bbc5efcd664fe4556ee61116a1c897042531170497015710f9c65fad5aad22b143be29c1bb";
+  sha512.run = "d2960b30958ec42658db52566a25a02151e5f42f97c4f443ce8da3680bb5cdd39d111135c53f627ed5da592148a4b9f4d59fa2cc737afd9a29a76953bec68be2";
+  sha512.doc = "294b3a07b195797165fc7c858ccc83efd373e12392a9a0f6fedf4ff483d1628241de3911032a8d4d97bfc0c5673465c7512a83418ddfe561c6916af477e0b3ac";
   hasRunfiles = true;
 };
 "cnltx" = {
   stripPrefix = 0;
-  sha512.run = "a1c7efe87c196e42142dd3e85cf4b8a7d86eb7a882bc4e93644003eaed4d8108fb464967a887ae848ffa1fe3621a39e0e9cd121695a0e07cd670846e21891634";
-  sha512.doc = "7022ad9056acf0973f4ce8156dcbe0158e964f59762fb57e0069a407137c2a6a12fca14f57696934d64f9bcbe852a9c032b39b5bb796594ca4628f75336d9590";
+  sha512.run = "f1d5ab136f37882b921acd100eeaef3f25dfaec6ae2268fd2076ad24caee6af9ef7355970373eecf642de019769e79a8471b60decc97ee67ea7b72725fb862c7";
+  sha512.doc = "f4ef99db83da007ebd65abee419df1dcfc5cf467e27219d7f4231b319ac87261fad9ed319e2383e43830f784e2ffba0b6abe89f25d5a8cd42d8de5fabad548bf";
   hasRunfiles = true;
   version = "0.13";
 };
 "cns" = {
   stripPrefix = 0;
-  sha512.run = "f8a13a69192e2117c72521b83794cc6e36bf73ea44cea002cad186a2c5e67ca18a0d23fe5c4d418715bf46264f0d20776737d7c65ae1012e88151757b7f1049b";
-  sha512.doc = "9c73060c2da1314d97fbb8a74bb8706d56e298fefb9f60a3da78b9e68c040506c7a81b23eaa0a577289dbf84060e90a00d5c809996bfa1c1352b847d9902e742";
+  sha512.run = "54f74c716de52194d5bab6e95c6e1b7bb22b0d60a46ea6af04ab3859578c594415341ef51d88863fd188008d1326e4e9286afd40e2e7cf2c85278b1476ff65ee";
+  sha512.doc = "9097cd54f01a31f7299c0e175c646922d533a971a3e4e448b9fc2bc0e34afc13558bf22abcad837dffd7cf5ccfefeabb164cd4f9e8824d19505a76b6d89e77c5";
   hasRunfiles = true;
   version = "4.2.0";
 };
 "cntformats" = {
   stripPrefix = 0;
-  sha512.run = "d8d07c909b540195b1bf9578753f53e017c24b3d74c2b4ec44c8629ee05816c895485df80fb436400b3b092a2f9fff89933ea98e6a1b0a9a9a18da1682bcc3ce";
-  sha512.doc = "9d09c8b94e92083119801eff0842ded6d1cbd844e3fdac031d5bc9dd8a6bbf8269b2b1e344bb777fd7f4484b140636b11459e022ce96adf57ed1e0997afe819c";
+  sha512.run = "3c455761573dcc88c7d89462f4e65b484d6735a407fcbb3f950073fd163a2e8ffe39d884c7e858d867491918a5c4f8ea5666c99dad99a3c14e58c005d1056c8a";
+  sha512.doc = "6eadf27cff3aa010481c4fb33c87656baea8be9f89372e6703bbd446efa16fef87e476ca052e2176b1311983a590448d3c3c94de91db7fbf46bdc0e33e053ca2";
   hasRunfiles = true;
   version = "0.7";
 };
 "cntperchap" = {
   stripPrefix = 0;
-  sha512.run = "379c38194ba46679b27c43ec92ea33328fffff646259ddf9a26c6ce09bb04322d58f1803940eb2d85b6032ff43cf210d22802dab4af8b5b83cde04695ca41174";
-  sha512.doc = "ea2b3d7b49a188b9c4a46ad03db43851d3fbb43be23be854e85d646b662fa32b142cea931cc491953299dce0824d33712e9da7f06824f7c292f2d243a51df4f6";
+  sha512.run = "d12d7ae00bffde450674a4699a896814185eda47e41224e3ef286935c7d9b66426254e8d358e6f0a2f24c444c028534c3551b97f513d69807f0d250ceb3158f8";
+  sha512.doc = "2c1cc5064468755fcc11bc08ceac7baa57e2616b6e08bdcdd2cd90c6661f55a6f389738982c60b0b5ffe59e40a8f2583f228e7ebd7d924bbdf38b7f9caebbcea";
   hasRunfiles = true;
   version = "0.3";
 };
 "cochineal" = {
   stripPrefix = 0;
-  sha512.run = "c8cb897fa06998c94f1fe339d49ce6b613fd98df24de3f4e81c0fa211614484654aa29488261cec1bff735603f35a46d9f1b9a03bf35877c15526588f8c55671";
-  sha512.doc = "fa0e9dc04038319ab5f93cb482a991040c9c3385886970f0a760a03b72f8c803734757b705d490a31519b58a9bbbfc5f15ed3ce9912d6dd0b731d2b3151becfb";
+  sha512.run = "779693c290c433438186fd80f587cf747cce576c2edb29265837b5e09959bd3ebd9c91ec541269ddc2a3b6c49d20c97bfe7b64aad99e9a95d536666d3c13700d";
+  sha512.doc = "d63136dca99170effd0b0b1b3edf715700c3600fa5f91c32469bfe0079c64ed07d64a5fc19ebdf4e02a71e8ba11898f9bb9d528ebbab1a7027b1ce287dcc25f4";
   hasRunfiles = true;
-  version = "1.043a";
+  version = "1.046";
 };
 "codedoc" = {
   stripPrefix = 0;
-  sha512.run = "62ab8b76ef43cb36b1318a96b65f42af0ba1c3fab5a877395435b68ecc0a89ffb7ee249a77daffbcc8541983c9207603f08c0065e118dba69d9f8afe3c3daff8";
-  sha512.doc = "890361f5a1fc62eb9ca0ada921c49a2e01a293d4b70a36a3baf34170ec4778125769a5fff4777f77011b3adf8bab514b484c1aba64b428ecde6e5ec8d890f316";
+  sha512.run = "5e44c68f1b76188d69e0b30d60fdb24d3fce04a89ec20a47f444d45331e4850bcfe2a00a6e4fb022f9f2bf755a4fbdce7dd62c94ea63ea7ef6b1d4fd3b26c103";
+  sha512.doc = "8f57b95a7d45de4a3e7be5885aed326378bed6cd5184f0db8286d3cd63078e6672fa69f0f12bdc06d0257ccd404fd61a296fc088f5cf6af165267679df111766";
   hasRunfiles = true;
   version = "0.3";
 };
 "codepage" = {
   stripPrefix = 0;
-  sha512.run = "e6dc22a3a9a07db2cee0347a2cd0bf9db97271c6b292291d5e9ec9d8ccf800410d74e5948b421e0fe01125672640eb276702abe16bc2bf90aa196ae14ec4e0dd";
-  sha512.doc = "c0b0496452972f98ffb9f77c96eb52047ea22311f02baf74fd236ba21f4d2f68b4f2004092a396634e2fb3b4d29c5a788d52a5e9cc3bd8395cf70b245f161b16";
-  sha512.source = "adf659edf2c30d134305dbeae78a13dff0c18bd98932c6306cc122b82e81ae5b0dc12539a8adacfb084a3782f011b1e6203695c421ea61a05c70dcf27a03a1a9";
+  sha512.run = "a215056b1a9ab958e5b556820b1c014b5188baab0c657df4dcc7e6a248953b30070cd1869bc055fabd37263721b32646b85d445d48356df301de0b8cea7c622b";
+  sha512.doc = "43ed5710eb08a73eaefa30d67a43f04a617a36ae0e1a2885d2c836748a5242ff6399b973b1d662f774be59727bfe7ff07ce195c15a15aa959a25f54dc878483c";
+  sha512.source = "c091f964fcdc18a0814962c03c035f3bcf14499bcf155639a6adce1cb0a137ec0856677d30e29a01f36d3ce55a1b74a75c47cf3a813fb0c2903bae1e80f52a19";
   hasRunfiles = true;
 };
 "codesection" = {
   stripPrefix = 0;
-  sha512.run = "c4c464785b74f186253a00ecf970d27ea9c5dd017297fe2bbf132bf2a788868f016ad826c5f889ad082cc3353e6314937d3d1192a8314e70064f97bafaf5e009";
-  sha512.doc = "9490c82d3139534967372396a6cccb2b1c0085f9e345369bcbb49aca4de49083778e76b23b75309cb35f50228a11bfca9675bc09f2c5c01905d2a7c54b53ad63";
-  sha512.source = "468e19803d10682ae4d5e10960eacd2011156bf1c6176f54e1a2436b48d4394ec21a190dada10bd3581216bf8127b9c548740d243f9bd8c656fcc0dca62ce0b2";
+  sha512.run = "e7a49e9c41a66e95015a69a05a0e0e1070ce3ddd5391b8b24a3d4c45e92abd7a59fb9eb17c1fd4465fd73df0392dac2077020e6344a067e1706976ff6ab08736";
+  sha512.doc = "0b84742061fbab5d10222183f46865f41f4e1e3caeccaaa7b7ffb776fdb13e7d590b8b6cbfc48ec06a154571b46fab13f89acefd01009037d7ce17834946d5bc";
+  sha512.source = "8b4872828e2e9484e6cab4cfa90c94d09b8b9b7ede761a7c8c53768c4189054dda90bcaa9f293837eaa96ea39406583cb3d4baa4c11be67b6e3dbe18e0daef07";
   hasRunfiles = true;
   version = "0.1";
 };
 "codicefiscaleitaliano" = {
   stripPrefix = 0;
-  sha512.run = "e4f2748f06477ae9348e9fe8d77ebdc05abc84046b7e891670949ad0f1b7d9607df2ffbea94e302de3b1dd222e715c94f26ea4167f5ccb37c804b227013df29f";
-  sha512.doc = "3545c4efcec1561cf60eabf4ebaf7d94028227ce2ac245aa0ed9c10fb0dba8d6a6b6b4c6030c11239d21874e29ee057c6936b86df3a08bcf1c19cb3e14f7ef1d";
-  sha512.source = "fbb520a2598156c91b143a69e76307309e41337d71289164345cb84b74687cd080efc9e7c0f36113e370bfc6daa6dcedbfba2435142cabaa395cafd0a2d987cd";
+  sha512.run = "9ec16f9aadf5f25e900a079d75fb2397a074ae55947b6db6c2cc69b4a7fd093a5f99745ba1ae87cccafb772abb90d91b7f358d96542831f16870b63ddfa50395";
+  sha512.doc = "1c13e84e246807826d7dcd377b37c6e76c699391b2c01732d9dd535043176f4e52e48b2f36ceac3e1b3dc63486daf5ea8f71ad18d6b5745de6b14e910b663a53";
+  sha512.source = "ed47b42a709196180cfa85129e70eef4628adc0ee48574041a09fa54586640fb14f4ec2f8dda733f8861d1af985cd3178020427931ebe4fbb11039dd68fb5f17";
   hasRunfiles = true;
   version = "1.2";
 };
 "coelacanth" = {
   stripPrefix = 0;
-  sha512.run = "0dbec1e88254d34e2f32c72950a82540bfa70402fee3f67ff0ca7ddf94bf0097733e18ee6d7436188d0cf416f8e4e27d5e86fb482b20a4efd3eac8c5bb60a6b9";
-  sha512.doc = "eaa6db2db890b728e7edee52c823b1aad735da663c46275102d1eb3f6b28035748ee86b8fb0d21a113a97f9ea2bfbcbcd342c61b1b7e1dcef6e38ec81a630309";
+  sha512.run = "ecd5a439277011ce1ae74ca594e3cc8cd644a7c65f50a4d7a3ec96653a5445d47d25fd6f707661c978e7502b213872fc3c57dc26867473786c74b0839566a535";
+  sha512.doc = "03cb530cd89e0f28728b9d1cc5f6233aac2c3da9013005aad4b250b431d73d2010eb3982b4a57d8535330d3b461d2caab7481f96596a81d95edaa27bd089fead";
   hasRunfiles = true;
 };
 "collcell" = {
   stripPrefix = 0;
-  sha512.run = "1a5f2413fc37f017c742731fa9bf8337a77cc6de1e84c174c4363af5feb92f79858b60418b764e6a10e5c7b91b58a251e78db1bd4a8c353cb2c292cd4646c637";
-  sha512.doc = "869fed42f39cdfdced9cf20cdb2b1f1cb34fa498754cb89b601a16e938aa89575cce30f8a075a3e0ff36533c37181087e63bb1d82b82c08dff0ad3936bf3ea38";
-  sha512.source = "aad3fc14265f7f01d05ef6aad797e47c358a5019fba1d97db7148b8f721bbe9799d22342ba17a3c54e751b7c0bb03077a8526a01e17f89bdcd7490c6e27c095f";
+  sha512.run = "5c6516589bcf2810b967d127825a46b2583e292ac3146ae257db9e9c1145f1134aab98f0b9dff4b0163dd71bd470671e8b4cce540121e35f68a94a64f922efd2";
+  sha512.doc = "025ea516e02b2cba9ddebd6f5230f84be4ab45f107603687c61d8ce62410484bfdd214641aa6e1ad1111fb5e7577a79fa980775280549d35a2bf1a1d5c2d6b28";
+  sha512.source = "3d9aebd246a51c567ba21797fac308ea679a5e326d8a941c40b540e522c5ecff0ae1237bb0ffe4bf4141fcd663e866d0736fd3de9d5a616ce968f5228b0e6666";
   hasRunfiles = true;
   version = "0.5";
 };
 "collectbox" = {
   stripPrefix = 0;
-  sha512.run = "19141ee6e05c3064eb013b32ce78e7f6189ec12b15c0ab43cb33312591e163549be212c32d655a741965eada571fc91e4ad6828b71c939ddf950662cede981a5";
-  sha512.doc = "92eef3d383830c929feb6867116d8a6a41634b7682ba385e89d9253ca872cc078c261110f2b329d918ed8449f750ac00b0ca6f70a55e70dce7bf053cc1de5a18";
-  sha512.source = "aabbca22bea35bc9a8e4a8c13c1460e7ec374d1aa43ec5c5cf7adec0bbf3cb694e79529d755d8aa87eb5ba4b65eb1ccf4247613a77236a7dca9fa03e5a77e611";
+  sha512.run = "cc14ea810f9012c6d913b09196c97c3fb2ff80296af9818051836992bcdee871c1c4c429eb28551657761fe3f104d1a25ca987f8cd4feea77109bbb44332ffeb";
+  sha512.doc = "12e610688a0213fc090f725532d00b065409241ee8e626f9946a8b12f7e259cf76ad7474dd49b1db70cafd744520beed72ea8cf4a2a7f84ea95c5b81b15f14d0";
+  sha512.source = "42e060899e89cc264638650f65f05a308a4ac20b699ee9d28f1b1f3ca5b9d26e908206cce48cd115f18da20c1a4264ab3c586ce4897975d8e23c8b949bce502e";
   hasRunfiles = true;
   version = "0.4b";
 };
@@ -4421,7 +4541,7 @@ tl: { # no indentation
   deps."unicode-data" = tl."unicode-data";
   deps."updmap-map" = tl."updmap-map";
   deps."xdvi" = tl."xdvi";
-  sha512.run = "41af3318b7e0a2b94ff99406b42589f902d2d2b51cef65597df27772e4efdda2c3e98584b4afa2873b4c74b7d9d9c32ca82d278202d813fdab97bd75dde10071";
+  sha512.run = "5f97f97e8d6bd356fb2211961e58904188d7518b4de0fa7a5a84cf96eed2e8c7629617cef1bc53d92e2a670152d573c6680d3cc7ce6e08bd343fc1063f2a8101";
 };
 "collection-bibtexextra" = {
   stripPrefix = 0;
@@ -4455,6 +4575,7 @@ tl: { # no indentation
   deps."biblatex-claves" = tl."biblatex-claves";
   deps."biblatex-dw" = tl."biblatex-dw";
   deps."biblatex-enc" = tl."biblatex-enc";
+  deps."biblatex-ext" = tl."biblatex-ext";
   deps."biblatex-fiwi" = tl."biblatex-fiwi";
   deps."biblatex-gb7714-2015" = tl."biblatex-gb7714-2015";
   deps."biblatex-gost" = tl."biblatex-gost";
@@ -4482,6 +4603,7 @@ tl: { # no indentation
   deps."biblatex-sbl" = tl."biblatex-sbl";
   deps."biblatex-science" = tl."biblatex-science";
   deps."biblatex-shortfields" = tl."biblatex-shortfields";
+  deps."biblatex-socialscienceshuberlin" = tl."biblatex-socialscienceshuberlin";
   deps."biblatex-source-division" = tl."biblatex-source-division";
   deps."biblatex-subseries" = tl."biblatex-subseries";
   deps."biblatex-swiss-legal" = tl."biblatex-swiss-legal";
@@ -4502,6 +4624,7 @@ tl: { # no indentation
   deps."chembst" = tl."chembst";
   deps."chscite" = tl."chscite";
   deps."citeall" = tl."citeall";
+  deps."citeref" = tl."citeref";
   deps."collref" = tl."collref";
   deps."compactbib" = tl."compactbib";
   deps."crossrefware" = tl."crossrefware";
@@ -4515,6 +4638,7 @@ tl: { # no indentation
   deps."figbib" = tl."figbib";
   deps."footbib" = tl."footbib";
   deps."francais-bst" = tl."francais-bst";
+  deps."gbt7714" = tl."gbt7714";
   deps."geschichtsfrkl" = tl."geschichtsfrkl";
   deps."harvard" = tl."harvard";
   deps."harvmac" = tl."harvmac";
@@ -4552,7 +4676,7 @@ tl: { # no indentation
   deps."usebib" = tl."usebib";
   deps."vak" = tl."vak";
   deps."xcite" = tl."xcite";
-  sha512.run = "753fb31c4caa68f02ce512c0b574cc6985fcd74ff720a750be546e3eb0dbcc22d947a37a6296e32800d90c156cc9b59cc12cb4df5840922134dae8677e532cf1";
+  sha512.run = "bc86b198a8d0b289e502820ba5b85f6ea924995b134bcc7b0ab0ab2ac52bf9bcd7ff69efb8fd1a83ceebe54ffe119d7a12689110aa9aa04a69d4625f136d55fb";
 };
 "collection-binextra" = {
   stripPrefix = 0;
@@ -4568,6 +4692,7 @@ tl: { # no indentation
   deps."chktex" = tl."chktex";
   deps."ctan-o-mat" = tl."ctan-o-mat";
   deps."ctan_chk" = tl."ctan_chk";
+  deps."ctanbib" = tl."ctanbib";
   deps."ctanify" = tl."ctanify";
   deps."ctanupload" = tl."ctanupload";
   deps."ctie" = tl."ctie";
@@ -4590,6 +4715,7 @@ tl: { # no indentation
   deps."hook-pre-commit-pkg" = tl."hook-pre-commit-pkg";
   deps."hyphenex" = tl."hyphenex";
   deps."installfont" = tl."installfont";
+  deps."ketcindy" = tl."ketcindy";
   deps."lacheck" = tl."lacheck";
   deps."latex-git-log" = tl."latex-git-log";
   deps."latex-papersize" = tl."latex-papersize";
@@ -4629,6 +4755,7 @@ tl: { # no indentation
   deps."texdiff" = tl."texdiff";
   deps."texdirflatten" = tl."texdirflatten";
   deps."texdoc" = tl."texdoc";
+  deps."texdoctk" = tl."texdoctk";
   deps."texfot" = tl."texfot";
   deps."texliveonfly" = tl."texliveonfly";
   deps."texloganalyser" = tl."texloganalyser";
@@ -4641,7 +4768,7 @@ tl: { # no indentation
   deps."typeoutfileinfo" = tl."typeoutfileinfo";
   deps."web" = tl."web";
   deps."xindy" = tl."xindy";
-  sha512.run = "be7d2149ff4f08146c817a421d224d8126ea062b459117ebd49292b2f7082986edde7b653f751f53d7cedcc771d8d56a736c0b13a1e6604fc11e8450dcf1b10d";
+  sha512.run = "bc9d21400ca26f0839505729382b47b849e0749371b3b71903b359696c510755cbb60704255d186234097b11a434afeb9dc0885903989e367c9fc1d5de67085d";
 };
 "collection-context" = {
   stripPrefix = 0;
@@ -4649,6 +4776,7 @@ tl: { # no indentation
   deps."context" = tl."context";
   deps."jmn" = tl."jmn";
   deps."context-notes-zh-cn" = tl."context-notes-zh-cn";
+  deps."npp-for-context" = tl."npp-for-context";
   deps."context-account" = tl."context-account";
   deps."context-algorithmic" = tl."context-algorithmic";
   deps."context-animation" = tl."context-animation";
@@ -4682,7 +4810,7 @@ tl: { # no indentation
   deps."context-typescripts" = tl."context-typescripts";
   deps."context-vim" = tl."context-vim";
   deps."context-visualcounter" = tl."context-visualcounter";
-  sha512.run = "44043783c80d2283fbb214bdae89d97e511cbdd24105bbb1a098e95a28c09964803c902bc5202466938d00933a0108c5a76120a0a8c6e749c233bc559f8e9c95";
+  sha512.run = "0bf93a5f5e3a97db7bd92d43a3859b1e3b6d3296807c25d970e17b77e6b76203059b13bf89060c004f8996fa56276e1a6711eefb101a8663a3b6f81dd512480f";
 };
 "collection-fontsextra" = {
   stripPrefix = 0;
@@ -4777,6 +4905,7 @@ tl: { # no indentation
   deps."dozenal" = tl."dozenal";
   deps."drm" = tl."drm";
   deps."droid" = tl."droid";
+  deps."dsserif" = tl."dsserif";
   deps."duerer" = tl."duerer";
   deps."duerer-latex" = tl."duerer-latex";
   deps."dutchcal" = tl."dutchcal";
@@ -4820,6 +4949,7 @@ tl: { # no indentation
   deps."gfscomplutum" = tl."gfscomplutum";
   deps."gfsdidot" = tl."gfsdidot";
   deps."gfsneohellenic" = tl."gfsneohellenic";
+  deps."gfsneohellenicmath" = tl."gfsneohellenicmath";
   deps."gfssolomos" = tl."gfssolomos";
   deps."gillcm" = tl."gillcm";
   deps."gillius" = tl."gillius";
@@ -4850,6 +4980,7 @@ tl: { # no indentation
   deps."libertine" = tl."libertine";
   deps."libertinegc" = tl."libertinegc";
   deps."libertinus" = tl."libertinus";
+  deps."libertinus-otf" = tl."libertinus-otf";
   deps."libertinust1math" = tl."libertinust1math";
   deps."librebaskerville" = tl."librebaskerville";
   deps."librebodoni" = tl."librebodoni";
@@ -4925,7 +5056,10 @@ tl: { # no indentation
   deps."sourceserifpro" = tl."sourceserifpro";
   deps."starfont" = tl."starfont";
   deps."staves" = tl."staves";
+  deps."stickstoo" = tl."stickstoo";
   deps."stix" = tl."stix";
+  deps."stix2-otf" = tl."stix2-otf";
+  deps."stix2-type1" = tl."stix2-type1";
   deps."superiors" = tl."superiors";
   deps."svrsymbols" = tl."svrsymbols";
   deps."tapir" = tl."tapir";
@@ -4951,7 +5085,7 @@ tl: { # no indentation
   deps."yfonts-t1" = tl."yfonts-t1";
   deps."yinit-otf" = tl."yinit-otf";
   deps."zlmtt" = tl."zlmtt";
-  sha512.run = "1c1919d7195c47f82b87e0312305a8a170429a0a203317df294c9e20873465947329943f682064d125afc0432e05bc6b99f9eae857fb7e477c879b174b81b255";
+  sha512.run = "84a99e5a1a1505083b4929ea844de8cbd62f05bb87f2919a05315b1ceddf886fa146897a37450ba1014b3e8925e5b2f75ac19404a54530afb1512166f5cee47f";
 };
 "collection-fontsrecommended" = {
   stripPrefix = 0;
@@ -4990,7 +5124,7 @@ tl: { # no indentation
   deps."wasysym" = tl."wasysym";
   deps."zapfchan" = tl."zapfchan";
   deps."zapfding" = tl."zapfding";
-  sha512.run = "afa889b79b181a9c0c2122cec412fd258c416231929b42040963cef807f117e7d5d1f0b9ccf78f5aa0d6000777fae3000ea2a98f598bcc7fe93384161c2caa71";
+  sha512.run = "071eb6fc2afe7f70e1fe0496aa77bd38953dd7fcdd5439febff7369bd93b7fdb04525bb00b90cbacffdd768b2bd1db5243197d091519ddda4d8efe91cc375b5c";
 };
 "collection-fontutils" = {
   stripPrefix = 0;
@@ -5011,7 +5145,7 @@ tl: { # no indentation
   deps."mf2pt1" = tl."mf2pt1";
   deps."t1utils" = tl."t1utils";
   deps."ttfutils" = tl."ttfutils";
-  sha512.run = "4a8f60bf1ca04e7d168b655c91422ba1122ac54591beca5da6c699757318c6b0c437020aaa9f655abd5f33f2f7ad13d95fbca3bc175fe0528f3a6afc7361c7a4";
+  sha512.run = "e1538064dd72671bd1ce54c237e8759132068c378115e6f881902189153851dfaecbfca9bc8705a47bc5496d67df9ade054564e0341e669245450138b19d03e5";
 };
 "collection-formatsextra" = {
   stripPrefix = 0;
@@ -5035,7 +5169,7 @@ tl: { # no indentation
   deps."omega" = tl."omega";
   deps."omegaware" = tl."omegaware";
   deps."otibet" = tl."otibet";
-  sha512.run = "06f1e560a8d7b9f87cb089f5dcb72964c810e457764627a81ce3bbfe8b52e965838ae71083c12dcc7ffe10319839fca89c7a55d7bae345a00bf3758d00fca193";
+  sha512.run = "e763bdd83ccb58095d1854fe88a845da6830db9f72b40abcfe9c349f84e0284f78c8a0f85d714a9d0354e3026511a2db9d13f86cfbdbfb5d43f171d558563564";
 };
 "collection-games" = {
   stripPrefix = 0;
@@ -5056,6 +5190,8 @@ tl: { # no indentation
   deps."horoscop" = tl."horoscop";
   deps."labyrinth" = tl."labyrinth";
   deps."logicpuzzle" = tl."logicpuzzle";
+  deps."musikui" = tl."musikui";
+  deps."onedown" = tl."onedown";
   deps."othello" = tl."othello";
   deps."othelloboard" = tl."othelloboard";
   deps."pas-crosswords" = tl."pas-crosswords";
@@ -5071,7 +5207,7 @@ tl: { # no indentation
   deps."sudokubundle" = tl."sudokubundle";
   deps."xq" = tl."xq";
   deps."xskak" = tl."xskak";
-  sha512.run = "1e3e887b55548e17878297459f358300e738d1606db20225b2b4eb467d95799e6a3ce99cde2a55cf389060f7f310cb897b1c6f438cea647937d0e4c29da9e710";
+  sha512.run = "11eb490abf0e8bdf6920f3e81b83a6154d6018651ed862c224f95508cc84ac0207f918327c9bb107e01b7330d98017c79c75005a8d06df028b501d3ba7cb55ee";
 };
 "collection-humanities" = {
   stripPrefix = 0;
@@ -5127,7 +5263,7 @@ tl: { # no indentation
   deps."tree-dvips" = tl."tree-dvips";
   deps."verse" = tl."verse";
   deps."xyling" = tl."xyling";
-  sha512.run = "aa2d902c6b9247ef372c541a741272423ef3bec574d9729a78da86a2f745ed27cf23362058a9dc6252014e98c3807669fb1ab9504234b5b295cf1463ead6e58e";
+  sha512.run = "0d71b4f94997ac083eb7b5dc7dbabf39b50f460aaa6e800c1c262471733254a79f3df95ab1b725634c33ce59f0b5939a94d388b46ab30d0766424f33a6a536f3";
 };
 "collection-langarabic" = {
   stripPrefix = 0;
@@ -5145,6 +5281,7 @@ tl: { # no indentation
   deps."hyphen-arabic" = tl."hyphen-arabic";
   deps."hyphen-farsi" = tl."hyphen-farsi";
   deps."imsproc" = tl."imsproc";
+  deps."kurdishlipsum" = tl."kurdishlipsum";
   deps."lshort-persian" = tl."lshort-persian";
   deps."luabidi" = tl."luabidi";
   deps."na-box" = tl."na-box";
@@ -5153,7 +5290,7 @@ tl: { # no indentation
   deps."simurgh" = tl."simurgh";
   deps."tram" = tl."tram";
   deps."xepersian" = tl."xepersian";
-  sha512.run = "01e3cb1cefb57a5efcafc40d2f002895dc656997732bda7abf0f57fb513f4a6d5d54c16c498c84a8ad4688d0e15a9e18956cb940e49b04433e0b8d8fcfb2d737";
+  sha512.run = "8fc41d5a673c13910d03a11e21f4444d3e807e67864bff0ef153bdf39033ededc3002e70c9d2052dd1d1bca5131ac97b478e3aa5df62dcda0e8f0418119d276a";
 };
 "collection-langchinese" = {
   stripPrefix = 0;
@@ -5167,12 +5304,15 @@ tl: { # no indentation
   deps."ctex" = tl."ctex";
   deps."ctex-faq" = tl."ctex-faq";
   deps."fandol" = tl."fandol";
+  deps."fduthesis" = tl."fduthesis";
   deps."hyphen-chinese" = tl."hyphen-chinese";
   deps."impatient-cn" = tl."impatient-cn";
   deps."latex-notes-zh-cn" = tl."latex-notes-zh-cn";
   deps."lshort-chinese" = tl."lshort-chinese";
+  deps."pgfornament-han" = tl."pgfornament-han";
   deps."texlive-zh-cn" = tl."texlive-zh-cn";
   deps."texproposal" = tl."texproposal";
+  deps."xtuthesis" = tl."xtuthesis";
   deps."upzhkinsoku" = tl."upzhkinsoku";
   deps."xpinyin" = tl."xpinyin";
   deps."zhlipsum" = tl."zhlipsum";
@@ -5180,7 +5320,7 @@ tl: { # no indentation
   deps."zhmetrics-uptex" = tl."zhmetrics-uptex";
   deps."zhnumber" = tl."zhnumber";
   deps."zhspacing" = tl."zhspacing";
-  sha512.run = "2d4546090ca9846bf763719af5fef2982396010352bd92089078c4957f44f97c0e1175957db30b6be7672dd7c319e3ef149239070104df16e7f3dfb970a2f47b";
+  sha512.run = "b1c1b2746ec67c1f42c010500dd59df7c088b1fea556acfa5459940634c89f351e8bc6edbffb928f6d917d63c35a7ba31fb02c8195df7b478180ece2e13b66db";
 };
 "collection-langcjk" = {
   stripPrefix = 0;
@@ -5199,7 +5339,7 @@ tl: { # no indentation
   deps."pxtatescale" = tl."pxtatescale";
   deps."xcjk2uni" = tl."xcjk2uni";
   deps."zxjafont" = tl."zxjafont";
-  sha512.run = "52ffdf7c642232eaab8c9c384278600f0ea98e9101cbb50e5225c9223f80a2efdbc0e5219f164a282804a9e6620967b797670c49e3e26643cf3a99a9bea3ea1b";
+  sha512.run = "1beec3bbed9f3c01dfda1e64df30416f0430e0d4c33c33dae2cc5ecadcd19c5935282654dff979bb110d30bdbd3109b7664c1e28114f934fc42f8226f0526e2d";
 };
 "collection-langcyrillic" = {
   stripPrefix = 0;
@@ -5249,7 +5389,7 @@ tl: { # no indentation
   deps."texlive-ru" = tl."texlive-ru";
   deps."texlive-sr" = tl."texlive-sr";
   deps."ukrhyph" = tl."ukrhyph";
-  sha512.run = "4de9cbd705f676ac67e0705a78d17920981bf19b760870600b2973583dd95508076600e79d1d0bc33e6300d4ba42c7451cb09b68bb19a3e11f04fb86458d45d8";
+  sha512.run = "e7fa80da0a1ca28a49eb0cb1339e6416850ae4ae5adfa6a1da6903c191e0b166270c9917a0d60bf530f1b9a0e2feebed2c3050a302a3e40b05ee0498f52fdbaf";
 };
 "collection-langczechslovak" = {
   stripPrefix = 0;
@@ -5269,7 +5409,7 @@ tl: { # no indentation
   deps."lshort-czech" = tl."lshort-czech";
   deps."lshort-slovak" = tl."lshort-slovak";
   deps."texlive-cz" = tl."texlive-cz";
-  sha512.run = "8438ad9bb0ef9e65ba7a15aa55aee12598d5a1bf080c44ea6aad9626974bb410dad0248f3006ced490a3958e9b65c175e1518907bd77a57b22b3c719135ff9b2";
+  sha512.run = "ec73663ed991d9f7729f39e5c78d42f908f08be09e7d0fc11b77a2652e7759be0d7b6feb04635eb88f8dad87e7b64f8817822c72e21747df07200b2d00193a3a";
 };
 "collection-langenglish" = {
   stripPrefix = 0;
@@ -5337,7 +5477,7 @@ tl: { # no indentation
   deps."visualfaq" = tl."visualfaq";
   deps."webguide" = tl."webguide";
   deps."xetexref" = tl."xetexref";
-  sha512.run = "2cfa8be5d049c1d50fc2d347e002deec6b130f52370efe671e20139b4dc93b13757de72524a5f602ec46154bea44c277e3658435094b1cbf71d9923f7a2e7382";
+  sha512.run = "47e3a0d9de45a933c8396e8a0ee8b8c8dddf5551b205a54b985627c4265438ae57f2e4ea3f1c935a1c6877a30f5d592377d71b141b62fea7e0ca5d3d995812da";
 };
 "collection-langeuropean" = {
   stripPrefix = 0;
@@ -5373,6 +5513,7 @@ tl: { # no indentation
   deps."finbib" = tl."finbib";
   deps."gloss-occitan" = tl."gloss-occitan";
   deps."hrlatex" = tl."hrlatex";
+  deps."hulipsum" = tl."hulipsum";
   deps."hyphen-croatian" = tl."hyphen-croatian";
   deps."hyphen-danish" = tl."hyphen-danish";
   deps."hyphen-dutch" = tl."hyphen-dutch";
@@ -5405,7 +5546,7 @@ tl: { # no indentation
   deps."nevelok" = tl."nevelok";
   deps."swebib" = tl."swebib";
   deps."turkmen" = tl."turkmen";
-  sha512.run = "7bc24cfd71b6f4952c192ec214ac8823219ef3ac6f1eee15eeabb1117f89d6c2f7f4ed85a7772b62d8094d6f69b3234b95a1e6be34634125f465f8c81911d255";
+  sha512.run = "9f9c56bbada51086cf07611dab2adffefea6cea468f7d12e8f25ea1f3a7b958f566b09912737b3ce86c873da34c9035b30410340ba80f0edd0f63f5fcc4323a7";
 };
 "collection-langfrench" = {
   stripPrefix = 0;
@@ -5442,7 +5583,7 @@ tl: { # no indentation
   deps."translation-tabbing-fr" = tl."translation-tabbing-fr";
   deps."variations" = tl."variations";
   deps."visualtikz" = tl."visualtikz";
-  sha512.run = "d38335a76ac71f3072498aedb0c0dd99236550ed1050a348c07a5a44e2956f1ef480ea7879480e1ab8bb04fc30a67b40c1c17571d8ec77c17893390878955740";
+  sha512.run = "2009bc652c912e9296222402f61629b9be8ad88248fd5095d9d80abd95b3776dd5d5fa4ef2f059fc01d1b957b89969160e6132f84bfff3c65d6e27c3397ef7a2";
 };
 "collection-langgerman" = {
   stripPrefix = 0;
@@ -5496,7 +5637,7 @@ tl: { # no indentation
   deps."uhrzeit" = tl."uhrzeit";
   deps."umlaute" = tl."umlaute";
   deps."voss-mathcol" = tl."voss-mathcol";
-  sha512.run = "4c39d3da2fc9e441a081919c44a606a23f2cbc8ffe6077cc64062b9f81a6676b50b476f2bf91f67a7030fdf3db833fd59fd2a622c892ec5542b8ab77d9ed1621";
+  sha512.run = "b4b4574c6acbecae78038e6ee5302802aafae765b4d6630297406435861faee74735f80bf18bd824f3469a0089689dad6997c4b552f59b09305505aec4850bc0";
 };
 "collection-langgreek" = {
   stripPrefix = 0;
@@ -5525,7 +5666,7 @@ tl: { # no indentation
   deps."teubner" = tl."teubner";
   deps."xgreek" = tl."xgreek";
   deps."yannisgr" = tl."yannisgr";
-  sha512.run = "076f00a0178dc481c3a9e7e1a01322cd312f9f2d0250c0331b1488020d335fcb06f51ff463eec8b5df7ed2ad3d3f22dac1d6ccbb3d5c04c645a845f6f6b0b006";
+  sha512.run = "29c6e1ad439079e9b91c955086d6814c23e4ef6c6f713ee9c1ef5ca9d087f2d4f2ea7b1b172b6e3c3a59f761d12476f8701483947c160138974c5782ce45a27f";
 };
 "collection-langitalian" = {
   stripPrefix = 0;
@@ -5546,11 +5687,12 @@ tl: { # no indentation
   deps."lshort-italian" = tl."lshort-italian";
   deps."psfrag-italian" = tl."psfrag-italian";
   deps."texlive-it" = tl."texlive-it";
-  sha512.run = "cd20a27c58664baab02fdc681ff1c5eb129fe10ef8a7e90a6757ca07daa18543ff5a03d9822d4b20ceaf0e7d169c762ac4516466af42b79a0ea7221d29f78c97";
+  sha512.run = "436e66d3aa2dda1a876127420a148e8e589aa77cf7bdc8824ba77f67eef0b4ac19cb35d3d0fef8c56d898ac594898a18024d08164a6fc53d36c494c3ec49e0c6";
 };
 "collection-langjapanese" = {
   stripPrefix = 0;
   deps."collection-langcjk" = tl."collection-langcjk";
+  deps."ascmac" = tl."ascmac";
   deps."babel-japanese" = tl."babel-japanese";
   deps."bxbase" = tl."bxbase";
   deps."bxcjkjatype" = tl."bxcjkjatype";
@@ -5559,6 +5701,8 @@ tl: { # no indentation
   deps."bxjscls" = tl."bxjscls";
   deps."bxorigcapt" = tl."bxorigcapt";
   deps."convbkmk" = tl."convbkmk";
+  deps."endnotesj" = tl."endnotesj";
+  deps."gentombow" = tl."gentombow";
   deps."ifptex" = tl."ifptex";
   deps."ifxptex" = tl."ifxptex";
   deps."ipaex" = tl."ipaex";
@@ -5569,14 +5713,16 @@ tl: { # no indentation
   deps."lshort-japanese" = tl."lshort-japanese";
   deps."luatexja" = tl."luatexja";
   deps."mendex-doc" = tl."mendex-doc";
+  deps."morisawa" = tl."morisawa";
   deps."pbibtex-base" = tl."pbibtex-base";
   deps."platex" = tl."platex";
   deps."platex-tools" = tl."platex-tools";
   deps."platexcheat" = tl."platexcheat";
+  deps."plautopatch" = tl."plautopatch";
   deps."ptex" = tl."ptex";
   deps."ptex-base" = tl."ptex-base";
-  deps."ptex-fonts" = tl."ptex-fonts";
   deps."ptex-fontmaps" = tl."ptex-fontmaps";
+  deps."ptex-fonts" = tl."ptex-fonts";
   deps."ptex2pdf" = tl."ptex2pdf";
   deps."pxbase" = tl."pxbase";
   deps."pxchfon" = tl."pxchfon";
@@ -5591,7 +5737,7 @@ tl: { # no indentation
   deps."wadalab" = tl."wadalab";
   deps."zxjafbfont" = tl."zxjafbfont";
   deps."zxjatype" = tl."zxjatype";
-  sha512.run = "f480737faf887141bf4153b5a2403c552e86a5a2645fba16425fb590014ff4bb9837b8a732e48bf8253a5ff37acb7ebc27a23675954d347b2b6ddaf6a879d31b";
+  sha512.run = "42ad699c2fd1b24931eb9a387eafee12773536a8dd7ad762f8f8ef0f3df8ab55739caa92d914e94aa0e390a84e7421842b987556ae85f9a90add8438f06a7bb5";
 };
 "collection-langkorean" = {
   stripPrefix = 0;
@@ -5607,7 +5753,7 @@ tl: { # no indentation
   deps."uhc" = tl."uhc";
   deps."unfonts-core" = tl."unfonts-core";
   deps."unfonts-extra" = tl."unfonts-extra";
-  sha512.run = "24bc0dffd241b63778cc2791de1a0ce56878b716fe18b54974fb5871aadbfc2d51b7b3fc5d35be7680ee3314c25664059a5609aa02ff04d8ade966513031e10a";
+  sha512.run = "0d2e89f89143b7ccce1e2eb94a914d90707d4a1a5565cb478e53c29690a56583dc25cf7b470fe21736dc91e84ffb73863c3f9cd3f8a0a8dac2ef12ca8613bd75";
 };
 "collection-langother" = {
   stripPrefix = 0;
@@ -5661,7 +5807,7 @@ tl: { # no indentation
   deps."wnri" = tl."wnri";
   deps."wnri-latex" = tl."wnri-latex";
   deps."xetex-devanagari" = tl."xetex-devanagari";
-  sha512.run = "7d936404abbd46c2de6690a47c10fd15a583ecdb55625c05379767f80decb2dc01e5d52896addd692defb9886cc6d0a36057a1c8151ca8ec16595dd19bfadfc0";
+  sha512.run = "38429d43b0cb0c7291df6cabae9aae8421a4ef3eff5bf3dac21df33722777b7420d3d978b1d9207b3b33669052c8076b46fdb46c2d33a9f442fbf67818a05bcf";
 };
 "collection-langpolish" = {
   stripPrefix = 0;
@@ -5684,7 +5830,7 @@ tl: { # no indentation
   deps."tex-virtual-academy-pl" = tl."tex-virtual-academy-pl";
   deps."texlive-pl" = tl."texlive-pl";
   deps."utf8mex" = tl."utf8mex";
-  sha512.run = "2a2bcba779a189d2447742a5f1ec5965ad62c38b63828bc326622339dcc4bad6458e164fcb9feacc842b6601db580687dc84d7b148cd1212eae6a9e00e761402";
+  sha512.run = "950b354fe6d731322178d120a7d70c58b065c11aa3e4ddeba741196c790d801ad4ecf60b7b7478da1a6207fb797595a8ffc34f64488bb3874316cbfbe4f83bc7";
 };
 "collection-langportuguese" = {
   stripPrefix = 0;
@@ -5694,11 +5840,12 @@ tl: { # no indentation
   deps."cursolatex" = tl."cursolatex";
   deps."feupphdteses" = tl."feupphdteses";
   deps."hyphen-portuguese" = tl."hyphen-portuguese";
+  deps."latex-via-exemplos" = tl."latex-via-exemplos";
   deps."latexcheat-ptbr" = tl."latexcheat-ptbr";
   deps."lshort-portuguese" = tl."lshort-portuguese";
   deps."ordinalpt" = tl."ordinalpt";
   deps."xypic-tut-pt" = tl."xypic-tut-pt";
-  sha512.run = "73e53fb9391612d932a584ced1ee80283c807c47c69b773b93441e5cc500dce6f0047bfa4fc630b1d35b0fdf2d2b897ba61cc84a5973c263a18b897b4be47b83";
+  sha512.run = "2885b09a8e43d9addf666b6c83fc435f4d2da26192ffbcfc9aab77e445967a80e5969a430bfa52ab4b594c5a860cd2b7445acbb00f863d14fafe71b63f4526fd";
 };
 "collection-langspanish" = {
   stripPrefix = 0;
@@ -5717,7 +5864,7 @@ tl: { # no indentation
   deps."lshort-spanish" = tl."lshort-spanish";
   deps."spanish-mx" = tl."spanish-mx";
   deps."texlive-es" = tl."texlive-es";
-  sha512.run = "59ab0d8f922e362d79fbd49a95eabf49df4b2449a003f75f0006e1f90a0fe47033d8b710b7aedf56b0bc074d8a8567385431ebe5bd3169273c95d7f629f80fe9";
+  sha512.run = "ee8b79f60ae87ab4919319e5c0cc2f782de50e1340d00361fa3f36a7aafd0a37462d03799b4fcee0634e99833f489e228131a266c597c9ddbe9dfb2fa833dfd7";
 };
 "collection-latex" = {
   stripPrefix = 0;
@@ -5750,7 +5897,7 @@ tl: { # no indentation
   deps."pspicture" = tl."pspicture";
   deps."tools" = tl."tools";
   deps."url" = tl."url";
-  sha512.run = "9a85c8aef60ab9e539dd770db557dae04d5d09b3ef0a259352426f073a7c93e522139d7f2a4ebfca8f83654f870250f8d7831b62265fc1eb9939ed845b71428d";
+  sha512.run = "3db8bef953d336d22c67c49b0b1172b00f76621a97f7744345d0f9214ee84d83dea9190e666c49a649b1eb576c9b50210fcea7297dc555afd3fc4c83efcbc016";
 };
 "collection-latexextra" = {
   stripPrefix = 0;
@@ -5807,6 +5954,7 @@ tl: { # no indentation
   deps."autonum" = tl."autonum";
   deps."autopdf" = tl."autopdf";
   deps."avremu" = tl."avremu";
+  deps."axessibility" = tl."axessibility";
   deps."background" = tl."background";
   deps."bankstatement" = tl."bankstatement";
   deps."bashful" = tl."bashful";
@@ -5821,7 +5969,9 @@ tl: { # no indentation
   deps."beamertheme-cuerna" = tl."beamertheme-cuerna";
   deps."beamertheme-detlevcm" = tl."beamertheme-detlevcm";
   deps."beamertheme-epyt" = tl."beamertheme-epyt";
+  deps."beamertheme-focus" = tl."beamertheme-focus";
   deps."beamertheme-metropolis" = tl."beamertheme-metropolis";
+  deps."beamertheme-npbt" = tl."beamertheme-npbt";
   deps."beamertheme-phnompenh" = tl."beamertheme-phnompenh";
   deps."beamertheme-saintpetersburg" = tl."beamertheme-saintpetersburg";
   deps."beamertheme-upenn-bc" = tl."beamertheme-upenn-bc";
@@ -5888,6 +6038,7 @@ tl: { # no indentation
   deps."cd" = tl."cd";
   deps."cd-cover" = tl."cd-cover";
   deps."cdpbundl" = tl."cdpbundl";
+  deps."cellprops" = tl."cellprops";
   deps."cellspace" = tl."cellspace";
   deps."censor" = tl."censor";
   deps."changebar" = tl."changebar";
@@ -5912,6 +6063,8 @@ tl: { # no indentation
   deps."clipboard" = tl."clipboard";
   deps."clock" = tl."clock";
   deps."cloze" = tl."cloze";
+  deps."clrdblpg" = tl."clrdblpg";
+  deps."clrstrip" = tl."clrstrip";
   deps."cmdstring" = tl."cmdstring";
   deps."cmdtrack" = tl."cmdtrack";
   deps."cmsd" = tl."cmsd";
@@ -5923,6 +6076,7 @@ tl: { # no indentation
   deps."codesection" = tl."codesection";
   deps."collcell" = tl."collcell";
   deps."collectbox" = tl."collectbox";
+  deps."colophon" = tl."colophon";
   deps."colordoc" = tl."colordoc";
   deps."colorinfo" = tl."colorinfo";
   deps."coloring" = tl."coloring";
@@ -5936,6 +6090,7 @@ tl: { # no indentation
   deps."comma" = tl."comma";
   deps."commado" = tl."commado";
   deps."comment" = tl."comment";
+  deps."competences" = tl."competences";
   deps."concepts" = tl."concepts";
   deps."concprog" = tl."concprog";
   deps."constants" = tl."constants";
@@ -6059,6 +6214,7 @@ tl: { # no indentation
   deps."dtk" = tl."dtk";
   deps."dtxdescribe" = tl."dtxdescribe";
   deps."dtxgallery" = tl."dtxgallery";
+  deps."duckuments" = tl."duckuments";
   deps."ducksay" = tl."ducksay";
   deps."dvdcoll" = tl."dvdcoll";
   deps."dynamicnumber" = tl."dynamicnumber";
@@ -6108,6 +6264,7 @@ tl: { # no indentation
   deps."eqname" = tl."eqname";
   deps."eqparbox" = tl."eqparbox";
   deps."errata" = tl."errata";
+  deps."erw-l3" = tl."erw-l3";
   deps."esami" = tl."esami";
   deps."esdiff" = tl."esdiff";
   deps."esint" = tl."esint";
@@ -6129,6 +6286,7 @@ tl: { # no indentation
   deps."exceltex" = tl."exceltex";
   deps."excludeonly" = tl."excludeonly";
   deps."exercise" = tl."exercise";
+  deps."exercisebank" = tl."exercisebank";
   deps."exercises" = tl."exercises";
   deps."exp-testopt" = tl."exp-testopt";
   deps."expdlist" = tl."expdlist";
@@ -6215,6 +6373,7 @@ tl: { # no indentation
   deps."fvextra" = tl."fvextra";
   deps."fwlw" = tl."fwlw";
   deps."g-brief" = tl."g-brief";
+  deps."gatherenum" = tl."gatherenum";
   deps."gauss" = tl."gauss";
   deps."gcard" = tl."gcard";
   deps."gcite" = tl."gcite";
@@ -6260,6 +6419,7 @@ tl: { # no indentation
   deps."guitlogo" = tl."guitlogo";
   deps."halloweenmath" = tl."halloweenmath";
   deps."hackthefootline" = tl."hackthefootline";
+  deps."handin" = tl."handin";
   deps."handout" = tl."handout";
   deps."hang" = tl."hang";
   deps."hanging" = tl."hanging";
@@ -6277,6 +6437,7 @@ tl: { # no indentation
   deps."hvindex" = tl."hvindex";
   deps."hypdvips" = tl."hypdvips";
   deps."hyper" = tl."hyper";
+  deps."hyperbar" = tl."hyperbar";
   deps."hypernat" = tl."hypernat";
   deps."hyperxmp" = tl."hyperxmp";
   deps."hyphenat" = tl."hyphenat";
@@ -6295,10 +6456,12 @@ tl: { # no indentation
   deps."import" = tl."import";
   deps."incgraph" = tl."incgraph";
   deps."indextools" = tl."indextools";
+  deps."inline-images" = tl."inline-images";
   deps."inlinedef" = tl."inlinedef";
   deps."inputtrc" = tl."inputtrc";
   deps."interactiveworkbook" = tl."interactiveworkbook";
   deps."interfaces" = tl."interfaces";
+  deps."intopdf" = tl."intopdf";
   deps."inversepath" = tl."inversepath";
   deps."invoice" = tl."invoice";
   deps."invoice2" = tl."invoice2";
@@ -6402,6 +6565,7 @@ tl: { # no indentation
   deps."mandi" = tl."mandi";
   deps."manfnt" = tl."manfnt";
   deps."manuscript" = tl."manuscript";
+  deps."manyind" = tl."manyind";
   deps."marginfit" = tl."marginfit";
   deps."marginfix" = tl."marginfix";
   deps."marginnote" = tl."marginnote";
@@ -6410,6 +6574,7 @@ tl: { # no indentation
   deps."mathastext" = tl."mathastext";
   deps."mathexam" = tl."mathexam";
   deps."mathfam256" = tl."mathfam256";
+  deps."mathfont" = tl."mathfont";
   deps."maybemath" = tl."maybemath";
   deps."mbenotes" = tl."mbenotes";
   deps."mcaption" = tl."mcaption";
@@ -6497,6 +6662,7 @@ tl: { # no indentation
   deps."nicefilelist" = tl."nicefilelist";
   deps."niceframe" = tl."niceframe";
   deps."nicetext" = tl."nicetext";
+  deps."nidanfloat" = tl."nidanfloat";
   deps."nlctdoc" = tl."nlctdoc";
   deps."noconflict" = tl."noconflict";
   deps."noindentafter" = tl."noindentafter";
@@ -6536,6 +6702,7 @@ tl: { # no indentation
   deps."outlining" = tl."outlining";
   deps."overlays" = tl."overlays";
   deps."overpic" = tl."overpic";
+  deps."padcount" = tl."padcount";
   deps."pagecolor" = tl."pagecolor";
   deps."pagecont" = tl."pagecont";
   deps."pagenote" = tl."pagenote";
@@ -6565,7 +6732,9 @@ tl: { # no indentation
   deps."pdfcomment" = tl."pdfcomment";
   deps."pdfcprot" = tl."pdfcprot";
   deps."pdfmarginpar" = tl."pdfmarginpar";
+  deps."pdfoverlay" = tl."pdfoverlay";
   deps."pdfpagediff" = tl."pdfpagediff";
+  deps."pdfpc-movie" = tl."pdfpc-movie";
   deps."pdfprivacy" = tl."pdfprivacy";
   deps."pdfreview" = tl."pdfreview";
   deps."pdfscreen" = tl."pdfscreen";
@@ -6650,6 +6819,7 @@ tl: { # no indentation
   deps."relsize" = tl."relsize";
   deps."repeatindex" = tl."repeatindex";
   deps."repltext" = tl."repltext";
+  deps."returntogrid" = tl."returntogrid";
   deps."rjlparshap" = tl."rjlparshap";
   deps."rlepsf" = tl."rlepsf";
   deps."rmpage" = tl."rmpage";
@@ -6740,7 +6910,6 @@ tl: { # no indentation
   deps."stack" = tl."stack";
   deps."stackengine" = tl."stackengine";
   deps."standalone" = tl."standalone";
-  deps."statistik" = tl."statistik";
   deps."stdclsdv" = tl."stdclsdv";
   deps."stealcaps" = tl."stealcaps";
   deps."stdpage" = tl."stdpage";
@@ -6786,6 +6955,7 @@ tl: { # no indentation
   deps."tabulary" = tl."tabulary";
   deps."tagging" = tl."tagging";
   deps."tagpair" = tl."tagpair";
+  deps."tagpdf" = tl."tagpdf";
   deps."talk" = tl."talk";
   deps."tamefloats" = tl."tamefloats";
   deps."tasks" = tl."tasks";
@@ -6899,16 +7069,19 @@ tl: { # no indentation
   deps."withargs" = tl."withargs";
   deps."wordcount" = tl."wordcount";
   deps."wordlike" = tl."wordlike";
+  deps."worksheet" = tl."worksheet";
   deps."wrapfig" = tl."wrapfig";
   deps."wtref" = tl."wtref";
   deps."xargs" = tl."xargs";
   deps."xassoccnt" = tl."xassoccnt";
+  deps."xbmks" = tl."xbmks";
   deps."xcntperchap" = tl."xcntperchap";
   deps."xcolor-material" = tl."xcolor-material";
   deps."xcolor-solarized" = tl."xcolor-solarized";
   deps."xcomment" = tl."xcomment";
   deps."xdoc" = tl."xdoc";
   deps."xellipsis" = tl."xellipsis";
+  deps."xfakebold" = tl."xfakebold";
   deps."xfor" = tl."xfor";
   deps."xhfill" = tl."xhfill";
   deps."xifthen" = tl."xifthen";
@@ -6939,7 +7112,7 @@ tl: { # no indentation
   deps."ziffer" = tl."ziffer";
   deps."zwgetfdate" = tl."zwgetfdate";
   deps."zwpagelayout" = tl."zwpagelayout";
-  sha512.run = "195aa24bd46dc79c68a9ffea0c37017bdba83a8a235715bf3c25acb676dfb0d7bb078d56af2e9ed3ef1c5937003aa93982e5e07a53a2c1947d6992970f4f8237";
+  sha512.run = "e94f0365e2d8db95be256f982b29b87fd74b9aee0d9a60cccdc5bf2532485bef0cabb6eed97b9e337892899c59a7983df58044dc8125ccd558e07d654de9d089";
 };
 "collection-latexrecommended" = {
   stripPrefix = 0;
@@ -7006,11 +7179,13 @@ tl: { # no indentation
   deps."xkeyval" = tl."xkeyval";
   deps."xltxtra" = tl."xltxtra";
   deps."xunicode" = tl."xunicode";
-  sha512.run = "fe1e6f81c1b26ad541104dafd02ca030f1e2ee5f0ec415ae519e090c9137a997f82aa390abf5da4f89901ff8860ed0967fae9c8f17822ac14edb142a0e955220";
+  sha512.run = "c2ee4fdd220cd4e46d650f632d4f9cbbd13fe468df3a837eabe8705490b0a44c68c5acfd3c6813e90fe316a4bab4cfc68fbf2024dd42810a62d7090fab750cd5";
 };
 "collection-luatex" = {
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
+  deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua";
+  deps."bezierplot" = tl."bezierplot";
   deps."checkcites" = tl."checkcites";
   deps."chickenize" = tl."chickenize";
   deps."combofont" = tl."combofont";
@@ -7019,6 +7194,7 @@ tl: { # no indentation
   deps."enigma" = tl."enigma";
   deps."fontloader-luaotfload" = tl."fontloader-luaotfload";
   deps."interpreter" = tl."interpreter";
+  deps."kanaparser" = tl."kanaparser";
   deps."lua-visual-debug" = tl."lua-visual-debug";
   deps."lua2dox" = tl."lua2dox";
   deps."luacode" = tl."luacode";
@@ -7028,6 +7204,7 @@ tl: { # no indentation
   deps."luaintro" = tl."luaintro";
   deps."lualatex-doc" = tl."lualatex-doc";
   deps."lualatex-math" = tl."lualatex-math";
+  deps."lualatex-truncate" = tl."lualatex-truncate";
   deps."lualibs" = tl."lualibs";
   deps."luamplib" = tl."luamplib";
   deps."luaotfload" = tl."luaotfload";
@@ -7036,14 +7213,16 @@ tl: { # no indentation
   deps."luatexbase" = tl."luatexbase";
   deps."luatexko" = tl."luatexko";
   deps."luatextra" = tl."luatextra";
+  deps."luavlna" = tl."luavlna";
   deps."luaxml" = tl."luaxml";
   deps."nodetree" = tl."nodetree";
   deps."odsfile" = tl."odsfile";
   deps."placeat" = tl."placeat";
+  deps."plantuml" = tl."plantuml";
   deps."selnolig" = tl."selnolig";
   deps."spelling" = tl."spelling";
   deps."typewriter" = tl."typewriter";
-  sha512.run = "f54d6a933987dfa6f7d01f0bd5d57ba92c11a6d46775b7fff1b4fb9e6b929aa4240a107e8870c1a5b59905380463eba9a1dba3f4b8cd9d642778ddb9af985c8b";
+  sha512.run = "890739f7f3c95489f6a652a3c5597573bb20fe6a6cf9dbb18975dd7b3143076b4520186dde6ed5736988d070b919396eef449ace66b66e6270feccc0ec7987f4";
 };
 "collection-mathscience" = {
   stripPrefix = 0;
@@ -7074,6 +7253,7 @@ tl: { # no indentation
   deps."bropd" = tl."bropd";
   deps."bytefield" = tl."bytefield";
   deps."calculation" = tl."calculation";
+  deps."cascade" = tl."cascade";
   deps."ccfonts" = tl."ccfonts";
   deps."chemarrow" = tl."chemarrow";
   deps."chemcompounds" = tl."chemcompounds";
@@ -7084,6 +7264,7 @@ tl: { # no indentation
   deps."chemmacros" = tl."chemmacros";
   deps."chemnum" = tl."chemnum";
   deps."chemschemex" = tl."chemschemex";
+  deps."chemsec" = tl."chemsec";
   deps."chemstyle" = tl."chemstyle";
   deps."clrscode" = tl."clrscode";
   deps."clrscode3e" = tl."clrscode3e";
@@ -7096,8 +7277,8 @@ tl: { # no indentation
   deps."correctmathalign" = tl."correctmathalign";
   deps."cryptocode" = tl."cryptocode";
   deps."delim" = tl."delim";
-  deps."delimset" = tl."delimset";
   deps."delimseasy" = tl."delimseasy";
+  deps."delimset" = tl."delimset";
   deps."diffcoeff" = tl."diffcoeff";
   deps."digiconfigs" = tl."digiconfigs";
   deps."dijkstra" = tl."dijkstra";
@@ -7130,9 +7311,11 @@ tl: { # no indentation
   deps."hepparticles" = tl."hepparticles";
   deps."hepthesis" = tl."hepthesis";
   deps."hepunits" = tl."hepunits";
+  deps."includernw" = tl."includernw";
   deps."interval" = tl."interval";
   deps."ionumbers" = tl."ionumbers";
   deps."isomath" = tl."isomath";
+  deps."jkmath" = tl."jkmath";
   deps."karnaugh" = tl."karnaugh";
   deps."karnaugh-map" = tl."karnaugh-map";
   deps."karnaughmap" = tl."karnaughmap";
@@ -7142,9 +7325,9 @@ tl: { # no indentation
   deps."lplfitch" = tl."lplfitch";
   deps."lstbayes" = tl."lstbayes";
   deps."mathcomp" = tl."mathcomp";
+  deps."mathfixs" = tl."mathfixs";
   deps."mathpartir" = tl."mathpartir";
   deps."mathpunctspace" = tl."mathpunctspace";
-  deps."mathfixs" = tl."mathfixs";
   deps."matlab-prettifier" = tl."matlab-prettifier";
   deps."mattens" = tl."mattens";
   deps."mgltex" = tl."mgltex";
@@ -7190,8 +7373,12 @@ tl: { # no indentation
   deps."stanli" = tl."stanli";
   deps."statex" = tl."statex";
   deps."statex2" = tl."statex2";
+  deps."statistics" = tl."statistics";
+  deps."statistik" = tl."statistik";
+  deps."statmath" = tl."statmath";
   deps."steinmetz" = tl."steinmetz";
   deps."stmaryrd" = tl."stmaryrd";
+  deps."structmech" = tl."structmech";
   deps."struktex" = tl."struktex";
   deps."substances" = tl."substances";
   deps."subsupscripts" = tl."subsupscripts";
@@ -7215,7 +7402,7 @@ tl: { # no indentation
   deps."yhmath" = tl."yhmath";
   deps."youngtab" = tl."youngtab";
   deps."ytableau" = tl."ytableau";
-  sha512.run = "b7655304441b5fb88547b0735a316031d777e5af0afc52451aa08c5d919ff340504ba75374361c7caf4a399e060b490cdfd57bff6cbe329452bd5f4a4bdf59dd";
+  sha512.run = "3c903b3a43e32552989dc2aaafdae0363f843522755e7a4e6312f91756b6aaa1bf63f7de9b7e69b34bb0d20c45483cb67276a38e9d65285857997ad4a61d182d";
 };
 "collection-metapost" = {
   stripPrefix = 0;
@@ -7262,7 +7449,7 @@ tl: { # no indentation
   deps."suanpan" = tl."suanpan";
   deps."textpath" = tl."textpath";
   deps."threeddice" = tl."threeddice";
-  sha512.run = "18270591a04b9fa37a7b1798b012e97a9ee6404ab7af7cefe885b51b1966330a0a9b84ff32948a06969368df68f6a62d8bc672dbb3eb6d3d3d0aec681f2b4cde";
+  sha512.run = "f282500eb671d5fe17a676e75b2a81100eb42183bf9e4c1e91ba37b0084cb90860ad3257f79532857b45d4c6f2de8c7625d31556f4c7396c6e9e1c3c6507252f";
 };
 "collection-music" = {
   stripPrefix = 0;
@@ -7276,6 +7463,7 @@ tl: { # no indentation
   deps."gtrcrd" = tl."gtrcrd";
   deps."guitar" = tl."guitar";
   deps."guitarchordschemes" = tl."guitarchordschemes";
+  deps."guitartabs" = tl."guitartabs";
   deps."harmony" = tl."harmony";
   deps."leadsheets" = tl."leadsheets";
   deps."lilyglyphs" = tl."lilyglyphs";
@@ -7293,7 +7481,7 @@ tl: { # no indentation
   deps."songbook" = tl."songbook";
   deps."songs" = tl."songs";
   deps."xpiano" = tl."xpiano";
-  sha512.run = "21328300d0e2afaabb29aeabf82978665f0b63e85b4146ab3b890bd79d4e256b241e34b91641b66fd6d55aad00541908053c2ccb8b23f4cafcf1ba167e750054";
+  sha512.run = "0cd848a4952c384fa15a8c2efdd3347198a687cf42398efd955a259e0a66938d27358228930ba2f6db83ee6f9a1eede7691c4f0a190c52a54d0e2059cbc97441";
 };
 "collection-pictures" = {
   stripPrefix = 0;
@@ -7351,6 +7539,7 @@ tl: { # no indentation
   deps."gnuplottex" = tl."gnuplottex";
   deps."gradientframe" = tl."gradientframe";
   deps."grafcet" = tl."grafcet";
+  deps."graph35" = tl."graph35";
   deps."graphicxpsd" = tl."graphicxpsd";
   deps."graphviz" = tl."graphviz";
   deps."gtrlib-largetrees" = tl."gtrlib-largetrees";
@@ -7372,12 +7561,14 @@ tl: { # no indentation
   deps."maker" = tl."maker";
   deps."makeshape" = tl."makeshape";
   deps."mathspic" = tl."mathspic";
+  deps."milsymb" = tl."milsymb";
   deps."miniplot" = tl."miniplot";
   deps."mkpic" = tl."mkpic";
   deps."modiagram" = tl."modiagram";
   deps."neuralnetwork" = tl."neuralnetwork";
   deps."numericplots" = tl."numericplots";
   deps."pb-diagram" = tl."pb-diagram";
+  deps."penrose" = tl."penrose";
   deps."petri-nets" = tl."petri-nets";
   deps."pgf" = tl."pgf";
   deps."pgf-blur" = tl."pgf-blur";
@@ -7398,6 +7589,7 @@ tl: { # no indentation
   deps."pinlabel" = tl."pinlabel";
   deps."pixelart" = tl."pixelart";
   deps."pmgraph" = tl."pmgraph";
+  deps."postage" = tl."postage";
   deps."prerex" = tl."prerex";
   deps."productbox" = tl."productbox";
   deps."pxpgfmark" = tl."pxpgfmark";
@@ -7433,6 +7625,8 @@ tl: { # no indentation
   deps."tikz-karnaugh" = tl."tikz-karnaugh";
   deps."tikz-ladder" = tl."tikz-ladder";
   deps."tikz-layers" = tl."tikz-layers";
+  deps."tikz-nef" = tl."tikz-nef";
+  deps."tikz-network" = tl."tikz-network";
   deps."tikz-opm" = tl."tikz-opm";
   deps."tikz-optics" = tl."tikz-optics";
   deps."tikz-page" = tl."tikz-page";
@@ -7445,6 +7639,7 @@ tl: { # no indentation
   deps."tikzducks" = tl."tikzducks";
   deps."tikzinclude" = tl."tikzinclude";
   deps."tikzmark" = tl."tikzmark";
+  deps."tikzmarmots" = tl."tikzmarmots";
   deps."tikzorbital" = tl."tikzorbital";
   deps."tikzpagenodes" = tl."tikzpagenodes";
   deps."tikzpfeile" = tl."tikzpfeile";
@@ -7470,7 +7665,7 @@ tl: { # no indentation
   deps."visualpstricks" = tl."visualpstricks";
   deps."xpicture" = tl."xpicture";
   deps."xypic" = tl."xypic";
-  sha512.run = "f70b7399394eb9d4c65a825932f9e36fa055556c6f119aa977d3ba58f6039d556f5e760f52385b64ce520b8ebe0a832d7838fed908d55f21d40a903e0ebd6508";
+  sha512.run = "4738ac8e18d2fb8609a0a95ad6615b0d0eaf761a81510c6af032283ac66dcd4ba1ce803811d2fc899f8fa7726f077a0bf6fd64c33f464ed2b8e49fc5080bf113";
 };
 "collection-plaingeneric" = {
   stripPrefix = 0;
@@ -7526,6 +7721,7 @@ tl: { # no indentation
   deps."metatex" = tl."metatex";
   deps."midnight" = tl."midnight";
   deps."mkpattern" = tl."mkpattern";
+  deps."modulus" = tl."modulus";
   deps."multido" = tl."multido";
   deps."navigator" = tl."navigator";
   deps."newsletr" = tl."newsletr";
@@ -7551,6 +7747,7 @@ tl: { # no indentation
   deps."tex-ps" = tl."tex-ps";
   deps."tex4ht" = tl."tex4ht";
   deps."texapi" = tl."texapi";
+  deps."texdate" = tl."texdate";
   deps."texinfo" = tl."texinfo";
   deps."timetable" = tl."timetable";
   deps."tracklang" = tl."tracklang";
@@ -7563,7 +7760,7 @@ tl: { # no indentation
   deps."xii-lat" = tl."xii-lat";
   deps."xlop" = tl."xlop";
   deps."yax" = tl."yax";
-  sha512.run = "379b852ac8a9965ef78ce8879e249f9d3cecd1bfd4334104541c2282386866b3247e737b8dae0d5870a5b71fa51a8a34493de5ea0cdf0c40860151a5142279b1";
+  sha512.run = "c95e97a0eaf93fa84b922676ac4c4e64c7dd77be591ba1d0673fabe013b497c3d39eea2534c5395efc5b4d8d7ea0a9610e2b640cc08ed0f9b41636147410002d";
 };
 "collection-pstricks" = {
   stripPrefix = 0;
@@ -7595,6 +7792,7 @@ tl: { # no indentation
   deps."pst-cie" = tl."pst-cie";
   deps."pst-circ" = tl."pst-circ";
   deps."pst-coil" = tl."pst-coil";
+  deps."pst-contourplot" = tl."pst-contourplot";
   deps."pst-cox" = tl."pst-cox";
   deps."pst-dart" = tl."pst-dart";
   deps."pst-dbicons" = tl."pst-dbicons";
@@ -7674,7 +7872,7 @@ tl: { # no indentation
   deps."uml" = tl."uml";
   deps."vaucanson-g" = tl."vaucanson-g";
   deps."vocaltract" = tl."vocaltract";
-  sha512.run = "d4b5d6a3fbbb6d06a22b4975e1d4b734e7d7f0959c1aa9b943abf05619f0ece59d8d6525c93755daf64f890105ad655182497165375995be15cbf7dfffacd48e";
+  sha512.run = "def3e6e653d481c1c856346a77d69934f8a820eb33ed1420523f56b15546124c5958dd024a9543af64df8d0bf3d439f3ff870f8da33c994c3de1f6af0fc0ccc4";
 };
 "collection-publishers" = {
   stripPrefix = 0;
@@ -7705,6 +7903,7 @@ tl: { # no indentation
   deps."aucklandthesis" = tl."aucklandthesis";
   deps."bangorcsthesis" = tl."bangorcsthesis";
   deps."bangorexam" = tl."bangorexam";
+  deps."bath-bst" = tl."bath-bst";
   deps."beamer-FUBerlin" = tl."beamer-FUBerlin";
   deps."beamer-verona" = tl."beamer-verona";
   deps."beilstein" = tl."beilstein";
@@ -7724,6 +7923,7 @@ tl: { # no indentation
   deps."dithesis" = tl."dithesis";
   deps."ebook" = tl."ebook";
   deps."ebsthesis" = tl."ebsthesis";
+  deps."ecothesis" = tl."ecothesis";
   deps."ejpecp" = tl."ejpecp";
   deps."ekaia" = tl."ekaia";
   deps."elbioimp" = tl."elbioimp";
@@ -7732,6 +7932,7 @@ tl: { # no indentation
   deps."emisa" = tl."emisa";
   deps."erdc" = tl."erdc";
   deps."estcpmm" = tl."estcpmm";
+  deps."etsvthor" = tl."etsvthor";
   deps."fbithesis" = tl."fbithesis";
   deps."fcavtex" = tl."fcavtex";
   deps."fcltxdoc" = tl."fcltxdoc";
@@ -7758,6 +7959,7 @@ tl: { # no indentation
   deps."iscram" = tl."iscram";
   deps."jacow" = tl."jacow";
   deps."jmlr" = tl."jmlr";
+  deps."jnuexam" = tl."jnuexam";
   deps."jpsj" = tl."jpsj";
   deps."kdgdocs" = tl."kdgdocs";
   deps."kluwer" = tl."kluwer";
@@ -7796,6 +7998,7 @@ tl: { # no indentation
   deps."pittetd" = tl."pittetd";
   deps."pkuthss" = tl."pkuthss";
   deps."powerdot-FUBerlin" = tl."powerdot-FUBerlin";
+  deps."powerdot-tuliplab" = tl."powerdot-tuliplab";
   deps."pracjourn" = tl."pracjourn";
   deps."procIAGssymp" = tl."procIAGssymp";
   deps."proposal" = tl."proposal";
@@ -7809,8 +8012,8 @@ tl: { # no indentation
   deps."ryethesis" = tl."ryethesis";
   deps."sageep" = tl."sageep";
   deps."sapthesis" = tl."sapthesis";
-  deps."scrjrnl" = tl."scrjrnl";
   deps."schule" = tl."schule";
+  deps."scrjrnl" = tl."scrjrnl";
   deps."scientific-thesis-cover" = tl."scientific-thesis-cover";
   deps."sduthesis" = tl."sduthesis";
   deps."seuthesis" = tl."seuthesis";
@@ -7828,8 +8031,11 @@ tl: { # no indentation
   deps."thesis-ekf" = tl."thesis-ekf";
   deps."thesis-gwu" = tl."thesis-gwu";
   deps."thesis-titlepage-fhac" = tl."thesis-titlepage-fhac";
+  deps."thucoursework" = tl."thucoursework";
   deps."thuthesis" = tl."thuthesis";
   deps."timbreicmc" = tl."timbreicmc";
+  deps."tlc-article" = tl."tlc-article";
+  deps."topletter" = tl."topletter";
   deps."toptesi" = tl."toptesi";
   deps."tudscr" = tl."tudscr";
   deps."tugboat" = tl."tugboat";
@@ -7841,6 +8047,7 @@ tl: { # no indentation
   deps."uantwerpendocs" = tl."uantwerpendocs";
   deps."ucbthesis" = tl."ucbthesis";
   deps."ucdavisthesis" = tl."ucdavisthesis";
+  deps."ucsmonograph" = tl."ucsmonograph";
   deps."ucthesis" = tl."ucthesis";
   deps."uestcthesis" = tl."uestcthesis";
   deps."uhhassignment" = tl."uhhassignment";
@@ -7868,17 +8075,17 @@ tl: { # no indentation
   deps."xcookybooky" = tl."xcookybooky";
   deps."yathesis" = tl."yathesis";
   deps."york-thesis" = tl."york-thesis";
-  sha512.run = "7d4416a03f785d8dd89fd083ec1f4aa70beb982cd8b6184e67692e789e577d52ee926a9a808a7d1a1395b4cb7268ae5b949df529b178b9ba04ceb15a7c033dc9";
+  sha512.run = "742e304016e4b0ecdd9f27e118d85602b6ce2fe9f961dac57217bf7e3cb8ac2c4d3be2c46db3eef3881e396147e0c1e0597debd0be9f25dc72041eee866ea350";
 };
 "collection-texworks" = {
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."texworks" = tl."texworks";
-  sha512.run = "873bb9e9a28616197b66814b6a0c3635c37e360e36f5507fb300ff3983db566fca5adef375200f0b3007d1a6eba4e047fc5089a1f9473499b15762326bbc39c1";
+  sha512.run = "4d1850b3a52a8ea8a8e2aae83062017d80bcb4586c64398bcb044f1a044113cb65cd25bbabd64b1a9a1572f1e93c6b26ed92f61369c5a490f0c1ee62924352ee";
 };
 "collection-wintools" = {
   stripPrefix = 0;
-  sha512.run = "0ac29d5ef1655f5356d7a28e21e2d880146cd2dc59f52324e252e8d6cfcaea801ea0cdf1838532903e3f2406536202fc0b7bd7302510991b3a3ab8fdfd7f0a19";
+  sha512.run = "b935688c7e195195aafb92e88824d7ceb08a6496ca039e555ff66e99ca4cec9ec91878e21aa03487250ec945c997c01e8114720bd0918a960aabb4e71d17afa7";
 };
 "collection-xetex" = {
   stripPrefix = 0;
@@ -7890,6 +8097,8 @@ tl: { # no indentation
   deps."bidipagegrid" = tl."bidipagegrid";
   deps."bidishadowtext" = tl."bidishadowtext";
   deps."bidipresentation" = tl."bidipresentation";
+  deps."businesscard-qrcode" = tl."businesscard-qrcode";
+  deps."cqubeamer" = tl."cqubeamer";
   deps."fixlatvian" = tl."fixlatvian";
   deps."font-change-xetex" = tl."font-change-xetex";
   deps."fontbook" = tl."fontbook";
@@ -7921,245 +8130,261 @@ tl: { # no indentation
   deps."xetexfontinfo" = tl."xetexfontinfo";
   deps."xetexko" = tl."xetexko";
   deps."xevlna" = tl."xevlna";
-  sha512.run = "a168d582d60e7cabb3294d1d0851cad96dcf87a0a4df85ad792768ab9fe48636414be717945ec5b0fa74bb3b55a9e089e819665c092d0b847f0e2feae076d6c8";
+  sha512.run = "9535aea2dca0d6ac8f8b30433842056ce4fa5fe94abaef177f4505156d316ef999bfaa12ea5d8e7c826f58878cdc6d80e2244c35589904ffe59459d87b48447f";
 };
 "collref" = {
   stripPrefix = 0;
-  sha512.run = "5581ce5d2c8ec32026b55df5371df9c44107d78375a05ed5ea109eccb8b8a5b6d2cd4ccd146ed91acca97bb05bea720efd0514a71a85f4f518b83fdbd5b2f91c";
-  sha512.doc = "5f7abfff42cfc29362833af402f0f7f8e215e28675389a0fa1769698d721d5acb1988dca3a0fe4d4dba4744475fa2e7e879b6f7ef62f147a4c85539d4c6e26a0";
-  sha512.source = "9a8ae5a6ff27d0ca7b080fbddebbbbce7860f44aa4dc3ff82020f537fbf187eb73130f24472943bbf6384cf627ab3d984688441cbab2fa97df78d57e1856eb22";
+  sha512.run = "9d032c27fc91ba51e9e2193e3990e44acb7bdb33d18fb307b9b3292286884c7046e6183ec2bae59f6418ea48d62cbd0e680c852c18b016d193d8204993245e8e";
+  sha512.doc = "cfd24e2e37ee496ebccd2fb5d53e18854e4dfe36f0420aafd7e5149bf21cee1e7c167e2879041eac93e6cf8506bd8413afbd339e8bf49e1172b44d2b91f3db39";
+  sha512.source = "2dbd247ffd7d79d1b7aa6fc4baa242e9361a59f7eb2aba1bbcfbd15da03bf2c644802e40c21619e42d312be09addd4982f207e32fa7806428fd52f71883fdaa7";
   hasRunfiles = true;
   version = "2.0c";
 };
+"colophon" = {
+  stripPrefix = 0;
+  sha512.run = "1180bd69f1f0a4a8467798069c0fadf1105b46ea625fab9efdc5d2c79207ae992c61868cd9fa5c1d24b979106633ca434f7ce4bba818958395c9c70be47e2e73";
+  sha512.doc = "01176ec0b511d3976663a81f7dc9a0fee7531eac353c843f77eebd22643d37125f174c1a67796c2e439dea68cc3e4099b1811ca0b5b84f2d0503f511c62002c6";
+  sha512.source = "f318c78266bd339672b146023adcfdd9e7ea17d6d41cbf1e8f86e81cf85e10a3c0e277ace3b076793b46e77289a492803073a0fea63dcf4bfa7b465dd83dd791";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "colordoc" = {
   stripPrefix = 0;
-  sha512.run = "86fd1a01e6a5da711456c4e80e005ce10ee74471127cf4dc47bf63857ccd712dc872f2012a4ae7f16e2b53c19041aa1cb491639d4baba36cd46ece70d56a2383";
-  sha512.doc = "5b1a9c1317f2821de178ff9f1c95c82c8902fb17ec54d8396be548de7a97264ffc6fd47df3aa943b1d0c88b1fd5edc98361c1e222b304e591f8d88ea9dcc8c37";
-  sha512.source = "7bd8620363c5d161d293b92b05472355b862a2283abea8aeffb7eea8d618f87e3b82aa41607dc3f71bd8237b7802b7cdd0ca86d03ffb59997ef199a89814f7e4";
+  sha512.run = "16a98320e38c041068c403f710a0cf9cc981ec5525533919a12e71699f932f58bf7a178b04d491cda6b616406f8e63bf4ed835df6f4a45fd7eb335cf1a6b3dce";
+  sha512.doc = "a5dadd8d74de32073ed78adaf6db4d402b7132522a7b561573ec48c8a0c726a1bfeed9483823e3717925103e8dd91ee7ea70febdcd1cd32cf2cfd40e631b13be";
+  sha512.source = "d0c6b69053d88a6e042a9a5211c1bdb4aa9a60ff26039cb462ea87283316737fef3ef378ac7c6b8374f69206c73145598dd3bf6943d4335e5f1d52cbe7d77375";
   hasRunfiles = true;
 };
 "colorinfo" = {
   stripPrefix = 0;
-  sha512.run = "10596fb1328188500f30cde1082e552d7ff04a74da2fd627af5bf237f8ace6f2545057f9bac20110315ff70c336818cf62a43be8442ae62748e77f912de71c12";
-  sha512.doc = "9e14c4722e6a723ca2568c7c2db62c56b7650c9ae975718ab37e00393deb6d6a332d3d2c32fb0a0d532b3477e9245ab578ae823844e1856c34abfa918efbda44";
+  sha512.run = "057f88a1ba076616eb7a5fd1cb1d0409a481e5535825df2347fee112228e5c73895dfb7f467be20c88382655ad4d5f4704b3249bdb5c01ed5ba9a860cac38145";
+  sha512.doc = "381d93db9ad3d06cc9ca72340cc78484d15465828cc40963d096a6644b07801e44b958caa94aae8bfca2167eca9b6b0bdd8dc4697e99fb4c6fe4e21c64cd9982";
   hasRunfiles = true;
   version = "0.3c";
 };
 "coloring" = {
   stripPrefix = 0;
-  sha512.run = "a8ca562eb81ed5388856fb491d9ed8c65ad1e71ad9caf7d2829ffddb2c802e9eac94fea635fa3f6e9d15205d874cc379086eea07cfada7425dff3217fbab0250";
-  sha512.doc = "6c8b87ee1ff7284a40cc957825d860d34086d872ab23609708c8829424d3ed9e8a27305e4263aff7ef7cd06e2fb10095068252e401bb3f2fd12012d05dcd0a61";
+  sha512.run = "572696dbcd6d47e03eaf2b880efe3e137e0a179a3e14ba1a6078fb53670cbc364246a51b978c0657679a60f8c3ccd77d1ac6f098bc624527430921a1d55ee333";
+  sha512.doc = "dbcea5bc6621630fdfc35a9eb1fae1275b7a9283fd1563d9547e8d41548631fc82550890923f5938f526cf4d6ff2ee0b43a93dd2ff4343094f27122cebabbeb4";
   hasRunfiles = true;
   version = "0.2";
 };
 "colorsep" = {
   stripPrefix = 0;
-  sha512.run = "143519baad88cbcb05d0946fdf45c75eb17f8084883b0300d08a82e4a8d8a9222338bbe03b511220b12c8720778918a6c1166d76202463e0e24139b1b8a1bf61";
+  sha512.run = "3bd8002997c223caf89063ff643083f8c13a9c1a26395a8eeec444f2283029904055b2f4c6bd1bc7ad893792c1b391ead42605c8cbaf23bc20678bbfa2859623";
   hasRunfiles = true;
 };
 "colorspace" = {
   stripPrefix = 0;
-  sha512.run = "bc00c105f6704affcd8715fff5001190709e8225c20e3efb28ea3a7c602d6924374d1aef9305506adf1cf41ebe0dfa4ed40179d16471cde7bd04a59de45d65ee";
-  sha512.doc = "0519c56594bc6dd6e542d9ee9fddb65fe9905bdcc61330cf15479fe5624f883d55a3714ae3913b22c522a5c9f6f0a06015f685fc0e0af82e69b96b4eb3e9718f";
+  sha512.run = "8d7c80694dd3ccd7f44ba9c6c714f619482c80e296d1ab186b2cc49ed3f087cb20f1c368c4e4052e14ff3a5978be711fc337e246d53a01062c2b2862f13292a9";
+  sha512.doc = "6d844943e828d102af5ab86a5326ba6742ff11ecbbe38cc3eb5b1d66e0986db72941e3f74d5b2aef02b1c3f6fde4f04f10f44aa8ec5a1067c9789a3d11df3faf";
   hasRunfiles = true;
   version = "1.2.0";
 };
 "colortab" = {
   stripPrefix = 0;
-  sha512.run = "d9963fde136886902b27fbc4baf6415f5a8494c8663008d357c44a9c79d809c6cedbad6cea88f990e57e1f4f781220dce930d033f8fe2e8e779629ea07b5b832";
-  sha512.doc = "5b640ebc41a6fe8d1e2a05c9b51dc5bfc0705738082415db5e2f5cc3ab6f18cfe71f386250b24455f02a94979254c2b7da02753ad85721b8cde080332ac58cc2";
+  sha512.run = "75c35fefba78b3fdbb9fd56fcfd31c37d1da963af89371caefb46a76da53a5dc8d3121be07b2e8ea06d98e558a9971dd37549f04c652a78809b73b9eb1ad35fe";
+  sha512.doc = "05296a8c86e43d7acdfe32d7aa04caa50aecb32c8050b339c9444691cd24c5aba545161fc35e4f6815fe69a9284d37915d469643c7e78a34f943f2988687eb85";
   hasRunfiles = true;
   version = "1.0";
 };
 "colortbl" = {
   stripPrefix = 0;
-  sha512.run = "7dba46747f2e7c1e088d4e7b21e0c7014eb7226ffe20cab91e522a1df2ef5d81155b92bf37dff0f5926634da38d68980389edb6fdc7dcbc14791d68cdbc9f1c3";
-  sha512.doc = "2f91dde4844b874df6c176ff6d1fa06144a4fbb092295b071249f5b6da07d35975891155a3516414f32c24577a68890c5b106075cf5edb4b2927339eb45497af";
-  sha512.source = "92de5eb50a38d8dd3ce4f8b70d167de57328af0e31769ca6f5a89bc7ac2833ed4bb795c358c955d53e06b7c488217e239193ddf5c4bb3a4e800fb17ed5687fd7";
+  sha512.run = "078f32dcbc3d0e0b4f18d8a4a2524828fcf1c829089768bff6dd1c70a9e0e10de0ed3c6462203277be5087fda2f740039ef96b5a0edae9136aa02f5000026f90";
+  sha512.doc = "ef30bb53b18c42eb91f241cd30416e05a11cc15db2ebe303058c16fe1952b4ef7694fb63d908e33ac8af91a71fb3b7eafb30ae3c4e7408db8cef1a052758faff";
+  sha512.source = "285348c2230dc87e9c6bbd58cad7be70e84ea818d802d4ed25c6434f22724bbbb97f12e8ac71a9383496bc79f5223467d184c52bce3b38a3c5d5e7842c3870e1";
   hasRunfiles = true;
-  version = "1.0a";
+  version = "1.0c";
 };
 "colorwav" = {
   stripPrefix = 0;
-  sha512.run = "c12240d3647c5db8e734b9decb9fb72dbe5b133381c60d8c2aa7662c2f9a5951e6bc4cd97e411ce7fd86afedd8f5d56d34448347ead7c9b0b55e139fe5f17337";
-  sha512.doc = "570fab28d5dcff1cbc653b5f50333bcc654263321f270a28fa6f07de8827f614611e77e470d5e5e654b0363fdf9dbf986ef580c18c160989eb00e55704d98de6";
-  sha512.source = "f36a8b28ad5fed9309522e0007760e5ba53f62e13fd7ba26898db34335bd8b30c63e272d08bea985498d62d50972758a323c94c2cee2a01aea5b279df1606e7a";
+  sha512.run = "615caba84d24d8170f8408729b8fadd4992b3bafbfefa9b81da732b316c3327d49b011b3138420534a5d8b83d69faee8ffa0346a3bd141bdbae696e4c9dd99c4";
+  sha512.doc = "8538c10fe35d3530cdc0e27b190607167af9ae036858c5692570e332bb827b8d1394a725d6ac47c72e1bd1d9b03bcc2c908785db88b8df516b51a8151b48d837";
+  sha512.source = "f112f1020e075def73049dd8ec210c486cf6a8a2cff93db2688f2d7960181cf1c8e3e564596d395a6498d25865cc326981011aa56ba05616a07992fb25bec437";
   hasRunfiles = true;
   version = "1.0";
 };
 "colorweb" = {
   stripPrefix = 0;
-  sha512.run = "9003bbb6096739c76add5fd38cbe973457c26d618919b1193b96d56bf0bc084b3392e62e20ed5c15df22c41610ba67a5d05f5e21934ef57b1c98033f4257daa0";
-  sha512.doc = "d4ce533b122da7ec9ae0273e7e6419ed029d2b9b2521573e74dee2f740094721d8a0c88e0413aa0116e78fcaac386337435c5aef6165e7c3ce70d2fd3f21a26d";
-  sha512.source = "138ab30983442d15c6afdde499684ad11f2337e94708d735534a045973d6fe6c9efb964ba97fd796c9c68167228085141d7e4181eb80a0fb0cbc113804f6619a";
+  sha512.run = "12673691e77ec9316d03b6a65ce932bd91f8570dc3939c6063934e4d8324153f1479b0d2bd395c10f26547a140e1487a6e74dfca63830e43eb0c281fe65247b5";
+  sha512.doc = "b95aa651b349b8d4df30891dee6af6e6b1564257fe4cf700199809389ab1b7c8e77239b75812f93b7deaa02100c7aa5236a219d6337efa135fd042b7945cc330";
+  sha512.source = "e63dac77920e8a6156bb15f56d1df85c5e716ee4d06af008ba0649271f38526170dedcac0210caff368973b6edd1fbb16fceaa0543a08599960b5c40abf7361c";
   hasRunfiles = true;
   version = "1.3";
 };
 "colourchange" = {
   stripPrefix = 0;
-  sha512.run = "8e49edc6fe6f96140cd7acc96af63687668b8abc309b2a2bb130576f47b1e970ef70d9053bea19845f6d8f0f80967a470c392d8ce4762ff0c1f4458491048182";
-  sha512.doc = "b2d219b51b355078b0bd79bda5d668f268fad3579115eccd6eabad78ac0e28aa7031e79d134f0e0120b711194d04713b175dfef19dbc441ee1f3f04297ced1e5";
+  sha512.run = "4811c709d163ba87934c396d4f1e83985af1607f15330e1146e7a49f83f203589b5831cab9e5ed082eeeabf1e4d33096b50df91fe70016953be2ee2fb00dcdef";
+  sha512.doc = "99f20d002c50bd78877fc1563a0a19a37beafa84cbb947187000092e8d1533871995548aa302250df4eca9c16eaec1bebec6d43306103f524075875cad16b466";
   hasRunfiles = true;
   version = "1.22";
 };
 "combelow" = {
   stripPrefix = 0;
-  sha512.run = "3dfb483078917ea86029fce2ff203ac0c96fde458f9d852b1e12a8b0c83271c538d3f48865f01c6b0ea608c72905f4c0fa4a856eb593325586ede7a1f6eef4f9";
-  sha512.doc = "1ee63b2dafc869f08875ce03bc190af56ace436f51f13f37e61f1610c3a8b5aadee629f648b4021e3453e65616b5b9cd3f40ea5200586faf1b109ab3eb7977bc";
+  sha512.run = "90f17be87dbc02e346282f47694e2168b99c9e0111745f8c38ed31446b96c3258ca287ac79e80e05fd54384e27f4a44fcacdff05f04a3533d393558458c5c506";
+  sha512.doc = "bcefd624f3eb0822118109b70b905a75abd9c52031c380334bf7c3763fd950f916fe76378316bbf8541920686d4aeae99e707ca36df83ac7e3c2734c5c31eb3d";
   hasRunfiles = true;
   version = "0.99f";
 };
 "combine" = {
   stripPrefix = 0;
-  sha512.run = "157474162071eb1e781e4e80b7e1f0e8b7b2ecfddccd9cb3d2481cde247df148762ebbbf9bda488810a656866b3f260e10a965928196f3e2f3b432397018631c";
-  sha512.doc = "1c0dec5864840d16cb4acaa4ec41d9360942287dd15eb170d87f550deaa32d68bca3d845883e9bc0ae5977c90520cdff1707a17c590267d53d3bc6501d24a9fe";
-  sha512.source = "7769a7f6a839f59bc20e46402d43d1a61bf07482063780e79e1b93205e925f1f2e99c4f37731462c87ae6e8186e1495ae2c6f582d8da3515defc57fbad0d5df8";
+  sha512.run = "1ac3db1dcc8a2456711c4182a348895760c91880c89d4787808f04cdc4f807337d053c0adfd5ba9d9c4f1cec6f477dea33b4a96d134c77e5fdcefb2c8f2657cd";
+  sha512.doc = "5434cac620a2da1b4b8fcf087d720f5af53d7ec36da698d75e0386147d0070d0673c50746db59de167ffe0523cd157c29369c996e2e188b8eae4ed56980b76e1";
+  sha512.source = "8b9532dbe365d898a99bfc5df53ebab76a84019cd3a97d5dd78b9fc3813b7e1f3e1f88c1d49ef3c38fb5f2ca105e0ed4c2fd7988c3825fe31059a0361044803e";
   hasRunfiles = true;
   version = "0.7a";
 };
 "combinedgraphics" = {
   stripPrefix = 0;
-  sha512.run = "ed5d77c59f5a69cdecbe5801b0c3dbe287480774aeb2511f2b13f71d8d0c5954863b0999b0ed7a1d5bae064d9bf154aa65321fedabafe69a59079fbe3e4c258b";
-  sha512.doc = "2e455e4a14fc6fa695815109ee336d9daf6e5749d086d816f2eab7b57c1cef8a9d0002391d48cdc6ae7fa9778c27825424bedd45a3fdd5808d4cc6449e884de9";
-  sha512.source = "7b39d0af292e18bf617fea9122f15be57f21cc71b9bf9a2b768272f79b6bbbf484ab80b7541dc18b271e6a2414378b7f12c84b1ac6d093d5d752f598297784d4";
+  sha512.run = "accccaf617e20b555ee67ae776deab478bb8eb3628845c2de6a1cbc47b10d405d81debc9c590d1774b7c62f0bb9239a01bb0c7f6491cd0b864d07ad29a4da335";
+  sha512.doc = "bd63beb20aa2fb1c6b523bd17d9361c73486c9e528d4e54f8cc3dc1388f4ae6e88697e8e5f55b42c04dd3dd559283e494204127ad86fbd7a624833a539299559";
+  sha512.source = "4ac1e6a20e26947bbe3ce2ede052f12226930133f28cabcacc46e3bc03eef9945d62f24f04f3f254e0167d1e47716f34c4c4b0498831a9d2bde1040257ba9275";
   hasRunfiles = true;
   version = "0.2.2";
 };
 "combofont" = {
   stripPrefix = 0;
-  sha512.run = "a13e1a32520d2ef2ea08410a88dd51579980e081733aba137994ce8db58c0239e63f98a436e6b04f4e0b79267aaa5bbbcc171fabd4efd981297e72d5e0c35696";
-  sha512.doc = "44c9d02c2db0894f2f2ff9c5c00718c24481ef9a5af40d69a81c9e444ec187147e18e0942f5ee734c0cdf430647da2b2963d087d7ac3da4b23a64f8237fcde67";
+  sha512.run = "5b2a1df350a23d6a8fa06f7c8820a65b20ce3baa36606f4d46020e6c3cad58dd4c5d1c16a4f36e3e789cd41d422ff8a4849c8faee0c384ec779b7e97be7a8aa7";
+  sha512.doc = "18cbb6692855c1304e46cb19867a86c8c476cdac5c8d6ab5e171987cda4a82f74147b898d00f550650f2a11ecbe4019f1c19dc8b1a1c398eacfd025f44498056";
   hasRunfiles = true;
   version = "0.2";
 };
 "comfortaa" = {
   stripPrefix = 0;
-  sha512.run = "1faf90a9b49f35c99c03fd45ead7d772bc2db7876d400504df843126265394d20212bada204d4bb3c2376a26c55fcef5518435e5ab518c00eef36b1382a1eeba";
-  sha512.doc = "029d3a121baa40e83c01af48a70bd740b2e79320e1cc482e4456442ce72ebf5ebfe48d6fd1b8597ff518d33365203f0c88e311104cb04dbdb326a0b30105c542";
-  sha512.source = "f625b0d2fa176d9e7d6f4bdd15a3a284730a1fad25179c91f9b48d041400cbfb50f01bd270d0b4fd48a74aa9e933b2b1e32ac71d54eb90f9e76039d8ed061b6e";
+  sha512.run = "557beea39d924482cfbc16a4509232f968feceafeeaa68d0dd3cf78b6dbdef96d1628200967fb4c3d8f71b11d621cfe1a6f6f9a3a7d767c21cd6e6798c14302f";
+  sha512.doc = "f8502148d1cf9e5146a72491000bf0e62263f3ff36c9de83b5215326e3b30f72fe4fabd301f486945edfd20d286cc3ac4b7c01b89b60e71f2b844155eecd1bf7";
+  sha512.source = "d937e33b13fade7afc9810788848542ef9439af80b5d9ad5878abe110f5422d2ee4f6d8dd3f5af321b25fa24dd5bfcb478c4e919fe618374340dde5d0f1afb98";
   hasRunfiles = true;
   version = "2.3";
 };
 "comicneue" = {
   stripPrefix = 0;
-  sha512.run = "eb8bc5196125e68d6394178f4d57407222bf2591a7c6ab96a9b2e4a1b82c7fc744234dcec15d2eb644a8d6ce256bf78d44b7d60b17e58f60e1b753c80a007f17";
-  sha512.doc = "21f12f0893731cd91e0d194cbca093971e6947805b8ab94c9a011a5cf733ead5a5d6eef0fb6aa2b6eb7b1d15194e6977a26ef67d2456bcafe740627a427c0257";
+  sha512.run = "9c510fcdb0ef4165f162d60272894f6061162804be88fd17f7591426d39077c5d90be578faf963aaba707cd290ea05535ff04b490fdfd5529f4fc7f2574f6336";
+  sha512.doc = "304001eb14aa91e94abc1c872ce1967c0dbbcc4b29709287e25fe783ff0263922ebcd5144c0831ad0a8f6d18920304d480dda6d48a771c5ef21eae4456d2f9bb";
   hasRunfiles = true;
   version = "1.1";
 };
 "comma" = {
   stripPrefix = 0;
-  sha512.run = "8316f05afc81c990dbd305c0cf7e90b26b3ab3a308824454d1ebb4a7e761643fb05adb1819930e5d674c37d7478a4d65257dbe1f8a4e7b75934cf88ebba8b716";
-  sha512.doc = "6370f50a8ebea5eecaedefebfbe7ef6fe9324b818c222f381c21d978dcad9c9d26116d516dceebce6dc9fa54649f14a4a6d4ac7c44cc224b7cae027f61ea9c91";
+  sha512.run = "7fb323e1fd37563a7409a7eb8565d6a55c7cfbd539e8efcdec12866cfe55fc0c2a4e14fb2820d0742ee93cf42f0f8fa2b93eb0a3df64dbabee871d2b62675836";
+  sha512.doc = "fb9e9f5b7dad0b3be66884fa24b57ee50d4455ae102fcefcb49d19df543c832f3241acf824bdca99ca4016ce088e1e6fc0872cf46c6789d3fd2ada8ed862386d";
   hasRunfiles = true;
   version = "1.2";
 };
 "commado" = {
   stripPrefix = 0;
-  sha512.run = "bc2bd7b67597cd563f39fb7155f468a4dc0391d65abe7cb0104ab4b3115769dc9d7dead660fd16976d0b8c3767c17311a54e9e165c1d3c99486308eaf8699865";
-  sha512.doc = "60d04b61e277e1b7b627e99729d3670df51552ea668b116ba2714aa0f356cbc1be5ef4139445abc88cc8be0e11b15f70f2ac76d43a4ddf77ebade22dea799a6d";
-  sha512.source = "7625f3b57bda821b9386a40cb638623d79d9846d59df03b5e5ae910f590dca3fbb0959de8df85065a9ebf7773b7dd94c72d8555267de382a2b1b8d97ce417e90";
+  sha512.run = "c552d4be89c7075391a407386c5927f4eb0977b7b7998d2acec615929295900526370a9ab992d60b698996a15b3ab7bf2e24e39a74fd203b39f819dca509f35a";
+  sha512.doc = "e79926a469f84e6e8dbbd7d68c11eea9dcd4cd5af27f39765a8e16f57fb50eca80a41dc678ac9ad8fd0583983cab0d7ef16bf63a5362e33d4127fa4af62c89cd";
+  sha512.source = "179069e789165ce1d5beb1c2da8def2274f65718f170348b0e102bc58d3c2fb0aa283d494f79302e628f790e25a6a65d2cb6be435a3e9e34fb9ba90e8cd340f6";
   hasRunfiles = true;
   version = "r0.11a";
 };
 "commath" = {
   stripPrefix = 0;
-  sha512.run = "b13cc1a23e839fb84cb3351e8eae0900f506c338c7ee82152a3987ddb703ffd0b66cc8a0ee109bcb7a70996ca9e5e2d4826a1db014c91563f05468bf1802625f";
-  sha512.doc = "c141e9c38db740ff8d51ee952fafaff487c3bf66fd3d4d317ccd25bd266cfd651af081df303166a9dd552ebf837890fc24d8c131ead1fe3b6d337ae55204959d";
+  sha512.run = "5716ac19591d8eba5086a97ff5f2a7326f0b51dd937f87f81efa881735b5fe01e5b406578e87f80d09fc54228f20ff67d2beb462fe0c291f9caa8133f7d40109";
+  sha512.doc = "a83407ca5345925edb4ff9c4be8c25ca549ef79bc2e8c95b9778cb028c52ccff963a0799303cdab6d23509506a0b65cd4b0d228a8a3cd5708faa47265118a2d9";
   hasRunfiles = true;
   version = "0.3";
 };
 "comment" = {
   stripPrefix = 0;
-  sha512.run = "d4b58fdf45d84a7d783cbdaa72041111c27f3519e95f2264f4b7fa2488b64d1ceb80a7a6089ed6c39707a3de7f7ce3e6a15e2a557b8cdf870c3e1dc2f6a27063";
-  sha512.doc = "51473d0d41db4a5549fdfc3d8a36d48fcc32f2fc908d134e6a15a3003da26815af58a12b95f0d2cba6123bfc7eb051c008107a07bb50677e9f631615c9aa06b1";
+  sha512.run = "2b102bf1c2c278e2e336161d264e04102df7ac1cdcaa91d5a8462992acece368714645a5ae12c87baec5d6de6508edc8794b4aa032cb2e58be32378b524b5874";
+  sha512.doc = "a2f8af13b9529e088606bc5592b31e5a1c3f4503420021b10203f8a22b7fcc7369cce73851818c93b3b679f989a97d4734f96881f4c5d1c7d5175c5c9bb494b3";
   hasRunfiles = true;
   version = "3.8";
 };
 "compactbib" = {
   stripPrefix = 0;
-  sha512.run = "3ca521ced63e12f4f9015b325a8e9c9c9be4b53f4d86527bb6fd08b54b753d9d2673ac02145d3eac1e7c82b389e91054fd32d05096c7d84c03a48d536b43c0ab";
+  sha512.run = "8f40de9cd7db15864d220c49afdfa26fefd49d2563205c0b73a7693abe4509316e4d15c1d60d5c944328fd2cfb6e3cb254b1e6ab38d061bd23a66e1f99356f74";
   hasRunfiles = true;
 };
+"competences" = {
+  stripPrefix = 0;
+  sha512.run = "cebca8ba6243f962208b4b7817d2532c28e5aa327c157cadd6113836ec711446e6413ebc9f8fdd19e749101ae7a8b8710871c706fc754f8465ea535e280aa06a";
+  sha512.doc = "b15eb8dcb19d8d2303ceed04240770bb5444733488c2179c80121a8c2eb4fe9e1fa6665475d00c5143a0b943f68df6bf42059840a7eb72acb1388887698c0164";
+  sha512.source = "81232d5a93fcf0c2b278872d51b34911faa7ea4a92479956e651e95ec44d609093c257afc0a24454ec736960feeff7b2e335d43bfaabff299a3786a212d53c53";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "complexity" = {
   stripPrefix = 0;
-  sha512.run = "7c767f06d1ce35d3e6d4c5a8bee6f6bcf379928b89bf132dbbe36e3d28936fced7f0e7d6d77957b51c8813a60a72ec786005ae3e1e15953fd191ccdaaa536c1d";
-  sha512.doc = "ae0fe547157868ce240610fb094ca1d097c13e337fa39ee53530b7ab85c41284dc5e7e0f5b1170f6c51760ee99d17642979fc5875d6e9b04f305e22abf0a0c53";
+  sha512.run = "8377bdf605b7d625c7148e54f84e7313c6a3e6e99b2c0fd4981df3f359f8a2af64aaba4f61954b6407c7be95f726082a67eb1a937d112dcb14419522c72d8e7c";
+  sha512.doc = "d7832068a120e638fcdd91ac0c4e50e52f151aede46fd774fddb1337276f408d61bad0656c6bcb8e2c337ece53e59ea966ad2f3169161788d41eeeafa7753d87";
   hasRunfiles = true;
   version = "0.81a";
 };
 "components-of-TeX" = {
   stripPrefix = 0;
-  sha512.run = "bc68e26e7e411cbec89be84a2e4e30cbd80ac56c3de611cff3f3f25cd46c0456d00489adf159d13c5ca42f95b9d7f00248b20c636298aa913aa3bfca86f188b3";
-  sha512.doc = "8bea01596f3381457ccf9f3085b587ae60f2517e8b80310ec2fef1c32758a463734caa04a0ee4c37c118a71b2b2895630fd45d067f02bc69d2bf250c0c836f56";
+  sha512.run = "e0c5ab27cd8d772f2b890460e83d2fb681dabe1d3080a6f37baa8fae329af2675bb959925b0b5b7a345a6633edb5d362502928ec761de977a0896818bdc68526";
+  sha512.doc = "198ff64023dbae070b6995c75e75177f91ed0598e8145f2246e0b22fcecee4c02818781949185dc8923ec8ec94fdd0539b8a1d07e304529077fdee131987fc0c";
 };
 "comprehensive" = {
   stripPrefix = 0;
-  sha512.run = "1b102a7046c7e3d5c7351f766c745e4246b7e61f2f36d0886ce87fb73500a59f3e7e28820d7d130d87e1c96ca042d565f13c78ab1be30c7bd296dc1b1303fe1e";
-  sha512.doc = "6a26ac52c97b52dfd554eda8b8106e6410d153c0d0cc747d599a8cd7317ae153a660b1c2322de359925a84d2bc67d85ee11a062652625fd463b95df3588046cc";
+  sha512.run = "0ee08e9b2a9ed359ae61e1c1a284a18abea30413a9a2f3a1260a3f69fd12e0a1f2e9c97458043ba30f4aa31a63f4c894fbd20641559c78e6fcd312928276eeca";
+  sha512.doc = "1088ef5e1efb5a5657d6080727b24ee9c0aee88db36392b777f057814b72925d58b28fad102d8733debd9176cc61345f09a4cbdc2d1845d8ad00cb7bf3807cf6";
   version = "12.3";
 };
 "computational-complexity" = {
   stripPrefix = 0;
-  sha512.run = "41831a6d37336c57db43eec20d3815a0cb50d0b8d050416d817adb3ca1ad692aae9a31e634d7863a3dd4ff354c4b5b53069f2996e82d4a440924e3164ab7e9ee";
-  sha512.doc = "2c8c195ef94db0ebac7b7fff4fe239aee43bd531a1b210fc1d43dca5bcd1841a981556ac8177348d10f20ffe81dfbc34ab52e16e3084734327f17fb9d6659784";
-  sha512.source = "e112bafb5eabc92cfbfd2cc8f81edbd88a8c6643b428b6c64c612aee81d707098457d4e865cbffce17068482630dac0c465371d0060bcc9d6001022ce5bab5c4";
+  sha512.run = "4bc9be35eeccaa8d5dea51a219025391d950ac56d2aa0bf7e8264d047943df5cf3fe6b5a3e14973132edfdd0c0a9a68abdc95d5c46e54bbd79d315b8f12c4ef6";
+  sha512.doc = "09ae63bf095fba03b8db2f54a22f410c7f0ef2642209c917826c926ea3bf41c159c234dc56849c45f1ca73b15659dc43b466d3b7bb3d7b6c85ad8ff9d3f9103c";
+  sha512.source = "fa00f041cba1a8c9db5a769d578fd17443f2b8a8a9c590250199c76d416390bdc420e8456e1258c284977806cf8b49de271e69fbf678393a44032ba6e5155e20";
   hasRunfiles = true;
   version = "2.25f";
 };
 "concepts" = {
   stripPrefix = 0;
-  sha512.run = "cbfdfa569d9b112412808ac733b3bdc12697a48a503e2240286f950aad7af88b53f25d6075b1093e2839fdf5a79a2501ee949d0e9ff85aba7f9d5290f9391f16";
-  sha512.doc = "f09f406646cada7be7e758006941b95aa8793a1980edfb35cacbbba812f318e1f7fea352f5da3d7e32aa93f1ca7610c202b3031f589319db36a21a505fe13e11";
+  sha512.run = "b28ee91e7e558ec6f832f7422a0a29d7b813fd471b927b714fc056b36bc6147c606f1a10b5e678cdc0606dabebee1753bfe70377f48914fcc62792e5162aef91";
+  sha512.doc = "e056c91d0b11ac91228c0dd248c092a2b20bbba0241f9f0fb353e0a2d91d5916baf675eb661356adcdf0fce53479715e5292dbfbf2db399c5a64d2d7a5087d4e";
   hasRunfiles = true;
   version = "0.0.5-r1";
 };
 "concmath" = {
   stripPrefix = 0;
-  sha512.run = "6f3c566c14324566b49775c2b8b9539e91025a5db39217968039490d34cbce0ebc927e5a93620f74f7bda09b41c5991154e64ef3977d40e9e79d787002067038";
-  sha512.doc = "4849ece0ed58e231e6375ec03bec2f90950320d5f330b0f712fb7a01cff8a21c84af331709d8920918c7f4695cc30a94e7a631a3bf45cd16e29f7f5594f2a128";
-  sha512.source = "26263ce618b758b4d8b50ec79d0cd424c93f71a831610a2495292a2a5675407923be3f8581f22b5429ba22907e11d4e200302afed8856c99dc25c6b5e60ad520";
+  sha512.run = "dcd3f16d6ed8405bb7cf93aae518a1cebeabd0e27dca44daf7ad9dfcf4d8de280bda89204d01f14e37f27a0021b65130f11ba4d35e7cda86a66633d07ae41a9e";
+  sha512.doc = "a3c56deaa4726b6fad1cc94313b4a1f869eb8953726bc3c0bfdd92c2edb81c526562b4ad69ed519db974f8fea59d6947f16d182aaa8ec95143665c1bc92d7cb4";
+  sha512.source = "b895d6861c19fd86b9dabe9cc3ad53768dc18826f2144938d27498fa5483d4bcfb80b8b63d5213106e4c3871f65c1b683dd637d976fe56d7fd623528b52d1356";
   hasRunfiles = true;
 };
 "concmath-fonts" = {
   stripPrefix = 0;
-  sha512.run = "7bf31db5c6be83c68a5a52ff3f919b79597316f1fd40cd74eaf0b49c88a1f7c4d102f45f992f40af4d3806717a1fdcbe169bd8fa8ae001dff60321d1e9f33306";
-  sha512.doc = "2f68b05c4265d9ca7816761b8ed15d6cbd18d707d10ba15c36ba0db9d41439ec612b569289b7b2d68086cedb55fc43e98a1ad1aac1ea473ad175d0b58928c170";
+  sha512.run = "bb588056335d28dd9e98aa9ea52ca8a86f019925695ddcc1ec741229444a13edb5e21d11428218058af4d609762b83eebef8ec2f00832e4a07a7635f59c7d96a";
+  sha512.doc = "86eb3cb6035b233e1363dd301aafe5dbaa619bbe92a848f3a00f2aae973c921e650b5d2f425a34e322f524c3fe29c228017e5e7ca77fa5270fc9db5769484f35";
   hasRunfiles = true;
 };
 "concprog" = {
   stripPrefix = 0;
-  sha512.run = "4c2e2e917c94e023f76e1c378103d0ee6050a6334f0df134d6ce1923370ad28627783e4bf3b129186d9b73915c6009bbe7c5e8d9cc0c832ea9f4f3d15c26b7d9";
-  sha512.doc = "1b302f5b15e31a04570c86aea94088b6661718420723a2046a2f974412bb90fe2735fbef1ae215975a064779cfeb2ad8e57c464b8213d29b4bbb9c66e69efe31";
+  sha512.run = "77a23c872dac366de52c3466e7c9bb2d1c50854a63f5ac44a2bc878b6cb81f14743547140b535fd797060e1baedd61f14bd298025ac6f1198777b62a938d1142";
+  sha512.doc = "8354e96a7e3042d6068c5ed9a58396ea60fad48b3ea0212a8e288263bf40ee18e1d0d72f63b03ec1653f200e62b4caf4efd05cce00164d8283bf48916a9c3597";
   hasRunfiles = true;
 };
 "concrete" = {
   stripPrefix = 0;
-  sha512.run = "dd85441255e99b35dd38f8e24eb609b307e549bb2f312109d6233a82f28921d6b462596c23f9756b8c4b3d4818fba80343222fad62f5a7135c8eaa25ccdb10ef";
-  sha512.doc = "078d5462700b47076f67531a2d9d804e5a5e3a26bfebd0751e1bf10bed3bb0049ff0bf8ed8a4bd6aa67ed8aa964d68898e2d31c71ce84ebc930ef261b9ed73fd";
+  sha512.run = "fd799eae8a3c15ac07f4538a146ab0f8fa0971e660cc12c9826b4816729f161530697a33df753d916dbc67a66bacc99a8cb7041c0523a74a2c972d98d9fe9c6d";
+  sha512.doc = "a11a84161e8dda4a9f9a9d318578473de9784811d3d4f5d15466fef8249e2f2cf66445e03e4dde1f947307f18439aa8f8efa8fb37ba486ccd1878afeb2a1c9d9";
   hasRunfiles = true;
 };
 "confproc" = {
   stripPrefix = 0;
-  sha512.run = "e7a75632ee25512f73a1a3052e0f60b1eb8bf66e7a9373c0f025b0cebc2799e6e15a0bbae829630856aaf7e614300fbc80f2ce3a91042d95433b8ae830bf10fc";
-  sha512.doc = "6cd0b937c10da37741869c3b55912b01856165c56fba271c35224a939791c633a1c51d625e13ad06d91a949ab5b819fad397ec96b22560f4248d5e8b9da477d5";
-  sha512.source = "f8bb1fc787ea1cf7ed45acd2144bf68d5d094f5e7767c177650e81d241a2f588da2a906e247c0f7258f7beb6d68d90751c0fc96352cf1de77fcff5ed6ac86e5a";
+  sha512.run = "ceca3e99e7ba490b0da0368da6239e8c523d11863ec3f27d1ee60a864bdd5e58be776a2a2ada7b03bdbd1c2228e154ef9c58e2271b5cbe2216b61b42fcf31cb0";
+  sha512.doc = "e7f89fcf58d9c56ba5410eced55bb54b347780e5147786b6edc9260fbf7bb545dca6819d58d7842331351a1ea2146308808e8edfa9dbe26b728f896c90f83905";
+  sha512.source = "21cd8c2c57fcc31f457af44061779e12b039ec318af84c41d4b3ed015fddba6f50b854ff65d252910a7a3f3da530e6608634d22942eee7c7baaf665c68e5cd28";
   hasRunfiles = true;
   version = "0.8";
 };
 "constants" = {
   stripPrefix = 0;
-  sha512.run = "1acb7c5ed564185173b624ee440acd3deb700af63a11a545a51b36f63e843bcfba02299bee90dacbe34dc9d904df4179fadc9f8363244e707527ae637299046d";
-  sha512.doc = "453560b15506a41ceda01ec1395c6639941499c3b4f782c65933db9c148723e9af5c1da9db39d21f705b85f4b0a233a4f094a93b51b3d531d68ab45c738fe573";
-  sha512.source = "8423ba195cfdf7f785571c382c37c1351d93e71e312743864dcefeee6ffee5bb6015f8c12bca608e47b639becb873f9189dd8486a757aeda8a2faeed9bfa889d";
+  sha512.run = "c3e3ae974619d9d231d6404138825fad149fa431dec1650546306359fae83705e21d4418275a4c77d7758e431b8285a385d98e07bed2bdd1649d0a49dc78b49e";
+  sha512.doc = "964fad868080b9850e2c8f6ca040a3f3e6f6bf68d7db34e474052ef2643743111bb73f7a123f1d9d2b9eb0ae0e633fbc0b72199477afbc498a2405cea200fa0a";
+  sha512.source = "f0c3e7783ab2891e717db6fe9a617b1d19ccafc568e3af0f8e2ed3dd417df56459e6109de04ace6a214618c01611ecb58cfebdb635b0d79731b2affb76aa69b8";
   hasRunfiles = true;
   version = "1.0";
 };
 "conteq" = {
   stripPrefix = 0;
-  sha512.run = "a218500cbd0afde1db773126a72a4a0342b8cfa0e9f37a5cbdf65b9671ea3138b4048aa5ffd0e066a99346cb37c6ae44f8f82da646e8078d60004e401e40dab2";
-  sha512.doc = "da12642e504ff8a80308c8902d0ecd881ec5ac849c459d2b46e7de3cdcfbc6e52b6638dd4a5533b6524826e06c082e6ad72c36f2bcca43527eb73f7442f1b611";
-  sha512.source = "ec90a564423ce6b4ec66608a72c58943822935e3e2afa4b4878d202df68d1f011ba3b5a42359ec2296a00b79dc35a6813025a615446951d7fa80e990c64b0346";
+  sha512.run = "891a8b1b78f6656dc2032dddd4b67841a512bab4d71f6d64ee5ce1949802fd7a47d42d5369a60f7e46ad77b32ee3b72f6f7febc3aae89195f03e553b58ba178f";
+  sha512.doc = "288ec6477109351ae6d987bd5c720a5cbf40ee2ed9e7a1dd254ede630110561af5e28f7a2410e842922a38eda5ca3b04f81d4203a517370cc78f7617c7f1466f";
+  sha512.source = "95f7bb07cbf6c8c16e4c8c398ceec9098f87ee17d4535b174e06d375467406aaad5bd915134c903097148597946c7606d347465f5dc2fe7a4b9f94708d0b563a";
   hasRunfiles = true;
   version = "0.1.1";
 };
@@ -8176,546 +8401,557 @@ tl: { # no indentation
   deps."stmaryrd" = tl."stmaryrd";
   deps."mptopdf" = tl."mptopdf";
   deps."context" = tl."context";
-  sha512.run = "5340a77b70e4ca6eb297032a56c5ea86d062890d8595389d6b34d15edd64eb57c0362b048ed6060205ef8960efa8b34052617cb3642056d0a5e221875866a35a";
-  sha512.doc = "dc6e3911371cedd02d3ce3177ad8a83f01335bc994ee2aa537a5de428fbb460eadd3a8fd9fa557842d77ebffc96bc60f215a612fe90bde4088d681fc7be92265";
+  sha512.run = "f6f9af2e71fe1d048223c5c652dea12f5ed0677cb7886c2ead3a9ea6a492d3adcfa5ac3f5837204396b1148aa06471829941c437e621d316de47c81f14c49e37";
+  sha512.doc = "1b73f54ec780dcc8ec80182df1a19d4047406a30c65deaea864daa4bd0307b1a0ba2b496fcbe1fd455b7b79c761e9543ec4b9a1d1898354a6570a700ebc5a043";
   hasRunfiles = true;
 };
 "context-account" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "6507710625fbca78e73a9af8215cce63dfb55354faac92e4aa829ada12739e6c6e7e7562e5fbd8d9813f06a105e16e8d1d983820fc8a4a22dd23ea3138bb6d04";
-  sha512.doc = "dea2192c3865d19c2ab4fcdd6a7b6b96e488352f4b76e2fba4fc473a2a9977c8821b18d66c7d90c38f74dfc8bd85f38646446284f0a2727124efc2b2dab8c1e5";
+  sha512.run = "6be85da4c189496a01c1abf1e3525caa16b8941c1f22a75cfa65543526dc8fa1364cd54a354c509a9d2ddd436f199683e00f92a6eb3376fd45ee9e6a33d23bbf";
+  sha512.doc = "46aa593aff0e2ebd5e983b9808e869ed4fe68611d3574df8ade9d241887e3d07ff16da54705eb21dd9981c2ac5f9d5b6f6c190b59c61ca4d14585148f5ecf165";
   hasRunfiles = true;
 };
 "context-algorithmic" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "945c6af136d575aaf69b8039803b69edcb131dbd8c6c5e89eeae8ad90b6706c1055d53901062b541303c23ed3294aa2c6519f05822f565041ecb7c1d55ea3baf";
+  sha512.run = "46109bc6f1219a6ea1010d1715d7584490d91e3b02fc8e0d926cd289762e008b4ba719f96c64eab813d30f4e92de2c965c974599a7d00ce60c0523d770e8d7ad";
+  sha512.doc = "14ea7273dbff12c4717ae785c24684c8dbdc02f0393a0f6c564f7c4801e5c914f01f0d6f15e710f86f180c666c186bdffd21489142e6316d7f0d102ea12979c7";
   hasRunfiles = true;
 };
 "context-animation" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "f887bc3c2805aaaa35154512cc14b95e5acc5c6ffc63e670a09a3ec623e744c5e266ab9e63cf29ee5dadc432dfc335187fd982a6a605f55bf864fed738ef3176";
-  sha512.doc = "31e03847cca4ad5b3aa78914eb7c3443e74650e047073ee04738317d6a86b277747501b0503c6b8ad1cd8cc4e3c459da13b3c3b925b08232e6f32cc66a4d575b";
+  sha512.run = "6109fdc6a302561c55d192ac89b8f71dc8f55365385c1c93df73c9fd6ad59e3eb015352a53f9bb071e4bd2b7ebf701cdad86c4fd3adc53f0efbffa56a2527b71";
+  sha512.doc = "fb355b7c436cc6c0b0f1d718a6d228b7124ad8916f9f03112dfcbd0fea4b223e7c650a69e63870ec4dd54a7053207c4e1bff0452f44df7bd96a8104e8cba906c";
   hasRunfiles = true;
 };
 "context-annotation" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "fccd9c7d2d015a7f60d3f2989e1bb1ab7e435e23df2085f1522d6599507e1f2b304ed2af6b08cedaeeb8c4da9bfab80968710111798af8610619c6f9b39fb66c";
-  sha512.doc = "33d6d89a8fea162513741f234276af6b1039cb8158848dc4487d2e5078ca30de661a626ab490bd94d457f831d47824d8ffa0db81762e01fe48c9e06886045fcd";
+  sha512.run = "653c0adb351f4e455b03e11dad0439a3c6d4d2b22bfb9044535a033f40df2b4e0fdf5e4f7fb3bd9cc327e6a66f8d19a764fbb8aa7f54ac0ceb4dce009add1d45";
+  sha512.doc = "71e8ad76aa78b0730b9a22ab41a66780db09573711b6532e16ad29073178b9afb93cb2ef9fc3af9f5f015af392be2222780a11c49a1bd6011edd4b3fcaad953c";
   hasRunfiles = true;
+  version = "2013.05.27";
 };
 "context-bnf" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "4809cb91f2e25837d2e35ab113f6fd737824f1ab821aa837d3295714ee5796ee4fd617e6dea3bb3e0bc647f46943ffaa526b190786b78424a387c724cf46a47b";
-  sha512.doc = "2464f6e9ca9e72f2c4bd3984fb746d0052e5b1ab4c48348417e35969665a7edae4f924fda5dc7463453064cf032ad39fe9769fb6b9098499ca4d7355d7f0600c";
+  sha512.run = "dbdcf7575b7e344cbcb91e38912c410dc0ce37a09479592c06045562e372ebd853f59e374d0401d5026a1963b9206ce3c6c91f8920eb5c473ffb2f87b3f4e9cc";
+  sha512.doc = "0e512a3aad33fe9c00420c01262f62637aa3d7da6f673e1104a7c1836a492fa419e7684c85e288144b8277e7d30b73e4b836da051b28a130023e1e414bef39b8";
   hasRunfiles = true;
 };
 "context-chromato" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "5dbbec01123469bfb51b718ab52d83c742e8baba2d247871a06eb2cfb992ff24a20c5fe521ed814cf9ac92b7b70e9d7a18b6c2545cb563119a152b36ae5c4bed";
-  sha512.doc = "1ed94f5cf29bcd831904b2ed51d9de73cc6d2c564037d639440a45b2be5adc498481055d2ed2ed6e00df2efdad23ca46ed534afe000ccb0ac0ca4499afbd4ed0";
+  sha512.run = "6021aebd5c19cbc0a1bca3c3e61197259a75f0deb2012bbdb72536a58dc6d6e5bcd62b6b0a86914c95f3e982d58f6effc723ce3a30bb16adec5bcad019d90205";
+  sha512.doc = "c9ec185b781b0dfd30d0c6fa4935824a76f64cf64008403d349c96fd3c06fb7bddcd5b0523a5d5fc4d1ce9898905ccecf32dff18af2c5a73d4dda5a48de3aacc";
   hasRunfiles = true;
 };
 "context-cmscbf" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "74f1f586003ac37f5bad221dea912fa24bfac2d3c43c819d67412973d2a6ed71d940c8b2885f47b570e3982780c64a4a8f6ee4a09686710b9db820923664f122";
-  sha512.doc = "f107c6f3b5bef7b90bd0483449ad484050e6ba4673c1ddaf52c26dda9c7e67fda2698304159c0e31d884a02c43638bb44d69695d55d6f3538a912d509033b698";
+  sha512.run = "ce3c14c67754ffd2d644375286cd0cfe5cdf4f14397bd9ceabbf1e8b37bd8bf4b67b3686f0c42984298e5415472be84f7b68877bc213947bfb7ba676df014d86";
+  sha512.doc = "cb92d415876d6add2c357d0f2c737aedda6ef2d760a161a26d871939eff025eaa7143c182268e2573bbc0a644f7fe42a76f5406c88af1b6d45fcdb5cc558d5d3";
   hasRunfiles = true;
 };
 "context-cmttbf" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "df1b1522c1e490731f43312646c65c54bcb8d8af835c5aada5d40d92958a0f2f8211dcaf0f5a7966175e8a5af5ee3993ec2708ca2bbe13f97fcccae6c4be87f0";
-  sha512.doc = "8a3554878f751fe42de25dc692462778a581709a672b330ed2bd4117b4870df9abd2087d0c5753165c98fde6cff79b8f73dd74c1a4dd5ae2bb2535765b6ae9b8";
+  sha512.run = "e0ff7e8266977c7c560a491b966b695fa4db87d690ee5a572e472be8ccb56f8697089a5f5f63f2552136783deaaa067afc560caf933ea7cf760dc992e9b1b506";
+  sha512.doc = "2028462e737a2d3dc5e04e4eb2e4eb8da8dd3b23b8b5ec7182690b7c493daa4c439ba5948dce22c69b294cca85d28cc59d4434bbe73bc6800162942799154121";
   hasRunfiles = true;
 };
 "context-construction-plan" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "1c6da940230bed49cfcb689c8dba917fe5530d5350c1dbd06b967822ea49263adb9904ed822868f6c1f5871ea454a715604337623af5bd964d89faf9b2ec3e8a";
-  sha512.doc = "dbb0bb726fefdd31c87cc19aeb4923898686fe248d6b493cae406944db0cd0655464aaf2faa45b780134d0031be368cd3aea617bb9ad9a78579c7802016d9aec";
+  sha512.run = "2387cf5349e3456df61dd6817a5876d987446651b3f0ffe3ea38c695db5672ee57f86eb42e53ace12496161a5b4ae1137e348dfbf7cc53a789e04b44f9ee2566";
+  sha512.doc = "ce63c143e5d5a9c7a47d7a336a82016c736af55862a62c5aa46d52bea69a3f5c9b5e37530c5bacc5047afe41d69684e17215436700ed734d14d6de80bc08d9fa";
   hasRunfiles = true;
 };
 "context-cyrillicnumbers" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "fe4eea528eeef842ecfe73ac2744e3489601f637f4268fb908a5d452d895d06a55c7f9f23c8132aaed79150960dd49f53c4e86e8483dadaae03d9017d52427e9";
-  sha512.doc = "f92a8b31d5f4945cdf9c2bcacc4780a15097ac34cb01b153aabd8ca6db09250f861b3c62c5ef9fa67266bd6e791fa36a34c0576362d0fb576fb46b33a12b2a33";
+  sha512.run = "4f1b1eeeb6025122381336087f446fb494a817c43835f7afbb91f6deaf4239e7ffda314047ae87d6a6a70bfb8421031509392560407c9274507e5a74ed089513";
+  sha512.doc = "7c9ecf570bea115f9da4a867fa1a100db3f5d5be84e67064315a759b97546d41a452411f2f12d05a94d6e12280f54610fe3f64e5992def6699b19c86e5118229";
   hasRunfiles = true;
 };
 "context-degrade" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "96827085ea4c982cfbad49599770812b7a8ac1b1b28e4103ec76b92a8f2a511287a2b655553c6c02c851790d4df0d1cf57e9ac00ca586f6de195251d03565be2";
-  sha512.doc = "184d88889b4af40ca413d3520293c0ed8ad0615c4c844ca48ecda47a2deece1c26926df19d14e0f0f22da1f727da6d9ea7cc7e0156d1836c66366f3f7cebe25f";
+  sha512.run = "274113ea50a43fe02f9b8c51ec49c185d42d94beab37c9462a1e3c34770f14b1d6f154886057b6f8121526c11ac36ea2debd19df2b3d566837e4a2d081b7c31b";
+  sha512.doc = "30b63eb0c342cd477bbce2d234698d420fad28979838fb8cffcf812752714a62d9bd9a03a6ec325ffe2f16d759efbc5d49144e3955bacdeddf0ae478791a49ed";
   hasRunfiles = true;
 };
 "context-fancybreak" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "b4ffa03d346d3dff1c3e87a904c29c994d9bd1a8439624d60d1cac02fa9cfe96d4aadd623e4bb416c9ab42ea201170f9467ad527643261f985529ed2d395a75e";
-  sha512.doc = "bc227251c72895b1784114fcb2334c21f31c55eaf17b7584e6b7ba88526dc4887f57e6b66e2c6eefdf6fca4e788a5d5c5109c530822962681f57bfc9c7bde921";
+  sha512.run = "2453e152e2b3aa99ffa56f972ae40a166497b5c0856036fbdd0784a05c06efea8cc019b0f812a29d2899ffbdf51442a8ad3109c5b3d0a0db66d2ee6b7d402724";
+  sha512.doc = "e0497f9fa9bf998433a74ee82d19b6d758cac18e00855e912728236291bbc66dab770372f1395de8f404372f02c13bf8ee0bdefa45774a74eed83791b570aee0";
   hasRunfiles = true;
 };
 "context-filter" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "f36dec2e7e82b7374adbd64a50bf1023420ea78aae4c69595132c0fecafab279a91f736bc6076d91decae010e0d81d5d9ba3fc1c8ca5150a46044e9fc010626f";
-  sha512.doc = "0a254d47acacb5af9766c800c188cdfb5beddc2e70c2f0cfaaae0f530a59b9a36fac91bb3993cab9a87ed0fce91f726db224596bcc848c76c278da4ba8f1eadc";
+  sha512.run = "3e9f249dcda534a42eeaecbd4d83aae63dd598c117ad83713b3c2728b2f2184cffc33af264b70ef7e2993a9f8827132d60600bbc277cb271d4ef02631eadf586";
+  sha512.doc = "7ef047381612b397507e9b12c96f242570ec974c4e48ed18f61ba68070edda02f1ff99e110d8d16ced58bc6476cb88adbb8b3c37e6ac2fd4b07fdf5a55aba9b1";
   hasRunfiles = true;
 };
 "context-french" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "29d21a3fdac19e7f16fb262f3154bdd7546b7c6bc1a95e52eb69a72082a937b4fae2da7159b8165f901a166a2055e656754e4ad6408d665e9f96089114d5635e";
-  sha512.doc = "b7c44b6643c5f882599335b854728071313762ddafca5a672f179dd72e1dd362cea700775ac349dfac6eeef676d6782d82cbfa84070c1ae05ffaf6a0a80aef7c";
+  sha512.run = "6e8f14e3d9e0e179d2733c4bbe5386932a9ef39c7ed7fcb99908f043410531a0cb28217f11b005d6f9aad821c08f1ee4df6bc67317365ab7ab6c62fc1f0718e6";
+  sha512.doc = "5ddbfade3b054d44b5486f2407f5694e3a16b86be3601b14ced488954dbe33bf1d94d7b4712bb63a7d55155435e4f9be6ed818ca2c367be912d11f8751e627f4";
   hasRunfiles = true;
 };
 "context-fullpage" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "8b615517c9378357242d4efc51f96d06b05a627c33a026e059bae5292e42a72918e7573df9cbfee6bdfa07c6bac9862fe31d08d422d332394046a6577fae4c6d";
-  sha512.doc = "6a91b1aff38848fa05f153c853d5a1b8f4661647cc357f9817f52cf133975654be4729d70d8a50eef738daa5f95c1e1785b02cc5f8320be4ab37326fc9caec81";
+  sha512.run = "119c01690b881165b8c7c3e4928210e6c3dcf071b9c7d2e452656e232ca64df84d90b95c5649953045728fd65cea40545cb1877a1d04000ff111275eb6364d85";
+  sha512.doc = "c9f91af38d711cce9512d6c5d77644afcfc7208af4f9ae8e708d388e58e1529095b185667eafd6167ef62b4b31e3fdda2014fb32075db8d87886f37fdcf5d43b";
   hasRunfiles = true;
 };
 "context-gantt" = {
   stripPrefix = 0;
   deps."context" = tl."context";
   deps."hatching" = tl."hatching";
-  sha512.run = "683a0562aecc8e77a6233f3c0de8d559cc0adf66e9a674c0d79c99f6e0947da82e063c70c67640f636937f98f0b3f6d45a62cb70c6c788b59ac8351e3b63c738";
-  sha512.doc = "e9342869eca5404db8111ff8230031943b24fa56ffaf7caacff63f0f37d3718b4aa5a609b5dd362a8f63cd0379c54d947b946cf557155b4a25abeef4ab1b57ed";
+  sha512.run = "636470d76dd7bfddd3097483a510374bc69b5bbd7e5511699daffa0907746240e072a103d0f8e1426750767e48b6c3c975364cdb708a6dc980e422cbca05399e";
+  sha512.doc = "840074b5efce390401c607ccddabd279b494be32452f5b655ef98897ec52759e7f2a93fc456d5d872dc1faecf7fdb846ec2064f60b52a2d183a738f1cd16664c";
   hasRunfiles = true;
 };
 "context-gnuplot" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "fdd252f200546fbf69e46ec3c2a89eced2306720a7a5e2ba5af92275a501977e03703f222689bc578fc08402bc1498ae957b94c404792e5fbf387bed706dc488";
-  sha512.doc = "5103bb170cdc9cb250afbb936795e23cd9e491e2835a95e029ef552c2495ebe8890cc2f62da7c230d7e9606225d90757ae8ad3a66e44c5f0e95acd5f9f35af93";
+  sha512.run = "43aedb560660a834874488c07d8fe4a2332d50613f3eafa5caf2ae23234bffc7a2c332cfd4423d18aedf1b240aa19ca1cdc588c08a9805107d8f32c9ca0739d7";
+  sha512.doc = "6846c299a7989c198bf8024fd97952da2aedd8312147d148b0b1b08da81e62854e4d2088cebe4b4955c355aceaf0c2c61cc4292110c8d338f0a62f0593e4300f";
   hasRunfiles = true;
 };
 "context-handlecsv" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "256e91419cf7accbb3b760fc4ca1aae9893b83c43708a7da9cce59bfd9ca782a7ad293662c6bbc4ddde1ad5c721b5607c4fd456600e2a983d9b57530991eb5c6";
-  sha512.doc = "660c315fe3738f7a821487e2f5b77e8b86acd99b2d25610d1ade980450d0f01e0314c67324c3c9ea04e44ab1e88f8b944f047278c27e5220e1119282dd4ff793";
+  sha512.run = "d0f4e2512cb0a4eb5c9b7886904ca658a10b7c17051728c0700a00ed6696d0eb9c1af1a295a71ee7ed3ed57caf62ee8b3f7a956f4f969d8cafce5b08b5b72a00";
+  sha512.doc = "7d31ea48abc1bcc79dbb3549d723d04037e877907b3848f51ddf34b01d9fb807436668fe3942f371bf1ec988d5c75fe10aac72c7684a2f365d03bc3cb1aadb96";
   hasRunfiles = true;
+  version = "2018.02.14";
 };
 "context-inifile" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "2bd24192276d90b3a639200372543552c87f1303a1ed2a76f4254cfd10f7f64a7fb8455e86c899f1ccad37d729acca52b34312f70ad066c5973c5139d5d2eb94";
-  sha512.doc = "3d5a160afbe588ee8964ce91f4448aa0a193c9b42e165b9a03fed0d3b31f81f370832b16cb68ac3032e0ba32097ad3206284c8e4ab5d454c89b34dec80179430";
+  sha512.run = "f7a267f2f84a3407aebc73ba7913315f9e96ac431edbc99f6fea5e797cc9bacf04a4d9f5991e74924cfacec604d381976a89d090b113d2b3cf17cb6a6f727d6c";
+  sha512.doc = "113c6a6c5ac51750e007a2df09c2024f8d2090f82aabd43050ccc4f48265d0a6eb81b14ee433ed8543e5861c63ca074a9b6849a68794f8317db7c30723a4fbf3";
   hasRunfiles = true;
 };
 "context-layout" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "53d2ae89c7bc9741689ee39a332fade54d7f520b16ec3df3d93604c46c79b1533e4a2df91a313f1fb5f38e696dfd74d3572de12835e591e530c51166a6be3f09";
-  sha512.doc = "5311c221cfefa623e0e0f9b32f5ce2451368d117cfd798c93072c3fa1949fb414b1db0fcbb05c5a90958ae84b8f0fe327bd30264190ef7002986661387a9675d";
+  sha512.run = "b1313e3f6f748273d035b86f7d00cf05b70c8f9b6b411e0651d7f14cc78d8b1eabe31ca2ade6cd7f30d988ea4be4c22d00f9e0aa145a195d76eb8b742e52db27";
+  sha512.doc = "ff6ccec4f3c8086330305de882c5a438befe4240e1e524a99a05321e634de472640ae45e6f7e8266f4b88fed6c727fb3884fceac3d7b3f090a109ba0ba875e84";
   hasRunfiles = true;
 };
 "context-letter" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "f0853e350bd66e2205dd30d4b6b1c80465b4e40ca62cb3e31b34aa76eefcf97380f3222d9f44af08a24ed69f910a50d2002ea75ba63dc2de64cd331658ea7e83";
-  sha512.doc = "e0f69ae01780897bf2d6d6f1a9380b5c2ab6bc3ce60780a0b33f1fc2a5a3f13351907d219ba6634a7e129ee13e724fc99bbbcf2f659e379c8a042bad6afcaeb2";
+  sha512.run = "f6023b3e4558c0985a3f49e4489d7476fc7a9a0995200f2f39ff7f4ed2abb9135f960f8160e36af356357bae902e6ae28cf839879384d8e91765fce659893f39";
+  sha512.doc = "e48bc3616f2112f2b65b3f5a26082a48bce0534618a305b29785357655df315fcd6d1cf77519daad21473637179b354aab2f1f6512235f3c6905f33a472fbe09";
   hasRunfiles = true;
 };
 "context-lettrine" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "47b1c43e26ac59f1c4944dfb71c6ce623d4725824550bed80ddaa6b85148268b4dae5c4a519882ed2669dd8279d2e17655d2289daee287a4f9f59cf76ebf084f";
-  sha512.doc = "de03c6d769210e09d45f9db75fea7b18be532ce2979c4faec7085891589e95877b3d4655a3527b75425f5393842f00d1c05c1a9276e41ef1eee2291430db6089";
+  sha512.run = "2ce8f8f99342d292a2e1fea209c63337c4ed8443abd266bbe7d15cbb884f46dc90fb1cd00592003a01f96fc9ed5c700b5f8013dede98709da66e16159bfa3067";
+  sha512.doc = "52efa1cd862cdeab24d764ed0499021adeec724405ab1ef83789f1aaaa7d43bfe13de61f54cba163eeb1af1ab150fec86d2f63ab0495cf629f71dda9a1661620";
   hasRunfiles = true;
 };
 "context-mathsets" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "992a5d4faa623ba92c57508e0d119211b3d24fef2518b7950205bbd983d4aeaaedc9b6127ddc60d4d489bf6442aa26e28aacaaf391c97e45b782919887940533";
-  sha512.doc = "7c5bc6e76c2baa782afe64c873c86c4b53b93b400d5ec3f6db149d5dbf4b416806f73fbe6663678428435117416bc2e6ccc0bb7022cf054ec3637aeccb090206";
+  sha512.run = "e2916d7da6bf5e59ca285a6421da87418a55a438e29307dd58b7baadf7957715200c8345bd05f8684cf49aa89ad7d4bfbf3903f1ad5479283300db0b1511591d";
+  sha512.doc = "d698d0ecb3f65ad68fa66bb19394d52a30a2c564f2dcdfdd03354c4c4abee34705e46c6b68c26b3015a143e96e38f2dd6ef17dcf42e7acb890dee359f49406fe";
   hasRunfiles = true;
 };
 "context-notes-zh-cn" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "d20fed8ed282df793caffcc27f7416661c993f62a3f499062cbd03a5bb94f75076c0cd69f4d1c94c03f8bb3943b545a34ec9abce5f339274d6e6f6035204074d";
-  sha512.doc = "945bb550abf4834311e38eb81f0200753fcba6c6c049f4f26d5cf142222bebba8a3e60c3e2de1cf28fa3d6ffe519b483ca42418d791349da0239bab49404570d";
+  sha512.run = "6d321dcf07b95659734ebdfbcfbb195d75b7c53c4a7e02306501998e884a975e4f506360cf1c21a71bc96c1d67141aad04b8de7591a3c01348dd1d57fb163a12";
+  sha512.doc = "89abcfaac2b6742fa8dfd0fa309b57b90a66172e47563a181e1f721e7354795cdf596e7c0d64971e57b94c7053d5a320731a349a15b8be9e73ca745b8fe1962b";
 };
 "context-rst" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "358ee6dbe7753c089f61263777f3ea9f5dcc92aee2fe0a4b7d6f030c079646c7d2b17103cfe3b08905d4e062e8692403d3ff06c605305ace458e7a335f1963fa";
-  sha512.doc = "0ac19b208bec19210ba25e0ff2489c924d6d6ec9475156a88184d110b3dfde833604c1589350a2a8358a08253fe091d014735d9a2c1821f54eb2b0a3f49f376f";
+  sha512.run = "be0153e9b65a52a953e8cf48d08513defff40b820fc11ddfaa162820969d7287f22d3eda417a1cc7f3507aabaf3d407dfe69fff4798b8e9b53eabfdba3d1e231";
+  sha512.doc = "1ef3289c29964d658a6621bfecbf4e88e63fb4cddc461d72571dd016993322e16095905cdacf419160d1924999fcf4593e5981df15d0ba5e5597439bc623fff6";
   hasRunfiles = true;
   version = "0.6c";
 };
 "context-ruby" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "9e43ca854fe639c791d8b19586853f7f35bcea769c3467b73088f28acec193a8329ccc296c474434d0cca1e9c7e415e47029ed96e1a060020d610a3b31897c8a";
-  sha512.doc = "98b5b93e635a5af95ad8028a2bd4159d04432f2271196c8bb1caf754605c1e1c661dc4521801713f696fc619caff8f3091b6cdaadb76ff46b4ca24ea8410b1c9";
+  sha512.run = "99940c243b67afccfb6085c7b06d898616c1f6df3051c9b08748cb78b614e2e557d729f222b3ef52323eb5bb340d1926bc44b2282b502454ad841d2b9b591f06";
+  sha512.doc = "8b2fdfe02dec6df10f66d7a062a46a9407c0b110f999f65736c36ec340aa39205627df98c0f29b71024d3650cc2b4a374f64e53bb669e7b64f9bdfad3688ed4a";
   hasRunfiles = true;
 };
 "context-simplefonts" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "032bf0e18b3dbc4fe1bc5c47ce6b9db6ca834b392f8b9504a38e871963469b85c56e0b578b643292b910caafca39d19c55834aab86348ab4276bee82791bc4cd";
-  sha512.doc = "9a9b3149ed0b7e60ac8029ee2007f7603e7542f8b420c0c3c2c1adba6896aaeb95c94874c0b43f31eb5b0c63fc7f9ee48e35c66586a55f5a787a53fa2ca86c3c";
+  sha512.run = "6a151edd1209c8f39c67215f839d74d87be1540162702d5ff230581a8bec5b3cad2c37ec090c0e1c9e842005402112ad920385c8565c8721e7f54327c1689627";
+  sha512.doc = "2dbba6d9e6b142aabd19d8ebdcb02b372cf7872bb8cceee03d672735f431721a362a51cd3d13cbedfa61bb90294ef4908d4706b9727ceb5e36a2beeefb54576a";
   hasRunfiles = true;
 };
 "context-simpleslides" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "e692ca5a52ab7ca69f317718b6e53c11664dfb64ff587fc585ccc1b0dd8ec8497c8b1156ebf372ab2fb88f664071e682b4a99b9f2e443de45016b9f4e603e201";
-  sha512.doc = "5c57c461bb5a24743d573efa66e7f6673ae50d6dfab6d3c8974dec1335ce309910852683e970c5f75ceefecf759db062173c8428bd23592caf73d338a8155757";
+  sha512.run = "a7ad045d3d39ba2f58d31e3591aa97e943a44ea30da26cc0f9673cd62aed9891540f75fefb976b41af331dee156d4a8f68e540d4c264352732688ee6f6dcdd20";
+  sha512.doc = "3e5710dba2f88e83ddc4013a0d84e63d6790a23848dd9acda0f713c6d550d4bc17650de0193a04c71d00cddfbba737effbe5493677e10fc7071b7c56a3d7871e";
   hasRunfiles = true;
 };
 "context-title" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "317893535528db4c4e45374b2503384473d71671c085bb9fe2f5ae50d43b9914adb0aab6bbc7a61a7bce9f7052ed455554a22fe9a6f27be4a8c1ab99b5eeed25";
-  sha512.doc = "cd02b2bad2a9f507807638902808372f4b38073c0ac323f335138d585215cb616a7b763baaf064b543abca55c2f538caef0ecc1b09f18633daae69cb67239ba4";
+  sha512.run = "6ddaed20bccab2cb06d27c485c3974a43ce9d5f18848a23c9405892b5f8ba7628896fb10dd15faaeae78ef36a90d7c4202c5fdb83eec53953d2b3aaa1f9fbf20";
+  sha512.doc = "d0b2e09c6134b073a9509c5b9e6ea78085600678ff66a0c82af70513ef8e997500d9cdaf8c36486ecad675f04d8ab7e888b14d2eadd22da9dbbbd11291d342a0";
   hasRunfiles = true;
   version = "2012.04.11";
 };
 "context-transliterator" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "7b5e57ffe638397e30dd9f5b193a0c0688b620917ed2c95cb76a37678e3c5f5cb42912194069f36b8e34af7eceaa3a4f114573f062d1babe593cca5e5b4be54f";
-  sha512.doc = "7e3eb0f57c259618e234891548c5b8dfa1c79b59b55cdfbea189c3721857e8738264cddca8fc8c4f6032ebe5489f72fcb4c96be88aab6e9a8bc47d56584082c1";
+  sha512.run = "ad1bfc57346c01907d96a8b2a56af061eaaecbfda418fbc19d5da8daa9ca3c2ee7a277eee76adb70270b88c2e6b964df79fd7462e4eb44f7a987715028f099d5";
+  sha512.doc = "c379ab41c05bd3bb8b74e5aa0ee715f1de5650e25661942c7c6b198e7b56cfd32ef18fc543cad670187b0193ab5248d4e92b0b0dccbe8c50e48ed8a88def323c";
   hasRunfiles = true;
 };
 "context-typearea" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "5dae20a467b53d6e828f6f5653ec595f9beb30e9be8ed720916d363bf324ee48e5cc5a7dd88e0760774811bcca578620e94cb7e4910944f4db036e14af5f07ee";
-  sha512.doc = "c93bcd2556e10c7a11172abed6f476c0c9ec9853b52df6e8f393b0394b4f2641b1ed25e629f29e479b1190f6881782f127a19d40b4d7905fadbcce600b02d550";
+  sha512.run = "125d837f31cf3f41ae6e6f7c561ece96f5a75492fd77109ec8d51d70202ec01a279c4d6240eff685d7c263d40dcec0636a7419b1a5d6a6095430dac0379a003c";
+  sha512.doc = "e49544aa6ff94b7ac2dd3f4064c85d9c375f03cbc8756df40bd68c4424f91224d2e58c8eafbc229ac7bbc02545ba8bf3dd53f31a9cfb9de45d692a266fb57241";
   hasRunfiles = true;
 };
 "context-typescripts" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "2975b9599f9c89411bf624dd719ae8ed9793ad7605832810b3163241aad0bdb3d975c92273184411ad67a6a433f0abe2ae685e42a111795774f26811daee6dff";
-  sha512.doc = "ef23c68a8d9c6f63c665b28b4d7c935981cacca5291ad7685036d1c1fc8ea39a7a2a8421c52f4c57c2e534edcce93be6e634576ddefeadd1799c782d28c624f9";
+  sha512.run = "c2b587c8c4fe62c86fef355ea8e1884fd76a1e828a7df51d971a0993410c9973568ef857bbadcd3eb4f0659b66b389528afd3c9aabba1c42c2cf0e743f586d6d";
+  sha512.doc = "69e59386e1c699c5d070fb2abe14b2f02b8b6ae68ba3885632fddc6415b93e9cfafc694d998b0992d5aadc6a858eb51b4cddca421e01e094a237edf0b1b3b2cf";
   hasRunfiles = true;
 };
 "context-vim" = {
   stripPrefix = 0;
   deps."context-filter" = tl."context-filter";
   deps."context" = tl."context";
-  sha512.run = "86ad7dbc51267952f45ca2ca3cad409c58b22747cea56cbe836cbe885d98f0b4842fcb58a308c91e3d8537ad2e99a3268bd77e76160012a6270af026f9018a96";
-  sha512.doc = "d73d369b0ac49164f1f8251de460a78e19c6cdcecec7c87e10fd814fb6d3df28353532b1a8e8b311ec40a6d8fd0ab8667b9e801070b8876cf24b3d9fe92fe6da";
+  sha512.run = "630cf92427d777d48b52be13a8418e1be0d6cefb21303f3af4b9dac3ae976d59a1aebb312e010b63149ee23865e991baccc4cc5f5fcd552b0c7fe966f51aa7b7";
+  sha512.doc = "982201a594aa45f1fe80c80479391bdd2775f83846824d30de0a27d608abe8c5840607c8ecf214b55c8df41378a2c174a45d2d11083712a9c53153538874affd";
   hasRunfiles = true;
 };
 "context-visualcounter" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "b999ce391586e6f6d1f576edb18564c68b612ca48180b7a45bb60990a62ba718fbff47a70592fdfe6ca703e4b1c140421248c2944026f42ed3d37fa0759a2899";
-  sha512.doc = "dbdb0705a9ea9bf4fca7ebf5be5de4095a6083bb51c795e276e25865f44fbe1ed7219a387b69419f2002b1988141b27fffc2f46fac301e2005b016d021f63c19";
-  sha512.source = "d7b287aa7cd589a0c568c41fecf895f30535e621a9f440b44c59b4bf53ef7d4b42f4b2c14e0ab2f039ea5f17c304502da1f4c512adf1c83dc2f907a26a45d041";
+  sha512.run = "da05db90c965e7937dfafe51e36dc034357bc5af891ed79149fce07ee90961127a2af46eb1c6dc10c387faa47236e0544dd90f34dd8d7dd7337753900d8698cf";
+  sha512.doc = "d2ad6d2bd6d3f35bff6a6799cc1781a2d09b38dda6c35866fb0ccec38abd6686cfffcc50c8f972a08d5d03fe0d68362d423c8672263d5baf22bf4692f4bd8dad";
+  sha512.source = "fb83b4dd0441b5819e6bcbd13809e3d8692c35a65f0f9091f15455bfeac1e3635b65b173b50c2678212d50056b93656fcd8ec2ac759d72399b9ed87066b636cd";
   hasRunfiles = true;
+  version = "2013.04.01";
 };
 "continue" = {
   stripPrefix = 0;
-  sha512.run = "bf666a4705bdf374f89d166fc76189f281f0423a7df564e4c3261e2e75d068f294c3c7ac79154264618930450ed8d55a21ecefd06e2ae5623c9a26efa0a9acba";
-  sha512.doc = "a08e5a7ccc3e12eec8167d2fcc3bae3710a30becbd6256ecfd5ef36e35da36ccb8255ee8524ccf8d1a9f90507427cf5a31d27454209e27ca34c2a0dca73434be";
-  sha512.source = "95ca8cf76cdd3549ef7969ad5534af59a6edc97da1309df19956e70317770ab05fb9fe52d9fe9024bb97a1aaae16003b734cf9dfb116f146a53db7d5e8ab980f";
+  sha512.run = "325dc8c3f60a09f8106f89bc26425ec409f9e4b2cf8e4a1c247176e56e8daae77d7c3deea2a56d690cae35df9f6ccb47967863a4c8bea576b7cc080741258cd7";
+  sha512.doc = "3ba5e9ae714d79aef323a2a02d3a2ac5c25064db0ac3e616e4d71141a8bc0c64df4cba478b324d665d9a018324c8d4cab61f65131a373e290ab2c039134caa2f";
+  sha512.source = "5d07a3704d7c77971723e43c4721a461e40af53fb6cdcc3ac70af98ed873dadedde0e3cac78b337a2ca7dd9e713d4bc78352dc98da7b4c9897b1d2f7ff8fe5de";
   hasRunfiles = true;
   version = "0.1";
 };
 "contour" = {
   stripPrefix = 0;
-  sha512.run = "238c4a2029435533368ce5afb4529ada383fe2dc46a1843fc06aac4470458683e86856aa7586d8d48f1892b2ecb39b750b7a0e0eb443d1e3266a411ad50eaeaf";
-  sha512.doc = "0341de64af99fa264e2a128206c69d1ce8d2f637459b646fbbc4fb54d04f3bf0123b30619f5676760ed84e3890e6d5d518b61f13f6ea01fde7940d6d9275e3cc";
-  sha512.source = "a05d528070f5aeb381fd959a5c7df36601934f870a7cf796d8bda6bb5fad14fa8d25ca7b1ba3f687335af7c1dec820fec674e74b2d2144df415f79c72fdb85e3";
+  sha512.run = "a81eca4eb5e8bd5fb426221eb33d712d0cc584dcfd359c777bdbd725f6c5d6ab7403e2af8d53ff5969695e68237684272708a02e276cc7859bb09b85f40b583e";
+  sha512.doc = "911163363093e8dd9774e3b2df387ad490accc021b6223c19a95d8638cb400874f71951955f27e362b68f6602c974bb9fdded625098ea04bfef5360d8ee58046";
+  sha512.source = "ede0b0c085a5ceaf06a9c7327a2a958a80eb98cbd6e3176e486bbd2299325eecc0386cf46d262ea0e0bdf8d3be23509aa548f0ecd12d61ccd0e77a27d1027098";
   hasRunfiles = true;
   version = "2.14";
 };
 "contracard" = {
   stripPrefix = 0;
-  sha512.run = "d8b50b5dcfa7ec3b66a22f462d2e2dee15931f91c718d9f0600c2088390a3564272534410aad1c50978b5b413a8e632b37c3500914d387ca03a6a958298fc2c2";
-  sha512.doc = "392b93d8a50842cd7785e3a3ca8523e9933427e527c00e5dc061b94b1b35b527dd592910294b9bbe6a2f8a757763334d0c201b80a5cecdeb5d9793425cd5d36e";
-  sha512.source = "c497873e353d082afa8b9f95cb83818a82c53c4a05eaa60d4e9a3b88385c71d21569c5d02b08ff9ffdbcb0f14d366b73735113cc2039263fc1815f1841f6f6e3";
+  sha512.run = "eb25275ebd6afa6bf1225cc4d862de66810ee6bc8fd9a50332843572c1a5932ea4137a322e254a61e057bbc5bd846f3a4233c00b4fea37fb0480788babbad01a";
+  sha512.doc = "90a85621e86703b2576e1aab2ffedb129e8481127a05f0c506da35e98fbd45f47d7c3eb82b2ab7649f87d6ff14f2cb688f59f1361619c2edaabcad71094c7607";
+  sha512.source = "73a21a2d8d3301b33f2e167bfcc14aa33a7ec57d22e9d9543f4f6a659eaae400374de839b69d8961871f47db08781eccac1a97ddecc2aa0bca8b8f4cb9f6fda0";
   hasRunfiles = true;
-  version = "1.0.1";
+  version = "1.1.0";
 };
 "conv-xkv" = {
   stripPrefix = 0;
-  sha512.run = "f53fb7f7e115d1b158a86a88bac635d8c0f4d4859e472de28070e2d17db208d84b791c25014e264b3dda91379d5d05638f9d17fe615d702671b75d509d313431";
-  sha512.doc = "d247a282975c70138e49a5f65adf73d1cce08a396428a6773beb3674c0b20f5a044f19b02a8bf17153e75494d0c6138e12bfbee4afa985dd7a9f1a6c805e26ac";
-  sha512.source = "8553a6747ccceb9e2c687b62a3a57b3da8816761212db46b653fca42b019d6deaf104802c3190240dbcc27a5fd6ab970702cba1a9aab8031b1b3ad14a6947b03";
+  sha512.run = "74aeb5d9e7bfded02f9952a9e41de70e035647f23b9fa9f5a9f2bb8c62f3087f2e31894d9b29a252c03748de4c124133a44ee06fdf9a963414f59fa9f474b104";
+  sha512.doc = "a440fcc7bbc5690d24f25221595372bf7af483c4b7032c08a99de3c9f1f316e5a3450808354163901a14ed5b9205ea660b62d3aa76d485cce7b5dd6b6914f2fb";
+  sha512.source = "153e47449124c612cf95e30e8341c6f8ca4e1443bf6eb4812881aeadb271aa7405ac4f1b5411fe99456147cd5c3e654fe4c090cebee81b3c411e480721891a13";
   hasRunfiles = true;
 };
 "convbkmk" = {
-  sha512.run = "dcc8e15266390ed3e836aebfc598641e6924509e7d165b433827d4225a2a35e23b472cc5ed673683415d91c7509d9fe20030032ffa6ac77acb320ae7e17e5de8";
-  sha512.doc = "6fea2d485a902b8da2fee34a3502812182d0e2e4ce34160797d5ac3aa5d5b96552d09dc8ea7b19c7fac3c0eb3917c0c96b33d1ecf85f52a4b16dcb773149b82f";
+  sha512.run = "a4dbbbfba506948774e1c50d026d48f7e4ded0d3e99113295fb129ddfad94cf3344632e0b171c64f83816326753dae0de9d348aaf0d79552aa4165d9f4bd99d2";
+  sha512.doc = "b82c3d41070ad0c5b0f49298d163e28b5306f58a24fe337fe046b4b1b129fb097da4f6af1c678cd162e237966f68ca373c55f8eaceb805959536f9d6dd059d9a";
   hasRunfiles = true;
   version = "0.10a";
 };
 "cooking" = {
   stripPrefix = 0;
-  sha512.run = "28e2eec3e9f5ac78e23e32eefe9e2a0e73968e2d288e048ce28ebc6a96fa3fa9051f9c4f8f59046307b904d7bd04fd4484f841a82d4444a89ed2474f2e4e387d";
-  sha512.doc = "82c86cec30b459bb33e0447751c68af8942e1698618c20de0fcdad7a4db8eb04e9fd4d2ea80f1d3f3f05cad2459952c12fc78afb1101da4e280b25e341c4e863";
-  sha512.source = "f03af63474ed9b86fe22c9fc8fdf865ebff4832d3d742b3bc59323d79cbcccfd512285625377b8d37a4aa0709144ecdcd531c5fb87c7fb1a39bab2b861021065";
+  sha512.run = "1a368807b0cc958c916ae69c23af17902fa9ce7127efac84f89793bc4500418a1146753682f6c00b8dbe1aad9d899fdc13389e50a35499eb850c2769c49bae4d";
+  sha512.doc = "22c55b78060fe171927fbd83f4bae1aab6f1ebbbc2a301d6411b92bc479747ec756fc1185edf739aed0885536372bde3bbd02489d534fb12091dc386c9ddef10";
+  sha512.source = "b7fd5e2ed96f98f73daa743ddb907c2b2986b37c1aad1a1e7a65cf1c2dc116354555e5c2324153cacc616a27e52a1dfea429fd3e830d774233d5b74b96dbe721";
   hasRunfiles = true;
   version = "0.9b";
 };
 "cooking-units" = {
   stripPrefix = 0;
-  sha512.run = "252d52e43df3aeaa65b6b993611f3aa6503ffad28950397901ae96caa3fc251e62a96803e548c476a11033413388f9003e553bb06209de7e16a425931bcba523";
-  sha512.doc = "d7b7b7af0bc79478c2d0c4d7821134dde072acddb0be0e0d63e531644323ed8317bbb97a00112f54d523e979e73c6af3b956abdc1eb0ae330f62b51ae68a3807";
-  sha512.source = "9777c689246537bd903d0c932882e9f835c8e09f98bf52c0903acc2d3edff4fdd4baaea18f0d828fbe95a23f1fa94d88bb0aab56f844c24a06927e83b2af38de";
+  sha512.run = "4df7aecfbddc8ee945b1efc6fe576d6be35d078e9adac81e3ce4d619f2797f34237c22a0d3eed855204e118ea8e1d752e7baadc16358dbec79ce96fa991c710c";
+  sha512.doc = "cd449c7c3c2639aa83ed78d037d50e9886b77375f7a6616a446a7caee2d744030386a6d192a92aa8f7adb49f987b4cb8145c7d402dcb5078bbec6922251cd077";
+  sha512.source = "66b3053587189579b19e5b4575d6534e2df263518b8d20b5d90d104f561883f06fe62ffe834d4b20f482acb2cd7f7bb3739293d4596b4bba6662857f3d35286a";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.40";
 };
 "cookingsymbols" = {
   stripPrefix = 0;
-  sha512.run = "39376f889edd05cbac0c74b64c8641acceefa9677003c03e40a3f1d674fcda1854f5cc0e054f12ff6ea5ed6e6dc1c14c4ecdfa914911c65b87675afd1368f747";
-  sha512.doc = "441a0ee4fe5e006f74d1972bd1106e158cea7a61aa7b88a5762c27b14f147f94b0d65c6cc4c3788176dec6381671f04fb25da8fa39056f4616ff5d1507a0b359";
-  sha512.source = "28abebe743584358d251aad7694f89d427c0fe4fe4396e8fcc64e7615a4bd8d8311643d72a136c645c56215bf984269a252ec5622e0c0cd3d1435ff814ad7b37";
+  sha512.run = "5ec5e0e19fffd9eddbcada800a0d57beb62581d7bd1c268a5eff19df652e1edf3a51061ad4a8e9d5f19461e73d6891a38c30a9fd031f3051393f231b6a9d2287";
+  sha512.doc = "557293dc0da40248f94d87bb03750dfc1f04a9e3146528d168754a3d21ed86e96c73df088cc8b8b8dd635b1b27f260bc9777a9d73f9f8016f383a7e96f8159af";
+  sha512.source = "525c3aba4d1abc56a343b709ec22b712157a4f6464c7507608923bc677a22d50fd26d852ada65863d0fbba7c716b1f4247fe87008a357ce9eebdec2db2b8974b";
   hasRunfiles = true;
   version = "1.1";
 };
 "cool" = {
   stripPrefix = 0;
-  sha512.run = "d4404e771ff79e8d9d23f67c61aa5c7c251ad7457b8998b048d3f7773db8d1bcd652501c2a8d4ed269bf05119e9f11cb91c5e57ff1990c2879b600e37336d101";
-  sha512.doc = "30e9a95dbfb1d53a5133ed9a692567a7fe78d8da78b47b8a54c5c228bc81850f9503c050e275a003506ad1d1a08484dd025c07609a56d47c8175a704fc85ec26";
-  sha512.source = "4ed5ec24fb528c853db94e5c2ac3b5ee27450fabaaa33f2b0a84c51dd29db2d1c57e88e5acedc99c053741814032ca329449e686fb225b7d2edd690ae75c718d";
+  sha512.run = "cd537d4145b0a2b01a5198d7a673695c4b512b076ea32e76561af00ce508bd3f63c34a5bb5ba41a6fba83c481ad7d95e5b872440ee87b0823ddde79630c55f34";
+  sha512.doc = "49a43f6795e82448463b7defaf88bad7eed76d2171ec0c53e1adef5ea4f15da1ce4fd3c6a444b5e70a4be35ebd165be781e6d91d85bb64d0e3051a2a7d8f8d28";
+  sha512.source = "ac87ece3b25dd69adccc11431d4cfaabfb075a0aca77fdc02c6da28d029f140b0f61d49a8adcb863d15c0660e8ef5d50aa446af79f99e0a4b96f885556285988";
   hasRunfiles = true;
   version = "1.35";
 };
 "coollist" = {
   stripPrefix = 0;
-  sha512.run = "d5a6f271b4b47e74ae71af31adaa345a72e6afc5781aea5a77642d52b9ab936a9ed2d6af309a6d2562399a542c6b96c8827c67da13e9476fa4b2213181534dac";
-  sha512.doc = "dd5ded3dc3593669aef56e7834863dd41301b67822c0c4b81c941722630aa28e36b5770a4de2b503000345c6a3e5a546567eb9cb63d9f9087b892b1d70df56c4";
-  sha512.source = "d00d54ad423185b4b4af952149a78ebfda62ff635503514a1fcb5a43e9ca6be9029740d87d8ff4b5bdeeca7d1fb879e892454ee9fc86ab51a9c56dd48fd2f946";
+  sha512.run = "61a9e0e1d5f6920c964bbbb08e5af1154fcd52d582e738ceaafe9cf0209d7fd3d25a54cf069d858588213807c8d533da5a4ee23d5cc43dccef2e701a7e7e021e";
+  sha512.doc = "4da42e8602d22a4cc98ed5e10894caccc98abeef4f7666392a55bf8998a723be46224a4a22785be4a3a93c2005a90b90df48174ca12b122ad9ff05b11549c254";
+  sha512.source = "732d1c3ed798a95d339600f0e2f2d0d11dd760558677d03f8eb1a34a878b5fe96e501f5c1a685461c2fc109c1ec9a7d7b17ddbbcef49d9200369841366ef9f17";
   hasRunfiles = true;
   version = "1.4";
 };
 "coolstr" = {
   stripPrefix = 0;
-  sha512.run = "43fb4c3186fbb6e6648b1ab289be4c18813c4a041ba29907ed2fe88f1c99274ebc1bfba33c553c6bbbe872e8d572515d42a26e1529323f3c72b36512de33b8d3";
-  sha512.doc = "40e38692007eba22e15500990c6059e4427fa8eec90f31badd3064398031603af4df9023fe39afe834b49d3eb76d87a3a6abc041146b6ae142eedd9f13c9e4dd";
-  sha512.source = "90b2bf83be5f3ae54ef4ed24c9be10ca7b947028ae50c343eee44df18a61e4f390a6275bddfb08512aa586479683c9181e4614ea94ac428eb8b3ae1967124f97";
+  sha512.run = "ee2b78faefb88db52638b362114b552fc1d15bad4b6a5d00fea7966fe849183e35fe02f8da1d158411de12c6c6a5169f1d0aa54b4ccaf2c002aaf203f8a357d6";
+  sha512.doc = "4a7f70afe1ac773456b587e32590c1dd1750df5c7b5b92ca8c94ead9d71c523de48e1ef0cfd684fabec0ec85caa76d39b323c4f3f25a6f44b8374bb4bb07683d";
+  sha512.source = "730ce85ffe38653fd99fbd7ae60dee40a8d7e33399e80b87e7c4df8019385e9674815ee284335651c3c09cc469fc756996cbd124ca98208f6f75a87e15a48299";
   hasRunfiles = true;
   version = "2.2";
 };
 "coolthms" = {
   stripPrefix = 0;
-  sha512.run = "7290f99d015175575390dae25b00dc19c924a45d430d0142fb95b16f099da69237afcfa02bced15017198d11dcf2ebd984ed3cc6fb0ea6d874112141c65c3afe";
-  sha512.doc = "8dc5e848e89854a98a5e75687e7e643b1839f4826dd4423e17096c6697d39d574696606f4340467fdeb8345f62c5fe177730398df032b0a72e0542bd2971d9c0";
-  sha512.source = "e59b15f52b961f9d9f8bea2d54569a8978051ba7e2ab250d4c1dfc55b7921467075c533ac3ad8579e0ae6e98a421b3685a12a7cf4d48de578b1a40b2b1b269d7";
+  sha512.run = "20b7ae10129a0a0202efc4c39adebc628fc309a87a52fdaff064b0e781339b7fd903c31cda6a148216aa3b17707c3625b545c1ab68e6dc573f0fed2900a1dd02";
+  sha512.doc = "a66f3e1d29327bf44dc3dd01de7d3934e0cd6dedc483c0617e530ebc5046189f47640606746c27a5e1e8077b135719996c90a7931c36fb3a3fbccb702151975a";
+  sha512.source = "2ffd24397f10f3f9b6d220ef21ddf3680b1a141529ae3492c107a9b2a2c1226f43c4a41c82c779fb85e8d36e0e7565ebf37949c925b1edad65cd9867301fb5a5";
   hasRunfiles = true;
   version = "1.2";
 };
 "cooltooltips" = {
   stripPrefix = 0;
-  sha512.run = "720c0c88025d463d627f14103313716aea96643b52ad4b23e395bd2a6d2a694e081041b78ea5faec40f253033cf89bff10d8295a020edb8f66f380aca65944c0";
-  sha512.doc = "f3aa29a0c349eb46b949d85cc3a37003a3a4d0bdd64ea38c19b473b76c23c70f3cd4719618af212703f9df1bf0610424a57f8428362d82ddfd0cd18c0b8fa99a";
-  sha512.source = "7475492e3149b66c9af2b24217a463f270369e64e692a334054431dc34f896922d3ee5a3450ca7392ba488ca2ea3dc1bab16e7322f56741ce2c238f652e12294";
+  sha512.run = "a87d6aa09f7181e2e23c298459b6dbc99cfaefe26c5779806f2c2bb58aaae11aa77b911bd66ee4ac79a3ff45f9d12d9712ac4fbfa9e2c5e7841f570b4e37c103";
+  sha512.doc = "c81d621ee1921cd9e218e2c187d3ab1c6d2c71140baf84ab2b387d2dd58bb7b7519d6fad719f53e96b1157d27dc0ce1ca31c1d2056b57adf07fa1f9779237d91";
+  sha512.source = "5f007487db12acc447f79d9e10825374e083225b074ec87b4463a6a51b924af3812d4c9369748f7aa537ae9c1dced5f54c4df2d94dc607f195f07b0c2a0a51e2";
   hasRunfiles = true;
   version = "1.0";
 };
 "coordsys" = {
   stripPrefix = 0;
-  sha512.run = "7d0a097255827a2066dff32d2a714a5c3dc3befd5d112cc80e0606098d528462aaa4de55908cd2a5fb19486ab7935b984061c36528f81445204c90cb21d8f8a0";
-  sha512.doc = "63718f7cf9cb5b5b6bf35b0ac3feca21de7c3e7f2a1c24e9de2c795dd9a787c48e3d349ad03784a6fc837aa115112bfc4daaaefedcbd81901c1ae0f5071803b1";
-  sha512.source = "6b04b55802bd2c216dd4b2bf0ffd841645d987c370b1cb19bf400cd42617e9154eafd661845364ddd8717fa462856a8bec7636ddbfe26be507cf014fae3d0ce5";
+  sha512.run = "fee26ae109aea045d34266b82982cf01735d1e2287e0ffbcde79c4c358113105475cc0f9fa95ef41e0b9434ebf51aacefe0fb417ea6b0dd86a4c7f2d3fbb7e42";
+  sha512.doc = "80eae21f13eec9f37ed97049f283c88d938413010ef0aae8538f4e81065df3930aa39bc77ccece0e88a4bab42dca2afb59e64b1e7ab8a19a340ba8a1d4485556";
+  sha512.source = "8550707098bc5e72ac8d2d2b112ef77e8b1a96e65941d7cca11144b80e40c09dab7047b2aeef7267b21b27abd82fbda8c0dd5b44b2aed1bc97823329d6f21942";
   hasRunfiles = true;
   version = "1.4";
 };
 "copyedit" = {
   stripPrefix = 0;
-  sha512.run = "f2848f7acaad064f58423055b64b4d1dbd0dfa5e2ca7f914a92862c0cef979acd02cafb287736562a4d603388c26bfdd9996e73c63b402153653d41ccd02b0f5";
-  sha512.doc = "d2fe164ca629e997dd7b2e4e2ac70698418d418f97ddfc2f23603eb7be38bb6cb8397f12f742024e651bba0c716795055398caf669441acc26de590f70417d76";
-  sha512.source = "39d270f1b38fd578f5140457d0081097cb18df7f771454d1039c84ba5fdc5b060c8d2a03b68fcce272d11cc1a65461d9acc8c3bb4061fadc8a9e24aa994a5d7f";
+  sha512.run = "09465c229aab93e87a0d25c96fa9ba34a982b7e8f5ea91bcf0df7298e0218a980cc51e46b79cac71209b8897046381841ce778f7a7a20d93fa8ce616709d0b0c";
+  sha512.doc = "7cd490fa93566a74ff39e1b2cfacce8567b8b11015f3869792d646e5eb0eabd0c425b831459733d0a748e1e42df6ec964607795cba63cd0511324c06e410a67d";
+  sha512.source = "a543d5c235394ab0fc870d1df685cfbe46e6ba3ad141a7bd54bb588d6b785227bacc8295ac5f26624b45c285c792db84b286d696481c9496e3df076b52cf7dfe";
   hasRunfiles = true;
   version = "1.6";
 };
 "copyrightbox" = {
   stripPrefix = 0;
-  sha512.run = "d7c24c73892c698a9df8f0c3290e0cff235d360bc4be129a6ab8abb8a4ce28cfa5ec65725c14d5c299106b5e06b5dc005d166f973bda7ea1af45cf95840fd111";
-  sha512.doc = "e5af0df7c3cab9cf601b9201295bc7f5448f7045add3483268e0e1d2075a8b37d7da54b2a59b8f2e5e2835f8e23e4714f2cc5930960b24615aabef4351c5b1c2";
+  sha512.run = "27fcb0324e5116eae66bdce9bd46f9edc6e1e140a393d8fb7afd0e6524f24e8fee31f9b6efeee5f47fbfd8c4dd06243220bc1ee7e3d58ca5a091942d76e506a8";
+  sha512.doc = "ee4aaca87bd90e0b84b14b5927bab39f0b34f90eeda450d17afbbbf070ab5efd4d4f233ade4551e22ee4075bf140123cc307907a40b3696a9d3af3051462df55";
   hasRunfiles = true;
   version = "0.1";
 };
 "cormorantgaramond" = {
   stripPrefix = 0;
-  sha512.run = "10cfb0b6c419a5baa0c0d3fe67ff6464c3e24d5c9b8ff959a934725673178bd6c49936044de23b3c7fcfd5e8bdbea5e59fac37d2fbc5cab003455039d25012c4";
-  sha512.doc = "01f83f748149db00f7022f33c37434799367c0e18d0ebe22e200ce71eaac04241e059aa1d903a985c78b630d97bd0a9c1af17ac4637a2cb28f978a9f0184cc39";
+  sha512.run = "6b23250c801a862ae41f588426fcc561c59729963ec6307d0cf9bd631c369f83c6bd8149c340dd75190dfb343ff40006c2f62cf596262a812f8cf0a9c8fa1aad";
+  sha512.doc = "d33c8eabb4669083082f87701451f27dd37d370dd8ece23e92c07c42d9f903f80ee88f70324d2c1e569907e40a16b68f13aa2c81b8d39ecab1e3e83300f5e2ae";
   hasRunfiles = true;
   version = "3.00";
 };
 "correctmathalign" = {
   stripPrefix = 0;
-  sha512.run = "6b89a3773a3dfa427316f40d275c9e5b450fc1fe4b8e3007969aae50b9c863fb23b9b6239a1acebfafcc3d2fe80429a43048594c43fe85d040e8686b36442996";
-  sha512.doc = "6dbd6804d0795844bd5aa2cede7c734d725b0a12f322efcf982f938fdc7fbfe8969353ae1bc696b0a9cee5acc58d8babc8bf194a83d28961c37de2545c5bd145";
+  sha512.run = "f6bca1a4213071a6752b423eb9b05383c2b36398a14994aa65c698f1b694f96a103f1dcd952ea094d44d88462f175c97af9e1f58598ce78b81d56ff366f32d39";
+  sha512.doc = "495caf73049a14a82889b87954e5b0c3d8f9a3dbdf70830ee440a21bc916c752d3cc6d80257b219d5aec8ffdcd0f75f17b4bb92e404f471c83e04824c06b16b9";
   hasRunfiles = true;
   version = "1.1";
 };
 "coseoul" = {
   stripPrefix = 0;
-  sha512.run = "1337cbc8af8e6565521f858e897508287aa969b5e36c30e7bbbbd51f3ebc25ec2e019dda13aecac132af83585ea30b5bc21eebd24c886327a452e6add6e4d513";
-  sha512.doc = "492cfb47dcd8cdb29566405604795369a54f40f8bd7c58221d04f113a87624cc1c622edf62c31402363070f9de1670d1799c507901d3a0a48b1573bbe9f17f19";
+  sha512.run = "009166284f72779daa625af83f3486f86994891688feed3ad87d1a40e5d82ac4de5461b1eab298396f3f3e488381269b10fc2808eb546d219aa049c9a87f1a3c";
+  sha512.doc = "d5271f5f95016d0f6024256477b89317847b1f366580f2974276f8d310ef49e15741828721d4c47e8520e8b96aa16884cc644419780970c637aafb10b4f2bb0d";
   hasRunfiles = true;
   version = "1.1";
 };
 "countriesofeurope" = {
   stripPrefix = 0;
-  sha512.run = "f5b9a715948d256cd4bdf4799cbe83eaafede7f40e440aab836915b6053371043d92ae5b42abdb8646f5f8ad922207a6dc60caf65596673fe4f3d3bea8100eba";
-  sha512.doc = "efd0eb922a52527b69cad0c94f3e813a85ff8753a79e7079a8331a2f09efb3e20ee6093bf1aec5c5c1e2b1614e8378b93d88df2783219a1dda706accf5356c6b";
+  sha512.run = "b3b3d203884ce830503303ef5a7357269e6601ceb2734242f2d8344d78a50628b44a91143a24be1bb68fead3c1e0371265db45d7da0c06d450b08dd5a22c9395";
+  sha512.doc = "413d4e5d693a43688ebd1209f5ab22dcddad3a9a62bafe6137d9ae37a5923a8064f0be8c81725d79e2e8fd876ff8d0831f7d760ec695aff484341f11577fbfe7";
   hasRunfiles = true;
   version = "0.21";
 };
 "counttexruns" = {
   stripPrefix = 0;
-  sha512.run = "27e4799e46f0ab9c6361afbaef1d13b80bad034329189ba233bccd2bea07f08cf8c97f7840f98299fd04d2620e00bc65a80c74529a4aac57a13310f1b546e27a";
-  sha512.doc = "0045c40eaaafa191029d47520c42d83273d40184938d12ad7f5e1f6d47e792736dd562f430d1794fc040f8ef2555b097fabde87aa9aa8b2b22b850341d416667";
-  sha512.source = "2776770789753b2d9b3544543521049e869895a5843ff9d15b16ab521bee14a2b008825aa4ca63a47a54d349fba7495352a45fefa70c0e37b7a93da6052bfd55";
+  sha512.run = "23603509f9fee86cf4c67b19a2b38bfb0ee4790613c35bdc5690de8ade1062a10ee54c93970a47225ddcca198c85ff0eaa0c7d0586dbb96a7ae6e342f375cb3b";
+  sha512.doc = "221af8bb159351029e85bcdded44ad495f1daead8751b97f601381846cb13bf85cf8f1ab5873c7b763cafe10a2eabce719305562eb2618cf18edb6982902ced2";
+  sha512.source = "c5dba9753038df64c4e72d241d3d2c0f7dcd6d1b4a1acbcad63c8447a0e1f2996a7996463c5b2a2625644602b215ce0b38c51c4645e47ea166b01f54a9a760a5";
   hasRunfiles = true;
   version = "1.00a";
 };
 "courier" = {
   stripPrefix = 0;
-  sha512.run = "3ba5620ffe78fefbbe1b19307ee4dc9d973033aab55fd09fd420e00e6a8541716eac05ce8a2c96ff9b755f9aabf020ee42d2252586dcb6d674f36892c5ab5582";
+  sha512.run = "5fb048c8f062725d8a3bba1cbcb82cbf83e37726de1925033bd5f3fc0c3dd2362eb903253f9446e9003a333965995256afff1206e980b76d3be3f01e81521d0a";
   hasRunfiles = true;
 };
 "courier-scaled" = {
   stripPrefix = 0;
-  sha512.run = "a57a92e7631d8d1dfde5162637c974a3012445795f7c2517b154d0a49d5ac0b1b6b0557b1a288c03926952876d608c1ff9cadeee3298c87be744cd3d1267a004";
-  sha512.doc = "d3bae89be5fe957696e8ec50ae5d3040db1b166f080ec1800a2f09869a3f530cac7dfe64c5ac6d84949c677150f0a311bd4088a2cb5d6e63b37701780aae980e";
+  sha512.run = "593e9276737b01ba243bd288f9c6dec030e4e4f0aec559202b228545f6d1d2f374582968112f2075ce5c4d5940f13bfb28768f144d63b6bba5035cc17dca95a0";
+  sha512.doc = "dbc69a10a6098dd85fe5072044d78a71d8ffb2b85575f53ba336de5ba1a01acaeac71cb06c809a60f10537939a60ca28f1d095f68a68f1e854050ed9dcafb749";
   hasRunfiles = true;
 };
 "courseoutline" = {
   stripPrefix = 0;
-  sha512.run = "f140d1a810e3522e16f07512968592953bcc4f91171e41d7e3b1dbaa6f51d31f0becef607437686eb56d66eff1f10872c5e67c7db370e8a55da466f1a69503d5";
-  sha512.doc = "fb6b969d94962f77fa01002f8dc9fd0baec11edb42d5193fcd4c7a9edeb419f84b4099334b8d25af064807f29b8e00dc017e685c6980ce2d36179dc4caaae6ce";
+  sha512.run = "0caa7beff0a7ee6772f9dbfbfd37f35e80aabe3881626323402fcc51f00ebfdf9d598e6f1b9beb8d40ca93131c41f104f51cd0dffc7b76b7b9a061c69d18de3f";
+  sha512.doc = "6d6556e695db5ea4b17275c0203f9e8f3f411a444bd37867440d3c761d72766e7b628303d3ac1b4c98bc1ee3bdadf3dd4a75908c805a3c6ce4312597d5c34d17";
   hasRunfiles = true;
   version = "1.0";
 };
 "coursepaper" = {
   stripPrefix = 0;
-  sha512.run = "89c52a6cb12ca298bfa020298fbada44b6add825f7ea29f606b366a7fb3ae4d660f1808d5ba6ddcf214685bc8d90aba2701b533428eea9f723519c4d1d1bec3e";
-  sha512.doc = "d3ac764d2f09c9130b2ac1c6a84f704a59b0ac958c920b4951344228fe432bf6c82b94ad4ce27407a5a96143cb2e8cb0e018e28422dcbbf8f4fb4ddb0f1d5ac6";
+  sha512.run = "0e4a2e48f45742957236a15245ba31064c083edc778111f31e9f989f0d4a8af755570825d3a0ec81ba97b65be9b097147cc5fe11160d66f098feeed7ed80dcf2";
+  sha512.doc = "d2ff6513c28eb3dd82ff361facfd74b3c5e59d380ace763b48f436b498bf1e2c8abe5f3edaa89ec24b7f64b15a88ee459fedd96dbe1aa4e879b1eed3b55ba069";
   hasRunfiles = true;
   version = "2.0";
 };
 "coverpage" = {
   stripPrefix = 0;
-  sha512.run = "87205be2320b4b61e3c095512c3d2fb1e99537399cc59f7a15a0b5c06d47967af9eb78d113837e4619787da25a5e566c951cb0e424e6bc2a6a1fc5613d65c0e8";
-  sha512.doc = "3611c9e42b609716e7ab8b3ce5a2d8ff597ac1f75f2e224b43d15989956d30ebf244bff6e462916b689f8800e79ce35423e878244e6eea6e2ff7aa24a455e258";
-  sha512.source = "7bb2972130e71d47e076b49b7dcde7dfdd9f0132e5a63b077f5d3ae8bf93df46236869b31541bf805d95a4cccbc354da53233de1790b9cdb86941e079d603913";
+  sha512.run = "7e06405a0af0e8038e9848fdb318552040b7404aa36652b5d0b39bc1688259581bcf3ad49c196fbf964ca6d057eafa33891f47acfe201be89908e9321cfecdb6";
+  sha512.doc = "da848e5237283ff3accd700e577818fbc82dde6f46a01a1d14c620178ad1a04f0f6c9d9a806e329b706720e0b4dc8cc341994d8270a6ec1724f440f2e304870e";
+  sha512.source = "f9979ebc348c81961cee36a0265a829cb2e544abc0f84c1dbb10f040fe6f71c4137693659b4c327c32b1fd6e693e892e47e8de584c95f462120344627b18d20d";
   hasRunfiles = true;
   version = "1.01";
 };
 "covington" = {
   stripPrefix = 0;
-  sha512.run = "debbafda1b6b3df70350aa3cb3fb8f50155252b57f8ffa9a3261d4f394b904fa88d7d785e1a908a00d89877c594ac3876cbac6b209959dba4ecbe3a460287c5f";
-  sha512.doc = "9c3b0f849495b3e7829c8b441ee7fa71eab2dab15aaa9d9dcc304ebb007f1776ff64ee4deba9e64c81d839278ee5b8fef3c5de3992a2a78e0eaf6c6bbf80409f";
+  sha512.run = "fa2224ab43cff9324dbca7e676702427aec4af616a69edf0a4b0bfd58b885c7eff964787367982d7180cb336cd25ec0378ca1433a1d6d4d6b49c69bb210fc41a";
+  sha512.doc = "f3bc3d8a2e4cb1da9cca4616b08394b7c52de5e714b9473bfc2bb21ac8261298abd65de739eb80ae7c55c0408143a2019bc54a249c2f8c35b133f0a11706bebd";
   hasRunfiles = true;
-  version = "1.4";
+  version = "1.5";
 };
 "cprotect" = {
   stripPrefix = 0;
-  sha512.run = "2992477384d5f33af75d564d2f01a2ed3f430baa3d0c457f37ae3f6984f4da4e443f241bdcc34c1aab216e76e6f653d907ed9c8be9668ffe7e80c40d8b1c3db5";
-  sha512.doc = "0b50844e74d528bcc03f3aa18be2c65b963819e1fa1893b7c3d37532d9d60d901624d0a8276764fb24acaeb258e4ea46e08f521448c275fe6b23a0a8fb51e81f";
-  sha512.source = "d956ccaeda01ebe9b45a5c988960311e02f10f8e59d8adf06d4d1bff6278d7e5db695bad0daf36a830de843be64234a9dfbb0a6d53b92f316449de88a4758bd8";
+  sha512.run = "a6bf835a31dd911f7e6cdc33914b184ceb2ff1dfbd91e596ab416302952ccb66516d725fbabdb803dcb5a1ebaf0dcb686a35a25480bf23c803a923191b8d0ba1";
+  sha512.doc = "eebaefb15445c8ef7f69ad69badd881da89d626a8a4f406fb017b7eaf59efe691bfb358069741464ea1d9f4b3b2ef3b16b42f58f17ce5ddd41987a0b39c1616c";
+  sha512.source = "b5ab53b4f5e1ac1cab5e57c1fe4e83277357ca5403431a59d23419f69df676676b7ea7bd61a40208099af75e1116aef4296d0b1f9580feab667f89e7315b7678";
   hasRunfiles = true;
   version = "1.0e";
 };
+"cqubeamer" = {
+  stripPrefix = 0;
+  sha512.run = "f577a2acd31656a5b6ac61b3a347564f96380d172b5ea99aef87f8d16a8fa8c3c36b4bf97d00a6ab366cfc28f65942119ae23fc611aceb76310a7eff701b5874";
+  sha512.doc = "718ed336019a741910b34d438a7d4e8419697d788f9e0f1661d81c6d58420f81f43400b93de653e34b5bd9ca0b3a77ae56765d020a828b489a71b131d1061087";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "cquthesis" = {
   stripPrefix = 0;
-  sha512.run = "da45d8d38111e44ede1af3c3f9df58fac84189b1e4f483c8b0661bdd3d0dd5c6c71ab4f9541ddacf398ed4b764cf930416345f9da9e757c78127c612866d32cf";
-  sha512.doc = "97ad51dbeba74aed6ad52371fde14bb52537119f7399a16be8be8bf2669e7b3f4a33db0fad78f10d30e0b9ff609ffee24150bead188d3cfb8cb59fc71240231b";
-  sha512.source = "6b9403caa67008ab810e706fe74b559918dedd6ce1d059c76bb58407f463adf25951d6aec076b7ea3b65f14ded5022168aa9fda464498da2e10ab746c088d1cd";
+  sha512.run = "14ae2fa1a92aa6a1c14acd03a08b131db09e2c31861720be9f5b5192f03cdd4f7e4f6eeb4fdef17d9a8352fb7191907641751a7dd4cc7434f0f272a04864c2ef";
+  sha512.doc = "8f2e3cf94d81b5b12709b0bbbcabc2deac4e1889fea181ab2e6450c3af59ee32eb6e6b1bd4b78196d0b6c1af4cffec43cc471da00f73a6d4ba20880ffb56154b";
+  sha512.source = "444ee3789ebf3527b1d92f90b942ccea0fd0462caf150af35c572efca8ecff85707d3be006843308f3cd42309991b8e30d9ff1c7e186f085a041c446441cf298";
   hasRunfiles = true;
-  version = "1.20";
+  version = "1.30";
 };
 "crbox" = {
   stripPrefix = 0;
-  sha512.run = "96d5188195bac2d259e14f7ba86a76382a3482f4b583f85b2d618b4396f48c43b6947ff306636368fc7ae7c0a9ebc113efe4952331f4306e6b14aca9ae785008";
-  sha512.doc = "6a2feb83b412882546437243aeeade9cb4bc2a92457fb7601ab152c62a5d43c274e17424c12e5fda00b8d69ed45ef953834ce4c407adc78b5598ce677cdfee29";
+  sha512.run = "d11d406665290c2b8e5c39d1fa25135d3eb398a8d69d73b6af478a54d519db9a32d066e64cdfacf863d6ba1ce63ec2ea2e17a0e819dde564189b511487f18641";
+  sha512.doc = "47d8f1e0b55ca4c9ec866d26fc19b3896cfd6e11545842b05501dedf3518e7c458ca2bad0e336a0807c95912507c93fc1776862998371367b22355cb30293aaf";
   hasRunfiles = true;
   version = "0.1";
 };
 "crimson" = {
   stripPrefix = 0;
-  sha512.run = "b08ab68a63a976d88c1e76047c651850fd6ba7fc29c080143b09555bd6f9c54dbf580402eaba17ab137eb06492f00d804ea2fc91ab4b235a00780780674f9faf";
-  sha512.doc = "7f288019b4e6246ad7563f28648d749207a00a5c98f89624f26771845fa8995de2fa38a1213d975c2b3fced0023ba35ce20e056e74be136ec9c66f540bac195c";
+  sha512.run = "6ea30bace5375f3c8f644c6b7770af4803d564db194efe93beba97a97b2b91198aa9cbefa8673a0c1b1657f5682b4ca0dd0c16bb5c400ef0e09b6618a1089f91";
+  sha512.doc = "8daba8cc00bc1451ffc0c1a7d061d18710ba669ad5da7a7d1c7fd95c3d76473646c9730545cafdf3fa3a875a3b211adc702875b64e0d51eb582099fcb58ef986";
   hasRunfiles = true;
 };
 "crop" = {
   stripPrefix = 0;
-  sha512.run = "4179f188aadc1639c4014d48f7330b6575a776994defcb7d40058f6052baaed7756130cbd458654af541c9a9838d63d2cd70afa93e6e86f8a375fd9e42342e1a";
-  sha512.doc = "b1de83fcc3174a4f6f585e6ea3cd58deb60d60553b0603390623c6a5417ac5a20597faea0f18b700aeeefb0876e314d91eb4f6e7dc211ed3aff30a39fe3f656d";
-  sha512.source = "6bcc7ce850ac33d4a48eb3a70665fed1118cd3742143050fcb6443812a3706769d78d35acbd906059977ea30bd728a746dff2ae2a939e53bbd8b7078b79a1f80";
+  sha512.run = "6a070e0fb8e0421d1a72036a64773ca481b35bbe44567fc5cc417d1121cd7d5fa5cbf8bb10e7d4772cb20d94a36746397250c7284cb3bb782dd8e5dac7a72399";
+  sha512.doc = "099b28dbd15d01a4c715bca73c7f17c55b29143a0dfe675cd429f46aecb58bd5875c3ca5f8a1310427f8d4fd5bb4859792d17e58d63f2ccfdcab8261596dc25f";
+  sha512.source = "61f3832a4e43de4cf82435e46bc475456915f13ec25db1a5e9531a5a5b0df835bd439052522873b128eec49822c2590fbe76eb718f8f44ca0de5f10720611caf";
   hasRunfiles = true;
   version = "1.5";
 };
 "crossreference" = {
   stripPrefix = 0;
-  sha512.run = "5cc5424ab324496ebb2096c4cbb9173ca4aa747c1685a15a53867d40cddd3bb6f5ddaf5265884f4b6ca262b0821da20641c68c33ccecd111a67a81b94fda66f5";
-  sha512.doc = "fb7eb709648c37f5cc85033f10c01a9039f86f84ba23552383635dae359481646cc11ba76bb0f6046d9d9b202e5f4ea027c26978faaa3c2a9e33fdef1fb13c0b";
-  sha512.source = "7d74c6646819014a99a264e98f17b11545d7b8f074201ab710ffffc6acc8bd22b4a30151bc45b1a69f433cc3a8aa7ca1d8aa01a7276a65573e106cd83f446d4f";
+  sha512.run = "50af472a5b172d5418646fd1879f339126f68aeb9578c6c05d9f6d3990e9f222aa3bed793669c1b67389c272ab1b87bdd6d0e52506605b8e5a774855ec285ee3";
+  sha512.doc = "536b7fd22f6864906abe4e43548a9dbd08eb80d75e1ea034794c780a018a33e29ae2da9b68f3cc9b4e712c0d13addf9104baf00fc4017180c5936c1c2f3192e9";
+  sha512.source = "b20c0b9f2202e613d911cd9889b0bdcdd62b81024c04b24d6ec0c8239efd23911ecc059f3c65433b03e8e655848d73762e4b5cfd409cb119f0da4db284f21c29";
   hasRunfiles = true;
 };
 "crossreftools" = {
   stripPrefix = 0;
-  sha512.run = "6080f008aaffbdfb052f62d56182756e9b5d816924c6ffcc806210bf6becf1a7322f59290c2066bf5f9cb145a12a0f6d30f1f7c3987b3b77f839aefb1a26b32a";
-  sha512.doc = "57763723c66785aa79a8d563e49c27da1bbdf2308c275ba6244cab2b9a585cd3ffc16acadf68d71b580bd3d80d8bb6fcd6e4621ec72b4b89608b00581f723841";
+  sha512.run = "1b8891ea6030828a645dcecfac29002ba16dc3b5c4fd7f4f47ed2c1c81e580ab37506e9942e90f9b4fd73a2792900858402abcdf3bc63c29859e54d9880062ad";
+  sha512.doc = "1ae79c0a211ee171948c448105761c964a0ce589bfa4a9f640b090fdf343b6b4c8fdd383c996f2c1b3e4d20716a178e75418451722a7a65b7f80854b9a3b9f37";
   hasRunfiles = true;
-  version = "0.5";
+  version = "0.6";
 };
 "crossrefware" = {
-  sha512.run = "4a893b518a4420b276cf77e76bf28ae3fe0bd097b4c3759a9af9eb9023b83032f41b68a0f0107968bbcd4f8dddc3bc8b9c3c9133c66ac4236a4a7059b2101135";
-  sha512.doc = "a6166ee3c08110ec734de7245ba89a55a69235ce41410009833f82a75ee102d0d3851de30f7a035b4e83651275b140b3fc1e63944df01621f8e2bd3d793ff008";
+  sha512.run = "bb82e6ace8cf17fffb50be160e22ddedec6327b9b3b919ced50e6df6be7c14451b7cca9fb2237e9584dcdcc0584badbe1336767b136e202a9ead8033fdf19943";
+  sha512.doc = "0fe4f5ea083ddc7a6f480a38b1e65d749de3deea372b642581e950a7baac6c71dc16ace7cb1d14a213aa361e15271a90a60005acaf7a215a8c5879e841717fa7";
   hasRunfiles = true;
 };
 "crossword" = {
   stripPrefix = 0;
-  sha512.run = "2fefc372af24a5f3008858e2f4fbe29e5c9ada8949bac9eb4ea21322c7eb4dd8c21091e9242494809dc13b45a5b46d21998dec453d786930ddffa41c43db0956";
-  sha512.doc = "3345db04cf44208356326bbb1055741dcadf001944dd3971e0516f7189c97bff3afa04aca762a351381c0e1e5cbf34d48016ee5c9ecbff5ce3c15ae4daf53090";
-  sha512.source = "3c4013e2c60ffb15ceae5c1d85f646f9cb94ee00b7ede6cb5b2b3aa749ffb9af2612219f3885c0a44e593c20fba02da22c7860f5d8d484741fac531984213ae7";
+  sha512.run = "45fbd93550c98b16ec8ef7190f4fbe9534994ff21055cf59dba3bf959637d802d7a3c33b665c4c621e1ec046ea4e9e9a0ee79a4c892271702a91f986885c7762";
+  sha512.doc = "3e5f791639cfc0f95300101a37e4bcf011b71c3744eeed5f79621cfca347eae079f4f86d4a58d91229f9d3e3cc83869a077824ae048779666d9391a8c9271623";
+  sha512.source = "e1e4f7890e1f1b69acb0970f3af6822bf5c26d613bbb1c5936584df4d95f308253867a2ad2a8b0c130546476cd6c7e5d4b59f561e6f5c7674d6ca181e75d181d";
   hasRunfiles = true;
   version = "1.9";
 };
 "crosswrd" = {
   stripPrefix = 0;
-  sha512.run = "7a8463c1827b6930d7fb3a8d5023e9a5135fa233f8e99e70d6a63e52c8d3bebb6559bccf6e0b032c8beac5417eda564bbba72b0634ea3e197669dad3db3aa9fe";
-  sha512.doc = "855b308f708875c77b0a66732e182b48f8980ff9c8d79f3d7a1beb1810b1e7ad8f855a1e65abe24bd2792fb2b2ad576a83a526fbc91359f8c6ae4fd6c9926151";
-  sha512.source = "68892a25185a4d300cb8939987ad23556a5c252e61077afff7e3134f6ffa9cdc45f54a85202e39cc352c66be1a66841e178b2179272c10d29d7011900a6bc601";
+  sha512.run = "a5d7b43d92334e099d5e9a1b61f615ae8c599fc24dea4efc39ec4c3db959af5ca985997f01b26c8f7b2b8aa0f9fb5089f68d277f973071dd48b0da0ec65b214b";
+  sha512.doc = "fae76a3c76fbfa80b7920436ad22600bec913e5ae7d3f6678d5adceb9395134d563e3afc9b26557c6df1b8ad86b0f025ca50896f708fb531f96ea130e76d3f24";
+  sha512.source = "c69423f45afe0b7fa1de5b6269c0316c8d43ca553979268ca4e545872f813176a32fcaf2f33c78ef3df825349a64c4ee380e3b63ed2751107d2282d5acf2d91f";
   hasRunfiles = true;
   version = "3.0";
 };
 "cryptocode" = {
   stripPrefix = 0;
-  sha512.run = "333627e873ffd38bf4f107e232aad217ec8060a2aa05b44bea9f53ed489d602e5e6372460b3660fe854fb728898ffea23dca0f58cd2649685767d1434d8fa8c6";
-  sha512.doc = "867be9dfb1d1797a3f25f7894e9fbf878173758c02217f24ed43d55ab85d283a5b2034768d3525f4f676e1c3676c4dec24b131cc43dbaf0d735653e41986a551";
+  sha512.run = "c20228bf3e579b626a6d90320eb18bbd48213726373981768759b629e74b5592040a294fe7ab908ceb18e6e2128eb2d9baf5e8ef750efd9beb56d11418b25717";
+  sha512.doc = "87bc9a782cc965e98d59db31fef7f061d100f9ea5630d92a1eaa459a6f7723f48f099436f5439e74b7c97339a668875b33a6c12522f74244929d0b99198e2ed7";
   hasRunfiles = true;
   version = "0.1";
 };
 "cryst" = {
   stripPrefix = 0;
-  sha512.run = "87220aa0778edc6f81598708a2859b321cd8aac46ba799d13ed6628293e62bce445eb6b53dc7a600a7067496eaf8b1ecf7aae84f17c0f1b82993b3fab18a1368";
-  sha512.doc = "f88dd71bc87eae73ab9c6326edb5dd4b9840eea3f49d71e2b0ee6bb925853ce970d72c3c2d4e977300c3abff0087f7d022c19a0e8cfc729b5af4cde91fd388de";
+  sha512.run = "0fd7373670cecef60610c3f42b0828aebf413a62b16b86359cabcdd09e2443d0fbd1081ed3084372937b70d2f000428fbb5dc128cbf40fed8e70aec1e84a3292";
+  sha512.doc = "7f5c3692d8814f016ea56e2955c89787356e77b7ba8715e2703b27a66ff0b5bae01766a3646aa020017fd4ab43a6e07ad416aa0f47044ab8b4d81b06d866a87c";
   hasRunfiles = true;
 };
 "cs" = {
   stripPrefix = 0;
   deps."cmexb" = tl."cmexb";
-  sha512.run = "9b004bc7e0dbfd1d3317ce9cbd8aab56a2a7f0a1b7fc1f7bfeecd0a4f91e6ed749300cfaaeda46302133789465c7dd9ebf8177249cb1142b17620c1dd2991c4f";
+  sha512.run = "0575b1a336d91aa9967503196666594975e55c6f58802702e068167ebb9d87bab4d9d92582a3496a9e837c3e30a38a7c7a1fa3e70ce36a545ae368b7f9eef135";
   hasRunfiles = true;
 };
 "csbulletin" = {
   stripPrefix = 0;
-  sha512.run = "106b8cbd8ffc058e9dfdcaa348d984da4dada8906f7f71f0f10f59b5905f49450e67025ae4c0664bdee3c39b6ee903cdbad4e77568d3653a795decb1ffb3e213";
-  sha512.doc = "e66bb6041b0df2e450cd43193dc0ba10f1262be889870a14118908b63a27e3415936dffd0d2eaddc33e5ec3c5416dc7ba68d8ee5fd86745607b4b51a0852627b";
+  sha512.run = "35dbe4f3821563df5539fdad2fd6964f056393c1faa2c6468629d873a67f94364fd001702423222edbaf3c4328ab0e04ac8fa9c7c4387023272fdd5e82c18208";
+  sha512.doc = "ee40558b2ebd2b75f6ba6a79f3ca8641b20081ef47cc96fd1b734619e38e2b7558be29d1153d503c3e043e14abfcb9bae5786d81cfc45d1dc22b7fb8be081c27";
   hasRunfiles = true;
   version = "1.1";
 };
@@ -8726,8 +8962,9 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."latex-fonts" = tl."latex-fonts";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "8575b1568162588206471f4d708a4f61a01fe89eeb55de0a8a7b45af2266d7561a4d5ede59d6958e6b4c7f075115f8c12dcf0a67d3eebf55081e84692d77536e";
-  sha512.source = "de26b930dd484f40c6a1c9a4ab6a2a893846c14760b1a727d78d5a21f81a6923a105e5fd587a684ced72cfc672dcd516246e2f1a835d59847d91b6e3015db7dd";
+  sha512.run = "c328242128856f4c4ce33bfabed42f33d6ce746828018cf37ece8d33c8899238373ff779bfe7cb06491e42304bf2820845c1795b9d868d4db5c77101e6b7ef5f";
+  sha512.doc = "ee0c9e4b14e5fee30f09212ac92e23e1f8d6d4da153b55ba9eae7d6f9f130e3fd0c36baa8c2abc95990b0c8e5b88045160fce73974269fc97fc3806c959b35c4";
+  sha512.source = "91de6728bbd726c3c14e4df31352db424937a0aca0c269465999ecd0b19bad57df9bc282d2d91acac097d8401f576b764bbf82d4ed14a688ca491653edca98f3";
   hasRunfiles = true;
 };
 "csplain" = {
@@ -8740,723 +8977,729 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."luatex" = tl."luatex";
   deps."luatex85" = tl."luatex85";
-  sha512.run = "22c9249ef29a3a6e42f5ac12a48305e59e43b50a076f650703ffd44f6ca82535e5d51099ca86e5f66db1d69d68a205d27ea7d64c0d63816f69dd7614dc82f481";
+  sha512.run = "12af8f8c35e42debbeccbb73ffae3bbb53ffeb6aa2a371e7b849b2c6f35ada6e3bd799ffb82685db5664a4061d63361f6599dfa954802ddfea7dc7ca2ccbc285";
   hasRunfiles = true;
 };
 "csquotes" = {
   stripPrefix = 0;
-  sha512.run = "4bfdbbf20c3176af92aaa9e4ffd769295d66d172755fc20b5626ce54b90f018b2ac6c92da2fe3022d744950a236368c5226bcd05eddb18dd0a8ff091e96176d9";
-  sha512.doc = "36f9e3dbe5a3d400829381094acab1ffc7ec01eef26279b3d521972ad301a4fc788861bd0a0634492c092d59cc53c819dd43604bc1b51d94c400a619196707f5";
+  sha512.run = "e303d9f0f3564e8e93c9fd84fbf9bd260ee6e4c9ac152a629db0c05d5ce5d4329f270505d93f2500a9f1dc557f5cbde077ad0fb29bdca642c768266fbb592d27";
+  sha512.doc = "e45d66b9106427e6f025a73c9befdcd706b1a548ca8e444edfebbb34d97383c2611cdf8a5ac3a1b012c95c207600d9f6c59aa14217a97bbc729067fc502f1d25";
   hasRunfiles = true;
-  version = "5.2c";
+  version = "5.2d";
 };
 "csquotes-de" = {
   stripPrefix = 0;
-  sha512.run = "39850c16ecfbfa5d7fa9d1e2348f11d5b82e51c9eb1a14b573ae9d6252c6bab481e661e6df591d4c17457f96ce3bfacbc23c4f3b603eb8ad372ca416d9779f74";
-  sha512.doc = "63daab3c88b594f188cd5d30b4ceb11779e07e533ceed2e4c42a44958fe5de4245a992485d064b6e7ffeef698f407fcee63975c45fcf38f78420d1b0850ff2ee";
+  sha512.run = "ddd91563217653865199be4ca23199f1350e65a060d4b59553799b912e3402cc784344ba15e7a0cba469f116bdcf53cb2b73678d5615e18112605df0229a1c2a";
+  sha512.doc = "fe0be620f485719cd0522ac52147a1e8ff382d6be42089bf36f1545743927bb4826bea67305a5dbd39c4c9676ba168a77884071c6e473476c8098bb9ea022c42";
   version = "1.01";
 };
 "css-colors" = {
   stripPrefix = 0;
-  sha512.run = "361a8c4a0fd8d5ae3e0a740918aa1cf6b973198021da2e513ca120670dc367a2cd30b85ccf502c652e5013e3b6398a97beff3249042e5ffe2497b00134522eba";
-  sha512.doc = "f33fa08161ba23070fee9f404fe549feee59c8543dbfb7c92b68ce1a52ea2c066fbc3bfce521746072ec6ddea1378b30bbb94a0ca5861c15d4e888da250cbd1b";
+  sha512.run = "0f08d6b5c5c8ce9894869b0d0de1f8aa2cc54fc54122dd47e0f40f8504471e4b16d60a25ffc0dcd13fc49b39e59774c0c3e1f315190752c45fbb7a7456faf0d9";
+  sha512.doc = "fac801913bf12ddb569df8a5cf54dca87f0c75046cc5331c795832ec91982391f606000578a0af6b2c542e1a0e8b33a6f1f8f36ab9154150ccfe2aaeb9c198b7";
   hasRunfiles = true;
   version = "1.02";
 };
 "cstex" = {
   stripPrefix = 0;
-  sha512.run = "d6aebf1f01deb3f6ce45a7f48b5c4be817dc14685e94cce924c2030ec97fa574220908ca8ba1619fbbd6f9a3c779d004be30168bc81ed1b863ce62842a2c4a12";
-  sha512.doc = "85048d74d582b3d5b55cede0d2d9832ce600b09b37acec78fb758bf01d0005270d9ec35e51f75e22dd8036a3750031d8dbd85124095432dc15b33ce0ded27fab";
+  sha512.run = "7ee44254b6ac636cd71876a4673d5e6485b636e82c043c26bfe29d5f8f3bce8e67bb98783b2782de14e30e21f28efff47a7095ec03c3b6b629407887bde1a376";
+  sha512.doc = "ddc8b7e94e428cf909a66d61fe279ae55c15baf47b8e8f4525a8c1efaa510b434c054707e20c256d8ad5de8309842bd59dbf10baa8b88e82484afc9b616d6cd3";
 };
 "cstypo" = {
   stripPrefix = 0;
-  sha512.run = "35af745edd247fd5486f8c515973a6de5850fecb07f54892b1831f3f41ad67430b151f134e4210064c453eca5e9d4b3f2983a3c90242f2d6294be3e29e0378ba";
-  sha512.doc = "0af895b204bf739917cf2721011ebd9d12e1229f90c6be478a9574d0d64f26bbaae57800330bd3c994ee836d61584b6cfc8c886080fae5afc15ef15689806c2b";
+  sha512.run = "53832f712de55b05e1f2a5af7ada9b7d64743e202581a166b49ca01b2f0152d4fa3f546fcc399f33d0e44eef0869a1095eceb27ed098352dd91e047b29ae032c";
+  sha512.doc = "4d5f05d51386e80cb5ec170b35cb28780d89f0daa0c16a0cf333b6dbdea4763f9b546a3ed228db1123d078430d5ae1d01b9c402c43ee22f49f05675c91c18211";
   hasRunfiles = true;
   version = "0.03";
 };
 "csvsimple" = {
   stripPrefix = 0;
-  sha512.run = "63bda8038562a6d436ce34c45adb53c8405b0214494fe82070eef384e0dc0874831a4ecd4f623c66390934dafffa31c49f075ef6f02a6b9c402046957ddb6106";
-  sha512.doc = "e079fffb418151a7b7e98cabcffacfc0b1500feb289c6f2a5ce1d0c557f9322549252463dfbbb2f9331a9fefcefe78ad2ca0c43c25e8fdd387dda5f1e183a401";
+  sha512.run = "ce957cc019cc1abd92769f178872dceffeb473d936763391a3891e1d8d6fd2dc6206fad8437c25485f0b9818b9786f9d651c975a15c4503f67e5952270c76b11";
+  sha512.doc = "836904921bf4a851be3bbe10c38e85f11c65998524fd1e7749240d0db4d8a05bd349466fc511d7216a96c9a5c6fd22583b7f05b472230c9365842103eff1c33b";
   hasRunfiles = true;
   version = "1.20";
 };
 "ctable" = {
   stripPrefix = 0;
-  sha512.run = "53ead696f4c0cdf6c973daf3a4363962e6723dee8f24e743762d74c3716de48ff91aefff9b5f53df830b6db05be162089d047f1e335b5306803348b0dff3a280";
-  sha512.doc = "1331860b97e29f1fba814b18e35dc919b798a22fc10344838d24148d439565af0a70169d53343813c7bf28ffa2a77123078d0da7b16dfd826fa9fd5ab68fa914";
-  sha512.source = "9ecf33da977dcd173c8aa6d2c31ff0d1392fffd4abec3aff3aee4a94c937ce975c933c622116781db6433299acfbcfb927cfb99a7e22988e7612a75676ebd129";
+  sha512.run = "68d546dc4110f9cf1ab53f698129b68bd0476094c785e1dcb6d5b442e47f87f0678c4fb678fe71f1fd8dcfa6814929be9cefb242a4c15e842c40450680e87d32";
+  sha512.doc = "f72c1c085c7860e1b45d489d977ae0663566840abc08b3370b75877d9dcd8f8a8fd2731074631fee8a77f6202f422fded6814254c636418f6f7724c80fbd6b51";
+  sha512.source = "8b77af670e6c694a57b98ef518b3c6d9747a85e56884f2f4386120a704745b965b8fdd2c62ddaf5e9f846056010533f743e2fb61104cbad99698c64b097f885e";
   hasRunfiles = true;
   version = "1.31";
 };
 "ctablestack" = {
   stripPrefix = 0;
-  sha512.run = "ff3674ac057bbf799e834be4fb7998a7c0d53e977cb6f826dcd5d1300a0d9077d8c0182a58a3445aa0a0b6107b64c33122d3937af3476d939fe5ad6d0ebfdee6";
-  sha512.doc = "d8108bba26a458bab45483c95749fdfd7c49f99b102f4b439753c3b5c1c562b2b162a0138f46e9895cea32fd1a55c344c2e43cc95fde59902b9c53113dd5a9d7";
-  sha512.source = "2b2e1c7360f59332fecc5148a78709efc4c20a6fbf20ecc40e0a3413409d3b15443363b0fee7716f2741977fd9411e1b4dbd14f64147d3b1c1de92439ced6555";
+  sha512.run = "dfb5fd4e62c04311bf41c17d06395f5693c0232840bead53a41cf0898ba2704da68d6caf4cbe796fb728f189a57072f36433a51edc0fd9d1013a70f4906797ae";
+  sha512.doc = "d27e0392ffb1a4daf718ec780540d22b7f3ed3dc6e488f37583ef9fc06697309f7abd93e55832c50cc50e87a950dcc9cd602e0270d4b9fde9db6cbed59cf131c";
+  sha512.source = "083b381a0dc2b83dff0e71f475fa35dd60e9e62106a75c3537381e6b25c41155cdabfd6f5a07da1ad9d58f34d33052f24e212421b11e377c309c261454072e7b";
   hasRunfiles = true;
   version = "1.0";
 };
 "ctan-o-mat" = {
-  sha512.run = "8ef55a20fc8147186b0989f043fc40859ab7c401f31392eabe8847701d656ad089be8c30f6fd24a457c846e179dfc357b83e677ae27a60d0a1f481bad647c793";
-  sha512.doc = "82ce8a33c9c1d8c07807c5b9f60978a3f510e6e03a8ec51c80f122a77fe1146c65f14440dddfed0099660d6d6dddc8d64321ccafd3db37608ed17ef84083f5ae";
-  sha512.source = "b331f2c56fdccf044feae7ed8402f5234141d7d29b1ed8046db19b320e6250bd82dfaf880e9c1c575a90ee3033d0876cf9545e32bd13537309c06b548f241ad2";
+  sha512.run = "523d9ed02465ad0e6d0a3dd08c2b12369b37cab406182cd8ec6da1ccc0fc588c0642661135f34fc82844ae9310bfca6e6be4ab9e7aa22dfeb44937b02cbd5ca9";
+  sha512.doc = "75f5fabc5c932d9de95512e096018ed84ffe5ce5374d7e413d30248a740c09ce0d53057538b5b52c48c941c2f96ccf74900f85330ca9c4cea84552e48544b56d";
   hasRunfiles = true;
   version = "1.2";
 };
 "ctan_chk" = {
   stripPrefix = 0;
-  sha512.run = "0c829406eae0fea071f44f3c1cbd21f3a52a7f93585564e8bbc876e8eb4cf8a4444c703110fbf4e7a7ed1bc569c67e411192118cdf4ffc5de993945b5a5fec73";
-  sha512.doc = "cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a";
+  sha512.run = "1e0b0ba38e401b786df8363e43571d4cf2383e3dbae2bbedb9085cb25c0d243743eb552086962711708d0632089556fa3327a3a32713073d088b5b3550bce112";
+  sha512.doc = "8c057c6486a2be21303aeb20a3640abe40eab2cc1826ef07a74ff838a98f7ae344aebebd013d1c4e3c773566f49f5b497fb1c51091ce39c6d96a5fc5fa42b708";
   version = "1.0";
 };
+"ctanbib" = {
+  sha512.run = "55bf990800244a2079140116bc6419571924136fd961b12fc0a38afbb7f824ac2f7310709365ad3550b485ad6d9c1316868e11da168c42c005b33a9e5c1d66aa";
+  sha512.doc = "5a46317043f84ef542cc3436a593b96306d08c5acd1a76d58a14cfc6706da4f759c39657c50bb2255445c6a0640415cd190f52eb3487d48ffb970fc4c375fdfc";
+  hasRunfiles = true;
+  version = "0.1a";
+};
 "ctanify" = {
-  sha512.run = "335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c";
-  sha512.doc = "c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e";
+  sha512.run = "230dcd3c26b6954fae10baf251ba3ead846ae30a48128ba85bc7271c2390803d51c5b483d87066095932bbc047dc0ce634d550a7edfffd87f910e71dae243048";
+  sha512.doc = "424519cce6baa1a25158a833bcf0a4364faafeb1d7ff359c1a4bad62900d81bca7502da0535bf8251ac91afe4bfe4e70433bec2fb9fe010e6667fe2f2198cd22";
   hasRunfiles = true;
   version = "1.9.1";
 };
 "ctanupload" = {
-  sha512.run = "c184bedd92205e1d44449f26a926c6dcdc23a538328cee06fd623ed8c8c5bdbad890d31644446d7b6ce70daa7b47610324c210f88ee21ed2a8a78b4db89c1ee8";
-  sha512.doc = "29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e";
+  sha512.run = "e13e3ac1d9c2bb6fdb28396c466ccbd81547742d17d2ab328edb471cffeeba20b245cafa020f68e71b9e7052cd4c2fbbdf3f7c4bc97b96400d6ca667975ba08b";
+  sha512.doc = "e816b2f6d19165f46f0445e88ad4076a1956f23391ec0e24091e99e42ea579c9811b16bb93584d76839962fb24b70ec91f521531bf48fe156b57358f75f68f05";
   hasRunfiles = true;
   version = "1.2c";
 };
 "ctex" = {
   stripPrefix = 0;
   deps."ttfutils" = tl."ttfutils";
-  sha512.run = "a1715c0ac917ed81567719db54b55a9784f92ddaba7f93b6ad83a1d9b2f6b8d6d3c7ea4bf7c300445c9f001f731feb34228faea23bdee145e2ae618460ac12ab";
-  sha512.doc = "87aea18b08a27d729771e7ec6700865095d2819cf60696021fbac96e1a22aeb125ab6fa69b8475e5d2d7fc46cd786ca75a077fccce9c4ecb5c9a13ba2655930d";
-  sha512.source = "30ec2c36c01e0a717d520cbbe9162f4bdf37d5aacd18f8abed2a856d149807bb102aa55768592a7a722040ba5bd9975ba2949438e0bc01790a23d3cf51646da2";
+  sha512.run = "f43172725420d70bfe4fe755a804e5e6a7c24a0e93ca9d279c7652d30b45b0119b90aab8bd4d36cd951c7931d43b1c5eb931c54e9f0313fd5d2d76e6a3fae943";
+  sha512.doc = "0ab5ab1050b0f35884d344fffd7f141222a2fd3d280ac5f364b5cd9f25dc1c9486d2aa46236436d4987f862e62046283d9c28340968f08b0fe856e6b46199685";
+  sha512.source = "19ada9191335508317642b810be88b9b7d10e9e7c7688c35893e8e60bd6641b08972d0dd6a1e9aecdb5fa972f83efbd44b042103573040e7546724b72bdc42f2";
   hasRunfiles = true;
-  version = "2.4.12";
+  version = "2.4.14";
 };
 "ctex-faq" = {
   stripPrefix = 0;
-  sha512.run = "5f5f63a2b501ad91887fec0ae59a49723069fc3bb05313a16f871187377637b11e7d662e6cdc2ba85a1ba4e998389eef992d586172320ec4a0f342cc6f96a6de";
-  sha512.doc = "924891a40e39692107d750b6b8c26c61a0a6eddbf5c60d993609a9223578d482286819f997df5f00e41e8bb71464d727b84f3de17b9247b0275b7216bcc1ed1e";
+  sha512.run = "d2188e89e483e8f635b0816dcf58710a5b68cdd443fe1f95c393d0a0916fc57dd3e18d546b72b89e238206da4e6bb23e02326bd4a3b4d7323b205a266bc26e34";
+  sha512.doc = "5efd1283b708acf4a96cd9862cf8864f7b52b2834dc631b0a5280013dceef5f53e37c89684497c0991e82792e4382366ba11b9f2748d38652731af3d8fb7d17f";
 };
 "ctib" = {
   stripPrefix = 0;
-  sha512.run = "2ab602d22ec489fd3b64b3ec34d5d0bebc6c5dbb0c3736d03abe5dbca9bbcd4d64323c5478043459a79a1b85277cec74d11f1acbe8e3464662998a2c36fe5900";
-  sha512.doc = "162d27a328f68009b184de6ad41c5e3062d0f72c346c2215d413da02d5089d8ee3966a1db4abbbdbf8d370f143f83528b93750549ff4b7aaaf4cf7c396b630ff";
-  sha512.source = "6cac2f9492afec0d071acd0473df9429354cd27a2e00f35648ff0b10b2600ba34499a9190c97b5c98a190561efb6f8e4ed5ca52e0d1fe87e536d9b083227e5a6";
+  sha512.run = "d8730c9dd420f6d872e900c479b47c3f6f417741fd75b4db6446d47518d340a0b1025c337ad1181bad9f5922b959becdce0ab5d7f0309f84d7416681a96f0367";
+  sha512.doc = "bd3e34c536669045f2ba580e07cde4973a7f1b12527948300965b22edb09857c122c4df62aadf2e2df45ce4232307abebd8116049948bc5823b4c498fcd16f8c";
+  sha512.source = "ab66b3585531627595f1ab3930180391bb94acc0581ca702f88bf64969a434648e3410d67098fbf2582e5440785fd545231bdb452af24d49c820c57c7ae4211f";
   hasRunfiles = true;
 };
 "ctie" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722";
-  sha512.doc = "3de5219cdd5d39ecaee2deee3849fd8f02c0b69ba7ba9597c87013b5fa3a659aeedd1e6a8cacb059b9be132567911df16b74b81a05b112c7a3b0c56f7a902f3e";
+  sha512.run = "4688a2328dadfda291d10d42c15f18927a77e9ce7e87a825b697447e889b0ec93d13ddb911a174e74356e3c8378ae26b34d3976f7b8f75b1d2478e9cfd9ad8e9";
+  sha512.doc = "41f7f3344a307bb72c61c88d4660c2037dcc0b4723a5c7a23fa2858e01cf0cd53f65ce76f16a21a871303f918dc4488c777d7129d892fa11c96186b88b484e59";
   version = "1.1";
 };
 "cuisine" = {
   stripPrefix = 0;
-  sha512.run = "c8ae30aa1138ac8ae01e1516f80e2b80556bb2edb1db4d9586380f6b16975730a849989babdf13b5b6fbe8c8b04cae7dd2c0f8dd3e2ec8b137ad6a730edd8a8d";
-  sha512.doc = "4abdc612833656fad8b207d07dd06a8e318c75b738cb23c39eca6fd597e6cc13b2d63d4653202c3c84b079bf22c66628b3d0e4cfd79e69302f690b3fed95e843";
-  sha512.source = "1d36cf1c2c9bfe599eb2ab6ef3205c2674c237d1c37c74ad254d08bbd450c6af096a589c7684fabcf6e29f98347da6c73444041321d2e84f379c6972418dfc37";
+  sha512.run = "8ea7a566630cb127ac23e7b492561bd7db08187020246a9860e5648c84621d7bbf3ecef93f45012ce21bae4b9fb60a57455910806687e2726293e6e43383f1c2";
+  sha512.doc = "92b3c57c14eca023a1383b5e18e578192361334cd0287087341be8fe06f5ba86e14bab96092d0949bdbf2c045eba87b4530928540df4c9544ef61b347cb5e52e";
+  sha512.source = "8d771982b36ff28d6f4a8b3580bb7424c10f6d29f8ce5623df9ea19550c45879c45075b9c4e1555d5d78696d3f7e84d617572127dbff1853552775110f5b6ee5";
   hasRunfiles = true;
   version = "0.7";
 };
 "currency" = {
   stripPrefix = 0;
-  sha512.run = "0f7cfecbfa5bed79b4ff4c5e2bdc04068695ace676426958f2acf868f2f5b1e8b4b36bbc87f99afd813a9d453984da67a78ba382b3dcf8bc04a023e6a449abe1";
-  sha512.doc = "42e141de1d8a601fede69fb5d2fb9ca588de5988610eee82b6f10a48be808125fad635785edd4adb458abf904621867a6a3bc786be9c223eca5d379da08e2a04";
-  sha512.source = "be45957b0bd66b1b0f23a22c2750abe18f33e1be4f987229effee7b084c60841cc5158509b05ceb502041368ed901e4e2f138c1f728ba11136aaee8a88441613";
+  sha512.run = "d5b3633ffbb95457211e0073df7b183fb44794dccc90fe8c2ba84fa709b69c828672a5d6ada658860e637c04f69d3a48c1a4f474edfaa6dc50903274d81d38bf";
+  sha512.doc = "2f136b516cb41c4038ad29ae14d69351c20fa8bc7e5b969e9914f9cffac93bc70f164366f23dfdd2a76b1ff1d586be4697fd2850b475d8e1bf0aa64526121580";
+  sha512.source = "1d4cc25e6488224932024e18e3dd77dafe30a173d2d63933ef4c11b672814a6ea592b68d50cff7837231e084a32f651a38f6daaa8d5fc2295d9691b83e47c0f2";
   hasRunfiles = true;
   version = "0.1";
 };
 "currfile" = {
   stripPrefix = 0;
-  sha512.run = "ae4ef32a6bbf9e40577fb1a906e64b72ac03296cbdcfa31ab79c0a63e3c952d9c2a2429f160f4225d04550be2ececadd6e48a0e8d1b9b5a5663d2d8009403b3e";
-  sha512.doc = "b73a07e9a56f0aff7a2fe819ea3fbbe1a57f11adaf7f389b2c16646569887a8e285085e2d93d0ec947afe2a2c648413814ef3e30b194839f3dd320d4dca37100";
-  sha512.source = "2c0ebe861a85dfa2d7a5790b4682e93a50ad7fea36622f093614895b935555cec81fd03ebd9ccfd086ab2e18c952aa01217f700ff2a9253196be8cfc385f56d3";
+  sha512.run = "7903adb1697ead3a125f89e3dbf1e47880bcc2a7b93c8535d3b5775e9991ca948dee0f7d89db5183dff2b530f698ee9819997408634c9aa02e5664d393ccfa2f";
+  sha512.doc = "85cb2be7beb669a0af3e42e156aa2fb478cd509bd1e7575d6fc14a612e08b4320f470eb3d389192d1e5ef079b66be37bea01c7894a3862e13884eaac8d2aa988";
+  sha512.source = "813dd79d01c0d8e8c508fa6b96cbc6a473ccd0437f8fdc207b5b3e42ce6fd5431f7eec7e101f46313defeea18117f5d15e715e7f8a0017e6f93110731f45e49f";
   hasRunfiles = true;
   version = "0.7c";
 };
 "currvita" = {
   stripPrefix = 0;
-  sha512.run = "856eb75ae53569403b042a36854e02cc2db2c397fcc160069781ad6566fd20fb131cfa403358c48c9543429d490a1684b6c194f177a0c80b1d0e2dc0df453ec4";
-  sha512.doc = "da88767138655e3c67f0d85e0dade625ccba03089b3da083047d000b81e9db1ba46650f8f3268874c491b0fc50aed275d29d0fead48df7130038ea6ddf9ad39e";
-  sha512.source = "a7dbf5132c2ddf01c94e419efd8c4799ae222cbe2420724aa4b4950d6a7fc5ab47856a5d7c9899e4f046b20f71b40dee07399d8832f11e63c452c94fddfae0c6";
+  sha512.run = "8fe111e7013ecb0884f0b22451b44257633b1db37cd924817172f26fc28557854e6c544138b9dff7884e26c435f927360ab9529aef92871178d85e7941c51add";
+  sha512.doc = "ae12a321ac07888d2a52fb6bf69c7693fb39fe62c8b385852e9adabe1204e1c132229cd66e169c61d933b5816cb354a2ae16b0da4afe93e35e8aece37b87ba46";
+  sha512.source = "649379fc1650020408189dcd2478e1f5191e67003d7cf7cb090cc5ccefd2b70e61988b8973ade6b9797ceaa55fbe3fa7ce49100fd09d5025db8e88d0e11e6a42";
   hasRunfiles = true;
 };
 "cursolatex" = {
   stripPrefix = 0;
-  sha512.run = "cd97d9ffdaa2993deff19313e8b8c4419a96994254235f05ea77de6e8a2726a0b66eea2b40f3c15377721c57d015de0aa207cece6a6e19cb6bc27c7eab7b074c";
-  sha512.doc = "7a3284515caee6f4b8113f352d8191430230c92ea3a75197ea0b23884f7b6b76b6e177ca3e073cea65c48e819167ce48a4c1581eb428f0586d0559f06c158ecd";
+  sha512.run = "e7224fab9725b7f331aacca1057314342b517ea8940b17279d07115b5c70f7f04945aa88a4a242cf77edd4bb6699ad9f3ae07eb6b5bf03ea9d8f4e843c0f1448";
+  sha512.doc = "cc2310c92b7879f0bd4e4ed995a891ba4ca5da1b13e47e2f1f9b0ca847f7c054a08cc06a39f8da19640ec04a479e65b6328291ae1f3c2d2d9d49f04851b7c030";
 };
 "curve" = {
   stripPrefix = 0;
-  sha512.run = "21c4e53081b41ad1217c6593731fc455e42a2d30bcbfecbb40cf0ae764b153723e55e6e4ccdd2193db0e0d3653fcc633ed94834026d41e456ac6b0619c85c73c";
-  sha512.doc = "8488c35ef31576832779b6f1a0986f4490c6d15b2e6f79b41dde784e2d90dd384800e5e6298d0bc61ca66f279b59d1d66799a2e6a75b115e6bcd5d4438126305";
-  sha512.source = "246994b29a3a54fa46452f89f434b6c994875bf624dd8eaea2f9679b56761811a9fd38893bb96dcc19683cd4b26de94d059ab9c4f9d044441ebab2604243e6ae";
+  sha512.run = "cdbe36f957539445d400f5e7823405a93e863622a035a64eacca045bdcef864de5115fbf55bbc6e181537043e07ddb50e9f45a7f3e4eee091189d8b7e72ee5b5";
+  sha512.doc = "58c245ef4b78e7e3acd848ac945f7587e74c3a64505475fe5e8c4f8da15ef84ab34f6853467f6651d83c014c2e180229ac3383c444372506ce87e0393b84b887";
+  sha512.source = "6a351067a0e9a99534dc8eaf2ef1eaf7565b9b484adc2edc9126243afbbafd1110460437479dc9e5ea3fad9ac709160fa3f1dd503a4792f377222e36c3457c0c";
   hasRunfiles = true;
   version = "1.16";
 };
 "curve2e" = {
   stripPrefix = 0;
-  sha512.run = "6dad3e3d9d40437f1401b476e302d1159e3bde3aa229b96d3ea2183f1b2a2a5fbe8f3b71b149f455e8e7e3c6dfbfcd5816c4235cecb49c594f4d93784e92ffcc";
-  sha512.doc = "db5834335abb9ba26f02120297b89e5aa3de245f9073761ae69e02f32dae2d53ff127fc0e7abdc95977df14ed5e24ba7774972444da048cab8dc1a54f4355309";
-  sha512.source = "716674aeb101b29f8902d8f8a70c32f1c7f8fa6aab93ae402c7dee30ef625f9dc5e8ec6c03a10752a1c06640c447d0f9a02515263e2ccc6a2c9a4c11f6df7f34";
+  sha512.run = "a0cdd6af6da92e21f6a8b66ea98048c70416a96dcbb197407abd4b6e3086eeb47a79f48bba61ef186658267c02d9e3a00b6d1ecaa5252aea9cc9c3082dc5f209";
+  sha512.doc = "b7ad916208c423c5f3ecf95ebc334580b96a5b9cad7e9052d6629ce8e320fb2f7aa18cd5a68a810858315f948187ddf6469def5444966b9bda0d51bd3b392af7";
+  sha512.source = "663ba4b6ab31397355be8311fba12a4e4f674dce57ab6c35f63c9a435f3099258a2a82a9eaa5efc1058974e9b3fdc36360938ed09f5fa455ed80fd40c26fdcb1";
   hasRunfiles = true;
   version = "1.60";
 };
 "curves" = {
   stripPrefix = 0;
-  sha512.run = "bb64e6966c22876b086361b380d8e958f7a6c86cdc26468c859f437fff3c2e8f9a7a6aed38faf099190dd6d0f755259819cab28eb18c2355adbfca25f8646f49";
-  sha512.doc = "b87d5aabd633809c0fcd0a4837a9109f5593790a3b3d1729dbd381040e33fe08cffce3fac0dad7d373375a2796116501cc481e89f2653b0a255696925a388b48";
-  sha512.source = "b0cca720a4e6d92d5336453c5e39dc6777c219a2b6a9a00078d4df1102def42aa99933518ddfef56e3f880fe85c906c33ea92c5c6275ce7bedecb4f723a17b59";
+  sha512.run = "6383e102e3af8651207023c34ae0c56c92eab0d5ad8accf08892f277f916c88f9a193f624dc952d98b8958d887ca55816210362eea95dc70c707a7d6d1cc002a";
+  sha512.doc = "425049bb81ce1c06d6ac9a45f7665048e9e96de05378375675d8df95fc4e4c3dfacf668acf2d612237cb5ef41dc11b205dd025fccdbf434be0793d41ecbfe141";
+  sha512.source = "6804112c6c6314e8630fba7bc9d3b15a0853548eff5a11ae29cf8814db507e12c50469efeb9f98ddd2e465fe7b306a887e46d804ce665977ee0fb464dc4a88a7";
   hasRunfiles = true;
   version = "1.55";
 };
 "custom-bib" = {
   stripPrefix = 0;
-  sha512.run = "3863207fd766fba6626e1877c867f346d054cdc9db86d6ff7b808f1f9774217652d6b9cd01c03861a08b9f07abab27307c64d56df756935a5d1241ab0570fc8f";
-  sha512.doc = "6538152bb6e953970bc9109677ad24a34a28b92c44c39835fa23b5573197f6b5eb15928ebb95b229fd03b0d7c66134c4b59fd7a4e5ff6bd75c42091e496c68ef";
-  sha512.source = "54e62a503a1583b44b37ffa5b7520ea15c3224e93bab78befa955603ecce86dc273fd49000ea10b537070786421edebad8b6288c0adcb5cbd7ecbab9d3a0d90a";
+  sha512.run = "a4fc934668c7d5a0172756f87caf2c9ed6a86e5378887b87fcdf19e05fce49a139b4f199d5a78c8cf738a36d08408a267160f12d14e335d8b10c5549e7e542da";
+  sha512.doc = "49fb5ad74cb3cc29e57bf01c5da76389e7b8081c53ec680b0dd8b9ffa4baac06de1624ec77dd252980543eb2a7fb8e41d764e2531383d15e6f801b6fbf12d0aa";
+  sha512.source = "c3d28480cfb8c66420cb000a4586801c8189cc160e2a74ffd67e587517488a1dbbaf983835b4101ce6a31defd4f930610ba585e38ea78c63fce8c12a6c2ee07a";
   hasRunfiles = true;
   version = "4.33";
 };
 "cutwin" = {
   stripPrefix = 0;
-  sha512.run = "e11c3a4b2bbebc173e84dfd825352f33abc1fed99e168c26c70e83539a3bd9c1572c4bd1a016dc736586c0b3ee24c5fb0e9ff306b1cdfe5522339dcec981d35f";
-  sha512.doc = "c0f642cb90e6811d8175b96cd438709396cc7cc79c3ee0d9376b2b771e161bb15e7982dbe3678af9dd6ef638ebc7092c4eb45351c47d9ec6326fac74ed14b3d2";
-  sha512.source = "b1a8e88b6161eb599b5e037ed55a68a9d7f543059db711b2cc24be28fa2f3cb28fda784c953f0201495a79a44210da6c31c59db54f02bce2437d5e1b559f7b23";
+  sha512.run = "44091fd98c50809b63a0389affd03e3d270dc8345710f1def9d4430e19fb89289770d0f40ccc774e0226a9e9b5406e5fc3e1912ac82bb9ad29b1ed0e64f3c6d9";
+  sha512.doc = "c991c37f50b9180820024d3c8cf8c72af2eaada5b3a08605635f6f11cd104b1a17b3f3cee76c89801f9e1af1f84473e14c5c50cfd368edaf90c10d203a82f5b2";
+  sha512.source = "d60e3bc71d66065cb1bd0fb356b849a78bcf7bd5e10c0c4c1d27341bbf6ec69626a702bb314dae4096d1a168a9850b8d0c204be975a52299f861ffecf9ba28b9";
   hasRunfiles = true;
   version = "0.1";
 };
 "cv" = {
   stripPrefix = 0;
-  sha512.run = "2a29a91560450d67007a94b2c94561918da66c3f1107217ffae3ad9fbdb04533cd315692b5fe087ff1eda7cda2488ec153c9e3c5acb9cafccfaf386f718612ec";
-  sha512.doc = "c6672db7412b45bbe2e9ab0a72b6bbdf47e6f92d9992fab4b1f2b3088d46f40d956865b98e1b46d08e47f28a1bf8a6749e55f835c0d968950debd3a6e400ab25";
+  sha512.run = "8d4845e0ac5ae7b8c72cd83e46cb041763585d0d844e7dc920ca24bc31a4cca9e16af01e85ecc3aa0c89a467d18f05ef900f1a8ee710c8d12b19263503c8592e";
+  sha512.doc = "5431df2e85f4c89f33946ecef9712362f3207bfccd857b884b95d669a630b0675ecda08a0ecafe27620260590a092d67af4b44603a7c0f4426a73b9f8e754404";
   hasRunfiles = true;
 };
 "cv4tw" = {
   stripPrefix = 0;
-  sha512.run = "cd3a72f7c254e6b0a5d884a55cedc800bab38f151798dd22dd2fe77d78049927b496eaf90fc2337635f9918026fb1f696b2861f0272c6d967c5260ebe827ec79";
-  sha512.doc = "263cf61d5fc1562c97a63630c7ef5c27e5cc4df14b14b337b5a75802a8dfe8ecf970212645bf23648f3eb178c523aca7310b026597d9ca0d8fe326fbcc25e181";
+  sha512.run = "508e837ae533aa63d84f0be128a65351a261694480a159c318db8a5fa8bed33f4d7ceb770b10ef70d3aa0fddd326166d12177717085fa5bf2035ba2926686089";
+  sha512.doc = "46021029f976c9ad66eac16c33880af2d81b0d17edfd115294efab3ff273df4e9764915c5dc29f0919ac3a0f153ca04cf9f3bc0aaabfe7675260402ab95eeeb9";
   hasRunfiles = true;
   version = "0.2";
 };
 "cweb" = {
-  sha512.run = "49340ea70bd235f7d5d00d4087b0e90518ffeb83782993134823def6383f6e96d41d9ae6dfc5b85fe1fbfcf8f2944489dfd6167f3dc77bfcf0c5678c3356e617";
-  sha512.doc = "384e5bf9a9a07f6a64ab30b2ae2ded8edc8b821abb072a26fbd179b887acc11e6b99d0e2972327f15d8f70990104439745982609cdd73083982a5fc7eb1f5ae3";
+  sha512.run = "00f82ce1fa3d93d455f70d15376f70911cb37a3d2cf44a83b1b9ec3cecd1f19d9f90edf03be760835f43d5f4566ead3111de25c2b8210e56368038e20385d072";
+  sha512.doc = "f2436cb219a4ea887fbf2cd1c72a1ac25a46e5abbf5680a74517b3c8dfbc0a864832c981e7bc9d87ef0281ba81ce6d9611b8a52ae3b5b5ffb66d1b16fc44cb90";
   hasRunfiles = true;
   version = "3.64b";
 };
 "cweb-latex" = {
   stripPrefix = 0;
-  sha512.run = "6be3af317b410dd489f64e450a16a9ae4f543a1e2ba4d4b18f55455d973e4e3282f316e1f4d18171d1eab2d6928d21b3b6fd1d273adb13ea4924725ce8bf47df";
-  sha512.doc = "8f166b35282a6db5b0a3cb10855fe0f678d7a9d17d536a0a75b00ef65228b99a5635067355c165086e24dcaf42c5cb86f1d6be8aa4d3acf0e4e94bd559104e30";
+  sha512.run = "107d772799ca21900880b23f0f61c07165c0b3bc87be03403836ea8813a18734dc4c6015886bb70d63576176fba61ba9bfe11855865e8f5f2e347e8cc635e663";
+  sha512.doc = "7b2d93821a99b39cd43ae02f27c97b7f4ea02316376739955ae25da1b57c097d7170e828040feb01784003ef99e81215e5faeaed14ee72db16cfcd010c7a5ba6";
   hasRunfiles = true;
 };
 "cyber" = {
   stripPrefix = 0;
-  sha512.run = "bdf5640cb7bd4d74970feef86d8db861f02cdd841d3afd3f40a37e0a631b12ae7df1a9a126c5712340e6965f43c8055e20ee55f426a78f86c0221c6d2bf7bf23";
-  sha512.doc = "ed622e339da1cd07063e8e538e807e8bbac541387a16f315ec37fd3d0adbba7bf7ce5d76b137655abab3be75bb809bb55cec8a338ced4f433977bf2fe6ecb8ae";
-  sha512.source = "18dd66771bd756f468498cb365230aefb2a0e5662b54f76fb29439acea91a20d7b8bed6ccda9af2b82599cbaba54d2759078b023473345580c51e28548d1d5fa";
+  sha512.run = "83435c0ea24caafa9f72d6a6c33486d62b7da06b61bab5ce4e5a0ef5fb665cccc30f19fd59819fe5b393ba479ab9484b73db3659b1bf6b09a9cad102e5cd07c1";
+  sha512.doc = "a87b87ae6a7e58ed7f8043f856a0da5fa6261d17657955edce3ab18d4497295d0b7ba8612060527fc94eb9198221bed72792fbded1c3e95e64eeecc0432de230";
+  sha512.source = "f59893865ba9738cc8e343a1893dbbd224b6dafaf45d7e22612a9913e0cf0359a8f014335291bf12a2ebd5d7d763b96e1bf57b5c9b45fe4d5bc5b77df87ee8f8";
   hasRunfiles = true;
   version = "2.2";
 };
 "cybercic" = {
   stripPrefix = 0;
-  sha512.run = "c373bb5469813646c89eb06f5ab6f8ee9eafc056b877764615686faebde08c97694a39f26ec97ef4291e8695de72aa3548e156e4241ac3e10a56a61d0efa38c8";
-  sha512.doc = "8930d3f6a6955a36f9e48734db17fb13db5888f36d5df2eb91498e9195a86238f61e95c384d08272c19eb1d1933aac21d4b292281d629cacc40eb508cca8897d";
-  sha512.source = "3d5e45085a26677db22625df31e093affb2b0257f30ad362a2520fa0d5965c8420e0fcca52e0d60d12c24f47531a4221fe147c5de09faf7212308d2382f9df2f";
+  sha512.run = "ca5ce46f5921e8032a3c142e56db6b7f9ba26d7679f5333e8bc713d2b3d03ef9a79ab980fa1726e56a7a51d92e7e6654df0decf34f8196ba1ebb1071ce22f00e";
+  sha512.doc = "0c694194de516e11e50c20ad4c346de75e8cf996e42180aeabad225714dfe537ebd004e9726e56a5191a43cc93f3480fa1ccfc3882854ff7927cb36eac51628e";
+  sha512.source = "63a5780dbd05c0d6723b550591e41bf5cafec4b2474435e8ceebaf666610d8363e6beea6e02ce9bbe4c70ec5f3766d2309d7f99b53fd8e07edcb236891f416b9";
   hasRunfiles = true;
   version = "2.1";
 };
 "cyklop" = {
   stripPrefix = 0;
-  sha512.run = "8177c59f18be50c5e874f2991f913a357ed0f3423e5d1991be1db47898bcf4c885f9817978f640dca5967f560c6ae6f64a22f4b2bff0cb5b7874cacc27a2b319";
-  sha512.doc = "232c42b6a2b8f23e86beff9d31cd0b555323d2ebd1cd4066676638758246b55e79be4e86f2280d248e7b330586065b6618990375aba343a24cd6495ccae6620e";
+  sha512.run = "706c1fe6411a4cb44e20d2a03f19cf3e8964e8a58ee8a33ae544ee9582fc29a4a492a79b33933f75ea83ea699b6c4a7498be572079d912882f5af89062ab7d4c";
+  sha512.doc = "6922d69489f8c7bb7f022746a128a9b54527b38bb9cc70797752bcc68295d060e7612f2ae66fea375deaedeeee4fef394ca9b53a78670a3c857a8137305e8758";
   hasRunfiles = true;
   version = "0.915";
 };
 "cyrillic" = {
   stripPrefix = 0;
   deps."cyrillic-bin" = tl."cyrillic-bin";
-  sha512.run = "93a50b0b90a331d966f8b5ab2fd413427dfcff3580bc66a9b440156a41bf90f07287f6e57a3bcf12ee9b17fd7399a2b829ac3ff81aa808a5a94cc7753a0aeffc";
-  sha512.doc = "3955c5fa943c23e7113002f714a33d1f6d769eb1a7396c4c5b463d543d589e0f8b0094dee282cfbaf5dea91f7894a431824b9f60270f9f154ba9e3d552a9d581";
-  sha512.source = "e6773e5a268e6b50b2b0cdfdacafbbadef1193f277de6a579f7624ccf4b23753819357d1b4b07cf8eb4b288ccc4d15177c58f603a1456979f08ad5bc87fb5653";
+  sha512.run = "94e0619912878579b58758cb5b5f53d3c08b562c9146bc298a1f130910c78ce3b2eed1558a146340b221289751955e62e8ad5760cc57aea20aecced10c60310b";
+  sha512.doc = "253df9b5b0e3338bb20276b56127c19e2af654a34a358c3601f7ce79e5837aabaadd559d8de065d7a6c2e43487e842c2eae6dd8e62bf3d0d37220604f396cc20";
+  sha512.source = "9242dcbefbd21221cba7092bdd2b41b9bdc5f1bddc5e03ecb10c78ad9fa963f13464864793e063d96059474bc81b918809d3e2515b8258f566c0b7398385dda2";
   hasRunfiles = true;
 };
 "cyrillic-bin" = {
-  sha512.run = "f2ee8146ae804ef798986a5bed1aa006f3df56eb256a220f399a2e83375fdd6a39ec24c3ff221d824bb70e2fe0f9e0ea96d20c397f9df475acee0407c1548492";
-  sha512.doc = "b65e036f9fe1f778437ba23d19b58787baa8a9fbf2557e868bebed376b56ea442774608e4b6f3f70e7a9405890681b668f27f58df1987ee514fe0e2889e597f7";
+  sha512.run = "5714f2600dce71b773e1d488e7bae4c79cd30c0ecfa3f96d08c1dc1bd3e16a3ce437a1b4cc64e878388e63eee283fa73e3b327daa7ea001f326ce0b932a54187";
+  sha512.doc = "0a1be40b054f1bc6b696fae24d7790480335128bf4faabe26d9468701ed830235b0ff730742407d8c53c9afcefec98d3c850ad98b4f9709f45b88cb39ac48543";
   hasRunfiles = true;
 };
 "cyrplain" = {
   stripPrefix = 0;
-  sha512.run = "e2b525167bf94f671dcd12849b64d13388c0e8874c429d312937cf1d5f2181059613f1729ff41fc2f6122894e4ca63a5f996bcfb1177b20a795a440cdbe259ea";
+  sha512.run = "8cb0d1f40df357b42053638bb7e195bcc1c661aeeba97d9295fe92bee53809290370ab5cfd2a606912e802c0acad27770e24e6212e98f2c0aa69f78a35485b2e";
   hasRunfiles = true;
 };
 "dad" = {
   stripPrefix = 0;
-  sha512.run = "6c7f9be5098d3d37ac8f090058da1337a2f293746f2443f1e64d688d8f94224e20474e886e8023c08e0fd9d94b5893db6d045c1ec3cf0a986864c54237317e82";
-  sha512.doc = "35ded74ff43c5c767aa3a2d22594a468dba49debb0403584dcecff75134962ee109b699bdc18859e60ab2dc3e5d9e3a1d36b610906a8f6ebfe7274c7a4c217b5";
+  sha512.run = "5374f2d2760ed69d96fb3e609c55e460a187fe905141ca70dcd3fa3c606c5a3ec0375519cd4ef5c982e6411409b5c825981a546bb971c705dd2bdea58850ff93";
+  sha512.doc = "87fbc52cf71155e31332cc98069b63b9f833fe32477ea0870a469725ad7620405f1624574b673efe6fdcc91413ac19636b2bf3d9c2c3f55accd5aca45bfe5535";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "dancers" = {
   stripPrefix = 0;
-  sha512.run = "f1c7ea0b1f0998d10bf55803d4424c758717424e8d8cb234b790eee9673469c572acad51989f81705fe14eb2283dfdd243817480b95758da11e5cac90bfde281";
+  sha512.run = "6af1b6466c248a3b5d58ee17f3d46b79f22dce00b0df307620f4590cf8d4f2a9811238e8ce341e314d64b460afd47e19ea81fa8d9f02114bd42c50d742a9736e";
   hasRunfiles = true;
 };
 "dantelogo" = {
   stripPrefix = 0;
-  sha512.run = "b567775dd2d6fb1744baddc5ccd55b257d062ace89753e37aac8e615dc8d50169789dc32978eadbb16fabc6b04e2ae934e2e9eb86695ce14d092cae0d166c2d1";
-  sha512.doc = "ddd0d1c68fd44af3fd8989afc630897f020312e5d453080b4a2f4fac4f00bf2a38ebeb27a34a212de5367321b0fe2b7e008898734fc213830130b466d4df964f";
+  sha512.run = "77c33cc1a6d801151e87b546c8ae28590bf9d454df89acca76cfc178dca86e2522eb990ed34e2aa9c4458ea2ba41b86d7b7ff637ed607cf8c19394b517922a2f";
+  sha512.doc = "cab3eea8565ce30179bcfc0155446b8881f70ccf6146121be2e112d7cc14f0f460965755a199de6f41893ddf2e6ad6919272509e04cea5c067b49114090efb7d";
   hasRunfiles = true;
   version = "0.03";
 };
 "dashbox" = {
   stripPrefix = 0;
-  sha512.run = "2decae138dc05e1e0645cbaf0e55a4d4499838a9e813622d9684c2809f7904177c80c02095d4e5b63841aeaf2b3ffb9b2c53016df1bcd3e2e9f4aaa1fa617c1c";
-  sha512.doc = "7c32ba500ef6d0557bdfb407fe0c3e808736de144e09c3cb9fee3c844cd455a3f4865d26a92e3a54e7d1d9659fa0b76d8cf6583747bfd382a23fbb182e2d9e9b";
-  sha512.source = "9a3e8c31972d926300152d6a8a9066dd394376c5f325ecacdf425c08264d2788abe923487224e342b29c56e6e4936baa3219bfca37412ee21a2f5508e6ee5f0c";
+  sha512.run = "4f08cb7021670c31533566f76bc3d14465240bc6668273a3dc73218983b01b0730de2ef9094094e5682cb57d8232db4523e867611086494c810b0f1f7f3be8d8";
+  sha512.doc = "79099859352d6120f8f0ee23c1ae6d40f3cda6bca259334dd593a2b967e84effe97cadf56027fb0dd3b94d76f6808656d2ddb7d247d5a02a89b56fa7ea8c1a6e";
+  sha512.source = "863cd0ec2c1b1086913889615ae3674948cd9fd9a1c6cf677ae962ab7eb3f3c15bda15423ac8ce23c8d6b034b92b51c073e8870cb2a499bbe77589c9c14ede30";
   hasRunfiles = true;
   version = "1.14";
 };
 "dashrule" = {
   stripPrefix = 0;
-  sha512.run = "7bef0b549d51a7b2b456f197d2e04f7452db3cc77321b6d9e21c5a95e09e1e4ebe0d7c59589f9393c032fab7fbee361fa34f004c0cdd2b3978eabf95e21d57c8";
-  sha512.doc = "297be637b066f197fc64ac9518416b6de4a24a2d527a89f40aa71512061d17d1931ac35c97574dbcb1c1b9316ab82946f0e4f16f7b06f5d4e1aef2d3af9b3a2a";
-  sha512.source = "a5cb470fb709bbb0aee3a122ea0f3230eb12a6c7a916ec7a0518980737e7fcad1272e0ea52146b486b62a795df25a03a6c0bf7be12395dbd8992c658538fa7e9";
+  sha512.run = "3ecfe13b8901f8c41af79b94b2382a2423605f454230e78b86521844574e51eb6fd961083f908c9913f36f5f4a7258b856786aad1995bc418d1409cd33fba1e9";
+  sha512.doc = "123a92f8ae45087e3b6a560435c8d07c1914df7e5cc681f93157e8367c3c251393c795bb6a0123b0212b6322da807937137a591e906ebb23c5baf03dc73b3967";
+  sha512.source = "786ebf42bb524fd13b1fdeb0144eb8695453e7ddd3d83a500846e309edddd24491efc0b3e1368987e24b770c4ade54dd1df62e5445558d1b35000dde2fcb4c05";
   hasRunfiles = true;
   version = "1.3";
 };
 "dashundergaps" = {
   stripPrefix = 0;
-  sha512.run = "b0dbc922ee1270d3b516d1b474ecc9f1da9eeb62e21db2bb011f72bacbea220f22b0d8861972bb2e4a2fc3d797f47e2b1d95cad1cac231881cf5bbe2975e3d84";
-  sha512.doc = "7489fbf16f0c1bb8f712794de459fdf71a7f3fbdfc621f1ae406da3e1fda725a365c053be5b23a0ace04571812f32f8c4297dda94badb22edf5e898596d7e677";
+  sha512.run = "17aa5eb2bebf283d54dffcb1222627a2f32b18b0f9246b0be222ab6ff8207130f692c16b53ec0cf99271913589ed469c623f0b464dc2b18d9b9276253ce74931";
+  sha512.doc = "5b9b03455673a9e00b7b383e5e02d7671fe0f417d2730bbf2982dce286837710af12147613d1dd614262b010e6a83398bdf42cc6673a56b763c8a5a435110fde";
+  sha512.source = "c31013e13f046368964cb329f2b34bb96428c02dbf67d77793493dc53ab2bbb5b6a2a568c24068fda5b03b0897abe7fefc2313591cdae33ff748ec23951a1e31";
   hasRunfiles = true;
-  version = "1.2";
+  version = "2.0a";
 };
 "dataref" = {
   stripPrefix = 0;
-  sha512.run = "313b1e070c73945c25bdfb52a6e43224e9bc5bee44a734c4b7cad96044ba023df828ee076e814813126c01dd4599978dec9a04d276c661e8b3842ddf5d82be2e";
-  sha512.doc = "89b98cc741ec8dec166a65011040c0a0705895237792f3c6598e2b16685bd5426a1a818edd0fe1de9d6c374c0411ca4e5d206a670624d83b3179b27955eed7b9";
+  sha512.run = "11b6007a72e7439eed6f9e4d75b544b3b68ae7173504abf84ee5d0ebc559acd9a4ea88980b345cc1342cb6867cfdabb8b21f9be7515f4e743b76ada08cc1c90c";
+  sha512.doc = "fc9a3144519306af357f3e07f61a92a86133820f241d9dd6c4b1e5a4cd8c75ca20ac3c62d2eeff47f3adcb2b8b6c83d9d394574c9e6979f7f7dcdaab9ef6f18d";
   hasRunfiles = true;
   version = "0.6";
 };
 "datatool" = {
   stripPrefix = 0;
-  sha512.run = "dbb450b59e5cdb8f4fb84d443bd1cc41e5358f3eca2b59d5387ced2530069fdf961ed39a8c229c84e87cf6a3b1092a9f1dc3f36d905c7835e8d532116a623955";
-  sha512.doc = "c430a7a08a45de6e9316c59355223ff2f52f43cac9aa5994bcc69c9e6b518ffb0e42e577d86340954bd7e48c851f5d4d4547d9b83ba239482f9b7eb3f3951da5";
-  sha512.source = "0ad9d81090a8637220c15836acd4efc826305581488d7dd9d06cff25a1714b8651ec7fe09631b9cf5160942eea2601125799d5569dbbae7b52299bf8d289c932";
+  sha512.run = "7b695bf9e897d675803cf9f81a6f7869d437c44724690f159dbed088df7472d7ca5162c51096d1e38102aead100af86ff33f754fc7fba617c72d59602dfdd86f";
+  sha512.doc = "277f8e70f6fd6214058ff69c7b938672c8867ec1d7789f8e06004b8390fae8c1f2e9010bde950c2317e41dafe2e38b8fd1ddd80e611dac1cffa73398f31ead07";
+  sha512.source = "99d2387fc57d34e8e96bd553d088273e9ca520c9d16f4527e245f684192738e0b21fffbc3200ac99ef6343cf9f4430f04f74f2548d45ef23304d221173cfe9c2";
   hasRunfiles = true;
-  version = "2.29";
+  version = "2.30";
 };
 "dateiliste" = {
   stripPrefix = 0;
-  sha512.run = "df4d85978336efe41b8d472ae53ccc2ebef04d6bf1d39f33904a855991f21f87e858fb78248856fbe144dab4f4aa07ed2277107fd91248f2d154c5de7e312a56";
-  sha512.doc = "802315f47f814a954a312cc4f82e235839330ea6fc9899a81f5ce58f04deda1c6f42e1531018057b2d92f58a6e12607b79909cd6afe4f7b3c884c50d625ad400";
-  sha512.source = "e459a88d273c9b663d2b9e58ef7f5fd64eaf596f64110815a4482f1ac7644a876e7c9e6f6102eba3ff2479880a7c96fcc464a09d3ea32545ff52193e833e705e";
+  sha512.run = "c19103173ee9aca8a24e120554c4af4ea658db903b6099833789a17c85a8f05d543242737d4cf402f104e3a02a4e06fd7429a08c4c90ee9ba6361956a5fb6235";
+  sha512.doc = "2b4e3dd0cae8538082a4371d444e00f6e49bc2f007b28fca39b01af504df0a066db432d660f16d80de5c148ff48a69eb09226dc8899f43897b593b37c7250500";
+  sha512.source = "5f3ff3392df637bd785ae3c52644c634b3c7221296ce670b934488f13ad141e6d0dfb73bbceff7d6a042a429fed0700582343baa9882705ae0aea803ac2c1106";
   hasRunfiles = true;
   version = "0.6";
 };
 "datenumber" = {
   stripPrefix = 0;
-  sha512.run = "1daf5c9c18dc0fe7828ebcba661242cc73050a2e9296ab1ae5d2a1815e2faecc86684d32b5b5e1bf54f09457ea39bd71c792e6936fbca8a7b51c77c1c7d21ee0";
-  sha512.doc = "d597aebd037517a55cc36cbb7c48f7ffd58dbfe46dab72ead5fa4bfb64ec14411c4691fb3eac89edf38e0266f943e483537fba044beec95a084dd6d2aa135b48";
-  sha512.source = "0abdb643668d43f06d3056afd9a0a2e2fc7bab46948800cc9db0cab7ef7236d7ac8137498eba4a95335eb0182651548765643584681c0cd716bb1077e7c34abb";
+  sha512.run = "dc708ef113c196cbb38748f412840a35c0d44d1872fccdbeeb5e6614c466b61b4ff78bbd1606301c94aafd0af3527e77f2ba44951f021724ce517e0a8623afe2";
+  sha512.doc = "f974cbb2902dd51c69cd6242b885cdf325fee46f8ed495ef352794149b995c51e8bbd74b4bec49e5aeccf1ad61d9583590680cf1fea8d43116fd689a7b490cff";
+  sha512.source = "310363eefcdca22b23c0f411ce098015d9f51d7cddeed3ff195bcbc31ada79cceddf6383a090c7c0be10d325d4236abc6cf63b0d2937adb6bbf6a29ab7f97347";
   hasRunfiles = true;
   version = "0.02";
 };
 "datetime" = {
   stripPrefix = 0;
-  sha512.run = "5a8f2fca255529d2f292166cfb1329a503bf6a0fca104653cdafb7b538990b6bee5eee7aaed02d0e2307bf008e8e8dfa5e4f617869d76218a4b3e05d502f0545";
-  sha512.doc = "ed9db84eaaeba326c20bdc7344541fc8c1fa62e01b9b7ff9c2735e4a8ccc5dd1e4ad2175966a1031f192645600266df62f175d1a74ba1723225673abeef21e12";
-  sha512.source = "f8e42a4719a9098b00bb6d83e3998b17a14f6c4284230dc8d6ae4625db9adaba3e9914df41acd948407b1465cf9f21f5b8459e985b5ed535360f57b0598da591";
+  sha512.run = "513e226c6676aac8d1a6f5425375b66c62ddc2a77714684e458a13fb641b684910c1e8c3218044140640d957be6bdf215bc2dd44a82259a4a349c8887a0746e3";
+  sha512.doc = "0b5543c957cad8c898c6aca6e991b5aa0e7a90a64d03e4eb92f297c9b8df4ecd9391507c75321347b7eb446bfe615943e61948d7660ee6bbe2eb22fa3bfa0d70";
+  sha512.source = "a0e2021c402a8832ec56f5105443118a26a2b578efa11d1bd4e4824be1b2fe148856f601103177f04cab880894e4f2e56c90f93eea3ce93bf308faea16d55cc3";
   hasRunfiles = true;
   version = "2.60";
 };
 "datetime2" = {
   stripPrefix = 0;
-  sha512.run = "de6e72f2f3e733d638b2e825319061b723653266b269f88c82d0c6ec18f9d1995a87a2899c13e5f46349e21f42ee743b6dcc4df8a30d9e8faf29315d404f44f8";
-  sha512.doc = "b4d5b90b0ad42e8695f6fe54da98dc597f0b2a94711f736e4bd1a3a834b2fb979a703b6a54d1ad0118e1fa6b77a9c835c7e096fa7a7b398467d928ae2906632d";
-  sha512.source = "39ae2f164b9f117822bb3314bc060c3c55485b270ff9e567849f07911b207ecf76a59e051fce48e32ce1dc25319ff25b79db0af9c0f14c6ccb40fd34f633e50d";
+  sha512.run = "b8d8276ba1a596b77c122540926e86b59968f0f54fa9e4897433c1f0607c229ded01d7672c7b95869c128ea2fbb7e113f6a8c63c0781449fcb152d397a92238c";
+  sha512.doc = "5aa78c82711c91fb4203a5f37f2ec2bc75d9848674185d4bc265092c5b6695024d54e796cc038baaeef615deec4a9ff2e01f5c4baa186dd90264cfe438a7b31c";
+  sha512.source = "29e241773af4e71a960433017206d051fabb9b3af4a25b17ae4e3b9fa9f47017d0d73fcaedb08d4629b7935a20f27a579c540f9adf45993a352e182a005e5f6e";
   hasRunfiles = true;
-  version = "1.5.2";
+  version = "1.5.3";
 };
 "datetime2-bahasai" = {
   stripPrefix = 0;
-  sha512.run = "22d3bffd80f2cab05dfe4bcfb53bfe7e40412d101981d184e864b892fc5670c8713859f11690e2fb14b6c1e228318f1c1e671b60f1f6e06e6f7bbbd43a723cc0";
-  sha512.doc = "b56a2a3c50a984f4061f71f084fdd1cf745c116c5c0129bae0562da208f55c1ad039ea4b246be9361e6e0d15b317041b8987c0d1e111b99ef76b4c83d9b3a666";
-  sha512.source = "733d45d79331674eb974066c53ed0727271f9d7022353fc3c5feeb3a6f5518063f557b05f6e27310836ecbc39468f932d9870c33a5f3030fd28d1d6ccc4af7b7";
+  sha512.run = "25838a4c25fa54c1b5daeb02cca8af8de1a33561b7a5f6a0bc4b662675e0382a9b4a877104a72af1518b46b0986e988ea5cb48cd82300d68546abce5304718c1";
+  sha512.doc = "038d22520afda5faad39c74b94f26004def5d72e06c451772b2d31cc90cb561866d70e98e1866950c0b8111f166a931532feb696bd3ae9a63a541bd582f4b26e";
+  sha512.source = "e1db98c267e207b7046d9219a0224f4ebb762308994648ce5cf7c58d62ae99c96faa496b423518087b6a706632b4d6e03e77e572fbac81bbf5f7e7a17f8a31bc";
   hasRunfiles = true;
   version = "1.01";
 };
 "datetime2-basque" = {
   stripPrefix = 0;
-  sha512.run = "3a653c3b379870a2bbd9e9e54d647bf717005ff3ea56c5cca2fa15dc80820c17f8609cfb38c0d546a46cd9b99d45cf2bfe19d47b9501a61fae37374688d71b3b";
-  sha512.doc = "9fe8950d0ef17674a8d800e57c748d904b09c869a0856500688a63e64232f2729f1c480b39113b928c60b4decde844a7212c08f11c7d75ea20aab60ab6b0073e";
-  sha512.source = "dadd5269561283d0faaede22911474c8b45dce87ba295761832ce33f9cd876fcbe04189291dc2f860fcb9f7a5a0818ab4e103576a06e3fff18a2022d8c1f9987";
+  sha512.run = "a9b93a716adeb9b25c06d1eb1ecbad80888cf68d6b1e245853431fda8ad2c52d6096fe3abc87daca8bea1de001acbdfa3d33544f2d2d0e9665ee4815af9c1a66";
+  sha512.doc = "4e313ce2df3fc67c43e4904cd6ea331b7389f39184f301d1938b5705dba47dcc916d2b17ed837f607f1eed2b67910b70c0f6b15a6eabdbe929891cf45cd543aa";
+  sha512.source = "8add0cc0c4e60e2d9b7474ddf2aed4b5bf5ee047eeb0c58a41475da8f56820c7aeab3027fd1af016c4e0b864ba8affba64cbefa93ed8c41bd4800fc61cae6c58";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.2a";
 };
 "datetime2-breton" = {
   stripPrefix = 0;
-  sha512.run = "c459a5a3e8d34f1b763def883ad05125110bae215ec4b3329397d866805a1eaf9141e071dddb4879d9429adcbe71d862cb3181741d8cf49463455e19724e2068";
-  sha512.doc = "c7be481e11e1881a027c8d6f36cfacc1c4d8c2e3704749e2efa9158a8b80ec1e43f18962b89c35d575ccd41674312679a687b9ad6d1d42c39e3ad0cd1986cb03";
-  sha512.source = "f27dbc50be0a01f269e1c8e948080f9110a5e94ab84c668c95e61742a777d9cce3928b44e822af57b33dfa8dd561d62d027e8913c0b6b2ad0c0555bc57ac22db";
+  sha512.run = "0199c9e1aeddc11f8d802bf600cf874d46a23e18f6d5b0dedb7a4ef3ed0aa3680d20046c44eff7c293f8e01aa628f098d3e908b99930fc6a080d455b61585bbb";
+  sha512.doc = "c4228974e1e7e4a66507341bba28560c1169c946b7f3edd1dbf9f8c1485c1fcb897f4c5b970c20e0b2c8d487d0a77c8f1d6486aae4c91c7c1be4d3fc7c4682bc";
+  sha512.source = "0092fff59b306038b4ad494002c2b19843a7a2a5b7177f31cb105066b56a82fe1bfeb85f7a0c29d3dbdfaa0866f212281f68bdcf09724621acf5199a42783cdb";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-bulgarian" = {
   stripPrefix = 0;
-  sha512.run = "08a3db5f53b04dadb0cb531e623320f5ddc1df2e856a1f6cfeeebfe222129627c77ec579dc127ad8ad73df8997f2fad2f4e9cb94b3e5a4213949f1c2cd632aaf";
-  sha512.doc = "8fa3a5a005d58a7ea5557ca760f8f6a145410319c2a2a7e25a756e3073ded11948626ca37ad22a346dd5e2dd17facf532340c271b7f0209e0dd0ca02f44514e7";
-  sha512.source = "acb42626d32a086d1e96094c6f86631da24ed2636081412e4e5c90a57754dd30f5cb94cbc7b884aa72cf648a5ece14cd800551917e223b0910fc77958c7f05ab";
+  sha512.run = "13faed75c5ebede70585ba403d6ec4a6e87498e2186982067470850eb65b2a94f4ac399d1bea9092e49b36e432675bba00bc46d1274cf4a3eda4d12005cea9bd";
+  sha512.doc = "44d231018fb5497bf5234aa96ac0869db73dce6156e4c66811f9c48b14b97c88f3601fb3ac4e0e3b5021c7654b3b2e8c5e290dbbb37b57e055861e1d3daeea0d";
+  sha512.source = "98f0b5f92a4fc6c61bbaa1fff928812c3421b78f1289c4d3fe5cf4481dd12dec88441cd877d75820725d0d3b8b699136d92687aeb60bfb366e381103d5293373";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-catalan" = {
   stripPrefix = 0;
-  sha512.run = "c55e83cf41f9ce105e20b38468534ecb86aa710af005553b43b89511559d2e1d69e09fc3fa964fe0b27b3bba1eccde2712ba522bbb27f7f4c919b0d67c4c4265";
-  sha512.doc = "c4b54a274c786e5f87de77bbe90e353c613bcd1a1ff3cfd8640526350c3ef56ce57380bf3d1c9a94566b1fb1c12ab94567213e93bc833a67352ceb58f4337652";
-  sha512.source = "574e147ab3fae62e3167271c72e2a82ba41a5e38a13d31d29cc83661dd349b9ad90e04e73f554a5d1821948fe7b2c403d9767176ff4abd18785c768e539c27eb";
+  sha512.run = "31bf2df2c1d6e664ca5b8bba2d2733c1ba9ee3f46f6499c4bee0eeb3aa624ad2b1dee0e297f3c8d07f8167f2f33ca9b4aca73dc1d7e1ad30a66bbd26a68bb3d7";
+  sha512.doc = "dc75baba23ffa4b0014d7de107244b6848e0a28f27cbfae6feae98c81fef6cb95ab6f06428404c11777fb4f5b05bf0cd100efbeaf4c73b4d66ed3c31d26d2d93";
+  sha512.source = "2bb24a3fc158e4c179586fd7a024c455ac41fb499e34f04b44181cfc049d91323881201a475b462a9d6c76d060624d6544171bd4efc4e1e13df960be0c1b1982";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-croatian" = {
   stripPrefix = 0;
-  sha512.run = "4c40202b9b859faf97114e0cf3eddda9f2bf9c7c4ed09dc5a01ae52f9d8d87bd4295ba2c4677e8bcbb426c2b4e2f36b3f2d72704177804686e7f2e96bccb0cc0";
-  sha512.doc = "41dbf0394f74f868599226c77ea7223c45d024ba0790f35364bc40eaab25fc70541a1346100baa755c7d73223f9ba4c6a0ff86a3ab5a0c96bc69344804c0c36e";
-  sha512.source = "55c6164bb224855b9cce8d1349964a8788cee9b724c4c1569978a666995ab436443793209107c3fe5de7e689418ab5c4f90cd60410373c89b11ab36be5721ebb";
+  sha512.run = "7da533ed5aa33e3035cba2a3f10ca03f78f77a4d45114e181bad4a92200d49fffd395593d5b572b2ddb0c6e1164c6fe1636d3092bfb6fbcd94e1dadb432934df";
+  sha512.doc = "65e3058d8543572140006e287190b4ee2dc3c52dda14a588e4d1689ff1be26bbfa4dec8f6fe1dc43c64ad6787e1425d9d22a8c3e187e55f1f941d1b6b9422145";
+  sha512.source = "643d4c454b7e3d6ef34b826738b494a009d0fee388f12612750ada78b168ca874c2070810050bbb6b215b59ebe632b67b123d6c6edeeb65e59e799c0db0bdf1a";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-czech" = {
   stripPrefix = 0;
-  sha512.run = "c58590a5565a82a356d5f9bf9eb772c95b60fc15148e25146b97056ec80998ca07bbd44275b1428c57a34ad372dc7a3349719c5b4be377f895f21e02505c0a8f";
-  sha512.doc = "313a96320b922e7e984f4cafe6a12bffae98cba9eed49bbd599dab551d75a2495788d04c576d6c8916f3200fb4c06017da67502beb5911f967189aafc5353360";
-  sha512.source = "482f598e37d177ad270e4c9f371c44653b8acb2cc66cf345b764075d1ed451f97dfb1a44877d7f0fe3d15e29975dbce99d6fc8cf83a6e241d5ee56fa8a4f5d1a";
+  sha512.run = "1c1b1c664e3f138c183da3f3f1d7242684da5900b636d3b50190ad239b1722206fef04cd5a24d88752ae92793ab32dbe92faf31d6ca8162129818331b4a8ca6c";
+  sha512.doc = "00506625bf80aa0d3f3bc82d97434d0f5b09c2d38434fd3e634dfff96b66793570b70874e912738c1a6b4b69784c3461f10d7ec04bbafcdd911b0911acd5528f";
+  sha512.source = "d4a649663708300a9aaadd6baad924fb634654872d36374636f06c87a386728796e22d2dfccbd49a713f8223e412eee167f92fa366c92cc081ec8ed82ed312ff";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-danish" = {
   stripPrefix = 0;
-  sha512.run = "d716a3c079d30e4939bfee42b0db76476c2951df6bb271237949ee05e0984c8e66cb2d4c1576475b9ba329b5e33fcc278b1c0a687158b847c2916e1102ac3ad5";
-  sha512.doc = "5e1558e1c4787ffc368136974dd2aa011b13ddee36e9418c9d78d06e191fcbbd663a8da2134ad92e5f5e2acfbf724980e29737b106500bf0e692c2acd4bbb84d";
-  sha512.source = "8f909d010f3c2b8b01610a634992810195e39419ef38cea20c8b02e5679bf87f46bc4dd238deb50b204deb75a595defd64b4a437f49a9fb314821a66941c96be";
+  sha512.run = "c6c8b9299a391b607b00d461edef367da845cf932f6f6013768aa9385dd566bed673aad08f602b73255cdc24d86507e421bf022d77707ff9756c6f2da0677d3e";
+  sha512.doc = "e37b993eca8fc9f40938f27e8721d5dcc78b2b884bde336f873e33769f6a5ca8cab40b16745bb9b546708edfcd2d81ec6384a134bc193a8bd3c26699af720813";
+  sha512.source = "bd9747b90baa2b0832eb0dfa6f11315e5a7c974a51f8f7e827b39b8eb872070b6fd26b8175a50e13d2c9bba69dabb313c3fa1ac9a5aadbccdb4b3f50aebce04b";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-dutch" = {
   stripPrefix = 0;
-  sha512.run = "f84eb7357b5911e85ae287964a349774a4fa3fb5b6eb8a99f3a2c3897741dbd5405b93430af6eaeb13076fd4c4f70fc737e0af14b28f0a8bbbdc5a68dd7d74dc";
-  sha512.doc = "243ed14a1ce7eeee0e30c0d7c2425f3e3fae124658efa50a183359bda81143411d515b4f072587e2e1a818d20102b63fcbfd834083bd9a81e288f5d4f4831066";
-  sha512.source = "4fadf35c92674d62c44ed3312b241b6236ee34b3d236eade22ffe9218cab10215b31f4d0be0d7f6168cfbbfe8778f86ca044d275c39bb2a63e13af02d376559e";
+  sha512.run = "d968ecd90cc48cc0308ab7a092ea1c9d7240c933dacbae753f9a3e8e1f798bbd20fe41e6fb6474a794442226e9f92c27612cc857a8e27677ca06aeb6750da39c";
+  sha512.doc = "bd617f47f5bff2fc699ea092502de1311949fde3f60923312ed9da0951a5a0a3eeb75eb9961796ab3ecd42b555e73830bf178c8a1aa13f53dfefc9f27a27ff09";
+  sha512.source = "8fd61874e24173bd27e533278481b838d9c7654ed67355fc1ab539cef33e0a39592c5cf3ae3b6a54b364b2fefdacff393ede89160035595396fade7764cb1bed";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-en-fulltext" = {
   stripPrefix = 0;
-  sha512.run = "30646a85d0cf5f0cc59eff663ed989d389bad91620a82c63b93b21f5c5aa4af918a756be4e2136a53d014609749edb0189ed03c07e129684e5e2e25c513cf957";
-  sha512.doc = "7083cec6821635f147124a49f29165b2d047ef9e2f1df3e5cf87199a76d1ace00cb929cbb291586e8b7429ca49cc8106738ff443e60b7a196966befda6b337c8";
-  sha512.source = "67fd4a48dc3feb48db505c2a405c33d37cf8033fd4ad0b9621433868435aeae277591957dd3c40ed162ca1ff62dd0d250c49f8f4516697e9a4e41cf66187fb59";
+  sha512.run = "569f7db14d4a904313f50b16c8ccbe8ea7d1bd547ee1c7eec801cc726ba0b7dc9d3096d5363b5819cddd12299c31a85d48172879216669257571bdae01ce7522";
+  sha512.doc = "66c0b8fbb43c30a3376d3aac95a093c91fc28536494f6c59c504a9d9172880fc65d8e1aca02e30392d5a6fe084ff03812430cd8232db2aea825a419bee71c379";
+  sha512.source = "24acfbb2e634da788ed1236264b6de381c8a21487dc20ce1993d9229c6c70a45f1bc7eae96f1c18738537ceecd1421a652d5d2cb0e7a72e48b859a4a9d2d5753";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-english" = {
   stripPrefix = 0;
-  sha512.run = "8db3d0de7bc82228f439cae062550c52b4a6d2ec8dd24f05a7fe7868bb57bb817eda56e7c47759f33cd21738067bf1d5ac20ea1072acebad538236f916ece608";
-  sha512.doc = "5f5fd266141744822674a1e56b3928cfd2e0972ce79431cb3eb0a42bb0c008853e17b566d5f39ce4ee0da56f6e257fc4b35666868cf3acf261a6a3d2fa312eb2";
-  sha512.source = "e3716d1db267a112d6956c4ba34f4bb9723756347f523fe8ea4a7dd8b904d51c3e50632a6fb37f26545e169a0c7856c7d5713bcf911ceb8f83480de04e028c70";
+  sha512.run = "b6586534e636d66063f85a5f40ac087e308f40f9b4f97612e06164de745795458f17d028537a8c0395a59dd1118dac11fd43bc31237fe2559b38c37f048e134d";
+  sha512.doc = "cfea3a5472d4aa54e7cf4db7f49deeefc377e79dd9b81714ebe0ad28e6d9b27b68f266ffe7b76d2c575380c26f90493a90890af7c1f8365739e49bdab466fa7a";
+  sha512.source = "efbb49006928e56e9e312b2570fb6e87d5ad51ca6047bbc10bb6ab2196320bd7c1ed4f3da0fd9d0ae22380478c63cffb2ee2044b96bc0c4b740ba92aec4314a0";
   hasRunfiles = true;
   version = "1.04";
 };
 "datetime2-esperanto" = {
   stripPrefix = 0;
-  sha512.run = "e3f2d90f0597ae2df8b8de218e222d2fafcad00333ff493f4fb0eeabc21ed6f7000c055b630ff2da2f53863299844fa3f1ca3121703c4289977a784a0582608e";
-  sha512.doc = "7c5cebaf3c2de9b6448e8902d8b058b53ece7d741b3021adc7190ef98d7c48838f773412136a01fef6607963140be80f09324cbbf70d316bd853d3828251a954";
-  sha512.source = "4c857378c9231877a77443aaf44a023cb7567a5bc2bc07a59af9b5ce4945a343684355a25423533aaf248071aecce2691404b1898a45b5bd9ca19ed5bc9dd881";
+  sha512.run = "3267e868724fc5e5ab73d5b0d2e178be28f5507be001d5a85d012a43b0ce25bf90921e0248cbc4793348d6c5b06a627713a944fbe9a5f0b8806d349170e9fb46";
+  sha512.doc = "aa91fba7ea15eeb4d12f84bd9a353be638642bb9e5d51a07887fa9c4cbe5c84d7bf131b615109f39d7d7b96ac8c623f7e649e89f0d74dfb4248ad6d12e217b30";
+  sha512.source = "5c20f768a768d4579162fd0abc28e17ac2fead886e4441ace440f932740c93cdc0514c4b40a3d7b7982dddd5292406ffd349648bcef1a16d0fd9cd69d5cf1f9f";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-estonian" = {
   stripPrefix = 0;
-  sha512.run = "5cae4afbb74d1540967b015666004ac848edeff99513018e9522d52ef7b9c3bb2a9ddd54a035d9e94929e6bec28edc44a4b5a2f9d2f71ac07f9ddf29879f949f";
-  sha512.doc = "cc1e331ea236c11244b00e7e4f394240267db65d07ea18cce111c880bd944172240ee547082928765232894293fdf99be336e031451e68fcacbe9f54108451c4";
-  sha512.source = "afb08bd2c32b68068605e2400c904e40cc15d7d8b9f19196c21acf9019813b769a2d128d25a6d9db04c0f62a3b5798f4a0e63a40bc8fce71366bc9c4f1f65671";
+  sha512.run = "e46be8d994ba03558f361b6796febd9e6826656516edbfe4eedef3723e6d83fba29a1c9e1f65c65f7e98408d61d3da53a3a4fbeb55c795608617c40a9f80068c";
+  sha512.doc = "b4c86c7f96b878981d75f7943a3d4cbf729d7cc4ef88dce9da17f5fca44613de016c377a48686928aa1992163a2c2fa3152b2130a7cd99b760a50083e82cf73a";
+  sha512.source = "11056943b23b2f606f2fc04f7344a4dd9b33a449d20c62c40d8c9210c957ad92e2a99ead3816cb2faaac330234e47d7d8668d6e57168c73118dd7a74cd5b9d1a";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-finnish" = {
   stripPrefix = 0;
-  sha512.run = "81a180d2e891ba80c5096d12bd20c20b1052ee3609b9a87264e634842b29ea32bc0feddbb73a6eff73e0a1d6bd427fb8b8d06a9d9d53b3ea6c48b6c9a2b98eaa";
-  sha512.doc = "b5c4f4266ba2586bcd30c235b6efd6d3023ea9f203dbcd19e6beb6e2f448650ceb7df78215781aabe18e22f3dcac0c978afa312a8a93c9849a3366cbb783f640";
-  sha512.source = "0d783c686a04ef79c644affa18dd0d29da50e1773bae60bdce0d35db81d39a343a197de2edff6a3afd000a75ab24f2573554da884c9e8260bd022440298b7094";
+  sha512.run = "bb66a911f45132581cbbbde263a31166f53f610c212e05ef284bf762ab4c7bcc240e3d359e4bbb5c1af9479a9e07fcd22a96cba205ec70d475030a58e6f7c67f";
+  sha512.doc = "4deb69e53c37799560c218e33e443b9291d7d4af0642b40e40540fe4baca5fee4fdbbd8b53994cc339c302d2567a8a2624221651d02e5e65e92c7c40b454401e";
+  sha512.source = "98906c8851ba0157d7574d4e728b45197f32dd28e63c7f22c1b7cfb6da80e90ea5171c4b62ddda9015263230adda8504ae96b058c839f7e132c50d06b36ae06f";
   hasRunfiles = true;
   version = "1.1";
 };
 "datetime2-french" = {
   stripPrefix = 0;
-  sha512.run = "9fc1cdf803b8ca93aca2db3e43061c4662d213ff695746daa7fac62590c065b0f44d7cfc888e0cee02ff40b8667f1e6fbae1013f1fafc8e9add080e79959a112";
-  sha512.doc = "3b435b766e63adc4431352b3287a2724740c1f8fdfa341e1977e75553eb6dd0bca912a4fd164940e486bf1ec52477b487210c905508471e3231a417d5fd1eab3";
-  sha512.source = "44f64ce216478f06dc470fc1a4c796576d4889d6f8524a3b23cdd689969b455f241aa0afb8475e08e6a520aa69e2c57f8c3bdafdcc9f5b2c19a6f020cdce6b99";
+  sha512.run = "68ff4a94adc63910c6e7c6870ee472b11e934fc05600d29f01a21f3ffc70ac40fe7f19e14f42528609a405592a5a28a452a8091dbd86b6ab0efc6afce90ebe82";
+  sha512.doc = "cddd1a43ed111baf51d570edd967ad73cfcc662d9d2b058a054f58d811e8e685cb403663a0a985118a4bd1835b6642fcdcd164914e9f95e82c36546444362aac";
+  sha512.source = "322e33c64ecd4b5604607b5d4b964f2e2bd39ddc305c341cc55f4ddb4d8e8489c085a89ab512643d7e989e3bc8a40132e1ce2d31b937bb9f92b8fb49fa4b54c3";
   hasRunfiles = true;
   version = "1.02";
 };
 "datetime2-galician" = {
   stripPrefix = 0;
-  sha512.run = "58512ecb2a73adba01693c8335465ae92774ae673a0098f8912bbbc2601edbc71def0149eab5c54acc90b33a64878c77fcb46c7ec466c41a9d09bd57c91ec8e8";
-  sha512.doc = "137f116e2e988fd14d13b77ef4b8d9fa24244879c51f7185497f60e6137c7cd19db0fbe767ccc803e1583fb330cc42ad052dd9af57e49e43e9a4b1b12b442cc1";
-  sha512.source = "9486dbf74bd7cdbc94124dd459285a1fefd7b7e5ca252caf1785a9e1404c8d14fe8b1cd1a6ea8f0e84acfd543b589c8e11d9c0fc67ded5750f69b61ec2e78cbd";
+  sha512.run = "39dcb4756100905cb34b848c6c1c01a202b685290c18f2bd774dd77d6e28690d2b735445afe591041c9e1705295f34184bb1c503789d52b361d810ef35a02a42";
+  sha512.doc = "d52cc480c25b9c07ca06ecdba4e1c338424c42e75190c14f66a95a897cefacf6cbc07ad19bbbd6f1976034cbf39af3944e6594f19f0923ff5256e94922fb6ec0";
+  sha512.source = "942a2a79453e64507a0022a629d3b43a6304626db150fa6438de08fe487f73953c582a40597f325c9dc8513b4954abe2c1c3407721aee10daeb52e691b81b50c";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-german" = {
   stripPrefix = 0;
-  sha512.run = "916d91388542e5784758bf7c29ea7b5d9c6ef6f9b744f9c179760c943ff2c8cb60831cc2c7dc5addbcac4575f320d184598d1397b70cb2d12bdb037c76cff0eb";
-  sha512.doc = "cd3d76f38c6dd6a47ab60786f1fc213cc3c11a3c33630f0e97dbab2fc76035904f1d79710dcf6318fed27c65f252ea09c35ab5b3788a641a1cd1dde2a6deac40";
-  sha512.source = "5ef76fa33acac30aea9858461a3d0a2dee7ebfb9767f1337a81f71568f08ae96d02ff479273bf5b65ced61a2a31812e08af34c05e0f63655aff1b43ca9d64599";
+  sha512.run = "4dd22161360653dd9953482601bec0d094487f93f11f91ad751b9f9ca4744fc2a7125f6df9c8c4c5159fd7353f912ed12df5d6d56f3119284f0b5954d7ef4ecd";
+  sha512.doc = "88fd203580a26077112b933fcf3ca9af2e5345cd589cae8a9715bf8b89170ea6515c003e73bb2986d6ebff7cfdd51664390cd11290b9b67e154ed5738e08024f";
+  sha512.source = "a72220f354dabd03a7db28760146e03b49817544f2eb1d10f4eb6a9707527454b85c812913b6d9c29d9bcfd8c54b45ea0b7277c046a98d272cc58d89acb53a8c";
   hasRunfiles = true;
   version = "2.1";
 };
 "datetime2-greek" = {
   stripPrefix = 0;
-  sha512.run = "c5c305fb0d62106646df53005491bcc4b52480ec0b78888d3fd321a4bde9a0906a7c0c2719c9568f35c280f37d44f66607a8abd6854433f8a387c7642432935c";
-  sha512.doc = "78ae99df77350c97657e986e0d60920b29460af5887ba616a8bf665e8c6a2276d4d7ca2ae7bb14d0c6a75103c2f626c3e0c5739cd2000769d169e008458118fa";
-  sha512.source = "3abee53cf6438b9e0976000900d6abda0655e8b757724a638d2559781e45602184df71a2785b1623c968fb50adf2a42866912340cd3b37eabe74bf3a7917f292";
+  sha512.run = "d1f0f33a42da3ff4cca7ec3e257a977172a3b6a36d7813a69ed5df29437f1273564fde3f59f4fbfee3ec495f0554fbdacfa8a3d2e60826881651f88e7089363a";
+  sha512.doc = "fcfff6c6dfd31ab1cd4a2717c527948babecc13bd1fd49873f503a7b062e24a2b101cb4a5ffbb12f594f3ebf0011ba379c0c9d9732c46bb7c655b8fd13fcbf8d";
+  sha512.source = "2b1a208e6a210461c7dacada232897e56605b2deec0c86c5500a6698815ec7edb3722e525179fe73074e70437fd969fa34e78fc39c852d7882e25d424a0961d2";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-hebrew" = {
   stripPrefix = 0;
-  sha512.run = "470e8e95a3e38441366e6fe7632707e29556f47dc68cb6dbfb0155d807d63648905f40fdc0c557eae6a801d9f2ef0efa8a6268d96c3559119401555ba9d3aebc";
-  sha512.doc = "faee4585bd42f05c1d5aeefef85180e423296c5e54304dcf11df61d00c8b38037b1d95b1897443f3bd8b92c384e2167fa5b4d1a1c47466208e49390c729fc877";
-  sha512.source = "0452d89e2501fae3d029e1851722e7b44f0409db07d528dd8556856b42bc01b3189c99590868ec6fe46cb6391d40b9ac6089300cb862b109841f845fa12e98b6";
+  sha512.run = "8c8bfb6362a236f053012d5046673b1432d3da2b0f3cf12b6d9e9a60c401a34cfe6ccd6907aec1e2db3175def3a323b1ab8d2ff2f26c3b9ca60531ce36eb302a";
+  sha512.doc = "27ab941e01db57e7e52e106afa9613b61f76a6e13fd0a16a9e24a0071d71182e1c74a03d87e4cc055d8361a56ba7208fe7b23229a678c4d7a434566945cba83c";
+  sha512.source = "87d6960b3cf687ea6f17a83f722284971c817d2269dc7f063b6dc45496fefe789c697c71b94f4b20582c52e5e73ff06760cbd9dee82e8ba1e7efd8efca88c89d";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-icelandic" = {
   stripPrefix = 0;
-  sha512.run = "34723c5230bf5483253efd4beb62122efdf234bff08570b3c9456cf35db43c65692a68c0f7a81dad09e9a5a81408b28e317dbf7b58d3f492187e5b91c3cd4e31";
-  sha512.doc = "9926ffd3d76a6cd5776639a7aa8748c4bdc062f6ca43d8727737fdcefc3032d3b423275c1424d7099ef5206c4ba4ab4e26f3946d02968de533ec004effae65f3";
-  sha512.source = "285c2f259f132d2aaa0889d5f15b14018fab2ad7237749f86dd4d2b932c0faf6fc03410632112dd6808fd5680c3a5c3b08f568e99c6b9061ec14b35c73484813";
+  sha512.run = "276a9ea14a5e9c0a7741e883376c103a5b65d55e92b828467fb7e00d519ebda3fdbd706c9fc57774b21dac60b15e2b13c7fd97da6b2b446fefdd49f89b3040e0";
+  sha512.doc = "8e45d11a7881599bfc6a562b2a2d96f9900b5f4aebe2b8d5cf2c1d40922a4c1411a5452dea26e33e7316a8b2213fa3def06bb7c3acdb6210200c2bd10386dfaa";
+  sha512.source = "7c41fafeea80ae7ee295e7fca0e1cb4ee019ef064a4272ff18ca225e4518b6653fb4058adfd3b3e5d6c8f986e16031bcf6a72f2c9f99059cdc2d3a44d9bfe9c0";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-irish" = {
   stripPrefix = 0;
-  sha512.run = "5e1ee1a6437f690bcb0fa656e2ffe11a81fbf3ec86031f94d223b4333f78c63a4131658cc359dd8f417f647300207c74144c360212d5e05c681f861c779c65fd";
-  sha512.doc = "797df7e450b4cbb29a6f599acccc520e6d0bd642f9691f3e70e5dac9298e5ff2006693cb1ad0adc7632d1406cc3aafef51e3c91590a61a179601ea6b6fe29975";
-  sha512.source = "8d64714ac5457b0dc760e3476cdbefcc681836c05de411ef87101723e6967b68baad126ce1f16c003774c6a1fa4db05cc5850916c98d0ce590d98b503fac548c";
+  sha512.run = "08d3a6b076a50eb16b18b3b9258fa4fe2162f4241161d894ec0bec60ca5b6dd7b8c11ed364eba708275ff52c8aa2db7624ba5da6b1703ca513c4aa99f968d621";
+  sha512.doc = "20b4273dd7b40dbb4406bad1d3ea5fe3ddc591e684fbe62ac719ea78985b2b720a72f3f26e44fbc980c18002c2c566797b57a17a5bdd4876304b7a464985195d";
+  sha512.source = "582dac3cf29d9dbbb77b1423fae7cd92eb6f4579fd10183dec7f415d3591e56a0831f053eea07e66a4ac5e90ef3ddbf7fdb95194ed30c0dd2e34dfbe61f75245";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-it-fulltext" = {
   stripPrefix = 0;
-  sha512.run = "bbfa1d3f0bd0fbb9de4a48797588107cc7fb06c17fcd0050cbc50e30b7c4fb430b0d8a1c41aa21f0375225e13e283c39f211b3b2030edf2ee9a440e4dc1aeeb1";
-  sha512.doc = "a72c7cb214aba560377dc7228153b1925a4e739dd84cd2f7556b74c71b5385743091bee0fd21a8f7d4bc6ee5a0d57b685a8b7c77f0e127b5cfa29d401c05e3bf";
-  sha512.source = "9a5155f7db5e09b4d8a5f9e153d21134a96318966fb9bb403f5f1227276b29e6e5e8f3aa0a0aa770c868f9a12d03aea22dbb0edbc19286a5060687604b9e6c2c";
+  sha512.run = "6d9f454d028665c41b25c74dfaec12b8fa39c0384cf20423a376ae9026f7161d37a74c4810a7fbb3e6d56661ce355d1354c8da91af9d9061b61615548b834c44";
+  sha512.doc = "32f9599d86a6d47c1758244d68b02fcbf4fa567ca18d4800bc3a36960bd6bae1e610e222027ed5eb40a3fc5cd5bce20807ad65e693a025a23125c4965a574873";
+  sha512.source = "2308ac47b77b4e65c86e11daf0d529f26f30625d93c8236e3115105517ac97d2840e180417ff3745d405915a6fcad487f4de2bfd9068d9b672c631cab85c424d";
   hasRunfiles = true;
   version = "1.6";
 };
 "datetime2-italian" = {
   stripPrefix = 0;
-  sha512.run = "3f34766a4a0f9e975f62b6cafbc9399796a892bd9d54751af5b9a81d3807c50cb4a7a7f4d51ce48239ce2782621c062b24ec654cbdbd39dbbf5923516e086f00";
-  sha512.doc = "7d793782696faded36ab317405bb6e1d0509c1a13337b8997172fa07b1053536b2016bbe75b8581e43c18f120e9c21d10ccc06668e889e435471b504a081196c";
-  sha512.source = "ccd2970ce40841ea65aff9ed394814288a4db370c4f4e7bca090a8927848b4c1b209acf85b040ad397402718498efb1357abbe2d76964206ac882cb8c9874882";
+  sha512.run = "d34de7132b00bcb13e0a7ce8c5f9912654746f1d276c77dd630c5f7cbeb866aa9f97a927bfcac792ca1421c160b34904155beb6618d8df52105c5148ba45c60e";
+  sha512.doc = "85cf37a06920618da2ab7fcecd8bfceab47404f2381b200699171c21880ebe7563202b3bf042e8634c9febd6bce8ea4644b19aa11008c5eb25926d137f4d5674";
+  sha512.source = "109cb7eeb058544715eb8704fc666b8fb9adfc366a7d543f0de9c0774601aefb193bf7665eda4b387dafe37a660f3cf3e0a7c11cf3cc593bd163c8b2b7cd5b55";
   hasRunfiles = true;
   version = "1.3";
 };
 "datetime2-latin" = {
   stripPrefix = 0;
-  sha512.run = "e1d8bb19bd16107d303cccd8b61119a7184127b622fc3877bcad196379e6b52167b246fc97d24dc179581028abe60741c9c9c8a219a14a3f85cf5ae851b7a45a";
-  sha512.doc = "ae06aa0878a963079c4e2e59978da6d898fd638153617d7843084367dad1a0e894851cc333c6196cbe2e50a9dfc0c30e6e30d391e9e18c1ffec7ea73163e6294";
-  sha512.source = "5563a25b1011e7a9c3e28cb082b9b425a325f26fa2eac677634b1f594af688aa233d3db8a0510f7742606d2e819145b17d437c2f8e485168052e06a45b60925b";
+  sha512.run = "b815d88444c44f38794fdb54cc00b0e929a6f0489cd5a795a451608f4d51ecd0b373567b0814d12fa9f28d58314a69a9c4b7e9e7e44daabe80a73671f652ff56";
+  sha512.doc = "5792c6591cafc5101ee7b4a7ebd4102b2a2e522d91588df353c78453e022f6b6cc087b3032e4fed95863c7a465c557483d8ab28a9fa47efd5acb4148be920cee";
+  sha512.source = "9a06dc0e9d702bf2ae8e5bc59ee73729967585c86926e7306af6340e8bedae4ed1e02416492882d41f964ba38a5bb4fbb47f232193d1cdce6014d02314b76937";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-lsorbian" = {
   stripPrefix = 0;
-  sha512.run = "7f0b293fd7ddfe374e723659a8b26a83c8180211bf7f1adecacb822ce4a65b1fb301da7ebd657ed16039acf13c343acafc08c34cc756fc72d0e69713f0ed747f";
-  sha512.doc = "937485b91f8d4e1abb295660ba66801cd7696a8a80616f6f638a0fd475700b692005a04532e479786cad6dfc3b1ce1f4618dfdeebff19c3b8145e33c8b8324d8";
-  sha512.source = "eb86505d64bbbaf1f81c5d49cd14053bbaede810766273da428c0ce42d2cb84583c72433501dfde1e5f27babaa7f26cbb466ed677b588952e21c14a75d9e7970";
+  sha512.run = "1048e39e0d5b67b4019248d839d384e32028fb7970589a75e427f75a42f46aa8508bbb05aa98b07ebf2cdf3fd26ca22c4124d77f2b51bfc20ae2d3cc1b4893fd";
+  sha512.doc = "a27bfd05fad0d777a7f24a62487fc15edf8ea506d1f81fa8986e12727687b3c3ed260f0c5297c76fc7475da74b2b3f753221d480c219e5f18f9801fd2c2cc38b";
+  sha512.source = "8fb97c327119d272c6f2938bc73f323c7f082c277e5a9156c7b0c8286a465d56e0ad6e4565661bb49095a8697e33229cec3b6ff822ce6e9a002c93ea26b3e3be";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-magyar" = {
   stripPrefix = 0;
-  sha512.run = "62bed1be56531d6737a687208e680b989fa115abf46fd3a82081e50e770bb652628bde1dc3dd69738259dab10aaca1fd5cadaa0b0353f8d39f76130f1f583177";
-  sha512.doc = "8ded6ab1b7b53a96bfaba284b66040d71f2685aecee0d17cb120739825966312bc5d5348c522507da76f4473a3bc935a7304672a734f8f65c63dc79e3760d954";
-  sha512.source = "bf9aad5742dfa3ee62542b8fb4e6c75b17fe7b87a0535ceb1b184f0be1fc3797200bb0e5a02bac8009620815231ac3cd2ab632e488bd7503b03365bca32e1eba";
+  sha512.run = "880496bf3c1273204fbacfd90bd18e06bfd70d9003196a4fa15f2292a3a23d84f75c922cd361937f50d392193df2869a2ad04644960da5d4a915e6355488eab8";
+  sha512.doc = "41265047a830b29d15aa7bc587e20efeea06fab752668e09abf594daf590abea65ce8b02f7fbba9fa92e172e8b4547c3ede94a5ddc6a7be9b1ad041e5d377d1b";
+  sha512.source = "0a95bac32b7c51d8d1c433f8f3ee5a1379059f47634b373d982685aaff2e818a3653104b1c9e86db1aa7cb2bcdb45743a304696db841adfc44d1872e74267e24";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-norsk" = {
   stripPrefix = 0;
-  sha512.run = "63d0b476dff885d90bbe35268aaa66d567bd74e34abb18f343252af25dc18665add5c78a7a8c3fe273930a423b9a666a9eaf15ccd186b5a368d2313144ce3d48";
-  sha512.doc = "d5910999685c39873ae18aff686eb08024a524e7e0e394be645a7a55759ca8495c650b6f80770fca4a06503ecfc60a44d86daad45aad9058e216d7631b7e0b83";
-  sha512.source = "48b5587693f296b3e2c24cc122638773b5fc6bf2c2f57a1063b4a5c4897173e5255b5ae135ae5f8f4ab6d15b60acec2f99dc381f5fd67e0af10a1de0bd6544ed";
+  sha512.run = "63a2ba1e3d68981487c1a83547a10397f13361f2fde38646013d3973ef26003037516716f40c683d7806489916f5cad305e5150ca752c6dc7d868fba1c16cdca";
+  sha512.doc = "0d184343b60da97c6eec2118be8aec125560777c260668f61ce8cff33b7f6f0fb01130d19a595572eaf3620a3fe339dd7566acae0f3e450c8b1130660d75b0f5";
+  sha512.source = "4cc04c57ab9898c5ebccbe031456f673d809647555ee597bce08f077ceca644c0b32cab397d690be2ebf45ddc70b101813099cd28283f833019ee47e83f64b41";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-polish" = {
   stripPrefix = 0;
-  sha512.run = "79459e7d3559c7f0f2ba89a96b4e45690b8d04beefef422b8049496240c5d4e260cf688d611889d454e7e9d577ba405f45c820280e046afeb9f26cfc1fd8892b";
-  sha512.doc = "a77f8abdad427fdad024c2fcee0076a6baadc3686ce1aa6d052ad5a7f2381fb2b9f9e6d1aea5d715612eedbeb3646ea05bccf7649c44fb18b56a8068231e9f85";
-  sha512.source = "b58311ea0833c58bf9bb1de88148f6f64ac321d3a4dba9d0a907304240415c3ed3477eb3817beb869547daafaa5017339cae9aa78cec44cc1d31a5a09e04b40c";
+  sha512.run = "279b0cdb1800a13ab31ced923948e1075d0699dd8645faecabfcac7974ce4cfa8cd74b23a9569dd2f00aaca818cdc9bbcc844b17877d89ae8e6b509e172d3848";
+  sha512.doc = "512206ee7a44a1cfaeda700a8c5e98560c057c51ec92a8566f66e81ebf6a70503b9d57fb633f867c73e580c65c6f4204fa68a1f16ddfcba3f2bdb28bed4d1ad3";
+  sha512.source = "7af7b4e1a746f552c8eb125a6bb7ae55babf44b880c783bda3cc6984711c781309c3047bf1d8f03bc914a2d51e35c5882aa5394bac59de64bc3f01d7950dded3";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-portuges" = {
   stripPrefix = 0;
-  sha512.run = "b92c770eb3994bd2e5c9f1fc5dd767a6de76624b03d3ce12dfc394aba9dcba2478d0c74300434494e6f47a0dc161163db648c2cf629bd5d4b84b73c8539affaa";
-  sha512.doc = "661761b5aef12ec8ed1240ca2edb743df74916ff164046c84a5fb0d621350dbd996ed94002db67c2aadb2f1af77950092126111bfdcbb204537fea76331ee5b3";
-  sha512.source = "83cd39a316603ce84667b486848a79a1b5dc1706592786a46c61590d0ea774095e1528ec39cfebc4d8afecfe8719004f9c1511e9e5cf3788c29359d7389785af";
+  sha512.run = "249da207d08d396662ce8ab61b7f565a75bc3c6b4a375d0eccfa8f9c17ebc6b8dfb7d5ade7f28974584c6b1b3f0432f3b847a5e6435badd225d6efad0bfa49cd";
+  sha512.doc = "993e4ba069df709610af771cffd0c88292f982ef27369264afc0c8b10057235b3bbf3d720aca6199f2757f0c154af3fcc3b686f2eb7e191a760ff6221f90bd1f";
+  sha512.source = "de00206d85c9c4ec0198b1b3df2e69563b07f6bcb2f49936897cca05bb5ab3bf6efe7978b920266e9dfd6509617890bf9213b4431c8f9bd290d5cadb1d00ab51";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "datetime2-romanian" = {
   stripPrefix = 0;
-  sha512.run = "5e0944d955afa6fa29c9e03f6435b689e99227dec3d9b4765a777a29ffd0efd006498bf41a1ff5c96b382405ccafa46cf72cb5216303269e1fcb61e4bbef1e92";
-  sha512.doc = "9e14a5d6a17db61da8fcbe47f8e813b2e8d3e2257d151b2205cddb90dbe656596bc725959fae370cdee31af4cb675b32a4dc9e93661ef0816c4f971700b85ab9";
-  sha512.source = "c2efa94747dc4078dd0ecfebeeb52aedad5ec5ac74927c9adbf3a24b789032521accb1beadba3af27b3e593525c3460eacf5299a070c49f109817a7899412bf8";
+  sha512.run = "3e7efd5ef93a7da6d2e65c782f93f6bc0e3af80d09fe762e4360a1ec9a03824930c14569994b88b747a7cf41518aa52a26aff07218d16bbf10103f10930b81d5";
+  sha512.doc = "d3688a46661510083b638ef1e2bfdd58c5c243bd888b46ca0970b8b0a7f1ef9760366b1cf65808e34d9cd040d37c1807ea60dd8a2533719d14fdbd85e79bac47";
+  sha512.source = "f1fb9e9f95dea59cb113f3d09b66469579c84d4bed0386b9333ff110fd7c4be65139a97e5cc303296558f72d7934f97ed383e5e6679051fee8b3c79d6bc1a786";
   hasRunfiles = true;
   version = "1.01";
 };
 "datetime2-russian" = {
   stripPrefix = 0;
-  sha512.run = "ae001c395ee7aef0d80143e5d290d3e45fd396a1c0855542882b301124367a0884670ac5506de905dd24cb63e8949af1fe56e6700b5e85042524589ee24cd770";
-  sha512.doc = "c04eef4f2248e40ce7f515f49e0dc109baeafb9c1f0e31e000230c438fe304924de033203fbeed9742a9d6db1acb852ed7093065f11bd44e70edd5c3d2ebf560";
-  sha512.source = "cfa809510a0be7a45859f2220bd9c88493019aad4afc9a8d9f9120e3ad3c26a26d3b6ef3822c77cc19acb777f5d579c2a75e1edc4bf36a46d30b208510d23560";
+  sha512.run = "888fd02460774d391f55fc482862a011506084103aaa0815df5d2fd877d37892535047930da15c4a146232c53cf3e3fd366170dd2ddaaec5aa9acac2bd3cb25d";
+  sha512.doc = "125a50eea6b7d1a7275ef272f6cea4c3a1a1a4e05f13fe0e40f1fa2cca8dc742cc8eb9a953a2e7290498755adc25773ec3eaeb4fbecb53810734278d0830cec3";
+  sha512.source = "94ff6591fab37c471dc7932b841ad674b1a66eda7102b1141c49ec44b84c0b9d9258c1822d055b70b3f449ef4b78bf366e2517780ef5352f5f1cf2437b2c1230";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-samin" = {
   stripPrefix = 0;
-  sha512.run = "1326dc6a219b7701140fe5e2cdc7dc2d48a48007a45ed98ed9d50ef74bb327ea16f8c4f64bb08239b72493f1393c89896eeefcbc46480ee28272b118beb1d0a6";
-  sha512.doc = "b2f167181a56a1d90af4be57fe5c5a1c33d2335aabf2558124ce29f86b8f3fedd06e2f9f640c063c1e14a8a6861093998ae2d4cc64892c4dc136a9a466b1f850";
-  sha512.source = "a4c3f22263295847bae90c61b6dfa4ce4dd2b1210f36fd415cff2667bbf1891b9c9f64034e93971c125440e6721005f302b045fc48286eef53b5012c5ea8f267";
+  sha512.run = "aba95ff0150511a453f63c2b596041c81a3fafc56090ff86cf60bdfdbdf09a21b20c73f342157fc25f1bbc960aa6e177dbbefdf0c809f03bab6b9cbe0da28e45";
+  sha512.doc = "e36329c81becd8c00d2d214570dbd1b4098a2fa852dfd959abc13f041d6663df11b769c0674c93ca0517524c5ee629943767d4283be3ef0ef0dd6881afc82550";
+  sha512.source = "412ec13e8d22481fa410d01135acac9eaaa3e398bea108aaf8e05dfcaf3dbabcd3203a07483308c90bd61e82b219b90bf280cc4a614f67a13df5dbeb4682ce10";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-scottish" = {
   stripPrefix = 0;
-  sha512.run = "a65df749196ea74558ec1d04d2ee9ae4bd0fdc119fec6fc8b395e194a5be7a657e22b4788d260207c7a8072c8a205c6e8377d950bf0d4b0662f02be2d46d5413";
-  sha512.doc = "d41b068bff451ccc34cde4c6e9054c23df87ef48f58c119ebe2d296d62182f34edeed8adbb87df4fcb1f355b04564c827ff97810fe7c6b278a6cd4dfb32603bf";
-  sha512.source = "a2e6399a4e6ef10d0b2185d9eb161f113df86d76ff0307eefb0e857501eb9a32d8c560ef38b63fe8abb49b9a97171c4196125c68bd64823121e7cd40cea27d52";
+  sha512.run = "cfdfd26f6951ed6acef320f9785adc9f0cd8a1b4e8e8172004a07eaf46c8c7c966af4b8f81be2bda8a72710a2515ea13b5d81aa652bcc07940417f1c12e2f64f";
+  sha512.doc = "80c0a13d584e7f1da03118eca7faa4e8efce23be6d825fbcff8f21dc66a7da6dd9080ce97ee20d9ca12ea54ff90169329e03afa03c3a792ceec7406ad972f7ad";
+  sha512.source = "760a0beaea21ac17b7cbabca48abdc80bc5b9d42aa17f118ddfd4d76ebae0f500a2fdf82df598a3098d7277812d2668706381d09c908fd377e1c5d81282693ed";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-serbian" = {
   stripPrefix = 0;
-  sha512.run = "f8849c3f5bc6f446bde1e9208c0a807886e29027f5665bd0a1eb23ede8357b2c71218153f478b5cba91d64c7bdbdaaa886095419b519baa768885cd85de86015";
-  sha512.doc = "6f8458c85ea4fb7b5156670f346e843975489137fe4b04d02d04acea707bc304b733075c71e9539fd38220b2cc5a3945e2881d53181f1e7dfbef623bb994681d";
-  sha512.source = "9b90220120f75d6e8d482c5dd44a0da455ac4c224bb04ff29e72ef4ad88763cfd741e44a9f28658aaba684a6db6bce1faf0dc00bcfdf61db5453e3ba021471f7";
+  sha512.run = "87b67e49caaa3de3b3b5a2ed957b075406fbf0adb896f1739891bb01d881cb1dba669bead1b865908960485e08c35e61ace068ce45839096dca72a3077542cdb";
+  sha512.doc = "3fa8a22568c7b3108c7eaa504df1e1d7f37eb6815d282d58cf0259d1c7490e7daf2f02585326d77bd0839a65f33908ea7385c25b4dea77efc9cfa3d84825d4f5";
+  sha512.source = "9806b6eddae573bfca3bb0fd8509f703e6469b03c8ff9efe359107d7e171af1a88aa1928220d000ceee143d9fe1cdad0734c1b431c548bc8d4672d0c7320b85e";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-slovak" = {
   stripPrefix = 0;
-  sha512.run = "f8aecd56b681931209a37ae1388b2c42257e265ad744ea09b91a050e436f02e9569941b9f314d16b2983f748f7787c4275e1d94a74a8cb7be710356d37a3bf62";
-  sha512.doc = "762d1ff455d3968d508fe28af0302b2a4690eeead2b87580344c584beba29c1799735dde73ea6ada5fa396d6be0dc3ee30f669c95d8edbadbcc1a7bbfb54da76";
-  sha512.source = "6b687d818f05300f87c61d7734cfd7631df88db0ab0d519dbc3e9732594ca44c9ba58484219fd5ea04fa9055cafe539e7c4b83ee1d92be9887f29830a5eb2807";
+  sha512.run = "775836ae0269bcf813cfc6335e60b05cd6984281642231ff4e48f8965ec264f592bb396624e526a8c18a22de64ba955a5cabe905f5ac4bccee101a53cf567a8d";
+  sha512.doc = "267c7f8d678ed2d598999487d9ef6290afb27382e6cf83852cfe8988023903532cfe33127b9019ef3ef24ee6806b5a8bb159cf510a25b1bd698d65a4b976e23d";
+  sha512.source = "0cc7c5157a67c51795ed9b43a058f11f8fe4d7c1240f47b29657c612390849929c03bd08a7d2f801be0e41b243f8abd9cd9eb0d4847ce2b08d6d062d8cbbd456";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-slovene" = {
   stripPrefix = 0;
-  sha512.run = "ba0ee0978fdaaf19defb67b40bc963d0476ad7158a305f3676637b818dd6f7d0fe1dc0473b1db0d9b5a37dd0d489bfa3a1af05d844e24a8a9480841049d4cefc";
-  sha512.doc = "96074295557d7c01861a6a3d7f45910d06dac14f042b48ed29d0a7be9ab8e70f957ecb6e5fda8facf985006d7369922e91cb8d945ac0a91d5b8ff3085cdc4949";
-  sha512.source = "dc5a67de6292f2356e39d988722bafc50a2703e2a8b532816ee6d420d4adc7e9bb18d6962f8cf3ea3d36bb6374beb84aefad9b9f9d1b705c1842040d7b3a1fd1";
+  sha512.run = "02f0cb9711f156521625f7d2a840e2d524d0bfc53be53b1968f5fbc6778f4f85913b7bab5934a13603010f797edced96e9032d5fd3d5b13bc7151b8998e159dc";
+  sha512.doc = "f89f0836ba1d4c30e27ae3c97804cd81a0a72650e9b671e7e01bb992135ec0c828fb768b125b61527a46f8e746461cb22f9437bde3966bf58ed81fc1a4360651";
+  sha512.source = "95825cae4b867275b39fca8dc1a48039e6068f5edf06a623da9f838497350e229ef7854fe5a7e5bcd98ab3de2fbb17dbc661280321d9fbb386ed436d3f047b0a";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-spanish" = {
   stripPrefix = 0;
-  sha512.run = "5c84646a4654e562e4b7d52af49a6e966fb29bd6ff465323fe488b65a332c041e69c72714a537d3260cc0c317fb156b7b9177c96a4a25a08d2bd0d5211808e9d";
-  sha512.doc = "dd35c9fcce6a3a9b0407e67aaee63399376ef523b95e7b78eb3f0d718f294dd0041ab6d6545ada7b4dfa3c14e03a1fc89469fd7837779c2efef022a8d34cdd57";
-  sha512.source = "34644679b3e4dcf4e967fed7b5cf478c677743e6f18af1d13be692b43a8a45ac752bd49933100f969254643362ad797f795c82e24b084ae6d47a8f376141d124";
+  sha512.run = "0962b9524fcbb40912c10d5f2c2e364f9f278dadf76c63bc20527c8d031caa9a6a85ec92e47a38d4a194e24fff799f7c061f52a979952ecb67a7c58f5a4f22ec";
+  sha512.doc = "9e543bdb9acd333282176fe73614e48ca9ae779547d5b664dd35bd970da7922a874f737fff6ecb86133fb59346c56cd57ad69f0d229b998d16f91d1c099e96f3";
+  sha512.source = "8fc10bd792d13f4ad661873bb0003b16256936bc86783c48589b7cb3350e31714f122bd5255459ad45d0d4ba8f835c80e38fe6718d39143c674f036035b6f7b2";
   hasRunfiles = true;
   version = "1.1";
 };
 "datetime2-swedish" = {
   stripPrefix = 0;
-  sha512.run = "9981777bb04abcf7f3a64c706d9ce797e9dfc336711f23b7977d2d25a453b58916fbd86ae87883b04195d3d86eb262445716675ddda74c3de5cf1f41c80db0cb";
-  sha512.doc = "529ec7c0db10d6dc1e2c35222030105203f67d92d433dea6da40c348d94c56e2b47f740759b2be2ed0de2e0ef91bafc84a523a99083d7a69b04c8c4d8267c588";
-  sha512.source = "08af9f84f0a44c15d93405d9c7f7f525d9264819922e68873b4353db6c726881afe1057e1f8434d105ccd803135cb2795b77bcbdcad4db6735390096910d216f";
+  sha512.run = "9d976bfb47fc0eeef5b5bbcf8657f3ca5c22d4e82745cb3eedf2237c990932427b31d36566d071f186c3d235a533d8fdca05ef0fcabaf9ad9a16740ffe6175f6";
+  sha512.doc = "fcabab9ad37048045ebd7e52e2c32632121762352e4a4f06e6d6a3be4e157e0d6e0abaf20163ed6465a09444b02562900677d15be97122f8cec456810ff0245b";
+  sha512.source = "75e074c37c0b545fef5dc315c83e3f3f04c76b4ec4b7e0d359d838931bf7a605cb4811774b40480d75b9495d07ae51b9585840319ccf3fa956b99bc0b1ca7ab7";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-turkish" = {
   stripPrefix = 0;
-  sha512.run = "230d043c61334311162351a13286ee7eae53e6bdea6262623bb78b3f2722503c6ff8fa23a6ff461b3db10011a0198ad07a6bfa41bba9b5bae4ede7dc7404e9f0";
-  sha512.doc = "f62d798c3938654ef7287c5360e61c2dd4e68da1a9cab3a1bb0c8ef9b7a101a5b1ecd7d08390e621ef7d383ba769a2222586291ebf479aeb9828ef8b12828009";
-  sha512.source = "bd5431876719cc1b7dc0a424a17aee2fea725e90d37f0dd9f17f339b7160785daabd85304199230c784c3f72a99393ba1713fee70f775c82234dccfa69a9c8b7";
+  sha512.run = "c70299cabada8ab706a4d18633fcc3db8e12f45f93732969193e4472a538c6dbdfe4bce23f1631fb89a2ba011d6fc956df2ffb54eb05455bb1e420c4f5121049";
+  sha512.doc = "2079e93814c90c91fb4f2aad1a17a280f5db3de98adf257b3756f7ba851937c0a3175fc0f6798ad82c71c0b78943fb9140dafe610fc043e663dd7af4d7853bbb";
+  sha512.source = "142a54ac6db01a893f4989c13d1ac332506736067077c0e5b1aa1dfc3f628f54efb5c0f1f56a525fef52dabbf3dd49e63fb515459882ee298959c3809b916bfc";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-ukrainian" = {
   stripPrefix = 0;
-  sha512.run = "8458549d2a26ac8f79afeb19664a4c2ed5e3ce7963918106875ca4e39eb1acd9f3684678680ed9287ad58dce361676c3ce437749f0e9e91995321bcf2d366863";
-  sha512.doc = "68a27bf32f7accdb28023487ceb34b4eaec208f3f14d4e82be44d52252423f05c4dc1ae2dbc2d2e1082bf592d9c1baab9e29b756c1e1456b01fae7f0f059a4b9";
-  sha512.source = "e838e4b3101601d9102fc70a28364baf749cacc14a6ad6652b3896a9cca0c987a5d7423e872ddc96137e8682c225e5efa55008d6c0af6e0354ff2c5b03aff8f4";
+  sha512.run = "103feb2ca14fcd0f3d3cc722008c39c6d7ce7ae0c5662ae8888cb1e3d5d22ae9cc38551832284c5419e72798a8b3cb4332cd04262db3da1556568fa7a2863e08";
+  sha512.doc = "be864a970a62bd8596dfdb3c249206ead0799428488da4ca8e84cabfb18f40ab2931b700417317a858ebf6ec32e77310d439fa9e1828bff2489f011a29f8e5ae";
+  sha512.source = "4f6369c2bc9bf04c7514d747a01f436acca18a9ae439b3aca3836ee2098d4e0f900ec65ec0406d11fca9b56dc000c83de9a26c29103dec0e58199af7607d49fb";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.2a";
 };
 "datetime2-usorbian" = {
   stripPrefix = 0;
-  sha512.run = "33ff63f75926edf07ecf3ac436d31494a34fdf07c792e2eb3b96669d47a48b57fcf23e03cb3bac4662a5a7ffc6037b12886cc53c2969916453f428829390ef91";
-  sha512.doc = "741b4b7da1bd629aa1873981143fa3f5f26edc65ddf20864ea1ae7c50977ef4c75c42bc5c35303ab1355451ac9f2bd4192f817640a01ec61b2d9723d358420c7";
-  sha512.source = "7309258fe7137ccff4d9172e88e781d79875e45ef496678713dd0b85633362765e32ea48bd2121b317b776b7d8d8eb618b9e0f61185a27362e521d15391d0c13";
+  sha512.run = "7f93732c10fcc02c3c360b2674fb8e0479bac0bf341ff8488cfac902139b7838579207593deecb55ef2a2f1d2b1f108ae0f9f9e8df0ac5011343ceb28964d259";
+  sha512.doc = "fc64e097697beffb0a8f9c49d03339f318bcbb2444405281617be2c95cc9cc35312cc3c9cce5d4dc314458efeb6aba8c3fb987b0d07d83bdf93a42a5193d33f2";
+  sha512.source = "6a991d9253df03985a40c9696da8458b2d95a24eab034e14a4ed2bea74e2de0e1a5b5569ef2e4275d025f05976ab14657215aaff607880939aecf13528af8b85";
   hasRunfiles = true;
   version = "1.0";
 };
 "datetime2-welsh" = {
   stripPrefix = 0;
-  sha512.run = "366cbc65dd0a129ac3f44b96288f70dd42ab2bc7a38b4fb575d0c62ac5eee4a8114412bcd18b75d6954847c49d754e71a71581e7882a6903acf5c7425154a62d";
-  sha512.doc = "074399e9fe53187c29702272fa6c17999276631c4fe3857c0e18ef44f86a9f09c9ece7a98bbf868030b510c5f30d1ba9819b09d604ca2c4427753dab1fb3999c";
-  sha512.source = "50976990351ccb02d8cf794cd7a28fea757fda7f606038fc4d293d24f4526ea241987d9ea9d36ded7849860967334e1697ccc21c2dc6212729434db702211765";
+  sha512.run = "60dbdb53dd693ab50215d5ea1a6067549977cf63b6fb883cd5656513ea8ba8e75f50ce5dd18c75cfb4d99f99676c45483c84b6689c4bc6abbf24c876f07ce6e7";
+  sha512.doc = "5e0079860999445bac64fd788ba7535dacd35075e640f8fa671c535369a39979e56d9468249b7515bed3c7c9b5939812ffd139e2db67a81ea70cab10157774ad";
+  sha512.source = "6955148ca28883743a0342fa10355397924bd37c96845df3c68ed97c31ab15179792fe34e098c22b032cebc0f226717cc635c19d2284717214181e1ce816c2a9";
   hasRunfiles = true;
   version = "1.0";
 };
 "dblfloatfix" = {
   stripPrefix = 0;
-  sha512.run = "ee7e33556164cc02c782023d0f62ef25f609ae90cc251c58f8d1c6c69267f8c1a2b897d69650541f868416591e1b84c825deb2bece0d88d6edfb45ba45e95537";
-  sha512.doc = "30f51aa5e3b4e902a63267f27395e87815d6641ecd8a204bab292b2ffe134ab44446ae490853ca110dc6e7e0e347bb9fe8c1c5474e9287cf43aa489027004ff6";
+  sha512.run = "0da2dfe1979354090d97636cade6ab02c53aca0c9dea2f205e77fa9745276c8199be6af49b3d312cd74bae4846bdbcad59e269a25e742b17e9008db2bb57803f";
+  sha512.doc = "0baf4c0107050d96fca9a3091c8b535ea4666d67855d8c40cfc8376951b064bf6d84d9b914afd801e514307ccdc87c9acb702253707d396aad87bfcd38a36776";
   hasRunfiles = true;
   version = "1.0a";
 };
 "dccpaper" = {
   stripPrefix = 0;
-  sha512.run = "cd7781bc6d2c2b6577739bc4c71e03d5b865a7af7aa566f311bfe49a08fcbbb1d2ca0d4fd3ba157ca518148018d7b3cff8ab1397d2f9c8e8cba25f76484cb1af";
-  sha512.doc = "f0bf95c71dd15549d5b3d3642876d73aca2f6755ddc7d52dae0d1b63dc9880f4810a200cc60a90daa68f1b90137bc3e04792eae91f86ba548ae6f286028cd9d3";
-  sha512.source = "d940bdbd1edba08f1e13b569b90b066c55a6d88d094de9d2f6ca2d7733728049344e87aa6970c9a5dd8944d73713082480b337251ffa807f4fde1d74617b356a";
+  sha512.run = "7ae8d10b1ff1855ce6f1f4917ec7563986a30c47e362b1a58eaf2f36af635dc14354090e8ab4a7ea0c99463119580cbc469510d30106ba899096a439a637049d";
+  sha512.doc = "e36bd4ed494fddff2870bf884a86522ad8adb518f375733599d821d8a5f0aa4e9ac5a347382c291593c99611ebb9d74958de83f290137bc7b1704ffefb37dd92";
+  sha512.source = "a58a678cf9a3e194182a91ff8638b14748c776efc1926e49f56cd26c70a90caeed1157b71caf3b64b56a5618106027ac6f9e4761c3a4c14a3295e52106917b9d";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7.1";
 };
 "dcpic" = {
   stripPrefix = 0;
-  sha512.run = "6e512d1b8f945f6ac31a634830a08444c764b51f099c2eb27783fa2158aa526d5c0829f92ac0abc8a36130d9c8c77094a6e619baf52a07c57dd4627b671c0690";
-  sha512.doc = "5dbd76c92c0ceebaa9c2d1e8e75aae4ef7c0ac8f07b53d532037a8b0420c3c028e0b79e58c495d776635ff35b46cb721aa15fd505582b2cf5fbce876f215fe07";
+  sha512.run = "abea5ce71849ab3b445de50fc16422b832935284d54f12302d385a8db4d21dc649c5c2cf6fffc66e6f1decd69e673c6a09dc8fb654878dfe49452150e1653389";
+  sha512.doc = "cb770ce774577d44034e4897ec8bc4391a69c84868f0151f45186e1fde07ce3f4b4834e990c6cde0da8cf58900326ab683524f443010ae1ba90197652a3a4ca5";
   hasRunfiles = true;
   version = "5.0.0";
 };
 "de-macro" = {
-  sha512.run = "759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3";
-  sha512.doc = "00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee";
+  sha512.run = "757b8ca64cf446a01ba5e1ceb68f84dc4c89e7609e8a148b9105cf6b1646221e0004441023dcdfaed2daa5f65a650741a3352687b5d6c245e94d00c9daa18896";
+  sha512.doc = "d45a17b93884394dd52d8e0de33ec715aa03ae98455dee7cdeb2bedaaffeb99a7499e794c4a267394760ef05c79e5a34438ee53f9ec5cc23f3bba5db6dbc1dc7";
   hasRunfiles = true;
   version = "1.3";
 };
 "decimal" = {
   stripPrefix = 0;
-  sha512.run = "12db84f3a7a9d11781506f11a4db69bfec09c653ddc74f276fdc49a2f629e315718026f3304c3532aa70866f7986ad50010d2fbffd68dda6d1bbe3b8111101ee";
-  sha512.doc = "87d61c482036d06c0dd093e34d3d91dcf4125c0997395ba379563aeb6f4b93323a8ff265f924bb1129dcb626ba08fe36520b74c94001aafd320ba60a9791e0b7";
-  sha512.source = "27587cf28471dca71a03b73458a39189204d593891ede139d69a3da2f05ea3fd2259d28038434c041d927a424f4463a49a66c73bdf355cc4e0f5fe82898741ff";
+  sha512.run = "00c5c1cd9a81979e447b59b43fe77219a2ed4abfa16848d791f0ceaeed248154c690d7bb5d8331526c35cd5a7f8a50e0406636370cd21bf608383d430c0cd7de";
+  sha512.doc = "fb4850530e0817523287500470d318946f30c6ecbbe300f9998152aa2aeedb0fa8b5ba14e6e394ad142cce16acca23d86d05dd7cc34eabd07513b9c5723c3108";
+  sha512.source = "ffbc4c2a70a6b61b2e62e36e83da4e5b97b65310155a0634ba7c3401c09dbf10c608540a7a51e2ec89035b17be09f54d077b90c367a09f7a7e0c6c87d12e9d2a";
   hasRunfiles = true;
 };
 "decorule" = {
   stripPrefix = 0;
-  sha512.run = "33ca046bf611d3d87e950999b4d319625549019661290d094152664b8454e27cf9e36b891dec532787f93f0b567f2f6c8fa5654ecf1a5110b59d8ea4f52ebd4e";
-  sha512.doc = "c9c8da55e3e3729a233bc3da72460003ab22bde7572746252d9a24177480c76f97ca2e68cdfec7b6af6594d8324f6e0066302fdec03114d17a90f52ee7d5c720";
-  sha512.source = "2c8eac058af4dcf6fc6947db74c569d756d5d4d1f5fa86ba9da7cc517be9b0c6234fdc7ae4623376329663dece1781e2385eb1c830a6827a49950253a760b933";
+  sha512.run = "a1745e0a3e7a28bda4fb8ddb9932b9c822f3548b0f3479984e75ef1bf458c68c3500fe9202925dacc31cde9445ae3f6a86176035bb0698aa41d93b7258013d9e";
+  sha512.doc = "ffbe04812d249dcd60ed310c2bdf8f1eda025af3ce4a71d90a9dcbc8edb678eadc3b11f22fd1823a46e49a6fdfe153f8b4da8ab7bfc509fd3fd2f6db69cf72ed";
+  sha512.source = "8e13c353244c54bbbc057a69f8c471f6e8fe8d8de438a1450c27e015261459c50fe4c4cc9cfba8122349e3a960a844a58c4fb270877e3cbb2d1e748614aac5af";
   hasRunfiles = true;
   version = "0.6";
 };
@@ -9464,1321 +9707,1350 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "aa32d870510ade25cc982d66f190949c15bc46825b014421b179ff992f00bfd9193c976a51978bc19944cd6b32b826a1fb147295d6069eebb163b07f406e8770";
-  sha512.doc = "aa9795d1d1e03ab4086ebd0a7ca097840959d49b9b63d7f6ecd8400155b9bd052a28d3dd71355d1c3b28bb510ebb2198fb9bbdd9f5240f57c55cf4a4fb104c05";
+  sha512.run = "78b2589bb881f628ecec66cf3fb5829ff2f752faa4129db0d06321c63cdd229ca3289fc788757508359f04c3ab17d7dd2af87b72f27704cc2a172033a133517f";
+  sha512.doc = "f4c54e5fc362b37f8836b534e2ffb697f0eb123aa2fc3e46a97a373e0e7ba76d5c7c09f2056c847940e2c22106c4e1440cbf7288fc68374bd08598545a451a3f";
   hasRunfiles = true;
-  version = "0.41";
+  version = "0.5";
 };
 "dejavu" = {
   stripPrefix = 0;
-  sha512.run = "d3072415e3483d270587bdec3264207d9513c9163afbc272e8fa59332f845b3a598179cfc5c3221f5b4a6f18e0a2a1c770331eaacebf58d1e6e71ddeaf3199d3";
-  sha512.doc = "08245ab094b70665128808c1ff28bd9554683138473422c7c7b046e597044ab8a0af925ca35d17c67c1db501c8af5c78e4ab0a8f26f8642f89dbc8407a305242";
+  sha512.run = "4c9c92c9572973c24200e6a1cb475879ef0324833e1f5b201fa642ca1cc0bbaff7442a5b91f381515144fe9597883ce622018ff8df95e0b06d0e8a31d9ef3535";
+  sha512.doc = "97a8c3c6ad9857d75e1aab8afc8bb1171ad641f49aa4079227b3ca0fb1b690e331db9298c63c0e788ba6d5dbb3a38cbf0a176469a5748640ba50ea23f358d491";
   hasRunfiles = true;
   version = "2.34";
 };
 "dejavu-otf" = {
   stripPrefix = 0;
-  sha512.run = "ea416075faba87f1e199f95abfa146f4cf476a55ae0ce34126aca9c13481b1592d0064939733217a315bdc1593108dcac2026257b74c5fa5abb93cd02f5b65ce";
-  sha512.doc = "466c8df7160bd2c94224b783a4b49d95d63d4bbd59eecda3503ace43aaaa38adea9b126b888e4548dd94ccfb783414c816c58fe9b2c3be45963edbf623ef50f6";
+  sha512.run = "a566a93fa963b5b0a3301363313d090d02d283d04cd11ffff601845d5261b45875cf2d2d8e89c6996caba315620738db93ba7707f4e4710d74216c2360c322b3";
+  sha512.doc = "78630824e4f05b4f4d19491b6d78a6ad58a3f717e93a54b1b566175a8f0e7de1d9b9e1361fd512a7fd5e84b6463e321f577caaf9c1b0e2d42d4061ad7673a3ed";
   hasRunfiles = true;
   version = "0.04";
 };
 "delim" = {
   stripPrefix = 0;
-  sha512.run = "8f3f6a7aba5c9912883df5202547f526ccaf92b5c34be32e084df0be9275ec4f195ed4cb6789523ad39db3675416958259143a5fda7f95b8d13cbff2a83e6d2a";
-  sha512.doc = "3cd42ff6f8b5f9b3cb28e91fce071e99f57ebc4d5d9646a6b96bab352c293c00b887f8bad10c88bc84949449077c5dff30baec22b156135e2c426ee14e392a36";
-  sha512.source = "ac8cfa8373514b26b29ce427db9b8831a96383a449539cf978d499457a51acddd56ff433ce8744f8dedd0cbe611ef2fcc63967ba32a7f1ec07fa55d2e039b661";
+  sha512.run = "398319d23e1fd48ffcba14d61f7299fa7b42b3365abee3ec2ddfd9d9f5b7bebdfa505bfe700017d2b67b7aeb5aee756b41a516c7483bef150cc56683572b3d2b";
+  sha512.doc = "6226f6f7c6e57ea81cd396876475a88c6ca9aa5cd300a7a5665d72dc60c3f5ce6bc042193de728a09f60d69924374c40ccfb45e4954342c1f163b8dd57d11129";
+  sha512.source = "c77fbc32522d65137251c7638fdeffa704856bf8b3e209cb3db94861111574c3dfcfbb3ff85d0795f0070bceee0e544a369f6af3a6c94cd486bf0c1f42f39760";
   hasRunfiles = true;
   version = "1.0";
 };
 "delimseasy" = {
   stripPrefix = 0;
-  sha512.run = "4cf84281beb3c2e368f71553e4bef8e2199f11d02739f487db47b13ba8eb5998cdcc514ff9adb38b55b1e96957756700d0200ffd03abb9a774b1e25fdcd81793";
-  sha512.doc = "cafe52f2d589cafd545ceee75fbae9aa54df65368f43db7ce44af68fddd48034fba842a7e817385049365e02ec053b3335a992b9eaee32d561348354dfb7e1e4";
+  sha512.run = "a002802ddb2dc32b142165d8960eeb194719119cc79bfeb92944457321e3919bd97fca7adb33647c902f386dcc0754a765b3f17db49cdf060105d8fdea9223f2";
+  sha512.doc = "c483b8d91757673a96f3f9429fa52a0b352d2a33bd2310e8da641465bdf2fab4ca521bb157fea89553635c3c992e29e318441930ac5b51a418aa78e7ab949026";
   hasRunfiles = true;
   version = "2.0";
 };
 "delimset" = {
   stripPrefix = 0;
-  sha512.run = "dc22038c4273f08fe6730f6f4287032873f956f8eb31e9b10199b514dfbaf566285c8d4e0169cd4ebd69fc410eca506a9d45ecb47bd58628b04dfc89718b9313";
-  sha512.doc = "2b62eff0ed48d76649cd303bdeff4679e0474b554ca3bd13a8885606fe56614628d3604321cf785898c3dc21c5215530eb9819e4b95e419c3559f6b0f2528dab";
-  sha512.source = "1fd1b60bdf7da499416983d1993027d969da0f73cc03e2cfa05def8204b87508f4bba1fef61bf32460537c9435b21c21a7b5e2cb4145e35f6124efc6b07f0805";
+  sha512.run = "693913c99c249c5d238b44b231ab9bc2a4acb53c487b21f7aa8557176170185326deb5e0ee00d784ddddb2d3a51a800703e1b0691243d1408fbaf65dfbab3d54";
+  sha512.doc = "5de5294dd61bcaa7bc4e4e4b6460e90cabe98f88ef692f37087ff0d752d3c2071cdf4f40d63774874dca932c3df22a7c24b08a7e51c15d2700d7ae43f7ef6e0f";
+  sha512.source = "067fc6a3b6842b92402df860183470e7e1cb908debb85502826f5c5179b10e35a3e254fb69b0dcac9cd4b2b2bac04994adbfe472ab415b76c71e1b0f56ebd10c";
   hasRunfiles = true;
   version = "1.01";
 };
 "delimtxt" = {
   stripPrefix = 0;
-  sha512.run = "e04215aebcb0d04835fe890c9a7a187b9cb36b581dca6bb8db0bcc23e5b1676ffff88d220b3fb656a921b93c1c8ff3643a763c19cbe139a6d80c83f56479a1f0";
-  sha512.doc = "8bb5e26ce39edd93299d37a1f37e598eb6d4071d91e5c6da0885f8dd6aa9f5d9267c56422c69666ef90f49407ea3c9072fe00d9bbf2189533ebdaa73ff850ac6";
-  sha512.source = "71c821a05542bc496a44ab9d3dae5fb7cb9527a1dfaf8501ccd8b21cf7fb6bc29d5a4033d5ffd6ddc2db714a02e3c246362b3ed03d53df7eeeefa27c42689018";
+  sha512.run = "9e2c7fbbe0b86c9059be8b58950a7495f4e67f5ae1a1c6b296b5eba614e791efb3214aa3aa66b3b5bf3e158487f3da8a0cb749dd6ab7a0315655676555763f4f";
+  sha512.doc = "b7c54f4f24b63df675d8d0dd2356a243fab6aed848dd26f0a0f627f9faf512ca644b2f8b9e8c4ff3261a8d7edf87e1b47289a95600b34ba3bb5c9fb3e61d1c59";
+  sha512.source = "fd90108f697989fee93b195236c8f5eae92ab4e276cb68bdf4d30a33fb9e608f3d558034f0bb4751ad29d596942f5e034e8e2dcbee0b02854fce83f0f70f776b";
   hasRunfiles = true;
 };
 "denisbdoc" = {
   stripPrefix = 0;
-  sha512.run = "42eda8a9789280396bb607a3e35a93e41c6fef6deebf864b03fd47c9df02a035d6f23761b43c70da3d4faec1b760e826955578cd78408a1174bc4be32c98ec57";
-  sha512.doc = "c96a3d7e034cd2202e61d56a65b366063f9cf07e77c750d1b48eff2da5b37293c6d8f3e6e334adef971026b77554bed5edf1cf7b2669f0aebf7b98d951eb7531";
-  sha512.source = "9c887a7e76c7d0587fcf41b86ec272c1e290ea328e18cf9be7ec5311c655af60b8454439ee37c129145eaba795530a199a7dbc5eb62b51d33887ac4dee4d14fb";
+  sha512.run = "35392ca689c9b9a5f19fc514735f847b5b8db0c4726624d4089037f8a6ae19c070d73c56312e8f1aa330888dae53dc82a68ac74a2109bc6283508e143c057f12";
+  sha512.doc = "46f7c310f68087359c3fc3dee548d52fa26e7e2f8a7585864318efa5773239ba8f663dbc6c3128d5c181ec920f4bed02df273b446f4e39c51dc35d3531f74591";
+  sha512.source = "bc5581e64aaf117f21325a0dcb86929b8862a034d5efaa31742ff41ea03280d4f93e85de0f07a24a465dd6af1eb60c0993d6f74c016c0e264656516d123c7b4a";
   hasRunfiles = true;
   version = "0.7";
 };
 "detex" = {
-  sha512.run = "eafa287dca73c075ac51318e9fbf71851c2b55cfb669062e572986cbb5b04fa3f92a8bc4bdb4a4c5ea41c27601f7849d4abe1973b1f9c6a0cb34e6cbb7c37f3b";
-  sha512.doc = "541972668bd85f0b101a4d51034b70d18c2ed5a4fb319a7e187b28de46cc278ff120584c109d9af69fe65a9a361b0e12e42ed2a409d32c6432c6431ec8f3ee43";
+  sha512.run = "8d0578d3d6e8b57628b925ac3a4e80ad3395ddf369530921a5dc5ca10874d94454cbd7217401b8a7e64b4bd0fe49aef448102729bd27774d5b391730a43277d6";
+  sha512.doc = "51c53fce8f94081fde38d59aa47b1220f0537aa5e0a4c0e95abfa7cf8364856a84d5d09e51ebc1434c0617b375a0d3a22c302ef96e53dc774132af26e692d5f1";
 };
 "dhua" = {
   stripPrefix = 0;
-  sha512.run = "3d7a4262e956e82e8397505191884d142d9b97d99e1598592594c7dc7bbdd2c2bd57d2959f419f5d9fae0fbcde7930c33d864d712664fa3d7f9e59c9e18e7240";
-  sha512.doc = "1de4ea592f3314d8deb75aed38eb082f9424d76c41a6693a14440a64b07a0d330a137994b5ceb53c62f32c003168a817ec8fc5a834efb6f3370435e63b991ca1";
-  sha512.source = "4d9922a6da40144d0829144cff61cd4a886eee3ad20724985b07b0df534059e6aa9244131a250ac9baf4aede4beec5b1c7e26d6f45e1ee79f9d1a7439eb4b0bf";
+  sha512.run = "78c83ca709701eaf068b4ca9a6b058fdfb1ecd495ac8a7cc6996106020c1da0dcd34d17e4bdd7af8338ac182186435a99b4dc15ce9a6fe97ea967eec03eed880";
+  sha512.doc = "7d1702d6041ab0405d67b57e26de3181d30a050c3ddf97739a971bb290c765b5efe825d459fa20d5c8bc12dadbcae2d54345b068610928d65106ef4684b801eb";
+  sha512.source = "4fd741cda3aa61ca0c6e8702860f68a454deae5a539cfc8d0486df993103e79993b3e8e3836cbda3c62c5c234065b2de020ac0dd0803e2aa9e51ce127fe7ea8b";
   hasRunfiles = true;
   version = "0.11";
 };
 "diadia" = {
-  sha512.run = "de9964cf0f3659dae68f56fada6e2a7320dec2b06c35a3fe9da9103f6e4ebb5d9148d1cc0281a15377c16164c21b0dcc8c976b7c00d65bac4058d6441240f8cd";
-  sha512.doc = "9882e5e334aa126cb4f2bafd5616003e9aa0272acb5e04cbbc0c9d2cfa2fa9de2d3a94e22f51c6ffd14e92e7996ac4dde532a163cb739f6e54dba9958d33cba0";
+  sha512.run = "9da55c18d8c4793f8489dc429fed605f6f1d0a01c4440aed744161c9447d56c022b47a0721d39aa100c200bef7e4952c23c124af80db1a51845618f0a22111cd";
+  sha512.doc = "86aa3f4afd1f7ff19f072654b86421551b22a715f71b2dc17c2fb79e4f753914a41a043b5673f9502c4064f9c5865425de1c3bbc84565e0162a9018005585161";
   hasRunfiles = true;
   version = "1.1";
 };
 "diagbox" = {
   stripPrefix = 0;
-  sha512.run = "13ddd0643a47621250e40a12a33c9e93250470dc454bb6197a9fb69df7f53f54e1499d95f8694180ae450e9ef5cf616ee88b93488d8d6285dddb57cb4ea9d2c2";
-  sha512.doc = "0fc808662f680c3fe32cdbd716145b5209069529cd343e4804002e3eda999c5046fb22181112fa34e18e5c5690963c122aab19a4dfa404e76a08f1983fb2dce8";
-  sha512.source = "1f56465ce1416c687ca9f5b403d4641aa4fe65e07fccb35086d548fedba9f5a357672ef2efd7f5559524a03b6a05d26c0fb37cb18a9eafafcfd98e4c56b006e9";
+  sha512.run = "6aed511fd3b1a6eccd265511fd9b06756c1212815c7bf9539b42916bb8936e345a729ff51f483a5cdf959be932616aa6ac9ac02dd103bda9a4b5b2888acc9583";
+  sha512.doc = "84efe8524fc846f3f48bf9830f4c3247e8f3e3b13c389f3816f097d0bfca949600601c5108435e84ce50782384df0cbfc60fa6a15e90385f21982c7d2522703d";
+  sha512.source = "7d9df6c4557ddf56c92c9d06a2389a68d7d09c1d8f77dd47b3b9718ed2a79cb2ec5864fd7ea80cde800b1d496ab542402fbbdc9dd99f5e38ad8dd8b8d0904a70";
   hasRunfiles = true;
   version = "2.2";
 };
 "diagmac2" = {
   stripPrefix = 0;
-  sha512.run = "7e72b7aef00b1e7fb6f26e00cc7e225d0b66f2f6d03f9e2ebf0989af9014e56f2b69af38f2a74f3f040fb9a4180f8886928551eb6f9d7c2367835189e48f93ce";
-  sha512.doc = "bc4a7c26e514fddc8cc3a691a2f6499ee503af46134291ec1ec3a5c08841c2c9fdda484d657b23f39a8389a390c03c3a302a257238494da31efbe0ee7aca3fbc";
+  sha512.run = "2d5db3fc311c588a6fb7fae2c2ffb36e330b90485ca1bca77e3796d8cda8b8da9d9b75020665fa65d2564826576e9cf27b5a4d8b430e2a2fe3a14c0cfc6ed814";
+  sha512.doc = "5c6f1ea99afc70106b826474a3724fdf44831fc2d7bd8a120b0e86954e70d8d5205fd3f75430fef2638d9e4e41ee747fb1d53a73eaaa408724a19cfcf9348747";
   hasRunfiles = true;
   version = "2.1";
 };
 "diagnose" = {
   stripPrefix = 0;
-  sha512.run = "9370e74cec4b887e73ff10034fc59533f7cbb8ceedbb2dd0bd87c20fa94c220b526e4d1fa4d28e288376130638a6e4ce8868fae6cc883d8318bdde8f0e03a864";
-  sha512.doc = "8547443c9732c53bd21b5302302e738830ff7eb9ea2cc034d2dc8267d8e37b2cf7d6d3dda4e7deff9291396eee182c57f5d77117b01ca7a155379e17b6ffb189";
+  sha512.run = "8a1fd10a3ce3767f7535bbb8d8a2ad5c4bf93217195a266aac9cffc8911d066c00e6b30d7516ef35d2f0bb8401242cc81554adb5d81b923f69db8e7ebee8e325";
+  sha512.doc = "dc7a9259ef3f657ed045fcf2f67153f941e355d54c35447166ec5d782953e3377e2bef6e9225162d8e738a5147846beeaec766e26bc04a8eb27ad3fed580c996";
   hasRunfiles = true;
   version = "0.2";
 };
 "dialogl" = {
   stripPrefix = 0;
-  sha512.run = "d5b42484c10fc20afd70e47a0d92b3a23942f3950954bf6da2186b5894dfa65c54166fc00e77a593de01275667cdc661018f22d0b954d828c148298da5411df3";
-  sha512.doc = "27335b60ffaaf45599022d863b6694af8202e1ce4331f5f42a17155a20de1fd791f2964ce2b03f13d525bbcd2e0f6b17031d226a9075f1a593927136f8574aa9";
-  sha512.source = "4d6e176125dc77802e08e0d350d6715a8a653569576fb6df046c7cf39232ae8c8e9fd84c9317eccfbf7df19c7ba6cbd63f25e8fcefac40285f381c0d78191f16";
+  sha512.run = "c7589eaaf5ddfe668c0153505ad8d8251b2bffd442a3afcef25732e870b6d7552da6ca5e7864a141120ab036b6be4f9f7a47922264fbcbf21499d27a9d2b9f43";
+  sha512.doc = "61329d07bfe28603096da087e8dd14a686f1db0daad0fcbfb34accdd603db610a8af1ba48633ae4d69058f73989e81c5bf3123cb53defe0265f37171c73ac84d";
+  sha512.source = "34db457e1ebe15ee633732f83b9607dd26d41e3b2856d461ce335df9dc278d7692c93808b8084057b358e14d49f304511ed052b39f2787a1b1c032732365094b";
   hasRunfiles = true;
 };
 "dice" = {
   stripPrefix = 0;
-  sha512.run = "0b251ebc480781a27062830a63b28aba69d36f5e972511ef4c4048bf771f33215a75f69e0cef858f17f670bd40b3767970f00869e9d789e2a20478e204a7ffb4";
-  sha512.doc = "1e1edc80f4113b51fd4d6bf3a8815a18f8ef446411845218326b53495ab21d6956100276f2ab97af1b4833676f574524ef5d7dd59b05780ecb3fe1b8f0346c24";
+  sha512.run = "b5f13508c7610d4761c86ad6eb4a5bd4767e30926dda2ac33d43e48b8a580bf479b38fc0791778f71109627c9f1774f79a85c0017cb76560e8f5f38f38425aa6";
+  sha512.doc = "a28869cb1dedd2122abb46029d8889d3df24adf39cef4c4e2dc62c1ba253bc27f2e77c7062845d229a6b0222ff6b8695fb0698350749c4a7b4e10aa34f3158ac";
   hasRunfiles = true;
 };
 "dichokey" = {
   stripPrefix = 0;
-  sha512.run = "485f611126895bd7050514b320f52256b8930cfbb2615864f24067e4488a3ce82d5a3911ba8f640e03d6f9eb298795bf5b66489074e1f2403e473b2073ab2259";
-  sha512.doc = "8c5587b17a0719fb6ce93b9e6c989a3f60afaefe7aeec98fbc6668e83e3a25249d8ec32b2719e8a6357144f78794d41899dd36cb2cb4d618e0a8e07f76896e0a";
+  sha512.run = "b3b87eead07327dbe3424a65b1f45dfc5b6d706a57daf822f9a66b318a7ab05124c622ee931d5d3c261d8eb4084cec9510469dce298f7ad3ba254b2e4b2f78f1";
+  sha512.doc = "3b7a4e41bbfc67d72cd1504278b3b872dfe8ed9a60b171609518710ce9948eaf463ba0a89bf796255012d42c905cb27106131a4427f50ab5bbb71fddbd7ae98a";
   hasRunfiles = true;
 };
 "dickimaw" = {
   stripPrefix = 0;
-  sha512.run = "74d0847619aa5c9600b1b4c0912ecc4d30eb21be43ab261122f46ad542f5d937887e5977afb315de2f45dfb69654d70bd2fd699f79fc5f77f660b6837e1588b4";
-  sha512.doc = "39cfbeaee99bb4fd990c1e5d65d7689ed55511fdac98bd7f4a67fdf133f8db9f2eb390a614123cc7d4612f88fd30be380d210af3061fddc27c3ad499874fd59b";
+  sha512.run = "dee696667a2c05150ea3da51c4c60ff67336aacaf82a787d9ec4bbe0c04b1230fcb6a175d35423f2ca95ecbe34a9cf4930b5e099ef27593a295dfc217bb2d9dc";
+  sha512.doc = "c915f7cead9835528f7a209f78030a96ffec91d1fdc0d340371121cd479b87c301de458e35878c4229a232879e49615853b077c4e80bcd06a7544eed0b623d9d";
 };
 "dictsym" = {
   stripPrefix = 0;
-  sha512.run = "f5bc1e7b6ffa030097cc550041e306b9655ccb25ed0075fb78c5ea6a8686c8f87da5a0bd0c5b84f2a92cb5a755bfc451d648718bb411acceb264b0b4d780af5e";
-  sha512.doc = "e653ff8c00f87f30171d8a1e846ac268cf38d4bc67a8584c15afdbd2524b1bacbfac46252426175c51dcd8662b70f33ace08d584dd80af9cee8045d8f83caa06";
+  sha512.run = "44d2bcc9ec9f0d1ad8f9cf75d5415de89dcc77fa11d4193180b8c63ee67b0e55eb87b95b05d0ae0cf7f35b7f3f85d93ff79819020e11bfa71e249adf61bb748d";
+  sha512.doc = "1cfb975605ecc9b8c5f3005f6803daa6daae9369348a70238fe4950e594c71781a620e19dabfc024bd3e8db620a66a5fad845bef5acd347402da7b35a6a22345";
   hasRunfiles = true;
 };
 "diffcoeff" = {
   stripPrefix = 0;
-  sha512.run = "65b3503ddb17e1af2163e38944e4d9b8d8c4157a795d10cb4548b12fe00757fdd6c3fbab3123d3bb630de6d9ccc336641282ab4cf04372bfce10d802643eaf2b";
-  sha512.doc = "5ba6385486e5a4a742fd37ce046f5b2a6bf66f95b67980e9cb17b8e8c38145f7846a02e7df144d13e84cd4ce0531dadbfcbc72d2035e79115954afdb78ac7503";
+  sha512.run = "1c473f6107234075342f29d4040551d9432ec4ad28911b0efc594a60b3df21f38d0dd3a38c4aded320c6de46cfcead5524bb92f0ab9fbfd2c7f174a3c70b71c6";
+  sha512.doc = "33015c1064aa6af456c1175d3ce21d8e656c2e4a8de4f670f154f244ee52992a572f2ed86e0b00853cd916b01f71a45dd30837bff28b9a2675a15c361632ad54";
   hasRunfiles = true;
   version = "1.0";
 };
 "digiconfigs" = {
   stripPrefix = 0;
-  sha512.run = "79df1af74809d2d1f0a92aef10de06bb651c95082f3651439af0cc723b26f5bd6a869adf4451933c32da46195bf35f204bee6b4eab5bd4ca0cea20c02ec89031";
-  sha512.doc = "f8493833ada9bae0647ec8d8dfd2944413e4e43ac1aa203ce29c94d66766ee7c8d60c68fff14c78920075d0aaac0d7d92d8fd47029783fb1624cf27e0e1f44d4";
+  sha512.run = "e86fd88bdad9d702a4f1545696b9bdcd0898f33694f032bbd4fc6abe2f7cebd3ffde1db94a630c15c823afb59b9723213740f6786340ceb77f4b279fef975f91";
+  sha512.doc = "ab47be821ea3850ef015f6cdd57241eeeb330d04761c841999cc0d228fa6f37ea7bf4641e751343a581a0060ed057f0a56cd10e3887f722c7ff46e701e5a344f";
   hasRunfiles = true;
   version = "0.5";
 };
 "dijkstra" = {
   stripPrefix = 0;
-  sha512.run = "7b2bac4cbae815ae689dc6c523ef6e19252879aba40ac10cc1803d109441fbfbabcb2aa5acd3074d70ab72ea40ea21ffc43756e6c3a2d571689b78cf696f103a";
-  sha512.doc = "357ded9c047733ef7698d4c6c620f6fec7c64dd11bbd8b1b188d50546c5bc54d474d0d5c81d854097fe9deb8db98f9d7c9840988e13ab9f86d13b572a487516e";
+  sha512.run = "e0fc809dabf7e8367d1c22b88d4faef748dd694044f2af7abdf6ada699ac9415b93320295535687f4cbe575965edbef7da4ac69b8bccde73d85f64ba9e146901";
+  sha512.doc = "1803a8918675d4ad37ba8151567a78de6ea6f0c282117895f1813da9bd6c88f7f0f123667da02a4af52c112e79bfa0bb796575f6be3a8daa6e60c7c73d8e4216";
   hasRunfiles = true;
   version = "0.11";
 };
 "din1505" = {
   stripPrefix = 0;
-  sha512.run = "479efcd4dfc99ac545f9e60df139cb9878f01b238c840f707282b6977d3455b39632654828abbb905e2c99001022dd3b842f5a0918d7094b7f0ead76d7fb8edd";
-  sha512.doc = "a0f73446e074b0f8681962f7a5415283e94f9c4cfbf15e11170ded273826b75e8f20eab3e3bd79b24f69c6fdc21da17722c679e54d35ffcad22341171cac1901";
+  sha512.run = "d44b2758273e4cdc69721ea0be9de88dc1763b69821df76be8ae341809f538278989bebc81633e597c7e4e11b6c57a07e474781239531edfd2f216288a47889c";
+  sha512.doc = "be4913c9ba87ee6d05c3de5ba73f9d67ef624b6e093908ff4823e9e14ee5ba295462ad497249e23811a1cffcc2b17da261b6f7513deac1bba5e018bce7181f0d";
   hasRunfiles = true;
 };
 "dinat" = {
   stripPrefix = 0;
-  sha512.run = "cb298fc2ebdd1aebee7dfc4e684d10cb14eae1ef0cb49a879c5fb44529d56469477057306f072d573346ea459fa6c5a93fb29c7d0ddb6761e3a341e1897a8022";
-  sha512.doc = "f2f4b1748cacc985e7025c4e0c5948c4bed8d899eff46233fcecc5d4861bf43465ecc16fce08da1e2610bfff7811250645122b88d3b403f81eef98ef8dfbbf04";
+  sha512.run = "182665e612cfaf6895faf597cc0f9145bf35e3f0d1e3825f29df8c8ec9640adee142e9719cc30997d8f7a9859be687f005b2bb3e1218e2178de4d6455f0f5708";
+  sha512.doc = "542b327394cf804f3cfe64ef946030aec62cb35c69e2ac6cb5f6bef305aab0b575e0bcb76274476c60081cbb860dc382eaa8039eeb2124811a7b84bf42a058dd";
   hasRunfiles = true;
   version = "2.5";
 };
 "dinbrief" = {
   stripPrefix = 0;
-  sha512.run = "e103aa12b1d8cf0a89c7309ab71d753d9efaf597cc1dfb8c8086a81647799bbc2baca3dbae8a9f3ae09db1b74f8adf25d9d0ca0d9d70adb04525db8ad456a6a8";
-  sha512.doc = "512e2daaf5f2eb34e8ed3781443ba80661b99442fe561394d5c2a7346716a27e818f6faf87a4ead4ae7c831ab4ad98980ee5c8fbcfc5e2aa48241771456b6ead";
-  sha512.source = "a75c31dfb58d239f37750422ef21e2d7b9c8163036dc88bda203f72a78dd615b17333e3f8fd342a175ad578c97b1969d94f7a6cd44ad46ad4b27e0185e748f21";
+  sha512.run = "e47c60c8dc28ea59c0c50792b22a82e32c4879820e3df0a33f496b18b87b9f2e83dcf9fecee62383b621c3dc2826d2e68fd61fd7f1decda99577d8c4ae63ec2e";
+  sha512.doc = "e85a36ff3b35b66ad186ff748fe43addc16f3671abe5aae5c674ca541dfa8670c0b718f5162c1dc6f1a870aaed9e5562f14cae85542b1cd6ad4c0a89fd65477a";
+  sha512.source = "82bb581c0503006455c0700d96b9ca4f7776d3784fc604256ab6934d485d4233e7dfd2a95a72e41c89580708190358403f51785d3f41cd1548aa9efd98bee318";
   hasRunfiles = true;
 };
 "dingbat" = {
   stripPrefix = 0;
-  sha512.run = "ceb799b5196a1adfafbd05e582b52330810e3c15d366f3b888b35e7f65c87ac8bf8015cc565f96387fb0e39f54c67fb7ec065c4df3d4a24c2f7bda1cc319a7c8";
-  sha512.doc = "b67fdcbbd01da0e0aeb71b9841249badf0ce81e792cb48c0d0fb8eee0d532e502f2e737be5d11b47ea779bcb06c92b75e8d46a74b5e77b38407289fdc24f221d";
-  sha512.source = "e9fb5e1002a3ae0e9fb12120e394d29644de8ad0122d191e07f8044d8140146ce649e47c087f3aac2c5609e25918d3d05ca8b76661997befd1b4400b7ba711f1";
+  sha512.run = "207629d45e629d9d7dcdf7e75a23741b1a92b3f6fcfc49f6407480f1b534f9245abd60242b29932a6694ffdb2f7839c3f1ffabc969bb156bea899c40e124c5a5";
+  sha512.doc = "ae9525580681685f5c9200ac51c21fa71e244691b92e2194ee386ce19dab7d64d140715bf90cf7885387010d2be902464229db2c3bf638b0dcddef4983194543";
+  sha512.source = "414cf13ffe76f15cf66e6639696908a1f8640da5d1d7230bd3f8433fac1a04b52dc4623f124124a814e0bface44b5c221605655d03168e877c74f70061eb9cc2";
   hasRunfiles = true;
   version = "1.0";
 };
 "directory" = {
   stripPrefix = 0;
-  sha512.run = "925e0e3324eb008ab0bb26a6731ab5723d863270db593216b0a82e1fa934ece3651f68a41c244bb2b84c096c6f21d0cbb0376c094c3175838002d9773ac9b5e5";
-  sha512.doc = "f86990ab1f16e6b27bb7b59d6f28439d476b488ffab0b66fba1f1a70557d3deed56a486493ec8efb31f9d0b65a327bd4cbb63001bd8fce0b7b15dcfa50b92522";
+  sha512.run = "4cd6d535af7877f5fa6cbf64149a73c2a38d221dc100a9491fb554f1c29856a1db138eb8e4f6e6d97c5992aa774af7545e40c35810d6c9a236bed493b9d61038";
+  sha512.doc = "564136cb7848a6ed0a804a09e7434006202f7f4b0e48d7c24972f8ba06494dea2c9a000320506b76afee220024ae68c58c011832aaa1add45f00aa859a801ac2";
   hasRunfiles = true;
   version = "1.20";
 };
 "dirtree" = {
   stripPrefix = 0;
-  sha512.run = "6bbb349725737bce101d21cd39c2f9ddd5e89572000f3fba4c286eef97f5867f8cf67b94828927a5ab405e9f635fafb29e7a9cd1fc0d4ffbe30eadd233800fde";
-  sha512.doc = "8d01b6689e9b38e96c001278be01ebd4e07d70a548f4db8e2f0319d6255eaeb04577e92baa224d9f3cebc9dc4d306414a4606a686f75e56f911e1cfa4e249ff4";
-  sha512.source = "6c2127a930bf8e799e2673abbf4c53e5e18db75eed535bebd1cbfc9000be666cc5a97e9084d8a38eb879ae5e987aeb3febb41ab904e838184053e48cec60f202";
+  sha512.run = "e7dd498337de6078a977eeaf549b0fbcc73b1d90ec4183c8277b29998a1bb1d8ed5490ac4c1e4aae6006a65b37503e84e234e7d34be41ea014df697db77a88e5";
+  sha512.doc = "5019f352f4abc5cb967237163031ab340104ebc055bdd2ecd2fc637ee6cdaabecd838bda496f32affe1d73f7f1dd39872f6e31c1c992d8a6346d985963542617";
+  sha512.source = "1c06dcab34fb3c7928ef5e75f1642e42adacec51ccb86400a576899d55139b3ddbfd69b66153f4ea7f1b758bbc4dbbb89316532eb2453e4b9ff3491974b70479";
   hasRunfiles = true;
   version = "0.32";
 };
 "dirtytalk" = {
   stripPrefix = 0;
-  sha512.run = "1bcc56989e31b11a63b3774eea82cfdf8f722f41a2582b2f98db9fd00516c14da685a52a03c582dbecd56815a9a1e122d8da78d4ef90aac6c7ba49a814c0765e";
-  sha512.doc = "5c184d02df423f5c44944251b32f4affcd8887cb7f35d6846a55a172d2b75c7fa2c7dd8895f4db7e0317988f60f6a27153057706b2813dc328c74f0068156868";
-  sha512.source = "0ba8285a3a89861cedc53f8120f015df16eb019508b61efbd1754317a77f58f9e0504f619ab2f6e87a35fd33335788757f227cc5746d2771368eaaba5def2f96";
+  sha512.run = "a8f892a92d7296adfc272c3dcb651d446337325e26165128fe62ff821d7983d0123ad63be3f315bcf391a3421979f20d14f53319dff4a36eb685e00bf1646492";
+  sha512.doc = "90390854b6308ea4dd1aaead46fe72e53fd9d31a2e2b3b5f52a58066ec252c2425e87278e7bf62e2cffc41e25ea854ec0475d29d5d524d58bb6e0a1bc5de6f84";
+  sha512.source = "60b3f24e3093a67b9692eb10b9b4a11759b08fa222892e9d9ace283e1cb7549f27a9155d84b3b85aac3af8690f12244b4be16af4da3b6765e0f0d1cc729852d4";
   hasRunfiles = true;
   version = "1.0";
 };
 "disser" = {
   stripPrefix = 0;
-  sha512.run = "bea077b4e8cd7c36a6d437d6cae1cf5ade857743425f0260fb7a6ecd96c4f51571e9de53e4df95b528c219000c9e5ad81ac55cfea9f14b09a0a4dc93ec9e8ee5";
-  sha512.doc = "71e3dda2f6be304b8f00f5700351dcc2acaaea1f0ff3cbba8649ca3707ece118f5f09e230771128cc0f699471d6c7452159172a030265d737c429f33f705a92c";
-  sha512.source = "508f0da75988a784eb2d181992dfd3fee3a10242b0eb3061d6be5c3af8e0fcfeaf0de4b1f8b4ee4fdeb5b622b1cae06e86152841c2f463ed522464640bbbe875";
+  sha512.run = "aef60e17ddbfca507c233340d48ad263e27c9fde9fc596cb3584223cf29015979fdaf549aa88b409809386c066c3b34b70e91f0fb1b76ac2d89907696e251863";
+  sha512.doc = "23847773835fa8a81a6311b8aac152aec7da421203035aecf3f0e51ad68e37d78be78e6a980b8c32e7afbd4363121ca44ff8fe7b42e01c01e6db61930fbd02bb";
+  sha512.source = "29acb9b33c3eb3c7fca2de8926cb1cd34d0deb12cf150dbc70287bb51d82694ccd7a8eea1b2bb463c83b1a5ce5c2a574e0eccbad92608f7cc83654d5edb2ce7a";
   hasRunfiles = true;
   version = "1.5.0";
 };
 "dithesis" = {
   stripPrefix = 0;
-  sha512.run = "f2a68e2000dc931671338afe52ef770db002ddd85bb368d01595e4446d89d65174dfa5b99f4e93fd16cbf371895609527f4e557a16caa10ddf06ee28978e1122";
-  sha512.doc = "23de6a27172f68643e009f19ec63e9d6b22e963d92c5eae7b1168b237c62f89aca07dbb1d1c90553c4d40450057b47174396283e9ef19857c384fcff46738228";
+  sha512.run = "d0a2d42001e187bc40ae90f8c35a3e4201062ff88302b478fce744d566566d8366b7ea2e3e2f5aba5e140cb0561df6b9c0a9ed02eddf214b0f03b3de2ab6098b";
+  sha512.doc = "0f3f1ecfe0fef0a5cb39374d3c4d32255f196c9e167ab5216adbabc1064153c552beff9fcd2f3bbc44de3e7294ff4ca368ae3fd850db6066a4f66e8ca35bf973";
   hasRunfiles = true;
   version = "0.2";
 };
 "dk-bib" = {
   stripPrefix = 0;
-  sha512.run = "3192632eb86f29f35598e5f5e582e57e3ad6bb68a776bca82fe60bd379024dcca94ff29ea93e17b21e13061e346d118982c57dee90dddd17c1f00502579a1555";
-  sha512.doc = "7d4d0b5d0e6b62248e767e7c549946be86381fc83efaca9be6cd71001af5e485468885305013330b72943c6f8d5de572ebe44a5d824ea1de77ab0a13816afeaa";
-  sha512.source = "e9eaf79f882cb75d1553c2b4d552360fd8ef801dc35521e535a3448c4d8c5d9731a8665554f8c1e6bee308ca7a353a70e54af46e69a9faa2e20e9e29d2957d42";
+  sha512.run = "a426580847f7191e7a5be0b30d40a5ae8cfbe8b99931b4e71a9a24a121f15929fdb2cc67ac3e09a05b0e23706e318e35f9864f852ada3df9925fcbb03015d7e0";
+  sha512.doc = "0615b75f8dd8b6270426f7e4d7ad578b02749218efca1f68c0d6978d584781de84de9716773002d2715ffbf7367dad5d964e120a4e8ba8bb3c6de48600f16a7e";
+  sha512.source = "5dbf9347b53041b40d424c3b147fb63bcb4675417dd4ccdaf9a83896a47fe34a70cb5d8a8cd8ea663e859fa718d18053e600ce606c58ecfd1105c4aff249198e";
   hasRunfiles = true;
   version = "0.6";
 };
 "dlfltxb" = {
   stripPrefix = 0;
-  sha512.run = "8765bdc89080e639cbc2b244b14097893f04eef538ee9c6f4b25eda5ae182ae4e94c3810822753a860210e2a14bee3000e41e0c5abb008eb9915d9a86ba2da74";
-  sha512.doc = "e52fec614429bf172ab366391d3afe26edd70f2529a68f3194f9af9c5e11de717dc76dfd20eed5c3fff837b61dfb4108cc4edce8c4aacaeebe8fffd1614731ad";
+  sha512.run = "1191058be1156138af851fa49bb282c4a6c09c0a4a8ab4c62d798ab8d2a257a499fb984c85a4db86f9ba9246c31336281262362d2c766064d5fdfc0286deea1d";
+  sha512.doc = "caea35de364a26e39b20e9427a0b0c2f4411f68856471e800f89e4e687d705e9990d0a6bfa15b1eb4eedab8d0a0dab620617d0a5c76290487c467456cce3a601";
   hasRunfiles = true;
 };
 "dnaseq" = {
   stripPrefix = 0;
-  sha512.run = "396fb311c680678e394cf596b8b3b3dfc679a0a5cfd4998d9d8c015b890d47637ae79c21ff1ba99aea2957fe0885fc747e224c7d2352d1e67eef0cbce8783166";
-  sha512.doc = "94647a3a3cb224bc260563e8b0a6731cd27d19959b73aebcc68f82df86c88211f07595592b340f6950a1bcfb2cbda489bed1a4931b0b1b61233875827177124c";
-  sha512.source = "86ae4cb8fd4a4307c5db77005c29c14a33dca563d1878e4af1216f2755bae775c1682ecaabca92797f9ccf826c88512eed526fdf374f847e610972583b292bf8";
+  sha512.run = "c051207f76dc0d3ae34fce61198a510a04cfd3b76e33da3291b8c5df8d56cf084ed930b3423d759e390098f86e797fb5877fe3faf3387768d01239caef64e718";
+  sha512.doc = "a811c8ffd9f0de9c28c31e9ef96ca80883eff7696c8390b80d8ff7cb98ba2bc296d39d492144514a80659378786cf78f2ad8538fd7a96048c2f1ea98ef7ebe71";
+  sha512.source = "f2feec6e5d21ed3bcbdab9a8ca4546a09f98c158f1be541078ab810a587cbba0532c17fe60a56f207bef982f879ae78c9ccf57432f4fae72b118ca9675e96c6e";
   hasRunfiles = true;
   version = "0.01";
 };
 "dnp" = {
   stripPrefix = 0;
-  sha512.run = "07b3e0120792865eee7b48d5e2ebfc2cb349f6c497f99d65626f70bb8f6297742bc1a6ba00dfac0651998035ba161ec8dd8612b58be1a306111aac1b93c1efba";
+  sha512.run = "408ee3bb38c49e17a1d7909fd36547fadf31c138f0dd4b924a249af8ce66ae1d995b0c125c2ea1654439a21b62be8c66b45ded247ba24f0b1b4834b581cd2236";
   hasRunfiles = true;
 };
 "doc-pictex" = {
   stripPrefix = 0;
-  sha512.run = "6bf5013a7a58e34cf2e9fa39ea634bb36ffe2e4261d13b01cd96f67930b812aa440bfce545e36455786ec392057af192958eb55229d806f163788a430f55507a";
-  sha512.doc = "9e3d2b0e226bf4d87cd64b1bdfcd19bcbd3851ae3a241252f9c87cd963e850a6f7cd3c52974c383e7d84085e7db0bcd83b382883bc678ce86888e7f3e344d086";
+  sha512.run = "bd82b467e9546635b757a9a4d564d276cf749841484fa5dbfe74d777ea38e9c05de376cc4a7d7183f9abcc54f1e2f18fd356db209764cd17030e8170b8b439e7";
+  sha512.doc = "e64ccf563460fb970f300c056fc25e1367ae8ba659793fe87e864ed4bcff84e3b429aa3751012c448157d8f09bfe1d1fa9f61ec84ee74bd03fb4ae699984c530";
 };
 "docbytex" = {
   stripPrefix = 0;
-  sha512.run = "9d7d45c17a298be7f3b42f6d4c0c197aa9a954aaf9a91d1526726c62dea812ca1be99955a1496724f9c651a7b31c153fe670ad795b09a3243c0c25aa1bed056d";
-  sha512.doc = "f7bacc9e2011e6606a8bebbb7f52bfc7a73827ca513323b80fd366d6cac19cefa4492f84783d2644ee7f6978b3d821e2eac17ee36e21d769c54400c354c45f7d";
+  sha512.run = "f4ebc8dbd8c64505530cb3ce0565d26617aceff17c312857fda79548156d4c7a4f26eead1158b1ade18118813695952ce9b6bccb27ddddd7fbea4c093e7ebe6f";
+  sha512.doc = "9285323693d2b4def2420b93d71389dbac40527d9a3376b2537c3bb819fac737fc4a59e27013588eb70e8f7932b78210e9fb70921c6af5a1fe28a67a7f0117e3";
   hasRunfiles = true;
 };
 "doclicense" = {
   stripPrefix = 0;
-  sha512.run = "7fd8a9f9dda6f879a7ff0b6f9e93df34cc22ecf9f9d42ae89505850b978fb8ffe767afddba0668e3b0dec08ed1418e562cc99987de0ed5d0c323bbe160867e22";
-  sha512.doc = "82478a600c3f6def1285e5f82f415670a0b3213d343a51a9e29fce36f38946aeb2035a3cb4c3800f649756e3eae76bdf18abae00d8e06ace80b0ab739c75b7e7";
-  sha512.source = "5b2b6f60c248ad1c68af0460af869e3c35c5ac5ce4bfa0a8bb51dd9576081e022835f2fd00b5bbcb74347d146f8afa9d3af1a4a89b63221f059ed2470b36439d";
+  sha512.run = "ac014e1f9e73092f027fbf3f63a4a40736231b6dd486d7aaf455465576f38cfa9de7832c8c0d77233fda5b8521a2af37014775d1be19a9e66d00ac2fff0dd35a";
+  sha512.doc = "0b915bbd69ede897c1af0b46bf99eae3948463f32258e3c61cf1cfa8f9fd500b83c244aabfc10c8d3d37259d6e3e181fe834d586d5f6c40aba5e9deff6e2afef";
+  sha512.source = "b8a3af96703e35ac14b8ce9ce5b95b09bd967708530a671e45bba3d36012c4be59ff9657696e7487967e2ec708d2218f053c4ece4011d891ba276a704b545ca2";
   hasRunfiles = true;
-  version = "1.7.0";
+  version = "1.8.0";
 };
 "docmfp" = {
   stripPrefix = 0;
-  sha512.run = "5c4f7d305aa119c7c63bc2209363f74d2bb9eb55d87923bfb003eea87ae02df8db664c2ce516a58aa6a9b0532cb22c90b0ff77138a9a05f44b0957397ddc13fc";
-  sha512.doc = "585e529ce476d5fbb1390a167ec2d543da16bdc81f56dc37465d82fd8c863ffa5d62afdaf80dbcc290695836eab9480a0efe59a7c7e6bc2d72cbd4be126f2c71";
-  sha512.source = "fcca34d35714a082680acf6b14b590505b5b8254600076dc7de782e97cf0c65a004099a78115e35ef85ac181f37989a123a4547329e3656273144c38dac4ed8b";
+  sha512.run = "951a247be986e8c59f6a38879bec769e2d12987b825420bad31ad220533060059209b9dec00c63fb8490129eb535e4d6415dbbe9d158129d0ee91b58a69b4545";
+  sha512.doc = "ec70f25d3dee99e016cd2ae6b2ad7d62d21cbf1fc4e80d6d4fd55dd650bcce15f3078fca185875e233040ea9276e6f94580c495861aaa3386e1d92767ffadbed";
+  sha512.source = "a2603d9494ecfb4aa079ba28cb0de1a3dc109019dea8792524278c99cdc34d4ee13dbf41383321f99370d7012ed441eeff827b151a23e34e41a04db71f5964bc";
   hasRunfiles = true;
   version = "1.2d";
 };
 "docmute" = {
   stripPrefix = 0;
-  sha512.run = "b629eca3ce4acc69e7b35d892778227be09c2acce99f7521d57759787791378c32e36e9df4611228ac3a70f4b803381fcc5f975a1e8abb38c1ac488100754ac6";
-  sha512.doc = "0e2c7fb27d7fa92ae48e5a3e8871aca99b459bb3b35d061fd87b2981a4abb0bb6a58bc65555c6bb448ed39dededdafd96350b483e2d0f11a5ba2d5e1a2ee2219";
-  sha512.source = "6fe8dcc8906b36022bbd19b53f3f3d9425975e0a73feff5d941dec33c54caf2ec1c53e895b48a8362af610ae094fd7bb160f6dea2381122856f1cf9837a05801";
+  sha512.run = "6014904b4303ddefeeb06f84128b1e8d8609ad6298269cbaf1e56b9c7dd87d481af86216ba488d764f60e794854a3c2ecd3aadb1433b592790088f4fb371a7a1";
+  sha512.doc = "5bdfd7a9113ee1a17c1ab2578d7d5035b81572c9bf40156343f4cc819cb26ee0214bdd95a7258225eee934f384feb50c5f2a06485db528c1529586f81c5f9be6";
+  sha512.source = "4992d9097406b95bf0746b6648e1e1d90fc11919d83a659572d9ae043bcb0ddb944cb43b575762e8f09d321dbda9c060862dd39a2da33ce2cbd4f3dde9c94b74";
   hasRunfiles = true;
   version = "1.4";
 };
 "docsurvey" = {
   stripPrefix = 0;
-  sha512.run = "240e0aac10fb064181922ac6b519779e2cd11c054a9784ad2f5f71e0c675ce9d0594846ce7358227708e86ec0068b4c9ef939d0067edefac6f8cb15430250ea8";
-  sha512.doc = "7fbba2a8dfd0438a9cae72c5e9c75d24a5c10a232a9d10da330ac7c944e89bc9b5330f599d3eea22da0aaa5cfb25abdcab670de9a22d84e748f613d1b2339a4d";
+  sha512.run = "a8612871502a1213fb2c3f061ca8773dedd815d246a46c7d35fa8a96fcbd613ed6b879284eaa026fd1a2988bdcd2143f930c8b910536ff156017417791d9024e";
+  sha512.doc = "91a537fa0dfe18fc2d9a5bdcdd9d96c1f9af459712901371f6cf5c98ecfb1b514e9442fc62c4323eed7fb92b653d68ffabc551e44d8aa0b016c6d8ef15551b47";
 };
 "doctools" = {
   stripPrefix = 0;
-  sha512.run = "b215ce004b457ec0d18e4b439c36a8e758151f6a6ce34c4c2c300e572915963dd31196f3f6ee230cfc605cacc4419b7417c78419324e2aa621ee4c2afdf4ff30";
-  sha512.doc = "2de76c90f3ff073b480d99946c29455f38d9f519cc85ff94d175f84672f6a2868cd24adcf12f795f3b92f629f022e15f5232cc802e08f9383b8305994b17bd5b";
-  sha512.source = "c88af62724c2312a8362b32d4ae598258878ed03c9bf275ff5b34da9f7eb906f3f064e831a122719f9cf2bb53ad7273aa2546161c1d8f6c27a17a081bed4fe1a";
+  sha512.run = "5e3b1525b58590a87fdfc25fedafb7fc88e3fdcb1859b70deb9760c17033cf666a9099a2c00390e37cf0c58b690ab800e3aba3193c0b0c504f54c68766e04a27";
+  sha512.doc = "b51871fe430cc4a07064e6836808d85ba1ecdb9ed7dd447f17c8553e77f8d29aeb37a6155a75bdfcfdc33b796b327a53a5bb902c185fe1ab8676a50443b79677";
+  sha512.source = "38db24c874a3512d62c5a4ee0317476c2073baf5a2782c6efd5f94288880591c3dd597a8bc49132576ea3a7830de947cbb4818275b6c5e9a9a8a14ea3b67f5e9";
   hasRunfiles = true;
   version = "0.1";
 };
 "documentation" = {
   stripPrefix = 0;
-  sha512.run = "da11d3d6927624443391990d0a71541a5fba6caa4db2a02f59e5247c38ba88b7dbd392535e5c5a3458d02a931f1753b031f6d896a3df255029ca1797a8d1062d";
-  sha512.doc = "dd4ab228392fd2b0e13a7a6b90d168eafd9a7abb5b78d6ae2135256374fe66c05eca01ba6a2c60bcbf28153cdfc3f1299ff7584dbbab749895b495f02aa875bb";
-  sha512.source = "fc6a65448b99f2a5f9d9296f304ad1d698ce38191cc9e759a4e57ff00f07c7bc0e4040e35b1ca2d74be0f592ab263d2a29a350d197a4a84579b4e48c279aec65";
+  sha512.run = "928289a74bac72caf5a85814746c2dd0da0e45a9f71c57cc1ee6a0f5806323b8e6507fea35c4bf500deca3d73b933b0e0b89327a3ce6b22020090d08406eb8cc";
+  sha512.doc = "31d807da24483726a256355edea3ed0656f7947f8090febe1e42a50f336b96126d72d45e8abf356ec532ce9ff66ebdd5192643c63bdf46b31956fac3f02a7cdf";
+  sha512.source = "a8fe4460c0e317b0517866fc91a7d6130505c90e9a1a1a0a1e19d492df321a2a90a74fdc64f35d51b816f2afebc51c71592b3ab418e49caa40e58a36ad8246fa";
   hasRunfiles = true;
   version = "0.1";
 };
 "doi" = {
   stripPrefix = 0;
-  sha512.run = "62fa0aaa8f003281d30bcb0bfb02b2794b778f274e01a1d1d25b5c66b5a639339cc012460177a943f02f5e8b6b755af2dc4b421aca5b8de144cbd5358a3a2ff7";
-  sha512.doc = "1d1cd13a4df21c5fb851918ee83f7ccd1924175b9bdb36a7b7482af7d221a3a9eb3373c68b0e82f3a7c8884a3834df9fd177a02233ec46bfd046f7fbeca2484f";
+  sha512.run = "da0fcf3273182cfd3f882e76d99be7b08ce7d42b94c0dc334a22d8017a40c33aaacb88ac9bdb3847ddf3a07418dfaa5c329a178f223b94b84e69522f5ce94c43";
+  sha512.doc = "b44a13d834ce253bb5d6ae8f32784fad4e130b94dfa520f6f296aac11018f920082c8352b6c2bf49feda7e9667d8f87752392c90639e629db6e8572285cac959";
   hasRunfiles = true;
 };
 "doipubmed" = {
   stripPrefix = 0;
-  sha512.run = "cd594fca3020e6d267da9c20cf32905faf76aac1f5b3152ada20cbfa4d17ec4f22285e130f9c02539b94cafb52c0076f6f5248c8245404bd4ee3b46fdbe7d70b";
-  sha512.doc = "2ceb9cd2f566e043aaf5ef74c6cdc764d52b470b7579a37f49a5f635b20c1dc1598c4863c929e2c167f0fe74d85500046c027bd64204b46f64c23f844d0d9a12";
-  sha512.source = "6906485f248f504dc21bf398b5523a5106d67477dc1bdbdf8cfa93b471e1d2c44385d371375c23743916b0964c68466bc909e0e5c26f4a4abcc1898bb509a43a";
+  sha512.run = "6935fdaa9a5154b6917ab80af5809ace38432fd5ad7b8b71bd896a5d6794e6ae4f07d5e2bd54d6b81cb1377e2cd2b208e365c6417ee24886052eb4a2bea417c8";
+  sha512.doc = "4b914d757b2e262add61124fe45358119a72bcff39fcace7c2db44d99502f99440425692d07767fad4f3388920f5ee6f3272d31170c76f56ef30f47d5097040a";
+  sha512.source = "324a9b1eb6487c86b88ea7e1b6c2ba5eec4e7b116ff76f468cc657b6ae518527481f3af03c4b868ff17145f585d8b7d29f9a81df509da67a23494168e104cc6a";
   hasRunfiles = true;
   version = "1.01";
 };
 "dosepsbin" = {
-  sha512.run = "801065659ebd86f2dc0571254dccd4ea233abe7c319a2dc2a4c99e6500f421f2aa6c852a356d6083f41cdf88941e3253370a9622fb8a820d8c9b9b1c69054bf4";
-  sha512.doc = "ac615075e8ef995d65b0b94c322283e40e6e8f2151e65086ba8d0d7298b0f492bbb6e1ba46a9f950e23829303aa16a0e91116c65f371addb4cd0c8ab3ff66f3c";
-  sha512.source = "d3f8e63508e5ebd0202da0c0376e94f8abd29c5c34265c4f5bae71ee9e7fac1430f72aca4776e26d2aa695b5eb1a84830809639c43e4888c15560c17027c3af9";
+  sha512.run = "3e2e34c9d9486dd026967fc5e5cfc8a9f5816c46ec1b32cac1a64ff27433820c4c1257d04f7048dbea92d74120b07e8769e3a5dd1c9f9bb5c24d583febd33e5b";
+  sha512.doc = "f58c55f224ada686e2c40b00eeef38720bc2cb51dea8bf434471d466dfbec4323f3a5cf9b617de345e7dcb49a9df93e6cb0fe96ed920d27609b72f2890b37ff1";
+  sha512.source = "648b113da74369c09fb0f83cfe1fb3fc007286f6c61aa4ab214d6f070f7b8b2c7daac37b4d2f767cb146782185905e9f7472908d318abbcc0af4d4f00e079761";
   hasRunfiles = true;
   version = "1.2";
 };
 "dot2texi" = {
   stripPrefix = 0;
-  sha512.run = "c1b68b6fe29d9f09fab5a7bddf59119eed84c2ede35a99db7c0b5ee3fbb92aa0a9413c01d888e20174366e18b2e575e99129f946edbb5d38463209ad4231d5c9";
-  sha512.doc = "74e697038b940c0643b51acc07a44443a27525ab0e0133615e6fec903d0eb29edfdaa249f17c4bd14dbf00262475791981bcafb2528a235af702e762da90abdd";
+  sha512.run = "3be610219f98ff0a998064c288f30ef9178386eae37405cee06c8c3dfe1d3672c9b329b7a674ecdb1ed5da0bfc44240bf1ed0405d5cc4c31b88bdcd5c4730ddf";
+  sha512.doc = "39d7d3b38cc711b3a2a3c4e6f7f98e0f147e7ba3b908b3cfb715ac892e9518f05c248b83e3b8e4537cd8e20bb2f54c2f82d055499e6f0f5e0e0ee9fce0eb2e3b";
   hasRunfiles = true;
   version = "3.0";
 };
 "dotarrow" = {
   stripPrefix = 0;
-  sha512.run = "41f94e6c54bacf64ea0720cec0f0c49ceff6fd0689ba6751121dcf6a0c73263e12203f3aeed81b39925aeb9b140ac6170b2545fd5e19b7674d37dce7afff4c83";
-  sha512.doc = "3c32d8a8f77589422bf6b65a8e519c5ba844d3b70fa3a7238ac7a656c513cddc7a29f7bdeee1fe7c50e5e9c62ce5ae56475f4a27ca1fb5f675c9a78102c26c4b";
-  sha512.source = "c5877fceabf9292ed2d610d04bae933aabdfdb8e640a127bb6f2c7713c6dbb82cbe87306ade7bfacab19309d16772159e4f81cddadecf466ac550791585a3501";
+  sha512.run = "4107c16284334e2a772aa5186d11e37a0a35acb10a19369de5fb23c6f927c6ae1307821c33ba07688d0e9310fb83660d2c1f615c929d48e7fb89934f26a0ea77";
+  sha512.doc = "68a02a03f1cb35b5e9f309cd6ceffe54508473567bb331f4d582db1bbb376b0cc2500972ee80c51578552628b2b94dbbfaa1f2decde55d0f2edf440d6b3f36a0";
+  sha512.source = "a36b152c86a2c17c12e4d967773915393e2681cf5191e70fae1f749fbf2412cc3543eb5af0113548fe300fd1409ecf8fdfb06ac5aaa2dfe13109e68d2fbc872f";
   hasRunfiles = true;
   version = "0.01a";
 };
 "dotseqn" = {
   stripPrefix = 0;
-  sha512.run = "7e32da8a2f182e184f5f5e7b72e756f02554f7642205ec82572789e8c4049d00ee5213f5a78c07f08caca214fb56878e33da3296ca671c32d95d7ce9b6a3b02c";
-  sha512.doc = "dba15b32867d27f8c794558a54e9c33d89f02f9621dfaeab6b9a29d72b81b2050132382d27237c6eb436396fb1946664c4fd9cd2b3dcebf73eb050e00a3b278d";
-  sha512.source = "7aba44fa7c88f6446fb6c1dc3a179df980bda65d73fe392ede6b30123c5f49a5940e3e8097a14f32b273315429424c293afacb883aa0340315d947011becebd3";
+  sha512.run = "b262a2156153ae851b2f6db0ef957c2c44bcdd42091b92ffba7c983683e72366809e0048f1fc71d937be50987ae8797f99402b73cb6f01703260299beb45e8ff";
+  sha512.doc = "3bf91364b4df0d7a798d7acbbec6fa538208b3aad03e5067ec78a0564b25b1dc782fa8cee4e54756a07a645d2176af2ed170881164961bdedef39a7acc09f424";
+  sha512.source = "c6ce0d906752e3451d2fd398ea068812aba83c469e0bc61bda995442539b368b2de95b108b0957a10f5eed6810d40b868e72e73c6fa7bc34ec4fe3ff8c042da2";
   hasRunfiles = true;
   version = "1.1";
 };
 "dottex" = {
   stripPrefix = 0;
-  sha512.run = "2a4f5f44443cda9b915376a5dc1297d2a8334df0530fdbd9faab8e133ac4ffa7e01acf71bcb1e9189d86767286106f5aa69fcc8f9e048ffcdc5c0b1787801d7b";
-  sha512.doc = "26645f897e9b67dbf9b562f9e09a7d43d599d26e4e8ee2101a1b46c6e42b3befe0b066fe35e2c94a25bb1559403be7ee155a1d38b73a2be4e3bac349a5d1d0e4";
-  sha512.source = "46178e67d5d020a00db512ee9d5c7832acbae63f3d8d38e5cb45579684633eff064d5bc2dee03989df07032d417fc3dfb2c8531d77d7624e935a441fdce4b725";
+  sha512.run = "6e6481c1697a285625bcbf744463608264372c73cb499566fc64c37977f9658888cc8cb966a31eb29e3f047813797b804b3b8263e574ead8887b2ca567474bd5";
+  sha512.doc = "fe0f97117179666470409164717cd1db5039e89c1bf49f872dab44ed86b127816c100cefa1824b17fed5ea3a4a9eef8a91873967fc063f3d954815c9a0cfae36";
+  sha512.source = "7d1ad61ffb64825d6728676fab31dfc5c25d2112e4f34e50d5524208c0d79f4bc1bb69ac32e3a2c5da7b339d972aebab1885fb7f4bbf09bf4c2ad9f8f9a3870d";
   hasRunfiles = true;
   version = "0.6";
 };
 "doublestroke" = {
   stripPrefix = 0;
-  sha512.run = "20514b43acb1f3634ba6f7f3b0424007cd254d1ebc4b0dd05b89d8d2b1d6a388515551ebf744ce1ec43d4e2634f98ce71a2f729e04157993424d49bb430532b1";
-  sha512.doc = "dd42bfb5b5c9125a5b1fe4ebdfdbceccea3419516397ca9ae833abaed7f879b484fcd2094c529af22486e6da1c21202289337aeb7b7cc66d719ea0afded87967";
+  sha512.run = "4c00a764e11441079dcfa369f468f490e817a4e973021076ae39ffe6eba54c3a83453199b1c3400afe536ad32348bf10572983bc2b82405fcfae5db9f583a4ea";
+  sha512.doc = "5b9a56f557cac79930888f9673e7af694500672ba8e6811f23f3cf7770555fb6d7551e7160d736f630ed5c561a31376426b60751d59f0493afa01c3a8841bd93";
   hasRunfiles = true;
   version = "1.111";
 };
 "dowith" = {
   stripPrefix = 0;
-  sha512.run = "ec34ace73c5f55fe4771fa40e36deadce0c98136acf2ddf9bd310796996f08bc8d03e26e2688d629dd34f9d27af17711dace48d7338f2018d58e6b067d7d6279";
-  sha512.doc = "d324da786ae808ab6307f89b180ba14b727cf591e7d86f907f525e206ff15b2a15cf04710857aef0bdaab99949b511d1cccf6d4855ea5abaded95c64e717ced1";
-  sha512.source = "8e022a4e7dc9f24e234726f613d7f72b2d2981e9f4e33b69dc0f7625e37cfbc9fd67bdcbf57470dd663148aa218341a039e09d630d8db033f4e7a7b9854bb20b";
+  sha512.run = "85b160e3f2468602296284763103087f40c69268ab6a6fe64ad33174155b61c1da41b87e9818b1eb11e9abe98293a18b9578aede00985b37c7f46f1f9347bb91";
+  sha512.doc = "fe091342c22b2764778ef72d804e9d974ba22f3b5e1366c8c785b0ea83aceafcd297e7f71eeccf614f397187c4a2791eaf7e0f6ae475669bad4620944c6b42ee";
+  sha512.source = "c1552c6c55e6396f2dd4344b10a72886e4d62c0b705c5e339e438429d97d9bace5c5f349dfd56b770ab3ab84294444986e027941f4a3bb47b91755890089d4f3";
   hasRunfiles = true;
   version = "r0.32";
 };
 "download" = {
   stripPrefix = 0;
-  sha512.run = "4442019034aae6b1f114ac1637ced6130a6f3ca01ab8fd8313622d0326dee7c8f91d62e073089e273c39a54fba0961f49daab9d3e5bd3476f94301f9045d7fa8";
-  sha512.doc = "30eb5da1295aa3d0f7710ecff1b5befdc907088c9037680cf68248c836b72f316e218adeb73f3df187334c8ffd3cac2ab8c5064aa9bb0c91d384d298861c70c7";
-  sha512.source = "2b97ef311c514698a12b2e686babca42bd717b189298d5ecd0a7d274b395d2ddb055ff5836415f989c1feb4539722ecafbde714c7cdcd3a590ad1d7ccdd1b316";
+  sha512.run = "298dd897f57b622e86e235852ed4a90f4ed6922c42007e9b4a98b26427d5829bcedfd0bc6eb639a2b1333f86dba3f3954fe8ffb07dc6ee7fec1147ab6377c180";
+  sha512.doc = "fcaf4621cf5b1f319da5294c700f4cf50ea8a8f89e571cba4c8b2c7bfcd59c21c53715abc16d1c4804065475a8ce321fc72f77d858fbeb28b8c53bef0555a54f";
+  sha512.source = "2d2b76c11660cb2e520edbe5dd137ff47486fc621b9d05f0d5bd1a0b4834d53159a64d760f3ad0aafa4208a6826c5536ee39288b2c45d0b551a2eb251d08f66b";
   hasRunfiles = true;
   version = "1.1";
 };
 "dox" = {
   stripPrefix = 0;
-  sha512.run = "8977416df9e234e61b0bdda3c1a27a8394b05e6f65dd9c7ecd4a71af16ff5fb99fdd0bc8bc23a2af7027797d9b3a4260fcad70ed4e45770be3c41913c01fb84b";
-  sha512.doc = "534d00e824f5097671f951a775ff8daeda1a21dfe818af01910fa967e1212e16a095e88a64c181086ebcb3212f9c82a03fc8e44209793a98f5f5f372ce0e10e9";
-  sha512.source = "b65fb52e18e0a78d9ddff3e96428e23e1f416e2823a32650309bfe26464c2a1ecdc674291a7269946a6685b6b6a001e8621c824e5b38a221fe4904553733cf66";
+  sha512.run = "f3fbb2949b44094295814e62d660573577d2e267e02cbcc6f49e108e7cf8bab44dcf9d847b1157f5bdc0fa4a3d888f437be8e64869e92910e4e539d5d8fb377b";
+  sha512.doc = "739857f7bc6cf298dfeb7bd2a6fd67598e6651e232043c09224ef52cce53372f329929922bfb1638e20c754ff95481448964ae77a67bcb2722658099141bcf1a";
+  sha512.source = "bdf0796bd982a7f9797798251d831f93d33370ac2525b7ee513bb549ca641a81eff13bac0e076314b3be0b95946e57743d9024c1c2cb145c9f09ab672ba6d8c5";
   hasRunfiles = true;
   version = "2.4";
 };
 "dozenal" = {
   stripPrefix = 0;
-  sha512.run = "9fa16f71b79c76fd8b8396779b158785c9a0745d7ceb50224dac984d000e87e54608059e178e507bac1b33025a5910f4141d08cdd81fed8eedd50c1a66723170";
-  sha512.doc = "15bbae63e27b1594d51a17a834dcbaf0616ad03f046bc4836560337dd5525a829dd9fc6e7db04062d4b71769e35bb96b5ceb4e47a0bde31c5c1f90a7f10a9707";
-  sha512.source = "a58063fe66cf0433fc4e817099e94fb73ff237a6a0a999928b371a09455b5b2a2bb8fe70ced16d9b9da12bb13d7f3e1ec2bc2d240ef93a2e6566b39ba24c6a02";
+  sha512.run = "8875f5caa49673be6441cdeb4c35bd5b7614bf8cef76f3afebd9e4be817605c6a3795947ff453709fefc8bde8d6d5f1bbb7598b22fce7a12f448dfba2284d68f";
+  sha512.doc = "f31be9e8c280e8c518735abf46908e1347d07cc815d42a6156040ff014384a6df77c918f33ebfb81be0b9a8454d34975331ca0781679d423b348cfecd01c1fd6";
+  sha512.source = "3d4ca7130425990747a61184ffc431d8a88115cda2489d53816bebe209c8f1cb83b1abf49d0e8bbd33b43a5a0e41038960d176c8a999c7bd021e7a5c10bf256b";
   hasRunfiles = true;
-  version = "7.1";
+  version = "7.2";
 };
 "dpfloat" = {
   stripPrefix = 0;
-  sha512.run = "c34e23c314ab26ae0a1cec15a89154a0058a68eed9a04fbb999026929c82774bd12ebfba755b52217d6d11ff6120db15d19428f2493069255b8bd0b110e8cb8f";
-  sha512.doc = "a46c8885c7b27464c4487bfcd93bfefc62a1ecd63e79ea9615e7980eff1cb2ea9559f6b2ee06225ed7f6aa50e1c29e79ee8f73a5bc138b5aea170dd174399582";
+  sha512.run = "142e9338025d4e56276dde48b016405cb32c3837494b334bb749a4f185c5e796ae20cf39c45d75c2be421a3aba25ff09a1238edcd479c13f412acca7b360e214";
+  sha512.doc = "a4f935b6bce0c2cd4ee194bea1b29de4652f2ca0537543cd7e1ff5e89af7f1677f1e118d66e84fdcc56601a8a3d94cba3cd1ca559cdb8d04d1e2e36196446ce8";
   hasRunfiles = true;
 };
 "dprogress" = {
   stripPrefix = 0;
-  sha512.run = "d6a2c660a1e703017e75038dc660d196095e27fb71ead4507eed44834769f3d1905be36f650286efc9e9a18445029a6f63b45530855b66e098826b32b64fe905";
-  sha512.doc = "0a0a2adc510e60ad3ef1a30b2447fb596037e018c835c1b6e14221e18324f03eea70e71e49eb1dcf1765d23cbf2872a6142d0b9d1e89276105d221dda10d82d6";
-  sha512.source = "201e452c7929a105492c1eceaef86ab346b2063f4f171fd791ad91f64f3134edde39f4c9101a97b6fcf1c799ef987b702e7060a86ac187dd682458da01e311a1";
+  sha512.run = "eefa24b1eb960f8b5b092f6c2e2024a4b7959a521cc2eb450e51b551a311827d7e6c1c2686781bb4908f807af2dccf7715e5acd3b396ef14a7ee1608cbd4000c";
+  sha512.doc = "3f823b848309f6ec55cce98272508bcd3a180a8ce2f4f317512cc5a24d2e3ad6fc334e653f7ccb8dc53560ba70d5ac09fd567644f7239f5f6a47bc6fe8b74062";
+  sha512.source = "e872af270ea3a7982a8b8c859f6266f7dd484fdbbbcc80dc7873b8492c4d86ed73c4c9e9bf163366f13a0ea0eaf94bb1611cc1b2ba30d8bbaa1fffadc14141cc";
   hasRunfiles = true;
   version = "0.1";
 };
 "drac" = {
   stripPrefix = 0;
-  sha512.run = "67f26a39c14f1cdb0c30a64c23d5d95af0a6c51276dd4bd5a30164ed2996bec4a44fc5d9599dacd6c3a680e0d2f223e586ab123026774f99114a9fcee8316812";
-  sha512.doc = "bfca7cfb1b27c264f30a4803c9384763d0b7e1a7a3abb50f9ef356857ad909d2182704d18e4d074763a2a80982e386e03a91dfe4f4fac05148df6d97c7a30325";
-  sha512.source = "24c1bc313c0898f73e1f128db725362acd28a42efbbf1afc29a455ddb24a4faeca6bba2a83e2bc215be7a21990cbdcccb3f7dac4aaad5a808d814b7b1591741f";
+  sha512.run = "b236d2793b5e6735c092ec9e21107d1160ead9d3bb9b120c9b131abed9a32c4a76946c70fc742a5ca3ba82b507ef18b6d1db66a2035ae8016c7b352fc93743c5";
+  sha512.doc = "41fbcff3edf5d03a15c9fe9d177d82dadf64cea020196faea40368825a90f0ac0e5e35de193ceb6975827c46c136a5051a2df77b139eaafe54e6697b5065184a";
+  sha512.source = "da1dddad4d392590a3c32d2ae98f4d996219057153d04b473bfb15d3358c1ce8f0e81807c7cbdfc05229e848f67ffdb473b039a7cdb86ca9d92ea11b2de554ae";
   hasRunfiles = true;
   version = "1";
 };
 "draftcopy" = {
   stripPrefix = 0;
-  sha512.run = "ec6db224dbf38029672dfa661f40aa2f9d99a41341dbcfa21ea6c8c29ab5803f448281ee76ce79c5edabe348560c61548b1d9a211dd8001c822dca09a316ca09";
-  sha512.doc = "5288fe528325a966577406edbd556612ac53f533a2c50fd21bf8d93c413f7f9feb1f8842eb75660a8354e681758085d6720004b69898dec4170f7eb1e56c81f1";
-  sha512.source = "3850ca21498765eeea9bcd97db263de5acd066f753a90ba5b6f5346c237412885b8369145d86800e849670e7c38404102b91973af884752bd8093573ce1ce348";
+  sha512.run = "4652ee26259e986678f4c5283b44cd51d50c5359f29025fda360f47dc0f3fcf9d65069017b7840902f87def352c1e8c0f8a3d97dab5357c52c149ddca47fa3c6";
+  sha512.doc = "bc58e287cbfadb9cfffe112ee57fb72b34de934b5bd84e30b6d104fe052d97d153252db06b35e8d8f025e3cca215ae1adb41f21fea4fe961085ac85adf732cf4";
+  sha512.source = "7d35a60f25fc5fa8712c5c7f3ee6303715b6b6a8a91fc7da28beb87d9c6d3cb4758bbbeeeac487b5c8c43ef0f49081154106210c368fce37aab4b49436b186a9";
   hasRunfiles = true;
   version = "2.16";
 };
 "draftfigure" = {
   stripPrefix = 0;
-  sha512.run = "6a6e60a203f4720d813279b01c6239843619245b69d723158bff6976491ae899f6a3a18a5500d00bdbc44e0e0aa0525ececf94edff4e7a58e1a48becbf5c8c9d";
-  sha512.doc = "8d0a11cc5fbdf5fdf047a218493f3e04af0b934fecfa024f1145de5f775e88feb764f690f05270837ffc9f439a739b9101d330a42d16f0f78e50bab4048814b5";
+  sha512.run = "6c7ee9270f74538d4a1383334b783d109b1b70ded0ab8e445fad905cf9f5ea225941a83ee21c924aceaee5b3071762dc22f9fdee60d9f9881c2e7c4d2578cdd5";
+  sha512.doc = "2636faab9f499f3a4d52b458cfe58cb3a8c8289d788dafc9d13247274988cbd0378e50dbc7fe4ab8dd578bfc84dc09b54fa373a7e8a83ea450eb23d5a6bb2589";
   hasRunfiles = true;
   version = "0.2";
 };
 "draftwatermark" = {
   stripPrefix = 0;
-  sha512.run = "9d7a73c54054dd4db7334011c855fd8d82f55049677cd5d6cfd2c428e1b839a32bc138a39c276401da64f2fad9b18ac5b4b7466a0fb44bf521d9bc486fe54452";
-  sha512.doc = "98d405bbca9f82b3e44bae621e15dbbd38a0398e50ae34c454e84f505434761f89e891e3136fd38982f6a89ac2027e40d5937bead9f4a1071cdd224c730c829e";
-  sha512.source = "37e1fc52b2cf6831c314386e804ddc7a937885626203c7a1430ac4420fc8382cc82031b4c75f9528925ebfbe4d5ba13949ebde16cc29176dee3f2868efd15d2c";
+  sha512.run = "d44be3091742fc281f02d0576ed4281e89674e30ec44c2106fc18f552671f2ae6cbb6fe327ce7e9ceeff9b8612ed2cebe8920676ac4bfb0e58773df8ead69b0c";
+  sha512.doc = "b4e8e2d0580b6e85fa939e21e8de399235c3f131874c59b46404bf0d235fb9be29a12ca84a0335f345a21f4dad89ba82beb4dcd0165bfe598cd6138ded845ba7";
+  sha512.source = "4f23c5304491c9fc35a8e5cc1dc10175d69bf0e8351492bea96615c67e43ad2e515d083e5be1a1928554545910502281310c4e13922ab9e664f9463402b7594e";
   hasRunfiles = true;
   version = "1.2";
 };
 "dramatist" = {
   stripPrefix = 0;
-  sha512.run = "59a39061632fd2ba9a819aa0034bb32955afbe5a333093b6b06fdfb973acd926425696aa3bbe192f9eb8feace39c36de455b87131d8986991db728df1800a639";
-  sha512.doc = "95a2a6bda9d99309aa8dbd13095833b7f0a3ae537cc4803abe4fafec8e6df998db2980ad7799b7c4383c85c9eb35cf76e1e737dfcb83d4a0ee0851d3c963f81c";
-  sha512.source = "24c1a52594377b64868d3a59ce82bc9f3d60cf200d7ff72e590526148f4ccfbab3406a5c213e89d19f28f56f47e6dc5bdeda158c136dbf015edec03f4673c397";
+  sha512.run = "ed01c63c38ed96e407e2fb83ab82792149b676aa6ccebb08929585af91278042f65807b1bc5073e4c3ad81354e1724ec2dafc814bcb6683f6289748ead812a22";
+  sha512.doc = "9c110d01a61eea52106a48b1bbbab97dab0a658c0528059366b9ac95a4bda149afb1f887a708ea25df19b273023e018a753751bb597126a9e8d2bbf07cce681e";
+  sha512.source = "a3a1185a11b54de68f23274177d3712b4fae09f9ba04884e006de9337e21bb2ee891f159cb31a3e14c0fdcd54cc5006d35e615dd502d50811368e4b77e36f33b";
   hasRunfiles = true;
   version = "1.2e";
 };
 "dratex" = {
   stripPrefix = 0;
-  sha512.run = "faad53c51d15cb7e573599a6b4f39aee35c72b8b5129915e6ee14f75ccd9b308f36d9d87833ef63626e0b0ad72e8ffb550eb5a8cd6168fa025404d107dec963c";
-  sha512.doc = "bdb4d7256097106535e3c5a48e0cb48e8ebc6da6bdea3b7d395d6fd1149b4298e54a7da69b95dea82f56e524a96b2c27804cb1141a36559aaf227c9b0966ca50";
+  sha512.run = "8f91158bd74e369a005991824c6b9a12e64d9936887d0ecef19b2e822a7e7cf8068425ec629e04f4d59d2eb49167b6bcdb252b853eeb2dd2ff6b7426c76cf917";
+  sha512.doc = "a628ef6aaf1e0157e33ae1e44cc72c033c827cbc1fd3e38641218a82c873798e3941368c69e9f8eac6b02ad2f37fbf46daed9abdc0c4a3a26b8c3113ba7c3c55";
   hasRunfiles = true;
 };
 "drawmatrix" = {
   stripPrefix = 0;
-  sha512.run = "6d4c147da1330fdb08ba31848f935070910e695ff54cb7ff085b718ed6f63834eea6560975bec6d1218b793421cad85b3f13536727889d7cbb5c4d091eaf50fa";
-  sha512.doc = "2017f018f2526ea7c0f691f90e45115ac8acd9f9ca60a42cc887901f38732d4c8d8ef82260aafc376a7ece5a5accb6d8e81df6397686e22a5a2a7764791c1474";
-  sha512.source = "159d788d0a8e4245f22bc1b0370b47d6042bcacae90a97931175ac49a216922cb2564f11ea8e9714af21dc1baf031950aa8078301323df4d2d6181d6b838b0cb";
+  sha512.run = "d41aa3814fcffafbf32998dfda97c9e2d3a9b9f1cc10724e324272eda84f9668168c8a3fa107cb82dc9252a6dfd998a811d4bc566dcf669e07c0781bbe0e0c5a";
+  sha512.doc = "912dfe71b61f68f9817ce0634f3db0a1b5e3172e44c1b2b90bff5048d5b79ac508deaf0d4340e587959a2ac23b336b03cd6b15e73ab09c2fc6cb3970a9c2fa45";
+  sha512.source = "f05391907206fcf32ba1e66655e826da263fe5dab324d72e57c21dbce11899da39c3ce343abbb9abf51c3d5d8a8b0a685b31ab1c9d6e7085693f91dc866368a6";
   hasRunfiles = true;
   version = "1.5.0";
 };
 "drawstack" = {
   stripPrefix = 0;
-  sha512.run = "771c1c0bebb7cdefc500a6ce544983abdd7b3b7ed55b28cba2710ec540fbd0c7ff9f9b3cfd9f2db8d32579fdca4d2aea1a243f75988ddbfdbfcadeb48a1d26c2";
-  sha512.doc = "0e1f95bf4387cd6dcd524c16adb9182ff112f7f41b93d921f3cfdaaea2c8ae8fca914d804c44f1520669c5ce2de5bbf28f3900ddebcf74d81f6587813971ba98";
+  sha512.run = "04ea6d1bf741cbc56ea067b7b36ddbc3877340be19694a57e5bf1580c102a942b40150d8ec8fa411fbc1267bb136e24e32f23d6a6695de2ea99806791f78a006";
+  sha512.doc = "b0752028a10937096a62357b86debc7a81eb7659ee514ab64db8ac61189025031882973a036b54f6828168d0318cb695d46b0f5ecfe2975922b4eba70a78adbb";
   hasRunfiles = true;
 };
 "drm" = {
   stripPrefix = 0;
-  sha512.run = "64810d517f85a06b49977858bc30d8dc8b4566809a310e2f4d8ee49cfe1cdc2c0ceec7f51100e16e912cc95b8de013c129c1d12b9431fac747cd5b02b8317937";
-  sha512.doc = "3829f4fff4f10d590b40602ecf51f4221adacc6dcc2b9b3200c19409ed989fd0b3e0ed25025671296243ede3282cae3d9ab191c1f17dd14fc643d233253f32b0";
-  sha512.source = "aa0378b48f034bfd4291e78eeec3119e3d40e0af7e7229f0869432dcc8394ccffc2755e39b39965a698774f5972c7d581b59b788c6f3afad90482a8028514527";
+  sha512.run = "6ef9b2f809f38df44c96874f8d72755051f7438c2a6b78e63151a89b7e18c5f2544ab1c45e214b8ffc21ac223d6700e00d7345b75b6f77137bc6c471545871f1";
+  sha512.doc = "6d793ea685d7706b4800fe699d3ee16f565c1266369edf6c38ac0096a2c4b4224406c22afd3c3047d5a0aa3699b71b79698e7dab3c58d7b3003b30f6a9114a34";
+  sha512.source = "85b16df5ef5c7f80b72fab276f904f45426297b40eac54dc6a76a9b2aca11552744a366b2e1bbcd35b415b114a97a69dcb5391c25dd98f01d905b68dfbe95ed1";
   hasRunfiles = true;
   version = "4.4";
 };
 "droid" = {
   stripPrefix = 0;
-  sha512.run = "d9a0dca023bd3acc98e39911e37b7f0937a682c208210114b5698601385c37b2bddcf9f18547688224a81da90027177e7fc4c56ed6ff450431a16b3deefd4b36";
-  sha512.doc = "b52024b6972aea66ad80daa7f399c5b72795b0b60966c1703cf73531df5c5bdd81d097b97f049ba626faf1ceb079636320a105f085497a97d25271d236eef8bc";
-  sha512.source = "97311b9232d51fc344f6e3cc491b8bdfd1c96c7db48cafdb2800f55d33083bb272c8c86f6536c213f48eafc2200d59cbb1911f4dc96c8f2dcfaebf3a8891a7b2";
+  sha512.run = "0fea92248c58c9e240c12aab63bb7ad18ece51d07a05ce2b5ca47b11d2d2e60ff2710feceb949beea10c5bc0dde6554846f4dee74769ec2421b3b8dd4fca53ff";
+  sha512.doc = "b31a0ce794df8a20ff3a038b308c20edf660924ca9de6dbc09919264972b0e41db7be5207da49b0ba84b84d8f70312970385b8c26675e8483b48441ca850fe55";
+  sha512.source = "6a9567af182d91faa7e2289bb4ad3bfe23b61ef3cc6b2f9ff51d072f459bbe87e84d7ec45cfebed4edee9d3099d7f3391b785707f189e01a8491f2159e0ae563";
   hasRunfiles = true;
   version = "2.1";
 };
 "droit-fr" = {
   stripPrefix = 0;
-  sha512.run = "41d911636a5c4bfa167daa52bb2278714dc0aadca3a229adf0f8767903c3a406d9d126eccb405b22e397686eae0cb6f9d15513d13e3dca9aa0ab316cd4e95974";
-  sha512.doc = "0b6e08d5603ff1164b5b6b86d3925ca5ace2b8c2a4356808cfd42005df30a9f1a3e0973532cf4bc4266883679a660d7d1d5d4bb46693461523547a45d297b4ac";
+  sha512.run = "bb5ea7648ce6346d2127c344614fb39e1f8c2558eacaa5b0a3999475b0f9dc5d1afc0a76bf8e101898ba2a14bd070ce82ce24120710405a6a2c13cd97acad2eb";
+  sha512.doc = "e53efe18973efd69dd472946d149bba18914aa4144b747338d501bd7c7b45d92a6505d2f1da4d7ddadc47d5966f518206e955ca0951debc6496f7ad44ba34038";
   hasRunfiles = true;
   version = "1.2";
 };
 "drs" = {
   stripPrefix = 0;
-  sha512.run = "4ec56e8df9321390635416f73f08ced4ea4648be0e0dd97db9d891b731666151be40611812461c21f098441de9c84f855cf500a98dc61f80773217f9009c8d05";
-  sha512.doc = "b4013a240e12f2e71d720b3f616cea869557a1e061a64be640f615bbd82b0406c0ea1a9f702ea21239106dd8ee59daa87bb505691e0e2b605f82a7426b7213ef";
+  sha512.run = "b947b71d99fe38b1aaf6575af716597413d028849584c22853a1aad3d8738910243defc6c9563609515019d6c5ffd4022754bb88781c7399535ff196d9b20f45";
+  sha512.doc = "58827b5c2cb557c2b14f11a5babbabd89b535ce59420f5b7f9c23433f92517f1cc9a3af10e2d5071bc3733e7e09819dca1d50cfd799b960f6a192e8e1a4af0be";
   hasRunfiles = true;
   version = "1.1b";
 };
 "drv" = {
   stripPrefix = 0;
-  sha512.run = "21b73942af77736fbcefbfd8ae235c2a81a547df41df22043fc0c7f6404e1418a64a7864ddfa1027ef5b88e261abef154716e6914fef34a46bd8597874fa90a0";
-  sha512.doc = "3a82838325aac37e066729c3cce163e4821e1a3aaf43b3df585c23dfd5453f15690cb51c306bea21b0d56262ebe436ea52420709ce29b41a7ff54fed5c721dfe";
+  sha512.run = "682f33123c0e1e3bdf35bbe02ddea5c2dcdad9ff90009079f6ae8e876f0a7acae1b409c1045b921d312d4976c5f004168a3ed108ba65c49d687ac2022d4afe35";
+  sha512.doc = "927529113f567e10618d3397237f2cc31b70e051b7b1e4b06b6fa1d5ca4ee4c1bd86844989e31b4a8f8bae2c5350afc8c320ee517c2f249d551ed5741fb2dd9c";
   hasRunfiles = true;
   version = "0.97";
 };
 "dsptricks" = {
   stripPrefix = 0;
-  sha512.run = "18df6c82137b4cb83b28aeb72823a068144423672442454c29d0fe3d9094f76fcf18f1c0e06bf03a871e70386bca879661c2120243587f2251d8c37b2e9ba9ea";
-  sha512.doc = "3b003e3a4b8b2c5ba86491e53c2744c7d774c74894306986e65f0694ceb3980b0073678bbc7e938080ffbe550b3965e5a874b174551f60727af7076bcf4da018";
+  sha512.run = "7059577b4aed0eab5f2f82610911fc97001e01497717b0141d4e95b263ba825bfaa481829cd00dadc8eee278090ebeded09fb92e8502a7bb250330c6f22539cb";
+  sha512.doc = "da2eca39d66788da6dd13660d2c41927bfb12a9de5a2342633488a099f2aa5e17c9bc2d211b0334e3c5f7ef5f3cfa8aee4ca9b8b166e5138ff5c952d92d2acba";
   hasRunfiles = true;
   version = "1.0";
 };
+"dsserif" = {
+  stripPrefix = 0;
+  sha512.run = "4ce60b62a45aab9f64399ae3f6ea3f25b1c68c399c63a2c75afe5179c0cbc100cbb5dfbd68b247b758df1d1f5f4c2cc17cb6f2924e24ebcaca28bca9b68d7f53";
+  sha512.doc = "4dc47b830a1f2092918c08ab39c5157146c1ca514b6c042734e03c9786137cbd2ef6a1149e75fbbf139f457c170e70bd3da484680f38ef261d6d4eedfaed0b42";
+  sha512.source = "258be72d2eb7c5ea8a07ba79aedf87f765a6555f6de540b0f40d731d4761f29c3a1795c3561ed0c8dab4b9458cf785499988be4799b0ec42b9eae2d7cbd16b6e";
+  hasRunfiles = true;
+  version = "1.00";
+};
 "dtk" = {
   stripPrefix = 0;
-  sha512.run = "f47d558cccd4e079ad6702bebe0f60f4863d79940d72d85ee25c786c6b1d17002a40b6fa26a05a3562cc27579d64e4d27524e960983a4ce2e7c39ad40f144df5";
-  sha512.doc = "5e23b2283d24447affdda03f45635a4e8ecfc3f44e07414cba8f5dcca8b19542dc76d4c95fa0ccedf54b68b764c1242e076c4776422cf9f85a6624cf00a8aaa5";
+  sha512.run = "b0a4c2c5c796d3e9d8493a6ae857e7278095d841d179a300f39d09a7a413f0baffe24e61a1fc76828e9159bbed64f7295c560a6ee93f48aaadea45548c59907b";
+  sha512.doc = "f1d268a54d1911cb94921af8c865f2aed259ed2d9d096a91ce19c0a86deddd409c44df77198a56f18ae09a06d5712f9f1c624015843d31a2a44aaa87ded391b3";
   hasRunfiles = true;
   version = "2.07a";
 };
 "dtl" = {
-  sha512.run = "d389c17da9175acf1c92bfa3558cd9106bb8e74a14581682259e71eca87386931fe9a0a401cabfb98bcc1a2428b243ceac3b5245f68c8358389b2a807f890e65";
-  sha512.doc = "a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169";
+  sha512.run = "eb6f1dcc4d681b995f8ca3a4141b988dd42001881ed0e1290b6c188b5d5952a5d54901f924b4cf3f2015376c452ee2a713d253d532985322fb7eb0adeaacfeee";
+  sha512.doc = "0da315de96913bf61d0c24c34ef0f39c72ed0c1189dfad5f6d8fd1159d1c3e0fc2c91ddca1aa69798b4a0e648ec9a1d70b4cc0c7340ba273dc2e4b08aecba25a";
   version = "0.6.1";
 };
 "dtxdescribe" = {
   stripPrefix = 0;
-  sha512.run = "c9edc524578c4b8e6cea0cddb442856bea9723a0ebf7af8d6523da014dfc53cb8ba8c1ef984b8e6a8d50e17342e9f0765ddf3303aade6d2c416998820367f9b6";
-  sha512.doc = "c60a4d464c2ea0297325102fdd291875d4dcf4899c3b614457dfcff0f0c642466bb49a39361b7f12c46963b0b1280f61c40b3542090da22cf7c565ce6693ce7b";
-  sha512.source = "880cb5d0ff083ff3b1f2aa54bed13d3ea94f16e32f21bd758ffad7a62502fdc78924593f96d4720aee886858e8d7b29127c137c5017d249fa96772ee358ade7c";
+  sha512.run = "8fb76950c7e1545ec6f685d3f1abd2c5994eb2ee5815f27717676e305ff7806b5fc83df43655b97e359b29e8d82edc51a23f44bea45c56f34817c46b1549bbc6";
+  sha512.doc = "202797aef3975fcfe95d01aed21e7ac2ab97bd983afe4cc26d94f5d3792675955ccb435b348cd5c7d16eaf8f5d91ed380b30b7b7671cfde0d2c41441e8d299a3";
+  sha512.source = "05c5d3863f8aaa0ac6b2e6f983401a3ea9c2b8ddbd0701571ea1e8f585be84a200a1e6e2579acf9130bbd39021a4f1f3fcbd4de9c0b8f95b03283cbe416ce791";
   hasRunfiles = true;
-  version = "0.10";
+  version = "0.11";
 };
 "dtxgallery" = {
   stripPrefix = 0;
-  sha512.run = "2c73069596d5c99c6f9f9ea9f9e65f5f731854068d1b56a6317e5966a023ad057c81d8c62ef38fc3af962b7307cbff45dbcd3867fdb4caf7bcd3a2c83a722674";
-  sha512.doc = "31e82752179fb78fd8db1871eee1b3c254e78f4254540c43d63a4243f59a0ec5efcfef6211c0d9012e2dc336164ad65e1ec38d9a1f0274208600b188ff86bdfa";
-  sha512.source = "60b1bd74afa60c36d7ebd522157a594cb62298c3638b28d589a84f8df08e37dfc923c063663b9a7202481bf8d80970d873b2cb055c8fbcaba71d55c109e8a89d";
+  sha512.run = "622759f456e95dcd13996c6155d434ee54a42badf980f17bf1a157fc28b80e6d20aaf3e82dce1fcde6e43464358a2c0a173ff24a445df8637c29dc27bfa0b15a";
+  sha512.doc = "130a80a0ed4bd08aba17ac1257e507c4d92e4a1b877d97f7f33ca5b515fddd02eca347672a74db456108ff16c3142edb5438828192f7cef2b7f9552cb850edce";
+  sha512.source = "fd5c6007b330e9d7217a71f3e93cb63567bb719c74e02a96698c25a60cafa2f752157cc712fd7b5adf7643bce5ea4847759a34b8efb8255a3463d475076626a3";
   version = "1";
 };
 "dtxgen" = {
-  sha512.run = "faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915";
-  sha512.doc = "e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c";
+  sha512.run = "06e62fda6d696b6ce3512957df7e5dc37072939c4b0dcd7d83b5894f1d0be1856ea69457f7e16119cd46d62b3e69d0646b96a768f1a2fe16181911480391c90c";
+  sha512.doc = "bd4557f8ca056c04aec9a9cab5e1797eb7042402b396f6772a2fb5bb961d1981ad3a79f02df827059e8e82a3ffbe11d86d51af99cf844f234f328bce47c4e0c7";
   hasRunfiles = true;
   version = "1.07";
 };
 "dtxtut" = {
   stripPrefix = 0;
-  sha512.run = "e460c100074fbe7f5cfa6e6071c4a37c0de4ba9f29cc3aeef7bcda547e856bccdad3e7fc242609914b130c5095e5a9381c3514e2d33f584e9b788a908ce447ab";
-  sha512.doc = "a165e0b3a28bebedd3e15ad2c92920ca1dbd8e77976a3455a5359b81bbcf4ccd7e2334b985deb96dea986a1b5c00fd82311c32fa45e04f63126c0dfcdbf78695";
+  sha512.run = "511506ec001be0b3879a9f1d464a1d453e8ae8938a1446f08f874e59a90d861cb66c8487a4718f1c57870db11c3f8c2c274d37a968cdb32a8bb90353e968cbc3";
+  sha512.doc = "65216d3924211abbdc67e6ecd109e7adc3713cefcc6ea0a229ad8b4060a4b0342098594a64cedf3483c51603531496225077b0e12e2a7f28e593422bb5f1c30a";
   version = "2.1";
 };
 "ducksay" = {
   stripPrefix = 0;
-  sha512.run = "4795bb1deb7b6b3b1dc42fa4437e33f2d21bf84712c19c01ecfc74d7742e19ec449f4069373435f1bcdbc047298cdf0c80015c1d14ca4ba02323b4a3acf2ce54";
-  sha512.doc = "999363cda21ff8fcb4198b381e02f58dc7f9b79218e4d0c5fe96d63dd870d9ede4d366983ba7d9d7eb974b1f55575cc46491849c75b528c777977a2fc5cbaab7";
+  sha512.run = "9ddfba14ab34458bd65a653d1203b18052dbd1100899711b27d52ef6b7d0e1bbf9f73f7f80d9ad90249b5c30a56910f5c3e48ed2b8eb1b58bced62acf9e2aa25";
+  sha512.doc = "97c0331bd5e2ce9697b3cd85ee49f57a80034cad064673d23254de10db5fddae439eee09c95c841588c9a6c105eb87ba309e84aeb2757fc9bc3429e47ec8bebc";
   hasRunfiles = true;
   version = "1.2";
 };
+"duckuments" = {
+  stripPrefix = 0;
+  sha512.run = "074d5db92ef31f38bcde8279b39595e2d61501d1649a9ff089f4fca58cf7af7fccdeac21205ce47409df85677459d341a9b05c77b57ca4039c1308c831a6b9b2";
+  sha512.doc = "e5b1391772403e7deb2d58c3323dd32a19bed23bac139920adce0645de93edbe131dc707230f93c53d89e9fc03c3866c4ca8b316683503be208816f28beb6608";
+  sha512.source = "a59f751ed83fbd657f375fd9cec59e11279abca4b0f2c55325715d7aa01607f368615e080af820b953315c6419f415b21ab6d69eb67ee1cea6a0e37168ca48b0";
+  hasRunfiles = true;
+  version = "0.3";
+};
 "duerer" = {
   stripPrefix = 0;
-  sha512.run = "39925c3ba08be1f40535346cf0c5eb539dd46cd8ed3e53350ba3c6f82e18448167bbc0a558a6fffbaa77b63cca308004b4d7c3a113b0ccc443eb2c2519a94b84";
-  sha512.doc = "f58c065b597ccfcbf6f925b2bf6d66aae6bd3c9a550a2eb3097c02103a11c4a18c4ebf95540916f27a87bae44978ddee1512ea882d41886870cc1b03eb2e888c";
+  sha512.run = "00ac7c30c3f1df9a34b8c43328d664a32a087ae029f0d7b8f3f361b1df23815fd514fedb5dadbf8e36cf9d6fb9708eaedfd218b86f82484bf6d45c5ec8aec993";
+  sha512.doc = "9d5851724dae2a758dcd7e5b9e7abb545e03cba2e594a4f0ed966557346872869bbc7f89de2bbf463bd572619110a9cc09af6145984fe5e4d927f584704f539a";
   hasRunfiles = true;
 };
 "duerer-latex" = {
   stripPrefix = 0;
-  sha512.run = "24ecbcb0a1887a3656b7f7f971a5112798e1ace384a31669916f30ca8a792e80fa2a95de6ac3636580b3fc88dc56428cd77b8d53fc46f86c4dd6e83fac2ab5e8";
-  sha512.doc = "22f18c0183ef6a46f76dc07915fe12319bb6e81774b48bb2f00fb0b7929b3bf1d2daa6444daef338cc0edcbc37f4930708de4f871a38802d646785d323d7951f";
+  sha512.run = "4713018b0facd8b65b6305cce762b51bdb81ebb39c62f4544c2fa83ff578713423afe154264404eb5b557b7f2fb17a7a4e14b387d0ac265786c3641bdfb7af03";
+  sha512.doc = "fcd3e0a8b66f1a28882f4925a38cd472ef8e3dff2fb569a1cb1d737e4ede8ab55e26faf542424afc5a2412e48b3fcc55316ba367305c4031b5052fd0ca8f283d";
   hasRunfiles = true;
   version = "1.1";
 };
 "duotenzor" = {
   stripPrefix = 0;
-  sha512.run = "3d041940d69469849c30cb7ed67a651d44d408424adb96ae045bf49f6d33e9e0dbff67931e6525516f65ead66042dfdd356ae0ae28b857492ac652d63e8359b9";
-  sha512.doc = "ba8683c9f34844e963397098ef551a9ea9beac8f223f70842328bf77fb6c534a17794296e1734ce441aadfa8ef7a5176ba57ecb71484bc3d0c93088878b567bd";
+  sha512.run = "5c02daf4d27d7c1bce3b700196ffaea9e9c84917e1466c1b5b652b0568d5dd9090523c2f5a0879577f56ff707a46746c397fe220c89335b3b869de8ffeefc18a";
+  sha512.doc = "5a000c1c4fc212c2aa78344df918684cd9bcc39a45b94fc10bdeed9a8152eeb3d92d2184ef5e26862c5ebe522ce6c1f2945f3061f4992d84a473c8374e0580b2";
   hasRunfiles = true;
   version = "1.00";
 };
 "dutchcal" = {
   stripPrefix = 0;
-  sha512.run = "94f7a78bf230868727e8bdb1bc68235a78f336a7d68ea8e5b58349f3fe67061db1a687c8cd50da47db673076d6813fed631bd2b8dfb62c7c1e82f8845310ae87";
-  sha512.doc = "6a76f91dd740044c294bc4947071286cf91ffef8411196c2d4c962affb5f62db4d007f9215f19f312cee75f4054cbc2f25b624d08d0d4b2f63e9952f09026374";
+  sha512.run = "672879d41cb4048055a22e14b133d271eec90494e4ce7411e0896ccc2f26f23e277a8e773f0939b39ebfcd69eb825fdfbf6e09a3914d0e49fbebf84b9a200544";
+  sha512.doc = "c95a00395cfd1e42bc7ed3bc42dc6959678d8772a9acf70d57a831b78e8cf7cfc8ec28f92eff235a84c8ddc31a73655ac5d0da8ad900e4d6def4c74d458fec2f";
   hasRunfiles = true;
   version = "1.0";
 };
 "dvdcoll" = {
   stripPrefix = 0;
-  sha512.run = "ab06014ab39a98fafe2e6bb561c432d51d55e22a77888063905c36c6af5c6ed0009f928e527c244501a724e515dfb7bde2aada5424e1d968cf157b3164135e02";
-  sha512.doc = "1807b45594b1f7f5b1fc733d42488209fe1ec6169ede8e6aa09378eff1451630a9cc6a61e9786f287beca22ab1b2918f42b8026104181f63c3aa01f0b6758220";
+  sha512.run = "7fac05f7c72b7fb9117e30acf91e65196dc11b98844b496060a37aa47a78ba15ea1b7217cbcbce9e533c322cc32c147b37bfee9e8e19a07d72f91cfbff9a4908";
+  sha512.doc = "ab1616c844dd126885652b678cbb1fff7e9e21d970d8ae47b093bae0a333619134ad9354e42bc5f15d3b2231ec19dac7b3b61d80f69e74465792245fbb97b140";
   hasRunfiles = true;
   version = "1.1a";
 };
 "dvgloss" = {
   stripPrefix = 0;
-  sha512.run = "1138ae45e63f0e10d8eed2bdae3a1f25cb6c18326a0454d9e856d33e58db08b062da73a219f8018bbc555a74b056bc02d35874f015d8cc3bc6d27dff564ee431";
-  sha512.doc = "8f07d4927088c93b65570a503fcf7df3c62a3f3864cbafe25fab0f3a8cc8b923050515f028898c63d00d0f662249c427f2489dd0dcf3140f5ac7f1188a82d4eb";
-  sha512.source = "7c149c1affb56523e505f9f712c1d1d8230cbc5c1e30e73ed7ecdb70dc4f2a7cdf0c95535813ab4cd1a5c2d31901d0f591fe56c3a9fc6f56f3cdc95f317a15eb";
+  sha512.run = "40d837000580b1643f67e466a084696eea32faa9239dd42dced6e23feef125bfa52cbcf7e96618e009a7480e66ef772c4630eef87f4d2a9d9caf7e2a29fd2176";
+  sha512.doc = "2cc88e199da97a9f4173088ec49b5ce8bb09e5a539962c7167a79b12542d9e82fe866c136661e18cbf4ee1f4f7995677372cbbbcf55b7fee4973ff4286ab762d";
+  sha512.source = "bea81bb46b9311cc5f39bdf9233e918680d9477c31dfce494b437fabad6c61738f87893c88a3d2304088eab7d4488d5ac12a8ffed3a454caac7038505e318f94";
   hasRunfiles = true;
   version = "0.1";
 };
 "dvi2tty" = {
-  sha512.run = "21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa";
-  sha512.doc = "5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532";
+  sha512.run = "64d3a50cb8a84e92f6c2222e704f0d4bf43e3b2075abb24c82e66c5d4c4acfbbb753cdc83753da7306e6a452d1163dd94ed8caeb318b7ca16b302e6459f30757";
+  sha512.doc = "cd86896ea463ac9bb6d2fea927c7e50bfb81b0a7a1cb01b8324f4d95be13a393437cf649dc333fb4866637c725f7fe664372857acc2317ae751789d0d6b35608";
   version = "6.0.0";
 };
 "dviasm" = {
-  sha512.run = "39c89108cd5c717eb06d12b392028e8e1b01c8d703d82f914a4d979c99ea37f70921d4cd9e2cc61c383fece3e455283490b9e9045253dccfd622690822bdb496";
-  sha512.doc = "70cdeb100d9fea93a9d2d98b04733a0d45f76bfb10134f3d62a27f6d00cb09fe3e347e267e21aad9021269b4023911efb2e513d9df7f8c79a6c60a991dd91954";
+  sha512.run = "772415a27378f8cbedee1c34f083f6d99c99ea21095ab3f4e8299e3c4bfd73603412ddf53b97bea559bd1e7bbbae65967eccb06a049b2cb04e7ac3eb848f1a86";
+  sha512.doc = "818df232084d7c14933abb8413628697bcc83a6c7ebb7c005447cad6fb582a0ac2e1bbd249c14985a5b93272bd2afe01f5198d218a83140b4cda4ce6a1f8c470";
   hasRunfiles = true;
 };
 "dvicopy" = {
-  sha512.run = "63a65c2a95792fe56f5eef04085776cdc83b39b73eeb28a2b7fee310dc50d572dd7badc42269188c45bbd8ba930289c80fec643cc82e8fbcc373904dfc94cfda";
-  sha512.doc = "c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8";
+  sha512.run = "eb542d855a28fd8e06306472586c2aa4a4235843397050703ccb76c0663050f5ddccf334536e4417c8a0976ad78d3684915160242f30700ecfcb7f0ebf810bef";
+  sha512.doc = "ba9b33b91e582147490bb8ed3703a9cb181330fb0d7f2353fa624f494a3c33db0e4948e7ee7a8a8869d938b7b7425f8d271fe68f54983d4a033f657f7172fd6a";
   version = "1.5";
 };
 "dvidvi" = {
-  sha512.run = "efc9feaa1fd2e32e221094ac49a1f96fecd7e04144b785988e23a51537cfbda51f6a5aba93772d53c74d2e98b6a38739d76f10770201b24c57bf644f4b1faa8f";
-  sha512.doc = "72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda";
+  sha512.run = "e50dfe7c6b0c5fe13db3cb489a885a2b5b5ba82a5279834560c6ea747b2c11218a072273d46df13b061f38601e9705496a7b058a85de8d7ab6a5dcaee1ef4df4";
+  sha512.doc = "2c48aa8d74262966fac3b084aa4dcaba8186267d02dc8d9c65781158f28ee2be0c2864a8c99cbc787e1f5b1c48d9310572b54baa4ede164c9575ca0136e86e11";
 };
 "dviincl" = {
   stripPrefix = 0;
-  sha512.run = "0505307c9b28471a317e005efba7358d0256ff74de9cb4514640a7fd2411cd29f563a1cad51c14975c086b2173aca76ff922a0442d7330712a362abacec1c510";
-  sha512.doc = "696b22e82e7b00fdf4c7082aedd9a4b23992918bf8f787a696762d9b17ae60e2723db01b285c47b6d84d3e91d981339c506f5d991785302544056a2091dcf886";
+  sha512.run = "b4cae4830ef19a851eb6952183b5e8f652f237c5a1e4be8e92230406684d91850c56ab867ca13844f701fae070dbbd54e3e67e9872d08c49398836828e77d904";
+  sha512.doc = "7b679a236c32ddfed978cc1d9bdac3efb5b66abe6b1be578f656a5faf4914e8636a87189c8c1c980f6de76cb9b6912b92ea397a97ee9445293a271e1394b7d11";
   hasRunfiles = true;
   version = "1.00";
 };
 "dviinfox" = {
-  sha512.run = "f10b5248f84567030a03ac92259e5cbe0796020131e21f91cd52cb120598cea9e4ecc8c514638043ff3aa6e888525089448b0142f5aa4331d1be8f761cda299e";
-  sha512.doc = "f3a99ba86d6293094cf18b8cb720c556001c1715c5a38a6425e0a5ecafd215c74ee39b8e3d66b6645bf66b880aebbb29fc7db753d42b2cccf6940723c36af70e";
+  sha512.run = "a1e296c777a65a520ee21e7c02e877a5b94d9c444660714d5492642aa3f53311a440a7aebdf70c8c33373d7895c4ad14dcedb6efa50d770cc54898c2a33f3012";
+  sha512.doc = "356ceca531a8d8f0de2daa5101d363b8887a0864b8f36228c6f7604e8e77169aabd8d947bd283916afbc2a5b7a092c80053519b8c9ad6b96d34a3f596c6ea8ee";
   hasRunfiles = true;
   version = "1.04";
 };
 "dviljk" = {
-  sha512.run = "c194afcd4ee1446fb2bf2e6421827ae51a452743df98c4ebd5dede992db22f08eec7c9b1a77273799b971d2f7a31c2c4e2c5cbfb54c2b2c706d62f580ff482e3";
-  sha512.doc = "4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0";
+  sha512.run = "830b8f6075bd4506770ea0c8b12833ffdd201d0834c73fa8d6f1f9b550b4a3c1cc23aab513b895f657944d1d8bfde634942fe6530352e43567e1a67fd62659a6";
+  sha512.doc = "facaf508b2b2e884edeef713f6e3c649d4ffa19d8aa57ecb7ab98f341b3a854af203140e4ed98265af134f5838b6b5df6b7f6644ef79f47e466e943a28ce2bfc";
 };
 "dvipdfmx" = {
   deps."glyphlist" = tl."glyphlist";
-  sha512.run = "340a1903f5b8fb445dacee698f6290b300a6368d216ac370c1f81021c6a74cab69b0aaf13993a1cd5a065ac10f5446e286d75b8cda16d9e62b50116187852b6f";
-  sha512.doc = "5e4feb69d9709b53eb4c76b58193fe71105d78a44f1b369999ef06f2354115924e6066869c5c72245964309f8b4f2ddc81251eb847be5916eafb154d70562fe8";
+  sha512.run = "905da1daca59bf732906e75b28f765ae707b1394347165fed64dff94df3c2e0cda174579215bbbef403ff6278adc4061754e1e69aee3d3de2c282682deb0f15d";
+  sha512.doc = "d5f90e19898a14a8fb549445ec8ec19323d61b7d74e132e0dc49b54a5ad0f9ae0fdc138519c247886fc84c8f033a3bfa92318609a342afbe60dee64cac6814b3";
   hasRunfiles = true;
 };
 "dvipng" = {
-  sha512.run = "4b11468dee23c1203535758bfaaa43d6237fb5883e848921f47361f5ce65c839fc0babb03f4f7fecba8f9783635d93151cdedd036d6602bb76937168bb1333d3";
-  sha512.doc = "39b5642c7d15451738f46affcd6d0514f66e5ec47f5d2c9ef2f40f16be00d09c388b4453fe5503bf67f92ac701b2101bfca44558fa76ab2446a8f62cb47d4605";
+  sha512.run = "1392b745bce912cd98299b8e6c643d95590db0a14314a78504a5ee6f7942ceba994dc25763790349eaf5b07b333f59acbe1db12eb22dade4fd8114f176f8c134";
+  sha512.doc = "127010ed1eb30a2c88e59f2ca81c7185678b1c628c45561686e009e5178d825028d1ae0a0325806faf20723837a09baa9503bb375c51fd3a1731cc724178fba6";
   version = "1.15";
 };
 "dvipos" = {
-  sha512.run = "8ccb0b10c8a92d70ac55a1bd4af082b83417d1dee16e25cc69e334a554630a3267439add72e25aa5f46915601d0d68dc4b9ef93d858a1b6ddbd3a24abada6710";
-  sha512.doc = "3c6ac418c18ec5f84ef6f442435d3a47a9592f3f77cf00b093ebf7ab3669592542ea7a93b9c895aefbcf6d6091117125ee71e6576a954cea25cf8d2e5ded953f";
+  sha512.run = "ba8bbe1797971bdb1706a8ed059cc45c0d31a503380f3b1cff7c1d74ca8067d39cd6d0114e366ea0731d18ab00cd68eb8b57db287b0602c74e2bcbeffd6d3316";
+  sha512.doc = "6500b125af937ba20cd21649c16ce82ff8f8f1dae31294eb724f1e47ae1f9221966f68c5ddc9019dcccf411bbc262a3ac362fcd3d659972d3cdf5f559a87f756";
 };
 "dvips" = {
-  sha512.run = "1f39bf8036e017649f21db9063259b9a7afa3dbda56cbee93611c72f4fc0c47bcaaa2748995b59ce96e548ebc9017a1f7a48ec78e20eae044c9c2033c63b5266";
-  sha512.doc = "87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18";
+  sha512.run = "d5475ffb0fce54cde01b786b64e3b8cc34f3582576b442c3e4b2e24b4e6a298b8ad4e5e5361a97aae9c96bf8e86fe7dc23dfff161e5b27b597ee25a9b1fa0c78";
+  sha512.doc = "d88380d5d37c0cbca45c3c1cda0b4d6e437c9961f34e34055466deba423a590a28ac3e9e8cbb65f318506a36188eccf8fd6880657e66687557ea95a623c9597b";
   hasRunfiles = true;
 };
 "dvipsconfig" = {
   stripPrefix = 0;
-  sha512.run = "99beeba61093d7baf17f6706cdce374781dc44bfb0698205d14fb09b151e5bc417fa461ed96932d5f519276cc054de0679fcbd92b0936b47647194efef79b8d0";
+  sha512.run = "2c30561bcbf5ff231a3e2904094c144ff16591b1c88a8180e3bf6c9f2051e2d689bc1dc6bcf389e5c6c3c0df3aa6bd3fa31c58d53217670d5a1bb6fcd1ca6fa4";
   hasRunfiles = true;
   version = "1.6";
 };
 "dvisvgm" = {
-  sha512.run = "1114a7bc29c9f4212008d2e3ed06b05c2d4301ac021a8c48f12bcfb2b4aa414fe6754e202033ad024705bd2ad7c7c5bd4c239ed2cd7498f5e61618fc7fae8ddc";
-  sha512.doc = "39b753ad2743b3e6e73031e34495022deb9d01f4924c5bbceb365c61b5d04772e1dd73202337b2b739154f83cb5a4e77298d1fc2341d49bcf0237c126c60937b";
-  version = "2.1.3";
+  sha512.run = "0588cb349d8757f48954e6b80f7f49d6563e8fc186eb241b7dcf910c32deca74e4d9bb2dbab6dcb8da4900e00a911681dfa23d4fa5bdc10bbd8d2f9dc23f66c0";
+  sha512.doc = "815cab417e0eea6b968e0ebe60a027a7fecfb652380c350305e2172d81a2a21e896277fcc3972fd76f5a2e2a586c8a7aa24e3b6b625b951dd2ca2d5c43f33159";
+  version = "2.3";
 };
 "dynamicnumber" = {
   stripPrefix = 0;
-  sha512.run = "f175878764bf77f1257ea1161f039eee68352cb7fa263f9a4862c0db3a97657449e848a290fd898ff327a819268d10ba5ed03f960b2a5f958874a1bd54ad4748";
-  sha512.doc = "20dae05435a859161e470cebe0a1a5e8404ed3f9e830abc681be110b932d5487467c5c2dff6cc1ff8bd2fbc8057825a24e79524fb4f5b022cd48d245ae74bd41";
-  sha512.source = "94c3a273a48ab1d022e2e3d1075491d4c95c7a0e635c3d867d4b10bbedf428714456fd284ed63cde5492709c7401283a848629a9ed5a4a0908a8e0d5733df80d";
+  sha512.run = "41d3bcf563eaf30535369b7b02c949091ec4ad6ec38894a10316cfb53b2bb1138aa40c4ba87fbfc0a883e687632545f755fd931530d463b043637913c251f94c";
+  sha512.doc = "b3988e0c1e94afe82f8011b57b9e4cac16487e8a6d43c0108774d2d5337c9e583b46b3540dc939257048a69c915ce5f1100813fd5d2eb9c74643dabef81fecce";
+  sha512.source = "c8bd8789a1eec8b41347e62118134f4e95a96db736686363c76a90da7dfc62a9df725e86eab2372bdddb858c2fb51a6a9faa74f2a44583de5f41a0f71fbdfaff";
   hasRunfiles = true;
   version = "0.1.3";
 };
 "dynblocks" = {
   stripPrefix = 0;
-  sha512.run = "e4acf168fec3b0c36be3eb8fbdc56eaf76563f426c884a6f7fa61c42bef7aed803bac56d5e0afaf25ca7ba5ad19be6590e41483a98685cfcedb2e850371442a0";
-  sha512.doc = "9155711cda552a541a16a09ccfcb4f574c60aae17ca53dd15210f3e88f089af736609e9849ffa30b9e6f189a9ea5d1a540dc655332762c858d35f1b0bfef9af8";
+  sha512.run = "4f3089e8c908bf6f55c9472c6ef6ce3b733360bc5a0c1339f8e03b0ac746746ddce93cf77b22528ad0af83ae04e2571e282ee12ae28012b69b4214f2a18de654";
+  sha512.doc = "9d399d28088d6ec226826d08e28b81185146c382e1e6af405a44b855d64e4b1e06b779bd695fc2ff3f040041706946ad117fbf73fc32dfc8f70a2091fee400a8";
   hasRunfiles = true;
   version = "0.2b";
 };
 "dynkin-diagrams" = {
   stripPrefix = 0;
-  sha512.run = "817a997a8819149c3ff794331e7504472e949867981f62dc5838946bcf143fcea64a96284c8e1c24044f0dd946afea014be50cec976e95c5db8340dbc99f90dd";
-  sha512.doc = "793613dcae3f61fcaa540810d733ea371da95d0cdeb41b61023c4fd467a28e06ccd73d118de5c14c0c2c5a3648957bef0a5537c0bdb3965dc6d6b9d3de6ce177";
+  sha512.run = "e3d123faab0e3802cb64d25a9fb41a8cf665a788c3a2678614f27bc377a6aeb401c3e64a11578f50b15c237339713353d245cbfab0c6a4fa04d021f6bbdf5088";
+  sha512.doc = "b6036e1f9c42e8662b88fd77d971a603b1e789057d76bf96967b589a4124b3cf3d11389e2cc960f49f1a5d933febfd701273a6a4670fbf3533bc718a3de9c2e7";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.14";
 };
 "dyntree" = {
   stripPrefix = 0;
-  sha512.run = "093e8487570149aad10d2b5e649ef475d236a19ca80f88414e0913af69c1b9c065fff0e0970caaa1a4ff8cda2e8c152416573cb06a033ee21df2a4bbc7527840";
-  sha512.doc = "91dfc6ef2dd673593092296cc449749647c37cbf7a34af32e3b6a1da3baa7e09187ab44fd061ca6baed680c2e3ffcc3b7bccaf8d4d83f1b194cc6866dd3836a7";
-  sha512.source = "16756012845fcc87735f02ac316446550fee5d5e7d5ca1d73809eb74a09554a3f2db5d3d8524243c4670da1d704d4ac045991e7fc82c7aeba932e1b2a9ed4852";
+  sha512.run = "800e0074a2459419601655c6eb030925c7a4d5ae315ad375db341170d04848b1b24573245562902c14d49cb81cacb3e6a7f341e30784fe8e3b03355e93322ef8";
+  sha512.doc = "38abddacf6486ba5df3c820c77c3f2da2845d26eacf8d083a81231c4d4b6133a28eab5c98e87f19fe421f3aaa0776026640e484e736918f0337c86823e03c5a6";
+  sha512.source = "2b4e20726864dfe61ea12c312493b0c8f74b60e42da13de194469c7a26e5ba8f4eaca53063eb7c2714b451147e173b9750327515a00654c26dcf7fa7b22740d0";
   hasRunfiles = true;
   version = "1.0";
 };
 "e-french" = {
   stripPrefix = 0;
-  sha512.run = "279e88d68aea7395395fbd1399d281bd3bdc2570399a65434cb3cef575f2fb66f6cd1ff27e7127119a07a44782dc4d3b25ce236c373ff9ce2e95973d859b1bb0";
-  sha512.doc = "ea5dd4acf3ab38f93dda85407d634f5ed0b2ba04ff51c70dc0a951771b8708c0ec21e611091aff0da47b3c18794175e2002917f58effc16272bb4aa3fd6692da";
+  sha512.run = "5d6f1ebcecca91a976a9038c08eb9dc6459d946048426cc344c8f41152fab609c9702c0e274ae76739153b912fc48d4eccc12e8806b96d67b7c1b7ec85b14f59";
+  sha512.doc = "17f7bec65abb183c96ca6ce071c1bc35bf3c271900cb1cdb6c4c3d8786faa3f4d25463f48fb95635d9bd7cbe9d7d99e4a2704f1961dc031723353c6a6c4c3a7a";
   hasRunfiles = true;
   version = "6.01";
 };
 "ean" = {
   stripPrefix = 0;
-  sha512.run = "be181151f1e0d8690e8320d04fb1678abd8d4d71e7527c446f43a2a6c6b5933f9184a1075440b64e02de1b89bf0818ebf2b6b405d59a83f942c6c2981d3127dd";
-  sha512.doc = "4f535cc1de79faf284218af83822a9e3fe270ed4f681665dc4a3e1a7e2fca3d89c0831a012c452986f790db42ee5148a75a9c4b2c6c30c3d7558f257a88d5af5";
+  sha512.run = "6de1f65fe142a0b740db362c8fa4c90a410777fdf5ece83c7c9a21bdf8ab540b57f9e74ecd917f6ccae813b839d244672fa0a280a728340675e948c90f2debff";
+  sha512.doc = "5ab5f510a7849d41c9b1da5cb8909d9bdab21f8d88c96b8e9fe01c795d9605b2c18b88ff5d13ce94f459163c6885ec9c8728cfbbc9079fa14bbc9fe79955b7a5";
   hasRunfiles = true;
 };
 "ean13isbn" = {
   stripPrefix = 0;
-  sha512.run = "9de42a22a57ffc308cb357bab7787e46c07d6ab911a6e92fa8ad6eb94a4fac97bb476f7ae740378bc540684ef8c001f4d07a14f4c526b5b4c88413cacd1c4da4";
-  sha512.doc = "b74fc0037f52c1f286e35772d0ebb01d12985ed7b813ed539d037557c0f2f47282d78806f174a54d0454a126e0b6218ef7ddc18791daf65e063b747204b23d6d";
+  sha512.run = "3bf98eed7614063289dbafe986d25feea310e8241f181e4114ebb18ac3c942e85e2766985b7ecf8d36a0ece11ba11f47df7974816e2524b42cc913b410d76460";
+  sha512.doc = "a4361b89f84d31489626b2e1a632d9aeae52c1e6f90fba92c39f83b3037be2ca1d859a93dbc3ca7bcd89b74dc9709a869c1fa68d02f110bb21e3c0b9f1986604";
   hasRunfiles = true;
 };
 "easy" = {
   stripPrefix = 0;
-  sha512.run = "59203cf1b752b699eb709c7689739bdb325c6cabb4377a0da6f093bb6968fa789021b0efee066b3c2d687102160f0c707fd076f9b21d5c600965ecc678f9742f";
-  sha512.doc = "bc65ad294ef7b4002190fd008adee0589130c4590f234261678b2b7ba1a6771bc97142d8afac67c0510691690a733873d743be59a1d54bbf74ace0d6bd5cc6e7";
+  sha512.run = "07b0c9fd34e57b68e12589fce580bc20cac19e6c135e4af3415250c2f3bbdc27d0ca6057ea2b1dfb85d3af545ac1d1f4af778be121e69a54f6b45f2553e404ef";
+  sha512.doc = "68abc647e1e2855158928a72bcf92079941f0e6304195de4dc97ab20b21b4f2c97d9270e5e432caebe0a55ace336adb0a9c3e846acbdff90da0a351914d94ac6";
   hasRunfiles = true;
   version = "0.99";
 };
 "easy-todo" = {
   stripPrefix = 0;
-  sha512.run = "54a6c042f0ae1789b13d134c7f14c8c2022734002e4d0edc09ce060f591693c94999934bdf5e684db200dcd20775e14b5ad2bbe62e24c21ee6920d854dbfa94b";
-  sha512.doc = "c76feca144b93a42efd293212b234c28ce90bdded962f5de21e37cb8c2d0e3cf5f98d13a9191dd7f9d9727a5671574afdea3519bae71b9b4f10023808bf34d5b";
+  sha512.run = "d6558760eb8f40add9c41dc84995a3efe17d5646b161719824e86de9ce99069b9ce5cfa4287188d83433f57df67717427518f86b4ec0775d13f48da0a8f164c3";
+  sha512.doc = "5414bb88289fa112784c55335413fd0646140f3c39be3255aea439f8e8cb047171a7364a3ed84234e886abf13e6956f1c5d247c883242fbd58f45db5dc45960d";
   hasRunfiles = true;
 };
 "easyfig" = {
   stripPrefix = 0;
-  sha512.run = "4b24622d1fe97258ff4699805c71a57a7d1b3fef64f153b0b9538f3ca09fd75ca8b1fd9c70f2f69b651d789ef61689886f4a6f698a3af0257b01ec21ed786ea5";
-  sha512.doc = "c6e43fa0df7e356789ea97297fafbc3867590464758d2e9a30ca42c704007fd295b166dceb75ac2c40cf978975d6351b6b9b18565b079c421af36463c699939e";
-  sha512.source = "17bfd34845799e822fe117c8db16b565cf2b533e2c675fe8d53099ba68868b2611fd508fba0d0640ac8b7df928469ed8fd57c19d25049ec158077fa7ba5d9e8a";
+  sha512.run = "a604630a9b7e60f5ddb9c8f3ed09f8875ad0e6b3c9b809e0c8335b1bc432cfe70d603a81ef5cde3bca080d7b2871a480eccae5849b828a3f431b272055773099";
+  sha512.doc = "cd00ebcc22e99b829335389f6ad4e3f2652ce939f18f640eb0e69c2da1a11c693c25717b0544f5fd1326c238de0b99b2c32668071d34df6d2fd529c0957ae9d3";
+  sha512.source = "77f3159d682e62917a6605c5037824c917889f642fe062c0c22ad59cb7c33e3d9c6aa609531a9649a6ef4e9d7d281d1dead8dc3c617cf08923de33fbbdffdf7e";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.2a";
 };
 "easyformat" = {
   stripPrefix = 0;
-  sha512.run = "e5c857cdc196bd7f1bc343242bd1ee626ce3c0992f85db0555d222109f066ad5ac88774178ed366c6f97adcfcb86c9657c97d0c0748c08d4e1f4e07eea049608";
-  sha512.doc = "d5ce0248ce43506e97fb8757500712957c302da4bac9527cd572739677ea13e3c97621cd2c28e479cf604e0a8fc7cbbcecd92eb8bb5aa9c2fc32a7150e6caa91";
+  sha512.run = "4b7142fc6f1f92a9fcd044fc0e1ad958d35c50ed3b8a4c049f029cf68bf6561e9cf0905a4fe55d7bd6e9cbb9992ed5ac8f9c61b9fdb1527a1f78e2561db5bb03";
+  sha512.doc = "dc9b19e310b3ba73aa5bce51b73f06e706c73ce8849f824cdca4b8e6885c6e6e6cdbe283244ce35de17809718fc0aa00eb50ced3fd002d4025c5c33778362b68";
   hasRunfiles = true;
   version = "1.4.0";
 };
 "easylist" = {
   stripPrefix = 0;
-  sha512.run = "391d61abc618a77978d7fb647f2b5b3a9cde34e1be0d839ba0d5b3fd42189373064f314fa6efafc8bc6632747a41428430efd9d576f1be4f7a584731b312d0e2";
-  sha512.doc = "fd1a337f28c28e4f961cb8e6906277c390935711d2606ecbffe01b1ac042d17c2b102f299a76b6653e88bcb54c0f0f866fed5698fa5f7f33c91ce9d9f24ba243";
+  sha512.run = "ad44482ef848661b0002498cf1732ef56df15c28e14601217002882c7258f3aa1f31d7b65416b875f50b394479f45a8f31bd8da34a85e1d5672eb3e97ae9cf6d";
+  sha512.doc = "aa606e2dd57fab7e8aac263627ed98ffb2c11ec228c457173a8d4f2dc4f60a364e09e94f563bf2ad51370181273b4d03997aa0db0e26c4b1ae651ac130ca15ec";
   hasRunfiles = true;
   version = "1.3";
 };
 "easyreview" = {
   stripPrefix = 0;
-  sha512.run = "ac02330360e0d474656bb1f564924d9f9399eed73d0e902f94ed195b9c31a6ca71d40b5f174a8bcfa8d26b63c530964f1fd58dd84612e4bc32e3fd9ed31b015c";
-  sha512.doc = "a3ac9c12ee38dbf51b842fa5ee50db1897e5982d2754cb43e0263d5b2119f98c8dba771bb546bdb3b313291a3de8659e5d0f3b1bd254e7d8d4aa9fc4777974e7";
-  sha512.source = "b9bb399d933c4f8560d87a819381aa47bd31549bc6685b561b21b9b09d0b90f82f4d7aafb1f31abe3f8a4c36a4bd56a8450e5109a3bc049d6fc1e19f91d91cb7";
+  sha512.run = "283125df90064025667636eb3948cefe24d0f9d583a08daec135c0a71d9948b766efbbc1db700a8093162c06ccd55eaecd1a1c128f74babf8df9021c46d481c0";
+  sha512.doc = "0f88e47e74996011daac426432c28099317ada3cf3d67c1e123ad597dfa70c7d67010f0c17580550666cfd5f6c811c1aea4919a7492ab9046298b6bf0b1b6f86";
+  sha512.source = "5e2b84f6ac46769ca2c5747068e995d2026c850267c61d7ddba8acddd6b984c4a014d310a6dde1847b7c9433c362aa356cf192bdbe2e89a637fb17248af4d9fd";
   hasRunfiles = true;
   version = "1.0";
 };
 "ebezier" = {
   stripPrefix = 0;
-  sha512.run = "0498b73c5905d7d245a12e3a37f87dba2fb439638fd4df62787772964c4fe8a97515c5f90fb527739caea2a33b3d9fa6da3d0426119f4eedf9fdd6d654863684";
-  sha512.doc = "40e810c3fff25e81abf05e97eea6bb88ceb7e7bdb54b876fe4bc8d3f58d21a60506336cf49fff8ce9a4ac65642e2d539c5b4ac91894eb31ef6e307913b12d3be";
-  sha512.source = "95a85f3fa97248e73ff726aa3b613d40a633beba0bbb3908dcb31184b6ea8caf1e4f54979494e63809053048356a0934582184ba8be1235e390b4c407d173b03";
+  sha512.run = "3f3e08383e8f14846f6b5be6920d5d2c0e219a2925d08ab2813f4bd56ffa1f1c9a59251b09187b514379e663bc08497f87734bda2a7af8cd1b353e6870f0007e";
+  sha512.doc = "9ff660e3cee2c0619b6d74b2eaf55fe71e0eeb2f6de05d6a971bc341f2fca24ddc6a28c5fa39aef91e0d657a8827ce4c2e4d99b52116fd950b860f658aa79db4";
+  sha512.source = "67b3fc4c1631b2acbadec70b88a6480d24203402f96c6370f45cc612a1f1052ac1bc3f6b352a94b860f99312d0d8a1d16ff640822942101ec27a788566df2c95";
   hasRunfiles = true;
   version = "4";
 };
 "ebgaramond" = {
   stripPrefix = 0;
-  sha512.run = "efb472f7d418f5611bea6cd374ed84af42523946765be7e78ff13e89f02c70fd2c1d7624df1e7e2f25f94928a121a4dba1f7cbd2aa7287fd1f6f11f8196ba1c1";
-  sha512.doc = "4f2f61cca16dc64f0393b879022187a576e014494cb4f2c9e3f9a1a4f7c690dbfa4b84dcd7c346bf3bcff3103fe85e78de2159fbdea3965ac9e9b16f2d66d70f";
+  sha512.run = "1d8b1fb958e185dbbf487777e1ad25790f3e0b209aeaa2181052154d5fb83696c437b4765c1b865b520c1e4ed93666161c8bba7db51e7c51b7b5be3e9a7dd36b";
+  sha512.doc = "bbd0658fe357eb1de72a1246d3a43db1c8b3752661779bea57e1e97135522a475cbddcae03cf9ca200c61dbfc207cb6a26537c607debfce915b41052f7bc2ff4";
   hasRunfiles = true;
   version = "0.16";
 };
 "ebgaramond-maths" = {
   stripPrefix = 0;
-  sha512.run = "428f01088ef8090d885366a522f445a1bf37be2528186c5853a8873b25d7ee5a9d633fd0b37a05ec9de5e41fc667a11b925eeea453ffc1ac6625634e84ffbbaf";
-  sha512.doc = "a0d08213560e48718aa1748e4e7339ec42c1bfe5e6c694d6b24cde4678f23a7806325c3f64483a9f9b7257df54764ee85a9a3b4363f776b84975cecf663406c9";
+  sha512.run = "6d0ff4f85f83a350c2291c20798630af205f0a17f69e959979938b80e2db1b0dafe28818c6023ab1ef5d10ff7012e294403ac46f182658d563927f24d048f749";
+  sha512.doc = "7bb8132ecbd6bc1a73ebca1cb81e82ab3e497727ea2b932424eff628c81982bde9d77fd7aa2bdd5d54c4500139dc8da489f377912c0e1b86d0244f4d6969b4fa";
   hasRunfiles = true;
   version = "1.1";
 };
 "ebong" = {
-  sha512.run = "1e5dc3cc549c21738d95634aa1b464d05c8070c7dacdbc805c1cb5d0df89c982e840f6f1fafd8f876c0148462ee851ccfc3250b9d1c3ed898b1f4512bddd96ff";
-  sha512.doc = "ffc0b9cc7e2300e0cabb0d03af402cb4066e02cd34be3861a6b3fadb237b669aacc1a5edd1fa2511c60255cce4f066a7e6b10474b4d1df2ec6789a8f456bec97";
+  sha512.run = "9dbd783045b4976fc29601f1c5630e29e0c22826386322d67e4b39813c73e6f1f975e915a4e5343ae65163f050385b2f76a0aafb61c121eb7ff7e3dd1fe5466f";
+  sha512.doc = "eb6333aa57baf642e7e9e8fb9380a6737b3c54d32db7ab19deef90e240ba9afc35de74ea6b4639704e70faff823c7a9c0215ca7eb1139b09656f8a4ff1ea36d6";
   hasRunfiles = true;
 };
 "ebook" = {
   stripPrefix = 0;
-  sha512.run = "16648f3f93f86be95027ad818696ca88562bd201fea51eb2f69b9c9da8c9afca843fb721bcc632ff059efb2a4ad98bd70d347633cf2a3ddb207d12a6138c3a6e";
-  sha512.doc = "fd506f03cb86344069c7c116ec05a638a8b100fb0229f1b1cc026d614f4a1125b7b975c59d44855afc393890988c33cde5b1939b530d969457282ea7c2c21928";
+  sha512.run = "7293346edefed31af3518717cba1bf49612fefdcf997fb22910275eed6847dff472f93d123231c453dc4a0df5a190f5d2ea82b31df7e3e036956d6dea2927fc4";
+  sha512.doc = "34892cd456a1d743bf8a9f4d121a5ddaa9aef97b85b8889bb0e4bcf18108f48f5ae438a5d4bfee2d0732ffee8a93f9eca1c5e83d86514275d406d72616b51a9c";
   hasRunfiles = true;
 };
 "ebproof" = {
   stripPrefix = 0;
-  sha512.run = "19c23fe1f5b8da5bc4b3077915d9806440f1e1e13f37a47da06f3e22223c25ee94a4a3bc54094b6f59507c6ac9b5ad8b2d89a065b2eb7bfdc7beaa1007540cca";
-  sha512.doc = "78342bfe480861ef7643119d17152ea7d02215726e4d7776a63a32ff3079837066580578332ab7109eef5fc4418b47a7bb5f86a3565c0b49993e06f5b2efbffb";
+  sha512.run = "7d86ffca1d5c6b6105e4490bf4cbab7f08c54dd42454870fe1756c5f518535d0226e2e10b9505514d39b5125e001ec062f17fda3f15bbc7250ec407e0eb54afa";
+  sha512.doc = "6f46a6b296a44ba92106630ecdaf066cfe8537e1ea6066525e84a7a97fca5fbaca4602b8d0140b631eec18ffed2e32c49ce19238e2099cf7580ae00d274150ef";
   hasRunfiles = true;
   version = "2.0";
 };
 "ebsthesis" = {
   stripPrefix = 0;
-  sha512.run = "6feb6c78b9b5e779dded4556a80cbe5ef94951c828423bdefea9aa3d072a7b3a47adff92f27c8efcca4b9cb95992d18a06cf7419a3b587869b204e85029769e0";
-  sha512.doc = "7be86cd76f9647c1084f32d701af7312ea1f72113666310c226aab90a687b49e98f754fbe21f631cf01da32dd0449242b13bc040b6da4f312f4716f1a6fd8574";
-  sha512.source = "db279410247704cc6f25af3e8593621497d00ddeb07977dc2403884d769dc19e33b58613479696fa64a5da430592fb89ba894e01a7eb54dc046a72be69e330f2";
+  sha512.run = "d0e4e65ac91f4f92507fbfc1e24ebb73a3d4cad29141261c40379b222a75d9fcbf6ff07da21c6c5d27ca09f3ad57b9311ff68d464862e27c043f1cb0936d8428";
+  sha512.doc = "842865acf71f2f6e78b04f70d1cc20f977deb90511bbdee0d12ea97e81b5d38dce882054fe95606d4607c05daa340733993119c794dbd350830972a3e12ad1e0";
+  sha512.source = "14fb464218aa59eace233c25c234660db02f5771b02bef0cf4ec6374246c0ea01502746db36604b2b08c3bc6eb1a7390cb3e5755c5c5a87af3e3d8781794b68b";
   hasRunfiles = true;
   version = "1.0";
 };
 "ec" = {
   stripPrefix = 0;
-  sha512.run = "d09fc78a5e14669ccec8089b42e6393bd551679ac2924c44f915a784436860ee2570e5548556f8ca76393dd18f5d1bc332e5bf2498ee415fecb92f01223eec94";
-  sha512.doc = "b83c7a7beea246aad902f7a09b135e90d66189bb7bdbecc12f9255753e57193836fd8f5111de4777f07f519a618b93740521d9e6e781b8e68605bccb0e7a998b";
+  sha512.run = "bc5aef78d26464530d50e93f4120c2639ed9ba8909cb4db213b12dbd4fc851a91357604d4db00d8994958fc3a0d96784515a909cb0106f0df9c8dc66887831a4";
+  sha512.doc = "fa3e5e73f3b4ef6895cf36bf4806ee4abe48b8c783dab134a3c49f396e8740fcf6af65a7d81cc4c25c26117017f178de182f9b01db8cfe6e510ab0d8cac3191a";
   hasRunfiles = true;
   version = "1.0";
 };
 "ecc" = {
   stripPrefix = 0;
-  sha512.run = "a146e753087f2ec7de034b0a52c9f0369af4a9d00a39bf349971a1eb2bcaffad670c0cce5a454a81252a24e3b35628a0704c237c34f411514db3bff84ed75840";
-  sha512.doc = "5f6ad4a40aa91c6b3a48b76162411d3b4382e20e13f34459428822597691bcb93d5b355df19b2e618807524e9e96c8898769d60886979cb0cb52f2f976001b29";
+  sha512.run = "3876339ad96d7a2a7529c5747466de59dfa00154d6b27522ec701731d3e07532c9495cf7dce5d8979c8841549d6c691d9cc712349df932a240b6a508cf5b1297";
+  sha512.doc = "4be868f4d6a66a4af02f2bdef534b431f0878561cafbdbd46ffc050336bc56c28fdb56a45049703f86d0efeace5cf1bf0f8a5c151f5e8a7eb7c09d0d7bf35c5e";
   hasRunfiles = true;
 };
 "ecclesiastic" = {
   stripPrefix = 0;
-  sha512.run = "ce34428d1d101745a7e53baccd74ed518c88fb5e6009a442853765477a4273119af1aff3248739d5528a61df196518c483eeb9b0d6ba3c54a6656113e48c0e0a";
-  sha512.doc = "ec19ee4eb455166d6dc532de5b7888e7c52f400b593fd1459f5bf449a03590165c2a6ddcafb79b945c89a6c717ef5e8200108a84de231aba58f8e667d3a27461";
-  sha512.source = "94c1dacecffa48f844d45e7ea9e25d8d9b2741a1e27c95c00ab021d4771c388c43f45dec5e7145fd71470540c65d493d879d95d0b9042f8461365788c09d9db3";
+  sha512.run = "eb0016cff85625cd4d6bcddf73ba0681471f0462b5bce08ab6b6e3fbfbaeee98fd870c08f3b82b44ac432f94aa1dd48f82bf0a1f13d67663350657219f1d1945";
+  sha512.doc = "cf19634a34951664a3a1e4b5957f0810f7d6b32559f1a9eac6c55914b792b2da82cdf314af1dcb4def5bfcc8bebe0372094ba05b6a5d4f61cae09b6068b8b483";
+  sha512.source = "b2077410ced6053321e1ec396b15052a362081d3db34aae7f0c48d33e16f71014c811c6a0306f79b9f69fdcee217dc7a12ddd67ba2b07ff137155f63e1cdfc96";
   hasRunfiles = true;
   version = "0.3";
 };
 "ecgdraw" = {
   stripPrefix = 0;
-  sha512.run = "d73a0ee7d4c2f93565e7663707aa75d24a662277a4a883ef5cde83d15a509add513fb8f0db24905b65cc293681f3eb42af3670f317b571573b991f489bc1ec29";
-  sha512.doc = "2dbe1e9705ac34b8b1de2ad6be9a06f7df0a2463d38569c649f32a7b1279bd362d6b2a22ad115c42442b080d1b646643bd8fcad001d1a342b141cc126dd01d15";
-  sha512.source = "5137e0c7e2373f75ebe512a1706a6e0f4c0f878ea7caaa773780e904395d8bc5e6b3d84d2e71f3211b6688efb51ee57bc315f96013b7fbbe5e0d790cdcc4e0d9";
+  sha512.run = "8296e06f21c365ced65e1f7faf11d38ae8ad5004aa72c3e9716350161a21944e0566b86d02f0772498429b9d27ff0c7fb82df9b1e72ed8b33fdc1d074a55f1d8";
+  sha512.doc = "f92ed3dd1c8f399bf003b9778327752214a785ea95ffd0921c17dfbc26ade5d0bec40d19284caed6a7857b376d029f91dd85df2d593dec4ca03991c0948ad36f";
+  sha512.source = "eb794c09901a5c72720537be6c9f0e4e735417035f63be90683ba52bc1326963ab8087807524c260e3cda3b29608a037be6e534eae917545cc2f57478e950869";
   hasRunfiles = true;
   version = "0.1";
 };
 "ecltree" = {
   stripPrefix = 0;
-  sha512.run = "df0abddc568967d46bd5cc81f6b7ae4f82aa1d0bd34def4d94bd73835be781ff1ad992bb5cd654fad6328b3cbbb92ec5748494d76c544e0474a6787438a72f58";
-  sha512.doc = "ca795c0ca266986994678c5304ea32d5e746ebf74b96d6dcf9daced5d748728b28e24100723918f1e396d733a03942390e944dc0b8866654c84169559c4da21e";
+  sha512.run = "d54636eaf81b2131df2d72fe8bfe6232d1c732349865ecba107652a23fcdba4ffca7a6d1f7fd0680fe082596cc3b4f17611100c8b3e311df06a1b503487e62b2";
+  sha512.doc = "7ea18a4468340745c0ddf5959a911b96bb969e4b34799f2718928b8fa9a9b2dc24939c9ae9ac381c46b4a8f5f1e9d3f8b4dde92bc53a33f05ea74f6051d3b066";
   hasRunfiles = true;
   version = "1.1a";
 };
 "eco" = {
   stripPrefix = 0;
-  sha512.run = "d00a54f6bb636e96e5e720438ddfa24569920fcd8d4b5fd74add3fad1f92650d98cbb451d81ad03fdb0133a746bb65749f00ee1c7af826abf9f3dd4e41565b6d";
-  sha512.doc = "25edc7cf0c60cd47dce51ee26bbd07109b4070cbbfd2cf664a81ad8aae952ddfcc79e07e503b6883b605e892a1433b335141aa01c98c7b24e8a0d7b869756a66";
-  sha512.source = "9d8fc365b32c529d26d45c8a9a7cd26cdf7305252019b2326d64d1ec1f401eab9430b2dbcb93e52e379e6317b8cf1dce8a7a08fe4eebb29a499adda628067543";
+  sha512.run = "515309014215e6c6989056b11f3b43e4451cf458a53ddc54e0d2263248b7a84c339ecccee2b6e52e95b822a141f073a388c31b98d31ce456af7a51fa474b4f18";
+  sha512.doc = "f26e6e0788fd346c870c7eba75c0c8acae2496789bd816293b4a952a9ad1eb35dad26a58fd98397fb49f3596fda7343f8e7f4c266065301007a805a3016a600e";
+  sha512.source = "623aa1a5ffddb1fdf5b06103023d8420cb2e2ebb788315ab34931d1f9eb93395344c922573218ee4d21bb8c1ebcd1e5186fd6bc35a20b591455b07ecfbd76fac";
   hasRunfiles = true;
   version = "1.3";
 };
 "ecobiblatex" = {
   stripPrefix = 0;
-  sha512.run = "0edacf00b7da9c57f83afa72b990a43386d42dcfd94e369735152d26fe60f0d0113f77ca5ff1ee4504509e2b1b51404dd78529d0130cd64bc28540cc3c1b81de";
-  sha512.doc = "26542defbb8059e2ef4a603037489d2ad8033cca97fe1e1d00c6868ee26638c689a72589816452b1477e4abec81fb886688a300de4255004f5870b8bc2d1a513";
+  sha512.run = "164200b6da6992ebf541371032c1cf61f8c5076be0ab003e7a225c1f6c1b897701c805808d1c6de15cab82ed010919ddc282c932a4e19af4018cf16f7d04429c";
+  sha512.doc = "20841a19c7df4bb2a89ad0b91f3785d27007ea494ceb7f7d6c4c2bd34740dcb86ecbbdcb91e18a0b1c3442212a5f749905f445466ef8d86b9f2467f78492b1ea";
   hasRunfiles = true;
   version = "1.0";
 };
 "econometrics" = {
   stripPrefix = 0;
-  sha512.run = "04c9261e8f399dc5686c0f6b5da910fc0ae1e2b450ad1e6b9a2222be17044c5b84763ec3e03b9465018aaca99dbfda3163648bb5f0217ed8a591846cdfd1ca1b";
-  sha512.doc = "ee1a1b758bdd0c4ac522da207fad1f8fbf54c9239cfae951bbd75fac283949c2b315530316de6fcef489f6a49b75f3cd5f438a8ec467702fbc73cdfe190fadd3";
+  sha512.run = "6857c9cba42e12a2b4605f0c7b094ca575110111ff1efa46784ec413482496309dccac13865648be3f9e7ced08843ec22b5892ec95655ef291c8a661359571a0";
+  sha512.doc = "b567c985cb1f43d0c994792f67b356f3f33d31ddf3a592a5720b961f6906d0e22952caab1d47742a896ead71961ef8352187441a9dc2b2ecd6b29ed4de36d920";
   hasRunfiles = true;
   version = "1.0";
 };
 "economic" = {
   stripPrefix = 0;
-  sha512.run = "50305291f2d4613c047b74806c9ffca250cb17454ca7672e4e39b5ffa517b95afc9dea42d106a33d674473eccc5563e33cf09e253365771c3dcd38bf673f9647";
-  sha512.doc = "68c9d01f9aac55b4b574d4fc746180c3e3abd5bc6e053506e04b0c3c9801683a10ee047058eb1096d3794a1ce0c72c81bd56884c73774bd9fd99e28fb85c7736";
+  sha512.run = "f89113cfc9071c5a064f2f0f647f4b1735bc584c2fc637c7884707de0843005c4c2c9ca19d538e9b335378d0a2944e2bbb305b17c945212ea9728c5553d10c42";
+  sha512.doc = "03d49f08dd445e41916c254261b2de7f3355736b4b8c30a3f517ebdb270a4764501c4f6c3c6829b7d4941959e0d4936b5b08c514c90b86e62735ef835dffb4b0";
   hasRunfiles = true;
 };
+"ecothesis" = {
+  stripPrefix = 0;
+  sha512.run = "ff38f30f7e26f8889bfdb17b04cac6237ea42f5206a63fec6759021a6d3d31a594fb33e228e3c57e727c8ce521b6602514a929910410691df46ecfa316c6dc15";
+  sha512.doc = "3f6448549ed7ab119a7fb466b91eee7e9869567f0f59ec1c0faf1b3d54c5ce902b14c63eb9955d6c04bb40e98c5921864397039228aa301bb8f7e301afe11a20";
+  version = "1.2";
+};
 "ecv" = {
   stripPrefix = 0;
-  sha512.run = "d6119398a5cb09cc02e7e8185fa69c2412fb6f0c13713a5b75d47f6057abfd61820aa304beed07ce8ba80a2b0acdf0cc3663f72a1dff2053b49d5c0bfcd10674";
-  sha512.doc = "27f5efa832536474b47c28de74148d813c4c7625614fa8a8d5fc102612df98077fb424b3a0fc9e47643d024fee20c7d77e9bdc10fe91e3fe9c388c31f05b87dd";
-  sha512.source = "3ab42940b6d7dcacdb7fe39e36e5968e77d9465aa8e46433178e085d33966edd50e22142a05c6f45540b7faa408ad36c644c457f95b3a1ac84d448eca17bcf05";
+  sha512.run = "6a735b35ca107505b4f3001cec4eaceef97add305c9b4b0500ec831989efe128870f5573e4f731c898c4b6e2ab52db1e841d21b93976494c6e019734d3696636";
+  sha512.doc = "dbb8f0a72268b2c2dbe3a39b30c2168ab7015b6d7938a976ca32c2e745a83bf71c95dad64df660ebcbb71866290ab77a6f5982b460c04da91b82996b40f65866";
+  sha512.source = "b2b2ffda7bcec34442b74d61f6d9715d853223fc49650161cdf8058815934fcbaecbb5781b339c55360192ac9c47a023efd506663820ce1aa14dd0f5572edccf";
   hasRunfiles = true;
   version = "0.3";
 };
 "ed" = {
   stripPrefix = 0;
-  sha512.run = "ea909883eefd519c42fe9f333014bbca130ad005da9fc6ffbde8a70b762c1b338bdecbe5ae5d067c4d72fe00d5bc6842863faaf40d162920bc2e55ce67a867b6";
-  sha512.doc = "aaf9a2c32f8b3c6866c9db73d0e3a519c95bf8ebb83f6d8f9abf9ac96e9b39a29c6b2158cdc256f34caeabe2f6e52887d9e09547dc7998d0e857ded6103fef8a";
-  sha512.source = "f11a1ab337eb670a92d7f1096749c447ee4a512e58fd9bfffd5d131ff1022666f30f7f5ce46194605bd88258567439049f656907f5091cb7c8adaba7fe0f3541";
+  sha512.run = "1f3fec79ae46c23f2cf52ccbf8e5f6521a67156c94c68b54c03d61da2f0628b8ef676fd9571e0785ec1fd08eb2796210d838cddf35742ef4405214f6d7c5f3e0";
+  sha512.doc = "ec02d591ae000ae9b4fa161f9401ca170be33f72985e96ab9025cdb3543d17f921aea6c9ccf061e69769696ef28f5e81d55bcfb85eed27b735c2b186a5f84b59";
+  sha512.source = "1eb9a4eedf186ba0b3130cad23bfd21745d838ce9869886fb2d144fbb41cd89d3272115fc67ba91b9bd74475a407d310eac45be908ffc2345adfd5434be5d3ff";
   hasRunfiles = true;
   version = "1.8";
 };
 "edfnotes" = {
   stripPrefix = 0;
-  sha512.run = "22a3f583eaf533c848394c520cc4c9999a4914bca963063e76eb5e84b587b53d50e2cea8b761338f7dac4dc2d981b8e7dae63755db489d931a1bbaed3f360a34";
-  sha512.doc = "31c66ef45a89b57bbb259718bceb1933f316edb7c09d28d836baa17573d6faa4017e165985c5804e7e6b5cac993511b649f831087be3e58ab73b8dfd07a30d24";
-  sha512.source = "ebdbcecd0f1fb68a3f7745b4c04825927873cda7e6e4ad6b9db5d586a3c5443bb6c4b3fefd126ed993c8621d04ac7aa437b65ea6ad1e3cb7ae5c6cf8f85f67ef";
+  sha512.run = "f08a76ced11ed677e3e5be303d887bc6213f0ac6f3a19a1a4bd5d145aa3517179ab0e95fda21f7e5e2e48fc301cda825e4727d50b1dc069443af9e01e03e9288";
+  sha512.doc = "d8766b87b737470fb65e653e79c3eeca5e846e3afae6c067b62f8372b9c9e7607be0e2c29587747ec727f6eb588740314871f8671b72647bef87a215867743c3";
+  sha512.source = "fa748057e28d6f37d278010dd3e75e475662b20a380dc0b67eeaaf2bee72652b8e9c2a4bff85f4cd9d10d5e98b424ce1493488de35358d44da1a90e9062e616a";
   hasRunfiles = true;
   version = "0.6b";
 };
 "edmac" = {
   stripPrefix = 0;
-  sha512.run = "72a80cdc1854d6937da691f00800a0c0bc7d0d06e985f5b3f0dd683e7f8e49f49ef1e445e8590b92ebcc4deb8c639778e37a382841c3f73180a25362fdcf3e62";
-  sha512.doc = "c9f9d9d50c636fc4c62eee4cdb44073bdfbd488e048231b7c40598b41af9961f2013f7885c2d61fb563a555cfbbe42ffa7722f806b7204dbe75f5145b864d033";
-  sha512.source = "949ba3dfe67a34282e366f61bf4ac7740cf9c934e797990b0e96e10d6e43f0c7cf80ca136a159b2608a395199a13b404381face3f889ff150d327780b8ad871a";
+  sha512.run = "b7c3fe7b30a323d6149563991db847c7767bdb58581db6f93f5d8e0d4cfb289c70e9d2e24a5361e4c2407831d86a25096ea7d0757634ac83960ab1c3f49202c2";
+  sha512.doc = "e1b679a2cb755f8d43fa89c5079144ddc0db928d6e723db0c36a80c03ffbc839b91d682d626e65af3c741bdacfd9266d52e041fb6b8470ad0d52e3f7a349184d";
+  sha512.source = "82951241d58ff2288b5f0a6cb3f4ca9f1334af348c5b21227c1728b10e1785b801136ce54414be39525b46cd6c002fa4037c47cb8d01be5ae7f2c359432fe274";
   hasRunfiles = true;
   version = "3.17";
 };
 "edmargin" = {
   stripPrefix = 0;
-  sha512.run = "390462fb63f84fcc39ed1a1310a271d5df772d1a5bac4638cb552b364fda65899718469cd84717e37b40c00075bdc6e7ff017ae2faf54c59be67838c2860e72b";
-  sha512.doc = "a34784b63e1b17dcb4cf353d918ada54fea7f8f6f7334783d57f3b133f34e1dc74bc2337c55b9b0c8947ee9dca02bcdcf475d03eed5580c7f4697b012564f7ea";
-  sha512.source = "03f2f31ee5ee90e12432f2c000abf119dc2e9eed3222c8568fa65dcc4da2261518846510bd602da95537ff8e1c14d725e23118037e00f2a4750cf2c0a29fc487";
+  sha512.run = "181420648bfd1ea6d96d5727e4b9755d5764e34d1402a2ffac3ce661db512d19b30848e44a3974ff93773bdfe3146ae68a97c010abd98a8635c236a20194b13c";
+  sha512.doc = "0d06d22779d492c2f6873c9c5b4931b68475618f1774da9a82c4edeafd0ccd7357a9214e8f9e536f18efab333537813748166a3b1a2bd85d66522100628bbe0f";
+  sha512.source = "8ecd526c9001e72bdd12bea4119ef25eed8a283abf9e32b83f9209c2ef5d373bab3a99ef91dfb4bd2289547787481a032a70c95829cd1d907f9beb619e8f15ea";
   hasRunfiles = true;
   version = "1.2";
 };
 "ednotes" = {
   stripPrefix = 0;
   deps."ncctools" = tl."ncctools";
-  sha512.run = "c69f1db3932ceba2888df2d44e4e374bb0da34c6f2f64cc946e1bdecfe0d64352de3767ddebcf1091b0a6e7b139250e60aab570de6728414ddb31535ac4b6956";
-  sha512.doc = "8340204e509ff18b66cb498c701365619ed7ebb7ed27c3e4c7d21cb45eef972601828deab2ca164dd2285194509486b6ce8a27e4f90f8759f420a63d36aa0977";
+  sha512.run = "797821d6a4d686c74e4e798de8f78fe65516e9f0b3f0a994d8237d1a830e919e83edbbcc709fcb3563e1039a8ac11adcac715ae44c6879dfd55574adbc396300";
+  sha512.doc = "86f0e299c4d39cba61b4c69174958c3001e076323ae7422bde7d557e7b8d6f99c07276d5568f88a74ea2b777b471a681a2e21cd5f863e0eadd21f15002baee78";
   hasRunfiles = true;
   version = "1.3a";
 };
 "eemeir" = {
   stripPrefix = 0;
-  sha512.run = "81a541ef020a5fa94efc7f9bfdf36723dd51384cd3dac3ee74bcfe03cbf1f9a74e1c240d41e1eb752cd61c3abc4ef727a4d6020457581badea59cb7208ee16b0";
-  sha512.doc = "bf04d1b04fa2a4d4893fcf866e63a4e02ae001bd6454df6293c9b2e529168f39dd006aa7d9dcb1db71b87cf98b8e0ce47e8a207b604c175c179f41fd112c245e";
-  sha512.source = "5081c2a0a83408d124c828f31829cb26cf48ac4f7b1ef86e6e18b81278c79b719bb7442d6d42e2f04c3165bbf38642951dcab93fa1d9d1e271207e9794f307c0";
+  sha512.run = "5f340cd1c0aa44e273d58e3a7327ce66fca6787b654ebbfc5b4dbd8fd52879423e1f79b7fda90b34b5cbb973200776fc0095e75ffab80f6ef916c5ce3738dc48";
+  sha512.doc = "36de239518df2984bc33d2ffcee53a204e8f048f44e4f12dd18fc1354dcebc4c597f62fa62ab4481dbd9d2c82245144711a9d4d74fefda3f5043d477c8a20a9a";
+  sha512.source = "f7d93c5e9048c0454a1b68a6a0e7f6d09eb4b2de98eb0abe5d7f48ed5b632c460b778a7c1b7ad0e0a1d35807c2fbf15f9fd6de9257af350211dd5138b28a7339";
   hasRunfiles = true;
   version = "1.1b";
 };
 "eepic" = {
   stripPrefix = 0;
-  sha512.run = "05ced9f4da4e7b35df461cd4e22130e2629fb6874f436f53a393ec3ee750d4861261f5702e0b3754236c86cd41916ff2d5ce2843a7ccbe49ea105dc282116af5";
-  sha512.doc = "df9ecebf1ecde8166e43f6eb0bb6a50f1e7969553e48521b759767c39cdf749b91eec790a9c87f904fd7994516e25c08b4d953b889aad537f1dd33cf6e91d76a";
+  sha512.run = "e5a6092f6077bb779118caecc87526e4815a53703a99c374b53a8003d4578b874ebdcdd9c002e5757a4425d3439f1413519f17088e7cf050e0cbcd0375e214e3";
+  sha512.doc = "47fc6adca851f7f25cfb769a82efe7a5aa30973d14b2f3dd0523c3f45ef3b00e0bed7867fe73ee3bf76c2e8fa445dc98c53e30c9285fa160537a64122ad57843";
   hasRunfiles = true;
   version = "1.1e";
 };
 "efbox" = {
   stripPrefix = 0;
-  sha512.run = "3d5d1bcd1c4f9a0d1dc4f8b881b9e163cbf86930b449a66a554367692edfa1ddc2fe5910826c6ffb3b9b5370444b63b8f3e3d63ebd434d46cda6a399248941b1";
-  sha512.doc = "9ab0151d9aaf8caebc4b40090e26aa868adeb81b009097c3b05fbd7c158c44a98e9cb7f46aeb39fa68d5c85e0487b6fe63da63b24dd398a8527c06970d9cb7e3";
-  sha512.source = "575a6a26b0b33d5234380950ed4a3a653be9c420e24729005ff15bd497f49fd6dde7e98b45e8e6f04c9ea35200d55bea1467d3c1fb652ecada2f8822991d4f80";
+  sha512.run = "d58d6a149f45075d8b0bcf8722db17efc2816cb3cbebd459a46a797c6429c7a20f3c0253c3ab5234caf314ecd1fef90f2e34119512dafee9ead0a9979f975dde";
+  sha512.doc = "9035f0778a287edfe7cb5ef2e30c6c3997ce31a48c4e1fd59f3bd8316c7a4549ef741c198009c98beb265e733f6c5f79de42186b323b948d91a170795feb685c";
+  sha512.source = "e7964f8d690255df4ca21e5c0896a300e7a28bae50947a21f7ad53cdd58931a9aca20e90e58f30b6c119a7b8015e3d8cc92f57634f0130a30e4c314fb421914a";
   hasRunfiles = true;
   version = "1.0";
 };
 "egameps" = {
   stripPrefix = 0;
-  sha512.run = "0d5f01b9053f46dda99f7850dcaf7c503dcb3cb2eb9d65c612ea4341863b2733139e1151e3ecc667b232f33398aaa54ab0c5d4becc881342428334f1ab8a759b";
-  sha512.doc = "98699198e0daa9df0055b12d1a0ae47c52c9ca00027cc3766e26ebd0c2791a7c2df096dcf17c4c06b499b0157a2bf459d37e7e230ffa492e8fa4c60403b670fd";
+  sha512.run = "205128754e28949c842992a8a14863dbc2d0dea34bb16c59a641d9b8e5339c5ffb3b46c39bb4047470bfdde1fbce73c987bdeadcacb118236ebad64bf68a3992";
+  sha512.doc = "477975b0a6951d4261a208075bd4014a13250fc32179cc2a66738aba6aad9fb497a8b3605a5b8c5f62b5b491bb12702fe05546ebde7312dfe649adbe0072310b";
   hasRunfiles = true;
   version = "1.1";
 };
 "egplot" = {
   stripPrefix = 0;
-  sha512.run = "cc1dbbd686b550ed854fd6b5a263148707b89f4f1dd57e635266eb4c376b7fe921d4a35e02af95d3dabd37919eb8cd8d7c5e016a13167c3c6bc12350a01ec34f";
-  sha512.doc = "144f29edb5f98f8729c48008cb22b50cbae241a5e583e27791202875ea650bc75b8a1085f14abaaf258be7d48aa9322c050fead47c5354be8b6b924bbf22b2ee";
-  sha512.source = "bcfdcb64c5be0b2200953fefdd395d457a278f91bf37dd114b349a4b5ca698fdd21ab67e208639099ba7c9c0dd0430ad054a36f4662e33e3be8c23573d6953a4";
+  sha512.run = "10186e8c2334e7858995643e998b5fb8b5ff0f99463e893b215da9b2b822c3bbcdcec23c1090198dc1e1c1ade49729f3da7c834f987f4838a092489fd3d5c801";
+  sha512.doc = "8a72af7dd0d5d022d9be243974de413c317b36af1e334f2c858dc7b6a1dbddf4c6ce2a001321ef39cfc75bac5ac37bd043aaf87e9bc3e6e11f546d59b6aaf91a";
+  sha512.source = "d569aae99941d6fdc11df10d41f36fb72142248554acf7b923b260a9daeabbc1b9e13efb74e6dda1141ed2e4a7ce07aed311dbd9f0b93052de537e4ca4d4017c";
   hasRunfiles = true;
   version = "1.02a";
 };
 "eiad" = {
   stripPrefix = 0;
-  sha512.run = "ae0c41289d09e9a8453b648768e3d97eab4b8e43c5ab1a2369e4c44ab821318b395d33d0b07178ab2f1dfb6c111d8c3b008e91d8cc5e5d6f3a69dc945ab60887";
-  sha512.doc = "14a3e53db097310a49e6d9930835f7e4f54567b0c7e75e97cb74453ea594cf96a2aa4846b7029238f6533ec73e73422bcc5f862a169eca7c78e489a271ed4c5e";
+  sha512.run = "6007d8e3a6d4970ed57360a47cd01264b9c427efbe96a324e89c936779e13faff7f3e978afa125576f8653a80c06fe777c42998a6ad5e09f398ad394fbdc650b";
+  sha512.doc = "b9af768a3106b9e6be5e9afc68ce1b5ac113ea0d790a53013ed47adfd056fb10e89ef25fca935760ad24590cd2cbcd4b2b4ae7853650c8d1726d99df3f9af9de";
   hasRunfiles = true;
 };
 "eiad-ltx" = {
   stripPrefix = 0;
-  sha512.run = "03669421db4eebbc4b3d2f95de5b363349cdca991f8cfe2b2e8057c9670e13cc9ba67babaedee3668d6a8dfa70358e00d9947dfc03dd359cd8921dc75e301fc0";
-  sha512.doc = "3935f7bc52075731544882ece7365082abc88c7065d48b0cefc48eb13a8e024eedcb7ca5c0fdea3439d9f3f7af7325baaaba22b3f5332900b29da435fd880700";
-  sha512.source = "a0d5cd507b2002d369c8292615f8f41d213484d4b1d6160c12a59e0e1ade2a5b03e937aa421b2f84348a543c74ab114baad65a30db5128d0fd9ea401465288bd";
+  sha512.run = "9d6e2c3790e2812b8865ebf9a1011b43fad20410b8cc176baca397a81f7dce48e9c286e64f6d99f391717dbe2a75252c7ee993be45bc3bb9c08b405c29cdd01e";
+  sha512.doc = "21baf2a00e8ea5029d04a1ce2e35efe4f57180c18ffaec1d5c335894769e5419849aa6487dbf9c2c1eb33cf2bcbca6221577f1c34e2a82dd438b383bf93bcb3c";
+  sha512.source = "e07fca4c1602307235a87258205ddb1d026d70d68396f9f4b342de457bc5136899b40bf6cd7dab887640a20c2cfbcd5ae5662c58840d78fa356acbd6144b4c0a";
   hasRunfiles = true;
   version = "1.0";
 };
 "eijkhout" = {
   stripPrefix = 0;
-  sha512.run = "ecc9bcb8cf00cb5cf8e299fc39e8b9b322f69423126ddd0152f1247efda83607c98c732e16fb48fc8b335913ad0cbb4788f3930410c2d66bd052a20392810eb8";
+  sha512.run = "8c23d5c997321569240833e95c46c6c8cde2630a8ced730566d2d3cdb983efa98850b6e40305058cd1b264ada9ec631c715651899c564d3d495b9aa58b0d94b6";
   hasRunfiles = true;
 };
 "einfuehrung" = {
   stripPrefix = 0;
-  sha512.run = "436807aec42c3a4a16771ebf07bf4c0521b08e0b9f3feb82c1aa9c31e1228517aeacf49fd29c839ed824def78cd6e7d2949a3682e731847ef5e97f543e265bf8";
-  sha512.doc = "891177f04d76f9a72b3a7dff329231a71ded153d0f6e45182f35f30798e54f8bdbafe4259dae36420f8d0108f34fcd5d59c0dadfcf64b7be648af1487a8518c7";
+  sha512.run = "fabd484a6b579c08f195b4be6594e43f99e1a2f2d1611697a285e8ae5b6028a45723b93fbed60044457ef1050d7fb5b91d2c0be03c9d93a2be04ca4535b3bfe3";
+  sha512.doc = "e617ede54cc003a4b9f61c14c2dd092a0f266e00a5c885f3f91f2909d3cc98bd98110886504ac7ae0a0db45111c2d4e91509aecccf4dd93c4f0b43c1e920baf6";
 };
 "einfuehrung2" = {
   stripPrefix = 0;
-  sha512.run = "a7e0c95395a2f021853eeeb459a1fe34974df796c77c59f7b37eff35b72694d49a9240e84a0ddcc109178e2db62f7a842c21574d13cca2d1f5f97b667a3d9052";
-  sha512.doc = "1376171bafe517519d7cdf336582a5e90e32be294a315bd9d7e833bf5449e46de165b50c68ed2a4494706c659a49d28c2d45fd2a99b6e6354876adc51c05277e";
+  sha512.run = "0c0d36bc2c7ec2601dccce929c0a95ff4fc7145e1e7d7d8f5eb728fb59ccb297145b1af4037331859cd0d80a57c78d5d9eea87a8004d32a2368908bcd194e503";
+  sha512.doc = "44ca3c727ea487061934f861941737a139270466781b236a953dab8e8b43f154169ea5892779f3fd8fc377d29d96943bd2f119b38838c3eebdb02ac474826da1";
 };
 "ejpecp" = {
   stripPrefix = 0;
-  sha512.run = "dc91dd91987d14a11030ec5b44afe2e577b65f9e00010d8c32b87ec46cacbfe755f4883b3639c682715a065f38b34dc94d810d4b0a5fc7fc2b2901d1330ade78";
-  sha512.doc = "4e761c532cfb85ad193b718cf8c9b0d0bb4bbd2583a2f62c8e9976803cda3982c7aeaf7fc4d3041329481858af81f7a83347a8d5e1be952e03d3c250f6668e18";
-  sha512.source = "40813ba1cfc5e156f73a6a10ce75f2b16d8c03397838f6b3bfd8e9aae6980d393a71d833dc9ca8fb9d352ad27402ed3a0e714eaeb95cc98a7ab7d7e5292f0fea";
+  sha512.run = "3ee9bf015d9ac2b192eee5d004781e1100d52ba992aeb17e13689008aaad2e77ea61ac56cebfbac42152d8e4684591d401a2ee7c3029055b0b89317741bbc20a";
+  sha512.doc = "ddd544bb7320a80316ed7ea132c30ae6d0e6fdfa920aabb424762a9df7672ecf4c2c584068917927de463680f8e2657a76c0e5664ea0c3817290d7f1dffb00e6";
+  sha512.source = "e98ec063e58441130aa457d70649939ce39c15e079eb1629f42670a5735b292de0ffa34abbd845352deeaba89b7fc13f4c8a59243cb29c5f5e6069d112d26457";
   hasRunfiles = true;
   version = "1.5";
 };
 "ekaia" = {
   stripPrefix = 0;
-  sha512.run = "604099616a49e75be54bdd425d644487c5347546c7a2adc46e171b79d86efcdb6ea401969ed3b2ff2cbe3599dd5e50ec155e3207b2f52cbe2d20072174a49770";
-  sha512.doc = "17cf12a4252b0667dc0434b1b6949d1702d180d944f45d3c3c9ec78b3d28774822f6383e51d1d6489674e678a84f80c789c9215baea254d0d0221b58f5ab3a99";
-  sha512.source = "d1158620e05b78b04e834f6f6850cd115ee4248478553f8df3fd898ecb22225b243af94d7cd48c3e3700004a776753d73cfba5d04240cc058f658e3f71eed1f6";
+  sha512.run = "ecbb1873575d29b16d4771c3bcd313aae69bed2b01788d7d5d8aea8294202a9fff56420788df33f6dcf28521ad0943a87dba94e1070f551decf812929aa78292";
+  sha512.doc = "a144bf80fe2c12f0d8bdc16c16421b2105692c19578b6bfc77e1e4109fd0e08d0afeb19b9a7066b0e203b33cd6bf729c7e29ff4b0312ada146d6f8e267f91c46";
+  sha512.source = "cdb26287fad3833670d2ba54f188a7de5ae913ffdcee58402177b2e18952b2f183cc850528cf6b1ae491729a1033301c05b940c9aa4aa1e07fd298a86bdfd734";
   hasRunfiles = true;
   version = "1.04";
 };
 "elbioimp" = {
   stripPrefix = 0;
-  sha512.run = "cbc2c84df27d6a337b7dd970229daadcadc735bac26d157aca9839176893d3c88d1a851a971b51fceffba9d1dcd795f23892bf1d9b42698e2183a638147bfaac";
-  sha512.doc = "6c7c4b9a1dfd8d5adb4d1b681e7714393f816b2a3c635840007ffaf299f06b4a428ad7e56f15a870173be233b53d6bbad6aebbe6a5380ab2124f7464e440c29b";
-  sha512.source = "013ef7c1b96b8e4405fa86fe9fe74f5aab9a9bc683bb5ff034bdb1dbb41d40f63601a2ee8202ddd0e30ca90ef55fa167ccfc8107ab1cc2d981f3afd22e15bb13";
+  sha512.run = "6ebf09f01e32d39e285c51bb0e8b04077075d4e522d1c1b3f173fa67926ad8b5003e2e604f58c1e1ef6171ed23c0f3987e99601cd777df53fdb5c97569ef5ff5";
+  sha512.doc = "ff9f01c92e3156e3cdd2f384f4989d86202aa7e8018c5acea5b2cbfe38aae835b9e2c2f036aa0839fe74dd88441e0685629b3c790f2c189ce3d55314c071daba";
+  sha512.source = "8ffa21f034924b540352a7dbfc13f620cfa3093a1a9ab95635e42186ff72ca4630c57e8a581dee3136269508bebff1a44b5b2fe34cffc68b9a87133030b28d35";
   hasRunfiles = true;
   version = "1.2";
 };
 "electrum" = {
   stripPrefix = 0;
-  sha512.run = "17e9d3374b2f8a3c4f22219b29c70b08927c565e603e24fd6522481762fb3f88b051735ff016dbd76050430d7daa7d734021e840d619ff4aa8d24e75a8c9c427";
-  sha512.doc = "7a1811a7a0fe7b9d2e572dd4b0dc94ed2d89e6b374cde97eadebe1dda95458eb5470aea75342bd457969170d36d3933cd984a402e2bb43a4708461918f0dac7d";
-  sha512.source = "3e2ab3b6b3d631db17d43af1b5540bee4f29faf76459acab966c0fa5032827171743ac977709f7b62c8f39b95afcf39bd2a25f3ef7e63a85a0bc41adc0dd4f52";
+  sha512.run = "51e9a66812cceaebd2c3d69a94dcf3187ced4164defc0d77b6d9252522d6408b92f4b0ee32efa15611b107fa9bdb97ccb736a947842dd8782dc28eb009e6142f";
+  sha512.doc = "f743cda23ecb70993726246bcd3b8aea1bcce91f2dfd1efa273a3c5f70d9c42b3abadb41897e6af379d1836a726223fd772a0146f39333aefc5df951d47086bd";
+  sha512.source = "f796b4c53ca00bca59af73a6da63248f88ae3f8dfd06a9d9aaaa614c74423770efc483f0616ac73bc61a9036dff0f308501fd929ec038dccc4f096c1898d4c6f";
   hasRunfiles = true;
   version = "1.005-b";
 };
 "eledform" = {
   stripPrefix = 0;
-  sha512.run = "e6d05aaf868f538aac0aafe73f76718f858327afcca51f306f7b3fc9c1c06024a16fa803f9e33034a4629781999ef71d4035ae9e4988827a20490db438e96246";
-  sha512.doc = "9eeea6bac6d5219adfd816fba6e39b17e0e4217ab404e400f7b0baf8a462c166eb14d499b2fb7bfeb3aaf422271e101d920f3a1bec34b5bc64b691d41292e6c8";
-  sha512.source = "4bcb41817cdda25d03e42d6a485def2f509391e98831863ffdf5c8a0b3eb8c6b1cfa53fb95417b37831dbfce70ffa0e444d0b36f32e58d47e6078faaeb2606fb";
+  sha512.run = "2025cb9307b28e472a4a91f8a061d4cb209a8a4f859ab6d91dab68c0a039d4dc757cfbb4b5402788f6824d5075da98ad96f7f3ea85e11b6f861738ebdc0dfc5f";
+  sha512.doc = "0b467c65d18bf12b1fe2b1eec229aae04020236c098dcb51963243b3325f46d6000c3c00234f6cf726df426bc2fd8b349c5d239b14af2ed8815cd5ce9ddd10c3";
+  sha512.source = "53cc273f1943ea8e4238d5342b9b696b203bd228eff4dc72ba539646b89baa20184bac0009d6104ecf9a6952d0c1e1a060a4a80ed4b17a0877d0871b6fb5cc61";
   hasRunfiles = true;
   version = "1.1a";
 };
 "eledmac" = {
   stripPrefix = 0;
-  sha512.run = "cffc56db64137229f3b1009cfda247637bd65395eb311c5ceb6f42fb2928ce1faa825b6a4604b49c7bb460740690154dc1ebecf34130210d7676ce1cc6ba4b9c";
-  sha512.doc = "df92235a00627505bb9cd9286bcb35b1267d75ba29fa4c9c544c782192fe83cfea20400b196f776deac2db7b1f587a2405632f9b93b91988489b0a8862022912";
-  sha512.source = "5334d45b7d7ad5bb1ed4e802e0902f7474a2ffa2316e05687ed7cf3b2e8b594ce00843b333327271311545352eaa9486ea0f97dba52dc38d22e1d28b289cecc6";
+  sha512.run = "b48842a73130d6e0126d1909d9b31c68dafb4d83c53a852c1833f6fc28af445c0b9b073fd92ab2fdd7fc9aaedf46027eb523657aa03473f87565e040f0fa14e6";
+  sha512.doc = "bf47b75d3721a7e15888329968904e88c8d3dcd58a3d4c7851161491f59884e2d2db4c495a624287fb85708fe627e106df16b845831b3cd3856157c23672d0c3";
+  sha512.source = "125c734378cedfe95d1671945e3025aee97aca10e14ddae6328ab99ce579f7133af70d97cb7337cf4e068333eb528a24ec3a6013586c6c3aa33a032a068d373e";
   hasRunfiles = true;
   version = "1.24.12";
 };
 "elements" = {
   stripPrefix = 0;
-  sha512.run = "2c8fc287245e3391e0a0fc107a9a532ac0046b293b67c9f66288b663256cae888f73eab1c614670564e5159514355cd78fa6e8fca1458e526e76f18067aa28b8";
-  sha512.doc = "db8a6ef1d9ae67b2ab1793826bd278c2b97394f025591348de22a1d04ae2c72c66d59b4de0d3f2c7e112b69d272652a3eea58a82585dfd2855c52324306788c9";
+  sha512.run = "b926fe3ba4e78a6edd6a99a35edef4c90516541dc3d32d5857df3e90784780d7c34f25d80fbe9f98feb1a0f29583dd41eb1c093253529334f1fef0ae2ac889e8";
+  sha512.doc = "73f613bfe8dc49f6904ebad6165c0677bb2f2855be257b9b82c68a9c159e07e328b4066dda75033bb4a70b698f1a50f0b165382dcfa7404febf6742965fceb73";
   hasRunfiles = true;
   version = "0.2c";
 };
 "ellipse" = {
   stripPrefix = 0;
-  sha512.run = "bc0bdc976c197377bc3e99ba8e630502b16112bffd749c6220e63dc6dedcfa1da553c6c71fe7949d944c60e1dbcbefca5d746959ad6d3105ade7580bf1e7a677";
-  sha512.doc = "6a1d7e6f1fbfd449db417c30080cd9970881b7061ae810c0ceca1385d367339264e3f7e980ddf866d88b257119334bc93671a588694e3a7935d57fddc5c73389";
-  sha512.source = "4b8676a30b6405cad6db449827a780e34aabf2c7de02cc9f700ae798d3313be0d6c2a587cf16f21a43b36b08378cbd2033c1ac16ad0ced71875c538d4799b6d1";
+  sha512.run = "75cfe216b2afb889ef873ba24f324a0ba5d633a2d0bf4c3f26d4282b16b98f0e2ed2d72c7fd4ed528e0f8e8411f5a826d5785b364459a34ba9c959f5aceb58b1";
+  sha512.doc = "e91ab66f4a71bf41e2343fc4f8ccddddeb13d0750a14466054d8280c951026f8fa06bfae3f1e8b1a807b757a61c87a5d8c5bbc89f1cd0ea2533354dbf01487c7";
+  sha512.source = "89466b2e3b44700341f96d52c9810c213baa79a543abc8804f5ecbd5d5e9f76cdf032378cd76d9b8545655b45f91bf15cfa7ca5720b00fe113bb1173bc488553";
   hasRunfiles = true;
   version = "1.0";
 };
 "ellipsis" = {
   stripPrefix = 0;
-  sha512.run = "fa42fe1576b93bbd1611ef99947ea650b5f333eed420f9fc03b171c9729d20384523aca01ca8e5b9f9ccb50a8b7aae76c45c6f203605b8dc0278dde88fcfadac";
-  sha512.doc = "e8ee6a1a7b3fd9859e21c1f07f071ac5118993856e511b76ce737c585a9f9105a857e997c48dc5f676921501111922845ce4e965ac0fb81fdb90d7166df8253b";
-  sha512.source = "17fb42e33bab8c3e09edf6cb22120eba3a46dcc0306ce6477f9a68630d7b4582e21c7d8c36c3606c9ececb534e4346a748a9528039a6ee67f2c633a1ef1fb497";
+  sha512.run = "93d2ea4ce7551f6ff0388e067661d299bf8f0a1fe335b5e694a3556760db6a63ea0f418fe5a42c450acf7d53fa60fa80a9d3bb85a6c29074ab6f14c9d4e5bfbb";
+  sha512.doc = "e13ab159b28cbb6e9cbb489c829065c8bcc8e820f4ebab7c9f292d8985a4cdc16a07cd1f85f15c28df84268474e1dde03a9c111f4cfcd67871970eaee8995068";
+  sha512.source = "469c84ef48ad635cfdc0b6e7a1ab5cb0d9eb23ebb94532ae6cc5ff9e4795e77909edaead343ff96a3baf15202c5ad8e63846315836fde0fde11d1ca1e1e7cf81";
   hasRunfiles = true;
 };
 "elmath" = {
   stripPrefix = 0;
-  sha512.run = "62385f1bc534aee9a8e4ecfa207ebe75c80217270ff1ce8b28d70e0e268a6166076b96cafcee5b49d8a9a6c8a55be9f7fccf1d85e27bf63da99678796cfd23cb";
-  sha512.doc = "686b164e6677bd3d515c2efacf9edc70ed14a6b0e321ad5d0b1ead3814826bc5bf67ed9a263fe4e6f801c79c5139db07dbbca2dac72201bd810dbd100f9707f9";
-  sha512.source = "9629696941e9ec176f6007d843890f9ccb3b3e083405d53f383a5b69440bbc5f07134995406e6552aac1289d228a38cb3e20945d6e12f99bac32dc58dbaf723d";
+  sha512.run = "8542e08c3c50d7516885010c902322057ac52f7e8642afd11518abd20c676d25d3af9d73d26dfddeb8a1ba5d03a350a82224d52a0148f4ac10634c2dc9e8879b";
+  sha512.doc = "94b7c53bcd2ec53105832b6ad4e91e44b2a0639e1b3716c13292919cd58c10fb4252021039f4fc772551163806ff6a1edc19816cc7be8c7825181af1e88e6f40";
+  sha512.source = "d7a08b9d9b282ddbce129c7e0f4569c998836e0214deda2a72479f95a20d2e0b0beafb9d00bf7b807f5d97bdb4f3a7a1b4bbdd11caca334338caa51e3a658b5f";
   hasRunfiles = true;
   version = "1.2";
 };
 "elocalloc" = {
   stripPrefix = 0;
-  sha512.run = "d0c8fa80339b78e776773d02bd426e49ea5ec00d2a237fda08fc71f1b455ea429911a857c266257da8ab4e963f1c02e8f9a5d86d4f2f00fb2fa63cbc41c5fdcd";
-  sha512.doc = "8e8929ce6fb9caf6df2b6fdaa41aa92b228c61990b135b015c5d344a9839d81aea2d511e39cb5acf415109eaa9bac18d472f8f6e50b3a4d0b28b0739b66464b2";
-  sha512.source = "4b2fc2b35284c17d3d30e0e49fb5cc1e5e1d01abc4b45a131085ccac956c83c29a0988e1945ec80664e05430ced494b6753ce9d65e66bc1ed1912cebcf801be9";
+  sha512.run = "b61c0edc92bd64d6738a963f11b42ca61ccc167c9c4b93f6fc1f055395736a9e9043b413c9d9f9d1d5e4555d1c18ba7d66ddcbef67d508c337bcaa3b3d148bb0";
+  sha512.doc = "3648d15d3602c954708921ffba3b9e5c3928677bb1e4c5cd3957cacf5c059d6e7a36bec7f77a80a9d8b5b5bad44f4059e0d9ea23284338c633b155808d266063";
+  sha512.source = "c6df39d63f693d1cb44c7a014611e94f02a9c3bf0f11f20306910c02c01717af6833d71b386524087565b9de238b2e90d1e9444758c5e2925146126bab826235";
   hasRunfiles = true;
   version = "0.03";
 };
 "elpres" = {
   stripPrefix = 0;
-  sha512.run = "7327729550c582d22125d845ce9136a0352a18c6c896883f91d9795d62dfdfdffcb43289232dfcb450c72cbed4c21b6f1cb43a00dd6525eee4fbce79982a4672";
-  sha512.doc = "19de6437a5034626c8012ef8c34a99d3a5402f2c47cddd3f686a8b44fdadf707bfebe9542b87788a50d32e29a90df9c7e8a9f75fa6fe2340e634b38079284d81";
+  sha512.run = "d54fa2bb5395bd9d1178026929f2a0e216c3f6a7c11a472ff383eb89c9aa0a7e208b8e2a62d457571b412c6e390779ba5eedb11b8facdd885880b9ea9edb94d2";
+  sha512.doc = "5b6d736cfdd0222a303f903d5c7719d952936966e03df58c8ab10d99b33aa42ad7e02d35ac5ccdaf2c534a86457267e65e6a8403f43fc62b611a9742fff5c8c2";
   hasRunfiles = true;
   version = "0.4a";
 };
 "elsarticle" = {
   stripPrefix = 0;
-  sha512.run = "7f055b5565da2b18d5b5009a980924f4a671209214a20fde8e47b0b3f006bfa80ca4233ddd70842064f8e23eab09c1c2da4daaf0b386cd16672ac33a9e0aa9f4";
-  sha512.doc = "4c8419a55042ea6f7458dc02ebddb2ef39cb67325508801c2aaa5a5b151bd94f2951c5e3ef4a4fb3809b76786e8a0b06aec981a7d1b195486fd2281ec894ee2c";
-  sha512.source = "13de3c6adc011bec73e0beb925df84aa2bb0408a06643fc433025b4d132001fa2a8f3d363d361a125e6a0967ce6bc112072c27db891bac2e2052395f94c50bac";
+  sha512.run = "1e56e83842e4cdf91313f29e80bad87c5d6b65e77a8f50f192842874724853be699d1a5586cb7d70d0135e82d310f32b322a9eab77834d058c226ec3b0f1e55a";
+  sha512.doc = "64240b6c66303dc9c6d9e64d6c646763cd22051d11203a95bed5b061238bef7940e53f248f7ce693c5439067bca4a29c80e03d9ab87a4a21185d1c28002b4d43";
+  sha512.source = "84c2813d8d44acf166f926db084d139f35a2fb57c28d82976dc34cce3c5252b55dcd550f960455f6054edb1981a2a8b276e9d173ca36d854f9b43d9444d49ee9";
   hasRunfiles = true;
-  version = "1.20";
+  version = "3.0";
 };
 "elteikthesis" = {
   stripPrefix = 0;
-  sha512.run = "1fd8200be4bfe24330693fb1dbff6b01f24b5ed533dd13b467aadf245373888f2781165adbcd26c026a76a2a988239a12eec9959dacfd9e0e6fde979249f4537";
-  sha512.doc = "fde10fde051b6ca8caf4baab95d2540865fbeba6cb8274bac3632e60048033103c38e90d0be2a1cbf68ae37808deda6e4b4cdf2495717b120d29f17ee4c10aa5";
-  sha512.source = "12726156c91ed538229de8d27cc0d0a1efedcfb7ea7b6b439a42c072dd14d68d763ee4a28bf832da4f783564e70b22f586aec3262fb0b826394bf86e834270ff";
+  sha512.run = "e87015bc846f7e2b7c6b14a5befe84756a9438cd8989f6e32ae616a8ce583d5bef897a081c5dba642bc99681c5d6a11d93b2175a981ebfba1a25674d9dbd76b4";
+  sha512.doc = "698179aa0d4312e7af8a2f5a965659088fc3fa20baa5929ffd94228545d45cba8ef1e3dd0c9a70cc85378ed2cdb19ff525441cd7562d5eaaf4cf6cebb04a5884";
+  sha512.source = "e17a7a5e9f2928167151d34d834348af45da48fddb40890d4ef5bf0f42dcbbba7def6af5c895ed9fafb300ce32d48e0730870fb8832844b2f2d1dd2120088f70";
   hasRunfiles = true;
   version = "1.2";
 };
 "eltex" = {
   stripPrefix = 0;
-  sha512.run = "fb9aebbecfb612d731a114218570b1fa48be84d60718710655345a574814e0f7d6a87f90d5d124db925af64b4e02851f927c1f97734843955970e6b4fc464a35";
-  sha512.doc = "1ea074b9e703f2f970b7ab86170e7bd25d0da417f27b5c66e30d2242a205d8f83da930fbe9891b1f64394040a53cf76c65d11a19c8fb527281a7a0fa3f59e693";
+  sha512.run = "73aa10d6cf9c75d676103335accd0c6f88c46cff43b3a882d4df7aa037e5eb62c5e628d0299bacc1f9e8287a4ebc711129387ab2cf2680a2301a7b998b4c2708";
+  sha512.doc = "3db5f27b31389dbbd4a624248bc754bfc592d24bb71b9209f8116f3571b7fe347b481d918c9d5846614d7bc4b98b6b6953b4d5d896d3f39510079cf72a5f3368";
   hasRunfiles = true;
   version = "2.0";
 };
 "elvish" = {
   stripPrefix = 0;
-  sha512.run = "fd8f7d25961103b96f2473f5f485d46487c3c0dadf072820579bdcaf5aa09b68da04aba597e61cc5977dd522407d9af523ce317c566796340b86e42269b320bd";
-  sha512.doc = "40aa39a6f83c4609d46e098b8eaa853c4087ab2da49150f5e0c08b035fe1d290cc53ffab6b71843735b6a45d68e3f8596c55e9c865e190584f9ea75ec33922b6";
+  sha512.run = "d5861913aed4d151c0ff830b997c27f17f9f46a50a9bd6959c9557d633e80acd4ed50454af3e4f2fbb39a1345510f9a471b43f7dc9c061391d09b53a6015c8d7";
+  sha512.doc = "91165c2c931c389f905557af01fddb91a36ce3d1a70c748682551639d9159b9c007dd35141bca5df3ab642fcfd968b2c17e06526b2ad15909afe86fb5672b45b";
   hasRunfiles = true;
 };
 "elzcards" = {
   stripPrefix = 0;
-  sha512.run = "77a2ca1088d405c2454f160b3caabff9962da4fe91a927d7350e4c55ec71593319fd6721afa845febfd6b979139ecb30e61fc169359580a0541f0658c83317d9";
-  sha512.doc = "389139bf2aa6debb63108a9e40bb1215c1f1833c131ae9754e06a6344329fcf10538f8e2d90cc138afa9db81635bc14df0e1b88d8ad46634c8702d689d25395e";
-  sha512.source = "584c928dbeb0e1ef38fbc7e6167b12ec8ca2154b0839e476e4f9ac5e4a697cd422e76e6a35e6124f1bdbe205caa24a5a5d547717a5f1469d439b0343478604d0";
+  sha512.run = "65ff5fd441ca23860d911d8b510f1ec0560160175174faf033f5d83bde5fb2daa35d0ac16479338a9b7e6f3bf49d53c3e36ffcf42152425301f09720ec8753b8";
+  sha512.doc = "532694eae9fd9afb6f86da5f5b5c1453b3778d0ac7772730cb33f5677a64032f77b0f90a00e92f97def23beaccd4882e160c8d3cf26b2f5ad6a643307e8519ac";
+  sha512.source = "bebc0cbf50a64cb2dd61dc71c840a0fdb089ada927a45400f41b9807a32c2331c19c6c171611267a7985fb6c14e51a067cbe5d8e39ce43d27b6c3092a22f8444";
   hasRunfiles = true;
   version = "1.23";
 };
 "emarks" = {
   stripPrefix = 0;
-  sha512.run = "2ed8b75673c2be22263154f39a969fe80fa1d4bef6d7fff8f1101be77b228626719e32e64094535b719d4c370a842d1468b84b83622b4b8ba77e6f350729a76d";
-  sha512.doc = "3d6388dc52146ac79764f4f6a0b9c5e9fa025b1c8c81154287de5913186e750d6fbd839f3a582410fc7e3c16e2c6e94be5a8ac8cccdd0c6e41cdca95b26e6bd1";
-  sha512.source = "cd045da819d7e55e2046d799ba2ef92867a2490e49884c2cc270ba8f59f95cfcf094843a551e7b53901acccba41d655869ee747b90531643f23450c188a23bfa";
+  sha512.run = "40303e01c970b384af755dcf4ff5d72f2451ec8f4d01d644fe11db4c838ed718044970e46aaa95cc7bc1c6e9ed8ab8b6ddf5824d973c646b3e0598ef04c83897";
+  sha512.doc = "8bcfc7d58b91cd269ad9f607ece1f734dd9d229b0e093a07c835e1afac3227ff84be01ac4b99baf53d6d066b38ced4e8c5863b8789c4c853a824a2871da23a61";
+  sha512.source = "85e4482bc5d08255cb931396b79c7223a67ecb6f6bc22fe33cc7955fcf9b62dd6a138456e4b34cdd3f475ee7a0a11b321f3dbe4a000ecb354cc3c4fc51fd2de8";
   hasRunfiles = true;
   version = "1.0";
 };
 "embedall" = {
   stripPrefix = 0;
-  sha512.run = "f83552e454b03dca2d984ed538d8f4c33eeb06dac43894a235340d7fcadbba2732d49cc9f43ca38e9a3dcf542aec358b296bf08a2e8cdcacb5ba64296829dbaa";
-  sha512.doc = "e43d849282a45b9ba7e8cc7552ba37d4e51ad9881108e87814d9e37e72d1938a287e99925c96b934310f4eea0418cd911cfeb17f136fe5ce4ab3d5c046f5594b";
-  sha512.source = "58daa9065de7f4b57249b0c73c1cd0937196ddd0b094af2d1e5ff6daa2b7a04c083083f1a13f4683cafdc3fbcb7f97987384f574aebc88625907f994ff3a45f7";
+  sha512.run = "9d84d0249bf5bf196d91128ffbd0ab274b6edd02f04d31133bd546e98244e41c763edcc82f7997c2fd1ea630e2f1f81b2bd849c0339ff6b89257cc17bd9ad04b";
+  sha512.doc = "38945cf33e3aa07a286c325d7be63ea85bea7213e4601dd81071f8e7fb4e2160e913506d54f897c9da741ce2371a3a7fabd3b247441a492c36b850ad9cefff08";
+  sha512.source = "f9dc77e3bd97e73f8c56006829f255af1f3423cf9b149ec962e60b824e624a29e648fd9a46e316b4da8b04e07c8958cab370537d32ae6f0216700a68cdfe9924";
   hasRunfiles = true;
   version = "1.0";
 };
 "embrac" = {
   stripPrefix = 0;
-  sha512.run = "e37d29d061f83f25b5fb5541ca59f8d9e0d0e544eca1f77fb90690be435f3af6f72fdf407810651dfcf9b71476595c7b9aed49b6210f6819efeb3e9bdbe9bc64";
-  sha512.doc = "c5bfd53278c76adc927392c9ec1358d7d0617c9910cecd330b9237003672ba910cf205d12ce6188bd4d849234190df3ff143000bd59f515324e4efe7d13d2867";
+  sha512.run = "dee1affa977831255d152cdd883c924db6251b6957d64eac41b3204cc37545da05564cbb983a5f941d7c9b9d0bcc206841d68a3fb0dfcb600674dd47172c1d37";
+  sha512.doc = "c0957d153b5f7a89c406c3423d14653c82793347117cd8a7dba1cab3e97b8068b5743f328f750bb73cf8ecd547f077b00c51e26efafcf34163e20c7032f3e619";
   hasRunfiles = true;
   version = "0.7";
 };
 "emf" = {
   stripPrefix = 0;
-  sha512.run = "e362d06a85ed0affa54e854c65a326f508fc93d036c6be82f601f7d8390f3f2b3c1be2c4f77a8b1c9a3d17cd480b1e8915a0519ab5627c3e7d3f6dba05f78787";
-  sha512.doc = "193e310ee66ec4cae39290514e3ab40d3f28bbba02ceaa9041af972e516130b1bfd4f7d98f08938b09172260bd2e7a3af16a896de3a42872f490e8be1f41672a";
+  sha512.run = "221fba9ecbfd08f31179d5b05e42e944a12c1d5c4577fd76acab5bccf44129f1b8a10ff94220717ce311b9d641c0244ae89ff6548f4d179a4dee083bbe250717";
+  sha512.doc = "d8d3934d1634b616651c3495718e8767ab1feebdeea6631b9c66705959e98005d11d89fdb7a08b883c9c290227658d6c135e6a562e4e87d7e0ca07ec8fc4a3c1";
   hasRunfiles = true;
   version = "1";
 };
 "emisa" = {
   stripPrefix = 0;
-  sha512.run = "8c777bd02757071068d516195dc7e2a72fe27b0497d46c45bf570cadcaf8f0a862f87f2a70b56624e8ea3b47f6eacdca234c4802e6da2a6ae6f82b8622dbf013";
-  sha512.doc = "e639bfcf9423bf591823680ec26c4b4ff234e9d9d812d10b425ce342d72ea946b09f4612d0fcd1f59fc3a9790892621652abc1b5af99fe24397c0168e906dae5";
-  sha512.source = "c623df64ad7e990829dcc0d9a2b59b770faac3bbd2b27208154e13a3d982503a7421f90d030322e1a9d73d735c314d1c86a75114cd23adb61349ed4921caf93b";
+  sha512.run = "4879998a189c2c0cd7c556e13205d60dc57cc213efbec433d499663952dc68bf6445f55616c874a7075fc6f3a49c3e702b15f5d438226692b58925286ae74da1";
+  sha512.doc = "b971256d4254d793efe309f0cdcb13ccb4fa1836c0f7a5b124fdda1dc58568b739e0039b1359867bc269e64f899e19b1634b674f367b6404fb17a3ec04a13a02";
+  sha512.source = "652dd3f45223b899c23555a3a3276ab999cfbe2e71af94c3a6027d75a2f24631977d0c3e4a73e9443c659b724089479e2a3bc8b89a34222d5513eaa054707795";
   hasRunfiles = true;
   version = "2.2.0";
 };
 "emp" = {
   stripPrefix = 0;
-  sha512.run = "d0d4d7f8cdd47876bb658518304a475ea71e9e93fb29fff2bf0980e4cce4300dcd68726627dafd5857cdf773cf49b0df14ad703f91fd933a4fce3d2c8bd29c9f";
-  sha512.doc = "77d087ed5a1ecad18536d1691aaaf3b959c4a12862d55d620b739967d6215c0868df7f72d97ddcb2c62791f235410e5e2af4bbf0a32db71b93af00e463073cb3";
-  sha512.source = "2b0fa11207c9cc6335c8e85882261fe8d2142965162f67482cb78dfaafc5be25210bea54e5df8a9b99c2fa58b8519a75b159c99660ac00f2fb0f90e3a5813494";
+  sha512.run = "85a0506dbf9373ea3f5a0549a185bc3bd9668e8eeafc1829e8a79e8e95ffc64e357873f2b1f0a78713634e20d3be8cb28d3d10bf4519306456d54cca16c70805";
+  sha512.doc = "4980c12792a907ded64efa84cb27f528f66ef12cba0bf382e8441935ee97840d49fc80a2a84e7b9e198e1f8c6b1842dc2d3562db8736e812e54ef69694891670";
+  sha512.source = "a9eb0e2ee9a630ac54af943a0023a280bd24365fa0c44302487af83984b3c98daa0bc32aae74d5d5b46bf0c0ed014b81cc67602832485a5732229f490e26490c";
   hasRunfiles = true;
 };
 "emptypage" = {
   stripPrefix = 0;
-  sha512.run = "3eef570694c661a6eb5f06f11cd429a841e1794d8af933d042d2f23469447d2e209905c08fe5edb28ef19b050b66c1459b01017d6e85b173c12a6f50641e7ac3";
-  sha512.doc = "c90e15163b302ecb4eb00a99a1222444fad002421b0ee5348844b50d8928549fb8e23e1249c597381e74e5135ee8c847dab024e47a8a3459cb87adab9a1bb004";
-  sha512.source = "f794f2a8b7cf9f77ab8a8e716ec0609888d91c53094205213413ecc1677a2d72cc3b66e47440fc6f5defcc30b37c5491a3eade30b7ba9ef0ab03cea498f60521";
+  sha512.run = "b5faa4cfc44930dd817eac8569b52aa64b3ccaa6233e9e6e36fdafa3addc7380cc32689d6cf87508d129e97104e40dd79ea11a0ef554fa7277332a95af0a9014";
+  sha512.doc = "7dd45366b98fe35fa485180b1351dc459397a8cf0264fc03651dabf7c11ccbf41730ddff1943b4e6b9f18cd2672311e55b131cfc1c8b95f4b2a9d2888d18e09f";
+  sha512.source = "66cf2692cd1745e6d4367196fdd1f0f2f28e0b7deecbbdd726be55e5bfe4703b6c3e0c532e8403d3cbda46f7c8ebf9ead0a37621dd9a269fc7337ce9be72b637";
   hasRunfiles = true;
   version = "1.2";
 };
 "emulateapj" = {
   stripPrefix = 0;
-  sha512.run = "1530dd170333561c09c9a5234d97a00f0f84a32810de69d8e3e61b2cb4677f4425bffeef9773cb54cac8f5ad3cd944eac3537f2ff084b810bc640742c7898f9b";
-  sha512.doc = "f558c6cd51c66050a458df6adda1034ef0e8315e8be15a78ab18818930874333a9ebc5002c334e6576ffb6f15ed4ef848c8241c8339010a6487c39d5be217624";
+  sha512.run = "3d31ad11f250d92131792808563f9e00043e17f979aca5600913c07517096b4f23701490dc2d42cb0371e932212f8d385f486a4915cdcddb683a4d84d7237e00";
+  sha512.doc = "66f10ae7adca59519a8ea101487dcd99b47e85d38cc8c6d435ae7cd9011d24a875634e21ee3bc85b9d0cb142d2950c8be8b4d0ea437d5d2f66e8de3a500517fc";
   hasRunfiles = true;
 };
 "enctex" = {
   stripPrefix = 0;
-  sha512.run = "8926b0df22bbba91e027e31cde3f95674c5037d186fef5ef960a3a75a514125bbab56a816824dd0c892fe3e70a10cbb88193e53dcf57412e5703a0d9c3459bce";
-  sha512.doc = "6c493ff6ff3d0e4bb2a9bdf7097426a3e54c61bb925ef4b2d16b30c66724eaa99df9f236632f316c98bb50a6db48db28c2eda1dac531cda8b204421de98878ba";
+  sha512.run = "ad7b5cb9ca57e4db7322eeae184f9cb0a63da9577552bba97917941b5b6516db832bb4661cd96fd7f5b10b8ff0c3575e7d6cdb1f8442bcf022be33f734f55dd9";
+  sha512.doc = "726ad5443f5813a4cdea85ae73e7bd5763230e25c3f0ef5c5caafe8c817811848212369d099451b20db4611cd2a6b496cf8c54d911a511e6a484e844739b795b";
   hasRunfiles = true;
 };
 "encxvlna" = {
   stripPrefix = 0;
-  sha512.run = "d5d694f059c66dc727459b8d5db29f193a41dbb2e07d438e52c65e931a656e28565210b8e3e8fe38298cb7d92b3bd8efb721dc8346fe971c8ba04e045b9e173d";
-  sha512.doc = "b743e8c11ee1dc425cfa7bc1f66b4f2249465047644873aa2eda6b64ca021d0f9a138b09177e99b627fa0f77687466c36ca12712f7cfb84ca293adf2c1b58e4b";
+  sha512.run = "c4b6a3371733b1ee2cba037eb29650ed1dfc7b66f8f7c1947ae80d26b04a1e8384c4b92f1912e53d254c4ef1f0ddc14f9e53284a9a398f0c796b7e5431d4d386";
+  sha512.doc = "5c10175b6e1ef5811c0ca7f143fe0769e8c62a6f05eef1fed2cb6fbc05fae0bdf7ba28f230fbe6005592e7389bad188c6c5b669ada0d673f6da1b72ebe1c4f97";
   hasRunfiles = true;
   version = "1.1";
 };
 "endfloat" = {
   stripPrefix = 0;
-  sha512.run = "e1e68684f2b775dbf4f75522c91d9aa7388a66738e097ec8f118065b41272ebf43f3f5c83461cc7b859cbd9448e6a7e91657633c27b49744ee843267095a865c";
-  sha512.doc = "38b0271cad4641a14e0d14d7b009f322bb205c19f9cf6d3ca1105abf609b0df8d3e1b9c58e9cb2558ee0b56339dfea80117307de46f959969e14841736d07654";
-  sha512.source = "fcb0d3c752088a664ca100da92e5d9ef9ec06ecebdfb01ef8b0d23d12bf4ba37f7122d22bf868592583f2b02419601dcc6a9b3e18a0e8a3c0774e1da5768a491";
+  sha512.run = "11dd20d143a6c7697b1bcadc2930da3dbbba244ae66522f82a79aa48df2920fd405143bbe2f0e5b6870fbc1d4f81d9db57af0d6fd96dffc0dac76df33575c857";
+  sha512.doc = "46be4dab7f971b25bfbc15b8670c5b54690d5c5355498c8a059b9dafa6c29ae808dca939e6760838d82c94d6fd2a1a4668c7d69494b0b42249c6e25ff54fe49d";
+  sha512.source = "680d9f787dfecea506abc18b5ad7d2a7d96c90c597ddee567ab9eed3523e69bedf5f24f9651678e44266e455417fc7440c7de2940d0ce9b5933c5c1a4245a290";
   hasRunfiles = true;
-  version = "2.5d";
+  version = "2.6";
 };
 "endheads" = {
   stripPrefix = 0;
-  sha512.run = "d1480028192d437ffd4e6864ae750ba0308c5909761df15e3360162af960202ea6d330065a5c72f914b8542f2aa6bb0bfa4d14d1b71d80e582d8db69c6e68a70";
-  sha512.doc = "f36105951f15c0aa25506c633375a97c9ea0dd1240c4ac2cf4439259a4fdf35f046aa646990ffe92fe4e9508f621120d3c9c6997ee35d81bee8b3518968be33d";
-  sha512.source = "a691bbd6d05808355dfe4b44b13d82449528bf7e6a9e30ed6e1e5ed1c90cbc1e159f6a8c988a72a75492068b53d162d5daf24f7ab77a04fd4db9718919a3cb38";
+  sha512.run = "89afa8d3238e25f22744711325a59b05fec155865bbb03eda1f8e4d413cc0c3839a8a7d30c80df9a651f0df2becd92269b7f2d127fbc173675a204edb8dd1f17";
+  sha512.doc = "2016b165ab8e98b7c6dd09a077647b79347106142e293385b3a1fb9be32461abe931ce6d5263b245429d007767b1efdeddbce2b666750961ce352e321c2fe012";
+  sha512.source = "31da3f88222cd5c46583a8f0ccaa459368470d83e3586e5e7bc801af2ac17fb2f02dc59dd93e6904e182e0d83f290ac4b0c098c02ab6e3254aece62ed4223b82";
   hasRunfiles = true;
   version = "1.6";
 };
 "endiagram" = {
   stripPrefix = 0;
-  sha512.run = "a131fec69c86d8957319fa6f7736f7b1706d72ce3ace754fa688e41f6f686a0de7a20e1f67ed2d8664a7bbecc97446f81fd3dce4810affc2dc87a3f4e480a5a6";
-  sha512.doc = "60395f8001c1e49e0422712b281bcba8751e5a437119d9e8ad31698bcb9758943c17e34a0eda61fc7bdfb8c6d9d251b75605166daba3565f4e057b9e4bf931a1";
+  sha512.run = "b827f99d416465af28086098abc1041f6ce9ca3f099015c8c2cfcc472a84de484809832eaed6c11c054305b410446035ca68ed8582ed5529762c1a2a7c7ff263";
+  sha512.doc = "88e5669b25338f7ba12c0595cd72dc4192b064bda58d475ebc69fba0c7099681e190c1cc5001b01a55d2271943bc78996fbd9e788d70e5de9309d46fc5d17b24";
   hasRunfiles = true;
   version = "0.1d";
 };
 "endnotes" = {
   stripPrefix = 0;
-  sha512.run = "eb39fa443aa7f90e14f1149d5500cd58fe30539a72522233d4633e32e7b9c6bf7a7b35ddec1adb0a37fee621daaf789cfb8e94ca1b2d9b3cba59c47ea8333b6b";
-  sha512.doc = "43190f13ad0e1a61edff25c749c1bd219e2db24a7361dcfc4cd1def5a3e75f13a2c5af11ab377f3bfb2ce229886da7ee0fa9b8e4782a6d1ceeb1ccbb61ffa333";
+  sha512.run = "a7cae9bde505bd14be9d51e4a5fa8276408a9f31d0603e74f8d7e3f8b529b3398f953f0fb7cfbbb7b1fe1e6f3379898da1cec6ee39d7e0fb01b9fc5e2f1086c3";
+  sha512.doc = "7b9b3843c40112605c35025d262ea07a28f2d2a9f1c3f6904b99539f03cc56df8b3d1d2a00cef965121feff90d9b19b0ab2bf2f6327079830be595739b7a351a";
   hasRunfiles = true;
 };
+"endnotesj" = {
+  stripPrefix = 0;
+  sha512.run = "95c029534a6c5f5238dc03d1e5ebee92f58bab4bb086d870258e18fd035432bbad1099c31b64ea0bb995c543dfe2de293cb933b90325761f58f9217f4a8a6acd";
+  sha512.doc = "88f344ae3ba366222b30d0d2e2999807e9abbacad8a412cf63c727288f3117e25b24128278bb507679514f1808ac1386af892fb97a025ea61c563a93cabb9d45";
+  hasRunfiles = true;
+  version = "3.0";
+};
 "endofproofwd" = {
   stripPrefix = 0;
-  sha512.run = "b45eb5b0bc3cb33aa3358647a913fdda4162feeb00aaa025a3ab7c08de6fa525bef494c13b8feb39753f0681b31ea4a6412ed8eaae9904660c8ce74f0bdabab5";
-  sha512.doc = "5510e645e85d8a42b4adc74fa0809fadaaadb38844213ecf25f03dca3fd5a8764212c484b2d4580ed35b6877c3658cd9eabff4d95012e0eddc0d887c9d430449";
+  sha512.run = "9f476756673f42480cc243f35c91ab1836eabef9dc58184fe44cc086ba40b5b93e80d7b1f24f75395c8190ca761a84c57bb4e7a4c55c6fadfc16aad31c90def6";
+  sha512.doc = "238c1b5933c3c1bba365601e19dea81fd5a23e48210e8f48059660d3c65c38a0fa3da728684857138233981f21dc60f3457d55e9e41edc70b194da25eb438cd9";
   hasRunfiles = true;
 };
 "engpron" = {
   stripPrefix = 0;
-  sha512.run = "ceeafac986acb2cdf0086cadac398d8e259a65d50b65e58ec085aa309ea68f75b3c78da3997beceb8a2f44b46105b774ed5c3b9286115deac20ff44fc486e213";
-  sha512.doc = "1e98e5f9cdff5ced55371ca802078117ffcc332bfeebc3570bbec06a6b811285589aae79b055d5346ba1daf10de8a0f3f67f839c9dbf9b6d8b4abd93439ac6a7";
-  sha512.source = "f87b1ee98ef2d7be72d6a51d644260e6a3612815ae5e50e79fb1e10019ab352d2c73ca821944e3540b65de71f9d96c5eac99640718759123aa7b2dcae90b8f66";
+  sha512.run = "8bafb892342fdfc6e4d8534dbce52772bf6a821dff9991a67a65e7f5d859ce57227e06bf1401f86d944c5662187cad1acc3ee8f7fb0a2b369499bc95d7dd3b6a";
+  sha512.doc = "d9e06e6d5f9d52bb59ecd8aa01a985d6c396fb406aeab5393250e7c39e9a3ee468533cae840570b1d5e97167c3d786db131c423c80e09d578d10e6ce439c2720";
+  sha512.source = "11cb8883e1a58070aa39e7650a48087e95cd9836af6b95170755ac42e896ae3ad38f58fb55dfe7ea83803757113edd44c1dcfccb9b753e722699d2905a8c7c71";
   hasRunfiles = true;
   version = "2";
 };
 "engrec" = {
   stripPrefix = 0;
-  sha512.run = "f525589be18efef29b3ee8e1d2f8974aae80f861d4e95fe419d7cb78793b75e6ada6130660a70610859bf6b3a2ef7b5960692068b0f38d38fa51da4f7fcfde72";
-  sha512.doc = "5190eeb228228d1ca3dd2945aecc5392a180d702782b69bdc4e0a32dacc5665bcecf032bcf5099939ba0b0423ac06bdcf1fbdeba1da2368cff216e6065449345";
-  sha512.source = "9b709014023e2245fd2bb2ceebd2a8a80d246448841790cf57c789919eda73c5081640e64f2dc6cf4ec816bf8121a3a36c7439341ba51a1fdb4fea275193b993";
+  sha512.run = "7cc372bb9ed44acaba2fd1ffda68f513726186896c32d5ac66f12d9cc1b6c2e4852e0e01af3d12476582a58530280c308091f04f21e42fab315dd8497bef213f";
+  sha512.doc = "fda2b8075f8fbb4c6530434d66bd427d356ad3fcad80d655071a1b878b50f12f2f86d0894e26e2473f918fa73a74be06648734de0aa9006cfa7bcdb90dd84d7b";
+  sha512.source = "379b8b25d5fa6cee1f18d3e0446360f7c92f80b5a281c394629b2ef2d6543ea3fa77503e7d8d8e208402771ad7f0059baecac3df48a724d1a5980d19093997cc";
   hasRunfiles = true;
   version = "1.1";
 };
 "engtlc" = {
   stripPrefix = 0;
-  sha512.run = "a007f4219522c321f7aff1cd478ca7c9bed94c0655b24c7c89e3a77d6ef52db686c6fb7f3b21217e61de78bdf6630116a92b1888d7306506e6a1d27e44c4b900";
-  sha512.doc = "c7952647b7b5df8f3b72b2bd47ea1b10938e7543411c0dae2accfc77af91a41c5040f9f700884f8a50c1a429d20e9456dcc093e85bf302d02956be029355d31d";
+  sha512.run = "b838ab57db5bc63dfcb7350db7d50ac5a6bc9ebd55610a840859538e52ec75b75f12799fa42693e123fdbf1c48b103dcdb9fefbab5def6af970e18599b337094";
+  sha512.doc = "0f2f81e46963de20e3f45edd28d295495bf0137ccfdfbb4f5645eb9853981015338ccee249726d217deba9d7df9c68d7e5fb71988f72227c6d34b18c508c6abd";
   hasRunfiles = true;
   version = "3.2";
 };
 "enigma" = {
   stripPrefix = 0;
-  sha512.run = "206a4bed1686d2ae684d6952296345c7ee5030352cd8c64b507b97378a021b92f7a4003780991751f65bc76ca6b596e05e53cd761ded376a1064b7c1dd5eb87f";
-  sha512.doc = "cced459430ed103f4c7e3d83fd5278d6d050cc1ba2644f6074f85c1ce16cf8bfd18e197fd697310243ec20d2dd3911cdf91bb93afa072b7af754b5a5f7dd540d";
+  sha512.run = "5777966b33c524be97ab68d96307d20a1337128be3191f89de171903f629b91d3584204433665af367a90db3a2df8af23f418efd7810d5478476016ab7950815";
+  sha512.doc = "a0dd09dd0d59ad965d75d7c1f71bfd14f9fcb8c5447e8cd38ae21f813aabf153bb05d80525187d6d0f4e6af9747e3bf5c94d85005976210b9efe1f38253eaeac";
   hasRunfiles = true;
   version = "0.1";
 };
 "enotez" = {
   stripPrefix = 0;
-  sha512.run = "7048c9dc321ec6f126ba17479d686fb8b6cfb32f1f27fc33e438e94f82814d639b2e704bb7fae2f56145b5cc1fbe21755935eed9eca53dd181fadff813d58418";
-  sha512.doc = "52b07a9f35a8a457b3c27fce8824fb10eecad9f1b24fdee4773e0f54af240f41c0e79b88b86a85cba7659c00123c86846a0c8ab2f728f79d0cc0cda3a16a7ed5";
+  sha512.run = "aef007f46c45049f07475e0e5c467fdfe4f72afff233521f483d0e62c0ade11656ec52ce616ed374fcb34286d4f69ca8aec5811bbcc2d2a44ad6fa0ab8a3a096";
+  sha512.doc = "3a24e1001d2c4c2c3bfc5fed073b5a5b336c69a83c99e63c1ecf8bb042a9295b42a5464b015b2b7935962753be5a95724eee9c661e6115970eac1e5c4d17d030";
   hasRunfiles = true;
   version = "0.9a";
 };
 "enumitem" = {
   stripPrefix = 0;
-  sha512.run = "b0a428361b4dc4865dc1703a155b955ff16089149980e967f558d27238c89f19c61af96002c039b0fccd97e675f1ebb3247a140ad3fa8f21d4b736ef87bc4d2b";
-  sha512.doc = "72d7c6a58be78ccadaac6dc77485d3b191c1eb23959899d9b9cbe252d58c77ef7e540c59c435f4db1ddce1baefb2147fa673c602f5e7d5284e4c428aa5dc7a5a";
+  sha512.run = "1b922630679e04781d663affef10c1b1a8136a87969ad7a6e75a7ee8ab849a641f9c2a46ceeca01956b26822260593ae1670f02d6daa6719054b50e880ce0f7d";
+  sha512.doc = "66c41711d46252d0417c07cf2aad0f99c0b4a9b4f82292367692a1f3f366d75bc8aa244976fa58981276ea84989f0b1a25c2ef4d5775efeec48814e42ea1286a";
   hasRunfiles = true;
   version = "3.5.2";
 };
 "enumitem-zref" = {
   stripPrefix = 0;
-  sha512.run = "013b04a530f8cb82dc4e984e9f6efb36fca6976da245ff9a9d458d01b5e197e3013b48ec8e9787a1203726bbef850474a0a54d044664e97569c6639ce36d0326";
-  sha512.doc = "e7da2933ef201628d01b85d52bb9b9da2db8a652c95dd26061fc7983dbb0f9e92ebf1247fdcc402cac9cdc2520b6fb045eb1182bba1884c5ae2b8c51faeb2321";
-  sha512.source = "f2309f895e321b682e76f293f09098e23efd9f0a5f274b644922c5bb666f3e422af0750aebc33a728a97e9df6207e82efa078a4b92efb3ab2d7266f6eba3a351";
+  sha512.run = "b1160993c23a95b7c2a2a79e57cea992b83da56268e2dc2fd80d0841b99bb4036383b0811076498173b7e8982aec393978d7c0434f2d3349d4555754152ed5ed";
+  sha512.doc = "3e7d061479f649125628394408b3d859e7fd50110616e00169ea131fcefcacb325b37d9a23fd8b4c7eb7da258a3609c0384a3e3cb96a6308ae8b2bc5e4116e29";
+  sha512.source = "6e8fdc7591514ba2bc8381e7f712c36c6d2d6d9decc74882b9b4028bc6eddb8b75a932d907d41cd4623ce0848b8b89f263f106905048d8fa35522c67c8a7794d";
   hasRunfiles = true;
   version = "1.8";
 };
 "envbig" = {
   stripPrefix = 0;
-  sha512.run = "c6c57c01f63c003304eaa11e10d958b6c0af77b122cb9f688207f5db96170a8efe80771dd044004b2ae07a3a877dbbd44f13a9b9f579d4d40155ae6d494a6194";
-  sha512.doc = "e2602ea9b3f09ee1d7d036d1b2f21d93d3ea773fc20cd3ae71df1c774a8b7b487a7af22b86e0e552f98b9dc6903c5bc13c21239eff46c9d2496e45c5f323f9f9";
+  sha512.run = "bd004f62551ed8ad29cb833fc958f56156f0ab1a4134ee557b2fd9f64ef61a04da2d39eae3bdbd2b42ff232447b28ad84455d2f37e028d5e645467dbe5d520aa";
+  sha512.doc = "547712391157c7368d98892cfdda5ab82b1ffde08d1064e27ced3f6f9fdaf23d4dd0ea703bcddd1611a8367a45b8fc1f9a84156aa4b533fdf45d65037cdc3360";
   hasRunfiles = true;
 };
 "environ" = {
   stripPrefix = 0;
-  sha512.run = "acb2bd85f23df6565d2ae7a887403aaa8d4b18c275ab35589f34443b006f3c4e34410fc81c2075780b5e8d141f53b0ca962defad0b1136f0673270bf41c285f3";
-  sha512.doc = "899aab823206a88192da09d96aa8fbc18a70fe91fa25962dd7a6ab952a7c3cff1163b9acfc4ddce3bf891cac737d98f3ae83bb38209dbdec6bde7dcacde2310b";
-  sha512.source = "0de3de7e68e128836d0694111a2dbfa660a4a00ef66a242dc2423452f809c7abec83cd90d525377c5064631ca3a85497c8409527ce2f65ed81cc3ced0e00d005";
+  sha512.run = "fde1efcb82a9419bd7aeb065c39c3e1c89527301011e64286d58ad2ec9530c4157ac606f913a7b72c2f79a12aa131b1e2d0f8c987d0754e6618ab2f51e1cded4";
+  sha512.doc = "0f7f84134d703abd4589e7b4c982618560e652598fbd278ac5a2ffc9740a44b1d46ce4f128a5d042721f9699e418c6fc690ca292e0b0179a8b4f296bb42cd5a1";
+  sha512.source = "d1b1e1273582db5116111b726ecc6134a768e4027e2ea00ba311a4c0d21b03e67c76cbc3e75b256bdad38e7110e29f1155b0a584988f14cea237f5169dcccb56";
   hasRunfiles = true;
   version = "0.3";
 };
 "envlab" = {
   stripPrefix = 0;
-  sha512.run = "a5ca1ea1213257488655530fc2b7b28ffd08ac15f3476f295178a3307078737aee75231a12cd7f452c3a3fbeb8985d1402e83d00c91639c0ebef2f5bbd9eccc9";
-  sha512.doc = "f73644b6f038f3f8d46fa5af0aa8548457d19c9e62e86d47b6fc137c7eee62373786dae6843f3bdc599fb2a96cf266b715e97dbb1d4cde72a7f9d5ec8600a2a2";
-  sha512.source = "392e6a971016966181aa358f8d88653bb8e66aad7e3b1de594a51f7d890ef3d8e2c97c043eb1fe2b19f9d70491f3675a035803d18f0ff81d3635b9cefafd95ec";
+  sha512.run = "a0355170a81d013bf139c8db9bbdcd2210842b9823aa00d13739515e381dc87d3963748fda8a7e5ae4688b1349b96e3112d3e4176e6b4b9862725f384ab2b73d";
+  sha512.doc = "a23e9f54eff536859a3c1e73d5df2daa9b8fdb0622140d9cc6a1e8b719babf61e23ed9c3a1b6f6b0fb66bacd8d4e30e96e25f878b2c72412755a24b920a51ad2";
+  sha512.source = "50a42367bfe3de01f4f680154f0f81a895cff5742f088c77b79151879fadf3e4e57cf92b9a2d0a209dd6e0e55b36f8ce1b1d2d9cf71921df87d52d60e814a519";
   hasRunfiles = true;
   version = "1.2";
 };
 "epigrafica" = {
   stripPrefix = 0;
-  sha512.run = "7258541aef1d7fadba6b9f93b5074c227bce8be3911fdbe8d12b334f02e4b5dbdbf71b59bf2b51c20f00cbfb3bfb6a83d6584a049b8a2e80daa1ea0afe8ca6e3";
-  sha512.doc = "82ebc25014593678c4a97e44808d259bd59e548c3668932e1d8b5f4bbcccd70a8b43c625be15f5245c0c8be89f34a80a0577a2199554e88424805b85b671dfa8";
+  sha512.run = "38deb54c6e10db2be46d0bd8e960f067f759a18ee03aa298ddc21fc1207d082ae87f29b784bce99b2d4d47d9edf6c244f98f33eb54596dc36ad5fe388d78e21e";
+  sha512.doc = "bcdd4d9cddf2894f39c89bb78910a4839dba918baa04238e1a0c3f7cb824ff58875c0ebdddc2769ac483f4697699bed638062173d1d6062cac6bacb2d6a83e5b";
   hasRunfiles = true;
   version = "1.01";
 };
 "epigram" = {
   stripPrefix = 0;
-  sha512.run = "7d8a7381148c7d2a7debdd2dab2b5caa0af309df8d7cbcdeebc1b996fe997dd19f3804a104881f1b77b484d02cf14c41e10dfe726adc2fa0bc1adfd8b8f8eb8b";
+  sha512.run = "07399b0109f88c91a42002529a35c94f43b3d44a161cff988633d6b1a4bc8f60bc30f2a7b13e38eeec045dc7ad4d39b1cb872b3b1b9790e43978c2f08d05a29e";
   hasRunfiles = true;
 };
 "epigraph" = {
   stripPrefix = 0;
-  sha512.run = "511e64e2ab7344a9673b7feae318d8e0332712a620bc50fc15d7a8a773a0c4b1f7f298521cb88ebde2b62eaa2e28698017b51f80b5dc1f4f5aca9fa58c06e342";
-  sha512.doc = "ce4b2be76bdb490d96b733fa088702c1fecf7e9fb272b31e7473be6e657de5e566edc3e537557940cb8c40e59996ff6e15b2b1fc84d697fa1a327de14401d0da";
-  sha512.source = "bf77e0c42d674f54c4689e844baf1c5280023de1e267a8cf32998008c7830e9d535c70748cd2ba67ea27625407a1f227f8a261cc0d000e439cd83ebb53cd8f12";
+  sha512.run = "eca90f0e04b861c0b4fad52ca63aaef42035804a5d6c825dec0530f8475b720dd07b62d78617efdb1ca41db019ae481227a9a860fb1bac743a2df7277d8d4101";
+  sha512.doc = "509d632cb50fd408b0c5b7d3540e22623aa66a8a1936c2fe2dc60252ca2ee3867676b22eca3039ac50899582846c535f0df0ac9959c5be4e34135176366edbdc";
+  sha512.source = "0f0c9cabff3ca5664d1ed6318af17b42a932256452b467d70f191b832a3f12c962cce4a57e43c8bfb9025a2b83994e3c6007c2652690427096348f566b388c03";
   hasRunfiles = true;
   version = "1.5c";
 };
 "epiolmec" = {
   stripPrefix = 0;
-  sha512.run = "d2fda9a894be384ece57a9125d8e5b5288ca09ac4acde50fb37b7bf28fffcffd0e8c14ef4b52971816daef3f4a6f2b57d968d1e9fb928d3b8aab9d6f82abee14";
-  sha512.doc = "4fdd3d31e6fb5fa702590bc4c70c58944ac4caa0d3496ef615c9f12e738fbfd06e415a71285f5f9069cff7b2680d45f6d0c122c03bab2bde1e430d67fcb8e249";
-  sha512.source = "131a046a6eab6de3233b0d2c07ee72f1d45034398fe379509b5d6d6fa564818c735735fe1abbfdd51bcb7f260c85a5b7274fd8cebb40eb5d612e10d134a36b07";
+  sha512.run = "fd2721b671df77931512af2b10f01fac367f659cc1c069c5682f2d82dd6dc637481b49e838c911ae52717c03aff560fb632f97548a53051fab97c2d08ba61e10";
+  sha512.doc = "c1912940efbf6453a8e6168930545fb42d3586825811894e3f220e363c01cc12e18e762036f26ba6f54616ac50a0e6caaf1904b5740f5af40f6e31344b124fc3";
+  sha512.source = "ebe0063d46e5b56decc4fbd37f82532e73f00666ae9cba46198e0bc25700b4303768e7561ab24e39fd6727eb3a154dc8e3e5aac8db4527b248d0c1bd9d479290";
   hasRunfiles = true;
 };
 "eplain" = {
@@ -10789,1359 +11061,1389 @@ tl: { # no indentation
   deps."knuth-lib" = tl."knuth-lib";
   deps."latex-fonts" = tl."latex-fonts";
   deps."plain" = tl."plain";
-  sha512.run = "f92521b456ae7e09cfaebda6cc4f5096234eb2e3b4de0f6a693c39c3fbd92865edf71164f3238b3a92afd52e97fbc3d7fe7d6693b19c44dd0bea2999f8aa850c";
-  sha512.doc = "4ca1643714d1767af1d4f87d1fe0393ed8b9e724bdadc3169a4f78a53cbd2e5d27645d58d090b05966ec122b4816fff33f6166de9f127389ffe8af8173623f39";
-  sha512.source = "10c474339d55a6775ddb52897c862be1d3750249181ff5edd62aa0f9135e82cf41a10348a1ea1630e5754f8bef3f891b8c0de49daf6655820b2490aaa832a8e7";
+  sha512.run = "b0234ec56573a6759f8f0c58b21e925e67d5bb3c5e4ffea3053ed211a1dc924096608b23ed8cedeb7d472095425fbfb76743f71aab09bbf2095ca4066b5ef8d5";
+  sha512.doc = "08cbceb7ae891a4284ddee5faea3ad8d0463b4404eca170511fdea80c4e93fc3c5a12b67a6117eae298ab1a10c6a052a34d51f71c6e90c90165f26db1944fe00";
+  sha512.source = "1e87a1e464c728219b83e28eb77f084f98f9620a5377c964f0b08cacd344afe47564a0d1666b12b4e0a86a50034f4186d2f0ea313d9e800252c790590d497729";
   hasRunfiles = true;
   version = "3.8";
 };
 "epsdice" = {
   stripPrefix = 0;
-  sha512.run = "ef830871b856dd8479c58d130244fa677600a6828c1d8ad6737aa5d2f920a61d32a109f7e21f146b54e4d47c5c5e5a2d8bc5d3bfc8ce2655ddfae39de80953fa";
-  sha512.doc = "cd38ab58364d86bd352894bab82e2dc1399663dda8606e2ca7740338b53a5fcc9324cb622ca2f1ea62bb59548f781cf3c468a9696d1aa311f701847e022acda8";
-  sha512.source = "50b7d718adf85390feec47f88ced140363c9015e8e0d3ed186ce04c9bbe108ba4d67fe1ff3d50bc9271cc26544a8849bac1c8372cc82ef97e27d8d25460d59ed";
+  sha512.run = "b0782a5548f456bde627ec2ac04a7cea45124da43d88da5a9ded85207e70331769437a559266ca38b641ad13ae67295644d7d4a1100544ca209481a993fc18e8";
+  sha512.doc = "7ef7df16ef2fbda2fddc2a2ec22f3ae44b5eda4ccc45c94272f53835d466c052c87aa484086294ceff8973ee698f4b06efb96e6fd086948f2ffa041e4abb0e04";
+  sha512.source = "cde2a3708dcc061dea42945bfc7c62f566236a7150748bd844564d79518af42e61edcfad6cc42368a36694e9db353724dd2d5f7ca027c1fa9fb123b58c9161ec";
   hasRunfiles = true;
   version = "2.1";
 };
 "epsf" = {
   stripPrefix = 0;
-  sha512.run = "63783dbd6afba3c0657908022303b0cadf9431d756a1080a9d84b768951e3a42e0ffa1dd34b6076c76e2616c951d5a22c8c1536ed7562d89f18b3c930c12dbd8";
-  sha512.doc = "1b44b97290a86a9784cd13572e67330d6ca9ad4a62312ad182c2c81065e2fac676ca61eafafc3c68fc0845ce4573fba333141ae385b828d41f68287a3ed422f5";
+  sha512.run = "227043a531734382b48eb2b1250fd0ed2f0f836195a95f4d962db218a06016a940227f8e9bd8a44ab0e356aecc51df526a2f03b912f6c33f69157074cb16f74c";
+  sha512.doc = "a8fdb109e3efdf4fedf7d0243a8f1fd067584c0c1025a466dc845b0c8ed5973c6fc54d876329a7fa5bd464611557b825e0c3fcd2691890c03d58ee5e020014e3";
   hasRunfiles = true;
   version = "2.7.4";
 };
 "epsf-dvipdfmx" = {
   stripPrefix = 0;
-  sha512.run = "8103159cfd60032a77adf9735f889be940e63149eba00392c6ff3fb3de9f6da518dbf9fe079cc0765b02e47ace2b83893ae68a2a51a3119eb20939557c876a60";
-  sha512.doc = "c5f76abc3ec6502d5ba956444e03d15d9db3456959e674f8e1cafec576af1eb0d66acd1ad0fb49639664651d0129959e768bb4ae5fc15a7794a255c54ba51c53";
+  sha512.run = "16dc2da08c57eb05495b2a4c749babc16075c7bf2ac63208c0bf80feae52acbd0924ea41138659070a0211ec7a420c12872844af4d2320fa2a5f3f769273aa90";
+  sha512.doc = "dd094950ac6006c7708faa1cbb65a47aa56a54aff27b01f62f5ba3d1ecc9f450b615cabb853c4692b8693f79c1b7032ea8f09cbdbc8b654cd42988b45cba9f88";
   hasRunfiles = true;
   version = "2014";
 };
 "epsincl" = {
   stripPrefix = 0;
-  sha512.run = "cb49f01b5bed1d7180478c5e97a925a925573ac82deba5826ac3e707a5b012899e8a58d28d57580a6de18a1b9a637a40d6e00025831297a2f57e7771b0701949";
-  sha512.doc = "61523ecc10adc7000e51d6f695c7d6dfca9aa0f08cfeace0d278ecf0fabef8fa623882cf459d1741c6c309588b205282df46a917bbea8577f69a008597a138f8";
+  sha512.run = "c48d53d39281d082cfe56ff64ea33f42dc05c0d8943e669450635bfa3ba36ed91eeaae636d209149bd05fc08dde07462f15eefbafa57dfd0b8b1ac72152560b2";
+  sha512.doc = "8029eac2871973028d6e790263bb3e9247a19deafbbcdac1061544f293d326b6a483dfa2ceead46a6d3e89da1e793dd51de7f6e496912cfefbb3988f6c1663df";
   hasRunfiles = true;
   version = "0.2";
 };
 "epslatex-fr" = {
   stripPrefix = 0;
-  sha512.run = "86f3ee591430f3bb3e651d333a05cc84fa1c3608981b62942ae3e8798e3b19ad049a16eff52e20eafdeeccd8047cc2b80f0af450bf475c547c78bc55cb67a02e";
-  sha512.doc = "491535860a19bcac621af7320a9b3fb9528ae742c1464acf21906b54bd5b725d640aae39b694a7d9b071a3eba572c55061a1893493e0bfb156f2aa0356866299";
+  sha512.run = "1ae9b36fd14bfe91a03f53b4ffcd40a89fb14285da881cec644b0d1d5c76d1c43a337ecdf5ae90e381155876aa82f496aae1e5cc498409bc56762efdbb738cd6";
+  sha512.doc = "8b7a314af1fa4b4f0cc3f138d2ea00e4713b895bc0f0cff966104870249627d0cfd74cee4a0103625f73ac7a27e713641c5ceb606ee51be533adcd7ca6984e9c";
 };
 "epspdf" = {
-  sha512.run = "b63ca19b247cd92a8361aba2f21f298c335bcbe7f46fbc8e1fd16c455a58bbdcb94721269a95ad2d6a74c1acab3347b3bcf42b082b3fe7700ed526a217dc2398";
-  sha512.doc = "f467bf8021c1b50429917659756c9a8ba19d2352e4b8c64eb45a84ba8fd453890fb87afa250f59441cb9594705db1bedb66e39f35f235d1aca582df45f7ee429";
+  sha512.run = "5575e3e55c1004a0858a0f358817c2cabd1de13a75aac7438c7e9be441abac2b419f99551a5ab34045c445fd6ecda1f47d12564939fb56b36d61f5aea3abefa3";
+  sha512.doc = "4609242756c9d49d2361b2f723ecef732fc42f0792f21a409d869c6baccff60046d4bc77e8dae1be117faf3fab6f236feb1982d9c26e6a838930fe4ff2f5e718";
   hasRunfiles = true;
   version = "0.6.3";
 };
 "epspdfconversion" = {
   stripPrefix = 0;
-  sha512.run = "9476d33808f2ec91b40f4e2c66bfe8a372eca5a6d8aaeb96e7820dbdc40c37ad8f75b40360050d18fb307cbcbc8ae6bffca9e984679bdc94be44b4c47f98e62f";
-  sha512.doc = "714afe1bf5143c4a86f2c831db5d267d5ea985c587c4aadea03825bc79466f78abd70ca8bca296ef75e636bdc69670f0c1f535793e7f44cd95ceae972749379f";
+  sha512.run = "057288dbfa1e8e15205d7506bbdb801d90ca2e6bcd11bfb36ae18e463e406c6aa5b7b3b770240c882822e91d5a85920ee2f953f73d31abb7d59ab05df9265f24";
+  sha512.doc = "66f6c09737870706823e5fbccdca0c91416fefd478751fc84d4fe75199ee788281cfb56146db93c46515175da709689a1d213d1949625d602911190172a58317";
   hasRunfiles = true;
   version = "0.61";
 };
 "epstopdf" = {
-  sha512.run = "900ecfcfff1c99b303bf3d7a73afd8ce3f2ec0471f6ac5b398d921f692f6002467688206284b7dddf1458baa9182a473cb3159000f3986c5e8690e394cbfee87";
-  sha512.doc = "a33f8b037271d8515b7af1d04fd0b50af6e57a58a0d21e1c0457a7f961eba47a31243d500d43ab89a5d411e9a9ad97a5a140806bc8a0e24ad8b4b133fd69bdd3";
+  sha512.run = "362805a51781c4230cc400f19a5b64d878c26a81e4ef64e37a5ef768e7a30bae7ff79e57c29a2cd637d081626b8e880f879b48e9fe31788df001d2d81a229d27";
+  sha512.doc = "a99c5eb6e5488e4cfbc9f4a4c8c597d49674ac3dec33ec2c986b14b9812a4da9951275672716d3829d5f3fb4f19f52b4b948a8cf53c760003a9906f68a3674f3";
   hasRunfiles = true;
   version = "2.27";
 };
 "eqell" = {
   stripPrefix = 0;
-  sha512.run = "a53d1bb1c8972b76808465f641c831ea2bf4bbfe80ca130db4ee34433926b0c50d7d0cec606e3c58477414a4b318ff87b499b8fef227f71c516a26e3fe8e9e25";
-  sha512.doc = "a9738e558638df678e5ee020256281030ad16d28570204422f532bc0f962fdd36e88d6217488ad55aacb007f674051d7dc19523465fc3596f09f0769357e8745";
+  sha512.run = "140a88ab6d470457adee2887a178d56c42ff9864f23f6434d9a5c8c30d28625168c5db64f38499d3ed1604eb36a6f49829967b24c3a4daf1966046f5ca0da931";
+  sha512.doc = "04abaa97ebc8161fba6f5fb7814f165c55b1bc502fd9b23d43a79a5ef0faa3732a6fb95ef80da6ec49e9ae37d09d81e3805d07fcabe52bf42ad332d12acac4fb";
   hasRunfiles = true;
 };
 "eqlist" = {
   stripPrefix = 0;
-  sha512.run = "2adf4a2e9f60c87facf5dbc497f52346e412d9b9bf793a378b4862ac8a7e69b79ac447c5cad2cc3c5f102396e8c6de8b8461d9e7a2bf75f6c301ea8e6733c0c0";
-  sha512.doc = "1b3fa18b3a80660021df6403b20c3ac4223eb57aa61e8b68cadb7d96909d23de9cf00ceb847fd0f37db89b6f5bbad37b080e0b18620d877f77dfb6383f818f70";
-  sha512.source = "723abdfa8ba8ffed70f2b296a4325ff51b6bc8ea94b458efc2e46a77d5629df62eb97478154c3fb1371801684d4d869719caae0df4cf42fc8267146a352792bf";
+  sha512.run = "f700c1bb8b88a0f2b9bde6fe4d6a9020851dad3fc685522b48584e0b51ee7ff7d15cb941fbe2eced5ca0872abb3c6a8df6b35cd2d0c24473e18649a7d03f7ebd";
+  sha512.doc = "080eda6a0fe3676928d86742aba9bff6a15170366c4beb558a0480e6922c15a0a763b148dbe5c193e593b94ccfc459424d18ae62d37c92ccbf909057b372121f";
+  sha512.source = "3baf57959d289fcb0eb7046550784e5a1c46f66baf0de3f4ecec4171915703b15fa4a0703c06cf5ad0ffb01bea426a7a302e27121e599055437d49eceaef1c43";
   hasRunfiles = true;
   version = "2.1";
 };
 "eqnalign" = {
   stripPrefix = 0;
-  sha512.run = "de288a6451278003d0b00c584ddb76f3dd6800eecb0792f8be22d36f7ed96f3867e19f6c267ce95938ad0a777483f5752264799ab88a455f502d959688172800";
-  sha512.doc = "9e255aeb502c5eac55b648924655932f281deea6b9fe9b6d2dc84787ebba5df820bb8c0481313536a57f23a74454e5631218828448973483c8ac01ba2a526f23";
-  sha512.source = "3caa56c3a1c4af0085af41f0468340cd5b48ebb7f55543b693d8ab6caac0c8d2731daf88856ce0a7a1695b1e1b38b3eeb8717ec0afcb0d58bad432010138c932";
+  sha512.run = "92954bae2da8b1bc387ea1163c4d7b4802ae01b3d24d0af9a3d0af88ff42bce73a20f0fb9898d600785a0ec5c8a5e3f63848d3f043576f6f4f26b58cea4b6c21";
+  sha512.doc = "d30ae8a7555ca9058f7b779116771b4fe442179734e308eb1b6711a7ff7f105caeca0b5b944836bdc8b85b42a07b2c1fd303c84021cd3a811178077efe1bc5f7";
+  sha512.source = "c7d95f71626057e69ba5b3c3ce7cba60f9f7f6ded41f8d2c89ab9189ebc372d6aded3b1b93416a2895a44995249ac768dd14d847fc4ce74293255abb60bb539b";
   hasRunfiles = true;
   version = "1.0a";
 };
 "eqname" = {
   stripPrefix = 0;
-  sha512.run = "2f3f17d779f28ffd2eaf7ed2308de6dc58645dd227921c5e616b479377ca44a467e8187b7384ed00e222f60ffc649a865f094c0a82a46bd6c4c35594f70b5fb2";
+  sha512.run = "d5ecb6dacac2258d45951c1f5209555ef7a40a9ca7f5183de287660d60adda9b4d369beb1926da6120b4f15153e3fefa1b872fe223b525205c1dc898ad8d360b";
   hasRunfiles = true;
 };
 "eqnarray" = {
   stripPrefix = 0;
-  sha512.run = "3d04dc4f92c81c1d82c867627425cb8a978bf0d91fb81668abd38a41134df190e04a95815b37b0e523b89ccd4b50a59dce99fc08e3659c314671ac316b9146dc";
-  sha512.doc = "402d0cfea3348cb29463bbe654b03201d06a392d910902ea5b995684d5e304fbca77d5c2da190bc00bd619a8618d813074d184c00626947597d4e54a1d1647ab";
-  sha512.source = "269cf50fe5508055a60c3c41898907781886e96bb0977c94b80c355838bb9f974d5144a5acb49516001c6b653027041bb8eda95d6541629a3997481ba38cc8d5";
+  sha512.run = "586614eed6798c48f22da3a532d1cd3c13f49f9e8adf8d32f71f8111a88471480b7b3903d4a97ea86ef48d3f4817976a05c9f28c8541c68d6c89a4e460f4a552";
+  sha512.doc = "06d3cdccbbb2e2590022e900ebf4519625d112acde1d7f2bb7560b0b5c845b85be48443aa7607583476e7534fd326b97c29a7f6aa3cafc8a090e4dc73b6ad61f";
+  sha512.source = "ff0efc31bae1426ae995835f900f41e42e836a3223c90d8f7e37eebd1c80e43087bfe5e84772dc66f081ae75da9a7a18a22b762b4d239118638361d37b4a52a9";
   hasRunfiles = true;
   version = "1.3";
 };
 "eqnnumwarn" = {
   stripPrefix = 0;
-  sha512.run = "52663cec79ebd2195db8e64a40140f5c42b76d0bc43f1d6a327e1125bdce2e05e618796a3e607eb69b6ca4c4fd5d55b534d4db1fb449d8e7187edf3acdc1c123";
-  sha512.doc = "485095c7ca313db83e3b30aa9a5dadaedac313dda049830e665ef90185b098ef097d3145952b55de4921d44073c9c4115e813ea2390fef5fe0a4c22e8a541a5f";
+  sha512.run = "8a1a9d9e362d6de0d6653ed84830e0441cd41985c442cc4e74c83ec442fbf457210a1bf47f3ff6fde413f3c3facdc2ee4d69170f009bc6406e1f9c8ccc2e4117";
+  sha512.doc = "0f45c2688915fe30918e626046d1bf339cd366cf410799f51441ea30a0c3048daa741fcbcad66dc0ffa9ff8ff0b73de0112f7818798710ace6706fd1bc7140b8";
   hasRunfiles = true;
   version = "1.0";
 };
 "eqparbox" = {
   stripPrefix = 0;
-  sha512.run = "5e3ddfa8f2a196518915cfa26ca587df173fdcd7deb4dbb73adacf23f376af4829ed8b3241b160ebb35722fef788047e22568c709be3b383ce36283b57a7a6d0";
-  sha512.doc = "eb58c39c7fb8aa4df176f77dbcae752961468e6553362553fdcdcad6b9a689b3ef980d37cce77c362ab60618ada66cf2c80f5a415635292531a5c562bc8e0074";
-  sha512.source = "852c1588aab455eec49dfbe3746232f456ab4b99544de2c23d2692758c1b7410b73c7e14022e6c27e6457cb594c0f79bdd4c6d6bc2323785689b767986d847a2";
+  sha512.run = "15f8e86a1e878b90ccfc347627affc420a9cb0b91e8c48a074b08aad2b2f86923f06e0f76464e831d9d7f845851e713cd183971c8b530ac1af3ba32202dd3e14";
+  sha512.doc = "4030ad92e666a34d3c9ab28a7a9db08d0c2d9701a658d9c557c918ac058f639a7edd489b43ee61a9455882c88e8af83edda2b5b2eb112850c65965be3cf77be8";
+  sha512.source = "af5a1c446b498628dfbfe2cc418deadedd7e77620e8a755b17061291de12751319207ffc7f3c25999075d7ea284e30b81e57d0d8d7300f46d3ab7f71b5b7d65a";
   hasRunfiles = true;
   version = "4.1";
 };
 "erdc" = {
   stripPrefix = 0;
-  sha512.run = "4313eea1d4ff74b411c1f3d35789c4a2371b1842ea2db43a54ea6cdfa5402e68fa690bb090631749dfb65e004d4a3cdc5153d7cfd720f0795ae9a8ac32c64e14";
-  sha512.doc = "a2368e6d20bb404117b19030b2d2efa2df3e24158aa7bcc9e5ce5bdb64986204cdcf3ce1a83f0f2645ada9cf55a76254a08359a12120701435739055fb71e50f";
-  sha512.source = "d0888be62f00fe2ad2b9fa41b0f1561974dbe0cfb851840d1faffec818c5901b16754035ebe61cd8c14819ed61fd4aaed66b208ececc457a4bacc70136e24964";
+  sha512.run = "179a7cf4b488496b93482727a2aa51058aba7b493af3974d0786c4ce6b6a4d1fd52ea0b3f9fe455531a4d6ab65c4a327838bec76d47bb2f54322f61fdf5c8d2e";
+  sha512.doc = "8e6b9de4022a5a0dc85416633409e8a9eeb4e0adf137ddbe6fb11401b02a99497bad8df03e2ea46e9fee25ef53ecae0c36d727d835bda63f079c4be07faea618";
+  sha512.source = "68f815c3cd1a2ee8154f120592763b47bc45b54e86790b838e80d9cfc99ab79c35ed8404b81da6b3e0a4fade9b9871fff227cb0ad2cff5a96f3ed070aeb9eeda";
   hasRunfiles = true;
   version = "1.1";
 };
 "erewhon" = {
   stripPrefix = 0;
-  sha512.run = "fee2827c41d1f7531817047760ef8a8d48c935c8750783f60fe7021cb33fc6d85b559ea5fb6e5adab0f9a0033f6970f78c5cfb5967bc6b4ed2a59be66f848884";
-  sha512.doc = "980651fc8e6ebde9ba5d90b9b97aed2d0184afcc8ba2a0f25f8ab9ffe01a714485d55588a48aa9efeb1389f9d6d7aeb31ac0fa2c632a141a2f3b3f3abd92a835";
+  sha512.run = "332d4dfd6a8cdf933266c6c52ef82484135f3701b56627d8360e28161b4b4c0730e439683664c9f5d580a53a56956f5a84d211cf56b0eee823bff352dd1cda8c";
+  sha512.doc = "30ea890698a517cdddfec61c43c6cab5d7466f5f1c16bce706e80f8d8a1b3999727dce3eaab6dc04206ab19fd35d555f82d0310ad7ec1d140d21666932c8043d";
   hasRunfiles = true;
   version = "1.08";
 };
 "errata" = {
   stripPrefix = 0;
-  sha512.run = "a1d476da769b41af683195fd6f1769b345481dac03e7f7749ef17a0e057099396930a9d1f319e5eda0f598c90919cb231e91bfc8db41da372eae013cb7e1c1b9";
-  sha512.doc = "fc0b2d65efcc55bd617e5ac799f8784b6983cf34a3735f9e209fc3f18f77e227f4824afe8539c69212318659829deb39cceea20d4d39f39f58e78fd030e96143";
-  sha512.source = "0797e4ccb8891fd1d4541c2b99b3f2e8778f9b24aff6f62bbcc63bf8ddd7bf33629a97d6aafb6eb79748c00263fdd2d85438fc5266dcf81a390989fd4f14fe31";
+  sha512.run = "eea1906709e66a2cd61f292222f297c99c7ab92009fbef1959405b6d4512498d056fd4993fddf91a61e59560d01dd1e568d63725f197b834e4036bc129fa1b2d";
+  sha512.doc = "8a136c2d6e9239ad25f468902bab311f29d63d8901f8ed961133021136a502da8bf1ae4429094023becbe2aae21a863602577789f26b741e90eecaf6516e71ff";
+  sha512.source = "cb5107a069107b40eee5372285ab9288a7620f0eb0a363b0eed104fa0229c7512c2929b3e59860308dadaafbf8f5b7f768e679c566e8ba8b676fd745bbec9a58";
   hasRunfiles = true;
   version = "0.3";
 };
+"erw-l3" = {
+  stripPrefix = 0;
+  sha512.run = "91f9f5a89f80cd407836df82d1171198c9cb893c69d00dd30ba49846b8e3fb12e31e8b2184b71d9147b708950772ce10508a30fca86b190a29beb2c051edac42";
+  sha512.doc = "a33772b42375e6783efe9699c9b2225665f7ae992128f9c78f2f8bbdeb5219803fb10359837b40d5e20f24170b465a90a3200795d6423ed5ecc20701b2931ee7";
+  sha512.source = "9721b922e99f00f2c54d4844253a5171b62cfc5b9315d3fd031f5068784abf7f1b4a3616f2d3227fad65ea9657f08fc16465c9691c82bd911f1babf6f50175d2";
+  hasRunfiles = true;
+  version = "0.1.3";
+};
 "es-tex-faq" = {
   stripPrefix = 0;
-  sha512.run = "0dd8b158717d8ff9647e0a59e247786f3bb34f39d5d2b495ae6a427beba081eb5e190d4c936c8c570e5bf05b582930e8f059ab9bd94a5822698d22372846f60b";
-  sha512.doc = "f47348b7938761b34d1662dd2b9d38fc6975e43d6e7b040092a3ffc6dffa1a6d23906b4b0b3068e4a0d1155f733c5eca180c7c657333cffee0933381f4cc7505";
+  sha512.run = "965c3432fd649d1dbf7f532bf771c43eb613c6dd9c91d9fc83c97452f06b25f3e331ad1f0514f926b0dd79e485bf5ff221fbdfaace6aa8fd3776922c260e2c44";
+  sha512.doc = "66e5a1c57fb1accf32f2c1d6d86871c8187056e1c975dbdd09cf262c22e604e67a0f69cbb56160e5dbae8524a657addcfcfd22d66c0aef649ac430eab8299198";
   version = "1.97";
 };
 "esami" = {
   stripPrefix = 0;
-  sha512.run = "2c28527ca86b564e33010bac5fc5e39c5d0e1d7952a73e4d8a77dd03e2d2406d636be5cb8e110039ff185e822b858b6ac7fd7812bc3a07cd39600f8b4f5a8d2a";
-  sha512.doc = "451600fa4eef5694b2269f8b43a4d934d7ff74acecf3d51efce20f93dea7abc9b915821946c956ee478bca44f2775a5bd490f851564aff2eae873bb77578a012";
+  sha512.run = "1186df46de1ec9fad8c60340fd71ec41b86449e197b74641b3e4948476aeaec5ecc6dee9c6f6c98c001e80980cf47a921e061b57abf6a9823adcdd8d82e4a21c";
+  sha512.doc = "db1ff2a75988d78b4aa0ef78369bc29538cc1bd96364f9aa4bf364421eb0e8b7392a840d4312c00786ec29ebdce7dcedec163ac1d237ee88241f1930b23b8440";
   hasRunfiles = true;
-  version = "2.3";
+  version = "2.5";
 };
 "esdiff" = {
   stripPrefix = 0;
-  sha512.run = "c3a153d703b922c0a9e030c4095bd6454ddf60d499640e9723b995b69aa2f906bdc035eae38283ac0c633b3ad3c73f9c4d124f5a25ed2538aa162f4f683c7375";
-  sha512.doc = "ce094aa74f287510bae9b424b6eb41f2e0b809ba1def9406bd1f836b22d8639b09482b0e7bdd8dc4f7eebbd2dff58973b049f00483176163e062522bb83746e0";
-  sha512.source = "7deef3b1ce15eca17fbd2859b0aa476344f7ed6c7e9a0d6c205835c6cb1979f5e5d54f9959d5212e53c15666bfc0daa67858bfabb8a3b1c3eb9d528a3ceaf75d";
+  sha512.run = "a06f52927e98910526bd280806003b3dcb63c547b127fe01e090b45d83499bab1b3746816169f8d9641230cdbe135b745bfe0e551a8436e9e057a7fc92a97a20";
+  sha512.doc = "5b1b5037e480f797c5ab2b18b874ae23938a2e12b93a2df1b58311a8c363fe4f6450a7bfcc1d665d6be814f309d86dd4564d9a202b70f9d4aaf8c3dca8b18b34";
+  sha512.source = "d720e85aaf9b760087be5e2e8764eae4eea4d1098f8073f5fe78eb4c9856967176e5c96f5e641fbc39537ccb7e7ee51bece80bf758f3ada9cb2a5e42157cc87a";
   hasRunfiles = true;
   version = "1.2";
 };
 "esint" = {
   stripPrefix = 0;
-  sha512.run = "c59b43665e68cf4120f00962d139b3b669ac57a0bc8f0580de86791a51099225a54f7b1f2b5285599d7fb90a857cba17444a959dca3c383ece6256148dfe3455";
-  sha512.doc = "1e7936e0f9fb11f30d4c036e31ce32943db9536200dd0ede3a340d3228f3b9013df0c95a79efeaca17c1ad10214fe6f832227e364174024ac972e7bc8ef5d8c8";
-  sha512.source = "684bd2751f9e9c38cfefe6c38286daaa92b7bc5c2d1d13173d20f9552efa5cf9c7f72664059b950156af34dc8ab458cba3e06cd8ed92e107606c1762079bfa77";
+  sha512.run = "c5cd12903813146a4184d04911a7abd76862d781e7ba93523c533ca6edd48dfe1ffadb8a054e9ebcae639660693b3e7808ef27fb2d6c7744cc7d5efcf08948ec";
+  sha512.doc = "46418933503f2abc4054e9d075adb9da315ba3a01ec23757dd4e8ff1507b251ac03b52a63debd8d57679c368427d0c9043335278810911940ed1ca297ec0cf45";
+  sha512.source = "e9630518609080685ac8c2188e7196e497c26d3ec4d8d4efcf59c8d5bf89f91d8c49fd59fc04a5df8d745fbfd0e7b94e3f26cedbe0dfe31b4fd436ca4a1db94c";
   hasRunfiles = true;
   version = "1.1";
 };
 "esint-type1" = {
   stripPrefix = 0;
   deps."esint" = tl."esint";
-  sha512.run = "56f38ef1e2f1e10cf01fc85b27aeabfe4883f1bad6d0d93c9a007ffb1248f98320c27c4309f5d0e101e759416f7ed3f01521a79bab59b3e9f18f5989bcfea121";
-  sha512.doc = "b4a8cf286b7087023212ace32b2c64f3c798e34d39473a2944cc5106c036e6984732979dbeb3f8efe2bb55566d6bfc5e1668c21fab31aaa4a333bcf1353b53c9";
+  sha512.run = "a6579eb0e3cdb824293ff9f1ca261993904687c7c5f75f32ca38af9f59f82583de7a3c680528d09ef6e489e5ba32483c71cb7e9275ab04a8419645933f4f3d9d";
+  sha512.doc = "ad5816611f99a2704f1cf100959e53e415109a0aad3c9a18fde18ad4901980a68ecc95b8c2e65bbfa963ee28f7445bc5b1f9549444706aa0b8d582a9cdc2ad04";
   hasRunfiles = true;
 };
 "esk" = {
   stripPrefix = 0;
-  sha512.run = "9389f9e38608b6bcd72289be25502191fc3d2e5b50f3b39aa33b737da7dcebd998f778bac40b9948d4c03c95e042e82ad89f12e44f2742923fb5af585ee45d02";
-  sha512.doc = "193c412160d8ce5a49fb878ee7ce95a8c3c77141450360a864dc7598bdaf5c98e69e69ecd55e05b564c83eb7863ef01f8c85706b0cc6bb3032192f04e7a681a5";
-  sha512.source = "ca7585933d9b58a9ecdc6e7bbee7083b238a10622e48f26e9cbef879102224b0e92b661e80840a9e80eb07e37a0a0d9a238913c1e81944dab09db53130d3ab5f";
+  sha512.run = "82a28edbb32a94d204c6a349c68e2e30ffee2d51f95452753d300b017adb11bb757a5c987be485fce16c27224389531161fd2e8238026be628f0bdf3699e758d";
+  sha512.doc = "38a869264d24faa2c6a14333bd75e31b9895f9b04a8fca8d921f072f946dd1e4bd38b914b116bfc08f55c794bde055e5e8251393c851c95de3a20d3095126a14";
+  sha512.source = "d9160ce972ae3309a625316927c57dc8b282e4c78dbd9904b3501ea77d62dcd49dfb8358ead3e91351b5f7c785024f36b71e3ff04c59080e7c737c04a4cd8470";
   hasRunfiles = true;
   version = "1.0";
 };
 "eskd" = {
   stripPrefix = 0;
-  sha512.run = "20198e859037082fd1ebf8303949b87f176140d13feb46e9718dc7dcc11e567e2c5665f0a122e1d25ea030138a3e45df602470cf1eaa318af6bceec93a3ac0f5";
-  sha512.doc = "468b306536cac0dbf710a6b10acf9fd9baf933c92d83fedd16456bd88e7d27008237d20e786425b1db890aa6c52e1039e15acf867e4d54f306e0ec9b447a3b46";
-  sha512.source = "848f7d2fdd52dfd1f63b942dcde1a5da6ef6298239b1bb5c29f7d4bed3b3162cd5769ec9771b4418c2707f291298dd6e07275670f363ca409a15e6e826013505";
+  sha512.run = "38502358c9838ea5e50a924f4fa0730dabdf442c672f45c33568ca97e91cab2dbee2fca01d677f986a54f075f287b1df920069cafec9fa920e8929959995f5fc";
+  sha512.doc = "809341e2fbda85ae67d6c776a572d2e96ff369061961e7b80cacc901ee5714036b7a01e67f09b649647491b6f0b9e9b79d7c411a139cf84fbf7055e265ba8a0d";
+  sha512.source = "48877daaeaa0b3a4a4c8d3bca0d27494e0574a2305af2504abc6d4d750dba89c0c714a66f4f79c64f2f7f590622fe5d9480382fef951f3166b87754b77fe08f6";
   hasRunfiles = true;
 };
 "eskdx" = {
   stripPrefix = 0;
-  sha512.run = "b5189e8707f23a8850050b38ac056995c60ef1189f98eecfc59ba6cffbf0649256158a6c136d7b4740fe864b8d4b25a2b1019d88e44544ba5fe9eb959aa57d9c";
-  sha512.doc = "9de9b28dfba8020c99ae6fe4f875c08eb47ce114743082ae79164b1208a1754e42c0051e009ba27be39bcf71d35725d90c78d7bb79bcd290671953a032ed495b";
+  sha512.run = "1a08d0ce904ed96d059aadb1a7ee35caadb333dba3e93472b17a3ec7a013f481f81259a96b81572a839866974d76bbf002e4d5ff73eafec6e7200b6f80b8ac35";
+  sha512.doc = "4a6ea2a52e6155b6d8deb561828f53180cda84ed7336dfce38aac32397ce8dd6dd4631e750007a50fb028ff94c43c247a47dda78290c3c7bb1be8c8e74006aa5";
   hasRunfiles = true;
   version = "0.98";
 };
 "eso-pic" = {
   stripPrefix = 0;
-  sha512.run = "55b8f2306aa5470a19da55e7a5d3ab7ffd66270f6813d4f6a9401e789b07a9738a03738d44b103c39770f1d8833948a8806762a5575ec966523e64df8a56db79";
-  sha512.doc = "5940fb9e0fe29f96e276090c30325e208216c06918d6f598a792a63adff513dd37c0ea21eeee4e69630ffce591344b38f65119e5a9aa0ff9cd65d2a1d149344f";
-  sha512.source = "3ba7a6f7208a02b794159695370ad1b95c797762f2247105315a142253754490036bd1a893f7558dea1f539a2c1643ea30725fb9a6616e12ade6bb1bf8b0b02f";
+  sha512.run = "331b2ef80efd1a123a11ac4889dec80f3ec7ba34abfa46fa6528b6da23d0a753e89fa7d0c36855b6c06e021caf9b002a904b7ff85fe673e16f52c109ab1c6547";
+  sha512.doc = "ad391c5d56b9437d48d63694f56636d32f4ce786a71da10bfbb8c513ab68d8fe4e3af513a63c70b644743fac07af9a0966d2806cbadcc7091bea098554090c9d";
+  sha512.source = "e4920a366f2aeb65f6c9f4e548c10b0d8f697c53d5320dd37847c3fed8fd4b5628da3cb389b116434503391e9d2facd7ee7d1911f99a108c77cf3b05eb5a5144";
   hasRunfiles = true;
-  version = "2.0g";
+  version = "2.0h";
 };
 "esrelation" = {
   stripPrefix = 0;
-  sha512.run = "e7e24b3d88288cb105e8c254a5feeb0381c93ff215ff1af3dff0045849b8061232ee7e0fd5907bbe4995fc36c30be543594db13bbedaeda73266494c4c2dc1fc";
-  sha512.doc = "072f6561f1ff095262a4e42472d6e77f9a78d5c2e5e8e6bccf236c32c6a7dbfbc247e4c2c547f1119834225d830ea77f77e4b257275a98de7fdebae0773d54a8";
-  sha512.source = "069f65fca113f7858d125674f736bd8fe7551a389672470f0aa880c9f2a4f653b0fc05e66c46a773059b0d1d8ef29b33e9c8fb2959e6614c0178d2082626acb5";
+  sha512.run = "439c6cb57f4c7c540ee84c7144bc676ce40064754badc62457157ef05722be6632287bf66bd0d1404cc110cbdcfee634fb3790335f62269f9e6d08e03999901c";
+  sha512.doc = "4f44d211656cc7fcb24ee181e955f5831e447494dc1b041d76c1e4b32360cd7dee9afc8774ee9eafacc091e9f9d022e451d3ffb73ca03c72b3bdbbb14a36dfa0";
+  sha512.source = "0d81f15cf818de579453ee2509ba0818dfce237ba946a948d93c332f5612d94621529625c8ecef6e47a73cef15e904e70e78cff7c4af038f297d733a9eef3e91";
   hasRunfiles = true;
 };
 "esstix" = {
   stripPrefix = 0;
-  sha512.run = "24d336dbcb56fc7dcac47cfc42f1ef3bf8423d12ac15f498e7cb9d5624853562506c0a791d4feba8c24794499f2f9f95ee69da9977ab39b9924898b50a72f060";
-  sha512.doc = "9e80d2c9223c33e8f4766664b4043b552e6f073f7dec9ad07d3d43861c02f9ad92db8309b5a9477264ac91b631a6955c91c482ca172217520075ec2c2c73fb85";
+  sha512.run = "23af2d293f7c0d3b231388d140c75af480a1f6b4f1515544549af42e1585e3f138f021cd4161bc94d3e6a9dfdf3178c11abf54ca71f00b65562039bde14483ac";
+  sha512.doc = "9c1cd87e3d60f8d3713de4d9288286c4c074517970c99249d89f764a05d355e3ca77ec817ab12d8c5844f44da6f1d4a3893fd2463e3720bec7bb30728597ceb1";
   hasRunfiles = true;
   version = "1.0";
 };
 "estcpmm" = {
   stripPrefix = 0;
-  sha512.run = "0c3104b2d025dfc03b249ff86b6facf8a094dfadf5bacf5b032f20e83bedf33ef54e7e00bde0d1ea67e826fe075c673c85b63fcb444dac651776c13208b954e8";
-  sha512.doc = "1eaadadada2dfecebc58a918682e803dfac24c1d9f1758731a668d01cdf59ed11703e7d4144102716397eb22e528368ca67d354af6ec2759485fcc7b02b28954";
-  sha512.source = "da5ea4dbbd0b816b64b3d982baffde559b1b8d94a1b3148daa7ccb29c9aa83c2fa6fff9a173cb5c00bfce6fc4ff8bb64c0cf0ac11025d48f658d1140e7ca8911";
+  sha512.run = "604d0910573b2192dd8a1fc97214a528258fb3369f28304c6dbe1e91bc85456a6fa98bca6ac7a2e08144776208e84de51a217ea0708d0214b68c470700b70e03";
+  sha512.doc = "4ace679bb114bf83f5a884d3c15ba07405b1d426838fae064a4e2fd4484a807f86b592c29456f2cbd95a439f6d61ca5ba57f81ed09bacef7294e4b8d44d2af68";
+  sha512.source = "93a9070dee14c258f1834f7bebfb85237a29bbd3845cd8b80f61a75548903f29f2cc14575851f64a9351d29bbea427b8fd3596f7c086f56195408b9375415cad";
   hasRunfiles = true;
   version = "0.4";
 };
 "esvect" = {
   stripPrefix = 0;
-  sha512.run = "0b4171374df8b16b782923e13660ad4ece623644a874e4b9486f8ac93b64331f959be0c1a1a7256e77e51bf9bad3ae8442c8fc9be85e4ccd86e5d432a599bb4b";
-  sha512.doc = "2a5aedaf6c2420d0bd4a388ee65bbd4929adcc551c12de1155da596ab5b4d0dc49bffae2beb15e835b0fc7c6d6c110e3dc9b0d247460af3bde2b895c092793b8";
-  sha512.source = "27d483d197ec04fad46c68b66af9da89f8a5a8e60264e2f535548d331959385662ed4420d9e15a1397745b16d6e40fcfe596dd1d4fd77a60183a3c19db29d67f";
+  sha512.run = "63a248329d3245266ea84ef9835ceb2eb469fb93d13b9469af851be433e6b8353ba07af1381769fad54e1d8c8495a6e1e7cac1a2658a1b59a521c09e67abf023";
+  sha512.doc = "1885c718845210db3341732a65961244f7793c27d825e48fe510b0bc346a6cf3d7f4a44a4b432812dfd0050126a551b4d1391570385ccf8b3434b70affd53f80";
+  sha512.source = "74f75ff7824580874d1a4a6b30c3d606f4e6a407d9aa6af06713f05162d77a99964b27e94a29a22bc64843e37723c901b4174ac86c1457c11e26fefb4302ef0a";
   hasRunfiles = true;
   version = "1.3";
 };
 "etaremune" = {
   stripPrefix = 0;
-  sha512.run = "ef2f6e75b16fce9c888957dd94b0156a8d980c7b8560716110ebdf9f448c513ac75c430ed13b965d4308f1f759adcfa8e677a00036f57d27d9b056c778ecbb88";
-  sha512.doc = "497d6409cfdcc4f01ffb3e26ced5f0e6f2e1dc1ea768ee6c0a05edcb618ccf2a433735cdb916ec3d46b5ca00cb8c461cfd65c1949a4ca12aabde130223af279c";
-  sha512.source = "e77b38a526b92d43a0456b851204db53316d62d742a8f0fe5fdae5c3dd16066882d0507d1109441e99b204fb2bc47bd912c85cddab495cc2ad996df7b0453cd5";
+  sha512.run = "5bf23fab5bee34bd020211f056d341f5f459edb3ff536c12e186468d403bfbe5862e1d83a4a2f3633b045787982eb55937d7eb5ff788400bd7ec8ee60fe9b982";
+  sha512.doc = "630c9d422c6db627c68dbf600692c7fec75fb180e27c534e62817242d8447bcf93fb3cd783c9b6587c33f71befcd7c0501508d7d8e4ad2c5afa2dc85816d155c";
+  sha512.source = "e6af96170ff5f49191acdc384737ce0912bff603f6380af636a951144681f994c96e2ea752e8bef9a31c4c1a60f52dd4e7782ac9b11bca1e67f8b8bc11e16438";
   hasRunfiles = true;
   version = "1.2";
 };
 "etdipa" = {
   stripPrefix = 0;
-  sha512.run = "ffca4aa2545f3cd797383bc208c5a4a29b56590caab0922081a3bcfec398747ba3c9475d20102dd71b3ed492206ee67dccf688b4072ca40b3b919a9719a890e4";
-  sha512.doc = "c5a2dbda67f895ae7b6866aeba14d9a6b8fbfdee6b580ffda48ca3a48d1a964b211adaaa5fcccc7803405981493ead9be0f58652f2b8baf08b5261f1e1b2147a";
+  sha512.run = "6726067f15698390c7e1153658725465ee9f5ea7a730c7064a569af1827692afb27f31f0971e0a35630968a7bcbf1783e74079f830ac7c098c8603a9b1659a62";
+  sha512.doc = "60ae9d339b09b53d18cc90947e354d16476460e646ba5c822ae89f2f4171f3d62dbd296c5df0df5c44d2b724d825033186cd99653d0b6676969a45404286a9c1";
   version = "2.6";
 };
 "etex" = {
   stripPrefix = 0;
-  sha512.run = "b3626f470022b35ebc8f7fb06506e1ebc2bc4550696446f84532088562793365dcb28b58cf7caa3006c0d7ee93365831c28ec6befa4e149116f65f4ab87f06bc";
-  sha512.doc = "0aeaaae78836dede932ea915c8d0c9bc228940b91c56fc4422e288da7b8d846f308bd040393df196ed76d679a2e5fb99b9d76bb24328bd70bcb6a808a4c96f0f";
+  sha512.run = "cf1c7ed52510440f58daa4dd9fbc8e29e1cea1468e6b43c35e5a34555ce63e5914cd281673ba6551fcb52cdbb6b38f33219e0b1c79ba8e342d1a9c4664a7774d";
+  sha512.doc = "be1daf0be87cfd94c42f59cd4a09d86e617b642038b42faa62dbc171b7518ae87699398a17b61f6df22e3bf9dc06cc71cbb662f800727764dd18de78c4e5974c";
   hasRunfiles = true;
 };
 "etex-pkg" = {
   stripPrefix = 0;
-  sha512.run = "4aedbe724587685d874627d992befe14bba3e2b40107d9eaf8568c450d9e54903c15fc196d1da3becd6b3e14d5ce9ce8c9ebc0c16c109de33eb22e4fc6144035";
-  sha512.doc = "fa7cfffe5c8bb5846aa8dbda2a0403e7c4602c8d7ddf08393db1d3ba50b6f16bbb264213cebdb4d27f5563a1308a4f143d28847b169c3861654d02bd3ed39f3c";
+  sha512.run = "3b9f06f5d621a5f080dae7626ffc6cbbf2cb8eaab0b12d2e5c8fdc7747fa9fccdaf2a9df42e60c3622ba317814b5ba244b1e809657c7e6b57d325a0b489b82e5";
+  sha512.doc = "c66818ca5375fbc768533ec6bec0e1002c501f49221f0822636d810641abd5b6a8a63913dcecc5b9b82ee7dd70d417ace208f8a7d9c1fd4aaa22a64be46138b8";
   hasRunfiles = true;
   version = "2.7";
 };
 "etextools" = {
   stripPrefix = 0;
-  sha512.run = "96f00949602f82208b6aa8a496bebe8edd725890e028e980caa3473f7ea17b8c902c48081ebbdb2a5a4016e7230cc1bb5a54b8434a0fc27ea20092877c7b7991";
-  sha512.doc = "748ea84afbe5266f8b2ee1adef007b1786c6dc63b34258178f522542656e4c11892d7d0fa4b369c4f3ed9d09169b79f05bb1d2d216fde6e642935bcad2e230d0";
-  sha512.source = "96e917601585523508878e02df1186f0fef8009a3e624d9ed6280dfe259de5febfa4b241bc3db231ad97a763cbe4dd30bf616bea932a6418238e282083c90e4f";
+  sha512.run = "54ee643db1c1bfd65e76500bd6a8fadd50ab5c8722a6d9fabf5caed767fcdb95c4e71cb8e3d88458cc92b84d6b7d4d9b7336d4aa170d24991392b3c6c4db08c5";
+  sha512.doc = "7658a45e46e6e9978cdcf0d4ee0282209bc15351ca93c23f3f9ff5205a4aec3a174eb10c2313487169b7fad5a1de5636ddc50a7a8770f6d16c4fba6c0bd98182";
+  sha512.source = "c0c2fad3b29ffe3d7b564db7dda4846e3dcf2ee703cf3386bcfef8f81dd6c68c3e3ff1440818088d8ff3d752afd0642de2de7397c183e7b1e9fd5235840bf562";
   hasRunfiles = true;
   version = "3.1415926";
 };
 "ethiop" = {
   stripPrefix = 0;
-  sha512.run = "dca193631918f6e343eeb28522e5ea2f07eb1899da7d18e82e7a104ce45116252a8c6875e2ce9e1d89379df5399ff66502c18608d8a4a5a84b48e25b12b5cda7";
-  sha512.doc = "f288668393d13baaf9022b78693db90ed3f9dcd5e0de99af04600d384ff400a438b4c8c520f79add113423e67a9c12b649cd700dda1e2b6e33847e79c0e629eb";
-  sha512.source = "24769e7fbbed77ac18c7cc6d605b5f4dbb7c72b6033b5839612635b6dfd0a9f0734f2c0c9a68009788d8331e2c7e077bfca54eab0b782496de5bab3d5fd5388c";
+  sha512.run = "53759564ba3be8030f02f2e03985b1052f060f41a1f33060c6aa78c56f1b10dc2baf7832a40d2ec0ea1cb85831b17bd200d9ea3bfb98ced6805d3978acd663a8";
+  sha512.doc = "dbbfe7a8ab49f4780d512c232d5f22f1fbbe943f5c08283ca2a62d23c70ccb7daa71f8771c8d90c7c13090c170d8143668ccca46eec3953250893932ae17b9d3";
+  sha512.source = "5c70ee267369862577272116db81c692ec4a7c43fdc8786835066f931aa671d09614f5893ed4fab5a2da28ea0b7949958faf94746ec71d5165e594b206eb6f05";
   hasRunfiles = true;
   version = "0.7";
 };
 "ethiop-t1" = {
   stripPrefix = 0;
-  sha512.run = "f92e000226246e0fdfc99818af683f1d15f2e5f95a44f2086493079ef0b08f176216c26fa7299b544e3e45f3ef876f0cde36098c64b95901607ce4761adb7ce7";
-  sha512.doc = "ed5ba0b4673c172d6cc4c43a1aa1fe6dfb8c986e7a96ff9f93a2223aa706515b48f87f7e8f8668fe07c6fe0257912bf27e23cd3586e5a5bd43293c3926a45f55";
+  sha512.run = "448e86842514721dc89fb6dec5017c8413000b4ecad50fde2d32986533cfc0ef1124028af17d397e6d96ebc649ebf4363f0da705c004b675a6697ba6725110c8";
+  sha512.doc = "b6a921529e18634e7a5f4f9fcb28e0ee8207b7277b73dd701687e41260582f64b5e510334a431129bf659fbf63a5b6dfb090863bb8d558e8f758d1816d3faa03";
   hasRunfiles = true;
 };
 "etoc" = {
   stripPrefix = 0;
-  sha512.run = "f429d8f075d5596f246f0ab11c2187c0a58af7f2774e3626f08a0dffd2e0fc87ca0d118f63753a75b6ef0e2d4bc491ae575216381f83add8b90721ce5f0ce1a3";
-  sha512.doc = "54625387fcf6a316189fcfc797137eefda6c29ebb69250ce425a2b5602f038785b8cdd642e47ab670487dca06baf9d71d6d2e5953529dcbb9b188cfa1ee5085c";
-  sha512.source = "c211f9642c85d11398e9097167d755bc73916318cf0af87bb5e7e1d6d7973f9248da224b80191fdc8cb62d6460d1bd004ba01ad4d24412cab17874752756d220";
+  sha512.run = "7179facd22b1fe974b4420c19bc241a0fb047331f1d182c8894713029d760e0f04e2e85d7ca7661f2a2c64503ac4f089f04c58899869aa3f8d193a614b095515";
+  sha512.doc = "714118b62079ac9aa0a0df785c62dede54259a75351e8bc5273a9c4bb048d835bbde9ce533a2b1990215c3aad434934151aaa16f300635a38e1d60d6c9b7be0e";
+  sha512.source = "5fbed78f92e6ecc003991240c40031f74e36c26734c46700ee218e97678c2497b18b439639231e7c473766124d04367f15a8384a804e13d00e7b99a05fb5f492";
   hasRunfiles = true;
-  version = "1.08n";
+  version = "1.08p";
 };
 "etoolbox" = {
   stripPrefix = 0;
-  sha512.run = "aacd0e963ca33891b9bc85e6b8163841c74c645540c0ff058dbe4f8c602a2dc1d78f030b28880517ad81bdc09221810e80536b093650371f4111905b1adb1a15";
-  sha512.doc = "916c37e14362385d591b7917428bae40e893188b2332a2b6ffdb0500ed887faadba107c5e828c6a7c78aac60124b735ec1e0f732dfde25cc605e952500eed5a5";
+  sha512.run = "10df1906c7fc0617ca28164da6002c47852316684b15f0cb871082b6556c8d8f1710e9378b8f361e00a77eb9444a37dd5805a5c3003da8e7e55303f4714d81b9";
+  sha512.doc = "b180fe1229785c301dbfe0a9c58534482f55190d895595c21561694e7a26145cadb54bdd61e82536acb1369e31b1f0c143615a3cece41b32a295d760563f2f87";
   hasRunfiles = true;
-  version = "2.5e";
+  version = "2.5f";
 };
 "etoolbox-de" = {
   stripPrefix = 0;
-  sha512.run = "68733f05fa5c7be2bfa403ea1f56d5c9d88034147f30f4b33ab4fb9cf8ec38bd1ac7f6ec05ca6350cfc535a5505e9adf0d43b54c4d34f6f53ab91bdba41a28f0";
-  sha512.doc = "a94bfc0ddc6fb69d659c0ac07228c1b39b8ebee2a5b0856fe5efa04b67728540c10f0e69d954ef0d130ed438d03cd00720334ebd86f900ac2b4c2a9f7a7980d2";
+  sha512.run = "869b0fb0639aa81f9d0eef63aab1157ed954fa67c6c19b08a303c7b0aa64a26fae2eb52d231bbb4f29c15545a0922ec7b959ffacf52bdabfd03607bc4ff059d9";
+  sha512.doc = "80bf5e65b40e8ac339ad8d73991c8d845c39e5133e2957128ca15d6435ab6036c383fbfdc506d4a17283b9bb9f59ae4fdbc8f09a2af07c104e731337f3fc83cb";
   version = "1";
 };
+"etsvthor" = {
+  stripPrefix = 0;
+  sha512.run = "3ffa08004d3bceadf2f2c36f15c88e3a5facfc25093d84444c21bf64785a7d7f72ca7c65184b72f138638659fbd1c27a079681aa146404019f0fc8996418c87f";
+  sha512.doc = "2cdd0c03bda04e06f90d41b1a85088cc7e351f3fbf9fd129dd96d66ff89b7cd75e9bb00cbc2e4f48411b2b549af4e77ad04316f38413c872693a5d01aff8fa2d";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "euenc" = {
   stripPrefix = 0;
-  sha512.run = "612282ac0c8e37530cc61668ea62012e523568cdddfef85453e04d3a2d5e06c2f1f1a6bdef362575de796122f602c7dc2bd59c8c99d5b763b3d6d38f4f0884f6";
-  sha512.doc = "8077ef14346931b9b46b380a70960586c40eb1aebad1a51e98ce8e0ec65996f439756ca9cb2102d34161256bb5e224ce81c381fa0baaf8163b21faadd6317ab5";
-  sha512.source = "c7e29144eca59718e385d16dfceb2ba287275b6dd180da7bc72ed27ffb9385ba339b1039b1886fd015351fe184adbddc8d418c83a24949cceffac08497e402c7";
+  sha512.run = "64a1138033402ce014dc1cc68e2981c8fbaea03d4362d8d5acc38cc3e7263b281d43a4b15dbf72b25ea05ad5dbeba9709a733b6be9078ec77b5af5ee1df23d48";
+  sha512.doc = "69bdef150be2a41c5099c111b1d915e0c82cdd498863b94c798dbc5bee004aa43331464923ec40bd15cddb53a5283431d00e089c3222f0901309739b1cbd44dd";
+  sha512.source = "339f1ad3d889ad88e57d14022f692e79ed98224953f527070dd78604d97ddd10ee7c194bfa63b561ba23cdf5ae450f9b840b2c04542c1716f64ce74fa74f5637";
   hasRunfiles = true;
   version = "0.1h";
 };
 "eukdate" = {
   stripPrefix = 0;
-  sha512.run = "e0f182dd38ccc01d583ab2d968a5dd2394d8ed2e19a6607107ca56a76aa0d081bcb6e14cae83eebc028869ed440ede8ab07ea64ad777e503f58631e2bd9badab";
-  sha512.doc = "d34a3ee3ea4fbe49668545cc117df1cacbd6a1e6a9c9a3e14c4e3365bf5dfc71d84b3de37c4b52802d797844c907c228cba7939f0557afefbf5ef30d123cf557";
-  sha512.source = "fca57c1192914d1d6724eeca76e9814cf6da37f00b52b54b63d24b4d6142b2b7cdda94ef01516a4e53ddc73872f57fccb39bab686ddfd9b17af47e91647e95b7";
+  sha512.run = "38935de0c71c18fa05511bd809dbcb808ede10e0f9b026999e710ee1d0ba52a01fba4e32edb8614cd37cbd4a5cca3cf71cf494e159870a59efc160b4a22a128e";
+  sha512.doc = "5488becdc0cb30e23c6add2193a9b10ef058e7de200ad54119c11976372a71c181a8a15df63ecb39298c4466b4776ffb50c5303fc9e603f14fb9d69ec3ff5ec1";
+  sha512.source = "88471f75e44dd51e7bb9d71f23748dd1f4031ea9cec8406fb11abb1e29a5cefdefd516fc6b31b7cf274f80258665c7ec404557743236ee3efdae3b4aa7d58821";
   hasRunfiles = true;
   version = "1.04";
 };
 "euler" = {
   stripPrefix = 0;
-  sha512.run = "de030918e02a6ccd840ea16e1e0207d7e19116d6e08da5dea6c0c0cc86356bf379cc84e752c00956591c97921a826ba341400c0dc43973090b5417571875f067";
-  sha512.doc = "724071a613392351e53c59669defea562d0a87442b74360cd3790d0c652200f4a5aff4dd2edfcfddd369addacb45f7b7b39057b9681fc281e3ac59b3eb2a134d";
-  sha512.source = "080ffb7c1b2f626a87cb5a8add6c086b640cc6402078c736dab4f548d75f6d27f9e4f5a860dc2268823424ba2e189d294fbafc1efcc936d62399b487e0eab7d6";
+  sha512.run = "d7fe30994bf26895f51bf00b9cd3220184558067fb41990e9832ba3f2ac35f2703a398def670ea9a44474bfde87e6b2b745e25f8ec406984036e3441330ee728";
+  sha512.doc = "143c3c2118fe71d091946ccfb2494b2dd0e8bb627579620f021837c72aa192be9fca2795db6b734bc2da5a3239da926927c12d020022fb5ff0014cf7c321e06b";
+  sha512.source = "c7fbdd3c93a9222286ed0222b2e170fa66ef782a65d1bec787a0e8e162edfd7c6c911f8fa0058e9face0b415b2371af68ef1c5a277682d110db34a1e88892937";
   hasRunfiles = true;
   version = "2.5";
 };
 "eulerpx" = {
   stripPrefix = 0;
-  sha512.run = "65252de7cb03e860c6b3bc26198b83fb851ba1563ac9eabbac549e519a18bbc9fb05c7ae03ed9fec7caee69576f9e42a0c3b544cfb97ead49a364567c00c94fd";
-  sha512.doc = "00aab5a1cd65386beb6a3f7f0ca654963013cada73296fe1c6b4fc139ef3a4680aeb06fe05496625add0c57067f29034a14a84506f6206dbd1ade8faa02a2605";
+  sha512.run = "d535ef04ed81ed919cb14b153a9294ea7fce21094f59991185a12b3f2158c1a5b3dfffb8efb0421d76cbfb2ef4ccd46645ade518be7d3fa86d2e93505fa789ec";
+  sha512.doc = "4881dc6e74d0c2a465147068f64f5277915b9e9392ecbe5308a036396eeed549153f1de90985865a56d75d9ca218fe58719950377fcb474999fae378df973206";
   hasRunfiles = true;
   version = "0.2.1";
 };
 "eulervm" = {
   stripPrefix = 0;
-  sha512.run = "a56f542e0a2f8ec802281a84b724ef2ac500db24d6d5059c130616706263417e07c99a62319e9db4bc3fec180a4f89a7e61360695f6cab773d07c8f9e8071243";
-  sha512.doc = "31b3826f02da923f3962cd86d44034c6513da9f4967bc01263dadd380f9d3cf548f19bf9bb1057e3e36bf860ee5fe25f313806c71b0f97298ac2301a29b7280f";
-  sha512.source = "7ea0b2c11391105ef71a61597813aff567a4b55208b562f4189a657bec4a47d61d32a3518d67e3023d790e674eb340a2deda6f81a11dafb4b8bcf1090dc97df5";
+  sha512.run = "cc21a6eae46871959eb23ee03136d3a1496993ead66cf8fa6ef7193ceea6afdda79e6a290a4d880618cc09bb5e1b930669879cc9c50087982ac17a422c32ff43";
+  sha512.doc = "70d5e1be5e7c0398804347d30ca75d3a6840793cc4e3628799e4870bd38bd4244da94962945246c102d25e3f9f197b228bfbab0845045d117bb9d588b8fdfd7c";
+  sha512.source = "3f2df5a617f04fe8b770117ddf28b30b20ecf458c78c302ec4b2f15a8e6434e529aea2cb6b69c2c9ff26e059a682f4f37114ced73dfbef7e9d2261c6b7b36842";
   hasRunfiles = true;
   version = "4.0";
 };
 "euro" = {
   stripPrefix = 0;
-  sha512.run = "2ea3b1037c744ed8d9c6fc060f9c1acf7d8f915b8099f7a2e7b99a6c1b1a6f03695c8acb7f6f09cd6e50eff28c7cfb48788c351306c44cb9b586fb269e1a9b21";
-  sha512.doc = "b432146e058e920bb1bb7f19ff82dc77a260284a5597b0e87df70a0557ca232cace301d6d5f98ea7248408adb78899a4500b77027766fe7dca81efe05bda429c";
-  sha512.source = "beb42db4055f4607e8435a5659ae6b380a2552f3a8a31ee0d0f9dfe5fd49fc058b17fc7cccc3ef7dbe646342ff3434fbbafc4c38b8c4080fae041e322893568c";
+  sha512.run = "86721483f866d367a2d5733ff4fec6b3b85a6fdef9b0feb80b2ee87234132aa99b5e6cc4f86ecd83d23b238aac29933b3c18787fc3940a6d915413fd7a9d19ad";
+  sha512.doc = "cdde695a635ff28d4977b33f86407ce7ee0ea5b5adafa2ad5adc27b7dbadcbc2d4fe07d34a7461d5268b3b73db8a886d3e371022e5d22c06608686ff08f21700";
+  sha512.source = "636ca697b2a2a489b49749e9057d21621959d67c404a20b904a889055c277ae4711bafe995831e10aba9c5362734126d9b13f99b3bbdb0cdb35e2feb6cf7af9a";
   hasRunfiles = true;
   version = "1.1";
 };
 "euro-ce" = {
   stripPrefix = 0;
-  sha512.run = "e311391bc9efab8c0bc201fdced41890018765cf781c15f23d21da73edce1228c9facc30c4b4c833ae3769924fa7421bec657f940c9ba5afe624e05b736aef18";
-  sha512.doc = "af892c5470b63e4b40497fe205bb10c67958d83322b934f2f39c22b86a1803809f5b97dd5e1fff8c4c1bc041c5fbe5c6575e2db6e96cffe50e7dee7667e5792f";
+  sha512.run = "33ab79909ffeb2c66b406c337d10da58cc9608be8ab65544be5825f08a7bbca993440e53534a87960433a8a83ce165614becd32298ededf508fa43cdce90c2f6";
+  sha512.doc = "baed65a37954162826df93acecc031437514722a422dc61972bab10663b1df65379bfcb2cc690173edd4a9404423d8e289c04e167e1733b1cb6317c64418b1a1";
   hasRunfiles = true;
   version = "3.0b";
 };
 "europasscv" = {
   stripPrefix = 0;
-  sha512.run = "3cf10d275498bf098b6db80b9be7ca18311cfd6b08af18353b9285793666557805282aa1b94f0e16a6c1b144c401b2af9bcf75002b683d78f4c0c8d2ac8cd108";
-  sha512.doc = "ec5b8c88774332c3f7fab3b61fa812a4a1862fc84afbb8c939dede0dfbaf07fd3ca0c138edf0a1d87344af386ac815a2a1fff76a5561732233fe4029450eb39e";
+  sha512.run = "94c36411d3a437b8e54a6ebce602a42739713623a23b6ec388ad2e83f8ee89bf827a61cff90368d6493c13b532aa0f376703f424fac8aa6e76c3841901cbf2a4";
+  sha512.doc = "f94573529788591b0d940549a2a922d12d5e0512643f34a88ef8455f34621d0391b108d581e0aeb8220dba26922f1ff6501aa894cd49fd9264672a6e96f89e43";
   hasRunfiles = true;
 };
 "europecv" = {
   stripPrefix = 0;
-  sha512.run = "826a17c198198bccf47033df97f3211da46e1f6f85dfca1f95766c5a4809b24a4464892a5926abc0d113c01a121190fce5846ac8dd96859c6f056d8c5b30628d";
-  sha512.doc = "545ed5f435946ce8e91072a84db9bb9fcab37af6fb6eb8efde07515431c19d1e80f81a204d68dd546f5dc5e20aabe567e917c1267b96fa3a7d662d29e5344387";
+  sha512.run = "6785c845861f9357c4acee9410d21b0921c2f921184911215c28c1e0d773cc9f16b1ebf79253830845e5ee8eb7d29942872906fe4b8739954fce967d6c428246";
+  sha512.doc = "ce53cf65134f74935e4164f188472d73b40289614b04d26ea3b29dcf4f622911880006ac219f18904f72ad8dd3e3a34b9c53dbf4cc8339a086f2e328ebca8ada";
   hasRunfiles = true;
 };
 "eurosym" = {
   stripPrefix = 0;
-  sha512.run = "b917692f4d0ce9899f4cc9ea63c015a3ac34524b4f66059e81d024153b8c25b9e3e1615d02dfb5dd48a8dcb3a7f325c12e44765f76907aa54b12e4237de224b9";
-  sha512.doc = "efa2ba43b93f5891294ac15df3d339ba6ec0fecfaa0509ba380756189ff245f3c4055b168730316b169cadd3ec7a5159fff65e905302b34ba88fbb25e4a1f3ac";
+  sha512.run = "f2e1ff317bb586be7f3c80780dbaf74fe27d76f18fccc75bf88e9031f10d58b0214e6b49eed72d01c21597dc0d9272666084b057b0008868dcd901ed1c55e66c";
+  sha512.doc = "49eeba025196c77307e84443f362f31d46ab89c45ee79edc43a8b46956d95b76d5c63a23c5e1147d3c2326bd65eff04eaf58bcb7e18c064b51d99dfa5dd56af3";
   hasRunfiles = true;
   version = "1.4-subrfix";
 };
 "euxm" = {
   stripPrefix = 0;
-  sha512.run = "5bc5845d8e48ae7241b512a03e0971b9b8013d90feac90de9bd6dba3eda34b64375fc0e6947b8e524d702619bf607e9f94e2d25c21ca95e605886960e120260c";
+  sha512.run = "445033ad32e22be93ca0b29c69ada6016cd8d34f1eaf90a42678cd07eb44fa692f243746b673e07922e1ce4efd22e53ab2bdf26aa7b6262a23293f92d2a9145a";
   hasRunfiles = true;
 };
 "everyhook" = {
   stripPrefix = 0;
-  sha512.run = "58ba2f87aa416399b36e52814282ebfe2d6a670ddff20c597606545964ac8abcd9ddffad7dc583a6263d6684ef5bbd0d90b1a772b58f9c4a10ed3c0137b110a8";
-  sha512.doc = "4223aac4fa47319954c931fae3c5e9a828ef6886bc5dd1885e27b41b2e9543f9d0a10a90e8e002fd196572bb20e83db9970f0d3417668cbc25462b9ae602f4fc";
-  sha512.source = "7bc89755b1a3d221045da677ec7b24e6e3bc83a88041fa4eb9d322e96b318d1e6a7b8ef16f5b6924193667dcb9891e031d6feee11326d325721b53b3e23612ae";
+  sha512.run = "3c5262d7d994eaec11bbfc7a326dbd0e687b7bc951142d54b75191cb0837c808f1766346bc368ee8f2b8701e4d792d5f594fb73cefa2b6364dc98bc0a9c96b80";
+  sha512.doc = "d205c8b10663adc2c1f93fb52af2a74b4726c3e6491278e1357cae58419d9a991167d62204b6fa9545d4afef6d5c5b05726c21210d9d432abd712c67dcfd734e";
+  sha512.source = "ead4d2df08498a3eaaaf5ddc9600db7a9d75c12e8cc180e910b90cdd0c134bca72a85bd538bcd67ac9b66360ad4c4407b3449766b609bed7e8c3e86ea4dfba98";
   hasRunfiles = true;
   version = "1.2";
 };
 "everypage" = {
   stripPrefix = 0;
-  sha512.run = "0e77a77063469e1f1b872bd84720d1c9118f39f4643b7511756a57cc6ba195f1a619a47d80ec82424a6fa09d4cc2e636d9b6d2aec6d76e80cc7476737f4d5c2d";
-  sha512.doc = "aa70833380e10c6e1e088bbf9830be902282593d65bfce236bd0d4cf9a05075f82306e2b269d3764c430e27e23f27557ead1073b167e41a03fd6754b89df188e";
-  sha512.source = "a5c921653ed0cf1444dec20fc20e57e3d0c7ea4253af6042ecdd907a8948a6dfc2ca7580de06c39b78a66dcbf62c891c4aa023a8a670ecd56dec8357d626c248";
+  sha512.run = "c4ab90d1668d1b71393a07d6be8edcf493aeef5084c08bc057e759ac857997cc5f4647514f9dc8730b66d3379401055f23fae393ba6b0c882bb4cfc3c33c395c";
+  sha512.doc = "8c017ea944d9a4a22a2cc554f57ad2c7affadfce379a9ece6359aeb33503a2853ab138629d5de617fdc37e54b4a6478a330c4c5dfa157879e0ff67670adbb122";
+  sha512.source = "ab3aaa2b7e4e3793722b3c76119df69d9d50a9879b053e50f224d0956937fcb52924051d3ba45a5c1b4ef850ecf590e169ab1268a61a4e319881362fd59117a6";
   hasRunfiles = true;
   version = "1.1";
 };
 "exam" = {
   stripPrefix = 0;
-  sha512.run = "040ec6393b6f452ef9b002e4a802d599eb2a647777b6a320d6763e9cb03541a478d3e133099df5f3bf10e4039c0f42ff40089f301ccead620dda3100a792a5e9";
-  sha512.doc = "204ac96435e08472c69824118a0cdfe434a5baa26bf70844082c41bc26312a0387624dac5eeec085844dcf2e0371ceb0ff525dc6eb5f248f16b84f4b84569b0c";
+  sha512.run = "a402b55a310bd6d112dfca40fe3805592e5055880a539afb461f50b6a50a3852b2284cea7d0c0c1d7ed2c1e2495bd9f4fb161032b558df8abcd3f0ba1eb9509d";
+  sha512.doc = "a0c84a0784c49af226eca562ada98d808501a09f9915e1b97ad417fbf8fb4ce1ec5c5564cb07962d76a30436845fc2a52295de9b6f5681e302043f6a575dc3ac";
   hasRunfiles = true;
   version = "2.603";
 };
 "exam-n" = {
   stripPrefix = 0;
-  sha512.run = "f0152a94d73b70c61bce927e2f10ca7eb09829988f41be84cdfda6b455053241918ddceebac46e94955680453b5993c1769707c5f623e543072d6633b03ff61a";
-  sha512.doc = "86e70f0bba03ec40d3c77cc4f676e365076602d4fd7f92882f0461fe4f425aeb6a7fa47f3412fd7a9478c7e35f06d4d5105901d109c428fbef893abf9f80bd69";
-  sha512.source = "611e76b45def8c6a522d3bfd163da2cfd11482f60bfaf5371d9eaba3982fc13cebf3982525a17ff1de87d81636bd1b4f9ace564fb8ae79929dd1ec50650e1023";
+  sha512.run = "2889e6a494930487a34a26871ce53b93cd9f9f1210de6507b5ed8657e5e86d528bf4ed926ae999e2c127c41afd529dfeaa7bb86482af78bad0eb6452cd386728";
+  sha512.doc = "fa187f29eeb05edc50a6a6afd2c4ee5003233b4fbe9601fde5b2cb112d649d58dee56836c6ee1efa7103cda7c27084acc72b803ba67d38a2ff2a4b237d4b1838";
+  sha512.source = "bc53ddac6ee065de20ab89997f437e532832344b95bf0b02241bee760755807d603245e0029b9c25c99bb0999648020d485233fc6447d636da566faef6b20fdf";
   hasRunfiles = true;
   version = "1.1.4";
 };
 "examdesign" = {
   stripPrefix = 0;
-  sha512.run = "b354eaababfd8d8d20516c5eeb70ae687b6399520fa60d5fe88b0627a6f8b8c5236f9ae25dfe91ffa53324478b31bb9631a0bd12aae30d1e9b9d34a8df724940";
-  sha512.doc = "0afd372010830c18f2f1d4abee2771e2b33b0bfc95ebb9fa055de2bfa19bc24a0318d527cdc47826b8c35bf5d26ca12c4d32106837410e1b5fbf8d7a63d5a651";
-  sha512.source = "cb6f9af701d23b82f22ac9be7ea904526b2295532638f4b3d1133ec86d4d106302c24f7264346dbf3b4e03f132c9f0f843012e49fe98b22c2b68a222f87664ab";
+  sha512.run = "3dc287e5c6e51597689e82b738270dd57d2c63463717f9381ed992e421cf70fe37dd1df808780177904973f2fc916feeb695efc109dcad3230d9878400d7b6d8";
+  sha512.doc = "97b83f9d5bfcfdcee45d1a35b757d3f61d33bd899aa2a2f86c15e12698bd0dc8e48a04a4b31be63c55268bb161923e11148b4ef68b3e6cf60672faed2f07b8b0";
+  sha512.source = "6a287a229a70f7aefc5e6e1c12964fcaa7f084c29e42aad36f7a589141d2b12fc46dc21d8b31ccee12b9d2de90d2e6b7a04428756a3b36f5f332500136d0b711";
   hasRunfiles = true;
   version = "1.101";
 };
 "example" = {
   stripPrefix = 0;
-  sha512.run = "e1362dc171454092e956051ee6de618e6baa1d656b28cf41afb6907e38174ef2aca467be2ddf9c575a6278af1ae48dc3d33b70630f09d59e4eccd5bb2ea60760";
+  sha512.run = "3e6427f2b0fc965e97f7f9c1358b7c80a859fa4619d0843c7426fbf4b2a9d347a36945bd54698c7ba8c44032d4b6757307a46644b185cfabbc87bdbf84e4489d";
   hasRunfiles = true;
 };
 "examplep" = {
   stripPrefix = 0;
-  sha512.run = "910877e6fe4db7023f625523284af35fdb7c3464430fa81a9d89c2c5819aa3cd3390827f84ebc4f30b623177c71d89217e749dff15032b06a12f484dfa9107ab";
-  sha512.doc = "2f274fef33827ec8854b5b7091538b2e3c2ddff4dbb9d9d6a64ffcd65b1cc8e4283e28acfe441414782a29f61d6bc806dc9a406c9c7fc0fb306a9a40e03d29c0";
+  sha512.run = "7b56e5ec0bd53a52d5a1630c618b7b4e2f01931da047dc8415d085dc954d4d984dd9461f10a1be99929db51a9ed32b3d5a09cd4a0bd0158c3e482c1585067ad2";
+  sha512.doc = "94680c5b2015d29df39455bd29d3cf8b979263657633f0dc8d61667238f0ca2e988a6cb63f173036cecc6d6c470915d812ddcb5e6814c50f863a3406324ebe5d";
   hasRunfiles = true;
   version = "0.04";
 };
 "exceltex" = {
-  sha512.run = "ba07d375df5cf350efee0ae903772f9b86b66dcdf1b6041c85624799b65ea2d24538a55f7aabe831bbc232b38a897a40f2157fa7f9200fa2976cc765b46f0182";
-  sha512.doc = "23e5670046a28b4cdfc3670f59b77b65e057fddb383f565e061f0f7d4b4257b0f84bf88e6bbe4cf69fc114f547e4246e68596532e70cba2b38507f18e48412c2";
+  sha512.run = "4175a2e4d9f5fbbcb441d9272ace24e567c0ec2cdac87f46b78058cec84ad4f1c8e62fe98d7ec20a8a528285129bb73187be40ca814de7f220997c5490404983";
+  sha512.doc = "f53a69468572e296c27665a86d81de4e66b780e8972c2520f35db37b54ff9dd9b1fb26355143008d0866c676e9fd3dd1cb256c00f5b24c696ad98c2a3a550003";
   hasRunfiles = true;
   version = "0.5.1";
 };
 "excludeonly" = {
   stripPrefix = 0;
-  sha512.run = "1dc2838b12cab19229491f718b08056e75dd0355729108f70dc9b6a7015206757dce45b7ca13a44722a4af0697c9aa7db20676c970aeae45f5056df153bd3e1f";
-  sha512.doc = "69c41e0af7409ff55846b3a0b6bdec2adcaae993bcd1d78037ee7b3f193550b21865c8918ae6d05e94ddb860eca291d03167ddb2e6d17a4535b1883b43095afd";
+  sha512.run = "09846074e61b5297945cd0f6968fd775eae9aa48b3e03af4829664601d5f41b7acd9f42db9f960a573d276a1bd68f837455651d3d31cebd4db56b6ef55ee06fb";
+  sha512.doc = "c1e8503b7a5ab87913b58184e61cab0329c6b39a38f0b4aad4c016aebfe41aebf775f0c68c9e18524cd2d4890416dce429e5185614ffe992c8c538661c3c1c32";
   hasRunfiles = true;
   version = "1.0";
 };
 "exercise" = {
   stripPrefix = 0;
-  sha512.run = "76140841a088aa68b4952cc6d7cd5c2ac8331b6e971093e2208abd59cb48fa03bc0feba08e852bcae781de100ecd87dbefdfc4d09c0c370b9c4370535b1f747e";
-  sha512.doc = "e0340a2ccd05925232030e583f944425d1d223ab854b56852847d0dab762d185ecc5fc1d88386ceed403735d1cb673d8442aab6dbc72a5b7f2524c4cbe1fb502";
-  sha512.source = "2d6d4af4beb9c5df0e67b1fd61b25cca02a69d9ed364c9d1705b1843b6d7f604fa4d5e9355ad9e3d58043c57616a58440c067de2ce238f8746505d17747ab84a";
+  sha512.run = "adcb9044d1763933d07d2c52f718d6a63b7f4b361cf0565bbbdf6242c319f2fb589df02c8548cc3d6ecc04660b5a832c46377966dd31f1f15c70adb431f5dcd4";
+  sha512.doc = "36ae9e179a3835e18ecd7f512a1708f3f70a6eb8df762a8bd6578b466972b2f7ed9a2404338dcaaf9a9cc535b7dd8550cbd69c53e5bb4c03ec765af94553bd75";
+  sha512.source = "d13b9f9ecc692459d86d7ce4ea1eef12bf84de86a86f10334adfb52215d7d768cfa75720aac24fb927c0f1f5d38353ea66a4a07c10ff86b8bbf8dc8200fffe85";
   hasRunfiles = true;
   version = "1.6";
 };
+"exercisebank" = {
+  stripPrefix = 0;
+  sha512.run = "917cbbc062f2f2cfdeb66d80e1e861f0d6fcb243322cdb242e81f83ea2e768c4c32a852a4b8404a26ea152b94bf1b98d5f6f64d290cf50985e0a78498b6c9801";
+  sha512.doc = "46e31482677668e627bd7b40365088e71628195fb3324587b2b7e92000cba95a6cef0f52e82ae39f90ff28d79974c310d3055fd13876ee1c90f0f04f292f2aa8";
+  hasRunfiles = true;
+  version = "0.2.0";
+};
 "exercises" = {
   stripPrefix = 0;
-  sha512.run = "d65e49284fbaad1996887bdadaccfeaba3741f41a04f432ffa94e8ae27fe8a45a0de5851356327bdc5e33ebf8315112dd16b2363a4bab07a03f858ac6fd147a4";
-  sha512.doc = "483e82f1701f0b945caf7ab111a31a874c0c0706800f48f964efd87bbff8a3bd12e8b2fc8a17b3f5120d699d366b023fa9aa3de575d14a8477f09308ad086aec";
-  sha512.source = "dae7f3c3921c4f8268e7db88e7f0432ccb270e72d7604fa3b33a9d50114c3076a8f6286138ad1072ab6aa06b978fda335ffa6db3f8f9127cf89b14fa4644c12c";
+  sha512.run = "e61c9c18906ba8a36a3025e56e89799f9b0ed458bacbbcdb03c024ee86d7723bcf7d6a89a0f7e123cf2e24f7fc17875f9e76e00b669af17385e474aa60f8fdad";
+  sha512.doc = "83cdd2604acec5f48afcc7f2c7533a9bd783219cb379fcef43f9e9237820d939e498e7e1beda8f73b93ac78b2fbfff61702e0c660547c0393cd8d62388b1249b";
+  sha512.source = "40c83ce9ab410e23765ad71ed3601a8610c1528872c0494ba418c253b9ad985a53c4168cf48a82b6d89fb3e07a632e78694cacd961fe88160b340593bf8618ef";
   hasRunfiles = true;
   version = "1.0";
 };
 "exp-testopt" = {
   stripPrefix = 0;
-  sha512.run = "8582673cbf181b93e868cd36266331eaf03df2c766d1b2eea0ecaf69fbc3529a5f34ef4a71c4f06b6a01672638d2613cc56d6630974e1295a812de29a65b2cf0";
-  sha512.doc = "713daa96d84f83605e210c298af3224093f5d758a9cee48bcf2746e34ad5b929e41822a1ff59e22262b1df4e4da4b4e8fa24aa7c4d814678d2c2f6aed00888cf";
-  sha512.source = "402fc1bd581c3535ea527ac33c8dde0fc5cb554401c826373d9b25a2aae6f445eedc689ed00571380fbef3c301a0c460f693f064af846bf25e7117b795a1dbea";
+  sha512.run = "cf6c61e036488ae1f273f474cde7c54b91427db8d73e96dc39f6b3951df04cee1c039f40b52fe2918834422de6f28637498d127b3449d39141f001a7bcb79f34";
+  sha512.doc = "3839178742aa9a1fd3c4fb61a23044404bd8d5d9f4132831a3d7bbb020a75e13444070fa0b33881cc06a529a3661a50822e1ef6f5cbe21b58610eb3475715b45";
+  sha512.source = "f58044277a2abfc0b51bf3140fcc18fa5d2e826c566ff1e7faecf1c8c7279e416986429e7ed139b4f29e75122a0777d5798c361b8ebe1a003e7c933c460a1327";
   hasRunfiles = true;
   version = "0.3";
 };
 "expdlist" = {
   stripPrefix = 0;
-  sha512.run = "f161451c2e59eaf28743f09311a5794ceb9e9e294e82288f96bda131fa793cd0baf7530c1fff169ce17bd40e377c5616a85c8dc9c73c184a2197f2a8d447de9a";
-  sha512.doc = "a18e36bc7b0491b1f27ef27e0668b1cf707a3a287c2c6e9ac2ba8d62b7d64e19d0053c9ed024ca7050e0ad5685cdbd00b25f4ca89cf93b60f17d23c40bc2d7f1";
-  sha512.source = "c73cd4df2e9a3c3576fb2d65890fc9b6426029a90796f016c40af614b40e618fc603851daefda001bd692f07744de3fa19c0cbca92b47794d23456e593f81fbf";
+  sha512.run = "005fe946714ffd88815d80f1bf92c85a2607f8216e8635a284e5332d1efd600d24e6a3f235edb5897d102f9c4005500c3aed1b92254d49404405eecea78114b7";
+  sha512.doc = "2ad7d8daf09012dc95ac92134f8874c21b25f088697e13a7840806bfef80aab4c13ff16acbfd7bde1f6e476b510188fbda0dfce36f3407baef607c5235128498";
+  sha512.source = "a83bc009fc732444d2f79b4650ad9f0edea3bcfaee7130678c203761f461d268798a597fbea1c73ac5d667b868236df08ab614b59b6c938c8882749fa1bc7492";
   hasRunfiles = true;
   version = "2.4";
 };
 "expex" = {
   stripPrefix = 0;
-  sha512.run = "90c6b5eea3f73451bf473afb3998734be4881f27a3d630416894a6f70e54246604125f435f6670c63a5c191e55f1739d3e1d14222c9a9e1c0754e72753d7e3af";
-  sha512.doc = "a19b0b4a5472520c3738679f745aec78d1e20b09c0a535fb5b333bddcd7bba4c9eeae8372f45ebcf1c29ea62a4f8579020f08722fd2186d6910b64100c42b0f7";
+  sha512.run = "39b77a5135445ee2d23d42ead06e9624c2127a8ab7295062793df9d3a5e6f81647b5ec822e4c2acf572e08b8d474131ee8ad45d0bf061bc5aa6cad6253475163";
+  sha512.doc = "837a068cf5a70256e64c722263edf1568f5cd507b96420db51e85a0cf8c7743ca1497a56520872db828547b808194c971a7480f54d292c82aedf76788ebcbc2d";
   hasRunfiles = true;
   version = "5.1b";
 };
 "export" = {
   stripPrefix = 0;
-  sha512.run = "d8baaa2aeff62f29b09e70978d108fb01109fb388aea2d3812ffc84bd0c9eabadafa86a855196fa8aad8d285d2ce06ce5b9f8d38c98f82eda72c70191959d324";
-  sha512.doc = "49d805277234fa3a77a95053a2f0bc60d8b7ae812d4e6e3900cf1342f3dd23e8d25b557cbc4e4b989e7ab5952f6777fd44d3bdfb9f8a13cf5c9d539e825fbb89";
-  sha512.source = "a55e80ef71460729a0bac56a285718345e1a446bdcf430b1c7f67960879b0c5aaf7b45f3a2b81de07f611a0e356f319c34e158cb5f23f694fd30c140769b5904";
+  sha512.run = "3df119bb2d68bc3a8ed26efedf16758d188eedbd0cf1708e15b729768e709f75e13ad739f2e6a4436359d49f54f172d4b556bd2a8a1c663412e25050379a44f7";
+  sha512.doc = "ae3b76ce879260e019fd41f3d778e3290304f9d7db1dc83f612adbde59174461006f5c1384375914cae3808fcf6ada79610208a4021b7787975239ea8c418deb";
+  sha512.source = "ecd92735ed51c56e860fb80dc1ac02acdae5d9e34d949a332855429419e9d5ce86cd81c47a092636e0888bfc214549e3b23948940ac0df834108fdb83fdc9bb5";
   hasRunfiles = true;
   version = "1.8";
 };
 "expressg" = {
   stripPrefix = 0;
-  sha512.run = "7317f0148e5ebbdb8653220cc10045ab228c60188e99c8f9ce2c4582b4f2df9d1da9c18b50b86db66acd144d86c61ea1f8f837e248a187eb30a98e7445fb8a02";
-  sha512.doc = "4395ea2f6eccabfb48e9c55a1b9969f5bc2284718b703c3e99dd9cc172b39690fc49946b5b3afa1876eea1017dd2485fd9ab13045d776ea67fbecc7280bdb231";
-  sha512.source = "4b486c58e3679538a985e52ad1cfbb604929fd7c2463b198f51a198c87d697b08687d7a6a0cc64787701c683d8c44834b30469008d93b910c032dc54fe0489fb";
+  sha512.run = "3175a35fddb3bc5f6e59e8c2d01a9a301689c9bb1f066af079d36158834797f35a5fe4b40d545b3e45723ac27783dbe4f8ad0e9527f73cdf9ffc3d942866e592";
+  sha512.doc = "7ae382eddb9a54ad9f812fa7d3d2d79fb1fa00aabd92b2c4f2003d8dfff27fdaea9625cbf4bbbc417e6183e8e4747476fc846bbc6f4cd9310705bfdcf2dc06da";
+  sha512.source = "e654e012782e06af9b88560e3cffc0c0d784bc570dd9dea4485db23867e03e49749b9a78b6793cf0854144c447da456b6263ab6ee37ebff6fa00c80b8bf7b473";
   hasRunfiles = true;
   version = "1.5";
 };
 "exsheets" = {
   stripPrefix = 0;
-  sha512.run = "b6c3ed8001298b665cb476afc4b39900562fa53011296f77072f2370a3a122cb90ac84afc252d8655ffb67f0d9254f4d9fcd197b644b2caf91591826c82adb63";
-  sha512.doc = "da979970bae1a3e0ef2e4243aa3cdad3b01ddce123216f566729ea7a4e1bfab2d600fb543e603cbddf6a9081292feac8bc5fb205fff529a1911d47acd59b2ff3";
+  sha512.run = "f45b35d31e4d777c06ae3b4c4e550a498137eb0b7231bbc9b521fe383cd8cf80f9069b394761b96376e31ef8ea2feb664d87921f121be4b684d14c06f86c4ff6";
+  sha512.doc = "eb7a7a80d3b947ae05394aa96c55b800fa229b809dee7494d99fca8b67a111a8d08a2e5b46aa289c18a2fb0e5c8774383bfaf2300e8746d39a5e805f727a2afb";
   hasRunfiles = true;
   version = "0.21i";
 };
 "exsol" = {
   stripPrefix = 0;
-  sha512.run = "88e6d14dc081825235442b2699c6fc261da96f97c678d352e36a6e582818d88e6c69ec0ad19ec2a3a7690e6ac302d5b105ee139aea67ee988a819a18fbae1e35";
-  sha512.doc = "ba10e4b83c5374b0d0e016d8f0b3b3b701bb3e8604176c66620377501e5f634e7f00008409a8ca6fe944e884574f7ae080ce3e9d3580cf47a658eb1449b88111";
-  sha512.source = "f6389b5970573f6b51d6386a59c672f821e53cb30a6e4a3c39b9095501c8eed2d42389f5fc2571525c807f071f8b450ef7647b8720f0f3a35368ce5ae63a2bb6";
+  sha512.run = "33e99c0d1336f8e2f4182473af79868d3343bba9e2c2b9917a5d928ae6ed3701b2d5d7608821b2fd09b26f47bde93f5a5e3f29dd6c2c0b206b9e343363fd31a2";
+  sha512.doc = "19d91325e10612c161aad4b6fbfca77bded57eb69a6d4b1abb053d5b7ed352da100ba7ca4e095752a7fc57e495e1768738dd585a7bc2ff0148b131e9423e3308";
+  sha512.source = "85ca20774d21f75fc7521193b2f467adaccbfd6b08a50b55f583494dfa64106b1f818ab7d69d9e27310f86601dcd0928aba0edd2348a324ec2c21f0413acea84";
   hasRunfiles = true;
   version = "1.2";
 };
 "extarrows" = {
   stripPrefix = 0;
-  sha512.run = "c43e1ee79fb03bda0097678b6fedd6bc006c6f4bb4fdd7a9954934e0c4da288aff0583f9c12c16133d3daa99e132260ac0a2ee1945b617e4077426b6cbd7e35e";
-  sha512.doc = "7b25392720a6c85bb05d25ef4fa74124d7137fdf9717beb13192d7c534a4e17f67a541acf4191d3a9530d1540ffac5a8393524fa8eae177ca038a1f0a1779021";
+  sha512.run = "52264fc10f2f78f1455c2691673b890b5fd7167ffba1adf0572e640f7db537b79a0ebb4582d5eb42261e97b7d0bee2e86134d652404dc393b9854c19c5d9ef7d";
+  sha512.doc = "13ee4cb016f65dec37cdcc7b2b92bb22e6d1cfd7e6762694cf58d029017b8efaebe6bb5d4fabafdbbfaaa38b6c251483361b7246b241509252cb2f166b5b13d7";
   hasRunfiles = true;
   version = "1.0b";
 };
 "exteps" = {
   stripPrefix = 0;
-  sha512.run = "27a84d86bd883b3e912a8554ac22991109b477ee9196ad2d63f0ba667f2e07de185fb4a06658250f0e195e95cfeb1dfe251c7c61210d4e8f14d01a2fe3491997";
-  sha512.doc = "85189427bdd1085f35659af197a0014d4026986d88a45003c9660ea01053e28089e201254bc2d360a894069083e860271746e3a71febc9dbc5adff6a3148dae6";
+  sha512.run = "8347bab209d794059ef0e9377fcc8702ea69214b715a334a7401436b868dca176f1bf042afbfe17a34b89d2ce8fd238d0f068a262eb005e2913115b6e049ec2b";
+  sha512.doc = "354647b3ee8ef0af7846af314afeeddee200c7a6b3bc3eeed1aa37d2983db778943d1841f7ba2c248b3c87eee64557e7f24dbb50299f178dc81409d9852dcac0";
   hasRunfiles = true;
   version = "0.41";
 };
 "extpfeil" = {
   stripPrefix = 0;
-  sha512.run = "08cd37d649a5cdbecc0867a830357348eec6e9d4026e76defdf07ddab58d7d4e3e98602d7657abf3fbb82d2f2cd2a92d565d62eb2999007cd43f9ae7604bd4e1";
-  sha512.doc = "b02eb633033a110ba6d359064eda80d3d93681cd7861128e6e1eb4b6dd5009b7c18cc5deb1fe17b0610021d3b235cba04d7beb8a3aee363f3d2c7c27ca2fb32c";
-  sha512.source = "8115467a914cfea6bc9ad95fa2c17f9c29481656bcca7dee537979d82687d9f2d45727b8ce979a740fcdadc7608ed9765240b359b644399e2fb8a16cfb6ed0d5";
+  sha512.run = "081e4f9ed814d9c8d8e9e28640ea1e8d19dae3bc6184abf7447371ff63fed5e75b45d92ce1c6129b169c689e108d4d33e09bdbefd8222428f94f976f98048649";
+  sha512.doc = "3d055cdd8e83f5377b18825da05fe348b3fae1db2fbd8aff29e417e991a682f56986cd99d9b372048a4301b3b015b52aabf6f7cf67949b47a0b66c5c6fb50609";
+  sha512.source = "f5fcbabe85a4c1eb184483d9907a3c2a73b4fe80d00ef616a9cc27742418a06e671fda1ab3e3f6eb3da48fde327f847cc59797fd0a8fd228840769f4afa44d3e";
   hasRunfiles = true;
   version = "0.4";
 };
 "extract" = {
   stripPrefix = 0;
-  sha512.run = "ab58d4bc31d136b9bbd4ce8d198b9d19ea88b32acfcad55e0d5162a9cb73f91052094391040f16b7c42488bc621beab1895a6bf9cdedb0321a07b3cee4835383";
-  sha512.doc = "e2ad26b2aa12df0b4c12cf68319d97825d89b2afe3aa73c6034e3acc3e6f4883d063cc86fc3c0185bc16df846e91de89f59f3b70a67db949f33b3d73d90b5d77";
-  sha512.source = "118695af01f7202bf3f5d089c97d7ccd801041b9823081f21e0636afc0a5c27d5632c02df7a33d68e67e57aeb6e4ca50fd840230ab0c1c4b19b39570ae8f0fa2";
+  sha512.run = "7fbe5537188930eac068e7c8989de4c978964e39274c3f6e2f4f8598eeb4e6024ac130643594089c5f69e21bd3118d9e6624c4cde8c85b130b23ae6d7a0a5a55";
+  sha512.doc = "ca18f79413c3ce9b9be09373fd37dce6d2b55976e3fab30b3bc7931d3e6a5e55d065e4f6488bece046745911da2af0e6d30d6e0b9089554c4bfbe118a897ece0";
+  sha512.source = "b51bb86f90dec89242078c34bd33968f37f97b7579d168b6ce2f609c20fbd77cc5ca6ac373d5cd3ac30a72e744b01282e77a3d3ff08c2727de29ece8c6b4d91c";
   hasRunfiles = true;
   version = "1.8";
 };
 "extsizes" = {
   stripPrefix = 0;
-  sha512.run = "e9cddfa87b67033004e96ffaf182c6237775a2c0f08437d39c501041affa91a7b18e36100bac036871705c2908ecb520a132685abe4ac4d4789fe880dc45bea1";
-  sha512.doc = "910de0f6f990f7ad769f51cfcaf4215485fe69816b61295805d3375cba4bbb0182ec5f0850c0ac34ca5611e2894da09465e63efd1a56dc913c1449c9e374ef0f";
+  sha512.run = "4eda9c64a6086a2eb7b8de546096bc2e5e00c9575b4ad89900481a99b4e5ed42a3941444a79337b26646c7e69811fc9b53f64d408609e79ec648c1e31b13450b";
+  sha512.doc = "8e0489226942ea45e916dff3a0062d1588d322708f1dc416438f8f6ddfb89dfbcb4dfda415fe868848a048c4be15b1535624058ba3a2932c880c6d429a6a127f";
   hasRunfiles = true;
   version = "1.4a";
 };
 "facsimile" = {
   stripPrefix = 0;
-  sha512.run = "fc15e5bea58e991ed2d56a7cf8e894605d11426bf9eef9a84bfc409fd58710a527cf5db2b0690aa4cd2ee60227fda55c59fc7689381c20d209732f20c1b8b7aa";
-  sha512.doc = "2e28767e952611c803ab62e4b43cae2f845fcb4e1cbae788e913a880ffd5637d4b4c6d072281cd664e2bff4a671339bafa95f6ad02f1f1cddda68b5cf2122959";
-  sha512.source = "f04bc97ee472b0a08433eb0e095c28513174dcdfe2316f489cabba28079411bb9c8a496742604d5799d8c3fd0209b535d5229150773b466db392397d566820a9";
+  sha512.run = "7ce1d861c3562369771b2008421e36835729245a907a0bd5e5d92e2a816416f89fb1f270bef356491db0c2489984c8984bd45a91c28e278e56bd253f1ff04b68";
+  sha512.doc = "e5f003df30a6ba2aa15a6a878fc51edf4250b441f3acfce7930aa4e983101dbbd0fddc75a00e0c694a007383f24becbc3d2372743b849b3eac71f568406e0fbf";
+  sha512.source = "4374b1c8f76123a69f2360c2037a0c1ea711fdbbdeac13b0c18840e7633e5a49a450393cfa3e294e55864ced0d2d0c34a07bb76959d630c3576d6b8a1d4b0191";
   hasRunfiles = true;
   version = "1.0";
 };
 "factura" = {
   stripPrefix = 0;
-  sha512.run = "6e6498da73be15af2b3adaef8465debff6d4ce20d51245c67f82ac3ab6b4b5ddc47f0cec74c3bd63f8cc4dba515a0dc0b4f2408aba959344bac4905e4ad613b6";
-  sha512.doc = "29984acf63cf93382fb554cc8a21e0a611552a17e418a6a211723803a6d91aef3228c7a4df8451ccede56c4fac5d0c990d9f347ba22e9837d279f6b264923025";
-  sha512.source = "10aa58ca5501437bd8221f1c985cde776059950c47dbe66c20883ba11c83127d75750d6524dae1ace3af322c13249bf00cc637f4ff4770f8b3e7d407d70e7f7e";
+  sha512.run = "f9ac35ff37b156b76f940f31ee68642ae28b276afd424c324d4b386cf6fbbf4f0115cbdcf03667c5e9a186a3b7cb9d4693fb4d8c1a90ea53f81f2a5ad80f9f49";
+  sha512.doc = "0ae6bee674dce3b651b9abbd124fd7d45196d24b9371291f7bae6cbb745099596abd02d58b4cc7341d8155c64faea1288113fd97a97550865d864c5ccb63f5d9";
+  sha512.source = "f5ddc8449fd8fd8cc3c5fe050e1ceda817ad64ed836365821b69c71705a4b87e312e414eb94b07e31beba0b6e08a2ed64d4c1923303ae037893dca3f05f3e214";
   hasRunfiles = true;
-  version = "3.40";
+  version = "3.57";
 };
 "facture" = {
   stripPrefix = 0;
-  sha512.run = "0c693a03d03cf15503942008505b0a2d48819ad59a6b39fb5b6b1ffc600dcfb4d5b1b37d2c29f4b9eb3c6e09258eb2630c7b0f798a1a88d60c11cc7e745aac94";
-  sha512.doc = "df4a4bd55c9706adeba8696ff825cdbd38cd5c2cc8bde21969d6296b4f602e9559be252967f0953af139695e15e47d2308f3abe22320c90475f53b0958071928";
-  sha512.source = "27da89521c978f70323c3520989e75e8a6b7ccb290b41a4b6acca8c6ee583430f95264d540f0cdf0349b6e1c706e1406f7e22cf65dc169c6780e01e60f580210";
+  sha512.run = "38191fc9bd763b377ff57ff415f94ee3e21faccca851fc88f46ea5093dba0ce5b4640c5c9d7335f979395c6becbcd88f753ead58cf7a0dac73ceb24f22f0ff3f";
+  sha512.doc = "995c9cbc559df6f6adabd1b46d22d92467c24fb2d2577823b7a5f839be11c508141c3a29350ab7fa138fdd162a2d8c02dec94b6a4dfc013a229723ca855e77d3";
+  sha512.source = "e8b599ccc78b111d7dffcfc8970387b1dad1ba54ed219076b9e10da583a058cf49bf370c10b17a4c09b1c11109e5c055b33c7ab0596a5013b73513947381c7db";
   hasRunfiles = true;
   version = "1.2.2";
 };
 "faktor" = {
   stripPrefix = 0;
-  sha512.run = "f39fcf2d87224c0b0449793a6eb81a302904c271f6d7ce7a582e3e592fdbf4b81eb8712000c67f5fad544ccd48f3f003e4f6be82e9ee7d78d23c9ff437b9fb05";
-  sha512.doc = "bc5307d21dd40ac2e01250e2654042896f0b61559be7c1754ae82059e66297ed547ba304fa108412a6813d659ad51458401e4ed551691fd95f77496877cd65ab";
-  sha512.source = "36819c0580e207c0074daae1332cdccff8bb3e8aae364c52724871b4e6c31072badcba48a7494fb5bdca08301dd1adc680b2655d3dd86a746aadedf503c9dc44";
+  sha512.run = "4f9590b54008fa7646664dff5b7b711a7d91d87535798726abb49a3d241d30508bc7c3028cb615f277fed8dd1d613cf3503d0efbea61c4a1579b09c9ae576511";
+  sha512.doc = "207020f973a717150ca96c6fc0459c3abff43761e9cd541f86db4771eab08a1b117658c93299cd63af11448e3d040124a71d1620edf9950a460e265cb871fd9c";
+  sha512.source = "ef21eea80a13249cdf2057b35138ef5992b7e91ad1705a294178adea420921dc56b88b32fb480784904781a88295a0d11d63f973106ef1e4b153e10a0130237e";
   hasRunfiles = true;
   version = "0.1b";
 };
 "fancybox" = {
   stripPrefix = 0;
-  sha512.run = "9e2568f2ed6d912db920e5a79023922db5f51e069c83d09588b7e763a04e1bc60797ef32c1bb92281b2427d6c1c57354c440f5a26ba9ed242c06501d470846c4";
-  sha512.doc = "24ee1be49291ffc4806fb5913eff69e8c880a7bb9b2edebc07044c50bfd45b8118186f34f60c41d7fdb18d6c6499db935a93e56dc03521af28b01c38438a9c75";
+  sha512.run = "cf5d223e392151fa71b831510e6217c9409e43700a47522e142f21d5403f38a1fae59fcf594a4622b91c75cb54c2cc9b61094cae97fa3f8d21c6f492a8a94c26";
+  sha512.doc = "39970283af4bd1e87a94c89438260b6de07a7c5fc2eed07361c3c566c73b94b087dc58396870d1afc7f9f8ebdcddaf43f4ab97f76553cbe2e1d89f7d259ae978";
   hasRunfiles = true;
   version = "1.4";
 };
 "fancyhandout" = {
   stripPrefix = 0;
-  sha512.run = "19b289b43c88f5ca5a337ee37ad55b8d04a96598a25486e583b05164baf5253ff9f6af73f27105f3e2075215061c083f19c0da151b04ac7f95ee8e70beb0fdc5";
-  sha512.doc = "1988ab58a212683af58163a5a2914c8c39ec69121ba2ab17cefceb04203d4441126b46693d3072f468324025e368a6202d4caf858f278c02473d1903c98d22c5";
+  sha512.run = "e51de612fe1e1bd8f266941952c24b10bc404d075c39119c5506623f763f98bfcf8d30d01edb17f7a63b14adb85ae9b5f48c0e97edc5288355fb4fcd67d3bc31";
+  sha512.doc = "c49a4ae58599939d55c1adf2baa2d8438649484de07f7060ce76780b032accc95f655323e1f9fd9dbfd9423ee63a8160d9c9d5c9913efd7c569536fe9268b50f";
   hasRunfiles = true;
 };
 "fancyhdr" = {
   stripPrefix = 0;
-  sha512.run = "fbb979ec5136e80de13289e2eb6e45f4ce37cf2d7d8b62171b3d87f49c5afe187547a66ccd107d80451c98479b52cec7b794a3a696aa6809b20acfd84033a927";
-  sha512.doc = "0b15d9b4b2501a247a2b35bfce6ef37e972d884c0ef7029d940e338fffd308ae544a735afc2befa94537b128e4de6fad5aeef278ad15d6e8f5289eaf136d222f";
+  sha512.run = "065139f8347fa49c973c46b0853b257f551ef5ac80b19e7feab726cce583d34fcaef279615e097b34c31cd04e85ef677adb300299a2dee13b93395e59e55bd23";
+  sha512.doc = "cf97543a5e43315a8e58c69b76b65b5449993948f9d72231134f80f477d30aca01b32b290023bdf45b64d0e18b459aad4e40d801919e5761052b81e81a9f7863";
   hasRunfiles = true;
   version = "3.9a";
 };
 "fancyhdr-it" = {
   stripPrefix = 0;
-  sha512.run = "fa78d0f7003f8d451c7a5dbf28a235db1d2b58223a8f231381dbe27171c96ba3b72b83b530bb17f3364b08c74cd80e15eff05e67c1b13b82f7a509d2aa94875c";
-  sha512.doc = "4b91c678834782e813f66125284e0fe7bd031ce329feb57dd8fd74b48ab5f13403bfb802ef627409facd5d28887c8facec7bfd734b89b65191c62d0080ca5d9a";
+  sha512.run = "cf68d833f9422cc5b9aa1f5c62e84e098dacb005f1799ab90cdf3397dd9afed06c77b89d9017946922385ee2c65528e09585f9cb8277e328f204fccf6113b104";
+  sha512.doc = "0a3540263b9b6ae4a65a0cf9d2c24117e5744616b5c4d8a4cdf417ebecbc489b8dd944637360dfdcc93d56f4882fd7abb4226469b0ff0d2073d6f2168a42216d";
 };
 "fancylabel" = {
   stripPrefix = 0;
-  sha512.run = "4152b73a236d6543c5d305db5547fb965548fe05ea8df1f27f4107585fd3948281eb078700c99e1e0d80e45119e48370cf01a5a36d8b2861b90650e48551f9e3";
-  sha512.doc = "30f4836c91d8d4bb559064449dbb225757e1f0391c03aa4fc5298059c935ccc59d8569db3487c4e63742c0bc51840ad01ada9809c49fc3c91b6b1b190f3cac51";
-  sha512.source = "cf44d6f13562b67faf758b4506fea35e835e212c4d5aa12ac70039b8fb6a751f8be491d35f5449ccf2f804a038fd58d988021f13b293ca54419d2612e204e039";
+  sha512.run = "3e16ed1347eafdf3317999221e238b46e42d35003cfbdb0ebff877ee95f9c0d663971842767409ff21db2b9b1c8fd43cd96dfa6deb346a43ae758d25741a41a3";
+  sha512.doc = "de3e8cfd4e49de20228355b36c7abea945b0e0b5b1526327aa101b5cfbce2333b6e5bf85961142dae05ef2af95b06722c4e322b7349c2fd6e652d8c11109f062";
+  sha512.source = "9ca32782079ae1b508c10fbf45b12d55f08ae22ce0a2644069a17392d90083e81b9dd4287fbce240bdb14a3706b6c3aab46f11d30bb53e272c5808d52ab01802";
   hasRunfiles = true;
   version = "1.1";
 };
 "fancynum" = {
   stripPrefix = 0;
-  sha512.run = "e0c0dc5c85ad4978f799b6508e31221b43923b58d7109c44fb6b51436e67c24d41b1a14102db2fde92dff3988ae1281d18ff9a456cc3fac88e837676582c007e";
-  sha512.doc = "21c700bb4e38a64cb579796bf6317129a53354ab9923a9b53729cbdfc278417ee7791a6f880a4c8c5e959e84e87fd5babe92f9386aed591bb3bd0110e3033806";
-  sha512.source = "d592f1db25ebbd3fe0cee622f5e20433239781b07732c01390942e566ca31402191302728a77472aefd5d302e8136b03bf5f60290d3d69df4b8d9a083df63d1f";
+  sha512.run = "fbfd9952fa59633c42337185521ef1bf28b38ca3f6af5485b47754e7bafd26f8199a87cde265913449f5a4696af5a7d38576054d4706cd7724500c246a1f08cf";
+  sha512.doc = "dc544d6b5258a99e42ccacdb6e32469193848300786e7666b1e14509a12c4e5c9e78d8f96dce388025dafd93d6edac2a4aded246528b3916b154ae43e90e1101";
+  sha512.source = "59c7b1732908463d413dce66f2e29fd6993e2adbef5c9da1b4b489aba03fc87d61e86e2245a8fcefe8bed56143b7398605f60ee2423698ebe654a2c5c9534e5b";
   hasRunfiles = true;
   version = "0.92";
 };
 "fancypar" = {
   stripPrefix = 0;
-  sha512.run = "66f01bfa4f1700581fd42114329153687ee5867a904597bf27f3af5c62e37b640f413a51af1983ea39929adedb1cddf86d449215757dc0003b82fb7592c21a79";
-  sha512.doc = "a01d11ffad07aec5a40176d6bd5425d98230de0df06fb21524c15e8342a2b606b23cd1c19b5de8740844f046c02f7dc7c34be4bf5107ff2f205b6d6e7e3d165f";
-  sha512.source = "889389aefa10146489daf0d3de0aa161c0f0f748cc1722356e586eb02fdf84dd2fd4a9a2cf04d1291b9f39ce1dfad83d95c63665a437e7b0250cd789f0dbea0d";
+  sha512.run = "233c3cf9e683c522a8295eb08e96e43f92f067e44b8a60f968e807a8065906b47fc3e1fde95cc633633cde6563456eb9a29ab3d6e832601c45260d415bc66cb0";
+  sha512.doc = "72495d011fd813e5ff7efd428c031b4d6483c005720fb9ad0ff8742f7542bf95bfc26307cafe782deae18340aa71bb24eb8f4c6367a2f860e80c96f21a07467b";
+  sha512.source = "ac7548a9f80b989b98c0459af011bbb0b2a6d563323b36ba1b9ff66d5a2a9d77f2017e92f72c0c3d0a6d7e7f9845c8d8302cb0f934b358f85b02df2afb87b99a";
   hasRunfiles = true;
   version = "1.1";
 };
 "fancyref" = {
   stripPrefix = 0;
-  sha512.run = "1cf0c8587d9e7ba7648ecadaa089c186ff31d2f6d1f78c28de53db2f5738dac0a811a187b6c9b1d18ba3e79f21e7f214e6cb35ecd164bc8de39dc831d79aba92";
-  sha512.doc = "b6672e8ba718e0f0aa78ba4d53e0dbb46caf51f7b9d7558d541acbfdd22751fc04b4e0d92aaa5038d157a2e4a2314e3b582cf5bfeda5299e70e21d5671379de5";
-  sha512.source = "ad1269959246547251d5344314e44f934e68d7085f5643320e9d14dfe01e19213b8468c7d47ea4acace086d275de4d73b322bcbc0e8e2ac8561aaac5f7509f82";
+  sha512.run = "fa29fcdc7b7cbe335df3c5cf235728a1b720f6cc559c8586a5baa4631ed8d3b74890e93789687268b788fa2fe37fb9d1eca61c834ae95215e9fe0251c82d0ecc";
+  sha512.doc = "6d1055a9ced2272b074d3921d073a81655ea46d6fbad03ade5487979d9e956b8d06e1aa89665e806ce6ea9b4f6511b6cd633230b8be77fa0b2a44c3d903afa68";
+  sha512.source = "d6f6aac983bb319b6b14ea0c7bd1e2ce4afead61d94444549dc9e991d78373204f0f9adebbda069749472dcad6801c56b947a40417b44aa9a8b82c6cff429f42";
   hasRunfiles = true;
   version = "0.9c";
 };
 "fancyslides" = {
   stripPrefix = 0;
-  sha512.run = "3991a2412a1d847ae392f4177dd378013dd7fe9e55f59ee9bf343516076bec73698004276c1d9d01f32648afe7e0d7a363f720a0a4e19622c9bfafbec74c526f";
-  sha512.doc = "1e6bee86b7af6b0f3da83992a9cfd8f063585c72593eff2f8f9d421b9d529ad5a95fa1656036bfacf8487b3dbf2c54333eb1a665a169cc9a5cfb8623df91520b";
+  sha512.run = "a70749962778866e1cf76c1ef60eb8fe97597007163719f5c441cdd0ef00e73322ba1442a4ced0fe04cf076b5c9e2167cbe160405b470c5b429e2848e0d2ba33";
+  sha512.doc = "630b9c9ad27de354fb963a60f4edd8d4d1739887445097bcce11d6769994bc3ddaf2141e3b792927efa1920b2de2b64fe0ad3835b5b229ce37e0828619dd7ebc";
   hasRunfiles = true;
   version = "1.0";
 };
 "fancytabs" = {
   stripPrefix = 0;
-  sha512.run = "23c10b6afc2d4733930c3b82832f7108010af84f54f53e844aac060c415d40679cbbefdf42750c6cdcedc69d5c510b7b6d8a9b92daf1e945faa76ff5485e1054";
-  sha512.doc = "b3ac96a7e40248b79f8e5b77e27015d9348b5279c5061c81c1af1625013b03ec3bbc1b714c370c41d113d94132e93c193c39155790e5ab109b74e816494533f0";
-  sha512.source = "60cebc9d236c7cab7dc9e6d4853c31b2ef2fabb657ca9b72f8f7015e5472457786c257f688a058ad456f29232acd5fe7cb7778fdeb153b6ef4de7a9d826b221f";
+  sha512.run = "ccda127c0d59d6200521922ba226a3f2602ef1186cdaeb1764398e3f5c742ccc3c3a628539e4125bbdc81a95c030f10430fcae930b1a7cd512c8ca4ecdf52b33";
+  sha512.doc = "f3f383377aaa5a89db6dc5f982cddd1c575176b669312244a1f17c36dfcd4b9dcc3f4d1eb206c38916251fefeaf01fb1ab1a35f9478346427da8f2ac225811a4";
+  sha512.source = "3d6660bdf9f74ddc67339e81f246627d1f4eb43f74c84cd76a9cd2b4a4859be487229185862dee2394309e6e028150a2e6eedeab9efc185afdbc10986f135940";
   hasRunfiles = true;
   version = "1.9";
 };
 "fancytooltips" = {
   stripPrefix = 0;
-  sha512.run = "448c68944d389bc0eeb5ae8347dd77ac0603281150b4783de7a65d17bd38f17fff7619ba0d548c5baa21367e8ad26a205ef0d4691ffce772d81d11987a494a57";
-  sha512.doc = "b8bd34a1066a9aa607d866fdb79a47dc2834e7dbebd6d3b1c3d9e76dd6b7b5cfb0a7cfd89d13922b15211f82af8eb9760fc0f030fa32ac322fb4e395a8941fbb";
-  sha512.source = "47445e5da72a6ef25c2041df0a163cc699740fe0964187a9543752b9fbebe84cb8a14aa205f3e265ab3b87d7b3d7f81862621b8a00bdb2b01dca5810bc161f05";
+  sha512.run = "2ed53370e3162f678f1b606d4f018927b3514455b6804e97f01a8604ee738cbc07f23e8d8f50b27df7e670ccd3866878d3abae5f495f939890da484243bec028";
+  sha512.doc = "5e9992dc312c8d0360ae8af789295ae5f2e3c81e4375ebd39d478e2e6d3b7e6776190308a2c3bdfafbf61cbf188e9135433b4b1019d625a1005658cb4ae4f28d";
+  sha512.source = "87cfeed78f6935fc9ce2be9344e48b95c96d8388a3fe45d5c608aaf9354ce6241aed1f85dc5a8be43191ef3c40286fd2d98799e4b703eefcf6f3e3d51eed2f60";
   hasRunfiles = true;
   version = "1.8";
 };
 "fancyvrb" = {
   stripPrefix = 0;
-  sha512.run = "bd96399219b8f4f3a699931dce431f343fe195edf6620669f7bd20811e530602287363da1032958d4bf8ed2632f1bca9fb406b9a992ab3c9ef1fcd45629490e4";
-  sha512.doc = "9b5b420812997dcd4fc1eca8c8f07270266d62e10f48fd9853bf40f9be7de24ba4be079e69b1b36886b0657fffed8a943c5d152bfee06f40b3cb6eb849e569a1";
-  sha512.source = "2133c96bcb9fa28c689f13b7facbe7ddb9a1861cc810b9b6e181ada7abe0ebfc28fa539abfd839ab1299de6f4784634b66e38c77a9558f2c614168c320a2cf87";
+  sha512.run = "ae645b5b511caa94a0c117c705982fb03702246ea17c2bf6e3ebb5d27dea9a58e1a5bc4551b92b6e582a505296662790673019b736af7761f6df95d65cebe757";
+  sha512.doc = "69a3301107db98a3ddb3edc2c893792255427efa88fd4d906201cb92e3768b9d378e955130c1aa6a63040b9ce47582896d9dd6cc9c90e66f7f1b1da721c02bea";
+  sha512.source = "d45d9803377da7b8c41bebdb996b755a47afd5123a448b20b94155b5841ddc3eaf4c84cf7bafb2c64908814f9504414ba21553426c576e50df6508b1caf21a14";
   hasRunfiles = true;
   version = "2.8";
 };
 "fandol" = {
   stripPrefix = 0;
-  sha512.run = "443983d3bfe11acc922036e44a09fa27761b9850cfc5be1dfdfe3afba8b0a7fec5d1da429b4ffbe7dcb7c0350214e7465ae4f01e9295a71f392bc09ebc4630ba";
-  sha512.doc = "fcc48dca53b2acbd4a9b4eb49124c250dd847cb7e74959434dfbc9ddd91b136251757904749aed2502e55379b7be66fb3690924e6538e3ecb208c847322dfe1f";
+  sha512.run = "0e2da47c1fafd801700ea94d020df8310455d62571808008c1f1becdeef2066db5bcd422664ba67a50b4cedd7335c0e4fb173364c17eb143cdde5fc7c30d327c";
+  sha512.doc = "30ad7bd38254f82a8de78667d3e56b8831bed9bfc11ec59012719438f652549b0fdb9e63f8687bc0c75a19cd6899848ae83d3e4804f4c600164cd13183726271";
   hasRunfiles = true;
   version = "0.3";
 };
 "fast-diagram" = {
   stripPrefix = 0;
-  sha512.run = "d254f07689dc7f46b121db935e2f995d07f47f482bd205024e028aa0caebe26f98e0d87092f59d830f343f5fdc24a047c67633a1853490c06a5aaabb5accd9f2";
-  sha512.doc = "8a3f7854fbb9008a50a13d4ab3f762a89d456b75ef413fc53b37cf4156c221283ed03ebb3b3a31048dddf281223cbf7688a2e4c8c7aabb6413372a34d968c3ba";
+  sha512.run = "0cfaef660148c62b2288057d38ee082e1d2be21c2955a4577fd5a54546f08b8fb2a96ce459bffd45587b706677fd3705f58df243dfb0c35dca9ab3d046163611";
+  sha512.doc = "62e98a27e4883ba1b0ffb35ec14e39c95f2ccb77fa761c369a02a3561d9ba1ef8db720f9d6304ef64a0c15fee1dd5ecaccc55dd3fb28e43089cb27d27b3eb28d";
   hasRunfiles = true;
   version = "1.1";
 };
 "fbb" = {
   stripPrefix = 0;
-  sha512.run = "acf832878a678dab8ddf3bcc41b3c4e931982af0af58b47cca0efccbb03bdae93b07299c561a96f4ae47df3bb9656becab93cd7555d49be841d7fbf561546aec";
-  sha512.doc = "47a30ae9d3e545a4ceab4f641f92e25df25e8cd09bf2110dd3cff0c1be869ebe00dc8b78262123fbb2ed6fb374d2068ddeeefd278669032bc826706b3116b52b";
+  sha512.run = "6ed1ccf4160837f40a37330ec4ecd0dd5d8ec9353eadb1cdb0674d176cf65934153f96484ecee5286bc49069e78c004127f3cae62cd87010b9ee320a0e68ee8a";
+  sha512.doc = "98ccb4f7946b2337515f579c833acf5a108689d73a5e307413bc5e7712b02a461202b5664d04bdc8fb15d2e1c07ae17f0c60fe409806ef5529b1c277ca159995";
   hasRunfiles = true;
   version = "1.14";
 };
 "fbithesis" = {
   stripPrefix = 0;
-  sha512.run = "ea0e9c94a1c0f11b5c82da4d7595cd9b41558109c628bf24301cea07f26c6f735dff08385f7d78b31aa7129e47eddf58cd0a812a8812e28ea4293bcdaa72829b";
-  sha512.doc = "63afb074229a69f7288db834470e79f02014bc31662de79c4649d0fc72fb909683aa38f3afe31a0dc6da5fcd8376e6aa49fe079faf6637ed951b80d3a645a68e";
-  sha512.source = "9764719b0c735e79195cdcb154b6187fde124cbd9d30db09adc9b9aa279e365930cadb2ce877ae1749b769a8e106601334ebc47dfdf315841807ca4f9ff238b0";
+  sha512.run = "369abe7dd1494770aef74a6d2e06047bdfd1f5345ddd6d0166b8bd2a7461f5c151d2f0469fff3bc4ab7bbe7184fc1e5f39c10cfd906c18b0d0311a216c1a49cc";
+  sha512.doc = "6ff5d6b4e371fb88e775160700dbe27078298750681ae9e07914da18c73335cc57789b2d21175d63c1364d9e3100bd6c25c9611005323cdd75f5be8d75d7f73e";
+  sha512.source = "2f6d12ef1ec916b418e5f948a0fece0a77bfccf12f3710c9554b024e9a06aee2b9668b90045fb9ec3b0e9a41033124514a3fcf71f851287e45b159079fff5dee";
   hasRunfiles = true;
   version = "1.2m";
 };
 "fbs" = {
   stripPrefix = 0;
-  sha512.run = "576120971e4eb156ba7c66f33175b79691ff16004f6ecc7d4caa1a82e3fa6d7bb31b1c7e46bcf3c8a028a2233313f8ac09fd69bbae50a0108d8ccbc2a10792fe";
+  sha512.run = "ce26c38721a8583d1eade2da63298533b2e751add9828b9de8d5f1c9e42040ced6d186ef4d027a34a919ea166035542b88b498407f487aba06cb2438ab9c92d4";
   hasRunfiles = true;
 };
 "fc" = {
   stripPrefix = 0;
-  sha512.run = "e7add9d87d360bcc70a05cfe26f8a41a0ea4fbdaf2bdcb5931e61166581db6f5c185f455ce8d9d47074b226c4ef9d4794b90bcd90d620e69711836e7913f5dbd";
-  sha512.doc = "edd7d3fc3df5f6c21a1c9b9a59af00c4951a4ce73464298c1d1f1b23bbb18c5920ba65990ce4f4ecf642aa115201872fb9e6a597463baa17980fb0cf906acebc";
+  sha512.run = "fbcdb6b7c0e12ddaee44794c7c39dd80e3bc405d85f764e0959c4cb99eb2d2254547cde532b821bb34f9c3693bcf7249021e49b02f2cebc0a8e5bf7beed38ece";
+  sha512.doc = "2d44161b3cf5604573114e4eeded4ed39664a7d90d22b38384b7caff2d8a1febee74f42c5273e7b89717e3d74ac34f53c5c7511954e602952ce2d71db1cbbbf1";
   hasRunfiles = true;
   version = "1.4";
 };
 "fcavtex" = {
   stripPrefix = 0;
-  sha512.run = "8caf87bdbda3bd9350cf83e67a2b0de4224cf180a19346d077d6601ab3589e931eb5e522271d8725518c944a5872330d7a25c780e65466d8362138023444817b";
-  sha512.doc = "3a83576ec440730ab1881c9afdc9fa8a8b3f287f6172d57823583d055cdc703ff7e37ca67eafc399cb333b60dc4afc857182bbb29125f58fa70fafea1d7bc8da";
+  sha512.run = "76c5c5303afac13ed471a90e589f70a6e8ee257e07d5b583b1f8189506908a24fc8cad9f682526df278ec7139b24f9c91cad51bd229c70e0c249b3e13e7cc747";
+  sha512.doc = "69388eedbc0df92f9d07ad15f466d005657f0e4048aa0761e3ef58d71ccc410986c6d80053b21972bf0805d989b76ea6eab1f0575028471c32b31117bd13d1ec";
   hasRunfiles = true;
   version = "1.1";
 };
 "fcltxdoc" = {
   stripPrefix = 0;
-  sha512.run = "153048455389951e49d699ad07dbd80579db0af2d8655ba294009b13da3b9ee89a1cbbc84c6704b465601af79a0cc523f4f198a6fee409461d8175337a37cb5e";
-  sha512.doc = "bfe18b2871a7dd80f4a1ac4df8772035606af2384000531a007eb7e22751cf572641c300218536f70b15a0af4e530c0d1c3c272680d60f26ab53422a2f2107b9";
-  sha512.source = "cd6d4d1bc1802d44b9ee30e4ddb45689d00e0dc413a14d9ca9502384268efa579dfe3c551fb72b875a0468f15e8fceefb8f74608d6dbb5803852d3766fb6a90b";
+  sha512.run = "9dab396e393853baf4f68d3ef3690df5081c904b7f062bdd17e32d4b627587698b09eabb980273fd09be388c2968db7b0f0911286ff14a1c5577bfc5b58ffd37";
+  sha512.doc = "c70e0da6fe590dea2fa94a696b06518d1f24dc03cb20f57f303e33c657a0ec1b15f73a42550ea1b1e714619ed3551f403e1a14eb4c83617e87cf865b39b6caff";
+  sha512.source = "f71822e56f1e7791f93383cfbece9c0a13e8528d906d4ba4b6c4518d413dd9fe0082db31538c0c9fc62cf5e376fc20de437667c0210dd93a7b5595432d26d97e";
   hasRunfiles = true;
   version = "1.0";
 };
 "fcolumn" = {
   stripPrefix = 0;
-  sha512.run = "04cd365b212fb3b1d1a1992305ca822c459c95d214249a74611b5ed0b069fcf360e51757f49fa06b80efefbeaa68636535e25ea880b2194d9104a00c1a5089fe";
-  sha512.doc = "1ff374cf1b17f2b5141d13fe45eb10e34fecb57ca22451b58be44c4cce386a97664ca091386e29c1153492a43387541fbaf67ccb652a083c9bf56b674814ac92";
-  sha512.source = "12440b04af8702905125e1ee1927b5205a98df2063280f73a04348ecbf70e9d725560e5e7ff6107224cf2ea31f099ea15b1bcb508e16d87ef819435a6745bb85";
+  sha512.run = "93084d36d630f893a5c5eef99356d42fb5321fea48f2df0db2c0ee4ec66bb9d9804fb1f9d717cc322213322bd47705417a5a8e6426b5dec51b153995a96a89a4";
+  sha512.doc = "af3d335e2c423b2414c73f18055c787e89b1a47d96adbe7482ac0319e16972752d809e8552672dc567d9e0a2f3618fbb5b737891fec30a485ba7ff2f94f802a1";
+  sha512.source = "0ed1f3f6ec013c27f9ffb5c2f78f1da3b9b4e56225c3dd0abf519f4fc13ec202ff0c65f1502b1cbdd75d77096c6d187c54f961c87767c48fe9e68189dd9f488a";
   hasRunfiles = true;
   version = "1.1.1";
 };
 "fdsymbol" = {
   stripPrefix = 0;
-  sha512.run = "1270da930700599917aa72ca33d8469ffaa68a33c9a2ccc74fcdb25503b650846cc6d8b23a37d7ae102e84d51c558ca4cb9cb1b69edcd4c415e813b2e8228df5";
-  sha512.doc = "53099bd98963950ce0d303a92cc4d937b7cde79547ebc8daf93c6e6a01b35ac0ce145fcae4dcb1dbc0cf6b4df54419d374d0b5c5826e1d95a51495c9210e54d9";
-  sha512.source = "3bfd208a1ee8ff07f2f68bed98c785c79fba9d5a10ae71811ab33ca97ccaefe7ba635ad07974b933e458271b969ab49d92c6925cbdbc6b5e6c5435a025e76019";
+  sha512.run = "95b189a868fff1e3936505cea19aa0b7d398e79ce2b2754eeacd41a800c95554a89735b6c956d03057813b35fa172cd3342bb934d9775bba760fca6dc6b53118";
+  sha512.doc = "fe6f9d1508c7da01958ddfa5edcea015433251db7b4b5214070c2fa7a6a506a23d8254457cf0aedcc1432f79b7779ea847db215919712130dcb9c39204e973fa";
+  sha512.source = "ab9f6d39eaabe378e8aa958bf6ba0c86a6e7410c6f2cf4e35ae04d098c832a7d00ef16695dc3fa849a9150d8b0520b7bde790d55f63c04d7f64930067b801e28";
   hasRunfiles = true;
   version = "0.8";
 };
+"fduthesis" = {
+  stripPrefix = 0;
+  sha512.run = "02dd9ef79be0c04a35e698022091bc4383b8fef1c86a9c7e31191ed9878535a6c11b028985f60723227100b7a22b51b937036855d05ce0b6f2d6a1e234737477";
+  sha512.doc = "f94c29076791883f406b584f4ac480d84722375d66f960575ecb23b799c836df772692700056d054a30967ecce263a8f2f3c1c5861b60f1474ee347c3f09537f";
+  sha512.source = "9cef69446a7dcc9cd4b8f22ff8ae9054dacd7e445c6e640e40470403f0b27c8827e311700fad008f0bdd30e5a2a5ab339df75c41fcf8f3edc175cf393116801d";
+  hasRunfiles = true;
+  version = "0.7b";
+};
 "featpost" = {
   stripPrefix = 0;
-  sha512.run = "0ab3eabc5119bd3905528d2890a623e9bcfffcd608ce4e2a56413b1b222afe5c2be05262b5a0f8a210c6e2591b8b86d096292d5cf4ded6dda40b33e872837b9f";
-  sha512.doc = "8e386131263f50b31e575206c2c4cb49c494a328219135e757127588d968e81c68dee9d2e64e5522ddf125165a169758a71d34f88df30361e6d83b378086cec3";
+  sha512.run = "ba519599c85d9ba12be01c442aab7ab7066d1880cf774c56bf93bb76a6ad5c8b67ca53a97d1b432b0e8fae2859dabfd37efca3577352edb37bad0929cb2335d8";
+  sha512.doc = "55094dcd9bfa7bcf527da6669d1d713e39ca62fc39e01ccc01dbd1e5e2919832a3bd93dd5f76667c32a5004307d2ec5a6fe5bd4994423f58df98c1ac86a8eb2f";
   hasRunfiles = true;
   version = "0.8.8";
 };
 "fei" = {
   stripPrefix = 0;
-  sha512.run = "dffefd9b232e9dd8a816fa45737b0475740ed07f9167ba00f0271dcd580121cc8ef1c9be1faa6d53ff722b8a4439c70d3e316efdeb8f36a073f03c2bf0da61df";
-  sha512.doc = "49f34ca0670619113dd7452c2223efdb9de36a15b0d0b1a8db4664175bd64b7e1074ad86eeb1261ee1b24c8bde07a9550a45a772da61731b8e69c76f1c1ed5ba";
-  sha512.source = "739c8c559c54f49a9a5bdcb65260f80638f7b77232aa89113ad8909ecc81871d8476a6b78108110d4556af70a1582cba496375acb08227c39e852a181184a87e";
+  sha512.run = "c2805668c8c9350aa7413c8c14164af5622ab96e27f8b5953bf49803c385e749b9bc8185ede27d4f83d7c2f8e6b2030b5222ebaa113a0c51b5180de07ae6961d";
+  sha512.doc = "8510289d481bfc6c0175b5556bd95cb039b1f1e5074ec8e3e4108247af72b456f9b41ef4b74aa024302b092ba045247043ee6adc22d817089653cb3df4067f71";
+  sha512.source = "6aa3437a033b0e02ffb354479c83b182411a5af2648dcbd1e084713bb4e482e8b3c5d86b5df4bcdc3cf60a099845a1ba922681b847ce0d673df6b77c2b94a7b1";
   hasRunfiles = true;
   version = "4.1.1";
 };
 "fenixpar" = {
   stripPrefix = 0;
-  sha512.run = "57fe2ea29addf2ec285eb440e5c00f3f2c805bc13b8f6d5d33226e07125338349bea889e09620ae9175bc4b6639f211fd6e4b6674ea27d6762892166f73e39b2";
-  sha512.doc = "50cc4182e6bc64ace216cca2303e582938e041948ea3f009f2db8ef7e777291d885be939b22d9e1f8201c9bce552cd6268854527ad5dc2bfaf74ffde6a640310";
+  sha512.run = "7c13e910f0aca3129d2f93cddd3ee727e040e6c579486ac871600614f68f6fb6147b5d350805758c62a552a976a88c6c96e5022516844ac8c99166802d24b416";
+  sha512.doc = "64a881986cad1cc04f954b33e174dafcdf82433b6c5cb1c4ac3ccbd4b96d6db9017c39ad31a7f181da7f2ef7d600eaca64ea5c818176928e0511de616e4ae0d8";
   hasRunfiles = true;
   version = "0.92";
 };
 "fetamont" = {
   stripPrefix = 0;
-  sha512.run = "967e075bec04359ea8e7c28e4ac723b892110fd405be22af9bb3004c934d316232798eefd722cfe8b2ea2b4358159ed9aaf2fe245b4a12e3fd1cbaedffab0577";
-  sha512.doc = "2dffb49bce46a90efbe2f85117094c1eebb315248bb218e6aa25ffe1fdf687d9a029fefc5f0350b985028726627717de9dc5870455c3d6f6cb9872ecb7f563b1";
-  sha512.source = "c77605cee00e227fca71cb3850375432460f282035cde0eda65c2891d70daa2544b71fbbdb6d5170974f1ed9fd6c50e9144a48662db37ae0860f9e0a13cb0161";
+  sha512.run = "df7b696e142236b7ee0f1fe85b05f29176c95383a74722a1b3a59c79836512612ac1d94fff4f97e74256f214256a4b9dee8651abab0b663909d754e7b11ab5ed";
+  sha512.doc = "15d5722ce31bc5b216cc2cbadb42fe9cce4c43fbea4b2538883da6bd937f106f159f080e21d8159dd92c2ef93605e5655810b0608c67d9f325d1db52fa8ca69b";
+  sha512.source = "9208a9643c6d4961db737798b46e3aafb3b1ea24cbd201916547f27277b432f237e4f0c816b98a48abf907a8cf7e1eec223ce7e7fbdc18da91b0d526cc649478";
   hasRunfiles = true;
 };
 "fetchcls" = {
   stripPrefix = 0;
-  sha512.run = "3282e1c8cef9262f38284576c8cd6256b8224d2b47fb4046bd92425080e38fa6a1c7b9cd228ebc591513d4cec725281e97928e42dda3626c94233bf619dba01c";
-  sha512.doc = "57924667b2def106a157c448b8707318e99f23900d25cccb2701528eff0217c7fdefe14ec6172f621436ef863dc562b901e1ba551de881371114933882a6d086";
-  sha512.source = "34d0a8a61b9ae779ccda68aba28184a88ebcbba91dc8f1f36c99ae0d2b899ee30d117d4e0565a51a381d1b9b335f0de9f0135ce3867ebbc4ef75bb8f08a6afed";
+  sha512.run = "90a153d224156ab0dba0431e2bb1d808a9d8c99769876549c318b8369d11704d17f3ffd8e9d74d24eab27364ee366a62917f881f4b0128491164e70df85fdec9";
+  sha512.doc = "f92ea859cca20b94deede5cd7f604f6642f9fea247855ada2c78e653787de611b64e6d4e74c1e31e2094037180c41db491ccbd9f61367896e164ca9f60a55be3";
+  sha512.source = "c3e6a00361ced434b3f8bffe954f3f5342278df4114684b8024453c41e523e3e59c8c568240b78c4b25a38576e157cb08ec64d386a5ff92dc067658e589aabb4";
   hasRunfiles = true;
   version = "1.0";
 };
 "feupphdteses" = {
   stripPrefix = 0;
-  sha512.run = "fe3906cf8e3c80c16901d0ec4d9d5216131727f7d850e02cb2907748d44bc5e35f7902b8a6665983c6715f947f0605a336e4627e6f55fc2672c7afbd5367e391";
-  sha512.doc = "f611d18daa2e53fada215d8722cf6e0aa3be5e2897fca62032ff84915c33b209c399db1ae068ef3ef19a8c2d201c2134c5d1420dad21cece0c397592052314a7";
+  sha512.run = "5226ce724cdb1abc24feadea33ddafb8003e02731aeef0116620cc7a6d50db68f14971d2cf21d32c08e8ff1472a118a5a5a30a0de7c76bc2b5a300509edcbe0e";
+  sha512.doc = "29da36af12697d523460e6df8d191a75262ae9d360374bf41fe3c0185c596ea23e46b73944420bc77d32f7cff3bfb51a0817fe8ca2116fa6c4294151f723549d";
   hasRunfiles = true;
   version = "4.0";
 };
 "feyn" = {
   stripPrefix = 0;
-  sha512.run = "a91d9dc4de1c7f87d467215b4a3db343f4952860b517e2c198dd1a92fab7cbec7de878f882a4a03142d5a23f784ced33443b7dc8d08e11696fa5547b6fe4e0b3";
-  sha512.doc = "d56a50e68700154f354435ec88c92d1913d9a3d40d1d01b064e33e9b4ec989f617b0470053b3541e4380f055ae31d9ebd738964d7d88c2718cd5786b18b708bf";
-  sha512.source = "3890445b755aa779c3e338a4ec914f33c3d2691f1cbdfd917dacb46f0cd61ca31fe213df998372d03e79a9a8d24ffc152717b36e0abfcbca5c583a9c8821b5d6";
+  sha512.run = "73027c19e958ceab78b1205b3bed875c1b0ddc4bbe1fa1740a305e56bf2129e73eb7e0394db2245689d8449a38034b95e3ed9e560f9c8a068c46e732f50bf17b";
+  sha512.doc = "f756b4a142b69daf1c0a5aaf64049c26ede2ecbf094a1b63ae30e3773f8a30f07ea1ea4eaed0fa7d2f451ecaed98505469dac7e9a1256a7c064a0be0f8fed677";
+  sha512.source = "d89c411815c7d3c3967ffeb49a0ba479255aae5a274061fb8a9229d3ae48e3b8811caff9ec3618896b2c4635d2eca1b929f2ad0406271b0afb57b46d289dcc36";
   hasRunfiles = true;
   version = "0.4.1";
 };
 "feynmf" = {
   stripPrefix = 0;
-  sha512.run = "e03e6af806492aa4e84c9e84d8d73431e1f8a7a99b8aca6bd4066abb5b13d039a5b3b0015d3f02ca4e3a3645c57a6a98eb2c1fed1aaa060a6ffd8ad9704f4091";
-  sha512.doc = "c2a723969d84f8939522a28c86cad4682583ecd50aee83e73b9917b78b98c7899c9e035f9ad5253d5c09a69eca500c28d4828f350f604446fc1d88bd36c82c95";
-  sha512.source = "2edbae5dc56312af2a05b184564dbe91513dda38acac3f89e25cf81dc1cae6e22449abb8a15b1ae85dfe0ee438f0e6e368c2c30fe92210480b3c48aed7b9b057";
+  sha512.run = "88222474e2b5894bcad17f774042b6bb37b22739e29d5694c08977576950b2a2d302a0a3b23eceff308b7cb3fa0c13796f8cf6597e7b4fe8518030e75b3f8ec0";
+  sha512.doc = "dca778be6ea8fd00a8707abe507784abe12ba9263319eb372bfde43b8251e22c66eeb6da4c748b272588918d14ab50cc5083c64c7b8c27ef854d653f59fdf78c";
+  sha512.source = "1cbba7a5f1feb616e08f867978c431932e8ecdf949fdcc60ea27b4734f9d8c03770b19f1c57ab28757fc516eb142dff0b5c9e25ea3ba8b515ae4999a621e6b0a";
   hasRunfiles = true;
   version = "1.08";
 };
 "feynmp-auto" = {
   stripPrefix = 0;
-  sha512.run = "555858178bb28a8f395dbd00c48fc72079ffe73fa97656d6968ada0472ae7c7edd114828afd40c73f622c78f98e2a5ea5f7791bc4913c2b7bd11d1dbd043869b";
-  sha512.doc = "b2bafa4576fa70ff886c1c79ac0b4cfa5b5dd19bb7f010b3195626d8e687df4f4f4c30d56240d4431bd3e62c1845af695d9323322287fb20532a013cc5bcd745";
-  sha512.source = "90b5388e4aa91426eb3fca978c1e3010f2fbd0690e4e82d4c6a42dd5ba3dbdef571c16a034cc7da4ee632c5ef60789f90c3c420b846c8d9ee813ec7c97f3b890";
+  sha512.run = "22fe3516aa71999464e4262544f50581796654732b6a2040e4047ed21735cb0bfb08594de5317677ce7ad7762425fe3036c92d107f0ffc38c09bb2a5a1ff93bc";
+  sha512.doc = "e6fae6da300f974ec4d09162997220d5f1cd306cfb0f5bd82dd356de55f580b55a2a3e638da2e61a8721dd958ea21268eeb43fa719ab5933968221d2b347ea58";
+  sha512.source = "18e7e6650853d65486328e1ef377f6a210a424f19bd85882692fc4b20b47a4e6d678fe193d71b726893877b0b7824d7f32f2ddd8674ae6b304dea590056f2ed7";
   hasRunfiles = true;
   version = "1.1";
 };
 "ffslides" = {
   stripPrefix = 0;
-  sha512.run = "409e60ef0f33a8e43557d5faccc45bcfc6ff2d60508d341de1c10ba14932d9ffe473de927e1fc2426590b4eef0a020ad0eed9391d4e690065208a41802811968";
-  sha512.doc = "87656dfbc29086ec27a33ed7a31d052b5c586865db7628db977f7a048baef612f3fb8daf4a90a799192c2f31c31334c341cc0de2bf6cf2b7e82007923ad64047";
+  sha512.run = "de917097f213ea57a8dfc299a9d2a9a76485a52a74c2e9ee2b637c0c3d7566473bea4ca576e80a9381c3c47f4f19baa50cb07b39b6136fba0e2232540d1f01a7";
+  sha512.doc = "52897a4551b760b0dadc9b13b029762dc191e47049320f44fc20255cb959a9dbc8e4eec60ca79e2b96856d973ee4058558f99271e5798b08a808399bb2d85f08";
   hasRunfiles = true;
 };
 "fge" = {
   stripPrefix = 0;
-  sha512.run = "edfc74fa26aed58ca2ba1e7c1569f75789c64f7b719e097da405a886ff2c6decc7e92f30e9564ed437af72389cb4ed97a59e157c9159da4eea065f456556eefc";
-  sha512.doc = "76f1dc2b5df831c3f0625b25acf4963d7737c11eb2b8a6156fd30185ecb4c7e9dd28cbf837b96312fe3982a61e626cde51cc139837d0e7d958e7b245eeaf3bc2";
-  sha512.source = "0be2bc32d984efa4cf0d3c0f85596eb96688108bf61f01f8fb44cc842e59f1e72d9e2bc3b04a8aa3fd5f4e5e8aa54bf5418178b26dc4b0b72dfb08f2980536d7";
+  sha512.run = "c26250f4c8fab830aa6a38f782d8fae60d71cbfd040b833f3b5c2fe2be8e25ad295693109b3b28cce1216769c96817943c3b30f55a8b379e36a975f7c1501817";
+  sha512.doc = "843e5b37bf31a3076ea99925ce8a5ae9be504e7836de0ee5d0b0ecb5a39ad3147c9a5222f1c25ab9e95c0f59fb3c77f56836767971b12fd25edae3b240a283ac";
+  sha512.source = "5ea686fa6c1116022da456b6b2949309ed3bc8eb29451213752d8167474f9aee2d1b67f7084b910439dc91017302596adf4ed11601ad8e93b6f20c447f79e601";
   hasRunfiles = true;
   version = "1.25";
 };
 "fgruler" = {
   stripPrefix = 0;
-  sha512.run = "a9bcbabc207957abba157218f495dd29f392827b1c9ee5d9a61b741befc2f82983d13b51e0ae7d607a7783bafe7709f653e9ec1d4c2d4916c6e8b113648274ef";
-  sha512.doc = "672a25f10d8c94a8d99ceaff7000859c87e53fe657525602f076b03ae44624151d39e2408c5edb7e15e389425a7a6742bf9151ac270c7095e0ba48480e3f64d2";
-  sha512.source = "5f8498da311e18314b4d5582ecbeef5967bc0dcc78b7ba6b64b98ba45311e4a70a9f4eac6b875eb6cd74a7daa919348d15eca6920f54f0c20aa38bac35dacc2e";
+  sha512.run = "f79f01da911aa41081738aff68486c69bfe8581e1f23c88b6e8f0e97030b8042e50742dc5906d52a4633bbec3b3e0223d7a39d054f8071652b5a55104bca1704";
+  sha512.doc = "d24ed685cec23a410a08f9a519510442947725dbcf8fc010d9cef8814bcb0e67d9c6b10e8eadb51c77dae7f35de6edf8d66ddb4b39fef1eee7f1114c9ae4da25";
+  sha512.source = "4d9d219961fd7c9200142c0d51e3bb7e690621011e23f25e3e449530f941c4494075b89bfa44afae31fb5c1a440d86dc75babfc57e80b897ce8628a4cf54e8fd";
   hasRunfiles = true;
   version = "1.0";
 };
 "fibeamer" = {
   stripPrefix = 0;
-  sha512.run = "43a420e22102ad719c12f6dd2151e7c283e65be91df98286a03e2dc0ded884858ff3a0d1f61c629f5628490ffedf19e17560de240856651ad20633b65ca28536";
-  sha512.doc = "89bfcc957f01946e1c219eb926aa5e3e4c9d20f072aa5a5e80fe144aad26ec576e91ab353fa82c7b8d8df7b012e8e011271fb18d22d0c70f32b4a397f2a931fb";
-  sha512.source = "8389c745da718f1fc56467b526a2750e6ec1fd784adc3ce928acfdb4027bcc7320b0859080ff6b88e743db5f7200e974205b8b9fee75b707d5d5d784025d06c1";
+  sha512.run = "fd7d7c52f99f70671606bbf50e7ecbd590aa53141bd50533008e29f654aea18d336156558a5a584de6ab8e6843512f0bdd0a8ee6ee9233eaa9dfd6e2992ffd5c";
+  sha512.doc = "88d3aaa12fbcb35851fa38ed746e9738ba458ec8add67d2f818cfd158736ec4174acbbe6f4e29922d9ee4cded1b7618c271a80ed1d739060cb464e2ed67ef7d9";
+  sha512.source = "1ea9ea639883de3543ebc215622a1793d94819cb738d507295a3b0073aafab813518f3346f15e3924bf288ca266db4c6a28d7a4718beb04596b404bdff8b64de";
   hasRunfiles = true;
   version = "1.1.7";
 };
 "fifinddo-info" = {
   stripPrefix = 0;
-  sha512.run = "aebc087cbb04e11afed70eacebb677063feb3b8b4a0f099a69f8029025066732b11c9d8a9ee1aac4db896c0db2a2c4e71c4ac615115c4184b7936c41ae2b63e1";
-  sha512.doc = "161245683deefcb9e30cdbe60ef7981879a08db2f971d80246df279e103f5c46856f705ca70e3202cfd67c84a2e0e1abb13da70fcbd3f76185832c4f5d8ecca8";
-  sha512.source = "2b8a240bcfedc8709ea301cfcb039583a2394a2690c8f9471247da6619e48463e1a1c5a1a31478ef404ede438ddf5c1b09878a20070520d994392dab6f953796";
+  sha512.run = "62167afd92d1e9419950923434a46eadb5243d41acafa5c1869ab39ee1e71a91956fbd0d9ee9d453eabe42e31c5c13b1a8c4d570f50eea7b116ae78a77cd01be";
+  sha512.doc = "90bdff2c82815051ba18b7661ba0f5c561b427a180882657e790e310ef6c71b723a160be142e0a5a52f71896441ee341623f5957135e3bb11a5ddab92f4f8050";
+  sha512.source = "3e2e43d1d61125ae336f8526685952a46323d5df92c7b71926a8aee0cd0db12e4c457d49e81a1d95f4d528bd14ce6c01461ff1ead3a12f672d1e64637c9c2ae8";
   version = "1.1b";
 };
 "fifo-stack" = {
   stripPrefix = 0;
-  sha512.run = "bc4087ae34e2391e8de4d2648d9226468b829ebe5d93b798f20ade1c0c2660c90f96ffc5ade6ff8e98bbdedfb37396db4fd557835fda26f8877826fe0f961a64";
-  sha512.doc = "e8a297126d8000687cc51a1ac69e22aaf1fb6be875aad8c10a618de2f3f41b50d63f9a89cb6a0f8642714b40a6875e5304d4dd34d333f76f9219f0417ee464cd";
-  sha512.source = "cc1455972d3b27e36f61a25dac3520cf412b3618090c4f8509b65bd82bc50f57d8c801ba803328a14b32e1e89c5cab963fd7647a26d872dccc7480df9322c874";
+  sha512.run = "92c22652cc48fc7aac57e2137755be490a488b03924d08fa6c00d70412c8365783b03b576ffaa69704a33de47dbf79c92fbdfd222ba594570cb1756b987f80c8";
+  sha512.doc = "320a14aa063f66f3418be7ecefb7dd96a2b3194fb6b6aad4ba3f88da9deb6165381aa85717883d7d0c59226eda1be49b033b753186f0f8fe57950c49c0a6a174";
+  sha512.source = "608930ce489ef043617bfa5cda442ad165ddaf43e4eccf079a7819829442d9abb7f09740a706a0cd6cf07ae36899466c660700af5ab829ec28f9168c52b53593";
   hasRunfiles = true;
   version = "1.0";
 };
 "fig4latex" = {
-  sha512.run = "2991ffb63e2d6046abe203fcfbfb54a8916192c9f7099ec0f804e7727cbea875c27ec81f44d73c829eebce31b2b7943373ad17c6bdfeecfd8d2b25f2690d04d4";
-  sha512.doc = "d185af6444b8dd65d40e7cb2647e5c4f590784cb959017a2e1a3d4a264619e019104a995f4c6200fc32783b0cd75a1055e921c55ec3feb3a5762c3285cf9422b";
+  sha512.run = "f6c00e585c12b56a65ea70ada98f8a42616ae79a5db37cf117847f3a05757dfbdc4a73b0cc58945fd143c2bfedf5c67351b6b86bc7e6aabcd963e400c627a063";
+  sha512.doc = "49092e5b3cb3d9b2cfea001ac31b373c4b31193790d9fb8dec7fbe1b4aac68bbd1bbed0e732d84e4c2653d117765dc1b581911905fc927385b3171c8a149da55";
   hasRunfiles = true;
   version = "0.2";
 };
 "figbas" = {
   stripPrefix = 0;
-  sha512.run = "c3e57729709a8e50955b2a6d4f7f735f73c45ded3389c238ab9a0c042fad514c67b1d868ee4ebd63b7dcc4c5ce4cb5c2461b05941fda9a91037dacec2c3ca93f";
-  sha512.doc = "96040a5dc1132789a5ecabff5e0e809c0f6c839be2a2f47cf234f654b52a1e4f6301012d5a9c590ad3e0f7d1bcf44375f39f35a4d33932ca4de8798663773a67";
+  sha512.run = "e246d380a26efe266563a8797cfa97da5c1bb0630ff011f0b053437f4db030c78a3ffa98842f54fc02f4c640bd03671dbe2d8892e056e20f4601ab9bbb958781";
+  sha512.doc = "c97a087a0573c04c44635308fcdd5cc2d131b5b6e0bd394af2c783cd8c0ec973491a54d0232cbc1494625a0146b241cacae05ba66fb1b2e13b4950a3dd5f431f";
   hasRunfiles = true;
   version = "1.0.3";
 };
 "figbib" = {
   stripPrefix = 0;
-  sha512.run = "955eb4111a678c4f1f88a140071810c313942a69ceaafe421abce88895feaaaf750017da93864e16ce4b0b41f7142b1ca7e80c8471b04f84d49fbadfd17b2da2";
-  sha512.doc = "0cc9841176f5ab724d7a738330f30dff7d4ba8a5ace6f9883106f69ce8a18c4847b296f145eb92ddc315f1b40f8f26d12102bef964400ac8e77b55d6388727e9";
+  sha512.run = "64c680d9d2901af03c2fda7598a22cedf7bfcc16ad0f341cb8cf1cb809a093589bf5f7bd923be544ccfee58802c406c60046ddaf5ba8ab8ea9e94df4697194e9";
+  sha512.doc = "9f75147b83f995f5e3a22573e098a294cf56a143597eb3831defa513d8b8ae6490f558cb89c221032c2ac05dbea03ce7688186e75bfc80d1cded28a8ed9c5613";
   hasRunfiles = true;
 };
 "figflow" = {
   stripPrefix = 0;
-  sha512.run = "ac105154156b7cc11dc9fd5b5db4da99a873067b7a23c3a3cae5f24e191db9a29ed06d1758882d322dd84e8ce84a48577066e5ca7ca71d467bd884175fb85660";
-  sha512.doc = "b08e0ee9c611c2a9f6ffdc93e28e02a6127fa809efbc5f7e62e12681f7c4c951ff3aedbfc0795d5986a1f511dc3178dbbaf15b5e9cbde5d5343f0d5dada85278";
+  sha512.run = "ad50e8df3e04371ff96b9d4628c0cbe2cf03add781e1741eb9a188d414b64dc4fc97de8bea1185b4f1910e472b589bca16c9ac218e756ce7413243accb480532";
+  sha512.doc = "d7ae465a24f9e0ce7f06579c9d997c653d544a70d48a7b59e6ec0b9e204b5c9646cfeab7dbce470da15b54e5a7d3e77e3eaac10a8569bb19b775b37efc1fe0f1";
   hasRunfiles = true;
 };
 "figsize" = {
   stripPrefix = 0;
-  sha512.run = "8b7ac1e05662bca0ed5e0048f02356a66d67a9f3258d162a90376a9b7c85b936fcc09f3da878797b5e54d79097f1646361f6af9283e07523b02f1dbbfcb416e5";
-  sha512.doc = "e7f57d8e9b194394dcb55348fe28403086052aaf9de4282c6a10c9360ffdc61de87624ca61698e968abf439654e7655b43920492dc7f8fb4affc75c74ed80afc";
+  sha512.run = "a48134a4cb9acceecbf382d3de106b8d3169926757367475ee4b0794fd34121a03d1f57a2ceebe764fc20cd5a07946a5e19ab99de20c6acc6f2179660de42d29";
+  sha512.doc = "ae2f520a04935789e3018f94344d336aaf6ddd1362e9b7623df66212297a624afbd5936c4afa52c4072de40a23bdd8a6774a042a6b7447bd14fbc0269bb0acfa";
   hasRunfiles = true;
   version = "0.1";
 };
 "filecontents" = {
   stripPrefix = 0;
-  sha512.run = "1675635cfbf822e6b1307d7fb00f8351313342b1d864c07615ff288220dab322d1e5510bd2e9461d91356fdaf355a72312ab74ce731ddecdec9dad0e94af6579";
-  sha512.doc = "cb06dcf21a35a5b7cc1c9b2e7bb9776f202a084f094136f45672577de1673e7dfc70481bdffb36af98f315ff7c848b1ac081471338cf99b9856be34e6750d06c";
-  sha512.source = "c211ecc3e379152b0c982d10b83e722dd655690e9e4140c07c19743806dbf7f5256f8e3f5ed79cca27a6dd60cd11f485bd6d4b9007b117d9e809b882228d358d";
+  sha512.run = "98fe1de0b2b0b775af5a82f77c15838639501f80b8a914bd72d36d9b7d2f98d357b90a8941dfa91450db5c9d3bc0f8bc2daa744c44067a3f33875cbc63e90ad5";
+  sha512.doc = "ba8246e491a33afca55cf1fb6e65220f66e693ad850071045607b828e564e16c621b47c46284736927c1f8b3330004df9ea260c7edd23cb91495080038ba4af9";
+  sha512.source = "3248206aaf15b6975757628b0b46ff54df45ef41bedd901e048ec6854a396c5e4ccf6d27e4fa47920f132bcdbb5a0cbd021c1de8ff9684def897ef6ea0537b62";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4";
 };
 "filecontentsdef" = {
   stripPrefix = 0;
-  sha512.run = "6a5d2facb57479dda5fc7858d9e658382d107afb77f949e96c631730489c5493fe7311a2e023d17e8813fb50826741ee26622599560555f7c349941dfe462447";
-  sha512.doc = "96786ca8866352b3bc727a6f661babf30281c3be30f12e2db7aa03989c31a84bd007a6e204c992ac88d111a30288c9f3134fc39c10ef837081d72057f4b48378";
-  sha512.source = "2f33f95ee02bc874e483222a89458e6f21ff8c06d4ea34bb1997106b5850940d377c049f5a17d8d05cdd3e38db702fd8ef87f2dff3085cca911af9e3172001af";
+  sha512.run = "2b4d4e1f6bd57d7bb62140855efa501d12eba8fe75c6e05b0e4a8aa963ac195246ba6650656dad059b3dfbdbc8b024dd575ce708170081e97f5aa2dd0074b546";
+  sha512.doc = "b1b8849577b15112e283be7f5af1bc1ea16f29fab06b73e0df24d8f292fcb2161924f011925b7246a04948d43c45c1b6678784da58a3e656ede384c9f529eb45";
+  sha512.source = "1bdf5390632dc1ce361c2e5a44a6096a0af24579d30b04bb51eb961efcac4a464eb7fe2b67f7370eeb255dcb79fb89a8d9b5281917009ba058edb38aca2d5b91";
   hasRunfiles = true;
   version = "1.2";
 };
 "filedate" = {
   stripPrefix = 0;
-  sha512.run = "e7820b91f27a69c12560a2f39851a3c40f9d8e1e31ba367ba15d805d6c703609f7a7d36135dc2e090faa03f5356f49f87c6d47804b52a53d389a94bef2e18808";
-  sha512.doc = "f21b00143551f50adc134c7557bb5b9cef0ec3e4cb452755d97f58a45bf2b111c48acad17a67759b120d11e720ae52c8b765cadac0739250489e79eef54b691f";
-  sha512.source = "ad8d5693d42cb0d0d82a5dcb44f54cb3144c5cb2deadad619bd1ae32c3b853272aa2b741e955d64857893b325560964b0794f6f6f14f3cc302e52ce306b51ddf";
+  sha512.run = "5d708eb35731a5623dfb01a92a1b8c8b44dff7437d28e716407630b3cc63bcc57b14738010b6106b02575daaa294dff3dd78c1fb2c141310d1b8648de85de40b";
+  sha512.doc = "d0fc0ebd2bdae61477598a9bcf62fe7b02b2ecb1798b5188ec9a5ab6649decb25d2a05c1941d3597a6b0498b3a2d07a2d98b54c03fb172bdf4cf7e3fc52d602b";
+  sha512.source = "a98556187fa34839c152dca61fb45e2bd144e8c7214e7175243685e263d3265bf9554e84b6c65874fcfccd8b6af5dbfc55f2458f0f64818860a4442f4b3ffa0d";
   hasRunfiles = true;
 };
 "filehook" = {
   stripPrefix = 0;
-  sha512.run = "a085a56c19a1a76cccdb3efd70d53fff7a94b8d9c8211ce49d6764dc8deee699c9ea5b1b1129cfd0a9800e8f60260233b0f47f9ff604c1ceda6f4962282f49f9";
-  sha512.doc = "14981ca68d58ee0a7d1b4c554d48e6719440e750195316aadf359867791955804af63113ca6edad368ca26704cf0d429cfcf39d0a24d8d6edc147376980e15d2";
-  sha512.source = "b244dde7d555143075889376ae7a970b47890d6035b8f447388127120ddffc21255796369421c38a491e3f6b434e266c8c8511f850a217f5bdd32b6484534d10";
+  sha512.run = "b9c4837b60c6997b8df6f9c4e5eaecb69110395b4dce7645a7a7692887bf4f7962635e09e4a2fae7a8f30b623d24ec126107b5df93d1a7ff374d0d0c66e3472d";
+  sha512.doc = "9a716bce0053c97e6a6a5df5a11a99816ce4c893e3b64058c98b886b11d902a48fa3f8edefc0011c1079200f5269be6ab303e519658e3b981635bd37da97641f";
+  sha512.source = "2b63b01bcc3f3fdc44a671800696c2a37694cab5093826984b800b5f6acc866bb950d03e38a814fa56e055a773ef9ef51c370eecbb61999676187f4dea52b454";
   hasRunfiles = true;
   version = "0.5d";
 };
 "fileinfo" = {
   stripPrefix = 0;
-  sha512.run = "6519d17ae499a12e41f203c9870fb0092fb8b0c0e09af9b6ab7e86468ea349a939d868c58c7e8115b9bb2dfc7e5bb73908d49f420709d707adbd66a316fd38b1";
-  sha512.doc = "fa378b23cf2c55c267d414c1472d02dda29c4cf429f8f1b0ea2bdd1c1a47cc5f953c82bebd62850afa8dc9040c65e23d13594d3a9365b8e78fc162c105d71372";
-  sha512.source = "90e27b8856f300a05f1dd5ca0b9cebb1975e16bd9c668e01cd7b3808bd7e14cf03da3feab73bf56a7efb4ae5759e5ec12dfd4adce08566c7726bb829a95f6cab";
+  sha512.run = "87b4bfbf19357fc971b49f1e582ae6a3a7a70289d4f487d9b82c7c8f51814231097c492fb581d406384d9c54e41545849756f5e2e1fe2e5658ef1f179faeb099";
+  sha512.doc = "90ec6f61c9fefbe471d0845676f4c7fb099645337f7d75cf8690462bcf7b55367f6911dd0dacd522eaabb1ce5f067046bd51f9867b44b69fc6bc7b96cc058b24";
+  sha512.source = "ec5359366876b018b7b310d594d17021a70fb515c6227fd1f194328f71d69ae37bbe52eb3bcfa1efea43545adeecdff64c5105cf489a20fdf6bcec3a08915541";
   hasRunfiles = true;
   version = "0.81a";
 };
 "filemod" = {
   stripPrefix = 0;
-  sha512.run = "ae572f39b6ad3077fbd0e01eb7345071b6873e5502d216d5dc087a862547fa3016086428039e697c1da7aa427521878e7c3d1052eb95fed22ed5cb2396e64324";
-  sha512.doc = "d1d9e7836f1702e232a9ed9ffadc26d734e51c635cb5ff2f3ab1fc46d94f517e62790588fe9bbf2fe4d48b9d5b67c224202725b28d436d5e84a944562a836e7e";
+  sha512.run = "57196ce4e542998eba3541084d26e65d712bd038ced993d656b48c70bc867a21f05e01542bddfb87790e4b911f7c8f324f69d517d497e4d47798d16499e37619";
+  sha512.doc = "0dbd05659cba350fc028ea3d5663e8a30e3a30e58b2982a7d7b6e17c1d0ab6e1e9667ea10b21bb082b5b807d52c5e0d13797e3b05c8e37aaf6bd4ff789d50830";
   hasRunfiles = true;
   version = "1.2";
 };
 "finbib" = {
   stripPrefix = 0;
-  sha512.run = "3f69a708594493bc4aaa4c2fff6777feae389937d08efb16cf61ad62e175dae0bac5a714826e5ef0c6edbbecadd615ad3daf824d809297241ec3f43746df8884";
+  sha512.run = "407e12fd58de8a0f60eef6e75b815f5d102f754d4861b4fb9f3a0aa4a80b27b964714909989bb35ea3abeea3a45c42c89afe29b8a7ff30b6c8d1980a34469f1f";
   hasRunfiles = true;
 };
 "findhyph" = {
-  sha512.run = "f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26";
-  sha512.doc = "fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5";
+  sha512.run = "7125515ebdccd398d18cb71eba65197519b461ff273970fda6cb2f882d84d12418b60263a85671917f2d7450339273153e5e0e4ff6eb0f8a36ef38a949f6526a";
+  sha512.doc = "0d2793837bc16ac5f9b6aa245f24366d68541e0d4ddc55f70fcc28b6c324b8282b07a2ad6b0eefbb77346621e1b0b44d25a11971357d70870fcca7d79f00ec06";
   hasRunfiles = true;
   version = "3.4";
 };
 "fink" = {
   stripPrefix = 0;
-  sha512.run = "d3e7934b5f8e4521c26495377b4e0174b5715b24156fc1037af71cb9ba346bd6519feb43577242dc35986b1ffdea37fc1d767cfdde23853d30577820ef6f75cc";
-  sha512.doc = "816b27a96bcd0a24750bdfd881020ecd2bbba48beee67ca3d1c1578eff9eafb3e493f5616de3641e769ae926a35ad16c13db4f44add6879a5df6859704348b86";
-  sha512.source = "4a28a403eda52844bde58155315532fa50dd200a93273d3777f8ba744558889967c1bc1bcc0fa6aa7553870ca87d947db726311c839e27d1876ad951d0922fe5";
+  sha512.run = "3db9998be0f255b9867d8e907c1247bcf3059e6069aa99c303d014d62f648890d3b9bbe0976cee6981fbd022f5ab7d12fa7c4ca562a074e4da93ef5763f5d4ad";
+  sha512.doc = "4b695569a5d487ebf0803ea30f942f477e2b11adcfdcd925583814df2fafa821bb243c17615f91ab8a9786f737930fd7f1699281e6e3d0cfe69eaa040698dba8";
+  sha512.source = "6b4c5fa64e6530251cc7777821a3994d4e956d001a29b24651fe50a57e5c2c5efbcf4d52db669eb9c8b081da32f49a523901d0e98e0e9b0b3a8227e84c6a26dd";
   hasRunfiles = true;
   version = "2.2.1";
 };
 "finstrut" = {
   stripPrefix = 0;
-  sha512.run = "13040e25dd2a8224ae30a101da7561513c7cadc5d7889d8e93587884d017eb9db4fd1fbef750923035293462186017216dd118c9a82ddeda231c1d3312727f99";
-  sha512.doc = "63e723591116fd41f708c6cd94fa44f2b25e545dcb74175bc1fd75e05b177c53dee6b2beadc011d44a07ff205425508c327c3388db62452a6ce30ca5bc6f12cc";
-  sha512.source = "8dfc775de15590ab9537a6ea214354e13e6d4339273395bf7ffb39a059ee262c023e11ee4aab2962c9a972422428ae59b84ade7f562d3785d1dbf76880b7fb67";
+  sha512.run = "56a940bf6d97a8e5ceada5c8e622c0634c5fb349df86ceeed6c4d206510c9e4479c913d136df71428549ee72a9fbe3385db034cd70049efdbc9a4eefab93ce2d";
+  sha512.doc = "6852224ef7f7e2f7c4f4553e0c9a9c3314947e1024e871b1b1e6671468a66e72c98757d065b858eed3cc099dd79159d7b343852a2f3d548353bed54c609c435b";
+  sha512.source = "b439aa92c4e29dc2b8fee4627af9e7e1bf5ffd359142ff8373594278dea603d6c900060f01754b987f02d7239784bfebf00b9e4c5133afb66dca2647e3cf89e3";
   hasRunfiles = true;
   version = "0.5";
 };
 "fira" = {
   stripPrefix = 0;
-  sha512.run = "1eade240777072ada72beb6c3fcfb5843992b3d650ab049f2dbf73c63512bb53cc3faec5991da57fdd657fc8af2627a68a500403845acb52558d9a2862c2b4a0";
-  sha512.doc = "f47a90d500a77a41152703be84f4e2cc8f2440e6138910bc9305ba8f859cf02f50df25ca802e14738be79762b78a5f8dc8d61d2b619b7c970217d7c7358fea0d";
+  sha512.run = "26ae1aa1b223dd021f065cc16d2879b48cbf15369d9ee5af1b8656f227880cf17ca477ad790883ed4ee1650bae25b2b94f7b93e4b035f18e4dfbd94c3529dd44";
+  sha512.doc = "d3e193d0d2924704a0c2b01d3c0e2bdcda174b1550ed881c0662a627b971a1c18d7e5150c1ed2e9e6c7d3ae37e31f21fbea6606f3c771130ec0cbc607b18f9ab";
   hasRunfiles = true;
   version = "4.2";
 };
 "first-latex-doc" = {
   stripPrefix = 0;
-  sha512.run = "01b1c544fc1faedddbbf1eb43bb507d52982329744d51eb88df641e68b3f2a3ceea9b768ab7c7cb55640666a4014f2d6ce73c787a04051da455901b60564358c";
-  sha512.doc = "1883271b4a4ac0f5dc3786ffe30799f70a26e676a9115c3d5737bdbb8d0d806d4f2688f99e5fe1b8eb111bb767f2c978f6ee71eec5eacd74f4e7867015d5da16";
+  sha512.run = "b5f0b5ea0787819e8ff1863e545a3af3c01c20d2591cb8baaf4cbb95075e31ab1c50753fb4f77ce8ad166ae2299c0a488b84a5d1f4b0566cea5cc15538bafbe7";
+  sha512.doc = "2ab8e4454afb7b3336f7d1f72e49f783a226e38da10d0973ca08ecc9aa7fe13a0e3fbc37db6857e0a5d33b938e064b8d6448e448020d2fa0a2b955684da5ec76";
 };
 "fitbox" = {
   stripPrefix = 0;
-  sha512.run = "e8a9730ded9ba1f685f82c4bf9f15ab55e2c96cbbe7f3debe6d2da338a3df2f9ed67175c312ecce5f9760adce9373c7715830633420a2ae9a5969eef1142e870";
-  sha512.doc = "8b49cdae1386a9f582784e9d481798f9f79b97ece42df8896849bf29368c67a263d9ad3243abae5fdf098926e154bb9d0e031abfaea8a4cb0f3e1baea2551268";
-  sha512.source = "1c004bdb7efd71094563a48d7be2a1a5d93c2edb661e3057a6418418fcb2b3df3eebca7aeef8bba5c72e6e754b4c81dc528954faa02bed779fba63ab73ee11d1";
+  sha512.run = "d6b40c71db0fc2f7b97751b518297d99617c3fbd030334fa8f3b244a3e12d799e659e46a81594aa890f99cead9815d18f7ad5880b614f8d1128aa02e2632bff9";
+  sha512.doc = "80c3a248b5eb94be7bf276d68fcdf4d559ecd7aa5f7ce0d247454c7e961b244a4ce95651aec18e60e94560f0b5eb0920f28393f007ce984d7dbc64dbca9831e8";
+  sha512.source = "3aaab2f5398d7084879bb9da1dd78f189044ad79b0addf4b8661ed393673a8b38c37aaee8b5ae1185d70c611c7ba26a0873deda22fe6fda64192cad324652dac";
   hasRunfiles = true;
   version = "1.00";
 };
 "fithesis" = {
   stripPrefix = 0;
-  sha512.run = "4d7638916169df8cbeaee44a2eebffa72688f2bf2107bc892cb9bbfc9efd027a24f0dd107a2418fd6e7355923ce991545e5d1991a42a3e1fc7c95525feb4c4b6";
-  sha512.doc = "722429b601ce177ecba47b104145271cfaf9486247d3ad0bf5b311fc9b9b1571216cd1f4aebebde9124b715e6fb5efc7bfd98719e312591318b76269a3fc751f";
-  sha512.source = "524bb69e5f635ae76fbb6af84ff956bde1c043a3c5d034d405dd95d5af491fda0565f744a1a3730edeef203e1875c6faf5e21e92cf121b7833c6d55968e5a484";
+  sha512.run = "dd7e8c5306f0d2be96017aaa3312b14da33efe130c7cd8ba08c254796db0b6cac0e14fe50edcc408ce8a134ddb77c7567b31a4dbbd96d7b629302f9b461527fc";
+  sha512.doc = "efe6afbf9b59248e7ec85415b9a4ff5d6932b85b629dec4e306a96e550a34250d1e81488b1f9473f5a82cc89f353cf823c426dc5d2e9949e0970f09680034c43";
+  sha512.source = "b14b508955875c70ce4d6801a341965b5e640633f651b5c65d21fb647063136e64b6d0aba8dd9157b1869ebe3dd21e5fd860092f1fff7031e66d9c657d5e4f76";
   hasRunfiles = true;
-  version = "0.3.49";
+  version = "0.3.50";
 };
 "fix2col" = {
   stripPrefix = 0;
-  sha512.run = "a1924348aeb5724701e3b488e41b4f0f2eefb0e0df82ab9f75de8870cbd19ac43027b52906c81b8982040ede788aa42d7319d51dd87d032354adea7f4d1172de";
-  sha512.doc = "199c5c2179683dd86ebb9d341e163d15e437c95a01928c7393735f99f8f13b6b6be8e6ed3764369b100f51a446ccfe0b47846dbda0caf095a7fcb5d55724f9ff";
-  sha512.source = "79f12be20201bf6c2cfaaac08c599659fb66c160f50e5e9f0fb57d10b01c3ce666854fb716d40012241f84e0ddc261122d9e3c3af2f846baba135fa3cbafd635";
+  sha512.run = "fb4f181d182c8d3be5ecdd90dcdbadfc54318a404ed5498e6f8fbbd509693cab1ca66c5cd7d2830a8f5718195cd852e3808516bcea5b49bde15b4208ba51dd61";
+  sha512.doc = "4a1582896f707571e7ff9686fe99e2d77ce20269f1dee25529710cea23148618cc24d4cbacebe0741740fcecbed8a3c8e0d2ee0bc5310b660e973b34dcab0aec";
+  sha512.source = "e220c6bb620dee018ac7fe6cda9bdd2fa814b81689e3d6330b954c4a108cb2cc6ac2141edeab23cbef313d2a38193eb625212b5fdef919b7e49c83edbb8b5fb1";
   hasRunfiles = true;
   version = "0.04";
 };
 "fixcmex" = {
   stripPrefix = 0;
-  sha512.run = "0e1aa2db43f18507f237aba192d8eee0ac0a5b90f9e5a4c4debe215bedd518557160b3b582cc7aa73cdfb5a17ae6e78878af0fda7cd046fba4825ad4874334c1";
-  sha512.doc = "7a87fe20ad4716ab28efb6a4ef4195da0f03c2cd382f0f08908ddd6c789b7d0494e5914de464d41560caabad9168c48306ef5a0e275c9e6cc1e3fc55c2987205";
-  sha512.source = "c19e4dc0a3ab2a878241be25c996c7d0a25bfcbd9c616cac8f91b707c14489de1a396304acab5d18a9e27592e9e54547af7d0cb6d88e0757f3ce40c6f48397aa";
+  sha512.run = "32df4f4e2ff4591dfa42368bed25e0f24e5a6413cb15012431bb3d0d15664b941674197cd51580549c6b1e26b2cc6f288df5527daf8aeec3421c0459cd62c7b6";
+  sha512.doc = "6fb12fa5b0155a04e7dbb71ce0807658e35b299e171c6701bd399aceff884a4df66cf054b472003e61db529ffbf3d44d8b18725589e50d014fd347ad1f1b84b1";
+  sha512.source = "ac63cd2ece9cbb68fb88944b2e0e1af240371b511d145fd1773408703f51f565450ec84256399b1e2e20e7abff865d8ecb8fdad9af1680de7ddfcff25debedfd";
   hasRunfiles = true;
   version = "1.0";
 };
 "fixfoot" = {
   stripPrefix = 0;
-  sha512.run = "4e447d94030fc8a52f79a7dd886bedb5d738cabf650b61e5b4863116afb6aeb8ecb5018116cf0e50564cbd1d9607ff7f3d4a2ef7d0fd13e23e19874a75df6836";
-  sha512.doc = "f718e9d65af9d8592148db29a6668425ba3de526f27aab1e61e1256efc2dba05059d3eff1b3fc721fad13627ad19daea7315aae56fca13cf401fbeceec4fafb7";
+  sha512.run = "658f51450828ff5b1c3127ad666c565ff25f7d35a0a8bbfc9c5f02e0505267bd544861b54be25698d2626582e51ef240e73b99105a2fdddbddb6c6dce4e5cbc2";
+  sha512.doc = "729934182676f566a1a5e07e665e0ac849acb21cb8def4c88932c7b1e03d30b539e53717ef35710b1c8bc28ea64a72d30138b915e30ced67eb461b45dafb4eb4";
   hasRunfiles = true;
   version = "0.3a";
 };
 "fixjfm" = {
   stripPrefix = 0;
-  sha512.run = "17e727529d388364c5206097b75c19cf465218da7cdb3acd2338f3918267e64c1901765de5ed4abfad4a5daace2b2f9a16d034ec93125455d0c13dc78f1c19d3";
-  sha512.doc = "219247ac211fd6c74ec10dc912e969fa355efe80e5bef484fadc83ba67ec95d2349bbed4a50f96c79e0becbc0c6faceb3410661c1eb57968b7ad86839f80863d";
+  sha512.run = "9c4efd9a422ec0b272686c5fe4c2d12ae680788241d81b3566ed771c4cea231dea72ade81ae01408a263d0e5b17905e2f3fc93894fb919112171776bfd715903";
+  sha512.doc = "0894cadf0a622e7417f9c7016ff4abb5bfba98dba58e657dd7e78f80e97415b3add502991d15ffac0a50b2f8a2927f478d112763b16299e0931da9d486c9fc15";
   hasRunfiles = true;
-  version = "0.7";
+  version = "0.8";
 };
 "fixlatvian" = {
   stripPrefix = 0;
-  sha512.run = "79cc00b68648c2e5d9a9fec5fa0c29a9c398580ffd2f18bbc7c797fa5f1dfacfc4345adf4f0758dd102484723942861666649fb5c729eb1a688a39f1169e1e72";
-  sha512.doc = "ead6f469b23b88448cee9e3688afbc85d47456c731e781e32a2f8772d13a7a5c7494c4a349f33a08097c4fc28eed5b5159ae5a240ec58af3e22dddae06e02ff6";
-  sha512.source = "13a1645708320d0aadd47b8c1a087f4fd8d3670f8a2d79b11eef9ed922b7dfd8dbcdad4b1ed3fed996810670f4fb8958f7d5f0b258522e32cf8a456dff751217";
+  sha512.run = "9f6ac11a75f6c211929552902edc6a2f7303a0928bd5862e6692220ab32153941761b4a056ccf04cc71b767f91df107af56c8ac373d6ebde1368915c4d3113f8";
+  sha512.doc = "6ff8b8a5b2b62a2fa83eb541a449d5fe12df3f17bf0b5fd12ada7c1becb89a028f395bb4e68183700452bcac3026da81816114314a4c1f09da9d08f7dae5bf49";
+  sha512.source = "6f510e9325842838fbef50523f95ce432a8b8827bf34a612b8383b51c8875fd5c748ba8e575ebd0b76fd585a6faf1251fcba4a2c20fc4299014a454ef34ee052";
   hasRunfiles = true;
   version = "1a";
 };
 "fixltxhyph" = {
   stripPrefix = 0;
-  sha512.run = "7c5b7c36ffb989b1e72221f6b53cb2ecacf69f95ded17c1d57709a19584eb7dc073d806a3d690104d5dd22e9fb8dd09785d4dcd891d80be968fc45397728e435";
-  sha512.doc = "a8a603064829f9ca1e4977114cd4317fe20e922d2fb78abc9f67c910707fd21d09853278f6044d86032c2180e8c1c9c17fd2fd8f20f4e853012f5d30c6823144";
-  sha512.source = "7658225ef6cca27511c7e89619eb8256dc0bf087f4ec8035d10166f9f5a997ad7bdb7ca6ccbfc2479f23747f0394a96d847054748c532b1b50077e2faa7b816d";
+  sha512.run = "a9758d799989d3df6ed91d88c86eac84a14196a05e0ceb52e3427397e785b84707b3557236ec3c7cc11e4fe78c194e5c1ef2ecec9dc293f2d2bd2a45f52edda0";
+  sha512.doc = "63f1a9b43c00bf097d2460b9dd4e1aa7b91d48fb7ab54987e94a2da05a0f33f199e5c66c3c9b5f2d592dc9f464c4bd29b675c4b21c3f7edaca7db1448a5552f4";
+  sha512.source = "b502b61ede064538ba4311abe12246fb7d79ebcbd8337fc847adb066449adb40365f17342ce471b1796c1b0ef9e42e91443495bb591af21bbf6c5ba2342a0b40";
   hasRunfiles = true;
   version = "0.4";
 };
 "fixme" = {
   stripPrefix = 0;
-  sha512.run = "e4c44b2e5648ef918a937621f834dac5cf0282965be47d2e2e437984a9dcf57381f3cccc59190f22eb17e5a7f8e6a8d3283a89ba81b554823947a3ee6f615934";
-  sha512.doc = "fab4b5e463f7c7a9a75c6a03e0defa89cfa222634dc4ed1f1489f8b0829022a6dadad6c85d3334306c7753ef6a4929854b3dc84ad2633a86a743c974f6c37b41";
-  sha512.source = "8087bfd475a39c4dc48de6d7c7268c75377bebab8130aa4a5b21562fbab9c199311dff34b28750870db556d401db7f14161ee56463e6b6e94396047fa6cc1f51";
+  sha512.run = "063eb527c23bc27a2d4cb70f0a81457e93b1c6358d6115732fb3097e662c08851ee0c64552982fe0031640391226fb934ecfc41dc4f90f4a3b50b889288b5f76";
+  sha512.doc = "7f6e15d2ca09a9b8e6a940944f1b731d28fbdc8c809d49371bd335019096e4093f902d2031704ad90b80999374bb917f4e7604849c91efb1976ed9787a4d7c07";
+  sha512.source = "304c5af32f2567c7d33b0ea012b498e9788d362e5172b53b0fd3926d442f6005a87f9d7c804fd98fc689be3341478248b2aaf2f09dae26981e636f3d45d84d6b";
   hasRunfiles = true;
   version = "4.4";
 };
 "fixmetodonotes" = {
   stripPrefix = 0;
-  sha512.run = "1aa033855923497b4caa1d265d284026ebad69e7f0a09c7a6ac125b1361cad586fd4af921c4158827ea33f039daba65aec82770b149902d3602217f48c8c0d1a";
-  sha512.doc = "f9f4cdfaf677e206dac9b846de8f68ed97b4d0771adddcd6f33123186a6897873430f08dc6c298bd2d7bb4619c935c9651f87388961af9f68c6cd0b9b7c98995";
-  sha512.source = "32ef034e36a188032c7cdf248f0264f5d6cf6ea3e8fa7cb22830d6bb134e12a3ee84d95c51bc5fe4eb7990b2821d6a36d6d8bde17610abc143b09f23217038b3";
+  sha512.run = "4acc23d93841477381ce6da0126a4b0c953ed99fbc53ceb642b17f31a96685239a68b4d8852387946ecf94a0ad595a8de09e0b1596bae157be44ef54d163afb4";
+  sha512.doc = "11d0c498719506e55c5ecf29ed3c1bb8ca1d6eb46036e6209fec6075d81d46dc688100e4b03553fe258d9b30a8efa06e98de8b0933ff01bbee2bc32bc75aaa12";
+  sha512.source = "e0c2e2f190685e3c59d33e974e3f96ae3d7bd36c0a401988bb4406131df543a5ad9fb56ac137e45d7b2774fc31af0245edc7f85b4b16656483584be5156797ff";
   hasRunfiles = true;
   version = "0.2.2";
 };
 "fixpdfmag" = {
   stripPrefix = 0;
-  sha512.run = "7758f85da66a0e0cd1e2daee725a6ad2d2871cc541b34d702b969242ab0fc728f38179703542d899b11f16399aa0d7b7fd3ca28f8cbc88ac3bc486625df6e1a1";
+  sha512.run = "cd9db73b7e4de35a1cfb83fbc0687063e98bd2caa72798cfa9142536e6aaebcc84343de80640c3e59b8243508de68e3857910541babe601e6192195f371d1af6";
   hasRunfiles = true;
 };
 "fjodor" = {
   stripPrefix = 0;
-  sha512.run = "b3cc01303c80322e9535794f92d2b9b4d846ef73f1805a9177a058f4737e3cec1457363d9a0aad206a4a5eeac4e171aecd4a531283a98fb0c76a8775ba40645b";
-  sha512.doc = "a236f049a9cbfeaf4df78bf41f17e95400bbe937a48e77806a7ba287062e18ef7e6ef5b09debf76aae944f6458e1eadb643f31087b82549211837bd52d27967f";
+  sha512.run = "307b4ccc6aafd4b4791a667204d713ca0ed6bd20c1494042b891487014f552fade5a3b85f1953001d5f699542bf312e326e99372681410193b368db83a509ca0";
+  sha512.doc = "cbc4ae27c667cf4d374d41d63921646980cbeb5b07227fb7ae7c26db81a5b815d68908c760c2b55de7553fa691a072ff23df60bb80e1638cc3e3e0a13e49f4a2";
   hasRunfiles = true;
 };
 "flabels" = {
   stripPrefix = 0;
-  sha512.run = "ef409fc5354ff9249543355fd98c8829c3380fdadd8ab8dee2e41ba9cd2217d7fda259b017a6e13cacff436a8ebe92fa80ec67ccc8df1a871840e568c63dd625";
-  sha512.doc = "d998ab0d68db900c3208b61bbba4aa4621b250bed1114b42a283a91d99a0a7bc733f8b6694d1d0953172956596517f4dc77c512c5652d548ece2da9553899e3a";
-  sha512.source = "5cb4043a8b94ffaff5985b45452ac0a06f95cd103973c88923124860832792948a53669b295df1e6a71b6cf6c9d8f4a8b42b088ddfa006fc9c6104e8e3ae6078";
+  sha512.run = "1f6a98ce9f7342223443290bfcaa9ad2f3bc1c7f8971a009a7520d811a484ab8a8d607da7ac985902ff010da7afc8b0753eb3f556c062c29d5490e42952c6d65";
+  sha512.doc = "272bc4f5d7f68d01bc32f49f199015478bfbe89a144f2d3d408adce98845de69f06084b069f15f8e88e14242151d2375152d3b6ceb3b940daa1d513d1fddee3d";
+  sha512.source = "cd06fa5e4642ecc2f3469edaaa478f2ca38dc8f6f9afc6df73c67eae7ef60049c36a353a57eb05b3fed03a87cdaf576d1ccecc9187a7549ca6d9de311ac7a82d";
   hasRunfiles = true;
   version = "1.0";
 };
 "flacards" = {
   stripPrefix = 0;
-  sha512.run = "a54cc76280d230760b3b0e65a11b3466e1c61f0fd7d63331cf377eb328246fa5736cf0cb8eb7f74836db58366a46522f5e8fdccc6e2683201f9e62452c469b4a";
-  sha512.doc = "88c43eed262da4cdf81022e9cd2455ecafdd5fe73e2ac99ccb63a2ede4adcdab1f86e37d7b2523a344750c408b148cc39c682ffa43173b658a1419b4ac9861c4";
+  sha512.run = "32ca7a00841b66c5f2301ca7518f18e376968933310e4449f546db1958f37f91848fdef67973ef043c3fde04a06f019ad13b4d217ac366378f21ce274fb66694";
+  sha512.doc = "62714468ec7892548478c23269a66e7046956570f92858da9f7847ea28f520c0576088356c3ef66255309bc04f6e99dc4928496df5ecfe3952521f644ba272b1";
   hasRunfiles = true;
   version = "0.1.1b";
 };
 "flagderiv" = {
   stripPrefix = 0;
-  sha512.run = "b8c4cce8d78ef894ab79d910b0695c140ffa9d61608fca1db1a45fd2f2d72ef9cc77d1d561d338d46c39362d96bde2b091d0bc9020f8291e254387d981158a44";
-  sha512.doc = "f0425cc00882fa2511d526631297e3740025c905672ed67ef1eb1d5914f9c93af8c6729ead293302dbc6569e6b5ddb889b20892d05639d93f951ab0da5795dbb";
-  sha512.source = "46bc731918897c0ea12d0be6e02690aadb37835473627a461a14a807929ed1a4df5983066a78e6aade9ab9bfebbec7bfd5b69826dc111e551875e7927a941656";
+  sha512.run = "c61c0fd9a2a88b06f4ce0939425d5de006bccce07f7c371a0682ad17c7f74dc61caa2d205b0448bcf8695f0fab1a22477dcd3a0eac2e8d7938ea11fb8038d238";
+  sha512.doc = "bf0644ea71d917999f2c3c157f60e0fc783433420a8bafffc56673e776d9108ce122080861cb33b5b93856284319e9542b6ea8bb528de42c4fd3749158e03974";
+  sha512.source = "e632279a2d29a1ebefa2b001b8a4c158ab9393c27abdc65ced00cafa5a596e760fd4b8d7e0f0e3de384ada391922d1fd1287cd852654c5ae2256c12039e05ae9";
   hasRunfiles = true;
   version = "0.10";
 };
 "flashcards" = {
   stripPrefix = 0;
-  sha512.run = "ee38d2e55015d4c93377cc039fc504cc2473bbbbb63bae90c310d105d13e94eecfb6ab853afd595d15febcd7c5e3d16418e6114ccd9da5885bf0203c6ba65c1d";
-  sha512.doc = "0876920a2b0ed5b3458241e9f41dc831ec80bc7a9b9c34ed1559a0a6eedc2710752956a139783082c4c11d1b8bc6305ecb4eaef049ffbf534700d9e6a29a1ba1";
-  sha512.source = "6ab6963a2ee1a7ad004ea21ae808fcbcaff4070836f8dcd1bbc59bac6d8c1a3a03ccc31c7c418fdb8714dcb8ad75a9b891adc7a357a2b848db26d94bc1930376";
+  sha512.run = "5fa5ab1f1cd9081f86b0ff367b2456309160e124cedb6b21c1778081022f22f0ccd0db86b7719123930fddacd2fde4b99ed5a16f3f79a7d50e05b27ab748ac69";
+  sha512.doc = "cb981d5c7f128c8d213a0da2ebb05ff1e75fe9725bfa14782df9c29b8298f6c39bc580ef017bf4fc116f40c34a22a784e98d8342fe79c357749399e222cbb0ff";
+  sha512.source = "a5c55863d48500ea1212e6c5e17ae7a7eb65dc2a3455213a6170976767a87b8ed506b0b6dd595e52cee677c0c74503b25dae7e44325d20d9806dbd01de013158";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "flashmovie" = {
   stripPrefix = 0;
-  sha512.run = "93b9c68a9d7edc89cab3234c2ace46b64c6aa616f6434aec5c28c0eba817e3b84a43cdd0619946b8d4f13ecca912442554feea8ed1535db1844da3d090be35fb";
-  sha512.doc = "0106b5b6c14e3073e60f085e55e976a189e086185b772573313b74c1530365095e824b80b6eafdc688135cce3fac5b8919812fdddfa6bedc54cb1bcf64811d2a";
+  sha512.run = "2bc088e1b614ebfe8268c59673d8340d908cc399743e827bde651e5ab8e070c3266f8b1480594bad3e61d86fcdbafc27d0b63f3aa6380bcd12ed591627cddc07";
+  sha512.doc = "dfcdb1bb2c1d78e12e1df4b14e968c0c70e3da8e5cf62d65007521af10f000c9cb369504dfc7300bcbaba41c78fea2f9e3326167ef455d29f361e818a04861d3";
   hasRunfiles = true;
   version = "0.4";
 };
 "flipbook" = {
   stripPrefix = 0;
-  sha512.run = "ba4211ed51f54aeba8e1efaea693d4f8216bdc41358f9f13cbf0f49477e3716b4ad68b36827d4c4f849bd844cd2b260b78b3dccff77ac51ab68e6f331568f61a";
-  sha512.doc = "65ecc664d8f7433eb801831b07f34205644434394b39daaaf91037b8cc5ef89a8c153692cbbc33d1492ac7847b5c090f5afe08b0e3fc0bc0e1da4d0fd8233356";
+  sha512.run = "3e3326bac4aa8301552aa9618a98a68f2058f0c417e4e935d09a2677a462f35e5b646b47ab7a252779d8bb529c437f80d588953783b707383b46e635966b428e";
+  sha512.doc = "f909e90487084c7a37f08affea0e84a787446590952c75e73bcbc5540d546ef0a31f012297daed5a561de9c4c8a3290f40bb0ae3bb6b3a49aa26e3c1d872a438";
   hasRunfiles = true;
   version = "0.2";
 };
 "flippdf" = {
   stripPrefix = 0;
-  sha512.run = "94cfcde9f76dee6f615fdce4a77c3bdfee220d659fff79f379768d2d42f456ed11075866f6fd8b6dfe26963fd55e931b7bf059820574b170a8b2c91bd29368af";
-  sha512.doc = "a9ea94b8855f9cbce8a948286c51eed0f520721fc5cfe9953651eb74e6976e91f7681a1739480354019114135747d0e2cd0c83da0d1a5836f37779a5d406f1fc";
-  sha512.source = "0fec127d4dc15e1c3c22a422e2e2b0a7ac1af0c092b3f5f3d8ab23f513cbc55a55c8f77bfe15587a8d674b15cfb6e02ffa26a326110550d9788762f996c84aec";
+  sha512.run = "adc92607b204664391bac6f4158d5b6ac506e0f49a208f40a50420de7555825bcc0c0801b795467a44042c1a4275f035e799cc4d29d097b8be506bbf1865f95b";
+  sha512.doc = "1a863556a4a9fef2f953e672bd798ef3d0bd3fb6e910914a196c464182f94cb31e1ae29e92246e42a293d0bf96c0a117f8d77ae707a58cdae8297312121d095c";
+  sha512.source = "48039bb008cc4b54a1becb4b55e2828435bdc7ba2fe2f0dd015a831a1b03475869e0d083afb54f68f4e9a4b1990f35780b7e79931724c3eed10ab8ed43fd82a1";
   hasRunfiles = true;
   version = "1.0";
 };
 "float" = {
   stripPrefix = 0;
-  sha512.run = "1b5a68b1cf524e4dfc15395166e977ee5635ca8025f00c33139907a7f6c2e1cc73baa95c85a67f24bd479888b24eb8c1382b0f5bb6178bbf7883ea8267d5867b";
-  sha512.doc = "cacea3c2c47fe639c1df9ddc3a56724c6931b6bc400487a43f7dcf892ba0eabfe3a659d89e40b27199cb9ca1ac121c72b70b54189eef992e165fac648fbef6a3";
-  sha512.source = "e6be8887c2d612d1ce02f54565f268bce665f66593018eb0eee8644390a56d14f83db5db8d7c3717df68413164ade1f603a6df501ce0e1dbbd69044d95c78b84";
+  sha512.run = "da8459357daeb5441146d60e2d5cc603cba1f62cd15e055af4fa912cb25476cc110f6b736f34a8752aac32b041e1d7c82a2813ea3ae313a6ed504fdb036cc8e8";
+  sha512.doc = "57d101767a58de9523efe89841481f8fef482b6f5a705768e59d417fc18675dc43c553e2b072729509c079f7a80294e6a0a62ba0e801e4b5ac4b6c13fb6f3c28";
+  sha512.source = "1635da7c63febf72f2f43730bbd5f6cf6aa045f4e82d031b9b2f0a0f4f3da9d154e8cc38551c78f9437b2b4f4e7fdebcc45cfc7fd0bd2dc3a5aba6383e09ff75";
   hasRunfiles = true;
   version = "1.3d";
 };
 "floatflt" = {
   stripPrefix = 0;
-  sha512.run = "8a928d4eb4e3091d73b7d07604082ccb0d984589c47d0680b845780c4b3a5c5f3a3eb12936bd0d0f14a02ac9192c336d479e174e6125257d68990ebda54b1cbb";
-  sha512.doc = "446201c3f7d88a7f94ddd1f2ac551ee4b227e1d81987672be369e5f2f0d9d9c45f6386975ade8330f607192c71a378d5f437941236b33c8a2521ebb94d804da1";
-  sha512.source = "57874f6b37b2eaeb46761fb42a0baf992bc226ed193c7a8d2fbd09d43a22a1c3b882973f0704329aa1b77ebbe5719a342e54f0e8b4faab7b69e544f4cafd8d81";
+  sha512.run = "dec5ca9a6b58c0b44794b55dde27ae57ec0885577f24c3a903ebad8bc4bc7723ab19156924cbf4115e9fc2fb23560c1ec352f23f783991e8f60972cdd87252a7";
+  sha512.doc = "4ff43ca25ca20223cd6b39a3e8968669120bdcdc7ff220b07e3b33d460396417f54f5c3cedeafff5ed32604b2a5a4f4788cdaf2c27e65ddf570d51bed2579c0d";
+  sha512.source = "51c3434a4eb53573f75a36d20a7da770256997cfb6fc28313c903deaf28ed8a6efddbb695cc31b05910feda878893f6e6d8c11c5a476211dcca149ccf01321b2";
   hasRunfiles = true;
   version = "1.31";
 };
 "floatrow" = {
   stripPrefix = 0;
-  sha512.run = "b69c1d4d405186f19b10daa25915f99726304bd40930eff15470e35d86f151143ea5edf62c8e441e5433ec976557422b6dcf77578f7ced770ed158fcff826ae6";
-  sha512.doc = "eb0e5939e762f4923d19de3bbd35c55f952fa6618903e8901779de0c98330693ab68b65f4a315b267cdf2685eea9f4c6572e613982b1ee23b163342b79205e65";
-  sha512.source = "eb5b21beb621329ddda64e99a7cdcc627e2651003229d01224955c6d14e0a318959d21685a2046f52f8f5828a2cfed81b1cb75cbd9b52915efddc952bc1dfe1c";
+  sha512.run = "95c8c72cc22b7d6bc4d164c8a7d994a1b07a13eada7b9a0e98f5f75d8e3fe88188239300f3b86b8be48de3adf917b44b2f9b2a055113066bcd2aa062a1761c79";
+  sha512.doc = "0de9418d6361cb5742a306e68e48f16a5661b73245aca8f01529e1aeda1bbebe6e7e4fde489335f86d8a3d1dc48306bc7ea60ed69f3dae5e5c2e215f486e1602";
+  sha512.source = "318f7e0adba4a389037bd274c6fe6957d851931a8bf467664eed75c43bbb3b3b5ca33ea2c3acdfbc27a36e4b9bb68b4947c18c3015b6d6f88e505090f76cf5ea";
   hasRunfiles = true;
   version = "0.3b";
 };
 "flowchart" = {
   stripPrefix = 0;
-  sha512.run = "f57c855be67f8b54c843f0d30679216ff4444c8aec77e69c96d3c42f68d36f4949285bb7d9a440a209d76c6a58f4fed4fa611fd60692cac0a5667e81d65eb4f4";
-  sha512.doc = "b81cbe45676bd632a601582e741e99b79eeed297413f7cf21c2b78f4dda2d852a4b8f4edfbd821f37ecc7749c9290f1f3d20b20a890a3e6ae67f18a22a797b5f";
-  sha512.source = "6b8e9a8b57fdf098c6fbb7092ad341d5a806359530c9ea97c5c847c1706b170afcd8fa5cf1a7895754b70062e2bb2506a53eab3dfe7f7cce57094e09b5bc4c16";
+  sha512.run = "e6ecbb4df7f449e8f24a8b4e795bde0f84b32d2ad86fa74f07a440c28013160c73ee8c5ea3176a77d392b6f1d682581a174cad1f3d38c49dc4828825604196fe";
+  sha512.doc = "e6b4304cb32bec33fef3db52f18b100004e21d2f88d6e9c20c34c49007282e631782303cea0c0136cedd98f854f96924a66950852a6b4269f08f2c1b561dd435";
+  sha512.source = "968d7a7d4524c6cc0eecf76d36be12972d71c6961cabb95ef4ce1d3c38c2f1a7dd39b24c13c42933f35f926953d7bd35691b6bce60c6de08b8cd881d90dc0c4b";
   hasRunfiles = true;
   version = "3.3";
 };
 "flowfram" = {
   stripPrefix = 0;
-  sha512.run = "02f6630b1a35903d02faebd676d7307c9bea96786f4ee49121a2cd3669525178d06fcecd22c746a7b5db816a10720025511f86b517af20df6540025ac96ebdd4";
-  sha512.doc = "46d3f8b09c7679f562cf3a1c341e8ff1562ebd2da1c7bf4c20efbccde638ff1b93e76edf7e694390c57a8feecaff429475a848dcc432d900375feadaa4bfb939";
-  sha512.source = "fa0e091d59dafc0b25090c085c68c85023bc7f6e2474b7ed40f0c2f4de82c70ff11c91e860811ad63c31acb1c8950d0cbf2cae8265a57c94a0be6531ee0ac18e";
+  sha512.run = "4a69fe7bcdca106dd96ee9d2528a574ad58b59dcce5ed0d10f84d4d52f2967e1d5fdfb246d619f4cb6e52e860650135f70d612200c14ea3560a96656255e854e";
+  sha512.doc = "bcb6ad016425c3219fddacc3f130d9ff06cc0dd73354ea42ba848484a3863facd761d580c4b308b1b23b1c96e3889a6db5b961998bc33d5fb03cda9483072f44";
+  sha512.source = "f7f1b09ac3e6426b3dd36bf98fbae04ff7b0e37cda96e12b5453c77fa63329fc1042b0b1dfaa7753c297dd25b613e0c5a0a1e00ece8d6259b729192a2a25ea74";
   hasRunfiles = true;
   version = "1.17";
 };
 "fltpoint" = {
   stripPrefix = 0;
-  sha512.run = "9deeb8339ec93079f2db9f7902a87d8053f59c5f5115e6bfd801193f3550c84088604de2f00a622f0a3392e948a2ad951b5c5b6b012d4571a240b0b9e4eb27d4";
-  sha512.doc = "3e0fa9a2bcf2174249ee2ed195fb142e82143908964e0789789e866df040caea296e185f6c61836937a18adcb15c386a0ec9d4fc2aebd4097132c0eda9740cc8";
-  sha512.source = "4ebd9cd9f68730aaaf94df370680e0f1cdf3b52ace430cd5ced2dc655f7ae09b897328a97f6a646bec6c35037e30c9dee122c92f366b92ae95174224b5ec8baf";
+  sha512.run = "81791d6c757f029f7b08667c7eeaa1a00b1e5fc0555703685f317f3c02b069eff6c6d01a70574c671ca588cdcfa88f22119bfaacaed175d5ff2d496fdd7afc26";
+  sha512.doc = "68ad4d398b1e6eca1d57bfbf4aa61f05e2271356b4da00439b82a92a5fdbda7e9abf9af9c83397b97385746fe55a2b7dd6b2462cde8f2b0314a439bc485b2874";
+  sha512.source = "c8a0cf1593fc0d73730e954b40db37fcd604d6e0158ec32e2dec3be1d8ee46a60bb89a0a04cf3bf8fb30aa20c0ebbb80fb35df62dc8eef86c7e2508049d0c934";
   hasRunfiles = true;
   version = "1.1b";
 };
 "fmp" = {
   stripPrefix = 0;
-  sha512.run = "02ac92ab398ff1c3e9a1189ca96d4e7a6b5af57852307c965d8d055955aed7049e49c80d193120166f50c95d5351040edbd92c56d20abca4cdcee5444eec87f1";
-  sha512.doc = "a053883618552e9cc3a355ee95b4e2245e8054b78c446945d97be6f7c8c37163715b24472bae01b129ba423d4cd95c532a4412235ab9f0604c88520256854bdc";
-  sha512.source = "6adbbe9f1e6e4f2ea803be6522395dc4c14655e63df717cdb87024a7fc25fc82e2da0e4bfb74f1de1982c20cdbf1e5d5af5fe13060e4d5f480f62635648bdf71";
+  sha512.run = "d45ba07aafcdc84449fc9a3c5660c5a792250ef30b5f284e328806fb421ddff07a5b1e917b8361b86efb3d6af2cd2b7bf2fa9d26a4a18c30e5aae2bfa0656c86";
+  sha512.doc = "a59448581eddab4a0ed9804c07c63778740d25f885fb39e2fc3b6182d2ac6bc23c679657d84517449498d111c50373cbde4806cdd5361067247022dfd4b5a238";
+  sha512.source = "32a6d3a6692dd3a5c9473832402d4dd72fe9a6c9934bbbbe8fae6c12883a95931a65920f3c7e7f33ac0b67443a621387e296ce979c9724d960a0b54e54ceebd3";
   hasRunfiles = true;
 };
 "fmtcount" = {
   stripPrefix = 0;
-  sha512.run = "d95cd86f4d2484fa0ff20ce6012a770a7ac1dceeeb724cafc4835a9507cf08ad566d169750d92382c1fa6c4b66f59bc9cc281741556a62cf06084144bed68a90";
-  sha512.doc = "eebf07539eae00ce09e7c3266c400f1a2bb5e8ace82d49b509f2bd6e0e50e7ea9658a66b6ddd8acc8969245063202b8e4d27e002852352721830dce53704675c";
-  sha512.source = "0d342894592ed29329f654218adc659f59fa8e8088d8207301f8ce4667ae62e3713671807f096402551bdd5759f273aa449838d850116da67669cec559bf11dd";
+  sha512.run = "dacb809f12fd58d447cb481500ff5ca4628102346270dda652afb37b63eb544a74665ef5bded1ee541674b9e31007514df27ef6c364a2794d46ea8781c05913a";
+  sha512.doc = "1f01ed3b3456f2216d36ebba206aa9cd7928b1c587e9a93e41491896a1e82676796d297b798d91c62d5acc34c8671cc67dac51cd5184013d1a123c2c9817a18c";
+  sha512.source = "02e1ae68f4bfe81b070e288ae94cb664ff22b2a714a0d92c1a990cf7c548494de7526d4473a5c28929528f5845d8551a731180d0bae121d998e78f6c77583c37";
   hasRunfiles = true;
   version = "3.05";
 };
 "fn2end" = {
   stripPrefix = 0;
-  sha512.run = "39b9f63b274fe0f3faa1edfdbb1d27044a981d42b5ab4d272d69e9b84e266be43018d2bf76e574412cfa0808d418b9ec47cc57b58b2fe1d7d0bbcdca1bf5b941";
-  sha512.doc = "885260ebdfcc4c372b493f388fc1fee665d263361f7a3f26f85aed41d804c8bed81621c07cd960c2a9137b9adeb1b97919a93086d947aa1b45caa59b4de26d9c";
+  sha512.run = "6da10d643daab4b65827532fe94c83715ffff3fbd4822ffa908835f9aa66c1f2d55eb46c18a801a64c6e0df9ba0c6e3ce5b4e6d27afea4745626b0d75d46332a";
+  sha512.doc = "681424556d76ffdf5f188215aa8a4425c8f8344aefdc36085ca014839e5a0e5352c0c83e63ce8d1be5c6f5c7d2016d92fb73d7d0ee71284a4a89197f01fb59b0";
   hasRunfiles = true;
   version = "1.1";
 };
 "fnbreak" = {
   stripPrefix = 0;
-  sha512.run = "6c1cb056c45c244575d377bc9d2a0ae5864293b3f92b5b9b1edd2a2ade0696a80e5d4b915c46db65a33c3af6ca93109a722521df61e176e1aa3f09bb9d2c649c";
-  sha512.doc = "55e5782338aa6d7dece1584c3c688bbd69fbfdae91e8ca42606c22f056a06af54acae2817cb192112b26b4b14c14f5fb673e2aa24a64e060b405861dd118b561";
-  sha512.source = "8fb5828b9d995d3084c205d3752c124e899c5089fa16945a8064513b0f7656645dfc1114cf604af5811ebad87356555729882a819f2cfe4c982b75e27420adbe";
+  sha512.run = "e1a4c4a9b6a8b710a9e2db85b4352e190a53f75894256ffdf50013faad7d2f49bf74ca48b4b39b07cd22882c1db43eaf8d554ee24bea8cd0c0750a1b5f1553ef";
+  sha512.doc = "2343d948dbdf45117971a46b99014dfbbaea68605872a332c74ac40eee6479a4f861aa0a67533e9227fe3c69c6469272a5a37914e6ac1b333fe7f911650458ef";
+  sha512.source = "0fba7999b40f12bdbe657c8e0190945f4880092ab63ebd80a5ab175dabe580c8d2ef0f5c4bcd2a4243bba0c7f6c4cff03346cbc5893288c9f8328d4eb6f5b752";
   hasRunfiles = true;
   version = "1.30";
 };
 "fncychap" = {
   stripPrefix = 0;
-  sha512.run = "3099377f973a613e8c3525780e51c5c100557c6fc508e77bba49a470680844ceebda10253a7df13226aebda5b9660da49fd77193854a8852571104275228273a";
-  sha512.doc = "ef64defa7d51e176137cc00f78b2b69d6fb292fb9f9f97c234dd4d9a290724ed18e3c7750ca24950e23465ff5eb66b353ee697a067eca3f2a4151802b9bd122e";
+  sha512.run = "2a503c8bb1251a42688cd2e8a563f61f3e78e687b9676af5d4607c3ff88bd2bcafab908bdbf457c64825e56ac11264d445c77408f5ce6671a799c3e972391b08";
+  sha512.doc = "5720e40c286f54a2f1ae29347086438d659cbb7f00749fa76f6754986075637ac35818430eabceb59971bd59cc22c9a9becb6bfb23ae879ef622616f0c6b87fe";
   hasRunfiles = true;
   version = "1.34";
 };
 "fncylab" = {
   stripPrefix = 0;
-  sha512.run = "0f87d268f482188eabcbe037dc784e486772783fb14d8ccd5ea7b5ed3e13fef75c1d344e495e1c4ff9b2262bab79d53d998c44a191586e9f6d2fa89c4492bb65";
-  sha512.doc = "7a3c5512227e269062ad5c8c9383bb548d390db0faaf1a5d71c76fcf2ce80a42c729daa889424919ed374212e8f279285d1c6e1e4a88d23a4a9c1b14145f3911";
+  sha512.run = "b0e3ce2bf0e8e83e31bca923c8d9646ed5fc1cb68414b99fbcb6c5773057f813eabfe762c6c3af6000589ae5eadac6ccac653b7727d7e15c28b98ef1450fc591";
+  sha512.doc = "f41fcf6fcfadaa4baf0b94663bd41830f6f2e03ff412cd530a024f5627e828e9fe907e32a30424b9d55a9b54a254453a00bcbfb3ca5c8d314b7c2e2457c9d9c5";
   hasRunfiles = true;
   version = "1.0";
 };
 "fnpara" = {
   stripPrefix = 0;
-  sha512.run = "59420c112654b48908f3b76aaaeaa677e024ebbd2026c97a576b484b8996e778558e335fbc3e722434996ac288ab4ee28f26bf53952db2461468d07bf8d11ca1";
-  sha512.doc = "fa503c1497c6cad52da06653614b5bd5065114c17ba62fbd836ebaadb6925f0312af4e3fc79b2cfe26790cac9cc5ec1bd6682074d161c998b223ee9e5691a304";
+  sha512.run = "3885412fc08219ac39c18c0ff47d79dfde68658b0ae26e381bc81b66e1ee91c158ecd9ab37b0dcda45e539d9a764c93c60d711c4f0e4f376855e80c056ee019a";
+  sha512.doc = "272421ebd2be07bbf0721db8340fe9befa3da38677705a5a7f183a481c88868b531d9273cf5b955322c629c45ac7adc0af71ec2935c345487b950f733c8578de";
   hasRunfiles = true;
 };
 "fnpct" = {
   stripPrefix = 0;
-  sha512.run = "2242e960251030f93218f8839b9a0c2e8a06a6a8f41affa69e49e564a51c2ae4b724247da6818f2b5147619f43e85f68d2f168625e46681fcdcf2545f679fd23";
-  sha512.doc = "05670ec69ec7383c7311b1b9df5736cba560ce21805e15a73fbbd9cc2efd5689a964e84c39a97c325a49597ea738cb031ae9f1d42596eac2570ad104a024e988";
+  sha512.run = "843412ccbbdf3cbdecb7f1fa1b75b049d47bb371a6963ac736390ac71cf3d9653fe9bd4ada66ca9bb531859a26462da365f3c29f5e461a01eccbaf7776b3397d";
+  sha512.doc = "0b5fc265c163d571f40dbf54aef5ab1289e5b85c1ce888bae83651851ad1e4db0491fd43870940b210a52c44cf048d8f1e83b1b9ea80193915ba83da017e4a6d";
   hasRunfiles = true;
   version = "0.4e";
 };
 "fnspe" = {
   stripPrefix = 0;
-  sha512.run = "a6e97c2a51a7b4d84debe02159685272e47e93f7cb941899d8869ab85f3a3041914619e701c3e5a0492b2efbfd7d9b7889b0cb9924ee08e2a7e709b63a26a232";
-  sha512.doc = "efe8e737691542a0024ddf79b3fa379c96755fe04429fd8cddaedbe4186f4aa52d7325e161b2e609c004dc72ab4953dc2084bee87df416e0f84e8002ad302d5a";
+  sha512.run = "aafc72460c896dea613f42f54910ff4d6ff7887c088e7c188a824425dd0d0f43c4ea10b09ba51b218f2c7d37fa4ca4bdc52af255b67ec99ae8e94dc9bf19ff8c";
+  sha512.doc = "21555504df662523ed1957487e8451a0804d60f0d4d64c9c184e2447e2ec4f3e9fb9c527fbd516f8c389cb5dd2802c75d04a749a04d6a07055282aa20cbfcd78";
   hasRunfiles = true;
   version = "1.2a";
 };
 "fntproof" = {
   stripPrefix = 0;
-  sha512.run = "5cdd745875134c4c8538225c6bc340a699b7b83c5405ef3072eebe2f18447e8c1ff68f9d4d53d7b26d5afc9966c61fa74f1fa0f33aa2f5d8b06bafc1fa591fa7";
-  sha512.doc = "7ff0d46c14927d5b3334d3f18ea5d010df95aaba25d1327d949d7e7558b1fb1634e1dff23d77c2a55cfe85b626b91f540ccf52fe3a0ae3ce743bad4dd88474b1";
+  sha512.run = "77851e7bb017aab274e1a13af6899d0417a5d58f777c063978469799086516a2f40ad6dcf3f88b3a564c8e5b383fa02c33de725099146d49476ab60b5c93d6b4";
+  sha512.doc = "7712920134c1820e117c657a99b35b6212bc48c4f78b6408e4dda4067b7ed654f91dfb326a7219b2aa702663d92420ac4660cd1df4344e5fed3f8335f1dd94c2";
   hasRunfiles = true;
 };
 "fnumprint" = {
   stripPrefix = 0;
-  sha512.run = "0ee4d6a57bcaf85b12ef0de73735a94747dd62cca9c7dbbf4034a720ce0660446f19aca0210fbdafd29c14609708eb8bf113183f5e5d82b718282c639122a1c9";
-  sha512.doc = "1868d8d7e775dfc419716c4cb8ddec9c897e2b1e5facc05d1401a918f0ee0a1a79c6d4b73c4a742bf43e4c6e8e60f84504e7d74fd3edfa9304457c256917d84f";
-  sha512.source = "cf22f7c073d0162592ab334889fa51f9e1296fde682827b5b17f6d2f19edb8520410889addf911bc49cead430404df562c137d9f0e8db2c58ce50642c421a6f5";
+  sha512.run = "7705cabc07005c894dc8dd24abe62165675fb3468c9ef09d3909aa0bc74075c431e2bd410b884efba446fb86c65695759e57a00ad4bf99f9ef4805f90a000fab";
+  sha512.doc = "ea10c9160429e3587083f1b386953e2fc25a7049a81f49e3b9d45e0075fb1b1be045e34f0ef5a7c11159e8fcba15be329ffc0e1bb24ba7a78d1a575e697d3edb";
+  sha512.source = "610a346894dcf4d7f792278f1a6840a3e8b8773936a8aaaed60e9ddf466d3493bba3311b1e3ec153c25433762f2a3338485786af16a2eb648a7838f00e6f4842";
   hasRunfiles = true;
   version = "1.1a";
 };
 "foekfont" = {
   stripPrefix = 0;
-  sha512.run = "f5fa9f53f52982c5a0dc8a3d091044778bc2bac07dbf2a3988255045d6d45274d5f24bc371652bc758e4486fa1d7e1fc6370c92d0c9c3eeb7896fd3a584df41f";
-  sha512.doc = "2628b9ba703cb7e2861539f53710a40591509e8922490a3883a3ccd096c3f408346d67e62483a16f81a9db2dd726bffa40507d4d295f161a0f705b45bd7bb9fa";
+  sha512.run = "17763dea28933e618c6a14615bb8119bbac9d3ae145b1e004f174b15df35b7b37143629ee9e55b79dcf48b16b234f215ffacee313308e8bdd11ac1706eb85428";
+  sha512.doc = "adfcc71b92921b2e1fa17b16f96feec2594f4a97b240a1d04c261fd1df4468fbdf64cfcda795a9dfedc74ef4f8a70470ce31afe6fef3dd23926cbc2de71cd300";
   hasRunfiles = true;
 };
 "foilhtml" = {
   stripPrefix = 0;
-  sha512.run = "c53482f392c24be764659ddb9cb0bfd6c08255267d25e8d65a61bafad33626130bd4a0a2061ee5c32b65311b08a5d020d5a6ac6193060860c36ec414b25e74b6";
-  sha512.doc = "a08c4b901b12efb19ab3a583817f1e5469878d49f338928ccba8c29c442b30b96dd5ca114099d905f985a36cf979a8aa40d4515ebcf96627aa535660b5b58696";
-  sha512.source = "d5afe4e2b48b5117d8f5ff56d35b8d71604b825a460da290b8f4410b60ddbe0da08d1fa0ae86520062a01f08d365806c0eafe1d972932e30ccf85096e17e2071";
+  sha512.run = "cd367bc008e5773e026af6b930c7b3764e715bd251536673ab60179fd1342f3ba4f31f1da755c987813331423a73c9d31baf136f3522093a3d2936cca753ff39";
+  sha512.doc = "5015263b6047e5ab6e0863acb4087175962b24d8b5ca4681e6ebfd70585297a67acdec0bfe30a1cfce01ee26b0ba9d9e235f94b2b61cf3dd1ef462652ffcc904";
+  sha512.source = "9a0ca2ffe18c68fd5b1652a94c70b0cd2a771b08b27f1899cedf23ad49af831a2b95924cebb2c4659eb30a17543c995d6239f814900b33c6bf392a5eb2a7cdc3";
   hasRunfiles = true;
   version = "1.2";
 };
 "fonetika" = {
   stripPrefix = 0;
-  sha512.run = "8318e4ae9252942f143cf4f3c393fd9a3668b24a5490a10a2d1daaf7659ba5965e49b0b0cceba8e651590ef6db3f072e0629576952d4e9562aa6227bdc7a8c27";
-  sha512.doc = "065a8472d473504ed055af2359a7f9c2b71a9476e2066ae95e8143ff72722b051093f1de9143b39adbdad245551def2ab68421205aaa81b7e82b2daeabb72b97";
+  sha512.run = "be59af8255547f310a7b07443477fea4c3eb9eb19c9e8873ec29d8ddb3e3af7ad092147f3de4735c8a8debd4b4a34d789a99765addbd5e4307a90a3143133d81";
+  sha512.doc = "4db3227332c484a0d1ec75bd27e9e7ccef82721bb1ee7e50e87d76f74759ed0da8465fa44f0ec597f21afa9048bd8df609cb1005228e9169b9157c17ab1e2ba8";
   hasRunfiles = true;
 };
 "font-change" = {
   stripPrefix = 0;
-  sha512.run = "3ad0ac78ceba803f8e7a9513c0b7edf8c0627d9ec03e8c6038fb41b8b12d2161bf0cb12336ab6b5d6ca860118d4ab5d4e42ea7204be0c38a79eaa17771940fff";
-  sha512.doc = "5f5097f59ef057db715ce0b6646dd2a98c292c17af04166760c671ae0863604ca75a91b058604df413739d49eb59c8228bc607a23efe8b61e02bbb94c85d9c3b";
+  sha512.run = "7965348e1f923ab1b261a81224dde1bfd1b0b3e62b1f028a634d1f39fce8fd32cb1044359554d949a750bfb41975ce782edba9822203c1127c2f9d01bce28f61";
+  sha512.doc = "dbad8aaf2ddf8ed5afb4b4eaea651f5302e558c3a5a78cfebba994f34dec54090497164e3c3231593c6970bb7f8cfdcde5c01eb9a6634388b5bb314978cbb8b3";
   hasRunfiles = true;
   version = "2015.2";
 };
 "font-change-xetex" = {
   stripPrefix = 0;
-  sha512.run = "cb3768c112d0f2e62640d88f5283b2d18824fcf0c1a9e6b4129f55d421ce81aa349cc6e5ff52deb6f0f8ffa58dc0a457b59e4466356c13b372ebe1aa92a118e2";
-  sha512.doc = "71195ab39116bd8c84a3344d25390f7014805684342440a341d5c86819e8ae11c603f1cefdde3b33a163fc6c0ddac9a4d773c9a680fb821c8d6f879f2d468d54";
+  sha512.run = "79e6a0837adab9c5fd493477cd87d183dd13d8a82066df58400d5d0dccb1b05afb16bcbfb8f8d5f52203615c1a6fc7d2ab7050b351c50b888f2951e38e5dc3c3";
+  sha512.doc = "0a6dd281eb5be193a7452eea7ed36b95548da35b321f48bed367917249a6f7c54cb0a4b677865d86c139059525031d1e37362a0d5fd31544221976bb18f5174b";
   hasRunfiles = true;
   version = "2016.1";
 };
 "fontawesome" = {
   stripPrefix = 0;
-  sha512.run = "6a53ef4aa6553124c9d45e3cfc23a0a15e4bf8f26905cfc624026c3f9c812f0ab43115abb5589bcf0ad2b42f52212ff1f2d4caaee1d9b41223dcedcaa8a5ee4e";
-  sha512.doc = "1695f4794e47408b58cb4dfe526899f182d954675a3b01db2f1ccd9c85d3fe252c189121f0bdc503a7cfabdece0f7a8e357321922e8caa9a6f7d89a3930c898b";
+  sha512.run = "27d033f45e343309154b80e21915ba043b2956571ce83fbf6aac43d9cb918da264dc12313c7ab5a5e7b6faa00f21f1a4fb999ddc6ea8753077b6416e97a75e1e";
+  sha512.doc = "56368a42566bfc5dd0e5498fd8130d5c98c635f366eb254c5dc976011d9ca5eaa3dcc243974ef44cbf7579c6160144c6629a9a14fdbb69ab90f6137a577b2236";
   hasRunfiles = true;
   version = "4.6.3.2";
 };
 "fontawesome5" = {
   stripPrefix = 0;
-  sha512.run = "222f22023cdfd2c12f27de1a81e26364a750ac8a5bbcbcb14d5d9e7becdd4878eef091c7063d7061fafab3e261bf0030abb80fc833ec3b27d1fab5b6e7a03dc4";
-  sha512.doc = "ecaecd96fdadccbf99e70537c6d4de319e47d1359d7893c7e635babc9f5556d95853f36d82df7f52976c042c13fa788362c1cac3fcac469e0e129122cbe0f120";
+  sha512.run = "a9173c52b32143df20ea051d5ed08e9dd1bc1aa3c7e585d45f5673f457aee535dd84de6e484cf1ce81149fb101ae16b4e03a80bd30a262b7ac0601b720c78618";
+  sha512.doc = "a441b09f17ea27fa9e8595445eb5f348568112b8f43f378349cb97b0ffaf84fccf6a98217becc0d1ccdf9830b431f1ced45fd6030e5436bae7bc0b53b7b3f3f8";
   hasRunfiles = true;
-  version = "5.0.8";
+  version = "5.2.0.1";
 };
 "fontaxes" = {
   stripPrefix = 0;
-  sha512.run = "e31605021bee03afd0b1e8eaf2d6b7a0cd3ae7268472dafe76ec0a73a90eb97bb9c02d1f8d16cc47088c19c0bd6c3d5e48923fc740bae9042a20718d4c333af4";
-  sha512.doc = "c628115788c847cda4a39525c031befddc994092594ad3126ad366f95bf830583c7fb9f4f441269446c73d5739920041725f1ccb196b6d1f99bd675cc8e5e4c8";
-  sha512.source = "e090f0dd614db83cef1487f6f890f288f0814d6d5221c39d2b26d163108b9856f8945f37a15ad74a1d66583a34ae1ebf19654573aa8340b4598431b36a3de2c6";
+  sha512.run = "2697223d9944c785b21a918ec57a0525deb7004180d7ad16b89b74c11ffaa28691d373b5dfa8233ec2a721020fba36d1f21bb0da5f9bb7ca047e836034ee57de";
+  sha512.doc = "76cd77a0ad214167ef4708fa7ecbaab22f0a1f5121f7155cb6fbe097ae0167cd3a98e77e8f60577316316b06c19a933c0715f1bd83a14ce39fbedec7f4fb3617";
+  sha512.source = "c9ed42efb259fb6ae80e60fbe4bb9197ae22f78aaa350fca353b9c273a94ccf95a9c0518cfd2d48b574727dd9072645bb4ca4a2624022ca9c554e76a46d3e374";
   hasRunfiles = true;
   version = "1.0d";
 };
 "fontbook" = {
   stripPrefix = 0;
-  sha512.run = "8b8b3440e628ce6c3922d2eae3f5ba357bb177257abb3548b46f558b433c091621a335fc409148e77181619da6f0bd8c7487b672ec18d03f2b9f8012480e5920";
-  sha512.doc = "c34447b4ae6ee7fa45ca48a2fcb7737aebe77f1d3a464e066363c294c843ffe32c23ae74dc9b8430fc3a821e6b9bc46f518784cffb385d789fd9d862ff54ae2e";
-  sha512.source = "5005f9fe7d4a47f269927fe6c082aa74dd137c7bbe52e9eedd07154410edd7204b98ed1743614fe4abc560c769668340b88113f15908d5639bfb9b6daea49e52";
+  sha512.run = "0991fa4c65e929cb6818815a780ab9fbbd93110e051fb7d2afe167c12322eca53a1f86160ea29a4bb7fcef789dae20784a562ad192e9b9e7af4502596c58c3da";
+  sha512.doc = "f0b17a0ade838bae8de9d4a135a9fd715b98cfef8a94400d472b0d6fb16632c305afe325e7b374c6ea3dc6389418d8c3e7fc93130228cf97b6967727f1aefc88";
+  sha512.source = "fbc85bc5fa510a1ad822ebcacc558f31b2afe36663db4c9af0b0c3dae20a4f46c339b2b5a19a6eeed9305fb608acd0f62bc3b2125b1f4ffe6a96fb260137b5bc";
   hasRunfiles = true;
   version = "0.2";
 };
 "fontch" = {
   stripPrefix = 0;
-  sha512.run = "e8f3eb6d29d4cc3543bcbcaff25cba4962f6e4a82eabfe4d2dfb66cc1730196ab95b0043e22df632dd0863fa53c2e26a1c61bbd489939e3cb54d3ded6962f1bb";
-  sha512.doc = "a48f6e0c97498d040f32294289b9d23ff0daa530d949cdb67f659d8f5d961c3ab8e89960a95b022ba6359bbc094a9e0cbf8dc2d83192902771ae7e29a545c13f";
+  sha512.run = "eda729617b6796e46348e597c7d13bc8642bff6e41c5cb2ba83e81b6b4ca872543ebb301ac24033347dc4e109b91aaa93075f4e463ea643abfcbd7a0edd31e02";
+  sha512.doc = "c793170d89cb8674032baf4c39e2425b9b0e4c6611fde66995911178af447ba123038917328277f1e578a21ee9c18afb779b99a54adae68cc8a12366fbd2eba5";
   hasRunfiles = true;
   version = "2.2";
 };
 "fontinst" = {
-  sha512.run = "282b6c39a1ca5e09900e30eb3d88abf4ce2ae36a8eecb44e272738f625632a782008be080fb1c0f2cd74f4cf9d5bbc35bd722f2177324ec1da5f0982f827e365";
-  sha512.doc = "d69a560da340f3a800cba8ffffc059f8df2dc80df63b35e8fbff63e73547332cff37ec756b70df2d2bbc01cfbab9398f5824f5f3b2f83b66bf3b478d395a0981";
-  sha512.source = "9dd90201d0be4d0611043df58517d305fe23f11f96f8515edfc5910bccd10462a51b44f0468b82bbfd0a5076f1beca6e55bdec43c3897f72f2a6dc71aebd7a7a";
+  sha512.run = "9768a036ab6b4ef3ff5dd2a64feec41820b18e3997f0a98917ef2596d5966a03ddb6f8bbcf1dd8ba4ca3ce2087aaf2cd563c7e074ae153a2e76b0cd7847edb74";
+  sha512.doc = "e462da9b786aee455a1da52b208df4639cb1b8e44dd19efce5d9e4e51f85923d9ebcd601a12f615226b4f17484893591e66727785ca2e43fdfc8fb1dc63e0356";
+  sha512.source = "3976a1e79dcd6bca9ff5d8e2c3dbe2afed04ca6bfe03b717dce9f339f26ed6064f2c90562379028455e24108230a80a5534fc0cbeabe05f3b5e68fe4655f5364";
   hasRunfiles = true;
   version = "1.933";
 };
 "fontloader-luaotfload" = {
   stripPrefix = 0;
-  sha512.run = "05c766692352a63f874beaf8091f8cc685579fa0c4a31ffc411141828a26e74515c468c2751b3d1f902c705fdcaa21bb8917df47a71217e78bb542db99cb54bf";
-  sha512.doc = "9bad6574292dc9255a7eb731cca7dff002dba95feb60d69336b92543f6c5282eeec493cb83689e9c90e12d4e724b091869c28dbf64b38ddaa65dcaa3d3bc6b98";
+  sha512.run = "117c5686944084d6cfc8e8713b879a10a4cab9f9118bc214fc8285da6d8c0318998d8b6283d4c6fc8cf7cbf2c0186fde08349d7fef73564bba9fd317144d6c4f";
+  sha512.doc = "892956c741dd836abf30fde246232af886d80e73b451154cde3bda949195ab8f541f6c84db23136d34a604f387b1314f8df10cce49d9b5269ff91c6f00911790";
   hasRunfiles = true;
   version = "1.0";
 };
 "fontmfizz" = {
   stripPrefix = 0;
-  sha512.run = "4a63477035c31d87e3ccece92dfd84b1d0c09052fc2411dd6361d06e59d1d8614c9801bd0218fb0f8b1c36102da15b9a5e8ae0473221ef3d5601d2891b2b0ecc";
-  sha512.doc = "3fd94f2167552d74560ae9533bb9b2bedee196928285dffdc8d83568c0fdb4e9287fbd80f25515c6147ab5d05b96f7527283ff1e0eb6767488dd64b8b30d3ff2";
+  sha512.run = "686dea794df028564d9792c97d224e0bb51df82aaeedf551ab930d18e67dc7e4554b1a334a34a7676a849818455ec63c7f8deaefa6d31179c439331d37bce44d";
+  sha512.doc = "d4616154d4b221618a325114829217cec63304073639e0e2e2cee6093ef5a9ad32cffe65dce84480b8d90ed4c044dc7bf38fb8fded3dda3b671b09e76767a87e";
   hasRunfiles = true;
 };
 "fontname" = {
   stripPrefix = 0;
-  sha512.run = "fde54b6c7101bb25c3184f154f6ddb0cf8fefb2be15511ddea25e585de4a8402d30a796720bbe3359584d4ca98bd4b9398122fcc22674c519f9d90e12314af93";
-  sha512.doc = "4c905e6617e915f7e7d602a821bc9b562fa8513aeec708e114f673646ba5a87c89f3a303eaf7dc9beee8529de2470707c045c8f2bb94669119a862517b484cad";
+  sha512.run = "983dc78451ec8a254caa984d5fa12611c399ad6a5d5574babdd44896484616c4c8305d4e516f161989969117603e77550ceb520d9577b0ca0a9f66378a5db5c2";
+  sha512.doc = "c3cf408c747132cc5cd48ae33b43ea236b02cb31433b69f6562e828c9be3d791967ae68b7d857d75c511950d365b64061ef8632ff895cebdb046c2e112af4095";
   hasRunfiles = true;
 };
 "fontools" = {
-  sha512.run = "b3b8593f88c39844849b9a1799efbfdf21bc7ca00d23957925f9b4661804050c7219e087f4e55e526151d0f1fea1afbd153dbbe5b0acae1d813b95c4c94a1c64";
-  sha512.doc = "888fba1f43e9072f08ed919b6e3f9d937a376a894bdb3713376c7be3c964517357f1642719987a047fe11175c4872f10c79f072ebd6a204335315d8c1ad9d9a6";
+  sha512.run = "8eedde1531eb4dfd2d0012a7317c26957d57b6d57cccefae52b0e0abd0e8af70eecb0f1aea52885460326b03755da779e8b0253db264dcaa3626632d73abaf44";
+  sha512.doc = "23a9b7db94ab948275f35f4694ac7eafff56943f7d19655f75bcacee48137ebf1d6635e1030d7de46f29e3c4f4f09065dec96a27ed535172b749dffafd2d94c0";
   hasRunfiles = true;
 };
 "fonts-churchslavonic" = {
   stripPrefix = 0;
-  sha512.run = "77927d5d122cf2b4bc7aa7f544adb745059f7d8d27d715fc90246f70f95e113a2f2d7132bff91760b2e45063fae0c1b1605b70806c6976abe7e6981db7ee8ad7";
-  sha512.doc = "acf97575b293c235de2b9c5ddeed578b124d19fe3081cfd7449e8bd3d55293605c333863d9bcce49bf810908d91f7592255fe94d08469869258a802b11033fbf";
+  sha512.run = "d5fa8427ae6eca83d43bb305a3b9b01cbefe791d0c76e46bd5ca57b6ac56a9f2229c60649868a9863e6b445677589542e5591be9da178a85d7a7617e68a01fa6";
+  sha512.doc = "3262591dc394bf46471bd9f4be75025bf663d0d6a3960e9d4b85332e6ec903696e4bf4e2061a1b49c5fd23c333ebda7a014b18aabffae56399f8dd3d78f456df";
   hasRunfiles = true;
   version = "1.1";
 };
 "fonts-tlwg" = {
   stripPrefix = 0;
-  sha512.run = "46a5c8bb5b2abb6acfd43ed9555c165a7f7359c28ce284e87e028f9a10e36b8b23c472a45e369391e5e74c5b74468efe0dc9fb1cb9938653c55e5283103c1663";
-  sha512.doc = "cfa6f1ff8684e598c1190238339cb8a36daf8d4fb30c36901bc312254d442c19529b6401b3dad994a15cdbcef247e90591e70bc42aa966d2e770a0272df3995a";
-  sha512.source = "27cc8b97c243421d3d2c3546d47e739657b90841672bcf9020969ac50665ee1e4132afc8d4355902cbcbe110765871f5e138582b95325bbe0f08d7a2c8ed9552";
+  sha512.run = "1db79cb270b2af5b2af4ee0985fb2a8b670a0b321eb7b7759eaec0be50960fbccd497fa8d13dbc385654529e9a4529ef66079dc3e4b509752b26c2f706724e28";
+  sha512.doc = "0496e45b0456d18687f6ef475ffcb6a308f7dd87bbda95e9cd2b795b0ed8e0ad45fee0b2b5d97052144b68b566e6916e6773637d691afdb23b75ce1f39016e60";
+  sha512.source = "2cb5e1966f41c85dcc52a303a9f5837f0ef8e4a775631c9c892fa0e4b135abced829f577678eba327be9f7de6735d12ee2099febb9daa2314b0afd0d992d28ff";
   hasRunfiles = true;
-  version = "0.6.4";
+  version = "0.6.5";
 };
 "fontspec" = {
   stripPrefix = 0;
@@ -12151,1856 +12453,1923 @@ tl: { # no indentation
   deps."xunicode" = tl."xunicode";
   deps."lm" = tl."lm";
   deps."euenc" = tl."euenc";
-  sha512.run = "17b5899c768a098f84ab75d999e97e608de0e308b5393c239f03be06317aeb25f2bcb072211b6aebb8dadb5412ea78923cb7ccc4899520da58baa6204ffd4d52";
-  sha512.doc = "391a73ba51fe63f7b16cbe26c6d18b96b510bc82477e0356d1785bdffde8db0658ad9f961c60671905583d4939ec74a88291837bb0cac6a499ce2b7153a184fb";
-  sha512.source = "82e61c8f49d12540fd6d0d39bb4a287c681ab61977d88a96d8f7ab985f56b4713746ab8d9ccd21dc4ae396159387c36cc521d83130871ac2dbaf88be50e11361";
+  sha512.run = "05bb93b4ec4e247ef7db42aca8d2ab73d3be47e7cab38aba7239772ac5e9719dbc376c4158447bdadf9bad2fbc47b9988a949d9a4323ca646c00287d0642b3ae";
+  sha512.doc = "3338c7d7c75bf93f56d2315383682fe7c6facd33fb16d68e3f8852e7699081b71b954fa43a810ab01db8d7c6cfa64b9744cdcc3ecc5e1f61b5f3ac9c73573e36";
+  sha512.source = "268df8e8436603d0ee15fb85ec6ed5f42d5b4164c88a83a205bac88d874abdd74b3c9e219a2441b06dfe023b67cd4ef760ac847cc941608d3787b1c35b590304";
   hasRunfiles = true;
-  version = "2.6g";
+  version = "2.6h";
 };
 "fonttable" = {
   stripPrefix = 0;
-  sha512.run = "d44ae16ae8abcdf9443a6a3baad8ec53bf75f3e1ce94bdcdd60b985eed97c023e86b534d0abb0a2bed08eed43624f752472c21621b0bd7fa5ca05260490a9778";
-  sha512.doc = "d33e0c1f573e4059705eb601812855a291f947a50387e200b853ee42078f7dfb464052211976dcd7693b76269de13eb1bece6cc38c6b131ba2ceb74b5b38a8ab";
-  sha512.source = "be26d6c0161e96546678720ceb67ce18d11b0743a434eb77456df717f4483fabeebbbe0bea8d6042a369b06d34326346d2a132abd13f096b30d457849f4c7b16";
+  sha512.run = "9c90178161175f7fc6cb6ccc7d34fc8923a7716d48637219d4a1f8e9e2b64ee9308a536c48af2b386de2493f7530fada7e9f2f41360ac9a61fd7af04718a5b30";
+  sha512.doc = "7198f27f3eace8ed272896b8a98e48542b38d5eb006817b8a670eae7baca54eec4fff28bf197d292f9f5b2e1eb40ac58e317f1f190f4be0cf6b36ed1abd88886";
+  sha512.source = "dd1711a06d44dd76467f0a66e35398f15c078e824fc00715492c7d25e28fe4012c4a5db73ca13a6852b7e2191b7c73a53d0a3a6796616865c163924ab44b14f3";
   hasRunfiles = true;
   version = "1.6c";
 };
 "fontware" = {
-  sha512.run = "977161237e84b9bb862cd3cf3bb9650946d6edcff536a223a52e87e1bad6dda8c36cfda5809a214491579abca8073e730d0acaa8d7389ba98ebbe10e9cdb441e";
-  sha512.doc = "0fb6dcb5d5d647abe97f2d7fc2d2cb632cf7c7d5e3a89313ce4b3e7b49ef7ca370de02457ff88cd83b9d436556ded89623bcf0d53d9a1491edd688bfdcd140d4";
+  sha512.run = "26efbe7dbb32c6ca2af0c7ad3692afb746a5623d7f4d9224cb6d9ad3aadc4e21e288c2dabe9d2b42e22e32885f7a9074704c2c8c119ce126982d48ef32ded778";
+  sha512.doc = "f9e8f57eaa61111df2d59a32f2bbed159eb88a2bfb4ea5353a6405584e944e279f6eea07d556c8f805440c5e99bc5dd2118e837f93a27ac5ad5e845f3aa4da12";
 };
 "fontwrap" = {
   stripPrefix = 0;
-  sha512.run = "9e6dee5e0de068f25a4d8376967c410bb77d8e091b15404566cbf7fbab900cd05ac36d8eb3f8cdd6b9120b2896e3c8da2ca3ae66d91c15e96f699571d5844ed3";
-  sha512.doc = "823b594b539171cd5a56ea7961387848afd55d3cf8371b37838139bb7bd2ece19f318b1edfd14ca0a06d6bcc5e5f63c37ab8bd20de1684f1766784a48ebe0f60";
+  sha512.run = "5188b2b39c1a34a53370dc49f4cf84e9081039a727b6f3b98c809fa08a9dcc3c05c19a077776b439a3dc68c56e3aa23981457dc68e8488e434211bdb4412f87c";
+  sha512.doc = "57ec44ba77be65fee3165750af4845b1b7f4f2e9972a0802760dbc7c7cbfb8210c4dda341b5ef8bc601dab8d21ac05e2ede7462712abe0d82452d0f6ed10eadd";
   hasRunfiles = true;
 };
 "footbib" = {
   stripPrefix = 0;
-  sha512.run = "b112a434417df74aa15ca1faeb1e8eea6cee42768b5dca44f84e10dc715c5fb7f402cd657e1b1be4d040008c928c1ab60182e340231c6295b12022c1b96488f9";
-  sha512.doc = "cf097928a1d46a9ca07ad0460df5532be3bf94021d493dbf84a1ef38b1fe6fcbdd6d51bc51c0b1782d01a68b71e63cce3be42a0a61b79b614963c03caefd00d4";
-  sha512.source = "cfbf79bafad586a0d68323edf4346401624ba1707d6a3ba689692e641d8e03862cd10c752aa075fd6b437d18f2adb554864edf127bf28956c6ac3542d4173e3d";
+  sha512.run = "ff87c62784a403c3cd5fb90d8abbfbaaa79dad47ffaa44b09159a360b6d5f19ca2bc859334e42066951573ba77652b3e26797f0fb021136262e1bca5a457eedd";
+  sha512.doc = "61c56d8b0c579c584db873bfa6422f4a27c64a683b08f7cfb9569a1f2f19f9e5605e9fd9e4d7327144d0e5fed26aa0b2ffe94b07f39b1aac13699986f68b7c04";
+  sha512.source = "4f3c2d5d8b70358258669cf1eca69f33d64e5be63a6027ec431c9f58158eef059f9c08af732ea76edd999e24fbbc5c6f11c9926042135a1524643eb9f4a512d6";
   hasRunfiles = true;
   version = "2.0.7";
 };
 "footmisc" = {
   stripPrefix = 0;
-  sha512.run = "09683c32900be52f81fc953da7054367b55f1489ce6f5a993e07f358613ef3d6f2a11c23aeb1acf87def730dacd112152f926128c1c137ed0b2b441e0bc4babb";
-  sha512.doc = "21ed78a823ef1e279b82ae08f93c28fc6098f355fb331a890f0d55ffa10ae75cd1365f8a02345ddc5b1f727caffec5b5cb3e055afbd061ede55d631d6a48e8da";
-  sha512.source = "3fa1c9a6667479e1d1a963fca18b76c8c5a5406bd4a9a1430c4b405c515203d5d8e80b65b514bb7a10055429dbfa28232a925b6ca0c53a609d013084fc6fbfe2";
+  sha512.run = "1ef81bb84a2ea5bfe3bd21d4fd5c028b720696ffa8e1404398f78c7e50a39b1d21bf3b3e55c3ec216a638ad833bd018b86b66098f0e84f4dd52ad5955d02976c";
+  sha512.doc = "8dc1dbf98355831eb50737fa3fc8f5c4a9809ec0d7fcf6e601e5caf22e37aa3014c9815dd6c8f05aa69718766d9fd4b48f0e20bd00cde4027f0b004809daebfb";
+  sha512.source = "0eed09b8d7405b3ac6c3f53533e073dd010677e4fbb65dea72263c73898e3381078aa73bd8431f5df180278fda65cd0fc16492641486a0b63941d245b1fb4928";
   hasRunfiles = true;
   version = "5.5b";
 };
 "footmisx" = {
   stripPrefix = 0;
-  sha512.run = "51287d6b1371195350d227c229311e79c11184a922b4da124e25a4857c570d72dac1694ae8b9a4834301fb56e1453d51b351935c1b1c9182aae65f3f7597f1a4";
-  sha512.doc = "effa741d149173c90ac55f7a120700f621e1ae9948ac09ea90d4a69d2a78b647ea1458f2ad5db4cf31f7fdf117dda0ff8a0719ba94897957782174e6f17bd8b7";
-  sha512.source = "75400ab04cb1e0f1895068736fbd72a80774e1c3955eab5cf43efc4b0d03a4aa418e5041dc7e71e1efe2322bdb52bf3cba4b16c9ef9563ced781727dc5e4eaba";
+  sha512.run = "12a3cdb832a767a56cdcfed4db8c23e8ca9626be47a6d5bc7202666ebc287838bccea2d36fee6ce11e6e9097da2b784a718645ad69688fbe78b4305137fe6480";
+  sha512.doc = "71c3b46d9448f5a567fd33ca85330cdca4a233c24b18ad555f9ee6055ef7aa5cf3a114cb533fcc3620781ab27d29b30887d637d6a2e62c38c87c9fd13e170246";
+  sha512.source = "769908f23d1d9ea748a59b5b315819f09b417a24be45a06eaf60097731fbc2eeadb89e3a0f5084fcfae03d1542fac66469959843419927ff04b45165e6b24909";
   hasRunfiles = true;
   version = "20161201";
 };
 "footnotebackref" = {
   stripPrefix = 0;
-  sha512.run = "7229e66030bb8e1a243d7b9ce11ddfd6d35a6110a4bdccd659ea59147a798b698b43fdfb64cd7177c0f07baf242a887fc5bac42882bd3fd39d6aaad23c1821ce";
-  sha512.doc = "21ac8d1c80f77816845d9949c07f9c24f959b65ae1c968bef39cda04be3a83f9e8045736c4eb45bb27f772ccb7d3b914f65b22cced221fcfb7afbbb128407ae4";
+  sha512.run = "b25eef45a35fc4c67634d7bcd7bc619603f983a97d0fc9c9b9febf2b6d2cb367eec59ceed4e45eab1f206b3b5dbbec277527ad91bba4f41da7686abc4286a8d0";
+  sha512.doc = "5db5d2d98ebb7b2c38720ad73345df7bb5161f040057142d54066f46e0a39b5ddce822f94ae2809b715de686eae4bd40bb8c7c8859f114180ee812471661a36c";
   hasRunfiles = true;
   version = "1.0";
 };
 "footnotehyper" = {
   stripPrefix = 0;
-  sha512.run = "585f8d657ac5c9fe39caf3474a0597199ed3e52717dd1b0282a23e40b48f89cae71918fcda4a33d4dc084e5c234156309caea35b8368d44b73ac2f05129e1373";
-  sha512.doc = "9e82a0e7381ce6f201da450f78c59860945e49e7f522d7491993996995c104c6927c75089c53a9bebcbf0655cd855106bdb23db13304c443a99a01364c02728d";
-  sha512.source = "b3b84c50e42e7a06c4fec99f8615caf5dec3cf7a4692cd2ac0b468bf633fd68b7862c5fdfcd683b54b8520f6a4b58cdd0dbcbd556010e0c0628f6be65fe27300";
+  sha512.run = "d14070ac2cafa4158bdd2f422102b9cca40a94d0179722d0209b73430dc3f27205f0cb4c7080c8612e714fdda9a57bf3e9cd6c9210649002ab2347358ece2e6d";
+  sha512.doc = "59551554266354f6d4dc2f3ad2d1b43ed0172f661f5100d605b21a366500d01b4f340657ab1471acba79b735d60327621fda3d0f9547e5649128b5bb1a989810";
+  sha512.source = "3071a53c6673a962b881b11151f2de97881ae959348628f183dbc7d66803e462974a9ec75eae3e7a3ebfd5f307869cc03a7a1f3f5c89ec7ac0d19916e5cd9f38";
   hasRunfiles = true;
   version = "1.1";
 };
 "footnoterange" = {
   stripPrefix = 0;
-  sha512.run = "5f59579f69e25f3560b47ac925098a605f53c83b413172a383699659cb573a24871439645dded71c956008ce30e24872b365e653f3c350a1f1b81bae44b5504c";
-  sha512.doc = "97c59bb752adc9dad6eb901c5ba4306d76cd287631fef425b41fc38d27fdd5724e4f63ef12d4f84c80fd64e0d9e542670b3d9ff350e0830f41fed52f802ebe28";
-  sha512.source = "4f9852998093dea736aaf58e89b0619652b11efbafe7074d3c863e35db4b099a90d114966849d713e51157db9e84a2f9d549755f89543eb373fd9e40553f856d";
+  sha512.run = "055d5bf664fbc469f7352e915d1c7fc27c4300ca7bca69a63032d0d8bcb42cc3dff0271707361af7f07a292b73ee0fa427433e85b5db348ff2d79dec24edc2fc";
+  sha512.doc = "81fb5d9b936a3ae826e08c20612b2ccafc071395c6334fda6cd24a072e0db6843f2494d0744625876972b3c6d48b75b237395c9665521e834518b61101630b41";
+  sha512.source = "62d9c9dab24c07491e5be8aad3bdfaf38881319900cbbd9ad2cab59467c07d016327efb9a3caa1cb8457e960fae3970b0c89cb23d7834de4ee0ae04e09446f08";
   hasRunfiles = true;
   version = "1.0a";
 };
 "footnpag" = {
   stripPrefix = 0;
-  sha512.run = "caad690f5b4f4a5f1188dde7de7a9b7b05f33b655ca7e8748602be9fe9fa840d50e5fb299e75431440b3d3a299f4730509a65622b0dac4c203cf240078e1270d";
-  sha512.doc = "3b69a99d94dc49c2d656dd16c935bda26dbe6f65373fa6bb23270a346b65a5c38e46f8baf0da8dbbb9c6178b385fc00f11594f327c0653d6152124282d2c5132";
-  sha512.source = "c2c7df05cda2c5798d2609a0a7f16fd326fa42c7d90336c99522837392053a134e31a813283bbbae7893afefa6dbc7afbc8ad437829be0e22c7cca0b6d090f28";
+  sha512.run = "4e41ed0f2eb64527123308203f7a31c61715617ac11698e0c67363e51cbb73e61ea2b74a2c9bd12c893ad8c5fbe229701db47b71f8114c63408d122e9b23a852";
+  sha512.doc = "99fb443298ee5087568f20d1aab779f90fd1c63d9470179ce8103d780c6823b7fc8fa7a1f748df6ffc99e1e99007dc04a95f4f1929f1a049c51a45916459fa5a";
+  sha512.source = "cb7de173d9553cf314f0bc8cd90b104f76091d6f99aed8ae3fb85382f860e576783ede87df4e31d8b728ec6738cf116caa11d55c2bce3254c4d294901464ad30";
   hasRunfiles = true;
 };
 "forarray" = {
   stripPrefix = 0;
-  sha512.run = "1ccd986f7c01ecfe84a083f35a6fda0c1310e8949fdb9a494135883346978a14c986ac70c33abcd025b37cec3264d1ecff2488b6d6dfc1652ebbe4b89d03da0d";
-  sha512.doc = "b2372ae5aab36b800ab40720d0816fdc1d7c8fa3e08250492fa05d62fc590b1d05df8a043c0925d5a4060d6b1a6bfcae967a83aed48a4bcbf13dc3806dc1703f";
-  sha512.source = "c2fc73ca3defbd1dc2c8fcfd83129e7d633e218f373df3544e5144e2bba7644ea6b6ec425cce5a32445c01b73bfa063a6e409dcecd29af5b337006dc1fc423ce";
+  sha512.run = "a996a822e5626680fbf0705b8b623000edb5f9bd28ccb9b6807f0f3b93c6db338bff984d0994f9ca399222020c6a3f167c0a7e6dcc31e0786a7e0f0461eeb5c5";
+  sha512.doc = "f34a6df2fd2b84eae134985f65aa7b6e6af93a659272df2cc2245e5daabcb960954ea7b63d8f5d68198f7b35115733a2ba20d6cef4f3fd0676fb05c4c49ecd25";
+  sha512.source = "c2cb83459a2bc1e3a2f45888cde095115072acfe7486c6a6000753e1c58e3ff426ba0d4df4a647a2a9d34ea0fa74413ba72c392658c0963ed419582cff0f7f92";
   hasRunfiles = true;
   version = "1.01";
 };
 "foreign" = {
   stripPrefix = 0;
-  sha512.run = "48968bc38dd8d21ad5c67d55f771014e089d3cf02edec24fdec56d173477075c264f5153893dee76041d8e687fdeb863277bfa412e100daf793bbe7e99d06208";
-  sha512.doc = "9b413b96ad4dba24bc94830e755577f65e08783c956e677c7af4d92d443ff5013cfd751cfe9a7c5abd23c8b63a8859491a1b88fa3698e1125f642bb3a0fc0284";
-  sha512.source = "0a6035a43b42aa7065a6a4a27543fa3e11c5dda863cbc3b93663fae9821a59272cea948af9130e20906097568075f4536d4cae620d31fe89364108c008440509";
+  sha512.run = "a1cd8e172dfefe9eb2fffc0b9eafdd961c0e4ac0a9058f25443d980afb85119a53b0067ef7ffca0d16cc6dfe2dc53b16925d1d74795c5e5ba6ee76cd9d1e4974";
+  sha512.doc = "bce22ad824554a3ecb1a31df292c478f4b24ada58812c691ad1422140fad1d4f7ae8cfca44e11198a8af722a06a8a3df335cec42c272623f87016d5c87fea069";
+  sha512.source = "e80f1b38883e8eb3db43b7412c2ad8ddf575af62a7846b12eea9cc17d08f0898540c71d7c5741be9ace7db495a38bb3d133636e8234b18633865672e07816160";
   hasRunfiles = true;
   version = "2.7";
 };
 "forest" = {
   stripPrefix = 0;
   deps."elocalloc" = tl."elocalloc";
-  sha512.run = "2f433123f6eb500d8dbc6a22857bbb51713c671668767c083dea096f994d5fe4d8a03ab22ad6590ab5ffacbf829ba992faff764ef2ef167323e7b3e1b0699b4d";
-  sha512.doc = "4467381da4fca42ba5ebf33c80a7f1b357b8b6738112a89e3fb24cebd449255c0490dcab35d90a108749951133d0768a54c7cfc9b6d8a41e14e42234cb662331";
-  sha512.source = "a5b9b98b31c7649aaaaacb981f171c23ec12ff7f2c8b83ea27214b8f0f19551dc76f8d08946235a1cebc862aa5f4cdcf76d6229f8bc10ae83481e4e03c319e70";
+  sha512.run = "3abe903346fba5b97d972915bf45a87616edba938a773ee943eed90a7c3ccf82d46c71a195e0ea7a77ffdf4eaf52b741b1e8c8c42336724c0b729ae9dc9f3154";
+  sha512.doc = "187e2656adfdc6ec7891b98ae7afb8f205639bbb6eb3a82a8029f546d9e2784cd35226003ec5dcf005ba743da8a7cc73e0730540be78f4d2c6c5e10a9379c075";
+  sha512.source = "c02b0f3e5c9f0881e9e2933c77aa8e4067c0a01123ac859286d21c1aff2847b8d294e8250d34220570b1c6091c94edc8e88f712c5e581c6f3882c452ca966ba0";
   hasRunfiles = true;
   version = "2.1.5";
 };
 "forest-quickstart" = {
   stripPrefix = 0;
-  sha512.run = "9b4da4bb41fb1223ba79f87d2ae220aacb7f9789441ed576d05fea5e3dd63e9eef0173a7dfaf4a772b1d5045a3f6e792fca0b35e1fd8a021ca9f527cbadd9a27";
-  sha512.doc = "4efddfe286e55017641574388f0621d8d7d194e8841e5d2eefd9d1fce0ab99ebab57cf2c59354a50b2cd6c006aceb9e9a3da4b541935aa1114857533e1399b17";
+  sha512.run = "38acb6d669db3ff2b8da78d8017ce538680175d8debd2d5e8442c376a65b60af0d9674f3ae6fc1cca17bda91bfb9f0f429bbd0637747376c9fb09ab4077832e4";
+  sha512.doc = "53d81d2ffd9b6495de0fb8999eb45962552a1d89e3ac4b552f28c817217e7de7a69acf959934913052e9627214c30a471ef1588771c2086efedf1d824309cb3a";
 };
 "forloop" = {
   stripPrefix = 0;
-  sha512.run = "3c96489c603bd3232033d7352c1617f41329d27cc8f2c3541f963170c915ee51446fc05e72067b84b9df907f3623ca8912f4a5314cc75f7234a9264c44d23303";
-  sha512.doc = "d5f7a8c726a5ed516df999fcfade30f4975951c5d439cd611b065dea7591cd65620a4d1c011289278a1b52290b851518d00be03a3887aaf37019ea5e14ddb513";
-  sha512.source = "eb2bdd074c64f740e4b9b73fdbf53ec1fec137630cb0a6c0e99177790581b36a31e550e281c2b5b61365b1ca7a2b984b5f76cdbc9978e07c804e035e26365ebc";
+  sha512.run = "3ad0389bc77c8c9c1f3c2df08dd437f3705c78b7967b88cec7218dbad2cc0e718b0f01e6425986021bf209c5198dae00c3950faa0cfbcaa7a435bf074466a430";
+  sha512.doc = "d005984e6a7eacd02c4f5110a1a4c6a194d8c6361c665e888ab4edf7af083838a45f9d5a521f51dcce25b867621a376ed024a08d83febb2b7c1d1bf1b6d18dc3";
+  sha512.source = "22c86944eebba0466fb097cc124d68d6fec402c4d23a59df2dfd06238d59597422d1327f055515984e92873dc223f591c7b1b0f15d0ff956e4950153d6fd8a29";
   hasRunfiles = true;
   version = "3.0";
 };
 "formation-latex-ul" = {
   stripPrefix = 0;
-  sha512.run = "835bbaad1934cf74e9939dd033f72dc0ee65dc00e713966f7d67fe0dab6486f826ede4897374077dd0df2bc4eff7e4e84db335803e53fcc6cdb5724375a2c786";
-  sha512.doc = "19a4e4763a5515b2680515cccbef4a61a9d08731cdec6fcbe92c665d97382c441fe3f16f0b68086229372f1d3a5144da6b19e1ad9a3a63684bb9655b0b8d7bff";
-  sha512.source = "72be1d39e9c3df4600feed3e56b6e17a2010a6fa218bd8bb33e2f346f04f33bbcb574c73c9502cffec44de19a6fc0f0503d112af6424473a1d89c14d1f4527b7";
+  sha512.run = "f40f5d47aac3cfede372d91bf833157b83aa6216a03e759eca0a68d414dd076f2cf80c7d20bddec06d5b4ce68f31eea27b227c86428755be29159ddc55c71cd5";
+  sha512.doc = "a99aadcfff0c880c81f60c33b0f85052e267fd0f3d9fc5e9a6ea14ce2b44cbc7ba0fdf848d5eb3478c1c09a2b180f6b70d48fc0e7f2b29de3234b60a58b05d54";
+  sha512.source = "2315095e3649e583b98274705e4241d930f0dbac877a6429fc5993ebfcb925e8628dd421ef6db7d1a030aecd4fd3a806d7698004fc33922068edda3db786b144";
   version = "2016.11-3";
 };
 "formlett" = {
   stripPrefix = 0;
-  sha512.run = "051c8ef21fcb102afaed42693db4e993e38dd537b26c08730993912990ff75c8e5375125fb92e164286e85a8720df31356fca1ad5e59ee6abd9f538cbe05ee61";
-  sha512.doc = "bdabf709471360f0e57026c82838310fe050c9f95c2a24bb7d5e14d76ed096a030b686f899d1d71b989aec1facd2fac5a8ae37d939932600c553b515206fe1bf";
+  sha512.run = "41b47cfd4d381b109c59b245131cc345cb7ce12574a5f7350fa7a604f34e4211cb1d7d3115c0ba4a41c2059ec8cc73c5b4e2e5fec298f6f7861d86c59414f65f";
+  sha512.doc = "508bd92dce6af5d0d4e1bf9419461bf491211f012d2b091540b29f0fbe420a5bf62cf33ff9899ae36b60d045ec68c22d34b44f1a74d5811e1eb82e9706baefda";
   hasRunfiles = true;
   version = "2.3";
 };
 "forms16be" = {
   stripPrefix = 0;
-  sha512.run = "0c4bae6002eed5dd1993477c80641d405916f41979e13df5978ca82724a64c4dd9c09b544aa6686b05d39fd98e648103831e178eb01d6b20c769f299371f1832";
-  sha512.doc = "61d93f5af9970a0571306164428d8adccd15941e67b321117fa3d4fc45158492e429542d68aa5a010bfe6815865346ad343e12e29dd4fa8b7f5bc4e999e406e2";
-  sha512.source = "320f28fac214c10f2e57fa2613276be15b5482fc748dc772dc869ff2f30cad69d6e4a7792dcbc7c53c1e7d84b0bf2cf85add0992adf18ed7b4d93dd36caa8f08";
+  sha512.run = "5cb57ddbd8d7d5a259c3896295de2a4bc7d64cc41869f5fbc0a259c356a1130cfa62565592a7d701108cbbf7d49bf55683502d3a0bc8eedf2618cd5abbbd3578";
+  sha512.doc = "56432da4c2aacdd153cab0d118c68c4c971d28ad5ebe1a172c4648be40e9ee6dfa39da91a11a14caa50fdcf6468de3d5e48c743f192aa7ecf597ea1f2227c855";
+  sha512.source = "90faa2171d972f4b9dd45d1cedaf7d35b5787cd62f0899e700ae0e043237711f940b96ce64070797b8bc8f12924789439d3367f722a2138860c22e73f89a8742";
   hasRunfiles = true;
   version = "1.2";
 };
 "formular" = {
   stripPrefix = 0;
-  sha512.run = "87379202c9db9f77abca5e1808b272500f7c0d60325386fd1761c929d1b8e7551a4c3249ef9cd685c5793e6470ec33bc675f450ff0b86f2948adf69aa69f51fb";
-  sha512.doc = "c94efb4969479d198e6c231c30f9aca225d9f98c3f60c46db8c5f670f6ce101eb8f2a354c1c3f26adab6d799461dba2551f78e69b670bae00f25221087398d0f";
-  sha512.source = "fe966aea09b0508faf7b05d5c81a043fd99c01cb926728fbb4fa6c0c4ab46f1a536e539dcc9259b49c3041e74f445e9f2563c22fe67ede541ede58c7adcac39e";
+  sha512.run = "acb5afed1497cf9af824c925caf771ebb0a994d389e86707e66761204f601ea918a20a92bd689922e11c40fe69a158f5523967320474dd592a27e8f8266d5ae2";
+  sha512.doc = "a3852d031181deeeb0bf81aaadf3d19001605b9fb1a93ac06b02d1c657909686b260cc5894b9798c2098f4f1c938b76c8befe3242da8d125147695f3959550fc";
+  sha512.source = "273f7ad3a288d00ec4d41c82672691f3e10094f10b44492d25f8e4f239730271e796ce09c54d2e415b18cf18499cae0a21ff73e2877fc7e940bcacfd2c82031b";
   hasRunfiles = true;
   version = "1.0a";
 };
 "fouridx" = {
   stripPrefix = 0;
-  sha512.run = "ca4eb5b267771ff164acf006cd69073c469ba97ffe89b2bd2ba7b465942edd3318ac294cd37371d124109e276d101af9d05c464e27819c8f41cc8eaed514c7f5";
-  sha512.doc = "fd58c538d49e799552bef23e71336081332aacf5a8cc730a668d70b78619da8873d112030f504a9b366c24f93c4f6497f8a3c489ef43e91a30ff7c976a113c2a";
-  sha512.source = "d1c197ccd0d1bd9a9da2d189e6ab0be870a51930cf1bc71ce65b91a5bb6cb0fe3762d6b0169d8b2d165768c51399bc66da83735ac4351241881a14c178820ea0";
+  sha512.run = "82e7f17a0699f9255c04fc12f4addcdd7659e1fa8dcfa27eddaaa7e7a4364db3e1ecbdc44ef003a4f6ff55bb219d91d583dd3555ebe923f9ad2ee308f5e68e54";
+  sha512.doc = "8f1b5c7b03d2447daf5416cd2c885dc8395c3afc839873b137be7b5168bde7b686769208abd4a19baf3cd4ce7c80a019ac89871a8d5955e67525460c4e7eaa90";
+  sha512.source = "fb4c61f9b69f38cb7010781cf2bcc7f382d255971c3dc622d8f8bcf152edeaec6c8df8c729f9c9ba75ab8d3238af3b524ca3e5c32916b255acce7fdf62bd27c5";
   hasRunfiles = true;
   version = "2.00";
 };
 "fourier" = {
   stripPrefix = 0;
-  sha512.run = "e95a4183ecb397e4c9e2891361ed73198c39275f102d04c0685f2335cc112f5bd0066f999af79a38072111d810140e39c5eb207f1bab8f65b0fb4cf35aa898d0";
-  sha512.doc = "87ae8eda86509ff38de89842b3f6d38ac4d507caa0cad921a0d86c76599fdd1b37c310a7ef36e450988312b946fab42d61379fa28029f6d43d22d7292ebced11";
-  sha512.source = "b5f53b44d361f9df0ed76c4e27b44f9f7eef643bd5ff83d98770474805f365219d59d65009840df9720922a9f5b56f19ec7b4145e1d3d3a57559c93e5d40f0ae";
+  sha512.run = "b275c98a68d22f0e81e5e79051ee7a0bcb0dfa93e002cb821eb4837dd8e5fe25deff9810647ed78927b861fe61ee9a349971abc73e1cd6f8c133b5d1857fffef";
+  sha512.doc = "6367e10067de7a34cf1ea8688412e8b1512f97e87aa2401c7ea8d980b6f2a3cf7a533441f5ffcef4daef3a5fad4d622f756d484e6b41fcc04a2594a6ef826dce";
+  sha512.source = "a1ca1ec31e9e68d9ce7465731cb5702222648adf49d04f399a40440f767d068ee963692d8cab55cf7ff403928c51a17393819cc870f58df1b69a580bbe818793";
   hasRunfiles = true;
   version = "1.3";
 };
 "fouriernc" = {
   stripPrefix = 0;
-  sha512.run = "7fc4b0334b091948b01dd32d08317851ce9b5878d418dfb2fc348cf72cdefeb7cec3cfbbc23e57fb53a7e879da637dc0daa39b07158a9cf45f30637c5fabde83";
-  sha512.doc = "39b82a723c73e06c80db4e3e5ca0e2067581d3230adac8c87b47dac3e3ed0a7701b5ff7f2f79b67a278d023f308a2152a050dcd589a6a42dd9b06a832619cb67";
+  sha512.run = "573df641b416a3df871c2c8f686329e2e1ee4f118cff4892becb63e5384684f7c21e8ca4e8297c0e989cf4051e24d562ceed046e4ab0fccc1d229ba4e198a0dc";
+  sha512.doc = "180a6bd2ca416e72b8f8c8c6da08a38c2af4d56a993431e7e30d50032c5b93cbdad7641a03790d060b2f1225b941dfefcf4f1a78ebfc007f3835e4e39471ab6b";
   hasRunfiles = true;
 };
 "fp" = {
   stripPrefix = 0;
-  sha512.run = "219f25b4024b02d229ff536a342c3fae088e646f7104acd1d25e55352508922119d847b89dea1ad5ccf3c72a27a38c6548838a979da9a8f239edd9b120012b1d";
-  sha512.doc = "4fc02def06fa1ea17141a2db2e3a8f3d181c05af9ba15f4bda1c6b72e8b7d1f7ffde187d83a83e91adb3dfa143511dd3b38b11829bf3c181ef1395c422884b4c";
+  sha512.run = "31ca9b896d48346f4d2696ef390a8166880b7cfd578d4f5087c438ea1435b3a0af337c9aac84a5835051fdf95fd31b07c073a5b265584a973720905e46e46ec8";
+  sha512.doc = "ca9b6310547c335c4b31aa4089966127f36668246ee1cc34e4c3711a7563e3626c852f4ca14dc8bd41e52248f6279042aef82fac3ea7056115082ed07cabe556";
   hasRunfiles = true;
 };
 "fpl" = {
   stripPrefix = 0;
-  sha512.run = "144864c03e288d22f459e5fd77077b00d6d095423c0ec49dde706cdf286dd09137d3fccec6d8fcef9a1861b2279a7eb91c6966d5cd4af82f21f87dc102ef7bca";
-  sha512.doc = "ebcee5a21f379584b673d28c84f47678f5a805b0350b28c6036cbb66fbb829ba31d6566e5952d5f3d28575cbde92c94dc4a9c22b32fa8f7171a7ed3c38ef28c1";
-  sha512.source = "05e889e5788ff4f8206cd1dd4270ab782bd6267aea9b033d8067b7e0bd813d513c2c1dfb331b6ca8e1821d52aaf652960260492614bba64a2aa9a42e2ed7f47b";
+  sha512.run = "58a368859625637259663a0082994b6d6df31a6c7b6c551e52b64f6ee1974cdd1abf86a438c040aef181f4129c70d9ce6e59efbcd2918a4528563f2454ce2a18";
+  sha512.doc = "6884ba9baa74ac73c78597c5391775a6bd88dcdefcda87cd68fe55c6d042e5dfe277e8bb7780405f6514f98963ae38b11dfb4176f6a31b712a1356e1be9efe4c";
+  sha512.source = "601b39646ead67d397f8503f37a0844c464cc5eb104760dc2c2046b82da28993c681580675884da230968ee3f128183f91273939e1edefb718ba770b3c50dbee";
   hasRunfiles = true;
   version = "1.002";
 };
 "fragmaster" = {
-  sha512.run = "a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc";
-  sha512.doc = "cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2";
+  sha512.run = "1f534934532e157eb398e330e2cbd94e62b419a03c313c492e9125953d1803bacf5d4707297027345d32ef82711b323003582d3caa05bafe903842e0a2fa8a5c";
+  sha512.doc = "09739ee4ab0bec2d190ffc5382242eb8612291a7e93ee0286169173bbb84e5e0affa6bd363496b62abafb220bb2eafe504d4ced43fd75eaa0b53a8ec854a7a59";
   hasRunfiles = true;
   version = "1.6";
 };
 "fragments" = {
   stripPrefix = 0;
-  sha512.run = "91de59773e027f8f9d5f81cf36de437023f30f14adfe713d2a2b612f636de866fb07d59d0dd925d7b40660b4cb29bc243d3e267af74851072f20d49c66ebb45f";
-  sha512.doc = "5e51acadc166b306d7d77e22d1aa330ff091fcd705a3b7f1faa33a7d838eaa61dcdc9df16b0e89fdc3062e111e03fd22963676ecc4e76b280d9356943697e508";
+  sha512.run = "a033d2c411bd6defa3461a036e286e15b779d6b75dcf2b23ed9126bcf048e98b96d6e5c6638ae4bf52daf417b11c1a3245a82b7f79611eec7dcc1f346b48dc63";
+  sha512.doc = "099faf521580f2ab96d6e6e778162d273fa97e916660114275b821beaaee61386d8c61dcbb2f74e12c6b22a456d7cfc7208f0705d37878902b285c2d3e6ff309";
   hasRunfiles = true;
 };
 "frame" = {
   stripPrefix = 0;
-  sha512.run = "d83f39be31503629d68514d0e35f30706cd965b6c252b46a4ad33baa00b1f07bed632bfde7a0d9d0c5a0eab811daaa2712a5957446012f94360511e2dcb9f074";
-  sha512.doc = "c3c26427c8987f90cb698f0901e114c4d08cab46339d65ab1e94ab081305fa315fdc0a9509e89d75a3d2a1162c6ca227e9967d4973cecc774c1b8b814285dc0d";
+  sha512.run = "d630380c648d00b6f1cbfa751770f7a520fb86f5525b986ba565c330908c5f6de9d237bffb1d0c06bd29107bc4f1826aa3bb375e2f533d8f2e1aa40ded6cc348";
+  sha512.doc = "6d69ae2387d69ef3db67174383d323e7cc095fb8a8426658cf37c0d288c57f97e77548e93f7a3faec881d2ce0e617b07076932f05c0d165ec469d696ddf216a9";
   hasRunfiles = true;
   version = "1.0";
 };
 "framed" = {
   stripPrefix = 0;
-  sha512.run = "5f3295811e8d0a6e9d9f647110e1a155de5e4f96deb2d408c0f62d865c622bea0a229334b5ce045af9a5b0be8cf1b205b84f9fd4617551fa4f4e20c16943e6ac";
-  sha512.doc = "1ffe4f361014f0fbe56f804f29f0b4695c17c1e1250e4a18d0549e92b2c02470012188a8ca94b75efbce703cb3af437fc9e2ffa7c3e4425471324c56f38c7e55";
+  sha512.run = "47ebbdd15f22c1606ec5bbfdabf18bdce3d1abdd2fcaa8c3d42d21c8739838d41be0fe8ed9213f17c49d0951526aa5b65591884708833a6ad1639d4f46a83841";
+  sha512.doc = "c1ad8180bc6edec12c0d644bd8694bacb0c2ecd6e946ed54fcaf530aa31f6403a8eea75f95ff6b0127ea01c67f9815bbd85952e682c4b637e7444e1311389d7c";
   hasRunfiles = true;
   version = "0.96";
 };
 "francais-bst" = {
   stripPrefix = 0;
-  sha512.run = "1de4d8ea422be6061e4a6a725d8bb3e820c997a7cbd37e644fa0da79bcd42c9575f9c5b1527f67e87b832f539fa2b2cdbe26b43323c3c9c5ffd892a0c0ad3e34";
-  sha512.doc = "bf1582a21b4c5859e41690b2bbb21367ba903941543402658228b29b864e4b2ba454e68df1bec5197418771bd2fd04cc5840b76e2ef6b28e781664b2028498bb";
+  sha512.run = "277a6e0d711cb0a48ac52ec76b64d8c4dd010124c9b72782d2c16872326b324c49613189c6ad422a88c46326b3105f603346ef5199054669f9294b3f43a739b1";
+  sha512.doc = "6f0c57e703f4fbc5c175ea5b7dd793c5b0a34caf8fc601e0d6c32a43d7469215c008dab7402b314c0d8d6212fdedbbd898d1bfa8f0febe42cff3453e22b5c39a";
   hasRunfiles = true;
   version = "1.1";
 };
 "frankenstein" = {
   stripPrefix = 0;
-  sha512.run = "95395c527475813b7d3f7ac019b012d7054336525e0d432de93143dc000022a044e97cddf006ee3072fe0d445cad7fe98e080362a94a89a332e7b00e30b38677";
-  sha512.doc = "40e3f7ef517124f3c7533d53d1a93a22b4e76176d2f367c0b1d228f030aeecad4d3daf7234e985ccf523220a64d9419bb89e6921ea72fc5296acef5e12d45424";
-  sha512.source = "d2c5908a0315dbae9535a1f043ddb5be71510556694dfcbf687861fe5279e59963715663b35b45a58fe9db57c1db1714a4bdcff51565c44ef346d048176f0267";
+  sha512.run = "ad7e9e38f24e5eaf231685d1be8af70c1a6d875cbd8957f44c01edda48299653e3c3386e427da00de9db6b83ba1e84155f49b68e6c19309e6f37feec4ca226db";
+  sha512.doc = "8d5c2e1c7dca50f4942accd46756cd1730205cf382779d06ce823d9e8715c77e6b9df76780b8dea3d5fa12daec4788a6b302d031a2a956d4c9e05b67d39e5db1";
+  sha512.source = "46b85983d6180871ebc4c80826578956d901c47be460fb2f7c1ee7881a7c8c8fe4c80e192f44b09590dbba7d3e35e43373d2a09cb48a2ad17846193b2def8f2b";
   hasRunfiles = true;
 };
 "frcursive" = {
   stripPrefix = 0;
-  sha512.run = "a8a4c66862cabe7ab1075698f9dde62130e0f1c92a807248dbd29f4ddae382195bee4d19361fe59458c000a8c84a986f6e08b20c0fe7949e0ba28088b063d011";
-  sha512.doc = "c38e35b00b2d3d6ef522ff07780d4a64cdae82094a45ad985897fe2e1726478780139786877599cad89076aa854395ebe6ca86c42f541484c8bec15a441893a2";
+  sha512.run = "9e3535dc5542dd16c0fbe0347b8086148e35f7494f2f83a4b191f389c5c3694770284a1b44834c1897385dd08d1feeecff48cf23137f1497afeab4b663bf53d5";
+  sha512.doc = "1c930a082401b92a0dbc6b83066e84d08f0bc55e8b98918d1d35d526f5cf94d5bf679f4bae5b318681c6044ab64474eccff80a85e82e1dedd76f7e70351117b8";
   hasRunfiles = true;
 };
 "frederika2016" = {
   stripPrefix = 0;
-  sha512.run = "5274e2a781b272f0ba48141bd361d1445e65ecfb0d62d770e51eb044cb6c2d65b290898923205312b801e9e7270768f59f1ff25e9a5f88b667775cd6de5903c7";
-  sha512.doc = "cf34c4e2ca27927b9d8defeb9ec113acc3e7229d6146f42bf2076b86eeb30059c42a782b4f1e7fca5dec617454021e11e7edcf4bc738f4893ba4c50f308cc96d";
+  sha512.run = "796610db48d86b4e90207578917546955bd13e1793b00a6960cae36696d9e188a350289ba79c3bc8f4840b405f97947e0b4a39607521bf1f90896c8dfb25e54a";
+  sha512.doc = "db39b9e807f7d53a619ad0679caa64ce40944593fdc1e9d2666c71f5e98e22e18f2c963106ba675055ddc77c859312a3a817a9eb50dea076ccfd45a7582636e0";
   hasRunfiles = true;
   version = "1.000_2016_initial_release";
 };
 "frege" = {
   stripPrefix = 0;
-  sha512.run = "a091472f9e3ef8c92f02d65a15f083cd287f00da280547d2142e8b811ac61bc881554872c0e261637d4abc734d578600f354b803d44016398a95160514b47770";
-  sha512.doc = "1a69fbcbb43402d057952bdf89f66166d57f0b7bf2955e615d15e6984f49beb363de6c242824c0d4ee752cc24ca15b1930b44d64e6c6ce0b924c98bcbc1bd180";
+  sha512.run = "2952ec6f6e6ec3e8b2a5c4c923bbdf4dd8272f28a54202f740f1daa864f4ab671d973a695e3a606662c45440c9ad2d2368d1c585e32aa1924bb982b8d02d1ffa";
+  sha512.doc = "8201b7d3e9476614b1d5622447795457b01388c2015d623590a1f85ee848038b3c6975f9f8730467ea7f9c03a6cc7d65905fcc3423808014007f89e5533cf852";
   hasRunfiles = true;
   version = "1.3";
 };
 "frletter" = {
   stripPrefix = 0;
-  sha512.run = "d986276b9c318c46804851fb67f51f4c10fe51cfc271baba560cafd0384825d8e6208ffce2a8aa61e9852a6987c0c4217825172a1ef5ea26ea5018d86e99d396";
-  sha512.doc = "f4100dbcf33f0e2f9e1350505e3fe39d375156f3ff0f231caa9be23ca601d5d1aaff1431b74abc4b88ea76f109cb710ab0be56f466df368c71d224cc3a2f8e14";
+  sha512.run = "3d71b22fc4f356b09775b3bdb82bf70a27dd8a08b4cb899986bbf575c626e74a04ff5bec7df2ee3d03d6e89b3a6ce1822fd49e14e18bd4bd969b61e78bd7e1f0";
+  sha512.doc = "f44d5518d3a4d78e7b59bdf2d484d21ed1b892288193d1bcf2c93e42f9cd6318b45efe96d7642a97254f52c0da63e0fe844ae34c738bb64fdc0aed8ec0ca9ec4";
   hasRunfiles = true;
 };
 "frontespizio" = {
   stripPrefix = 0;
-  sha512.run = "f978dac45a8265c99653e91acf940ab8a59f5085f6bc18b33ddffde43e3e6f66e5380f85e8133f80ec0cb8fe3f890073bf6d16ab5359e7183a1d5a68e9dd6393";
-  sha512.doc = "a8ba0edd988c4a8024112395535c8c92129c4456d76dc991d64b0a2cbefacdf0b804e118d7f8e9ffb59c9ff51493d1a3576052d4fb9e75a9a41ff0d7afb7626a";
-  sha512.source = "53d642b72dbf6b56f5fc88ad6b10b8cf07cf181a3a6e979fc55ff91ad4df527ff3566d0db5e97a6bb90803bd964b6198deeef210dd2cd1e16e04e5845b79fa14";
+  sha512.run = "ab73d2883345ee9ad92cd2bc1a01560f62eb399284dfccbc132a482255d59a3124c595ac40e47027bec02058a143d9362bbcb6e6742e458324b736062cf28ec4";
+  sha512.doc = "659dcb35912a4cc82f27e126e8aad4a9459673ebba0722614670f27e14d0ef434873570f5e64550b06c31a49c2fa40b4a0e5295df7ae73e6f4f6d366a5030da0";
+  sha512.source = "7023a33cbb831d9b83962400312e5793cfb1a07dcfb476f17ddf9ceb90f7fcc09d076773716d8ef3a5c999ce5760044127f7d6c0c423e1ad8abf35fde322f6c8";
   hasRunfiles = true;
   version = "1.4a";
 };
 "ftcap" = {
   stripPrefix = 0;
-  sha512.run = "c967ee42a9b2815778771d7764ff7cb7d7ae3d23b5fb2565db16b2424469b2f08887d5048aef65619f1e7568b871195736a079bf8a4adfd9bbefaa5d3446d2fc";
-  sha512.doc = "8b7a3e2589003ebc218f1a51814235b2c0474c6ebcaf4aac03bd19a04bb667be3565eee7d58d1ef7c1e6b8b9738beaaf76f8321d10bafa0f798ac8b6e1c3c838";
+  sha512.run = "58ccf3674d424dc2f0b8a948603824fcdf621f054cc9525775663a5733874634eeba3ee8a2c0e7a1492faae6d0b4918754db92573961de343d9a453b1c0c5eb1";
+  sha512.doc = "743d53a67cf7c237cc6e75a9a6fca9a364d5d3c9ae37ef885425856d6dcdb2e961d004c8043532a6baa1fbaa51b4be81ba8cbfccd18128fedfe44c62450046e8";
   hasRunfiles = true;
   version = "1.4";
 };
 "ftnxtra" = {
   stripPrefix = 0;
-  sha512.run = "889afbfeaf22b1219d685e9b24a5095eec867cacace75dfd865c86b2e8370dc945761bb6819811ad62f908b2ab66101fdcf553dbf9c71cdc900af91ca6c9be73";
-  sha512.doc = "68b1bebc65eada958fe1f61e243e8399aa294a2c21483f70edfc43c1b394ce8a46bc639c4333a697cfe0b87a91f7ed4dc720ef3aefe34fa1758a916b882487ad";
-  sha512.source = "8b8f79ab74d2ff51eeeae3a9a8b3e3d341aee23aeaf2cab834019bfa70bebc968e7bdb0835e259dec331f707ba9ef14359f5fb6a024d08cc1c0eee5985da01e1";
+  sha512.run = "b938db2391007e8c0886b8178b6e7c77d420fc15df8b907ca1132fb27d691145a3ef4caa72eea6f2e579237c35dfbe0d3e2719185e59409dde946dad536358d6";
+  sha512.doc = "441b712c5c0fd7657b0ef6db2604149acad27c1c2e55ed4d9fe7f87e714888ca7ad2d4567ecf61071dbb6c9afb4c8dce4c8d82d338be701bfaec2fea5c634ce9";
+  sha512.source = "b4fadec0bc877799773060c4625dab892e709037676fa5f8166f87779ed079ed7651f132dcff3c7560ae31108653537a47cd93e1cc9252a61c1721ef6cc481c3";
   hasRunfiles = true;
   version = "0.1";
 };
 "fullblck" = {
   stripPrefix = 0;
-  sha512.run = "63aa1a21c25f012ff87a4db1a343d1657ac038c733f2c151d9a24d4dc8686b63b3b00808651fac9496a40e16b2410a5b5827dc1ae948cd57dc43edd6fb03c79e";
-  sha512.doc = "31bc4855c39ca83e600cb30ab0651fc79af06d4598771b963aafdcffd2fb5fb055ac15aa0453682801d1253c69d6895ee082990d7eb8492aaa73fa1c214b6f5c";
-  sha512.source = "7766d631c992a7126bce2a3ab55b9a1a8b032c34de9617303b48c9e33bbb8aba36af63923c6dd7c720bcdd039ca9c84b7d2af30676a82c4a028c1db3995cde8b";
+  sha512.run = "06cbc00a95c7d5684a1eceb477685631f054a8200190c0cc7472d68587b125f95d2cad46b2189326b7edb11476914402630d0b74d6321b0c3b7ccb73d21480eb";
+  sha512.doc = "84bdb73042dc8556e9ae4ff9cc3f996f12cf0705ed5c076f8aae799e51c3a188a9c7323552f3a0d04f8747adb8c7a8abb6f1a6e1f051f08986506cdbab6afc0c";
+  sha512.source = "b0b20e4918fc456ab5919e24b9a4371fed56b24c1d15026f7dec4b91aabcbd9647497671ad5d951848db2092709a89f223b5ee82a8a4da0bc7b46bd85fe07177";
   hasRunfiles = true;
   version = "1.03";
 };
 "fullminipage" = {
   stripPrefix = 0;
-  sha512.run = "446f7a6a66a77ed9bd51e31e8ca8276b65e8a8a58b2885a71876cf8f0d4eeb0ff4a4902a256888606a265a3738498ccdcb195f5ca7eaef90102c69f0e396b103";
-  sha512.doc = "70d2855f58d2edf9eb33bf526b13fb4fb5ce67418a8010b6095ae98e28cc961d049ae4930b06df8e56c427193a4b85cbc76085c169a6a0f62c312672d7ed2e4b";
-  sha512.source = "c1b717146651147bc4181b6210ae83e820047a45911ceee28036d9235441df331907b328213a75476e547fba24a6eaa85c973f283914aab71cf3cb0e618cb254";
+  sha512.run = "42a1a17467872eb2f23f8abe0e5661020ef5e6c310fa09a56e71c73cc420db4956cf6e5512afbbab29d57f99f56258a83348ad7ec8f73c2195f49309e54cc0f8";
+  sha512.doc = "19d3d3c4a56915885ea1b33f775dbaf4e6ed1342b797fc6ad2ee98304952374d7972fcbb1fd3243a97e2adacd1ee753930c3407c03ec00de351e4a12a209ae61";
+  sha512.source = "c8c88a5cf32b46762e6bab1549fc441bdfde0ceaeafbea1da5943f659575b5ff40621b083e65672d26f677e8f599377c510c99596986f12ca46901928200ed55";
   hasRunfiles = true;
   version = "0.1.1";
 };
 "fullwidth" = {
   stripPrefix = 0;
-  sha512.run = "540ad88ddeb2aab8cef489c53eeaea4c6ddf174140879ba431f913ff2dd9a6d472dc01112330e2350da41a94d462eeaec35231de19f2b577f6f2fdb5a6a0a321";
-  sha512.doc = "e4fd61b04a8309735f2053d78a1544e4b88b16d68434fc1b0b14aab128383afd6e075df4c3539341bf8d4e2c0bc6fb16ff2396e0fcad0c64531efd92bbd4409a";
+  sha512.run = "ea79226fe4c421f9c6059e58c9c1d47c6bfca4a4c3fe24f10a42b6409af157fe306b524eeb090b7cd5cc72256fd2976b37fda2f546a4869635de6b267cd0843e";
+  sha512.doc = "5e7fed77cf33115ca40cafc71e00de29497eab384bfafafc920f9ddca334ef0e3bafff72c606f2d64b7b1dd3fb596f8614664043ecbc597177c91a318249bd1e";
   hasRunfiles = true;
   version = "0.1";
 };
 "functan" = {
   stripPrefix = 0;
-  sha512.run = "b3ad3303049a11885d70aa99d0dcef80acb775d3f192670301941965f51c1e83c305ac8e4b2da574f0d72b5ff39a8d29c4afc2318e7006c59d736915df9b6312";
-  sha512.doc = "8e21100d7bf86fe7a319afbe6b3b19cd111358c50ede9b9989698f871cd0c6399482307f48a4c7083c80bce9187e67b7a929c4085690b0513ecb4a89d1c3dfd3";
-  sha512.source = "887374bfd203e56bf029e198e857e44d86a3d0c2ac5de6213e1e9986fb65c5a4123893613dd324a45a6a173e076fff43084e12ebed52258488f22ceab5a483df";
+  sha512.run = "87ce583e4626798b269af7e14477c1a17acc79bf63888dcd3aff36e679cf87309914bab0794ae7d832e2cb549fa7f7b16d1c147299ec3277fac911a9874119d8";
+  sha512.doc = "9904a29683d4569bda2a1d8cc749251ffcf073b3fe0b00bab0b8a36e672ab6037677fc37bb09aad60050193ec35525d1bb5c85d920b452ff9693e4b417d5117b";
+  sha512.source = "1b963b9b405bce32f5485782e12b9808081c93f413f43da1a63d1ac327a008d0f7bbf5b811bbf3d0527c5833ed9b170f36e515e80e975ba191d2b15fcc01fd56";
   hasRunfiles = true;
 };
 "fundus-calligra" = {
   stripPrefix = 0;
-  sha512.run = "16ede7ce82e4b655b2d4be677feb294ee1ec6e556ab94cb2fc8bf14ad6b56f9869f38be4c829b17ee20ab27c6b777d2f4b496c2203852514f633adebf7bd8f2e";
-  sha512.doc = "4adc5779bde2daac2231f0ee47f7470d79d96e868a25b1261fe62d9140b3c99680764094eb06dddf7f1ecac7c4ab0685ca13ff612ecf365e06618a0829084071";
-  sha512.source = "b3d7f3272562a3a2b180b8d69b50842da19465e6c54a033c2a6a0a41bb814a83a9308f4f22586107fa997b26aba515e1fbfb68b5b548fce4d590a1ce5bec7294";
+  sha512.run = "4e4af075b48df0727dd46b3c7d00f690e2100e3c341437313dd2e5183db2c0173e705a72964bfe0aed2b9ae50e74a1338a7ec3ebb85f07ed2204d93d506b21a5";
+  sha512.doc = "4e8c4e6f5bb27edc11ec331c9e6781e9f08b9870f2e627875c7673a2692b82a3d7ecb079abca94af447be024a4ef215d7cac14773692d58a9f09f74a2c70d916";
+  sha512.source = "5660db1f802c5ed82db18b8e23fd8aeed8d5ff003e3e0c663431c398b933a24229169c969327e11863ba32c56383d876e2990193434ac0dd05ab1688f1cf39f3";
   hasRunfiles = true;
   version = "1.2";
 };
 "fundus-cyr" = {
   stripPrefix = 0;
-  sha512.run = "6963624a9e6fa1acb3cc7b43864a4fdc021f4929feec7e501c903e523d32732323d22774b77d49cbf21184a2ed7359085628ad8455d61242a000593b26f1d47b";
+  sha512.run = "2cd1ce802b9d4f60e547177b00b535c1b94aabb1e23a5da29fbcc8fafe85cbe84c5bd23a62ea58b496df95bd50b9cd72bef91f2533429e437072d674a4e8469b";
   hasRunfiles = true;
 };
 "fundus-sueterlin" = {
   stripPrefix = 0;
-  sha512.run = "2fa89198d1e1dccc2b7938aad6a87c322d97cdf53fa9355ddf329c63ece147a58b38240932335986678c57b66f64931f2cacf30a506027014a0bccc42962af16";
-  sha512.doc = "e15b07ff8b399385399314c7ff9956e19a03da2c8dd99fafc0f88e32e69a32eafa443a1f718a0c433169e94b06f700c1a76e85d1bff367cda79f1c35588fcfcf";
-  sha512.source = "49cf09e188424a9183cc18f58083d5438619fabdb2db85d0a2a161fa941ee6252fe6746a8c0272fc2563f40adadc053df8e5dca8d52520737634e0947fda0682";
+  sha512.run = "eb9062aeb2c888aa4cac7dfd4cea3cfa8d697fa4674dd0e1691a0b045a5a3b1ffd0efd2b602a6b1f1ac95f5b38474f717fcb6fc9e3c8e26b1ffd48ea7c4fb23f";
+  sha512.doc = "822f4dbadda70995fe25be9b90f7ef4b929d6109a6b0069d596dfb1662438ed7d08ef56da0ab7cf62207616f81da34f598337d1613e30f9b9d72642c125a1af6";
+  sha512.source = "16cf25413c96f27b05d2857778623ce4189309d642e29bb6b0360b6430e63d0fc4d63438f9b16cd7fb1d5491fa6995fad795f6481b78bdb31b73a471b237d771";
   hasRunfiles = true;
   version = "1.2";
 };
 "fvextra" = {
   stripPrefix = 0;
-  sha512.run = "3526c3656124b15217161792f14f914dad2ec84af7ffd85f95654701c82e3be6bde304df0ca1ba8b4eb943122e731fe7c059a0d8ba7554f49a5401be6b709d8a";
-  sha512.doc = "919cff94f930cb624723fdca66033df39fee4dfe391df4ec592ded2a5c9ae59a9f29594ebdb09c9d9e54b5afc9dd77591258155530aa7c8fc45361b8dc31e8c3";
-  sha512.source = "934d419ca8e4c748f0d7d41f520abd07df4682295c6eef3390b9d2d628469d0d84ff7ffb707f1ee70b83b0fdf42b16ad9ad350c4b5166b28117543dde9d7d049";
+  sha512.run = "8a265f6b8a745965950827dd9f24952c9448ec11bdb71ba8e88779f814dfe97f2c4311c02543a086b69886b9a57ba6fc2d8f0f9f44c3faffffea0909d44e054b";
+  sha512.doc = "3d83960b862c80d9969f1bb943dfc7d7ae60f33ce122e8e740ec3237719f0c9dd4fe4bdc855bc0806026b37fdabfdcd6a4ce12e7a0fbd640279dcb129a7dfac2";
+  sha512.source = "2c86df002b859e0296493af0286ba36501eaea7f1b1f965cae8ba408b9bf11dbe4f9708b8ad88f48aeac32b696f53a06600b08ec375ad5e547d8f1715e44f963";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "fwlw" = {
   stripPrefix = 0;
-  sha512.run = "9f4c2259c70cf75b9d41d0b4f7727c2b7c8769b1c050d9732f423234a14da41afc9ea6aff2ad444a6d04c37734124cf16d9c0fbcfac26bea47205b602ec0d9b4";
-  sha512.doc = "6b4b2f7dd05eae98ad7d426e0b6c6ab749d4eb8f8bc33ebe6ab5e5e635c8a67dc814c931b20dde6695e5c16c5d33d87eb83e0c0bba864626b0b80ac5394baf44";
+  sha512.run = "9f4634a743206a5f82c95ec5c2ad247280ff8b8e95b5d6e98d4171635d9c226e3b0232e6507734e47592ba04d8102a8b47712d67e08334b9be4449b2330caeef";
+  sha512.doc = "8ebee4e71f6486fe2ffe05aa9aceee4462fac28b43ebd75dc8a5556e86eb96cdc2e03fec23a3d2243505168a8ee5622486d7081c99c9a8c1d0246b8f389b1115";
   hasRunfiles = true;
 };
 "g-brief" = {
   stripPrefix = 0;
-  sha512.run = "faa1255d7714808dccf1079aa4875372f35253998dcc163574d32a23b69ba8de16d0894859f6f3be58ab5df3ebfa382fdb0f198c31d84bc4c0b0f55f99cc7315";
-  sha512.doc = "051c19011067e135099e4c3bd7af47a2d0671b34cb0378c54816dbed1ac97aa19e7a64dc46c380eed2ac7b32b0601e16003799b20487680358b25adaff0d400d";
-  sha512.source = "cd1def237ee4cd76e225a1476226e9fb960eca128e727d574c38166b8da77c290ae5486df99a3ab01bfd10e61ad46ece0ced8e2b3824ff07847623b05182bdb4";
+  sha512.run = "c88997ad2c25f864fbb3b7acad7b19333cfb378a9e02df602a322cb2b5dba7bd29c4f0a0dfb7459996d2cac6c0b9e3de22431a3e1d6a70cb38dd8ae0415fdd7e";
+  sha512.doc = "9f1e97232b00ff2afe7d2ad550dd14e1e860a95ae55f9f3f9e94ac9b0314b6f0afcc63aa45875db65ff8d3e5bddc76a5ee4dc7abd03431efd65d7191fa9e4d85";
+  sha512.source = "4257cfbb187b7a68797a8bcc31967a4fe95ae5e57beb9f5d4db5bea360e0a93cc040bbf4c5a2ff38d60b4582cebfc1a225c620837d1f490507fd6554617eee1a";
   hasRunfiles = true;
   version = "4.0.2";
 };
 "gaceta" = {
   stripPrefix = 0;
-  sha512.run = "c5fbd062f8861bdeb4cf3fab803f8eac24962d22516145ead65e03312cc42db85d4a659e63b6f6db3045c5bc2caa3c22c946f7bb1d4e6a3fd6bda86162e35225";
-  sha512.doc = "c9680d24d4ff2618c7874b231f22425738669e4eee74c2e8113efabed054f5ef8cea167cae571ea7e675860639bda83e6f189590f3ed54562eb152b40badb971";
+  sha512.run = "4a99b460e2455da5e82cce23884e7fed1543f942152c286ce58984c64bc16599cd9e5ad4cc2c2143cdf3c624737192a124197fc97e4c2f654ffbeda49e81a89c";
+  sha512.doc = "97e7e6abed0a0f3946e53082e81970344d27ecd95f7245fdf419d20f061d994b45a5aec9369ff30aaf1a31e6312cdc42d8a7eecb3a0e237781e13f8eb7f75c24";
   hasRunfiles = true;
   version = "1.06";
 };
 "galois" = {
   stripPrefix = 0;
-  sha512.run = "c1c53bf7c30ef43f826ecfea216beb6e52429ad0e548b2298d7631d39e2ecf35bb32690ffcc1335f7879be207197a0033d4e40daaf4a635a625a5ec648592806";
-  sha512.doc = "d8ff051dcf305eb43c7a600242140b5c07b53b55f1fd95a81ffb485a54651222524d558b70d818d3ef88835aef613efa74c104ce2d9695bcf351b6b7bd67ef0d";
-  sha512.source = "b66f67fb6934eb818ea6b476e83a236954fe366c314f846a37d7947af7ee2d8c94244e2f4f2bacd903056ff4a8d5d3fdbd6d39b35ae76f816689872fbb5c4eb0";
+  sha512.run = "bcab33037af8e711038628116c7e5b4c3c0e8fbc59df940e95c224379afa44c17bd9f551fb1b9deae86743ecccdc3130e80cde803f9233c99236add31109d52f";
+  sha512.doc = "938ad234561f95a60fb6ed7e8aa3b88aba63b7081044e37fdc5ec0e7b2eafd92afa919a927be6902a5d6232817941336267b8193d307e4de9ab2d58acb93d9cc";
+  sha512.source = "9ab411987c51c647a732dcc9e33f14780d45221698aabaa9d5a569212cc15d85d1bc4ad76543364e1550dd100d34ccf447b3102a449d6b55efd27ed73ae8cee8";
   hasRunfiles = true;
   version = "1.5";
 };
 "gamebook" = {
   stripPrefix = 0;
-  sha512.run = "90b7338db32a87778554f2f2d00ba9f995a98e45027ff98e9ad12a709bc53a2ff2ce8b1e66fc974380da56ab2ff21fbaafb138ba0b37f018fa65b7bc7bfa0936";
-  sha512.doc = "bee5d4d93a284e5467eba372a9116f329b763e38ec703dc1ef511a92da6c245a9a230399b2464eb78c627916b13ef491ab68e15793ac545ff0645268f6097609";
-  sha512.source = "2be9013f821604d7f5bcd45f0440bca95db89c99f1b310bd8f0fb720011ae1cfeb4dc0418f29d21f096d7232fc45f86211208f0414427866c2d28f62a401031c";
+  sha512.run = "71d9fe895c72854c43d79b5ef48f8cfa4ecd12f6c3a5c9a267b3b67cb1d549c2a910c113801a0dbc0f3642c50dc54395edb5dfb369de284dfb95935f98cd682d";
+  sha512.doc = "49dc32afe21fc090a1f8f0c1f8734ef32b82ee41b5586df0bf6fadfab44f152a42f580c0119fdc8ed11d961a0b1b86ad9c900228a45ab91aa140c107f5769900";
+  sha512.source = "14718b4e3f70d98934662559b263c5e4314e745b9eed5a0a04ef3788590f4ec206eea1076acf5c08b386892cf2b7c0235c1af7bd1d075b00851852edf754dc63";
   hasRunfiles = true;
   version = "1.0";
 };
 "garrigues" = {
   stripPrefix = 0;
-  sha512.run = "d548f711c7c28f3bce9a272a5aabae04e20da300e4ac3a234de464b50c32eaff6e2c1e5673ac69c256c6715b02f7dc3ebfcc65919de502136f07ee00e04be7b6";
-  sha512.doc = "464f160d4dcccdb310efa0f9376d9517a04e4d24bbc0476c7bd5871efa9b2736a2731240f813079bb01ebec2425149465d165aa826159366751cc56a8bb13012";
+  sha512.run = "04ee1157572ea1ff83d648937b89b43c86fa10dd5c918b57eb43944e2886e6f6899618b165f02573e436b5726f1f82f4b4c1e5f28f7875fcb313c30b8c856a17";
+  sha512.doc = "ffc59bfba07dc6b46f4c63a05d22722bebc6f87052f3ac72472bd2ab0f5b3cc8a09f06e262c8db0392d11ed12cc14642ff10ece036b86a6d73ae0dd754f8066b";
   hasRunfiles = true;
 };
 "garuda-c90" = {
   stripPrefix = 0;
   deps."fonts-tlwg" = tl."fonts-tlwg";
-  sha512.run = "5b8d4f90d4586e96fdcb2e6943350d329ef6f7ca5acaa70769420642d1ff624a06f4d28495010e9ce83130aa6a7ae207444415bbf94123ce97903dd54ca21e6a";
-  sha512.source = "6e864f09d27a1137f2561f76b0db8a8973215147e12421862d38984b51ba1f42c5455f12e168066ead5529a63397488aad1e36bb6bd56f747e7ff439a772425f";
+  sha512.run = "de8cffea9686ce311383b647a57dab4e6dae6f9a94930e17d76f13fadaaf762c986153c75cd185fdc1bbb7719676d348ea66779d6264b176370c76c379900799";
+  sha512.source = "699b6922116896b06054edc7e8410e66f7e7485adf9e02a12e78b68540ccf1aca00205749b0589542e32c26a7f65915556f7cb764d0a994c9c20c47f874f3a43";
   hasRunfiles = true;
 };
 "gastex" = {
   stripPrefix = 0;
-  sha512.run = "84cdc32f9947bc5abcb0e9280b47c4808cf5cf910a9c3cdbbab3acabf687cf7a0eac20585b2b492f4b2931897af6586a9f2a062b9e23c8c104e2817527895fc6";
-  sha512.doc = "8aae266295f57dd319060105170ddb2578ad9e05b846f5e3aafd570266a1947a943946be2fd3e7d0b6cea321e555747398a921585b6b062013f048bc2ae80dbe";
+  sha512.run = "02acdaee5e853c897f459a2adf0291d87b97489e0a87d6c333150abd073fd38c33593a5a826bfb670e83be200dbe239f732610039ec2ad5055bb67d17154267a";
+  sha512.doc = "f0f631824a24c4648cbe2c525c479861e33aaf05818efa3a7e1a26734015b6b44ce241a30aeeb1e682ed5f57b03fccba9ee5f37a97e96bcfa8292bf10e4c8634";
   hasRunfiles = true;
   version = "2.8";
 };
 "gatech-thesis" = {
   stripPrefix = 0;
-  sha512.run = "3d290a07814a7bf1d548fea587c65d845be84ab0f807da839be5f7fd61f223703d2b7d7fc4160cdbb9dc5c0f65c711ec23c5560136f0775766414c918584acc5";
-  sha512.doc = "9e810391f5c2a4fec787ab0e60deff43ce342978727f4773cd90747421db7d4f24bb2e956ae2745c2d15b574f10dabd44e3d4ebb13203e8c893048b23ff0aba3";
+  sha512.run = "507566b1712e4e246424b8d87c659f86b2b9913dbd1f2667ab208f56636bdd9d8303b6b5fd3580bfbb85291ff4d3e5bdec42a1f5f33b858a880bb19122d4e0ad";
+  sha512.doc = "626e2067d411401fc0a43cabc6cfb39128ff0e1fcae1c4b7d2d0ddc113c22f04b13327f133eaeb365588a782c2d7c834026d057ca35269ee52f09a10c8f18117";
   hasRunfiles = true;
   version = "1.8";
 };
 "gates" = {
   stripPrefix = 0;
-  sha512.run = "ec85e8e306596d17b0328520c66e039f333e04121be463c3027a3841fdf4d3275eadaf04615098a1156c14d305e4173dfe3f2f471960bd462f18ccecc4b62cd2";
-  sha512.doc = "051f273fb5c28c25acf97e05451c6b1647efbc17578b43306a9aa2e693f82031534c63bf95af13ce76e4966f1b1484c49a672b909a7106e3faa31668ab9b11ab";
+  sha512.run = "cadd90a07909d9f1248ba9107fc8af64ecb54df7bf1c63919c30ecc032b496c11b346490c1b37218f75a1d191fddf11208a229dd9980e4a550b4af71700ca947";
+  sha512.doc = "bac81ed9937b5d52c4a9f12a31be2614734460d382cf5e19e0a7387f66ab9b07a4b3ffe96146fffd608b4d89c89d5ab925e15feec0f3f0ee47ff359e7a8c0b1d";
   hasRunfiles = true;
   version = "0.2";
 };
+"gatherenum" = {
+  stripPrefix = 0;
+  sha512.run = "0819f78de222816110286cd765b0c3223e5ec467fd230f065fe283ca0e4340dfcf8d73862c8df5a7e9488f1ec68c2cd2e6b44a646fd498360f3013d9853e525c";
+  sha512.doc = "0675c77700e8dabb9613e3a5a55c8151e750152c9a1cd053948b34fa80691e6d92e2fbf72d5be43d617aeefc9be5910e716aa1ea0cda1db6106be42285606219";
+  sha512.source = "4e6eaa37129662dc756780a55cf20974b07a4a5cece933c8407d10fe91b62c918eb01976c15541d384f583dc40b61a093ea1c0381dd46f2dbc5b8687e0ca27d3";
+  hasRunfiles = true;
+  version = "1.7";
+};
 "gauss" = {
   stripPrefix = 0;
-  sha512.run = "4df107ea24d37b30d3ca46c833b9f482bc67f3ea3da39ff6e72fc175e2a1368209cccfb1a431dadb8efac178b4e33922e60d58073a58d2da455f0aa763d3e393";
-  sha512.doc = "3da609a92d88df54674680aa2b0dd3edaa1773241bca205f418f7d6a97ce1fc0024b9a61050aac7f4f61b18513ca390e892b3f7e3c3f7d9a3dd0582195901ea1";
+  sha512.run = "faed4d59d517f2c215d2467cfe5212e9dbf38cf76245a9eb287d9ec172fb3c25bf4489e26c02628ec836e69a8e0292a12d92c505eec1f71b45dcd0d3bdd9ce7f";
+  sha512.doc = "d0253226c286290860e0d5e9a806d98fcecf3b8e847a039c1c08deacf64eaaf57b3bdad019e8af3d75fd5f19f88eb282c7c9815aa65bf6ee0de30490c017e595";
   hasRunfiles = true;
 };
 "gb4e" = {
   stripPrefix = 0;
-  sha512.run = "1d94d3cfff237ede5a8567f25a19f055d7424e9d4f3bfbe5bf53821393a37559a4125309720f3666860aa1fd7574ba4d535f76cf72cc910cdfb82dc3a7c6d819";
-  sha512.doc = "592c8ff372189df544f3fdba2f324e2358af0f8fe40f367c79ae12b57c8b763be06e4f12769539e7ebdd8edc4af03634be9b51e0ac7fd3540210039a55874086";
+  sha512.run = "b80d116441b5b64dbedbef647fb827083ea6440ed903098f62e6ba29352ee8875652ece3ba4ef03cbd312956cbe3e12555824766bc6cf21b5e6c47e15208369d";
+  sha512.doc = "e97f5db682638fb74215986d85a8ae4ef1a50c415b5d48b202a3ec4d97d82e57f059f9e86b90f4a954d3a56260591e45ac023e0512050807907394e39e03c02a";
   hasRunfiles = true;
 };
+"gbt7714" = {
+  stripPrefix = 0;
+  sha512.run = "09109545412bf81801f5bf3ff2a11c499c46bf38042602a7c16026ce34f6d223c53aec6983c9aaf1bd3f98f020f728d82d1a51f883a0ac77b5ae3c489b899262";
+  sha512.doc = "663114268e2f5459d2bc6d28752d01483a88bfd1d7abd6d98dd115d421a25fab7acddd5892e51343906cb71ef153376e6ea6c60b9cf6e65ee7958dff4a2ac64e";
+  sha512.source = "10e7e84891458b374f7fe70b9b6021cce8b0bc9a1aaf57a673dccb014bdd4567300cf80716f1a11ef8ab35a5944c909f7a7781145d6668a4f79415fb6c95631c";
+  hasRunfiles = true;
+  version = "1.0.9";
+};
 "gcard" = {
   stripPrefix = 0;
-  sha512.run = "b5e551b71933d550e3b1cff598cd96805a1fd5b5c81848256ee42c333da961038407623e62cd6ec75e1a1f3fb045e9b945fa2c98fb2c2e4ccf42a1132d28b3b7";
-  sha512.doc = "4fdc56ab41e2a68392e6dca5660aac2091ac853e6c9a41c2dcb2f535cf9b4d27df43193a34a477530cef9488f0deb12d3aa368b64b200688f93260e18c3ed85d";
+  sha512.run = "47e3b6d7910616831a4e2a3b6d6b77365fb5fb6ed2a7542f08067fe5e31fe3a19c4dabc232e41ee0f874d62277dba6c8587eea042512879f1993b5640e57a8a4";
+  sha512.doc = "f16c2f67c1d7dc6842c169b41404090c0d8702692deb32c498f1adf6a48ba7aa16ffad49ae7e9a7cf628d7e046ddb02db82dabf2a0966bec63bae77ddd9bcd4f";
   hasRunfiles = true;
 };
 "gchords" = {
   stripPrefix = 0;
-  sha512.run = "7227cd18daf37b84b9a3ed66b69ef54a449699b2be7fb1d224c5f031b6c3b66aa97ae3c518cf464329ffa53a584b0d493277b551811d3a85e08db146c71b4c81";
-  sha512.doc = "a9b1c7cc1c414c9413714407235adecf72cbd0794966c295e5d41910da8298604459ca69ce74e69c4c00188610a1f77f702a72eafc31c11f43cdcf151f9d60c9";
+  sha512.run = "620ff42fbe396f13cb4d4f83aa5b55327638fad8742fd9004f37f6382e3584a957b3dd3de3aa9691c71fe2e80c5f89496c0acc7a9b1df9da6d13b07152c17734";
+  sha512.doc = "ff33c35bf00084e05a4e7d95030d34eb382ffa136289dfb4ad02fa831be425388ea51a3ea511fcaa103dbb6b16785e8a5ce44b7d45cc697f29e8c06b9c976687";
   hasRunfiles = true;
   version = "1.20";
 };
 "gcite" = {
   stripPrefix = 0;
-  sha512.run = "971dc3269af37c685a278a329214f85c37345eb0ae7699c12a45ba7ceba7ca9fcbe5ef2e87ef4630e7d7d45ec503363951470f5b3e679f1cc3572027e43cc67e";
-  sha512.doc = "00a21e3edf75a969363452f522684243df324b45c4d855750fb2089f7e5ee0cf9e57f8aaf071d62332f8ff95da41623a4ec7e761191bad77736d1ae4205d6dd3";
-  sha512.source = "26679a19106c24b8e643824fb5845afbf9fd23bd3402640654b459cf5cb9d6e8b8e2eb1db636b1f5f51d659ce0f1c8caa0be728e94b0a8f83a2aa972126c36d9";
+  sha512.run = "9772a2fdc8a07abefe7881c662cf5469cdb17a41b80e9ae9aee6e8ee01d4d3f42d55fe887277dfc5e912227a672db89ed24b26b948ef20e919a770c12a59d765";
+  sha512.doc = "15f2c59104e5d320de4f76eb32942c67337eaa9f40bdecc3d19edae98a675207ddf8d7f35cb314582554ce44432be2cc86960ed830e0a362ecb59127895f4402";
+  sha512.source = "f3e6ead38a6026c0441d084f921a78a0e0942cd4befbaa39df39b3b0f9d8cddda7f5120cba432df78f3a5d341c150463123ba86867a46b98dc155115d64e96a5";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "gender" = {
   stripPrefix = 0;
-  sha512.run = "d19f068bf20651c61e42df98f941c0f0c2eddf4595e54e91db0faef530718b4232b9512d0a759e8a0c67b473142f3e210f0c353b001eb4f14148d7b31d5b9a1e";
-  sha512.doc = "40d3510deba6b3153a0b42e4fd67534e2ed0547903f6b26b589930431cbbc0c449e2834f23f378c9a649822b93f20964194677d34cae06955d6b0cc72d5b86b7";
-  sha512.source = "cc430b4f61a728edadb46f6252d78d0d9b2a51cf4b0a8cc894f777152446cbf7d20aa5fb9f1c6b76226905313eed156ec21b31b953c3e66408e788c07710b31e";
+  sha512.run = "806db75dc9ec6e471e8a4e730298a771b791ac391cb7e0e2c2838de120e096c363b4143da3e19617f5c6014ef5851fa65a90d85552dd27f27b8c76a12d34523b";
+  sha512.doc = "3fb64631b8c2e49a2aecfa59b0717299ad3d5b5186786878abb5e539fe0f35e716c2175997cc084fd4f13c68a653966b511d43ba3b6bd6e44acb7a52a928ce98";
+  sha512.source = "d6af87c19855eea27c687deb9919e415e0e31838bd712640eb56dd9a9818439f139102fbc1dd56583a31f44742872c2a76512c25e45bac623bee6fe27e5d0d87";
   hasRunfiles = true;
   version = "1.0";
 };
 "gene-logic" = {
   stripPrefix = 0;
-  sha512.run = "569815baee8813dd1a9b0b42dc3d4faaa62a5ebbfdbcebac0725034d7642e8ca2441bc6be5a5255c0cf3aee859463f668b9f0e40584ad7f4fcf1bf85ec8accb1";
-  sha512.doc = "71961b1f6a27ebc970f13756f4cbfbd11c1e6ae4b8b7542193f87299ab58e44a93628a31ff061d61983ba6b0c6ead7422b2baff7b319ec199ff7133725f8de89";
+  sha512.run = "74fa725154e826eda2e46f506bc5be514bc1fe5f88a758c6b88434d2c71c6ac252f617439e18d1ab67118a86fd9164f875b86ba65c22d85f5600758e7501d7fe";
+  sha512.doc = "1265fee0f421d8c5f06b1ba6c1404b563207677925724e30d29e6a4469ef96b6fe62b7718821449a61d93c77228f245cea193a15953b6587d77f7b816c134775";
   hasRunfiles = true;
   version = "1.4";
 };
 "genealogy" = {
   stripPrefix = 0;
-  sha512.run = "d723bcfec88d6034e68a900283f8fa5061465cc2e0ab2679ffd6d81e2f8c5453927fb532309328f0460227c6b9097bb61e40dce2c580c6d6bd5a6549603cb705";
-  sha512.doc = "4d3e5cda81904be3abac2d2a99d37c6e7b7eb19de6e40a7f1cbe577c6b1197962f5179494c7c4c8a4bcdead204800a59f6d2962a13b4bc04905468a5e478956d";
+  sha512.run = "6f583417b4b950238dda3bd4a19986701780e47f541adca3b7d7fe355223064547b08e3bd221d81b70653b578fa05b0003eccd5219effc1f9d065df47a32d6c2";
+  sha512.doc = "5f492e8821642350e9e96d622da5bb9d21449f1a8ca1d381f04f27a9a878308c2f40f05b117ed29702094ac1c790acee84689ff17b3097ae9c014e98373a2112";
   hasRunfiles = true;
 };
 "genealogytree" = {
   stripPrefix = 0;
-  sha512.run = "da4d144382cf3665efc0b2b64cd666ef08b9b86c0d2e17e3f9a9d742ba186e0faf0831460f7eb66df0b8e78a358acc0cfa6ad8bd17d299c3406817ae8011a171";
-  sha512.doc = "20aedbc6ef3e1a8478c94e6790c01020c9e7c424b7b80fd68311906a323d56501efe0dbc5e0f5a65dd4cd52885a1a3e98bbd68635cde6342ff27a3348fe4f45b";
+  sha512.run = "9ef09ca5452d81cc2d6778723ae3b4b5798864e757c553f70599174e359e4a2f2302a926faf76ee094e6cbe3935c3b7f34087135ec086d8f31d1f86e78c155e4";
+  sha512.doc = "784799d2a934eb9e0dc42a6299b0f1a47a25a81bf3b74ebea994c82066bd6f3b6b7fa5445ac8ad619e016ca4c38cacf690bfdb60dd868f23644918ad18bd774a";
   hasRunfiles = true;
-  version = "1.30";
+  version = "1.31";
 };
 "genmisc" = {
   stripPrefix = 0;
-  sha512.run = "087a249b2ef6bd8f24fb92eae2094dc6fd22ab5410805d1358da0c49ded484d5b3396d23d2a064789933f5c6ffc4f0265dcb3e7372dede2afc6cf53f6149aab3";
+  sha512.run = "bb8038964454d4203f064100942470e1ae88e830caaacffeafa0281808176199bed075224fe62e99dab911e2e071f6b2916ce16dcc2f7307f0e83a7322c668a1";
   hasRunfiles = true;
 };
 "genmpage" = {
   stripPrefix = 0;
-  sha512.run = "ce9d0d8cd32c23ae02f8a4cbb44a501be69d0d8c86c5706ea34191c4fcef8c56fac875b5d3376baf4ef3cafd8d65a8cd270db7a949e020a93dfbdd284a85c12a";
-  sha512.doc = "38c113a8719e0b87e1dc659b753ccf3449e2b0aa1d362b814b970a667ce846e2d65e62c05bb658508d9e7c3a86b7e31b6a6745672026e51aa719bd5e8e3b167a";
-  sha512.source = "18696417d1aba3add604a31693d26653aa935aa3dfa9d4f449f63bdb7fd7cd8f80be0e36f07a3795a1f59dc1b8e4823e6df21c147d382329aaac7b336652d034";
+  sha512.run = "ee01a45c5dda8360552168adf2e9a9dd85a2e715cecd287e7a334509e10c5efc11186ebc30876cf4e7cf3ecb44630333fa6835c3bfc4380e37e973d78f1b57f1";
+  sha512.doc = "98f499fd5a908e5dad5f7c27794aeeee512e164f7e7a502313a52a5c17af7836d9833a7a2c034b30f63cdf7912855724cb96a4ff430eff0a2bef22973a883cd6";
+  sha512.source = "eb3c9dc0e4de3b3a2805f557e554ade2fd882cba16f645f2e44e8875680437dc38c88043821f91db3b63e6cf7481be317780de465f8d7dd17919ade5303e5a50";
   hasRunfiles = true;
   version = "0.3.1";
 };
 "gentium-tug" = {
   stripPrefix = 0;
-  sha512.run = "330cfef9a58515954a977122d4854a5bf3dfb8403c2f1637d772fc73a6cfa57378fd6c8fe946dd565cd5ff8551680bd685e862a20428bc78e7bb774fb2341b44";
-  sha512.doc = "c957fb2e7c527f4357f4d06dadfd6da594663c5bbed1a274857221f664dcab1444ff10af152e2753a5edf03b4e1e1f15619d38606398aba288465d8728380ca7";
-  sha512.source = "d9bd4e8ba95107522f4591c345661d6b0e0a803acafef45ed83b454a3ce6e019a5c359612e13e30e8b950e4fb2547931da9810a8fbe8380f91d8672d69c5f39b";
+  sha512.run = "16e8f323f318166d5e900897de9fbf6b382156d0c2590964583b34b0a4b3a1c91fe81c6ec794aae56cadbe697b78f7779c7f508a7ec9aa87f2af0aa4610caa4a";
+  sha512.doc = "58cf40d0b34e5929ab108dbad393591f1f845720c8a2e33220ce95a016613c310e900887f11290699f93ba312f4b574d55a2339559e2cdd49c1b0c99c009468d";
+  sha512.source = "2f91e06f209a5f021b01a2ada22eb7d72df58404938c61dd8631ffc04ff1e9b42f95485382ddabab9d9287542b68d62662ef7a1454e3f8bbe315c32ac448ea38";
   hasRunfiles = true;
   version = "1.1";
 };
 "gentle" = {
   stripPrefix = 0;
-  sha512.run = "dd5004b8607d3244660a3ce63fb4083783d52d0b7a2420e0991cb99db8d7f84b58e084081c5ff4e251f8963aaa9a81a26a7fe99a35f62773be744bd680eece5b";
-  sha512.doc = "58959c3fa8b4ace137abc1dbc95d310db820783315f31b05fb6985353c8f7c058d804b06e092b9f97cf3157374afccb3ce225d37e053225edd01bde3d6b3487f";
+  sha512.run = "b5233a9dd5a5829460fcdc84b3bca12a4a5a96c6e6d6fe44c306515bdc4185755711884323430acf6be0b5a277961e27b4a81711b1cf92289746a076d49128c1";
+  sha512.doc = "8005a7aa84be338f8247a5a8f5b1c9effcbfa772206a8c3b4518d748445322457cc591fe2da7c3458a18bdc3217a09c906f44e163a67eae825aabc5766a1d58c";
+};
+"gentombow" = {
+  stripPrefix = 0;
+  sha512.run = "c5899e5870bf4fe5d5200dfd72ea01d6cd2317c66290e9f80f1a05b7d0d79afc2b2ce50eda4f742ff8a43a4e5ede2133c85931e2c1f2d9ab4c33a1c2759666ae";
+  sha512.doc = "86473a4c92e75a0c77e5abdd002f0be110d5609246917e89846128caa2936a0d5919f83c157c87009e410edab2f344673ebb9a1a3dd15b3fbc664906d5d00cee";
+  hasRunfiles = true;
 };
 "geometry" = {
   stripPrefix = 0;
-  sha512.run = "85b90b6b30495b1f02c95e040e6db45762cc73fb301e9b25f9b83c7ce8fdab2f29c64f611e20842df6820c326761d62440abd4ceef52794381b9633d67eacb03";
-  sha512.doc = "f80aa69969bb810eb5f7b740def08507ddf78777e3281372bd614a6be2d023d2d8a28942ac0bdffad62ccf3761a72d8e68436d336ede367f3002643b99fed7b5";
-  sha512.source = "d9b43c38287613c50cef84e0a77266fc2ef4c4da25eedc50971e41d4de1c77eab7d84a237f412c0652b6022d818e653e0adf2de4a917037b953bce2c4db3fc46";
+  sha512.run = "c46127522e9f862ae31f6a77a7a64bb1375a02bb2916905aa7b1ce10df7f6680a8959b18f8680bd38e6a21b494c6d69e59df1ae5a42c9a69974bf6a130dde2d2";
+  sha512.doc = "7611936292f14a037e34a719807c224b2468562d704bf7fdaa6110c31c67bca89afc78c14fd78b8ff5f4738451313e94a4c2ee8c933c666167134ef9ddf58c8f";
+  sha512.source = "a93b2068243d9c32c6cfd03ead56e6ec1a53c76857a9f72cc4525545934cd8f9944a92a76ab9fe37bd25a46aac885c52096d036c1166f66848ec96916966b0ac";
   hasRunfiles = true;
-  version = "5.6";
+  version = "5.8";
 };
 "geometry-de" = {
   stripPrefix = 0;
-  sha512.run = "ad7bf81cad49340ddebf7cf366fdc6c4797bbde9955adf74172a94ad94e1f8c5e207350442a7890cb6c0b04b51caf1780669499e70c4aa9ce6af93613eeb5302";
-  sha512.doc = "f21d93eb4791f3dddb24c0a3fed610ee195f8d40fbbafc9a88dffa0fcc5c2fa026f4a91bb197de984103fb14079b1323a6259fffc2ac6596555b8bc16b706e5b";
+  sha512.run = "8bb8a7b64cb2f4f07598d8237bb708cff0b8eaaf00789c74c7407d6fe077a35b540520486aab6ba5d476245e38aa37ff36e710c3c8e3c0057354154ec1be5a51";
+  sha512.doc = "e57236897990d065b3dd3d16c0435cb2df3b75a57dbf1065f16dffdf78a0475aa15fd1edbf85e01f59754ca987784caf87af257f95341f113cd1ac2009d3f13d";
   version = "1.1";
 };
 "german" = {
   stripPrefix = 0;
-  sha512.run = "5ada24a610a3177492feef474225f4de4d1f1f915a62cad01b4858c47f13ebad278c590b07138e0304eafe6b4b3e7fb2f5022a1130b84f957a04d18de45f0b36";
-  sha512.doc = "53778d9f92c4f7acbeb9ee40267d85963ee6c6c49e2c02c6c4c0092c9dc2c147d27c23b1b2d74507e48240f85d2b1b608bc505167359b01643bf05cc5fd67942";
-  sha512.source = "bf0011534bc03d35fcefcf0a67675eee72f620e0049c7fa58419b21e7436e583f9acb1b2c85ce70a3dc39da57ed5600d89ba0133030062477dcad8c43d57966c";
+  sha512.run = "d360fb727a70c83d050bd870092213a93f9a240dcacc4da03520d9a757e925e84e0b75323b272c39078e3612b99461b82e63a38fbfc53f56748c6bc98a53dfe9";
+  sha512.doc = "b1831d47672d54118272148aa56fa54042e6a667be4ab91bab431db35d4f3a39b5aa4598b4159a77324e27ea1ef41b12721528b73482e71284016b4a4fa9a678";
+  sha512.source = "5005e00b83984b3a15c10463359deb399bd0654898317f5fe7d15b65b0829a9cb3a48008b69d7158f971d3cd546b7cc8f5aacbcd019898ab55c3f6b761a6215a";
   hasRunfiles = true;
   version = "2.5e";
 };
 "germbib" = {
   stripPrefix = 0;
-  sha512.run = "731dc9f7ebba43a28a2d713f82f847f2419e804e4f908d0bad64209a9cd4eda3ae88dbf3d4f42b10b5005d358e0de393bd12b1677bd51d31337c1068f2787be1";
-  sha512.doc = "26569f4415a365d16c79220131d9a44f1722e9c29a789e6e3775d497ae1116685b6a5093868573f48a2bed1460dea3dca4b485324b85eb0c69b82cbbeb3dd6cf";
+  sha512.run = "b920a479124e04ec4b5c58a6b48e2cdbdf72c6e1720d3f938d5e1dd4656ee65227d907064e86b7d65d2c70c1edaae25223b0e328d0c325a8bd91f01ed2347ea8";
+  sha512.doc = "85efe11f202b4d2c119b0ba4aa545c9305fe0094d94e616bf29602ae50e1d73c459af7fab35b35d7f57323921a9e7be72b46d56f828fc3325e1c77145a127a64";
   hasRunfiles = true;
 };
 "germkorr" = {
   stripPrefix = 0;
-  sha512.run = "d92900006070f5bf132fe93e1ebc9827819dce8c2d7478ee9aa4dc6d87c0e228c763c1b2429920a5cf9fcbb8c856d75672c588b25ba5d9a3a6ee74659ad7cd62";
-  sha512.doc = "4b07867a85f9d63a39fb15c3f21526d1a61285b9e0b81ac88c9cdad6f50f6f2726439eafd1b03f9d1398d8de1ffeba2d91aa6d5319897765666d5baa009e1f44";
+  sha512.run = "39478f3902dd4e9e512ffeba15af41f11d881dc5e629aa7c697bba76c719fbf7b7dc0b68e7bb4f11b6955de566ee51ac16b7583cae96010e68b254afb23d8d25";
+  sha512.doc = "3abb2a5710117d55c65b9ae9d8b5488bd71e0a8063e105f211d21d648de0ec59fc84c950823d3e352aeca6e9afc3b5e83582920bc9a21b8686360d4d5db57169";
   hasRunfiles = true;
   version = "1.0";
 };
 "geschichtsfrkl" = {
   stripPrefix = 0;
-  sha512.run = "5c86faa93b3529dd42e50d11c7c657e757dc1d0ce4816aee6a07489058fa6482960bb38bea5ea836e37f8c3393e4fcb89e5b4b8a43f907dcc3f6b4c5f6accd11";
-  sha512.doc = "b693a52748830275203f55fb394f0faa74d434d441ee8035c83cdfa237556c040163944f36a89551b2a3e73978a0c3d5ca56a0642119a790ff8118e5296ded35";
-  sha512.source = "4b5848047e2ccb42506ebb41620d4de3395a9ec564d819751c7bd76ca244569a9547d4ea8f5d4ea03f9f2eb1f80c58546839837dfed7c95fcd04cffadd7a0e53";
+  sha512.run = "9486137efbc111afd1d2410aa6bb91e2a1484c38f466becf922c2b4de91be6aba9dfadf2def3c73929b000ceba0248831809b45383fd6d8fe289d4ab5670f725";
+  sha512.doc = "ba8a23e22042878026c9251f610515aeeacdd1fcc41346fc4ca73f5705f62508cb07fef0dfcb8951dd4257130cc7af53ffc327fa4cf24e1104014cd9172a110f";
+  sha512.source = "b976b5c66562e49afc93a087a3221d2c2ada7be608c6a0ceb9c960ffa06381e96b5bd91c9e862b8bb28e4dfb5724dfeb4a9a89cf5d7e5531be070d55257f8d52";
   hasRunfiles = true;
   version = "1.4";
 };
 "getfiledate" = {
   stripPrefix = 0;
-  sha512.run = "04b7c2ab26c250163cfbc6b508e3528be8cf43e354f73dd8f3277c4145926ad0973f9363a9fe838cb4ec037da7d5aaf6da955268cd6dd0f096e4a88c771af97a";
-  sha512.doc = "2f40b5488e4dd81fb4e777f95ea7652da1c17fe511ebf9d8d705c7b1ba6235f9f2c4a816c30ec916a91dda2b02156cc5808bbeb165b1124c326a3cc322c58599";
+  sha512.run = "f708fbfce06bf36135771b5b81cba833eb8e83c77c8150ec47318eb194a95ff91c761b765049c29b86d381af760b5b87313ef8cdcbea0affc33068bc91a5a94c";
+  sha512.doc = "8a19fa537a752eddd8a6326d355624a90afd6e88aa5097b6ab82992020e5ff53f8107d04fd48226a5f11a390a98c7a2c03c5946243f213fec8b1d6294eaef1b7";
   hasRunfiles = true;
   version = "1.2";
 };
 "getitems" = {
   stripPrefix = 0;
-  sha512.run = "6a30ec5b967681210faf93fd0e2b28577c1682181d40a13ad5e5b2a816d48d33b573ba2ade29ca4c40d8834af04589398c031da7f0607924c99d118aeb76e740";
-  sha512.doc = "5d87bfef26b07b5f4e426d891ea12bdfa29320b10382504b60f9f12e422e8787dc05a07b9865579b978ced0c9ec90d168098dc4d34063cae6c360b90cbc5e9b5";
-  sha512.source = "7d796018c35bfa87598a297d4f8949745f25bc72d942821eecc538ec7f863809a918a9daaf07056a8f435d69fbdb2705a2fe266374f52a05fb45a9ce3c3e77d5";
+  sha512.run = "4b32265cecd3d2a3ab6ecbc0f60f60d56b978fb62682e8f913a1b453db40220b54bdca8ce81aa078f8ebcb57306eb79e127575017939e6ab9bf068ae01351909";
+  sha512.doc = "dbacf5714f31da72a348fe69df63ed469363ba2ad1b02f51d9704f397e275dafb0e537dc55b519c2cb97766595c13ca8d4c9a306d75fa2f267dbadbe92d3bc7a";
+  sha512.source = "c40cc53ece800d7a88488d1d8d0e57033cd7a79231e252e7b516c9514aec73f43cfcfb97db064f6f09f9cd25240e403626433146ed6feb32831e4a49a6434aeb";
   hasRunfiles = true;
   version = "1.0";
 };
 "getmap" = {
-  sha512.run = "777df2b8b400c7d576df05e5f18c5c68610093ffdbb29753250e3bd6594342e2e1c398213848edd3a55b87b23ee7ffcfc55ef1579f37366aada7d3aacf48c602";
-  sha512.doc = "afb8efcd5166e638bfef9a9f226c75d267ca99b080f9c9a5e8759fa1aa9d0efc9d0c555b2c21021617331e18267d8c45093202c62bf95a824e2a9ca34caee656";
+  sha512.run = "6209f31d7826cccc8791e3c1733ea1a86a05e9bfc036f713584cc6386cfe2d147cd1663e9cf18a5900f77a155ff2da13e2152881118b2647b9fb5ab3ad86e8d3";
+  sha512.doc = "47f89462fa3ced7b39fabcf2b95a80df43e09a4fd337c111496586e0516b5319edd292cce88995f824aa56c986fbe39fe7e0776512e1781aab6b05440883f478";
   hasRunfiles = true;
-  version = "1.9";
+  version = "1.10";
 };
 "getoptk" = {
   stripPrefix = 0;
-  sha512.run = "af4d051ab5c2bd2ab3e9e1aae4156aba4ab7186371685bf5f175843751e2c81ae371c34df1714c8532873ab19643f0400a6017cfa635738f4538b5e08598905c";
-  sha512.doc = "f9388cbe00b13884f7aff0d607261ab13d410f0f7f9ce58a9a6fed835697fde8fb57b4f58917a53ee7e90a67099f3ecc90a208d67065c1a28e60720ad3c2fa5f";
+  sha512.run = "8669abadaa18e96dff02381a5e7c82749b50be58565b1cb27139d6cf50a5b89ef141954501bd2437d59345829dee94391a5e6481e0e148d2cf5e172b00dbb2fc";
+  sha512.doc = "a2090afd8067557e6326f001ca1a0dabbe471ef82df11320ce5b414e9d48cade97a0ae18bac7087f714ef0bc1d391fd15fa2c8844540a5bf8735839daa4143a3";
   hasRunfiles = true;
   version = "1.0";
 };
 "gfnotation" = {
   stripPrefix = 0;
-  sha512.run = "73bb4451a25a06c1e23692621e9a6134aef46b11d46f677ed10ee5686c6d37f716f720295171a90ccbce450f6ea9e3bd09b6913397969439d2adb32f7337d4da";
-  sha512.doc = "532e2c11ff6fe674d117f142e1195af894e05b724b03291ef29a5c277924e8ee500839b1916908b5a4d168b17fcc57dbd3d1caaf6d7ea314d26af454e43d7a55";
+  sha512.run = "74022d881516a4fc215ab98323b15e5f5824e2aa15bc40e8296b2075819293f4e61c29b56d9bb4391f74a03cf8734fe0ff6981c61eb0f4c0a2a1bb06d8fcb954";
+  sha512.doc = "324e1894ac909bf7e732660549cc0e3949c0deb1430f046d48c73b88f580a9332114b28629925079d0ac0e8704b8873af59a88e5c3a12b26785a220c0dc02a0e";
   hasRunfiles = true;
   version = "2.9";
 };
 "gfsartemisia" = {
   stripPrefix = 0;
-  sha512.run = "abff26773d671b7e501337e60cd9df448c5a68487e789d6990aad847d85829caba8d7c4dca1a21ac7e56a78b02bb5ca7c215a31b31cb97663a90f931cac41cea";
-  sha512.doc = "9bf97fdf1631cc6bb6b75d26971c002bcd71f901032393ca9335fa61219a00c20302f6d00af2534704a05733f7f4f9b40be469ce03e38409952833885228abd2";
+  sha512.run = "aeaa238e5d57a0481d63958cc86be0b5770a4569b34a4bf5e949ae2aaa67415f5d4d34bc80f17e0e664906f1c0e3ac85148f4edb8a7cfed5ddcc023006a414b5";
+  sha512.doc = "b19eb64545be5a0d0a7347a227e63566f7e93a3a68205dfbd1e24349eee07e0076fff3c83f283ce67ff4340df23f1bb8cfd27ae977941c2909e668ebfea2234b";
   hasRunfiles = true;
   version = "1.0";
 };
 "gfsbaskerville" = {
   stripPrefix = 0;
-  sha512.run = "8f3b1a77371e52496dd55fc05169a7df8a1d29c856a5a917a1bbc7f00d1863fe1815a991132bc12865296f26669b2e010ece01ac9fb83d3793c457a1fc135c1e";
-  sha512.doc = "e524c9c9322cb8ea09d3f35d396c8b75bd8bcd684fbfaaca68e502220b6fd4b1d7248c579fdcd35fbf2bec01f06034341fe1aded9a2eb4b0a30d90763ecc668a";
+  sha512.run = "748726e7a51359f9e1db7d8e9b754570181ef22fee0fca0bab2bebf46a30919415263dd3865caf85b3a312e865246b878e803789d12925ccd3fea7f8ea097d9a";
+  sha512.doc = "ae0ff51072db75afed124be042218b147362ae631a5126dbc3c304f65adec74948aa9419d40bd91342eead325e83ca7176ef30c40c9c3211b8da5fa9f9fc482b";
   hasRunfiles = true;
   version = "1.0";
 };
 "gfsbodoni" = {
   stripPrefix = 0;
-  sha512.run = "fbd6c83d4e6c53810d7102fdccf5cd232f5f5fbd9932d40311fb95a6acbada8d8526ce3c86cfb7018ad7cd816a6186a0118246043e671b782b08918fce3fd202";
-  sha512.doc = "3c12bccbd5a7c072335f6dcc9af3eee3bcd4b3553175895186568cc4afccd5cbfa85882c1035e97430e8f502fd2b1c274e2a949e90b0cfa9115df7d6355d88b2";
+  sha512.run = "c8c616a736d543cdaa22aec02ed82ebb50ccc3a27f47a522b4572450c8dfb30fd2b2595049d192eee75e3be7db34abc4f556ad7545a3ec2458994c11e2cfa353";
+  sha512.doc = "5632de9367ec68c65377e91a480e295074a79baf536694752b3e96a8ce7fe548e0d23d1d22b90a0768c0f4c984c886dc25a79c5dc41c95bb4134c295ad0acb44";
   hasRunfiles = true;
   version = "1.01";
 };
 "gfscomplutum" = {
   stripPrefix = 0;
-  sha512.run = "00911b83b56771fb1ee7e80fa2ed1ebd0d8e30a00828a76bc9cdc0c47752bfeb0804b39ee66a1e4f68bc1e2a05b7436d2026c5f8b2e5a835cb5242fe8f308fe0";
-  sha512.doc = "62ce86b1362181de46a6e9c000ad47935496aea60d442c4200e0fefc186a8760c106ff2fe3bc79003f8295de1830e2232760e871b6de8bc804102e8dd2f51b74";
+  sha512.run = "6c34446f452b1a87fc266cfd80ee55d3a59aa6bd545bcff002261ab571f26fb02c388adb15f50b8abd5b46940cebc626977eced644050b05b6411ebd52023bdd";
+  sha512.doc = "426770fa9abca81b0603e8e8ea32a7d268f9646dbcef823c59b7ee07235a4c04b762eaf5f23f459aa25ed8a963cf3fa1bc28729e4650c47c9d18660e52719da2";
   hasRunfiles = true;
   version = "1.0";
 };
 "gfsdidot" = {
   stripPrefix = 0;
-  sha512.run = "175e304a13a71dc76ad94a2be5989d22d442f9a08f558205449227d81f1d26b6534ac4860b69133f263bec3e2f5118b3150b81322789a9ff0edfeeacb3d6ae04";
-  sha512.doc = "3b84323704da3b7514aca029ff49b5578fbe7065e36318c37f024b1eb1e490ced0a9f765b797362ada55d3bcdf285cf6f0a2eee36ccb0aca14dff8a51217ecd1";
+  sha512.run = "6ba55f79fa7724aa3c30d1b6d74ecb0bb656b197ad36967caebf32b09ccc093287fe4b06cfb9c40347dc790d6f1e7046a6a165b6de9e5b805ea97d6120512158";
+  sha512.doc = "16721250fb94a803de947bfa52b6902e18d53e39969d9314dde2b9cccea64d1f3b37fe21af42122b11c66b731f7ea59df5e3bae3b5a822b7de3527a0159e03ac";
   hasRunfiles = true;
 };
 "gfsneohellenic" = {
   stripPrefix = 0;
-  sha512.run = "77db72231a85cac2bb5ef9d551a3d57024812432a4ea55a95405f8d44483b584f0a87ab6c80fcd15d64600cdb06b41ff5f5e8e2a1a1fe23c1edb842c1cfa74a8";
-  sha512.doc = "cd7240fbc55daed2741142970304a8ac192e4e9b19d39b04dec497da7553929110260f4287f77a0333901ac1a949db9daccbc029c8a87145ee53ff92dfbef237";
+  sha512.run = "a4949ecea09af3a45ddd8141476c83ecde44aab826d4be675560c08b0ea005cad1a5cdcf5ac6947b64924f32b25dd99689acba351187b7a0e9ed1888ade289c1";
+  sha512.doc = "7d6831a455cd401e2917e2eb20f94399ae3c55a11d95207c159088ea8c80ff0eb8ef641ef46505d4a00ca994546e488f43183fdf0b6b811d0208a15f70967812";
   hasRunfiles = true;
 };
+"gfsneohellenicmath" = {
+  stripPrefix = 0;
+  sha512.run = "2d8907097554ddea4170df9af8176e736cbb2321ee349e668c5e157c9821074a7646fe914f721270daceba20f0a522b7cee4a9c1ac754758b674697eaada8fd7";
+  sha512.doc = "645ed59786837f01fbed8d915bd84ca5b064d0b78d25abcbccc00dc018ca6eedbc4452064ec6f668dfc41c800a4e944d2bd08c913fb3163701152900e8857b9e";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "gfsporson" = {
   stripPrefix = 0;
-  sha512.run = "1b8098bd718b7fb249108889681223f1b78936d10f72b4decdaf0a84772982c7a93321a3e97c36d815a895c917225de3737e2368b192495b64d4134daddccbaf";
-  sha512.doc = "cb8bec053d9eefcaf2c27ed7824607f72233aa4617e198e535992b5f282bfe6d069174e725168a142e3e1f2e79a8b10cd9c74ea6fa2b018b52c0d774aa35c24d";
+  sha512.run = "e5e67659f694c15bebdbad7978033c937ffe0610954f46283c6ab8f08797fab4d9d895a8b72a71b8168ec9c5c66c553b82301ec0cf91cc279ebbef4d2e524577";
+  sha512.doc = "a6b3519bc09c476a481c28d188b5908ba09db86db2c127b12e3deab1bfa2b5568d9715138badb315b491aee6ac276cbfa2c787d7442a5718d6f01577eea056bc";
   hasRunfiles = true;
   version = "1.01";
 };
 "gfssolomos" = {
   stripPrefix = 0;
-  sha512.run = "1c9378041ce183bcb95b6692e867997075f71966559f6201b87a9c7b54f53d15f236289d81da1aaa23bc3d686b7c142d8844d6c5f051aa94ed04c4caf81dec99";
-  sha512.doc = "8cb9e57ffda1a7ca8b6e37667e93397105df019dd25f794417052d64f4f926c3fe5d3483bc7123cd52d7d4eca8355a43d603d74b67ffff08aa2a53502475b541";
+  sha512.run = "618ad24e2ab0289985b0f8a5da7509704d7613435388472c6a300e4bc56256a37dbef09d0d4f086c51f9065790d707e087f1218e00c8f47302f92d6094409659";
+  sha512.doc = "8e12674e5c445eb6ba2f245745ec25de1ebbefb62d11784c30b11ec2640517eb206446713ed842e04beaa02c8593a92a587af82e6cdb2721b9aae4b9cec82b7a";
   hasRunfiles = true;
   version = "1.0";
 };
 "ghab" = {
   stripPrefix = 0;
-  sha512.run = "a995c2407e59715559ad8a70f52d1e0da1fa5ce0c26a800da0f2467264586545d83eece68c69caf29eb41b0f684ac8745152ea7fa2b5f6a59fc17643462a42df";
-  sha512.doc = "e86fa097a5d49dc685c1c35dc124c11a09fc16d7dc07ff6b2291167f9ac73c9a3adb38321224b4b69c992331e200c8ccaaac49cccd6705d1790360149c91fbf5";
+  sha512.run = "c123b87e6b3416a0be0388c87e91262e0353d7939bc059e9cb87870656f6d9ee213ab08b5b5fd485a16bd033bf7f5f296a951ee3236c49d3c742be7c2db9fa0d";
+  sha512.doc = "1be36f868af14a1b276881c3c43c23b22915acc17c63d8bb3e9dce9f4e155220b587dc09209803cc3d81e13915dbe9cd2073671c34915223bc51dfa0fcc3db44";
   hasRunfiles = true;
   version = "0.5";
 };
 "ghsystem" = {
   stripPrefix = 0;
-  sha512.run = "45aa7c9ddff1771dc14b421f6472489cf7a6ee91df00c2dd453704c84d804485afda7fff8494480a48469becd77aff632268068b0168809016860701e169ba6d";
-  sha512.doc = "f5bb98daea6763c249ba9ee790c04b8a10b1dbfd43ae6972df42861192079ad1adf766f132199a6437ca6fda339dbaa9ed52132f9f4005ede3c16896ebc741dd";
+  sha512.run = "68fdcfd47ecd220dead1a7aa896708abe063d35d61b15d3ddff5e210b05614da1d3dfb58b389736711a360a0e532e52f013ffa73648a0ceb3c234b6ca7330dc8";
+  sha512.doc = "61fb9d94b7fb27abeffc530615def569dd9bb5fbb62fbe759711d669a74a42ab7fd8d6cca0f3626f625225c8183a53100355b02009673d98575452a256e2f8ff";
   hasRunfiles = true;
   version = "4.8";
 };
 "gillcm" = {
   stripPrefix = 0;
-  sha512.run = "36fb3787f065998b48dfa15098028eb81557c7b5b33362f56f1867237b9851994ce6a2c34a6ec5a3450484132037c2813c1ab2c9a2c7a6f219338db4d81f40f5";
-  sha512.doc = "a87de9019d32440d7efbc73094dabd2d390a448b7de6aa0d92f59a4638932aee5880241bd5597cbbd09031937daf5266fd9d0e1ece787a3b419538faf28ac038";
+  sha512.run = "d0a775cfb77ff29ee4c4ef06c97ef306ce7b0c2210c80bb8bb676ab6a3dcb6e81f98f7e1cc1c9794a2d962551032979ecc7cfab551aa9f8bdeec6eaca1c61de7";
+  sha512.doc = "419761c774dd0b832730614c9a60dfb15ab4b488723e445d654090c14a7f926f32135901c939603444e3f4902a244eefdc449e0b6c3e737e9233f1261079f20f";
   hasRunfiles = true;
   version = "1.1";
 };
 "gillius" = {
   stripPrefix = 0;
-  sha512.run = "ce58fb719e5b095f5547209621632724fd0a64be82d82d9ee30402b42e5874e670d2644daae956d54bcc561f0a42a7557cb38ac27e9bb585f96e8af9902cf68c";
-  sha512.doc = "865cf23b45a1ab2118eb30be34721f7e96d7aba9d7136dc09b5da00acb2aa6edf1d23c1686ad8afa167c654871aefaf484b38e5c6dfa7e850f0a3590038e394e";
+  sha512.run = "bdf639b81b871239429da96e313c805a247fffe2912d80bc1eb38481f9a3ad5c2b8198bd6d8b3a18710b99a729d9b2b18e0dc28b9c37697eb1acc0e6eb18f812";
+  sha512.doc = "cf2c841e299ea3376c6aa3761fe4b31b18a96ccaded261a7998653614494979ebfa7797b178ea5bcb8dd565a8827f7360b671159b77aaa0d338044c4673068ba";
   hasRunfiles = true;
 };
 "gincltex" = {
   stripPrefix = 0;
-  sha512.run = "1e77411f03e1232c9263c1395909e51ff86d1d2290045b27713fd84601f75c215de3d93c6bd9d72ee903a7b9f73d1c523cdc2b75430f489b9d130709d1bfce3f";
-  sha512.doc = "0dadc508d345f10e65195fd1177fcd5e0081b392d9883a0e3d84174e6670b7fba4ee4df601c3edbb2ad2a78ffe508a3a51296269e8a2ec5e27026d9c41af15ab";
-  sha512.source = "034548c66d2c397f6b70b434581aeae8241d85801842a9dfb6c42bfda61a60efdae8fd30e346550153abfccc57c819f05b620f1da73e5d7d728792ea9499c823";
+  sha512.run = "d0555eae18a22bf26101f9c8c273dd3b676a97a73b83e502e4adfe0aecbc1651f8e6faba856ca502266291c938c781154b2bbe54d1da02edb47b63b7ed95a14e";
+  sha512.doc = "c7ed8ee56c211a3ee6ca7b8cd456872dc4c4de2d51567128cab6e11a3cd9be27e3d2bf845ce865f2f6f719fa492c3089c360dceddd085f358441d7ff2c17bbbc";
+  sha512.source = "7fb23614f759ef4476aa407812eb44a876f36344c43d3beff4072f72dc4204076da5d2f97019a80ee46553d37a4adf21b32431b6c69ce2c515e2788602e1d678";
   hasRunfiles = true;
   version = "0.3";
 };
 "ginpenc" = {
   stripPrefix = 0;
-  sha512.run = "ac7aa59f985d544982eddd48a1ab31b396e87ed589a20fecbbad42328253ef5ab913f3cf753c1857b4e6ef0f4457419c1821d751dd6ae11a5c90afb3fdba539b";
-  sha512.doc = "5100364fe354cd535950e013f859d7df8340308d34ffb7562ad8bb35dcf25f080d7987c431cbd1468f602da840361dc21d55d032336b5188c0500f486e45e4b2";
-  sha512.source = "b33eefa66e3ee831cc56d0cb249680bc23d5bf5cb27e549a970fa49416fccccf24f90c53d1fd9f61f39a5c62b93c2b916327ed1294abe832d1d6394ca3d7ee7c";
+  sha512.run = "f982140e9f6f71fa2f8ad0a22e199ee7085f0765f2c740430a79799e308c91a17642a5c7c2c7679214d95a1ef57a93947e278b4da73b2b6e50942b77e093b768";
+  sha512.doc = "ca32af66b79de0282305ac7432a96bcb9f0d02ac428d93a50bce0140170d3bece148db47dfdee56386a0652c993e5e10b2e2dfae41c0ae42572049696172c4a9";
+  sha512.source = "3e9cd418912b2b05cfe97f91e9781e895b70796ff3283452b2d53efe7047203932f444319cb9231084b46b2fea538c8ddd8bf874d6e7e1dee712bc05b5b9a73a";
   hasRunfiles = true;
   version = "1.0";
 };
 "gitfile-info" = {
   stripPrefix = 0;
-  sha512.run = "12c29586101a53f5b1236e3b37204195f106cf39888afa07423285175010841f25105f290a63cd1cb81f48a69a9630a5d2af944fdb94004eeee8d079e0fe9678";
-  sha512.doc = "bd01c08a556fb86be307ca30d4e706054958be9f6c399bbdb515989c563b896cb6e8ef085a7947a90439a80a92952f946ad2f1095e273d407316dd4dead2f23a";
-  sha512.source = "a8051331414471f7c6c65ddb70d39758dfc40f4acef3ca805fb7bb9c18d041414dfd570aabf13728b2ca623cfad99e8ce841e4bc51dcc5291eb30cbe9bed6e29";
+  sha512.run = "8f47f876665ab749441bfab4e9a75540031a194af009aeec13cd35339fd82cac674d489a69f37acf7e14e990b075f9269161c5e5a0de7f238e4971303042fbce";
+  sha512.doc = "744492af4cfa0d07daa062d70105f369d551cdecedba75a0175791d86af621558985385b9f18d8a7503d9d41046a0a32b1720eecf63e39768dbefab6ae7c67be";
+  sha512.source = "8eaff16139a4684a49bcec93f89b952c74a6a4ee4e4bc4ea0dff90889a05c71f5b7943eb214d40e4d45cc239732f4d6e82a47d8ba59bcc1bf4ec4f7565d5009d";
   hasRunfiles = true;
   version = "0.3";
 };
 "gitinfo" = {
   stripPrefix = 0;
-  sha512.run = "39da330c0e2f3b4d6d0d807e8418728b941bf41ace3cdf10e4bfbd20216048ee2a8d1b72fed410d95b08c2106607f92803207e622fcaa74c6742122f62aef94e";
-  sha512.doc = "b55627afa754a3de683c09b1954d3857660834136ea2fc29cc145b7ec3fb4a1753cc70af60482631bc41201d9caa93271efe6549bf74c435cf81df0df0adf8c4";
+  sha512.run = "cd79bf3a48eda5d919ac7f497ae182144178f3a0075ce40274ce37fa583e469565aa8cf70882859d93c8d43793f16a4734f6dbb260618e1411439b8216667f97";
+  sha512.doc = "1086c4ba51d29659a56d347ea78b034ee1eb2b67ccf4b6cc4d2339f7da12cfff5c56f6c35b55f2b080c810d6876e86c2b7e63a81dfbd52f4cc6afdfa79607a68";
   hasRunfiles = true;
   version = "1.0";
 };
 "gitinfo2" = {
   stripPrefix = 0;
-  sha512.run = "048474a148f82ee47efdbde00e6f737d94705e6260f1177d5d16612b80eb4070c51ab2c666a2438fabe3a7d7939d09c27a9d44f3d6f9b13ed4a3b4d598d1eb90";
-  sha512.doc = "2dc233c5894bc415870d8d4cb4b54b3d9d7ba3dcd086f1b306a26e6e0d7803f7a05213a49dd521d0dcf5546c4eabb50a5f3b5dd646b2f6510287e9fa2f135a41";
+  sha512.run = "727e0ded5837033380a835dd57a4110b79ceb3442cf3705be3c8a80f79fcbf20232cd2b2188947d8c53df6ac4569d5327e7c4d96a101474d791fe265ee9b36f5";
+  sha512.doc = "e02ac353674c2716b75a2006fc85287421ae29a2dcb40219c383c151f9668fa3f2209c7b5b644fda15ba386f330a66c99919a4781eabe5f9ac93c6fbf0e77d69";
   hasRunfiles = true;
   version = "2.0.7";
 };
 "gitlog" = {
   stripPrefix = 0;
-  sha512.run = "d21d4b0bee8c65841ecb8fc960c2e6d210c6bd649a5c1239cbe8cf21a60810a23bed75d9084a3ea727afe6cee4d1a8387b3c29c9c6bab1c783b9a295bc964b2a";
-  sha512.doc = "201ddcf7cf630463a5770ec1bf0adfaf09517737bebdc8d0ed38e80c9a0483ed4af2ab32dff7e26392310743516d07d2eeebc5146ae8ecda0a0079c84ed8a0a2";
+  sha512.run = "395848c7a059b69723fa4e85b58a9758888acdaf88ce84cab33787fb50d9d806c543f770296cf6b54fefb01e72de27203cb079fd266d2a4a84143df47a5568b5";
+  sha512.doc = "443fd4bb291bc00203fc22ffb30b2f447b9000976817ec3b1c55b96bfb5f98cecd0dbbc34aef3e92120be6cbb671bdc2aefe1f8d561855ebf5551806f1c9c78a";
   hasRunfiles = true;
   version = "0.0.beta";
 };
 "gloss" = {
   stripPrefix = 0;
-  sha512.run = "8f27b36c00722413de92bd5da41844f5010c6fd8089120a6637605b8df7cc6166f37f7dbbb16fde15ebebacba24cbfa791c7f92711c8073f2d43082dcd68e86a";
-  sha512.doc = "7196eb77a996375e7e92a4ab549ccafc44d06c9f4c72abaaf762e6ff39c4f4d79e51ec15dd93eac05a4201e9530ffea330e133fffc49528d40747980eb6539d8";
+  sha512.run = "7a517048e3edaa687f586d2ea1d2721d704c7f7791ddda3f9752d1f733b2d7fe3d7a2ed25bed035fd3f7ba8fe853e26a925f1b563901919346947222d593f24d";
+  sha512.doc = "1a3e9f0b58f18e9822f20a086bb6882bffa988897dd31477abca8c3fea398b24b208c2c956b56abaa702ed9af2fcc8d649232414c3e9596bc4cb72158362d0df";
   hasRunfiles = true;
   version = "1.5.2";
 };
 "gloss-occitan" = {
   stripPrefix = 0;
-  sha512.run = "7e0f4a379e49d01e6a56d35064faac5ee59127760ef575b7c1e648f7492deb0889874d8c2c3ad252e643bc1cb44e55d193e6f688105bdfc362867541657636a5";
-  sha512.doc = "25954242024d183e41d9088b12a2aabe38d576bb091417fe3a415ca4ad024a926295ce523e3d529226fa5e2f6a5f884181009a89b20a9ebf98c84702d64ee281";
-  sha512.source = "f9b753eed0154880178e0b44841fafd5b038951db122c5dd84899da57f9c27a811bdacd5c5963a956417e650c09524276eb312cac2986c7b18ee51097b79c89b";
+  sha512.run = "ee3607bb7e3866e50c747d831392e8051046b228b2eae49cbed63bdd64604be6dac9106028a09f0ae4351106ad21695dfe278831c24edfc4e338f9b91208e314";
+  sha512.doc = "f60decd3b8dfa3999c8f9ff0dfc7e7e5c8ded11569eea9f4ead2457af24a9c3f0258ad3b8bb4fbe98a6faee7dd428a787b1aee5e26650f0ed8b0f9426c068831";
+  sha512.source = "054686d1f3fe1a57eb6c79abc8390a34a955af1d00c13cacf5fee6ecded92891ee9f67a35ac08002a173f5bacbeeb0b19966116e8bec5939e7540ad5281c9bfd";
   hasRunfiles = true;
   version = "0.1";
 };
 "glossaries" = {
-  sha512.run = "ff8889e37219fa25cc0a5c60c39cf6b839f044a5d89b2e84547dfc03133b1d48533c078767e03d023cb55c4749c8c9db2c6f8c5edf9c8b131bd5dbc958048f73";
-  sha512.doc = "178ac8b0e182b3d7adedf4fcc4e9a0dd30b1dbce1b9025d92f789bff8af9eff907cc6772976ada3158027cb89c1d441e65ef31350df0e0d5715ef51d59458691";
-  sha512.source = "93575acae268959114b7e0b1452676c6242de403ac1890cbd41df5fd50181bcc82182a0e3a5ba1a7e1735f6878d10d31ffb114a511897268d81bedfae273f268";
+  sha512.run = "5304036db4d1afb214edd577ed364d3b9d5575fba4c9de59bc848875ae49a4f8e8af90a949cad3c55c47ffff54b96b5b355e843f9d291842695fe655c85c32bb";
+  sha512.doc = "34e7c2b35dc2c403924f923a34ea36656a4df01d7cb662953f6fe1a77ef137f7fd724fa26d19ebaade3ffeb3cc7cda801daee796e93da0fe9e10c6374896f31d";
+  sha512.source = "65a202166dec350214b5423bc40868d9f23e836014062735fa304d84a8d5d3f03cddf1506e767fb0533c59c54af98c7b5a1624751755c570b5f28d2103f48d93";
   hasRunfiles = true;
-  version = "4.35";
+  version = "4.41";
 };
 "glossaries-danish" = {
   stripPrefix = 0;
-  sha512.run = "a230b1284d098c79c590718005478416ad93e3678d54bc470dadda86b5ee98cd1990a5153b6c1e7b0627556e7b07ae9846017a765b6f333d52cf4d6a446d8efb";
-  sha512.doc = "ae1ceaaa00291efb9147d5097d18d52cbd8b7dc6478508875abd28f82faaaa55ab116fa1b98f38c3041cf53d4a6a8e18cad9aa762f3dbbb1788f124978b0ecf0";
-  sha512.source = "0c15b70c1fdf582b47984aff5846bf5031bb4ea341eeb37c7f4888ca8c6443e7a533ca4fedbff9763904a88f6d48f80e7b812a56903f10bdff807cae77194945";
+  sha512.run = "d1d3a50bdf0057f6a1d9c608a89941c152af6bbbc158d7f3c4916c315f34e28421cba16e277d1892763fa822ab84504a20322d012b6bbe7748f76cbec0a14bd4";
+  sha512.doc = "8458a62fdff455e2ec14942c719eea4452c1a268ba039ae5187241f8fe47bddc7d81b0e6017839b9d5e4f0049c1a632a0ee6cad3aab8709ce4b1dcd973c1ac25";
+  sha512.source = "a62494f080864755d23d04d89253074779cbc76ec88e7a097713695c41e02c567d5e6748a81a33c5828c1163ae07cd6a284e9e1c74ebc1c9630de1c05beecc8c";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-dutch" = {
   stripPrefix = 0;
-  sha512.run = "a98878661106f9e8abebbeba83c074fde4909dcd5293855e4050396f2a9393ec072ba47be777a6fd990863c4f4be21d893f9c49d7e519c7b5db157f074c00403";
-  sha512.doc = "04f05310e32eba25520fc0124946c786ce4c51e3c75e41c22f7286f966eca2a755334ddffa9787330b216ff6a88c38cd4228f7933fd70605d792e6f072b47e6c";
-  sha512.source = "86c0bb50009006e10925f8eb1adab3952b0e91544cafe8fd35a136c15476e4479a6dc49bfc81c30d6ee6197756503d46ac240588243a96513c1ca2953d836c92";
+  sha512.run = "bd2e2a67c976b7f7f1a914d4976d81f933b5ff8d59607f4eb65f799628f25f78a970252efb7229986a203cf9da60e7e11c4fb2c537e093f77e27170e0e294896";
+  sha512.doc = "7e9b8ebf101aeb0c0b49bde9bcbaa6f7702fb9b17f3d6ef6dc654b755f3124ccdbebd99e75d85478b0496a161a60279e68ce04626847aacbd28894a4ce646568";
+  sha512.source = "b1c8bef55905d2e4e7b297663c18e1df3255896f0b15d18866ae401d56f5dfd32f3b89e4873d16bf382c158bceb0e0491c9d54cc518f4a6b506fb0c85375749e";
   hasRunfiles = true;
   version = "1.1";
 };
 "glossaries-english" = {
   stripPrefix = 0;
-  sha512.run = "b063304d48ee539f2fc1c81441890178e0df698a1550df98734e4fc5cd69bff361e9c1b69cec3c43c2af6021b4687fa071f16cb0628b579f404d0888af7d20b6";
-  sha512.doc = "b86d7565d4490bddfb109124cd2bbe076771f504f4836667ceddf13494359a8df1804f0b1af481e5d88047900f71507cd2db53a078d50c1e28fd93c082e41828";
-  sha512.source = "8ceac920735f1abaa418e273522a6966f60c4ca0663679451a46352bc6868366c878cb038fc1f1824113df8287f81aa6580532749b3446aa2ffb860a00191d14";
+  sha512.run = "db7d6b615a7e265616a7cea3c7914c3481de85a4c64ac7dd7dbc02ac390713dd686ae90146db96c953d28e9ec88a80b010c6e12b6b27f9b4aac4b59735235f87";
+  sha512.doc = "1fe6b0c411ef46b08365bed3bd260b32d221436ce6eaeb7fe6d1e61e853685d92451dcc346d716aa612fad6ca68345c16ff29fc5b8067f2fbb825cc553506484";
+  sha512.source = "7bd582d9ccd6332e2de5ce35c87348e5250f14f2aacfaacb4180736fe373e3cd561ec804a2db05b38d9cfc3c3ce2bdd04e236b579f7f25404a8a65d9b414131c";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-extra" = {
   stripPrefix = 0;
-  sha512.run = "f5e43f234fe9cccbb9e108f956d872901ad6e7e1458db4ad5ac1cd98cf90dc010ab503a79b793125bc0f2107fd9b31b04fbc765a5066b4bfc5c922a81d625aef";
-  sha512.doc = "d6803dc5025322fccf68bfd2e6c66a77eeda79ca1d35e94d6fad4393ae8cdf01d57148209d64f054527b6573a25a2b6e210aed729d383f66cebfd35dac935dd5";
-  sha512.source = "892878f920678193dec6f5aba9976bae32e28d5558f3e44590606af1a2de2fee9c54e4189e73dc53fca66086b818cee35b4b70d71a3217d1d848c19ea5f2b640";
+  sha512.run = "dfdb272461d5c80ab102e53a4526e5e2d456852f312afcc7ac4b0b09ab24dde698527f6c89de085c878342a1a39dbfdbc44a47858efeb08f5b20442c2fcc739e";
+  sha512.doc = "b9156ba7f4d6eb53d5ebff9e822dd019f3b7c7222ecbe696792da689c0bdc8bdc12694d2e14056815a27a9276b9daae24949119970604f4d474b0924c08b3ac5";
+  sha512.source = "7c67a891d43b50f5afffc5c19038dc7472915ea4d52800c611b64bab9a20f09a13064493d9f9fb494b1fafb207843c4cac10ae90808839a1c86efb84760e2167";
   hasRunfiles = true;
-  version = "1.27";
+  version = "1.36";
 };
 "glossaries-finnish" = {
   stripPrefix = 0;
-  sha512.run = "468e1c66f2d3249d475b8b0e7af8ab00bef37020a4bf33f6aba74a6af1752b043b3021279accf0511edecf9426155ea42fe4e3564ed2de8060d6fc044f6035c2";
-  sha512.doc = "4b667e846730462fc136a01d3d365520c1ac7446c05c8631f0009af1c800334a8da2117f6459e0a0fe5ada0d7fca9cca445e750d2bb4cca269e54bf21dbf469c";
-  sha512.source = "5d93759a8263e6f49641201e7f6f6b26c434261fc8f6f31ae879393d7c8a9574df82fe225e4f5d5c142a2b7d3f6478a6eeda613ece9c03e6e2b6eff4e8cfa55a";
+  sha512.run = "2b3dabc1755c4237f67fee04f07d5760e9542a8eabf8ad5a3d8644845802d6f9b00a381c233789d2b32e4626bc9138131baa0ac96f45fdbfe1f90f2352ac2ca5";
+  sha512.doc = "60a75c69047de7011fa3292b999a9ed5da5ef5caf0974859b3b7e2d09c66c7a4d0a6c12236026319f336953708a7cef8143b2977713b4777df891ad46e7d2613";
+  sha512.source = "7f0fd5d04b156941f55239762813d5d55b54dd57a99b680736116eb102e0031ceb82c9185fac927dffa507ba7063980055a192f21c1a45b884145c46c29b3b1c";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-french" = {
   stripPrefix = 0;
-  sha512.run = "6430e98dc04aa5135a60261ec6c0d3797f35836ff5f0432afc5b22ac1fddcd9b6f0f42740207bf40bb00754218d2e507509a44e47ffa193c9e1d271010ad274f";
-  sha512.doc = "95e830cb34d9316eda15e45187378353595141b5205c24623818ccbbe1743a240bbaed18669495f71be093797706bb28850a2ed0f2acf90eb972a2ae83e9c803";
-  sha512.source = "b0b7c073d62ce469af713d12173de7b9028920c744869591a7800798672cfab094fb3567557928345983fee0f8889d179839c2ccf0376ccc027aa4ed14444a87";
+  sha512.run = "56aadc863aac72140c191aa401b8b1ea0b30f15c5df0be362d5c23b417f08252806540c5239fe14ba16e6a803c1915f7324eb9f8cf641107757ef71026ef4745";
+  sha512.doc = "30d54434170b9ad32263ffeccf00b817687f0d7b4aaf0513b42d4a3e71b1a8ee2179302336ddd7302a354a3df95e73239d13b1fb6e3ab1be41ee6d4ecbff0311";
+  sha512.source = "d36139182679dff6d1ee5cda58a8363c60f5fc3ea4fd8c2e225030e903f97aa2add848a879707573391390d4f862a85f9189baad4fe23f6bda7c0a555b10ca0f";
   hasRunfiles = true;
   version = "1.1";
 };
 "glossaries-german" = {
   stripPrefix = 0;
-  sha512.run = "f0a5b2f7c5b8d82a0df7dba4ad6ba8832916668f82dafb20bae15a3d9ba6e832e7f2fe947f02747c3f90890b5c1c453e3d6a188c319886f0c97c99a393e710e1";
-  sha512.doc = "b5b641ff5c0512269e7fb6d31133084cfbabd4a4934de5951da4a2cec89734a993bfedf215bffea9968fc505cb8411e2806c4bb494cc02a7283b3fe016e9a085";
-  sha512.source = "bfdef478f79c53ea94ef06000aac777225681418e8374deed6a727ded08ecc8c29ddc6ffff5e413c31e8cbada8f18a21429b5d3ff4a7459b9763425d16fb9b90";
+  sha512.run = "1fb5413923070cec4fe29d84328fb303ed729425012376169fca74616c0f9c7f0aec48ea4de23888f3a7b94c7d91064b23fe12049bbafc3b68b2ff04b1fb086c";
+  sha512.doc = "0e3e4fdfff984ebef69ffa7b4de31fe5c8ee489a64585b885f868fe151b7885f6aa6b286df281db1e7a10a8307aca95a9bad914bc4bf7a3a0fdf391352ac90e7";
+  sha512.source = "35b866f2902d41ad81a94143e011bc8585c33be88e489b57c4eb28a8b1a2e0c09ce5d6ad3eaf4b15a7b276698306a8eb689c80138a7cbd110dd26ebc33f44ff1";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-irish" = {
   stripPrefix = 0;
-  sha512.run = "3ec6f60c17a09574ee707aa3dff0a59148b46c8ddf3d887dc605c8e6547377f62c8ea049c530bcc2f9575a2df69ece25b86b34960bb70ae8d30ba3f35abcc160";
-  sha512.doc = "5f984102b7bb11951f8154d0c4313390c531354c7b55d270a1b87171f32fc3f35cfe3438a7d0901bcdbb8c0c39fa5e8ca7dce74a3676784020d2273b829a7f8a";
-  sha512.source = "393b5473545080a3b18ad8ea61dec0ca729f79ec590b2683c1afaf56337b94bbb538f37293752f0580be83cf07b9cc53e82df7ee174509a7639d1fec11e99411";
+  sha512.run = "828f1176666beb12ee36da4c8b058c673b2630bd872485ab9aec7c5ae97749e1a6449d96ab69ca8e088aede7e9ddf78a43f7e4bf425cd2275bc70114fe6b65c6";
+  sha512.doc = "bbc879818fd0324f8e912114e5dba97772e2cdba1808b2d66d13f1a5348c5df997e058e65d9e77bc54fc159c10add9a9ad73917ebad7c8c91c87678cf90c000b";
+  sha512.source = "9954cfd2e8818dd91c5597adb0e07c845ee7ce10b747b5a427c1203037b7779b0c552f5fae4e869af157ede3e9dd4ad505dafd8ae935a229f61eb885440e7849";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-italian" = {
   stripPrefix = 0;
-  sha512.run = "60af229fc74b32f50a727cca6da16e29cb9a5a0102f7c38c82db457f790d752e21e89b65977d56b9afe5834290cd399295b80de8f34eef6bd54c7925aed53764";
-  sha512.doc = "bbb88baba614ea14a3a2b3d7a9a10a7297f610bffe0e167544cdfda594f4ff5cc6cea0e372114a7fd8f4c85860652be14c1040e978f6a2c6b3d4d050d63db9d4";
-  sha512.source = "da88e27cddd31eff1bf08d7cab9c556abf70d931e18bbada30e667ab140847c33df098066d25797e83b2e14ceaec210e1000bc5add3f5db2e5a3aa0220784f96";
+  sha512.run = "cc58e873ecf3ced0c0ce6a28ccd810940f4511c9d83cb024791b24cba86b34dad48cbabb9cc0b1cd504cc7984f1c5124e9613beb5e8a3cb075a3bce9e91c37e8";
+  sha512.doc = "6b49f3cdcf424430cc75ea8fc931628e05b5f92c280c5c2f80e4747857626f249579126ef501f42ab588c59efced8f41fdc7736b5d08424b5af427b7e45d7ae6";
+  sha512.source = "79a2b76a6ddd32ffb9793002c513452a13a267a02f002944302f159b1187ec6462c90ee74bfd6f7a1034b44a2b6acf40f9a52a183f6c8f236ab87cf7022a1c48";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-magyar" = {
   stripPrefix = 0;
-  sha512.run = "4a61e8c41cd597ed3a743dbd9641d0e620dc6376ef8abeab52a23eeb40ae00511ce09996a9d0b36cd698ca15785bfdeaa34bc4d5f74f27851edf9b265db23912";
-  sha512.doc = "ae94d6ce95e9f379ad9f34953fddbe54ad85ee9aad25b99bd7a6d72cf0c8f9bfcbf00372f1556043509e18ac17c444add395be40699451482124f560d490b596";
-  sha512.source = "284004f197cf50f8cf24057a3c6b768bc9ed8ea43db9bf50ed83a28edfe52a35f2bfbf99420139c5cc2e291b09ce5b524b0445657b42e234a75908d2bc7cd65e";
+  sha512.run = "e6414a864cb7dfeb7298a555717b8f5005e577f2a1fe8fab69a72ffc3e0f087e87a414e0334a1b5981423c446794fe8869de22f4cacc9a8438251a050d293fcc";
+  sha512.doc = "869b766f9b00cf3c9cf06b9567713af5b608bb6ca53330405509422e670d63dc49cca39c386b1a669f2beb84e462d60d491ffe205e6525bae3ec8da356f5a2b9";
+  sha512.source = "575ef0a9b907df7a19a13c9949e16a734374777134fc1e1ff1d52791d1aa76df6f84a2e8409ada9acc1d0ed7cab76f1d33607d9982cff08efcefb315c8af83a3";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-polish" = {
   stripPrefix = 0;
-  sha512.run = "bf989f9dfd66b420ab57a86004ae3666f10804abfb0e0edbeb07d9184eddbe5e4208901ea3620f016cc844128ba411df1ace800d584bebb1e2739df84dc7bceb";
-  sha512.doc = "908a01da9fa0a952823f6f1272badee85adb44c7bc2f072e47b4b8395a78dcf19474f88be32fa74e81f5bc6a232fceed04c8f5c3557d1d8dece1dc215dc11f0b";
-  sha512.source = "b2b50883796f07c0cedd4dfc1b3633badb110847be9b6118892daa4cd0f78d8b8bd20ef479c164532b6c7eeadad353cfaaedd336fad5e17705307c7c7e1f4002";
+  sha512.run = "726bb6287552903bb1b8b6d161e2b07c7832a66c200c23bc873dbcf3dfc7185adaf551929a53f956f601e115d68de2cb2f2136cf6412a8d047e7d1002f356474";
+  sha512.doc = "13e70e01e8b902f9b47082ca3138e7f4b5546b0dc0aa5ef64dd68afe7843d8d9e0967d7b45cf8c9b5ff3bfb83e48613f0334000aa6a03f3e823866a36761a1b2";
+  sha512.source = "7db56dc25c365bea01590b9a4968d31780000952851aafb6332e60ed02e049a27f75ce3b6a320f15b8367f1b68ee71a09e0738fc0116739c40967fd12173a88e";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-portuges" = {
   stripPrefix = 0;
-  sha512.run = "cd4120cca27b0783680f0bc04822391a706fc0bcc6c9c4bf00188a4a234acc2325ca09371fc43d7597bd07e3924eef5bd0c4f151a0017ee6d279566eda4b8591";
-  sha512.doc = "3f3462689c558964e20e49476ebcdc558d6ccb38cc544f65d63135ddde951374ceaa977b533d6057927a5bccbcbb15279aa8d5f6eefd7e83a242f934c0cd65ee";
-  sha512.source = "cbec106856a55776b4907631eba04259acb1fee014a938aeec1f6dcb240e946d4b66958cfe8e5d43bcaa924cadc890aefb2f8fee30381c6e09277307c8decef9";
+  sha512.run = "3b31dbd9bb8f6ba0d998c6a4adc1e65c78414e620b44f282279a4f7d7562d494a13e2b8dd1c5e6022d0a19b53a8b2b6d6e266f07ca157b3734f7e45252bba665";
+  sha512.doc = "ed214df5cbf6aa5f7d721a1c9aefbfd9a4483b69803d3df2d10c6432db3604f9c1981dbf8bd4d8f4baf62c556b4fff4fc93c691056fea23a8992afe4c4a7d366";
+  sha512.source = "a1ff4ef92e3efdd3e89d4ddf520715e451e4417b77c2a195102ed6f9fbe2226cb09c545033775501570ae193828a0305070d01b971e533c8b34f0b3e5db100ac";
   hasRunfiles = true;
   version = "1.1";
 };
 "glossaries-serbian" = {
   stripPrefix = 0;
-  sha512.run = "58d1ded7534658095795078fdde71d38639f38794894d2b97484aa68ec776ea88371919e6005fba164b1f9f591f972e11c72c8872f5e09be901c3e3c4b0c53ff";
-  sha512.doc = "77f47d2bd1fbef8d03ec64af191d59fbd11439afab176e215eb2b359837f7e0b04cb9ddf0b00cb61973c6850cde58227c9d126a003de14b156e98b36378a469e";
-  sha512.source = "ec1993a5187f700033da2b2ac40e4aeca38126ba31a0b3edf319b5c3b70dbd59b9beacfd3edd1f57724e381ce6d9bbccb3e54a6ff371f54d8239e16c278c04a2";
+  sha512.run = "f240dc5de854d29d73b91c77df99b6c544a535b8a621b7d4b40683b4e7d1969681e409a466475d8ec68244a9b415d8addad856d6055c47f4015c19f8c2bb2327";
+  sha512.doc = "67b94bfa70c27840aba2b9eeddb3bd5c8f45b1182e657ab7fe0fad950624b3c09f07f4e4a2066bd6c704006de68cc021c2df435afbbecccc1bd009adbb0da8d6";
+  sha512.source = "bf371774f83237e812f6cf37d452335ab7773a9bb16e1fd01e4f0f73148afb9a21c9a9ed2994bfb7d67ce97d2de1b0c0f32aeedb85e24d163d3a48a24c4f104a";
   hasRunfiles = true;
   version = "1.0";
 };
 "glossaries-spanish" = {
   stripPrefix = 0;
-  sha512.run = "ab6899d794216c2ca181a73fe72c278d28653435f9af7c3de96633cdea112c62d56330eb00a0536d80ba93e6e54c47f0768e9d6bb4847060afa1a5b130bd31a8";
-  sha512.doc = "1e925a2195082128ec1e0afc572378c38266512d2e4e69c5d3f6d508e6b1ff4c49607a89927eb921c9b9eb3e40ecf3b54185f3f58485a44726cfa0b70019f870";
-  sha512.source = "634483a819d0f26d7eb08a7698068e8bbe7c1f45611bd8003703a890a9d5504b70cecc1bc77f197c3211adb89984354b69e448597e87a21840a594b44ac49308";
+  sha512.run = "b30355a97f8a434e70542195ea3d11c90a243fc76d5d8b2c374a13a8e9b1b94c7dde82237d83594a8442da92eba22e861e589e35f49397ce599ccb528761319e";
+  sha512.doc = "6951596bb259a85401899c2dc532c5d256c0026647d0912694df2768cf467597f6ae6b014277ddcde7603dd2efafef95f695752604e2f5d192e185ab2d054a41";
+  sha512.source = "1dcd8b4d50bc079100ff842d4ec7c1a046b51de66421f2d099a1b85eb35504f0afa8454f756c265e0c6e096a5be54795330c07ee033754323eb19c3fa5119c38";
   hasRunfiles = true;
   version = "1.0";
 };
 "glyphlist" = {
   stripPrefix = 0;
-  sha512.run = "27800dddf1eff4c9f093b97cc26b806af6fd868e4267210510466eed7cc14620ff75f70738cc3a13746e8428ca47a1a54d02800e85c563d25c1950707018131e";
+  sha512.run = "493d1d5af92fda0bc44228e3001b39e3675a9a9d367fdd95fd210fb34b8a0802ec84ccdc121bc139f70350d905c5587b489d9afdeb49e63a0c585a55bf396bcb";
   hasRunfiles = true;
 };
 "gmdoc" = {
   stripPrefix = 0;
-  sha512.run = "c71dd4e87d917fe9a374edd44dfa6424aca01aa8f162cfcfa45f2493fc38d21c4538442867d08ff9b95a4b73e32952227e4decd438a5cd2a9911361dc961d219";
-  sha512.doc = "11596c39aa8850861115230cc0a2ba427aaf649cc40d5aa1db36333517c5591f0af6f7fdf404510b016419606f19fd41adb5f26ecbb7539ea27957a2c1969039";
+  sha512.run = "34b3ea992dc387c99e8703be3d2af11b4e0d8c488a31de1b906f94c7989ff17b2dfaa1217d4798811cb44c4b4c9d36874991f0392191263d2e77bdc9f09623d7";
+  sha512.doc = "d4b2272fd092a6cfcae9b560653299807708959187c89e59aa7fc27c393f7c52463c135d201369710e6d76bfa4fa672a9538f192eff868b7eef4d2df21df38f3";
   hasRunfiles = true;
   version = "0.993";
 };
 "gmdoc-enhance" = {
   stripPrefix = 0;
-  sha512.run = "efe2e6ef8869bff7ab44257eff816138e374c13940204a52f687670f58409da8abb5bc6e91dbbd34ac1166438f7ac0d697cd3ea92204a3747b10d4a52bfedf61";
-  sha512.doc = "6b1e89ac5448cdaae3f21b5abf1d9f3bbf04832f1b1022ba40b0ccab1c2f93053f024580ce1a842a668e319e6831561fa9a77f0ae5498c4b4fbbe943a61db93f";
-  sha512.source = "eecc7d58ce2e085bee46e7ebabaf94cd98427561bd0c417ca0b0ab232aba2ff6d0f728290d9d572a95c749ce2eab45007cbbfd174ef6cf5b56bf5a3380f94cce";
+  sha512.run = "b1b006107bf7ff4290ef90bd9393b792240d68cfebb9fd84ca13af4e9239339e7b1789efbe97a9f68fa2e121c08f2847a032482afa04838b7278dd4f049f6f45";
+  sha512.doc = "c27eced1666315e492ea1fe4ff9f4760603149901000587cdfb8fbfbe6c99f3f9fa84d5bb23f473dca010b479e1d5307f976ad1fd147fee26dff62f55b63aebf";
+  sha512.source = "500f3725ddd8aa74f70247a8d01edc68d6f9cdb8d2ab9ac362eed15a1664f626ea156c96cc351fdc3db00b893bd5f7ef8637ff1a17ab9f4a70bcf675e495521e";
   hasRunfiles = true;
   version = "0.2";
 };
 "gmiflink" = {
   stripPrefix = 0;
-  sha512.run = "1cd15d41bd28e10d7b03bc63fa53f0c54591dfb0f9b4dd74252b62b158a32cda145465bf18b475ac59d9e94a845e3e5281dfd565f6b32224769f9aae551fd672";
-  sha512.doc = "2bfa0141479a651426292d00a0ff0bacded2f8cd3c6307766ec2fef353e9494e0b2af15b7e09eafd5e5de41832fa0f426be195ff266735bff47ba9b861e54720";
+  sha512.run = "d9c7a86ac218009bb6d431272aba2ec5be5dadc6cfa01f144e1a7cc7a9b6135956466e6b010326980974c93c3e6fa616ff96838fc455ea68758a1095e8016e17";
+  sha512.doc = "101f2ae37a1546c6dd8738fa3814d1332eeedb9b59a107fdc4a257eb4f8bd3f48b5a36bd3fba4155939a0446d07687d7fb5e1651c736ced7a32a0c86d7514336";
   hasRunfiles = true;
   version = "0.97";
 };
 "gmp" = {
   stripPrefix = 0;
-  sha512.run = "c326a670946f1111819d56bd61c1510ea6f8c647c5941504c654310864574b0493037f8ecc343b5193f86d301dd722b79e5e224f84d4e855fa64d613ce3672f5";
-  sha512.doc = "ad4359685fe34292586f7f50b62a69b08828da14da0618c7279920332b3cfdaaf29639f0b0456b534844fb7cca52fcb25add943c051c604714c80c2aa20698fb";
-  sha512.source = "4db103e3c543625ee48eb212447daa6a9fdbdaefee127d57a81546851524e2e0b3f8a54ced2b69e29fd803776a461dba482f13a603782f4865ed9531695160c6";
+  sha512.run = "b959ee9e96675c973944c1cefe1fcc2ca3bb64f8a4fa996c53dc7d33c47838c8a95cdcad047688a891ee271e786765ac77cc37b75e417fa56d023ef96892b26d";
+  sha512.doc = "362ad7d66efd4447df607de3a4da6a7eb7c28e04df02be991b784bfeb2ba6c1567a3e4a6b1655c1a1aa3c81c2d528032539ae948d3a9f77048f67a7211ce51a1";
+  sha512.source = "5e6bd221c09130daaedb0768f55d29a7b78ca92c61f5e0b54028f15f0bd47698e10608a9c01f39b29a49f4f04c31eefed84e8b36a5519ed951cbf3436d7e6e9a";
   hasRunfiles = true;
   version = "1.0";
 };
 "gmutils" = {
   stripPrefix = 0;
-  sha512.run = "5070bc04feaa468869a92700c6b96450f1a79bd8da9e64bd5cdefadc932a1a9f491107c6614fae8f49812810dd5171b08a9ffa9cd2738fac8b82d4c7fa9cccc7";
-  sha512.doc = "ccbb028595a28c71f3f774197597e329f13cc22050aa6c1396529219b4fe1060505f09f8912226211cc90f85ea5cb7b6c79e8b38f485bf0ec19c1f085cb7e1fa";
+  sha512.run = "f7cc3aabbf7eacf805e270d599784acb91fd592044e213d26ad640ea3f5d78654bdef08af1292d6f9dfebb75ce1b1a76a0a6d5f05fc7bb244f38dfc3879d0ece";
+  sha512.doc = "affdfd366d466e077287cbc998205721298f1bf6422bef4d968a4b469f371cfc403480f74f16e32803f6b25b11af774f513ffaeb6099132b4130b0eef76dfe83";
   hasRunfiles = true;
   version = "0.996";
 };
 "gmverb" = {
   stripPrefix = 0;
-  sha512.run = "b3ae9dc4215c0ae5880ac4aebde1a0073117b6908c2c8d0830e9e50a143a82c8b8c783aa859513c7253289070eb06124f45ee95b128d55e4082fbacf15b85415";
-  sha512.doc = "5ed64ed8fd0c3dfe0c2d10d22ded62ec2c1ce7327e7b998baaa7a92bdd6cc644c948e22d85e3fe5ffe9c5404d5c7608b559540225939ff46fe81005a02f3ac78";
+  sha512.run = "f17bc2b8c31f779682d2f4a9a5514173a90361a4b00b56f458fb4a0858eb2495693bcf968cda21d0ab3d5b6e1ab962a75d9b8959e4fc7feb7bf19f0349d5f07a";
+  sha512.doc = "3e40b6b06c3b20808b04878f4c52fd57fb4f6f6d544df7fe107650a44839bed414cf5fbf66819a801c3dfb82586ea682fadb2da65b66ac7d06263ba6c24d2c19";
   hasRunfiles = true;
   version = "0.98";
 };
 "gmverse" = {
   stripPrefix = 0;
-  sha512.run = "5dd6132914915f7d69d784e16bd4e0ad92f163b6c764709399f0b3fce488898eb6b2eed42172fb2c2823706cbec2ed7e96aaad880f3f9879094cd764e6385ebe";
-  sha512.doc = "4f617f46295d4880c330319c591879d2149f623e81309226a840820d6182cba5f210571f36464c9484aeb9995c3a9a5253fab7b483a570b0866284db63b391bb";
+  sha512.run = "8e5396d11f60da6986e34a4822bd61093885c2c9308f5d2314f7af5b769138d3999a19e5b2223a0b8185fa5be332a2478874acc5a18dae94ae2c35a5c7310919";
+  sha512.doc = "74c7d0644a32c8ff1997117ed1b665d73736d8ec99c698fe537898a22ac134ccf10e66b4aaa04a967888bd849cad1396e0cc61b0baf1348f1e8173621f881e70";
   hasRunfiles = true;
   version = "0.73";
 };
 "gnu-freefont" = {
   stripPrefix = 0;
-  sha512.run = "62a1f50e297a0d246f38ee663f10de4b09332f54f72468829f06f0601099a0942d8203fa8ded0c14233d9d8cc0b4500b4596045a36af567429048f8a71c38996";
-  sha512.doc = "7116da2eefbff3250bcb0da271695f97196961fb0489aac4495632c56eca55f66a4b82f3ce23946e99d737922267f030a1d34aed773efcf790977f1511cb0d52";
-  sha512.source = "03d224f486e727568e6de7fad64f3ddb3eb714aa42762ab723dd11ca27956d7c82794501742263ccd7b87d7b10742d587a6693e97ca50634b5fe121b51f62454";
+  sha512.run = "0955603a0107f6822fcd654b1b048cedc5cb3fa7dbca5bb857d2c96cf6f10b969d2d0dcacea5566bf0f2d54ebb1d854eb51cceb1435123075f14635ed2ccb3ae";
+  sha512.doc = "de7b1e65675edfdb9b6aa986769f9076af7c657e0c5799b343e140fadc00947655255e0af7619a2d4503ebbcddc95f0a3a012ec67b4d823e3c190bc278221a00";
+  sha512.source = "f815fcc6f786a66dd4b9beb809a22385bb83f62d6e3433180d431cc4752681fa991ede7cc4ad6a59a1a2177be174e4b55407317c4fc1d2ca3c323c98fe69e3bf";
   hasRunfiles = true;
 };
 "gnuplottex" = {
   stripPrefix = 0;
-  sha512.run = "c93c3b3a56a006a659a5feadc6a884d969750851cf297cdb609f03fcc2fe8b1a3799a2fae2426752d9101506d1989e5630fb10267c20826a619ee45f646e42dd";
-  sha512.doc = "a445054ada59f892396dfdc5012cc39b51ac0096c441e4c341f39ecfb6346527620c59b02305eee5021da52bf92f3fa6499ec71fec007744daff47630cbc9d01";
-  sha512.source = "0133e0e4a93fd03272d558804f5b9fe3dd9ef5ddaf346a3baef7f083b8e568ca662bfc42e9b95c9cb376ec2fb5d658ac48147a368d5e91ad46cebfeb208da580";
+  sha512.run = "88af020c489b187dfc86a9f83b6b64eb2d3a0f4c922426f6784e3c6b094c5d1b22c430b407413a980302e324899c6178f7ba184168b240a8e50c42d87e9a06ab";
+  sha512.doc = "448cc866ef0a256ec1ec64d8f2e43ccc1dedcb8e483aa808ba0c918d6f1a67ca81aa8f5053ef733b2ee0dc53f152982f41073791a91835978001083c691899e4";
+  sha512.source = "6811c1b75a07a1258c601a6dc86da6be60ef62be3ab362eb48627f49e54e68bde62a5610dbaf6dec953a1fc6a2dc229ede97c0b8f31ff6a7d5b5f40cf242e93a";
   hasRunfiles = true;
   version = "0.9.2";
 };
 "go" = {
   stripPrefix = 0;
-  sha512.run = "8b1c7d07f15e744873d861bec608d0649928dceef6d4d2321c4436ec03dcf68ff004664c70515a2cf80d9915b03013aa6a50f69d88285fba63143c4fbc63a839";
-  sha512.doc = "08cd544fe1970aa82800e94a450993f791ac1a50a6b172a173f56eaafb8982882dfb64a9d4426e641932461a6aff418c3be01747112b182c44315d48bb866d15";
-  sha512.source = "246257ad82325ee95c6b1c0f1c3789bc006d4a5bc4da244e5548478397e4171705efb574e2b0e54feec31e017b97d50a0c8cc59cd6efff164a0e7d7b17850c29";
+  sha512.run = "e73b4fdd85590adc4cb7aca073c647b6bf136945ef49855b8fcdf55096edc928037de6d057e35f8ff76faaac93fa4d09c6363da5cc638e4c34b115c7190c9650";
+  sha512.doc = "3cd5af1276497f9aadc095b378dc3d49560bc9dc3f68c06cf315c6f1f33c48c171b9733cbf99da474d340122b31e525131991600e5e27b7470574de5d2bb79e8";
+  sha512.source = "526c9a9c3e9df8ca9f7764849c16d7044ecaf30bdcc8eee2891deb0f3a2c20a1f19d7b0ae4ab3b1f856201383b2169566c890ae9c127ecbd440bfee6e464345b";
   hasRunfiles = true;
 };
 "gobble" = {
   stripPrefix = 0;
-  sha512.run = "1b748ef7c3e47a494bb7ebc5a256b7aeb727d92508e247a82738d0c5bba8e6d7f09e019ae22afc975f8d6f2df9f9fed38bc2a76f1645d65bddfc5f9dd15496a8";
-  sha512.doc = "e4686eaa757c04d427d62a68df31837e167f49874b903a154201b0bbe38be4ea1ce2d57189e407b89aba16889bd24e9478fe09d57b88985ca18c692258c0539d";
-  sha512.source = "b42eba5c42598f16870273ca3877af6fba1ecf59dea5bc70d140bb3cafe0100760723f5659e9b836ad2876f3599a5d1d42b862c92b256de6fb58de8aaadbcb93";
+  sha512.run = "4489f156aa3bce1400040593e852a105ab8b1b085ee9f620b5c4efd81cf23bc5e5f98c1a228df86abad5a8d5e71f3bf97c0f1d8c12a331ca4c1da6b1932c20c7";
+  sha512.doc = "8e796688e81cd0c0637cb1129f83421b47abd5de4ec3d7decae4a510eccd264031c7d8a0a76669ca576fe6eecd2f732022dee76260b7b259053dd2f826968bea";
+  sha512.source = "a8b3b6c9b15c9a3e7635a1d5068cb03893acc60072bb339ac7df14b3f21aa365f3801fb24cd7979458f42f990128d19af1ed7f45f95e5dc7f66c2c630f1820ce";
   hasRunfiles = true;
   version = "0.1";
 };
 "gofonts" = {
   stripPrefix = 0;
-  sha512.run = "d619175a589acd3b3711f00068e0d04485da7d76222804a5348397c7aad22f69ab3e0f0e2efdd605895027974965ac8ea7e1d09f00f274fa64e82fe62d1c5461";
-  sha512.doc = "d47496de150cf2b5cc1133b97ca3e4b16004e6ef7d41b79949e094a8f0c7a973a4d77cc0dc771e287f0dae2e1c158fd4489d6334b77eed6a395ba44dfd22b0c0";
+  sha512.run = "6401682f636cc451c326ba67120e860e5a21c97915d168294ad4bc38c1160160d4e9de981a49ef30d042f07ea710f2e302458a0216c6d8bca783eaceead45b7f";
+  sha512.doc = "59c48dd701bca3f0dae5c80fd4e182145d01c98c0e7d19bbd3335da138c7d0a1297f16369f942d1f07d34e113e14970de1835886a596931fa62ba81ec52ff356";
   hasRunfiles = true;
 };
 "gost" = {
   stripPrefix = 0;
-  sha512.run = "10ebcab14cfcb5c6f5c8eec30d4859e67d4b31db486facc53151e471b21f403ea5ac5245528c3c923edac36689ccfcccfed45a244dc020b18889c11a26486010";
-  sha512.doc = "0a50b2d1a76fd0000cb870413df632b5915c60d9dfeb9617e4a14b98ad918dbb26c513b71ae6bed77ad9a5e46c92bc3057823d23c3186841a01443d0b774f3ab";
-  sha512.source = "53ea56184064287423c26826d31466b1c29952973b7e3af9dc74b72b7c971d90481d2a382898d2b75109350368710df7049f31d13de066751234df68d065a4c6";
+  sha512.run = "af42c1e2407b682057c55b2672a7238a9cf93728ed26b24dee16452f4ce1ad53f564118b49edd00fec7f423d405c2ea4ccb3d965e63942ee0d639d6731678b90";
+  sha512.doc = "69331bbaae1cfbf76dbbedaeb2112e7b62c61b3148f78c6f74333960a72458f0abc44891d61e7876a67e24e800eb42845219af4a8be894bee296a8793c53ee36";
+  sha512.source = "9ed231579a5c156edc92db74a2d224dbdc94faa0edda9a7be8a18771a3d6bdad00806adbe419e19a3752c02b59d6c78e24e2dd11af1a65b56041731292375f38";
   hasRunfiles = true;
   version = "1.2i";
 };
 "gothic" = {
   stripPrefix = 0;
-  sha512.run = "bf3b41ea562b60d55478da8469e66add0bf2dd6f4d3f73e7e4da71e7d7736260a06573664d5aaba2979aed8f45580babd380daf7b0f697e273de6690a1782f88";
-  sha512.doc = "08db9ad84c7d51a388520c70f05de19b62813fd92f51ad857dcb14087eeaf09ef8f48fb5a207cee14c79372a124a7e3f0579260acd2e7f0cd2538b920b8e1bf0";
-  sha512.source = "c92fa61ac98dde3b2f519f3e78a91fd1ce609366dffe6fd836242b06fa65148e26bec2b226bb9b95767302d02ceadbaeb4294e0210c4a41dbcf37fe744089f2e";
+  sha512.run = "2af358e5cbaae42d26881b5a8047e5ad0919fa0d6e03488baeb00e50bd81ac38ed3531d47b4be24161b63af4345ff7e26354a2f0e604fce4ff97df795825b064";
+  sha512.doc = "606d3b62b04671c00372aad2da6003a285d6a89f5fb255fbda07e5042b59ce6f1674b0b4e3448b431141b03597732c0cc989914d393be9595616d8ccbf0020d0";
+  sha512.source = "ec8740d7b8b1520fce2a65573d133b40b8112793d80ad5fe25212142a569851ca27888fb7877b9af552151958e0e5935b00118e3acd506b5eeaab7cafcd1f0c7";
   hasRunfiles = true;
 };
 "gotoh" = {
   stripPrefix = 0;
-  sha512.run = "2fa9f97628bb05301a22889f9ebb684643b9279f86ba157fa7883a3c3ab26f36c71fcb47ac0c843550e7e4bac41acfbdca3e6518cf57ace8449f7e36c6e21e50";
-  sha512.doc = "8ddff9907f774e094113188569108f23cda9310430852da888ae721d3546048a0460b642747f72cfa2a7661900e574dd9b709a14ea780bbe4d8d563c2a87746e";
-  sha512.source = "f43b9ebff79d51ea9a90a306f9831a8e719e53ee282443defbbb8f88b31c6957ed9c98f0057290ad2be57d676787b13fb91339420e73ff8b5de8d2f69e931a15";
+  sha512.run = "7371c8718ed8651fd13e69897e2b8f8c1fdace736bfd40a669b866ab849af17be81afb9c258a99ba0e7722b8c54a4077370c9e3501c14a22d2f2a49115e0e8ce";
+  sha512.doc = "6584b7e4c40ea9ffbf503f99e1e9fa4f76ab9d40bc1b96e9dedca11ddfdacb2565c10835900308f7d3e54d04ab07b346527a827e17d8a358852278e729570fe2";
+  sha512.source = "e166d20459d2e9ab63e2897f4fdf90e14deb3322f0937250fc07bf3d7349289e16185e8e986ebebbc6e68f9639e1c8cbbc63e8f4e7ae2d68961cf7c4172dd46f";
   hasRunfiles = true;
   version = "1.1";
 };
 "gradientframe" = {
   stripPrefix = 0;
-  sha512.run = "61a760d5bc4cd25738b45fb8810ee5ed6926b87e7a2ca054ce10cca7fb94ff9b20616513ebdd1a18248ad54a599d8249131489b1b0ba66bdb9f5dc6df57cbc8d";
-  sha512.doc = "098ff1d7af6f960362df595c214b079bcde701fa3b59a32b2e043ae57bbb2f8101b5ac9b4c997f30d5e004fae289b5711b6bca503e1fa82992c1de1d6b256435";
-  sha512.source = "7e7e199ab40c529c0ac63feea2012259563e12c708742ddaebf1d97e6871d2ebb1427994191a8c0b97d0543dd9e109d90504c357a20c53b1f104ea268e21958d";
+  sha512.run = "9fdb9eb50f689b1b4bcef0e96b002a5db0009b13f4d34d15206e5530bdfc8eda25f43a30a69c44008aff93463026d801a355fe5c3e02afd49c2b7b4f74b6171f";
+  sha512.doc = "fcd1920d85e51a96e17ffce5e0b14fb1ac864100ff8cb4af03d0bde2aca18c95569dd5b41279e074e86a031394a8f176d2686259c0c55c0b4cce31c7066e56ac";
+  sha512.source = "6ab758a0ecfc76b11e0c069684ec9acb0918e22ce9415dc7ac92c6114728e5550f2aacadecdd2b4dfa0f7551061bbc2446a9bb0e14b26bfd9de14e962843a55f";
   hasRunfiles = true;
   version = "0.2";
 };
 "gradstudentresume" = {
   stripPrefix = 0;
-  sha512.run = "5797532e2cf6dae3913e65eff7cdf36e33e3e942843b6d92c505e95969e96e6424cd8d1d79d09d235a9817769e0256e5bdecec7345559cadd58b2998fa9dead0";
-  sha512.doc = "f9a1924be3d80cf40dafaa2ceb35803ef016fbb2fe178113534ece56425575e2a40143ffb1f46cb18bf4850c27a2ab88e579873ed4453b7b4c1048f1b7eb5ffc";
+  sha512.run = "99236f32dbd505b6b408fdb8b0cc78a43c3907a6fa011453b4ca12b71a5b4d85269bb830bcb3b33f43d0f13bd3600736841cec17d848287bd4e401e38a7231a7";
+  sha512.doc = "828328262784d92e3a809992211772996bf92ef82e65d30a906d4d7c541ede3e7ab3c13e2e77237087fe4dd609e457ce035c5589037f1bb51df7a459d199b84f";
   hasRunfiles = true;
 };
 "grafcet" = {
   stripPrefix = 0;
-  sha512.run = "a269ee049c297979fba8d972f0bcd03038ad0df42eafd356e3d1c0ac3bd9faecc3c2c1b86ffd19c5e56444d306863260da105fd8dc687e24ebdebf7036f3da1f";
-  sha512.doc = "2e7bb7cdeade5ce4d15071bcee578326c562218e8975e46da7506c63a31d2eb4cae9d7b4a08369d8731f2d259c72a6c446450572633ad887e6495f49013f0036";
+  sha512.run = "51f50b30976c73069a380398658b504544a44c6e32c1497575700c2ae7a5cd31febc6b2e5e99c95ff9a939aced83c2ef496aadc9d8df3f22fe8ec62b70a5831b";
+  sha512.doc = "67a0105a95974e88f5a5b24a06c3831a1d69b03f870e1c0dda7972ac420f77d82ce81f9030afb83f404716689b08e3ac717a26ef0a70e66b29f07226fcf867a0";
   hasRunfiles = true;
   version = "1.3.5";
 };
 "grant" = {
   stripPrefix = 0;
-  sha512.run = "6bd8e29ac76386db7d778361d17a8d126ce7238c96c3e4bcc60904484832e5bbb6f5d4c034e5ce6edc2790047bae9f9ba23ff067f228c97a684dd60aef554b80";
-  sha512.doc = "261482f23ab91f03cece1db6f7217f3a6d7780a8e886415bdfb3e7cedf06cf45df3758dcc64fe958474a9515d723da5f58b5bd0d64923589e71bffe3824fe4e6";
-  sha512.source = "5d04be8dae034518801b9b1d9dc1e53fe9fd8093039c7842df1618e3c46b5d10a8eb1198fe068dbb999ee20c4b67ec938302d558152ede32d813cfe4567c8a7e";
+  sha512.run = "97532f2d870189e325af363b3825955e76e11070ef524f662155c90a5342148a93b365e53627d2e0d7909fb45558a4e0cddaded8ee9d9398b2e516eae987cb82";
+  sha512.doc = "fba7a0d396f928cf5d7b6a295e7ba54c4d7168f0a120d01871703966b075b627e5e85ec95027aa1be7baf920f7a0f74219ddddb4d4620540a26466de21a5df6d";
+  sha512.source = "0eff24236e91e76e8b5918f5aec7d7cb8e8e76758f3f7c81e2b82349317c8d534fa9332cf67d50a2627b6c679e3e0964ba2cf5c82411eefd2d7529a9e005a1bd";
   hasRunfiles = true;
   version = "0.0.3";
 };
+"graph35" = {
+  stripPrefix = 0;
+  sha512.run = "5026f47a57455bbd55bd87f4267b1ece00b7e1e7a8ac2b93cdf168198ca13aa1eef87335660d2ec7fe33a2408f1e12978adb615f81675ed8007e21daf7809d23";
+  sha512.doc = "64750ba4543e251661e5e054435588e1def17ce91a94bb5ecce74f621597bddcb3fd765bcc2662391c3adb603a89a419ee998d0f9a441806fb38b8a7e1b9945f";
+  sha512.source = "db4ade0d195e34245f0866ea37b3ab97beeb2b6b3dcdb8424d3a9b2dd26d9eb3fd8714bbd596bfd2eb2121c44adf45efaaf5a3841f1c746f1e031b8f118cfbf4";
+  hasRunfiles = true;
+  version = "0.1.1";
+};
 "graphbox" = {
   stripPrefix = 0;
-  sha512.run = "bdcdcc806a004b72cd8ad42e8a39adb9b656e43923bac89b5166cf2a16f055e980e0dc1059e6b3d14633e730df7f2a1e830189a7ade4aa19318096338e452620";
-  sha512.doc = "6af5b7a0f3a3ff3e37823ba9d39995f60aaf683aec8ff5f45d741e3747fa5b011977aff6bc6b28fd8ec056c38f1c97977745ef9f5b01a00a1fcf567cfb9ad614";
-  sha512.source = "c9ba6236fd04a8ddc003c303adae2951c6b6c9d0b736809175ced0cd12627d6e5753a0eae5eefc43f7901547162f0f50fb1548861ebdc8489cd514513eb99a04";
+  sha512.run = "fd3cf4ebc945d889d74d54571a158052e00799b9f973c2eed0aee7eb495a3311fb1465b9038103bc9bf6f9b5c0ea8b74c9ab36cebc1c9125f9b2f23fa513aaaf";
+  sha512.doc = "b43c56f85b7a4b1be4866b3d6c53b7c106e9285de03d4b9aea8f4871d32e391789c6912d65522bab3178b17577229016db64ce8b1c3dad788caa5ee2f6ad9f59";
+  sha512.source = "e94d59027803f55e87d05542f5165ab8a78973211cf43ca7d0fce348275e7b8b3556af92c9ca6dc741bbbef39bdf87b2a423549a3330be1a7dab94f22ea1c8f1";
   hasRunfiles = true;
   version = "1.1";
 };
 "graphics" = {
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
-  sha512.run = "05d98de8e1a3dea18aa19d95ae892653dfbf2a4d52fedf1cfe50d1d019c368fe44f1cc21009759df363672d6186091d0482e38a8b95234aaa1f67d1b29af59e1";
-  sha512.doc = "00d011ca0ab614779a350765eda8a79e09d7a93dd53fca5431d27a533827c4b4f0332be0cfbc82253490deadf8ed3a25893d474d222f0cea7e40065ee3babe72";
-  sha512.source = "d63dd8dbb9a6eec1b37445f97969d353584c01bfbe353a01eab2f8a43d1dfb1589f73163aa7e14468a9b352469fbd8a45b8c80045c0db2a22623a026cb89f0f8";
+  sha512.run = "5f11bab21969a5ea2fd6419315ce75016147d6c2b19cde5fc62b14b2c4442df2078ea504484b8d55f9f9f9aa34955ad767775b80fd33d3aca2a959ab8e762ec3";
+  sha512.doc = "a1cca357a00fe2478db4409e34b89535c371416746f225a0392007e1d6b1798e74dc144b0dd2be4d3e80184993bcf8c0fee415810c61223c0c50801b829bcc3d";
+  sha512.source = "df668bc141aa225e2fc7449f0eebe2d415773338a78aaba2d0e84409b247f0f7dc5b5e70fda9b415b6babcccb138f22b12625457b61954c3e7791b8203264c5f";
   hasRunfiles = true;
 };
 "graphics-cfg" = {
   stripPrefix = 0;
-  sha512.run = "9fce4db5d9739280a128fb3f6b1ef37e45774cdb9c78bdada11a3548105f0a920fe62697cc845a5e4edba2c55f8f493e091993bc0246303be535bbb30d897b7b";
-  sha512.doc = "6608c7ddd3afdf8b3c08f223e8f3ae854c67ac043d7cb80173ba47293faed6f96a28dbd920b6bbe9df7c48d2108efaa549c87847b4be25c4db23e0df42479f21";
+  sha512.run = "de5503498e2da72de1eb8c17e3e182a237dc08b821325a1cb99a291a119a68884d0ff5b9bc48401918a5574e020e59d7719f23588ee7df1a0a4c2e0f3afb64d1";
+  sha512.doc = "a8b6caf61ddfc74817b92124dc4ac77f652be325af9e6caf76b5f1f3e9b41b7c13ebda9cb7cde8afd4a227acbafd26d420fc819fe85d4a6d9583546baf3b1847";
   hasRunfiles = true;
 };
 "graphics-def" = {
   stripPrefix = 0;
-  sha512.run = "bbdbbef48f5cb3895eb86f516fddceceea1522b18f03c37a56e7d3f52229966087304174c372de8ee40fc9699662500a26f0ba534f83da2d203d86fe2eb6cb8b";
-  sha512.doc = "9b47e09ff2795007b66424db2f7a6b6fe663552f765f36430b016aa7e7b9fade6f45646992e4fab05e09a1f34a8b95eb8c8125f611f1d524610af93d4acd7088";
+  sha512.run = "c38f88cb97cca4c9410fdc35933e6ebc4aa54863d38ab78e07797f88eeebe6a8ef6dba74e2ab92c49114d72b72d4889d4a9b56f51c8ba7402caa0b3bcf721b76";
+  sha512.doc = "6b98fc05aa919f65259a2b5fd659174cae036697b3b5c1fc4a446ebd861c0b641c7c4f6498d960191197aba270f242f282f13a86042771b69b7275f30ffe26a5";
   hasRunfiles = true;
 };
 "graphics-pln" = {
   stripPrefix = 0;
-  sha512.run = "977e3ce54b83f5c85614e3c78501cebb814bbcb248f2523663e9ead8f841e41c591ba53753b2f3272ff1500fdae92e5b21fa0b75696a74745b32092b79e372e5";
-  sha512.doc = "f1fcc6a0233986404893110aedc21839fafaf3306165f11acdbc31e132c27c228d85bb3a61d0ad99549bc3a5310e958d29adcf6f30ecf5fe0be91c9ba10af355";
+  sha512.run = "c24212eb46857883081ddd7639be20850a68afa036b4c392108b8a06bdde15c147a77ab64421ca3513063d531e7805dfcc869b8adede5d32eed49494f52dbb4f";
+  sha512.doc = "56c8f8baf3623116758c9e624629c3ac5c8517668d6c96205517ad04f12f8419100277ba44241d475781d29b60bde40b7020f832091bd31e086884906a2b708c";
   hasRunfiles = true;
 };
 "graphicx-psmin" = {
   stripPrefix = 0;
-  sha512.run = "a235b80135aee8a9c16a2860aa48645dc20ad49286df042bfbc05024282818744d851bab791ed674f9948839ae7ea56a5e8b75fb7f513d4dd8ca3b6b07009a71";
-  sha512.doc = "09677f6b0e8cb82ff0682546e3ddee7dc366c04c25762a7b89a427a0c3b5416ff65ece64f9ad8a6b376ec56edb16328fee4d47c84c6c3c3a8e05714b46001f9b";
-  sha512.source = "9f73324766f8723e569e5f08ce4c12cdb0be6f827d3b12cfc93560aeb036a118799537336200df55f02c6108a9f28ae199b060b1c02facee7c69ef2ead88e4b5";
+  sha512.run = "c8adbd518b130b11acf7e528166299caa5451b89332f79aa8b27e72243845f69736460c840d2fac7782c77ba4926f1fb6a97292ac312e2a44adc537f25676c63";
+  sha512.doc = "06a6703d35b86e9accad930e71977e6186406bb3b131ccb78fff8f583ad3a5239fbc07f5cc046f9a7059cd4ff1cad3b5ded60333a6d0f7c95369a8ce620173e8";
+  sha512.source = "e81b2dbdbcd61c896a89c8a9777fc9f0701a7051f8d97460701f26ebb9c824f112a5259d11c910ffbe45aaac52469b1454edecce74ce1d4e88a8d00421a84092";
   hasRunfiles = true;
   version = "1.1";
 };
 "graphicxbox" = {
   stripPrefix = 0;
-  sha512.run = "368bbf56c5c88793eb068f5db9af8c5455b9aedfbcc9cf75f6e275bca197b995b5a5273b25bbe58a533b5612c6d4a7e55ce8bc156c510d96eda810c49d9dc6e0";
-  sha512.doc = "0963a229628fcfcde39d1e4ceb56927f921e0a04e3dd42c3956446e005dc6b13ae3068caca84747868aa5536a78b160c5fdaf9bbb77f96a16fcc72a017d4a8b6";
-  sha512.source = "234283cc9e8427017ddbf015733a9d07525bfb375769784c4a3a82819fd2ac83912571ceefe7d1d3fe4fda93b1dd165222e715530eac759b5011b2acdf7b6591";
+  sha512.run = "0e1e0e9fcbe56ed93bb87c8d29049e756ce21d71488084ebbf51c47ab16107ed213333da137eef8fc38e4431ee95dc02e66201977f1133babdf2b447e24bbe70";
+  sha512.doc = "39182c10a5a3c1ff44aabc7359f974a89d7a67f931156c6c0c10b10973c0fa7de3c4c5b558f3cdcba7fca092c0b318eb0cd99da0cacce3a5b826344c939b7882";
+  sha512.source = "0077fdffd487632502285409f2ff4c0addb85f607ebb1d5e3e909ef58f3c1b7ba67bcfe07f5cc2fe5b95ec1f2e3b9d5d7ff2f9c66d48a5fa8a73c4cec13e795d";
   hasRunfiles = true;
   version = "1.0";
 };
 "graphicxpsd" = {
   stripPrefix = 0;
-  sha512.run = "233f0656e499556e83f5ac05e6633fbc13b1a9e5aced6c2f1f2e3c1788bbebad0a3a4ab4a128a43703a6754469a0f6c25d6e399b6043d583d570625b20f8f331";
-  sha512.doc = "acba191abf61209c696b0339f71d6b423b1315d23a8cda75bd48ef29174c4b3953ab272fb4073bcbc62bc1a8fd750550c204c7d1866c9646587dd0f864a14a94";
+  sha512.run = "616808aa01900a8712fa96626864a6e423359de5f181f8bac4556dad99f12a147a8a8152339c6061cc90bd20ba5e2db6afa8a9431b17c1fd9058eb04948fab3b";
+  sha512.doc = "7a9d1a5c9a9ee43985a0fc3c826bc7b93024ca75be02e5b155d283faabe4ace3c1946f9ffca85ca0e98f6b05fd6972e1c0ab9210aeab8da982e0c8da64eefa46";
   hasRunfiles = true;
   version = "1.1";
 };
 "graphviz" = {
   stripPrefix = 0;
-  sha512.run = "f4897f65eed3cc6c54fb1cee0d22fcc77b9030769525cae0103cf2b27005456d6a9d08831faffb1eab532ad8385f9a233a8d766e46cf8d6ab0018c3f19f8de69";
-  sha512.doc = "e32eba1da87318ef0e7406155d5bdd0afccd403c82d00e18940632a021a1a97dd0dfeb3663723c5b4ba06adc8c1e56d4c8488c63627870fc18f49467a2beb711";
-  sha512.source = "184dab4ef1b23843999f54bedef123b7364e902c0f68a514d8bf9f00b88abafe3d30fe411dc40673959649833b00045873fc1e8539c21c8755f3278f5800f66d";
+  sha512.run = "01188af4a90b3906959c8c86f4da24e74fa230bff75d4a21ba06f0524b1a195e5640c992b77a97575ecb0b21c6236fccd8ec4cbbfcd3d5fa1675157f5f305402";
+  sha512.doc = "298c96bb4c07dcb085111d5eafe027b61e1d6abbcf26efc5888fa2bdc4bafc9380f838eb9065d8ccc431b46f0f1870f50cf00de59f0e6f3ccfb35db2b06a9c20";
+  sha512.source = "cdb6a5d2ba774ac28412cb465804dd07c18e2282efdd7ef4721a1f48cacc22d55068e32188d505dcdf28d5c34c70d3f6026c1b8637378274d8e04533578e379b";
   hasRunfiles = true;
   version = "0.94";
 };
 "grayhints" = {
   stripPrefix = 0;
-  sha512.run = "08c611155497965243a9588b15a3f489d7c87e72d2868aeb41342ea8fed2afc7ccf31042ac473db93c91221571dda485593ba9f7652d52812138d6c9e81ee8f1";
-  sha512.doc = "acaa446a2b5721bf0ddb80f5f126f88ab31d83801455c6c1c3c88c40c6fcfbbd19263159cb67d63a5eecc0a95736a4f01dda8999fabdcd4ce0508a8277c32775";
-  sha512.source = "6d85c509c5cf02f77149bb31ce171dccb4ef769d4ea490398e6c5deb50df53eabb5fa0e8736f2daf541d7836913dca4084d19fe39c06bc24980479b040ac0c2d";
+  sha512.run = "dd16c50a1d1c5886c445b6b6ed3b73a082f42d915c8d38994b5014ecebedc49774d2d0cae5da8c69c532c4f18a4b34dd701f4b192fa3a9c6c3f57a80e654f4f6";
+  sha512.doc = "e11c7bc565ec3503d959e2d1a4368d2fc351a0cc5be322163afb03e88711346312d2064ced4c5afabfd3e8616a2719103117ee90b5c397d7151a005ff833267a";
+  sha512.source = "dc94b73a52c4ba9babfceaee31495391240bae9e95f487301d660d1198e1b19ab50932498313bc69413d7087dd6929670eaa2c5d4ead2e9e2dfd96cced2cbdd2";
   hasRunfiles = true;
 };
 "greek-fontenc" = {
   stripPrefix = 0;
-  sha512.run = "605f1d91a43146603279cbcecb2da650dd4c00c13399e01da328878dce44777100b4102b5f9a23fc81c63c50427c2f5c9a71b1b8e706977e52e077717386a13f";
-  sha512.doc = "fd054ef5f78ea6d69ecce352e8258561dd295338410dbcee5b27f87db8c08f09d08d8f18eef7dfe918fdd6ce48a8f897d59847e1e7818d19313753b558499500";
+  sha512.run = "ada072429ca788a4186e31d9fff6ae7907ec220dc485d646ab5de7ee345775c3e9dde31c92f6f3ac5d3378930ba596e25457ce84ccaa3fffc2833b7260489528";
+  sha512.doc = "ca726404f67bfa7c6c010c2d11b695e7695bb33e5f594a43ca62fe84b40ce1abd5f45756bd22e36c990bf88df6929f22450fb24b70d81671dd07c2f89fbcd407";
   hasRunfiles = true;
   version = "0.13.2";
 };
 "greek-inputenc" = {
   stripPrefix = 0;
-  sha512.run = "432266a627b883535d306a3099c3269eace84be95adf1384264a0f4fc0c5e45947b96ece58f69e5d48f6e4518e8e789f7b3d5ae17b8a1b4b55e2f83f49393f2b";
-  sha512.doc = "b92dabada3f928b05dcecb84ea2bcd4cdb660f95a053e9e3c7ddaae9782c7c7d1ffb2200243d295a7885f26c4537db6c0ed16cfa349f4a4711a58f784fa5d190";
+  sha512.run = "685e9df2ec95a7de4a1ee1fcf27b5cb7eec1d6ed12185ea4df1d966272a5db1ba542c7f882e1999146554304a5cf85cfe4ead1af9884d0ef70097db808d0fea8";
+  sha512.doc = "6c4e1dc8dec7dc622ff15a9bf24e03c15870c3d3563acc63101f6c73c294e421d809146b2df57c602ffb7431bd823f9a7ef51cf091049c1adffffccfe5408d47";
   hasRunfiles = true;
   version = "1.6";
 };
 "greekdates" = {
   stripPrefix = 0;
-  sha512.run = "dbe0ca6784df4a8d90d1ee66a52b1a13b4e4184a815b4c91df9eafbb1fcd7cab6acfe0f09635266ba89c01c4082c588bd5af2564ae4220323089e749cee58c95";
-  sha512.doc = "040414914ac5739885d28421d54a8813dc974cf4ab5e7b972cc83dd491085c90ece8f17d9a03a1e89cb7a559314cadb83668cd9e2379c81e11b27e3e5adccd31";
-  sha512.source = "23420b6246d4f328017ec044a67ad1d2815e0b0a4cd7c29b552f9d35a6f6903fc0d4a38fdaf92da9e7e24984761bdf854cb51fb79853e897d2c68f2716a56c1f";
+  sha512.run = "721a81513a0b3ab8f2405d2f78413d05a13cea26aabc2ca0e9dba50cddb608f2fb45cc52cf63e71cca1abad9ed6eba1aa05bd5d7619a6df5988380b2e56b5481";
+  sha512.doc = "4c815ce71a13b2e67c06b533d7f0e6450f011dd3d6cd591653fe1921ad490f085aca51a509689fa36f72793c3f3decc41c45d77c41ee7cdb8150e07d7fac8351";
+  sha512.source = "9ac531d4dbcda702fc7d159d655693d519d8d3d4fcb0d98ad13d88b9fd9aac60b4bb4269c183a1bceeafec35e211c61e9c6643ff119f8b63d3f44bbcab8e7937";
   hasRunfiles = true;
   version = "1.0";
 };
 "greektex" = {
   stripPrefix = 0;
-  sha512.run = "8cb4dd29de606a66a8c9ea571e64c03b03d8fbf42a3a8d6680b6d39cd4f73dd27c60c8f91ee6d1885841b87770e48f4c40fe1fa54f812a5bf871c539d0f70912";
-  sha512.doc = "2e1dca244449a6f5da1184761fc8e8100f74d33dcfad250a6db8052f66f14272294f062bda3cbe1671d806b6df73ee8d5677dfd3f9ae904ebc167527530cc3de";
+  sha512.run = "b2b76c3ab4240c67415b6d45bfb8e77e36038650b91af5290de45ed8c8ad2343158c21bcf7e70bcb5e80783ec0db41d2888959ff36b3ee74299ee24e2d047d96";
+  sha512.doc = "3e010611f618a222ba9b53c57c1d62d5732903c3462de4f2c149914ba1d43949e16eb1a0211ac04f84c8f05244ad38fb396e04b7f32bd4fb364b51121b2aaa50";
   hasRunfiles = true;
 };
 "greektonoi" = {
   stripPrefix = 0;
-  sha512.run = "3784eb59d7574f161f1e044dd18daf2a042d1193599013d4472ddcd694e1e622ffc0ac113266a8bb9a22e033af35076ee923114ad3233bb9ecdf8026eb026a31";
-  sha512.doc = "4f955724c820cf77ba3a412a30c4ccc4fef38440c43bf8e5b626961077ca17deb32bba47538b1661b64e2c556efc7081ce721a524a7234a868b1d257e7af3fa5";
+  sha512.run = "b8031533ea50ba9ee2f2c9291f81f63858e0c2a76f3c893cf236c3ec0f0fc800f6a4d520754f1f5d1648fc5bd63ad96e979ba8e34863705efb97a151ca2ca071";
+  sha512.doc = "727930dee43368f08e83df6af725cc920bd8955db2fd7562c2694f92f21486de670225ed535ee385e0ee9e4615683b74bbb537b3e9ad9398e5cdb67a8a7e71e1";
   hasRunfiles = true;
 };
 "greenpoint" = {
   stripPrefix = 0;
-  sha512.run = "ec3db382be91cc19b7476600e8442d58d22995f31b36650da59d0f967df815a28e3e758fa6b5ee7f909ec76c22e45c9f6bec11392153bf340af50bddb79ad955";
-  sha512.doc = "db6e9c6d21f28bbdf3f6ab7b2e145fd3f528b5216c48a12d48a682aa227831dba8e8768d59fc6d6bc9ac9e40dfbda9d5c97670ceb81789a0ff2e2ddfaebdf931";
+  sha512.run = "c621456c62481a8815c6b9072fc9c1286912501f4a0280b9191dc8c2e2d377e7066f0dcd566396b61dbf81398fa586698b97a69e6937b2df31c2757dc76b675c";
+  sha512.doc = "bb66340a341f46b1df0437269624f900bc9fa22e076eba9c84d7634e18e3d96edf59f9d4951e1dcb5860385aaef78d895d2f381131df2b88bd9341ecb3cee6ba";
   hasRunfiles = true;
 };
 "gregoriotex" = {
-  sha512.run = "fef43f6931a277666f89e1996a5e5d5534d529fcc5c902140b7d0217ef215fa854041623e67c313cb74d228de040e05ba1336b7a4c31fb8e9ecac74c22fd4a88";
-  sha512.doc = "237175e9306a7bded676d4e06b0995985fde3f17969e63ba67eae7e9f05a65092d1b024bb06b61d2d169d4660144aebcff4a15a776301aeb7b096aaa5893dd76";
+  sha512.run = "512797dfa961e12e38f46c1d2d1300d8d84f628e52cca51e3d91cce08ee5be697b495fde415810e63b51a09f5588ed306c0fd9a821dc22ed1ff379af70ea1ff8";
+  sha512.doc = "4d7d71e538da4f69094d06c3ea06bc4ce7f70391f2775fbe13aea23ae297a7ccbfec88fe7412a37dfbdebcae07ab92d1c55e51ed71c4772992a3ae76af2c3e15";
   hasRunfiles = true;
-  version = "5.0.2";
+  version = "5.1.1";
 };
 "grfpaste" = {
   stripPrefix = 0;
-  sha512.run = "eb25e224b47ea8177d672f3bff989d3f63af82358e51ffea3c5f4ab57f4298b48a5fdf58ef4ac5d690bfe6306fef01844b914fb25be8937251468a483c5f29af";
-  sha512.doc = "dc5413b4a7ea9d851da30e2013ec8c0b52dd2daa2fdcdd34e6050c136ddd70932a3ce081b34aa27c1b63a8c5fcdaa46fc24d416e211a6597013c3098222458b8";
+  sha512.run = "431b0ea9df21d22ff4c8ed26a3b20e229d79e6c8873f445fab65dc748e79c1fb45a95a1c13ff05af68bb68989984642c1d024451e826f82a26e289b53ccd8df7";
+  sha512.doc = "a0bfed3ba3e24e05da8ca49be0561d4180e7cd33a61feba9e046e4271936c622682ba819e6f6a2222fb994735aafee45ce9c1cdc371acf6f23b4aac7eb870414";
   hasRunfiles = true;
   version = "0.2";
 };
 "grid" = {
   stripPrefix = 0;
-  sha512.run = "be06734d90ea62ebf3a6d2d7c44e28b70108e71622ba25f00acbdd83d7580aefdf094baa0cce16931315f2e9d33b9dc77042aeed301292c20d2696044f663dcd";
-  sha512.doc = "0440b3ef360b64bc30b35494a208da3854e2be5256fd48580b529238185c239ef8bc56a003cb1f024c47e46f93d767c0d646776be462fb5e0e835588d0e91481";
-  sha512.source = "a3b152075dbb258fca43beee3b1eaa00083b6b0bc935299d2528deb88175d63d75008508c4ee3d5fd6a430ddbc62e1477676ad2743952b71a597ad33cbcd22d6";
+  sha512.run = "004e211b0129672ca702afb61ba257ad547d61a74aa9a5bae1cccd2f5dd9aa37896dc774adace999800d510ef2a701cb01e6d841dbb11ce0293eb879fb6d1b80";
+  sha512.doc = "05ce56acbd728ad63ce4e6372bdda99bd060c18894373923cdc8084ee56b2ec4c9bd267471e5dfd139cdba3525d8c145c71554bf8eac353fbcc105d9554f6331";
+  sha512.source = "94f3ce897c7947e8bebf4bfd9e76936d0da764934048f277be389a35ac34d2f7b3d6ca38efe01a53ad755c540ab590acf9b35f72f5720b01a26e449968b6dc17";
   hasRunfiles = true;
   version = "1.0";
 };
 "grid-system" = {
   stripPrefix = 0;
-  sha512.run = "981795802645e81e285b9d03aec157cbd26e06c74cf0a6bf9e8131bbcdbf484232e5f6d57b8d996c0236d113bbe111101e2fa8b2e0a804108f0615e8ffdfdf06";
-  sha512.doc = "6b6a4f2b168d45107670b6ba03e6d38ccacbe4a297b3b2500b7e8d8dead7f152fc0c09164366fdd3dd24f5873bf14fe59533ada546394b7f4ce3ef7e16d63435";
+  sha512.run = "976f5af3d430a8cc60883c7e6d3a1f196b24cbea14ff1ad003e480b00320c2f77c21ba4a0cb6342eb597ed3ee3678df2fe06697c0936eb8005700ad576d0d93c";
+  sha512.doc = "2de86d7c39c887286cb8d421e1b7a511815f55450f5b27a1f5abbe59b79de7e6dfb09376555af39a580816cbaf5423102d866805b8af56601319e96569e2f5e9";
   hasRunfiles = true;
   version = "0.3.0";
 };
 "gridset" = {
   stripPrefix = 0;
-  sha512.run = "144ab443c5b8e3ca2fec752513b8cac3c1f91bffb05b45c8107bca75642571a3f70157eefe2e926786f1d95e3530f542818f349e4c21a717ba84a5be5e2135e5";
-  sha512.doc = "6d89269108aa4381792ae637253c5f879685f1406740317e4fc95671ce5b0e7c4362ee4fd4168520e3e4dc43642c1e31a5573f9f90f66f310f49c8904a259b62";
-  sha512.source = "4fef83a4cac4fac876bf2cd5fa9b9b5a4860b82d4f7d00431c6a367ab2df5d71de1e0819e0a0aa45353905e6296180f1d5882be3a12c4eaf0b0e76c33506e040";
+  sha512.run = "b64151aaabf19e50c5e268874f0c4325da51911d59f3e04e3a1c4f07831ebf136887315b70fb7117ced4e9665ae9aec1a8a91edbfd25454e8981dc4c664793da";
+  sha512.doc = "41de2b8ef64e58e2aa41819a98d913703566940a04dbb9f3936f97c72f9c76b5f5764bbf4c65c68ba9791fcbe8c7c79c16d1027295d66fc51c5eb3e2ef3c4126";
+  sha512.source = "8224407a2a12b7cb3cf432d65c4179e82f44d95f90784fc869187effc0fd92c06142317a99e7a78afd71f576b97bbd1a63247e93584934ef2c2cf55a4771ed24";
   hasRunfiles = true;
   version = "0.1";
 };
 "gridslides" = {
   stripPrefix = 0;
-  sha512.run = "03f58592fe0bc9ef857a67106cac15d85a66d7ba02ad09c9b993e63514f5811089270b57af3e5b5ecc5c71265c98dc0720f70e7cbf6ad92165e3fcddf905cec5";
-  sha512.doc = "8d05778689afa217d44257f49fa45dfde56ea7f619dd1ef911811d8970801e3b321b00795468a0fff8bdd6c194fc7c7acd2df07456c56dbdf335aec810452411";
+  sha512.run = "dca3a5375d3fba8711f470773522e29ce1555d5be72d06377265edec7b75d2b4d9158222286b5f5cc3638c41c39860893cada58c77f6caa75b6626d2cd42c2a3";
+  sha512.doc = "b272d57343c179c281f323077bcccd93c76f146d8b15a9d6fd470c55c551150bb66610574aeaf670091551a0df0cdc57b2b25b1dee846fb42948646c22ccdfeb";
   hasRunfiles = true;
   version = "0.1.1";
 };
 "grotesq" = {
   stripPrefix = 0;
-  sha512.run = "ef5573692df356e1bcc03abf73fabbe55f6230030a729e12d2ad48d67424b78487152e66f4466e16474564027b48119ebc956e6ceb265dff21d9e65d133244f0";
-  sha512.doc = "1f628b3285eba360d31c7263537ee8a1ebb8dca0cfe42a7a2808e982e899151d02616a2620f34a51f090260d714d64a06017e91cb530d34cfd2d8df67e4d0342";
+  sha512.run = "cf22c79ceb07272d414bb6d761e6709dc32705a0ee080ce08c75e95d4eaf8499fe2a579bc85602b4ddf04475914c7d23954f2c80398ea460be41e17cde0ebe06";
+  sha512.doc = "8078639cc0c63f629049c73db9c323ab0cdcbab8a4944a2efe90732922e6e09aae1a322542f0e7521efc39afa7ad08cdcca7eff857179d61098e2aaf6f9f3e14";
   hasRunfiles = true;
 };
 "grundgesetze" = {
   stripPrefix = 0;
-  sha512.run = "f5cf1dbb546c2afd00501090ab9892dc42fd362a4a8a7255595e8597e0e293bab89c4bff104bf9deaaecd63e1f22c2778a02e9c2271bc28ccf8eda94a0474bbc";
-  sha512.doc = "aeb48ddf123606bbde015704d276d2445845a113aec62b5e8d9ba46befbcf957e1085c6dd2984cba540fae366f2d3aadbd9bc5294467661451734d0e03906ff7";
-  sha512.source = "552e4cbc86bc8c9c95d2edcc8d07934cc75b67bdf2f65e93843d046542af4ce935b8cb6ac2b0dedf5c62470567cdf50090cd64dc79b10408fd6f47d374838dbb";
+  sha512.run = "077506c3c4ce6be1bc1a1851909f26ad4044b5186db4371f1a37cc5e635c4c7824d16831490809963fd815ccececca5eb8e382dc28111a1223bc4a2621ea88ae";
+  sha512.doc = "b681dbfb17ef5858c47c3eab38b50f611974773e8dcc68ba7ef075ecd0cbd0b56a99987f77d895a4938fa56e53f3df4ce58cb5acd4c5414d6051a260e340deed";
+  sha512.source = "a0f8eaf53a390d72f0955ba4b915559e6b41728c7176725186dc30e83f389161ba3558638d8ea8ed01e6a14d8898b743d6bc457bcb254663fc5d86f1c7b6757f";
   hasRunfiles = true;
   version = "1.02";
 };
 "gsemthesis" = {
   stripPrefix = 0;
-  sha512.run = "ca083a82c242efe9231bf8f94b3423ff12af0fb2fc270aebaa4453f199bf1901c51c206a169a4cd5d42962897c0309d72d9347c076a607d065f4c05aba227957";
-  sha512.doc = "7405a4b7fd363b9fd0dde86bd35a43251a47daea90a853c9bc6d2fc853aad2859e6b3a3b6251093fb8d751b4cdf8abac486b69242dddc07176c49325c52a35a0";
-  sha512.source = "a431c5b6ce5251e2541f2d8074991b08a75322c7172595469e9a1d1bdae0aa4e758e9e32a84ee039720c1d8e4ada47474ea09d3f54ec72f4a0a03a7abe71039e";
+  sha512.run = "3d90719beeabe2e7bec382761f83b7c34e70545947b175d1b5cf1cf5f834b5a0cf4f4951bb3def70df8138b2d62cf6a725859b22f80c08cab0db9d3badc379a3";
+  sha512.doc = "875fd5a5ebdc26ae92d5e304c61aa1f34e8049e648d29245062700c529667d2d6547e1a5407d200c781c07e19664c0428cbd4da743f8d9a610b3203462cd324c";
+  sha512.source = "ff03aba0135b33905ef4649f58ca1d92da0e5c88a537cc95233e8f85fe4380eb2680e88a9018c3ec7b79c8124a6f734ee1879937fac8e6110e99df82cc212875";
   hasRunfiles = true;
   version = "0.9.4";
 };
 "gsftopk" = {
-  sha512.run = "9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce";
-  sha512.doc = "6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b";
+  sha512.run = "d60ff1257c2f00d12173593648b3e1d7f9c9ea043ef16b5486a039083f9b74e6129d48a71efbdc8f1f0a7adf74ac59e13c971c96e6d97cc7c8cf4cc0093be61a";
+  sha512.doc = "e3ef7876b48c4ea9afa5dda8a72ecbd83cf32600eac87890e44c42e77557c05e386f96cfcd00ba31e527deabdb41c84b22b5b297d0ac08dd9121ac3b9b724efd";
   hasRunfiles = true;
   version = "1.19.2";
 };
 "gtl" = {
   stripPrefix = 0;
-  sha512.run = "82fc021b6abd99ac19baa9399f3c9ad13ff488b033b40bb3524090ecfea141ce34c8271395212d284b567cc505909a7c5c3f9ad8395c10e833d76b1c071f231a";
-  sha512.doc = "d509ec0fd805dc2ee0855791faebedd9a76a178978271a4d97c55f0af82f0b113f9a08814c1d8cd222bb51789c99bd03f850e46ed4b87498dfcbeab21d8ed188";
-  sha512.source = "e0fd7e0fe5ad1176bb6835278e7e66c898542c282664740073af4b1a81acf9a1f1e648d40f6c6a32626f2b7212e9e7979ac9837410fcf59f7a34608a4b6c6c76";
+  sha512.run = "200fe45986e113bfde48d2fc58bcb70f1037f45ee5b67a456b6b06653dd2dd191e62bc1121e0328402d946a1d19312066ac746e4da3534ae8e3d6ed225e1f90e";
+  sha512.doc = "592143b271535b0f76dca24eca2e49d82462baf78f98ea8a48e79c3868a80cfca7d98d0c49dd9e27e7a0bffec57c342c68e21cb90c4a8c6ed75521fed7d4f0ba";
+  sha512.source = "fca389f391e452d9165c3c7d12162cd0a153d6bff38a90278e3c7ccbbbcd688d6b9a0e92652cbccdbaf1189d5847c685607b4c7b76cf81b5e0be5b99ac5f46b6";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "gtrcrd" = {
   stripPrefix = 0;
-  sha512.run = "44250833bc848a84a8eb99555ba8c46dd51cac6772a78a822e44a2d1c1dfae963bc2be89c7f53b727847243cc60f66e4b8eaf1ced4b10ab2cc1b979bd8862d7b";
-  sha512.doc = "27f82c55c72a3a9ce2232a8bf053070e0bd574cec230c4b725bbb61435945c74a74d74e4ae9b6734a2bb58e9fa925927c059c0c2fde5a1ffa54c7ac81fa6512c";
+  sha512.run = "632759fc4cf26e729b5f15c40d973f9b1cad67ceb6e8d721ce1c5d6533bf8a820a7f66e3eafaa3b390ffaf10473edd05f91cc667e1bf36bac1f817fad57ad1a1";
+  sha512.doc = "c371aae1901c087f2fec07bffc5c447964fbdf062160f47aaf84a492efccbc5b2dfb1430134c25492774aff21252a668e3b39ab9d909ebb24d0b3b8e00de29e7";
   hasRunfiles = true;
   version = "1.1";
 };
 "gtrlib-largetrees" = {
   stripPrefix = 0;
-  sha512.run = "29670646353d6d90c3ecef51a9ec4c102fd493efda791fbb7f3436d0dbfb2997b259b82879de9b8f67d4914bd1af5b470c514f697a4b1a65f112b351e589a77f";
-  sha512.doc = "7d6d7fcfda77541a42336c9d4c5cae28d27848884fd8d90bec8d95ac218c3ca0e2ed24c2f87745d4a0959720a7924deef8d5d283580509315c1d4efd4de7c3de";
-  sha512.source = "45a5847a6768ce30150d0de66832070a8e0353dc42f1ec0e5a94e5284a1a315714bdbf8af012a06c15616db2ada4582ddeee2dcd29f7614a2f8248ea2b447d2d";
+  sha512.run = "51168c5f18c1bb7a3fe3b55ad01339565bb47c281caee5f638cbfa01395774a45dbd114a74021b8dc182ce2b8753bac4e19b6fab187d2bc2e2da70d102ca3e4b";
+  sha512.doc = "ffc203ea7143dbf631fddf00a09192d7553d7440611d48c9c68067c8cb5b320005a66e408ee310f68c06935e0a5b5ada08f874554c0fcaf91bba8d8ae264a034";
+  sha512.source = "4cb6d31c4338579b8e73aec9d837f7ff19ac4adfb7c3391760ae857ff2f1511a790dd4f2dafe8ff404980c8453fb45310e7f610524fc13f1baabb8b5bf6ed85e";
   hasRunfiles = true;
 };
 "gu" = {
   stripPrefix = 0;
-  sha512.run = "141e9483f220c5b77130c3b9b9e6b9671f8892cfe1881abb79e3a35bca43839120811c8573af7b907793f036a167fda51f0cac000effd60145fdf8da3b402489";
-  sha512.doc = "8f23de36f55f8a2028cacaa20a83e559c4b0cbff168338dc246356b9aca2d2ccca7d154e60a3a49e8246219e142e3991e99d1dc8aa066c641f6f770115ddd7b9";
+  sha512.run = "28941c3b24e96e01931220f2f5e7962770e373005db8c58f70b880ff0a0a2cd4da95b0a902de5aa3b9ad3ccac4086722d8d00240fec27c3d2ab45d3fe781bf91";
+  sha512.doc = "fba0d6976e5e55eb1254aa281fd301806717fd5f99e8077d5e5874041e800e2e428e99083267ab618f0bdbb8e07ac048ae79a29ca375859717c1fa83247a5eda";
   hasRunfiles = true;
 };
 "guide-to-latex" = {
   stripPrefix = 0;
-  sha512.run = "fbe2d0cfd7ec76fc1160ee52106fbcb2d8125e20e46a2a45cb129f413bc7941d0b58f0e03e59ee2e4762bd3da5b2c0281dfecd2948f92415837b09bd637a2ec6";
-  sha512.doc = "b1a4c61d68d54a6c2fb861461752e5c8348800052e3c6214849c64c1d19f858defbc68a0ef30d178f9796b950bd0f54643ee27bf66d6254e3ebcc68745d99cdd";
+  sha512.run = "415a26bb9a3811f6bcfacd5f3a801045c5ac86c7cae439ebbb184523f328d239145551520b3f45ab6d9c681417fd7e2b84634da097775deb643e594d3c0d3be0";
+  sha512.doc = "2d9d18cfbe4e961c36f8d5384908b0b802f5ad8db1ad6070319778d79fdb52e5fbfb8555e1d6172f8cbbb26a051c38d1f40eed4011aa943c106c8b5cd61104cc";
 };
 "guitar" = {
   stripPrefix = 0;
-  sha512.run = "d19086d92159377981649804400fce11ec4ea5e450bf3d39542cde5566870ff4b386cc7546c4a3e836b4e9d1e95bda275eaf6d2f432028a9bb61048f8b9e8f4b";
-  sha512.doc = "5b8c6b0b78ff289e1ba1e9c6e22b1152af8cec9bf31d4cf9ea5339c8aad45200d3966c65b6eae58836ecc4fbc879a8146cd5f2075222d9a80db53bce48c7f385";
-  sha512.source = "010d468db2ee4a186a322d5f1521179f4d271fdb5a6027e7d2e3985048eb424d890d939747ee6634d4fe24a1e103e959544b7ee44ef378cdc53f4aa8b50b8a99";
+  sha512.run = "c5a72458a7541542341d5abb6ea1f019a3027c447e94f47635ded971dfe8d27f70ae00f928650dbe1f22719db59c935a5ab47f7e2e67f5dc6c562798d6a20fcc";
+  sha512.doc = "0e948da10d5a7ad2b5be2bafc07b5d4793909350d9bb91af609e29e2742394ee69e75a6fc35ed44e78942bdda4d819dc1c6c0ad1bcb05198a21509d560cecbd4";
+  sha512.source = "e2c830562fcbdf4766819df5f02efea556d06e3251cda1be293c2c666e780ae5ea705cef33c26d3651836d2e90d4572178b7ef0ce3fedc8a32a2d0bc7cb73edc";
   hasRunfiles = true;
   version = "1.6";
 };
 "guitarchordschemes" = {
   stripPrefix = 0;
-  sha512.run = "39b1778a39f2cf686c0fc39389126002ffde4c438eedb7067599c6042d398596c2f1dd2f94c431b6ee13ca9a6b684bbfb7ff444181a415a4d76829ef1eb382a6";
-  sha512.doc = "a125c97501d2b488a1941be66eb096d0b1f845b3fbe994a9cc46ad5da75ed51d6f097815cd4df5c2036a55e25ac79c68e45a9eab8190bd391fcb4bbda2f2041d";
+  sha512.run = "488e38d6b68be45780e76053bb90f86c80ee12865d81a738796316e87c0a4b28dc4f3db295bbef276bd17bf9f085d192a32aa5ebf3321f9c27c85d4662dafe38";
+  sha512.doc = "b2e00eb51020c0e9df0d6fd1c71284dd62fa8bdf51c03d1cedc463d4aaa645258a9bb12299e8b6671992a7dbd537734ed5fbb3157612fab21af2f28d6ea29cdf";
   hasRunfiles = true;
   version = "0.7";
 };
+"guitartabs" = {
+  stripPrefix = 0;
+  sha512.run = "13c55fbafdd504a539e7f3626279bd84331c5be308c1698b5a393d7cc6945f9b15172eea3867d79a7ef3b54dbc083c08ef7820c8f6ba3987a578ccfa3136c6e7";
+  sha512.doc = "f9c2c45571ae4fa9d9525222c692e99918e96594987d195a26c1959143be2cfce02feeca754dbb033fea95063f5d0ead6d39797402c690b35534fea1640ac334";
+  hasRunfiles = true;
+};
 "guitlogo" = {
   stripPrefix = 0;
-  sha512.run = "75ceb508cf25130ba52ca982222853ddd55a5a8fac3167baaf95057db5d82098eeebf82963b2e62c503bb15d6438a291419719502c9aef6993567196367b3c36";
-  sha512.doc = "1a75c80b650d1c2f9f1d4f76e50374cfee4e79d7dde198e91dd394ab005f4eea66b72ec265e67315e8f1930d9933badc960579678370c5cc261d07a309ff5072";
-  sha512.source = "1ec6a09bb8171d8081a0871c465058d7f24d39bfd6ced9cf77430b2ce0271637b207c3367fe5328c4a3552bc38cda158e9649b6588a45b16a07e670948510dfe";
+  sha512.run = "9c8cd064bcd3d525cd2d95ca9a0ffb551abac21b9116bcc0471b94b595fe9299cbba005a5c07a54b964fa6762d0aff8b05c093c966a817bad6821af6597212bd";
+  sha512.doc = "206b46aecb911289c513d8a1c8d5e43e787e04b1be07774c68c6630acd2b135156c0fa85306c3255eaa4115b31b14f68954b077e91f533491858d044d22f11e9";
+  sha512.source = "0c18e36ca4bcb7ab908fab9d4ff60a3c1ff00bad125917b7553c43b5dc60f2c6031e9db09df34058ec9e95d55448aefaf858dfb1c7b0eb8547cb8fe831e65515";
   hasRunfiles = true;
   version = "0.9.2";
 };
 "gustlib" = {
   stripPrefix = 0;
-  sha512.run = "67a07abbe44f396c09aae2449154b63e42766a79e0b4aa246fa983700ff1d047de41b29647d62007d4a2093f5395f31b92b3ffde9c45b967234c3502e96e5494";
-  sha512.doc = "dc01268969b863e4e7e5f5821833023d61164413e01c707d8a7d4a7812661bc82526e84139e5ac3e1076c4097a29dd6325c8964a008b2eec91265e936122b818";
+  sha512.run = "028808a38b9072f81b63ef747fe4e1ad6f937fee6517f6f6bb103a299c01418ce14a3c1bcc4e7858cea20842ffd5461f50946cd458469343599b25c1aa2199aa";
+  sha512.doc = "b4aae1b3af101d428c40af14e89d59f876939af9801e8e9ed7be8bdb9cb6e0106d5346d7688bf1d52defcf1e64cbaeab1b22b4bb0b2d8dba2b14b799b6a606df";
   hasRunfiles = true;
 };
 "gustprog" = {
   stripPrefix = 0;
-  sha512.run = "e16a9f523a4f1daa57b0fe33d9bc8bd1d49c561feb05a8d03c2fe9080030d8348c4cf4887db767797f277f6f75151ae785559ee0f221209296ee9fce9c6f1b7f";
-  sha512.doc = "1a495332afe72847f49f24b166c50f30e73aa005d2801e2779c569c41570de64d5154c6b41d5210a6fac8a66704416fc2d138665f53396eebe3cc1de43576ede";
+  sha512.run = "9984254e1882486e7e8729cffdd00c861e255a4e7f7c7926dce555f904315866b618a113df2550a84fca75bf52b5ca4dac6973b4ad5dd29e29386f661582a7bb";
+  sha512.doc = "701af6dc553824c47bde4cf172ecc73ecfef56ce55a9202f7cc40ae38fe5191b2ff8ef1931d4225623f0a4f2ea744b925a9a3e8281dd3fbe918a532add7a4342";
 };
 "gzt" = {
   stripPrefix = 0;
-  sha512.run = "9c5664e69145c5aca41ae3e0448e6488988126a07af2343aee2a7e48ffa3c78e5896c1dba7e3de47888f7be4a83adcf5d0fe4609f8fabf433ffe651db9f58292";
-  sha512.doc = "4dc8b2668dc6adaad06c1fd2aa9a9369cc508ce07ebc3b06ced50316954783f440f7d432e9f6e58a9e3b1eaef1231acc069fd9f056227c0fa3997667b22c916c";
-  sha512.source = "d208f58f8bc0aedade5f243700291c1de58fd41d458d544965b86809936472d446c8e3a45c73d082d14a21a8c313be85fb131bc2e7d7e1a476c0a13d1d960407";
+  sha512.run = "b720c5f9e097cc04e7f34eb79d469dff04def91af96e6946fede29d86b1372a649a19f393719352bbf7a3b75fde946918fa05264819ac59e8915224ab0637852";
+  sha512.doc = "2379f23ebc1c9e2ada9159ac2bc06408e4c810a938a5f951ecfc795ccfa16ac71b147e708b1db2590866af34410744d92399ddf44413bdb4469ffb2b2c25ad74";
+  sha512.source = "082fbd44cc91dddea942471d2caf2f817027ecd0e3df50c3e89ff067f216142ce604d43d96d8ff171d6626f6e191e89130ec5da661eca71953909bb569ec7a41";
   hasRunfiles = true;
-  version = "0.97";
+  version = "0.98";
 };
 "h2020proposal" = {
   stripPrefix = 0;
-  sha512.run = "8191b9b9fe3175fbe119ec49ed3c007f8447ad8d1d9eddc4a6982d672263969b7bc3b1ff6f75d814103d79bd4de4d19d6f4d027b0f7c97b376860948a2615403";
-  sha512.doc = "f1ce9c06ead50afa37be7f5f0adaa15b72d1afd76489558cbf65ab57feeefef7f43e6381a2e9b8e64c0527443c783b4f8337b532f418f21895d3b28091802fe9";
+  sha512.run = "51712a270162ab52423bee272ecd0e9531ca9fc41f0dd6e524dd41df1b7db727ed5d09d4bd96e99b8190d7cdd95b2280c62ec0eb1e8ddb8471dbd6de3cd8bf02";
+  sha512.doc = "35a7d2890a6143a089a19f49fcada289e08e8feba2327439fe7f2568806266b46047ec75be93e022f2bacb12733ac100f3701562a361864c79b77586917ffe32";
   hasRunfiles = true;
   version = "1.0";
 };
 "hackthefootline" = {
   stripPrefix = 0;
-  sha512.run = "aae4c2c8597f139300cca364372b227f6c62079700a757ed2dd3f3450b0019cb323492049e4b6b467f3907a49a97067ee4164fa4c2d3eb13ffe305806fd43f29";
-  sha512.doc = "97882d28f9d0470871edc0d89e7fc13a25a3ea0cb765b2b53a50b104d04d0f30881eb961511639ca4bcdf67dc80ade25c9e45531409d23ab3137d7363b0fba24";
+  sha512.run = "b9df492b9d6663cf5a2ba47d623c50b1476418136d36b6d52c785c28f36781334989b795fbe57770d85196abdb36a071d4d0867336672676bba946d01216c6a0";
+  sha512.doc = "11075c419ed60fbad9324709bb55fa8b034bb2ee66a4b0a2e067be0ffab1c64be463c093f042b89f15dd851c4e858763cb97ce5d0522642feb6c669e468b8b2c";
   hasRunfiles = true;
 };
 "hacm" = {
   stripPrefix = 0;
-  sha512.run = "06d2763c253c5cbac5c7b2ecd61f17b5da492e125fff52f5fe93784da8cf73d2ff0a1de0f5d517787ec0ee2b06dd21861e759e6acacd25b281e89b94481b7c20";
-  sha512.doc = "8cdaf2771cbb4a8dc9e4a1e61ed74ccf989ed89785d88c4385af702e484f4d63ab88574d9fc5cd26f88b744733c9e31ba9ef548ae9a7d0e001bcb8f112066526";
+  sha512.run = "f62d665d3151429cf2d66f15c61d9afe60bd8c08c327cf8a1dcaa26ce7bea15c29b1dce75cc1133d787fb3e0fc15645be111d2dd8c1f3b0257b2ec7885a142d6";
+  sha512.doc = "71513c80428379262bb57db29d5f01035c7c6cdeec320188c49b0d1b75fd968417f0a2408ecba5ccfc22ae4253115bd033639344b7c3470b799d149f72dbca3a";
   hasRunfiles = true;
   version = "0.1";
 };
 "hagenberg-thesis" = {
   stripPrefix = 0;
-  sha512.run = "94e3bbfbd17b546b0124fa94880f6b83b9584a594a4f18ce3a9273ef81958b48c5f81d52955f5613fac355f46e34947e517257c2e8cc2fb261e1e17d70cb94b5";
-  sha512.doc = "461df7f5648b0aaba2c92f3fcd7dcbab14c1eab7eb9148a0b10669cf571f1b5b47e1cf930b72a13d2c7c1fc607517a983c02a5d3756fc1b1712b34328d693d5d";
+  sha512.run = "ba51855c194f0e5533ddaedf518da206a272d35e3f5113e7ceec74e5553960da83d8a295947683055a38fd89da878eabde270c943fedac8cc696e6b84d33f4bf";
+  sha512.doc = "b9e71a821c94a4023f9dd7888bc9ed4808370e97a7935de62470bbe84cc93f1ef106a3a9df4e4b438f403d811bb60a57252925051105b109ab5c502161410164";
   hasRunfiles = true;
 };
 "halloweenmath" = {
   stripPrefix = 0;
-  sha512.run = "d166706564bdc3f4e41f005eb0a16b76d19c08618afa85fae8c39df415072f60e66b0bce67794b6306560a33717e8841ae30098cea5d123afcf6cd35aa1f5273";
-  sha512.doc = "9b194bc6632acf803f5a327e46c009b0c0c4f46f26910bff5207428ae9f8f6ca2022e440e2aefd604c3637ab19943c5e90693b2304bbbe08344896448c96cf1f";
-  sha512.source = "9fcdf1962c433071837eda94a298786797fcb3c293fa893aa69331c86b92362420d5b71e4d72e3ee822f5c366bd40afba3cba0dcfbc75b7ae8c7e3086c2dc221";
+  sha512.run = "7117c46bfa37b9493d17e1ef86d01790f0cb33c578a82d59ae9aae5bf7973bd82e7659dd6e02939c545a0d978e728790a7c8849eba3e0106df8e7a0ec474eeea";
+  sha512.doc = "c86370f7bbc6b9b8c1bfed07cfd4672534306fa3abf44a3cfa819bedc064d2d44b8d84180451f1a537f4dfc28050df9f73a38f27f342352b0acad287b897d3a9";
+  sha512.source = "ae7a0b897b299d123b79841213ada242427d6cf311ac5447388a78b5da725a946b6b1a5ba468fcf81bd47d8c6cae6f26aa6fb3340b94b645d4066776be042bee";
   hasRunfiles = true;
   version = "0.10a";
 };
+"handin" = {
+  stripPrefix = 0;
+  sha512.run = "7bd2f9568a3e0f06475b927ca77af4505d1c2fee4a22a977e08835370d65a3e087115051248e68e26ed24741ea36caaeca52ab3c67b33d793d5f098355f2a693";
+  sha512.doc = "50afb88a7153e1c3f0cd73e46a1ba65a33081b2e293f7d0195a0c5516d7148febd39720430a224b391a260c174c52fb7494020f33d4df1d07a5952a15765d121";
+  hasRunfiles = true;
+  version = "0.1.1";
+};
 "handout" = {
   stripPrefix = 0;
-  sha512.run = "b0c2a130e62688261df3c0d32edf6719b56b08d833a2b494652720e0da3b16f3477e153c5a740405a4b722c8b0c10fe2a0fc7bc6f4a8bc596a78008309a0f2de";
-  sha512.doc = "a490e64c2081e8f43fef0c87bd7f5bddea3f4cace3c97d1ac3120f58c3da535bc9852b3d2e06a11c8c2388482ec3cb6ee14eea7ba7902011f016a92b044f900f";
+  sha512.run = "2786448e6b86e340d7f48c28a6df595a2ec689b8bd643b159fb74a9722a80dcfe7985bc00074a6e8ede8a237b71fd3183f69f51dee30c06e5f0cabd3edb0d39d";
+  sha512.doc = "5497ff31e3d76e386c0c2ee97d6c355b8e4816461c64f817cc2701e86d548350e772dd8916c7184a2c4f96cb9f9c307f7913e7eac7b5a4addfa257023d2d5624";
   hasRunfiles = true;
   version = "1.6.0";
 };
 "hands" = {
   stripPrefix = 0;
-  sha512.run = "cc73310677a0ce8e60cb6923117a7f7b75300f22e3ef2d55d396008cf795cf2c0eedcaaa4f0270c6a76ffc4cd2b55f87ad04a56b91233a8addf8a23ddac7da88";
+  sha512.run = "404e507f404e8cd600b5d38c3cbbe1271356e2c2fd224399fc2ed139b2634643a00a674984eef9e2171ee5e9eac46304905a5bbf8f8a05451f0eb57babcbd59a";
   hasRunfiles = true;
 };
 "hang" = {
   stripPrefix = 0;
-  sha512.run = "d2622b8e83650ce5dfa4db23d2a03ad25b13eeb4f8ddbecb50a87357cafdb3325ef5e24c4ea0290b16f1672d95766641a2367aa75e173efa78f7940e6de4a838";
-  sha512.doc = "acf8796c87cc5fbea9330da6c7e0c362dcfa06a6c7fe043fc78260cafb543da4c5de27758bfbf15f9ea2ba84edd01a299d808011db72aa959e917c792228a38e";
+  sha512.run = "ae6d8f091bc4e82a0199312eb2d919b2bd66613d0ad46205d02c5dec4f6f39e6c516060076a52fee75cc63f2aec07f68735bbc54e7e265856ecbf4b890197aba";
+  sha512.doc = "7f9af4702676ff5899f1508ecc31ba47fbbe1da7ea7815f8b17a1cc5db6322aa1bff07d74a485493283e0cc6eb51518ce0fdad07c769365ba6c14106bb4ef252";
   hasRunfiles = true;
   version = "2.1";
 };
 "hanging" = {
   stripPrefix = 0;
-  sha512.run = "a9fc7e02c01550bdbc5b91d07b6a8839a6c8a512bc9360dadd470354cecdce231612682db7ae8ef8fe7ca3c7e4b86e0eb233524e2a8afcf2c4bd88a2d45e7003";
-  sha512.doc = "ca214d4f9a618277c2f4e0e97a309d0d33f00181f8aac84fea9979a11f97f5e768d3af8f12dde5cc187e89427389e97fba07d07646e8886c151a4121a9bb99c7";
-  sha512.source = "6c61f63ec7e3df13a5ca4217f60cd31b1ee2bd66b27caf667e4e2e9601390968c45c56b76138cf3effd3b404cb3a3781f154660570e3e5aa636f44d6d3e908a9";
+  sha512.run = "e30fc568335371bca9bce003c7cfb20845416317208705c6e35cf0a2bfc01db01dc53807ceabdbef330d6b15ca47316950972e59b278a78ad384e694ab287335";
+  sha512.doc = "d75243fa745ffdced25acfd24f69b431f577fb6322c9f119cc7159b605432ffe98cd6026db34b6a5f6323f8b338285d1996d40d556a5380407ad5d921d942314";
+  sha512.source = "a5edffb447641950b519880e8e950b9129c0d11b9bcce78556824334b2bb4274231966e96941515f6302aabcb248281c233f80ebd586f434ccf238ef9037d1a6";
   hasRunfiles = true;
   version = "1.2b";
 };
 "hanoi" = {
   stripPrefix = 0;
-  sha512.run = "20b2faaeb391025b7f80b68b5200ef887dbecad3eb6f0293853eb58e837a7c27c742596f85c8d1a19811d7d010f8697ec096a667de8c7075c1a1b332f257e84f";
+  sha512.run = "8c1a70492755a88009688e527411c28e90c759b28a86832cbce7537191cc25fa69f6ae3ad32eef9cd971f641af371882e1e8abb408a43b6759512630a0f65476";
   hasRunfiles = true;
   version = "20120101";
 };
 "happy4th" = {
   stripPrefix = 0;
-  sha512.run = "947c6b70514613e51b9ad1dd6c1f6d989e9eec1edd2ce8ede63d7b18a449e6e49a91b5668d3726723679676054f684e847af784de9f5fcaf92f0474cb83b2499";
-  sha512.doc = "76df75edda15bfe03cf5a4f0bd75d0052b95f1ad8541e79fb2c7271a18495b37b08b33811ea74ec5f764bb1fa5b57023586f7409af1dc76d70d78e810c328479";
+  sha512.run = "803e4288ee72372834a131397401f65a822a9ae3d4240f1e1f3e768d2f67766d230c8ce957f167a98a2d4c188a3b091e0f447b94f928ec90bebf72f2f1ae93b9";
+  sha512.doc = "37511555c16f90cb0bddf62b4484cdb084362b0a54408a5c187d04b06ea42b28b5c8144325895afab6834ab45f816c8979dcf15f269fca4ab6cc1b0c9418b526";
   version = "20120102";
 };
 "har2nat" = {
   stripPrefix = 0;
-  sha512.run = "07144a9e4cf97b5cc60f22bc41aa47183e3162d94ec2b6aad6168e4d154221814a4eb9b33e7e8e68672778ee01c3c3986c8cb7c10d55c8c9d30ea5ad202d35ac";
-  sha512.doc = "e40e870032b2a6ce45c076440e161b52185758863e892f64e6e5481cc98b8ca7193122196b9f56c3879722299bad47346f936f465c6383589f490cfa889f838f";
+  sha512.run = "fb4936bdcc959ef262a5b491d4b509e2dfc394f3f24e6007678947003c702d12aea56d0f4f3432607fe0df338dac16715ee12b2d5fdabce7f4b8890406bfdb38";
+  sha512.doc = "8f5fcda18c674be9fc67386cc044e37107b12c32009a1caec48611c8e1ce6852f75026340cbddf57f0e704ac7714bb93aede2253349959d8850933dd440ab801";
   hasRunfiles = true;
   version = "1.0";
 };
 "hardwrap" = {
   stripPrefix = 0;
-  sha512.run = "2ff0f06ef8f7a0577ba6935ec93889902c13d757a79beeb8890f30269a108735f55721006a99b931af3706acade949ef2fd62ee6d090f7cdd14e1bc4118f9999";
-  sha512.doc = "921d33924aea3782cc73bf01f463c6d2cbc440b1e6b5685de8776d082c4d0c55eb5c75fe5ecb963968a5f94e88799a7430c706529583b11f22b79dd2c743ab51";
-  sha512.source = "14afd430f822c78ddc434599f7c8e2beba3a2452d33ba87132f8280558178a3c05e9b66ea9bc2712c5228e5efd6f8b44070d0b2e4746a1d928c341a4da2da6ac";
+  sha512.run = "28d381c14a4f0311ab13ee858eb51a568e67abf3e06657ce5faa30d7aa36510fcadc2fd4e5e4572252fdf5385eb64a43737efef6b805f7f443cdb5d4e221ba2b";
+  sha512.doc = "848f6f064910d9508d3b0a595002f53a88dd11c6840cd485005c34e185e8433575aee3815fb130b1783b50c3415ad2c6936b845d9a51d2285511bda5d23a5922";
+  sha512.source = "1bf651dd7d1df7fc9e82781d55aafb3deccb1dfd95da28862e3f51aaf8a45cd85bd319a26351bc704504cb612955293e83256b74cc452a5ce98338510ea5ab77";
   hasRunfiles = true;
   version = "0.2";
 };
 "harmony" = {
   stripPrefix = 0;
-  sha512.run = "be998e9012d15a7feb8253748121e207d92807c334502bcee305bbbb26cd4d9766660f78669668f8748bc77ed808933e704a0a7cae98f0cd92940729c8b5770c";
-  sha512.doc = "ec319eca8407b77ac3b83ec1db9583bb0066aecae0eb0864e1daf4e9dcc50a28ce6e29e4eaf5874f25962b739620266654b8676b5bacbc610839d04baa45c621";
+  sha512.run = "c2fbb9aef4effb5e6b60503d1f4b46325c2df8b6fd145c2a35de691babc955f1260a7cf8870027feef4edd6e31182983ab60483c3d8913f0dcf4897e3790fe53";
+  sha512.doc = "61390b600a1e3fd1eac08fc369d3802147f8437df59173d7199b37ec32864e7d19c0ade5c7fc7c78454700d2b4dd278882c7c607eb5db8b5567c1e547f2195cc";
   hasRunfiles = true;
 };
 "harnon-cv" = {
   stripPrefix = 0;
-  sha512.run = "5ab470b2286573b3f38cd1fa85e302e3e3c4d2bf055b849f94caa73956fd14cdcc054a286a7a36363b99a6a91deb7c48352aec0e498dc302cbba828b76fc37d2";
-  sha512.doc = "a8def96e2f7756f201c893dd01d4315ef24ca7c6bf8faabcca0491f23698f5b7ea4d8d2688880bbebec6dcd6066db869c2f76a656304d55012514b252d02bf23";
+  sha512.run = "c6075a8cf730cdcac250729b718ce8ad6216e352d89531476bdf59df333f09c13167a9af92aacb4d7f5fb3418aab2b397727c589a45e304e403484b5408746c2";
+  sha512.doc = "52230767ecc14ea7cb371072970f3fb72a2371887854104c577f60bd073f7cf12c88aa64888239dea204086084cdbaf8671301c7c1aeaa3f4125775b1a364d83";
   hasRunfiles = true;
   version = "1.0";
 };
 "harpoon" = {
   stripPrefix = 0;
-  sha512.run = "affd21b29b2b502d7b421e019e777fef557c51e4979bc1d6f0c3d7eeae89292b98a5690156d7b9e202cfa2a06006ab0b1f2b459988e21b1f2262f7d7138f0e44";
-  sha512.doc = "8ebff20dc38e924e47d90ad876894fa3c767062b81559ee21ecff986da2e2f66c42b35a285983107b187f390371265cdccceabe89318f40ef1c78640753204e9";
+  sha512.run = "74be44d5627f0ecb5cbdd3bb9243526201314b7bb113f3a3f9efda5d688be5fa8fc8199a8ca32d86d5b2c2ef64156393bbdf352a912f44593b06da5438d0c227";
+  sha512.doc = "998b475f0bacd97bdb4776ee0853d12c7d7b4f6f140a6fe556f8a93417a4123fac542b6f3db8e53c8dad687a38032885e09b07404b25ff0f6e1934f118a10457";
   hasRunfiles = true;
   version = "1.0";
 };
 "harvard" = {
   stripPrefix = 0;
-  sha512.run = "bedce658061f2a998fe980c58f62bc501618aad151c604fe85bb5031f8651bf099e9de33708cd23e9ab5d5503615a954bd72897568ba5ff30a84bc9e31ac03eb";
-  sha512.doc = "3752706f0c4c1c8d3eaafc15873e00dbe0ac54e4acc7a6783b7993d779052b729a3250e0f4803f8536b6b0e796f9c8dc0def369a0b90bf53b811d4b7af8ccbb9";
-  sha512.source = "b124faffd47aa5f0303bf7b8d7909be72ddbf8f58333d2e876e311b1b497ffac17c3904f5e45de862a534cd1b1250026cccfc7c8aac0155fc5eac878f4c8c3da";
+  sha512.run = "cb6484a9a28ac06e74402d4ef63576b8047675a772514b51b09b269ea9280286910af2ff03134c2f2690731e2e79f5ef48d05ba89b9a33a0183e56723fbb2ee7";
+  sha512.doc = "e309a653f60498a3108706b6d650e915c12e4bcbdff80bf107151aa8a559a3540cfbb43a4c024d19713126587c236bc58aaf6b257c7cabfd27e53512e311b018";
+  sha512.source = "6da1378b3c77bb3268dceb71bea4cf19e2c3faf9b9b6e7e317585e76d0480fdb20409bf2373e6824d388b1eb3abd205440bf8c42032023caa327e4f8658f144f";
   hasRunfiles = true;
   version = "2.0.5";
 };
 "harveyballs" = {
   stripPrefix = 0;
-  sha512.run = "f86c008ac9bf34beed121c54fdd475501d030600b30d881ac00085e728fe3434fc3eff79117a1a33165f11b92cfe585b5bfee1a2230a7837a69da1651c7890b6";
-  sha512.doc = "a44a61ee178c94e54dbc4571e79c14dcc0322e14d8cbeb198075e6fcb69bcc1f962252440a574becd36f8fc20c6e78bd81f1dc1387117e762f1edcd51fcaa550";
+  sha512.run = "43cc15f36c27f6674711ec6a3351df74424ace1258d0d5e907f0125aeb498e14ba171c426a7db22038fc3b8c352603fcd65a771d14219285d9dff2c914a6f45c";
+  sha512.doc = "4c0ce6df5eddaf81e92eb59883a6a9407d76fe2b662dedf27c7235ff9b49f175b9675cff8092119a2732d1be957254e25bc50080d3d4cd25fa58feed51b96eb4";
   hasRunfiles = true;
   version = "1.1";
 };
 "harvmac" = {
   stripPrefix = 0;
-  sha512.run = "48adfa6e5965facef5fa21a7ff3f7531242738f9e44a503a7668dd46cd5ecfb76fe9516f22c1fd96339954b4188d69d647f314e1d2db0d9dc524275c5555ce3f";
-  sha512.doc = "bfdd58d90f8050dca66cf9e1d9ad30d0f87554ede45c079f22c22eae597737f7cb6bd1eabe92a86e2bd10045b5cf00056948f57934d6c8729fe40376b9286b36";
+  sha512.run = "b3e67dc6780938f0bd7e46bc814d6776edfe5827df1137aadb6ad597be6c40a0bc1d3611b0273a04a31675b0837ac7a3de79e19b36fe07278240e9c74d7b07a9";
+  sha512.doc = "f8556792bda5f61402486671eaa6606bfd02ce80c67bde6635186869eeac9b86f0f3314c0924cfc8b983cfe2ff3e29f96d2f1b027ec387e55379be1f4850ef26";
   hasRunfiles = true;
 };
 "hatching" = {
   stripPrefix = 0;
-  sha512.run = "6475ffa9739392630673415fc5d5595b86ae3c618d1b60818d2e74b613227c0cda9c9d13cf5c6552717b77aaa20a5876e07cd77e54949c8eb12f3e60bc827986";
-  sha512.doc = "33a56375391f68ec7f6aea92be86bb59ea4f22a949f20015b15ed17daba1f52dd05a1cb112c78e13ebe6e29aa002704f59c5daf6d70670ea649834f5e239437e";
+  sha512.run = "3b4875a8973cd6aa23bb698f77c8b72c375f88327e98bf5a120ff2371f1e79de8e88193a7ae715dab8ab0f1bd2ab386ec1ca1c61d6b790fce878d0d8f2fa2dbc";
+  sha512.doc = "6cc2fdea222d7c126a7b92d8c430cdf13d7b6a2d3d990fdd683b4f896b01a19d19f95e8dc2344fb11bae67875a5bcf539f5cc1037c7b58c5fafc3d64f923f227";
   hasRunfiles = true;
   version = "0.11";
 };
 "hausarbeit-jura" = {
   stripPrefix = 0;
-  sha512.run = "4d08c513073948526182020e9594c9c773b880262d1bf0f22220a70e5660690e7352968bb9f5343c0f1e7a07d311ef85ed23f569dfa62e25dbac48dfb398a023";
-  sha512.doc = "6cde5d764bad94fcff002bc3db7b878e7c53e01ed202dd7be2e36e710daaa709f0bfee2696932ff29dca95b0ab37892f0f0d12613e5249561c84ef94b48de2bc";
-  sha512.source = "c3a49a2b6b31c17e73e92e6e82d7bde35af1be053aaec4982559c0b59e8d0ddf53025694a98707d3e967feae429d60b1c507d0ba6bd462182fe56a13a0580f6d";
+  sha512.run = "2da51cb7fe7f37b1ba25c9294ebf1a0a29cee13b7ad9b126b893883171c84664f3b49c0a831a4135bd6b51b0aa7473a253341f821450277a7bc0e23e6a8680c5";
+  sha512.doc = "abebb83226adbb9a0a58d537d1c2081f8cf5a79b6de09767b439dad2f72f9aa87daef46cd892b03e3666a7cfe03da2819d8bc66cc1cb7d638475fda944e211f4";
+  sha512.source = "f578eb4d1ebfa2b33f2d8c564cb915808972a04695089eb6a15b251eca985e8d926d1d804a9659317eaba5654589c32a796d4b3bd0dd769c33725b0ea3494189";
   hasRunfiles = true;
   version = "1.5";
 };
 "havannah" = {
   stripPrefix = 0;
-  sha512.run = "d08d314b4b5b04541853333b391b04e1ac2ec6a65fc7629980b93ab1f54e7a2e280c25ebd66bad1c087663b90af25c88e0d9189c8645c3a68451ba2664a7eaae";
-  sha512.doc = "aed7b6d717a0bb8e39d570cb128fa1144cc239304d0767ccd6370a5deba25d1d87c91a76c9a9bdaa102c586e5e1431854bfe84950cd890f4550444c8af2e4473";
-  sha512.source = "3be2e5d64d6611c24f2895cf1ef54ec023394cfc3e6bf6e4132fefcd28b5ca3e27d7653b190f13274cadb9d90fd9a37a81d69c466a95146bb1d0c5d38d172d46";
+  sha512.run = "2105ca746cbf7bb010fd62a36f76628a753e8a99ca392f725add72bd87963b87d19d6d1834d9f1e88ed7fbefd20047d3c9010932d646a1cfae34eaaff5005cf3";
+  sha512.doc = "66136477c70c15adae6627013e320f6abc269e7d41e3c3fb9b795f8e91e3202a5ae77510186cabb46383bf701aba4e00f7f0273bdabbdbfbe742e8d65ae60c04";
+  sha512.source = "0697b802a96f76df540c1f2e2d0a93bdd57614c69e00e224108ca50630ef5f8a603c11e1973f930c82b5fbec8a72deb1b931d3f2d6e77ba51ef8264fe1a8b732";
   hasRunfiles = true;
 };
 "hc" = {
   stripPrefix = 0;
-  sha512.run = "ce2285bba662b8be4b4ba8be1e4b9dfc5b9da4f6e8080ecbc766ab58774d2b2949de7f1e9290ac917cb1ca825aa17d3fe4be35cd2eee2e180591c1251913ec95";
-  sha512.doc = "cb520c39bd4bf6624886fcaa34c39b6cc0857892ef2eb7ed111a5d1fd95778fa1fffbbe9dc65509b996a98ab1c309aa55b30d048c911409c2f625585b547fe31";
-  sha512.source = "9e5fb6955ca4ac9775511fe5ff83053a71ff818d1efa619a58052d295c38f27a501e1244b7a20fa299f84ee8e58a2d6d7eadb50e7b62de760dec4bb835f41e92";
+  sha512.run = "3f5ef407d17bf86bed61cae9c8edc6852e9a4d45c0a8f80c8411fe4f0cd0b2398df89c1ca1bb70f9c7db8a5f4b60430c69b9d31f947a5d14c4580cf7e1520e58";
+  sha512.doc = "9d1fad6d29ea117c6d4a68c4b07404a25e5c2b141ec9036e15d61d4a70cec5cce481645a700bed83fa263a97c0341f54384a35e5c4ab9f6b429bcfec262c8c78";
+  sha512.source = "d2e7696e04912b6d1901a05c8a0053198496a50f34fd47904f2e28ae82722219e0bdfc397de68cfb16656edb22277106bf09c4d9e23be7307bfdae3f4c34f64d";
   hasRunfiles = true;
 };
 "he-she" = {
   stripPrefix = 0;
-  sha512.run = "6b5b915c0fe8fe98ba6190fe70363cea5adf995835c628b39612f3ea91f6c0f1c38c243bc1418d10b0a99a58012ecdbc2dd4cc0ed3e65537c4737f713e6a70ed";
-  sha512.doc = "e627ff553b40f0338d7533dee014753866fbc77f3691e13de6fc13b5847dcfe04f7a1f469356f3ab8297c971fb7db258b2da4500193621a8db0e543b19fe55cf";
+  sha512.run = "511c08089b88dcdef8b938d4db541c1cbc6a1f2f4673f6989284ea6fdd347c857d491311b1e7d3b099165c634150691d739140dbbf98dd4b909ab8a63d778db3";
+  sha512.doc = "465590b22a79087227108df5e91bf8d1d670b01f9e978f26f6d59f9dbc1a6784bbabfe89652735b12b0a20694f9399e1cb5604121a1068d4f05cd04babe0cc61";
   hasRunfiles = true;
   version = "1.3";
 };
 "hecthese" = {
   stripPrefix = 0;
-  sha512.run = "abdd365594fa5926c397dd07090ffb620564d36a57eae45e3d011623b106c96f19f65005d18095d254b08696f8e294823681201b8493f4dd30ac0e4b4113272e";
-  sha512.doc = "9f0c4346055817b88c9661dfca7d4659af17b0f12ebc72feec12d6b9ffda3802f7cdae2a635f8c572b9b2c46ec95b325736d7667cf07f03eeceb255e91c141b4";
-  sha512.source = "fb2b4f2c9a665684cf1ec614443c50a04b6f7ea8d4a0561ca50bda8f039e2c150db6ad25df2b7e96a34d4663064824fabd5c44138561e54beaa120bbb7c1a3e1";
+  sha512.run = "eb9cdc3f26769b1ad3f3d4db3834563b68ef91420b91e168e65e77aea36ed1fb46739f3b64689a59feb40b85781cac25c90955cf0843432b9a078135197f44a2";
+  sha512.doc = "42cb45a5ee7a8e077c40b943779691a5b5ebb991cc2600fde711b49fbad8d6fb0c9ad5b0c1b072d29375f3ba6b4aab5a2ebf8282b7a4f0de2902ec0526c0bce5";
+  sha512.source = "ba3b0c4c6ed2c97dab54151750631ca8a59884fad9ea147dbe600424fd4d3f8865ff841c19688693113fd25ff4216158e6c9a3c8ef464d5c722d2a105f2debfb";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "helvetic" = {
   stripPrefix = 0;
-  sha512.run = "f0ddd27ac2ad33205bbfaf7e89025e49e712e2021b149e88af817fd00e5bdc8751228e16e2fe5991af22c705fcd5a009de69b95a3f7f119256864d9b9e754bc1";
+  sha512.run = "8347129c9489f8d823acf647ed4b0b68e050065c41ebddf0fa52658bc55507afcf72b5d3d18a85a98c4410c6317ddb9c76e263fbe693dad756cb235b3bbdaa13";
   hasRunfiles = true;
 };
 "hep" = {
   stripPrefix = 0;
-  sha512.run = "c0907dcd15855a81837d3957645c8aaa1628f1fe003d7666929243b4e082916c7f2885247b9d5080d2beb01119f74450cd6c23b94e43b27ac24bab3182499cb1";
-  sha512.doc = "237135e96e7884726c5e308c918cb009b17617f8cbf3f2a91a75b6218ab958e89b551885210b3cf4b96981afb289024f2f716d8d52a4a3901f2086404c464da7";
+  sha512.run = "a044fbba300393f51e20e658568813d275ab6d94bef11476596bebb562f03f1e18e212ffd39a4627f69c01749e43cf5755fb4f5222214a3b9ca5c4ee6bb25d89";
+  sha512.doc = "303be5b10add656d2f9ac537cd5656007573512adaa34de586d910a7d3dce4819401051dfca2c3ac370bea5cdcbff00d30887ffb3b8bfcdd00f69dc0a36309d1";
   hasRunfiles = true;
   version = "1.0";
 };
 "hepnames" = {
   stripPrefix = 0;
-  sha512.run = "29447b58ae335ca1695ab5a0a4ac0b41ebb9e6f27f32dba87d38abb959ca764304adcde6318633391561c3f66b72af9981ea3a3f6cacab0d2f51a9f9ead3244a";
-  sha512.doc = "77a84c6affe2f9be38e3c448e0fe1aefd686be5adc435cd379cdfc18a8a025d7ac7efdcc1a98f528ff8232c4a9add2ba0475c077c880b7ebd07ab7b17101a370";
+  sha512.run = "fb737248b78ed8e9aa9890eebfca80db268353efd88633202bbc16f1ed5e21ebfa17493a9501af700bc172256b7feead84239c19a6be6f4d63ce080bb337c6d9";
+  sha512.doc = "9d90471d71db147826f5c1328e07897c4241b516047225bf0f78c5181dc80ac95299e94770b616394ff7fb422a0a4cdb8ea81c3e2fc9cc917242d6f684dd4290";
   hasRunfiles = true;
   version = "2.0";
 };
 "hepparticles" = {
   stripPrefix = 0;
-  sha512.run = "db528abe8d2b7acedb396b47352ea4f1a323668f1a152bb6a691246dc3a238b55e38f94bc1ae74a908e09a1e1d76694a7ae05006f4534b1584a48a3b4914ab59";
-  sha512.doc = "c204bdc909d6f12726afb54bc20c57fcc5cbb661970a57028c44603f3332a196be00efeccdebe7c8a240f623ee3c95d9542d940c58fc39bd1109cd737b90ae52";
+  sha512.run = "b231fb3bda7785f428acd38b84b23d6f49f203f2991b53d3730c47efa00671b984d30b5b62a819e9b71a48477185d16739b25a113d4005b65d6e516f9eda6564";
+  sha512.doc = "301b6b7e5d36d5ecab33c2254738a1826ed4ddb45e17a980b9ec4d0111292527a8ab100f74f2dc9dce0394d4660f157e7490e8af63f8d5820550495ea5c2c0ac";
   hasRunfiles = true;
   version = "2.0";
 };
 "hepthesis" = {
   stripPrefix = 0;
-  sha512.run = "4138132f24d279d4d4f2b5471e3603bf6e57891ad46956b7c39b8e0bc43e61543d531c334ac2bd9e86084a0fd1a38b5a9dbcdce1a1a6734ae14aa9ecce63f2c9";
-  sha512.doc = "d527aad9b2948b951c9e2b174c6f7acfba691cd971511d7807802a444265abd7490c5c5a11389d6fdaea23cb3278e6b3391fe52f82d6f2d492fc540b703a1c66";
+  sha512.run = "03a1c835c0ba739fe9c099cf5757048ec8c832f3de119710bca9096a93575251cab0786a89806ca94e3c144b7f56b8784b5ae34ffcb02f9aa7b0729f960c96c3";
+  sha512.doc = "148f902854362d602c327411331a9af33d5323b04b03b791c6b673764587a7b74a27a1ffbd20bf31ffb6689aa27c3aaa678b5fdf56501b9cfab1d89c36674166";
   hasRunfiles = true;
   version = "1.5.2";
 };
 "hepunits" = {
   stripPrefix = 0;
-  sha512.run = "82250e4c7d0596e3570c8c1a33f4eff91b081b578db52ffed1d65dadac3ec268a7e409fd8a102b879281348d0bbeff9fc4ef37629c6b4213cf21581ae2f35f59";
-  sha512.doc = "6bde627e7b60525f77404055598084546463ec66ab1c5c8d7c0ebf43ab07896aad61306303baae2bf3a86121ab12d53cf04c460d3d2a3e4d654c39f06330d040";
+  sha512.run = "3ed262c1b8f33aa4a6d183f6685b9e715c94d5c7381c08a6adca15de7667e65a84633b777a853d016d1c01d0b3ff732daa3883f2108fca17388562ff00e2fd1d";
+  sha512.doc = "25fd34b209dab893fd93d21ca5ff377f97e34b31378836cab28d6697367bdd88264bbc49893c4e9c06e2e6586d65a97b14dfb37633aaeefaecf0c2e5d7278ce6";
   hasRunfiles = true;
   version = "1.1.1";
 };
 "here" = {
   stripPrefix = 0;
-  sha512.run = "c99c3aa66ba9a315de9296708c3dcbffd694323737f435502dce339a4d0a780df8401844b6698cc9871396b253cb0d352ebccce414488217dc08be627d82218e";
-  sha512.doc = "fa9730469c0007633398f38d424596b2b10ad52a219252e82a56212523294b0b09c69f23a850ef638f1038abc28a0a67947bb92dc3332f21b920472a41855664";
+  sha512.run = "1f5b8c0df20a1c51e2796fd0ff74765c35f49611e7ef7d24502dd13e8c7ec97d964c34f2525e16392873674d6b6b71a7f7ed388eca370f28f7a31d10496f8bfd";
+  sha512.doc = "8deb441b571a1f959e7d53f2b425ec2706135b248ebbf67f96b9ffce0d9798feb47c21b0a74802886e03aa53417666575f8f23bbbfe463e78d94a73fb16da3fa";
   hasRunfiles = true;
 };
 "heuristica" = {
   stripPrefix = 0;
-  sha512.run = "01bfbe056af1198a60828c96a872f37bf1c3d14410f3a4b79c594aa1f7cea1372d26d85e50fc6a35a91c4ed9f666a492d959076de699f081c594dab1a26c1828";
-  sha512.doc = "357f40879cf5ad92369136aef0347395eb3c5dbbf1e653f79ac174848e0c779c10ff5c60e820d1d40122519b298a42bface9963ca8bba5edad5a708ba628fae6";
+  sha512.run = "1e554bed979dfc24f33f2d226bb7157152d6994f54010d18901c93131d0633f88eaa6f75ec88e12bddfc225cc1f7e1b5f23e7c06b20832177d0c6aabe083d0ab";
+  sha512.doc = "4dee89a14593ccebbe70f2bf68795a029e8df3823d0386e80c494d4e67119fa11a7b1dd136993090535a0983c972da887acce0d4898523336fa675a023c00a56";
   hasRunfiles = true;
   version = "1.09";
 };
 "hexgame" = {
   stripPrefix = 0;
-  sha512.run = "018bd268e4863fedd1746724745ffd6b4b301a71f602eda95a14d25e37a285523aecca035256f16d8fbef6dfce6a80f2b087159e3c227f6e6fe781acd89fb751";
-  sha512.doc = "c7b7e2941b98d2142e71830c822ae06929833b765d018ab80eaca09a867291acde8a7563d093b048c2e45f4b772e1c34ee6cb352dc9776aa6a5702ba5ef92201";
+  sha512.run = "6f549a4705a4330514524b88dd798b7ab46f39c8facd0a83882373e1352c8ff63ce6bce5cb05628f25cb06da3226a6c29d54f86ee6a4178ea406207869ea93cc";
+  sha512.doc = "5d93321d97204742c6c783b0b665597e9704ca88a733d55a9b55c0f1262781c99db19135c89209fb06df6d058b9d6c7af2a82f1c03493f446f90d23225bd7dd1";
   hasRunfiles = true;
   version = "1.0";
 };
 "hf-tikz" = {
   stripPrefix = 0;
-  sha512.run = "f653388ca17671d77271b28e3830a5a319d003566da26ec1a8a9266db5c708db0427fd716444cfadbbff94d94db692b5d082a107ece1e57f42e57051bf7756ca";
-  sha512.doc = "e30d13f17c07766f26462102ff14ad9ca98ceffdd0eb52cdf390ac001cd53a46ac1ae1e2645849e61f27aadcf85726df89566435b52b723030b8918a4e1a58c5";
-  sha512.source = "f5231064ab63aa8cc37634e5efe22cd6a99628ba4a5991f5d7eeafb2e649c66b2266470c93a4bdb80cac3ea071125f0ca73fb2bb16cf0217a95c8e7a00202522";
+  sha512.run = "e88264f40cbac85aefda33aa39d7dcdbb986dddc1871e8f3587ca67ed46c4ed815f1974b7d86fb4adb8ac4c5cee2c38d34b4142a5a3c4d27209510dff196d8c3";
+  sha512.doc = "ca50c52c2b6b4bad80d689f8a202646d3ad9de8ccc2b3dcdc7ffd3e76cfa51483c0de0a679fe5e12327667d66afbfb063e1a4cd72666e1165697366d46298aa8";
+  sha512.source = "f975201174caa84f26964fbf25aa04bdbfcd2a23d820fbd41ada4f5918faaab7adb73ccc94677eb053cdf2aeaaaf5f50d1baedd6847159fc2b767156b7c4b32c";
   hasRunfiles = true;
   version = "0.3a";
 };
 "hfbright" = {
   stripPrefix = 0;
-  sha512.run = "fdeae928fec9bb3aa885d97a3594bd07c21e575c041387cc0138af384bfaf4c2fb10e1da5effea892058f29d5464acc469c21e21651eacb9156ec1e2239df8eb";
-  sha512.doc = "1302332fb4e13ca4293ba016bfe2032e07f415daaadf11cab239192fedbe3bf7b6def5a51ca384f41c6fb0c8b424c330ef17b2defb37380e0e99fd1c07cadd85";
+  sha512.run = "e9a2e0f6e51f334e9a9907cb88eb8c7e816ebfe8217d185f4c632b25b5319222faa2cd604aceec48bb0d45ae0490d2069798838e9b2491883e7c409d8524b4ee";
+  sha512.doc = "6ccc4c4ad1bb46544d637bf7b05a4c9cbac8a396a4b7ee85b6253e71ed13c36e6afdb32d8736c04da30dd55011ef4d9e6dc94b488b0d825d0caf7c6873057ef5";
   hasRunfiles = true;
 };
 "hfoldsty" = {
   stripPrefix = 0;
-  sha512.run = "f267f9283ea376b53fb3c0af00105ddda0140b9dabeca0b61c7fd8b32a569a4e7ad503ebf71f795c8efb0efca383b5cd697cbe53591c8a427c3b3709b5465d6d";
-  sha512.doc = "83729ea33d03815b330772cad1585b25f6f19650eff6de92242df482cca45152f2ce90854c423113e450d56fe8f9a032ced352d0f66aea7de053b5645f15e310";
-  sha512.source = "32db735792382b21e815388491146d3966cceb603c5e4e7980dba3aff2b70dc718b208476bb6ef004a8b3f505ad93c5bf7d579b7ce251f71f84e5bfc05f2959d";
+  sha512.run = "7fd7b4b1490f38c2a978ef8a530d7613323c934cfd2ec87b6ead261d94b464e9e96806899910d364c94445d6706650ba48b888de3c57bfcc3bc6ebab9029f957";
+  sha512.doc = "cc2817ecc48c5a26fa2374212b9fec1bf64ec30dd18446a4c06aa6d7a2ac24d4a404e91090db1fc0d0359bd234ad290451da7d16ee20c65c66aafbce145a3326";
+  sha512.source = "0a190ffadea04c2dd12bef0317933c5d434ffe779055f176e054774681de20b5bc984c5e141c5e21a592a8943ec1d9c6aa4151c1bcb369f4159d6b22be49f8e0";
   hasRunfiles = true;
   version = "1.15";
 };
 "hhtensor" = {
   stripPrefix = 0;
-  sha512.run = "d58c8267176bfd39f37164f7970d54780f0092d0a945f0d22b1696f8bb2c24df55c914ba04cd82df4bbb5387e7badb346366d440bef4b33d3d3d1eeb4468eac7";
-  sha512.doc = "52985780c96a4b514c8e671c9ffb2e82049e77cb997798bb29f60badb585f78a74c13f4f3f25790007f48cd408009d1b92272201e20661796cac22183d2c0cfb";
-  sha512.source = "6510eb36e984415de1e930e78589ab8a415db0851ccbafef1ad4b1926d0d9aaf7f46b00cca1c0b51c89bcc1d512f138152856a5fcaf5b4e6f3699ba6e8df5782";
+  sha512.run = "e974e6742276db99ce21721d86f4ef258581e27d4a4893a21b52ab71e976ad7e445b4ee3c4c675a601e11f4d7795047818ae5decb28502a3633f1d21dcc6a123";
+  sha512.doc = "6f781f8b0c6701cc0c766963bff45a2de35db9f688b7647d5d2624912f0e95a82ec302c995ae417c961266375cedadbf17aa326f8807287ef0effbbf25940a7b";
+  sha512.source = "e78f57ef09994c2e4fcef640ed332bb884f2bbe8b1c31362d4d5f24f92493771ab0faa52d0573f13e52bba73651d55fe91cf5b6ce264119c826bb9cfa64f3b13";
   hasRunfiles = true;
   version = "0.61";
 };
 "histogr" = {
   stripPrefix = 0;
-  sha512.run = "b9823b2fc7ae0ce8f29428332f9b60697ada6f4228c7ad0c1dac0c1d649d72b9427da2a3c867cc655beff7987296ce975597cc7e0e2f6bf527d60b0deb476451";
-  sha512.doc = "27cc031641d76da5a664617cd8bfac001aa016097433f7b525ad32925b179a4717be6e6666d0862f8305b359aba25e0f48f8b7d14ad112137e780f0c3a564a49";
-  sha512.source = "bd7aa0c4cf62e95d89dbec7e0a805089d03cf30a02d85de811a262c7ebefcc18877ff779987f7f76e5daaaa34b039471826946e2d5a37ff25369809e66f3a809";
+  sha512.run = "575dc55866f1e22ca0e749515888f80d7abaa84b590306d9a44f9e8268c05cef1e15b8c2095969b5c1914a7307a0ea0834f24a3ae1b903df8482680b32ed655d";
+  sha512.doc = "1f1861e7948e09fe03e6d886404f227f2337f963aa938f4e23921ef806adfee80bf16f83cfe9b8dff6e92e351f18960a3abe51e10e820b2cbb8ee72a1da8ebe3";
+  sha512.source = "0dd340a9ddb5d8baa9792384a7060e1db0e3c51e70d9dc67d245ef9a316f164f0db0c1d1fb132a9e580edf492d51f9c19ebad921c48ef12840dbce22ad39ae08";
   hasRunfiles = true;
   version = "1.01";
 };
 "historische-zeitschrift" = {
   stripPrefix = 0;
-  sha512.run = "98b56ec3869856146be67db2159a1f607816a00546e2a81f30e282c0e1611805e725d5388dcae0854e6f9ca87895d13c6383007ce9fef28612ce03175ba4df50";
-  sha512.doc = "e933a55927231d31192fb0796aae79a9ef4c2cffde2c3435fd84ba2440399fff94c4f4c73534cb0a78ffd41caae04c07fdc60cf7bc16581763b30d5407996634";
+  sha512.run = "5374c1f2cda6679fdf9dfbbdbf8325097419947d69bce2cf4f1d72a8be9a5802d10d3033c9c93b0e0f2dd7ebbe604614d03f77ec51ed5660367be2c6c1928910";
+  sha512.doc = "9614eb3a642fba44e2818b0feac246aebff35693d153ec727602dba14259aae91fc5146dabb09d8c9e4f0163dccf618d68f442c2fce6d13ddcfa56dd2238b25c";
   hasRunfiles = true;
   version = "1.2";
 };
 "hitec" = {
   stripPrefix = 0;
-  sha512.run = "133dad933650ecad2c5699beb6d5467a8f13ef2564a7ee7e4777b6f1d133a9f1c5c975c3ad07c018a8bbd9acaa283d51681cd91d41e494cea02fa674c18dced0";
-  sha512.doc = "0036dd2f88e652feccfb04029e2768eb02889c28d37c3a58fe10eb458aee7ba49434b5fdb50a9ef4b4b34cb4348948a345962cf9526f5ed52e42be2958b5e044";
+  sha512.run = "ecac36e6dba021f36c159b66566ef09679396f5b66214b2d308c2c6d7e863772bf583112c023c86d653d2da72cd20e930742d2dbcfa80b2f6b84349778b34cf6";
+  sha512.doc = "a219eb647e39a3971d26d31bdbbc36a5e4a5ad0e2c703796660da5e9e3ea2d85b60a3e4d7b2e0089cb5ccf958388cdef848b1c727ef06e0c7f2c557ac6e386d7";
   hasRunfiles = true;
   version = "0.0beta";
 };
 "hithesis" = {
   stripPrefix = 0;
-  sha512.run = "87bbe5f382e12fdd097f0e749eb3d5c490bbc85003fdc91408169619b3f25b9a38b4816959a449df0d8bb40670550e81143f4da284a70e21c4581c41de885c26";
-  sha512.doc = "a3832265b5da055d049d9f6096eb0fcad37bdf47e3adc5658ca300f67667ebfac7d003869ac35a68e04b0a43006ef31e896a19ff87ffe2e6e380838edaad5d42";
-  sha512.source = "1df4abda74183e2e56ecc3f2699145285c7bee3dc14f9807eddae651159099fc8c4012503318df0407411b997ca226d74749db3f6e12abd29fd02f2f7eb30437";
+  sha512.run = "a5076d9d723ee954f7aba8ecdb2c3647eb0dc71fdfb19f71a904fa5a7e71868ad9228e4217dae439067fe1bb6aad0836c3c7a21527ca81a2a0b54936340398af";
+  sha512.doc = "ffb054310c0e2d67f0c44d55186ad9eaa19c37470320c27d084c46a55470d8b00359ecdc8af2b76975bc9bbcc8a996388572819e2bc97781e15503a0e193a4dc";
+  sha512.source = "00c877a6d680d584026a15d44b4a3296c74832b349c18134141aa518f6a13d32222893202cffb46329b3ace59b4cc73b0a9329b0a2e9cce819ca0b04a5df3941";
   hasRunfiles = true;
   version = "1.0.9";
 };
 "hletter" = {
   stripPrefix = 0;
-  sha512.run = "660d60256172213effd8343454bfb2277c16a94ae36e256dc47016a0cc136ed69f2b238f665a6a8d738909a338861412881f7947a26b06c38000f9ebfa0b6c58";
-  sha512.doc = "a2e943a70db36dfe267b6b894f6c3bdad10dc0d9361ba3456e4ad6c481511d53307c7a747ff344d868ab0c77909906fd0b40262fa1bd045560bc4dbb3641972e";
+  sha512.run = "47f01846d4d0696af56c6e16c4aa5f61d0cda81e7b38b4a30bacb2bb88ae0494844e6f41f2e6b3fd403f5d9492d965babf7007994fdb5eeeaa047ecee85c264f";
+  sha512.doc = "2638b350b3244bcb7331750269c21be0d40a2faea524e9956907812ff4cac265a35f6efb19ea935edf1c44a56fb41fed4e4481ad3a41e954d518f9cd7fe76aad";
   hasRunfiles = true;
   version = "4.2";
 };
 "hlist" = {
   stripPrefix = 0;
-  sha512.run = "a834d506975e131957536ba939f27ca71b6eb432dc376afd6a2911afe9dc8e75afc17b67e3d0e902c8e05a54c38f7858d57d9c3dc8c5ca47743a70638c8428fe";
-  sha512.doc = "4a8b6c2c86f5bf2d98333c6c5a9a3732a862db890fac46b76305667fcc31c1cc473606bc56fbf653904fab6ab656d0645ea597252f0cea0f1a7993a9ec1dc281";
+  sha512.run = "0d6fbd18d1f1cffb6f6f9fe00970bacd40a337bae6dc701c66782731224235a9e252fe78f2dedf997c6030d45dae43cf428e748974f10206cf68323a173de449";
+  sha512.doc = "73803f7c1f7d888271b99452a3ea2f4d7e3fd34e60c6b1f564aa230c63e58dc1fbfb44dbed0558ef95a924302f25dcd8c0e003ff55a76425c2957a95c4b8062f";
   hasRunfiles = true;
   version = "0.11";
 };
 "hobby" = {
   stripPrefix = 0;
-  sha512.run = "8ba7a7968798cb2958e3148b38f622fb261dd6469622b9ae13d245ddc7d6257e0cf60e98cf5e93f40a36975ce68a878c00409e46e60d288f42fc55a4ac1dd14e";
-  sha512.doc = "0885c18dce2aa47aea53a901ae83440546a7b798b2655b5f7ce7d4c9e526d72d1188d3647e7af793a800b25e4546ec901f8c6a9cb26db957fbdd916bc229352c";
-  sha512.source = "772346264759dcf62d662bde16961fa079586a9da20c7a6bb5b07af7432de5786d69018464821fefa8538688258e0522f406da33b023524ba47a182c7beb9d06";
+  sha512.run = "3746a55d5e85247837fbd49fb8861404400d718b1e58be288ec95d80139fdc54286fd297b1688c2ddce6ca9cf46a73bdab4cf12fd127e0989d64f62211d13c5e";
+  sha512.doc = "46696a2b257509758d8dec1736f12f9ce8b54358fa7dab23b56cd6c78bd34890021868aff3dddc9c28525a8af30924b7f33fd7e488e6ac90dab2e28c1b1a14e2";
+  sha512.source = "cc152d8c0669a54680b66237be894535eb7da745985050efb9fe249bcd36db5c5e99a454a0834f02bc07f57c5a3e3eeab0583e2b705bd03a2e9311b3e7787a53";
   hasRunfiles = true;
   version = "1.8";
 };
 "hobete" = {
   stripPrefix = 0;
-  sha512.run = "35c81995b070004dad1bb967cc6278499f37dfa1cfcd417254bbb45a779a7d1596b3bdad80ae909e3b625dd3a4ba7513f8fc4c427507fa8d52bf25418356120f";
-  sha512.doc = "7076ce114173c6d4aa2f39971723f54b5a446978a0a6619ffeafca14e7d653c4f47278a6cd9852a8bf984a7060a30ccff7dfc6ff673970f33f70a889ba849eac";
+  sha512.run = "29b74fd2f761b99e15329633e4c38c0bb37629d1fc158511ccbec620955dfdb1c43f92741ec700330bba78bae6cd2733dd1f76d13a77929674111f0f196b0586";
+  sha512.doc = "c6a8f41cc7b988813d02c24a9c2a8f010da9513385480f3549e4148d62c578ae35b28394656a51b2f5b337e2137034aa9d08ea5b5240c4439321f9d68dfe1e7d";
   hasRunfiles = true;
 };
 "hook-pre-commit-pkg" = {
   stripPrefix = 0;
-  sha512.run = "8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1";
-  sha512.doc = "723eaf3b4ae0019e6992dd16157e82ba1a15b5ac286b117778654b46c4f25c9ffe28a4e7b0fdcbbf8a4e3cef590824eb112e678f0b7a6e2100947d6bca704020";
+  sha512.run = "3911e1932a1667cb867fbd62b58ae832ac8aa63d46ef905195df14c924cc682fc3517d006da78eedba27b950d9e9488b3523a97109c15befa036f07baf59b853";
+  sha512.doc = "94945a10d1384577c94f4fd4ba8a2525e6ef1f95899d719396b7a6d7526bb9823e07ff32b8bd570081da0f78cf1310564bc7c97bb6fbe25c880845b1c2e60f32";
   version = "1.1.2";
 };
 "horoscop" = {
   stripPrefix = 0;
-  sha512.run = "9a7ef3661c8a59d1d25b9f91e32333bede29ed27f4dbc87ff02d4b6a680c7d8413abde05f4d886a266b961d58e15a0d468ee1de88e1818a63f91f9cca2aec7eb";
-  sha512.doc = "33a34f3a3b001ac0a03defd11423a016411f6bf744c2fae13a9efbf1f640d79eec12bc3ce4dd7b58a19e5ec183b557e2711fbd2e35c1ed1fd01918e594686b63";
-  sha512.source = "a2c9e50ee2e9b2d1f0e9a4c189017cfb15b5aa4ab6cb3de33ffe5c695dcf47d5779c11f970178cde85e412b7af258b23d9e1eca64a30b77e1eae5de04c5d6700";
+  sha512.run = "8ef1f301ee3c5d934ec79dfb4205b8076f6c6937db298200474e4b5f35ca9821b8be72404fbd09184b4691bd8a73b76ebea4414504a239b7c97592fa183b64be";
+  sha512.doc = "ec47fe5110fdf79f218ed3a45c8df8f8556099627aa04d7dddb9ef248e520526764264259b6c47ba19053b9c014327cddde2a3624160a2b4d47f72ca5a59617d";
+  sha512.source = "a955e8de3273af88e7048ee5289cc7617b0a26387989bdb580b5c82d453d381612abada18e34d677b3b03e8314115567106f413c66ef738654e80a500814722c";
   hasRunfiles = true;
   version = "0.92";
 };
 "hpsdiss" = {
   stripPrefix = 0;
-  sha512.run = "0f39db497dea0c8b6ca5e25c364e631e2a7d9fabc8cdf0ebde04ff37071b0a2459eab5bfc43bead14237839a45967aa00010b19863807fe16ae0354b6627e7f7";
-  sha512.doc = "94edce387fd9801a3cbd87604a91ed0b4d0b04e56b5cfb72309375903a42ff3d7407158d257626a957ec0d452d4c185f544cc741c5101cb7a1f83146793db727";
-  sha512.source = "9f1488cdd5f5c2a41c1e57afc1c8c18f45c6cb01b93a0443e0e6098d60a60bf1c5bdc49356ff4e077ad37a2cbe8c60c4e0d98571fb1bb49ff9beeeb543703156";
+  sha512.run = "01040a8493fa4f072dae13d14357a57f24fdd825c49090b6fd8dc0b19ff8a8b0acb79c2e16d94f8f30ba185c51116a7d5f9b88f4a2b6543c8ba3bdde98133341";
+  sha512.doc = "85a9d32ce39bf02399de4c9ec7eadd0d24879c27adbd5bcc945c780aa978144efc48b9cc21d1bdfb9d610cd129f86efd3745b026690d85d76511ec24e3f9123a";
+  sha512.source = "408ad0eae02e7e2ec6378c129610805b7886b3a157402f7d95a6885c530fc81f8f850e16d0d70a82bf5746e58c8f1d79e271ea8fd79e9f6e27885e58ae02bf7e";
   hasRunfiles = true;
   version = "1.0";
 };
 "hrefhide" = {
   stripPrefix = 0;
-  sha512.run = "ebc1987708208a1f7ae76cab58c7390b71d96b9d84d85064f141b335ad690b77404d91d322f9970f916c95499779fc8f8866f4e17d4f3642879e0c349cd4b2d5";
-  sha512.doc = "80eafd2b69028bab971d5c75b0f2774681c8382e204f66c80bee0c86d080f0dde81ea77e9e5ac15246532cdf27245b8163f635245b4ee7b8fdd2806ddd232ff7";
-  sha512.source = "d4f208d3efb19170502f4d630f49973588710ec7302db6ee78309e477d7a4eb446dbb14d92963c16efe67e96034430533f94babadbc29ff6d83c863beb3243a8";
+  sha512.run = "d91885dd641c9cfb5b9b8ef7e5806093fdeef096e28d89eca7443e14327095fcf81b076c18d97979d8f15e08df9fbae104a9fc270eec6cd2c3063412007d1b8e";
+  sha512.doc = "1774553b6bccb4bec504b5a34a3ed29f2edda4ad5a709c5ff92826d86a776dc1705bfeabb3c8089e5a7178fe0cec0bec7f45d4aa4e7d349823b889274ed565e4";
+  sha512.source = "f02eaccb774c2442166361f24f0dca925cb515c336e5aa5cfb9f202fed5d1a77e2dff4770c11ce2793245f54ca3889168625759506339767c97fea5ff0de2cde";
   hasRunfiles = true;
   version = "1.0f";
 };
 "hrlatex" = {
   stripPrefix = 0;
-  sha512.run = "e8346b098213a26d6557b61a7b2591fd2aebd0334b0e59582c4dd56a1d9b71ed98cc9cebd3dd2256274cd0534c1e9413fe40597d9a902e9438e04719bd67221d";
-  sha512.doc = "aeab5548451f3f35b6b9a41c378fb3d9d1b90edeb975e5f6e99e2a481918a51f2728047e6010a44480a63190f731269a43c43432bef6e3b2092df9ebbc72b192";
-  sha512.source = "b929755effacb4868bcd2d7c897045864fc5790be482728e708099991b818e01f7eec9d1b2b41504df3a90d2391cb8cfffc8003a056281208cce272f0920ab6a";
+  sha512.run = "ec8be06c668db498225eb27d08abf178c82518275471f1b9a458c230f47946f0e18a28513c27d2aba1bf4937ab60d6f88612972210a8a631589e294fa80c9b25";
+  sha512.doc = "d8d5bcdd588a57a20061dadf62bf74b447a211574efcbbdb288119b3a51255182047cbbe4e9db41199034d6e3733f112bc4f741f5e0dd654c68f844aacd44961";
+  sha512.source = "a3127361fdf057ec7a69a75a40111636c68eb2088330c966074b4f9af9eca6a854d83d6ee5346c582a0ef32ad99f1c2066760885912531d45b286498ea7203c5";
   hasRunfiles = true;
   version = "0.23";
 };
+"hulipsum" = {
+  stripPrefix = 0;
+  sha512.run = "550c0c9796d99aa685c448e9a64fcad28a61ed1a5c3c2a7a6de1d8b0a20e873c140c324b209877d09fb57864736563f862de7ee3c56360c5284e88b52dadbaea";
+  sha512.doc = "c68827618d24f702e438a6bf1e22f70bf1d1203e67758f767d32b0224a4231a1adc4b339c2ddca2b06e59615fcbb2f9141ef193b9b7fe0f2d56d63b82369db60";
+  sha512.source = "3e5da3c8af258bc6cac81490f5f65f6710216f476dd3f17a55ebef7bb7f79ae8209b0f269620f29d2983194baa2478a54e3851bc15a095c6f2134ee8a2151463";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "hustthesis" = {
   stripPrefix = 0;
-  sha512.run = "45f139aee006587677ae4d85df7b067d7943d45e9de5d3b315bc864a9e606d6097fb97e053e9fdddf227484287eeb6df9577819ffdc10acf58ae346161de849c";
-  sha512.doc = "432ba40204cc4293e245ae7b8017bee78316d6e147dd38ff605012adfe5c7732cd146915524178529810b276b855f931b1390b48b31f6d02339a70160b475653";
-  sha512.source = "3b100824dfb8b00e6b69b3b159dc65663ad285d332e6240708dd6c84f15be27806339782276db07148c609a806f359595ad4b8c37707da88f5ca5d47f6069702";
+  sha512.run = "6589bb1d8450db368522f141c96e7498acb098b1fc68902862fef692d49dde8333f18c374c28db9dcfe1d18bd03193ef94f84564db08e275e266e107b6c934ab";
+  sha512.doc = "f9c20575406b5284af3f7a53b9add4c5fcc9095f7d514ceeafd7793acd81704762aaa0b45f45d5d0bf5abad2e7a381e955910cb604e11266c6a057f079f411c2";
+  sha512.source = "9dd31a9b6ef2ce2b52d8503756e7e0ce8e74f7e744b043530aa992092ebb117a4c9d1b8e79dae545871514934b3f7774f14569ea3540685bdb4593b9e15ff746";
   hasRunfiles = true;
   version = "1.4";
 };
 "hvfloat" = {
   stripPrefix = 0;
-  sha512.run = "999a2fde88a534a6566e5421aee492104a4e99299c3aad9e8eb41310372814095cf3c1886284edc4fa9fef906910879ccfaac0739b21c40b1fb8f4454b4e3873";
-  sha512.doc = "73b70042aec7b9fe7f6aff85c86f0a9840f3672163243cd5622ecf07fcb0f537654a8c549b9487b308348534b27e102b4f7a609fe971b5cfdeb08a79b91357ac";
+  sha512.run = "1213690dc1b074c39ab4dc2d932966961b6788c37fe9d5b0138bfc40ee854a1c33f5c84de93ac642a2741a74d9b8b9589b1e7e573c1a289651f91bc52f003985";
+  sha512.doc = "692749091967845b981771fb52a07c5aa256ee05a8f5293278a3806526c2414a5fc8985d7911c3a72996675c7f290485941c4b836b78dc25959eb1cb8a9dab84";
   hasRunfiles = true;
   version = "1.2b";
 };
 "hvindex" = {
   stripPrefix = 0;
-  sha512.run = "eae0579c06a530eaea2ba7ace6a26c985fdeb5e223822642efbbb54320cd6f70279851a7782e700362042e59457a1bf9ef3e6646f515dafefd9a58ed56452dd7";
-  sha512.doc = "d1b6b13b777111f63b8ced9fc1e892fa76f99c2a11079fd13d152f2093f9888cd9dc0ebc0658e3f1fed2855fceecc7c4e04642c64b03c2d4bd52be8930188f72";
+  sha512.run = "229abc2d2c8ae1db136c4cae13bcd9b24906a0e594774b098c03e907960179af2e120df4498b6e91a594464bc1d6b598438def80c6f5fbcc878bb8803c2e4232";
+  sha512.doc = "24dab31ddac4edeeb1ecaa235ce88fa6384eee0b80df4aff9d0c4e1ff35c3074799a34111ca05e1176b5f18b0abbc0b85dea930b6dd72246cd709a3a9950cd48";
   hasRunfiles = true;
   version = "0.04";
 };
 "hypdvips" = {
   stripPrefix = 0;
-  sha512.run = "09e916e5cd640da389df8422af598da324a7ed5811b5bfd767cc25261b7eb53acebf2b342a89d0acf6e9b7e7c4762b7b3f876ecb2445758d4ac64b0ad19b2d37";
-  sha512.doc = "1331f87bba94d3df97974e3c5460f32baac2adc2f3023f406968888a13931707ef312386ee4b6d45c815a14544f4db1859db9f51dfaacc75789774932b41d36e";
+  sha512.run = "f0f6bf1ba27eec8c78b7e11b53ac9093c68a133dbad15fa9ca220d2f6df2bcceb3788bb1b0d19582803220d397fc7e4160a4ccd5627852180dfa64f617a2d9cb";
+  sha512.doc = "71759765aac53988dfc2033efb33c66684f5649e5c6d827c8d1447bb64544a41474d4ed75aa5c2a9d62c012c6fbc0723994f6f0bae4b0a6b31bafe3536852636";
   hasRunfiles = true;
   version = "3.02";
 };
 "hyper" = {
   stripPrefix = 0;
-  sha512.run = "2b65db9aaadb2c62651bc33ddb90bfe9ce2bbb3d642f2e1a6ab4eaf4395c7483c2360087a3bf866f79fe569c1bfd66c169b9772178f02979bc518eb3ccb5cd81";
-  sha512.doc = "2f1e04a5a3103a52d66aa8f0e68212ddbefe88f0d8fed774165829a22b2f0d0318b1477dc60101def572fd6973dae5f2e622ff2eaee4723f08969503b3f3b7dc";
-  sha512.source = "08ecd7c4343b8bc3f8eed55202b6c64e4c9e2b0cca588eb36c8eadb108a7a0d9c933f2c17638660d2af521c49df6a5ec9cc3aff80edb4b273fd4a798f8d6dc3d";
+  sha512.run = "6d0f94126fbb76fa8d6f6c44240b6d8b9971f0513bd5e9d9d14f68cc32bfe3c9c4e8adb8b092ddcc615ccc5c44be52712b72d2ff382ab0810b6f7f72d3d5f960";
+  sha512.doc = "f07c0634e9cac0053164c1689d80a6fb5868180ac48534222f5bfe661bca21ac36464b4ae369f0e1ea874d28abceba1d4f0027df6fb585a0efba054f64274484";
+  sha512.source = "40130d795fd88720fcff24137eb7cd83fde37f134b7674dd04890363fa388b0d805528511f6d99bca08d07bad9ecb47cff7478bfefe969abc0bb39d13cef219f";
   hasRunfiles = true;
   version = "4.2d";
 };
+"hyperbar" = {
+  stripPrefix = 0;
+  sha512.run = "c778d9a242267a20c0e4fc5f097cd01d907411bbacdecc96f2aa98be73b7b666b8194bd9e9ee38ebb77ae5c0277546a1d64a9749395f2b5410222bfc84d3a932";
+  sha512.doc = "63503e786691e75155e236eb35e704d426d0b2e411987a13488ee432cd33a7c2e1e6976760d5909ddd483ac03bc0058e30fb15a0617633c557b3da39c93b5846";
+  sha512.source = "a21f7d15a908ce8ac59172d53326582b26eb69d80d4ae8be3a6a469e55da0c75c3784894fb40179d15a397ea1d414857b4ab3ab304d7f1e7dd68dbf887bcdaf4";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "hypernat" = {
   stripPrefix = 0;
-  sha512.run = "c13e383a05784d705e766710b402f6c660582c5c3e4c8a6cffafc73823d6a1f0a28530b3b56027f77fcd54afa66627deb4e36ff74d3d82545e1dd89f803584f0";
-  sha512.doc = "993f83e00aaa489c4524e8e1d204b9b122ec6bc2d745357cf958209a4291586883588f73919b2093d0b178d9c9d92a36666bbe54334db2764be7340e7480475b";
+  sha512.run = "4d11cb8c93c4b545a8d0888713b88ea5bdec07f2c102ee8dbf660b5115083dbb5f2154385493b72f97b16207e349f89dd22cf4ba008fd0910b719e9812854990";
+  sha512.doc = "b64dc6fecb5b0e9acf0a53442ca2fa174743e93281d9982bd36418f2a23983372ae44fbad3de66feae19882cacdeefb8d4a62e2eaf1689dcf4a19a33369d5c58";
   hasRunfiles = true;
   version = "1.0b";
 };
 "hyperref" = {
   stripPrefix = 0;
-  sha512.run = "a07110e680986628503a91d5aa14f4310899ae8c84abca6a8da3733770be31d173d273eb3ed708e2c3d0e3a2244f01704b3a28e1f0992154e377f58e8974b3d1";
-  sha512.doc = "d2d34a10c5b8bb18512ca1569b1ac3e91c03cf51e2e82508bd294eacac39caaec72769ccedc02c6afa8cefacc8520e56c5bf75c4e85e49b78d20d21d60334548";
-  sha512.source = "0fa9f2491cf8a088e54d24112cdb7ac2b269c2e02b51dccc2343af739f93b1ccffda9dbdc0e2a091791566a8e0374a6babb43d2c3ce6df1eaaefe99a499296e5";
+  sha512.run = "57de3bac579742122b753b73b7f875244b1de5f918e4f7b604b2f263b197ae8fb0dd340aaec825cc7c1829a4b377b3489f81a769c39139ef1148eec1c4da1996";
+  sha512.doc = "8c285c95494dbb3992136e80683b51d7a2eedd164de3e5297968a8cfa4bc3c045017ee4c9202fad4f0aa307c69de5fb63de757ffe873725532048741308f90eb";
+  sha512.source = "6e7f2ee07d2d6d9056f7ff91c7399b9d87eda045107cdb73b4a5cda4c5483b386fcc4348622d27dc8f82ea70ad339d58f1a3836bbda1d18a6cc1255f84fb8fef";
   hasRunfiles = true;
   version = "6.86b";
 };
 "hyperxmp" = {
   stripPrefix = 0;
-  sha512.run = "360ad2be8700c6917de6a93e93ad4014d23aad73d07fb165b48f4e4b2911f1c482ac37a6d13812aaa656cecc6dc5886dddd6fb9e5ba0c2e9fcf01496cf979fe6";
-  sha512.doc = "15bdaa0670bb0af7d5e10695ec4ea8273513d2fd12e4bd79e5e2e78ab942c16a2522abdb43d1e5116ab447d56e968217cb6916784e72cb21f45e589cc6fd9698";
-  sha512.source = "8c60342f7ba392f969024f4c46df7b91b502c94e47a9df0567c673fc2993bbedc1a2ff5ef0a5c3d54d3f4f407600513a7dce8df8c97eca21a73493cf6a4c07f7";
+  sha512.run = "d01374b2cb08bd4966589ecdb8b184af8504db3a82f18ab5d62c377231df0ecd20793c06a5a4f6a962fb59fdf4cb8528a8a9800f9c42a424d49b3d08a710a59a";
+  sha512.doc = "e8ad27f45bb2e49d68749e673b8e6b395f4a40d79353c2e530a49180b595c38dff6535d2780049de1f93277a26d819170ce57bb17cd86c10e72baad7806b44fb";
+  sha512.source = "84294404ff755ad3fbbbe772d125a2ad17b8959faf812c9ee98e0d48efd5af41f1c9b64a7bce9188bdfde23c97e3b6cdc7aecf0b6bc87256ac082e02a237c52c";
   hasRunfiles = true;
   version = "3.4";
 };
 "hyph-utf8" = {
   stripPrefix = 0;
-  sha512.run = "6090a8e4f416f1805cacdd9daeb4c8b201473798d7efecea0d2fe792ad6f0ccbe0f76e9e905160f961bcb8ff9e8894a3a1ae9c23a9de3967e15ea6b67135354c";
-  sha512.doc = "75dc0072fed352fb5a782f7497e8f757203f9ebcfc61b23245e4a61b5f3b7736a04762b41c168552984e90acc95b92d9ad6d9520cfd46e8723087d729ce4427d";
-  sha512.source = "39b27ccb9d9625a170840db58eae673243b86c8ebb8d8937f77092559ffdc8e6cfb9e56c4caa903fe7d38ac1f100bcbf1646fb0b7add83b7dd902d89adeb8118";
+  sha512.run = "a59b631859220e7b13854733627bf015800c38a0e9ef26511b767b90b97ca997fbdfcbc04e77acfcd15095320e09dfe9bdd84d8077e2cec4956254dd8bde9f42";
+  sha512.doc = "32f0bbeae8b930e8edbe5ddc57b994f56b4c22593b7453b73158e9df12279b42a516cd380d9738de0890ef68d2650b9ee02f0f5f0f480c514ecd93a6fa92f1d2";
+  sha512.source = "502b55024b8d8774b5b2d544551c01eda834449d458832c761c7d443fe9a9b5ca39ec04a957f559ed4fc1f5e5ef13084aacf73ac0174950670063c8451d3989e";
   hasRunfiles = true;
 };
 "hyphen-afrikaans" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "2e2874b3baa13ee367d9735f715d52583555c930fda9a9604a0ae11386996980fce904f88a4af0df227f8cbba60e8baaa4c3cd1c35eb8197e93d43e9b8622eff";
+  sha512.run = "ff255de2b61e86f9a8062283568e6935ad858ea562673db01955c4d0625b9928a81d6922af7adaec3d795a87993c94be1586da24d7ec0a90f47524f5d1965899";
   hasRunfiles = true;
 };
 "hyphen-ancientgreek" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "357015430e95b9ab12786e2b4449f804b38d04fa22b0bf22d9c45a75adfc72c618f01a50a85f79460d390e317dc1c09599cd3b0ae2c82ad0b9945f6d1a10f978";
+  sha512.run = "3a396ad5338fb4607c99162f72d67c247edc839d8dfecf6c8b6c690c9ea9eb33b12e8c0633a6bd589ba2104668223b58a1872562888380d402f56e582b8ac16c";
   hasRunfiles = true;
 };
 "hyphen-arabic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "357765a032b815432d7bdeb9cf76c30f19945e030e2729c2b8c5ed3f1ecc9d24acb78647a819a780199d7af0d1a47893cc990d4f55f00b5e30712ee00e87f488";
+  sha512.run = "43659f34dffc68e8e44fe46bbcfe7110473a12ad729f661184060124f3cf777cf46f260b27edc8760555fa944381094212f89ec649fcb794c809fddce4f60993";
 };
 "hyphen-armenian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "937abff139173510ba3540762ec2a2b285e646c5c35f3b6ef419004a053bd8e98575743ad516cf9c0f6e402a93900ddf73e0a641421c82a7852656af9467ea7e";
-  sha512.source = "59e18d9e196c3f52240727d3f888ca33377fbc3fad8e973840457c60bfd32e5960761787c8a822494036db5e5750ff2a2f23d1cf378992aad317d457d118eab1";
+  sha512.run = "10a4a152371b5d36336b9b784c2541d7ede06ce9271289b05c9f8964dd4fdbd5951c77a7050cc32e3a7b17eb898a8a2e747ef9de940673e4095d06a65cdf3f2d";
+  sha512.source = "84db1e7af1f97b5a451ec1f5d63047951fc9781db28f984c4d312eb7703e87377d2f2a8da5d03fdead3fdfec95c5c3b8792007c25f82500eddf48506482b221f";
   hasRunfiles = true;
 };
 "hyphen-base" = {
   stripPrefix = 0;
-  sha512.run = "e0e4acd6017bfe171c70188c8001db963e89c8398f5c2a0ae390ce31ef17ef59f572028e9f0dfff3a289735febc549237c41fbc14624803cc6efc0be56d905fe";
+  sha512.run = "445afd44630f10078cd5e2780ebfe5c27cc384956180fba70dce7afee00686d68bc3e3d7f34f014a76c4b246877bdce6ad64f375dcd5dad786432d1b19822a1c";
   hasRunfiles = true;
 };
 "hyphen-basque" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "27a224ff5196826f0035658b2524d25dc53271810eabbb24ee94a8a0efd9fd07fc3b2017ae2c24ad0f5cf93a203e33d7dcc0eac75c520f308d098974427f03d4";
-  sha512.source = "6137b6832dd2b21b29dde60506c8f5d12f4e49cdde55f8d09db18d6c2429be841aba1e4cb377c20695ca0c6f5deaabf539809771a94c5926b14cbecb910ff84d";
+  sha512.run = "b4b3afa387cb99f76f28b2f6aa1e2043421f47f2f3bed86f8bc4dc69b9f57493b115e5d88ba071561d4611372635895380613918de143069de9d4c1c1b9816c3";
+  sha512.source = "71fe8540df3a59757b129804e51bc436e201a7f9c1a1f9deaa54c193d57df996a0d0c3865f2141bb21c8efba89c2c8346346473f85cc18bc470b4ec8171e7485";
   hasRunfiles = true;
 };
 "hyphen-belarusian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "365418d7e1aaf46045c4971c366a90117cc53b12829164429a1b7e72748f839625f513fa8f74e44a8458706f70fb38d18581434741b762bcd42e3dea7140a2bc";
+  sha512.run = "f4656953e944f3037ddc051da3ac17f8f4f0584174c2d5a5b2cf92bb9a4091b53b640739dbb72703b80c8e874c8c402698746a0afba416f94af78a60178d0447";
   hasRunfiles = true;
 };
 "hyphen-bulgarian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "aee1d8d88efcfc4097ee3bcbf318d058849422d19bd6537e2f788000927e642fd3b8d18fe203fb23adb8d2eecf9645b44e7b2db7e997b08c241d23457d5e1312";
-  sha512.doc = "b6924d3c2741412a8dcd990b22ebfe558d25912157b0b27e34fa6c73de4465bf0549ee5474dde12c5da2e5dc236e0bb1d59a286df837887b3857cecd88aac963";
+  sha512.run = "6ba8204c3643c1bc6eafb30feb3ad611dd3088e3ade5e0a82e11ea7af0ff021300155a657d3e0319ecdf8acd1ad62aba88e7ce875eabd2b8b2905eae15d30912";
+  sha512.doc = "6f02c405951790e35f5c134c8903c45c4222061d6dbfd24f4aa24bde31f0ebdcd629feeb1282d46e73216caa2a415a4efd2351320ea934dbd2d8526970fd50cf";
   hasRunfiles = true;
 };
 "hyphen-catalan" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "05dfdab38464c922144e134bdc83971174e6b14fc502f031637d5cc478f500680cedc33d12018e687a2b53d1965626fb2145d479a8e96e8718ac636b5f6522a5";
+  sha512.run = "34818db5a68d221fb6c986e45f8522103b145b14e1eaa355d24218795f2cdbd7bf0f3a0927ee50b4ed118c06d0b5fc95b0e9dd98f6c23239468295fb2b35d708";
   hasRunfiles = true;
 };
 "hyphen-chinese" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "d3b56e89539a9fc04a6444f5fc93e6d0ee530db840a7475887b9c0270ed784ed84bd65c4f4cb36358853ca368e68aa4e06ae304cd3ba88ba3af35395c7c00b37";
+  sha512.run = "e98682fc95dae669c5e4088e637b51255184c6101212f419397b45107962a551e42c567df052a8760c042ddaf804e1c3058db8f3e81bde2396490ba376a786fa";
   hasRunfiles = true;
 };
 "hyphen-churchslavonic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "be8679b8f2e366965c2cf888a2937b10e1a6651480717ddb3ad879df3470277e65ff274acc1b0645cc0927a8948ce6afd67969bfc52df4cce8c1294453ca2946";
+  sha512.run = "6905d004d498b64e6139f7eb05ff8fef87724b0cf9acb7562f09f3e8d806ad8fa5e5ddc9375acccab160e449e0aa626ac5929d37d1ca525f96c35ba1e88bad04";
   hasRunfiles = true;
 };
 "hyphen-coptic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "38d2f29c6f6539d4572c537d653145f9c23d0053ef5b19e089a3847a6adfdedc9b23abd0e191571c4ee051681feb981805ab72818c09e133dbe4bf34ce09890f";
+  sha512.run = "fb30462a32072f279e76503ec1bcf003fa686c130e378c69b9fb8066df3c1b2a7d792f0acd6f761752116d84f0c6a39f876fc5b6a57b3883808b8322148b6d88";
   hasRunfiles = true;
 };
 "hyphen-croatian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "34be9235449dfaa951c8cfbf28328fd35e873c5cc17da5c9252da43d331324d2c18458a64cbbcd576b5d1ce047aa910fef60e1ac7e1e1d5f15bcdb342362d542";
+  sha512.run = "54a146e821fb95394fc0121c554bb6030a753b34897e90a89810087f25e86f80f52a4937965f2ab278f995cdc55bb9176c6fec60181eecf6400ee69821030458";
   hasRunfiles = true;
 };
 "hyphen-czech" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "21780a8068778c0c079e182dba2495a52598a330ce9e52026aabd37bb97621aa8e683a5bcd0085769326b37ab5ec6145b63cf7c64593af3ad17130e3648a9eae";
+  sha512.run = "7bf2dec6999582cf08bad6db541baa1d0ed945c4799ed3881ecae735ec93c654621a836622bc7c81f27b7f15e8d10855f2f46d49c908a1bb47054a44e5db33d9";
   hasRunfiles = true;
 };
 "hyphen-danish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "a4ff436442db5c0f6726986ac4764c8e21e9e224b6cebc4f296de4a00b7efcadc60857ce3cc4fc5c75d6f48873de7a86af99e7df15000a5174d9355b46895c25";
+  sha512.run = "6805810ad352535e97ef264d90075fdfdbb6d53a6933e4c899e15e104c39f7e3bd1d3a31d0ad36cc60b789bfaae6efbc9716f7ba831c7ea1e9f8513ada237867";
   hasRunfiles = true;
 };
 "hyphen-dutch" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "585d3a52beac2f1bc2b402c34dd73bd1fc390edadd737d1a81258384431f4e8bf1e7eb07cda99c1da3425194a69e277f5572ae781ac3693573cbd86d55e9724f";
+  sha512.run = "53fe1a3da3b19133d41fc88e78284addff7bbc2d1c0f53493cb2fd12fc3cae4f1c0dc352b0d41696130e7b1c12baf0eb663a361aaeddef6d65bd64acf13daab6";
   hasRunfiles = true;
+  version = "1.1";
 };
 "hyphen-english" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "836f1cbb5576aa330e193e6d5027559ac2938c9300d1589aa3e2cfd0a76b73c756491597c077fe5a442c1e09a873f19f8ef4054e2ab69af577c5a0b5fc7d5f8f";
+  sha512.run = "03a1da761eb7f36b62cad768dc37f8ece0eea67ba1b4168e7ae795433766b43fcc01150abf5d91d64cd6447dc20aaad5d790ac41dba253adaecca19889b2f54a";
   hasRunfiles = true;
 };
 "hyphen-esperanto" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "a8bad99d6ce2631a0234809236a976385340cc83a37fafa9dead53b6e1f59d7b4887dac0f4308b5c37867a2fdc59af9f2e7e0f08a54216c7595302fa5615f45a";
+  sha512.run = "5e96751c22b2c1b7dfa97c2c7ff4175ddff79c8792e44c0054f9a4681503185d108e9fca66c9bcea18fb6b9de4495e651a64c7c15b445bf2cd3bc6378112310d";
   hasRunfiles = true;
 };
 "hyphen-estonian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "33e44148383cebc4f8b02f606f7a6d874fd58a949b2f6ee367223e61769abd46f10f5b01e9c6c61a99b467cdc22715f96df0113fcaad9c943a126af7270af1f4";
+  sha512.run = "8b1350158cc59c1122a09194577119ab266d1640672e1cd948f1837c51d112659f3de06024720e9f4532b6fe90fc8e1ee9b877c87924e9f3f2bd8b4f788e82c3";
   hasRunfiles = true;
 };
 "hyphen-ethiopic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "e06c0cf2758903302bae14d647b81c7e21891ea30c5e08b70a76ae2400f5f0053c4e7ce88039d0b1d0e25424924961a6a92600e1b5201491197c40d2c8b3508e";
-  sha512.source = "ae3a4f087cf120a54ae68dfd25a5dd9b2df4f2df2cb3908d74841b670119f0164bec5412ef67a80b06d79b9dc966b2096e0e9a39eac92b0b09ce82cb80d3a99a";
+  sha512.run = "86977751857c0f8055ed47a1a9855181e8b1cd4736356882737a6e70f2ef6a4a746c8db429a096f1f2c572d07c4f23ff9c2ce9844330a9103d4656f91b0e97a8";
+  sha512.source = "fa068f99c4c373f29be2690d1d42a027184fbaca8b90186222e320cf88222d8c7fa42dff558584df69b5aec4affc2652624258fca2c91d9da9ac82f4dc2f3031";
   hasRunfiles = true;
 };
 "hyphen-farsi" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "d6363605955ceeee48c8641d70fb3963dd75efa46ed936b47502dfcf385f46205595fa51fc1caeae7d3efc2327f0786d7009909c79bae5655fb61544afa2934d";
+  sha512.run = "39b6a4311f5b125a52d9b68c97e046b56aa05bc6c9b2fb9ef496a33bbe384461c6be1fb218204a19e001d995a733bd6ee4255b99b1c7d1b98d530fa4860fbd82";
 };
 "hyphen-finnish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "dcf030330637ffc6fd89215b9c7e5abaaa4dec64387cfebd3d63209cd742a022c5327ab7a45c3ccba058a21c7843fce8a6638be78534f2ddb7021775ec86c541";
+  sha512.run = "3d1c49914f1b0d03660da36964bc200d1444b330381bffeffdd2e7f1e804be879831b8078280c18eb24f50fb1e837b2ddb69bae98ca4c7987716f3af8e0582c0";
   hasRunfiles = true;
 };
 "hyphen-french" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "4c4d2cf01aec76a5c65f3b251b2c78d21a752c0bc6ec480260a1f12854a4cadf4a0a8b208093ecb2f733d07533a652c643eb17d1899afa00441b25765ef46082";
+  sha512.run = "db80ca1e33ea4b22d16cea616235818d0d9982812c5974f26f35fcfbec272de27a421894e2267e8e1d43e21f8adf281825ec1eb1c99cb64c5be565eb34d934bf";
   hasRunfiles = true;
 };
 "hyphen-friulan" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "23298fe8f4151eae6bbbdc49e8a798bd40e8073048b1a8f2e07c2ad18bf4b68a426848c6623437ca189f1b5e247825f6f2fc243c1fdc5a9cfdd3c0531519904a";
+  sha512.run = "ab7e29b8bfe37fd25e9f42eba3b8f7fc6ef5304aa67abab53eb6db8c87c9e5054112d1bbcad521eeb74ac6105ecbcc4c731631be545a6349981cb475e4cfbdca";
   hasRunfiles = true;
 };
 "hyphen-galician" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "2781c4c3a56108b15ae88969a73c9d77fe848eb1e91679de121e1d21d19dd00cc4cfbf385d53d3c4a3571f8155cc1fdc21921e8f52b206b94c2b01582fda57d2";
-  sha512.source = "2e9cf30eb8dea0993c6829b15bf6dbda17f8abc1551d55e64633be06b6615395d68df62348e276de1fee4bb4c9ae9ca92fa42de99766a9e1ba8e388a79ecce74";
+  sha512.run = "29f470034ead928f259ab8e575c6ffdd6c935d1c55cb2f1374a7947e9825ef6cadc571531dd8ab00aee130e452ed5fc4086ac11b9c05285687aeeac95aa7093b";
+  sha512.source = "873724e9ce797fd112f0cab4c652d963740602d07dcd3f108d10d6410e35ed1f5ab639e89f12e19f53d2fb9dda007069d1d9889f6dee2743a11f08411e01376d";
   hasRunfiles = true;
 };
 "hyphen-georgian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "4d3151bd873461d782085d541a945db21e79f864a7b17f9d6ae944df06ccbbe3a5351ea2bb42170aa723a18d7995a91ecf57250f7630e622c09a005df9579ce7";
+  sha512.run = "fe0630d54f6a2c0575fd6c26233546d01a2aed6d14429d3c3014805f478019d66262c749d4583745feecc9ed22f607f2cea4f03c15e64e82e7a3396153725d13";
   hasRunfiles = true;
 };
 "hyphen-german" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "712bdaf81f4e9fdeccd1ca90abd8d84eeb3d86f9cf7785a61911a1d490f7d4711646f523a6172e06ca5a1a8749d6d40ef21efc5942b854fa67c257650a5da1b4";
+  sha512.run = "1572a4e7ac8dea78ba043e69b37e2b844c39c4e9bceda0d2238961b70dbb9208a2116af7d2d1fb6fe8b13e768c3a8821a755e833fd73fca78d4b844f08441562";
   hasRunfiles = true;
 };
 "hyphen-greek" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "17b84d34fbb78bdfd1bec8fa9e2dc06287cd42391414800141dd610b4ab6811da6d439cbc3fe3b95cd839039f585ca01547542a851165cb4db5a295d1eb78e0f";
-  sha512.doc = "d7afbe35a6c64853da095b41aacbd4ebdd32d0f90ea6a6492d2965f510e9522271a6f306b5bcc16c92498ec77384f51a20df8453666cce08bce1c44fbf357efc";
+  sha512.run = "ddaa7347a23b72c957e0b3ce91d29fdfcfc0ee87fcaf2419bc19597521b9ab704f0a548efbff664d823af7677c5a6089301dc5338a368c3d535c66cb0515677c";
+  sha512.doc = "31368c64befe13624838275f28d6128af10b9a8367c71808965081e3ef6af75a01cf26df510c340b611986c7d7f2448491969fe815b6b96760fe62c9aaafa6fa";
   hasRunfiles = true;
   version = "5";
 };
@@ -14008,50 +14377,50 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "c58ffcb0f5ef0ca338ee5dba8d520fdf935f264c042112eb016ab99fe5beea68158eae11c3dbdf8148fdb771632df16a7ca762526e8ceb0282a774839463edfd";
-  sha512.doc = "a14d74bb141abab2cf92a648b7114ed766ceb00de155846ce58c6bc89c313e78ceed0b4c68f4a69b5093a5e6c54e1297c7609548fbda6be41d5e83d59bcc1de6";
+  sha512.run = "e65c9066dde564b06e5ee5bd50df73a961094e97062adf61926bbcfaea8d50730d3ac11cb322644da08e6996721b3cef0a4d4e7e33cc66486f067fd0845e438d";
+  sha512.doc = "637396b1280848154e7637358703e25d7757e09bd89bc0340063605bbcb386bce572b4a00db24167dca68904ecb56a90babaad0fb1791e169b87fddde4dc7382";
   hasRunfiles = true;
 };
 "hyphen-icelandic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "c139c3b45b219b15fe20ece2334a5d8f26a35133789a71396d057954279401fb3230e17f775c1842b52a7923e7ef2fc5a8e4592a71231083c084b1062b91002c";
+  sha512.run = "688cf906e41ca7679f4e230ba4055749e530e4951799b36ba606a09796794ae89e2a5fb580ff44cecc384107e442510feb8c2401aade3dccc2e7aa7d1ca1af42";
   hasRunfiles = true;
 };
 "hyphen-indic" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "3bf0260af99d6a29a7a5a501d2711ff9a8366fd60440899274c7676bacf49b08e5defbc87cdbe2b78c34545f47caa762b0262bb940b04182942ed1f182064927";
+  sha512.run = "2662d3a36addf0ef9bd545129116336915bee3bafe0db7a13b22badd31077a27c9a76605acde50ebd5187a718bc9e6ce93ca9b66ba30e188d726a98eb53152ae";
   hasRunfiles = true;
 };
 "hyphen-indonesian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "ba6c9c18b7e7f7f7016e3aac6d22b37b6289936365e3031d82be6ccc682360ed8a21f0a3d197d58061a81edd5a2e2eb7233708c9a65d5e307048a20bd3c9010a";
+  sha512.run = "17de599272ec2196de1d5b1457c6954eb1d282d44663c17f630dd0548d7bdcf93e4304f336fc012de2993a5915e187bb8459e97a92d1406739a7072f4dc90871";
   hasRunfiles = true;
 };
 "hyphen-interlingua" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "dce4777d1612ebf6ae9ebff6d573ba7cefa77e5563a40a1fe8cdbb9dfe1eb8a0d54fee70d49de47acba5a5b467feb63ea82d64f8350030fb4c3f7a1a344d234d";
+  sha512.run = "9f64182043a2e1aba60d35702e6ef038d77d3a9eef7c543571f2fea24aee5124e09feb99564af5a3d9f91f552172fd99d743fd3b88beb3810949d8bc5ce102a9";
   hasRunfiles = true;
 };
 "hyphen-irish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "432361d593ba1e4a3197a68245545bea8dd37ddc307a6546811f0c381499c3648e19a3c7b36b7bdb2ad82bb27b6b37388b39fc05a71e1ec3df0ecb803f367a4d";
+  sha512.run = "9425e061e24418abcf612c9a34a73dcb234380c9f5a29aa9fdefe691c8db63cf7125de8deb378c4a9908143fc3ffd7987fc04410b295a3623e1963b48cf4c29d";
   hasRunfiles = true;
 };
 "hyphen-italian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "5b8b51faf88b14af90964753ef963c8e63b5b196f6c6d7960929ba78f2a131068dc35056f7ad3ed864a219f15450e7d33ed1596e678b8f7b0c1e206372f08900";
+  sha512.run = "9deb698f3fc899e7c211ada8a1cc0b015e7b1df6f420e7f88df38af8a25cece4a3702ccbf67d442762f28862bfbdd4f89fdf755e07d185fa9aa6f88cbc5eafdd";
   hasRunfiles = true;
   version = "4.8g";
 };
@@ -14059,14 +14428,14 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "b98b82184f21ee0105633313d7a727c6fe90b319dffbe232f62eb4a60fdb8a0514d6c2f407180d3597688ce928abce7a19eea6f2eab3931da174bcab5e004d90";
+  sha512.run = "a2d52e2c3ff0357107d2032a7046012fc54f4cf64f68eabd23a89559d906c2cf24a8ff56a4397473917445180387671af286b23a3e63267422f557afbcdc8b8f";
   hasRunfiles = true;
 };
 "hyphen-latin" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "e7087b2821458752b675aba4e6ee4a146a91162fa8d0ecdb86d46c49ffd441d2f9c1dff0ce3bd8fca74af9c85cb81cb129896dd9afcac55148632975ed24519b";
+  sha512.run = "03e669648b65f3e4a62717f65b90d8e8bcbd401c5fa58e50f11acd1a85084206717c6a2954c5d551c45edd1603ba111886854d201bd43737a192a071ea958ed9";
   hasRunfiles = true;
   version = "3.1";
 };
@@ -14074,49 +14443,49 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "3470edd656d22cc71c7b89d0f19f191563928eb8ab743d70e1b8c1f6e3863c26ab3b469a22f7cbb27fe34699e9954c4c633e569a402f6dab03734b6ced16d785";
+  sha512.run = "5823ddfd8aef9a107630545e2ff12d3835e9d985751bf1821e34d76f1add3f289f8104ac8c0b40c8febebef7826e0edb4e37500f2133b270cc1817640651102e";
   hasRunfiles = true;
 };
 "hyphen-lithuanian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "fdf21dafe50f3745d5dc23e370111e83851131881d057df54f459f1c01def15b066459cc58bbaaceb6abca67c536b43af4033c72e0dadd42d0a98142e2be7192";
+  sha512.run = "ce9d629ef1e25b9eb07fb2841cc97cc0d417d0c2ca4e777b58be0c7b4292deb9b9228478f56beb326c128b60246165abe71e89bafe24530e8bd9c7672e9f61c7";
   hasRunfiles = true;
 };
 "hyphen-mongolian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "90765de59dba6ec9ebe5d68fe08dc887b296880f90b4bf61ad435fce433cdb61ed65f80f51d4009b8c5e7c777a05b53b4134020cc5082ad1117924e39b298c36";
+  sha512.run = "bff336af68a89fcfb02d37f4728a478776b80dd7b1fec98203b53f8c34679c8dc0ea018ecf3e804e29c5ef9cee87aa1aac29f3f90823bc369d8551968420ff0a";
   hasRunfiles = true;
 };
 "hyphen-norwegian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "575ef99eb76a3ccf30477c35d149ffc36ee9ba3d60c3abc31469e03488e52db568956112a04b964fbe043df3f7b7b7c31692ffee948c34ae5ee2a9882058f410";
+  sha512.run = "04d4b2d8347f82dddca9d745394ffccb1236ac3f477d5a896fba778fd89d29dcf114cfe614b3719317d622c28f69dd6d118d3a4874d226e1ba66c3733293589b";
   hasRunfiles = true;
 };
 "hyphen-occitan" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "8738497cad865898e043a54214b86627a123aea35d5c7ca701bd947966b8b6899cbf66f801f48c1475e3d43ead61e38af082dec101fa1b7556810c778e7bf174";
+  sha512.run = "0c22cd432c23d064165fe076a4cf83c41b9aa5bf2715c6232926b479c148cdeceed13ef6d64cef1c928e699e15d8c6e59ecab05000ab6a99047927dcdb94a6bf";
   hasRunfiles = true;
 };
 "hyphen-piedmontese" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "8f5d9a0f6408ff62160f65fe9716f6159b8f2474a106c081c973ad23d4003d56936b9d132c84e1c5e070e79aba6030b7d9c1386b15290fefa5a09e8c50a6b413";
+  sha512.run = "81159a91010578a02a2a04d3682450ea0e208327a9ba845ecbdb6317585751c9569a46ccdc7d5df8b7292c981632dcf3f3f334b0f1bdf2e413860a8065436e3c";
   hasRunfiles = true;
 };
 "hyphen-polish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "927afd1d830c902e8e9931626b59893b3e384aa29a2635ebcbc5a5c8a07e1194ef5b76fdde7ec1cd209dffb676d5302f4e84fae27c9d3abbeb23498a1236d494";
+  sha512.run = "491d9be07f649424909e751ae75d655bf448754cc45730d3d8032fedc9446815970b30c7591281b8af90f75e77e3dc87651dd8625301a868b37328db03cdcd5b";
   hasRunfiles = true;
   version = "3.0a";
 };
@@ -14124,21 +14493,21 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "fdcd0c319c9483df3f9fbbdf91c809f153c7221df6d79f257cb2e6412495b7b3e306e83573dc3aad0aec3acb44b390b5f85dc07cc59c8f0a7852aaecb1a27512";
+  sha512.run = "dac2c7eded6d88908268452dca7c6bf8bfeaf7d8a7818cbf3d9aabd5f062e3f2bf0cdd5f9ea56d3f5b3319bf3b556cc04685d8d0c6535860eae9c87a4b1d68ed";
   hasRunfiles = true;
 };
 "hyphen-romanian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "be833ae75b826202f56413bd57b4ea0b4172b2cb7150af46c929daedd54289181e7b01c6161a2b49f2475910bc76dc6968e986cbdfc2c1409be22dceb0e3c3b5";
+  sha512.run = "8954b12a098d04d23f92fd9e10e0100e97d4dc4444b1861db5d1975b00c9d3d2b7c7a4db4afc56528f4acea18b9ecc67c4cc0018e90a794edfe562e951317f20";
   hasRunfiles = true;
 };
 "hyphen-romansh" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "f44bdc6ad6319b9b92d47c8225eb295a97dff5b0e2815c071b606df726dba311adabfe820a51f42539db61df164688b127e8c85ecb39f995682b7cd3bd25954b";
+  sha512.run = "2c029f0f0cbff95fec9948c6a6df325f682535b99eb1e8a36188573b406258bc960d558be1da9ce3ee8f10317b73afc46a2f0624ec6d864b8fc94547be99bd3b";
   hasRunfiles = true;
 };
 "hyphen-russian" = {
@@ -14146,22 +14515,22 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
   deps."ruhyphen" = tl."ruhyphen";
-  sha512.run = "005595051b7c9b55e16c086e1ae9f8624c6b3bda36766dfe228d7d1ff7847c2298d128693d277c11f6a4f5216fe42004242c196a4ce56f52948f2456854ef0e3";
+  sha512.run = "e5e805cfd75bdf601adb51b96a2ed90df3c32f8bdc3f0c4e0b37e68d68064230b9715d5c6f3b3e8e26cfa64842ee09bee4be17b8f4b1fc6ec2e44e64d6877957";
   hasRunfiles = true;
 };
 "hyphen-sanskrit" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "8c2f0810e76280c1dc4218aa04595bd30c24190a0cb3a805a61305aa3ed2683ce1933d1e61ab941eeff8af5a9f8c1cc8d9c4bd28498721ad2be40437242642e3";
-  sha512.doc = "f14a552657cba4a061314e36e4f070ef5a16b0f25abb2bae92a0ef0993ea250a0165c18ff66cfa3a0b2471e11e47b40cfaccef1457312cb4c1078498ae227013";
+  sha512.run = "0685eecdd296c96461fb6f8f162e3748d500c7e60c004839b8717ff1c10a7737dd3221c1e5515e8f9433c34e9e7af622efd13b49efe7e3e233a79a22d858d9a5";
+  sha512.doc = "83deb7e79b5b3a24dec150e434f40ad8fcaaecca873ec5d200bcc5ebf66315fbc289fdd8a7a3d04dd2a6697199d54eec8eb08fa5a4e5f7667e88909224349952";
   hasRunfiles = true;
 };
 "hyphen-serbian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "f39a9a1bb6d922d59b379db0b587756a8fb4107b37dc00257594ee63dbf2b66bd86bd7af5ef2a54d3d19770525da176f1705749d0444479fa8d34def6430fd60";
+  sha512.run = "af8859193d7639333bcc9569d62b4dc5f89b2b35bf4c2b427bb5ee2c7def43cab807009e2d4d171f041b95a12f5f1e93a7a66253a3476d6cb1b213e802c9a95f";
   hasRunfiles = true;
   version = "1.0a";
 };
@@ -14169,23 +14538,23 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "fdf0d487f05c56f4978ffd7a36be32771ac76651f9629da780a22991d740ab5341e33ff8ed7366a6c2dcf773b98912b6f0d382979d6e78fc1885783ca7749537";
+  sha512.run = "af4db6af1e341901f700e0be559158d9945f8b040b31928068a624da0825be656917c229801796bfeb83961bfbfc1543f6e5aaade1b98c91a0ccaaa32e9f5859";
   hasRunfiles = true;
 };
 "hyphen-slovenian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "1f621150c2697c2ee3e6b92f2a54e27e12aca55ef6c42425cdadba69750c7801cbb00cc8c0f3323452f28d476ea4866ee45f253a5a207c3aa27ef2a079b731dc";
+  sha512.run = "653e8fb086de01b11c50aa8b442f3ab92beca239b5b12a2251bee2ba57de0921b47aa7357b3df306538141a4843cb15de604c4246a459856cb474b30168a0dff";
   hasRunfiles = true;
 };
 "hyphen-spanish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "d96b778fd00726b98a09d6c4f5913d76033b60d7a385e7028ce5206224f1e74836f5c8afd26a6b266f37fadbd09062ea8facc8a4096552b5947a1516dfef29f0";
-  sha512.doc = "e4bdcab6af51b4c2271738c92d0ecfd3cbe38d1d3ca14b1d63b24fd5ef1aa81916833a11d465dc8f6c79e8a29be667f39de6a761ea50b6e75cfafaa6449801f7";
-  sha512.source = "4cb8fa2af4eb9c8d28d35cdd3367402bfc4a38e67e9efd04829a978294e146fb3dbbcb457da684d3d1346e83424701d418637f02b4cba90c69b37889ff085df0";
+  sha512.run = "1ddde4a5b555957f2ac7c7069485cecacf3211704316a913d0744ca7d5b5344e07af861d112bff2951e75f7579b066ace02ff1871f67918c9808a3e7fe61ffa1";
+  sha512.doc = "3d1cdb1a5d7978f8c89cca45470d4049224678d05bd7787d55af81d4f1ac3ea5c44f1016369f18b6495a9df417d37664d7df69c42e1ae178b9cf661eff8801b7";
+  sha512.source = "61d302c4a3278d95da6ae51f4e4d115eded4bb758b13cd104e7fd4d379d801ba2ba1eb947d6446e76c667cac2c1bd99302f0edb6b4e51978a09c82ae9d4706dd";
   hasRunfiles = true;
   version = "4.5";
 };
@@ -14193,30 +14562,30 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "eea8a170b121498be9b36c12196f8b432b4153161d2eb542a76cc5c60658f011fd5a8d6b45fb9c78a5aaef532b7a4e29a60dd73369906b8f3520b54eb4120747";
+  sha512.run = "aaa792710ceba8e1e0e73df8a2981139d5281bd0b422ce7ed82823b280c1576ef55509680d05cccc9c1e1b9e775fbe861337266f4ebfd3de60f157892b5f890b";
   hasRunfiles = true;
 };
 "hyphen-thai" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "ff2dc6c1a648e8ee5e9e3ccee2b6456df578026786b0f0d7ea96b84515b10b67696adbfef6367566c2405d408758c153acf1a4f52868206cac674b80c61b7245";
+  sha512.run = "6fc174e20936c81e9a8aa37828cdbe3f012e6ac63b55da901a7ae18f2015bc5f42a13f2d701342714dffbc56054911c45675badf35a9a33559d3116787d70d54";
   hasRunfiles = true;
 };
 "hyphen-turkish" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "f4cc3d6dc466f8ad00964b79f5e6f7cca1254acbf0c98fc0764fe480efbea99cc00d31f45bcb6d28b697483e0b44971c9f319b73c9bf483f87f8b114bb2098d5";
-  sha512.source = "cd6a82458e2eebb0b91104e8c0730ea5faa3ce2cb716e21e4d14f22e88e16e0a7de470bffb04da04cd057288ccd6bf9e6f7a9468b54baed6abf8f5a314a19114";
+  sha512.run = "aa0be6510ef3f34cefa767cae455e2098e7f342a4f86f641559a74fcb1ef34f56b80d6ea84a153791cf44e9d1c9b067f9128810a0c6d32f4df3605f4c5189bea";
+  sha512.source = "af17151780e7ee2fe7d3b3cc5e1bf05d2e9ce22e1cddc81b224d1f6db3483c34a6aeca33604fd9957977ced3d2997bffc1d8c2e9399ba657a5cefd9844a23124";
   hasRunfiles = true;
 };
 "hyphen-turkmen" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "4440fe94f82ed6816828eb408135245372789c73220c5e9f1ac2e52c34feeea24981da8619ab2496bf9a273c02022a126546160b723b92de422cfc715301a707";
-  sha512.source = "cef89548b178852a39c40401c0663a412b5705e2669d9b02e78fd1e9878eea93e71117188591f7d43a1d040fe94d4dd31f22f913c324353a593832b7c665c148";
+  sha512.run = "e64a952ddd586762f322ec03611b6129aeaf8042500c47edecef4798e64031d5812fc140c83d3ee51114c6874629608183112a9c8b669b3ddf5570aee7d6cb21";
+  sha512.source = "d790319232276b3994f4eba8ab460ced3ad2c5995791e5ba0c803e6bfc9e5934f5efac7b3089a3e9a994dd1d51d2fea3812f5a4b6802a677cc1a515b1de43a4e";
   hasRunfiles = true;
 };
 "hyphen-ukrainian" = {
@@ -14224,587 +14593,609 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
   deps."ukrhyph" = tl."ukrhyph";
-  sha512.run = "e74efbb2a80a124ac9a8ba83721823e2645cdbb798c63ec0b5d159ff6c222f26a388fdca318ec88dd3d8f5f6538cb0945cbc3824c490ba78c832cc3f2c389b7e";
+  sha512.run = "bddd99e19b7f900db737dfb39100642b1749647c287d7947811144e5fbbbded5c474894770d2ddda5fc930a0a46a2acbfdafd6554c42301b90f674b5ad4a2a1f";
   hasRunfiles = true;
 };
 "hyphen-uppersorbian" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "499fb8027eeec96d52efa90e13c010219c9d2a26b9f6abf7dd71f0df81f1a4443597beb5413f5c8cf99e3a549121b4c03155250c344f7e1a23370e0e4f587dad";
+  sha512.run = "2b62f8380983f340613ea5f762815cc2395e80eaa28a08c48121124f2af4ba75158ff8dd2f47046e90fdf51b6df7609ee78a5ef47a59e1309e277e1eccbe3d32";
   hasRunfiles = true;
 };
 "hyphen-welsh" = {
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "bc4d413f1a6bd74faf785e613f254fa3408a7f21faeee4c33816ace82772b094829ca1746e50d3ce73b6dc99221203fcc83e1b61e66681f34a14610f6c1cac5b";
+  sha512.run = "6e513b5c900a9aa7ae6aa750e18d57d152137a3648b6064293a970af27543908b32ea578a5a314be8809bcd2c0ce18c753c12308c2b74e5ee5e2c1331b40b9eb";
   hasRunfiles = true;
 };
 "hyphenat" = {
   stripPrefix = 0;
-  sha512.run = "b36f7500e50ce94ea5e5be8513c707fcbe5a23cb5851de3f112dd6c23521fcf918c957ba8b2c01c6850225215e37feeb46f0a8ae90b53e03ac534a0fdaf45804";
-  sha512.doc = "c6a9d7c513c51426147afd415315c6f36ebda4c4d59eb91bea3a67b3cf3c82e842d3bb6a7d52381489618c4e26115be29666618e160fb8df778ab6d4d57272ee";
-  sha512.source = "8e48466d50c880a2869ce769c72f822d79b39792076a2260dfa0d7d0758be1452494aa553ed6dd44850105b1da90fbf89fed0f842ff661fbda61c750fdf27284";
+  sha512.run = "e4579c8c18fc6e42093da75fa532a318c0a3367d566817c545c9c980c661f7a3ea84c730ebc8ea91a9373755d98d5376590b025fde5fe431d8ce33be9a373122";
+  sha512.doc = "93743c1a61c40bf476f8390ac232ae1ebf0355b896f8f89587f710c58474a014d834e3a360e0f8f6295b67ef4137e94ba0bfb0517117287dafcdb1fa7754399c";
+  sha512.source = "3f9d367ad03eb4bd5e364af27ed8b242cf2d2feab3e69a283753c7f83c285491302468ecc4a3cd77337b6d72216e02f86489e9f932c2b3d7b570e8dc4a10df28";
   hasRunfiles = true;
   version = "2.3c";
 };
 "hyphenex" = {
   stripPrefix = 0;
-  sha512.run = "c31bb38975a925be8d782f27326b77ab85fd468e110d201a54248c541c767ffe9ba8f747749cefe2b8cd5d53fc78d94d697681cd8af5e680592907a7b42a3060";
-  sha512.source = "c7a943ad0916408cc4807260bdc5ea2450a1401f90031e80518298d0fab8b251136bc6a5d95e107ea99f72c4af595e3c80de09f1341160a56b8f21363ff7decc";
+  sha512.run = "e600c6c31be4d174b62d12d0a9a371f8a28d261977fc46291ee3cdc69677608eb4babe6727af9abc2aac7a4441e82960c8b52741ba4fe5dd46a62647c6eece17";
+  sha512.source = "748950dc28ae855cb277aa678559e375d6d1de8f107b8f531c55c8e5c4ab87fb9a330c96e7be4659f79ec2643092b87387379d959f02468b64250de2307a485d";
   hasRunfiles = true;
 };
 "hyplain" = {
   stripPrefix = 0;
-  sha512.run = "c990bea7ef8e217e967ce338819525da9da7e37caab9dc9bdf6fae481c82d76311b2d68c0ac25a2939f478849bc2d9daa25c9114f6a02965a6a62e2571dd0959";
-  sha512.doc = "2dfa59598f318c8d283055b8c563a3db7ab032de250692e416faf39ede90d3825fa93996a0e7bdc36e41d5f69dcbb9419070b5bebc01543eb510f68502828ff5";
+  sha512.run = "badc61562fb6c305b47d4d58a077a6f006fb58fd4bb216397eceb00cfe2d6baeefce329e780db9e8d89e4472539ac56af1dcd66af8ddc6a6e66702616d13b377";
+  sha512.doc = "94ab39ba1a75b3179c03f94df475407a8cb03d0aaf6bcbde0125521e1855622e3d84f4e1c2d4b0c2bcc29925edbd62b3ef0ed7f6f68ebc44d31f3a7594ed09cf";
   hasRunfiles = true;
   version = "1.0";
 };
 "ibycus-babel" = {
   stripPrefix = 0;
-  sha512.run = "c2af30625578806caac29fab263dc4c62d7ccbb40b32aa2e469cef23613ea2cb70f56ea4e1ec244e35f254af65ec602df92b5418264b5644cf2ba562b0bb64af";
-  sha512.doc = "c8a1f831fd7ff5af5a55ac832972d9cff07b19d86d41970183d3c72f7ef522097a15f25b5958d19fdcdd85e592534d41dc9bae9ba6928ac72302b6e2102d44f6";
-  sha512.source = "b5a441180e741ea592b547db5f01950e2665aaaf9b720937c675e0534712db8a4fa31def6d119176a32bbe638b8af074057c04023206d3a7b616633550bb349c";
+  sha512.run = "0ae5a9ad8480aad9bc2a6e334f818c973462df46eb2263f0ff43c7e42ad235b136a6eed9aaef027fe11f9505458c9a546960b4f3e12763739bf672dac960b935";
+  sha512.doc = "26adf6ee7bc0eb7b7da825d6574c72d1b0cbcbda92dcbbd8691ca0433124447ff56609ebf2c89334bee23e3830a8523a08e1c1e4e7503033df7e36efeddb7d33";
+  sha512.source = "db5efc9bc39da60ce12c507179791dd7f55c55598fdf5511d03048a6e3847cd37eadeb45e34ece14eeec5ce98372694871bf740e3833bc35c752bedea65ca22e";
   hasRunfiles = true;
   version = "3.0";
 };
 "ibygrk" = {
   stripPrefix = 0;
-  sha512.run = "f1ee3b261b36f3eb9f05873455d93fde5d882d8526dc7abf36fc5ce277a12cdd42ecd849e904cdba5c5e7e64f2049d3f0c3aa122f1e8cbe917c015ce4c8d8e0a";
-  sha512.doc = "3b24188c4bcd8b50dae2ea41028eb8e03c8ab7337082d0bc7aef291ab8823638ad38c8a678fbf1c3dcc2b73c808196b943b3cfd592d6eacfc5d7452332c9105a";
+  sha512.run = "07fcb4978b909a1da79032f73aaec4c05c2dcd4251010637aa15eda6b79e65c7f7792287894dd87ba7bc4789ced8fe61a8189ee5b0eaa654337c4f9f41853917";
+  sha512.doc = "8a1897f6a0231564896be560a5beeb0cc732fe30598c6f15d5c3f48abc390de389863ce7eb5510f187bee63409bdb818a38b404d675c82c7b71bd3c1ee9d0e0e";
   hasRunfiles = true;
   version = "4.5";
 };
 "icsv" = {
   stripPrefix = 0;
-  sha512.run = "9586d94334361983028513ac56bc869dfcd37edaa309694b90ed8810230bda7f8b6fb6b1cac00a094c8c180e2fc7cdcc052697996c2a432e74d4c76b43a60221";
-  sha512.doc = "1dc1f3e4c33c88abc05043f1b320586df03cc14b5d4ca6829c41f39ae59cff01e52d1c3dcacd0ca773a37ced5d74884b2aa7ad23ced14a78c38f119c9fe5980a";
-  sha512.source = "6094e6ead26784d97fc849ef3668fd39a10a849902669c4743841bd604a621deddde7bca5a60c126974a1f7de5d1d1d4f0215d31476ce275685265fae198e1c3";
+  sha512.run = "5814a58b6702f9f16464cb3d199f9f0f1a3178d0f1ad9b7fffb828e0750c99cb90223c848fee35e4ee8328206f02855e7eafa9f00e406aec5c2c260bda89048f";
+  sha512.doc = "7fbe6c7f4af905b54864fd3dfd9f0a15d832b5a09a6cc4a7ff658da9c98a55e689b78842249fe197cdd32629db53a82e3181d18880dd1b5dcbba727fcc4ac23c";
+  sha512.source = "5c04b71a1778e2b79fe82045d04f6fe4c68c8235e29d7e203402918e657517c8696673b12d3ea6e420eadf45d6a844d5e77a32b9db04fad4004c0c4606d7c97d";
   hasRunfiles = true;
   version = "0.2";
 };
 "idxcmds" = {
   stripPrefix = 0;
-  sha512.run = "a363c6def35d9544817408e7d090b4b90f9c0e2a21b42b62378c96d00aa6646eb63fcf72b8ab72b4c996b4c6305257d2045600411fda3a286e86b5f0fe25e8d7";
-  sha512.doc = "265aff9a006921805bab24d22e475832ebd0aba642d1c5b15e59837d5e9cccc98078d2acbf949e5c28bf486ddb238833f9a9abe257779040383e3cc8636ca0bc";
+  sha512.run = "8cf7ec540377800924d9d6414fddfc3097e9bec218f68411d75bc566c412dbedd0c988c40b4d01a8859250e11bc6bb4d7fbf5f3772b29c8ac2a6a1fd530ddcbf";
+  sha512.doc = "99f5164839a2a3621224e2672185609a59598aca6eee0787e382ab5d973e08694035dbe539b7d87c4f856d8066c7484679afdd575cd7cad4d76cdcd647f54b54";
   hasRunfiles = true;
   version = "0.2c";
 };
 "idxlayout" = {
   stripPrefix = 0;
-  sha512.run = "86982ae4bbfcf4fa15694f6cb7d6f7334510d063c450e8b661ffed87fe06ad4be4546b867cdc026721b29bd2cdaf8323aee37aa813b677ccdee10588e7453754";
-  sha512.doc = "ae84d455597d80ac54a2fd09ef00b626b5b39ce3204e78901c71cc2d87f6a8523db09be168861baf6589286c754a6285070b48edd47914ccee5af024f929b357";
-  sha512.source = "3bbf519d24bdeab30bc34afa0fdbb913e94637626dfc8eb4208b4b0282fc0aa7531d4d36517a317c01bdc83f707db53d387d3a32466796540d6cc4cee84410e5";
+  sha512.run = "a57b765fd4129a83f119786c587e8cf00d3ea86de7add0858b4f479aa3645a28b68b2bad1d19bad969ddf9222bcaefb1f4950d06931a2f4b6a24e2a1480194e8";
+  sha512.doc = "edbb6e8c35967ebc4425f787a7504509b43ddb2c5d61bdc85cb5586c27bbe893de53c712af3f76e1ed5c895bd458ef7e36b6636dd8844debbedd15b526926678";
+  sha512.source = "3ecffba6b07096ee909d3788d2327c0b69fd7d22bce3d70ca903e3314f0d78d33c5e76722464ebbf8021739da2d1749f7b847bafbe8a18fbc77fbd238087f4a7";
   hasRunfiles = true;
   version = "0.4d";
 };
 "ieeepes" = {
   stripPrefix = 0;
-  sha512.run = "cb5a2c086596674d0cbe0e14ca07a9b5111ec1f2bd146cd2040e898b214bcb469d50bc57e7881ba406b9aa2a7597edf7b278f97bdefcf34f20904d5fb6bc44df";
-  sha512.doc = "c56478a34b2498f750b9ec40026fe97c8aaf12508a5bd19a265fcb7905e4a7ebb16bcc0263aa5e9ff1468c0d0eb38206d51b3db6dcdac2e71cdb89d1c53b97eb";
+  sha512.run = "a0335c98433d3673a68c421b8a561050b9f20b29581c87c70806adb6a34ee9eae5c872978f6998ebe5146576c6684f6c56ac99e3b151e68c983ed63c9d7764fc";
+  sha512.doc = "b5ccca4fc4dab5e9f2aea77e9b09992ef34c58f41d3e8329d9a90bdd134814102bc5b25c6fc44822e3fa28665a2d422e3475c1a9a05739096a0e02f9df9e9922";
   hasRunfiles = true;
   version = "4.0";
 };
 "ietfbibs" = {
   stripPrefix = 0;
-  sha512.run = "ebe7df927fcfbe35606b5242e69b453bd1757949b84839dcfdfe61234267767f87b6db39acdcdf563c2f2466bc86a6c2db18b8a427efa6aac2cbf1a3317f804e";
-  sha512.doc = "6ff8309f884e7f966144051de412818ca0fd9e55669903f8bce009d6a0c9d664b3dd2bcb3a326a4fed531038bc36feb9245b852414ecb6a76a51e218c75ca383";
+  sha512.run = "1039f113f8ceeb0745fdc73c8df27820c453de8eaab2138163d6e8bb7a1ad66e6304f08cb80bc7d3253b9b7c6729746a5eb2610706bee155d82d67f3a5add799";
+  sha512.doc = "ab8df81de97c30c61360459e95eac29bff764e3d0cc334d45ee476b92eff5988bf0509ac2aa270c730c1cfe2171ba27545525bc8a3d8950271d6d6a1d1488647";
   version = "1.0.0";
 };
 "ifetex" = {
   stripPrefix = 0;
-  sha512.run = "40f9a3a41406652e2d7dc6e528b3dcf562175a4287464ffedd9b9b70a0ed331425e6ad6bc558c6157fd53cffbb5d9f53c3e5572fabe0638ad31378be0690a154";
-  sha512.doc = "ffeb9847eb4653a5b603202a2665736bdb38d64941f1586e92721c704c02c9eccbf0c2e72c78c53e331272578b29f77ad1e908119c054de0219fda4f692a013c";
-  sha512.source = "4f331b0f004f9b4ee939eafe203024456e5369d715409cc5be372acfc1dc8be815fd49f000cf1a9e159ce072ff05d6c8f98db97955f4a131699ce01d17b76224";
+  sha512.run = "244537aa156a2a6a2b09b3ad2afb052fa71a7f1ed4f2e5135ec4b3e86de48f6ae5caaccaed5df0c928d1c796b6b3eaa412d00b8d89a00c9b5d65b8989066606e";
+  sha512.doc = "8e30cd47a74075af82439c1c07d64392e1977072cc2200203492cc5eb01d31a74180fd5c0fc0fc71441175b3c46d9d5cffe2fb7998729b14f918ca62df741390";
+  sha512.source = "edd3a2cdd20b08657c76d93bc53d103784f8d3c74ede88a896f48a0be90fc71f064ffcc9e71a650d1a1099d5f59432bb2fd7f2a3d067fefc3c40d8255c941f08";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.2a";
 };
 "iffont" = {
   stripPrefix = 0;
-  sha512.run = "994b623a4f701e45c860d4d750dcfd5a12fa60682450040f9d059849a5ef0da92ffb8f871db127b41524d7e083a8b76e161dfd9d0a24d920a3c1ec22c9a89602";
-  sha512.doc = "f6a28abf4b7b0c6c554e6710e971263a8a8fb08e3a4174a83ebb84767b4e80d66609ebc1aaeae4dbf2ff305cd1aa42f6f84945463db103ac8b1022bab198e38c";
-  sha512.source = "78402ac8bb73df47ed1d709e8c95f1ed84cab987fe401de38725e6862d5938e781d74f2c8252259c29ab287ce193548886a54cd286eb8c8a1ffd9d6c358dadcf";
+  sha512.run = "db81318951811058cb3d447122febba2c8847711d21fec0deefa89e46238d60c2bb53f80b91db4ba17ef3dbd82b8b43b13607b6e87517d21af4ba85e6a820d51";
+  sha512.doc = "5d5a52504d3ca36400ce4558251df6f3f1b6a2f0b7a1b2ce9f8ecfd219505e4aab90cbadc30252199afb3f9d1ea3054b10edb03c031ede773d02f67f67213b5a";
+  sha512.source = "f2ff5e2092e4b3da61622d8799c4924428d95cd727a81a889ece6fcc8fa56f0e09ecd5773ed0e837192ebe5bc53b7c5758a002e4ad5b9b660f451ee6a631cd7c";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "ifluatex" = {
   stripPrefix = 0;
-  sha512.run = "5affa220d36d1e79cc2d3fa605f7addc0a1bb36517c68e83f60902f89b43e08f0b60dae6dae1144409759cdc38605dc2e81142ef4bf119cca630fd7590e12003";
-  sha512.doc = "5c01d7b313d6bb972fee86b85f5b500971ca78cc31f4b964290fd18f1d206906eeff8fbdeacad2b05fa1a32e0bf1194bbe480269788844bd89bff1845d7127c4";
-  sha512.source = "a1cb96f2c72bc4d63d379866c4979450568f332bc79ba3a0f9378124f66ae8c5f4e8d51ad0348d0054eb1e7b129c5f8a29e29a367232e4e7134f32e41dd0c985";
+  sha512.run = "6edf3ce2c2e6dd730f4ff856ba8e14c3ca508937b1ee180a1d6e0ced5b054053ab1f668e214b39f3c0241aace25adba3c4da13c2cd96bd7ebe3c6dde311f5ea8";
+  sha512.doc = "bd73f656f49af92b2dbaa5f3cf973e8bc83f3edd738ae48408fce369e8c0810c06db0c9f9d3264e503928f54cc3534693a1f87c79d869b9d813d3b5c80869e33";
+  sha512.source = "7597c857ac659e0e62f2d96114ea9c82a4e5893a2565d4eb5669a3b537ba440ea7a919bcad5c5ec0c659953bff726decbf866e3b0ad96d558f351477ec9e7e91";
   hasRunfiles = true;
   version = "1.4";
 };
 "ifmslide" = {
   stripPrefix = 0;
-  sha512.run = "fa39c408ae74c9d3df6d9aa798d1dce10d3b4268d3afe19af372b21f4521dc36d1b38d3cf88f1e61f18cee12a34b0dcc5ad12df3e1608c99924d875c53b6591d";
-  sha512.doc = "03e0acf5c5fcf4c5311f51ab54bcc2f43300bde0fac47a0609dfc6db54775e76149e534b8198c7fe5f5f8b5b2355891d8c1594a50c7bb9292311d3f29df0f210";
+  sha512.run = "63a90be74e2fd845dbc5b441bbead45f3c274b78f621734ddf9de71aacdf9196715e3addcf935755fdb24b01ce9578960a9ce5bc897a2b6a7dea101c6fd544b5";
+  sha512.doc = "948abbab43264427cab5718fc1cb8208f3ddcf0d027356c473815855271fe3f2e12b3bc5709ae1570668744c08af062e84ddd2549ed265b13903c5793fa95d4a";
   hasRunfiles = true;
   version = "0.47";
 };
 "ifmtarg" = {
   stripPrefix = 0;
-  sha512.run = "ea153cba91caa2875b9fa523ee3f1c0fb56437fd314a9ad05f6f3053f643b000a0f8d2b85e41c4c7e0ec3f822595684218de76c243b705899820fcbc607b9008";
-  sha512.doc = "5a05457f1b3527e11dc101783dbeb98373d0a50cc2c1fe1932ad709c46f27f1cbd99f6daf9a95e20b7b7f6d5acb7fec156115dc4800b3e70085e1a0136e51324";
-  sha512.source = "51b7dd09ed79e0623cbc375016f73f411d8d462c16c15bbc1a327e62920c673598478cb03e96cddd7838f1061587c45cb46f918ac2b3748e9dc689fd090c3c15";
+  sha512.run = "fddd696d0df09f2563052789347b9718fb8fd47cc7a985039611d66e5662be89bf2e52edfdc9a87d104947340f0420b008e12cabb02ccc257069ce0ecb5ca25d";
+  sha512.doc = "f2508fab4080f3f7f042da3e124c2431f8f1976967efc06db09e7c8e6e2eb2034beedc73839fb2c1d8453ea066e5e6225c399c6ae2abaea671f58e669411100f";
+  sha512.source = "0d98363add45581481a89c2e18115c554c2a97a4a5d0c9c1a4846464bee5d9cd8d30584c39a80241596590e2e4486afa782aac0b4076a8a93d705bcfbaed0a10";
   hasRunfiles = true;
-  version = "1.2a";
+  version = "1.2b";
 };
 "ifnextok" = {
   stripPrefix = 0;
-  sha512.run = "3b45e1a43cda38c589b6286bb5d308946c0fbd12ea86d9ac8e85154c06612416e18573050c88f56f1458a8c99ea3ca06bdbddef2b02321b9a7d3cca02e2f80f9";
-  sha512.doc = "95339742a50598e554340692d49fcba4814256e6ffba1534bd0c22e2eaf9eb9adee04a467778a9c05c0d2f9234d947f008899505061180a6bf44903f3413f822";
-  sha512.source = "625f90a29b3806a7584edfec0632393989e0a7a049035034e24e9969c290f5f3e2b48d2ae3bca8212474e8d09d4d3dc4eaf1032e62f4e1041f42963df07ec3c4";
+  sha512.run = "5e84329bcb92190e0ada853b0448725de1f6c6071e309677d804437513affa16e1862ab070e31970f174c7b3a0f6d7c7d0da58d8d9cbdfc584f342cc53987420";
+  sha512.doc = "ba0fd47d517c621f43982a70f3e1471d3e0719f6633e0e7b2b454f78a1e213f1e26d64a5b10930d54a8409d255231b88e6b7a75c7c59649844d0caa3bb5e9d98";
+  sha512.source = "bbecfe991f67b53b7ee3d3c5a3da39f9167096cb6d11c7d04e2b9a2f8c4be6d51cab801a35b34dae6cf42516eaff035b1434de24fd624e5f1ac7c7f02016c8c6";
   hasRunfiles = true;
   version = "0.3";
 };
 "ifoddpage" = {
   stripPrefix = 0;
-  sha512.run = "5474863e00bb3142aab745e0f4823b56660fb463acaa7e335055c9696e2eea0ff59f168369e3e8e4387b4bf49a956e27826a75f419401ee07e0fba496d0eb797";
-  sha512.doc = "5f504036c33369b85bf914acb2c421bca589f0e755ea4b6a2f55416c54edde09cc866f01b5b0548c6ef8e50d82f9737c3a66c0a71c04e282e7aee7bc16d62334";
-  sha512.source = "ec3a58764289de6e0bbb3dd196fb79b1667a1e7c8e05d45e5ce674e188348bb8aa8016ea96a5a22b3d852d41e5150540bb29dd27105f99b9b735dedb8f3bb2b7";
+  sha512.run = "c8b7cc7ae1ee1ba089c5b754c247a7de8263c71d913cba5ae37f772048944ab025266b5967e36395866d97c13bf614453b857ecf2dca5ca5197d443d2f843141";
+  sha512.doc = "8cf77f9deb7ea57f9ad18f240cf6bc1233948dd1ab296d8d8d4334ab8860b33d85bfedf952ff328aa8873dbfb6eb9160880adf2f7d61dc6749c3fee8d944d49c";
+  sha512.source = "41c35dde706a70697ac0627427d0a656411ea78d4ff01ba413b084eca5d09509ae5e412ed1e397f4bbec21c62e717430887e759a95bf0dcef1d58c297cfaacc3";
   hasRunfiles = true;
   version = "1.1";
 };
 "ifplatform" = {
   stripPrefix = 0;
-  sha512.run = "bcaff3c3f867e288ce5816576c5d69aff2777e29772186606bcb59a61c2f07db603989540e18b748104813d01b67468d5ef9b2042cfcf7a71e00653142c16c09";
-  sha512.doc = "00fe27ae2c1dc74e2158ce3849207aa4d582c6dfdaa45779d43a8c76ac2770c2d21000e26216a9640d042502560a9a6bdfdacf0f35abe6c6adc834b3b2856a43";
-  sha512.source = "50011ca90ecd6bdf1760a4d25f1afa14b05815f123ca0b5d35e19d0bba402300651a5ff628f74e76a2d56aa990cc23eeebd8f023dfb79de0544be5797bb29a9e";
+  sha512.run = "22339a035bbfd771e38b78cb2419a3a834545f037dc7f11335e9334b43ec77679875cf696caef246415cda02c0848e0d96ede820a7817e738bf9d9d0590a1a3a";
+  sha512.doc = "b5678b1de625f1afbcfafe997c8dae7eda021c24a997dc08c02bfa07d89d9a3f87b6fc4c563922b602de450778b7c8562c5c3c784da34a889e44c3955db3e841";
+  sha512.source = "f09c3c8b73d4f2fdff8bc892d547d08e790c33aeaad3224c4e33c4f9e9b4067be340c6c681af849492999195938e908e32a417e786ff79626fdecb5a0be9ddff";
   hasRunfiles = true;
   version = "0.4a";
 };
 "ifptex" = {
   stripPrefix = 0;
-  sha512.run = "17188a20b985ebde4a5606a1be1146add6dc18980fa23953c7c15f6b256204f0c8016d764a6a8452a81d3b96ce9c61753b58af8a9aebdb47911fbef0980a3c7d";
-  sha512.doc = "c5afbb5fae630752388522b3c4338c1db44f41585bbdd557b6b6fbcb29a842651e8050ef471748789f1b0deeba4764b67c7e89854899d93c69c0b4a155837384";
+  sha512.run = "0ac89e0f49ebf958b81c6907d4fa2d02aaec512837f53fa0b3ce7e7b12e9b3926c54561fc13650a6d63c2708d5d46917cac39c7548547b8b7e002a8de219cb53";
+  sha512.doc = "559a451c6098e1431599b03258c3c067243b9d97a7c2c14f3c2b14d2a09ef3fc66f635537805e6281d9bb6c4a64781a612ab286189697904442a2dcde4f64a63";
   hasRunfiles = true;
   version = "1.2c";
 };
 "ifsym" = {
   stripPrefix = 0;
-  sha512.run = "bc4632e6f850d8683416064b02151d2dcd1e35252d23fdf1f98b3701795e6de3cd282f8e18c27bbc9142b0d1d99e5914d109c16644387945815ec71fc06f23e1";
-  sha512.doc = "7a16d60e352d6b2d71b426e0311459b8200a022dad169b6727fa01a1329e0961976fb333c4257f2a13c3419a40e07b1832bd7e9039c04db460c04927fa904368";
+  sha512.run = "aadca74b07372d26d278d013329fb0b3a06c7b9d8d5f731765107ddbb4cc91880a46507d7073720a260ffde2c041a5627f8d3f4d87e74b68de333eaaf6365cc3";
+  sha512.doc = "b6ca0942531ee454b3f1d79d7430a1996f3a82d9ddb16b2982901775a2e3aa74c69723e483099cd968c3b82af833928f422814dd11c037f590a6372a2f55cfa2";
   hasRunfiles = true;
 };
 "iftex" = {
   stripPrefix = 0;
-  sha512.run = "4cbfee322f9a31c9792ded769e488bb577c40cf2be7fbe3da8b2651d6f82be2b691aabecbf5742a1317af215c30ceade69efa9f8e498386772e40b6daae50b4d";
-  sha512.doc = "6441b2773635c1160d0ff5e2e00e935d8d05871373687fae683fb45bde47a99a1916e7d5781ba53f1398f4108e553499ddc20dc261e9908481c75a88fdcb463c";
+  sha512.run = "3a0ddcdb5a7c866d9b38efd5129e739d2303feebb800e492e1add76f56646cc02f2bac549d3030e6b57c57718fc499d16eaf40cdc4425474807e5135995b2cc8";
+  sha512.doc = "2a3c5c51c3e98d68c2a91dd735bf65a2406d5d8e3d2091e03e694a360f8aab43bd2098f084d237598fcac7f58c9d72921a3c7001ddf78cf54ff344076054c9b7";
   hasRunfiles = true;
   version = "0.2";
 };
 "ifthenx" = {
   stripPrefix = 0;
-  sha512.run = "4325e80a8c85befea9c9455e69be8ca7ae1fdbf0008ee8fbacf87c2748459afbcfbc7f0db6ae2abbdd79287d42a4027980d33e05ac5f1fee2c76d993a24a0426";
-  sha512.doc = "3dfb07fda927b9033385b473560a40796fd679de3ab3f3bcebbedf8bb9bdb44554921253139743e14132559a3bcc3307d6fab1d2ceee9194a8eef0e48e7f1a54";
+  sha512.run = "362cc2672d36cc1f89d773e37b433c7146f59fa3a2e7d048e5977edd4c37d96ce6f46a9d79a0b12288dc3ae724174d51348d02c856b40094a8a3872bcb235b7f";
+  sha512.doc = "7db094ba518d79a9c839c3985ab4358244bb3514dc38dbeb004abc342de3f0d135cc8bf7bcd0c8bc6df63d24d5dfe7a6c86aff95ff70a7ced471e3c721220a17";
   hasRunfiles = true;
   version = "0.1a";
 };
 "ifxetex" = {
   stripPrefix = 0;
-  sha512.run = "eb8adea84c1cbc49245bc8b20033e0f27868e905f689d1416a73a03c2f7ba1f6d87149f513478265fe162ce0bfdfd480b962d0a3ad63f0a797d8597c1b6ca041";
-  sha512.doc = "8f97f652fcb288bf3eb20faa959ebf3c2ef211ab58dc38a1ba45aacafb6bda9dca58eba01922c8cf7f2a43574ccf0edc51c8a6fa6009d3f0908613a6af33e86d";
-  sha512.source = "18176771ecfb14d1deb6ee63166d181a370ec388e24cf66812ea04bb75503b11e3582192e715147cb9591211c748c306c3491056f105df4126c2728810214369";
+  sha512.run = "5c7193adbbccb2659dcf382537eb4940c73f6727846ac3944c8803a7d5fb269e6e42cc276a914b5bcc11d18436e9bbb9aad503dbacbe6f6aa93c5465f7341b29";
+  sha512.doc = "412d2b0c1bd2aa6d4e3960c150b9b812e8fc0a7052225ded2afc8ed4af1f55d8f51b3ef0504183b622198ec647f9b437c073682311c6e7b05a495348b577c1c3";
+  sha512.source = "63edb47d3ef4554c7753c8b7db74499dab4bd90dde460c26bed0c837b4a8f8bb6f0736f7ff03226fb3ccc1f2375d3db4d7e2dfabdca0f88b6401c509c36a43db";
   hasRunfiles = true;
   version = "0.6";
 };
 "ifxptex" = {
   stripPrefix = 0;
-  sha512.run = "2fa042a3eaed9710c26bb50472f2a070081f00956ad995e06cef2c1a6b5658e86a2d5e1a7b1565933de531e29b1c6f78ac22444b5943ae8081fc7ab1a6c96b1c";
-  sha512.doc = "025f57e7149603e0f5af797eb5a8ef4090c7460346287c7f2e5b15e2b88fda2e0a6d5b45dc0214b7b38d8bc0d36c96ea8885142a756a2915a094fa66e6c9171f";
+  sha512.run = "329c5d5a5ae6080e934b2e6560da0da94dbe93183b4692edb13ecfd460ac93cd7643f1d84e53a85eed3164f0e10d8e277525a2ce512b9afe84fb59f37cfa97dc";
+  sha512.doc = "2ebdb370e07007ca2b94463aa3cb6777b55504aaf61ccbe5767b1113a46629b89be3f27f1e7ae5fe93e79a4e6ea0328205378069aa60d2d9a8d3029b64873208";
   hasRunfiles = true;
   version = "0.2";
 };
 "iitem" = {
   stripPrefix = 0;
-  sha512.run = "bf58e8c167a8bfe29f12a0786c52a49f275ff4ef2a6c0ee0a9b6dd9693f97354d5209b53abf7b0d6616af2e744470ec77a45e5d106fca9c1063166ec3d248c98";
-  sha512.doc = "96dcdd6aca4e640bed41d34fd2105f6664ca4e2c444527150b11f5ac0e8d1ccd9e1d8eaead20dd433e9e6481bfebf9730144e15a458c1d3c368177667454f0ec";
-  sha512.source = "06824fa0e816605b80712f4d8d87c4317d0aa385933d1672867ed72726c1f51438ff03bd602ab309264c451d1a768ff85260cc4a3c5ffd39519f83e5912eca19";
+  sha512.run = "ab91889a6515fb1baf9b7173b601239736358877de660546a50a2253dd96d11867c06d9479d86b701718fafa2723a6a17ef5aec16233cd22060d28edd743a6c0";
+  sha512.doc = "72f567e70ac57e6a58ee79d27aa3d10de3a777d4b0305d80ba7e7975d801e8323a744b01809177d3626cfb50ee14da688aff46fe038eebb46de1fece0f8be5b6";
+  sha512.source = "e943879a9aa19e1181abc32500c7147c3261a14bfafca3d691abe9748dce0c7daef2b38e5d3318eab58035e55cf5e0f50991f254538d2cd82a36a35c731739e5";
   hasRunfiles = true;
   version = "1.0";
 };
 "ijmart" = {
   stripPrefix = 0;
-  sha512.run = "f0a0fd4a101c95ef4f13ed70b3231586b1278d162bfa3b8141a2647013bb03b024a6bbb755a9a350e57e0e00d61540a1c35599cd32375a1f7492eaa772ce3c2f";
-  sha512.doc = "5bf65fcd531a2c8e24fffadc01592ba0f4cc5322d74d2fde62a6999b709cbd4a3429a6761d13ddefc60d23768eaea9c3b4294dbb4e3379386d0a2810a19a6d97";
-  sha512.source = "2666dce1bfb91d1a9484c15b62367fc1f51aa65736fe0c4cdbdd737325d0d9156e6b06e88c30b93b6ec5f375434c5eddd83feedc6d5f37efeac741e58d12c9c7";
+  sha512.run = "c4af4173b33a946f87fa12c008e9b25c2906458d7e873775dacbbbf7c55c721a0ad16fe28e06618dd7fb56adedde49ed1fbaab6fa26aeec9ab798afbd5d448dc";
+  sha512.doc = "40c4ab62964c94ebd5b2db82b6406f1ad4587c31ffec7ade043997e40e7c76fbfd50226ae4bd1dfef7418d27225fe5649978d29b0ef1d787c28188ef12cf0278";
+  sha512.source = "8d88a0ad7d5a46415afb5164639e3e504ac84cd9450cd76a23ae177a299bf3689acf07bff6048f2f7cddedb8ef430d306671b7d2401fd600e973126e0d0b71b3";
   hasRunfiles = true;
   version = "1.7";
 };
 "ijqc" = {
   stripPrefix = 0;
-  sha512.run = "1e1b23978975d5aa696b2129cfc5c577d0fe114a739849dbe27293a7543a11cc5e0ac47a36b3bbfe40a5ae5f9d677269f9eb13f7052230bef96da66e5c05258c";
-  sha512.doc = "0a2c3c6de19f57d6e23e03fda28d152ec50cbe064c8af753fc4a62380d3897a7b11b6a4e5da3889b4cadd1b769c13e65e70cbbda26cea053722a0f1d16ab1f2b";
+  sha512.run = "cbf3a88bd185ad2e213eefe1f0d87d96dbea1416e1ab9dc4c693d2658f941e3fb64d23ae4b104fbaa86f25e0bfff9001ac28b9c7268ea842100b4deec94a8498";
+  sha512.doc = "0cfcd9eaa19474da6c7f41ce323a677c320a539948973b51be1f5b56c46381b9861350a369b76cd9259c797b73d554a8b7d9efbbf31e62b9b2b2ecabd9c0ec83";
   hasRunfiles = true;
   version = "1.2";
 };
 "ijsra" = {
   stripPrefix = 0;
-  sha512.run = "4b159e402eb97a40a9e25aea93e0c91edac4fd053d0229a061110fb0db0fc6ec8cbebcb488e1ee6b60614c4afe1c27f5e659b515d53847b4c5abaab40a4f6771";
-  sha512.doc = "2c5686bd089de421cd81fbf8a702995315189e14cb480b9c903aa8f1407bff8fb88b235f6405bb046315853e3ab358828d72ce9fd80852558e230ce4da427d56";
+  sha512.run = "34a5a8c4068f0d5f81baa598a76a9b120275cf20a063f8395e1866bbea6d213479b04d300aaa3cfb703fa1b6974b0ff3333afda5562c9ee5619fa0505d4bf0fd";
+  sha512.doc = "d0fdf2864cc55a56fa140e6b58838c0f6f9b1feebef7335097fcec0c91b66c598836be6b28baa749a6ec171800b710547123bf557114f2b81611897d844141c7";
   hasRunfiles = true;
   version = "1.1";
 };
 "imac" = {
   stripPrefix = 0;
-  sha512.run = "62cf7db689c06b5f37821f04779ef4b5dddae272e8327ae0f8fa2ee4b65a68aa5901b5fbd711e51259c039eade5447a51c1f30050cb1127f6a7a5411303d4675";
-  sha512.doc = "50a9ac075bd11ce1ca97904734ad6078ca045bc0e3f2ac32b9ac5c4cadb14d32779b9248cad504b0a9cd6c97d559d4ff297c6a99adb5a480e2bfb7519b4ded65";
+  sha512.run = "76b9046d79c8ea0354d73a81e815dd486989063cba2e12ff7d1066ee61423cf53e652e2062ea36f4b8bd23afd1fa2c4615c41f62c754f8b28a4a19f55e11568d";
+  sha512.doc = "4c147ea2bd1ffe0c1519aa9d66da6448376a6650addf4c2a8a23985caa0866842a310eb041171cac71c9d80613d6a919206fa6afc06f0c75dc131db78f7f28f6";
   hasRunfiles = true;
 };
 "image-gallery" = {
   stripPrefix = 0;
-  sha512.run = "583bd22b681c07e1575ac46119aba4e53dc1b7fc40bb3ee1c01d5c5fdc2ff26ae98715dd3bbb36a1bb6c6404d3bd90edfe58b51774e5a975e9c45e0f28047390";
-  sha512.doc = "f1ca0e423d8bf34fca25e7ecd77f216ec7c46b0f15278d11a0ba093040d9cdd7d695fa27132515d67797838781a2312bfa3083cdfa110a85a92ce0ab38b22b6f";
+  sha512.run = "bd1a028da1f3225ecb7985de5f8a1d9fe1dc2258bdd9342372f92d66a3a19b580989f3fd5d7c849cc6bd578097fcc32ed224dceeb3d3602319ae22e7640d626c";
+  sha512.doc = "10c3230cb0c9717a900ad890cd1b74461a229c591e07853fdaf34136816a1cf29c396e4165b04466ef539090b36770c3a32132f8f5b9f98169d40036867ecfa5";
   hasRunfiles = true;
   version = "1.0j";
 };
 "imakeidx" = {
   stripPrefix = 0;
-  sha512.run = "9b99683eae611558f7505e3a12093f5a9bb53c8169380a289eb57d386b2882437832d9c7b4187d30171ee14167c4e696c52f768702adf1fc3405c5d63b821de7";
-  sha512.doc = "3acde1fbb7686d065f0fcf4400baa71bf45559b766b847e83fc25d7ac9b8b8801c3d3cc709bd295847cfc1c7c24b2c5beca0b15d8f7c2d3e124910b5a303de48";
-  sha512.source = "2b9402c14d0f510b63386f67df6582c53ae1d3ffdc68e5d340c30b462462dbe300b26953d48b1d897a2ccceeed07adbfeff9aef2abd950680aa7a4871ddc4eaa";
+  sha512.run = "e7c90e8b2b82e57acf6a8f4447ca832a9ef627a1e9c17b0f02b7c235de83911dab6dcbc19af9904f50b31ad631c78852ff815e1382c44087dfa7421004ed8fcd";
+  sha512.doc = "66475a428a4592c5ca225df2e2a212c4f8955c798f8b01daeed7a351ec8d6d8db97d78ef25b1768e737a541dbe9e4fbe9abaa648c97b8b2b552e1bbbb1f651c0";
+  sha512.source = "cd30fd8cf1e17ac236994cdde34de8d09e228abe18fa384809b0e6d78a17622c4003bb98e50b0fa1106a3a93a5c769cb9943f42f9ecf4528038f1e368b5794d4";
   hasRunfiles = true;
   version = "1.3e";
 };
 "imfellenglish" = {
   stripPrefix = 0;
-  sha512.run = "169a8dc16976c72b12ad432a1b434a205117eb40bb2f44f48e4390b2d0eaa87ab076e443e29cf758d111e00fe1d8f625bddf57390d89ead21dcf93af69c2701f";
-  sha512.doc = "dda9c786293d9ed609d6182ba172456b2afbbd7fd7c7e29454a2556a118aba4cb8c6dd53fd8ed506280feba8f5a0ca65a9d3d81199f0b326d28ce9200c9e1f75";
+  sha512.run = "d90fff2792b9957964bd360d1366a40b817f32829845a5b44bfd876a1b1f5d66f8540208868f115385f29d81fc139eceab107fbe16f2c134e7e0dc7ac9b56f7b";
+  sha512.doc = "00adcc7980a53eb452f39d30c4cd39753e2a19e31bb9a5d2e55d1396d39c08f353a10704ad698cc4b17ad387226caf718ed04f5223304b9da8ec350f3cf98ed6";
   hasRunfiles = true;
 };
 "impatient" = {
   stripPrefix = 0;
-  sha512.run = "091d764044dd22b6f2c783bb0825a01ce109f348dfebcf759f253d032f6445e3df9c2f8c6c5fd957a7c3603d91660b420c5ad5d155d2298948312def15010685";
-  sha512.doc = "55f7b776f3f2468df564564df6d3ac09fb5940b5d32532b9123c9353d2d445cbe9b879ba920d396a17d2abb11e14c9f6bf4d803b1943edbc997016cf31de04fa";
+  sha512.run = "5d035e82458dc283a0b934e7f873950e0d685e3021a0e47f922f6890f3e35025e580675f3c10312524ce1582fd3a15facf432df4bca0f7721fd2e11689061ede";
+  sha512.doc = "f5702f458befd535744eb5ad91f020e05adb02143ae91c2a413f82dfb3b57a1d1c630e1d03abcad0c6bdf16574ef9307455f095769872a9f68c92486d7ae99af";
 };
 "impatient-cn" = {
   stripPrefix = 0;
-  sha512.run = "3e64634724991b35c0fc3328ea8d6bd6ae8679abee0bfae8a34673802a2188448e087b02307e080fa0a8a8f571c22423eeae3db5b42210344ff88efe50392472";
-  sha512.doc = "196acf9dbf0c559e7981325f508fdd180b3533d975698efc701b43990314ddb46ef44244f2000599476108ae5e262ddfdaf5b6c39dbcd1fb31c6c727288a5c85";
+  sha512.run = "b5fbce7da2b456cc20415f4ddaace64e93ca73ce7a6c238ef11f79ebc1c2bea12eaa0416ecfd3e1b0c98cda284d170d28589cb2d6c0c1119c0550fd6f332ae56";
+  sha512.doc = "30cad393ff9463cababe8580ec87a7a3734064290008be075b29837cec560ead4f8ba67f040bd0270e3703fbbe0fa319c13d9c7a3bda4ba60d9e8d818a63b55f";
 };
 "impatient-fr" = {
   stripPrefix = 0;
-  sha512.run = "1bf2258ba5c115ebf3afb3ceaf9c1e936a7afe16bdba02853362230e6f29652272cffbb04fce95974c83580b8768818b9091033702fa584a4c03cb033f58a7c3";
-  sha512.doc = "96b1001908a4dafb2cebaac526e8cff5749ce02940a8a62d0bcb0525db8062e003d0b20991b2f2913546ab10cf3ae1ac4479d0539d5c48a7d30cf7f6c5a9ce60";
+  sha512.run = "5b834188fc95ee389f5f2634167a4851a7d681a4a1ae1c91788774838e38b7c10babfa7c410a41e6ad9bde8e22ffc41c59b87c76ee750458ea876b9e0cf27791";
+  sha512.doc = "c40f4d9f22bd4794af4361505ca7254e7f2f91c6616ac2d4af31900d2b64dd6f2071e12cf5bd8ecec3b1431c78cebd276f3fcffcfb3671af4645b75d29f6f725";
 };
 "impnattypo" = {
   stripPrefix = 0;
-  sha512.run = "db493c715e9d149742453f7257a72ddc40ab4d79376490fec91e9fccceb49e9d2fa83781b3d0fd0bd5119aae16abb9ddc206eae53ed5bfaa1053d97d756105ad";
-  sha512.doc = "4b59db56bd57a302f97a108afd399747a98bafd7e74eb1f543b7748dc4148d819371b3e5eafb0afc9e0f596c4d1dfd68579b69281e44fd6ddcbcbde16c0275ff";
-  sha512.source = "06e60c977ea9eb115ff56970cb414bb6c7e8a4096bd4d352580a431cb83b26c2378bbd30b1293a9b0e0f189debcef78e07c2149b9d344a7e3871d3f1de5d1c2a";
+  sha512.run = "4dba7265b2ede3ed02e12e0c79b6d58d854399d1eb9932d59440457e712ce004b2942800449adbb8c3f9bb648c10be6e0939df4822897f35b97e74ccfad6e9d8";
+  sha512.doc = "96b441f8215af755f13723aaddac2f9d9d67f0e8529ecf1970c780ea97a5804d76512e642e498f5a5dabf0f66fe6476fddeb4663462a70c32a70bfe0b5999954";
+  sha512.source = "cb216d896e8d17ab8cbc4da1783bfcd070e8f8bb95013f1dbeea5ece3caf9712508a3b08fa685d1abe1efe4e4ff4917840b943da5441e340d7f3c053d8d1fb87";
   hasRunfiles = true;
   version = "1.4";
 };
 "import" = {
   stripPrefix = 0;
-  sha512.run = "7e66951b6efe821cf4a09235aa5df9c3b03b77e21afa016867e25ab07b81c1b164f04c0365c45ae74494cb96022bac49c6fbe7d52210b961b326a52554a66b60";
-  sha512.doc = "407006135c13bbbd7de37a1e5db4540e9bf7d536f4e36adaf6011a78fffccd6b9373e6f9890482218e8b96819e5e72ed8221012672d3211a134cf3600b654323";
+  sha512.run = "4b19993b8fd0575c25af5bdec258412a9a9edc0fd7821138b21c78318f6a57e2309865ebcf8ecc545444b2985cc4acfbca827daecd25387022f29098f1f3837d";
+  sha512.doc = "5b16f74bfc6baafd16e7355ba168226b037398969f818bf630e7328d47a1d37246b522fe21a8fc7ba9472b922ff979fee0282399e9f504babb16206ae4852be8";
   hasRunfiles = true;
   version = "5.1";
 };
 "imsproc" = {
   stripPrefix = 0;
-  sha512.run = "2d1c96ffdfa8f5335816d4c464daabdddbbba07e5fc28894a6aaaa057169c1c21fce0d76892ba30e3d2efa1812acf5bf764b0492805bb7c552c3f120917dd3c8";
-  sha512.doc = "19719c94510a7c3cbf78f0bde541cc4390b6e95bf2a5e1f9a6edf2700c45c4e0f41df5f174c52d9020117dca9122001b18a573e9cf6ef25d8327741ff92de262";
+  sha512.run = "377ab9514203ff67599b0d12c6e42d4da23729e4654d3e8a05cfb3dfb633ffd1c223e7efbfab9d217d3df21c662f6cf96a215a7d6c9968f13b56e3f8c5eb779f";
+  sha512.doc = "491ee560552053717e7ebf68091136759ab5ca36d291d5aaf0db74d9f49e34fd8a35afcd63a38180ca62dcf1c1af082dc6d2b2227f8f95a65385f3aa4a1ec18f";
   hasRunfiles = true;
   version = "0.1";
 };
 "imtekda" = {
   stripPrefix = 0;
-  sha512.run = "681cca3cceade9de6f8176ebf82c29ee74d85a7b0f6ae0be51ae8fc7ecde0ffd73b1b43b6855775f5ec98983c6deaaebab26db270c5bdd1aac60c66cf8891742";
-  sha512.doc = "5880acb4ae44108f072f69be3065f31654fd6c63eab46c5e1b1c79e045e2933296d66c8e386859dde433f542b997bd3e6c7f0fb0ee82aecabd0782e30c2b58c5";
-  sha512.source = "85895f79358841bf25951e2f7a60a9c14d3ec700db7d7d09bfb49ff6233c6b761d9c487fcca1b911736220b37ac7b22f03aeb2dddbc17a691e968c4eea42d347";
+  sha512.run = "ccef323af9afccdbb73d35447aeee07c0cbfa517f25b6dbf7ddf67745781aed1fdbf7e0dc7de9bde0c42c6c79622266cfcfbba4ef901ae1a87b0531008e49364";
+  sha512.doc = "2210792c87305740c7b5c96e9f57b1926d98d4c1fe0fe5a1acc7dfb7ff82e88bb3b0e320b7d7788580f268433be9735988ed0db1d5d2e855df7340ec74a2a61a";
+  sha512.source = "a4339e13ae17cfbf75f140588099cf8bb52c3deed1992d558bc1db52fb64da71aec3315da68fa6e0dff3c959c0952556f30192e491cb7376fcdf30b5f541e3b9";
   hasRunfiles = true;
   version = "1.7";
 };
 "incgraph" = {
   stripPrefix = 0;
-  sha512.run = "e9cf4dbd0589d3e6458d06d56587daaf8ae2e94eaac59de08c83d6431c040ddf89c82e1e287340e8edea21e2f213f8936885bb9bbf1415ec1673e828d3315b64";
-  sha512.doc = "984a38cb1cd606a46fc571fa74a572dbe363aa1867a28c978a42ac0d5906ab470d443c671a2d9968b0988ae6d2b7116f6f0e4995bf18ed26362d01bcd7b91f0c";
+  sha512.run = "7ca01a4e40b6f28b51c46f664f3ae869636452e0bb600fb256fee87a5824a1eb8e9bdd7d7c7b82a32b1dd0f9a407f31b9beb4b3d56e86d7a4411e4a23b58fade";
+  sha512.doc = "e1097fbab528ef96d82d972214893a2303c9ca70a63c47ee83574389374ae83afbf437ec047f3ecbe12e6961ef159c27b6659ea969b9b41d1bbea96b9e9592ec";
   hasRunfiles = true;
   version = "1.12";
 };
+"includernw" = {
+  stripPrefix = 0;
+  sha512.run = "60b67dd314d904d7a2ed50dd6c167f0c8d5ce0248dd723b087839cbe19e150f3d48e0945586c02f467a38936bcd9b17393c1b4f579c216a9989c19edb0cefe52";
+  sha512.doc = "9be0e0bc20e12d3bd5ca96fdf349ce0da31724cba29e7812a55c742459711128219643a7559396ebd00a1ca6aa4bd9be68da54bbbe3e96fc7ff9dfd83de6ab7b";
+  hasRunfiles = true;
+  version = "0.1.0";
+};
 "inconsolata" = {
   stripPrefix = 0;
-  sha512.run = "5d811fde8befb983c27823917ddbab37469e655457a9d046782514bc59b466ff1aaa8f0fe876118bce43a145802a180cc778750dfcdb16c61e41b74d0466d27f";
-  sha512.doc = "927f6855264cd0aa56ead6f4b3514bda95da146ebb418cc3b6a38620b41057dbd32f6c934784fdcb164bee0f1163f266393869714eba9cc3dfc381e53eedf212";
+  sha512.run = "134a52eef41ce0dd1338c700cb06a95a15af75cce5bf5c7fcf1b12740456009a801b374db694bff8a2b8b3c3d26642c1b3c44093db02534bbed1b46c365d4922";
+  sha512.doc = "028e6819f8dd4a310af7491e951c6a843bab124b9aabfb8df564549b952cb288f7a71a847b2a2f5706d2b0d971418e08591d2dfd913574552e625ac6af440c05";
   hasRunfiles = true;
   version = "1.114";
 };
 "index" = {
   stripPrefix = 0;
-  sha512.run = "728711a48b5d23a9b8523ac12632592372753af77865eacf1fa93a3b5a72126895643a5161c30660d53b27a4909d84917206dd37514a2472e55aad6fe92084a2";
-  sha512.doc = "06035f10f25072c24393cdd019841a132faa87e3f8b73423f299e589ea142b9ef9326e13a4ceebe246e43a65825eb89e298db78a816618293dc453e78bb397e9";
-  sha512.source = "0b9887affb437b5f761006aad2666e8e0a5fccc99d8002fdd9aae0b227b3414df0e483c221d47da6e20024fad1b4ecc5891065a25517c51f0b3a83849043e244";
+  sha512.run = "4e6bdea9f0e7eb6ee910c820984706f54a0e9c4292d568e6efded5214a2d3981203e90ba6895301c590587be190ddfc262b7d2803b686387668d3f5627bb5c18";
+  sha512.doc = "4b999cf6feaf4fab3a381e2fd33a029a09e3dcdb022d1904ac95ae54ce7a4e8b6c08db2e81495399dcd14de6772d9bc1145ebd9ce659de40dbdc78bdf9a212ab";
+  sha512.source = "80021647cea6c178b30946e20b11e7a9ba24787a5211443d7a097e16b1ac22c0631be28ce27db0b2533852e3147fce90d0101c67fbd54a5666c547fcfb966972";
   hasRunfiles = true;
   version = "4.1beta";
 };
 "indextools" = {
   stripPrefix = 0;
-  sha512.run = "46fa8667306be73e99e2bd6a0593ba7edfadcf4ddf0066eccf1d519d5591da4c54f8943aae941391cbbb8cb975d146960064e2e09736d6aebb651b7afb733de4";
-  sha512.doc = "7b328b02ec3415d0cf2d28f0a7c8f9ada390b32ed6fc8eb9a9c830006c93199d102a6ba61b9c92cce64daed623c7019c2173cf9d920a23598d1bab72c82871c7";
-  sha512.source = "5be74d6c6010132db606deee220958c9e2ec7908b9ba868d0c0c822fb7db53f6825d5983e917878546d0a8bb199ecf543dec0386c5b080466031aa649f76fee0";
+  sha512.run = "c716037ce45ab35293c12dfe2868958b529c06126e7027935a0c89cf43a4289ad5980f5394ac755474a58b4a2dcd01fe922740d3cad71449ab19e531c4e3f736";
+  sha512.doc = "39946a98f88b1d055ac8407107bc745db546431350c689e0d00f8f6f0fadd6596295b929bf6c735b385bf6938ef9c48fe6cd83cb451e4d4bc7b807821569d1c8";
+  sha512.source = "2ce8cbce477d00f3569a14016f689469ff3bcbe6d10fd53231a71efab0aaa3e896dd4201f54315595c9b22eb0da6ab6570de0f67164b6a5f2deafab43cccf0db";
   hasRunfiles = true;
   version = "1.5.1";
 };
 "initials" = {
   stripPrefix = 0;
-  sha512.run = "9f62c3526b28fac1138992c6e79363f6924d17294ce764ccd84392c0debdd5fbaf7b39805cc6c4f2d163de0e2ae5ce60bb8dc2385cebc758d43a1b8678be493b";
-  sha512.doc = "a47dda7fb2d7dd12239127f1c08e56c9ba36334d89ba9f8e7e86362b3bef9a49f7aef4591ca44c18e6d55f9245981aaae725a194775917c698f1059b04bd2f10";
+  sha512.run = "f4fd172d489327fcae8bf3f552542d44ae730760e097330125de1c590d21903ed196647f21b95af6fba2dd3f5efeb0a27326a0e48f052a1960831daa02b5ddf1";
+  sha512.doc = "4b12041062f077aa02f14065b3b63b5e69bba75f8f4d48d6a93b2417f9b155ee5076609698eea574c757212484a0abc0171804929eb699fbd4adc7ca13143fff";
   hasRunfiles = true;
 };
+"inline-images" = {
+  stripPrefix = 0;
+  sha512.run = "ae88646433bc16d0335f72d9f761a89184f41f2fde746d788b804cafc974a73275514dbe95216dcc8b7e83b0c2150e00c7da0918cd5912e609ac64aedf4324b4";
+  sha512.doc = "2796d176a59f095e62fada630a6153324c5f61c7948c1a0d2599a88b6867f45a596d2ad0397fd6b18ead3b75e9897c29394b9a4f545c50a367b29ea987633821";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "inlinebib" = {
   stripPrefix = 0;
-  sha512.run = "71db5da23e78cb9b0525a72c70bd264949d27e17f685ded04b10133dfab3ac77855ed6e49822a7cc2dea6484e780df989938c07a1f3ef849842530af433a57a2";
-  sha512.doc = "84fbf82349f96378364cec3d67901e367d264b7c4014e975eae0b21e97c1a0c731e598dcfd7f4dc5f055aac731924470f5bed1a7f7608d9c311903794cc89636";
+  sha512.run = "8d07e968b6d36856f74e9db4ff8a5a2fb040359069e5b257022f9774761748da57583d3a4f85200d213925cca1a1810fad369e0039a27866e9d28f134d1c7273";
+  sha512.doc = "e8781b14701027b9e78d6374c04fba5887d825bfa2a142a736abc0ecc84bdd1a1c0faaaa089801eae6cd4d97f91d71a5f9ccc3e5f129c4591edf0058caf268fd";
   hasRunfiles = true;
 };
 "inlinedef" = {
   stripPrefix = 0;
-  sha512.run = "2d196490175ee92c26b887723fbcd9b6996177b2b0d524d5961223c82dcd4078836a3ee01e5a4c517214ebff5e4ff9351c74bc4b74715a63e7a15f1e8189aff1";
-  sha512.doc = "6c5dce2141bfc9b1a59f1c3015e920e88908c1ba00057ff2abf25fc0b53eccc564b6d38b01812fcbd7969eca7ef1e79298ee2dc55979be6e74a5d2696d78656c";
-  sha512.source = "a3e1a4b13f132e1722e4de997812674c00e88b020b14fca8910e9d84276297d665e8ebe50ca61930d4a77e4243046abe684ef5e5c0a92504c50b5ce2429a613a";
+  sha512.run = "8d88246963a50ee8472a5cb806db0b53fca6b2da4380c8cc9ede626ba7f0091de7f07fad8eb0bc5503534f62dc63a5850dcd47792ddda5395860f281fd029643";
+  sha512.doc = "31c8b1f16ae2a4a2b72d975d25d7c69072e711a0bce8af415fd3c2a726257ba79212cbfa0aa9b3694202b0a62553124a1732c305e4efaf91ca8d450cbf970528";
+  sha512.source = "78f54c99ef084252ec0b4f7dc3c630b6321cc264dcde1b861039cfa8c1dff104d621575c3cc28309444d8d4f80cf098b459fc7fbb7b57707da34909bf2d16afc";
   hasRunfiles = true;
   version = "1.0";
 };
 "inputtrc" = {
   stripPrefix = 0;
-  sha512.run = "f27106ab09f85622c0a3ca8665965346969f8094173bd180e53fd537686dbe950a41b495855f11356e4167501163c4d9b4f4ad02b511e50d29a0644d041ab7bf";
-  sha512.doc = "b94da0c4bd1ea5f979a5f00b77a23cd819defb97fece5aa8d3b615a80df233f9d010bd0145d7ae8cdbd5194f128884d94c5ac41537a4ead00e2d1e953f1bb52d";
-  sha512.source = "0d4482c5f95beb499ef9f08e755c8c6f77c4fadbe8ad8986e3d12ffa33eafd4f9b0d592643ccf50626b544f41a92b83511aa1bb7650710f691259d566e7be67b";
+  sha512.run = "2bafafc41be7932ba9ec5b28bb6995c651d1b0f083029c006bc3dd4e9e9f644ace4eaa84674b1cf133ff67e1db2e67a625d29d1b9f908b79cdbbf1d4c19d6891";
+  sha512.doc = "8a504e91e13152f8893d2312ebef4114be5ddfde343f4da17c9e4814605c7931f3ecc09aa35e9d2ee0dfa6a6cf539b028c8c969f8957a5f15344407e5dfa1ad0";
+  sha512.source = "be48f2138583c4f4271e239386b78deebda2aa06ecf06a0c390862f406da6b35cf851e66455f1d1168c2d2a02b43338f48308110b0b681d2442a780cf1161659";
   hasRunfiles = true;
   version = "0.3";
 };
 "insbox" = {
   stripPrefix = 0;
-  sha512.run = "a52ae3f400b77cc2a403ee5e9d773e8f2288c4490de45042788158fc6be60ff439467dd2899906f95dc5833cd9ec51829eeebba3ec5fe20711b2783fec798310";
-  sha512.doc = "73d8cfe102b38ea1c0956f3e95edaaa8d77928b38147fdf41a4253576900fd5917ed53c3c4053d2329b89cc2e07d01675adc0f4e3f60a4dac89d2f5ed2bceb8d";
+  sha512.run = "37bd2892e0ba09a4e0e1154ee94899f49f71cca2292e59d4f3d929c430e986c376324a929a58e92f7946767d83b7cce5d3835174b9e8256d636c606b0763d64b";
+  sha512.doc = "ec8318cec96402f9e86a50495375593d6d421ee20359fdb93877b72ec6752425c8a36c6bc07e1b7db4363a2986e18502dd0df36b19f1e0a5c49f21cd22597567";
   hasRunfiles = true;
   version = "2.2";
 };
 "installfont" = {
-  sha512.run = "f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071";
-  sha512.doc = "cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce";
+  sha512.run = "b5f28c690b1eceb036102cf3838342dc506c5cac6cb6c227287b23121b53536748f5b79822748191dfca4a2c4912b5633aae55e87fabf28b63f949f5a654535c";
+  sha512.doc = "c2db89e1349f8586cb3ff2f8cef1130d6542d927cfb4ac7a313f598cc7b2b113b17961d21092ee898be5484b8fc53e61a6637ad584777394aff9d9a98376359f";
   hasRunfiles = true;
   version = "1.7";
 };
 "interactiveworkbook" = {
   stripPrefix = 0;
-  sha512.run = "de1502a093788fe0776dc3f956f68cb7fc05dad1df38c68bbc9726bc7b72f3c153f31aee63ad25e9ea0d0df1350a561604321e65174dc520c3fe23030a202260";
-  sha512.doc = "a3038734364a0bef606a893388e69b614665c63173b1f73d00b4e2412ffc3c6eced65b40320fd2c87cb8c8052c4d94c09f2f1b1960675ae587eeee67f8f8f579";
+  sha512.run = "8068beea2b172d3f9821e34f77b6fc05a82a4b40706f125bf3df259b5ba3c3d15691327c5caac31c08602e74dfd67210fa170202450b5efb5439b445e3ca734b";
+  sha512.doc = "bf85a7c00da476769efd504972ebd76bf3105e7176aa231e2a7a262decd094150d13d9bc04f2cd4caaad114353e261751fd168b381c69baabae3af526e5592c4";
   hasRunfiles = true;
 };
 "interchar" = {
   stripPrefix = 0;
-  sha512.run = "51f94044c55b5d26b46848a063329f400f82b155f402e99fc8ecd9acf39a0327c262af4c1faebe70e936db1efaa865a70dc50c2e1b11b113f58900dab9793790";
-  sha512.doc = "879a3b4b251064d72076ee462b2abe2a6c680924b1a42c9e4369da19704c4a1970b847ac0d3458d1c3d098999f064512e2473622940cda07f90c5d9fdd9bfb52";
+  sha512.run = "241a6affde706eed95960023a3777abed6b1c437356dd87b080e1408ba567091c319e40b5e179e6d17aaaaef0792daa114185fd859da4d9af9d15704e013f47e";
+  sha512.doc = "6a8a7131d713ab4a4a573a2094ff99c52b23ca40ad23938248ea49fc55e044a17cac2d9635938c18a7fa64c051008cd34a720867916c4f14718c1aefc51ac81f";
   hasRunfiles = true;
   version = "0.2";
 };
 "interfaces" = {
   stripPrefix = 0;
-  sha512.run = "eb64d18aefb9a9dfb48a7bc1eb7bf9baaad6cc2b41e4683425fdfa3ea0c0c79f67c1c467cd3ebc6f0aa7484a7886e56b39cc9d11e23851c414f92ea20cd531ca";
-  sha512.doc = "389dd104bbd5e2b70bcf8f7477c828617b49c368f777479315fcdcedb7ded53bf930d2c218276021ea3a71e561d4dafe41a8694603169f670287b5e971002476";
-  sha512.source = "cb18f823fb44292cc4516dce540ecb016398b68bdec1066d7a9047b8cec59d0fa90ac79942bbb50a8fff365e33cb70e5b62bb77512d5adb18e1e9217f643b111";
+  sha512.run = "741e567a19d666b852bb8a5ae288301d267add352056648ac607e2c93a22835e5408910fb8ebb21e1b99c2375bb0de9baf7c070d031b210c1cfa2415a454c819";
+  sha512.doc = "247b9eca1bbe6fc23c38ebcac7fa24805452791e5a27a2aef1fa380eb7012ba333ca25b031ab4f4cbe8eb085ac7d1b50b6dc0fcf02626bf4f60ef52c830f6097";
+  sha512.source = "71637489c0d9fbb8be7556b33d7e94d4f9f2df862cbbc0bd4ed1c7aa4ba5585174c515b328710c41bfd889aa5a0815f99d15436346818d77273879e5b318892a";
   hasRunfiles = true;
   version = "3.1";
 };
 "interpreter" = {
   stripPrefix = 0;
-  sha512.run = "8515ee7449078bb819cc1ee60f192ae50146dd6cfcc5593654abd45e32a0a9d39fc8f56cbfdb0c527b507a87f8839793258e9c6e6b85ab7f5f4640b7da86956d";
-  sha512.doc = "251d3549da60c4e0cf95bc741d81efd0dbe98e6535dbc8e239ba9276af8c0d13b58aeef1bc1fcc2863d485ea7a8ea706e9f8e4c3a28b9ca0afd1847dcb2e56e2";
+  sha512.run = "f24c8cf2dec52960c3acff13322e585cc53c7d631f72aa047ecd8c4c9707f8bf37c3cc347f8b0d290e50e34a5a6187d6036d9ce74077a7cd8da96430f04c0b46";
+  sha512.doc = "bc5261408545ff66066e67b0292e7178d86498b4f4a7a6d03e45d374ee03eae7d2869379e87aede3d710585ff9e905e7a2acf76b86ffde257ca91943972a249b";
   hasRunfiles = true;
   version = "1.2";
 };
 "interval" = {
   stripPrefix = 0;
-  sha512.run = "7009d0423cc9ac03df78e0e43b471583f62961d71cf5a302a4858c97c82a8b8f96e0e4fce5a0f406aa8440ca349c71c12136a47f818ee883cb2d0e3167af024f";
-  sha512.doc = "793da15f3c04d60a6ccadabcf486e2154569333ef3a5be61398f8a2940ddfd15e2be59777da507708e8756edb67cff95d847fd01a1af1bfa5d49c90889c52454";
+  sha512.run = "25f18044f470bf074181711019e01beebadfe537fbc69262133da953a913fcf67e653cc4b673a58e7764e7bed5853848d47d2befa992f1aef85a7f4534be56be";
+  sha512.doc = "1b030417b50d3af3dba959e8a9a00d7d228ceb908d07fa36fc14c4cc0c24b2b6cc43c4b45539437ede99cb4f0c381c43a7ec6aceb7afdf5ee464b7ae1847d9e4";
   hasRunfiles = true;
   version = "0.3";
 };
+"intopdf" = {
+  stripPrefix = 0;
+  sha512.run = "049fcb518a2819f442b1aa57e0c4e51cb1d1810675c1976ec944b7220e0bfab2a832db0edc09afa82c45e81a387c1258e816a0d04cae54bd37dfc2d5a3ca71e1";
+  sha512.doc = "91d516ecc72d2c4f05a239a9d867ee3ad800542e7370d6bd459c1f24d96d7048d734890c8f685d7110c595a6aa19377f96bed9eaa7fb9377d830f8fc14c40879";
+  sha512.source = "306444209ba45eadf584fe1be059d9692252a474a2bc84f0508e3cca7f90a6ac518020c70ff52c29886dcd993559891328ae3498edb9311781462d44bb23077e";
+  hasRunfiles = true;
+  version = "0.1.0";
+};
 "intro-scientific" = {
   stripPrefix = 0;
-  sha512.run = "98205a648a218306964fa141633ec54113591d0077dfe7905e108ee1fb8be80cf22661375e34e3ce1eb275e5ce8f2a14bef3382cb98024635ac45df5532d4a1f";
-  sha512.doc = "f75b2e1c029d18cda0f1e955c5994d9d0e1220e2468615ebffe76dd4c9aac2e7257e8a0b5ededac4c946b045461b20699e3f805b57af2d42f8fdd39b35f820c6";
+  sha512.run = "6d45f369159148340fb28174a4b73594011c5205069b540eabe836afec990bb03b5843ea59b93c64c18c7bdc21be37e54b20469482115ad0e9e8af0477bd9aac";
+  sha512.doc = "4acae1d4f0b4a8f962799aaf50f2b77e7126ce044281e3213453a71c82b5982fd44739cafeb995745f2593bf7aae46f7405f14da060f2a0d1bf075bcef0770ac";
   version = "5th_edition";
 };
 "inversepath" = {
   stripPrefix = 0;
-  sha512.run = "9d3f89db9ec041a29c67354fb4754a4f483a727695cd162285c1601734bcd10270c2d3906b4d75ddc64bfafbc9305a41a5c1e57e618439ab42413faaf1c5762c";
-  sha512.doc = "548ed95299b527e3eb349037e4563a38aca57de73f9f3993c279835c6f34048362f62f6ef5fa2f30c441aca64d75584caab91ee0b3fb06ec04db9e324ef58fc0";
-  sha512.source = "ddba1cb7b35f11bbaa93a4d1f39f25f81dc9a0a3c8c4e73f148cf7525b5f5ac8c4239722dee4c343300bb04587cb727c53f6a937b037541b032533acbf00e2a8";
+  sha512.run = "97e8327853efc3fb15c8984112cf13b36af6981484068e949de44952f23ec703b46a9c603aea1df5e7e21bcec60f12c4d312124b8abfd83435914d9901d2895e";
+  sha512.doc = "6404ba872692a7cb05634e1f2c6f4c5ec4006835413ba10536fa59d99fd2afa60678da4aae61af4e5bc57251b030c1b9bb182e55c05b9569add65061565732a3";
+  sha512.source = "bb6b4ceeb02bbc4981dcc573ef206e75b8535035d06a6a3c193b31db48dc1c82797be514a3f8fb7d7f83b74592d9c70e9a7d11cacbd97848dd60f38d3fd3633b";
   hasRunfiles = true;
   version = "0.2";
 };
 "invoice" = {
   stripPrefix = 0;
-  sha512.run = "0fd31f4fa8e0b4266815549dcd5ed85a1a71711fea0c8ca7a7ebc8b3aef052897910c5b5430859d5cecc909f95fb7ebae6ea4c976a624b3ffdb69d7f6bf7d2f9";
-  sha512.doc = "75292ae617affb175fac8c4e3b6890cbc3645a59d0a9ee3d04d5994340637e99e9c1523ea94af3de670be4bef47d3cc732a959701b2cc4d140038a1b6d902791";
+  sha512.run = "f1d08d9ad7cf1ae2c0a5f8850e4cc036947a5d35e71b815942d9aaf431ad3e00a73043a29849f1c108ae508ae6919e2c0e01fc60bb645458138724a6bc6a97f5";
+  sha512.doc = "79007cb97f061171de3df6e10ed36c874da388f97d321cfb5be117b68cf635ace12b6532a51fa0048cb2ba3b3f5124f0754c41c4cd8a8f5daee91b17e70b235c";
   hasRunfiles = true;
 };
 "invoice2" = {
   stripPrefix = 0;
-  sha512.run = "d1d21add2da4ee4131c343a930effc5f78780af9de9b30719f4e40dc5e812d7ef2ef1845f5557374566fcc316b4ebd428e6a8950b93dec0adddaee9fa319aa2a";
-  sha512.doc = "ae853be47b294a4602d88b6b68ce575f24d4ae909d50a13dc40f5d46529ca8581585b4b7facfe8a7738b3e6f342b618e5ab9abb99d4dc0c858e10f9d5ad0576f";
-  sha512.source = "4a1d3b31f5d66f33d895e8c93d2a04fbd4b9848d80e9262e581a001c1e8c4c6576f1c1d9e0088e670cc1056c2a46791ef4ed744e48120a8db64d7bfc5eeb6fc4";
+  sha512.run = "fb055a1465083701bcf26b6ad296f81f7f49364e9d4c802f812333109a5fb2ec63f6afbf777dd8528f117e5a65d035160140e7dda024cea858eaf569841093d6";
+  sha512.doc = "ef8cde71c1f552ecfca199b26b0a7439b07092e4bb827df19f2812f680655e5602bb47f0c3ec3a2f31b379df13c9f08c27a298449f252beda6c4644bdb950033";
+  sha512.source = "06bc86f3eb255ba78f7b4919748e9304117617345e532a6075b72c1050507760de40061ab2db5caa8621da433e80b17b2fdaa1e1c02fd6ccd85fa781fb2caa72";
   hasRunfiles = true;
 };
 "ionumbers" = {
   stripPrefix = 0;
-  sha512.run = "bf26f68c48b4f1033adeea350c6379fc3b9012f52c4a3209e7b4a8b76387518bb6dde73494a1912bedde881ba58e22eac8b74e5c08509289d72e65ae63fc2a5c";
-  sha512.doc = "377f1f20b560114f68a59da8a4bd13658acef1b6b8d2ceee65ee39b07a607a4b85072b27a2b6ddda0f59d303b7a56018b18f0bdc43dbec171b4867b991a00f8d";
-  sha512.source = "e2e1f08b9b258c9903edc994419bf4515367d4b7dc112bb74ad544570af6c012eff12a33897611ceeb34e695a8c0b73716632772d8b6bd5b3cad61da6406d692";
+  sha512.run = "2864db49f4a2ad24fdf9ed91006347f09186a828ef2103fb08ecf12cb145af0d41e92127dc3a76c7c32761e2e092a57b358ff9a8c9bf549b381fdca1daa0ec34";
+  sha512.doc = "548988dca2db6bf22af23e520ca83f0a085390b2d09546559e0246b64749a276eb7cdb6db9923d1821e4156071c83dc3e0aeea6578a9716f059ffad88118d4fe";
+  sha512.source = "c06bce4b589dc8a9f2d19f27f8c5842ca4a508e83b915507b9eaa39dcd47e1b2363d6c5f14cb4563184ba7c72b4de7846e85def32c671395ddb7ed79ad97f4b4";
   hasRunfiles = true;
   version = "0.3.3";
 };
 "iopart-num" = {
   stripPrefix = 0;
-  sha512.run = "9183b9641a7c857868c0f287cf0ed8017088ec74b59209d49291ee163ca7be4fbb723d9c684402040c088b3f7d9c037de52b9da8c82ced026a0056427079457e";
-  sha512.doc = "7461bf8a7ab358e8cf03a4cafe080644bf06f30086d5d9b43c373bd78df4c6f3b0026e3a18035ae71a5466356987f84a8c62f0d7ec22969c289c512dd57bcdba";
+  sha512.run = "0b1fbd2e8c46d777d5ce1009f660d59757b9c76903b13cd24e13a8e1b0d32852bb233b5b646785dfbb1ed9f99fbfde70baf47b32ea746c2541cb3a6c822fd9c4";
+  sha512.doc = "cf299cf16322444dea007f93cc226a5988417c2e1b3f3cffdc51e827ef9e25eddba98fcdc2b6fbaff2633fa500c2e999cf834e45942f99024214a04c7c8866b7";
   hasRunfiles = true;
   version = "2.1";
 };
 "ipaex" = {
   stripPrefix = 0;
-  sha512.run = "dc9391ed88a7e260a9dc0b4f0abe0e731ab0031ac048e910c46845b42788ee15ebfdb2b6ea409254512fb866ef276fa2c1094b0b7d8698fe4879ba29c8309f19";
-  sha512.doc = "743b6b6c768ae3780e23ff0c389934b06b6824b6d7d855253a3dfe4efcf35d2f562f7034a4a64c64f48464967fd34401b39e48b2913bacec203698ff0b806067";
+  sha512.run = "6925d4abf2524bdc5334f496724bbe733aa305c10302e5cb4674fa3802339a0fd7a4177183de67ba2ca78f70781c3d929057186173fa67ebc75943d13ad9f248";
+  sha512.doc = "a6309bd2940c3da45538b1ff2aa0404144e9054d90973ad63f84be23e9e7f2b88de5aff447bdc99504cf5ac855dbc8a3efa3609f921b002f173bdfddc0f99672";
   hasRunfiles = true;
 };
 "ipaex-type1" = {
   stripPrefix = 0;
-  sha512.run = "15f0595e3bc91565f0c918730b3cabb66b9de52e6fab3ff8c1ff9ddec2bb97c938fbf09dcdd7749e85ec04fade6bb77e7a88c37d44df61ad498d44b3a670de49";
-  sha512.doc = "c30540a596a3d422c83a2133f6a95979d562d46fd16084dd729f42a75e1a309d5ed921f929b637a99824e214de669e48ad6694bf324dac307ee75a886ed7ab2c";
+  sha512.run = "5bbeceee2bbaa2748cd6ebf3954c598db8e7d72a04af75e0b6aad510cab9ccf0812c0daf17da8b11d5676eeea10ffee8af6f35eca063fe5784a8563803b7266f";
+  sha512.doc = "b35e123b658b609cf103c41adedc154b1a9e1cf7d69ef575492c7bd8cb5575ea5779532a3a3e85ce9796a90427088af83b9189f3ce05b51e304ac08afdf775c0";
   hasRunfiles = true;
-  version = "0.4a";
+  version = "0.5";
 };
 "iscram" = {
   stripPrefix = 0;
-  sha512.run = "b6b30fa5ada8f1c250e785cea2f78922981a4c93ae42f0e6427cfeacd95acdc8970e28a708e6c119db137bf2b567e3d5e513924e1b2e431f65d2cb62d27f91af";
-  sha512.doc = "438881bd8095cf8aca263869f78c8af91401b0f2590f5e1820bb6fcc53f50319bfce4657c6540ff646fd37b10f2d0bf58cccf6e6df48c5764c3179b634ee1c30";
+  sha512.run = "529aff3b63d5fa2d5bb9f93c9127d5d1d03050b0153af74793dacf29988176bd53036e35c4447d982430d6344766d9711ec800fb1c91ccec66891353c4779f44";
+  sha512.doc = "afe9ccd889ed1573c60080897b8a2a3b17bf3c38e11504896a04228aa8f8dbfce5fefd1978cb10f6965e6a983563ec1c72c1fb4cb2f59034f5c3505feeda4604";
   hasRunfiles = true;
   version = "1.1";
 };
 "iso" = {
   stripPrefix = 0;
-  sha512.run = "7cebdb7bd6beaa31ac4cc798cd3d4422372e60241a014c7344bb4ff3333e4d790bef4828f19555f1fa54ddc62d0a8161ecbc5969ddc00e1f71558a874688d738";
-  sha512.doc = "54282b2ea823fb2ff2802041520663d8616d09850f768b6528b7c5da974089ce2772b07c23240ee36a3daf934a08c4043522b3745639304f471d3f7d17733c4a";
-  sha512.source = "ea0e47a190b4b02dbc7e613a844fa743e531acd535b2bf62c994af06d4e5d4142bdec895c820eecd1c0bee3d587559cd34175a80d71c064839392294d53ff732";
+  sha512.run = "7cc5c162d0437a95e5640f9b320baa824cfe650d9f0cb8232d43a3fd3758a1efd4e63c0605162a6358c562787e8d813c6dd10a65dba758e228bff33f7dd4b985";
+  sha512.doc = "07802f739ad364920f605f8c783211b0e296dccab57e227397c188a796af59b667642cc4d84f6d8e053fb6fab42d3be6a57ebc8c350f23cac65b63e30c86558a";
+  sha512.source = "29c4a6ff6c5d5b1b7c943245b8aa80570d6ef884e43daa224fff661685998f4d1d28622b32b44a7510c712e6354d4af99aa5395ff98019428ba000e7d26b11bc";
   hasRunfiles = true;
   version = "2.4";
 };
 "iso10303" = {
   stripPrefix = 0;
-  sha512.run = "37fd6ee02c25a50799cd85957ca25113c277ca0b65325de5855ab9515b95577d9b53d562881ad2cd0d8140d9dc10881253e84fe53ae5ee74138986c8dfa80970";
-  sha512.doc = "a0960735fe6bc580b821aba68ca8175edf880a2538580e215fa3162cbdbebd872dec127287c40692d9ef37f29436ba44ecd0881bd3b134458e166abe1889c961";
-  sha512.source = "f66c76d897ec25844ee1cdfc045c6797c5f52ceab495782aa4ceb5fd942a992948db5e23f84d467f4c99ac6c90e8e7d3388a3e670efdcd16542b0b53e4c0bf16";
+  sha512.run = "d0911a77646ea4367e76f03173cbe4d445782ab98cbd36501a9af84a5c26a876c94b8cd59833eda8b78a3eb80c0159546f3e108777a386538b23c83618372e81";
+  sha512.doc = "4b237ca9baaea13234a0a540f7618fcd7dff5be9a0c6f01a82782b44b2a2760fe8367fc1662cc2231f179ddd33e6aec1737a0968573e3be2bbf305208130004f";
+  sha512.source = "b87353745a0be9dc6c8070f4b9e6d1621498a414c482e85a3741a684123841f873d599705ba650922e9f76f87076a0901827a6c074fbee20045a34169abd0ad8";
   hasRunfiles = true;
   version = "1.5";
 };
 "isodate" = {
   stripPrefix = 0;
-  sha512.run = "a4f20cd6d36610c8585d0e44baeec5d97a353fafa1186752e96b847f663dcc457bb9146da42f3f2080b2d75aef98d71c9b35b0c52ce2627fad316d99f939db6c";
-  sha512.doc = "c1c322956930c7b8765f166d8db312d911e6da7ef5e6e20f356116fe20d971f98e08f4fca9a43a758228b73d43251da4c00f1f83014acd77245c47829335acc6";
-  sha512.source = "41f4f46d89deb50149b4745f111850c1a2a064ca0415356c451592027aed902cf501e1ae5168c41f69c3b13245d11071b36b1f57de3d621d78ab53e57395ebd8";
+  sha512.run = "4467d4d48c4b4602bde671ac0362517b525977e848dcc8f4b044c4261cebf6c0710824d8134498b391c619a5ac5aeed456b0f56f3e90068c09d9c3627fcd9853";
+  sha512.doc = "815eae6e63cf7a72ffa10465dcfa18685a64a6f632e07045edf5f41a099fea520d7902029a840705cf3859c9798bf3c8ea9a87ddf7980112f20fe2a37ceb8fc0";
+  sha512.source = "ce8755490fd80c68da081862f8ead2f7120cfe19fe58fb003e57f7b07a693d6087873db7c6e29e12477f4896b93c6531a6d1f708306ced3694f2cea7dab7109c";
   hasRunfiles = true;
   version = "2.28";
 };
 "isodoc" = {
   stripPrefix = 0;
-  sha512.run = "58cba07575edfbaf2541fbf93e757eeef77eb5e63b57f927629c9b5470d94ed4aa4e6baa79a435bec282e87c18a4b871081e44a74e869fe43eb92c2c6d28471e";
-  sha512.doc = "b237e99e602f512355cccd62a1d2971a762aa91bcf6b45e43d2398ef25a9a9b3a5ab02bde11ecdfac668bf5a960cc517bd553458be1ac2260b9af63979c0617d";
-  sha512.source = "f163a0e0ffcfb28101d1cd3ca7a9acd29db8bfdea93c68c0930007e2cec7354a7b960a67d1d0200d95ef6905fefb837d51372a474fbdb4f8459374e3464d86d9";
+  sha512.run = "ae0e23d61388e41dff59e77dd15fa8ff563d48767ccc686b1890c20e817270b9c331f11e6d5841dca8060bf3f25f1fe089f19908a31dcc526d742c7265d600d2";
+  sha512.doc = "4c70906182c5b033ee55316c74f93f0c26fb8701dada71f83bb4add4d37e3fcf1b1c4a81a9ddc6093032fdc68a0604354001e1a53a2b0efe66bc31861071b923";
+  sha512.source = "8f6855693b2b40d8f4956ea5035f3ab040b3c0114455f198c1e0d7199f058e6ee869345a57b1846002443bee0a339eccd555d8a230eeb3268c479c7a856bf3a2";
   hasRunfiles = true;
-  version = "1.09";
+  version = "1.10";
 };
 "isomath" = {
   stripPrefix = 0;
-  sha512.run = "60d9ae2efbd926ccbd689b862f98000b84f378e1aa45a1f85195d72312cab35f7d94ae09c42b2b2a34c77ff2aa2cdaf4ad89cb8e497bd802a24f403534a0313e";
-  sha512.doc = "6c9844faad18ed913b1a0e52d6ed9621a4913907518840506bb231cd2acbf344f09d862899660b77b7949c9fc564375e2e235a77bc9103e3fbbbba14b97add2e";
+  sha512.run = "70c46b16cb90b587cb85be6cd2d88f0d2793fc65b9f80656a0f279e1dfd37fc29b0c696cfb2a988c729e410b1f6d76939156ec9b2eef12528175a8e782afd44a";
+  sha512.doc = "3e7d4c871a554def747a249fe38761e709de9a9a23ed1e21e90855ffae33d858bf40830791e68903b7da8483f9c19f95ee95d4a02f2dabaf29c34eba83e9c1e6";
   hasRunfiles = true;
   version = "0.6.1";
 };
 "isonums" = {
   stripPrefix = 0;
-  sha512.run = "30ddec341a5cc62dd88441425a79fb7972383dea0837d756f65b42b22f0cf5d212d77024875cd11820e5a89472c236faa917170d817cf0f1874293a36efe6f4d";
-  sha512.doc = "73ef8b070aca617a6ec51411a2957b5b32207ce84c99a50676c9a4c545e4e19354f1b55ca87ab2fa476a3e596b68057794a87ee594c7d4511f129090fe528814";
+  sha512.run = "03eaa0dfda4740c5bc730083385934c0935271d6b7ad77d6747cde5d7fe22f3ef6fd64fb287aec933763f508720915acf947c2cfe773b390eca965b30251f224";
+  sha512.doc = "76d4be777fcea2cd8647e2d3720b72e3dd349363e3f263868b277bcd4a2469e48e4cf2716e35e1fef56b2449d17ebedf66a0dce5724a16b2830429794714e363";
   hasRunfiles = true;
   version = "1.0";
 };
 "isopt" = {
   stripPrefix = 0;
-  sha512.run = "d2d0f459221c265e73ff5482324f1e6b65df99f25a56863890c1925ea57925f7280b96f99ad85f8f7bab098cecce87ea21cd59e9aa2f7e46f9975b9dc3889d76";
-  sha512.doc = "59a48938a2cf0de9e953b27f30820cdfe4a4d98275369c4457b8c2ce03a220c0ceef6e8d42d66d7e3d0b8f40859d7c30f864783654ca300a4e773986fb31e1fc";
+  sha512.run = "a3087a33a5df7f5e67dbf58060b01eef2f4feba4aefce84da65ea49dea15ecf72a013993511870a37fafb67b2105506ac0854158c3b66d8e6ba59819326d70d1";
+  sha512.doc = "10f09a197037821e408b5f90f1a04a4b05c2091997d41a285bfdd0c6d27cf974468bd32d3e35d78861b061d385a6b5a03eeceb1cf077f7446d574f6af33e1263";
   hasRunfiles = true;
   version = "0.01";
 };
 "isorot" = {
   stripPrefix = 0;
-  sha512.run = "9f0a3bbe459d6157de478b4472c3f8aa1930978445857f24ec024d96b59b73c10515942e3ea7fe8a461cba0226e009f6979a15dc8934de861fd14d6f3e4d2e5e";
-  sha512.doc = "dbcef3d947957cd55d08c770e340c614b85352b3236b7082603074f025f698ca770d5b434ca5129bba7f757fbbaddf09592fdcbaf6afab17e0b777e990517f72";
-  sha512.source = "6f92adc63af4431e213947468da67879fb9138f532f9cb7e9be2f947638f7e64b75094eb0ac9369c57e5fea9b078591aa418f207836d9bf35ea84d2d8ad248a1";
+  sha512.run = "8e574c8c7861cd6ec143c61ac22b2c884e7a8ecf9a4ef890063844174bfe47ae7a263530c4745a211b3a401d2036181a74d34399924b7db071629ace033920f2";
+  sha512.doc = "7e33a76d75dc7296bd0f2953694e4896e7541dddd8fa0139a6c681214fe416d8f5cffa387337ceff07d0aa6b25cae8772543b477bc55f19f2854e98f9f3dcc39";
+  sha512.source = "8b59fb7c3b3f80ee6f27e53e89f0828da591242fd7e18b8eda94ba5c5ea37a17e62abad61fd44ea0bb7d7e9adaf80897b65229d9400a1952530472b3e23b9fc5";
   hasRunfiles = true;
 };
 "isotope" = {
   stripPrefix = 0;
-  sha512.run = "5b95a5c53e3f63ddb0569305a76b4c592455b3775e87ef0eff2b7759d07040466f2247cad40ca83879be0ff2716ac63a6d1f7e0b6b22617840c2a6aefb342ecf";
-  sha512.doc = "549601f82807882a37e72866612bcc510a426f04d5681ca7a392b07ee34763ae6434f25d6de667f21750f9f775f7d2f5f3462768fd5788c472a6a0042bc6f627";
-  sha512.source = "785d11c2496d1819102a0a099d56c49576d0ed5f2203553c26eda269d3b4963cec646304fe7da1a3937e0e8d5a09eb209b8cf0635ab59924a18ddd885dff881d";
+  sha512.run = "0646e95955bb48b78760995842a5a97c4f1bae8d7cdb1dadac51e10f927606bbf56debf1cd8b4ea0ba334843dd8d6c7f05b4a3cd6edf0b89efeb0239bc04d72a";
+  sha512.doc = "ad9f3c26b3609185114d2694b5c90472d3c7006ada6e87b203249dc9a43192ad25e0bd21b51dc5d72bcf8ef702065fa11b18441e531fa830f2fb2a80723bffba";
+  sha512.source = "64975de3e008b588c670f9ccf29c66c4a2042e016f82bd7c92473c05e68f972becfc60fe4e28bf9826833c86909b102087c6acf29d0a3a75d2368fa332132a89";
   hasRunfiles = true;
   version = "0.3";
 };
 "issuulinks" = {
   stripPrefix = 0;
-  sha512.run = "761e9e355380fb7b84fc10d75e6b9936289f81fa3e420a6bf42d1dc3cd36a39b93b9a2faf04c660bb7777efb179f6d038ee55188398337d84a179bd94ad774f5";
-  sha512.doc = "3feaa478152e062d4aa7f0920b19a23994e65be8855542f0ddab8bedc7d86c71a446261f8b303fd5bdb18ebbb90327b9b621abaf903db85cc0cb12cb37fab3d5";
-  sha512.source = "722954151adb4f410365650ab93bf048bd74df9c1052354066e037d23b554d431980e937f08cea92c67cf6add93b58937f590425a761ba23ffdfdfdf084a15ab";
+  sha512.run = "a56207011e2f171f06a08754e5b949ca169d681f7d068d483474a718415cec5c6567ac6a5a69590d978f3c693a5028af7a81797efa8405ee1a6749183e4110a1";
+  sha512.doc = "53588f04fb1160cea73713551d603339b32a7a3e31578deb66616a3b51fa9913e74c729acb10d363169083c26725c503d89f16fb1c97f8ccd2247a33dcff604e";
+  sha512.source = "efa0a67522f16c9aefcb947bf5fbad0e4ce6d0524b51af8982972f9c76c7c1faedbf1c2190423758293207246447278044f240416e36139a35e0c713add9eefe";
   hasRunfiles = true;
   version = "1.1";
 };
 "istgame" = {
   stripPrefix = 0;
-  sha512.run = "a4f5e6129343df7b3e6a7c895ea72fe417edbcf97da18483b7e8d469a0f523a5f13691619f69d3915b289fdcc93a297b8062fa1a8e05630d9c88f6f164b6c20c";
-  sha512.doc = "f96f6ebcd603d7223bd231917d125a0a61e0224394e92f8a4373061d6de2a6039b17c2b162e53fd5925f5a5e48ab73b7dbff824cedeff4e401a0e5487fe00b28";
+  sha512.run = "c0a873cb25a0809c0ea0ad96ec685d5ffe906bab70fe80f9153a56453d8f86c6315737af6e72cf6403ff9096c223fadade8d9ae915e6deb17bedd3cf78f5c6e1";
+  sha512.doc = "f1a2aedaae8067195bd3d7bdad992a543e073eee98293d7b889ce9c9cbb2016184e464217462f3c299f1caf6a3dc1ae2c4249847d42fb44cff5de61a48fe8ffb";
   hasRunfiles = true;
   version = "1.0";
 };
 "itnumpar" = {
   stripPrefix = 0;
-  sha512.run = "76ac283caf27a936af6cb91af2e8fb8e3c48efb41eb602d6c068ce560edf958215921722bf01371c6cda8470bf4e2ee5bc318e72acfef738c459ea94f9bc5a8c";
-  sha512.doc = "54387c2ec9a644325d61ef8f2293364449274bd6f15254e133554f2dc8ef4aaff74afbfbc1c21b7349307782a90188fcc4080bca2ef75bfc08f50346c2962f55";
-  sha512.source = "932478a3f5a28596e5d2bddd46ab8314b0e552d0d685870d33a2a988bb3a81afe3db62b4611659184ceb9c813f5237e67d3542ad1dfa4a9f9688ebaa6efb0dcb";
+  sha512.run = "90600dee91d73049cd9d80074d2d137ac839d61b9d4d8eb8e924d3f529688eeafa835565ed776c9aaae2a74b58d436fa7956be220422cfd4d6787c899294562e";
+  sha512.doc = "85288b2924e4350a1d1ee209fff09cc05e2c7eedfb44130e1e6d66b1d7659f3661fd00c243840c2b3b7e5a0b0c945e3fd409dbf4420a5dbc6480bb6e78b04349";
+  sha512.source = "95423bef9a2692d18961e40661047c381654d94e86b5ef084c5239b60b5f91c82b5fcf8989eedd363e4805de4b3461a08ab295e781f5b18b70447b69e06efa5d";
   hasRunfiles = true;
   version = "1.0";
 };
 "iwhdp" = {
   stripPrefix = 0;
-  sha512.run = "511f40014624c0318610c14dbcd00440c4d07f9055666f3b8f2878a24420a941cb53a368482c680f823f3e319ea22bb9d60a669175569af1184e1a0715cdb17d";
-  sha512.doc = "1b8fb85856a3b5f138dc28e1bd04fff188ed47f5e8482d049a56d5a2258d870409de8d9e8e7f92eea20e21bc95460843bf75a84b566da398fd968c7465d4f736";
+  sha512.run = "ae98cb6a8e1fd1fe3cb721286c81aa0b54c31490e099ca862b597da09fcc6f4f33d13c529287bec6e671aa59d49f3d221de3a8579af91729b444200a72bcc3c0";
+  sha512.doc = "436464e737abf05717e39aa8077bc6172e6ba359e6391eb5c566868542d8fd32717ffc871e61aaf830a1c96ceda47ca430029665859520b5930e91968abf4d06";
   hasRunfiles = true;
   version = "0.50";
 };
 "iwona" = {
   stripPrefix = 0;
-  sha512.run = "18eb18d9c4ffe8b56c762ffbd23bd62f0ae57f82284c493387b823183a17995e9d5d8da490ca83dfb5050caec0e9b2dd41c647d91a2f40a0a3f7dab948c7f0fb";
-  sha512.doc = "745bd8bd5764312f0a9d7cd798aafb8cc561b599af7fa06491fec01be50f2b1ba39fdc2793c76697f4f98d14024a26502cd56fc3423a46c3c13e5f39baf066ba";
+  sha512.run = "2dd5001f4c302cf8f889566b0891bab13ce45bcd7f99acccf1f8ef7f1ca7fe8e663369e473ecd57f25a703930896cbff10cc5a5c943ea6039140549d5e6c1966";
+  sha512.doc = "ab62cdddb9557f4e2d0fde7aae7987e99da3733f8ea057cae5433d8f88399eaefeac80a3b45244a32414de7be819c1cb9d35b326b9bc2836d5b5e9747ddcb013";
   hasRunfiles = true;
   version = "0.995b";
 };
 "jablantile" = {
   stripPrefix = 0;
-  sha512.run = "e41affce6ffa270c79584752eab1331a4425c2ed5cbeb57eacb1fb06fbd12b90cab77ea89d8ab7afecd347523ca2b59555e35fea3d938f46190f4fd21a97cb14";
-  sha512.doc = "269161f11f04fb3ca2c79f2be200734d9514f839db3af52508273455f003eb227f9cfe25aaa7c88b5f7c221ce04892e9190daa32c1df55937e9f20262db0dde7";
+  sha512.run = "a3d6a7f0b76eee7c9c4569830d46cec4ac8bbd0637910dcfdd0ee29ecf2cc1eb92e2a67f95ad4672b25658521af649978dc0127c8759647d0be38e5654a03582";
+  sha512.doc = "3faf8ae22f5d4f8403f71d4245471f0e28d7a5766e0a332da0e2d3d9b6db468f6b4828c5b0169a42459a96cc124da1ada7c6431dc8c0c69cf54930c7d8d99913";
   hasRunfiles = true;
 };
 "jacow" = {
   stripPrefix = 0;
-  sha512.run = "6ea77d90199df704a7c6e40fe155ede4f608e5ff02f60307ae199c82c07e1781df6ddf61d8d1dd735d480928c18542cb80722a02158f9fc3bf149aff8f1b5059";
-  sha512.doc = "10cb3d72df60842f845701be65afbed9e6eba9f85a0ad1384f03ffd0b5fc2cb79d7ade6d0293ebb3bc4f10736b584f8edef4c8ed7a5b85f86f35f8548429a28c";
+  sha512.run = "7f9cef6c3f200b6be71547eae17127e27d2bcba240d376544b95a3daa79e1e5f08bef1418040c24b40baec974716b043bbe510dae0f210141b3360018cf739ff";
+  sha512.doc = "fc3c88d5ed43f9c9824e31e43b4f6d6a1ebcf07e396606547dd030fade8f7ab392932b06601151916daf251e77e1509cf9c58d88bbce304ebe15b2ea12b7b64d";
   hasRunfiles = true;
-  version = "1.95";
+  version = "2.2";
 };
 "jadetex" = {
   deps."latex" = tl."latex";
@@ -14838,595 +15229,629 @@ tl: { # no indentation
   deps."url" = tl."url";
   deps."wasysym" = tl."wasysym";
   deps."zapfding" = tl."zapfding";
-  sha512.run = "6ed72520385234d3059eab3bfe9592ea974a4a83fbc85c8731d24cf84efd6cb75646dda7d71a73888d413de8c7215ff6482f10a04d15f8a656b67b4403a9d70b";
-  sha512.doc = "31d31d74f2e34c021951e66424d50212287595a7506609272ef07c5eb8916a0fd0531bcacce936b48cf4afcc0c6d71dccf9ea81eb5cd0ef4b3a8e99e7f90cdf2";
-  sha512.source = "c43870533d29e15feba03b50a14978300a1f462af542492b9c637c2bc8cc7adaae3e3a01bbe8061e74204cff2bb964efe022f2387c70982118228e290ad01479";
+  sha512.run = "b20c37768210bfe77eb6a5eedf78f72d0b2fa19e9a41b047957932e06891732593be18e9b170cf966340383b9edc692df81a570f9fe9f9a00c3bfef5f088651b";
+  sha512.doc = "3d79b4462dc596ac82f9bc3adab70103272482dc8605d73c52dc8a9c185943f9f03f861b051250cd71987ccc04fadd862e53d26f83f3da5375b08e67541eda72";
+  sha512.source = "35ce82b2a17ed0e063f5d9992b81d3668041bdfa20834fa5b55a99b7d80b7aeebe924acc0c0db7a605d0b15a7ef92d1127f3f8d74282b08cb64a18dbe439987e";
   hasRunfiles = true;
   version = "3.13";
 };
 "jamtimes" = {
   stripPrefix = 0;
-  sha512.run = "458f2d11a629406f08c462e8a95ebe3393dddf2a47c72184fdd4ccce77e2183d5e0eb07d6f6a9e6239e781a08e6a5237ea6ed597e691042b3444ee4651e9f16b";
-  sha512.doc = "dfa1a2010e20de9595a35a1e2b6926be014e893d60424320e6f28f460fc6efab73195a1154863ded18baefb3d5e6deb3f322474c077649c320bc9ae0fb9b41a6";
+  sha512.run = "00db9f45801060d06c3bf64c62ed17cdc6af397479be2ddb0ee32c10d059c47f5ebee7f8900d1b3a4dfce179a10399d0a63f6ac4812c774bf081e1f727ca405f";
+  sha512.doc = "6c6de31871bf34cb2ed2147a43cab003597e62e4480faee70f49a479d8d237c77b90d631cb70956525b2363daa3a1dc60ba503c09853836262527a6322321750";
   hasRunfiles = true;
   version = "1.12";
 };
 "japanese-otf" = {
   stripPrefix = 0;
-  sha512.run = "3e482aecbda8407209f97fcc4a5e66642b4a2031e6cb69b0c62cce54de53e54b0a4e80220e9a47c8bc53125ba9ecc1496f6a309a831295f16fd67d5aa0ad520b";
-  sha512.doc = "8191b29549ce32be1ec395f568472b8b272ffe65889271bbd9dc6d843608a7356bb5e7ec65f293b64c2f99b8ecb92ff9c49f732665eb1d61e5b3f70230d7797b";
-  sha512.source = "4e176c1dd0cd76476877d4cbab61b177c96c22035efba17b9352963af36afc243f21fedbcf341a7d5f806086206322f66778d7d51866c7dcd378a62eb6bed2f0";
+  sha512.run = "ffa12f631de025553c73599afa0bdd0d8375e2d49dc3d854ac77135e8eb80e2414c36139180d81cdf33c855f42e1d500b878835275c5beba6934f1d8d08a83d5";
+  sha512.doc = "bb0fa39567f27db49ed091add238960ed5b1ce826239b7b6a1dce38b8a639b98702efd325d651f11f1779253f0ebcdc894a7c0371648093cfe0a43764421349c";
+  sha512.source = "2d1ec9ee99900d42ee1502ef3c3f1e343979158e94ba7995203f208a1e4562f5f26f4ad6854e712bc8e540327e8f029914c66b598381274131dac0dc97f43700";
   hasRunfiles = true;
   version = "1.7b7";
 };
 "japanese-otf-uptex" = {
   stripPrefix = 0;
   deps."japanese-otf" = tl."japanese-otf";
-  sha512.run = "dccdf9716d6e97b04e4d67d8770f216c3e43fd67766c01d1778e2167e7b2d0bd185bba203349af4d52eb1363a06e7523239f828ad95f9986d40cf76cc6955a9b";
-  sha512.doc = "0ee1a093e1c0ab37e99d4709fea8f759609a4270064c05ae26cb7a085ab9c9b63ce11b35bb460a64631b8ebe68a5218294f096f7d402df48360436a7b74ff5f4";
-  sha512.source = "7ccd50333e8696caf50addbb1a7e76b70ebd1f5efd9b0ddbf57fc5bca96ee8be14fd5901091af0940d943b8deefa431bcfad81b63067d347340508dd41d91670";
+  sha512.run = "cf782f880913fb6835a8149a311cdd5cbca09f21101f0d785271d50ce23df545be49c841f931f7ffd6f085dfc02cd75c539be940dc55105fbd67dd17d4192f32";
+  sha512.doc = "d97c8aa5c7e548839bb72dbfe26d07be3c649d89a35d0c4b5acf04b7719011be4e15fbca365c3ea0ad3aa9b7aeee5a1d8a30e56b193d5cf6b439b81274fc740f";
+  sha512.source = "14f9b04140280e2bab5c40a0ae17af88cbdbe5f33d531ac46cec1da7599cfd4ec1eb0e2b06059065770b296e2fa68bc1fc5180ccadecb986aaff51b3aa09493d";
   hasRunfiles = true;
-  version = "0.19";
+  version = "0.21";
 };
 "jfmutil" = {
-  sha512.run = "d3b9f061bda09b929beb66c598efa8036b684b4adac288be1f062dedf01199515d8e5a357c7a462d4817ecc0a15ae0dc58848b789d392402b0d48c45cddc98a2";
-  sha512.doc = "b213f85c3c7775527396665dda2a9f9e55c02ca6e854a7297ea7283a665613340dfc14623b2031fd1b7bdbe9a2f82ca21535636edb854b5061d37f958f18e4b2";
+  sha512.run = "be4958e1bf7697e28794c88f20ce014dfdfad5f020699b94c95a5e9f8f2eee0c360c8f2035a4b66ef2381a524f61b7145414c9f919891fa56afa66cbb4a87649";
+  sha512.doc = "dbdef11ea85b1b583d52436c16a45878233621774cd11be11c059cc9a6ad54a257b2c28cff728e9179d9d220f02bda73b884f13c125492effb421487c84d94ac";
   hasRunfiles = true;
   version = "1.1.1";
 };
+"jkmath" = {
+  stripPrefix = 0;
+  sha512.run = "f55b22a4af38ab63377a34b882e273bae8d5bf7b81e2168592a5e58245d83420bbcdbc6187e6a59f4f4b119bd945fb0ef83f9673142988362b682011283c1469";
+  sha512.doc = "b51b92b3cce332c4b5db5ba239f59c2a86e898bdabc4ad2ab4ecd7a1be9c9ad6616b926cadf726a82b2b8a37b619dee23e546cbcc185b51a8e73458dceef27d4";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "jknapltx" = {
   stripPrefix = 0;
-  sha512.run = "c80565970011efe38733d275b2ac2ad4edbfeb4fa6be1767e39bb317b222ecf3f7363a556fc9c936f91bda6ae97c72727ec27597e7c77f99027414f9350353f9";
-  sha512.doc = "d5e97c3afd929944e672399905a4a464db8f1a39dacaf428d3ca066127ff16f1382af71f930b7b39a7e9be4418745134980381526474e7d9bc97d5f98d4e6da7";
+  sha512.run = "7ef3a3e6ad2b1205491035233ecbdd63550522baf22d8ef6a10d63e1564addddaee10274dbe6d62c74193d15b71356dc628f091125fb1c026daf8e3441f30d61";
+  sha512.doc = "30d6cf0847674483c9e4188a4ff1ee94ca12ed0969694ae76506b501c378355798df50cd87e8982fc626e5e323c5c721f8beab481cb1ba5821453310d0794876";
   hasRunfiles = true;
 };
 "jlabels" = {
   stripPrefix = 0;
-  sha512.run = "b13e605f93659a6c847edd2f7a6c4de3e39aa693305162a8f7567bbefd319da93075cf76c7c937c2f39c383eb0b0b14018facee0a2abdb070930ce22b74a38c3";
-  sha512.doc = "919e83269fa76d1085a99597d9d4a472019a89cd9370e6d6ccdf2dcf13044fdd8222ce17a35c2392f0bfcaadacd229b29ceac0b3242bd330d92b46de7e57926d";
+  sha512.run = "7b5670f939f812bc72fc52f7371e5239ab0f22ac8f607de803175bfdb6c9b5b7e619c5fa019d6a103d78a38440a3c6fa01245f9fc6a481dc3a6a9764b954911f";
+  sha512.doc = "f3e24f4c751ee83577e9e328d90051d05b0e3fe749e336d2587e9c9b798665f62c951f918be583b53eaf65c30fddd58943e6225822d555ae4ad573037554bb3d";
   hasRunfiles = true;
 };
 "jlreq" = {
   stripPrefix = 0;
-  sha512.run = "87939da64eccdcd7c8b814e981a1b11cb051dbbceec1fef3eee4d0850d01880f41a01b7b82e090d8ff1d9c75be3e45294c3f291e903426a0e8e792bbc12a4b92";
-  sha512.doc = "b8ef9b8f62bbe59776e6a7539a8d4a4cdf8799b25e4ab986a6117d3c2b6b14406d308da86f859db4f89a3a60d3ab8cd4e7c7fc1e103f6902747e19d62e39b2b0";
+  sha512.run = "8fb4884e5ac9461facfe8d6b5ad639806e2dbce914b6efaf522192c017b356614cc79e3ceb7a9670a060ffd906a15f8897d1d22d22155f92059673980520194e";
+  sha512.doc = "4f497a720c056cf5aa34926ae889c73ac8d665504e11c7916e8dd6d62dc8c6becd55765d641ea6dbc96adb98778fd2018ac2a4d6713702a938c85999bba146ef";
   hasRunfiles = true;
 };
 "jmlr" = {
   stripPrefix = 0;
-  sha512.run = "6eb1256b97beeed6afe3ad8f526cc5a975fd314e57d9aa1370bdc2fe94b973ab40b15487b6a1b7f15abf3be4b22fc3265d7c8e74bae5f596e31dd91cfc65a184";
-  sha512.doc = "f771fd76ab905861048f2fec507192e51cab69e64c11726939230da16c974537c05b7e26f62b611c039b18786362cae0afc642eae9fd7baa92df4aa99486e525";
-  sha512.source = "f056d8061880145573b860826924cc6e8edc13a0f8cfdcd9638eb297a47092ef2c5bbbc36f53e06367063386060cb9abf676932bcd216fb50199df77da2cb879";
+  sha512.run = "ac07998c36b782e20a1fdcf16bd0deb9e878562294888d3b551364a19f83065a31e2a06f1276091fefd3c193726e02925039ccd08e24b9891ad9ec1f503a4f75";
+  sha512.doc = "8945fcebfdc5a68ae6c4cdec98fbecd66b16a2eab4f07c84842a27b8a77249e1f1b69e23882e81923a4bb8dd22f8e8f2ba5f3b9e773476733866ecc59e4eb526";
+  sha512.source = "a28adbfc3edec772297af1428ed90c7e975a8f4dafb6b80c35fc4fd7eb223881889dcd89961805a238fa4a501260e2c9dddecdb60461ce9b817b184f2f7317df";
   hasRunfiles = true;
   version = "1.24";
 };
 "jmn" = {
   stripPrefix = 0;
-  sha512.run = "7db8baf376df32a42bea851134b0cae82e535afa062be72f03dbe5177d650729087a91415354cb41aafb7ffba006c4e51a590026d4b880284e6180350d438968";
+  sha512.run = "e3fd8c8bf6e7a7bb5d7f18a134fc29b4c390bc1f5995007aedaebd08e1747bcfafd7c18c343647bfe7a6f1bdbcc7529df13427a664ff33a3aba6716472af3549";
   hasRunfiles = true;
 };
 "jneurosci" = {
   stripPrefix = 0;
-  sha512.run = "aac970fd8e844b0fd12d369043fc2eb5ddb2e0c30bdcfdd3c31f97ce6a7a4ddbe80136b2e7b1d61104696f56a1a8df7c375bcafd7bdf70105d2cc3e83091196d";
-  sha512.doc = "0df176afc07a47fd71c3b3081fb468a77eae2fdb2755f3d3a07316fd83b36c3cd232b2ab0f586edc8656074c46eb01c5d136e70d7be28bd00631dceac2e65d10";
+  sha512.run = "7ac58a7715887e8d61f14e8bbb9bd7d3b03055fb69d31368e204bbb13eb570d93e76f9dd0ecde3c8cbf79819d31f160a6c7c5a6a23edce38c336c8fdb2834265";
+  sha512.doc = "ee1b93ca02d7a1d8b0ced845411b9d9e52fc39ad331e0fae695c1990754b52419febb6d457379cd148aac3d10568b69cdae531f1654004adc4f1cbb6cae1809f";
   hasRunfiles = true;
   version = "1.00";
 };
+"jnuexam" = {
+  stripPrefix = 0;
+  sha512.run = "aeb071e5cc657bad587260cb24395aeefe5f18546a0baa3044cc0d94e8bbfa1f3473b9b912f60ca6c93299e1fbb0ad4f3c3cf9c5a9a892724413b01e030813d4";
+  sha512.doc = "14660c847ae27feb8adad479d061d7fc266a9e43a4c12898f62200edfb4bd6137570625b4de87be5bd00a476bed0f2182a215c092ca503f30859b3ee103cd7a1";
+  hasRunfiles = true;
+  version = "0.3";
+};
 "jpsj" = {
   stripPrefix = 0;
-  sha512.run = "d8ec47043c071d817e76689e451bff8941a52fa91d0fb095fc02984b712503715b855956b294517dba5e6db133e2dd3249b20265a57a92965d8f3f19ba953263";
-  sha512.doc = "7fddde49f1e1ab1d0272d7b3f5d4293c7b54ecef209e66657e9a1fe1e35e997fa6aeedfdfa824187284f7cd684ed88fe78afa154329f6ad03ea9c99a0be52c0e";
+  sha512.run = "cd6ccf7f0468eeef89592d0bc439c23ce396f39da63843174d85433a96297c8d311c000424e44a17b5a0214c6e8014b09b3ede56567f8f383a634517d7b324fe";
+  sha512.doc = "12ae57efffc699a5a62da79608a058654577100942f15b7d840c18aa61c55e87a3120aa224ac5fc0dcda42a4af81ef99e72b6f57ef77cfb0ab9e63228b1e7227";
   hasRunfiles = true;
   version = "1.2.2";
 };
 "js-misc" = {
   stripPrefix = 0;
-  sha512.run = "77055cf3d8073f56aeefeeb283aab7133d8c7445ff0fbd94eaa47b8a0ebffe39a6d975bf8e53445383b301fce9eb79ec0f2b4091a323c02c784614e2db3b1625";
-  sha512.doc = "66912d191bf3937445bc8ead5d9984211cd612e1a5169b883cec945bd7ae20ebeeb28bc9d6798ec30df63da50afb29bbd0f633573bb2e14be10a6d30583fd3c1";
+  sha512.run = "3a72dd2466bc7fb1955a52b17f0f7ac2d9a78c5f0f1923adcdc32707651f5b45a70af24df0c543230882bdc9d5e3332862e66a3c041fa5271d2c2c7f566a8621";
+  sha512.doc = "0f4f8b7029219294445c5c78128ee8d4a69e8245367c30142616aa4756cfff7eef172d01cbd921e1eaf0590553bf96da87b9d6cc5c83de7f583dfb202e328a24";
   hasRunfiles = true;
 };
 "jsclasses" = {
   stripPrefix = 0;
-  sha512.run = "3e96c973b8b88a4a00839717c31b7c9015ca03832230276b0caed70fba00f674abdad0498b69d9e2cb929ec3861b781698313418de2dd35d3a81df71a408b175";
-  sha512.doc = "dc6fff707945505aa57fe04820f6b5f8cf2b1021b117d7c4d253cfeecb828ec438fc0ad2647fae467342afc2fcfadfb97cbcfe07cdb2c59b36f4fe6b47f501a2";
-  sha512.source = "7e77fa6c4c99048d748c8e3565714f04beae665babb538dd476f3f06353975e34d5b42f25e55641d07cf5a91ad35a53d0404dbf6cedcf5469a19ec553bf81626";
+  sha512.run = "7fe5c49e217c74a9b1d4426925732eb1e9cffb67a72e9030b7dcfeb9b81b95def7c890cbddcbe98f94f7a7891d1c88fae840e4336d48043c195f2b0251054757";
+  sha512.doc = "a096a4d53ed72db6ecef85b03079181a199d2e477fb748ad39febe6c5e4088b959dd7c4e113afd28c329f6c3ed7a1b488a7ddff056e103f62c36cf6995e8d610";
+  sha512.source = "ad4c999908f2b133210f4b1c4ca2128c8680c12e8ef4027c56e9661d0019b30105801d8c2fd9e2fc539e7ed1650d5d4ae4bcc774fe637b3c2934b5ea43159eb1";
   hasRunfiles = true;
 };
 "jslectureplanner" = {
   stripPrefix = 0;
-  sha512.run = "c5553387cd5e9945d27508e27737f4b4ffd1ea843f9457958bbf25252780420855d786d44ab804c3a2af875ac7d215e80c23925e520a52362e2abd822b3464f8";
-  sha512.doc = "c6c55c09cd3b80625261af2db915fa6ed7aa73211cca93d3e98630befc0f1b977e426acf2ef94e7d22d8a3bb8ddb5d3ff5dfbc38bee07621054b1083733f3d9e";
+  sha512.run = "b43eb4bd90de9e52b0bf4ba6faf0b2a7b090142a3d6811a4ca2d8d5b9ff44bbf683d8a3eba84937c5f943b475a5c969e547dd2fa563ff0fa7fb80e76439c12e0";
+  sha512.doc = "1838bba7061615414c727c63c21292471c787f1caa5febfba3afc8cf394bad99f789ec0227dd1cf89f3cbb710a918629d914220c828f315c6bd50b06ccf1aef6";
   hasRunfiles = true;
   version = "1.5";
 };
 "jumplines" = {
   stripPrefix = 0;
-  sha512.run = "43302281f9d0eda31fd8bd71d37cacf708e0fbd270e461554c0698371fd91c50dcea9741ebcc5b8908d3189770cc0805b5e3ce21b517ad2179edb2bc6ccef67b";
-  sha512.doc = "5b4fe10e0c26ca43f1247f4fb2e75dbec20a797fda33aeffa02a8de8c6a2404431a47fa52f4db3bb8600af1f018a86c4b886a19540933beb4c6f854b3318b75c";
+  sha512.run = "e4835d45643351542959f04ea57d3cbc1206a41cf06be96f37ea5c96342669992af62f7512cc28b415baeb2f99ef5a14b7ec732eb2bcf3c804de3df573b1b6b9";
+  sha512.doc = "8351f486e852bc1972b5385524e3de6fe20a3db916800d5bfd50c57be6bf3c67665ec00694689e9f463601f4fc15fbcdce3dd34f0e6e2f785ce6277c4ab4c286";
   hasRunfiles = true;
   version = "0.2";
 };
 "junicode" = {
   stripPrefix = 0;
-  sha512.run = "1d8458d2c9be36c9fe5517f5534e8585e9be7726010108ab28e77dd397b6464d5fead143b586fe9d817ddb08897d17d559adbeb54299b9b4ed7cb956f1a4500f";
-  sha512.doc = "afb255b666159c46d10ab1d206cb78acebba423e795ecd2de758885c9b008de58396425e8416140da412db55e606b15c20810e0beb38ec9b9143ac99b0cdc8b5";
+  sha512.run = "333ce889518880d2eb9af9bc748536c1bd46288dc58b40590c45aaab6e3faa72bff29f30243b89a5ce0dcd3be71a5a7f6cc720bfe622090bc550f7a0ada25b21";
+  sha512.doc = "d7b2fbca2e4bffaa2742eaa541f3539e9351166a5205069a1e5d8ac18929a32efd8137261b71cc457bcc3ce185e39b6d5cea2f29da3731d755209e4b848689b1";
   hasRunfiles = true;
   version = "0.7.7";
 };
 "jura" = {
   stripPrefix = 0;
-  sha512.run = "8332dacd591726bd35cefb384b3040ba13928890aae281eb51386646958b767b7025b118f5f06d1d318f3443c51c18ddd4131e350a2e763ccac0d75f3105556e";
-  sha512.doc = "46c0c3ab2c12bd515829f5483b35e8d53365c738be8c58ce304c74fcba18d076188bec166e2834572c49f56a4c74db57d00c8e3ba42c5dd4d67f91f87cc67489";
-  sha512.source = "23e20d3c6a67da1211694b1ce6108001e9e2f96efcf6511ec773ac9b191b0b6b1a3e0d07b9491c903f21c0bff412cbae67946319860a654438ac1aa10c838aa9";
+  sha512.run = "d24bec6792ea9add04f124a3255d9a3ce72d05c010291b4f0680cc74277cf867254c27b1f275e079f00687dd9143ac98c9ee73bef64726dcbbdba242b2a9be32";
+  sha512.doc = "783c4d835258f56b66bdabe6ecee7942fc48dd3c9ea68fa43301396ce0d90a02f8c6a058b688ed08039d2bf498c525bbe4fb031de71c7c45566d70f0cdb3ba45";
+  sha512.source = "d3da1019c3d122ec259d5485fc2d529d4420e4668436de68592fdb85ccba1e5e395eb29d9b5bc1cdffcfccea759fa815649bf1ef1881c28523d7c1fd09032d99";
   hasRunfiles = true;
   version = "4.3";
 };
 "juraabbrev" = {
   stripPrefix = 0;
-  sha512.run = "b4e1d39be1ab5a7839ec7e86b345067d978eb16316c0d4670232aa2373a40ce262135a8fb2869041fe97bbb615c2424ab61111a616e9cf8086248e7216000b65";
-  sha512.doc = "a99307d7bd16b6513e63fa908c662c155ac459d4307b4e392d3bd5684b381a794b99082ceb5fdfb3aef4862151f825c1c01c1e0e42c5ed5de383b224728b0e90";
-  sha512.source = "769917c6e47b0ef6ce680d15efa7711f46f903a680498447e52b6675db43639b9364a517d9046a47c5d517a28ffca3e6649919cdb8d82448760d0add245adc95";
+  sha512.run = "a786d90596555de4d9a709a31e29b18697f6d8530ac5903b63d49fd5648e55541d0c6a647eb0c9779520093f9a7f1e90f7cde95c6e68d3c82feaa79db156af98";
+  sha512.doc = "c2ac7476da488de1ee416b5e6b1c9a18ccbe68de8b45c16cfb683cc636ba30ca39b4c8e6074994ecafed61968e3507f9c9864863ad88de45d86089754b1967b1";
+  sha512.source = "42b741093a194a310065edfd10190dc11ad947081c1e5feee24bbcef7f464435cf682712d05309e34e4e0fe06b13c78175198c056cb6185a4b3b98bedf64bc7a";
   hasRunfiles = true;
 };
 "jurabib" = {
   stripPrefix = 0;
-  sha512.run = "3cee6133a75b1bd487b9e98f42c8a46beeaada6ad85732f84fa256831fc2ac93c580a9436af53bbf456e594d40bd91c661803f80b59ea1c74a7965f9191aec88";
-  sha512.doc = "73a3b7abcab1f98c7db4d746933aae8f3a3a9c63137454e5d6f115d2636cd923074193a532f605ba95eba641a5e8f1ab59b530e59b91c87b22b1b13cc38a16cb";
-  sha512.source = "aea5eace6f239aaa9606d35afdaed62659abbaa198c2ef80d6ddb2908032ed8b1cfe329d0c40e9262ec7d268d2e699c211168d0cb5997833504ad8f32afb22e7";
+  sha512.run = "743004ff65680a2ade98b36b01425a90803b048627db44370495fef410a0cf5fcc51b5222f6cbe041b927e41a017001361cbf80bf2c7eb532cfd3c7fb075008f";
+  sha512.doc = "66be347fa123db6b16b1c997a9df96a438ade06e764b68cbe5ec5b4fd4cfcf97a1f345e017ac776734f506e0b04792aa1659391bde3d275fabdbb4ab5a2776a2";
+  sha512.source = "e705e5fce178f2fe58bbc746bad4328642cbe6f6e7ec6e62f53f8df5d34f1ed976e28f59de1fc8efb99fa064e0475a4c2e83277087eb022cf0db58a1e280ffd5";
   hasRunfiles = true;
   version = "0.6";
 };
 "juramisc" = {
   stripPrefix = 0;
-  sha512.run = "a452942275b7e5e45beecc0ebe227920f542619de3e7e998f19262f063c257183548f9cf8ee32282a6d9cf20450ee0f95c9e1a6f7a5e205e781cb3905fdbbf07";
-  sha512.doc = "0f3de83652bab4ba137d3d1d1a3e5fb18f2c222faef4de305a79a47a1a09cf00c1944e676330f6e44a8e2f5b7a1aee8b8809d0fe760deec227e6ac3fde53f999";
+  sha512.run = "8d98f6918fe761a37f2e8f8ea3da8a70dcc7ef7231739bf54ed47b693e1d813e7cac02e3df8fc56651d9fe0018a60543504535901e8e1f455f2ab1feda1da6cf";
+  sha512.doc = "1a0c376edf2a53554bc5772890a2f2d2ad129bfd9f788fc6a7b0700c2c425700fd9d3d80e0b7efc9ff36475e4363d94a7bde2edd5d19579854ed88cf6abd210e";
   hasRunfiles = true;
   version = "0.91";
 };
 "jurarsp" = {
   stripPrefix = 0;
-  sha512.run = "e6fdad9b61498ddc3a9cf485c26f341bf7f79086acbd7a40ddda99de8aaecf0a99d69282220a96e3474ec0a39b1e7f365bc0bf2f9352e21b730776d791f268c7";
-  sha512.doc = "721f3a573133e3f8c41c33f5a96bad91cb6bfc1970a60a3a8e573a2195db853ac33c24c9056cd033204c83d8623d14e29a90715ccb02841786663b3e0de9c6cd";
-  sha512.source = "57e6306bbae5ec8ce5aa8949dc3e3eb4fc5cdff80d3ebd00f2d74cb208e18a13c6cb789e8ee3994788fdb0392700bd98598ea151bc1735f993361e090658b9e1";
+  sha512.run = "61ee03cf2ea51772f96449c6f0ca1c3a65a5914a8c8b0bded9f3c4b2a74de06838f1ce53d0c36cb6de6be9b58ee6433bc86b8869e426821948bb82599e68c598";
+  sha512.doc = "c339dbd71518579ed5665e343fd2508c5b1fad576160a7f56082fb335a08cd40a3cd75016e8c6949784da064b0e1877120c741671beeafe0c06533e56e619443";
+  sha512.source = "1d93961c50dbd95f2e075da63d960bf16058edafff41d9f23c6c6bf26f78ca717f05459c52b4f6bb2df68557afbb4db459e5d08241fab37bd4074364583cbb61";
   hasRunfiles = true;
   version = "0.52";
 };
 "jvlisting" = {
   stripPrefix = 0;
-  sha512.run = "7b642347a716b54ef66de1d05025a2dee56ba6cd48dedf48a8d3a31c35a2137ea79e6863cc81c714bf529ece827714b850e3e2b6eb9f8e4c8d9736d21b4fbd23";
-  sha512.doc = "fdaf441c19573ec1285e2c127035756b16b092ac966b5c4549fac84ab527f4e72ad90949a30a53eacf8e217de66ee8201e15a56c32c0246f4d79a6ce8a2c8422";
-  sha512.source = "b2f4f459f53b778e03bc0bb1047ec86be969b636fc609fc297a77a505dbb5fd4ff4950df790cf24a50a14639bb0ba43cbc319aebfe57b43606fe8050f156ab31";
+  sha512.run = "e2d4dfa09a23c94c39367056db32a36829a96ec9ee66680650fc543e4fbf453c291848265bbeaa6820743e5e7b4152c6716445d9730c1783d84693d56f2f81fe";
+  sha512.doc = "5d2e61c410945696b11fe5a86a14467f96ba2458acf4ed199a3746fd3e4f828e859af0bf52383485fc01a7f0207f9da346daf596ae0c46cdb5b64707df69874a";
+  sha512.source = "7fe9b09a857aefdcf8d545cea9c20a51829dc174bc85e875410724249d3e6c13e50736a911f287906c64c315f685194d9f75663ce7991e4f48169498d056ab1d";
   hasRunfiles = true;
   version = "0.7";
 };
+"kanaparser" = {
+  stripPrefix = 0;
+  sha512.run = "2f8c953e807d7f5ad5bcf6917579770253918217e054983f1cbb261903b2afbdef02136a85c26043150b766662f7711b234566f7dc13f41c1a83c99a1acea8c0";
+  sha512.doc = "22c236134ad46285cbd24ef518da1eb05870c7c2d3f12d59498126c30faf937a673cbbf8b6aa4f1509efc3ecdd1ce43ba42a91a50892e46cb7eb0a5e3dc8476b";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "kantlipsum" = {
   stripPrefix = 0;
-  sha512.run = "439b1004dd357fb785d2c142dd677f2c052a8364ff727f86421617748aae50d8f14e47227179bec4f1fd69329d0c04c9009d2f3bf8ed938b6a223a264ae35050";
-  sha512.doc = "9a5332e29aa9a1d48757519cc3e640d487bcbb817b39ed976e848c3919d08ab56bead8e273cae1cca0fca5783ec70c010b0a11d041b890cb72c05a144ff7bf04";
-  sha512.source = "3b3fbaf8f67bdfe8ce2e5365886f5602aa82caae094f1fbd21c7871f4fb2d064ddef45967839ac8143816f21cb726aa303e55ad7a9dbf5dbb5228bc294bc115a";
+  sha512.run = "c50685b94d882bc338f1cb63fe0e70ff1189f204edffc13897a7afafa751ca53be9227d28fbad22596934b179337f80f7ec6e6c05365b52ec9d58a1727475027";
+  sha512.doc = "8bcc6cc805bdecae8cd321c08fbc328478fca10c20318e2ac981ee53736dc3f8b2078af60e3135281ff49f232bdc65b1efa64b62e526fdffeca4a63d79cf8620";
+  sha512.source = "8d155c20bd92c9e0b7146fac3f09836b6e5167e1c0510ffdd85f16f09d86b9286c2554451da780a2667c099283d6c885ce0daca092834038928fb91895b47444";
   hasRunfiles = true;
   version = "0.7";
 };
 "karnaugh" = {
   stripPrefix = 0;
-  sha512.run = "c14a8fe909471244ea4537920f5c611c41763f3737401d5381a51436498b208a716fd0a9b6b4393be195450744c1284242c73a7142138e4db36b70e515fbbfdc";
-  sha512.doc = "ab6f9a33e82907d1608179a0f7ac7fa816511375da13a6186b9693615ee63bc5808a59d4ad3e27c1a58f7698ffcd7899c656b2ee50cf8e889ae91575a9b40003";
+  sha512.run = "2f9c2a53bd62b93a53897b2d52d97f8067660b5d2735927e7ff19eb9722bb41b603cbb5c120655453ba4cacb63ca3907fd6f8ee8b925eb0a3f62905b361a49a9";
+  sha512.doc = "05d6614c88ef2aec3abf9b0a3ec5793a7e41560f93271fe9ebae7ffdcc1549f57eebc60987cd40549c37c7fdd0dc5698065993d33e3f6b0f524587e1a14961c1";
   hasRunfiles = true;
 };
 "karnaugh-map" = {
   stripPrefix = 0;
-  sha512.run = "339459c4e196a1a6513e82637718527b4c854b1c160dfd867e18a2095f8e954bab22c821439c7db6de309cd3cb4daf93f42dec9e14419e5a382b51df67aa8bab";
-  sha512.doc = "9aa3be0547a9117fd782db05948ce2bdede570b3fa85eb91816d9da02a50680c98c3adb556fc9c030406d5895da4dd7ae878d0fd8dca179e3937ca10432e1d20";
-  sha512.source = "22580b1bbadb522e070fbd0fcf772a8bfcbbb997f0e456746eea04a68d59cc90624027446e1d34b5170a870a6431692f84e24890d000ee7930ee9562c0645af6";
+  sha512.run = "2fc65deb57c29a490788c5c6edd8b8e56d2a4646535e45997140f7ad06eacd44e4190fbb6f4a988746df732acd0448c98b9ff3e01849cc2df635d89b26f10913";
+  sha512.doc = "1a39b0c5e473e78f2a367ed967382b5dc731b10a864735b25ae6c10e95060a2156514c2a3819bb5e5d9ae126e135683dc461e932c945b38f379195cd33b6d385";
+  sha512.source = "0d330660d0f8d00d38bfa8e381dfc478169c862e61ed380d2735ff4f431ed52d5d97221da2fcf66edbf0005def3e69ae62e889e5f42fad7165c9f8fab4f5d4f9";
   hasRunfiles = true;
   version = "1.1";
 };
 "karnaughmap" = {
   stripPrefix = 0;
-  sha512.run = "55fb50f5c7364fac8d5123f7bc0cac24fed237a24f7d8400e42e1a4e436ac77124a2ff6f4744ab3468a81554cc8a8f771fe5fc762a5260363179835e40fb67f8";
-  sha512.doc = "7acb8a9b39e8cd3fe3ddebf5a85d11dceff4fd297d7dd2c9db80761a22d3eb010644b17b278ee11f453a02ab466dc4400118455da54922fb19ef200752a8cab9";
-  sha512.source = "a570675b2f3a7499123ad59daf701108b3f31bde6103aea98e1c4d4317c302a179f52d90e7a2bafbc1c32a3c02fcf1ec40437c8fd1ba5555c533f384d54c1eac";
+  sha512.run = "a14d21719011ddbf2735356ce4685c77973b6cfba02a855ea05d7a35f064644b1e730e6fb1ead02034957cf8651079e677ec1d96ee7e33e2a7683a4e968c5d4b";
+  sha512.doc = "f2363bda04a596a2d7281ad98f7e6c2c79b7ee4b6bb2d838740284df78266c9ccc7f56e0762b9ef8230be668b80bd39dad9b98de7c537f815ac090e5b195efb8";
+  sha512.source = "7114c3b579d5f355ccf85390fc3dbb1dd5621dc33c0ebb863cb947109a9bb6b9a120af01078e8e6ae99a4f859c7d3b2e5b0e191fff50d224680a9b701d5c065b";
   hasRunfiles = true;
   version = "2.0";
 };
 "kastrup" = {
   stripPrefix = 0;
-  sha512.run = "586e7eb3342aec8c8f5b7a1fcee3a1f11b650152808dc9824a2bb213ba25e139ba66404fc26d87d9f456d6e9267f222d933ddd73ee0f9fd612c638276aff98a9";
-  sha512.doc = "19f242b2f3ecd80cb03a60aa33a05756e515af0bd9b410496f2ee2db8ccc00d250b7e91804c7d7a7b78c887fd308c36386799368fac7bf4418f86e427c48361a";
-  sha512.source = "d76e349e0d57f5ed7d2565f5c3374f040263ac8cfe566654b3f95d764dd349ca07bfb90e7fa42d51b07e80c4f927e12f8dea90d5bc4ae177ceffa1edd721fbe9";
+  sha512.run = "e9eba3a9901e8fa2edcc7b2f12cce2a2f3b5854a884e163c04ab01bf38833aac3c3f03dc86499f6b08ce7a4be5045d578ec9de9f057f20d32a0f7a32b003f248";
+  sha512.doc = "09dd54c1203787c9fbecfe021f711a48c3b43528ff1ef58d1f3919a2e053a52a5ab84a594392729ddd7a2e18aebbf52bbe86d4c245d190dc3106de5c087e1b59";
+  sha512.source = "e8cb85107baf55653de215782835617cc3b27ff858341960f948f5998ebbfd9f208c23a93ca14758fe876205e1681eff8e937ede3f0335901c4897537628cd81";
   hasRunfiles = true;
 };
 "kdgdocs" = {
   stripPrefix = 0;
-  sha512.run = "17f95948cd33736c394a108b2f54095574bd4ab8062bf49823de82467595614d1fd6de3b10488b3a7173a881ffca4213986c2565fd12fc7563f5f1db029dd7cc";
-  sha512.doc = "097d9e3d82f4b07213bbe9b5b49d7c0a93d2f381c03baceb88f2c04ccb8fdd9a4bde9a876381f48b24352702fd9d9814d77e6b9ab977e70cd6a221649891d15b";
-  sha512.source = "77dbc37044835b96baad878189d9b97a0b02e40d638914f184ba6268bf37a4fc36f3bc9e570720ca37ea11f7a5e91a8eb7b118c675d01ddee6b09d83f6afb59f";
+  sha512.run = "06522c8bce7ea8c4825563bc3872b6ab8a37624e48c3d20de26c210e1e779bde7047b8da215f4c39d0f908aeb2413b1ca1a2e6141cbb1914d8f4051ee8723b10";
+  sha512.doc = "371791acc5561d20bf459ceb51486ba9d3c8d8e47c39cd99e0fc9c0d5dc85ed1bf5ad98be4c6aeb6b5516d60c799f8c1cc8f2a63a34c41ff3fe9a19f26a16f61";
+  sha512.source = "d0d99893464f8c80d2b044bad065f47d3132cbf4679ac08849855a25aa0f853b1228375db86f2c4a67f2b9df037418160dfcdc6da33bfdc7d9e3742ad80a83fa";
   hasRunfiles = true;
   version = "1.0";
 };
 "kerkis" = {
   stripPrefix = 0;
-  sha512.run = "803f032e04def3a04778204c49d733e9b2aa633fbc981795c2c47018456204af051b85bc1d9767c1917e1137e1f85e5e3a5bea26af130d49e8cd543b0c651cb5";
-  sha512.doc = "1356c2c1db466845f653d5eec8233a7f3171e92d8f6e4da2bf4c1e6bc16b784e06a948c9b6ddb7b1c8820e5771a8543a24df70e67e501360ec2264f3acfce8ed";
+  sha512.run = "d3fc4814ce8dcf203905ac6246443167746ba06d4d900f68183f1fbeabe918c12062ccd0dc8005b7667984f9d209a3abd41c44050416b76af8a98bbf49c8d691";
+  sha512.doc = "35526824bf43cfbb24a8abff713310c51c03ff716eb8bd6496d28297a74dc80d88e2c9b407a16ce79e342c33c914bac15a9dd26a821c58e95299a751db4c0eb4";
   hasRunfiles = true;
 };
 "kerntest" = {
   stripPrefix = 0;
-  sha512.run = "e471662c127d4baaf3daea783fa7e465066f2068ad1e1b3aff3a416856466d5616c6673c3b5c90490ea034bea353f28fcf11f66967788e2a4ace8c397d5bfac0";
-  sha512.doc = "73d53dcad00505265c86c195964fef191287f4873bfad87cb7f9371bb66297e8bd8f41f977eb7e6955c33cc9cb2a628107d589e251ef89dc90181bb7d1401105";
-  sha512.source = "2d54427c5aa1f7e5c0a5404b0595c9a843fa578354969b5cd58eee6391a73d6268d173fcbbc74adc381a2d8d3e5c0fb23672060cdc40dcf094f824bbd53cf098";
+  sha512.run = "e8fff2f03c74390e6063048c5097c71bb1d10696966767f97ee854e64b48ba9405f79a7db4b4b557abca50c73a993342ed471b6aee4975db54ff34d8a5dfb7a0";
+  sha512.doc = "81f9dcd232c158198fda7edb8f82b307253bfb2cfd0d41abf4cf688652d53285cad0c423eb35d9abba047854f3d3659bd9e6f3182767596b56673178a743fba0";
+  sha512.source = "50e50573dc409c5829e49f2824b2ac252efbebba5be2dc4f6dc0565c8af28d1b310b1f2657a96737a463b30db7e184795e3ce7135dd1ba1f5eeb4e9d9747c665";
   hasRunfiles = true;
   version = "1.32";
 };
+"ketcindy" = {
+  sha512.run = "9bed0d11addf5ae8b0758efd0df56f9eedbe47d018d071baa4e320a3663b1643d12bc9bce6f1e9695ffc98b68aa9a5263110c4bd283dbc7321010dfb01c3f3f3";
+  sha512.doc = "2d57b99f560e7ea00fb907a5b97b0a1fd89221ce390ba296f8cdff99818c997eeb9c70d73a87055012ee2ef75fc8f5e4c98e582a2e262a14c8acb3e97ad42f88";
+  hasRunfiles = true;
+  version = "20180617.0";
+};
 "keycommand" = {
   stripPrefix = 0;
-  sha512.run = "9b61eea1afe852abeddb8564d50e9f0e0bb24b1355a490f2db7688eb10a9c929c4b57d9eddbd80de38365085c43a265f2e29a2fbf363c6b48117229a40208fc9";
-  sha512.doc = "30397dd0d016aa57a9eff122cbe225326f47392ec3b50ab0c050e485ef135b306d1a86e6c34ca4a7ac09c5a00343c21a06fcd72da7b99134cd05d201f0b7c928";
-  sha512.source = "94fc4b2516c6f75403ce7b466c59516505e476a20d0031ef50db69767a938fcd54643a7ca5f8972bd4a5e8ccf522110aacbb5f01d038bb974447c9629cf411fe";
+  sha512.run = "b521d46425102c3b7bb30df43f2bfa5178376a104aab10bd6a7010db591401df252e90b5a56408975d0fc37cf593df2eaa50412db1ecb3ef5d12b4940b1c45e2";
+  sha512.doc = "5e384278dccaab65989918ef9027f0c7c82449ba47cd4f031fb66c8a107c7906e398260cec18f25ab0272c56a76566189c0fecd05c41920f68bcf4ffb124938a";
+  sha512.source = "ec4f05a40eb8271b8c21d3ac8dc8bccdabd68ed09ed2ec6e4cb05fa1b44a0d258ff56fa090da5850dd67237bf52433d72976872ac3833419b05999cf8b019770";
   hasRunfiles = true;
   version = "3.1415";
 };
 "keyfloat" = {
   stripPrefix = 0;
-  sha512.run = "67c52cc688db059ac60553ebdb9f9689c404d23737cb73156a7ac509a29c85fdee5595fb3d6a550d2c566d2e13286f32f63d9f520d8e06442ab6c4c5e9db69a2";
-  sha512.doc = "14e53fb0f1ffb59b86b3724348d6bd24a821721efb295c0fe8d91bb77ff8cba4f4c94622b566f27252a2e500be292fbc427eefeab241a930b719e1c14a920623";
-  sha512.source = "9644a0a76ba467c5f5c5c46a3e98cf58d9ee688c9ed32e5641ffadef981b661e5a7189064f8f47118c886bbc982538db6165e1e2ff7b63d0964ac6bf4a7ade53";
+  sha512.run = "154efbc36c5e811923b0e69240fc42a2556192320c8193acf6747beacaa224948d9720e8128a6392ce2ef2029c7a517ebf4dd6ee435ff48467e3101ee6c5e19e";
+  sha512.doc = "b55840ac3293578c155e60241cea0030b1a3bba9531365c3b4b9ec8e221e98264bef57a97a741c1a7bf7088c774d73ad1b48cb505430481390a4283df4e8c291";
+  sha512.source = "8f09dee356f2c2a622d9bbe0b8751212624eca4ceb8d1ebb18a3514b9dec609d4bda5f9139e4ea038dbaf53ae5449a2c033a502702f094fe6c4e86793049f45b";
   hasRunfiles = true;
   version = "0.15";
 };
 "keyreader" = {
   stripPrefix = 0;
-  sha512.run = "3d94825c8bedec771d44e42483be7d28167f705cd648a0592664a17cb9376c6f5927603a99a340289f4cd8f4a20e708ded36a9fb92c50df89367d2183d67c4f9";
-  sha512.doc = "65af9531ef09cbea35a5c6fa42f0ca1767904f4863fae510fffabb34d8fb686786c52423e6bca009d9e221ebfdb4c1d8e4ccf67c778a9a361f7b4275f836d46d";
+  sha512.run = "7042a31af913f95676028e185639aef01150b3b0927d56712119e1c697392f12b38af3a054880613daf06dce2ffdb6df14b3690862319f5f6d750d3f49c5fb6e";
+  sha512.doc = "8a57b1987a214ddac40dc723157f307c8b337dcb353c7a9542792910a6aa3591236cda7ccb40e14959df85dab29446769caff0c0277514170b76498bbf6f6b54";
   hasRunfiles = true;
   version = "0.5b";
 };
 "keystroke" = {
   stripPrefix = 0;
-  sha512.run = "3f9fe9af261a6be745477cfca2c7cd292c1ae5d25e07583d1e81d4b1900a1d2a687a2fb7f6962da72033710270c8803179d7f80b4a1c6f45649b26fd6fb8010f";
-  sha512.doc = "d7ef0aa5a24bbf762277556dda13df1e8b0518884d392d5c23b5fc5e7824230395c329881d81dca461a07932daaa2cbed9cb0ac6444ca4c24408fc7cd1aaeabf";
+  sha512.run = "7bc9e6f188a1993a7a7634212d8fda998cd46d95114fda74af86c4d839df309a00b992d09a42e631334ac438a307fca2676a6032d900b3cb477796b61c07cbb4";
+  sha512.doc = "1961c326f829c0cfa008654d363318d0a02993319f3ec8bf4e0dd6cc011c231a93d50aecdcecfd8425680cf0c2d397b8f770713049b2c4836add6d3dbafd7db0";
   hasRunfiles = true;
   version = "1.6";
 };
 "keyval2e" = {
   stripPrefix = 0;
-  sha512.run = "4c77f77a3c4fcae4180c54b8fd2e95da34e8805232f3f825d2b7cc9e66e33cad3dfeb64a5a4d78127e1e9b180cf3e00fdd629fc0ca5303aa6fa655a0d696fa31";
-  sha512.doc = "30cc5d28a544037a67ad62a859f108f503c0b442912dc2ed61570ae49fe3deaa02c22ad2720330bd18c03337faa87a5e14ddcebe43da609eefcac29171f44a9d";
+  sha512.run = "9d9e1a83702f274a4d9d301d26da1017ff2b7591c25f971f2ac4ebcd12277afd9089bf786cc00523378e4e06a885a47b581bce389670c1d0d9c698cacd849dba";
+  sha512.doc = "01fd04920146e44f36f9d36e7b93fb1b799e6153db8fe362f4a6014967e3ed6c14dc29e8079aa1bb49668a30197ffd27a22634e431bd447a902781d782a8f7f5";
   hasRunfiles = true;
   version = "0.0.2";
 };
 "keyvaltable" = {
   stripPrefix = 0;
-  sha512.run = "8d3cd2faf121cc43b0ce1ca64789a4bd57cc9d5c321a7cdb523509e0dec96446c38a265d3f5167c8c087855bd1423696a51f6cb135229d224e05bd250703096f";
-  sha512.doc = "a0b67c0b445f6e3ec52ad66551eacb09670975c558e9447b3ad5a478f551d7f39cf755975aa06c6d617d20e293a0ff07eac8692d9c286d8ffb32697923ae87a0";
-  sha512.source = "ec864f8a74866db7e104d8b0fa480ed15d7211219759e4e703480bd3c778621460809a1e04c02bb120a9d060ad24c19f32fc869b6b54601f5cd4e082d59162b2";
+  sha512.run = "ee3819d0690b3144a05addad27881305b1a6fca1d18dc26439f4781163b44048f5340da9037cbb4b71928d164e60c0f41df2f466de42c31f6b5b207f851ffa62";
+  sha512.doc = "a4ce06795952c880923f8c16bacc57b946d0a1102a2807b471487857b72d533d530826aa23785a8d0861092c0cf635bc6e261a3c1f7f4ab5ed4b7f5d42461906";
+  sha512.source = "b7deed320b4f1357c12db182fe33ecef53380c8b02ccae98f39fa6e2b237a93fb1377df403c136c5698c31caa8f6af006a6635fc47bff40f1f6ef0c98b89d6cb";
   hasRunfiles = true;
   version = "0.2";
 };
 "kix" = {
   stripPrefix = 0;
-  sha512.run = "7e24255f2786ed860a8127ab2c9467d925f6bfed859d44affdd4df64a9111fccc3a880b968cb01c8021672bd7c7f8c155f0deb5b7415e4456c5e86d77ad922f9";
-  sha512.doc = "ba03d9757804654f319fb610b71f209bdc1f059f297b19cbd398bd982c24908417d5e6f7a51793f4dd377918165dd4ba42028e4293507e963954852e49d86061";
+  sha512.run = "4d038fdd6b3b37fe59cbcad7118501313c12a8d19f60deab25c893595b5d7a3d82e5c4d54892ead56f89271ef3c810ddfaba7c1109c1050bb3e5a8c4cf6a469e";
+  sha512.doc = "acddef8940de408a8ebbb57bc9047ab324ac2a549401653a64260223bf845092bb0165f543655cb8b43c09daead4e8149184547dd56d14a1b7176e0dc269fd6b";
   hasRunfiles = true;
 };
 "kixfont" = {
   stripPrefix = 0;
-  sha512.run = "d4518748d99f0e044ef3c6e404e01653687014a18c90c62c0b990b943bb1361ceaf880dec136b9b51105816a63dd28cb194292f6a5fc7831e6dc8463edb997a9";
-  sha512.doc = "00045ab67dadbfb08301684c04a764aefb5264c0b6e844443fd62c8ac739ac74636b51903707a3c11841cce739f5d94334685c3d1bd5da1f344966d94a731172";
+  sha512.run = "fc3e0b2b95b7b838fc719e65a84cf8ac00bfac9c2b85fe2da637775a346ab4f8f19c4458980074b93c8e699915d1ce5c4ec0bd349e1c378ebae2421f2a47c14d";
+  sha512.doc = "c733c34c332598abfa4463b06b8c0c30437f2d4f4e8e36f07fb84ef0957cba33eb7030d094dd3246904c64be7bac5ade61fb9b490e49ba343922e986c2b20224";
   hasRunfiles = true;
 };
 "kluwer" = {
   stripPrefix = 0;
-  sha512.run = "64d96b6cb591474d27140ed45c538ba6fb17b313ab2988cab3b5a9017b1a065613ee389330078320c25b0587f092338e68591f15f9c6da251c3751761ee234aa";
-  sha512.doc = "990e10dbd736293f43fbe460462cf997fe73028127390cb02e0ad930dd875021cd8ecd232c5bbf94b623c10cad8faa9c6118b10f1aab68a825d031251bb41562";
-  sha512.source = "8f815cdee55701609315a0db55c40c706ce488f1b4b2ebecf34cfe77ecab436d4cf0aab4b49fb1822753e8c0a57ae4b0d76f3faa3824f9f7ff089160b5e8aef9";
+  sha512.run = "cea707f796ce6030d1a641185ac6640367ecc3e1c9ab8f2c316f5c6d121e934d2bf09da81bb01a9b2130c69259e828dd35038501ca1b19f90dc4f8cdd7a85774";
+  sha512.doc = "30287d921ff77974c715c95da106808f10090636f8501d091db7566d85f690a1656fca5f8115c56728512bfa04acbe74f93b4ac181fbc988fd1209e6924afdc7";
+  sha512.source = "28570669f4a8437bcab7b0810d17a9e6c8cc70fa4b3e45868355b827d550ede17cb48a70ff51d171f6f9e884e324c093dc423de5a6dd1794e0279ddf06d69bef";
   hasRunfiles = true;
 };
 "knitting" = {
   stripPrefix = 0;
-  sha512.run = "19761eda2e1c9eb4cb039929d702f7947bacf17414f7785a3b8a5332df63efb15b27abf6351cbce8c05d3fa9ef4c9b61a7bbd802adc67b562518f7d99d34ed65";
-  sha512.doc = "be2eb407c3a08eb1e2a969dc55397acc9ddbcadc86ecd45cf29c9d691df3860e836644790ebcbd24b50ff1459bb0e954a4b3c4108fd4e38db91ad612ad649a93";
+  sha512.run = "64dfbc625540a8e25e3025e11d1f3ae327e92aa3ad24e4b832414bfb4e8319dc289ff7ad29314427dcaf563e619d740f839b4bb04deedb8dccf191cad0486b83";
+  sha512.doc = "22042cfba330de899d2024897d072306577d2700cba5d33cc3d69de3eaaf36d703b7bd30f670bfae9683c8df156463c0983f0490859e110fa7ac7a2100a419f8";
   hasRunfiles = true;
   version = "2.0";
 };
 "knittingpattern" = {
   stripPrefix = 0;
-  sha512.run = "d0aca7111cd844ce2a609dd7f2e7069f0c4fd9c5aedf4ea3d6308c62609432d7a3236f5433472354f8ee6092c540c5bdc3d8bfe3a7933891c4b02e32dbb715e9";
-  sha512.doc = "29cb16f238212e0175ee5f87235df1e22298ddd928e3bf72d598d36972c5912b3e7d140261e2a3ad40214c06d96cf6b40c501c473e95e9f0034404ff8550d799";
+  sha512.run = "c497ec20255e7402069d94dd06b72b3fcdaef7d7682336a4d6062f24056cb588cdac62b73578abfd74931923cc2633eb8edbd926eb3cde6d76a4c54d580f795e";
+  sha512.doc = "8ff15c48aed895835ca2f621672c0c0421d943c3b77c27ab0235d1b346d6116f9bdf1992ae542b5c8d6e752e8727cce37fe7c5d44dde125e615c1c1a9064a306";
   hasRunfiles = true;
 };
 "knowledge" = {
   stripPrefix = 0;
-  sha512.run = "531e3d1abd910b73b2df62e519e39cd7e0f8e9eb1a94b4b880d4335e1c5fd9b3e6c2135e8bca22c7649ab3418e4d86cb57d516088c00c093ea559f6e16e3a85d";
-  sha512.doc = "3beca098cba61dc4c06b8b9b9dbc51d74c81e04f5f05892be58e9a24734798ad993d7e29e7937b488867554e32e0863f910ba247bc0cafa6fcbeb690a39bbfae";
-  sha512.source = "2f325910ee7847f76976491b45d40320fc0cf8fce0b86e0503e3dddbe6882d5ff8426a6e4ad9d7c75ef5f05f66b903c3b1bf6940e4b0096901463e79fa958f70";
+  sha512.run = "defddfd7435905e12f24620484a13ad0f5d15e72ed9053d9ad746666cba9d13429a8493b0c64b5bae8b606eb2926f12766557709cc13e237c9a750bf14521d6d";
+  sha512.doc = "f1c4287f7550965a894221d6fb2954f796ba44fb5e99dd5df011761fc1b61f35171ad5ebf62ca302145511f8d51da01c7c687e0c4030a1963fdf3e74a076e25e";
+  sha512.source = "d1babfc870c948f1438c2f4bb7f283e793319f59bf8a13553adab3f0347edfb8f8ba45c413060b249d3facb224e3a0c2ddd7b9325ba3d17ead6a9c25518eb13a";
   hasRunfiles = true;
-  version = "1.10";
+  version = "1.12";
 };
 "knuth" = {
   stripPrefix = 0;
-  sha512.run = "d88c54cba55a90032074a8c9cd0d254f4d266b2e4c29df041e94f02e213e3cdc0ea4b9b54b15103a567c3c079a8ba97af1db8bb16a2d348df98b812a601b78d7";
-  sha512.doc = "4b8fd3daf7f0d1bfff7689d381583cf47c71b4ab90423b8396710588fc1a896fce6bfad265623b6e2c69766a6ac818ed44ea9f935e6355914ed96020604b37d8";
-  sha512.source = "d28eed39420d4ee39d1cef128aa53ef30fec76ecca66d690b08407d88d0ea4366c510ef7251eecce566bd0e256205084f762e2266a54fc8894d53bff5ffa96ed";
+  sha512.run = "d5b2d76e329d483e5d438c2a6213c6c5d39c2a9c38e7eef6c14321ed63204604a898e589e84c504f2a363ead6aa51a9e650531466be64b49477480fc87779563";
+  sha512.doc = "99a914151d7dae014f881c165c88671ca374a29d3f07f7d9863e552230ba5c037324451f66c5c3b06026dc0e22417cdab05bf6eaf2324ca8a9e79d61746482fe";
+  sha512.source = "54c7822c781063fb972ede26f9f7bb4eea5419bbc4d295fd3d5c080affdb85bcac2312c63cb493c6feeaff32321a8af11d5febf9ad33a8489125e4d59d58d772";
 };
 "knuth-lib" = {
   stripPrefix = 0;
-  sha512.run = "6fd8cc9fbd95b894231ea2d0e35444bf9f86e2047f91735ef3431eba4815f36544510249c79834cab8cf1588fbf502c9363edea5065446757fd8b9c035ea747f";
+  sha512.run = "f85a1042504d410f7f3368c939d126fe08af3510d148c5e9401fe946075c71e91c1f980f0cb734708cdb37213cbe21b3b6eac6d9618e21002af9bf88f262488c";
   hasRunfiles = true;
 };
 "knuth-local" = {
   stripPrefix = 0;
-  sha512.run = "1f8e5c14877e803f9e79a0c0de7bd5206955150a68cdeff0cd8511ed0d05f1dc2c3ab84b368a1f5c3b3e05903aa05100ee8bc2b90361ba953a75aaec8fec8e0a";
+  sha512.run = "7dea5d292c44c4ce60576ae9bcb7a5cc5b6739994f635b6cace0494c2c1a77561e9695e24296b30db83990481a665a581a97182c89a8656374bb80c0ef4e4309";
   hasRunfiles = true;
 };
 "koma-moderncvclassic" = {
   stripPrefix = 0;
-  sha512.run = "b69bc101daec091a6ee3c9c572f355ff8698a81ebbf938a167e4e8861916069ab9652a9e02f39b162b929a41a1fdd05b26e04cf4b80593426a3030daabe6aeb9";
-  sha512.doc = "824c2c4b66d107341b62ef9b0061c2aa2f4da5f434482b9de168bade66b739c27306edfd188916d41d73bd561d8051753953c463457d8e2de30c3b3fa27aed35";
+  sha512.run = "55eec1674ada0edc45bd5f792def8511fb61730d086f8349f0cb459964d550572ea3b01ac6bfdfad9be69bdeae4542882e8a2e5c2193f4fe8d5c9c443a03c91c";
+  sha512.doc = "080b602ea8b1b80452c7dfcc977c2cbb973ddda8cf8fb729bcef9ba78bec8096797f4c3ca964b7694b3196e5977f40574c96fd4ea9cb098e407df0aed5bd1848";
   hasRunfiles = true;
   version = "0.5";
 };
 "koma-script" = {
   stripPrefix = 0;
-  sha512.run = "17dd68fa26f5e7a526ef3180ecd07848daacfbc7c2f2b851560b2c1579a7d34bb413343a9b2addccf74b54790613ac69a25444bf2b1018b5cc9516cb60e0ff4d";
+  sha512.run = "8cea49a94e11f945e8af5095c5a9bd8d4cf77f7bde06fb9d5b724ac35e269f0b8e780db3c049df357b269d4e24a61812e2935a10b3a12dab92e0f8258634bf53";
   hasRunfiles = true;
-  version = "3.24";
+  version = "3.25";
 };
 "koma-script-examples" = {
   stripPrefix = 0;
-  sha512.run = "9fa4be29910346b58b32eff29b5d70ee0eb88fad43e1a5128d3b55d97d4fd78780b80d03ef8b3831ca53062b4fe5fec46a64c88a59979b5a432c818c5181db6b";
-  sha512.doc = "2181447cb7f62fde400d1c982188da82da305aee85c6f072a18af7f65659d95d220f6025abbcca01e7bb081eb328acad785b220d49bc213cfe154dbb3cbe1ee6";
+  sha512.run = "0723599b64a4d75a27e6850db2e5b092e2be9af36374bc2ff5b21f3278990c1172fbf477138ac984ca9dbb38346f41192103d6f0515f53fc549193ff0099d2e9";
+  sha512.doc = "bae427744f56fd0026903b8f63dbafe85e2a661cc2aaa71d387a45018fb740cbcd03a0f22cb3e73050bb4b931959aaf012fa0d65553242a6adbb2f37d8f30217";
 };
 "koma-script-sfs" = {
   stripPrefix = 0;
-  sha512.run = "0a28f115e3f85d685d8080446b7d5ae83b1819902fe0147bf70d0609b7acbba0696c85f3d441e2093b90ac4e4e6f570e55cb0b8a15659dd70ee71e3a04a1e77c";
-  sha512.doc = "be730584d1189ca50d06107499c443f62d5e5a3049bd7498cea3f666f06fa6e099b94e87da614fe64ed8f4ad633c228524d8b7806d4966525cf899c037b8c5e7";
+  sha512.run = "287535c4cf7e3477f43b3920a5d53d3789447e072816f15f0495722dffd3b3ba3dc92940007d83ce2979a3916e8545889c28ef381864f1d50772d207a6561a45";
+  sha512.doc = "ae1c0f36ffae0e1f776e56cb65d9541d35d344ab184304dd884496132021f1cd189b59680f6cafb0c56a1f4ba062619d18e85507cf6c549fc5faf9b220c78120";
   hasRunfiles = true;
   version = "1.0";
 };
 "komacv" = {
   stripPrefix = 0;
-  sha512.run = "a79056054b9c6e9c4a7a8036145cbd4b8efd212c0388d3a39ade44f93ad9c79dc2ad8d70518e8fd0b5d811f3ac1a1830894d70bee5cdbcbce5f70086066e65b7";
-  sha512.doc = "158acfddd9234c20afca01700e3e3c9036133ed6a3601fc8f5d4e6e4e463fbb037368fdeb9f2deb4dde3c4b63e34fe1df5d62eb014c420b9391eb8a2433f9a77";
-  sha512.source = "115678d77c80c62287a410ae78392591da2e296b3d4679cfe47ba72b1b7f0c4198bb0d2f61370fb0c3c057c67400c427a1452376dafdaa33ff69bd0c95e14ce7";
+  sha512.run = "36d8a2fd4e2113269b4c9a994443b2e696f70091e0008e5129cb4fa178c0acae4b52b59b4a727b6055f63679325c8183dd3ef614c91e7270eac678f96bf484ba";
+  sha512.doc = "863e811c07e2ccfc4dff38129d5eaa3891f15a5d1ab7b6df36b0d8b57c0a0a4614892294a0e27734bbf834d4e260ed3b90fe39789d4b139ee2bb33fefd29db9a";
+  sha512.source = "ee1f5168d2d970e90f3edf812bd575b7cc7e7857a293b770396a4414e68f5f5fe3fbb17feec14800dac735b0d9f67810230aa0a8339ff931df3d083e360a7701";
   hasRunfiles = true;
   version = "1.1.1";
 };
 "komacv-rg" = {
   stripPrefix = 0;
-  sha512.run = "797447b76752d113a4d33635f058f933f831d9dfe9937a04117134cdf14e4854c1f54034e543ff01f380cb22767911ea4eb1145787892f7cbdb19e91ff4fa7a5";
-  sha512.doc = "92128b43feb272cf3113ec04b4968468301a4989ecab54ffd2d05674668a6ee02d2fd59ec6e499c0bf95bb0785377363198742bcd2f45dc5ea156d319afe1624";
-  sha512.source = "283cafa8b781981e6c16b03b0d5a260938bf75946a18ba36b6f2d1a74dfcb8f78772b5ef5810c071a6903245a04e026f64dd61b51fb69799e794253a57b78681";
+  sha512.run = "2d6ddd4d927a42aff2c1813c3832e5f7441911efe041744f2a32db0850f89c993f960df9247b9d854d01c36bb67151f6cc74a57f35649cc2603c024149eefe65";
+  sha512.doc = "7a6fa15474ca21b422dd3e64e4fc2cbdab3dcae88d876b00d65700b0b73aa25e51a63737764b1e3c7c66cda75b65e57dea7a6a9aaae42f989f7102ed5f05e124";
+  sha512.source = "3c5553a218da8576a7998724cb0082a8649f9c8f620a10368468593c37b38cbbb7573716d79affc3172c5af745964153e624a05047ecab7f633e68696ee3b247";
   hasRunfiles = true;
-  version = "0.9";
+  version = "0.9.1";
 };
 "kotex-oblivoir" = {
   stripPrefix = 0;
   deps."memoir" = tl."memoir";
   deps."kotex-utf" = tl."kotex-utf";
-  sha512.run = "9b7d9edfcf9e816c3dc72e8271171e5a3264c5ca72d7903564dfcac93bc7c899db0b306ca0bacba565f54b32ac90b00d8453ee5aded5e5e099130cbb6d29cc1a";
-  sha512.doc = "ec746e7ad0c1c970e602b54146c53856ca888c0e55ad249714d7f8e37b96632777a7391f819851641f4949adc22a6ff4efbbae449b54e279c3f5a327f5404a1e";
+  sha512.run = "8d0d72f5a3003dca30c6d0627f35dd5f921175f4f48a7c01dea8c13f8c79abdd5da3cabdc279779bab9bd0174a2db9c1247c3d44f70e11a4d7d192bcd6baed92";
+  sha512.doc = "0e51d4e2a4274252bbdfda668f8b5a9857eb7d798ed2f1fce953477fa6f894904b95bfa62ffed0e85e6ba63c522d95d6e086671c18d20cfd9cf04e963fa12e58";
   hasRunfiles = true;
   version = "2.1.8";
 };
 "kotex-plain" = {
   stripPrefix = 0;
-  sha512.run = "e1daa46dee937dd9a18496ebc66bf41f62a1ec2382a7c0ae917b1e52ed73531b1fbf813b0327f491e86a0e2bba5b0857f1971c21c581da7ca3faab9a53378124";
-  sha512.doc = "ba4c45c08932bb3d321c5e975065cf7b9512ef73800ea53022479bb2d35e2f3f38f32b6fe06f1a4956867a0aa6611f1156992e61b52e26688886d4abcdf8362f";
+  sha512.run = "57bbcc19986b1a6035430fb0b18716b2c14f6cb076fca20950166b02d37b751f1955c05aadfed95a0054cf6c52a22e561d1776fc8342f401a7148eac123ea924";
+  sha512.doc = "c780bfbd022f5f97d1004318d368056b67c39316293c3f2b27591636e482cc1ddb598f2940dd6fa3ea1710c0872fc8ead55cf437dd3612950e9d0f8e2ec1ca35";
   hasRunfiles = true;
   version = "2.1.1a";
 };
 "kotex-utf" = {
   stripPrefix = 0;
   deps."cjk-ko" = tl."cjk-ko";
-  sha512.run = "7324b405269ffed172f10efd42c2144ee7da07b0e20e50c12afc3ba01f498765a1b88214e29988455579aaef955f10eef0a1a99af4d619fe443845470aabb02b";
-  sha512.doc = "b7c0451145967e0a2840c0283919be9a45732d5bd77ad474dc945bdd7f3fd2ed9e725e0894378112fa52f8ad452c8a4aab4d7e44f2abc3019cc019f8496335cf";
+  sha512.run = "ca4235723625c349863082d973ab35183562fec8bc3d2f5932825fb792cc92fab9fd36b2046c0f2ef5508bce1ee1f834b081d8619ffe23d7a5574706efcf444a";
+  sha512.doc = "3308cccaecee744bd62fdac857457bfcb9f126d52de232cd6406f94e431995e9a621677e9342ebca39df4a1a16fa2cbf6b5a47970247145d91ab1031148eba0a";
   hasRunfiles = true;
   version = "2.1.2";
 };
 "kotex-utils" = {
   deps."kotex-utf" = tl."kotex-utf";
-  sha512.run = "c47ec4d47b7f38086abd4e1939f8f801eacf91ad707b0024c126a8d2f322091089a6e9966f8959d80cad4a4b7138c807ae131024f1731163e09357c4588273bf";
-  sha512.doc = "01b18177fbf0d9b67757a4c41d876e0f46e4cebe6f501c236ff20d7f5e2fef72fa3826158518fd0a097414a054f6cb0b0261f8c1352b4f46c0b49e7371ff9f13";
+  sha512.run = "59a30d2693703b72707f6026597cd53d54e41569ac1b1410a7b73baf8c1455140f7d45da225d3b6699d0208387df33f4ea9737eb10ea6f9fe7614af6704440e2";
+  sha512.doc = "a811988e250b1888e32c9349026b036c7341a7184f574e14b6fac1f821e21ec398c94efcb04d32d2dcf147af5a1fa1db4a863c8fbd7707d10540465b9c61d934";
   hasRunfiles = true;
   version = "2.1.0";
 };
 "kpathsea" = {
-  sha512.run = "f103b44da4d01ccafc43be81208b3bca69936da291c1a0f16dcc5000f5fed5772d1d0ad2432373f4a4111fad5394db47466e044daac8b624582dbdfb29cd7604";
-  sha512.doc = "614fdc91b7b9c206269fd434fcd0383406f4f05c4cdec9249933bfbb02eaab47470bc5737cfb95a4decfcbd1b532e284068abc6a7bd1da94f51366012c1efb27";
+  sha512.run = "1ad1b9e35afff278c20501532b46a492755bae9e6aa2d9eb653e2427eb16ec84e5dd026ddb473cd3aeca9c938d0a0cb408d5922401d6833174a0ed36f11c10ca";
+  sha512.doc = "6ce377c29a0155ecfb1ae0c1596e7b098b320d5708b310492fb38f87a032fbda349a4e1f14edab9914adfd1922cfc6cef6e0524ab3296606184105e34037fc24";
   hasRunfiles = true;
 };
 "kpfonts" = {
   stripPrefix = 0;
-  sha512.run = "348cdf487da9745496cab0fdb8156fcf8c884010c2f69eac80183f5e01b1bb47dadd4b013faa78555148bc6ef71c70c959a179a77c349c9b52064acd240462ef";
-  sha512.doc = "d5872d4a9e459758721ae3320af53fc71fcaae70c7c2872f5339b08826a15efb7068355aacf040ae0e10b0b88f3f7f32b16949f74263b6a17b5dcad80ab2b535";
+  sha512.run = "e6997f0a3cba6f4de6860986569dacec3ca381f1c13e045539a74e4e2e7f84656a042416cdc7adf3f77ae9b58d77baac4782d0374dee56fd2e6a6301678cb29b";
+  sha512.doc = "65c2fc56d27f6bf3bccbbaaa31276f2f3918e0b0de4a4b7708847f5af26630f10e84236bc33a682dcd101c7ac62b68455f0ae521a0be0e14c794e38159a70eeb";
+  sha512.source = "f8e1782af4d99309c6b8ffa634f2689a45d70e101e3f841d2ce17b286a3beda1b3a0661eea6982e192954c5e8b09fd8653084a120dcd62b6bb7f909ea901235f";
   hasRunfiles = true;
-  version = "3.31";
+  version = "3.33";
 };
 "ksfh_nat" = {
   stripPrefix = 0;
-  sha512.run = "793a651c44014f7d6ce79cddee611e0df0e52de7baaa0f4bde15215f9326b5c608cd711037c8d145c3df721c63be2f696a9058cfde6c379293d0c8f9a0700c72";
+  sha512.run = "5f67ed675f92fccf13069e8659c2fbef96528aebada68d006c28538409c513354e23c47b3be0041b5be34edb8fa9f71288e3eedccf45909ec443c5dba7c79bb2";
   hasRunfiles = true;
   version = "1.1";
 };
 "ksp-thesis" = {
   stripPrefix = 0;
-  sha512.run = "1dadf2c309b39e0e9faa2cb65ddcc910daaba54dc14eb3bbc771183a003454cefff6bf39d19f7ad456a25de985b078b01adbea578d644acc32e71aa143521977";
-  sha512.doc = "22a87e115a8eeadc2b1019c0def314e9e2fd509fc482a312bb55d8cf15435c08987ac3b89d22b52407fdee029434db0ebcce477513c41e99dfad34f6c55ae2d6";
+  sha512.run = "840efee7d2e90288f2b420594b52fd871842706f5f1e0a28e3b03730da2cbeebf4976c54de27c81962aa182543432129ff0caa6c1f785b54d93a8dc185d304da";
+  sha512.doc = "3f49d4bcdc9e9c7a6901d213c3f688fe1113781cb5c6d4e2724ded1a7cab4492e2537a798588867d51b6faef096beae6678596da6827a6b9329318467f3639c4";
   hasRunfiles = true;
   version = "1.0.2";
 };
 "ktv-texdata" = {
   stripPrefix = 0;
-  sha512.run = "cfc6edb4ad56189ced326053bdb3ba5d76c29076c1432ce783d23913d4fe43e7a259ed963596eadcdd2f78491816d8d4a110addab56869271a96c3e642b2a1cc";
-  sha512.doc = "475685ff29c821daa35dc5e6707448d5b18606e8a6bcfaf698bfa421f922258878b45a3938817bc694ddaa6c317d306f16791760d1d2c53a0ff01ec8c80101d0";
-  sha512.source = "76c2ec510bb9628323dff382dc977c2df9e24967f8593df2084c4ddde1c9189c7e289dd6acc9aa1d57bbe0a553c94259f0362143e689f7e717a063c4d30802f8";
+  sha512.run = "9617f2cb5a70a996f0407b2febf7e3ab6d65b828301ddf501e1f83088654cdf5778adbda0660e9d6b7c5ba545d11558d3612901f4625ae017ee3ec791abe6f85";
+  sha512.doc = "2047f3b3043d4feb1fae37ff737e238eac4338b711ca685064af905ae4c2a10ad0d581e2745dd6d03cae8a494d3bfffa84a203790774eeab57ca89b7efb70c83";
+  sha512.source = "5b0d584c2a3609c0f262e07c8637ca1d8f447fcd620a24b05679b2d980f0fc9c85ab6da532c88066e9eca5cdc1e9b66a88f11be8ecd62346a816eb1f7ede72b8";
   hasRunfiles = true;
   version = "05.34";
 };
 "ku-template" = {
   stripPrefix = 0;
-  sha512.run = "d611847c2cc0d664d17d095609a293c1e6f84b7b4c63e514cb761cf72e3b0dfd7e65192264308d4e8bd9d53bd8a11e3b6884070cf17f0a9e0c8bc4a74fa03184";
-  sha512.doc = "fb9cfa645df43449d2fa4374235f7f03af66de10243dee3c581cec29788f162ce28fe739c2e6e281f58b08f7e2a540162322be5fbd015a39f755e8dcdcf9d314";
+  sha512.run = "db219686bd5e5c7fa087141b17edcb3a364059a31f76c99c0ae3da071f35a61b1e655862901ba37c1e90be92071bcb7126b20fcc89506993942015f92574c731";
+  sha512.doc = "c973d53ec268ee9ca5b3c011f99b8f4c2673237391c233846df93664a71218d1353ab3a27edb4819ddd6978b147171ea3be11039f52a1dc2cf52a196028ba932";
   hasRunfiles = true;
   version = "0.02";
 };
+"kurdishlipsum" = {
+  stripPrefix = 0;
+  sha512.run = "f226b01777b27962db60fb87c8cf7f32c708f057650d16696547a9208431bfef31b13ca313953d2cf512226a6186f76b715d630650eaad6370600f3c07730d81";
+  sha512.doc = "50016b1c0609e893c6bd63bd5ee22baaef8b12e28a1e9c2cdfc012ef927d8ec46def7208a64e0d734e3ea71a0361d618ae097b2c1b2b8043b5e77b6763b1580c";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "kurier" = {
   stripPrefix = 0;
-  sha512.run = "88bd25a598c57b46401ce4e866a605df16e419b6c63d7b842f0072bf28d5eba7494e97fbe9c09253f7a25caf7480bfc1b036f9fbbc9a4718e372976b96678e98";
-  sha512.doc = "247f7a6048415613858ad30dbf69cc801959fced5a46e7fbaf9ec03eef7e07c32fc20d3789b5dc1d52558f3c1d1ac7825b94fe4b44d6b99c313c644be2128430";
+  sha512.run = "5c94f27d9897c8b33c4dbf9e4edbdd7b3f445dc210c442e73b5ae19bb6dbfbb800569d4d1dd98b0716c2dea27764c6dd5453d2041ece8004d3e743d8745b73ae";
+  sha512.doc = "398205b45f868a3d00eb7e45af8fd094676012174b1e4be175da0bd01ab24497b40522e77cd0d29c8f2e6283548a96ba0d0f3b88ce7e593f4509258aad4a98db";
   hasRunfiles = true;
   version = "0.995b";
 };
 "l2picfaq" = {
   stripPrefix = 0;
-  sha512.run = "73dfcb776921c0c5f5ec88250078e523e28902ceeb62fed9a73a7287357e6a5031761ec0a8ec9980f580b876820252184c00da049e3759312c411023df290102";
-  sha512.doc = "2d64b6a483a19b97461a2a6d35766e91a970dc026a3927b4f62b6a2c6ebdabc873c08fcdfd937ebfc462921cab3004d6c52ccd738fd2dd730c20043ca93235f2";
+  sha512.run = "0c876914f63a12ba657c14893480e24c4b4beeb2a42537937c8e2f40dff29bed077eda0f74300745f3d4dec8bdf4c06cbe7c8c7ebc2ae1ede95c1cb7b891802a";
+  sha512.doc = "4d5cd178c45aa30ed738c8d4175284ebd6e1cb83693752732d77fa574607dd4887e6a528229e8c1c1ebc8a0619b47bfaec3dfd5431f916b5f7de5278cb448844";
   version = "1.50";
 };
 "l2tabu" = {
   stripPrefix = 0;
-  sha512.run = "7acd1493b182409576b818174b3673ba78530167ef3dd6e3d773c19e0dbb201ea969e39c6dcbd5d2f6565c218bfee2cf88628af2fbb17c036a001a679ef6efed";
-  sha512.doc = "337f714f0f26c753bf98a22eed59503183e808822c485c2ba3eafae8cc4638d84330beae98e59f822a8b0b287d1d5cffce7696c8d3df6e93652d34552339c3af";
+  sha512.run = "03814d3aeb2fda70f001f7abbd3f31a4112b2f4f6a6e6380dcb79ae11fe3be7b2c994f25fe5ac1a7b99ff2e2852dcaafe84edee7e092a558301246727aba8ad8";
+  sha512.doc = "b462d7118bf3845ac91b2bc254df881f35236cf7bae1a64b154cb175770a01c67c358d4dec4b0949d2377b3ee3985158adf44a3f1bb7882b3009d1bfe6a959c8";
   version = "2.4";
 };
 "l2tabu-english" = {
   stripPrefix = 0;
-  sha512.run = "12c3ad4bdcbddeff614148915376c7e1f20ba540f51ff144868a1a3bbf351ec313c2b91ab239c26ddf10bc6b077b6c8ec92884ff32d16ad61cf8fbcbb4984e0c";
-  sha512.doc = "d697a24d6b2688b316cfefc75db753a004ede7f35bf7a32bb7aabeee038cc9c1b532bd1503705915ea0ff5e28f8099a227ed772f39bee474d576a4412cd43493";
+  sha512.run = "0ebc04eb6bf4b4600616d8d82bc847f26287c34e7130d4d2e315577b8fbbea41846344071a250b60da95d46a3fdbd82994551eba10778708d6a0b3ce6e8618bf";
+  sha512.doc = "6cb0856a2428d2387280c47f26a5e479f49bec0a2d76e8a26c26497c228a1795cd51d7e19acf03eb6e39d2fb4d025115a44f4238fac80cf782f7a87cc683ca58";
   version = "1.8.5.7";
 };
 "l2tabu-french" = {
   stripPrefix = 0;
-  sha512.run = "c587ee97160b7c13953adc34b98958236c6712c071a264f0515c32f25606ee9cd166c7f59beace1995014aa08142a8ea2534c52b20ce806cbdddae89f8441c1c";
-  sha512.doc = "895298ebf21474d0145e44fccffc0f519b65eb641c53e980ec6ae20b64f6d9b239ab6b03b3e17785b7bf9d05854f11879436c5ad6b62294238187aab0e3ec2e9";
+  sha512.run = "7e274ff36fde207f23be08ae1f72d1dea4fef39941b3eb319b7b6b15489348de996a7ba299820471f03e38dd4a8cb74d069e43bbb90f3768aeb3c3e2c14fcd0f";
+  sha512.doc = "ec5addaf9e7f4aafb09ed402713531eb4f94661b9e9ea31f2251086e3e02701a19c6b6c214dbdd2b531c6edcf50c6cdee0033c47ea57a2f4f6c66bc1647afee1";
   version = "2.3";
 };
 "l2tabu-italian" = {
   stripPrefix = 0;
-  sha512.run = "d86a5b0ae006322eaf340a27caf0691be7dcf7ca9aef52ed98415e7d48ed9133fbaea855f010c75761a3e583541f507bee2fe76eb34663e1b20f88592f214eff";
-  sha512.doc = "23fb72d87c1f8eeb50cfcb714ff41502b184baa328b6b77bd0c2fbf2258deb84725fcc418511f4500bcb4b9ba3c1c01f607c257f0758e2df3a1efca39bd331e7";
+  sha512.run = "155f27842e2b55b290a6656943785fcbc445b7f4117c5c3b1d15bc7cf2b8926abd5f92dbfd7980e1e2e93945ce0fe4fd6b699e67beafbc6f4f98959876091b6a";
+  sha512.doc = "e593673e37b8b75bb97ff5d9f253dea797929ab48cd923b7297935f534a79f3181fe37461424faec16c38feb56e46a4a127f2a85132c3e4083cc1debcdf29e1e";
   version = "2.3";
 };
 "l2tabu-spanish" = {
   stripPrefix = 0;
-  sha512.run = "506a0e3d1753015744e11aeaadea80b44e272ee7f7acf41155bde9d4af2e9c6140caf1db23909eed09340edc5eec7192c1663e53326ee10d6bcb4698cd9c26d2";
-  sha512.doc = "d6c7268dd13673e8aa388e9c9b76c603daba724b83e578d1a7bf01c51342c491379ff4de751c52c9c3abd2381f9ec8b850ded0c7e1ab89327006f54719fcbfd5";
+  sha512.run = "7b7c963d78d8e70351e4d2043e9356c7a5730fbc86f24635d3f4c868130ae7468d1b06f7d7a4c7a484127e2ecf57f12f547f008a832ec490336a85c88dd9c1a3";
+  sha512.doc = "fe9a6a6c41e71575a116bb71d913ff994abb5a3bb8af6963fbd3349400e67fb8fb4268a0344bb162054c5ff12eb7e73d29014220c25891f6912e12149fc18931";
   version = "1.1";
 };
 "l3build" = {
-  stripPrefix = 0;
-  sha512.run = "68837610d1d78df6e381cc2eec39a8a93c55933edecf91b1d14869e6639dfd65fa75c780cea0b685c9aeec85aaf448f2f854dd657010c4e2b5f0fe1a85635f9b";
-  sha512.doc = "946a6f9215bc3b830d7cd5242efc713b82f9ad7a4e9cd4e40f537db4a5a351cfea98f499ba8fdb305bf93b35739a0d66906ba7d693c0f18d80a98f20cf2ea1eb";
-  sha512.source = "03ae26bdf6fb58369a954a95b38a47bc0c4088339e554afa866cc266a02c621b09c3b7e551f64c3e31f3e9625a8121d1ba038d6f9a664ba87ebc2140fb90ecec";
+  sha512.run = "822ea350f9aa9e052a19ca5feb0b2e324c85a062e5fe7e0197c874c82e43cda6af4fd198f3b8cd95840e02b44e3471acc6d1a88460c4e7a376935b482c1cabe8";
+  sha512.doc = "6bb9ae18130c15694195072f197a8acc04e2e1c5f72018b2c0a3d0f7bdcab8cb18af580d765d8369c5e75a989e7b66c2acad69ac5da94219b865dea7c4091bdd";
+  sha512.source = "92f59fd524ba7cd91774b1f905714510610b4d0c418b1cf3c6c492413b7c1a784a6fcd2294d149ec0243195b5ba501cfc8f0b13e1f6e0436c93f17f60f15a14f";
   hasRunfiles = true;
 };
 "l3experimental" = {
   stripPrefix = 0;
-  sha512.run = "c4c92290d451fe9fc49d5ead5d2b886e4f530afa710790d239ab75f081ffa75a277737350651e568a2969e2921811a654cf032e4e5c13b7b32d88e658788c1cf";
-  sha512.doc = "d4903b2c284d845e2456679c69c8a2ec7482874be1059cce990ba05276cdcd48ece1d1e436f4a6f4c3298196353747896b30544d95ffc14165267505e145c8fc";
-  sha512.source = "a70f1d2f6e822c5a72bd3723cdf107f07ca8649492be1fc7e6f831a937ff8ae9adf630b2d58fc75d30ba10bf3279bd066e2874682965b47d37e1510dac0904a1";
+  sha512.run = "e79dd99ef32b4b1036a27782430e45d597fd009cf931ac68b4f7d2bd844f88d255f11f3e598a9f584103d991f25666afabadd3ff87d03f932a94c6b9e70b8fa4";
+  sha512.doc = "929bc709ba3c57fa93359716eb5a7b81103a66c0ee9e990af9bbb6571278c0549a48460ef6a2ff5abce50c8a8a3591422c41c0880f5df53783cdff665f9953c5";
+  sha512.source = "dec10923397d4bb95de989ff740b94a4d1163de16dea4d3848ab8fec679f0b53f3e43e16a2487c1bcad000b35ef93900e8fb7052362a146a603712d8a1f84448";
   hasRunfiles = true;
 };
 "l3kernel" = {
   stripPrefix = 0;
-  sha512.run = "267a505b9ecf632010ff38e4c2400db2a0f364a5c9f0b350b02036e3e8dd86de94e47f0687485339a92028ce5f82ed3ca66a5e4846fb7d6fb4ac6c2b70faa39e";
-  sha512.doc = "129ce134f4044f47623d2606813ecd90962e6d7b338b05a7c367d975d77d6cf39fa70acbe879758a44cf152dfe9996b826e029ab5c04028030c0149ea1939016";
-  sha512.source = "fa0e332daadca1173818e0c87202ba8f638d7fd1e638a7bee89aef2600614a61846b522835fe1841e4ca3615150625f8e05e1efcb2f32ac847854dcaaf2974f2";
+  sha512.run = "2053e04f18737a877487b8d4e3fb9c32f71824340f8f15953cb38dfdb4f552835aa421ea0c002d484a707fe4c0f382361bb8a75853a91a0ed249d2166263e7b0";
+  sha512.doc = "64dedc486b203abbc706fa545278a83144bfa45e754ab3bd3b01f30e92b4f08ce215d0d23afc22108ec749dd45f762f4f078eff3ee2002b2398c47134b410aa8";
+  sha512.source = "31b80b39990d5c30103cfc46bf4d86e5d180b8723658199ff882eb4ee47403f7a6958e48350865891244066c408e95e6e8fa858f94d04b85c6031104281703e5";
   hasRunfiles = true;
 };
 "l3packages" = {
   stripPrefix = 0;
-  sha512.run = "131c2f955dab33c906e20fb2b86a568edd0b5b308893277476437f7ea776582ab0a8180f2ea89b760d1f9b5590030f0c3b2a2e6f73864656606bf7303f313b59";
-  sha512.doc = "30622a9b02a8c1ff6b69feff9a9e4bc6855338120cf1d5125157a04c17de04d600fcc6e5eeae8c07c043154ca2a627aff7e987d108bf327b00347b22d536410f";
-  sha512.source = "0a8319b18f36a174c28497cefd109a76d5c3e9eb3710307dedcf53357ae6055618989fac363883e9a15be3ceed56704e31a095293c28f26df06f1f0bc3be5750";
+  sha512.run = "775fc31bd56e6a942bd23624bbb5e306d5dc4b41e715c572dcad5158897d1f0aec158dbb79b622f264e80a7f6d19ebb72779b154b0452b74cae771f49f41984c";
+  sha512.doc = "4d9d108fd24e05a8e4e76baba3f6dac1f4318d336da8d321b7995e5f858b92df3c79bf6e43c1607f6c8cf271d6debaa0d12034bbff36997aa1d440683cf47ee1";
+  sha512.source = "fb8c9ed253f3266a42c175c359e16b97382b070de26befef183acb5f7803bb0f5620d467d39648c87102a832306efca5652a16917b21f077cb03fb0c43087fa9";
   hasRunfiles = true;
 };
 "labbook" = {
   stripPrefix = 0;
-  sha512.run = "d8ec3b3d5abf5b2b94dfea5333ff5ce5bf02ab9a324d14b623e0b88c45ae79e2b361a4e41ab1c2ea8abfbc9592b25bfcc5066248623951b0e78b77a0f977c042";
-  sha512.doc = "a5b8d02a5a4b9387155c62fdf7b43f2fa139a202984017b9faa654023496d842c2d5728ce2ad3138d5ced25df927084ba8f74578dad370f4f147f006b25b93c2";
-  sha512.source = "99763bca089b9764f86b50652746f7322dde66da05035d266224c89e97c729129748373ed14b8891ccbcab9f182d3a9e844abfedc67d294c30b1529ff966cb42";
+  sha512.run = "a06297b8b48fe6d3df24733648d680c49ce356befe24accde5ca358e9f1e80ddec4fd7a335c1016e2075ad1bb7934af3d90a21977ee1bfd2b47e50a8fa90aecf";
+  sha512.doc = "e92d3d316aa451ee33576340d7c383a4e565eaa67bed6dfc7ad3041fbfc63c67f60b8a01b934a18964e28a89791d668120c5de9592a0a0e176a4b77e6ac7de23";
+  sha512.source = "7d93ac14bb8fda72fa65de59033c9b493fb5fa81e5ff9a259f691f27aede5ce4ab7caf063df02b9e18685916d08c14abda4ea93bb24b7f28486c70f3c681528c";
   hasRunfiles = true;
 };
 "labels" = {
   stripPrefix = 0;
-  sha512.run = "63252de4041984075bc61bdfe54b385b128e663cc480903723e0ad96ae914dc13ad081db0309296ea77606510e80852462b2c992378f9243c94015c9b571c96a";
-  sha512.doc = "21fc004c6e3f099b0f2f5f517104a4ad52bc0264d307a1b9b3b626c5407e0a09c3f13e194c11c0df2762a5e3db41ce381d45264f328f4865034d7518f28628ad";
-  sha512.source = "448e902fd8df1460e2b718d96856183bd7c2d1671f630103b5b39f27d2c8a3d09f28ace8dd30e5a467f8d5c0059f076107360b5bc83b19bc30cafa50c829cf93";
+  sha512.run = "5647800c562f346c7777db7f2433dffcfccddb4ea2f0bb0633f099c0a486629c25b6289286035f8e34a42fde637761e797fdecb58aa43601409f63b962ebe194";
+  sha512.doc = "4efa287b894eb727c94a9c5669d1f6cf79c9c6e1e5f82b1ada996005b3c74672e1c08bf38b40ff6b01ad47e1a385f7e0ef1fedaf52dad504213a3424584ecab2";
+  sha512.source = "a48650834f036fd80ff0dda6287f37c8d1f2da76d90bba9f1d68e54cec4b7a924e3f8f9f0db858d4113505fbe3b70f55ee774491e33e26b7badfdf9f6ba270c1";
   hasRunfiles = true;
   version = ".13";
 };
 "labelschanged" = {
   stripPrefix = 0;
-  sha512.run = "649fa42e1457648cffc27704ee4e36d8c307f8685ca8c4edf245bf5bec365a824f075e8d29f2ea97ad06041befc442897ea14e9ebaa06fb3f6f6fcd5f4780a62";
-  sha512.doc = "7f5dc166676192182e40d9bfa440b609f3c0e8bbc64dd503be7e53d0148dfd3bbbb3103dedf815e98c6867fad044a56c50d869ef564f2290a125ef3a9907947e";
-  sha512.source = "a46710e26d68e7b434a42122c1c0741d0ccbc06d50e2e9e05cf514e415cf2f528eab20ddfdb94bfc15dc770163c2273acd5a668416d1256278e61ed2b920ad0a";
+  sha512.run = "54ef82e26b97bbf719bd0d8c2ba678442ce653e0abdbbc9c96186c573e0e778f40803ef43c993712417972fdee05fce8cd862052daf1cae4fc38a572f6253a67";
+  sha512.doc = "a6a530f7fb8d373ab9b37ce3b6062790d8acd6eca826682cfc775aa49a38d01fa9a9549ed1721cfd77a9cd714fd6f286fe37c0495020493ac8b756caffdc2d10";
+  sha512.source = "f794f4c33e78c8976ef4b053c3adb1bda71d75d82b898dbf60713073f9a90307731e4b24fcf9064345bbadf4052e71ad6a0f854dc90ee259851959742909822d";
   hasRunfiles = true;
   version = "1.0";
 };
 "labyrinth" = {
   stripPrefix = 0;
-  sha512.run = "71175126101e225fd21971cb936337bb4d4324e3d4362e0a8853b6216bf54c618ab68e72ce8d8521ab7eb42fcf713acf5717c642f57d03a7d6756a3975504756";
-  sha512.doc = "016480becb3916a7049d4f41e4d199831021f3345bf87245f87067a87dc2e4c13565a42ee52580b4bbd6f7198823c2169c637463253bb8716f63f09d688152b3";
+  sha512.run = "54b504d5d555246ae2f36f49cb060179cc62a73d6d1f3085a9280ea4d88be25c5371aff126a74ebc6197ef98b9bfeb9cb17a20b4a118e2f33c4cbdf56b83a64a";
+  sha512.doc = "bfa1ed0645f4ff540484cf55bfd80cea7255e488ce04be2c7e0f0ff415256aa13d13accdc30b8cc33cdca33bbef38bce1298c231399da40661b50994c709e4d3";
   hasRunfiles = true;
   version = "1.0";
 };
 "lacheck" = {
-  sha512.run = "16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac";
-  sha512.doc = "dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2";
+  sha512.run = "0e02c1a8a47aedc47f9346ffe21b5ca7dbb5c89618561afd74b3e817d8b093df551baf2243e44645557da722831ce6743a0fcd21ab98e0f56e0efc9f67b0dee6";
+  sha512.doc = "f69dad894e5b6c808e9653d45500140096009284f01cab9ab5295d4c516488cb1d82b5ed616c6e10c1f25ba78169faa980ba4cfb55de9aaaa5c37d0b1e5b2f92";
 };
 "ladder" = {
   stripPrefix = 0;
-  sha512.run = "f6688c16161593d3f647df9cf624209ae7d71364a6bd6755d6941df10b612638492fc9db7bc4484505634bfa8185d7585130676636aad1f0a240a8c0bce6951c";
-  sha512.doc = "4f07996f73ca58687dfe75560398a32c8cab2efecf4f7dc7bbae3f8aa387f8baf53fdeceebd2cef74c3453697ed13efb9c4f0a772c327b70c42545b331716385";
+  sha512.run = "41ce1702c35cbf9794772ebbcd80e2f2d4e445a37df0b7a8cc6e184bdf0051a2979560b2167c244b4d42712c230f45f362347f4951a0dbb1b327b7dd0f5d1eb5";
+  sha512.doc = "19c3db31ba877b5076575f32fe78c8998b5e7920ea38a003aaece34a99300c9f52e05aef5f89d9dfae04360d3ddf87a636a969a2892d1dfea14b2dcc369c4895";
   hasRunfiles = true;
 };
 "lambda" = {
   stripPrefix = 0;
-  sha512.run = "5f32e0a1bca8d7225fdd9cdd1bb4b39543a9412e8753dcfc4a1ceb4a9bc0ec1e3c0a946bb816f260c54f1f4c41b01f6e75c1fecd87e24ad4aa46a352df1fda9a";
+  sha512.run = "cce054e426eed743c11f6dfbd7004b10937b071ca305837a91a62608a121bdc45effd2511192d477efeee8c6aa37092feaf2bef4d24820bd7114501f7905f112";
   hasRunfiles = true;
 };
 "lambda-lists" = {
   stripPrefix = 0;
-  sha512.run = "c51e48929a0b35a3e0ace484d213dc76c1089fc9fe10383253141281ae4567cad43fd732457f90ebf8d9828286e5cd41dea9a31ef74fc2405061b0c1d4cf40a1";
-  sha512.doc = "134afd8d75f9e29d0ea213b7207baa5e32960de39cf5fe9fa7dea86fbc403dad24149f6ca07b93b1ec53ec424ffab95041b7562e75313fa3960ad64eefa8822e";
+  sha512.run = "368575ee8b74228752c377b67a226b5eaf6cca9b6c846f988d599ebcace0e12b0bd54a2b8f7e17d353c974871b0b0742b85471f73f40e354a0fd6ff7df51aa14";
+  sha512.doc = "ca0dccf61dd14f3d146e05edaa5c71e1b4869ee6dda86bba059538a086555ecaf8235fb1d7d13ac61f8b169c3d05a4d17f614c3698117995838f90af1d44f588";
   hasRunfiles = true;
 };
 "langcode" = {
   stripPrefix = 0;
-  sha512.run = "972d14c102d5c9406308b27bef1b31e7a4d8f3b9e83ca520b4d428cb6aa746c9e711399f7dc20703fd442aeb21a5e15cc11b07ddc3255134558cc9f4bfa91cb2";
-  sha512.doc = "09a58b263deadd3c8009a0861e9072f899e69e87af6e6c6e17669450b3a03b1b5bb7254b63af7cf53d15f8cfde3cebf0910654ae89f0248f07370beac39c269d";
-  sha512.source = "fbdb17ac27fbe1148b510af198355b75d3fc7abcda83239ec627ae285bf0495f2f8f93b6f12dece7026602eea33a17176b73a3a5a91a4863309dec700d993bc2";
+  sha512.run = "40ecfaecb171d4b5898513747026fc917388f8d75fed666e0dced7a861139708769f75135f846140103065dcb8369fccec69fed7ca5e6e0afb55a66e421f5167";
+  sha512.doc = "7f631cb80439df5a83f154e88028a998d837f1d84c02db589a0ea72e350770c539326056e5e25bf462a12da25175b6d0a8c9c4e5e90eb71c30839604278aef3f";
+  sha512.source = "6aac199dbabba9fb194a9cf822381166fadf9f2f1a73d0e5ab0e50cb811c49d67b27b51f4a97be7930c559eab523211112bae1f00bb335d422474ae1ee56e007";
   hasRunfiles = true;
   version = "0.2";
 };
 "langsci" = {
   stripPrefix = 0;
-  sha512.run = "8c5348b6006ecc996c432c5e8674d9e4b90df9197ea29f3e0722b15be7441311ab67726e9583f823c90ecc7e75bbe4c4d5da635c523b3dddecbc153a83744b9b";
-  sha512.doc = "79d9828ee8d3e2414ec822845a68e0c51e3d4a2d11dbff4f56d97b7c30fb981252c440455fed2c31eeeb561efeb2adfb9401b8197436b46b76a63b8900cf1694";
+  sha512.run = "5c5de4024b3fbde931c5915ec6b653cd10af30c88fd3b320b1b69309153259a09fc0cb2861fcc50da43ae79253d6f59ca7ed9085e7925b296fe2e65cc567a83e";
+  sha512.doc = "1acf6a4eeaa8630a28b0b6b5c388965a54ebceea867721a1e1855c79f0f8b614dfe1ee68b8c2e17769247e4675ef2a5b154ece42b4e340c03219f9b3171e5d21";
   hasRunfiles = true;
 };
 "lapdf" = {
   stripPrefix = 0;
-  sha512.run = "820eef605404385a110659908c7c948b4b0a48339f67f526b015fbd07a28039614cd53f716b8355d05618d59e650a3fa9b70c12518da7782a9134454530b300e";
-  sha512.doc = "d1551bcb06c2bd7a48cb86c8dfcf5428c9854c1d4c904b5aea8f2a66132432f1c94ad345acd8b9936db274e8cd1d280fc80439598f00be105ea1e3535c630f80";
+  sha512.run = "ae3ba4ddd6bc8aea967f9abcd00781e65459c3b6b9ef2d9df8d33b52686700b98848c6b049a75c73b39f3b35b81639cc9835a36a1ef551de6b942eca868f3cf1";
+  sha512.doc = "8b0b8c9ffa68c0c64e3954e04a65e1e0c7d821c1055fff95954c158f32c2a40ad577e71b93605af032a9dce1dada4b68e023bfd8f3f8740cefe29d5aff9e083f";
   hasRunfiles = true;
   version = "1.1";
 };
 "lastpackage" = {
   stripPrefix = 0;
-  sha512.run = "d184f2f2e5ec7d2ec87efaddbb17b1d128afdd97964e4ebcbdbce33dbce3154f957d916bbd699c6e52f2d1174990e7d2590f394f9e39df4983565456f5d53b48";
-  sha512.doc = "babf67f8c3e9da12141d28fb58c3801e9a90dcb807c10b0216df767003b14e80b09f5cc979f6c5973e723384d89523e26c4016b68209a4f679c05386a4224180";
-  sha512.source = "468ae5fb5352df2185c4f0cc3e2b70eac61f5a570bf7f9bb321fc4564ceb7048ffad2a45255ae5276c36fbebc243f4349003f17a988bebf1ee8be7fbd066b2ba";
+  sha512.run = "985fbc2254086d29281aa6c2110abdac4af676bf4296ecacf78d33324bc7d8529af13b3d34a6f2bb8e0d613386f5e77bbce3120da34b1925d1450a0efb20c9e8";
+  sha512.doc = "e19b5a55ff29b97f970a8ea5bd42b46b346e8140155f2f546e29fa8574a0c4f9a43286de1ec1ed65aba018f6454b3d3d454724220fe0910c1c6f9919ee00807d";
+  sha512.source = "29df3dd1bc7e6882ea378a0c1d1caf7c8c1c7e021cc0e34d919a29c5b9ccd947b79ad8da8ac17e31399ed7389f5e9f0898a65f8dfa4c0c145b9a6e9c171a69e2";
   hasRunfiles = true;
   version = "0.1";
 };
 "lastpage" = {
   stripPrefix = 0;
-  sha512.run = "2784dc960ee06d68a787fb7fcda9afcbe413b9ba1485b75e4e96cab1bc5a5f31affd250b0a4882f1571ff01c305e213f9e416e5a8af0623c82ca25c710276b31";
-  sha512.doc = "b1b0bd841047b1cc05f94a0d989377b57c38a3e705e9a4f5c57714e28ffe229eaef61cb70592aafe70a5c54b7b1f5ae52fcba5dcf559a9a60d053018d9791008";
-  sha512.source = "25e22904b084b65b594e18a7b9d7b14d94953870ab7dd99bfe12963b952450d2c9ad1f02d93b3db4d5b9961a08160fc3e0333a2a06e8e60119548b5a014b8be0";
+  sha512.run = "3de2ae8047fa3c8bd2ee9af7fa8a09e20f51d669d8cf8d32326bb4481c6824e1b8f09a0550e6d75b0f0e6964fe28d5bc377c4f51f99ff5794795ea086c8d8c91";
+  sha512.doc = "c70c89f91472e98e142495ab5473ef7bc8bbce2811e01a082f767ef98c7d7f1be79ea10dc076227246d9130f7bf0836276eaca854fbbb26d3cc0938c37ead0f4";
+  sha512.source = "a9d1da2deb2245755e5400a1876fc8725820e185acaef99345bbf7d7e46430e2ac203e0b06d38803de51c2954fd4ace1b5e1b371003f597a6a1c8dbc2378bbfe";
   hasRunfiles = true;
   version = "1.2m";
 };
@@ -15436,21 +15861,21 @@ tl: { # no indentation
   deps."pdftex" = tl."pdftex";
   deps."latexconfig" = tl."latexconfig";
   deps."latex-fonts" = tl."latex-fonts";
-  sha512.run = "af0ac85f89b7620eb7699c8bca6348f8913352c473af1056b7a90f28567d3f3e21d60be1f44e056107766b1dce8d87d367e7f8a82f777d565a2d4597feb24558";
-  sha512.doc = "5bdfea6b85c431a0af2abc8f8df160b297ad73f6a324ca88df990f01f24611c9ae80d2f6d12c7b3767308fbe3de3fca3d11664b923ea4080fb13fd056a1d0c3d";
-  sha512.source = "1d145b567cf48d6ee71582a1f329fe5cf002d6259269a71d2e4a69e6e6bd65abeb92461d31d7137f3803503534282bc0c5546e5d2d1aa2604e896e607c53b041";
+  sha512.run = "360ab16c3ce6bf5cc8983d2e3372a181bcb3e510bd97a0e0713fe731d79d326091eb1c07496f71059cbd669637d21cf067911a1c0a4ed323157cd20c039eadef";
+  sha512.doc = "cd9eba568c24dc8af1bc79a14dabb8101a5df6d8012e068f7ca9b12533bf671b0182994de8cfdd21f350748b58aee2213ff3c14e7735e95ab7e5455f522fb52c";
+  sha512.source = "d93ee1b033893d7eb6088b1677a0a77b6b82fadd7b66981fab2751d207381043e56860146b59597d9e396fc3b40368e19ae16d2294054f487fbc375727e8b4fd";
   hasRunfiles = true;
-  version = "2017-01-01_PL1";
+  version = "PL_5";
 };
 "latex-bib-ex" = {
   stripPrefix = 0;
-  sha512.run = "ebb0e86e5626073110ba801a53e6a10d6f91801cfd96f300874c3c8a556c373d90086cba89ef40ce1ebfc98326c729387808995292e1a7760a57a931e04bc54b";
-  sha512.doc = "46e74c1ccf39c7d26d205542befb96e96dc3007f04136e485c38393ee1b59775930fb31779ce36f88572c94e039041910b0c57441c123db05fb87b0137c21cb9";
+  sha512.run = "0f919bfbfb21f2102aa44ac6445270fa120072b960aec9f09253381e6657a418c2818cf85ebd201f9a208f384174ffed3924d46f35e6c6f6a888b049d15febdf";
+  sha512.doc = "b33691bb61b09d4e23060f04b41fc6e004708a15e5013b09b21e074c24f7a15fdb0e39a21e6f14f4810e6864582987810ef5c21050a00c2c41cdde462910eec1";
 };
 "latex-bib2-ex" = {
   stripPrefix = 0;
-  sha512.run = "76634990fd5a03e6b87d40be373b9871d8b9afe4916cc2930ca0fe76e505627fea682d2a374f482d514331b9726fb83ef17a3f8ca8b4523ae48bd6ade766f7f9";
-  sha512.doc = "df256a11f460746bbfa7a59a715f9d6cdf641f7adddb9158b365f4ff26fd7d370737422b0e82d6a45a406060dbd2d0efe1a8e2b77ae97f5d699062ad3e686ef5";
+  sha512.run = "25ac22b5d0f2b842fbd1f3ac2fe6498f7a0965a0e02f8d46ea818d840024050bab0ea1d4c85594e35e421b2e464cef638c70aacc83d4ed9a8d5072a412548c56";
+  sha512.doc = "0ce885f124577f99f68c1c83b1dc6249dce152e80384bdf42fa82a991f97ab5ea403d23ff1ffe24d3d4e0bf41e23a07794cd2376a92b8260620a5545db6d460c";
 };
 "latex-bin" = {
   deps."latex" = tl."latex";
@@ -15461,1259 +15886,1281 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."latexconfig" = tl."latexconfig";
   deps."unicode-data" = tl."unicode-data";
-  sha512.run = "333bbc5b93b382811f53a3fa00af8bf80edfc42f716a32ec689e41bfcb0a09d370583006536665dff4e23450780b957c5230907582b312dd5613410f7504e5ad";
-  sha512.doc = "f6f7c1e3c36ffd20be78b0ba8f0c8168d9d5ab8b953ea4dd401f404a2ee20e4ab88f2ad33060a15229a551daa54478fa51b5404b33551edfa963ce9058a1a4b8";
+  sha512.run = "b1e53204a800b9c44d9ee228f629a6d59b6c6656e734af2047d0d54006db0b3881eefdbd13098906e24e58aa343a709632a5435643bbdc74db675a92c9a69ea2";
+  sha512.doc = "c1054eb1bd0f5eed2ac7f263b6eefc09e42a2fbb0b86779db8988ee5885606530f0243c98a0105418214bf2f7c08a900c3b389e99fcb00da714e93ba9e2cdb53";
 };
 "latex-brochure" = {
   stripPrefix = 0;
-  sha512.run = "c1aa37b1fb90bcf741a9f58fa1303e6099cc83b393068bb74b3ca6381ea299bcd1cba22b2140bafd5b328680bf0bbe57c17da9f4dec7769923c1261eee264fa6";
-  sha512.doc = "1df4b84c14e87414a7db850546dfd5dbcd82373cacfd61a30bf851e1bcb5acb7b9bb40fcb4026c9ec1873ed6bfff186ff57b2b9183a3411bf9744eb496a1649e";
+  sha512.run = "aa266f2ee796a86498ffc7f3d260fc5ebc7c0207dc7ea282c09dcb3b2a192b4df0e9775e0afb0a6250d80cac5092b98400c600d4183cda4ee60fcc00ab59ec9c";
+  sha512.doc = "56c2f8ae0c56d06cec4e9e6afdfbdecf68ca4fc445450ac5b193ffe343ad5a984ae6541ac02a20ba68a220172a0fb90d8caac3ed0d39caa6f0ce92413dd58a9a";
 };
 "latex-course" = {
   stripPrefix = 0;
-  sha512.run = "47f8a9c8eed272d70a5c886a0a3235360f1f603bf2ecb97aa5386a9d825517e4e3b57727f82f707d269108f9658203d1571b7857694a01d891de8d8bf832fda3";
-  sha512.doc = "5dfb3e2301e002a18b758e13f1cedc776c5ee7b3a6313aa8ddaef1bad3566d6cceb6b6596a97acbd927323dbd52977e0375c35991602d8cf8391d7846b62f7ef";
+  sha512.run = "e244576c0405010ae1ec0545e34d57f49b43334a30f53d0f7f66df51855fcfb6c58e31bf59a2834a3bf03cbb4ba6b6a10ed6be2f6012148422ec04a9bf5ff1c8";
+  sha512.doc = "64cb01caa310cf5c1553120fc31f63bea713cf1f89560321b842930cd74a9b75be6485a15884eba2124591ffc77ae3d7f1fdbf84159f29554de0211991d4cb50";
   version = "2";
 };
 "latex-doc-ptr" = {
   stripPrefix = 0;
-  sha512.run = "a776cc476ba8245031362bd95c6378b0efc03de1cfa467698dd8f4016bc24e058232685e89cb8a891e1e06e8111cc2a76b33297fd91913ca0cc61481bb5ba9ec";
-  sha512.doc = "32f908df14518d086baef7d2690385ff975317e9529fe1e0037e59bcd787a55f43aaf909d62d1bccea0ddc07e09161a930a4db55a99361b4ee0b78140c308809";
+  sha512.run = "81607926e05e3604140acc87a52e5e2f754d9d1d39a6a19a0982383fdedd54369cf8174a8e2261f6229cf1e387175bed64cd9ec8320ffd790a0daae0ce10d1c7";
+  sha512.doc = "e965b4d9fea1c1e514a808e697c346a8c53205eb24475573fd5435c22cb3898c6b490ff3672c60012fdbbdd19d9b2d4552cbf715c52514360f77319bbda83397";
 };
 "latex-fonts" = {
   stripPrefix = 0;
-  sha512.run = "258a934f6dc87cb7620efafceb53f831c57d1fae89fa33d35bd4e5a8d53dfa1dd724a4f806975d4259df65cee53a072ef91768aa37aee2a9d5583950ccac474b";
-  sha512.doc = "0f52ea921b1991480f08f89ad480dc9026979a484e75b409d3fa9301e03f3dc134310ae51019001116f42f3e00b42c3b7b48843f5d7b6f82fd7faead238e2c3a";
+  sha512.run = "ce52b60862fd61367d4951db1852db7e0f4f7922580680b3560bea1df065d2a6792ca5ca9647c2cb6cc5e2bbeff44c410dacf6d468a58e9a2620004b4f6cef62";
+  sha512.doc = "2c9d67d0b9521680e839f14b7e30469c00824c8ed68856aa63a56f21c2ddc1cc8dbd69a001e989b5ce331eddb66b12f0ad1d391f75b94f5a491ba77e796d6c9e";
   hasRunfiles = true;
 };
 "latex-git-log" = {
-  sha512.run = "01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03";
-  sha512.doc = "69f6d77f2163cde39f3c5de0d2ea2f402c1178eb3d8469ba65c7f61809e92e1c6a3417cb1d760f6b3757abfe08e441d0ba4cac53344bac847754f5c0db01b5b8";
+  sha512.run = "9b889286f9eb3a2ba0b1123252866f7de61678e32c1f7988ab3d5286cfd946acacb602170fa2f63d56dd63166815b103588fa545c94559e105c60478c6b0e8f1";
+  sha512.doc = "f27474c0f8837d8b8d90af1277cc2b34fc769821923c3ad3121a73de6c239b97c113409a9af86cc28af0df11515dab8956ecd04d211856e91cec84280cecd72a";
   hasRunfiles = true;
   version = "0.9";
 };
 "latex-graphics-companion" = {
   stripPrefix = 0;
-  sha512.run = "6722b243dde4415c88a5c743e2e6d8f8994582f1452d5713384d0dd901a32da12394579a5560fa45823edfbce841486a8ba6d6d7fe19bd4e0190ee203e5b6808";
-  sha512.doc = "3a59948140a640aa356332999cc8cd5fc00c6df69a1f1f9b23e3ce7e14bcf283c6e9b2594e62178289f7d1b76f00b2bf13a982993921f9e56ebe4eca844b5325";
+  sha512.run = "8907b2f669cecd9f32c644b531a531261cb891e8969742d0e493fb16fbbeb266c56fd0ebd2865f2367f25e626efffbc686db39e24d56a38242af7712bf86afff";
+  sha512.doc = "bb53f00319459888ca5da925e70db861756b2ae1249327590cbda5b26dece09c97b98671872b819fc5f32842d4b298c201c058339967ae9e8630c83c2eeb1cdd";
 };
 "latex-make" = {
   stripPrefix = 0;
-  sha512.run = "813202b3dcd95ab93d374563a8cc9cd329c313302d5c38630b97917e942dd43c79e570fc5e67b8330f47eb5e8e83ae6802698cbb90fdf8595c68b2d4965d54c9";
-  sha512.doc = "97f02779d2cc5a1da19322689f121caefb075783cc0c153a17e8620e90096f0692eb33d37c9c667bb5f7142f5bf4f97dfbc4aaed939e8e8e2cff86b7a3cf025e";
-  sha512.source = "7eb5b6d6f3e69adee18d27dc5967b85fa398596d4b3d7b69fdcf99802223c2fdb24128c4e6ef603a9e5b6ef802a8d6ed8368e7a10599f75c5332e60fc1f80536";
+  sha512.run = "d2afe6b53156877b5dd919caee6b840f8174b40ba533ea5b1d85e3b639b4adee1ddcea38393c1c1309faf80bbae31835768c60af0ad012a3da847bbf2f311a05";
+  sha512.doc = "315880d19d62848097fa99d41c466e64e44b243b2a5e5cb637c63969addc3ec50b0e6fae4c3176ad0129f3d87e073c53902add6aba5b76325e2e27a8c7cd8d86";
+  sha512.source = "3577c815927643cec36b6ce7f07b58d7dfb7a08041d6587858c956819b67ccc9b00113c1197abab7b3a85a2f5614c8f963624f440afb8995226ddce4a6c48641";
   hasRunfiles = true;
-  version = "2.2.3";
+  version = "2.2.4";
 };
 "latex-mr" = {
   stripPrefix = 0;
-  sha512.run = "af6fc39ba7f2890aefbc82a7406da28634d74e086aedaa3fa8d55866c8b28cae670fb63ba7c77bf4f6f013efec2f4ea48dc0bf54097c70ac2b5f8482f9f88444";
-  sha512.doc = "b3aab069459a46c128e8543c02b8ac0f988593be62446f3cddeef51c2da28423d7ab6aaa15a6ddb51b63b05c610f4c23e613d9d801bc7d015c5d50f80555f633";
+  sha512.run = "aac1311fb74a34233e5f07f44c64d210cee42f8f40d3cc711fec55e70d76884bb537f76cedd51348734c6bc003b605395f0ee6b5b877a292c28977eb63dd65a2";
+  sha512.doc = "2979d7e7c2418a9c6694dfa05d7a4e3a015259780cf9187ddb142067d1f60bc5ff818ae79c1163aca26c6b324a3d0b39df813b57a3216e9316c1334f48c2ff26";
   version = "1.0";
 };
 "latex-notes-zh-cn" = {
   stripPrefix = 0;
-  sha512.run = "e7915e821f7028a45512ef801d96b5e1913174c152ee653cc1a1dc0feea392589f2e9d251053b94b0250ac0eff1963a6c96d2554242b38335c3aaf346c70318d";
-  sha512.doc = "d9d8136fd6ce3a57c7ff4599f096cce705d10571dde4940e320f94caac3108a20b548f2aef4b3fac4e772704337f1b65fc21a7d22852c5e9f21df85d584a96f9";
+  sha512.run = "11cdd1a27de3a7419378051016245d90ba269cba1798c516d5449d0c0dfaec639dc77c663b97f56bd07970f8b2e58b805f13544245e204700485f93e4864bb06";
+  sha512.doc = "99e6ca45546de6e2b65ad302fbd379c8881452b5e71fd2e80f07445ab82eed133c0bc37225ff81bb3b5e2c4a1f4649e204eb7cfb5582e218de59d3f43853c89a";
   version = "1.20";
 };
 "latex-papersize" = {
-  sha512.run = "0b721446f7d74f113182211db735d3d7cc98f61b044f95467a05b989d949230354bcffd8957f8d2a5be1bd56fc7bf3a096eee93dcfe30da563874c2a6fc19e63";
-  sha512.doc = "e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b";
+  sha512.run = "ec821fd792e83a8aa9230e60898286225dba8d0cfbcd1677dbc75746334db512c063fa37268a60add8f2d8aeab182a29f8707d9d6ce75e730f0cdaa53ded20d3";
+  sha512.doc = "0513959efdcbb9a6a210299cf35fc4f2a1a83affffe707bca1a210263d73acab60e75293a50273116336ecd66c086c1c5f4f29a31ae26508af2f0784c935ee4f";
   hasRunfiles = true;
   version = "1.62";
 };
 "latex-referenz" = {
   stripPrefix = 0;
-  sha512.run = "9a8d637186e25ae6bc1ccb15efa6593e1a85209d6e3b1a3d1f27fef1c259214ea911959b1fd43c1de2a5b05f8649eb5236f2b4a866648f6c498f24262485744d";
-  sha512.doc = "a62f46c36a7471bc9dc1fce001ba4d1e65e23642a767d2b929123a89ff4619bf6bd034f8b294d88da5040d12da49f37b8aee496cfe0f8fec387463734c51491d";
+  sha512.run = "be060fccc9bb4518ec7ec64035fadff208e6ea36814122d7d7870d53ca8e253387175abb8c0965278839c04f2964e9694ad706d1bf3f1f9e3e18cd854fbe71a3";
+  sha512.doc = "e905b889488d868982cc253c4dad621462301191dc5abe8bb7d77853d13bf460c9c5396bbf657a3003fab11b0aefa315f24cc7ec59ba4320b3f835fae9cb2819";
   version = "2";
 };
 "latex-refsheet" = {
   stripPrefix = 0;
-  sha512.run = "1938831671144ed309443daa3c7584ff0acdb0f6f29eaaf25ae4bd5ad64f07b339073ecb01e6bfbbe72110c15ecaa6fa46cfa167870a86604c1198fb643efd4f";
-  sha512.doc = "7370a002cb0fced79107e47762f3ed7ec54ada54cd9c1dd7a97e406753d42fe6da40cc6b001f652a08fce3dfbdeb845eb5a380e9ce455843e5d6c097381526d5";
+  sha512.run = "f12ee11dbabc330396539a3a97a2592048d4a726c8a3e373e3b478f41f649fe2d6c0b9eb804e55a980f71c61d2e05298277b4a6efcfd0c739a043f2855c89a9a";
+  sha512.doc = "a5d57a859c6e293175090492bac0d99da31bae58264fb08d9859cb65ccef558b8b4ac1390c1b4e286748ec4734664d2d2a51de9f1bc51a82ee96bd958b68c637";
   version = "1.2";
 };
 "latex-tabellen" = {
   stripPrefix = 0;
-  sha512.run = "3737737c1ba04175109e52ba9c75940417cf1acc521af4dfd3e09660723218d87e8c79bdaebca187cc6f609448f9822e99481503badecf491ff6cc0d1830335a";
-  sha512.doc = "4cfeb0a3a63549c1cb5636784b49b3308b533f6050ff78de01e468f1c7d3472807fb4a24ac3d9387e4a6891eeeaedff44ba31d1a6a611eef35c39175d40d8590";
+  sha512.run = "272ba504955b7376da617d79325421e38fc228c7ac5a894bfb348572f1aaacccf5764b4ad6f0c9d6fc3002cd4872785528bf98ea18f4ceb9985b203f480df803";
+  sha512.doc = "f17b4d6267c9f7518c0fa8344a66162bacfc8752020db97314d9044a9cbb7fca4b991a556442c146f32a77cb3f28e11eb6ac4b5a7d76f9837354fbf2437e5110";
 };
 "latex-tds" = {
   stripPrefix = 0;
-  sha512.run = "fa8344b592c0c6b87214565de65a8551417449915174e727d7c9e2c628c1525c6c7c84fa707db80a72d4386290929bc22a2d743f8f90ec6d5d83e66d21472321";
-  sha512.doc = "1b8a885271a58da70b8695fc0609b9df2a15d8f99fb36eab9485e1cb02af4148a0aaf1288af4c2cfb9dfb12f373fe2e4a76e8a4d6363f9492b2434edaeaf352d";
-  sha512.source = "1190f480474235685949968d697c0f82e02342fbd140d5a24c4dacfbfbcca6c448531649b3895137bf256971c047a63d0e6aa5b0cd5e9545dcfcc72417a0f9b7";
+  sha512.run = "4e0375778f7b7bdb64685113214e60c19b0156efb89c58e20ea527fe17533847743620a5786b8566df99463916a9569eae392d19f1ee79debb053368ed6eb02d";
+  sha512.doc = "d8b9f54320e4b99f0a415ac1d545730bb4a3755dc40322e253f0b2bb024f5ab3b3846389e83f3cbea5c1e0c8b8efbaca25ee1218b1fda3066eddaf04400105b4";
+  sha512.source = "6de2a95864709e0465eeac11e2db3919f7348dcb9f9013f039e285d728f7c4b4b03550cf4769f39ef589b9192c65e4dc05162a2d8fb9fd9d2d2c4bcfd789d640";
 };
 "latex-veryshortguide" = {
   stripPrefix = 0;
-  sha512.run = "8641b2dd84b1a7dd27f802fe21f0faeb565ef9fb6700a240f1a2b6c9653398e2e7d5608b90c08a32984fd36c0fea5930e7bea27545f71a18e2206ac26b933d4e";
-  sha512.doc = "f745de3348e570e4efd2ed2f38f1c4a7a71239a9caafde5fbaf151595fd2c495c96c95f6b135573453037fb2428e0bc3b857424b21766fb0528de71c4ea25133";
+  sha512.run = "008ec189589e50e8439cab7614dd325e19ec40c13eef4d6eedbfa633596b084183089de9e7d61b56b31c8a4b39f7353f7d738cad738ba7abe66ff8f50943d032";
+  sha512.doc = "48be36409f33bbd04331e0c70d173d726517ea330077594f9620883f3c7469183d603d6a57c638b8b8a8760dcc4ed176ef6ce0b1f4a734c872cc9c550db08651";
+};
+"latex-via-exemplos" = {
+  stripPrefix = 0;
+  sha512.run = "a50e5374f7bfd7e5ab3738992cc09418827d861b158f2f225988e4ad70f16953eb4652354836e6df22be0a60f447e481d578ea51ef42ad1a2e17c751787e5836";
+  sha512.doc = "5dbcb402c736f66a0aabce22c49fa706647bd58a95ea105f671e02c6022e3a907f51015cb99986d421872d0b1c88026365a2b9462db41ca515aaec5fc38c3ff7";
+  version = "0.5.2";
 };
 "latex-web-companion" = {
   stripPrefix = 0;
-  sha512.run = "e2f87ef2bf0b5f2091dccaee53928f7407300801b9d08ec66793b5276d285b792c2b99a8c447652a48fda227df56c9435d92b976eda4fdcbae0f93bdd6a29b60";
-  sha512.doc = "f66ef8d9180d5c05d81037496ededcc0172baf1b52eba8f30da8dde1888808d6791333841dbf14ae53589a1eaa384a00ef61e57a0e5ef70eed3f608edcb025de";
+  sha512.run = "6090a7be3a38be64aa634edb76287d6e716e37e5e94d7a3543be5e5551cfc95a5a938763604e3f73dec9aa09cbc4835d9efca9f73a31b2345e0a9e42e9d2cf2d";
+  sha512.doc = "f5d1e3e96707ce946446408642b7d2f873804c7e7432f7f38206776bef0d084dccaa7c25354d70990a83112e20c1234d3db060b896f68245c8917430f190ca81";
 };
 "latex2e-help-texinfo" = {
   stripPrefix = 0;
-  sha512.run = "dc548b02f9161f2cd19c9b35fe3d0610dc196ce4be71f92c3c1d1133516c4ce95243b3a6943a5702c7cc5a1eafdf46c022cbed2c322dfa723a7df1474cd6d578";
-  sha512.doc = "789ffcd7ac1362140a604405f32b58314a319c63c71e478d87ca10a2169f25771bb47fa01d762ce16930094471e8dfd1a159d655af02b92283eb648574047578";
+  sha512.run = "4482ba0685d8a102e18f3ea67dfdb938b9043ad69f5525895787ab9ddbcfe67cd23e4b35776637eda744c750ca92dd6bbb75fe0ce63889dda3f585ec5f2f10a6";
+  sha512.doc = "b523bf0dc7df80834b7749663a0bf060c8be51325332ebb357e6c384f9bd4416f232a2970129e66df67b82e0df48a08ffdc945aa12c6affd4f8673813577c94a";
 };
 "latex2e-help-texinfo-fr" = {
   stripPrefix = 0;
-  sha512.run = "f3712f41e8f4040e22d0066371ee53d414361b52966167a0d32bff2c56a27f8751d40e27ce18f49b7f713a0fbd02b5c86a783c44849ba19efaae3dbf1ce132bd";
-  sha512.doc = "4281ed9010d9f30dd64abed177a72d8c26de32d759a4382fa2b739744ad3dfaaac37e8439c5413ca427c84d409678d60e6ba126ee2120b4bc33a4d431335be17";
+  sha512.run = "930efa9fcf16e342fe1ffbe31dcf79e51c2119235d689ab5511bb496ac8850f3d53fb77d3b72d67757e01c5d8dd037d8858f4824821187706f43933c7cceb33c";
+  sha512.doc = "32e5bf2fae86f1ebd5a621bdf6527f7ccd8f26771d87fcce5baa6e2a71c021a522d80c4e53af00ace55ea46a1c596d3722abcfe919cfc0e944668b39574fcb8b";
 };
 "latex2e-help-texinfo-spanish" = {
   stripPrefix = 0;
-  sha512.run = "d8cf1776d5f3cb8784c184cd668208a53371b758aef7dfe372a835b39282355e89ba51a7d0a961cb8550af0ac5702aebaaad822640331d78e6f85f0f84ac341e";
-  sha512.doc = "805c02f9e4286fefdecedcf72e0b6155f7a8d04239d9bfe66acd8e3afef554c7902c3de4d205c8dd17fda0cb95d4ff74ac5608cc0ad19928c2489e55666a5a05";
+  sha512.run = "cef009d6e99ff629acf59dc9e666121ee4bea704f4100482cb44134c04c957c7eaf1988b8be125dd84283386091c7c8e1ba00254867dbf1c6180491f16be3ba6";
+  sha512.doc = "1356c84a5128925b3de2a27d51c068da94f80a2739810c3f9c2b572df3f6d40d3705de540dcc6d148d0fa767888db9e142e9bf825545503ba036d12f415ee1b5";
 };
 "latex2man" = {
-  sha512.run = "bae51adb723994901517b195db70e69464b02bd2bf85fc1c4cf3cac41ee7bfcbdcd156ab37beace31b324be2bb0c569e69ae24eb09b9ca61919136fc4c4ba511";
-  sha512.doc = "59ae050a3aa583d3d6473bcf836a6a2827a6b6fb1c23097478527adc5d984fa3de5f7d7832ab66e51df92993c19c4d717e4b27e576d524ee5da6ae0ccbbabd0b";
+  sha512.run = "581f529dd99cac9cb0d2167626cfa14bfa90e47dedda1528b7ad810f045b34be1003e399f92996cab3bb7bb29aec27e739769310fa182e9a2e0e4683ac8fec02";
+  sha512.doc = "654d1c88f71fe30b37a59c1e202cbeca6ecf22864825c707b70ec76cc6c671249f5f3d2c5df027bfa537497251b341d741381a20ddc4042337b5932a89e97a7a";
   hasRunfiles = true;
-  version = "1.26";
+  version = "1.27";
 };
 "latex2nemeth" = {
-  sha512.run = "7a2c00dc371f30bab7a5899c6cf4793cb784b5d72d0f32a4d518e946b810f7875bed16b2b07e12715bb325cec6a5c1ca0ea59cb70191ab0bd230f6ba0049afd5";
-  sha512.doc = "4618a2b808ebc1d3271a16a9d992e1e7831e2b2250ca06868a4122961a9842dc3e0f078770aafdb3001a87403f4f4045b51d95a1c55b2d1817b3c4c01436a539";
+  sha512.run = "0ed818c581d66ab8f6bede58793931b2216270a6873092e869f6ddb7e2a206d48fb7e49d16919116eba625f9d1379a6aab7ff586d1d3027f636d35ca33a83df0";
+  sha512.doc = "8679a82ad00d5778e571d1285ac8528e99cc5ba2ec19f816b297a548d98130d499c4cefe8ee0641bc80bcec09c99f194ee9fc1f27c696a4276729e9f8be144c6";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "latex4wp" = {
   stripPrefix = 0;
-  sha512.run = "25b4d07eb6ecfce58a5fa0c9db1a4d6002e661b93b84e232530d0e83d9cdaff1db551fc8168e0513602ec073b72b686f303cd0948293f8a903a60c14ab7e3545";
-  sha512.doc = "4739657ed83fedbddb072762c6fda8da8f8777f04d4a573736fb46cc2fde4ce5cec3a119cbf2693e84d003d7f1b1dd07aaaf34958c4adda764d9ba23c2eb36ab";
+  sha512.run = "7f52a976846b6ea661156c95fdf833564d9f9aa08cbd4c167b7bb877add5804d8fca00aac0182a79621c49377b9f2ac274be9f2fec02dd1a20b9c389172c466b";
+  sha512.doc = "93122c154a9ad564713422f0b7c25c56a79c95cbf0f4a17e0253b5835f7358b34ec65eea862b734e4be3673c12893f168ade5a9f071feeaac5b11e540d09de31";
   version = "1.0.10";
 };
 "latex4wp-it" = {
   stripPrefix = 0;
-  sha512.run = "a9317fc16cc5928513f8669fe2cd5564a77b5e8d91d2a0b1de4b2708be9d3e511be98129de85b816b0733b92046dbd2bc327f9260267854af88c6f5cb727a8cb";
-  sha512.doc = "f11b35fedbd12cb33e62498e4aec325b94a0099caceb98091f3e045c36981945d477d7807ff1bb0aa126bfd1b92aa9f52b2a7563ec959cbab6df2afee7835fbf";
+  sha512.run = "9a3a8ec4d886065a59a13a89e1cafe1ca6accbbfc934447f3ef7bbe29beb3e52b26c9b256a0333c90afba301f3f49b9b74c2ef063482c1db5b34630860506203";
+  sha512.doc = "2a94533bd833f1189531967500b5dcb51dffc4aeb48d366d2d661191dcfe6a2766b3d61f54f6dbeb0d6993e3b4121a529f42e26dd98eb75ab400076d5c1691af";
   version = "1.0.10";
 };
 "latexbangla" = {
   stripPrefix = 0;
-  sha512.run = "6272bff77d44010c3d0ec839cbe035df5ab96d6bf1575064bfd26acfbf772fdbfdc5b18b8cba5f4bd94a592a71b79aea2a29f29f479ad2d7a96e171e2b5d9445";
-  sha512.doc = "6ef80fc022ba2569149edd903a4ee113917255d3c140d8a812b7879ad5522a8645b2c246eea199bd08d22b6ba749dd45b0177f5ec3c354e9a4797bbf9073ae1f";
+  sha512.run = "0b3ed739e59b63fffb074903c7857c526ceaffeae5786bfd5a398bd4aeb79bcdbd5741a3e81b604f16fb27c04fe501cf456ed8703cf27ff8f1aad7625affdce1";
+  sha512.doc = "1fd3ca636997ece57aebc7154a5513f714bb9c235b6d91df8367326b16c0e1e6948489aa4330f27e579c3c8350bf5e09419ffd7efbe57a9f940fd15bdebb4b35";
   hasRunfiles = true;
   version = "0.2";
 };
 "latexbug" = {
   stripPrefix = 0;
-  sha512.run = "175e6055cc3aba4b284426a5e8e77bcf834d3d97f12c22e165f894be2147818b0dbd252b6b3575048f217a32cdfdb27b7f2dd98693817e62d2d24cd7778d6063";
-  sha512.doc = "e1d77f7dc625dbf76e1b46e267e1af3dd932f26fdf3bea283589b1ac3b5427537a7756a1501e32d5ab7871bd6e4435f5e4fd7df7fc7059ae066fb63fe775f907";
-  sha512.source = "1fdce6f354ae6a5e248611fa39e152749041cb6a760117e17429a1d358c47cdd6a3659188a08025fb1674106c8ba7bcb48de4556f492b154464079d293557d29";
+  sha512.run = "a4bdf57625c948a8f16617d241664a6e40566843bc7c50ffe20fce1a9eef93f81988757209f35cff57483ea7f14a185eb57517fde8a29b61839992b3992c8e87";
+  sha512.doc = "0179d714d5f274226d69240b1772c059764c06957903f4aa38c61b536dacfc0814539b6989d3ec1e439c8be5ab276f00dca3667f3a4fb805cb7f41d7fe6a9006";
+  sha512.source = "b9c3dc095bfa7be56362d79fa64aad6627974a63cdff5934047625ecc360e248c62460892fd2c253f33c9cd95c350c9860e5a7b27ce406bffd10641639bdfbb5";
   hasRunfiles = true;
   version = "1.0d";
 };
 "latexcheat" = {
   stripPrefix = 0;
-  sha512.run = "399ffa445cca613e6b84b7832296dca9cdbc7681b81cd709811bdf1ea283f833b795bfff87818298033202d6ae77c0b161be73fe0dec9687f41a80e2d0d42b7f";
-  sha512.doc = "e45b46e6a0244bca6b5a17b5eb681f172b2610b499bdc927d140faaf18111dd95e228bd621460f72a2b966a4593c963a123c7d3737ffafb3729704e924b43e7c";
+  sha512.run = "fb278af88bb236be7859b031d91cd316c7bc65308b31cee00c7eea064aab08a0ba3eff396fcb6cc27b039bc13d73eae5ae1256c2f7e6aed976bf2f0a56d13721";
+  sha512.doc = "ff301a8a697a510a39238bf8614266b2bacf413f7b57f4be0268df65a3bc2381455440ba0542b76ec2df1f9ca5879c5bdc32359250787d7c89a623db7d5ea7e5";
   version = "1.13";
 };
 "latexcheat-de" = {
   stripPrefix = 0;
-  sha512.run = "0c6b033e7f04d9ace3d0aaf242ac82303c3c1d4490fb935f6898caca34b63522df5bb127d3537a1b10ce74ae0dc9cc1dd4d90941706816495934d890c11a2f8d";
-  sha512.doc = "267eba0aaa0c48e1f57b9d155996b518955bccf705455d45af4b84d9e07073df743dcace80aa44710349f415a32494bd7dc1eb5da27a0c55567d1d22df53c5f5";
+  sha512.run = "4d23bda42cb40d3d172b3a76d314dc9d5b9bbc8a4a074ab75dfdf08744e25363d7edc37fa5207cbf17d4128607f512f7d894e78cf279a54e3d6bf00948d1ce96";
+  sha512.doc = "42caec3233e5266d7a8c9ee22c6d1c255d782f72089ab4e3b3d7bb41578e69a13d2f8e7db93efc01067b0836c2b9d5ee6a74531a2babc6492f2a070ea52014f2";
 };
 "latexcheat-esmx" = {
   stripPrefix = 0;
-  sha512.run = "df44d1cec3c8beed46433ac44c8d82ea78a310f7989a6af51e27e6fe960654dcf0d324aad722b038edf10b3b0587b31cf00790f24583dddc5e4c805a24cfb61b";
-  sha512.doc = "2881b2430d709aa26d389d0d28f7b5e2e47bf0b73e97e715ea9d7c234236f55afe444a41599abfca3d9b2657cd61fa369c93ed68f47291fd7de6745661caa571";
+  sha512.run = "5c7d95217962b1cf10e60a891c16d8055746e2c35dfe101e5bda9bea38189ad32adf81064b128c13bd68b5ade0b66641e14d03a04e10640a8c7def1cdb8246cd";
+  sha512.doc = "c22a2b0fd91722ec5028c1e0d6fc881011fecef7b327311f2b25c9b89750b4a0750a93872392a1a79f7342e96360c6b98576ce86a7dca358ffa4c67e0bbc107f";
   version = "2.00";
 };
 "latexcheat-ptbr" = {
   stripPrefix = 0;
-  sha512.run = "1bc5e94d888f8fa98a332dd06ac731fbfd7bc540261b908209cda9c67e03e41a98555ddffd092adf285c046aadb36616aac6028b229cf1a15f751c10457b623b";
-  sha512.doc = "fdd4f15dc5ae8f15df994e4d4046b6965e082206974f2f0a1032f61a4613b43cfa2de5d094e3000a3e181c80ea66317b5ceb4ae4b9eba6c6251eb3dbf909aece";
+  sha512.run = "082f9f554f83c79d391611bcd2c6bc8f153cf80c5e0bf18dcf48391c4e99dd7f5d3f6da9de40cbc15966a86e176e68a5c619159481e598b2b779ac827b5f3b98";
+  sha512.doc = "33171a503dc6629d5a99c362c6e8c2861b295ef61ee481125b2d0214370702d6029d4545b098120a119c8d7cbd7cfce0f893b0739d3abd55489d38472fbb7a74";
   version = "1.13";
 };
 "latexconfig" = {
   stripPrefix = 0;
-  sha512.run = "4026f562b60ee17b14d2e14e37c5e4c4a96b6cd80646eb5434b4baafe4d8f43fa2074f21a22ee59fce85c0d1c248efd8c53efcb9b2361050a8aa2492a1d47a87";
+  sha512.run = "c61085460eb52dad4b8e77b4cd1454eac2514da6747a4fd64ebb2493f27a47ddf3d1de1b28276d49f9936cb2876dabe836e6f7bf0a250cea9e484ea65fe83276";
   hasRunfiles = true;
 };
 "latexcourse-rug" = {
   stripPrefix = 0;
-  sha512.run = "8450a659c1c1045489f8ffc7c952eca5b3391c78ebab38ebef6434d9301d980cb6d92e0180cb111983447608aeac9dde479400350a6b996636835d729f96fc9e";
-  sha512.doc = "bb44dab682a6a6c47bb61ad47ab2d0e2a20ef157bd89dfc9b475e538e814405055fc529ff6ede698e2f3673485e99fea67bff5710f448fe1265504ca6cd1aaaa";
+  sha512.run = "1a4bf61ba19a937886114ba554b4e4f4579ad6a295fe1458a5a120602974ed59eefabb98d7da7c1f09e8f8fc608f2e99661c0eb0e1dd288378e103e045df8e6b";
+  sha512.doc = "6cd12d3b4af5013d2e7355712280f8ea8636ac75eb027a9c3bde239e81931f53ef9f383d7259cf5ed95bbd2ae758f0c16b1816e2f5e828999156cc70bef3df45";
   version = "1.1";
 };
 "latexdemo" = {
   stripPrefix = 0;
-  sha512.run = "6842456bcce1d235225fdc6f5d2a04fe3df855c00f62257bb148d3f6808cbba89f41a1e8eaf5f2bdbac775c13d9507fb80ea66b9b228dba2f1cad0a4087bc0f7";
-  sha512.doc = "5c347c15cb43b59ede094726d4658e47e6c991c5a3e70755a96c1f045d31e1259f2d38ae574010584c4b4ff4f79fa649514bb98cad2615fcb88001ecd7924e22";
-  sha512.source = "70c2f64030472fd75ae189dee9769aec03367399c385f9979562a0e48125a5ae4075181b309295d7007e8f5993510c3dc444c709d7b990d5df612d77deb65666";
+  sha512.run = "beaa1e9071d773e544091afec1529269182eb068ed4838d952206bcc359ad939a2f0c36b74e547c03c5431eec2ea25c69acce74123e862902a24f2d5cb9196ac";
+  sha512.doc = "0d519e727fc03243eefca1c8baba2afef159309a41c4bdf74dc25b4a71b8d5f0a74c98d475c8c3d2a55d4676a5af7f593d51777478d294b508f81266564ad4f1";
+  sha512.source = "b667237f534876c6587e2b3490b15e5d42f0ef4750391dc021a5522c4267046fa719ebc3bd7898d41ad04e88d9ca07f7b0f46baaa183d3bd6dd20a7cb4fa65b4";
   hasRunfiles = true;
   version = "0.1";
 };
 "latexdiff" = {
-  sha512.run = "e91673ade517a18bccf667ea69b37ac3a3d447f99d848d511e93f04f5ee36fdbf879406cdd0f1323b0c71e226b23eb7009c54070189622a70aa51b40a503f769";
-  sha512.doc = "8b5b77955a946e0969ab4377964a350408c6dd55346c3518bde7299f6bed128b6ff8fdacb8dfc174b91fdac2f6eb09a537fcc3f6b19ce9bded9ad1efabf27d54";
+  sha512.run = "dc0845bce8ce26fa41afbaa222d3b7c81735dfd2c8859e554e3883cfc503fe9ca349d12efecfa75181c700fc9ba35476b87f80ce3dbe83cd8624233fbbefaa8c";
+  sha512.doc = "1338c9af56c390517230c3f34381a3ca22654b693a7ff0408eaf710ec00cca596cc669f32981b0da639401521440a4405b8a70ca147d48d196da6273aadbf3e6";
   hasRunfiles = true;
   version = "1.2.1";
 };
 "latexfileinfo-pkgs" = {
   stripPrefix = 0;
-  sha512.run = "66c698c558473494435173d18aeefde8af1fb5e2111f384c43eee350efd894b88a055efd92a83cd6b77c6714e80dd8522d0b1a5b0e22a2a68e9a3ad27ba604fe";
-  sha512.doc = "2ed3fd784728a05660e76a8925e4b0312a47dcdb745c90ac40e72e8d84b16d90dcebdc1f2fbc5217b22dd7a3723030d0fa24ac4976eaa623063ff45b018029cd";
-  sha512.source = "1fe18636e59ec712391b6f6db4b054bfdcd815224e8df835c29d3645a371bca90ab648a1a2e60bdc865c319b582f41f95476871e10860c81e2d6353a6143ca58";
+  sha512.run = "e32d60dad7f9c8df14996a4e954e0f614498147c2ff71748c8d866da86c91bacb7cc0be8e403bb1c44aafe731aa6b5080fd6aec3b09c86f8a85599a648162563";
+  sha512.doc = "c3e1bddb8ffdb73bc8676464b9faeb8154c2a5a7656b1b65f1d900193e49aeddfef75b9bd4350ecfa988d126e664525884182cb8d8f1c7d83a1d75967579b41e";
+  sha512.source = "eea2680b263c03ec2c8adcd1b8d4647abd722bd2454ba69ab587010d2eb3efbae8e2b1f1c938c92d47507159a0e0a01d7710d5c2fe1bd68859323954ad5ed7d9";
   hasRunfiles = true;
   version = "0.22";
 };
 "latexfileversion" = {
-  sha512.run = "7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e";
-  sha512.doc = "46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679";
+  sha512.run = "932fae5a19526a73123918a23bdfd4246fced21be54e03289e5cf37e11a3ad172e9f689e0611ca9688b874afe70b7f8b0c0cba11803554b42819b114d4c7599f";
+  sha512.doc = "ddbe5ec7d1e523789ec912bd666813aeb90cbe920148fb992eecd086f672cd8f1f68df8054f14633e3b018a8c2305f23a4a0acb3e6492279edb655fa10f54e30";
   hasRunfiles = true;
   version = "0.3";
 };
 "latexgit" = {
   stripPrefix = 0;
-  sha512.run = "f0882d465ff22f633247bd75d5e7edb2eb3374eca27278b812f4fda68fd4a0e55ad7003d30529e23b8adf40309a38ad52fd599d57b6c895a97dcaf0a57390e14";
-  sha512.doc = "a2efb2deb597626bf6bda6085ebac464859774c8fbf43cdc6f1dbf3801406b7cad38c563fc602e0622c961296c807ed9beafe93b8c4474e849487279b3fab0d1";
-  sha512.source = "e682de946afc84d7fbb85f46c1b134dfb237064ec3ba13b8f2de990772475893f3f8f4e429b7a25deba6eac5df312e4d60c731273298e8114c73e50b2b93a0f0";
+  sha512.run = "5e628b39cb067ca9680ad22f8da11884961514353e9cba722f09f77ba3ce8e642b3245577afe5735f15f8cc2e450b4016fb012ffb2e25987199ccf0afb1c1cda";
+  sha512.doc = "8bf98bba71a2b857ab5f054bc7c8d8645be0d8575c9ee6371f4019a7bf6b2355605e4a489d5f7172624bd6e0b1d5c685f4fdc3077b4d6be9f6597c349110637a";
+  sha512.source = "1c2792ebe3cedde0571dd5313dcb7f3a195a0c2cc46eede7234902a20716532c32f5e4b8a9eeb492b18e0da1b76e5e5a8d44775ccf7e04e3561c218b3ef2248d";
   hasRunfiles = true;
 };
 "latexindent" = {
-  sha512.run = "6e57dc20b523eeec1c12a4f7d8dad1b1114919a7f5496bc5e23843a4e7ba619161d83c8295b7550b9a92f2840764ab1e198ff06dff80fad6804a933ceaa41a6c";
-  sha512.doc = "4ee68381c8830022a15d53ee510979360bf2518c44215d9a55eac8f4731a76785743f269139873a3fe38f7f5d0668066d7579f5480d9a06ecfc1b3b8f9b995a1";
+  sha512.run = "a3b935c1e81a346cbbe32642b730c7fe934338899e7e117d3f45227d2cf1ba020b9074ebbd2cfedf056f8e08cd099ceb3d6c044909ede01a51e26f492436cb06";
+  sha512.doc = "3689351ad94a8e38e448ba4918572e89abb520bbedfc88822fa9e5e8aa953902a24e637e8cbc2d32bbaadda51e8000c44b7efd01a47125014cfb401e8a7e55c3";
   hasRunfiles = true;
-  version = "3.4.1";
+  version = "3.5";
 };
 "latexmk" = {
-  sha512.run = "6b0e54438ae19998100803dac357b3dd45b3ea2712c71511b44992dd1caeec4dc19d095941eaf9dbe7193f34c2662a375023a6aa6d1fad2e1c0cbe4df877b899";
-  sha512.doc = "c07be91b9ede5d4a879c9e8c1ccd89daaea28bb0792bff72b3d85761980a95c8800be714c923f84d90ffaa561649b1c9953ca95d791cb72871fbd89319523931";
-  sha512.source = "4e0f5fff5af6c20670a2c97fa096924b5cf56d8cb1fc599354542311349af1a34ce05b9ef9d10d833dc06986a17a5adc8ece95cccd2586233d74bce963c468d7";
+  sha512.run = "789d992a8907d63d4c39bea774447b95cf9d3afa9a7f9940ca0e5ba0e74138759937d31e35d701dd52c3ba640e814faec4e593fcbe1a7b095acc440985dd136e";
+  sha512.doc = "f1789dcb25fa023f9c3b977cd5665fdff48190d753ee5c10a1afa14be20bc1db4baa052a8d9883c37ad6dd3a7704c5942fd30756ea35c8630b3f7d7eb1ee8cde";
+  sha512.source = "366ffae340bfcb92f4af6b48c2657502f1f2e4650e54bad585d94e25693fc034e51a7be249fd7c5e1f61c8e2cda7467dbfff46e00a57ec91b192f03e9e5c013c";
   hasRunfiles = true;
-  version = "4.55";
+  version = "4.59";
 };
 "latexmp" = {
   stripPrefix = 0;
-  sha512.run = "d9d0ae6f0701609f5ea4b5df19160ed26710e5917e623ade57eabd3289525b3eed34b7dd9fc3166cc8e87c6be5ada2b52da0364aa61bee06d8831a6b6bce519a";
-  sha512.doc = "c82e0fac070f2331d4348d01c88e78c0b4797b39c11a58b93108eee2edde1f89b2d8d7b510b542bd9439a33b28d0439613544eb7ffc6f8591591a6bea6b6cb91";
+  sha512.run = "636f1518720ebf6e9bdf15e006bfe33863acddd4d856db0d2808520280a359f639cd6568da541fa7cf59bb345bb23e3852a59af3b85586c540341751b9f80e88";
+  sha512.doc = "f754a9e9e38e3138f28d90c9d6ae1b5eea68c3cf5dbbbf373dfd323064b27778603c6a59b6c73d7b81c42458b98595c7834538e467444949d14b93f3478b3c1b";
   hasRunfiles = true;
   version = "1.2.1";
 };
 "latexpand" = {
-  sha512.run = "e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1";
-  sha512.doc = "ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede";
+  sha512.run = "77f6505504f2622f47a301b89a3bc019e3a52fcd27a3f6284b5fa8f701800cd17ae61b698c336d26939e437922a7769d654923de37998cf63c53ad2cfbe79121";
+  sha512.doc = "a6e7b623a5d6039ef5e749aa9e61ca8c75aa0137fce9885660b589d6a0e7cdf62459bfd21f5297a45f88eccfa68396134a43f68fa8947c161638c825a24476d8";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4-1-gb32a776";
 };
 "lato" = {
   stripPrefix = 0;
-  sha512.run = "9c9d214354a94c6a676eaf42d4786deaa8f81961b13416472bb0c0803abc8787633505997fb847864664d1482c8e3ab7cc68d4d677f7d52fcc0597cd2dbf4d74";
-  sha512.doc = "fa5c78806f93eaa134e062c025ab38666ced11d56ffc8e99d9c58894ddffa24b041478c4251c91b433ef7f0290f1e4c437274cabd42d8ce9b20b385218b5660f";
+  sha512.run = "7ced63aa65bcc3744826ce1a75248a5563ff0b54a76fd5f6edb6e5ac77ad0070fe17517b484eb8facc5236aa44672942581eade88c2a63b8c19a0e8621be0a59";
+  sha512.doc = "06516da2c15aa92cf714e18cb73a517bef4a12c59a96511292acfcfff14225a320f12be4e86fa7bcd662bcf48cc1a965dbf837d0d67fd5af914a18991d27136d";
   hasRunfiles = true;
   version = "3.0";
 };
 "layaureo" = {
   stripPrefix = 0;
-  sha512.run = "44f52009680b94a76e00bc95302744456534d606c413e46a0adb0a407d35677e904a24c3168236467868b3bfb5a3ffb9573b7c3b53a3aebcd71464172c621f41";
-  sha512.doc = "7cd672a57db261acb6e4bd88769c11c11b8eee2ecf3349f7ab1ddc977eeff33f3a34eaf4c094ace8a3efe4affa97c6d1ec3e6a99bf11bab9fa683bef43a264f1";
-  sha512.source = "109613de27a1bdcfce407045be42790b97354cc5fdbdbc747bc637d64cb1e1a8e0726063dd2e1061c9b98632fba26c99aa11d8aa04366486f08ef82845d26f67";
+  sha512.run = "d7c6d900c179f47e1adae907e993bdf8a802041d23d4ac6e950d686169ce7b98d3bf4a893a9a4f112fd4599997d3fd9101e59a9fda56e313ebe3438d73602f9a";
+  sha512.doc = "0d3e3ee1bde647ab7622bce9c0468ed5e7196a5a4aa593634b3feed91344907eec8abec69eef77c48bd46b8a6585fca036d03ed0d9f6654b16b9195dce06dfa9";
+  sha512.source = "8ce52616c9b60525121f9ecdc2502ef730ff284d7f027191c2a3d60131d5345de89a0e194f0ea9dc421afebd74a2f28662615344e7e040a67fef7eb695f35e16";
   hasRunfiles = true;
   version = "0.2";
 };
 "layouts" = {
   stripPrefix = 0;
-  sha512.run = "61ced1589b90bec6ab903b0af2798fc69a428b9f779a54b62fa9300f10dffd119158f1a61f5c4128eb25725328de9e7904dad872970fc89894b4400a57f02436";
-  sha512.doc = "2a1be947837b7438f714e98aaa6ec992815e51aea825ee6a7014b7b17b0410aaf8696f8d3d05ab081ae079da1fb617415585b9ac3b84948001a7d363eb750771";
-  sha512.source = "18757c8b8590fec84ae6a6d9ab8dea1597fe987e1ac139951a4af625b6210ec38617152b9b96a8fb21a18bd5625040ee6501102a866380874741e3e4be95bb7f";
+  sha512.run = "afd1a5bc597fc55a98084d6f20962295518c80f5a56b0894a3a675feb27797eb49ec90ddc276a829d9dbc9f6d99b0883d5f0e7d06c647b0d2b7b9726bf0a71da";
+  sha512.doc = "393a7436084f4ace080d22f1f4913a7b30a3cc19e9a05b04a66b59cd257e199e466f4dfc271ca2f9ebfb4a4db6ede039fa965fd2e25763e7a3bf055163dc3944";
+  sha512.source = "acf390e822ba0cd22e82e1b1280305b4e93ac674a9a1ffceda02ed0e469f2ecbabac607a845fb1ac2185ab1acc123b5fcca6ab1b0356c75a462f4b18fc96c093";
   hasRunfiles = true;
   version = "2.6d";
 };
 "lazylist" = {
   stripPrefix = 0;
-  sha512.run = "c087e45d4bceafa639d58b9a2b10c8b35359014cb909dfa7a64cf84c94c944271ae3fbc2c2c9f42fada7b491b6836f20241c974d4bfff861405f6a79e26c16c1";
-  sha512.doc = "0d9e46e939f7560a43e5ee15be2d891b122f1fa405e29055b830c8fd05426afcdfeee463a2fe80a3d9a1d2aeecdf751f941834f2e8acedc1fc0b6a6ef1a7eb69";
+  sha512.run = "29f76af5cec8e17ca65a6c35293e77a5f7dd8f060675c4ac2b17e5ad96964809c128ad1bf48888080ddc2fec48d6d8523038aff418adb68da9b681f8e8a315a7";
+  sha512.doc = "278faed3cb463977f078f531ea700702c69d41ab70178c8d934139d2854e54785db4d0d96cc019ecbc4e7346bc6d1ec15f87164aadfbcdae80d4b1ac5bdf5d12";
   hasRunfiles = true;
   version = "1.0a";
 };
 "lccaps" = {
   stripPrefix = 0;
-  sha512.run = "68aafd119b80e4201aecde329bc7231139b7528431dbc917458c3fa14aa94b3a5958220560dcca99938a779dad8c702e492609d82d77cb37bc13ce34f2c54d63";
-  sha512.doc = "9c6e529940ea71ba653819ddf41d4a5572638d622635cbeb75b49fe865d1371477d4d465fe4a220820f7817afcc8896d851da6b48d93eb46b29536256154c6b4";
-  sha512.source = "5b6ae536251ec31a4f5bbd7a3abc48113a8d720f3307cda7869aa69e67969fc018d4ba9425a02e65a045bf45e8388e2e6ff0948d4430b5a8de465448f4ded17a";
+  sha512.run = "2c320bdddb495aa3210df01fc19a7107b62638b84758d4dbd20ed094ae0600a4bf5fd187a8d751a0e6815351b72d707ff229b9790babc5ce46965a1bbeed6900";
+  sha512.doc = "3ac1c1cda03e2fda71fbc53dfb466c284a42904bed46789d2d16aa8c4fe40ab6986ed033f8fe09a7ebc931671eb942350ab7bd3716e0c8578f7f078216803d43";
+  sha512.source = "82764e566b98020f41d43c9f14a24db099943add92d39e25530ec6a5d3c709c32c51ee9bf49fde8b2d9f21bf414f7eefc78b0da687f9c803cda79c1b6b72ec0d";
   hasRunfiles = true;
   version = "1.0";
 };
 "lcd" = {
   stripPrefix = 0;
-  sha512.run = "6a18878e3ba6724a57db3c3af85eb4bdcfeeb030d7edf092da30c0eed8e7a4d53c26a8d9503a3d23334422e0ff3b955092ce85b5fa0386548595eace27410daf";
-  sha512.doc = "37d53aa1168d8c19604aa2d350a19742ceab90690c752b6a74d0f8d75cb7f6ef85a55a72dac0c10f842d789eb64bc5d633257faad77be1e702c0e0a48e20f8b7";
-  sha512.source = "8f07ea037000ac6350810024d8ab901730ead7211680f566c7a5af5225bffe0f9bc548bea33543e9d45af095a24ba835f4fc20543540f56c210c3b3a73568d4f";
+  sha512.run = "425ca583451db97a9bd8f6b2f592e8d00ba42d05e0d4bc2e046225abf0e8ce95568d369f52810728580d79697210a980fd9305ceeedfddfd1911a576ba8a9bfb";
+  sha512.doc = "5cec71471d88414a6c4a93afaf427ccadcde4b7697433bbe1ef81481fcf6c6c352c199ef2a743bac4603ead0cc3d41ad0a2f0241da594b910486bdbbcff907a5";
+  sha512.source = "27d88b6890705c3f3e3f8439594eb95a1456ff34a820ba830f21d865b73cbc8bd01b031de3fb00dab4d1670590664a707c4a7692664224764663afebec0e0843";
   hasRunfiles = true;
   version = "0.3";
 };
 "lcdftypetools" = {
   deps."glyphlist" = tl."glyphlist";
-  sha512.run = "da2568ac9f6134c0efca4e7bd994e7363a3f890b90fe29ac4677a8b3f1fde13d185260f7bd84b53d448a24aef7fcb2de8559e5a54b4fb1f486d9c723ae37797e";
-  sha512.doc = "ba1d803b7abd0154ccd61d0b78cb94ab1b6c57d966a69bdf2fe3b011bd38c16f0b6248f56525a89b87ee66c2b739d7ebd1eca2d631145a2d00853ec665cf31bb";
+  sha512.run = "21afe7cbd70858d22f6e1da50857b8f5c67f806d2719fce2e1e71aa5e75feb51385e1c51ceabda01ac3aff55d081d54fcf4d796a42bd1206f0e111f7a19251c6";
+  sha512.doc = "dde3a638877c8329a9ff3cf092d4692ac19e2f07c81bcc5ed05fd9ec60e3464742ee7143b040d3c6737e8c116bea697483a49dc68ff04f177b745503f11b15c6";
 };
 "lcg" = {
   stripPrefix = 0;
-  sha512.run = "ec52f5f1fdd371dc7581ac18a6c74b01af3143f915db1776b9025004ab4df12dffd51f8bc95efddf571a49cc005692da69c7898f7d647bd606c2bf4add7b836f";
-  sha512.doc = "1375d12aaa55b3009bf591eb65635089c8eb21fc81fbb216508af15fcadeb97d2491eeb4cf561c5a48d0413b76af5e619dd5b7d640aab6949a4481475b604290";
-  sha512.source = "6a084255d3199eaf1835fe05eb9d83a3f8a9e7301887d41c96c2a8322544873d158850198cdde734cdc11721a87963e44f4b79dd1721b9076da9a61ab66f3ff0";
+  sha512.run = "89fdefb7473a17a9478e380e22ce6ca53d6366e6908e57d5fdac6b1e6921b56f8cd1c5036842b92ed12a8a6485d801d1444c78bc9ca4e00f0e00e504c8927ef2";
+  sha512.doc = "26c28718f1e0891a9bc8204d932796f8e988595428f792a56b2d0710513c3c37a897fcd8dc1b7a600bd4b5a3fc95a7b90863b9b697465dbfad76ed138644b659";
+  sha512.source = "49b9721ae1e229c9fb99cb2213c12ab481188a4b20a3a7d310af13d2f8ff4010c952eed14d8ae0f69227c48ab0b585b520d46bd0888da97d90662b7aacce955b";
   hasRunfiles = true;
   version = "1.3";
 };
 "lcyw" = {
   stripPrefix = 0;
-  sha512.run = "ed72909665e648fe61aa66d663bd40bc1e28e7808358358f372f6f51490aa224c997c35457f3e1f43c88a4baed1bff212e2b366d8ad06cd6b277fbe16513b5cf";
-  sha512.doc = "9e7244e7c82259f823b5d769cf0d78f21f380c8fada821cc0eebc3565b3eadcfd85a47c6f442f5efccd18976d49b2540acc003b81ebc4edf296da65582251f48";
-  sha512.source = "6cab67af9beb409950c7f6b74d42e7992e3f2c7b107540a0a57c86475925423225c25250faffedd6a53359c64640521b8f866052cd0e1bb8901c37538beb685a";
+  sha512.run = "06d7593d801f0bf7e7677e759325e3c3deaa2731c62c836740e2b227ad5fb1dab47911f4514b6c4f77cd5666102700b823d56660cd7887d3f4165233ce5a3873";
+  sha512.doc = "aeed5aebb5209094957d580f6b50f48fe1657700e87e514d649a494bd3c72fa81f82b133888588c2992adf3adebbd60e330e12566cb1bbb83b897ade82443012";
+  sha512.source = "3608788b437f93648a5fe35efec5b0cac97a59695d3865e877bff9a5b922fe79cfd60a14f2befeb1a45b94720e63e8af6de39ca3a5222a1f7793ee94e2910876";
   hasRunfiles = true;
   version = "1.1";
 };
 "leading" = {
   stripPrefix = 0;
-  sha512.run = "105a9099152719d19931e1ca250e308f13c3e4c55916b6ee0e8617dc8dfe64ca9eacc68486bd871f2097a88530a2d3e76588e0e0a61ed323d8554e493ffbd6a6";
-  sha512.doc = "2f663eb37226fc0ccf197470dcb520e9d1f2ab7e2550a320a21688e3a0b0aa70cf7377bfeb9952ccaa95a3d4a2f9ab520dfe30675bb6f347aaeb319d2e8b3328";
-  sha512.source = "2d7bf0b7bbd76f4736b8dc5eace10b9341c469ec8a09f6252ddc6133b476be03c9cd075eb329dac688541d987d4925b43a23bbdc673020d84dea9758ab445d39";
+  sha512.run = "41cdc23bc78d019ec78c16dd1bf78e68ebb0cd2d59275c3f5604b8ddc93bec863ada14678f74f85a5232cc3a3ccd693498795f24a84c5d9c14414c72e9ac9bbd";
+  sha512.doc = "5c968b53cabeb8388d914d7d7e5e7839ee4436687d4e01fc3af93c66087d650afaf61f037a466a6c622b6b5aff0f7addd04740e52335508dc361f0fc9eefb330";
+  sha512.source = "4b07e326d00c8bc67bdef641ac52943fa7c3df5d8e96f8e1f524822dfc83afb946bd7d59a88e921ec2cd7cdc2b0bb253b85fe75babf771a2838c618f27c07b76";
   hasRunfiles = true;
   version = "0.3";
 };
 "leadsheets" = {
   stripPrefix = 0;
-  sha512.run = "76adcdb1c5fc5c6087542e4c362c6ea67856c068a3900999989859d60f4e24b14d2d95afb60ff228f2f1b4bac81899e6ee98ec67e9cc9a2ac4e09ecada6aa4e2";
-  sha512.doc = "fd832c1c3bba1cf826fa6f83748e551c486e446aa7d7324b20cfffd9c86eb5b4cefb7d70b910869346e149d70e40f67ece9f6c27237ef1b2ddba830aff6734b7";
+  sha512.run = "fab88dec28299b87a46d7cdac74ce21d897b91bdbfd7cf755a8e7df7a703bda0c804067b574ec1692f028ed2b35f4be3fd6bb6fe4ae02eecb7297b20e2b3ba65";
+  sha512.doc = "3c1530c52c140b5384a454756db69987ad25d336b69d7f2a58e38106fe16d11f919131c9ce99a107766dc6756942bbf35b3b3f16a4719e97dfd659f96fecc820";
   hasRunfiles = true;
   version = "0.5b";
 };
 "leaflet" = {
   stripPrefix = 0;
-  sha512.run = "27c1125bb283f8507ad3628e5dc2e84454e8ef5ff730f91f36a044d1f315324f8a3887ef58124b166396c6512677737db0dc38536249648dd9fc3f630e51436b";
-  sha512.doc = "013a4ef9bf00911318d3648acdbe8f3b4d5983692936d793e1d893f6c2696ccb23dd4726706209502a731e1fd7eecd6f0708e77a37c3091ae1125d59ed323354";
-  sha512.source = "d2862ecd6b6e989197c407a893b52d0651cc16696b5f55ba6c00690185bae1e9a418b7316d08e1bd00df59af096ad3d3d9e6892e9859837f32e97bec81cc7574";
+  sha512.run = "ec5fbc63796f12c9769055dcabcaa27f83e79296c59628ce127fad9610dcf3385ff5491eb61ddce2ade5e1a179f285bf6de70756e8711752f1ab1e0528eaaeb8";
+  sha512.doc = "340ae2a34093a8881af2f5c5dfd457035c801d823d58b21a6c29029dd662f0a3ba7c949cdb6d7d6983b05bcf25d375de086584f08ba9df85a25b1ed894d33172";
+  sha512.source = "8613594c43cccdf38b1111e8604b909d23a19117e3b83dc7a5e46c71df019ae5bea939248e1bf12e5bcc5e5c7c1525a1aad76787b42754be6cef9d8486fd0bc5";
   hasRunfiles = true;
   version = "1.1b";
 };
 "lecturer" = {
   stripPrefix = 0;
-  sha512.run = "14496a7c36209243d1b78554a4ade2dfa266f8451b52003f7a7222ce226bad7218eb87caf8af9df18524c9bee47bd6280eaf017a82638327e709b9a2f31a73fa";
-  sha512.doc = "e12165f31352e6542df0d6f03e26ccc066356cbf9de8a070dbc58ed43f7707e2c088dba4b085d3f3e9597ec9f27ed0ab5da3b47f0f4444ce0725b02ccd19a9cc";
+  sha512.run = "83e7f939ac36a64cae61bc6ddd80adf80b61b17cef34641728a77f5c5915125e457deba21232fdb712d07c1f2d2ea4ba65ecb427829f8d907620070f72a4aff6";
+  sha512.doc = "da11916f3fe603cb276466e9dd732912a3c831c693d73ef46ed623ed45c2b1843275c95ac1a7fe83c95f922867e4859ef9769b0acf2f2465c6cc2934a2494cc3";
   hasRunfiles = true;
 };
 "ledmac" = {
   stripPrefix = 0;
-  sha512.run = "ee484e4dd117f4f3a316a2af3034696854247fa2063a885daf8b07ed3c346dc3a0d529b58d92fe882ad7499fb65c555b78f56568a2b41809f82bcef4184aa64f";
-  sha512.doc = "544243f028e1ab925c4f499197c0759a9eacab054e86a0a17ce04852e84fb55fab297b377817b777964a1c554f972cff023dfdf993d88bf7002445537d3bb225";
-  sha512.source = "9b946c70b1bad3e4150560f6c8b810dc8f5a3abfdbf71bbb8f2852853a572bf9fa0a389b4715866ff49fe6e4993f4712ae54000fc6957ad167c5bff86fe1198f";
+  sha512.run = "65e45edcf5604e11637f03d55bd43acbf18e64d744bf0e5d4488c46acad1b8068cea8ab7bd68700fe0668c1dd28cf4177c0d61a76f7cd6098df8fc2eb1abec4b";
+  sha512.doc = "a69b57d1c69ef55d6d09802cad31f847b0056592f953d07b9d2db7375fcf19d21de36bf445dcbef00d9790caad5a0c994619e38c79693d2122051dc95b5593c0";
+  sha512.source = "abc52058cecd0b472d0caf9ecc1aef9f836e7ebd0af7c2261b646c51183231a3b7b02e7f977e79bff5748e125219fa5a47a36ab4e006dc555c95993ffa58832d";
   hasRunfiles = true;
   version = "0.19.4";
 };
 "leftidx" = {
   stripPrefix = 0;
-  sha512.run = "a96938daca611329ef760a9118925f457c6bce69b2271eff962d1069acf060722f68b3eafa09900422fb8463f55011bd954dff027358e6f2bc554d557d42fd6e";
-  sha512.doc = "277d790021504a2c20725c1a6725dcc169af19bedbd0807a20be1878d9ae71c3a334f02e29393aebbdaec6c5e1b6a9ebb1550468ed4d63ddcc5e3c70b1d24a75";
-  sha512.source = "892203a421d8094351e0d89b0a02ade7555cf82a4f17b00ce751cf0163eac333c580f0302875075cf4d378a233a49111a9c274b68784d6c470d6005fd4a253bb";
+  sha512.run = "62ce66f61829e230f46043dd54e2a5a3e87a5ce9f8faea9322ec7075754542370395d42796a609f456d22e222e679d24215cfe13cb99bf9a6abd305c3b519780";
+  sha512.doc = "5f92c6b8a7236406870edaa356ba0f47a32ab2c1b97d7fd71db11fc9d30cb87d56f2cffdfe87f2a151d4472a2ffe2c7227babf389d7a4fe9f61bcb54767db7bb";
+  sha512.source = "357f89ac6c87dbc22023e97ed4ea61c30f8bc477f9f351055656db77d02d5d6da88e2fc2881e981c57b477cc81553e8f6a2978360bc7d4b73d2680633675c4d8";
   hasRunfiles = true;
 };
 "leipzig" = {
   stripPrefix = 0;
-  sha512.run = "6f87196cc9c664a2a2ceeb7d68cba8b8c888d614d668b78c643d4bf099e171d7a41222caa401862ed28506526283de3ad33424ce692ee681a3471f5ba2f275a7";
-  sha512.doc = "0243dee577dc4e33bab5629ae673cd3a4eafda06dfb2f2a18d6cf874eeb272675d7935f6b0b1dc062a649fc43874cf5fd65b7845ce89ee54b64793df55fde5ac";
-  sha512.source = "2d35a5b27c0f4bd1d3ab83a04ff482e569b05980fbdacc9268bf961e0c1ecba26fb5cb26d6a84b13e1f2b4f3c50c4c6f3b8c6b322a48f550bb06f574322cb407";
+  sha512.run = "01c4af894b45cc257dcd378ac6397c1dc39e9e11830cf43bed2a0309ae7e903379749100ed23206fdc69729720d211222990d50907a4372ffec243967010dd23";
+  sha512.doc = "53b006d654a65b344bd4a0895ad8b7f9b1d3d2a1d4090af5f60b3c3145346f3ea67462c7ff268015f1812915c65404807a66ac764f2cbf3444a184190bf9ef36";
+  sha512.source = "a55034b92b4344565e48a93576d81cdbd2beae9b46fc5064dfe4fd15ef045c9c22a88a0d73ea3d26b9c98bde8bf87ba1694cb5f71418fa4ca91ecf26275e0429";
   hasRunfiles = true;
   version = "2.0";
 };
 "lengthconvert" = {
   stripPrefix = 0;
-  sha512.run = "a275b7d339c777cd52d56d9c38cceed4b6c3bc194f65a76a61f0a68b34cd4118f81a8438c6f6311cc2187fcddf3c1431de7e3e98c2358e8eed432d947a20baa6";
-  sha512.doc = "17a73183b7680512e39183a231587568902b4b915e73c35236c6e033dcbeaafd269006d099195852f82da1b8167c9d8b9733da930969a37146319751743583d6";
-  sha512.source = "d9948393de8a8f3f84f6d0b679ca45015628b2f55147e188ad5034731f5c3a11edbaacbdd2bb084ff289dbb93bfadfad384b9a7d396090b162f7debbcb8fb2d4";
+  sha512.run = "298ba87fb340501f45631cda04d4ca623b8ee6db47c57431e4b202f1b26c35c52af22059786685cbf766cf72512cd63c1ea172a86842c7c87db4c3e8977c11a5";
+  sha512.doc = "f8f7a2729925cc43c3bb02ddaec1ea9bcb62ec7a12a1d40c9ff59d48bc4d85071b9d6a085e6a5f0a8eec37426a12887be031ab244177b85f78ac5d3f4ad828ee";
+  sha512.source = "0b7e75e53795317ea35d0d5aef36f860404c88148ada824f14061e9c70c6cf1dfc3d57366ae86c194b20c99b9dcf7101fb00203f5a206da42ceeffdbe8e2287b";
   hasRunfiles = true;
   version = "1.0a";
 };
 "lettre" = {
   stripPrefix = 0;
-  sha512.run = "b1acf94a16d8bfa5cd4f787944713d6550dd8df541e53a1fbafd493a29c9d7e524b4123a15adfe42a2d9e3b4d43139f9bbfab5e86dd7ea177786c3be7576accc";
-  sha512.doc = "44d63b455ec4e26aeb875bda8281a011cb64cc052b8e7227ec3ceeab810b07d1dfa767cadceae0f65a940f969c1377fd34518a4492b4f2170571de52112d91ca";
+  sha512.run = "ab91841ac2a8f724b6d99e71c0bb14642015be8237b7316530b111194b1d681edb65250649234d646aeaa020b1fbe576056c6440f22ac86855f17a0d0dcfaf64";
+  sha512.doc = "065a4226ac3d295ba1acbe8c36e874a38ae8f9ebcc35941f4ad186c0c313c4f25ebe1da0b5f143c19a7fc0db9cee404cac2e80d96faddc395678893240836128";
   hasRunfiles = true;
   version = "3.000";
 };
 "lettrine" = {
   stripPrefix = 0;
-  sha512.run = "f9e15a3842e5ce0202edff14eb052beab2ccf8558d5abd5efe81ebdc766bb6c35e102941877e8fe0ccb0c8f8a7c58652a7dc91beb661f0bc8856f2a65adf4272";
-  sha512.doc = "f4486723e0f9a8cdcc9f6e2ebbec6b643ad03c6a768c211f4e1cfecfd5d3eb36b2d9a8616571667ed57af8569665e7e816baf74d27e0fb8378dcd9acef88a884";
-  sha512.source = "eaef1a00456fe48ad32bad56506f7f64ce9037f4cb683bc7e6e854e7fd3c1f4eb33ea92581a5d75cc6c4d070a4c74dc9991f036a25943077b4f761f74910932c";
+  sha512.run = "d5e6b1d622a7ffbd7fe4a0285a36a058d12726452543c5aca88736272428761ffb7af654a8030f7a76f7e99a57c77543ce48a030a525f2257ad2654deb86d378";
+  sha512.doc = "356cccecc735bf5c05b02076c06d94dccf258ec6f8b0a45d041ec28ad042531aaeb571e9af423051c4c41b1fc78b1d6c37280e1778df9cb1920c52e2bb905106";
+  sha512.source = "46f0329eb987e29104379b28b341208bdcbeda52b41bf7215345acbc26fcb4bb2f892b6e8e395325544b3f079c3c44b377803562494952b149ac9888bbb7d340";
   hasRunfiles = true;
-  version = "1.9";
+  version = "2.2";
 };
 "levy" = {
   stripPrefix = 0;
-  sha512.run = "30f228496d77f58d5ff87b13de1dc31d073739701a1b294040b72059112fb2af818dc2ec020195512a8f3b282e883e72fc1aba82f80e4264e687a8a9d9c52a63";
-  sha512.doc = "b4a7dbe81e752eebae0a0623a828fca9f95d56593fec150a31165f2f0ff411a5fa3dc0ea55a8baf3df867ce6e006d8721270f6b7bc53f83296b158064518874e";
+  sha512.run = "a5bb7cb28f47789cf2226ce2fca931e3c321006a4de85999c9728b80189d40baaf308c9d08d1b6d34f93c3e1195f1d4c466a0a20e4a20fa37e93741d32193817";
+  sha512.doc = "bb2139366326e8af4a12b05a56c6e51841437e26cf9320f4202d7c25bef4bd0a92da1cedddd9204833de2f2e18d1f3e2a69da0480dcb1e417ffa7902cdd9feb2";
   hasRunfiles = true;
 };
 "lewis" = {
   stripPrefix = 0;
-  sha512.run = "61abf94fd822e4f4024d87263de75dd5f0f25dc7b34dd236e94867aaa066c6b08f3baf4220cf1c98e39e8c2bf0df23cf79e1fcde5b6b49b1d08c97d898eb2ada";
-  sha512.doc = "5e0c052030279023e5958fc77c826c30b6dfec06dbb901f172694eb9169b7e3aa6b245ccb5adc23e03efae0f55cb8dbed832e9c4e63bf0752ee0e07d151e3db3";
+  sha512.run = "5db517ada9c6f82c3c3fb87177aac8bd5f81bad8b4defa524b4a90f5a029cabea9892230ed43b05de0364483215a41f1941bbd55eba660b0e30200e443d6ee70";
+  sha512.doc = "d9c46eeb1510c78037e435995a97e047f482b230066f32dfcb3de00468c8fb008614cb79ab730f081f4d06b7828e61ff8b2fd92f1a136ee75b9e7fa6ee12c45b";
   hasRunfiles = true;
   version = "0.1";
 };
 "lexikon" = {
   stripPrefix = 0;
-  sha512.run = "879d0502d1d3a0af7aeab7d8d91c015d1f8cc2be68106a5e84f8421a562e96ee695412693be9c3805cef911045c33058b68f6f0997cd86635a74c430b52d961b";
-  sha512.doc = "049b022694280ce8d427b68a98cf267510838963ea7e4ea06491a700a9208ad7fb9e26a9f185aa2ac46be6884ac24774e9f8bd7c2fde3e3e4d4cede4410925d5";
+  sha512.run = "7b961acfc7efcd079fadb1c1346993b8df00dbb7b6e3dec427c39e0edf5fe7c4406cd945ed5f4be5fe624446c7fa2a654b2569064294bc6369abc8f3e3bc8b84";
+  sha512.doc = "3d38a9c2b52872be2b4ac432c6dfc4a9a16ac8e45875c78da79972c0bf0177c9419aaf28999e016c9ee73fb003fc16b0194472e0bca608335ae0c9afdeb186d0";
   hasRunfiles = true;
   version = "1.0c";
 };
 "lexref" = {
   stripPrefix = 0;
-  sha512.run = "9cd6a479db2cc4412b7bdbefa9e374c0c586bc21377ea95c627651cb0643ee469a45e71f3311baf78260f4bafd52d0ee63d8017e90909e0edbc5b2f2b93f8f56";
-  sha512.doc = "a01be087762959791dc6159efbcfd38a8522cdcfd1de969f8306d9b242fb1e8ef24c639ea2283abf543a5519976358de43db34cee0663bc60cf7e123072b3be0";
+  sha512.run = "cdb84262dafc2cb7389c2e14d22f3fec2b01aaf50c2558b5d7ac7b0d669682e22263b080402548f4d590c1f9b1ca0fc25f37e1b63afd95fbd7d4fd51377f6381";
+  sha512.doc = "bc99ae9c5f2fb643698e7d10220648e49b9175e4852e8405c622c9b7a5557b9e283916354109f9de789f4136c81acc09a4262016e644c49a1c301392a3e121cc";
   hasRunfiles = true;
   version = "1.1a";
 };
 "lfb" = {
   stripPrefix = 0;
-  sha512.run = "a6b912d9338a6fb41c32172a1c81fe0f23f8403612f333c833a8e757ab820c723a883d1b93677b5ee4217fe6335a3ed050721ea44de99b59240058e0b71fe0b8";
-  sha512.doc = "2d3fe6e14bac5d0d57beccafe48607990b12628b89dc35acd3ba8625e08ae6ad5cc72815b62f1954a915dffb492030942268e5a278d133c53a1944626059cdc1";
+  sha512.run = "1dafc6843bac872c9004f9d4aca4a0bf1246f023714e8414e40bcac98f000d1aa3cf06b2135ae03246f82967d59d089f09a9dcfb9bb2b40d1a49fba6040e2000";
+  sha512.doc = "2fff337f7b0db8b0ecc9f6ce0759b78b167659ad53e1daba78d86948e542d3ebece985ea35c9075a4ef58ed82e864ca8de316bc71a816d64174938dabbcd09cd";
   hasRunfiles = true;
   version = "1.0";
 };
 "lgreek" = {
   stripPrefix = 0;
-  sha512.run = "e384a66e808ea9514580cb3101a670ea1c9d2826c5913ae4651b3b57035c74fc5d35b3b9fef5a02d4c2e8c306c5f9083133547a50781b5f32f8be06358448cf1";
-  sha512.doc = "bea42993770f2a7e2b43332009a82088db4db0a787c41240b9a3b8654ce4d6cc330d2e4763c4274def5d31ee4206ec8fd242835cbfcfc938806a29970d6ca830";
+  sha512.run = "b549da22d5b6e59c99c989155903c20a3c3121b8217c8c39febb61df4481d5d1d751c134f25f80958f38d8de79dafecbb4f7b2b8316ed2e6650ee256cc3e6f18";
+  sha512.doc = "89beee9af80b1cf584519ec49f3cdf1f1be6a3316281a73847b40165ef7658b9c4ad0dc1a78ed8c3800503aa90e924055247e059dfd3c8dd0b96816d9ca4f2f7";
   hasRunfiles = true;
 };
 "lh" = {
   stripPrefix = 0;
   deps."ec" = tl."ec";
-  sha512.run = "9770669e0fcc5582de399b042709b6eb914def5214ad7dac0df58a4cedc25ccc3c4b28b2aab1bc42f0e8b62c176eb297822e378a81c19552a3cc28f918b03f15";
-  sha512.doc = "c63ed045f20ac09ee1b156042c1dec5cb55d9d5dba550217aaf8c0ce1db657a5efeb31c5c3b4736ad78bd918764c218b79ca4d25423048288e95d958da312c1e";
-  sha512.source = "b93956ae1543ae8a32bf679cbe1f638ec365e3a3838705ae333063c1fe5cb05e24d075bed2fae6b856208b075744a529bf788d74b5b881d5f2c20f6aea99cd49";
+  sha512.run = "dd30f3fc1ad7fb479a53dfd98d50562f47c9db7f8846b10e38f0f80e5ddeb46cc0d544761833126254b3f4f595e0731fd69a8bf4bca08523991476dbdafcf970";
+  sha512.doc = "484e5edb67cea104ded9d244f9b3bd4afb6cb8028fcedec2eb37070f916043afa4b847830a443c8bd2f399b2b2c8d369d13cb82545679741100936c49dc9ace8";
+  sha512.source = "4013ee8ea1d43820a0c8abfee4b680dbdd15ccb9a27fcb1236c12773188a83fe1a58bb837349d69689c1dc8cb6feb781b3ecfac9b7a31d61a7dd2ebc0a1d97e9";
   hasRunfiles = true;
   version = "3.5g";
 };
 "lhcyr" = {
   stripPrefix = 0;
-  sha512.run = "8984a07bb6e40d8b79084dc86d798dca9ade631af35311fb795a7d62124341f8c9715633756cf8d195ec7fc00403f14ec1dfe64b981309b8d4035272eabd24b5";
-  sha512.source = "c40f2a1aaa7fbdb00f3fab1d445af339c02fdbdc81271f3e6208ec2cc871c7633d3f5198eb33df39a9dfc2a3c77578c8156c81ff101ae3c656d010a23502290c";
+  sha512.run = "888771a6b161d79aee90373fc39ad541260d121513e81801142c66ca1f2085a739fd1b243e45adc11b5d33a72534cdfad5d9ee87f15d432a732063c3befab487";
+  sha512.source = "3b9db27f86d31800bb837ddac0cc1fb3270e4d2e751e5a96ec8e26817aa3a7a3832f2833665bb9e0256da5494f5dd04e9660fc2d2d8c5dfc06d1c06ca8c1efce";
   hasRunfiles = true;
 };
 "lhelp" = {
   stripPrefix = 0;
-  sha512.run = "201dc2abd26502b5fe35343d3849fa10e026e6382ba54a3a4c01e168c48ca0739fc983b1ef1aab513199f1313cc3de71de0c778a6639d9fc53e73fde6f044692";
-  sha512.doc = "09af222db58a8678870a96472be8645cbcb427e5f1f6e7c4cafde159f51370a67ae013c1ad94dca4ca8e79957790ca8e487519744c165201ba2b5db3f7f46d49";
-  sha512.source = "b3984ddfdc303fe63fc79d283446abcaebfcf2d3f7c177ef43231d4030854cf0dcb61d7150265beadd380c006013b48d2ded2a43aca591a32b0747550c747118";
+  sha512.run = "d0eaf745f3488d62ea5be89aa899fcf65b8f82e610e4335a766fded0f0c8ea0b947bbefaacd9b0223b5c251d55e6a096845578659271be31e0e27d692fd9c6d4";
+  sha512.doc = "d0523bb786fb1b877410fd17be4106133e1fcb1d98050b3e0a800d3fd8c7ff12e23ff8e0e953f1610e54d03cafea68457d647ffe9c266359894f568ca1c7f7a1";
+  sha512.source = "2fef4ea70694858c5d4f347e3b5f389133237e16ed6f04fbb60a57d99cce4e3fcd5be681b2e875389aa42adf496297090fee7e2ee87e1269642640d07302be19";
   hasRunfiles = true;
   version = "2.0";
 };
 "libertine" = {
   stripPrefix = 0;
-  sha512.run = "4c9d7961fa783dd5b405ebe8defc3924358a21f0a1a2c963f478e1fa25534ded7a1c4ce98fea95980a325ea2f2cab9657ee0807989ce1b7d46de9a059b4eca7b";
-  sha512.doc = "161aaea4415c81e8be9b15f2f6f8ab040cbeac2b163d9f84a11b2bbed83dcac1c15f009229819c50baecc3aac4af952c09ddb6883fd9f95333102b8fd234f6ea";
+  sha512.run = "9e2aa4193445fc7c5450bbd91313524b8803c8973e6022440deb7d22edeaf999d50f264b76e8d856c6e1884d22a65c94c03461da5d5c7a3798af53a5d3b8fb0e";
+  sha512.doc = "1328fbfe302e865f7484fd918c50eba5652368dee489a28b3feebf93b2cd6bbd855d24f4328ed6bc363819c106e27cf1185568b6b5b4dd9347956a981c41cc9c";
   hasRunfiles = true;
   version = "5.3.0";
 };
 "libertinegc" = {
   stripPrefix = 0;
-  sha512.run = "f70161b8571b622fcc0cda333bafa72405ee4ef7adba5141bf77af067485b6153973e5ff7af3517943c253ec296a3a45052fe3909137205ee471c251fd003556";
-  sha512.doc = "4b379d112b1775b72e746bab2c68f63678644844e34e98db7db3bc1e5b7313ac0a1e07077662ab95b572cbf70c2f6728938ac08130adf9f3ccfa8c8a89730f07";
+  sha512.run = "40e7c0bb1d5f53954744b063b8449ad79e06397e390d949d6d9b724bb25606e6556b8054f8e94b387aa2345bcdffd64b59dd09a8a2d82d7a8b3b98f4e16eb1b0";
+  sha512.doc = "ec84115defbef11550e0267bf55e17916e8209273fd5d0c6be02d0b40eaf3e47b80d00f0d10a028f6346c1a7ca3294f04d92e5a38667170c8faf6576d204117a";
   hasRunfiles = true;
   version = "1.01";
 };
 "libertinus" = {
   stripPrefix = 0;
-  sha512.run = "9fc0c37a949630a07d045740c8f478bb478f27a43359c634cd8f8a46a6fd3c595558ec8e717f885b92381525278c6c5925aababef1d6a98bd0b146e4ec0d2445";
-  sha512.doc = "3eaf8d6a34c1b5fe192d3ed644e646a0ae43c276972e0121b463630e6a3ffa721ec5092c3b0e25d96f59ab92a81061502494ff794f26a0a8b24f7a49d8bd0d38";
+  sha512.run = "c2606a4ca53b0f028072fd81a751c2f0bac86452ee80a76685f0661efa833db0fb0d7fc3f2dfcac544b3b33b023d6d2643ff428dea68aad37fc4792e4020baa4";
+  sha512.doc = "490c5ec0f63d2b4704e2d25dda0df615e7076edf92e4f2cb5957ccb0da65b9dbbef6aa442401c5019c8ad2b9e32573aa9e93fd8772732061184370c6ab02fc94";
   hasRunfiles = true;
-  version = "6.4";
+  version = "6.6";
+};
+"libertinus-otf" = {
+  stripPrefix = 0;
+  sha512.run = "28aff0816d8b301177baa5e1ae5101c972fe5b70287c8424f15cc6e0068b2e8a7ff4d6c302b48fa0554968f641a84df86e1accc0355127bee606c66ecc3d44a7";
+  sha512.doc = "1a055f4ba187d6f63f681638ec6656432b5d173ade8880fbeac36db871ec616a7086c18f7ea5467eaf7c7236b02a4081059a9fef96a2a3c0e202240aea4fd57c";
+  hasRunfiles = true;
+  version = "0.11";
 };
 "libertinust1math" = {
   stripPrefix = 0;
-  sha512.run = "1278414ff7276a740ce1cc9c403ce006deb122e0aaabb12260f6c2479dc0a87a46fd2d167e7946345dce35ac35e3c9f43166ddb36ea28b4f58290e444a875ea9";
-  sha512.doc = "d438d26bd9071fa6fe2a48e88b3b1de96c42a75326890bd8cb8a16b501efdf4140a87b954efde7cea65f273a037626423c64fe2ae308c30851dc743a277c35db";
+  sha512.run = "3ce26f940c8c33e7a7126f214b8b2df3b2ff62e846b3db244b88a80e1689264c63a80f37032ffb4b0f28e0d99f1e22d4627e804293f3ccfbcc26a4cb1b4cdb5d";
+  sha512.doc = "922c41278e4c5101b85b468c484a28fd93d7ccbff47f19618222f217aa8abc72cf8f6fc258404c7b8db2b0eaa457e48925f6978bce5421f5e778597bcd308144";
   hasRunfiles = true;
-  version = "1.1.4";
+  version = "1.1.7";
 };
 "libgreek" = {
   stripPrefix = 0;
-  sha512.run = "dacbd366995d65900fb7827db67f0e68d2a93ade15c78426c147bed7b619c6badc97f1223ea7f2bfb7eef3a65d834a961273418753821f72f1bb490b8457c252";
-  sha512.doc = "e1654411fb18daddd2245f361184c8b20ab8e1c322c4de922a02298d41c1d8d4636b8cf7240f4ca346f1d339948249929ead1f63931f6f3d7b956c8f5c0dba94";
-  sha512.source = "90bd6ae652a339c6d3203672dcdf02b10338577fe64f5ad4884a39ca33f26a7f7d37dbd2ca865cf28aba79fc884292ff1df87a6ba09c2dd5172c053661836c07";
+  sha512.run = "8a28488f95ba9e527c4597c306d07d904255644d17aa6ea27ba6dff41ba75f83751dd7715f6bdda076bcb1223ab781551a8b1cca14f235dc47efede5104a6df4";
+  sha512.doc = "f911a73807e47445d2e2b3a69a86e507dd9cc1f7066ad97aad6b10a763316ecbccd21d2320defcdf1cc6c3526ac29070786c92e4def880a55bb1aef3c3e5c380";
+  sha512.source = "97a0bba573ceda152867feb66bd1e155cee0e169251b055bc043b165e2f13ba719797d20f76916fccf8fe2475638dcd089530bd14204a604a0a9dd55cfcdafcb";
   hasRunfiles = true;
   version = "1.0";
 };
 "librarian" = {
   stripPrefix = 0;
-  sha512.run = "37b546b16928d6b58c8f563f8e3ac68385957960e608582d6cd52e350b06f3fef15f344b50ae69ef3ac4437107cd65089bea8b0fb7f1c92958763e3b8ed47422";
-  sha512.doc = "413b745f254b69ee3bb5cee6c6feaa4deaf98db4b3fa1f54e6da74176c2de6241e28ecc1acf1e3bab1feb3dbac418215c44d5ab2e8b4419a9dbc2cad8db5d64f";
+  sha512.run = "93bee0564437b85eaa0129baac0bc9cc8e372bc9bcd516a59bc8cb811417e3bde58410b2de28defcd8a9898aa7a301a65e15d6d1549be764708f2040f5197004";
+  sha512.doc = "e10d41fd7dd6152e9a8e5d25422dca7b3b787a1d0bd9d1c17ad7e47650706639c05de5106be42468cf9c94c657731efbd57b55288cb75769633e6ae026456231";
   hasRunfiles = true;
   version = "1.0";
 };
 "librebaskerville" = {
   stripPrefix = 0;
-  sha512.run = "86953b3a087b7b31bb9193a6fea8d5e46848446cf6593e2a27b6fe5d8d0ce72a1eed8a2843fbd89c75cf8c610821253210d7a1749ca2664e5f7fbadfd8c1728f";
-  sha512.doc = "57932d118bfa5312333ab93869c9ab175d81884a4a1fe22e02a3c3f81fd2f88151cc5c56b58a0b32387491870c812fd01953ddcb67e350a0b187057495429e97";
+  sha512.run = "43d6270943eb0f88fdd4f033eb9a3be7092d123e6467aa39a259820df931f529ee1a2b3faac420ea3ef2a61ad982c4a45e349d57ac9aee9873b8cc3bf7017f0a";
+  sha512.doc = "73c9e6b1f6cdbc0de8cc5f2bb91e98aeefd4915d1c72815843ef77d568c68ab8b4d0b12e6ce6ad7e46b2cec6a2d2c82ed5e74bc63beada3488faeedc698a6766";
   hasRunfiles = true;
 };
 "librebodoni" = {
   stripPrefix = 0;
-  sha512.run = "22600b6e50fec3af193f6f53ac7a30299136dbc09e8046e6b0fd25ad8172e2c2a39b3d5d79c4c3e57e2c1e5c2393f967966761ee8638a41ed887e8ef1d964d1a";
-  sha512.doc = "a3dd690860397fef72aad7906f48abf32477f7fb18fc099009f6a846a273fadd0b7ea71c95cb875fc38213bd4266ccd2be96b25f88d097fa295f7eb767545037";
+  sha512.run = "d11dda0a5866751272be5f96a6ff3a946cf0b766bd1dcb8e447062c8d79cf64ead0ba25bb1e2d8928d5d7f935e5b6566f7b09a25a688b9a98393528a2c16d9c9";
+  sha512.doc = "75fdab1f2c972ebe17c12b5f637cbf4ca1c0bd502092a995270c45b6fcaa768e0cb0ed3c82ddf5926beda637cfb3d5a55afe8b45435357b96bcb8ffc32390572";
   hasRunfiles = true;
 };
 "librecaslon" = {
   stripPrefix = 0;
-  sha512.run = "3846bbf6027ac8e0afbf946e69403db0eddcd82885e615639ff6ae418d709784a230c7107ecf26ad360c37ce79d2231671b2ee0b1cdbd049241182091e98c9ed";
-  sha512.doc = "eb2ccbd26666502993a64cf8046a2dece25824eac04729edb7bc5622bf95bd3960ba56d72598d4dee011b3c5bd93c5e47611b3fe25d9a629f8eab36ab5dcefc1";
+  sha512.run = "9148c0d56c472dce6d28924b3f7ccf66d3758d421a9232758786ff37627b2891c3539fee48c6e453dc7c6f9dd1018b5db319155f9cee85f6944617549fb7d0b6";
+  sha512.doc = "d8d586fba45bb5752ad3416f29e964df80cb3f5e61132f6a6006ecceba6e1483b8672617a6b7659ece2e438c5aaa5b2f9668c3b549a9a539228431fd8fb6e331";
   hasRunfiles = true;
 };
 "libris" = {
   stripPrefix = 0;
-  sha512.run = "d05ee7f099e501fe7027c008e599fc37b4a239d717e9fe69f88822336470abe1c2db84f164f75dcb626d0e2027351880f3399096024eafa09d0cff564a3f4afc";
-  sha512.doc = "efc12622c48baf467f233b2845f32802248eaa654345716951d77c84e52097e683a54634b838e7821d11046ab41299da6d0f9d646ab87df08350bb9b460021e0";
-  sha512.source = "f65829aa8a0fb0333b53826c631a3e201d12b7286bd467f17e6dec30b742e6a8172872a0d2b427f5e53946c6411e93afbd29a55463c667849e5bdc2a54040146";
+  sha512.run = "4800226965f7876d460dfc2b54eb94be7f8a0f785e8ac09c2fd37b92dab4aa1f6824887d34b3bea3b1050ab0ee7f4eeda43518a5de4de7736c4ea3f6f4a9a833";
+  sha512.doc = "33b8383999393f68cc0a68ccfcff3f58f1c1ab5bcaf5045e3b6b51235fbba02eb941cbecc713606ade8fc5dd0fb616bd47891cd1c9980bcf73b64abc6554d524";
+  sha512.source = "1cd2d076295b1df4523ebf0b809fd3ddb8535567564647942c128bc620f4d71a9d8f2b7109fa06e176156a050bc7f606f81fc1362cc0a50f03bc325bfbac1d1c";
   hasRunfiles = true;
   version = "1.007";
 };
 "lilyglyphs" = {
-  sha512.run = "ea36d715eb258d7790c92ed3a2d459b024d9a782792b6cd03d67ab84fd17af37097c5c3a8f9cc2f9883ff72d21acdff2a36265ac06a2bbe96d517a7d4a72aee4";
-  sha512.doc = "df110ee71498ba8e1cd536cbe50a80b91ff07b7ce0b43838bfa8fa121a059bafaf1f033c61b21c10a855623ad5e24bd6b4b56399c28ea1ce35a27dda643f14e1";
-  sha512.source = "bfdb720321b9769b762e3e441049b0260fc3b910e481316b0d6487226014428e1b86d1dbce4bf6cb57f9190a059c74e37da49fca4d6914403e849f759ef2b6a7";
+  sha512.run = "708d545b10251fd31c89ca3903e226dcc63c78ac77a8d036b3475ed1d5d396f3087b8dd2ec0aafebac65223ae4569d1c66171fcebdff5e06f37fffb3f45eac30";
+  sha512.doc = "455e55a342445cd98616033098c37031c60429df822e89b344db80fab3e7b30b4518cbfef539b7594a29347c6998794696c9011a2a413a112a369be422f002a2";
+  sha512.source = "99675f5eec7e580af74fda6e646a1b6acc2541825e9fbbc83cad40f7737b5c35cf399290e35f622424d6e38a3bf3999ae4c62cb1c188c501bd52b7ab5899287c";
   hasRunfiles = true;
   version = "0.2.3";
 };
 "limap" = {
   stripPrefix = 0;
-  sha512.run = "25fc0d9bf29e5b4b4312e8b7165479ea1d9a1dd65f645ac85a6efb8c0eb0208d42da8d40e9cb5ab8712ee934c14a21d2dca161877bb3ceafd79505eb16d36038";
-  sha512.doc = "f6548c21fb9ee32b4f6906bac884d8e49b0aa1b083db3a49ffa8c8ebce6647770551f179bc6a338dc66191922c7bcce6d82810579a9ed91a49889af2873fb5c0";
-  sha512.source = "bb949dab7b46aaf19bd9d1a9f8488c1be245d814b1fb59b3e2ed58e76b3c30762977767685b0ee2db37998d87178986de8623d9a1b90da6a2a6ed2079add21a5";
+  sha512.run = "56202d76d91cb7da45cf5a94805f222b601e23ed907f6c6611ad9ea06c3da553e8ffb9dd342ad4c3c44acaa9f683c08b082c40cd78faf8208c3b9328c74c4acc";
+  sha512.doc = "55d48fa928eedebc30ed267232011829504ec2657676115521106e161b5efcb10b02572d040db316f73ed62cf78eb8d9486032e5d85e185e28294c476207da0a";
+  sha512.source = "a190500623b9c819f6678540979d67b18e803d8d2be39e94e3d4019dbff87901efbe31789fda153241445dcb88aa08de6f01748deab194eef94f7e8708e650b5";
   hasRunfiles = true;
   version = "2.2";
 };
 "limecv" = {
   stripPrefix = 0;
-  sha512.run = "f1b7b470651781530cc246bc9986eaad0f49378f9e952d816769c3f08e56458fcf8c1d7576179ffb999fce958dce79fe3320d434f82453abaa9c7807a8c9d620";
-  sha512.doc = "5762f9d12c6191544ef752490895bb6c266ca1d25c44b65caa585230e5865b191c6223347cd6f19396c1f72840423480996feb90f80c773160ed0358dc7b8381";
-  sha512.source = "b56bfe74e00a7525eb1642d0e50511990493afbc0b3368a84ec484bbeca766f190083a7d66dab54240ae896739caa428bc91696c58a12130c73241ce87202761";
+  sha512.run = "9649b976ed0bc8cee8f04d3f2bd51fb2a934bf07900c6c62ada42eaefff8a77a99557c78e3dfa7cc452d3208e15a3e6ed83671c36cc37ad2c61bfa4873b50ed5";
+  sha512.doc = "b93f3141f0347fb7f07b2329f5989363ff966e3788b7ed984e7af5c2d78dd64e7494b558bde2a8fb0e77bba8db82ea1e8a51bb66fc3b89863c1dbf8f19a7be1a";
+  sha512.source = "9459e5c05342a0df657e2ad6427c17b9290e7c419deefdedb83ef4579fc7e65b532e9d5010b492d3afeb1567c628096a52aba5840d1f660f99c5d499cad400b3";
   hasRunfiles = true;
   version = "0.1.3";
 };
 "linearA" = {
   stripPrefix = 0;
-  sha512.run = "29f35b4ee25311d9e5e02150b59ac51336a0d393a7f9a8af302dfaf45415c3fade0ede40f9e7419584e6f326739e2b91b60c84c04895a26577b651f0c848d83e";
-  sha512.doc = "31e600145d4ff0f0f0fe526a2e2138f853059bcca04e956d0fec6e9b80967e7a2beeb877e6de886535ae79b627137963991f946657292ced556f873e0f8338e5";
-  sha512.source = "9b043a59456295abef96aef8001601c1234b2dc38a46180e9ff70999564522701ccf08b3fa047995535cbf27cd29867b54a1dbd4298560430cafb35f9015324e";
+  sha512.run = "056bb723ed97108e9fe4674cf0aedda641b2f2c3d425b7292ce3486b8ef110782638e64c6f342f2b84bb381cd8de9cbf4e3029954043814ec2fe48ed19cb1023";
+  sha512.doc = "6d2ff9a44691e02b1fb70738926e082708afd0e5584e83a702352bac3c59b852503bb0d79b3818ea94a0d9f62dccfee16eb9a1a1b32c3558297589e88a91bc92";
+  sha512.source = "5df96146fd5735a8772453435153679d4ea64a971839c9163d570935968d4ffd5d8ec6c59be82045e12c2843dbb74bdcf605b10bd4ac72ccfa910665d80dd608";
   hasRunfiles = true;
 };
 "linegoal" = {
   stripPrefix = 0;
-  sha512.run = "bcfdbcfdad91162a9ca08f929baa0dc81be1f41e847fa40f5479c06c7666d17de6bce3ad2f4b72def299b17d09a3200e0542e042f79253ea6cabdb5738ef1ace";
-  sha512.doc = "a88af2033a6f31314c26539cc2d6743d1ba58148be213436d522745ec1ecb6626d23cc35fbfcbcd8af75baafcd8b58dc2aa560a08728443719a010396320d885";
-  sha512.source = "f3989ac27eacfd2aad5d1b6ee7662a9fa0d70a79988a675647250519bfc6206728f1bc46e0dc3f3b71523945151b42d69f65899c7f36099e0a56a1a77f5b7a5f";
+  sha512.run = "4bbc5b5a4352bfb81336af91f9d77b6e16eddb8b73ae70dce0a6a2a5b622e27a277338403aa630337df3bc32e4333b7333a32ed4d989f9d6b4d4caae6a611d9f";
+  sha512.doc = "cce3c4504802a438788858cbba2d29152f8f511ac8fc04eb9ab0d019e1c8670a9a184452fc50f708227188234662225cd30acd2cc209e9ac30e66f0fde40cc42";
+  sha512.source = "481f5265e1fd7e5107ec530ebeff768ffedbfa9c3a92ce4ee24ac7d4b64a55376c61eb4f4432e158285667e3b0c3839bb06b7f0e089259f09e13886582dc2d21";
   hasRunfiles = true;
   version = "2.9";
 };
 "lineno" = {
   stripPrefix = 0;
-  sha512.run = "727809407648be2718923496d60432b5531186510e8938c0386144cc9a321196d9cac2acd74e21bf3c510c3a8750b7a0dec0a3a80ae196bb3e6dd1b7c654383f";
-  sha512.doc = "66fc957be05ffa21f8644ea4bfed0b1dee6a0f7f5dead70a7bec0ada6fc03097ec6c8bea2ef41a33d0499c7e517fe76bd4c962a7b249d7c3c0a2d0ee9d6592b7";
-  sha512.source = "2309e909f7d908e6f8d807113de2af65bd234cb064f55b4aee18f25d978ddf633a63451b82f8779243fe3f4e8b4eff7fb6e481bf855064f69c6240ae82242c75";
+  sha512.run = "dd66ea16c7878fb34d3b7f43fbdc126bef0f15e09388655409d41488126ccfcaecd0c34269116d83c39df787c13754cbb48b1e4a3241c28985bd5e3a3df0a3b8";
+  sha512.doc = "7a0a5c86fee3e4ca4020fb5e3271978468fcc81a0d6d076dfc73d83f9837ca1115f47ef2620e3a5a3b967395ab8e97a02dd9b76bf82744d380ba9bc34133635f";
+  sha512.source = "9833dfa17d1cd995314a38f7f1a85f6fbb190a0e1c10c163dc33ec1a370c4c14dfa134ff35a920b04d84bdce09ce39667fa49bfb0afedcbfec1d0a26e6b34f7f";
   hasRunfiles = true;
   version = "4.41";
 };
 "ling-macros" = {
   stripPrefix = 0;
-  sha512.run = "ba5152f9ae9b8513c2a63bb1a019172c45e75fdf50700f3373ef195093b9c08abb73b98fa9f7f472e40bc92ca71fb958dbf1a746e91941afb0768060b51fa532";
-  sha512.doc = "e606c2685c7ee3e3d376969d302aba18a120c8d4e5681b6512a489896c8550fc37b7030688cc2bf6911df19295bd290004ed80818db3befb4a520afcb15834c8";
+  sha512.run = "fe018bff08137d844802ca0c99ffe3a0e044e927be497fa707d2cfc36a868f5fc803320787744827729765ff6e792e14c62a14b863412588e6158e53f671ef9d";
+  sha512.doc = "00e8f896b8796dc89031aaff043007e7276aeebe624f77b006c266a4965ae06bb03682f182a34ec97b536621f5b605c79085f9780d50eb3d12062f90f0322489";
   hasRunfiles = true;
 };
 "linguex" = {
   stripPrefix = 0;
-  sha512.run = "a032952ec7979f65fc905ccd85cf317ce3bb7e0091bcfc9a9480268bfee18536777aceb93553e47cf2b287870be84d75666acea2948f6720b75e2644c5e0334a";
-  sha512.doc = "c60e422c8f1fcd25a60a1b8b83543cc8fc07855d0af32427003834eec3360675083ea16edb54546dbf974af7811b653bd9f6c5bad28564427887c1d92a0f8dc3";
+  sha512.run = "d679785e47cbb0c7741621759757ece79ecabe096310ed0f52800a5dab0fcbdaefa405a84ef15bba3c1f852740bdc2ce66e49117507c315e942c12fa61dc57b1";
+  sha512.doc = "e1248ddd9152ccd6572bed6246dc3e65df3c479f09aa7168890a4dfda62c6a9f8b0693181eb7e1679adf7fe30830febcf77fe21e10998f8d68c954aebd9220fb";
   hasRunfiles = true;
   version = "4.3";
 };
 "linop" = {
   stripPrefix = 0;
-  sha512.run = "1c8d84670e633ec9777cef1dba12a2062d2c9a336bedf97cd572622061b357d51f16d4a3bb5cc1ad26c4a70f20a3c7eab5967842782efe1b380e309699779d21";
-  sha512.doc = "c8bb4645a9db7c942678a2b37796d58c709c96898b1bb56311389c7b8c8a4c4bac367c7feb61f04e60a90e46a48afe1d3739427f4c97a155aa4a943809fc51d1";
+  sha512.run = "3a59b63004eb332ee10c322272807cfc41ac31af0e83fac4578de33547ad9b1e1084bf139ace14c52e8430cd2c681ad090455a4e03ec92622852b64334bcd50d";
+  sha512.doc = "f846adf12bbe9ce5f95e739fe4f7b7dfd7c14dd05991cc3d3a39da8970e93016c6bca54795bdc4486c8acb30ff41f6c118a4cb93fbaadee0642e881232c2f69f";
   hasRunfiles = true;
   version = "0.1";
 };
 "lion-msc" = {
   stripPrefix = 0;
-  sha512.run = "045eac2fe20156727121aad156682225cee310732e450a798a923f06262977ed4ad13e52da96a623a57d8be28b632673fb05eb8ec372478af0e2bc5a94db71b9";
-  sha512.doc = "052eb12bc1fe7d55b5e893ae1e02ce27e3bfc801fcd0f70620afa08cbf61da2cb4fb04d9daa503134a72bf9bf12d3e3cc3769871b71782a9afeeaecc0eb519b4";
+  sha512.run = "4843cc01315871b787ce279dd31210301b81269f110ad308f3af6fe98fccdbaef51e45fd2a30b3f5039fa33bc92f6e2c52785383304372d3ecc1e73e680835ee";
+  sha512.doc = "e369bbb870e4c5ea5ebe0479e93e970481fe0e2d30cef389aa687836ce732731ab42a94ec2ce9648325041546f91265d2f6ac70404b1120f78f6f04223dd6fa3";
   hasRunfiles = true;
   version = "0.27";
 };
 "lipsum" = {
   stripPrefix = 0;
-  sha512.run = "c10c9355eb5dd31ae1de5f423328f8024cd4d1713d13bf22f1745f6c2eed9072399e3501c047f6ae6b4b6f83a977a5427d2aec249e68728593891be91aaaed13";
-  sha512.doc = "22b0ab7a8bc531796453fbbd1ee1e7f284a3909010e3d6b3972e9aa8b6d589a6b91500d11c65671304564dd9cfac209dff2eb21b070c1266cefd069d7945bac3";
-  sha512.source = "8678218c23e21bb0a9c5035737b2b09ed067f1cfdb73389ccab3a68be5ffb8f34c1058e30c9dd405b33c754be7408210c83ef49554b0da0c0596ed93e79fbc97";
+  sha512.run = "d844392be2ef4a96f1185c0a3890a2997d9d135789b672e93679f90d39e8d415d76c58636247bc38ae572152eba73457b36277d2eda9d68e081bd9e6d12e3f25";
+  sha512.doc = "67f3ea8e183aedd7e1c179cb596e0886e6f25097b8d9a4774bc1785336587de13311785b1060a39d4c7a4b42ca796d0b4804a68a53a3ee188675a0639641d75c";
+  sha512.source = "4aff7073c879dcad4baeb8d1852876164fbd88a38c9c62260d3606a4429a38097b0e3f4902d2a70d70c188d6bb7acb7c83344f204c7526bf2dbc6eb1222fce19";
   hasRunfiles = true;
   version = "1.3";
 };
 "lisp-on-tex" = {
   stripPrefix = 0;
-  sha512.run = "73690cce2dc6390512694085cf4b38a80471a803aeef949156ed1446472fa40ec355ac47c3c3dc596539ca8943f211a3d92efc17a06ced985afdeef2c731ceb6";
-  sha512.doc = "4709f081e5f41c0761476cddf2dc91587ac8099f43d0bc1c2818fb229d24d16dd3b40d4858a44bd22cb94e15e8b83619d6256023634d4ec6ec06ec5721591b32";
+  sha512.run = "25095131e83db6ca19f3d5303940e1f2ba27eda008e7d7bffd337da6d4d45ac4ab41233607488635ac007c07211157b35b15f3c34973139ec6f0a0d5e916540c";
+  sha512.doc = "c559cd27838dae13246151891d67c5df984d2d58ba8c575e390caf29157de889884cba86df1fa65636925870e3305c2454fd596c34a96a5551355096a9d9a9b9";
   hasRunfiles = true;
   version = "2.0";
 };
 "listbib" = {
-  sha512.run = "76a88875fcd0615257e73772e87ed4356686890936ece423b934f14f9c2be3a8512d21823783b03d1198e5718540b43de5239b1d8e11e93bb26519322518cef3";
-  sha512.doc = "a3bad539e30e0c4ce041327e0dcd3f5e945a8c23e5bfc1a2d6c7a8a2f1cd38a53cb38442d0b60784187a746b511e5614b86cd0e2cc3e70869afa04a1fe9bdc55";
-  sha512.source = "1119f75cd408d64a11cd93121ecea5e4a7959035094b88aeb27e02177744ad8acb7eb2b02a8716a8653279a71ab8769927d550d4f03fa39eb731d45cbf89a029";
+  sha512.run = "4fab2e4abc99307598e482823e02a3961e694faebb8c5275557c9030dc40dc8f1d52d5da6859466139fd2194e4272b1b93782562034aaaf909fd1f6a205dfd1e";
+  sha512.doc = "46b2503dcf8615eb1f8f93ba6633658227a370fc8946fc4361c08ffeba5dc03eef6361df28ea996b53d59708a123b1f7bd5502f5acde813805b1d2ed35f60c92";
+  sha512.source = "efb6cb3f27d90e64c29f0dd8da57d75985990eea0071dd3f73b5f952d820379efb9286f981d4b1d7c2276b9dd2690c125cdbade04091f8a9233f0e21afb72199";
   hasRunfiles = true;
   version = "2.2";
 };
 "listing" = {
   stripPrefix = 0;
-  sha512.run = "b8fadfe932495715aa8872013ddbe7b0de3ceb104d5ee84d77b2e16ff0176d7a52614be2b7803c2552794b6df6967e8d4430208f51f8462fcc6acd9d5e999556";
-  sha512.doc = "3c83e8aaad29397b3b4004b939c3cbe4a490a93f568ab2df8cb0347b186705eaade065495afadc39aed2815a1c4c1ac731a7c39ad1a0b27c59a4c6d940a89818";
+  sha512.run = "52b2c88af72a800d79f78fe805cfbd0c12e0ec3410a25e56d97d1164090f6afa13cf57cbbe0f062994f79dbcc924c2b5441fcee3fc238ec0c3025db70bfa0695";
+  sha512.doc = "aa3fd47301a3055b5d12af8d4b8dba1adee33d4d06f1eaa4243a3253bbecb54a607b30654a0e053cc402e9b8d0b25ae211c8ccc0cb5988da28b6ed46db570a06";
   hasRunfiles = true;
   version = "1.2";
 };
 "listings" = {
   stripPrefix = 0;
-  sha512.run = "aec69d06bc6a072f836db36548ca5182093056450fd43271938bdb4f55b79b05650c925cb7286f8a50b7786e46c5e0b5447e14d231fcfabf4e7ad4b8bf401c63";
-  sha512.doc = "902217e3504d02cb1bb5a136a0d3afc0c38d19b688b92fe835312f8b6c30a3c65500062cd8b9a50793a881d866b8b26c0b291d60ad6c1631d26f5865ad61db34";
-  sha512.source = "a8b9d0626159b0268d8c20c69ceafa1d701b01d6e6ec3636ae3ea1f988758b8a28b8b52d486cdc1df8fb84f583d4e95917d425977e86d10830b3aedbfc6490e4";
+  sha512.run = "b322f5375aa05806ca66870048db7b5792443996711426875eaf8e816e159021ac94d41cc9db17609a4b88d26511521871469cb58b5801a86dcdb1c228d7530f";
+  sha512.doc = "50411ad6e63a062f2730f2266effbdf532ae2cad2fa2ebd9d7de5c9d85519d2cfb735b7d836fd007172d0b791841787f820ee20c8c0a8eaea23650154ef29156";
+  sha512.source = "1f1c106251647b19fe0d0a6e6e80e933615749cfa126f644001be6826ea4c3dbc731f4f6592896333be7b21d5bb95a0fa25ef38f84e544d186f602e6ba9f7ec8";
   hasRunfiles = true;
   version = "1.6";
 };
 "listings-ext" = {
-  sha512.run = "a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461";
-  sha512.doc = "edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327";
-  sha512.source = "4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a";
+  sha512.run = "99e2cb51f1eda7d031be3eb39a1aae3295da0d5532691d3b1031111610fd06ca134d271b5fadc065991fb5f427f33486a67bc1a9dc69421a4ba0ca6162cc25d6";
+  sha512.doc = "d26afc5303dea720645bd0296158d24fa5ef2d733bc52d31a4c8c57a87febc7d60f3556a30d7df6406537bec8d7b94c37c572291bffcca84263a7a89ed2e7f96";
+  sha512.source = "d1a6f2f5a4047bd3ed0ee3d6f5de2d1094babed732d4469ae2ea37b8893c14f84fb98239c8e568a762bc7bb62046d2a9ed3f4d90b22877f2c6deafd1595ef1e3";
   hasRunfiles = true;
   version = "67";
 };
 "listlbls" = {
   stripPrefix = 0;
-  sha512.run = "9be2d45cc5374fa8b7c71ad82a310fa976be7259081c11c07c1f91f691d22542639dec0b3f5538b915a245f8d850c531cc0fb44e985ecc5b9fb3d3daa9e2f77f";
-  sha512.doc = "0eac925db69be4d8fb5ca7adc47f545373e394774ad21469298684d6a16526a3448444e1e10b2c6dc124960d4010e168cd0d2f90212968af154f87a61c34a1b9";
-  sha512.source = "ab651ba658ca52055453041274f775f4b0b82d50664b60a9552e813e0a39f7f2713c5fe0194c29d24bb9fb1a7786fe152e8b9c47b95a549c5f65a94eff7f6a64";
+  sha512.run = "e8d3aac3466572225183bd285cd927ade4c0a398949b4d0ee26c8647af60cf8da4d05092387974a1c4c9bbd46b921e8a8628ca38555bbae25cfaa59fc35276f8";
+  sha512.doc = "cc53d332a3b727d634ab94d4bd8a23d5800258fc390b3753107e305c6d1a2152ddb114ad9c1da063ad7ddb2194de7fb4276f0f9a7c66dfb4a34f276502380378";
+  sha512.source = "471edd300bedbf573451e53cab697d3737dcef4f2006df53baf845410479d5ab692f3ac36242fdc277113b54b7c004fb3681827233436fb2e5d79c79b3590966";
   hasRunfiles = true;
   version = "1.03";
 };
 "listliketab" = {
   stripPrefix = 0;
-  sha512.run = "9173a43a545b910819bdbda9293202a3fd03bd8dc135e41caf44df2a28e119ac17c9efb6b67aa2958b5642ea22178b33ff50da0322e7245af4429a73f511b4f9";
-  sha512.doc = "1006f6f6c844a3e35a6c0c680071e667eda495ac0993f6065c53c459d60c5335913f6311f8664f8af21e329b31a0817a972d8d039b85a3034a1ba41f15f30e7c";
-  sha512.source = "3c48c91cb0685d0546440d8413b5993c51fe12a6abc85954e94d5853f6fed474d14f8b13ef8915c975848598914d5fabe02d84db76be423621a6ebd849fff43d";
+  sha512.run = "2a98c8a6f6ecfbf2650524ad72509d8a47d741da58b967014927b00c3e8af92546b4dda05452e38e4d7c8f5c0b29ab56cfac665fdd140bb9e4fc7e335f28037a";
+  sha512.doc = "3fe42c67ee16b94d55fd28b189312ab63614768a023d14fccf55507de494e7b7fec440469e434711daa7894abefc3abcb3ffda4c8ea45b266612304a7a759bf7";
+  sha512.source = "e5f3dcf631a5d9392b6428d0c4bf30bb0dc6f0a34824144b7bf4d80be589106034d9935007a7c46abdff129e31dcd06355147c23ebeabe90b39c2320319e4e29";
   hasRunfiles = true;
 };
 "listofitems" = {
   stripPrefix = 0;
-  sha512.run = "8707125a2294b470c19ef95437c9e32c0645eb7e233b376329c44b53ca7376e23f69d337e74d4fd94d8c3ae8bef9af763d3b7dedaf18e53a1574256179e56a9f";
-  sha512.doc = "d1d482511c86a26ee758bd1aa1b7c28fa3d79707ca3f3ae24825cf70434f310b5d76044a0ee3136643d184051bdad03974d614f2c84f68044dbc8ccf4abf115e";
+  sha512.run = "baee3678f191eb57d58df5a4f726cb7a9ebecafa2ce0cc31d0872f7f6192318b30b895a56899a248a252bc049b189a57a16530efc0b0b826ff0ca117ef118e47";
+  sha512.doc = "5c6038c05ffab34f81da2a6b5e60bed590d8454ac4e9201752d5420133b6f015e1fb97efc1e56b397133058f800217f051ea5482aa257340d9d73919236e4bc5";
   hasRunfiles = true;
-  version = "1.52";
+  version = "1.53";
 };
 "listofsymbols" = {
   stripPrefix = 0;
-  sha512.run = "851524b6498013246a8bf2498a68d094719a74ea7334d8571feb50d2f6f80bdbc6cca38d2d5fd3659c337c5da083159e9017d99c6df24ecd25c2f083b8278b6f";
-  sha512.doc = "d5b843cec591671dbb2ac0db532538e3053e72803487a411fdb76209d7c7dd17db59fcb7232fc12b3c77367c274068df54207ccd9083f284e4f3659e00db8931";
-  sha512.source = "3e8ce5d91cd64060940c1a617f099459a7635ea690c2ab07c8c2cc31dfddccf7ba466a2d9be55e1d16d3856d1c985ffc1f9b81a3a566be250cf61eec013b0a6f";
+  sha512.run = "a9327c900fc4f3e6a8c219211e4136aab4d12b2ace952106e33b94c10e2892fbd3c42c522cc89cd6d0ba70930651607c724ce06167563f6c957bc3cdc82a6dd6";
+  sha512.doc = "b722083baac81005e655a86e888e16ce75036d1ff3681410a59c689bd02d7029a051333431a04709c4792961e53a9b439c4c269047ef55ad6b7c980d25b28758";
+  sha512.source = "907a60ac1b12c1c76527e9b0fc1f67f493ddfa9ebf357c53ebbda5d7edbe68291c1c602d4348c79deac8ccea51096fcf4da66e792d6f0cd3e38f98837c249257";
   hasRunfiles = true;
   version = "0.2";
 };
 "lithuanian" = {
   stripPrefix = 0;
-  sha512.run = "67572d1cdcf1970fcfeae1031a9c120db59864225bbfbbdb5b145267c1cd9a6f2bc526a5b49b26f728a526cebdf727f4e12c74442676dbda7602618473c08a0c";
-  sha512.doc = "1f68d0c0fddce37adb915d2607a488e4c517167f06d4692f53fde2a39510a704b26c721dca395dc86c3f6a91f49e67c030011dc9a2365879baa65b488191ca66";
+  sha512.run = "94f3bac72d845496934cd474f9ec51b9dab541d9efd2a6e55972568055b93a57a63104af8fb5e1fe7283f08d99184599e3eb80637a8b441eca7677b38ebc4208";
+  sha512.doc = "22e16063cbe9f59e7e0435d827f14423426dd464f51886eed3a0383113881d7e8492e838c51d373ecde2c4d99a9352c6d4141c80292127703b29c8d848254c45";
   hasRunfiles = true;
 };
 "liturg" = {
   stripPrefix = 0;
-  sha512.run = "c012213f66f6c2bba328983933a0caf38b7bd0e8e49c8273124c96113d4a1dc1e9dffa44ce97fc710f483f3d29946341c6b67373f98b6befb8a19b90b1fe0283";
-  sha512.doc = "84b3e4b1e49f203532d501ff3c1896c24630b889b6b87a234fa4124ce13248136d5334461a7d66539b6f5e4df8f99da009f46a70bde6254724e0217932a81ebe";
-  sha512.source = "59fda955680f5173cc4cecafe359180dc45b0193b23549ecaddb82603b6ad509a8a68905ab0396335ba34b0ddebcd14d7a7f0559941e74d60a519004069958d2";
+  sha512.run = "a850a6c4cd8bd3181d9d35144871a413aac9a8660fbf9837c701eda9a0bbadb8d6c82803c912fbbe2df4b2d109f74cb02dbd64d7c0b84802e8e3ebfefe8053ab";
+  sha512.doc = "b22d9d4647c54377fddcffcfc5d38152407ef58eecf509dcebe1672c8a75369a46211792cf7a56726595d29d38c93139472d8b23ab607524083329c12ab6206b";
+  sha512.source = "8460c6edf94920b6f505d678ca5f33540076866adb1872c4ebb196c4ef4f0870116c435d3fd044c50355abf9eb586009e64b7fae5f0317fa6857ed7e85f06837";
   hasRunfiles = true;
   version = "1.0";
 };
 "lkproof" = {
   stripPrefix = 0;
-  sha512.run = "6f5c5095a7c755ac2c83dc3106414552bccf1035c4dca8a69f434e29d5395be3510c226073cedebfb4fb928322579ef5ada89d11c245ce2231bb8bf246d32632";
-  sha512.doc = "6576bd300dd43f4a83dc8e79ed77ae5288228cd6db1efea3cf632359542c4c54d2c76e8681aa63f0322990a51dcf7f21c86650481563e08a7689dcb14b9a6977";
+  sha512.run = "d5be4d8dd3893da6961f3b516846b5abd2258527dbdea6120a4ccc9a4fd07129f76af83ff01ffcfe6a1931e47842be63ce9708e1fceb37f370ae1f20ff3e5adc";
+  sha512.doc = "920a09606270004c8eda9173859cc4b14002379fb97fd902c4e7a23923ec94aa56a98c0320eeb8006cfe12e1ed97ae96cf229dd34f36aef7e0773d69680af4ad";
   hasRunfiles = true;
   version = "3.1";
 };
 "llncsconf" = {
   stripPrefix = 0;
-  sha512.run = "3bfab1e51b54fa028a08cb5211c0b91f56c19d7d351feff134d86b695edba2ae7e2f4ad2b270f11b167470db610c41082fd1f1b3c9145986b76b1dd2548ef2f7";
-  sha512.doc = "7e4f31797ea7d1f33e909003cc36af4992080d8499ad800445b40ccf08b8333dd9a80bf773174036689d8de5bb4161693490fbf94c682b46c0ba5cf8529d683b";
+  sha512.run = "30daf8c816267a6b5f6b887ccc6d16890b0eeb45c3892bc3babdedd9502ffeaa18174f7c9f7436d481b382c5120b4c6110de10e9adc508efc8e4407c10deaeec";
+  sha512.doc = "636199aca8bfc969f953ddcec2b4dae899006e9dd158ce9b15bcaad0aa805bf298b00d854866483c83e2314a2cc95cbd5bd96595e3712440928215077a606793";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "lm" = {
   stripPrefix = 0;
-  sha512.run = "2946873e80de07b7bf4365413e674d4a7b5b91f5d528c0b3c74e014c070843e7c0f18a5211816601d5fcb1a333e4eaabf6c3d974e11442c4425410230a62270f";
-  sha512.doc = "888512fc883a28d058b05fdd6a921768d2ce26efa51c1e7acd71875ce9d975556c84bb0dcb590bc18d8961f80e135ca7e75bd91defd43434418197e6f1912d48";
-  sha512.source = "f1b6fc2242fc0a7ae019bc289a4e008822f64fab5b2f9780ef29be63e00b492b2dea25c67aa1af95085056b6e9333d4169de643277d5e5692ea61c672a7cf218";
+  sha512.run = "5bc73dbcda5aef36ecc9e49268a45aea4ff8a29b59a8e2e426ae560a033af7aac44d6d761eb7a9657577c1796dc1a8ce12d1c58369d5addd826f6721d5c8b756";
+  sha512.doc = "cdb3bf69658b36ec8a0fbc4a984970ffdc4ef4e773d9ae972708ba5ec33a7e785b0a3c11cbc6ba908e5e9a8daee15674730a9ca3970ef86f127cb70c8c59e579";
+  sha512.source = "f4ff434a5ed5b53462d5caa4347a842703a59669213784a46e0ecd2fb7808a7bbb2bad33b78999bcb18fc1968e022872e7958bfd0b57bd305f29d1ff8d25d418";
   hasRunfiles = true;
   version = "2.004";
 };
 "lm-math" = {
   stripPrefix = 0;
-  sha512.run = "3c40249166a62f6e0da24a6179ecb44208fbf61d844998b2ce0ee6b1de958c3755544b545d32f3d8edfc0f617f4a1d57e73e932b8336a439e014352a36f738a0";
-  sha512.doc = "71795c7ac57105ae22c0d3755d7d25596016e864970cebc4359abdc86792b59d15422ac191ba880f3c2b4aa6a4fab1f8e664e4f8fdfe5df4c1ce899b620cf91d";
+  sha512.run = "6b0d6d989536a32bd9625abec0852eb6a1ebedd19000c571c6399764bb1bb5e454f8486539fafb20db63b7a4dc064b559a9b3094bfc5d14456358344bf186c83";
+  sha512.doc = "972df7f9e1af3c24e0fa2a8ca1d602ec76ee4ebf1ca29ebe8f94941953116808e90ba71eab1fe16ffc920659010ab3402699289235de5ddefd3e25138658255d";
   hasRunfiles = true;
   version = "1.959";
 };
 "lmake" = {
   stripPrefix = 0;
-  sha512.run = "3231463e90ef974cc3a2fcb837572c54a3cfb230eeb1503347e2a8f4ca1ee1e0f75edfb4ac6a467ecb688cb60a32784f025ea7ed8fd2f4f116a4654f020ba807";
-  sha512.doc = "457227ee5f6e0b52f7148c7d93249b104d825125bda9c5dd5d0e1bd04ee62ea19a4bd0c4ec6db01c611ef1c99532ccd5a5b41da76c2684b086460b3ce156d4a5";
-  sha512.source = "0f202fdce500419e6a128af82dbde7483d7a983a6207eec1c09e3353a8f9f45d52389f9620e7f10758dd7c4bd6db0a828d81632351af7bd52331557844b081d8";
+  sha512.run = "8daadcf6840d457b1d7c94a1b3886248adcebaa1306535ffb70ab7e50c5cc99e07704acc77d062ef39d06cb6644e585c9a168d36105bbc9bcf1fb290282b05b5";
+  sha512.doc = "550a71e09af936e86d334c30bd26896ef478d4d86063e9d2163a9628f33eb2e6b2b65011b673582279a3f1298ad4c6e7144af8f32bbc8e8cfe9547705fc8e7a1";
+  sha512.source = "55e6e5c1ddc61f9b91c1b6c0792bcf1a4b0040cf938a0ee5dfdd42768b48576e38f1cb9016ecbcb225aaab1a9fab45e085ffc9fdc540bb62e9de004892d9b7a2";
   hasRunfiles = true;
   version = "1.0";
 };
 "lni" = {
   stripPrefix = 0;
-  sha512.run = "1803fe4e1052e5eee5766e537781d3dcfe36d52a99e1b12bcce29d427587e36050e51f59343970c9d0a397dfdfb3fe97fa35b108c50aaedfa6083b5fe18fea15";
-  sha512.doc = "e127e210bfe72fba5fbc94f5ef8b870e7df4ce6bc4da98d37121151dbb2d6443e015369580729d440204ea2da60820832d2da13066034508e9253c6d61101f8d";
-  sha512.source = "375f110b29a823e0f96084b412f906bc4bdc5a740d3454c8b233c734bc10736b5fe74f7a3a34023c65822dec4f2f1e671f872f3a23a8259976f4b9efc375ee5e";
+  sha512.run = "76b26d64f58a31e2a1ca208a0cb4fc0c6b3a3ac0143e4d5f2d950e304f7e27d8dfe1aa281c4a013d9b056f06cb81189372d53b6cf1c6b926c16510cf19e60779";
+  sha512.doc = "94fa6da8ecc68adada56a2f86785d5e111135770c556991496ecc85d23c6dcf831f9c1cbc19752d5535cd1c3d075c86fd1b8854142b7902cccf51f6463548abd";
+  sha512.source = "ee62aed7fe29f07666b024483fe6dff4d3447c9d0a4ccd907c003940fc7b4dff5ae30fe15ea45bf64875e9dda1dfd7994ad0e2a2cc9bd5baa3bf1f17030fd513";
   hasRunfiles = true;
   version = "1.4";
 };
 "lobster2" = {
   stripPrefix = 0;
-  sha512.run = "3826e5e811d46eb796dbd3dad2534e94533676919c674b608a074ef50d99932f68268ae536d497bfc71397449d88222ba212a826dc39b63d085013d546f620f4";
-  sha512.doc = "1e0d858fa85a92ae50db7c1bf581b62937442397c175072e2c1d87bec452ecd0b291073ba1677150d1a0f7989dd5ce968ea754543481b1ed4538e5cd3b04a50b";
+  sha512.run = "01ddcddf240936b55c4ee58e52f345f27d4450ff16369fc3fc73752a8e74ba0fd32fd052673913f2e3bdd839f26e1d128407624e14f4874c1d2378ef8f07364e";
+  sha512.doc = "9b0ac88ac19259b9ccfeb50e17edf5c5205e955380080e90fa4e66d6a6739afce2a8e65f8b236fcb211e9cc437060af5ed58f5360f5d38738f863b24eda83cb1";
   hasRunfiles = true;
 };
 "locality" = {
   stripPrefix = 0;
-  sha512.run = "3d3ea65806be84003471401225dbd7704374ce78f3a3dfaeb5db4cccec7c3b6006d9548512e118e05f2ddee386044941a73b29a2e7a54103c7e6ea6b84bf22ad";
-  sha512.doc = "ad273a8309e4924511f98d19c7472842a7c618941f9b155318afeece16f0cd9cadc2620c97ac3afdc3101f9af92b61b228c813d9702e6837eaee4c545d52dce7";
-  sha512.source = "fe9fcf84be9ece5e9265e52202b5eee8623da0842f250996653ea4f4bacfdb14d9ee48d1f88259319911487ffb83c69540a5bb4a957b8d6eaf89b8610093ab6a";
+  sha512.run = "48d854b76a985a4ad6586325a26bdac9d1b39b1f89026e7371d275613a5154ee07819bb3c586ebbff6e7fc40af6c5a258d269bec3052f0065f4e7f1f6635ffb8";
+  sha512.doc = "0a3a2e538a4a60927a33fa92feda6ae923a8a125bfd874f7a51249b6a3887668d84307db1e65899fcd88924ce7652fac5894f6ed12aed3369983d51c648199df";
+  sha512.source = "34cfc3772c3f3ee6b38b7612f283d9d3386e87f2d20161120e5ec68d2ac8182a6aa7193b845b4ccff7471103cceff5918074309f17820d561673fe26c50f5829";
   hasRunfiles = true;
   version = "0.2";
 };
 "localloc" = {
   stripPrefix = 0;
-  sha512.run = "2a67f60e4a4b5c430ba95461db6926aee442a2847f8146383a365de683c8e9061e68df22b7212b06396eca7b7749d912175e01eb2ca1544206713752f20f181d";
-  sha512.doc = "5457660f931bb0cf3a74e5de346091c3aefe536e04851d6fb3c6786ad977e70f430be6035891011ce8deb0aa286568264c50b0e3e4d57df2525984f573ea8226";
-  sha512.source = "33b3c1b4b9f3c69f7e1e44879b99bdf31db08b0a1600e0450950edf93700f35fe19b7ec769c0451ce91c240fc6f3765da5041429b5c15a613f4516e42fb4fc82";
+  sha512.run = "a0e16a441a1842331d8ff4778904b68dcb5c7650e605fcc12e2205b780fdd9b42cfaf4b0d2c528b3d747f75e57886ddc2f5481d8de6d4a493c18b18481302b93";
+  sha512.doc = "e3e47a9beb602fb94a1ba7279d4f9e04b4dc12a4112b520d5f5dca52cfa3b56cdf0494f0251dbf5991eabde2705436d6284e28c1b101a8abbe461816cb73676f";
+  sha512.source = "7dacc5d6ee2eca888bc99466575cbc6865bc4083565b65dcfa8ebccb0ba46b23600ba56fd058603d8ff47aa6a6b6372f240c089b2035611f36dab34ba1d725ea";
   hasRunfiles = true;
 };
 "logbox" = {
   stripPrefix = 0;
-  sha512.run = "ff833a3c0290dac512fe511185c33248811ca2d1980234651db3f3e5c54441d6125b1c13683ea884704be901313cbe7af99939eaae233cedb9420ad704fa7fac";
-  sha512.doc = "4b0b6ac80f9f69aae1e8784e4e109e5e6c78b44560c9f2e1a3ad164d954a9b77bfadc01ded8d7891ff04c01b864d29865f6a743ee24b6fc072bb3774911e4f73";
-  sha512.source = "ae52a0a72a72a0a7ec8ab5b035080fb9c55cfab712659acdcb57bcca6a1ab95a80520116f8e72523e8da9956458dfb7466eccdc23a756771fe8feb8283dc204a";
+  sha512.run = "ea4fb3891441a49694d998e69f1fdcca64e795335cc6d18215c65f282049897f0bb7a41768d5e1f01df6516b2dbf69e67e1898b272a47c760bdd9ba5c1ef0b03";
+  sha512.doc = "b87519598311f255a691fa89bb1e4c98a07c18afd8f28f5732ef581ce19cd2c5dfaaf1984e187b8514d784ca1e55cb03d09f8744e23b7e4aa3c0d6afab9ccfb2";
+  sha512.source = "c568a8a760444c999c02bba8d8dd791f22807a465365198b550a4f643c578d85b0676557af022d470b46ef063193d1c3f66a200d5dec46901e44eda6168656a3";
   hasRunfiles = true;
   version = "1.0";
 };
 "logical-markup-utils" = {
   stripPrefix = 0;
-  sha512.run = "30ed86de4071302fe2b6429afa968685a286cf9559902b4de0c585e6b752b31c97608158fd122668b260e8def41f1ac26f446b61c2ac476a52dea764406c5945";
-  sha512.doc = "b48e8068581ccfcf21cbe3013d7afa0907af9036ce999caf5e9d449c2df17b549c1ab076eda521eaa5f0b0b1e00e97386eebfd36d6bf5a65a9fc971f9486e565";
+  sha512.run = "95213312bc9348b673420c3177bfa03b1c2c94f5a369ac5ec5fdf64d22eea20ee31f86258f79248a85253ae89cd6b8f7a5afd0a629c6e36d9cac47d12cdcc2ed";
+  sha512.doc = "6f1adc74f9ea04bd8f3a78f62f1d126da4c43ec9965d94d2047b777bdc5d03162589df8f2891ecb4c4540bbef46308f0f6015e19c28feb81b6406e5fc9a2ce09";
   hasRunfiles = true;
 };
 "logicproof" = {
   stripPrefix = 0;
-  sha512.run = "912b97323bf2746763c34b36622318f2abd0ee4332766ae2b04e6ae3e73455838ea99e27e0a23036143f4f6a55c37bd95b303009e3e1435f250c0c82bb38ece4";
-  sha512.doc = "51820ab646b6cb91a1113657fff61256c69de8c37c8b0dc3c7ec8b22aff7f5980c01827caa3e3d4d5489bc75d400a4b50749dba16bb02ffdf65a4a0613c9e4b2";
-  sha512.source = "f8415aeb6d68bec11f4274a714c36dbf6b88d594282fe51678b26f26c95b76588cdad7b8e533bb604cf848894cc3f13ead84b40fcbcec84f75db7f7130e1eca2";
+  sha512.run = "ed17364fcb71402d6a56190b20115bc2335d303d52ac9f971fc85768c5b6d492d15ec3a7fb7dbc1f637c8d58e981e527a0d7dcfd19f915435be9d21dfa6bf942";
+  sha512.doc = "732fc80c0281eb26bda98120f5bf383ca2a000cf0b84e1f8d9977e50d0f437893778445f915991867d9f2ea6cbc9b9953bf8e1607d3fb5dfa97b53d562f6113f";
+  sha512.source = "02e84b4f79ec6ccbd73f2a838cfb0c0b7b013d6f57f5f75fdb582356a7095684483cf27f863250f41ac167cc3b2596068021f7bea28ed6c036a90f114f716fbd";
   hasRunfiles = true;
 };
 "logicpuzzle" = {
   stripPrefix = 0;
-  sha512.run = "1e6063c22fde733876b6e6364295fbbe65b936b310f785186ad3535c775e7c477598b0502d515e65a13329eeb117f3a1f2e968b2f85ba9e76397df005e5bdd9c";
-  sha512.doc = "dfe0eb90e22506ea20179fa2fb11467935672e328e784dfcb2ae7a9d2840e9d28787fb31a267526c0cbf2966e007082f5a7f8d368854286e734f20f81078eace";
+  sha512.run = "bb851ad8f7812b08bbdb7764dfd4eaccca439c1fff83c6672ee08c89e1eebde2d249757f5e8408ea6253a893b0470b80b89a0369ef64119ed2a8d9f070e11274";
+  sha512.doc = "86783bfa1706624eaac232afa00636f971d653968c9005fdf8d9f1ade9728154f19024633901ca6823175c8f6e130c117b82297f405649a19cb99a1e138a6b1c";
   hasRunfiles = true;
   version = "2.5";
 };
 "logpap" = {
   stripPrefix = 0;
-  sha512.run = "7b5d6635ed69c40d69b7b6d5594620f7665bb29dedd55343a1c2a28edb2896da0336c11aca51aafee462deda4c0101d45f44cd4583cb70a861e740aa02500e91";
-  sha512.doc = "ff4f9b9e85c3c519940d1ee8c151a6cf816ab01d65ffafd5497d5940f6bf16f7d018163664f502a6b050e9fde3b5c749381ebd5fc23dee622259462c4ded035e";
-  sha512.source = "0b4d4e3af35f2820782ab2fb002738c8922693f14ffc181204866ad09854f3eab8e0830b87fc18d0f6421853f02ac79e8068fc804b2716a499561a2017a3b0a2";
+  sha512.run = "d2e9939d2d2b4f1fe1ef369d794b3037e76ba7681195afc2e05c133866bbcf3aeca19fe8a4de603fa8b6a3090c8d036a28502b722120d0a0334533a58ea883e6";
+  sha512.doc = "cdfe0fa0ad0d7e13c1d931b15bae8cacba9a0d25310536b621092475d67c24f8ec1c570cd738cd3686423f02c9f535156f0d232446bbd67417e899d0976c8926";
+  sha512.source = "19a098596c4cbb5566be76a6f2fd6c95838f50bfa6ce182e086fcf118836836ffb1ffbbd5fe9ab849eef20ed2984bb2be422949f3df2c4e2cd532b1e6ca78447";
   hasRunfiles = true;
   version = "0.6";
 };
 "logreq" = {
   stripPrefix = 0;
-  sha512.run = "58088d0c286fe1b53f54c03850bf5097a0dc467e21b4014ac74fcef71ba820245348b471d2ca5737cdb2964e685d2f79706f09aa8dd892c1b72c83cd8553b0e8";
-  sha512.doc = "1c054f08f2662d9a3256b06da86799c9c44fb2d49b31132317e3f79f2e9817d18a3634902d20228cba323c059d3d0f893a7a77ac8c217f8ca3727316ad10709f";
+  sha512.run = "58a34917926aa3812b4749a5e539cbd41cf53111fbfa01bc0295dfa70e1a68a27d6fb38b3709442ddd7baf6d77d20bf15036ba22b117abc4dbf3b037c58ef627";
+  sha512.doc = "d554c411596c0cd66ebf4ecae5c56136aaacac0460dfe83cc7ff377ba5494ade31a887555533ac90269d56cd2e16ecdd8a4eaff89172f53c99e8b2ff62aadf73";
   hasRunfiles = true;
   version = "1.0";
 };
 "lollipop" = {
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
-  sha512.run = "f852c9e858ed45b7c67453bb1e19ab7cf34ac62df0f3a54b1032cbb2e969ce4cf6171f872adb83f90f03e81ba07a59ffa93a8cac2cb223b59683b6103118cef8";
-  sha512.doc = "a5c79a6276b00bba1c15cfcdd5ce63aba92168d79bf4607e5c985b199627d54b5de4ce8d177b684532c1516a218651e3b52dfaa72dd100b0e359e02a6e06e8d0";
+  sha512.run = "9d388b2970c9a393cd21bfedc68f0a250dad62cf4f728ebc0313d25b1a461025661efc2744f0e85920ba674596f98c9a0af987839b31a1b23f2a797be887ad7b";
+  sha512.doc = "551c2557d686fe656158f2bb754fbee843ff251c95e0e8ba6b43139d81702d335897ed32c28143c910addc87f3b9e30acb8f563753084faf3d9cd657a6867157";
   hasRunfiles = true;
   version = "1.07";
 };
 "longdivision" = {
   stripPrefix = 0;
-  sha512.run = "2b15d66f5a88f7fee4438fb451c76614ccd8f8e2ca473f260589499e0ee981729c5763bc3ab2fefdaf1f29fc3ca30e79b26f9f184a11f10713722261fd811d09";
-  sha512.doc = "49df965aa9f7ad8551a9bfbe7c0dcfb98da0437cafef3a118f5fb492e3545262e9b9679e579a04ac492749b949a197f3bea1ea1186419bc44e402075a80330a4";
+  sha512.run = "e5b8086954318877b30f32054e42aa9361224307e51587afd760ff4435236d636a3248b0b8cc53ef106bcfae35f9d8ee948b9b97b92a9beb069b5bf71e788f65";
+  sha512.doc = "2ab1fa5483eca5da8bc1077d25f892691b282ff6369e6a32a0a74fac52765f99bafd1a1447f9c1da0971e6a87cf29b85bbfdd4acfd07f2767a85b304147dbc39";
   hasRunfiles = true;
   version = "1.0";
 };
 "longfbox" = {
   stripPrefix = 0;
-  sha512.run = "9a63f00a6670d55a8e6cb8dc468f4981f67c6662465b482404f23599aa9c73764179a6458bf9e60b49138531563cec3650050cd207cdd27b868ff00f0d3871bf";
-  sha512.doc = "994c537db7315424d4f426e92776f7b052ca0366cbaa97a54c5c69ab8d417ff4239ef1454f5dd34443ca5462c3a30760bce76c2cfe3498852e2b9ef88c160aa8";
+  sha512.run = "9c8ea6cbd1781da1c66888e140853013a9561010d1b35d66def2715773d0bd4d655384b0c257a7c231c5da919d5a68e2a24ff435495bbf876baac4b5c167650e";
+  sha512.doc = "d16a5f3ae1dc654ec04c24734eed5f2fc856d2d9303034c495a85d98ae56253af19c0f630e46dc1b1311703bc72c12cef81ed70c7349058e33f5f7d2cde7006c";
   hasRunfiles = true;
   version = "1.0";
 };
 "longfigure" = {
   stripPrefix = 0;
-  sha512.run = "97b4c6c7c0044bb48a161d9f869ecbfc418a0810e0ae26cd00a4bfd97559236ad7cdee86bf283eced10d3862949d3033c6fb261c1e472c7218aeaad45a92fffc";
-  sha512.doc = "cd28ed5a9b4735112f2e5e5437b0c1d804ccd4176df9285652cb7dde81dcdda9b4ed2496c571e694a7f5c8a8db83fa820188616d98ea55a3b8847c2767823622";
-  sha512.source = "0ccb688d74818fa4b51c964d1a9fe9a9a95943a831fae2dc870d69183fd847f57d44a027d8c13113ba4d65ba3434bcfd81aefd32b2b334308c82719df1618754";
+  sha512.run = "e38e10c7250523bc0707e3361337b65989a26f7f6bf4d90956105a525d9fbaa010310dabf9867252a5de787e9edf447c46ca62e91256dfd0c4e4a16268a658a7";
+  sha512.doc = "ae8b67cb06b1945f9bd9a7195297e5673a4ae06fc174d46d5a8ad78c32e0d92dc38cef116d3721a2e9c0fb551ab8804b5f1d4279677634111e2eb4a884d46e29";
+  sha512.source = "603be3e5d39781642264ff56f6935b81b604ef2696d747bf6ff3b98ca7b9cdacf3b70705395a1442effc839c4291ff6c66c8a2fede0f3819d73184515b922491";
   hasRunfiles = true;
   version = "1.0";
 };
 "longnamefilelist" = {
   stripPrefix = 0;
-  sha512.run = "fc272c97f158a47335b89e4b3b71c0d0b8579ff5dab932ae46fad31b2ec7b4c7cffbefaab2b2d432eb116bfd9db780a2f4d5f1a77509ac411af6d694fdb8d6c7";
-  sha512.doc = "45fdd54dceed8878e3e0ab885dafe887820db5a72ba1e1e791dda5fb468f2c328d0b26947e6e98688b219446103665c70db6cb6d425c58914da27004814c999a";
-  sha512.source = "b73a7b0498a5f3bc236bddc26d848b446a57c01f6040efb850511b34c93fc07e11dd95a6dec1c748457d960cb1f1f776b50a0192b1c66742136bf6d33135a18f";
+  sha512.run = "dc29ed649305de90006c904136029876299bb1e666841493aa0ec8d9416d6f7faba64a3de124418b9597752280cea4dbde89572f8407c54a6f3c0290fb9d172a";
+  sha512.doc = "faee6701f47a99c56f75dd3f25c350333cf038f1a0e026aa1c31b579d7ba631ac0715cf28bfd8b2ef442ca515898439a434c6f8a929325ffa2e2a43ab8c6c7d2";
+  sha512.source = "7a67ba29a40af37039eb1e443a38e00d69ad47044721a6386502433a19f00924e27ba813313c694f6b54a1f369cfcfd18b1852e52e57f5761efa0699f4e20e93";
   hasRunfiles = true;
   version = "0.2";
 };
 "loops" = {
   stripPrefix = 0;
-  sha512.run = "880845c59f1a6d42f119d138a87ca93b214b57a45a5a3aa592cab9aebbd0bebaa8926a67ebe0c88f2316d1604a0c32badc4be237f8eb29eeee9acccd73c803ac";
-  sha512.doc = "741b4590c9d72a78144c7bd1022d4d7eb0bd39bd731cce38c0dec90c4ee9d520f9b6318603d78ba55f00ccf553bd7e655fadb0778ed4faf4013496c8aa5cd144";
+  sha512.run = "6502eb7ab20604cf277783a0435e7a2a41faa3c8bed6f6c79b30c78b88d4b1dfec33336e0cdc85186af7fb9a64750ad3fd261c438f3c852a44470a16318e7b30";
+  sha512.doc = "28e7841c79b59c9376269369a45adf02a6798ddc8b3b69b001e285bf7af65e98b66680903d137af061a8faa7e1dc25740b19af0257d5e418daa715db3f177fd1";
   hasRunfiles = true;
   version = "1.3";
 };
 "lpform" = {
   stripPrefix = 0;
-  sha512.run = "1a468f4b783b32638b23dd4753458b31efd041404e933ce152bef8117b7adc42c65c79eb0940e9a759d5e91ed3cae5a7bf794869225e905ef9a4f305481a57a7";
-  sha512.doc = "8ab57eaeca83c2549939f6d2ccd2be4caef208050bdeb772990bf6cdbea7447baf58c0914b9e79a5130fba99d74dfae039a31b8ddef5590e712ed5239cd6f907";
+  sha512.run = "0f8c3e7f5e585a2ee6d08f397b486aaeed2a9d0af22d3d5391a529a6a87a828ff713b0e3dda1b9eeaa838235e55437ab8660502d57fa2626b8045dc9e918f22a";
+  sha512.doc = "f80b14818c5f7a0fc6cfbcc8208490c41089c0c32bafd7ed8d3b68a81d3372d739d818dcf5085e861a14a8f6bc3ea28851960452d1d24cbcc45eace6dfcc75bc";
   hasRunfiles = true;
 };
 "lpic" = {
   stripPrefix = 0;
-  sha512.run = "7d25010b20c273d33715bf7e55de8abcc2eb61c7c200bb408faa09fa4999b4a503ab200ace19ccd744fb89e07698870811f3534b562d2003bd079c777945dbd5";
-  sha512.doc = "8ac7e235c0a37a1882313e0a29163a44992d4dad78f5f330a9a94d8ddbbde87018025c73f6489ba4a3a93cbf3a71557adf1469fdbb8d70ee1d35dd698f86d44e";
+  sha512.run = "d2427aed695fe956fe90c485233bcd1189603e5f522bcf76d8fd9bd6021ca02779f23cc1c8da70628e50537bf1c2789bec5d77d0dd2b615008f8f5bbb16c17fb";
+  sha512.doc = "85800646bb25f9f33a706bac57716531779e8f5478d28b536a818da52b600e45ebabe9a74c05cc5fb460ad247a10f77589de0377ea588f5643f4ac20543d87d6";
   hasRunfiles = true;
   version = "0.8";
 };
 "lplfitch" = {
   stripPrefix = 0;
-  sha512.run = "0b39939130d4ab4e9323caa298e5a0e983955f12f3de922743503c9db33fe132c0f0b37dbd7676f987babfa024c740b0514d4f3d32082e4439b7a6f330716bf2";
-  sha512.doc = "c88bb97e1524edf8f17370955cc1fcd5c468e5c37e76326fd40c95f7a41c69d9e4ba35afd11a0dc7a4cedb17f1b294f68c557aa2baeabddf43f683cde814d2ac";
-  sha512.source = "b094ab9c31d7ba30ab30392c7304bd901d05a5ae306d26f72a52b4172962b0833731955436cff93ec0af245e0538d7be9d2bbecf9c021b8001279f7882e222c7";
+  sha512.run = "1cab8b037e4ccd1f88f41d8e3e5eb6226b164fae639e36144a9a0fb6af2cbe3bea17da3a8f3faca1b98f4974e03e20ee3725f3af261375742ff892f82289e2e7";
+  sha512.doc = "be7d76e744b8709e9bfca3cbe777d097c8992837b4fdb9644a5fb200e0a64afbce2620bf4d68afe266daebae3f5bbe4bd9fdc509845be670b2b514df1e89966e";
+  sha512.source = "db4f1b0ca58ada86db43f3980f19f7d97f636bf6510676cc93011d561550bb51b475b5bf3ee47df05138cbfdafd19b07b0d6d27403b02feb7f2935cd549b1308";
   hasRunfiles = true;
   version = "0.9";
 };
 "lps" = {
   stripPrefix = 0;
-  sha512.run = "a1b1c880bf54e2997c051ebc44a0d8b6382d022fcbbd2bbb93680f2f94811c1bff0968db54c9f8fe6c29f9cfa668832351b0f0daf2edf2d6b4c3697367f0d593";
-  sha512.doc = "b5441d08ad5db6d46f33a55fe717444fa2d53f839f1b16534630eb863aa22e7c0564a423a87757a8a8e337cae31f0123d68bafeb91d637cf21730033058cf4f9";
-  sha512.source = "ea30b900bdc162820c30609414c2d2b53c62d303ef5704d213bf0befdff89884233bfd68dc26efcd129268e04db2a56de3708122a8b8c1140a4b078b939f54fc";
+  sha512.run = "34dfe55cf5a772a2d0c6019f4d8fa4036e5ceb75af1129a6c2142995a450acb42679916fd46667ae4ce33134231eceb8a29dcc20c420a963652d57f581b4b1a6";
+  sha512.doc = "b74a9055eb66c93a1231dc757c5c5e918623ab4ff329d0ca3782e19cf7b430e970dc23101feab0293fdc9a23b970e5a238ef780eb85210403a431497fea4bc9c";
+  sha512.source = "81c74b776b4fe73c79d77995e8e68cd2743a335c049809088396f452b441a04a06512b2afab7e0faba2347732423ad00be2dd33f99c2062d7b64be00e881906b";
   hasRunfiles = true;
   version = "0.7";
 };
 "lroundrect" = {
   stripPrefix = 0;
-  sha512.run = "c369eb9eb5260e1cc99461ebbf4c62abd1eb2e75b17560fea1158d7c3e045c98eef6f0761f33e9b23de1f187e61e3f9d8dd7e8fbaa9338f9c1a6617a4c7fefd8";
-  sha512.doc = "fd5107ca3a9d81f3c413dc1a83af0150e0c68a5a7f9eff7d476d6a9945ed36561a1f603ac120825e102b9a6ce56926271bcf8413ad61295f6096142625e4612f";
-  sha512.source = "674026d57f198af15644602b7ccaf5a2772a5ddbba3a601f8c6544bfc2d96ccf33296847092599b600f33fe6ee02090ca648285b29afb8d8f25b1a05b5f49065";
+  sha512.run = "50caff961bfa572ae9ea36ce5c5afba0259b579eeed5308e8261b040d4897a45fb1a1f62dbfdfdb85c8cc2a5cd1314b18b26b3af1ad1fac5a7b327dc792be4d2";
+  sha512.doc = "11ac802287cca62b5e247641edbb5745624371cf64d217cc19fbaa052886bf2c5a97ef89084ed09399b59450bd0166bc38ca5837e79d3e32f5a7b1802dbf999a";
+  sha512.source = "f3a639815cc18f096daff9e982264d023ac4a2c46f7efdefcff01a88c721b8764772cddb96115fdb7ed20253af15574ede670a8e6f22e1175cb7d74611ad9fa3";
   hasRunfiles = true;
   version = "1.0";
 };
 "lsc" = {
   stripPrefix = 0;
-  sha512.run = "5fa31f26896a7540a138ab8ca1682df709c08c9d647437a85e2923232031172e69429844140ea6e5d004356864bc4a9ac7091d5eb9a6330083a7d54043027ff9";
-  sha512.doc = "46d4816d1076f17387c03c999c0efcf080cf216e5d97e13dbfbe6925e0f489c588c4ec9b7c5b1a1421ae1ab927d82a85602891d1533a587bcfcff78d65b9e02c";
+  sha512.run = "134bc263794be8b2a40db93708a6c74a58c25920994d406bdd81d2a9b8d900a75a9d26683c34782535ae9047153b969dc7c4ec7c4a7466925901afd1440e3164";
+  sha512.doc = "f7f132878cc277c6cf1556fc06971b6e312d40f2cf135a5f2b4d25a7afe074ea1f5b372e29eb4576208ba196faf27b00524345b5821190d5b844bb8e9f834949";
   hasRunfiles = true;
 };
 "lshort-bulgarian" = {
   stripPrefix = 0;
-  sha512.run = "0b2ada342dfc3def287e96f5bbcd63601e601fe61e777469262294d7987fabdfe8e44195dc7dbc9e8db2da3bd1945d61a3e5fb154fc82c59a9211bb36a324140";
-  sha512.doc = "f2ac03a25bb27a51c7564f2863813d3eb8b5f5f4c306952d42fa81b9a95104bca1f15236ca6c2eb538398103a13c3f52f03656ac4e01ae7cb879d1b94367e942";
+  sha512.run = "feb356faa485a690aa54ff3541c1419bc6b7aab289c375d6023500bb964642ca9b783e24668d7b1f3379478798edda7e34ab3cc116c4b1f8305df8c163032f1c";
+  sha512.doc = "8b0cbf5cf602f9adb28a5a4ef2ba9b7b8e17ec295e2f4ed07c7cf5b154aa8443131f1f2e642ebe24519f824215c5e5f40f2b737c619ef1d43c10ac92bb5a6736";
 };
 "lshort-chinese" = {
   stripPrefix = 0;
-  sha512.run = "494c80938d8701588f48a33843c9b25d35b5ee09688e73c42822927b198eed24ad34d99af3e1be5f1c8116e87888f781ace3133c9f2ac8c17e13010f29238a43";
-  sha512.doc = "4e846e78d5aa268998bba324aa8e0ad6f21d90f16b81ea3d48a20b91d2e6c35d3f3fda8fc951f85dbb18f0358b6e4ea59d8bbb4c897e77da83acb44a22226dd8";
-  version = "5.10";
+  sha512.run = "91727dd4309cc7bff22cd36563eb4b460bb6f8f2120ab9226539171ecced772a43cdc5cfe7fdf02b4966d3f6ab215a5b5cbad27d5184aa06d53a7e09788655ed";
+  sha512.doc = "84f9ab2d8e93dac2dc7fb2653e8d2de8601a5ef0746c6aa52f3ae31f467b047b39444fcd89d0b0b2d889e8a5e6d3fdbb71cbc4b0b5ea22d44bd9e416d6375a24";
+  version = "5.11";
 };
 "lshort-czech" = {
   stripPrefix = 0;
-  sha512.run = "18ff9db89f45c825533f73e69f6c89cb56620b36f7f33572f9d49fd8b6abe9430c7e5e1fe3b863ee5e31dcc15306d0cd006bb830998ec4f8cc919dceb925ece7";
-  sha512.doc = "7f70f63f9a4262cb37bb2c8259865254d0bee1cd1ba2cfafb6002fb7801711c832143178a6903e7d03625ae92041ec820eb4d1109a98fed28d9ad7ed79c1150d";
+  sha512.run = "cdc1edabc81f9153b469596db1039d664f4129cbdf07e30973097dac4d6fd84441b4015e2595b0df68130d3581a3b591f807348833b2a2a0e7e48a1318b38dac";
+  sha512.doc = "1fffd62d69fd1ed1a04cee19c5527896e2b992ead63fba3dd24231b897c5dfbb095ade4cbba96f6a8e8cb4c295f9413726bbacebce84c7d3d7967a25be6d74d2";
   version = "4.27";
 };
 "lshort-dutch" = {
   stripPrefix = 0;
-  sha512.run = "62c08f5226bdb63e5675c82f9a14041e6fa44483b2620ebae9b77dccc026488e01f908a9f769c4bdc4356eabaa8d3da8c43cf16dba387fddf9f72331b5a330ce";
-  sha512.doc = "5999f216df5f7f7a927776e54fec78dcd320a312f7e95f84c4b47110174a24b9deeaee6f1e4c1977558309551fd479218ad97b0a39a4addadc2f8dd23859a3ad";
+  sha512.run = "0a24122f4ec08cdd9d93d70956f43ca1f9d51c6b21c5048eb8a10f1d906ca1704190f7827342fdc2bc70e87492e3ce137340594d48fa92095c1a55e35dd4cc24";
+  sha512.doc = "eb6dbf050ac838896dcdb69c2a9e0708b3f3845324e429a81b824415e0b0b374c039b6a4796ffb01b956af5ee060cf6043f5bb82797a40cfda90b763ff334272";
   version = "1.3";
 };
 "lshort-english" = {
   stripPrefix = 0;
-  sha512.run = "c08cd60373d6da6bed88828dff55c77fa103a2db614115a638b784ee17354e07f3467a6adb9030a2a7562a7ca8b7330f4ec3a9f6547c466eb4521de6271220d3";
-  sha512.doc = "b7a2e7873876a2001e0211b26d4ca809f501960666fce5b572adb5bf60b8f60bc32d22b6de9b094f4652d225ca643d687d69fcd8438d27c07e2f8e0c36226a48";
+  sha512.run = "5c63912111f97e4ef3ad844b5aebbbfc87e06bea0678581d2d347950a28adf28ce93126953083921d562a608e711c082cdf94ee2b90b64a02e9071facc6ca980";
+  sha512.doc = "d6c1c2ea3ce26c4918ae97312aebceebb898a37b7dbdece04d021ef31d0b47daff82f516b6920642acade1088b4d144d551c4d1d91221e02e063202566f3f46e";
   version = "6.2";
 };
 "lshort-estonian" = {
   stripPrefix = 0;
-  sha512.run = "3540b7ccb6f166525561fb39147931aeef87ee64c79ac8207ae0b9dcfcd95757bcb4a31fc57fc700e5746b1ce1cf8204fcc9e3348be5764f638d328211182dc8";
-  sha512.doc = "4551dc092e2a701dd924ec352f983611cb2ef19038046e170bac22aeffca9adac27dfe93d434c74400967a718a7bc7fc91cb533ea4c15cd3aa4e3e4168f40c49";
+  sha512.run = "c2a80570ceed404aaa393b0810ced1ff86e03dfba94e37b8fe7463c885e3587471dffa5f9df55a3fd18192024c64769202c5d2bd4b768849e89fb3246ee04797";
+  sha512.doc = "b6f62aa6897d2413b62d47197af2270188705602821076b072c5f8a3dfbe94b3a39423b7251373f3bc822b622a386b32ef9605649070e77e0614d54964ab5151";
   version = "5.05";
 };
 "lshort-finnish" = {
   stripPrefix = 0;
-  sha512.run = "9b23541c7c4feb8ce2003ac768163002144b921524fcff25329c816f6a5ccea36c59c1390b1a053bfd269c3d55c2af3301cc02cf7d876e71d94abb61ce6697aa";
-  sha512.doc = "9905feadad575fa628462e2bddf489aa831181bd543e8bb38aeda11e3f793d2f65a31bee7aeede11643b7eb56ddd8ca1376fb2d19b0329c87c71eadbcc1c3d09";
+  sha512.run = "fe17b0781f17089d3a02754bcfe0fd07cc27edb9236761f75748110cea98e3360f243ec789a12307597ded80ca94403781582e598009239bde7ccbd3e3c20ea8";
+  sha512.doc = "4a4f2cc42bc3cfdb7318e20e16304e3f79a082ce58d703b3cf69359b339f9c4e393d62b3d0f87c8b43e9058439963d8031bf5b50acaa6ccbbf8681dd72a9f75f";
 };
 "lshort-french" = {
   stripPrefix = 0;
-  sha512.run = "569d06fd4f91fd840efcb85dbb708796a59064e50694ea53450c2e31ad0dc4a099db2d5e8bc331b729c349acbd1260c543afd3bc5823ac5ec74aa9f8390bb4bc";
-  sha512.doc = "ddb43a7318bfaca9c619d3a61761e99407d4051e07aafac373e45ce7dbad81b0fd576995d53a14bd00dbf1a3f41886f03f53cd158149b486697190549af70f12";
+  sha512.run = "426e30c7d83ed107f5f7821754bea4604b21305f53de6bd11ae24e94ded4921ef80dff7ae6ce1a133e093e0a6c47484090867086765b3f02cab59fdc77503256";
+  sha512.doc = "14d7bbb0906448253fda58ba54dbdc09caa582def3b629e42f8deebf3fe240c029e324b0d9daf407fd4ec4c39850132e5276f5acdeb8d4cfa08c8dd7d786fe6d";
   version = "5.01fr-0";
 };
 "lshort-german" = {
   stripPrefix = 0;
-  sha512.run = "c3eab626a050dc2648a3c537b1659a0d04cff5400ec345cff3689859c146f030af49551c2216f786cbb7b8161f2e4c8c1c4aa3f75e73a280d833d0c703cc112a";
-  sha512.doc = "3ac4a23508444fda57773f131ca41ba532d0718d95aa9730ec5675971722797c7ad0e4c204a4c9c48d5803faefc3d109f8981f0429138a54e248105d39271129";
-  version = "3.0b";
+  sha512.run = "427d12c0184d0ad90e4408e81358448ce0919cde5b0058a3472043b7990ab602102c127ebe43fc3cfada5c0a63e0ae05d5499ca4f37885e09437f124984ed518";
+  sha512.doc = "017a232c60b72daa02ddd4fdc38ffe0ba25532a5fe7825145ed02f0c8162a1c8b2e5366d915179293503626caeeb84362394483e5b634d14b72454a42f52024e";
+  version = "3.0c";
 };
 "lshort-italian" = {
   stripPrefix = 0;
-  sha512.run = "06c2cbaa641f8162887de49096701c8791f9af3e6d64817e8abbfe9167e79fbb65f6cafd5be06035deef2e48dc03f8b993e8b5198b8590f919c05ef86c7b8f57";
-  sha512.doc = "aa57d3e8bb93ee15a9cbbdab2f5677aae5afa38ee53653fc2566921e7af14f0d8642e7127309a9246155f332e93f06b72fe727b55e7d906cf5bb58f9c2ee13ef";
+  sha512.run = "69183fb3f161c9b964208c2a7c434430ea051d18eb04c585f90295043709d391b6aa6e93e4c5e3f4c76c441dce78b1128ebd808af115ec1d3febf0f63c22f26f";
+  sha512.doc = "353a087a86018147ad47258384a84dcad217333c3e3df1c9401284948ae9aa63179a2a2c0b68e47d88bf5407624bf15c8b05b913165db7635fec7fff27df916f";
 };
 "lshort-japanese" = {
   stripPrefix = 0;
-  sha512.run = "31d11e8722a9874073867869c78c1367aef1633aa757bd82381bb06a02233b83d5cb01f1e3e435ab64f35d8f0f326ed4aa83e8113bd784f0b62f74b4d468757a";
-  sha512.doc = "85c2e8d250c27cbc1f84ca2c355b7b2758b60355b61897184f3d383ff78325b649dba2670e42513b08192ff784222ce76ad70cd59517268c608863bfa0dfd028";
+  sha512.run = "27c64952e4d1f9c90875dd3d3343df93a6e68a3c87d4c970aa8a357d972222d2c00f8bd7c229a0be0ddf487aa94e74b313381e1caff2d6fb86240f3c39c7212e";
+  sha512.doc = "c101d56f2f127163c9183c57d2c1a3aa7469a1a8567dc538df8550ec66aa0ac4b489deb40188c3266a2f591d38be0f4d3ef784811ace91ebe5f7d5acea938453";
 };
 "lshort-korean" = {
   stripPrefix = 0;
-  sha512.run = "9f30872ffce767b4197e87d08c7c4fe7085528e78214659d769462cdaac5c9ddc2198f8ec4bc6436f7fd7cb5f24920f460344b122d8f8e157c7b4fa7b282f3e8";
-  sha512.doc = "2840b4fb956dcfc1d3e18a1bea5691bc9a6ad4bd855ec35d1631de95e0aa6112f0938587156fe301e29a3a941a34d5eb64f1a08f9b7d7877f3fe8cfce14cdfe8";
+  sha512.run = "3040afe9879dab6322683645343f4a0e2066cf756e6d0881a3d36f0ae65b2e56985fb964f6f8874a642dea4f57dd1a70f8032f8c4dcfcadf0652ace943e066eb";
+  sha512.doc = "1b1ff951c2131090aecc26603ac7bb30f90c4542a4bb4402f0fd08698239090cd5045b7572847aae18cb9bd6c47a0ddf720af9d795108b60e9203a23f6a4ae28";
   version = "4.17";
 };
 "lshort-mongol" = {
   stripPrefix = 0;
-  sha512.run = "0bfe7429aecf488a98fb38125a49a80d75022000243085d91a1149d9199a07f2b306fceb1d1d835d0bd2023d87b9ee157bb966b22fd25278c45afe2dfc35a44d";
-  sha512.doc = "a6634f05f88c92231aab590d6517666fd390753a6d71a1c43efd545205e90820d6ec8270943d46b95464ffbe55d6c4c725045c4aa7e619b8d721b9d1645c1ff9";
+  sha512.run = "df7d79307a1878641c0ef95ee30852a748aced24cc99612bfe40c83c893dc5808890915917fdeee3c44f407d467bda936f4d819fd67d1cab97be36e4194694b4";
+  sha512.doc = "576e1ab332f66eb8261b51669f09da98fa543766818b26df6476bbaccf3a24164d11cd85e03233f51377186c80bf28360854de9d68d17dbc26db3bc6a1b85793";
   version = "4.26";
 };
 "lshort-persian" = {
   stripPrefix = 0;
-  sha512.run = "b2238cefdbb41c8a712e8678c9e50716023d070bc7b279aad118624b529ecff376b6fb1d780c96ca70047d052237f30cdbb820c0a2a552b526826699aa907671";
-  sha512.doc = "d523b72041136152a3c768a1deff8bc62bccf66084d39c35a8c76ec8073c1d4d6aaeccf4b8303feed5f4d7c3a24ac9d95997c25dcdce4eb26584919e8503b537";
+  sha512.run = "20370bbc67384133a41755a1ee91306170c9b5b7131af042eb088f2cf41413f618470f0baf3a9e5036089faeeadb6c35285a8d2cf0374483c0db4d0137f73e0f";
+  sha512.doc = "21577f3ec0ea5196a8b7719d26a6d8a89e04192529bde730304aae0d24f558a34a64bcf96ac1f6055f7db69a9c62702559fc893e884eaee601d219fc9dd5b0ec";
   version = "5.01";
 };
 "lshort-polish" = {
   stripPrefix = 0;
-  sha512.run = "de698d17ab23b3b0673d44b5f01b9bef75eca7dab6781f9d393de1d6411b86abe9ed1a5881274dec38da12fe5d7624ad58134863f902a792fbc6cd1c5f642577";
-  sha512.doc = "b1c79989645e5dd192a94d790b8066f0bfa49e6d5b22a766650df11d167e262a34b4f43536261ab26c1eb3e2262f55f6b7b140c54013cd68bcc63c04cf9a1cbd";
+  sha512.run = "6ad3d6a8b22c00c3609dcb2dd0029a7da70f0bf5c78930a6f0370fdcc026898d3b3aa93ba6f391af51c8c428a07a2f45e75d6d3a05032d2d3d62ec55e6a812b7";
+  sha512.doc = "b0deb0f9fe5d1db6eb6d4a1599b612d7df05d595e44946bfcfafa951f77c7231d00e0415dd3de5dcdc20e1f3b9c2181245be233a67328457a7db23a186556f2d";
 };
 "lshort-portuguese" = {
   stripPrefix = 0;
-  sha512.run = "bbf60d6643f349d979a833c033c21e3a2797ccc45b5ffdcac831f67edad439bd330ffb7dfce619cf0eeea8a7b714e4d60f3a5190fe09e7641a35b08645913c0c";
-  sha512.doc = "0ca107e7d891537ca3a7e4a992fc75844755c81c8aaadd11c7f6dac70c06aa06b3de328df04c1deae60bec930057fee89c6ebf47ffd4ebce5683c92df13515f3";
+  sha512.run = "42f40e4c0de0f1243d6a5926adde4eeff6e909f239c430c2d1a69a8ac911943248ad0e2c62cd03eb4f6e4d9cdc7569ead5a4a52ca449e1717e0fb2d4456b3111";
+  sha512.doc = "ab305db94730f95770b975c9f9c8f7dfc09080ca9bab06e9e159d8d012038e874e43ad79c92716cbdacc6bed7949f47268e233e26b3c38920bfd944c520fa12e";
   version = "5.01.0";
 };
 "lshort-russian" = {
   stripPrefix = 0;
-  sha512.run = "fd631c2cdb692ecd9286dc2a0b09b464d1ee05263fdb44404ef627065d920cae1dffaae946e214e1a6e12d5c46f0a5119f24bcdfed473cfa9e1cb9fec0549e92";
-  sha512.doc = "2528733a71fb87e98f760f5e6052a80e69cf9b98022daa63bc886bafc16629d0d5ef4204a9b8ad88b4af64f3ab27d4f45f373445b4c55411983b32304a79c89b";
+  sha512.run = "a7dd5c673c83499d569202f136cb768e3d0222ab6fd68c21faf602803123c30545530d5ad9d9bd75415f06d6c78247056de086339d528679719c144fec832b7a";
+  sha512.doc = "c72729aa6600b58e71fddf3f11fc28db46a0ae330ab180234b40e8d096bb206ca2d1b226754126a64b876676d3992342e6f0be8f5d75b41b20cdabf93f704909";
 };
 "lshort-slovak" = {
   stripPrefix = 0;
-  sha512.run = "90545f5f8d48fcf81668a39d2daef68439cd658387193c89ec280e54d5f5ca74cd428d5c92bcd527a5f50151fe22d031ca4200ad258f2ea00250ff1b53b42bd5";
-  sha512.doc = "a783ab895d6f13aee097eda3546fa09a89f2c82add3d9bcf3965f2c3aa6c2d079f56a6f78432bdff1c9638e748d88d99bdea7facf8aafa34418972f84224c114";
+  sha512.run = "08f3193ba3cfbbd8c04bd4077f53ed56b8d7add2efe9ae5daaad916f36f23a66e1d4cc1d4016d5211d1b8028db06235582be442c8ab5384f3e37ace5f1a2430d";
+  sha512.doc = "ceb72821d0c8d3c34ba723533ffd9c00ad926bba968ba10bff45dc336ce878c55cb5ae7ee38236ec839ffa64b32f1f429831f2ae6c4e29c8ba307e48db2e6e80";
 };
 "lshort-slovenian" = {
   stripPrefix = 0;
-  sha512.run = "340fb85eda395dbed3171f7bf606044d2010d02c4f9f640185b6d3a8d14da5cb59adfd27c06b9c05f3b4eaf52e058fe5bfe613659a2b4ec945f1b31f0e8c1ca8";
-  sha512.doc = "8248d8e18a569596a957cbd8d8247dca049cac6e4a7ec68e94687bc2fd66dcf7c3263ec596199844bff09ab430077416167b47240f34717e16e95890044987ef";
+  sha512.run = "057a284e7cc1f55a4d04bf2f50ab28b854937d5b09ee2831be52d6d30e0e7759c69bad9a9ba1e91db6d6a33e93bc9bb1cdfa9dba698abbb77ec018df505cb55f";
+  sha512.doc = "a616266f37952d1cc8f8372411398b00bcea232925eb702cc1469b43ba2d0f25bc20e3130f195efa0cfe8fccae5992ecc2ab680c8a10611d09d580f10a1013d4";
   version = "4.20";
 };
 "lshort-spanish" = {
   stripPrefix = 0;
-  sha512.run = "cfca9873f04f7c52f2cf5aa0c2b1355a6df8e233d38efff0a5a3aaf6cba2ea0903a2949a8acefa12741d7432bbb46879a303d93421d1595005a5578b670f5a76";
-  sha512.doc = "f240847ff7804173c6c3e59d7ce681884aa85f1978a03cfa85c592297d55944767b7e74fdd80dbb1339f9032a307cd6ad1bacaadb4955647afd30ed7f05759ec";
+  sha512.run = "1475d70a9e615b9d64cfc8ce6e1302f3fb11110a927ffa52ff1d4e461af4b7e0af620a21eb486544bb709921c7f69e146ed8bd38a85760df22703e701336460a";
+  sha512.doc = "c76c4bb717d3d19cfd759042ce69a9fcca3f7ed8bdf224f3ede6babaa12e6d766855af9a5199e180538d9edea44adc3647bb6e5e6c552d1c537e9ced66174eaa";
   version = "0.5";
 };
 "lshort-thai" = {
   stripPrefix = 0;
-  sha512.run = "8f8ab7d1c846c4e7d19db7d58397bb914ffe812fec77ecfaffe44c0456299e33a72f9c2e8ebb54e0c3653ab30f303c308b7f0f27cf4749a2a9dd7d4d5f17ee11";
-  sha512.doc = "6d476297a225911caa75f61ffc02b60253db1eacb007a415ee52ebab0a6aac7a44d4c72e38778aca3bba09c908c653f00b48701a14399a7fc1473d673281a2e1";
+  sha512.run = "f46476d48ad6d1410584f5a4fba1e95560077774b9a314c87bc890d87d71c2ea35fa76b876aab56d9f4ae8ec7197a85affada59a60da977f90ffd168dc4a83b9";
+  sha512.doc = "05f657fda3dfc0bb25394b6464e00a5dc50e5d71c9d2c4beb02951ede1b95966edcbef26960f4120f484659fb0afbeb37ab75533406174abe00feee738a7b7a3";
   version = "1.32";
 };
 "lshort-turkish" = {
   stripPrefix = 0;
-  sha512.run = "7504082503c49cbe4dfa998656efd06d4969a68c3458f23835b3c26b85cebc347c9ec4c9bb9b3b4027533046edcd9f92558532969fcbba62398b81afd482d83e";
-  sha512.doc = "09b90fb9c7a44ea68be192aed17fd350ccd9baa915ae90809f0b167c9ff46f0a9bd64ee2b8fb27c4bcb9b0d84925f301f500dc1da55717a83f68203b3e94243f";
+  sha512.run = "5379e397748fde4cecdb4bbdd691b2e84be7c02168e0c061f48e7a93ecb0d22860de7ce11bea905de37bc1f2d738c3bd074daca72fe5354db1a61913f7c04caa";
+  sha512.doc = "32dda88db535c658512923ae650b837507534625403d927e92bc45bb8f55d0bc7a3585f87ff0798101f05fc82460754e0ebf22419ecc2e262b2d82bdf4273bac";
   version = "4.20";
 };
 "lshort-ukr" = {
   stripPrefix = 0;
-  sha512.run = "6b244223c6e6ae2f7d3ca8ff801e59b24f9ab52389f50863d24037f56d6783dc9d303ad961521ee74cdd615d9eb6aeb2fef4108f1c993275c3670fdfeb5cd5ff";
-  sha512.doc = "469975ec19aec34ebeb1d64b210d9155b0322bbd2bb061298f8ec4f6de6430f6c685c7ba5aaef5b121da82d761f8632e25517f710c7eef946daf75c287feb6b8";
+  sha512.run = "af36c0986487f1d3a6d8a6f3635db83754252b64bca1ccd7b96f0610afb375772a753af726a8e455514b82dbb9f539c8f7ef5beff3ce6c54957cdd3b1acd6432";
+  sha512.doc = "a8f7d18f672b1268403c9d38d3ade10492d6b8812b037f0e568c44f32e30ac5ed270ba44a7d87676bfe474d14e1c0a363fff0e5ad03f76814818e570df12a19d";
   version = "4.00";
 };
 "lshort-vietnamese" = {
   stripPrefix = 0;
-  sha512.run = "ffaa54f3cd34a0a4f1fa1ee56a2be3a807a5a3e15dce38d4a6bafcca640610405e9315ba538ca202078331b60905a0d3885a825a2faa87306900339ff481dce7";
-  sha512.doc = "382b7a4872bb528d2f89ff176e08140c96a8578cd57923bbeda48c418b6a1f19a016372e717fc08c0b08a8fd2762cf44795b699a51bb93180b8c825a5fc0ea97";
+  sha512.run = "483521a1885f5ba39a2c3f1a1b972c2286a3d39ba999ba934116f41b6a9c2674cbba98d05ad5a1288fbccac72ce4b55767e372e31ecd47dfd65891373fd2335f";
+  sha512.doc = "367895d346df9e7bc74cc6c6bf734889143b9a439c4d02ad2812408a951d8a276a5758707216a201c14b620aa47fbdf2441346936484a03e8559a749c9e20eb4";
   version = "4.00";
 };
 "lstaddons" = {
   stripPrefix = 0;
-  sha512.run = "d7b04cbfe3af078f1c5bf637c89fdb88327e002c9e20707ed92f4d17b822afeb11b753100fb1c8451988b66b3ee02fe276984b57c33508f9cc0fe925f421cad2";
-  sha512.doc = "dea8c29d1bc366e18aab89b425eb72cdedb89d0f56b79275b8a71688d5722d3c468803c3bca9a166261c03123dec0ad134dca5aa7bb3719e902a449fb2d69709";
-  sha512.source = "ffaabb9fe414be0591afa0af93f0470ad038b28636c20e2d314a6ac1858f9a5e1de063527ce764b5770fef78ac0bebdfa0e9daffe03ce11d2234c5d38c5bd33e";
+  sha512.run = "20ebc73c2627de5b41c1906e5656dabea141c07391f4b85a4c825b7752b9a424af30aeb9b33de89e68889bf158b1361880d293034e179d6ab391e6b47a8e6bab";
+  sha512.doc = "2edc6cbf09676690b722c1c15d73386a68bc60516bc1f54e0b9ceede4e1c67396128c38214e6180ad37f28d6fa5a05553901628467348128ba655af26b2be89f";
+  sha512.source = "686e41bedbdfb06af24c382f3a1009879159d0b32c5d2f6f2ae2600034573eb11b04e150b4d3cbb43db94ac7c804df28ef5ca6981e04f8763ec178aebbcef15b";
   hasRunfiles = true;
   version = "0.1";
 };
 "lstbayes" = {
   stripPrefix = 0;
-  sha512.run = "bab0746844d13c07a63d07d423afde39690bb8640e2944dd3ec5b728f9a01b782871f95e9212df8d99ed59fce932de6eaf5f7f16d9717f45a1a02e1022c58bab";
-  sha512.doc = "8e8636a559dd1ff12345666f78bfb249968dc9e945fe72e9ff9f4f45507b307f018530a1c6659d7a105ba511c0848caeac04004c1551ed713feba1ebc7c89f5b";
-  sha512.source = "43088aa29c8282fcc7f772698fffb741ebbee447969d0b34adbb902ae1b07f0ad4e9d621eefa1a7931576ceabaf52d51f25184b2dd1da0d26f9ae7fb1096c36c";
+  sha512.run = "a18f1940a7d904116f51b0afc09228907927f933a8c18a6885ecdbec7f513a64dfca66a62c04517bdf37d3f4cf3a58df5c72fa2c14fd893a796bccc30a99a33c";
+  sha512.doc = "eed7a36914f03cab4fdcbf9b2090932d331b9f414efe87e4eef00b851013b06757bf12e1d13ee7850d5584d89d0fd39aa2f360adfa208bc6833b199076b743c2";
+  sha512.source = "2897cf1d1adc6bc8958696737f70b35ba2e26122c114a3231afb49a5db0b973bb607f26d4f6f12f5fda8c53656998da5d3e71d85f3c978637e9253e2be8b63a4";
   hasRunfiles = true;
 };
 "lt3graph" = {
   stripPrefix = 0;
-  sha512.run = "bf6822c07a514bdb18b9ff26cf308997b83008195315ebd213d51af7889ac2f39fc2959c72b7535a9f03bd61b519d8fb1ea91607e22f13be58094c1acf770afe";
-  sha512.doc = "bd9d9fa3a2ff75d1278d5aa2ee6ebe79f96c9e9aee0709914fb8f092e2afe5f5ad77fd0a49965948b3c484aaa6ec475c27dbded125d5556c697428f3f5aec684";
+  sha512.run = "2731b8f21a5a69978cbcf7bfe12481c79d6029b9e7d19ea582965bbdf70fff2b42f40c579c5007d090647a15ffd6e88365e5da81a3dce2c8326173df20c06f8c";
+  sha512.doc = "9de47e35ecaabc789494ffc802bb95d6275d9c7af335ca149fc458bdb28b11f096de22e173b3c62ccfb42ec80ba4c8a2a59a925d85697491903dc8f4aca1d7bd";
   hasRunfiles = true;
   version = "0.1.9";
 };
 "ltablex" = {
   stripPrefix = 0;
-  sha512.run = "5aa9ee17104cf684d69012d1c6b77a7e8a05e9e3a18b4bc2fbd4759db72dc9ba3cec7385dcd8fdb81906473387077d86a5a066ea229db686d51760cf984e9930";
-  sha512.doc = "c65e8d32f338e291b70f7081d6e62647d483bcbe3201efc566162f30471a89d977be75bb7f0c966c19fc8ff32f8827f94da863a45c33badeb799351e3a675aa5";
+  sha512.run = "127f4cd2d9dc424dd4e2b7a0f60f1292baf81e53c3e17281851003500dc3959f714c714dc548bdb7a68bda2b3d480a7edd78f041c1ec574b1f3f5d697309dbef";
+  sha512.doc = "85cf455e32e95a6fe6d9a01c78997369f5e5479ff3b372ec80b91cb2da084ab4eca5c87b1e9ee6ddc98a4fff281aa5de0daff09922013197397b78844e8c5f1b";
   hasRunfiles = true;
   version = "1.1";
 };
 "ltabptch" = {
   stripPrefix = 0;
-  sha512.run = "7f13830e7f8e218228a1d290044425484431180309eb0d35e84d75a354d969dbb0992630ae00f29e8191645f81a5ba7f1f0a8457c2924480ced43fea5b71c905";
-  sha512.doc = "bc01fe8ec4621130569aee1faae35de990d0f08ba7cc23c6b42d7e2934e0b570102e00432aa5ee17103bd6cec5fafde363c3390acbe79df7054c5f3b8a82952e";
+  sha512.run = "dd89ace56e0dfa1f6737713fe8820c99f43c791f08c0dd28132090585e5946b65577ebbbfc5c3c40f1121624bc77d3a96f853679051e63f2aede466b727d73d7";
+  sha512.doc = "60ad97cd519cf0cfb83b3d295470ca06adcb5f4e2140751890d92760f0986e16d95fbc02d26307471c154f7170fca12ca217ded1ce8f2c34e2376d0b2a2991c5";
   hasRunfiles = true;
   version = "1.74d";
 };
 "ltb2bib" = {
   stripPrefix = 0;
-  sha512.run = "fc797173d5c11737d28c31812cb478a1411e867c566fc0ee02d1c8d9b9abbc9ca540b75224017bc23d989c477e46a6512dfabafc06772070e44cbc6f5ca2d2d8";
-  sha512.doc = "68ab5ae1be304fb958bdacb7a4be0a3f825b70c32c983aebadfb3214f19f0902591bac5549460dca8ba207005ed282897411ab9c1760d4391f14c6275c4ba3fe";
-  sha512.source = "0bfc8e316d3f6a9ca6be0e7b1233f60b44d49dea05f711a1d7dfa2ab40b2e3cb97e3745b314501c74b1a0576dfc64d90bb00366567a48dda3f8227a77431d724";
+  sha512.run = "d4cefdf14b511260929fdda1672d548b54e0be3453273408fe7626b712a9cd1a2a287729e45ea8dd629e77fd7ebd87c615240913c1c6d8a5e63552560381c87f";
+  sha512.doc = "cd88ef0ddfc92cd9416d8529ba055e18bfb522089a22c3d7b4640520daae9a76dd51df5f6f22502a1a5b036cdcd85b70da1f6b7f3cdadf09abaed0ed6e03e122";
+  sha512.source = "eefade64111d57126de5910ede7e1511cfb8c5c8bf9d30473b6605e6fbb303dcec35b009252ad65a521d506625a891ef47d69474867606b9b1095b0c611d6e93";
   hasRunfiles = true;
   version = "0.01";
 };
 "ltxdockit" = {
   stripPrefix = 0;
-  sha512.run = "a81cbace2cdf44968dda8c069425ac937124bded05f0f15160a55b90a4ea9c71b67cb8d8445eb0c9c9bc7f483d8724535abde6e77b7a02e7bea6e4b2b4d68355";
-  sha512.doc = "654da5f666181eb878e803288b7738202933ba47f495eb0472de776019f8f32399a0a16ad2e13d54c2821b7fd2f9940d99fcd1a781d985517b9bbb73d3c415b3";
+  sha512.run = "ff556fc044826c6b1838f94058bd7ea290ee0c670aab58995543d3a7b12236603ccda4b00fd2448289da0fcc7fd26e39cd1d5af0aaa44d32f0c85c94858d14d7";
+  sha512.doc = "f55221b3b8437231371d159e7fe26926202fb323df17243259982403cb9664895b14ff3637c5c4fee477f9a843662d5d9062e2e730548d2f376d7248303603c0";
   hasRunfiles = true;
   version = "1.2d";
 };
 "ltxfileinfo" = {
-  sha512.run = "d4969bb58c2ec3a167041a78586913481fd3d760d1434a4696ebdae643e9e80adcce0b424fd7b3ec33a8ae85e9bc7241eb108535f4873c93bf6a5fc30088fd10";
-  sha512.doc = "44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88";
+  sha512.run = "d3e308718cd73b58f73b4ffd0e2588e4b3ad130fa7dbe1047697e3b7c8c06f6d30ca0346e88b2daf122c6f198787812303cb2172aa3c6beb9f53ff4c7004277f";
+  sha512.doc = "3ffcd73b9ff61e2e63504bf7081cd4dd55cc903e4bb33654c8c69e7bebdb5958164f8c680676fc3a44b0f309c4640b2bdbddcc6f64f4aab0913d43ca63114e60";
   hasRunfiles = true;
   version = "2.04";
 };
 "ltximg" = {
-  sha512.run = "5e79c50138d86e511cbd2122149feb26b0fca7da689bb571a2290d028802684c0c8416022bb8f2da22e40430fa9866e98f42c13e98d5ff834c1d019c0dbd4c6a";
-  sha512.doc = "a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8";
+  sha512.run = "e900ba5934129db488239a3430b563b54f13d0d33dc4d01976f272efac432f9912aeea94eeaaba9bef0d67f20802674e7765e377ac031783150f02c58d21f707";
+  sha512.doc = "bc7d176e11a306394a8d3837a77c47024bbc3207c8d52b3d381714368cf040099ec587bfac7212205311dc3196e3b3c5c94fb1870698411f0378eea2bab05659";
+  sha512.source = "534c9e2790d05993c07e2cc7f2bd1d5ee0a8c4630c50d413419033a39f8a2e6a2bf410aff717e5fa84197a0e49e39a0bc51fd5da0a0e8c61a276bf3bca457458";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.5";
 };
 "ltxindex" = {
   stripPrefix = 0;
-  sha512.run = "503c41747ed70f575e1e675bb814e722d06b3de20f3a8bf5908b87ca471616bdb0c3fe6d4b18d585d2e529470ae4cf7b8060b5bdcc03c29b44e990cd2c6ed303";
-  sha512.doc = "ae13262a4a3453c754437af47c8903db3a9209dd90c8465add3f2441fc73ca9026ee3440136cff344809559e5d38645a3bdd0bbf045a3d409308d235f2efb083";
-  sha512.source = "218bcd78d5959fbbeb85daecb394bb26fb85bc84c77890efe15c9723ae3bf25380010afa2e3e14de654eed05361488506c7ded988bbcf1d714d1fef39a93f5f7";
+  sha512.run = "0f67f4a6f7894add145d8d464e3d90d194f30e2bd0e6ef5e12240a7e9b978f8162f7571dc09f10f4da0983ce6a32a5cefa816b67e01e149ba158d2f52138135d";
+  sha512.doc = "4b2fa5c3a6dfebf86d71a93e5fd8165265c28f8577b227c540fcc6c8f9175510aac55197ffad3925a4d62b80977ae896cecbb26972d817e95091c37ed6b3c89f";
+  sha512.source = "766b399267bb7070de121f64b3439d77d4b6f3b883c949482ae6685bc4c52e4a7e99888bcf5da40f41df81b1539148a67b117a4145b2eaada240fb7e4ad23a5d";
   hasRunfiles = true;
   version = "0.1c";
 };
 "ltxkeys" = {
   stripPrefix = 0;
-  sha512.run = "642a5bb7c2c437390525e74178c4e6277faec2691f3d4fef335f43f3f1efbd8fb4f69d619e8a64b306e33dae234541e540c5372a7e978ea22cd9987daf146628";
-  sha512.doc = "68a58e6587a3bfad93de40cbb4cfdbe463ee3d2fd354d08069806111b84e236f3ac4b09d8533259e432010931e4d5882afd68b5a0f0ebeb0835de5d0ce941af5";
+  sha512.run = "91a8e6860a5a6f31c35679e21817cdd35ed93e359528a4459181fe98cc46475cb08e72877d6701ea6aeac9635cf85998529a39d456927146dbd633f5d2b5dbd6";
+  sha512.doc = "9c9b0b071a47187d8236b8b2ebe4e79d60b29650b8d9b9508f8f7b845a387b38a01deb43a1571aa91923d185bc90d8e6135a8e07f5ddf489437da525c52813a7";
   hasRunfiles = true;
   version = "0.0.3c";
 };
 "ltxmisc" = {
   stripPrefix = 0;
-  sha512.run = "bd8e2163df74914a297bcf38706d59a891f9d863825c6d501a6f7bdc9ada9dabb641d5537214df0cd1b9ee75070c923f6f4522c0af1bb24ba9495aa3b7590128";
+  sha512.run = "d7b93ae125998ac4448b698ba142a930cde58424379ccd3752de1261b61536b2e87d15dfd159eac6e62d7cc8611806a8bd5d7e9565252a9d18d0eb2bf5183134";
   hasRunfiles = true;
 };
 "ltxnew" = {
   stripPrefix = 0;
-  sha512.run = "0dd6ea107a73fe8243f995a9a91f50023d7298dbefae2e7463f96f2d6f09a5d9d6a8be0a565c1bafbdd797a0ba0e76447f5f2e9b911cbd004d527e16f50dc0a7";
-  sha512.doc = "7f44f1d8ed6f2f15d79c6510af25f119caf23569214cd0799be3b64566b5f95622429fd332d322000a871b6a2689f9d1b4bbdfee5135d7a60d74e615084db278";
-  sha512.source = "b9fdf9fe5e6b6ff6561f9036f12e332b75c43b550b908662202f6acd6bccd2b9b1d27a5bf74523e1e1f0af5fdf351f95edb76895d86ade55b065676ab8f41482";
+  sha512.run = "76d29be39f2c198ab87145db85c0b889b191a890da404fb5d6fb587ea982aafe00915f18b1b3c3dc188e3114c29f79e3a3d622febd53d96e8c3585690b0e0590";
+  sha512.doc = "4f400f321e0b44be3a994ebba08bfb71e03d445b0beb02a0cf430bde084e18886a93d4a9ba98569a5f388c90e4d9afc2c38e82a88d5f2549b7f034a8f37b1ceb";
+  sha512.source = "89988f5bf63d211c849c9021121bbe869d6b00b30d84dd1470f77698f81f67ac1adadbf2cffa67a24482d1b259226caff97186d02f27f83f76dac3d0be41ecae";
   hasRunfiles = true;
   version = "1.3";
 };
 "ltxtools" = {
   stripPrefix = 0;
-  sha512.run = "1202facba31b425100f115b2725c1623af6290fe6b72f4857579a20863de4c02c88bd323b6519048d0268555eeac2cd7a3902f42a6fa55419b831d3dce51fbd0";
-  sha512.doc = "9b7fda4de084af5bb8dfe140a826b526b1496546051a48851c42d5158d3c5939e27088d3389f7ab140beb8aa2810acafd23037ff8295233dd1659156317255c6";
+  sha512.run = "d38437071541d91c7a621be3c4f421f95a8f974f7878f280d4032e776d8e96491946d4e5fac95dd2900763e30039097cfdee2eb9522905749323e4e5f7b3a4b3";
+  sha512.doc = "8e8dcc1332c865cf79282f9e96d799357cf399c106ce89a42180bb62c12320ccc065e0743e2201aa06da2739e608428738c5affd3292e080eda89a6bde8a8b08";
   hasRunfiles = true;
   version = "0.0.1a";
 };
 "lua-alt-getopt" = {
   stripPrefix = 0;
-  sha512.run = "ff3771ec5de2487e7017d290f38259435c9e06abee82be03d96a0ac858c509f006d9f0904deba4e6fb661d334697df3ae5ccd905b81e4ac76d50005ec3dc6c30";
-  sha512.doc = "a9aeccad97118c77ee77681ac73adc6cc53dab904c0a4a28f554dcaf651a3a3c54b3aa26e9431050857340ec4c3161afe57aa1bab5ddf8ff45889b184371287a";
+  sha512.run = "85c5f1ba68f9fc874b025a7ebd63501419b1df332fbe456e49560effbe4f386abc641481a91a35e66617f7e7357f45a5d605876efa0e3fd680d4a4699c0e7cf1";
+  sha512.doc = "311a04ef22af0e2bcab6166ff3d257f76e7c39244cbe81742009a97466e5230d69a574e98976db5ac585baf3e3d13c0e6b2cfdebb119e6db2acc6e8aba0169b3";
   hasRunfiles = true;
   version = "0.7.0";
 };
 "lua-check-hyphen" = {
   stripPrefix = 0;
-  sha512.run = "b838df3e2d193ea9c71afbeed80dca2d80e2d25d0407d35f18bf2cfe1bf3caf727d0008a44ba530754f8955d98a45a3a1959ff0062063a0ff242b7132c1f0391";
-  sha512.doc = "5f65b2206e212b24bc1ebd051e7ee68d6a3edadb8534205f3cb3629199c47ea0c38bff74c96fb0f34ac9ec573111710540a3c4d0805aa53cafb6dd23d1783946";
+  sha512.run = "461c69113030a4aa7b2db1916d6072cf3d8cf264e03e6f103bb748d98c4953d74e325aab1f4e6a260b53a5591d8c3cc667ada416705d6a2d7d9fbf0c46503dd2";
+  sha512.doc = "10acf29ef3e6991b6559ee5081cc7e566ebc8b83c9cbc26a5c81993e21f9a56545558a082f07e616bf440af99b18e5ce921732d6b4150d1d16548901172261da";
   hasRunfiles = true;
-  version = "0.6";
+  version = "0.7a";
 };
 "lua-visual-debug" = {
   stripPrefix = 0;
-  sha512.run = "2bc9b1566530d8da5bfa3237cc41c6f2c486143348e19d832938f7e7325bad49b5d58b057d3307ab1145126555746aa194fa51be502ea5e4d97d33f6db4bc89a";
-  sha512.doc = "f812fe0401de5085d958217af41af8613b9df9541ceaa8c4f64b4a5bfa31992bfd20bbbd85ad4f62d3a3b95a572351bf747818f2e8be17087959a1ec00e549b0";
+  sha512.run = "d5cfbc328ea50720eca067e9cfe436d8908df0acf50b48539b8f875bf735f79c376aa9b1936304aad46c3f37048efa668f10ed91549fc3aec68d98942ce0237a";
+  sha512.doc = "6d8ecfc56d263086fabd8cd12452c45547f5f872275ea6cc6dd5ddd1ac74449e8f903ba77ac0ab2d4f7b9bdcfce16efffa031bac1dced7e67022a7b81684825b";
   hasRunfiles = true;
   version = "0.5";
 };
 "lua2dox" = {
-  sha512.run = "8d92191cd59a56e902181c5326d08ea04c35faf838671ea2dfbc273a7536ed822da493c463f6220703e66326572445bb91f12d2f91f554035113fa0019191277";
-  sha512.doc = "6fafe55653f1631b42e24f83ad8a181da7ff0936a5446fb5c048ef8e849885fbcd2d48c82dd4380e4d0a5c39480e6d37847c87d87f0414801591e6082e1552ec";
+  sha512.run = "7f94a474c26a50b50eb9d26082a174f526272fbe39d8a2d4e2afedfac7cfdf1adadbc2fa69d029ae92463fdb9db86f36bbd5d54538f14df933c697c8a85fbf4c";
+  sha512.doc = "e1be1ffaeca1cd4830c2ee0636aaa4d596ef2cf63fcc54a84a3db7f36d53af01b571c15f26650d4ca35b523957b281818b94f4a8a36ab5e89f7afc49f4480512";
   hasRunfiles = true;
   version = "0.2";
 };
 "luabibentry" = {
   stripPrefix = 0;
-  sha512.run = "4aff7f4b3dab9233c5d605be99593fcc1ed4be8b93530a38a5939a3d60f31a8c4b41d5070494578ec8d88e87559ab2651fdb05f1534ba3c32acb0ff8adf19c30";
-  sha512.doc = "1e2a3ec01d4f7270d43586e604bd12c165b43842601b4672e9153a1ed2eff0c3bfdec1aabbba24e883b9b88fb3a0df035cb2f34b699597a62446b921ed19907a";
-  sha512.source = "7fb052ec0667986de3b1f9ffd03d95acecf5a6f029878f5abf5e3e0349727ffead4887233a918673c8d63040704ab95043dd13554df86ca6b5d83acc9d76b62a";
+  sha512.run = "a8e2c7f08f11f0cdd12ead37f559e6bdbeffbf9e639c40e7d0b3218d730a2624711d06b5f0afa1f1f24fe23ad62bf7564a207fcf76333ecdcd6aeb26786f8f2a";
+  sha512.doc = "51e0c28cebed656d3d6d6b7128dff4d03526d097aba2d0ea1b835add42a81124b0983b25a7386b436f6900197c25814d1be2d278198e0c01b38f7bf44a3dbfbf";
+  sha512.source = "4b17fd5d9768e93bf59fdbaa61f857511606379a0e1c38ecaaa494871ea14f2e0b614cef12cc9672d3e81e38275332b2fc437999b8d06d1e5c01f23efa0164b1";
   hasRunfiles = true;
   version = "0.1a";
 };
 "luabidi" = {
   stripPrefix = 0;
-  sha512.run = "8247241eefd8c8e81e6e9d1b41d87a779c098b8ea5b077869f31c0c525078b4cc2034e5cb1caba91a51f891781d1a6e3a2af9ac93dd6089546130b57e4ceb3e4";
-  sha512.doc = "8753dc7c6520bdb48d323edde13d0faf0227257b9342cfd350abb637f86bae9dd761345c26969263ea0faf3b1e288103ae51fa5c9db7a2c5ee365a77bbbbe84d";
+  sha512.run = "ce7cd6fb13d00d23a6e9616b11c4b787cb6dabe03b715a5f98c78659eb2ab18259a562d484c28e97f228b0a8e6b63a80f07e6e770705d40d3689604368ca1336";
+  sha512.doc = "8d52481c91e5f4528a2b6696e31d4295a32a83dc6ae17f7ee2bb942d804263bbcc3480117e23758c3086b99b971d10d0733266ca6446e6fc3eb31d50e6dd40e3";
   hasRunfiles = true;
   version = "0.2";
 };
 "luacode" = {
   stripPrefix = 0;
-  sha512.run = "4cbbed61727afa7bcbf285fa2aac427d55d170ca84fc8bdfcca1cc6889ffa72010965926677962a1e66870430d47b48a718d398c5c99c3c7df3928cd300a6ddf";
-  sha512.doc = "88efc8b6328a1206a961c9e060c1378949189964e7dd46384eded38ab21d43a7699d02d9e43fb5190d1936e682d6868ae6064eb3ea5a9111b91ed8f990d988cb";
-  sha512.source = "8b25527c80ff7f92c58bfaec7e763e251876500b95e61a5e28a621d6cff0054ea5a449ca23f088f14ac9caa22cfef9a31a2d85cfd9dc4ef14a3858f1e6fe71ab";
+  sha512.run = "2e135a1af37d2f239a972ed407415b49c39d2930c29f02f17283452d2683ce33fa695d3709137be6fe952c3dda6bde0ff3ee5007b2b6aca90f686effcbebe206";
+  sha512.doc = "3cc13b412ec06725e4e624f6a033d431793da1c04e3cae3166ea495ccba903a52d224d518d039787adbf71f4e6190c1edec2134ee895d7f98423b656257eaf4a";
+  sha512.source = "5bc71c17e2a85fcba64b1b768464ad58bb253f826323ae2f95d0bd1e7650fe45f8fc9f13f9b4849ef172ad3caba0f2e83c934a6b8a0ce2bc3987fdb188c22cca";
   hasRunfiles = true;
   version = "1.2a";
 };
 "luahyphenrules" = {
   stripPrefix = 0;
-  sha512.run = "63e44768889e80c9a447e60fe22ec9fc4aa1a38b375f968ac58bad34d968fa45a7ae5a77da9675c3f189967bb784cb95993d37f029791fd432ae262b513567a3";
-  sha512.doc = "e05db13a6fbf9d24b703e9a43caf02d189a5cd06ba8f087acc04df0ffb5121a590f84f4e85ac7ddd078fec5003877016540637feb8141c52cadd644233f3da35";
+  sha512.run = "2cf947482acb36ed99138de97304c4dc9ac929f6bf6bd0f32319d35ad2741ef03dd93da804ec331a6d3a1011cac4a105003a8028eaf1c041a7fc520ba27ceb3f";
+  sha512.doc = "f181a3c3147ece62ef0088ac815079ff2a2648a89969f3c2555b150d387a35d7d5b42a78a95a0efd90c4d6c6ab0b4427bae24d320b1435ce3a74a715cd79b716";
   hasRunfiles = true;
   version = "1.0";
 };
 "luaindex" = {
   stripPrefix = 0;
-  sha512.run = "ac48c3ccaac3e0df87ac00b23dde55bc8f2858996eb9b66e7f4d590c212c98d58730177e938a3cbc989931fda75dd3b2290759b4b6e9ebc088328979ab809efd";
-  sha512.doc = "e4221485dddb61b7a1a166d6cc261b09b9a65bd21c4e641b41b11cbcff98405f7e2e6ce62dc3cb72da0cb0002ed2fab918c0c37bb94cba49e6646338e2d17c60";
-  sha512.source = "2baeb9b0cbf6a7dfe129c97ae910a58f61d30398fd7144b5216fed25b9351542d36b61fe0e7a3ca30984613ba71559f99d68ffe2373fc74661808db716018530";
+  sha512.run = "60c0ccd42590fc29d2ea99a70ce1ace05ccea8608edc48a65732d3062554d3d8ca866c7aab30e14752a312243bc131b9e06f045b68c8a3d631428a432af8abcd";
+  sha512.doc = "af008a80e9906a5e3a6532f201066b3d57cfc9436eea8844d3f5a2f6d15dbaa100f99bec9f09528eeaf1ed29944a4de96cc9346d8bef772963de13861c0eb9f0";
+  sha512.source = "5733006ee58becd0e14351b9b67d0b32b6f332d5b86ba6b7c51d1f1bb360f1377aa9545c7918d53802606700ebe93eea2e581913feaee700b84eafde33952bb8";
   hasRunfiles = true;
   version = "0.1b";
 };
 "luainputenc" = {
   stripPrefix = 0;
-  sha512.run = "379cc8762a4d429b35bca956f9ce6de8b157f95d6f24653fc4fa8c2b3e83c649c375af12927fad0c47ea9e447b024c3f44d8c60c3b2f773d4b0f4bb4b1c8c0b2";
-  sha512.doc = "35dbf2c45dc6b18b8acc56c4743d7eba700718e3821929244bdb3d598145040eba85060513426b14bd5f274ce1bf801aad59d20b7bcc7cf659b06ee3c81570a1";
-  sha512.source = "1e4ade787298238a3994d7fde5284891c75fbacf107073c56a2b6d6e7658b463f57ac4995ba7f1460e7aee41707202954f9e591befc9e671c464ef2c2f4a5480";
+  sha512.run = "a626c9f0c1ea5037758886399183773e3b746d3fbcfcb886c7c875eff69d6c25c449ff363342fe526785fa246139a25401feea8a5d2018dcb610f44132abf6d0";
+  sha512.doc = "959d2ca40ba73c3c42d8ee3b37c05b05accb1f9bc1430e09c93c1f3077664d8b6d2fdf24d40e153c314437b0ce161a24d75609e199c917f4ad90b5a1c8357cb6";
+  sha512.source = "fbf4557582a25ae71c510db06d14cc131a7db99369bbac19ce68eede61aef6f41a1add200dc4660b2bc2b48e2eb64c1b861b1b6dce9b4f7683ffa54cfd011004";
   hasRunfiles = true;
   version = "0.973";
 };
 "luaintro" = {
   stripPrefix = 0;
-  sha512.run = "55fd5b8cfa5260b40f233e40cb55c85c9fbcfcfc460c6c8270871d8a5b45e9b845f14d9b7392a418aa857987d9b8f3e5483f5098333e99840e38b89cf70f9b8d";
-  sha512.doc = "f15d3efa9c6daa96b7bf1828c06be29d8f8be8497e99a48f2427cd65fa805872ad7b12afc19593bbba4972164f6d5d2a55aca61bb9393606c018b0d592e36406";
+  sha512.run = "61494892635c6ccc928de914280a826582e26254e82b75e4713c6d7f209f58a4259c980715b09dd3ce1287822b5f34e2229db12e92abf4bd38befab565da1877";
+  sha512.doc = "fd566b874716888c0135cc7464382cfea65be4539e029d36c1020536046f94160d6637a86ed44e31e7e8da6c60eee092138e4d8567aa613eebfd8c37c6927f6e";
   version = "0.03";
 };
 "lualatex-doc" = {
   stripPrefix = 0;
-  sha512.run = "3533c503c3b2e3554da847cc84478edf2d1c87c65bef3f89c91bf8920233163cffa092a9787761b78a5c9fc51fe288eabaa185859a5cbf5338549a327b9841dd";
-  sha512.doc = "7a35c781b063da063a5ccab63fa476637e7c543c389f03f7e10059baf28ac47c687c29a8e151ddb0897a10bdd860029fd6627d4bdec4d19838655c30bf88dbfb";
-  sha512.source = "5ed3164060824134d215f5a7fa7fdc9f90d8aea1bd4756208c105411d737994030e11bdceda1a6070579a3cdafb960495850a0d6dc7a0b4f26ccd2efadcec8e0";
+  sha512.run = "076b23f336857c0c60baf7390314241abfc76ef244e77cddd4e8702e049863ce08b2464767a7ceaa1343b7dfac906222d9d4099baa42c4339e126b9357a988f4";
+  sha512.doc = "cccde093698749307035cf673477b8ca9d052c0d11af2a4396c07dd5fb135d278febbee35ee6e2294c49d0e123589ffd8dc6e5d5fe38c23dcc2cc850f43b1128";
+  sha512.source = "5ea811c91d4de834cefcec7fedaa5bc33173e8bfc060d4fa74c21119e556244e3be7d8e71ea120559fb508078f8e843fbdf3a72f06e2b5c0e8d01c0bc44cbca4";
 };
 "lualatex-doc-de" = {
   stripPrefix = 0;
-  sha512.run = "d8c8e130697914a1aba0a276599f490dc220abdb7bcb772cc4888ca2164e83ddc28334c28e56fe7e5211361dc8597a38ce4aa679a8d3f88829be808228a72a27";
-  sha512.doc = "35f8c2e547e99307030b869233ceb497e52a5947f3894d02c7f3ffaef501d516e3ab034fd748befb2836d47f0ab7a44cdf764a623aca4fe4d286b107ccba4de4";
+  sha512.run = "3bdaf2d088999417a1d8d6f9890a80e385eaa5ceb856c3f931f1f88fc1a6492630ce9112e5fa0afa8931ef761caa1259fe5d74f289e10a96f6de1a4bb4773fa1";
+  sha512.doc = "7b6e1d872bec18a0309e34d9096f7b1e364c9b5f4960bc69513a454395d2b25f7d271de8f213aff30141e29d3f0294e06ff7100364f1e57fa46b02c4c5bb1988";
   version = "1.0";
 };
 "lualatex-math" = {
   stripPrefix = 0;
-  sha512.run = "ca0ba0f8dd678b6fcc05439c93e1bc3ee6554dc54837c075a50189beac201d59f8105f6557e2cf9998e512b0dda37de7f534c1464d8d4ea3e9273401f00724e3";
-  sha512.doc = "df52c4c69205408be93bb8c7495ad8743a2447d9f4b6b6de214e26855a82f4df392946118a27bd36883ae3ae7776115d93f1967d5141f6fb4f0eba3c58518b8d";
-  sha512.source = "7509102014fc7e5f7df3027e02bcbe4158399aa6850ff98120140f01f6342e0d40c3b149cc8e56d6c4fd135592c9e941c9c26816f2d5466cb95b55f2cbc1980d";
+  sha512.run = "98b88213f0a8c8e7e1d4941e7692771ebd5d29f0d1bdd077ee7a55cb348689ca8820f227209af76d05bf9f13a826353791726fc15d4cdc71b8bc703d23d48e33";
+  sha512.doc = "3f65fe029c7ca74ba3480f80187b05d52c4946d00c08ff57f9d0358ed85c6158103030ecdee0975345aaa94edb1df039f91fab327a1bd5f7d6e524988ddf587b";
+  sha512.source = "e210ae76fdb8275476f7f8a9b9258c4f7e89928eff1070e3c4bfa85dc3db2c722434c630d3deba759ddb75afac601aca18beb0cffd2d32dcc111bd24fadf2d4a";
   hasRunfiles = true;
   version = "1.7";
 };
+"lualatex-truncate" = {
+  stripPrefix = 0;
+  sha512.run = "a1a5f1f657b9157ee9e6011aabe632a8cebfe9ed53d3a36f4155b6c474232ffda5acc6ce1c6aeb8916322e958a171c156520ad564e41c005c4abf83e4610eda4";
+  sha512.doc = "568ab68bf891e4c0d7d3a67554a51404bc3a26f8c8f9211049b1d2902ac77950728e9a24b557a5a35d4157835fec2f79ab459bcd179c41af8cd53214b9206435";
+  sha512.source = "259058ce56ddb534e758b6bedc400a9fc18b72c83785621006424cb3cbfca1ad10421dab0a9f7dfab4f083ee1c605b9ed454adab8322fd6fff5b40823b465073";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "lualibs" = {
   stripPrefix = 0;
-  sha512.run = "1012f97ba836b07123e470037d9d6fae967aa54ca1385e22c0fb38252600d5e984072d1cb123a4c618d2de810af164252b2c5563f58011044cb552007bea640a";
-  sha512.doc = "0ba312e78b2a6163c09810615f78940d04ed58de4699ff2e802cd44bf6631d2fd98ead8f45af7ee171b799208eb040b1fe540f5c4f928c5bf08a99fcb514c74e";
-  sha512.source = "9a044d847339104974f46a1256470049042aea0b314eb94ac3e01111383076b320bb3ccee5a730852be6812c7f6638f92cc19ddec64034815a757157baf3d3f2";
+  sha512.run = "e5ece99d5f6b3539ecccb2f7506d9cc7d89d5e9bfcad767db548f673875d3360a7ce778a1cc61a3467cd3ba21904a413f7109d47dec00bb7100ba3f78effbc08";
+  sha512.doc = "f84375704094796a308dd63e2a0ffd090449f3e15758516d835d384d448af9b87008e0871eaf0a303afd6a36804368286c3cb051c5a3514e668294f9b8904302";
+  sha512.source = "82f33f896713f85ba672b56309ecb2198cd5a7a3e35707eee2e6cded65b44154098281e46f04d4b9069a54e55bd84147c8c950e62e4a7846ab6e1d445a5527f2";
   hasRunfiles = true;
   version = "2.5";
 };
 "luamesh" = {
   stripPrefix = 0;
-  sha512.run = "d299aadb8941b414d34e3c1a9e2d3a9124bc1f6adb7b0a4c1197a7cf4fc3ea78b3cd48c0e95c74cf816412509f36a2c0ed2a74f6a6584cd48f8d0c96bccf4416";
-  sha512.doc = "cc8d6336228057ddea936ad26a43e5add41b975060d5127dab5e2dce5d737331435c80fb15a6c5b21a903957529d6d80dd9d13fc6bf8c0aa249fb2cd36619c59";
+  sha512.run = "a827a23b9e7c0ad1b4b0eb8c17ec362715e6b07aa79dfcb81bbb61fdcdd3f8f2b14f7313c2b9ca359e3a9409555ae412d40d2f7d25db371a76478a7adf703608";
+  sha512.doc = "0b2c928dc0b2b0e465fc2a0b073928ff3603e50bca3e49753056fa95785f572c7e010a16e431c25e696a1e00e16b18ff79925f9d661badee831136ee7db7b252";
   hasRunfiles = true;
   version = "0.51";
 };
 "luamplib" = {
   stripPrefix = 0;
-  sha512.run = "c563e8f1f7bdf8a5bc830febb86cb20fbf92a0c57bb68a11a1646e5ce3c043e5865f4afa9ea2f0d51b0fdbd250f7d6528b6201ba1ca97d01945d8caf52195755";
-  sha512.doc = "5f2d7381a06332a6eec2ab82cd1224e704ca19e05a8a7c269a2a6f7419395aa8542ee8db78be1b16fc14b8bbea0cf035018bbc4c63d800d64d899180490d9bfd";
-  sha512.source = "289954b36588db63452608912d141b33950c0b7fc1d5b9eb89307645e4b5850139b31fdcb7b5d761d7171b9176a11cb3ec82c82c142d7cb821fe15475f051a85";
+  sha512.run = "440f56072bb3326502b1e403b2b113650d3a2727bdf20d66042970955e246d71cf93240084fdb9ffc2e62aa838f0192098bef925bd73cd1cb197c10ec410d847";
+  sha512.doc = "1169de9c18f1d7b06a0f1793d82e6f8fe73430cce3100dcafeb2b5c519017b37fbb787afe456866a3a3f1d71f614f8fc401e0263192e401256ce4948a4486403";
+  sha512.source = "76047662473fcb3ba4849433101620460f05ec09bce526595ecbe67a52cc879142119d637fa69d5c2e7fbca2ffcd5f28c98a7f10664bc3973abfbf5a98dc7623";
   hasRunfiles = true;
-  version = "2.12.2";
+  version = "2.12.4";
 };
 "luaotfload" = {
   deps."lualibs" = tl."lualibs";
-  sha512.run = "c9f353503b81d55885dd22d5c5b707823018475ea260eff4bc8aa1d91150ff0ac034f857b5721f6604612755c28df2d79b139dd6cd3dc7edae3a66c3612dd381";
-  sha512.doc = "bbd0f6f3cae8e9b4ef8f4cc315fe45327472da1a9fb9fbf906c86c5789cd7e2d495602472fb8c94b0eba0764f2e7d6525ea710cba0981c2d1e7f43a391aba4ff";
-  sha512.source = "4e3af9212efa8da6474353638e1b408e6caaacb3a4925bf552c3200b6f1afbb4ec05de7e1b7e4170f624f5e3d88f96a3789b720e5b12fff2d64c6bfed395a529";
+  sha512.run = "07d85e222d32a4860d855c68b7f8b3c4c1f30211714c609ee65352d077ba633b76a157ff277017831080566861be8499f7a613d4b3c67e9b17389663f019776f";
+  sha512.doc = "557a462d62a52bfc05a8687fc0444dd11244bf0cb9c94f4aa56c50ab8388573e5ffbbcf60a04660b962b16afc80ce25cd01dc428c6f659a132f37f31863e2282";
+  sha512.source = "8a2cab7e23027949a696cd104796d059e51b4b2bc70f57f6f75007b5f496be5ffe1ef2aea9fb70fc08d630e0df0b447ece6575059f3b7a38f58ef493ef73bfee";
   hasRunfiles = true;
   version = "2.8-fix-2";
 };
 "luapackageloader" = {
   stripPrefix = 0;
-  sha512.run = "20b476f8009087e196b3a93b25310ba8f109fd541292f170e995c1cd7ce93c20ea9fb772f1bbabd50201d86948b8290ca10c616e2bb7a58f9d9e26d4806ab318";
-  sha512.doc = "f7662315be0cbdb8a7ec9f639d909e59e17049cf30be22aa0deaa0f9d54ed357b1f33246e8071202cd2dc8f623eba892332844d83b20dc7be26fe9972656b9d0";
+  sha512.run = "b55830386d6855d54480a937cd70b46b2421d41e67f08e2ff7f0ff9dd3c98d609c1a2a61d4531a187d542e567f3b6304162ecf3efcb4b6b51d6fa63441ce6d96";
+  sha512.doc = "f32580f23a3beb4b4b182982eca8f7080a2767cf7b4d8a6e0cbfe8989f01174a70a1395e218cd2c7fa9f30aa82391a84010f656d2e3683a8e55ef49b0ca35a54";
   hasRunfiles = true;
   version = "0.1";
 };
 "luasseq" = {
   stripPrefix = 0;
-  sha512.run = "d7a95218800925dadfdefaacdf7737bdd8a5d6c3b03642cce32e60e513e5dbf5420e3ac3e06fb6306679464237e75e8228ff0c2903e1705ec2a5f7e4bba50dde";
-  sha512.doc = "b22b5cdb280a7aee4387eaf1f41c5086502ed69a6c5562adf8d5b6b89d64870c1c51c5985c51ce8c10fc7c7b66031365847a7cbb8dffc223bfbdbd4e15331c0d";
-  sha512.source = "fe64cb9d5c418c5df71a3e2f4529a0b070d8e3176894e0e428a8f021b71c12affdf6077d98f84042526c6a1d5b18783741fa77ef5e58066b76c4ead2ff9f75a6";
+  sha512.run = "84ba5270c97196ba72a9686d3d9279f4beb87c8949f0bc450f55d2fea878655823236c8799f4e1a4a7525079a332b1d6ee76e580134fadc3b04e6d7ef5b4d38b";
+  sha512.doc = "ec45faa8ad8886aac9e694a46a6f3b0c6cc48c3373a5d6e5bf1191c4787842aa62f007a0c356ac216a376edce0801b133f861f1e47a56d5e7895317e6359a642";
+  sha512.source = "42c3aea7f27478fdd75135f549e00e29a0894125cb8473030eab381cdc16ef61f5d20c8bd00c5ffc72a9d19b568e36f57249a198b0b47808d1f30ce3301b8a1f";
   hasRunfiles = true;
 };
 "luatex" = {
@@ -16724,758 +17171,780 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
-  sha512.run = "1dbf06562fc322726d9e1a71dd8e57e204980e5e5463ed68858092eb8225a53e0c603496d4ae3df9983958ba0b6db0cb2bc2bd49e3e5afaf30c7fe36456a8951";
-  sha512.doc = "b42bd67ca23bb305f5d87e1854f5e6b9bd11e5e1e3d5e31c5400301b5f83cbb3a22f73d375d86320c461488820fa77afccc02bd03816df155307e96691db20e2";
+  sha512.run = "a9adc65694661ca9f012c7012f36c04616676465c89d40bbf779617b933bfb1672e4183f956109a352dbefef6730340d19e0c782ce2220febbda9fe86c724e2b";
+  sha512.doc = "3ed90c0ea5e11b5afb5bf7062084512a90e436c83f5583bc0a04c55fc2d3d9a3abe3d685706e82698a27a95131ee0adc0e3da7778e5a533cff62dac8e4bce500";
   hasRunfiles = true;
 };
 "luatex85" = {
   stripPrefix = 0;
-  sha512.run = "75557d4948919dd37bf3665058f74ae7b7f1dfad1c4f28b1f1d4bcf52065e772b5c84e9529e83d3a6e1fd3fb28d0037a0ed4393176efa010ae738d0516be97e4";
-  sha512.doc = "aa67297946e44435bb9d348055d70e664c3f93c26c3993a42b7fcebb9d0d2f0a9b155301bbbbf29db76ef552daf1b967fba2e1b8f1a238f6b8ce572d9c44ce33";
-  sha512.source = "ba95639f16fb74cadf344b4af070ca171f37081ff768d1fa41e7f47cc7c4b25cb27d18814f9007e54e7056dffdfdfcee323794e1e82a2a7278045297d08936cc";
+  sha512.run = "5366f13010df9a7ea224d825252a126a9dd560af373f9359dbc87d3398c50ed040852e43c5953bfc767f4a49accaaa8333a42b8a3d661e7df69e3a9fc2f13e79";
+  sha512.doc = "6353689e7f50779d2969082d11ed33649ec8ae2d75dce18b7016b40df33bee21e0a261eaa25c719d06f5ccab2f1b3fab97b924b2cd939a7dd79568db2ea0c331";
+  sha512.source = "6de2565880374c7b7a3534652c5203e0b61e6a8b1ae865f9e2dc636f31864f069f5d9bf280ddb36064834b5ccb6cbabcf6fa7511206d6d50f197a7af09ad9bdb";
   hasRunfiles = true;
   version = "1.4";
 };
 "luatexbase" = {
   stripPrefix = 0;
-  sha512.run = "3817a6e3e13c88a6cc14ffa53f94a63aad05571b1059109e83e0852e17f3e866efbcf77aa425ad2f361c3644924d74bcd93fa665b8e48447d3dbe49f2292f9f4";
-  sha512.doc = "0dad18936f8fff4b6b91ed0e9ccbd7149e1fa2cf286d01b198368b638379d5378213f0a8a7e340c8b7fe2db9960e5b3a86647e8a4a9b39365be5e9804bb0603a";
-  sha512.source = "dc2a3bddb0247c5c7003c769bde782a7d7611b9fc41aaa664ea6fadba959c8455a8f26ec76d2a5ee08541112c00f3f29bc43885987ce809bb48bc3a81c60b09f";
+  sha512.run = "e0de4aac88b8558ce85f27cd4a659b0373f0e122a5ced943c83140f722b6415437ec39a9a809402d31802340de7dd22669cf03236b8ef18ff343adbdc615ef95";
+  sha512.doc = "cb2d91f48716999a3facef7b3cb162b50ba217b640f2954783acdd6ebe3f739c6f776353b4e4440f0a4f84efc9b457e0d35190be421733cfdbbf0cad2835eafb";
+  sha512.source = "deb8fbe9b572898613d77d581a9cd0a2e6c88480dd55169ec8a04995b06c81f90f2bae8811b4fd05c484bf9009a831044b0c460a9a40223be9cb6fef3939f19a";
   hasRunfiles = true;
   version = "1.3";
 };
 "luatexja" = {
   stripPrefix = 0;
-  sha512.run = "2e1b6c22e0eec56ac0f4f7ddc7a02dfc093f3b534d892e7778b3cfd95737933e33b24be56ef249316c5155fd90c5fc555bcb9d7bb381b16f3b43c12598930d02";
-  sha512.doc = "214f1d0586c7a47eb83b8ed0569f8cd34760de66231a64fc074dda24ec80bc5127cc0284214f2cff8524c6bcfcf147f2fd12ab178563c237d65c28fc170cd3c4";
-  sha512.source = "7eef2107ca93489e850400ebf1e649e8cc7e6878527cd2ef3c482b0493629612f3187c53cff5783387a2c6a779a70cd68e889d0dc10cdbab839b396b7bd60ab7";
+  sha512.run = "0e07db884a1d136a79aa5f49876ee18ad2d4618ef73cd76f0cd7847b4cd4f6dd714118962d2b732cc5dc193ba489e549854015e8265de99bfc92892959252cd4";
+  sha512.doc = "e9e911870e508950d6230b8988003f5345009e3f556fbb1de25b4297c984003dd80f809212a0c639b890625397e76affcf4544fe4d98e482734811fc1f0bd317";
+  sha512.source = "3ceb4bae3b7caaa3c23a6bb913493efafaa154cfcd1bd8bbc6be4d8687efc13db7bdecd1ebb222da4ba94f8a7c09a060ded888b816e9c257ae4421cd4a97f404";
   hasRunfiles = true;
-  version = "20180121.0";
+  version = "20180825.0";
 };
 "luatexko" = {
   stripPrefix = 0;
-  sha512.run = "cf530bd289773e11af7c02b26c4f618ea3a80cdf91c3b607d4ac0f753c84a9bbe63afae9b9dcde47732eb89ce9eab4d3a764aa3e600f875ed6d498af09478dda";
-  sha512.doc = "8fad54ea14da51a0c7dcc0a3e7bc62044ca7cb9592d8cacf57e8850922e91cc441324a6c53a15748fdaf74b2b04b937d3457300beadfc7430500e35c537e80f7";
+  sha512.run = "4e6b426f7e61a09ce7b9298ce907853c5d61aec9ffeaf723b5eb405c2efd2ff9cf8b4b3a88f2068d88589fc5d6bd034716ba53834e615f101f0edae3b7a883dc";
+  sha512.doc = "ecfffb78ac636842783de2a5aff156efac52ea8198cecc713e2fc2ee459a1c14fda37b07346a032299603bc4f8aae8de4b33f25f26db0e85719fc4c96cb838e4";
   hasRunfiles = true;
-  version = "1.18";
+  version = "1.21";
 };
 "luatextra" = {
   stripPrefix = 0;
-  sha512.run = "77d108ecdf2c7d838b2973435742c5a61a1374b3d04e22c1d4961cfd1ecc6ed8c4be1fbbbe5fa92ae3272055d31d0b34a2a1152d59ab8eb6dc45fde183a3d133";
-  sha512.doc = "bb58cdac4be4eba73286f5b48143226d9af62eaae1c6b2b9b51cec22b84f65ca77e49c5cadea4704d0b72866e554d15a01498ae73ec1088364bab8a78332609b";
-  sha512.source = "0965a2c20ad9e030a37b9550b13852928210cdaa68bd23822d64ae0f4e1c0261b3c02f017d6b6de6fae852385f435953c245e108e55c56977acce96703ec687d";
+  sha512.run = "1eff6622beac9c02553dc50a8f408b1e9f345418bacd644f5ea3015285de817303550b4dfa63e302360de307ce23adff029cbd5e52b69fdecdf08b4ceffa81f7";
+  sha512.doc = "62e14aa6b6f907314573169c673b81f7ea9ccf3c6db8f3de42bdce181205625dffcec4794b3f4ccb0e28832148f9e63032d67577ab156a44fb6fceab346ac0e4";
+  sha512.source = "26e291db8699108bb8b44dfc7bafe82f36af4cbc9ce3e9ab5d6723bb5cde7dc0eb8abdabb2a442dc065c8e6620818247b67d37a54e1a0d85958ccd1d58262e62";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "luatodonotes" = {
   stripPrefix = 0;
-  sha512.run = "f254d355040471924c0e2786e445b6360d88c5ec29386696b5ac79bd0b8b46e6db94225b888e7e3461b7b852b1c30e8831197d241f6cc444299cd8785c041d09";
-  sha512.doc = "f89d84dd9d53d6bc43f00cb4fc67326c42f88cb3cc6b9e8b1e9bb1453ec1c5dde4da13e00c334540733f10f0ec5956aa44460fbd29b2460edd0ed8a429684d4c";
-  sha512.source = "1f9e4d1fbf1a40cd2b77e4d492587e182d89dea424c7ec5be75ebd7e763405d455202472ab8862c996ee5b04eed63beee6d97d164cfd49c2074d956a8005804f";
+  sha512.run = "a4c766c5ed8e4e04d50cac3f462620f8963fd94da2ddeac691f79f5e38ae1c6d50dbe39e661bb9f44bc676a76cd0cd6d2dde25405616b078912142b2f6add3a4";
+  sha512.doc = "87f98a59a3864d91ba45afe9d987714a1acfa6d0a0989384da27e3eb02fd5d34d0ca2dded6c52e44d8da2d6a651e23ee84f4b292fb35af87fc1db7618bf22659";
+  sha512.source = "c4fb233f61ea70b108aa8b3b3e38787a6c6e1ca0a5c64a3f58f7c39403d26cb1495425b961184bb8647e43242539ad01adb9d2bc886740767cecad31437a8b0d";
   hasRunfiles = true;
   version = "0.4";
 };
-"luaxml" = {
+"luavlna" = {
   stripPrefix = 0;
-  sha512.run = "335ac4401e053757cc31fbf1dd4e452d6a9cfeef629ff0faff8134dff758be1b83c5d210ac97a8c12399d85db1f5cdfa353145533dc5d22af8a24b76b47f787a";
-  sha512.doc = "f4122e03fd325390c38b68ab4c1055323edd2ac4c3a2b3dc87f88001d0480fa6981c74283da396b698de4f9790839b3942467b264aabbfb3d21c9c997777a472";
+  sha512.run = "64b518d2d08214c8df8857d9644dace1bd14b83d49ee7adaba18f762f19f3afc249b5aa5e63cb675af14f293869aec0d81615c5016e43ef7f33e84ed9b06265d";
+  sha512.doc = "446f464fc30aa995fb7e5f85e1b8ec46b5fe43667723df707680610993143fed67320b1670bdcb0aa2dc6238b6d24b950ad87674d715482d3bb112b411526d48";
   hasRunfiles = true;
   version = "0.1b";
 };
-"lwarp" = {
-  sha512.run = "4fbe682692fcb1a237973748cb2c0b9d26ad58ffbf63d75de1c3c174f3bca1e63fe14a374320ab6dc0e1d9b297cdef3bfe6b7090bfb409e60808f19df6c02d2f";
-  sha512.doc = "0bd34144c326df9a997db479a9c5d0e9723a54e3b4341e103f625fdc1d10fa58cb108ad3f1768e94ea626c829f5d1e2b90482adabfa4c38e7fab1c95549166ac";
-  sha512.source = "1c0012cec49a3ec7c3ac3875e2a7493ba10f49071c5f65a5f67ab492c149fb79ac85597e70b4aef9a8917dc7f2f641ea04f6f32f3f64e3d979619585d8e80211";
+"luaxml" = {
+  stripPrefix = 0;
+  sha512.run = "551db4bd4ce4ced70f3c90bd251d79edeae324cbd4b2ff7a2cb0af97adff020e79323b600efb06b2b1f69dd220923e69e31d083a6090cb9d34ffa700c5596d89";
+  sha512.doc = "2195b8c63311da566b5782c466a224b9fb92d2d7ed9f1975387a5561a60382eda97a8760c8e19c997a9bf2c5d413cc3f792ac7da1587c85da893d6e020f8c5af";
   hasRunfiles = true;
-  version = "0.49";
+  version = "0.1e";
+};
+"lwarp" = {
+  sha512.run = "cf873d87ff7bec788f77d3f8a8d3d55be5e4857a71067f33a12bfa8b85c2ff74141d18c50c4acca7f8188c043809a159fbce564110fe80bb19e0619d18052d43";
+  sha512.doc = "adc8f68bbb34722a609fbb943574dff8a7703b1e013959161a10c3eed2f9ddb2295bdb37ffc56eb7de8f9142334f2692ed2c2f62340bbb4185c57ce339e99103";
+  sha512.source = "973272c21dceb556d34f5ffda4ea5c20d19190dc0092f3be77e3b6c6a4da88907ea4881d77c9d333c7c198a9a16e908186b206fd229a960f8058c35021019fcf";
+  hasRunfiles = true;
+  version = "0.58";
 };
 "lxfonts" = {
   stripPrefix = 0;
-  sha512.run = "2d2bad0a6f54f74f19852dfe1b4b443843ab475ed3e22d35f79050846a6e75d8c543f54d2c6c367ecb1ddc095bbe0bf822c471cc76d28c369f29f98f3be8bb7e";
-  sha512.doc = "690509f3999bd69a59ee45f229243c132256596fba3ba550c89b75e6c60e72e526766218930fc72ad0b8f11aaca98451008c3d852623c782b11d2013c9bce92c";
-  sha512.source = "2df9e749dc16f261f34f09600c5c46071bdef762a9b0608b7370f6aed3e423df84efa85675d87c60d3efd4a7083d648a3130e55299444916b19bf3449dc1f6cd";
+  sha512.run = "abeb6b0e1556ab0ac94f48bd19d8f12a48240edef851976a09c6335e766220c0456155bdf58eff704cc6f5aca07669c7f1b9b3e9a926f339d739c9dd3feb5e56";
+  sha512.doc = "4f58b879b603700da8c317e28ceea11646e5dcf9a2fa3ab3604e3077526d58734fb3233aa68846d2e2a3be523bc9affefb5478535a2643b39896c65d31a100af";
+  sha512.source = "8071d70c2f06ad68090853e9de0c700922e8f551819247db974038580447f813e93a1f9ac932e208d66f1720c00cb884b9e52af761fbaee2ff819c2288ff71f1";
   hasRunfiles = true;
   version = "2.0b";
 };
 "ly1" = {
   stripPrefix = 0;
-  sha512.run = "cf7802a8e70ee9d58700d94f4c90c551e39adf98b413822286a09ce6fde42c59c27e9a6b12ef982efae3463332458be23928d898a79733cce596c8c1dd2c14ba";
-  sha512.doc = "11cfb104b1aedd5afd69809d439baf6dd68a88590dd99579d0917dbf95d2ca52381f0191439a23194454180c82e593882ca22c841ab7fad7d55647041c5729ce";
+  sha512.run = "a744e7d5d5670dbc7317412684f41d57c584cf70b5b4356993bfdec8c7f5e3cc7581fe0a1432c3e8d3126c2f3d95caa8684eaf60be5e5f32f14d28febffb2fcf";
+  sha512.doc = "402f3e5c01e9ea95c5db8dce4d05c49b384e9b6f871ff4bd63cb31e7a02e75f8781d64596167d9b19086609941f50b0895d42f34f262f7f5fbfd993a947d4345";
   hasRunfiles = true;
 };
 "lyluatex" = {
   stripPrefix = 0;
-  sha512.run = "b5372dfcfa63b1a3e7b5bb76b08df29a72313d251be920e90972193d8018e8eb5db6426cebea0fe84b1ac85c9ccb16f561b3b8e354555d20196a3ee8ef879e19";
-  sha512.doc = "b8f83bfd7b639ef330c5d7b148193b5e577201d15e9df480879697ff50fc674b92d9b43e079cfd7e66d163295a50865c82b8b42a3addaa2c58f96b3c4d2126a7";
+  sha512.run = "ad51a904a5050ef92df17d9220a5e453e251cad0facff2531cd6b9b5df47b0f39a6acb2762cff75e4a27c0db14099119603c03e760713cf0de88c263a2ee5ed7";
+  sha512.doc = "0641a8dbb8678add9c21f5ae9e94c897cda0ed63ea54fa199d8d41e308e63ec2fd360606089e263f827a5926475d2cad358baef3383edd5804e5712e3c628479";
   hasRunfiles = true;
+  version = "1.0b";
 };
 "m-tx" = {
-  sha512.run = "f000e4e60feec5c066b274e190a2592f73eeb6d69c1dddfb5c75d08589115ffb7828c419cf7243987a9bfdf06ed228eb66ef9b82fa291a9cae6fd56b059b8431";
-  sha512.doc = "aa6a2fc3450f70d5e276e2d489889557fa6e1356ab836202ff2a19193f03974e5011d15c3cce8fa206a537e0c514bc0ed75d9c18452394db578b1705a2f26533";
+  sha512.run = "c767a7a0d98d1916f581c874101fbfe93332ed3fae4335a24b3cb647649ab9e09f9d458ac22d610eec329c89ed47c1d97fc0661a50bfb71e115bc6be407d4204";
+  sha512.doc = "402356d171beb953d063262c1b2b09afdacffd43c831742b05b74f390150e800c6e35aeaf87c239f3f9ca75fd65512c7b781b9d47e7f49d8b66f8e1b57ce04b3";
   hasRunfiles = true;
-  version = "0.62a";
+  version = "0.63a";
 };
 "macros2e" = {
   stripPrefix = 0;
-  sha512.run = "7d6e8fee6abeb182df8c3fda6a03df1438cfd98952bc47e92c416720caf58e5df42bff762eba0c6614aef558b7d7c129c6df453d5e9bb85f6fd8b8fd3e641d39";
-  sha512.doc = "bcf2bec5050e2242d673572830576a2a14b697dcbb68f7f60a491f633bb7f57209e125c7643c08b9a33b4b41b46a7868b3b088ad293bce699b375b5a2dd8c7b3";
+  sha512.run = "2839f7638b935e0832edc459f6bd61500b76c4969b9c7d45431f578b351d3375768a2c733066801143035d89284d7ff808f415067a92f4932bcd3128a59c8954";
+  sha512.doc = "a1c2c1d491f263456de3f312729218ef4485f61f84fa216f1ac3a0b3e5e9a90dd4e728c1b031a27d90364beff4f9acf6a37e55f5ef04fd746804ac4a7f9b1304";
   hasRunfiles = true;
   version = "0.4a";
 };
 "macroswap" = {
   stripPrefix = 0;
-  sha512.run = "a74a53a0b0e70187295a9ca8ab00dc40bd25954f1ed75f23a758cda4757fb3c84f9e3cd437fa12737735a4e9c3500ccc60802f6b9312caf0f58aaeccaae5d3db";
-  sha512.doc = "354604fc3c92e8099f80eab05894efe5494c2e9c95f8c371d91d51cfc09bce50c5dbbe7cb9df6cc2db078d7d261293fce2ea12fec0a59c1f09156dbebece02a4";
-  sha512.source = "3027617370964442465e45e84c618f3e3aa89ece99fd396405e96911d0c09e8f2d5fbce7d763f4dcff23a11ed56cd6b2c9c165cede657adeb86ec4f5f4ce76be";
+  sha512.run = "39059c91b813b434cb13386cb40eb67cb045178008bb2460405f12eff6229ca7c9937605ea2ace4b4dd405b48254319ae3f072a28d277ce112d80aca3a392027";
+  sha512.doc = "47cf23120b9a25a8cee5f4a89ce3e3e2cea07a3db390fedd51ee0288e50b55224b6e664908eac84dc50f2157c5b51f7694dd7f1345fa9392c324fd89c9e9326f";
+  sha512.source = "799545bbf299a75c9f66e00525ce96a9177cf9fe916f95082dfa516925de635894ba33e00ebf3e239be46e91573b066b41370884bb3608ca460099f2657ee22d";
   hasRunfiles = true;
   version = "1.1";
 };
 "mafr" = {
   stripPrefix = 0;
-  sha512.run = "074ebc59529ac780bf7625704a3e621a48673e7781f4d641befff4fd28edfa97a09b8777cc8d3ea0d607c3859d1dc685140f66b8849ad17831263ea1c1cb95f8";
-  sha512.doc = "248667e5a9686ac54c3f8454c38a2037c31419177be024c5cb5de3285e8f5712262b326459879d50d28a94911e965d948326ad73e122e7bbaf5a5b50eefcbd90";
+  sha512.run = "cd38708b8ac98fa1d95d77c7b107a213d07cd778212c9e9ea5cf0b3d758d6079b69637ef2ed4fcc0c5da58b3a75d76fe6c68ae874a07b17aad9f8414b2bf9ab1";
+  sha512.doc = "168a80bfaaee9ff30c8bd3511a862d0e0cc0b12d873a7b412cadc375c04580f39781e48c138df062e5d66a0953ae81e9e78ecc5ae493f6a8543e4a72d57e277e";
   hasRunfiles = true;
   version = "1.0";
 };
 "magaz" = {
   stripPrefix = 0;
-  sha512.run = "c6cff676128dd1e6b144f0fc1cbb720ebf7613de0921215e7ade5edcee55ae25b1f9beddba3be1606a0d6d25aebce1b4ec4edab9b2ebf22c5c25e99370e5f26f";
-  sha512.doc = "628890dfde89627016b0505d6e570f0e62192c6928aee1052ba8398b9a32ee6b89766c0efc25712d19e8b26629a6b00fc812fb3b342abd54a1eb43236461e125";
+  sha512.run = "02837fa79e1ac2edfc20dd0cfd4d215d0f38b9dcc4d3a234d3fbf67d418614b696e1a08e547cbd901efe949711d61fb01cb22b5253945d9dd7c5d3b050ddfeee";
+  sha512.doc = "cff62121a4918f8ced43f519dc301b6a5c521763ede7f616d8eb6bf09a603b411e4f3783086e6810fd9feb92cc438974bb28b0f5bc673bc79ea685eca0776e3d";
   hasRunfiles = true;
   version = "0.4";
 };
 "mailing" = {
   stripPrefix = 0;
-  sha512.run = "b5843c6f8209dd177f4a4ca710b36a843f2c3a949bea7e585b89c23a9994e313115f592dcbca6ce0faba448da88e04877288682d10b3633402236bd75d0edbaf";
-  sha512.doc = "e9bb4b66b3ee56d8fd9954710a586199b1b980fa062735d08714ad0fadfa5e9cfff520460c61751dc968622b8f8eb07a0009e048e8ffbbe995ac0460a7f767f0";
-  sha512.source = "eb6359b65e9aadfb93c687ca01f13c831cbb08faf6e56b25588ad242a1c499419c2068323e8c4cf1fc1e1bd209787228d1b8b46705ac4736bbf9d4f2ff4b7179";
+  sha512.run = "1a3f6e06eaecaff632a3111fa3baa0eb5cfa6083904b67f9249be9b8a139ff6f5656c4e5dc996c69df651d7b8866ca5e5937eda8eea7177b12dfc67ed6a80b9a";
+  sha512.doc = "d92f6627ad7288a711e69e56162e12952b16fcc9d8184d2cb7118114eab6002b2db8454a464b3e1b4a59f8a27d53224a5091186f98c2dc699e2f7be8f804af72";
+  sha512.source = "47cfa6d0280cad84b5afc86091924b52d431853ab6e67febb18c9ebc4d6d5ff87c41df015170bfe26acb27a40989627b02b24ad8166c38da21e347c353a555c7";
   hasRunfiles = true;
 };
 "mailmerge" = {
   stripPrefix = 0;
-  sha512.run = "217f64cea4323470f265795c51f908f209586e6c8fc5dd752c8892c41427283e22a263681f308141bf04479e249e169d3ba576dc5c72ae718b006abf3b06f5c7";
-  sha512.doc = "078415f1ac2697f70642f03496e7ea4facb78de905596381b2449bca9ee700c2867347d652be681bdd3a96d4e694aa0393ecd741e59288097ff38d39820b5e30";
-  sha512.source = "2cafe83ea6f0f940be949ffdb79f23842e5af8542f4b2dd1c685b9bf201f351db2d27169e1dbb354bcff75fe8fc47312981f09b6810d91c8b9d62c37b5326503";
+  sha512.run = "9ce0a1bcd0e0b14112b2840bdc6850069ef0c98f45e2142842516bcb075a182064f6ec4efa07ab5576ac47b03dec3cb13d1cf30558030949621909d44e36042a";
+  sha512.doc = "8b07be8de89a9046687021e5a60e4d60120d22999d3238022f4cd6521ad5792ed7a25a0c39204b43894753a2fa0c621adf3fcd4fdcdc9675c4bc858e7385e6e9";
+  sha512.source = "2fd8ba294c2b23c952a499ad33dd6a6ac76097fcfd60a5a473b29d91d0f098cea26caa9ada49dac83cdce1cf1745f7c20d79a8b59b5f387421d5d153403219c1";
   hasRunfiles = true;
   version = "1.0";
 };
 "make4ht" = {
-  sha512.run = "06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f";
-  sha512.doc = "05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9";
+  sha512.run = "e26aa87ab2d5a0cf14273ace579ffc9d09249f3c441db295aaa6c357242817b0c1e006b6d0b4fe30642376980d6713ec74f1297df11f9fd5c488f1ecce642e5e";
+  sha512.doc = "818570850ad5dffc0499879d78b146c315d8cea0ab0bffb6e62c7dc8f4ecb0dbc846b2fcb1499d0f0330d68c00b822b6c800d7ea5ddf792372a12b4ab6f14299";
   hasRunfiles = true;
-  version = "0.1c";
+  version = "0.2c";
 };
 "makebarcode" = {
   stripPrefix = 0;
-  sha512.run = "3333398f2ef9949995e9176dbfa57172e7aa85f47f83e346d6ecda52693c3b4f5c46621da61f0dfebe166f32a364e85e3eacc9f0bd367bec7f0793c72772a6cd";
-  sha512.doc = "c695d2d68b4f050346551a9c7c00cafe8fe0cdf9ae04d62de95488954a8ab797da5cd121afdc3d38edefc4b9ec5b97884f71a260f577e9be32cb0c781cfa0fd0";
+  sha512.run = "cd03fb999898e2c34f68c177151573fe3cd84af4a6f63d4e49eb84f7a719dc4d47ef492a74a5c9f95b7ad323efd7de4b5793d635f3fd4807dec3bc078ac318dd";
+  sha512.doc = "c8f8e2239b24714dba4b6237ab1e1936f8d05c2829c7d5a10735837f2eec3d3573b5d435bc6f54cfbb42eb3800de4b5c5a3ada2efbca951d5539ed5d7347cf68";
   hasRunfiles = true;
   version = "1.0";
 };
 "makebase" = {
   stripPrefix = 0;
-  sha512.run = "83c57f3a6703d8119852069b482e3c309440566a59c4cb121c5c780c38f3193cf236fe0989a0d2eb016771c07bceab2e3083cb774bda59d1c9fc428534fcc658";
-  sha512.doc = "ba254ebbbc2c7a1735cc8635a5e69a5031076575ca4f86012a1b5376fb5216fb860df686cc68e7839c5e70448cda32aa90a8083e2955f1ee5c1bace7a933579f";
-  sha512.source = "d3198c6619ba3ba4fd2628d830661a655582421e2daa67b1e009e31b66ab46e20aeb9910654076a7d872aed0b53da85a7a8d26007ffd1af3e179b9198c5117d4";
+  sha512.run = "8b66b365ac438f21b0293a5254bc29ada3a8b63dc0cc97e0e44e66a9346a8e75fdf38fc17c762d1432e83a10f9aefafbddaa272f1824bacaffb24bb4e18ca46c";
+  sha512.doc = "aa958571714d79a478f8ae077649eeed9b9d4e678ac3749e4ba2bbaf1366316af314bc9f4f5751714c9c7e6f843d962f35737c4134094ea65368863e3c67ef40";
+  sha512.source = "423877eced8c97c1115a0a8b2f0924111dcb01de3157fa7b606c92c28c5a862dea18feefc049e8d49243d05a7817478263f23122dc66fe2c0ec07d975eb82f8f";
   hasRunfiles = true;
   version = "0.2";
 };
 "makebox" = {
   stripPrefix = 0;
-  sha512.run = "65cd377d5303f8797ae149b435257950a984c32092750eb013ad0a86a7f8b56bcf2c1962376071ccfd9687b8c958bea26bbcfb0d8cbf4a94e8555d98d4d580db";
-  sha512.doc = "99d4182bee235d020d19ccc80f94b294103cf63c8ec35c199d11c2f710f65ae632c03d96258f70cd8200e94d0b4190c78c4a433a90c3a8597f3252cb45d525db";
-  sha512.source = "843f33fac1c6a2f5bdf37d0fcb4a7b1a5be107b1c69a259f8b3cb5181daaf80452602cf4d84f755a0a360b3ea53af08126de5b5251bc48128cdf088552378e67";
+  sha512.run = "e5f36d8eec92d974aff44689361bcd61ffddc9b3de97f79de457049eac9f20557a81ae76773ccd747ddd1e5273008a53f7f4f315dde377409cfefd7db921d085";
+  sha512.doc = "675d283b75016bf8ccf3a341e468ea2c97d07fddd2aefc228363e7785641015ed7546388d6ba1f9f76fe45391c9b0634e7f6c1583bde7169dece5485a7dcbb53";
+  sha512.source = "21aefe5e849c5801e1ec3713bf1c568555e910bc22d7bcca4a7ef4ced82a3258c7568cb22b20c087816e17fe33ca896d3fe0bdc339e933822dd0b247a80a370a";
   hasRunfiles = true;
   version = "0.1";
 };
 "makecell" = {
   stripPrefix = 0;
-  sha512.run = "33ace2ccee3c20da99c02f38ce4006888c518f54bfa40ab8ca224d598775a3605928550cb62bea7eb29ddf9c89da8ea540919c80ea3f348d276092f8a39f380f";
-  sha512.doc = "e9abcf651a41802400442c1daad57deeea62ffd196148584b25030825138efaa52b898dc99c3c17c42068d5a2b8a61227bc3c08560e3589ac8971df8fa95ae30";
-  sha512.source = "a3b46beba6a4e4b994c33276d3d683523b94b563b506d44aefcbced6a2ac0b96ced462083c680fa6192cb83af1b7a596977748127b807f93a38ff94e8e6c0fa0";
+  sha512.run = "c1859d1f0f93a52632e7c8fddeded1f9cf71684bd4aa6d3c2469a1e42ace260a4b35aa6a382d9ba8c22aced107d7ff21f566f1929f0643a96e7c6bddb35df5d7";
+  sha512.doc = "68bab63d7ae25b48f8a1405b975d183b1569390ee2b764e73e133464e02a0b482cc65a747b1a648043fe02d94e26568d5c86789c6dd3d91d2a954bb9abc0ac0c";
+  sha512.source = "66590735e5c96e54a2a984a5473c8afd088b6c52ab405b622797a780332e3c5b78ccebde73f0828656882219e8a5694ec80796e5f962e42858231af6d0918972";
   hasRunfiles = true;
   version = "0.1e";
 };
 "makecirc" = {
   stripPrefix = 0;
-  sha512.run = "98011cd64a322d9b9271add9c6d67a05a993b2c48ab9ccb0b9645095a8d2b15729219d916e700896c495aa4075a4b475762add6847c85406d31e9c8d9eeb5224";
-  sha512.doc = "8263aeb64cf5a266932cb3cc955a71b88c8a268d0c831430cab0991bf403f0c09f545c9d69bfc73144f6d23bac7083d7861ed13fa7c57b69ff9ce822e73f8c73";
+  sha512.run = "1be011dd44cc281763a4243ac8770cb24d5a8dcfe3b7a4c5a1a21678140ac279e0afd8a7448b5c9a4466f1c03d9fbad1a4e7a722e8ca553b30f95c291cb67b89";
+  sha512.doc = "e0ee3b6a430492a23ab857c77af8f96dc969af562d62590f7b34014ee2632e657d4a1cb26152e019d3d31cf35df3aa0c906cddee284e88bf4ade10b0097c4af8";
   hasRunfiles = true;
 };
 "makecmds" = {
   stripPrefix = 0;
-  sha512.run = "ebb1caeec15639475ae47bd4f10ba2f084dd4695233ef7a8eb8e7a13bc8cda38e267fdae1ac61c7ebc7b21e1ba18e67fad3a22cdc82955494fc686e8401b90c0";
-  sha512.doc = "20a906f8a4e0b7756105ac356250eb258fe5658b6bda420385574e3afc6afb740bafe403d613ee6f94e6e5647c1d9004692a5e21b6955382cf94f5a10e23ec4f";
-  sha512.source = "a1da6ecdad892e8977519e45111c901f900d85a76e6441662909d75746566db1cb9e6b3df828cc2383dc5df0f9444395f36528aecfd0f93d9c515ce1c3db5516";
+  sha512.run = "7a742680ba9b4f3fa0e079b32781610e93765e631ec7f92e2e495e8d35c20fe8375533164aeff411587eb915a703150d4a5d6bc767348e49ad9129dd70b9a599";
+  sha512.doc = "0e5aa35987bc7be7f4cd54d14be5dc960e5d0d5a0a5be103e7fcd0712749020955b6c9e178e5673abff01cc26f7f87fc426e921e87cfccb5beb1c62a447f7f3b";
+  sha512.source = "ed945ae385baa825f773d690099c9f7ad9c66bfb046267a0587e8992b545c4c5eb97b6816731bfc8db578ee4d9570862ca089d67546fd044a93c96404d49f0dd";
   hasRunfiles = true;
 };
 "makedtx" = {
-  sha512.run = "574b5be32d2b17fbebfb650c319a769235ebd22334163c4eb198c0ff089735496852bc9a429df810ef3b8a04df6fe2209eaf163c5a4baa7191108d4ea632511c";
-  sha512.doc = "87d0f1935e05132dcd484ff9c84e1c46baf1d2e4cf5829d7806cf964cf77518ffa3ac477aaf06f196ec9f22baa9726aeb3219cefb32b97d81558bfc2e926d850";
-  sha512.source = "f3d009f8cc10fdc526a585398c454a071f0eaa55a81880f94383ec80bf5d02e2c93e9c1d9f4a421cc5a51390665861131d3bbdf4b4034b77fc2be5ef46be5b0f";
+  sha512.run = "dd5e0a4545bc603998beef532f3accaed479fc06fc92a73de183d6803a9b4b7b54dea901964124607a4ba14559fc41e0a7b218c7b1796194d004334fa4d32544";
+  sha512.doc = "279a128c92a8342c5b3f1091f6ec927fb1df8e977db847df9c390218f617df3b99aa0b91e3bf3749ee4d95c1fed6025dcfb4a1e6bac6b950cb337725732e77a3";
+  sha512.source = "b1e5292d447a049f43e6a0cfa748adc369d5ec9a407c650848806865be46491425a36f201ba89f62d2e5fd0bb6efd1f6ce7251f3dd1c06f8ac8e6e46e4933997";
   hasRunfiles = true;
   version = "1.2";
 };
 "makeglos" = {
   stripPrefix = 0;
-  sha512.run = "d4507046be1d367255b44054ba315f7cf3f56cf213526af22cbc8c56b27525071d6413bace85b4f460cfc90bafe651d7979ad7dcc9b1d16ae6cf6520b493b1e9";
-  sha512.doc = "aa139aa8aba717915050ad5face11d900543a91d25d22c9f78d8573f3d1b072ac29084f71541335f2cbadeb76561bbe9d07d6b3c14b187dea6302278a32bf66f";
+  sha512.run = "03ee1fc998e0a06669aae05636edb45c972bdbddc96c2ddb36d7361bed2d562e79ef42cb7b3bb98bf96e0b5b88a176be936248c9d48afe3692679cf3d652496f";
+  sha512.doc = "2bcaeee0f98dcd49a58230eea62490428efd05b9a65aae19deffd3adcde2ba59c7f64feb6f34ae6b9f783dfdee39e1234704294768d14ab6d67834f373ff65e6";
   hasRunfiles = true;
 };
 "makeindex" = {
-  sha512.run = "964d084febbbac407c614fc9d23c9077f9800f555324fa8349b865210d4d3ae12c98805caac91e2400027ee29c05d3672c9212e7689e1c4169d490f192be59b6";
-  sha512.doc = "944c04d20a0c37b9a7fb9a7b7e75294f34bfbbc5efec78e9dc893f40a2b0e283f7134bb5a9e370f9fa7252dc3840f0e1cec9c7b1f34e54733a413fda9f6f6349";
+  sha512.run = "2c0afe8d9e5d03187ae8ee6b0b023f727577b84d369d31dd5e1a1980a059f75866b752aae8c5067ca968c2c6c6b5a6fb9f11010c8c8ba9f2aac9191a6647c5d7";
+  sha512.doc = "7feb700df902f8c5d66eb491121218fdb9eb04077a7c208706af3281a81c53ace56cac1080627ff10db939a66a7077dbd637b61642ba5e7256adbbb5b0ea2826";
   hasRunfiles = true;
 };
 "makeplot" = {
   stripPrefix = 0;
-  sha512.run = "5d592b00108588ff72070e03fc4225221db126cac941402a6428e97ef5e2fd58df5e4c5c15955bdbc2161944cc0f6917122af62ec75d85960b84c60722bb6a2a";
-  sha512.doc = "18a8603da0ea13c9cc2cf395037fe34ba7b5562c163824b3c0e83114681658bafa5df7e8e7022765dae09634ec8763e773af7932dc6d8617eb4f259ec933761a";
-  sha512.source = "450ed10be9a0c7fe83ffe9ca8d0900b77f743b77ac07bc07b5b7a3fcd22263df67d908c165071b7e18e7a12d7b7027cb3874f1d0aee5439e77fa28e67d31ef97";
+  sha512.run = "c8fdbc19ccf1f7f87db631519c07085d680ac52d71ef96a1eae8a5cf5251d346bcac1c5c229066e45f6b4f8750b6d3debf5b5452b34f0a93f62175c6c6001e57";
+  sha512.doc = "a74e513029f0d00cbbfa71f8db3df5201a9adf4a87362b00c191c71bbbc6edd04ade1681ed42d3705c77adb5694d2fed1a1104cd2506ae5ea5595e1b5472169c";
+  sha512.source = "3b385e376b6148119ce2131effb4cb845faa45f4ea4a68a6456e6efda566e3ef2727a634381b34455d9d121a9e7089746746891ed95f6c6cf45d2f22007fd6fd";
   hasRunfiles = true;
   version = "1.0.6";
 };
 "maker" = {
   stripPrefix = 0;
-  sha512.run = "b8444585661a00ce7adfa6ab14a6470ce1ee3e92b5268607c23d4332a9115e4ce3b6f77a743787857c48cbe7663000818b8b02194b52c90579f954325ba3953a";
-  sha512.doc = "7a98e0ea48a4e8c6183e7c17a3465d3baec0099b4f9239c8d424fbd26cda3a9c8daad43331fb2d1961d73e714195221d172c6a115f503467ec7029da89c3c80a";
+  sha512.run = "6050c2179ab041e05f5c14f24a9814cb74ab41327d844ba455465c8463d0134361dc21723d9abc40935ecfa47c12110897f726b4735ae5f475de3254bc280e35";
+  sha512.doc = "9d2de06644c8da3e8d71948e11f18a618352d1684726895ca51eb982f0f85f462dadeb5f22248beb84934e7517ff950caa634e3f4144ce8ba16044104c5d75b8";
   hasRunfiles = true;
   version = "1.0";
 };
 "makeshape" = {
   stripPrefix = 0;
-  sha512.run = "6fe13a2913e44e5857cec0f0064e403149d2c1bc5c8916b019bf68ecd4711a49b7904667277f52631196f07680c1393fd01e55b43408ff1db182566cb3c6696a";
-  sha512.doc = "2187157a3eefaef33ede33203de0bb392e10349ad6940fb32041e14290eacda41717726c5c9749e289678474bde4b7e1d7098fb2e218268d8f38b77698afbb2d";
-  sha512.source = "f053371485e702540e6550bd9c36c649be376a608fe7411fb6fdcf4ff6282fba2e81e8845159ff87aa6b8aebbe0af4c793f1156022004a247b4da593935d8998";
+  sha512.run = "3c5611f80c0af1d782c010f0d0d53e27e4fdfb2a95816153c0866623b4b76dad28cdd5c72bc1a73e4b036e24daad95790039042b11269b04bc297f7ae5b995af";
+  sha512.doc = "db60a0e947317139d67974084603db04ce3bc56b048cf93f0ee7ae83bb23b7b09f03323adcad6b5e7ad80707f61f8a90736c39d6356add6c230ace39a5fd7abb";
+  sha512.source = "e540ee1c963f59211617a18e378dd6165d0d22e99d7017bd52008f400261d14f728eedebb666d5dac0e63275fe79de6a27099417a2ac3f3ff61351311d9b1c2f";
   hasRunfiles = true;
   version = "2.1";
 };
 "mandi" = {
   stripPrefix = 0;
-  sha512.run = "7a968310cb5aa1e47c8015daf6e86698e76ef0f3c67f5fd1e28131d29881a538fbc221ef5231a738148a41a863ed95b263edb7ee709df454d26a31bea6cf0c18";
-  sha512.doc = "ff01c45687a20d069c8ade525bb9af7b1f1a7edbfae0a4b4ebb52b2b34c332c98cac2dfd4b2a0b1d30b4d86e32dc0709a176255ac6dfa6d92c52c61ed233bc29";
-  sha512.source = "fd7bc7de5bf0c10c561f6b943000920aad49ac30928277be1bc3185676620b1abb936a17043fd14174ae16fb4e69b32c6b16da2653854d61a371faa214ad2655";
+  sha512.run = "2844ac77d5b0c440c6e27cc13225d3936a12df0dd48d24db43391e0aedc2555d9ea6d6eb1dc1eef22951d297287cb423e8f7daece4539d1094063b3ace03e843";
+  sha512.doc = "d84cdda92fa1695f72ace4cb9a751bb5ba8a1f54ce9b272a89f5a45793e3dd202e0b10df7d0be1eb6d0d46ddc79e1a8bd643d2394f3b8232ae59055fda2fc9fa";
+  sha512.source = "0648cfdb0409b0136101762996277a249e64418bcf322e8e013cfbdd3c0f772c58eb8239e4ab44369c6bf6217b9b37c652bc827cc973675bbbdb3f6d7c41f873";
   hasRunfiles = true;
-  version = "2.7.1";
+  version = "2.7.2";
 };
 "manfnt" = {
   stripPrefix = 0;
-  sha512.run = "3791dc2e65fe6c4b24b9541f5ed6ac5c5abacdde6db0edb809220928c7a934adaf08f50507cc34fa45d60ffd7daa957cf8531772a7f7cbae522c1ec9bbb6518e";
-  sha512.source = "4839ea3c9db03f906316541ddedb54de67bfad11d343ecae5b1987a57f213e89c61185d283c3a52bed24d3d3613f9d83499050794798190eec2f788caa844e5c";
+  sha512.run = "49a8d481de2a4522ad6ef7b6d876a113f620223da72f52bef37ef30bbada2cdfe0c440324ffbd024cb78540a4f75f8b1b50de7e5a715c314c3256a864e2ae9a6";
+  sha512.source = "7f03244e1d6f17a4414d2291762de433e1b424ecac0f197c48215bd778b343cfa507b3807fcc02b84b330cef423f3a27599acb82b87863182dd0653ec3878f7e";
   hasRunfiles = true;
 };
 "manfnt-font" = {
   stripPrefix = 0;
-  sha512.run = "2ddef2ef0ad6c3402c5258d0ae9e0120e47ff7d154d315049936c6dd3b06fc2558aa862d9cb390a5a2e8577d7db6c516a4288d22cb4d34d81ee335b46378cbfb";
+  sha512.run = "4351ea888c31fb5f2164815cdd9c1900cf73afad6a9260a5395e61a67cc5d0b489bc0385b443c5e6526029bac6bb971a466668cf5bbf01b326e69f5cddc6ce1f";
   hasRunfiles = true;
 };
 "manuscript" = {
   stripPrefix = 0;
-  sha512.run = "b0474657488d80bc595a8fd986e23755871d792e1eed4daf55f4b88432b22f69a3d33dd083c57a1fbef0e62588b15317c28215a2ec880d7f2bea89f626fdb8cf";
-  sha512.doc = "306301bde4247b69b2f2a12e68dc4568e09327eabe3d184040aea3fac11f09b7ce7402ff0fb48124a66dfde7ccf5b895c9b58763d2573cb30cb89daa4c13c870";
-  sha512.source = "6898d348e6a7fb45fe358d42a8f1716471e69b77c768565a839541e5705a7996e331623a0ab9dc47dcc6f74d01d3dadd292a2dbcc31539a6ea60afcdcbb6d47f";
+  sha512.run = "6838f47dbd0e8d3b17fdea938ab47e0a4d2e1660c52750ab80071947cdf64c016db4646621791fc73344ba357452f6de74d80111794fbeec4989d9429120014b";
+  sha512.doc = "97637dd380978648da6913990a3cbd0a1f3b791e114b0ae18ac20e4779adbd3a347d02ad3f64560472ffec51864848c76fbf00d45af1af8a84356eaaed227430";
+  sha512.source = "3a706157ee20f3be6a33df93a0caee2573b6ec1196e2278f2fe4b009f987efc44dfe43fd83893d2940dbbadec1e8b0ce6944ec48ccb260d04312dfbdcd84343d";
   hasRunfiles = true;
   version = "1.7";
 };
+"manyind" = {
+  stripPrefix = 0;
+  sha512.run = "68fe7116792790c086110dc20009fea8c97aca84f0f0e6ecc96847d6c01d11cccc50c6232802ff74b6cbdd0c3a3b1faac41e65b35f34cfc89e0d5697c3fb2da6";
+  sha512.doc = "c0833d7870607dbcaee3932e4ed68691b96ca440c1956d45b3667d61ba3ab92030a84ed4839423fe0f02069871a18800d0e3a3c1fd471d9eb1e2a7247932d3aa";
+  hasRunfiles = true;
+};
 "margbib" = {
   stripPrefix = 0;
-  sha512.run = "53ae60d5dcd813b40ea87941627425b9f966ae575ad51b41cbbe720cc5b2461a210d577433e633ef861db74ae8d314cae9016cc2fe2638d29310eb3cf1bee1a3";
-  sha512.doc = "fde1ec63a77d6ac7d30762683097217e4c623281630b4c9819f5b19970c5541a6f2ea64d2113fc9890e9403a0f95d1860a03b49b90660b4a1e2419be3b3bc3ee";
-  sha512.source = "b93e0b774f37e969797b16a3222c6aea7f8af12bada5693c1f7c97b31b1a5d6c855b4a4c20e2685e816879caac3ee4bcf58cd55af0a03dc7d49b08179d8e86d0";
+  sha512.run = "da375b010abe4dcce77234ae0bb046ad1adc98bb5b12591cff61d91da45e97645aa553a0068103bd90024b76ffc0c637861a102b080681c390532854cf6edb17";
+  sha512.doc = "72099ac09b34593127c65d29ba27f1018503211e72241aa975c7fcbf9660e22ab09346a8a93164f28f331896f54a743353874606c983c73abae60f0f0ef9b16f";
+  sha512.source = "e0c9427ec0472e868d2901828e81561becdd35263e47685fa64e372c2a1ed2c1947a5dde55856bba72eaf0e6b436b8de9edbba0bcde439b071733f4f5f329582";
   hasRunfiles = true;
   version = "1.0c";
 };
 "marginfit" = {
   stripPrefix = 0;
-  sha512.run = "ad5121e6bf98223986c5af11e5f50260186c81ec0b526a3b6b95d107468465a2df2cf7fb5e0094ba87b0b63be5e8865720f7157ab029dc14f9c274a7eb268a46";
-  sha512.doc = "414bf7f3385a363d99e7820bc29dc85c4b4e1e61d4612452fbca6eae44be91c4b543d580dfcd198becbf35f682a1b5ad59cb290c3d81920d50a16b78437cdb41";
-  sha512.source = "c68ae541278302b6c88fb490a2951c831cd3287b8eb296df362a26305908ad9b35d2e525483431e17ae6dbc4ebc3036882180be663925cad4b1a2bd9d0ec809f";
+  sha512.run = "a4f9a5830c02b9fa06523d16718dec7b029cb0dd8556a161cc8f38b06d4053d2c86cf0b856d8bc231ff3f4bf01fb4d6578ef245c8d9ab43d721ac4ab380d2852";
+  sha512.doc = "909fb267b5eb4239ad7cf13d59d7df929a7a6687d351a0af647d0c63ec9f80500f7c034f138c4263cecea102b1f55d9b11dbbeeb4fc9ac7c877c9b167c7a1905";
+  sha512.source = "7df7f150048c92cc63c0415615d32e53a11dbb26761f8c809558aabfa9df1dfd71f31e851c884b9b34ed82818a5b7a5527397c59d7c7d5acbefded7b998b1b88";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "marginfix" = {
   stripPrefix = 0;
-  sha512.run = "58585a1af1d6fe17b9d2c95d4d05cc5e32e035e6b8dbaf06482282660d330238a041a627d8138a5d21cc1306bcf13c655877e1337f702689a9dfedc0ee961b78";
-  sha512.doc = "7fc2d8777864f88a0c232bac6b58b6f7b29acc86a87aa826de320c734f22fe4792ee5809f97c313a47f0c8e5c35d17deadcbad98804583ec2e366ff095ee7982";
-  sha512.source = "bbe37c640d511055877d9eb7877abab82df011f900b7e0948b99a66f11cbd836ae918227448df44b2aa27d52cd0e91c8026dc4611977e947a9799d7143e4154e";
+  sha512.run = "4ed5aab04ed97f8919e29445daa7654edbcc6f74775c814e1b85926914f25e2d11b8f15cc7ca4b0f40720c753435088e03edf42bff4cd08af413ac0eeb6261bd";
+  sha512.doc = "2c327e9a43db7d58eed91fd62780aa58db60492dc7294b7536de5de294cc38225eab38f0815e4f5faa0ce1f7a3ef6e1e37feddb8ebe8d8c3d725c09baa2496b5";
+  sha512.source = "d2af0e1ff0bdfe5211c0cbf481e7dcba42c35b5d33255b996f79545fe46cca040c95e8e11a80682b52474b09214ab7fdccf688e730b6e44ecbf195c6db415952";
   hasRunfiles = true;
   version = "1.1";
 };
 "marginnote" = {
   stripPrefix = 0;
-  sha512.run = "b2cb945982790b92d6d77336417c97bb52b47210a661d52448bd3829d3d9f41581fc98d01b9fee2f7e3f9965f0620da6e9d8ccd1e0c138ec582c1f324f7a1853";
-  sha512.doc = "bc9c76a21f7e5880f231933959fa8fab0d45fa84f6c9ddf39f036547397c4638d80a3df814b5063e1352dc7bd34e5dbfdd3b090236256890a3e8272c755437ec";
-  sha512.source = "6fcb3ccf70453b880698668ffc520d22a672d27b5f225043d50f89a5b9f88d9f293e9bd123691dfeba1d3699e4d34e2466da1aae9c11ba8d62afdc6de1649637";
+  sha512.run = "57f84fcb7859ed9107fbe14e8f09c2923b6fce844165a67ece9058cdba4bc7750e878ab8434b667be086436dc5179056b3a88c15cbcfb3e404446e8a92230fca";
+  sha512.doc = "c4e7f12bda9f7f55e6456bcfa46ebd5cc27d8004d4a5c739a315f1fe66bb22ce61863c7f57b9ed5535c1520d19e052d0490df35c172fb01059e5070831e88779";
+  sha512.source = "86b722ade866dd80db34b46e7f812676c321a0332c551eaa3745dcfdba4522dc7253f3e990efb4f757baca5977c8a983103dacd6e0fa0edd519717e18b4b6bee";
   hasRunfiles = true;
-  version = "1.2b";
+  version = "1.4b";
 };
 "markdown" = {
   stripPrefix = 0;
-  sha512.run = "c449cb4561bab5f4091bc2cb2a6676dfa170e9e07003f03fd59e83c0adbde7141e8a1031609305b4786125eeee8e7a404a6930078c2188ac036185d63b363372";
-  sha512.doc = "0c621f400184bf80f4a7b8a8a5317f57dce22aeb354fa506bc2049f11976dbbe6aa3f227f16b66678305b943c64083119f11dabb68f00b46293ff59fbdc8ce3d";
-  sha512.source = "cc707be253131d472660d84a519761460481459ef4ab0bcef75d5351ee2d129e0a1c8f1e76ca0c5c0b7011d30be7eb0f27ffba824175aa489188b473b4a71f66";
+  sha512.run = "1ce30ddfef3438ccf9924a1ca59c13c8abfc5af022136d643671b28d3a5bc63852407f40bbe2b12fc458d8249fa675988b3486556e008405279bc56c8754cb48";
+  sha512.doc = "2168faf3139a2ce02fecda923df9a023ef8fcd6b65c8145b0e9a2cf7d3279874f0eb7cd07399a7e567e0e560a1c120fd6964def34d120bb20b13a249f78a0501";
+  sha512.source = "33bbde0a376bc7ce214cac8003ffacb21666a9ab96b60decf763dca338b4d4f130779432cdcc820bd4d084ad6d016d14a1decce5f3ccb46997f600283aa9600f";
   hasRunfiles = true;
-  version = "2.5.5";
+  version = "2.5.6";
 };
 "marvosym" = {
   stripPrefix = 0;
-  sha512.run = "1dec2c47a412b7e2b121e413f4c4264fc8d7d5f89ad810cb35a7028763b34fca8058aeab35a1e03166a0f4c50d43ea32c421db357b806d989b05aa65a168d5b2";
-  sha512.doc = "3c51c470531caddab3fdf70c6de6b237cc19513127a7113bc828c4bfa35f2d38497b32c9c6f992aa69be5a7e5ca033a2c9ee7098c47f0ea0ae2176e11442c166";
-  sha512.source = "fe830a61370fe0213e61e17f22571ee607d2b0c0b4c00b96b101915bf215d429d6a06db5a74d1cdde6679a9ec0fac569a28a51a72d28297b2500f9406bc4bc91";
+  sha512.run = "f441f0d1736234def9e75fd4039a5537f2b34907e147e0c03a57d213273e0b70b5adf5cf2a511bce0390246d1c1dcb8c8d10899e8d55dd3be14e0a5cd802063a";
+  sha512.doc = "86e7e38fe479d29908cc008cdae174df0453e83062c5974f6b7be91d351bb626e712263e6e3eae300fc581780c794084e60b3872eaa5967833a6de73e8879a50";
+  sha512.source = "e5e17b45ad2c8914c9eef3dda317afeee3a0c34d55089107dc2bdbd2cea12e46f8216a41b5d031d60b5ea160ebd42c05992792aa1d44d43d571c6aeebc231eca";
   hasRunfiles = true;
   version = "2.2a";
 };
 "matc3" = {
   stripPrefix = 0;
-  sha512.run = "9727afaa6570291444e33e9c30a71d7b53b8d5a15812bc58927858477adc8cb92a723e2dec07fdcb5cc7efc9da56c384435d5829144a25962975bf88a7f06611";
-  sha512.doc = "8be35027459404346e4098f20c6799d62a054e8bdf56e2299531c5a13c2fcec89dd9b0f8684a6bb900be8fa45ab8f11fb2f1f4cae048988344201f85da95b3f7";
-  sha512.source = "7c479eb2f6276ca2f9413138dd9a30ad7ff23352235809957b33ec4524fce92da7906283d4adcddea46ad22664dd9be2515c9b6a73f0cfd66dcad7724e40aff3";
+  sha512.run = "130475e90890456495fbe46597c85a9664268352b80a4175ca5cc9b5cf76b47620a8009c9b0ddc8515266884f1d3454d3e56bd2756fc4f25837e737690080007";
+  sha512.doc = "afbe2428ecc96f0c94cb095c9fddf062cea92637fbf5ef4403ff1bcf10f22ff95670fd2d62159aad76961a9bcd7922906379994d6a072e8d103828b6cd366726";
+  sha512.source = "d63fb503fcbd71f9b21dce4daedf3431a9475402df1633e651f9dfb8375f68e643dc740bd993ca5352536c1926d4530feb8b5d2e36a33f5456edd7fbb8619834";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "matc3mem" = {
   stripPrefix = 0;
-  sha512.run = "f84c320689ddce13d8458ab5c79fd64d02515813790f4fc89fe940846558cc0c8ac5764e4aa005e4bf6d852162025cab8528d05b7908b9110593a2e99b20859f";
-  sha512.doc = "c553598227ce58a63b176d8e6107e56dc60673601f8487ba6a1e6f70434492db5db7add42286384139c3761b3756450e5fcd8a82b78111cc493f25ddfa9d463b";
-  sha512.source = "4a6cf0733c801d0b36aeee99e78db5cb17a4a26af1104ed71b5d325fe2b2e73e0306e3b0df023c6bec37814def6f286f688ae16723872a647da3d90172a7cdc8";
+  sha512.run = "bb3efb5226c01103ec38a0f51b63f7ffa8361dd5973d60473b4f44c02b594c304e265e72c82451442b88309f6420292c2bd2e393a61793a7d258181c6b579117";
+  sha512.doc = "6a029bc798b4aba05a68d0c83766c39cbf659a0802d6d4a9b9e6b56f7f33940248fd74f7e57785bc1b551a45f3ea5bd48c8d5012cb903d6858c9c3bf72156c4e";
+  sha512.source = "4df6c1c4b68124db862b9a106f1b754bc0200011807fc728b725c2b3e2a9e44b7d9664abd33c6cfbf0dbef3bf6bedba3bfad8ea48d634a0f9310caf9fae66264";
   hasRunfiles = true;
   version = "1.1";
 };
 "match_parens" = {
-  sha512.run = "ce7850ddaf29d0f9c0640eec6b84eb4218a69e9c5831dd8f3a2e9d74de568e89c2fd017b7bb70d2fb7ff2297f38b6310238a45970a3a0cdc360bf9b4d7c1fcc3";
-  sha512.doc = "d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1";
+  sha512.run = "08f8397acbd565922be2ba794de458fb5d559f447fb3a23037287b0c8de26230f844b172880bc986a1badc1d09ce35d18db4319cc900ba891c90866743225d6c";
+  sha512.doc = "ede20fccd5fa4e4c92a5c85f7ef471fc765ec106b0518eb77c4545f774358ae4debab7c1039dee9d5fa9f83b747d021b16c43b77977725e4a9bf0e47a2c76c75";
   hasRunfiles = true;
   version = "1.43";
 };
 "math-e" = {
   stripPrefix = 0;
-  sha512.run = "8067394898c49497b97c930d72f452d3296104fcb0b0e4dd63278f4974e63dac00d87695a410e7a5b9555549125fdebfa5c36fb42bbc874c46816bd78c7a6d4a";
-  sha512.doc = "fbcd033952436f69f55c2951e3652fffade56bb9441ce913ea87a0f1168e1c1f8fb370f69e3e1dabcd574064e45b3dbbeba0597b1377951f058cc70cb0afae91";
+  sha512.run = "5bb1a7a78071b31e60c22b2031f63d3d73f138020d37ce525621209cae573f3a4ce166c3af1e6b1899c22c86021509ef5440313d2a948fd5450432784fd69757";
+  sha512.doc = "58b71a9cbbe850ed954e6f07e424879a253886f8c4abb5302ce67191bb71a75ffa8a1a8c679555648b218bdeac2e1f2ebd868a879dab30c14b1798d9cebe6fa6";
 };
 "math-into-latex-4" = {
   stripPrefix = 0;
-  sha512.run = "327b80898de9666abb9c31db3af31b6ce6a4321dc057a4076cee7dd7aa05288e21c9a9837f2bcb7fa00643bc02e105775dcb2be44146032d856545f9badb97ad";
-  sha512.doc = "2bc8ed0fe89f656bdbf4c9e28d45bafdc9e89cbfb24186fcf2140738dc191b1553eb94f48d70bcf9fd512ca55dede0dfcd660717a74d8752b01858c183cc9c1e";
+  sha512.run = "70f4e0fd7e79a60c0476604aaadf74741b97dabc84b43b1ec3b521b5bf4da667439efd2000667f8a59a4d5baeba58f7f4ad89ea9d04faea452e410c8d587e798";
+  sha512.doc = "99b5983faf30fd630f676ece01f5aec34ce8833f0dedcc0b501f2466a765ec4f1056c59a6562d76f408fdd6ac1b8d46a7e0b24ce43e7bd04ef385462cbee62d5";
 };
 "mathabx" = {
   stripPrefix = 0;
-  sha512.run = "96ee53266642ac7c44d77f8e602b43b7ed63efed2b2148b72fa061a7da6c97d6b85b924ce5b5e8a28224ad30e3e7e9f2e06396a4e3d81c97d9bd75710870e66d";
-  sha512.doc = "90f62efac356a81775c0bcdc14e2f41efafc7ecdd0000bfb70d12886bdc047f433f5ffd515492cacfbb18f3d5f3bcff5196012fcb005cdc09130f39ffefeea3d";
+  sha512.run = "37e05615e9fbd9f61fa0aba00b3fac6c6ca2f47e11e5404f00a971aca9abd0cebbff1295bfc20df3252bc8d964e35cd93e71b6929998583f39fa3781311c05df";
+  sha512.doc = "f85da311735fd80ac66ed2fc41c1d2875f1be65021e275d63d2e2e581d7e4a619d8b360209e2245308e8630e12d2528d21fb9896cfc965854fe76cb32e6c02dd";
   hasRunfiles = true;
 };
 "mathabx-type1" = {
   stripPrefix = 0;
   deps."mathabx" = tl."mathabx";
-  sha512.run = "4e7b1971fc8a11d49e1404144d8988ccf73ee6838e2ad08a101a8017e92232be8d37c302d91e1f4ffcd26e5e1ad7849b92a18ff917df2c454265da9ef254f74c";
-  sha512.doc = "60fb0a6d25b70ef6785be8d717eccd1634fdb1264d365efde408b81b919573e87a80c019aadabb2b97cb910cd49793f1064c4aed66220302295f0fed76676ada";
+  sha512.run = "e49ba939d3205af0d4e3de21416f7ee6a0b110f5a5dfe1e4d3bf690fef7b63dca43a708470dae966c4be03d83fca96a2120ade873cfe1cc02a7d65baabac546b";
+  sha512.doc = "1044780bc705b332ab13deb125a430802292bbd48c5755ab34123d828f3665f444f0f56262228b92b73759688f6b4abe2ae71fa9bec170b84dc2c1a0eaa683ca";
   hasRunfiles = true;
 };
 "mathalfa" = {
   stripPrefix = 0;
-  sha512.run = "8cf9bc724dfb3cb0314c010012834851d9a02fd9afaba41bcb4be43eb976c201380be9ae146426e043f36aab0f0863e5cbd0976dd78fe4c254735ee8def697d7";
-  sha512.doc = "ad2b3110eff832f96cf307529bfa672800001a7f0e11ddae5cf9df1f66824d5ad393f20ba677696b2749a000b2b48429cdbdee405725ca852ad4bd38aeabee36";
+  sha512.run = "4225b0a6e71e8e36c60cfdf27378616f69a2cd5a078156c8a9c58ea2f959c24ff82b99038e6d9834746a6d2a5fb8feeac4a24d8e9d375274a5b5dd4b3e8c5f34";
+  sha512.doc = "7131b455af595807bcefb5e409b3e123a6e0dc56df65624b65358a8f8368086b22c02569036f6c26838fabd6a18d900b701f643b4b2e7c94bc9411ac412210ff";
   hasRunfiles = true;
-  version = "1.09";
+  version = "1.10";
 };
 "mathastext" = {
   stripPrefix = 0;
-  sha512.run = "d0af8d952a678855dfd1ffb7cf4bf52456723aa5546aa997b2c20e41a81bcc5bd7e652823bd0dcd1ba3b01007fb9688ab2a7a220a656876ecc56d3364bd27be5";
-  sha512.doc = "0566d44ae0308e7d35966faad23209537b08bc17eaf4f119eb32f66d66b92fbac4a3b7ac4df56fdce631c44d05145e16062fe1a31277c12c0635492e96a611d9";
-  sha512.source = "836f03bdbb88a49f5a68e6caa58dc020160ede59b6392beb757080ad5d8ab8e592e760de2a59524da33195a254439d1e1a00d46536428ccd0b61c8967b13b11c";
+  sha512.run = "f8f5fddde33008b488c788d0b6de69f6745c6e979cc94324c35e93d8f64478e7bd131f4274ba8b293d32b5dc46929451d3f04bd866df392eb759a03df2c8a505";
+  sha512.doc = "f60a91d7352e569190deffe4d08576e2d4a6f09f5ec0c69d444325277b64d93bc108c130beb675a0c3a2a1ff762b221d4e1a54b1f2633b765130c92b7d3eaa87";
+  sha512.source = "47ba8441be03cbd737140630d86b32442e2005aa381373639b37172736883be26dc43cd8fb61c4cdff2db03f4d3f267fc4136b8d9ad610e57ac0bb670c8d4eea";
   hasRunfiles = true;
-  version = "1.3r";
+  version = "1.3t";
 };
 "mathcomp" = {
   stripPrefix = 0;
-  sha512.run = "0e46d4252811edc6a42e9753fc1bfc60949d6793a5f474b011bdb698c155cf7eab7259e4a49f7ff93643c620d5eb007823b8915e585adcbc5abfc40875d93426";
-  sha512.doc = "f388f97524d37ea2f8f14e7c1e317edd45eac8d428f688dfeb1d0173b458aacc27b1c20d2d99aadc611f745b2683e85652bd2de09c6160d7a467578b1a77bfc4";
-  sha512.source = "399cc66659e7d8f609f41bb35c2753cd2709ced7478f4a5f3827649340f12736230a0344ee40736dbb238d761b8c95bfcd97f74a0a9f1eca0926dc072872bf4e";
+  sha512.run = "b9cbf0ffcb39ccfd7e54e3903e36f5d1ccdd86e2ce83477ff7f8aa0258015bd3c9ed013b23192c7014b92dddb93f5a2340e7bd71dc99fd7fdda47ac27a50d35e";
+  sha512.doc = "1bba8b39dc3f5276b2ff68071a53ce990ed3eb6652ef5e75773dc49aa73b701bb5ffbfc221cf9b9aa00030c1a8096c7bcff3ebf4dde18bc858fb215d06629137";
+  sha512.source = "df312759db12a10b31f790ee195bfa677b67640c57ec12bc754c42d98bf98abf5ed0007c305a60d8284dc7ee63c7cafbc00dc14aba9002992d95137a39e117fa";
   hasRunfiles = true;
   version = "0.1f";
 };
 "mathdesign" = {
   stripPrefix = 0;
-  sha512.run = "80d41d02fa19315d6d8974606c1aac409f4cbe3011d02bb70fdb194d264f33965ad810a0b26dcad70d38a5102f0b21f038edf5fe1c2ec25a5d537ae54573314c";
-  sha512.doc = "6c1ec62a3d365d679b7361441bf28c140bfd3c017818aa05263526798a818cc5488f3317df921f01fd061e0b26144358cc03b656b33868c3b4f5555a37152baa";
+  sha512.run = "3307b0e16436b98816c7979443c2c31db615126e16c28fd20e19e8520f65bfb0989ac59db08bca29a605cee211532da1d712122f3ef83efbf4c9f8733cc72d67";
+  sha512.doc = "543c36087d9545f1228985f754b255a5c08650a9690b2e7340e7aaf8ef19f03ade44c0de49ae456541664341d34316021d0980e3788b05baafa4088391858f8e";
   hasRunfiles = true;
   version = "2.31";
 };
 "mathdots" = {
   stripPrefix = 0;
-  sha512.run = "b97a005dd0c2dc83d07ef48f2007807bdf94b18cb1a07bef54028162197594806ba84ca517902189feb50b0ec65f52c83eca70367c4e3efb4425cccc393158cf";
-  sha512.doc = "644c62af210a9607b7235cfe959ed123f77b5d1a84abed3bfc4f8e3070b61e46d51130b7250e9d3dd408c3fff2e519e9497a53c398c8b95f6efdd482e868cb78";
-  sha512.source = "92b2220a3728f0a41a961277df18244472768dfb85002d448f3c33b7689405b310e26cb67bb6d9d557efcdaf85440a2899cf475e46cdb303c02144bd7fa60f67";
+  sha512.run = "4372f11c8ba5e29caaab78cfd37c129267c2704b6de9e5dad13cc1ebf184760602eb2292955c46269ffb3fb13b4c48969e019460fc1916fa83d01644b9c93e3e";
+  sha512.doc = "f30d66cc9ab8b87429639fa382608dff41c11094be52afaa16a8534f3f2e91bc12dac9f6e0bc0def89088dc9491e47f9ae5871fbbeaa5217bd4c6586fc059615";
+  sha512.source = "897726dda3d395d175c684d8e032abf8f563c1ef2d0f64596c1ab82035011630fc734bffc5bb197a0b9a92e2fac08f9adc09cb588dd990f40ec7deec3c5ab9b6";
   hasRunfiles = true;
   version = "0.9";
 };
 "mathexam" = {
   stripPrefix = 0;
-  sha512.run = "cc17bc652489a42318c59a9cbcddb8843471e51dda431a5bb955c00cf2976dbba0a4e3236869ba5d2ff104aa84bcc042993cea910dc37c8976bd85b889ba76be";
-  sha512.doc = "4385f98957a6e18ac3d0f3871e85522ef41f6d441000213955839bc695b1380f5d929715e6b650e097a1573349367d49c48e71f550c9dd87ddc7d1b3f1335468";
-  sha512.source = "ef67c896e100bc892bedbfff23340f9bad5a1886c822d0f2c4432f2e8ef9de03d0c05e8b21a3b6dcd45433cef5fd2e9fd43cc16d14de8b01a77f74e941d715f8";
+  sha512.run = "8ce36f0b68ed9e2a706db6da73eb3f3ca52cf71b4523004fcdbc1b176abac8b079f4863b6f771b99e956244dbd73e03b23f2a7526d990e33d04a544c4cc35c6c";
+  sha512.doc = "a260f0fa247d8a5f9c0ee185dfb129f2265811d77037b29982e08eed5a515bee4003d09dbd291c21c613123473eb8254bcafdea696c7a67235da0a25d18f9272";
+  sha512.source = "91d18d28d4cef28fd71cec51fe8ee8e3fbd19712a6fb4e3898a1803554ca837a9af1e9c8fcf36a961f40db6f40c61d0fbf98e7d2733522d5db7fa403739afb66";
   hasRunfiles = true;
   version = "1.00";
 };
 "mathfam256" = {
   stripPrefix = 0;
-  sha512.run = "807607a786fa817319faf4c2a8dfa1b7fe6d900854f4d10d0d8beafc5c9f513aa5e06f46ebb1384a4f8fdf9d14cbc0217576d991e433a6cb13bc44ad3de4c218";
-  sha512.doc = "6670f21cd2f012ba83a87cd51cc07756163e5f6cdd0426cb9a69090e8bffec4ded163c4233f9b8c4bfa32eea57fca17133185ce76fd6198b74e7d2a1a095d6d3";
+  sha512.run = "c28458427f4ef2006bb8efee489ffb6cd40f44fafa98f341c243e3675b3af564067c8e6b11385bdaeb77b72b9a6cd4e78edc8f3e3afa12cbcf91d510c5544fdc";
+  sha512.doc = "dc651242f471a2cd0937632d27095c11ad237a48d175f740cfcfdcdb3cb4818ac65328e214314cd778b85075ca42e5c32435c71fafe7f0a173be20bee92cf1f3";
   hasRunfiles = true;
   version = "0.2";
 };
 "mathfixs" = {
   stripPrefix = 0;
-  sha512.run = "113d9e01f2cb4a80a9f2db7a5fc0bf6d4222e156dd94340d6d1a89330c097a182e75a2c089ead21a0ffa447776163154cd5b11e879787582d243efac184ec618";
-  sha512.doc = "e2bf9b50096f34cfc27ce46697212b3de461e1470fc910d1752215fd062fcfb715673206c3d60f884feab58a00c9a9dc74d2d58ba945aa7df4b00bfa2f313833";
-  sha512.source = "fed77a89ed472aa9ed91dfc15c4775e4bda64bda179a453c781930facd6284133d1c0d9848dff78fde5dee735d10b9963d46771b0e1128131362f87fd85a747d";
+  sha512.run = "fffb605931552772eb18759a310f906fda93bf343101dd51dd52e44f049ef2c02bd40baf59e80df6c814360216a593728c7038dfb626e665673e6dbbaa0a4d52";
+  sha512.doc = "6457a6945f5ea24222e25e55e64c92798611a62c7ed672905fa6e53fc1ded45c2a36c32404572cd7f2e2b2b4045c3a980a2d20e1ae053517169f2d35c578bc09";
+  sha512.source = "f37b3cde8e553101b6215f585fb8228abdb89056c7b71dbd4055317d4ccce8d2dcc69cc5d1f466aa4c9379086e2a1c4b24ae7ea5ab5fcbf357ecd5055984c007";
   hasRunfiles = true;
   version = "1.0";
 };
+"mathfont" = {
+  stripPrefix = 0;
+  sha512.run = "6111546b089f97806fd502a49244f4c30875cfd49eda5a6da2796f1eeb3abbd1e40d3938a3340d530545491c52a3591f7da7c578d9f3b05e9abe69df1229a441";
+  sha512.doc = "7bedcea88cbeec54ee469586c319c87debaa6a8736c1e49aa8beca4800d17f4a9a595cf2ad5853130d1d85341cc6e2cba1c550c2c9bef35260709658eed278e8";
+  sha512.source = "950bfbd0765a0f0e041f64f183277fe077853decb1c5c417242705d6d3e6b8f1583302928ec7965e6e7bf04abcc3f9765e523d53acbf771b406607743f4acddf";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "mathpartir" = {
   stripPrefix = 0;
-  sha512.run = "4f7e8c5346ddd8afc210cd02e2de1d49bf604deecf4bdb1d7a291a21ef0eebf68d262ea00ab1dc9e7d95c0e66e2e7af6a3fb9a5003fe9ae95cdc0bc00e766e97";
-  sha512.doc = "f2f094388be4e25edd6cd9eeaced70bfcfbabf1750733a74fa54e89eb17ab1a16102acfd54a92b09a07a781fb1a8ca40322aa5de036ee0d96e4f6f0034fc906b";
-  sha512.source = "6d9198c76e9eb73ddc77457c839883f1844e810e228027d4e0165ba05f87113420524fe0356ba0e67471742490fd8c82a1cb7cf2c8d574be2dd03de6220febf6";
+  sha512.run = "57a990700d21297b35122d99bfeec9949c66fa1250ac7eb2265808ee2a03480ad6452fb40a5db1accd2629325c2d83b8985b16b4bac46a5a332f81ed1dfa2600";
+  sha512.doc = "2e7e06b3037cf2ac3792cfeb25b0ea685843279f0f3f5c6e6e18e398d755e13b6b0402871f30d1776513f41c863f13bcb7c541076b7ee872c289c1af1a0cb30b";
+  sha512.source = "e7b9f5e7ca3b9de90938a4e662bf98abd54bac5c42c08b4ca380e0c3e65894cc3498249ff89b8e99e46fc4a3eec89e169559817e1e48be1d8010a29082daf43d";
   hasRunfiles = true;
   version = "1.3.2";
 };
 "mathpazo" = {
   stripPrefix = 0;
-  sha512.run = "a8aed5032748a33bf7f5fe24606d7c8c67bf5885a4be71903967a87e77867c8ea1a221ea7bb1a37c032d53fe7d55cd8b8ebb431d3a7280c844dc1e178673e4c4";
-  sha512.doc = "c30abb60003a0818c85ed298713a712b5610e4cc0c410c29cbbae2ae7e45696751148e70f8ac2992b0c71dd4728a78f481d9ba80993dd39ec148c4f53cba5e12";
-  sha512.source = "fbd33946f54d9514f4be46070a96126b5cb1a41641d18992991477a4d8aac6fc5b7a9632d35399c66b2aa221cb9cb7c6845d233dfe215ca4ec6c739c2a9bb6a0";
+  sha512.run = "2dcf90536c3aed72179436ece3328f5155dc8bdfc49e01bb68feb67467603607b5232085cf622d71bef836392645b4f8fbfbbc10c8d7d9b28801038f3960ccc5";
+  sha512.doc = "1cfa151841063c1a8eb5be6b3c1ecb8f4ce6d32e54b7a6e5c252de471ad486a46b6dd33e86569f460c95b13a340b25592c4425c008cfc0bbc877d46c4c47bf6e";
+  sha512.source = "f696489ab4e1780f3a538fef0ed1bd16c6b3064a6cf54ad51fdf3d77602a5026f7f6568ff280281ea904435df3292ac251d7eb55e9b7bb76e2199f80e71e5cac";
   hasRunfiles = true;
   version = "1.003";
 };
 "mathpunctspace" = {
   stripPrefix = 0;
-  sha512.run = "f9f63c7d0bde17cf7f1ac1c1dedc6cd6ca2274329e3729d469a3ac05223d306881c9704291c83076ee75ad4f492a75402938f855037b62bf1d0e9dd989f76c62";
-  sha512.doc = "6948e07d4c134158ae15e9c05888741813743854243aefb826e41c530982515fe6915dcd30340ca09dcb1719e92cc274e582cb1fe5e456924f460e00195d3b55";
+  sha512.run = "73ab1f4578d23e993251c930e8e246c87192ad6c0246a16d77fc9064fc5927da3aa49e18b7707ab8d101d6c0a5afbf5f8aa42b90e2c53455aa7ac2f5628873c3";
+  sha512.doc = "9911b18ac61e83786646975449c43a16d19c85f7733f5f9d6d65a5efdd934990d40b44f691886c513a36acca35e11d0b03104372663813768c7ba0f8188c8f44";
   hasRunfiles = true;
   version = "1.1";
 };
 "maths-symbols" = {
   stripPrefix = 0;
-  sha512.run = "55866bb3c364d4dbaa2ca8bda2d287736e2a7152266e293539cd6a083577390eebe7c4a97909c7404b0d532d3386ccbe9ebb0c21b838960e8b8d0bc21024ebd7";
-  sha512.doc = "87e8b4d7890570b6c54dc7772d1a83f662d33a5356eca01e77f69bca672d3aa096e175b13d0fcc63605a30394ed2e168bf6a40a8192226a8aa5a0fe321a6875b";
+  sha512.run = "e74c95739d206a47d3ae838d1a8c2b852868a578c9c073807af74deb110fa4df083f1ec2a75e759bed3c4629602adbc877a6cf5ff60b2089f2e66cd8196408eb";
+  sha512.doc = "c17822fc318a46438692b49e4aa40464be6b1163dc9c9402a4548a4348a6d3a6fb120c8c148274498d6278f4bb2fdd20cdad9e84701aa343cc3aa2099256a61b";
   version = "3.4";
 };
 "mathspec" = {
   stripPrefix = 0;
-  sha512.run = "bbda6912323bdda65efff5556d31475a33cb0d1b9284d1dc5e1134a0426f85299f6d38851daf8408fcc7766fb1fa782f6dc50ae5e521201bc044173a59ff1b92";
-  sha512.doc = "b31b7492b89e8d7742fcfe4fb32f99c6ccc799dfcc40e268fbe3a7e6671e45c000346e1622f9a2dafe683f7a32bfb96f31dcfacb398aaaf8fb61fefa4d0de490";
+  sha512.run = "2d40ad9cc6194e42c2e6c76d63fd079bbfae3a7eddf97cf5119161731517d1de68e8eb5811674ccc40d10a226993c0e58d8f9d264ed5874795e2409e8faa1902";
+  sha512.doc = "db64160206a4c172894251a1e99b06f5aa897afd0afb6c521af0834839e7546dc6d8e2325346c663c1a8620104f3d5694f06322ebc2f37822e7061d866ca136a";
   hasRunfiles = true;
   version = "0.2b";
 };
 "mathspic" = {
-  sha512.run = "4cc6f9037fad5eb5cd703b619d04e2f372acafbb2b05b0886287bbd4f652829b574f507308543ab2fe33538b38ed8deea6e84712790acc5bd3832e7cd44614b2";
-  sha512.doc = "c58b590e5d4412552c24290b6f597386a6699424df77234aa4b651c3ddf0565f58f7085b17d94a0604259cb97ba3f8475b73fcbc4becb04584760efc5047af70";
+  sha512.run = "134b5aae7b3b3a41cb34cf8fc615fd6ccb965716323b4157c989a29ab3809d75e4bb8a9ba7b25305614e3b73fa3e93b29789fe5a2fe72ddff026c6c1cef112d2";
+  sha512.doc = "3e92570e8383aa7a186be1f2d7ea3de771ae9ab8135677a8537e901f2b26317f4ad3d93919f761e3bb2040d97368c4f0d4bfcca965414b2793d067c78587273c";
   hasRunfiles = true;
   version = "1.13";
 };
 "mathtools" = {
   stripPrefix = 0;
-  sha512.run = "97e877f02c9a71c048220ecbf0eab1233b1c7dc4ba82d0dfc48c7da791f6559d789676d8dc37750c5f70d4a6b13564ae517c75ed28a12322175760b2632d95f4";
-  sha512.doc = "362fa13ce657c9f35ca5e1907d768f183b2110a7991bb49871e4416ec5bf0e49fb081597935e71c3121ab3f8a567c4a9008bc221c4f106d62d9356cc12289e64";
-  sha512.source = "cd3ecba5db4a33bdaaaa05b3fadbb30588ebafa2b4613376a72a1cd0f0f2d9bfe16b056b2f884862b8f8fd86b0f3a93955b33eda6742708ef78a3526e96166f7";
+  sha512.run = "1d431b36f98584251376e8d6fc237d6a342627e0c80ff2f17aff45fe8762419f7145a719fe4bec7e29f7bb93881e8d748799aa5ac1042e9c83819cb6e2c001d7";
+  sha512.doc = "c53a7de8f1ac1de94d2d368d5d6551f55ce5376a36a3aaa3c44da2e5edf12dcfb1ad664db25f6e9f430adb2b67f71972d5cab3d00e90f84fe8bf6ef5e25c5a04";
+  sha512.source = "b53aa643406e54162e4e0355fba89ca55738223fdd85d1acb9d6ded116e4f7916e29d7ffaca59d69eb72a9e795c42982e5aeb396be863a4abe0c936955f32099";
   hasRunfiles = true;
   version = "1.21";
 };
 "matlab-prettifier" = {
   stripPrefix = 0;
-  sha512.run = "872e03919dbda0d4873d9826a541daa0bcbdd24eb0a8a30c5d6f36e6e1f157bf7ef9225680fccf9997fbfa6c346cd9e6bc3ead2fd5177736151c142a1fe0c196";
-  sha512.doc = "4994375e70a569ed6fd3038c3c56c12af9b97614e1e9815e6efdd7b9320d9b55dc7a038cc5bb1faa9300a529e934a8c06af32d65a20aafe408ed803a80643cbe";
-  sha512.source = "b2aef14d9bcddc9c3e381b1bcccd9cd648683aed934ecfeb758f53b7c54cef8d3f672ddfeb342d8a0a18af4fa687727018bda9992ae5cb2bb633ba46fcd55f30";
+  sha512.run = "2d0053ff3b63087c21b42e6d35d226604f5d582900d5293a090151a4df46cdb8c5775b1e7879c04dcd00fd91fccd9bbd06def15053a9c5ec8d269a702ff8e815";
+  sha512.doc = "18d58e8a6903336eaae24ca8e0af21fd0fa3651aec4c9a6d03ae486a81e938fee749675ff0186dc570e2c47780ad7bfa3b194b75a5a87b83f0dd800857ed4f27";
+  sha512.source = "62ab422b9b374a433cb5e40db9e195e94e67682a74fbaabe43f8339d030763a93d07696c6ce0d092d1867f8ea318b9da19976663a41020b7ce2cf47f9395fe21";
   hasRunfiles = true;
   version = "0.3";
 };
 "mattens" = {
   stripPrefix = 0;
-  sha512.run = "5e1fa647ef7d73cdc7dc1d71e49a3c3c364ee4b349dedc9e1424284194a4e817b4bb1151099f8bf22b7836fc95e54f45faab90215bbebf8bf198e136b4017878";
-  sha512.doc = "98506381024d5da25251f24badf74046fe313dfe7494ca2a83ab4dd1a93ba266197a6191b7ee0183243e1c4b38661ef8a1cfec4df90166b1ae376c82e566ee9c";
-  sha512.source = "c937a344e29ab9f8dd2bd5b21de1256fa1789ee810cd0d0ecf37c5dcc7e742786ea2c36e0851e28e6125ed6d6e69a8d38f517022ca6338951c02f13f781cf879";
+  sha512.run = "f8d373790a24a2cd7170e54f2d2429658425c32d4516019d18fea01fd35fb28a85c8cb63b4adf473bf60042b0b2cccab844f0b52604d01fe4d0a3269f6751644";
+  sha512.doc = "7bec3ee9e8fabd9f144ecd4e7549566fb7a86a43860753ef21ab523bb5dea86a074ea19738241eb9ad786587a9aec1ac9e65ac32676042d1484a7c55a75b9b7a";
+  sha512.source = "4e62726b6d0022c6cb67583ba2bc979251adf451fff426017e24896d21793954c9d7becf06a7dfa81cc7e10d16e14a753f70117fa7d3b8232611cd6ecd526781";
   hasRunfiles = true;
   version = "1.3";
 };
 "maybemath" = {
   stripPrefix = 0;
-  sha512.run = "54ad340fefdc3f496eb357937a142d33dd64ed32bf0e14903533b448cae4c6e00adec4b22408e02e27c711ad011b6d211b08f9889a15fa784ca7224462e639c1";
-  sha512.doc = "9c7e490a1b7a1ef1a5b1975a29f5397c90131507887f407c636ab7ccce9d20895271e9d4d9906b2e13670b2b8620fa6f819b328aeab9475050775c65245a70f4";
+  sha512.run = "86f55d180f5c831ed19d1ef68afa79fed8f3c7ad1f88cefb45faa0723a2868f916b65057137715b07e741437fcd38aeb8aef58481531c005bc830239cd068bd5";
+  sha512.doc = "ebd6ae72ed2cd6a5b35126fa32f5061715e12e4a8af6ea9c3faf77d739bb78dc50dc5ae860a268d7af82890c674c2041e532babe4e9d8be9a877fc06650b49c8";
   hasRunfiles = true;
 };
 "mbenotes" = {
   stripPrefix = 0;
-  sha512.run = "4e6824f3d046c8ad414c8de8c8eb08577311547a251d9d4c25ff71ebb5ce3da3cb4a9cc8470f4be9707d8d519dc96f8f2510d56194578901ed7e6f034a030f95";
-  sha512.doc = "6a466223c581757678d96e7bbd319dc920d3f0fa423ea6e875b77af003f5bc25976d9cf810ef717135689af0bf38d5e11d394523c4bfe620956d0463d93ada11";
+  sha512.run = "83a61c5293bf286081fa3312436728159747dec58fd8b260490b97d1b153f3b1b0a7798b45e969021f7987f333b2cf330ee18beb48afc4e2f517235f8585087d";
+  sha512.doc = "a0b64a0812baa38e41afb34c101df834aad0d68f8c984ee43e244f48daa876ba3989bece4c5852c9b4aa4ae5bf6a3bc2e8d6dc47564712ae1f37139bd69aadfb";
   hasRunfiles = true;
   version = "2";
 };
 "mcaption" = {
   stripPrefix = 0;
-  sha512.run = "29e7ddf80b61b26bfca483a779f27446920a0f1360b27e6a659cabe91fb6b1ef3fff8f24c7529827eadb8ef8ae8c7ef82b7a4a8a0b5ea99af3a2d5b84bf097ad";
-  sha512.doc = "cc7320e31125c89241bbcab178ac180c4ff4977f4c5c6d252566c7c5dba059886ab815fac96b4a54c246ad60320f790eba6762c09d129cff74d6ec4a1d50c173";
-  sha512.source = "527835b84c84e0001605012aa8b3d47b6366a79f8e8ffe787d9de454410f94803679b5214bf7079e06f487f12529856850f0a16affa5c648840263568caca6ee";
+  sha512.run = "d88202208a5dff6dcc049e3a16dac37a89eee7303108bb5a15a22da3a52056ddbcbcad4aa87fcdc5f5d556ac8ba876783c4e379967ccb805d73f61c2ab131cad";
+  sha512.doc = "f33f6aafe75fe982a130a07996f9b421565ab0a27363a03b748f5cb3316c0b5d571dfaae15c245d3f1c46df05aec84df7aaf2c247713a34fa9d02fc991ad13d5";
+  sha512.source = "c60d859c23d6e932786c1596515541aaf8854a1ccd8c1dc657d03db228d8f92b784320f078f07b34b6deb572c55e810075de9d9a8eea3ab217791b014e2d6874";
   hasRunfiles = true;
   version = "3.0";
 };
 "mceinleger" = {
   stripPrefix = 0;
-  sha512.run = "fd8b35aa35ffaa979e951d70ce20fb6358ca702172d84dc62d5143c69519663623e8a2c0443a4ee43e9b0c5dc7a115b3eeecfcc847f6ebdf199bca2fcc1c649b";
-  sha512.doc = "62c3cb39839bea920332e87e02f4374b84c3bcfeb51813a3e3abece0183c5c197d05052c988e01e7b2a736920568c08b0c20ee20aaed5279fcb38c9bc00f4e01";
+  sha512.run = "7e0bdf0daaa7c22f63193f6d1acd59a510c6c1a8b2da338761a54a6d1859232e8889d77c38b90f8452da6990a4a37a98385d77623eb2b23ad8ea694e66f82122";
+  sha512.doc = "e2fe65efa4610348d9389277d9b4e4df099fe36d9d6c874757b7e59d623047cf3c13c31f8a1c590cae0e1c45a0cfea2c2c9a9dfea034da4257a6a8ff2fdd4e3d";
   hasRunfiles = true;
 };
 "mcexam" = {
   stripPrefix = 0;
-  sha512.run = "9ea7c2e4a661ba8a178d990889f34da97142f3f45be0e96fff38f2232e3ab7ee560b55899b7b6e693082df5bb1039e4688a1299c896aed2000b8331f9a7faada";
-  sha512.doc = "b5075b4be3811380d6264b7800dafbd0dc4e6e271def95328636723bdca78eede3b71d608fd7dea4bb9b7a9449c768b01235d6ab351d3f47dd5d33f0470b652e";
+  sha512.run = "4fc675725a4bb015e0bb524aaf3310a5a39d4735cec7922c12564ac4f5e9f1dc787a0eadee0e27dc33e2bda5b57c499204686d4d9a5754b965967f9c5edf5dbe";
+  sha512.doc = "27330a36dedc9e1c89a7eb5b4b91dca3a5da289852ba6337c9699630b91ad51817e79d246f70c9b769496075241c18f0bb3f2555ea9e590b11b651f9e1fb3062";
   hasRunfiles = true;
   version = "0.4";
 };
 "mcf2graph" = {
   stripPrefix = 0;
-  sha512.run = "6683be9e63ca007934d198007add981fd380b3ba22680d42926dc54f1600fe5b4eaaf254cfd1dda86045e8285d054103fd4517d2a5a6a1be297babc890beb276";
-  sha512.doc = "97440f224e3476f99922be890afcfc7b84a3552088ad08a4cf0d06a694a4bb5ad003dd921d58a73f60eb7b4da7381c9b010bd7c8982316a442c7f9f9fd448076";
+  sha512.run = "44de72bacece44c209fc077bbff4fdbba49bd213cbfed157fbdc1d97bd05fc14c84cb19a31bd3d69dfa8bfa5eca2ef2ce10aad60dc0608b2f8065362d7f51031";
+  sha512.doc = "9db7142634e67bd0b1200e2f4507d4d12eaeb0bfa8510e2e37583c8e0ff688513fd10db97693d3eb6bec79557c9a141f229229b1e02ce505c8e7281211b4d71f";
   hasRunfiles = true;
-  version = "4.30";
+  version = "4.33";
 };
 "mcite" = {
   stripPrefix = 0;
-  sha512.run = "6172b0ed7d38aa493c17c6b0f272eda7b7624f942431106cf11bbbc46ed61d3b3e64874a9529a4b9a03419748065ad3165dce6bc99baac6404a65589cb70b43d";
-  sha512.doc = "79cf297dd0835ea2f6f29817e6159d5651b7b521b8e7f2a3859a2c07a56e419406e8668195bc639afb47fd6adf1ebee1d9e3d73026a7d6592fbe0bd6902aefd5";
-  sha512.source = "f726fd0bf399b948431a2da094bb578c7c7beea57a8527a08a5332d8482d0a44253b153010d50fd50a6adfb44d44741f3577feb99d77a1ac3d97aea197918d2d";
+  sha512.run = "56c63daeb94f8ad8fba69f7e3d48657ef7160f877b7bec7b4d7dc19a12b76570ca799e4e2f6d4540f53f94700c9277374ea6f09fdd1b9d3f4f4eda079ba574dd";
+  sha512.doc = "872406dcd9496451473f39449cf0cdeb7bc45c54b97ed3f5111b3cd3187b2aaa211a3cd4c0446e5a8047427137c9f5519fe9fa68794a782cdc6200227e3f9878";
+  sha512.source = "ce398af083fe07435225d5578f540a22667b126c7b2e8603ed61d33cc39ae6c761ec1695e31dabdea072c2d9862e8cbe640a0cae967a2b3979c18c423aeb48de";
   hasRunfiles = true;
   version = "1.6";
 };
 "mciteplus" = {
   stripPrefix = 0;
-  sha512.run = "b69f6787ad6c3680f08fa20780117a0b36ffcc4dc342e4615fa0df0809e8dd6aa346a421767d363f047bd3752a28e22a8240f09ab9d4e6d279299a9e2eb1bc79";
-  sha512.doc = "60b5d07b769ac64ccf7c2d444cd6b6335012aeefac2b275d37c4ad688b5da151dfb13540b5d28adba8e9968171fcdc95348a768a279ec0c49980614180999d8a";
+  sha512.run = "2b3e4cb5da38b6d4c1ddd3568a14ba9a8fa8162c678f8b8306d341ba48944587dfe10ab334ff1128e413b21eb07a857a6cfdab76eb78754c6b794b4ccd65a9c5";
+  sha512.doc = "ca686398828f7fa2c957104aee0e4bce6a6e94f25f115be4bc2f76f451bed7e0f135f0b8259f3bb40193f5f4be37e3d200d299cbb1cb9618274f2570bcdf0022";
   hasRunfiles = true;
   version = "1.2";
 };
 "mcmthesis" = {
   stripPrefix = 0;
-  sha512.run = "975e4420686b97fefa13a762a35ce70c3148ce41015b703fabce01e52eb8a97f30bf053954c93081141c184e54b7df8f3f3418e64d5d6183639561ef009d7f4b";
-  sha512.doc = "4639d1643636a2fde240936af0e02c0250a6821029d2719593ae7aba6a43c5937260d84ce6b2edfd5f7cc223dadddd8badea51f5ee7872e6de7c5a0240248551";
-  sha512.source = "557cf0062d7dbfd3e936424a5800b21980ee430bbfb8ff411538d118c940a3f496bfe2eb47a80f11b0f4510c72a791aaac997efb360b58e64408045ca985d7e2";
+  sha512.run = "9928c4f370331abb4dde8e5d0a1a836b5b49a38b7975583488b6319d509c7998c64c8d314d3eaccf8b735a865d6362aa73256cd2555c2b3ed2995dff02f925ec";
+  sha512.doc = "a4800208ec41974daafd65d1a82ce4bef9858fa7288ba1977b1c537d54884cc1e990e813eefd36eb2730876808306f8d7db9c855ba06e1defe67c13529532509";
+  sha512.source = "1b3a47fe6d401b6f00e1039092629e2a68f0e78df277718af2fb7200a76c5a493d34cd3049bdcdfb459794a2f567a78b44dc46120bab3e431220a4509795677d";
   hasRunfiles = true;
   version = "6.2";
 };
 "mdframed" = {
   stripPrefix = 0;
-  sha512.run = "97d6b5bf8f65a0ecb2f418df52cfd2acc6ac3d8d9abca00e8d68e7622174ee0e0f2f5806ded7670d790a4aa8f79afebc716d3aaef79c43e6aba8a20a0e87c8f4";
-  sha512.doc = "cd1c9da42cd8ab963ddd2382d9a574ef5cff3315a80da9ae961e24c46e231420ecab807c37d1e457e964c514f336bf155f7b5b700c524cc10143ac6533f2d200";
-  sha512.source = "d006b7200bfa7334ec04b41fb4550d29f2891640856a771b183a8d61664bd02c62b88e810760c94a2df921990a436d6fc5805df64591a50dd6cd2c5243dd5475";
+  sha512.run = "52c61dd7dbc5bdc201d4bb0aaa254814526322aec3d05d9cd621dcec038cc69924c29c72a7bc5e08a6fc96dd122b4fbc3fd3de9f08f40223fd9b2c290f4fa499";
+  sha512.doc = "2f5a22a1e10f5fb34dea34bc2c4a4ac36ae825049574475c7fd4995ad065f4eadda02600b6f0cb5080a122f40e27c605df919a4eb12fef175b4ee757c6cd4971";
+  sha512.source = "1ee1e03bd09d4c533b5676803fd5fe19e7a10225a7c0f49551f6ddda27687b4952c4a1f32681237cd9c318f357a9640af20558c849b314b2cc5d6a5b09d59b9e";
   hasRunfiles = true;
   version = "1.9b";
 };
 "mdputu" = {
   stripPrefix = 0;
-  sha512.run = "abcb61f4f569f9242166914244c8c9a6953512ea8b95b0c82ceb12f4a2d9e150f42f13ee253e3d30ae7854cf40c34e764716a5b5d732393655506aa3373ce1df";
-  sha512.doc = "e3ea1c6b5057b777955fd265261124e7498e47f1958dec48592d8bab05dbc3f3d551df5bdb45d905260c4325d6e85c85cc845e9315652c7c9ac4a9ac89254f7a";
+  sha512.run = "bfbbc306385d62d5ec04abf72f7e2f15f0acbef91f102e8beafba687ea7a5f1448e167106f2bbc048d072bae744960ecfa05f46250d8527afc58865b1604a6e8";
+  sha512.doc = "490647b290fab553101311d314d21367432c729ce492e1a87623668760d9f909eb9a8382b5ef996770f19170d187d8bbdd87f6d4e5753bc251d1e62314008ee4";
   hasRunfiles = true;
   version = "1.2";
 };
 "mdsymbol" = {
   stripPrefix = 0;
-  sha512.run = "9d0c0805a2cc7271930b9a500c9feeed0a929bc4f5c3bf35499f6804ad5f7d74d05e8bc692653557a28c81c6d51bf5071ed6a7667873600bde704b00879dca6d";
-  sha512.doc = "820de15b359bf53f14687d18089e500cbc1ef02718bb7cd483d655062798acc4566ff8b7e8d6a9be5ba4335cfd16ba56c8122199f2ea7063d211fa7c50147ca4";
-  sha512.source = "fd31f7842abe8ed8534dc3f182f19ca3ff551ebf620d7c67701fdaeb11c35d13622ddf9c3a136ee2054ab945a7541fe8525b50fa31c472a9b573c64aa6eee3c1";
+  sha512.run = "25fce53590b50242f7e4c2d61e3a0b2222579c0e1dfc2a8d34c12b72e7786f44e6616c90810e50cfc7acffb1005181a13e4af09a912fddcaacea6db8576bf639";
+  sha512.doc = "21b9acacbff32e82d625926ca35290f490e710efa784f3999d1b2fd8e32826ed13724ce4d57f0bf18015d61c956112752df45966eb3cde980e6380aa06c52a44";
+  sha512.source = "995b6a4d55cb403e2be8fbfb8da0f50710a00e6f5e52b55f29d3b0cee9ada99a1c41fbea2b1bba5478801d7b11e86de7024bfa42a6cbe63dd6fbed15519cf9f8";
   hasRunfiles = true;
   version = "0.5";
 };
 "mdwtools" = {
   stripPrefix = 0;
-  sha512.run = "098f6055d36e762ef796398deecbda8c8948545afdafa8791d292b27ef12696c1d5e7fa4234835434cc7068b4a7bc015b36636b882e15e9f2883794151902c45";
-  sha512.doc = "5adb6268bffd292a4f5db451302664772ae4d6deb54cc9a5885ea6a76a965fd7aea807e26c227cb93be382cb0a964379531b62285c11dce388f7346e07c83fb4";
-  sha512.source = "96232db731d74b0284af71b065c82ca124c2ca868947582da8fb0cd36b0ee0fe1f94a4ab4df44b86c9e184a18d22246eccf6397169d3c31aa94ea58180d73d20";
+  sha512.run = "3be60ae87b535713cc8099707b70206ce5792fb9474d26f29850c0df8311efe688ab422eede6bcf9bc747c0c9ac91bbef367da17e09bf5b0ba6898a47e750c67";
+  sha512.doc = "6d55ed569a180949dc8994df6e0df7a193eb355abc55b19ced1b672efcd6b47aaef9d0c5534f4ad900169954ed92ebab8fd70f3a93f35f828a54538a93c5b145";
+  sha512.source = "e465e4c98f4f4047db581399bfc678b4baa7b00ff7eddced5749e3d44b192a35267ffe6eebf5143814cd820eb3d5fccd9e5ec7e9a25af0f46abe3cbb1b41fce6";
   hasRunfiles = true;
   version = "1.05.4";
 };
 "media9" = {
   stripPrefix = 0;
-  sha512.run = "6d193af256b5d2f348394944fabd4031dfe070f4ee2aec1333d4e47739910df96c57950da5f6f7459afa9c687f33a72d2327c68aaf3396bebf2248816e58c2a9";
-  sha512.doc = "1b132d2c3a22ae74204bab3c9a90e13480d90ec955b237d6602080d8a569e3c3ee5c8ad40a3cbf29d60457874979dfed91c154ba6e49eb548be2b2b0a52137d4";
-  sha512.source = "c1a25309290da316eabdabfd986be1949e710428757184a5721c3a5ff356b83c04e3a4f62abd0b1f6b382118adc0b26a0b2c64c7180d327948a7020c2ec0ccfe";
+  sha512.run = "cdfe247bd2a32f70d23d169a831b7c7278c0adcddfb1ff714b488a66aa78a4fbad7111884f47cdbc4fd099065edaed86e6f30db7920f29dde7ce210418e2a708";
+  sha512.doc = "2c9ff93ae6bbd67a856343c8234d425ecee98ce040cfb69f9e27a7c87a68fce4517c9df187a2ebcc8c89ef2621430fc80900859ecac3e7ba4b9c1c018415d8ef";
+  sha512.source = "3393767a1ab04e5d41d38fe0bc396b4891099627ee131bd72282b4a2ecc415ddcd0672a63853b863d211241483d2cd74d8aa669ac25956e244bb5ee021110a3f";
   hasRunfiles = true;
-  version = "0.90";
+  version = "0.93";
 };
 "medstarbeamer" = {
   stripPrefix = 0;
-  sha512.run = "f42865db148ce91aba0ab76a0d174027993a373c8a85f0853c9131fc36a0ecf1494f22aaf974055dba34ee3eb5e6a7872d351d570b590b9635e2b0ff7babed77";
-  sha512.doc = "460fa18f1370686a9e9ce01abfe29bc3ba562275b3a5f34b1a6e81778eea6369091a355853877ca6659d60dfd548c98a8a6d63e74a3712f02f8ce753a527c8d5";
+  sha512.run = "6d94c9471d2bcb08b0630c247d5255445df3b94979c88c72250a383d92fcdf5de6c36eac55bac34d9488d44a3a47558ec987b0af0d7b32411ba575ae28968273";
+  sha512.doc = "8f26397fcd6ed26e681fc0787f14fad51a6b96ec48984018cc38911eef932b3a1814758272393c93a1d0f4335123ac2ec29f7edc35b36d3d85fce5c2daadeb52";
   hasRunfiles = true;
 };
 "meetingmins" = {
   stripPrefix = 0;
-  sha512.run = "64eccc835b059c6291a68da0f97ad5899ef5595118aa0097594957f757a88e2328b18c92c449bcde52a2edc572f1bd52bd29ab0f844923eaf8a060ea3ea56ccf";
-  sha512.doc = "275b680c2c05517e63cf3a1540a01871c885b9444abeca2716d308162966ba9c9ee9bae8e57096096ec542ee3f684cf28f46381eda54009b07f5c861e546d969";
-  sha512.source = "6451bed8e10563ae20c8d3bcf4bf4644b4af607b134088ad479c1c42601344dcdca3ca60e08b7553ba2486f02598e5189350d8d8b5ee4d39ea42281605a8985f";
+  sha512.run = "ca91bc85239c271a73d071106ff95f94a7a6fc4ba3306393c02bb8782c10ee61b22e60533c882fd9c759be17d8a7565125f5fc60e733dc1e843f50e45ceee8d6";
+  sha512.doc = "fdc9714b2c09effd70c899a5348269aeb9c2edceec717377a83bd0e56a54d55a10c60f4b20906c62105df5e112f905e8d8c92a57484d869c237a2787688dcd93";
+  sha512.source = "9f8c0ead8c7426c7c23de2e0258397a72ce80860fd5bb295ee1533607e210d73dab9324d498e870c080645689095311b75bac1b8f4eefd30863cd87e42e7dceb";
   hasRunfiles = true;
   version = "1.6";
 };
 "memdesign" = {
   stripPrefix = 0;
-  sha512.run = "8bfda699cd273df94333a07de44eefb1811171aa31cb54ead347b71e7fd094d14015a0d76c0e93174297c574cb2a5c37eac2a9a7e1b8779c397e71007c3c7467";
-  sha512.doc = "a6071526a6480d733228f0a450c9165d12100690f5e029202006e7a97e5410fff444b58ac512d3a999206848608653a4a7b5fd8c9ac53be31f44f3ae008cc872";
+  sha512.run = "70bc75c51984b306af70997de54ce995ef477fb484d26b19725572d2d9b4477376a9a0e4fced4cc7d808efdcdd8156c8a311ea308b5642f468fc4732e5e935c0";
+  sha512.doc = "2c4e054a488fd3d028958d090f24bf442dd6df1c4990e44a6dc165d872adc316a9ec5a300a9f7352bb180ada765009dd4ffb686809418fd965c3553128b2f478";
 };
 "memexsupp" = {
   stripPrefix = 0;
-  sha512.run = "ab6b8b1d8009c947409ced5d42a1689119982577515b962bcad6ffc130c37d11b637292ae984605c6dbc77efa717c086942ee5b558c80b80dcdbd489d2a4a2aa";
-  sha512.doc = "11fbaa0ab8f3018cb75db7110511f5353c87d585871938ee3909f193cd90d9499223d177a39f109ea4d124e168720f3aa9e0b12c52bc8d0a2911ebc26631fce2";
+  sha512.run = "0721c35d3d8624389fd93e92424adbc1edcdd45cd2a542729a0f286dc0b41c67482ea26065c124aebc87c1264e363f9d75a3294609abc0c17303527b4bc48bc5";
+  sha512.doc = "7ac0f61c1f0bd90e0a974e4ba3233db9aa7a4dc3b2a77c2e18c9c2f534f9e3d748fd7aec30b8fc96b60e6ca46827c56ce78d91dbe691c70caa02d784f93be5e9";
   hasRunfiles = true;
   version = "0.1";
 };
 "memoir" = {
   stripPrefix = 0;
-  sha512.run = "df69b6cbbd77f00000bf2b29e741bd5c630877514a9216c2afa5d9d8f74c821d3c49e0e2a33c8a1396c420b83676f7121b8f4b6cd31df159d7703e5ccc3e2c54";
-  sha512.doc = "582463e5cb2fa60ca83bedb42574a63f09b5fc2c9610ae504c17b188ee51eeeb38eca9f9a0162d24b5d132e114bdf2ccd567b7f5421382ca3166bfb1b73e178a";
-  sha512.source = "76696043dbcd449714b0b57bf2abaf569b6d6868124b06117d70bab10ce2428c3f5d619dc5bbe42c73eb00a39a40c20710a21f486f3bca0100e340de361cd38e";
+  sha512.run = "f73ce2c562322506d2a1ed7ed498810f4526ad68c9ccec386dabb8546c52c2dbad5ff3360968efcdf5d1c30d60841adb7de9f8cc27793d6eb5598ddee0493a3e";
+  sha512.doc = "5143c30bd7622a5696b1bb47515071694d39131bcd777b524a1b0d7d4aac8245581c28e498dad3f3c96d33a777b0a9c89a900b87eccf882d68ebc1698b72c319";
+  sha512.source = "76d37aa77c153cbadb5a8a86be43dd31615a753bfc1039ba99ace64b38f20e4b9c24457f32d560a4a9a72ba5d85421f23fdd112318b24f519cd771e3988d891c";
   hasRunfiles = true;
-  version = "3.7f";
+  version = "3.7g";
 };
 "memory" = {
   stripPrefix = 0;
-  sha512.run = "a61db93b181f721a06ca9e29f55851d93f3b5624f14f047f8366cfde7dd660a865270784c6c1fe4cc96afb7e788d9568b2f9c531b888fd127d2b4c0570203426";
-  sha512.doc = "0de03e5080f3f5b1ee5f859212f471940989c5a529e881a1d7f918f94c71fc93ce922c1f022e8c9c2706bf26cb0b64de9df3eb2f4c993d94e140de1aa6e3704e";
-  sha512.source = "5cbe7278c037cab87832d1ba2b653fc882f914df4cf6d549e80b41feaaae142df91a5a4e6013b40161c070d4586b632408ed7c4bbfee1d61919ddf7bdd27217a";
+  sha512.run = "68a65db37e578a3f4f9c52f0329f23c7562a4095b6cea93a8f20c51af92d960a5634e7891ccd9eccfa303d8a2a9f16a62618eea33d389e0cefc1e90e1acfb8e2";
+  sha512.doc = "1dc997363d0702444ccc0f50e77189af8ef461bb5a4198a91ddd13ec7c66d5bd4ffd1888c844dacbcb8c364130b685a15cda472dee0e50b9af75102202c9ee7b";
+  sha512.source = "9059227e17871ce2376659b0b7f0ed295ff9ae9a6d3a771c6e9898e8dad40bb60b6846ab3688ea42a0c5ab6c4d1dc5eb1a426cf2bcad56a3fd78132f7fb23d77";
   hasRunfiles = true;
   version = "1.2";
 };
 "mendex-doc" = {
   stripPrefix = 0;
-  sha512.run = "394f11e7f87b1cb519130df9c2b2ec49e11dd9a84c0286490695ac2fabc5a44cccd2f07f46559e9be5e770b4e9f250c49c65248bbddb3e46e8146d63da36e2a9";
-  sha512.doc = "1874f1a2121434f4ede26a1a603134f70ffb822acf7cea858ceb5fc46298d44f80734ed49dda3c59964977156090d7e518a4e8e86cc34bcc15b015e50fd6face";
+  sha512.run = "2fc6a76cb570ab2d101ca2f94ec66c24a7a43b4ee3cb88fddf35479a40a0454aa42f1523723418f931dea29140a06d8f1b884664b4cd897ba570f66583a4b4fa";
+  sha512.doc = "c07ba31bef9f3e19b7e74343e8afa93fc86cdbbec0ac516506f0d755e43fa1ad8c03d22f08221814674441a34940a4c8adfe02422dbb367f949c97aabdf79686";
 };
 "mensa-tex" = {
   stripPrefix = 0;
-  sha512.run = "3919e6d48a434695817d4600b28f42fa7a464605b1642610c00655b197f9bae6a0893a3d3b5778df11a545db5a7bed2bbb9486de3f98538285d2255f64c821eb";
-  sha512.doc = "e948b102579980da9b5eadd695e6700f028346886ece74c2a45e26401cad4104f494561cf1d462cd7d24d96e349c7bb23936a3d5cdee0565121c2bbb29bf3442";
+  sha512.run = "2555ad3735cbde99945a4836257f0a00d24042df33855f54c978490dbc4d60e7847d0f049120c8be038d7b3eb82c1f7c231ab11e9e78b7edea478cc1238cbc72";
+  sha512.doc = "6d8a28586b50486c6e0627ca0a08b2263164e429b6acfd56ddace0706ebd6f1b631eb2633d85cd0fd49e234a65d8fdcb34225335ac97dd9528cddb8878fd06ea";
   hasRunfiles = true;
 };
 "mentis" = {
   stripPrefix = 0;
-  sha512.run = "b1f6a7ccc1cfe206bce1c331e9e0840b4957ede52fd0332db6fff9208ebaf4281284b96101cff6eed9f318432264f02a95cc5c29d33fc9abb124d08ae1067fa8";
-  sha512.doc = "865d972072e0824dc68120aaafd51c7c59ab021ea425ef2bdfc6ef59a29c41942a4320cf9ede5edf930d463c18dc1a51e19c8f38306400210070f36a533314a8";
-  sha512.source = "59f1a8c1cac763a4afefbd0fb7ca0c248bdddf06ffafe7bfee08edc67694accdd5e460162389ca9331cc008924115e9831cc328551f5646a42e21495eaf24abf";
+  sha512.run = "0e553bcd4a2a46ab7c75f01948d137ec13dfbb4b4aa9e2825292ad4075a093a81bd92a2ea6fa48a7d9c7fb9e9f11a820a3213a63ce70fa12fa0ae8491cdf20b4";
+  sha512.doc = "f5e6dc8af56d7d31c757c9da79716e862047d8ea9cf19fa43a153a97a37bc835e8f5edd1f62c8ae3871026c9e55db221df574e1857f6e50d84c050d9560d6da4";
+  sha512.source = "6f319e1b35abbe62baa2e8c67491df37e452074d88f99ea5824bbf9527618e0bb0993991112addad33c8edb96cb4f770e26f5b9ce5ca33f85d4c4ae5ff7582c0";
   hasRunfiles = true;
   version = "1.5";
 };
 "menu" = {
   stripPrefix = 0;
-  sha512.run = "35a89bf06bac9ba0e0280fe5c020e9ec435b588e4bba3bedb33977f8374d11b30cb9cb9b27d74823446b2b2f8fc7a5b27448cb147b509ee405f89c06e4b9b4e0";
-  sha512.doc = "0764cbe5c8b4730589b3e71ecbf1c7550155fa8c9128a85179f5563d0912902d207aac50bef7140bdd8eb89aee161f8fb07681144631448063a7d988d7233f65";
-  sha512.source = "8b93fb2caf33fd57d59fac5021e0f593a56c7eb41b52709b8fce484ae8e146045db3d6aa819612759582b7ed7ba2cb18f87d19c90f07ef929e7a5a712947a8ba";
+  sha512.run = "c3b4fe9603bce6d5d591c7410c5a75eca4fa50dc94094b153ee2ccb9178b9a69aa57df587282ce94d59006e26d1d10316df70771be454d70204a9bdbf4b01578";
+  sha512.doc = "7ce4393b23d24b46101a289b9cd97753a0e8a5e859243c075dc0d7c72acf9c9b12a1a40f4868823cec960b59eae4c1094780a03c7d7d9825a5ade44333e20b74";
+  sha512.source = "dc9405634cee54b7eb5ed1494083685e06369e8d96e53bf1160c1f8975198557b8a2603e0f45d2c43ad39774d394889522e166b4696f926d2dec1c7b0d84e91e";
   hasRunfiles = true;
   version = "0.994";
 };
 "menukeys" = {
   stripPrefix = 0;
-  sha512.run = "d6144f029852f6810e81fe661cdaed46eb4b1e64ae273b139412f6db75034f0ba264463f77a77a1b0d08e34d85c2a848a18b7be8e1ee30111b7962168967d6df";
-  sha512.doc = "ffc091909fe815c6017b60eef351413e59e163b869f30b718c0890f495eed4d040d9f05697f6cb67416768d273635429d0413dfbd7a9b058a18a254891970026";
-  sha512.source = "57b0c2c772cc0aacf6dfc8050a6e0a39f0e67dd2d435a64ecd2bba5c73d67a47efb399cefe6b826b2e7def58d6688544efcca3c0540211addf22df8b61f29824";
+  sha512.run = "c35c3bf59fc1a1f89b4457e9196bd12bf918727e707ec86cea1bd574b0e43587ab43725ab1819e64eff5228553bc252b11e53a1658cc14f4c05b7dd5d05ead72";
+  sha512.doc = "2deb55916ca0403be7038fb5bb3d564cf33a26f6e867e52652524cb7f04b2df7b6d1d8a02cb8889cf3753b89e2d3437fbc842af594a5932b9494134aeba8b1f6";
+  sha512.source = "afbdf9b30062d2d20b766b42597be80cae80daf9f8fffdc70ac47feb5ea6af266eb9e77397006fb580e87739070b76ee09d373e9f757523f8badeb1832605072";
   hasRunfiles = true;
   version = "1.5";
 };
 "merriweather" = {
   stripPrefix = 0;
-  sha512.run = "067b1d991046a806940b15c63146b8b8128b4de620c39af5096e0a537d12deb1578df6a25087782e531f556bed4c75befd3bcdd7d7fbe07fc844070cebd6b0d9";
-  sha512.doc = "0cca2fe2ab8fead4d8c29fe03f873c4c39ce9ab950838f7702882e31932c61c0ae52acdc1bb364b14b9ac77a3b6bd911df8914cb0cc9a27f240b48a6853ca413";
+  sha512.run = "2b1fdad9a066711a038865dae15036f709b5b9e08b9ef077e140d7b608c0075e3c5a07f59a367f7a3c87b42074e7160637a235fffc27e2a57ac9d350183f6ef3";
+  sha512.doc = "f1c2f6c2edc1618b8d0e86f3e404c5783f3021438724e4011fac5af7a0290bc326b791589505ba7a88f8f592e215f36d34142559575f8b940af1ec63995d70ab";
   hasRunfiles = true;
 };
 "metafont" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "122f6bfd4cad948a0f298a27409fdc74863922c6289dd70fbd1d6dfeb1a8df833f5cd5aaa1d768512d4d259532847bac24cde377c51f627caa986d15192e249c";
-  sha512.doc = "ea65f23d5a5ad588926057ed9e50ca3891072c04c59480a498b82c8110dba1e64c215af5f008646e2fedcfc6a2e35d5f6268a6ddf969b80bc23ef2715714cf86";
+  sha512.run = "46ab9e77136fe7680143d20296b0a3f80188f3bf3f03d5642c32edcc6b286b3161e282f281e386977db4ef228035fa8f73beb7f7344cbe51edbf0be6afba5def";
+  sha512.doc = "1124acbe6c8b85728e70a67c65fca671a855aa3c3bee4e37d64c180b06be582e6fba7eee3c1c2c3263f71159144b514c5e5166f18e5228b0084a7417807f7936";
   hasRunfiles = true;
   version = "2.7182818";
 };
 "metafont-beginners" = {
   stripPrefix = 0;
-  sha512.run = "bfd06624cdb18438a409a7d517cece4269e51dfbd829f471b7884d1dbb641e37deb180bbdf4b52a77e5ff770f03e7870f526a7d0fd897f9f2928d03ae5f8b911";
-  sha512.doc = "8826fd514b8a81c7f73ffed7b6da5020a38cb14fe1b8865c07733b071a63f0876b8c5d64b3fe09b1cd6130498f250c4b4e6aac438a433e09dde1a9cdb4db1e3d";
+  sha512.run = "3e8f0d1331679de6f178376ff3fb282d59a54d2cb9b64778a0e0708bbf6d2dad859c6c543f7b2dc7d971a92c3c6012f9c07244bda8f5965d2f380a8eb2cba90a";
+  sha512.doc = "cf6fd311d6e7114c3848f722043ee53df3a39296901b028775dac52cac56de2683a736b0c3f6fb24150a4efb1effadc79b3621d27ea11c57983a3e02bcbb3a8e";
 };
 "metago" = {
   stripPrefix = 0;
-  sha512.run = "8897793fde3c229551407ac1456ac1e5ba9e1fddd930d1ae5d818e5bf26c35af047bfcaeb8eddd9ab860a4444888a35552f5921d5691de91999fff83ebf9f6ec";
-  sha512.doc = "931807fbd5b930890eea30e0abd9cd00306cbc7f24769f142c69e3fc6299f51b0fc8e5de75d6be3c071c23a6989966922b6a147e8cb969b107d2c78d13d4983f";
+  sha512.run = "04f6d94dc0109d70ff13b7e1d2a485071aa3c33d5875eed14e3c6aedd42dc9e14913c764935c37c09ede377f7b766654fc8c1a9465c98551d6a47017bdd0f9b0";
+  sha512.doc = "aa6e6378b89c8f0c13e8adcb2fa915cda391831531ca86f99cb684617a4abc8365454c4a0bc47018fb528291f6c8fea5aab8e942db76abda04e34aace8b60655";
   hasRunfiles = true;
   version = "0.9";
 };
 "metalogo" = {
   stripPrefix = 0;
-  sha512.run = "0bd5f149186d4732812bf512f0a3118e0da1bde4c0f0c3ad2eea342515eb82404655d06ccfa275bfb8efae8766643cdbe12688633453966065a8febc595f7baa";
-  sha512.doc = "93ce4b3508dcb52fc3f6cec341c3e64c43f42f6e5fb9ab1d285a881f864842ba09aa7e96c7107b3a83aac09b38d538bfde20c59c8db6f3fc18ca4f7703ec9b43";
-  sha512.source = "255c6cf2c8a551937e8c5af380156b3a6e17d133eaa7d595c616ce77c352944c7e71e47671086ad887ca02f067a897fbc991c1c0329c0743e0116573c19de97d";
+  sha512.run = "c5f4aac2b65663f2062484523fba524e1436f3b4db244e30bfbf9bab47750f32b7c180158f6b9d8f7f5c5185ab199be827a5fed4830dcbd9f7ab6e18d8cf12f1";
+  sha512.doc = "a2ac81231535af36d216254cfd1270ed5dfa99e2c081f2813b48dc907e28d98f8c4a4f22e1e5464bc81083d9d8969db0722a58bd7f53aa719918c3b2beb77dfd";
+  sha512.source = "d26b1e43cc5d2b1947c5c44b2b6d8808bea1d24cb78e60fe28fc0af61ade02f166311001634596cb3eecfc6b3351f3822a970baf5ede0f0650341edd0c0352a6";
   hasRunfiles = true;
   version = "0.12";
 };
 "metaobj" = {
   stripPrefix = 0;
-  sha512.run = "f5db6bade446984e13aefe15c63a8ee850c47786f33f8be24e4e88c240af4dd59b994aacced37181f6cf236a02731a6df7f4de37e7af90285135a48ad5f9814e";
-  sha512.doc = "fefb4ef2c677e834bce9abc50b731530314dec2c924d96c11462af8b038953a8d348391511918ef6ac8fef8794692579f365e5d80d9513651f208a2d5b583071";
+  sha512.run = "9798325379f5fa26d333eeafa7b1452eb1b7c1c14990a05db57df71df859deb9e40d8e843554a7ad4b4f4fbab867be6bef28bd6ac669eaddff5e8ef91e29da6e";
+  sha512.doc = "f7cc7bfbbf6969b1c4827ad2d42d64ebb2033c242821ec839dc568d283fd246500c53549c58cdf05e1f785712f4fbd8c8b075ec42b84a5c83b9006b32cfacf14";
   hasRunfiles = true;
   version = "0.93";
 };
 "metaplot" = {
   stripPrefix = 0;
-  sha512.run = "3e3b9e1022306970f6be08e4bb019afaa7547db7f86376b50d23d28927779b4ef591bd6a544de1a6376837d797e5354dffa923a17ccf54db112f2d23756d1855";
-  sha512.doc = "10622218efec1942a1605bad6c9b7673035cec5412b52be950a8977115332cc04679c40dc2e20fdfd56b13913ccb68ffd5b948e4903c53b109b0f39bfabc5593";
+  sha512.run = "4707c640fe04df1a5ada23ded8edc6ff20fd056094f98b273227b62aae4d360b53f04113c4468644bb1abd0f7e975b3950ccc4075d5010b9f3dbc8afb5d40315";
+  sha512.doc = "aa0252bc713ec8f428ede4e6602d040f066729c1ef42713d95c881bd13f82667325afef312eb057f9f8c9d3635a40c38072c18fde3cc190722ac4324a2595de6";
   hasRunfiles = true;
   version = "0.91";
 };
 "metapost" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "a597bf82aaaa063d2b569dccab10f46dc60714ef4ebbb57eaef543594f11976b4b1137a730c2cc2ae1bc5d8e1e9ac2490af1ab094f9bb87a6f23e7b681f67078";
-  sha512.doc = "79e016864a23b8b40f327bb1e7072b060e1f0a3516c694e95cb9a5d162542a8716d837179fac524d18490a4bf76be02fb5cca346c190369bb0fbf928e319275a";
+  sha512.run = "55ac785952785d53961123e7b257d98438c26a73096cfebadc99aba7ae0230712d70d7c65ef6622c9ed8e542154e2a96c3e6959dd9e9351007a71cebb9a5c997";
+  sha512.doc = "df9294e647f4dd7221eed00f3932233ecd379f5189430a2d30e4825d7435449c56809ff6e298edbe75ebaeb1ed9759f4bc6bb5d030e5896c1f331135e50c25c2";
   hasRunfiles = true;
 };
 "metapost-examples" = {
   stripPrefix = 0;
-  sha512.run = "4239020ddd1182a083fc616b78cb32e447f78fdaaa0c16b78a3457a764365404c07d03ae37970351ae3b3af934da7e9d3c935833d97844d65470a482b3b00725";
-  sha512.doc = "cffef78020a5d9ccf521ad49dd0345a23b6593a634d2a5fc2c3369af426d00ea6920893bfdac87d8f2fde7c463ab73fa4d664ace8e82a9d88e672e47d4847fdd";
+  sha512.run = "8edc3fd25c5911a5e752640137c881f42ff4cf10ab005e51520033e5b7e1467758f02a4b8e4ee9c533d32f83516e1b4d7a75f574d21c2dbdbcdba509de1168ff";
+  sha512.doc = "c6327735520b9421abe26629bccd83d1b034afb4841954e090df8f33a24a27589ee82a57b4353830216c01ccce8d71c6fa2789fb38402cff4a4e02a0a8a9884f";
 };
 "metatex" = {
   stripPrefix = 0;
-  sha512.run = "896bfda68475f6990552e52c15bcb87ff9e628c866a26629e00eecb8147757af86d55a87e5796f388dc2a36ffd2d7066f31a51fcfb687081050df54676f2c3c7";
-  sha512.doc = "8c40e772ec12bacebad8e578d9bee3cdcea1d4f2f05402afeee8d44032af7827d6df5b4b1a527914c4564c4f4390c8f533b9045c095b4fe77d0565cb9ce3bb0b";
+  sha512.run = "251dfa4a2cbfe7841ffc0e38a2b9d2f795bf29d21d1c6b3ef647a55574852eb486b95a371a359e644a91c3dcc4de0e98337fa6f13af8af54406ec399511c6f7f";
+  sha512.doc = "c0360784e8eea3d0d975ae3fe5092efeff5b5d44bb80cb76bf9a9a4aca19e00b8e0574d79e2fe223fa591e6f26e4570a6f15459c857bcc3ac11445064ea89b03";
   hasRunfiles = true;
   version = "1.1";
 };
 "metatype1" = {
   stripPrefix = 0;
-  sha512.run = "e36332e13230b47eb0d567acbc1cfa70460fb08af6b7befe0b2fbcfd899b7252b99a9cdcf6054e479fd839579fdaf45b4dfd646b719521428dadc36ed9c52827";
-  sha512.source = "10ece3e66f6c5992b6b0e0a460c749a6e4fe8c492bbfed6a61ea1037511616be65a2dbadcd3a1ee1f3b8582097ef2252f2e7b76c0a58ea250e9f912be582fdfb";
+  sha512.run = "c5c76791ae50cda15e03aaec81f496b533a950492321f79cd86e9277d1e94ae6ecce90ed1709ebb8957173021e71e9b25a20b26c2976b231622f76d00f5d339e";
+  sha512.source = "ceeb7f5bb1b3a4b6ba1b6a04ba0ad4c84ddfe222ec037964671baedceaa5777e31f08fd3451fb954a3d6e2d2f03b02f907102b58eabe785e6846015acb01b5b7";
   version = "0.56";
 };
 "metauml" = {
   stripPrefix = 0;
-  sha512.run = "cd1bd58d30a2fb87481ea92d85711c37e4b864a9a985902623a0e60acae89f52a6efaa55da3c8e7b02f00bd99a04bf6b0b257cbc8fb5db53e26f809d5f9a817a";
-  sha512.doc = "cf175d8db6697f0ddfda9d57c4d68c60ab3c13ac0614c28f163aeb4608ed5430ad674b7c740bbff5ccd675e77edf5ddc3a793279ba1346fe982ff96ed630582e";
+  sha512.run = "28ea363f7c76ab5157ea103b5caf65a54dc9d337b15bc70709a69eefe5381b0e4b7b8e5b7b1b7ba110d3e2334e708ef21f1ae85a56879c170ea4ba0f4c4f6fdb";
+  sha512.doc = "06cfa004c232109b957774d025e24e971b79523b98673a58da2f8ed425e7f4bd3471bcfbc277cb46481edc705da44c9c62d98324f45bc25e4327c918c0f7f83c";
   hasRunfiles = true;
   version = "0.2.5";
 };
 "method" = {
   stripPrefix = 0;
-  sha512.run = "7ba78f02af8985fb633dd3eeca51c8325648def29afb074684cfbc9cf576f00e1b42d8b3cde6859b4841b91be3b2e2421c1b2c748690ef490a977b25f511f12c";
-  sha512.doc = "d4ad7c53cf9dd6cec7732aa21aee3567156c0dbd9deae60a55d5a229bf90dd651d4f65293426f430452a106aba4cdf2f410e037b149b3e9397089b77ff383673";
-  sha512.source = "fd454cfab03b0ef8c5b1654dddb57de768948699580a5b023c2849b36660d15d2036a7be57015edb5b57671b60fbeadc71feec09585dae8d29c1b16c6a908495";
+  sha512.run = "269bcbaffda5fdb12b2aeba150acd7b62c961aca528ae87bb0207a1bd887edefe4d29122fef3db87453bdd5b3c2a9e063fb53991499b2e5f199c1530a7d56d32";
+  sha512.doc = "8649910b86dcea1424f687e952661da4faf086ebf451bf1b5c9b409d54c26a040a11bd90025e27f4f6c28c13e71f772ec89ffb863b5aa3dbffcdc833f58ee324";
+  sha512.source = "30f9bb31384a9e5939ab3990eea086acba20d247e17684dfd58075673fdcb6659b8516bcab5170c6671cb45c69283a9289288aa61b1cbf0b73bf4f237eae0ed8";
   hasRunfiles = true;
   version = "2.0b";
 };
 "metre" = {
   stripPrefix = 0;
-  sha512.run = "1b866ee77feb3bdf7570fe642ba637915f650f43a6584fdeb24d2a2d92e2ebaf0bde8ccb53b4120de10e72f92c505c2a2e3e1827d5caad2d9ab72584ef53ce86";
-  sha512.doc = "48ee19cbbc6276786e3b29597905b7f4c9dcb43c47e6e76f2021fc218949a9c8d2519d4e7980e1a49a9e73c6837823aab11da8cb14182ead0fc8dec199237254";
-  sha512.source = "cd7fbcbc25f67c0abb97fed983982ec45d8f29c380712ec0adffb4a8eb26bc7b3a0107ab4b3375388ec32a00f0700ea25a7e090780b2e4ea21f61c4c3add6735";
+  sha512.run = "cec7a41408a788ee7aa3c81c3c1ca200f5c0247b58c301346dcdb8ea36984925eebdb90d74b8934f201f73da84ebc01b0696484933da5ae88ae50f88df0dd111";
+  sha512.doc = "598b7f9164f710f401424dc5e1dcf348bccefce8c433518645dcf01cf043cb2c869de88ee1a9c5a86afcbf18bdc283cb9ed8a168034263569290b66ac0677100";
+  sha512.source = "94e12ebf022a6d8a863ece139482210ea38483104887accf7d3a02fa201b4b575f3bd6fc9df1d096ae170fdfd0395098700392b6883a9fb9d87788d08a105a37";
   hasRunfiles = true;
   version = "1.0";
 };
 "metrix" = {
   stripPrefix = 0;
-  sha512.run = "bbe715800987a7c569ff2387b446bcb1868a1871ad9931ec6f40988efc4124f4f30fff3ea3c2702e3df325b370ad815fa5258eb0eeb747a0e0108138f4dfe2f8";
-  sha512.doc = "b3a419ab4d493a5ff3b1383089c58c89c64cb09bc3c805cd5a1c25bdd290b26d3519fa57a6a0893f2b3d27b4253ef1521de857feb091ede4a147ceda09225438";
-  sha512.source = "1b8ebe8454795671857c9a56b28d42d6c37e700e438d65679af80b1220f3cb3e7433f45b28a29135750e9f76bb07c15f00501d771a8ff4b977b91715472a0b09";
+  sha512.run = "329c293873badb614f53dc7a6ae410c9efcfc755627aa25df7143c69326d2b659de969041a076b4626a7cf3b7e0133fe97af79bbf6355af009a8165f2df1a8fe";
+  sha512.doc = "26786534759fae6e44302dada94b13f5778f2076e7fb475c590853a33c731a095bb5d49de6865ea54d36d07f768d99a8e5fb2689b00cd9a1259f73604b231100";
+  sha512.source = "2259286aca488723bd44397a078989baa15cba633e62156ef8c14ede21d9192f1c354e5f7f2a9694407710616ff98daf17a4a8e84992087954385df0291ba696";
   hasRunfiles = true;
   version = "1.3";
 };
@@ -17490,273 +17959,280 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."enctex" = tl."enctex";
   deps."utf8mex" = tl."utf8mex";
-  sha512.run = "821b69856222623e14e90625eaa3a88570631e23d3e1a4a52f639344cd6095c8ce8b2a5e05b9e3f8904a562552b3f899d0132d20a319d9431fca629b5b495e56";
-  sha512.doc = "fe474aa5581870855648989151b513775e67e8a6e2e418d7b505b0fc825f6530e6cb19a5d0950893b9d02056413d1cf47f61540a67dceddc168b6284804e2c5e";
-  sha512.source = "ec915189a4999a5fcaa73ff4c55f0db6d34ddfd34986256b2bbcf02ba1656c4f4021103b6bff73b6f3afd64ddf5c6f6aaae1d14d7c3628b7c0fdea32ec8ba7aa";
+  sha512.run = "7e0fc7d9577412e69adc243d1286d830fb0182348434d51dc61534d2d262e9389ee56309278e1d4f96915dec05b15c0dff6b021706c8ad8c1546707053c53c14";
+  sha512.doc = "61f921bbca7b5074f5fd32658016779a347881dd91b2e278c1e0f838de9d2e4944dd3675f839cfefebf3f0b76f91c4c17153afc8c64ca739a1496675ba5d8d2d";
+  sha512.source = "5486bf0a72cfb08b5b71b87308775d65df1cde56776ad254abd9a2f42e41b070dfc0460a607138c994e2c5b70e73339a9ffd95b422e0f5c69a9fdfc3d737d316";
   hasRunfiles = true;
   version = "1.05";
 };
 "mf2pt1" = {
-  sha512.run = "9b537bb2163b1c9cff8f8a710e4e292a962b6e13c5c26e27547bcdf3a8fbc4ccf949b66b3cfd89969a07a487908d69619e0d46e63c60671726a272d1c6c0df0d";
-  sha512.doc = "e582a6ab811bfc4cebfbc647076cca17adf4468c806618b50791e9bb01101c610b8d2ea20dfaee373d1e9fa7fa9b07d0b01c09aadbc60831858144c679a6b9da";
+  sha512.run = "c1865afab20a1fdf52fff4703f13de9df20a349e5ede70b8b7fb45a0a3680c7acdd024cd81d23d30baf5be8ee4e7a4e4f2d2b8a9543670f85ab9d4b7568f5acd";
+  sha512.doc = "68e4c8e5105503cedc918c4a221c36e8018378cae92f0ff62f372790385d700ed7abe617b4d8976471ad30720b59597856f6552ad2aee74e6790c4a332ca481f";
   hasRunfiles = true;
   version = "2.5a";
 };
 "mfirstuc" = {
   stripPrefix = 0;
-  sha512.run = "658d47067482c77f383ee7a67d9e86825e89de5d35b9224786308535a7f0abb4f8260c6ef0d962a529b7f84cd133f6e753c004b907ee33fa5144ef609adfe0ff";
-  sha512.doc = "1653b9f2a06597c2820905189cc9d165d553dc528c1223507e9d05371bda74fc8fb76de7370132fb3fdca076a98e53c01f9e3abcc584081b4f9dd2c549c88942";
-  sha512.source = "a498ddc4e71f1c22f6da02825f0f4ebc0d36dc9baa4503bce63d2bc82c8a4e3ba6aea29442c1f24f1f4970f8187c54537af1387c0562e019600f7bdcb434c96a";
+  sha512.run = "905fd873b7e130270da05265ca59092a6cbdf1ea8c3ddd444b1622251629781858eae18abe6a5abf4f793d0d8d60d941cab03964258bd3a5d6e94c0fe4d736c4";
+  sha512.doc = "41f1e68878866fa567acb407b71f49336ed50b05bb6260b3169c35c32e94844e6d3739d34451b9be8b1207e90591eb02c6c2679ec9aa43e262df26589d4c9c39";
+  sha512.source = "cc0aad40077ea9a88c7a78aed63433879b7d472f37658efcfff3c17f0f2d0f1e250808843a5bc08b50442a1f361741e2f8cd79bd1cc526a3e56079188d8031c8";
   hasRunfiles = true;
   version = "2.06";
 };
 "mflogo" = {
   stripPrefix = 0;
-  sha512.run = "0c1e7b42cd1149acdb1f2ff916faa6bd4146db358773833de07f2707fbe45ea64dd17f2e98f2c7d03e92e246aff1287878de8ef620b3e392319ee6846b5c1990";
-  sha512.doc = "75e1a699f940b2c8cd7c9dab0bc2a5d168dbccf029e1330bf3a60d1e33640b4d739f1c31b5dac863f5e95ed12c5dfe4a62a7d734ec354662e5f2e4b30ef5182a";
-  sha512.source = "cc795af094f3e31b8fde5499e58e771c1676e88d4263eb746a57295b5c7ae3f7fd551dd020d85c06824c9a5ff7e069041ac0a053fcb4faa2c8aa80393a1d058d";
+  sha512.run = "1c8418186762593c91bbdec30b9f5b8705e4cf4dfbdd01c7f0e20d70b9c6717bc099eb6add34679c8a9e44c72dd15b7319fed4031deabcf2c3716fd242cd7c87";
+  sha512.doc = "0d94bad751d9c78cf5cbabee8b29a6f43bc96f4ecea82d47ff2f1392b923b1ca2fd0a55cabed63e2cc3e8ac1d6e76fd2d992335c849b699819bd4a395db6e107";
+  sha512.source = "d685801dbe3720b8e497d2d20c6a3a87448d3df571f6769cb58552bb983a41458de3631b845a0560630605d22407bb44a932c8ff4b75a2bdcb7596e121570b63";
   hasRunfiles = true;
   version = "2.0";
 };
 "mflogo-font" = {
   stripPrefix = 0;
-  sha512.run = "61f27199ff1f80f00e624b330f2e14e3e2d02ad35d12b092e33ab3bdf3389f1ea736952d87393440c7dc0433824c13b9d12736df7cee3124f1f61cef3ecb8ff0";
-  sha512.doc = "c0f7b1b0ede2f490bffd9a8c575611e934cd369bc4977ccacf5524185fb330809fe5df90d74779eb7064a753fb251f3504f4b94d0ace5afdfd2725a80c1043c6";
+  sha512.run = "ed66d934054c3b7262951fe261b8f0189668e1b5a38a3c85190d761322cd54201b627d255211cf09e14b8b3951d92bc1869013ca4269402ebda63f50db7644c7";
+  sha512.doc = "26aa14f700be84e211a06f11a3b6b8f213163e57146f0199798f92c969134c808d50ff00ab9bf4108be2feaa6ab6ed7ed61866e521d40a8ac7b8e4ee5000dc8f";
   hasRunfiles = true;
   version = "1.002";
 };
 "mflua" = {
   deps."metafont" = tl."metafont";
   deps."luatex" = tl."luatex";
-  sha512.run = "58a3da81c20c1d4c8f05938d1bd3f13a524cedf2ec9edd4b630f5c4f70e9ce828c0140f106e920b8992e86afca59d410017d607af85bd83ee6a31987519bbd48";
+  sha512.run = "663280aaf9bf9e1a935a3ecbaa7e37bab4135bb59fd0043fd421c6483aaf3849c4591b66f0e4f1ad4e1fa15212854c950726e71ac5fbca6435d588f94bd08d0c";
   hasRunfiles = true;
 };
 "mfnfss" = {
   stripPrefix = 0;
-  sha512.run = "efd530690932d81350e42b29e8e52a52587a8a7423bc915036210dd546652a094dd1f44c1c3b34e2589c1fb2220bab8102f68f0d0d1c63859b2850effba1c319";
-  sha512.doc = "02684519ce881ea18e6e956d1460fde5c6b9a07011018fcf449b0f77b3970cc0cc99e45f5d2bb23675679b326cde619e19d2169f1ccd3157085b62feadac95ef";
-  sha512.source = "daaece2c81fabf63fbe321e0bec63219b407173907d0b39d208b1169ba307a34a8b4777f8922df5435bb5876b582edbbda04159c2532a2b95a2ed0677376c65d";
+  sha512.run = "cbe438e051415adcba7c17aa2ab75267b64cb5c9e7af0a25c1d87c228e9e1ff2e8f302a57acf1c1ce4b18d31aa589079a731bfc09f8d46d81cc1cb030b9496b1";
+  sha512.doc = "75700dff90fbe52e3ce98a063ae1000da099e7a7acce29da30880b8b92e6b4b82271e2686e85bfd8d36dbf99718735b36abcb04eb50d7bbc94eb3bbaa576359a";
+  sha512.source = "efc94553641acc572b9f7f6d5ce77ec65971144cb0f05dff4cac3337e3bd8f2d23fcf18e0921a1b801ce5b854b1e79665b9124876e27ae7d1ed2c7fa77bb9cd0";
   hasRunfiles = true;
 };
 "mfpic" = {
   stripPrefix = 0;
-  sha512.run = "f85cf28b98281073fb633eafe08b4ada4b7d389a4ceff85ab172de64371b4a7f47ce9e2b26e60ce3a9a409ff49b4f037a3198237ce699d111d7ee1a81a045926";
-  sha512.doc = "2a33278cabcfac6293305ff447ddd7fda9af9b0fa13828e88b852abdb5fdf21fd2e4648e88fee39a6f72377523e1f0e97f9afd242c3a57c0f8ee3ec94ad0ef81";
-  sha512.source = "00ba89fa68036f0baac597ba6b0ba7ed386f37ee8a5273ea62f4e93092bd7474e7499f9072a29e7abde8ec4112a96e199581f34e9b073c76c11a224581f3d1be";
+  sha512.run = "d3d13e105d5bfcff4960d8ba677923d1affd911c096ac786e5cd0860c2be7ec5b92c3b5c6def1f3e99d3b3f0de74710dbaca954a3f8d4052f2c7c42b9933078a";
+  sha512.doc = "0e5c81431f6881e78c34165eff73eefd7c8bc7a221bcb9b7727971f5ce1aee7260fd448070797eaf6831d4690c83e1f55ef4d4c214d408eb71af24eacaa877df";
+  sha512.source = "50035d8887f7084eafd0c70c18e5bdf8ca7652d2e59ad41b63e6dbf469ea2005abcbb12c475983dddc95065eb5b5ef29f11f3703d8ac622bd75c9a913d4c503b";
   hasRunfiles = true;
   version = "1.10";
 };
 "mfpic4ode" = {
   stripPrefix = 0;
-  sha512.run = "24c1954aae6086239b48c601b390e16dc004fef5c49c7d997b0348b0c7ceb9940f9c5be2fe3a7eb47b11782d7dc2beb04c0052fe07fbe8d374b8e0636bf714c2";
-  sha512.doc = "935df65f8a695e18de722320c005947ea85da19eb80031c4f91dd7ae421a5640d11658e2a5a0efde9e71b773fb4dc7cf4f68d3053edc7dc049a34574c73cb0de";
-  sha512.source = "0e0b2ce6dda12a3c75faeef0914816f9659a09a8864233515da22fb2993bb2827dd9995dfa67b3c5cb187140410e2db96897b2bcff34c8ccac7c0fb8d193d855";
+  sha512.run = "de430b6ac60c0d106cb23e331352ca8f5f550c4f5ecef19a972c8ae03b7f8b614c9dbfa1dcbd8d0921c8c92de545ffa62305cb84014bc7a09f7a139515fddbba";
+  sha512.doc = "9517a39fcf7abad9fc95b83db90702930b8b6a4159af1dd916af4aae88e1bd6a507c1975476778c3f97fa844b4fde3b924378e3942e041ed500e0fe9de62bc0f";
+  sha512.source = "b41d79fca5279456ab01ddf4f7f7cf498b27d69f53aeff0afc221d39ba800a56e5f6112c023ea2b3a8a40140eb39dc6c751ea1599fb583cc863b78c0288bf4c6";
   hasRunfiles = true;
   version = "0.4";
 };
 "mftinc" = {
   stripPrefix = 0;
-  sha512.run = "ec7cbd2e5bce2bd5e7556cf52962cba40ea695970f50865ac7063e6193fb47e6effd5eaef248ee981d0bec272637015e58c1b3bcaa2bd556b97759f380292caf";
-  sha512.doc = "21252ead484b3ff0e9023b38c7815ac3b191148796172a567741345388ada5279019be064d04a2dc21cf53b127c16a01ad007c03cdb51cc4fb80d31c9ac5fb4a";
-  sha512.source = "568205c4d581ef47ec3c12d14e00113c1947dc6b024766237abd0e97a5927f9d3fa1c62339d6833b8354ba8e53f1b3abdb6a154a4658c14672a04cf62b475ef4";
+  sha512.run = "adbcb0871e679f3909ac59615b4e4ec85702a0ca39668fccc7b1cd44c4fbe1351d8b9eedfc384d1020e2fad0431bfef40bf194836674f22fb7b9d33d827b1914";
+  sha512.doc = "0381e1912d6322a6b1f7e7253e932976d57d17f9bab83a4835fe05bd01a422e87405e9e23ac9e65719f6e2fe424b8c0eb71cc92960853b887bbfeae20f993110";
+  sha512.source = "6d64da073e5e795fbf0ce8bc72e75a69a60c58b02b07d27e6ab3f858566f9ac104c92de493b500c80781a9c2baed14cae5c79b3ebc6b84cc104b5907e7f3111b";
   hasRunfiles = true;
   version = "1.0a";
 };
 "mfware" = {
-  sha512.run = "ef670f1c6d9075a4a0c8d5cb4bcf9c5b203f4c855c4a76e19f839381ac25a57726e7f0b151520d9bbdb6068fb4afbe973216d130c6df60b8beec2290aee7be8a";
-  sha512.doc = "a8e2de145a076b8024a4638751b0b3de8079af92feec0b67685cc26029f23f7e95a47ec551470ebd7583b7f58599c2b32a7574a9eb41dd5a6e117c12322a54b9";
+  sha512.run = "6b0bf98a6b6420259a4456237ca3a02c4b0586e051555ae27f27afdd1e21da1e54b9f46034cecb920423a54af9c46e02234a517175933d1806bc105ab15d35ca";
+  sha512.doc = "7447a7719590d9a6cd39f846ce29d22e768b0b7c0272ed9cc349ba41ea8c0d31d78ddfb04808383e7e810644a0b00dbfa308401f0142ae1e36a792380961bb3e";
   hasRunfiles = true;
 };
 "mgltex" = {
   stripPrefix = 0;
-  sha512.run = "1a4dc5d8bc7b3ed7310c29fef7fc256c1acd06413aa3e1757dffef9fd1d93d558e6b1a5f5e312835d224dd861ece1dbcd5cb8b79b224a7c57190c202bd873fdd";
-  sha512.doc = "740d0731f72e61ee89ab76d43095395963c10ca8ed96ddc9faa563a2e507ecd2610d7253140584224a3435a8f10e6563324b3044a9f87afcb7baf1b646d59680";
-  sha512.source = "7a70d7e5fedfdb9816f8cca99ac482d9619ef7380b570cbdf9c30a97a364f7f383c1b0cdc133be30ed3175fa28932d659ce873f34b968893efeb3d3b21fd6c74";
+  sha512.run = "784c0c8530899a8c3d66273951fdda53707439d737bea9d33858f4fad93d889efb2873660ca279530b5a3d938b908fcb82f3561200ae389862c565c7b66b7e76";
+  sha512.doc = "95ee395d285ede2e3bd706c792ff6584fe590559f87e26706711362e56abe3c02403ae15b0c055235acea7d6d59f5508a04419db88e523308b416e015c7b0b54";
+  sha512.source = "d403cbeba95f3c7020822edc5f7effdb38fbe14a8379dc305ef7afc2ff2ea09ecea031ec4c93453ee7666e704b978a640fc70a7b597bccf0930a681d9c822316";
   hasRunfiles = true;
   version = "4.2";
 };
 "mhchem" = {
   stripPrefix = 0;
   deps."chemgreek" = tl."chemgreek";
-  sha512.run = "f1f8af1d7ab05dc6e36cfb36761caf7655904548dec85ed526e6da41b4b4a4c6c91975a0e11ccc6595ac3df00237b9cbe41aff0c5804417058422b29c6d9358b";
-  sha512.doc = "312975c00809b7fc2ab5aa786c28c76e2ede4bae250caaa28077c2ebd3ecc8a3dbc099cde20d8610e06620e5b3a8ce11d4b24cbd3338debb9d8fb1c8021f6782";
+  sha512.run = "a514d4049567d1763da4b1e8865609b0ef4d8ffbfe74a4db58d60e48b9968b615f259c8524639ffe5cc74aacf4db9ed3ef5d04d28a42df381a16fa0914efc1a3";
+  sha512.doc = "61eb4735097b7cbdbf18b5276e4ef47628c557802b71198a9bd8a7e5f953b6c684e8c6f0cb2e2ee68c05143ace40c509d2292ba8e0d20091cf60b956552f52af";
   hasRunfiles = true;
 };
 "mhequ" = {
   stripPrefix = 0;
-  sha512.run = "ac57e11f6e85a873b718bee20635212d83540c9017cd48cc8f2985c19a46f19136c0f563f80af04a79610c5d2fe00f168567d1528a732327c3062c02701d82f0";
-  sha512.doc = "366aac5a87f4e23e1ac9c70dccfeb40f26dca0787fe8c1e6f4926899d8e2fc7feb09f29ededfed74d970ccdb57a22e1d514d7c2efe6bf2044b342b378d0e0a14";
+  sha512.run = "8c368f2ad6209c2cf503a38e43d008db46a674af539f4de9c85f25ab5334dfc98c97b5013a1b1713e4cc6461be1b2943275945a01f95e29aa13dc62a77a19c99";
+  sha512.doc = "cc34cd1b641f0e010f13f51484d4110c277674a327dbe55be69b454a9288c82da6f832b24a21708980a32e544ba69f30e31a2ed061f66fada0b16da346a8bced";
   hasRunfiles = true;
   version = "1.7";
 };
 "miama" = {
   stripPrefix = 0;
-  sha512.run = "f487a54bf22d515d820612138cee428cfd3b1910cf90a5478fc42837c2ba035041beb77bed842dc9de0deb4e42b18f35b8defb9009c106fa710c603cbdcd4281";
-  sha512.doc = "223ee05b5f0d9c654aa9f9053a7a147964a46201cc9a286f06f59d46841e4e916a5a2d2096baad9a1acc5a5fec41f879b786019c2b04cade0cf7c8c63eb1e00c";
-  sha512.source = "e893caab7b2859fe3aa9457649e06d69496c84f4fb63d6abab1900cc8a9accb1cdfeb669cd36fbba479eaa09a5b51f8ac1f96ad93ae54862f5779bfd82386827";
+  sha512.run = "de3e66a7bb4a374189c09d098f35e1ae33bec7824680605f2de4eaa0bd55748696afa2c30f9088d9167485887a2c6f63234c070d5bdf404dd4d46aeddf23ebde";
+  sha512.doc = "3cf4edb7eb1049dbc5943b0b88d45909be779301503587b49837d3344e20cfd7695ba604f481b679d937c4290c288f925d4b6bb68e9a2d809be72a71405d8c71";
+  sha512.source = "65911e34d6bdcf158296ab8de6afb27959f3e4379fc7416e228d5ed851bd51a4f6149875b51d2995383f592f968520bcce07bbd4ff324e531da31c135dc64d90";
   hasRunfiles = true;
   version = "1.0";
 };
 "microtype" = {
   stripPrefix = 0;
-  sha512.run = "82eaf0e1a466349cdd2ea8614fe10c03e1195f882fcd8a0b5b453baae2fcd396438e92b89d17982ea31048d179e88598c1fb431afc94bb39e96b975acdb8206a";
-  sha512.doc = "092a5044ea9a580a6b8d8e93da0d0ae1a77d26b79a10f9c5a64ebee7ef02d519bee871969e8aada3f6e1e2a4266853003a480a39d6b6e1eb9f197c694f59049d";
-  sha512.source = "dc4d113dfaefef1056f0d9111532b42f707f52345bce4cf4190133862ff1b3b25d68a0e2d5b6108b24ec029d3554729475806abb9efd522ad445718943edd496";
+  sha512.run = "ec4aa5f4982e1b5cfea99a9ae0f3e74cdb7d814d885d5eb8f65100fd5c7019e576821b327aefbcaaeb54f7889e521ee0afc627153b3f7b213917e0cf647c154c";
+  sha512.doc = "0469b0a305da06a0da149417e908804b0aeebf00d0ba2f9630b149068983aa6d36502439ae90095c8607a04cc55542224b375a2c9058bdd330f61a7cd3080c3b";
+  sha512.source = "a382de33e87b6b8de9b99edffc5fa9073517e1570eadc3061ffcc2abc7c9e8ec1424544ad1663be96d0f489b7cee7a92b43d1fc6ab7c300153d084661796a113";
   hasRunfiles = true;
   version = "2.7a";
 };
 "microtype-de" = {
   stripPrefix = 0;
-  sha512.run = "18b6af898fa57e3406c97a6575c1f01efe885ae8f5d02613b3add22061a9ddb245676ad0ce3bd340de16edbc47eba5ae34d6373647695bf6c0ddd9718bcbf745";
-  sha512.doc = "04e6685f0234ed3f02cf5b2e948ddb61bae78cf3f01affd23d5305047ae20b4b7a97d625b00475054685fba53d1249ca4b93d7a45297c430e241a633a822d829";
+  sha512.run = "1af4dccc8bd6edefba7bd66d7adef9a27bd341b3c4f0155a33b35135c39bd819a62a121c05b4edeacf2a35daca0a60a6e1fc5f8f0062ea1f89def220b24ca03d";
+  sha512.doc = "c0d43291d38e01ac163af05c9ca57da3196d7cb93e9c494ce816c1359b1d073ef30fec7735df22d869afb3f92a52f452c777e0ef97526204aa4e6cd0de14e333";
   version = "2.4";
 };
 "midnight" = {
   stripPrefix = 0;
-  sha512.run = "fb4a30ef08d47381fbe155bb18b447b606c9fa52095cc170e4d23f65454f75e834c8e4e1de3f25f29925af616e244eb64afcd9136eb7276b23278a2a3c8e0010";
-  sha512.doc = "fe24bde56f21a9b12001d3d30f4b166cadaef42aaefbf7a0926b87557d873486d6bc78c62d68f5dc670bd674c74139492172f211506b7e37eea4c7a93540623b";
+  sha512.run = "232fcc0ecf25e6c80704a486d98b17c1a8750fbeadddb393eddabbdb7c46f2926cff65d4db3e39065a1c8caeff64b775a40017d51d3a01fa44ba727f82494624";
+  sha512.doc = "385763510c1cd1e276910306ee3b427a66c5a1a3735b655091ff9b6ae7be89daa66b442bbd21fd806a426802683369c081883d96e3da77e0a4402def5fce107e";
   hasRunfiles = true;
 };
 "midpage" = {
   stripPrefix = 0;
-  sha512.run = "b7d8cd10f5dcc1830f87f0671037fc1bce6de39849236ca79b9c3b1f97475cbd8a8355ce3288b95b36f9492f48dd29971b5abc83d0070d90fbd2fd7189b6a69e";
-  sha512.doc = "4f7cc9ebafeac2380c58d3e44eb4eea1a25960e4941823161edd0c37148b9689bff65a23eab0080980612193d03ce328014e965899886a707baa5997129e2600";
+  sha512.run = "8b4cac90dd0bbe21c3d48276fa93d62ff2dba0c471999b7180e314c28eeca1ae48cfde4d7f98d48ec353340d9598a31e52f9d62429444a861f1ab395f008b7df";
+  sha512.doc = "ee51c5d7a8d69ae1a680eac984ac7885b2735cef4039c140bd39c84cfcb5b58a139ca54c7d8c669a1338fa9d4a21723fb03f031ff987ac5e8fefed829183b8e1";
   hasRunfiles = true;
   version = "1.1a";
 };
 "miller" = {
   stripPrefix = 0;
-  sha512.run = "2782cef8fee5b7d76ce695a44b04111ee3db04cd3cf9b7759f803537d40782c989ddfeda34f0330c48b42a1196ebcb96caca4d6d7b43fbe7237a286cdc47b7d1";
-  sha512.doc = "b4a28efb2df3d2d14416795a6bc0e810b8fa73de2a9447b86d0e7b41f21b76a525e2daa1bd4dc1f33fb2dbf481214c0cde9bf26cff1ab14ead90740ed716c92a";
-  sha512.source = "bdfd4c63b531fe9b6328683abcc2124bc032ff2bd44bd859438424d8214e64bc392a43bbff383d305051f28468e45c50b6d5516f3644d4851520cf4ab1e34736";
+  sha512.run = "1de8a349f509aaf16a74495a8629bd9a7c4f592387cf0d0928f12ca5c46f9772c819e062dc47aa0039bbb6b94285c2fde107a3a6dc3b16c48c38b9d8e4ea8290";
+  sha512.doc = "e8c633b8e058c281ed6060e876d98ec7057ffde804516d5e8e0e773f49a742363c1ce5eeb51f9359ee54da3fc90938f745c8624b26f713ffb42e2300fece571a";
+  sha512.source = "e926b6f20dae412bad08c0c82feeafc8915cf1b6101b77b29bed0bd4b6cb95f4a6a4dd07856756436857695707d87b317859ccb0be5621b4b954133afdda50a2";
   hasRunfiles = true;
   version = "1.2";
 };
 "milog" = {
   stripPrefix = 0;
-  sha512.run = "132f918b0e0dcd93c125349d40804fd19a7cc47b02de338102340a029ab4a32ce8fbac6fa8f68d479676bf72dfce3e6216f62913857284fc4d2dae879dcaa7e9";
-  sha512.doc = "6f39308c119137ff1862db7d886fc5b5b1e871bd534e80c22056a63426ef34862f800bcf72992164799ed7cc793947636253a692a10ae73d9628425458c99297";
+  sha512.run = "294c434d7f4a0a4c94a2796a1f1520ad436144041a9180ad145b0aa406bca9ebc24ef545b71bdde69bd0c7dfb5f1d4c9efd4d0813ef1d1a15cfda5d05c91c165";
+  sha512.doc = "a93fbb41d37cfc4cfd016c00a2c88497da57d55be73d442c7c30f5e3bd3cb5bf68ca89027a03c889e212b4f396768b0f8bec43fe2b574daabbe576766810a68c";
+  hasRunfiles = true;
+  version = "1.0";
+};
+"milsymb" = {
+  stripPrefix = 0;
+  sha512.run = "db2c38e789edffbebe5ad9729021b6f4663902e002786863aa5c4dfba1900d864494677c69d66e9abb009eff1719da3d029c807b2073a009d3962483f3431cba";
+  sha512.doc = "957dee2080cc2d45d5985a21d253ca8236ae289bde8cab3ef02d9baadf9ca48e2e1d5002605d96bc81ec8799e2f7cb9f3cdcfe7ea76e1fc5ab046857188513d7";
   hasRunfiles = true;
   version = "1.0";
 };
 "minibox" = {
   stripPrefix = 0;
-  sha512.run = "36314fd2c90feb3dc530097c2ef37d9ef9e141f4d08b04b6524fb9ebe043e59c2995e77bbfc6cc1407144d6d225ba4480692eaeaab5da3640df58287133fe4fe";
-  sha512.doc = "3f0958e31ace868196699178536da461eff2a96ccef41c708bf493e6868892826c4a3ce5e99b45d48e62f2b3f3410a7e9d1c4d97578d44327efa486d9e9bef39";
-  sha512.source = "6f15682106dd49a84c54124f38e842e4f2e47ac68cab40c19ad28cae2490b735aa8012f2b6f446a814fc263ac8ceb755d74eda2c10aa18b70232e2f0acf6d78c";
+  sha512.run = "924b155ad60c556841075a17df246588ae523cd691fb4570f822f7f885f717c2e7dc998788083c9a19a078c7f054f7370c71c615310edb42749ecbbefe8742fa";
+  sha512.doc = "d238fda7c71e8addb74658b65e8fa519d28f2a812f99903ef06ded1642281f76f40248b5520717808dd34a3c3794cb7f4e903bb4b0171cac6c603bf66a81c6f7";
+  sha512.source = "4ce46abed9f9e1ad4ecb4d8781e32d748b308cebde1cbbb369a86a6e7803325b39ae355c3048f0679851c75dcbf86b26a1bc5671a7721f3d593ad0149ec31404";
   hasRunfiles = true;
   version = "0.2a";
 };
 "minidocument" = {
   stripPrefix = 0;
-  sha512.run = "a11a2d5d5b7e49432ec1056a92affd4c8bd65184b285df78c63d1172e5bcbf55b8c8eba65dd526efa6fe1922e9db4d31dfcbe2e9a4a922b30d7cf4d68b3772ba";
-  sha512.doc = "cf9694946ca4c95709815fa4bf87554e0d37e878c2a0e6efa4e37fa0d52a0cdbbc425ebf4d901bfe601482f8c40b38c4c626529f2ff823dbbd581507a7a09083";
-  sha512.source = "4b8efd35e682188a3790ec10efabce2e4b9417cf9cf2f3f38f8b0742b85943acddf1595d9a6b9f1627f4f655cf23788e64ed747833e97aebe544c9776ab745c7";
+  sha512.run = "5ecf897d89dbc0e66ead1514edffc851c5838021ffac5eaed9566fafb221b458fc03532ad1d128abc14de1d1cd503f067cc217f4bcb09d38c86e459951a36cdf";
+  sha512.doc = "9013993b16c687e845c6f146ec37507385c2eb42978e02db7caeb10f878e424d8c606c81ff00b2ccd47d37665a67a9cf9e9ece237300122c194c0e4482e1e5f7";
+  sha512.source = "f4d9e6fb84ca33e8bc8a91474334824671b6f0f072fe49d0da45cbdc1f34ff7dff74622bac42725c9733ff7bc4bb2c97ff1b45bbcf216e98cade86953b766ca4";
   hasRunfiles = true;
   version = "1.0";
 };
 "minifp" = {
   stripPrefix = 0;
-  sha512.run = "e47ffbc35d72acc8fc27da30ff08f6788db5c3157872efc4ce7cf7708654dcc84d9f85f5fa0c361afaa3f1b47d66e612a85808a5657e96e23a27be85be3e3bc6";
-  sha512.doc = "796de8ab2195f60450ed74994dd1f9e7c29950c569e999f3e7921f0dd62cedf1629fef9af326c41f0ba4e323c7f7e4e2e1833891cc97184000f6f80129feaaec";
-  sha512.source = "12d9e7c22b791c98c11cc9b14b79e26d67ee44fe9d223ef8424d95faf8cf949f872461fc1beeb79956c670f4c64c380215b96f6baa1f0ed119d4ca947beadbe3";
+  sha512.run = "77dbdbdb2bdc3da49d43c9c1bca96245633dd0764faf7bf9276769adac234e3eed2b318f24470d755d2f56c635959c36370dcd9514b0258fa6c316ae8e6e5a50";
+  sha512.doc = "825b8b2038041f139067026c09c6ee4968a6011c287fefabe01f7cf574795ecb5dddd076e6f44e0dc0ae489111748953d8441185643c7573729a67c5a49c9962";
+  sha512.source = "f5d63a1214d2175430d866abbd5f9863472306e9accdf4d819731c59ad11b85c9ccce6a288265025a07037e4a1fa0ea05f8077a9e8f476b5d1eaa712c4c627a8";
   hasRunfiles = true;
   version = "0.96";
 };
 "minipage-marginpar" = {
   stripPrefix = 0;
-  sha512.run = "3dc536815527b85dad0b1a1d7cc4dc0c5efacb555c323c6e092e793abc6370c90bd140306db5647a5d1ef52af78f85f8bdab270b1da42635ad99585654408de5";
-  sha512.doc = "3caea0bf14b6dc35b9789d9572b17eead1af07e005c08451a815533b8e07157f27628929888a4689bab8184ebfd6a21bcc7d4ec0e1c87bd6c2fa62b4fcaedc0d";
-  sha512.source = "888d3fb020cfb215da6cd06826a92ddde492bbfb92fe4ccb40050da20d80de1938abc700b7f2ca1ed1cb768c64fe4e4570eec23e584b1b110e238009a6f445f0";
+  sha512.run = "54b8a8a4f6eb26a3519759cfdc24944cef1e3b794232ea22119893b275a1f72be6e16519421319ea50de08de254d2fbf8f9e5826c8f2d1a43185644a63e4e775";
+  sha512.doc = "93d6c156136c827aa0d5a9efbf124c2869284214962d5ddca7fe04cb13fefb5cbe882c2c44eb0ac7776684b16535cc51283dc6aa5de664ef7c77806c821eb2f9";
+  sha512.source = "61a673e790966e6d465295d1e7173bd68f37fb18f6ce0e5d365510723079401f4354f52575864057694651fcfae4bb573a37ff4262f898d6d2de3cf4a08038ea";
   hasRunfiles = true;
   version = "0.2";
 };
 "miniplot" = {
   stripPrefix = 0;
-  sha512.run = "f331e4bed822c1f82d967a56b5cb876a2d80bad550f260d9a8bc9b9ff54c3a731ed9da075b7faf2505b52167201aef9e4472f6943e39a1f312fa4d28ff831dc3";
-  sha512.doc = "4ca5fca9109210581c76f082c1e14a518dff82f8cb3a5383259798bbb72a06ed91000c697933e7d9231ebdd9a4c6668187c46d57a0e4980bf483e844763ab29a";
+  sha512.run = "ecd9cc1bd9a1ac439c2e705e24cc4066a08a24adb92df83057c44feb3f3dbfe951a32e28a50ff60f37dbb27700a37ffdd77f288cd201a1ad9f8fb65c5475ca0e";
+  sha512.doc = "9c907949f394f35ced7ff99f85343188b04eb09a69f6b9a3d2374f5e4d81496eec28d642cd49bc71c73fbde4d80587fa4b7de2f08a3d3be39acd64659502453e";
   hasRunfiles = true;
 };
 "minitoc" = {
   stripPrefix = 0;
-  sha512.run = "b638742cbb03fb01063ad32d26690bd9b8d8b9e0284852f576e8ce1675acccfe6d0166b7e049d1e0c352990d916a8c9246313e8a46db99613452936bf122be48";
-  sha512.doc = "29bed4e7eb0de690e4ab1648f95cb88731fdd31adb4c42bd07f4a191f452ff498c885295ef745b3b4ec321a0c5151e04df6d47256268f03c4b1f1421fa7618dc";
+  sha512.run = "a7f98ce1e0d7d830be5f07717878fdd982d8127989261d28b7ede836d25245c4255f9f8f13058466fb589923e303c5b1516fd017f1702998886e0e1eb547190f";
+  sha512.doc = "17763cc33ac714a7cc1e5c1eac55693d6487b754be1d79e6310a9a0d7e2cf25f079d728658a68f4a574db7badc9470359433331dbe739bc04d51adcb7a9e7ba3";
   hasRunfiles = true;
-  version = "61";
+  version = "62";
 };
 "minorrevision" = {
   stripPrefix = 0;
-  sha512.run = "d4e0e7227a05812822e09cf96e8aa0d8f0b2b9c9a63f8a79abe77b7af0fad9a57249427d43bc7d16469aa4b12fc1c777c97c70dd1d823afb646f166d9f2519af";
-  sha512.doc = "273fcffb457843a8d9e437278d88ec663a57e32709e2b8281e4434527221620bff1986433340ff825357c1d4b38bd64706a758fa8a5ca02d8bb1070b16db0825";
+  sha512.run = "4c601f1f5eeb8680afd55ef77f7e5f01e3c744038bbc9a38737f7fe3116d241db9c263074cfce00279b270f5064aa9441a8538ac67dd27401c92eaf90ddd9032";
+  sha512.doc = "3fdb619aec7a32f1f8acf2d6a1158282cb3414c395cf744ba42755f59ce294dc7c241bc0784423c6e910925cd5c1c93c8a3f9b6f04cc349020643a0496f1d1d3";
   hasRunfiles = true;
   version = "1.1";
 };
 "minted" = {
   stripPrefix = 0;
-  sha512.run = "6bfff77120a70214f492f34b31bc7354f75173e742b0d40b76116e78f18d471946175e7cae1d51d0f2b948bf566c8e44c755f1d98a338b8a0b1b0cfb6b77f462";
-  sha512.doc = "013bab6a7abfff35d5316ec335ddb13e8c91e918ef78d9e49bc393be3cc6e71f22c740ff862045a5d20bbfc1a508bbc272f0dbc668db3ffc657dafb0ddfbc45c";
-  sha512.source = "3ae1e00adeff4ff117be3c35120d0c94569f62c7e4b6c8640236fbd52a9ceb20fce24b87faf0d5cc2b9295fd5a3689cda5eb01dc2c3897e8a2f228326ae6cdb6";
+  sha512.run = "272dc1ef723c28eb2f73ee66a8ccf7b92e8b3b705952dd7b3a72615a63e33a3874d67301084606b4a8749d0d4b153dd21026a42a82bc7fa6adc58479203f5918";
+  sha512.doc = "b5d9de3ed42e2aa5ee8b8f6025db7d0acbf50f3bd487c1ae0b6240a03e5b6855f9e9a048b4d85328fc264ca333aec30c9b604c2d263717a26a157e1de058183c";
+  sha512.source = "24e73622b1baaed440442556165c3c3e3918ce797b48f400dcffd98f9d21334fb0784863a30207c28a887e714c71328b73720e62f55b9d37071bedc05274bd43";
   hasRunfiles = true;
   version = "2.5";
 };
 "mintspirit" = {
   stripPrefix = 0;
-  sha512.run = "9f0ba77e2dc4e36225b179047be4665ad8f410156feb8e2265f4ae97ab546c107a621242ee54311db9d670d4bf079aebfc695426c0c66bf0313e65598752e94c";
-  sha512.doc = "9ce6886faa4f3c9b0c4ee93408a1decbe681a2016d9b9f088beb917f9e8a47f9b9c34924cacbf48b41ac75da116f96800477c1cc73075cd837a7adbf6f333012";
+  sha512.run = "28281b474cca00d698964d9d84f772b7e6a7f162f2c258ac2284be13b78150f66dd039087229d20be7ff78185ce54b66f0c0c9378c01a049403b48f169116033";
+  sha512.doc = "709dca3ac467e4cc74f5ed1f28db6c49776b9bc889e7bbc86a030e18347202d0decf4d84579fa080909721c3f14acf7abdd0fbef1422d7e59992e03707e7d6dd";
   hasRunfiles = true;
 };
 "minutes" = {
   stripPrefix = 0;
-  sha512.run = "a880da4e0273f4f35d84126df55318a82bb512acb07ddf71f39e8c519e72080a1e48e7ff3460ff8a500fbebebed5250931325f42290d5eb9c3f0b76775bbd2f3";
-  sha512.doc = "659ed6669f6d356ed1a43271f1fbd835279063628a91ba22f14d9cbb18c3ce3957a33e848dfe4f58833422064403a540383e8014e46e2b70a0ccb4920951bf81";
-  sha512.source = "d92ddae9e345eff7937e2f5f9b8bb1eaedb99856436350caea720926445597061ccec55021c61d5742fdd121a918bfc2127c0eff8420f9440c1ed149ed42662e";
+  sha512.run = "043659eb44a51f324e5a0aed9ccae1ca91ad1786f63f7a03e40736ac7b1d6face292d605e7452b6bb01a3c5373ebf2b3828730b40dbe3c636845e16b488b833a";
+  sha512.doc = "f9d7aa496009d83f82d7d09a1812cf68ad90521213006c23de9d6e1614ae5bd5523e9944ba75c6c42129573cf64bcdc8b914d782d81228f3537b7f2279e5899e";
+  sha512.source = "a5a879f1ee1638bf637d003dc8531cf9aa21a37766a3a1e70d0a227ce6fac1a108ca0df134be6e44443f9d482245c7cf058c2343be8d7d197b814d0a3dd1f78d";
   hasRunfiles = true;
   version = "1.8f";
 };
 "missaali" = {
   stripPrefix = 0;
-  sha512.run = "898ff23af3e1504035a5d760b93f04a515ad517e0d8ca098ce30b01092bf261d54e453d0341cb3dc1fc938443e00a4d76a242387ae771c676975e0a6742f015f";
-  sha512.doc = "248bc7a2f57e4eec92b6b9685353253395585b5c1e04f1409902f6f653aa8890f06b28397ff82d0d236117cc88b9ec65fe433b0a64db8a7c8bdc42702b8482ea";
+  sha512.run = "da21a26c726423dcc0f7ded9871429b74db5748809820e91e349175a6104f128cf77b3e2039db1e44bf5629dae1018188b4e050da9c11bd03b19858eb3904b72";
+  sha512.doc = "411da5ab29814802cf7b37f62d3ed4251e24da395dbe441d9df55a68621aceb03af8f49296331235a7ac01624e0ed3cc73b36c56cb02db9678570f8c44820884";
   hasRunfiles = true;
   version = "1.004";
 };
 "mkgrkindex" = {
-  sha512.run = "19f28882640f8ffcca3368932a60efcc64176cdb4c796cdaee55e1539a4b24f944da6af2ddbfee0abdcb5c79a02d58a6a2842dd101b37bd41baa18f9a97cd0cb";
-  sha512.doc = "58592014581bdf45854c5095053843a89413023609797661268a0ce0a11bd713f201dadd619ce7d16f9f99267495fd4c663d8aa7aac525ded9b3be7b71a40191";
+  sha512.run = "a8ae7c100099a0680b1559e8b29e6b9c7231cad69c498cc3e3a46a84dfd1a4af9eb14da881545a95ef5894d202e0992d92a12ed64b8deefc97b30854cc398af5";
+  sha512.doc = "0dd37369cd881bf3ddbfdf5c415047e54b6977077f759687236f2bc77fc4706e9b587265c64d8bfe9dffc340d343ff782cc63954986344744d0b1380485a3de8";
   hasRunfiles = true;
   version = "2.0";
 };
 "mkjobtexmf" = {
-  sha512.run = "b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960";
-  sha512.doc = "4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80";
-  sha512.source = "2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed";
+  sha512.run = "10219cbdcdceca2b8ad52330a3471938ee180b334f6101f88d440336d15aabc60f87ed46c2958633df033a90b50ee73e3d122d8a03c3d5a7b98ee84500e402a9";
+  sha512.doc = "4afad2e4d7b841a6d2a7a21f429ae157e48aad10ef33ea74dff4ae7ad1570db0e02f96fab8d28d5fd0350cfa1c6360ccc00a9cabdb7d0273c6d949efbeee9db6";
+  sha512.source = "c20096c77641c56d583c9c4c4820cde6ab48c19543b98fe06edc8048d65cd3dd4f90d745eb1618eb9b18aa5d03f7f9e0fa55bd6ecb15f0fc4c98a79293156185";
   hasRunfiles = true;
   version = "0.8";
 };
 "mkpattern" = {
   stripPrefix = 0;
-  sha512.run = "a7379d6a259610c376242a7faa3bef52fddc8c8ef5db3e6cea04f59df1f3a58ec0638716bc79c566bf48816b035f92a1e8b1bdecbb2f8a1706900b6026c27a86";
-  sha512.doc = "043a33d2d59a92cfe02fd4feee4545ecff0e2bce81432565197b7f8385387f37adc7e402780268979bf119e1d1e2ea36e5fd6e1f416cf47471cdf6e44ca6c443";
+  sha512.run = "7e5efd2ed7f6bd93ec83021c42396c14b2de2b6c0cd9f3bb5ece4ae51d6f1c45e54f90dc755be92d309e27884134214a50884237e53ee86c5bc76013588aba04";
+  sha512.doc = "a19a1856e9dfb225fcb607257f6e54d5ccf5d746d7f6b715bd1b3b86c9684a03b1fec182eba43097f7343adb34531f0be63909623c6f2de192d7ca3e528e5cd2";
   hasRunfiles = true;
   version = "1.2";
 };
 "mkpic" = {
-  sha512.run = "032d36e6137c8ea94f0c8149e53a271117a1d00eb3d3b65c25e465de97ba55595c62a8199cf8d8607df5ba6fabf7ee780b8b8420b2b1a34e2b9d7c06f42e8d23";
-  sha512.doc = "9d6501e80cca978de05bdf4f39d67943b98c08711c13d84d8663136ce22ed643c33cbb51a7bac3bb581c1266ab15057aea4d4fc97f2d258da2c1433916ff0e0f";
+  sha512.run = "7294d20fc13153d183d711fdda3efc7d4e3fc8e351c041109f32e6130aa33f30eed6bf39f6042b22e78a3cde375fb6e8ff8de09979fa8e52e83cd652289bc85f";
+  sha512.doc = "e07e6c22292ccf08bcc047eef1d306f37ac4471106b5da74b75155ec81462ce25c58fb8524701150b0a1e06c6f61db11455f59ad60c8499cf8a4206d86afcd92";
   hasRunfiles = true;
   version = "1.02";
 };
 "mla-paper" = {
   stripPrefix = 0;
-  sha512.run = "62e181381b5afe739a68b1f67640c9f814815951daab13868234fdf662ab3beeb38b887b26e951f8376e8571e83340de3c459e158f30f3c22f043784bf8c87ab";
-  sha512.doc = "cf5f5cc5c8483431297abbc60c33b505a75928a29f8eda447ec1bcad671b48b30e161b2c12d5d8777b3ad04d22212ee6454c109ee1e4648ec758bb5068297ff7";
+  sha512.run = "c929251ad5f93a8d0ccb35ac3dc11604e1498ed1e339027cb020c70087dd0799eaf4d2ebdc9cad64f9aa68d82742aff4b670234db3fc86b039b5ab1d9dd74f06";
+  sha512.doc = "358c508833804c87e338cc2fb30889e018505e7e747f7b5c60dbe5444f6c0cf8d62ef366c0bd3eda0216cc32594891bcafef07b3bc4e45cd51471171f3620ce9";
   hasRunfiles = true;
 };
 "mlist" = {
   stripPrefix = 0;
-  sha512.run = "722f39aa2bdeae2b3b32b897dc2fbabea361042a53d45ae721a147054be11efdf536c83335dec4c06ae0c1fa2d2d3418ca2e6481891e9328c225754f47f3c7ed";
-  sha512.doc = "d0b59fbad7bebba7e2282bab6ff70acc890c0935a4a1961ee4ab29448124e3b18e1faf2f1b4a49bed01b0b1a41d934678bd263f599fc061511d47994a44700ed";
-  sha512.source = "921ca1050546b6d8f454c325c85ad2f90cf78edc78362b4698cf853ae308bed5bd8e0b6434c2d555c1b45cb716029308300d6322023f7ae2f22a82bd826586da";
+  sha512.run = "6830a8034b0eb1f8ccc00a30e5ff4bffba0f62510ac8211fae8a2de0d40b7c28dd890cf8a4bf61da83a48fc97e827702e6e9ad1b0d0753eb891af4e84b0dfca6";
+  sha512.doc = "c2f5a6d696ec9acb3567c3fe8e7b6cb4e4090a4cc74558e61f67e168aa446a1064f0ffffc277c3e56520b42117e3bbdf63c0644e3cb055596b018b793187ac91";
+  sha512.source = "7672e0c592e65acabd2a14dbc44f66339ac62880315d9a2d7b4386ef7a6079bc0360be75a4224eb3e19d9b2314928245addf4ced415fd470a796f1e779a6c09f";
   hasRunfiles = true;
   version = "0.6a";
 };
@@ -17769,1844 +18245,1911 @@ tl: { # no indentation
   deps."latex-fonts" = tl."latex-fonts";
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
-  sha512.run = "3393bb39c1f685b9012f1066707143c2b93a4e050290951c18f3398a365a35f267184abb6baa7cfc610378e1ab34c50293f844fcc13d63ffd460b7bd2fc51abd";
-  sha512.doc = "99ea93113bd48941f5719a6ee3da34bf3d8dc89cbf6d8ec34b461d2bc91c80ac6f625c857a748ef8ec599c21a2dc6d4fa43adc476b3963c1aa113b995f222fb6";
+  sha512.run = "2cde1c246bf371d4fe0aa141bfa6a50ce84caa324d505258ad6d3f2360e960e9c6141000def7e38db793e65979ed2541d46c11784f95e855f49a9d2157e170c3";
+  sha512.doc = "d53fcdcb41c31bac3837f6474fb533df22757dd8fd4e9966034402c712efe5d04184969b42eb51e5c9fae52579710df22ca89ac75bbdf01221a5a2989ed7a86f";
   hasRunfiles = true;
   version = "2.2";
 };
 "mmap" = {
   stripPrefix = 0;
-  sha512.run = "857e84591195a3627d9612e2c4dcd8a67f0c6d278f57e4b0b3fd79570f2de4e7415b258d92fc0d43fe604a8d49d78bac1355bbb47d6aed87169897766bfb2ddf";
-  sha512.doc = "aa259bd29bed0adf602c785d8aca30aa804537d1ccec3abffa33386a4ea446db758bbf2dab1f0f7718a9b0c10c80e4990fec48fc13ec8a50346b744c39e17a0d";
+  sha512.run = "8ba688e31dceb7d22213eca41ad50b11be4d2c8d177c29ffe8908947c621c5ec99b0c9102e34d3584059225a2b0af4c60306df9741108ab484c1f7c621c2fc3f";
+  sha512.doc = "712d5efb341d3bd3dcb3bbdd988cb7f58a4c638605925db500d781e2c7d2ed8c7f35084c31eb4758d895703479bba56c772ab6fe56458c206044dbf48648e949";
   hasRunfiles = true;
   version = "1.03";
 };
 "mnotes" = {
   stripPrefix = 0;
-  sha512.run = "09be785b531728e837397a2f1e42fd2157db00049c4ffebc4193e84d8740adec8fcda16b19f1f0304102868241b1cc356adaa6908fb0c74dabeeeee0fda6443a";
-  sha512.doc = "5f464accce7e4dd757759e7e5e1997fa7d3c5444e2d1dee5a7aa6fc89993882f92676b1f81d86629bfe0a35dca2b19bdec2d83d8281a7f2247f7f3ffaf7f6149";
-  sha512.source = "af8df1d6009842cd5fe000b8300d21de4f4e57d5890cdb78f7f0805f134d205e31fd770f49118f7836acc72cdf1bdc311ea36db4b5c5d37936ee3efde8ba967d";
+  sha512.run = "a44cf6586951f9f32f975869880c694a0218c6477a573b109b9f9e2f9001313cfb04a4301748d02aff56197c93faabb5db4a39fabdff980b4509ffef9964c3a9";
+  sha512.doc = "b0d8ef4c7481549aaf461b55ea8e0d8c1f82cf2aa42ea1b0b889e63f3c786615818768eb52b664e3e0dc71627199f077c8297498e6471af641ca287007761669";
+  sha512.source = "cd09675b23bd12489bbc35f6b7c6f0c36562860f0020de7d9dc265fc52aa4c9daeceebd2b5298df855970aebcc0475a63ec221b7bea602f7989109e42bf7461d";
   hasRunfiles = true;
   version = "0.8";
 };
 "mnras" = {
   stripPrefix = 0;
-  sha512.run = "d67ef2c46e1056f67f7ff6f354cd67eecf1d01c8f87af99f3ead8cae0a4b24a0dd712378d7c917afc2e759ee0a2ad3b265e5cd3057bc132b0d50a5b4a38812b0";
-  sha512.doc = "769b0aabfbe5f502e17e1b4b511274c5414beac254933c7fb61151b0f68ceef5887b1392a827a211f94dd2711bb62ca50463851c4c88a86d3acb2bd4be2c6da3";
+  sha512.run = "23bf39cb10bbc815acc3163fcc12548c6aa62e70bb2f513e09b9a43f040a769d5a1e3efdbc22beca5ff7de78199e960fe5b7d793b5da95d43f5a1934ce88e7de";
+  sha512.doc = "6a650500cbb8b6eb270378489379f1838095b9381d0363ef9e868f7af8c6e167e33d63e9027f2f65595a6102e347405954df1b3ade037ec4524b946e35046126";
   hasRunfiles = true;
   version = "3.0";
 };
 "mnsymbol" = {
   stripPrefix = 0;
-  sha512.run = "4e9a110627894afb73692fa51de5e84e988ff64df90f460e16f36d495eddbfa747c5c73cb6bfc535814ec879c67b9b50dc5a5589c06c6e7414e0218589cfdc96";
-  sha512.doc = "eedb867da3b45238296bd196a912e589d6531d2d29a09fe199984cf020054cf05c786a389b25f7380e072721bb7da1f4543f029d6e1e88d07d047d912ef4b55b";
-  sha512.source = "3ba530844e292c0210b595eec0eb202a04f1869dbab9641eaf978d43ddd209c5f1f2722d4e560be1d3a505c9154e9f5882bf448ce3a632d55f9c7e45638912f6";
+  sha512.run = "59743d33ba889498dd316220884314a1a8a15ecd761f591fdd1df2f79bfd44fd557609efde7a50f23bfd502225688480d8a7ca5ffee53735f3efd28318bbf674";
+  sha512.doc = "53fd0db2dc9817e8c5804c15fead5b2d3b935f1339096c13ea626133bbdb0b6a388110b60082d17864f6a82808831fb6f1e0387b6959d65b7ebf3592137ae410";
+  sha512.source = "7c427aeb3ddbb2f916b7f8356c298d32df0b945fd9ee5fb00b51ac95528ca78b8e41d6c0a00a633afd88d94e6d0dd1ecef0267dda67154a313632a451bf6f608";
   hasRunfiles = true;
   version = "1.4";
 };
 "moderncv" = {
   stripPrefix = 0;
-  sha512.run = "fb040cf5e81a525e209010528abeeef740afa6f237bc89de90626c9e8a57ee583f0c242d4fa4ad58e13de5737db77238ff6e4186e52a177b1f002cff33141958";
-  sha512.doc = "d2fcdcc5e5f85f2b9201ce40eb79e2ef082c9f83e7e2d570b06e3cc1f6a391199c033f5a4506ef9b46503eef2b58f93eb3cb0d441bed8caa2ff76b3e4ef6dc0f";
+  sha512.run = "2e96c327cf107d3494b2f76ee1fec3f9e5571579b29864210d6084f53cea96177bf6f452314ee201a8e3f62f4975c79189571b41dad2fa382d92876109bcea5a";
+  sha512.doc = "23a3fb70ceba7628aa57f0e45a0fa3b7a40a9e9b265733b98ea5ca2c8365cd7feb690bd596f15d64a8c9b198b04c6ec034ce9e46f35c621de981eadf847dc485";
   hasRunfiles = true;
   version = "2.0.0";
 };
 "modernposter" = {
   stripPrefix = 0;
-  sha512.run = "df889d931d2a2a8c209a288959cafaa60bf2ce031efad52065152f525e8dac388e281a3b1bac6f26fe99eac92474ce37b2730e9d65735f197d843ca9f7b3a0ec";
-  sha512.doc = "0a8fa048fa6036656f06657510bcfb293489e5086378822271ec4dd391d85a69768139e82908790d346a2f559f9be275813f33ac7fef719481808a712bbb67a1";
+  sha512.run = "2606c452964677548a8935271f2fa483f592210635ae5fee851a8ddb3aa5428324a5262e6af7f64f3bdbae6e1288d12a19b5b67d8f3eec865d6a9a1d9a8c4883";
+  sha512.doc = "9575341774c05f15bc106c8b26943b8780f7221c4c766502f95c351de04a7ceddafb25c99a4fbe520f0cecc7c4d3b39e648259751db53c89e3dcd0842cbb6d3f";
   hasRunfiles = true;
-  version = "1.02.1";
+  version = "1.03.1";
 };
 "moderntimeline" = {
   stripPrefix = 0;
-  sha512.run = "bbe1407f9686f11e2e0102bc7aaa825f31175c832d3d0d5d7081a5e43f63f9062b36c43480ae6d307b760fa1a7ab3d59f02d974d70de7cfe1a81fd10d0886061";
-  sha512.doc = "c2694254f19e3b912ee7abc0ebcac31438f32ca145af243cf732c3df4b6c61c4e4a65a727ba491360c25c6f07da86662ef0603a648d6fae25508dcaa83b7aebc";
-  sha512.source = "fc359a8a57e7d43724b116fb19a7b00cc215b8d4cc598952aa8ce67605abad6b127a8546528531740473019cf32d380d32a451ac9aa6ecae6a3fe049dc91a57e";
+  sha512.run = "dfc86b92f8ed9eff0c8e298316ac74bf120a983b4f2542caa2f76cd0e8c1e8929cb36421f6556827cdc8ccbc14cc61177cb5e585decf31c258367368f0745631";
+  sha512.doc = "eb62a7aeb0667d100f447ad9c6ae4bc8440f07804098a2afd7ae8cf89a5824769d2a0b3231cc13b7efe2bb56cc7feac9bc18958cc0596ce429c5ba7cc8478211";
+  sha512.source = "b14e7b05835e3f414c0691dc13fdf5ff2599abef3f0bde6f497f5002211039b69fa7c5b69833b0c98ac93125a93111e9641e334aed3a12f2f6773a4fde0be980";
   hasRunfiles = true;
   version = "0.9";
 };
 "modiagram" = {
   stripPrefix = 0;
-  sha512.run = "7d762312bbb139588db0cf2d6c104d340c4acd1400573853dd5afaac80f1466c05fb1611b919b9c92f2d07580758aef87cb84c1057ef98082d0bc95cd608ce97";
-  sha512.doc = "c6c91515f2b5e1d2a1b8c73c037eae8850cad326d8f53723761317ab052d5026f7a495c0934d3d90cf7c4d2d00b0e6f2c857f0f56d710a728c06ee16a7a95cec";
+  sha512.run = "ceb959fb011e8d3c87eeaf4d01c6a216f524a47b24c4504db0137cda4355c67f11fd72ec3a5f94335867307e0298745ebb203fc28d116319b6de21edf36a8257";
+  sha512.doc = "5d053069b720d41608098ca05b42eb2c58429ab29c8d1e5d8d8d894eaac0f0ebd51aefbf45e2086f453b79080750514e108b05f2d3d949b139d1eac17d27bde8";
   hasRunfiles = true;
   version = "0.2g";
 };
 "modref" = {
   stripPrefix = 0;
-  sha512.run = "5f6bb75cb78201b89900a0cd2fc680670e716440b53362041bf943a647e8e2549c98026932332b9a6693e23003396feb1443af0d6f42c1ebbdbaaef25bfdb75a";
-  sha512.doc = "b8e963cae4a691238265dab11f153acc68041d1c3fb5244efedfd3255defd087ffa3637bc4f356b9c1647a2814ee9b0ab7b7015e77fd45b171ce65e4ac9f4b17";
-  sha512.source = "8a42bf07ffa0a74fb0572d307d1b3089d9335adb88700c508e242467dfd661364d168f28ed8c5a62e3871ff51960a62a2b5038b3487ec8699a68ff58707bedc3";
+  sha512.run = "cdfaad53fb89fb53e2d0bbbdb3d4f8cfd84f3d4bdd97a337c1b3480647dbbe43ed78b9a7a646257d6ffd422629d3f1a87dee997eb09ff46229c2da6c6cfb349b";
+  sha512.doc = "d1d9b3ddfa84b26b2953fbd2443b0cdb9e9ddbc473fd4aa602cfaa3809c3f11b9aec33e88c1604e7309c26eff1a28a758020aa6729fa0285de8aced5485b1257";
+  sha512.source = "1f9b8e5d9142737f6322d3d23f9568cc04ce7cd241c0532011c5ca059a4ca68b5a0db19244c175943bc9d876a81215c2e9f52f50d111a7663c44ec20dc4aa975";
   hasRunfiles = true;
   version = "1.0";
 };
 "modroman" = {
   stripPrefix = 0;
-  sha512.run = "d44855a7eb1dea95c6d0ec02e480fac04e13ceafd796a94852c8ca10708520223bdd215ed823ec596f2daa6c6aadd860769b59a1849333d58631d764050c9809";
-  sha512.doc = "6ae6b25f3a8362842650e60d38b336749cc124ce4e3bd6e4d545b0b4e7fd0c07b640a166fd1336ec4e345e77d3d2d5585f3ac94247f4c7785d0900cc41de5a41";
-  sha512.source = "52c71138bce827a3fe04a999e34fcfc26cd78342c6ce5842556de49c44a16971f689d169116be9d3daf997dd742c26bffe9efec414ff17979b96289d89f17e51";
+  sha512.run = "df2a7728ff59f548733fcf9221e86e9120a0cf3d84d71bc887caf8ccd914ef4d2fe45a14c705edf9369210997723e95b409beb714b0cd0cfe04bfaf26eacb1ff";
+  sha512.doc = "86cb5f47daf5e1fc3ecc77ad5a052edfba30d1d3b7e37e0d8720870e2e8e4448ce94bd2887e4e7a7925c030c5f70663505246504e14358dacddabb5f94e63901";
+  sha512.source = "119addc4ea61473b60f54d6e5946914dc0c9041a1040a5a5ef2d31389964525e1d1eaf66b0076cad30dd6e571c8495415d5368eff82845aba43fd3d21ce1b4e6";
   hasRunfiles = true;
   version = "1";
 };
 "modular" = {
   stripPrefix = 0;
-  sha512.run = "90620c7556b887f406b7f3add1092e3d5f2ef4aaf23a4432e6be149ff1731d625f5099a709c5fb8090b29e300ba32fdd818b904f56c32bcc82b5a510b3daac10";
-  sha512.doc = "bcb85ee43b7789e0959e9db52e78b7dc30b241b12cd9c2bc04b9e497acb7ca4acf70ac598bec88b937eafe2be493619c07001d15d2089c0a90e436aa9acbf321";
+  sha512.run = "9cf7e1f3f40902a747d9cf1922f6c495c06594544030818471399131818b92019e3461694ea4d3e7dec0cdd9c416048bc50b2810e3262119cd9f055f29a98ecd";
+  sha512.doc = "f61f9825b056ad277dbaf02f1460f4e6df5b85ea3c26482db0a9540cd0e457e9b3007da31e5ecacbe07c260886d99c9b74875f315027e24cb158a8a4f43ebc1d";
   hasRunfiles = true;
 };
+"modulus" = {
+  stripPrefix = 0;
+  sha512.run = "8b218f1395461af4f2f10a92a08b085b6989cac6a601289c1e513273fb13844fa2b3fd53afd73763eaa4638af287ab342d01d573fc8df02776fbd6e46a1b06f9";
+  sha512.doc = "a6e64d463aef61a854ac08d71da9b71f993ad53d1ae65130f2d909d35217663188830ae5f3fa023ac0242be3bab64acc8dca5e7b4905fac622ada355785bdb79";
+  sha512.source = "c47204ecba59067869eba2953d2b96a49c2853069c77ea0dcfff8ba56196f4a4570d122fc89d22b8f22da87605357b686ce0d14b6f2aa214ccce37808f2993db";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "mongolian-babel" = {
   stripPrefix = 0;
-  sha512.run = "dfa13598f3b086ad56126948d4ac200c816b7331e7a6bc9e0240dc8a8d68c6465ca2b16db967cf3b3d0a9c83920cda5112d70afa9d4710b515a31ffdfa0a78e4";
-  sha512.doc = "39abb5cd5d7f8bdd1adfa65d3d16718a28680e91f8395a4ed70ec4f0fa118c1b851f4aefeaaa29352248ad7950f60707a71804d3b4b529cfc298eb1e757cd8ab";
-  sha512.source = "e3b6bbe41079fe3eecd1cd91ba245bce8031d90128eae7d762e29533a1c8edebeec9d697944581facef5e1bbe018c2af72ed75681bd33a249b560775496cff63";
+  sha512.run = "47ee6171ad7c77e75cb72814dc207a37118b7ede9ae07f49b3195063df282c38531970f294755e738cdcf7e0bd24e6f0b8917a54031bca9378050cfc1832c62c";
+  sha512.doc = "0d850947c85a023374bd4a404a681975259473a0e414fa8057868aa759e23581a2b2feaadbc27d0f8a4b7acba7c44fee0c95bb3ce7b45aad21dd8ee69ea27eb8";
+  sha512.source = "aef1f22c944cee374f8394127bf6912f3b490b8c368fa400ad8c6be7809ac6d66d975b3e70399a310b54e580e8865c5dc722ac5f54fdc424ca04ce4df13dd7fb";
   hasRunfiles = true;
   version = "1.2";
 };
 "monofill" = {
   stripPrefix = 0;
-  sha512.run = "9face849593a78025a36caf3f5eb4600a5dbf4704d6fef6915978c42544c9b3f8df096e24e0985986c3ccbccd880aa020460490574c442e1ca39837d15f4b371";
-  sha512.doc = "21d4402f496c67d06e1732587229dab38b2927ea284814768a5a4382133290bf1803dc64d5c3af2218ef463f7510e7f58fe65b58c5a0ef36288e4f69b2237355";
-  sha512.source = "e9fa619f4c14bb3f6c1590c2c1b607eae4fa91730048ee88d2628bbb2c42d014a1b775b14f61c58f4bfe1837022bf0b0f88338824ecf4989e9050633b613ca03";
+  sha512.run = "a2f8ad3ddf134b934c7095d6a97d840ca17c62e5726c9982ead20586986d8000d8aaaa5a07459af3fe9a243fddfd2818079715da616ab6e4d682fa23673a113b";
+  sha512.doc = "ddd1a1fc6fff098cd9327a037bbe32f5755141dab82f097537e17abf00e73485466feff0eab1ce1c6bc407cb234d18161711206dc1e08b28fe1bac3c07d3d717";
+  sha512.source = "2e9068bfa3c95c90cb83477f2d834e513ea4e2c85328dca0916cada22cf5295a6a7c2fea37aabd4109813b7976640114e8624731a1d89a833f820d2687b4c9c7";
   hasRunfiles = true;
   version = "0.2";
 };
 "montex" = {
   stripPrefix = 0;
   deps."cbfonts" = tl."cbfonts";
-  sha512.run = "d798bc54e39a29a206dfae2af6839688e4330cb5a58db818f66e91e346645fbe944d90e8b0698f3da901b72c9fe0c63433167dfd198b2e0fe82989e54199f681";
-  sha512.doc = "53d87141bc1792a0da8c5620e29109a4a2811fcb16d59ebfacf7a7874c94013b7d65e5c80464dbc97ed55017ba49b62cf62a59b094363092d7e59d2070562bc1";
+  sha512.run = "8b045195f3ffcd23e87ec68bb32bcf7dabaea924c2b02cc5854161047449cc344c5a5b26bbbfa54d1ca43d1aeb438339f123c8dc5cd29566d0134de0fba637f2";
+  sha512.doc = "7cd9792d75eadc63a00cd6424dc31e24b7a79b8d5eff28d8ccb8c22d829c930a9624043895885c7f8f046e719d6ff53fe436ea19414b561fa344db28c29cbca6";
   hasRunfiles = true;
   version = "IVu.04.092";
 };
 "montserrat" = {
   stripPrefix = 0;
-  sha512.run = "6b81e84da031f61aa9821b7ca639355bb01afd6fe5acd7997a8e5bb012f38f082a28aa621d7fd119d8ef359a0a5aa7a1a0ed2176e381cef96ea7f14dd7c9c3b5";
-  sha512.doc = "3a548882798e78f8e96072363a2346386c6168ebad21d7b8ec6cebdfbc97d8cdb04ae51cf382a86f8a87884165cc90a594fb6f446ee72e5d7a85e88e97633e78";
+  sha512.run = "b9d68d28b298464a2b8815cb93cdf6b1f729927a198d793c07251a31b463dbe95d16056192b3dc16e9256458c7e0a7889c95e1dc994c668d09b2efc2677225e2";
+  sha512.doc = "d3f42720603eda54039d3d8501e31e41b8598e5427c568eb597b7a607b82ac0ec9ed8f6099b030edaf82780dcf4301b92e37b221f731f548ca2cdfd1715438d2";
   hasRunfiles = true;
   version = "1.01";
 };
 "moodle" = {
   stripPrefix = 0;
-  sha512.run = "9fde7f6207cfa43d115bdb7e62e5cfbd5aa20e34e1f738f10be3a16b13e8c4a855ee950780a204995029899dd2205c256faf0a070f7f5e3a68fb7fdb48548802";
-  sha512.doc = "dd7fa577d07b282eb2321b4974690375376b12e4c24577acd12bdf92693f1aa050543f6bbb4d6466575d88d71f00ab9c71abceda284dd1ca08d7e8ba96bb4bd3";
-  sha512.source = "f6467fd3e0ced4adb54cae03715cc8a0ea17aee37418846d6b89cc64828b70858ac88be5fc7e6fc01bddeb4158dcea60e13146df2ffae935431bf1f8d02ebf40";
+  sha512.run = "34d28fba1f52fbf4bf1d2407933da7160da4c153f944da8e3e1a0542187bf78ab3c8f743272bc83772aba09b2ae6aaf5356f0926e4bed8f2e3c92fe84b985071";
+  sha512.doc = "03122f73ed4d31b16a8d514368343c6066523b9e88a55d7c628ac2d86ab5961f3214c4c98f786e43ab8bd6f131395e61335dcf03a97a9e887afc3a05c2b29d8d";
+  sha512.source = "e34ac82c7d21cc7b956df9cd60a9be134f8629481ae9cd34f956a788eaea9f7f5f9430b677f3c2f2f47d24c6c396169c2da11f04ec4537195a7abd79a905fd2d";
   hasRunfiles = true;
   version = "0.5";
 };
 "moreenum" = {
   stripPrefix = 0;
-  sha512.run = "5be4c4f56483acb3313029285a9a03798f26fa730570bda15cd21b463f8137930f51d6de1ad45348e0a235aa8750a20823977a1a935d4c1af2da2323ab280566";
-  sha512.doc = "2e532db6b0911ff0a948713c21f67b839ff8ccf041b2a549fbd3542a455d1e44bd60832d6d0146cf11ce744aa0c004df6c2d2a75d923bde768ab0af3d176d77a";
+  sha512.run = "aed29236fe5a5e8ca34b91f64759a67b5250cdf9ff16d7d63b6da4f2299ee7f324c960ea4240a0c1d75c1187c17c7eda1bddf64d4e0a9e0cff725be10fd4c8af";
+  sha512.doc = "f2a74fef3144ff0498f9c5961b2dd9100e19fa655527f87df08c905f0be407dab1fd8f67b0254041214921794b47a8ecd6eed027deb3fcce4a21ab8bc59e4210";
   hasRunfiles = true;
   version = "1.03";
 };
 "morefloats" = {
   stripPrefix = 0;
-  sha512.run = "3748ce8ab11289df1867faf856bfbebeecbcb3dd8335dd76e738ca9abd41ccdc21ea261d2e78cbe94c9a4af961820635986ed36d9e1f5bad7dc0f3c505ec23e9";
-  sha512.doc = "c389c7e7fddb2870d18a10db99f9de138227547f86bccecf5d64504e378e9b1a722c0ecc2fe8c8ca67d942252f2d139fdbd9e350cee4920e16657b964480f5f9";
-  sha512.source = "877df3c14edf00f3ff0bf22ec2c2dc67c0d044b7d87267735ce9876ae84e2c8421d2a4bb35bcf1e70280bc586fb8c9e1ac2463d0519ebf8910f57736b70f8c1b";
+  sha512.run = "b352cf85e7aed763c1c212a7f4471d13d995ff685b9374c78cbca961e8b2cab306a874f926dfeea41dc51fac818cc23177d48537ba82f35fb6bcbaa217149715";
+  sha512.doc = "6d12d1fade3c748a1d278556ca7491cd63623a47412edc1d6f24df0b45595e8e2ccb87656e02965565d361c6e9200c60e0d3bfc5bcc2b0ad8f9b5b20abee9661";
+  sha512.source = "c271c486073794f7d6e10e7ce7574b6bf5bef57a128aa804e036a34dce3d70e036d1dd41788c552c44f8a0c78312376428ab371c07c56d36872f70819e5a0f4a";
   hasRunfiles = true;
   version = "1.0h";
 };
 "morehype" = {
   stripPrefix = 0;
-  sha512.run = "2575d03680f22c63741119deddc70fb978e6761a42163bb8182cc0045f5c36e9345c045153b22a2a8d1d9c1c89dfc818d4835f625345f5c97a65f6155e426c55";
-  sha512.doc = "b5003bf164033629f616d3917c7d63f266db6cc891371f012b079eae0eb900109be121fc2e2046fc90936c17a40a6da05ff051d3a5b2657fc10f666846313f43";
-  sha512.source = "83f7f633901e6c37b382ef4ccdf485493a4993c9d42cc23a093976ba761bf428f4be85809104988381a2978645156c2515423aa4a101863038b30f99c588e13d";
+  sha512.run = "ee56a9dc4e310aa38dfc8a51820eeea9c08164d40d8464fe66682b7274646e80fd95da0e5a7cb1edcc56e365ec38914b5dfa80944c0ac193891b5a67f0b682de";
+  sha512.doc = "3ed9324e177db4be4f5fb84df7df17aab0e5b28e478288303716746ff3eadfc08891fc5a9108719830ad82be35662948218a1b10aa8f062c0d791ca3db6332a6";
+  sha512.source = "b31b2606055b05f2d6e3de22a88a0068b354622c160754e125f47f13d1c3aba667618d1c356a64a795db75ac2a760590d464b64b50086a3589a23e325da30d98";
   hasRunfiles = true;
   version = "r0.83";
 };
 "moresize" = {
   stripPrefix = 0;
-  sha512.run = "eb43e70252e412f1932f2eb068088ff8ed5f66569d8a18707984e21ea25c5685842c0340979abf5ea36f7172310f156841984de5a9b3c40a53f3528895db03c9";
-  sha512.doc = "34a0ca23e9d2b0caf2c3eb043ab99c8a818c86513ba58d725854627e59621c911647108f6463777507ae98c5ecf4992793f26740cd77a2b4bf41279260e6fffb";
-  sha512.source = "be4e8d84f65c4cb163b80016e0d4f994b86f2e401cb8f7ac42e87d101c02316860b1a8cab748aa09ee0ae6d0ac5f225a00ac49d606915ae8328a06d55e8473e0";
+  sha512.run = "f8bbf3bb070e8a8ea62f6297625918a4ef7eb4448f510aef7c467e856bbfbb010d0ecf433073e327eb72c15e6b3e0078c9e5e35b61d9a8de03fe49c117c064bd";
+  sha512.doc = "d61edbcf14210c746f82f37e8131320252ce3597f92f55f2eb900ed800946880564372e482a9b88a04614ca2fb8534bfb09b711a70c743d68287bc7135dea9c5";
+  sha512.source = "b53fc89ec96d1cfbd275250f79785cebeb73e03416db1a08438ff2035c44e23faa07b497f0b7d6c6a1b118a0eeb1837bbfa83e81ce7c5951f8af48b0b1c65021";
   hasRunfiles = true;
   version = "1.9";
 };
 "moreverb" = {
   stripPrefix = 0;
-  sha512.run = "47cf397060b203f96e8f4373de5627523689fab4a5b0f8271dc48eae8b57e8a2fcd7dd2073f1ef78848fa1d082b7d3583d0be7b68daedc656b9e2eaa95d089e9";
-  sha512.doc = "d556e059d8b38cd13d833ddd7c65640905da53e758c8d38c686d65e107545473ee4a6422c428bbda986ab38fc00b6354944477822cc5bd1ed6340c2392ad8ec2";
-  sha512.source = "941b912f9f19390d88609d31c0fd809e0bd7408ad619cafa3141dbb51733f0fbfb14168416107dc1632bd497724ca03d37a1c8489f940d3027f3d9fe0d29ca14";
+  sha512.run = "085ca5765f86334a421127e1061b77a67abe1651451ffb581c53cb7fbdb1df944b00456b0cf572d79900c43e7fc99fd35913604b1f3cc9d2c0ac12957b472df9";
+  sha512.doc = "df8b481563a1654d0ff00c8d22137232c61500deee22ae1fb312bc5eb44d1308ddf2ccbc793285169ab7fe506b34b62cc8dff521f6ae7819195f7f86a5b81fa6";
+  sha512.source = "471acf53bcc5ace750c68f59af79aab1b6e6aa02f66f0a0f3aa69504422cd4a9573a89315d384800a2c3e2888449dfb0fe1e40ca145e00e9683c1729bc646890";
   hasRunfiles = true;
   version = "2.3a";
 };
 "morewrites" = {
   stripPrefix = 0;
-  sha512.run = "31517074aa3713596080d2f282cb250b659d7ded583c143d3007674c9c290613365083b1aea07a190f37dca1298973a7b816a031fa1ed33060f4129e837705d5";
-  sha512.doc = "1a0a96197264d244788e0b3f92ac30d326902eff60af6363bc2b5abb6b98ff96fc90e59f9f3d0ab365ccd0fff797f8ac401408b757d76f71f4e4dc82116353ab";
-  sha512.source = "d011f90c8824227114a2c70fa21219dd1c527252b91949c8e54fc7875eeb2ca69d0ba02fc59d7cf2f2fdb38508c0c9642ef68513b99fd7ff1419ff437b42f8b6";
+  sha512.run = "0d7f76d202733a9fc87226a9dcd1e57234f78b8824509f78d3d9beb236b1f31b3407e9f326f9788004efbeec78d439a4e262eeee0d6be6dd0dbfc98dfe3b6b48";
+  sha512.doc = "488fdb93fa4fcbb0eaa596e5a48146f4ad8fde32121556e70c7ef4d2f39117c0885679c79ded838df017aecf4ea3d68c9ed28fa51026f3a540569c240b773524";
+  sha512.source = "a3a6c058d4ad1d34ddb2bdbd66f2c3059ba142152bb82ae6f9af4d143965611eac2da73e348331c73c71af7bcc777d7815612fbfb7df4918a75901d9b1bc415e";
+  hasRunfiles = true;
+};
+"morisawa" = {
+  stripPrefix = 0;
+  sha512.run = "d694955be45673b952ffbe50cc711d9d93d8143c58f44b760733a502abdbc863b1a04159da9aae9feb2c40848bd69587069aa2f46b3497a9ab5e7ded6bb51ee7";
+  sha512.doc = "a54a78d7c64dee995ef05d37dfbb90877d7248c6256eb4ed944d417eba0213cf51cd10e69ed656d90b3edc81a6cbc817de81c254facca646a1ae9ae9ded54b2d";
+  sha512.source = "d3fbe35585895127cd4e335f7d9b597bc2c77a10725ddcbead32baab93a31a1f705fb4330595b0baff5d9c0276fa5866a9455a0ed5637af975fded90ca7be89b";
   hasRunfiles = true;
 };
 "movie15" = {
   stripPrefix = 0;
-  sha512.run = "1fcb97d8b65476714584c22c7b9c397ed06a04c77006cc8a3e3847f29cf10530deb6087b82e4aeddb87ce64e2af2b579c0fb5f78677bc23e4a629f41bee5542c";
-  sha512.doc = "8f2235d8c6231e093b9c50a241c0146b1e254a67406d6051cd3171b4dc0d8d0f9934d48f36cd5ff074e71c9b95f658dc05ff02a92af80f01194c0bfd0c842c8d";
+  sha512.run = "58348557bcd037e0e0d645e9d7f1268620960857374c3ddec6211708f9ed01fbcb856da15b09c35105a61740adca269a9ba40d8b96e4216c0d7b54a0fd1f3978";
+  sha512.doc = "a37a02d7a18cc5f25aecbb15b2b3056c6d6aea33d57d70294a624070f020262f3d8c4e74db1dc933c7c63b73959b261e6c2a42e01754b90e3f02233a2ac9e789";
   hasRunfiles = true;
 };
 "mp3d" = {
   stripPrefix = 0;
-  sha512.run = "c064b86dd14d87bc3859bdeef6b8d931e7147182272e51649650afda8f9eda30711e5a19035d168b98c4b04496cea2d1d7cbc15d821d77e5b867073e2ad5a48b";
-  sha512.doc = "7c323251fc58fae31b900b63ef4be928d4f9a20795e31507a69d3cf819b2b37dc469996ba489dda5d16deb51a543d71c73157a9c16a1d3cf5f863ee181b0f97d";
+  sha512.run = "aea4ce09e6290a2dc8c0f113156f2f45b020759ef6782869081a2ff60cd40f205e09b1b6187d8e54adae4bb936216b94f6491c02e4a1039ff0909794590de36d";
+  sha512.doc = "dccbced8d142239a8302a24451826fded826ccd3a0228f7a1e2aee7b03c45c301dc644d376511fca4fa1cfdeccca76e1092f2836e8c9c0ab882416bda377cbc1";
   hasRunfiles = true;
   version = "1.34";
 };
 "mparhack" = {
   stripPrefix = 0;
-  sha512.run = "ece053107d79f848a650fd7cd378944af31878a9f2c4bdb118796b73997a9e85cb0f2c3f2367041060933cf674763d642f37afccd24f4582d405835c4d036f24";
-  sha512.doc = "be040dc8d21f7027e571842ba2e726089baa7bbb0fae107bca2fdcba70b79eedcf62c959aa3c2c70a655bc048d3ee381da566a7001ebe046f6841bb41fcccf4e";
-  sha512.source = "fd465dee5da550756b612de8dce528895b84084690238f25473bd825a0bfdadf7b85b80973bdc92123c8fa185fa59860237c5cb4547a917d73a636f79fcb1656";
+  sha512.run = "b6aa2a43966fe6203f571160004be3dae60abd6787545cfc0ed61227a3ab845ebbdac5139f417defb7857d0352e25e473a8374c2d919798e438785dff3c71601";
+  sha512.doc = "3ba53ee761fe9f1be08ee0ca91950d7494e356149cc1c083d3faacacad71af484bd09f067bb0d53056453369c121c0953b05e4cd4868e2b836a9d882ff0c1472";
+  sha512.source = "68e2a8a8a424f4a09b468a3826f658370032d26cea6d5588f787d01c1a61c0632ef0a7ba252248962d85f610a620ba25718fea326f9726f9183528862f610d98";
   hasRunfiles = true;
   version = "1.4";
 };
 "mparrows" = {
   stripPrefix = 0;
-  sha512.run = "a009f3e80a6d57668540ffc4c0389b43f9b02c1d72129344cbb6b2e00466b75413c0662e1d6d18b7a3ee28bcdc3541845ebfc3c85c388f502cb59ec35b3a2445";
-  sha512.doc = "d24cd5bb790c72a01a1b7678646ae97b883ee024760d025350f91f74a32d48cd3253c3da99b1aeb4b028fbbeaee0d6d579ece46be947bbcf1dec027acf4c18cd";
+  sha512.run = "939d331a3385b951a337c23c95b462da54590f61d871d3ab6dc618f3ffcc650e8af739aa396b0cf40d9431e0825ed3407eca405906da3c50c7a8dc84f44f1fde";
+  sha512.doc = "1b946c5b10aacc8664d9e8f167385f462c1a43d400e65ece8a57a52480ffcf172fabc8da8ac3376fd40412eac9a34d6f6a0184405d2a70ae89f3a44d5349ec76";
   hasRunfiles = true;
   version = "0.1";
 };
 "mpattern" = {
   stripPrefix = 0;
-  sha512.run = "7b0bbb7d7b2af4ad9b297041a03aa427e483fdaac744dacbcdfec88fa5863babdc19f6a956e3e8e792be5ac35151d63723ba2098f27961187daff052a72cd228";
-  sha512.doc = "a8940332cee4f62de2db7e3edd0274c17b34dd4aac2d4f22e3b92f454d7529725f7c346d6232d63a71d0cc4b76188a21ffbc8d67985f91ddd54c1c7d19273f0b";
+  sha512.run = "6cd202f5ab5f5da84ebcb2bf04f9fc196f21e9a447d312fe2cd181a0e3fb256f1ea6109a7b0a6e35ad58596a5220b807484cb73eb18d8b9265171817ca7c1457";
+  sha512.doc = "4c735bac2c430d63d961c2e9b6370b74719735fe2106ccc52d9874efb414b66bd5c3aa7593ef131889a6cfbbcff6c0221c8460e8d89581b4a184d74538745076";
   hasRunfiles = true;
 };
 "mpcolornames" = {
   stripPrefix = 0;
-  sha512.run = "1bcb5e11c23d239cf889df580dc059add8d33f2471ef68052cfbecf55395858dda55ee92a3d6cb19e311e2f9c2b3e4566002dea33df59005d6292fa38020c438";
-  sha512.doc = "829aea70ffba2c5b92a39c655d0d8530b2f3e3dc337413304c4852e4f4a511fea95fd1cfb2b0489e96ea4ef6de8319f7612df776128f82fcc2e6e09231fe5aa6";
-  sha512.source = "814723976f227a0365fa05e93074cbf6ac93825902af18faadc581d03bc0fb9cbcf255d46429ece790c46fd9a749b71f367f4d495edae2b0f3e00c2f7462c525";
+  sha512.run = "eba0a6fcad7dede3a040e7cbd63c3eee3dd980a66f76f54353183d06dff4fd56c06eb219d42bc806ea5c0624447b8a3f29452c25be5af2d8a0fa8ea1257db9ff";
+  sha512.doc = "a34c39c5a0d967987a7f932174a583aa2564f0b86f42c64fba45bd09c4f8a9acd1f5446783a862f9b0fc16cf246e4a72f8b739b03745ce8f257aa855683c0af9";
+  sha512.source = "fad89f7e49d9349b94bce228d82802137ce4defd4c87c0d73cd9bc6be9ad44ab34165c0f3c611aaaa03347753b0b05bf3292ea85ca5df9128ece6562c89499a3";
   hasRunfiles = true;
   version = "0.20";
 };
 "mpgraphics" = {
   stripPrefix = 0;
-  sha512.run = "7088f755051bea94e3c5508c2e862153ffda33708941f91cfcc402ad5cc57f20bafc5a21015b44c3cf5cc67df33853f7067e59b51f46446b77525c04ac589e5c";
-  sha512.doc = "ea12b23b2ecdd4598aadaca42062d36bc15fa71c6a69e0e0c575b4b8c34d32d87a97ef7e14b93bdf630b748357d27ee30abfe77b193cd870040f7ee8ff69028e";
-  sha512.source = "3195462e35b4472b35ec46c8cf545759ef89ce588acc5dbdb4ddd507f23ccb830cb0f38ba92c3214b6b4db846ef0f5c0a198d8437c8a4d721b27a3fb2d4d8e5f";
+  sha512.run = "32c102e3d8fec947210609f45bd84b22942c17c61cc29faddad24caab660ada928ea18e06028608f474c55f03af36836984821b341cecab3973c8421d6b824de";
+  sha512.doc = "2734d766809a8fc741373c578e0f9dfd15c0c9f5e0ac55b6a5211b1b44a9363f691723e9b9ab8a887e95ff0fd73aac5072ffbf91b9873f2a1cb2a20feb98aec9";
+  sha512.source = "09561eccc248288efbedb4e29a19ac5eddc7e0ccaf14242c6b8fa97749c0bd6c99f0db9bbe030b5a3ff0f2bcfd092ebcbe599db6df8e0b67dd65e75c1ab5021a";
   hasRunfiles = true;
   version = "0.3";
 };
 "mpman-ru" = {
   stripPrefix = 0;
-  sha512.run = "d604239c85c968af34cd012f8565af5f03e86115d4978ce9dc758bb8255a8fda60bc92c87837c6e4f6906b838cadefa03573dca8af898aa426cd1f8de79f759b";
-  sha512.doc = "6ab711c12d6e1f8293ff0564d3fbfcdff4e2e976d8fffb1973652b4b1da18237b9b645e9049d0d57c0b12ac2691da8c16c92781964e87067de1d7aa9f4d92936";
+  sha512.run = "c94124d69f09e0a3b07317f8d426a46532fe1fd15d807c68e4f6955fb7a6848fab81ae3dc8f44118a69f8be866dc0e411d5530b4c479c430189ba39a9aa8c7e9";
+  sha512.doc = "1bc1ae9c56662088f81fa54b101cb4cba68e03116c44754d58ed24d2481b6e312da30a547f471a988c82272fc3e314e5f1c3592103c11b4f16479fc95ee5ee54";
   version = "1.004";
 };
 "mpostinl" = {
   stripPrefix = 0;
-  sha512.run = "3286a2f11381d95bc095072f959fe4c788ab5060aad7bee6e0cff7e1202196063870f519fdfad82b8df3fb97074c2d3780c1ae16b6b21a9e77c96ee11ec3ba31";
-  sha512.doc = "028d558d9878bc8d12455d6dca0c27a1371f3dee4023b30825aead264ad8e476bffaf3f349c8612f604b774128fd41ac51a68701bbe40a4a6b15c29729eac71e";
-  sha512.source = "229598b6a6b2a063d2c667ade894c8399b2672137ee9a8ab689086ded43e9368c6019658d73acd7d438556a3a8d59d9610006d1a685d3ef0e878d7906c6e00f8";
+  sha512.run = "d1196fb969f16ce35b1c16c75b67e16d477c4360606ede82bb6231709093ce99f7ac1ee5a65271a808f6dbf591053bcf44a97f8088dc28ad23caf43d59ec0c01";
+  sha512.doc = "9f4a9218d70ccff7fd8f4483135caaf0c56f1e33e0b0e09a7bfffa1df677f9606a2e753382c621a9491c80e5c437cb78c024e0039c7ce4c70da8bb9acf51b147";
+  sha512.source = "d27882d5bd3d3a740d4f59a9054242d6f53c1efdd5353252b34be07d5628b302e9e92d1794e9ef241276ffb1f42baeddb638825bf1a31440ff8b52d52544008b";
   hasRunfiles = true;
   version = "1.4";
 };
 "mptopdf" = {
   deps."plain" = tl."plain";
-  sha512.run = "1a0a3c3c63428cbff613f9862d51c0245ba89e9cc96b92dee960c6410163aaef10c47fc46a6d76e7357f527fb95f2d7fdade01302b6562b9c8414bf844173d32";
-  sha512.doc = "734b618464150608d29e7995a5549f7f8ab33c2d5d8dc23da3114c0b9e2d897c6d401de2e9d63fa8eb3fcd726394699942edcfde3654e000c59904e9690c122b";
+  sha512.run = "8cc056d2beb65777bcb98e8914a41a1bf7c35c942e9af89410cd9af32530d2bd62b39466b27a429d5856441c6f74040a9d85c59d72e5fab9ee03b044e1f2d51f";
+  sha512.doc = "67ad71ab2c84f87d1256b1fe3fc054083cff530f91136bc7e03ae9e3e05c177170397be07efa4fd3755b71d7716b75d182d99fc3e234318717b4160b1117b3e0";
   hasRunfiles = true;
 };
 "mptrees" = {
   stripPrefix = 0;
-  sha512.run = "71489744778ed1672ae1d82111125aadaf17d44cc37bbda9cc2e637429b33e74cd3e0446f6cd65e911d6d1e8ec2c270ea63f1a630f10bde0c94a941501050c55";
-  sha512.doc = "40a470f16b38400a1e588cdefa76e78cd275a7e05623c74b78e1e7adac559f6f1dff2086af9f25ef4348af86f39da8dc24f5193097616da634c38750a202c201";
+  sha512.run = "ba988e8130c79a6a23ca3a6686a0a254b7dc12be92a6ab8ad2ff7a8ea425b9c0cfb0ac21233e593d33c3bc0c6ba41a649498fda823d6fc2fc64df600e82dc733";
+  sha512.doc = "26605a6065f437719c3451bdd992891f0dddff9595f1aa06d1595ed63d1a7022875ebfd801cd2fede62aee75f9f7800849eb59b03391d0e14033a4b3f78f201f";
   hasRunfiles = true;
   version = "17.06";
 };
 "ms" = {
   stripPrefix = 0;
-  sha512.run = "1f2301109edae3e89e2f076b1070ffff8024dad11b65a6adc5f78222c95bdf18c670527bdce801e48dee158e320d4ede26b55dbf97c0ffb86ef673029b8c46d7";
-  sha512.doc = "fa535926f826ef8cdd9552101fed4d7ae79ee438964292079b86029890ac2cd904de55cf4fda743340c998dd3f441d87372ba2e0a972e655afa7ad46613c4dad";
-  sha512.source = "400f7adccb9a42743a5c31a25593c24508953b0ac47753f84fbcac2e0ad33aca0b61738f0f446dda414c720defbcac8a6989f12fabe6da7b1ddc8e7b03a5f7aa";
+  sha512.run = "e2b1340bb001b21a5fff4b5397be3992c3f021cf328dd8efaf02a5f3a2c9b1980235e4a70405629d41dbee519cf0b980bfa878c185217d2069b957b235264aaf";
+  sha512.doc = "ca356c3d4ea2ddc9ab501a2b292c25191a1e0179ff91733d2bd8f2bd9dca9673098487e36b9b849a9f70266ea2c724b3859ba89522cc3904699e69aa8a8334ac";
+  sha512.source = "c74cc8ca98b198f2baf76c85f8a8ac7aa607f55215d98874067661e0c624e4d72f7170944b48d721fb59fde9b17e4897a445f44d5b23d84869d7dc56c6174eac";
   hasRunfiles = true;
 };
 "msc" = {
   stripPrefix = 0;
-  sha512.run = "4b12d35e16ba4406af9774b5eb4b1bd7d9dbf6627864c9e298ebbd5620b242a0148fcdf6e77e20875417d427d37df0ecac682b213d425ea2814959f55282b10d";
-  sha512.doc = "79c29569fb8c9d0395626a3027db710c09822720ea236a4cfbc8739cccfb9329358cafd59c32bed54e19ea68d7374a86f84d0b2842923100da0fd1227463a432";
+  sha512.run = "560f60beea10d71a0f9d1915baa58a893fd2e14104accc72bf513b1d269a618ee1553be0714c8b6380c0065191fe45f3a529897f1cdc7f5390116d3ad8c0e8ce";
+  sha512.doc = "e5c0fd8ab06b4c7848f080369a384e8bcf9c117dc21907b15c77d356a7df98092bb491e03d9809414395cf27d6275e534bef40aab8d5b5bdf177104b8658fa7c";
   hasRunfiles = true;
   version = "1.16";
 };
 "msg" = {
   stripPrefix = 0;
-  sha512.run = "930949ca1f1989a22f6e0dd0cf9300a544b883feabb09385fafa47ca7073e4598677133a3a337c4ccadc278546612327a9f079851d643a66eb540c3d04308a78";
-  sha512.doc = "843bd4b9479045e928a509deee926ab02f53ca019fd9b533309ca4b04375a60d53f41c80b24df3b7db725dc5667fb2a80241e2b5efd079cd876b2df77d8d95c1";
-  sha512.source = "40fe8fb7ff53c378f6db6ac2aa8d7ce65295f9f25649af85e676da9a2a3f82cd0d11b321a6220172a97ac38c7505a5b3a3ff46202dedefdfccfe10f775c60366";
+  sha512.run = "733363128ec4d7a54574e2f145a224cd7daa6cf055187dc6a4e2c068cce220cac48257a2e05e0fa1cc8240a82ced71d9b0219c65782ede370902b01b1adcc025";
+  sha512.doc = "7be5306085dc5600e7b82d5208608792e60d87a9ae133c4945e90e2c33a786e37b424304724b33448ebc9d35d1562ac6328de108f07b8af5d676e8e56894f256";
+  sha512.source = "9fe057e71b3528a7e3ec0b8c9fe858b6ef828788f2d781d711cc671e26c1081cfc930af5b2cd0a3fbb48e5d4708188df409dc098803902de9802c8515a99490b";
   hasRunfiles = true;
   version = "0.40";
 };
 "mslapa" = {
   stripPrefix = 0;
-  sha512.run = "433d54b3d636177f81825ef37513d8a588e1d606c503ce0d2a17a1b38cec25784978ac550a0e970c3fe170bfedb10bc6458f34dab3343992a8b5b65f511694cf";
-  sha512.doc = "f6de43d6c0c5cbcdada62104108371f813f4cb89a121ec35d9cbf3edda693383f1f5164696abb550945b070f551cd1e82ceb3d17095cec7876d26241ba0c342c";
+  sha512.run = "86e5864b0f027e604bef759d2923d9fc07ea4f195ac2af439728c684716e615733580aaa66159790e8bb904fd4ce93a552942db889e402e99af1990c006a7f21";
+  sha512.doc = "e22dd5dd4fc53c0289d506cabafe48c6bd119fcefe361bbc99f2e118895c6cc3513ec6f1ca9a9c9a1b38bd6b2cf7e9327ef705f45490c5852c2decba3e0f05c7";
   hasRunfiles = true;
 };
 "msu-thesis" = {
   stripPrefix = 0;
-  sha512.run = "9649c84b3a6f0199a515b65c2a6f8660b9c060fc5c4d12f37cd7bd66fc7b63094c658fe4a6d411b738d361f9941aac233f12b24f2f0bb72b50568d82b280a086";
-  sha512.doc = "6172b11c5f80186d19014b9d8f8f555d9fae345eeebb28783aacf89e1ab8563ce68144c0fa54a09144f247cc8b6b9b570cbf6396523b85ae1a86309d90ac863f";
+  sha512.run = "43c2849964441b17d8ceb333ae04e302d354259bb3585b0711d4d6f8a9bd42022e246dc182f5b1a1e7d886a0f720e27d93dd275d1f7ed85be58271b7b41bcb20";
+  sha512.doc = "511db06331d063f712a6efa265a4d4a5f0da13d858b4f9486af2764f91ee1d6231fe0c4b82892dda764ecc79cd2a7b504fc406c91878c78c9b3272556c44a612";
   hasRunfiles = true;
   version = "2.8";
 };
 "mtgreek" = {
   stripPrefix = 0;
-  sha512.run = "51fd40798e047d2a544fb8524e21aebd1938d02ef65c4ae9afea7decfedb6fcbb057c1cc264607462bbcf48eb90088447fa8a750eaadb184edf12fdaba574480";
-  sha512.doc = "029833fc8636770c294babfee0e4ee29861305c69cda7807a12c6ec8987712271b91c81a5990594bc4de2a121a644470bf97776e2d165b3541f074c843ca632a";
-  sha512.source = "042b43808c180d40ad4a6ac3c0194a14872c7baeec3842de1a1e0b7905abdb68144e24707493d8e53aebafe9b47747942b8b6c61e1fe24055ae9ebef98520150";
+  sha512.run = "d378190e882a69454da3a34fe221a890f78694f65a4e921140ecb1466fb0c2df7523c34cc1e7d52fe8ed7b17caf5ac815eefb459d07dcc4ca96f68e8640c4ca5";
+  sha512.doc = "a0737813965472df1811ff0b0416e80b54b212a86713d5bb864f178789d6948903c3bae380db70bfa9bcc11ff49c8027519310d3bfbbbbe548075f6eeeda4756";
+  sha512.source = "4582921ddd20a0c1254f3600a919a68f83fe71032d03447c7db729a1577a426560fa92e6fb4a043003a4f477f9ad408566fc75560b05bf7e3ee024124c9e20a7";
   hasRunfiles = true;
   version = "1.1+";
 };
 "mucproc" = {
   stripPrefix = 0;
-  sha512.run = "a5c60010ba40711bcd7d78e1ed1a7bbf0c883ae2db013c6095d1036c7c025fd77e212d09cf8c5cb7df30b70d120587f6cc107d15a840c818eaef50964d418725";
-  sha512.doc = "6a3189a90f78df7ec49b230b859143529c525486926a0f13284013bf0bf1e420595534521982e39913829c0965e8c28771954a11295bbf208e720009590f5484";
-  sha512.source = "dd1298d53b6f420e4c4964d10da595878934cfd3ce482ce70089bd9a42ff1dfed3ee845f824a1463bea8d322f4292916a45109f6118d8a8ed493fda51d07af61";
+  sha512.run = "d4dd4dba61ecf366c27c4dbe0ceb569381c6b07d6cf990b852164addfee557ba5ae59d019c8a8066343074dfe364e4bf005ee28722d5564019e5ecb7df0a0f68";
+  sha512.doc = "1d6b3378686b58023dc8ea39ff3ace838232fc1168e4c093b77cf9611c359ccc11b41623f629780aacedc87b544b640f79769d925a1fe41810da480ff6fbb578";
+  sha512.source = "62df473565c6d8c7cdbb2ea70bdb8a4d3adc662ae711f86f8fabed78b2b9b88fee4e6a52e92d5b2259a37d0408364711b14f48b53136f525e07f9f7526edb698";
   hasRunfiles = true;
   version = "1.02";
 };
 "mugsthesis" = {
   stripPrefix = 0;
-  sha512.run = "ea972c1291b8c13fd30bafc3c26f6698364e7463ef66986e37715050d5e07b0379f297fa4732cf5b01c964d06cbbd10b54bd21dc83706491e40b6af06608a401";
-  sha512.doc = "5daa7b3b4a30beb9af180e3757a2cb5b786d640ee7d47ce1a42bb885bbc52fb552729f4eb41adcef238c22c4d22872d8705f6f573816b8bd2576292204afcafd";
-  sha512.source = "41d9f4c664917b9a81455ee2d0e28c1c205168fcb47a151717b1ad735587c3e39ec095e279bbc77bc9bfd90b4b9dc89e681d9ec7b4ad436bdc244ccd00e45d60";
+  sha512.run = "c2e1dcdc949b301e1b93c033d2003760c1f56b5efb0d328f84c8068cd42bebcbd7252eb01e324fcb226b5a7c78cc86fd5bca940119a736aabfc92105a8f650e5";
+  sha512.doc = "0d1d9e7d47e5edc8059dc0875be4e9d135558fd1d38c99cacae8fcd6e68300623437dc6f145d47cea9b968a6c870ff6ab21b9de6fb4d8bcec2b41a9de384b44e";
+  sha512.source = "858407db029efef3cae9f935a13fbc229b60184dd864eb4aac4710ad1dae1c0131a4533d6dfe8caee659b624da05d1b2ee27aade516adcd5dd199c48a222a9c4";
   hasRunfiles = true;
 };
 "multenum" = {
   stripPrefix = 0;
-  sha512.run = "74d291c0b73368cd4238b4889f67375e6ecc550fa8f614a82c2c653cbe682ac8905624c75e7b32567a5f8664bf3293039f70d775586a0c517a3645bcddb4cd3e";
-  sha512.doc = "1b826002b98050f5a47511dd82223fadd115aa2711e1346f62e78037e7f6f640f3967cc678cc9b57dc686790f59787de4f9795ecb63b25b1a5237e756bf83fe1";
+  sha512.run = "901002dd98b40aff63e303a226938659b83f8fd3c2418c0cc4768b2de5afd7a3f7e46ed1f321ed81f76de23b9057e3dac3ecd0c8372a530bc13b6d143f62f1d9";
+  sha512.doc = "c7fe53790702297911e9ff87a301675281fc32c8697d0dee63379063f02f6c17b0abc82d11fe8fb2fd008e378329c5a5ecb9551bce46d83f2af7038dea77d9a2";
   hasRunfiles = true;
 };
 "multiaudience" = {
   stripPrefix = 0;
-  sha512.run = "909f42535396618ab2a09ae4866f10344e950eaad766de436b5ef4a46fbb692e37b1dc37e79f4b0ceaf8befc5ba353693b5a4ee72224f0bb27bd4366d2560d96";
-  sha512.doc = "7c48e06e4aaf4ed518eaf93918241ff2659117e4c21b53c6c06713b96ebe8b2af9c0ce6924f1924c377636002d63fecf815a1704e59dee2f52bf14c2c720d35f";
-  sha512.source = "3a073c199edf1b2d10f049e4268785c2a2c92aa0ed1562c94cf3e10f3284ca886a746407af5aa7860dceaedcf8bcc3d2e7d90b603fb71d1deb2dea519847529b";
+  sha512.run = "78a2a051ef7f7ca8b0bbe173e88bc4b64b5b623580b316bf31586f4e67d074cd644573ed18bf6a540bcd897828494cdbabacbabeb42ae9ce328ea9913bec0bd8";
+  sha512.doc = "43ec5920965e2da300e218a0ae99c708a661e9cab2324db5cbdb5602ea1f20bc48aa49c3a2ef71ef4dcc4d10141233ad07e31f35f394245b6bb8e97ddc0d083a";
+  sha512.source = "2de57ec7301c11d0cac77045d619f79cbbfd9f0898cc3fe526842b2bd8b2c66d52a8e17654c1e428918c02421a16e66f218579d8f5ca94401a1e71ff27e9ffb8";
   hasRunfiles = true;
   version = "1.03";
 };
 "multibbl" = {
   stripPrefix = 0;
-  sha512.run = "faeaba34c94c07fc8cff1c7fab4db5d2044ba92e82d6d6676703cd8cee36c24f5a72ddf89eb5cd359c35a95ed1b20146609db91a4de6fb8311aaa088da31d16f";
-  sha512.doc = "a6e6e5365b37973109f053d256dd74078d2eaa18ef8749f85c0aa07ca14db229564113c40e8aa34dd93419b55d5f214899cb1c055e5a20bdc4285e9a126416a2";
-  sha512.source = "8c1ee8ee13f24a91d39a0dc7da7dfdee34d5bdea8f0cae9f459c22d5c2e59b199591ac42eb8aa1285c638514674c1cbcf22c46ed377dfa871f5b6cc0a2d85bd1";
+  sha512.run = "243ac801f32cfbb7236a7d84c56bdbfcd906fb938d73c2e7cabb0df02352f9d5e82a89a48a8b0184e6a8eef7b754f17cc25e24407a017c70fca9fbf436238ee4";
+  sha512.doc = "dd5c18fdf75cca6edaf3a306b34ba504b645e2060d43781417ed54e65be5b2b27ad20023c11683dc758e4f62fab7e859e2479aa0b165a411197e9520d1749940";
+  sha512.source = "f89177795d5062e9beafe541f75d56bde9c4a66a6a82a999dfd06cc524d68c1df4eb73203df48cacc05c4d3ef979bb300443af1042ce9ac0f399d3db800bb170";
   hasRunfiles = true;
   version = "1.1";
 };
 "multibib" = {
   stripPrefix = 0;
-  sha512.run = "fda7eccc426166efc98a93fc7abf9e2e665734c083581237e2199ec85165cbe458fcd474924e4e2edb58f3bf21359d685b517e8a391c7c3927b6505676304249";
-  sha512.doc = "e6ea9d46761af9b58e7d1ba478ed3f1e2a46bc76a33852d85317a241541aa64717018f1def3ac8ca6ce6854dc4220b6e4bc25384a73b21c24cf9ec10712a0c18";
-  sha512.source = "eba7066242e2762a6d5a3897594960a05841f7945aa3a02aacbc3390bb11cae9d81ad1d678bafa3c9635fb67ac9a0d53bb238792f6bc96f6ba6b77b372d9e0ea";
+  sha512.run = "878c79df4e21eda2876a1c33191eadc742aea5d0005c97b374415df0b4de494a1920c1d13ab87ab75f8846f953c8553fbd69fce9235a19c51502c67a98651a53";
+  sha512.doc = "6449f236bbc8daf6b7d607a30d69daa93bde20ed5e383bd97f980cff9e8b2f1a8f3df33a3614c33e51d2da84f2a51bdb9e4b76ad5b2281002f938669d01b806b";
+  sha512.source = "de017fb36f8a838c5848d06ea53c9ef44e599f74547607e69d03c7c862179c3c6630da0523dc163ff3bbd444422dc6c5635195710348f7bb0b2f0a8f11009055";
   hasRunfiles = true;
   version = "1.4";
 };
 "multibibliography" = {
-  sha512.run = "5b0c126b2061322e50839572051e274946665d079be7e536597c93fdbaf6c14c18203d9cc60b74e630eff5bc852ace22ffdfa9b308b55ee79280a8944b193f73";
-  sha512.doc = "419d3a65b0060e078c3414df406d4c56e926cc89d6a60f89e01b307d88502a828d3aaa7b8180faa77736764fe2f25a67a8ff5357c5f41595164ca7edc855d543";
-  sha512.source = "ef4bc48ff81302da5d87eedd3afcd4cfa93fdb8bab1f9b79d2951b14edd6cd8df09c66e6fa745381bd101e4251106974ce5a5136af4382193cc88c096f07debd";
+  sha512.run = "9986d47132abafa57620c8b667d7868bb8fcb9cf00f21df786bf40bba81fac51380e94bc0bd371659cf7fb1eb23a057d72a2e8fcee100edc850f2c9447ad4c7f";
+  sha512.doc = "987531138a45f5a8f5790fd3ee023ffbbe17353011270119d2b696e02b79eb9328070fae7fe054842610b21a116faa7f872f079b5ec4bd6646ff4482644f6f02";
+  sha512.source = "8a6260c775e8c5f264724e9a523e9dcff36f8e9d2f870d93c26f71580125584116400ce1a0be27fefbcd9fac22b38e464f35ecfbf5ffc4f49f2c7c8080f43551";
   hasRunfiles = true;
   version = "1.03";
 };
 "multicap" = {
   stripPrefix = 0;
-  sha512.run = "453d43d9c521d6646b75656ad31ef16a300183ff4ab9ff945df759ad790970bbda6583a8f34d8500be1a10bc8278f6f96fb96203f0d750f62a6a040b5f5f9517";
-  sha512.doc = "f59a1b66ba100f1ca2053317a2d77897be76d5314c0d339e6b6a3d4f40fb5cc60f80602edf7ea1b28a9f062b3c7752cfd4ff5c4456ad6ee4a4b896b7dc4b038c";
-  sha512.source = "d549d1fdf2a2e164410fe7d0fad526118c41f23aed87653f259faf05366bc6efa95bac30ac56b270c33c700d655b8b0495cceaf6e0c781a3a484c0ab9933c662";
+  sha512.run = "a5e4e2fe7a0975b2a971a9893f5fc4091afa3b4acfec2bdb3929e2c9d676002c23d55aa7db1dc4d60c0d3d3355d433bf5cc2d5ce84fb5747aa52fe8b20a82b7e";
+  sha512.doc = "6b0232a5a23b101989323f6ff551a02365c97b63894f5d71d4c182352ed09f7ed0384af7b78116e8a6bfaf8cd06341c0b4a31d3bba4bf8ad6397554d6eb9bb09";
+  sha512.source = "c76cf367cbbad4330a1276e1e0d3ccf64dc136d6119246af1ecab217c02d987918d9452a38278c7550269f88203c56ade2405ac53595a01646a75a242507fbd5";
   hasRunfiles = true;
 };
 "multidef" = {
   stripPrefix = 0;
-  sha512.run = "b801b8f1066985233d0003e0d80f0ac23eed5e00fec263c7e4b930e45ad46bc23a842c4366aea2b1a9cb1a5e5a62796bbb075810df531545fa055e607748b7fc";
-  sha512.doc = "9b162eb694fd89c697fe2f42ef83c62eb6bc5e8a3f3291501a30b69437e6a8fb80dae47a53df30650f4d5c29a0ca114fad08a105e4fcf6a0ce7be59ecd75bbbd";
-  sha512.source = "87c5869e1bd307c5e051521c79064de0dedd2309516c93d5373f76564a4c5486aea8c03684a3e7c0ac0d90403a92325caf68268966e7d2dc77b337114ca3b9e0";
+  sha512.run = "426c6b820b417fc9d7faac43e9e6202ae8d77f867cd362125f2ea0d0101911942b89e544f37cfe5ad1b2e85422aa6d3cea26158465c47e463010ed295950cfa1";
+  sha512.doc = "a3afa448de003acb5a354e396e32077a4b0fc422d027d595eb2de0a363b076c80c74c5221a105e6001d4a700539ac25e57cd2c1ce778eefc0a7763471f1b604c";
+  sha512.source = "1631c9acfd024417194ee2638b0013d459b6b8239557f94fed1c85a245259d893be7d493138d66d7793fde132da9376ec947c9d51e876be387c321a77eac087f";
   hasRunfiles = true;
   version = "1.10";
 };
 "multido" = {
   stripPrefix = 0;
-  sha512.run = "50434c26d169175deaafcdf8f26e054bcf3dd07785799fdf27b088dd129b13e72fd630acdd96c7a2210ccd8f5d037e69a71f16ef3a6acad25ac9fa838f3402fe";
-  sha512.doc = "1e65843705f8d294118ef6b8292ba9572a2cabb607fe595ca72b8eb380b554ff365b8e051150ed6dc57a94191bc38e6b6b40eeb3310d8339a15de5848b86d0de";
-  sha512.source = "b83842b9c2389b135c5ff68d61c76c392622a350681a8cb19469adb3c84b2189a7646591c8afe8387b0c988cac721b58f489f1b61e28b15d61de3e40fc4c1bcb";
+  sha512.run = "1e542899bd24ecc7478349347b8b7b07e146e1c2c9c1f68c3eaaa87fe4d6073032c45acd0a269db5559f3faf4f9118025023497d6eb00c48926721ba50aa6396";
+  sha512.doc = "2657a5ca63b5292ca030e2488ea8b16b052bcf5d339777455a19b102c54320c3ae576558f6ca708ec8beaac0d9901a13c9d85296f971168fd94e0bd50f4bc42c";
+  sha512.source = "55182bce95cfbca99940760c3f7a51a220b57dcac7650396ca559200be67ab4c50fdf781e767f5074d1e1688079dc3faf7f93a9c4480a07c8d035a373f4be94d";
   hasRunfiles = true;
   version = "1.42";
 };
 "multienv" = {
   stripPrefix = 0;
-  sha512.run = "bc69c3723b6f9b1c42235b3dddeda01547c2eff69bba39586d38d090f312105a509e7e2df153ed395335a4115a05e7bdb609ee65852fba080b13a8c757414a2f";
-  sha512.doc = "e57bcc32bcfa5b896ad49a7d8bf6828d4a6e879780e92dde231397ed1efbbe08ab8dc35f5481e678c3f762669eb1f8185d092258490a4fe6aee615289e6dd52a";
-  sha512.source = "5104ddd809ae522b873a2ceea15be4ceb13f0a4d20dbdd291b61abd7ed5c25b5548301f8b3ed35a59fec06850269d97826da2d2f16a3bc8899c78d6716c4ad5a";
+  sha512.run = "d336c3c03c288578c6e0c8d9b5915b418e3258c679673b1c2d2b68f04206074d8c175d85e862ffa56ba4932c48757ffe51acaeda30e48103191ce39856d7c354";
+  sha512.doc = "080371cd37f08bc4296b216e21e7a7c23476bf1450adf93a339048e3504dbf609512fc366dc712a11e7700623315896cd1f85f27b41ee52a0502915c02641773";
+  sha512.source = "45c3e472942eaf4bddda93de0463d2c19cf9573599b84f05df3c41906046ac933a6e219e542d644f178269ec60f0abaad6c2a9eaedd86753765f4c018f59ddfa";
   hasRunfiles = true;
   version = "1.0";
 };
 "multiexpand" = {
   stripPrefix = 0;
-  sha512.run = "643253d9a69cd9af651ad7ef60e2ef3eb47d6b620ab87d0cbd4e370c8d98e3aec3e74213b66942d658cbf3ca79688e46692a887408ac56adacce6f42fd6ce7e0";
-  sha512.doc = "7cbb0f6274d2528d2274baf8173e47d0f88a150a2a648ea152610fb67e63d70176506133f6dd05159ff3840c2ef5c3eff346c61954795b398c6e7a1d86b0bf66";
-  sha512.source = "85e1dd93a5dacf9513131cfcf7d5740a12dc5461889d516bf9ad5d3bc9c52ac0afbbdc00466072c925c9976c2e72fbb99b31343fa3f4850cf5d7fb4d996c180f";
+  sha512.run = "71f976579e2f2d71554574d8f670ea348d7f721d132f4ff56bdc0e0f534a74b79cefef3aeb8e44e87bd2ec348f5cb570698d63f2a865fa9f116108c4e05293b7";
+  sha512.doc = "a15d1370ccbe4a98fbe2ad8955b919a5f52109942506457190b739e45b7e1c7161b69fdbd6816b83756074694bdaba64a60ada1b07a4c7b9e9ba028a59ada4f1";
+  sha512.source = "406eaf42e10e9f5d2ab48a308374ad7d10c5421b3876b94a65058b07bcae2c99b03859e11042e8bda90a92be6655b99f5d91901ae06a88a9d34a1d25ad962590";
   hasRunfiles = true;
   version = "1.5";
 };
 "multilang" = {
   stripPrefix = 0;
-  sha512.run = "c5d758de47e7062f1bbf7154ea2708588f4bdde433e3a3a06603496ba18537ee3e697c51f9dbfbbd065b9f393498b4a1e8d20e4157c699c6e1290bdad8fcebec";
-  sha512.doc = "a59d1a7a12b94b09569cb4fdcf06ad0cfa8be1bc34e5745d0fdb53e8ca2e8afef929a4962fc14448a679d241e764452e4637297a13c9a163d32031a25f407f0e";
-  sha512.source = "025f79784002eb837afafffb25a69d4746bc7a022449f09e8fa3341604dfe8c73ba1970cef791bf0286795626a38da3a421f33166afb864e95bf10bae9739127";
+  sha512.run = "50a4f5079b658cd1ed348bdfb6f0c988dcf80b4e93d4ddaf1d36c159f90da9b2c122f9a7a0f0bb40f0addf3511a01334ff5cc4a77634b898fac70a83ae7a3a32";
+  sha512.doc = "252527d5954d4993e19df79b3328e609aa892adf19d39873d13a8393e616ca6fc8985f886c19fa68aad59d727c257fdacadaa4252be41c59efd31951a8c9933d";
+  sha512.source = "46ade2eed1aa86934f34a8f9d5a659b73f807c450da8c73e4ad916512af3f66a75dc02c499f2d57fddf4b1db1bdcae200595c4992ecf4d139315ca02e411e5f1";
   hasRunfiles = true;
   version = "0.9";
 };
 "multiobjective" = {
   stripPrefix = 0;
-  sha512.run = "0f82c4b69a5f087747693be7e8228e1499e57803a434e97b80dba8bd772f5ca2cf69fbb6ae646cf495d5f65c40c98127374230f9fbe9ae2fc952cc22677f9c7f";
-  sha512.doc = "fd4f29e3aa45bfde1a23bee9c7fa78ba68a41c69fe8ecbb7771d363a2f9b36872384ca17b4bc9ea996021b8100224e366461b445880cdfc9e066301f16d092e4";
-  sha512.source = "b708bcae2b26beb08fe0b3d0b4204d2781e4f955eddd9837aa9536ff11f32d56b7a28e4c6f59776d67872f36b5a828bbe88ae5a9e753fb1a8536a0e434beffe2";
+  sha512.run = "85e7a2643958df70518fcebc4f6d3b9f5d9877115ec270d60561fac46b74db5e2a682362577be7ac3396102f7d30a34d9fb9ab925d70da505cdccab72d00a33c";
+  sha512.doc = "749d1fb9cc479c9446abc5484ecc402cd0061966d29a5febd7db8bed9d5b3312d12a24501a5d9d0f2a8de8690ea3123a881bb0eb02f4fa91c50389dcb2e12794";
+  sha512.source = "899b8e2a6c1bdc53aa3fe65648eb9be7e2f0c44263f2f8d9f330178c902ca6a8d743ba716df6077326019dfe5de74083f9679b743864036388e9260d19e1b304";
   hasRunfiles = true;
   version = "1.0";
 };
 "multirow" = {
   stripPrefix = 0;
-  sha512.run = "ac84eb4f165272efe67f20bbf4ea346e5db7e2a7729561ac38865cdaf3535ee9b0ba571c8b61baff1ed4d4f554914822ffa903940e28f845c8c93bb6a11b727f";
-  sha512.doc = "1d2838aa3c0b74e5d59fcd2f039dfd6f4eefcd2a54f239f0ba84cf2cc8b48d70a3e52ffbeec2238aac36f8c3de8fb145740f5c76d8f32c4949e9e090737246ba";
-  sha512.source = "0e2e640a28bc0cbf78af23f8bd0c6636c6beb94a2afd6b394b21513bee59bd15ba3da7cac894afe663a91f0d4337bc641c028e3ad08a94420198ac638b57ce8d";
+  sha512.run = "f88596d38b8f15363a02c84c68f290bf1746ad4282b6c3abcaa1655c2c4f82c0fe601ba0b46e330246eccedc6d4e9a5101ea5d773f8cae8b704bc80ebf2b1c8f";
+  sha512.doc = "1878f76d910accc1151dc0434cfe092871a52c835b3b0d53e40eb015b2ff26d908e1406102db917d67798b65b7f1f436066f846a899d3209d27a20cc11e7813f";
+  sha512.source = "cc46429e51a16c057ba1152ea3e2794adb57468ec6149cbeaa2d355179aa2f06063db106c1d3c14710fb1bad8996693242dae816f0f7ceb30fb4528d8ef592e7";
   hasRunfiles = true;
-  version = "2.2";
+  version = "2.3";
 };
 "munich" = {
   stripPrefix = 0;
-  sha512.run = "dc44dfd6e1772a0865a633496a567cb147d5c0915ff05ce80df108a38bce865bf896872baa23db3361b946572ecd057c6f4255bdd194616e173729a1b10c2d68";
-  sha512.doc = "37354b76f65f532278f9c930b65462a3ee647cde3924ae5122521cfbef7fe28248ffa1b8cdde61486219110c37909ce7ae6ac6bb1c54ab1e3cdc252d2235b0e1";
+  sha512.run = "7a7f12331ec00a0ad2735f55261269fbadefea5cd627eb2916a79eb39d8710bfdf20f72da6f909ae2018021bff0c50b6852ac298d281a2ec012f1be25961acaf";
+  sha512.doc = "9ca7e2f17f8f04846209f3578c115b25a4340f322ee66191032a534d454b187f352765a816c5238047fadaa795af34f6b5b191836c166616fd61317ab937ee16";
   hasRunfiles = true;
 };
 "musicography" = {
   stripPrefix = 0;
-  sha512.run = "ae85ee7aa2b00e85b47fbeb9b48bc15e4c0d017440697de0ffe675febadd6362e0385077d9d00e569dfc4ec0cd76b57aa64784452cf735b6f2e42009ad1da5d9";
-  sha512.doc = "aa15e350a134552ea0b6b138e7e4c26f93b473414ab480bced8079f7ecaab8b04181482a7cdc3e7661d209c62714d12fca52bbd47189faa96bfc4f7df80ec85b";
+  sha512.run = "43cef788e788b8545fcbc261e9cfed0c74f987a816a7ad518e2ca1522265ec6ca1369b988013bb7b3ed81c87d2f49f59267c60a950a1aaa969beee294496e664";
+  sha512.doc = "8fc80e058605ff2437ce640e5c5609d122e9e3599cd2e0d3139f622a12fa799f0276194738bcc0a738b3ce55aa40d39d5a15fd614f23476e9c151c6eb5e0b974";
   hasRunfiles = true;
 };
+"musikui" = {
+  stripPrefix = 0;
+  sha512.run = "8c15c00c614b478ab557c1054e49c41fd46360ef5615e438020e2437f52bcaaa56e4cebf4209740c7d8e0ad482718390f811d0b82a36858da3d6b34ed0475da7";
+  sha512.doc = "946ee66c7f6fd4adf7485eade66c7161473b60915314550ba24485acff590a289c2dfe70122f5c8f4eb5481329312687e44c9b6c85ce50f1af658d21dedfa39e";
+  hasRunfiles = true;
+  version = "1";
+};
 "musixguit" = {
   stripPrefix = 0;
-  sha512.run = "3ed6228dd37d7b1cbf037391e859b2fddb8bcb6f843c030a71f0a2bb1ff0f743e0bf1b4811737e466470edbdd290ac7ba5894253654254c0f930e9c0f4517f39";
-  sha512.doc = "4a6eeb94fbfceba1db8d40bdc1a26820f5e5d43c3865aa196aa8fd9820e0cb64e52a6a2fa47f148768f9fde3c8d2a01a6bcbc555d03e412a9ed1464aaad8331c";
+  sha512.run = "2039f6c6034b34fa3b4553cd592cfd41fa4c9b18d5cf4c017c4ce1373130bf709bc8eeaf89feadd83afef23ba97b91e8ae02ad0264f47bf31d6d47b2b80a74e6";
+  sha512.doc = "f0fca030e5320f68cad7db832b70414c0a7ca8c60ee392a00961d72980e653d6fde7e3025a099cd09418b539abaf76fab48b98eda031ca110128f485dd8cf169";
   hasRunfiles = true;
   version = "1.2.2";
 };
 "musixtex" = {
-  sha512.run = "78f18d58bb571c5799c8785e235c561b071de235920fb1b69cceb6195f8a1772da1f8f0d6cd3c2c76be1888a7692f89747e5ec927b4b5fe813b35033de1d7216";
-  sha512.doc = "a93e418ed6f30739744700a6dc2467a994ae03989e037f21366c0e337f779f54ace9d297e051a0ac6e0d2c302ff1483f36d54ff037918f7fecfee48085704555";
-  sha512.source = "a833138e04e622f623913cb0814836e6d768575c1c05e1afc678aca2ae76c65e795ff49a01c8d50456359784076c9acbf6de78f665f86b6164fc799b960a4c75";
+  sha512.run = "e183ead0bf93e7d456033afff2deba0e7cac2adc13f6706f79541c7406a5c83fe185887b73f2664e965f3a3e53ed445003759dbe874447c2daa46aded9b17c5a";
+  sha512.doc = "c0e0c682cbf3bfd1b270e6675d04da916669840b5bc1a93311a94fa8dbf5c71c30a0fcdb46bbe098140e1a6d29f82cdc160e9e15b09384cc422d65a26e18bd36";
+  sha512.source = "329c0d1fce5506c8a12ad0c28ce658411321d99bec8e9b88275cf807ab8404cefe812bcd5c4700fbc15dceb29e0efa24419b9acef7407fbb8bcef935c8af8c1f";
   hasRunfiles = true;
-  version = "1.27";
+  version = "1.29";
 };
 "musixtex-fonts" = {
   stripPrefix = 0;
-  sha512.run = "4035b252d1f2d22f6fe8187bc4c09efa3c3efac1abeba20381ca172aece2f76fb31c5463c306f84ffc5299cb28cc9964cfb16eb3709ba390ae7ed9a13f6f5826";
-  sha512.doc = "ece4e1073270ad8279c603f2ff8217c53db3532d484c7678af69f92b77042a39dc2d4b5a571a0394f47b0e56e519d6d35c8d248ac5ad67e2748112cf24392453";
+  sha512.run = "0553b418e045e55e66d10ea57d73a5a201da170fc368ad24ec37f00f40956e97f59c25ffa30c0673374d164369ebad4a5fa51779786cab8ca6324062ae34977f";
+  sha512.doc = "9642814f4637075bf824857cc08c2af5cd5767555cb2f8823f3eb97507aaf1048395e90dc5ead6ebb0df06015b233e9a9e1b9bebdcfff7fa6e2e9691ee36fb89";
   hasRunfiles = true;
 };
 "musixtnt" = {
   deps."musixtex" = tl."musixtex";
-  sha512.run = "2926c9add9e223d6aa28eca415d91f258ab1df5f43fc12d3e649a9e1eb83169eb2ccdb7c17b07b2eae83686393f6eda5cdcf87082eb97d83471f0f15cc85a2db";
-  sha512.doc = "3073c26c993f43292a92d02fc33bc7593f1c631533250425e3e81dcc349262ee0da4408ca4c760a2431e30a7d0624bac769483a5635728666955a4bb5f2a8f07";
+  sha512.run = "309beff8e7edb74f88f40c918af32c9c609d08743eddd4993cd45b5b94bd02530964949e328dad533bf9dc5f80f0c445febcb3ca3bcfd88508d4d789c4f2f540";
+  sha512.doc = "e5543d8ab2fc39813fe2d8a38cb331cc2c0a2e3f99db4d2a256874f10305db16e6e9e94e05be68407af71c7161e7bc45cbed810488e09f7c026e351402e8375b";
   hasRunfiles = true;
 };
 "musuos" = {
   stripPrefix = 0;
-  sha512.run = "1fcfb04e0a53786eae9813a6bab2db9d7d60430afd26fdf0af769175a1fbff220f24c3b7c7e80d92fe20139ec121d9d1533feb0288f669395a11bce3d0f78a7e";
-  sha512.doc = "514a7f83f48bb7a4f6ec81151ddf5f85f6203c57cbeee7a227fa83f0b577798ac8a73dad7fde16aaaccaf226cee5afb0f4dec08f37bd7684572b3c8273f12817";
-  sha512.source = "07419bab34b1fd735f7acd380db213e47779f52b903e03e79b2538eaf6dc985ad24118c7991a1368ea7605b8bac57342b591c997767e627fa72dbd2e108c9a37";
+  sha512.run = "b51081d6eef7c85218b6d7d605e6ba3bb1c9dbacda36984ce1f1ef4e4d21c32e20a4c6073a0683ec7dd25fee6c77895ca9a0c018a6c23c64830fd1584df063da";
+  sha512.doc = "3b28e3e9c5157ea8c88a2a4ddfdbce3de0e38c62dbddfffccdca28f4f5c8f95ca9da60ed6df7a9eadc619013cb62f00f90991386873b50f4dc20fe4072caf619";
+  sha512.source = "7b8fef58c14e0d3203cd31b08b885c325ae4156760ecdc3b0b9f311ce0a5fe9743605486355bb18462c0d3c08dc11ddc07ebc7ff798da04ecaf2f689c259597a";
   hasRunfiles = true;
   version = "1.1d";
 };
 "muthesis" = {
   stripPrefix = 0;
-  sha512.run = "6e87e49191c9517cbf896e85d5eba85fafdceba48519eb2b7460a3b15d6742b1c70a30a4cb93c405e3961f9555a9cce20caa01513ffa21b52ed87109cdb52cd3";
-  sha512.doc = "118f579b41b7d87e73b5194ee3ac99bb8fe7f4fcc7c296e8502ba4220521e17948e20c386a66d1e881b9b85937fef6df478672ee5423149972a72ac5b1534a59";
+  sha512.run = "aa3dbf0dff8af9f206b181058ffb7fa244e5e6be23bf1db7fd18134e164b0056daf2901bfd9a9a9485578cbd57e19114b531a6c3f179b1ee6ed15ed153d4b8a5";
+  sha512.doc = "b76250df53cc206a34a10d215e012d17a2d369465080f17d500d9060851f3a777154cbddc4f6504cdae823c8b74bb31e7a100a3544c6ebe2703be738a623c082";
   hasRunfiles = true;
 };
 "mversion" = {
   stripPrefix = 0;
-  sha512.run = "e21489489352b3d656e628b298c4f7f2f633eff6821023a86baaeac2943a73462ee63db876c6ff581f95fe63245a911c377f6f8d1347fe0dfba7f4bba1978f1f";
-  sha512.doc = "4a59309d5292a1c29396ebcbb5c5149e525f3ab660b5f5edf6413478ec250c5e8fbb8acff854c20dfc333e4bcf12d6bf50b28021d20b19d6ecf0ab76902b0e98";
-  sha512.source = "15d3772a3102e66b7f922497d378ee9dde66d17f42bbd59cc52e434c97f8e55b6610a0b1354b1858fe8071428a107528953f068fcdbb5c0ff821baaab7694d12";
+  sha512.run = "5e9a47c85953e41f46b981ce3c5c302835e3784abb2e25560c8603b62f7a6cd61e0cd5254311029ea25bb5ef10e5c7f2ad32b055f68a9889778a2db27a07d8d9";
+  sha512.doc = "06b7407e26463547d761ccea1844579cc81a07783c80169505218d335b3ebca05e0fbbbd2c6ee295a9a7d1f60b5a156d4e83a1edeb31bfdccf916ae4d11453df";
+  sha512.source = "1d1e025996b904d89d3b38544a7a6058c68f26200f846341de7277af11577fb54d26ea8a3ed2459fd6acf77fc2a33cbc8cdadf9729a77653f54188a29cfc1fce";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "mwcls" = {
   stripPrefix = 0;
-  sha512.run = "0fc5b776ab342f5d2d8c5bb5f088bf430fed79e66a5220f59dc463270dbc8e276ba009193d0d84df4a32f5adc0c8180ca3e4af5974677fec4c4a3d4fa32fc610";
-  sha512.doc = "6fba9916419b8b5dbb26f9ffc5a62f75738c03688d7b88cc783e4a3643a4479b2082c3ce9a578a7bbeaab97bbd2ef88591e29b39fbbf0e63456c0f4de4ef128b";
-  sha512.source = "8e671bb6d0ea8a277e88cee14a11b6d3dbab131698dd48c583b3c55722729da65add4f7531f0f133ee7e6ed4931e90c4bae8aa52eaab5428695f2e32857c498d";
+  sha512.run = "57122db964d70bff7d7c8474947bdb0e73034daeb75cea397ac5ba1d4d5fc1a238130ee8b5e002fae07c26a4db849911805f5ea463e72ddcdf30232c15d918a4";
+  sha512.doc = "2672c2802df4318910861f29d2e640c6f726d14ce87bfae26dbc136537bd394a31d0e43983fae2b5ba319d48a3f944903a7cfc66fa4129052c7f1ebc394078bf";
+  sha512.source = "8c8af115ad893d9fa59f4787398846a7f764e9f81ed096852e6030450146e1d74ce7cb47979fb26f27f4734ac721f4986835ebc954777887a2496486188955df";
   hasRunfiles = true;
   version = "0.75";
 };
 "mwe" = {
   stripPrefix = 0;
-  sha512.run = "2e01b7de379a4fe0bd6c57edd1bdf5390a296328339dd7e282e78453721d821172cacb6eed99015da95a0cb0d2fa44d011ada95d77983bebf2281c047e7494e2";
-  sha512.doc = "7a70f4d8747b7adb8edab3009f4efd17cd66419ab4a23a6d37f49c2bf8e78238d1fc1dc68f2f36ddbe40f4ed4c685f6f2b4ed9c3706b42a22001be0e22619687";
-  sha512.source = "68558682891afc32d7b36a4b23e9cdd7ea268601d93325b1253eaef7085cc9b6c0acd5337f8278af04b3d4e9939e70bfeb4613e45afb1d0243fbac8e522936ce";
+  sha512.run = "dab346ea9eb4ee71860b9141ecfea892cc17817f932463e3c8b48e3065edd21e3909df59a473d9068a509a0f5a3142af9dea6a3fefd0d107f7a40a3773787283";
+  sha512.doc = "a48c3460aee8d779aeab04ea3ac2aeabeed68e7719ee1178c917f1d872eca0fdcfe2b557f85e0ac2de6213a67265e778e5190c20e908cca2447b84ffef097eab";
+  sha512.source = "ba11ae8aaf8f4567f7242288aa9339e8a60ee6ebce3dc2a9cdfd59fe69b7ad5d04dbcbd377943cbd6a88d95b6d31115b99f14a3a97f7b06696ff30a7f0f11870";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.5";
 };
 "mweights" = {
   stripPrefix = 0;
-  sha512.run = "8e386e383679ecd5c47504552134d55bf1d0e048d32d3ef8d71bc4bae19bc2c342dffaffb36342a824157e9ec1c1c51c1ad05b6e2c2f9bc0e3d7249cc118c1e1";
-  sha512.doc = "776f877697b1d70201029c7480e835c3453334a790e1e56a06c3e80d3a658a319cafffe950d65c8ad109c945a19a2232ad42ff2d61dedca618952d2d3820080b";
+  sha512.run = "6beb616d6a41096ae176bd8353776c7d4254e3aed2c304c80f38f75ebe6a5b9f60d6ad970243f8d00483af4141ec94eeb688dee53715438d4b39b75e35c0c849";
+  sha512.doc = "8ecdfd8030061d5998a178d0b5b070bfe90dac6deba9b967f08fa5ff943d3bdb2b9475b8641009a73676e61527a8c021be99ff7e038c6c66611b123aca0caf7f";
   hasRunfiles = true;
 };
 "mxedruli" = {
   stripPrefix = 0;
-  sha512.run = "1cad74e8c72250ef6c18f1d38df2e4f3f6c2ab7a14ab2e509303af02d9b5d5a2217f4f658b85da580df7a41646131b21a15581ce079947d03fc28e2479bb0837";
-  sha512.doc = "d2a0b65a3a4edd5146ce2430ffb54dd67fa5a8200ba96fcf415048fcc219aafdad9307571d4f81b13744730eb8377a2afea6bb0af89bc14a434818a08046ab90";
+  sha512.run = "9134add39bf358e36d872bb1f134b1111a84b8f770decf600bcc19b1263f4bb3f86b6571a42e2091f31bfbc41e94cbce75efe7bb1a4ffb4d5e98603f347b80b3";
+  sha512.doc = "73d9ea8e98df8e1c7be73e6f86248b46d45d25bf7c0e0682a75b0f01ad0d55f5c2c288ea86b2dccfb12178d90c0c60bfded02e8888b155e852022d1f295fd3d0";
   hasRunfiles = true;
   version = "3.3c";
 };
 "mychemistry" = {
   stripPrefix = 0;
-  sha512.run = "16616598fa769fc608f93da9e9200304ce721c3ad172ff026681474d319b93207ce018eeade072606c089ca686f2ac95a0e1a878330bb54b717532bc8a897c66";
-  sha512.doc = "44ffad4b73598479a894b330aedfbb8b8d4bb09334c647e9b9a7ebac52c24f877f083cc23fba40286ca07c2e0fd172911ae629f4f385b3952728559b79ca5947";
+  sha512.run = "891a6dfa2071ef7b500844558728ebb5664c19f3ce4e2d004747f8bcf1e96356c8856506736ed48bc5b7e8179700544a760e9afb83694bc72d6ed47144e328ce";
+  sha512.doc = "4c07fe3db837be7a687d472e404276a5fc437d07a19f54ce9f19871c12c768e6791ecb98fa2dc2a0673595a0c9276b774fb9dcac2830c70ffa4e73842d22fa27";
   hasRunfiles = true;
   version = "1.99b";
 };
 "mycv" = {
   stripPrefix = 0;
-  sha512.run = "7d5821d9a1e61356ed7a575bdf27b88ff7dfbe46be17c57adf6e5d12c838daec6e2c478b8a18bd26672a2f3a51f89c4e48a296ed8747fb586d61639cd2f8cf5a";
-  sha512.doc = "e65344423a1d92f26010136ba9683f87a564a1967d52e4ca67b1099ef0f2b2260aa55c00ea973a87b057986af3ab64e56ad563173d58f887c3cde45e98ad6f65";
-  sha512.source = "d36104ec69a9024d6e7fa82631d3fa7bcc18a0ae94e0ade61ef7206d7c88d23150d30b33b97df399ee3f9e99ebee9cf42fd2c20c2d3da539ee86704fd490b820";
+  sha512.run = "16844ba3c43f97baca58d2c170e8215ba6d800bc9e76f2642a0cb41db42c3423f8dfaf2bed7220e0f28610a502c2ff1fab70ab72e8d0ec1dae5fc1f56c681ee7";
+  sha512.doc = "1bf6a8d67e7905fff5b587025d746e143343fb030df021ae9f793772f0f21f3757a31c1a116df8e2de995a5cfd4bac55a785b5b461a9d59bc644462a765b1e49";
+  sha512.source = "131407ced4762412c369c8d17586846198aa1ca3bd3184a9b2842fd67769ffeedb1a5a8f30fd7e6bcdbd06cd318ccbb7018d6474c498eca063e499012940b733";
   hasRunfiles = true;
   version = "1.5.6";
 };
 "mylatexformat" = {
   stripPrefix = 0;
-  sha512.run = "b3105d57f91b460638ba2dc342e8204d6643cd71f446b8955ab42b37c0613641e6f2fd78279143c59cf8e39f824a3245eb5f5377286c3f81bae0bd2ea67fcbd1";
-  sha512.doc = "a8fc8672034dba5da8e77bdb4e759ccf46d81b6a9162c91379fad8b7e7a84fc9bea05b7e06ff29640e597e4550289d23b6b64aae6817e5a3825f578f387b1cad";
-  sha512.source = "0fac5e27c2fd7e520852da1b7f9a48efaa4dd5e9bc5f1c91f0190b50585947f70a884d45427b8917b0d64c8939d9eba0e19abb1dbe6cdcf2a67e0edd8d1a2f7d";
+  sha512.run = "6e98404607a9974b838611d5a5a431edbbece0c4ac11a2457aaf62302376d2efbfb245cbec9fcd55c15f8ee42997c627da38534c3c59e89d255b06db4cdc2aa5";
+  sha512.doc = "ba5c00513dc4d3571d48f5925f3e6fa11630c037d859b432e1240ab1480f219d68b18a8f63a68234f458a437017a6d56f0339ab8ac1e729ee8a2416b52403279";
+  sha512.source = "d4f7708682fe8bdf8a433bf0ca59c3a5fb76bc14415d3ebae8ebc9298676ae2f73804812912115f266b03b85e388d1ed7f969dd2895f06bee3e4e4d5fff3897a";
   hasRunfiles = true;
   version = "3.4";
 };
 "mynsfc" = {
   stripPrefix = 0;
-  sha512.run = "24181fbc1474ac928d779117abfc2cec8ef2f0591b730bb762c0056667d48c57b03d6691fbe01377362c1be180b1b3d5a3e540f43625d54ef1c433fa59dc740b";
-  sha512.doc = "a292d4d1e5c8b0d4b455ac6b0e58d3028e23648272fb366cb641908fa98a477de4b0c30e648ba6fff251f0a368984f854ccc562f10c27df548322fac0295ebfb";
-  sha512.source = "34ce835e3fdc173c2ed6e61798977b493a022b7463c3364c93ae0454d1dde716ac75274d4867a32b3ce0b9d803eb50d42b53d602663e944c272a9de96f3cfb32";
+  sha512.run = "49ab7c16e8eadeb5e328ccb5a34c6fb76f030ac6419fe0c855b44231dc91e4b00f4914de4dbf5f6e332e73eb63199df0871c1d282353b818668bf92148504c8b";
+  sha512.doc = "8c026b4961c17fb9d998c11e88ebde83cb7ce6ab1f433ec70acd29d085b26da76027895a1fff4acc883161d4a235bc4bc6a1ed7383a7bc907e9d0a6166023646";
+  sha512.source = "6a95b7401c8e8c855dd2a5521ddf73b88faa4de41a13eff3e226d4cca4b50ec5e42df9aecbeff3eb4be38d291396e0a6452eb38bd1b112935bd9248fe58f244e";
   hasRunfiles = true;
   version = "1.01";
 };
 "na-box" = {
   stripPrefix = 0;
-  sha512.run = "698a90998b5a35a47eaf0fe6b29d53e7393f84b66f273f12921f761683c4311792cb28710b330cd076435ec4b28e125b203a0a738adf09c556d448f98a0e5574";
-  sha512.doc = "5d78a6ce8517eda0d81aeac17ce4fa04d351d7866165a68c4b966e3ff3707cf8927ffbcf344d78aaea0c71d0cc70861b356770d297fd5d22b7740ceca3e4b2de";
+  sha512.run = "1fe42f30774e8ee7aa4d5651e3ee804fd2ea8bc24190c61ed18d873e565b8277018da3c954586bfd7a61477703ec36015ae78d0a3e06488ffe28ef684488fcf1";
+  sha512.doc = "d1f04e01986d70c4a95aec18d5a1deb47e055d3c1b4875ca0c11ddb65c5a0d6882017c86e592db08d4119f7ed43e2ed10c0bf2d3788778ec66f5a15ea55bd37e";
   hasRunfiles = true;
   version = "1.0";
 };
 "na-position" = {
   stripPrefix = 0;
-  sha512.run = "440300bd214a0610909e43bc6e0d4e72fd388b076a4d0dfce48837d6b35e4b3958c2509ce3597677d55651c1eff9dab97a02ef39e709aa67cf87671285de1bb4";
-  sha512.doc = "b698d5f9380c80cc51fb4012d71da6026552e4c195b2debbc396bc115a89820730a88f7d5ea459b03a5f8dcc7323c1d6984bbfa2d998b6ffa35caec64303b6d1";
+  sha512.run = "bca96e4189aedfa1b626d8d891b48d4924cd34399a516980fc0d92840f3402ffbe09bdce5f7517e76f94021d382ef18792d3d9c5c04302f95bfc6f51a1b5bf80";
+  sha512.doc = "929db0310f829cd9b7e3ba11637e5baa6998d617e5c1ee749b1e215b9c8beb0697f20eda3719a93c2febbb7c0e42e4b7b7f887209cb854cd9dbe18debd2aca11";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "nag" = {
   stripPrefix = 0;
-  sha512.run = "2701f3270f51641b8971c10953358cfd2a38a1ca39248ba1317c59d1aacb27dfd30a963b95e863f7f37378bf37a0d101d28d38ca8d19ccb3eeba6508077b9632";
-  sha512.doc = "14f05aaefb7ec9130caaf9e2016be77e00c338d0999c0f9f97e3747aada7172b1ce0c445bbf3b589034c5048b9bb831d3de96b8853098771bce19349681a41ef";
-  sha512.source = "16e99febe660eba54baf0753a092c6e511557ace6f98be7238d7de080a09a7b0a1145265ebbf2678e039163542a14d3cf58d08fdc6a655b2a33b4ddc511ffa28";
+  sha512.run = "6957f91612817783f035befa6a569376d1bc81ee4c14bcda6a94559df9d721e50a396bdaa7a71ca4eb491604e88f44405d3a4c18401f42b09a991e24f18b456d";
+  sha512.doc = "a8914ffb5a5e6c17d1293130bae26a08a8c232802bef52e04275662642e6f67e6ceea0c46e0a1f8c572d654ed23e5ad3b1dd380214135628103f221568bd4b03";
+  sha512.source = "e35d0b9bf5efec4cf11001b243f22c4dcc69e991f0f96f70aadb5a975acbf087389776a233a0725e46aec0f1f55fcac196d9d53588aefec5a7635c8a82c4a514";
   hasRunfiles = true;
   version = "0.7";
 };
 "nameauth" = {
   stripPrefix = 0;
-  sha512.run = "4a9fd0b40587d66a9627aac5481d1a011c7d448a9adddfd9d1bd4ee2cf4d61b435322ccab536c8c05d32f001144172f1405a43bfcac93876ef768bdd61c056d5";
-  sha512.doc = "57d9ccee3f27d94dda2b1a9d855786bcad5d6120d8f9578277c69e4938f9fdc37dd1bafe3dc902770a9121a2feaa0f33c1a7cb89fb883412cc8eb93bd7b3ba34";
-  sha512.source = "698453e154bd1c066a8011a8bf2b16eb8498601fde4f63fffa2e981550e960fb556b32e8a2c616b9a86d236e89b7f1352b7e1cb2b978f8b9687044f68e9215f8";
+  sha512.run = "0915123ec207725310d958de1abc03815cdf51c68c95617bd610f53c41023c2fad4f61551e63348898e0d22b4f6c7018ba6f5298eaec25a649fb547adef3f41c";
+  sha512.doc = "5e904aa6d2f36426a52fc5315a5c81b8a4270ca515f9f9fe9eb4ac508aa77699423994b58c21ae7f444a20ef0e3d9a20fa4406180ad349042dbe753b3f14f4b6";
+  sha512.source = "d2a2c5a4ae07539679641694db1f2341e49e99d0895d9984aafe2f05993a4d25c44607b1600a6194778f575333c52698ad199d1596d298cab5ef69a05e995a97";
   hasRunfiles = true;
   version = "3.2";
 };
 "namespc" = {
   stripPrefix = 0;
-  sha512.run = "e8c4e9a4ed395f20d953c9636dfbbc02f1271a61804ebbb6044438bda07047cea612af838e33459d831d90c46502e197727a563a13e6784578fd379e255a21c5";
-  sha512.doc = "3af0b92231c7bf48c9b93a98d03a14f5eb3ce15c2421dea5373d58f744b12a6512290b10f623dfe51364f9cc917ad3a464e81acc39daf621587c62e911deb2e7";
-  sha512.source = "3c9052974a5530e219fc18dd738519d7ed3455f1d4b2980dcbbdeb53b82490e55e6aea1a4e3242f866064c530347d967dccf0f5da2b5a3ef0ea7e450fed0aaa7";
+  sha512.run = "7b80d2fe35c29e1c293e7954b0254188cb44aa1a9ed4b13b8bd58299777f61fa5391f4e314907b9059dfe6c9b17fd9e499d493743d5ecad0fd49bb9f09b10880";
+  sha512.doc = "2b9f10c6c4b52889a4b61f6b5d0753ccdfedbbba80a664069acd0bf461068eee737a00a85a12a2ff06984ed020ba5e0565df88a50ac764e2e0155896d3cc8087";
+  sha512.source = "bc3baf55f86bf4abbb1ed3f04f09dcfc12fef4e562736b5e667197c02854aac1d34a1b2dd2ddac19432468f106aa75c155d48b9c96076b6a8e68d49e01a64875";
   hasRunfiles = true;
 };
 "nanumtype1" = {
   stripPrefix = 0;
-  sha512.run = "e419cc9e0cc15c41e6cac1f90707c09dfaa48853d79915b4872c4e87a092c15680f5edef159e79ad3ca939af086a3aeaa34461d1bdc528374ee76d01457614c4";
-  sha512.doc = "e110972ef1184628e74c6f4e85bb251a7882117e93ce5457ea808980ebd936c07e2cb2c7704ed71e092164afd22ac6a4f34b89c1fa1f5333289cbcfd0a5fb544";
+  sha512.run = "398b8cf3d14c8a15b1568f095233594c96fa1b4e15605b1bedae93f442886279e63923047d5481458bd567babfa92ad3b53a2039523a13ce87ab029782e6ffa3";
+  sha512.doc = "61e36e9a299cab348b9c806bdc1992710d251034bdf112528492279075b0dc862cb4deee35b97aeb637fe0adb5c82473b5f61290aec7a21d5f8f36b66f6588a6";
   hasRunfiles = true;
   version = "3.0";
 };
 "nar" = {
   stripPrefix = 0;
-  sha512.run = "c55cc325c662563bed1c163709049af20f5a59e9c473848c3312786866ba3001d61eb462750e4dd4be65b4d498c7f7c051ab460e5d00cda8bf50ccd2806c256a";
+  sha512.run = "21aeb077ae2f4beb784bad979b7ea27069548d0e968894b190ebf23c333180da56bfafb2b9c7e46b0ac135316e0c04d187c58331f546765c599aaed42f1d260c";
   hasRunfiles = true;
   version = "3.19";
 };
 "natbib" = {
   stripPrefix = 0;
-  sha512.run = "60148c6a709252e838ffc1c634ed9c0fc588b72f51993e32d191f14e0e9e298b525b4ed0ee3160774877243ab9db8d75d084fd59b21c2a75d442f8fdd2bf37cb";
-  sha512.doc = "d97c19363737b2ac7a8acfdc83d619d29b613b6729764f48fcaa0c8d57cff506039df3ea8adb4ec54d5e65eeee3b092c5917054940b8e198f9d92c1a6ad1bfc9";
-  sha512.source = "44e26ce459c42ec13bbc9a4d59db8043d31ca4658ed5639485300c901ba3927d743cf41b41dfd9d198221ebdd1bde95121650f5ae1f43e6e7dda5f7b7d38cbd2";
+  sha512.run = "f6963760f4b2b025c36a4dc89aefae1d4ea50f56a5da51b22a37004d585fca5d2184ab917373dda9770877fa0a06b83f62ada1564dceb141bd414f2d0abcf43a";
+  sha512.doc = "c98df2529a88f3277f9245ef8666dc415927053f172d3988480d32314e717dcb32516aaace87a9e6213824d4de14054f81f87b7117d9c91f1aaa7a2d9c74341d";
+  sha512.source = "484408436bc66654c81d5471048bc55987201ae84c9d453541a5d0ee4b6e00071d14712f3a8d89c0b9348e76e41140557ab0c70442d6840db00594c32ad3eb56";
   hasRunfiles = true;
   version = "8.31b";
 };
 "natded" = {
   stripPrefix = 0;
-  sha512.run = "362149c5ec2d191918ca61124bd154cbd899590faa3f178eb09c9d66cbb4c131144cc655ee57da5e491827b1b312f0ce682d526acdc392b60ddef3c5cb704c1d";
-  sha512.doc = "aadd0f4e3484a88b5e47938e4b1047e5ecca99b6986268a74c3303273eec8f31f9e6fa6eda3b9a7e61c04406739c83799482b879d8c3b382d2619dfe3d7316fd";
+  sha512.run = "75150292f9d002a14495b55a6e1b33dca5e20db60b7557bd1286251615f396c2ed1cbc25682afe47568b3d7b47c247c3ec4b2086bfddd1a9ef459996d50db0b4";
+  sha512.doc = "c4bd2f734e281901e4ef0a6685d3f4a13f432ef208acbfee2909b3aa0ca25b9e013920389732c6e5df407912890dd9f49755ea0be06374d806dbdb5bef8d4ead";
   hasRunfiles = true;
   version = "0.1";
 };
 "nath" = {
   stripPrefix = 0;
-  sha512.run = "76f33f9e36c25a442e610a1acafdb15f77368c9f0870e7410a87a2b034d1bd79798f5d3534f8c86807cec48b782c473b14d242181afcecebcdf82875f069b2aa";
-  sha512.doc = "726ad0d1c403a5f55e011d00701b244f9d684c6f459e0bca20cdfd1101652683b39d9ed307af8fd0665b0cc298e07f801ec64e7205f97a0e021ba64e428d1648";
+  sha512.run = "fed2ec738a13b18779566ce59fbf7bc1dfca12e9da7f5056053309cec3bfdb412f3a6d2938c1a43436f36b6976465e3d0d662c89a98169364bd803316ae882f1";
+  sha512.doc = "a223fd508230d1bd656e2393d50c7d6bffa81fc9a0bb2d98ddaf72ad7f8d5395a25f0dc83105e1beb044ff78b48a5ea098b88d1f8ae3c5b32221d2804360c0de";
   hasRunfiles = true;
 };
 "nature" = {
   stripPrefix = 0;
-  sha512.run = "a72ffea07eccc6f508947fc59380a877cec0e02b3e919dc069f13d30008f46c66bf7d62c62f0c1d4d6ebeabe428972fb55ea544674c6434d7e7b30be6de12ffe";
-  sha512.doc = "385ce13c9482e17579ba6bec15dcbe46410787a44f1e7830303b981839b13102a48b1b94607309fc069b79e07455700b8d8b60d89b19d205d79f464c362eff54";
+  sha512.run = "4cb8deeca6070d5b2b4b1fdf6769cd59384bff0a8be4e901f516b3882a629202424cd7aaa28c25fb92ee69ddf3718475fd5c7518d9c6797edeba7537ec4f4124";
+  sha512.doc = "727943ddc96986222843ae5135679b4f790e27b6e75d6fbb23724732a5b83a34aa8c75fa9123974f9c777c9e0a4728c28557e02ec0d3f34d24ad0dabd82ec01c";
   hasRunfiles = true;
   version = "1.0";
 };
 "navigator" = {
   stripPrefix = 0;
-  sha512.run = "8550651a652502eec48f4f187b052b4f96b9a9a4081c35e6b90f02b5e94a7888148fce6c30a3543a47199b0f1061d089337f570f573bff519cff9e9267accde6";
-  sha512.doc = "1c918f84edb7f83372dfa36662bf5cacdad76202867b7445f4a537ebc80b62b8578ef75fb4606320d9408fbff4fa46b79bb86d10e3f87ce742076b1ec37b05c9";
+  sha512.run = "db78b3bb973c11b66da55709010e4185fc1222cfba604d9f546130f8b1d0f908896d0114186a96c96fd73ae1660c0d1aafcb65434256e7d1d4b18297f88ef12c";
+  sha512.doc = "f04d3bf6c4eebe7bdb2187a0fa8dd96acaa3083e2ed00a90246a2bf93ee2c0afe65c07c4a106e57c98201e724e22e4a990fd039d0bbf575332dcf772df54806d";
   hasRunfiles = true;
   version = "1.1";
 };
 "navydocs" = {
   stripPrefix = 0;
-  sha512.run = "32fc4a9896c00e3e93a3213ee1b7c5ead253264619637aedf26497b90da35c0906cd75abdd4aa51b32e56ea8441b8c9ab3b62ac594d39a08fe35b3cd900284ec";
-  sha512.doc = "c9c33dd8765c572f2ad0476df05df9379d16781e3af9017ca8d7915935ec1fc8645e4294859a4f6d26fafc01f00f0fd1cda32ab1199ec1e4a8f7b770883956f9";
-  sha512.source = "0de7366ec4b6b88bdc48d74644d08e66b32259360ce58ef0f4e1b983b046045444538d4fca9ca0593d084ab3682d75c12c692bcf0490b69a3977a077892b9929";
+  sha512.run = "32c697a6ee3fdc77c669f7fa8da5f55a5158dad8932130183988abbe6fe84e842895de2d36ccf3768572663212c3216cd1664db4889982e8d0a9748b28096b6e";
+  sha512.doc = "dad7821a7e1ff2dca76470c535334be8c4bc8f2b9271f3c4113630fc97954fb7e1cd85b688f9588230edc9b53119c2e04d1ef30422635a38b4f6f031be0f0b6c";
+  sha512.source = "25127ad0d659e92c1b3ee051b601a4aca0dfe26fccb6013cf35ff38b052380386e395bed500b36556b7356286ec6312a9720e385610a6282e19a3564394a735e";
   hasRunfiles = true;
   version = "1.1";
 };
 "ncclatex" = {
   stripPrefix = 0;
-  sha512.run = "ab1e392b279c3789f024b6208ed833d898e9a72654a90b94cb57756baf88556876f1caec64c326e576d90cbd2e4e6be2f05266b814979b7324c57bdb53e44a65";
-  sha512.doc = "e22f6ecd5e1e00b5c53758fafa0793d75400b6c51e13405d74d2987311ded4d54e7883ff1a23d8641b017ad81beaba3247f9206ef444bc12974ea8579d23a76e";
+  sha512.run = "5968654afb4f740dbc3d22bfe83c455200a8fe34a17eed375119ca8acf5d7d990f6689b1bb5ea1cde70adbb0a5b13525ebef2061fe6eb20a964a480edbf1f641";
+  sha512.doc = "a65c5f3f1c270f38f6b29ddd7b5764b1ecac96804640b336231677d01f7a00f844ad19f6ad971f4a14150a34229098a51a98ce0a0c63cc9198c3dec483f1ba81";
   hasRunfiles = true;
   version = "1.5";
 };
 "ncctools" = {
   stripPrefix = 0;
-  sha512.run = "feeef8e250db07c6bc0cf2f7a1365470f19943640b326fcca5100395cb9ae406f8cd9629fa6bb334d60b69a4486ec6e009c2ecbff31930d3b935f9d51a03544d";
-  sha512.doc = "004cc63e9e745608fe4b3da90867c43b7e1c4244a6e9a321c7ce31ecdbbe60fa5a6620f527a56bac046c0a3fd5d9ae14d9443cc5054acb19368f085f32d30828";
-  sha512.source = "ea6ccbcfd68988194231e8bc8655fff99b888757334a0cfe947394e5fa5b33d4aa0a92774fb5c4672c059cfb0bf0e535d73ee2aad0bb4693a457bba16b8bbb13";
+  sha512.run = "b7860f8185c045eeb12fb25b2f3d71d4a795318f239e0d5563370ea55e6b74d3f7fe9b66397f329d572de7c33582a0528cf9b934fc30d90b5a30f85d7a928aa1";
+  sha512.doc = "9352102166682f1ea8d7eab9b9d38e1b243a89bf0eb12c9bb0d5b07d535a97c8b763c8e064f8af2aec96b2b9bcc017cdf0c964fc1a3538efb8ba4fc2ff87aaa5";
+  sha512.source = "2bf1a0bf50d2e449a09ea0814205ea779d2cc1af2a15c4b1326686e383beee80c8d723ae974db1588ba596b2dce5b35bd5bb17c0844b4a0d81629800f691c9d9";
   hasRunfiles = true;
-  version = "3.5";
+  version = "3.5.2";
 };
 "ncntrsbk" = {
   stripPrefix = 0;
-  sha512.run = "99e44be90103cdd1442b22dc6d0c4b8feea3876b82988e903a440bb60cb5465ac5021323424b98c9947b69b8ab4736ea102fd33455e22d8abeee80018b68ad21";
+  sha512.run = "58adffff045364afc9d9c04b5bfbbd5b16df8df002648057ef026971e7f33c3aa34293335bc1ab10f6e1190b5e38bdbeb6a4db52f5df9f55a0bcf20ac7b08b3d";
   hasRunfiles = true;
 };
 "nddiss" = {
   stripPrefix = 0;
-  sha512.run = "8a02a15a4e3910abb9ad1729e06aa807852d41958257c03c62a832e79f7224168adc7b493d69677520ba9d9d8420fec16d914e9919cc39f157cc5fcb3241f015";
-  sha512.doc = "d46e6bc6beec60736baddd923206332ccef35ca64833edde42311ea8f98ab2253fa52e67232a8d3df1c5b2a8b19da65d0a1ac376f82097231a900280e051951e";
-  sha512.source = "58f3dffd797804899856b86abd87bfd8c3e5941d42dc760a9ea449d6185741b08ccfe5d03e95b1614e57e6aff4cf078d6a3b71cdbb9d6c6035106a892ce92388";
+  sha512.run = "6509a5a7bab6f1698d1cd870f02fbe541479b7f631689ad21969008df3e6357542b2bd087c94fa3b7f471713fb361c54cb3b18c2b9ce81b9a8af9f280acbe594";
+  sha512.doc = "8c4471d989d15ba37fea0b92abf25a15202eaee7dad715bb4afd219a8def23d887b618ba9fe7cc0887ad99b4df5068f5f22d13f468f13fa209f5bd902eb8e770";
+  sha512.source = "255ba4a75d31a578b7e1912c27be056e796b7c37692cf3ee71a6e4482a001b7299b3885a4997dea73e6f6cec1fec9ce9c4f36a270baa51ae1bb78f5c17f4edef";
   hasRunfiles = true;
   version = "3.2017.2";
 };
 "ndsu-thesis" = {
   stripPrefix = 0;
-  sha512.run = "6dc8feb2aa9756178f4979836434c700c03dccaeb0c5f6aca947ae62c450c54107d6b08b5ba9b843d590ab7c8b86bd3ecdfa16f8f0e2c195ec374aa551334dd4";
-  sha512.doc = "17a4987f4b471dd6b22dffe337c204084ab22ff1ca0c5421d49751fd8ce1345f09da5f2a9de96dbe0525d0671f4844ba0fa1b951886471762108a635681981c6";
+  sha512.run = "2b119038c570eb666ce5040d3b507233d8d4b102f19c6e79df4afc3e703ca006ea537705da840810c430d88fa1bf31967348202c4b2447aa5a9f1866720a12c8";
+  sha512.doc = "3a700a9719b740360c229598d873b0b453406c360984272f4de16f1b9422333db20962c6e19f9d6d0adf37fd70488544106526f944fa7ac415f3e2482699140d";
   hasRunfiles = true;
 };
 "needspace" = {
   stripPrefix = 0;
-  sha512.run = "04232434c818cdca16ed1bb2827054124691ea05a1be82fb1293eac5c9671bbccdae6bfc05c9a2eea825fe18fc53deeae946508edb73f1a192e62a4d1c87b71a";
-  sha512.doc = "1e846cad512f3c8e86597211001642eebbf0d297cdfce9ae539911fb6d799d7ff7ad91525ed3a5407e02e7ab3d5aa8d73ccca33fe521aa42ff48186cd4060f2e";
-  sha512.source = "cb236ef50297a4ee3650c9fcf5566c18baa273dd2ddf740fa3be37626351f177bb1c688f9bcfa25bc5d4765bc41febdc4972ec8d8fe1b3cead1a600185c80404";
+  sha512.run = "92a40bc763d8908426255ef02829477b3a11cfca058ce1849f04e71af206e4747ca26144dd15bf2004380e524785a690e4003f9f01c9c0248b54696b9c7f2588";
+  sha512.doc = "559cbec49d49cc2ebb3f2cd8346bfc80675e3d55e91037c3abe12886f04dc1bc6f8733c91dd28fecec2119b3d6bca70695c9ba37e68afa91a270866f5765d30c";
+  sha512.source = "82c99a02400cb05f3e2f92ba58fb23fd36febb03bd68b859d88d7e36f76b8cd9e510834d92d72ad52fd740ad6c1ffa8bad71dff41dc7794704d4eec01374479e";
   hasRunfiles = true;
   version = "1.3d";
 };
 "nestquot" = {
   stripPrefix = 0;
-  sha512.run = "0ff0055f92298b61ed069f02716e3458ad429e3381a1c9326f66faec47cef18ba850bcd7f13cb56a535d6c94e20e4df3c62307b862f0acb0a4ab51ea662c441a";
+  sha512.run = "115478855b7164ad723afb9ad905b74ff26eae8e8eefccf345a1a774ebb1c200cd6386896606a344ecd4a7178a0a8c5b1e45d592b3a18615cae94e06800a4d3f";
   hasRunfiles = true;
 };
 "neuralnetwork" = {
   stripPrefix = 0;
-  sha512.run = "dfff34483e72031ef817d184fb804ad2c92ab48a384317ebf3cfb4f3eb577f15bb27b8a57f5a3ed6ccfde0b05909c3395c2c1e10515a0b09cedd836b908aae97";
-  sha512.doc = "e71ba15d44953c406a3a0fd91a0e2b03e32176afea25b9ff67a9b02fed8217179e61c3545a3c453aafd2177e41152add3d793811ade45ce7c1dfbe6d674f1823";
+  sha512.run = "6b14a5930a3e0a608602587d0f4a357da87cf9b4abfda04f7c916725d069ddb67b0495890decc366edbb271c4e8cb2760741446ed09060d540162401e3c7ac4b";
+  sha512.doc = "bbbb2f0cb508f6c9daf2f19d857447518a4bed1f547d6e12f5c7efd6a92cfd9065419140668df0817571fc9f03ff512dc94b76158781fa83748d16c0b94c83cc";
   hasRunfiles = true;
   version = "1.0";
 };
 "nevelok" = {
   stripPrefix = 0;
-  sha512.run = "8839125b955df30f0c8364f034c8267407fe5564990bfbc43b5c81b2d9a0e861c7967b4d8f4c1dd583c33b851fa25b8cb114b8f0634ca0864f0e459ed3bff0e6";
-  sha512.doc = "afebea73b86292ba149fdaf339108385ca6103a448bb6f0423d62ebb1d0681809273bea73430919bcfa4605aaa45786f2814818dd1683e333dabc0fc8e53f904";
-  sha512.source = "d9c8f7daf85c917c5fa438fe5d74c15f8106e92bf53e80bb870919788e829bf6563b4a8f12adcb87628dcf65fff76c5fd8a064a6a7a243696337efd2804962a0";
+  sha512.run = "b2a04fee4e10efe9d23392156922f34558a6f1c28900c8fe292793a82aadb09334142d124c334ff0a493d8f917197587c27215a4d0628659f18b132d20b46022";
+  sha512.doc = "c92b44f736be87dc1e0fed530e67d437bf0a389198fe566eb43126a6baa2b6520aec66e803c765e64c1c6dab99a7af1e037ede4bef9ce1ea1d9df0249fc4cea0";
+  sha512.source = "43c8c92daa96bc1942adbb02164badab69c05f19a52c7e292adb46a501626cc1c55a4ce4db66e4c964cf664e7ea76fa48be5b3356c9989466504761c4f1be5f3";
   hasRunfiles = true;
   version = "1.03";
 };
 "newcommand" = {
   stripPrefix = 0;
-  sha512.run = "1336f0df447b7f374ab7a18f80a44226a540f2b70800f383d64c5bc6f3f41876954104fde45c088b1334c347105348d2b5bab3dc46e0575670c95097a01297c8";
-  sha512.doc = "ee233268a32680d95e25edafbc50419858fecb5f6aa6d29264479603ab8c5d6ee58aaa035cb3fc58c9432127144009ff1c75ea62d7782b08c4447ad44ef80113";
+  sha512.run = "a3073abb1742218a971acb1e87979f9d7b34a0328a539ceda5c4ea13b83adfceeadd79028cca77a86229710fb6475db984f0b325d6cfc5744ec54a9cf74f3ee0";
+  sha512.doc = "5f461359b43cc2d20724df697125be712fccfed8162cf28f467d40b8838e8b34365039d31e311427d565120ab025536dc9ee7691aa84146ca62f6151edb036ac";
   version = "2.0";
 };
 "newenviron" = {
   stripPrefix = 0;
-  sha512.run = "df57f9bfb5ec97ab16a3dc008eceee1597ee092dd5ebc51199be636817afcfcd29ae6d0ac73a10fee6765bfb97a6731f7728f5765646b9101c17b03e2b3a77c7";
-  sha512.doc = "366b97d5fe7d3e86dad3ee80aca4a17b3d3e1c41cbb6e7a30589cb4d100b451902491d076d737d261272a32ae948d273d7f4b0e98728dc2b89479a7c2278a51a";
+  sha512.run = "19fe6f74363a353252edcef9894ac93f37f03dd507d5a113a5c9411c3a333fe6dabe2a94d0cfe9e11949b959d65996f6ab22ee5ab0518ceb2962987630e7d3c8";
+  sha512.doc = "ccc086951b0ca4821d47e58b4397a1413e83359cd4df29ff37f8dddb172b6a60b45c3e6846a4348e337a463d656bebc72c947945ede385c88783cd994fd5b3be";
   hasRunfiles = true;
   version = "1.0";
 };
 "newfile" = {
   stripPrefix = 0;
-  sha512.run = "d9c9564fc78c83b2ae3e49c0feb05aca4742258d5dc298cfd0b52721c453a6961e7bda9b610708a7afdfec7127d5ef98286ed59912ff1b9ae3bf83c39845e1f4";
-  sha512.doc = "a1a0c74fbe4dfc6d76d9f564a180fe22c3c5342ee7a8ad8e22b41bc8818082266044eaa864a3c6cc9baa3fe501f3b40f375520f94e4986298493b1215d813b03";
-  sha512.source = "020322e683b863bf5d578c905a1c1462d1b15d17e3d5d585f4540c57c086cdadfebbaa3b26193c52a164b3ea97c71fb168fe5793fcbc2ae08b280a3fed509ea0";
+  sha512.run = "ea4deee4e8012836afe4edf6862f165f3cb294fa1e9aa9ef4a269d93e62073c47caa31e2ef9ca00402de2570fe0923b8faf1ce2387ec33a81e86c477ecc1463a";
+  sha512.doc = "2cb3c7c931939299d6f42e2c2a7b96bc30aba12eea3704fe0bf79d9fede643275624a4ada4f1b9870125dc8eb943a0a5ba94faef54b3f54371a3058898a62dfc";
+  sha512.source = "df89b5b48a04c46a326e892464cca3d7dbbd5df9137c6b48111d2574adc7f678d741fb13eef71f0f6de08766e5574799cb0f9b52dd2e166130206b6bbbd7bd90";
   hasRunfiles = true;
   version = "1.0c";
 };
 "newlfm" = {
   stripPrefix = 0;
-  sha512.run = "ef2d3463bcfa21c38c39b6d611ef6d1bc2eee55affd3187c1f23e43a077b76aaab9078b1f2ad6871e622819c8a8fc0f2b7c7c950f4a165183be0bbda9c66e713";
-  sha512.doc = "b4af6e750c3a0437e3376dbe3252477e214d66a7f14c685230ca8406e878d795a3bbf73c769c1a0bbe314f740b3473deb307815f6d4ec876c1dc429114bc93c4";
-  sha512.source = "d8a06ebef2de5ba30b8fe115fcf489215e9f965ca6a4c2373cda92c109c7567ddb8690b05407840fd90b246984ae792ca177fcc32a6730b278fc5b8c2ef70947";
+  sha512.run = "17a76c4846a855861719232700f5a009ace80a92732da459547f792873f512dd664a8ca8e795e9a0aa8104dbe80a9d6f379bf2541d0a5f56732f85a0fc28b87a";
+  sha512.doc = "86f3c197c410de4439cfba37bb9e62a519d58a438c804eb8d2b2714762df491a1934dd90c1a3e752a9fbce633adb5f23ae75b7209864a221af4032dbd6b0555d";
+  sha512.source = "56b5bef7787e953df41d73851bd5cf747f151b4c027a9bb9b3489d0a7a4ca8875754980329bea5a7783a056da5ee2223dce75e403783e529ae174f07a1d3c7df";
   hasRunfiles = true;
   version = "9.4";
 };
 "newpx" = {
   stripPrefix = 0;
-  sha512.run = "7d7503bc714a98517b29c86bad2169a62cd890bf3c991b49e71f105fa20e22087d0c456268414862e9b8c3806d0202060c001a5918968a21380b39fd26d0b30c";
-  sha512.doc = "aa8a673928c243104e18670b3d1dacf044f9fdb346c903b1800f579ae03ab8ebd8b12d7aeb426651f6e706d0ea6782bf44ca68b1f2ee994be6180528a99da395";
+  sha512.run = "ab46f043000ff7794f3c88070c4799f8d14bbf278ab1c823038375bd51f9f0570cbbc156277788c8e7351a6c1caca27127fe48265ed6683c1fdeb8f35d33da83";
+  sha512.doc = "39c89b93bfabb8bfba15c92d62183f18e04cafd538d0e57f24e033d42b905b8ba3302c6aed9b9149a1855c3be8186e4881e706a928bd0737b8b55a6d40f7ec1f";
   hasRunfiles = true;
   version = "1.321";
 };
 "newsletr" = {
   stripPrefix = 0;
-  sha512.run = "438f387d847f80993ceb84c8a6d528451176de4ef1c48690e98ed180f3a55a46e0947cfab366d8733171d9689951b1ece2aa3698b0f3e649641738c13e834b03";
-  sha512.doc = "c80ee7aabbe8b5e0c2ce58734fd68b0a51624ba4e34e9ec09813b1196b73f30068384d353a9d37d08ef5e849f4c0295211d4b2fe4844e0e820126f32ad424c1b";
+  sha512.run = "911147a1ed8d7235d6ef8143067ec36b20e007d217080eef750125a6d7ce0322d1c1a09e3b89e0635a780390f0fd39a720c904d51da18da8914adf4ed6c64311";
+  sha512.doc = "b1d62301281bcd752f7f90be2c8874e024cc85bfcc29cf071a542c09b57bdca863dce06a3dfcdd01bf941e42b9c0e0851a104780754c3cd67fa0feec95ebeacf";
   hasRunfiles = true;
 };
 "newspaper" = {
   stripPrefix = 0;
-  sha512.run = "5c92a9bf6b0b030ee77460d2bae247749e19b8cdc57c24ff730f58d10a10e4a011b311e51b293cb49be6b45fb6967ba7483f53145e60bf87e022339c09c23260";
-  sha512.doc = "7002aeb257a0c85ef3a78d4625d0a1d99400a3842507fe1d13ad466845946d996ab5c4e406d9f8ffe4268e29b4ce95f947a0f9d26d0be0c05656f8c75b7a667e";
-  sha512.source = "763cbdc234bacff15a0aea12f11ccac61bd5dbd648672fcb8f14d92e19987dc43f7094cee3a448e1e259b87d66411da73c39324285e300b9df27e6eb0b915a8a";
+  sha512.run = "9f3ef522c55c2623279801dbb5fa92e41ba45b1b74ffba1d2571a82b5a6173cfabe35b13deac3c1d9a49614802797a3c54c12bfc4abf06c1fd2b647f80b33653";
+  sha512.doc = "95f37bea9eafcfe37c102483e1b8d7d5284316b9d5ceeb5a6185af89d505dd7dd68107a4e90839a10a9d64a9c2e9123654ac003272a69e2c4e488eb753b0b020";
+  sha512.source = "b3c904af397bd8241feab3e8eb04170ae225891f005d3bd87adc2a5bf9d01c6a01decbc3ceb67933aa4ea3dece25a1cb0880e5102cb737760f3102fb7f89d105";
   hasRunfiles = true;
   version = "1.0";
 };
 "newtx" = {
   stripPrefix = 0;
   deps."kastrup" = tl."kastrup";
-  sha512.run = "b8caed12467bb03a13ef82e8acc04578fb9f3c1210da584f5cd5e7f2fdea07d0c6bc75b108fd7fa08c51d78701f70a0ecc2f179b9af2e8afd9c079f9085b5c2c";
-  sha512.doc = "ff7893c9ca37b8e0eb77fce82cfa6d43ee478d20ea0f7e18c009a51c29b13cf3b5592fe29946de67250db0e7e65f2b1729622ea41b3af1054c716e115194f582";
+  sha512.run = "3939fad3b083885fabea65732b8da5dac0595ae0c125fb6a30934be403d30f835a0cb5b1371714842927bcf31d22162ec2e260645f2694c76630f08e04762dfb";
+  sha512.doc = "e0f19a948e33a95fb6938fd70efb6b26e422f8fdf22f035fbe2b25a44858f155481109d6e3207133040db0fe807070cf6cb31419dc0763397dd282c685a665dd";
   hasRunfiles = true;
-  version = "1.53";
+  version = "1.554";
 };
 "newtxsf" = {
   stripPrefix = 0;
-  sha512.run = "2b2a9976c14b2beaae7d11cc931463ebb4a24f5ce29919ac1a26aa6c3a5e18487cf1a2057b9740ff2af68d7a97dc7cfaff107773b00fcc41921c5fc17b292ae8";
-  sha512.doc = "a9e7f183274c685ac7c249313d08dc060a44b3d040158aca3d55050d6e7556c28ecc65ee1651b79987946f247dde24b8c229733f3cceb5605fc91c180b402166";
+  sha512.run = "e28a38e32511d1a44f95bb577470379c8f74ee227901419275a3039e855f4fba3918905ce30ffe93b5eda6000d486932f43fd4b869af8191c3f7d9dac51d8e6c";
+  sha512.doc = "716d413cbd4571e2db0af0455eb2a0e38b798418631be9651b94687ed0afcae9ecd093f738b99d53d0cab5ad4b5c215f544f630e5a56de56134c8f7c57fa8007";
   hasRunfiles = true;
-  version = "1.05";
+  version = "1.051";
 };
 "newtxtt" = {
   stripPrefix = 0;
-  sha512.run = "cf571dcf23c600be2131c2ed8273fdf8ffdd581c77d69d951c732ec7d18b13fa2eedd4b9f2d4ef72dc9f23be2bed1e5644715ebedc8af94d28fb01c974a2b056";
-  sha512.doc = "81342ccb7b716255078e4f05c033db8fddb2780f1825d36537387a886b7f8cda471f8f8c325e7ded3634dfa486378a8c587ed7f87b8fb0fe3b2bdcc3ab3c67c1";
+  sha512.run = "9e3b978a977044ffa33a025bcbfe6351295efe3ef875d7f93b1aa34b430c931c21a91503513b4c08b880e6af88a744fa20e75813fa4fa637458d6699c166f7a4";
+  sha512.doc = "50f4064c2e0067893e487a811f5c093772616281fc8e163a6079296c251ac42d4e307a16797e6dd58a9b66999ca201fb29c3d2b5dea3d6e917f1bc58d3375f58";
   hasRunfiles = true;
   version = "1.055";
 };
 "newunicodechar" = {
   stripPrefix = 0;
-  sha512.run = "21b69e484a18cc15d45d546cd2ce4ef82ae32988eff98d37c084237b728bf9fe88a46a892f32287456ebf129e8d7bcd8a4318d0bc67245ea197d7752482f4a0b";
-  sha512.doc = "28d89dc45677490b5fe510ffeaa001b452d8a83c060bc790697ab01f29fd9ce4f21aa1f4009d7bfcb33c919a28b0d6f41a825989f1a0a28b0e257c3b8735ad1d";
-  sha512.source = "e8bb77955f8fab1898ad7feaad76e39ea438b235b36280f3eb7e7232df9fc973391f52c4cc0d66c0c7a5dd9ac5ffd48b574367dee6d3b564fa48c684c35dc453";
+  sha512.run = "2f235e5a9fc85969b509285e81a40b87ad1fa0fb0b03a65e2a695fc673a3cb0bc12e3f3bb17f5c3082c39332264ee38fad065254f4fb5417de62ea0f9e38dfaa";
+  sha512.doc = "75e0e692b0e6787a3614f559281067795ee3ab6cb7f75b6a001d3f1982d52a15124ba3658e78d390665d8bc3240d153dd6766c1aa8922f19abd315b26e7db93a";
+  sha512.source = "fd9a3e7342b82a9b7d99bd512e0696e92fa6f9bb61c74d841c7306449f5ada5f4f7d8969cdb058f2a7c6f05ab5434ff30923af4706c330c40f54d30d6ee28a1b";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "newvbtm" = {
   stripPrefix = 0;
-  sha512.run = "0f8e9b3ac562182a4ea11697afe587d0515932ea4f948ded4ffb817508c0cfe1b0804453d3435352f2e707396e1eb236e71e60d1ba22b43aca2e9ba56212bc8f";
-  sha512.doc = "d480a12131e20bf8c336a8d199f753fd75d8a515c2bd8d594091456f364ddaf2434fafb2171facbb643f5b002d9de27d2288171120b5eb1749bd56a28f7bd2ca";
-  sha512.source = "6b66e02639cb6ac32b3d4bf48841a9a55ce55461e606483208d2c72989c691be3e6b6245618da42164a50c711e5f96638c42dca3d1e165f17b4a0d759d0322c4";
+  sha512.run = "b9ea7ab694c347f8d7abf010a0e987f951df5a751904780750f8f52ad58fd30757056100b7687144eafa4ad10b59e1e19c5cb803ffcfda5d4d4b3ca98b836418";
+  sha512.doc = "b109ecf9dde74023f3fe675ec3bc92a8e05dcecf91db8d6d221c773c1e3d73c002588d95e982722b4e063ef29f841c5d4ad44c661bd2df447ee62ffbd04e0f14";
+  sha512.source = "2757b352d3c7e907c2450800c89ce2cfcba2e4dcbff863eb59998f34e4338a7613e20f30ed5922532062fd8c0f3d879eed9801c6b6eff6a88557b92a6859bc25";
   hasRunfiles = true;
   version = "1.1";
 };
 "newverbs" = {
   stripPrefix = 0;
-  sha512.run = "8559fc9816eed4cbaef0fe7a3f474228c8015fe6465792ac7b7a7d9a9870ed41608db39bc812923a8076dfcaf444c5546d3e8f4582b62f8c68aba06bffa15e25";
-  sha512.doc = "c54e9741aa06e92a4eb1cc1db40111909fe6850bd53a98f06476a4355b2495cf9644f688782868613ec87c2c0bb1775a45ef8257e65d12739048c002a8123b0b";
-  sha512.source = "ea978a55da817013824a393e733440925561194eb77a3646fe095611950c186f7e79c7b704954f58272f63f8d43473c6c5059e5f97c70b7c019258343574d1c0";
+  sha512.run = "00e959968ff1179560727cce60694d9caaf52aa707e2363974036c6743e786161bc0d60ad3ffddf3b0d71b0cab7f418f5c580585e30bcda4edf6bbbeddb36af9";
+  sha512.doc = "3a53fd7f38f7e228acf25bee3335060a44d70ad7781768a2b3d76ce6fee02e4bf00a4281ad578bc12e4c98240e0a8eea33e1db59e85cf7633338f1fa7941824b";
+  sha512.source = "4b279fcc44af41ffb817a0a42d43dd92c191444bd6ae2ff99c302d4bffe29f6f86572b9a0c9a00b9f0a905e4653271c7a9f039b6a0e4634a1c2c0faf89924c39";
   hasRunfiles = true;
   version = "1.3a";
 };
 "nextpage" = {
   stripPrefix = 0;
-  sha512.run = "f3a5d2bfb51c982213690fa016330626178f5e46873497fcf75f821a053aeca7c71722db5d255dc1597065ac1b00f575022e3c7d6d47f417f1fbbbc9fa9f0f20";
+  sha512.run = "7d0209ba89f277593c9abd58fcecf0fac8face75e84891f86738297c4b546c0df5dcc74f986e51b6f801b05db441e927647794893dae801210b099e94226ff0d";
   hasRunfiles = true;
   version = "1.1a";
 };
 "nfssext-cfr" = {
   stripPrefix = 0;
-  sha512.run = "7748682e49b0f50bfd3f7ab951ccab27a408bef993f4c52d6b10f4f28b32d3ac4552824586b8776c9ea3a58b435a0eb87f80f31942c8e06786cfefc4ac099a55";
-  sha512.doc = "aa6268d1d400d651419646eb5cb9bb9e8be9c4fbda4435627847ec36b515ff79d954e482f583929b97293e425122d13246a8383cff5509d7601109c10d678139";
+  sha512.run = "f02f616f2be081b5622bfbaf05a55b1980bfe6a86d3ff6ccc5f754010057758798c9a32e47644f95179d5870be51ca30b2ff6cb82b05d95a8fb251e6d3fa3e4c";
+  sha512.doc = "23ae8b56b7f963275f32ba43f587a47b1908119392b32d044f8a833bc18c63018a4c20c4b73781a2f071dc7480d837c5ce18f5208c6e7777eb7ab6ba65af6b02";
   hasRunfiles = true;
 };
 "nicefilelist" = {
   stripPrefix = 0;
-  sha512.run = "d34ea83b8e87bbe327f5aebbcfcb5ce79dcb01fe7314740a5f705cacdd79e1b5390a7edce2bd386d997c69349d02252ea2acf1d6c773af8a4343b46406592fc2";
-  sha512.doc = "110c618bc7ed9dd8fbe6bb81371576c1125e9c8edc17ad2e8670f156a07c78541c9fd51c7e2a9b529c9a78625c5203cb54349f16c2bf8ccd65b89ec244ac7adf";
-  sha512.source = "1ccb6db1713fce233d53494e6748360b01821b2416b81d17e9c22bf5beb9967ca4061c90ab063afe5246cff1f38900e569101a775ea066f5b732cca586a21160";
+  sha512.run = "591ba654814056c213afaebfd8a235b6ceeda97c7d225aa3a4e2661aecffea1cb1777dfbc2f94e688edfd2055c529f9bd4f13960526c438511b6cd13d8fa03da";
+  sha512.doc = "16db26610924583864ca58a856b1f1013fd7856843c8dcd5b22b98aa02374f03449444af44326ce4ea20dc2c32f974d3fe97024a09135879514792167b422b18";
+  sha512.source = "f27a53057ef8f03da3f325016f54402b07e0debfaa26559398d9dfd5a2a42377309d985b4eb505ab85e0930a7b8cef867cd153f7c2c8043b5246cc846a6bc7c9";
   hasRunfiles = true;
   version = "0.7a";
 };
 "niceframe" = {
   stripPrefix = 0;
-  sha512.run = "dc25ce5eaa015f23000fb568efc876f2df54551844bb700cd5487c185061dabf3dd785fd77a39f923e5c83f259448bf846ad3b6e773b6bf807d04a6352003777";
-  sha512.doc = "69a9d48c8aceaae5eaa2238989bef1b5100f55dd758dfb17b93b498bdd3181c2348b5c402537fbc05bb750aa18de26115fa9b0ff3ff8decfd5f81dc6191e5fd9";
-  sha512.source = "f2cb30868c1599b29ccadc82bf23293bc3c14ad76f37d56ebef7411ac77594aba71ddf67483c49555f04efebc460bb29c330596334da4dc4a804b8d7a03129bd";
+  sha512.run = "2ab84908702edc7aa4dea2e1fad6688bb6c56b7c4aa8cb4b3d1c3fcd78f9193db6bceefc465958d24d7e0fb90da882c30cb75e24fd02bf9ebdfb3b097fa70658";
+  sha512.doc = "3719b30bc9208377f504dbc38ceb4cacef517649d31f7903a0d8e7e493da8fa5f46e73249e08668aed1467c39c7016bd7b37311ed8e6d04aa97fbe9c1ff6a73b";
+  sha512.source = "b0f4c0734218ae78ee8031371c1865026230a4054735e306b624ab434d81dd459ff844d9afd8e822af8b749d2036c04c05801f0d6b387abd17c1b59d986a9f98";
   hasRunfiles = true;
   version = "1.1c";
 };
 "niceframe-type1" = {
   stripPrefix = 0;
-  sha512.run = "bd273fe2894e39102b1567920aaa64fa45add544670db9458d15c7acddae38dad5ff4ac36430e3d4e74312b017ad40fd85fdd56670641ff61d0944c5c64e7cce";
-  sha512.doc = "20a50eab3688631ffee73cd5819ae14542e8892c3e16b584b16c858c311e5a24b5ebd0b76c6c01865c2ab690db86cba51645559c62cc4567f53c2c5b6d626445";
+  sha512.run = "bb660a9b735a4878e294edb66c87a39e47e52ed66717335285434fcc3f256298377b69b172ed81c3acba6bad8aff30f987021e08bd1583fa706c443540d6bf12";
+  sha512.doc = "548896af3b9ba4e5a64d301e8dc2823b32cb74ec7411cf6b897d12222c0f1be9499416ab12558e2be61dbd67fe9a3c897b318912291651f968e3f8d484ffbf85";
   hasRunfiles = true;
 };
 "nicematrix" = {
   stripPrefix = 0;
-  sha512.run = "b7c8ab419afb6ac3685081d7aad0791aa324e707044cb9143e97895d5d3119c7d007f76af1cc56a227733f70dba51b38330ec38e6fc8e344f3ef3918977192f6";
-  sha512.doc = "d8b94647275f767e5552daa6c3745c80c8fe673c0db6571fd3f769395f62bf363fcade9a59ae4d68e8bbbc22c2cc2b4ad41063053e6c8c1ce267110cfd89aca2";
-  sha512.source = "9533d652d7779c9db36f138ceab2f312fc0fb6727cc596b2412117fd179f296909296cb638690b2383746e48c883b25562f8c42646da75d5055a33ce645d79a3";
+  sha512.run = "7701902fa7c52319ca352287bbe48d4f7f04b78f7032495d5ea20087ada77e03bfedb66f2f281fc6c11cd16c0f6f423090d7f29a1df1807c8c135ab9d2370231";
+  sha512.doc = "1f4145da77adaeb1f7afa5f3f7aa119c86631e2b77d15afda616d2b1c1122998dd242c6a5d03ca92ae6aaf8318c1d7843926dd4aeba1d1daf8f7e4f2a69773b9";
+  sha512.source = "81f0705881afd230217aeabf8440e4d17cb96285750d7d067f81c9c3f8b972e052e4b103f4e540ada3bee3e889193257d81e41a71d8f80876fcc1cf05a7cb9c0";
   hasRunfiles = true;
-  version = "1.1";
+  version = "2.1";
 };
 "nicetext" = {
   stripPrefix = 0;
-  sha512.run = "428d8a21b2de4725af9e10b41bb62f78de0283693e5fe3ac0cc8bede4a847bbf54e10f239479d56cceab81d09b2619a4b3d927132c5ae9d089c804961ccee7cd";
-  sha512.doc = "693ce7dc1d930e864f0de7e6081e8b2830615a0b755d01516694f7287c7620cf9e2503890596feed64d6ef7a64c28c598e39384d220bf262f5976853303b88a1";
-  sha512.source = "0677992833746769d38e72d909e65826c2f794289166c30e1975c6aca38d0f72637c9088a3f33f8b25f7c947a120cf71b0e4e87c5541afb49f6b8597dcdd3980";
+  sha512.run = "83b062e1d59f7642ee9300adbde202902a6ba3c4aab3efb4a249249df9c05e85d89676ec92c36ab2e1014baff6e913dec11b194c465a669388864372559845f5";
+  sha512.doc = "d170337978b4d42e2b785f20c404574bbfce5ea29acc79e02cd33d43c77319ee7275a96320c06e4e57c92829251a7b72d826192f7a25daf98bfb757c211cc551";
+  sha512.source = "888818ccb11dc75d59a10d54934110f510f26ca2b2009319bbc726f655d95509c8583128e3a57c881b7ef35637e0ab266ec37107eb8188a0371978622b7b58f3";
   hasRunfiles = true;
   version = "r0.67";
 };
+"nidanfloat" = {
+  stripPrefix = 0;
+  sha512.run = "ee424937c5e6433f9f103c4fb86e0a25d085b1e28233a955a689b23456fcfe16a1a6a691d5bfdf3f45e94e4f81fc217f75da5cb6fdaeb9de6c24475c03c0676e";
+  sha512.doc = "97b370fde5e113be6e25bd69ec4b8b03696ba472e2c2fdff34e09ef84c2722cd2d93cff12eb5b2931405ddfaf705b4059dfefb0c0709611f75f2c841ec08ca65";
+  sha512.source = "cdffb19e02eca970460e1265ad818a5e1909c882437c88ee6bba9f6186c83ab7eb0b2f70eaf85955d0f78fe07daa013bec72b95f43b71d5cdce602f32cf94075";
+  hasRunfiles = true;
+};
 "nih" = {
   stripPrefix = 0;
-  sha512.run = "14f05a93c164d7c82c9a2e3672d9515d62a4bebb92fbabea98034e7cda3a55d914d8f958dbb7978a470b482fda1954431e0357bd5ff654299508b86f4c7af5bf";
-  sha512.doc = "465efcedaf3fbe9dd421311a4067a416e5cf589589f4c3e3300bb06452c601d3ab94de74d58948375b52c1bd185f4d28f58a471a14352ff3fb860b9f07190850";
+  sha512.run = "60a1de7afb1e359e34a56d959d0672b4c6bd891b27052e0d3699ba2ce84036c286a392a0c4831582e72d3986fe550e6625851d50921eb65c31f268c72fed46e3";
+  sha512.doc = "17096627b5be33717431c839950ba0184f6a38fa654d1552c9df1adc93c9f785fcbdd22a518d9e14bfabcc51436b1451a5a2582df61d51cd1169d286e72b2107";
   hasRunfiles = true;
 };
 "nihbiosketch" = {
   stripPrefix = 0;
-  sha512.run = "00f7fce44886f33404b2cb4d82ee356f79a40053ad306a4112fffbbb88301fa7525a8374f7c1522b8f6c883dc289598c9f1cc7be36d02e071ace1f468ee0e3f7";
-  sha512.doc = "1be8fd68059977900c857dc180e2e6c2bc7e28b9b98bc98b689bc23557fe1afbe1c2e6da88f0afc8793db7ee6873fe118267796fca1e2e08028e1c933c4a0671";
+  sha512.run = "4042d98133d4740b057f44d08d1079d247311a8bcc9f4d92b6b4d016f77daee668ade8918e2087f40c098738fd78b5eda10acb78b5f41e27d8b92be8736cc7dd";
+  sha512.doc = "4c114e60d85b75b11982cac780a7a24ad17bbb0040783728888251f56e2e674517c0e327aa9d52912cf65a3d03ba15cb5f4b36485b04d2c1a7dbec5ced467f82";
   hasRunfiles = true;
 };
 "nimbus15" = {
   stripPrefix = 0;
-  sha512.run = "e8fb7bc81a72f93899263082796224c135b345bac7093a992b567e19b5cbdbee53b7ebcc9819818615fad71299299deb2573fba4b8bddc2797112887a732db0b";
-  sha512.doc = "142de43c58458c1057982f36901bb13009260c8ee3689d709f33cfdea7c31f8595a51ce6984e74abaa41e1a3c4940b3a7bee768c1f895f76831ad09bb84a46bd";
+  sha512.run = "9ee4c75f455cfbe47bc4821329968c73483bc092337e9c1ff9f53713b3d356700ef46a692a1b0faf423a0937dc62f3481b560e1e2eaf05411851806195cb29a6";
+  sha512.doc = "f0def58dadf3e20ed0aa6b5147e26e9ce40fd9a5ccbf02e7818d5ae9da03368111b4a8820265354d22cef2623240e0772dbea2af2a141b4de889f464ef5968ae";
   hasRunfiles = true;
   version = "1.00";
 };
 "nkarta" = {
   stripPrefix = 0;
-  sha512.run = "65f25f899ded4120246ccb4dd539cf142b60167514c9474c312e4ffda919cbbc7aa33d9fd0dd95699242b048b18cdeea8c413be87db2b759086772cc967d95ec";
-  sha512.doc = "89bfa7cd1ce997191356d13ad6c6c9a0b80e58bfc815f9b7e6b2074edf4e933dd4c54c02b628e7e3d425371677bd1934be41332284ae096804b90d8addaf4bfa";
-  sha512.source = "c10746598c17d8d76abeebf809a2fe1775c5cd23a2a750a9aa6dd5228485f304c7a5f426d0649a88616b61e13d5f8dc04e6df6ed36b418bf33d4b29cdce69a5c";
+  sha512.run = "de9569637ae849c272367dfb80c80cf3d0943401b9c010c6beebca8f8139560b799c77b4e73177437ec4d8fc25fe34cee904be765440010811e5a3c1be42acad";
+  sha512.doc = "61415d43578d178a708baf382758901c883c0f945a60ecfbd90e88af9bcbb87a6ca505016f3a3e9ea828a9884e8bc21ab4a01093806bde7ee2d7f3b79646c42f";
+  sha512.source = "5004d60e871be3c7888881d953e01aebf18c1087c602d1db2a99076b75c5bdc61726674db0adc7d28df62e1c634f0dc05721e30300c36d75879ef32bfbd757ac";
   hasRunfiles = true;
   version = "0.2";
 };
 "nlctdoc" = {
   stripPrefix = 0;
-  sha512.run = "80464f61e73b3e9ccdb448a800b5ecc9a0e5df85b184c016e5e24ecd5624fb3f6d13e2a1fb57b3e75a1084e3b6fbbbe665101cd04b36e60771dc7a464b8a8bac";
-  sha512.doc = "220ac2aca9fe22ccc91a0c24418098d41d1c34c7a3807f0b152bd15fdb78ca61161cda4350b861db21c11b5d1d04af82ab804be9298dfd19ea9cb13ba17695b6";
+  sha512.run = "0388fff1fd8167935f21b062e6aeb1e97497213fd0a81e891b92e8c30f2daf05661e42c3532bc4d61816c15dc1e645209ab3c629912fdf2f6d2e85cf8b53b058";
+  sha512.doc = "ca10cf38f1bc0bad96b8280139b60049e2857b330e71de43afd1a456a89eac67b5345e38316e7f6d95b2c443acfda34ff21280462b4b19d38e6bbaeebb7bacc9";
   hasRunfiles = true;
   version = "1.06";
 };
 "nmbib" = {
   stripPrefix = 0;
-  sha512.run = "e32a06558f5cdd634e6bc8de6415184ec268e8a7d8373eee29935a51d7af9b40b30a17c66d6a625b423a6ac25c6d532b6eba8378298607233e4160715d6e6d2a";
-  sha512.doc = "80e772d69056682f0376e9a1fc1b85a6e84c053c8c89cd896e67cd290bbc104245d02e72a8b11817d84d20ebcd93ff8c6ff6bde18cf81debc5f2c019d475a825";
-  sha512.source = "9e8802379775dfa1a2ca9963a763111eb1462b661691ed9f692ae3be6ec8a65d8bea9c872409d78c81e8d37a5c4685601a0777c30683d37b6f91c9123514ec3d";
+  sha512.run = "6faae2866e409fc7422fd787446a816e8d5efb1690a36a5f2c9c1b061c806e9e4ec42524f38a0039911f13c76c128887a13c58aacbee9fda794d8f05e6e3b275";
+  sha512.doc = "e5c0ab9dedf49127ad55c08a8607a28d18a60add040c4e09e8f06dad0f35f805f64cd2041658b92b9e74641f844755d585402b9eb209de8bea923bd0d8af466d";
+  sha512.source = "77e6d9da9765ccef6e383e25d03695925b9df2dced01633f368de3d3608c89bc52d015fb2e806104f240ab0400dd1a5eff6a3b0c84b1a59e8f90ab1331c0b078";
   hasRunfiles = true;
   version = "1.04";
 };
 "noconflict" = {
   stripPrefix = 0;
-  sha512.run = "4b599f4618b6668443167f839d0d422696ace92d26af5a7ecb60e2990fd99b22970b8ac4653e8fd7058238aa7225170f4b136abe3888531a5ee888cdc135d095";
-  sha512.doc = "6f3fc1f6d07c45752c8ce3220b4f1ce77a73e315863ddb4225d4846692561aab772356de8d4d8d8f208e6ec476a5dddf797993822bb838549f8d9cc59714c115";
+  sha512.run = "b4c99ae23fd8be538a08f86609c302a3ec117ac15041dde939750e4795fe6e4775a98d42af925377337f44ac351af5f82d56da2cbe1b2df6f4a75fe59bf3ea26";
+  sha512.doc = "8916c5e8d1fb18e0b7162041a27843a0603c6f02c771ca1e79c4931b12dd3c35cbacb072096452a4fac957848b16c1964e32eea796e2476beb8413585d16d72f";
   hasRunfiles = true;
   version = "1.0";
 };
 "nodetree" = {
   stripPrefix = 0;
-  sha512.run = "fcefd5457315b0c69dd2eb404b43ca9d3b0b3383e48e81d9606283894e09ae4151a807eb5cf5499472be91759504fa996f8fc3d0601249e7c7b240085a3e14e6";
-  sha512.doc = "06c9e1209d9fb0d0ab682fa4280d59e821ee3ee44aa39b5be8723e27de09911961de7253b9847c7f5153e6bb6bdac203d9036394416fe4264ee6dca9f7661bed";
-  sha512.source = "074c1a0325b9558474bd840c83d9f30a5801fc418d16aeeff7f95fc5acb2e6155e9b503968306d4f48d2ead26e108dbb7b6322a262bc83b2237e24655bb7fd96";
+  sha512.run = "5db2ec9d7e9abf425613fd305828c745d8f9947d12063a1209c15b82cc4bcdb3969c5a4e8ec39091bbc9b154e29971ae84eb3de971f883bcf32cee5fba3975ce";
+  sha512.doc = "404470cb8bddf82ab245a6b31e12a0c9b7bd0d80e0c2f7b479b1f06ebd9f7be52adcb52660e8f68a13ffbcefddbdd280cec44e3163351d1b7d3be507fd339abd";
+  sha512.source = "8a8c54af6ff57d314ac31f9e3d7145d799dc977df681d2a293bbb018054cd1e165215e16e4296e100732e4462d944e4bc9a7222d5e56cc0664731e6169b40b21";
   hasRunfiles = true;
   version = "1.2";
 };
 "noindentafter" = {
   stripPrefix = 0;
-  sha512.run = "4796f7e360fc28454cb7bc4d135da981b9417e0a43752063b3739d9b7846d8f8127e9bb58c8e31aa7f71573f2579e944ce8ca77dec747b96a405b79bb2a984f7";
-  sha512.doc = "55cc42f57528f7af6a265b1ff071528273112565c2b2ccf3ff96f6614ead366cb17247f1ee3230eb744d72f2c36a0af441b5f72d42564d7a664a2ab6e0d12a3b";
+  sha512.run = "a549b3ec893a48be88fdf854549cea49bd680bc7399d687434d0440336b6a34b526d551520dcf6a6eb31ccee20cfc9a2c82aec9046f37347fd5b7162217b3af8";
+  sha512.doc = "bc4d77c42c4373708f5e96b5d3f4d243a618cee9ae3c7ff7060de7f3b85b4da14b9cb0ed5fd0bd02304b5852fb173409ea7dbeaf9e41fc42a89c4bcbcee5734b";
   hasRunfiles = true;
   version = "0.2.2";
 };
 "noitcrul" = {
   stripPrefix = 0;
-  sha512.run = "76e1870827599d8e3c65d520728958bbfec9943f88b4b4f684c288525cb5e71926f5a99369c230d0df68e8424a8e2f4be2720d70c22733179d9a4fa12b03c3e4";
-  sha512.doc = "9dc557b9e09310d6a9c46112478bb15f633d75e44164d68fc1e19de683a41879e246687e36faaedf029a057d9d5f1f1a18d9fc7005cd4ccf212a90fdf5f56b26";
-  sha512.source = "f3c69f01c1e358b501b1d849ee789fa6ca54d62370366e8e977abe676297e60cd14a7e3c0b9cc2adb615205bcca38226c8907775519374a127c3c52c1f1b4217";
+  sha512.run = "c0801d938deaee7ab9da9ff27bddd0ae701e013aaf01bb5dd4096243172c0fe8db64028fe2c939ff0dd7b9f8b469342a4e37f6ec9e22634930901b127b4f9aec";
+  sha512.doc = "28332688444c498cd07f5c996ec1e273b5c0d45aeb8d5b7923501d415882ac0750e47fa55e7da94b66c0c03c82fcc3f741ca550b74534e26eb2181bc0c87a9b4";
+  sha512.source = "a695fce128a95573eb23ca4e9a50780d4f150940c0e726584e604802840555315dfc9f528340e0977e2e943a929e9082060c5c6f9dfd3f6476ce0779bf4389df";
   hasRunfiles = true;
   version = "0.2";
 };
 "nolbreaks" = {
   stripPrefix = 0;
-  sha512.run = "6e5298457f3c9a0a866e39d4d654218f8f6dc31243aa521aa6f993d35d1c4c4759293dec175e16f3e4e8c9f5aee94582157bdda01f8b06ad76d4ef2902e1c56a";
-  sha512.doc = "1946d43feaf2b1feb54fbe237c119c3dde9c2c1d23f66305bce8167d6ffdcec3d3f2a86bcfa29160e9c06462557ffdc44d721995f34a92adb4c7f95c4f5abbfd";
+  sha512.run = "424452fb97c94e0b5405bbfd83cdec23734c26bcb2b3b0a9f22c143fe5ee6b16de3a1667f6f9b1c73bf379a63e670745bd6685404dd94d384d60e6c060dcff1c";
+  sha512.doc = "4536167e8d2ef0ac0544afd710afb4fe2388ad74f819bf9c4dab99d2d34a59afdc6acbb235b467a5b7ca36c22bea0e3c673e786c44afd112123e952657b4644b";
   hasRunfiles = true;
   version = "1.2";
 };
 "nomencl" = {
   stripPrefix = 0;
-  sha512.run = "a37d83069dfc134d3b199e4e034f8c6f05381c8992323fc2a4bcce931f7aaa60e84f3b81b65efcd1a95fe0781e24218427218afa6fb6ef62d3073c0ea8ee9839";
-  sha512.doc = "ae74a4f7989ba132cedecc9c47191bc0b3cd08b3211fefd3de29d80f6841358cdfb41ce2140b6298c89b43de0aed3f7e3668014ef923ec0e1ca239f73df5a873";
-  sha512.source = "660fc2c4f30612a8b0c65fb875502d3e2339e415ae4f381ad38297be9fcae21b04162d56d048298215eeb778f432166cf4abc50e8c421c5536b920a381daa20d";
+  sha512.run = "38751fb1a32670453232451191fa9aff28bf86423fefb570308f4e36e3d991f80fc4f3006f42ce943a3f95a48174646311297602082f3a53b7d821b97f9f3bb7";
+  sha512.doc = "0b27120fb89d4cdddf0c29fd50e7fdfce77bc225815ff3aa1d6dff19fd3cbbbf64734d4ab6edfc64ab8255641de6e3a127db1547be619f8ec16120ec50ef4105";
+  sha512.source = "4e29bae6593a49da28f9f9e3194a16c7e5bcc9693002a6af3201e9d66dc66c86a7cad7d443b1326e6fb09afa1658f00c936ad77690b61812cb2135bd52849346";
   hasRunfiles = true;
   version = "3.1a";
 };
 "nomentbl" = {
   stripPrefix = 0;
-  sha512.run = "8dc944270aa07057269f8ffe1683cfa9777148a7977a917efe4a1dae15de968b1e575d87caecb38ac5bfdec8f030a8144be5682a3e5c396202027c4019c508b7";
-  sha512.doc = "e91647450820811dba858a09587d8e1f3c72ecde183aaafec1f758a26f79454320e20468d22cbbbad173a5b2c687d62d5f0c53221db160fa435da48b51916ec8";
-  sha512.source = "c67002dae231b77749db53f5ebde1182bf654119abd79e265d73c164953807679a8358e7f2999a3abacc7f37df58f0fd9180227fcbdc4bb937e4ffe85ea76b9b";
+  sha512.run = "411d0891dd1ae12b931a4718dddf85a26cddb72db1ff315dec2488296caf65a0e02eb0862b15b86f6567827ba93f776ed11fc0955b3c4c78315cd47ca29b89b9";
+  sha512.doc = "9a42e48440b39ecfc62c283ab1a34ce27d7df7b992fb3fdb836120ea6bacd7b6f440c5414e1c228d589aabbdf9c2280bf08843e6e719f83df5ec4ebdc5927b81";
+  sha512.source = "207a040bfe6b84a67da2b6c2f3c5521d7e47ecb92909f863036e746f833b7c00f546a388aa9a20f10de8acc8a7ceacb3d386d450f00f12ddbb2dbecc0d066419";
   hasRunfiles = true;
   version = "0.4";
 };
 "nonfloat" = {
   stripPrefix = 0;
-  sha512.run = "f34ac022b3f5f41f3a9c2878d42fd51287602b4e0febedac5137800ff26cb925980d4aa0fd739dd70675b0333f6c6733d7a39be4062d8b0b4618da8dae3e8e06";
-  sha512.doc = "1f676394d98e1d7dc58d75e7b890d976cc9ed7978bf69fcee0960878263e113621c8cdf1d4a09cfa541b7469826669aaebe6238ced7858d64b097cf6119935cf";
-  sha512.source = "4a684978866a171a01cbcd7d01be28e8171271403fcdf9fc07b10602f8d62a2a4901d2962b257d0ce5e2f89f032bb31df356cc8106a824db3bb386f09e43ab9a";
+  sha512.run = "237bdd74d04577e5d99afe44c3ea33e1055050fcdefa24cbaf0d858402cdddb14140587cded9096cf16d61e121e3b99d1d36b9aa171b2b34bfb8800cd0bcac5a";
+  sha512.doc = "4b5f2284c3d89d5a092d88c3ca52ffc0419b53077cd9d327905ee87d7f71e43699c21008cb06dbf6730c5e2cae2b5d41021783dcf604443982f54e1ef7e23696";
+  sha512.source = "9cfda7e1e3ac23db49326024606f68e15bada6801e9a478b1dc759bc3b1f334c071c1bb3720cde9ad9f4445eba6f3d344e357d732cf898295cbba90cd2e39b8d";
   hasRunfiles = true;
   version = "1.0";
 };
 "nonumonpart" = {
   stripPrefix = 0;
-  sha512.run = "ab3645a636edc6b3146339275f979cc700f5eb4e6648a5dd12b306ebae449acca27705f3e091bfacb4cb5b88ea4e9aea29facf2d801c0c42bcf069a52824c0dd";
-  sha512.doc = "0a451a284e1cfa90bdf7ca1fe2fb4ba3be0c0a48af51499d0d107dacd96645148064ed539b0308b22dcf138b97f05c12dbd490cdd9213df51dda245ef3d45288";
-  sha512.source = "0837ad8d6183c35b34276955841f92bbd8537a95e1d001101afb5222dfe0b8a7e6528765e58e68781007f3359b752e4efeac2085ad407ebc49567aa35f98052a";
+  sha512.run = "17cdb1528c93fe52946b17fe971e372d9287ab1b8639f2d9ad1bd7cd560cc4e66c0fda6364660b657ab56d440a3bc3b10cdc7103457b15fd3c111ead28d07744";
+  sha512.doc = "cf3d1f1e4b70f5f63d47525f3e90b5dd00ba6eb43799f6e9dc8c441dbbf2f507936a94e6d5973deb45c4ef746c38cb34dcf7e18127f56d78fe35699f1b3b3aa8";
+  sha512.source = "b1f20d56a585235f61f556b8c596c058f8c50f65c3877b3f267ea21baeed356e0056b6a2f1aae832a1d3ed8479d49a68fb7ab50f29e6ac9085ea920b64498f15";
   hasRunfiles = true;
   version = "1";
 };
 "nopageno" = {
   stripPrefix = 0;
-  sha512.run = "ef4e82c84328b5add7cdf2a0cebf45aea48dc97290aad0dcad0bbdd3fac998990a8362056e79dfc0640dfae5ad2cebe62ff0b1c539cf05c8f904402f0086fa90";
-  sha512.doc = "c61a8f4aab2a821b87d85ee635c96d722f8184bafef37b196cf090bbc9aabb5608de33662bfbbe5100e8ad4885c9569e236772119d3cd5b2172debc0f19f8434";
+  sha512.run = "317fce6e4275b2738f20b0b91eb684eea4662e089aaacea6692b1a31a4ea4a447c1849da9e815aa121761d635d9d8d59186c73bb9237b307ef834330ecfbbd54";
+  sha512.doc = "7d16f0a2aba099d77f150211e975e8dff74fe0ab73fc5e0af72d3150efa6b1efe54010ebbfdbb5c5a27d912f55d5de7aaeea1c672022eb7f9e2e2013ff9911a0";
   hasRunfiles = true;
 };
 "norasi-c90" = {
   stripPrefix = 0;
   deps."fonts-tlwg" = tl."fonts-tlwg";
-  sha512.run = "235cbd271fab39467767859fdce763ce8c506121abbe6d7dcf49f9c3973943e0df29e714377358b96164282cec799becba15579c5c4bbc05c31ab893cc9624e4";
-  sha512.source = "90db5f800036ebb0a181eab3bc002183298b994643738d3c16c8339d87ccef6a3171994a9407cb41e149440f26c019bbdb45ea7272cd12470ac0433d197cb915";
+  sha512.run = "d2c29b4f2aa0d56fa56dd780cc745c9e109ff28328f05d008d417e4217b927cafe4a4b2099cfdbb1d45997aa9e87e1a5d6b18f8e2e3837506011b3d48ce54813";
+  sha512.source = "532e2e6feb80091ce403f9f85b96d00df968512443d9f1fc3a0d22eecd8fc5b752bef4a7f40cc74f846709074251f09e2f9f775a4db2ca87cd722eb86984a11c";
   hasRunfiles = true;
 };
 "normalcolor" = {
   stripPrefix = 0;
-  sha512.run = "2548511c1066c0ecb74957ab058d6a76366ad7d0ec98168f8f38f6a0dbbfea55a3ebb0558a61c602d92f1a17c228c5a15effbf7fe860721c4f9dc53b6859928f";
-  sha512.doc = "e92728002072bab004f1b4c3a118875c257a179907e60ce85e69c2e7854f6e0260ed53f2da5ec7cc125842a78cbe3f99f4715bf32507b91f35e5d6f3d6172cb3";
-  sha512.source = "4047ace7f89bd2e9b18e4670170840bfb0422581d6451e79bfa084f01e6f31bf38e5997ab0f4d85fde0c4f758b0c51ec97b641f434b76fb71efd3cd20195896a";
+  sha512.run = "a2ace6258e0cb734c7abd427839203a085ed637ca771ee993483e1b026e23141d79f4c995ae051edc504363dae1c7f53f498aa89618a5f97495092da0af0c1e5";
+  sha512.doc = "96bd2a1cd23068d2ca62447c161e4a7cc350a2e8faea0d5a9fb13efc2816d8c85fe2b0bee9dbeb21716f073d1c0ef23809214455f7478fd86e10650317ec0d0e";
+  sha512.source = "9e85012f56f8a53127e73f1f30931a59188d0c43d4de0db2ab63fff4471df9f03d378434b8d4fe4f7c65b042dd050bf9514d6f04d193d66390feaa177e89edf6";
   hasRunfiles = true;
   version = "r11";
 };
 "nostarch" = {
   stripPrefix = 0;
-  sha512.run = "b688ed5e5e37d87b61b6c372aba5633b3da4dd95613ac494bad5bc1bbbcf1069d0658a5f4658f659a40398455c9a313ad24f94d4bc95136b2d902f9452a730a2";
-  sha512.doc = "2a4a5042f737cfce2896c6d951abda35f0c4d71bb0f0005726a4f10049f03c92332da5e7ac49f5880e3860681e3741cd112d87eb7713f2665e5b2ffb83309302";
-  sha512.source = "e36c8ab4b77b6b2b92f0efde19a3cb814c6853f38fa5eff2cb099ee5953d95d8a5f721bf43cf9d2d8ba9355ce0674b6583c5e8cc54a653793759974a88f5fec7";
+  sha512.run = "244c5aba3f91e83d9d7a982fb96f3a11b27216979bd9b49ad733cee5b4550ac62727756e3d369fc8bc4026352a0e54b5dca503401c6aebe2829ae3dd6e08fb41";
+  sha512.doc = "851cb664be49637bc6acc1e2da600400f1f964c96fb7950b7a453dc61f4f628955cb1b0f43ec789db8251c73fdbfbb6a2cc888e94624fb064ce573e70faca589";
+  sha512.source = "3fe849fdf4173aa0871420979e5396f3f4f9c93a0f1447fa1e39a4f34922ffc9dffc78609e62167131b662210391a53e496d4ed8cb32bb44ab212ff3e54f57da";
   hasRunfiles = true;
   version = "1.3";
 };
 "notes" = {
   stripPrefix = 0;
-  sha512.run = "a296e27dff3242c00a7c308ecb03d6d909b82faf21d5647b84988865052513230bed567f6b0f4160e2884ba5af65e9ab81948c661249cc177928f5a301febdd9";
-  sha512.doc = "943f3a2b2f0f38e399e150c73bcb9a4863ea67772899bc9a39a23472b2ce2e43ab5fc8cc1c6f29af340fd5f731cd899e5a1b4f051e76c2ef02791990eaa70e15";
-  sha512.source = "66d9aa0a8f39f9f68e4da082494582c6e82683b12eb2a67a03273e90226c6d34c9abf69ebfc56302a58654514baa3c0dcbbc8ae48c834f76f01931fb3d6e9d71";
+  sha512.run = "a8eea01979d388564835ce9c265d61d785e539dd2612e8a3dbdeff52836dc324fc29db13fec618e35f89a25ad04dc7bab97468b9535a2854a87c48e1e7d6f9a9";
+  sha512.doc = "1de3d25aaf4a1fb773d9bfdf480a8586f8dd49106e3df9ace57c6d3dc879ab32515a3670e6a8ea1e3588977a4e5e22aa2acc95b39b09327e1d7abe90ffa066d6";
+  sha512.source = "68a6cfaafe40f53366c887d7cb39a8d1cbf9a0664935e2b9467e654c28699490fe4275c35a967e435c33219e2c3e77b06e943cd4da2d539cafa1110c0e41a060";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "notes2bib" = {
   stripPrefix = 0;
-  sha512.run = "7573dc4e0c8ec0e97b3805cc2e7e933b4f8325047c8e5b2e973d47ac83a7f1407275f573a75515d07a8cc38dc7a2033bad6e83805230979f939f404c37fa8daa";
-  sha512.doc = "d06c8625dcc579122b512c1b49cb6311a0a087354953ceadacceb0aac3c172412c7d932a6162385a6024b8aa32ed8059cfd02e613ce716d70d0ff555306928e0";
-  sha512.source = "1ea0a2b43f1e4464974e6e948794f3ade15b4530d1bb02dee84a4f5fe8dfd406848ecf29654b740ba6ac2ec59b8a26a87fac7868d88bf0713f7811c0cf96edeb";
+  sha512.run = "855c9c6a2afd28804134f01bca1a8fadc092847ce6246d7e0339137de28a3a5e2d737a68b2526f347dd7497296b61d2ca4cbc9e31d5e7cc0c363eecb80d66309";
+  sha512.doc = "1d5fbf181b40198652fc8aadf8ed06985b237ec9f95b2dfea4de71fb694dd374f075650086e034c36cfe583805556b97474cd510bfa2c2a1f882d3c4e4a49080";
+  sha512.source = "acdcb37079189e9f4e552aa767a7d35d0df4f46fc61d1e319032f704a1358ce3ea2fd8ca2351c1f98b2e626db9436748da4c94df80e9eadcf02661fd683d9626";
   hasRunfiles = true;
   version = "2.0k";
 };
 "notespages" = {
   stripPrefix = 0;
-  sha512.run = "78d22d43390a3afdd8ed0ee5b9a8320a3385291c6ac50709f31f3e4676b5979d2588c0dffeee6cacba150f2b57b8a0aa6b5ca79b2817e5749f55358f2250c4ec";
-  sha512.doc = "e6fd2999508ed5957b4eb752f751a232d719bd40808ad3f44c35ad279b45a1acea6c65cade1fc0c75c376ce20ea8494bddccf951e6c565b995ab6ba810a1ae1b";
-  sha512.source = "e159dc59bc3d1bcb4208beca223271b326a3879cded1e10d264786874722dd6704bcf809191f4256a3cdc6cdda50b234eaff37924051963fe24d7dd39b612e54";
+  sha512.run = "474998103d9b17ac13c87da52bfb641658cab8e26207b518e545e7d8add0afd4381026f2dde544f78a29c63462037579f65d2d027b76318847a66c347e992de3";
+  sha512.doc = "e3c1b41e6203aca20c7977e9328f5b3fc6eb5cfa7fca781a0a3cceef7f7fb83071cde927c09ebdf53f8daca99bcb079efd9a4f5922390d9f246d54ea8d314b3a";
+  sha512.source = "28e6c3396773676a77b753a3adc5c3fae957a57a6c667f7cb956d6d51ff004b626b5aaa9c3b86476e2a9e644e023e84362380e37ba80b8d702331a692c2939df";
   hasRunfiles = true;
   version = "0.8.1";
 };
 "notestex" = {
   stripPrefix = 0;
-  sha512.run = "1f30061554da034fa5b42b09c4b65d7f3d9804c3d9167ddfdc7f93c9fc1be8cb82cb4123d6197f308f3295b2b5aa738c3f383e6239b30141fc7f48ab4e131aa6";
-  sha512.doc = "efa10d6741ebdc2778c7826cdcc4a162804d9019d42f1527303d706905e7dddb4d6a6d0a62693c89e6aa44962305dc0a4845e556fd56ada10250fb124cf9a578";
+  sha512.run = "d022f1f4b0d17a07215e6f7ba74c47f21dd62896bd5b27f03d133a4aed0916ec4235c6e73da1bf8497f5e6dd5981b5dc412c8336f8e1708a8d7cc44ce2874887";
+  sha512.doc = "61f5596392bcaf9e3edd6d1ff372945426dc062859a0191b8559d7e15ddfb34a7b313aab40033775853cdf3d89f9c88e294566d7c4a262c9473e92e4494c1aaf";
   hasRunfiles = true;
   version = "1.0";
 };
 "notex-bst" = {
   stripPrefix = 0;
-  sha512.run = "50cee9736a028b2d887467290a71c689da6d71d569b3ec7c7a1128a43d49550ea5c59fee8d832a70166b6a7e0f39148bc3f6536440f77c16c871603bd430afd5";
+  sha512.run = "9f2de0714079d9af3fe9dbd05e926256f74e950d4300f466bb51dd6ca449e1556047e3f211025508ac3f49c9b5f9607a4d55a09db031e22710466275f130974c";
   hasRunfiles = true;
 };
 "noto" = {
   stripPrefix = 0;
-  sha512.run = "137c4493b4dd6657b67f748d606850dc574f54543f3190469d04ef860a64f3cea61ca4ecbb0808b1c431a21f2a5e987db159c1c1bb5f8070cb08c9aadd3d8bce";
-  sha512.doc = "ad98d4682c614a3dba803cc9f29befd3278729a2883b9ef97ce7e317b7069e9137a7eb7f61b5f2d7014a8de5f9ef4f5e806dd65d893969f48bc0d6fa51d8d1a2";
+  sha512.run = "19ba79290a7fc370e33b0eb504533c11a9e8f9bb5afd9deabca88fd7248fb8c28f0734e9dfda5167b2aabe6c13f30c08d74e1ab74d42f23626b4f8047cc005c1";
+  sha512.doc = "94071c780fdb528b361945dd724641610a7443f043992a57ee92b537447fa230c47a61de4326dc4c59a3dfb8971779d0681ee6d82f3b90f25d759a564fe6aec9";
   hasRunfiles = true;
 };
 "notoccite" = {
   stripPrefix = 0;
-  sha512.run = "deab2246188c9bfc02167273474eb1a2b8223cb428e46cd28135939edaf6089b0e539a36353f6d72061c3e6afd271d731f3ba58e74ac4e5325d1464943b28b8f";
-  sha512.doc = "10312c92ba85c28d202cc182e14f2bdee9bdb4bf519673dd66c2bc5303d62f180f3e5dbff1b7660081c37de71f0e4436535e00b98c74a82755619e1d272c990d";
+  sha512.run = "9552e9a92c4f3aa447aaeec36046906d275aa18209d0180c3b6a0fa9561487df60d9381905c3ff63d3c0d2ef4bfbe1947ef58cb7bc924751cf9b3387064a1759";
+  sha512.doc = "d0c78c3b14eaad84cfd5b04e1d80d6255fb53e20811c7bd437ed057f053f257cba14d363b57b8f3fc04f774e4411a38589606d2cc0ae2593326f1bbcef7a19d5";
   hasRunfiles = true;
 };
 "novel" = {
   stripPrefix = 0;
-  sha512.run = "ac4e6dc42c08a2ad348e7e148d48a049bd1c0edccd16920116577d5d4ff45f31bfe0d839925d7627254018ac941a34fa19d901441035e85a669f41e0aba10f55";
-  sha512.doc = "b457e63e401f6b33772256fa521dfa21b48290f6f91c6db599ce1f803875d9f9cc19f6593b12eb5843422ae8140c6734e71051dd063a3d57ed111027b4cf510d";
+  sha512.run = "e8fbb2ccc6066474b40e3b7b820726dab29378248d7b8178c4823f42446e5218bb02cbcef20571f00b91995b7e9bc2c59e39dcd71f3c9b588805054d8c4d3723";
+  sha512.doc = "506e870d2e2e78bce56a0533f9cde244fb53c82cb3933044a176f8c2ad98a4fd48838fa99741e017b63b90a52bb5c43b48d16c46f591a45106343a14a51f39e4";
   hasRunfiles = true;
-  version = "1.46.2";
+  version = "1.52";
 };
 "nowidow" = {
   stripPrefix = 0;
-  sha512.run = "cf120e4ef5badc72ca2c1cf9b84a44ef88c3dceafbc7610569406088f9a6801a46b37f6b95b1bfc9e062bec1b17bec44c5b693c48d6c6eeb024c0830e1c5d92f";
-  sha512.doc = "c627ae480df23301acf164231a9a81d3117929d8caa2f5e8738753a795b979dded6a8f445ee5756f41f30771df90025b5bc3c30333498835ffac01febafda95c";
-  sha512.source = "c05852736df3b98c24b45065a5c15ad6f07622893052eee9b615adfa97289d6abd9e313ac0d8eef00ee2118d6ffb4a3f17c1d2392dd03e62f8a5bebc07f2c236";
+  sha512.run = "da8c9dd2b2a64fe7643d8502c49c76ffb441488023f6e896fc92c89e784a1f2eeef9d0ab2bdaaae14fc5d7dad8bee7cb663b15c2382dd09cb3a1a493946e1453";
+  sha512.doc = "6e01c5f7bae98bb808d1ccef3b93e644c4d41cd211bd30aaccf30e59e133f7e16459b94b0bc5fbee1d7901ea20993dd6374224148aa1ad937a95f636e0565fc5";
+  sha512.source = "cdd9dea11d8cc2d56acd5d091bff85b33faeb9b986b5fb07c2aaa811b1f5200dafc5171cc1a4e9e94029fc272e7fdd40c41c977be8153c8ad20f1251360fe866";
   hasRunfiles = true;
   version = "1.0";
 };
 "nox" = {
   stripPrefix = 0;
-  sha512.run = "8711f4158013cc23869c0ff3ca1c8466f6adf0217412897d7ed40697cf1186aa14c1e8d448d7534dcc15c20b1b87acd71a1dcedc87c47d8b3b38554e5eb03b31";
-  sha512.doc = "5b2041975cc52bea94f4f559b87e7711410b5c71fbcabd84a37b4dc3ab7d13514ddc164c62c7f419bb004d5b941e258e8ea836a91aaa70971950dc0fe28bdf92";
+  sha512.run = "6e81968905e530750ffe8f84f410c1e72c0dc324b69acda11553244b2ac0acbfebe0026ff8014f7bf294535deb6527ef8912334c63b849928003607b28dc10e6";
+  sha512.doc = "562edd79b914378e450dd3b19426255f544539dba806b8643cdd44b168b9f40ab1dbef41191c3c964eff6ddc49283650bb8fcfbb2cc8af42dcfbf7b1f66e6d9c";
   hasRunfiles = true;
   version = "1.0";
 };
+"npp-for-context" = {
+  stripPrefix = 0;
+  sha512.run = "59d6f20cb9e2357fcfe7acd498f02b75124f87483d6c4cb3dc5b5dc19eb0bf9cb4af60c79bb63f8eaa1d9673089af5227367e023e67c37cfe20fbecce30999cd";
+  sha512.doc = "f5b3532864c00c5cdadb423f99cd32e4f86a6c4bdf4cd8eb87ec3abbfdf3aeafadf8bbb4b8fa0f2c70902d7f7dd8444ad58993f3c3ced00e1ab55cd85a7caa8f";
+  version = "0.98";
+};
 "nrc" = {
   stripPrefix = 0;
-  sha512.run = "a9a3eb3807bd1a503224ae22c2e3b741fa6e7f9ced384fb49ec235a82916bce06ca2363abdd1e11312bc966ea056db36cfb67ba6ca1a58041c5da4386e57eb7e";
-  sha512.doc = "91321241aa34dc54f4eb2a9af47928d242951a4a7632756a5089eeb3a4334dd6bd6bd5f97429b921b08437723dbaae09704baef0823c56e54a7a54c4463c74bd";
-  sha512.source = "1160510f25851be4ec150901403aca388f3d3be7efe33d5cc59b629e3ae6330863da31a570ed2084ca934ccbc6027cb9ef4b363792169234344d16d8d6341f75";
+  sha512.run = "fe5644c3162f00fd8b6a45ce22609730007620633411e9108580e20d2e45dc1f50066946fc27b780689b85bc14e7a410720e744dabd6dbc7fdf4e4ad399730a7";
+  sha512.doc = "961db00f3a5163197b2527c2e9358521c3212586c93ca234fb0e205f726648d6cd3acb205cae566711e86876ebc44abdf9b6f3bcef147d6a4229daeb659542eb";
+  sha512.source = "d9387a9d8941427a0e8ba625f60a17e200a4995e43f38c4213868e43e7334e996f1e4db9f440dbb2f42a31024a247939f46dedd8804cdc2cb81ab1ab5b10e98f";
   hasRunfiles = true;
   version = "2.01a";
 };
 "ntgclass" = {
   stripPrefix = 0;
-  sha512.run = "2ced93b0eff6e74dcfb327464d9fcda3f69861c6f6cea61b96a0be07f9ef9012012787550b0fca6e1ced0c66a7ae6657ba252517ff2297aa6a463f6be53142d1";
-  sha512.doc = "46956352415d7fe695598b83308be5dc8e09da22a060686dee48e873f6ba75605de128d4a5c440f24769fc918600c40616f222e23bf21809c93ae3309aaa51c2";
-  sha512.source = "1147b653bac19f1c507c3728f2a980f8b5543e7ab02a86a8fbe07d8a60367acd3f00cab54e54a6ffc017bb925d274171b509eba0959988d35efd406995195945";
+  sha512.run = "ecbe7de30c75e442a3da6f76a1a82727b84125b0f7bc25c397f4bd6f553eacca5cced79eb9764f6221b458621e1a927f3f1cbaeb6049724438e91b07c3eb2d04";
+  sha512.doc = "860fda66e52bdfc03d7c4e3d996402295ebc4dd98b05925afe5735e4f5161b64c34b33a85ef3df95ee76d5784667179f0b336c1d92d484e4201815921ff87b73";
+  sha512.source = "51c4e7f37f5d399d90565c88b60c2eaf8b202de5ffb347ef0bba4c0da0d7dbb5945962493d727d239c691a32099345f14e80fd10f539282e964476973a8ca8fa";
   hasRunfiles = true;
   version = "2.1a";
 };
 "ntheorem" = {
   stripPrefix = 0;
-  sha512.run = "34f270bafa11ca505538cae19d8600b12226c2c68f271947aeb93794e28f5e00f8b5538a985903c526b238cd06ad082c9c0805fd0ca1d9367579921cf026f066";
-  sha512.doc = "6b4363ad3274c31903490e8e126a157bc52a781dc7d62f10fa15e3d357dccef76d0bc2c613d3498b4d2db3b3b1d190e905831f270437858a8f83d1235fbcccd7";
-  sha512.source = "982872443879c07c8a8be11830dc97f40a1196056c5b291af8df14841a74d41d7d4054cd43d8b3bb2f9d4ae7171b195d4190c296a42e4232547d1b6b421321df";
+  sha512.run = "90d18d32a585aab43b27c38d0dfb1bb2357419940fb854c6d6cdd83e183f59d8f4bd478908417f63acffbc3ccf8ea5e1acf35f1a8a5799ad4f4479268093ed61";
+  sha512.doc = "d65ddf7e3b9d926e1177ba27f569b50d886b19733fde1636e4f86d24da6f40fcf1cb572da9bec4ead8a0e94eb8cbcb5ffbd61d441f954d1342906240673a0ea3";
+  sha512.source = "153b635fff805f5beeeaa6c95ec4c2a6ba08e9f73f98efd4873aa361618cd915f2ab969c7118119bd30a0f57e3dc35acf10ef80beb24d5c2fe0fc7eb503783da";
   hasRunfiles = true;
   version = "1.33";
 };
 "ntheorem-vn" = {
   stripPrefix = 0;
-  sha512.run = "991e3e43c228c0ee57e5ecb22e2735bacefc4e45d750cc9037e56777770960368affb6bc5905936204a8a40e040dbdf643a3209334afdc8e4b79beb19a73728f";
-  sha512.doc = "4975cfff2a63bcb2dfb8c3efb4c2f20eba14870b9a45ddcd283185461847e5ef158ca084927c223cd11b8733ba51b19383730b1b1f8cfc4c8aaca3509db0d88c";
+  sha512.run = "7e4344498126dceffe76867c879b81ac601fd74e8d766c18523a1d587a26d95b84e81d8368c2aa28b8148cf0253a0bd0dc2e07331ff66aaeb1629a330e00d251";
+  sha512.doc = "ecfd39bbde5e010f71b9686e6678bbc5e27cbe75207121014cda0de9918d29d6cdf2d606d2e065c8001841d617c1e44765ee1d7135d991099f99781be6d37eac";
   version = "1.203";
 };
 "nuc" = {
   stripPrefix = 0;
-  sha512.run = "6412bbbd1217b833679659ef82fc370e00298b29e4468c79b7e4241c3f4ee5c6c19c76c339ec2b22ada7aef0c8e500d08aac1ad098f4c27389f008ead914d122";
-  sha512.doc = "1f4a725e05f1d387ca05b26d53fecf2b56d36ab89dc6206e9e09f8e3445d13c2b9f98f36774c025f422dda5f1f2164282bfe5cd1454b7db51eb6842cb061565b";
+  sha512.run = "34e4e1f97be707af2e13c0286ba31c864c6c861f253e0961d0e338b3e1d004fa8e5f5fcfb4db438538de14191f77224c3ecdb464f9b9b699f46a7a894a5d4ae0";
+  sha512.doc = "903d54c51ab36b805a191c8655a8255f0cc7302202ec8d363f025609ce763939ace5ccde475a6b42ef68e2a5a03a244f8a1439ef98148d43d0340c5dcd86e9a7";
   hasRunfiles = true;
   version = "0.1";
 };
 "nucleardata" = {
   stripPrefix = 0;
-  sha512.run = "e54e03f54ee71180d3634b46a5efd3342f8581276ec9a15a769a60060a2b154f8906ff04a681233a7ec3928d151714cb79bbc7f20adf0223ee72613c8c699dca";
-  sha512.doc = "8f9799ee953c2a7e0590f7e5d5455829e219820c04f24308a942f318bff5735bb1cb34ad09d9af1148e727d1a8c87a0f31436224244469439c83980732429966";
-  sha512.source = "2c684e78a331e063859f0b18cd8df828a83f9f7fa8952a0b17b333445d47249f8061a5b2ee81be3d99cfd2e4408dbaa81b8040ca24cb2c8125ce7cea6861d78f";
+  sha512.run = "b68559323f45aad9c4a07794a8195b5b1e6f3a5ea0f54f82b7d5d743bf4fb2396c0472731f84d1ec524e38cc99ef5afa6949127340a554d80a36b00d7cae5e3d";
+  sha512.doc = "5ef98fdbac5be3052aeba824c80b94eeb651bf514bf77b82d54096a3ede9b7fd7f62cc7dda543ca5da2eff53a5cc6586b2c64d3881dacbde233382addb1f05a4";
+  sha512.source = "d74f0625fa3a8ac897c23c116a8ba99b84776d8e2a224b94fa01764c3d97d75b2b2693a138b6d21a8d728243325511c9b79a8fb77390677536e7c73f256f6b3c";
   hasRunfiles = true;
-  version = "1.01d";
+  version = "1.1";
 };
 "numberedblock" = {
   stripPrefix = 0;
-  sha512.run = "6e838d804c451f9d9237795981c385c4e233556a85eb01393227b62db5d3b7a5dd6a2497387a310788c3a25607a7a58a03930c142230a328b0d3e3bd28f4c98d";
-  sha512.doc = "d50a4b17e9e82adcc9e0a238fb5fa0a5a9305c49423cfd0adad0a4641360a6a4bce45f518f4dd1ce8e823aa54c3e81421c33cbdb557939a43d01da5a0fa47805";
+  sha512.run = "4d18af64342aa06630d772ba702ea13cb96778321b87d3d1025d8770f40c609c5577e858474a4fc4feb4c0d7a6a026319a02d68a6a99194c4aff539579613993";
+  sha512.doc = "50427c74920c3d9f409705d92d913ef1931b3648510d93b5cf70fac250894bcddcbe67671dd5eb19b1372a536c964e2c1f145672db2091e4132d5fb210d454b8";
   hasRunfiles = true;
   version = "1.10";
 };
 "numericplots" = {
   stripPrefix = 0;
-  sha512.run = "ed37b27256794ca33ba0b65e4b33ed28c5e748e333d7b11acb329d183446452d3ac9e8b8ec5bc87d29b93f8984cd238e198bacad3a1bc243908c25ff2c88c5fa";
-  sha512.doc = "22f504f9657f1efa8fe259209a8fdacc27dc8769a919eb5ee2d2a1d185462aff570fec1d302920a26cfcbd2fd166f3a9d949bd6f4909a7e9da9cc71a65a3c266";
+  sha512.run = "f724c8b35002ea5c3cac7520f6ddc6100f22762a46f1b5fc5b9e5597db8902ab7e3417974112d43f4ad4aad20da9486c996c4032f8c709ce44b8526ce66a004c";
+  sha512.doc = "7395e92722414a00175c442abb9fc74c3a5f6dcea06d4011e3c95a3b8749c152e70a9346f49ce3aa1696270af376987b4ccb63722ff0edb6c6e8ff0573327610";
   hasRunfiles = true;
   version = "2.0.2";
 };
 "numname" = {
   stripPrefix = 0;
-  sha512.run = "b1cc5f9d94fc7edbb6d678cf6cbcfdf43107a5c948e892e1619f8ee47ccfacc441e60dc73c4cec96b1a78ca4d65502d9f2eecacfe5e839216f558c234c862c3c";
-  sha512.doc = "341813b4d4a6a580671a0347c4f044ff58f185254944ab6e8dc07eda22bfd9d79917ff772e6da5b81e004a36773befe76254bf47d1883f4132a88dcc139595fc";
+  sha512.run = "cee042c1508d651445f7d64bfb46a58a6c9d984c6c12dad80750b462723eabf764515437da1c677e4f6082926b906445861ac50d069a66a02874b93655e99f7f";
+  sha512.doc = "91e93657532ddc88c0f2a9251b6053f96b1e567acd57cab9c1d523b1c5409aa86763052993290ce2e7c17697f32039f91f796ee1008961a44a2a760682745a6b";
   hasRunfiles = true;
 };
 "numnameru" = {
   stripPrefix = 0;
-  sha512.run = "ce295f695b00c9a02f8df926566f0992f5bbc4b0950b074245599157181f132b06e5c4e3826da0e0f4ccbc93d3ab032791e0e0619315f098af62973e8d936e43";
-  sha512.doc = "60adcfb63515a65c9acceaa089d344c787c2df37a5a43893f5964470b31d779d9df8c1112ea795df3dd2e5e252efddf94ee89ea7d61a3e27a3238e7541af37d4";
+  sha512.run = "b474b7990598bb5bddaad3534450bc2001c23cd47f0c152a2fa720c184256c4309096be5a87e08756fd1455413d81d27bbe2d75b7573d234f593d7ff747923a1";
+  sha512.doc = "23c616efcd9f1d261e50fb738d839c640ddd680ea50c9784850aec7406a0543ee33ad02b5ac4a325a859c050ff1bcc4a96b69777769796b537e09d158b10ed71";
   hasRunfiles = true;
 };
 "numprint" = {
   stripPrefix = 0;
-  sha512.run = "5c7f54b17e8254e38495082d8d2fc02611ae2e99e5b908f99966203895552d82a0bdd318cb0265aca635afa2b06d7476a88533983c56808ba8560397a18cc1e3";
-  sha512.doc = "9514d5fff2d866efff7b0d6d4899dcebbfd4030345e86519380dbd30eae3960593e9d7185c1c876f7dfb08f6687cbdc52ff77f10811efb6f95c19d3e8cba6a2e";
-  sha512.source = "52238ef3c140801e5fce1cadd4636de353001f64eed83b03ba8ca33b6492152217ebff0a7f2412a2b139ada6cd507f66c1a15fb220ef81524b8aee3b971176bd";
+  sha512.run = "842ff2ecda1735e850fcefbd13b0aa676d11aa6ad698dfafb7c53f1fcb388d79b0d5db508b9321a3ad8612bba5f0b37e08c53a40e03558d9205b136fdf5b4279";
+  sha512.doc = "6efc0037de519c330ee049080bfe0941bd76f27b6cdd3cb9509a781f919b322b602998fb7ff01a58a7125d3cc1107536953eece9e143a3dafd2fb2eeda725bc3";
+  sha512.source = "7e72a20bb07348c80ae6ea2aaccb6196a6751bcb61a98f54ebf9c595f6565e0b240e198936dfa665e287f0d1bf9d110ae671d7888737ca4e7aa05174c56d5e56";
   hasRunfiles = true;
   version = "1.39";
 };
 "numspell" = {
   stripPrefix = 0;
-  sha512.run = "a053e3083c8c3024a7737d1ed0ed15b8b7bebdc37f627cd3419f978aa0ea1086dd40c1785cf700b68d02ac88f31e47741b1bb842863b24f1c086b2fa994a114c";
-  sha512.doc = "1fc0ae640e762a5486fd92263cb5954610b498387225c8b056b3c1318ba383709f2e2cd9d1bd4aa03b214f53e726da6351df5178685f12941a1c40d9772b241c";
+  sha512.run = "e96de6205405139ccdc1462a165d4dfa7226ad5fd3b319dd63f5acca0f3b9d6b1bd658935d181ce817b2a8ce40656a31c51dbd0f1eca256dac0545090d4d7d79";
+  sha512.doc = "b762d5cc76a4d5f932943713bccafdfd969bf8899e4543bcca2d28a8e90fcce897fbb6674e4c0a3c924d582fa2c441595976467a69ddbc12aa624269e5cc0856";
   hasRunfiles = true;
   version = "1.2";
 };
 "nwejm" = {
   stripPrefix = 0;
-  sha512.run = "9fbb62c23f87d3726d9686c99514a67396c1c4cf5d10cd1d58633cc3cb6d36a659e8067bd456b90162d2eb4742e1e1f02752e49e94e5c4679efdc7b20b9a1f15";
-  sha512.doc = "aec8a04ecfc87b52209d10406660fe9acedc5090e813c326f21c2a47417a9bce492615d7bebcd72f4f1e7a07e7a6519b9ffe758cddaa213446529afe5c1f47a8";
-  sha512.source = "2b3df368f49db1bd091c4fc370d1d9b159194d07bca60b46a45a4344184f2afac67259bcf290f29ef81f1c5f3d8ccf3e46490d117949a19ae5ce0df31053f7bf";
+  sha512.run = "2ed126a29ab038121173071ef7bce7b77fb36ecb9e319eb2d8f6a30c91b32728af27e844fb2a0c5a96ae0f556a852ea85ecf3be0ef533bc6a1b45c543e2ae944";
+  sha512.doc = "b4ce3ff44cbf513a759b0d95e4b226206189bd2d09d583e12e0f16017f3f3b51e79b040c8b14b6bff11312af872dea645fbf2dadc24b03e458b74421b98cc6dc";
+  sha512.source = "cb8f90d0085ed77e9077a3735dd2bed05247ebbdcaad54ef45fe0d5bcbe4c354bb2dc24baf10c605f1991fbbea31d774590806a4020e049b6156cb3aea49b160";
   hasRunfiles = true;
-  version = "0.98d";
+  version = "0.98e";
 };
 "oberdiek" = {
   stripPrefix = 0;
-  sha512.run = "649c757a9a921d8ab72df5716325f8873503527c457d77e36b608751d9293c56ee0c02723ded10f233cb2840903ecf4c5460e62b6e92ee28006b7f5337c32fbb";
-  sha512.doc = "5d9bc2d39fc84e054d7732d812dbf98e4eb6df26d84db239240c5cf263b84ea7df5cb6496080fa277813f0950575e5b8376aa56b620d4ea1b75a4d18fd322e7c";
-  sha512.source = "49655523a7d52a55a8b804dd56101671081776f196d514d551f78a18fda1b96e6f38c26c8b940a46e2f809805db97d0d2caf4bc783b45ccc13371ee2a3104515";
+  sha512.run = "750a6b5df16d34265fe21bdad99a3493074c81e4a0d055cbd3df6e95ea3bb80d4a40980697cc759f52d1bdee59f88d2a3db3afd907c8fdb3032ee4a25363f475";
+  sha512.doc = "28366d4dbccaf9d62bb1f1d8905101e2d81d37bebe1aa5484faf9081a1a32518ae6fe7058dd433ad189256bda96f01aaf7f9a9ee28c24c1cdb9707fdc3ba027c";
+  sha512.source = "f34e5a0872dc5a3c93715ac7df080becba318bb48047b0b331753559f43e7d9e20b891a1d33f6d5d3a78772bb755d565b201b3e0b79ab883ffa413738adb4679";
   hasRunfiles = true;
 };
 "objectz" = {
   stripPrefix = 0;
-  sha512.run = "993f91a7b8486831d8c6c8a5963b447b3690d6cdf65ecd1b226f3e1d360836b1f1fa686e9d64e51cfbe2d8d0a94b831eee4cbc73bd55bb348fbc469631095d17";
-  sha512.doc = "a1799f8c37dc6042427240267c810239c4b4bf59aec3c2ae040199543db0e98e43649936f9dbbf187633e65bdae1af3c8d4086f759bd08947a3aa31dc5607b69";
-  sha512.source = "880813d34ad6f1c5723633d59b679be40e1dfff1510f8e12f04418980b98b5776a9241a6d44e2e2df86c019975038652d0f0d1d3e349371b0052538f21b5ca57";
+  sha512.run = "c99ad2bd028fc099125dcf2c37c33f2af6565288a8d72d2f5f8edfae2987bd7e1a3cccc4c0b2ccf530b686dfa782ad9dae24557f418a9b7a74497919ae87491a";
+  sha512.doc = "e4e9911bcc9971ddbcf60db29f612fba32fb21142c7d2f72e8efbe659300e2296f28d31fd4e3a4137aa2037d0b5f97e9baf0133bd92a4ac557647637de761515";
+  sha512.source = "dae33847ec4c7a3936cc66cd0ee90901b8f2694daa61f036fe00155bb78cec3873f6ea08210f557907725d3505c631324681645bdc6c723f23e69da03f2c9762";
   hasRunfiles = true;
 };
 "obnov" = {
   stripPrefix = 0;
-  sha512.run = "41785a882ceb83021c6f45bc0afcd39eff2a92602a4b65f10923c0a3fa836963f7d48fad2df2011d452d991796fd3981be3f9cc6f5646d751706ebed0cfe7414";
-  sha512.doc = "acc56f359971628a60cdd02a65a2c288d44c99577663cd8bd5fdcbca447ad4d0f25b23b43c8bd79303e5729504d7a8090711e91211f197fb52980f44dd0096a9";
+  sha512.run = "bba8d75d8b7d2e5b38c3f0d7f7b96700bcc614d298ed9eef879782f7f910ce304e95f238c20e3e2d796f24baebf18167eb5d2df9155eb05fd6ea66233003e50a";
+  sha512.doc = "c49e87f54d995c5669cb30294450366c9dbc8637528cc97a823f762755c318bbcb2a4873a982a760ea78c79aaa5b88ea7a9705d28f342e9f4d06e635ce6d4bc7";
   hasRunfiles = true;
   version = "0.11";
 };
 "ocg-p" = {
   stripPrefix = 0;
-  sha512.run = "c2e14bb8e50a5a3d0c0db95e3577b784e27b5dc57391cdabe4e243c7fee9af0a6bb5ca1001569ea28ca7a116f6bfa99bf7982dc8c9cdee2abc6e3c736f7c7b7a";
-  sha512.doc = "d9a7745f23f13bd3e1d66fb6a0b7afdd132be1b455258d54f52988e0a2f5268ecc1b8ccb5f2ffd59f4022816f09b2f1f3d3e318e76c50296cb70083ad16777a2";
+  sha512.run = "6506d4574cc8501dfb245f97455db807cb4a12767f81bf245ee424851c99a142f254d005f3e20ec68ba38473d3ec2bc97b2638d41746ae00f0b38cdc450d65d6";
+  sha512.doc = "9a33dce50c5847bcefd3fe5aa11ad77c12ee9d7da6d8dc21100e27347fe72045b27e928e9c266a19cb922659af6d90c87445034888f813b565fa08eb743e3162";
   hasRunfiles = true;
   version = "0.4";
 };
 "ocgx" = {
   stripPrefix = 0;
-  sha512.run = "cb5a6940ab5e24dea47bd0ef82e346f6fffe82b237d106e396d426754ad6449c838ea619c454f86ef42d3a0749df725eecc8ff94d3efd35d691d0baa5bd3027a";
-  sha512.doc = "dd6fa6c25c4b6c8e2af55e9350af4e69fecac4a8e5fab03fef11d34909c45cc4eacee76b72b43890b39290beeae90a0ed807f2f286a0ea05a996e3bf95cec72e";
-  sha512.source = "0c4a4ec68df67e06796ddddfedb7b7f8c021623129f01af206fbb91aa7a257ab6b650ef937a249a1cba538736ee4d0d1b07d44d089700b24e736ee3cdd4f69b2";
+  sha512.run = "d39cea85bf48f8a8168d9ff2baa469a52bf5e023cb265dcaf5e42fb6b75e8e6be5a27e6c071833a4bf148fa1582565df4c29300b00ae67d294de648201303bc3";
+  sha512.doc = "98392e220d146bde4d35636ad5f05514cf2c6e9ff55b803fde3acba259c6f9322e600ff5cc88d58a71e13a5b6ca46a049e92501ad20719002361eed50583763b";
+  sha512.source = "2263a05007116711328a81e026c22315b9c05b34b7b2253be0b2d3af4d49e7f6bd80e6abadfe961d171326f5758ad5578fcb2caeafa8dee936c8e4d8af60b780";
   hasRunfiles = true;
   version = "0.5";
 };
 "ocgx2" = {
   stripPrefix = 0;
-  sha512.run = "ba5edfa28ad342f3346857ba072ebc4b059b6cba5332e30f003ed1f8fcf614043f5f6ac1e88ce45ce00082e636ddfb476c625e212de22daee593db6986a5ecf9";
-  sha512.doc = "841d51330f6388ccb1f9c6d6187b03dd16f09d3c27f5fbbdf4605dbf04112fff4b14e88a28e3a0c1d3a2d9ecb118bb4d026f1fdc63a8678e306838ab977d2a38";
+  sha512.run = "9d23dc77fc47cb690e15febe6554f0c7fe94a56f87736262f9fa87380ac54707cf08ced48ff5c36b2e094ec52c3066645822788747d85a4aecaa30507f38ef20";
+  sha512.doc = "ffe2ed83f864b9791b9c53180f562db59fa4d07ea718a6cd69eeeeda42f8e22c06a3be9bd6f68160cd538231772076d4b4b8322b5a4370a6e6806b7f078c5a82";
   hasRunfiles = true;
-  version = "0.32";
+  version = "0.36";
 };
 "ocherokee" = {
   stripPrefix = 0;
-  sha512.run = "ccef75a3021154e48a3f5fb04b419d6eb1a72ca04718a93912439d4d8f5e8fdc36fbd2aaf791dfefdb6f86845d630e7c726f94b5489d0732ed2335f1c3626fbd";
-  sha512.doc = "74010acc2885ef8dd571af43b4a3cbc86a9d771a5abf2c915a66dd9c6b3dc8ef445e7867531be2648b7fb4a42faed2fc3c31e660e33ca8329ac7696bd9028616";
+  sha512.run = "f19c0978d54757b6673a8e9348dd1133d138ddd0734ec86c237b97644606015eabea03bcc52df42388273dddd9d2d261a6b14c780454c9f76f6884f2cf6a80bc";
+  sha512.doc = "cdbf85af5fdda57ad25ee1ad20d8ead0fc15c25644c1db51555b8cf646037e71e313ff468710d1add6aa043e9d4f0853106b0b995d22aa261c409fbfc25c77b7";
   hasRunfiles = true;
 };
 "ocr-b" = {
   stripPrefix = 0;
-  sha512.run = "736b2f66441af7d02680d309f3bd2e23b646727a056b7d057f97e234d65fd3478ea28743be409b83ca99e05c5ac2eb0a98a2daba78666eed9ffed6d1f10afefe";
-  sha512.doc = "710b0bda6e4a1e982dbd7859e22a898d9fdc3b55de4a4944e370618e31d4e24fd56b88e8a7be32a153f1bcae5ac4ca00644ace735ea037f26a64007b91705ee1";
+  sha512.run = "1c7903717108b83f461ec67ed247ca60c02481c5d9c01ddd5be3dd8e8000f14c5fd01c9632641ab821438dca9c690367e36685e1c7161ae43a661c81eb6f80ca";
+  sha512.doc = "ba962f0df9f179940ee1dc9b2e4bc0587527734ed614fefa9493a384812002365b41dd1765fbe5357521e4de958a6c6b153c3c43bd093d38434bf21b294771b5";
   hasRunfiles = true;
 };
 "ocr-b-outline" = {
   stripPrefix = 0;
-  sha512.run = "d6487974eb7e17a28c4c804fba0865f88434db2536bd112ba11dffa3e821242528bca1df4d944abbdb54a0064042d3446dd9eb7d7ded10301c7dbf55a73d6813";
-  sha512.doc = "d92d2fa37c004ac96181ff7d997f9ed022d3ad7c8d752098b69d0129a659004f83c137eb5ec3029f70e3195ebc5e159821dd23438e1e4b74ae0586317b682b41";
-  sha512.source = "e06a7b9d98a30ee373e838030f4b90b8079e0b7dc75a474663a45c43bb39282cc52e4713127fe25f219e03afb676cf47e41aded3d6f25c729964cd7d4bf4003a";
+  sha512.run = "727e4550ad8a4d2d8886ac99d7ad58690e39e80512c64fee4e01f780a20eac6e5e32e0faa1b7d56b5556f1287b78736e4653c44f6911c559ad6436f2ca63cc9e";
+  sha512.doc = "2d18b50f25d79b5bf07d5c760cb9cc7445554fd06e12de2844efb6c6a360333bbd9daa1529725c5cba71ebae8cf3dabb22db14917d8344d63a30b7f5cdd40b45";
+  sha512.source = "7b817e4b93e25845f3953ea2bfe608d052595339ab9cdf85f62dabf750a8c997a1e9ce7ce726bdefb64229d609b2dfc5e1929624fc644b2e65554aa13dc2f8f8";
   hasRunfiles = true;
 };
 "ocr-latex" = {
   stripPrefix = 0;
-  sha512.run = "e23de9488c9d49b8f087648baf497acad7474ef79771941850877449c8af7a208cb19e0266148a06ea7f9f7d333648d187b0778a0568ff84720a97993c3c49e2";
-  sha512.doc = "90ccbbbb9034cc68ba99592bfefb890554fbd4c97a7dc138fab571c8b49c0d853ad1abc5357fb896873600d625937f011b50c797636ae0c66ba1628af314c31e";
+  sha512.run = "e4e6e65eada08b3feefcfab0e5b0d7e5ae901525442adb2c6212b1f96bbc4861eb5b2b6baefe4b67e88d9d77e12679cbf6517bc65c64a9d1ff943c09922341f2";
+  sha512.doc = "814f8c65d532c24c87abc5b034b3e6d857cc372a665d61721278aaa900a3a96d7dc84262d021d8daf5c713b5e8a0893ed3826914ff9046dc5655009ae21f2d71";
   hasRunfiles = true;
 };
 "octave" = {
   stripPrefix = 0;
-  sha512.run = "83690251225ace3b6b51c20f0fa096a5c3ac1e6c6fd914a20070a19f4b802ba1413e3541fd67344eade0a3c83e1ec9b276e7181b1cc086522f37c2f0757e0945";
-  sha512.doc = "b2f3d73d0e57265849487cd6b337380d9883baaeba4a2af52d97bbd3f9c6a957bd7b6929d999fa613704240a14d4eb6934be92fb21c3eae6d5bb323c98265133";
+  sha512.run = "f25eddf66336137957478ed6687cbb85bf8de083e549ad3f0db0ac512b241fa7482f1dc411b116ec60b8cd1789544ee7abadc8f8b8f37559ee2e6740754e4b2a";
+  sha512.doc = "1d49da5cf5c6f0b8957f15ff8f24570f04f69a05fdcb6b4f6356198aa6337bcbc8abc6f566631ae9470c231acce11d1dbf4cb81e8c57f3c8600b87a5f0c77610";
   hasRunfiles = true;
 };
 "octavo" = {
   stripPrefix = 0;
-  sha512.run = "a8e8b904b085a2124c6531fc2eefe838515c5829804c12cacc932f495c36c9f692a3fec8d50c191d777f9eba9e97bbec5da05a1e28506ef2f92053c003d87ca7";
-  sha512.doc = "5ae95140b7275b829dc7310394d55438176f7b1395ede3539a55d74e6445e233d2e896970d81c3baa292d81901297b278652a0575289c9aea806a60cfacf0719";
-  sha512.source = "dce7330041cf68de0eee6f8f704ba16adf2fa04eef65cb762e8c31bd3baeda9a37a18c1f288f2b1eae9a07fb3f0603b1dbad3444a49ed86c8a0bc503d9e4f517";
+  sha512.run = "b2b33aff9c3b8f02cfbfad6e60b3c524d1ea8fdaf97a7c4ae0f6cf0d52fa54ead00288675f3694391aaca02c90dd2bcecba4240a1878dcff4be739c515486439";
+  sha512.doc = "413cc3a0a88835f4136d9834e1545f674169ba684201f6a43549feb1d5b7970445d41c9efd07939aae72ba139c7791f75bd406394b6233f4c35966eb5432da07";
+  sha512.source = "7e17c81344cd0d619b4101db168794bbd468b0224ad07302334a9e9df3eb16cb214cc9bd9df5c408d7d5122d6e6abdb2c71d04a4396c7f645bea2d396780f4d7";
   hasRunfiles = true;
   version = "1.2";
 };
 "odsfile" = {
   stripPrefix = 0;
-  sha512.run = "be465c781a94374fc73dfbaa4970378e7b1cfd05a65eb3b6df4d74aca9d5a7d567bff25a164b1246b2c86d6e46887670340c5605c12c6a495499a536725a2db1";
-  sha512.doc = "f02d709e8343e1176808c8e66e1f4f2385ece69038c1126b7941e5025601cdb547bbe1a48f8d27fd7cedf8cc5f34fea420d42c8c0e7741bd2608495f63ca79e2";
+  sha512.run = "e8f2e4ae565f5800dddf048f8cdee5d7c007b0b442758936ec37f62f0b531db8bdd00e502a5040cdbd56e6a3b928c5aaa7337422a6d7d54aec7ceaa5036a0f62";
+  sha512.doc = "f58037561f782430061fe5a440f06f74b0354ad0931bc32108bf43a26fa44324077fb84e8068f8623e611c1af8139737aa4ee42b779aefdb046ff88b5de6ec85";
   hasRunfiles = true;
   version = "0.6";
 };
 "ofs" = {
   stripPrefix = 0;
-  sha512.run = "2cf371ace149811b641254c9b45eede4f66cc5fb521a93b1b7cae1f0b36ee0901d71adf3d6fc2d5b0b7e42ed07355cb532416dc028958af5f5337b63857f6be3";
-  sha512.doc = "25e6310d8b6aabdb17d7ccba6674c8621e64842e0864e2a78523781a5c1ba734f08daa281ccc342924b09c23f436adea392b7e4ab5cd8bd783cfa4ad7de6b77f";
+  sha512.run = "f95d10f0cc61e13f2f60112a1660987ce3264090d0205dc55393f6a0204f6fe30f5a32ba16317ffacabf0d87cebdbf41cde1fd642f9e51d4f413ce1211699d5f";
+  sha512.doc = "a43dc7e1a8253c1fec3516eed30a512292c9351fe456247cd163c47ffb28a0a5965d25ae2622b6c44c6c13d4810a93d605df496567511294340dc039cdded409";
   hasRunfiles = true;
 };
 "ogham" = {
   stripPrefix = 0;
-  sha512.run = "dc1c86d88a4ed1f4d978275882b50c48a0a00939482b8814d619c495d94807b449d633b83be2e0cf7c957e6ed8269c10ee3c028edae17d0b0911d71833509ed1";
-  sha512.doc = "f3ccb2f5f50fc748dc1e484149285cee8a189b8cb289e6aced102ede1427d128b56ad4933cbf57e1ef2de4dc612eca28e457d9d19ff4c80922f12e5c4205a71b";
+  sha512.run = "66033bb98497948c0a5c41c2973082faf9ed55061883daaa504f380edd486fb876c7d8c93489731b9f39aef00a27c9d8ba94bcb66b04d103eb7d6b3d4905eda0";
+  sha512.doc = "5f666b255eb40a80bce743f00eb627151ee51bab9e7b282a8e496ce3f9ddbd8b61c026c0662005d517610d545680f9c92665a6a52fab18c01bd36a8a7883039a";
   hasRunfiles = true;
 };
 "oinuit" = {
   stripPrefix = 0;
-  sha512.run = "b01153f0608e5de85d08fb52541d149c714263e97131c9cffe9c5e31b20d171a00b7ead8544be5bfaf2cb5c9360c21b63c7dbddb50455a23a3101ef9a544359c";
-  sha512.doc = "5c7e4bb264c5584c7dc2f5b25c8efd6b3fa2c9a16ab8124038a3bdddbdd06e5b245cbc544ee002265500cadd8a8e2a63ab62b7d6af3d0e61d3e1d8db22577a14";
-  sha512.source = "e7462bad253136bab23664c730ef1763b2a9329ce484f5ab68ed913acc019e2de9148211ed7e98566a35cefbd37ad02c902c024f5cca7b29d1d6a7e88521b375";
+  sha512.run = "d3e38d11d3b36649f70b49c5f9ad9725300657fcb9dda849f34fdcf846f51893a484f0f4097e6c6729ce7637da94f2e483894c4075a18b86a6b877eb140e7131";
+  sha512.doc = "78a2f77dca0f277109e8f000caef96ad06d2e115d44ccf0a9ed12508dc1cdfbe8d18eb4b70748075cc2f43ca62dbf562115941265a2c3f48dc882d157ff418ef";
+  sha512.source = "0c2529f9db37899ebaf7a26300d1f2968e7baf2da546163a715ac873d3bedf301330467d54ffc696e57ee153c1543df3dfdff5941280b94c0d6bbcb9521c9d6d";
   hasRunfiles = true;
 };
 "old-arrows" = {
   stripPrefix = 0;
-  sha512.run = "59f0dbf01b73ca9a3e51ed18367394880ecd18f3ef6a93ea360f5658ce72bc11a23865fad47744b548bd3667d01ac1e90bb21c19090d008ca1709bd6c44797f0";
-  sha512.doc = "715dc85717234ad1469be1cc209e10bbc1a205b2fab6d10caa46d2ef3189d06fd59c84097c9deff9bd0cb804071a11923ff129c0e49fa544d9e6c43d77b21eff";
+  sha512.run = "a4d3b87c61130122050b4ab4c1f82f52b56ae1d3d5dd776a7bcb0087c09a5c5f49ec65c088fd5f6a180671d41e20786deddcba3e988711f019210c36748e0325";
+  sha512.doc = "1a812614d55fe5e809fc1c375f0b72c2494daa21098ef4e5737c5a4aaf1e8e78e81528992ad42012b5bfdd594c1b4ee7bfec53b00695426db28d9f776ea0755d";
   hasRunfiles = true;
   version = "2.0";
 };
 "oldlatin" = {
   stripPrefix = 0;
-  sha512.run = "a80118c87352c8e4b60215ecced0447bfc675d58dc19989e9788e938dc989002909bd2f4ff7354a674042086ae02bb34e9632d1356b979df8f1d5c84f3104203";
-  sha512.doc = "1d2259e534afc17f080a85db564d66747389daab934a9fc9c39506df8f8a428422de51355a8b5f89446da4645378f3cd29436808397cbd87de0a33e6a5115cd2";
+  sha512.run = "2f151b634a91aab7d9ef59cc6eb5c79ba89e136c99e70ea467275784b6800c432e7a3fd3a1bea3d941cfbb7adc905b3357c04e97caa250871f65d0f484a3fc49";
+  sha512.doc = "a457c079c6f4edfba26b65990b1d00c25d1b8526f808857270ebf47748c03f026bc6b8560853ce18e8bdd1f994b10b225d1ec4891d1d2b3686049b71d6f2634a";
   hasRunfiles = true;
   version = "1.00";
 };
 "oldstandard" = {
   stripPrefix = 0;
-  sha512.run = "066ffc69114c7ecbb1f6bc9088f97fdd241cc2f53089b210373e6832ef023bfcd0d5b333d8819d90242d0b6797f8b2ee5f678eed5ca850173759c2a916061e10";
-  sha512.doc = "d6176e46fe91cf18a11c22b51c9ab4cc7e69094526edb031a6a22a324736de755c8572dff7163b38dcf595a2877958fdd68218082cf96a24cec6994abf3e3674";
+  sha512.run = "97ac11efb16137815f3e36e2d2a30f61ba3b7c249dbb424f259199abb87d2b1301fac15a22ebf10afe8ad455927676721114030a549a0f7839809b357740fccb";
+  sha512.doc = "1dbb21b3ce9dfc2acefa5e249735c27df3e3715ca53b9fcd311b8fd13415f3898f966f00976ee956ec071b45c8ba4b6113ca8903a57501e61c54ad6d459e4a66";
   hasRunfiles = true;
   version = "2.2";
 };
 "oldstyle" = {
   stripPrefix = 0;
-  sha512.run = "d3e4536934d739db96ab7873bf15059f1425946b19da9d2aa573ed5d5a2f4b8dfb5ff41982f2f7268ba3397b82463b54c827e6a4cf652d497576dbea5d0b2924";
-  sha512.doc = "43325ebca8bcfbf1c6b0ed5c722c3a6814647ce445130d22d75296af96a5d023c182cc90a29da2e369c4c49500b01be9f21d45de2f3809bb42fc11275c17b0c7";
-  sha512.source = "7c6a45cea597e18aca6ce4e152eb421ee34ee4b41e8cdec404bee971d4509d4de43778070d0d26366d105cd7bc078f441b8fbae333286df4caf203c99ba91209";
+  sha512.run = "08c61323fe1e30d0926408928fa0159f569db2b3383ee8f86803c3b9369abf4fd3227f161f45431c206aba9e1e4c39023d05f0f207825ac63c07c6680a811ce5";
+  sha512.doc = "6bf5ccaf8c1e8888e5e78d90b264b69790b6384a8a5c23f1776e32bc76fcbd10eb389149af2c3cc3bbe88497eb0a0b49e68a04e1b212ab17aec5873130de8081";
+  sha512.source = "a24679cc6c7fde3c5136416e75fe6aa0195f94796eee46e77029a6a0137f354886191e7b310f2b1bb4450ce41607ef6ac6a840a32232dc6685d6e0a4cdbc96c7";
   hasRunfiles = true;
   version = "0.2";
 };
 "olsak-misc" = {
   stripPrefix = 0;
-  sha512.run = "758e224bac81045f0aceb7322771ceb8150616684ed4d178003d92d66152ac21930e0ecec7c88688daa9c1d3dcec985b605ad7566dcd029cb3654cd8a5090589";
-  sha512.doc = "bef6830e06dcfc8e441e20a5f7821e9ce6a4ca081a4d8bd8690e874aaf76f648572aadf07bd1391b4f35b6a098c67ba4bd6d1cba08c4747587c195fa9bb8b0bf";
+  sha512.run = "f6f73e43e5bf53629b11f2186a5f946334f15c548950ccf6da2216f3e61ac02cd891f2a9c63d16c25e18f64359b787f9be95b4e5ac209235106cd4082a1a177e";
+  sha512.doc = "57c3e7874f83c156cf62e7b5ae6c768658d1c987fb8f6b0cd00ae65945608a0cb5d58405d65d963ed5b62f8550a3b2c26253ce44ca1e0e0aac279092ffed4a9f";
   hasRunfiles = true;
 };
 "omega" = {
   stripPrefix = 0;
-  sha512.run = "c54a5ebfc228d5697614d636b6f8353250b01358bc4095e83217e3636ef5da019db5c90673d7511e315921102f74650a85704217722e0fa69690d3e344b323aa";
-  sha512.doc = "520ffc30ca1ee8de617e4bb1c985b3bc0add243a8f270d412cdd5c939c594c4f3e63919c7f9a49673e1d9b0eba4c6d00bafb6b7f7af2cfc2d0cc8946020bef19";
+  sha512.run = "1711da48c07c8be1712b76e1530ea626dffdd0fd116f752bfc1c3379152cbc86ef95604fff29e30e15a4db9e9430a1a713f8f211ae6b262a4b1db99db8bca599";
+  sha512.doc = "92367c352f3668edf963afbaa51c91caa0c2d662844b30a660a9a07802e33c127ea5755f63eab1a174e76a9d02986c91d93185c7a2f9c118f021aca85794e8ee";
   hasRunfiles = true;
 };
 "omegaware" = {
-  sha512.run = "87fca97c7df2fd4651748d815b3873ef0c71b495bafdc38012a548a0b99a56ef8e076471f16c7591e9cdb7176f11606434b5dca54cbd6922e2d7aec456ee358b";
-  sha512.doc = "7c8175a6a08ec8faca859d19152a28a3809d26f49116d1c9c64ea082800598bc263b489f5aaca2b0e83c0bebf8abb1229ea6a6d48f3228290383749d3f137dbd";
+  sha512.run = "d68d683178942100d89a88fd79d84fd2b7809a0f1573517648cd212442bb0c810bd09fe346685a1d3cc38fdf0ac28156fd9e6b54c409a6508f8567d7c41de356";
+  sha512.doc = "37417c48bd0c4e6b0d0365c1fa6cb9302838e4222a230cc1ba44801ea9b6155af96c092ea7142eab8ff7148b4447c905c286bed29a7715bcf72230109b6d7cbd";
+};
+"onedown" = {
+  stripPrefix = 0;
+  sha512.run = "eddd948910e8e5f2444fdb9526912110661eb7536c61952512c05f0e06e786405c02845827c8db8ddfd70c7a4c68b611097835f44b24e830a0a9c36f82a05787";
+  sha512.doc = "9f751dac237447801ed1c7524190f4a20b4355dd8ede510b6821390e338260f7c39be202539d2f7b6de8e63d88a8ccafba9f2f174b59a6f9d539c9166bdc2967";
+  sha512.source = "2071f990a30aedc50f0d5c18d4a2da4a17ac87f49f87cb45489ce3cba03ec0dc16a5d3d0dce59c5a77dd9f6f3dc7e02503ee27286e14bea62f17d2320b345272";
+  hasRunfiles = true;
+  version = "1.0";
 };
 "onlyamsmath" = {
   stripPrefix = 0;
-  sha512.run = "c1d3eee13f677c028abb78ff406fa65613bb0e98d4812da4871e1ce9b04d49f65854e70ad31773b2328287ea283b518272a640b6661159c10c447ee54c46f827";
-  sha512.doc = "cf7439999ccf44698c0ee931fbd84f01a6bbf7a5d29655e6b6dcf71802812b4f4c64ef4afabe3f65c17ae454a86b83f91f1f2858231bc69d1443045c1c9b4cbc";
-  sha512.source = "e140c537dd006e38f83c661e60f935a9e2bfd6f88489495d133fc37eb36c12f2c9374b010e9c0d9f170e2eb2a84567d803652ad091a65eb9e120b356eab4bf81";
+  sha512.run = "07d896306fbef347f06ea7ed622e30bf09972a70c6f5cdae677e6a28bfaa2df823280012f341138879c9bbd41a1e5521ffa4609cf4e005b5be664ddd9a0f0a54";
+  sha512.doc = "3716ecd026995672972eac111c8d06f4a112289485fffeafd16861be5c18f9e93546640b91b5cbbd801d4c4182e3ea91c57e4846765c8688d2c6b600e00bfeed";
+  sha512.source = "2ae0ccf3535fa969c8f461cc348faaff044dd4ceb60098a3631893f009c755edec4f03dffc1ab8a563ced02bb07dd4dca02f1cb305486142cbd881d8464e4ea6";
   hasRunfiles = true;
   version = "0.20";
 };
 "onrannual" = {
   stripPrefix = 0;
-  sha512.run = "3518e4f82868ba3fd8ac465cf383f4838d51bce29e92843d5a26651a2aeb1d82baf1320d6422f6bf368c46fb946b65a70b80ad61e1296bd841e97cd095acaa4c";
-  sha512.doc = "9d54123bb0a1d3e3cec08cc4fe37a6d9817906a2a4aac29cbccbf5f85c5ab28511f873d585b33c6d241b841a61c600635d6c17f9310d65d85e95ce6ff031b9bc";
+  sha512.run = "78af270d055b4fa4d79d6d72cd03bc51cd5b79fe7bc376216eadc8f4c1329822c422119c3f68a9afe0d620092caebe772e33524f7b5409a7b0c93aee93420fa6";
+  sha512.doc = "dd4023ef0e08deae6ff2ebc4fd7dcc23c941030fb1cb3972cba3289c655513d5c7541fa2fd863c2ab682870ba5a37029145695a7a8cc80932dac094a21344d36";
   hasRunfiles = true;
   version = "1.1";
 };
 "opcit" = {
   stripPrefix = 0;
-  sha512.run = "583dcf71f4889f99f2a281f04b63116cd5f42b4fbf8b0d7fb4787fdc00e0c3ee1bc4c33c50b3660c6c1f51244782505d3d1e5090954dc958123dfec9424c4fa8";
-  sha512.doc = "700f5f4fb65dbb6c7a849ba3ecea4ec9e34c1f91a38e30da40c662c272186b8ac5122d82d321be879efded877fdf9473013d009033c46b58f3266d6085d0cddc";
-  sha512.source = "7d6da8fb1ba77ce95fbbc0c82baf62744a160778f6e3c3e41b666f83726b0c9f0264abe1c1a678999c8afe84d8a3b2fd3df46282504d6cceff1769727177fcda";
+  sha512.run = "79f0fdf4555eb10203e81337dca0a9219076ed287ce1cbec87d147881a1dc9183124c132b7c66da23a356498461a27e9d6b7f469b1c5cd7e79b5f8e3233d4239";
+  sha512.doc = "0d84bbeb4d74c8ee0f850baacfa93b6db9fb00137d75cc617e9361469a78bb85499b044bdede6f52dfce535dbe3d34101fc1fa03656e72e9c680a09205cc467a";
+  sha512.source = "191ce4c6c5a129a089c530fedf520c9ccfc2086e64fc26500220ef647a8e38fdb888fc50c54855a869581c6b884bb0bd63f7ce474b8a2953de264a75dbb48787";
   hasRunfiles = true;
   version = "1.1";
 };
 "opensans" = {
   stripPrefix = 0;
-  sha512.run = "a2a02275fe83d2029797d4e2c61e8b87b86a29c7cfc07bb0744cb406c4b10b820eaa7138ae97f6a01d46b83fb4b852a7af2c838b752da688fb8b6e1cfae104f7";
-  sha512.doc = "26d21c6ca839dbc7b2c18010e3f88c3352f3b00bc0644c4a539b76ba3273e3719d16b9b9b8d3874c899a16d3b0395783809346a879172a41969966efd2b06305";
-  sha512.source = "8296f4a2031b13cf2d8fb5aaeb3ebd99d9bcbf50db9ab69ce09b97bb23ae34db8f565ba35b0ac020cdc13d8d1acc9dc0201992646fd99fbacc7d8569f4eddf4f";
+  sha512.run = "1b62a2523cc8eb8a046e9bc4c0f96cfb45cbe469780d81a727a6ce9ebbe94d4a17289f66b3ab834c7d0a4b61948505454e26351cb11302840bd81048c2af9294";
+  sha512.doc = "5b05aa4a166fb7f33cf92c25c05408f62b84a85f0823ca38a0253bb5d4eb61c93b0e6a6b4aa64f5d2465b6232fabac9c14bddf4dad037e42b7dddb69ca4206c1";
+  sha512.source = "130a595916b3cd512cd4a2bf257bef3e21c89449e5ce86a9116d5a3c55d07e8bb47d3115e717a7fd336f23b80b0677fd518a5a82bbbbf012aeb3d7b81c85cad1";
   hasRunfiles = true;
   version = "1.2";
 };
 "oplotsymbl" = {
   stripPrefix = 0;
-  sha512.run = "b5ce619a831f6074ca5749a9b84ef36eda5159f96722b3e72faf9ab3af0a7d0b8af95277b0cc487514d34a3ff9308df4ad5a6ec01af67f11f2d06cb4c564386f";
-  sha512.doc = "3da74a93ba8975d8cdacb246a15e67cafe63604c5cf0625ce2e13975a7a529930d3c313d44c18ab153499a795aa9f60a4bfbf3408ed2716b4f9502e188226b35";
+  sha512.run = "b1febef8e492029d9843fbd81447f6fa2aacdcc22afe411f832e690915a92348c769df53c567905d2b1798e55afa859991c15df5aeea228ea51f9849ef739318";
+  sha512.doc = "37aa4e068487443db6af8e935f93fb7c25157785a77eb87e93fc5c06d0be9858caba2fd02b2ba912eb5e20e342b5c5802e05916aa89d7ea787ecb721da488755";
   hasRunfiles = true;
   version = "1.4";
 };
 "opteng" = {
   stripPrefix = 0;
-  sha512.run = "0bf352ef6badec0890a9692b1c66de51abdd042a8c720852462c8987eab70720e460feb44000984a8a18db1c8b7c31b73dcfb2ec1c79ae27bcb8fa0029a4cad3";
-  sha512.doc = "d9a32db393149635deca730101e1ad14438d6ab7dcf4a81839c09f68d0e037d5df68e2ca0a91fbcc54d8bd788e66c6cf27a6abe7143ec2ab8ae1d98385378d99";
+  sha512.run = "93dd8d0bf33a27914b7f76211ca11eeb09a859b6ae195e0079d9dbac4f34c69636854464e1e50b3e9853a99a37f1fd635f8f8148bfd4a00a49a043db5fb30898";
+  sha512.doc = "73f9e12e7e5e8c3b2535cfba4787a4e106d2649b9a488fbf0cc6146e0a48ac4c8cb806f3fa399ea0282b0cbcd9b78471eb8662747317158512306572bc912b48";
   hasRunfiles = true;
   version = "1.0";
 };
 "optidef" = {
   stripPrefix = 0;
-  sha512.run = "6c893ac9e7a468a8e392dc71d7f3bb8250a469f0e4411a190631f708b3ab09757e9a2ae55df686b2e96d80c50260d854bd62834fcbc8416d442f83d421f712e2";
-  sha512.doc = "bd2db443e00005be943189faf08c0d96aefa24e19694974e9874cfeb8bf150c869d03d706c30fef547d3b5b45945579d670a90c7ef7297b5519ea1f29ef1a59c";
+  sha512.run = "78d9ded8b8227a86cc6d6ac22debb0f3f75391653f865f569275855cb92a169752a4e1154ac4731c3a605cba88ed575e3e2a2f0b373281cfcca45f507f8b9be1";
+  sha512.doc = "9e7765ab552a0a25b018116a5a13381d3c35054d35e8cd7a2c631d690fb9b6466c33a0ab2104ee683623919e47122c021fd093cf2875057fe270559425449783";
   hasRunfiles = true;
-  version = "2.6";
+  version = "3.0";
 };
 "optional" = {
   stripPrefix = 0;
-  sha512.run = "6e7c57e83d9a7481485e08e9f24b3ea31ac1e12f9b526dd4fff829f9fde77db1cb23ec36a29992100e1d4bd6a2820acf08741dc96dbbf92ba3dcd38c72e99947";
-  sha512.doc = "56fbf86419899c71713572b3ef579885b1cc40ac74bc14fcac4bde36b8484c893df5d012fafe7920f1b934605c1de80ec31d01a72a49a371ff47b01871dab4dc";
+  sha512.run = "c12af52748c71ce9b729a0b894e68dcf38392e97053e213b294963cbefefc40efd8f198192abe81320b4ffebba7328b3959a152120c2e7f66c96aa72e06bed4b";
+  sha512.doc = "c465ca8b3178320ddef5a7447cd3ef7a6b2bea266af17bdaa6dbb9a2baf556d25a6d4c3c763a3329cafea8490d546c41b512b64a1b775396301d7999d8904312";
   hasRunfiles = true;
   version = "2.2b";
 };
 "options" = {
   stripPrefix = 0;
-  sha512.run = "803a98f8462f531d910a93c1e341f1eb129bd0e4e6a1a7a770a411b7dc09120e3dec195c4fd94e438ac51c660571a3a95b4ce3f5fd04a1808047b300733c1240";
-  sha512.doc = "7f1e03fc594e044adf550b9c44f87c4e693e9f35caa000ed4d86fc2fdf64662cd0536416391ed3bfb361268064d7cb3b0e6d14efb8ed6ae75f4ffce37037e10c";
+  sha512.run = "887139672439c9ea71bf7481a099267cba0cbe8d9b964dd9682f74a567b5b07bb5f02937373a2515bfeaf4b7ca3faf780ed71edce7e168beb0e5b3a69a1f0375";
+  sha512.doc = "62b0b68ce34d53e2f3e0de36f1ce8f246ea04e6a39e43d1e876a16574646dc8f4d943b2fcb93197fed3d634715e116da002fa3615cd248ed15ce4e649a9de709";
   hasRunfiles = true;
   version = "1.0";
 };
 "ordinalpt" = {
   stripPrefix = 0;
-  sha512.run = "b8c216f0aca22688ae33a149df6f1c4dc6a37f1a3c3c3df24fc2f3d5243e2d5793d07643fcea2b788efa800f9e93048eb24ec3bf7cf97b21d7d8eb411960ab35";
-  sha512.doc = "5cce0d750ef2e9e582e312d3d1584df7d26b51cb4577c9ce8acda7fc7fcf10fa2285fc4f900430fedc3be5e4e9fec93117e316fe3ec847753f30600a7b2bc648";
-  sha512.source = "7f759421d709c255f6172cd78429142d11ea06b9cf443ef3e34e743f5a02458fa6e4ca9d777b0ed026382fbaa092363a43668bc9db1a6166ae16fab33d123dd3";
+  sha512.run = "dd252717ef554d70ecf8201e2c86d87f9ead6e1cd09d0976335884b62ceb8bcfe846bd89354e5e3ce44c47f68bdf549ed36cd392491c4a44829095f14dcb89fc";
+  sha512.doc = "fca9a8ba4f74b6e4ed51ad0217e74bd376c80b9bab22cb2b237af37c8cabfc2f06e3def10925eda270b3c304d55ec6acc474299528245869f85dbfbaba95562c";
+  sha512.source = "a4d5bb167721aa257aca01ecb12ffd7a185bf47f20a31623c7c8d1fdf58bc337c0a11914cda0637bf2a5ad86c345f365c8287af8809c53e6916683bc1541b197";
   hasRunfiles = true;
   version = "2.1";
 };
 "orkhun" = {
   stripPrefix = 0;
-  sha512.run = "2ccb9c5eee346ff83cd95a8bb19a7ddfc7337892561e5a8d5c15312177512b8106decfac7b517e11c094c3867779a259faa7cac1d79013ade35c8c1cd7b56487";
-  sha512.doc = "7d2a35f08dce693da3c2d37b8cf1b63012e1598cf1bc6174e95a977f59dd19a58593aed2382760a256d017a50267dc53643da6cc371468d9c4e8ce7f4a3ce374";
+  sha512.run = "5684739fb813473de67eb62252392662f76e975e7a37893424467a8c614d477cc83cf0243ec0aca00384373a5c7986a39dfe53e985196c8394f22e18e9d2d4b0";
+  sha512.doc = "48afb9d4a5b9f3ce6190a69ad56a36a4d1d63822e6e25d8454479c51b4b9072f4eb6315906274e570547f9b44d98ccd0aa4ec9860e6e838bbbeef33be3dd607b";
   hasRunfiles = true;
 };
 "oscola" = {
   stripPrefix = 0;
-  sha512.run = "19bc9fcfa8dfdb2a13659b1549ccbc456a0b27275a427ad0caec36dbcbea747bc5b295d31c14da9a2fe84ee27b9f80d0be1746676152745f3a9cf838db804455";
-  sha512.doc = "d5f5cd0f2f8b1ec277f4098209f8898041b00ec1d5373c0337dda6188d2694eea288b8d79cab803a00fecdce6092bf18a3c2fb33ff318206422a9daec954b01a";
+  sha512.run = "e7ad020c74d4ded9de33b7ed569c96585aae324d9b0fe72ed9daa0a447ca275af639d760fec1742fd8b65a158f68160c4cab5f2abba082623120416c76784db0";
+  sha512.doc = "c5fa10b7e9a140a10f69d631f2c57304811b42f9effa194bdbdde0553b4c9e0a5f3dca43b5441dedcdbb819b27063f5004d27ffc1dd3fffc7b76ec102867c4dd";
   hasRunfiles = true;
   version = "1.5";
 };
 "ot-tableau" = {
   stripPrefix = 0;
-  sha512.run = "9be03b9e32dac53e9d252897ed65d02ac0a87b6c95cc444518b5a319836cd9b9a39723cf70269b2df5ab1adf0d79f0d38155b8099040c6d87fa395aaed448c6a";
-  sha512.doc = "25a3395bbc19ca7ae857e5df7a2e5133a5f1fd8ec5fb2f36dc0f9b058f49369c95285799f3a0ce0544a694aa95f8ca11facf61a9c750f83c767e04842f1bceec";
+  sha512.run = "6d21f86375067958db161820283913bc77afc050087a90c08e32d35af989ff874659887814bc7a4775241a1180f3f01c1a767d280c86d0746605339c6c1cf7a1";
+  sha512.doc = "18f4085c3884fdd71e5e4cb9296ee70281ce82f7b6c61b20a9c392cda07a307d173e2a4a9f25330a6e19df478ecae647e8aaa48c0f648a603b3cd6afe19b4dcf";
   hasRunfiles = true;
 };
 "othello" = {
   stripPrefix = 0;
-  sha512.run = "67aa19359f3ad5707bf33ff872a4a07557f121a0d027c44d8bb210a4d4eb12a10a7ad59a657ffe4877095693a14ef3f7843cab6a02875f585e48bb93c1650b05";
-  sha512.doc = "bdd3ae0164641c67ee9af724bbcc5258b98c844c318615040fdeeca259e98b2448b87dd99be94ba477ce6cfd5d33572ff77dcbd0e858483704bc39f52a5da168";
+  sha512.run = "f84716121c8b75e32348e958bee7e976854d9d01f8e53f56db015879db731c6400f1389f12686780ba69b69bbfdaeac3ab8322d5761dcf69efff29af61c82280";
+  sha512.doc = "84bbbfd5f6a7c983bb1e175bbeacfbe00cf879d4a6fcdf57ae4cd49477e9a14eb5e648acd53b24b0d36253569f60048143531b35daf47cc7558eb37565425859";
   hasRunfiles = true;
 };
 "othelloboard" = {
   stripPrefix = 0;
-  sha512.run = "bb61db5921e20d6f2a5285cfdb59e44e7e54869637a7c42c0d6f1c780b5ea4803ef33176cd368d1b1cb1fea9d5ef50bca8b5e2b9837e4edb2477e0d8e30a3af1";
-  sha512.doc = "53101eb9ec914e2c24683ee324dad139637f273785d990267dae929f7e854af0f31d04477b0f21831157e9daa3a9f5b0cb0210760f547bf2712cfb89f140580c";
+  sha512.run = "0ceceed906f5638bbc016a374a8c1ab0c094e06e0074dcaa235db4e6bc2b6c83777d8b9240c5224867a7a915e6449cb9af214448ec118d2f9e7c68f2604bc7be";
+  sha512.doc = "544638f7881e1a92d2cba2520de7852812bf214c88260033759ea73699aa9d81e1052333f1a7354f21e641ebf0f7b8fca8bce7b310a51a9ca6f4a15109e61676";
   hasRunfiles = true;
   version = "1.2";
 };
 "otibet" = {
   stripPrefix = 0;
-  sha512.run = "4711035d84570b303b629cb44128060a8d74a5c09b74e037c8d0147f949f4baf0a03e0a8f65fca2817b50724b39826a73791c7c14ace1b8a92d4c13561222b57";
-  sha512.doc = "907281a62dda64a338705035111e26f8e3adad3c1f4d9ec2b9ee1454dbf5be70d6b6f5c267aa13e4db9f59a5b010a17584ac77bbdff47bb5ededc6caa2e9c97a";
-  sha512.source = "ad0c8e1172cbd28db9c901a09a9071607868190aa983e1526349a9f49171e8536b4dbdb13d00b4f4682770a18c8c9427ebe60dea26fc533bdab7f71a1bde9388";
+  sha512.run = "376fb6680994ce60be4bc5b58dc8c24daa2389048f194aa6bc378aca32fc881ed7e2a8e365a669f32660406e06476f857b8ce2933fec5e9cd4aaf33eedcc0508";
+  sha512.doc = "656a5755f1e96f25f88c8150d13acd057370664f9dc2953b53a8ef8c87b884dac8330556798d3d28999ca28be99678c471348431ccc83d5615a0de9d9923841c";
+  sha512.source = "bbafe03ff70738cb17a8815b88b11f94afeaf5cc5f57877eddd1f22cfeaa482a4a8ceb25c36db693bdc0568f2f249aac918ffcd539ebba6856185c4fd6b6d40a";
   hasRunfiles = true;
 };
 "oubraces" = {
   stripPrefix = 0;
-  sha512.run = "f768742bf135d60bf41182b1410d66522a8ccc494324ca1ec3bbb6126c0a47312f7ed9ccfd93fdee6c961634ffa191c5d07b7a24d6cdcada18884440597ea5b7";
-  sha512.doc = "ed942eb52981c536a00f38b1f2fb490e6199fd20404ac274a9d186c44bc4764f3b92d6595f1dfa9601454ec3cd230862ede8299106639400e206453b6529a79d";
+  sha512.run = "dc33263b8d035441a9f3b9d08c10bb167c5e8b9b7553d2068fd493a711540bdfcc2ac953d8017e6162e673f024dd6be1bff1ea2db88309ff1be9876b29cc558e";
+  sha512.doc = "847728d7cb359803af815c8a8461e861c71d2e845ad486f824349270f7f0221f2541b1a4b671fc6774ae1b5d87cb355ca534ab31adc4783430734195d97a00aa";
   hasRunfiles = true;
 };
 "outline" = {
   stripPrefix = 0;
-  sha512.run = "77a6d2a874c4c544122b1cb492d6eec1b7cf0f0449ad9faa1c8841b927cf0e659b4e5ef160a771eb2d8640caa32dd3ca3eb1fcdf9e806cabd7658f7d993caa63";
-  sha512.doc = "bdbbb25a6855226290e77f0852ce8e01ea886999d5967fa263750e599d2e9b728df87661e1f44039e34f9e8dce69376f3a4d3e6672598532acfea72a8267e116";
+  sha512.run = "7f3ae266dbe61bba4d3f7ac5f21663f37d273f5f5089992511f3108cdaed5358341e3bc1c8ccec51ae86baede1be2ed112057979d1418f0489e153ed2eeac0d5";
+  sha512.doc = "b7014e0b5f8b33ccbb70a1c2b9aa8d0232c9979082df2c1c62d22cbec39f1244272a4cd89dcb207c1333f541cbd851554c6acb9f50092909872e70578461bf7e";
   hasRunfiles = true;
 };
 "outliner" = {
   stripPrefix = 0;
-  sha512.run = "675a560ee56566a07c19eef0c8d4e1d5c3e845b9229569bb499bcf420c63a9aa081f17509dea0701f0972cde1fc3c77f96d039b658c2ea832442be3a5eae688d";
-  sha512.doc = "e45cefa743e7a12c44848647933cbf10503007a8e45e895bd6f9e7f10e1e4f24d060fae48d8f97f8cef4ba337796af9ac79dbd9a6425b4e3a4075fea5d12c822";
+  sha512.run = "dd87866e40c815ce3ce89aead11276d117b1dc65b6e6a75155941ad89aa1e090bb8131a437d71319b16cdebef1a029b3e8a8e6ed45b01e0a93af0dd44276cba2";
+  sha512.doc = "80f0d4e8263ac8bb4aac9d7d5f4d9f2456701f4fe19146b34e62a89a6c749d9b1cac097930b30bcaf15cc07a8669dcf18ee32a116e5a4c766c834be24ab84442";
   hasRunfiles = true;
   version = "0.94";
 };
 "outlines" = {
   stripPrefix = 0;
-  sha512.run = "29ae068839182fd97ae8a41f0a2f7e2476d8cbd2b838cb5c67e97b696cce2cbd4eec45ff2337b61b597c304194e7c90853dc5178f6c7c129363fec9fa5b0c53d";
-  sha512.doc = "2a6dc0fdde67ef03de1aef219298d1423eb81646b867db3f9b0e408252e0d10b6935886c195442a3053dff6aa306c0bcdd8c3f85cc471d665e0278e1a1a6b058";
+  sha512.run = "178d5dcce66f3bced5b770918b57a3e55906a6216343c5065d2b4a9ae36967b587a9ecfd255d5610d2c867c7fb36aa40d0ac4d545e833a52407f0bc977d3e851";
+  sha512.doc = "e0268327e65fb469ecc2ce2531303a30e5d7c896356dc3ac235190d16c2ff8d8c689b15563c69d7e62f64f8c4bda35840040c550c89e25131dd701ef84761d19";
   hasRunfiles = true;
   version = "1.1";
 };
 "outlining" = {
   stripPrefix = 0;
-  sha512.run = "ebba51809760bbbbf66ece21aaafaa37766b6dbb8b68cff4bddcf31859d22fd565ac21c43c03596108f3521e256e23b1b566244b2195afe8cf684bfec0917636";
-  sha512.doc = "ff0401958d68de4797ca8cc19dceddd3eefc665ce86be50f72d3dc2ef53b7c2e2ebe3f90c1fd631d43b70188fd7bf26034461f77fae2cecc8508c6e73e26c050";
-  sha512.source = "6226043de6423277a987ef18522f18177d8c19ae0408b943ec73a244f25960957d3264ffeca60392427a86bc20f9c7269ea92bdbe2fd7b748a4a5075084083b9";
+  sha512.run = "7a04d8df8da076f8932923f6cfdf879912965f96520cb3a6163366daaddf41c3016f41dbb3df3e26d7e7994617792450609bbd0de5e2f83745486130efc0eeab";
+  sha512.doc = "7202dd35c580446fde04610fa3136b8092c07a6034abf5b507fe89dfc11bf445173a80bee609ed93fad4244f49e1627fc8526fbe72d2e68b3b3b9c7ae25bc4f2";
+  sha512.source = "b1cc9f821b61116be76ed2b901162bd244ef586a60cd9f0024d2e0c6696577bfcd1f8b887fc3115fc24e941f244f3deb7c2cc637915a82106d23d115b8a6fe73";
   hasRunfiles = true;
   version = "0.1";
 };
 "overlays" = {
   stripPrefix = 0;
-  sha512.run = "933ca27719ca3fcc41a7099a25a61e95d63320024acc2ac059760ac14d530b3308aa6fbfe038ce282c67cec5667d2de9e8bfd7601b9c91c37bd6545df630ea86";
-  sha512.doc = "572124f5404d8149a9aaf07bb95ec43ebbf4c06af9b5e1fc31e8d072eb5b9fa3bdac0fefe88f0c82026aedf2f4a47c544a71e31111567c6947f159696617f42b";
+  sha512.run = "e59cc05e4e81e1e9e7c1194ce71b174f33f3692252714e71cc4722ff70ca07009bfab8e466cc1f7ab11bc68f5908b00978a49bfa2cc9fc4c9faafe257200b0ad";
+  sha512.doc = "0e580e5a4ab2b588c196a53f571bc2b237b44b8162cf8fc5c037851d3edaaf6d361f8fc3cc8a6bdecc940febabf5118fc07794e64eda737ae83c5c329242a08c";
   hasRunfiles = true;
   version = "2.10";
 };
 "overlock" = {
   stripPrefix = 0;
-  sha512.run = "06c41c089a4a1a8da31dd84cfbc49169e8933767dfaae3801ff31ba8a3c168b0bfcebc138cc1315c5c71cdb06cece22964be6e9888e5a251bd4dd6f03bf6fd0e";
-  sha512.doc = "537e0ca46576edcf0596d730e33fff65d0be3c1ed991c296247e38ae373fd13cf7f0fefeff4cc979478b547270887e9e5cfe0c79cc61e5c499f2facb5df24376";
+  sha512.run = "723ef923ed702b19aefde4cbe4787945d5c4f6d8c1261e27ae02bcb12bde34a5ffdfbf83cb516ebfab8801e909d66644c1abdb89e503ed2dbb76469b08bf5898";
+  sha512.doc = "114b60b115738389824839322fbbe5947977953475a5d7e56d99c48a32b81d091e00363c522e61ee7f90a2186328b0c2789396d2ce9ce67a86f503ecec054e87";
   hasRunfiles = true;
 };
 "overpic" = {
   stripPrefix = 0;
-  sha512.run = "e8f2dc46c0ce1b3b65e5e7315ebf16024e643ccf362d3a3b5f729e8a2f8d942ae97507e331c773ac9d967b18fab50baeca915608132b901e2ac6d00012a5f8de";
-  sha512.doc = "7f2c58d5c38684818bc2f3598235f27f17b824df65434fbcf321559c6ba00f8f7542797dc939bedadca7d241548ac6b0b3e7ece0adb8fe0a9b28f12fb02d3f1e";
-  sha512.source = "2ea109d691802b92abda8c793d8f7da5d5f17cbf0425de1d77e6e0c8f4df608590c379823e6e68ad6f7f4d6829ab7ccd52ef40a8dd77219246e1b173da9741f7";
+  sha512.run = "75aa93a009d19acf16fcd4250d8715cc8ff6749d5e96857bb384b8593f14a40266b057089cba1c1182ed22f349696e69b8a2fc3cde6f4c0ada3266491ade8c97";
+  sha512.doc = "c4a08e159afcd437be9c7706e87940312e4400e9bcca535382f473119c695e463ea3b3f892258453c1ccb960a58e46f3e68d877eaf4388aebc75307454a14c60";
+  sha512.source = "f8251d93b0e665609fafbb73ebaa89928cd6dd2cdbd15ee8c086722bc21aa121da579ff2f3a2603bfb161bb92cb563f9464326190f9af4dc1809235aa2aa43b7";
   hasRunfiles = true;
   version = "1.0";
 };
 "pacioli" = {
   stripPrefix = 0;
-  sha512.run = "604ab58483b98ffb345337eb55fa53426c190fa5d40080ec7e4639597b676914faf3b2eb114828492c5d4576579f1ae8d81749d2269e5ce619f71d8d13d09fba";
-  sha512.doc = "75fb0e80cb421af31d0a23537932b3379bfb054c0b7e8533850a5383d32f7b5a22128210c2e76af2c106fad1929871baf656c85fee667bc3e0f25477e0a5bb6c";
-  sha512.source = "fc33c20e9d5b492a940b0948a705093f7ce3c369ac3ca236da08aee78520d182e19c1d15e2236f94ee07475044a1de93f0794f7a648bdaca09b40851976952e1";
+  sha512.run = "d42c90b9ed9f68b73b1e1fe5c8604b9be082be2220fb5eb4f636173204b6797bd7791dd3f327f41ea2f513edfbac0c5a5804c67855a6e3a0a8f54644563196de";
+  sha512.doc = "4dd6617a5f5bf44b53d9407e80d5e2410dff648331e4f8cd71c547727a6c2b5cb0f3eb7050d0900bd9206808bca6f41ffea3e9a3604986ed0e6dd5d32832c913";
+  sha512.source = "08c8c71e93d7f635970547d60cfa0bbb177bff4fd67267f3012555436b2085e417d0b26d51e819849c4626e77f6d3ee703132ff9f4e5c72c0c436f168d8c2eec";
   hasRunfiles = true;
 };
 "padauk" = {
   stripPrefix = 0;
-  sha512.run = "0af27bc6c0d245e76e39f06b373b39c5f1637fb4286711918a7a4ce988e0ba9179f1d904b78875a0a3cee77867911d248b717a9e0a02f270c452126e09ae6f03";
-  sha512.doc = "8b2aa1fc834ad06edba511b9eea18bbacb82fea86b2e854cce831d3bdcffabd5d7703defbcfe222a7e3d46eb3919bc79c33f9b713b9ba1790b135d8ea29cc67f";
+  sha512.run = "1142a3a3c8683556e74220b69b0528b9fee1f74588fed4ca794a596970126fd575f32a42aff9b0989157d1210e80eee7ae82e2ad4ab727ff68685ee2bd173506";
+  sha512.doc = "af85be786daefa82f7f2f795bb00499a05512287f65f9ee0336061d3bd7e72f9c86046e3b58f5a3717968519e2bd65c08b958dc985c25d0be8b6cde9dd9185a3";
   hasRunfiles = true;
   version = "3.002";
 };
+"padcount" = {
+  stripPrefix = 0;
+  sha512.run = "77883d6d0cf6e9e54ec5dc16458d0ae665386d4ebcdb0dc029c202c83e2bc31cec11f3ff358ce08dafa9ddbf8d3681fbfdf40decd0cfdfcc55dac7d392bd9250";
+  sha512.doc = "2590f6afe5c359f6d434249fd601517c0cceb8f665af5dbc89f81e92eb9e8c2448f310cee5f3a3422bc9ae20c87e472751706b45471d77ec9c07f01376da816b";
+  sha512.source = "94bc1655e13518a4e29a6f6fd0541d5e33eac99e416264499cda52a42838b5037209eed20eeeb112721861491f85aaa5d8a9dab8da81df71c04b764372f7feb2";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "pagecolor" = {
   stripPrefix = 0;
-  sha512.run = "42ef5cb11e319932bb04f2ca7af98302f956cf4a5a1dcc79e21d09e51df7248099754a89fee3f75ba2dd41c15566a6d6b13649a2cfb4740cd063a28b4908f978";
-  sha512.doc = "1943953e72a98fb68648ac503c3ecd2bd7b4fe94599f7327f9453175040391d2c452b120cd5a900ebb04c53c952b7fedb5775e5a9fbd96e7d17a24dcbdc11b68";
-  sha512.source = "545da4a4987ac7b8306020f0ce60e21c113b103f542b429014268a457100e55f17e08bf61cfeb8693c6c62a2d868842929e742db17dfff7cb59e220637dfe200";
+  sha512.run = "93ea68718432049e5b9970e2883220f08a87f30a0deecd2d58e96a62bd693972c5c450d1a01f3fd53b8fc973096ba4334b75e3342a191e3494c2af8652cf8556";
+  sha512.doc = "951ce5f1b43f3512b30f313cafb3be67bc2e36e439297c84c530120506f8f95bfd1e5a9982ccef324661922dbef91abf118cc552b6f5c5f6c897a98a7dd89a33";
+  sha512.source = "1cb18e84e30a1e2ec398f9db4c71fe41ebb4d3738ba5bc1d109a2f14cc5cb925b35cb2a6d9740516ca86c4d019c682260987974b573efd4f18034c8b17e671f1";
   hasRunfiles = true;
   version = "1.0i";
 };
 "pagecont" = {
   stripPrefix = 0;
-  sha512.run = "dfc36bd2cfbf1078f3e2a9221812ab58149107a82ae0c3bc9d458e10084b0725b586c31c5588f0d937fb03292202bfd335f0c8118588c092be7fd4c67be7a260";
-  sha512.doc = "c2f6cc2f26816e6b32bad255db41b8b42b470552098e3d43ca4302c9fdb2cc3a6586426acb5bafddab1b587d6bc3e1d69c4d5ca20d369766b9644c8e2814396c";
-  sha512.source = "7ac033df1923b44e65002c06f9bd90acd1b2699e07a8982dc9e5ef606a96b3c19136b5a57391b7f23cb24caae30d41b8173f4a70c00e45bb9d23da5ef900b6a3";
+  sha512.run = "153954c9ba1bfbd3e4b18d47672b8a5f4f8ec800f21110e55b1086473553e465297247671d82ef842428467a2012697df41ca21bd8359b04c1113107d12001c5";
+  sha512.doc = "b3ab5839801365dd0003693278bd4ce50eaae890dfd5655143b0c3dea0da9fe5ce566005c936342a0e98936e0f53b44412b7cbf0fd49ae74253c0fa2ff6d328b";
+  sha512.source = "11f57e1d645461bbe372c228962574448cf57a49702018a2111dc957e92f70ea64b29dfe62450a720d1938abe0c8e3bfefd96beb6f8c5f6412c61175cc1e09d1";
   hasRunfiles = true;
   version = "1.0";
 };
 "pagenote" = {
   stripPrefix = 0;
-  sha512.run = "df3667f219bd019b040f075901a3a25a8d97158945fd03e2de5fdeee38e2d8b65276da7936dc68c45dcf65fe38aa25baf7197caa974da5e5937fd684d18bd74d";
-  sha512.doc = "1e11494e34e0e703b0b92cc6ed6d17104d82f3a9d20d60b1bf7a950235ac6a9646438c2193085432304ea9e937ec321c155bfa3ae42e3089bf0632fb793e2900";
-  sha512.source = "821c693d52763d215a1f8da05417b9a6037910b478fcb10223faef91a70fc620507b3ba7e20b3036bef5e66cea891f8b3083265a9140be1b80c1e0659252ad50";
+  sha512.run = "4ff0fd54fb8a9b3f9de71449ff9c5d48285d325b4c127aef38ca6a37e1383f2023ce2f1ec5210c25f4443ef798b3731b8732238a3d16e9988511d0230c4eab5c";
+  sha512.doc = "80f1182ae1c79deb3f9fa28935c3cf0030be7771e20ef65b983ce3ee20e1c81f89c95fb5708a42bc33d56ebc49c4a96e8c95cff1f0f322218e07b4efb9dd6191";
+  sha512.source = "6636ab8fda25a359585a1d49035a34be035e413700abb498fc4330f6e182ab478aaba4fbfde2c412ecea443ba48b7781b6f186dbaef92a5c17d48ab1f570de2f";
   hasRunfiles = true;
   version = "1.1a";
 };
 "pagerange" = {
   stripPrefix = 0;
-  sha512.run = "74746fcb12dbcc069235acdfa13d52a16c920b6836591657abe127929c62c757acd103fd9e4cab8f71b1f6cc24d6a5f87f6d6d0a632d81f4c8e8f59ee5694c96";
-  sha512.doc = "6a598b219614f9e32d32a61c7897b94cb3e6479d23cc112b38fd6b97c443df2fa138b5a5031109b8b67533e66fc05d880d2e08efe2922ec334bcbe8553de4a56";
+  sha512.run = "83041f3fa88171b7485758b188dc14ca7f4161805f28f1a7d25d3bc76b066968bd7f6f061450e99c0081893b27d6b1945268d6d32ef61964aa6019f908c928e8";
+  sha512.doc = "522796a683b81739d40c90dd5bd158eae54fa6787030e95dd0440e556c0a21cae92824c0f6cc8bc3dd952d97703584cf7038db5a5f3e526e977309590c0e79ac";
   hasRunfiles = true;
   version = "0.5";
 };
 "pageslts" = {
   stripPrefix = 0;
-  sha512.run = "346a528ac06f0c461e308689c6071868067cb02f8a16e98b8561c079d82ea41a8fa6304b08627cbcd674bd730d658ca08f69fcafaf323b107dd907cda64654df";
-  sha512.doc = "5f03a0d1114b984f4e08fcf94ae4879c4e680aa3d41ee1769e69173119a55ae136c931bbebce401cbc9ddc049e4dd2bf649b3810f307a07712e192c7d450f0ee";
-  sha512.source = "9cd96f6342864903a0a2e508f095a0d928b3ccd8f9b0592f293007eca03dc9057accd4df07195daa626925769166fc4979e1c959cd0424badc6fb7e86d58c587";
+  sha512.run = "3ad576144e0fdab56625e0779f6af430432b073a8b0d619f9ab5c589d0d6023130d7f9eafa5f891445d669cae745b9f7bd8ad464d43264344383968f5a5c7a67";
+  sha512.doc = "8419817dc48b4c623c36dd82ffd88366f79ca04fc25a47f359bea3274de576187eb1a9c8c3466697f3eff549eb6bdf73ee12160d07158cad2d5a7ab195b3d85c";
+  sha512.source = "d1220ab0ac9bdb8b53d120fe164e25d89af8edbbc22fbf4b4bf6c4f1cf0e8567c220dfceca9286b75cc0c5606e13caf945112b9d8ecea1637a0a79c59b3556db";
   hasRunfiles = true;
   version = "1.2f";
 };
 "palatino" = {
   stripPrefix = 0;
-  sha512.run = "b313331881b843165888a107789ea70362f6465ee839cde4cd6091cc60de677a4ddd43664f485c791e80f9715a716e9e6e63b46c5daefc6f3601eadeb5c6f580";
+  sha512.run = "7f7e758a1bbcfca2232530e93f26bdd8795ea2eb98f48da983901c648e5e6b40bd61750d50d77c110a422e76c340ecbe8f0c3ca690a19a1adb7ae47f23aefb0c";
   hasRunfiles = true;
 };
 "paper" = {
   stripPrefix = 0;
-  sha512.run = "4194d6d780f10ab7009b142499b38f0e19794b71ddf2d821bf6d7a516b997c6e474f85a0512c94e018f6ec73abafd0a6ebf09015f100dbea1a5835cdf6b9cb1e";
-  sha512.doc = "ce677ec53028179d6945016d9315ea44c85530f4e1cf857ca102523c31aa479087c6d2219bfdca79105deab49402bc7409aaa59e78a9a75ec9290c55ed0cf457";
-  sha512.source = "b653e9b4c3a7d53ab62632ba94de435cba292a5dc95d453c85d31e33edf8fdb4ccb6fd800d7d7a3ec44442715a65c506f34b836bf2f2480d38b9d38575b01487";
+  sha512.run = "7efc69558af8fe524865898d30dec4a0dd45e3d678ce29d21a26f918cde39aa25599d895b9957786748772e759c00173174a8ea6f333a0a2dd578de8c75b8a12";
+  sha512.doc = "3eb4227d0c6a27cfeebdc771ab4bc15f25df40fb27f5d94a697394a92acdbe756a56cb75bca67782c99c3a5bbfba844884ec558d29adb2844212ba0334d912d4";
+  sha512.source = "ce33a55ebed8f2fd9aae3897869457bba49a52dc17bcb84d2e560774a32c810770ce46790c442d76d4cefe28265778dcf4d9970a572af2c4cd2db207ba8c8300";
   hasRunfiles = true;
   version = "1.0l";
 };
 "papercdcase" = {
   stripPrefix = 0;
-  sha512.run = "a8408eb0e2aeb2eb380b55632ab525880c96dc62d5074a8056cc16d9fd2ec904ad472a211bfd4789ffae8785470b0f1069580b4376781684ce1c22382813816a";
-  sha512.doc = "8554736dd8bd2b3809d7fbfc7516ccdf00962d4ad15f9a6be767ca41ae40d0d9183e4fed19ea24f77fce60c635c61434253e34545cd060ec11ec2991ee5199f9";
-  sha512.source = "6a0aa3d40764b1ca492782f70e5716d0a60aad8faae899add7f74d7184058da4733816e0144416a96cbf44b9002b65aac18a1012bf9280f0a3484959f7a7b0a9";
+  sha512.run = "05e2078524367deeaa765c2294b6d0fc1889455b0fb2911089d7cca4c6a5ed551b889f6500083e2005b72a1a9ae794c8a73f9e5573ab77897e0a743dab3aa7a9";
+  sha512.doc = "298f0372d315f2bfa4cc8bfd900eb8a718bc44b56f453e354a6afd4fcf06260e2168df212ab164c3aadce31cabaa281e61df1d5bb0e6acdd5664a733ef9e66cb";
+  sha512.source = "dea0003413c6dabe674371e9bd0ddbce43e88eba030693aec967ea211f051f20f54aae43751a604e353adfc81d9e03eda3b5112c5ab09c978a2d3462fefaa24d";
   hasRunfiles = true;
 };
 "papermas" = {
   stripPrefix = 0;
-  sha512.run = "3a38eaf377d0963f31686d15c33d2e42929c3a4bb997ae4e62d4bd09cc73779768d7adce28000f35511d0b0189f4557f0c7b4feaf24a42279c910beb4f087de9";
-  sha512.doc = "c26a8beda0fff2e3df67aefba714a195fc8c1593f4215c7be48fddd09503eac232669a45b3c272c0b04b456d2e32302575f2692a2f68d906cf1be15ffa36bd29";
-  sha512.source = "fcc70da89c469746a7d5b288028fdd58b098af759063996d6451481b2dd552ee52d7ae79daf73b5407c4dd37ecaaf65ba83ddbd4fb2ea6e01de1980561f908e3";
+  sha512.run = "85733a4e9ad956259ea00b50d1b27c66501803478a6b37a82a5449dd68224c33c7cb1ff143e55aee7b5f8069582d306803f4a0a42d0287dfc0bd32496b774a79";
+  sha512.doc = "8923bbbb395c375065029578682584ae1573b8c249b99528a8ab83fde4b0a8d317ce74a9f3d44c8cfefccf2d2f01b2280dbbbdad3bcb257b825a190136e9ff20";
+  sha512.source = "6df197a0c4c8b9c469e3ab7c16a055258be199e469440f8db45801c6ce723302234abd414101b282b9fb4dd0a05d16c210fe22427bd0b316c8400270c2cd513a";
   hasRunfiles = true;
   version = "1.0h";
 };
 "papertex" = {
   stripPrefix = 0;
-  sha512.run = "233fd7ab1dc4a8746e4045f3871c234ac0f95583405888e32a4b681d6f30bed5d205f2bac5f94d4371394b23140a9925c21145fabb6b7fb820894316837fc62c";
-  sha512.doc = "208d02a342afb1a7d49d0def884f0e155ad0b05baf25d5f3ce7aac6e7c9dbca8e3534ee78da4a9f4a696c665e610045fc7bfe9f565b1e137eea729aee5e6fc9b";
-  sha512.source = "8b6686540066a7872de571a768ca2c45c720a8fbc7d79247ec378a74eae72a44cabad024d91f3ec3927eb39c6b02806cf8310718749302f39495b00b280e892b";
+  sha512.run = "3cc499ae8d67854ed619d76b1d2701d07f70543a94c18e66ff93e69898696051d864c674ef450de66c0a716619248161bb8cf2fee232bc218f327472265b398c";
+  sha512.doc = "4e93f60f8005b0d0c03ed1ef4d40e07f9662286316c7b0b38eceda102d7e396747abcd1b27bcbadffb1cee303d36b34c0069dab74b83de63f4b1387735a73f9c";
+  sha512.source = "f3ad76541cdac95264a537af4879952a7b7d95e07292f9207073005dc642c58be91ae310938b9978e880e63dd3448027ece5365c98dc955fa3ce32ebd665777f";
   hasRunfiles = true;
   version = "1.2b";
 };
 "paracol" = {
   stripPrefix = 0;
-  sha512.run = "7c4431926216fd625796be9042e112d9177cc09f5d78061db035a5b8254c2bc090ad5c14f45121408f11186cf6c49789fa37b9b130f87f06b704352b06ed0f05";
-  sha512.doc = "3c4e943483e7fee34c5aaf6c819fb24bee64ac2699a38521cc92ea801c6b12a140d26498c1ef0afa52bc62923073896538f4778bb2f449d1a98f97003bdd7966";
-  sha512.source = "566c479b1a90d1228cc0895b82217c7917e28fd8c435a41d05d9080819652501f2e3de04bd7cd97c0806a855856f316473518e086138b50e24f8ed7ffa09b435";
+  sha512.run = "e97c95c2020d42617fa3b8fd81e6cb1470d968445877f950626967f3ed97061dc5c0dc7d6eca637b5c7727244abbfb783e640c640f0fffd57f481fd166301f4e";
+  sha512.doc = "2c34b20e90afe0643d047cbf3d981e0d5d433bf38c6dc2160dfcba9ec4a75fb892215c9b5c3a5b333741b26633ac07e2ed4eb94e877efc55dce890abeb9671c9";
+  sha512.source = "b11e003dad30ea4f0f2d8dead3d4dbde327dbf30d4ba75b1b8a7f3e101b118a165b953736dd0f6439a13240dc6e845827d96956d5e3f95c6054d05173dd4db99";
   hasRunfiles = true;
-  version = "1.32";
+  version = "1.34";
 };
 "parades" = {
   stripPrefix = 0;
-  sha512.run = "3e91a5825f1fd88be2a9565b0985d084420e1a7de43dfd0edf2c230039a303c59e676a735a5bb51d72757ed47c056fa4deeb44716e6237ba510ccf584e1e83f2";
-  sha512.doc = "6f26531d9ddf7fa3bb39cb2412d85ee9e216c3be459f99b6434dcf66431a2c5d402ac7f741a22517801f9c1f60fc0a70d43bca1196aeaf112a4d06d89e062dcc";
+  sha512.run = "0af806fefbba77812705d7e758106ea1909900a4471e218b3c4d9f5be18ac54612d3a5a0fefd08b962d6e2b48f566b567e1d0011764f96254959972635f086ce";
+  sha512.doc = "4697556f4e1ffdce59916b4e7f98094da139f8522c318c8ddf84aa363700f6a1b0250ca1baee612f7422749066feb23b11c331845b3613ed6fd5a3debc652efb";
   hasRunfiles = true;
 };
 "paralist" = {
   stripPrefix = 0;
-  sha512.run = "f849afee27959dd8cf660b84e0bb114a8ffc987225ad4c5a6816febf4aaccb972a42131ccdf7570ff56513b6a0cbd8f368a7a31f3a67959e0e55cd396b178e39";
-  sha512.doc = "9779cafcaccb6db5b3c8502fef772f688c25df78ceb5f0025972266a5a76fc2f3aa7e3e3c408155da4815fafe83792c29e02b1f9ee5aec60f52c3fe1bf4ea051";
-  sha512.source = "e313abffb61f25a43ccf391e8629486ea0179f8c3949a58229c42b52b0c56a2d88b2fa52971f0097394be91b6ba35fd026a594044c9c3d5d8e02cd549ecd1707";
+  sha512.run = "0b226bc481b4eeb744945df6b7f8df710ab81e639d8632db189ba40acd7d6f8f131566cc71dfea03fbfb312a361d66898d2e4e2318ca979a2b71457bebe05b6d";
+  sha512.doc = "16233ca09205b5cf8e801e7593101bff1602b8d9120bed552dec7cd3f9cf4a478bf6121e6c1033b5842199d2b5df4d99af144e715ab25c7a2e7590446491595c";
+  sha512.source = "8b26bddf66e2b470fab9953d25d1b33b98300ba814e18b4f1706718b762e6cf1f9d5858e174cdd8524290608e2afb69e94ffee152d88ed6b4a31f69467d344a4";
   hasRunfiles = true;
   version = "2.7";
 };
 "parallel" = {
   stripPrefix = 0;
-  sha512.run = "035e6ce29dc8171a62ab8950908452e2ee5ddc37ba7ed46e35d9cb6a7996b105107a27fbc1a4523963c71a678c3864c31366b1e6370362eeb881993e82d848dd";
-  sha512.doc = "0934556a766206210969bb1c912e58cf53d87dc0a94bad468f7c4ef568839afed3de7f6992f2a6934ad082f1e3fb81405337a3577b1164e585972d74eb511b25";
-  sha512.source = "f055617e78a0576d74a78b397973b9105b2281ecec9e94691e2d56a1dc6af0a9fef6b3c37b4b6e7ece702113783b8e8e0865f8be25b3a78a1a219ba9121c8a43";
+  sha512.run = "d073d7560fa4a039f3ae9d3eaec48d0c42967de940096d9ec9bf0921eaa823697cfc97d0e465670cd73560ca61e9500a333b544ce6b76b1f8fa3a61b7bd56ca4";
+  sha512.doc = "38a4ee6195c2eeb68ce7af4d5fb6826f6ad4df76c67933e9b4331cc0b10e10804ffa92d3aa4efa91eeb329024695bafa0db764b18dca5ee978cb0182b5651fde";
+  sha512.source = "79a641bed3aaad40dae7f668603ca115f43364a34a5f18e381883b9eba6761386df42feba6aa235952f4d02ddbd85fd6d5dbb65fed7f93a39e6009a8d1c31d89";
   hasRunfiles = true;
 };
 "paratype" = {
   stripPrefix = 0;
-  sha512.run = "c89e456c2cb869603584674939c20a18309f5cee44528c399f696f76b4d0c0c8801ba10200ee4c6a2ece92ede87186190100ee779b536fbf12f7a2f84ef3bfe2";
-  sha512.doc = "7ca2e48eff9083af6f93f1b7d4229cf948ccebc6d3da045fa8c5d7117bc55572465a926171b450d1b131a93fbbd93e9d7b8a856aa798d1ec00e9a27107bd6288";
+  sha512.run = "b403eb2f8c452b23669a5df55e76e9d97d392bdf6e68558367209ebce689072ca4e281b0e5504dd89a6fd4915f8f719c16c32966d8ee7c98e7949f2da511c429";
+  sha512.doc = "c293fac434e03b8949c7e012fb4363e23eae07be903c578c55f2d74753e90eccf6b430d43aa9528239432efdee24d2d9cd058e8b8a87ad412140016bd6831cb8";
   hasRunfiles = true;
 };
 "paresse" = {
   stripPrefix = 0;
-  sha512.run = "3629c2e6e5a876b474716e17d4334b441c00cccd11264b3d42ad82880c43e4b7f6dc9f7972900089af219996acb3737efa703e137e39e1f90c648d01c8ee2f0a";
-  sha512.doc = "851c9d36b2e4f7023023e7f6e9ae4dd2f4d00387d540ae990a1fe57f635d6144521f4ce8b178e20954c659248ccc162506b3e545f0a226209f8e5721a899655a";
-  sha512.source = "a004d969a6eb94e9eea16bffa27cde41e2ea78f7e3fe0e7eb5d3bb8bd6ca791c8cd54c77d3068a425099aa02e8d0eacdbbe9b565d89e4268a85b2d088db8b91c";
+  sha512.run = "98eedc0ea29400064c64f2edaadc7ec4397714b060f6b76df5757e912b2b09d943d13cb8bf6e68bf4c9808f4a7178fc21eb02c705b55ba8ec2ae575025cf5b7b";
+  sha512.doc = "2e7d35e42718cea78f2cfb4df49949e4dd245c5f7e9f33588cf153945b32903d449256b8581fe24aa47b20256399163c07d82c164dfc6ee0b1f71d8fcf4891b5";
+  sha512.source = "3612ee0b98bd3917742113b0ae5161d81b6c65abd2d048c6f81f82acc819fbbc2019dbeaebc79d7f2008372a5e1e47f114f580de2579331899816a308b25cf9a";
   hasRunfiles = true;
   version = "4.1";
 };
 "parnotes" = {
   stripPrefix = 0;
-  sha512.run = "1d54c97d697b6fe95b8a80f083b230b3c6a7356966aecd9543945c2c2d38466af02ade5e4cea0bf8074052fc40775cbd5a0621fc150c173ed34e75573895b3b8";
-  sha512.doc = "f4e75d3132bb97f2742c2339763fb92d3ea25dcd26bada710fa5a28dbfda3851698cd9c86c469ead9c7b2c433c903f2275607da1eb6936762e8cc5ee0fb34dd7";
+  sha512.run = "4eabe02ee44557ba34a7eb95922cd17cecfecc48c5c128d4fea8789b94b6a60484a354a0fc3e80cab1365e274bdc8921ff048e9c72a3396aec0c21ac35ba7611";
+  sha512.doc = "4b3d162ef6b88016e88b4cf3bd9792ad25351ca702f21d0f3d0a2b6a3f0dbcd34da419535b907dada09c176e6a6b52285fb945069e1a082a76151bb7f3397efd";
   hasRunfiles = true;
   version = "3";
 };
 "parrun" = {
   stripPrefix = 0;
-  sha512.run = "e15fc6a9328075bfc574b7568a4439b8c78c80fe659246ae2019f8ca23e3c63d4d918b67a3ea8a3a068465f5673370d97305b7067000169ab8da088ba6a4ee07";
-  sha512.doc = "68173a017943537b1b3654d2dd4bb35a81d45f305e62fd8557836a351f42851318ae0230ecddc3a6b82b573510fa9a901d4dea30455988fab0d7aa735bade9cb";
-  sha512.source = "47c37d71993ba37102a4e84337a20bc95d53cdc59412b107fef7362cd4813443879b48fadbaca0bb447886a165616eb144598fcc0cf036f97bcfbb27e22522d1";
+  sha512.run = "d4b36b25584227fb9ab5e93c4efa1514f135e38ef19971e57a9a9e204edd6f247dbdeca8d7cb737b92ec1ac5979e70e4f167d64621b15b347fd3a5a99f6ea5b4";
+  sha512.doc = "39c408fd55e14df2c2c04566092ea60ea61870adf2e36ed7002fa0d443f45af4a15a87fe6bcd664e411c9e8ca2f10c3005265f2e04fc3528a4a7c3f0e7a8bfbf";
+  sha512.source = "de94e739fccf651d9a833f5dbbc1c15cab862f1fb462872df0d8f7992f1e57fba003f48392c813ec08a9e79afeee143f343bb8306366496b26c731180ac9b293";
   hasRunfiles = true;
 };
 "parselines" = {
   stripPrefix = 0;
-  sha512.run = "2d7ee51970c931fa536b9c378750c3fa9c48187be38f9f748185b9b6b46d9cbebea29525752d4a748997db69ed8d64776da5a819781305257bed5ff2ebd9e515";
-  sha512.doc = "941ae0a2bf80a44642c8fa10f365f3efd9899ab89a41a865294e171d42c2de728d360fa021c0ef5b1c005ae21f3aa7795469c91c7e31e98565a3e1af40674327";
-  sha512.source = "ed187efeceba73a73924db75679434d99a32c7a6a5c953a486ef8f953b4e2d8eb6ba38d669a6491952c30da7e074d595245cb130de2c4127ffbded13c855d148";
+  sha512.run = "4b70d4211abf690b2d6203a0de3ce65af87b50074c01b9d6da27c52b40a78e2780fdbf79c9e85e3126c428a94cd6af871774b1c2cee237b45b1a138e7ce259fb";
+  sha512.doc = "c4b6adea89a41ba3507d949179919b13f19ddcd617c32d64105d524946fc946dbdfd792c7f0409af2ccaf0577be84d45e0dd0a0ffab6271117a6ecf40cff85a6";
+  sha512.source = "296ede2e3ee96c8537c4546d9b0937f056878e5cd28c06731f7fe6a4c32d9f91f1b09d574fa8a07b9daab429712f7650d2b146a9e3fca79a081a1fe187e82adf";
   hasRunfiles = true;
   version = "1.4";
 };
 "parskip" = {
   stripPrefix = 0;
-  sha512.run = "3f5a59a362ad9a20dd8c3b2c1ced7f9739c416b8678863d465508667a00b0e91becd310bd015367dff19e80277a8bf3f26549a3ddb5736a1c7d07ad939523957";
-  sha512.doc = "353cefb3c39b5bbe57932dfc2e73391ad7527060927091d77a8e3d7c99f67debb8db2cb9dda949924757a3f984ae586c6a512a21fe03e136946d73343d0b006c";
+  sha512.run = "d2978f27016ed06a638dc997f37ba748bf7ea04f3605a34da8f6b7d5f9945dad871d32ebc2b3c7b41b2bce2ced15c07104bfaf287dfb38b648fa02263a3109d7";
+  sha512.doc = "076b5ef350522e9fcdba2bc00c8a9a23237f518c50fd542bbe7b6f16642bd67b31129856104fdd4c094cb2b0ed0ea0642f80b791a081309e1695efaed46539b3";
   hasRunfiles = true;
   version = "2.0";
 };
 "pas-cours" = {
   stripPrefix = 0;
-  sha512.run = "39dc712d88779a4993d3f3f831acd737af2ae2040a5458ce0072aad2260f4f91dfdec708d3ed651deae70ab373bad6ebf2b2ba3b851e665e7108869465970858";
-  sha512.doc = "d27ce6d6bb5e615baf09992d13c4805b64ff67489ef82ca800a4225df59e22bbe7b09783803e96e38637f49d61acc034f095af98f1f45b151b2a1b4d9ed2cd4c";
+  sha512.run = "76f3ab7bdd0cc863aa950eafae07ee0182b383430cad2eb2e6f275d62e2ddc018eb7336f59c5828d4ce89029a43a4b14a69b80f3b1fe98341fb021e69ca17c98";
+  sha512.doc = "22961bf957b57a81569679aa0bcd98f1cb3534a38505aa6653cf653bbf5a10c666d046e3dad530937ce26913f7c9ac96b930ecd13270fc92938c379a78fc44a0";
   hasRunfiles = true;
   version = "1.6";
 };
 "pas-crosswords" = {
   stripPrefix = 0;
-  sha512.run = "403960b331bafa0f20b584710a245e2c6ab5957622293237ba3c0bcf462adef7c99309de159ffd1e6fd3e2b6c6dc3aa23027488f5b8bc47f0ea893968fa2eae8";
-  sha512.doc = "dce49a69195a4f9b3b378ec821f1e00ca5cf80cdd5992746299316f43b133671c680981ab6e9468655299341196030f68ebe0b7d481e7c5de753f8496171c1e4";
+  sha512.run = "a2e148da7428d54ab30d31f4493f92da5b3410faccb2ed15dee0b51eb9b54aada3d3207af7c3e1fae2a86d1b9f61fcbf5e0e2a3befa57c21d425dcfd44960f1a";
+  sha512.doc = "8f82a6537ac822751546ce457b692baf793c8bd83a53d07bada35411d429961e79eca2ff2f4827a67796d3881a892dbcdb34db54481e8ff0e521b36df86aacb4";
   hasRunfiles = true;
   version = "1.03";
 };
 "pas-cv" = {
   stripPrefix = 0;
-  sha512.run = "ba31a19c0868f79cc7c6936267572433785f1f5f388c5b466b603bad62baf66c715dc7cc52d15020714144067ed11657afea106b9e3a03ec90d7fd055c0ae61a";
-  sha512.doc = "1402c21c9d5bd6c79746f9533be03609237d0bdec81b35c96f18321458eed4e350bcb11c781a7b1030850d51b1c59effd1de955b9dba942392117f5114f85611";
+  sha512.run = "e47e1d20ccb6063a3895a26938fc38387f4a1c6ac8c2271116b4dca3f77361c6bbf806cbc9fee0a4ce749354ee4969feacf5cc535ea743d63aa71e410415a160";
+  sha512.doc = "a90fa6e1cac23aa4b4f0e5de8c1ca7da6c220be16ad430edb592cca25579481cfb71a3c5d9a4d8623a7a69aa17d63f5645fa5d64f20d6d87068c8e1c93e8d684";
   hasRunfiles = true;
   version = "2.01";
 };
 "pas-tableur" = {
   stripPrefix = 0;
-  sha512.run = "e71a4e6293457ca2a1ef8c6e9d34b5abcd437c0ddae087cf5a3398896afdf3ebf164d148d81d7402cb27cdfe310c1e29a1addda82464cba2f5a7ae3e460bc77e";
-  sha512.doc = "4345ca8ed0cbe3a39917451968dba7795b4d974ebc5d75623c100795b9b70acb3a023a47bec31013a41b0df4b4482a3eb846eb5a657637b2e4d9d2d3d1586552";
+  sha512.run = "e17fa2b2e079ab2dbaaeb85210a85dc1daf89f9b2c7f345891f1ea2e7ab712ac012f82361864e553146443588e85f5cf1b8b24e10c151833c24d1e174c2cb00d";
+  sha512.doc = "ac402d7413c83a58ae997d8da8c8b4c9b1a24bb36576b9bb69fb6e28fcc05d3c4b05f7e90960629da8ea2f1ce2db396a3c6917e9b6272ffccfa0b26c60d38483";
   hasRunfiles = true;
   version = "2.01";
 };
 "passivetex" = {
   stripPrefix = 0;
-  sha512.run = "b0930cae3ca65fd64c14b903956a877a5e0c848950b96f89f35f60ccf728af6c4c4d4f67a7182bda93aef257f702f23167f368b7d71183e5f95ee2cefef00050";
+  sha512.run = "5f6bdad6aa87aa92ecdcee9e6cd09f4af84b7c9505e3cc4b6349c8c9b027ad9008509c93ff5e41937d599e1f9f7a3d6a88d59519fbe5c1c29270f943e512868b";
   hasRunfiles = true;
 };
 "patch" = {
   stripPrefix = 0;
-  sha512.run = "d11fa1e1da0949f45d499bc916df869fac43a4b00748d2bcacda28362113db64936b469d34a5305ffab295871612d9ea92c87cea8e076c922a57f1335bcc4d34";
-  sha512.source = "5f9032ecb38d52565f4b3b7f7da746bcc2c9ebba12a68297405225e837b1862b5fab46dbd4d751db0da4030bf2de08c110955bda0d7c07926c7b056bee9c21aa";
+  sha512.run = "b6023a153af8906f6103d989c6b7481fcaa997ce25ba4a6a19009d4cf8ef91309d7d03729a175fdd6a93c62d94d6f8ad1041185b07191fdaefd1115cd4454f64";
+  sha512.source = "a3655e8b940611baa1f3ed56ed0c1f6cb1e3dd9d8fc4d2df16784f1d3badc7a258257c4a6293eca5aa4feb64d805489e78f91324ef19066f77904e9588158d12";
 };
 "patchcmd" = {
   stripPrefix = 0;
-  sha512.run = "447b637670ef1f936bfb8b814f419753c21e5a40ec2c608fbfbf0028162ba934de917252e3a607ba35de77fb2e3766075585658800fbdb050c861380e977519a";
-  sha512.doc = "217f4f6585abb7d27002924311e96233c820751113f3c0121a5a565bf8666710e9bf75ec0cd17deaba602ca00c16a698b8d9ce067f19d6525fbd680522ba5518";
-  sha512.source = "41a9d9eac90e97b5f0dee2b599dd2a0a23606fc1dd9890146310030c50d7b811206f4e71994ffffe98e0a6823b6519c7e5d6481242ba46551123fb838c88f448";
+  sha512.run = "953612c41419929c690bff3fd9b2ecb29dfdb6c3a537937e972ba46bf80dbaffc835ee70196f407cdb346495d211c41c1fe21fba340c19f60ddc56a083abdf2f";
+  sha512.doc = "47e83a15b358daf3cb2d4a87644f63b12f984d221c3b23dae51568b711a9eff68b29796c5551840c81e6d2a16fd77ed19fa050fb2498f1aa152c8b1ad673db5c";
+  sha512.source = "307af547aa0f003d5aa7f8b518875b93a9d00bb2e6745c639762895ce1985829a083aa265ad261f98b477a288fb29267b02d295f4b87bbaff9cdade5dd9de951";
   hasRunfiles = true;
   version = "1.05";
 };
 "patgen" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "2a5175046894474d981baafc9cbdfe5e1079713ff58c214ff0573b99e73117178459b898f7b3116408569152adda3aed070ee7790b1db50afe2b9ca15ee74b50";
-  sha512.doc = "b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117";
+  sha512.run = "f214b762c18ba6ccfedd0df11bf3cf47477bdaa23b1c701e4d1ecf98c4bd642b563d7066b7463237492c1b8ffad1130abbcbecc1b020901ab49572007d199c31";
+  sha512.doc = "108534d334d4f1de613abd901d7f11196c83dce58c57f74977889efe656064c563785eafd315f3f63dc2d1cfdc14a4c3d12994dcdc95d098bbf203a472b174ed";
   version = "2.3";
 };
 "patgen2-tutorial" = {
   stripPrefix = 0;
-  sha512.run = "5c935ab21860d4392256354d7f1648f93558a62f185589fd9353fe61837e09e98e8d8f7c73dd4aa9215e348ea1a667817a4bf5600c4a03b57ab5f3e0de6b13b5";
-  sha512.doc = "11e2dac6af84260c54b7e8ef7112094ef5c183b7a4712a722764a5d56803d74d04e7573d7aa023ef7b35c9f76814243869e4eba906ef9de1820c747b8ed0f591";
+  sha512.run = "3ade1b053670c62388bd5605601eacc0fce4cfd37284b3205b163c9b47f1b2adcb5745b1d5f348bdd7e15c8b20f22664b5daab4c99091833907f0b80a90a1a66";
+  sha512.doc = "32d8aeabf00a08e952e2896bd64c7e80de6c2ef41b3bc863c8d66c24048e3e1ae4aab6c994119a60152f8481c8c6cd828ad447be8e637637d1167631e746b8ed";
 };
 "path" = {
   stripPrefix = 0;
-  sha512.run = "cadffc11b553ff8a17689021c3561880aecacad7137373edcdfd4dd656d7d1f72608bf5a02a895cee5630c1b38034f4f2af6f8d3f20b99b51f203f8f2c50c9fa";
-  sha512.doc = "d355e435a4386a40adc6e0d8c7e7e513aa4cf8b258a415d3cd107a57f13997bdc2448f8f1f21acb7d38f787aae40a85c6d2d806637517e54be5ca20b0824cc90";
+  sha512.run = "b0c01b50519d260d940689cd147c7ae4a501f611f0e76ee8b25a82d3b84d98567ab742b40da5366b2d0800e6a96f0fa2e5de47aebe61823a878a9f9a2a2c2abd";
+  sha512.doc = "ca21c8feea7a95c71664922e149d8a3a6606db1a9eebae517be1ed393cbc8dd3c613e71df53b8998011bbffe6dc8c5e1bba3258bf101e35471ef822230ab77ce";
   hasRunfiles = true;
   version = "3.05";
 };
 "pauldoc" = {
   stripPrefix = 0;
-  sha512.run = "ee87c00838aefaa004e02fdac2d704f489f2ffff6139cf0f4a15c2c81eba51ee7f1a96e5ce385cc30885a3a8d97bd7567b6a8556a7fd46284d51d6773de80760";
-  sha512.doc = "aace90582f9d4341b3b9bc7a267a084acaa4fe2dd734518399ea73fb901db7662696677a4eba2513df252a51c3209f0496fd3e3329e1eb779b226ddeba1f1180";
-  sha512.source = "51d0b3d78deef281840d365b34ddf851c1b2b6482bf827124d9687e440eebc3ff479a4b2a51adaff12d796c900f44d54b1ebfbe5acc0fe5cb9d1d3f4d77a43e7";
+  sha512.run = "3ea0729b9b74369b1e960a8ece1af9a108c2d9351a3d6361da5d67810e7aaa68a74170fc552c649331db4c3055bc8439006de910925f0f837aa0525500b6ee7d";
+  sha512.doc = "9a8d4ffe1e796045e3704f49d628059746e77ba218f1f5170fbaa431b69f744131f18de1f83793d6f3ece2d79fc04844c9fa04ec832122dd696dffa86e5d8607";
+  sha512.source = "e2364405e3fb03dabe0720e731918784b7d05f739ba17d2f69b8cfcc0f19e22dd22822ed7a35f6689b6d83ea9ef9feaf4e5f8e3b3d00aed3b1a64912ca1de2b0";
   hasRunfiles = true;
   version = "0.5";
 };
 "pawpict" = {
   stripPrefix = 0;
-  sha512.run = "772f9d8e41c73993f38dea586dff99afb6d762904e3e3d4d263af357384d6ac450166116f00611c016b670209b9fd6dd8f66577871b685395b3d2e8e7b3dcbf4";
-  sha512.doc = "d73a22d4cbae3b129b024612b6202db73330be331da774681acdcfd646e86cb9873856cdd6280f92edcd56c12bf552aed16dbd813921c92d895c6d1f977de109";
-  sha512.source = "290534e36cbc2c93195977734a05939ec6dbe44a301325b1136f0d482d9c81aa5baac2e9a91bd71f84928568d7bda5864f749a3ccfa81e3af6b5153f14adeb91";
+  sha512.run = "2a054f3ecb6b64792cdd31fa7093039614b28f36e1919b493549efc89868ee17095e7ab77bdb5e4608e46821e358e372e00b763eaceef841045cfd457b91a3fa";
+  sha512.doc = "03b523aa178f9a7a80932d1547224eac5ba5ffa0ffd9eb8ec21afe5f764fac869a8c70e3df75ea650c717dfef1216a2f371f727229038155bd07d4375bc1aaf5";
+  sha512.source = "18a2de29b6b472700a3e3e5ad735ea036ca63546accb483f6c85da949b2041c5baa1c72642de93a13ce80bc2a8d97a4a2fad5d6a4c0bee904f6a9a149b600608";
   hasRunfiles = true;
   version = "1.0";
 };
 "pax" = {
-  sha512.run = "0acc0ff24198c7b21be60cc16ab5dc042cc69a087a347d7926cc72b3f482592fb8096220e56c933450d70c2363e519b0edab0825173f5bf6cb6e5dc3e9c293d3";
-  sha512.doc = "c9c7d22970c0b5b9340a9c072ab37a5272dc8f7d3b491c1d89aeaa7e5c5b8484e4e276f600c1c08f65fb8a8a6f5a999729e3147af701c877c2d5e98ae9f92f36";
-  sha512.source = "5824d1770c495d478cb43cfb61411752bc57e49fe05d2dc97b4c4f2a70dcce2fcfdf2b1bb02fc004037bd7fb5da16aa7f532e48b272489c697e162664292c739";
+  sha512.run = "094f27135ce5203193a2310f8af1203f0c7c00b40b20810f770087b949e4afcaab82e6e20a9e17074d0f34527b8db1c6722b7ed998341e29cb3ac597e43f21e4";
+  sha512.doc = "3fdb6dde8e6a46d728af62b76fc7c7f2b00e5245cf32a3eebb7c24d0dd031c37fe78495c9266968e54fa6c68966c866bf4acd00dc8e18912d1b774422699e9ef";
+  sha512.source = "8d9fad9bd2ebac748423da3058e2bd84b30b52c190b97bda0194cdc3aa9ed80e4f3eee5d983bed81ab9314a7c791e907484ba643876ac5f281faa640f16a9546";
   hasRunfiles = true;
   version = "0.1l";
 };
 "pb-diagram" = {
   stripPrefix = 0;
-  sha512.run = "3cb8b5f47843018cb6fe8b4d677a7bfc04fde3c93e7de3ddc63319d4a1d5b0e8e9abe62f13da09345064ca4c19bbd8ad1c30228a9f24ad2b9045c2bd8e566396";
-  sha512.doc = "b0a41d38042e0e5b42985f972097cb834b6bf393a54705c64447092ce08056a8fdb3ad30410bd8edb6a7b45f10ecc117ee24e12937430a67104cbba843d749aa";
+  sha512.run = "d3eaf1f72a2a677f1db557fedd48a3e3d80c98c0a00b055d6445b986aaca228237739f3f4386712e3f26b581924322571ec23495961fde6e2fffe6a23ffb90c4";
+  sha512.doc = "c73baa74719bd3a95061c614505e0e60e443e6e4a2690ed2cd69d20062f0decdb15730336ed4f7f9aa03cdea39b436dc85585c36b95e44f861927a3abeb029a4";
   hasRunfiles = true;
   version = "5.0";
 };
 "pbibtex-base" = {
   stripPrefix = 0;
-  sha512.run = "d3f5ba274452cbed4707a25a696c3a106495ca37facf2a544eb09598d236a42356e28202e8740e58810ed71a543b5090a60e9bb874fa82ff7188e4e0dffb0cdf";
-  sha512.doc = "5b179fdf320aa5adb769f54c9b5170b07f3e15002c6955d6f5b55730bab2f7ab1ea91c93536d04ed6c014909c122c391b779071eba8a26291cb4d77a478bb5e5";
+  sha512.run = "3a1aeeecd8e8481449ee074e0993d5d1c29d2b6bfe25d6d333a99af402b18d4ecce59c6fcc773a3e6b086d8ac1b55a57f34d59047e92a80facb6efd38b6c8e1e";
+  sha512.doc = "6698b31cc6ad8fcf9abcc9bae2ee81b59f3d32d4a3b5f6bbe45f00033b61c708cc6de75a349164101ef718a716bd4c016a7dddebd788127a4ace2877dcf95554";
   hasRunfiles = true;
 };
 "pbox" = {
   stripPrefix = 0;
-  sha512.run = "22322472eda264bc06eaf4b8b161d68fe53af498f5dc5d8ded15ba0619bcd9a7ecb6ef98a57e62c2dfe215dd8f304cd0b3023ddc766028e019696b3ba98336b1";
-  sha512.doc = "d29477d3768f33b1fcae17b5656818a2063f8e0f480b0dd6e44bcea50c4ea14126bfdbfd85ae4f4b3e9761200d925b523c5656923d2777b312dcb64bf890c536";
-  sha512.source = "4b070b2e276120f30115984afd9f0f3bf295a7ef14f7da8b02e798bc101ed8e0623f273e14a8f2e7c3608bc41b48727c3983f2c9a85807da62ffa817523ccb4f";
+  sha512.run = "4c0d4a7994d80f3d24aaa5accce99886e84855c9c4ef16b954290eb2c4212cca68644207b9f179043c9ca0491f2484094509164c53d5b58a78eca7b234e8ed48";
+  sha512.doc = "8e7da6e1b1474b142d785f0dba59c6124cdac51aa613302812ebfe79eb466b02324fcbf74e589b9b2a4d740438eb5be32aadea925af3979c72d0cef387f39a25";
+  sha512.source = "16d754bc533f0ea28c8d87c28a4a6c3d5af181e2107d934f44f6a70d9a74d92930d8e43b2ff6f462371ee49bad09a1b5d843a5da320c12b0eae13cfbeccd9404";
   hasRunfiles = true;
   version = "1.2";
 };
 "pbsheet" = {
   stripPrefix = 0;
-  sha512.run = "750c5049f4d2315a465986224f69991eb1b33d8d1c65bac088d6eda5e88b6498353de3b5c6847c7a4789861d83247233359cc116a7a80797af695c9d0dfaae0c";
-  sha512.doc = "e0c16f2655487b4db79b1b708f02cab0b5913e0c7a1d3c02ee57458ef67e26ca2b1b61f61ed26fca165b80cbb266f13fde2e7ee9f151ca1e144e7ebc0f2fce98";
-  sha512.source = "82dea778c65a6b6356d03be1a2e62290a79e393f3a33aa1ed342c6bbfc77884c722f0fdd34ef662921a80c3ae3d28a7952f4b693bce84c181cc1809aaa809548";
+  sha512.run = "ffd66e88d2e6af69be0125f66cbe425cdd403ff4c1c330c93a06ad0c389b05cc5b17c8a8e58943e9fc881f25904da64a9c5dadca19968226e8e3457c3380b954";
+  sha512.doc = "522ebc8b15942d74949c2210ffc591306d215e6d2656653b4ed9a3fa38546f211624f4ea6d52ab5b69ff4a9c2a7162e7a2eb65d58e23eeb84103b5283bd490c2";
+  sha512.source = "59d8d0fc13302ed682f9d0ea3b4b28662d79cedee2522a5c110cfe95d72acc9afb235762a568e0124ecb9260eabb973575b5cc0beaafdb13a17305c6a330eefd";
   hasRunfiles = true;
   version = "0.1";
 };
 "pdf-trans" = {
   stripPrefix = 0;
-  sha512.run = "0ce2167463e26fbbf31d31192e2219ba492166451c65bc005f74fd8ca4a1f339a62ec1c90e51959bb7a79e3e7555d525ffbda3df8741117ea0a558efa92ce63d";
-  sha512.doc = "c3281e86a462333ef6f2a22e6faaec9c4327801cea4c7a6650b1491660437d4df0dbe044b7dc6734e8c1d0926573ac06f43166cab584cb73be07a93617953306";
+  sha512.run = "57157e8267ac09e3fbc2b9287165f298823898ed3656c4cbd91390555270289113c9d1dbdfc17db9fba77e2e3768c74e6011ac21a0d195620a1d5e50f23e6c41";
+  sha512.doc = "ff09b34edf898063ef5aa9c4f72b546f3e84639b69a34f2994ff0a22632c221f5dbb2c130b31efa19ab23a4549a1078c42702b76208251eb67bcd7bf1d4a6211";
   hasRunfiles = true;
   version = "2.4";
 };
 "pdf14" = {
   stripPrefix = 0;
-  sha512.run = "bccc7f7b91f6fe84472fca0cca81bf5d18f4eccb7d13a32fce5f83282bebe1f1b5e6e56203437ff8abf3fffde2a399ba622a19bba8f07fbdb2d2b7a449313c23";
-  sha512.doc = "1f3d73803ebded38920e9714a5e786c7d384ea976e7f3065bc9d8caf86bbff5e9bef7d071fec98620273cb07d79be6dca1402697b38ebbb4cc83bbe9e29c1130";
-  sha512.source = "36f959099350d6850b40657a5b6deb919ca2d43852f195b5eeeee366773d1464aa5d5ed70c278ae28f97a87a7d7d9f85afca109f003524bbf529b403dd8b0995";
+  sha512.run = "4fdf40a81588dc5ab4e3e0d083611fc25db01a10194b69cb7233a1c2ed30dc7d69893f04fb14b6e0c6da04be2f13d9f4c3211ecb4551503447b93d3c3655cc2e";
+  sha512.doc = "94f5cac8ab22255afc1d12d20611e574c8d305486a45290a5331fe00c49d46363a2676f0cdc3e3275ede5c86453072d457d8e32bde22ed537d27ee0d26d45ce7";
+  sha512.source = "f1733d1b8b34392640bcba5afcb83ee236cb0621247d61e2f7e86a963726d8c66a2d6bea5c884f9b3dd9379c30dfb0acdaa7d22456a0608ef66f44444238e973";
   hasRunfiles = true;
   version = "0.1";
 };
 "pdfbook2" = {
-  sha512.run = "62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d";
-  sha512.doc = "7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d";
+  sha512.run = "792394ced9d0b195a05d8462b59abded5c341aa1bebd76d197dfa2387624469c06c4dd0002a7414682e01969e4568a48e5fcb08d57d763748d4aee8d40758687";
+  sha512.doc = "951e7fe656db899c801fe24e3dcd3f0c4d64188b0299c94afad3e8d7b4a57dddd921485ce3d9fde0e78a134ef726d1c6fd05aa38b36205ef37b37f2ec1c9505d";
   hasRunfiles = true;
   version = "1.2";
 };
 "pdfcomment" = {
   stripPrefix = 0;
-  sha512.run = "b1eee395cb0c2a9f47e03618b0949175881cf6fb223fc986ffd58ebb36412d164093760463f7d36704a4580553a1caa6e3f983cd2e6f22a840a852e121bee110";
-  sha512.doc = "5c9a246f8b2ee104754a0702f2b21406a9caaf7e6007b0fde39dc5c4fecdf0a53ca4b935e5575e69258ac86a5a5267761137589ff658485d9f222df49a796a0c";
+  sha512.run = "29dbd386e6b8e2997c3bbcbc38ecc486334598c3ec848c72901d2513713397fcd810ee20ab360f303e9edc90f49dfa47393d8fb3b950ce24ca09d7b5b2df8590";
+  sha512.doc = "eb884e5fa3dfeb2b01b9b1181b0bc2eae26deac47ae07a509fef2db6579eb7cb5b3533d2b6c4e0aecd1731aa4ec45f30c869ab74ea151d88b3edc1efa0718af0";
   hasRunfiles = true;
   version = "2.4";
 };
 "pdfcprot" = {
   stripPrefix = 0;
-  sha512.run = "b7ffe282f527877a0bf8a076dc964d0a5e1d1f11ec3f9c1d86a67852dcf3292a5cfcff3eedbf34724aa110f4ea45dde630af1c3ac452d21dd2e7537f4f528382";
-  sha512.doc = "fdddbd272de2d7a515953619d127269b3f744a9f0888db149faf01cb09f7b6fd4d2cada254cc5bbe585ccc10396c77bbaccdd263de790ca0aca8bd13547bb6ef";
-  sha512.source = "8e83909423c2d1334ef15f01b8a21c4c954af270ceb32d1cfbb6bddd63fa4521968818819f1cd22880a14c85e66a43f12baf966d331ccc0296be0c4866e53c12";
+  sha512.run = "29776d792396bcc1b1e8d742957f2eb16cde308d77487894929c202cdb0973cb2df2a0e5e6afc7ce29720fd8b9118cd0c54af8b3d062669b64dae6d14bed4357";
+  sha512.doc = "c1b3d85d24b42b864e7bf70c272829d521f03d670fa086d9e9e44a8a0d8e06d6577c8ea6aee2a09486f072082e50d98e15d12904bc76a2a42397b8f75043ab66";
+  sha512.source = "5397826472a8e6af9aa8d6ed5f6dab976778d0232f882076a5034d46ee096e147ad562ea7de461486484abd47334f50f9427595109c10564d47bb4a3bbc52305";
   hasRunfiles = true;
   version = "1.7a";
 };
 "pdfcrop" = {
-  sha512.run = "11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00";
-  sha512.doc = "fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110";
+  sha512.run = "6e273965655e7ab8cee0f9ae8ff489b7e7b782f7a3bbe89f8a245bd1e00a46f6752cac43aa8e3e4c0cfaf21642b7a1b1fd447e25cf5adbc6f2d14651814eb326";
+  sha512.doc = "71683887bd5fc1557fc53b42f4b34c691064d3321c91ccb7831edb5d00e7415b66e41144b8d887fca04dbb3acc785fe7ed5932e047e352b57a24a37cddc7f531";
   hasRunfiles = true;
   version = "1.37";
 };
 "pdfjam" = {
-  sha512.run = "4a752cd626123e98b484fb13396f97914a24593f7c25bdaf6b4f16d5836839fb995600e268c24cc454b672f06df9e4b018b3cfa0d7402ffff7f7e2d351daeb4b";
-  sha512.doc = "31571cc3f5328c889c4693ded0bde5249f27b4aa12b15ba3716208a91c6c06d85ca5a218cf5a219feebe547c9c693337c7c60aabcaa234daa1821a21eaa637f6";
+  sha512.run = "0f38852f4539efdb1831a1f53e4937497e2b95b2cce845c3b4af1b303610a66177d8a977b57a04ce50b639d06c1f805cc354d840190638965f002f5581512983";
+  sha512.doc = "d7cb3243bfa9f5f013330b466adbe6b48ce755e8dd210b86aa5d83ecabccfeb92ebfb9361dcb6499c81acab263e8c8f644ef5a77e300b688030ca361719e98e4";
   hasRunfiles = true;
   version = "2.02";
 };
 "pdflatexpicscale" = {
-  sha512.run = "8e7e2f2767d3a965b6763b58fc33bb30c2230db5f8f697228e41d095d962cd8a553019da3070d781a7b057c3baa952a94e755c54bc2b7cd5dc6b454ae31fee63";
-  sha512.doc = "30ce87953115886735be4370eee12bed0cf82a65003bcc45a4fb934fbfbd193dfd19fc96956e7d9636dee2ee14f247ef79766fa45d1155ea704758caf4402cfb";
+  sha512.run = "7745915f0e27647d65cc2c3613a9b696d80179a2ab0d802038f7fa3a9b35c530ad061c3b95eba04a20312d38e5b98357bea40f9d5336fcf68d14111d675bf40d";
+  sha512.doc = "32cc6ee92dbb2d7cac71cafd31e17b393f4ad0f766a217669653f7e4bf216f133e19d5a0bc75b4b80229bae986340bbfa21e230f921050b15e0a528d58dcce7f";
   hasRunfiles = true;
   version = "0.32";
 };
 "pdfmarginpar" = {
   stripPrefix = 0;
-  sha512.run = "349838fb5c0aab05c94f19f9f3e9854147a9d8dd19ed5301ad8e4cc2cd1b333a122fa26639b8ffae2ca85f0d7d876dafd25e1fa59b6311196a4d6bb2eb046765";
-  sha512.doc = "42a34fe8159e03e8aaa6bbc9a19db9c0298be8fcf0589d1be1ed4e381333442631c06bef5ab315c3e1580e8a897e847e262a377b1c2603bcb97fad6ee2377213";
+  sha512.run = "d12750d76770dd8767236f50ddb44d38a36190fffc25b00ceaadf822e0b2aac18225eb05bbea976044b93dd15da8033bab8933a26e87d880d45590d72e769e1f";
+  sha512.doc = "f7409a193b11bbc36b50cbbf1ca83820f71e86d1906ac0fa168c3cd13574e621396f613b8f12d085607a2b4c92877c443009f009864b918e202d2a2ac3cc219d";
   hasRunfiles = true;
   version = "0.92";
 };
+"pdfoverlay" = {
+  stripPrefix = 0;
+  sha512.run = "b4e173531c6b1515f81f71fad9385948edf3ec0e75ff0fa367005ca30f4d9d7585c9d93a3111fbcf91323f956ca94732a78a78321ade5af2442bf43f863fb9e2";
+  sha512.doc = "3d0c67b8f9d4ffedc975db19a2a91acef387657dc6f6b5200f44436fef1310a9f04790764629ebfd6be87aeb761f85f48e380dab3634dcba8b12acdf2a560df3";
+  sha512.source = "1181e4c7e91634ec6a86d104f8376449346a9bc1b0923e5e04a629cdc2203b8ec02cca91664642ab6ae6d5527e6329ffcdd6892297c548d45ea60b9cb6b91060";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "pdfpagediff" = {
   stripPrefix = 0;
-  sha512.run = "4227287fe3e005eb48bddd3ccf4f4e6c6107a73eb143a08018a6b8f1f1e68ed06d95928bd94a1a23dcb29e7044038962a1cfa2d87d83709bd7339346af1e1dc5";
-  sha512.doc = "d8948d0173c8f0dd9fc6c3ffa55de8bbec9b19cc007626ce3648386062026775343931f0e9554ab03797b3f0b80b4bc5050d8e2704f36bd93a44ec209d22a25c";
+  sha512.run = "70f9565b908591199fcf1e060192391ab89656274fc336166ccf2c69ea98183e883deef9335ca5989482bf312d3aaac210705e64eeb79207df4523c10a864e71";
+  sha512.doc = "a3ff81695029fba4c52630875c310b93166e43878e403f1717218bff0c896af81e3a9a0bde792867f1f467b8d3ac32963f241bf2ab1fd2a54243ae086aef4cc3";
   hasRunfiles = true;
   version = "1.4";
 };
 "pdfpages" = {
   stripPrefix = 0;
   deps."eso-pic" = tl."eso-pic";
-  sha512.run = "20b0745fef41d3b1ccc5ec04bb1eb44a3272bd7eac51cf8522ff6fe11fd089c9499e76ec832dfe42005a946b9c46f40068817d85b318ba7f479864a5c5ba6af8";
-  sha512.doc = "c5709eea9340267921792286652ecd30e5cb95b7eb93af8f02879118725c81444aba7f3581d3c8f4f82f44ad6a4ab4d47bbc6ea267a0217efc3df6dd693bdad4";
-  sha512.source = "407f2b948473b9e6c48fcffccd7cb1902087ebd424e716c77c807a745755053bbef5d6deb122d7fb2964c5bce779472f47916ad14b90b7ae482f5926d43e14c6";
+  sha512.run = "1b4e4394c19d8046c457c6a7a8fb973ecbc05cef3a60f697d6e478de5127ee60b6d83cef8a581038fbdb5d6d11d71917ddc3bfa5102ef31487bee3bcef818b05";
+  sha512.doc = "8820087411ba55efd4bc09610fed21891f3d197a9595077419e5136d032498669bdc03822119f8cd40e7b3aa0be37f683e3fd88650924ad04235aa0d96a3ea51";
+  sha512.source = "98ced144ac5e8dc18a240c6a54d70d97a8ee3c0e6571135bd4af5078447bdd1c4b37f4ab44798f441c80733f613e375658e9e7fe515316bda7d7ddc76f824a60";
   hasRunfiles = true;
   version = "0.5l";
 };
+"pdfpc-movie" = {
+  stripPrefix = 0;
+  sha512.run = "cdd91d0bff1ab7e81066e1061b60b2976e83107e6ee3e8ee1edd40fc4185fa7693ec3f8f9c33f04433cef165727c08091a426f32ab4967433d0e0696f7dbaa06";
+  sha512.doc = "6232db67dd66475d02361496ae068bda39eaebe64966a425ee61fcba270fd88448982ab0ab00018aacb6259486d506c0810a6c2980552ef7eaa997d33d0ac4e8";
+  sha512.source = "b2d18bd631684f8dd4d4b839c6a7e61d52c8e9e50d7771d8e7e9000d39300fb5c3cf13df18a65e44c3337322ce544c7eda704b205d0caa08749450f4014f3f08";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "pdfprivacy" = {
   stripPrefix = 0;
-  sha512.run = "3b4eeb8c622b81ae4d81bca8c18c73e35ba30b557be793e6887d1cbd994b8f35c0267f463664cb673264e8fd0053e371446b50cfe142e1c8cd571d5c52bc9131";
-  sha512.doc = "6c6a36dd73f282ef5afa6eee2021436cce376e58bb76f50e7c2e04dc98a68370cb82bcfb6cde6251ac9137eec3efaee709e248252d1f6cca09d32b56eee7c5b0";
-  sha512.source = "65c34a0e043ad39936ae7256eabf325dbabcf38be76cdf33b1eaa97ea6a67f00a52f3d8f2c462dfda973cfb079a8c23e28d8fd8755ece4651da43ff160de7aa9";
+  sha512.run = "cb33b9d2cad1d84418475ad030eb1b2844242afe62aaa2cb4c573853c6996d08cf61e64a90578cd91a3ff2b1d84839c1b94e312cf273c889d3edf0642b9128ee";
+  sha512.doc = "beff7ec0d8d54f4d9b32fde2af94ef22243e0083913ea7f7f88b0701e7dddc197e66b5fb48ed870e17e34e740a2958d1f38021cfdc3a222d90c4e52d1f1e9024";
+  sha512.source = "0bc784af40058e0c51cc598b3f176128a273446e20e021cb2a8292759979ce340e2a1c50ba1645509e1ff9cf08b5b370479be8d3d2abea892aa63e62cd489174";
   hasRunfiles = true;
   version = "1.0";
 };
 "pdfreview" = {
   stripPrefix = 0;
-  sha512.run = "368274596be574f1e8819aa7a4b3a3b742c0315c5a154b6d5219506e0dbbdc5186795911842df0ee81412b1bec9d121a9d049ed2c335f393de2d193127ab6614";
-  sha512.doc = "38e89fd1ff0038db16fd7603771bbac22f090658bf7a64b425955013c66a3a6dbc078c83bd3cd96652038be3e916e1153b2d340f6e4dec87aafc360c67d40b75";
+  sha512.run = "e33df4eb764c99f01dfb9c5dcde6aa4ef4420d4d9f6bb3310aa3257b9795b7fdee16950e72052a5567b6a821060c1b991a9318b6a32b2974bff15c312787ff45";
+  sha512.doc = "b1a7100774f75b6f2c9bdd97f5f4a78aefb4ce5b4601296bdf1f873e467190e83b60c28db841d3dca468e1a28dd0ad2816cb323bfe97387a452b4184845b1bc2";
   hasRunfiles = true;
   version = "1.1";
 };
 "pdfscreen" = {
   stripPrefix = 0;
-  sha512.run = "f47b56d4552ac01da579978d4a99dff2e61810d992a309fd895f9f74aa9e3826b0f0c51aa84c6b8e11c6b6699566be3904cd2d6a738dfd9b2a3d503df2ce6917";
-  sha512.doc = "399fbbf25b2c1c1dfe8ff452d497032728d465b53ea952514bdcdd05b291e35f202625fd417458b82103ad410f6af552155eea99b22bd4b4e6b4cccc04709007";
+  sha512.run = "922128818d0929cfe4e114313b7d427ae46bff282d6dcdf20446b0917bf6de43d391a8d3aed49f34275040b45ef790a63281c911a766ebf7be81c43c34a1749f";
+  sha512.doc = "b8a0738c6e70258954145a58b5d3443188c9b4f4b02da5551c9edea7f37e4984b1d268dd5b9912c09e9d1a637a26ef38b9b2777358832bf8c9f23d0f917e2217";
   hasRunfiles = true;
   version = "1.5";
 };
 "pdfslide" = {
   stripPrefix = 0;
-  sha512.run = "008090ee9634e4a7639e03bfd3a8c285495893775f1996ccf0ebbee268ab8e2bc3f8304c04e2d5284a2e4ae10920dead85f70087a5bf3da14114876efd549adf";
-  sha512.doc = "8a237d7feb343aebb92caad829d6842b79db7cb7c80005fa4cce8c38586c41a15c1247e406b0088a49cd4b1e9bbefa8e718b0e2dbe9ae22762cbe93b0edb8ee3";
+  sha512.run = "569db4128c23ac61106c0358b666e9bf239a2eee109d694e376144d17ffafe4cf679e4450e20261d4c15d8998f13b525ef14737858211954d135e00fe0dcf1a9";
+  sha512.doc = "8a28b9c0595edec37a352789368b10e15999faeeb526bfc0587500cf9756c18d60117c5962aaf684b88b6705f1c7c7f8daa0f6ae35288dfdb495e757c5c2f692";
   hasRunfiles = true;
 };
 "pdfsync" = {
   stripPrefix = 0;
-  sha512.run = "9b4e7ce73622eedd6bed7040830c9d27e3e26cb2afd2fe5264db265dbfe7a8cc383cd4f5517981cac2f128c5fe475402a219ed23b6eeb14dd6daee54740a3ebb";
-  sha512.doc = "23dfb8b69452eabbfa9afa1d7aee1d51d4ddf6046a3e9c04baed4fb67096e595354bcaaafe873d7558c0f3d85b9eaff259bb6a8c29a4aa117aef581fb4014a85";
+  sha512.run = "7132b4b1845abdaaf0040fb4f07fdb3650608023bd869393ac28b4e25cf31ad993ebedf3fffdf9fe3757d9ecd22109c90ac87334eec2944d0fd26f978b65ece9";
+  sha512.doc = "f1a7e4035edaf56122b1308be77cce7d92116599bc778032be742233469df5c32f7da7dc12bdb623002e2a7101f04befe8fb7a59d21b27565e8fc6f26256a0fc";
   hasRunfiles = true;
 };
 "pdftex" = {
@@ -19617,507 +20160,528 @@ tl: { # no indentation
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "64a35dc0e86a70f5d80671565cb5288e55b9b1c2079562cff7830042fec3d4eb962ed57e59f67eaf0ddeabdd5d7f8aea6d344bedb1b6573185b37801bf1f19b0";
-  sha512.doc = "a7e9bcf8af36c9fdbd8bc9ed8d073e127e81f0050bde8f84b3437c4df25faa737a723f338873e330926ef96e97dbcf288ebcdc6d8f9928ba796021b856587cad";
+  sha512.run = "b449d76cc5048241e67f5de19206a3a947a77d68126bc57f2c49b8374f04782555ebca6c93b4d7fea25c75cb6b2b7bbdbaad6b9dd2e3209f1d20659c251e6a0b";
+  sha512.doc = "ef1ebb01323140f78d7d49089b3ca33538b13d2431b146607083baad039637db2392576ee1c09e3f28dface3deb77d03ed67818622798b6a9a8b7a60ed5641ba";
   hasRunfiles = true;
 };
 "pdftools" = {
-  sha512.run = "1b23958cc62245ee219f89671884445ed3793615d5150131c2d5e9aded201231b45800accc952b8e045de54f4d1172b619dcf315020debfa4de00ce5812e19c9";
-  sha512.doc = "33a3680ba93a9926968d778dc26d591239ddb1ff1facec54ac60c2140adea8774c9c98fd918fe7bdf298dd69633becbe28f121917f6b390f1f8be3578a5df8ac";
+  sha512.run = "f87afdaa518e4c2fb918fcedc24d75d625386741c148aa89097006048dd57368cedbb76e72f82cb76cacc732f6639a60cc8bfa0d6dcfb96a3c70a2a5838eb5fb";
+  sha512.doc = "4304a2fe4367aeadfa1d057fa813863edac0858a74dc05f57c2c2110633611b5f4a6dfa84e6304eb9a943380e77175a14d38e3b3c0cd9f33fe161f3ba5ba981b";
   hasRunfiles = true;
   version = "0.86";
 };
 "pdftricks" = {
   stripPrefix = 0;
-  sha512.run = "cba63464bda71de4d991719f5c6ad5951f4d581da6277f3864ce06882f7ddb1bb2050be9672bbe73bf5ec72d66b648e6abf6bc087de1b744d7d8f4bdf3a2c15c";
-  sha512.doc = "796acdbf56bb2070349a1d0ebba7287b457ff15a6f627511b8f141665baf64720670b40103939d1e6414e367ea50d239d6f3d77d3c2413f04ea67de801425146";
+  sha512.run = "6cd07126e942e53fc84d079b36e6078516977792b6b04d3e6ece0996ce591ab88346f59b6e1ba1f0cb7674f41db637b80ce9a19b643a2d7d57cd48c1f630d3fd";
+  sha512.doc = "8a9989732bc55f169d67ec1a4d9273a63174a3e24ed286b8c048717731c02063430220f7c5fa27d848efae2cfa96eebb2ed289a041e17e998ccff701d6487155";
   hasRunfiles = true;
   version = "1.16";
 };
 "pdftricks2" = {
   stripPrefix = 0;
-  sha512.run = "e352c063abe383664d95d3d0669ba42b7c41d0073eca43bf6046da0e6cc073a996e149f36eeabd8adb7e9284f2eec64f11dccaffbff5517f8849c4da22faf9f0";
-  sha512.doc = "3a995888d4b632263ae4dbcea10dc79510efc97a7a6e61056fdca2a553812be216f09146e22b6f36f7438aeaa3b8b1622ef8803d71c36b6e6162c58212e93f5a";
+  sha512.run = "0557236e2abf369844f2cbd14c12f3647b4258e53b66c643c243e59f19490ad24c519b413060cac9fb32d0a2098eb60d461491af952066cdb51d681077a36f56";
+  sha512.doc = "759ee31dcf880689d39b37fadc3105398193526a91849c1283ac64ff95870e07e2d97506fab2fdb7e1defa2d1040d29d126ce778d4d918532842d09ae32bb4f5";
   hasRunfiles = true;
   version = "1.01";
 };
 "pdfwin" = {
   stripPrefix = 0;
-  sha512.run = "fd5d8eb8aa1a2087aacdc11bab8f59a44afb5cb12366e43ef18e85dd8ea45067b59453913de3843175a9105b9bcaadeb9670d1c630be7c3ec12005ff8f193ea8";
-  sha512.doc = "d9e44f61a384fa499671643e1d1e6477a58a3f6db482707c452530c1c6331accc432e6a0410a04e86f63b9df9dc1550d0fa5673184ecf6fe4a3cf0f103c278bd";
+  sha512.run = "a1fe7c369818312c0c6c96e30686f79b1fc399c2c5bf1141db5218254fe25d96f77d7c01ecb87d5259d2382644f08b21046d1a7465cf01d1a254b7240aad844f";
+  sha512.doc = "34b5486cbdf80358dbeaedfdeb1dd99d7b1ab78b5e24faa5b93ec625a65a131d709b239f002257f5e095bffe6a00e4ff5d5aaca26f8d3e24938767759ae0d6ad";
   hasRunfiles = true;
 };
 "pdfx" = {
   stripPrefix = 0;
-  sha512.run = "914d28d8c377acc402b26065fb26ad7740c514b3aa75b752e8fd0e64870002870d58f391062c5e909e5d8abe15ebf0798549a8dad49de4630266c8aa6188f9a4";
-  sha512.doc = "9c0521e44dca12ae9c274d5ded49e956217d6105556ea87fffb6042fd3d9c96b10d50c35080bf3af8b94f657827bd076baa7ac622be57532b72f0047670e4265";
-  sha512.source = "096bbb9065a02a7bc84f64e1cc4caa12c2cb1cca16175c3551d2580affef7d27488d926320142c88f51c722a21a711c5b85f993b1b06ec19f941604bbfc95c29";
+  sha512.run = "62228a46fc90dbd67349629be9a4964fa184a100cef9fb6eb38ebf454491e98b76662e3c8fa7850303acdb16286820eabf60930d646ca2afa1bffbdd80d7bc73";
+  sha512.doc = "470ccb65f9c279dadc14d21e435720c5f9f34384e730527d9972dbdc585b7a3655d6ee47667562c63bd7a71a0a483d6d8df8d30e982a53c76b17019aafbe6b6f";
+  sha512.source = "14949f07ac6d9b5905e4feced096e7f55355443bca7176eb5025c967e62af968663f2420893f2ab7b9c0046077b646e80121e269ebb1268253c7ecdcdba59e24";
   hasRunfiles = true;
   version = "1.5.84";
 };
 "pdfxup" = {
-  sha512.run = "9026e4729d1ee798b84b5675ae586fdf1279b122485e6c8b04e6e2dcd09fa9045e07bd7b0360cb36e118f17256a61e05f9c5145ba3c2e6843ca9c4326a0a7281";
-  sha512.doc = "08c73707c64e418042deb7b064efb8888e383b5fe81b7e732a6f68e6bc33fd280bfb7045551bb772c08110a61ba59d16b9a4c9ba0542a730a9dbb91c88a2b1f2";
+  sha512.run = "c6909b34d1f7ced60a5a5f540ca6898bf159744c5ef2a60fbf428f4f0e784f73e12ff6bfe85367fda2ac6a5be616eac54be467ef0c283fc879e8846c73b66353";
+  sha512.doc = "f48822d648866b249f5917889157ded2b21b3adb0a4777b680603757920e4abcd8fe6b6e4cc6d978a14bd4a1cd5417fbbe2352d2f374d5d19d3f8a9768362343";
   hasRunfiles = true;
   version = "1.30";
 };
 "pecha" = {
   stripPrefix = 0;
-  sha512.run = "2bab9ea60b79bf5650fa2938687c90e69742ea2b4b98d78c2adda50192040230fa355273df9d187a0a74f8e8b0b141cbbca4ab0b12e65e94f16009c30f973a99";
-  sha512.doc = "7f55a144c4c063437a33aca7af7a68ebf6886aab0d94a106d1b7782c0616fd1e0c31d93e916aefa1e07851b62da188212b858b4f66938e617e2e74f879c906b8";
+  sha512.run = "daa2e215a94f648e717796c2bb8e576445c7764e774454c6f6daee098a7a8802f728e13281d6894c0f7ab8f08097fab05f28d668e1f6a7118419780aa7531b3a";
+  sha512.doc = "458db6d1200d61afc16550a8613f234e6d2ed4936cf9e963a6254e9ae814f19e66f8ae73552df520fa6e953142e075291934fa62698129ec0b4bf49af215b46d";
   hasRunfiles = true;
   version = "0.1";
 };
 "pedigree-perl" = {
-  sha512.run = "6b85e7b63af3777b0b58d1abdd56551a846de114815d3bdb31e815e0624f24a6783425887050b275a64a2434fcb86d712b0b7755f4b63614e7c3b333b835e9e0";
-  sha512.doc = "f343893092640eb2594d331eaea7725dd079dbecc14db67180dc4522885343e4498831778cb64b8d6b667e0a2dc0f6d3859d674a30d1edefed22cf2783f5761a";
+  sha512.run = "146d596df52a0df51c618308f692e6ba2e1d79f0fb8c49dc5e0e0164b4baca15164772f558d00f40ea34a9934ac21f6fabb3a9c275f2d4e008e655d6a4ac1177";
+  sha512.doc = "beb28e19bd824667d29e0a94c302994d1e9b21b69e9d4ce6027aa3c486408cbbb9769603003b7948839f95961353a1ba406ffefc2db90cc3bcc9a0e6754a43cd";
+  hasRunfiles = true;
+  version = "1.0";
+};
+"penrose" = {
+  stripPrefix = 0;
+  sha512.run = "6b25de13f9a14d9bc3526eeae019394f6f049bea0f9d8dfd6072e39d2814370235b8896d4c94c8bc44c93f8abb398015af6280ffe4e6ee9849f9b81cc8c43924";
+  sha512.doc = "f82e19e28f8efc0be7d716f2cb5e8808b3dcafc4029da4159c57088a985c6b5f7cb433c515e4dd55bb9203bdb625761af81cd9bceab9545f3273dbc8ee3959cf";
+  sha512.source = "cb3fb7406e4acce0b558c6a39cbef9c3e93e20596e79434f81372ab9d471dee849635d7296553831249d1024e030e748c42c34bf7843c3a5e8a2d90247368581";
   hasRunfiles = true;
   version = "1.0";
 };
 "perception" = {
   stripPrefix = 0;
-  sha512.run = "595085a45d3a50f0996000ca81aeeac9373556aa6963767ca3fc9270693337346f61acf023b845e644751858848af9e2ab53947084e12905d38f6dc103b10290";
-  sha512.doc = "2168bc855a10b51cf4058e6cba6651fbff20e0af91fb12c29a7a03f5e2f497041a74984997607492436722cd417a6b4ee90776a44df57e1449260446ad7ea4ab";
+  sha512.run = "859f188e83a650c8f82e08d41c22161c084a0952c89257e5f84064b9e400c5d4a2d634ee671d0c0e714300b8fe8abb774f574e1bba96656caf081336f9f5c016";
+  sha512.doc = "f36d6b097c02c00bf1d55adb8f6106ddd5fd2025de992f9908ccb1e855875c541924b84ab766484282a30f06edd0d6aa7da9146726f34fcb1af0fb306f7a0c0e";
   hasRunfiles = true;
 };
 "perfectcut" = {
   stripPrefix = 0;
-  sha512.run = "041b39d64db6935cfbd757f7cc0a7d18c6ac44bfaf5bafaf512b313d98127cb98242cfd3fdc178bc227d8d470e2d971df9978564a48d84050fa54b0e2a507f77";
-  sha512.doc = "65ed397bf5e64c1e11ba2f3d4a15be02c72bf5c3b05ffe6eed4663c9a172558330be5d720d37720acded9a18ee6b3d921205184a5e8b7b5d08bef89547373bba";
+  sha512.run = "369e739e46c167f02cce7206e1da7e33888da4efc2817253998392bc03c8eb59ea5e2468d7c13ca176bdce34128bdd31bd336505cda81894171965af80e6bdbc";
+  sha512.doc = "ad37367c16caf593b41747a1e2cb50fd5cb091fda638917e1faf1050844c35d4c1134cdca52ef29605ec9f3c8aaeffe3d1bac6d4b9713171c90fcb95b1d33115";
   hasRunfiles = true;
   version = "2.2";
 };
 "perltex" = {
-  sha512.run = "b9674daf70415a57284757c74968c6aa6a0cbff68e420d9263677507432bff84b59d7a9be625cf7be548567bace3301f7082df96c3a23fd43a737da714d535eb";
-  sha512.doc = "09fbce62f426ff10178843edbf398b55edff60bc5c8646e60ab9b51a4e6a3a1738c0198ae802be5053e4ca45490fe9e16eccc89392281a3f33e1c18d8b3fd31a";
-  sha512.source = "9d6128586b44f2322ea1829540c718a653eac19a3283d8618c393e40ec0497f6f5807e39a6252dd70c2d5ca3fa8b3153154d2c3f7e24cd316d4ff350164d398b";
+  sha512.run = "3b468f68e62b9c6e8741e8616ce786499924e18c1eb91ebcf7b452de00b0dd439414ea18a51268a04d15fd9ff9910ee61a81d45e6df72d1ef09186737203c5f8";
+  sha512.doc = "843ffc1c8bd416efc30ab6d3ae23f0cc47acafbc69005b2a56f7caabf8b874c66b0019ad3e3893e02d8832f95ce8af4c23e390992241ee4b85c14fdd662996dd";
+  sha512.source = "04cd318d0ae246caa81b482a2eea14c101055cb7b9dc95cd56edac478fb2d751e6fc03245037cff943a509802b9fa6bb31c58eee6b3ad45fc81e5fa0b308e394";
   hasRunfiles = true;
   version = "2.1";
 };
 "permute" = {
   stripPrefix = 0;
-  sha512.run = "c2b744ba603fa5d30545d64c6e7b97167b8a52a5572961c564c5b448305e4360cc632408e3f48aa6348d6b34215399016c82d6f0f75426b05662e7b83d96ae11";
-  sha512.doc = "da74ab36a229dfaf450f8f1a19a0cd0a5fbd57f76e8e77fdd8702b5e1b48eba28a825df0ab87a5a9c6accb881d93ee162b3d6b0e14d47bec845d07b15fe673ce";
-  sha512.source = "965147bcbb35bbecc99d74a48e497f55780d5685d4758684bc9201b6a31134dc7ff5d754bc760cec459ffcc2a023884d388860e6246e8a662ccbb656fb6cdc65";
+  sha512.run = "beb6fafc97af2e621ffd3280b0436602af5f47d1e18089a1bce8f5adcddf6efc6a5593b5807ba894aa0e12e63d89b1797483f7e0eff6d1d565314f923d83022f";
+  sha512.doc = "133b3a072ab9c3af8528caa24e712756adbfaa04446fdc2082ade1fc373e86d9e32218a5566505ca0a3618b1941883d159b3d99bffcdccb26b7dc042e64be19d";
+  sha512.source = "a2fd3c5bfa7a01db448c9fb6d454bc0c79b7fd337d3d941d69569f146c68a3aafa0913bf18d1824c953c19dc63f22f022dc840cb46f4751a7ea4ff7b636cf068";
   hasRunfiles = true;
 };
 "persian-bib" = {
   stripPrefix = 0;
-  sha512.run = "04d9e34d0aa4327ae327d24e64a9b4f0a920903461d9ca81932da877187e9822e39f4f7bf3c733a1debcdedc90035d0d58f398caaab4ee791836ea0928eab3fb";
-  sha512.doc = "bbb682e22a58f32d865dad7af7d8a5a16b8a118567b6097b8a9c034bc8c2e951f1892afdd50735783bd9a726a14c989b5cdc470cc199204f6db3e33568bef928";
+  sha512.run = "79c40df3289a698af69e25cebfc4ed688d1bb38659f0db986ce6b4dac52591d513c74d6656f31ffcd3a29673bb2f3dc47ff2907026227c811335804c7278c814";
+  sha512.doc = "5d8c2d1ba8436df5f5df467040ca254346186b6960d66a5f89e45562e375c492690a5bbbe0fc4bf44d17db3312eef013d9c43582c2ce22803af405f7a2c591fe";
   hasRunfiles = true;
   version = "0.9";
 };
 "petiteannonce" = {
   stripPrefix = 0;
-  sha512.run = "cf179a2e3b8bae404a9cfba8ec4a2ad61cb3a65814104756982568ed4526bdd98b7227c024901645d4e5b9e9a6ec3992d0894cd71ee613c2e539fec3a9f08a68";
-  sha512.doc = "fa875efebc8a06981ca17aa1a9c0c1c3c6e612b3d1e871f6982e5167a35b87e31fbcdc21c60655011a611802caea2601629b394c2241a8ba93a11d97c42dfa2e";
+  sha512.run = "45bc1b0cabe2051e50934d50618dee8765659a1ea26c2164b66d6dfc3905145df0609fa386d787cbdacf7d75fca89713a8ebec976aa4690d6ce65a5c7739c6a3";
+  sha512.doc = "02cbbb4781d84170d4ac1166ed3c4d15db8bf8b372db581c15c9e40c7b5a4a63c1d16d8ada7a67450e19af5b62bbd7128df15273c50975770234323df6685124";
   hasRunfiles = true;
   version = "1.0001";
 };
 "petri-nets" = {
-  sha512.run = "c1e90ba7e8e06b308890aed68d2d5487ee832a9110fbfd9d680d5695c67db8c769aec4a8d43ed22415c2e89f13e4930dd3c2d58b0518f999d3ba58ea1567a99f";
-  sha512.doc = "a12ef73af62bfff282690a4ca15a2bd773503e2e67ba7e49399082f13279630df000a3c50d2bc7a25a11116e7f95cd03c0ba234e23d2d3f79bf37b36057b4f07";
+  sha512.run = "cd6d799680cdb7063fe05f7cdeddf749a3c2dfdf3827193d8d3111a2e728a247a953c036c6dd9f8bd1c13c2be1fadb96fac73b99b47cb2cc61c8e8f0ad51d843";
+  sha512.doc = "fe466eb157aa99311d79c59f72b675b8106f88999cada692e908859ed8f2de13eaa87876dcfd327c2a7988039ce2494156b7bafd889835d2d3cc0e1cdaf533c8";
   hasRunfiles = true;
 };
 "pfarrei" = {
-  sha512.run = "3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95";
-  sha512.doc = "15596eda6e1c9c53174a17c76f6a36ffa0ecdf864f1c9f1077ac8fb75f7fed97f5d72b48ef553907ca6fa7c40a6c0445a130dbfbf040a5a214d4a4719ca08dd7";
-  sha512.source = "2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0";
+  sha512.run = "c83d4d1423e03ec068a57881d5f4154485337b9e51ca2253d05877d732542b06805d210d66750587d6fc9789d829f638bc7d3f20264d2b75083903622a3144c7";
+  sha512.doc = "d1dcccd68eab493dd610fc1c0ba7bc106c4f1b176c01b67ab3ec05a803f674741bb2a04102ec42a1b7c4a3b14bbbe2bb55ea8d61cafb47c2515fe74026085ba4";
+  sha512.source = "5def1546e4cdf6bf81fc32ea263b9e7ca19bf5778f939ddd58ab0a6bccf2c665814fe2be191feec062147f9b5570717f04685aea912972a9a51380b9fc3c0502";
   hasRunfiles = true;
   version = "r36";
 };
 "pgf" = {
   stripPrefix = 0;
   deps."ms" = tl."ms";
-  sha512.run = "509500fddedc8d340fc5c0eaed0ac38fe8164d835178ed0a46c4ea8652b21722c5453e0ea49147ff14706bb106b761380d6bc71581ac43277a47805fcba4571a";
-  sha512.doc = "ff69b853a52bd03736af64709a3fbcce68c12d9ad15ae03f882b7a876b935e656647c816f3e5318e2698c0d93f49628d70634e1e2ed6a8b759cca582f776511e";
-  sha512.source = "404ec4a6da67d901e9e5a7b9f9bb20eeb78ae0826dca1f93c9b7a791b44dc00da2fd5d9b54616a0ff208960079b32886108fea589381e6732e6c926e0d6d5e7b";
+  sha512.run = "24c342a0957f5fa6850bb17b7b4146cecfbfbb3db325061b946ac5bab61e224818b515a50d07f1993c00a4487ec023122116ea307493c4b36ba180d17830d234";
+  sha512.doc = "2af1882b9b802f1ec63b95084ad1b4ad0d25f87f223964d639e8bae412c031f4fa7ce3b2581f573c82ff7adbb29affe61d09fc9ca12d66f1c78611dc1fd0d9d4";
+  sha512.source = "73ee9e3f2eb347c9d829827d873cb7b4ef6e33e740214d68208ed69b0d506bc1a61baf7d78be6baf117ac5f1bc956c41e833af4031c7df109ab1903b42eacabc";
   hasRunfiles = true;
   version = "3.0.1a";
 };
 "pgf-blur" = {
   stripPrefix = 0;
-  sha512.run = "76cdf2f20a2420958fbe62060ff9c961f77c4c3e13a5b6546170524aeacf656929977a2716782af383593bf91f19a62bf3da4e994e1d1b13babd40b28ac7c304";
-  sha512.doc = "ae11bf640e741a129161e622b6d2bfa85ebf346bd5687251b299ff8a3254547051093dec42e5900d697009026418c30148375e6da35d3c776e45b9e128d20d94";
-  sha512.source = "89d8b5f78c6c6e94e0f2b2d59c8377009f82ad324b1ac025b99ba0df83b8da9429a77718e8629de5f5f43ce07a1358f14f6b281bc4ac0d6f83e842d8374ed50b";
+  sha512.run = "77bb0b5f6a176826abb39ed891e879c8ad80f2e8f1fa6b965b65fbcc22796227bd1520d1d80712034333d8de1e3eb6154fd1523bbbc575b6074e2d05c655cdd2";
+  sha512.doc = "c203cd71f7dc4672c1b5781161df4abebc6c6217d2a1f863ea8ac5024dfee0a4ee6cd4104aa4000f835317499fe9e887d066a3047f6e133106b08c251810a008";
+  sha512.source = "4a89acd4916d1d24b52b2a7c53c936941d1a8c0413a311f717b1bcfe1631ae801b1440a38008cf8ff8070f805b5c4fc3f714855f33377515114705955746c967";
   hasRunfiles = true;
-  version = "1.01";
+  version = "1.02";
 };
 "pgf-soroban" = {
   stripPrefix = 0;
-  sha512.run = "1e9bf5307bae44ac7da6dfef690dbf8997acc9ba5d4bdf42b4e40e12c27965585b4b203fe149de9c5c7006778a78bf086d790dabb57f645441113cf94c23c56f";
-  sha512.doc = "81da4c248af78306e7223c7af92b9de27aaa95f08cac4dbaacec0e9baed73717d090372e046d6be1dfc64dfd205634ea9b63067a752edaee3e1e60966a88c087";
+  sha512.run = "bb2958d282b6e16da09ca1590e6a2086b7c4e4713a4c2b810b354b9e2fb7554693e1b4d97ce8ce83aaf0b26eb7738cc39d0c09228558c3263d69d04b91176c94";
+  sha512.doc = "1a776e8f2158fb0a20abbc919ecb6d2d3d8c22c3964cae982477e9e7543c8a6230b89ce75fa9b59d5a14765216d8135b03b25772c8dd68d322c5949d336fe37d";
   hasRunfiles = true;
   version = "1.1";
 };
 "pgf-spectra" = {
   stripPrefix = 0;
-  sha512.run = "987c1c75209869037c811744a86083f08f57e22538378c546ddd58ad477206fe2c4f8ffcf210b9ade64cf48ae66560dbb3ae0c07c3bdda34fd1ecfc63774b547";
-  sha512.doc = "e9db08ddfe02d1c0886a7a81564a913bc14da8cc999d798f5f79546e55687a6991d3a18bc069ab214724682f72ed9832f895161be13e4f1cda031b0ea8350571";
+  sha512.run = "af5276df229fb1e003bb8d88b7548675ecf963d9925be6647cbce932267cc6e5813a52464475f826c710081a0d6cb2e01258ed6f0ec6eed99f55685be95f087f";
+  sha512.doc = "0aea4d8100d8effeccb483bf8d61160e22ad812c54ea02ebcf6307bec5a5e4bc55ae072666c2b06a2bffdcea0d984ff664ad59ad85561567eab1f0dba38c9440";
   hasRunfiles = true;
   version = "1.0";
 };
 "pgf-umlcd" = {
   stripPrefix = 0;
-  sha512.run = "2c1cb3b0343756f30e7470a81517a7c4cba6dfa9d3acbcc74912a3202a99552a877badf14b97fea87f586ae67527ca8a9f279151b91cf0babb0f5aae44741611";
-  sha512.doc = "d7622f46be17726385ea3e622a0251b95dec7d04a460acfffd2f863439f2f031ff55ecd14a0bbc220323a29914d6405c758cba2098c8201839c0cf54afb8dde8";
+  sha512.run = "c1d7e22910a8e455c10f86a2902fbf4ab017fc5d47d590c93d261daae859ea9983917dfe829f5d9403a83f482e37c35f7120981e623bc328b40545ccb6b0e4b3";
+  sha512.doc = "45739d53cd816c7ffd9a8f737e6a49ec6565168badeedd16bcaf4306d832cdf9e87560c50a3ba242d791109ded3891e227d05dbacd0d7a964d17237c65cb5448";
   hasRunfiles = true;
   version = "0.2.1.1";
 };
 "pgf-umlsd" = {
   stripPrefix = 0;
-  sha512.run = "99178a8c0fecd657dea94bff6777ae57a25f79757667ddc95859745e016ec25a382c879c5356ce7b163bab7b321ee85e161e131f3f5adbf3dd59f803f80810dc";
-  sha512.doc = "fba4f8777a58d98afe17b0cb04b770fa840e5a54b2cee88280058927807cf30ec97d69c1aadf99f9302cfc17155cb926e91533895016ad7c0a3abbc7f8ad2ded";
+  sha512.run = "e504bd7d0f5424d352d8a08e55a726208352123cf43a010a3b7e63090ddbb8080b0d35b5a83212699617a79edad208b8e0d7c96fddbce9e026d047205b35076a";
+  sha512.doc = "ebbc578e29ddae47dfa7ad838526f8245f4b1f44b7b4e1d35601742ff183f95deccbb9e4277a01d284e7e77356319b477158ad9f974264e0d1b6235ab41c4b6d";
   hasRunfiles = true;
   version = "0.7";
 };
 "pgfgantt" = {
   stripPrefix = 0;
-  sha512.run = "1440ea941ff7133922b8439dc1f634b4625e682037c76e866d578a7650edc0aaeda1c57bf26c128c624e842fe7f7d0372578a0da6d90a3da3851510aa8c2f444";
-  sha512.doc = "3602cc038bc22b6c5275679edc045a3f07fb70c66a12b9ee9e9a43b96c4f592ee34509a58b28a5f640657e270b8b7916295702c0f192c1602ab783028bee979b";
-  sha512.source = "f106adbbd82cb6192d114633fbf85f9b1f094d238edfdf886b9de46d695f61b43e0f397810ef85751c8e151c80a7ae114d4d463880cc3762202e30dbe763bcfc";
+  sha512.run = "ddf43ee604b0552b70ddd0c7a9f5f8b3f276583286d535e08586f57bf789fa1c8926509382069c96309b608296a0ca45609ccf9a45a974630dd0b91f86d289f6";
+  sha512.doc = "95e793e22e692590b84f346bbf65a4bfe7b8ffcaf8d0e35d5e5913bcc049cf0ae18f590124b9d1ec4fc82ec46e8dfc8d70d0c12f7e28ba726c5a7c69f437e758";
+  sha512.source = "8dba3c1de8397d3716aeea44462998824231c6c44d3c0f540baca31cc4bc5a15e77383786dfeea169ac7e3ef386637ed952a0d944b4ad8e2c70a283b55e17273";
   hasRunfiles = true;
   version = "5.0";
 };
 "pgfkeyx" = {
   stripPrefix = 0;
-  sha512.run = "3081742c740fa5b0dc6c6350a3df2e601ee394a6ce93044e5839ca134b54256db0f8fcca77981be5a86f4e6f232870f48328ded07d34de1498c5f4d868f6a6f6";
-  sha512.doc = "e81a1903e292c4fb099718fa2a09911b3126996952c88f7fc8fe238dd913139942a94d964280630fd1da38540b1c99de8766c5b4f1283196ca11776004950970";
+  sha512.run = "6febdb706acf607f621f756ba3206320e246b8187df50657131b17390195aa60187430fd56c17380276ea4cd560e49784c5750ef8ac6e005b856ddcac04526d8";
+  sha512.doc = "7878683f748b83ed9fef9a6b96071a2892aaa784221df9e25cbebe3dad8f5f09a87538b946d1587a1fd1effd841975648d98a4f9c559945c066657bcd8b6a878";
   hasRunfiles = true;
   version = "0.0.1";
 };
 "pgfmolbio" = {
   stripPrefix = 0;
-  sha512.run = "f1af80d7431a42b8c349bb46a84c08040e96fa6a122f4f6665c3c82622d2d61caf2b0fe6ad1d577cc00ab5091d484028da4269f081c7067f6ed6942b38284cb8";
-  sha512.doc = "c43217d235570a7f7333a0d68758fc3a6f2a9e17fe19e24516dac065cb684e7184427d640975117f0d436f7c74d3165da93ea09bc9460f7da2a60364eb393e4a";
-  sha512.source = "dcb982bbb0b5509f17312b584d9a7c6320802e3315daa1c79e77f997b1dc41008ee32a89e84f65b3f8c6674a4776253a0765f32d2815fbf263af87d89af0135c";
+  sha512.run = "529c7be36a2e19eb7508c52f380d1bdcede68248c525cb2fa39e69488da9d655799de878fe274f434d69b3f22aef31f24b89a60d4f688821af9b7722758b1f0a";
+  sha512.doc = "320f98e7bba6989e020ca829ca08f747e65098cdf12a8efb7f1cf58b74c279b5e5366a6df3d1fcc2fb6999d4af1754ea4d78db313c0af2b179a627d89b88e970";
+  sha512.source = "6c6338f15ef9532f4ba865c0a4ad01f5859a3ba3569b1223becc73a2980414b663bf52cf339b44fc6ece6e3b91c545d019de47b970ba78e79f9b7a3180932e03";
   hasRunfiles = true;
   version = "0.21";
 };
 "pgfopts" = {
   stripPrefix = 0;
-  sha512.run = "09e89d8b6bbc02aa373b91e3115c3044362c8c0faba0590881b009bfe98c5af6d50d373db7880e237a072b366dbc44b04c49ee2c064ba334ef9178399f7721c0";
-  sha512.doc = "941c04cc98677b9f8e87d3d5e6c6ac55b811a244c74eea9a34321ccba48527a61ae88097fcd2ef52f38727e0d63d4719c7abfb704b154179529efa64ad40f549";
-  sha512.source = "6a396ea09795bf8c277342b785ce3de5e2f9c9481834500c6f70878801e2950fc066f29880ade8660c527b80b30705883d35f3d42409324edcd9240681db8c58";
+  sha512.run = "f74fd91b76111b057f4898b5eb78bcec75d0bda6a80d0dfbb8cb7e2fd7df877c4c97be5c225f37e87e0507e73c20eff38e973a84a76ff2aa1d17a6cc25d47eba";
+  sha512.doc = "a47caf0c1bffe1676f2c61f75bdb56997d7eb8d0fe1b96f9d9dbc584fab2e6d7e0b8b47824e8af9dd6994389ce11928a962ace12666b239d8905a9c4c5994cad";
+  sha512.source = "1176e01e2a052f8f58d967c3f233cf3cdc34c8ed79f389c43cdada25d7b547e81fb83b1f97cd22b0e62c599523713c0e2dada1ba01bbef880a6cb15f1d02f032";
   hasRunfiles = true;
   version = "2.1a";
 };
 "pgfornament" = {
   stripPrefix = 0;
-  sha512.run = "3e3938e181b77445aee04da9fc422bdc867da556180c834115a6b482e563a8cf0d0843ca4d49f6b56976d83fae99ec603c61e68672fc192c900f5ee74779bdbb";
-  sha512.doc = "600a2aa16f942c82e32346095b170aacc8eccb13e534e65a5ccbff97e2b070e1c058e62ff5c96f8003bcabfbe5df911e271b6a3c49d658c67ebe52fcb9c2df2e";
+  sha512.run = "f56e5fd96ec4fff738c5d6371ea27dd32584b504fc1c977be9205d0a606f39e9d5807968e89007ad7c74492b6e87a5d5293fe8c8186ce1b40ecda09573991506";
+  sha512.doc = "99405ee3cc1e63a7acc29db2d6de13ac960827a7fc3ad1bd93554c54f32da431bf1795f0b86b3aeca9df46ac813506d2b34239a15b6d0ece09f96013e7971f93";
   hasRunfiles = true;
   version = "0.21";
 };
+"pgfornament-han" = {
+  stripPrefix = 0;
+  sha512.run = "23730bfb4485a80c5f21048ac267d2f310f7fa24923f91e7bd947593ad2c16c36ceede7c19e37c50826f6de22c3960a9adbcb52b2e7ee161e909a7bdcad0cf22";
+  sha512.doc = "2609718f0a2a83bce393980cbc0ca3eb14ddbb587a1f6f7ebf7da5fe3f73331564173a83be4ad4a153b159eeb4ef171532805352aead85ef72d069d4c2c383aa";
+  hasRunfiles = true;
+};
 "pgfplots" = {
   stripPrefix = 0;
-  sha512.run = "4c024f3e72b77573ac19f6799fda2d888501ea70573551191e5fc204d2d8a480a9f2f1df040094c4c4336fd7b0017624e05b636d6b55ecb88a3edd69bb25d5e0";
-  sha512.doc = "66f91688d772edc9e562ed3804efab3dec47298291c2a44a6d3c5dfc25ae79b1e58411cc68ac6d075dd1c6f8a7ad99a5c5089c93a58686a492cda576cacf804d";
-  sha512.source = "a97bdd94687f7af892dc07929d4243d8f07cc7bc07aff2e52998840413625f6dd652431aa94f69734cb96d2b56cad09fadc2c2c0978f9a80df31c13cef329e3c";
+  sha512.run = "58a9095d8cc670dd937d36b22bc0a2320ec216e05e6d3deb562d17fc8cef9489f223a02778064f7a56fb32c7fa7e03e2fa0b46f7bb493055cbc196c91c9778e9";
+  sha512.doc = "3174e7df66a6ce9f10e4705dde9523cef3dd64d509e07766dd131b01974bb39660810a6dd05810a3613de60b4c3fb8575770c249c479c65d38ee01257f6da958";
+  sha512.source = "63ce714276c6f54093b912c33285db3d2449dabd7a3127ef292ffac235a82d266ba3077e65e0ee76fec055b2413733ec55f836f60962c8fcb265fe6140b70359";
   hasRunfiles = true;
-  version = "1.15";
+  version = "1.16";
 };
 "phaistos" = {
   stripPrefix = 0;
-  sha512.run = "640da6cc7cbe6a0c5700905aeaf0c3b00716309f7f59dddcac6289bad0ed8797bfe0c7fd5dc4ff4927823a9b4e4d7a45c6d3e75a5060dd454e9d101d88bda30a";
-  sha512.doc = "e9044b9de4e22d567d8b277736061171c60246afc5838f57d39d6eea66291ef15cb084580bbda0db743a378b50883241a4074a0054787f8e5fe19251cd1c6572";
-  sha512.source = "494d52d1abd22c50f23a544d9f7595dec569844e595f28e9cd8a4fb0b31349c4fb28a5ad620ce02b3c94808764bcaa710a530ffbd1ab4e7b3d966f670e679733";
+  sha512.run = "4e237e9d608a425d647b71df70202a30d3bb8173faf09f308a992d79b9236eabc9284438a3abcd227abbc7614d0e0b4fbef787c3f352a1501e5758dc43d7fdd8";
+  sha512.doc = "da845e4f297ef77b42adb8114cee1f692c4e9096b432df4bb4aa799ca3f2de7271ddd2678dfd47883653133203e0e689c08d8c831ff7aa1e1f47da36ecbae6a0";
+  sha512.source = "81686af9bc6a8d6e45cea26fe6fa2c86fe9d93ecfcd34a1145d1488037e2838af14dd7e71a63f8630d6e8b321c300f4a175fa943a8cebcd996e02be042e3c6dd";
   hasRunfiles = true;
   version = "1.0";
 };
 "phffullpagefigure" = {
   stripPrefix = 0;
-  sha512.run = "9dcd546a7b5742519f67696a7bf0f5725ec2b1432f06cf96d8a1fca05b940e8cc8dd9832963758188e1839920849225024d1e8d3abcc45d423c6e51a2f82038c";
-  sha512.doc = "0c5248b351b5e03668732ab6d9b068ca57af630dd603924629931348416b0646a8e14629321e228c8e2ad7883a07617d0f8cac39fcc437d124427b5761322bef";
-  sha512.source = "6eddfa11c717f828fcc4332cd31c647d1580a1015b5908caef7eb5e5e2408f9a86cb1b35cba043b7353e086e06d2e4b16d87af4bfde48e63c2590737b40fc90d";
+  sha512.run = "eda9d318d498adaac64f0beb513a4e163dac0af0d68df04069e966abf5c78e35c419f99860b885c79d57a5f13bde07780c9ec6f315bb30848ce972a0c8c82a0b";
+  sha512.doc = "65c0233cc9144db078cfca998cd961bd3da882a82a0b0d2399b925fc92e45efda2408ed8388f760759dd108a92b877c13320272644fdcaab50782cd111d93d54";
+  sha512.source = "043abf71b2f8d54d8edb41c7d195a799677c807dba6ee406fd27dff356e3235132d02d083df58e9e82be0b0562c3b9aa8b6901984af9a6284fafd6537134137f";
   hasRunfiles = true;
   version = "1.0";
 };
 "phfnote" = {
   stripPrefix = 0;
-  sha512.run = "b9daa4da3136617c480b8e8c47faf378be9e5379ec556b731a120bd3db7694b16c48c930e8fa83521f94a0c7fc8dfe09f6b0d2d175935248cb5b84517e5cfc80";
-  sha512.doc = "a0b937fa952ff067bff3bd67289cdaa82b6de0395bd86b5c10eabb7749cf9aa15016d78a29e7289bb15e48ea11d797e552a34c478377a2854b3beea94561638d";
-  sha512.source = "f4d9fddbbf38536fdf0bb149317251bed7bf2e0c7ffd1df4fa6775313b062551e323444e3e994fe4d96921249f8b296858f64d5bd3ac8b979b35a0eb93b85438";
+  sha512.run = "da1ab71ce832e6f27bdb0f40628fced6b10e6815b039d55cf6813f6afb1fd864e3559cfc2306d5273311cfb79fb068366335621e8bf2558cea07bf3737916a3f";
+  sha512.doc = "d096651879a7e0b7da3a38130fb8478e03a80a0ede7a7099a1c8cab7a7a2defc268e604c745f11f8124ccf1d71ffcf76b2139a387f226d8fba162767cfba1f7c";
+  sha512.source = "b2002efc4d534347cdf276ac5e0894209a65a76d23a77b99c747c36d35661e0e2a0efed130b024fcf84e8f564c91896101582bc952aa64a3d880ef194df4057c";
   hasRunfiles = true;
   version = "1.0";
 };
 "phfparen" = {
   stripPrefix = 0;
-  sha512.run = "defee7563a0597dbb5e0cbdb64a7c2660ff75684479090951407e3e2c4becd0b68b3627e3d37660cc00c138d8084f2a9c96e6d46c8fbbdde8cf5ccbbe373e298";
-  sha512.doc = "d9be9b14ac4296ae033ac15c83909c7398c1d431975e99a2c82b0362e374138d44cb5146680cf2cb914f57ac1fd2c5dbfac949b1a56b10dd80777a11f38c29d7";
-  sha512.source = "214f9206c9746258cbd6576f3124f5f4ac6fc45f78c4e9104cb7bdb24b399bdb40c57eed0cc0c612ca16160c6757b0c01d439fbc4690f7dc3998d2141fc29a85";
+  sha512.run = "5f909ad07a60e5219c6e6a4a39d65bcd693f0ef89154d866b35139355d67678bfea130e86e9bae36560586760c8681cc194301e8ad823c20ff170f23c799f57b";
+  sha512.doc = "08ab8a17987cae72c7cd0c734b6c0e60dd3c61bf9a2b719abcc47bf55704c7896f07d8703606b34a93d8e693911991dab52e2848e313a173e462706601ab09e9";
+  sha512.source = "2bc6b68daae6b9f9099588f921fb64f4611b7c2e24811f408374da3ed3fb03ed6477a6582f98caf4a44bc4bbf579f18c5062479c351c1bc08fdccc12e49126a7";
   hasRunfiles = true;
   version = "1.0";
 };
 "phfqit" = {
   stripPrefix = 0;
-  sha512.run = "1af14d14aac6629c16cbe8b6a81f48604ba0fe0f53123992f5fb03ada3b1f3329dc5714541e93bb4bc97f121cd6e329aa3908a20c25a76ff69bb428976465e11";
-  sha512.doc = "45820535805310baf7c12c1cc78c4c4b587d2166686d911aef59fc3148b0741a7f72e22f988d8846d12f1ae9bcb03b3d42a92253087e19f2fd068c09d88cf4ba";
-  sha512.source = "46c487165abeaaefac02ca84a0a41494edfb72e97876cfd803fcf200c1054ab601dcef637cbdc5b8a546cb60402ee35df211734b0390a14f277ad2c979f636eb";
+  sha512.run = "bf83e4d7fc558c68b4163bc6bae78149786a2cfd0a6c627ef3252a7d06919e8080a20480a0f85266b9a29f1f83336c17a1e20c4ba0e7c0d5dc15886772f04d4a";
+  sha512.doc = "b5f64d4999133086642bd5f433212976d8dc715f9f751d850760539ddfff6cb82b4916b190678a2a76ad95c3504058e0aaf029a0c1df88a76db5901f583d18fe";
+  sha512.source = "b72e6662ded062cd35e341740224ca2d2cef70565fa000bd6873e9cbe0e5fc40451d62d7abcbb72e7931ac47ae36c80bfd10439544e529735f01ebbd87c5d3d0";
   hasRunfiles = true;
   version = "2.0";
 };
 "phfquotetext" = {
   stripPrefix = 0;
-  sha512.run = "b08b58eb84db19399aa2cbc2fb4d7d6bfc38be6c3b9bdaf1608ee85948fe6a80e58afe6333bfcdfe61c4d75c6eb460d2c7ab6704e70b5ca7112b98550fdd43b4";
-  sha512.doc = "d168dd51ff571e95d59e4fbe4cb6486c51b82088fdca3cbadbd8f9b8c2e08da1ac7e4204652b751108ec7aaef139ddc74fae54faa2c97425882c6febde0f48ab";
-  sha512.source = "fc760754b8fc4cebd71bf27f6d7c3ff016f2318fa91c348c2a97734b1a587d24a9e978848486fdd9bf203c3c2a950b6ea39a7b0e2236174e62ddd6653b3fba59";
+  sha512.run = "a4b9326348c808cddf69fea5aee35152c06cbc2d181a77552db15b572909af60ceaaf1a9343ff60a81e48f13cb41c8380437c16e27ccc6d6d84b7267c77125bb";
+  sha512.doc = "51eebd07efdf558a48875b42186489f8c220622f91fd86049b3d8cbd13eee9936c096d0065f9d3d071e5ef0f0b259a15b18bed8c19a300a2b4326f4462163923";
+  sha512.source = "ecbc1a070fa5db8b20e8ddb7d96b2dea032763b18d60a0613effb6b30069946649bdb424c22bba84da9af1f68cd52e9000573c13e7547d8d74bd6779bab0f3a6";
   hasRunfiles = true;
   version = "1.0";
 };
 "phfsvnwatermark" = {
   stripPrefix = 0;
-  sha512.run = "0d78512aa3fef50796e226615a4dd37df663b5c26ce08183c3e67cc40c9fb6157f3e32b0aaf8d282c84e5a9d4e453fb01940e29ad3d519fd73f35f8402a3cea9";
-  sha512.doc = "6fa2f678d06cae3315a38087c213f652b7d844106995e5d3c7e7b336b380fa393cb8355234e231daf3588f974017739a3d9da1e9a53d39db0de1a1f8102dd12b";
-  sha512.source = "84949f1dd948f91eab949a920a1481213ef42393113cef19541dfdac3a9692967bf8f38dc0fba55a6e187d0c1b8a21a0611ec47dfcb8c6303238ff68a33a6cd3";
+  sha512.run = "ccbb4fa15d35414e0c5124e32ee5455a959361e167890990e8154ec212d0c42a29ac1c2ee5d4e27c948ff34fb4828968735fd2a840acfb6eb646e0c45f3b3a1f";
+  sha512.doc = "53a11353a095ae9c5af998bf3dcebe74a7db2edcb4d03bdbaebcfbbfe40bd1388d34919a58160cd263d8b83d532fe9746551cef43b7d471c49e46b2603ce1b98";
+  sha512.source = "24873c4064ddb1991e44e1d1132eec2ab4b2a82670f25f6e5d6147bb7ef29f982b31364dbafd1f4f1ca15721fbea7a40edda6a1c86aae5f032c25244f5c8534a";
   hasRunfiles = true;
   version = "1.0";
 };
 "phfthm" = {
   stripPrefix = 0;
-  sha512.run = "bb4a7358cc995e1ac17c1836ab6bd6c3f37c70730b084c34b467ad1ada389b0f311a9c1bed4f12d5082859ca50ba1b1666c3bbe70fe16d601e3dd116b205af5c";
-  sha512.doc = "5b190754c3937071931ffab42528b564869681aea4d05a3eb90361d7e52398bd32f103edaa838d4744194343543483208cc45a3e5cb99c7cf235d9a3b012234f";
-  sha512.source = "a67c4b9d3043bc2b93a89d51d6173cb1f197a38f7e7feb770884fef099269f0c47e81900b920325a476e13397ce57da0f58c840b8403688cedda95800eb328e7";
+  sha512.run = "5614d4d6fe7e6b737c81c4405d224797c2321f15302c18b2af781055d6c8cf8aa653c379ca106f30df83eea4ebe40c6ca3f85a522384cefca1b1de4c685a9c9b";
+  sha512.doc = "28536bc2e6801c43f17458460cb0e52d35a4bf5a5d3bcc1141b8deef6de88a2a3c6398783af1fe182e122b48d03e119426947f3a454be28cb599bd2c597e22c9";
+  sha512.source = "f6d611276b1ccdc4a48f74c238ce6c5d759e8778bad1e686c19baa989adf53e33fa82537a3145ecbef969aa488b21973847e723c2f8dcf541a17e7d1a7885142";
   hasRunfiles = true;
   version = "1.0";
 };
 "philex" = {
   stripPrefix = 0;
-  sha512.run = "d7e54cabcc3b449aad2ebaeb31d668215b9bd13f5c1e5bbbb105b1892be8a4f1e36028f1caade0fb7c237e2843d55475727ed978698e7c91c4a4594de5f73ae3";
-  sha512.doc = "7438c6d2d897dd5fc6be6a96426f111cc0580c954ef8cee3d36d8b589aaafe698afd08a6e7651ab3ed72eaff6d6253d0201954921084e99bd7a00c343e177c2f";
+  sha512.run = "edf7f546d0681b28c504cfd0b86989ff88c7aa3d027905ad30e4965c47c8b9ac9d6a84030a61efc56cced60795a3faf5497e9811a12f34d80daa09bf352fcdb4";
+  sha512.doc = "92914dea3723d566f5a54b047ccaed17193e02e07b2f8c522753a11c3963601efc8a55b9cb114dd192a6b992c4f854eca10e9aabd534735b5780f79c15d8f23a";
   hasRunfiles = true;
   version = "1.3";
 };
 "philokalia" = {
   stripPrefix = 0;
-  sha512.run = "e601a448e1ed710b20c9b49b032139255445ea7b0e3bbc064a75c0dffbf05d4734d2e4579a9e5a643b43d9dd90e5b8d72ff21270d0ed4309f1243d026c85f548";
-  sha512.doc = "8d44d217aa96e9754c1cf1e968dd7d584c74b92c39ca18be84c559127b3a383c337997a19baf9790fb4d17616803ff48bb4dd95ff4d150962b474c37a6e1d542";
-  sha512.source = "86d39ab66f1b11b0fbdeb6329484bb6b0ca37f7a04fea1457cb52ad6a0b7779e70f708e30836eca9c4694ad5f82133bb03b1d8238fcdd3b65eed721a90319e49";
+  sha512.run = "e39110fcdb8ff5a2b6cd185d512b1bf036098685be84517ea2cfb2c8a529428163b3ad30952b41c2271f153f078dc452088cf9bd12180ce19b157a75739b59d0";
+  sha512.doc = "be664f8be0a2031a49aedb25f05288aaff7ad47276c9e2d8fe349c422a58c97c08e8fbd8528e444102a10d96b49ede58510f52337b764a3b1254a63d60c6008d";
+  sha512.source = "19b098ab92fb41e560ddabc26a662a9785d13a786e51bad2a9fff02eefc91580c0618432a085763eae6964f6058bf2ab88b1e7012ee73c0d6e290118024aff14";
   hasRunfiles = true;
   version = "1.2";
 };
 "philosophersimprint" = {
   stripPrefix = 0;
-  sha512.run = "b7eb5a3e3f29d793ed2258be862f71c856c64a4af5e6d451091d73bf53ad7d2dad01d56bcae964cf8ae0b132f6d794dc4b25a5868e9d8a58408aeeca98d019f6";
-  sha512.doc = "36a11c07f2ca7bb1e46e83ccc83bc416779e7958eaab735d66fb16c76b6df5ed2818ecdfb4b4c344e6a736a70e4d75a0a524cdb7d35a73bd71a7afab29d0fd61";
-  sha512.source = "cfafb69863dd65ba8e3317f8978cd5ff991140cf5512d116a4d58b91c30f991f92acdcdf55672169b4e2e2355adb5292ac23757343ab6e365aa5be79efe8291f";
+  sha512.run = "b9e5b828fe4e4b91a11c51e9ef1e499d672b10b3175e41ab10dccd3d5315a500c9fc75466f792f2f83920b2dd5ea316a4568ba69bc67a15cffa8852654df5d88";
+  sha512.doc = "b47ac4c8cd2b912667983b74beb0c6aa23904f9d5c775746d29f987d5c41d925e6360ec37f17727b746e24322c0cb225a3b646661f291fbe44ce8eefc651a201";
+  sha512.source = "7f2d980fb8aea8f1b8ff4a08fcd831775fceb4772507f8cd11714bd6505f87c73e89bc5955a3e2ae2a4312dfda1c80a369041d93f9c9ed89308b98e2d46b96ca";
   hasRunfiles = true;
   version = "1.4";
 };
 "phonenumbers" = {
   stripPrefix = 0;
-  sha512.run = "04f6d7e41e6503e1cedd57000e20fee3598b153c2e469f76786c0a04dc088fae83dca8adbfccd13b98eddfe5c4885e6578d3be61cb001e293dd1e086a88034af";
-  sha512.doc = "9b7ed92b6e4aa840482f2be24ec80861cd6fb22f7de49b2a912af6db8c19457d1d68887deaae2a3f6168225654d02bf043e9774d2df8435b2a10fd11d7c0671d";
+  sha512.run = "1f66ae909cc77ccdc3a01c07f4e019fecee7631db24010dfb635b54bc8676c84deaea1568232232b898f219f94a3a75e263dab7828a89ba30f68f3f3a3b55d98";
+  sha512.doc = "da4ec2c324e8c46cce9f3f2f1778c03c441956cbddc6bd05be56931153e255bf628c9719b384b381ff9d3988d26a0e1712a016c203fdf398da635faf5bb5096d";
   hasRunfiles = true;
-  version = "2.0.2";
+  version = "2.1";
 };
 "phonetic" = {
   stripPrefix = 0;
-  sha512.run = "270dd1cf36b93dda0b559b1606601e77fe2b7f99007ddf72662e67d8b561e4005fd9e120fb1503e7ba95c7ce71cb50cfd13dcea03b6377acabeb36b3ced8a9f7";
-  sha512.doc = "654b849276ffa39d182feb539e62f6227d3e2da098addf910931e8882542a069f760e3d66c2d4c9ece854261117b44e1a8498261b4e0847fd25c2fb0abdbf79f";
+  sha512.run = "fab8ac4463c53a15d0769245040bebc754dbb2b4ed282db8426b28737abc9ac5bd5bcb3180114fa7e9d2f0fa3e9ef403805c9ba099a967aa177d63ef89a11aee";
+  sha512.doc = "933f25da20e6e4c75bcc86fb16bcf89c408efe213aaa6a5402480d06375dbad80289d29559a09542adafd71b403a74b1fb03a439e836a070dc8174d13ec0853e";
   hasRunfiles = true;
 };
 "phonrule" = {
   stripPrefix = 0;
-  sha512.run = "a689824134d2a31e4303ef88a34f487715893c9d9e6b8d0e0a0094e3550f8d57c85b2de9effcfc59d27d27cda066db5755165476576dcf6ba12b4526973b2007";
-  sha512.doc = "db2ce3988c1841b7cf5a14a16c5dc451c10349349a52c273d9c1955a47d30066f102a02d344e445dbbc17eed64c9a23df712678db0b040154c131c70a7d7e7a4";
+  sha512.run = "28279e5d7ae76be648db4544f7d172aec1c13cac1e004b21768f8dfd84679304663a8973b47e9a9876e05938827a690a0a449b043ee31c69f4a3f0e5c0d9b1c3";
+  sha512.doc = "ba2a9d7416762265fe8bfa15a125436fe93330f0c8d8fda7da2fa4d4dc3bea11a52ccaffc0a18072a7330ff51f36d050feda661c95799d89719d1b1ba34d62bb";
   hasRunfiles = true;
   version = "1.3.2";
 };
 "photo" = {
   stripPrefix = 0;
-  sha512.run = "5a0cf9b729f7802aacf3895ca644adca90377404e4b15749fed65824afb74bcecdca62da5bd3d62b2ea5e6871373a84815984e68e229cb1fb01c94d742ccc7a2";
-  sha512.doc = "790205416c05efc0c9866d578d65003074d5e41719159cea48cc23c100e700764d55ef9af7f65f978110a89bd7a63e26d498a90bd91bb40af621187921a78347";
-  sha512.source = "10ede7321056f2cced7ef0131646c971c081004d615a5f0c855afaf89eae040b113749bfa02e28d41bdf8f31f2044b3a15cbeca24d1e2f3e62ef508b701e1149";
+  sha512.run = "fe3a9a5917ad689b4e1ba3da9ae3637d3301204949eb676f4cd8bc75ef823a5b2279cbeb88c1c90c404f9e535c504f78f88807a863e1502c3f0a31d448a98fae";
+  sha512.doc = "c0b75b2be340fc19b4e750fabd7d83f411473d185524c8bc23e738422731e2c089a08dfe2d8f30606f5b5057ba8b949dea02a74de3525a69999fb133b56705bc";
+  sha512.source = "661c507e2324d07c078f263da723ee63e6a8a41c3d5df532c4e2612bffe9c84b14605be05d0614c6fa3341dce142567c5aa07174b5d5b8cbad4f3e98efa1767c";
   hasRunfiles = true;
 };
 "physics" = {
   stripPrefix = 0;
-  sha512.run = "38dcfb5c7208d1e7e678df2bd464015850eb139df767e4b538fca2826325f8c91a59dfed929c2255364e0f9f0c4b935b6bf057ab06a12d719e63f660bdcad8cb";
-  sha512.doc = "38d876a51c3a5ceab9b55d1f57ad412973a3cf7bee87f947566869c10e270205bbf513e6d7aa8592280bd21a0eab1d6ec35254dd76abfb17fe682ae8b85220ec";
+  sha512.run = "f3b8c13b0887f065e7045d7f6cb6c9fef46a662640e64875fcec1a89c11908b64f12beb14de5320a9fed1e9b8a8a1b1735941cfac54de4786d22395e86ad8119";
+  sha512.doc = "d71a48281649a1815a9ad2918041e9ee3776fdb5e07c76abfb0604ebaa035f53879d777b5e6561e918edc8913651bdb3ac71c7b53801ce74dda8d489d0a7062e";
   hasRunfiles = true;
   version = "1.3";
 };
 "piano" = {
   stripPrefix = 0;
-  sha512.run = "92e6ad66c8dfef28065f8de02c29b317a855fc5d8589a361430994a96108f9d2b34ae6bac489e33d12b5422563f52b5bc559954771439cbc02d99dbfd83fd139";
-  sha512.doc = "6f00e8a483ce4c8627ea57cceaefff08be6e8f1c0258366aaeb8ff8886f47f42594e9e2f97c9ef5633790ea6f2dd13e298ec317c9e638a1d61b73e8413d941b6";
+  sha512.run = "65bec55df8c552217119c9c67355c6fa309a8f6a9ae13035099891aab991e9918ac076b09558df9dcad33b89c5f838078c2fcc0899765c0c13b17775c7fff2d8";
+  sha512.doc = "dd10f520f6faa69c875f80c9d6bea8fff2f32c97e949e813af5c2afae6a4aa651630e34c25c436dcfe8b59dcd14d4ecdf8a03abdab681295087d5b7fefd5df84";
   hasRunfiles = true;
   version = "1.0";
 };
 "picinpar" = {
   stripPrefix = 0;
-  sha512.run = "e71975a08222180c480741df02e1c08632fad319b5d9e55974ad34df962b60fba020bff1ba3035751e5ad882a39b7190c127e310265c3ba07ac142237683c582";
-  sha512.doc = "2c61ec4e8f441205390ac71b74cb8f557d9ea970c7c608098a70612fa3aae412461368d28f246cadb79cc475fb1f7922f5ed80207275393344f4847bb789b2eb";
+  sha512.run = "605a2b152b178ac3021fd31186dbb231385cfefc2d1eccf0ca79af445397aecf408e810a700bc538514733168e3251a9e84f0e43f6cedb9f829c20977cbb1959";
+  sha512.doc = "db69e3005d4d0405b92b2456fa3f0b131abe25dc7e9e89437d31b222919b2d5ae6dc1545405b657643fbcdf08d9899f9ae30e0d6171657184a8e7f23c2d0514c";
   hasRunfiles = true;
   version = "1.2a";
 };
 "pict2e" = {
   stripPrefix = 0;
-  sha512.run = "d6c1e132c21d9e593d305dc4cda118de133edcbe6bce1743f14097c85665a0a958bf77ccda3dfe1c7b0fc4f1c998c5a87a988386b66b8a31bdb6742493c39f97";
-  sha512.doc = "bb88d403be2173e9e0653925a40ff4141cd9a8833aa5a9703535cddaa6cb0f8fdb14b2d0a52295fe2c6ab4d6e5f64235cd6847404017542fdc8a819f0d05bf28";
-  sha512.source = "258e07c77434625fe81b1c6eb1bea7eea7d55e825dc98a5336bea00901586c26b8427f84a00f5b48c3c3ce1ef6655844cda42001270588769b16093ea8302cbe";
+  sha512.run = "d15febe4c834a4f11565a8ca32c39456f1f5255a72ec7c10e570be5f9f474f75bcd1de061e2cb0f12372f2aee6fac3f7e289a6474b3bad8aceedaf4f2e3cbd95";
+  sha512.doc = "6653e9e1decbdda3a025aa20ecf1065f1429adec3fb583cdf420af2971872bd05150f2638712ca5f9cced7fbce3cbc75469e625be4424b48a088348cc0b7e9d0";
+  sha512.source = "062bc6d02eed679f8384fe1a04ce7fb05b0bfdaff24848abd3275f94a4e6df57eb9ee6bbb615c240a49584f62c6246343cb5efbf2c09e24ef3a84d9686e3d7dc";
   hasRunfiles = true;
   version = "0.3b";
 };
 "pictex" = {
   stripPrefix = 0;
-  sha512.run = "bc9e0051f23b432958f95fe81697fe9c37bddf09061e1b87324fa01f3758875daac027dcc70380e573576e8b25380ee46875a578137349e1f12afc940a324b53";
-  sha512.doc = "98d6f41dd257184930c3b651eae16a9936538cd8096133d8651e779d1c69be71339a1cffb77fef794504ffd855d1189e352f24a48b6467314d12d9115390fe32";
+  sha512.run = "22c9827f170cdb4f7c4235fc214dcec69b952d759d4f9ed8b5a8afa22123dbfa9945cfd1eba367ec3063fba705b7c0cd7ad5efdf793fa48744fa37947c3d1dd7";
+  sha512.doc = "2f3deb63cae8aaab6ece148fe95dfd9bb984b3b4b7376437cc0c88bf211b091aaa48e80d39ea02ea0c68aabf1dc673b803a23b29f6eaa5977c01509d4e10c400";
   hasRunfiles = true;
   version = "1.1";
 };
 "pictex2" = {
   stripPrefix = 0;
-  sha512.run = "d9f2c8f866908b9e84f0e968a80c052446eb8c00679ec777f70bd9cbea81ff316c02b69cc113aa789aa934e46fe0936dd5f74f5bdb478d9788a3e107bf85f5d3";
+  sha512.run = "78f31ffbe24a1c91f6b03053f5a89d56bd8f20cdf67f13494a03b848d50e7dc6c3c175bf1df74ad59921e2b77159d8bd2f8c07257284f386462835ebad0efe6b";
   hasRunfiles = true;
 };
 "pictexsum" = {
   stripPrefix = 0;
-  sha512.run = "e70446c20df749eb2ad10934156b2ed415bcda53a73c53a078a9d9b8c870500ba703bfe8e758fad0be24d1ca76fc2c8fd5acfdbb43001af86f6c9c6cc2f66ff0";
-  sha512.doc = "abb1d1b9c5ced80adcc1869ae0074c939f9a899b09e5e90a5a1ba15ae1f3e97b28cfa4c2b046d0263413a2fcd904ff93d4d1ba6a5e1abe9da041f2f0ed3f0890";
+  sha512.run = "482fc6f1a7729623a50b4f524486c2da53ad4ab10e075336f92c9256471a96369b77fb62d5218e341207dce5aa8b0557192623db09f45a8dcb6537c916d7c792";
+  sha512.doc = "1bd9c7e7d7314631d962cf746334483527630f526076e07052e13bc1d1cf6f0b9b831e09788f19b834e408bbc1afa43215b684bd8e91a2a10e15cf976829a932";
 };
 "piechartmp" = {
   stripPrefix = 0;
-  sha512.run = "92af7d1bcde781108b9190c9c20e907924e6dc7bada9f71418b5bd2518259e7069882c2a0e9b1dc752dcc87f37129df463984d686d13bf893c513bb401c7dc4d";
-  sha512.doc = "791158ebf0b03401fef447c6ad08f0206136d6fa2e3e29f36d6fc2e9b57faeddd9c98299876d50b7e40518eec52fccaa377f055f3e853aa73011233d08ed024e";
+  sha512.run = "cb132337d5ad7a15873cce6b416e3bf4b097c58bc1d16962b6b858ee6094524f3076e24430e7ad7f50feb12f07011dfff9dbc2cbdd06cf454fa72ae7d7a11315";
+  sha512.doc = "3f28c9ea54d17bcee60853da3f1e2bcd623142d2c56d7d1eb48e726adcf232cf8be0c732e36f261cdfb35687c05f3260d1d11df493072ea801a94daf1c627adc";
   hasRunfiles = true;
   version = "0.3.0";
 };
 "piff" = {
   stripPrefix = 0;
-  sha512.run = "cc7ec01a4751d00488ba456a4e2ba9c062dab095bbaaf643ec249212f7fe27df09b167e80f77c48cda556ef4d1bd7c1cf026cc84dbc4fc285760ab8b3fec2537";
-  sha512.doc = "32c8831dac7472b2ac61592ecaccd9e4039ed29df7c85512cce92d8f2577d57019e74a319cad1e72e7dffc738ab00ca0f6fa814122cc04101a18706602fad92c";
+  sha512.run = "ca03fd39036c86626a3b3c36f3b017d81ef93a90807e9e24a5c7df96f53e0e4f74fc499daca51bd3fba1e37ccfec4094fccf7c9ce20d17fd33a89c5f8a62dd59";
+  sha512.doc = "0e0a69603bd80092c4e17cd9ba15dde276c68f255b5c1ef4d1dabbcdf0b4212cc85d36383ccf605b4b18e1906a208babd11db36e249795b4b9492cc51612d551";
   hasRunfiles = true;
 };
 "pigpen" = {
   stripPrefix = 0;
-  sha512.run = "51f41344a024af4d0ffc1ba932cb9f263c353861fde31e41ad5d5f093bf05f0e6cda4d80e00f5395a503d42954970115a1e4a4d019c7ef5ba87c4a1bdb56c004";
-  sha512.doc = "a09cc8aa1856b04685bb1f8151d5bf98649deba94c14e361f92ae328cd4c18323a3d61e02457ef44c97a7acd947e75781e7159b66c482e471acc2641c5c03a7e";
+  sha512.run = "6dac4af49e6b77d7757af9bd7fccd892409cb7bd09623d30039c8c62e3894830c3119a05ac3d26a1b3b23f0f9985b1a8c92d4dfba7c585dd53d6b90713aa82c1";
+  sha512.doc = "d1f7cee73bb9a07b5cb3fbcc9f8baf33725fb26e51a72a71776851db6a2c01b2a9b0f491575a023899aeb58ae47e84c2d1c8fac94bf4be69fb95d965eda25196";
   hasRunfiles = true;
   version = "0.2";
 };
 "pinlabel" = {
   stripPrefix = 0;
-  sha512.run = "8f0e5c30a0e4cd551b03733bb1ef48f04fb11bde2f1d074d0b4ab9896948d22459b66821be063a9ef6d21283ad8f2bdb71c7e5aab10207a54da773326c078d31";
-  sha512.doc = "9db7725ea354cc6b761f9712cf0d691262a67633ad46603bac3e37c01af9d8aafc2f715ef212917f938be62bc2081e09ff1e9c29cca894d02d8cb10f02865e6b";
+  sha512.run = "507d3449a9e977e6f308e391a1306a1156671da5a29f433bae55c1f099b22f1eb2a6b41af8985131349295b0a74a7cc2b76e83326f3f2e77ae283e09cd4bcb40";
+  sha512.doc = "59bc4d2ff33ec77afd20022a6c6a1f2db0c31b9af3147ce1fc7ee236a808843bca0378f4396df2a94db4a637cd91ea9fd07b021591f3ffc52a90f22a1009c98d";
   hasRunfiles = true;
   version = "1.2";
 };
 "pitex" = {
   stripPrefix = 0;
-  sha512.run = "e19d3d45eeb781ee4473d7b3ae43670ad27476a392bc48bd853e0e342d152bc7f5cb610ba6a0754fe0b4197a47a3f7662b5a1d8673b28644dae0739f02ec7558";
-  sha512.doc = "fb58836e65cd66d4e2c3946af1ff48b1b8b1f6f978399274d73765409f2f5ed83f7063b204129bbd21b50e2a666c8e74a6052a9e251b6ad841d11edd5b5518c6";
+  sha512.run = "7b950db7ecb87af1ed0626d0d06ca6c955afbfc8b1bb2b478d9a991498d243ba74d8e10115a443a981b3e0bb97795412f0a047986f64cd5a7dc7fbefbb5a622b";
+  sha512.doc = "65eb709e3894bef7b99b457941a2fd837817cd82ee623cb416b7cf7b02dd826e7c3bf5c6afd6ce8f713ffe72c6a521adffbcc3bd0a18d8315a9ba56179bf8a80";
   hasRunfiles = true;
 };
 "pittetd" = {
   stripPrefix = 0;
-  sha512.run = "d6cd15ac86abbc95dafceae0b21837cdcdd277760623eb5e49ae294922e7a1ae14e37197049ae5113c231ba8e7feaf3a808b4ec69786449702b63dd63e11e82a";
-  sha512.doc = "134315888cf008c7d77490656b14186f2b76336d55882db7f84fcb23c5c8e6b4fd4f57f29f46928656464a52a7dfa7f0069c6db7e4537fed451a10171e3155c3";
-  sha512.source = "f6d0bdbb6cffa1968788dea76be346a94d3c34d943a6afb3c29708f032778110756767744229c66f61e8e348472896d4c4e91737d231a6ab265b0ddc73466ab4";
+  sha512.run = "e3b9edb291323f8eb3b49f9e4c0f839f2f4e77a85358017ac68c78c6c1a88921bc48053e16c4da1c5ce3668ae8ca00736f4ff1ee019197dec5456343949a5e2c";
+  sha512.doc = "177c565aa8c415cabfe6f91154032cbb0d67135e9f6ae7b71579eb89e1acbee9da30ae2085f511994018d04b93fc31cd4d4b865c15fb7d4c32326909f487bd5e";
+  sha512.source = "2a7fd63f232f04329627c69d1a739ab3c81ae9217043c6d0837addaf48d8f1f229c6f649cfba7ba7e30eb8fd4b57408b97ea7c1f1881213ba348bfe8f491ac48";
   hasRunfiles = true;
   version = "1.618";
 };
 "pixelart" = {
   stripPrefix = 0;
-  sha512.run = "491c55f6d2a2af8c44a5f6d3e831852825045c998b3ad5544cafb33d6f846ba78088ea7410ac993f5a2a4a46df4fa721c2b7ffd0f14cd2bc703fd7c523c94282";
-  sha512.doc = "06c08e30b2e5871eb0a55b0fe22ea368892ca777ba1ac77dd87bec80bd058023d8a6a24aaffd6c3d511173b4d09c99dfffb4c7fa6c0d0b568247e883e41336a7";
-  sha512.source = "9749351978d257761980e1585d71f14bb095a00fe249dda4b474bb3a045c186f9fc6db2ae0cddc2da873fe865ba2b3f93b5fb491f0a93e804e84d12c5131ead0";
+  sha512.run = "014244e9e5a85b6629f397a86c3f709956182d96e0141044f4436576b7ae5f89bfca619201ad82880cb7351f785021fa21aab6222f84c93302acdfff00689369";
+  sha512.doc = "f48c8b96c544b02fd0a183794658c2a4a0bb15919e367d46770e81b51e2c5674d291467ebca27502cb3e89c901ccd6a1c4e9f5d387a6a12da3e7e08aee1b2fab";
+  sha512.source = "b1502155ab651560acf1bb0ce03046ecc88490b1a67efe801f570faca4ee785978e771b82579a6c40085fb05a5df41d010b63ccb47d27811cd12ac34ed526e99";
   hasRunfiles = true;
   version = "0.2.0";
 };
 "pkfix" = {
-  sha512.run = "5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691";
-  sha512.doc = "6631a03d1f2e591387daf7b87df7babd168be26b84b08d5547aaeb7eb0b5bd2d2193ecf92ac701eaec87496121d4318cc22821a85f622501e5c39d1ef0a277a1";
+  sha512.run = "53163cd13b4e2466474ff01e92d0b97fab73a30756f06db65c4dc50f7a9e8a2af0bf771b575ed7e65404620b34c26d2833ee0897f82d75728bc74f35d0154dc5";
+  sha512.doc = "ef411ae7d4533ceac526fd02dd775296ed00c664fa733459b89de8abc1e0259f45c30b667e7723b5141ae28d5d7541bbd0054100c2e51b41a01de589de58e8f6";
   hasRunfiles = true;
   version = "1.7";
 };
 "pkfix-helper" = {
-  sha512.run = "4f63c561f387e971b0fc624ec252a5783c53303c661e05bd21b04a26ce4743397b0920762b4193bdc93e6b23458b2e728a28b3b5a355cdd66d143320636a9492";
-  sha512.doc = "9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5";
+  sha512.run = "673856c42400e15ba230d627a8b21e07e8c8a61f62c5d90f6b2387ede1bba1c8931dd1084f7fbcd17651ad988360b68b532fb8be2451f11176c95c3e74f7b9dc";
+  sha512.doc = "886ced25440d938e756cccfabaa8f42747c4c19cda31fed6be422bddd2d5d228442ddcc8c7e0ecbcba9efd8e8d780afccd5790dd593d9671a515e8bc42c40701";
   hasRunfiles = true;
   version = "1.4";
 };
 "pkgloader" = {
   stripPrefix = 0;
-  sha512.run = "44abfe7c35252b114d37320f9d7d6dae4fc08dbcbad2807393016e6493fa8f6cedd89e6733ea52948f169c7287b0194cf409272b3d8e5a2f6b641c5de20a191e";
-  sha512.doc = "ab982861402af0e3e637b772b714ee68be3416cc2f1ee09c605776f288fe925705ab9c4007e6fad2e976a7b7d48f55742cc8a893603e8da4000a6569124c7f01";
+  sha512.run = "6087da3f84553e9ca85460a55ab207749e81e78fd65ebdadc5273b0817bc24b089d469e6cbd783caf970e3235441ec9a8ab3250b2b0d6fe25c8d85e6885ee4e9";
+  sha512.doc = "b957abd848419537609365534d4794028f7af791aeeedced5b26e97b56809f58793cd45e1497d0c727c8020e169e619bc88f300700b3d521779e22060e797651";
   hasRunfiles = true;
-  version = "0.5.1";
+  version = "0.7.0";
 };
 "pkuthss" = {
   stripPrefix = 0;
-  sha512.run = "e5bf31c9bffe4661da270b030d063771d0827f6f3933bd2490f83a7f0877b356d4b08f73f22a1fc1568337a469a2d0090f2ee313af812fb0b1210817d2a616a8";
-  sha512.doc = "1163c142f7a2e10e453031d5d9b1cb6f887c21c8a50ac5da7ef4dec20286798614524c99f335f58dfb68bbb3464a42c11d52d0ec30572da6e65b09498081600f";
+  sha512.run = "2525c72b11d760dbd4075aade89e7d1ce842df72f27364ce9f60b9f245d8c4a7492867d98428aaeba775ecb1a3d599941cc5570c2cd46a5f90babeadb371b4a3";
+  sha512.doc = "842a895d4dbff3c657862a6df742ef335a0e84798585807e4de0d73c7ae0ea951013f92687ce04a68bead9c2536164112bf064535ef778a1f24b3a5c58d781ef";
   hasRunfiles = true;
-  version = "1.7.4";
+  version = "1.8.0";
 };
 "pl" = {
   stripPrefix = 0;
-  sha512.run = "bb6910b5a45b0fca78f328194091d44df1bb3cc60c2951b13e5eecbde246f4551c32ff032d9865f1f403aa580f642e35654f5aedb06366cda955b8f3edbf67f2";
-  sha512.doc = "22fec0634637c9f12c75fdf5700362f53bb462f9e9ea2fab5d2df390ff3ca7e443c777f8758ed63668374d21cbf500d6f8409ebb569b35a9acdae781f7da4cfe";
+  sha512.run = "4a15992ab0c6c1352e6047582b5ff86469bfbd7f02995be4ebfe49275d39acf80b1e409836d8a5e6fbeef8ce8f5371825091a9da6c98b2468dd98c133f2eca40";
+  sha512.doc = "d1a1a06e2c9d229c8cd7476322a498e0bf2903e24cdbb35951a92935d706a799043061d0e26425b1ef9e90b3b04237f4d9dc6c979d8908605b74dfbe95e27aa7";
   hasRunfiles = true;
   version = "1.09";
 };
 "placeat" = {
   stripPrefix = 0;
-  sha512.run = "96f5d772c6c77ab0008a9cacc3b007509948fca192bf9e8d1864ded209d0f0dfb00e9a59d07ac327329e35a249d46cdd0874765154aa28dbd58f764b39423091";
-  sha512.doc = "671a7843c26e7553f6586bdaf78c116983cfe7b602470a876b875dd443249219b3fb0eea7fb64ac9c499dec4ada6204c82dd71322e72ba22e218ada56325e176";
-  sha512.source = "d7b47bb81c15f5c198eccb843fffa7c768f9517e4e8ed6d8931c3532d332a95a815164b8c2b0e983992f9e18198d983d48e3dc93cac36191a612929393ce0106";
+  sha512.run = "5bc3ebafc77719bdc477a1848cfad1288820c592944fccca284d3cb1b671fcda59b229ab93447a3ec3c40e2e99b6b7ec612943c48917e5c3628cdbfef8647168";
+  sha512.doc = "c12a7202c55f4bca9c05ef7c74e315b6f71d270eddbd39cd9d50ff882e0a4a12001e81aa8fed37bfe4c4300d8f7a0525efe49e11beaff604db5ef6a6d949b05d";
+  sha512.source = "4990186a44675eb67dd27e6b1deeaa73e3e948071e550a236342ed709ebb3acb31409266fb3d1e85566e3f8b59fe3ba44cdd21fd23ea958e1f1836e89b0466b1";
   hasRunfiles = true;
   version = "0.1d1";
 };
 "placeins" = {
   stripPrefix = 0;
-  sha512.run = "2dc27ea0821885943a5c6dcd22d792df1dff6c3337ad412833c6bc346316684ec096ec331a017538a2eb75b70f47943d9681b7ed4af89b0728c32283929ce452";
-  sha512.doc = "2d3139db1e6fee0b55242822928435d3cfac70908a5796159d6f360bd506a609f8893ad53434d42b83e067111b143aae1718dab9bce73a04b97358e6f83f6fe2";
+  sha512.run = "7187d061286fc3b454aaca5456f1920b349878d8070afd03b3078167c369133ce5e114dcc42490196ae98d00ec6d081417f82bc25b5d6a2068d2532195b32262";
+  sha512.doc = "3f3a25b748cf80d9b5b35bb5af300389fb9aac1b8f64352aff854a5537a9168433434bb52b8567a2acd13ebc89f5a500d2428de974b234e37b417d5093bc6cc1";
   hasRunfiles = true;
   version = "2.2";
 };
 "placeins-plain" = {
   stripPrefix = 0;
-  sha512.run = "2c818627dc1df57508c47b0baefc454440597833bafee0fc4153f7350a179baae99717f53ca400f7989265459d7d48911981885286202b0b5ce2f9db17df81c6";
+  sha512.run = "0e525e725a599af304cba87b9ed9dba588937935427c6666de2cab47c0c114d5b46fff0b7cc0512bd32e6d4bf032a20da1d945665b2ad27cdb1d7c1ef7122af4";
   hasRunfiles = true;
   version = "2.0";
 };
 "plain" = {
   stripPrefix = 0;
-  sha512.run = "af91bdb1b749cca877dc4c24533d17c7e19f5df6fa90dd002c357d3af4cf5a688440bd4c16bd9d50a22272c3edcc2e8f011b050ed1c10cf5be04a06bec462c2d";
+  sha512.run = "bb95609bc13886773500fa0338f277625ee72b81e71aa7def3e3ccd97b8b9aed58fe0949d3843fecc96b531a1ac42f33aecad8df8bfecf46dc7b24ae46b5444b";
   hasRunfiles = true;
   version = "3.141592653";
 };
 "plain-doc" = {
   stripPrefix = 0;
-  sha512.run = "f8f9fb01c3d0477819bfb7fb5606c66b3067bece12ff072b26729db420419aefb8d20cbe5dc0d831f40a301c69b9e2a385acf4e9ea752ce5817aff2f390a8a2b";
-  sha512.doc = "264cf9c8cdbbcbff5e711419018b9d7b728fe640b6f7f7f03fba4675b7bcdaa3ec70fc89f4eba044f5ce2ed5a741e372f553b00190bca85012a0a8832f24f888";
+  sha512.run = "e551b1ae0a4e0ec1abc1207610bee6de222abe866f71967606b6c556d42211d82bd5736741bc1349d83f99a159847a59c6101aa3a67c57a780a6bf1907bc479e";
+  sha512.doc = "04d35d5790ab5ae4bb0d6b6f73cd9a5e412ab0c02829573d3848435189bf86f14badefcbfbe7f6405523a9a80e15ce1681b3b066372fe5c811cee18141f9cfb2";
 };
 "plainpkg" = {
   stripPrefix = 0;
-  sha512.run = "cca83fef6f450db7bb8e623b17c6cdffd9718bc16ddc462c5e8fdc3610a834c5c187771821fe70a8a12a19e5d5522fcc21e3b7fa79496e30fee04a68e185cc65";
-  sha512.doc = "734ae5e52403c3d14d3ba9bc360bcb90625c33cb85f3534b7e7d0ef2f354ee26a04240e99d8f48111bbac79ee018b8272c86b1e5479bb7bf64028796e14d39ef";
-  sha512.source = "dbc714a2c040370c04bb4adec138792069612708845ec38b2363eb0c287b3d5c509c82b75ff4366f79988f3e709a6e8c69a90770db652abfe64276bebb86b55b";
+  sha512.run = "7072cd339b5cc620bacc3e91b2d8774eb1a1ccec56b1bb0d3d7b18b00ca0eed6d96d0723aeb927451550ec1f093fd4b2ee74fba5eb2518849b285fc603e8ed25";
+  sha512.doc = "bbbb8c0fe4670bb574a4dfbcce5c818b81e7ee2f28255525532ee5a23a8604d80373c9c12b92e5a1d639aa3dcaa42a2975efcc5ac61bd8e45fc35eed8088977c";
+  sha512.source = "da4589649cc674dee1c3605daa30849cb2de4fc6ac2446e68feac6fb7c659b23b0be32a5a84d38dd401af2f002c69be4bf0e89fbee1a1e3614f10b0b3e71b2b0";
   hasRunfiles = true;
   version = "0.4a";
 };
 "plantslabels" = {
   stripPrefix = 0;
-  sha512.run = "de3ab6d45cbf38470994096593ce5cab19c8a064858c827d1259b0c464017c879355957dc73c88851a6700ec395eb4b512b02d1450e7dcf3bd668732db642062";
-  sha512.doc = "67af29487f04b81ce3b94680570cc026e5b4623f7e7dc8fb1d6b9a8a1759780e67799529c6453a367a20a688b84eefb0437a2871af05fbbbe7a550ef2e538e0d";
+  sha512.run = "c1df3bed9b03f0290d41ef4ea46071e8baaf3eba3aa8980821e0a6ae3534540c150f2cfc31c0f77f554b4e2491878705b3747d175a7b1bc4940638833d18ae7a";
+  sha512.doc = "ef94665515ef37a85752647d3e743d1fb42715a476fca68d64c37a7dfa23b61354d2abdf0d29e8fdaf9b2426377ef707c87152bbdfbc3c2daa31b56e689029a8";
   hasRunfiles = true;
   version = "1.0";
 };
+"plantuml" = {
+  stripPrefix = 0;
+  sha512.run = "21aec60872faa4b920aa192738e732b148864fca0638bd4a602dcfc8ec46678b2be5f732406545db7fdba7772decc9f0abb0b0c5ca47959fde555cde2fde3b7e";
+  sha512.doc = "8bf931f9ba79dd2a55f78f01101de7e9cff3d9e71e716067d6274fd2b6e5b5e83259c99823b2855efa5f7b67bb0c4adb15872766693aa5ae68c6625d976e19f3";
+  hasRunfiles = true;
+  version = "0.2.3";
+};
 "plari" = {
   stripPrefix = 0;
-  sha512.run = "8c7602bae41feacc404580f899a671a17b18f6382a43567ec0578adc2a34a2d8725d45780661a2e5743bc79244ac5ba18cc57fb459a2cb1351ec5ec0981f3044";
-  sha512.doc = "a0dac100af6566dcd017d171613102c79e82656460e38831cc3063d99272adbe98c6ebc9d18f437a8852e251828f98e245834795d2616e95b7dc2c73a4d13043";
-  sha512.source = "3f3b9204a45a55a77377c576ceb3e211f0922e4ee1055ab31f36acf3fd011412dafb7bf687c50abedc3b900f434c73ada4679c012320c307b59ad052a400a3c6";
+  sha512.run = "68d06d8a5e6d9332bcc752bbecae9f0d250fbbe20ee8aca9bde4866195866fe992cb38018e685956aeedb237da25c06d38bc5a98bec2987554f1534a3a3ac5c3";
+  sha512.doc = "86b3b1747fc6740542ddeda397b257c0a4489cae1d12048b880f57e1cf1cb56ada1cbb7fb7342cf283d6401faf9c319b4de7aaffe26b574a0f780cded3510c6b";
+  sha512.source = "6f9776d8b13afe27f8804ec4841db1c166eadfc108d557d0433832215c6ecaa8698adf2b75e8a8d5cb973cee8152d3845be8edfc8f05b9b20650356c69a13a3f";
   hasRunfiles = true;
 };
 "plates" = {
   stripPrefix = 0;
-  sha512.run = "eca1ab1f89f13c0938bd4976cd983a8b52c63c2da8efd1d8ea97eea22ae6f97f7368943b065403fe3a335ef58d6eb8a620b3696a599dde35c07b5201800c8595";
-  sha512.doc = "3de315b9c8ba1a0fe18802ae8c4e69c0e31fb64d28bdbfbe6b66210ee17a0e7d2e082d0c76cf46a69f349f90ffb75637fa08f3c9b0fb079f1b9020b05b2df32a";
+  sha512.run = "89926561c815eac2d14917a1656867cac4231a4721aee1e851149b6536feda8c32bd59d12d8ad5a91280681b7d5de08e9538c55835edc93130ca7af451b1ecb4";
+  sha512.doc = "8ac48e03510312f54bac0a6bfb0845240726714400c90f7bff378e121c889c07eadc0b0fc830fa1fcd8decd9989a8655fdc43f533b24af0fe74bc7f231362deb";
   hasRunfiles = true;
   version = "0.1";
 };
@@ -20129,156 +20693,163 @@ tl: { # no indentation
   deps."latex" = tl."latex";
   deps."latex-fonts" = tl."latex-fonts";
   deps."ptex-fonts" = tl."ptex-fonts";
-  sha512.run = "ddb8bce525e62ea28a62d71e3e33b7886979ef91d9a502b88588724b493a956e610bbe8605353efcde04b43f591f5bb8e9566746843fb05c34f53c77a0a57230";
-  sha512.doc = "8ed05722173ee32bc58accfc7c20507524975d7c56f45f24660f28cf66cf934b7a39a6768a785b38533f761a303728d30901f7407736ff7d2d3cb50ba5b56e1b";
-  sha512.source = "b2cf6806d5f714cd78c0b5204a96e6f5e75b6fc3107dfa38d5d9b44d6865f352ed7e2cb83b6791ff03ea2a366a7a914b3a922f6029f35d293722508b586b28fd";
+  sha512.run = "220819ca572ca1620a2dca4daa1df21475650d47d8aecfdf24d59c5ea8c4be5be69bd1cf60e0dbf5e29423726bb9b961869fb68933b27487c53fdfa530befe48";
+  sha512.doc = "ad25b27634e0cd6039120235578fceb1610408f137889fed3228c5aefb60f073053f92f53f81a718757ab786aeb7726baeca46055e5436862b93285c2096541b";
+  sha512.source = "06cf805ae34c77a25cadb5c7bf38034760d6feddd588c12f0e29246b512459267724acf4de36d5211eaf60e6b1e14734ccb6209abd8a391ad2c0ba1f54725cda";
   hasRunfiles = true;
 };
 "platex-tools" = {
   stripPrefix = 0;
-  sha512.run = "3e3edc11b28da38b8f18a4ccc5f6ebf1258b131ea13cd06b852c3a18fc840bec4632434773d12eb74fcf82af2a8016467680d400a3a23fba2513549091f8c063";
-  sha512.doc = "1f6992d115497cbb3ffde2e840ca4706171a16b3e6ba3035c8dae881b255c591f8012619acb08248affdf69e5f743c3621d2422d7c05ab6de55bd00fd2581776";
+  sha512.run = "d9209ae9628530730773aa2c2c1b838a54abd043c9606c628d861ebf34e228a99c867f7e1bef4297d7549a7dc46c86f38df57f71b21a739b1b785dd1c3276106";
+  sha512.doc = "d4b9323f13dd3e7650aab03d3d359a05623f6fa825cb876d8ae3e9ae9c6a4abb831833664c2d6426c90918a24010116eefd86b8e6186111dd959839a0a24db5e";
   hasRunfiles = true;
 };
 "platexcheat" = {
   stripPrefix = 0;
-  sha512.run = "7c0296e18ea17fcf816725c2396783d013403701ad00515979b6727ca2aa9f325b1e1c7cecbaa2ee9e882489793de6fe4076edc76df91d9d4bf56392b9db9054";
-  sha512.doc = "323fb0625fc5cf2607be4129351aadeea5cd8df6aaf5fd866cda5a625f92ba369507949535f691cbae649f14136b29d153f2b7e026345fbb4cd009548005488a";
+  sha512.run = "c545e22c05dd66bd62ea6b896d1e67b6e6791668843580422447ca144f148feaceaa14b91121364b695b823c503e61151fd5c48f41220dbe040875e65d43f397";
+  sha512.doc = "f901f8e157b1e34bbd35f5a2a56dfa485680f276c21160a800f6a577ec6cfba81cfc1981cbb690ad896f45aacf70f1b45d3046e24353bf237dcde4fd1fc46333";
   version = "3.0";
 };
+"plautopatch" = {
+  stripPrefix = 0;
+  sha512.run = "dccad206c575996be6a4a7fed401d2ccc044018db13de0fb85d9b6ba65d045a5c35d5de99437ef8ef39ff1e25ac6843d628258a3da97a2b2a4e4da87da7ed5ce";
+  sha512.doc = "760934d736379819f90d2985ee164b5d9b7bfab82cfabcf6867ac52732a175602622e5d834cf8de328a9e13e75dea863ae2971d9f73a8a19e12acf76b91057a6";
+  hasRunfiles = true;
+  version = "0.3";
+};
 "play" = {
   stripPrefix = 0;
-  sha512.run = "35d6643e452d8145555e3c56502831eb6dbad9bd6eebd8674fe45b21bcbc2a7ebdc12566c5a926466c96eef61880c170cc3be0afa25f5740e5b01beeb6d070f5";
-  sha512.doc = "0940cc70357c75593ff7e4d24a9471f256585ad64ef3f0193fbebbaaa4b5c99adfe49de3920893876677f1605f980186706d8ae794edc1a495e28fbe6c181a17";
-  sha512.source = "eb7b6b953c744fc71a45cd6e4f6e7c05d17e50de647e303ddbb4b80a8ddeb633f3aa80f3158b75ae31100bd1c9e085728010c633dcd49be863a44ae34b73ee58";
+  sha512.run = "228b3ef2d72ee0174937d397e4da21c55d9404862f6549bb7e9e129f7fcf5ad2816ffc8612cfd03d7cb9846ed3fb239d162c68dd92bb27542eb7e606b9f43582";
+  sha512.doc = "0f5adc57d3f1e4bbc2b6ffdc78415085d5cfaeb4750489e3a0ca2dcc1558a0496223ee5610282652444b9f8f418f95863f6acfdb49e28ecd7b63b6412c823e37";
+  sha512.source = "7441585f8c75d9496fdc4084c24b38ae01e36f24617347b22e256c7914ac753d1703041b5da81caf92b4246f948bfb70d7c03d950259e6dd0e577163c7b4b413";
   hasRunfiles = true;
 };
 "playfair" = {
   stripPrefix = 0;
-  sha512.run = "b36901fe4657b7cf97cef6e39c97232a206125f28a1c969e8aa7444b948306fe824cc03f6700e6aab50618c20673ca768b4cac4e9e90ad390447b35bc7d106bf";
-  sha512.doc = "c96b5c36df3fd2e1717b6c8bc3e36d741bc56e832dae5cfa534fbf23c205b98c19e47caa8dd32cbf492b4dffa9637a55949f68446f17d5ce31e277274e197d3e";
+  sha512.run = "d88f5f8695dd49637d0ac044f006a6ac9b3e7f6c7251f247231918b1696891686bdf01ec09683f29ddcca282a8a4008792dad80034dc01cad17aef33df541c59";
+  sha512.doc = "b0ed617eef20b55ca9ab8e1393cace2fefa3048a0669dc9169b19026555510412f310250484b5e02ab48bff6a9f2df8724105f2e238a4a7a8a58180f75fedb8a";
   hasRunfiles = true;
 };
 "plex" = {
   stripPrefix = 0;
-  sha512.run = "320d7f0c0e78c719a8496e683a85baa16f29028967fe7db906427ac3da923276385b12b99ed7de8cc3a01c975ac268b3d881b5d4deaf43450278ddc72e3d37b4";
-  sha512.doc = "0db5afd120b85687577270806469be6dfb1ff1945482ce06533d2e6c0c8009180d7964835c4366f7c3d6eaaf4d6ad41a4fb33cedda77dfcbfa8b855c06db1a2a";
+  sha512.run = "8e75431f50208845833b5801b6ad57a404d0c12a8f8ac236dfca294c8ceb54adc9e87417c49ddac6037cd6bac22fd08350e331bebafb6c04667f8ba2e7939e9d";
+  sha512.doc = "7589ffa741bd047e62d04b45c0e9a89fb096813001baa2390062ead05cdd3ecf7e175f6f2e858e59c49015a3e32e3277fa80a7b1f348e4c1c63969b28e3676c7";
   hasRunfiles = true;
 };
 "plex-otf" = {
   stripPrefix = 0;
-  sha512.run = "4905bcd3990b876f453edac23830b8cf019aa8f73a6e5ccdf85f18f6a4d6c140a595e371e3b1f77acfeb0c6aa0050fddde301e1ae396d0882dd7922d06c3d35a";
-  sha512.doc = "248f99cef59dbc81352ac81a639b5da349cd332ad383f6ffbbc019d611b81a870192b084d3ca96e6c6b9f5e9e96cd697e254c2dbb77243a4596ff09f0c0e2c8c";
+  sha512.run = "6c74a6cd3473e490b37fd694fd8b5b3d0a5ab2cdb834529045023f1340c19a45f2fdfdc79c074d3b81e7b8f6eb0b4d77a92305fbd0b16478d1cfce30ba71aa67";
+  sha512.doc = "0ee702e79a835ae5b9096929c648ce621e914e07f8537a394d20f3221af5b1c12b0d5b78312ff8d4ea2c034fa63ff9652e465ad0b4b8950d93238d6d512a992a";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.07a";
 };
 "plipsum" = {
   stripPrefix = 0;
-  sha512.run = "1f954f60ae7fa423431d97b17a3599119191faa789f65741caab614b93777f10a5b88120b47942f5b87ef30b93215dc0676b5ed661ed08ddcf73b354405a2c91";
-  sha512.doc = "9835349cfa588886479cb4e0bf463aca8aa6e14503fb62995c9b8c2ac7e6d923e3563caa0c2f197e1bc2e20ce69f4aca8528a302eaa15ea1cec805ba9fb15d4c";
+  sha512.run = "2291f4350a614227fd709f5276019e45a5e626248874c3d67060d98070dbe531e065c6f3eb7254b34b023169bbcd12ab77dc7cd5b667bc32f28614aca4f774d0";
+  sha512.doc = "a3d5160d775343d91adf981329b2e7242c3e4faefd60f8a40432dc7c6e5a83a519ad4f8e53e10672d8cf076ba17e2323504f84f34f76c91cf937dc385b63bb25";
   hasRunfiles = true;
   version = "4.3";
 };
 "plnfss" = {
   stripPrefix = 0;
-  sha512.run = "086669b9f5cbb758a08cf6dcb8f8d78772f7b866bc3e826caf27b766274e6d5d0418916bc435bb997094f3d43cc73ac79f764637341dce23db7b1a52cdec6668";
-  sha512.doc = "76b33154af91911d5eb4be82414d037b432f523d23df75788a485e8857c9893dd66cc13eaa9f92bcc595089a5a9ea88543d8e0aceb4466eddc85888c64e08ce6";
+  sha512.run = "82bea391e7b2e8e0b169e26b70122ca27b552ae19575653e25c82dab287f724321f227c60b6f2bc9e81b3da065d0915ab4e52beb30ef5db8cb091f0337f59021";
+  sha512.doc = "afa54f8b4c0b96ed99d77c86305a380e5b0f2332f6dfce8599828c35988de7d2adf650b8ed5ed37d2f6e88a43ca4d58f6fdbab6f3ba47353a0bb901976887af2";
   hasRunfiles = true;
   version = "1.1";
 };
 "plstmary" = {
   stripPrefix = 0;
-  sha512.run = "274c59344d55bad027f96c5cc6abbb0cb1a6bb5f7aa85ac8b6f3eac2f2376e9e9b75da35c2b1ed2ae70be1d90600169c07fc005ffbbb63f23947482a0f1fdb0d";
-  sha512.doc = "fc255f99b11fbd28511d00bdc439443444a7f75bc14a11dc9db7094f52056fcd017beb646abec91e0842e2844dabeadc61728502d4e7987c927325dec8ce1779";
+  sha512.run = "fd91a187e70b5d00143e8cf6867a990311777b8f6c88b5612dfde3922a56de69fb44c8b371fabdf768b358c7fe5d444b52ef7f5513390a6e85cfb2425ff8d23c";
+  sha512.doc = "e679bd26b1180bde93fa54ed5a01e04428211f40f9bdaa8bceb3c050c8a1894c04388b6d6bd2fb7c6aca75ccbea127cd9818f9f16bdd8703cfb3305aa657c96f";
   hasRunfiles = true;
   version = "0.5c";
 };
 "plweb" = {
   stripPrefix = 0;
-  sha512.run = "355d48949783a9998c5c0f587d4d6cbec000d3aa08b78e39189bab4669922fdfad69ae5ffd35dbd0f9f5915fab6bb41f69cebe06d63f04031b9268afd2728747";
-  sha512.doc = "079d3b1245d40f7ad5c90fc58f98e6c27208a56f88ae2d9801c34748884291ef54497a02df203d3c9f16610492a232ba7bc8d1fc04a8c9bb4a1b7740f45e2906";
-  sha512.source = "4a69886d4ace45c1f50dad02ccdbe7c303851cca59af273ab4e0e9cb4493f2215b00003cc7a5e216dade9ee991a83d2face627cf0b6978eabd483798539cc1a4";
+  sha512.run = "5bf5cfd6e4a03314d7a1a9b176747fb20566adb7a6eb8a1125af508e6a911d16af76de888ed046bab9fab2ef8815c515a2ed4b0d72be61a3ad71ed7667b446d2";
+  sha512.doc = "aedd2c57a896769c1e67145ddba29a4d44bdece00cc545ae55c8ce8ae32d448c3135348d80e1ecfe9c599c742de6be70cd9804c935698aaf90772263c6c4e554";
+  sha512.source = "174c2320c0d86c141d70ff7d3e97cfa270390b0c116d722287ae1800e54c32d76d3f60a6a3e3a32896504b61df15020c60de873d31dd5bf5f905e934e2ef75d4";
   hasRunfiles = true;
   version = "3.0";
 };
 "pm-isomath" = {
   stripPrefix = 0;
-  sha512.run = "7a9daf30323dad9c0dad4ecbb43fbfb9ba8196d1781a4ac2f540f3e8c9ee74c5b3f01dd6b6c5bf1350cf25988b3518f6dd5c92a11baf173fefb43b2a13ae5680";
-  sha512.doc = "bd6e02105e2d2db1b91bd69e41831ceb4a3a4f8f12ae4905948f1705377faf2e8855407fc4e8fa8cf45fd375764bae0e674e0a513ef2aa018ca17d8497a043a0";
-  sha512.source = "588032e6218dee85fd44a090025da88ab6e6ad6753b60a99b55b4955fdc22de0b8b2fd7a85821fe39bf4cc08cae54fb0b63638b289768ffb93cf7a03605fdeac";
+  sha512.run = "02f2748914dd727beb091e6ef10f59cae9140b1523bce24cb6eeadfbe1eecbb3345d898f91eabc4e0b909cbd25eeafae51d42196b71044d9ee53d98003981ac8";
+  sha512.doc = "1fde2a86cfc4b3138cb097f89e9aab0b6e42677006a4b78c911635ec705976247e627f2b8efda22075041c632dc9ab5ab5579ba659645d0fd3df5f26544f9a02";
+  sha512.source = "30062167acdff154f5e347523ee80305e920c8ceb0c15d381f09e0a52f49ab31a92a9bec07dc6c0bdbb7532ea14e9e362ad722f233cbc217591289bf052857dd";
   hasRunfiles = true;
   version = "1.0.04";
 };
 "pmgraph" = {
   stripPrefix = 0;
-  sha512.run = "1def98a201bf4fe734f48a298e6fa7191d4e7a2fb80bcd65a4b140e60e1e42cbbc0cb35531bbab9970dd79e2b2e0d23915c6585d3e84cc4b7951db6e3cc44220";
-  sha512.doc = "3e9d5d66e863e306a9e8bd9e3ed2e380cc8e4b5650d9696e2716782bd40bff89ed75d3e22e6a8b900b8d1be953c373aa9a5b0afdb242e34ea1d2303e440413db";
+  sha512.run = "d3c3cdacbc2439962b6084af553772c28d1ac1f4a0542944b20f7767dbb2599962710dc4c0a1573649b9c7d6134c922f11a995042f72e7252ffc644fc6c4b0b6";
+  sha512.doc = "50aab458e70ce9b2809c1d50c5c5ff0a52388afc0559af24c570ff962e92851dd7ab24fa053b186f2e49c65b659a1daaa1508ec82aa5900eef3e5244fa05277a";
   hasRunfiles = true;
   version = "1.0";
 };
 "pmx" = {
-  sha512.run = "5b01eb2c856868035943460f65cb5395b654c777ac54534e431ba6204bbb01cd78033a135715f6aea6e4c2d2c0270f7cbaa72363329202fc5c54ff9b566a848e";
-  sha512.doc = "86c4bf705d23c1dbb516548b48ebdabbc05b4871cc8ce3962d2f2e016a3f48c5d53bd6a9e1dec074665b961c2412a48294c9ce93769bfae8a7ca8ab1d4f900a9";
+  sha512.run = "f1f7f1396e4dc6920103d37951a2768853307631de9ada442b75689754c7e79c30bb807a5d5c23243385e72902fe4d3163896e710f0eefe631169a1b6cee7ab3";
+  sha512.doc = "7c9422b842129e8b227585a530ef6c833f4148f93290362bcae29fb827ed2ebbf0406cc28a68a7f47960e8a6964449f7d0a792ce37f00ee32cf8933b6d29c799";
   hasRunfiles = true;
-  version = "2.76";
+  version = "2.84";
 };
 "pmxchords" = {
-  sha512.run = "c5901ce0b9f96bdb232acc845e6a23df6510414ce588c246654cc61ffabf407a4ca7b6c25b54cf12fbe8bdc368d7ca5db5bf1900f0002b4905d1e2bc738e91e7";
-  sha512.doc = "d6a75117adad99aefc853b6bde83901215c915409d16c7be5a212132b591e0efa90f2ad2ec87957f64efa61f7112564f4d5ce59fddadb898e6dec0fd843e6824";
+  sha512.run = "89e1c6be41bf1c04e1d956b3365ed3ceaeba7424c51c426763a32566b909e23a985d2bf82043ffa9a3ba702a0d99225f7e578128d5f3d3b1ba2a60d41b8c5480";
+  sha512.doc = "88bbe4169b8b07bd17694508f1f9f25de2da546da49bc726fa557111f1f93b96672f83dd07646ccff2b8dffd6fdbca5d8c379d298c0b929a66c8bed64e205d6c";
   hasRunfiles = true;
   version = "2.0.2";
 };
 "pnas2009" = {
   stripPrefix = 0;
-  sha512.run = "d788d314d51f09fce3b3a3f9de7162a7277dbaabaaf803b96c683190095463fbc96897f227f2ae275bbde0ae8598ac28554bbe451b9614b62b360c04a795e381";
+  sha512.run = "c95b172714cbf182194f908e245acf5469b2fbb71e078da8dc1130b349b3bd95283c94a7efcc80ec01867f6e022928baae1d59cac8fa037fd3cbb68d71c6360f";
   hasRunfiles = true;
   version = "1.0";
 };
 "poemscol" = {
   stripPrefix = 0;
-  sha512.run = "ffb91ca5ea6bc558ba7d13abac49f476a81ff6507cf5bc956aeb04aee40647e17fb0443257188ac06879188be9ffbb5a60a52930ea398312a8bf62335295bd56";
-  sha512.doc = "707ec69d6d21b127b16b934eab8a6947dc77615abbe197e2ebe0dc39f552373b1a858a1a682eb46c5e4ed0ca655bdbca3d9f74664dfa78aef6dda657856ce69c";
-  sha512.source = "08cca292f1658f4d14a3bcbdd66ce4aa32b3dd5133d1bedb067a2627c166d629ce765a19fbfc2f4b92e37f014a9813f68c7fa580f3d6fa740e7f8d201d7216eb";
+  sha512.run = "faae854ed0fc326679f39af10a438a609661002dce566b35d0429072fe44c153e3f43e576fddd4a0ffc542f111a7f487aeb95a0d27787d61533f4182ddb0d5e7";
+  sha512.doc = "b55908de68f3dd87b47610f4ba90ee6179b88ea70028c56aa0d3dd3d6cfaff581cf10a04890dba96a44f61251e8f1ff7acd165456d0623745de32cee8b83f7ed";
+  sha512.source = "aaec63569e24c71d70d59883e48a97d6d2f35b4ebb7886eb27dffefa59cccb02ad37dda6c816a00aba71e7e7957a3d65ec92b3c7177572270a85d39a85b6eef3";
   hasRunfiles = true;
   version = "2.97";
 };
 "poetry" = {
   stripPrefix = 0;
-  sha512.run = "6f4f18ca2bb5edf1c8cc2c331481ee474b258f1b219675ed1460ec75dbda9fcd2b9b29491f0238e9df87364c1cb547472a1548c0d4a85e2d8d647c5dc4205032";
-  sha512.doc = "e82ac80ce96c4cbb100a9fa6c33806f1069684bee6ed46d1a7f41bd8f58ae95f34f62c878bee38454787d882e9182cd3547611d6868b4865bf9e1b323f05e417";
-  sha512.source = "7cfc94b503ede6c3fefc96a7cea8e0a628cbdfe858c07acee6565f2efda816fbc1d1bf775fca7b2666ec83155925ba98181ef8ae5b44e2ea3add80d4540b3d86";
+  sha512.run = "185909847e6b84fe5007b8811ff39b31f0f574bfe7732c53b4e22351b75f0ce7dab441d25088f1e6a9360bb95f3ca2d718d07294155d6c92083e3b80249d7814";
+  sha512.doc = "888a555279a9070aab9191d93537e3149c8607de9ab01e7a52d5b5cfcc8e4a7abd4ac3e54f73511e9866d392fcf9747f4242a5c47da6628203720f636d28537d";
+  sha512.source = "8448ed37853044d44b2b0ef99c511fd0c2f3f16660cf4c1098aa90f82dbbc004f158672f6a4b1ae330147ab64586ce4a46c397ca72d9ca3c0d94a2646dc071b9";
   hasRunfiles = true;
   version = "1.0";
 };
 "poetrytex" = {
   stripPrefix = 0;
-  sha512.run = "9cd19819a31efd2ac92992ba579700783ffcc210ffecdf9c1bd725c72ddc8949a25f757d1d681186a97b57b893dd35cb9b1eb97c604d454d9ef5538baea1982c";
-  sha512.doc = "3f43e35fe55783c350bcf31f151740ab351fdd1fbdeed8b6af9e9dfaf5f7b783dd385533e71492e498864bea2f3019a12a16a54623f35c9ba618b4adc61a621f";
-  sha512.source = "c53cb4e37a5460a3ab0c13f6a6e16a205a5c1d684b69e3fc60f5e08ac7d177fc0d8242cf960a28b8d88757eecf2e7f17b8c975f1467f5a0681224378322ed7f7";
+  sha512.run = "dcfadbf6d9effc05dea645bd50b65260b0d1740c248697267c45361ed1b5e8523d950eb475749d90762ed45f160047d1de69df167298493eefebbb9ef879cb86";
+  sha512.doc = "080681ff9704ac024d06c054ac4a9dfb1ce146bb26a876c3d8d993e025d8f6dd7aef8d6838077894fe5d3cdba342d895ebc00091a3e1360c343a92d9b446644b";
+  sha512.source = "ccfe6a93b0110dd8787c61dc6b33ad3877b116d1f71b4fb0e828c8cf153fe26b5f8b145b5b553f281aac253707d13fcd7aa6a724373bc5f63f0e9ed030a3eb85";
   hasRunfiles = true;
   version = "3.0.1";
 };
 "polexpr" = {
   stripPrefix = 0;
-  sha512.run = "e1b1d4ce5a173cff92de824aadb6c8ba5e69bcac3a4b6097e896110b009a79d7e4bcb99f86d41c2e7ff1beca29ce92548613cea51265c5ef67066d8084df158f";
-  sha512.doc = "85aeb766321ce44dd94a3d5853db98289cd0c368246d100653cfcee8af0768a77acd0ecc5b9a96d53f40b19a6437bb67120767c02f75b9a75a03a03003868c08";
+  sha512.run = "34a3a4f7ed847d0680e0a7eddcc506719fb758399c74df41200243bb91ad8f65200317dd24120238cb6c8a8d8a905b02231033e6e32891e15af366d75b030b3c";
+  sha512.doc = "9c646ab6a6533bfa14b4791f150ab0ed45cca8a9afaf0e08cfefdd63cb0f58ef1132955c940e6951e604d0e12cbb3dd8c03a1836ee4dbeee3c81f035e20a212f";
   hasRunfiles = true;
-  version = "0.4.1";
+  version = "0.5.1";
 };
 "polski" = {
   stripPrefix = 0;
   deps."pl" = tl."pl";
   deps."hyphen-polish" = tl."hyphen-polish";
-  sha512.run = "5a2c466892bdef8a837e4329e5c1ebb6a5bd0ada13d73b04ee1ffe015c589670b5f3a283d1363fece4cb1525c291e831a7ae38fdf2739384bdf52669a4586874";
-  sha512.doc = "d6a7d36c093174c70b22e58b3669a9899d03fee21bcacc5042b17d5d8caa6dc4b098095a3fc1a583b88932865255a720ce355c5c5ee9f40cb7470aede8411ca9";
-  sha512.source = "c90a6aa38a74a86af09818b480ddd1e7625034ab031f4431172f03afe93de8da3e5f5535c4bbb5c68f8929cf434aab5ee96b87f738e7a0c5870f91ee07b29c83";
+  sha512.run = "dff00e12389d30a68e43289ed928212609e5f94d1f3529556bc891b6ddcf0d0c41d0ab8b320b6340575a568787e29d5c48e93319a7aa85612a8d84ab059888f0";
+  sha512.doc = "aeafd5e2f737d683dd5e2847bf755a8f1c7979a485952cfd06aaa7a01edcd4856e17cebb4726c874be4100f6d3a7bc0cf174013832f923df3bd3a045ba779a91";
+  sha512.source = "68dc18c14ba9b397480d540732b5f7c5a200ba8588580830d63af210a5ec1a42cb4ab51a980005a4985078cd3a9c7972f0237dc1985d27ee493217d53520fe36";
   hasRunfiles = true;
   version = "1.3.4";
 };
 "poltawski" = {
   stripPrefix = 0;
-  sha512.run = "75164ff34f6039c163f3f8442be7d026b47b1b61e6b25a6ee570dd6ba89c7ba385cfbc7022b3ef8ab2790c576b570c97b72658982a20a2785dff5e0999b1ce13";
-  sha512.doc = "301696d9ba61fed07b770e62413e099b7fba642243eec03ffc1d6f2134d6bded164d608430f86d8f50efb0c68b16172facd2532ec0beda2a969077a7f08affb6";
+  sha512.run = "4a52ab208c714d4e276a6a6e8129c1495c68e457f9b04945f1d46cb6ada21ad212fadfb1af0df0fe00d00e9b6b6130684b9d85338f22d77fe4d761655d096504";
+  sha512.doc = "bf14d55e9d636c63f3d25f5ee44e11067d79c02a4d3a58dddb5bb30e6539e33f9c5c24c25fb5460d8fbdd6f5ecbaf6a805863fe651ac79811b1f951a0c845ff6";
   hasRunfiles = true;
   version = "1.101";
 };
@@ -20289,1056 +20860,1078 @@ tl: { # no indentation
   deps."ifluatex" = tl."ifluatex";
   deps."makecmds" = tl."makecmds";
   deps."xkeyval" = tl."xkeyval";
-  sha512.run = "3fb58f8299933a1dca7a555e79cd804c547d9ac8ac5cb8838a88edcd2dcd3676ccbfdacc65b6000480ee64370545d409f38f6408c260b02ed8ef68546732cae6";
-  sha512.doc = "17ba146f59dea81880f6f7c69dfd405d48a2ccc4cbcb7cd4ec334fffbf328d3ea4d5ce00860993c7561cc421f165099483f391a249f641ac98e851286303db92";
-  sha512.source = "c1ac59abddbaf18dbff1727d98907dfbfc4e6a6a6b2a7a2294d37e278ff1fb067d6bb3ec1515b680d32bbb79f10f202f4c65294c87492725348722b0cff563c9";
+  sha512.run = "3f1dd6edb94323727be205c8ca8f664729ea828407df893906659d9a63135ec851f207bbf81acf3e0040002b9240b5902dc16e1bf81f5e5b5d0e4f7d079bd30c";
+  sha512.doc = "068ff54633cf31fce29f3e9a07968755daa1159e3836b22a6f1db3f3cbc17f4c168560db6e2c09a9d4b9e278835efd0b8153bfc0702bbce594165abbd64216a7";
+  sha512.source = "1804ea7050f9d57e37db7ce713fb28fe800f9953bf0582dd5a5bde4d416fc842cc3e8495c0fe21a5414e3daa8f8625a594c0d11d950b3896d0e982d546c758f4";
   hasRunfiles = true;
-  version = "1.42.4";
+  version = "1.43";
 };
 "polynom" = {
   stripPrefix = 0;
-  sha512.run = "9009178f09f6b41dd06652e722f1fb410e9f110ab9fb1a86e54c7b7eeb01c7e90db4fd172d57e0ac408f6c4d2034a73297271937d96b07f55eb80d63a15c0873";
-  sha512.doc = "3f1f9a676f9b8b2a9c4327fb1c5e870e75240903f63d1c5f5cc34d46365a5299a484a1553fd37d756110307e7ee33279d2f8878d808aa7c21f7c684afab1dc10";
-  sha512.source = "0fd37de233120360c7f5acefd7f7c7d9b52904e66e1f3516612bdf4261d807916315daa25e8504ef31c7020443d09438202bc7c8ec9e53c70a3fd29fbbc0118f";
+  sha512.run = "d07713955f7b5b4602d5616ddc95fb6270b0755a9537387866014664e295583dc4b456869fd2c90d1ddbfee4251223fd708b53d9f38ba6791fa70620bef2551e";
+  sha512.doc = "847c5ddb883e8092870b022b76f41a7a75e50ea15b2d878ad2925cc7fb0a50408c7dbfbb6b765ee7d3cbe5b110b33e5719b201c5bdf72993738bafcd0af7c85b";
+  sha512.source = "aac2f7436ccd629ea2608424e82dd1a03e44129c5b993e6ef26cf026ec9795fefde717a0fb5ea6a1698b67f6b4b8641b4a79195d7722add9349ac4409fb0da77";
   hasRunfiles = true;
   version = "0.19";
 };
 "polynomial" = {
   stripPrefix = 0;
-  sha512.run = "545c6d9586bda3cb4b6c1cf44f6d2b81ad4432ae2d6559d10977f814ea501c0fd19a8a09fde12d50e264bbd30d6e1489cf5a2d33c7936ab86d6dfc8e206d2a97";
-  sha512.doc = "78eee6eff163dd3a84d5805ae346ca2f96ad76e8ab670b1860b242cc3e366dd476e1923a06db02a528f398480211f1751b27b42f54f870559aa46c51604dedbb";
-  sha512.source = "e227d11591432c89d47057e180bbce7b453b6d2024e893573f214b6e9e6c9bd99189e05dd1a3370c74fe1711d5e2e0656dac44bb1415429636f0d523e99ba546";
+  sha512.run = "653ac7cdfea2412499706a2556906508a0e6d26ca431516e8ecba67f5f3396d7b15bf8313f135e2f73f5de3f8c54be632e87823f60ed7e04de3abb25b525356b";
+  sha512.doc = "77b7816bf8d5974ef0b6ab3d9bef30ffc958771b0c3197f602f8b1de48d6dc76907f67c59150ca5b724dcc5ef7f650982562beb57d165f2000f4d4fdb53af545";
+  sha512.source = "10025ae5cbaf4a9b767c96323b64d44a5067b0c23a36b79da647faf5c4d8b8510e1c953eec18d33cddba4740c4e96e31293b292dc94ab1116135471458fdc579";
   hasRunfiles = true;
   version = "1.0";
 };
 "polytable" = {
   stripPrefix = 0;
-  sha512.run = "c2c11cac43dbacdc0eb485d8d2641fab87906c9718c6757d2533c89422fbb1e91437b4b39bf5ba01949c851a995b16993eba9efe82b2f3e89cc6b90c148a40ee";
-  sha512.doc = "a219829966d7162c41e0a093daed14fa66b52d30829b3a41a5c5cc1c685dd8894ed8d4095f0e71e0411032e53448af17e22872de7774ed8f66f8ee5314a59e10";
-  sha512.source = "26524c0cb886afa18d78c954f85c760c3e8ebe6e0af673e67b3197b3cabaa91e629a150706f089559ff4f80d6ba44b5575d49c7e68d70368e184dc9d6729ac6d";
+  sha512.run = "fd1291468c06109503436664173a4372e7f1c2a581f68066e9756c1ac9d6f671dafb3983eae4ae42658a63d6c5261fc554514d8c0db5cce50d1c4aeef8247cc8";
+  sha512.doc = "b2a05c14c3f55689500ccce9b1e8d254cbae25e20a362c863566a6987f7a954b88b57ba6701cbd76300d84cd581935153182ae31a0ca345f26c047a99f9e1b49";
+  sha512.source = "0ea0fea2f609d08f57246bdbc26ca4df0a67242d2c1ed05db9018b242fed30a0f375adc87f44d4cb3c38a011508869116de4d175c496a51ff87be0a40e236ca5";
   hasRunfiles = true;
   version = "0.8.2";
 };
+"postage" = {
+  stripPrefix = 0;
+  sha512.run = "45b6a61eadc67bae26ffd26de8536f4461c71c4c5ca07c1f00949e6a689f2e40a88dd6670cb1691155df9eddb66e9a5ca78941a8533368437d678269a032d432";
+  sha512.doc = "04db9507f7bd413b260df785cfca4f5fc75916ad8b39ebd51a2b31351388deae4cd24ef97b1d14575a65436b82f138cf7023e742c08083d589852e5082c34c49";
+  sha512.source = "20c9169c42a81ad0118b2aa0e3dbfdda07bfee854429063aab29ab461c302c3b991f70591f72f2c7a10b7db37e3af1b43e64b605ac195e81ed8f71c35ced0844";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "postcards" = {
   stripPrefix = 0;
-  sha512.run = "504d53c10e54e1e5d48d487e5c384148a2a9b4dd2d4b2bc59796aae57ceecfd616c9b5a95fbf0959a04c18c3b0d3f3238f5122101582e1383b83b15d12acd8c6";
-  sha512.doc = "803644b00fae2b0c8973e219bc916f0e898690845f0a9cdaa92caee1c71f1d14d5f1c52dd38cb33e95ac701a8deb96485a3a0c27a8a56c8abf1e5351746a85e5";
+  sha512.run = "9bd942b43e0c6c22d8a5f9ba080e95388f5b062e4aff85ecc4545aad9cb9a66068161915841f185f5c48ef391a09181a3ecbde5254d30cb37464501de9ae8c09";
+  sha512.doc = "3322dc7f5111ab1d6bb3ddd2fa4e6ef3161be32d0cd7285dbe375db5624f15e62ed27a9d7791171549470a6e34bf29808ce569e9ab86e7bc244b3f8d16c8399f";
   hasRunfiles = true;
 };
 "poster-mac" = {
   stripPrefix = 0;
-  sha512.run = "5a565b0095c39fdd2321f366f9d1d99d7816383bcbeb4c6812bce63468d6410c48e57e1297ec7f38f398fdeed834db97f17c229a8e5ab98528537c51bf0bd42f";
-  sha512.doc = "51a6b7e70ece0c6d26dcdd83859010b09a220078edb03f7607f6363977df8988de28f57a665ccedcdea8602676caff4b453c2ac17b39ca12b8bfd17a56d43493";
+  sha512.run = "12c8401999860083fef5bf571917938afae6217e24550c8547ac73859f53e07906851f578482c99d54344110408b18741d3304a2c9af779b300bebf6d3f1c115";
+  sha512.doc = "6fa16888d98ff48907724aa41d147491139cc02bde63416fddac149183c34b21f94fb51561c308df0cf545630968500da131cacc58411c8632ecc761fd730911";
   hasRunfiles = true;
   version = "1.1";
 };
 "powerdot" = {
   stripPrefix = 0;
-  sha512.run = "3fcfa89bd7e903d662fa7726efe4b70fbec2660484c804f86f8f4a1d29ea088656ac9d9e6018020dd08e2dc0dc776c8618c4a1475cf410bb698f13523f9a3120";
-  sha512.doc = "f25fe269795d7909a9d6e311542b4fef466e52880b78b4628179b2093f0858550fcbc7ee1dea77cd1103e3c345ee866f26f56d19f472f29b36f75b640fab4312";
-  sha512.source = "14c1b543249e81b8291104ff1c5d3372547f664d5594ec7dee220d6203ff761fa9838d1b9634b4c5d02d8a9eeb997c79fa84207b0831bf67a7a13cef6676e4ba";
+  sha512.run = "b6b77008d9800f96b4187da8ddd2a2bd55307fc2549d7a53ca4bc8999a2b9ecc26321490890302b618f7f1ec8536ab96aa88955d9c9e888d4f38601374760c5f";
+  sha512.doc = "e02df77a2ecd36ca0359c1d480357fea3e385c2fe69f922466edf47f309952748f5813578e36e972c521445ee94a49ff97ab699d4a374ce3fcb5b8ba2942604d";
+  sha512.source = "04a24fd806b382b3b9f6a38855b715ed8676871917c8d383483cc05ba1f335a2280eff12ae69f5825edceb02c8563b77ccf83616d4725f1798faf6361ad8ba7b";
   hasRunfiles = true;
   version = "1.5c";
 };
 "powerdot-FUBerlin" = {
   stripPrefix = 0;
-  sha512.run = "e11f2aad35d564871fce4c1f08b81170936ef57eee1b493a5d5d29aa91483e64224202c9dae479b4f4396af01f6899ec174e4f40ab38d6554bb080a90d756db0";
-  sha512.doc = "96030abbab721be1cdbc1df4e63e393816adf04b88cbe473abf38c938d632686155bc390313d9200b6e71eb80d8e39e954c59b024277ccf501a6c0b299ba0c50";
+  sha512.run = "c38415f65f1157a9e2aa7059117ef50b1acb8e130e4ddb3d7dd24f54deaa8575524ed2d5c18c0157ec4271d8fe9da04bdd0293f5b0761c395e79df12abb4c190";
+  sha512.doc = "730a3061a8e4d12af40cd9ae143a511982ef6ad079194934ac9e9c751113319ba099e4f6421be1c4118c6f31cc71b5fd95c55d2fb17c2b8271da22fe30822912";
   hasRunfiles = true;
   version = "0.01";
 };
+"powerdot-tuliplab" = {
+  stripPrefix = 0;
+  sha512.run = "82edf9a39917fa90786ce9e2b22b19a6857b447e670f991059f75afb9ecd745455f0db81f019c5d24fe23be9ae8f3954b732210fa25240fcf309ffb6a53e9bcd";
+  sha512.doc = "39af648e2baa3a88040a2fd297f63a14e61753422b46ddb2520af6d0cbdbb926ddc7162d05ad95c3132d322b472b2e45d279a9d7c5a282439e458fbfca2999ef";
+  hasRunfiles = true;
+  version = "1.0.0";
+};
 "ppr-prv" = {
   stripPrefix = 0;
-  sha512.run = "e61f75f7ffab2ac5ee4474415f5fe57924fabb419a7444bd1cfe60acccf54f80533dfb76933b08a986d0762d57d7cfe4ba0822435fc6ba85c9f60818f93c8d5d";
-  sha512.doc = "c4ea5a3d9f9fa9c81875d0c54d60d5d8e1210e1a35e8ccb6d0731a1c87a95578df416059524393b7cc83807be9bd8a884215d14b0bf53166920f71d07160cef5";
-  sha512.source = "825c0da9c7307e8d67bb30b81ddb67825f9f557b49fe57ac7e87a244337a78734f2900ed711d626c144383ef6331e91d4fb3cd60e8db349f3ae196e46f0c459a";
+  sha512.run = "a80d160493a0cd52bc8613980c275d35ea18c01b3cdf7ac08d39403cf1b09c0d167f76de79325499b19709f3b6c4674a8a1fd6c2ffc58995fef00b704ffce7c6";
+  sha512.doc = "8cb08bf776ba207c23dc1a8f670a1799d1301acfb9298ee8eb066cff8a3575fbd11b913922f8135d78560e5762cad04990279ebb38b25ffc693de82540f9a85a";
+  sha512.source = "6507fdac525b8c70a44497e9312acf7b41d8760ea37e4b1c6fc3ec14f7e1f54bb6536c10f386b54b8aa0d09a16ba20b24f097eb50def59f6e53441cf30c48da7";
   hasRunfiles = true;
   version = "0.13c";
 };
 "pracjourn" = {
   stripPrefix = 0;
-  sha512.run = "c1acfa483f7391fdd4b30cb03ece603e0eeabbc6689207fa17203a7b09a590691d9b2a9c0c54d1a81ccd666a28945f96aefbe5b4d055999a1b578db63e3e09cc";
-  sha512.doc = "efcf85f68426bcdac33f6d3b22c203137b4a302f6d2dcb7280af95adce86d5e5fd7b881948f9cd5a30c4c9267dc108be248eb8261aada31d71f1529d7b695690";
-  sha512.source = "8f77945c15793f52dc9265e8a7613b4937306013cb7fef3a2da46ed8a48ce99e6bdfce04b04772385036335ebad95981fd4d481efe23a06ca079f2e4d726991a";
+  sha512.run = "5061643b8c882e470be43072320f452a29be68ce4317bd899a403890a7d7e54d6bc73b305d50a707b326bf97512b200d023b0678d319ea4975665b85f37b26a9";
+  sha512.doc = "403b5d66d6ae91a6b94662b14a3dee192df880afb8f9534b92939d673c8edde2852ab9454dad1c00e56c17bfa6180b7fab0d9ba0e0664360f5b9d5322e44ea87";
+  sha512.source = "d3ec2231ccbe0a261e96605fc615b17e6f858a85af3bcdb3c4981942f8f48965fc3ea58b806491306890836c87b3036cde5bf48a9be6bda507bbfd2fc2cd3894";
   hasRunfiles = true;
   version = "0.4n";
 };
 "preprint" = {
   stripPrefix = 0;
-  sha512.run = "b8b42c0555761d5758aefc107de450a1af9af119947668181aab3618d00cd46f94ab28397851213d0c245676b8d0264ae95007cc40ae2b04377d5b54f44497f7";
-  sha512.doc = "b7dd68c9324930d0b5c12c0271db8b9128bfb2e2dd9f7ebf2484917903da10b7d86842b39fa8ddb438a3f9cb3834d5335dd3d0ff8571b9e1c3812b2b3c2beef2";
-  sha512.source = "b41f77d63f12547a429c7e1797e4824c535f735740cc4e39a212670490ded342167d3822850d96ad018c4c604e37a239c0a80af6da23e5766a068d3b5e4660ac";
+  sha512.run = "88d6c3d1ed37351a766b5c9fc75f0be5d1cdad17003fc91a1dfb82248b990c1976f97dcfa118acfec7d18fe3024f3b842468f5dc7062ed1262ee83b616a55404";
+  sha512.doc = "b4eb4af6c1f256e3d83ca7b094c5ff45958d681a2279eca71f8f059b16ad18285bf2bb8f6db5f37f73154493ae4e859aac670b00f46dc7768519db1d9ed0d4a7";
+  sha512.source = "54a27ffca2afb7d325ff0f88e8a8b6b18dba6fc811d204ff8b50f3943c0be4fd753d3ee10595e42a2d022763b4a622c3d58ff91b7f6fea528dd44eebb38e92cc";
   hasRunfiles = true;
   version = "2011";
 };
 "prerex" = {
   stripPrefix = 0;
-  sha512.run = "70b0444652eb90973395156371a1b0074c3738f06e7ae67ed670adafde276e3d67553702816d762214e50b1bd58394fc7d2b23eb89b9abcefea8246ef3788298";
-  sha512.doc = "5742383c2efd9209e21e41f62f13fcc31b9eaa65cf681f5d7c8d5a2bff74036f827cc8520ac168e4518b918127769fd6aacd6a2cb7fd67b04d531d002b52a8f2";
+  sha512.run = "274e5a291ed5623357b53bd414c96cfaf5863b19d17eb5ebf3752079eae917ac0c9833e480b07993b871315afb009f8971e24576d63a1f0d01707fcd20eace43";
+  sha512.doc = "edc266fb3ebd1747063d0efd90782356f8e9c9b968c93b8afa72e4a54bc2978d520b4d9eeaa72096cd27501302f946a07566a0663fa4fdb6be1968f29ce4e43a";
   hasRunfiles = true;
   version = "a";
 };
 "present" = {
   stripPrefix = 0;
-  sha512.run = "72f3e186541736bbcacd8bc2b667b6428cb9f110bd832078fca39ed33c3cdefea7a79eccf12997939d0b7cafe1122e5ca68331cef7c6ee18aa44418315169afc";
-  sha512.doc = "a0463548f3cd50a18c1c97764f552a0820b0429f977c6aa6691d9d1a99e42285135ab2ba4372c485c0224bb71b6deba6b62fb06d91a4816582e6300eccc8d90a";
+  sha512.run = "073c277a87875e5093a1d93eafdbee7bfa9f4757d303539aef54cfafd4522c7f6018bdd5661c8fa4089a268595dfdba5968a326af8c816a7c2a8900ffd4b3dd5";
+  sha512.doc = "e1d103037e557d049f7d1402ed4030230d968e65c90952cefb584baf1e0d410526e9f72440494be4f446e71a9cffa6d1ed664886d6405210ea1bc2cd6cb7b69d";
   hasRunfiles = true;
   version = "2.2";
 };
 "presentations" = {
   stripPrefix = 0;
-  sha512.run = "09c84f3946959c2f60b410a7ac5d22397190afeaa39a005a245d369d0ef84297e7be831c9e5a007ea8d59c3624bb6c1c20626158d6f0793a34c3437af2339e27";
-  sha512.doc = "da145e1c53cdb6689e4e9342194eace169f3a56a66379e1fe31f5e7cfe4100622aef2e2fe45966a865ca73969df79b74363879143c8759feadaab81b9f1905d1";
+  sha512.run = "ebd8bdc79a5514fabc270929f40d1b24e1d29c1b117aff4e841ea919bb88b1864944aa75f0cf0cd51d2bd57547a8be8ed4d00ebe5ff6afa2468dabcce82787a6";
+  sha512.doc = "25ea07f2f0373d0acc997d10bd375dddf52b8a53874932839322f988a7b176be35750e203bf120b94c2bb4e030d936cad963eeb85003cd6b94364833d0969dcd";
 };
 "presentations-en" = {
   stripPrefix = 0;
-  sha512.run = "eaa6f51b1aa1fa6adb18305507d4f60ccd72ad4ff4242b584ed73d8e49a04029048d26d6438b402fb321e58441c9036873a29b9109be7d0a127fdb7af952739e";
-  sha512.doc = "296d8240ef223259b8f0466ffc3fee9d58d8799a6480415de38ba092eb80f6569f1973d73911543f573ed989c9995bf353edb019b2cda403fc9a59619b238f68";
+  sha512.run = "c848d4f9b7fe47072711912db45848cce8c46ed80e2e2b079f10083a874d53ce29508320baf536588c16396d47a2b85035d586da845d8d6d59a82d73b2f57b28";
+  sha512.doc = "d843eb2d3f858f9083fcd40c2192bcec66e7ac9e8df06d17d027c4dfd095c263ff98081c0c11cce1c750f553878bd1cd215a2862309d85eb50abcba0d3e138df";
 };
 "pressrelease" = {
   stripPrefix = 0;
-  sha512.run = "4000759e802c472c29ad10a7a24b2d39990337e1e2079e9288eb70d900669f1a0c036d3fe8572cc4015d832f4a8ef74261ce2954929e255fe3fdd6e9d534bf87";
-  sha512.doc = "e08d5cb11fb32954b9a07c15167339408f4d988ef2720d075d90d1fdfce56c1f29e93d0fe46f444c194ee5933931d6256a95d54f33c27514a05fa84cf95378e3";
-  sha512.source = "19dea63ee80bb897f649706e36ea74859ebdf7466d20c8449093ad4704b2431325a9dfb05ce0f4aad5a67eda677300e2ba0d815ae2f4898eeebe05b5ff6288d8";
+  sha512.run = "0020913ae0ba3d9b4198788cf6804585248724d3151a7c807900b7e3867c5f91d615478f5e93e45f6c2819de67743b1fbef3fc9d42d51c4c149d9c0a7830137a";
+  sha512.doc = "bad421819d5a157092804a63098069941123fc9c4da644809b6f6ebbe2e37fd2836482b90d587473fe445a2326a00ee59acc15bbdd92bf76f3cc600c9392a3eb";
+  sha512.source = "daf5b5e17e9594f03b60f5e8154a7928a06a2f8de7a0062393ff0ff3c754bfa70632341ae9a97532ea2a93f098682147367647da4b943e0eb531fb6cc5e9132a";
   hasRunfiles = true;
   version = "1.0";
 };
 "prettyref" = {
   stripPrefix = 0;
-  sha512.run = "fbfb303e99b27ba88d52399096fd9f2bcfeecd59129c885f47ef1108a64957cd859188e805f68d09afc8012c61a64e463be2b4b83900fd5d6e16010d6c97ed33";
-  sha512.doc = "ab38a0e43ae2a52396c06066908f4dc1da7be9b7e1ccaf446fcbc4af563b9b35761273e8518d83039041eea8aaeb36b028d6428b5242fa8c421c4b6a0ce80790";
-  sha512.source = "556058ce249602dcf6c7427a03083ff3a543fa3113d31b1f332a25420da97fce16a84a2595b6f7dc540c4750e964443146b0e365b308911d48367df2fc3c640d";
+  sha512.run = "ccc12f37ed459fe134b53ca243f4a565af8170c5e1257850a80be2508ee5dc6e1a2150a9b6d3afbe5fc3701edf58fa66e7ec9859e391df73af3119c8d703beca";
+  sha512.doc = "953fd3948c394b2427706ba94bde64ceadaaf6b4d3d8c88049819b6ae83d165410d2880de00b7ff449bc41dc517a7465b2758a29414fb7c8897c1a36a9f923c0";
+  sha512.source = "1daa21d67b00f996f06601724f2a489e2ecec4d014a5d761e7c75c0cd3674bf37c10549ca7003a567adb7eace85d16edf2a942a4fe723eada592a55ee909a76d";
   hasRunfiles = true;
   version = "3.0";
 };
 "preview" = {
   stripPrefix = 0;
-  sha512.run = "3a408c31b3c99022f7936d38681cfd89c85d6f8639b5300f3b64bc626f74489b3c885c6e8903be234e14833684e5b89b18b63964ac3602f211a182687256814c";
-  sha512.doc = "1593350e4d3efcd8cc5ae1fb5846c444a281f3bbf032bfe3bab4614350fa8a2fdcca7f645ad948a5e977433b4b806a24877d09c45f2a0976dd4ecf9fa0e4bae3";
-  sha512.source = "cdf89c904037537012a4e578e9a0450712b302ba9db3ed39e30a3d473eaa787fb415282926e9fc827861d9ef180c67021d9faced9465a4666ec559190f8b4a87";
+  sha512.run = "038eb9bf96b81158a0b25eaa8e6a4451c5d7c33dfacf7cfa0359caf4989df730220ba703f260cbbaef255d051d6baf20acee411dbc106dd3a082744a02d0b0d6";
+  sha512.doc = "e65e61f36bd4c008f8dc383f70b1112061426ba1edd112f4953ba0a63a4012b4328510c8e35a00a38ad62552ebf18b39239233b86ff49b22f58a48bf753f4ba3";
+  sha512.source = "358ce920b6d885840590ed289723c6b920fafb3d3d14b0509d43d2026d6d8708d7dc22f1475b922b78513646b016adc63f36a279cb5d513184794118d9b1978a";
   hasRunfiles = true;
   version = "11.91";
 };
 "prftree" = {
   stripPrefix = 0;
-  sha512.run = "5b32b66eef22f0474b0bb3f9ac04480768e1a57eb395bf42c42042b36a5d9ad7b07d9a9444cee8b6d10f2417bd77d798b9ab15b270f41adf39f6d6eabb3ee5d7";
-  sha512.doc = "771327be0903762ed4969d29affb906654d90e74920447dc1eb72dbe1f63d0b609325fe08df67131c2ab770abff6597909b222f398027787b0768327ee04071c";
+  sha512.run = "9fdd1591b2d1ab0ad4702f5d2217ad51096e7c95f660d56a02c04882aab8b0a864cd0c2dbea9fab0f50258f705b286a71e0430a9436c348e1bff0e2dd6d42a7b";
+  sha512.doc = "86df839834280a9f526b2ac45482e9d194447d523819e6f6349b94ea38f78e1533107a8b106ae216660d766d6463c863b646dae3541fefe697aa569f2a09b13b";
   hasRunfiles = true;
   version = "1.5";
 };
 "printlen" = {
   stripPrefix = 0;
-  sha512.run = "6672db24fa4e2943251099fb22bae746ce66222406033990bb6b30c72ec2f000245e05e3987e140687508976eabd5b9e9bce5b0c9125a3eeed96c7e8d981b098";
-  sha512.doc = "bde0461a07a1a7b64bdd7de311409f697e6dfaab4bd9fd6ea07b690c8006297a8882d6c9a834b30a03dc8a19f5b48c5b41c6a4332c88ef312915ba179be34812";
+  sha512.run = "56abf08156ae04c1ef527faaf2d5cd7713b4979bea39dbb8b607b9ec05c18fc8897c26f0816dd492c413e1d72aa1718088dee66e14e3db311c43ac91d6aa306d";
+  sha512.doc = "66dea77153addbd834bc1220b76b96e82a40f4abde9962235b09a022b96c3e5cdc9c4ef72c387c1cff4a32408d95df7488600630c917c4091de57326f4d2c175";
   hasRunfiles = true;
   version = "1.1a";
 };
 "proba" = {
   stripPrefix = 0;
-  sha512.run = "0b49c45cd70595f0846433c305da3cc4bc7fd1aae8ece5d0f2c59477f0d2be76b728360c0ad17da341905805affa70b17cfe51627c0ada0d073d73e38e6b0bd0";
-  sha512.doc = "b7c96d7f0b057920ab44c347d54d51c2917863c4d5e687e306c6549ea631e46865200d3845b149c5964c01267fd1ff4e6588cdfd265264915732e93a40e5762f";
-  sha512.source = "15c3c3c025e9dada15ba3f814dcf4b7c55a7acd60d84ae3a934b3e64093530402641f311b6dbcd40ef8b0ade63bd2c0f88df6e1101c9f1d48c80d9e78a10c9d8";
+  sha512.run = "882095ab9e4ff706ce70b16bba633863042711ea03db2febcf4c471d88bec9723bff5931b093ae5c76f4a58f0e4bdedbcd3b372bb2b5f90142b37a9eb8284c9f";
+  sha512.doc = "b2a09ca0012c3ff9ffbfa0add8761c021478cb090d11be27ecdd1e8cfe311cf5681140bbf0d76d57ee5519faa08f350ec132713fa7332f04bfa88d0669a8ae9d";
+  sha512.source = "db46940f6a419abeb721fa94d462db21c2b14c4e83a40a0991701b3975b165bd46a88822d72eb5c7c79e0df3024fb3f779c2a314bbbabc0d05b497031b6d5a8d";
   hasRunfiles = true;
 };
 "probsoln" = {
   stripPrefix = 0;
-  sha512.run = "6e299a8f310c25f6942872e42ec5b031b6a1469a06e79c6f359fcc96f6975db0383c0ce6dbee085ae60149d65e39724ca3dccf82f40183e0e20e857ecdbf1dfc";
-  sha512.doc = "bfc11035b829f299aef75d852ed6425880cb8f43ee48bd09186e5969a553520c009dd09b2e73b234e3c57e5f1299713409b15a464ff1ed96df4befda0b8f8076";
-  sha512.source = "7643201166639ed902caadfd8938f588a407700cc2e0e1284a03ad72f20fd9cbb3d19337b069e6471bac777da9725ba619ec55590edda34ddaa96aaaedb5de09";
+  sha512.run = "1f9abb8cb5154d127c149ac142b8c8b50f9f8c087db9dae33c7406daa69ec8e4de065781d81b3c6d30e7e0209c58bcfb754acd20e3194211736474e98de60546";
+  sha512.doc = "ead68e1e551d79c3d29f7941277a1fc5502721c90809643fe09f546c4372189b1007f1a157f9fa5a7887141d92c0a3126fc428b8bfb3e1acba29a106bbb1070b";
+  sha512.source = "e5dc5738c96068df0448f0c784f31d75a654f10c20c4980eb6e287c2f614f67955b9cae6a9bec83910a6212cf061df3400e476ede5df3b070548b92f45f564d2";
   hasRunfiles = true;
   version = "3.05";
 };
 "procIAGssymp" = {
   stripPrefix = 0;
-  sha512.run = "570ef81ac2d535533e1996f575732af5afe26d3360e36ca9400934e942c777bc8ce287b8319168f21df3140ee8c327dd5e47a74b1173dfb32b6f54e232155071";
-  sha512.doc = "afc6937514efbee38d878cacf255fc5ed9d8964c174b48bea278ccbc327ce3c017318a15f24fcec859c949a32d35e14048d10906bcff2798bb711caf77db0211";
+  sha512.run = "d4808df6738a10f8b256104b5f699b90db06503f29d1594ec1a5a2b0531197ac8abb8e0e5231d8534a9d15b65136c1b2040513acb5b783142c0182a4e2aaf468";
+  sha512.doc = "da11845ab6998b20f46fb306ef8bee9f7bb4bbcf6f1ac893630ff8f9ef32de082d776453832c9e66c14a7b71fe72882f9a6003ac1cfbbd20ae81f9d60923855a";
   hasRunfiles = true;
 };
 "prodint" = {
   stripPrefix = 0;
-  sha512.run = "132307231fe54e6b5e4d1ef0d2d00e0e207ea403853418bfe02168764062a597f1b4e14cd984ef4242e9a9ec35b80a9a42a875bd1c69e02b6face26f4a7ec1ef";
-  sha512.doc = "642cfe880574e1d559de6010ccd83a12e3a43fc8d06493fd5dcd18a62d39a2d6a50a69abccea11e6d69a72919a03c224a30ba2a325785403011a1fc466d463aa";
+  sha512.run = "02649833a5723497ac7f3c5a56df7e1c692051172815b64b4d1e92d8911389e0d339e987c7c524f7856dfe635f98090e82b3195ca9668f0f62cc1e31f444bddb";
+  sha512.doc = "b54990e30f5bcb3674bdec7b5e0fbdbf5b68335d35dd11fe3760000b84680e5f7977c46e3e165e46af7f98659c9431ce8de9764895d79d6772a450b092e4928a";
   hasRunfiles = true;
 };
 "productbox" = {
   stripPrefix = 0;
-  sha512.run = "f191807cc001d09b602b9516b98efc3b9d97b595c2141a5918ee84da847ba5bc66462491f519d28d901290f3ece952660214f57266db710ee640bf88b86d7325";
-  sha512.doc = "2dadb3bd91003b19f7bda8d86365c7aee8c72bd381284f9dbdbc2ce595467d365f65aa7921e502941e126a9e0424f47d54906ceeb970ed34aeaa83d2579ad5e3";
-  sha512.source = "f80bb940b5a39403c7faacdeadcade858c7ad7c39cf33a82afa7e638d1b61cc71c4056549d2023f2929583762f3a9e630d2ee35abe4f610b69a5bf87120b93e6";
+  sha512.run = "c4765778df2c13a691af32a7fcce9e1268756aeb790c8de3545a29cb5ac660b1f73a0f8e92b6274da813036e26c6e834e3444899edd481fd04ee81eba1d7b13a";
+  sha512.doc = "18d949da3725aa060db34ee56c5d32616ea627d8ae7b9a78b29c69578153091ebb3fc1c213e39609f40d88475185ef2d62a3412e0680153b6d7daf4c8529a16e";
+  sha512.source = "6b978baa0444f4a4a5c6fd388ca4bc3c1e3c2c99c41ad7e0c2f1f939b8c5c9db6046d23ab3f863048af2a000487d79bda94c960f5a05cb81575d27f949a384ab";
   hasRunfiles = true;
   version = "1.1";
 };
 "program" = {
   stripPrefix = 0;
-  sha512.run = "d13fb6b557183ce67ffaf28939c455f89d3a33a0809bad989545fa111aa1690aa5c076bd36c709c88dc6916c19c1f803012bb8ec6f06b448118958d7ecf128ad";
-  sha512.doc = "708f7f2ebea653659e7d789647a095596b6ee882cdbb16aeed7223490762302a57f99cc5ca5667e3880e2a7cf9aba85cf03d25c95d6386a5b68e50c0c2ec01ff";
+  sha512.run = "5acc5fc93e4056782d45dc42c2253775313f0ba4649924af6677db4ac53058cebf91ec6c52474a57b98ddb6cca07c80eb1b9a1670d1b0bba10cf1500493dff3a";
+  sha512.doc = "e3d4e63d97c48091e5cb4f0b2b8784e379ce159e6358a70143dd64f6c82056a2cfa014bd00dad74db530261f01a3a1e7140dcdd104c7f9bf5990a9c6fa116aef";
   hasRunfiles = true;
   version = "3.3.14";
 };
 "progress" = {
   stripPrefix = 0;
-  sha512.run = "073e102368d63760ee163866842c8ff4485b8ab805644d32c63e97dbc206cd40242e23c84dd6a8cf13361fe3f4e060326914a12b59cfbb83a0245e1e8c61ca76";
-  sha512.doc = "5f95243fdf2f704dd920c55a677dd71b928617f5f831906642c1e8c33906a3a54fdfefa7d729837b1ccf964a4099adf5e9ad64f6a99963c18dd9ffca5e277f80";
+  sha512.run = "8b921b8696d10bdc2e6ac11c30f2fe6c99c9154266798dcfc771852c275a1c5d12d75fc84c489a658f420ec2d098bb4e362ea6a7381b7d6e0db12f42a59c6065";
+  sha512.doc = "cdf5416846311cef8777e4cd27f3b2682d52cb44e20241c3344b5490b744b71a7024893f57b74041245026ce542cb81daf4154174fa909f131f8ef2ceec0d8f1";
   hasRunfiles = true;
   version = "1.10";
 };
 "progressbar" = {
   stripPrefix = 0;
-  sha512.run = "7e215f062526ab029784dcb017c13c8a16d61bf793edd63ecf290437b91253d612588b8292cfb7be3ef92e3b3ed56e413328eb0f64d0618adea1a8a48842f0f9";
-  sha512.doc = "22cb4ad888a45fe3e8f4ad80e265916c4bd2c0d4d24f05e141e27719306825e85ed0995c8953bbde919c0e2c8dc0700ccb642e858923c18466a559d81b738fd5";
+  sha512.run = "cd4f907bc0c463d0096d0daf192047e5df8ddfa8784c2aa1a11c17ef5408d06a1da51057915461791501ae6456a99ffe3a5cb183262411aa443d316bb2f7382d";
+  sha512.doc = "bc4ad3a8eae43d3cc6c2c7194d51227878a7da647ce26056380ed845029c609203f4dd89e99deb3b6f5e545f5c672bdca711bf5fd7d08497d69bfca5bf5603a4";
   hasRunfiles = true;
   version = "1.0b-4";
 };
 "proofread" = {
   stripPrefix = 0;
-  sha512.run = "701954018d7fac07f73adcedc4ea6fd47700554108f53da82aa0acb38227d8bf0c923c724a5dcba33c4f67d90daa1203abee9b7715f76b97c6f530751353bdaf";
-  sha512.doc = "dd1e7d707248b815b873c55e6dce02a3e172699f7a7fced1bbf8d322202aa4e2c78f16a16d3d9b5919bbba6a71f856a72857024046e854448d66491e0c9edb14";
-  sha512.source = "1f8cb1a19dc1403242f989666f10fa64a9747a234a67e85497b20d223eaa87eaebd6383a102a6a7efe47eef2198c4fd5148ce7e85b6676834e3ed87180abefd1";
+  sha512.run = "f61a9098f16faafae4ad258f48dbd6a5a440a51b552d8e76df30f37f93c1120f6f78f04743253f4434188b615c37a7f413affee104889d943ad1d84814a27e5f";
+  sha512.doc = "e11a34099718ea93293dcb1a3e1785ae61104862f42c90e5d3cf2c4293413d6d76ae16704ec3bf2077b740f10d86ea1016a0272bee57cc1ba105344cf221514d";
+  sha512.source = "e59deeb8fc52c9d84d2fcf34c3bec889f5b0f7a94979b64c35d126db34ec2ee1a117cb3ef26096acfea926290c22ec3f5eff78b47929cddaaf5eb1ae068ea28c";
   hasRunfiles = true;
-  version = "1.02";
+  version = "1.03";
 };
 "prooftrees" = {
   stripPrefix = 0;
-  sha512.run = "ad1c20cea224728aa3a4147134316a792c0ab16280806176a1212fa330e44007124243a340fdf7ad182d1368ceec7ce85a181073daa22623580e6625ffaf23c1";
-  sha512.doc = "c5d23eabe693919bda6f45d82c35bfe37b1cc6fe1add6bd5c23fcab24ff58291bf83ea6569b19ed73f47503d6c65729ef7815e7cc1ec6c9fc893b1f7c9f4e592";
+  sha512.run = "f679b3114b1c7ec161b505dd0e7300ddbc2e86fca133e1f5cb09da697805829f89a5a2811f1166d16babe99cd886614342bf37f583ceb9df94a0136649e20911";
+  sha512.doc = "06cd87fece212c0e03e717c33ce54375043f4a649c2970bb73f3dfe0cec5c8940c16d362be403bccb8b230e4665c3d361acc053452dc26b8bc85a502c61b527a";
   hasRunfiles = true;
   version = "0.6";
 };
 "properties" = {
   stripPrefix = 0;
-  sha512.run = "ce2a2a59bb95a0f00592a84dc583e2f0ed1cb38e96568f6c53ae5fd779683bd8e14adb34f927dc6f7d20b6bfb5e167f2ff51f8393611bf7da751be5fda5030ae";
-  sha512.doc = "e80984d8026fcbd20c92c2b84cb6e231ac7dfdd10909c52d0340e71e66006809fe0687c3061d6d15fad441c410e6aaf03af03e0d9a2bce6c1a41b56aab616aba";
+  sha512.run = "75e3258e627cde703950dddcfa869264f2e664ffaf2428a73fc68e41e84c15e5b6c0f704e2e052ea7838273318abe89a2a9a219ce039bb7305010a5c7e83b5ef";
+  sha512.doc = "89b3ed30f47ed09e8b503086e0c517feef1753f728c3946828348da0a452e5386fa148de26c7a94556ee5dea28d389ad1cd1cc8b26fc1f24e2f826abbff9dd53";
   hasRunfiles = true;
   version = "0.2";
 };
 "proposal" = {
   stripPrefix = 0;
-  sha512.run = "ea063ba92cae59161cd2e50f725896888d0f9024bc9f6c93611e31a4b9a8ecb10473395ab7a637ec2d6e00b8482691773d01c91404ee3e05e57c6bca661f716b";
-  sha512.doc = "108c02924f00ad100529503cd7a44001d85348bd603dab5718ffa4c0f8fad37951c907f96a071507092160a626237457e7178509366778a94e6845dcbcf7b4e3";
-  sha512.source = "5591918150c3bb725f6a494d3c2a27eb1774fae9027a7d04a206c01b61cd10925e082e7f24f98be972300a32d9f63995cdc04f8769ad3505961ace9517374927";
+  sha512.run = "394661a9b8d2f150d676558d868e2c2158a87d62d5d5f59c0283b5780caeab1516fffce859e710b3c40eed9d4b35629da783d39da2eded6b764f0f62d16e6870";
+  sha512.doc = "871c9b8035ff56a01cb4e80093ab5fa02af4e04f3b1fa97f701fcf00f33dd1368504d6054c424a928af932cab74236ed6532e88d1d27b4d9693dbf8b6522bae2";
+  sha512.source = "531dc70cc53a793d9d7087508e23b5e899b6cb027c86cf2f8d526b00cf04189f3edcca72e7ec5ffed61c3405b8051ec35456408a348c277f3312ec3950141c27";
   hasRunfiles = true;
 };
 "prosper" = {
   stripPrefix = 0;
-  sha512.run = "b6ade52dd5d76a3a7703a2666f47df84766edc167a91c23c86346f591cde35b7a2eb84b43b4c51010735263d4b31602ae85db868cbf2af884098982c9ba522f3";
-  sha512.doc = "3b5d58475b5356a00b8b0e9bd5456d47cc9bde6afbfa49eb33c60c1ec7295a988203680e587577985b28459ac63abfa1df066657b317c951f678fe4f82451366";
+  sha512.run = "fced977fd39f6750f9d17a13c5edaa032f15be04de94a6378eeb8e4a2eff4f3ccd03985b9c07a2f588a12a43a60985570610784ff7eda75ee248020e756083d2";
+  sha512.doc = "6dbf3366874665613e438d9ad81fe5d24ec8b986bf4bd4fec38f673bd5885d0fad53af40dc445905121ec3cf7b2a2299416a20b12305cd2d619fb9de93a13275";
   hasRunfiles = true;
   version = "1.0h";
 };
 "protex" = {
   stripPrefix = 0;
-  sha512.run = "5a819b91cbbecb552f6f3def4551867cf2bfd85ffd8d1b32ce0b93f9cb45a9d50d50c4b556cef31156b7fd0bdb3f46ab08488eadd9728af71173b5000598f9d8";
-  sha512.doc = "45b5112b06d382663b164c4490fb6c5aa517cab51a4f3289ba4e159a26dc5ec1faf88b3eca45eb71a379412a64b2260c29a91b6681134899a8a9479bfb731218";
+  sha512.run = "c7850b01775a50dda0e93d3ba19a7f461b17f1ced967da4e4482030ec9461ad0eee4220041952c40136a6930fae0cca717898e78f757da66aca29606ce088233";
+  sha512.doc = "5888666f82e95199b935b5d8a7161eb5433666dc5fb6a1d669ceac1aa79fc2b31ab9ce6c90a0c61a23b0319647476f7817f954f3fb92dd1f4e53fd524c90fce9";
   hasRunfiles = true;
 };
 "protocol" = {
   stripPrefix = 0;
-  sha512.run = "9b7ce4221b93db14f07d1aedbeaab7d48f82e3b89322f3c9d17e04ffb2a7f6d3f92d6331994119eeebb09e7595a07af688ea838185a0e93a0bcacf62b9f3430c";
-  sha512.doc = "e26158a61e10369c4c90960f48733446df1f0a75f53e12db60e03fb24baf07dd7ad297dcc5bdde8510fd55e675d9aefa66d4828657299c576a7592f90e2e507c";
-  sha512.source = "6769174a350bf234898fd11a8ae396b2f4d51f63159c42b92b0869b1a8d605bfb7e307d67133402a443a1aaf7bc5de9c065477ec7374b36150e9bcdba4aa161c";
+  sha512.run = "e16bf8329f7c09da3dae6b1119093b163185168936723c6560b6e9d1fe2ae58e5cc9149149e736769fba3a7c28b1e661271c1e81e7ea25470044985cbeb750f8";
+  sha512.doc = "2f145527564fb5b1edc199aa9345b7eaccdc1b3b72f8bf940cda535ee29ef5a2bfe172fba37d0342b4eb7afd02dcfbfd6147226590c16cfcce77623e6997af93";
+  sha512.source = "6dd473af233bd504da81dc345f9848d46188f80f61cfe75cfb6854bbb17f68c60ca1e98107b492e2438e5ef591ce86c5beb37441952b35333005b6e84fcb9ab9";
   hasRunfiles = true;
   version = "1.13";
 };
 "przechlewski-book" = {
   stripPrefix = 0;
-  sha512.run = "040650fba437d73e654010a862b76ece72cb98f8435141866acb48f93a4278ac55c5328f83486b9d85a220665baf8005b1b2542931a142aafe1c19aedbac92a8";
-  sha512.doc = "3247cdb49943139395813bed66360090dc46dfe02a70a09981eff8deaecca7928d5b4c0ef541642fb0ca1198874ccfaca31c1716696a275050c7ea1f66abaa8a";
+  sha512.run = "7b11a0cb74b74ae8e821f3dd202e9528add14ecadab5029118bad30c9e29ae4a9714c142a4838e9cf03ceb1dfbd192f935b7a06da7855f16e0546988bb810c33";
+  sha512.doc = "aaee8478e0091e2a18fd402e9ad366d8caf416e73146cb2a9cf9b330ec879eee1e56ee17eb67803049a555279dad6aa7432c4c927cbd8593df2fe5fccbea64de";
   hasRunfiles = true;
 };
 "ps2pk" = {
-  sha512.run = "6535d75c20525f32fd39f724c26aec84daa66ac31862afafabec7dd6a43c03af4a740eb81ac8839e5e0057bb90c04e2b8da81a8902e132316c4de0379786e491";
-  sha512.doc = "822f87276b52a34afa3965365607d277148e8b7a36db7250af435c6ab5e2dbd91d5447744c4d14a7fd3466208a45ed92683bf34cf057371a09af8076fb60a8d1";
+  sha512.run = "b58f41f01b0932e9e80ef479fac89796361b0d60945f80da3678006bc64817298da9789ed71a52ff1579b06d8bd2ee80280e0910c1713f4949e96e756f3c0dd6";
+  sha512.doc = "a800f9a4957d0a6e38bc199bbd9c65cdd169f7b993ccf41a1a5381b0ce877c5785861aa14865241c2ce2cd22288248875a3e71d33065cec6226d428f68f93ba1";
 };
 "psbao" = {
   stripPrefix = 0;
-  sha512.run = "0ae72ee6d7f76a94e9bfb920ab82e9986991a10d2dcfe750b83087b6dc3b93ea270779abfa1a98e206949b95edbf2c0d1556d7156b7841a4d22b463c6bb9fa61";
-  sha512.doc = "cef5dcd39c93aafa4144adc6f5e85be1ec851cf36a7d83ed3cb4ac68703fddd8e27c06193209a8a57fe161713ad625b9711b5f3abf52681a9d22937cb67df6c7";
+  sha512.run = "7e0de245e003433ed71dd132e7349db761bda6d9cf607c78ddeef2889e099a514c9e6c00ec326eb239d6ff32da2ff9c24aa74b8ff1bfa7be3069665328bb0ed0";
+  sha512.doc = "f892a7facb1e21f5bb518a1d31a9dfd62d69d036a6406f2de98242353a7eda9594338d7c810c373396a67c893999134034b828e72f1366c118ac6f232337968c";
   hasRunfiles = true;
   version = "0.17";
 };
 "pseudocode" = {
   stripPrefix = 0;
-  sha512.run = "1186d6803a1819e0be08b6fcb7fdcf923642954933e9cd7f18b6afbfebe05d3f47263a580d90728eec18fe4c11e775aef33174677e131839b6095d3a374d5152";
-  sha512.doc = "4f4e0be3bf5e17db8f8ab5259ed406668e44c94d64c8891136a718a16836299a530852153aae16ec3a593569bb74e880e1086ab3fa269b3f2593e15b6c41e416";
+  sha512.run = "b79efca82be2326275def77c65dbb25321291329731d234a7565393bc9eeeb7d36f7046509d93bfabc9ad3bdaec00dc91031a0e47b2527711a1b917cdb716b2f";
+  sha512.doc = "ea08e955bed276121aa5c691c2a2e17d863c6c2eeb3ce53da40d41755a8334bd7cb9f4c28563a5baa67c797fca75f3cbc4871952c5570d2274e62175fb252bd7";
   hasRunfiles = true;
 };
 "psfrag" = {
   stripPrefix = 0;
-  sha512.run = "9581232fc535e6421a26e3fd6b7533cd08cf9dd0a3bcba12da3bf18b83f49913520d44072279de90184c0eb55dec2c5ca420ebd37ad2c725d341f680fe659299";
-  sha512.doc = "2d05a88239d51c17afc73d3a8264100b2906f1e855fb26d9c50dfa83702f149f862e99ddd9d0bf9bd3e84ba8a9f54eb52e24f80c25c5ebb417d182b447312f3a";
-  sha512.source = "43c1e9d25c22f8762cd59854cf0de5a4f682eb76c5a28760af7041daed9c48bd4b4015821a7bdfd12ec20d93e9e023a23387bc44e2b263f5abf04e4657c5b9fa";
+  sha512.run = "217ecc12adbb6ab64b3eaa04fdd97b6e1c77b76df5d8aa2986ab27086c18f6f895775402aca8cc7194a057f3b119a27599daeeb1e9698e114bf261a328c74126";
+  sha512.doc = "2b19f6c8d9882bb32daf5c87d15c379feab49ef63c91369720b1498ebee3d2255871ea796090c51b080b107ad6f670e9d804a8a85df7d6a3e877a8e758441a76";
+  sha512.source = "211307e26454e3ac89c6734fbfbea2ec72b5f0425f503f8379b783145c571f32a339359e854376e1e6b2d2760a065812c7ba4f80f36ef0adc2326a2520536391";
   hasRunfiles = true;
   version = "3.04";
 };
 "psfrag-italian" = {
   stripPrefix = 0;
-  sha512.run = "65a63c4bed3df744bdab423cbd608cf6cb24363aa8b7f6d84a21a36988ffec97b7745b9a280076d2d6e9494b3a97aa427d7256499e1dd25bfa08d9fc1070ab42";
-  sha512.doc = "04c02e4a23101e61cad5af6614f222921ee24bab14bfa27c368e04ce81cf379129b0d1467db3e2c56d408c254adef8e0c69f65543b4203f24d1a7235a3cf230c";
+  sha512.run = "23f04240c6c24362bb3029627dbad44735d59d32ea919795d5598a03c40dd5ca1368fa9aed4c7a988def43c0c62f4641fb368e5ba9214bacec04b1f4c101a396";
+  sha512.doc = "883fbe21a71b27a4bfbd7272fd78ef6d5d7d5f4aaa1e57c3657f149e65c0536281c594e7c649c0fd28ba857a9911846dabf2ec92b19cee0b93e10646a9288b2b";
 };
 "psfragx" = {
   stripPrefix = 0;
-  sha512.run = "d43d006979d50e70b42994a503854e06c42ce0c7c7623268266972ec971bc46a49beb3cd4c223cc32edb62f179a08d4b7802bc5a580372b40cab2be5a42bc4c5";
-  sha512.doc = "a1a85399960e754053df4a50a4ac6ef04db4315b52dcad58c7f376ed7adff89a1c8cadc4a9893525fddc3d174a1c4a285214ba7b4b974d55cd33195d2fad00ca";
-  sha512.source = "ce027da2b8807bf8e1bd58ed65a90f43f1bf76c698f539e5b8fc79ab030ea56cd23c6c6fe13db92fd058cc917813f203a6eeab2e4330ca032b56ace9f0fcbd36";
+  sha512.run = "a3c8cd69b7d635d2f0de4a2f5b8bc495b3bdb52cbe02610b28f5a71563e0442c95703713737c953dd86dbe5c8e88bc3dc4c323051dd637a4a848b082b92d2aec";
+  sha512.doc = "589f991cd3c1c33cd8dfe1d3e8b484de83618370a56f93274ca8bc48d166da8e3ff32b571df6d5d7e4d9c7c195859741cef58577eafd3a2fe3c16a762281422d";
+  sha512.source = "434c16781289782ff557ada687f7f2d5145c162c11d61efdfafe04810af221e3fb903660bf56598861af011035cfffa7450e82a9945155592c239b4f24eefd50";
   hasRunfiles = true;
   version = "1.1";
 };
 "psgo" = {
   stripPrefix = 0;
-  sha512.run = "5524185acc680d64a639b8b259fbc1dd7a188d72a988a5423f7e0da1e3f818cbbd50da2a6501a08df6344a2e17319529d36011f4abfe05609abb7157cbc80e7f";
-  sha512.doc = "93e2a17b61c06f748c873c32f041bec0a5c29ce323aa6d7e1e2911218bd466e761b3c2e8a2373212e60969ba53cdad7f85dcb04dc1aa99b462d05cc8f12dcb64";
+  sha512.run = "77e580b06210b97106b43a788b36b25bf9c00b27c2739a0159c98d8b4c0dd3bcf548d0dcecd0bd8e544cef1be8116186c556d9a869bac750b4f74cccf23815c4";
+  sha512.doc = "6ed2ab159e15ca3cb29c6f3e2e751d1d41b15c910d81c3a16a799d4f2f9a713d47117b928d5209b079532306f2535d461c6a9cb19664b5c9934d47170ddd8800";
   hasRunfiles = true;
   version = "0.17";
 };
 "psizzl" = {
   stripPrefix = 0;
-  sha512.run = "845d801d779e39ff5279f44a0578f269b337bfa4f8969ef0dad237d8426a5e5bba7f9b2a151447514ba0035593af1f466786dd00808e73fb46c6f4028b71c959";
-  sha512.doc = "7304b6717e027530915c00dfdd1775058129f81d560eed2e705c17eea98a589538d6ce44bfa182f64235fc9f468e89ddd15a33b67c92061b5c61248ec0aaaeb5";
-  sha512.source = "713a429617e235a13bef1e8307742f40e3d93eeb5a945b4a936a51c33e89d8d9d5561f49bbbf561f917aa1a324bd1c681193386b472a89b069237cb2263cfc56";
+  sha512.run = "ed6e5187756adfd51bad01bec2c589b26a055e03696fdfd863289e6f63dc4e2f92c509301d9ec5c80f8557f3f4f1effcfb6b60425c77c4de101ac93a46faf6c0";
+  sha512.doc = "42342c21803a0341d97dec8d1ace37bbe2388979b2c08518d9161fcb4dc9396bf43ec1c063e7173eb0b76f2d6ec3102c5b07529c0b75846c23a268897646290d";
+  sha512.source = "33a1da7fb8f7a726aeedb1e19c85d50562649ea232e520285b875a1b291d2594f4bd77a6ea51c473db8c22a82f3864cbc1ba041c3a62c28f5f6b949f2700ee02";
   hasRunfiles = true;
   version = "0.35";
 };
 "pslatex" = {
   stripPrefix = 0;
-  sha512.run = "6525f58bbea2c66b05fa419f506ea309273d76b9394d8b2907ddfb53a051b42708d2a8872a6317b8837d14d9426215e73ab191d6898ab1c8f3d746019c8040f7";
-  sha512.source = "bdbb40ac2de55d838cac164aa6625adde8abeab19381567385e33546fa900fa067468a191b8440fd7cc8cbcfd752ef833d50cf2deb8f6965dfaf5171514c1256";
+  sha512.run = "173ba887f379e2a0966531812e47074caa36f80e8011ed79f8bdbdb5e8fdf2e63761a8d9ab26592213d18c7f97e86f489c25b0d0ec523851bab15999d95c5f3d";
+  sha512.source = "b816114a455848329b7a96afeeb47a6b7cca9b5ca186bd96b2875a50b5db4503eb8ea0cf7f970480a37cfc020bc779ed9e294aba4ce716b42d53343134e42fc4";
   hasRunfiles = true;
 };
 "psnfss" = {
   stripPrefix = 0;
   deps."graphics" = tl."graphics";
-  sha512.run = "1e290605934fe52f21306a006cbf1ecb938eae3f18d86b574f732ba184b8cf540f3a4284b145da9102e247d46474b1cf31f3c1eecdded15faafb33b9867a08a2";
-  sha512.doc = "5f41338dd9d33e78e6e02a5faa68ee396f889ed9423538d869654821bb23cde036230a0ca834a161666103e78de3f7ed6087e8f25216b52075c417982e3e6c19";
-  sha512.source = "41a82132584c0e6a313d0fcf925564c8c625f8f1ff6f2d96435049bfe4c05da705aeac5c92f617d857c25b31fed62c1da1dcbc7bf07df2f1335e183894ab510d";
+  sha512.run = "2551573cb39bcf09c394d25e63cdd4ca89958c9109117e16d8c354631d0309f177f5a52d8cebf5bc22d022441212825f70a849b60337e4290fa440526667d503";
+  sha512.doc = "d7e3606176ab1f18a388b3e58a4ef56076caa243391175f2337f18deb2e6cfc2b90bad8ca085802468bcaa2fed624bf70cc1e30aa13d7df11c453f8c6261bcc4";
+  sha512.source = "b44bc333700d91673e69830be9d3ae07f6d27ff2cb61464d94982029ab755553bb2065a26dac3c344aacc1ab8caaf420b9b8eb157ad96354a844bce734a2c351";
   hasRunfiles = true;
   version = "9.2a";
 };
 "pspicture" = {
   stripPrefix = 0;
-  sha512.run = "6e7655a7258a816ba04931f31e5ed0924bd5a5ceaca1e3ded125831e9757451cf9bdabbc47b2de8c22331dbe9edd27bf54a19b9266273eebeee6888e0ca815cd";
-  sha512.doc = "cdbc07df614ddace8e7b91cace7742328efdb48ce7d31889faf902f0932886cb8eaf4df4ec0861cd41c90a78fc179877670afd30d4816d9152097c06004a3f73";
-  sha512.source = "f6372d0446847a6105f566911e96d930f3a19a83a01d5db7098c0de2c783c950109f805ab3a17afb297ed75534bb90392de9b78c53dd07d06f77851d8038daa1";
+  sha512.run = "2f13b2ce8eab934634dbe3f4414127e6fb8e651262eec011dd6e5679e402912816b9b9dd47baf82b9fcbb96afb35d2de6e59809d0f84a44b7a1d179bcc0fbdbe";
+  sha512.doc = "56fe13db8d57f87f7168fd06c7dad3039bf8e368076a03fa5a5f494174110325532d7169e25792f87c039597c84fd8dc06f056af9e499d21145869526e1331ac";
+  sha512.source = "4edbf3ed5df16af062fe8456a2923d4c11d1d6bb928418eb5be096ea6f9b10d446351269c1cdad5a5f72955b0d14f23ea2256d05e124500db9a61e5f35ab2811";
   hasRunfiles = true;
 };
 "pst-2dplot" = {
   stripPrefix = 0;
-  sha512.run = "c923d465499ca6c581f04bd5f9e6cf3a5bac5cc52d90c2a30a635c2d296bd4d631365b57e444b63bbca91bcf7a9c73a70c394258241e6ac875dec99aa4f7bfe8";
-  sha512.doc = "dd9597f365202035457cb50d96ac3506a00c996bfffff50b99ad390be3eb514c651174d939d66152d04043b8b6378d6577d0252ce4a835e758a0003af0c79deb";
+  sha512.run = "ea68b25142d68d4fd5934c8d960ffa9a94d5fa63deaf30e692fa40c3f7e61da1665daeb3250a0ed2126eaa2dfb7cf8dadae3d9012699a36184cbe760b5327e54";
+  sha512.doc = "4506d5757f78419d0b955545d848ad6d7605d39460a525597469b02f0ab73cc6ce9f5af0b5c2bdc5ee1ecf881450a5235ed72ee889301d8ac9b9f34afc2c5c6d";
   hasRunfiles = true;
   version = "1.5";
 };
 "pst-3d" = {
   stripPrefix = 0;
-  sha512.run = "596b16c88676758baf954633582b778e777d87cbdedb7a806cdd0e99e5d80bfc2c3f27615ed85f2a82e0ddb0bd926450d6b090b0490477c1123f63027b6bf18c";
-  sha512.doc = "08a875442a11b2fc0c8302d3ab9ef74b183edfac99f350086e5ed453d63c4e619d3ffb9293c870c3205527e46e271af2b00e02840a1b0b87cacc2a7b966e8a6a";
-  sha512.source = "157049eab9512b886ba88303d134af319d04b036664b8a0e4095cd428c469fcd1cb8ee72aff3f6b808a1cd5dd56c0e16ccc6c52b2a38c1baefc4cb76e46d3147";
+  sha512.run = "9cc5d12378b9f80273211c3a0c895d403aeec062ad48eff43dac1153e5bde2b81ab5daeca835075e170ee73d2d5ca70b1d9b00bd0429cb48fdba6c2c2b61e0f8";
+  sha512.doc = "dea7b6cea86e57b2c50c0c93076d05d44267bccbe708926bf078810b40456e0505ecafba3207055a63355646183f28ddb388dae480d337c91dcc2de99be5fb44";
+  sha512.source = "6f70001c4cff90093752aaec192cf466724b99f6f044d5f782645a4079dd94ef62a6a4ff00b7668c896ecdc17fca5320444de2c3a9e093b1cc250ef35be8cf5d";
   hasRunfiles = true;
   version = "1.10";
 };
 "pst-3dplot" = {
   stripPrefix = 0;
-  sha512.run = "64233122fd2615a6d346a3fcb397e925cfcfb0a9328a05bffaeb4bac02db00e7d455a897ed79d994ed6e36c8a5f67988a5ec3177e932ea1e24017d527c9cbf3b";
-  sha512.doc = "2336382816205b51e9cdfae16f56be3d71702145b1b7448ec89c9543d373c306f5546000056afe3710df254e00c81fba00970a98433575d3d26ea16d31795e5d";
+  sha512.run = "ab8c3df60ef81c759c37eeeb90808fadff827e569924d8aa118b0b17f46b3b4f500ec13eb2fb92dd1cb8b175e3a839cdec2c932090a2c9bc52d1b31b47507dfc";
+  sha512.doc = "5741690243bc2b1ec3275d26566aa8005e0d5eb448f64ca4d5fbd89ddd25f60b17f31fe37405352d01748b7659b96d01e1fe1ab45af87666034b5129ed1e293d";
   hasRunfiles = true;
   version = "2.04";
 };
 "pst-abspos" = {
   stripPrefix = 0;
-  sha512.run = "94479849baf4652d8c521d94b6acd1b3950162f2e25bc08d6ab804778dc48a84feed26b6598fe5bb39e34ecd23d83ddb405802868f618719f38f15228d4eea0b";
-  sha512.doc = "ba627e4cb4ac065645de8cafdbbe649ae2038903cb33e54f6c1b7068f645efa7b5bca62875f80bcd62a69458d367fd16df1eb61e5eb7671faff45ef21de699a9";
-  sha512.source = "fdb609d2e4fae3b16fc991ae74438e35bb8d6f3c74816acbc0a7c7a91687592eb0b8e0a3493572482b2852d1d815c170f88408368e75bcece6e621862c286e28";
+  sha512.run = "4aa582a5f56b69891c63cd6d10afefadabc0f8a1de3376750568e7bf691d800056b5914e4c8384226419c3ad6cb0edd6a489a7793b51a15afa6f87d19429d077";
+  sha512.doc = "3fc8f7fd19994a662d63ceee5214645d15665e2cc4df950ee2e4f99069571d3b3ff7b893fe8336acc44e56e9aecb1d6cdef7fe4bc2a203140f36a6725c164c59";
+  sha512.source = "ed254d0178d908fd609c3f2d4abe912ef086c995629c23026224e824346e9f6518b8fe5497c03212dd3962dbbe07cc7fe6e63811cd50d4607a5048d7340e05a9";
   hasRunfiles = true;
   version = "0.2";
 };
 "pst-am" = {
   stripPrefix = 0;
-  sha512.run = "6c14fbc3caa40a53c9f091deca9572e8efa36cdbe5b2294bbdc09b91bd8362f0c9808497eebabdb6b71f6078b881d62182149dafe502e10cfdff0403eaac602c";
-  sha512.doc = "c1c4e77c0dced78f0962e1d98d262919e9a78e9ee4deafc1abb659e4b9a3bbbcaad15c65fddcdd8faaa7ed47bd3614a348eaac70783fdc60cfa571a280e9650b";
-  sha512.source = "6a7da23adf9122ef48067a049eff9c6316b07cc04d77c946bf98cfd53f6a65dccb6011de591a164382e73fbb033085e93c75207e320629d65f04318067a6d470";
+  sha512.run = "0219995fc5c17c68dccf7401b929f4a6e144fa63442dcd14e1566bcc79afaa8069a06c25128137f0e69d4b7395a16d79b4eb74bb1096aa027d13945be47a7705";
+  sha512.doc = "46107a5e065f055889875d9ece2f2db4e2aa7ae3e46d9208781712940ad6ede66ae19f29894fbe8685adb33aa43e9d76a6b0ec9257b66e4ec9125a8a02e29c85";
+  sha512.source = "fef9d47668478f36f06db399fdfa645810a21bd669a74171c8a54c506e76a54707aa18ea406daaa99ad51c170d4956502aba7fe5e2bcd7a7d39fe70582bb4163";
   hasRunfiles = true;
   version = "1.02";
 };
 "pst-antiprism" = {
   stripPrefix = 0;
-  sha512.run = "9b3dcc4f72210be825715bf61fde805c747576c67ba742628a68285d7316e356ac0164d3b14c54a976548be9f4976530bdddecade0f28175bc3fc357a4641130";
-  sha512.doc = "d54df1cf67e33779d3b84fa60bbe900b0e6b3555aac8cb5f764bdd5deb16b6115a44f7fd8ec6f9cce7bebf5f851b3e58870345b4f138c7ae864994eff44481c4";
+  sha512.run = "5e28cde1a8da51c60d8d5f9a0813444ea70447e5212aa08c6217fb24879b5764409d091f572051977f55db6a7594db915f8ab9d793daf87e11baa8f6b474068c";
+  sha512.doc = "3358635f2a847e5609e62520cbd4b05ee2db1417bc699249b12f7e65ff2d8b1c81a6aab278e05d61f7ebcbeb5892ec083b11a63637a8173ac2a7ff119f77bfce";
   hasRunfiles = true;
   version = "0.02";
 };
 "pst-arrow" = {
   stripPrefix = 0;
-  sha512.run = "f7c5755abf373759e8f3ff2f75aa363ad9bafc644e4cc9d96f6aa0b6550484aad6a7c5327162ca7a3605a25536eff11e25c411e188ba998b1a55b42fe31c3b13";
-  sha512.doc = "a18561543db58ee02fec836e863b44cb122a381a69966c897c03e4e3592a67e434b7ac7207e5d7d88355fb3b5b00da36f83125a3f3d801f043dc4d8e982808d5";
+  sha512.run = "2cdfde85bacfa13b9bd5085b9c7330ea7e0d5bed2751b06dfbf2990e8821e6a32c8b64d9e10dfb295d811234c605ad3c9b23309af292594c6507f6a482921d8b";
+  sha512.doc = "662d7eb5a5575e838a22318e4f0031e2a30cb1e6c2b47062140ac4de2e090bcddaafdd04aa9a21733e3f8ffe0b13fa974a24136ec3389625e1574a27f10c66de";
   hasRunfiles = true;
   version = "0.01";
 };
 "pst-asr" = {
   stripPrefix = 0;
-  sha512.run = "c706da2714b909eaf76900c53ba961c4c0813af435012a28265b932460bb0334ec6024ec0517ddafad815d5e7f32b8a1100492145a94b3ea524a2f6c6c5ddcc4";
-  sha512.doc = "869f4d5ddabddc84157da7483e5af78ffec423a72a4e351a7761b4f641dba9af131b0e8f3ca4baec260124a78d2ff608fb9dd1d781078aa671b0518be67a70ea";
+  sha512.run = "94a7d57ef346248b92e8f6e48e7083fac675deb981abac78b704ea63261e32204413136545296a20b2e8fab573c360f8fdceb7cf8c6b9ff0508c39970d8d7934";
+  sha512.doc = "f707146e0ea626d79d776535c1f3aa3286773a1cda7033949f30dd18d85e016a61a9996bad6e7763c5324d2bb952af294382c5d0139c22e34682d7ccee887d51";
   hasRunfiles = true;
   version = "1.3";
 };
 "pst-bar" = {
   stripPrefix = 0;
-  sha512.run = "8ac5a9e696c348865115786b413426c2a52fea27f379952c1deea94bae8a7ce84d193594e71da1015ed8f38334e1bff791df6e37c2ce4a49d3c11129cb3d54c3";
-  sha512.doc = "06c3eb4b7e488d5b7ca3378fef3dee6f468bb5dceb11933a73fd568c21fa79c38d9d8f0b860ed866865015c031737b22239aed4574ac4599aaedd29513e10eb1";
-  sha512.source = "426dd87408d7e370d825ec0be6d37c88c943d0d4223362192cfdd9662937fe197ba83dad64e14f08c921dc62563ba8d5f6133871339356b67914823cc06bb075";
+  sha512.run = "85bb44d82111741ad59f061f8085acf7ab24d0aa6a6f95a3f1c764bf395a9d3aeb25619af6b48ffc32b5e5368348e19e6ede4022eb006c201bbe4af9aa13a57e";
+  sha512.doc = "0b255b52fe7f35ff63856e34e4b0cdcbec03f8c553516a0d1560fa1f3abf4ca0ea2ddaebb78f75b861a92feab82217d41530c593591545d076b3d703c44461b5";
+  sha512.source = "b48dc8d785253d26dc465310c287db8ef17ece5793eb654dd263f636a4d5c3d7051d1b09f0c88288fcb3f392d8bf2ec6207faaf8579cbaab110b3c22584a794e";
   hasRunfiles = true;
   version = "0.92";
 };
 "pst-barcode" = {
   stripPrefix = 0;
-  sha512.run = "d50047671e417f84bbd0266b714fd5aa14d454531ad36dd0e227c07ee41479e9ca686df24cd2eae0fa409542a24511110104533f272aa48d06defeb1ad442cae";
-  sha512.doc = "7fb03a93f43cc793fe3b5b2ce094c1fc7cb9b83107403a57813b5c2b32eee3a759fa9a8cea350bc24c0d224538b62a64621477ea0a3da16eb3a4eff4e205bed0";
+  sha512.run = "182804ed04fc0e40310211c9621e4c234fe726154601a9eaab91677cb230ebbd900d99ae977f363a5af8786c6321822d36f0faf352d20380436df68b23817eb0";
+  sha512.doc = "2a069ced6ace70004b89f18abba69612d6859dbf6772f8bc55e5fa3844477eb9a0aff5095bd45500433865e74675f690a067a4e79e37737f9ab4f7893316cdd2";
   hasRunfiles = true;
   version = "0.18";
 };
 "pst-bezier" = {
   stripPrefix = 0;
-  sha512.run = "051cbbf5f278cc74e52cc8baea264c0099649e9e7a347858dff91a6f16dcba95be9322a052fe7811bfdb728eece7d3a6d424d5c94c49569cf9c9c29ad9979ffc";
-  sha512.doc = "34c66e601bff9f37619a7ff8f28d2e9e2b943ffa30522c1ddd3763417a0b40651e5db9190f9bd1f194914f6a4e90fb5f0bb0359d6427fce44d49ded12eec7560";
+  sha512.run = "84e88caf6f1762334320bab9be0eeca0bc7e83dbaeea137a86d75eea9539924ffc55409d73608ed4d2385158301b96799f178005429e99693e4a3357476e577f";
+  sha512.doc = "1f8a9866660eae8da6815506173ea5d6d0f14d2db7c8df7365210e6064b9c6b9b92142688f398541315be495dcc0d695937b735543dd6f777c1a7ea5bf6eda44";
   hasRunfiles = true;
   version = "0.03";
 };
 "pst-blur" = {
   stripPrefix = 0;
-  sha512.run = "a1ddcf9f697048e85fdede40be357011f002229bffb3e283bb1daac72c159e81651418272bad3e35e272b1d059bcbb69e41875c895a467f67cf096ebeb185191";
-  sha512.doc = "01510178bf72f9aa6a464295529367110bdf24debdcb0f5f74cea61c5606f6ca41697a96f7f44481e92c41e101db17a974a9919acd4c38aed2737fc1fa22d410";
-  sha512.source = "0b06d28fcb1b1e401eaad60fbcc76b5b56a7e8950fb9a57b8720171d782ec79869178ea0dbfa0cff9428a4dd968d3c55bc0ea5e42742069aa249cb14455af7ab";
+  sha512.run = "c25dca70edbae0e003c70694759d34cd352c9a05d810a900a8bd0b09a2a3a75c6e68cdfb29ac9999cbb580ca70eb9d2716469ba40528269ab7a0ad19e0107c17";
+  sha512.doc = "12e58de82be7a64624fd38064424ebd972854b39eeed7217e528fa593af9bd76d3eb7f10806558501af5accd58989459e3e04c8ad843c5595c6b2f19c3bb97e7";
+  sha512.source = "246a92a533e00bab1d98ec854a2aef3d699b8b0d26f55d6e9dd17040ecf5c4aa3a912651b1bb223fb3012fffd8fdc24ef4892d185e39365de733ffa6c50a9ff9";
   hasRunfiles = true;
   version = "2.0";
 };
 "pst-bspline" = {
   stripPrefix = 0;
-  sha512.run = "945c600a38ea0246effee6e3715e4cdb5154c3ac7e11a762f561fd4db60f15fc7e72f5d1d749e2cd94756099bf34572724972015153314b957fe188492996a30";
-  sha512.doc = "ce372815203a78865bf2814e3a53baf61b036b15136f0845d17af5f1ef7b487e5748fd4d16ebf5afe234419ee2925d588943c911a254926bbb09f29142ba0661";
+  sha512.run = "bc9eedaebd0ae3b9bd65abd83a57e385549d521c27fa682448b7c139ad40f71761db6d226788076c747894e9d1aea965f030e6eed750fa1a6ae0a47687eb88e1";
+  sha512.doc = "b14cf6943f11d36e8f3aa57edb1c0cf84846cc1762114b629b53b887e713f5d15a39bf827a1da071b91bdca41b8ce95d9541b58374511d277ced00679faff1f2";
   hasRunfiles = true;
   version = "1.62";
 };
 "pst-calculate" = {
   stripPrefix = 0;
-  sha512.run = "cf5f8c5fa8a88b57c67ec4467b5663bc6eca522b62546a1b31f55260a114d97d8a72feae53e20f0f4ba2e17196c0806b12379d6902c998df25d292a0cdbc4430";
-  sha512.doc = "8ee7d550b148589cfb393de1a073755863ec762a9d75efe777b72fcf7c6273e97a4b468d41740794c9103e122307f5032fd2a67d63a77167d5e45c894e590234";
+  sha512.run = "b265ca51704f47f77b72aee418adaa808547da85fb822e8b386f7b91a2ede16867b3f3aabdd71c4e97f40f3a05212d6acf78fe1bd5a57a97a35f84a4526d4612";
+  sha512.doc = "2341af232431d322de2f4a8ff4c87cab82dc723862a24d32da5367fcc92872f8c7bceaf6669f4a7103cd4330aae57d104aac038e001b80b5cb895fd9d6f153c9";
   hasRunfiles = true;
   version = "0.01";
 };
 "pst-calendar" = {
   stripPrefix = 0;
-  sha512.run = "da24e2242234f828f0d68bb870bb468fc627d4bf35ddd9517cc3042b7aa22e7c34ba8d02aacdba980a031c3f30bcc61c7d0c0cf25f364bdb246b872a284242dd";
-  sha512.doc = "62292d738660b2a72a7f428afaf53a649a9d49c836e74fc347352f6f229fc3d24073c5c3396d8ebeef734790fb43175c5e3e190d07bb4177c817a8987b7dc8d2";
+  sha512.run = "2e7e8c3d0079ef9abd4f6cda62c56175747afadb5d9695e9d40a33a5a9d4f8359fa6cd6246f20f2c0611220920a14fba6c28fc9e96b5019342d13b37847ecf8a";
+  sha512.doc = "f2729fac75d7c6009f315ad812b6a68a0f0e0db53d6d1183a1d520f400c34e9b33270b78f0679cafd850fc8ad73675dcddbe3c6aa1203f83ee3c9661e5981270";
   hasRunfiles = true;
   version = "0.47";
 };
 "pst-cie" = {
   stripPrefix = 0;
-  sha512.run = "0ea8b0ede2ae1107cca2df4eac435150279de0fc62ffdd5119087de3fa429332c223f87d7045c1916703a3ed0a786cc4c6b8fa0afef06c2360e9c90ce2c49665";
-  sha512.doc = "1dfd967421485121aa90a1a6d6b5063f32b79a7adeef71a15327adf583ea92ce31e7721cf2497b4c54999a5288e42681152f330546e882d000875fbdfd0d5ed8";
+  sha512.run = "4a674554d7a44aa06220fbd3901ba5a13b4c55e0cc5a4bc8a65704696c369715742473a1c1e6820d9f9ff1a03cd135de3a29a979a64a438f6c07f7b9b531ddd6";
+  sha512.doc = "99a751812eb6a753024ad788fc561cac5644d7f4373f9206bd3683cabb940c6bca26e162deb6771dc7aca7ac33f772e4de2489c772d770238f9c9c898df780a1";
   hasRunfiles = true;
   version = "1.06";
 };
 "pst-circ" = {
   stripPrefix = 0;
-  sha512.run = "d25ca0336690f44958b23473abe92de288f081ff56bb4b411c2b3ae64d5597c6fb8d2b92c61515d69cfd8010e6115f33b2334fef57fd787d344ef1d942841176";
-  sha512.doc = "bb7655d7ea721b29437ac7d64f04deeca362e90436aee8ed075ec3bc8ad6c17a35247a07881cdea9baa4bf4cc47e9587879ccc85d3d185c271e718589bce3153";
+  sha512.run = "dce50fa997b0a7f19a0bf663ad524cc4373bf995eb37bf7bf20f4aa0e793f1d057530b0531abe4fc1fd804dc5d1574418336be7840846273d5c98b9485fba8a9";
+  sha512.doc = "64fde0d7e0f005988a464e4db018274e57b8b508fbbb9011895aa7e9a25023a35d7c7cb4b47ab8fa603b1d5ebe1f637ebb4d5e9f57e43509ae76461c6f4b534a";
   hasRunfiles = true;
   version = "2.15";
 };
 "pst-coil" = {
   stripPrefix = 0;
-  sha512.run = "e9f68063fe2f7f8853ad14a3820ef1ddd9ce3c1fcf2a9c71c6fd46a21e4726985fd0f8de95f6fe73805d37b3951b0a8e0ef54b990c8f7f544e2206fd97449a88";
-  sha512.doc = "59e5decc1f0240c45bc8cc37186bc934ae807087fdf2db924a739a466f0214778c06fdc368f0697f311ea25d20b4c005f55d459313e01bda37d2f287455cad87";
+  sha512.run = "81a4e606881acf352ff9741409c5b9228415c747ad1d837c0160f5ef0ad4decb6f98870a57041b820e77b199a652e43eb5fbfe14d21e8f186ccf5303c135ad40";
+  sha512.doc = "aebd14a47f29c22a2ca6d098cb8ea8539f6b8ba9d59967978afca7f2770cd3df057991aa6d7c7156b00dfad6f722f434bcb7c19e353ad319d1556eb158a86034";
   hasRunfiles = true;
   version = "1.07";
 };
+"pst-contourplot" = {
+  stripPrefix = 0;
+  sha512.run = "c37264ebb4e293892c1a3d6f7a4e403aebd1148780be190793dd1db410551aeee8476395cc8cdfd9c1eb9d7b505238910dab897ae48e90ea7f56fcbf8046503e";
+  sha512.doc = "c2e73f5e6b618c904cadd530d94d92f1978b614e3eef816e33b7a3e87aa4a138dad3f9a646b7241f6de33e56c357b1a286e2ea5008083c82560808a25a0343a6";
+  hasRunfiles = true;
+  version = "0.6";
+};
 "pst-cox" = {
   stripPrefix = 0;
-  sha512.run = "38cd064efe89e90e731ac0880e379a0af1397fd0b4904ce05b6ef240157e0d3b455d489b667d6a764c24e9a7cfccb38789ee09ee01f7e9d05b7be9099113686f";
-  sha512.doc = "7d2b16a731ff5f82c54641f611d80015a45715f1e08009041bb022a7ebfbc47b869df9f9ea31df3b5cef706711968c9d1e69f637206e22c4724fe30e8f098551";
+  sha512.run = "ffc30a3f1add73a11ace889387719bdc67ddf175bfc43f5b051d6cc828aabb0c1847413cb24b44322baf61c5a7ec7ae9a8b5131bae68f3da2336c9dad80ef6fd";
+  sha512.doc = "986a68093b5bae0741d9876699aa0510f591a42e3c2d8e7e7e12330240e051f431cf5e223a08b87bbb1545da5c768a366feea4736e59a25dcaa69433a9604da4";
   hasRunfiles = true;
   version = "0.98_Beta";
 };
 "pst-dart" = {
   stripPrefix = 0;
-  sha512.run = "f87ba0010b9c26a6d0bf1949555280f5ebdcd8df3ecdf000c8e366d226d0d2bfe068cfc7095dfd5ffb741babb16c8539ae5aeb4e1d5c4796b9298f95bfbec1d0";
-  sha512.doc = "f68f998358888329465f7a57673889e678ea1d0e740da4bdc3a19ead797eeb0dd2d8be961a4021b1eefab91a394aaf0aa95f6f10c142a8033cf31bf6a6b1d523";
+  sha512.run = "69ab56bf69a215734eea9fa2bfc8e5d0aeddd3ecf5b6fae3a2d850063e50e919de1205dd73ec7559662b1e3f4bfc98c826e1bc4f651e5d9ab74f75256d4b25df";
+  sha512.doc = "461208919a4b4927f33f31dcbae2f02a7d977ebf343142a2d097aebae78a5b9806ae2f460dedd539c0a3f6f3c9ab07b618ff3e0fb3f99c17ac62a989754d9eda";
   hasRunfiles = true;
   version = "0.02";
 };
 "pst-dbicons" = {
   stripPrefix = 0;
-  sha512.run = "c0ae8b26481ff2b4a659c78286b22eef0aa44ad53104171545fad338773cc4fd66ca00ebd9742fdcd10ba117a7c21a7296977c403ce6427b1f526583e102adff";
-  sha512.doc = "904f522586acd5165c9eaa42a9141bd9745b563d47f253bf71743832fece8d868da3b6d89950cf8dd06c8b457f021073482d8e4cb9ba610e796f4dac32bce9ed";
-  sha512.source = "52cf56ba7f98d4860c07fe1535b3888b3d0cccaa165e32061c27c347db8494e7f85656a2702eb2a2dac5dac97fbd6021e587673d8dbf03b18298e0f25e4fd3c9";
+  sha512.run = "abfc48deacca65ea697b4d389d79d44bedfd0fcadd416d392f73b2cfd052bb85f23c17e4fcfa032a39759f3089f48bc05c35b20091ceaf58c176ca6e67d9c03f";
+  sha512.doc = "552fdbecee8f97361728fb539395e0f101bab8e1f246d79689f30bf3ba7953683569c9b85926e9401ef502e412f7a0bcf7bdd1b6147f6f386c9ba0dde6c61a5a";
+  sha512.source = "a4a555b8a956283d2a80d44a0aee459048bdc6cbafd5a66afc0065b75c6a3934a5fadfd4ecaa6a30750d7d5c23f6a9b591e216f6afaaa960059fdffa49ec0d00";
   hasRunfiles = true;
   version = "0.16";
 };
 "pst-diffraction" = {
   stripPrefix = 0;
-  sha512.run = "3ebbc93dc43bfb312b8006d6eb3055165069359572a4cb5d291ec318cbe19f6b3a465ed04c8b4dac043bd0ce02cf0688caec72238363054abd4127117cf2c582";
-  sha512.doc = "d721e2aaa06dfb16c0d3cdf09402958cf535fbee4fcbb32cbf7769b8852d94e5c041e4bca0ec980e956f3120436f8d947f56c02fab0b65179c2d144e68bb8746";
-  sha512.source = "fd700abfceffe8b2ae6223bd3eb79c1fafc352495844aee288f7dd8fd47374cef7c54e0f895ee3a7eab97a47314d4e3042ff918b2fa0d86c0af82d4404b5b7e7";
+  sha512.run = "26c6aec3b71a766a3ab0876d400af2cf1bc8689d44603023426059176f27fe5b323f2edf95a8ca42a941a982b19c7cfd5df5913b98adbae18563d4d576ad35aa";
+  sha512.doc = "c9d3c3311768c2cd6f0d166feca47070675b4f68eadcf7350138979e3e22d07d2d014afc62d64a5273a6d5f83259688a578cc021e03948eca9af6e324e544e4e";
+  sha512.source = "8ff615fd64d8eb59d98aeba6b49acb3aa42402ee658a6590d15003b4ff9947b58d4ea3214dba91808a6e88a15d1f11244deda453740710029c72ffa13a10c652";
   hasRunfiles = true;
   version = "2.03";
 };
 "pst-electricfield" = {
   stripPrefix = 0;
-  sha512.run = "e8a3d5a219f9710b773fb71ad0881bb92e30ea3f843481e9862475f0096c4aee4d8eca63fccf38b94a6795f16386c4513ce04b4a47743f139b7d601cfa5c6187";
-  sha512.doc = "b1f4797f783b1633268dc0783eea87cb79b6f171849e9d7dece46e02095980d99afbc00cc1356812d237926bdbe368f95ecfe36c520dee7835eedcab7c3aa73d";
-  sha512.source = "9893ef242ab7a9eb4ea44b54aea1e042859d6d28f0b0b54faf15bcb91cfc96ad258831221edc8806db2e79b28db49e9053d3a376fc3d5c24e1c9fb24162c8556";
+  sha512.run = "eb2d5ada4d909dcae9399800bf5e89382129bfbf2b7cbaf64c12264b7c5096300fafd2b938a6aaf4b727c4166eb54b2afad414ca5dc5189ced6c2505de2832bc";
+  sha512.doc = "a16aeb2c4d76ebc75184f0751faa1053b0507f522ab3a4d20379fc42ee3fb130b36df4c3581313c6dff500fd501a30134ab999b986596992cd5fe7a3f1a16cdd";
+  sha512.source = "ffcb1b62c1fc0b34d1c62ab6cff7106b17e683f992310d65a21832cae6e2f5762233be21157d6574ecc29c1f2304c6fb58a1c4a286a10e248acf6716e8b54d74";
   hasRunfiles = true;
   version = "0.14";
 };
 "pst-eps" = {
   stripPrefix = 0;
-  sha512.run = "efec20c25f556094b891c853507a62e42300785bd66127efcdd7a8435500f94a68f1ecd2e5dc3bd97d8167093da9485f730e10ec01a5d62bb1707cbd6ac302ce";
-  sha512.doc = "1bb74cbdc28a597e31bc51a5e7c005d8faaab6b8b20c63ad4d0efec705d536f773348f104bf5587d95adb2f3ff0cf0db97031f6993018f1c95a40188a7c4c155";
-  sha512.source = "ba663c6ef4232d9f25dff6206f8dd962c85457aa8f81e82ff27c6585d616d77d9c80d777111e58bbaedecb69183186f6434b737675a3bcd39fc6ebedb1aea0f3";
+  sha512.run = "fcceaf962e941e48af3841c56a4adce304446862165a53bbe6fd96c3aba261782ab624d8e550a35490f978ddc6774e8e79f7e0a8cedfa1c715822d79f76d96e5";
+  sha512.doc = "c24c600211d92d5fe4e72fe2e78a4dec32bd78bbe1c5416f2cdd6007ec7587bb8a73a0d469794521c8482042b07edf2324aeb09a5305d5dce7226d0005b4717e";
+  sha512.source = "7b42483777531c4419456e7080571c9735bf0eb995a32c06dc5c57ffd83c94fe916103a6588f2cbe21605a1dde80777d4fc387ab2d10dc9417a602099ea5f516";
   hasRunfiles = true;
   version = "1.0";
 };
 "pst-eucl" = {
   stripPrefix = 0;
-  sha512.run = "cfe4091d98600461a2f992bf5297f1e368b2c6b75a539c84d88285d6acf92b60ed7cf9d4286507a30fce7d5a3d0d331b4c24ff7639bd6384753104e71625b0ca";
-  sha512.doc = "e9b50e38797653b59c5871ca0991a025baaeaddf2d2de4d51dd665617a5d28514fccc5654fa6eb1c1cf545ee335c7c9a56a4503df3773d761575b511178c24bc";
+  sha512.run = "d71dc5a7f195c52b3336fe46ce7d344cf969a0d373ea7c03f667cabf54b3aadbe6a18d1e87ceda03c9e862ce2d76cb779de9775fab022d9a1fa377fccbab6b55";
+  sha512.doc = "0fab23d78c54c56a9f2429fa3bf1dd023b5365f37a5f81eba3f7c50267d55250c2333d99ee3d961315d315c97fe04f44427ca977786cfa47052c9bafa339ee5b";
   hasRunfiles = true;
   version = "1.56";
 };
 "pst-eucl-translation-bg" = {
   stripPrefix = 0;
-  sha512.run = "69479fbc511c74f3f35ed454440ceaf53ad1988068bc5a7ed5659f4c1533b3bfa00efa2a5ca10ae1844a2730935af8640870cad9dc5bd87f02ab9d6d853a8835";
-  sha512.doc = "d6ba19082277776f5088f1d795bb229484f2fa5cfc397f18f5798ff13ffd1d7eb914e4355aa615bd21c126ee44e9de230a5d5cbee475ff51f803f113d5918353";
+  sha512.run = "7bcbb61eb01e5e0fdc6773452623f858b9d03a55395831e549cfd55cc8155fb3498c12dd8030b6fc40135acf02efac2e91e5da9927bef1aa78166ad3eca03376";
+  sha512.doc = "51459bfaa61df2906e296c6c81255692f2c046bd361b3c4261f71641e79dc7110c1d3e3aef740ebcf6e6ebab1cb53ec9302f4550412e890baa0df77546c97f99";
   version = "1.3.2";
 };
 "pst-exa" = {
   stripPrefix = 0;
-  sha512.run = "c7329a527be5616b5b88fe7a32fb91416ba15cbf62b717fff424bf0d39bef21bcedb3fa981fa07b712b8ad854bd42fd4fd186252e7b5bf38afc2e62ae4904c83";
-  sha512.doc = "1007014e19d472367ed89e6ef01b0026cf8f3cff3246e5ffa9b0a80845d8c3c10768913b9142f9e6357313f34f33c52756bbf37c9616c0b80a2d406bc417d402";
+  sha512.run = "b7e2de8382e07f54921dfa3aaa34615038d5fbe1020e2f582709dedd524f79fd40ecb1f6ffa3a97b2636e749db3b4f2f951731c77d074ee46dda3e8a1cb684f6";
+  sha512.doc = "bfcdd25430e62fffbb395f3e9522761a59a91f9fea4fe1dfe971252f2ac802736df1bd7aa5ac940dbdf4cf8a74304e344c2a262c708cbc5881e25593ef60c313";
   hasRunfiles = true;
   version = "0.06";
 };
 "pst-fill" = {
   stripPrefix = 0;
-  sha512.run = "73002cd576c4aadf77ec6bfb4b7150c664eff009b75f5301359a84d5978950e0c1a2a7f563c96c806a9cdf621f8868bf31bd16f782ddb0295f3cc42d9b67c7a5";
-  sha512.doc = "665fa6dde45b987effe31160453fd1b3a6277ac69c10120826f873179e686d441c8681e79604d2f8fca6c3ee2b3938f84b82597d1d551f46c0de49f9fba522cc";
-  sha512.source = "a83cce3f552f18ef04c8e53c144f32a2e465f029b4199dd34cb5b78066ccfc788bcd2a45446573b5c585fdd8212fe1bc9198716c999e250fd285d5d407f0b3a6";
+  sha512.run = "7d82ee4e591dbbb15fbfabf2f25b86158145d6ff5e6dda65776d9ee2e4614d09cdcc503bf68ed4ea5709baf8e3e4d03a0ba05fea688e7e8637cdd805b8921c03";
+  sha512.doc = "68ef3850dfa068c2cc53bb11a3be1a298a501cb33cc53eda0835b1433bfc5af2afb8c19fb222b7ba7aec8c7dc1155c9be56c1b6b8bb9ca70f7fd6a379d6e4972";
+  sha512.source = "5e869b17a9c21fbecdb9ea803bed0026ab4c6da24ce080ca8d5593f7327d999e38890de5d328ef54ff36e0fd238dd40846dc658da70dfafbad334e7c1c55b02e";
   hasRunfiles = true;
   version = "1.01";
 };
 "pst-fit" = {
   stripPrefix = 0;
-  sha512.run = "871968c4b362944fa0aada780f83cdc0fd03ad76feb9f2cdd13f8931e0a8e4c71f7a974eebb426c778ff4bd647f24e5bcf4445820bd3593232309706e80f398a";
-  sha512.doc = "d32cc0bb29f39c444f1a995cbb00ab2b4c17988e97ece6ccaad422cece33afcfcc0c25fb56f2b78eb4ed1298228bf57314fd4f9304375c570c4946861e7f09e0";
+  sha512.run = "27195184d8bfd666a666f67eee106111e2fde12a04bda2b8b828a3eaf83b49d2334392f7c11817b55ffb8b200d21d8e89e66af35fa3477a2eed33e4fd5b3c86f";
+  sha512.doc = "ac52c0c9ad19431c6dca5b5153194868f0047f6205f3aab38da7ebe63a58b788b13b667ff41a7a03160d7613718660c7b46abca4369f753611ebeadd36ce04f5";
   hasRunfiles = true;
   version = "0.02";
 };
 "pst-fr3d" = {
   stripPrefix = 0;
-  sha512.run = "ef0c129738fde7766fd9e07a027361b5cd614dd99c7302c067f6e73cbfd0291ff30d1c5e912b4274949484350c9c792ac0b97f0ad3a017bfb1e64c52490d0c48";
-  sha512.doc = "4fca675bc04f11359b97b3ec3b9fba1c38e153887d770c2bee711919be5e6a4c8d1b83a0bfb95a548ce98c8ef798b2f17e9df2f988473d82df20c2558276fe70";
-  sha512.source = "851a689eb9c86fcfae01a89bbac868eef5e2fa102a7be6a9ae105e87471e998a0c6c61bb35758d4123dc6cab5d6664f41a6c96d4fd0ceaab71c00d8625039606";
+  sha512.run = "a6f8d5410ea78535f7a881e7bf109fa4145ffecd4c65a28014d4913d0d3b4e84950bb3b024ce799acc60956183c6a80b4baa1744a3f3fcf48d0c74b625fd0dff";
+  sha512.doc = "9b31e1828927bf7668ef5aa1a8b064cdb37c51714ecf90d06862d6df62db158df1e3076d178e5a5017a93690814ff0c6ef2457dc449b9fe0bc0e4498a1c9372f";
+  sha512.source = "26155f39d5787feddd1d3fa9febdaeebcc7f0f42bcb8f268e1485a20ed9973d6cc470fc0538c0b720a3e541ebb616bf7f993a8d816c7bd65c1a80b29dc8de6d3";
   hasRunfiles = true;
   version = "1.10";
 };
 "pst-fractal" = {
   stripPrefix = 0;
-  sha512.run = "895ec8fd14338329b561df1f57f6de4b03cd28379f6eac3468746de1a358c2344eeeb6b6f8612e604d46e74d9c22c61deef8ba95247d7cace8556780a0616227";
-  sha512.doc = "c8778b2b8d62edf8a355a5c01ad501d7c1e265d2d5129d64b5d18ed8e38872006fd70ce5cf060348455aee49e077db4cffbcae4827752ca7bddfd0e58083dbd7";
+  sha512.run = "40d0638a683d6d7294624dda34ce20d815c6bb194ee31ed7eda1302880d9338d74d7ac657f8e3bf8d0961c4b2c85a0c3d919509d7d4f010dba7b2dfd1aee1631";
+  sha512.doc = "57fb077eaa9f4fb90052ba3f1fa553c43356f93af47952e835c8fb209550c524fa006c44a9b92dc5f4c658b95bfc285f1547dcd7b33876b339ef91a99bd00328";
   hasRunfiles = true;
   version = "0.09";
 };
 "pst-fun" = {
   stripPrefix = 0;
-  sha512.run = "3be315df08e560a386f5ee2f25f7fedbd7311f35ce41b0a87755ddf7aae91a8e350e347678285428ebe8d5017f0a08d6e1e40974adcfe56d66e9508d94c50fae";
-  sha512.doc = "6bd28af75c1bd85f5870235991b5dd8dc864b8396f7362a123e672591d1fb2b9112ff547332c5685e498abdd2f3e836fbe12d83dcc4fdbb06df2dd9307096435";
-  sha512.source = "9825930190d77a0c8fa6c06932c5969816776a714ae2563dfd90b23537b80ee8e6095b58a6989a0da972e60b49c26fc4cfd0a4fe9739f3aa21a25d4508865b91";
+  sha512.run = "91c1720b0434495ab9296f2a3a791940d216f32868e31c44078cedce9a0f40e9070ea6df12ac1113f3d3da1fad9ae72ecc59ab933b1a86716d9f38d61a35d7d2";
+  sha512.doc = "f0edef7308ec757a5d6328a2383d4181b1f6907a99235f976bb55edab52f104bc03cc06cb6b62cd20949c659769bf6955818981e4adc9e17705057841824488f";
+  sha512.source = "4672fd4508d4cbffb9499eb6c2d93d5fe1902713dfd8a9346875226daffb406dbbaac84b21d530b0e3f3f9982927a9830944cdb1e48dd12dc6133e98f5ec09d7";
   hasRunfiles = true;
   version = "0.04";
 };
 "pst-func" = {
   stripPrefix = 0;
-  sha512.run = "6e223a4071c6d6b1c2b7007bb00485b17a9f62a3fd47e3155d5bdc928bdb41bd5060d42549dd40803eef7ff4e456095353d660629e32bf0f47853847e99d0f68";
-  sha512.doc = "c71e2211a1e33d28888a4c7fe74c6a418d61336b2115c67fb2ef7514353ddf35d3f400c5c6e083bf7a6b2054d3e6f880cb5386acf7ec06137875ca61fed9262c";
+  sha512.run = "92a8ef155430e8219fd3af16511fa4117eab5e96d7c9d5edfa088d0e7d21fbabb390908794cb761beaa90358ccc4f13ca1ee6cb5be614c2c247a9ee45081f664";
+  sha512.doc = "772c399e96cca20a5398318566ffc47bb7174e30bf005d21b8f2d38cbefc66ca4438d003d57211a79b8e6f2f6ea8221c7cbe0c1a3763e76ca7d53cca0321bcec";
   hasRunfiles = true;
-  version = "0.88";
+  version = "0.89";
 };
 "pst-gantt" = {
   stripPrefix = 0;
-  sha512.run = "77ff77d2fd6e9591d3a23b359a0c049c0aa45fdf4dac68833c6569a4c9740d083fe5032d15c4c79f92a480914639897840efca19c749eee9d117e479df392517";
-  sha512.doc = "603d4679f96de28e256dad00c5e765f8823b070adccee7510d9469e06b9fba3be4f9b5f87fc8153f0928b7324d1a855fbf17c23f640ad07c921ed4099c6d5f72";
+  sha512.run = "5d30ab27593046a69cb1e9a9ff7d342c53e69da72622a54f37ccd495fb86896315a0bed6bff12c0ff7db98625a340cfc95574b63f94b2b7a2209209133f12b27";
+  sha512.doc = "69a613540ab07a96910e610ec6d6841d5b6452d7fe70759adc0b7d849b662b969cdc1bb9c4ccfa4b6ed7033b5280f89537bfa2d6f101cbc6c47157c4dc94746e";
   hasRunfiles = true;
   version = "0.22a";
 };
 "pst-geo" = {
   stripPrefix = 0;
-  sha512.run = "07940fba9455993f431c5bc8e0eaa42d63939ff0269acf31466794b18eecd8570511c70f75203a8acd0b87613c611844cfc7177e2c92fd0a5393df0ffb97478a";
-  sha512.doc = "d7206cffdc5cc9d094440dae29d46d754b997e0449fb2b38d9c1cd7d0f56fc9e7d61654c7701cca70bacd507dfe92b4c390ae2e115d73a6e7827a8dc32fa2f7d";
+  sha512.run = "da0dc94471243cb61da452e136597038b46652a9efd7505dac8ff9e9495f4865e7a5219e49bdc7d66ef8d6848c76fa104958462ec486b2bf3df2f1b467763750";
+  sha512.doc = "3cc41a99d8afb27a953f5073efd5ab73f6fc0dba3d4f2bb878a3d1af7abf5de6a64710b23986b932d7edf37ed9ef9eb55e2c9808c053d931be5b5a02a88352e2";
   hasRunfiles = true;
   version = "0.06";
 };
 "pst-geometrictools" = {
   stripPrefix = 0;
-  sha512.run = "72c757937769d6779404fbbd41cc5d015a6ec03faf05493ce13a0e0dc309a14ebe2bc2e9210ef5d9b2c3e249616c80fbce6ad95306656fd00aee8ed46aa2b808";
-  sha512.doc = "eba78863e6c96a4b6295279e49bac278897930eef44d7c5f3f7b4985be705cfa94268e88e3498ed223f35e1a58f12c2a8fc06a9e68e5d25c7bef29b8ccb1837e";
+  sha512.run = "65000848ae7496342db63523041937294c7c8710aa6639dfdd6bd989410f533d11cdaa6d23796efc8a1c2b706bc45576ba1a66512b7bc51584c341b41bf60ceb";
+  sha512.doc = "4ca6832eaf6345354693b99e3366c5ac0c91c2f7fa8ca2160ce5133e260d92139de22726ef151ec37c04bcb3220059d1fc1b92d19ec53fcb36fc28983b0f657f";
   hasRunfiles = true;
   version = "1.1";
 };
 "pst-ghsb" = {
   stripPrefix = 0;
-  sha512.run = "13dec486eb7813d02b500668053ee8714343a855d937b22c9439aaeb8e68f0cceae37e4bc651d2237edb9e324b1b84a73c877856de0f677e7fbead4f6ef7c186";
-  sha512.doc = "bed6a1487100403bd7c260ab9d6cb27e6ade9430fb13f9ae1a715e569105626d5376a91462cd0df1368bdce544376fc68a1aa6ac781b02ffc986f8a189f9d076";
+  sha512.run = "1806c8fff1653b8b7e838940d01bba3a0dcec14ead19941be6141e16ee42a92dfea8a0f7238550e6fd5b4856ec0d149bd4cc820145609a75b09586d5d00b1b01";
+  sha512.doc = "7374481f7484b257738f0be0723bf378ea3e6dbbc2d999f0786379fd77f3e11247b03ab723c216cb1a37b4b61abc93de3dd946bba058ba2d4f9a37e931a43094";
   hasRunfiles = true;
 };
 "pst-gr3d" = {
   stripPrefix = 0;
-  sha512.run = "659e15bdbeb08115d3bfdac5930bc5b40c1770a4060f20e76108dd613ddc7ac0602a65e19ba4d295e450dce3c4ab557e5fa4ecf8760a325d06612b6f33db274d";
-  sha512.doc = "f60f989a5b34700aa4e80d7b76597fa39bae53e65db2186459c81991c01324887b8d39f987c771b4f7b14fe8672d3c88643d4f4df4cb5b69110f91f04dc36f33";
-  sha512.source = "6e7a56b9a354252523c1aaf907dbab6c11fdd20c872ffdd13e2497c1e1f3ec1fc498a2415362c5f9d45c2e5303fab55ac697b888decbec49806aba1608badb61";
+  sha512.run = "f4fc3a9f42441ecb872605877564251d59c191d455e8207ddbc541f992687dfc622095fa248b18b477aa218c3d71b416cb0c832c7930f006b8e4e0a104616c01";
+  sha512.doc = "9c2c30653ea53758e12938432569f08a41670d1c8957d6963742676e21832561f29e439f07ebd6ba194915ac5463c89791320c9bb3ac609b6843ec17aa70a6f3";
+  sha512.source = "4f657820d3e8b0a7a9d8bf89120bd2e9b6f33c776a7c6eab19eac2bcccd440941b4c479beec06cac182b43d9614f8ffe516f11c0438eac86a37d63bf1e4bdea3";
   hasRunfiles = true;
   version = "1.34";
 };
 "pst-grad" = {
   stripPrefix = 0;
-  sha512.run = "1db6234963501a10109909a81754d434907ba6b273cac75b673c607e36a4ea65114a5a8385c1b8de73a4a8801ad17a7b0e45fd80961a9f0cdaecf4045b4a430d";
-  sha512.doc = "09ee3ecd0757eea9fb2695b885184ec2e3d4420edf17eabc53002cdc411f53c7d9459dc65fa3f21a47c2d8cb8384a56fac64c418b436aaa77c467fc01004873f";
+  sha512.run = "50e1a82b66cc322e686037c12f59da8f57ec0145a9e65684bc7745fb57d03711d5cce2ef255a4e6f9ab7248a64e34e881b33c5eafb3691ad84334a7e0029db47";
+  sha512.doc = "eb1f56084e64f638366aa165bddec413ff33cc95cfe8a79e840a5132a9a40c6fc277f394b9e6506a47aae8589902cf01ab703eb76be8f4c88f7cbed87aee0a74";
   hasRunfiles = true;
   version = "1.06";
 };
 "pst-graphicx" = {
   stripPrefix = 0;
-  sha512.run = "7a2e59eb2e9078e3b7c62a59261bf5ce917697dd0025777751b12ebb0b6ec3d24b89575ed52e9cd6b298ff54049be9959ed7a627d963de7739b82f24ae1e4689";
-  sha512.doc = "ce6f108aa6f1124978ea6d94c6ba3c038a32403158b72e1fc426819e34e6fd1e3f48ea6b53d0e43fdd7d0bb146caa60ce4c8027e735e3ced870aa12ce4511253";
+  sha512.run = "dbe716edb3f590baca6be3599d6e5a56495f5dcf6edba295629fe51aba3ba482bebcba68628faef5f183c59dc250496ba24f121b21fac703e4d2137432299b5a";
+  sha512.doc = "3391357d54faa7b45e23094ffb1363ff8e8e80202a94dffa7d207a7d86825f9fb1990a90c47301ac8aa814c4c15455a0629cc08356a58297da78ed4d773106a7";
   hasRunfiles = true;
   version = "0.02";
 };
 "pst-infixplot" = {
   stripPrefix = 0;
-  sha512.run = "5872746b64dbe87d60bcacda9c87005c9f88dc200fb3ac2e68f7feaaf3036fd3ab74dcaa91eaabf275bc756a1bf20c3e04b01156efe0aa3527bbe22a8011c9fb";
-  sha512.doc = "7acc14653d186e93f23c4707d5a58fab82263a3faf25be3dedfe2b275aa1b7484b03140e6d17b7d448c36c1f726c39c703d7efb79b1ab3063857c4c38fb49716";
+  sha512.run = "bfe9576b59f09b273f1540da1aa1a2c29ae36f05d3140e1e4f7e7e606175bf8c29ebf799f900f1fc5f19ffa53ba6d9797dfd0f5a3a586acba99b5ff0b4dcc2cc";
+  sha512.doc = "0df4c60d60fc99fe329b6dd05abd86f9ad9c33feb7f7595f43c610a826eeecc040b554705d914f1e176df5f4cf172f745e34a2f03550998039c9293422aa7981";
   hasRunfiles = true;
   version = "0.11";
 };
 "pst-intersect" = {
   stripPrefix = 0;
-  sha512.run = "49e18dcc314a9249e86d074071f36b60aa61216f9c55d8f46372c534b005649b4c38d8e20c25d9599509576c9f49a4d8b97cf484886c8f0f28b752f61d32b465";
-  sha512.doc = "1facd30f71751d81ae2b44ff3945fccc46f2fb0ee46acade0090d5cae4ad4b1ca0c0c17f99df84f75174735f152893767d025b6bf5e621570075e36a8572960c";
-  sha512.source = "9747f299a41a4f98cbd58035530c73b0980693001d5558a89e86dd9ca03b7eb3191c8fb5df6853fda8656a1757306f586c91c22dc5dffc3c622e46e31b3c1645";
+  sha512.run = "0c960d5aa888c197e962211bbeb2a4de7a241b4407751670cbbb64ac198b9b3acdb6e6d75b87819dcca01322a33def3b0570c2cc0ab2fc55cb5d10e0be3a36b6";
+  sha512.doc = "ffba933e0b3992eb3e680c3a316260bc3f706916ccbb27c51c8593c295c11dbe6deee19a4eb1357ac8c1e9587c624bb6fe2d4737a29dfee61a71d85e6c00ac41";
+  sha512.source = "f7f91edb39817a714c32d6baf8ee056eff0fba34f58739d27a2ca495dc7b534a5d5e3ce81b1f5afd3705a4954afc73dbe6193ba2ae953f64efb82214ad12c0dd";
   hasRunfiles = true;
   version = "0.4";
 };
 "pst-jtree" = {
   stripPrefix = 0;
-  sha512.run = "a2d2e821c4d6737869516d8c6e5a3244c8a859e2e03f2eceda21c3138e55ce5dbae8200e0b0b1c6cf1a3dbec203ea388ca362ac0062ad792c989e7f2253405db";
-  sha512.doc = "d7c783ac5f6a8b37c3e05ff5ffb1be6d98033efb8b61da3a839b0d89048a3c83343431498e7781928e45c4c104e068d57223b771226aaf410e8097a97651238b";
+  sha512.run = "f70a8f837acf2ac132516de3ea6ee84c86852c430dd0ce1425751389590b3e154f024668b62b149998b818ce517be0d5647b054444101df0b66dbc6e1e4ddd11";
+  sha512.doc = "9c49176534e5d4b77e47ba452389e1f378470a703851a2125983a56afa2d84bb64bf90c34ca80c1dce817a3b622b5a60f099addd9458101b9566d5ffe73c022a";
   hasRunfiles = true;
   version = "2.6";
 };
 "pst-knot" = {
   stripPrefix = 0;
-  sha512.run = "5194aac99d914d186ee743b004568b8930e6310224d7f0185dc17d22226d84094df54eb27b1ae3b14b73ca4163920e3ef37c01fb4a971c18b395cede98870301";
-  sha512.doc = "a872e85de4f571d601a660715909c67c415ecd042c0d41cd5f59d6c93612f9bee231bc5cc5e95d537ea6b30f998abe064f98bd7af6f5bb9355a1ea73343b3c30";
+  sha512.run = "a29cce0c9656747faeaa01d9e85403c0759618c69fae83a562f537537458b9c0ba0f8bf6e515e43cbf859b56cd6e3feaf1f6cce72b868a387a275e5c85931a8b";
+  sha512.doc = "71084fb78959f3f83e4dd4b3925118c2c1ca22b4a79a3d1edb44ddcfcd39ce75091054e072e96565e0ae2cc10bf2d58cf01d5f966344e5c84b9ffb04bda531fc";
   hasRunfiles = true;
   version = "0.2";
 };
 "pst-labo" = {
   stripPrefix = 0;
-  sha512.run = "e23478116ba79c157d5d93e39fda39cbed8cddc069e2c969cb2b77cd55551937390deb84b9297fcdef71a371c3c438d1651116cbe96ebe9df726ee309a1e2d3a";
-  sha512.doc = "5dbbc520ca69f9af01e6c03e391c558e934e58be3ed1e6ce3b25af5356da25898a21db92514691fd697c8afa9ea934e0dceac15c5556484009d654cb14e35738";
+  sha512.run = "0c98cdef5deb3d02d48666ce2e86c728fb428fe667fe24980e8006091c1e40da2a11b921105fdb896ce8e7c02e01cf7d7b571bf4c00d72d97cb21dbef1e88b24";
+  sha512.doc = "c120ddc3a909de7b6bcdca7a985388d6a9bd6cf7818d63e5b91163b44c5052053202abe0bb81d673f10bf0bd53f61ee9e0f89f8aa7cbad1dc7172fdcd566f248";
   hasRunfiles = true;
   version = "2.04";
 };
 "pst-layout" = {
   stripPrefix = 0;
-  sha512.run = "7be8b2c8a5012799a781e9628811f7c03e6b2d402f05cf379c6f249889274ed5fe06b547b9c5f0b7e095b9d6c91507e8ffbf3a3acc6a5dbd9e1d3993b1040af1";
-  sha512.doc = "c82388b71cd944b0b942bbff062fbc26d3f4a575adce61400400e4fe96b6442b50559bba03806bfcda72c9ef042542718b6e2d7536efa8db2c1907a4b116d6e3";
+  sha512.run = "de6f24e890d87af52734aa2ab51f9fb93c350982596c1192b6c9907b28d5c7d8099320bcaa9ec8d6c272ac93a268fbaaa587395cdd5acf8321d3b488ece7e155";
+  sha512.doc = "102e315ca001897b14aa629549c4ff6e67202c93501c22250360ba24e0bf7460c95f2e80846129419643a3f22c6f8dca77317556a073a0e623bf4ad8c7672921";
   hasRunfiles = true;
   version = ".95";
 };
 "pst-lens" = {
   stripPrefix = 0;
-  sha512.run = "17c31995f67c2cc6c1f931c27f65d71862262ec07596678839d79dfd9efbb5814708e6988b718869ed6f4959dbb925b064f127c00debe9f9d0fdcdf34899babd";
-  sha512.doc = "1aded3d332bb482c5f318f6603e112f5343e14b63c053af6ea023a00290a08339c185dc81da6bc8be41dc80a65dca4b33d967f622b21f24cfeaa27918ea9306f";
-  sha512.source = "f8b1b77e1cd7cc1479220cf9002dd93d1d02f21e2defd5ff771bae3dec9c94d8b5795786274a9ab87c0fb28a76eea743fdacff6dd494349f23b85d04f7b33b8e";
+  sha512.run = "0d0b241c6126e4acc51052e83d4f945aea5fefc37985f9d71c794916e09de09a1b6c287ca212abe2682438042526ed9c28c3a67ad5e4ee5ea3ba5cd6f8c3e4f7";
+  sha512.doc = "2a95118ef33bb3487dae96f08926f3ca35a9a23ade7ff2a2d917639b229400b75bccac318710fae8dc61d5cad0098258bb1d0357c67d847129632c03b5f8be98";
+  sha512.source = "5cff0f11ba55910dae063ae7bf1ef41f038e900b08b0dd406633369cba8b5741a05f4afed3dac7d371ed9609557c5b0c244cb3040154e6bcfccc7b3d32a14370";
   hasRunfiles = true;
   version = "1.02";
 };
 "pst-light3d" = {
   stripPrefix = 0;
-  sha512.run = "b5736937469ac7cc26bb6d1fc1bde27bb36ae41c7205ff27f13906ba3d1a0d0f22f72bc5dff1f2f70e34ed5abd26e784d338baa69735085e01b19de0319d8259";
-  sha512.doc = "3b0f13d20229660f20fb649e0597fc04362a14298a5a8854497b6e5d0fb565578d3dc512a5069c191cff7abc40dabf7eaa51550ebd707ff2014f8a63ee503c73";
-  sha512.source = "93af4a5da733bd20dacba994f86400bfdbfaad55cfee30fe8de1ccbdd9a783dccae2ded211b6db7841c5f32a8ac180d7f832bc918d585f196ee4829dd808d8db";
+  sha512.run = "7130e4626b7b793fa85a8eec4d97f4977317fbe4610cbb793003001000481d243fc304a7a0e7daf9559547b8a5a5707fa6c9c2db022346e3cf7a701ad080b9ee";
+  sha512.doc = "e848dad90b266538c9ad71c5d3a9cc892479b947120e3c35469b6ce3e22bbd4594ab544b5fc9c13f38559d1643d8f0d2cbf7f01e6f08f6d56dac7aceee875a64";
+  sha512.source = "74551e7099a63417322fa903ae0b5c69aa0d26ea97a188cf3fb7c2495d478c306ab6ee86ee4fa32046a5db3515974474039040ca20bc64f6b41ce22a82927bec";
   hasRunfiles = true;
   version = "0.12";
 };
 "pst-magneticfield" = {
   stripPrefix = 0;
-  sha512.run = "4fba74025016ba17ebc52f6c7b1f06e29eca053477e5ef741586aca1612f81512d7a2339bbb527f95d461808e0eeb606dd940f3c00e11943252cfacae60e8d4e";
-  sha512.doc = "004edf7cc9ecbb1c54db1a940848636b2b7801f51b235dc4475ada68840a925a58dd72772a221b84fc3d0592867d8152d4b5dde9c4485971f91d2a3f963fabb7";
-  sha512.source = "35c7aaf381ad200b2a62600e35d3b9af0fca90b79a83b4aff5529ad3de9c128bcc2125d390c8e7b89e527694c8f8b6d7e7ce0c31e0f107ee557c41b6c3bc2d8d";
+  sha512.run = "90a08481d255a7b64d4ef654f401f44e14614b85de8b1e89e3458ab95390090c832e33774276165e495a8599b88ca9ebe3fa6da284b2e6bd3c9b5a52618e9af0";
+  sha512.doc = "90b0829ca0349f9fa244f6f6fb76d452a4660a95b80832f780a3942cedc516f95b3c5e2a3be8b86d9db607f3632590bc31fee3f24d90219e152b92289b79c07f";
+  sha512.source = "b5a8d59bed89455472612606ffd2ff82ffde14dac3f87548a64a9e7a9dd69a2cf435745e60792f36dac7f685d5d2d09b2d7eaa4f3c40ed4dadafc22ea4d0f556";
   hasRunfiles = true;
   version = "1.13";
 };
 "pst-math" = {
   stripPrefix = 0;
-  sha512.run = "0c55acd13525001b201dc1f7114ba3084d8079eed9fd1f8cc599aea774680177854515be36acfb0fac5b1ce75573ff4bdcbff9244e0bdd075e77a3a72ee82571";
-  sha512.doc = "f97806854b1cfebd0703ab6229c881fcba4af5c026ff780121d0a46e34aa7e0fd0c3e9ff5f0b60c8ea3a2aefc71a23c20f6400067e0d04ae258d43a50d57ea25";
+  sha512.run = "e1d2e86a4ca33553c75091b91d3f74d25bdf3388ecdff2886cb2364a309dfc307176f36c51fe5123ba1a99bd80ac80bdaef2bff50b4f3c8270eefdf4e96f9afa";
+  sha512.doc = "d6e4e9a72d8b5ccbd83fcba1bcfadb692e31e2742462bb8ed931488d5f1ca57a181422b6df16e5bf1829b9e6b5fc1b94a2f43f849f52307044bb97e9e4e9df9c";
   hasRunfiles = true;
   version = "0.63";
 };
 "pst-mirror" = {
   stripPrefix = 0;
-  sha512.run = "c60a4e3e4d15fef4e42db4abc48c0fc982f9c3c60df6e14edfee6e162e22b51faf695f5dc449374dc7eeea6e1dae4c3906abba6f2aec7157572f3c694824870d";
-  sha512.doc = "2121e227ef43bdb08f3f64943adfc43ac45bb9f0246accdc8ae8401aa49720ff935a1919e01e67c614ad134b4f1c88e271a665942c378c565381175114e84276";
+  sha512.run = "6bf53ddbdcb2aa1a90c065fd102033d9293fdd7f8d413fb711f8e8bfc006251f5f374dfa58bdb9d33ce702c6b9a57a4b7f1e3090309ac50ca081114ed090d6a5";
+  sha512.doc = "8b2488c5c4dbe89c5dfb7b4d7a73199ac9e61db99507aad52497b4bf19e2c5b3045fdc48ce4eb9ea1897644fbab26adfb4eeb9de510a6f312e36252a440fa9e6";
   hasRunfiles = true;
   version = "1.01";
 };
 "pst-node" = {
   stripPrefix = 0;
-  sha512.run = "6e089fafc3c03cc6a942cca2858777f2792177dc130962538552280298c2481fcd4f95269447a25262fac1aaf82912900d37efd9203d15a0629873d8fbd38860";
-  sha512.doc = "c2f212340551a70553dfff79243ae4adc7ece7b62cdf6fcfce5f314c70ef41e8d78d9b9fb406c3f1105dadc4896a35f9b8ea8015cad89acc7d9605ec06da4c30";
+  sha512.run = "9ebf3355f23fa67f2469441f77c7a58b8c15a7eb04e20de80f1a921daa2e67fb176e341d068ad3dfbfbf17e015c75f9b9e315601208e17df92ae3051eaa21bd8";
+  sha512.doc = "45eb2db40396e1dbc3c42939270071ee6091fed63f9b2f8b30da076b8feb8bfc6deeab30d5e1325a9fcc358fb28e7fc6e207e28b55a3da6244120d0973f8a288";
   hasRunfiles = true;
   version = "1.41";
 };
 "pst-ob3d" = {
   stripPrefix = 0;
-  sha512.run = "096bf22677d2bf1000d9b8bc6628e9611075a13e079238fbd26a60524d622c3db8f7eb3feb29aa94aa39169964f04b22662c23333d7855f5ff0ee41fb3425c39";
-  sha512.doc = "0dc70b9a35556109aa47cddc48528b01dae6f0e3d70fa66120b60240e8bc113b54956da609d1def6339dfbdff9d4b50fd3bf806a986442a7542958e1c637cb93";
-  sha512.source = "bfe12f0ffa82867fac346c380810eedc6fcf0760583a8c9636ac9c24d61866fb2466cbe3a30913d8e01f2feaa51f8b0fa5af8a6fe1513789d60c14eff18944ff";
+  sha512.run = "23930d438d23141591cf02c45b22396935cd1b54f8a75bbfd8729136ae8f57951d84527d0dc4dfd701dca7ce9812643640c0c0afaa7048733d2d46564720d617";
+  sha512.doc = "8b916b99f8610121fac8dfd4413dec2c96b7be6cfb676b7a57547c66ef8dee4917a5642418f77bb47174be9ba2fa26328b80d09af5da726430197b96c4f215fb";
+  sha512.source = "a6a0c47dc4938d1a461952cbe0559d25895e04c90915b6b13e8c3133b160c913d7601b397e2d4e1fcbb376b2c119bb7cebcc2ebd3890cfb81e8bdc9b9ca4a4c5";
   hasRunfiles = true;
   version = "0.21";
 };
 "pst-ode" = {
   stripPrefix = 0;
-  sha512.run = "4afc694e6037d6e754ed7b578e686d3761e1d67851dab7a1084fe3bf36dcd5ea50301cdfa629c2608284a89ebd4fb13fb10b3e96e9e2b1ff2f99528fdb5bc677";
-  sha512.doc = "3740bb9c2905d781054517fced5635d0de9aecd8c742a8001f590e9d3fa8e7d7f1379d671ead5f2b98afc389ca2d6f4d21eb205bbdceb24785b86ce4d4d025d3";
+  sha512.run = "746c5be1c6bc928222c2e97851ce43cfc7420587adc0590836a696ca0f08baaaca53319a3aeb4a836eaf430c1e90bfd04f9318137f2ad9a071050d25ee9a51df";
+  sha512.doc = "5a0beea3a720b1e3401ad90f8a33b0720ce162876e377f827a4eb70e882c616fe01b7bb5c31bb8080aaf42edca5a5db1ce5f22e3bc7705f5a6d63ecf74e12ff2";
   hasRunfiles = true;
-  version = "0.11";
+  version = "0.12";
 };
 "pst-optexp" = {
   stripPrefix = 0;
-  sha512.run = "2aa4b8bcb37cd2559d83ae4251a1b28c84c18496abaa9ad0a39546057ea7fbbfb0b1d4ac84ce80e98c8c8a4d32359350796c1f0e3c07b2cb8bbc7d68c81f5106";
-  sha512.doc = "03221bb8858fc8f8e3ae727fd25c5b4d5139c519289af0500a2f2e08ba8fdb9eb3808bf3bc665ce8118382163d1e31ec1f0ee149f9bda475d267f2d0f41b366e";
-  sha512.source = "2ebe5d7fa8070083ec7c645b9c63896eb2dcfbab5dd7bbd51a32759773e1aa311c11e952b4bdb827ef0bb2c00ea04f294653ad71431313a7f9403c2c0612f27d";
+  sha512.run = "98016815e185ee2ededb6abdd70f476a268bfcaba98208b7037f013d6a28a2fe18179a8d461910a50dcdac7a2d13df72b78d4f39e884b751962c53774a42d283";
+  sha512.doc = "1aab4ee03b8c109c0fa92b4fb9b5391576fc91ca3e12e02b76f3762035abbc80bb0044d572532ff1f4b7a1f3325de330d6066d8fb1ae8d3d6c2b9fc46475832d";
+  sha512.source = "c7e7d135d47f880950b2b8dc802bad8b7b8908ddc858f0158621d0b8c654453519aa0c7deef75afac5a8f53746784a37c27aa1b2e72aad099ae93b4929f23e10";
   hasRunfiles = true;
   version = "5.2";
 };
 "pst-optic" = {
   stripPrefix = 0;
-  sha512.run = "b56327d618b5dba511991785122ab7553d7b9c617cb0cc5244cf025899cdda266db2c95e6d37f87a169aae477029ea00c7c60a3b05a6c10060175c48d023fc4e";
-  sha512.doc = "c73a543d9c02337e18deee8b4b44efc361d9f9b495d9a6944631ceec2788ea277c0181e001232682bdf314db86e4799f2401d723b8078690f27410eedccf55af";
+  sha512.run = "557d2a0db4731adeea0395f68a65989f5edd558f8b0ba00e1d7a43774e3c6e128f80df5977a4419f4362a96594933bda7f81b3a275653d3984dfdd25df5008a1";
+  sha512.doc = "3ae2d15d4d0daaa350014923fa1c273e18c9454996220dc022e3770312f364ad64e822114e93a805b134f2ed1e6a970c058a53edbec640b3e06b933b41d32f27";
   hasRunfiles = true;
   version = "1.02";
 };
 "pst-osci" = {
   stripPrefix = 0;
-  sha512.run = "1831af8a78c2964d79078c89f7628290507575fb3ed597d21ef706c4b100d5864490f9e528ce05293838598ba3613b58cd1ed7b018daf8881d369540d1ac198d";
-  sha512.doc = "e9307a5dc8ba4f67cdc5023b6efb4df9e39cea3bcfcbe70540b5b5e2ac10b18215d1f01134ac303479c8825535b6241481c4238b18fba35e81f699019942f9af";
+  sha512.run = "6f3188639903d41ae04591886a5554706df11e5fd3fbe9a9907ac22182a2fe8bcf2303d652ccfeb19bb310af66075c4a5d94c47290ef9ca74eb80dd6209ad010";
+  sha512.doc = "55704231e3d99f1d41e89296023945d57d9a06d2d7a81242910c7fbf5426d44c471baa929308146a80ed824146fecdcfcadbc5ca31130d89565eaca1fbd2b69e";
   hasRunfiles = true;
   version = "2.82";
 };
 "pst-ovl" = {
   stripPrefix = 0;
-  sha512.run = "ebc4a824dc10c4c9efaa2d5baf9f2023ae0bd4367566f8d7c93ab323c0ad8c989c9c22509532788c5f29632401e8380cb3c2dc2bf599f790ad21e2d8efd9c910";
-  sha512.doc = "24d303e7cd8dd104a6655bbd51eb3aaec43c9f011b3e225e7382eef35ef8972b5e060bae8ccb7ecfcd2a4541bc409f920a590629eada378be6dd5988a3b09c04";
+  sha512.run = "6b1ab074412f058d0918174b94f746b01591843a19632b0ef0de3a3b4c990441474fe95a29e774c93d32b7229dab78fad1c81783026f839466c9c1d74be49bb6";
+  sha512.doc = "a5816b91e3e0e094e734eaa3d972d8ea5967580cb3849bed6178dd892b0dd12a896f9147cafa6c1c477f94239df1af81b55ace9b193980e49028cc7161ed7e64";
   hasRunfiles = true;
   version = "0.07a";
 };
 "pst-pad" = {
   stripPrefix = 0;
-  sha512.run = "03b2b6894ea73e0848119667eb6d3bd63cd74224ff74229dc6b81809f19e473de116567d9294910281b96e93924aa66df709b012833fa2f3d5110c6294b5094e";
-  sha512.doc = "6873976607a9b707a762ad9f565c07ba06a925fea6832919aa37d671a9bb70f149a07858e3a309c3bc4f6f945223277f04d00ab0a80bfb2c4c30535cdbe74c02";
-  sha512.source = "4c531a2f4623d4899fb461690ffb58578ae3b03b2a1059dffa841cd641ba1378c4d4f13553202da027699349329659eaac059a01faad8eaecc8db01c5c1e97e3";
+  sha512.run = "81670343167d716927954061016cad8e239c9fd3cec313fc5238da30cd3f93a9495d662afae7df6aead69853dad0942477adaec2e6ed9c6737a1eadaeb32893f";
+  sha512.doc = "572d5d79d08602a9e085e8c796fa332101a683b7328757d77e3ca56c949015e025068d372349ed07a884042f75c2183d8186317600996a5224ab360b6ab6cccc";
+  sha512.source = "98841a9942326e96898b7fc0c318d83b12aec22aa345852c5f978f80368a109563246e173c8ba1252d5a0861c197fff1693b6cdfbbdcad7ca52adac1dc592b5a";
   hasRunfiles = true;
   version = "0.3b";
 };
 "pst-pdf" = {
-  sha512.run = "ba85656810cc2c0b33b133a756266c052ef0ccc1663be3df05a72a49b8ae55351240cb4635aa5f433c8d2184fbad35edd853e8b365af681fefef36f5a1f6b312";
-  sha512.doc = "c096a636cc8d11944b4ec0a5098af67e1813803131474958fd9b7335804edb48ea6de9c5be379233ce36b6db3047caebf477a391ce398edd7df53ccca9c62e4e";
-  sha512.source = "f0ff418f33573f9c2df4c86846c84d149c2e9cd41b8e1897372de24d8427973abc0ff3935b497430d2cf13864ec6b8b6966e7fca1029bcbccefe5bd4a9719109";
+  sha512.run = "c9a079b3f0b01daae0cf2fa554fb939ffcd585e83acf22eb04c259de986aab0cd4a17f88f96696d742eea0c84c65c3e32ee5c9f4aba4f22908f83c81e2b1cc3a";
+  sha512.doc = "1fd832b8f27eba2cf3cb8af6709b9171f7da25a6ea6df22dd65727df8b28ed073d3d57baa88d6b585514b3c617a405f73234114fd66b07e35b8322cf03a89d7f";
+  sha512.source = "5e54c108e6181c5ee92dbd35f220607aa98b596fe35811d5d88fe0cabc68fcca217e6d6b2e2586defd07d116400823bf0804474b70c2270560c5396a5e39f7c2";
   hasRunfiles = true;
   version = "1.2d";
 };
 "pst-pdgr" = {
   stripPrefix = 0;
-  sha512.run = "ae0132da663b1bc2b24a3906cf4498084734c2c3ac2241b12ff8f28891ca2b4f732b04cdbeaa3dbfce26b602ec09a8c230421607bb4446d4bafa5ff035d80943";
-  sha512.doc = "e0e33dd3f2b178bae01c10b281b7d38a6803f8872dd04e29c5d40f623f3174484a2931162382e3ca400baa43f614aaab9b5eec9233b1a854b9db47dda9abc2e6";
-  sha512.source = "be4248289528f93bb26cf8948e93c74478215ae2944dc54bd4e9c0db3c403bac30640274973ef1ebe87607bf5df449cdf0d5ea470a5d21429334964b31109f62";
+  sha512.run = "d59221926220e46ba52d1156497afb7690184dd9cfa09e9f2cd62902d67743d9ff6ec976f50fccc50090eb96dfa5e4233e8baaa67b2176b202216d0e921af3dc";
+  sha512.doc = "0d7ca6afd872e04aba4049ce242e2bde6e34ffd5bc71c4fd6dc683f2e8210f372ddb817758e6cddc001930450f3ac80f9af7db0d6839d95ec1c56d2a67987bd7";
+  sha512.source = "4b5c15f28e408c1e7ce80608b3838d42f1b3c12f8c1c1b6865f9053c299441f146a90830e5602aed290d0c15b2ea4e86fda76a74cdbfeab493ad9c7ff8594d52";
   hasRunfiles = true;
   version = "0.4";
 };
 "pst-perspective" = {
   stripPrefix = 0;
-  sha512.run = "97bed57fba37ce5b8f7000e0c00b27be06439b680fd2aaec325a7c7ed261664e124873453aaed218ff6d5825b2a80f6e7e72a9463966496bf02eb9d3c5957102";
-  sha512.doc = "e27ccbf7df29e87b823c6bd2e7cdfb95efb272debcf5d420d987fa0d26419c72fba51e1fc263c7baf2e88bb5fe9eada9c3c6fe642f984c5475e647b4acb3868e";
+  sha512.run = "6787f0d3a5c27d4590967bfa3b185248b78d2956926d1e1a747036de73a4ead131f27f6367ceb31254ae094cfcff4eb365c3771b79d5aa5f121ee3ec0d24a299";
+  sha512.doc = "75589c263d16543ac02259af53c47f1fe1ed51eeec0ff1ad8fd713727d8d317b900f58b7835cecc750eda7edac9b8568932dfae7477ad8f735b502d905fa1b21";
   hasRunfiles = true;
   version = "1.05";
 };
 "pst-platon" = {
   stripPrefix = 0;
-  sha512.run = "a40c20163b2d4dfd79e116bef417c734169ea9134746dd8ac48c7b3740655ee0887fa819901624db18cf6d7171307e4d0a20b490b263c31bb6af7166c35d3fc0";
-  sha512.doc = "5741a3a5b4b9409cd9dcda0fe271a0476ee83fed081c3cd7be6c10892e2d2b7675b817909bbcd1771f28184a446164e7bfe94317297f4d6ea693eb75882338ab";
-  sha512.source = "7b983d8fbbe702a2eefdc143e317ddb7d1b45d1321afc2ebaea2e1616aaaf8cc391ab6d71a982d2e04fa94c361f9231d674158a4bd2ee654676e4bb8ac4ef482";
+  sha512.run = "655cf06fb8edae714903cae3f8eb250e3fce466b98ecc6ddc4635c0f420923385e8a94750b84f906606b6ab5a43984bc0618faeedb3aa8cd121a764668a825f6";
+  sha512.doc = "46297eafbdcc006f514fc435c883658baf9a67217fd995d9c70dd1e116d538f0a46d895cd95734bc24fe1c01ac392cc5e134617134b52c6a11ff4919681a97ee";
+  sha512.source = "e453ab72984f6e47995d5ee1d058ffe7bfd10747ef46df1830094179f1cf0624ad3e45406006e467eb351ec0469d6de578c2a0074f40169ae07c36d0bf039914";
   hasRunfiles = true;
   version = "0.01";
 };
 "pst-plot" = {
   stripPrefix = 0;
-  sha512.run = "17e7fe0dd8858393ea2aa9bb2f0e1fec6713259f1e2dabb43dedbc9397031408a8dfd4649b3b80cb0e4ca8f746530e990c10f8011c4ccbf07d9b76af29c5e9bd";
-  sha512.doc = "e9c3357f0f00e60a8ddb302f5dc339048fe537d4a63d3b8aa1930bb547620ab5f7e9f22781730095b4d008b9a92eec1ae14c87b09cc56d9dcee3ec5c14379218";
+  sha512.run = "e0736a975b4f56600592b498e1e20e0d77793281c4157fa08b0c3f0769ca81b810a34f79d8ee8b7de880f367e3fa5cebb8739e7dd114aa080929e8fd740f1eea";
+  sha512.doc = "0adfbf5bf05e164f52b6f904cdc528947e5dd64c0d50447e30cd2be92aa55755c708a6f81ea433290418bf9b16ec50fab49e91f813ba6a2ec4681f3636ea73ef";
   hasRunfiles = true;
-  version = "1.89";
+  version = "1.90";
 };
 "pst-poker" = {
   stripPrefix = 0;
-  sha512.run = "b9a7b33b74d223bbbf1f25896efff3709f9f862f9c86f32f0d859a95f2af062dd9de6d47e1f7126cb4afae838a791a1c48830c35a68bfb7035f36b59e2b66648";
-  sha512.doc = "9ad9ebacd874816e24b78b47f0ecc0e2653ccfe9d7de75b764a7b754b5b1192b5336d2b82bbb60af5dbc8dcd934d77525ac8952d8457347a17670d69ab78cac5";
+  sha512.run = "893265f9a0dea9a4a473de5480be0592b6acd528fa2ce605e7a21051305b934188e49fe16cb6c71484e73e256035a28c6fa4fc90884686580a9bd398282e3f5d";
+  sha512.doc = "6adbb5f467e5bb98ecd708c85f4a2d3f20d385d0ec0795a823b326c2dc33f1a74b1ff388f22f77a4b426f22404dd7a0f5fbf6b6258075816b6422cc4adc45da7";
   hasRunfiles = true;
-  version = "0.02";
+  version = "0.03";
 };
 "pst-poly" = {
   stripPrefix = 0;
-  sha512.run = "6a00f8837d4b14fd1baecff8cd6fe869ca452ab15500403a3103c1e5cf44846bb3fa04f08fb8b2f4fb676d030b570ee7f6ca462e52dffa1fb92e099d8d26c279";
-  sha512.doc = "b53548ac6f2adda7d6cffce8d4f9fc8e4f975ab4a6fee8a6ac71d26c722043aaa3434fe9fa8cd47dbbb41091115b2a98923720e04f0f730ec4050ae9b308b3a1";
+  sha512.run = "7f2dd39967b550dd4b5394b27a5a85919a04b71564178464dabada5ca9ccf9d4f04b88349f0a1f2af98df20f12a0f3c57571fa087cfd440989ceeaaa025621bd";
+  sha512.doc = "059a35c1d279453f9d9127ea9fde4c88ef744f4f87975c51084e12f73c5a376af33e097bf11d68f9827295d195174cb43cff55995954e8989b81486f13edb880";
   hasRunfiles = true;
   version = "1.63";
 };
 "pst-pulley" = {
   stripPrefix = 0;
-  sha512.run = "9598abc1bfa28044fba9d2e53c7e866c472c5dab19a4def4d7a489f8837599a0886f722fa5409fff2635dbdebe4e673fca2d908aa509f81fb0f32b8c6aebdbad";
-  sha512.doc = "5ef753430666ea1cba5ac2a038a9ef45c334dfe924e3d385369621532777103047cfaf17e54855374ef0985003d86291fe569171091993f30e79b44d7acd3c4f";
+  sha512.run = "35c4a8f47c5053c93717f972dd0ef321fe6b37f84b8b6fb67141f3362e93aa87b7ca4cbb288781498da8a2b5f518ca61a45935ec1c9ae8417f90c96e7aec1361";
+  sha512.doc = "38890ad43db8dd161383d3c926d60b6ee393a4813a88c765463e1dc07232355193f36eba861d35d356b858ba18a43e63516d9a738d4452f7f8e0a2908ff81f6f";
   hasRunfiles = true;
   version = "0.02";
 };
 "pst-qtree" = {
   stripPrefix = 0;
-  sha512.run = "520d30eb514a840d1f3408112968b7ce53ecfdeb297466f9900495f9c0467c3f55cc87bd04b1c00ae7bf85297af1cdcd1548325aacf8208ca4de80c4fef3f703";
-  sha512.doc = "0bdfb038f975d6fc17bd2f4bee2875419c0975543217ab0bb63e84253cb523d95063533385811cd77030d9a2525784c2f3355a4bf6f111b30d1004429195abc8";
+  sha512.run = "5982a5e5c1b2e380747d73768ac65dbf3ad89d7ef5e68533ebc6f953da76d730eeb6067869035e668b9fa2b35f20a5328b3f2d79fc920f17f47fba3a2dd37a9e";
+  sha512.doc = "d4d165b271578cbf36acd936752ac8c8502a28c035aef83f429b17b77735124861c7356d41f497741764699523b078cc1015a7a4d53cba2f905b5522ee985edd";
   hasRunfiles = true;
 };
 "pst-rputover" = {
   stripPrefix = 0;
-  sha512.run = "acab00eb0cfd0ee1acb6bb2ff57424a15b5a416c454b6b461136d0e921d239f7fcd667b41c766caa809106f3661fe041b60d9e11431e76c5e9a896b993cb9be7";
-  sha512.doc = "08349db0d7f6a622eb79229d9c2ad024781cbaf793108f545863b9feea5ae7dd967b99146094fdb0ddce98d93f8a4ba9428da6901f8c48f963ce2ab9184f9808";
+  sha512.run = "ce8c5cdaefbf9c36079c8f572059ba5e997a46fb653bb7463f4044bc7ca7e5b14a3c17f21abac64dd638a76ee9fcbfd5cd27f804a7366ff73054f9f139752b95";
+  sha512.doc = "a95a3780518286d8926d86b7bf1d07006705191e7393f268b09c5c36e9388ca88f1cdabb2559228a1e8f0371a8c1ff3745c89fa1ff6efeab19a8dfbbc3dd55ad";
   hasRunfiles = true;
   version = "1.0";
 };
 "pst-rubans" = {
   stripPrefix = 0;
-  sha512.run = "05d62d7cd8d987e8a31b64935e981c67fc325feb32c1fc40335c1ad58dfcf284125c0748d71151f7d00c5bda2770828eedc1cde2a130fb6f19e6806cb758bfee";
-  sha512.doc = "c558a30f538870b473ee24190c560c2d0976d7a1165f718cc0c96433a63f6897d95a28f9bd256599b9ed6dcad31cf075985c827091475d8380db8156c25361ae";
-  sha512.source = "1f0ab0f351171b0a760ae772bc5bf11712a75c07ab953cf6d7e6811bf65da48afaecb02bf30ee866254598183f7de54b975e0b83b10340feff6f3eb0626850f0";
+  sha512.run = "178d33d30fec6ddc19e0e82a7ff123a76750113e5c0ab3cd813ebd0768c454cd11042b82c9a597da5cbf7cb912398c0e6755624c7adda72327dec1815a524fb7";
+  sha512.doc = "62f90f38b6ec29f4db2174da6514e472ca8fa5e6c0f27e2713ec6327a21c69e98a0d965b48219de27a15e8adc9a0a8fe334647a40d969ad057b20aab8b6a2a12";
+  sha512.source = "4a665e659ce748716093b2b7a13adf4a1cf0b4f40a876480206d3b444607150de3d7f75fded868bb29c9f7b44a32037cb1d51765d50011401063eac403759f6b";
   hasRunfiles = true;
   version = "1.2";
 };
 "pst-shell" = {
   stripPrefix = 0;
-  sha512.run = "4b89a1c9e4f845cdf4f7869de30337c69b2dc40e65914432a670c19358db772aa93083727a12e991792556e767e8e701000a927b1fb2f66c102fd299d8ec0be7";
-  sha512.doc = "ca73110acd83de72a85379b1a46dd6c3add897b93fddbddebf91f73c60c64cce844ce4744d05c3b612211f8dfe9405dffdbf1a1bed5f13af9c7de3ac007deb38";
-  sha512.source = "4a70745692d1b1722c1c069079db9de8daa6bb0941d5c3cfdd30b2afeeb5401bee19e9da72338c01b89ab5d4e7ca9b8ea5d5fce66cbd01963465e7536b2c0c3d";
+  sha512.run = "4c4dfa130a66a4ef97f427b803f9dfddabbd91fbf053d3ab6fb731a104b7eaba26df4696b8c4b325c87a34181f014af8987ce19560e140131fe4912a81541be6";
+  sha512.doc = "cfa47d2a93091ffbef791a3a3184ebcd507d90e84b057283c766b0d506b9383f07363bf0403d601c7ee90c3e59a402a999aad4341a9b28634a3708f94b74e547";
+  sha512.source = "fca5297656172e7ece0d9c3e5b8d6c50eff07e13e3deb0e9bb1b04a2017c3a0cff26fa62d38ac3f33ed3829df787828829c9e542e8c4c96c2468955b750d32af";
   hasRunfiles = true;
   version = "0.03";
 };
 "pst-sigsys" = {
   stripPrefix = 0;
-  sha512.run = "746d627f114bb89deae9f840090731d8a10971e97e17f0a1a721c10fe0322557bb061930117413450e31f7962805c6ca8e46e435f9c960c4889648e54b756908";
-  sha512.doc = "13ebd1da5b0b1b7ebc5e3099934dbee9b3e6ab5d48d6abee922c931d2293351b11c0d8a68dcc57996e10e580c950f02d418acc68e0f8cb96da48af2639b048f6";
+  sha512.run = "fe02df794ab22277261ffe4dd98c4dc039a2ad07b550dc1cbe586db337f44492d80f146decd102422e55124ffe38a06ff084a4d4ebe54828df1c60ad20db4292";
+  sha512.doc = "8b864efae0b9d711fe889e64821605d3a90ba5b98ce742cf40bc6ae9cf942cee19fcb155a1e45903f14bff4d969c33097fd289283d58c5f5379f9fa7155ef2e5";
   hasRunfiles = true;
   version = "1.4";
 };
 "pst-slpe" = {
   stripPrefix = 0;
-  sha512.run = "7f04cf465d6d53f2a7b6d4be254a2e76d3ced870bbc4a6eeb35a3edbf7797377391a845e1dfc2690a3aa415c345fc868abda7002c32c53af6e5f04c1d20bf75a";
-  sha512.doc = "2ef3d0969d000b407384bd27b84aa6a3a6f2bbe6ed414c9069e5d7db9948deeb51fe4b3d46beb7dfafd8777b85851af83bcbc61bc387321f5487ceef623874cf";
-  sha512.source = "02173a90232c9109e7a4e859eeb9a05faffbbf49ce9ca7782d423da9437d3615231585356c488d232d9720ee89ebd2e9ad7a53ad28cb20f68e7ff3ed04648fd3";
+  sha512.run = "a7c95aa3e0b3df061146e335b00d7fc129da3af3e616caa21c9f7434d527f668d03d72323cb66b3e2cf78e7af967d022572818de7c511c9e728d1fca190b70e7";
+  sha512.doc = "b9aa1a8388bcb915f1c072073329a3b8014195f05e76cc366a542b428e7d361596870d9c562d7973402c4f3e710ea67aaff1a4cda618c9d6db312fe358a9a0b3";
+  sha512.source = "de0a4d9815f5bcf3865fdf71f23204cdda35ed7086572380a5174fb8d355c8b2aa37e2ae7ff42f90a50878ebc24541e3323026e6dfd0182807f38be14bec878d";
   hasRunfiles = true;
   version = "1.31";
 };
 "pst-solarsystem" = {
   stripPrefix = 0;
-  sha512.run = "669d48267d7b8cf76c597275f06f1c26a26158411945bc9c9cc72e777aa84e3e669c8001d122322a23827c37e559e40bff9223d8b6ca0b6575799d5a443601f1";
-  sha512.doc = "a2a7a4f25fee693e4558ca587c34553d49afe1f1d8d77c0db1b021fa706e5c184c18c3e2e30950b5d05505900a03c60324a346fc5e5c1be5569b2adb3939987c";
+  sha512.run = "81c0530f53de54f2918dea06f1249d37e05d28846ef42fbee30e04269ba6dfb9b1e1208615fc1bffa6d1398af75128aa23edda6cd1b0c3fd7be19c109003ffb4";
+  sha512.doc = "fac0b481c81e2a7c460e840ef4b77eb31956ab80b879ba137bd3ad9d82a0be061c674e130616c59b31e4915e01359c3213b9f58445218cb11f1b765e85d1ed53";
   hasRunfiles = true;
   version = "0.13";
 };
 "pst-solides3d" = {
   stripPrefix = 0;
-  sha512.run = "6a19599f2736a0909206cb7ca7e91912b68febc746923d19be8c0b938b74c7b48212a2c6ce56d51a0f59f89d11ab06d222c68bfb90e6144d9dbd1949072e6f62";
-  sha512.doc = "0c2e8722e6b9c2c78b9cc05d0a3ecf86e16e421754e4139fcc227ab9bf9f3bf3346b823c3433110d07d8537cbe5da072f38e25cd75d5a7e3fcba23aad9316602";
+  sha512.run = "1b0405926a69e99ce84289bd753d3d1cf9dae05fca3d187d26e427afd4c0c883af5672b2d44cf045a7a085ee8137ba28d1a7b54fd171331a3d6f3e1682cb21ca";
+  sha512.doc = "a67e0e7c4fcf31106e34bcc44c546f205c7d99f9150e374439e06f4458de9019243cdae3c5ddb02836065ab9621040c910fbd89933056ad06185fba889a9b4e2";
   hasRunfiles = true;
   version = "4.34";
 };
 "pst-soroban" = {
   stripPrefix = 0;
-  sha512.run = "224392cf4855a92569f55b7a380a639d60acf15c1760e8871d3dbadc4fc0d645b8e5baef0cde76b9bd3462e7b1cd78b9e14840d6f04743faeb5acced8ef0d8a1";
-  sha512.doc = "c5f347d118d432cdeac74f1eb2c62c186cdad152055bb1a29971c80bd6a267176d411d6ab0654af4b6124aec579b9b56b3e3f2c216a09edc15d3df0a8242b68e";
-  sha512.source = "25f3d44cb95b5615e66a6b59968fb7ebed115524eadb401d8ded94726ff55a35bbd90140285a809a049e6fbd48ffa5a33a954fa701942868245d41c132ac6b70";
+  sha512.run = "d68e1edb82bc68fef190b4db7fe0d97424bb5efbf6cfbdff287cf4c7eece44965ecab28817cf497f53545451e04951c3719d5758a54bdf3a8968187c2a55d8ea";
+  sha512.doc = "8055b92dc7bf073cf453eac72d2a90bfeb018a882da9cf145c949d1eaea24147b49d3b402443ee635f05166e9eca70ff550e38ba7e95e22a7c5852288f549765";
+  sha512.source = "c76f32794867ce9cb1067198bde8072628d106a9f86ec2cf4c4f4409fc407391ac63e4e9d3106b51195e9cb9650688986edd8a443faab8457790b7066112f2f1";
   hasRunfiles = true;
   version = "1.0";
 };
 "pst-spectra" = {
   stripPrefix = 0;
-  sha512.run = "f947b7048e06f2304a7367e3eee2ed727a7f4085eafa89459fd44605c2e3e0e22b085bcd78fec520a24b7afba4a41fc01e6ea15374ea9dd1f899357fe6ffa3a1";
-  sha512.doc = "243b00e5fbd652ab3ecc437caeb6994ebc7521f9360ee6f704a47a125b144eb49a3fe4ba0c0baa02430bbd842d05382cd9e660cbd0f631f7be858927925aa599";
+  sha512.run = "e13ed3972b579274aaee6b4f9b7de5f296a96c4438050e83f683c5154b9b2577feb86d222063a9315c1d1e600679ec97994f3f74e4fc48d1bbe48e315bb5de50";
+  sha512.doc = "5f55b77868ebe979c1290f360e0c6e4402a8bfb73014106e8d5764d037e028ac4a3846a8833cfbb40712cc7ca7451e74ffef4369d42a24681c9ccb50932207ca";
   hasRunfiles = true;
   version = "0.91";
 };
 "pst-spinner" = {
   stripPrefix = 0;
-  sha512.run = "4abab2cd69fcdda66e43e5af60926b0e1c94b00668dfec1f5ddd609b626c0f318b248d4dcc3b6de77b791be6e6715d2bb5925620b1b9f6a211b57e720d684d3f";
-  sha512.doc = "c5666d0aa8176bf0fffb2bca7eb3d135c09ad804983f59e00421731054734c0e6b8b413852c26b59e226840c60d98df8828be402a2cb0ebc83e626b8ba9e6e32";
+  sha512.run = "1a344d248b4f3e0e394c149159f47a271df7a8f3b168477909b87080557fa6ce7a0760843f8579c3a18a04d32fea4a92b1cd8f20f87ae01680779aff67d7c82e";
+  sha512.doc = "841e76e46dac07678d571b6c5126c7d9e8919eedd1b8719739d83f2db6f206eca7694813f5394beba71dea3699fbeb213c9357bcaf5fb8680e6b5d0502b82a84";
   hasRunfiles = true;
   version = "1.02";
 };
 "pst-spirograph" = {
   stripPrefix = 0;
-  sha512.run = "7ac4c84a6b4d8d14ddb1b025c4ecead4e8cca2c6997e0c33ac0184f49c205fcefb5e3c781250d8c969dbcb82ae209e293a988e775a4df93c16d6046fa1707597";
-  sha512.doc = "33fc4fad625d384cf83eddd798f78bd3d1b0a26c5cf9108fe199c53f9e57b58119b12a2c70a1ff168e830af1f0eede9411b8714f357fe8cac41c3655d9886f2a";
+  sha512.run = "8ae7896243a520926d13c57a23a599f489807fa8cb3163a07c853985add1b89516eed28f258e2d0abc3fb4ec5c3a1341e2698046fce1b8bcbed0fa1e85c1a758";
+  sha512.doc = "eaa5cba617352902de3a19a736d55333d520d8758ff8df86793960376c2c229e3354510462ae0683713d7fd9405fa1ec71c8d688c022f2017d900717c6097178";
   hasRunfiles = true;
   version = "0.41";
 };
 "pst-stru" = {
   stripPrefix = 0;
-  sha512.run = "61ff21d3e887d551fa6c294be9b2d5ec6b06b8ba08168299e742e8e0d319846e50c75253b4f1c351c49c31c4b6f1e2fdc74b02b09c4ae03c7e5e7ef9bb15d364";
-  sha512.doc = "548744786fa9ed3081cdfe3715259ab18d6787f4364ebd3ef8ca014e049c620c6e2cd9e9524084d0825a59a0983d6f5466f6f4787d4e07423d2f53299e68b555";
+  sha512.run = "aa0e2ebb7f54b3dc6c1c6f53e4f74baa52963ec2f26bfab78c41178b7a6dfd656596bb2ccf11cf2f8a38b3b553d9a9675c1ec1db4db82f3f07daa4267dd20004";
+  sha512.doc = "0a1aae1e801b841929fdc514d98e2a244cd0ff92b63069b3e297c1e4c879f51a72d0e694eba5b83f767b3be204f1042ba5f064900ecb055c5f6d53b0795bc529";
   hasRunfiles = true;
   version = "0.13";
 };
 "pst-support" = {
   stripPrefix = 0;
-  sha512.run = "5db1cfbb5f5ea6c92ee5d7e7967ecce9bfa9bab2b5d35db6fe6b818bf802be5508b9af339d2d5cb2fb038617e06ae744d18da12956cef0cac31bc868f22c2304";
-  sha512.doc = "78da9e2c6834078334b431ab98ce33053e1e390d2f4d274f912c98375a64b8df995f9dc8a62206c5d0e139656a04c0eb177f8bb0427b04426c903410eff37731";
+  sha512.run = "47b25cd0fd2662e7a6c5317ad060cc31fde5645326f8273e25f7fece1c6df5562c934f6f2ec10e3a3a695f3b0358706793c02f1e1a58ba461b7b6df31b495aa1";
+  sha512.doc = "15682b391f3eb970f6fe23390cbfe2c72f975b1e7dcc8a5d200784131d90bbc5839c14f36d059023c772c8d62aba336e4459e5b1c82a968ae3cdc032a8be93f2";
 };
 "pst-text" = {
   stripPrefix = 0;
-  sha512.run = "29cdbc4608818260449b974f23449aa4129737906f277011e9a188b40553ee3bd81c68a14efecc0c41e285ac267978675afe212ad7d6bafcf29b84905380ae51";
-  sha512.doc = "e1255f013562579dc88f431c5ddad83d861fe78aadccdf69a3d35cd88f2dafb935439126fa5044b1320f9c20b96e5ae2bee492e745fb27ff0717cd2b951ef68f";
-  sha512.source = "ee1f58690f12be2f0c209490f53c416803df81074af8da3f43035647bfd933c8ea0e63c7a0e3fca7ea558ed234753a987acc12f764fc1208ae1fb9fc4bd803d4";
+  sha512.run = "3cdb5ab9170d7ecc5193bca66772bc80934504ec72f2b1388dbea4b0d5ee16e56aef4c89b728c9ee0d137fc19ac61890321392df13105fe723de37525862eb06";
+  sha512.doc = "5ccc0506f25aec4c4e7dd8e2f7a268522172fa7486f2cd17fa43cb2fe6fe95629c057ddde2000aa8ad7470a599e7c6a6b5024c5716191459727b8ac9a497e1c8";
+  sha512.source = "5fd9d6031bcda55c1e620e8e423b980c221235dec41ad0d8f12003e1e6ec5bb96bc3bd3bfabe156c0bf862c58a258ee011254e3843b7ab16079591a4ae508161";
   hasRunfiles = true;
   version = "1.00";
 };
 "pst-thick" = {
   stripPrefix = 0;
-  sha512.run = "a4a868d3536ac66ac14e92f7393db64f0f62f8b242417ae4e228fa7d7af241299d8c4aebd05f611e96655df4032580ab25a3ae230a4ad7b47dbe0a487d369062";
-  sha512.doc = "b6d7c59485201ca390e6e4337695f97b9c9420a57462829a255a6c1d670755de98238415e1003641142711ba2609651bd84d4a0bb38a55b530c16b84b3e045f4";
-  sha512.source = "0e7709d31de48b74e109042e7bbd4a0f191ddb0290d37279812903d53a6bb90cd7718fc660bae65ab07c8a3f4b9de0598554b57b6fe8e9047d6ba06c95d702a0";
+  sha512.run = "ebe6b2ef7c537501314a1afa1ffd9d5bff65a8cedadf1f6239b408e19d976b1f8acef0971ee9cba967e807601bce41354f69118f6899207eb051a321aaaa8de6";
+  sha512.doc = "13fe9352c9297628cc6e7e90c828bfe4b1c1aca4d65af4b944d332d74d29625590d22466d31ba7d7f3e7fb6eadcd56a58f819ceb316161eeef5edb045a86c0f4";
+  sha512.source = "01d4b55db39de424fa050874132d45181c9c0039c46abdffef1eeabf290ffdc875ba0bb31e5b029cac2bff081d22e96b0d5cbffdf956feca2c3c2605d17e0b37";
   hasRunfiles = true;
   version = "1.0";
 };
 "pst-tools" = {
   stripPrefix = 0;
-  sha512.run = "7f4e89956fc90702b68f567b9019d7cf7744d6a711212e1254a8cc9d262147dd860107d80deab6c26345fb1031c3620c479b78e7eea5fcf451dbe416ccfe8b8b";
-  sha512.doc = "914b23163a3c0a7dedfba26b92f902345c5091d0ade91abeccc3a5ff90f1c3ab7174184357fe6d87d7d41f333176ba32ebfc49d5dec72e10c6af08d110bed5a0";
+  sha512.run = "d367cacb564d056c57af71f07467737bac73a1f0e41b443a9a76eea5d2cc34d15e91a47cce8cb53a68159f87677707929cb862fdef06cd7354a4dd253154e41c";
+  sha512.doc = "4e976c9101a25f6c20a5a60b4df88bb5104c124501cd7188df1159f405b06fb638259738c3ed4ff75e0aa11dbbc67743459ddfc1bb496998796918084b833582";
   hasRunfiles = true;
   version = "0.09b";
 };
 "pst-tree" = {
   stripPrefix = 0;
-  sha512.run = "a1414df9f119bd081af599dfa629a4894f09f4e0d669fae111002a7866e15b4d09c15da52f55289d10d185274220f959f965c617ba724b6edb6b75adf40d6381";
-  sha512.doc = "49957861198ff4eb3c290e906678a94a129afd8eb1ac10c35379794af8213011f4add7754f525ab4feb95f7d7e7bfb32e3dc0c4a0d3207b583f39852a07103de";
+  sha512.run = "7ac131959b9879902cec299e5afb22fb7c52e5b0ed15056b13ec6f34eaa71449306f1f1ac3d4b6552d491b8e02e57cf1e09d3d204ee38fbfdf6aab709d6b4b8f";
+  sha512.doc = "2b951ec9ddee3211d447334e39112e3f689269925a9932eb3fb9c53d4d7c185c34186edd440081296b53377382fab77d77ea5d012ccdf8701285ef555061edb6";
   hasRunfiles = true;
   version = "1.13";
 };
 "pst-tvz" = {
   stripPrefix = 0;
-  sha512.run = "0379fa7a1b2f657e5017d6c9557652fd73a21c65304340c6d607a143a76bfd5a09988d4049d9752c8f4623d7556f69096965ff37bcd6c4e5a01bfbd5b6d3cbf4";
-  sha512.doc = "7fcd64811f7c0449cf65ddad018f3fbb16d63a5aa49ec88c7ef688814977070b216bec614f77678a357ea2123f249a2f20ec7e9fca663e7398fc122988b89547";
-  sha512.source = "81c8f9ad18ed63e54f317aa69196e01ea5b36bb2fee155da6c54aa1e691081814ba26158222d3bde90429e5ec1357de7d878adbbe508d148cfc593a6fe4b9710";
+  sha512.run = "89b36072de1e3063a056247b07c297b1f2250743ccacf55d9773affe12ebfa7d22012a391522d032410de14f0f074f8adf297e10698aea96ee05cd4f1b9e02c1";
+  sha512.doc = "25fc9a6f9fbc9b0985107579c49db136e9313356de6bb4daa8c1435a714e0bdcfaf378a322bce2387e05178bccc6d44ee6a2d852e1960857d69bc9eb79a03e5a";
+  sha512.source = "203544563dda7f06ac3ebc609749a1d9b01e75563253a87304b3c6a8e9e21faed815d65e159b9b8ea6e1ec9e67ecb2f7fc53830c0999778b1e94781b18556790";
   hasRunfiles = true;
   version = "1.01";
 };
 "pst-uml" = {
   stripPrefix = 0;
   deps."multido" = tl."multido";
-  sha512.run = "34f3564e14d3378403d22e09ef0a4bc990b5df7861c962fb1333f4e57a29f55ee7e2d4325a6fcd4e08ee91e3f03263d8049aec733d7b20a380e94978989e6579";
-  sha512.doc = "63626a17a0faa6c8e71e5fcca7757be7b26069b8d9c881101f527045bf67927f43395dc0cfeb48474e7407597dc9dd1a873d5d0ccf45c7ddfca89f482df4af1d";
-  sha512.source = "0e96c0d2699af23cbb5ea4e9674d1ad2c1079877d913a709016aec63819da2e7afa79200e50532946b97895a57a4f6d192f1b24ab2ec395ba630c5d1f3f1d5fd";
+  sha512.run = "102c88719a8ef77fab8290f68577164ff2fedcce78473d5ef2188f177ac6cbd7091bb12d547a567fc7d8a6617aa3b327a274128aea910bb56519519b657f2c87";
+  sha512.doc = "6f728dd59f32b13075b124cd3f0331b37ee3ffa76e188acf47bd16500983f2dd87f7fea5c55ccaed45c8c9840e3cf7de43ff53ab3593c65987e781de7740c8ec";
+  sha512.source = "d75abf7a1ca4ff8e5c3fe84e455ffdd7f22f0782ce2d0ffbb986021427678cd42af0c31b011ac0e8c10b263d4f0b100d193e1d65f42b0d80dbf487511b5003ef";
   hasRunfiles = true;
   version = "0.83";
 };
 "pst-vectorian" = {
   stripPrefix = 0;
-  sha512.run = "04a42b00c7258227a98fa1895d35751c168887b77433a6d7fd198bfaba4483f31a581d6726e480ac7b31e2c8ec17324d948a058579c0537e6f981ba3569c1055";
-  sha512.doc = "5d717c3453e3ff8c5f13a25003e3d2b869afbeb2ee589cd1d17443cc329f88111ba6ae244378b435b7645efd878ea44bdbb6735e0d7b8b6123440e639475ebda";
+  sha512.run = "05b447c1a67f906645945e77960303a72ba413bf2a0fb9c6b84d67f694f3aa73fd03b1dd2ce298dfe5eb8ee6b1bf8e76425dbe97772ee0539a37258f2611ac11";
+  sha512.doc = "d4711ac4696a4e4c05e54ac3fff7788ce67ee55469ec4b8fd375cb9cae40781a4f445c469bb519894006cf1698faab914929dc292bd5ca1b578e8ff1585fe422";
   hasRunfiles = true;
   version = "0.4";
 };
 "pst-vehicle" = {
   stripPrefix = 0;
-  sha512.run = "1c2bb3f2f49d210024623487c0904a7d7d4acb951b7ed43702bf249c54f85340acf39c98fdabbf908f1da2780279c45cd30a02f373d8a48ba146dda34de3a8d4";
-  sha512.doc = "3cbc6f141b7206b3d2736221c96317d3e4f39723e1479bfea17fff88ef13673b229a2914e6cd0a4d916aeb03ab9f2cd6f2ed15978897d9cdca7ad1c9ea2c61c8";
+  sha512.run = "688fc3744f1d830b5ef2e99a9b8ee56c0f4dea7476cd16fbb77fd4d3fc13586151eabb7318ecb3410f4d46bf6b9bb51b233b0ce0c5a08b6ea74fd91cef938368";
+  sha512.doc = "df1baa44326be9c17a2964868e12a6a24f89278a33b90d6f599d9b0cb8733c5ce463496bd52744524d55e74706d958bfa47ddc25efc9b2681a53d0af728b3713";
   hasRunfiles = true;
   version = "1.2";
 };
 "pst-vowel" = {
   stripPrefix = 0;
-  sha512.run = "5a66825eb97e0e3b71c946febf17baf9256ae01932e758cf181f01c169108da9e1b3063bb58fbc870de799c8049da458cb445c4f7bef5fd2ea819fb013f5443b";
-  sha512.doc = "6ec92e0e7af268d3a13c8bab26137d50a7f0391f9d590c68b84df7357f534025b6f9eb2c940e57f336d2716320a42260e91d5da99c7167113b86dbd6c4f8684f";
+  sha512.run = "fd15b9f89ce2e3aecc639c42f02ca1a59eb40373e6ffc9290dd95d02a1f7874719dc9ff86b22a877528f56ccb938c308bf8c6da10fccc4d88798a67a143cd4ac";
+  sha512.doc = "de5c08694571bed38acd6034a9ff805a52df78dd9ed586882d9bf8a34ae30676618efdd5f9ef99b27d20790f3903c8a22e6538caba9dee43002f912e0e300a0a";
   hasRunfiles = true;
   version = "1.0";
 };
 "pst-vue3d" = {
   stripPrefix = 0;
-  sha512.run = "ccd19c551f775afc1ff6f01dd9fd4f3ec810e7edc1e246f53e2fe7644a4cc1d617266eb6f608a2ab13ed697c401aea520c190cb40b695a38ec96dfa04bd55fc0";
-  sha512.doc = "4ad2bb57d955a84e4919f7262867424c1164b277b8fd40f079ce54f85a180b3a2cc4d53064cc65f4dbde821196849ff0628a21cb6296c3afefa832cd9055e852";
-  sha512.source = "fec56d0d7acf9685eaef5525b6739f8a78e718d7d438b4051a3c204f53c25bbe070fe2e5fb15a7a7da38ca3f516fbe1c55c37deee093f778a9122bbd7387d5b8";
+  sha512.run = "374f22476cbb9a2d276d0dc98986ed6fd404800ba1110ddfeca210b7f60437583aeadf7eb34dbece440ced0102a6431b189bdf07aa9e4ec2e717f109f33e1064";
+  sha512.doc = "54c5ff0153086a59a56ba03b86cdc2e51175b5d1d76285462d0a0dc3dc396187c91e24808d15bc60e9e1740d35484faec37802433feebc8af07c959c4e7bb2f2";
+  sha512.source = "52685797af67ffee756fd3506e5627760a4a78634f44d127a0faac573fb5889eb0c2f7ceba57d1582720aa832f1bc449b222c6736763a54d5079c22174acacfe";
   hasRunfiles = true;
   version = "1.24";
 };
 "pst2pdf" = {
-  sha512.run = "378fba43588a995afccfa51891d9bbc04b5b015162935b13374ecc275cc23909f1503c5ade17ea7b8ce8015eb4654fcc4eeebe0036381f55d76e7bad9631d685";
-  sha512.doc = "2142e45f6d2c1308acf01226bdffe61f5d2be2bdf195c128367d99ace9dd7a127399e0ba00d358a82864c37b75ee31ac5044796d2eea0e81a057f42047bef46b";
+  sha512.run = "dfaacc3b072e53735c78ed7aa5bf9dc78368baea19c54de847b5668e1b7b967e349d8ac40d7f134e2bdd9c66950b50462eca34c9d43ea1183d957c1a393a0ffd";
+  sha512.doc = "74f3670b2f27e6a79d79226d45d1b3d2242abe359da623043e2f91734e1260bc0e1036841881891b45044bdc46edad052f8a3f1bd9630c3fd3fe92628df114be";
   hasRunfiles = true;
   version = "0.18";
 };
 "pstool" = {
   stripPrefix = 0;
-  sha512.run = "26e77bb1e78ad3c58fbefda4cf2946d55f71c527ac72ec13cd19929547e91292437048e031a2a9d639f3a40b1adb316488c5f2230a0d768d6238cde1ee79fe56";
-  sha512.doc = "833914d110d2948585a5b7a95c2ca32753f94aa22996e048476cb4709df7c5edbdce7893acf034ac2dd48e5f0a7aff620c7d4a1694d159d9293fe82fb8997566";
+  sha512.run = "5352cbc1617b0fae85018f93fd31f51fb59d83ab1d12d95284575c23d170d91d4d2ac3eb32e968e6160e1c4df4c172a1752f9c1b30dfa2b5006f2bfafcd079a5";
+  sha512.doc = "debba5d6ca4042ec3bddc25473b22d5db4d71f0f66ef9317e7c0b015e98ac7b373e580d14111545f71f14c50beeb020e4a353b7d9957ad0e3cc7aa63ca7bba2e";
   hasRunfiles = true;
   version = "1.5e";
 };
 "pstools" = {
-  sha512.run = "bd01abc56d9a3049f06a709a5a31edbcdf76897d7ba42c16d4e8ab00252cd7b07d4690c6e7bddedd13a60d24c07afdf69b26c0e9266cdcba564961facb5a3cf4";
-  sha512.doc = "ec264edac380918ee7aa35134e558e0515ab25be106ad8b649d7afd503a5cae59e768761c92bd48354935a16bba98aabb761aa119dcf9b68499336d0695f2443";
+  sha512.run = "cdd956d75184be4dce6bdb053054ad8d24488701e61a65c1fab90b2497d57d3c523475ab460bdfe1b40491f3a0106ece5e845cccbda2356553de4bf4b428ad5f";
+  sha512.doc = "256d3082de17444776b236f0f42441b98547349e351ff8c8f6ef1119e289f643124581fce091f666c5f321ecaffe7cbd807a50864c4d931d5df3dc30a4b31bb5";
   hasRunfiles = true;
   version = "1.68";
 };
 "pstricks" = {
   stripPrefix = 0;
-  sha512.run = "0f6303196dd86516e1ed9ceee1ff310c803d8802cc82b6a08776b84f19b94ba6532727b80a46bcb710df3cc2f0aaa66c2ceec52d8eed5ae293365169a32d0f76";
-  sha512.doc = "2d55e4be28bfb92b33d93b9f8fce500098b9aa56285238aa34f3d28f56c842edae396f9247c4226cdd55a94224ba121f728ca5fe922ee4255f79693e81dbce70";
+  sha512.run = "959ed9acc99d2ce095dbd842777852dbe45ae32658c9b84ed7ef921b178c7d57c77f2cd2aa7f699f322adb27e0340d8f696e9450e763f91f4657df630ad90f3c";
+  sha512.doc = "806a423a2163ce5acc4fc70d27e27ecad3303477eaaae5cb65a3827e3ea683aa81bb1731fbc37e94889952edaea574d347860f73ace898be376d5e390ec29c6c";
   hasRunfiles = true;
-  version = "2.82";
+  version = "2.86";
 };
 "pstricks-add" = {
   stripPrefix = 0;
-  sha512.run = "c2e571744ed83787a0680c989fa96527147d5b7de505963b2ed980975de5d32a875c200a4131ae75311a28085a263364a64588ce1125c5e6e5b8fe3878b0d309";
-  sha512.doc = "34e108e7b78fca3c67eebaab73e81517dfcaf3f56266b9a19b4d917fcbc94f64394a42812332fff496b7e98e00dc4b6d99b7517a56e479b096bf8d0cd7edf901";
+  sha512.run = "bfc20c162d668e572003976e1f6b66897b7788dec1c136a5da003727fbc8fda56509ae63dfa7b6c54cfdd662b231c338f211b93c72c3c3b44fe0fd9ae31c74d3";
+  sha512.doc = "6054b81f5d9fe23c9420f2856de766459b84f877336f36d16d2dac7e9129237b4de2bcd01eb3ce38632b7cb8f9e5ef432349780cf68cbbe6637a378c1f346595";
   hasRunfiles = true;
   version = "3.85a";
 };
 "pstricks_calcnotes" = {
   stripPrefix = 0;
-  sha512.run = "2288bed8fbbd5defd51b5a7794a06dd907de689e3a5f2623779bc0a25a33778d14b96be6024b3285332309d67a60b85a0e7d50227ff8d138417685844a26cfbe";
-  sha512.doc = "9b1d7312da30d7385f0995c2c1dbef0488aa4fb01ffc7d9a9de8a586be559bc4aae0583f5fcd699d40465653f69decad9dd5145f54fe574e3c74998dd8bd8cf2";
+  sha512.run = "0ca1dbce039dd8f41796a1747fcb9b04cc90a7cc3669c1db28e61fd9d36c151a7202f2e5dfaf163ed2f0014ccde0c0dbb3f74b9083dd547982f37ce557f40efa";
+  sha512.doc = "6ed44605777c6baa8cc5f016adbaa1be200ce1dd272fc074d54f452f6459210f43e91390067e55d7ff1a36cc22b241ccd315d88ca73c0f326b892aa8eaf53443";
   version = "1.2";
 };
 "pstring" = {
   stripPrefix = 0;
-  sha512.run = "4b0fb6c854a3bff82670f0a22c8a2869bb5f0f72f492981777e27032c5c940daec29be5b63e5cbcae3ddc13ed647ecab0fe0ffaad9fe28f1f68a0a9ef3624446";
-  sha512.doc = "5084b73e0232218a3a1d99fd5ef1b9249017921b4ed3e1ffa3d3e853987f4d7ca63e6cf90191b3403be65f1adccf45fdfd18da6b5eab5d7b060a89d8b254d67c";
+  sha512.run = "11d48ef84929ee9a1bd1cd6c58767d4b0604d3bd63ddda40ad76af41866bbe081584f386b580ca36aa8b6f2f093c9520c607264f2bcdbe50ca7c6530784ca065";
+  sha512.doc = "1461feadf5bfbafbf2d59d0626a8de242fd685c75ead6c507e04fe0a4458a511ac945ed6f57f358e6d078585a96cb7582020705a761e0113dd5968033fa369e1";
   hasRunfiles = true;
 };
 "psu-thesis" = {
   stripPrefix = 0;
-  sha512.run = "9e11a6715e6aa55b72334466b6bd30281f0ff6a607a7f454f0284c23dbb53d4e02262a550635418083a386e4a2aa092228f1d1af410a10267f9eed73d9d25567";
-  sha512.doc = "9285a7a1ac0de74b287296dcb3f89a8732a556f9fc1466cfc432c63eb7596a242a697946e844cae46b5049e5a13b303f1369edae3ad6d839388422010e95ee90";
+  sha512.run = "643f2e67a4f58f3aa97f7bd6c4f7c3aea02b3fbc4ece2d54b3fb38fdc80817230f280a5a8afd95886e73237165e2362f416efe5eacba1a489aab2f29de3abadc";
+  sha512.doc = "978ac91d16b044442d1b3a099abf0f0616503a0bd24a85fc2437b4baca479a6c3b87250b884fed9150ad1be59163b9648492fae7adaaf1ec2165a85fdbfff23b";
   hasRunfiles = true;
   version = "1.1";
 };
 "psutils" = {
-  sha512.run = "f8a05a13a01fc913ac11df643b817e35c0d127547977f55a09ec3ecfc246e23195484707c01b2a675122445be2f382bc5a0b3e07e57994fb284aba95c545d038";
-  sha512.doc = "8db24a9c905ec64f3848fff1fd655381875e89b88cfefd5da9729cb7939f5d7d5d9769e7dca1cd3ad1b4237996584b3c568d11422b811744417f5339ca9ad162";
+  sha512.run = "6614cc1d2d4fc0356f85fde6c6fc796fea9e9f715e29c0b0302e134816376b6bb33a03371db138f18cb7588f5b3444cd52a5211e992ad20991132334e6e43820";
+  sha512.doc = "6017a48df0c8d4ed28a3602da01ee72082f31d4ebed5046e13d25ffe3bcf6d52511504347dc0213a79dbf9af48905928ce44fc578be6f4d397642805fc2b730a";
   hasRunfiles = true;
   version = "p17";
 };
@@ -21350,999 +21943,1005 @@ tl: { # no indentation
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
   deps."etex" = tl."etex";
-  sha512.run = "0e19b211b9ccc8d891e4f04d2925fa6159b5a2e935b91e1862bfca4f97de7e31459bc6fa3671979a10cf09d73676a869b0831f4043475a2b55988fcab1ae5989";
-  sha512.doc = "14033c1049fec6982bf43badc5e0e38d8f1e91cbf896c19d9c86dd7c7d84f08073923d86b61c1a064e7712ed561c1410d633c2a20c1e15fe8c4b8e3272240de6";
-  hasRunfiles = true;
+  sha512.run = "b6411f33f6b160de707e5589b7d92df88647d7b2a8fd824261828ebc2429bb122c119688af5a19f4dd2ca8014839d7e29decb698cfeab2644f14f99c8fa9ec94";
+  sha512.doc = "de2fc94e268565bb1a1897a0a687e7f07ae07fef54d55729a377bb901a20b61c1c686be1adaebc1fe8ca21d72d9da008b1a6e1056aaadda4b81d0a0104240c43";
 };
 "ptex-base" = {
   stripPrefix = 0;
-  sha512.run = "cdfa55a70bf22c0a08acac835036256c52245d956a2cd74c72fb55c53e05a8ebab1a09c04243e6a009829082119f5248f04e60eb28577c2d4fc089a235051399";
-  sha512.doc = "8057c116f488cdf76aac9461db2753c017fd88f43225e159f21fb2f0befeb1ad7a3f7805a2af552b0a8ac7d4c5529d09fc3fd013148d3ac4af52098362a1e2c2";
+  sha512.run = "6a9decc4358d1941c8de10655352cf53f3bdc7c1253205c801dd946ba50211fa92bf32ef554198b531301db9330a714d8a54200d33d0b8e2c76331dc1e1c473e";
+  sha512.doc = "92cb2f517c5f866aa2b07b0a58f0b0c4546067224f72c7f376c675d712f1b22abeffc0d3243de40f52f7bb7b2e890797ad8c2d1274e995e250f5f8fc80f185fd";
   hasRunfiles = true;
 };
 "ptex-fontmaps" = {
   deps."arphic-ttf" = tl."arphic-ttf";
   deps."baekmuk" = tl."baekmuk";
   deps."ipaex" = tl."ipaex";
-  sha512.run = "d0f3bf502c4faec80126dd549c42ee4eeb1214b56e8ca014bf26f7f6dfdfddb8a25bcfbb0a0149a0c2aeda4b4d214333405f966fac667c40517c0fabde021d10";
-  sha512.doc = "cc841ce5c595cc864e5e9c6346200c4d9bae0f4bd356d85fc5fc9543cb29db0b3794777522c713e3cb369458e99e784193257faecd3cf6c1d744560a43197a55";
-  sha512.source = "8490a8577b3533e2740cae681fae5bb77530c6e9be6506beef22b6194dca8ef7bf1febfdc9bc7e8ff0ef9878ccaca0e97277d8765e37286590ad3db1197db46b";
+  sha512.run = "59c8daf96779a67951b96a2b583bb406f6a59a75651bb3387465b006715b1b45e393501d198f547b40f7efaeb2a1d81e20ce7bf046b4a1b6060dd5645174d2c3";
+  sha512.doc = "008b78438dc7825aa7f06dcd307587ec4b08fec8e042f9a64fd3244e4d1c218e093c6002234a04cb2e14730530dddfc65169a3bab38285f13076548062fbd8bb";
+  sha512.source = "74bb5d0906fc953c8a35ba0d69a0273f5332769e95e5de9d8c94d919d96d480059aca23886941f224f87b7519bae1513bbf0d6e19d6469bc607bb223658777d9";
   hasRunfiles = true;
-  version = "20170624.0";
+  version = "20180328.0";
 };
 "ptex-fonts" = {
   stripPrefix = 0;
-  sha512.run = "c4795588ad3736ad5218a59b0b28c370570f8da3718bcb6433ce396657e2f2d915418a48cb10be5e7b0ed694237b6b22a97cbf16325aa569a76959d9db7c7dfb";
-  sha512.doc = "568d03da1230d00f164a9bd60d9b2a700207d86a4e24f059c464c2f46ea96d6c942bc5effdbaf831f7664453ab88266daca4b017ea4e31d4dde4039e5a4ac9bc";
+  sha512.run = "808304e70950f7d81ba229bc11b661566b87f80d066a9501c4821d94c36f6ec136fdad1566002377c531ed16b9d0f4f29c9cd6d0526924fa758b78ae14e55514";
+  sha512.doc = "67404208897589f1ffafc254c7d0fd8ed1ff88aeeca896bf8a8fd91e0a4836f46925894090a3bb023171c66538c57de062f687559763ef12ca555b776c23f2d8";
   hasRunfiles = true;
 };
 "ptex2pdf" = {
-  sha512.run = "44da8b241e4d74f2dff3799a7c1f5b5d0446b917cb032c3bf8dfcc4a53848dad123b1f026c6ee83264cacc54820b037054d02029e15da8000be07e3c0e1ff3d8";
-  sha512.doc = "0157fd1946e26d58bdcbee0af748a4209a93ffd99c3f16329be02c25d369d9f5d37878e50160ec6b4626e35fb6e3bd20f78d8e59ab9655f99caea36a35142a46";
+  sha512.run = "bf021445d8dd55fd28a7f271e5ae772c0f54989f6fcb04018943a6890826af4b5e7a8a4e369b4175b39de7e1437d61e3dcdb93423fefa7e8bfdd7c451bc84432";
+  sha512.doc = "64457f78e496247eb81194f6f397460d5081dad3489e3f21d2e5512c0e916a103bba811ecbd4a5bd100b8f26802413488572151da821f1d33c9ed8086fbd46cd";
   hasRunfiles = true;
-  version = "20170622.0";
+  version = "20180514.0";
 };
 "ptext" = {
   stripPrefix = 0;
-  sha512.run = "575151202ba1ac9b0251dde5d68e34fafd2d8c53591dcead79093d156ddad334ecd6c2da006f2b7720c869ecde3395e125b987573c28aab8f4492db3b59a6b08";
-  sha512.doc = "18db7a9a0fd796d93975a0d2a11726278f9f98e33503145c1849caaf6339bd680701bd5581c7152e2bfa031c1281c5f78e3b9326984a2bebaea0f7d5bd7807e7";
+  sha512.run = "31dc96e30a545401759d80cee607f3dccbba5026f98199b44a80e9ac757f9fa57784d1fd06e4a7b2290bc19229d417264f8af920cbf7041ec4d9d2d70879222b";
+  sha512.doc = "b018919fd86a0529716c6a18e13404932a2e3a6133888912aa90b44cd6b9d82624d74baf02007404eba9003eef5a2fd6ba2646825ad52cc13a0f06b1a82f6ec7";
   hasRunfiles = true;
   version = "1.1";
 };
 "ptptex" = {
   stripPrefix = 0;
-  sha512.run = "5b294a1871e88515e4f02329a97e9d321aab55d65ee653f9be874b3ebcc0dc25f1e31d5b45220616fc3d0749f799994e412f11bbe5dd6b725a3fff648870e83e";
-  sha512.doc = "12deb51362701cdc1491a8d3c39f213d2cdb3483b9ce52309b8adda8330152185210107ceb3e4758cbd88fcc147742a27bf9fb2fa2cc66b147659785b8d63079";
+  sha512.run = "a9cf4e9e4346f335f7ad7631a24383b6fb04c66931fd6deb9bc064df88a3d5d15eef2b7a4121cafef13e71279244f37af532b884f6cff8b6f0aaf069b2facb7b";
+  sha512.doc = "625734bfe9d2c01a3d35dc5aa97a173ec15d07a8cb531ff3d5aad0ea59b6b5e16be12ae286065bd5862ede51daae3f7f123376a19b29869096be363287067b40";
   hasRunfiles = true;
   version = "0.91";
 };
 "punk" = {
   stripPrefix = 0;
-  sha512.run = "5e5eb9c43056a3835832bc28ce4039f3e481d5a53eb705fe5b05df1fcfc4d8e7628dcdbd620b39cfb44fee92b8806455111d65524c820971358271cea910d38d";
-  sha512.doc = "d78a1db63eec6dcd4f8cce9cfeb7d1d13f9d0d1b21de4bb4c68b757e4cb4f7e5ad0ef40a0ee35b19f3c76b475967ba5e017fcd8b97160b9a70ac5faefe5331c8";
+  sha512.run = "2219acd9b314ec049b7ceb8ee3a4dd9d3fabd433872966e6a480a2695eaf578ab76cfe1b32c8072c443e48b1bc2a913c91fff3fbf9574398eff132912a673047";
+  sha512.doc = "cf4219ab67d554ba2fae0137bf96e4479fecf775e8ef641a8edbc9b8f60d9e5589bacb14c69e1ed4449addd132a78035b51698701a5de77723ecaf2bb2f8cded";
   hasRunfiles = true;
 };
 "punk-latex" = {
   stripPrefix = 0;
-  sha512.run = "95c546b3501a6a8eb7e9496638345bce0c5ad90b026e655b890d75817054713424476df9e480b18f976e5d7934a5ab1a9519af5a6d588d02981db1fbc3cc8406";
-  sha512.doc = "b9fffee22009f5aab460af1746bf81e6b5b750a589b7e37daf08e6b64888e863b676b193573cc7ee3d9efb53f689177e62c4da730ff87d8b51314d1a84fefaa2";
+  sha512.run = "e89c0aa6b8568194ae3ce57112fdb10da55bafd19f3f487ce7d75f2339e6f3762da623432be7a9564a3da070a5dfedf827244c19b4a6730eced736400d5591bb";
+  sha512.doc = "186c5a0dcf975929af7649696a0c55c8ab1535f4398ce232b67ef750241d834ec8ddf09176bd94ce80fd7acbbd4257022e4128633f5249a946564dbdd8c99124";
   hasRunfiles = true;
   version = "1.1";
 };
 "punknova" = {
   stripPrefix = 0;
-  sha512.run = "e18f37ab74f4649ff867dcef9e620cde9a35a77078c14b40057dc2c393cf0ab62142447b80139ef68c46394882e7d04d74eee486dd0e8e189538565b7a91383b";
-  sha512.doc = "9e1d21c13397c0b5f1e98dda9f84de71125f684c55bcea35b81e911b8e6abb861edd6f3f646a3c0ab0f4567dbd81e2896f2acdd718594001d2cf8a23384537b8";
+  sha512.run = "1de1e904525e9df9a2b169f932b400576ae3216c950caab4e8ce99ead768ae97b8231d749f14beae7bcc6cb277caaa16e05476d9a659bcfe5bd08104b7b2a8fd";
+  sha512.doc = "5c3f09f51fdb66860873214b73fd1756054b959f3453faaba2e3e860377d572dd70277e91560a8c404202220f25d005cf748cb5c9acac0cb11c05398d4d5e0bc";
   hasRunfiles = true;
   version = "1.003";
 };
 "purifyeps" = {
-  sha512.run = "28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817";
-  sha512.doc = "666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07";
+  sha512.run = "ce4966735dc455a626cd28d6bddc86e88995d5af54a4d0a0bc80c842458f09d2a25ef67aab073ecf680c88dc0c6112c5260761eddab25e3994f79b6266da2954";
+  sha512.doc = "921175e2d72126df4966f28555180f70ddd23c9ee8363a3c44fd8707a82380b60c7ac49a39f069e1931e3b92f60e9ef301fae3a6d7232691a1d48f77e2d93571";
   hasRunfiles = true;
   version = "1.1";
 };
 "pxbase" = {
   stripPrefix = 0;
-  sha512.run = "8c8a054604f35bd67c6de31c241d5684c34a5289cac1483401a13a505ad86d5f263f653ea28092effc40f21aa0ec935e37c601144d34e19601fb02eb5971af13";
-  sha512.doc = "db072fd7d023a3c620d83684aeb8cf18c680c90c6e5d3571887b4d8022b47a7c649645352b86c4fd61a04856ed443eaf3ceab7ccf74b586e3f48ab2b1213fa66";
+  sha512.run = "3ab554ce7c338ebb1e032f988fe55473b0e8a28d60bbb7ed3048e15714c315ff8e9c48ea0d1d7762a9be5352c039438420999f0f2baa5fb09ec52438ece682fe";
+  sha512.doc = "1972944b6170c05ccb5c64802e01029ad8f92285adb2ece244a8efb24b00ba5f75e7fb563e4843aa6e1694b41ef89a67eb586ad3c9b241b82c5c60e135f5efec";
   hasRunfiles = true;
   version = "1.1b";
 };
 "pxchfon" = {
   stripPrefix = 0;
-  sha512.run = "0c1598ce0fe9cc3e2742ff2eebe5277ad9398816ffd92b84cb922b0d4b1b75e059159a26314f003b7a8fe3c70323633a4e3dadbd8733a92e190b7a2edb947354";
-  sha512.doc = "69d6aecef3af18ae7f68c9d81d86e0dd0fddb4e31c8e288112fe7261ca743b989e058c3ac096a8842f87eaf6adbac32822790a37b1119c93d95744f5364ef274";
+  sha512.run = "4dc9c808a82c3bfe9f8819da667d79a575aca6ea85b458e52b1aae5defcc89508cf214391f599ec75281f1ff22819bb3c201d8533da9680cbf03bcd93142ba31";
+  sha512.doc = "2b6c63c6e768d8257d7871129d0ad57c2ae47cde1e9484649375f82867cf129bbb2bec90b3ccab17a8a1c9408049879846178474e2646e0b5d4bff27d0d106ed";
   hasRunfiles = true;
-  version = "1.1b";
+  version = "1.2";
 };
 "pxcjkcat" = {
   stripPrefix = 0;
-  sha512.run = "304169afd7ecf879fd32836145ddcb499dea4e84707af4c33e73eabbd6b354960bb02c9a97b230d0232c80af5b8632598445353db48719c730c2982d36e7c21b";
-  sha512.doc = "d2e346dbf9730bafbf37e16487758ee98bca7e16d43617586a65844e5ed8e0d9e3a2a5e29102272a68e0ed6bf2fd5d61270bf86bdf063e4705a444aff37ef1a6";
+  sha512.run = "b824772c0436ae61aaf76ab6294c49576d4c193ceb1d79b01284e21b797d3c3d1134ff9066d49f3c493d5ee9e904ecaf39c3e9720958d2d4584d4d8de06bd02a";
+  sha512.doc = "443596f53087216b11bee4f778fc3ad54b0bd0c495c1298d74b66d1df60cab3f487c5e6927b3155d764b8bfafca954ef07006ce87b8158bf4f92dc74faac534f";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "pxfonts" = {
   stripPrefix = 0;
-  sha512.run = "e90979e74733fdbc14936ca6c7076f24b300814214c2d3a7915c88d99a6503ce772ce1e8857584d9fe54a2ff15a7e663ebf9f5aecdfb7826aabd4095f7b6d0a1";
-  sha512.doc = "34291bd74a94118e3e4461a379473ad4c7ad338810e320e8642fdd24b16b6f68a31bd902396615bd659ca04f5fbe23d2f717a7557143dd25be669c20b2544cd8";
+  sha512.run = "e16b21e28872f9a2efc57d7bd10a9fa3ab0d73d87da5120166f474690cfc99e94d261a211813179c9d198c078732e920c2a8482dfd0cde7cf2bbc374ea5a1db6";
+  sha512.doc = "ff10b970e3e43ddd79c081bec3fecb9a4ff2fcd6947f583efcd23ef33d3b4058d37873d8aa51c330a0fca6c5fec7560d3e0246c253f7a59134fc64f730198fd2";
   hasRunfiles = true;
 };
 "pxgreeks" = {
   stripPrefix = 0;
-  sha512.run = "5ae98e838971f085129c91ef4099c26a4247ee286ee5485efba307e46ffd29472ccfc7946c323cf9fa4b91d1e6911d2a1791dcf57142a6f6049474d9fb161251";
-  sha512.doc = "11d35b0b843c335db1b62c0220347cfe4c9f4e435a3bf471ef22253f5a8923cb9eb3682f27385c969f9ad2aab263229933913117707cb915c1bd26721833165f";
-  sha512.source = "33f8806e168d9b41621345c7a8c635fd2f934ff4be9a0cf1c314a6b969391daae2d9e465b1ad563a749ddb94bd40eb7094b3af8a312ea40f35cf4d9a0c04fc3c";
+  sha512.run = "b459b51fc1df28132e6e1e0fc7d30620f8b15144aea0e7a91b59ccd25e31a3dd23c3c51fb86f254fbd2edaf4271638522dbc481f5b08af1d9dfac2267dc8ad10";
+  sha512.doc = "aa8a3646f6fcd58c27293787c067c115cee6aca342579ea21a3c6f9eb69a59eca1aa584e910d072863eea3885d03b6d96597d855f7aafc7022f094819b663e63";
+  sha512.source = "dd268d1d6b727121bec99b6c540d100637876ddf7b8f7b0033859bf25657bad9b4e52a9954bfc341f29094040e0a8b193f3d76dea44c0f869faec0311ce7a8d3";
   hasRunfiles = true;
   version = "1.0";
 };
 "pxjahyper" = {
   stripPrefix = 0;
-  sha512.run = "eb1ec3ec1168d5acd04595e8fd4adc4e25738b60cc1ec232e42028622b1c0897e9237d8f04b14308d6d1cd6c95cfd540c37f6e4b905c2dd4bc4ecb477537bdd4";
-  sha512.doc = "4710b71be6aece0b308555c402ccea024fbbb3c5c52d3b0c31aca158f323a89c7a52b0cf954fbff175763d810fba32b761bcdb2ffc862a279c08cb969bac9a0e";
+  sha512.run = "e675fb944be6a01354f76dd5836b6e9156c11cb0a45546c0c95f41d58aaaad6eec49d093d269cc5e00f3c114c68cc35db240adfb338720b6f230a839ff1aef92";
+  sha512.doc = "6bda2b9ecdd7a686c80a173d041cd13709c68b70588bc429d1f792bf82b0f65787f079d03892fac45c19bfa444c23f095600247700b0c328e2390a9920f6b06a";
   hasRunfiles = true;
-  version = "0.3c";
+  version = "0.3d";
 };
 "pxpgfmark" = {
   stripPrefix = 0;
-  sha512.run = "44fe97a1372c0069626fb17834dbe4b2db0ca17a16b97da909f63e86466cea064a406a820c9c23981ad83ffdd2319e50797cb717b0c78e167849349c94b8fb0b";
-  sha512.doc = "b4f725b938b88262fbb22a871e9a5480c5bad0c82cad85ccdebd8ca4367ec7a65bc026f0740c907142163b277b791fe8b223efb29e6f005470a7cd4ccc61600f";
+  sha512.run = "5dd4abfd1db7ad53146dcc5a63960c106557f04333eb0d4aaecfd08e9016b544228a0464c43d9447176b4569e8faaa9df5117c68cf37e0f6774d308de0f2e1e9";
+  sha512.doc = "c24ce9a435799f1aad579417ec62027dfd5043e557f5912c9e8c5b86b39cd4a640a9499d6918d9cda36a8e35579b8faaad90161bdf87fe8404c5fb61f14c19ef";
   hasRunfiles = true;
   version = "0.2";
 };
 "pxrubrica" = {
   stripPrefix = 0;
-  sha512.run = "28b95ea9a2d822409c69338de732f743bda6e6911631e30ce0775a47c3fa50819bddc1f26b942bb908af3ee5b95f7db1b3097c1daca85508788f841f17cd1497";
-  sha512.doc = "652d2db9d6645a46cae2c7436fa5f3cd291c64839604b0fa94fdde22012b01a15533a185804c5ee9079ac8c430ffb556cafa97347224d3be2b3bf2c30a9897cd";
-  sha512.source = "e4fbf6e5b344b083c131410c241ad40ad0bb01adbdd472d3f160508f58dcd26df88539dc93822fb4dba8056dbe72f674ffa094194e78d6d67b76ede3ba8a856d";
+  sha512.run = "99aab9f5c901a15ba94af980b616103ceb4d23088cbcbe80735be8801da5e8cb66a4680b5bd9a651b549d0265940253744af7b2606b8e77ae22646fb8fee60dc";
+  sha512.doc = "3fa05873688cba369f39db11a609975297b1da088f3abfe7d33184e9e1eeb13d5490c3c6294d7c6ac6a3da4970a8f99fc25bed71d75f13e7c529241773379d61";
+  sha512.source = "bccb7d1e6cec7afea3a3c348fbd07d705b391f387205c7548a320846867572d5a3c8d1f6c14888109a74b449a12929d22f40b18917e06659833c1cf56fff90d9";
   hasRunfiles = true;
-  version = "1.3b";
+  version = "1.3c";
 };
 "pxtatescale" = {
   stripPrefix = 0;
-  sha512.run = "f55e3ab05dadd09913b0c4ac4775b6b09099651784d64134a836886b9d4b8d75ab2d922899105e7339c912db2eebe1c50faff08e03505dcf5c22e79931b83447";
-  sha512.doc = "3af3dbdbff26890ed118b10b036f500bd95757c9c192f4c7a4043cd328232494e63789c713211d446be44d9e9d21bcfe73a3dced6f9b4570cb2e721b51122cee";
+  sha512.run = "7d734827e5e98f42c21dad2686c7a6d48a4e335120687c6df92ed88744d2bde2aa0f35658adefe25245b62ae2058994fcb49dddfb3c46a2714417bce1a4ee660";
+  sha512.doc = "4837faf2ca0c535d53af120a0ee2ec06bb32f0bad27be6fbf01a197f0e7cb0a9db5c5e9ab92e7d8539a69495a89ead283d8ea837cf2b84a8c1eda4b79933cf84";
   hasRunfiles = true;
   version = "0.4";
 };
 "pxtxalfa" = {
   stripPrefix = 0;
-  sha512.run = "a8bd7a0aca6b7497da6a09bf5ebfc5855f02dd001ad4966276efd0b6f99cc17d34daf18dbaec17cb8150aa46a031f629e0db0d323d9fa76b2589cb198a014bb5";
-  sha512.doc = "0b7a4a5757c4476e0dd166e2eab6b4354a57efba26e31dac0f5347c5e33deae541c43fd860af811f8d990588ed974b9673dd804f41e0d9d5b99f6d0e61255f5e";
+  sha512.run = "f74376f0d8a327bd1723372d84789687f2bbd133c00626fd7343c3f30de53cb7f0c197ccc7f04b75420cd3a973f5255aa01f25e9cf65e4ec0772247b49f45f26";
+  sha512.doc = "b5a50bee699de3af9ccd149b60aace90df8111795a455ab5e1667a5d502359bdf6624c0954ff7b772e0887f17fd342118ebaa8e9bbcb436c56dc8248441c5ece";
   hasRunfiles = true;
   version = "1";
 };
 "pxufont" = {
   stripPrefix = 0;
-  sha512.run = "eb0a0ed53d3ce5dfb5dc8a60ad7af1525790402ce550189bba2c254e6830955d9e63372ef2d19af88f4bbc2e527a33e73f8966e693f0c9fad52b0c77a768db44";
-  sha512.doc = "05ab1c1ef9369f2ac54ecca5b00a38e4470de24f7b52c4e183867d5836b1869fa39b546f6ee787a74c1dd1e7e7fb8bf1899ffc38f1aa40645c84e02863b35a11";
+  sha512.run = "8fc676ca8979d395444d15749cb8c7a1abfe618df9b2ec4b2248dd62141840561135091a0cda3e67fb3a9f6eb50d55554a3bd17852f3c609bb78effbc8786ded";
+  sha512.doc = "ecf10540a1df8881134b4c114d6c2dd1e622d4f3fe7a79ceee665d388dbd39652876157269f36adc58e59cbe89f19572273a2cc0b3f42c61c0694063dcf44899";
   hasRunfiles = true;
   version = "0.3";
 };
 "pygmentex" = {
-  sha512.run = "daf469ab524cae1dd06c888cc5150aa8c0e1827a8175cf51ec609fd32251c2139bbf6383862b1181c715d1ffc3ec52fd150e93d84efb756dfb9cb2ff5782341f";
-  sha512.doc = "cdea814dfb54ffd092538261eb740bb129c42bae2751c50b693ab2dd5360836d2ce6c11ad4af9d3d21075ca56500abf05672fb352daf4b24660e2959b4af53b9";
+  sha512.run = "fb83b4b6e96d07a8f41c1810159083d64781fdb34f19949f4ba5405d7b8e5a928b17a9fb52c1c629d532b1ffc81aa9fa3fc9b8059689687448a2853fd5b94966";
+  sha512.doc = "5a4a08b47f0e802fd9a3a99e952b9d62c1b6b65f4bc07422a884db65303029508fa3054a12a9331d607c1035ab1dbf2e80ec9ced33742d151639ec5fbdf0da9f";
   hasRunfiles = true;
   version = "0.8";
 };
 "python" = {
   stripPrefix = 0;
-  sha512.run = "79461f3a6c8de11c24b43e72360497ec735789a26adec6240f98ffae27d188f259f8a8e151a52329b187a24f18908bd6fcca0d2fb398150f3f93cec023f35014";
-  sha512.doc = "52e3a0064f91c4610b4097049026511d3008d67ed925cdd00a8d7cb73d6550b5b4ad0852cefa6e7e451e8f5fcb24e9011d2bc685a3098c7176689fb04496fc82";
+  sha512.run = "0bbd828caf38c67454952d05fe3d613c006896aef1fe436d8a6ab80069660e2f7e678777f600780f60e6bf950128f6757ec01d59a0c0d9fc153c0e05b7accc2a";
+  sha512.doc = "4e2eb72f86eed1843fb5413c6b296403da131b68779b2bf5b029347445e12087ec6b2dc5c2738f8b49746515ce8913e38c392924f875e1d1fdd86473a8fe29e7";
   hasRunfiles = true;
   version = "0.21";
 };
 "pythonhighlight" = {
   stripPrefix = 0;
-  sha512.run = "47bf4115c5b720a2ae39c3f686cc9cbc4bc767a57ed1da3e131bf1b4125ea1a60261c85b752358571049e6333a8a19f013825c8a643d8a1f568cfaf28fb68b36";
-  sha512.doc = "49efd9af50b4c095e8e0751967c1fd4e25c75428f95a6c4476b8e9afef3309377f0e58cb94c6229857d8eb1b4ae3d921078549c0ac05b887db8247aed129a621";
+  sha512.run = "bd85d164572dc18ae0294a1d3c052b5c4a106269b276f0c36090f3517d3923754021a94f4b20185c311344ecf447b50e17f236c481ac4fc7861f0d8345ab2612";
+  sha512.doc = "47253c708ed0c2e799f641855d1fa8de95b5d98097a124afee60ff69ff376c21f25318baf23ae2e070c9b37ac62e70ff2d95690fe2b49c8380ab998a062b4013";
   hasRunfiles = true;
 };
 "pythontex" = {
-  sha512.run = "c38c0f12a40de2d2c180d3ce021a95dc2c70797326742a1bc158fd52cdc828587127191881b6738d881701b4dba97cb7bbf224a83bc2ce7417c550bcd2605fa6";
-  sha512.doc = "843c6db622949cea3234441e3a2a91d93b91a8f2c95de5c375d0809feddd5e3646cb9894cb0e1b3850c049a36f3b3bfa03ab03e4dc4b82382030285ff872d363";
-  sha512.source = "e079d53454022c552b4fe701ec321da32b8fe5cc066281c839da8a6b7283d4497ecc2afd083ad68f610d590ff4379adf927daf48a92b2099020e9f08c57b861d";
+  sha512.run = "b4443098c8c4c1fb18fa260a719f8b2b4d18f82b59c6ed5d2ec3c5cc253cf692242fa2c50cb660e187768e920b672861ea79cebd05e5d61128f88bbb9a267d97";
+  sha512.doc = "0208ceac9ea6764cedf25fda70d9f723568852d70baa7e93993179a3e784c66e58cd6e4b504fec568012ef92184abafbcd4437ba996387f869ab1f8c0f9aaeea";
+  sha512.source = "c384e808ba35da665d6b184a05b9130921f9004d5928d81d9aa254d5e5e840a8a8e6ce79da08aa96cf087be625942df6bbec7dcbb0dcbea4e72b0bc55612c55a";
   hasRunfiles = true;
   version = "0.16";
 };
 "qcircuit" = {
   stripPrefix = 0;
-  sha512.run = "476066f65b7f7137246e5c75aa8d98840632ca616b502e0bed1f8137eb2eb3ca49f07b4a35a9740bd9de895b15a8a2bea9fc6c23e124d771fe095870f4a5491a";
-  sha512.doc = "a323282b11ffac17de9d6d590ad09f9913cef381d72f0608d3cf67aeb391cf98152085e092eddf81b5b225d995963c18a237b851ae9ae1688f4dd9b79345f517";
+  sha512.run = "ba0805d50d970da6bd4db8cd930533104d670fac94ca33e5f37dbe1770b8282e1715ed836e555629ab227002890a2726999bc58e8e80452fe2d074aca95175f6";
+  sha512.doc = "8a40c56ff87e61a975364f0213be6c6d106763a20eba511271e49c8c182c5bd0be403aed72562ca586844c9790312c25008266662c81194b24ece8ac924f29df";
   hasRunfiles = true;
-  version = "2.5.3";
+  version = "2.6.0";
 };
 "qcm" = {
   stripPrefix = 0;
-  sha512.run = "5e0ab47c37df6df1fb2cc9c3a77f731eef82ac437564d1ec78571083bf6abf0f05b82aeb13f22505973e9fe0fb560a29450f72fd5c62425fd647d59fce1a6092";
-  sha512.doc = "1bdb8ecda9e2547a1c1583bb78f5547157d5999b1350303a84d2d81ff5bbd6a528a67ffbeb344f5357a454b59ed0716eb03aab02a0ee71e88e11cafaff310c3d";
-  sha512.source = "519f82befdd28dcf7d93ad9333be2f006fc2be59cbb4cf351225b1f99f58f840086c832e28b926ab698f198686bd11faac62763e2f1ed5df7cf46e8de1c0cfce";
+  sha512.run = "0e5b2701110cb451a1980eb59a57d807d9bd7052e6a1797fbe011b0f40dd3a84abe3e380d2cb91ddd36954ab5a2d9653bfabcc7a588d7a229a3c76c67e3a3f8b";
+  sha512.doc = "7d95b71cbb106e227cb0033a37308f7d5a2d7037a2501eee040313a716722b0d0c477104e9ce98a5d952a23f1398a38d4fae96fd58fa78973c6893d7da5ff91c";
+  sha512.source = "68785ee7a7d209e762533e7fe8fb7d91321679d27bd48378d342ef6f44fe62e11f61143e50d31bac48e270f9049554aa483a7607cccb09be6c24933c88fd876f";
   hasRunfiles = true;
   version = "2.1";
 };
 "qobitree" = {
   stripPrefix = 0;
-  sha512.run = "e383cb119368affedd4d399e9bb1d560ffb38076db493e08d5b10f6ff9bf3b6ef43171757e5aeabb47d7bf46b2927d1ca2f9740dfd396f86aadbf38a1ea6e0e8";
-  sha512.doc = "5fae8e063b6fba338aaeb71d1339ac18bc33dd781bdafb20fce7ec3fe773e2e9ec1ad326c881118e3694a76925f532ad366d8bcf49ac1d0f9a69f15790fb3127";
+  sha512.run = "efa2be846c8dc1cd79ef144a59c6ad25cbd337bc42e9a5e8877f3598c95f7f285bbe5c819f8da243b0b01a4931c8bf0a6bb02b4cb6ea9a38cb21ce39257073fc";
+  sha512.doc = "6e34b9946a497cb33cf1c18b7badb187c759ada6085148397612f4c915d03ec80633828fdae6bf9e3288be23bc91ad929b0e4a2a36b36fe98e60a4d7680236ef";
   hasRunfiles = true;
 };
 "qpxqtx" = {
   stripPrefix = 0;
-  sha512.run = "d6020d1b4318981bced5af8aa3e612d9407933b7f51901f4d393084b6ce238e4fb46d68fcee28bed0a2c32c50f3839d57b9ed9b14489f2b45647296bf709a941";
-  sha512.doc = "ebdb735ca72cfafcc24c2c6da5db2f767b26e31a3c77e6be3f16759c35f39a3be542940505f55609405ad36d1d53019b6fc7e147674edb3e34366f07b5911851";
+  sha512.run = "edc644ac92bffc6e5a04ec76c9c94ceab2047993132881384f3b35043002bb50e8113b7a5b9e4fafd6051e9b04d07324c963eaf256f7f348daef5d984464d34e";
+  sha512.doc = "b2ddf16e535eda7a1907fd08e21fb938481fd9f3235b4d687f93f7b37403f6ab24243ef215e6b71a9eefbf0438472881a8a787003fd1c047850d8399c623cfb1";
   hasRunfiles = true;
 };
 "qrcode" = {
   stripPrefix = 0;
-  sha512.run = "396ac62177123dbb9c9e82d522b0b84d580864da8a240603b670739edd01367f16c37dff7a51c90965d278cad1b26f7dcb5195cf8e4e44d6094c6ff5d7e84647";
-  sha512.doc = "ef19086172394b93e3790a45f95b3e3d5ae067e8d8d699e7d52a0a3d47b5db83f28731f180de01e5c88cb4a97028a14376e63c16417157aeb1f073c96e0ef25e";
-  sha512.source = "e7bfecc885a35c34fcb9d6a28bfe5890cd8107f1f9dcc579fc161b8daf3ba6b9472d4655241cdee7e57ea8126614aaf556c2edea21844934b356d716fc9f6e34";
+  sha512.run = "b342fda7ccc47fad65884a76fee47bfc614a00144d8dccadaaffc2c58a084c540e41db531a374f9ffa28e6ee1d76841f9f9e5c2dcbfb926c6b13df45d5475c06";
+  sha512.doc = "6852b006df162ca82fa6ba27fabc86a10986132a50dcd573719bbaa361f45accd76def08087007035a5f06668c1c206828255d4c581720a17a1892731c24079a";
+  sha512.source = "ce732484458441e63be40785fb3062054b36e974ad106fa43331389d1018eec5f3d4c5e69ebba3f6fd6405943997243a35342257fa971f4d38f2d146b1ce3342";
   hasRunfiles = true;
   version = "1.51";
 };
 "qstest" = {
   stripPrefix = 0;
-  sha512.run = "9287e6b907953b7516b15ea0c64b867f11ba46e123fe8f91bab0f9b182fc73e65ad7a61228839998d45261ca6f8d2c7c4ca6296e77917374a481ff0bc337439f";
-  sha512.doc = "1869fd40d4063913e9f667a0e0671484137c5e3688767555455dee983306472e8bf794a219d3f19c59d3b79b5c413698462abd9086726be1973729fd1ad92f33";
-  sha512.source = "4cc48f2994a57676356c4f533b5a7d43640f9d278472681daf89d38f4e02b4bbfb2c76a89658fd1d2241d4a02efb69c1bde6ab1835e834235fee7c3bb16beeb8";
+  sha512.run = "10b01530aa055e55a8d884896add9b102789890cf8b56ba2244435946ede647e5adfcc499c47c811c95673a8ec2c37325a466b59f0ada884a314bc16e61c8ee6";
+  sha512.doc = "24e635c00efa5cde6de4e70eea7efdcde0fbb0e85a970221e8eed829adbc15b22bb71c0fd22b0f28b7fe4dc2003885de2c2da356c0b6c1bc168629647ef99264";
+  sha512.source = "56a3f783c9882ff46c051689191e3f86f035d782694bae801b3981c46051b0b0a6fcc70f37e54672d51bf441163aff7ae3f70cbec68c985fb21af0794c94a145";
   hasRunfiles = true;
 };
 "qsymbols" = {
   stripPrefix = 0;
-  sha512.run = "ac65c4717dcf87ff092864216eeec35d20998f91f684097c169f10e3f755a2cde076cf7cad8d01d1579d72d647b8fc612acead37925f1e58f49f4fa936d471af";
-  sha512.doc = "ccbbcf77a135949edeff501ebb07557b5906624bffaf24887ca393e179d57041c2257d61cd2b95004deb1f7cf5322eb2fb9aab8ac325641db32aa63d40f20136";
-  sha512.source = "9162f3ae79487aa20b815ab7cb80866b45d2994278f9c780f598bc6c53516f378566d0768a6367c36fbae977fe2fd75e91f2dadcf08c1bc498444a18691d5942";
+  sha512.run = "e9c0b7b6507ad4b62644d1892e6d7d270cfe2f9e3a73282c074ea1fc39b6243ba8791c5f693f72cbf082242886969c036f491b55c6e55d3222cd15d2e7f473f2";
+  sha512.doc = "908ab875ae142842667e6a0975951b0c4d86279438f4c398da7e24046a9a5a16f7fb911e97832c22639032b1b8e0907f9ad9a57b7f210b03bf4997758cd23f0a";
+  sha512.source = "2750aec632bf1306ee88880ce388c5dd471269ef9c9e284b61a450220c0093787df0b28a024615b4ae2308f46a320b80ff8ab82f5dd2cff90289598cb1dbeb37";
   hasRunfiles = true;
 };
 "qtree" = {
   stripPrefix = 0;
-  sha512.run = "22a1467f4a88d4d0201bacee1fbd91874bf2047d2f0d17e8874afa68f2c8cdaf8cc892d827d4c80035e7cff7ffeb8eba2a974c306dea539a8673cb9268b06f47";
-  sha512.doc = "9175a6048af552184d864836001e722dc38d43d04bf95c8d8fec5359acaa79a78ec5ed1336edfa1792efccb492e1c5f0dd0fcd825ed93f7125af0b502ab659cf";
+  sha512.run = "be7d3dd2eba1c32b3bb5bbe429df9140f1f6b314679b40aaef602d67fcf150b4d7b671de409ad464f2e5d50231f2e2229b3517d2ee84eb5d4bfaddbd754a552a";
+  sha512.doc = "044398c3ae5ff47867d57270a7760f79e22a5d312786dab75ed1161758dd8028128ae24d6c23836b528d7e4058359471fed22b99456c1eb0dc206c7473543f77";
   hasRunfiles = true;
   version = "3.1b";
 };
 "quattrocento" = {
   stripPrefix = 0;
-  sha512.run = "15d4ae2405bae91037b0516f59b08f773aae46681a3b33918e09f6360e26e7ef963ce55fe46d764f1b62f50de55905452400c9ff09325d01704e1df278dc40c3";
-  sha512.doc = "9e74468f0d78afc6bec380ddaf9b63bf821e27da237225cdb71505369fb40f39217bfb74d389452ec88dbddbbbab6836ce6425fcf5c7362e084a0265554b3c81";
+  sha512.run = "c9a76d02efe1cad1c2928c5f17adbc95dda098c9fcfb7ea44e2e6c2c8c8ac109b82caa2abc7e0371f798f1893139a671e113a18fb23faf5a346babd5a73dddc7";
+  sha512.doc = "907619be37c23e69ac6f5944e5f777b148d5afaeb8aabd92743d513125fe3b01926a131ea4eaf64f306baae5fab73d4a5b78f8b8909127ba4df2d0321b5f4334";
   hasRunfiles = true;
 };
 "quicktype" = {
   stripPrefix = 0;
-  sha512.run = "c014e22eeb7f2b7b9f3e4cda04f1e6c2807e74b852df7a62094189236d3a1b1113e6ad9f3311833a5e4b8999b0fa5107293b8a1d5932c95d83cc2076cd84ff07";
-  sha512.doc = "37222254b5ebd80e8342de64f6d08ef5f498259dbb240a7ffc741ea415038b0b0eb66220bb88b2addea9d461a379fc2ce3148dcb6cdc550b6c91569ac08020df";
+  sha512.run = "997554cc6a031d46ff989b5e81dcb01e871dd468c48834d111583a6a1a4cc9a091e548de0c1c8f5cb473ca695e3b5688b45649fafff212a2a9632fa7101e716c";
+  sha512.doc = "484dab33e3ec0bf31e6037cfea69ce607de1da70f321a14fa06e48df94f75bd7dd06456e15cde967be084372b298f665eaee954e30d051c3fb344f2fd96a1817";
   hasRunfiles = true;
   version = "0.1";
 };
 "quotchap" = {
   stripPrefix = 0;
-  sha512.run = "a2e3ca687484811b1f06da9d8a5e07104239b24dd5d92b25541004384270a4d4abb5d4c0bcbb3999652a51c87638f9b3e90a42bb5e5525f13bf5e063fb6ab086";
-  sha512.doc = "383fa983ed7f858408f5c8fc15746f737ca9ccd20422c19ac4afb03abea7b37dc8853fbf7c24a02d7dd162fa377c1dafb3648704ab603c49ad736074bb2aab46";
-  sha512.source = "34379d9eba35cb12d6d90a8dc8d21fcf260d6c86c9ba19f4767a9fe97aa92e5b2dd62b683d49d2393ce21989972d03080e45764aa493b9c2eba238cfe7c6004c";
+  sha512.run = "b2532032191bc114e3db752535e8b35869a3a8304f11037b1de40f38ff5a63bc3ca9a888eded1e4ac50b63716f475a34a2f8cf1be8439ae5b7233aa4905cb10f";
+  sha512.doc = "6ed31487396b75903ee28c2d1834d6aa8befcc8d878389772f8df315bb9c5189a44b46df405601752e8f66d52b410bccf607b96e2e4210474e6d1d8ca03876cd";
+  sha512.source = "8b01ef71228a1337471de0462145b55811f9cefb68c929a7ae9752ad70464d180ccedcd37ffd1073ad57fce8cdf7b99264e77099af9c87f4b852a3e27263a8a2";
   hasRunfiles = true;
   version = "1.1";
 };
 "quoting" = {
   stripPrefix = 0;
-  sha512.run = "e3dbdb2910a8c9953bdc00b8dc5e1feca91da33024a0ed22200d6a159021cbe4813c92419ce0cc8e38895d08a2f63b55864d3a60956f52b3f16b780a8747495b";
-  sha512.doc = "3bfc837c41974f56ba1daca8fd0c8de5d29ae36069f1f3b6ca06fe6c6941119f8adc523bd69bacda969df13b7f0c39bea3eeb8c79780becac559b25b54b9e8ca";
-  sha512.source = "8b894b7759b7d4e0038491cd2289dcd328592f98fc4fd90272a9f6c501f6c665a81a1dde0a3ab19cd2e7e5172783419579b37141be77b056315fd8ab38cc56fa";
+  sha512.run = "d8a9964310912db2f70f41cf8d99c398f9f6f356eaf53fe14cb097d00f021e730e15070cb155b2b441cea7ec06c41718155b07bad5a1348643d4962c7225307f";
+  sha512.doc = "3220a564bdff7624699979fe45e53ac89095cefff59c93493eb058c9f569fee15deca97a2b5a5738b297eb021ceac930a344c7552b493794996b8772599071c6";
+  sha512.source = "5448ed23d320208ef287c3279b26af88b9940030bec068c1dd42f99691b765bd526ac56df9dfa983dc41e7252281fd15f164bfc6b251606be8918bd5f3bad397";
   hasRunfiles = true;
   version = "0.1c";
 };
 "quotmark" = {
   stripPrefix = 0;
-  sha512.run = "3a9ff250fd820fe2da7736fafd749e79439b20e77c5a13e0998b443a90e491fd8cc655e385068dae1f6134955d2bfe9011a28b1352d17b36c0ff7d22719d61eb";
-  sha512.doc = "0464ba57b89368ad51cb349059593b1324625e2bd863053a5eebc24902d54a6ede6ed89abeea9ddbff06258c0e10996204d5448e1302b554084d1146daeca462";
-  sha512.source = "0855fb78f5486034180e48c76e6aca9256297f94f8d7b2049d4b52ce9d2a8a277c4ac3fe2a58026fd7d1b08da9f34dbf918f1c698accb9459677628b4b996c99";
+  sha512.run = "bc5a3a19c8ad82e5bc367b409d26daef55de532bf8a16ebd8cda5e6e187311946721acef96fed125ce4b16f01ab893843495b2eb712192b494e9ff470217c130";
+  sha512.doc = "4c22177a0687b90c6097c3af93ba20ea2cea44ecdd441b2fa2a285d9b7626f659540079b5d17f44ab620317f7d3f597db18fd8528c7573d37c68ad5cde2e8861";
+  sha512.source = "b989487e0263f6c2633577bd80a6fc31b4564ee14ffc25e1b0bf2be845c0d113bb4cbd892e4f507404cf19f3c7155f0e07ef5c873ca2385f590a2a75fb0418c6";
   hasRunfiles = true;
   version = "1.0";
 };
 "quran" = {
   stripPrefix = 0;
-  sha512.run = "6e53e993a8b53b59898750de487cb8ef95d1d60efd8e5face22fc77ddc025aac426a25abc12e42b313c45b183705e1aa15d97914697f84caab4b00a0470eabe1";
-  sha512.doc = "823bd14c0bc0ca71a38c9ec55e66e4fb4f619ee04856c128ff16758dfc24b5d87c56dab8b3165eb29a60d612241480d0ae1f55561411d9e91d6ca2862614176e";
+  sha512.run = "c566209371af6c2bc2f8d3539bd0b7a88775d81576c9998e9b84adf5352a46e4f1d9ebcfff14c86548ade900e67f05c04268bb11e9b6cba0f2be39eab5b44399";
+  sha512.doc = "c9764e927b03922a217ce31b1930823a6818fd3a4cc8280860429d01ec3b0a748060d567126378b4712d04a9bf2aacee3295aee617bb43efe0a3948dcc598d51";
   hasRunfiles = true;
   version = "1.42a";
 };
 "r_und_s" = {
   stripPrefix = 0;
-  sha512.run = "ea44f8153f71c6fcbee2ecb2ee154e1ef05bbcf104b8b9410ac9fd9d8f707a2abea12af5101c05bcc4e098461e7ef89e6baf44f171a2672052e4d8da871f8165";
-  sha512.doc = "c9ff5ae725137af07f77e18e019b7a81df670371b4db499a99cc9bc9c29b676d8c71f85de9025582066d288af2cf331fa8272452efa373c54a220358767026ae";
+  sha512.run = "ee6335d6e04765ee6a4c85c1e71047e6c0eb74461dc896945f26f79c2b38c86e9daf13ce8eadb0226404c566f6f5148964e098c7a698b9ceeac315d30b941748";
+  sha512.doc = "45fbae3dd1d572c9bec44827743996325471bc07702399f7a59412fe9f197d66f2c008dca78c20dead3fcea599c31ab892bfd8ac57241945ed5d0cd3c9d226c2";
   hasRunfiles = true;
   version = "1.3i";
 };
 "raleway" = {
   stripPrefix = 0;
-  sha512.run = "4f08e6b9171e62a18121ae9023150d5f53733ff681373f7df92a30a636dad6cc62b7a967f6587fde1af9b1d27608272502e1b400207839bc93f3ea7be709164d";
-  sha512.doc = "4ed5ce9eb175c3687603518d4813f6a50e6b1b62c15f2b8ba03d2fea1fd7bb379cfd2eb115974f537341522fbdc7c75f350b6321266be58b5ec239a62d753cc1";
+  sha512.run = "78b68b8aa3863ffeee5b3147d947fbdf6e4f18f1d89cb2bf39a3fc8d2b0272914e9aac57c9bf43547868e2d7479d6d07bd4f3bd1dea9cf426b7bb187aa34713b";
+  sha512.doc = "9721ef21f576496b5f035058974d86190e6a1518a1eeb3b2a4b7728b900a2394f8c876498e7a14693f5c535b4259560b2e7e93b29b0731ec0da3e7a29df1aa1c";
   hasRunfiles = true;
   version = "1.4";
 };
 "ran_toks" = {
   stripPrefix = 0;
-  sha512.run = "fe4c899a8d307662b3963c89e710ad15ca60140faa2b2f8c4d18b22fb600ccb5d9178c4ae148dd114734523b90ca2e2fae64bdf11237a6cd948f0b45d1686aca";
-  sha512.doc = "a3acde938f8ebc427e3ff087cae6ad9ca023882d9aac16a2fcb1b50cc47da3df4ad1bc46055f41b3012428f1045875c4d0af467cf7011a9e26182376daea3875";
-  sha512.source = "1d357c779b9585195cd69c9347f48642c7b5eaebb095cfa2f615728996479c4086ef168eee97599bb1a44da32ca698b0b181e66f43f07c6e1672c7aa7d80f9d5";
+  sha512.run = "9b8664d43b9f5030289ac44097d48a7d453144ca000d38563d6c8eabd1fe5a9c2f7c8ca5591dbb6af2b92748b56e8338d7205873e19f7be763f667abb102dee8";
+  sha512.doc = "122cc456142f2080532f20e96fa39c37038b887b27af86c5c4df17567f74db29eef474e1dc9645bf8fcfe02c72d210da8d8eef2edbf957806abb84a80b69bbc0";
+  sha512.source = "018ee528f96e42592895a7be6ce5ca5ff9191f23a7b3b670ef1f7cb2d2054cd8681399f3ec90018af039010901ca66007bc52378bd7caf4b582f25d512c10753";
   hasRunfiles = true;
   version = "1.1";
 };
 "randbild" = {
   stripPrefix = 0;
-  sha512.run = "29e16f3fb3c88c8901275c568b6dfdaa87a3e999706387fdcd90da5edbcfc5dc293d360959e548f3c34b70f52247121abc46c99033640605e19e58018da88a3c";
-  sha512.doc = "43af5af906fd06b798d1ea03fd7996af9f9fa44aef63f25d9debf60565045fb402fca2f696f4f3dc531e9ae576c8d9bbc2d528afbad5c2643725a8a7ed5082ba";
-  sha512.source = "fb2b1ff94c91d4e29c2820ba522361d139765aac21da054cff0e254c83398de5699d4d804c5f6cabc3365e15750a13f798595d220fb2224beada48d8627620d4";
+  sha512.run = "35b93bcf5a91815ecc73b3b34020d4bcebfcac5e9904be1c72d8e0f7b272721de6e7cc9e38153d4cb05ffd1bc1f01f9c6073afd2fcdc44152b03233430d0ca09";
+  sha512.doc = "d5db0b4ef488cd1e11794538c078d8c455e958c77fd554f81a688b9150071837b76ddeb2c2c246466c0037f6da62f41838d78c4fc731085dd076a8d67cd8510c";
+  sha512.source = "f6370a88d849a78072396a9eee13098034b6db59f03343315e9de46ce0c19c786670b8cf52103b6f74b4e144e9f1561b8d24dae47942d31d9517e6bfffab8317";
   hasRunfiles = true;
   version = "0.2";
 };
 "randomlist" = {
   stripPrefix = 0;
-  sha512.run = "354b3fdc797e18a9de1a7a6ce8f11b32a3d9f29a3c11e1ba30b9968030051023d6dea59b2ddc5e28ba7d0aca148641b65102e5fa788fcca9e219eaa3d926008b";
-  sha512.doc = "dd7aa597d238e44d04821e3bafd08aa806bc3e23fdea025320423b9813da6505531a99dc24fa1d6f5ac77ce5c19a529a5ed95a924f9aed7dc2bd055b0276ff40";
-  sha512.source = "9a09528c5bf82fcadf71a8e6affdbbfef2eb786dc07ec8155f496e262143c1476054879281d5579f13998d9bcfc0671d9cbe3174f3021a88c91e3ff9a32a8930";
+  sha512.run = "fb5c57de13932682098d15072d40370efc68ac33f3a0de45c4a275a912222e3ac29aa34ae93e9bce92aa425285f86a0966e74f5974a36da18a2891a7defa20c5";
+  sha512.doc = "9f4b9529407181edcd86e20bfb390f333640cf36a1bdffeb598aacc8efa0ea2fd67c6b98dd238b537889c8e9d6e9fc20db94db89db1c23c94bea7f2001537c1c";
+  sha512.source = "ccb17f684fea37bef5316e5ee538f1dd82b73b7db600d0380505f5948082e8a8dc8bb4a340a54bd61e5359c87b1c9ef4671310fad53e9b766a36bf64bc8bc63d";
   hasRunfiles = true;
   version = "1.3";
 };
 "randomwalk" = {
   stripPrefix = 0;
-  sha512.run = "f58c351505f9d4e0ffd3b8909154e7657c430386d972da742eaa523758c1bb8a380067af817c4028210eb3b0a9145c9a913d374b28b4a59f81e791e875090ed1";
-  sha512.doc = "592f0f81dffc38ecd6dedf7a979ef5892b80df57c03f9d2476a39ac8f682bab448a5404665f8d7624db9baa7f9e933751d237b975f83a0f433b15a0666a82313";
-  sha512.source = "0e8ccab2bd204e9d881ce5856f704eca20feb40a6cc84ae8e7cf654d650289a34c27daaab2837e8d8ff9e8f822d071e50827474c77dd8ce7d9ae87ecb35e863e";
+  sha512.run = "7def807764a6fbc7a100243c4be8ee777b0affcee694cee4ce339c2acdaec27e887fcf3c427f8059e0f78baef8ffd92fccb3501266355325966e3757dfc031b9";
+  sha512.doc = "6440e47ccd23e9f3c48ee39ca2dcf5336143e113d990f1cc8f659e80404b8fbf7c1a4ca61d11a1fa57c2186306dea3b4dac4a38a16502af3cbec12f431a9fc05";
+  sha512.source = "359fba28fa206e91852ac85fde7d96edb0467f0e1eac53dafe46ee2941ae4279ddfc2e9fcca5696b9f967b9f10da8b3375ce9eba9f8c9fceddd2ccb637211d71";
   hasRunfiles = true;
   version = "0.5";
 };
 "randtext" = {
   stripPrefix = 0;
-  sha512.run = "bb49ee87b458cdec98b79edbb13479e47b8d86038596206a48873e775a805528b7bea06fe81026f4f8eceba02a7adddea386f35f4c9654345b37ecf9c24c171f";
-  sha512.doc = "344c1384d1645260df238edc5ba40db354c9289c11e0472f1d3daf13125f81c07fe84341ee37e9ea4aa0ac7c0796e21eb6ecc1b82fef3e5c5639e79425248b36";
+  sha512.run = "e20b4e2ebd41d7815bbd5de915ae13ad09c5e98c2f62914ed77590a66cb9ebf12a56c994d8d1f0d3dc84d06d37eede85413437b38cdbc93bf702ce82b1378a17";
+  sha512.doc = "c96f7f804b6e24d759b30cd754326b80a5439d4d514f28e0e17884faea6568019d1bc12a987ff7c460151d92afda55ea6fa6b6ab9d7e5a49146de218c59f6ece";
   hasRunfiles = true;
 };
 "rccol" = {
   stripPrefix = 0;
-  sha512.run = "863d1bed2cec1220598aa217d3a26b5bddc142990910ade7f8a4b3fa6e977b4f482225aa804869f5ee32fabd8ffdfed017fd2849549630090c9b9006ecb5fe5d";
-  sha512.doc = "87646168caf23c730c63a2a8276a868725445f286fef89b843c4dc94d669132422bd8717beefee65784fc32b8aa545919b36daea0de45c6c3dcc66ea92e41d13";
-  sha512.source = "7fa39a29b02d1e89029a5f24ae1bf524b560b98c7411fd1dae38b63a7748da9f4857f4d58ee2d3c7fd4ab84049bfdacfc7031496cb4e5884e4780a2924b33213";
+  sha512.run = "e858afb44964dbc47db564cab2d464af7af496c2ad74d13dc14e243a178582df610951b6c1c4e2fcd3b4ec74c20ece276293b3d5e934b938fc952341d4f8731f";
+  sha512.doc = "8887d4bb4782c8c0b14752ac1f394705d33e0ddf8241a6efc616121788a45070c954bcee363e659bf2a6ab250076eb22aea8f718791825066e2cb120607e3bcd";
+  sha512.source = "e52754768a2bf3b321fdb9cecbb83bf43bae2bf4ef1c99a5e21a97c825d8c11e59b7df8d7d74ec4837deda3fd152c5176572ea619eab855310bf9d6c12347491";
   hasRunfiles = true;
   version = "1.2c";
 };
 "rcs" = {
   stripPrefix = 0;
-  sha512.run = "1855eb85e3d39c30643c9d17ee44d9a52b80c4c14a3f544002d9299e9f4564bb8bb19b5e3800ea5afe8dbcdb17535c89a795a15be55083b5fa4ca36f61dbdbfd";
-  sha512.doc = "46df458bfcb4d42f97bc2402425cd769de194a0c4a87ca849127f385c030dde11ba19893abe980a65df331a689fdbd480b7c288839e0ced7f81b0b8c68441d8c";
-  sha512.source = "c1f0e64651fb8ba6d47d8defa45ad4afdb30f2a251e995f9bbbc0ea3e3e21ed8a79857614e2abbfe73a26bebd445eddf54cd0b6d7038fd6ece69ef75ff419dc4";
+  sha512.run = "c2be931adfc353eb3b1919344771d106f2b3dbfde6b623960f94ee6e7d627c0cc88b301ad124bf93a9d491f1bd7183d7eabf76296b9c90343e15cc7fb3720414";
+  sha512.doc = "8bb2df33e83f64986285f6e1eb3785454288628d1870a49451cf4cae1564443cc8a5a36cac033641ae761f3aa707e924f944248e2eb9e3317b7fd6058d3af02b";
+  sha512.source = "289b084f0027cd3e7b251b3bb3ec28c165058df1d4efd2e214146767dc746cb8cc7cedb10af7dfd7bd9b23225ab540de62887b2f6fd99fe36b8d65a4e7e94655";
   hasRunfiles = true;
 };
 "rcs-multi" = {
   stripPrefix = 0;
-  sha512.run = "3b670992dd33ac7db33dab26833838dadf558c421d258181b9d29e22b8968a1b5a80bb00092aedc88314fb7def4ff07a1ce87c6e57edd68d1e21a4272729f020";
-  sha512.doc = "2b9f0efd212ac3fce629162b0902e713b760be706d6b543fc263a984b5e3d10348ddf9d8a396a01139d889718d6335b6c048fccbbd8cb5fc8925096132b20243";
-  sha512.source = "b48093ef79c7065031da61ef98ea0b0eb1a6e4c19b77645cb76d841d93c6ff6213be63f80445090c615a0a89b833d2c70331bb83f794515c623bba3aa8b91cfd";
+  sha512.run = "1541b3231f8ea0b863ab851a11bd3414f73467dae8a6c84d7e0566e0395041b40085af736055ff914686b324b6e8ce23bd702204a73cb57fc0cb5001f99a5491";
+  sha512.doc = "3778d46a2aae8e8f20c77c779aeb72da3275103fc4d9784b054deee2199eded98c1faf8724365cbbdff00720a9f141d8b9f9e43f6aaa2b5e4ef5f097522ad2a6";
+  sha512.source = "76095c85d3c57a6a237756fc490bf7b07c8fb39fcb674ae67208a9161401df1778d6e119832eeb2a511205b65adebe0e017c0ac5afb0ee088cbfe407ffddcfbf";
   hasRunfiles = true;
   version = "0.1a";
 };
 "rcsinfo" = {
   stripPrefix = 0;
-  sha512.run = "49e81ba54baf4adbb4669889dc7e1e6fab16d2036476fa3427a25e660bb82760632e5bdae926aa1a9bfa10418548c7d89f62d648a043ee7d9cc0b9814aa4ff20";
-  sha512.doc = "82e5f7ddf4f13c8c75e13dc3eb2ab2a99c9d40a6275731a14657d70fb769280f08edbc9a2f76fd35148890c1e573be7517760fe0b5180607469ed9085f0da2cd";
-  sha512.source = "afda9b00a708876ef30848075c60ccbc668de1d9a974279d1ef978a5b28f75336692fcbeae6a314927edf1cb1a51e2eb20f783979949cdd291cc72de8a4ba165";
+  sha512.run = "0c66f0c9cc46d08893c63c50d82d7645d5d5e892f46521c4e53c1493ecd9daa4c34ca1fd50d04ae57bdf4401ccb8475fe84cec7f362c8dada4c265f8312e9c3b";
+  sha512.doc = "400cc662c09eb1a4e77d2b6533bc0fd8b9597ee55061f9e7dd2e2c800478f9d7d8bb2f95a1ebfd02848dc5da21ff5261b209b49be9863afa7bc26bdf9e372e77";
+  sha512.source = "906705e03e80ef4c375d7e547770af010bfbeedefa87dcf4303f79271c0788ce134996a4dc31e199947e8d23fef3f9376c93529f1d497163569955a2713ccc05";
   hasRunfiles = true;
   version = "1.11";
 };
 "readarray" = {
   stripPrefix = 0;
-  sha512.run = "792fba2da6f0a4065bb9be7a0cd40babeeb2b642b6bda46f073c7db01c3db18aac00c3dbe0f5564401819111705e1818a0da673aaaa0c31ac4feb0cb764c46ce";
-  sha512.doc = "f0e0eb06d3a6763262eef1959a0f2f51081eaef0de523eba265ec855f5266d897d5c10c97fc46ae5e04a9e4b9fdaa5c97fc07d72f5adf329ab1bfb754465d317";
+  sha512.run = "8b0dafa35cce273abce6435b2a81a642a9fa86859f8a0d920be5a85fa038b2f2ecc35109d5fd13b93f521bc9923d3cb0bf9380c49d7ffd01e2d72ae4a67203ea";
+  sha512.doc = "6f5d8550530f132a7447e8cf6fa3c18441cd3b7d3f737bd2fb8ab1253b042f60a93d527889bdc53f17313e41ab6bce2ed10eb6c0b46f569407eb45b0abc5870f";
   hasRunfiles = true;
   version = "2.0";
 };
 "realboxes" = {
   stripPrefix = 0;
-  sha512.run = "9a9bb2d43d1648119d3e593d4014a9d1e501fca06ef222bb3bb16a5a6b85221ef5ce055343171a4dc75781ffe87e4b230e0d6f96a4a5df2c7159c8b7f71a031c";
-  sha512.doc = "dcbb06ec7289034fdb927cc729e88b5630bf50d610b401d25b8b2d5d2ab67dc365cf423723e4defe2e83d8d91c0c9eae5bc66ec789ac0fb6af6f51c1bb36200d";
-  sha512.source = "ea496283828cbf326934eb6b7460f8574ea3fa3d498c0fbbac43ea57197d7bff7f049ef1176a05dc745ce29924f8fa762c48cda2fd17801b6ad9fd3b5c26344a";
+  sha512.run = "f2a35b1bd3f4d46d4fb87257f656c05e9820942fd92d4b2e6ba5a028e22960da21a7ea07020a2e2088303ecef1fdff87d5dfd0385b35a31d367ec41dd426eb20";
+  sha512.doc = "23d68c9bed442ea79675adb535727f4181d0c91971b4cb0ecc635cc15f1b791326f83861c9df60c6190ecaf16643f29c9f7892996d11f8c1f60bf0df4bd3f96a";
+  sha512.source = "053a25cafcad302b10ad8b50b4d7e1730fd8399d27b897d6044ec63cbea198b75a57732d1ce7ba49ac66d13644caff3f0119152ec7f8390bebe5c42fdeaf1454";
   hasRunfiles = true;
   version = "0.2";
 };
 "realscripts" = {
   stripPrefix = 0;
-  sha512.run = "679a20682e2a42c12bff17d16c058e1635e546d289b84ad5002a4d139f654e33ace9239330cebfdcae1e8edfa4e4f588346e7a8614553e489d513b174fa42744";
-  sha512.doc = "c439fa6e1e43232c0bc906135265acaef455ad7998391677b06fa69c9a1397ae8e59d7f93cd09dc6d2924ff524702df6748d989243068b484e3b4b40d5b77549";
-  sha512.source = "7a4f2194418ba5baa7f2016106be7637e58de32d77b007b7779365b19cc46c5bb4dca49c84459cddf0eef45b6a1715d5ba43de4ce353d5b69eface51cea25483";
+  sha512.run = "3ded8c5bbe0d623832a1f4a20663661c6f444dc1f17e4cae9927a8c01b1a840bb69d239cd69297b81c9021ed2452509d0c8629b0e52d1e7656a83b957ab9ef21";
+  sha512.doc = "e14cfc14f0a244f1eeb43cad84e0eff427251f5519e946f52830f73c94801b35ac852b680830ed28ca486487e77e9ab5748c9e660678da9f42b3a6a99181c46d";
+  sha512.source = "182989ec74ca611c0d093fbb297553994416d8a879a16bd056e1cbadd62340c6e07a473662f5e0ea9560718f66ec45e32d2d1d3bdd08aec3de27f7c8c8ff6255";
   hasRunfiles = true;
   version = "0.3d";
 };
 "rec-thy" = {
   stripPrefix = 0;
-  sha512.run = "2fba80f7c41f27080195e9ba8a7db8276a93a75881d0ebdae6b8f56093ec06d432acfb4c7470e32cc8f579930d6027c7cffadfa1db10f35e4662aefaa7d7b3b8";
-  sha512.doc = "219a3f851f3cf95f93bfaa21b824937827b18dc0d729a4b86140e5c0fdd7ec5f29160c4a8158d20096e451393cb6dac4913a010d7b0ae3004b023f17e94d075a";
+  sha512.run = "c1e3ff64681a53b3d6afb063e2dbb73b7c820779ff2c8407404fa47533a4444d72970f600e339e273178eb5f59af1c15eac060729337d14bce539c5ae381dd5d";
+  sha512.doc = "7eba500b08d79e29908f867718205b1e2a21b1640c5792aee8f8f00e1bba5322af7a255cadfb5e0a6f7ae666437c7b10c26b865786ef1cf0f1aac462508952eb";
   hasRunfiles = true;
   version = "2.4.1";
 };
 "recipe" = {
   stripPrefix = 0;
-  sha512.run = "3b822c0aac7edc074b0a69662ee098649f2314a12eb9d1a07ccb1a7b6fef0be7be6b496518a37b4f396932752b0c4462fb0e7f75e348e67055149ec17e391e74";
-  sha512.doc = "a9be5a663f9c77873bfe9c5de389bfabfc0fb0d203847004b936dd586c4a29221e83f340298344659212f064b0c02c40841daccdc4bc698034581593ff6d508d";
+  sha512.run = "f5854d1f7eae2f2f2268105d6c86aba95524534c3e428b4791afab4cca54e6d5da1b23897084e2fb271ce5fd568ab556a5644d6adaba859a8acf6d4be845261f";
+  sha512.doc = "d42469b59c462a002c9c88c8ba7b5d236ca3a3061806d76fbe38851964ffec61635727b8f8a5b77eef21fd5016dbd54a52b7b8c3417ad2983da867590778b525";
   hasRunfiles = true;
   version = "0.9";
 };
 "recipebook" = {
   stripPrefix = 0;
-  sha512.run = "134917dc261d6a336fb5815330ac2d3f3911e5b5a92f3197dc6fa1f4381d6476e586e4a235abd019fad50cfcde2facb63a82cdea610c83442556807b7e6e3f53";
-  sha512.doc = "01780aa8eb150c8190f9a15baa78b065cb96ea73f10776fc75b33775998e84e6c6ec5cb3ecc1666cea972d77d9e711f42d6ebf51f1838f2eed62d136873cfa4c";
+  sha512.run = "3b1b0070f8f2cf2c6fde5831175c331ef28297d03bc207ed8c4fe105b488c1f3a05c6d3def0d70aad6ccd30f6e84a475af403a7b9d01cc186cb6ca7c61989b2a";
+  sha512.doc = "470637daf760f47889e973c514f45ba7d27f0f3d29686493d2170903804dfcf5a59fdd85bee378f0289534753f59eb4ae1e6c1f32b54f85cb924fcce63452040";
   hasRunfiles = true;
 };
 "recipecard" = {
   stripPrefix = 0;
-  sha512.run = "dda508a75ba95479e3861baa91223a726f5c66be93cf4ebdb4f8adf71aba877554caad9040483004a2e1ab74ec7f7f1f2d8d6cc4ccaf261aa054d1d3eb94deff";
-  sha512.doc = "49972be228d877cc9e63ef406a9d3d2b91120d89de57d1ebe2791c317e0a983c92a0a13dc2c0f9c3c75bf75359b263abaad00f033b45ae9f10006459a209b602";
-  sha512.source = "edcee1fb675c310b1725225748f30177a4ca0dde7a463dbfcf7dc444bdcebf0185eab50e97f3c9b7f223c149fd583a27000925f1712c7b3b004c63ed73aae304";
+  sha512.run = "a1e28222c48d249a601573dacca48bbe6bb61557ee8fb895a98ec539c2b584d17ea7c3348c7ba5593a3433f8bdc0bb700859c616b94bbe9c9b82412adeba5ecb";
+  sha512.doc = "196ee125fe019952ac8b98a24a65aae9fa45e19a0a3b8dea37e89eeb22053d3a8deff30799ec9df2858ecc2c5897dd267ab1b14068fca236e23e3a2c4e387da1";
+  sha512.source = "1b4506eb2048bd09b05a7ef152739a59e85fb38fd266b1cc53d019c8554a09a245b435ab91c721570e78de8c74a1d9d4bc71ea29c109a6f88685fcd6a35a631c";
   hasRunfiles = true;
   version = "2.0";
 };
 "rectopma" = {
   stripPrefix = 0;
-  sha512.run = "a171c942da792f7f0592d94aaac577e671ce433f6c065afa87820c4b0a5717bd0b5948911edf95f9374911d8fa20c2928373ebd63ca03874ea76a145babb7587";
-  sha512.doc = "b7499663b148f721ffc4c8291b00c5cb2f357801299dbb0b64fd608ed19b2dc5a21d646931ddff5aa33c3a51c5c7a61889d4aa67bd0c8727d196520f0e0decd6";
+  sha512.run = "cae353c842be434fb7af2e9d01bf444b446783a18c992cb056132a07d029511715bba574ccab469fd834848849fa63df72ac976ea913222eaf31046edc345d92";
+  sha512.doc = "f04b4386f0f5a1741471eb9a252d1b55b9175bfaa304b21c66aff7d609a50773b6fbbaf713541a9037ae2b84cf5c216907349f88907d349df473437dbdfcac06";
   hasRunfiles = true;
 };
 "recycle" = {
   stripPrefix = 0;
-  sha512.run = "7628d7cf243d492e1a096166765b30116fee65399145169ff46f11b57f28aa0dafc1a6cc74f8a1f381c4f86f4fe39a47453ce60e14a5d6ab702279094e1a0315";
-  sha512.doc = "a63f5f1dd7de638225fc49bf92783473d2b9c846b7cf437f326b35a652af423c3f5397c81cbfcb4a984e8ff4069b7a7cb86e0365959c2b7ad4602d9697d8c461";
+  sha512.run = "48f9f3df5b04f7d7fe17c29607d736297a39efaf4ea0e9d500b45b3989b951ef9df970ef26c199d309e07641dafcc4cb1afddd37dc843150322f9f541a1b9b6f";
+  sha512.doc = "4a2599801072ac8682d2e2c1563621db5c0c1598365fea57e10b0dfed6339ca49c49f44c4dfe25558afcafac75c02284bbf99a5ba08e3db16b1fa7e40b342b74";
   hasRunfiles = true;
 };
 "refcheck" = {
   stripPrefix = 0;
-  sha512.run = "50a4d8694921ec0cea4dfd505ccc3c666c489431040fb3ce4c573ac1c072c51aa8d00135d31b0ea203f0e24f2df2966d46b60368ca804d7697b05ad86e559874";
-  sha512.doc = "52122e44cba922d21f86d2298d22b97d6af837644f6ee68d3adc82b2d047c4b741f7fa9eff92f52a25b243e0f31dd5f92c47a54a65b92440f47685570c141c17";
+  sha512.run = "271b1ae64a55d1d5aac19a715780c85427063fe958a206dd8510417e4f38d06a5c8f9596e99f0b29ccbce0789d7a69b8070e7eb9f0b1caf8802f6f0ac2f4fc30";
+  sha512.doc = "6f6e844bb8dc40e2b2ed45e439399fc0208dd9c2e8b76e91c23c3945b1163c12d1c4f81885aa00470778400ac0ac088552a803fcd2d7ce160624e17d1041148a";
   hasRunfiles = true;
   version = "1.9.1";
 };
 "refenums" = {
   stripPrefix = 0;
-  sha512.run = "e16418646d962963c411a6c9715708d2466b7dd98e1576b2b8566688b3c53af9fed45ec4292ce8681aee3713b40b277f681ea376a07874b993508aeb75a5129d";
-  sha512.doc = "54431c13d9190492094c3d223252bcba0ff6a897c148def6ac7dd6c2aea1625a77c5ebf375ca86e7409adedc674a750e4255d05f10c636619e9336ac9f803409";
+  sha512.run = "e0316c337a7f7ceac42a0127cdc8988cdc4a3e3eda697f8595564dc44e909e90cdcfe963b0af64be0def5c8711882489e779729d286930a350a2df7962bad0a0";
+  sha512.doc = "42fbf9dc873fe4c9ba26df085a2ddc7ee0ad9daaee9ed477b3d81f2f6ddcdfeb5e38be0e16f4badb09fb4cbd0d5fe26f57426c5730a3a6ce4abb43b9f92eecaf";
   hasRunfiles = true;
   version = "1.1.2";
 };
 "reflectgraphics" = {
   stripPrefix = 0;
-  sha512.run = "dfcbe1baa2e6ec30f2f72d5777c715abba9dddaadc18afbd429d98e0dd6d5396c366689ad81e9caf255a3bebacc87a12fbf8e745354454b09aa435f19657607a";
-  sha512.doc = "7f724317904df56abe800585e213b076aaf955dff6aefef7eeea5b6dcad0ca1f76ee965cdcf713ee03ef70756600f89764b3bd0b9dc46fb20ea885306cc4f4b0";
-  sha512.source = "9f99603177165f33b360a83de0eeed3709c0b0a041c0a2ac7a947adeafca006cb1fb1822e2e9db1a58e41c09cf90f5567334fb0a919d37e3dae70807b0510e58";
+  sha512.run = "dd16175f0b8fd9c8e5c685f604d88bbb691566f605f580f6da24a0a28582e778de6466c2b796c0e268b86a804f6b1a35eb99538facf58d2556ac41693b27ff2e";
+  sha512.doc = "9295a8254ec7cfc25d2f634e332bd13f771928d87190e9a1849f1567bdfa60ed578d3cd663d25e4b6ace9f5ed44de854fc90ae3c20fd746dcc278724d7c2cf98";
+  sha512.source = "0d0663f57910f746dab93bd690d36bdf9268e49a83656cf55d0aa228fbae9ba3485ce1d3a97e2ad1305bc6f0d2f7503aa05d5000b7c59820997250c28e821264";
   hasRunfiles = true;
   version = "0.2c";
 };
 "refman" = {
   stripPrefix = 0;
-  sha512.run = "f260a647c35abc409552c54209d20acddf7bcc5f931b8f1aff7b40df6b92be42ed0fd40dbdf7de19d28a5f4e4a420890783e0af3380bbbbd937aaa2d4d74f5d5";
-  sha512.doc = "98c3efefa1d289ac1e7e4a8c0dfe9b8135cf4214b7a2f1449bc38c0e8c984888add307e69432e5085be42c3d7ffb9494a9696791fda9d164bf90478120377c7e";
-  sha512.source = "69f7e1bfbb7d4c2b70d57c16394e844777ef5ad02ed7c20dfa79fd539477947cc6b291f14c5ea0b521a5c68260a0c62a675f2fc72e6ba7e89f8026347ac97098";
+  sha512.run = "da577aa3bebfaeb4d29690026aec5da1095ab4eb79411f403a538c7f9b2635effee7996335091e986d0a427cd44f6998cced1f6127521ecd3de14db29cfef60b";
+  sha512.doc = "e502af19b2802b452262cf571f190ed3dab5f03dc28b9172514fabf87f5aa5bcadb34b4bed8f87edde52e336f8fdbb054cd2a714caac8059138d98945adde280";
+  sha512.source = "4fe4d09fb37764a7c407ac03f10e5e6a50ac919c61c4a600e473b364edd486cbed61096d32757b296e5dfb20a21002bc840f61450d23f24ad62b67dcff98b1cc";
   hasRunfiles = true;
   version = "2.0e";
 };
 "refstyle" = {
   stripPrefix = 0;
-  sha512.run = "72e06e098fa72e8a1bec52535eb0f959f7e15c08bcdfa73f2efbd8acbe0605eb458af32bd99065af1e18c3125f8c182da6d598586d36e3d2617fe7e2efbfa62e";
-  sha512.doc = "f0ba29e1851c9d4821cd5ace83600ad5e6583ef91f84ac2852f9ea8b2d59de0dc3de7a4790c6f629f4164f86bd0ada8a3e10cb69758e1ca680e32ccb50521953";
-  sha512.source = "7ca4617e77f68ec35434e0871b7a6c5ab3b766c7f3b7d8a76b8455be7df7eb61ee8d05f4bd1cb3a7fcf2b1e912f3c88ddbf81b256f6f996ef36a275d1c4da824";
+  sha512.run = "5bb4d79fe30672f95ea084db1632975a676674e4f984afd6b4caf2bc6cba9f1c2f75b49e1b5c6050e80891cfcf9113e7d7f0e37a632fff79537dd3f392216b3f";
+  sha512.doc = "2f05d938e046e8681f6f50a96f4a8e45798425edd3bceda57cb848265a0f7808d8df1a7c753a1629e0c8086ffda01da9e7cc30f708d75411831f928eb8addd1d";
+  sha512.source = "5363ef536d1b3f34fbe4bb59d36c85dab8af7624cd14fec6ee0a94dd9f1fe786c3826265230b9b1c9a8f407cd3fad32284a3caf04c9fbf6381e4e7d7c5128abd";
   hasRunfiles = true;
   version = "0.5";
 };
 "regcount" = {
   stripPrefix = 0;
-  sha512.run = "2dedba9cd4c873bf2b94916e93af4e3e65ab61d78f72fbe90fde8707d5c782bb9146e17f8a9e3526ff6f151a67d4bcd2d703af8620d04d789005c9075da2bf02";
-  sha512.doc = "a84b2c5a5c8c63b8be19d0be89739c378e014d4c5157432331839ac51b37bb11bb8d486908d44518c1de2b09845ccad194d357ce36dbc0a3dd1c12b068a63f8e";
-  sha512.source = "9e25ca01e1b729a59f05b4c9a6ae04535e8143cc5255fbc907e94707f934ee212755075e8e1c01494039b814e403410e544457ed36bfc31ffedeeae3d8beaa58";
+  sha512.run = "4d21ec19807c682d235cd1375ed98651f050b6feb969945efa5d5ef3f869259e735e21e7ec3ce358703564863f266fb428b2fc046d6b8658068c4190d5c9336f";
+  sha512.doc = "03a7a0d3627d4ca7cd47f175333e42f37ffb520b9757f8a522e11b640b8329d65f1a979041228010c0e51b8c3640b4b3f1a164ff4e2eefaa3ed6040381f30693";
+  sha512.source = "4ffd91a882ba6b24024f8a9504eb2928d1fdcadda6c56fa3c88b5c22a8b377831667192dcc347624ede01e0df2def6f7b48ef2a7272a5b3d2f26627bd07d06e5";
   hasRunfiles = true;
   version = "1.0";
 };
 "regexpatch" = {
   stripPrefix = 0;
-  sha512.run = "5614b39c9aacceaf4cdd2e2da54dec7d4f5c2ccab81fc5479dc1ef4eb15ce616b3b55ed6b8f90d297534a256c698e6990a6f0b9699dbd8b47d0c4efd4420dae2";
-  sha512.doc = "35bca1c04298f064c70ca937567cfc3b7c1237490938ec47f829aa77998735638cebfd76102e4361572114b0a66fba99ad3568a109b7f8ffdfcb9f34a530d35d";
-  sha512.source = "3ce601e998e6fdadde9a852a884173d9199bc8545daec17f4da296ec85f17ef2e06f94f2ffcf7019b825e722ebef01a6e7f05a23576f856af7ded8e0c12f4524";
+  sha512.run = "abdabd6c881546cc7015df2d5709bbfdd55f26368b3f661e1452be406b74c925a7bac9b71e583a4a58106b984f9a8bb42fe727efb009df10067a09f192ccc1c1";
+  sha512.doc = "ad121e01efeea9252c3f8454cec40960518f1be072c70e912525061a5e55ae6e58eb35af697fa205d2374ddda7d46e9dbaeea4c1bf7065b1afba19d4c4804e98";
+  sha512.source = "41da5b3100efce4544618b9e716b402d33d24a832c29dee214feb59d6b7498edb70fd2812a947b1afcf4ab9f9c6a6d3f72f71018f95777810e64ab0cf2fedc6c";
   hasRunfiles = true;
-  version = "0.2b";
+  version = "0.2d";
 };
 "register" = {
   stripPrefix = 0;
-  sha512.run = "bba3fd21655abca118cd621f7feccfd4b78059d206e4f7bc075892a6bcea08a12a6131a316300ebd18c9927abfab13429a56e44c1399adee57dd42050cc469ac";
-  sha512.doc = "49c0ea565bb7600fda47cc83ce93b6e5197f06295d146a6cbfac9f13a97f5a9fe59485a28ef08a28b3d0cd275231f08375efd54782658303cd76a7f06a9dc121";
-  sha512.source = "8fe7ca4ed63e3a6070eec506f1e52f3d7467dbb9fe29b21a6218c2150cc31375c69effa975e4b81168a1185caee5f8735e1ca8e420012f63e33e0e792053c11c";
+  sha512.run = "567fb67e37c2e6a7cf830e91d91f08d3893a76d655d53c0c3781f2aa444b222e7894b789dd0b7b41d123c1c6fd99f7c37fe4a56ed4339d4a04bdb2fb1e48c8de";
+  sha512.doc = "f5fb07469a0b1d01053747d01f7230e96e0b4f55e78d310132594037515071ebbcd1474df67c60022af2ce098e9317e1369e5269479b685e36f677bb3df37da0";
+  sha512.source = "105b3ab704a23b9a2cfe6f1bb986b4401f103fe792630f32d2d623643bf06e5f624bd323fd93e727284d59029774dddcb18d0cd3ae5777d35ddfde57b503eb20";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7";
 };
 "regstats" = {
   stripPrefix = 0;
-  sha512.run = "c2374199df479b46f732200ca18d6a4d44b7304575226f8f3f1d0149c1064fef274dff6601dc469ce16145e95fecbad795e94e607d3638fdff96b9fc52d9316f";
-  sha512.doc = "db3656e649a0d9db98ce20145edf4cc9f5bbd982f46247c70c126eb022e2da3e727cf8b07f35e4c5ce0837e0c240cac1ae2084103b54a0ead9d6239d3ea27bb7";
-  sha512.source = "c3c6983232b7fdbaeaeba4f9a1d606467c580ce375b7034a2e71899f237e90185f555c8349fce42a24a3703a50dad1ca22ffba02289f688468b0ca09149c9be9";
+  sha512.run = "95dcf3868924ad3a0cb7b6213ca258a000826e111ee0410d6afc443ce7bc8f3cbea085d6d54c1dc8a497262dc629a2e12c585096563654103322bf22ce525b89";
+  sha512.doc = "0e39c513491cfd0e0f07d4846fcb89fe015d202bb6d24ec6dc9a2969c415faa86e0c790438f9e84b5e9aae5c8208d665db7d21a997c91428311515d3652fa2f1";
+  sha512.source = "850c538dd71fb9cabfc5f7d9e1575038dd0bb4827bf046789c43156aa10a0a2c3dd0017ef8919709c9c088bcc3a6e834733ec338de95e7d08bef0e4c90036222";
   hasRunfiles = true;
   version = "1.0h";
 };
 "reledmac" = {
   stripPrefix = 0;
-  sha512.run = "0400059527e63bfd7079b4d8914bf4254df4afce3412362b78adfa961deaf10bd8f08bcc54b06ca62617f1a2b233cf864a7eb9e18bf18fd4d4be940486d48ffa";
-  sha512.doc = "861c99aa9d925225984fd738907f915b44c76e57841adfc919dc49c21e9c83a2e902f25c96222988398e815d366eec4d1ace7b248c5dcfdedddb547d9a395ed7";
-  sha512.source = "276ee3bc4cf98bd84332bd61d077b4b93296779ac4d7a132f341befd3face1255c758e002fa26a67404de443e976408c00dda2c62141775542848fdfa9e67f40";
+  sha512.run = "8f4ad751a32c65c9bcd030c910bb6fa60b8d558fbdb848ee8360650e5049fb5868cda1b1df1175ab687fe21136703b2eccc2d9e9c692e8dc6d6c2700215fc1dd";
+  sha512.doc = "459bebcd50964bafaa37c5490d5b125a0afa6e85ddf104319d9c376d7f94e4e659d3a3e4fb6c5eff0111867004b7d5ffa0cd0fc3fe1c3684de1b3fbea8218caf";
+  sha512.source = "1337bdd791679ca35b7abb7d61a73083d1be152b9b52ad8427fdd62f9a25095b293120e6c1f2860c547ab479b17e4ccfe3d9a20efb4d7def621734c65aae6482";
   hasRunfiles = true;
-  version = "2.26.6";
+  version = "2.26.12";
 };
 "relenc" = {
   stripPrefix = 0;
-  sha512.run = "a505df93d306ab9b0d619aa2fbad00239e96b8efd93631de0f2f9de4c2aa22105e82ee2e7dbd72dcf0002368e8afbecd7dfe3c431d89912313a88e0cfea44871";
-  sha512.doc = "d4ca02cc02ede0862a493b4257b311f8e543436cf156df8c26f7c6775fbca48aef6e7392d77b44cdc7b27a97576fa7a37a5be61ead881efe0de7057eb91788bc";
-  sha512.source = "39f3df283c1c9cb3e74e854ceefe8372b2f754b24ce99dcef881c12144ce88fb268a5fe331480f20409ee1ae6ba60fab18186522d9cb952925036791c364320e";
+  sha512.run = "f03aa519f1752ecb45c1c0e0dabd575195e527ef7744a2d2512e3f7ee2f21594e0e2515a0a79fcfe98d3acbf34563665e70dd21925255096351016914e40bda6";
+  sha512.doc = "2d57f5e3420eb78c188243e571656a91bbb628bbf3298527975952f6dc930adc571a7712d3392905f3b28d664e07194e00e0f4f7d1176e83e52d624cf0fa2d8f";
+  sha512.source = "72aff8b877014e0321f9e242cd13829ea95a27e33ce75d5d00868cf65bca3d9f0f745f449d5e7a5b7d7e07a1073ae20c94f59bb038a50e43a1b13fcba694ea31";
   hasRunfiles = true;
 };
 "relsize" = {
   stripPrefix = 0;
-  sha512.run = "fe38c848c9f2242dc611185281519b3a96858856cf3ac074d88bb2c8acffb97b172d42755731ff9ea48e3296ccb8c747ae61dd6a09bc3f4bf5c6cc13041ac1b7";
-  sha512.doc = "26e4bbb103d1ed5654baa1b14003e92a4b97ecc24e5c400ee80e4a02cabd8561db045ff5fe1aa5c699fc180a28a5f2a69099bd646b35642b94e49cda733de3fa";
+  sha512.run = "86ee036834c90d8ef64f8be67059cc80cc053f90d1356e13a597422c07bbf40e81e0cc8ea0166034a2aa0fb81fd0fa82d431372bb0552c0491a56fd8e119c7e9";
+  sha512.doc = "b5ea1ab1cd882e649e91ef3172d2121f3b5252b63fb1ce79cecebbffe2600de63cca07d0aaff72c5c0f63720483e22d241bac94e7740e1924e64de02d8dd17c7";
   hasRunfiles = true;
   version = "4.1";
 };
 "reotex" = {
   stripPrefix = 0;
-  sha512.run = "753ea0894ed0063bf37d6127d4735b44f0b9390a931559cf28e1bb318b188349f344fd66b49ff3af3086e2a57d290f933a1e0fa32c05f94ec84babc3cce91de8";
-  sha512.doc = "a8c5cfbbff73ca14bb0ed6f2e179bd93208fae0fffd99d7a3e4f327fd88473dbd5e7ce4482211e5f0054f27972bf5d2d21199f1cd5922c33c068ebe0e0378b52";
+  sha512.run = "b08f2a86ed6f3377c099c605469ff5e6fc5f9033bfe599da755de27fa7d0daa58ab4067a84705b080f4d7410f2871da2c4e2a8ef5b1e2258ebf74917d0b5572d";
+  sha512.doc = "2d71592807ac5985bedc8f9a731bbf13f572376cd64cf5733d3b6acaafb3020c34f5137030d3374d4f353cba259f6794f3ddf70100a00f0907f9d568d9ef6ff5";
   hasRunfiles = true;
   version = "1.1";
 };
 "repeatindex" = {
   stripPrefix = 0;
-  sha512.run = "f8cac6609a829e400219703e8f79a271c5d6296a55c53f93a1f164a9b4914ff2b4019876e4346df53b338f12c96858864e8a5dd555bd91513128d3fd3b64f9f0";
-  sha512.doc = "71d34350079a905fd1546737c40f8a67979558651b26d02cc495d1308ca95b393d970a8e76fa464118883d6f39b294e88c720937360716f36d4fc9436b2b7661";
+  sha512.run = "a9e66561c2293b4ebbb41139c31ab27733bb9d2e89839a14545185973f7c19f34120eb0c046edd3716e24bc676e4bff0418b6ff6141373339510814c82ff3b05";
+  sha512.doc = "1def6a75ee033441b3cf93841cfc98bd68f15f40da246404d56fa934453bcbb8479927d5e2e624a0c1acffb8927603bb88c47a06825807b17f9ea285bdec802f";
   hasRunfiles = true;
   version = "0.01";
 };
 "repere" = {
   stripPrefix = 0;
-  sha512.run = "a18470486cd11f2603a037191c251023357dfaa6e342612394bad6b68fe261c784b2d2c2e63d14dea4258f28e7a5ab7505e81f67370c012530b221cd4ba07a07";
-  sha512.doc = "bfa022f56677ef44625f517f9bf68fc94cb77d41b41d8d5e8820ae85aa34ce0b2862f2fb7f7befbea9fa4de125a779266696106750fd751d450b468f516231f7";
+  sha512.run = "e3ce2652e341725ed471dcb6ec77a3e52beb9890f91d6278429f06482f9feb74bbc0bc4eff9c7d406177fdf6908809578ea1a26ad60919b1faed35b0565605d5";
+  sha512.doc = "e9060efc93dfdbd1053f11fe982f204ae3fa248c8b627c86f9793e640fcba27ddd6352ac4b932f0194878c269b6d9afeb841d4a33737d091921843d854d3bf8b";
   hasRunfiles = true;
   version = "17.11.2";
 };
 "repltext" = {
   stripPrefix = 0;
-  sha512.run = "d92b68383e2bfda1292bae6ca1f5d0f2c66204c76038c3dd9e2441b5f380a22abcebc22591e72fcfac5f5d79a83e786d700e9ea9ea702d821bc6146bf7e1f9fd";
-  sha512.doc = "ec4ff07175e8c841ed4bfa4be48d1977e15ba567a356b665c59cfe45528449991dc950fa6bd9a680bdb0a7a65ec75c86dfa0ed6b96dc7b6c14343bdf65029c02";
-  sha512.source = "50d941a7ae8dd32fe6cace1b58f61db0c64a090a89d64071b2fde3daa863620c6d8687ce36fa81a500f13cd19f40756d4b0787a2c7d7112254086c89923317ae";
+  sha512.run = "141472cbfd051a8214297eb33923ec8fddad751d41caec16089e5455c69c8e77e2bc33186f82f69315aa1e5e18a4e01658065d429b4324af4f70e036c8d5bd23";
+  sha512.doc = "375a170885bb43f79e5f86017b4ddc415c975cba2d0c58bb12affbf7a06330d274104196743b72a0f7c46d2d3632507b984785e2e00453dc5104f8ca93d963fb";
+  sha512.source = "e8662123b7ced46ff9b79fa0eb21fc0372967c4b871bb50a5c61a6a64fe6333cfdd0ab0f3c1bd3bfdbaaeaa8d08526295dd8310306e9b9ae2d85973fdc6b2136";
   hasRunfiles = true;
   version = "1.0";
 };
 "resphilosophica" = {
   stripPrefix = 0;
-  sha512.run = "01a3a1b01e916c81473e0de973ee53461d87fd16c35ea9b5d16b0c8906e040e9560cf63e0e425348f6f065a4290a4ce07c941609256cd6af8a3e4f2fc51f195c";
-  sha512.doc = "df241732986161314b30c1a1419d7249534902eb02c2c438c6b1c57fcde0634af644226936a7145f9aa42f37d176afc6d6d9ccc2d519052a835b84e073da6477";
-  sha512.source = "329576e992641b8e0b059f82c57da616bd6b21b755689b4ef6af3c47cfd8ea01011025977ba25eeb6034fe68b35665b956f9ddbf345cf880ee79d38fb0b5d16e";
+  sha512.run = "08a4542f04405c098958fb19f5caf024692331f72cd3a0f17c4b19177c2541c8cfab1fee2a7710399c19a5c1436f95941479db0c1c94387d85f3090cbe78ce73";
+  sha512.doc = "6effbf8bb0187eeb0cab635f58c04066b761c8b3f90b03b54763c718330a779376d97b59a2a6aecd04de2eb8b2a0513e41eefbbbe5e33d305cfdcfbf969b3b5a";
+  sha512.source = "d0d1cd848ef7f95b41eece10be02b91d2bd8ba052a9cd6257e41d815c24fd142754c989fb88c33fefccd423e9b9005a4da657e7042eddc62b350820f4f6bc54b";
   hasRunfiles = true;
   version = "1.32";
 };
 "resumecls" = {
   stripPrefix = 0;
-  sha512.run = "bfb6ca5e2ffc53ad6a8093bb3b29bf007762348750f58d17f3e22a241a0fa7ff163b6ebde8fd1b63d9ae832c22317c0ab95528f137e1d2643069bfcd981072f6";
-  sha512.doc = "08a1ccbdef66fab7a4029ae5165f2f9f1cb20053a69fd81fae7192917fa3077d161e4ea2555afb057455e71e7d030c3fab3a1b7c0d5e5e8c0e37f7eb1406c023";
-  sha512.source = "956969910b6323660cc8715a2eac747b9bb216ac7760658157b3cbd8162f3db8cd4ec21fb35919e95aca9bfe101b85849d3b8ba7a59741a6502249977715ca82";
+  sha512.run = "1d6bc53eb0915b7be73ec9b02e4a7bcfa4368c662595fcbec203a2ca2b6ef5a4a486bcddcf55057b5a7483fa2003c3110c5c9263ca1ea5cc344a0fa490124b27";
+  sha512.doc = "123308938dd4d2d7fc4f1d6597adaa6d0024588f0f277b5d6430ff3c7abb2fb81327a5b70cafb061c1bfd7b830034a8aa12e07a0de3b0f1205fb7b83a44f4811";
+  sha512.source = "e1489dbb558433d7d5f0e69c69067df4304b1daee5c81dcd68ef6f9bdaf3f0f68976639a51c5473a162434f818bb6b5761038df75d1d740f07b6824166cc2b7d";
   hasRunfiles = true;
   version = "0.3.2";
 };
 "resumemac" = {
   stripPrefix = 0;
-  sha512.run = "37dfe2d2310e95f9bc5af514d553944370f346b25a7cc24c45a648fd8d729d6044c68c28acfca50fa89d7aa3e49d13c40318ba70845c6ddaa319bd756d731904";
-  sha512.doc = "80679c91c13bac0c17d55ec4358c806176293a801c4fb5fa21fe3cb7934f844b14780d9fae65df0bfd8cdd9e7ac7ff87cb45598f8e48a8f07f1947b10b43a658";
+  sha512.run = "9be9b7ecac2537e49c8513df20555d6f5c2f077d33486fa6b82a8b2b1f2b31d9e9b9a310542444218d288d95a9a34a9b2d8299f8477e049de5c71169223f3b2d";
+  sha512.doc = "6f185446f9b9edb7e8e07ea37e33ced0e1f443c0556c21d25c9eb49f62055cfe126440ccb8417490336752bb59aaafd563b7f6143572c833a46442f24e1912ae";
   hasRunfiles = true;
 };
+"returntogrid" = {
+  stripPrefix = 0;
+  sha512.run = "849dabf59a1e027cd0adc4a67476ac33d836897bb7a28b0174db76431caf7d738aea6917052f3350a62e55186169ead1aff553742fe59969c207b2591fa96ae0";
+  sha512.doc = "921406ec234440af7609afdaf32e8ba0f62be9df1a14649e294ff1b2f2a0f01db091686e7f081bc705cde54277ca22af8cc0230a9d57df3fef6f7c46f9ae2ee0";
+  hasRunfiles = true;
+  version = "0.2";
+};
 "reverxii" = {
   stripPrefix = 0;
-  sha512.run = "bb290891648010cde5eff517820e0f5ed24b19898b7a0b4e6725a70252bc624775462cf20c38831fac0aa08c9d29fccbdffefe8ec95d955b489e23712aaf648a";
-  sha512.doc = "7e25160a06cf0a5328b6e088756af64e71655df69c5134ee158017a4f916f8e7d98bd45b8e7c727816744be1d062d9c1beffce71769cb92345f703407cd9427e";
+  sha512.run = "6f665c581ffce69f049a41aefd4f201d589a661bf869edbf796229c7df86a94799e9db3d8c392976022276d272857fba8ad42e1c7f06c4a45375d986aacdd5b6";
+  sha512.doc = "0b82d8e6a4ca1c76283e76f23102dbbc4b4eaff876705bddf22bfeab4614ed4f36c1781b5960114e81248c7f4abe10e0b08bfc637dc5ab5acc3b76b3359231a7";
 };
 "revquantum" = {
   stripPrefix = 0;
-  sha512.run = "4e808c26292b67c896b503911974179a735df034b9d167c0f94ae890a159f6861e40a9183edcdd1cfdab9681d00429ab4e21ef1bf406a20c854f58d07e6dbec3";
-  sha512.doc = "62c360caf5d2988ba67e1644bccf2cab469f374ff52320d8e98d8be59657890cdcb5d357f7410dcfba2e89a4501853a3fe5d586ff36843e6547ce4385b66cb64";
-  sha512.source = "25f463a1f7d054a4dc567d8c78220959257b77299a3378708ba2d2fa1806164e041ad6a338b4c68e910f4064dccc9dc8b389185543ed011c9da1517548fd0005";
+  sha512.run = "66a2a46daf5481cdd87e40064a04842cd891f5aff16b7fa8d170a62712880ceca8b01c2cfc649933ffb3d25f1de49fffd9de5545901a5ad89c64ff91bdfabd90";
+  sha512.doc = "eeb197d2172bf70dd8afa13d6192d39c222a4e37f190b2434e21cf4116ae713f6b71a423e3358bed2b7e4d9adeac3a28246263ae26dda6a773ca6603a27fdeb0";
+  sha512.source = "f448867460bee1a27f9445bd278ab4692499f8e44c1bfc949ee1387dcd6a30239c97745ecb8866016657feb6653904a32c1428305b29c45e827450d305c70ae4";
   hasRunfiles = true;
   version = "0.11";
 };
 "revtex" = {
   stripPrefix = 0;
-  sha512.run = "3cd7b730d7e92bb6e18ef426a57e1d2b527395c51705fcd18c29e4897582fe871e75019e92ec0b6bd8b6bf623464d446ef0ec79e5ebd785c19106b6fbcf4a1b7";
-  sha512.doc = "2f706e80012190ec2925917dce8f376af3d695d62d5efe363b7f962f04895224b2af3e2eb78e6adcd8523361c3a2fe39d6d6b948d9a0f0e37ef5c96e7ef4eb78";
-  sha512.source = "4c67705a823158d45ecbf899dbdc42345535cf5fea750b4a6da3f01b5c6abab231f1b92b9814398b60fb7b391d90cf627de87fe0ede356355d4b111e96b3489f";
+  sha512.run = "1e76a927df169675bd863ba8783cbe4404e46bcd5592c104bc62b82d0a54c11ac2f27bdbd48652e6ff7a91993167c616dc6f7113626bd655cb21df4d7ddad6de";
+  sha512.doc = "1e6f730d623eb322a71e0a225e2683ae417960fe1fca5c3fbf80d7509b00236096e92e985f6da1396d6c56d7622aa9c0f4480d4a47a1ac718abac6b99a725728";
+  sha512.source = "a848f6eb0d392b2ea8670e61f97ef1b155163701ac7adb2cc9b17561e7a71c33cfdfa51e2e87e23e1b3ef67d626ede0580b1d7d1c9604d7a69857514c275dd0b";
   hasRunfiles = true;
   version = "4.1r";
 };
 "revtex4" = {
   stripPrefix = 0;
-  sha512.run = "885a0b0e8606259b40f9c7d24749378437c64d620ae079d03eba2047b45f7be598faab185f874b4e5c323a6ff3e2d140f580a1ec31b670f3fdc8dcc896766a1b";
-  sha512.doc = "7c419cd0e87e753e5b31da1fc104236c15c5d800ea9297c87d077dd4c4102338749fefa19af16e4d944a248458526f0274e624708b45d27997495654acfed89c";
-  sha512.source = "a04001f56db0f768a1adb86801f223c9261a699c1602e03fdb99a7fad33e66b5c77b48bc15c5bf0d16b1c726f781064478edc2b558c2d6da12cc6425c82fc7b3";
+  sha512.run = "8cac2a271af2d1fce6b7494fa18aa9e85daf49ddf6fb5f19683cd6cbda856dd46cc7f4d798fc192953462aa3be0e7b04774c8216e6926e001569286eb39edc77";
+  sha512.doc = "75e7494c11ca25c2cbb2b4925a7eeb88113139857c353bea1413e0b2ccc9f05d949c892b4ae27750433aef5fb789a0e07520260afc4baf10a430051a0cc878eb";
+  sha512.source = "aecf26db235637ae637522e68994e58af0e337d547e7b9395dd56980e27c792fe4a1317d1a487af10be5e622e09b1ccc14436943eb1baafda44a1b1262bcbd94";
   hasRunfiles = true;
   version = "4.0";
 };
 "ribbonproofs" = {
   stripPrefix = 0;
-  sha512.run = "9a4521a7b660a4db2c2b3d5708e26b2b90324ae576a5af0b80abfb966bfca008bacdec2ef9057b1c8b5f1b09a72877423711dacb414f738a947c42f0a62332d6";
-  sha512.doc = "002680a34df26d0d88df4ddbc5891e488d1e92358f57d4b94a12fcb99e9012b644b7a1f2db45657bd6822056336626377b8cfa3780c2093fd3b642f35651d0e2";
+  sha512.run = "051362589f58d6c6c7d9b763ad0ca281cad41c445f127be0622f6c125d541f6572892641a9e6bc22c52e81b645e79960987a5eeaba31399e304f9a3f9004b4c4";
+  sha512.doc = "3c1b00a1d64260978c3e6a25a45e1c90435955e2f0924e3c2d5c244303a6776d605f030d8e9a7953358e466482b356d270eb00fbf393ac9abadf88c8999536dd";
   hasRunfiles = true;
   version = "1.0";
 };
 "rjlparshap" = {
   stripPrefix = 0;
-  sha512.run = "2dd670d09fd8f83eb6cd62b45dc32e24f424e69cc41600ed6d89e47c58d499d877ea62e7498b791d1a0efd08f29ced1a9051ee1073887335e26b44cd3beebfd6";
-  sha512.doc = "b8d9c17050f0258a10e5a4316e82775821f6673263dc1654677b035f9f7817e548f62f7f47d46a85f841a2c75ba97b0b8e9fd0ab667d2cec6c41e9506bc0941f";
-  sha512.source = "fb9e76fac76bff827f94f1b75388f5e8e5cf93f90a2432c0b7072b7dd9c798d1ccfb55683e509c49faec3ac09fe1c770f3a09e0a4753ea6fb15be0a535c8d356";
+  sha512.run = "d07a0ffe9f6620994142d7d12e64bb30e1b439bb3da2b2af07829523fabae1ff7b8260f6cb6e34896af91abc9d9a5a5d797d50541736707bdbe0e2ec1258b30b";
+  sha512.doc = "4e51465a60181745a38abfae79158fcdf38b77cb10318fea1223129e2a7625366cf0556cf57ed81d337fe540281df2e68b6c7534bc65e9336f9942e9d59e157e";
+  sha512.source = "5d9892ca17bd10515ce33f58877e6469a1b09cb567e7d06cda9507601e90d1c4afcc26d8823e63e5be52d3b00f695b6f78fc102c213990322d4ec68e2f5377e6";
   hasRunfiles = true;
   version = "1.0";
 };
 "rlepsf" = {
   stripPrefix = 0;
-  sha512.run = "cf3bea90b95608b1e894621037eefc536851dc4fdb7d267c2cd08c8f99d4710b1efa3bfc51cceb54dccd340fd053fb40037d885631b0b1132d2de3403906a6aa";
-  sha512.doc = "953441f785df2885a503d742c236a42ab5143037191fdb7bb179b74d0d0a1581bf42fd8c32c859b223ecfc7880eae354ad0cae43f39b12dabc1f3fb0c71e7cbc";
+  sha512.run = "1caad08d95b81c2445f75e37ee939faac5a251a82b42d4303d5d70db14f77d114075279602a0fbe1565fc228895ee166951f0e5adc27b6a88f5e098e64be0525";
+  sha512.doc = "ca7e0a9179e7d6a97d107aa2e163c6f906cd74be722ddbb4e4aaa39b133188377847891ef970274cd752cc3d1375c4463527ec662d62ca90004c0a376755a37a";
   hasRunfiles = true;
 };
 "rmathbr" = {
   stripPrefix = 0;
-  sha512.run = "7fd0888cd1f93aa366c2838ec1c7b40b9b4bafc92e8a674279a1ae1ceb1a9d5e747239104a88dd40cdf45dc6d82fabce8620b5663b12d6d75eb2a50068823c92";
-  sha512.doc = "453414094d61ba23994f12a409f6f6e1f712021332647d1b1025ccb59c5fcec00434fb37df02d5b307ef9fde3824ad630cd1474545052edff7fc2868a89efb4a";
-  sha512.source = "fb26dd151fec692b79ebd78aefe6d6aba9324905e8c5e6cb40bc541b91e9bc9096aae8a9d4f2e17e9d25ce961d1560fd611f7243f57d73d8b6898ad1dfe26dbb";
+  sha512.run = "da4c62b69306375ca0f2ccbe8ad6573f716354408379cb4bde44f2c1aee7bc94bf47c1d18c78b7d2a78d670efe78aee43f985a5635a142af7e92bda42b27cc3a";
+  sha512.doc = "99100dbc2c3798b4a6227b7e43664ed954de22c56f3105db164bf4f6605aeeb54b2de63417c6dcd0b16136dc0235fd56ec68f848f4cfd3cba36f1cea55c1305e";
+  sha512.source = "32da36a82ab818e5c3a44e8e53430d7ba02069abd03a259948c83dd45c4d16e32b0229237000348635b523a602dc573216994f24df243e44170e3d3a7cbbac6f";
   hasRunfiles = true;
   version = "1.0.3";
 };
 "rmpage" = {
   stripPrefix = 0;
-  sha512.run = "7fe400212aff46673c4ca399ae7fe2db7b9ba482d6b84b6ece0f56c6042236a8256df5025a6e66f356b9e79a63ed45d5ac122b20ad8d2930de4253f7fe25212e";
-  sha512.doc = "0a9194bdb9017e2a01b34c7bc3102e5401b1a288f0cd3b86b074e87f6c57711bf325fcd30c054cc4632e145c67043654039cdd72f6996201c5ae146f08d0b456";
+  sha512.run = "3b8b56e8fd576ddc240ee8a4000524ac8831fc009b4c5d86da8a31669e1b9c38217a641f228f98fad93f91b436deb370efe02b652911bd1c27876a9a1defe5af";
+  sha512.doc = "6543fd6e9d1113764d0c90692fe3c62c052bab5a97e44220471e675733edde1f0232622ef89d6a12f0671caa042bd3e6243e0e7e232e1cbd029a736297ce7b96";
   hasRunfiles = true;
   version = "0.92";
 };
 "roboto" = {
   stripPrefix = 0;
-  sha512.run = "fef144de771478133a7142df25a34e61d1346ca47aee6b76bebafbd886e79d76e4b7b72ca28f4452b243e933a0e28420be44cc5aae969c841f5234765e9273a5";
-  sha512.doc = "08516ec17dd5ee68c3b555824705b78d624514d3d01128c18363d5e71d80ce76199c399d21fd29aeca4177524ed9bd4af33cbff5e7c1ad10e1183ca1d56c93c2";
+  sha512.run = "cecbc5c38b92a3b4671376d8df2fcfca2305ea795461bb9d9ae9d84577d4cdd3d7094cf57f6cb69ae97c2749f5e31139a8fb6a85812d2462aac3646cfaf06883";
+  sha512.doc = "796c93c2c4adb904b292c939f173c821eec44a199cd8f55462c26c8a7aca02712c11a079a64750b89c03d9ae6db55dd99176f372658d2f98bf32d9ed7d4b0de1";
   hasRunfiles = true;
 };
 "robustcommand" = {
   stripPrefix = 0;
-  sha512.run = "9e88e02542422ed4c6624ccb054ee37a5e877368d2f58f795bcd66137c25f37bd7be9487621e228b2670aa37766c706fbb844ed052065a65943e4835d0bb21b5";
-  sha512.doc = "e3e7eeebb91a12b159cc4ec343c98638811155e7ea1fc660632683287f27456445c70410fd6c5b5305b84c977a64b11c50e2b61ceeee1a3faea0cf9ea7bdffc0";
-  sha512.source = "edcf17b47a2a30ab54494a08dbf4f8912fc850e3920d5ef0072a6379d82529f4609fb09b5de402721ce37fff1fd033092dd66b069af0dda2a4c21ce9786158f9";
+  sha512.run = "5ec54f58bff4f0a1a8bed4e3780bdd3d4c3b6c6e43f932463d69b49326769f7968a246d28a39541e9c0abb577e6a5c39bbe08684e636954207535bc445ca960d";
+  sha512.doc = "e3a16925b40835e4e1f86fe51ea7e4096b75ec9a4d01b48efa2cce2d5b2c4173151cf906979e973b5e52a8b9acdb2de923f9e3e798099ddae478635a765a0661";
+  sha512.source = "781737e3fc7f7d51fafe873dde914b9497add072445fbde5a6e0292f5faaa1b556ff845ca9da3b65f75fc64294059bd6e64fa4f0ac5306800f84a5095aa30900";
   hasRunfiles = true;
   version = "0.1";
 };
 "robustindex" = {
   stripPrefix = 0;
-  sha512.run = "b767aa5e6c00b41cab1451e96f4f35560a34062e07d297f29ec5ba27069f57e36e75074cb630af8f94f48deeb69bfebcf506e383f57844f6c05b8cd8721f4776";
-  sha512.doc = "deed10828d696d0abac90d30e579468297a8b7c87ec5234e6b232eee94998c844cfc962072f057b98e7ebf1cc4584d815572519a5b120126319e57b62952d7ac";
+  sha512.run = "346eae9b7245c02fae7d1a1fc1c973d7da3040a7875ba44ab3a4e905c98a1f21fd521d6b0c567754a279486a3645a4ec8d530a319b9c334bf7b1ffe6a09c8e34";
+  sha512.doc = "4cda805c5d0c4533dee9e37f18eee253e710932cf331778a762dabc8d5712f01f5a5a04599c33f7593c9279fd470469597f87c55d9de349ff9da2abd4dc6c89e";
   hasRunfiles = true;
 };
 "roex" = {
   stripPrefix = 0;
-  sha512.run = "0cdf09b09017715e73fc5844fb03a3925361e617e990dc5f10df218d81b09a42f1565adbc89665413a693609aac45f51aee2fc17365a913571a96bcb676c8182";
-  sha512.source = "113a9abe888b444349dba03207c47f3ae3207b1904e71b5b199143d5ce2a58026aadd74662a10826da1a02643b4faaed1df0e68b4e88d32a671988175c1d35be";
+  sha512.run = "6e95cc394d00a01bce5d7daa18a138ba4c25263365b3c072046e697e4a486091e27ea53fd0ce35619c96b6cd238f119aee534e5297e62164115dad6d95bee6c0";
+  sha512.source = "4b78a2ffa9e820d61217578726e88f1b386dfb8c373398784611b81d2f7b12590fd0b9b0c8b8a4e950593e2121013ee6ea0d13e8a774aa77603ef7ced0f7ae19";
   hasRunfiles = true;
 };
 "romanbar" = {
   stripPrefix = 0;
-  sha512.run = "6df8858e4c45c849c5ed2baf8350df8a3d6daee8fbf673595dfd8529395197b6a260e0a7b383a41fa4cb668eb88c99f0c8342096a323710efbbe50c7689dd889";
-  sha512.doc = "1fd1e32b488914b2002a2c2e118b6477a1533a5ea520e89d32df6226a617458705dd99ceee72a166cd96e8ca0d91e9d3cc78b7be41c89907df5a9f598f029ffb";
-  sha512.source = "f78d5e64edbb9ead104e0664b27cfc13985339d632a254231e3bacea70a9c05b78cf5cb92fa06422dda1020b1bc2fc7d2ad17bf61ec3b7b9fbaaf519f69ceee1";
+  sha512.run = "3f6f65b167fa3cf3014e35cfbdc2cf70d32f57d0ef0165b482358786229404d4a1d32422acb66b47aa2c9d7b452e34a0c36374e498a837bad9e4710a615be27c";
+  sha512.doc = "e8d6073154a1e8ad7a91c86775df596fd515ea5a93b78088c911cb93d303ef698db81508b0665dd4a01bd4598ef6ba46218ca3e27fbf25d2b7aeafe6e3fdb6dc";
+  sha512.source = "d642e141d2db2790fa604be55dea4ee97ee542a953aed7974be71223954242c554f71e5a41e0f23595cc521dca98693b4e4350e51fe48fef40b2114d2170289d";
   hasRunfiles = true;
   version = "1.0f";
 };
 "romanbarpagenumber" = {
   stripPrefix = 0;
-  sha512.run = "a8fa7b33d71af2037171efb9ef968de101a3dfec972fd10396d82760c258471446c9e9729ade32e1b96a07ca77363ba94ac9578e7cd7007c17fb9ce39777eba7";
-  sha512.doc = "cf3cc0cc5ccd908e011d00456d6652316c000c2e1c188348598d96fe06c97df6b3cdc78be99f680db114c36d48f201afaba5b0b2dc4f167ef72f2ce678c55fe3";
-  sha512.source = "6a16fd221738c69e0f77f2e4f0adcd8a7778c846e0e9f54fc2c0ca1ea5d9d962fe94f8d97dfdc3c50a31b0752ef044741066c70719f83e8bc15afc281bfb5f01";
+  sha512.run = "61ea143ef45b04bcfc489cd985ebce6defe3afc906cec0126269145fd9a0dc206fcc32da4e500cd7ae967040b56d9d7d8967c99eaee8261431c8c376a094f249";
+  sha512.doc = "36d53fe286904c144e8a14769d652fb1b2ddbf7d749d7aba49038b88f5487d9e1187de01370dce923f9341e8d92bbb4f5f49fe72e66456afac6b96ee6ca26a99";
+  sha512.source = "8b89749c065932c7af509b94baecb863ef2233f370ae512ee4b13323c9fbe2ece81da7dfd4c67012c826128f34a3c8ca41e19a67954b8f4d48eb65157ae322a8";
   hasRunfiles = true;
   version = "1.0";
 };
 "romande" = {
   stripPrefix = 0;
-  sha512.run = "2a5e440aad7c9e8f35ee2a4eb5fe24ff680a2fb5f0fd1c3b9a7ba17b640bab63281388529437bf1b34fbca8516d566537ed197952f32135046771a08a0e1af3c";
-  sha512.doc = "018567f19535ac67a744f3605feeae7de16c8236dc8d205c2f4a97985c169a5630769a85b997da2c139c150388bd1a7b157ccb9e995dba565dc7703939f52827";
-  sha512.source = "99b166011b5f82cc8ab0e135ea626b3247a5d2f270ddba39303d9f0e46f1e96c32b40e548ee6537202e43b414d622879f002686ae894ba6332de15759cbe6f18";
+  sha512.run = "91d82e42852e49f15da793732ebb892a1e9b340b9edf7d522a9e54e08138801be2c22e0464d66e1978bc03df6b8e5f102ec5449eea747dda13e7d397e1e655bd";
+  sha512.doc = "ff1ffaf46fc6822b2ae9c051bd21f96b44c38f73fa50123cb691c1a7304be885c378f4fb7649ab4b5b19f913255200c71575e8a9337018095b087b2c090ade9d";
+  sha512.source = "a73375a467747c5382872e4f1d8f0fa4d82233b17e8fbb7e3b94008e41b33aa07a084681d89e726229b1986dca0617caa24a6ee6ae72f3460d2e4869fc981bca";
   hasRunfiles = true;
   version = "1.008-v7-sc";
 };
 "romanneg" = {
   stripPrefix = 0;
-  sha512.run = "b3e1a0aa7d85fa553759b3401d4c48152d07517de5ff9e24fc3f1524e2561ea95f00e7cac9c5eafb0a0b382957d99adede77e565b3fe284047894cb0df25a931";
-  sha512.doc = "590b852f47d3f9fb5c264375cb00032e4ce83cca48c8d2ed30961503afc396d43580523819b8a53d48c1eaff8f195122fe97ca1d78d95e24b9a489ab12dff35e";
+  sha512.run = "3c0bdbaec93e6040b9ba0c43c2c772d624a8fa1610c1242e2f6771326088c2c538c3f4628514919a6841d4ce4b20a18857caf1639a84c2e3ac99bba4c2b9e356";
+  sha512.doc = "745e21333be41a715121cca5fdc9581681994d9bdd2ab68d2baf524df95e146737a0ffad1bf284e7e9300af0ed0af29090a2be1ece1beb8b40165132024da9d5";
   hasRunfiles = true;
 };
 "romannum" = {
   stripPrefix = 0;
-  sha512.run = "ec9692dc014f9fa61f663863abf93027d3ce0e330ed2dc7a6e85b9779442a2bedd80b2d4a279efd1ea75cfbcc3e061267659d9077f744e8fb851616377531649";
-  sha512.doc = "0845fb00334303cfd761ca4ff09d83c1f6436ade5e27c569e21c4e2230289aff182f6894d9d64d969062eb20a3c96cfa27a95248a067a35387def7641d049145";
-  sha512.source = "4457359a0eb8dc9a4812fd4fe1b7f62e1dee3ba39350ff307987882cdc1b756c40dd45312a6343eea053fe9b721e24413e09f825ca2c8ac2afd802d55b39b469";
+  sha512.run = "9c2dbde6b5cbff0805b06c55a99c708461b584bb0ebab49ce6e4a89f972afd30e7895239e9e6a10ba572a3f5a696612e5568af0c63760646dd9c2e3e06b9ceaa";
+  sha512.doc = "ea2a9bc6aeb1b6ddb4fdbf246b1143bd85821b91ccd68a9cc81290c68e5063e06d1bf3a2a8ef882c5d2b50bb1373ad4dad870864ea3dd9893ff50fef0add21a9";
+  sha512.source = "7509cf4c2c9446ac30d6da498b14cc8aa7084cc3b6eb82013b8cb9db2830359fbbb45e81363c8fd0d5b8ff1e8458d6295baf7309b5f3e286325d048f1c173016";
   hasRunfiles = true;
   version = "1.0b";
 };
 "rosario" = {
   stripPrefix = 0;
-  sha512.run = "e091d79717c6f36711b402ad7436fb054978a2ce060343f500c7c533de7cf48a6372853e41d6435e110398c13bbdddb2a1c18dea8131f0dc3667ee32cb92e6b5";
-  sha512.doc = "3234e8cf4acd61ed7c1e85da44cc69c51e733fc5d592b52f1b95c7f4d6a553f985e7af1643b11fd584119317e21b67f94f4405126f90e1627b8b855b238dd060";
-  sha512.source = "1f718953cf50a0f0b2c2d23ed1e3c85efe317247c2bd1e5bda0fc5f2b29fa3088418430fe80c16107b28e02ced562e8010e93d43befa28542ca5f8f4fc34982f";
+  sha512.run = "cce759aa57f8cdfb9923223601816007087f3f88448b6efee80d083cef8d0abbe74677d5d5cd82efc56b3c2a1cb508ce43b86dbdd4e3c4667d9ec2450ae20468";
+  sha512.doc = "0e0a57f188625276a8594df6cf06c97c2f730c381b0524a11bb98b02cec3da15f4ac36ea2f30401bacdd520d4d32f22ed46de973cdc35e234c0af94760b47fff";
+  sha512.source = "792b46f42c0b432c678c8d8113ef453a957cbffed6a8516b90733ea7cafb322c4a1772c8742808bacb4eef1e5bed741bfbd779382a0bf0b04718bfe676ccf0e1";
   hasRunfiles = true;
   version = "1.0";
 };
 "rotfloat" = {
   stripPrefix = 0;
-  sha512.run = "d5c4bb4376d8793a1444978321a0b5de690d3eddd9645f7979f40102a1833c98a625c45961f96dd6f1f416c72b4f2ad811758a2aa2191b68f83f531fd4a5f8e3";
-  sha512.doc = "9c83c2e3e342e9d81c440591dddd170030c3959a996b7009de2d685f7d2227acd857e61218990681a33e74cd41f0b0522ed1dff9ac00c42f340c72cda47744ab";
-  sha512.source = "38d8584e2eb7b391d7b58a2474705d080f57cb2fcb32ff14ad4e4d7b80b1df22d6a3fb2d117fc7fec15aca44e5cd48f4e9466c871867f9651c38d44c1e2960a2";
+  sha512.run = "8a80713d45e0b6cb20a087a78c8441f5e3831751e9253e4680a44468e467d502d69fe67d8fd05f8583d032d647ce02f5ceba1917f3ad174febef9bf8f1d98a37";
+  sha512.doc = "7a9766badffdeb1e84954534cf21c3877c6e2294fe16e69902fd9c7e2405546956fc68c332fe2f18c319a415236f29834fd6157ed3951a50856d42055c54259e";
+  sha512.source = "177b636e2ab53bb5e6359e4c91ec2f45f487e7d5456b812410ea56942292ee74b137715f87ff3bc817f17aeb29a6ae0fa89691962c2cb563f2c08e2534e2826f";
   hasRunfiles = true;
   version = "1.2";
 };
 "rotpages" = {
   stripPrefix = 0;
-  sha512.run = "18ffa6f29199b6d9a5e68d864c5f52192102226594ec524424c2970e10b4f98af4539ce9cd6d5a6f43f0f445998531e54dc8d742085e0b57e808e9413d6082e7";
-  sha512.doc = "1236e55f6e6b68300418fd35e7d245b8f5ad1202120aa460070705b01c96dc68a9a4a5c9be2838567e722a59a23310a540400fd8f503cb4d9d405d71eacd05bc";
+  sha512.run = "a6f51d55d743d2015375640fffc81f81d080f2d3ca9d27ed93eeae395be0e908c526e1c2eec26e9a71a5dac665e7c78b71d1ac1d1006dab5e5953b2c91a04ba6";
+  sha512.doc = "1cea6f0e5c2334de7d480ebd5ae7ae2308de96a327ed8e06027a32a15bbd2fe7ddad40f51b47a466941def26c572fe1f23d4240beda3215fd9e87010560e1122";
   hasRunfiles = true;
   version = "3.0";
 };
 "roundbox" = {
   stripPrefix = 0;
-  sha512.run = "c119a91528895e0b3fce0d10914ac0a64c44ea56b489c8ae5ab0aeec38023fc82b76b9a3965894e1a6a42a0109e5ee8c5a83a84f851cc4c9ac0b7b7ac747d44a";
-  sha512.doc = "48b0318d507f159d68201ed58b6adf185b02eb166d73761adffbd5038b0dad1a4a24680f95e126a7f55b62bc729a382c2c4477a0e09c2dd3176c8661e78e2c25";
+  sha512.run = "75983b28b41aee6dabb35cd2012ee39e3fbb93fd26b87f3606197a230598495f76d37599907c5fa8e486241dcb0e6de853020a3a08605c1cc51f44f7d4aa2c78";
+  sha512.doc = "03a79367e18e95eda32fecf44892113426fb30b53d4deb95b4b631615992b5da24c4f9ed74ba15013971434bbd41a545a5fdf30b46cc2a34587e61fa7f136afd";
   hasRunfiles = true;
   version = "0.2";
 };
 "roundrect" = {
   stripPrefix = 0;
-  sha512.run = "740a5c26aa90fa86414b5e53fbac7214c7605db8a42eb99a3e3b1120e839f1afefeea61eaec59999c5b8503554f30e220bb97c37a676b3b2d77ab0ba324c69cf";
-  sha512.doc = "aed2f9e95282682706e12ff562e21b7fec2d9890b4b9bf8af00fd0712c76de4d02a943591643d130edf73f247f41709a4f6dc9b715b70a7b1e92c13a7014426e";
-  sha512.source = "4a13a700b10c1a435f62b34e1bc8529a08fca6d7a236f43ff49fed745d20a1fd8875c02043b8f54d2a260155e4c08afa5a923edcb0c688d1de8a783efcb20237";
+  sha512.run = "86ad2797ebff2f9725ee933f77768d925c37a302d6a2ad0dc728365f033aefda041e3ec67216a6cc30986c74077cb42a62a54de120eb6910b2647067dd8e6ba4";
+  sha512.doc = "c9b5e55d11f6004e203c46423fb264c270fc35471e5ecb303f1f815c3217c0f029e053912ededc6a0bf5749465bd6472c015be109b1abbe0d2f79c9c7e61702f";
+  sha512.source = "b001e7865c3ebdc698bb87bc72ab7968af8e61a6a7e6eb89f85ecc2f147fadb9284168e05817fa096da863adfb5d26603718088157df9195427d72e9c21bf6f6";
   hasRunfiles = true;
   version = "2.2";
 };
 "rrgtrees" = {
   stripPrefix = 0;
-  sha512.run = "5bdc469d2fc2dca63d9fe47b78544f7914a020251bdae8d4847e74e7b9511c9bcbf35a1e00fb37231548ff6932a99e1425a09fdc0a4415fb62b409945da27979";
-  sha512.doc = "2af988ee3d1c161f384bd1d324124628dfeeb5ddda5ad51e37aec2c074490ce54d4f8bdbaff2298a18e0cdb65c1324f4d1aab5a802756b57026916eea4203783";
-  sha512.source = "c31859b6b52baca3b1473066c9692036b846616aed5bab80c900052d61312334f4cd8a7e48f2e71055f48b4eadfc59ddf044e9217d8cbf61d866fcedee9a02d5";
+  sha512.run = "1f3663231040a2b3a60abb9468bc397893e96434b7a1c6b8ae589010e5eabb263e5d8961dab24910a4479b00466988c2e3c8896b9b1d6598fe4246405d31d80a";
+  sha512.doc = "95846504f8a443c393d295bb2056320bd3294133e4aa1ae6df4af8a3218bebdb495697eb7ae29d41d36ada7c646efbb3cff50ec0cb81782206f8c7c9a344ec34";
+  sha512.source = "a96289cd36a8202f76bf05309844619299ffff3df7bd27d703456e38c173fb9a1599e20efc294418e71651835cd23e3c4f264b30ce354a3ee9ab44ae1d1f8dcf";
   hasRunfiles = true;
   version = "1.1";
 };
 "rsc" = {
   stripPrefix = 0;
-  sha512.run = "f0daec3635346205108a72f93d8f778f422ed5791d6ec14d3d0c563ebfd240b4fec66fe8a701bf53435c3968706a16d0fdb5ca3719bb89721571be868764ae15";
-  sha512.doc = "2727313bf9c210b7038de3270298a8bc3b135d96e9025911138a62d980b4d240d4494503b261e0b7da551dd17c8c105fff71499794991f866929cb24cbd9838d";
-  sha512.source = "a5b048e2b54982a8c160f8e7340988d5d46a71561b50aff7f4a6b9cc4573a49fcf12804ca4661c935eeb0ce4ab5a04a6df6d60201a5069b526c7f38efd9902d8";
+  sha512.run = "1f9b9dadab1dc937738c0767423ec55a8d0ee85c0c0a9098d5f94960eb2c5302a88d3479e4fd2fef8df9d2d8927b9c2247de59f0c63651d7971368d35f0bde83";
+  sha512.doc = "75dac5282b82ecc9d192e7b9a88f3d281aae2dcefb9a156c0084a3ab199a80ec5c545fedd26c67cc10b11505887d93b83bd57b526c6ac7e89764dc0109376fda";
+  sha512.source = "fd1de8d282631019709044adeb620a632922deb6511f44bac1bc44a52bb7ab1d722bf1c9f4d2ccaa9c339c2f87325e6b2c951c9dce65d7716988e9408df53a50";
   hasRunfiles = true;
   version = "3.1f";
 };
 "rsfs" = {
   stripPrefix = 0;
-  sha512.run = "cf4ea3bc3856399fae53e6fedb91017b4336c2807b151bca90171614c678b24cfad85a0aa0a77bdc7e23f2d86d408246256726f66b3827684713303b9ec0719e";
-  sha512.doc = "da5f2659e8b96afa50c6da148e3d390da5c44501b59ce14183cc28f709dfe5022d50707832e17aac30a71cdf73048a538e6f95938cfb6b20b6baaf60da2e929d";
+  sha512.run = "80a3424b8e94a95b4487cacb0bac953bbecd423667a94730e536be773cfe080a79008c1355ab1f4605f37686fba8d93cb6bdef021cc0884bd2add695fe0fcc8d";
+  sha512.doc = "82ca4f8cdcd5afddd80cfe8f7b05b23e003b2c6249a637fa9f9378eddda9d54ceb2263f1192ada379d84b485f1ca0ba2f969c64f105bcdc415341def8d6a4796";
   hasRunfiles = true;
 };
 "rsfso" = {
   stripPrefix = 0;
-  sha512.run = "a654373112b70e17986aee215bcf1885413f421f35af7cab2c0e29091923720194245f1b6546ca48f97dcc2961dea8b686e7a573c210a320b0e3ef4668aae7cf";
-  sha512.doc = "f0eb7338ed27b5fc57adcdcc483f3727f33870b9287cb427bbb7d7055ebd186c95096b2f156ce2db191614849a585705b6e541d321fc062dec331097c2077970";
+  sha512.run = "ce036562c7cc85a028426f7169281362b7ccd0ffe8fc772f0aebeb4841b5b0aaa39aef1e6fb4a0a2f403077f9643ace3f22991c30a8ceba51c367bc50d045e41";
+  sha512.doc = "2df69dcdfe794d0f10feeb413ea857c62570c2e16e97955cb1c86dc8dc076e19346718c5d291db6cae4e3850a31141dca9710a6e2f4d91d6e36cbd3e29e454bc";
   hasRunfiles = true;
   version = "1.02";
 };
 "rterface" = {
   stripPrefix = 0;
-  sha512.run = "e66f0344a876f82ecc74cbfa2306a3c6d697817fb933d7aa95e90c5b25ae668689630794a9c9c8c40786e0788136e956ade3f03b2fb027a6130e3eb5295f2ce5";
-  sha512.doc = "304299c37b8349119fe1177f429fdfe20a84a6f96b7c6ffda51a4d8dea391af6dfc2c30ccb50f7007621d5a87e00422474a8a92df6119c3ff83a474eb5ca4069";
+  sha512.run = "73cd997d2d54ca16f3eb8b8a6fdad4c5fee1e23f3b2bf62fe98307d79c7e431ec3ef82e4d588be7ffd3d3d3c04e829d0f37a9489b8adea5a6e2be3abc0e7b0dc";
+  sha512.doc = "dbde5ebc327e62962da253ee9fab772b52739eb4772a2f849676600762bc39976e580d923afe671869e0fb9c80a7f0c400ffb835ba2f021254939521b124aaa2";
   hasRunfiles = true;
 };
 "rtkinenc" = {
   stripPrefix = 0;
-  sha512.run = "07e8c9f756b46fec635b42dab60515da47ec8416392b512453d903b1d023807c7f85900300df91547e13eca9ca35c38bbb2c7a71bd6cd253b7ab304a7ec364d3";
-  sha512.doc = "c9bf34451e11c7b9006c2c00caf0a72d34e9ba0ddab2c4bb9cb541b6be213d05d971efdf76022d41448de17229e038290cffacf348b4542839b5f4786fe30d07";
-  sha512.source = "0051586a808dbc1dd593905a440a1d486f43b135ae2d3fc4cf5ed01d57e2dc04023742bc57e2ab659e3e905d7d4468e91e454dd4fb21b669074c2c27bfe5e4d8";
+  sha512.run = "287985d5ff2308014772aed6fdc4052e43218e5a7a60e054d471aa9f86e5579295e0cfea4f68efa3654b0b53f449405fb4d33135fffbe2b8cede1a3117fb5510";
+  sha512.doc = "1e0439e39861ac9babe709608cd224bb5a4e8ccc1ce5e788d9923aed2df5c085e2446f620b06eff6f00b31c2eaa3e0246a3ca09d634d1b83d0e7e4136b43c546";
+  sha512.source = "58a09ab1236bf5f781f8b2aada6acbfa5a889508994a2a054c950b56f880b75717e89aed550bb11e028d23c215cd5375f145779adde5a487f41c27e421d5aff2";
   hasRunfiles = true;
   version = "1.0";
 };
 "rtklage" = {
   stripPrefix = 0;
-  sha512.run = "551da27acd370003e160a2ebac30b2d71beca8d1de4d70b93839520c7c24146a0ad4b957d9c016d7e6bb9cc7bbc7f6fa39547739984aba41ed43fb9d719baaff";
-  sha512.doc = "603a23aa8b8e5c6f8572a78a592708131a86d6c38fdc53841bd0a10b294e44cbd046a73497c36fdb98bc61e36634900a19ff69a6f2acdee8b00ad5f21734a6aa";
+  sha512.run = "e2c8f07aff7d72ddf0492b70fc2c3cabe948e67df374870f6696cdd9ac3ee6e0dff1acea8872befc92905ec68f2a0e1b0bee964c76ecd6289ad06cbeb0ffb4dd";
+  sha512.doc = "8d5658e36382ad40f589b713f4abcb1f4ca97c7da4b154952c73fb34cdf8ad9291581f3baba9ab0e05d06437468c75860bf2331e18703111470f2043b3057854";
   hasRunfiles = true;
 };
 "rubik" = {
-  sha512.run = "ae19f062cc081a26c2666640fcc00a3c095f452535089b0aa19abe28e13ca29ff89731e23dba107695577549f07aa443040382b7a384294b25ebd742663d4c41";
-  sha512.doc = "96606db6eae1f55d7e9b4bb2a82a91a58bc2242772f9c322f3e3754cd3426e0527f1a6ce79ad033011a489e59809354ab9837aa40c42e649a1dc3473c7bc72c2";
-  sha512.source = "71438fdb4806f3954a7351329c7b92fbe33903f19a3b86c1e47fffdbc7d1ab5eb657a02cc952695f30bd3228d10ebcd84a238d2d86ee802697daa5c1070fbf35";
+  sha512.run = "1908d95ff36962c91c62fc57e74c6c9b1cbfe751cf6355e90940fa294c5977998410c7eb50eed01e5a258f059e444436a9a0ed69ee8f27d13316f932b1c4b077";
+  sha512.doc = "0d9210dcd1276ae0393c63bcf2cd06e1b7b3e2a9d1845651a776f032b467f5619b1cd8fedbc0cfc5a3640d3d4e2b1d1906d509a44950130114ead64011cde2c2";
+  sha512.source = "b09668cae1a54aca218c5eec593e9072e9be33fb0e14a4198d429408732cc8c898544782f0a28a8ffd3f6972e37b2e0114432ac28ba22f6afbee9d8deb06ba20";
   hasRunfiles = true;
   version = "5.0";
 };
 "ruhyphen" = {
   stripPrefix = 0;
-  sha512.run = "630b320996b28a92bf650cecd71e829620308c332b5be9eb778444487710cd76fecb729afa47d89c29906e8b914fd8596322832be762e4c2c76b7f1520e37652";
-  sha512.source = "eed0a7301c39fd719d1af1a01e1e58646f5c3f5b6fea8bac6608edaaab05dbba254cb797b38a1f53a529874c6253ff0269a812dee421caa95b97734d238fe8f2";
+  sha512.run = "dc4a222a945f30d24a4bc54ac1c4ca1056479772bca6ea45cd5dba03287cd815d25fb01d347ce664d3e7930ef5ea83eeadf72df9c3103ff7fb4a237b3b36babb";
+  sha512.source = "7cc7b27c924e19683450a77cb9f543ea5f91393fbb72e1454a70690599011cbf3d0cf2bff644806942f874363974e2d1ac36bb18471e3a503ef7dd6e70a89b82";
   hasRunfiles = true;
   version = "1.6";
 };
 "rulercompass" = {
   stripPrefix = 0;
-  sha512.run = "7c7e630eb11b35b8fd169b8fdae4168ac00b411e843eabfdf1750284f4fdc0ec73e007605bdc988cd3b99731f132043c1558b4bb32ea108b661a6a8710cb2ff3";
-  sha512.doc = "041453feee5f6382812300cf2346df3776264a8fe046ef9c97f36d539c307f92159f96b783068b48defa6376fed12f984009b70a0abfd86c43413f4589e9477f";
-  sha512.source = "539738195c1a0e7fb2cf176162c26d2ab7f4a422aa2339c29ee9807b5040ea591652b8cec8859b0455e5572020ea4c9b544b5fc4cad5169459a3d177a824b8aa";
+  sha512.run = "47922197800bdd5a78f72879333cb3982a2dc31ab0319a1a0b5810399cbd3a19fd6fd0482e84fde45d444ecb8df2115759fd79b0c8d5098b3993a80d2e48945e";
+  sha512.doc = "d3db2233666ef0b682c988395f5cc2ed600815d583fbd01a92db7d8480232843d506b62b6d80a0dc99aed5f8f97288a2423977fd7bbbcd03e96a54a948c3fb18";
+  sha512.source = "7b502b26d45f6dae54813672cc8ee79736af9559566b48e2314a12f87708f704467dd26c56ed3f0f11829c884e7ce3f176ba771acff872ff4f9588c6d68279b2";
   hasRunfiles = true;
   version = "1";
 };
 "russ" = {
   stripPrefix = 0;
-  sha512.run = "aeac97954cfa649e0c33efd1138acc60bf4c4977c8abcaa8dffa006291ba7d7d111e87dd6b5bc4b466c555da7bd54671f63d6cef6aae041b007b33ea10a45464";
-  sha512.doc = "895ab20e585f6d96affa349b012dda20034d6613a1437b8845aa7c77af59f9e21fdc199e043e3134aa53602c4ef1c1882f59f44b31d3d6e179d2e2a55d03512d";
+  sha512.run = "d24a7a9742f19812b44dae7be99e4156113491da8939f050ac8e01e491916d9a17eb2832d9e521d44d1d4304f8f85de9cf9c5bc3129a64036a67159109f5c048";
+  sha512.doc = "abe5a7c33f01a7df0c014be91426c8338814f28296041783d8c5c90a495943106c70dd1b9829a42c5f3cd824516aa2e4484993078c61cc9edd2ed4f494085f36";
   hasRunfiles = true;
 };
 "rutitlepage" = {
   stripPrefix = 0;
-  sha512.run = "6fb1f2a606ffe6b4980285a0c30e2e0f35d3617e9eccc1c76b3430783e18a37b2ce45f01161dbd3ea66864507a7039636d213af95cdcf9f913426175d3d13efb";
-  sha512.doc = "f83e8e4d3ac47bfbda74e8abb6c9ac5ef6098eb9164436e3c8b6273e84f7172799a26e3e760dcae319d85e3cc3719a283ef1e9dc7291c2a5350bfc82e44a235c";
-  sha512.source = "dfa48d61bab25d12e6bfb0c4b70c7b3ef855f726841cfb0e5fd29950419820415701c95d4c56d4719e76a518998eb7d490de3b9e5988d5ac7945c24455e7e32b";
+  sha512.run = "e94d9fcf19139ae7b28116ce544de13665ab86c180846dc46b1acce0b4094d0bc5f830df934ade7ecbebbb40920c8366eb1558e6933acfaba3fbd59bfd248787";
+  sha512.doc = "08ebef5c77ad2b2e45cddeae4d58d392723de39be0b223f205f7681b16a84bdf991f1bc18b7c92eaa94e01a3833d1e92f339987c6213ae92eef295e5de66fb3f";
+  sha512.source = "f6147af0e72ed3f38cfb82ed036a59ec154a5c30c28d8e8d72006c1e64f80dcaa7975fb37a4d99e2f975311cfc5fa9929ca8fc5ce2be0121097b8e7cc0ab9f7f";
   hasRunfiles = true;
   version = "1.0";
 };
 "rviewport" = {
   stripPrefix = 0;
-  sha512.run = "41933d6e6ce0b6f1053fa9f51adc8042947ee865ec9e8ea17103ff66d116dfa88b39d8b032243b03e567e3a663c280322fac5b22598717e53c091b23cf207749";
-  sha512.doc = "93ff09d6e031ba7b71191159d407ad717f16c852e33b8e950dbff80502d37802373bdc3daa409125540efa42ae9986c454cc9a5ecdff81162b4018f8809920ff";
-  sha512.source = "b916ed4279bcf1496f5978a3ac561cd02c3a8bce7c03f78f1784b38e03205f2026c4cf7638e2e8a5db7ea382f62491f137792f4a61cbaa9981410686653d4b2e";
+  sha512.run = "4bd5f79960c9efb05d32aecb825e69d82d6cbb558cee89e6b6f38d8836771e2076a47c4047187bf6a2fd86e06e27da46693c65412dbb70d0d2d756abf31280fc";
+  sha512.doc = "189705f93ea310d6d65f8bbb78376c6a9de6db4f45d57ec5f83794b2efdd6959601c7423f427febe95fc6b0008d0cb66a9ec25b775090b62753ab4d2accd41c7";
+  sha512.source = "c80eb46f40c06f577b46101b27cb5e20f0d360ec4e6ce633d3139ab49616f163ddd464731f66946db23639508ff13f0c7d208038abb9f0c03ccb8b9bde18d268";
   hasRunfiles = true;
   version = "1.0";
 };
 "rvwrite" = {
   stripPrefix = 0;
-  sha512.run = "231423c4f9380a458c5caaf4da9c6a53eb9c927d4c0998fdfd32c38dc1c601c4b7355206aa04c3bae4d68ff2e713c04d958276b67bbcad6028b505dde9baaeb3";
-  sha512.doc = "0d70059f33d4053af9b4faf8321369374a1a0c5ab5bb2150dc815e3d70e68640b10ba24d0c2f7d96e7e68d153aa09a945fc18238450c5004e981549fb1c92a4b";
+  sha512.run = "eac51d04fb6bd7b43dd2d241502e4ad3132a3b4cc3da918533174919563965defd1bd0b3e0c08015094dbe116084391f607b9687056b7f3e69c86cac9094fd70";
+  sha512.doc = "dd0b12298c17d32923864c8659fbf748e19a233322847e0d1311c6e02bd7f99b140537881731f3fe4ba2bb7a5c719f9de661b97937753b3199b4cf740065cdd0";
   hasRunfiles = true;
   version = "1.2";
 };
 "ryethesis" = {
   stripPrefix = 0;
-  sha512.run = "4ac57e420f635eec9af98a39b142f26b3ef4bc2bb2916c1d5601de78511de43077c36dceb120e017820725f8e28360b6706d82ae1dd1611fad55c89c7047ffe8";
-  sha512.doc = "04c6e59a0f509038d4b890852f7439817a57c3a0e72d853cf60902bf2137fca2056386fb6a41e2f27a895d78e956bdd880a9cd84a9c025f71dec9aaa69680693";
-  sha512.source = "b647939fdbb7abbfc2702441e7e5ff4b4d131cb3893057b8b38edb94c7d233b0b8b442c0928887983248e1764bae243a407e2ca68e901910a4c96f1e4e605c40";
+  sha512.run = "abc4293012110d50f4cf6330d3e3f48bbd9ec72a233f0df765fc260de1ee6d00485e0444dd4f518e1c53907e2ad8d3ed90b5927ee7611ebe2a76a08b25530ee0";
+  sha512.doc = "c01347d51fec0f22ef54e64a396ca9849abac9b1ce66d73ef44d26cd4357049f588694c84850397cf0841c9dbcf10f03068d79c052d4a4a5d3dab0de5237bdbd";
+  sha512.source = "f86a9bbc76acd8e09622c9b416b16a82d58334ef69eb182b06224b7e89f3aea085a7bd3e7c0ad0787e235647cfa50c2ccff691c6c18b0647df4de3a8fb266441";
   hasRunfiles = true;
   version = "1.36";
 };
 "sa-tikz" = {
   stripPrefix = 0;
-  sha512.run = "c6ccb10d4660edfbf3cdeb926f4df685c2ef43648a5f4663d6348c626e3cff6674031d51cf5f71abf2dd23b42cea179ff084b125f7bd83383b1fe461508c746f";
-  sha512.doc = "ca3f5618d6775002afcda66374107391b74c976f7f4922af2bd29b476f6d3d141cbf37a13d8754a7ce7b16e3990555803acf54f12e0217b80126ac23a7fc783f";
+  sha512.run = "5969d262e733bca6a0b3067b30149240a5e327d1b51f092c92a26e2ebfec13e0c25cfb3ac71069e119d6dccf9b0e9a4ac381101e78ce60119785c12bf12fd336";
+  sha512.doc = "6ccc4679dc2baaac02252e3591333185d1e01ba95eb2398c377aadbbf4ba9e229ef3ba831682fc16cb997854cbf8405f906157ec9b6a5ba71e5ed7781f0c4232";
   hasRunfiles = true;
   version = "0.7a";
 };
 "sageep" = {
   stripPrefix = 0;
-  sha512.run = "0cbbe3095936b5f724e4ae406d3d3181a210b1892caeae61c9507d72e2a2dcce86e9d533ccbe246c7d010a9764e3c8ba12c2309789f537455baf9cf84efcd19f";
-  sha512.doc = "ecfa03f65e0422472487773c952a954de17fd6f15188476449eeb3fb9d246684dd56b30b79e0bfb4b4a64b8f3db1028abc8bd70704e27513d55fff41012079b8";
-  sha512.source = "e0d5e0d54d49dbe68fd79460347168212709290c1f706e1ceb5c188ef10b953538509ffeedcb2113dc3bb0f4a7cff3cfbc4c14abe1cc7c988e630c84d2976049";
+  sha512.run = "4a5472d1cbedbbed23c656a0959bfdb08c8a1be62812ea5390d80d37fb906e0ea8d8205479d6ab7c9bf9f61d72eb7a69a89defd47aa28c0c8fd4de3d4738018f";
+  sha512.doc = "8c2d45bf6191ac38708e4a79aecc19d53fdb2c2f60e48d8852fd1706a5ed12ebfd3820f7b32ced41d2b8111bca42000a5f04291886414e83931275c5af3aeb07";
+  sha512.source = "99fade228079afb6b90ce76e6a460c060b82fa6fde8c61a110dfe3210ba6c0cf213279ce88699e670fa0cf50f29ab7a1c448c708e22d11bb6829e0ce63d6cc42";
   hasRunfiles = true;
   version = "1.0";
 };
 "sanitize-umlaut" = {
   stripPrefix = 0;
-  sha512.run = "b6754c36552adb91da48a862354c87c2d24c2b48f1f113582ac56bf85e76cd9dc94cb833c57c71e3ae8f85b68f11b34ebc5be623265d2dedb914e0088d08d188";
-  sha512.doc = "28c469bb846b74ff2037d273a5e205df32995e2b634cee0672014d3efaca96e390f9f1802a4566ad923c5931441dd9c53b26d6a2ef86fa8ae0549b204d236766";
+  sha512.run = "41401c7537570e8e8ddbcbe6b6f1737d7e971ec1929c2eaf710cbe9ec18fee2566d2b69967c9da6c6bf0626b0721b08dd9f5a14698eb64aef7eeece32119aedb";
+  sha512.doc = "4dcbd3ccb3523a856568245c4da6138a6931c09f9ccd4bceb8da6dd4b92e138e10d895941c2401cbfe98d9213cac263f9ab7f4d8b7da95cacfd988d82cb94216";
   hasRunfiles = true;
   version = "1.00";
 };
 "sanskrit" = {
   stripPrefix = 0;
-  sha512.run = "0fba4a04b7414fe4f44ed7173d3a9cd42a42b1d7d73641ea9c4756740d54ab44982b305d0263825efcaa5602d6f85bbb08829f91169bebd4c4cc10d845caff1d";
-  sha512.doc = "e8e198f19e6ccc9968107913d98fba237b538b476e9d2a6d385e031d7f07265d50276807b1f982f4f1b7e99d9c62e66acf0de6311d99a17fa2153f90e809b5be";
-  sha512.source = "9250e08242bee02f6a1dba664cd6a962fe8383a47f380e37703613fd236eb7b296096bf7be7d88d6f07f77f70c3a9a06f3f0aae55c1ed88e991f28f24c1704fb";
+  sha512.run = "7b9c1f557cfce651e360b7097f1a9208fb4481591969135309fad0742b0ebeea35642f6be70055fe657e28dc1ec0781926a86863b6c69c251c44877e3a3ac33f";
+  sha512.doc = "b646c2ae67f3f6dff7fe2361ced54e65d3d5f29b44b6fdd6b68e3a5171116d6d9998ea4203fa994109f30b36840613d0aee54ee48d09ad451b6c9f911619ded3";
+  sha512.source = "2112d903318a21e6adf0cf2b7f9e1b7a06e279372989347d38f06eb4b25fd37961d94837d005f6ff911d1789befdd12cf743c6d0bcfe70ad5d5a786cd6e762ff";
   hasRunfiles = true;
   version = "2.2.1";
 };
 "sanskrit-t1" = {
   stripPrefix = 0;
-  sha512.run = "a169c33e99152d2f8959f81d67b76f6a6a099f298248a9d8e424a67381abef63efea4ed769c23cce1a84566c98d8ea22f49bb6c8445c1a0b7cfd53d45f1cebf7";
-  sha512.doc = "2c9d8820f656ff6ef623f59dd0c3ec29ecf17668b44d2ef6f4bade1f89dfadc7fafd8a4e831fa28ff35124b6a22db76ed77519b24b5a6108e883e71de8e05ab5";
+  sha512.run = "4eabf0b929ad30a65a8e1540af6f063c1ee1c2cf1be78a8fdb3514ec9aa5ac5a2a7c63793c75288b2c70ba5e4d2e7d1b3a44a9603467f2a9fb29604cbb9a2e0d";
+  sha512.doc = "6ab8af3dc7ec384dd5d9d2a027dcde17ccd25a9bf09f3fb2477c27e11a1ef405e36c58365941776741e5f73a79882773d4d9654dec0bfdc698175d7689425897";
   hasRunfiles = true;
 };
 "sansmath" = {
   stripPrefix = 0;
-  sha512.run = "67b0264f2dec13c9c5acea76689fa0cf219adb00dec08a13cf03c5812d34d9cd240529d64fc77fbd2f1a675211d7b077cde42988a1524cf96f0c006009a595b5";
-  sha512.doc = "dbd873a58eff17f83107cbc7fe6d195c9ae06f4eb35b3780a1d2c0c50d4f47bf48d2737d1d091c15049ad1f9ef0e19fda8e45b2f975462b2dc99452c2d35083a";
+  sha512.run = "75241f4993bad1e6df2ad25aedbf264ef7021289cf2db10842ad4583bf7983a184c670e9ec7673ba1a92ebba1714ae50e4bf38433c5bb546d8596c6a04585482";
+  sha512.doc = "5a24f5b9c0cc6b0ed6fc80894c8089e4882071faacde63207f6cff816f4ba26d13c3ecc1b44811376c2958e3a80011c5ce72f1d3da1eb8e69d456674425ea1d9";
   hasRunfiles = true;
   version = "1.1";
 };
 "sansmathaccent" = {
   stripPrefix = 0;
-  sha512.run = "51d8d7d678f71588c4263f2804698c2e1b989b218670c492e25e1bfcdb4006b17b2f7def026a5314eb0c0af73465e6f31baa3b04f098df80a90a3b975e8dd48e";
-  sha512.doc = "55852c1c35876c8e4a32217e2ea7afc66347c48d4bbe3c9942392b1478b5850bbdffb5d6a1b83d0828870eca0361ca6cdc13f73bc0642ac2b36e8bc56e610e63";
+  sha512.run = "cadaa7f9fee0b146a7914c42656dec17372798bc8df78b9df57b1990eb67469204d5e6206fda60637cbeb7b6ca1d626f6767779f733dc502d581f6d684684627";
+  sha512.doc = "df44db3488e5c14c849a07d9f61dcb2cc5b78bda89be2ec4082ba08c088b7a4e97b91f39cc00bc1fc2c2a29c64f1e0996ba52b9ba580e2c8865f4220ef184590";
   hasRunfiles = true;
 };
 "sansmathfonts" = {
   stripPrefix = 0;
-  sha512.run = "799177c7aff03e968ee2e317f7d3890e4d3189043a36bf1f34b78ffb82b14e5f624585efc8ba5bab868a555c8930b1ef962d88efc22713f6e4fe090b17011536";
-  sha512.doc = "bf658e3c208a3f1d160a682b1410a3a8f24ff6584afb180d30a3a8897c7e3240459956080e71852588298afc0e9c1dfc729a210e351d2bdc8f1c603ede165168";
+  sha512.run = "e9edfca88abd3e71590d6e47b7a26ce94f438da72eb6f2f0c944d6e898e1e1813846a414d1e59a1593b1604207868f8eaadac9105b982feb5ebccbc74e475661";
+  sha512.doc = "21d595585240d18095632fa3b2adaf7878d7912259d633ac1b5dcc8f754ceb0453150266e386d53b60d13f84dcf2ac49a881bb7e288f3bb68db41b9f6b293783";
   hasRunfiles = true;
 };
 "sapthesis" = {
   stripPrefix = 0;
-  sha512.run = "d7ed8bd5003ca1c9f189316607e3f6c08f8483a6951dc15f9044d2efc9822e84be2d3a2d27fe85e08b6a232420330c485673d683c21ead8725eef38ab1219f92";
-  sha512.doc = "3cca9cc2c5d13c2fb87c6cb9b7f66e0f167e323d1bad00f43087160cfba374745522a8878943c4dc6976a10e0b0e112239d65d60b86863ca65c98db3b8c363e8";
+  sha512.run = "058a6dce540acd4201b84e61e7ae6db8066bf25c2fcec082b4bb3e7776514f4dd02207ee70b1ae9b8182caf45bbc4c273b94f97be81fedf8224e5ce0b3fd5d72";
+  sha512.doc = "fb7eae2616f424de6fe82a29a90dd5b0f57f652b8533e7a047c97b2bb8fec901951a95c8c0c44d735440f11d2fec4723a1a1d8a0665647888f94efd33140a784";
   hasRunfiles = true;
-  version = "3.8";
+  version = "4.1";
 };
 "sasnrdisplay" = {
   stripPrefix = 0;
-  sha512.run = "3c853634e887535528d0408f5b6aac0f65f4da528a6522a4220bfc423938eabba9ab37db8aa8581bdeef062d1fa11681ba283d4f9ddd816d6ff7f9e84ed6ee29";
-  sha512.doc = "dd753a97d26fd46d4cb1d9fccb5d84736b367c146891e144e375a3946a45ff113d4e4a6bc0cfc86b8055bb7c3dacabbc8d87b136f88eb9856d3437e2164374b0";
+  sha512.run = "8104c28cdb6c2e22dc5fb84712f7d44b4c42c9fee4b7e37fdb128fd079c0b83a82ed18bdac324036ee99de9e1ebd8fca9829c62643823fbcd296eff572366156";
+  sha512.doc = "e7b6c2ffe355cb162bcc44a31d271d8a2e3ac81f8a7e5e5777cfe405098df8b9d556b21cb7eba86bd85527d24047eeb1d934c10602070c7ea4b8f9444cbd1f4b";
   hasRunfiles = true;
   version = "0.95";
 };
 "sauerj" = {
   stripPrefix = 0;
-  sha512.run = "bd2c470ae9b2ca4b8260a3b9636764ba306a3bf8185235f4d2ae945e485b09eec2ba330cadb04ad0c5c20cf3d4d3c3de7ffd78e57c7a6401b30b40909cc2aade";
-  sha512.doc = "2061b87262566595c6940190185c01390124d4c44f0c52326057509499c857d6aec4996f34ddec36f56044ea0be31fe704f062d231098ad752b9802aa89419e2";
-  sha512.source = "2593e9f1e47e215c1dada01ba109c067a247f2ca748df0ff52114ca26f3e42f30a3c69f779492e722f8070a931f9cffb884e2baef7fb059bda348e2fc21fd63b";
+  sha512.run = "e0fe7c3a1fc3eb4b96af67371169b455552897f5f93953cfc3a7f356a1b6eb6a9394b2d4b7234e4e25580e0a34ad52db687319708888de0a11a705de7f38828a";
+  sha512.doc = "1a666e49382e40b439cbae90d2b4afef3123edea913a11cdbb3a82e2f0bb6b19692f821a218e8226d24f9dd4625ba84bcd8a74055b320faa43aedf07d4079920";
+  sha512.source = "4e06b0925f955570d9589ecf47f5ea8db8711af58f4c44aeea59f0ac5c1f336468f0e2b27e8ac70cdb4e9df89382f79adddc5520a5c7114551520489888377f8";
   hasRunfiles = true;
 };
 "sauter" = {
   stripPrefix = 0;
-  sha512.run = "d89041be0660c3dd4ddc4e08c52f562c16142d49b5b20f4904a41d57334d4bbd11928f3eb07e3f8dd852bd8c5d7853d40050bdbc570669fb4a56c58f784350d6";
+  sha512.run = "11fd6758cf403f9a377872bf4f1803700522c1e28aecb8c764a119302942b481536bfa62a39b1287bedca6c3c37f6983b5fbf92c4f8e0f4f5a2c9cb5600a91c8";
   hasRunfiles = true;
   version = "2.4";
 };
 "sauterfonts" = {
   stripPrefix = 0;
-  sha512.run = "8ef1810ec6b9a00f38ac96de1245a5dcbed86ad41fd8bba0533c131257e8c6efa8cec351cf80fa52e4b964a56a2198c84602161f5f9b5ce9ce2c26b5f166776c";
-  sha512.doc = "fcdf00cc84f792d22b9274517a617d245fa6c990720f42b9f5886d4128576db74de403952a86d6189bbc446c156e8a2155fbd3b495e538c868953634fbe8b9eb";
-  sha512.source = "ad19efdd651a07dcfaa66b03c13d491a0c72721a5a35c309f02577d6e15bd7a26ab087beb23005b40f77e5cffb1957747ff423f171d7c332af53f4dde0799e22";
+  sha512.run = "6397472d26f02696160839e2be99c21b0814a3f9c60f70c92931d467f0929e00b7a7235fec811c2c2c36ca7879c98561ccb9b6aa757e9fc3f13e04300e28106c";
+  sha512.doc = "a92202d225901f73846c76b6d9b0f3b0caffe75c76a41fa8c9a55aedd20922c4899c83271e03f8df1b3d7a515ee935e3d8ffab2644acdfdc50d25ab8b30d9ccf";
+  sha512.source = "f40879625b69f97b241eb257eedacb99d45f44560b4dfc809c5964867023e1144702c1250ff69dc214845fc7288d10944f262ba03da7dfa9a1fce5c820a6b878";
   hasRunfiles = true;
 };
 "savefnmark" = {
   stripPrefix = 0;
-  sha512.run = "897d9791847334f9d6fbb66f34775dca8cab1927272c3e52da2f7e91ddbb80f52159a9b2352f59f4606c7b6fb8447e2a48fd5925ce7ce1e92a10a3e82e94d24f";
-  sha512.doc = "1008635e75d3a24d8aa3ab0eb42f83729a1c5e5242ba06c6eaa0758cbf971298aa83289836b6ae04c9af767295807bda1ecf9f47f61bb0660e66e7bd79698aca";
-  sha512.source = "c95af6ed9e2a6375bf212dfbefc43e6f9618838f252bc1bfa719485c3ca19219dbc93bc2a51e89ad0aa022dfa7fa6f552fa522c3ced452406b879f96846fd3a5";
+  sha512.run = "492925eee8ada9b988828e67a243d7544a4c22ae7c5e8b9d9b96b484a19856d35402775da44b4a83ce3e464b43019a4b2133c971ad94e1678c7424f4ddd04061";
+  sha512.doc = "575120cddf8f8428e5c20f2260913f0181aacec90d1d092e1cb2a311e0d3f01fdb26ba1dfa76470c2f0794785ae7683f478456d23663a8511472098c4339e7a1";
+  sha512.source = "2f5accfb941f0a8da11baa92b9059ed5091079d59638361dad35411dd2b6b38cc1be81a1e66bd532bbc06799f89354e83fdc5fabcb7a96eb761ddbb1b9779f4a";
   hasRunfiles = true;
   version = "1.0";
 };
 "savesym" = {
   stripPrefix = 0;
-  sha512.run = "db20ef825e742a32475815a30f8ed8965b1fd1f467aed9f9716c775a7fee98182291ef6286457c759d6d468c7850e0492a70cb8a41cc4df89f704c0b65bf89a1";
+  sha512.run = "c29910b17ee44e4fd9e32f035910eedc47739c6c34e5f728611e59df88eccdc36d954347610991f6e7ec67bc25d5cce1d457a9db866b30eb8d1b98f19e424776";
   hasRunfiles = true;
   version = "1.2";
 };
 "savetrees" = {
   stripPrefix = 0;
-  sha512.run = "0fc5b695c09be8b8569782de2e4eaf815f5a1d3bbcef1ff66e23f6767345a07242a1f04c5d946abf94bc0befd4eeeca18f307ec3d2660205a8a4e25c02f4b05c";
-  sha512.doc = "45c904c18de92b618a635485378c3e65b5c0dbd8e6f7443edad445340077afa91ec844023aed6a793bd9a32e86aef612bdbf481ad2e2ad4f5f725eba074ce166";
-  sha512.source = "ba4684ed247e26b2c10fa05765a1eb23f7ef0f07a7fff33b5f69b79230f7a3a82c59a860a8007fafb54159d29e4f459a1360d958d45d51dbc41263dcb7db6d88";
+  sha512.run = "693e8df1c97fb4828af52f8fd3c83b69185f6b199be87beb2457487e31e730ab1cff0e69399afa39a23a7ffa51e9317352f0a7c2ed217e4528212678be23f01b";
+  sha512.doc = "ca32a928e785d44d908f85f49d6dd90651a30694c1c8c8d46c4fde17f30c6af441dcc1ba6da68287857a1676c596fe702ad1dbae324ec66d5a220710cde3718d";
+  sha512.source = "741eaaa7cc70c8cc988325d3d9b9311aa1594b14b15d290418b37c033e85fbbed080e0cc25f31d9f630a85f55cff0a1098ef8a0797cef696b4621a3c7fa416ba";
   hasRunfiles = true;
   version = "2.4";
 };
 "scale" = {
   stripPrefix = 0;
-  sha512.run = "a0a256a2a81710daf613d89a4812055282939ee7984d180d62dd20ddddd1b9c7a547df65a2f96579063a2a1b6c34ddd6740ab76867e36ca414bffa04f7dde684";
-  sha512.doc = "cd1d76eba41849f5807f47a406ee60a2e90ea30ad1b436062d757aac63f9882b322929c0012a9611900c88af6d307a43e788d11aad3f756d9e2ae65861759e0f";
-  sha512.source = "9e346237d7873813be381a17ad7482d39e4eb2ae6f37381a347863a2033d36ae237506091ff4d61220a6ef8fd9ec7c616ebec90c43f1ea47eb9840fa6dabcb76";
+  sha512.run = "211c349477562ab0d309ea5e908dcea127f67cf1da6f2516e159bf6ef273b7cf5be90a4411ba91f1fa3e9af9c6a439bad04f74e0b2b4426e5f661014d1c001d3";
+  sha512.doc = "4957c6b4de940a1798bf924a2e46c1ef707490e257057ee446397bf178543a85a8102010720d008b9ee7dac54423966a4c57d0f7b0b021556dd720c697cbb1ac";
+  sha512.source = "294f74c3bbf64b109a528edef99d6318b2a04182c2266e5077dfc8b1e058cade296be1737f955ee880a8576c382c39cb63ba1fe75f214e36aa9ffc727dd7a6de";
   hasRunfiles = true;
   version = "1.1.2";
 };
 "scalebar" = {
   stripPrefix = 0;
-  sha512.run = "c3e59e125897b82795232fdebea0f1220598dc154a1c15962cb1f2d7d4eb081d806f2a207457bb2f3ccce538d95d6ad68fe0651561413ff4ceb2cf4a59113bbc";
-  sha512.doc = "a33bf288ac5c8df25687f83e862753cc8c61deeee7491629bf72521d893cae10344f915b74739ef06209faac05505b5d185f28f22b9a777715832bc32be4c058";
-  sha512.source = "1cca252c9eafec731967f36e5dd3736e42f0971a09f49b067f1e32dbc09784a8ca11e31049e38aaf1a0de8bd9ff23bdebd785fa8b02699bffbc6a4aaaa9f5830";
+  sha512.run = "f10c30f4f5eea08a15c5c55a27403fa5650891dbf4a9fa5aeb85cb16efd14cb3610581e08a85c3b4e01082226a65cbbf218c63151fda33b3648ab9ef753cecc8";
+  sha512.doc = "b60ef1af676c7fe79f40184afc0df38278b8dd32c7ee94ec3b4132a6cea30f36bcc0212678bed75096e8131374e11fe738abb3a27da3f0bf39381ffaf2e3db96";
+  sha512.source = "d5cf25ab4a4938394f7e96b92b538ecb0325761f036a14dc17f72b773351f84980af7048241e24148bf71ac86bfefb63fa810d3af561954e4d3a8eb73d14e36b";
   hasRunfiles = true;
   version = "1.0";
 };
 "scalerel" = {
   stripPrefix = 0;
-  sha512.run = "85c667097ea3f8e058fa9a5042e1506831cd98568ed9918608f52290ba2c5131f192472a3011397be1bc3612110793e01639bddc706e740c5c6ed3e0b1f32902";
-  sha512.doc = "ec095c29eef0ae2c88a0b7e521c03a69c13c0d2caf09a4ced9c2457044acfa541be4c36984fdd8dc0b7a7ca3cf1ab53b08470197f1c22838f8f26578c9fe9e9c";
+  sha512.run = "cdc00004572d8c23035f5d797d24fb4a41f61a07172a8d3792450f18e6af26269f6af2282f9366ce92e7bf1ddf2461957ca31b804841050fc36c1daccfaa234a";
+  sha512.doc = "314ef43e527a4c07f7f7b99dedcbadd8a74a3a27b5acfe3b92e11969fe664e8cce15b6029a3e418c1ed7413e2055bf36383f43a51500dacf416a615ce7b02801";
   hasRunfiles = true;
   version = "1.8";
 };
 "scanpages" = {
   stripPrefix = 0;
-  sha512.run = "94f0b5e98e43a3b7a8c28331e97f1f88586e2ee06fa3ad8971434183955260e7c0724b166ebf235f41b34f0541045752d530e2dd6c0647b597949fdfdda51389";
-  sha512.doc = "db80512631269435dd814aa440174a6b57cdaaecc754dff43c04b8829b0d400dcc0ff0f3bd773bec3174af9ab655a50d5b361c08a2806669049a24b32fb55a2b";
+  sha512.run = "18b4d359d71f3b18c6b1d063370a2a7b5e1e5951aee27638f68c9b96b07783f3e5be4b962d4fe026dfc8d57fc9a23f2b9e8bf220d76d268fad7c6e07454359ee";
+  sha512.doc = "30be0196aec9bf14d6d7977415f7c7e73eba7f877c814af43a020f93a1f1f00a9cbcc44a5deab5629148c37e6fef8b604b5ac3726ab8edf6781b6a27ebeeceb6";
   hasRunfiles = true;
   version = "1.05a";
 };
 "schemabloc" = {
   stripPrefix = 0;
-  sha512.run = "c511b720b117766efb05f2b129930c6a4612b1726179a774aa723630b6cc6d069c4d9d4e32fcf4fe7570bccb54ba9341ff94db08848c360edae35af476e5134b";
-  sha512.doc = "ea71df2c4949ffcf9659b1665251fa23d05c0c2d6b8e425128446e0303bc0cc87d98e7fcec33319e12618bd7cbaa03f1ad606f31c12f02a67dd68ad1363a8f3f";
+  sha512.run = "80b87938a744fe627a3ec13606384ba367c280bb085804c322358c1d05e88596e7f43cf578da9a2e91a8e7c93f5860805cf74713c0e54c7b505f2a43d704d8e1";
+  sha512.doc = "da50742f32b64b79f55f4a6289313510c90c8b9cb41f427f44e144a80b1776856642e9ea4405688c89107e7bd77cc0b624bcedfb06e80f9b1659aae5b7ca0567";
   hasRunfiles = true;
   version = "1.5";
 };
 "schemata" = {
   stripPrefix = 0;
-  sha512.run = "06c58cfbc59c13ea5a04165f53edcfbfde11108007c7685b55ddf8accd826109f265279aa3e97616f0a19d325bb8d9a450bbdb0f24e56d927b32c7a92c21c77c";
-  sha512.doc = "ed8c7c4571a90a7418f5445211ed14e697ef3decaedba020a32f00bb9336478e2f4f40619b4bd7e8aaa17bcc95c9f111e1e16fc5e2f07ce58c39aee547e2c9a2";
-  sha512.source = "8c3504ea5c91a49b7b4679172c2d4719e756cd781b48272a03f63e0b9e80176749661e4c0612781739e3ca1b8cc7dbd7471d752b4e04a2de6f191090b0c5e66c";
+  sha512.run = "4cc9e75717c80c2162d34c44634fba069ba20789e820d3fd2204d469f212e826dc242ed659e09fc65f674d2378f4fa8984fe36d040e8391cb8c80c670992bf55";
+  sha512.doc = "bb9a15e9f40de6824168dc96d355ba84d378f93e12793091af6e5592add42a9c2325ff0514bc6fa879623a1f7e5457fb79892a33764fba17b9c12389806ded3d";
+  sha512.source = "2ee502a7d909d0793e739b467237ad7d9f5c23361fed459e74c3ff09ad9d784d7b52bf13025772f1fcc680c84dd82e07a43016be523495ec08d1345ce5967861";
   hasRunfiles = true;
   version = "0.8";
 };
@@ -22350,7 +22949,7 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
-  sha512.run = "05809be0dea213626c71ce7fd36d2aca7bcb1b915e97458475d64187d1c307dc713e0281f196898c99b1a6e76042f2b51da3a3564bd9b7d2442daa0e73f4ab84";
+  sha512.run = "2250810241ac6f92713342a7b4dd3cf1deade2ad6ef65552eb9b987f340d952589fb941270c881eb07c2e97a861db47f57e16777ebf81142155f3dfd4dd6d5be";
 };
 "scheme-context" = {
   stripPrefix = 0;
@@ -22374,7 +22973,7 @@ tl: { # no indentation
   deps."mflogo-font" = tl."mflogo-font";
   deps."wasy" = tl."wasy";
   deps."ly1" = tl."ly1";
-  sha512.run = "3208c41866e321747d62b8bfb507ebd0e27632bbc199ecc0d4901e826ce9c3d91cd31e8217f8ededea84309981e1b0a7956a18e4e7669bd7acf84325f316c419";
+  sha512.run = "e575255e24c9be8241f9202b013b5ff6aa0cd055b9e6b1454ff0eba4145a2a234ee974be899edee595c2cf6f7adb8911346f208a290eeef47edfba2d1bef0cdb";
 };
 "scheme-full" = {
   stripPrefix = 0;
@@ -22418,7 +23017,7 @@ tl: { # no indentation
   deps."collection-publishers" = tl."collection-publishers";
   deps."collection-texworks" = tl."collection-texworks";
   deps."collection-xetex" = tl."collection-xetex";
-  sha512.run = "64f22bcd115354bd8ad66699aaf598de24928629f020f7e8ba274c5325cdade1d65fdcbeecaa7fee33f8e9cc713303da72f171c171451047577c48f92a648c59";
+  sha512.run = "79d8fc33e595506fb4a3df54fce72022281c8b7f2fd2e002bca6e1369bcfc12f9b98a872f64170d7f7d5c482361e4f00c0394b26de4b9804715b674ed309aae3";
 };
 "scheme-gust" = {
   stripPrefix = 0;
@@ -22456,14 +23055,14 @@ tl: { # no indentation
   deps."collection-plaingeneric" = tl."collection-plaingeneric";
   deps."collection-texworks" = tl."collection-texworks";
   deps."collection-xetex" = tl."collection-xetex";
-  sha512.run = "25baf5ab992d7b93c90b452096252511fe5f304449041fc2590dd9186c18240998f8a85afeb8250428d88cc0c591eeb990368cf05c5a127afde6da789f5b7dd7";
+  sha512.run = "4c962883f5a5d723a0aed753580741c2841828a9662641893dccfcc70fab1d90d7988975de9a8c3061825fbe44977607b374d25bd4c57fd27566c16f65aa8b12";
 };
 "scheme-infraonly" = {
   stripPrefix = 0;
   deps."kpathsea" = tl."kpathsea";
   deps."hyphen-base" = tl."hyphen-base";
   deps."tetex" = tl."tetex";
-  sha512.run = "2c55d7fcd1404f4137048fe8ddaa90c74c00e28527c77e486e6b26e40de1bd9e62d9cafd1b3dcb20e8f1cecdaea2932766b8ade8c9a77b916cc10a1f4042e2f9";
+  sha512.run = "3aa8d9b098cb6a84e6c864589387a19032c6badd2eb1fa1920ab3477d2d5ac8179e1cc38cda032bb183dc3a284c7afd23d825e337e375c54777de32437439cba";
 };
 "scheme-medium" = {
   stripPrefix = 0;
@@ -22489,12 +23088,12 @@ tl: { # no indentation
   deps."collection-plaingeneric" = tl."collection-plaingeneric";
   deps."collection-texworks" = tl."collection-texworks";
   deps."collection-xetex" = tl."collection-xetex";
-  sha512.run = "a9b38b64e8d263cd92aaca2bc51b3d83f1613e302c2a45bbd0c8025914acd597561c8acb64219fa5b652428c339154d6a79af614eb4178bd7a7bd004bcc09d2c";
+  sha512.run = "6b4c722f7257406a16daae92e65ab28dd36849af72f67bf837332a94ea871b1e015e4f580f8e614a491c079f93b2c37f3954c6a746eede60de6a66dcd6e1ec70";
 };
 "scheme-minimal" = {
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
-  sha512.run = "8662db9d8c1166a903c19c17d30fc1befddc1bfb4b0660fecc8c586078a73aefabc1289c7926b45cc57a74d21ed2291414a8a2486fab826b7429de93fd29a261";
+  sha512.run = "a63f63a14bf5b3e12dfb49ece263f8fd797b71d0c88dca2df00cb988bf32cc662978d0abfd669cc616a3216ec021b38d62de39902d853de27087219faa5aa66b";
 };
 "scheme-small" = {
   stripPrefix = 0;
@@ -22546,7 +23145,7 @@ tl: { # no indentation
   deps."hyphen-spanish" = tl."hyphen-spanish";
   deps."babel-swedish" = tl."babel-swedish";
   deps."hyphen-swedish" = tl."hyphen-swedish";
-  sha512.run = "c63ef87495f2b3cca332fe06690e9c972ac8a7136418b3cf4e36090b656c3d0884f1b67cba8af393f08e675feff59b1edc3afbab24dae02d655c1e356b4bc8a3";
+  sha512.run = "7dc94de0576778302e7446bf35117833d5a8cd99654fc18f7f7fb241eea269a317d28fdda9044bd72e5defd0b619864b19b8115034af0fcbf1c4f3a3672fd80d";
 };
 "scheme-tetex" = {
   stripPrefix = 0;
@@ -22611,1816 +23210,1870 @@ tl: { # no indentation
   deps."collection-pictures" = tl."collection-pictures";
   deps."collection-plaingeneric" = tl."collection-plaingeneric";
   deps."collection-pstricks" = tl."collection-pstricks";
-  sha512.run = "8f4a6a9f746bb3ae2a16c90f8d1b89f496394d62f8b0b814c5845d6a18735b578964278730b34147fa0525c31e981257266a760d3c7c2979f777b2bcb2dd922d";
+  sha512.run = "3d81ac3f87da79f5d8811a678ef944db5e0332b50487146310dea22adde338d824564c987f5f931ada8f3e7754028f2d320c5639c61fb194fe5b8fae6497f439";
 };
 "schule" = {
   stripPrefix = 0;
-  sha512.run = "960d1bf4ff9c227a7c701de8676db3fe0d74eeb0829abad293733130645407da18f7b1251dbadd437667b8908066d3adcb6188797ac65bda5a5e81db8e579f9f";
-  sha512.doc = "aa70a7cdcf0fd4abc47acc1d8f3b2ca9a6f0160b4106580507cd674ef1802a72d4820bd364eebbe5ff94d26f49c4d01a71decab7f7834aef29009483c3fa2d4e";
-  sha512.source = "6f1174dd8588ef9bf282b3badcca63ef8953095e4cf7dc8b6c412eb59bf8dbe72de93f0f6eae89c7b356fc7d8ebffffc93e3e38ba1424c2ff25ee66b0e7144a5";
+  sha512.run = "fa7bd660a2b3bbbd35d00eb93dca6830ae9aa5abe8e3a1a2ba358ef296e17d8d6d99cde09258b78fd870b77f9967b372e5a5d9b4719e20daa778cc1b18149840";
+  sha512.doc = "0c01fd17b4be2a227c5c8fa98857b11083a91fea5ea8a76c6e1b7f361d4df678783948409e444684683a82ef939d7fad80eb6bf1830da3a093176ea2bbcbfbb6";
   hasRunfiles = true;
-  version = "0.6";
+  version = "0.8.1";
 };
 "schulschriften" = {
   stripPrefix = 0;
-  sha512.run = "5da3cd8297c8d661e7d6451bca6a1870de200f9bb4a35b373f676ea7ceb43b49f180dffff846c2f97add286f506d983aa8b999c163ea73602c726fbe24644488";
-  sha512.doc = "2d481b4abfcd1ae17a4e81109704378c41a290e5d28a571ec38d59ea2354083815fea751985a428a504d92ee7881d36494a6ed4c5938b47327711b7a4d69f14b";
+  sha512.run = "48383258904947223f8079e39810a6ca0a53df7de8b48c551edaec9a4190b6bc4c4e294ecd619e464b0f95adac4c6e4964d8fb3ce80cc3f6edb04905b1b1aa14";
+  sha512.doc = "3b98b93ddffab0865bd068bf3391686ab7327d9498ccc379a0591324be268cef6af05c815eee32c696c24df342abcaaf4fcdcff68e165992ff33e091bffad64c";
   hasRunfiles = true;
   version = "4";
 };
 "schwalbe-chess" = {
   stripPrefix = 0;
-  sha512.run = "3b5765290a380b88bf1467a744235d143571184782d67f1dac1d36aa793603ed4f897fe412d75658d78049440825668568c3620c2ef610066c7b22de6a85c1a8";
-  sha512.doc = "6b26b7cb5b9c888ea815ab1d95da57a944755db55860659eca5c0770e093db4b0d82bdc8eec199a7348591ee97b9ae427ad40d8c00ebf2da50640e14e6a23f71";
-  sha512.source = "93e4f7c89b6750a40cb34922884e24c80758a47d0b13f755830ae04cd455f1fed147bc3479736de5e8bc1773c7bbfaa0a10a7b40054b99edf1dbeb7ba94829ca";
+  sha512.run = "795d5317b5eccfdc46c0b6887e55453492b297483c55f3b58255b3039c78f9a4af0fc9aba0cd5f682e7577a7ccf3322b3ebfdec1a3b7a7b16d47cd723b6921ef";
+  sha512.doc = "d8aaa1cd0733aa92fcc0f8f869f87073ffeb919c978c91319aca0c94567926b8838da3dfe89343682026e245fc532b9b5efbfeea60b9e30136fa57e138b0c057";
+  sha512.source = "722d1bbd37e4ca93a4a090c0c235dbaef02b3659259f98a357f1da2de204819d70d1192eb60988044c3842d6def9aa391eed49eaa7a25defd3e990b0e53b6f84";
   hasRunfiles = true;
-  version = "2.1";
+  version = "2.2";
 };
 "scientific-thesis-cover" = {
   stripPrefix = 0;
-  sha512.run = "89e99f9b3ec8b9d2be062ea3b75efa8bb1eb2856bce5f61d2d74fb392b1eb5e6ef7c8dce973c2412c3b9d5a95312688be7f4d9da580cd05f4419ecf6e887cfdb";
-  sha512.doc = "6127247a0af0346425df9a0cec17f522045180c70cd1af4be4fec6d8d37c9fda89289c6e26040c0297425c9d694313439fdce35934da5293eef0a4f98bbde4de";
+  sha512.run = "6d0704de435fe5a3df678551ef66b7b808dcb48863b4fa3a43bc433f20ce12b790e7a41f42ec505f41374f2da3c64f9fe3fea113869e997419fc667cc52d2d56";
+  sha512.doc = "30d7f539bd6b7a42d2a6300dbf2fddef2f4f4929d9ebbb0bd77ce7c4b137a44d5cc55e0b6fdfb9424d9379b2191ddb089ba2dde93e14815d216aed94d3a18d7d";
+  sha512.source = "a7b7e08990c6f8cc87ac4cd8ba43d858652d96a842087493890bd4ea46a20e54ebd6435995d6ae28d4aeef9806995bf22e3435418c4f58d4ed1f6bd165949c9d";
   hasRunfiles = true;
-  version = "4.0.0";
+  version = "4.0.2";
 };
 "sciposter" = {
   stripPrefix = 0;
-  sha512.run = "82e388ee62b16a1c6c8618216fae0903de8d09c4fd97508cde2db379606638a0e153f9011af468c4a026db743678c8adb76edf848d0f843a8edbc550c09e9d8c";
-  sha512.doc = "6ec8af48314c7e651f7242bb7db49c027b75b13dfa2957ec8e2e443de750356052f670c020bb5cb52bb31b5cc8d1b392de79907e69bcb0a574a75df58507c985";
+  sha512.run = "f8b052b8a894ffdbd2c1934eb9742bb7a06b1d49e9bc42254fb69f7fa5564d97b636ee4cfb260ecf1f88f19b09f62394e283407a0aa10b47fa969af1490cfe30";
+  sha512.doc = "2e539b0e604fc209be6ac60b136ed8dfe00fe3090bde1786e0eda8445c32d9c55617fb84b30dbf47779203eeda7c27e04bdd15bb4cc662c373df6048fb24b39a";
   hasRunfiles = true;
   version = "1.18";
 };
 "sclang-prettifier" = {
   stripPrefix = 0;
-  sha512.run = "1701a717beb846b86cd801d1b27809d937c84eabe9ccee961b15a1f238c9e264007cc7de1ad3973ccdf4a0edc93d8e4ea40eeda0a675c7efe69120283a6f3ad7";
-  sha512.doc = "3262993a25440660e96e0ebcc615b4804dbd61599df6f94ef3eaddd9725bc1e7537075f000c08b2236a426a004cabd25ed9731c33661954b57a2aa3358653164";
-  sha512.source = "4b74d097313a2c32c207772b684ffefd053bf36269288fd53291eff226227e55565cb46da8f7bfd3fba798b6470abf1c331845fbcd653988a2bd6f77bc96324e";
+  sha512.run = "8e7bdebc613de7734485c01547dae096d65f534e13a8e1f4a08e7e6594b2f4d67d2c82e5a0a477134886b54c2503afbcc3c30ff70cadf41698d57a5662f17ec9";
+  sha512.doc = "ddaf681e4e7d6c0d073f122e50c311b5422f0192e141bd7ce68db0af0f87bb14466fb8b6e51186a51979984120a7ea9e18996d7cda4857b000b56f08bd411c4d";
+  sha512.source = "870f468cdcba45d0ad83b08317e6aff8cd164bcbc2f0add0795624c63f6bcde7846efa0ff3bea78008ae3eb6285bb9e2278b080b0b8d2f0b1684ef246e7d97cc";
   hasRunfiles = true;
   version = "0.1";
 };
 "scratch" = {
   stripPrefix = 0;
-  sha512.run = "029f14fabf45525e8dfe882f830788e422f40e86abfccea7e6ec994e1cf57825f9bc2a80352ebe0be554470cc7d3ef7904ccc5fb7e6feb9d72ac55061dd97c44";
-  sha512.doc = "81991d7cd357bee59439ddaa81fdd1e97f14ad47683bf58590ad0b49c84ff3e962eb86cb2d6f789610139f54c969615ad252fc2eb8bba6339a80d9a8d4992fd0";
+  sha512.run = "6bfb0225677900f4d1afb90345e3ff70f184da15102cb33a0be3ab6e96ca7b047033d061510edf3fae0504ce2ee66cddd3f0d7c542b10d9aa9ffef8007d6c9cc";
+  sha512.doc = "2c5471bfc501ffe9d12291d70bb8bc891c1548da4a0a212581524f0aadc9533611ae0ea9b20663f557cedd5e47d943cb80ea35456f3bd93702f3a0cc0fdee0a3";
   hasRunfiles = true;
-  version = "0.33";
+  version = "0.4";
 };
 "scratchx" = {
   stripPrefix = 0;
-  sha512.run = "144e330718f32edcd2f537d1ee6476afe2444417ce2dffa0e36ee7b3ddbdf492423f1c4f1d03167b99602351164a296921d98fe98637e8fc0b8dbd340aba7b87";
-  sha512.doc = "ac4683f6e2078e11fc1d7c6a85dfdeaafbafad2d40cbe1e436432e294d850f2fdc6145c35a266f39ca40efbbc029001228e283fb995980ad508b0b21ca08acce";
+  sha512.run = "279d630387571db5e8e2c7660d1a59d6090225d27bb195e78393b45e8876fa8a1e890287c5459a72de75f66d4f56bccec0b5b6b532d45b88603c511428b41e20";
+  sha512.doc = "8fe347f23dff202b436c2f55e65c420063809cc9d640b83ac690c0ea836f4087803a253d26a37e2f4e78d051bf7da57180bf9fa924bd0acbb6d5b0a2cc2f0f50";
   hasRunfiles = true;
   version = "1.1";
 };
 "screenplay" = {
   stripPrefix = 0;
-  sha512.run = "01436f43e152d83c77bb80e157708da97dbfa384a60a635421d067314deb0bd1f76ae4996ac06f8e330e395e395bd1cf2cd32d9e8e7ae05b61232c6a2668753b";
-  sha512.doc = "cd0835ed76656a63edc3604d0c98cd3581003ecae0530b1b0632e01cda2edbf3a444bcbaa5862a6a1dfd83b170812d2e82f14bc8cb9ed516dd829f223deef92a";
-  sha512.source = "8b77bd792b873ac1581c3a6ec8a866092dd230982cac0cf460d77472ca5c22eb6c428387484d61cf9f6a95c64d70b5af66b8892785a80bc3b2b9ed95ee42e051";
+  sha512.run = "8c0baa21ea50e77709b8e78fe853b4a2593c014bd409ae7c71cb918e3831baf16c0483ec589cdbd9a7d68fde8ffceda8dc99d02e86b7d51e8e639de358f3b6a3";
+  sha512.doc = "6817a43c3ffcaf748d2aab07dcd7cd703ef35d425b8369d7b5923b74f1075ab57c278fe9d59a2370ea229f31e88813dc6bb5cf9004c42d5a475da02d70eaa0dc";
+  sha512.source = "da26ff7428b3ceaba37f5f0d8651e72f3d2bf86776a6ad20b5317fecbd10944732a06c4f8dff2a9fd2d9943552d6d26ccaca19771a7a866338549382bfaf299b";
   hasRunfiles = true;
   version = "1.6";
 };
 "screenplay-pkg" = {
   stripPrefix = 0;
-  sha512.run = "45ad30a4fa467e8fb3df870b1f659beeb879fbc69d62726335ed95ec3b295bdeda351846c5112caf974756be1e06e8ed9dfb1c92f5e35942eede58dd48175cdc";
-  sha512.doc = "8f49f897d5846834715210b8ab0610e1481f807fa4f089558390dfbdf3b00a9fa166b1c7ff5d268a162dd3dbb78d52230754e7ca10d47f32be676fda6188dc07";
+  sha512.run = "534726f9dd1c393ab897011a0d37f509e07a90933bc5fc5e80abd31cdd3f439d6679302f1e458528301088a1cedce09c15eeb6fe1bb7f1b0c5daad9e5bb78b6b";
+  sha512.doc = "bff468dc22f74a7cca86e3ebee672835062bb682fcc91170e3bf3d359c908e111bc1e393f0f0c134aa2aee620227ecb00e5869d1ecc2494f55410cfb879c3340";
   hasRunfiles = true;
   version = "1.1";
 };
 "scrjrnl" = {
   stripPrefix = 0;
-  sha512.run = "dd5e2afb6dd4d5f61963f085c3d97c94766c732f3636aa7bf1d40ce6ae6640a4d4d3ab3a382ffac17b4ee2e8eefd2cdfa9cb0b4caceff95a5f0f2243e2328ceb";
-  sha512.doc = "e5bdea1cea4da1d62fb0ae5bc5ea6373ed3bf749bd519c100dee140636d7d2b8651f0f0c19c57b06cc208cc30e8de63a944c21c3e4b43be1ce9a3e34e08a1a43";
-  sha512.source = "5c3bdaeb03595cea2b858c948f4a91797156a1b3d4c49dbaf0159bd6bc2a9e7f823325bef44c7a3c8426038b81f90f508abf547a6e757e09bbc3f9c18813e536";
+  sha512.run = "ba9db8280b2f80de2708e51a4d302b36d292d76a1de72d9021cd559ee60cd2ba4504d4a388611c074261736bf4a16fd6bad3824b74a521d753f7f92a4e3e27f8";
+  sha512.doc = "84f6fc697d5bc7ee87fa8410b11334a2ecc122363afac29a57a25e896b3a718ae0e1b9fe89213797a7f1f0d4eedd3cff9e3da56ce110b472e967e3bb3f5724ca";
+  sha512.source = "3d6ecc90397349865dec4c8a541d6a259d70e8f85855c164a7a4bca91bfc3ba6e7d15fcc88a2482e34845adeec15239f3bc8d8249b4854cb09a075b74a27c1b1";
   hasRunfiles = true;
   version = "0.1";
 };
 "scrlttr2copy" = {
   stripPrefix = 0;
-  sha512.run = "9ac36dd9470501a539d08ecc415e5e8df6dd2f07f3e21d224eb1ee1cfc9224a08ab18d03370b27fc724834d83a502d30e87445a2757b40085d6213f02f0d3dd3";
-  sha512.doc = "1360950718612c4970c795ae7dc697dd727a9f091a54750bb66adb08b286ee075bd039cf1ea29162ea0a6236f5573f0a6eb0da5abce59e94807000ca982fedeb";
+  sha512.run = "0be35ffa4b9b3a7b603be134bd131964950476e90842e4f6f9db9fb68255e3eaa8c6c47d9387b3c713357e72c927171a2f4f34f0c5b4ec38ed5faa3a28781415";
+  sha512.doc = "3f41cf1545e3cfbd383a98dc51feec57580065751f1ce9aee8d9db65e754bba4870bc486bfed9883f81fb7a47cb2aa49c5140e2841865b3fbfb525cee11eea19";
   hasRunfiles = true;
   version = "0.1d";
 };
 "scsnowman" = {
   stripPrefix = 0;
-  sha512.run = "03a426d599007bde9c2cd158a6fb1dd3878fe5f562194c4ea71a3c192b0ba2b7992914bea2656729eee25ab65aa16dd75c649cb73861aca253bb0bf230796bf0";
-  sha512.doc = "245715bc414adf30f65ca9eebf1580701f6e730c1f3c6483c5d7ad061a5d346e425c4e0a61c3aada50ebb4a3e64cbc0955ce2efbd9d2a7685efff9bca68ad98e";
+  sha512.run = "c0fb2971442ea60f5a631a54021551408293d29f7aa6e3ae4d15d9312922a690be40c33b4fb3bb04d1600b7677bf0d7d970a3a0aa4bb2e25cdbbd6c136286b1c";
+  sha512.doc = "153f8b9578969b7c2622d0c18deb5561ec0facf2df175a2ad0a2460e1e5d37258a46d234c520a62cb15e49298f5eacab256a2c3f8656856e321250619718ed05";
   hasRunfiles = true;
-  version = "1.2c";
+  version = "1.2d";
 };
 "sdrt" = {
   stripPrefix = 0;
-  sha512.run = "368615182ac3e347306c1ffd4f6fc90a1d65de9bedca52bd68904e06406646981149e0b19fc410e48144b2d4604d02651a8750ec55afad1fece31a49ea754b3c";
-  sha512.doc = "bfac9bff68d17514f08cb20cc981ec5bf02d064e587ff5f3a42b3bdbb68a8c391a6f65e06ab6a75ab6e85b7fd8b169f452f8b96ed28a20fbd4f02881492e771d";
+  sha512.run = "04e621c8e8bb5325de61e285597ab7c7eb9daa62071c54aaf830d7c8ace87b67768692759aa0c7d89bf1aa51d8e9724c32c67bc3fe00f4c413709c3caa2f13df";
+  sha512.doc = "877ab7829be2c25a53352c2ab0d6367639d95e9bf8d5d82cbafbbfd46e02809441dd83c369b59d8a355f2692b7af35b3dde25e5c4902608c779b9f62517b47af";
   hasRunfiles = true;
   version = "1.0";
 };
 "sduthesis" = {
   stripPrefix = 0;
-  sha512.run = "7bc709e69507cba4a27872956b859b4a737cede3b631798c610edba037f98d23f3dc0fcfb2ae8952dbe99dea86d950365e772fbfec34c1d8ff9f88f73720d7d6";
-  sha512.doc = "3fd79070d4e47238e2ad5ccdaf7a5b11820c3aad77cb0e5eaaa99fac2a84685a8c805e4453692d885329e85c3d63a85cfa924be5a7bfbd8c11ee6c37dec4d5c1";
-  sha512.source = "6e62da5b0b51260fb1bf41bb823817cf71d2e39c952b4145dcf8e4b65432d16c132646694f91984e82222733c720be4436abc5eac2aa0ec2b90364c80847165a";
+  sha512.run = "380db9bc40c80157ab4bf11151e9c02e1b1f18a6d3472ff95df350e5c9d191cd79b74a7578939fb2f23b86cbc1e814f9ddbad8f51bef8acc72fc53dfe016df27";
+  sha512.doc = "87761b59474d2ede65d360fa2448b04c6aa6ad09d3325522441ce5efaa81a7bbef8b0a0d86d61d6fdd044c442f5ab69db53b6bdf15f98d7b5be4baac5735eaeb";
+  sha512.source = "f7fea0894cf355b288f76c744509861deecef316e3609de3f9f711f75070ea0b8e4b96e47e56b224f3fe63a4ed7462bd5f809b0c8be9d2cc1087d14c769d4a08";
   hasRunfiles = true;
   version = "1.2.1";
 };
 "secdot" = {
   stripPrefix = 0;
-  sha512.run = "ef7139d8fc807c1971b894ad25e39b02f6da6e91b3259263c4ea8c3f229a5272908d421ffd0b84d819244b37359f3255e4572afd6b545538f33859c405b58f0a";
-  sha512.doc = "7cd4dd848d9ad508f5b2815e1b5a9128bb273a25299f24259a6ddb4ee0bc17b08d76193d0f6c28e6141ef7e7e43638c2358ee34ad7ebe918da6a82a87f5f9ee0";
+  sha512.run = "e2ec06c1627c012fcc48ebea55c7d0364c1a11d1e5aff9b01e9de51ef9334a0097cecca73a90bf5e40520c39bb5f8a68adb015b1b794be8c09ca21803d5bc851";
+  sha512.doc = "f85845d0745038418cff01e6c9fd2370275b37c5306bf2e57bba824815082c87e407ea092b522abb467162e389ac7e77226b1dc71133e9dfbbf830a3446139f5";
   hasRunfiles = true;
   version = "1.0";
 };
 "section" = {
   stripPrefix = 0;
-  sha512.run = "35759e5e8e217bfb7ea2d114ee7034edb9625a78f8b3720181b0c9f713af2cdc69993e3a19f83fb01fcb2e98a56c5082fa68dea22f2370225fcc72760b3f7f0d";
-  sha512.doc = "469acbedbefe45ebfe1994440ad0ae9d2c26720b9b06c1a3c624245039133b58a59740b513904b39c3deafa01579bef86431c1d38285e9faaa21e03dc3214f72";
+  sha512.run = "1ef93a2a5b37b673f128cf1d0ef1ec07ef92fb612a6a03a5ab6cba33542ea86087773780dfd0ecec2873cfc0c26e3ac7e074083731253cc7183523401d07640b";
+  sha512.doc = "92f42f9f73e261dbad1c7276002ff55fa6c33b3538255ea6083cbecfbabaaffecf27d0f9d87b35fdbf97cd49e663ae52ab42380fc358ceffb2c40b6678f9d164";
   hasRunfiles = true;
 };
 "sectionbox" = {
   stripPrefix = 0;
-  sha512.run = "b19d1b9c852f29730e52b9d485294d75c449d5d2be444aacfba524c66656770da5158169940609daee2e3247aa2ec3eabff9ce221e80f46890e95a59d15617fc";
-  sha512.doc = "6e0bb42918e9aeb8a7ba319c26fde589663d2f1ebddbe49009f4de9dfa53ea9ee54a6c9206624c0b9118ae8c02489edde6169fc997d1ccaf18efbda93bb59731";
+  sha512.run = "9f212c2771464064809aee7d7a57b1f92c09e062bdeca803329b06a951cd5bdad2d774ccd82616dd35a2febaef303cd4dbc7309852f6c77d9af7b6779c2e0bbe";
+  sha512.doc = "16cdc44c2f8fffa500e698f9d28fbb623a47800976188e6e2a0e265261c6466cb23021d77b1c738fdac28e9be7417090f210ec0339c1d66f5a5adaee72556d48";
   hasRunfiles = true;
   version = "1.01";
 };
 "sectionbreak" = {
   stripPrefix = 0;
-  sha512.run = "9544423212b864702e927e2b2c41b2aabb1f8bd54718036bc5beeb22b1bd9272d9bf6d089e4f0636aed43415955ad9b9c7773e99b2af96a49fdfd55589e47857";
-  sha512.doc = "ab2099464db6accf898a36034e6d5b64df72472687ac0e8b76bf25cb404ea090fb91f4fef7becd0b1c23f50ae0c44377e01b8539ad7f998a0aa531bb29c14303";
+  sha512.run = "6bd3dfeae0144ee3cfaf775c6847aec0882ac62bf57df7a6684d3aac9bafba844fd3ae4fecc826c86bfb110dfea2e061d84cb22369fe6a18864db97abd69cdb6";
+  sha512.doc = "9d25f1700d55950fe2c36ceb6551a8364206f2788e2a406c76f0fab06214bcfc9cd9d54f29ffe49185e64574ae44da01c40f55974c7e41b3c26f8f516db009ff";
   hasRunfiles = true;
   version = "0.1c";
 };
 "sectsty" = {
   stripPrefix = 0;
-  sha512.run = "a8ba10f4045f13dd6e140aaa51a08a94885001f0ce4714847106d842b4b3debf29729602276f2079155e6863c01f9df1bbc77016e0555950c5b2fbee48761b0a";
-  sha512.doc = "f1bbf39b8f0825e2c34e26b212ffe1066df558341d10e19208c4f7d046fb7e5dc1f074dba59e798aa102a7b07160bb85f804203f2fddf3626a37d4cf7bd1affd";
-  sha512.source = "67e7dbd265df4e33d079849467acc4bad1b4be35b080e9f68f112f4b1785a63236fc578c0563c3e5ec9ade664f33f2272ab682861d9a876a0831246c88c8e67a";
+  sha512.run = "1b442df1be18f55a417a30a7fde6266ed93d305694778e0fefd85cc83f17839ca72155839b696c0c0b63ea59de6f35cec46c76c709d142ee3296b1ee5a86f4b2";
+  sha512.doc = "c0a3e87c7aa57797d07024b58845d1214fa04bde59eb14e27424761b2dcc616af9836d1bd7b291d00d2324812d21b8881aa0e223b050214eeed42fe24fdd657c";
+  sha512.source = "9dcfb02dab0cce980c3c19bb9c8978b80fe5fa5c0fd8468a5a2a9b103c91d6b489ff76d84defe990c521212c30f754cc6e31fac21dde67078a95c6600a9ac3c9";
   hasRunfiles = true;
   version = "2.0.2";
 };
 "seealso" = {
   stripPrefix = 0;
-  sha512.run = "7b2bc0f325624d116d8d1029712c931e6ba56d920f9df2273ac5807874576fdf45796c16ef232dab23fb73a11f2d6280720d01e02e8cfb405b014939a4ca4143";
-  sha512.doc = "bc33fc56580dea6d2c5149c2526e64378a5ad7ada792fbc7e06ae7bb83eba3ac3e1956cc7603da465bb24efb90e3d5e80c2084471ef2a11efbf63070e550220e";
-  sha512.source = "9ac8c6f267e418c3792038e5fdbe1774d0ce292cb4c2a0473ceebae6d9c1e9a28462b58060268a15185c9339cddd9f16c202a5f371d7b25bbf3ab37f43925996";
+  sha512.run = "1a8eb14820aff134ec4acb3ff4ff3c60061b4ee24868841935374ef17d32cc0ee506a801df3f5cc9717644ba390fc26ac553eb8090b4e2e62865427cbf2a26cd";
+  sha512.doc = "411c4a85e94f0d1531f483de7b815fea9ca86f3c95d6f6f66f3b0f12a78b4cc9003f623478b2509c8c100c77dc20455af3f571bcca18f203cbc66e4310407f24";
+  sha512.source = "9d379f6b22a9e374df999dff56de2161bcfdf21b68ef508af37f8b7cd2e521f5cc656cbb6d652e1038d32691600e8a6896c76c4df2f7ae7c7ee88c8b6bac4d84";
   hasRunfiles = true;
   version = "1.2";
 };
 "seetexk" = {
-  sha512.run = "f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5";
-  sha512.doc = "8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94";
+  sha512.run = "756fa2ffc5fcfde85619d7a2ad063c67016e161cd576d95d207a8411c18b6c7226e4a1bb4a3ade01920e6a2f2541c353f3fa3d2cac14c63ab1c01788b839d170";
+  sha512.doc = "43864bfd3ebd8e9cddb1fac976a131c5c3dd6ea223b8d94176549419d6bdf3f106aee41e2cf3234a22384fc0be52cd6741a75f044ec2f1eeddec26f087a664bb";
 };
 "selectp" = {
   stripPrefix = 0;
-  sha512.run = "bbd927fbb644f43c7968d9df12c3c1dacb6ac129049a12367ede97111f98eeeaa8b4b2fa1bac71142ae50e1e25e0ad5cf58f33ac73cc42e12daf4002aaa8af36";
-  sha512.doc = "702c04217b081c3ec0748ea53a7813017206d5469db9cac9cf6b120ed350167422e266f385a1abb8b3653c1d74235e3ea76571cc9d0735b799152fa8e1147b72";
+  sha512.run = "412e476d7c51affd75e01fd7c96f726e607e813287f71d54924fb39b039082d289053cf6a3954c282ece141d0be802a27622578fed91495aadae4d870a400d81";
+  sha512.doc = "2586950165e4f7abdc6e8403a8b39e304682cdbcbe2c016efef7cfe494a9fb6feeee8039805af0be33ff23d97f43cc5359bbcf3105401c2086f85b9238b36cfb";
   hasRunfiles = true;
   version = "1.0";
 };
 "selnolig" = {
   stripPrefix = 0;
-  sha512.run = "1b484393a7bc470730ceda053a4676b48d3dbc2c02ead97580e8136754783a38645429a2a4643b60bc794a233c17c383a48a9f975fe11311c4ff50fc055b4914";
-  sha512.doc = "fa4164e5b480ef2287d34f158ac43cd1a99e65f3de77cf67e4b4c13a0add76ddbe01b5d0a9b84cac90fe3963cf4b8cded5739905eadcb2a8958918caf60a1d1e";
+  sha512.run = "c267f6c6b3095566d444c99adebfb4da58a39fe5870ebf63f5f717ea71f3285e363ae995cb474023764c19bf7fb02b676ffffe956a5e3151b9f7314ff335f159";
+  sha512.doc = "0a91e2b1b91b33a6a363c7633ad8371ddeab0f16bdabfd895105d7a08a67a7cd8d3b6fd01fd3e2a053d5ca2051160b14d5fedbb0864fee7e532833d9ae5cd040";
   hasRunfiles = true;
   version = "0.302";
 };
 "semantic" = {
   stripPrefix = 0;
-  sha512.run = "5b3b9490d6348a810cc8920291d69f5b137e501e5e486e75d4fdfe495a7249d13ce0cb4a871147d1fe5242485873f9856f08495165d66c2e6f93a5c1a3a54cc3";
-  sha512.doc = "65871c60f4a1984a207efa5c01cc3a5884671813742be56fb4f86b7455251455f5e8ec61e047f7722a0d889009af5525d27db07fa3bba54c89cd7401719699e7";
-  sha512.source = "576a7033c87817c5ce92e092ac6d735e3675af36d1a801ce227d11e85173917ad4efb0fd7dcf579fe02b6850971752afb73388da40fc2f953d2cc03793135265";
+  sha512.run = "4d5ce32ffba5d0733dcf65495b131b5b3eb5f4ca3f58a5deca6345382db422e1411c48b86578cc2ecc48b38a007e781c11ceccfdb1b6523bbebc04bb32556b71";
+  sha512.doc = "8e381764fcb23c40db87146990bb81499c5a6ce7d825aab6c93acfb4fc2b54e33639469777a47917d4a877b435721197ec1da14bea1d2e55d425685370f0544a";
+  sha512.source = "5fecb6ab18b77722a7f48b1b720fa9cd1aa995394262cf891e4bed160bd4f7b61db8777a4523c85d59dc609d5c2a2b7b2c4ce1655affb3e162325def3238e669";
   hasRunfiles = true;
   version = "2.0";
 };
 "semantic-markup" = {
   stripPrefix = 0;
-  sha512.run = "1803a37f21230e5426d49b6d9775450e2713d9acc01d6415fb1f53c85029ff6202f55ef1772f84eb686e5ca528faadc12ef5171ac106cc22a96290e285244393";
-  sha512.doc = "2cb4b54cba46e632fe214f6a5306d72b627606a417a3329346652a66963bd15585eb6699d6bf6d2fe8ef56e77d6ae6ddf9a77e598db20eb072a0f02931640d95";
+  sha512.run = "41b176ec09469f8786062a13975680af0d7b66d6becc42840aa5e387af126e29174dd1ce3b555d4412aab87d884393bdc13e7151c6342cc4adffe8f7a26bd767";
+  sha512.doc = "24a68d36e6b1c6f7e873adb8483b055585fe37b2d970039ba8749ba0e2c782060325d6ffce0c2d5ef1d022c02222b7b4ba82ad12bbbe657eb28118270e1c77d8";
   hasRunfiles = true;
 };
 "semaphor" = {
   stripPrefix = 0;
-  sha512.run = "4fb1fa7c2d5f076d82887a99d4bcc6754b588498b46055d82ed64288c311c179a10aa219bbc35eaca3de962b66ccfba068cafa1864f95140ac007340ca00ba12";
-  sha512.doc = "fc138f5b71e7e78fd4d70abb12fc112e3f74f80b992a27070b79f3c6bed3c62e115178a3c7b3493ee24dfb66c6118595f2b5c4e34e1d18269a1eedeeca11a8d5";
+  sha512.run = "bd62567ad08af5b706ffd10273b6b05fb2446ee6afb00d804cfaaf0ebf0420470e9c4691afcb3e6eb08ab6e7a70f0c19ee7ec6559a07f63de7efdbeaf93dedab";
+  sha512.doc = "064f4e779538736806d2cf2b2096f065df7fca9bdfca1f5c782fb830220d84daaa752d15dfd7a56d891978f61a65389536feb5077927990aa477b8aeef614b95";
   hasRunfiles = true;
 };
 "seminar" = {
   stripPrefix = 0;
-  sha512.run = "65879943c59988c5bd5e7268fa86c5b80640e14b45ece541b038a078aa589bda85e46c1bc9f588d7d4af793595ad00bb6ada1321c36c8e8fe57abe1db6079358";
-  sha512.doc = "62b26673e892c04d004ebc539f3f94b01c9221218d0e6e49e356a894344064eeaec206e9d0b7a28ef0ebd7e3585334328b471ccb4b41989ce72385ecb1b2ea81";
+  sha512.run = "b9325d50f47a2c8bcf875da1a3728d53e82fa7a354d6dcbc1282b45b52c311a303fffaac7a08c6726a610559ac6a736a0029379a3b361030e68dd746934114f9";
+  sha512.doc = "72a328122a0f599c875c0c7f6d6501f1a87ae612baea93c3ab6ccaa768efbe2051a5d3a818da3747dbe45fbce8af1add47ca778b9f0b7c69f8e36beb21fe7e45";
   hasRunfiles = true;
   version = "1.62";
 };
 "semioneside" = {
   stripPrefix = 0;
-  sha512.run = "18f42c8d886ea804571ded620496a3417baafcea209df61bbc7c6e5726d5e7f4921a842cd4fdbdd6a5f0d194f04bb55357ca2a2c3fe2cb20095327f7dfa0a5bd";
-  sha512.doc = "cb540d5078e4d75b9338b11da228904e24506e83cab126b1e5e4797047d1fd974ddb857a39f097a4c14f64b3a9ece0c14b3e9f0e5e0295b7d29b47b3e8836b45";
-  sha512.source = "88b2112cd0236ff4a9f7d5d2506332272f171f66f18f870e2e483b255ee1480f9515dc7d3ddd69975797a997c73aba5555dcfc15d0d7ca5df3320e8b32b30e33";
+  sha512.run = "5381ad475db4d8f052f355cf77284488f56b0bdb12229cbb9629ae9ef5dcb1d6617bb89b3e1f4eed1a1d77467a0522de9e3601885174445ab97e2e3827627b03";
+  sha512.doc = "076832a74ae8d80c3b66809f5231bc3692b3f48e9500991ba309cf9a477e1127521543513bffad7f24d1ff0b3b2fbb52ddb433c1b66a5932fbd29b9d429be9e2";
+  sha512.source = "bace41deafd8599d41daff4ce60fd01901331ff5c1b369f5ba57529789e24cebfbdaf142697d6a6dde629f63b5c76d4f30b6c47784a5c23546f56d36010d7eb2";
   hasRunfiles = true;
   version = "0.41";
 };
 "semproc" = {
   stripPrefix = 0;
-  sha512.run = "faecdd7e575a0a891c3e4127ccc65a86f624f5be24ac3d08ada5994d73496e4f3fda242e6f5789c6032026655437f7d139fa4e776822408ac36b1ba8c3a03f00";
-  sha512.doc = "df4df4126189a67c80e65f925c818284f71f92098ec6b302ceb3d2ec89e8eece2b3b6155e0e3ea1285ae8fe6b075c9d4aff49bab789a07a8335a9ef42ccfeae8";
-  sha512.source = "d663d4dc9ffa21f310592eb88433d23636656c7266f12a9265061a433f6373999bf971aa12048b28d1966f69b13d862c900180a01127e66d378fe32962839fd4";
+  sha512.run = "b2cf54ad6628f84a177fd9e77c00c90b154b5c2f3b842bc4dd51ce586dca0799ac6f82af1945576219bcae6beb8f412aa4110b3479752ebd3bc860fda53b3aa6";
+  sha512.doc = "7f1dc62a21ca9e0fedc708c48381161e0b213df9473235501ca233bb33a588adc18461cbddf908e3bebf9ac25ae2f65b8cc41a00c4e168a82541e1356560e5fc";
+  sha512.source = "7b9ffd8366b07e54f6d15610aecbc9dd6177a3306572183e155ddbbbd327bfdc4c5bb2293c818e0a29ce8700d3479511f81926e5dcbb8fcdf5f0f7505ff131a2";
   hasRunfiles = true;
   version = "0.1";
 };
 "sepfootnotes" = {
   stripPrefix = 0;
-  sha512.run = "22e87676881830c030508b79a37ddde40a54746a46d266cab93b5cd6c54afb512638899d8208bda1447f10c72c626b4fff91cdda2173a73b7067e871179ff603";
-  sha512.doc = "51b26aa22d585ee3e8a49e91e61084d258b1311a2d623b3397ea6b2c6795196c60be02f4b8857685ea577204b5744195fe7e5e82c3a8864d42707f364f075c79";
+  sha512.run = "ddce5beb341eb7e2b2391b752d9e00355255e2d14985c88d6e60f7aeb4da3e18f93d3eef4d97ddb9ee9ed5bbdfda6e2097c5ec43bfaa6ae0f1b8633dc2fd3fbe";
+  sha512.doc = "9ebb95905dfeb04a7c6313ecde83b5870330b48f0cbad152d770194c65fe8aadffb3e69a29cc665011a1dc9fb64dee1893872ab1d59181f6872b838e3c082d0d";
   hasRunfiles = true;
   version = "0.3c";
 };
 "sepnum" = {
   stripPrefix = 0;
-  sha512.run = "fa27afce5ea085d4869d47d7ac93e27db730c7aaa9db30fcaa5f350e822157332f97670ba19e94c49463958a3b6c365be6044f69d6be4213a6d69a424c7b3ed0";
-  sha512.doc = "d482844026e1dc7a66f42e43184190f3941a944acc0788aacbaae8273cbb3636d5509bddf4095c2b89ae7fe7a4145712bcd0f86af2599e371945db1c15497729";
+  sha512.run = "87d34c3d24aa96655bfab3f80c6da8a0cb95c011496f180f214560b34776722f8e01f6dc73afc65c09eabb26407c6e84416878606f1adcaca0b6b6c599b09648";
+  sha512.doc = "6c0393c241710a190dfa518778ce9d278c6be661c04ee81e4fc40383836d12426052aae3e438c2d8373dc94932eb1fdc20b9610ed274fccce6461191fbc674bc";
   hasRunfiles = true;
   version = "2.0";
 };
 "seqsplit" = {
   stripPrefix = 0;
-  sha512.run = "4040a2b7c724fc189f1b97f25278b0b22c4eb746ac6909f98ccb556fbb6341241a759fd20092508e91849ffe525f2dc184291a55ae1a01f857b689306dded469";
-  sha512.doc = "e664b0e40b698b5d3e485e5360271b1984ede1f9b3b031e76699a59711ffdf4107e68c43bc49474567dfed020b93a96709f579a33198b2687c79e8ca9a1525f5";
-  sha512.source = "d0a2e5afe5f526ce9a0a0bf9e7adaf517559f6f40a6f0948bf3b9017e4ee16d6d5dc0e3812ed1c7df04e3ce0707f3b0e0440bb910e69b51fe9a0a5621d0179b5";
+  sha512.run = "603c8b359f845e97203815adb4f9dad0ef134312b20cb868bb1551ae1519bdf061ecc40b59a482c578aac649886039906eecfc9c607a9c2d9f7e1dd6772b3638";
+  sha512.doc = "0c166c5b8cdfc4738415db14762a9d7b9f56445cd1f7fb8d3bb99ab94adf4b45efb85ce1fd534b70cb31da25da76634a59351854e755d49aaec6a2ccf235b0e7";
+  sha512.source = "00d88636c50351328748b444d8118728b8ea800e84c8f419294d1851fbfbf4e3c599a884d124472b09ef366283b604213e1e82205f36dde7ae50990468d46b81";
   hasRunfiles = true;
   version = "0.1";
 };
 "serbian-apostrophe" = {
   stripPrefix = 0;
-  sha512.run = "1792739611a15dc0da6c0185c6c50a9581dcebfa5ceecb3c9c65d2cd211fb4b0d34afdfa1d21f6a99dd710526d22bd5d2dfcf9ae8f033299aa25a1adf796cd72";
-  sha512.doc = "3c10add2ce217132c1fac55947fe5f8933d8fa490da81d80a74872d96a936be22389d42152134358fbe5634e97f2cf81728826e996a383de55cfe474f502ff92";
+  sha512.run = "2323b648ac08df85d09f7b4394d071f2b4e629a158f7b34eeb88ec16537d296ae36a2d49ff41e846d08ce279f0d897ebc34d63bfa17f822cd7e8e876580a19d0";
+  sha512.doc = "ba92dc6aff7caafcbd7e26c46c6a0cb1e9cbdf567c26bff5f5d30d66281829dfd2c185c9b1fad959daa520b51f003c0cd42e7adf2f8019cbce133aebf62f1e7e";
   hasRunfiles = true;
 };
 "serbian-date-lat" = {
   stripPrefix = 0;
-  sha512.run = "05688427435f46ae3a9449a59e5cf93af394baf3a31296e2f62a9704ecd89edccf4b98a953df34987e40e5daf98be312809a495d440bc8495ec7e58f6bb214fd";
-  sha512.doc = "b68a2b022b59b74eeff6ea36d6bbf53a4e836a279fe9a62253dc302adbe88e220705830fb4298483662f164ac6c1630aab25471f272ff6fa78d7c48f12b38369";
+  sha512.run = "338ecdf2e6ca397d977445b9d6581eaab0453c099708354d7e952dd3784ef9f352d8b1c4a96cd3ce0edf20c230545bc1540a7b81af7f584bfe359deb46bb64d1";
+  sha512.doc = "7c1b8a3a697f8cc566c6966b6c9799f150cabaf182099812258966e74deb63fbf42f47c935f4f5505e8a42dcec116484fed6ca75dd4ba41020d1a59f1d817a1d";
   hasRunfiles = true;
 };
 "serbian-def-cyr" = {
   stripPrefix = 0;
-  sha512.run = "bdafed6be1c5b58de33a48f190db89daf820f6553bb3ec02c27ee8c20d13a4a1cfc4642f7b68bca28c31c35711305f6dd143a574d38f9a72c1785dc449cb2dc0";
-  sha512.doc = "1aecbc150bca7dae60ad00384cb877ed0a668eec0bf3f39d7588d66b80355aa9311b2181a64e168295555b93fed043e73728d5abcd120460fb130830ac2cbdf0";
+  sha512.run = "b96c00a437670e723a68c699b37702dc1ab9ba5916d6340414b7bd9a5a93e596051237a7011a9435e5dc3a314d535b9ac184d5808fc035c45f75bf274219a2fd";
+  sha512.doc = "683f096dd9e24d5db4e9faa05b93947f04934426100d4577216d2bb4bffec108819bc00c1c4d382aabf58d04ddc6e97e0f02c3fda537f22d9d4a2d28838aac96";
   hasRunfiles = true;
 };
 "serbian-lig" = {
   stripPrefix = 0;
-  sha512.run = "04a03e0d95d666cd13fbd77d5d4a0c20a289e37c717f3869d5f07b6876b5d7d849faa7e76185af0bae7f24e2bd301fb77ee8f2865773cd283d9884bccde80aa1";
-  sha512.doc = "e28aa4c6dab40e54c1298d1dad10b98c594da266c78d1096a4746b570c3fea0c596880df3558ca5aabf17a4ad2f0546ef14d5f18076e14e1fbe874f6820afd4f";
+  sha512.run = "05b100b9cdb3c14096a0b930ba11ad99ca4fd02a7ef3215d6826a86f179a9fbc58e6e966c30526fe792e84e376a48707c7fadea7a9886555a2bdc89ce12c511e";
+  sha512.doc = "a4da11e0bcaf274b8cd905bce97473e397b543559a504dcc5e65688f512ec6e0ac6fc2b55ad4383501334bb7a42eec5cd835642751ded1613f99f8e958da0c3c";
   hasRunfiles = true;
 };
 "sesamanuel" = {
   stripPrefix = 0;
-  sha512.run = "710be6cd25ff6ba154d146dbddb045ab1bc3a9f2bf2444a900cc38975cfbcb1e034a8c3dde7558c398d0b5e0ba3d28d36621036e9c9ccb577df23e683034a6f0";
-  sha512.doc = "01f0c5036160316c7faf01c5dae8ef220adf75f6ecf12087e73809b5474c93c739771a455169ff6f9808907adedaaf70a821a5e731b77b64c8b16ad181fd7323";
-  sha512.source = "9bfdfcb044be609ba8951aed42c7e350423b756cc1f5de14eeca3fe7c08a3cceba7530549dc4adbd896147e56bf6bcc4f2ce84551d7321ae58d78747c4cf89fd";
+  sha512.run = "052cdaef9049fa42b1e9cce03c9e9d11e62899466e127e60dd982ccf757d5c83fbec30ee3fe1b8c67e1af326668c2b6b4ae21dd96e58502e997186e62178665c";
+  sha512.doc = "d44a4a9e10c5d73c55b55326d15e4495d002d4b9676ef00322ec8b49c8437be55bfe9448d792511d7a0ef54596b530d917219011dabb3c03505298c6ec6cd6d1";
+  sha512.source = "980516e9ab47b15a5ffc4d9a06105d427cd0ca24b7b724c7289ba1c8709d04da2352b36c77463e98f4bf3762e6a231c39c508d485df1354b3d85b5de1bc1baa0";
   hasRunfiles = true;
   version = "0.6";
 };
 "sesstime" = {
   stripPrefix = 0;
-  sha512.run = "2846d3520b34380e2a5eb5988857bd1398a43a88c434124e90eccbf3882291d75817b50e0180164be706efc61a35d85f6c360175114564e2a84cefaf7245cad1";
-  sha512.doc = "cbdde7986d8c083df763f1199b7619684791dbaab33d25bad7896a5460806d7554ddc74538d1d14aa3ff7efd216643e9d026bb24306e2aee187edbca0a74ac1e";
-  sha512.source = "4502bdc3b51468dce57e4fd58794b14e5e364347b6a258b6b4f209d4e81a04d16c3be0fc22303a1a0a509f6b7384eb99211286e5c2395ac874cdfb337ed194f3";
+  sha512.run = "8848810733344b8116f7b6aadbd6aeed0b56f5876da0bcb5ba1c0d64b1be98edba8ebf6ce2fe56d25d8cdbccd5f6bdbd9b4289f9486683c152175e08e001f768";
+  sha512.doc = "6b76dc9ca6183807c14a9ff4d2928819e23bc552553b88cf93c043ab085ec4b51c98e7b9cfd083790e97d5df7b9323df7eea5ba3640705be9bf73faedd7188eb";
+  sha512.source = "0368abc180d9869b6f408c311b43df648308a029d094d695172c8e96f8d7dcc9c166fc3b683143020944b3502b54f089bf1b27a7eb8c0de7ad7d00c0d772fb63";
   hasRunfiles = true;
   version = "1.11";
 };
 "setdeck" = {
   stripPrefix = 0;
-  sha512.run = "9db06b6345653192bc68e691e8c925173f7e9e989d3b9e4d2abaa43d665722fff9031714ea8ececf4e54ec6fbf454ec6ea41596f9508e9d12d2a315de4c998b9";
-  sha512.doc = "6315a4342dd6f462ff4d9f9d682e71a36dc3c71c4c8524fc0858a84a5076c9e446b513418e318b23744622ee5b51e11f08f3afc253ddb1c7bf412b3c52fa9f27";
+  sha512.run = "717be42652f38081fd416d3e762165539d3aa353813168b16c82f3a6c763ade9cff0e4b134af181959c52fc7e96b5729b603208ffdd87ea4ff646079e62a09b4";
+  sha512.doc = "566deeb35a67c0f5e6bf83f3ae8b13f1864084fda65e2a2bc51852d533e29cf75199db48b9515bf0a3c411ea36062c0b7aea3c173be2654a9d396e7efcea73eb";
   hasRunfiles = true;
   version = "0.1";
 };
 "setspace" = {
   stripPrefix = 0;
-  sha512.run = "2be791eb447356f937b75acd4471df825d28ce1369e0781dfb135dd4c95a504d2a95da284bc0866b4eba00e9e0ab6aa2aaa04c8244ad32ac4fed90e361aa87a3";
-  sha512.doc = "0da1e7ae7c6f814bd2028005ce0e82a3b16062a29023eeff23307b71274024343dd76654048f7ce911f22056b9e6802028ab9586da7bc4338a94197ea6ce0c75";
+  sha512.run = "4ed61dac3ecb6b5aad341c96b7e81fe8e1bc14ba3d6802245f711eaf0744fcb157c411adbb85e51fea5924f22c634c9b9b72c8eb11a45cddf8bcdbc9085a1765";
+  sha512.doc = "c4fcae8d7a113edc980135b4c72bcdf1c5ef082055180f78fe2ddf0d4f90a127344e22abd0f97762e724b35945a60edc804520ce15c6ab24861272688b23b1bd";
   hasRunfiles = true;
   version = "6.7a";
 };
 "seuthesis" = {
   stripPrefix = 0;
-  sha512.run = "be8eede7b0b1f6d2f7a48cd1996b43b66bfc5796131cf397944e8622164da1316203feb8be528c0fffb3e8f1ba081f1df1f61b39cdf9f01da2720cf2eadbeaa9";
-  sha512.doc = "5a6df286fa445d4a969ce789659d12560f0f4a12ca61496e1ee1f3d1a8d66b06c10df9b83b6a69fa665cf072fff50e82b9a9f4ae9b81335381d5ebd5e774a83d";
-  sha512.source = "4fefeab61fce3c8851a1ba48c69825fea6581cbbf4555f13bee2f2d0fb7683e8a6dd6ffa198935fdd45735dec7c7431fed9e2ef14a5d20a9830f0e8458e67283";
+  sha512.run = "57f55c62874f21cd88adc9b6e36807363041d24719d4c96d184619967f0420a086eb279deb9bb1951f2f3e5e9e752f1a15f5fffcb765160c51cdc831d5618df3";
+  sha512.doc = "cbfc5d9e2fd0215c3f677eb75151b060e4b3260635d1d40b5df61cffa8c79a3041cb74cdf67c34cdc297ae444d415b175ab3f81021769282022c42fc57653f48";
+  sha512.source = "f999b79f7dbe8fe0bec8dfea96a97bd6d664780c48a92d5960259c340f037890a99d4636eab177c07969ec86656206233d963c984cf64798cacaa69302f54ef6";
   hasRunfiles = true;
   version = "2.1.2";
 };
 "seuthesix" = {
   stripPrefix = 0;
-  sha512.run = "621bde9336c2fd9d9e03fadfae09a630088ab0fe4a4f7d202b1dbffe4ebffc81bfad1304d7bb13c80e25755bfbc78bba872d273256073643540aa3da4df0b01f";
-  sha512.doc = "80eed7d4e6529343d8ac9c0c11b723a4e5b4bfba63c3267e317a4a41de67c8c8f53e7e7fc9c809ffda7d27afbc60fcd6d9f1556e06ab6bb5d91ed669f8f6ba85";
-  sha512.source = "43a04d92f8a8abe123ca3234265335ab272f4be5f2dd170edfcc3fb3acf132a867ab84de03500331cdfb4ba280e6c048afa323df5ff7cf5a713498304b843cc9";
+  sha512.run = "74a7a44b3303a76b039cb5f0234031fe5175c20bee1302b21cef5072b8bb4d354f125889a8d6f50b61e7159dede445a1dbdcce70d1e4e6021756fdf446fb3b0a";
+  sha512.doc = "05131bff927db97ae55a8d7d6d0d91e1190df27cbb85c1783bdd4bdbfd34d6b931eb80415db75773044c37a728ebda7bb525cdb4ea8e6757b0842b515a155dfe";
+  sha512.source = "451cc46e9932d904124b6c7ea72e27a99b2d1bccb638db16d7173bd016a833fb47977bc34fec7b6e26e91de8c4ca2c8d4cc1805f0d555442c38302a935c5487a";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "sexam" = {
   stripPrefix = 0;
-  sha512.run = "87caa9741b554d11fb51ae3d3fc58a9d202d8817ea9fbb71a90c4b5489a975ed6de49c6e0f13ad06251488f8224ad99b3a626993beb00e9264eaf8d22795a5b5";
-  sha512.doc = "3135c9d4932e416f38d9efa40eb91489e733d266a2d54b4494ae1c5291b43460aca10a1ed2772cd343544d467c4d84f084bb3cb7191f45e552bea8bf656e78fd";
+  sha512.run = "17387e89e1f26075af386a0909ff5613b50eb12a22471bff8af85f1d6a8c37525e9855b5a9c2009cc7cc06cd670e17e2cec18bac1cc571e152aab89b6e170f96";
+  sha512.doc = "f6d50295dd8c9aa53e98e99eb4e43f7044a275102e0ead5b03668202c3c0d0598b524657f8a14ab7a0ee2aeb147b92af703ddad4b478a5c294e654daa87aa320";
   hasRunfiles = true;
   version = "1";
 };
 "sf298" = {
   stripPrefix = 0;
-  sha512.run = "98874c4071cc4e1bb4fde517f3863b0301dff15566e53b9c946a7790a4998ceeeba8a53928380d71955b08a1fd5179653b096fe08436dd6d0fdb68aa12642e95";
-  sha512.doc = "9ce2d0e9146c46a51121d54d7953e031687296fcbe0f166132e5b024273dd3c9ede5dacf9171c7bbe7b58ba9037588724d0e1e464131ea8d617a6126901850aa";
-  sha512.source = "1bce84ab89ad1af42d6a76b3fde6f8afa2ef0f15088a202a0865f8ca5e357b8e5ba62ae7e01afd69f52153b5561cba7ba02e9e9d998e7e2ab986051d44d50e18";
+  sha512.run = "97ead6cec5d4d15ed7a5d387f1b657403f9ffd90f0738343644d00281c9872accee2a6b6964a5e984b39a157f9d94d029ac8f63db896012abf75f28671eb4a66";
+  sha512.doc = "7844d103a9411cc177ee38b9048919462da0ee51687dc87a8cc6adbbe8ad5f4986ce246d85832df8bc76941104cebe04944c8c862a0e29b4cf7fa24bcb1806f9";
+  sha512.source = "d4e20855cf541dd12d4077ed0234ccb2caa485d926f1cb5352782f37a48a2d463ba127e23c133b0963a72d2e6391140f23c757d560b781b026f314dc6a14322e";
   hasRunfiles = true;
   version = "1.3";
 };
 "sffms" = {
   stripPrefix = 0;
-  sha512.run = "84cfefcdff43d83f0be39d03d9d9c8045667472fae960eeba6bb3e1cb6e842a71e514594c445571ab445d1b42b18dc57f3fbc2dca783f006a87db9250e5aeb8c";
-  sha512.doc = "9797edb224bd9896a24b855a5e4115412e07b678720f2a44b971e9e8d57433241ff3187645f7490c8ccff41dc849b555c4377f2a4afbe34975fff41bd70bae09";
-  sha512.source = "0452a198eb7ceb3256cfaac0c3799f3104e8ec474d36d2cef1013205d45b0773a3ce39f63d4eeffe053b3de713f110b4663991aafb7e478546df902c60fa72ec";
+  sha512.run = "88ac4187402827c4f696223a0dd9603a16614f737ff4096f1c493a15d7c7ef30637b8d4d260f204bbf6825ed582d67629cd65f58678e787536e1d6bef15304b7";
+  sha512.doc = "a7104b18fa293873b90b0626da71c6ba6ebc92a95b7ab63ccedb7cb27c482031f747f63b0ab1e7d474749519da0fd5a7e226d4978d05c6778d8800755169da82";
+  sha512.source = "d251add649866b18798231577d071bbfb788e11ea5596102b5f7a18d4a5be86e1452f4841e665fe76f3dbe36784919cad7e648d031b21c25c9b669038160b640";
   hasRunfiles = true;
   version = "2.0";
 };
 "sfg" = {
   stripPrefix = 0;
-  sha512.run = "0fe04d759411d3f8fd90c8df1e895ee2d24fed1ae4ba91e57015fcce9e28696461127e177d58694bb4d92d73e4448a5b7f09bf091d2a20972f20c9f01709066e";
-  sha512.doc = "afb8ff089c31a3a4c5ec874a97bccb5d2f1a8f97613e3ba7812eb08d68be2259c54edfc135244be28340f0559f8cdc92737addf3c627cc5623324ad7a77d6efd";
+  sha512.run = "16c49fd1f1ad63719f5494d01f1dcf4f0b04827bce963b39e056daa235afc83ed9ffafc8629301cbc38ba028d19e61cb9f2eddfbb85558605c879d7355a79f33";
+  sha512.doc = "3436ff0aee6f506a21b0ccd63795cec73e8387d671d4efaef3638a685cb4ca493ebe32df7c0a5750bbb70fb93c35dbf5aa2b704c233dc09ab99db027347a0be0";
   hasRunfiles = true;
   version = "0.91";
 };
 "sfmath" = {
   stripPrefix = 0;
-  sha512.run = "8091b2f144602fc5ff2c247ade97587fa607d696a467be0168d4aef90622ea11d2e3d308238e478e8b21473f76b7cec80cbdf79a04729d0b611205bf60169b8a";
+  sha512.run = "757e6deeb1d60dd9a548ce424dfa659a6ffc27e8a3f518452358f077582ca4cd889d05268ea7e8ba0a2fef15556cff2ffe796e707e86c6b570ddc7b131e3be2c";
   hasRunfiles = true;
   version = "0.8";
 };
 "sgame" = {
   stripPrefix = 0;
-  sha512.run = "44350a95a44bf14c5a805d02d6a1df15c967ed2e98a774c80ca5808228a56db6b3ddd8dd25b0f0b598cdb69348c70dc611ef1fa429fb3e0ca6804a7fbb6ffb0d";
-  sha512.doc = "7dfce25a17f66fcb333ca12c3abdf9035461463edc75951a0988ac4a4bcb499d1d8b21486abc40f0e2c4193561022e85c0724620da0f3c5b175c3f1b78fdbaab";
+  sha512.run = "42e19fae6e5e550a68861280edd7eae538b624324579ed0bf764db0c871ff2182ade6b69640a34088f1b2f5b74861cf5ce8968e9e98d99386aa5f01a1a4604d1";
+  sha512.doc = "80bdd390c12bf3ba4716b8b7e80493b7ce902063eb9cc06094fda5c2eed60cce656c2c24e1faec119f5932fc3b3ab9e1ac506c30444d218165979374d81a2145";
   hasRunfiles = true;
   version = "2.15";
 };
 "shade" = {
   stripPrefix = 0;
-  sha512.run = "592e84febf97efb8ab3ed300b1372882fae37032ea3824f6b67c82996580de41cf81676a8db8c970167354bfc1aa5efd9f030627b88310af53ed181ee5cb3518";
-  sha512.doc = "11d6827159ad566b70300c408db32cea2448aaf1be65f9d02aaafe35782e6d40e9f8a2c59bcd68a85c41b892dd1c80400ad3c510278ea586c90294fb1aecd949";
+  sha512.run = "16d77085d03efc99f152db725a4896493e348d8603ae326d8342e04e679eebe3f9466b7f436eadfcc2f78c5b34f1088cdb92b30df69341fc288b9df5ce3647e4";
+  sha512.doc = "a284bfbf5cf6372ac7c5836ae28166cbed272929ff5d37db6fd8c7199a2f18cc3ae1ba2a9c7c286b479d9fec80f16bb75b4cf5359d9c30011bfbb947d1e1b3c0";
   hasRunfiles = true;
   version = "1";
 };
 "shadethm" = {
   stripPrefix = 0;
-  sha512.run = "57ecbab515c7cb573c85e4f61afd3ad28c7915424f1070943908395a0b560a8f0bb84d43466a5c5ce918d090ef97763c28e66702b16a23b12232c67960476091";
-  sha512.doc = "a75f81fedb1e45947258541562de86b27e949322722073a169fe084b7fdcd10963a50df26cd820c539a3b1c5c59cf7ad79cd3baf5840047d0085e940fe278c17";
+  sha512.run = "235d50a3ac8fcd8ff1f5978ade55bc6697936a3bc0e98298203e9b5df94118070156278363ec5df8690dddaad2a27135b9ce241abaa931f64793073b9debb0d6";
+  sha512.doc = "4626666e5abb2aee3b09c4d2308fb4cba20e295857ba5bb6dc576f5f097550c7866b383b9817c64f602055fe66780d03519aff2e46502befceebefdb5caa8939";
   hasRunfiles = true;
 };
 "shadow" = {
   stripPrefix = 0;
-  sha512.run = "9a866ebf557068fe412e0f99ac3c65ae25bfd24ee8d328af2f01baf7d91b362ac3691e0fa1b70ed55c60a6366e2df45f73606ecd3236da84db14279520f5cb7f";
-  sha512.doc = "f25724583a09b4aa67954c9e27f2924608893c8762fec6f06ccebec513c43c294fff7409625b667f0daa3488e75c7416d60a2597bb546d7695d5e8c632da48e0";
+  sha512.run = "7d97a26b754fb42ff6b998b4e43668ba597422f985c62bde0ffe722e80c6a7e79305bf23b326fd679f85409060cc435274af47de21ec972f01b538212fdce913";
+  sha512.doc = "36ab18dc4d6ddb84b2c95c33220e8a13dda5b5a92794519ce33087c9ef64ba272a0e9979efd8dee721ad43967d58247886e10602eb150862f972ffe3688421c5";
   hasRunfiles = true;
 };
 "shadowtext" = {
   stripPrefix = 0;
-  sha512.run = "a1701fcc6e2da89bb72ae6b461d84266c71acaff546ef929f11bad7e7d95a22546ae5fd0dc074b762b35a1802dc67d350c41cda9f4fc5484a5d4d6e1cb0ad500";
-  sha512.doc = "2b41dd52bdf19d85fed75f4e4d4f5172b6e79fe6b11c01a8bd45119f590e4f6687884f8a4a275b858b02f639bed73a846ba3fe2daa508b6521041ea3d38f28f4";
+  sha512.run = "d0dd624c34bcec0486eb64a7447046a58d16ea2d7e36b951434dfcedb65fef540b75d9964ed021cd13d48c289df3c8584a0aa3f05490d330065110034e0c63af";
+  sha512.doc = "dec73f61f6280c68e7f98170334aa68d6876b79d22f62f05414c82d070f7768d89c9a04fcd1d9debbdb871e0f312134806a3d40cc168ac6a71a36ea7871e1c55";
   hasRunfiles = true;
   version = "0.3";
 };
 "shapepar" = {
   stripPrefix = 0;
-  sha512.run = "c93d1371f15832f15dd1e1780e823860f20ba0a274c749324691be4e2221e829416256b630cb3ed105290902d6262ba650fcaef4757418056b4459790121cc31";
-  sha512.doc = "10c8bb38048b5601435acd985e10760368003e409bf4ae20cabe62d7e1c9cc6b0704590400dcafef061da7c06edb31df9956b30bb83458a5d8b36709543107b2";
+  sha512.run = "07e743c4d21dcc9b386f5c85f17edbc52019417b1e05fd979e86bd25239b0949b289832a62128e5369f94ba9fee94b95d26b32e51de352e9b1880be704fe79e5";
+  sha512.doc = "3572ef902cf3ff8146d44d1e490c5691ea3b8ab42972f7f4a80418dd2f940085a9c676f27f55371ad63ca126f32d73b5924ce5ae203ff4371f8b1a30d407b991";
   hasRunfiles = true;
   version = "2.2";
 };
 "shapes" = {
   stripPrefix = 0;
-  sha512.run = "fc6ae3dfef666d2968225894d77680b17023d8b35f6e6f10143ee0221ee5a5e9f00b3a31a5696ee835f71db384f588a296a73778bab18c73ececdd235fe409a9";
-  sha512.doc = "ecdc8aa22a156fb6c2435644d34e8a58c0e1017be7103afeeffa3e03c054cd7482a360dd8713dcac64d75c6f1c44c328e8a718dd7acdf849d0dc5e6436bf0c16";
-  sha512.source = "0e517d47c8dd5cd64dd773fc20d732f3a799bbb7bb39555ab9aa5563acf26a3668df5911b5c41e9c3230ef916b66a34a39aa6e850132aa49994fd486c2c8ba2e";
+  sha512.run = "91187dde3b19117f2386e062d10743adbe892074737fe379e6a76a40f652fa97867af042e209c8c3e6c5ee1f5acb081affe22cd1cb34d3ba49cb1f7dd34c4a2e";
+  sha512.doc = "7b0ef9f2eb4735e2b146301ff51a7b4ea82b886796edd619ddd2f14ecdc9e3c2dcb27289f0d1a5193a3253bc7a44d4895979573e95200fe1c6993e969180bced";
+  sha512.source = "c5be53f9fb534e32d8c3bcdb84aa1e54b597e51bb588374737c3fd25118363ce188407ec25b3db5762d9c48f251cd1244373520becbbc6f1d06d6c5cb399e7ce";
   hasRunfiles = true;
   version = "1.1";
 };
 "shdoc" = {
   stripPrefix = 0;
-  sha512.run = "97e64c5539f2d449c82e4bf6a9c0025299ad60a7fab50dd5b65b94522146f8203744c57c746ae433809a786011adaa2ad8a5c923f33e35062705962882c55114";
-  sha512.doc = "42ebfdc941f5ec4d24aa9946137c128759c7ac714a830b760a1c97f0548bdaa7542e0ad810ac84b7ab6a9e924ebb7ba3022de1f90005f4b7c9457edb920adb30";
-  sha512.source = "f269448a01cb4020ba96a0562b19a38d9d3ea86ca96618d6b567bb4574c413270005d23328498ef25d3e5158416c60b69ea5165649de6a382a34f66c00281894";
+  sha512.run = "83e9ab3198e54d882b924c89b8c133d5da6ec448f3027b09d3e1f5b24d7ceb0a96fe264150829cc467cb5b21627c378249d7306e435def6a700933680cf86347";
+  sha512.doc = "bd57b6a6cf1e4aedeb917c72a4ee7dacae7ea8182dc0f72630bf0c96076df06eaad84f3b30f7b01adfdb18a9bbabbb49e2d2164b285623cfe04fecda4c0c0087";
+  sha512.source = "fd526bb1626ed22a8ea7d8c8fd6eb8022deaa48c430aae28092bb83d58aeb22bfec95c3cffabfa65572e78f38a9b2bcb79731f1e9c872da9cf6c262db039154b";
   hasRunfiles = true;
   version = "2.1b";
 };
 "shipunov" = {
   stripPrefix = 0;
-  sha512.run = "c1f52c272ca14df62aadb181dabede0e727a6a436fd12f4522a362c8e94ccee4acf09d51e78dcca87ec874465666d7feea741fc042efd70b0f84a1737399a8d9";
-  sha512.doc = "88f828144ed9e5530c40a10257536b38421596892496dc7c3d67ac74f6e2d78d86127cb81d1997882b3a4816bdc5e49f7e4918ac99d63be7f8a980d89f5345d6";
+  sha512.run = "b33640df5bc341acc86d462665697fb24d2b21db0223006f4603380d28d84c5e757e79a7338e87b5b5aca650341bde6d3827677dad527ebdbce144a099b58ead";
+  sha512.doc = "ccedb4bbc836a4a5fc8b5d71e8f9bb97646537a8bc7b85e5f151df4540cddae09435c7a624d6522415b1288553a1a721e95f09358d65f1a11d11735588454ea7";
   hasRunfiles = true;
   version = "1.1";
 };
 "shobhika" = {
   stripPrefix = 0;
-  sha512.run = "aaca01a0efefcc1328becb5c11b7068a69518f8259848f57e02559722d9629de00cd79286af49370234effad116b3aaa82b721031d04050e957468ad9034f4ca";
-  sha512.doc = "c40ed3d82bbf7df7eacd626a7b7e1f3f581fd05be8d3824954ac1c4f562a3454911f5580332adef83ab72729636c104b35cd4f13dd095b25bf23a21be32ad4fc";
+  sha512.run = "8474bae56ed71a3186386f142087ac67972a3c8958f51f87a57444542805d209a2db0c67964ee2a297c3a168784264121ea287ee19938c9018a3d70e0729e004";
+  sha512.doc = "2878d20b7eca86771c9d8cc0b9b2ca80de03ed738c229a1b072b58593a3a3cde425133eede94aba9c54fcaae98487b97582e5a8397234fc00f2d08f6c55219ad";
   hasRunfiles = true;
   version = "1.04";
 };
 "short-math-guide" = {
   stripPrefix = 0;
-  sha512.run = "c1364ce902a14416bbc584577e661efc169e078748392b9b9d45c46bbed5d08b749290546952fe0abba23590e7171a58d14ffceaa7bfe636fa1fff4ff1e0aeb9";
-  sha512.doc = "d3421403a75613ccc3dc7904bb2b6ee354645ff8f53a3be0b1ee23e3ff653fecd2cfcf96cdf14d7ead3e38a3a040327d5ebd9fab09bdf77033bb15bf4143e4a3";
+  sha512.run = "4f3bf4d4542bc5a64fc7496ad0da907ebde07b1bd8e50139c4c4598f0c6f074d7d7ccaecc2925a222d3537db2d0a5c24712e2334abebebb74da73e1944278c31";
+  sha512.doc = "3f6e1ea3be9616efd1b7a09969c688d63f6cf48cad89b6b088380eec2d91329a285f5538ee57285a378dabc37552d5467dc7e9fe90c914bad462906c04e407e8";
   version = "2.0";
 };
 "shorttoc" = {
   stripPrefix = 0;
-  sha512.run = "26d7f1e389a2325f8cd657d8ae40a5799b97f12d662f6d96dd8386a09588d8f8ed5910829f3a7e53204b72104be3a3043eea02193f0fea8f6158dc8c2dabb525";
-  sha512.doc = "dfbfd3abe27bfd444ebc2bd8994d4af9ccf2dde3317d8b2285c9fd42805028b48b5dbcbf88dff80a52201f3e66d880a85e155edc3947db07a6aa9191ed79259a";
-  sha512.source = "9b1f3fc2e2e58bf86493355243af973e93630c711141e901c663b0535778428b3417af4f63d56ff4a8262efcd85ba5b363885156b60e95ee20f8aefa79fe8330";
+  sha512.run = "890b52d8c23bcfe70b27f60e607e25ac6036992b29e1602289d361b30f7307cbc16571b300463d09bc40475bf0e0432539d23ef3c63263502895b78130795c57";
+  sha512.doc = "0e38cfe8a8ff980db6f6373b476657795d75d49918ee73794e3df477f980d9133db7c592ba212d3c5869d3d42fa37e1c82e099c76dd29b54c63a367e56a654ef";
+  sha512.source = "7619eb121e45e995d86941d809a26066bf8b687d4fcc80d9768e12e2980bf8b3c8849c0255c4811b05c2adbaf43aaeef188686cb122643fbba265be5d8b34c1d";
   hasRunfiles = true;
   version = "1.3";
 };
 "show2e" = {
   stripPrefix = 0;
-  sha512.run = "2d27fad83a778e43e49c2674ad7cf6f88d3d2c89666245f0490e28ea80ec997872d8920da9930cb2c281528a2c188ff8dd16f2e1f4430251ae8b3546982b4e68";
-  sha512.doc = "a53c4beb31a44c7253cc7d7a8261eb6a98415a641ba696cd848471d1ec785144a0e52dc6a7868bbf6d9718351cff82ce1d16dd1de8848dea1a3318c99eff5172";
-  sha512.source = "9376672f4b2705f88993c9d2a585f17b77fb366e7e5c6a1a76edabafde5d36c543ce50c50bce7ce109d9ebc89cf32b0b4c3c44dfb4528296d9f7930438398948";
+  sha512.run = "4b1e825730f7fef5d0c0374433a1d99847ff91d14e828900c6354ce29b9869e3a46522453960b0277f939b2b1778c85eed7cb67f94b604f8e251bb5b06a1cd54";
+  sha512.doc = "0d172c8cff006fb510fd3b7520acfae4ba1f46a29daa8bbb9fb1369f8279ea9e241825ecc37e5c079ee47ea6e28f7bd44d6fd4514b50a1f9c7e0b457d486d827";
+  sha512.source = "a0e19c439ceec3b45b4916eb05a292c0ed2fcb1fe82d9b845a8796442a6f9ec73c0c0b06ab074d78ae32a6621847977ee03623695bec5dec2718ca369f65a1f2";
   hasRunfiles = true;
   version = "1.0";
 };
 "showcharinbox" = {
   stripPrefix = 0;
-  sha512.run = "281613fbbfbdc70fa777d838bf4557bda48ebbb1c575acf7bcb5a6cc1ca8936e4ac6bc800582d80235f31b10d43da0888d8945824fec8b0e981e90392f1d092a";
-  sha512.doc = "d71905af63111ea9d713bb481c48c3ae50781352d62f82de31bf6e76146531cc49f96202275ed98cf404102f3f4b3d732705a07ef1c8c676d4524cd2834355b2";
-  sha512.source = "01ea85761e725b1840ad8d9f1839ca1d60ab4379cfa547e2356481f6d465542af67d2c1601cd2e735025a69746d3386045406e193799988e972b093e9ac8d451";
+  sha512.run = "7c5d2cc85fce3b9011dba8f02751c37f292b630064706762a3cb70a784bd2a561d1227365f48bd551ea68de8dfea895348f11598954b76a50a4f361c7e975cbc";
+  sha512.doc = "42587d7a15eaffc197a1ad4232f950f4e192b7197269608a45aaa712b275449a6c5ac120713ae06a95cd14886bceb86426a5da3eb952da774bd3526be16025f5";
+  sha512.source = "882e6248dd3ba8fa4018543c4e8b3aaa0cbb7c5f2514e3435efaba30cd777bfd95b8de662c9fc2595e793d477c52db5e1e367c83d5c1f69eb93490c8eaf05fc3";
   hasRunfiles = true;
   version = "0.1";
 };
 "showdim" = {
   stripPrefix = 0;
-  sha512.run = "09fbf2734a5ae56338babc2a14cafb3bb7173d515922181891ea9fb9e590a4581f97e4e1a3c75c590912a65cdc8cd996d47ba254455ec0fc4d0943354f11201f";
-  sha512.doc = "5744c6d86bd658ca2b4dbf50e7d4f6fe59a6bd89415962c20550fa3bda28803095c037e675ee9c6ae496693bcbaa6ed1475b7ac32b34c569fab87411f6c70730";
+  sha512.run = "b8377b3c4eb81919bc1d874db969e61c7982a032792011470b374ddbb9b0742dba8a0c8576ff5bb44eab2686816b7dd0e8f2b999974aba96cf59d68ceab5ccbc";
+  sha512.doc = "9cf6001463ed491581502b4e8833bf5769c7295bfe9a5be7f1a29f8b913dbc117ee29e4c1af526f364b47b8515ed6ceb51aad50264720f520c2c488692daaea2";
   hasRunfiles = true;
   version = "1.2";
 };
 "showexpl" = {
   stripPrefix = 0;
-  sha512.run = "64c7be04e9fd6f36add80c488a703517266c112b02314f6f960277f32d23511a0a547ea91fb85b9b35a89881079e0911ea600526bec516887dcd9b147eb90f05";
-  sha512.doc = "156b9d2ebba0215b8a5f6566e04fd4e7d771c5e618053d7c91493087ced660a22241654380b025e070158ce51c0cd55575793b4af22f0b88ac7268727b1661ff";
-  sha512.source = "5139a619a45e8830cd9d9ed7bc70ed42f31f4398b4451911df69a9058cf4bcd461c600041fd47697eaf92b3faaf145d8120073d091dda073b731242ca60c4028";
+  sha512.run = "a435ee94b57c1d4df1b2549b2e5ba7257682e2fc4a170f11b610ee920f7aab3411cf3d08bd6faf9c73a3eff5f23a5ad778ca30d7a52debe64d32c05760845a71";
+  sha512.doc = "5a096b71aa2d0a93ac0d8ec38de8ab09b783e4a40a5d01c422c04583ad7197c5393b7b80b5180390881dd5801378aba57022291c8be43bffe684ac6d51828bfc";
+  sha512.source = "7c682d4779e47be78aa3b04f8af5b5dcc966edefcb27026c62d803b3640b360340b6ee51fb50dd137ff7026c8c9b1cb8f215f601b66f2eb2c09cf8339926e4c7";
   hasRunfiles = true;
   version = "0.3o";
 };
 "showhyphens" = {
   stripPrefix = 0;
-  sha512.run = "3f8569802c36405613c094015b8078d49dfc43d16f63737b6174285c796511b18b0481922ac68e28e54ad365a510df87331f1d576766ea8d91f94059dbf49484";
-  sha512.doc = "a31d0c2ee10cb3f59c295d291ad0ed473c31cbc27969c9f454870cc33406a5c7b8624f95bcd4e42d3385f599d641f7a448dcfe4cf0071fc732284db0fafa331c";
+  sha512.run = "92c4a37d024538a07e0794284e893ac7561aebcd4bc51ab9a6c8700a134d364b5d68addd2d24790f88b2a633a510f968823d1fcd4f020fced7c3e362c0c47450";
+  sha512.doc = "1de4be082ca15852cfc814baa7bad2298f2911ec958066f2d2031e03388830b0f2cf0829c12404e13770beed51affda78642b9f8e92fc69fe8585b118e5326fe";
   hasRunfiles = true;
   version = "0.5c";
 };
 "showlabels" = {
   stripPrefix = 0;
-  sha512.run = "912fc6342dea1fe29862875c7b763e7fab43bde1f5d30e3b7ccb30719a623d51f2bf75b0f8d4159f7556dd2facaecc572873a8576a9e4e559d4c07c37820f59b";
-  sha512.doc = "c75a4b987e0766d223615d5a6d197646f1f60af915a8dd8c740cc0c1856ae84e7cefc50afc4201092997141e04f95fd3c53105340bda5a3eea5a7b97472dd870";
-  sha512.source = "f73d06116bffa80bf18e49722a691561a12b92d242562854961a3f2a1b23c5036d10561eb243dfa312e2671f2cca09794520e4f0bcb8280089875efc56280ca8";
+  sha512.run = "93b3f2a23108470c1e62b83b7ecc911f34052a9e3411b8658eda63205e0e28fd903308e42bc5b7e4f7541cf442b03908dfb04ec74422c9149338acbbc16046c3";
+  sha512.doc = "0d76c6e1d27fabbd2c19a1e723e447513b598facc097b1158e7d6a876dcee79000dc45dc0d0b11b2e22ddd3943ddad7aecdddc55d9db178d714f9bb146a5579d";
+  sha512.source = "03dc851be8d1c27d9ee2e504da1d5cebf7070b1be6654bbdc43566e7811e8928b3165ef097e33ddc65ad6d2e2734d85428e6a8f250c307dc979299767026f1e5";
   hasRunfiles = true;
   version = "1.8";
 };
 "showtags" = {
   stripPrefix = 0;
-  sha512.run = "2d01616dc74225c3e93dddcc580b30a1254aa9d45e77ba44213f6f8eadd737aaa498d45a85e38a4cdabc7e69d5fa7b9d8a1ddd59f26c1365a65298dd52488725";
-  sha512.doc = "83f0cab91f300308d5453c556a5608daa322c282b7863d6a038c99ee5828f98deeaebaf7c5d943b4422a580fbf152b02d1f8a5cecd33b8796ff169ef8349c434";
+  sha512.run = "cedbe096b08498693c2cfa7f04d41d997e5ebe850e3e771a423d9e96df53be5b1e6ff1b2479edb25f24aa8ff644b38eadd420c983c26517e4c0e06d3dc3be321";
+  sha512.doc = "559a346ff2ac77e894a56fe86253dad2f86fafa9d9400be0644d5bfce914c1a6c58dd246496fda0b7d85b93291ae77f9db80c2215c8a46339560288ea9672005";
   hasRunfiles = true;
   version = "1.05";
 };
 "shuffle" = {
   stripPrefix = 0;
-  sha512.run = "33ae4025484bb9edfb3795ffe88e5650ed31fb4e60288c5fddccc898195afcc4b0701023fae0f79871af5a2b1bf7183df3ae921a40dea16d089741f01e3b2625";
-  sha512.doc = "43a1bb1daa0e739b5abc8b4614b1a493d1301eeb5e950f0708d4d0b206a0f4ffbc01ce968da13c70d38afc9f1269ca81674481c1c3c61b79a3cdc0f91a947ddf";
-  sha512.source = "9a5c83f0c8b0019f22fc544ef674e795f89d0268b660bb4149cbbeb28e9712cc1fedcbbd061ecd1ab4c3ffb49262b867d58dcbca7747d31b39b56cd63328f213";
+  sha512.run = "6c37e073b086b1a2fd1a6e7aab6cebe0775784d9fdc3096724990eee5b554b05fd72ac3fe103f4ddf8cad107d1751d89bfc149561acaa2b73f3647645e5fce0b";
+  sha512.doc = "593d4baa3780e8fb9aab3fecd78e9a58bd4c695b011bb7182f72c845aaac8d4f40c78ecab95074a0e19eb50e6bd0b843c8e09e74dc3246acb04c9a8f6e84755b";
+  sha512.source = "69cd7ca67b00cea1f3c4c74840f8645edc061fc55d3910cc9722cb012b8bf88a1c99e0c95ebf62c6e388d7a41a57b4bdfa3f57f20657d45c84c7799ff73b4834";
   hasRunfiles = true;
   version = "1.0";
 };
 "sidecap" = {
   stripPrefix = 0;
-  sha512.run = "6dada4fd2de2d8f9ea12030522539be2b41474cf3532bc0c4f58beeb4fca287dd0bd629aa0283ff02ad7174068136c17f66ed53c93fa277a2cff463efd1a2bcc";
-  sha512.doc = "fc9bf019dad4c59b0559e53a85be15203024bab9a85ce99397eafe9311fcf0f854f58ccdf62417f3425745621fea1d568c47f00a0f41ac86dca3f1c8da685922";
-  sha512.source = "d51a584601b1dd48eff7cc0d90ad0c02a179b38be88445f7c3cbf5fe0db187ae025544adaf9ece6b3d63f1b7fb54a54c02f6a09ca003106faed46f549402e512";
+  sha512.run = "a777eb8c63e131e7683d7b98ead417cb98fa8fdfad33de43f49eac034a1ba483a2783ba608b29e80b216ce4fb506c606c759219e9945504266aa43c8084706be";
+  sha512.doc = "f23ed0a2e953fe51ea32019b4c616cdaa4cbefcfb54f68692f2ef12a4cabc581ab470891888c14a41ad6170e0641247ba35fc902d40e967784cf64d243772daf";
+  sha512.source = "2067f4bd8de366e2033bf101932d0170e1b31e2455980777f4fd1fdc659467f39f1194f6b78c99bd04ae942a22af3f2664aa9cfc9db0a85bf4d47015a8ae6024";
   hasRunfiles = true;
   version = "1.6f";
 };
 "sidenotes" = {
   stripPrefix = 0;
-  sha512.run = "c5a6b0bed737fa38bd24a429f24cfe04e7135265574baeb48f88ba0f577c17a73ba602751876111a3aad50f73964ebfcf15e3588bbd7b472c788a129fd1e907c";
-  sha512.doc = "8bdf83c8187224583e5b85db5d62b23d28a3a088dd3d0f2851d47802b23328c19f7e4fe97bdcaf55d896c3aaca890254bd609d293745cf6be575847791e90eeb";
-  sha512.source = "34e119e4339ee0f3d806ab0cdce8dd895e6967c2a7358ade3f8e6bfe1a32499bb86b7a8435cce4f9dab8ac9e237def7a7286ce76531c1fe4fd741a5efe8906dd";
+  sha512.run = "4dfc504d10ebc71a302564ec7d12849216563e4a3bb4efa553ccf1973601ff4d5fd09b4b8b9cc832a040f984d5c3935f9ed7dca11692732612df2b3b0fd43e66";
+  sha512.doc = "91df7e6bbaaf71bcf4c57ee217c9dd550a03e5cc03c4db7faa9be395a1a92926791604d7b4268dd8cf872c935bf7b7fa3106b149fd028b674d53057947c7f7e1";
+  sha512.source = "069084b708ef02cb2b9ebc6b47236d394298a6fe2b3c5a81a7d748593b541f37cf5f55e6b9428cc25b43201d844908cf5bc89cfc378b38fad5bff758662d04b4";
   hasRunfiles = true;
   version = "1.00";
 };
 "sides" = {
   stripPrefix = 0;
-  sha512.run = "0573ac6fc51856d22c17b4863877a3df8ac24a346023bb5a264cd1fe0847be7a091207e4d56e28c9e058c371e361345eafe6c64d82d9900739f14b6158e70c32";
-  sha512.doc = "2961d4af99dc1692a9c3f4c69d38de189ee2e9228d181964e0ceff98ec79ae4a9ff1e314dc1adb6954a3687b7eb71a82755d608b144711030b06836d9d0ab3af";
+  sha512.run = "1b0c13e382579d1bac38e788c859c89189def12190b05debbfc42d63d821607f091cb98a197f85a92e860f61baeaa3a93e979557a0183cef0423e336e17a6da7";
+  sha512.doc = "a72e906f0844989b3207aaa439926584ebdf32dd0f7f6e01be7375b45e4752b8b2991b9cbed0bff9a08fec78af3522399a99cb79cc8bb6479cd562fef87b1d79";
   hasRunfiles = true;
 };
 "signchart" = {
   stripPrefix = 0;
-  sha512.run = "d454200a1de0c9dee82c93fd2227dc1b431e1fedda7d62b0dacd6f5d7d7a285eef7b0a0c289ff7db92b482817cf23a09d4d9ba535098bbce933519e38735da9a";
-  sha512.doc = "b839ff4b2308805f0116be15250b308764f267219e747073748be408d9329a7b1fa9e1e08689b711debbd01d0ac1961bcbfee73f180072c95b60edd7fa22d53e";
-  sha512.source = "f65986f42c1994beeed43fd8f419cbeba4d1e1ba6a0a4d5ec70e3a4db4b528e8b29dd62f6ed525a08bf39cecd3c5b142e19c573bec061a1e6baeb0c5ff10a2a4";
+  sha512.run = "0e8faf5ff68ca32cb21c611b19f90234ebdefd01958be303c8dbc8c46b6de572f82e96a05ec51c2da65f1b265226a5bdd2521a695ca698f17f92aec6fabd7f83";
+  sha512.doc = "991eb2ca4b93545d4e6ec7aec4db2d48f4ad5dc3ea292d254e83a6063ec2be276c6a0a9c0ab1e4b59572974d37758534f15a4a90d0e57b2576f9a51fd3662484";
+  sha512.source = "8400cd907f04a4e2a9f176d9e1a571475458cf88ab9204076b1c15430a5d2117c41fdad82ea2c7f6b6eea29c6c4b169253b9d56a4f520d3e11a6fa093eebbf1e";
   hasRunfiles = true;
   version = "1.01";
 };
 "silence" = {
   stripPrefix = 0;
-  sha512.run = "9c649b85a5482c4ca9777b762fd4a33b2ab44f25c676884b1b7895c8002206de2f9977e3b04af348d35c8e4c6431701763a54a915325176e098d32836763e7bc";
-  sha512.doc = "2a0ec2a0c93d70acfad90a7ee165ad835401284cac4c07fa646e92caa7460bd80c3b5cdf4a3abb1832941fe55578e82c760c83c7e848b08017de8021676bf86e";
-  sha512.source = "122fca2c4f25acec48dbff38c71fb013638eb8761cfb820082603f6c22053885422b8ef8b37e0d82caf5477c260ca887777777163442136dfe111e6f14a3792c";
+  sha512.run = "b7961132e8683f10eb2abae6cee49794a53cedbf6a878a972cffc21aae509e2bcfbda61b450c4f4dd2a06450a976d0b27100433f784d837483b2762c8fb3f063";
+  sha512.doc = "674a0b23bdaa086eb28a15168dba87979c6082bce2522046cfece3b9b7a8e532069e1ad0d5c2c05b5a8326b920920cde0c850fbbd2ec20b2ae5cad4efbd1b9c6";
+  sha512.source = "e2783b26b534cf2dfb7eaae95fc3507ca9e2f25a0cb0fa2b771f522f65dc082fca7b0516ed74ed61ec54d28cbe4143b35bba4714978540aba0d862d72b0d08e5";
   hasRunfiles = true;
   version = "1.5b";
 };
 "simple-resume-cv" = {
   stripPrefix = 0;
-  sha512.run = "e12a45a9c1c3e50d8cf413b3fca3553ae9333c630cbc23bf69f514d6f372a882bd0f32cfdc854dfeb3b942d68840e65612f19453e33b42e7acef813d6811a048";
-  sha512.doc = "336963362dcdfc64b9256e280cfc65431b2319457ea097330bed004d64134ed771814412bf3c1e964e01971aaddb997b8d857a40af33ea84191b57e8dd3760f7";
+  sha512.run = "2345755a42b940f9c697100ff83672f673fa324adbd572884cf816c128d324db0480674ef04e27b1133be07c0ed49a8a1e154bbe01935291c00d1f508b630883";
+  sha512.doc = "10fc221f97110e11039e439b9b071c9ef5e988bdb7e3ba88ebc2a5ecc5e551028ea6698f14332660758c7bf1571fc4a2c42f03a524b27ccbcb729106bcf522a2";
   hasRunfiles = true;
 };
 "simple-thesis-dissertation" = {
   stripPrefix = 0;
-  sha512.run = "4e631997c9c786858d298cd6a697cb83a638000b4bc17c5c5b414a648b9880e3ac52b52d7353fa6cbb98d77497ff0e1f4eb8eb4ec6409edc53881657aa26977c";
-  sha512.doc = "ad9aedb60f896a51a96cd418c3013198cac8f4d0c9cba95aae2e389a8fb8e183e98eff5129fe91ac8de4fce95a362ba6bf6a09e5f971ef09391542715247793b";
+  sha512.run = "4ba32961d1ff123d87224af6a3ba015541f76f7f536093b61fbfec366b79e90443ba113fa824625a54556f77f8aa4c34eb6f79401af491408ee24ca0063b68e6";
+  sha512.doc = "93b9b2c61b47286e2880e2f9bba4845f21fa65b0955cf4b427b624e6d4e89dd1aedf625f2cb44bdd71e3132388b14d3bc6136fd1a6efebd5e44261f8ced5773d";
   hasRunfiles = true;
 };
 "simplecd" = {
   stripPrefix = 0;
-  sha512.run = "f850a545323819bcf806aa2720b867ae7c20538319e0f7e0fa79c0e9e5416b54f729f77c1b6a5f2191dd2e682c1050143769f5884a771ef12f552629363a989b";
-  sha512.doc = "b65a3dce05375a46996e42f41e0ee7ef4c747f282d6d1cda1d851f7476205cbfb38a2c9da52630ab6af10ad4d50d71f5ca83c52e04b157954e723306fc87d87d";
-  sha512.source = "d6ba0449c0c2ed9f841bf8b27ff69efa1e2ae75a354e62339515cdf1c4d42c96f451daa295d83071fc64d792cc1985dfc396f95d2007acd6508f7d5fbe28fcb3";
+  sha512.run = "485cdb853f05f0cf4a61c505e93e30b15e5223b26648db2c9c42a2506bca8cdbb619502c7a7ccff467bf6caf3880889bc6e95ea5a079ca2fb4f7b232ca16c567";
+  sha512.doc = "ccedc1ac3f8a491b7161e4e174ac96efce06296c25ea114a01a8f3772308daaa70ae43dfed5a84d5625a504b1ff5cc206cc001395e09967cd6c242256c52e72e";
+  sha512.source = "12b998c2f470908ff3007bcfbf179f0be57edc50c177ef8563463299bb5a73d4fe672c47a38f1083f2702b67e6703e8d5f4fbe7bc3d022aa03ce6efe4537237a";
   hasRunfiles = true;
   version = "1.4";
 };
 "simplecv" = {
   stripPrefix = 0;
-  sha512.run = "9cdee2fb5cb59fcd42b8b36331226fd9b4654453ef1969929185b4b653cf76780f578e68d3f76b8b658be8bd67cf4191f7be4eb6ea279cfc6e6f9c0cf9d36866";
-  sha512.doc = "528a7b32ba12e160743404263409f852379cdd6050484c144480a8f26e81d5c2d9034ec51fb4f020fa34daa617ec59931b00aa2f2323591d063b30a72efb2800";
-  sha512.source = "bdaff8e8daa3162f7a65e06c75eea0d0e2c46be8283636224f5fb51a7eff4dd684217794e276987a563c881c6e00a5cf80ef55207be27db817a4c3add87875e7";
+  sha512.run = "bee78f50077e4b307270f7f276180ad6ddacf15ff76edbdb236821a2f58dae058c30968071ea7b15f4e15612173641b6f4176d67dd734cba89e788ad35f3fa88";
+  sha512.doc = "f38cfbdbfd20634ee364118a29ccebf1324ef0746de87c2528f7ae72ba44a25f3c2629a626202aa689c88ebf036ec184a85621e43a4de4a4fb4f8e59746c6107";
+  sha512.source = "adb3a428ceb3c0239d09c8d2fb0652284218d0ceddde00547dc9c93a112c522448c4a7a85d5d247e1a8a4e67972dd40c19c0575fb853c33272d79d022e83ad60";
   hasRunfiles = true;
   version = "1.6a";
 };
 "simpleinvoice" = {
   stripPrefix = 0;
-  sha512.run = "66bedb979c550185684d54a5f0aefc25c2fdfacbe636702be3d678fab26ddff8a0733708f3ed8d7ec69473742524ba5283166eaacbef98a5ca0fdd66af0f9579";
-  sha512.doc = "fddb11195eea16143f30c24327de61af5febc2e75dc03bb6bd9422c3118deec56e5344e06a48259451b930017499e9c4a81bda5dc42bc84101742e2c0acfe39b";
+  sha512.run = "fc05387beb66a10323158a2007033cbb10b0639c68c3d9d72f0cbce1cc8782e04511dc76c97a840bd36eb779b8c3fcc414465990ab970444652300fd5ee2a733";
+  sha512.doc = "26e3a4a0bdcaa69304a4b63ba1a59473ad57bb21b9dea49c946b9e1124f7bc03109893e15f1c808a9784f74caa026e317c8369ae1031981a695029f069ddcd22";
   hasRunfiles = true;
 };
 "simplekv" = {
   stripPrefix = 0;
-  sha512.run = "fdf6e843644fa3e8dc2253c23b80390daba62de2d5235ab8946213b61432aeb4c3d14352d138977d0c592253c6e3d1ee25e50a7fb0f5fffcffc478e6e4ceb6fb";
-  sha512.doc = "8103c123e699ef970fbf9549fcf47ca466b69d3075d8fceafd3d743cfee66e532c9677d1dae846b55e27fd561754d9f2dacdd130bec7889d594bac4079290d89";
+  sha512.run = "3d4200cc9892c90c74651a3da4fd2b485bc336892501422eca71d584f6f48f58be996732676db1e9bf998cde36b1b35155635ec2f3249f6718610f3b5041c9a5";
+  sha512.doc = "2cae56baed8025a4d3a542b210331780894423cf38a35b7fcf7d4c0cdc97a0ed11377139ba92d35331150877479045e33eca77be5f7e9ff2d9f71e706ea5942b";
   hasRunfiles = true;
   version = "0.1";
 };
 "simpler-wick" = {
   stripPrefix = 0;
-  sha512.run = "fb5298e729fa0b400e6500f96fc3be08de68a891ac98cddaa98fd6bc2d7dd7ae47c2de66325423d66326aff2128a96da079751a657aff3dd31d32cf7396b8c79";
-  sha512.doc = "21b7d998a7d6647d6a4cd1b91e9344839275e2d660e183cb4fdc152cce6b8c932bc437af092b5edf3e0c905bf020d70391c5436bcd1b22d9b815db12f579000e";
+  sha512.run = "5ae2b0ff7c404b71ba6ce68fecd428732d7821c3bf2bee3fcb006cfd4bde646abc71fa677b4820f1075edca9bb6aaac03908745e8156e73204773be0bda7f7cc";
+  sha512.doc = "8436fe02465c860b33cc5d6d99fcd5584466b93ad719248b2b752d89994050c3a503b0fe0e6474c71e7257d84699159bdcf7c2e538fb13b74aa138122bbf3d5c";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "simplewick" = {
   stripPrefix = 0;
-  sha512.run = "30a1c8e3abbc9f68bb454fdca84e353b788e41bcaf12886b7de0e8210a20edc35e433044bc3e49845afcacc0ddb0c196eac4274a47777b1925356107843cc2c5";
-  sha512.doc = "438c766ad1eebde646758673ddb9695d96bdc48680618a0eb36ebb63b0303d61241e98a9bd588662248c93a6398a2ba8a283e400c35c98387b5770ab0afbd151";
-  sha512.source = "75265ebd9facbf29771ff49e3d255518b4bea1f557dc90fe9135395d7ea7456ccf9e46c4433f56e34ba0460cd2182048ede93a846112a94d5b65ec87970b522e";
+  sha512.run = "c1679462c301b98b91176a2488f2093e7a6287c7beff71db6c8ca2987917bb5dda2a346309addae980e924c02a8579ea692f66c813fd0b9780950f577a266599";
+  sha512.doc = "9267de9557edfe5c85322ad326d870f4ff6658020f5d5856114d250acb30682efd642f9620a40e1a21b173a838bd33d5f4324c3e97b2c5893d2b8a42856b0680";
+  sha512.source = "79791479433c4e23c962982a9c7ca7a9ee861d0cdc400221eac89aee10bfb94f441d45047671a4c8626567d0b42055229ebe6be65e1ae7f53790f5807494577f";
   hasRunfiles = true;
   version = "1.2a";
 };
 "simplified-latex" = {
   stripPrefix = 0;
-  sha512.run = "5974bd32f99812ded4fbb8d915a2d211502a9a7e9ed30bd63ae7884dce47984498317c3c22a3630931c8da5e08d0467ed1601c52ace234bf5778f0df3eb9ef63";
-  sha512.doc = "b65c32ef48f50382dee8892fb0a550e7b5728971d26b01bf241039ad6a3c4361279c48071bf73986b7b44fd9bec556bb1b14732de4905ed9e31903fb10b19a59";
+  sha512.run = "0a923443dea8c6aa4a84f5251a699fa15b0c2bb504abbd6a30b88533b7f3e3f8c116b312f4e7fa9f842327e4afa8bae1493ca8e5c47a91b8e0afe7fdacfe8877";
+  sha512.doc = "cadac28791129332f0650fedbeb32adb608ef91505d5904a990721f40e8fa6f3ab6bd9d513481ed2adedd245af48bf3d16f2cad1a85bd7180b53de60fbc6d182";
 };
 "simurgh" = {
   stripPrefix = 0;
-  sha512.run = "c80c9f9960340b61105d17fc2c08376c52274fb00c60529e9f50e831dea4a4bf70c0c31d90252edde7bed3023f133a1f47a255c7425b44246763e8e84ecc7509";
-  sha512.doc = "f6d59acd270a4005c088992c795c6636c3a2258c01c6cbc6e0998dafae5c78ee914eadf6df5dcb016bb4d1d9421bd93246de4dc638eeb6393d762ffa112591d5";
+  sha512.run = "1354d65bbe08af6757bccac6c390cc0f900116eab201bfd818e5deb837b99dc52eaf32203f64466596e1ff489f987d407cc3b1b4351da51359d1bad169c82440";
+  sha512.doc = "6b7d053346c75d832aa388fab859193ab16de5cf3fa0434a715e8f74a82c935cec9236e082ef2769d159158b89f19eafb4397e33b2da2b40fcb2d699a7b90232";
   hasRunfiles = true;
   version = "0.01b";
 };
 "sitem" = {
   stripPrefix = 0;
-  sha512.run = "3df87ce9f37e0bec68771799b9484d2cbf055a0663379ffecb6894a0143d4616cf8c10b2217d6c98fde39dad7f5f26942163f22ed86026bf69f4269ae662485e";
-  sha512.doc = "8ea4774b52823d78e3fbf12b2852ffd2bc3cb032ddffc23640ff6df004c7c903b52bbfb571c6ba690d66690e2d41200a7e2139af6152b97e9ba99baffc16cce0";
-  sha512.source = "212a8b35d8ec6af8f74ff4bf6671fec72d606555278883f08853113edb4dabe035a2d1785a537d7dad7bff24252710dc4692c88e060d355d7f789e35728e7fc6";
+  sha512.run = "92d4b491831182a05412160edb32d78c41cf50b83f2335b6dadb4bc8871ff9ec9783204f438c1af104fb403b12142632ab34c522e425238f375b6d635b820ad5";
+  sha512.doc = "b276d43061a695fc164cd664d460eee714d3ade2ac7fdf129bb46a5f78c28005143658bb92a06f37f927224aa5246ec31a543577da76d391906ad1f7bf6a43a0";
+  sha512.source = "4a5c026ade5676dd7090c775554bbe6d561dc029cc34eeb2889aaa5ca7398932ffe8bac5ec560e35cb7f8f4689dd258fe781ff41e97646c7da231ff32c9c0321";
   hasRunfiles = true;
   version = "1.0";
 };
 "siunitx" = {
   stripPrefix = 0;
-  sha512.run = "869817751c3c673db2861476fd3208805bab7a056b4d950803322aa035c0c22297b157dff1c21df5a9f60059869ad95ffd77214649ac92622adb333aa28a8355";
-  sha512.doc = "6deae1c55dee55742c3287f13d1a98cbfe9c077b5a61c1f629fad5ed638cca30956558eb113ba81c18e3742b7ccd22051ef8146bb53e21a69a941f201b0b61eb";
-  sha512.source = "f241c2a54e9693de64bce4ca7f94b526bd4846dcf3d13143989c98b61dfa4fbd7545df7ad6e9e490bacabe8556528f2d28a767e1eb917364966ea0b667c170c8";
+  sha512.run = "7dfb0a614d2962cb2c82f04fb531cbdf7f91bf8dc0e011a53bfdfd6d6c9191ed5c8b1e822e0dc458bdfe951d6612d321d6e9819b58183f66690bbb39d274eb68";
+  sha512.doc = "4628e80afab9f0c8c5fd7d884f6d007d4e9a5a57c8cab90b823c450a2df8c3df83fd96e08823effe37051b28d3a8f6bef9cc74887cff3c1cc7309b234e6d3ce1";
+  sha512.source = "6dee92822781f6575a40c0ca9717153976f2913e6d5d5af50a91c7d719ee1f0efe42f472c68f35f78400384a2f936342bd54f9be4e2aa4e261310c0dda0f0292";
   hasRunfiles = true;
-  version = "2.7k";
+  version = "2.7s";
 };
 "skak" = {
   stripPrefix = 0;
-  sha512.run = "4688a429bd81adc200f95a40f4600fcda07e4acbf8b195df946f177d0b117e25a61608687723a53c37bf5dee918fecdd111f444aa81054e87ec072c256ed9b49";
-  sha512.doc = "1e0794bcba23d1228c170c539bb076e16448e4bc14bf8d7ccb7a0a6a65c9d7710625df9a4f08bd3853501e16553a36819ecbc93c560890adb39f29df77cd5ba6";
+  sha512.run = "853779e87f148998b7ce83a75651dccf2e59072612e4653543f4cbfa58c9a826bd8733e7b29971a8e5f19891fe4963e85e85a223e61c26f8ea68c37c484d4e36";
+  sha512.doc = "17ed00f9438f7313bef29835c0d46d4dd11282e83dbe5d526052f14f0c7134cb186ef3fa04a14513395a0a4369baf98c555559e181218e858508ddbf94c6383a";
   hasRunfiles = true;
   version = "1.5.3";
 };
 "skaknew" = {
   stripPrefix = 0;
-  sha512.run = "da977d6be6defa75c679915c524a12e14596a6731060ca4b15139bf8f870837bed905d39720b93059e1b55948e9fed495f322dfcb71095f12c2826c812918f53";
-  sha512.doc = "9a9d13509f3b27678b77db7b5ed0caf2233c5bbe0be98fdcbd9a1ad2795d8b860b3dc73b6436f3dbf68fccc5abbd405e80da63f8e3de3a8a896a7d99873a3eab";
+  sha512.run = "3fecd59c3c2128830d428fbc2fdd2664fd654ad19d1f2c9658f80757b35d099f8283dd251a0b8245889e1b2cc6694b71f7c103a4ef9e228f3931f1ada75e2229";
+  sha512.doc = "fdb5135a8d33c833d3125b29a4c7c8f85ff308c2b11f787c6a70e9a7d22beae063f69ff6c85d23132a88970385eee6abb9e3f7d89c70f89d0b7004b150d82364";
   hasRunfiles = true;
 };
 "skb" = {
   stripPrefix = 0;
-  sha512.run = "054e4bbf9f1e80f2fb2eef42a654dc1df1f81d407add944e83102a097d694537af9140240a9ef58bda2f5be792f18f20c772cc3cf80326356e630ca2421377f9";
-  sha512.doc = "7f211bd9ff1b58add314d706439896ccdfae9e5db6d64da46ee602bf7fcdd239601a9844748116a770248122d48fb5f43f26bf4cea81832894a06e9dd41c3c00";
-  sha512.source = "9646e492ab486f718a6978d7ae4b14b4ad823fc71354b0ccb90b6a97e1a61ba2819688b725b16ecb7b04eb7c79268bfc7af6027315b8365ac55fa4d4b655fea1";
+  sha512.run = "609b1e74e65ff83778ced419ec80daa93ed78b708da989523bfa3b2346d5ede42f4ec353d8e390bdd691ee078f9fc55391dc825e280a860ef8d1bfa798590c17";
+  sha512.doc = "cfd2bb648f3326d610c5c8903402cccd76fce3b9d28f2314161bebca7624f171da64badbee203d284a73a15ea81c20091a229a0698f3d524635f1a09c086013b";
+  sha512.source = "1a71439072698ead9ee821081de1a0a2bc6c974ce514514473df544419739095e363b2587f3b7e333539b5f39e6069f990fe3233cb9fc182e8e884144432be34";
   hasRunfiles = true;
   version = "0.52";
 };
 "skdoc" = {
   stripPrefix = 0;
-  sha512.run = "f09f8cfd441ad525eaeb103151e890d5c3da0ef0638ac738cac382490f17452dc369c6f8d5664be16c62848cb141e9f451d3cf9d16ea4f2da0f00863f42030de";
-  sha512.doc = "4e672b4392ad7c8447775b3e25ddb66e9e083dd530e8b4cc191788f4139a0154ff65e0cc23f115072e4e0af448c3ecaf0e5532f04bf1b1e2f6858bb1d74ee1be";
-  sha512.source = "62bfc1bf3613e85dd7b88a7689a80ddd636ceef60ad77b4c709666cd54875ad929428406c3392e0735e285c5e577628316ccc12540526870b7729e0edbca1246";
+  sha512.run = "a89565128ff1185e4cdc336217ddf27b2af60aec9cf90930a7f3f6a24421d383cbfd223ebe45701db72a25bc4033418d1c633736fd72b80e61eefe828007eac8";
+  sha512.doc = "4c5ccc21af86f5371a09009ab9afa9eb2b9cef825ecd6f50648e92c63223b97815d0dd55eaa3880987a47fe2591487324ebe922285cea60301ddaba9a6ecbee2";
+  sha512.source = "ee7fd15beb5a97a7c731ea3d55d088551062eef306dff09410bc45cbc9e3dd95e0f10a788bc57e560a008460bba5e1ae065281136879c5e905c192a344ade80a";
   hasRunfiles = true;
-  version = "1.5";
+  version = "1.5a";
 };
 "skeycommand" = {
   stripPrefix = 0;
-  sha512.run = "dd75a3df739be9a4f5982d641c933e72190f661a9870145399fcf26c3655a43644ee8e7af053d6ab20b7f7efdbded7429f20646ad72ffae1f8b25312264bce8f";
-  sha512.doc = "61458019753e934e1da5b5eea0168cc912e9003b3153836e329593a060bdf7107a5a52708d1b52bd7ed5e7256dbfe7ed83c4ce79e3b25416554e4a089e533e54";
+  sha512.run = "c99f23a066955148d6212a2418de29bbec7b300b16b2da58d581328f8bef884b8fb1ee87a076b3f1dad6d04e6c523a4ed37a75a58ac0cf656b485b80462e10ca";
+  sha512.doc = "45208bfbe41325b2120a071d32a70bab5ca993e0e9ca0b006d7e3a78513dc5fe0cbae232fc56f6a80f864794dab1ae82b64ade55a2bd4eced37c763ed1685e3f";
   hasRunfiles = true;
   version = "0.4";
 };
 "skeyval" = {
   stripPrefix = 0;
-  sha512.run = "8fbd511d79c120be7f6de835061fa394b5148479dcfd18fc6897199321459ea49cfa33a3593ffdcc0ce216bc68250ef99d4d7948a3b916d770bd962d9d002143";
-  sha512.doc = "82d67dc0376cbeb8de8073f152cfe6a5d0b6d0f47692923040ad7dad20ab4e3fe8028915ea6b97d227d1476be98f46b070896403bd1a47a77f5eab867c1f494e";
+  sha512.run = "0636c805d4297d07a7247625abfb3a4e56b3b5422357ffea960f376617d49a442e51d6184b46417851a3f57750297fcfd90f46d41aa166e8febd62648c6feaa5";
+  sha512.doc = "dfc0edb8eb6f9ee857a66bcbef70c7c3e8c0af5eb5a840b323088e316edfeb75ea803480a816156ada444648c935eb6d09958e9db3882fae056e1185f1058ee4";
   hasRunfiles = true;
   version = "1.3";
 };
 "skmath" = {
   stripPrefix = 0;
-  sha512.run = "159dd8bc446a11cba64a9acc0081454255be669a0e275eecffb48427cb3f7590dc096a06c35a8c8fafd72c8ccc27045c415226a5fae1f2b9d06610a183531eb1";
-  sha512.doc = "56a6b5776d3f44daa0be591cfe8473f70a9ce1a18adf70e2959418f9d59b0df890086b2853dc75573e254842a47448e3fd717960670e2b953839c95703ed8d08";
-  sha512.source = "686cba83bc28967aaacc3fb88a076aaeaf4e8782a548a5c5e1bb3d9d26cfca9241a7d2fed6494aaa16b6ac921cb6ac769526bcc4d3e7e306f49faf517fad4b38";
+  sha512.run = "6a355e6165a21eedba852d90244069937abf464a06538889967d7d89b56cf2a10e1f733f94ee0f4961c2d4d6b8fe0b70f4cfaec64aae90a3601b0d8b973e0633";
+  sha512.doc = "151c0f4823f781072544ec855cf80888e4f038cd8c5db1d63aae09376b166823e6c5ac12a79a9ea7eef50261753e178cd45a68fbf5ce6da812ff62589b7de072";
+  sha512.source = "add6557bf051d0643b960439e3e72572457dcb99edf047ed909fe611c2cd617d024260465ba6775d3e8191715a5b79c2b1320df3aba36e5656664beab2759738";
   hasRunfiles = true;
   version = "0.4b";
 };
 "skrapport" = {
   stripPrefix = 0;
-  sha512.run = "dc6926e416ffc63f6f28a1224ce21359035b132fefa1db123b86996956ef1f9d9d9aa96d414e5c70042ed1f09a0ac811f6163eaaaedeacdfa6c4d674af4a5075";
-  sha512.doc = "3077a6535eaa7322e38766f3054dde94bbece2d640f67c2b279a7ce08bb8580a5dfde72660fd195f4842d236f361d6d684a49690bbd1d50c79d3253ac3c7ec65";
-  sha512.source = "8bfc458283b49c4464f12e0c885224ddec421ae6b3b73d3dc8dbda09e9c8826078e3438c0b743e1d0f689952486fa80bb106cd39647065daeef68b99ccfd30b9";
+  sha512.run = "9199e967101f4423aab984f57c1addf05da7b72ed925849d09be660799b32250fb34704462d8a6d829fa6e07ab1bbd36b7d313a054dc11c892b9c7ca6d971c49";
+  sha512.doc = "9ef2154a9ef5aff6290b1c75904558093ae9d91bddc87f05ef3b9db4569174dcba41f81dcb2d73888f6ba847666ba311526ed22f3c340fad77ecf34b7a6a0f0c";
+  sha512.source = "8bf091b9f50d19466f1d7288c393b63fbc373ba5211b7e910cfa063ad5d89f0354ab2e94f64c4bd212f941a59598f44e12ac788fa08c8ad76b095d72e38342f1";
   hasRunfiles = true;
   version = "0.12h";
 };
 "skull" = {
   stripPrefix = 0;
-  sha512.run = "4b25962fd4890d36d219ec68a7958044a4cb34c9e240edcfff000efd6a7756ce64e994c49ab1a5517fe5d2b88abc6d58a44fec89b5f8152db8ab5c2d70dcde99";
-  sha512.source = "603f2cf96a0724cc62b430dd6e80021495d60fa82807c8b6fb0730c5ba0d958a25d38245442f8f26a12863dc5ef6e60fa989f0097edacf8926bc0629866cc29c";
+  sha512.run = "f1a347d05166df10bd4bfc3295ead834bebee50a2351a860cb664020dae73316dac8b249619804f77fa02675e6e124258ca2669103fdcdf3f498ad87bb1d7b5c";
+  sha512.source = "002d7c12e21ad67b33ed8d91621f679fd081e2b79e7aa403690d989375125b21a01c0fa1bfb6b2dd46a36295f598235f87fc309aea5ff19c3fcb723e01b8c896";
   hasRunfiles = true;
   version = "0.1";
 };
 "slantsc" = {
   stripPrefix = 0;
-  sha512.run = "89762adb504de4cf9e041c8a64afbbf3716b8ef9b64fd041de1eabca66b988fe8fa982fc7b9714d712f61c59454ab34b01013fde818caefc29676f5e5cf8b1f3";
-  sha512.doc = "109d8fc430c9206f8d24af3d2b1ba81598f975aaf109dac2ec592cd0dc399cf8b5777e001923b8680be40625d349a91b6a748568d39be2b1980f191cc4a8329f";
-  sha512.source = "af35df83387b2fc679d1bac6671640b369639d295fd67065b28bacdc2ebd36f5d3b472d52d3ce50408e7796f64d9474600c52fdf869b496d0e2371423e0d42e0";
+  sha512.run = "5ffb339e971c1dcc16027b01e50e44798eef93fb510ea4f598099deba7d8e711dd12d8324a95e9629da008cb8eaddcf5e7a7e633915f51b58c19d24fda289212";
+  sha512.doc = "1acdf8b580d92224289af661989e523bcb1839777e8071b018b5a8a6bbe7b8339275506984ae505637c254dac81f8d397c92098b54f787d7c187497c25b1f11b";
+  sha512.source = "7e1c5541ae6ccd907b470307d024fa98a67ee65c8b5a723c55ea4ab49e456511cf23d55390e33edb38dc44ed2407ab9593163cd69e627379c1b85bf0cd79b43b";
   hasRunfiles = true;
   version = "2.11";
 };
 "slideshow" = {
   stripPrefix = 0;
-  sha512.run = "cb47e5785bc7f399831426dd158c61a6c7a0d5f2db15eff835b7dc796b9d7d7ba796be6a4e1a4d8ccf6984c318d55ee217376dc60d34db9a691daaae31cf8203";
-  sha512.doc = "b4bb348fbad3a3c3764d654712e61476e3daf9e307f74759758d4ba172e49b2673c9b7db90959f32d67e71bf2ea2fd8e11967175666a1d2063b7141af276ac3e";
+  sha512.run = "c44a782de77d5b16c0d4c696fe5541a9073e59c1a91a97ffc409d2c4ac15fa8e1da3fa56f8a79225c2427223860bc23e160e6d291d8cc6d0e4fdcbfc96ac0e54";
+  sha512.doc = "c8351470d808cb11be9ddc8de32ae446a0375c5981902a3c6b4fce16b0b10c74103f10fe0d6d191f6770ec3a62783076cde3f516709bad6ea0fac226ab0b022c";
   hasRunfiles = true;
   version = "1.0";
 };
 "smalltableof" = {
   stripPrefix = 0;
-  sha512.run = "66e640a5c6002c7194ff01fc4260523e172b2e4c72490cdda7e4f0682a2a125e39da821b3e0ced03538941932ffc628d9f235b832944f86292c5c82eb3a2edd9";
-  sha512.doc = "c8ad942f534d633a26c77090db2f24ca7a29e12809f1a7d4e89e42f5ce513f26e7a33202e8c79e3dc5c8aa50f565b555e626b13789a66c57b0190c897cd2f0fb";
+  sha512.run = "c1ddd107d59ec950011b48cff38880b1353869d247701d76a8e3c0ffc28f50d31c982cbe8f28388378be7e7e40868347f20c5f31ee2763df16b6d24c9e5b447e";
+  sha512.doc = "10f787377bb431a48e4a03d6bbf8affed7c4954546a751dbe16c88ee3dd0cd47570a4cd7ee6406c355fbb54cdab51f95fb87d96e10b162e272701a7d8ad6e507";
   hasRunfiles = true;
 };
 "smartdiagram" = {
   stripPrefix = 0;
-  sha512.run = "38d7a19387261521d5cc338601c60411b7db01f1b2bbbebe274bace2b877d8b59a1db9ccf8c5ecffa38762527b48a4009b78320c3c2a16c2bfa437a792d9efc2";
-  sha512.doc = "c045d3010014d7a77907b36e55e48f6f7363672aed9e491a69ceff348a761169d7ff0d63baebebb2cda06552bcd47933dde395ea180ec53edde04566e8abbcfb";
-  sha512.source = "7c882eb78c69df14d24aeeb6bd39ae4b2b6d0685561ebfded00a42e366f7f4fea1d79a85988f675be239f49c19c887b000cf17da9445caa0b4d5cbb9e78ae13f";
+  sha512.run = "c07e40ce025cc05c1cbd1da0f736773ef446c193d8efb9f9437d63e8ac15e5ff4e598b06564c2e9ef410bbde20bcfe1a2d971523601f844a46654f2dd6dc930b";
+  sha512.doc = "f102af261f8ed7803da69ebc9498377a86c3e087db12d815e485706b5b221d9a8fa77434cea09f386ed181d10f8e210c32278def786ab35c60fbff7cb6702ee8";
+  sha512.source = "dd405b652293c7f87b3b3341b1183d6e69286a924ed250a5353f28deaa45f486b9b906da22b60b7797b434a15a168f24006eadd893f118d4a556c07e57b1b211";
   hasRunfiles = true;
   version = "0.3b";
 };
 "smartref" = {
   stripPrefix = 0;
-  sha512.run = "d9ce0b051a0033157136e85c9056354b7b3fe29ee40ea9750a2a10dea11391ca114dba69123edd2fe3e9f2ce2d67276873049c8f0405f3e73a71572bd0435a09";
-  sha512.doc = "9e728e503019fbf4be5fe0b82feff0cc2a5781305034913210cb20700dac0b179203bbd66b9ddb330e5368d522df162d833fadc593c37b4318158c5df8a497c0";
+  sha512.run = "148c6b62c7e3e8f1b5690e38ab1733dd5e94a370dfa8a9ff0d2529d723e1be76e20729ef0eca3a11099adb4d0830f6d4576eaf26a50240d922fd55b3651cac5d";
+  sha512.doc = "cfc6b9ed3b35af9f4dc1dfc71d1b892f59695247bcb7d47fa9d4762ff7847bb0b4af8207056ed0e7060df28d83ab40efe881bf05fa9cdcee963459a1198a23dd";
   hasRunfiles = true;
   version = "1.9";
 };
 "smartunits" = {
   stripPrefix = 0;
-  sha512.run = "ffe938f694cf04ac2d1091ecc2aadb34045a57d8a1a9bf97df6e6c23d32221b95c0caaa2f59712667b51fc6f7ae15679fb1c06fe28d4572a26de6251ce7ce5e2";
-  sha512.doc = "dbad1733d298ff3cc7f58be7d3df76604b83a2d74e8cfe85b419a043f2b43fe60b2f38b3c683e56f5bc58afeb66ebd899125ce96b81bb6cc8053aa607cb9836a";
+  sha512.run = "b70c3637265196c56b07f8ac5a21d4c71c47d82b8def59deae453ce49bc9b29337e36df0d8d20ef560154a4917253b4655f7e0cdcc7de9fcb39666839a3ab4d6";
+  sha512.doc = "7ba15efbae145968ffba425954d0c55d3ed3f74ee30919d1034a79d591f9aa7654dd63650ece2cca61f8ead1267509b82994ca371e904dded867d7d846186d6e";
   hasRunfiles = true;
   version = "1.2";
 };
 "snapshot" = {
   stripPrefix = 0;
-  sha512.run = "b91306e9655a7d556373199f2821827a60415a83e41c2fb21f064bbc3358a71a0e0f9901e7f4582d5ac96a29b160e02c11cc1c9e1dbaf893c8068de112e99637";
-  sha512.doc = "8e7cda6671278a9808caea0eee5f93738cff34ff987d810191c02ddfde8e83f1bc979ef7f11a2be37db39968db223cebd86386aec664edf02257a9a339bae937";
-  sha512.source = "593fea38576331da89341943441d62598597495b0de5908e07ad6d923d2476403708baa1dd18747e49dd45fbee1ebd9d8fceeddfce0645669b6d02bd0d684d47";
+  sha512.run = "28e9d5785aafce74422734a62fe2f807b585125caac5a7a86f70cbd19122daf3d44f4bf046ac4b5c4edb5bd1b7bf042232aed0a0ad34425e13eb3845c93dad48";
+  sha512.doc = "76b46eadb5f81970514253fb650a1c3450c8e57d684c733dfb2dfec01dba743e0ce31e65a72e31af16c8dd7db0927a3e9af98390e191a1bdab08f13cfa94cfae";
+  sha512.source = "7f31d845b33295bdb50e44754b9b085cfce8f7aeb26b50814dae5c3fa71605a175eed9d507d6c19d3577cb3c362b50936fe3299f499a62c91faac0123ed30740";
   hasRunfiles = true;
   version = "1.14";
 };
 "snotez" = {
   stripPrefix = 0;
-  sha512.run = "7e6ee6ee7cbf3abe3a9b0764dd48548adefdeb571a4516fc336b2d40852a86200328dbdca9d4a3610bc08fdb209c7039200b299905395462cd3d0770435932df";
-  sha512.doc = "db4e0c7a918a4279a314c1dffdefe32f08b28c48b0df60cf24ed2643b84ce3515ab417a4157e609b9e7c2a01619dbb507c18dd3d1bf1f8eb72ef1de51e8e7bc7";
+  sha512.run = "37610541fa0db43bfc86a13ff501c89773ed1db3f419623f811f517c640ad3a6bea3a908f64c509d780ffc45840c79c056257a6626b476e7735644a1d1d38f80";
+  sha512.doc = "096add2f0af76dbc1b7953984e4cf27d404540f47d5e65a35147173385a5d47f108bf417a3573ea649219d37e8ee6b256d53fec8875bf3a9ed89a19cb8d7eb4b";
   hasRunfiles = true;
   version = "0.3";
 };
 "songbook" = {
   stripPrefix = 0;
-  sha512.run = "4026828d0e4f33e24226ca92e66af202e03670e88eca2f6f0e10b3f12fbb58b38e6835cd443d35f4b87941150d0ac52e5ebbe68617b926df14120e1aac5d18a4";
-  sha512.doc = "eecae23a5838a63f7c255943f73fefc135b000ec9a471ab8be1f1ede09bd22b051f73f95855009196284db193bca6db2a63ea5870a58bcf0d8a5f50008397bcc";
-  sha512.source = "11c019762b49fe5963bc77077d74e03a71af05af9fa2c6b9d8c101159ca9fe261d8afaf6f47737cccaa5299c97f132d72b2ae366c6000c0f601f5545b850e7d2";
+  sha512.run = "3461bd028cec5861f2ac19b613c4ed98c12533498e750daa8a9365c392f796362e55b91f8932876cc137394668894823286945a07896acb6a8eb29fcc8b20ab7";
+  sha512.doc = "1face74895aeb5f9a8f63aa3ef6848372825f48efec33af3209245f267716a03a9818eb30e5f270eeaadae7bab1c5c02377ea9b5b731d4827e465dd06cc063d2";
+  sha512.source = "23e6e07ad9b4a0859a2e9439f90231f29ab834da1f46a24ddae9be5e631754e352651fe66c03093eba28856f8ed7ad9aedaa7cbb8c1f26e0a02c83a7afef714d";
   hasRunfiles = true;
   version = "4.5";
 };
 "songs" = {
   stripPrefix = 0;
-  sha512.run = "b300697c973970887e995fe481c3bd1e5467e70d6d446650007680c401b2f9d370f43f84672f488be7ba430724fbf1cbfec8d15738a664f6d63565c795c1090d";
-  sha512.doc = "012b09b5d2986f3a65f3c9b98da0b34898cf578b7420ad9205b5468051e7e092e3371e881935ab2ea82dfece7d1e027b15f8165b7b4fe17eb503df10b82ee4ef";
-  sha512.source = "ac018c61310aef3231a9a4f2e1a92c598dc7cd42e4fc3de3119fbf202f193f274fb4c52031589d292a148a5fb96a00f4e878afc087b319de2ee64dfa82f6b71c";
+  sha512.run = "d7f37654f8324abbabbc82ebc70a430957cc1a8af09f7f0e41110d4809e8c39252b8eac2e0de521519701c8735d73e6059b3c63b61645fce98309827b6fc1a13";
+  sha512.doc = "a114618be50d3babde08944f40ded36d536d6c5bf7292ae07ffbe57c5c43074520560aec60fb54373a275feed7f3ae5a4690fd6abf39a4c7f853bec56884036f";
+  sha512.source = "21dd9813c2cb873c2071e3107d1bea21a0a21209f1b4a3c5aa614d8c1da43f17197aa25dee83b65446ddf95a71816b2d94b6d72ab774bc51206c3bbcf06b4f04";
   hasRunfiles = true;
   version = "3.0";
 };
 "sort-by-letters" = {
   stripPrefix = 0;
-  sha512.run = "c73e0ffe9f2df49fe2f9b4f59f55baeb017106fac2b564eb1727d1919aed73fb33f0d0264d6dc5df7e2ca02a837fbce3dae972a19511145d64faaf47e0b8f20c";
-  sha512.doc = "427d876a9025b18750bcab4f38986e8e3a306fb914c85d0c1402645c2814fb5b4a00ff86a0bf7988d2251e5307b06c41d9d7341b16cce2857bfee87439a12769";
+  sha512.run = "a90f03d2347daf4e2af7e9b4bf2c6d24e3602252a2e1bec01b7eefbfeca94664073d2eb5d6910d527161736fbe8cb1a15fa571293f0da531c76b7635ca4a3037";
+  sha512.doc = "4d1d4323bbf5a6b8247a3906a79f419976e949531e2ff4fa527c48eacce289b5ce8c0387f589f46c4ad0c007b13bf40c2ca5d35b01547036c37b1a36352bf201";
   hasRunfiles = true;
 };
 "soton" = {
   stripPrefix = 0;
-  sha512.run = "3e1fa3ebb1ca4c227fce753f4703c26a91a709ccabe750d8a2638e8c5c8cc7171d0540bbc7aefd2e69e39feb0d3904c221002b94723ea45b21d232f64796b685";
-  sha512.doc = "a8f7a1fc03ced298ea4d5db82799bddfb6f760b2ba5ee9f47eee0edd3eeddfa4af84aee23c48648841e5c42dd6d2d5d1cb274b173b087e3562ebdfcaaf495b7c";
+  sha512.run = "a50899eb0c2c0becac5199d43678caf40998f8c0aa94b42de4c6b07fefac7ce5237f64914ce93a76d68be918d2ebf503ce11bae78e95bed8ab65237431e4eeb1";
+  sha512.doc = "ca43e56168be89ebb655182aef8bc52c8322ca29b89c442bf682047a1cbb8ded6b639f8fe9a5c1e6363d96842ad78f4d4625dc05ad19c4177e7ded58bda67557";
   hasRunfiles = true;
   version = "0.1";
 };
 "soul" = {
   stripPrefix = 0;
-  sha512.run = "56b1ba148ca4e16d925938b7423da9a950d43bbb89a5380d93789fef57706f55ae30ef0fd59aa4a5fa9a7156ffc0363ca2f95bf8053dce247b4cae61625ee16c";
-  sha512.doc = "0f2e1188589d86681bb95a0af1f764433f86ea6485c4dae1c8bac39e36b831089c774792a799f0dccf0d70c82a53458416622d735c0e6aade57028b740e88698";
-  sha512.source = "078ffda58752786d556326f7d3087215d5de04aa7c4a500a53707e69d43ceed79c9a347d6740c0dabd252d46270cc526c072bd3bc2d5e932b997ba2aa20d1d86";
+  sha512.run = "7da58625623b2a7b2b077ce0480ab3769dc269c79eadcaf6b7273db67455ac7232ecb9d3e1a10cce9f77d9c1309e098ecda392eca8b203e724c6302632291d88";
+  sha512.doc = "c8fcb1573266487644f1c9471ca5e298a8bc20cbef916040f81f1209b8053f74fa439dc59f1ff11b734d9ccfef0d98124de6bda759a07894175c38785bc29f0e";
+  sha512.source = "fbe23d5959efdb15eb7fc9be141f0ad7423b653d0e2c87a2e60480256990899f4fd8a592665c2f937a2f59566a7c6e079cbbe168047050b062d3ac8dccaec73b";
   hasRunfiles = true;
   version = "2.4";
 };
 "soup" = {
   stripPrefix = 0;
-  sha512.run = "798335b264bf0fac34f16f9157ee01df43ac163b658844d2c4e869c50979e04490b18491211f25fb63f54626ab598df1b4bc7b3a9cac140cb9f185b87d758510";
-  sha512.doc = "f5920fcddad2b127ac8231ff50b1abb3fb81c879dda63a6dd4144ed337bd11169236b19cc31eac60f1ae239701ea8fd50d085c08d5f72c578003ba0de55198a5";
-  sha512.source = "191760fa43032e2169fc6e19182590e69b3d436ccfa8d3e201d15a1bd79ead8d966d7cb83041a7a730a6e77fd9090d100ee211cb11a16bf75c361e39f9b0be60";
+  sha512.run = "0e0197339cfdce41b0701fca5f7934fc0f1457aa4737b922a0d0bbefd3fae5647c79442c93630adef450dbfe430ae187a13af181f7ddf3df8ac84aa2776ef533";
+  sha512.doc = "a8abcd649a352e826cd66f5804dbf7e114693f3242453ca23bd6ff0328d8ce6b87e3e904587a5fe399baf03b99914cdad22abbd87d68814130cc7b58ab0e61b3";
+  sha512.source = "9762ffe1e5c3199c0fb18c99e9df495b2f6f3ed8610db2a124d7f108bb2cab4a648849a4ef0f48ac73975f138c9d318e42c06bd059a958c28b53113179f4b1bf";
   hasRunfiles = true;
   version = "1.0";
 };
 "sourcecodepro" = {
   stripPrefix = 0;
-  sha512.run = "17121b02875f566640489e66609fad873bdc1dfe4e6de34b0fa82ec6a80b8c7a84c3e4593a940ec8683d6ac8ffeb8bd6e513aa46a70bd3831de8a435a6560aec";
-  sha512.doc = "43d51c740bf70e75f0c784fa269e3cbde5db8728f0544980306d43a5221e9d3cb13376c278e4adcb58b40a5f317839f0d6af5eebccd2191413cead9ae3924b11";
+  sha512.run = "b9c4272ff1534c0f2de213c5230e0d78caf860113a5a4c280ca9f4a6f589ea572311cdc57402910172473059b4c46738dd801efd08ece47d709523d75b0a12c4";
+  sha512.doc = "afc9f3ec69c49a000b625c0b4221e62abce3032d3dc1f73bacd4e3789e80f342b52400a226079e4ebd4f824a2de1537cec85a8113759f708cfa99438facabd8c";
   hasRunfiles = true;
   version = "2.6";
 };
 "sourcesanspro" = {
   stripPrefix = 0;
-  sha512.run = "978429517207c61d9b9343d76d7407685c1fba49d0a2155f391dfcc5e52965edf797ebe8eb67cb0cd983d58fd9c4c4635d5e0a87a073aebc27e37c4194a8997e";
-  sha512.doc = "91a73d0b0005e10ff4987237b65b6d25b4dffa6adca35b447f8c4372586d1b1b73f5326673eb231feba32fc6d3b4a019df7b4dc4bf152b1f6c3fe974d1704f22";
+  sha512.run = "139be9e91dad1d8599656a586a1670f059452424892a6962a3ae66c2e3113e7952d1bfc402c1273c219ea3ed204bd944dde324205f98b075ea9047fb2d97a908";
+  sha512.doc = "b76815953ceafd9c851a85c0f773a4efc6fb8b06395237608328381443a3628866c80cb46de351dd837ffe640c47cb34cfed19f3ed963bf2ac533bda9cbce9de";
   hasRunfiles = true;
   version = "2.6";
 };
 "sourceserifpro" = {
   stripPrefix = 0;
-  sha512.run = "cf1f812958ffbf3fb12d327a4b47556ca28dc1b56747dd0cf558daf812ac7f89d994f71d5371fc8d607231e5e1007d2b9828dee228dc8ecb714841dfbe2d05f2";
-  sha512.doc = "c57bbfe576c4307639063f0d9d8e319bf9ef58e16f6ee40f85ee2d93d999ca04e571668c449a970a64c0e5a8bc9d2152b123bcccb9659c88a1eac455e863cef3";
+  sha512.run = "d8dc82b308fdb5d6b08c815f8675fa6de0c060356ef99bc8d509c823500db296dc4f49d9f1706ab525c9adf7629b7fa10836b557f1b1d452e4f884dd41f5cd07";
+  sha512.doc = "93640dac82db48f1423a8b3936bf449505dd482158e1c8fcac54c501d5a8068bb7b8ef82afc64cbf16f4eb83f9a5e1c1e9bfb61d92f6166a9e6d3e50a5f4704c";
   hasRunfiles = true;
   version = "1.2";
 };
 "spalign" = {
   stripPrefix = 0;
-  sha512.run = "dd2229a0fe8b15c1eb076215dc6e28cd307320472e55a2b9f4e0c3133d46932f3175753d96618850116dd407c2cca2e1bbddba2a191d6773af5bd5ea3f8cda3c";
-  sha512.doc = "6a26db61f60b3d940371329e0601b1c3f53b5701086ef1108024e853c9780c9d2eeb832020786ee614a6076b5f3df857c6c7ceacfa7f9a6a77c4b2dd3793a4d1";
-  sha512.source = "0f6ef61c5d1878088769f5d07ed67d64fdef3b133dbf71d91a284d951ca46473f1e44e093c18974a6a5798cba9c8b0b35259843c8264d256df8d54e46b89298f";
+  sha512.run = "37872b82939414f552247dca785e2a46b1b2fc44508f0c877d648ee99aebb7d6cf0e5db2c5b3905cf79093d79d11edca4454d4ad336999a9d059e5972b31250c";
+  sha512.doc = "b0e000756cc6a55fa00698bee6136aac33b5e8bc8a633e3363c14cc4041697b62004e5bfe9f6551770f51c00a701b8deacb03bac1b9fb90544e7937b92e411c2";
+  sha512.source = "4d1c42f8e0051d090bcff560a92b30e8420e9eb7cd875d8a25e8009c5c62421e7698e75c518e8f2dd08937bb56f1ebb5604a7955eb34efa4c57c6b51c40a42c6";
   hasRunfiles = true;
 };
 "spanish-mx" = {
   stripPrefix = 0;
-  sha512.run = "d0d1d486b53994614c0ae8ff50d3a77354d870f7e8773c73f91896e6c9facbf534a0009b638779a38fc1eea503173c29713440272dfc22f2dbef8bd73e45b3c7";
-  sha512.doc = "332851a9dfe5de9e0530b26c080461232e0286b66c3cc17cac4ca35c1ac0ff1ecd805c41227fc692b349c126280ae3de18b8eb1b326b119b72d6676689af6afb";
+  sha512.run = "0179d053b4b2605db0ba9c92de0e84afe075efe6b050cdd24879d4ad5f9c7e64dc513649a6a7cfcfef7dfbe9c38a6a569cab1dc4ca3880fbb297a3bd81b20afe";
+  sha512.doc = "01dc04e3fe236f465f93901e8877b937a650e84efad69ff675dabff50b5d9e81febefc81bc125341319b95f2086e74fefb9ac8d8d8c36f3b291ea9f9cf4a7151";
   hasRunfiles = true;
   version = "1.1a";
 };
 "spark-otf" = {
   stripPrefix = 0;
-  sha512.run = "35ca41ea8eba32e7e13864364507401525cd1ff1e052da1e2dec84f72c61740759da768119b68e9a4ba0e38e92afdfd7fbbff937f40535aac614cf7a164afd7b";
-  sha512.doc = "43867f3e54b9d6e19b9f5b0112d7f97d6605d31a333fbab606df8cc92d8acc403074b7e15c32beb93c8bab44e39c8bfcaca58dacc245a19c65380414b0f9e410";
+  sha512.run = "a5eb69b505bd4e72b3c4f9d68df21d95d98ff50df5fc93e977c0c2660e6c6a2ecf4de4b673fed9cdd60b334188118e0d4d766ec6fc3fa5aa16fe4057deee8842";
+  sha512.doc = "52e2840f3f4955e32c7da9e6cc32d7c041e5f2d3b9542094e24e8c438e5b6772077678474e677a2ca5493a7e22b62cbc97106d4d8e2bd7839643da46241499b4";
   hasRunfiles = true;
   version = "0.04";
 };
 "sparklines" = {
   stripPrefix = 0;
-  sha512.run = "9c47ccfd81e44ceca0e15765ca0751814e3769995d03aed56fda40051d6771bbbfeba2a91adff63832863a12bef397ce68a17e16bc32235051949fd13304d6ce";
-  sha512.doc = "8e88c2b43ee94fadf2897e39acdff119453e03b7efff73e09334af71d66da2b0cbf511e7476dba180a5bf37667de4d3ae8cad0928c038ef74067e2685396f184";
+  sha512.run = "6d4c5514e408c3de22fc0cf8d6268e3f9e275bd141ba05896397e3828e78ddd142477649acc69a72a203200d9c1afe72b51cb60afd3980b8010e999083fa5559";
+  sha512.doc = "66d8d47fa2923097ffbe3422d87e98d89e055b785daae4ffcac2dba14eb4e7d94cc1364bb8c60be32864026c3630aad0b776303a781c7b6b5d05604016429736";
   hasRunfiles = true;
   version = "1.7";
 };
 "spath3" = {
   stripPrefix = 0;
-  sha512.run = "a7adef4a9d9c4146358862d960b488ac0e82989aa1b5b1d5e367997f2fe39f58a8739efa6388f2fbbdf1d5735afd39c96a0fee6cb84bcc95f7f7b541b9d22afb";
-  sha512.doc = "f043f8c68a5c49083181ab9ac16a620e0e035ba2b821e666412ed34b3f13851ee03404bdbf6abbe3a0bda81382b654ad558b419420fee1e76c86b8b13a3279ab";
-  sha512.source = "a5d3392991c3e5f5cfc90e0831a4d98be2475c70f42d13c09dfc04e13d2846c7ce8d2cf25f6e2efff095f4ba00fc4b3c7e10de2b8e64a39f44d703e06c25c888";
+  sha512.run = "8c466e67b6770874ab6041e82a0f09379a6d06272fea01dace0ee0437baaf6a18d7985c5ff474eee0681ae663ea3e79dce2c3c54204e2aef1560844b445b0ccb";
+  sha512.doc = "9a7bc2a97548e91ca606cde3e832d75c4d8a5655619cad783822ffa237724e08e30d2284afee100f7f9ab3a51704f83d9a679877bf5269a34db1cc39cf3b1226";
+  sha512.source = "d046b212a1c810981452350530a7981174ac2bcbfd0ccc593f9eadf59722f262e5494065e0ecc0c487b6c55215e890f0b6411df0a6dd8dd44c8c31a29a62e2d3";
   hasRunfiles = true;
   version = "1.1";
 };
 "spectralsequences" = {
   stripPrefix = 0;
-  sha512.run = "265f3b341f5dd6b3c07edd8443d8861ec5ecff102e96e7c70cb1dc50d9cded6c88c29b16507e48fa0db6459f7dba5aaa7072ee97ff2d6d6920f269b21af6cf29";
-  sha512.doc = "6c744b899b457928d0f57911d5b59f011a439a7531141ed25fa4e6a8fa4a48651838145a4cb64ef2886429e598e895cbd6d968966f4c8bdd64eb4c59cd85a447";
+  sha512.run = "8f957adc0943e8d95fd315c2086e79c08ee52b3868de8b6022d6ea3e87417ee720acb7dffe6ceec1ef8d4c5c03cd752d5f70e84cb01dc6c0584d86ee891d28ae";
+  sha512.doc = "7c688ad705e19164d3fa36e9de366ea099b55b511536d69d5dde2930355f735df2b3385e435a11a1be4d9daac18fcae1cf745cb785fde901aa0b0e97170e6df8";
   hasRunfiles = true;
   version = "1.2.0";
 };
 "spelling" = {
   stripPrefix = 0;
-  sha512.run = "66386778428da99451410f58c2bda3ca8b39b9d3c0968be55444387baf35582f2127e5f7a49943f4e04e926346f16a518e3c50a783072198a459a9019a0e66c5";
-  sha512.doc = "3e88d464793a54c99b77292633371c247b85c45acb88ea55a35cb1374f970dffc6c0ab8f75fb80d53f3d4372beb45bd2c1a89d542224dc20a9d5576b7be44d0d";
+  sha512.run = "7b1329685e8b9f6af5ff42d364d538fc73fa86cc3999dd78ab14779a9b7ab799dcbd648ac6c9be37b58209738f6bc511afc9dc2638d4cd837bd70d5d6bb159b6";
+  sha512.doc = "9154c23cfe92fe0c084feae557e552c9bb4ac0e25bb6f3988ebaf63f99a9ef8a976d96a9fbd7e1332de9e5df4d9274e560bff801070a3bac2c827509f393ae2c";
   hasRunfiles = true;
   version = "0.41";
 };
 "sphack" = {
   stripPrefix = 0;
-  sha512.run = "8bcf5700215ae57f032725de18bfd7575663b454d6bab6385c1a91b2c881b0f53c0dae4f60b2c945a53510d84957839b936fd5ade46abf7e7e6ebae0a1a8b238";
-  sha512.doc = "0bf7ef8626b2867b13afb0da83298ef9da6df6221f0e21c9aa12c4de6b034a5a4b3787a24b11dd9d17726e90f15b853f61e6b9f83eba495901a9053b2de59e25";
+  sha512.run = "b062159c503351e404c86e8a5155c2ac918e65ad27d32f016c6c14af729d7a67ed58dda64337b9f0b0709e141d5fc8f789e915ee676878b4eb8c2d19acd1e4b6";
+  sha512.doc = "00b56adbcbb1f2fad92c77fd6bea562c70980cc0981f3365ae14682af504f8ff31b9b3b13db41612cf31d9ca959df89fdde00e64d15be33ac996a3c51f8aa08f";
   hasRunfiles = true;
 };
 "sphdthesis" = {
   stripPrefix = 0;
-  sha512.run = "dae58d45e62b20afd1788e023b81c7c7e75c0f83056ada105d3b4206770a4aca5631d54b0f73f7f28aa8da24e7a5af96a1289c40cd1620a1c3e6919a647ffad1";
-  sha512.doc = "6cdd2dbeeca0edc66afd34c7d3ca983df682059e9143a68005941547836d031fb1874498ea04cbc499d33004d8c5c43149df2333d2160c84b6878158b8592fbd";
+  sha512.run = "843b61f56e2229bf429f9645329021962759827cd93341edccfb4c1970bd6ee772107224c3ea5448b01f48830eeb4e9d67d9d73cc6a68fd551db713245ce1ea7";
+  sha512.doc = "2cc14b042f0bea47bafd4b1e2b7c25c8cff3795e91558a10e5e4bdc5f1f64887560413d83365a2ada788a3b898d3a5f8714747a4266211aa01e73098d27e25ed";
   hasRunfiles = true;
   version = "1.0";
 };
 "spie" = {
   stripPrefix = 0;
-  sha512.run = "afaf683e4898b211ccede796cfbb0b06bcc9406f02c3a044bbc760433be9750c16b378942226168d4ad4013ffe70607954e4a652298f5067627438cf5c1db83b";
-  sha512.doc = "1cfa033116f2dc6d6a62254f4c12ca2a18b41a7a93c5636c2801dcc77330af15750629e4aa0ad3b901b64c37763bc53b7fc86d4a99d36e2b2bd604bdaa3ad0bd";
+  sha512.run = "6bf648d460a1556552ac1ae8704db867c1f11baa97759b65c1d70e9411eb0c97c11e7b82a1ee8384d649fdfe8e98f7d584af4586cc9b23439e3c21a2237b1c7f";
+  sha512.doc = "b05e8119c5212978112a66072a8ee1d9c91c31771e89a93fd78e207db1986fa21d54e0e422672a713cc2ddc7fab181855dbfb841e39b15266ae3bf3d79bebd52";
   hasRunfiles = true;
   version = "3.25";
 };
 "splines" = {
   stripPrefix = 0;
-  sha512.run = "09bd20a47ba5eb104ae6895f405d8a26bc3fa589b894b241132bcbe96f8a331eccd28257a0a4acdfd93d80cf1fd656c858cc71f6c7a8baf27fb6a90b5ebbf302";
-  sha512.doc = "bb7ece0fd130223b2aa714512314a3592c6bd1ba6528a3f2657fb369f30b706d4c439c6faafdced6b926f2018d3e7b3000e2cdc4e743bc418e17ba3b1176e2f0";
-  sha512.source = "ff3ea5ff1485bb346cda9d0ed2360ed5f2e6672ef1a63934e92f60f8b2dfce67bd7581459d9f971be9490dc0eef7069f10cf1d928bda36a196537123dc519205";
+  sha512.run = "a03bbdd3236b8a73488299bc42d6e593a9c71013c9fa01b39e9c4ab039407982bf0456ad0066cf924cc33f0751b90b57140e656096ca51dda6993a9559f45d6d";
+  sha512.doc = "2c53654ac9a240bb3b1ac04fc74af67fff799056cdd9289ba57ff5b41359ef33648873695e9140f0535f1693f0fc79b94ebc9c2778a3cb083e64118bab5d3e64";
+  sha512.source = "ea2340950586e2c9dde051aeda1a6660799e581fbd10e54117e26da4856655503a0d5ce97d7cd057cbe4c7162b037907c4adaf7550ce58c53ab2d43a05e3c03c";
   hasRunfiles = true;
   version = "0.2";
 };
 "splitbib" = {
   stripPrefix = 0;
-  sha512.run = "66ed7d14b1aece3dc8abdd84944a82ddd72102166ffc19048df5feff7a0bec0d5aab7a439ccab0ea16bf2ff652593f3f42f4ed50a2a4474a1a8116313ea867e8";
-  sha512.doc = "3f12c7c1ad450463c7e521d2272172c99fb9a60fd60d83c93c95f7cd6385a8a947f12c7ae7ba4cb8ba36bacf42b6ee1128f587c534d5018de2048af2d6fe806a";
-  sha512.source = "0cd784aae14bd6404d6028dee461623b76759d9f58c9279a2b178dbcfca50b0e8ec9c56c1b88d3f68055ec598e01eb0e3d222421d1d29ba50231ac05bca6569a";
+  sha512.run = "7ba5746c0be7f159a41b41b917b40a7dcc57a0e4fc673ffd5d69df9f18ef990b6b1e44b802557012eb285155cf956409a18fa0b8a61eada892fc1e57cfc13871";
+  sha512.doc = "de42e83296f488e984ff0b5e840ea840a8c2310662c142378078070cb869634bb563d00770bbd98c23ec98afc808ea70759167a897fc2971d42244dd06a0fa15";
+  sha512.source = "da32e3df407f4326ffcc9ce0947eeb28be2aa5da87032538c2de75351300f846fa81d18cc47bfc845740ca7ebc82afba18116add1b8d8b90b3ec29b260f1906e";
   hasRunfiles = true;
   version = "1.17";
 };
 "splitindex" = {
-  sha512.run = "56389aeb34e2c4a3d4aaa7e2e1e9abc6d1c68b7dda2c5a02c171df56341f7244083fb409b207dd0c9d8c936d1b1f6b96aaa66e78095e696d1aa02ce02475fb25";
-  sha512.doc = "948194ad2eca2a388e7c4d401ab81b8519bcb93a94fb608a9e6a09753785f45d632900495e43d170354981da130ca4d8e2a77be46594de6db35c07179d1441bb";
-  sha512.source = "9544714e2ff9f06556f22bdb98dde2f7e16d5a601b40aa9d06cea103656a0bd94efe109adab918b8da96403449e3b31bdfb8fdb534e665e3fd1697bbd4c6bf68";
+  sha512.run = "9ad1b7fac522860c5dc313f4866d5d1b6a0537eec8116bea455a351d5c79f31779034f788fe3df34ecd669eeadf14299a78f7d3413b2fae72a7b02d3a4163d83";
+  sha512.doc = "a984763cbaa641c437fcfd14e57abbfd2c2e0539caf789f5c009fdd4fe6d3af899d031d9f36b88d3dbca365b358ad131bb21cceaeb1d0961e76a0311768b08c1";
+  sha512.source = "bab345d51cdf6029c9a04f66de22b9aa5f567e273e7159df4b0bd5da7f295d3aa7ba69c0c2119be85ccdcdf3bfc7a39d88ece9b3cd39f7ac07c645f1b4e8ff05";
   hasRunfiles = true;
   version = "1.2c";
 };
 "spot" = {
   stripPrefix = 0;
-  sha512.run = "15a57980848f0914db73b34618abc6f95c8f56742a32b49858f008e70b389c13378a47828d4e84d771d599bad77f269df080d69a4d31f107e7185d311eca7862";
-  sha512.doc = "224e0acb1b42f575a08576450ca8b7a49dfbe68ccf74ea760f7cc45eb547e1e48888ea83905e426d26b70fa344ca3161072910293861f51c2e7dbaf67b592693";
-  sha512.source = "2ba9a734f47455a4493644d465272f56864b674765c5b206c3b700d0b24a5da130a9fee8161706a373bf4fd2f19ff92a3883ca253dbef52c9dbd9b5fb9f0ddd1";
+  sha512.run = "6fdd7c2d745c06f06a39459c97fffa6b3f3638c739908cb89c742091c28136f00bb9b093d7fc6eee58fa8c4dc7a1cace6fb593adc4e80aea5f3740701600b326";
+  sha512.doc = "53eb67c1d1b65a08ba66ea4ecde5123bbd6365f5a51e7cf651870c192b79b92a2b86dab59e7874fe845ecd054eac921c500a67764d909ba281a577ad3c0dce19";
+  sha512.source = "8d06f19b777972d101461d01e4511f8b75d483901fc780ed572d94b8d2ec572806719101c7d30379e6fd5ef5cf973d85fa496a68dd08981bbe5bce1b57313aa2";
   hasRunfiles = true;
   version = "1.1";
 };
 "spotcolor" = {
   stripPrefix = 0;
-  sha512.run = "386bcf76dd8073c67c79336fcc74f9d583b32640bbd07b40ff6a8b6e96ffc684a0fce61fd856947d6d56b3dc2d73b437768ad1390063652bd858ad030009bcd1";
-  sha512.doc = "a0bd5d114c12942d11eb80837bd553df211ef240735abbc4f12b24a70f9d7cb5b62da3cab6c4ac089085140386690a91717057ede0dc65d3c4dfbf42382095dd";
+  sha512.run = "2f236d19de158e2aba063b5e26192fa0a2d3c3edef0395ebe40cf00d7794747c0fde05b863eaca87f37e5c746a6e19c7f664844ebf3b8664f169a16b9aa76905";
+  sha512.doc = "7d6cdde2ebfdbf56ce3251d1c4b05c5e3b1bc9e93fc11c66885d1a4e1300442e97e32e105b641342727a4b643526645bf71807fcca7029ad426eb6adeef5c781";
   hasRunfiles = true;
   version = "1.2";
 };
 "spreadtab" = {
   stripPrefix = 0;
-  sha512.run = "1daae505b7ee6ffa38d456e2b679a119f09e7dabc6329a7e20e810463d3146ec6a71019ecea1238795e19ec4ee6025da9e8d4a67b1de6134b11965f3f93d9749";
-  sha512.doc = "04903a0f787094e715eab5e6a47c65a100ebe785cb2333c0cecac6a13d8ff274c3cf30c76d1fce6797b97e7c942c0cafaca1e42e737e041ecff01455abc2625e";
+  sha512.run = "04d670f16644d6f01094f3382e703a469e113ed1c50d1cacd3bac8b57e2736960da9b7e9228d171fbb44d0f38cca0d64fb3db54d2f9b41fff74201b321bdf1d9";
+  sha512.doc = "639e08e674c4c82d4143184ed07c32501fbd10508d5c9b6d84278d549d966396214fa243961543d60eaee15856882fcf726a8e7fe0119f860acd20787d274b02";
   hasRunfiles = true;
   version = "0.4d";
 };
 "spverbatim" = {
   stripPrefix = 0;
-  sha512.run = "b13a79a16ac5137467c20b245f993dfff0469f79d1ad647f9aa2f090b19f609e864af688e6a6d7d0c6b74ff29abbb99b461284897d72988278feee8552d4d242";
-  sha512.doc = "6d14166c704e1402282322efc4e459bd4d7fe2f670f248b3c3a9f68e6e324c3fa0a6ee4d3f8cad085e02846b0f94b4346d51c6e466563b9c8123ce626e07cbe1";
-  sha512.source = "0217516343174f322b182877cf5c908b22232c697e6d3b34abe7ff2e290b6dcb74ebea9a64af87ceb5f46c5f35898464a817d8d517eae2a35b01b0736a998541";
+  sha512.run = "0de6b8f887bc5047a2c886d964016fb3f2e9b47fb3043be2515384663c2af0ef0a129ea6a09f5c47bb2ed0b102d8758f33273a451642b7e57c9fa1eaae2f4511";
+  sha512.doc = "3a67db65e548ae9a540cd80461ba3525a3a8c133ba079108f3551d94dc85f9bb7ea9b58e6db8dc73025e998d9bad5e1782073b113d45d235d6f3d0393f31ff3c";
+  sha512.source = "7482bbd365a43b9e7329888d996c5dc3820b885de4d5fed1cea000bbc5421f16f5f174f73f71a6f1bed3fc21f0e1f1f6080b9ac290d84dfbef52bda6b6e17fa8";
   hasRunfiles = true;
   version = "1.0";
 };
 "sr-vorl" = {
   stripPrefix = 0;
-  sha512.run = "780e64db96a7cb030569d854c4bc691e61ae9a8f221fa9d2dabd3c5509f4e5c78d89cb7a9f95b0c6f213d22545c960dc0a52105d54d585e553ef5c673a79cad7";
-  sha512.doc = "47c8fd065c66873a37441004d909a28c7d2cac609e3c2c295423a0420a7fcba06999c9295990ee2e005d544efcc2034a1c3a30bb131add9be7097d41e55c2a7c";
-  sha512.source = "591f14eb56460ae9810e8a35389313b4e4beebe756fdb547883caaaa0c53137b781c23adfd7b431d63771dace61b1213d85f44fa6e7843a6b1a695e2322e7af0";
+  sha512.run = "46b860301861c347c08e3ae49e20b1c45a4eb7d3e2afdfa425f9a9e43393409a346a6f9105151f1ba6c2fdb073a50b57b6a455648af50a1c19f26794b6a38132";
+  sha512.doc = "24a0d001b8c48dfbf6d9830e84a48ae9372b83ce4b87eecb550d222a9188605233676a8ba377c4d9449d5edecee0764faf236c1d96c11bbc58b23913be3ea328";
+  sha512.source = "5edee30cc48c9b55fb8f388fdfa0da24c16844ff0cf19675da615df7087dccd61f625c5f03100c0032c8cfc0441d740edd30858e6e935c266cd79e702ac0eb85";
   hasRunfiles = true;
   version = "1.1";
 };
 "srbook-mem" = {
   stripPrefix = 0;
-  sha512.run = "97daf469cded8ba9868bd5343434e8afc3009f1d358ef8b404dd97c0691495f4edff244b1f68682d45c834435fd39ab98fb218e143dd31bed2610afd1185dd83";
-  sha512.doc = "3e7cc030916f0d43ede04729fec833f7b1da4e00269bed9404b7fd34aa884fe09d7a8fb4214f28ff955b36087027ff8b278a4b179595ea91a4df08627a5243d4";
+  sha512.run = "42031993e075c8c20f30db2d4e166f000cda651227e8c6f4d54546de5209fc6cf2cb39c5484d925ac7e04de6f1bacdb5e2859219a8ac5f24f173e5d349f91910";
+  sha512.doc = "846600cd654e5ad43027cc264a94cfc9af790e9ad3d23157d098d1494e3579bd11b5faa7d6b745220aa57ba28e712281332b7eafa41ee6c193abb5af23297cba";
   hasRunfiles = true;
 };
 "srcltx" = {
   stripPrefix = 0;
-  sha512.run = "6bb3a6307cd58ae26c8cb7074879ee72fde8f7a680f7a8cc26eaf890a27ea25c0c5d9fc82dbc7d9074382303faeeca85012509b3679e5738f0fe95e6fbe05d1a";
-  sha512.doc = "9353c88ad3e52f32d8a0ae9d0823eedea21affb1a8f4f2216f2757a36628e9062d95dff4dd63a9dd08dae52a349903fde2c29ffb5b7774f60bec8b59eec128c9";
-  sha512.source = "e8b26b3c63caa17155fe31cd6a3aa492da9429261e04a86f1d2cd68b44b92403866175f14ababbd9d05e1111f7e6b5d73ed86fed4b0a843af0e6a90daff5b4e1";
+  sha512.run = "90e9b71af3780ecf95d40bf1634c0eca151f56b3f6e34e8025d85f325052028a4002ded679c42532f48d501144c207c64bb96ce1d8018f5748eab4d882b433a0";
+  sha512.doc = "2497eea30903463d4fb66e1d48df88ae87b87c0571c77e1894b3a09b1aab37ec97de5b5ce4ed49ef5ace354aed6e9d3b2842e7f2bfbd1dababc89b43acb81a1e";
+  sha512.source = "43662e9a7db4a19367b613814eb9fd4dc5d8d7d09f27f2afd7e9079eac7422d882d4fab0005eea4fa3d22ed49d93b713d86aa3c393b20a61fdbecd7f127e05ce";
   hasRunfiles = true;
   version = "1.6";
 };
 "srcredact" = {
-  sha512.run = "8f3c8ab3ddce951dd59dfe6a7ccc60be6023b5a33a780f7a2c9022496615ec1ad0229c325bd0af8ac3a2400fd548f3f46fe4542ff4ac220d545c3419bd753bc3";
-  sha512.doc = "fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16";
+  sha512.run = "3b8ffb1a36605aa054f4b3b07ad8f149813b5adf67562dcc0015c1f45b38fd0cfd561b2930b7cd89db40aef124ed77aa4ad3350fb3cd366adab0d3bde3ec65ce";
+  sha512.doc = "df2d83fc9849079a98f6062411d7ef7e500bc7dcba494ee8175377ac7f018c32bf53f69534578a8c0329f924026cd18986da23a8f35540494f4fc863c6c9e7ea";
   hasRunfiles = true;
   version = "1.0";
 };
 "sseq" = {
   stripPrefix = 0;
-  sha512.run = "961e7cf9f56fe47d13bf18b4d92da3a1f278bc69ae792155e9776a1bc1f69d2b5790f298829b4840c11a98bb1db4d29596f0a2803398f991f7ac2ac27d607522";
-  sha512.doc = "ced828b31868df711d7647f0e8fbb009fa03a6e1f362383e186e6d4daec01b9580c6d4386e0d8cc75229e376ab030d5d3daeab47b5ce6a6b5578a4f1ad152edb";
-  sha512.source = "88c6864197af5ef186d38e8e56af990afc09edbb10f615be35a7589b381908fde460b49c194705163b80b3d16f4ad57881b7fb208d680a90f4113b1a421b9611";
+  sha512.run = "2926bc833f76f998eff7c9eadcdbad2a439917873e007bea681a420656e7b716f806e409d9febc1326ea88438f471b7033a5cc73fb587f1598dfbbf958250d13";
+  sha512.doc = "7da492657d846acb4276f0546316038b99c723fbe66c529fb9b4d88435433361f8ef5335510c131c316a414cb2d11a96555ef021ad88f092146f8186379d45cb";
+  sha512.source = "c13a7298890ccecf743712b2bbd2acd360c38ad2cbd3e1ce134a06a429400a24fa2bdd1d01605202ae87668f8589f8ca9c614bec50ac82136d45ba11cb638300";
   hasRunfiles = true;
   version = "2.01";
 };
 "sslides" = {
   stripPrefix = 0;
-  sha512.run = "36769f421c3d1604abd2902410135d2cbad2ba8cb2b01bec5a21f6aceae6c9b0f5ed7202aa440ad91ae192797e37536b5bd05801cffa568c68d0fa73f22c983f";
-  sha512.doc = "1d28bc1a856715509b22f0fe50fd453bd15dfcccbeb08db44ec678e95b2c839da7b072540fae6102dad633de897395e71bd847a1e14b5a283cac0da2a5b75336";
+  sha512.run = "487339e103574180b68847a0d584eee06e59c93c01783c6c66f5885856ccb2df49e0808b8f165097ea30fd85b382801c4c8b347dc7d075d2e94bc7e9f4ba8f2b";
+  sha512.doc = "5ff112e47d866bbd816772242170225037e273304ea340e730613cd5a11d3ccfa4bd81e22cd95ee61cc2c494fe651b22992b55b5605eda9a3dd1809c9ae49c4b";
   hasRunfiles = true;
 };
 "stack" = {
   stripPrefix = 0;
-  sha512.run = "3d7ac08910b037cec30e34fcccaa922cb6d952164f4055eaf69dfe08915ab47c1dce71e1c0a2d04ae64fdd7a7ffb4687922e995173b2bf418655d061f08170bf";
-  sha512.source = "cf3fc3b7993b319e3afb5d11437f71444a838f83aed391b5eba8c34d4ce42bd6b58cd607733aa79c31c7752854d285953d391e5301f572b4be0d47067edcf9f2";
+  sha512.run = "a67616c4cc3a4624f054de844cc3d34f2fc762e0bcb3a899f16d928c712904a67e2cebbafc70cd13b4cf1d43864f8a60b110c9b75d7ad5a2f9b4f89fc9f4a819";
+  sha512.source = "07d3f857a5078ef7670c02fcf2ed75b689a8363839224516f990c135ddda992cbc9ed46fe842fbcbdf3f1977a0bc54cebc690bc97cd8a89f62da2c286049b474";
   hasRunfiles = true;
   version = "1.00";
 };
 "stackengine" = {
   stripPrefix = 0;
-  sha512.run = "1e9f97788a06961aa0eb04e9874cb0241b3dd7f175a7b2322ce3e3d13b92e4c8f1479cc9f88c9badf39f60f4758f800898a4d0f9716793151750d24e424c5707";
-  sha512.doc = "1e2a1638c149db181bb6b8c7e7c2cfd59a2b178c34fe8915ad0b05c4dcbd7122d2db798d2b012431684a01b3b286bf19d54fb755fea9a82a9a58d740af07af80";
+  sha512.run = "a97438b6eeda42feefdf024b50e0aa1bd62509a81ba8e789b365f95e82e323e9e1302c442cad8f85befbc228aa5546f74c68b741f16599f463a476515f211ec8";
+  sha512.doc = "bca4e157b28f17566d7bcc14113aa007ebb589c0feaaaadf2247e1ed6778233c997b4d565de410866e0ea8f72d281fb92f46c812f19d314563f32fcbdbbd6cdb";
   hasRunfiles = true;
   version = "4.01";
 };
 "stage" = {
   stripPrefix = 0;
-  sha512.run = "b31fc6d9d091eed88dd65ceb9fd1db1fcec622219cd3df1364922d151042fbb48a33808407f2ae2b72c50961422f5f2204b2fb54758ee4d893090d893677f053";
-  sha512.doc = "ac8da8b80f5f9b9b5f5c9e84862b3b4556a8516732affb9f6e75ad602e4339c7d9cd053f0a1c9d2b23c3f6ba19115a286571ba1bd027242f03d4428bc3ce5f04";
+  sha512.run = "81184ec086db9723ed26877effa199f7829c31b226398a4744ddaa023729c941d31e551b45ef8092dce019c2fad6ef28a1020b677cfcb52f581c37e329b05887";
+  sha512.doc = "acaf16f0f5b6d08cfde1c893e81ad74089bda1bdbab975c520b321dbe8c255c1594fc980155fc55ab603a5c543ac571c1a9dc7e18454c8de54b08555b1cd187d";
   hasRunfiles = true;
   version = "1.00";
 };
 "standalone" = {
   stripPrefix = 0;
-  sha512.run = "c2beaeda9621eeb6aee308f24ffe43e093c375bf65d3a0333d091859cd8246bf6a3611f8effbf2e595847834c7da613eb723754594747a2be72de92173b4af2f";
-  sha512.doc = "0ba7e52525aa5327294ecc1152b251997ba796c717f5d4f8832f4279d99f6bb11e4e5efa757a6fda622e5184d7125ee6b4b520d266b8d1b503af8409c03ea6f5";
-  sha512.source = "6008c0c30b4e92a1f39afe8d5009bfe67fca05a2163128773b160413b07770fcb8ef954a3bc9282ebbf61ed5985d735a1c3c6e78acbb381755dc06c0bd861a21";
+  sha512.run = "599fc0934d53eab3cb97bfed16317ebdd6f31b70e0016c3ce8c413752290319940a8793b0458abd58a2a2151f8f7156628b0a083f42a1fde73e0e7c666abbfcb";
+  sha512.doc = "d7b86ac37855a9f2471ded0bd3cd370d4e7e247b0bf8a5ff63aa44e6ff8648fc1a696e813e25871ca5e02cb364f4abeced6bfc40d2f1679e0d5a894ace0872b6";
+  sha512.source = "41a27055bf76047d986e44e8b9b582e217c3f347d3a1dccd8c20eb61abd423bfb234d1f5f8c2a1d907975b01cad37f850917de33cd4013ac36f610ff1c94b52c";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3a";
 };
 "stanli" = {
   stripPrefix = 0;
-  sha512.run = "0b1bd7520b556a44edc887fd47117731353c5f18c997869c772797495fffd8e222c2c160c099b02dd2177e7980bd6f0b5cfd68c1e985019e205ab28bc13c87d7";
-  sha512.doc = "9de91d9a4516cb25403c0307a5f6614a24297b5810620f6057622e4d4464ff8357a39746cea12eeec65a2744b6aa449dcea2fd1ed24953b0193290addec87a9b";
+  sha512.run = "1aeb9ba661234bd6b51465535733a37431f26a755c1671390bdb686ffe86a0e09f70e7ba46cc2147c41028b40c23d4a79550579de6054ee76147f6244a0668a3";
+  sha512.doc = "730f204c533c9ddd5b2ad1df32d46017e276cd3fe29d7361476d6a722c325d952ace1d14a210adbc33b1584c2765c5f429cd5eed66afc9f024ff4a7f334f4eb8";
   hasRunfiles = true;
   version = "3.0";
 };
 "starfont" = {
   stripPrefix = 0;
-  sha512.run = "e447f749fc51fc72719582fa5f270fb7967f9e013fc79dabcac6966712658398596ecfec90327d848245762d729d8be6ce52f98ba54a36f54dade5fde5e63832";
-  sha512.doc = "3a6a3c1cb8c712cca61dc638e013baa3245932c05aad13ab5ba60c13f0c9b490b851daa95d4d9415484e1c7bc173a06693897c6d61296f068839db4a05d4f7d8";
+  sha512.run = "979b32c84862e7f4c3c57ec23222589cd21d3ca7bba00c45e268977f20a4b7ffe6eb66fa44ef05172c47de7ef846ede91015d1cde43ee867c38c0aa19bf74ff4";
+  sha512.doc = "425d8bd16db28f54260579b9b8704c6a6417a52bba4d348f29f0cab001201c2944941e38ad079fc30b77584c1fb49cacb384e5ca7eafd5db69c7b2dd176c0028";
   hasRunfiles = true;
   version = "1.2";
 };
 "startex" = {
   stripPrefix = 0;
-  sha512.run = "f8d707f0791fa7d2edd2d94775b6ba398e335e84a8d09d889b4e34785ef1d7593d3830ac725d2371d0988a6475a512b6460e9404b8d19de9ea80288f2f203a72";
-  sha512.doc = "e73c7ccc7b523d0d1de25c11d8ea499eac57777063576c707e4e6ee0891cfa1ee22c13db61397c3d62d45e3b42b6c4f53d1fd8266c177c631852a1c2e7c565db";
-  sha512.source = "c6b35e3a484ae37a7811a665af811146df46278bc1711e7de65e9b2beffe0a49922ea26df6ba1fe57b835e371a5c3ac78b9e7dc741e822ec55605dcbbab84834";
+  sha512.run = "5df9424c8b3735efc287f4eee8ded1c79cf5121a1fe834494d0437f7dc9c04136d3d4e6c9d7bc1e66be973a8e1f4d1c9c1aab958551fcd20f578d263885794ac";
+  sha512.doc = "5ebd38171140df4d97331f3bc987b6edd8a5b32235ec573755651cb8514a06f6f97ef1772bcc8043a80d84ee51cb669d571a1a31815569c46960acae3cce6427";
+  sha512.source = "55df72d72aa4ed3973b00106dfb89cec16705209c37342f9a14875d01b3341209414cad3a1fc1b8c6573360ca668f0c36e7dd71663a07dba2521a81b4f667e60";
   hasRunfiles = true;
   version = "1.04";
 };
 "statex" = {
   stripPrefix = 0;
-  sha512.run = "30211a2476c780314b7d361284993d32ff4bb0bd4323747286456469f3298d2128e1f761886cc3cad424d1f3cdebdd71d082a45d00d60fb7727eac952dab5798";
-  sha512.doc = "aab7d12d50353a589bb77b45c8f5453fd723c0f55b40358a47d428e11050027372ced6f085c2c13194ba2daf878224af656b8414d443295e9c09f4996f06a9bf";
+  sha512.run = "df5b8537898b92ba263b01612bda4ab28283810e2b13f75ba708834bffe2ecdd96c9c4ab35c215904bae3d6a3f22734471524cb06cfadf5110a21b16e6e16c83";
+  sha512.doc = "c9284b1edc4e94c660fac6dd112a1a2996da0024e3a1c71a20b01d507296ca0f5a103e6076fe1674c16e324fef6e7ec6a7cc33bf65127066d449ffa0bc95ded2";
   hasRunfiles = true;
   version = "1.6";
 };
 "statex2" = {
   stripPrefix = 0;
-  sha512.run = "677cbc6f1c78f745a357d298f342275570d3c153677f7f9836b8f968c9c63b3a389c8d5b54f3bf0cf78fcd33a8fdcd1472d29ec05505f7cbaf2f8dde83f6bfc4";
-  sha512.doc = "6ecd0b9e17214d7bf0fff5fac81d2adf677aab2467ee9d0ccf3237bd07e11c234205eec0be8f6f6bf0938a124243af1530a9870358888357075ea5729453b3eb";
+  sha512.run = "d2bf5b1da4b5df042c81d5b6dfb0a37f37d62ee7feefc4ffb17326d01e4965b892ad71a39a8a0b5a3f1de33147c86b0a85895ee0dff47030171c811443885e19";
+  sha512.doc = "c5434dfc272a656020e2849e9ed3fda12121ca1c4c9a928ad6e77795e19b313a9ff77fff2f1f2056a1d3035103d1dc8d8dbbece97b63c34fa82314e2cfdbafa1";
   hasRunfiles = true;
   version = "2.1";
 };
+"statistics" = {
+  stripPrefix = 0;
+  sha512.run = "e5fe49a729fbaea2a85e394e58e78459d4238e45c74f56d277694a8c0dc4b9b088b814072c2e12cfe6d8248a4b4a89dbc072bf7e121b57776445a170be26171c";
+  sha512.doc = "a918e8c1962a20ed79e6c285820f9007a5873215f6408fe4aa482bec837f52af4fbc2b55266ab78c036b6da5dd5c656963870f366674e9a920e4126acb9bd459";
+  sha512.source = "e735fc3fcb4db1a25396d65b68014b38488cb9f5bb2ecb30c751c96d4e376249ac29d990c79465cab0c5a0f199ae22e13c53ea1b2ba40802874380a4fafee779";
+  hasRunfiles = true;
+  version = "2.0";
+};
 "statistik" = {
   stripPrefix = 0;
-  sha512.run = "1dc1e479a4eba775e4e5c8e51cce07f5485482cbebbb9b5f7810336a59120442ddb0bdaa5cb0320341982f05ae5463041aab962d8a4aea22458a838db17db324";
-  sha512.doc = "051e6bb37b093e9cae64a7cee5a6517e27fec826b45593f64de5888cc9635e117d8a551f1adf19b45f8eee877d65424648005bd8369ce4cc0323eff4709779c4";
-  sha512.source = "2f886072f030eee08ea44ceb84f5cc1ad21735516401927f5a6a7f7ca11044ca5eb132b94e9f7ecb288fee24ac70b1af005ba9e975aa8987ebbafa67af9501be";
+  sha512.run = "fb20d3b876618ccd5dc7cea70c4ad9fd80b9587c9fe916492268ae1ce8f539a07aa88bcd6367e7f396529555b8d121618a2287892471dcee4a2f825fe6e4dba3";
+  sha512.doc = "694df9bf436b53a0909da133ea581f10e64e441b00419c7b428848a52ecf8cedb878f6003527f74e95d33cd3b8f64d1008ad041843dcd1761fcfc557998bd62c";
+  sha512.source = "8f9e4dc7285cc86ffb6c570231861984906470e9297f6193594fbeebacb88a8ca97a05f9b8b955ae1ecfc8408dc08426adc16fcd85e4ffc5c12f6bc62f7c1303";
   hasRunfiles = true;
   version = "0.03";
 };
+"statmath" = {
+  stripPrefix = 0;
+  sha512.run = "11b5155a0aa5c6b516290cfef8d5bf86fa00da0fde18e774bed73ae4f66ae3ba6844fb31a2d3a8da6687c17115328e900878f1fd1feaeea1b31f50036a8fe9f9";
+  sha512.doc = "28420eafcac045d3ee0f2ef666ff43775eac020d50c490130aa2f85017781850e3066e41272ed7fd938baa6c7a7856fe352bf8df33b0fc9751f8fca6c20d0332";
+  sha512.source = "923135c2e7f3839ccb6c5ea4641054fab1f64084e2389a962dbc08117dafb89b96edb355940548ea8a6846d3d9797bd97917832bafb95f745cb021bb04b3ae73";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "staves" = {
   stripPrefix = 0;
-  sha512.run = "509b077b804ed13ab7cf445dc7171c2bbf93c08aa393479db4bce134e634d7ec42dddacaf4a4b95be6a6c808eced2184fa0fcea12102e041a1ff47d707e6af3c";
-  sha512.doc = "9ef795d934c51f161a366e7e90b3c2bec31a036721c72106a61f6e329c946acf0a4dd7dc0abfd922ad00164157ccc5351a075293bbcd38abcd23369bbe852207";
-  sha512.source = "95c4e94ce7310188544f31ff82ff6b9c649096c3195ff9ef7e9d903d17bad7ff92e35ac608e025eba6fbfea76774ac3b4de5f04b4d41081f31976c38c652ddee";
+  sha512.run = "15fc1c5170a6ec70bf2740e5b2b8580ed726f4a616830fc73a919c8a1fec6e3fd39788612ee37c9c20e3e67ced2824c6d0e93768b2dc54bd96259c4c3c9ce48b";
+  sha512.doc = "2bc0cb7294239ccdd14fc5f45fb0139269484623bccf4690d576de42965fabe872fce41a4de1af5d9ed7a534bc520aecc8f97835050b045a424f8cac5ebe0605";
+  sha512.source = "ee7a6d62ae35c5f2a1934c28eb0c999073e0fe3d697cc9fe900dea9244179276df7d3eaacd537771cb1c46ec38bf32cd1e4b21fa25bc64d2969f8c5eb36c6ed1";
   hasRunfiles = true;
 };
 "stdclsdv" = {
   stripPrefix = 0;
-  sha512.run = "99d65f3b8ca59ecb48afa5cfbecd4524044593c113018d9616c1e9ef32865be78ae1756cc2ec89430a6b51c73abcbb8144fcdbeb4546e22bf777aaed4190e193";
-  sha512.doc = "aa8feb5d9006443e2aa50e20efeab9c2c3950aca4e83eacfd378363cb8d52840a9c71a6a475f2d2ceac8aba7655b8b9fc28559188fcf41a04d7d77049208c6cc";
-  sha512.source = "89958937f3e2389a25fd11b7b20796cfb7ac7c5186d060c552061ee61ccf89490f25d1f12f842833c237b5bd62458cf1f382346610982efa1392251e945f9690";
+  sha512.run = "36b8a1e8ac6571778c942d8e11e6eb481a4e498606099c1c4bd54b57ff8a20a0b3d2366ecde89d3dd627b208b9c57d2951125c0ad0372552d42077a7614348e1";
+  sha512.doc = "600ec2df2bc645370ecf32cb6ee76dec222c522eac2b52928141c64ed47df75bf66634816bd7e9f4faac09d9a53b1a45d6c4cc99e421b2e4ead360b691ebf3bf";
+  sha512.source = "f24deb8c4aed887af5baf1cb155f475b4947f2fa5ac7bf5cdd89cf0ea315eb901fa534bc71a36bf200dd814bd2b9ce9b149e8c52f47d48002931b5f1e3e3e00f";
   hasRunfiles = true;
   version = "1.1a";
 };
 "stdpage" = {
   stripPrefix = 0;
-  sha512.run = "01d3ed06968feb61a89f0362194be8f777208b6a782eff27dade510526c64dd1a5c0e4aa3663490d5cbe04b7c7669f32b3808c49efce41b976fd3c60b40859f0";
-  sha512.doc = "1038d47bc03431740e77d779ffad11c4689a2948f1b7ce10e18c5e35381c5243a018afa3c090e16b942ce6fc757cc83a162014274bf967168fb9844cc63ebc04";
-  sha512.source = "b52ed4eb3ca09249f96148f753bde108e58c646513d557b2850c290bfe4bef82de0c8f28fcd215ba6f1dfb4063b1dd2caec4b0dd902068b4b15c412f562f442a";
+  sha512.run = "ebd8e13b5b75c14b6ee15d4b7c3702177b6f37125036636c47a1675ad5850740b8f536c7eadc3df000e63bf114a58dcb42cbd8de6139c8786a6b0c601faff572";
+  sha512.doc = "be07352e61f37a0d28fdd8e7edc390ec161bbc2208f4be7268225ac6662dd0edb118fa121a0fa1d999e8aaa3e44ff78549c8d5269b655e55d75784478fc5ea7f";
+  sha512.source = "0a64a702cb074bcc5f331573d6becae1a092d5348df408146f333140f132756972404980eae549f117f6da73c4aed5ad19df502a8dc133e5106f87c8ca86601f";
   hasRunfiles = true;
   version = "0.6";
 };
 "stealcaps" = {
   stripPrefix = 0;
-  sha512.run = "bcb6d84a1a4415a8ec344a8a9f5f3d9f3b6ccde5a11f86654209ffa01d0e61c06cc584f3fec8d68d4ab33e3f3e128900132de9e63a8f448e109fb713e8257ad2";
-  sha512.doc = "cfa87549cef1b5573ad3178f0a12d2e537b59645a7ffefa600af04de4ae25df7820e8a4c5ca4df7848e028f209a50d292ba8a3f460e7a75feed5f29b7963df41";
-  sha512.source = "1057841583ad3f0d32af19282b648762870733c55480b305d97fc6e2a62c666a34e0e08f2b0e6f98d49434a93df45f467041a1dd07f0a25f4422a4be83db8c7e";
+  sha512.run = "c1e61b161a18c7194fa824ca13d645546a8847e9a3e5f6661f96b188bab52aec001ddd1659e02b90e7052b4a1586a0fb0a67d7c0a303df5b025389958c36c4f3";
+  sha512.doc = "60cedced7bbc7ff53f7bd1b07fcb521ae311f9aabce00e14eafab0439163b1b11ac292704d03f4433eb7365181d6ccd10f5de6423f4adcfb277457f8899e71f8";
+  sha512.source = "33c1a228c67c060276e3d7d62b369556567d4365d0730a816ee99c3e59894eceb200279a464e5ce1fa7f248dd336a85d6ee7a94be15804d45d2415092ee708bc";
   hasRunfiles = true;
   version = "1.0";
 };
 "steinmetz" = {
   stripPrefix = 0;
-  sha512.run = "0b2b6b8f7452772f8958da69151f0b48b1546500d51dc86cfd0339ff37bf22083cb8621b52a52d6813d52c9559950d7a1023c55e9daf6ba41bdef4df6a1fa119";
-  sha512.doc = "59060d1dc80a79bd63698ff11b0aeeda29b877c0f599f7a94c312b54d9ad992059beee7bd9614f62906c617f43bc3ec9878c0a7d290e888d6cc74d071708459d";
-  sha512.source = "e7873e713033bddfbd7014077696ec7b87280346db312995a25fefabf5f857290757c10409fc2b858184d9998bbe06793efdd6151727d9d4ce234ae4a612af42";
+  sha512.run = "793fb6f3c11647fa3ec40154bae40dc6d479f11f5a3897866957ce60465ef2a3cdd9c22132ba0bb03b110355ca8cd668c74ff2de214792903bccc523e6ef7575";
+  sha512.doc = "0f14d677a5597c392cff9617ac6fc7560660b10ea47d1b1e184ea04d01ffa3cdf70472c066872bad221c7eade131f7a56e0f75dacd3f16720775898aba56cfb4";
+  sha512.source = "3007d5343758686145cc3c960234c1f9f553d76488e804d393bf56fd22694056c6b814fc80eaf292e2c85f52247a0c935a2eb16aba9ff5f6e81aacc72ea04417";
   hasRunfiles = true;
   version = "1.0";
 };
 "stellenbosch" = {
   stripPrefix = 0;
-  sha512.run = "62b5da7b149d0b6dd7916f1e4de68a8fb1043d81fc8b03875dfc2cdf8ca30cb6e21891213c3afb6c5a2b74b630f77804f1ab5f5c048241646b22112f0306e1e8";
-  sha512.doc = "f287f28e210511c88901a01b71b7ba1ca416fa55f27a9c489c302e1db5e348a33345ffd0efa6b8feca3d8d58234156f646877c72fcf4dc511048c772ffee62d0";
-  sha512.source = "96e4c720bc9065a0bfbac3f260791d6a67c1efc8b3ea762ac3bcf8658c7b492ce6cafb357e48d3612b7d2dd0fa380f442456ff743bcf4ce2f9d37aa631997467";
+  sha512.run = "b50034113084955cc712f03306ed369b1a6ba6bfe0072b9a754b77c923d7ee903cb09d1315391aaa15d7c98a32040ef0c1eebfa955ff677d5ee238a34561e15e";
+  sha512.doc = "5b5d27765cdcfc171ae9308be017af84c86133fdb00c349421be359da40fc3f4c8f03ac7e1a97894a2ac633239870e6fc546d3dc9b47d6fc7a8c09e308f48393";
+  sha512.source = "6df35b6c53d012a47684ad044fe0bbbccd472f37b557164f4a09d391d3f130b74b3a1f1c2856257a90e7ebe31b148ab7e8691bbadc499eb8474b0bf271cb4f73";
   hasRunfiles = true;
   version = "11a";
 };
 "stex" = {
   stripPrefix = 0;
-  sha512.run = "55c0845ad5034a88e00a6172e5f11a605d6a31db1bd7c917b1616e67a98802d94131077c1271bdb80a7b1e2a43d44cb4dd44f4e1a4dc4da5f6d452bc4a02d3d7";
-  sha512.doc = "1985d5d69416900ebd3423b286ce7b94acee3141d04eda9e61eccae892e1151cb381c941d036039e918fb2823c30f6c217d75122ad3a6490e41d0023ee66e828";
-  sha512.source = "963af75e163c1e8eaa2e9a033e50df59a5395d0512155d25326e57b457bd8fd7e318f911283d6948ae48b3f3606c9c0dc934cb0715c50b7761b44c91c17f607a";
+  sha512.run = "70f85f98b3427daa82583ee11b637d239b63595e3fa393f679f888c72be2b738eb8084fd7968935bf60ec135eac1bc6fec2047b7ecb193337a1052f991e10f61";
+  sha512.doc = "cb3e15ccbb8ce24be0d8621df709de14b8812342714fd36c16b7105289b61bd6c48c0a69865f5a9ebbc832272eb9d70429f04cd2618a82e79520877935e181ce";
+  sha512.source = "84699ffafd2a7b842afd664c21aafb4b75d91ebb8edf252e5810fb25aa48918866587ff5b1b955070df96e90e24cc5f990d52b0920037d7cd74594222d722dc3";
   hasRunfiles = true;
 };
+"stickstoo" = {
+  stripPrefix = 0;
+  sha512.run = "8649809e4e3039f8111eba390e4b372a5d19b3dc68ea2da7d030165cac764e7652b5509fb12c4d52e163704a257800efd5d265b08f11c14834876d5e80c3b109";
+  sha512.doc = "c9dd9db2ef724552ce4ad442a431c9fe40e622f383234740a6ac56ea54d347b45a23eefbcf3a993687b9d6c0ff6d74948af7ddfc8cf8879b7be0ec6d78277d29";
+  hasRunfiles = true;
+  version = "1.031";
+};
 "stix" = {
   stripPrefix = 0;
-  sha512.run = "dfb77dad10543eaf0fbaac476e7a8cb0335f8314f641660fbbbafafb15a96e15acd7b5fdce7d86c1c6d17a0b5808a1eb4de4e9ddb2c344c94bfb67e1d2fb3546";
-  sha512.doc = "3d284028644c99db4116e1973f0c949dfb1c767a4d207b007d5f4522c67f1498d45ccc98f9509b0936ec0931300680d5708b0fb7ae1cbe90abe7c0d5fa428b7b";
-  sha512.source = "18030a768332938e734b93bcdb486b8ae2846ac374b25dc17f79f6dcd7deac599073196d4ff1cb1acf6ad242393e3352d0f7a6a6a461e872dcc20146aff77695";
+  sha512.run = "526f96636d7458e1d90502a36811f6f5edcb47c35edc95b5bbfaeb8c4a2379ed5f5e5e6df07b633cd8c107c5bd295c4747d9aa1a47209e135bf83e53e3d4b398";
+  sha512.doc = "3072cdce210346c3a40b6eb0bee16b91c490e60eb718d99cf6d846bb9ccf175645023d8c3c2d95ca097b70b8eea807b33e479770f1ef16d5e2fe1781fb236f8a";
+  sha512.source = "45e8000e5ecc051af6fd9dcffd2e63c104116a595088834229c07f4f270e087f8bee732213da8caf1cb1eb0dc43170511c44100d1a74e2b4707d071245c51894";
   hasRunfiles = true;
-  version = "1.1.2";
+  version = "1.1.3";
+};
+"stix2-otf" = {
+  stripPrefix = 0;
+  sha512.run = "e43ed32e2dfece68e6e38cd542a664ab7054500b5de56b2c86bdd4f31a9620facb39798322af97b7dfcb37f84662606ee97b34506c107136755bc0495991218b";
+  sha512.doc = "4723db0b72d7b6104adada756c25f0dc63642b6f292c10e54d9e9740d046850946baa66a06662b009471717f7252fa591422b4bb425a6fe94daa0c966f8ef339";
+  hasRunfiles = true;
+  version = "2.0.0";
+};
+"stix2-type1" = {
+  stripPrefix = 0;
+  sha512.run = "55159de5e5294ae87cb217a51815333ebb16e48d8798e1488eadbc281dc155b37fc4cc917e54fb6d408e4c326717fef4ab8d0e6a607526b3850d54c9f439f492";
+  sha512.doc = "11d3d9e1e8aaf6cc3e6ff3d026add3fe3480a8582d0b4954d75bcf6ef6781f4710e5dfa2ef7984a870ac947644d941c449daac7977a340b19f7aa9ed155ca9d8";
+  sha512.source = "1a5662960c36cbbc3cd8a0fe06c32de4eb49b3e7c2f9922e03648b0a27640b643f5732a970c8f6e46066334fa54f6b66f68ecf7d8d2ac4f911715a9d3abf53cf";
+  hasRunfiles = true;
+  version = "2.0.0";
 };
 "stmaryrd" = {
   stripPrefix = 0;
-  sha512.run = "4a8b7c09bf65a1d3fc42bd61bf5f64af6df5bf000c3e1ae08c25d2e5df5723d7e4cbd84527f548ca81e4a3c181830656007a85cb70b683d146f6ca5060283f09";
-  sha512.doc = "efc4bb9c55bc7cc7e2c40b6ef722c639fa7f4c3d89de3423fdcff1cd79201996e3107b5ae0ad6169c84cb9bd0abeb089b8b00597b7943a1c2663e14630a10a87";
-  sha512.source = "b80b1ac2aaa7c4dfc78b02f684bd2d6cb87a688e9f1e8ef71471ca08c6f7d5869e084ff16d0cd79d51c054dfb9deadc7858ac70c5650100496d4efa2427a8173";
+  sha512.run = "3c0d67aefa6e10fb2875a690fab469a44fda3f245d4d2c9a0d1d0063984759cdac111b8d87982fd3d8b24ea82fb26600bbd2ec7ff18835606df3290ea7e5e886";
+  sha512.doc = "1b4904a3d623a66bf0b81e33a491fc53b2d89e3c48910adce996961375e5775010bda5900421a7dca1d3df26bab965d04b05eb6ea040e3d314f9fce6d1a9c218";
+  sha512.source = "5e623029e0e79897892b8d4bf9bfc37b16157908e624e80e9a1962b8ef848e74f9e916342dfa0822fdf3b5516cab86f19ea49b73404a0cc55b684d80af786718";
   hasRunfiles = true;
 };
 "storebox" = {
   stripPrefix = 0;
-  sha512.run = "025573c2b06e8cf1965e1eb8167c4346df682e0db96e17e8950d5f847d7cb8a9d4c4ff477979a938df11b5c3339f4dcf9f2277ccdfad406e8f4bdece2003c965";
-  sha512.doc = "14f2d7ff370a58529aa0925ce4f12ab401c3f04df113e93ca7c015cfa989ea00ac6d66bce0a367b2c838002d723c910f32bec32e08a58e7cc69ea6c5075c5a78";
-  sha512.source = "a306252014209ad8737d90627ff2fd6bf8716e9e35320772c7e3b3fe97143d4da5175287b894e10271cb05c4b04b9d2aaac514d59ed5361075a7b38fc89b5aed";
+  sha512.run = "5fbda79d0adf0a1dfeb8d99af26efceb647fac8d07555989b4cedb286fee61492a2c517833f39a746adebe32ab38529f26ee6a34eb91efefbdce7d302e364194";
+  sha512.doc = "15a6d1da8aa7d310f2e424ec55dfb4e200b1503951a00f04e8d09750c97ff90909b7aa253ca62c6fef124377ea9b4127dd4a0b963ce4a5abf78afecaefadbce0";
+  sha512.source = "61ba29c2b787d41b6b400b173ebe100111f55c1a88aaa1ea56407f0796d83a01a68ba23958d8b8d24466123f5d6f7532ea6a9b4efa32ebeebeb495274347d1d3";
   hasRunfiles = true;
   version = "1.3a";
 };
 "storecmd" = {
   stripPrefix = 0;
-  sha512.run = "fa6e17217f509b48b7ca460bdf8d5b0b6db084347d4ad43cb6f74800b3808c7686aa3a8f0b54a65fb43db7d61e08a21d0a72874dd615c2910854c15df078eb79";
-  sha512.doc = "2f39e4cdaa9de01cc07dea628b33b2a0c2f6acda2d04d4557bd634c32f9837c731ba9e6aa0de5c7d64cf3204f105e92b2ee9ac6247b4807ff7c4d6c15ca69fcb";
+  sha512.run = "882af655e2305834a5d79ef4a3d9e257969822940786e38afbeaab083bd87b61e167ce1ed6048cc75801d57d12e0e351f75ebee9be0d4dfe5112f6215e746d1f";
+  sha512.doc = "b328e72eb75471e98941033a83085d2c2b4beb78fdb78112dfe6f4b9b282d7bcea5e473bb73db8c80b76b5fa08e14e7d23f62777393c8fb211b23abb6b953bcf";
   hasRunfiles = true;
   version = "0.0.2";
 };
 "stringstrings" = {
   stripPrefix = 0;
-  sha512.run = "e1ad5fd5ecf8d75bb195b51c81d020c12d3a12025105ec4209fbad968ebd3e323e477438570de21ac30961036b625a8ff5fcf06a27b30bf33eb5071eb6f049e6";
-  sha512.doc = "8328d1ff45929d206a412d47fb85f8f8254d200eda40a729b9a8b8f170c740fc17e05362da8a2a63e49b1fa7f8ef468121d0be6c84e45c61b5c646dfc7b29d48";
-  sha512.source = "92c72e7b6b00abd8dcc3a3b7ea9e0dee7949dfb36b1d81c771fedb2d1286733be59c0f4644e0098c960596c5afac01387929009f73fa89e6f9ae2b2e0daaacf5";
+  sha512.run = "044a42e677d9bd425ed350f40a3fb1d419004c42dda56a152c13765530d49aa34d7cc80d1f2c7c6703338ebe2e0a526d3c043832436f3259b4a28bb6bcd8c068";
+  sha512.doc = "2d63d1a5064b7979da09623f30ccc414539b00a788baf1f107fd6ec8bc7104e5ee3fbb38f19ac0aad6c518b03b5f6d4e9dd4097214ed51ab7da5ea4b8374b8db";
+  sha512.source = "bd70fc77d5b2e64456463bdf89418456345fc0c20f5e1e85950c4d42f8c14886715d47686cce6816b011b48562be94aa9615fc9984c7eb8720aa4d1e6888760b";
   hasRunfiles = true;
   version = "1.23";
 };
+"structmech" = {
+  stripPrefix = 0;
+  sha512.run = "a759dadfdda5854c37ac7c3273af3cd83057ae2150b750747071c535a572ed605276cd1d9995aa23b8412f8fb51249ef7a50f63784cd3381afcb864f479de5cb";
+  sha512.doc = "9279f28424459bc687a2a5492924d529c7067240264bd8fc0844ceee2592369a6c0c099c2608eec7045cf27d0aa1ccd17083b0d03a7bb7709c55ebe0c3d62f63";
+  version = "1.0";
+};
 "struktex" = {
   stripPrefix = 0;
-  sha512.run = "9bcb1403a47c444f2a5731de83aa50301da7178fcc1639d4c80d68101bfa8fdb8cf192cd7a92ac96d7a48f767969c09f255b7e3a9e3de5cdfef433255c6b1500";
-  sha512.doc = "eabe84e7ea6a984bd437d620ac8e6967299df9f61ed519600fb5c912095b2a18c1ea2afb561b5a00546dbfc5773c113c82a7862d9271e24524f4b8c6d149dce2";
-  sha512.source = "af3c152de4d41605e67a66660a237e3f485232917cf950a17a0edc0a040e68fce05d4ba25ab1c3406633d71392b0e687b8ddc0f1a22f835d5261e5a172cef6ae";
+  sha512.run = "2c2a038d7525884f095df0ef177a26d0ae99549e4b61deb7fe6c125bd1d9db623f4d15863ae46334285ef0a3b54b865d30ed7e2fcf81bd74d3adc56515c2765b";
+  sha512.doc = "fd021b26565b651493941e75ce4ddddec23af39a8e12a8b04938453f0d6b9836fa9c1e9ef3888a5e1f69b94e8dbea6924e3ac896ded22873b50458f76be128aa";
+  sha512.source = "ac7a8b9b260d6089b9bc437b4c10601d9646afb8771aeea2f1d949d6ba9cc0cbab5f9cbb811aec7dc65b386fae90dfee2f9824b83b6aa7956041e320568093fe";
   hasRunfiles = true;
-  version = "2.2b-6";
+  version = "2.3c-0-g7d3fc5b";
 };
 "sttools" = {
   stripPrefix = 0;
-  sha512.run = "f3f694033029597e34c385ff9e2d2d0a17adcb4577ec8fc96fc906e07a1be25d04cd5c2646d221d88a6ffd7c031aaede634331753454ac501b0ab75e2e9ccfc9";
-  sha512.doc = "7526c2d3de8c9ba2f00585b7b560872d661a071b98ee4e7b45da137c0805cf8f84a4123e8f24c2985ba467064744ba0440bc83a8928807e10182da25d05befc1";
-  sha512.source = "f6324733bebd98a23a37528674effdb66ef970d16c6c561fb0a5cd252da0d4811a3fb18fac1830c9b26c9dbb2fda88e86bb5efa3b6cbbce2bdba3fed9b5b21ce";
+  sha512.run = "304e8bf849c234766c8fc200c6027a8ebed023c11a77c1091c5e8ecaa7ad8f5f9b22d126d84ccb814d440c9c737d1483225e68d7a1436ece4dc344202c55867d";
+  sha512.doc = "648bbfbc3606212c22f28d135a9ac1770c6a6aaf241273b4db7648ceb923eedf829fda455733666798fe2c51b91ca3988f758ae00520b823d8280ca5e8cfe022";
+  sha512.source = "9a87c6db7af113bf68419cca8cd27d8c1de0991cba96b2d27fe8fbd37018c8b4a094018165446dce575c95ec29cf85c8eec97492298403b8bce3f184236ec443";
   hasRunfiles = true;
   version = "2.0";
 };
 "stubs" = {
   stripPrefix = 0;
-  sha512.run = "b4f36384169eec8635cab440b5674cdd6e30fd26180e5523e489755e6718a0e0d213704ec8461fec7915f4fb34c173e2f6da5e18dd6873a3e7a2853b32b1c123";
-  sha512.doc = "f0c59adab932464695c638a8179b1dcb8321c58c91261e2efd5e6187c16ae3b771e98e4cb136d2a226f74413c4b73ead901093bbabfa129702eec7195045965c";
+  sha512.run = "3282529ac0a07cef0088ecc46dd74a5dd4ea50fa2664131bc4368ac0b59aba515eeff04310e7f4c0d656f9e30ea0f4e13f6f637f51b9f8ff16167d2996d135a7";
+  sha512.doc = "0f9fb5849a4c2e44e712ca2ad5d4834b902c1c1fa610bb26f7f8bfe98c09fa5dda4b2786ad79225a697299542c59d5ea49e323b93c6145d6acc7ae379896675e";
   hasRunfiles = true;
   version = "0.1.1";
 };
 "studenthandouts" = {
   stripPrefix = 0;
-  sha512.run = "db44f7f8593730789bc2e36cfcdb702ac8cfce54e012a8c4b29903b918aa01f36ac8632cde124e901382605b0ba9f2016615147cca094fa709b644b442bb406e";
-  sha512.doc = "b50001964a934f829388caa81db195ea03203e3e36f96a9d5c29723100c02ae02d4745485963d3109ac6c791c7dadc7c059d3ba8a90f9aab8ae43749aaf90c4d";
+  sha512.run = "6a0c05d2e87f023d213ceae35c0e2202a08b032567831cad828e51cc28a7125a771810ad5996a710440785d6a8776ad4290071b114ae23d03b7c0d9633bf0b4f";
+  sha512.doc = "5d2c842443f43c8452a789398cc526aff5b22ead9b4940000afd64f1b2f27a1db46b8d47cb2e0867df501c63f968654c3fcb324f0e882b358e7e5344ebbb45ec";
   hasRunfiles = true;
   version = "1.0";
 };
 "sty2dtx" = {
-  sha512.run = "fdddd11a11cc0361cb8efc9eb0de8a56ddaeb81d1894b6f614c5998f27d9867874bedb5bcf4244ad09c025c729588b51bb6ddd482e5777749fe299af3ca8c736";
-  sha512.doc = "0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10";
+  sha512.run = "a85b16ea69c410dc44a167b15a0b362d8f8137c278e4c62b18009395347594c956517c3ca578dbeedeb8564c79cec82b4056dd64bd4a212bd9edbaa1d444f6f4";
+  sha512.doc = "aa2b3e7ede27a3793edac52a9468639b152dc3a309730611f3c3aab3997d14f9f7f980a077c96fc610b8eb514f99e900017791e4bc68c59d7d14db2f0bffce91";
   hasRunfiles = true;
   version = "2.3";
 };
 "suanpan" = {
   stripPrefix = 0;
-  sha512.run = "2c9fa1b23908e0b3e8504b0eb5bc97da04e21dc9f770da6dace26a8430ca00264dcf6b65b2c885851fe65ca178a36791a742c93abd4d472047da271141f76e6c";
-  sha512.doc = "efbe834e32f771a56a73b0b795d37f00136db9a428cfd4099a51f89fcfde1dcb4610c23516ed3e0d0a5b0d7b8d4393f80f226eac32e2ccc52bb42608975474f2";
+  sha512.run = "8199a96b44988f1307f43e5bceff313a2ff595aac1b473853a9856be579824a111c50ff9f88cc90f81063759ea65a016a9f08d53d07e8396aa319ec98c1fcd4c";
+  sha512.doc = "6b85bed44ed5ef4760f046a3f012b978cfa2e304190de327691b4eb5fd41207cd2af3ec8dd94c50ace73784a5f2df1c5b0401b6c09c7b06afff79f21e9e86dbf";
   hasRunfiles = true;
 };
 "subdepth" = {
   stripPrefix = 0;
-  sha512.run = "63f66b9b58f5fbd6635233bc1439d422db89e0253ecc9c55e05887e0084377aaa228fc16b2463abcbee7d655b8d73f4af63baaaab90035646b8dc125213d664d";
-  sha512.doc = "2faf5ba18359f45c958cb58e2ee99a17fda24941f3b0f4ee4cee9ee996f64a1cda78accd4b9da76315f1af8132d99d3ec9121621e3654a33f247318770b71e1b";
-  sha512.source = "ec2df51edc4b0a05ef99f8d5a57c8196c8e6f00c56b9f08bff189f9790f262fe0a64d310d87d866e9cfdc154cac04067b846d824928ca53724fc564c83eda48b";
+  sha512.run = "a4f464acc985e1f3f98daa1c049ec0d5538b2fbcbee3263201114a4ed9a37f44ffc36f4208eb4950bbfa4c8fea21b572c107abff82ab56a4f3b8e4716bc592b6";
+  sha512.doc = "579bb024c0a764d7af182c736cac453ea5d828309497fe3a1306e9ba98c25eeba90f6f838cd1b9654ebc9bad38104878147c3ec5f01b501fc500c606c822a63c";
+  sha512.source = "5ceeae5a954ed5208f6e7967de7338351a45b983a94023af9c4045f4fe80d24cdcc3a79617e141f063e51893f6b653a7d0d4a1d3d95bfd20be96bc6e81663793";
   hasRunfiles = true;
   version = "0.1";
 };
 "subeqn" = {
   stripPrefix = 0;
-  sha512.run = "6f983b16056c0246d42b1a91d4ab2c6638f4231d192fd9c7ac5b0ce9c6a3863787fb484c04ec1ece3a064f2af6b4a7cf94e77849c02c61171b42914b1f5032f0";
-  sha512.doc = "c83b1d4a6e107323c878c00d84de5d9c417a559a9b0d78483bc57be91533c0b91c7c50c5b515f317d43d12cbe8bf9652876e949c94d3765246d2cf35457581a1";
-  sha512.source = "84cfef10644432dd349edae639c88670832b1497d721545bfa5a1734699a815522ef81c796113f8a9caf95ebffe73c864b7e98879740b543746609272ef21371";
+  sha512.run = "6810e482077f3f5e18c84ba554280ace286d254219e0e85ef0255a33d48fd931fef7edd3e5e9ad6dc893645900dbf0771a6fe6c54eb40a7da7020f5a655ce091";
+  sha512.doc = "2dab3daba553c8b5f5ad7560439c5e07ef376a5266e0b1e903eac5c2513fa3e267dde73599d739d9a095d2fa5426bcf8868c774c1aaf20d1bbda0da23cf64f07";
+  sha512.source = "d418d7d86a9501822d54c1765fb11c90b2e59c7cea1a44de18bcd079b501653b58dc10d43c7b75709fc664c8ed824fba004919ee1d15d4be2465f13b4feb2682";
   hasRunfiles = true;
   version = "2.0b";
 };
 "subeqnarray" = {
   stripPrefix = 0;
-  sha512.run = "0fd7493cf7986942a6942ec8bb3772eafa65518336e73c18b012e9d32b8d13e678ea8241485c0f6c7cd68a52d36e7ffdaeafa1ada446c0b741de4e6f00260947";
-  sha512.doc = "86e0babfdce0de43c332dc3d5fd40841ffd0438645ddbd6d3bee45b6dcd33d7deb280c9b203b5231a7d219c16e6f845f6c8dc0159acee29d525d0df3a217fa4e";
-  sha512.source = "efc7a844569367fd233104bc99108b95110360280babd50459f8b72adefbdd5da731dd419d08eca6faa0ff0ab6d24d3bc59d33ad3d4952c0f2f53af0199da794";
+  sha512.run = "f68acb4fb6888c503c2c98221b9e6eb74c2a437a7b2e91b871f300990ecad4ba38d541650615991660b02d3cdbe4480049e824cb8a17ee8f7862140f5c009eca";
+  sha512.doc = "79a311f2bcc3c707084eee67e0f4b4282682809e0321fbb9b8948ab97d2a93448f631b1b7dd3a85bb4d7843439d34d000c933460fa2e76c7f434472c4a7dcb04";
+  sha512.source = "fbc81e56d0c9fc61be00e1dcc0605e0ef34c7b3486ecf147823c4a7e43c62ea3a639851eaef31e5d5e2de6835761587c83467d7a3910fa749b7b0f45b110f763";
   hasRunfiles = true;
   version = "2.1c";
 };
 "subfig" = {
   stripPrefix = 0;
-  sha512.run = "51176d5929630569025ecf2817e8034c248e009eb1d5485a1fb62c1065a46c303cbc60be188dd42f39dda82a0dd80b7d857768391f4741ac30ceac49fef886c6";
-  sha512.doc = "17376b8f1b2468d67867dbcbcb0dee16294f25051edbefefcb31ba255555515be4ea6137e875b28a0af7f298ecf5f4aeb49c17485da151e85ce201c6549973c0";
-  sha512.source = "c9b99f88150049907e351396e6f6914b940c87201025b07cd6cc07a99b5a0f4a6fd720d1c4ef8c60e44a611920e8d8b371422a4c3399412a25cac330054aeac9";
+  sha512.run = "ad38fe7784dbbd52270a44ecf7495bbf42f2e93a8e6a73189bd9c49c3c4220266e1f71c3ae62603ec1d7a216c1011e204abc2ffc1640c903c98a91d6eddf4c4f";
+  sha512.doc = "7662ef8853fbfa06a32da6755516f1cc45f5e55171c497d10cee7e3d7531d956724ff212decaedf4f45da488282e59182a30a5c5923a85a4e58514bfc2561e1f";
+  sha512.source = "48edaba19b095684c6798454d853fc786e48b134dff7641dba5fb68336918992c911ec33de02d5da805d0a525842d0fa95ac5ce296ffe1000cac0e8af921cda5";
   hasRunfiles = true;
   version = "1.3";
 };
 "subfigmat" = {
   stripPrefix = 0;
-  sha512.run = "5af353fdb88c58fd14e8bccb78f430c45069c6c4d7b3c2ec974e77329217c92f5b01fe3d549a55c78e70602952e320e01b527f6a888b3165476ed442454518fb";
-  sha512.doc = "d0416dfdae2eb2c56fe55bdfb2013be212d40506a4daf8f5f87aced70b8d071a53eb8bc0a9c55031dbd2939873134d47281d0a5d90145b5a9f5deb429f6260e1";
+  sha512.run = "4bf27196b198a7b8074e5b6dd3f771c80ac31c7c71eadbbfac58abb5450240976ca7f98f6852d3a1b416144ad4e73cf7a377914ea83ba624dcbc30c0c2d849e4";
+  sha512.doc = "17398fb604d3d45d0f93bb392c78b2cb0d7bb08d0a23d5cfeda5f5a7116ae8825beb1d3548dda66f40fdabd70cf5690a97a40966cc600db551774b7b7178dca4";
   hasRunfiles = true;
   version = "1.0";
 };
 "subfigure" = {
   stripPrefix = 0;
-  sha512.run = "355b338faba52fb291eb0ce744144f3ffcea262f2b7dbb4657fea5a7a7b0249f246a49208b9343eb9e0ecb47bc4715acda708d345932980c58f52b99a7df018a";
-  sha512.doc = "238639051f78867e1702800db0a39503104c4784dc006932b185f9cfbc12a4c5c686fe0848cf907c0d0f9ff06d655967217662ad82b036b72521fa491b6bdf9f";
-  sha512.source = "7bf0258e4be48f07a0803ac2ef8c2b9e660a8625553f9fef66ae98f5a6d6aec703c423b6eebafcf45db770b13a697bd3f9a71def6aa0b0f2dcf12c1d4c34c61f";
+  sha512.run = "e536798e5cb322a80c861485e3c0ee0b4322042cb6c806dd68b57037c4b23c6737a18bd8b3792c8a76ada7fc393077895cb497f2a1003c451049e74dbb3924eb";
+  sha512.doc = "c5f8a3c23d1c4e7dd9d84bbe6b2304f310779f7e856a42e7322f74398a961dceeb87037a6f83aeede53bfd4e6c7d9dda043e810f3bc4b26da85c32754f0f05fb";
+  sha512.source = "1d81d4b508fda79b95cc22755b7d2a0e45fdba5fe4596a93789b21ff0fca2d1751b0314548e1c6c019eeb65a036128f6d3532ceefe671938507766b816f44642";
   hasRunfiles = true;
   version = "2.1.5";
 };
 "subfiles" = {
   stripPrefix = 0;
-  sha512.run = "a940579cc3846b91cad09d659cf6b9e29e015e5b93964e48b48b4feb836da73fa3abdc8af0dee0f1f1c6b1501e502c7d2609a448af3f6bf6aca62aa54e249f99";
-  sha512.doc = "73f9a8c9d3b0734ccdb0c70e03387069906bd4cd10a862b4c31db743afdcfb8a6afe9f09a90152a8113bcdaa5ec94f60cfeff624cb07852870e4a17e6e727b2c";
-  sha512.source = "3fcbf107ac2a0b1e957a0ec4894f9d06108e011a2b4aa6646ea91361278dd08f19fc808daf2ff191a64530d3fe13eef0469391b67f95eec25de7c76d9e204869";
+  sha512.run = "bce3972400535736b306fe1d87e10b79dfe26675ad18ef272a91d1046e91302bebc1413bffe11785780eb7379a0daaf4d12cd64954d803a6c1c220a213a334cf";
+  sha512.doc = "73a923c6bdd7901b1d77b64c33905f78613cf9c32dd85b2639db6ae6d43d4918405ff27e02eb36ea26443055aa31beb3075f2ae27e891110229dce2f59baee9c";
+  sha512.source = "5f01c63aa2112a2b94cbffe8452976126f0a44cec0523dca39ad022515f06a35e95b1e43bf61c30a974ac50d3252e46b2db1bdc4ab9cc1729c11375e95cb015f";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "subfloat" = {
   stripPrefix = 0;
-  sha512.run = "787cfe19648357cddddd73fd33e514eca3196601f242950902c3aa5d22b42874ec533e1d79702b722e5161bf375b23dbcf472e7070c47228e865de0329f4d2f5";
-  sha512.doc = "5e2a3fd82661a97f998f01d26c0993fe439e63f28080dbd3c3895d295db0e2e6eddea9d750e7b19e3189998eede99ac4ba2795d6d8a55b256d92c796a5f0671d";
-  sha512.source = "140a05f98ef03142e6675596afb2f3312a31163356e5deddcdd2488632a25c71f73d157810e5f7561c7a03c0bbfa4f9719358e4c6e257a544e0c53af0355f93a";
+  sha512.run = "60a9c3ec854c48d929e36d207f06846fc6057ae1fd33ae4a131d3b77d21f7c60f4bedf51763753ace394018960d2ab2eeb35911857a6e297d3a8c67c514ec461";
+  sha512.doc = "bd9a58fd90ad37ae9cd4deb6e2cef80bc5e2c047501e27214663c8fa6ebab530c74d4a2ecb73ef9b72bb67ef4598c54a23804f8121570bc131ce1f1cb914a67d";
+  sha512.source = "935f88144a69247bbc6ac4e21f5ed6c9b372ec420efabce8f3216bf87178114b07d1de536a7ba19242db647f35ca7a7ee0505688e22dbdfa121d3149506e6cea";
   hasRunfiles = true;
   version = "2.14";
 };
 "substances" = {
   stripPrefix = 0;
-  sha512.run = "723232a74b22eaa4229cb9e2ce036e7f3958155beda5058be0290ef951e7e9a42498da1485b7466cf699ce885833a258795a61feeb003cd11f851cf61c7665fe";
-  sha512.doc = "93e3137a6125842944d90c4c84fd3764d08e7e84474db9b8170013d80035855374540a5bb3060be645774cb647344815bac472a2647f5c32d212732409bf17dd";
+  sha512.run = "e11ba3bdb0c79253c62b7d5efe90d445ff4c47486cc0077f0d4fee3dc62c708f596fb2110ff266c04aae3b04ff5c35f40a08b6b5a43a03b990d05cd6d3e19682";
+  sha512.doc = "456a7c0b4d4be1c2cc44e6387d431bf31d53e983b232e3fa60973f035e80816fa74b96521670479872c854fc0b16b222bb8965480d0205bec02c2f6ff4e8d350";
   hasRunfiles = true;
   version = "0.2a";
 };
 "substitutefont" = {
   stripPrefix = 0;
-  sha512.run = "3c52efbfdc6dcb3c2365b9c56f55815cfc186323dd0dc370fe9a3996213e955f260c619aaf7c44a8d79808dc7f265d53b58d82d46e76dc18c5e408dbf78a5ce1";
-  sha512.doc = "473b37f13a66aac66dfcccb6adf6aed5b3eeb7bec21977faea402617cbbee6b89706e27297a343af9048f12fbf37c31dd3c8ef0b7f047f1dc329d44953f4a097";
+  sha512.run = "5f3eb640783115e28fe644362f6b4028388d8dad242dbdb43c0ce7e4ce6921527070d571f2972fe1ea2175b7786f213c6ef749496f19f2c27c9e8dae79eaf4c0";
+  sha512.doc = "479050e2a2860109d0e1b2aeea673a43e8e2fa6277aa91eb23c656ece50ec052b45f9bc3adf7d931fe67e9e5e85a956b40a9317d02c6d953f3d0220789526b53";
   hasRunfiles = true;
   version = "0.1.4";
 };
 "substr" = {
   stripPrefix = 0;
-  sha512.run = "5eecd9de72bbf841c992ad11b430261b4b1d7c6654654f7889f0f13bf30c74e4ba15a40af0fdf8a4e621e2e8ff5c725fce3391f5c7487895c91bffe039516d18";
-  sha512.doc = "f23f2e92a53f56ec60fdde1347b040d7f3641e57bbc76dd059e7a8a2cf534956c7856a9182716cdd90a2460018a2d5ad2cdf569e7a8132c1cf7d723bbdb10aae";
+  sha512.run = "2ebeff35f974e032dc20f07c61d4c3dbaffb61909884dca791520f9b204e12fc5d7a16bb96c8ca76832e48de31c25ab02fb8aaa2ad6de3b58aed89647bba4a43";
+  sha512.doc = "d005ecb9f9c90f178f68f2de2394ef4f1265abb831c4b679a9ddd03d9792b814c1c383beaecf3bfb76e4f85e73916bc386fcbe4e7d73917751a9b1a975265ab9";
   hasRunfiles = true;
   version = "1.2";
 };
 "subsupscripts" = {
   stripPrefix = 0;
-  sha512.run = "02d7d1964822c72333c5d5367b7d4961e51b095796e0446eaddf52349c315b84100772c12a7ed2a6f68a38c70de5d549171fb691a453c52a3f2b7c810f012a68";
-  sha512.doc = "768964084ebc34c1f3aefc6581ef2f93dde43f7cf5f028e63e005ea1b36f05ada8a10112a7377f5ad4b293bc1d902186c378fba50540be713ee7ddf302217d06";
+  sha512.run = "3abe5681a0aa05cd9872f564b1b97da28382f60002464ec9c7d167ba9289bc09ee6a74096c687bbc4b0f51004ee3fe51c5cc7a2e23f7a5bc3737fc8e8f39c75f";
+  sha512.doc = "1cad042a0c5ca08fd17e9f9318e26ac0f8847310df8e14f0f4195df8d39146763714073efd51e1dda3b7ff44ce12f2d9f76eb6e62e01a93af5cad1f9b60d9bd9";
   hasRunfiles = true;
   version = "1.0";
 };
 "sudoku" = {
   stripPrefix = 0;
-  sha512.run = "520910ea894f8498aea01d6028aa51b606f0055a9b58e572d2f12708a1fea188838e070918a82a375bacb5452ce7d23721ccd118edb16261a4526364cf987e3e";
-  sha512.doc = "ce2d8e03582898987c843201456c689f0be85c9ff70d5fa1a29070ededd5ac4c4b0d2b9f6e1be87f4e5b7dba71c2f1bcef97aafe391db5bbab065a0e00704c22";
-  sha512.source = "a944bd3a0b632111317155ffe8b79d7807e314ecafb7690affd982e710496893421ddf1395cb7f6f3d89ce0b4b1b60f0a7f739d0547159c20c2be19a795051d6";
+  sha512.run = "e59789ad8af410520ce0817144c477d8dc64ccffd76c27feb9474e3d9a5a3ec83474543a9dd3a61c684cb8982e0e71349d07c18836e5756d4e04d797fb6a093f";
+  sha512.doc = "983f6f7ba74963abed5f95a1ff8632b6ce4b4cbe636228c729856babba4882da0140d0c895c990598d837ed653c46dbe88378cc45d17631e6e175b0c287096b1";
+  sha512.source = "cce32bcdde07c820584a4ccc8b67965f4c7b46ee602d96219b599910c8ba71b02c5497d82f9b011768d7970abb994524ce8f004bbe462d0751ea4b8f9a1ff784";
   hasRunfiles = true;
   version = "1.0";
 };
 "sudokubundle" = {
   stripPrefix = 0;
-  sha512.run = "4eb4ad8e3ddf360a1717817cff71757c22cedd9105de45dccf885a2ac39623510154d4ec6cd90bb2723d32b70b600381be3de25d30e42184ffa341036c591e20";
-  sha512.doc = "07d69530b91dd8bd53b0a87b3c19103194b9dc339081ed4b91944b89542e9c29f3f33239ee49d37df7985500d7d84723f4378276097f8aa7242133dce5d2d60c";
-  sha512.source = "334d7166431cbea62e768536cf5f5aaf27a90743e046f74fc1f306ee6dbe24bc334c3f2bd329b42098e94204960ea0b8595739dccc569115a71427e69b2f852c";
+  sha512.run = "a8de67fda97042211f758c32179feeaa4258e098f316f5655a616c3992148b27683139fc59b34693859a87272214c125509ec5c693ff7ba3a02b4ea132ab0f91";
+  sha512.doc = "64d28b4daecd5b0e85da96a0bf7d6dade26a74cfe13b68069af80cd9ff5279610650954e683691cf3ee2992b4a8812a6d9f1699beaec957b5a9f4f7e6932fcbe";
+  sha512.source = "0403491075ee3975af6b61347cce331a44cfa93a25de3a96607e0d7904b79703b3d01e7d0972e31bbb5573dc5ee246ab7e918ea02f53b5c68b2fd75e1aa62c06";
   hasRunfiles = true;
   version = "1.0a";
 };
 "suftesi" = {
   stripPrefix = 0;
-  sha512.run = "b1e018b664b419d4e0a056e3412e39ce2ae841601a0cbd060e668fb910103330e99840dcd078e2ef69c7685a3b006acdcaa0a0bc101a22c0f4486c26b4a474b1";
-  sha512.doc = "b30400b35b1c282691fa99328d5a040f5eafc6644557557be2e05ab9b92487ccdaf7b9f8cf2ddba3753dfcfd10636b1f0cbe406f4d7e84ada62df696f53b0602";
-  sha512.source = "350355c766ceaf794b25b2d3efa03c514b8b22ddd87104d3b7388f3e96f6d75d69c70569f8f07c898d8c13efa4bd2e5a648ffd6693619c7b734366498ac782ca";
+  sha512.run = "25d5af29d7d0257b4f5c76f3eed0a203980c37f3f6cdcafa4e9b768f93a4a53713eee11f2a64a5e62530e27faad53c6456f415c6ac67d0701c651fa55bfd49c7";
+  sha512.doc = "4fc6f2d164e6e6ef23d101e1de1590f1985e1fd539b5aa9ef543b26dc9a5ec880bbf863521dbe0d3a2ccace05b7a285182e9ca8ce7edbd7c86cf4283d40e6a64";
+  sha512.source = "765a6814468a558d9a2cd960e82c4124604e86c6d4b6836dcfeff53527b638caa7022d3c143834007dc2eba3d4f786b9f23c14da91d9f849aae07f55b5774b07";
   hasRunfiles = true;
   version = "2.9";
 };
 "sugconf" = {
   stripPrefix = 0;
-  sha512.run = "4d72ff975a28778550ba344a2c98b2de365f26a728a83ffd77d54ca9fc65a624748f6885f8d3f3964dacbd1d8d23c537068c5080cdc8aa881a6cf568598d1022";
-  sha512.doc = "8a07eb993979aa5b9f0899d5b3ac2806fb137efb2c0e3c9a6e0356f42fc91f7cc0c32aa00d4e1ea8779de811bb1b13276b007de7a1d8a40dbd92ac3936315530";
+  sha512.run = "f3df85e2d7443eaefc6e2ee21c5861554ffdde29fb308388e1ac7d04081700d0f60b6492d636f84485740489c98e0bfcce7057fce95f0ed60e63dd4a591718fc";
+  sha512.doc = "cf4a58ca823c64106adcfd418e21306811f27991a0d09f0d2074ec55595fe2e04e4f490b041d0862b33a8a22e7cf3e93cd49de500b4aa870925aeb4d4340a8a7";
   hasRunfiles = true;
 };
 "superiors" = {
   stripPrefix = 0;
-  sha512.run = "eb59a1ddf092173fc3c21732436a0d8c524cd727fd0ae5efd676a72d36686aef0dffa0893ef158b10c736567cb9a1773f387242c65e20405a74b11c2f68ddae5";
-  sha512.doc = "2ecba61e2bb9334bf3f7441b4d5a6e2cc5a35465380dde112d9b4d9c5efc74fbeecf48e0866fbcffc400d76c8aada7522abb94cb891443b68ec23a1ef063b1a8";
+  sha512.run = "3cd1612b070800212183f13751e5900e9c9c14ab58e8c604e28fcf31f17648140f751757fde69e6693e44001956b191fe1f8b0f3250a435f1ff061b3abc9f842";
+  sha512.doc = "f2a8504178a6cdd0f4b4d82a01969d3f04f303f34a287d4a1906eb09ced08461280658665dc303ef3686e33457678289c11b85081e124649fdf9ee3e484bf8df";
   hasRunfiles = true;
   version = "1.05";
 };
 "supertabular" = {
   stripPrefix = 0;
-  sha512.run = "bee7de98ea7252caf24280e037243b8440babb96f53e2fa524301178f128cb9cc68860e0806308d40dff121bfb98fdb381a331b9dc7dd375d47a6aac800694aa";
-  sha512.doc = "092a2dca021a1952a31266d65f2f395822394460e7305089069d3cf19ef632eac9ec4a70212bbb41a3ad0ea69892edfea29d07eafb1ea248340368094d51c598";
-  sha512.source = "1dbc3b8bfe926bfb3bf5c6099b474f22cffcc059a7e5f143bfcdb4deac0e9918ffd6c6e607174fc0d23aa3168d2cf787f3e204dc929e33a0fe48addccdad290f";
+  sha512.run = "91719d2afa4187e5bcdfc16326d4d496ef631b2dafbc2c780e338f2dde2508db38e1626d363cf7f19f93dd707804472aa6e60bec4450498f30713aa7264200f2";
+  sha512.doc = "a9101fbabf683f09bb434fd5b5ddf10b5801355da16698e0d7e3fcd78c8f12645c016ed91b26a35d451a8f1cdc015e30193402ff2b946065354821ffee6735d2";
+  sha512.source = "2c3540457b4d30ec30304dfc0661eb4319497d01934c96d885e19f1176996e2ccbff3dba873e98fe29496fb95b51f6ed16dcd2907a41e419bf6490a390b2f9f3";
   hasRunfiles = true;
-  version = "4.1a";
+  version = "4.1e";
 };
 "susy" = {
   stripPrefix = 0;
-  sha512.run = "3481d6cc2358c754c744f08c0a02d4229bfe3cd56ffc2387ef27a29f6492f465bf1972fc09f43918534d0bc91353a89fe5b70890249782239fa679bed445787f";
-  sha512.doc = "70e6b30e41c10cec6d2c19796c892db3b1496e15168ba2d0407c36f42fe7d8a213c560511ec5aa763056497af4efe0ac78f71b6cdc90b34c1759cf266265d40c";
+  sha512.run = "dbea3a827d0d8a1d451dfb86883de88e66d36edcd6c5f5f281780f45622bf9215d49ac8242cb26d132c91f7120df1b0c1f19b24bed9389a687486d1aa3ad423e";
+  sha512.doc = "45c6049bf2cb3457aa8a1b4390d78e660c56c330cf4b393922c0ccc405803d5e1c9a6be1f80c562949e67f3dcbed6eb7384d12e5a6d7feeb6ade4d181e6716b1";
   hasRunfiles = true;
 };
 "svg" = {
   stripPrefix = 0;
-  sha512.run = "5f3aeeb73cc15a2fa4f77b9195039b32f3f898c625c578cdb18d4a2ffcaf1ec1d7777bb984ebc6d75e692661451669d2211694146db99b208c4cbc7d21281097";
-  sha512.doc = "f017a157b0a906e7163451507667f1b591d617f52f1102d18751affd7911cfc3cf1684b92628d5c53aafb90d96a4ea15954306720cb553eb1df64e7a729a8060";
-  sha512.source = "7116ca538d4204a26f05dc8687dd9ad12f9f287a01cd5ad70c8a1c50955cbe0f181c35a3fe767eec6d3493e64c474079e7da8b14a9cd00cbec0c41ab9befae26";
+  sha512.run = "a7a9cd0f8e47dfa5e2ffb0596ecda0ee70eb4f26ab5ea32aa88bafe0f91ff969b8ee937f66392602e48f78e54938bd7fe778e141f24be2fab265234409cda440";
+  sha512.doc = "b503b87668a4f37cb173abc5c7fe665137cae491f65f62d7141022773eadc58f8db474a19d52323922548bce4e1e99a3d8febedc614193a5fe239b47f3020f14";
+  sha512.source = "a1c757f51eb11d723c0695d8c1ee90c34202026d1d14665f6dc52c73682a0566ab3832a8e5b8777892bc112757f1899915d2c55b846e82a7bd63b0ac61503e72";
   hasRunfiles = true;
   version = "2.01";
 };
 "svg-inkscape" = {
   stripPrefix = 0;
-  sha512.run = "f65f7eb1d44d03357d8ad6d2174fb4d80127d83a97db9832167c51e8ed3528eb9f157ad7b1668655bc2f07cd47d5527ae0f6d60d5dd8073da6ec1accab91ff1b";
-  sha512.doc = "0c056161bde899e4dde0b3edf5015d7da69dcd55f86fbb1a83f6665f2497125fb3593adda154ed3bbc97b11e822b29806032b496c2f1ebbd6b2ef2f629baa2fc";
+  sha512.run = "3aed995c7ccb8b53d509106edb59a2d46f8b4ad1cd54d7e08447c1f0aae8a0c2791940a5d2cb9a253ed9afa01dbffc2a21b992d06940488a3f39dde5e091d280";
+  sha512.doc = "8bc7b3b68f6630a979a93a2066a98febae945dcc8c9f4400091753bcbdf699aaadd15cf1acee50f7f21f284f62ab49a7834381feca43a23b2a67cc2baa508efd";
 };
 "svgcolor" = {
   stripPrefix = 0;
-  sha512.run = "bb2654c515a46ac3bca69fb04cd131a760b82309839bab153686085097d0b4d91378dc098f9606a802b4ad577d15363b9c0c31620be81120dcd74926a9a8ebc4";
-  sha512.doc = "056fa6b92158ce5bcb299b3ede5bfe640e756a3bd1dc78fc1c38eb309be01a65345e4fbd862f66bf364bc735d7e0e6264de1a9b2fdae27311d37ea41bc66ee0c";
+  sha512.run = "69715744abc5f4665fd6150b1ea2b1d766b8fbbf212cccbcd697ebd1cf4fe97575bff008338c9b5f6bbc309130bd3d5b6393f760929c081ca3a03bc716968453";
+  sha512.doc = "cdf9e76951cc6f2ba3551df21ea70a5675b83da99176722b96b81c72239d525035fa5dd3646decd72ff33bed63066adf96a3399c892e1599b9f3356f92145af8";
   hasRunfiles = true;
   version = "1.0";
 };
 "svn" = {
   stripPrefix = 0;
-  sha512.run = "79758be2073d1749d398527dbfa4e037b31b74f45f080fc46dcfcc18939b6eaf3a85715ecc3d0374ed7d52749ad5f4211090cc74921c429e34fa2df747d99934";
-  sha512.doc = "120616c7da240a1f44daf2aa4fcff5a91c29ff48767a91d90c912169f942ec6c40c3e40197696961a4526a56d0117f4fa43ff6bae2a103fdbcf5113ab400f31f";
-  sha512.source = "50c23937831438b4ed809e2b8d78865fce129fa5964f75fada0c41ed0f03b8b143c1b1a067e81ae9bef887585efcf4ab2760b9c30fe7e20c79cd2c39dbb75a92";
+  sha512.run = "5c6daf41bdb04b3420cd108f1f4660330ef5d6e7a79cbcd2e9fca96740bf3f61c6cecdbc93072181d79c20ba4ef0413d831383e94b1845c19e11ee77ace39d82";
+  sha512.doc = "ffd72cd7d402683d8d59c95997620f3571800f4bebd0ec8792ea0d8975f1295451cb18929fb1972a449ce7bff8efd12575f345ee3909d3eb5a67a1146aa1da5e";
+  sha512.source = "b0536c1e973a1e67e5a2df5dd462e651c4cdcdccba25a21743b9884a5d18616de88f969918cecc8b23571ef3de11b45b3781e97f6e9158a791537ce78a5efe93";
   hasRunfiles = true;
   version = "43";
 };
 "svn-multi" = {
-  sha512.run = "98884196bd167362478b5b7c267edf632d18ce17e2e537d77f80d4bdd69cb20ae0f302987c596fa2c41504183ea3fc9f22369f552a462f0f75f27160c301fc15";
-  sha512.doc = "4663b47c515f77230f5f61c9095782dd9a773fe57919be969dcbe9855dba3a7d1588d79f5616602814cf596f9f37d424732218b1c8dc9299b4498f3711a2bc15";
-  sha512.source = "b57add07f951d36d7f6854e49a15e3b1143abfb4d43c5427b811c003e56f7819c92a8502b2c6d6a3969dd655ba61e209aca46952ccd8f3f649b68a9968e754fe";
+  sha512.run = "f3a0f3bbc627ffda1456ea6afa6345940fbb0d3310309debfeeaee06f65320e1050e9133bcf15c104111c85913638b44b1e023fb24491c6731045cdfa7543049";
+  sha512.doc = "3f053a4ce166b1e2d72c9841985269bafbefe9492049f98e8f625302ca2d8f7a7d824efcbc5e3ec8b31375a72c00ff86f7b634836bd996881cf14cbc6d97246b";
+  sha512.source = "43187f8f229e97159a45a8fee8bab3bb8ad31dc7aa129e9ba5be20c94600d29e62334f10b2ae36c90042e2ae5e040e868312484641d52f4b73bf2427d8bb360f";
   hasRunfiles = true;
   version = "2.4d";
 };
 "svn-prov" = {
   stripPrefix = 0;
-  sha512.run = "938233c612ee195fa05304c964bc5c1d80ef0086674039795f8dcfc3e06db5503e5567e339fd0d9ae12e91e34588072d0c0f81c629e59ba5ceb547c0c5fea2c7";
-  sha512.doc = "fbfb64e9572a2879473b810d32ef9fafe913af94213c03e9ae810907c47ca387810538273c9ed405397516c00fc4f553c4b120784ce0308762dd86b6539b7b2a";
-  sha512.source = "846ea514fbe4be125536fc77fc8e20ce1bedd989809f4ae7423405937daf4fa776e9935385facf01d2e534a7d1e0cfe155f699484e9be5bb87083196d3f1cbb1";
+  sha512.run = "65500d9f2163c31886b0da87e4b696a3ff0f7c6324dd3b55365fb3decaf3c6b26f09ebeea7fcc89c9712d943b1155954a018c24fc557cfe2f639086a9cb5bc16";
+  sha512.doc = "5467790439685fb92f653328016725488dc7ed4eb722d1eca7dd88973a08a51bb1d631ab24f99a70a13e63844e08106b60de955bfc90c512192aefa5e75c9cfc";
+  sha512.source = "6d4686b3d026dfe0e9bf2c779871e5ac5e3eb499d6b18a56948d26af19d2587eb87890dd7abdea459093fb4610316d2a569d9bd8f8afdfbb2f3a7ff002925e9d";
   hasRunfiles = true;
   version = "3.1862";
 };
 "svninfo" = {
   stripPrefix = 0;
-  sha512.run = "509691837aa0863a186a5acec4e08877e57240638efcdba037c740d9cfd9f93e1bc348d2b5a40a6c5c05178d1ea0991a6209e0f97e8cda06967d0465aebb92f4";
-  sha512.doc = "29ce8c76167ef07f6d7879efe99aae4bea6a37b77a16330ce247a31d64889dd707a69d7e6bac811895c7a1e535c199c2f727cf48d2ce2eed901bccd1be57d8da";
-  sha512.source = "aaee0351c29e617b2ae7bdabd027508acedc39bda646d2b1c111dcd201ac202f3d673e67f5741a5814b5bc27e13e3709ad7ddfd6e1b8afb30aa3528ed432eef2";
+  sha512.run = "c82013869a45e7168dc48e6fabaa343c4600a1156eedb651e382c77bd65dcbbdbc0c47222884bf6e6a1c4a7f014e89c1528ff0dbafcabac17269c81b95a82247";
+  sha512.doc = "6862165228b6b1e1136e826a23096e03ebd285e2e885721bc9da07403edb41572512e3c2a2147cbda828185cbe1275cec3d809738f7c6b7fd81cdc12bd5e51db";
+  sha512.source = "0460910f68d83793b8e277c9ce88da585ca28b3e1ad10fdb11d39dc7ee53126aeca44636a95616f3e342458c273cd4fb66483f50f2f31ac0dde87ce180ac924f";
   hasRunfiles = true;
   version = "0.7.4";
 };
 "svrsymbols" = {
   stripPrefix = 0;
-  sha512.run = "58c182e6b6fb8ee97a9009ade4f5de54a0a0f28d29450aea86147d421d0f166f9b36e4517b297db29889369872441799842284e0a2b79a4221f59af577f549fd";
-  sha512.doc = "859771bb7903d31f4e092936453703911bb23312cfe13f30e2e1d41fb227a4643b0e6f0071d5db911dcafb9562721fd92e645162de04ac3bea4b6c135ceec63d";
-  sha512.source = "61add401b79875560d53175b74f2616302ca4770fe912dd79234e1f5b870ed2ba18d330e88bcf12a04f0c5bdebcdee1e6f9ac3b0e62742f90edc1ea1c32a6d50";
+  sha512.run = "37da34983d6f8d375094718fcb164558cc0cb381e47adf47511c49edde906b2292c9f60ce1addcf7b0570cbeaa33534317ae44ac1494b1bacda3b4d883f636b9";
+  sha512.doc = "141ca4987161eb24e9e2338c5e6f4f9bbd022715aa937bcc55021767fabc43a694ae6f869f4693219c2c9e47be30af39ad2d874d7adedf8e1abf567b2b14aeb2";
+  sha512.source = "0f708706c11117df69ea09413e4b23899de3d9995114d3021b52ce5d3c23aa039396139b8bfa9d1c3a517160032a32942a44ddc8ee2cf9c6b7c4361cee7f7151";
   hasRunfiles = true;
   version = "2.0a";
 };
 "swebib" = {
   stripPrefix = 0;
-  sha512.run = "90a97b5273090c6d7776a869be5d11a73e1db69d63c9eb4d48beffb92cf09e9b52c4a48ec9943d0fbf9892f95c4f630177da056e2e690e47558f7a74336d501a";
-  sha512.doc = "b7387c6f7051088cb6706153247a1c7681a25809420bebe217870cffb9492d990a1c2340b92cc5e246edd2cb33d54d0a7b11cc0f41609b5c8ac074089a2e98ad";
+  sha512.run = "3796cf2148aa57c841c36b1d655d4b0fdadc713ad8c65b4eb131cd571dad29b52aa115c343eb73405fbb16f1a8d6e8eb652aff6e34b05d0c9c95700e112d115e";
+  sha512.doc = "5b4b5877ba30f9642feaa105e466aadbccbb2dfc1ecc691ddcc7c700109dc0caa93d977f373f1b3428145ee7f02fefdb8c3ad3b37f671d36e1ef4becf820d036";
   hasRunfiles = true;
 };
 "swimgraf" = {
   stripPrefix = 0;
-  sha512.run = "0e30e5b041e6bd000fdd0e14a669ad92c0b9eebfcdaa17001743b2b71c0bad94154c355cda2a9c72c581ab3d43e9bdf82686fdd58e497e3d68cba92eb6fc5779";
-  sha512.doc = "1ce4044a5218bdab23153e863fc41ce8b6857710bcce0b758369bec2cf06d7aef1fa862b42e50aa2d342224562b2aed2e56f50068fe58a23325172350f9349e0";
+  sha512.run = "0793102bb0c04fe27aaad2e882b04f80b1e496dd747708d9dc7baeb037d94abbcc3c908d1719bb9d372a8c5932b836c5ddd66153378907afc43e3ec477aa9e62";
+  sha512.doc = "25b5a0292187102f74d821f8eea3d34d643756f90cad9256e008d07a7bada86926eab8dfe667c29ff970bd64edb177ce8540ddc2cb29f29bd31117bd04bd53f5";
   hasRunfiles = true;
 };
 "syllogism" = {
   stripPrefix = 0;
-  sha512.run = "0db08e932a138fc87307e48b411d21e9019533f023b54fce93468cb34a0f16d47e2e5933261bd7a0f5d951a56a92975c13786b4d1a17ce65cb2819c2b7527a25";
-  sha512.doc = "93b9a6fbf996b324aa3e6a3061a3aaff0ad786b91f48ebf80789f366cb06490151ecc539aa7f0e93ec7b13e6b9e862d6dc846307b560bddfebf0b682076c499d";
+  sha512.run = "a822ee5507f7b3fa41a4f338de2668afb094640a62f972296b5bef295e74d68118d75933245e22ff4aea5625b314bce18a57da31c5bd6a04050c1c25da668d94";
+  sha512.doc = "cab0677870328ff02b552a7dc7eb401aaac32a3dd927d72285ec1a884b720a8de1e009e4bc0454df0bd264f54b95ea45fa888d1a64339537ea8c31335f92c3f0";
   hasRunfiles = true;
   version = "1.2";
 };
 "symbol" = {
   stripPrefix = 0;
-  sha512.run = "449fa8d65db5694ad0fcdefa15db4b0e795f3a0467549932b5cdbf6b1e7c602c2895ac177411a81c9f215da7def46de8618e4d170a17d617c36b9f1d2d4a7571";
+  sha512.run = "6998e58f859b94825bdcf1c783eaee7935cdf5dd94b83a45e3c3de6d56317d674fbc53b370b3695f0729dbd869dc8ae00c51bcc63fdece7386c87bbd2581adb8";
   hasRunfiles = true;
 };
 "sympytexpackage" = {
   stripPrefix = 0;
-  sha512.run = "d220eec30d31d8cc60aa82050c97deb0138be9a6cb70deceaa75708078e213cc4a0dfc881cbb58996b877ae657dfa26401cf007ce29217af7ab03810c2dc1e9a";
-  sha512.doc = "38919aa0e4875c07c9f42c95239184ccdbef46865161621db7643d8c348623f8250c9181c2a93a18f1633ad01386b1abf8b1be8bd6b1568b37861246f9f38d96";
-  sha512.source = "927461233fa6ccc7a268136cc6cb2061f056da2992e11e70a5c52f0b6f58a807e5c5818f2968ea7ab83173a046b7b685932c81ba62ff9bd3738c225dde3f0cf1";
+  sha512.run = "b4c8f87f57aed463e8c518846dba32a189de8b75c3992e257ae4e3aea92e703b9d175a10503a1588ac58f0e0d5740247768f84eba3ac9c34983e6ed019baa698";
+  sha512.doc = "ae20ee5f1712b46ff2072aa6b3f139179bdde10199afd1ebe44aa0600948dff7c6e174be00f7a51a6711dfdc23831618f3b61f0f434aee348bff22266a106881";
+  sha512.source = "675a253288308b51c54042747984eda3115384ac997173dd910bd515f2f62f1dddb2fe3e9bd83af8332eea8bfe3d2a3e27f5691f3f8ed5eff7fb32fd93c3f37e";
   hasRunfiles = true;
   version = "0.3";
 };
 "synctex" = {
-  sha512.run = "3d550c694b5fea7042b9f278906b66668045a61c48219dbe1d53c27a1cdd697802c5aa3c707df28bc30d58771cc893f45d157a061491ffbacf11e568dcbcf43d";
-  sha512.doc = "7b7ce1dd5e0a90f7299b48097233b51121ffddfbc5640c82ab66c2195bad7e022023023d0bb81ec912e8e896bd084ba1ffd28e5390f63daeb361ba08900232d2";
+  sha512.run = "e3589ecd11871d949c3526eebb150e4d7e812aebcc9ab4a3476083418b138003ef4cb2486148fde55fb2fae194244c3ba37d9b6d85f48ed8c71ef778fa30744f";
+  sha512.doc = "10c3e6b125bde957321a18810c7163f98fafbca7b4715fa777e8381a16eda20000be671c67e71f6aeb18c24d804fe6fa4b905ba7ac9f7ae5c168f1db4f605af1";
 };
 "synproof" = {
   stripPrefix = 0;
-  sha512.run = "edca9046a03cade758ac9c6cc29b43e2276277b9ad4fc69f60904229c6ad94f3ae974ecdf7e09f1eb70a8c71b568ab8ef43dc9a4062a4807a7564b5fd60f73f1";
-  sha512.doc = "41c4a2cb4c4611199ea56a26bc6e068f588f8e99a7313d2796fbea13810b8cf9c6279bd143af709e487eb22a6646d7694673556a9f30660c20e367bea6f1bef7";
+  sha512.run = "202425dd18fdcd5f3f128c54c101e48fc2319c65aa8604a35daf9548d886c866359c561d1bf22fdcb2bf3d5dc8613e2ad47713a80bd68b064f7a1ca4ac62e9ea";
+  sha512.doc = "0a0625620f1f2f9ec34039c1bb02e89ffd8eb145f70131f6398162968948c3cd78932a6f647fe42cf94bd06fd803b9ffd55627ffcdb3b736785102978c474d91";
   hasRunfiles = true;
   version = "1.0";
 };
 "syntax" = {
   stripPrefix = 0;
-  sha512.run = "cefbb6eeb28787579567a9fec9bc9e672958d774ae31f9a1299d0945cccfbfb9b1647aff753774bb272677b3e31264556eaba976159c2cd7beea6c02d33de83d";
-  sha512.doc = "638e7c7eb539156aaba27b95f8ebd76c441529e956186b0ca7fcd50c838ef4fd7d4ae9c8fd61683e9e378f83358a707dae27c1779baa13aa8bb70d694c33ee59";
+  sha512.run = "e6d02e538cc8ba623fc56bcc86cc77f430cda6e2b8956ae8d6f600f41553591874b5d2dc1429c7a077e23c5f58f9e877056e818da4dbf55b99e39a0120344eaf";
+  sha512.doc = "a7238f8a7e673bb5beee6bddd92eda4a7fc052f82d85ce6aef3158accade9511e6253555c0a7f6520d5fde8d164bbcf2c078142510ec5c341a0a70cf93d66335";
   hasRunfiles = true;
 };
 "syntrace" = {
   stripPrefix = 0;
-  sha512.run = "0b6aee6c03e58911fe714532fc9d2557a3a243507d8a49cc26fdb72b8f37a08ed2155654dfd57464ad76eec62e3f0b6a537ecb04324d6be619da74ecf50e4ee3";
-  sha512.doc = "9734b2822acca6eb4e29530a29bdb1612038633846e75638596e55448ed0760ffcca949f0f6eaa7a31554b7852edc598f618b6e3e3f595cba9b55a751cef113e";
-  sha512.source = "b508d9c2e161d75552ff90a3c5590cbf1ca1bb44933b74cb39ea4cfcb0119433ab39ea5126f6c3b895ae0b47806f2d64ec26291aefd51b510b58226b6472eaf8";
+  sha512.run = "e0f6885186bec22d6a0f36c308d9ed4a948584439c3ffe2e2c05bf15624d6480169c932290aed6346c0538495371c5e074fa17e2e05d4a8dbaadf97e90cd7438";
+  sha512.doc = "3732c1b976690dc617cc548de59ff8d4fb19968dbaa705cbc04867e551a562dec6dc7ca710dd933c349ec73627e00e4c80e92d93a115a44dfbcee177409c921a";
+  sha512.source = "73df8375cb1669790fd5eee086f7722ec9d9ec55893923f18c76c5ee8cb97e206cefee1a722119a9c148b148e3ca9d095f717f2c290f7c5889648a921e2285fb";
   hasRunfiles = true;
   version = "1.1";
 };
 "synttree" = {
   stripPrefix = 0;
-  sha512.run = "4d8b89dfe8cfa5ae1b5b9a8cfe47d6f54e8f9dbbf41ca085115436bfcbb40f80c75dd904a3aba1e1dd2d50b37dd6d576c891bd66c33d450efb76c8488fc42be2";
-  sha512.doc = "fa8a7f42dfb395668246e9619aedec66967e4621fb3ed8f5861db1c062521e302d6df8706297511e922af2d40f4732f27fbb79a1429a1c9cc0377d9f870bd451";
-  sha512.source = "0a7a3c185297678807790e97a63e93ab192bb829d82fcd910662a6c5a985a522b6bf66b2aba0bc30f7032a3895267105031982d3d8cfc21683d1b923a77c5f07";
+  sha512.run = "3ad716f31a28a16de8661db756ea51c6f13a487f39db9023bc5f7327f60fda82a8a7179755bd0019d3c4c720bbd96b08e01947c4d2af6e82ec328e6d1b680b5c";
+  sha512.doc = "855d8b19dff9473d97a03e05d1e32acc59be52eae0dfd39ffb7f2f1a418e3dbdb0339b530081151645dd0183f80ee8b9f681f1f005a6fe833aabb523b1e52f09";
+  sha512.source = "c0c1b82eacb338a1ee74cea3a374153f9d8f0515c8f5590f5d957bbb4d7551fa111894c255f2dfadd05e2f09f203681af69ee8b3b79731a700d1b9359e7caec0";
   hasRunfiles = true;
   version = "1.4.2";
 };
 "systeme" = {
   stripPrefix = 0;
-  sha512.run = "9524c05a218080cf6f4b2037a887a9dec4e2e015ec5734757adee2098718e9c7eab41e0f12416c87dd437825b70d02920b118f82e779098a88a97162b24d2bd6";
-  sha512.doc = "584b81d136c25c9dd56c23554adf1f75f79f75709a4207127c0f6b56415d604d4deddde99e3c1579ad22477c2eece2cfb2ce3230337fb0c309f7ab9c2c7ec1b1";
+  sha512.run = "b62df9990cbd6821f29436a935c916f7787b6b53427feb8f38f0901aaf4c2a07743c1a91fed17d8282eb91b5f45483d7b400f9618062a9070786484721a3d6b6";
+  sha512.doc = "8778b42b287d89224f0d004c4cb4c841986984343433ebfe50e75ac05120f41ed1c3fbf68222dd0180ec74e6555d8dd8a72142d52b7c150f14a29b85fb5362ba";
   hasRunfiles = true;
   version = "0.31";
 };
 "t-angles" = {
   stripPrefix = 0;
-  sha512.run = "22e5ba0ffd645e2dee48a9777e68f808de92933e2bd15b553502106ebc738994176f63467a9a243768c0ad42d4c94c1cd081bb43d77ec2878dada8753389a554";
-  sha512.doc = "ab0ec415f428618fb43a7b3168acb8b31072c03fe6e8fd75b5515380b5bddb3d93fe116f0e16c0b7b47562d777d1bc59cd15a4513b80cc2cdb9792bd0759e3f3";
+  sha512.run = "50014d35220b1c25ea177d30b98e915ed84c1aa4f475c1e00ad3d77990b81d860cc141fa56243564586827aa1180b97bb28ae10a3c472a7790e482dffa4bf66e";
+  sha512.doc = "be8ef0f7459421c7931e91888b66a7adb0dac43bb0432f907a56142a05c25ade7dc784ef09035807bdd1e4341cba6bec76090fcd284aab137e57c4ec1c0e81d5";
   hasRunfiles = true;
 };
 "t1utils" = {
-  sha512.run = "96f21b5a125f386d74ee636f54b60dbd57b4a14bb498bbfc96b67e49c72e7b2fa0a5a883e3d612d9b06852fe0ba3e5f36d9da83f1514fdea414a3929a3088eef";
-  sha512.doc = "952dd54332c21300a80994c7cc3de833f1173493b9af3517983d23cfd623a23c64662ce6560885ea40402760d4b85582e4f8453bab08fb264d660b8411a36aa5";
+  sha512.run = "04d425c03cbb846204677454496c791ec00d94889f4e88003afe1ee2e96839650117e126a4973f0ab4978ea7a13b64c3f57c804280fc40c8adbef737fcf0d533";
+  sha512.doc = "bd9745a99f697f4f5d108ca7ec16051819c7a006a9e5cd154d7c1a926e7fbaf4e38afeff75b425d532d5bf2a1dff12e68b2216805f6d6e25597a2e3b4a0c0d2e";
 };
 "t2" = {
   stripPrefix = 0;
-  sha512.run = "729a0a0e58214a64a8034d88c9ab501a20469e43601770d8809813e473d5a25f04aa13f83358eb612c1e826df2568fa6c669501fd5932687cada124e58a089d4";
-  sha512.doc = "e1adbe91fd88f8297b1922f5971e827dde0638ecac5cb91e8d3e20907825e99df2b0221a26349e501edb0ca4437b9ac2d00bab17ee15331868d803f43c3d0cb0";
+  sha512.run = "2032ceca317de568c8d53182bcf803025301d5312adb5bdc19ed63d4ce404c4ce0673fb281bf3129024cc2c6211be4762e50bdb4f6d6e180d2afc41a62562ceb";
+  sha512.doc = "c94c4bf034a3851f9a6e8d7addaa5b71927df3e66c249d35dbb071e10109ca3c7497ff12845e882b994f345e0cbd5f1e7ed3fb39368e0f3201768a89fab7c105";
   hasRunfiles = true;
 };
 "tabfigures" = {
   stripPrefix = 0;
-  sha512.run = "f8570f66aa758f8a34a6b01fd3500990a465f1a6b4c2e78be868d6e8d29208b04f4b868d0ae9f02d645d43b878acf23a89c21bd84e79e2619d077694e909f3f6";
-  sha512.doc = "d05996aedc4a4b4762adfd197d8c1e13fa035074ec23bdbc74c28ca4c6941731864b3228e2249998972c1b34c5d4a0ea0174aaba509ae3f66449e830ffc5fffc";
-  sha512.source = "0185b1633dd481b6042c30cdf6b4fd4c3f7e0f55c2ed538ebd3bf9ee6f861164519053d7322ddcf19681643f1d387baf6688ff32a6535bea381ba53d5d72f944";
+  sha512.run = "2d2e8c1cd4ca07528aded326b154b8cf8ad019d475b1b7703cc27dd5bffc91c651c8633b35ae1ff25136a11b0959a503ce6be94453afc73d1323b8bc074f5f43";
+  sha512.doc = "c2e2efb2320ca28b2ecb1d95e67ab5bcd2f144ef040a79b4d65c64174e33d636e7d5de950a7346b63e67fe3f935d93499a207a96e1ba65053bd7c2a9cf912529";
+  sha512.source = "66fe82da3161b2f6a8e710e4fde9355c26aa2e07e4bc4c725a9bdc42327c910c306055d4db18bfdaac150a9440003251d861e4e3bfb0003c89193f4379daee74";
   hasRunfiles = true;
   version = "1.1";
 };
 "table-fct" = {
   stripPrefix = 0;
-  sha512.run = "52bc0ff7005b3ed4bab952db6578ba42407b30ecd533fbac9209760d3fc7454d43b0939b71dacebc7dd9f7afd232904bbfda3227e416cdb2acc3e1482c47aa85";
-  sha512.doc = "7ad0b66ddeeb0acff3c66d477810413603860ac84c784e8b6d856070d5f82db7b7d6cb1812df770f0f13277bf3b6334e8cc7ca4f4f81de0c7726032d66ffc8be";
+  sha512.run = "cbf1751be66d15b9ca61849b50a91418759d60f9c92e644b553a534c80a0db01b6f1447f104c64d934538f92f585d7bb25f22dec0b70f6c184ef584c329e6482";
+  sha512.doc = "bec99642880dc33b78ae7f611bcabd0e5abe0cb8f512abfea470ab6dd631134d76f579075eb9feee02b69dd70ff61c6835e47c671872e0fa881e59e7aa126abb";
   hasRunfiles = true;
   version = "1.1";
 };
 "tableaux" = {
   stripPrefix = 0;
-  sha512.run = "ea81ebd6c06079ad62185340f0c6b4e646c49a87952df074201167286e161a710b43d27b7e15c86d6a5f698cd4009c1b1d775612e9157acbb6add01240c5c9b6";
-  sha512.doc = "7dd159d6664f5e1791c2cb7377caae1bbd2de04dbc8a37dfeee4188b44bae7f7f377dd0ed461764adbe3ba2189521d63e94598cfdcac968d246a55a7eb44ae61";
+  sha512.run = "55efbcd334234afd711a6a7ee187de0680f0fab2e6c07ed4e255d9fb1f1ab97c33bc33f1a77d8ab53a34dcf024e24ca546b4f8c0c033da4f0e1c64aad4acd982";
+  sha512.doc = "89831cfb672b897f2a15d5c19d24286c65818444e58a60370cc84e3b0a387de93e0db69acec8e28fe864887f28ada88ed7bb280c464b194ac09544e2aaf105c1";
   hasRunfiles = true;
 };
 "tablefootnote" = {
   stripPrefix = 0;
-  sha512.run = "228a6c2e6cfcbe0cd1804bd2638e84ab48cf9caf6e35b2ea59900d4d1c02b6c2954688f609456443c368aaf89e5798cf28e8734f58c50426130cb29305a8ab04";
-  sha512.doc = "e4d8c3d29b8ab8c88f8f48077258ca42ae51dbe548629a635d227754865567f618365a370f62ad8a49ff839c6ab894ece0c3e0b61e0f29282fe74513e870e436";
-  sha512.source = "4f1e507aa722bfcd24ded64d6d7a9a35b4223b0614f85af43fd339862f88cb98eb445a09cc9c512df5666d2706523955a56865da3185c9d50ffacf75833402e0";
+  sha512.run = "6d037e4e5844629f05375d1cb54348685fdbf9cc9f8e6ff8a2193f7b9bf9b831025952ad1964073e297177a3dfee4d5b4dee9ef8f33664bcac2cecd0fcde31e8";
+  sha512.doc = "0f260f1b0d060d54d64d66c6f08ca84ad8e21d56570eaa2062f35f5e7e6343336bb926f013f3010953ca17f8ffeace2744cc02350fe273d3ec104155ec61e570";
+  sha512.source = "20dc30dd6db6624e183996908cd65ebf6fa812b4c544f45d5d30515d44d6dd4ec37321fb91c203b2a4073338bebfc47be761c07ce2271e618909de36f656c2cd";
   hasRunfiles = true;
   version = "1.1c";
 };
 "tableof" = {
   stripPrefix = 0;
-  sha512.run = "94a09747de37de024d254244e906761285248bc8dbe6f387d484b2c1368fa3350354c8f5b7c4794245c2f7a18a388a6f336131b9d5c24ee97d5c7d9aa54eac69";
-  sha512.doc = "3abd8ce27652c2f0bede5fdc1906fc15e9b12cdddc28f56fe1d24c7da89118ff76ad6aa148d1f2846eee4d8a55d0763ba64f9005c4603d4a5d91dd38454e779d";
-  sha512.source = "71cdc2dabff29762f2731883444a1fabb24dbe76f2e8b620e1eb619b09d031ab089a23bd1f7efd35f3c0dfd6e20005a17fc568afd53519bb0e76e238f9f182a5";
+  sha512.run = "0e19f570a652146ac7b00c9c43c05c54ee41bec5e13e93bdd178598a8e6aaee6b3f1cc303f4938e77acbc539a273a6d279df75b5f8bdf45a5ceeb47d5571f053";
+  sha512.doc = "378c42f4930c909db108a742674eb8017a7d338b8cb66b54005dd3919913ac418c7636adcca6721e484ed54c081fd382608ab32d290686279ef3698b75cc1e0f";
+  sha512.source = "510db94f0eddfaa020674569621cab7f959b34b3575825ce83cba359f1df45df4d8a9529284424687d940a423cfb4896b9978fee19f227cb93bc5e6de3fedb14";
   hasRunfiles = true;
   version = "1.4a";
 };
 "tablestyles" = {
   stripPrefix = 0;
-  sha512.run = "310b99cccb9f5887757564f6ba2abef70702e126ff1935140185a6631c25130422b5721fc3629a747b3c5e4ba0d75ec425f91d7190d190fb85f13a98258acd27";
-  sha512.doc = "44d08699343b723df3f7c89bdec6823ecceec68367d9cfc622d5a12e6f83af20bfcc9a21e5964c6d58535c6d5f870c0109a7e916d6eaae7bc79748e49ca131f6";
-  sha512.source = "395c0bf55ced6b88e7a373d4fbceb4243f8db3dbd3777d827df9e5b639118eabeba605e56dfc26aa6b6eef4b189e204cebca23501e8862ccce61608e9cc371a7";
+  sha512.run = "d0047d9c7e22330914ff254e2c8e57f8e925db9260edfe2c917b95964f95c5b6fe59e7e1e7952bc1fc6efa811c838a32077cc9eed4f06b1b589e8641e6608a3e";
+  sha512.doc = "6b64370b1620af723ca2e8c6d1c12373a70e4577bf327c97c9e3e03f339431fda997dc85d6ffa20c1628c91af2ba82ed5bc5a366043cb7ca01259250b3089e35";
+  sha512.source = "dffc2adf1caa1854f078f8667b2cb9342fa87a42b3dc9e8c1f9c1c25b91ec86a040b40f7d285c6b13e5c3a5049f3c4895d605f506e9a28972893bf94b6cf45e0";
   hasRunfiles = true;
+  version = "0.1";
 };
 "tablists" = {
   stripPrefix = 0;
-  sha512.run = "1567eb8bf72bc7b92a0af6d694be0d2f29dc8adc20a7faa8c2579035bdc721ecfd0e0538a20c3bb913c9cb9ecc87fc955ac14f448d6d9a63d1747caf34df0c19";
-  sha512.doc = "7e697def0b9979b1b48a7ba14f67b05ecb50d67735fba55866d1394ae3aeca995f0fbc0d15ae7bf950053343a53895769171aa28d7c1704aabe17f125b5fbfc2";
-  sha512.source = "e104e252184c5a0a1e8014cb9ec5d22858829222fdc2331ac5a4140a2579c0a9e9729218855cb2d49015d68a63977b8c106495051f40c9e99bac453ae73909a0";
+  sha512.run = "04ecf1b7a20ceff9e0baea59673750d9c60e3bc1f3bb2470578ae9565073b2f2fa39d3ebcfe32e3cd758b9bc8dcbd6a959efc0af2ad6601d74d9ce9fc91bbf09";
+  sha512.doc = "3c5f37e8d1bbda4de834911250e80b4fc86d56e7a4b94ea5c3b82b8ee63f3eafff03c8e74f9598dd3f7d4d73504b5d1d12cff0576cbd6fa827c9002f2b4d3f83";
+  sha512.source = "19e3412e7878d622cc9e082bafbf859d7da5335c02bccb83b77ed32f365bd9a0bbf2407351f12f2b31f7e08134bd78ceb641e04b6aef991cfc4a1308140ac075";
   hasRunfiles = true;
   version = "0.0e";
 };
 "tablor" = {
   stripPrefix = 0;
-  sha512.run = "11c5a372eca053a4dd58e8964846712565067ee034ff16b4aa0eb415fddb3e01a61729a82668a46e88b558191f6a6627848973b23e882c34856d60dc5918c750";
-  sha512.doc = "5d00cf2d9b168176d3178f95553284dd37a13cbde438dd74ef80430fb272153e1eba00ee3d99eef45524fa9676ba7abdae6b1c170586bf79b5d9e247b0ca2e6c";
+  sha512.run = "e2ef85bfd0eb76932c7d83c9c43b8852d8786926ca1a40dbd7de789ea71c8a49d7b393d3ee5d5bed432020863babfacd4d871f36fef37ce672047880dd64e3ba";
+  sha512.doc = "f76fb5e27137ec09899d8fb690c2dbeb953bd6316337d42ce3fae165b556ea48097c65f427c249319fed99c8a58c4b81d4b722ba709327cb9bd68d07aa7e1691";
   hasRunfiles = true;
   version = "4.07-g";
 };
 "tabls" = {
   stripPrefix = 0;
-  sha512.run = "3c86cf2fd3fddfccf8100ec6559b21fe02c530cb02eb7bc452dd3a4bc96597424bf9daaf6454a4b6a0fbecbdf79d9cd08cf16667fb30647fcf2fa6398279c95f";
-  sha512.doc = "4e8266296d3cb3e142cc600fd2b3935506d6dbd5a3a90e53e4840b67149ddf08b7219820295e176a184a3240f718fe53dd2f1be0c529dd1f8d4f25374d7e2ca8";
+  sha512.run = "f6c6c50355b44d70fb3138943ddfbb7b02aa1ac2b59f68c2537c687945b8ea1644fd2ddafa9c38123979ba04dc8f4e1217f264017c465b8d2c709a31fd19b585";
+  sha512.doc = "5989172b6d597baae856ae9d2b71e6808fb45e662d960e7b00712d13bc11c06bdf993771a67e3850b8d9561d1c3dd92e0754cb954b1fab79dc2f9647ea0d4fb7";
   hasRunfiles = true;
   version = "3.5";
 };
 "tabriz-thesis" = {
   stripPrefix = 0;
-  sha512.run = "c71fd9dd86087ac4443aebefa5f5074b3460aed34274b200ec76ad265682d2ee0c06163d7409fb83935d7383ababb5a4e4de59fe7ea299d72a5005d0e08e87c9";
-  sha512.doc = "296e663a3838bb173ccb789e7efb44e8bc54530e57dca1d44f45e93ed9abc1c3d25ffbf3eff79ae02b8500d92081fab39611c01b1c0f099b9e301b1d310e3c69";
+  sha512.run = "a5fd495a1008d0b1b318bfe1f9a420695e06339d7eca3d76ad083751d78718147a4f1470815da1465a6220370a60a008f7cffd7b82ceadf4e1f588f87c6b009d";
+  sha512.doc = "26a1ca0ce4654e2dba8369b400c3002473477076cb81577a62ff22f6e1aa47f98e785613ad797cec24cf54b78e14e1a48851ad467b2643b485bf1ba37503c5aa";
   hasRunfiles = true;
   version = "1.1";
 };
 "tabstackengine" = {
   stripPrefix = 0;
-  sha512.run = "a6a0bf93295568d3d23a1cc3e411672674e6871b62d4050ee1303a29e91d0f731f8fdd226979569f2fd15b7c59f7bda9ba545b6de1e6040d1d0ebf48328b6ac7";
-  sha512.doc = "b701a3ae428988de45d704fce137e3269bad606fb909675bea307fe40c233f06275b661fd7501ddffd126dd56abd6262e809aff5b0a115e9b209c164ed0bde30";
+  sha512.run = "98ca69e3e633204b594d13225f5ed453d60ec04e604e28c7cf563a7b5f7c3f397559778981f526bb4fdf69b8869f130544dc651b3dbb92056e94ea293ade3c72";
+  sha512.doc = "06226c144f39e6913cc28ce02d046b64596809341930a29dcf202e702bb18af1da60088a896e1b6b1591e767c995121de25c8ae5004bfa3bac4f26e233cbc550";
   hasRunfiles = true;
-  version = "2.01";
+  version = "2.10";
 };
 "tabto-generic" = {
   stripPrefix = 0;
-  sha512.run = "2c4a682711a688638d9a6ea53d4d86bb1c5bdbc479314deb3c8568484b8447fe83888055797e526d30e00abf1fee0845901b30052c3e250dc1c72db7caaa06ff";
+  sha512.run = "f32a0f66ae9cc6b9e7cf4974cf12c17a4fee4acb346a5817c2c86b6d263e28d9bd74f7179852859004db9c273e31e56ed28ca0e322172f5435b2630796c7d495";
   hasRunfiles = true;
 };
 "tabto-ltx" = {
   stripPrefix = 0;
-  sha512.run = "2ede2ffd1f217ef1c2d5da5b77ddedb423aeeff11274ddfc9c554ad237a63e2d56ce6e2dc13950a0b2b6f59f78ad3e49316ec9e98dfb96187fc33e7447408a44";
-  sha512.doc = "6cc8d3e829c7319791f1e0b4812ea9644b07de24c756525d73363d1bd6032ae3e23628ce302ea49766b3fea15395d1e0598acb6fcb05a797f82418a7cd75e746";
+  sha512.run = "80ca23ddeb6ad982b420e0565fe5bbc87ced89dd49dd0786c7f62fcb76955d8a66abbff8b366d8b31f0da72e228b39418518d73d3b2a37bbd8c1f6b444213e5d";
+  sha512.doc = "9ceba79c6aeec575ff547ffc20a5c7ead1eb42f7f6a8ef0a45458c327130370041fd1d212c89c19e2c91f97486a4feb183c07eb581c0d4a9340bfae7099200fe";
   hasRunfiles = true;
   version = "1.3";
 };
 "tabu" = {
   stripPrefix = 0;
-  sha512.run = "bc496a5acfee642509638126a777af867415dff518d596e051db8193cb20731a35b7202de765c6267b32703f8e49729ffa48cc720e9ceb46fe357def5b84cbef";
-  sha512.doc = "00d68588009fa4925ffb30de629b35c83551efc8db97f84f1709aa23d5f4b047c04d49e6cfda47162160b101e95bea8638fd97d763ee6212edf36dc8d67223c5";
-  sha512.source = "e27bd79b7a0e32a9198bbd5ee99d9f3745400836901f5a288fe99d15c7465783472c2219f5e6548baf95bb36c6a128b3c7f750bebc213cc85338f78e430d22a8";
+  sha512.run = "1627dafbd426a57e9f26833d0a957c04f2fb351791398d0795b0ea6228e6b144c4ab0998a5263f727908321c045ab05bd50acc7b62ef33445f8a38580535fb18";
+  sha512.doc = "4ec48c3c1209d50573c4cefdb1414de66f9e92ed3962244b8c5754ed688f573e1fa6fbebcc46b0146ea7c5e0de9b3cc130502084508ae4bb997495d0c2c91591";
+  sha512.source = "97db16a43f1d4c86b81f46c4021143324fe459a15a3d7cb5ca7bbc5df5ba1e708f8f9826abc02f0b5aad6e800e0803df5af82b812e96744b0b629e5e5b0ba494";
   hasRunfiles = true;
   version = "2.8";
 };
 "tabularborder" = {
   stripPrefix = 0;
-  sha512.run = "49ea305b92355e5b971319bb2d995a4083ec83114cfc5104587f4b59fc0f0736770c8ee79d6308cdf98f14448161e780d88108ee12d0ae70d69fba461a3c5388";
-  sha512.doc = "a69607686d742bbd78a38d9e06da0c83c717101109ce6107f0c2493e687b53bdd0a00f2fc180757aecd575ad739f4a68d964067fb0099c2b5aadaea987aa259a";
-  sha512.source = "273d371b78d78c3bd9ec0dba685a1af5e13a60fbb9dbb3e5db03e4436aeb14da46f0b2d940f46666cc8150e515d7a64eba0a17d5324e87d2c090e5cd1e125e62";
+  sha512.run = "acf9259f50b71b5460fec19855127879fa766d54477cb3619950f46cb63bbf6df2c3214afc838fc7797c803e62791f1864466fd0353729b8daa18fc4e77c742c";
+  sha512.doc = "62559cc216df428c5025fe4627c16990f7b6199efb9e985f66d923657ddc849df37f071caed17ed6de39d66d4a71c7aabf33a6c014b2dd96ef28e68b6d379298";
+  sha512.source = "15c1b1314148dc2f2491f3b4734fe23313ee32a3febaac448c963a0d7675fbb91fd5d906166bf98068fe7150bb91ad672df1e5003c4129b791925e2134075a43";
   hasRunfiles = true;
   version = "1.0a";
 };
 "tabularcalc" = {
   stripPrefix = 0;
-  sha512.run = "68a291d8a5a9a29f7d7b824bcfead1349b57a0df41895c90a7219f22ebfb9ac8e9cb68a2bff0a7e62a4a5898b1aeddbcfd6573475d9dbae78ded7897d0a32443";
-  sha512.doc = "3c66b96ebdcb9ec1c13e516648f7fc976e8f0988e933e5db40423179d77e9a9e6ebf4eb37990253c6c75beac1d85b4db9d065fa5eee9a53a4cb29e59a49a25d8";
+  sha512.run = "ee80d798afbeb134fe11c7babe72e191b968632cc34bcbd68744b915cc396b399df68b98e1b2af7ad65edf9e5e4648de8db4b2e639587a723ab4826a0e790d18";
+  sha512.doc = "57e3ffc73a27a03eff36a4538f919c15d1bd07e13e32e33a3dce11239dafeceb3248d3b444070db9fef8bfb3ebf3deaa199faffcf9ba416719ae862b8e99e6da";
   hasRunfiles = true;
   version = "0.2";
 };
 "tabularew" = {
   stripPrefix = 0;
-  sha512.run = "4207f8f0f952e33fccfbeb719b60e5c3f551f69417a6baa1b94a338f21af238dffdc0a1466e734f6afcdd4435ebed38ae6f1e37682d5fe5d8a9e078ed7535eca";
-  sha512.doc = "588ee86c9f57c12d3ebe6aab8ca4ca153cbb6091bf9d3705fe3e519dd104c24af4ac50c5b6a82f718d721167d8db90a0f0cc5e41a3cff16820a42ded82327d63";
-  sha512.source = "c90fea29e57e3af6a5ac4d7dd6294093085b6ebc223ff21fcc041bcf87afdf8178962ec39ed70171dbbabe0c8ec1324d48dcd410e19924d8ecf73c77a2161b4f";
+  sha512.run = "52689086e54ccefc5045145b17d588f4d2267a1745c2facb381655e5bebafb71349b303eb83b268c4b2c1b588095d3f430479d94bf13836b3e05f844c915dae9";
+  sha512.doc = "d7ed67db1c83cb116dd4250bef56faa46eb2225500aa24952a810ce157966fa50e42c216467fc824b0dd767e034f45224bcf2c496a21f1b273fb9a3453e40c6a";
+  sha512.source = "63a4f20d6d07114d840208489520e30b296e0bc2107e9d0cc3f3f78bb9aec7d2888c3ec73a63ffebb4867a662f88dcfcf9c96e176794ce360e2bf3104bdbf814";
   hasRunfiles = true;
   version = "0.1";
 };
 "tabulars-e" = {
   stripPrefix = 0;
-  sha512.run = "1deed4f9fd6db7d0f57506c8cbfa1257640af4b216aa707fd0628c0ffb3a22927a3f3963f7ac1a5ede1c9cc20fbb1ae316ec92a3bdabc87a6f15aae66c53f124";
-  sha512.doc = "82b7381394ee4aa82b59080d65011ad0ed94e88874b87bb0aa2312adfab2515ff6ae0adc45e0e5d000dc7b1fb91368f681a806893777ccc97db3f9a3fa0ae48e";
+  sha512.run = "592d1c6a7ccdd67c17fa3942a4ae87403122ac79ff5a7c94ea9736300c3f7228a4c87d5d04d5e8fc672635292ccddd255eaaaa40f77546e7cb8b417fa6da5723";
+  sha512.doc = "f2192781f5ba66ff0ce6994c5525df5bd4c2fb80778dca7cbc7f05174b9b2e509257b2bc676a568c1cc957d17360f8c0faf30d9a615c4c7c2aada88b3418b34e";
   version = "1.0";
 };
 "tabulary" = {
   stripPrefix = 0;
-  sha512.run = "d95194252848aa72fbd65f71e45ca6c57181d95edbd8534453d7458e21c10d9b61c2822640c9103d2457f3e45dbc9bbf4c76aaf108039772f3f1d93505f2c66c";
-  sha512.doc = "83bdb144dfd2e4dab15503ebbbb3ee507d8aa4e7aaf2103444bbf8a4ddd84d430f2bd1d3a08fbbe3f96074104b5a6e38d69ca64b198805b587ccfe0975f70c96";
-  sha512.source = "801dfd5fcedf96034330db30f261053cdb586dde528e138cfb88a944523fc0a7fe28c73e0eb3ba25ba1d281c272229ddf9095f83191d631ccaea2bc32575cc23";
+  sha512.run = "5345e1dc066d4207073843ddd27970572322cdd4b5ae316b23129a94bae0bf9b16a38a9bb5392a3fb502e2d84c38d0010ef0ceae51f02f1ad4f38a0a96b83a37";
+  sha512.doc = "e19e40ff6809cb4ca9883a25c621d28aa79aee0a72cf76204b5c876f419661fd8e0252191752c77154fb0d51517fc090aa0d5993dd672f673d65aa82b7f584af";
+  sha512.source = "686f417d6b18cab2e9d4a47cd4a4ba8effea290fb320deaa2faf470e177e1d986a38711cad58e4bf1b53730af6551d414dbd7f912cc705b46d86f0a663d9adaa";
   hasRunfiles = true;
   version = "0.10";
 };
 "tabvar" = {
   stripPrefix = 0;
-  sha512.run = "edd88eb91a190ae15cf2691a36fc67ac753be46b5ffc9ca027e0ad9aa140e9c948bd660dcbb5394da9263756ad817dec6482daa3d2fc2076abadd8c1e70ca3b3";
-  sha512.doc = "0f08db2a9c063bfae8bec3857d105e2c88775fb4a777fb34a1d7388d85c5d8a121b3df895e44df0d3d1f54ec6371ed3147429f34524d5013b0c2e31818cfd8f4";
-  sha512.source = "8d2e425f8acf06302ee73547bb431848e00832c4514312d40fc256228fe35586b141f78e1ffd0b67546d4d0a0bcae99a114e5b2c1a9627c5f0131a753ac99324";
+  sha512.run = "1a03c599c1406bbe902036a440f9948c56202e07df19ccb23e8807906f6423533bbc97bc28a93e95af6c17e536cfcf506b1157b8bc873f518c3eb9b2e693a56d";
+  sha512.doc = "59a7da9e80d4b9a668156b0897fa86ac73fc8571567256f2aa4e5810d360b2aae888240aea3df67e763bd2f3ef5fb46db2248a9eda6ee9d3dc8263cea6174b70";
+  sha512.source = "b84a80efe8c97b1922d91647aef914c486715f44a7cea37b46c8da25ff375de071fc8931e69662475e3c5467485040b590bcb5f5b3672cadac07c5fe8e9a9a4c";
   hasRunfiles = true;
   version = "1.7";
 };
 "tagging" = {
   stripPrefix = 0;
-  sha512.run = "b81f5f871f15b80cff2cbfbecf5faf92bc93ba74b48c49b0fc7171a6adf16c6592ddaed248305a809258a0c683b2fee7f3573760ff9fb7f8a31b9f8995e809e5";
-  sha512.doc = "33a2657486512bcde35fe061d5fa4d269b9300574c9c707bfedcb4b00248d09ccc519769d9a36c1cb3857b156a92cd4dcc9506be26fae15987dfe8681342cfb9";
+  sha512.run = "083f70027958b18827c4d16f08ab46f3753a88b4ccdb3a628d11e695db6aaebb347921889bcbff15b86ca1d4c08d81b8e8f2e50b924a63b2b1e0c1db743ae1e4";
+  sha512.doc = "c7eb46db4e68659747df33c18789c09c227f6f1eadf02988a3bc204a8fcaa616c023910446b8e3ca525b12fbe379eee0c0412b2429540fc27e6571307050ceef";
   hasRunfiles = true;
 };
 "tagpair" = {
   stripPrefix = 0;
-  sha512.run = "5f3121741184c51d268f0dd6474e81be30ce9b73fb53f6ed119c2fa49b805f54cdff1031ffd72db1c256a07c35b6f94cedeb2dec699677d57417c5c88638ac06";
-  sha512.doc = "d2867696bcdcd2432930fb496ddf80bea5dc23d81135160267a19b5ad57026bacceb8b4efe053c6ca06323608196bbbd71c2363a588eca518dd215592f9aef43";
+  sha512.run = "403c13872b22b9fdcc26975d475583e53153831c00d345077c0af570323d93ce93d14caa555dc05b66cd517d4789d015a36af2f8a05bd6d2dd28bc0602950b4f";
+  sha512.doc = "90b68e522b5e4c5856f13d4863a7cecaa1b62a882c367c9e56543023812b9ded93a3ad323a80aee54f8e56fe708008039e0d1350c37dfa4d385373ed187e4912";
   hasRunfiles = true;
   version = "1.1";
 };
+"tagpdf" = {
+  stripPrefix = 0;
+  sha512.run = "5cd991f2ef8eb7ce9a84e11d0208cb3207294d8ec39028f447e852d891b535a4d8527559646772832d05d0188718e87edec7527a8e4ff9b10324022c3ec67dea";
+  sha512.doc = "b7c189cfebfa9ccda9dee7dc4e79c0a1eb50f70dd04c251ec7b5a469de91c09dcc87b6a913a61e54aca9332280142725c7d8341ccac87edd518667d2c21c2ba7";
+  hasRunfiles = true;
+  version = "0.3";
+};
 "talk" = {
   stripPrefix = 0;
-  sha512.run = "c78de4e568e6f7606170f8100eb72f2002eb5422df13f9b2c49149ab76c529edaf6fbe031fc5cb7d2dd06349dc95038113005b01c8114f19303d4ae646516fe4";
-  sha512.doc = "ee8891fdbec019fd4493815f8be27e6a87a518bafc1e95b03cf7f50e65d2faf91a79a4cf0aa402d7272667dc2d7a116b36fe352a1fc0df14ffdd78845d735bd4";
-  sha512.source = "07fb2c5bb7cec21dc64658c0fd33ce744d957107e8af03104d3c12910a56f9c959be8cd0eefb13bf73b8189c7fcee2d73386c0e988aeed5545e51c3d3683bccb";
+  sha512.run = "acf8a5e1bb26e13df7d347715d16ee690f82e7bc417f53a7dc214879f76611cfca179733f6592060e9a584e1edb0faaf0e9817eb64b6ca4ee33b572bba588701";
+  sha512.doc = "a0f81717590b0b158d0ee2ab290c09eec2b382cddfa4918d05db3ac5c3472a2e982ad6a7341f2721e1cea814e79ad692397fbf150fc2498b1786bff3ff1fc1e4";
+  sha512.source = "06b43ff502ff9ac46919a6c47c3124bba48ea87c0cec34bce614a9a5192370165b8eed871cbfe950eafb1db9182fd74ccdbc0b0aa9b64ffc49fbd3a97a8d4994";
   hasRunfiles = true;
   version = "1.1";
 };
 "tamefloats" = {
   stripPrefix = 0;
-  sha512.run = "a5ebabdeda685a1775dd869bcd04acc65f0756d399a62d077421cd331863d599033f2ede191d9d609c3329fc3695db5956dc821fba1d6349be930a1538a8a848";
-  sha512.doc = "b695ac0d33a202ebdfb12995483d117ea6ab557f445393f1a6a55403709067ed7639d153a8e037f913131352f22e1e28f2331c827a0b6bfe54d05475ee8120ba";
+  sha512.run = "4ce45373f444ef2403203217ce09c9af667dc0fa7f068200c3fe99256dbae78c6b3779d3828b15dedec183dbd12d8e9c477e64c830177672a3bec20b6ba78988";
+  sha512.doc = "e3a23fee0e3004217dbe8524a03f9469f00456037d438481c4d93835a51d9c22356aa1065e20e83b1e6ed89db66b0a573d2ee43bb4af52a3797a5ff1257a1cdb";
   hasRunfiles = true;
   version = "0.42";
 };
 "tamethebeast" = {
   stripPrefix = 0;
-  sha512.run = "4e8088eef8dc927fb5ee906a1a115e0440322a471f0e1495d011c17279b16165fd8d9499235dcf988460afcf37f188e5b08ef163a303b4a1094b0ec4ad5e5816";
-  sha512.doc = "43dfa79518ca5e787ba033489e1df3c46d38a8831669c9efc7abf626f22e9c4d24c68ddd17b2f5a8588c9a932960aca1d7a651155512d60078ca8e3b7bad871b";
+  sha512.run = "be43165091d0e484b7aa7304513da25491c6627563695c8d003bc01cfc09eca54b8bf08f8f0280749502fa867d011053a281de4a10c3bd762a1f5415f7209fb4";
+  sha512.doc = "9d17a3df04e5bb3e26ddb7b95288eb1a88eee63af5b8fc017dcfd108e958badfb364b185b5ba410df3de6e59688ecc9579e35d5024379048e5ab0f91d35af9c7";
   version = "1.4";
 };
 "tap" = {
   stripPrefix = 0;
-  sha512.run = "fdeb751d7a4c4fb516830f6440965b02f19881947389b4900065716d476bddb0fce59d819443c1227bc52ed133eeec2aedc391327fa08fd81cff0c0b3646d464";
-  sha512.doc = "f11f97dce7659ec0d7cb58fca628b5bfe98304db75e040124de667c870cd85cf55dc932a69e1020332e5c4ee95816efd9fda3b9433ef69e4f4da858979dba367";
+  sha512.run = "5bb1ba3d04663122ea5037fc676483f905eb862291f229c2cb0ed5878bfd8d86c15a11d10352363e3dd819a99e54117f1aa1049faa288bcaf723b8ec9720ef4d";
+  sha512.doc = "e3ed4826e2315b400fd135a48bf05baa35cc1f068d5e09acf77d63b18fdd6a97ef8f5c3aceb181f1c61c06860201db464a98f97bd126866eb75055c82a8a4c67";
   hasRunfiles = true;
   version = "0.77";
 };
 "tapir" = {
   stripPrefix = 0;
-  sha512.run = "6dff7a9b20e8fa024d72f7a9b8ecce272f169b17941d30141f1edd339b4cee8c81d01498078503fe0aa512683e5177e1a59527353da95a41bc4dce51a9673079";
-  sha512.doc = "9518bbf7870f21192c4926572ad39ab899fed36dadc1d2284ec8f6c48fed77e2f44e413c5195155e38597b255c5e29b03ca1ae947124d72d275635da8ec325fc";
+  sha512.run = "a8b778e9814b0322332c60573a1a546c643a8988650eecccb0327d26578bddc3fc4ec8221ac3af54dd335ff609b36a4fe477626b439723ac65544bfb02c31346";
+  sha512.doc = "578d666f2807ef5c11dfe7ed9abeb5378e95ff4681444f498049d4a5b5684fd343c0dbef9b3c4744fe75d0bbd0dc27149a09dc991e4c1cf472452bb7a8a89e62";
   hasRunfiles = true;
   version = "0.2";
 };
 "tasks" = {
   stripPrefix = 0;
-  sha512.run = "483395d5ab96bd21ab898aba9634bdb41091d3a902dd8332b2d90e133788a2383a2cfd3859872007aa0f9889fd3a05b9cf3364a3d58d67cd7a87d4b36fcabf37";
-  sha512.doc = "8f77bbc21def07d0d40294e2693125d870ba2c21483406b6c34ce307879e462d50f3c02e9157f89b767fe429eafa7a82d29b17ec770b522c0c4a6e4fd3bc68bc";
+  sha512.run = "6ed559483c1d25b63cdd350e4a1a98497f49abccb4a3c7862c886d9d5ba7e8d73116d387489aeb6383a74e8fb1becca0b68aa5808244fb15858464947f128978";
+  sha512.doc = "fef69a0a376c158ab2c850ea5592b215290644f05096a0ff0a3bea0a399e66a33f3fca4a931f20b06dc1c374ac39614ac2a3558633856f8506649f82166808f2";
   hasRunfiles = true;
   version = "0.12";
 };
 "tcldoc" = {
   stripPrefix = 0;
-  sha512.run = "022ee5efea35e2166d796603b4639fd9da39fc89d48a2f13c5836f1e404a51ea2101494e4bdea08b287130fa7a98a2b4985d12c6f40e4668c3e1ee30fa6df4c8";
-  sha512.doc = "3c57175e6c0cbdc7bb578b73447378dbe4c4ac484f13aeaa2a5ff4247b068d83c1d93fdb3e4c2d7ea89433160e17d522fe4bb746efdb448d4b25bca459f1c552";
-  sha512.source = "0e177ea1e5545d856ba8a9ecba1addaa505b3116c837f1972911b931865daf4a5cc1c3957610b89e4143f89ed0461edbe7e603b22c8ee783c957f2d5758d5084";
+  sha512.run = "53751250905ac768ce3192dba721bdb4115dd8b5f4f6f2f69301a5e704e5e78777adc7b7300c3af6360c2ea9f392ceb0bbe7e06fe499c09f706c1df1a6b01a4b";
+  sha512.doc = "81a936616fe5e42efdd68fdb5c63de88ea54377b13d0dce82d98df0f7bbc6e8b7bfbb01930cf789ff2b1aa70b62c63bb9e9578dece6df701c17fac75b7d20b26";
+  sha512.source = "88157b3d5983c97799a68144cedc65d23258b6b0f457501fd2e3175df7293204c7b7bc180b9d48f04361fab0732b3f39e58bc1eed5fd36494da1cc870f44ef1a";
   hasRunfiles = true;
   version = "2.40";
 };
 "tcolorbox" = {
   stripPrefix = 0;
-  sha512.run = "77553fe8e503219bae809beed816a64746b581cf2ea42822c38aeae20c1746946147d58cb51ed472eaa963d5fbdd8a4e1c64e29b9c0a450a6a8d63520859b1d7";
-  sha512.doc = "1c23192ed42279dd3e753216dab62e4e58cda99fa71b5dbb1c037be1cb49344183447aec962380c302383155f8c1fef9ace8100e02396baa46f58a685ca5ccad";
+  sha512.run = "17674128bd7097cd1d8ee26c59c1b287492da4897cc5eb4cb6afe9fb9257c15f38702e368300b81f0972bc6d91de3b714bc56f94da45fa53d0d7063b69affedf";
+  sha512.doc = "81002f21baa3f58f892ac125c0f5868730e3073203179a2bb64844de56bfc6d7a49f322c93a6e28fd97cc1b2c98c8b0c950ceff71537e9d5355baa5413fa1b4f";
   hasRunfiles = true;
-  version = "4.12";
+  version = "4.14";
 };
 "tdclock" = {
   stripPrefix = 0;
-  sha512.run = "0121c3f0c1cebfaaca7db279f1e95b5130d658f343a87c5d8ad11d0464168422695ae4d1a5c2b2b8d18b3b4e7522ba4f929a0dca298279079ec6bf3350160ba0";
-  sha512.doc = "746ced3931d11fe4b32da42b1fdeac8e63250a1370c255c3c56b257a3d120cd21c072b6a3fedd79373f3ecff88a24d5e3f52f7ef2869c1f0e70a728e0451000f";
+  sha512.run = "4383fe7d88a4314c90a28198b2aa67fd39d91d071e431f600f32ebf6ac0988a7ebe4840704e3d864698f7549ff9b8059e206b59f81db470d3860bde4287538a0";
+  sha512.doc = "9e6a7f13dbcd80f56757ac0cb5fdf91d2a12de8f2229307cdd3264b104e91a67731467df78fb0c80a0d42b1b64215ae25ea11d8517199049298e6dd065fcd68d";
   hasRunfiles = true;
   version = "2.5";
 };
 "tds" = {
   stripPrefix = 0;
-  sha512.run = "6cd44c702a862dcaf9659cf25695df35c00d2128ed4c47745c768067aaf1950c4012a519670f207449df599de83929ce27696fe677c479a85c6a7480c828d5ca";
-  sha512.doc = "4dffe286cff8285742131d7db2fd67aa6e47ec211fdf5cff02b24a7e97f829121310a65b26e4cace6dbca32b7482e56f83a934de27e7ab459e5f62a40e74a4c3";
+  sha512.run = "75544c9fbd65ca504910001385d3750da00e5a743272df69248730b3ce9ee2c08737a1ae89ba0fa06d876953855c33c5c1b64e83b16eddba51dc9fbea3b6264e";
+  sha512.doc = "3cd80448d5c81b778cc32a55d5ad9c247343a0881b128e71eef200c957577571bce231aec9fc8cbb531292a47eaa0dca9ba2508ef51a84ce8f6b88ca68a808b8";
   version = "1.1";
 };
 "tdsfrmath" = {
   stripPrefix = 0;
-  sha512.run = "7386036e6b0a521fd7d679e8d7b3989825d419be6704564d8c43a20cae4f3c1a721f6c2118b1c4c9db1bf8b6872cfba0629e7c914fb92b090e18463fe44e1329";
-  sha512.doc = "e449e85f95f7b241b5c3169f0f26fc7c15b63bd5ed0c4940df0a497300d87a66e67c5191b27d2f42c6f1b056c1009a94fa9c7425eb8306ce94dd71bbd72dd171";
-  sha512.source = "53523791df018fb2a2bd8b6ba41745df4e48541f52dd23b777d5583af568038133a416d06ae87e80a3fe70e806be5d84952f20afabeb0b0b6a888c6b49d6998e";
+  sha512.run = "ece5a92f6a9f24ed4db593dd0dd985ed61fb1ee8720798ab13bc338d4e9c2412073ff0a86336aea430450f1ef756d929a496691c4eb5b7b6b6f280892af4951c";
+  sha512.doc = "8e8ac549c10c02a4427b8d2d653c7dd1f0b92b8da8ee5ba25ed8425e34dd961efdaed1586e7447cfd320dddf32ee188bead185a0818d09e91a4a691876afc249";
+  sha512.source = "e68e4a44ea863a6bcac61e355425339324a4a438a6661270c21558e429c877403db4dbd77636b26e79206bfc137e87c7f31c52782333e443ec1ee5dd9835f2c2";
   hasRunfiles = true;
   version = "1.3";
 };
 "technics" = {
   stripPrefix = 0;
-  sha512.run = "6039af9459b6ec04f0eedcaded54a9bff344140dd3bd704812d34c5854ec4caa772616abb10e07d4671381c30ef61db7ee99bf1f60af04bcbac34028f86ecfe8";
-  sha512.doc = "4e18e8466b7c54ec48e6e5dffa094335221d4b0dfd1004c88b2b9b786c11107ac409b3049acfa575ff84889e49a9afe3f5d5959c80f1902d4958327aeb0fa7be";
+  sha512.run = "7df4b987c271ab67d34f8ac88e5ad91ee289d1fbe10dcb2ff56ad04c44492562f264eea5c815457964870cac169529fffdb4d78ae5afca239331a811be366017";
+  sha512.doc = "db719c659d2d248b6d09a15c232be6a834c754e0b2755de7a2bc99e9c5ddc7f3e2384a3947801679758c00eebd59ed7d801e1f38a0db4d54f1db675d2c191a27";
   hasRunfiles = true;
   version = "1.0";
 };
 "ted" = {
   stripPrefix = 0;
-  sha512.run = "3d9dbbddea7a21f614c004496ea91bf1104e84d5f66c4043182a69aedc35be848ebaa182f52cb0900afdb5d560c9fdaee4d6fdf6b1594920a8cce3445156faa3";
-  sha512.doc = "86dadfaf638843ee415d4b51bf2ac727aaf9fa7b688e7aacc08a795484d3e89b4a615727002634fe51f54918c82c1e822b55ec65acfbd57d6989d15d1592089c";
-  sha512.source = "b68df38576418029ac1c3b1285571895904d8d58db8ee8c348f6844ea1e18028a2708b816c5a1f2e912fd435a74006d037cea9d292c93d768ae552384294ddcd";
+  sha512.run = "c8e2eb0ba79726aef057650367d3c1adddc1dfe59bd2e9958f923a7f2695878b38aacba6c0e39ef86584cd0abdefb3321063a87fa5f8b6f8feef4d056b1f940d";
+  sha512.doc = "4c80f58d75d7abe4d732a22c4adb426d2461997feb38f47b7905685b7b0f92daa1bb03982d6af946b97a390deb7e39eaceb58aeff27a718d9041c90152565fa8";
+  sha512.source = "55029484afb41a808e8a672cd43365ec2a3c7af0d1a9e3025a26fc467649fb463371718fedd2d14d3bfa2e7f8c1ce470564375efd71ac0215f092d751ecb5dfb";
   hasRunfiles = true;
   version = "1.06";
 };
 "templates-fenn" = {
   stripPrefix = 0;
-  sha512.run = "074e7a707ff166855a34f800313b0f2e09956d20415449f0b9d604c5e95cdf7f4c4b98103d380b0334f55f389a599b98d36534f5428e641dca43b701f7b1b757";
-  sha512.doc = "25d6f46df63807dd50a75eaa84159c84dd89bdd1c05b3c64cf4af66229076567e72919ed1f8a322c7e1767043186824287748859ab7c1ace59243d5a910e934a";
+  sha512.run = "24d40fcd1217a74da85df92ae8c27fda4ec29405992e7a13f66f9d8cbf999557c52bd010acfd613a82592ac28fefc0a517453887affdc311e35f3ca3f413f7f8";
+  sha512.doc = "da8310f1be225c9603c807f4d6263cc6de4dc79e05e00cb2e146bed3f57b0570214f0ce72bbe84e2d9d46d4d21d8576549eb81022a9289f64c2e4450ff37c099";
 };
 "templates-sommer" = {
   stripPrefix = 0;
-  sha512.run = "0dc06402951104bd7e4421ea8351abde30c2312e6f0db3f2cc1400058229d50c7303f57537eaf1d6b37c8c770b611c750dce009db98568b57b96d286daf9536b";
-  sha512.doc = "fb0d620a660092409bdaf2ac93aa656387145bb3b2923a9598784b8a38e63b429969e826df3afb0999fa9aebdb685af182930d5ef045e693fc42bbe038f94b96";
+  sha512.run = "a40dc96748bbe50e6046cd00eaf67dc34f47b2a2de39d8f3a5045f1ad899170e9232363e9d8e90c2e0cf2096e29effb9aa510ef6f4ca631a7ef145b56bc09826";
+  sha512.doc = "b9e2fa6a1ad4b8988a02f063a58b389c049b5bf9b2b32f1900d429e67ffd88ea45237f43583ce18f05aca132acd68974b7e1e5404d378816c93c24b9209a554b";
 };
 "templatetools" = {
   stripPrefix = 0;
-  sha512.run = "7668df88301f3567f9cb62c40452cec291fc9389338551833d91825535f59324381561ac7f5215d438682d9b5d29621400ffe677efcabbe6475db7514d93d0d6";
-  sha512.doc = "3bce03125d4d2f55b7f6e88f8e34ffe2bd8d29a5163844c06ccae9aa75e00a9c1c61ac9818c89f4fdc27f38ea6337b38396686e44e4d5f557e7f2171cfaaa83b";
-  sha512.source = "739b799726c5aba5f533fe027dcca7144ce8a5762da146fce4188deb171c1d1ade9888cc56a58e38e69c09c16aa63236ad1c0cf1ee72ebf59c0d944c57654e57";
+  sha512.run = "399140e2e225c974e8a2f5f4169facccffead1dff484652cf1de6e0b481526cc502d2d7a36b4d1f8ff565d866346811825cff2d8060ac5c8815dc60f6b30fdfc";
+  sha512.doc = "097e8fd5d08c84f1d8e683232b8c083f02c9ba66f5baab1807c70829690e8ce05be43bf5c723b5b5419ca208308ee2f37fa01e23a17bf2414d524ed42746c2c7";
+  sha512.source = "b99fa77794b3709f0dd3a2c7f39079865554f3af01cc54af12523ac91a63e38ea383f23fa231e2e8a9288212e722d7bd50a43198ce18da601339eaea3abb0071";
   hasRunfiles = true;
 };
 "tempora" = {
   stripPrefix = 0;
-  sha512.run = "c5de9684becfa29e99dc576d49ab99c1dd824a1c971029dd285754b941b280ce30b6c9d47cab1a7b512990681502ee9c9dd8dda747834b7f38cc385a18ed95cf";
-  sha512.doc = "c6239ed8780c40ee81698cc02b55670f6a973bc27966f8e0ae1f7810a8aae5f44477a877482e31a0cb3c487e9b3bfc0a7a2d241b7b94134b9264421278cb317e";
+  sha512.run = "75e234971017b2e8158fbc30eecbe3e5c796248d0625f4b8495c6f851cbc75cf5f9c86da43a0481e0ab8c918e294d6a5f13e0a940f437e3be4e29a82eabd023f";
+  sha512.doc = "fa7b419fb6ed7ce4f6ac4b75e588075da284d48e32b7d3526f4aee92334c08c58263852e8592bfaa92aa176aec9633f94de52e0581b48ed2b063585f0b24c663";
   hasRunfiles = true;
   version = "1.05";
 };
 "tengwarscript" = {
   stripPrefix = 0;
-  sha512.run = "02e34303fd460fb392cf2fb03452cdad3bf89520bac6dda598675b25e5df3fe361b0375f763286daac328a52a6a04fc2002dc0155c5b69e5a8a3a2c9c4ee549a";
-  sha512.doc = "923ca6e5e2b9354fbff896d67fd643b3b147f52630cccf41f270a2c80f11c7fd6498cc575940054fc2168a1c6996b641ac0cf847e09d10af27d928269951d151";
-  sha512.source = "e70fcdf835635aeddae02f6715412939ede6ee7cc277918f0d5d9d3c57f583b62123333e608a61404fc733527068cbcbfdf6d2f7d4fde69257a7b4ba0dbf6538";
+  sha512.run = "364873e692abbc5cc85c1eb8b998f5a307215f1817fedc54776a9aca8a65f605641a8f72e0779c1d4cdb4621a5ab23e41b0b3de4b1cf0f49b2c5808486f9b54c";
+  sha512.doc = "031cc72cfbb6ed967aa5fcd2c3d8d056f2030815266b09f618e6254c8b7877139f2e6120c5ef5a32f21d6dff167c2ae9dded76d3da9fd1f8e0cf02f4388e0eee";
+  sha512.source = "ed1de75913c023457e99d2f5b7a6b905643c23fcd82b21bfc64dd2852121baa6f3c7aa7546a2c291cd7a68ffe33e586250124ceef01f1b6c7b4056b011a5b238";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "tensor" = {
   stripPrefix = 0;
-  sha512.run = "0e5a55eaee56207d9019348c86a63d6d0550b825a3c2d5f9accb4064427122e6b8404aaca049e4d620671ea637546a7ef194caa5d07782240e039cdf2c57c807";
-  sha512.doc = "d9e4902375ef0bd1f50e4c99a5f35b37735a09386647ced6bb251563bb4f6c43243f9b065ece6c3940779430da35b2fc5fc302fdf29c51a23c02b314d2b73ea2";
-  sha512.source = "2f7aaf9df6ace651d44dd34d88dddefdd57cac167393dcdf052dcd21a178fd60f9160cd6537b02777697487c839e677c6c068d2cc57b4d2070a45a52732e872f";
+  sha512.run = "267fcd783e7d19ecc950285a83d818b5e94fdc54272b8f9bf7009aa5f4e8c34eaf2e8574509705d2a4521b7fd48a3cbb655bfa2a063f98cf6239c29b0351168a";
+  sha512.doc = "1118c86d3c018c49ddb142fdeff1e5c6c7e1fe433ec825aa1ff60681bbb44ac5383f6062de553c46fc6811bbe2e507ee8bce7501150387e2749878d736e1b6ca";
+  sha512.source = "fc0c7adf408273a937c7432b091a894048568625066bf86a3241246f2b84f527668af7013ae480c9cb7f51661e273df6d3715679a8ae1b1c89e3ee68708aadcd";
   hasRunfiles = true;
   version = "2.1";
 };
 "termcal" = {
   stripPrefix = 0;
-  sha512.run = "281116e4415b1fdb3668eedf195ecd225bfec808d5807e963e17380df7a7be60d796e46161055f09dc1b0c772c825df75d5766243c0b49ae014dfb8b2371f299";
-  sha512.doc = "fd15b4f7fceb23f668dc202bb5689c22c8524f552723df02f739a056f92a4839a5723d7b88d9b9b488ab4e8fc4ca37432d607a617eadd009149fc6aecd1549b1";
-  sha512.source = "d802a972b8261183cd4ad6abe347926dd8e622cd0a97974600e68537cd19b489645d079311a538e866da75b918209a8afd000f17b06714e000d7639aed829b01";
+  sha512.run = "f29057cbe0cd157addcbc74cdc69ac4a9963ed1afb272047d4e61b9bff081efc487e323842103c392b0d652a97d25e184ab8cdc86665a82df92ca3d56f526001";
+  sha512.doc = "581450891e4dd6a437371b7f7194e7777f11cb068e8dcb73d7aef8a8fcab33f3aaebd9c14f670bf25a96b771e28d660457a23cd3b6d20db5a264818f925f2991";
+  sha512.source = "e2e5ee5e68871022793d312bed33dd7e61063ad3f40fd0be449a5631b51f8309e5231595c13b6fb8ea4b656961d3785d56da40f3bce21315eb50378cfbeb4566";
   hasRunfiles = true;
   version = "1.8";
 };
 "termcal-de" = {
   stripPrefix = 0;
-  sha512.run = "7f00236c21386bd95acfcae03f005047f4029e4aea5d391b55657ed346d49cf079ebfb2d9f06f3ced81e02c5aa26ac014ff1f9c8d80757e6efe922faafb76911";
-  sha512.doc = "656f5710546a1df6d0072863f4d6628aaea464fba160308ed51b5ccfa0c20b7e3629274565e5c2d1bdc8e41e234b42357ad69448eb5103507a68ee7272cf1c3d";
+  sha512.run = "740632c1f203fc0e5e04b1a2e012b981548c4ec662a42a4fd42256e440fd3998d86a9308cdc4fbda237793098ecea938c95cbb2b8b7767450eec630b4875914c";
+  sha512.doc = "530e9dc48e6d06c4345413d23f4795b0ad8065b28845cd53497b5721e29a6dd742c5037c485a9945594c372abb89758829ce4c981984a64e8e8316163c8fcd7e";
+  sha512.source = "32045f41386c60667749b9d239bf0f7ecbbe97249047d27fe05bda79458b235bf0102728888806475c11f8087982ef033c8076a91ff68771fc238afe1a2de1f6";
   hasRunfiles = true;
+  version = "2.0";
 };
 "termlist" = {
   stripPrefix = 0;
-  sha512.run = "703a1ba87fef258c0ac88403ad78f746180f645274f1d923a5c543efeb3d059bd57485d26243176ae2505a5b81769059989e322841807fdc7199dc8819bced1f";
-  sha512.doc = "b8884d1e19a3cea2e2304d90e49d8e646946264aa90a8e402a29e24a1dc7bda0b390ebdf0e931475891cb1b3334cc54bb51ba79e0f7b9b6eeaf7e0ac5d71c5f8";
-  sha512.source = "4399c2747a332cbdf40d400faca71785ba59f10881f27b63242a5a751decfb2253c96ff33af9835cf509044d606ed6c895a6c72b012a21065f36e9b997a28f94";
+  sha512.run = "ea51a316860811527c62231dbd902155fc292eb8c0c42c5b3d5234519defbdcf250c32b4d3f996f2378eb2277ba828e6e6495b605c8f5ec0f3cc812a1143393f";
+  sha512.doc = "98980b2d20d2ebee5dad51cf0cef00d1ed1ccbca553627499c4246f30dcd5293a855880fd8f90684ab403fa87dae87dcabefc7d33a7e08f5c7e6857192fc5c3a";
+  sha512.source = "ed63e68899dd1c0fa064d95f6c7fdc6a15519e0c608018252a9778717b706d9706cf280935b20e94be75feb28c9e86a4514452d74874cded3de85f22ac26cb0b";
   hasRunfiles = true;
   version = "1.1";
 };
 "termmenu" = {
   stripPrefix = 0;
-  sha512.run = "35475c03c9e63d2f88762d43517fb7c5cdd036c0f04b6934fae391802b2679b98a0b1adb3b35a1c6f2611e6c324c0ce318ec0ac6531cda7ebb994fa6c60387cd";
-  sha512.doc = "88ef782a73b40bda50899a3dcfc1171e43ec20e1aeba0a597031938f77818eda774861163287a61259941877ebb2a52b84015880632a98d23786d0a38a1ffb51";
-  sha512.source = "84c50e5349f2d39866f9d6fe65b005904a7d1fe51be7789f1d09d6b8b6279d64a488c9d5f3e75ed3adae005ba81407240da4d6993f73e4355845a879410ad4ae";
+  sha512.run = "1c31e2831c535b6be4ba8675c709d4b25187efd7aeafae0cb7eae7309654d401e7c94be2b9472ab06314f6ba59dc39e300ecd117d058073d8c1375907b081c32";
+  sha512.doc = "d073848edcf16a653cba92f9211a06af22dbe0a62929b824ee0ed811e363fdd795a8051666b4ae1b2ceb36f4ae62426199fdcd6dbf416f606f3094dd05a1ff04";
+  sha512.source = "bc7e838d7a225cea41a5769e8cc94a64250015d520505a6e469182185517638f13dbc94a6b0d8d23e79e79123f0a4c930844649a2a7db5ff51fa85acf9cc1797";
   hasRunfiles = true;
 };
 "testhyphens" = {
   stripPrefix = 0;
-  sha512.run = "7d3a77ba26afe67c8d4dcc1874bfa69ef3d71b2ab7d0d2f270e88924d7d0ae34eb32d284ab33cac88a947b9e44d8fe58cf3b3fda6cf802cd81c1a5d6fbafa9c4";
-  sha512.doc = "330081e3453e1d41c1cad7a6bbaf8acc88b15d7e88b76dee6303c3a5fec3297a54f2972331a520b8f007bb93d79a9f920b89d848d2a65dc5e3a761227e9d6847";
-  sha512.source = "08b9ee87c50fa47bb484d358a5a0a555cf4ab2318971813ef636e457fecf5a93d72a634397118ba2b67a72bed7a0adbed0479119cdb40988ba89cf1466e6f055";
+  sha512.run = "3c2e1b5c860be5e1e99ef0a6641c5d698342257fb18e4cc64f6ff089ce6b2f627b658063d1db3926e79acee62d9b2bb9327570b3deaf575b425a8be6f296c073";
+  sha512.doc = "85d506e15b78ddaa0dc74177caef04684cf8d21bb9c64826b5629d178eb4f72910f6d15d1740c41ee6b4df32c3e840be59c1211681dde5f5c1c7b2fc90a9595c";
+  sha512.source = "9f95e744ad3c9ed200ed0f401d9a76b5e63b9294afa2e281b2c0e0619302d082f51be8bbc41a12248b148062a56afc71433ff5d7f2e5278356e9c403616834af";
   hasRunfiles = true;
   version = "0.7";
 };
 "testidx" = {
   stripPrefix = 0;
-  sha512.run = "4a8a66e44bf36e1722eecb1c85f52c51640cbf7432bd5ca49e13235d4493da8f6f894c23775a8530acdb3379d809c45438b29981c37953853761d035a7ad57e8";
-  sha512.doc = "efeca0bfc2685ced01f633e031ca228a7977af7290753ba8232f12b9085c18fc90f78cac8b62c7e0ac1cb02ebfa0b02b69094d44eadd93eaa9707f649bd0d642";
-  sha512.source = "ec0b216e9fa27b6ac6be9d4c391d15640ddded2747b4ca1c18e1415b47f0e2a76e2f5800aec4cc8cf220407dbba04583e753a8946806bf893f6d9324c8f3b3e3";
+  sha512.run = "161ca87c3d01c270b2d7862c9a20ca8356f1c57147ebc532a9904389ff6d32932d8eb86598d9221fd986d2cc2a55f7ff6d5bd15806e82206ea110073e76500c8";
+  sha512.doc = "6e2089df5001c16695f9f104a0c6a21e7e18ea511cf47e39c63f75070525fa90a990047c5164f5e0965b29a3cc1889c63032d54adba498ea01a6ed83a788a2fa";
+  sha512.source = "8c2bc960da06ae8f327009172a04909e29d91977ab9f76b2920f820625f0e96773f27fbbce837d9fa3f28a42e2d1f7cae0b80cc18853c6215242a828747e8c89";
   hasRunfiles = true;
   version = "1.1";
 };
 "tetex" = {
-  sha512.run = "2251304b8cd11e727ac0b9034bd5ab27c3b96629864a6ec253794486d43474814950eeb7d89a11415991efbe28fe92f15bb52c485f8cb9da15cf7fd90402aaf6";
-  sha512.doc = "4381d1bac0caa9b605da8afab6cd593640c2747051ef18339af283ac7e93399569e437ae6abb12065db1cda6848d2e97126fb56e5f37d8b8220acba70da5d367";
+  sha512.run = "3721b7df926ed74e4e4354df5beded6f2fd7615b4e447c88dc0b80b13bfaa3f37923f5c743473331101f2f32a9e17b3f61a5d88feb7447b516e1e14de1241713";
+  sha512.doc = "f810d62b6efefdcc656af1d648dc5bbbc492dc39c6ceeb50893c39a94a72b95ef80a91cfec6de0c078747dbc8de09ae20f5cb40894f05733a479c057ae92779b";
   hasRunfiles = true;
   version = "3.0";
 };
 "teubner" = {
   stripPrefix = 0;
-  sha512.run = "9d1f5f4a8370d6bb9d21286ec9847ce4a08808ae45ff0f6761cb422e5eee1fac23374bb20e75bbd81f79ca0a0a78c9790fbb2b2ab5830245a0e5fe32c9e4972a";
-  sha512.doc = "fa25e9c75e69d46aa7dcb56076f3d9f2cf0fe21db9d231bd5cfd05c5925a46a026470c761c57a3ce0bbbd89c069ba1590a49437aa00e3e862978d6d6b39c6107";
-  sha512.source = "57f8c8b4dce26bd61c1bb5e0bcc106e51cdeece8ea989983e85df8b78cb3194f35f7c2de4552e8e9188e874c0ef06e8400eeaf065c9645225d76c98bf3229b31";
+  sha512.run = "0e54c15878dca0d3637f7fd8d33cdcc0badd7bf4ddf2b7a7d6d93d63c21033a34d28db850facf47e6a78e3d42806cac90fef699db6439a9356311a236150a880";
+  sha512.doc = "3253ebcea092b12c4c608ad28dd1f1610545d56714f4245b2a9401710374026ffdcb9922c53b2be18564bf0dc0588c616630ffe23fb7c50b9eb09d8d797adf1b";
+  sha512.source = "28534eddff0e94c7296b6bada763ee7addf3a2edcd4218dc9735af328ef572109c40cc7c1bbc3174d9ce884d230405f89fcb1df8df0706e22d288d6389981375";
   hasRunfiles = true;
   version = "4.8";
 };
@@ -24430,285 +25083,302 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."knuth-lib" = tl."knuth-lib";
-  sha512.run = "40c1046a422acdfceba108c2243e4686aa9ab332820d8a4ce74ebee770fdea4bec397f1e56e769f384dba04126c89a3db2d33b10c90a45e66ffe21ab9190aa68";
-  sha512.doc = "65052abdd321a432993b354b2ed55aaad985aed668ba04accced298e7042bd1df6ae8ed271e42240e4a8616661da83eb02b8bf65d123a1e46f6b2fe761df24dd";
+  sha512.run = "e93cb703b1dd10686dff459b507e15d178f42ef039593d072513b5fbb05bd5df94f2cfb0a0f2f489b84877048d8abe12ef7918c0b4cad7993cb5d67825cf1017";
+  sha512.doc = "0d3426c18101a8f54725ad9b86602f6570035bcd985b2a3ac1b43bccff3f41c4f59a5504ee9e00bda89cbfcf5caf67ae093cd6577e851ee8026f6070ec28f45b";
   version = "3.14159265";
 };
 "tex-ewd" = {
   stripPrefix = 0;
-  sha512.run = "6b88c31e7c81733db4bb87380add2c1611f437df91189ef0a4eb1c10bfe50f17fa301c0887f18d5dbb79adeb75117f7e109c069b26776b9188d2556cb023cd17";
-  sha512.doc = "f8afb01f5a7008ff633b6e2177119b8aac1131c6b84d39a45ac12baf9594a1e756874b9f97ece3b3d6c984a8c33cc1b098029dd9a32fd5bc661eb8eeb7b55a68";
+  sha512.run = "d738b2a8913ca87151b90ca547dd4a35e0ab10f51a35d158e9d2e1a299fa72c3c6633bf3d2a3262ae936596b81ace4a70380abd9613485cb30d6a714bc2e2d15";
+  sha512.doc = "d89a1b3ba7c4c062c9281d13e6e41cc7b3b9f3435eed506e25bfd9642b1e73bfe999440d5fbcb47955d3d797ed1ec72b28f67267a7e6fe0ac5f49ced3099b277";
   hasRunfiles = true;
 };
 "tex-font-errors-cheatsheet" = {
   stripPrefix = 0;
-  sha512.run = "2b646035587288f37df57388e83e69c00c334b75a7b66db8d610cd9f0a504567e79bb7b09d86ed98070305ceee7e5ffbc63f9a8ac2914ddf897f6e8c120b7d1e";
-  sha512.doc = "8454773de7dcbddfa0c1a2f6ad5bd21154a69cc6790df03e72deaf5a694050585df55aa5ae686f23b5015390046e7b8b9de06dc464af79b7cb17ed60f5d9ea8c";
+  sha512.run = "6d5d54f0120cf9a9ab0655cb1715001624c3cae16c3840cc2cde2237f0c53a874f393ef63830b28f4cfa55117b566ecae6ff4415ccc82f95d89dbc46eb91a32c";
+  sha512.doc = "19b0e37025058ea8cf555506575c5f9d96dd6cb0592aea8e8a35644c2a1f53cc97d5d38fabe02cffde815fa437b33b49315b4f5822a44c45b59d2c6c8acd93c2";
   version = "0.1";
 };
 "tex-gyre" = {
   stripPrefix = 0;
-  sha512.run = "2850fbe76a851c726ec0c7c1a77508310ce5c459c200d96c3d7d801324d3555943aebc48af4cc20eded2abfc0ebcbd182242729a9d32106c5fd5f488881902cc";
-  sha512.doc = "6948c23322b2dabe8ed58508f110591c86f4e33bd1746e5241ebf3176127841464bfe5a33587c9a710c228db54a578b6369942964ff07a9435ffe793dc5d7e77";
+  sha512.run = "95000cd55940e8f2582925400eb1fb9ed8a59c71ed80a00b6d33e173c707fb9ff7597d451f3d1865e0a74084b07937df391af35d364cb2eab1135b9879cd45cb";
+  sha512.doc = "fb04ddc1a6cd0318261cb8ab9a1636ec9bb031d16261aaa69c4a3a75076333806b243e183bdaaf25321dec445e7d2c08052b77d939166d8430ad0689ecc62d16";
+  sha512.source = "8f6bf4d10a59e35a2f5d7fcb05a4806c24deb1fff295324fe3665d92d73869e97a86fec7958212cf968f2611c64a65329387a30c77ad968af5ffe0b1aabcc5fd";
   hasRunfiles = true;
-  version = "2.004";
+  version = "2.501";
 };
 "tex-gyre-math" = {
   stripPrefix = 0;
-  sha512.run = "5d27ac0beb5148b76ae1122226ae0cf77f6edec7d95ea2457af97ad3eec89a91f7ff261b0cbf6c30a7a9fbac63bdcc00454c5e13bd1e4a73855bd9ff9fa69011";
-  sha512.doc = "e6640f4e29853f59bec27fe437fa14c13d0abb3ed916515cf91027b387fce54f5747288885a6526c7e5e9b672d88eff83972c44c1ea268675c53758e58ac96a3";
-  sha512.source = "f2c315c1ba4e50502b978dbab7eafc5f3648d9d9497ee2011357e53cd64e7eb976dcbbe71d3331165dcc331531b5a2e543bd2bf6134a008b6f7926606a389ab7";
+  sha512.run = "5dcdc0f54a15e58e1d96c06b5f1d21f1c965acf0adf75d77251485cdaddf627a468ccd4dbf6ef3d7e7fafcf14f5934d89091910e69019ff121cb65705ee7ed3d";
+  sha512.doc = "de482203ba164b466cf14aebc63e35866897e28d503469d1dc485565b49c519336fbd2e0a518a341c1acb0024f776b678303ecae3198b87b704b0f117fd962e3";
+  sha512.source = "495c16c9924327895a122840872bef55e13178ef14506083922f12f07582b6ca171880389ae9cd367528cd9f2d6e0fe580c893b9c288ee70913cdfac318468b1";
   hasRunfiles = true;
 };
 "tex-ini-files" = {
   stripPrefix = 0;
-  sha512.run = "2795b5aec113b56764216275497ade6946a8f2dab95c0732260786bfcb8250c6a18d9cf594bd89590afaae6d53a5249002713abfb0c38deb999281537e1dcaec";
-  sha512.doc = "cdaddcbc681e696a18e37359161397f073ce39deadb9470834912cc7c397102242376eb9f0c1c8542cba418f2f962ab0f5b0410c9a457b363a3bcd94a1c20705";
+  sha512.run = "e14801a4b274049097ddccc7f25b24e31d11b4d17c894027ff5fd9b680b2d8b8c153ab4c617e59ac581a3e2836da72b63b6ef14d7a0452fd25bcc5718b1c98cc";
+  sha512.doc = "2cf0815a1db1b2d531b0cb897929ea8ea75dc443430719657152beb2ddebc1916bc4045ee1cbe268773c766d0c0d8f1ed4f9bbadc14e8254178a7a76cd0e7525";
   hasRunfiles = true;
 };
 "tex-label" = {
   stripPrefix = 0;
-  sha512.run = "7edf4511ae5c4601a81ffe84442028ccb4dc7027a3081966c48f42d3c3406e443a3c1603b7ee812ea59fd5055ff23df29fb52317d2ff9dfd623ab85ba8c35b3a";
-  sha512.doc = "9b53d67a4602d4ec5e3a942a273548eb6cf110eb2b602db9c0ccff7f8248dc41c10835e6d36eac10411c36dc5d2bd40a2a3cff30e2ee13ddb06eeb80ce9b6cbd";
-  sha512.source = "084db9e0cee617a651ca89ec76aa35bdfd6e882b3c68b13a47ce40c6af36a85f5888d44569025b5e45972c03fac294df88a663b61e956f0dc31fbbe7e6f0c029";
+  sha512.run = "f21905ceacf5d038bf52d82a46fa83f6ec4ad62e508d97cf8487f47983d68a114e9d34ff2709a12f081e5fd12984af0f05aff6ba3292591d122c060ca172db76";
+  sha512.doc = "1ab97b181e9382a0f40ce94a392b069d5f207faf8f4b0e56307f5b02181df0892d7d01b31d3ba18ceba5f0c3ca588714148d4349b94ec959836442205b14130a";
+  sha512.source = "006272a6940209ec6c27c5de951c9772fea455c68515dae75b725e7687e61d6fa818d7a29850ddc5bcf5bab21d899c3d58007980e2665735a1e508fe980c45b1";
   hasRunfiles = true;
 };
 "tex-overview" = {
   stripPrefix = 0;
-  sha512.run = "016d31cfb40fb481261645a45f4eb8351b7ca716d6684f7521b1bbe3fa25519e3fbce8f5da6425f3211dff071ce365946ba6a64f88f5776e06cf866786eb4f43";
-  sha512.doc = "bd4b06202a98eb90486138b6fc98613055667632ff188ae7322fdd348c850ba862fe76f46488c21b5b4dd03e154d005acc0c6af3e5ba49e469eb9f4e34f9e092";
+  sha512.run = "86a509e2a488324d8e465e3d60a4aa14138358583558a9b6ceb5b84cb6046656c19f0c06e2ef2ac4537a87c39d6471676ecb1e6be75819527b087168342e5320";
+  sha512.doc = "88a56c1ffdf50a2e1f8a3a97b9ae109ab73124475a369939f85ce04bff847b59b7be81e6dbf942a516c6035b6cb5ce3f952d982dc30c47af1ac9f49f15d63c15";
   version = "0.2";
 };
 "tex-ps" = {
   stripPrefix = 0;
-  sha512.run = "babef9fd918b96e89d6e44d2910c13b849034d54a4a1433aa919d6d923a370b8a64586157cbef875fcf53aede54686a46767dac1a6d5ed232215c22903c6638c";
-  sha512.doc = "cccf450086cda12b121c1d28d05efb2f0d5664381eafb8f2e1e53e66a663af866beb609803b610dfa77df7fdce57883c3dae1c926f5358e081b91009a905eeb6";
+  sha512.run = "b810f42bf06fb92eacea23e5d29f9efb1feefce7d33ece253596ab29e8892b6630246380f5ae366efd2a5bf2f906715fb9ff6e77b49ac1636673f7d6fb3666d0";
+  sha512.doc = "2c4b19d791afffa03e7ca0dda2ab69e792e858d9532480c1ece0abd82eb9cee3a40dbd22b370a549d6212fd461263a5e8bc21d6a89506a447c52a437a6d04f71";
   hasRunfiles = true;
 };
 "tex-refs" = {
   stripPrefix = 0;
-  sha512.run = "6b9735d4541c099ad7194ae78fb3d273d650fc77f9de2ddf4b2fda29c4150d5a7339d496fa444e4dcc9bed4073de481441a0068895502841d1d381cab581dc2f";
-  sha512.doc = "e1ef14f3be791e2cd87e13e5fad7d5f8e41ea85cb2f4adc0255298c5b17ad8c822e4642176c969a3bf9e8ece27a595284061ae4940db9a6cac1946f75efa33f4";
+  sha512.run = "d47adfec47f3002be574a1efd0836aef6d6164f16643db16dd729c70c327ef553e487a3e2448b20ab618b8f899fd45998c6a4f824736f4d98f94ae77e76bc269";
+  sha512.doc = "9ce7ccacf64d8c51bdb5e8683cedf15357db21fd62c72c2e5e9f56e1a489e4c07eedc8888388e65dea2a0eee06028f9c4bdb2a0b1bbdeecfcff1e04c2964aa29";
   version = "0.4.8";
 };
 "tex-virtual-academy-pl" = {
   stripPrefix = 0;
-  sha512.run = "9f06fb42fdb3a9a1fc8dfc9fe80991537539b8992b4e06a40a3d3e57cea40ed900801638fe232adeca9129e0396d8e30e046fafe83a02c86a1b49d817d21a0cf";
-  sha512.doc = "29a30add58e9fca0d0dc63c487faf5f0a74b12f409f666afa5cd5bf7c18c833c246d6b4d70fbc13b2318af638d95e79279e7b37f46889f970e777f0f1bf5a058";
+  sha512.run = "5778b8952522cce7680b351c4140b5a784d48dc8d3630daad73b6f6b6514a439dec75817f7d9e25bf383521984c8e87291fd6ae3431bdbe23bec2b5e591f2c94";
+  sha512.doc = "6985e54837c1a71232d50b58aff5704b850cdd5943bbebbc1fb1e594ed25245cde35733fbeb5a30db3e696d9ddcf379bcd16588bb9e0131b7aea2d3f3665cd42";
 };
 "tex4ebook" = {
-  sha512.run = "5e2743d928ba2198df053f485f8f578b49666473be99d7245b211c21433526159e64c3c8b54e6c3399f2a7a73970211a8fd9a0f82cbb8237d560d1790cf5fe64";
-  sha512.doc = "f0593db9ec81c1f8d561ca8bcd3a31e7aceaf37c97946d16db9072b5ca449fc1983601620187fd9ce3ec6175e20446da4bb588e3715e19c3322cb66990bd3423";
+  sha512.run = "d249eb2d9c9a1614286a2f351e382d40021c3e21b40006208912b2778f2fc622210ca98b2ff441adccbaad82e64c9be5062fed3b40b967b64f804df674e37e46";
+  sha512.doc = "515a3b9e536686c9841f6713f2bb533e96ddf1580944a9b1c2aee2bb964836b3184e1e1177f41b302a3396c6592145f6373fe35feb3788743359a14ab575afc1";
   hasRunfiles = true;
-  version = "0.1e";
+  version = "0.2a";
 };
 "tex4ht" = {
-  sha512.run = "fb2a1b42955adfda4760f242daf1ec6800b05907c5e864f82cc34ca1e85ea2583793330ad38ef8e04867165d434cced17ff8aa57435d7e85114bc1ad70ef8a62";
-  sha512.doc = "15e6554a2e5928aebc62fcf770073ebb05e1869f1797b00cac81fcfac7835f42d92f4898ca5a38c5d822135dfe8f3bca2417b6b99ad28c1816f3476e3ecaa5b9";
+  sha512.run = "c7e5da3f7f29c0f4ddc96e994564cbf8658bdc537bb974b8eff54eb7d1c2283515cbdbfda84e11c3fe86dc8e364d80c5a3cfaaeee4e8b320f285e17bf2654bfe";
+  sha512.doc = "925cb0e435120ba382f6ecec598c11b49c69fb6e8d5c58375c6e360adab30f2dc032affa60b71bb305ceb175bbdc8c53d7de10e4f6654140a1197015e0adaa31";
   hasRunfiles = true;
 };
 "texapi" = {
   stripPrefix = 0;
-  sha512.run = "e982e7cc37ed12665c9df8cf2c4918b64efc7f968bbb701596cbc5d9b8dd7a508b45c653342f09edd4315f66b6d7e53f6716523bcd750e76a60942aec8dbd59d";
-  sha512.doc = "42aced04389e0cd30cf7714fca97789bb940e12636c563abe9da43b94e42a713fad318ae068b94e9c99074bd221b6f76ef4eed0d524b214d32867217024a9601";
+  sha512.run = "d3c9e991e2dda17f778fae71ec74420ef989375e01fae5199544338feb57b9e29c4dc02a75ef61844989d6d629101d892ee05a8cef41c4620f1f2b9689e83787";
+  sha512.doc = "d238b88bfc10688647475994837d49143f25c48c761941c147dab6ac998a5f5d8c3e7e5c82d1a7ef549f7c1cbd65a0d504c3d5b2dd6d4a83a07c940f979f9104";
   hasRunfiles = true;
   version = "1.04";
 };
 "texbytopic" = {
   stripPrefix = 0;
-  sha512.run = "ef7cffda856c91536221236ae5206ccea427691ecd12925fb9e8cd8181e5e485687aed42438032b5b7f1e23d4439469c314b703a4c35ce87f2342309d584acf0";
-  sha512.doc = "c387d58ee1e5941ca2fd0d39d953b3630f77d60be0a0fe56345047768a836dbf009910fd0d3a89310271262847d46536419cf363f87b3730bbe966b051847d57";
+  sha512.run = "17af30045a7c078120432fc44ed3d805d5c2aff9a96b2f08b3ba208e65242156448bac0a4020979ed8a75ff2c7b850172362217e406eac3dd7536602b6ab6eb6";
+  sha512.doc = "074242caf91df4219883a041103857ac35ecf4ea1dccc780cdb5641d8d2770049f4399d026ea32cc12e47563f52fc9bdafbda7a919a53db7db0f93f07989d035";
 };
 "texcount" = {
-  sha512.run = "c539159161347e10b4abff9aaa43efe6c514f96c977bdc759b7921399191b47791789fcd1d2850281db51434d55cf767d790e7754c9b8f3119f3f14b57706468";
-  sha512.doc = "67cb829c6c49876852faee78f2eaff58b57c699b666abeec62d562e432080ee664b08cf861ff15c8560b6c1887d23dae490283ef9f79f19a66cce4559d7ca6d1";
+  sha512.run = "1f99c6d8bbc0c5d71304b84458f6c772b4d7caa3af7503f083b76cd545e405a0cd50e3c1b23ff722ff26de85a6e21d2397491e3884937cdee2203e55024ab530";
+  sha512.doc = "e94d51418b66d5750833956465b608cdb725f2ffa87cf2bc05e9f403c729dea518cb47485b3ce02164cc7e139ef3b04f97b4e774e39c42d41b1da5381f7264b8";
   hasRunfiles = true;
   version = "3.1";
 };
-"texdef" = {
-  sha512.run = "a0ecbd208c365e09111b5180d952cdd2ddbf3e1cad368ac3c431b594e29e4f8f09919e0662ea17de30fa16ab48d39c3f1d0068832d4908175e64811546dbf141";
-  sha512.doc = "bed0fcccdd48087453dde76c416fb39b197ef3ab4b33a4222997b48aea91d2cbdc3101041dbf86667e6bf6c86d6068bfbef74abed7b2326727e7ba86ba509baf";
-  sha512.source = "b424f3a553b02548c969d7097191a976e6289045bc7f86f1794f1c8217770cd53e3f13d722b3de52cf1a749d43d3be6b4e45d5fef474f5823b4542e54461e1e8";
+"texdate" = {
+  stripPrefix = 0;
+  sha512.run = "59a4515110f57f5e15c7ab467509a7bfdf28cfd087bee1a0601d58937b8c2fbe2ae4a7b957f247fde62d30afaa8d7620311746517b1bf587c5d8b3b0da8574ae";
+  sha512.doc = "425d84b23100bbd75f700c1340b7fb41581e353ce605734e217b36459fc8b455ccce45a38b341bfbf8df7e4e5fe4394dbd541df893167c7394cbb6ec6df2b25d";
+  sha512.source = "4e082c310c87370f21aeb63c55321cd4a83ab83fd3d2046b867d09e0cc6bf99cfcb0de6f725e18a7fa05ec27698776818e23478f6078d5e092b25bfa237dc25d";
   hasRunfiles = true;
-  version = "1.7c";
+  version = "1.0";
+};
+"texdef" = {
+  sha512.run = "2f30d8375dbfa150901c8c1c392e444cf2ab5c42b98602b67ffd8267507ad8a1b5e4a811d7b6dae2a28416b17cb289268e91d53a9fd613be8ea37b240b0656ac";
+  sha512.doc = "53f4932f85d39fe17ed098450019ceac132df0247723788670d203283f0c640a76ebd86967f0bf9794c9b6fcd899762f10aae099077ed82a79009e97c9381b4e";
+  sha512.source = "26ee8402681131f5291db0b3a04bb592ffe940e22df4a67d2e2ea479debdb80bae49067f5c3ea1ce3975ae3986a72edf171cd68b345c4efd86d70230461d8ba7";
+  hasRunfiles = true;
+  version = "1.8a";
 };
 "texdiff" = {
-  sha512.run = "1247b8fb5c2f6a66a18c67728430aba6935831b555de1bf1880f41b0eb23977b73b0f9a1bd99b20852dd0742616566680074902391aa405fb7c5f8aed931fec1";
-  sha512.doc = "b67ecf676c13b75658d7763caa80bc1c14841d59ba5149ec4a9bbc61e07ba8104c43e6c235a3b6d19ed6bde924dd505b7a002325961f75af60037a7883c018bb";
+  sha512.run = "2e5bc09c33a372b070d1e94355c76f803e2cb3f8c801fed5efdbb2990d8880def13dc842210c4d38cd866928e03d499baf4d304567313b4f1f82d12d48768d0a";
+  sha512.doc = "bfa104979d94d7cf7353fb75ac2b537a7a6b45762f29c8348c94d17c881289d9c8f45d04a53dd7263046cd7f6d38a8d3f90ab4c7f1a75233a3fa95bdb36d2128";
   hasRunfiles = true;
   version = "0.4";
 };
 "texdirflatten" = {
-  sha512.run = "02074fc5db80d66a3668b175b2c899c287fb968bd64849e66fe0868df734fb353019dc7bf0c75123fef6e52189c170c25398841d824d1b7a4b86b587822e693c";
-  sha512.doc = "8c7d8978e6a5ba849a3545808a7c1d2ee79699e28ded36f0848650c10d35f352a9e670771000d30e76c9c6276993d41b229e1e815301f6dc4271ccc68ec7930f";
+  sha512.run = "9764553a672d37e345c0eaac39c84479e46350f39f995e301cee7fe7396c4dcf55a2f51120a9d94a2087cbf7dfc448658eaf7d9690c89c97c23cb60ac12246de";
+  sha512.doc = "5c584b58fd02be2c6adef72d6b846bd193b4aaf02a21e5b1f6b80a6a93af49a9d4a12569d2aa4d9b3060290c51bd3d1e581310f9601668d27ba193d37b508b11";
   hasRunfiles = true;
   version = "1.3";
 };
 "texdoc" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "6b9171e57352b867aed10a1bbabf4a56afcdc3b4cc4514dd1bbb700190c2a0f0f080360ff074c13298a01b2948b340be2d816e0fbe7d4a9d47185d3c2ad13230";
-  sha512.doc = "57a352bd0c46edd5077836a4613c9c87963e6c7cefb8a9eaf2469274beaf1e83e7702007a657e1e61c80cac0c205de0cf71421cf6ca948bc70ea5abddb637ca3";
+  sha512.run = "c8e25291eb8928534f6d79f13bc35d6be7b207a27083d2d2bae4bb31f6a79cc8941f45f057472cf7c4298602452cee9b6f3f0264849d4daf6accffd73ed2edd7";
+  sha512.doc = "4b105ba04ff13596c7bb321377301024aa6d6c4bb7246ff21b6741e42484e47fa5378aec7a1d090041cf5c067a7ee73358eeb2be86d9c14989cb550fddce3775";
   hasRunfiles = true;
+  version = "3.0";
+};
+"texdoctk" = {
+  deps."kpathsea" = tl."kpathsea";
+  sha512.run = "2200e4d874e5b48d75339395330c06e4193181dad19e7f4bd27fe2970baaac680c19682b8512596883e1f71510f872b6c699bbfc036ecd04fef5ddc281b1a164";
+  sha512.doc = "c580b2c1b3fc055f2acb3907064feea91132310fa343bb6597102e1d4d22b0a3cb3b5fae23c83214edb532d10d68873d48902df98633b2d31ead9f001a5eb0fb";
+  hasRunfiles = true;
+  version = "0.6.0";
 };
 "texdraw" = {
   stripPrefix = 0;
-  sha512.run = "a80e3555e2e65b0d312c9a61c48a87d7f0ed5d5ed689faa2f31bc629feeb9229cffb98c6b18248638c4c6e1463ef4a79a96fcfbcde026debcc236222d7fee60a";
-  sha512.doc = "5354887cdafa2d317bfccd5c3471fff2e584c654a0a211e6335648161975d09071f2b38acd53034b1600dbf9e93d7aef0e6ec09320e8ab101dcf4fab56f60cfc";
+  sha512.run = "5a8ac698fe8470d85de66f2ea010c335cddd80ff7a87c5a91731a1abb15c42aa135f9af248bd454a1094a4bf03343fd508aad8b9e21fb58c65f71fa603493759";
+  sha512.doc = "ab77322e2c8b581c9d375aaf38b0269ada7fa72b32d4ebd1b38966cbabae772b49bcaa5e5a33cb080d9519af9bf65fcc4f401ecf6b3f16ae9f33940bb2ebcee7";
   hasRunfiles = true;
 };
 "texfot" = {
-  sha512.run = "241760929a0ca3e18801ca3e0481f08cc2de07600ca09fd7b150585fc5599f1aff0eaec6f051d2b03ed111990b1eedf6ff853a0780564499b4805bdcdf611c0b";
-  sha512.doc = "7aaa15850c96eab3396f7acd311f1ece887f1da60fc2e09c967d82381191b0e5308db58413d8db2557d78506f420a3bd92233ea3201fdfc99cb50310235b8974";
+  sha512.run = "97e64c6891b399bf5c5e0f02e2f9d9b43021860d2cfcd3c5d75818954d95d0301483389fbc56a5f1e0acc2d64552c43b5d0f1828d2c3c1d86ef55887a6057930";
+  sha512.doc = "e025fb17b263f3b88195100aa31f4b5baf817d62aa6c0e2d08301822a9b89f92f5a571f2cb55db1d67c77a252dfa68fd35c97db3be97f740d04c37602d5cae9b";
   hasRunfiles = true;
   version = "1.37";
 };
 "texilikechaps" = {
   stripPrefix = 0;
-  sha512.run = "f2a816d32595effe727d7bd7cde6c1d03a5e91a6f49dd18a3d0fc3d7ff3d5f3fe6c388e6e255d61ae351efb389f8bd4548b4a7677f7a21b45574b93f1f807a2a";
+  sha512.run = "65f9d3d047f311318f67f5aef968f0200a464770f099c698634bf243122182161138fe0db25efc0834e4adae05f469bbbe9f9d26d48d949a4fe94f6f174a7d4b";
   hasRunfiles = true;
   version = "1.0a";
 };
 "texilikecover" = {
   stripPrefix = 0;
-  sha512.run = "8ead076fa1fdfa0355322f2fb9fc92576ec4c88b17308e92540f83f7d06e0c99a9248ee3787fa8279a84fd3b7ebc43cbfb14dee5a6c9bf6d573bed5b81e12008";
+  sha512.run = "c4f4717a9d2aa0e4e677a859acca1762e7f9c93885a9852a2f27cc1e3f92df37331d7b0eeac7872c848a19c4e6412c186371d57ceb1e4936585afcfe76cd8089";
   hasRunfiles = true;
   version = "0.1";
 };
 "texinfo" = {
   stripPrefix = 0;
-  sha512.run = "066b5ae563e44c49de4a9387c7e20dede229fbf75194bf3996b2820d98121d54427281250d49aa530718eae1168fe4f59168cdda97b016c269ad85e838c7ed40";
+  sha512.run = "f3f82c7fbde14a3b6b5de1e61d72fafdd945b5657cd82a7e3582c0b82f4e494139fe7acb74f43dc62b79d0e4df69d05bb78ecdf7b98484cfc92bcfe3c8d2ee59";
   hasRunfiles = true;
   version = "5.1";
 };
 "texlive-common" = {
   stripPrefix = 0;
-  sha512.run = "93c787fe79e9e7983466630ea598a1340670d3403ad63df028883551fbe3b031bce2bce9a2e1a4006ec3d2115d287efcf8f5a5ff6b5122ef5694a0fde28acbf0";
-  sha512.doc = "4ceefba4a16fa38003cc08b8e933d56496a395b1718dd1b9e46de8502b16d94d95cf2a6ef38ce06c3f75a76192069471469ef639a8515e5fce27b09885b6e31c";
+  sha512.run = "55daf13056d3f75047fecea3ad0cba05bbfa342d54d8914ca6df7494e14e297d9380c22d6aafbbe76d86a79edd4b20aef55ff38fd2f4c6d64a6277bf90729825";
+  sha512.doc = "fa44cd5aba2db8502f41b2ac1c061bc235a9edc14aed22a3d789c5e6c78bf736069d67dd6eda4dddabeefa78010c844c197bfdfa3e76e18b874ec1c63712cd5b";
 };
 "texlive-cz" = {
   stripPrefix = 0;
-  sha512.run = "f39194d8227173fa34a877c0f2dd43838d23041321c734632929b84ca881815beae3543ed38878bb004ccb0e447e55fbf1a951e265fa0206033ff97639d2aca6";
-  sha512.doc = "914b96890fe0d136ebe7939e3659b9b93faa0f226ecef2a6bc06d058680a1ad48318ef09e6093eeb48073dfb32b65d141b80f36f631acaa9858d6ac72279e1bf";
+  sha512.run = "104a8357b0b372d5488995ca8b9baf4ff08b5fca34d65871c28b13f1a670b91e0e508daba78238c1422c58660146822575d9011328c92dc66f238684793e0560";
+  sha512.doc = "103599893c3a77fe569a866bb31a96e9160afc123200979cd6b587239685f891219bb53ed36e9a3a44d8003cc803215e503d6cc312198180ad59cc3473e7de26";
 };
 "texlive-de" = {
   stripPrefix = 0;
-  sha512.run = "d5ba038826cd6a62610dd772cc8c367fd2aaacf6f4bd39575a247e0b322f1faad28e914e94f96d6d8a4226c67fd6366a9f79f16dc7ab90c94d59874ba56be005";
-  sha512.doc = "cb36167bb4500190de30e698929fcf3f83f70a250514390fac4b17537c53524049c192a3d4820edc585a6ec617eb5c62f73b360a2d97adc96b37b8e7f2569f5a";
+  sha512.run = "08c67c0c348eadff200e98606f4c0b67c7e9f763e84cf12117e938fc1310e37a8a55177948771ad9e4156955dd0dda479addbb3caf1a067c0e5aa1ef7e815a3b";
+  sha512.doc = "a575f65e317d8d5bab4591dde8cf2958c821f3786352b09c5dd4c5b6f6069ebcdcb005405aeff2e13a38afa5bf32f00bfb60159f215048734c5871cf6bd0d06d";
 };
 "texlive-docindex" = {
-  sha512.run = "ffe6fa7e2b4b4c4937a08a1b8aba6107444fcbb808cd875f666c44b41e49ad9cf124aa01ec870ea1e5bef32a5449bea80ed105efa77e14a1e63a1c263c5575e5";
-  sha512.doc = "ea863ecbc7c9cd95c51735d12f67cb16f8e959e1c220a755e0ca9c23b74e1547a523882d8aaeb8c467591737048bc7c939d221c1adfdd7cf330d4fcfd2fbd1b4";
+  sha512.run = "c9cb8d7ac699f2cdab7cd791f6dafa7f785b21f183b25213fc0f1a983f8371e82660adf547966b4090b1f0fccdf896e51ccf027c877e453ec700ac10ebfd3bad";
+  sha512.doc = "1510f94586e35968f21bcc0bffb192a1c25bd894b605d22ed8c54544bdf91d8addf1cb7fbee0b5fd4a28ea4f8f8d8c5978fb60914c7cf1edcddff3b8ded5d180";
   hasRunfiles = true;
 };
 "texlive-en" = {
   stripPrefix = 0;
-  sha512.run = "53a670ec2647160312ceec11db4bcf050dd140493272f4082ff66ae4e86ad9d98ff2f595cb217b8509872c4a9c524d1f7ca103179daf86ad45ae50812ef4ce16";
-  sha512.doc = "cecae692a9acc3c84f59168356164a2b3d4553bc7b26e0fedffd7501a1e9194e2a036485a4feaac86c24be688dc47c8ef431feda0864cc2b66b59306687c6e17";
+  sha512.run = "dbbf5d8fc537755a353f0b4c65b868f8bc175068105dc0ea87d4056c27a9c6272f00814ecb235729fcde22290a08505f4167ba446a7506815f7b69cea3617adf";
+  sha512.doc = "44fb2b2fd811ffbced1638c7b16d4803fc39ee68a3727fe726c34d9d7bc8f9e8b96421e592962a29dc205ce3c7c9e759779b2c1bb254b74fb83ce161cde266d5";
 };
 "texlive-es" = {
   stripPrefix = 0;
-  sha512.run = "3d04cd70ad332bb7e1ee0184f23c37c2038938b38e4cf026117e01d8ab2bdc4f0846e68036cf96831f7b9eee79ecbc5e4cb3abce7d109476374f163006528bf5";
-  sha512.doc = "12194458b6a0ebbfcd51595bf02e2f33f7d7a367ed09ce35ddd080bc9d7fb8471008bd5b97c7265ccb12714d06b91958f18823e1079cb1a7396b412e06418e3b";
+  sha512.run = "f5e9404c19b4227c10a07ed9b35e202b41c038b17ca8b324d74fb279a95ce334e8271f233ee3333ab51e5b04da4d137469e4f061164f8ac10b843a158e38e656";
+  sha512.doc = "6fcda16d26282f387913f0b34b0daf6d4d068f4e15b34cc9fa6cbeab1a6f3af45cf900225fb4eafbb70943e8b76dcd000ad0bc27719e0e127f6ce73f629bea4e";
 };
 "texlive-fr" = {
   stripPrefix = 0;
-  sha512.run = "bdf6ba7ed88dd8687ac9f59d7d8092e7135a3e368f1c5975f35c148c7c351618b5c5ea4664b4772789e61ab39e3062036eafa45ebb9b1acb91c6726a23e41ad2";
-  sha512.doc = "b24759873e0d35c18861c10ccc4d7fcf3993fa493b4c2bdb1e5108f2d20863ada88a0fbe26faf24122d065eab7ed28817ea9bb2fb803167c29cead6aa0516319";
+  sha512.run = "2a94d599c4abf546ae8ad697e359bc627904a9706951899cbe42c10e0d500d212b882e6c91bb6afd27df69e6737f2e01f2299ebbc29eda792107db10f530af3e";
+  sha512.doc = "11e556f7e078f93fc7055b09a9f296929929ae111417d3dea8cf57e9ccf5e0b6fc4ef5a39ed233e8e70f6c9b10944117fbcb292ef16e0e4fc9bfd2d52f5d8f3f";
 };
 "texlive-it" = {
   stripPrefix = 0;
-  sha512.run = "1bb2cbee2e7046b452540dfaf96305b00418affc17f36862dc7efeda5e2c7e8e3a14e57b667115c3367d36af7af06358407845e466ea25bfeda7af00ac751574";
-  sha512.doc = "4f50a36da762c4ee000e93df770232d97726f7846c6d3dcdb9333849479371334f12c7acb454441f5985c44c0aeefcf1146136eae3ce69c4daf9c8e2af89fb9a";
+  sha512.run = "043e2d7d8026c6a3fa896819a4ca10925e1fcf8e9d64351661cada51e33662384b71bf8fa0981faf5ef060c62a08c993ff71168c8769545a37e83462f768c5cf";
+  sha512.doc = "70aceeecba1037edf17ea81c2a0b1cb5cdc36519b16bd68c981e9578e3ecc5c732548a8479684d9c95ce2665f8b837a390e8b673b0773240ffc3f449cf2ea3cf";
 };
 "texlive-msg-translations" = {
-  sha512.run = "24bec7e405f0c64b173c4517838ef6d2f9435aed52f1a113ed86476bf603510cf14aeb843cdd709a57839c75cb3fbaf7428a783257ae2bd9bb4e3dcb3f7b6155";
+  sha512.run = "bda93a4bbf5a20c9814dd1c42040ee1587cb7391026d2838959d6079fc8e11aa03b5073c6f59c3f69595972aba662b235c303605c0e7430d1c867b2fa46600fb";
   hasRunfiles = true;
 };
 "texlive-pl" = {
   stripPrefix = 0;
-  sha512.run = "0461a072b44a9fb6a824ac702a2b90f21a3c76b20c1dfe27825d51da9fbdd65c5d570bddf7ca3debaa45f2c092c45afaefdaad0dc054ea9792892e1e928c0cd0";
-  sha512.doc = "138dc8ecf8cb772355f146977f209e167a0ecaae9f2a97bde9390d6fb795e2bf10c26b989d9a5016a89f3056e85990a96824f215275f361390276941dbc0a83e";
+  sha512.run = "6be6da6a9e86eb07c4fe363ca677c5ac935dd7d5d4ea31e20947f2bcb0d5e13bed4fbf81c180a94a155d3ff93221cf7c4ca618e8c9055564603d5bef6d8c38b8";
+  sha512.doc = "c1205fc00e493df442a0fc65805f45a791f2dfa9465cb27886b87c67aba55f5fcf8dc05e5cfc148658b79cfc6cfa3e22beb00d7037bee57dfdbe0edf41d3fc7b";
 };
 "texlive-ru" = {
   stripPrefix = 0;
-  sha512.run = "7d5853f3cd8eb7db6ce7d8eb5ef3225095ef9f811c2c17888cf71ba096110843c1109600b65cc49b2fad65125105a14255d02178f07269447f51a683e28c0609";
-  sha512.doc = "e9136ab0faa2730e35d8696e3b48b138ee4cefe79055caec88fcc65122d2ce47f323353ed273d1c93248c71061f7e22d8b70bec4df056947f723bf815f96c834";
+  sha512.run = "fd8aabbee8f59061cf276239acc408845412558da75f516a82bc4fd87c3d8c84fb20555a46cb9a2cb9a39c1d5f630a38f92e0bc8183a43d595cdf30f04b1e306";
+  sha512.doc = "6c32216a52415b04c61ae276f9c15253929b10ee50cd024f0f6d3bf0a78c7c8c1787bdbba1ed4372f28207c7d5204085172a70ba4a20f595b19ed9bf6715f89d";
 };
 "texlive-scripts" = {
-  sha512.run = "379eab393d9eb6185668c9e237f0d30642ac34a0d9ca73055e2a0c1f5973de5f78c45ed17e443ed7277f69463de4fdc105b8d84bfb3a9baf6acfc5b407a57ae6";
-  sha512.doc = "a27d64e843afe703a32fabf53753db51592c56a5b62caaab678609abb4cf516f1f51f5bd3f4e62285ec3d5e2a96421396cd6a9beb7427b0aad776ea652437e6a";
+  sha512.run = "0243a341b062ab139e1f9cc09d13a88fef26a85cc44b9d53ee6b889f958c83b16e3a17cabedff4db04ddc4ee0cf459fb193bdc75fef006a4ebfa55409787d85b";
+  sha512.doc = "8a3cb3831f2b55cc8659d889ecd392c56248d33c409a1fba97fe22da8da3ecdcab0540dc98ebd6064b10e52876260ba3b7e20a9f1106994e53a04d47e7634e15";
   hasRunfiles = true;
 };
 "texlive-sr" = {
   stripPrefix = 0;
-  sha512.run = "2920a6ea6660813cb8b128d13cf8cb02799c040e26b871ce19599bf66e7f28346181822f1e6a4c03d65bfbe53d75240244e091afdc5899e31af4f1f3aed5971f";
-  sha512.doc = "c565439cfd3043ad49561d1ff5285186a10d6fe49c51b1b0caa328599b54966f7bbc54a4d931d4777ceeb72d67ec4ef4561cadf44fa7365495ad76d0a1755a6b";
+  sha512.run = "7785cf3aac02cf569bf342b019f9bba148fcef2fe837956d93d77cc38adf02922f85c3e76c7d0c954ebee5ade933843658684ade551a62d6a6fa36884405d0fa";
+  sha512.doc = "5fe8aa79b0181ea0e0de598f98f69306dedf8737302077c752ec142d066e35b904fd8958317f0c936ffac0300fe73ff54c24559520e4ea8d360a55acd8ed49d0";
 };
 "texlive-zh-cn" = {
   stripPrefix = 0;
-  sha512.run = "79ba3c28679aae65d678e747d9047d8920f1629bbe0eb33237df86d411789251b4ba383714ca038722d6013e1835b5afbdbe2b145f0c680d2de5cb3a722a0bef";
-  sha512.doc = "7929bd80b5f4ebaf6ea3354eee11b7e71e8edc503e7a5586c528f616673643a17cc5c16d9b2d427b3352355eb959f376f77b739242d32e8630087593eb7d5a3b";
+  sha512.run = "7f17a792a6ba347e97877d57117433ab69ef7d8252042e1c0f894373187b9fcc978c016e551225e4046689b7d755e06d28c1c5920cfc954b800ad6530d720669";
+  sha512.doc = "c63a383818c6e42e1137096cd69af387f1ef9e189b8c76be2b22a39e5b079c952a0efedad30c30ab191e6e4201be580d0c71655d631765a1e62e4dd371298d9a";
 };
 "texliveonfly" = {
-  sha512.run = "dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612";
-  sha512.doc = "4c4bf341425cd9867aded56a1cfb6b063d9b96c99283744fb157b7229107f6697ab6cb269e88333b82a9ef0bc6b8797dfedfc79c60e8c5e1e471b556b28d6e1b";
+  sha512.run = "f6fed46b75f50ef4dd37a1cc586d3ecabce9cc51c82a5e3389215aaa54af7f03d86f749ab2f069eb86ad848785e645664df6a6e6f10ae964ac0cd7596c94732f";
+  sha512.doc = "04697cccced8dbda7e2c41ce0f735d5d68698fd854174c98f331deb4f55bc6371b39d818aff3e57fa89bacbaf090169d23791596f8c92ecbabdc6463d0f8f89a";
   hasRunfiles = true;
 };
 "texloganalyser" = {
-  sha512.run = "0c8ed80e8475b9417e1294ded6aaf38f3bd8cc0107bbfa2aff473cfac67262feb4cf99026574c4d21b961a8726b7d5c8fc712e913688b46b3f6fbe8e3b212c42";
-  sha512.doc = "922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6";
+  sha512.run = "2bce24fc94e41f9db5ecbd640a0159ddc1d4db9900b2054afb89c5a008b02069af4d0c0ddee73282322ddd15bc092fb56e008e81859274f9a406e95c1963bbf7";
+  sha512.doc = "4e81dd980482b69bec05025293cbe05326f621cf319e3734f16a22ff74049a336b4a366f58dc0713c521473a011b468a28ac5b585d1d31b1d6370ce55ea71c97";
   hasRunfiles = true;
   version = "0.9";
 };
 "texlogos" = {
   stripPrefix = 0;
-  sha512.run = "54b058b971b7303cc3e315a17f9266e0932128e6d8d2fd63483b0dfc1a71a62236a008569c7c21142420be1dd9539ca3c13d2df369258f54239911747915ac2b";
+  sha512.run = "a62c4d988b6038bf0ecb2571e93304ad6c5b963da6b588d2f0354a9bb4140757a1f1e01a976befa8ec02a0aa3e2c0445fc504483992e7b9bd549c584941f8679";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "texmate" = {
   stripPrefix = 0;
-  sha512.run = "72bea7c6c146596ac0299a9d3084b87c344ea3f8a9bf6165cf75bd0d94fa96d7e1bef8a392fa6d99738b40e266924b5beaac644db139df46b668b52cff19cf1c";
-  sha512.doc = "d8aed89053aa0c8dd264f2ba5df999be7edd9c4fee89d07bc359d99b4207c6e51432e313882a2ab2e54b68bd49072aa76693efa5b6511d02a792e555570f1ac2";
-  sha512.source = "7fb1f0bf9368003456c13e7a8909b5c533a2c79e14f82920b180bbbb771eef1d005b9572a5bbab4303bd4848499873b6f053651f8f43d5d9c46fb7a9b8009d7d";
+  sha512.run = "79d3ddf850f906fc36db4701a3faf0ea8d9605581c98d23b60356598642142f5c9b036ae8f9792d1cdfcc7dafc618022b90a82f912fedd3093ac14c9551acfa0";
+  sha512.doc = "7af4892eb28a2d874d032155169ab088cacfe8186dbabba5a8baf7a1ebde08135111f9aeb89fa50e64d6ff5e00dd43631529ebd80f3e883d20e48bab613a63eb";
+  sha512.source = "1a57c6634b621b12a8d957ae4bbf636fd23fec03bc1158c10c097ff8a417e9d6c3efa2a53a7901f063d464f9064360af6d310cffc9d4c75921aa37f35ce946d7";
   hasRunfiles = true;
   version = "2";
 };
 "texments" = {
   stripPrefix = 0;
-  sha512.run = "6a5ba532ce323248b020761da9bce179a3c2dff913c9bb0d2e48dfce8ef2bf9b8ee1c09f5496222c28f73d1173637906ae6470b46a50bb8cab411802d54374af";
-  sha512.doc = "3eef3e560836cce20866a56204f5b61a79812d3f7c96209770767d68fd0f5bf189e1207bd06c9fe0afdf0c2a00bd98404b06f767b06e4145beb8ae2758905bef";
-  sha512.source = "3fd4e6a4549854c24785b3916d633a28be28d5afae997cbf899400ead7bc963758901934d5accfb411d2dea36f7d41973beec77860b4159eb211ed0e69a882aa";
+  sha512.run = "dd1084b0af3393ddd14b21dbb62b7fdf7a99b88d84dc44eeb994dae525a34c453411d4cb8d04c2e6f418116573bc468c7e62d44c5673f91be11bf46cb30fb7e9";
+  sha512.doc = "83f3665182fc628e74a2184b01c4d8c8b99bae05aee9f6f8771d0cdb7bbd02743b0ad4aaf7384e46b8a2d2c420b4731dedf56692ad711687047cb8e9403ca7c5";
+  sha512.source = "020210a06e09f93dd45aed1abcd7cc3925e757c0c7e1dfaacd0435c02a7ba6adcd5c53830f51d1d99bb1f098063c88e607dd773d5f4bdf154e86c9ccf6d65f35";
   hasRunfiles = true;
   version = "0.2.0";
 };
 "texosquery" = {
-  sha512.run = "21eb713120c491c210290db740e127e2191ff9ce654fbb6963eb868f87d319c1c1ac74200ca36925d7e7c531807a13896a1b6d01ce38ecc00ec1c264873834db";
-  sha512.doc = "416c08998850d5c290739eafdc72f61b0f460a7dad7d1ba9e602c5c159e18d81ddd9d241a82706bef2712df5e28490043cc022aa42a01d31d108d28005223658";
-  sha512.source = "f975e5d949a8b841dd6659222dfef08b0df71a4e179bdbb2fe2f113899d3b0946acb65d4b2bf1c38d37eb568fc82e2d6240046e53079b81993f6aed7e8009ea1";
+  sha512.run = "ebf04d38a7bc12eb867eae8b224ace7a59091982c7b396cb651fb4a4cfd563556c6542be7bc25d3512c3017b4a609091d7a09c5a10772e92322bf6ee2772c040";
+  sha512.doc = "f4e3a5ead3fddd68884ab6aec9772e19162ee99edad92cef14e3830eeb595ee19eb98f72744adb2fa5abd7df8ac1a90d3973d287185a17683405a03c619716b3";
+  sha512.source = "01abf4fecad864b11a948b87733b73083b543a3d9a316cfa2a3ae246b3093023e51679e5cabf23c2cbe2f41083c06f1a44e32af4b56a997548fd19d58a38992e";
   hasRunfiles = true;
   version = "1.6";
 };
 "texpower" = {
   stripPrefix = 0;
   deps."tpslifonts" = tl."tpslifonts";
-  sha512.run = "5f05c02fa2992b58628da023bd647f8be89a747a7a27593fbd7db6850015b18e02a72f2da81ca00887910dd59b8a300a6bfed32ee582cdc51265c43ce6a357e3";
-  sha512.doc = "99dd2582b7f66d21cba077be928e40c20bdb21f77e7443cf259c74eb19c8b5238170a2a97c69cccfc14bef43a457b4bb685b88b016fa43871a90de61012a1d36";
-  sha512.source = "e3ac51f98ca873001e43299567b9916dc0eda4a618f09f7aa8a9c5a1ec5b7ed02460b01c5b2a3c8010eaebc660185fe6d817d2219b148b8f1210c87307f8d4dc";
+  sha512.run = "4bea2fcdf79eff9642f7831cafdb66be35a26545f168d62b8e30177cbd347b7227a8aaf3102c30bfc39aa8a1659cf425fbc15a44e98e03eb60d15c8dba01cc60";
+  sha512.doc = "e5ba632d530a279132508fa8a2b9fa3d2a24e745bfa0a7746d9bdfede5eababe445873e99075c56be516d26eb3dacd924be8f937e4d08ac1ad68fe05da61ac95";
+  sha512.source = "839f24656f40d6ca64a4c62b36f6790150c2f4c50c60e001e63be9d836b944a1731c7c63fc1234abc37cb8de66237051e5f194a360edc7c3cd0c7efdccae535f";
   hasRunfiles = true;
   version = "0.2";
 };
 "texproposal" = {
   stripPrefix = 0;
-  sha512.run = "13a7b5a758b9a28bc60411fc0d2fe9825820f42c6c66f8bfc1e34b1c4724f112b17606e9834eee5dd8760b2f668977ec0ea597f074e90a7739cf689b7b9f1b4f";
-  sha512.doc = "42f77149ec776a709d9e424e458ae9d2bd0a9971c491b5dbbfa90cdec2652b59d4204b494e51fdf7da0a415ba4197de3de6e64eb294e90d7ea6aaddb6f09a5a7";
+  sha512.run = "6a301a43f1aa418d73d12b81e094fcf68ca2c04c8d60beddfb6e2f9a97950f5dfffafe4f050887b20cdbffe42ef91d291fffacc00e003de3b96a6bde2f82d727";
+  sha512.doc = "01b71d1beeb2395e219121a50f11024ea32fdd15dd9ac3ec050c33ddccb7224d2daa6634243c664d4483f9abc3d1330115290f7c315c32f9ef6c2fa41060e3b4";
   version = "1.4";
 };
 "texshade" = {
   stripPrefix = 0;
-  sha512.run = "4758f4b39f21a3d1b25c152d03979fff48f6f044263846edc718692034d03dbff14b763227ac321d5e374d0122d863ccbb779c81dc3707b3706489c832edf7ba";
-  sha512.doc = "d97965cfa14d3f7be64c52156cb72352e355e9b3e3ed524ed11625a9abf99fd4245c5706ab91d19559f5a9bd2b71b1bd7d1f6cae536da494fed99d1931618aeb";
-  sha512.source = "570c944038ec64298ef29922c83af351e723bd5de5af75d020cb20af35871922b52e565883fc96f71eb780efea5c088d0cae0235957f22dc88eac47d4f4a9a7a";
+  sha512.run = "5ed597c10da75fc0bb690da213e9cec7d927c13171b0667c845e022fed4925ddc2a98f581e5bdcd1c520e6800e978f99063f456d891509f68f601b095fa44db1";
+  sha512.doc = "7c2def29a5122e4cba42ca92f10c75e43fa84ad8712991a4217f5146d8eba4c066c7aa80ea3b6ec7f4e82f50cb43d3b91f56fcde786d9425687bcfe7e62f51f8";
+  sha512.source = "8bfcc1f7c7f41d6079c528f5531eaaf3c5e9225c911b1f9cbcba1d9038b73aaf5e43ca3e1c7e376bf153bea3435b82dadd204c15d0e7df4470b9d883fba15690";
   hasRunfiles = true;
   version = "1.25";
 };
@@ -24718,976 +25388,1021 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
-  sha512.run = "88ec1df50b6faa25db6b6417cc7e01308ff2b0bf22e86d8d59031bbf8c15130d8c6bc2926cebb9e94c3c1366540dbae1772bce80fd3216ae9d4f81828aef2ffc";
-  sha512.doc = "5ae2eafb672670783b89f51d50e0c56a151df4a3abbb6a6fd3e809d11553ee1d489e4ed7d166a615d7173a0ba9a72cb624c3a05f237fb949e68cbbade8371ecc";
+  sha512.run = "1faf7ba5456cdd835c691f43cc1c0865ce29997ab0c7a1623fcaebb2f48379395de26f140fbeb0b3aa6df4290cabf7bb5146768e56b813ab1223fdc088295341";
+  sha512.doc = "b402ea628dc62c57f06a0e611b048498dccca8c011b1493847241671ac838c9c2a67a860ede1d5b104b49d2b4de04264bcb896b0b0ac086bb4d35d3d2798cb4f";
   hasRunfiles = true;
   version = "2.18";
 };
 "textcase" = {
   stripPrefix = 0;
-  sha512.run = "3b0481957b5e66e58416fb3d50b8c3b22509b0ea0a7d467ba821eb7edc512ec801b9990a1f51763c79f95786bae24a725536f2bffb1af009d64c5f69444db391";
-  sha512.doc = "226cd4aa010291a03f9c0bc1eebfaf73c360a9e021cf41fb21e76cfc46e9389af33b7abd6d3b33b79638e25da56c645d0deb3cc64caf19f0be51d67002066faa";
-  sha512.source = "7eff5310ee1366773c284e2046c333a122bb0ede9bcc896d8ddb29a66a052aa2b1843ee62d19404c5797f60820b95017085c6a5189899891d6a38ffcbfa9bb3e";
+  sha512.run = "5ec9ec35ea83926236be5ab9862ec7491a4a1580292a8ae5139433d6e376a1adf8587e88f50fd9aa480fb3fd3421c96794682434862e819183aa7af4b7115815";
+  sha512.doc = "259f131d6b62031cbed1ade3a8cda72a269870d69aa537af7845db8b3ab50f8889d7fcddce8bb0724e20822d6af9a3434e10d7e95b931992cf122da968cfd30e";
+  sha512.source = "5e97220cf3cd999ed4fa80f0b910679c2bdbbb6896ef71968857131b055d64b9b1a789e0f5fed9d689d5694203859456d211920d0c2e9407e74309783b65f155";
   hasRunfiles = true;
 };
 "textfit" = {
   stripPrefix = 0;
-  sha512.run = "7d69a9d2ac31703b1e6925ec4960d87c74b2147bbb8c03687d0d4e4280394354c988cb4df87daeafe0eb590ac92395d5097fb15e0b7294a0b477b4d8873d66b8";
-  sha512.doc = "15de6d16d5ca5a751912616df9c36bd4b5c82b56698bdc0e14b1c358b058f58958e6a36c87a62841cb505fd30a1479d350082dc6101a29090b76ce730141bb12";
-  sha512.source = "fc6a645486f410ef6b601a7089404246040058da8068d384eee8cff42ca61041a7d00f782568de5743c8d81b2db0ecf132776807be7c5e3d0d4ce0bd50255882";
+  sha512.run = "3cd63466f501ac558fd99afb57d6288c1e1da39a4b5b774111f6b2ff9388db8acb2937fa397d69c674a17ae798a8ddd1310ad79a83dbece81e158be642306625";
+  sha512.doc = "53736d3a5423c29696e60a672e3dbe413aaacc5454e59d04f51608dee17a9788e7efcac1980008be2d4ad0b4611ccacae797de2b83d7592eb31c9b9ea45bcf8e";
+  sha512.source = "95689bdc578151afac702575a4a094fde4df8bbb95181a8e511e3dc537ed227b56c59016f52d1f7d1a6fc652bb33285e5ec7091e3be1d4028831538b25c54564";
   hasRunfiles = true;
   version = "5";
 };
 "textglos" = {
   stripPrefix = 0;
-  sha512.run = "653d40c92eee44e313e97e193f8568a7333d43fcf88fdae8ad8c42cb0db45b3be10796c68635de404c526f9a858e7636c1f09fd2b310c435a60dc018351be5b6";
-  sha512.doc = "61df00872909c3c77cb5f4e9432fc1ba89a9fc08aaf1ecc13bdc868dd1e9a2a242304075c28f4ad92ecf84e006169165ed7a3a63a82b4a43a6a0882173958396";
-  sha512.source = "7bf2562627097b1d4e2ecd22b4171e5f75245914e9bb22389638cc3666e01f92ec3b0ce0a8df1ad14816b463880b1f5cdabffca300a33e45cb8e6d7858bc75f1";
+  sha512.run = "ffc6e2543773e9b9945d3fecb11712253fd86b8215e3776ce1dd164839c82bc06d8e81f1b0d0f6864b702b8fa85e98630410c45d3f057d303ef4a913c012c586";
+  sha512.doc = "c6150d76f0740f519cf53614a8597cb25c79d7bd6ef2e43245f86e15d98cf7bc2383942e0345c7fc8ecd387f9644e5afd10c0af81c4b1f19448b9a22a23e1a7c";
+  sha512.source = "15abccad544236343a1278bc7f0f043a2ddd61ba7af19cee241eab1082e3f52b67aaaf6eae67f86cc0f497e2fd3c21d383902303a8bb8c109c246d0575f1a463";
   hasRunfiles = true;
   version = "1.0";
 };
 "textgreek" = {
   stripPrefix = 0;
   deps."greek-fontenc" = tl."greek-fontenc";
-  sha512.run = "70c17aecfc7bf4eeaa961a8b4ae20b2b7b800e4a634d2746c91f49a1dd7f8265cad656f26a1e759bea0610f376739477316cb9f13b55c2a09b25db5dbe3742ca";
-  sha512.doc = "05fcffca491588b8ae6a48e54dc5a69d6e5c580f5e1fd401661ecb0b67aa185f7c71512c918762a330a6ddeb4e819b9328b7065eff4c54d8e3048b5d068fd40c";
-  sha512.source = "6d87b5be328f217a59f45e092dfd56c588762e73151e48505d0be720b1c446148b1dc3e8d13e5391668a07ff56e4cfa9ee105ee8aa8056545e156616a04dfaf8";
+  sha512.run = "eb664894acb657e3b5fd058469fe4f6f9e733667ce80507bd80e72caa70f10dbf28f434e51047319eb50ebb031ef9eed836075cabe42b20db5c4676e676b804f";
+  sha512.doc = "2b7975bdc071bdab4329005816dea5c92a297c0fc0f3d3693b8ec33f527299209c5e858e723b20d34b538cd17f5772ab03b9869babff669769433637c43c44d7";
+  sha512.source = "4afd3a08ddc1cae4e9506ff9733e8012eaea995f6321d5cd85f1631dcd9592bc6f1727ad9696e5ca760f6e62317854febbb7d82b9fedfaab7feeefd8fa91df04";
   hasRunfiles = true;
   version = "0.7";
 };
 "textmerg" = {
   stripPrefix = 0;
-  sha512.run = "5c0a5a9e8e10e387476a0893aea351b10f98f0e5e0f9b42160fd7f9d2a0149def90dd3dffd9db997032946f421dfaa9e7107f0e4f8f0daa77546308844ea8dcb";
-  sha512.doc = "0e75cfec4ba5a418e3a220a58f12c478573f0f72ffc01d14b5f395af2eb9c9cde4379ffcd387696eb33514406381a17587ee0c7c2434e5e6bfbfdba744d4b3e5";
-  sha512.source = "f14eb9d6be623705d93fbfa4ca0560bb52ae20ba533b01e6394e912cca461e1602439e4886b6969a1bed2e2e0102e72d269f6f8ef4f8d29198e4465482e5b09b";
+  sha512.run = "4ddd8874a19695480cbcfa99317de08bb7fdbea60d45afd2a47df97fa565f9e5cfbe186f8b24c0ebd6e22c01310ec259d9422ec09bd74f7364c6d31bab056b0f";
+  sha512.doc = "32409007cf543cbfe3a2196989f84e00e04192e0fe5f2a3945789f0845a626f766b81d5c5ebb13845bc791f40308e552daa1477f964c2a6adda29204e9b8ab9b";
+  sha512.source = "6b0ac3859f10f2396fa217dcdb9635e63f459b12ea4b0b77ab3b8cfdcc426cf2b65e9286a2313ea7bf42b5385c10fc5d430ecdef8d7361f7753ee3d48a8cd345";
   hasRunfiles = true;
   version = "2.01";
 };
 "textopo" = {
   stripPrefix = 0;
-  sha512.run = "88a228955c2f143a3ba172e21b87a9755455f6b4efba855d900f04b49fc89ca018e4652ca6605a8c7c954e9dba4064b2aa679c5f4b7c4f98e77f8be15e56c4d7";
-  sha512.doc = "16f6b6c01596426ab59c5ae293353310e439f779dbc5ee340a23b3a25731c087f43055a3fe40f687497fc3a43e6648ef6789a535909e523f572e1a347a557655";
-  sha512.source = "2ec10f594028e8cd647424ec9effcb49be968866f0cdb83f9a35f56a2a4f3f62d3410f0ab6923f5d57b6de631eadce23a99f36ad2c151631f1a039d9680ed908";
+  sha512.run = "47115de58ce7b2653373255843f88a6f8d347ff56d8d9bf24495e68ffb80527edda29458d22ba71929ddbfae7e42b2d2f31015f045f937e0ee2c71d7fb0867c6";
+  sha512.doc = "04b33ee10a76b72709df57496e45f783647d608eafdd5b99e0c2ac7094bf1ee50c800be5d50fe5cb55b7c1c0d066b213e8acf2753ec54606d189fc88e2cc76b1";
+  sha512.source = "9c87b66a122812d93e5d290d7b9d028d3f1c72d287b3c3761f2903739f0e06d6866a96933b3fdeb4c739cab2a62970f3fb3c53c5e15112f1563845a56e0c3028";
   hasRunfiles = true;
   version = "1.5";
 };
 "textpath" = {
   stripPrefix = 0;
-  sha512.run = "3381cc6b2c8baefb69ee5044754b5ae4397025a2d6c9fe3d92260465dbabafab13c96fed7cb8fb732e7dc18c3c0de99969dbb557462c8ebb071012bde13916a2";
-  sha512.doc = "77798b15a79627e619435de52f827fa0370984af4a8c35b85c3373e9885ba9e08988294a9faf99bba7ad61cd3c6bd222bd0524aa333b1dc18265d945e5e4686b";
+  sha512.run = "350f2d2fdfc7d95b4ae68023f0d7d000ec837a25e47fd174834e4b20547240bcdf7f5b3b53d09a5630256f621a34ea8d70c8d5c41b3f0bce8bf6df7a91ed0b58";
+  sha512.doc = "4dcf46d11efcbc85c4384714ae5d98ac9a8237844c3abec8028c9896d7507fb5b6f2b1e962201f36dc9c7c0e75f52000555db5c5a7c66585ca1c658d05007daa";
   hasRunfiles = true;
   version = "1.6";
 };
 "textpos" = {
   stripPrefix = 0;
-  sha512.run = "a9479c2c5d1a6aa9861392d6d8e76008368e0b931c2b34efb9bae0de713bf837c4fa99fb7fe1daf9c6fb5e54b17ec00acd9a1880d841c322b90ae81e7a5f74b2";
-  sha512.doc = "0cebe05a87d71d39100fcc865d5c59a08bd890fc8104f3ca2ecd6b73b800272754610c025e174f78efe9b5038800a716bbe2fb2d0b02a3eab0d62c7c41a458ac";
-  sha512.source = "f64231f786ed5d807cf9dd4070d40acc6bd0bb8d151ba0704e7965e538e5bd89f5967c16805449458f7bc078779d891ba1a1968c0e1072890632ff760ff32d61";
+  sha512.run = "7dca90546726fd4d6b035b904dac12ee6c61cdb8cc49e0780ed817d20ee4e8f097f46124efea43b89449f0f4a2c738c17b4e52ee9216b27a71a198975851f94c";
+  sha512.doc = "37227ba44c32949ec75a2b85df5b73f5419c3d24123c83293f78abb566e077618ed9e9d8eeb137bb9b164aadcc5bd9001928f0455e41e07ccd0419ab9931e3a7";
+  sha512.source = "34a8a1d6058ba3578ad83f06ee8508df64a3fbd6c4827f52871a11e46b83bded6660150fbed71fc554f1f81dd7d1197dcb4f0f966e63ab46ce9e25c47700110c";
   hasRunfiles = true;
   version = "1.8";
 };
 "textualicomma" = {
   stripPrefix = 0;
-  sha512.run = "7d7a2188cc203577c14a06bb2e9aa57e854712ceb2976d0bfe54ee5f24923903328fda89728e6749af545dd3107a64a45554c71c2b9854797585b91907cd4606";
-  sha512.doc = "839e76ff4197ef2ba14b5e14d62caf8d2c54ce420e6e27d9ec8196fceb09340309fc31a131f81b4e59dd99a0c8fe05bcb2be0b4bef0f2ddd729a8299ebbbe5c2";
-  sha512.source = "4065b17a86d8a89985122ac64a1a2e8fc0f3cbe0a3be58c929392e5a03ab3b48e17520ab40baadbedd77f5685b7df59ac23c280ed5ac943eedd88890ed085cfe";
+  sha512.run = "10ba2294c9121a73dd8f62a211db3b96493c7f789ae82c763f8637b0a23d971b3a62725bab868dbf2df68cd619af128213b6688972e8845cc6356b0a786bff88";
+  sha512.doc = "e13e1a6f6079f3751670681d9c352cc97097c5634ff47f7ed11706118371bee2d65a5ce91af2d4f6a6f77765555f28413df3ddfda5293ffcbb60c8063fd9ba11";
+  sha512.source = "105883f7e1e676434e73b191a96f21135db761a6358195aaa669f2de0318d21dca7190e35b2184177d02b8328e21a5b478752a4a0b3a56df4b2433217e33db6f";
   hasRunfiles = true;
-  version = "2017-12-03";
+  version = "1.1";
 };
 "texvc" = {
   stripPrefix = 0;
-  sha512.run = "370b89467fcec1e40d53b19032510bc7d5fa047e17a83bd92ab638bf41e400784a84d3dedc3237e054f6021c84bb4b9c733f6525d906b122663f1fc5eb48bc72";
-  sha512.doc = "1c33e8d05718d0a7407ecc0b3d255623fda1a7c93f384e125a8c98b9d61ea7ee14e330e33ceeed4928553519e18f993efe7be41e9be9dba5258c8a5b9ab85a60";
-  sha512.source = "d53146f1daf1321bebfbcb171699c8f79ee0ea0cd4b02445eb8eae69f224c3f1ab74d217cff3a6e0abc46c2fee1923e10f4e1e900fbb56bdbc70dfcbdd35107c";
+  sha512.run = "1fb18df5dbbbf0c25cba9f97787becaba920914fcbb310016526ba9ab43fce418e6c0285d427fd63d1d119ad13ac82378e7fffc0e9c1fd6136017812c89f1b18";
+  sha512.doc = "232d199a9d929094ec8d1b165955cbd03b3ec5c0040cf0fc36635df6c2b5b8a37b4ece399e4d1b2f0f8fe9252eb8ec6b10986aee32c382321f2400a57b29abdc";
+  sha512.source = "290ffd35f50dcc61042d0b3d6617d8f6078f47fe5fda395505660307127bd87174a71f730adcc3f7d13b1fda9f09d8574a3bfa4bd5b07d8c99e4fdca88146144";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "texware" = {
-  sha512.run = "b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c";
-  sha512.doc = "2469ac17b29ea1414daf93e0bbb20fdf981a658e89a2d3abad0e11e919a4977ee73cb7535401e26250484cf13ea34393d99f32370b5d9ac3d6dd4bfe6203fdf9";
+  sha512.run = "aecff277f4341122dffaad2b6e6389434fa0db4c686fc89a398a506e495076b355cd0554b92d78ec257b4a5feab103369cf9b399873b98b724188804d3a878c7";
+  sha512.doc = "05a67ac4f25b162da981b92b2d2dafdfc96ad39303b4e84912f49c2bb11e3c3cbb724da6592b37d2288e6e7f02e19797b467596bdcff846f424358e7002735ed";
 };
 "texworks" = {
-  sha512.run = "4b3842cda353bb7bea8e661e279a500c5c91c9447403f2ef0656796943602a4f2ed3a448bfead21077f322888d539edcf0f67210f22db9aba8cad76bd1c4ebc2";
-  sha512.doc = "2c2e23269e1571c8ad7e3dc09a50dd28d0513e4b729eb92e8959ca4ab9fbc723de8d6a8f05e812cab6b1eeb6962895c2e48515baf31fd5af17afb0130284b5f0";
+  sha512.run = "18a589e7ff9987f222ede07e4c3d747fea0cbcd509fdcf8696fdafa271d869f13a4ea90fcda20e068cad9d010fa8a8dea5dc8cfb69c55d8cd33eb08fcf5bf9a9";
+  sha512.doc = "df97738ae0cea3c9b25c7ed4379808d0752ef46bbd9eab5d32ccfbd0961d2daf67928dde2e5df5796b2f8cd1556fd701408f0776fc59964ee0bdce81e3f6e594";
 };
 "tfrupee" = {
   stripPrefix = 0;
-  sha512.run = "fae1ccf691807531bee91e2deb54e3b8402c0d227db78c4bfe012557ab96f6683dbac080c766d2e6cb5455d0411fa4b105332359e52e8fc86fad1260097bfe41";
-  sha512.doc = "c59d3e32ae97b222fb8449d5c62d278be41c93fe809d352561a7131fd923fd7f5089fe6eba67b07712415045f8959942720efc1dc1165f1faee54f080949838c";
-  sha512.source = "e87e17c2a476882b6059ae149f6ba44413079cc3b25fc32ed3d692c58b149c042f3dab085749a6d20572bd0cc3329fa4f6ec9cebcdcc805406acc98b845afe2e";
+  sha512.run = "f6fd843816df2b0820e39e5cc01fa4f09e12d353aeadb477eba7fe82e15801544e1aa3625372ead78ae45a3d5d0747e822b703c0e815c0d5a8b9d1ab37f3794a";
+  sha512.doc = "1862a0b0962c9fdd3eb0293d3ff3cba0823403a074864e8a06e60b8cfe23379a24fc780af336941732e3a6856a5cbf7469ae12921a5d31b5ff07b2cd1060407b";
+  sha512.source = "3cf23d79378ae86742fab85b3db70d3d0c2393dce033f70a6b7dfb04d66c47e91ebb87ccf8eb5cba6cd36338ba2a379396957586aebffadb673676fc38dc20ab";
   hasRunfiles = true;
   version = "1.02";
 };
 "thaienum" = {
   stripPrefix = 0;
-  sha512.run = "1bb73d38040e39ee6618a86c9091584768a0f52a5705e7401403ae0e47f175035b68ddf72370184811ce976117d4721eb2cb60958724b312393abc42e4bea717";
-  sha512.doc = "0b275a70462fcc1e46e7538a4f517649846564a3a0a7c02812893c3ded07cdefa02bca6188a15bb454cfa9370c23240b60b051d49734074f9d0b5eff1d18f960";
+  sha512.run = "481e1af7bd2c0562fd5ddde7e07ed7cc2d9ed9461fea82b07ff23c8a3c47a1467bf1bbc1055dbbb9df947058c81665c83f1134c7e31c4ac969f44fe61836283c";
+  sha512.doc = "08ebf7db58932b45ca0c6e08ea15d7e137b198b2fc73487b246a356a152a233706eda2bf30de2e259b4913a415d77fa18b814b661c20d63bb6de086d014b8f1a";
   hasRunfiles = true;
   version = "0.2";
 };
 "thaispec" = {
   stripPrefix = 0;
-  sha512.run = "2cc539d07b326a7864bac7790b6d9051e952d5453b291c4ad64b29f18991cfb97016e3abbc0cda1ea990b18fc353762543f2eeff22bbfd3c3c66d30d06eee0f1";
-  sha512.doc = "fdbaf7c266769927b2fbfcce75266d9d44d1f7d8223dea9fd1a21aae6e86e325bd1573bae872ddc9a8fbeceaafc517f33653b15dcca862bc85152b580ab2069c";
-  sha512.source = "5731fa4496c52c352e0632905dc8662e5258021196513928b23824ec2e2e381f522a279c271572413a502e45a801f2ae5aea53a4678161ddf6c2f75b8c078751";
+  sha512.run = "34fcd008ac15de5618212fe7164625230f4e83d446bda96a3dd527d2c98b3d99e6c40a8f9be52701b915c8ed2dfc91ced98db44c757e1edc1adafb398082ad3c";
+  sha512.doc = "ca3956f697758c424901e1353cd77164917c9937b68efce27710307ee14b1101e365d76f5fa9e5aaaa92c4bed0674a6e04a3cd98491347c3003d18bb9463b6aa";
+  sha512.source = "bbd1e78b91ef861c086e7d94d2cc75e2a44c9dd5ad6e4ad093a74e86cb6956405963a11b6861385e8959738c99672b4231493280a13e27f1dc4181ec9c59827d";
   hasRunfiles = true;
-  version = "0.2";
+  version = "0.3";
 };
 "thalie" = {
   stripPrefix = 0;
-  sha512.run = "b3998675446639ed3bba036414eeacda083f50554752a5d0dcb6f8409b8fe67f20e51670dccc55f7b0ba37135cad5bafa18438aa5ccf3f48d7a93bd5c2df88ff";
-  sha512.doc = "2d3d90ae1b7a0495e9cda3cea8775c8e0005d8e2dd04d1382530133153670557a1d3d84fa0d637bc01adc05d86124b071d5f6551f1daf5fa6e8f86165d2567ab";
-  sha512.source = "ab8f724a93ae74880342c00ed46b9befe282bd70db36113934deee32597a1ee06c3a490ed0ca0a7aa74867929831e5e0f2aa1db7d958b5fca9739b589041967b";
+  sha512.run = "8853486ac153530ffe855aa6df125ae306d949d8266e551adea5b4cff0f4677a4ed1992479723afe750b6b0ae0032004242c032add336697701e81fd2ee6b9c0";
+  sha512.doc = "a4c558fecc14c76b34279e041f9eaa5a9be894a442e4ba03417124ea8c903a64468a69b582b87c6eefa21d7a360c408b4390d856caff4826bdab1c05a979ee7e";
+  sha512.source = "235b2292815c86cfaeab3128ab0f86c5bd83515a22586f99b2038efdc68c5ebd5f5ccaf55a1bdb133d3af77fab3c819df0cc746212499179561d5503ef35f143";
   hasRunfiles = true;
   version = "0.9b";
 };
 "theatre" = {
   stripPrefix = 0;
-  sha512.run = "961cc83052ef14e76932be1f405bae7bdc791f4433fb5db80ad62b1df09a87e61309287d9cb0481f38d835ce498de07930330cccb6d2a11b0ba9cf98c6727aef";
-  sha512.doc = "7bcef7da59ad6cd6ed2498628afa27febc5631bd6fd729ec9927cd2732ec9a589103bbf2f1f782b8aba4c42625d3b5c66c79bdfab1e82b027e87401e868156b1";
+  sha512.run = "045a349ddfc96298bf3bd6992cf3fe7f90d8b4c2891feb7cc2d129e99aff3c4c74c7502239e64c31b1d6171622af53ff20698b8e2f7ac90bfe2778237b638d76";
+  sha512.doc = "f47cac1051546b9e64a8009f8bf17ddec6ed572314e08cc3a79de46ce1d941b4917b0e51ba9a2507c8679a00c6b8627a4f224c7ad6b60fafbf24349fe68f393f";
   version = "0.1";
 };
 "theoremref" = {
   stripPrefix = 0;
-  sha512.run = "ce70fbfc620ca2be054227b7c81ebe4ef65513cff64f1e9282055255d37bd97ab064f8146b86665c695105d5853da76753618d3d9fc0b02095545074f9efa42b";
-  sha512.doc = "1b7b25bbc7a10975e45ee275c0695317f2aea99e49e32c9072ba20da5f40d9bf494ce53bdeb34a9cf536a6875fa1dc2bb2f7a85f834608afcb969a985fd68b36";
+  sha512.run = "8e9c76c0ad9b7905c16d68bf2299b57c665d5f44c8e42437b06dcfceedbb49702b5dda06af6cdaa70efb3aa10003fb60a5d5690891204d04b82989ef7e3345c1";
+  sha512.doc = "0498164f333ae9f3bcfdbd53bfde87989cf0a4dfa138c5d14135771112db49a7e103d6503dc7fe713f322f6afacb06a566c0f9bb6c7824783d4486754825b1a6";
   hasRunfiles = true;
 };
 "thesis-ekf" = {
   stripPrefix = 0;
-  sha512.run = "275f2d8dd7a8c9dce68de9cfb678c6af8b1096c66a41083c078355616bbb68d1e2ac788c4934a04749075d582e9faeaa12ff56acaff2c6456b3f919d4731f55e";
-  sha512.doc = "0241b3f94e9754f0df91c9912e126beee3de5951b6a4d3abb8a9a5dfd3cc29a65e257f090c21b319f63a7843f3bc685e06c0e0984839a27d2f5a896c5baf4eac";
-  sha512.source = "d645af9eccf4dd4ece2f17f53609c9c6327cb636aec31d5f1f6501fccdf24ed9744370de57c567b437ecade638188c4169ae55e1cd14b81006061fcd50907925";
+  sha512.run = "4e09c7d97e257d810e17bb29acc077fa5f73bd548882a69bb0508c8f522dfcda2b77004a10d2d94be9cc7717b0d1ced6075f8bb88894eade43b12fd9755e3973";
+  sha512.doc = "ca6e2ca15fbe0686012bd83d618d07f454ba756161f417d1449372d661bf2927cecdfa75c13affec0c07f7e758bc8b61eef1442a57b76379ede8feb22e99171c";
+  sha512.source = "7dd534c88232b1cd440b93e0d08822b3a4ca5f18ccd17fef4c9b0e13e6d427c14e8a669fdd6fd189b9ea29fc6fe6b1413b5f7dacf47ed7b45ec15e61921018a0";
   hasRunfiles = true;
   version = "2.2";
 };
 "thesis-gwu" = {
   stripPrefix = 0;
-  sha512.run = "4737b6dc5d38d1059ac5ea64e3914bfc8296539c9e34796307a920b55308b520bfe46b86b1240d7d60dc838c6c8909434820fae42f4834dba99e2ea0a04ff470";
-  sha512.doc = "b7c8a7eabb18f20c97311b65a558c98463c0349da59872fabd790487cc339140253ed1cdd853ea096800875806dd5a7a06300dba6999606af1dc23e92c96d83b";
+  sha512.run = "be317f5e9582cacad9bee92ce4cb3ea20c2310f7097dcb0d014d639e7ae578236d9fa8d9b3b60e14766e92a6f48782eed96605186c3fa02413273401795f8911";
+  sha512.doc = "c7dc040fc9eea4a7883fd2b71f69bd10d5fbda21059c3a1bc0c42d6bea0b4482905470b9c02798425eaed2f35e040b7e38a718284322be30a9d8b531828b8fbd";
   hasRunfiles = true;
-  version = "1.2.9";
+  version = "1.6.0";
 };
 "thesis-titlepage-fhac" = {
   stripPrefix = 0;
-  sha512.run = "ed346853cba6c687b9d58151012b7df3719f95d70d95c06c4dc86e95cef2133ca289f8adb55d6951f0ff323288c3f42215a34a0f96d56e7cfc0bf34c7ec1f38b";
-  sha512.doc = "70bf7225a95351a37f29ac520d7d9e0d794d8a42b9df661be6170b99459b8c298f4253222a3eaf39444f2919234b1fad5f93805fcaf9d5bf74cc6f14874ceb5d";
-  sha512.source = "955e4be3f8a82f66aa666228994b1a9f12b5dfda9614edabc697ed025a3e618ddda50079e45c25c0194effa90ed75f80c469fb4c60a36c0d22d456e62d0db1ca";
+  sha512.run = "138ef0423e7dacb4724a65bfdafe7f3aa7e3ae9a7c5d128a71caba0debb9042b3506f2a507c883daae29fbf10ee34f9fa15f0d0f8cd589005a9c911026f839f5";
+  sha512.doc = "b04d42101e06bc4adab81b65a852be9ef058d1081cf1dc8ba9aeaa974e3a79bccf456bf061d29fe560455c82483bcaeb94bacc9a8995c14ac3ee7bbe7d6b972a";
+  sha512.source = "b7121d93bcfd89716bc9e78de7e5e441501b3a1e97bd8333d35420fa139a8213fd70dfed2a5d9c08021398df3142f2d22774d2b3cfdd0498cd6a10efe9d897dc";
   hasRunfiles = true;
   version = "0.1";
 };
 "thinsp" = {
   stripPrefix = 0;
-  sha512.run = "dc921aea9b0a60ef16da61d683e20a1bf3c3754ea2f2872f82f5cba75281f11f5cfba8669ada0153985ecfd9ef756d3007515eb9c60a5534c83632dbc55dd6d4";
-  sha512.doc = "49c5ecfecb84f5f4e7261c72eadb265d0c496b3e62ee66b8adabca45528ba8f1c91075c758f0341182c2c9a8389eb01461c10327627082aaa88c312b2dcf01ac";
+  sha512.run = "9c5a3f68bdae70fc961842630dc4334ebd449b338848b6eb759c65f63e56d284df325dd18d1e7d06a466db622b31df35eeca3332681df9822931b812b4d556c6";
+  sha512.doc = "a1e469bdbf2a1cbcaa557e262e63926f03b54721abf0c9336b060a77fb052e6f13a16b845dce7ad868f20a0099275c6ba21c2c05442a6befa425ec11f982ec0a";
   hasRunfiles = true;
   version = "0.2";
 };
 "thmbox" = {
   stripPrefix = 0;
-  sha512.run = "fbeec69aecd6d9a753ee8f3b8a1232735fa160896e2d8fba8403af6d160cc9057e075898b3500f5684e517bafa47f9b2e4a0695739d871a36b43c0e918e33dda";
-  sha512.doc = "edccee96cc945b09431adb2c14407f85fd2fb9d098470524f3e37f42b8c7ed4a2c838c9da78c1d01d3ba27d86e84cc24748db43c97cdab26774bdb58f04b5ed3";
-  sha512.source = "b7fef5451a0c1509f76b01c45af448125a615060b7847e3db2fc07e24dcd442d28be227d7d27b3bc33b24405b20b7d11c383bab6b0ae32307bc329f60c5fb9de";
+  sha512.run = "b0896b1799a836f471fd929575befd9b18e8189d05723f2c0bb14f32627a64d36d7dcf306b9458fd450d0401d844e60802a5c731339c0786f539d5c32dcbe61b";
+  sha512.doc = "5a2498515e34eddd4c14fdceb9b294c739e5cad4aabaddd181268a8c2ae0b6d5952804ea50ed514e471ea510c487c2461c7c9eea767fa0e5a66b52fc8b00f6e1";
+  sha512.source = "fb3b8a61066bfa8c2674bf1d95e9d5b0f9b2de7ec63a96342a55a8dd8d574e6d02c2e9dadab695781849dd254305aa12555bce9274e4089e764355b645a40e08";
   hasRunfiles = true;
 };
 "thmtools" = {
   stripPrefix = 0;
-  sha512.run = "15bbb7de31e8af918a30c2243206ebe8452197a4436f1a9b43236bfeaed9db6ef2ebfbe1c0dcd310098765bddbd08f0d281bb6cad8b488a4cdc9f5b9dac3e4ea";
-  sha512.doc = "3daf8297fc3d36402fca16a979c51c2073f0830f7da4cff203583f5a24b3a7cee1e4bbb373030cdbeb348f73b7dbf9da733912d7fad87d324ee564e920b29c08";
-  sha512.source = "a4f4de6497061278aaa18383cf6e8cdff98e8281605fd39f78b4a954ccba0e1af0da15e2d96908842d471b313ec726ea6e2bd799726c4a819a763c0bb2921046";
+  sha512.run = "f34ed2b9b8e70119e344bc34c685b635e6727ba5e6d2351c2f92c61d9cac5d66cdf5257ffcbf79ab115808ab2de08d4f1a98892cf1203bdf3590b0e0dfd3f3f4";
+  sha512.doc = "e903159432323f55f6aba35e8ce68108e15199c742444459d514fac88602805329d744722c851bf2dacbf248eff515d9516bddaa26f89e5ad4e6ae360ba02864";
+  sha512.source = "ba7a852a01eff6b860d05558e25c305ccc161fb0cfa27c597a23e7bbd4d72fc8370744477321a07c4b8f197912dc77e3c566a2529412371882b920ccc0ef39e3";
   hasRunfiles = true;
   version = "66";
 };
 "threadcol" = {
   stripPrefix = 0;
-  sha512.run = "86dfae05dddee0db728a6ffddaa89b76c27207895f70177c362a5308bb83a5d495f61a5712ea4c4404430497ced5919921566f6c2e15ca2b83043f14999d8e88";
-  sha512.doc = "490fab9b77165041149c8c124c8dfcb7287a78ca23ddeb79d4f7c5f3ea32711fbb79e5bf8e75276c30f9b6da71d89e55f5f32f8079159255d1b954f6a7c26b7d";
-  sha512.source = "3a67827b21ab6d694f3b3d27a679e89fb04565e4e05d165efa49b403ba23ae46a12e95b1aad15c24629e37ddaf02bb31daa2ff856b6903dc9c62732ac6573697";
+  sha512.run = "5f6dc2490af25491ec6b1db606bdee77ea6353e7026b91613b06b64f275073c583f44e8bf4ae5e3ce72fa7e7c0946991fb7d9068fe8eaa0daec78edca96750c6";
+  sha512.doc = "0f777c3bf18c4d739d54bbf177a7006b132a3a598c67c17da90fb06b3ffd67fb60f2a55cfb39da420053a331ff6037bfdf157e579293ca9b6d3fdb4ecddbad9a";
+  sha512.source = "153ec08ecff4e4a91e81464c54dcd61a90488af658b6a919bc4af6b57fd4b39e3b01cd9c70e8e3340e3966a63d0df3d67fccdc9c3b7e332784ece3d5614a699c";
   hasRunfiles = true;
   version = "1.0";
 };
 "threeddice" = {
   stripPrefix = 0;
-  sha512.run = "bf22f949a04e85e1e8d08a7565a5d05d345d2dbcf51221d502aece67e1eaf8ab36813733c6d34ed91cccd30e1417d4358cfe4619344e2ab1bc1ddc1addd66090";
-  sha512.doc = "976acf5671cdfab523ce1af8a3851a99bb154ae19e601d2cb6ee26f5f78d69b975fe8e73a6930c6dbbf086c5e574d83a279efac3d6fe3f376eaaaef7f05665b6";
+  sha512.run = "d929d3f1eda2d07ef12f9cf87913b3b7b4fd225d2a395a0012a454b820bf05359d19b4fdad49159e009ea12a767439c8a356cac934cf36f1c8dd0487622e02c1";
+  sha512.doc = "ed566010d1d3af636a9683b0d2c4b7208c1f1f5ff92216c7bd1b0d64ee463aee717e7151d900783415451a0687eaa67fc09a27bb879091ad55859a0a045f3c73";
   hasRunfiles = true;
   version = "1.0";
 };
 "threeparttable" = {
   stripPrefix = 0;
-  sha512.run = "4e60e67f9ef80e858ba949540676bbb1e8b24a43d119f84a1c4b3c8eda163855ecebf3fdae627058db1b3cd735d51fe9af5e94439ff9191e809335957bdf2c9b";
-  sha512.doc = "b58756000c61b41f023542426ed55d83b93abaa4584bd08060970c94b6f1a42b40ba59e19a7961184d6a458d2b78835082d37b273a17b34b6107b2082a140714";
+  sha512.run = "484848a373608647e087db87aa37d8ce5ead9144999391795c54fa8a19c240b4ac88ab5e8c8481283877b18eb90218781e71b60f494d89c31823693509f5aff1";
+  sha512.doc = "cef636eab22846d7c323f1ee4f317a25b4eda3eab14f3bd9db80966f31ffbf4ddaec0e74a28e4fe5aa9a6c1f92e82a826f48ce11630dda5474a1bc8bd3200fac";
   hasRunfiles = true;
 };
 "threeparttablex" = {
   stripPrefix = 0;
-  sha512.run = "cd9776617cce9010f4a510586a148e9299dfa989c8c6f6f7005b0f3b038231b8f1389490f7dd2cf7eeec030140ec54d6b679ccb1e5d84bfe2c670d46bc455f42";
-  sha512.doc = "2e2e329071a3f52d89422c0dc5e97bb7c8bd15214530766d5e5017431d8f9bc848846fab61d13990b639960708e6043d606f328e0fd1febe5958f82767e75b81";
+  sha512.run = "398ffa1436ae8d74c27e6fba8c7e423a6c29518de2f860e32148e8a4c3185e043c85b03efa03c9df7be8d8a1a020f8f09c0aa81b87ac6237a993330cc0e2499e";
+  sha512.doc = "21a2834f7f9cfc0b57100533473a143910376436077a8d0513e5f626f5c13d20e2ccc0a99e7a3a9868cf3451cd253b3c370a4fa44eea16224540738bb715ca64";
   hasRunfiles = true;
   version = "0.3";
 };
+"thucoursework" = {
+  stripPrefix = 0;
+  sha512.run = "f05755c11d40ed861c175da688985c04d6c7a192bc2f562e93ae1aade737a72c43fa88c14a54acf6cfae4e31133378483fe1fc68c329bd9ecba3e6259bdfd91f";
+  sha512.doc = "8049cb66f918c7dd207f71ea7235390bf7874c3942c7ebacd528f167439030c6edda6e13e7aa44a35631f4d755ad86465fe867215cd0f5c50c0b19ba4b89cbea";
+  sha512.source = "e6a4aa4b1f83facf54e0272e7e62196fba486eabf1080b51df53e1bc80aba81f2a77139f8abf4a58e478fce0c845e21a6b123750f7d426677f9102d48d0a49c6";
+  hasRunfiles = true;
+  version = "2.5";
+};
 "thumb" = {
   stripPrefix = 0;
-  sha512.run = "61d78ea61ee56d7ec86b55bd624209c5c4589d695efe9170b165affa8a37b6227f46600251185fc1603be2011408fb7d815f514eae29fcf3cef0ce2cab3b6285";
-  sha512.doc = "7e86d1923dd5c99237ec0e524154039210729946635522c2eef9789cad2fb12d2efd13da9838bdb379e116246847fb71e2b87a7e9a1b35159771be67e36b7592";
-  sha512.source = "8e436fcd25c3d207e301336343681318f756699fbaf3e5674ee80fee7bc63139d89ff7e247be6b1daf740d93a225d9bca0196da2e675c049dfebdc391d5a78eb";
+  sha512.run = "3a8152471f19b39ceccd92317aabe11abede9a4f15c4c2ee483ec3d4d945686c1c827540086fbaf77a68a8c55d6f356d460b69f3ce99957de7896afbd252bc6f";
+  sha512.doc = "c40a0010a02de1a9b690d0bcbbeefa6f4801b00a0bc20eecca4526249e194bb5e31a057b16fadaa68924219361ef95d7cace97e53f4328890eed40bd40fe790e";
+  sha512.source = "a7c4a998f2a31d08e502bf8a260cc78b234ebc415531fd5028fc8985da78fa16b036279edccf49dcd79e3dc08cb485d9c7a2e64c30b61898a019bd3d08eaa308";
   hasRunfiles = true;
   version = "1.0";
 };
 "thumbpdf" = {
-  sha512.run = "347e8b52f210ced669162168b8efa59bbe243ee3d7549ad5019cd429265492679c8ca4a54e562218e890dba07192d01d2fc1f30cd23a5afbc2fa1acf1f2e55a4";
-  sha512.doc = "df05b466cd64a45076cf97bcd7a80fdf6e4d13d90083b6a2700b9d38ba2f08a4dc16e31fd6235c14f1de1432b0238bf9c078d5bca23f6d0986d15e5739a3efb1";
+  sha512.run = "1078aaddcde4244dc38ffc211644228716f2385bedb499004553cd22a258c4ae195152b890fbfc0938788c5ab4382267f1a91d2609dc4bcbf215f1c6aeac25ef";
+  sha512.doc = "5f5b630355497e6ce11650e1cb4ff71bf52d5adb202a7f0ca080da333e8f933eb9438f87adf3f92756b389ef517c65e8f7aaaab0cb7db121bc4b767680b5a20c";
   hasRunfiles = true;
   version = "3.16";
 };
 "thumbs" = {
   stripPrefix = 0;
-  sha512.run = "9e532c025c271ad09af2ae039b696e7995846863862639a7e6c1f6ca314bbbf0b94a923ce1dbfd427bf9a4370dc64f7464ff14a3cbfbf4937821c599326a7fce";
-  sha512.doc = "4d908f2c11302add225df364355679de5f37da56db9bdc18f94c63cdcfac47ee862d22bb90c2351a3bac87964d09cafc598f4576d459bc8032941599db52bcaa";
-  sha512.source = "bfeb511bedbd04e60330d09f83386d691ee10a205149fa4b4d6951dc267c39429171b489addd2318d51d3625fb7fd6d6e9bfcc990909a607a076ca58834c0547";
+  sha512.run = "1f210b14daab6b432571a4a4fe93c630e946f45beb9b3c2fbd96cd8f654db88280dae4c758669c9ea9e5899780754f6cf9802534d59bdfce2e76e780858e0fb7";
+  sha512.doc = "8de2e31205c5497552ecca79a27b6372a722d1e3678520378f58cf048a2f1829e2b35fdbe176be543de78ba94520ab5c8e6165a9b5829158ed77d8782e92f86e";
+  sha512.source = "7c78f71fb46f7e67b80a3711427c3f291d362da786b0e5583e2e2109ccaf1d7cf10d6cb64ad39b3d5a7ea65235e40e808dc8e82d1cf7860b7ab114e3c915f4c1";
   hasRunfiles = true;
   version = "1.0q";
 };
 "thumby" = {
   stripPrefix = 0;
-  sha512.run = "b96c18edd52533cced99fce625ae2d275d357fa538a4ccbb6be448eac0d6ee7d7bffe037b28e964e866a2d3d78830e6ae642727d5636b73447fd4ffbc0c34a5d";
-  sha512.doc = "387a9750e981ca314c71759f4854a83c4ee7fc551dfc107af5a4866cfa2ccd6372742ce89073f7138ca003e75a47edc9431ff2e1d074fc4f1c81c26fc65afb59";
+  sha512.run = "518e2e6a13d3ecf22af5436498938605d247e13a591ef06f81dd970346245c42593172d05e19a73e3928087fd8dfb9f6daf866ac735528afab1e59a31c1f81b6";
+  sha512.doc = "8682faa744b12afd6ba55197c6f03b5417763237b47a78a4805ce1613a2252c070857f292016df26ea8ee219dfb4e5110ab2ac7273cb86396839b53ef5e0d7cc";
   hasRunfiles = true;
   version = "0.1";
 };
 "thuthesis" = {
   stripPrefix = 0;
-  sha512.run = "48c123f1b8698edb5875706c11b5355eb3776c4eee0c4aad55df4f4d56dd099a05506ec8d8547dc4cf48d2fbef808827750420562006fcbcd9c8f24e144db2df";
-  sha512.doc = "b4e16db575619b1e5a2922e91d3ba6a2379c055c350faef55006cead9c89095a5ba0582617de030bd053b63623069caf2915584710185016b2bb354aab2e586f";
-  sha512.source = "f3b89c5515326b4559c920da714585623f222d3898dbf30da5a9f2149dc2baa46520eb952a9a06c4f30b584758b61a8bf2afc29f037fa8e7851c5cbacc0f678e";
+  sha512.run = "f532a48e24e05af7e5275317caa86e0068cb472d70bd57c8c608b7fe2f72ff41fe660b4ef0fbc8bfc5624caa87b843cf5ccdace493f4b268baceaa3924d04d12";
+  sha512.doc = "669bdda35639db48a5f905b6de3885019960065aae230402127015d729456a1afa418c04ad3f149b106d4397073a7890a36d11b614d95231d594cdf309d7336b";
+  sha512.source = "9ba973f157089153da08c1c857b73261cd3ebdee2add3476717a3d0ac4efa99fe7f10be5fcd94903e7e306a384d111fdf6440500addf26586b216a2dbebca82e";
   hasRunfiles = true;
-  version = "5.4.3";
+  version = "5.4.5";
 };
 "ticket" = {
   stripPrefix = 0;
-  sha512.run = "bdbd9b2e457c013d8c53bea9142fc00206919397870457ba6ea23f4727ee47d820d1220ca7b1f3f3ccbf25f55c1f40f40b972644d0f63a0022f64c66df049bc1";
-  sha512.doc = "75bd669c6be5c1dbdfd4cf1a92085108f28c115ec9946f09b1563c9b4111f1d2da5bf6dcfde191cdc5f486e18913b73c4096edb4426e8cadd54b8e7abbc6db07";
+  sha512.run = "a9ad6a0aaafff536722e48807d9c7eeba9c51595901c7707881099833688bfed0e7bb9083751668c28fd73014504725edaf23ffac24b3b9fcd617fa77621497a";
+  sha512.doc = "0e0a21a1645002ac14abbd8d3c1715ea33631127be6f26bdcf84833ed1822677d467d5baa9abcae870586c2e1ced36db495227e4b4abeb62eb6d22660ed47293";
   hasRunfiles = true;
   version = "0.4d";
 };
 "ticollege" = {
   stripPrefix = 0;
-  sha512.run = "20f5ce96db052865fe54af59435c2177d51e51fad28ae2cbbaeac45c04604162b1c1dbca3fd2482a62d579754d5331aa4bf11a5a3d9d7c7bc3063fcee121cd63";
-  sha512.doc = "58123e343debacaed5ab2d0d2d3fb2b2051f3de66094fb59358b61539262f6bad88df192df635793db30cd61272cc53cf26bdcff366e7734d5cfb2aed02b3a6f";
+  sha512.run = "309b415f46bc8e57e6a8a35c687ffba4ac1a7ee51b310e98e68c67065781742988263d82184f23d7dd9c566d4e540e273aeb7dbc59dd2675c0c54a637ba9dcdf";
+  sha512.doc = "a654a545c2a1efacc5a9bcce01394f9d3a9587ba78fe3f054b46a0e8cb9ef4225802fa89ee572196d0607a2369ee5b597aec09a01350d9a73be94d9c9d5b8e72";
   hasRunfiles = true;
   version = "1.0";
 };
 "tie" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24";
-  sha512.doc = "cd64337c124fed8cfc2a30c03bf7023ddb66909e2a279289f8f11a186a7ee565223709ed752cbab31fbe5089a0eac54f10a6f3eaa13a5393f3f57a6e6d313946";
+  sha512.run = "9916097a030d75cba4162ef3dce197ca56effccc4f7c9950d28444bcd327eddd343ce3fcd1dd38617c3f4ba6988678d5874599673ee328e9dc5d460110ffcdfe";
+  sha512.doc = "aa7433f73867d6c643a0930e37f7c903721dcbfd9ca06e350770734546097ab0496573604977a3ce62517ff4c1f068eaeb1bfa0e93f639a8bee42d90a8f6e26f";
   version = "2.4";
 };
 "tikz-3dplot" = {
   stripPrefix = 0;
-  sha512.run = "22f4e95ea992470fb26a48ae964e97ceaea44eb3b726b72b1834fc40f183eb70a4ddef0b5b158f44a9519184865fd29daebf4a9f58ade607080ebca63d82e0c9";
-  sha512.doc = "589fcc2c51561a33d0baca8c639ee017495a1c4e0e1cc5c517706922ab81ca5f5f4ef874770620cc4768963f51fc32a962d4f47da51a31584339b6de166d9509";
+  sha512.run = "20c7cda2cae8229c672e4a3626e20c88084990331e837360c2f9a2f996d4c1f45df6ac12583e7cd9741e16064f0fbc94bca06a2965cbcb5a47a465a8793d5d4e";
+  sha512.doc = "b5d5b886c9e4a07f4b3ac40cd7b3f4512840975a9ef88d73d6db19897893f85b2125fef1237e0b60109945a0008a5b2b0a504c67707be211257bdf583f85c440";
   hasRunfiles = true;
 };
 "tikz-bayesnet" = {
   stripPrefix = 0;
-  sha512.run = "ca9396a32fcf9af2544b25252f40c62655d821fa6d1994c27b1d362d6c4b624f8e6f96263f3cb8561bd50480e14156af01cfcf797c014ba2462361f08ed854d8";
-  sha512.doc = "70f62bd37e6a34bb666137f75523cd0ac677278504a13bda898dc3e2e6ea3e06881918b294b5b4bcd9bc8b40e570fcb47d3383fe2a019802f87c28c7d3dcd5c4";
+  sha512.run = "71da2af20e64c14285287e4959d2814f317cee1a82b204c6c773bac13872c8710111afb2b02be6dcf0cfb73b5e3a13d6835650c0a6eebbf452348e8012311b21";
+  sha512.doc = "295f166c1dd496a81e32e59665c2faaee7e3b158b6f0a42b49c842e501a8f9384cc0c8c77f4d3d7eb3a824c36a51acb18a8a156402e69016c91cebb1009488a4";
   hasRunfiles = true;
   version = "0.1";
 };
 "tikz-cd" = {
   stripPrefix = 0;
-  sha512.run = "9583d69ab89a267bb37c28b55c412706308261e9f38a0236c13dea723b95193427a332e7aacfd498586ff908a1c979d85125a741bc64a600372be379251b8a62";
-  sha512.doc = "a84a7a2d4492bad94012d2fe5930be0547160c86535f01a498444cae02baab64b40a400292371a497802e47517c452a72128c18e5826ddd003584f9b180bfbdd";
+  sha512.run = "734aecb0a5a7447b231dfe630929ba2e9444bcb6fe2127b8cb365e5d688248f89e58c2e6b50039d3cf44dfe81c06de1b55e419356f306fae7fbbef2dff763ed2";
+  sha512.doc = "046a2acb087577745be709cc369b3c0973cfe7c627f57349ff75a0a9705643ceb56d428b5d0e224d2ea57d52d1e65bcf94b4b6e7816b6618d737fb748a15b242";
   hasRunfiles = true;
   version = "0.9e";
 };
 "tikz-dependency" = {
   stripPrefix = 0;
-  sha512.run = "46b3b7269859c1e909a05a680e6ddaa42cb80de451c050a27e3e50bc75045adf13bcb86874e30aa700c6de0da298ddf06fb225755942cce3cb1c974a704c40c6";
-  sha512.doc = "0ae67a107f2689db98b68a78957d2ed0943a946a48ce3b164666a3fc6406f28591394518bd8b1e5f8cfd3f02f52fb2b82002ce75f7132b498efcb322a8b22b02";
+  sha512.run = "7aa21563507db06cbb0dbdce4f54fce991faf12049a9a89498adca2f1a3339f9df0094a4c9372c930309859bb1ea82fd29b90e06490a27fa4b03e06fee56216f";
+  sha512.doc = "18692a4f0ae6a552b3d5a991d8c5950bfcd3f2396bcf20247f964736ff4a172d4590c7eabd4636ec7bac8bd2868ce29f39b74a6d239a650564abf2e57923ea20";
   hasRunfiles = true;
   version = "1.2";
 };
 "tikz-dimline" = {
   stripPrefix = 0;
-  sha512.run = "13c575ef23c873626c93cfd8477404b964bb1062c4b86ea41b4f8f518b7e02dde19a5ed411c103a06492dc80786ac4ea650b9d6e3fab76e72edd22f4947d6d09";
-  sha512.doc = "e3e2c5ab84a24587069d7c923ca0ecc00e29e408e013a21b8690fa6354eb03c74d4982a63e03883e1c8b455dafe323c54000188272757b830373c6c91aa8b3fe";
+  sha512.run = "15a9227ff8fd1613a7d9996d4b648748228d6b5a79f4253ea8003c7bfa2ca29e7e78fae9504daa777d3aacfd3c04044612e0438ea15267e18926401897337f4a";
+  sha512.doc = "14e5ea2ca9dedcb70a141b4e4d67ca6f84b7ebaaf2a660f444d08be58edaa91743d5c2113f8ab454c345805b8810498ae43ebcda57a764516c85785fcdabfd0c";
   hasRunfiles = true;
   version = "1.0";
 };
 "tikz-feynhand" = {
   stripPrefix = 0;
-  sha512.run = "8e54ab08403965a599d4c2625545302c57fea043679f28953f2a28e9111c96266034cbee46bb84027ebfa6dabe713df474336990194d2444e4a6fb4651984523";
-  sha512.doc = "f103593c438e80cb5bc56932592ced5be44d103fa8b97d3c2befde5fa00da472d07bb713011e2aa0eb39c8a4689760faff0f9b345b787df79ab701a305c81e8e";
+  sha512.run = "f61cdf7e85274354bb8dcc254d725f253b5b692b5ffb0ae98ce46577400f99f272c533bb9bafd81cd5c6f7f303e8797ef5169dacf967a2020b144373fccf8b00";
+  sha512.doc = "27ecf9bdad89dcd319ae1df2dc6919d1a10d1d1ec0556666f16e71e39355e17aa21ebe75575592f1dd08d327a34b36e20475537bc2afb7bb53959895d6720e7d";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "tikz-feynman" = {
   stripPrefix = 0;
-  sha512.run = "0e121a346a9cd2824a8fa2062f1e770a73cc88c6b4c7980d5c3ab24e4563ab3e042312a5c281ba85bf614c6cb4352fae12b70afa5429a2eb0b0ce9769df70e02";
-  sha512.doc = "0e45d543800f9544603bf183f74563c3e18c4643ac2c32980445ac8a99c642c7625a1b22a99563f79ab11bff87f083f178cd925b26c155ae4b478991934d6d8a";
+  sha512.run = "64b388ec8468c2854d03ea4203d18557446c892b06076a26db173604697f3ad7b95238ab8d89e652887ae6c5dca40d145980638308e01883a6fc1619d3fc97e4";
+  sha512.doc = "da15dfb8f7e5477df6032d10c0d10ba07a06943e6599c6f800ce92f589c5715920faf2c3d5899c9c13496f5aab12705002204879994a11f526042dfd0487ae75";
   hasRunfiles = true;
   version = "1.1.0";
 };
 "tikz-inet" = {
   stripPrefix = 0;
-  sha512.run = "15253e510dcb2daf7b64c51f6d3101be95469fd9d7588ba6b9b97527f161a4d6f3d9a29e13da3280a7c158078a23bd338939f656e02fa63f034f9c89f427e316";
-  sha512.doc = "31e854306339a5b194f60852148f51466661811782eb569a5d6356794bb3f18093ab531c81b741bc53f16e3fb848db473e1e0aa054fa2583785af9b108eb9b38";
+  sha512.run = "cb9148816eaf21e3e9690ca5875a3a6cb7d0b5056b889acb2d9b4e3a8430009976187e19daf8615dbd440853b29c6a411f4dd32ba6113108979b8c5c75851789";
+  sha512.doc = "9ad3e4227c4a8b5857320ee8f7d74b5f7231b3a562c430050ca52927c9a92209194436d742c3c5ed53cc173af813159feef9b750090253cb03c041647e154764";
   hasRunfiles = true;
   version = "0.1";
 };
 "tikz-kalender" = {
   stripPrefix = 0;
-  sha512.run = "dcfa32b8b3d915290782e821d167e2de55c2108207ca937b5e48f7f835fd965cf588e944348033ef5f3a9126fe486eeb31d3982a2e7dfce67bcf58429c7b064c";
-  sha512.doc = "9167e4f1ca2e43acc8b9758737f93319975b2ef0ef00eccbc54f53265b4cba43fb65cb97189091a49d5c3e22b31aabda596dfbfb8bcac629b4298383291bca36";
+  sha512.run = "b12718a02f7899d39c212a0e062d3f62e2c871517aa83a3bb955b29a68d7bb80269e0c76df9b1e93d189fa2ece01ea22863c5cd9b2c59298951b6247c6e71143";
+  sha512.doc = "c4c76c76ef1f08d4a8c383ec8819839eb6ad142c252d0a3aa71f1cb191933e704c78d116d0dd66531d3023cfbfc0fe0ce341786e26f21a37876ef8a74284abc9";
   hasRunfiles = true;
   version = "0.4b";
 };
 "tikz-karnaugh" = {
   stripPrefix = 0;
-  sha512.run = "30bc7796d2e5ecc610f53b127064f5bc1b57418408dee919b1cfe5d1b9e63a8cd13166d939792d002bf316eb42b8d363a4cc75efc45c448037249f03b291c2bc";
-  sha512.doc = "9b61106522ec971525d4077957b9bf06945290817c75ec544731a51fa4bb1b668ee8fc0a00cfcbe84761b5b0e79b492b10f44c86fae0b06a47bc61aaf9193d31";
+  sha512.run = "e61e20154dcc35aa7b13bff85a04ac8ebd35036975ccd8be7a32f1bf511c93d8ee5ae3aecf02fdafdf820fb95856d55a5d68f55b4d96d2c40926387307b7d9b3";
+  sha512.doc = "f231e288a12c2d26c01127b4a4bd37019b3395221bb5ef777bbbc3f3f8e55c7ca410c41b4d068031dbd1f6ec9080af27c601ba68c02ae23d506e340fd6326e47";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "tikz-ladder" = {
   stripPrefix = 0;
-  sha512.run = "74903acd9b0dd745f9bb5c5f0e7c29db55149c1c7b70cf275f727e39d2979b42e01f9ca795a85ec3f96d611fe14304d0d5c79d5862b02d418bffa81667f32419";
-  sha512.doc = "1e3852ad84af74fe83fbfee8559e384e0aea8e53af8349de53958ad5acf9ab8724c756c8fcb1633b826efc3783f29d05aa9f039ae2ec64532719928c6c7b7a03";
+  sha512.run = "a93bfef42663121671d00e38e6cc25914c3e0a639ccdfde7954158bebcb0fa89d80634de2443597c86a93998c9a5b7f3992b6f77e7a94fa4d40e1e1f5ce1eb52";
+  sha512.doc = "3b64a2daefe80d550eb9f7058480224e10200429eb1e2398a05e627cf4dee0a53feb026fa5156b8cf892b42b8d73821669e8a744a0801b0235b31535b7bec139";
   hasRunfiles = true;
   version = "1.1";
 };
 "tikz-layers" = {
   stripPrefix = 0;
-  sha512.run = "5e57bb45c4a75f38f2047844167510bbbc471a956b8067d290843a50e88203e22ec95834cf75b3cbff34a32f3159623fb7c16427c4ea8a995bb21918d2a186eb";
-  sha512.doc = "4a28f4d9bb96623b6df976c932b2c42b34c675f1236a5b3be575746f2a25b279020766d98fb68138ce5f5528907823a77a1825c43830b758c0950436d4465662";
+  sha512.run = "8f6f4b000f21b44b28b76be464d6870c2f1a126ca94fa0468f19889b4fc71bce513b02925b70b79f58ddd9c474ba0d7190acd510fd9f0934bb3e56c971bdf478";
+  sha512.doc = "cb390870f37c8397fc30e66b8be8b22c35653fde216f25354fc7651c1740c7e0b950427af2fd38e2a45dc129c3975a540886374987390ba0c7d3ec2d3c048c3c";
   hasRunfiles = true;
   version = "0.9";
 };
+"tikz-nef" = {
+  stripPrefix = 0;
+  sha512.run = "9f53ae8076f72ffdaafb812e1da6ef06ecb212b1795892673301d881ec4f05b4608fe17e30a18875886c12c002802ed49c26d36a1f282dcd6859e3bc9ac0e632";
+  sha512.doc = "7acc3e48cc8cb83530c022beb1dd27753c1344eb5f58a8386b6a90cf12b9313f03a3ad152fd479394a6598de690c9aff173359e04afdf9c04d794a78b904b24a";
+  hasRunfiles = true;
+  version = "0.1";
+};
+"tikz-network" = {
+  stripPrefix = 0;
+  sha512.run = "bf8dc0cf66e2a3a0317265d7ae5b79bcc417aac278753b6c935831904bab9cd5ae1c65b3fa1a776caa5a798b1e038d21c6c4e00ca78a26e591047290f3f4717c";
+  sha512.doc = "79031df0589f4d900a044b617a6aa251fb0e137cf379a6530c0061955ecddc081a1fda8997359d36f0036395db070d34909d6b728eb216057bfe81e236ed5083";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "tikz-opm" = {
   stripPrefix = 0;
-  sha512.run = "0559f94069490601eb294987287f4ffd1cf486110e778b5f71b93ac8e755218baa347d3f2593324746182529ca3ee261a87b3756dbdfb4dec20ba1b68ec53add";
-  sha512.doc = "9262a94b387f934342ea45f9237c2361612dd79d5cf02e2257236820b990fd090b1e27efb77d276f1d2279cd7b710d15edb006a4b35a6ce03d876cef340e9984";
+  sha512.run = "00bc73b32a3a7029e1c75ebf329aa1b95a89e43099e63f046945c7840bbdf10b4dfe39fc2fa0412a2a5f5a7d2d14b0022934a5e4d25f118e3effd565ce8a8ed4";
+  sha512.doc = "e885b98a8295bc73cadd0f9db6cdb79e6bf725990831d2f7f9bed3ab0d72a8e1746a949c25bae90f3111b80be19db177867b17396703309dc542eee5d5627dc4";
   hasRunfiles = true;
   version = "0.1.1";
 };
 "tikz-optics" = {
   stripPrefix = 0;
-  sha512.run = "4253c44e7cba3769978882448fd9f6f9965c831ad30b721060afcd9cdeba9e8298919a96a9d510f7b0de88ffc1697f80a5609342927f9f6660bb31d70138105c";
-  sha512.doc = "4db57de6bc133ca1832b0bd56c10a8a59a47e98970e924ff6a8dc0cfb4a39ead005d08f7483bf1117f217bb0a43ec59c3d0498cc3a402b374968960492681d22";
+  sha512.run = "662ac765e5f18b1d3a63be91cf9fe03df838a50a8a618caba7fa922dbf461774572d3c3ad055cb7a856c698450ab33d51d08a5d1ed5e03c97a09cad92476dd74";
+  sha512.doc = "70a1908f94e51eb0e5d681047386f7c1f9f24e9537f6e2407bbf039244e15e06ea5559ea9cb4579e6b017fc22aced906f72dd672f98fe4a6f8ccddc5d3c86037";
   hasRunfiles = true;
   version = "0.2.3";
 };
 "tikz-page" = {
   stripPrefix = 0;
-  sha512.run = "76e71d83bc57189086b678edfa9947c669bedc39ee1d14fe81db9b4da91253f215982ddf067feb90320fc0aaab07e098b1afbce0227948914e939c8f7531fbb0";
-  sha512.doc = "484163045d93245287cf8ebdf3226d6aad2a2f90a98b5224f78ad5bb62f2e48749cb19f3e96f0dc26d74103b4fb388ba57ba10a2e7fa44632f5201cb40c39ff2";
-  sha512.source = "50d34370904f4c0930a4f069fd8e5665c9e1683503293a3697d8db97e024676f17c7de661e9cc7d00336cb6a75a5599fcc1ef21e91556132b9409abdd64dae91";
+  sha512.run = "f1b4af96e033ec2c5a927160cb44d88b47bb1f4ce4fbda953e6a0c17877f8b1a5ea43b593197b241d4d5fe675e176faa2408ffd39e986b542ed5801a024819ac";
+  sha512.doc = "3bd8489c3eb5b801054d55af24c35be4aaea73a4844f8215b27018d492e647a4e2ef3c1b009e22c06cc8a2db15f74f57dd1711860cebdb3b3d228d6907f009a1";
+  sha512.source = "61fe91386e466c394fc66905f26d861886a5db4adc370b25830338fca780112c69d683ba26f1ab860bf6e1714749a52ad69ecae42c2d26cd8f22b2a07d7b62b2";
   hasRunfiles = true;
   version = "1.0";
 };
 "tikz-palattice" = {
   stripPrefix = 0;
-  sha512.run = "688510382b0392c55a659571fd8aa4b90d169350bbafe749682764d93c4e40ca232bb75b0dbb8d586e643c9a9c3c160d14c0e49908aae8810b51edb65907bf1d";
-  sha512.doc = "575f184b44a6afa7739364e59d11fa8fe8101105d8d704c907d5d9269ef5275d53e61ebf14f01ab86d244dcac9b161fbd0fddab1e129855ed9fda91ff0026702";
+  sha512.run = "7c4cc55bdd6f825767642c5cf1b0e525673501352556127645bd0995400adcf920cf70240759d8a54a97a0b1672852262f2f02893b790e9a50ea52130d902a2b";
+  sha512.doc = "417702f0aef6ecea84563bbc61bd79fb9bb1414d99e64ca875a4cba2b7592cb94acddc25f20df51d057f03fcebfa909454434d68e8fea6402885aad71eb278ae";
   hasRunfiles = true;
   version = "2.3";
 };
 "tikz-qtree" = {
   stripPrefix = 0;
-  sha512.run = "610841f6607196490683e0eb933cc9720141268a16d5b549d5d9a979b26f31bad16faf1a63d8231d3a8dc2b292ac40f78b8245c4bd0529db8f79ae459cf6333a";
-  sha512.doc = "618dd6c23a53164e75db41f1212917f783e478dc1b8c36e63be2ece1a50cf5e2f1a4b7c6faa9e14962ad46d67cce9a5fe9f131ccccafefd35625f49b5188072e";
+  sha512.run = "24fa04e4fbd8f729fa90fbcdbae2051a2fef615671a1661791ab791ec16ea5d55ac23c03df031d03f56e4925ed417b585165bb1605b608b6379bca5a50d2d276";
+  sha512.doc = "c8260b1cd8f11217dbf495b9479518df657f7f52b948e4498b71fb31628ba98832f450d7b6ffaa965087940fc4795b932274b35c142d01591ab243b64d03dce4";
   hasRunfiles = true;
   version = "1.2";
 };
 "tikz-relay" = {
   stripPrefix = 0;
-  sha512.run = "c1943dc44c5c45c075ad8d18b712fc7cf5b1d4122fdacd82e421f3f05ab69936ef6c54745ec1e07ed7c14dd7d5225349b5a91e67e776bda4d981c98d6f596b41";
-  sha512.doc = "207611bcb49c433cc65e3d443db94482c625e84455da1fd5c5d2b3c496f0ae8cacc6bc07785dbe4489c095546a18b36d9711a701bd6742092aee0e1a0f44962d";
-  version = "1.1";
+  sha512.run = "884e8168d988ade3a040b87ebfa405bec5acb0f64466aabdc1da24e159a54db74898426df8b99e8e4529744acbdeadb0ab044fdb5b09b0bb88e6392a427959d6";
+  sha512.doc = "c446e3be63e5831619b859ea9d161a13edb633de0e698f9f799147aca0fa854488da86d548fa5065c45312217b01aa92f863fd8d6e8128649bdb25ecf6264fd1";
+  version = "1.2";
 };
 "tikz-sfc" = {
   stripPrefix = 0;
-  sha512.run = "6714a919e99328ed592e68a495de59423851232bd6373841db68abb617cf8e6ac2f04fb8ef7d78d3d1bc08a92d42f67157293101e36ca6d4a3e6fa5c900a6f2e";
-  sha512.doc = "e12c34111f53745db106db33dddcd0afb6bed1e0653877ba2a846db7807b777c1813a0f9b9b6d2d757ad6d000ecdf9b094ad1cbdc1520764b9590b20e618473e";
+  sha512.run = "b595c476678122e7d37808ac8f65378853c1ac95a66b5f04f87ce5c64c0a642d3de5cddc79562d10ed05a013c908ee243505d3b5931180b83d2d993ad3ce2071";
+  sha512.doc = "f8370da9e28109d451f35f13f0029ebd5a36e68d29497c505e3d237f2510e691def80f007818107359715749b63fad43befea0c30938133789dc5f9f016ffafe";
   hasRunfiles = true;
+  version = "1.0";
 };
 "tikz-timing" = {
   stripPrefix = 0;
   deps."svn-prov" = tl."svn-prov";
-  sha512.run = "2337cbba50823cd949e3902411a3f0df87761c7e86b964a5dbcf7e4c40f3a354e0df0aaefa0e785cc9899e37da6b74b3c51d33422104b1dda775e7d0e4afb91c";
-  sha512.doc = "ca0aea15dc277b47a51e09f7f0ebc80fc59474ecae0def50e8a8958766bbdce666e10c5082111826d7a04b512d5a5575c520dc95deb7ecc026af1c80495b0e65";
-  sha512.source = "c4003bad12ae6ed0790edb4b5897bd8ba8f1a5987b196456aa004a499c46a188177e5c645d70fbd6a2a98f3ea94758accae62acd6a3c158ed73fc6dc91aadcff";
+  sha512.run = "74986c39200857ed680fe9223d7c35fbb1ed4e890c9d3def0576201c717b53974954d3983c074f99ebac425da40a909f202eab3175d79d2b96d9d11a473af7c6";
+  sha512.doc = "0ed1dcdecbbcc83bf78e7aeaa528e93e772b0f999de59f3b1e0a17b661128745a4010074ea2cc18b9c53a72a6a67668baec55c91fba41f70341af17d79725e10";
+  sha512.source = "2bd27be6383b20223f7c4934b65c27dbb6dbe4c509831f286526f87fff6a81c34faec1e2cd95bdab49826c38489a7d21880f508aaedb6f22d742f5db2d3f132f";
   hasRunfiles = true;
   version = "0.7f";
 };
 "tikzcodeblocks" = {
   stripPrefix = 0;
-  sha512.run = "a52dd881bf83c626192c83037c128bf28c768faa227ddfedb602657f31e113ef41b5dc32c5596089c49a2542cec691f702e6178439e05ef3c36ce619da61b06e";
-  sha512.doc = "cc181a7d6d975989dae5c8d286b2c11c2b2bbcf6f6fde1dcc826fb6581bc144338586b599c51ae891d49819bdb61a04cdbd15194303c9c777ff15bfec77cbfcd";
+  sha512.run = "c95b1f21ed2f7c4c7a260794025128878e7d08c720a28d68053c4dee9b1e09e79c93ac1a2f8931e1ff988f127b4bd5e594407d819a6ea08229c6b94ff3b7658d";
+  sha512.doc = "0c6e96db23af4a4699afe71ea4fbc77481ae6a8dab7cbc0b1e64e9d2fd82213743376fae03c5eefa09b6ac9c1953c39e65f91c5581c4fa039a212a5e56850034";
   hasRunfiles = true;
-  version = "0.11";
+  version = "0.12";
 };
 "tikzducks" = {
   stripPrefix = 0;
-  sha512.run = "5ff991d2a6c1f3eb5eb369e7b3cf42f0a81ef6b4f04337132488666ec56402817e567cd86ce0201ef348ab7bef058567fdabc7bd68c9b752da8259a17a48e948";
-  sha512.doc = "bfc524ee02189bba9db8b0aef594f86987ea90a220ca66160d8ae8cf731117689ed57cfd0deacd859fbff310c15052208d025b4867cce1685333b1b691d6fc0d";
+  sha512.run = "7274c301e382169312a2d318c43832f29752027ce13c38f960ddd58309b844225aed7a886decf61b4dc1d7ed90d4c4c54db56813be5d05cd0008eed4c922d023";
+  sha512.doc = "243ab120ebcaa888cee0e29fc785199512b08f29ccda98f1a54c4318b12e0798ea35ab73ad33b38a1be787022b310c6d74a0b58a7d4d03bdcd37e79b8b5dd4b2";
   hasRunfiles = true;
-  version = "0.5a";
+  version = "0.7";
 };
 "tikzinclude" = {
   stripPrefix = 0;
-  sha512.run = "049e303cbf6816a64798f883db28ba22b274546579e72cb9c39a8de51791792c67cafa7406b8110fb88cc47c12615e4e9c9ec0812129dca82fdf2ef2de6eaca6";
-  sha512.doc = "efb54a9a6f4878b3d371941519f272f8b0e6c156c681acb1875d854ae7dcecf808c54ddae1e75efa00bb36a4a0fa9960d4b4e9b2fa9d730b4a24df53fd4bfa40";
-  sha512.source = "7b4bf9f6275d29c586315592735ee8f5436e76b0a7f784bd2ee23f1f3f279226c806b2866fe897d3904d18ccf307798c7cc754a44a3923af027fc3aa7021ea2c";
+  sha512.run = "ae1d739dd05a9f24354890fcc15d51c268c6a9f96bc7f5e36a6e2a6b9f1625b2cacd3e4f54d6dd9a49cee29e6e18ea82086769424e9dbf9183b96230393fd21b";
+  sha512.doc = "8d1051d37a68f1cc26d84cb1e8b10a2b516ae2ccf94bea416f3e613ef9bad5ec6389144803601637ec9fe301bd8ff9ca821b59f0ff5a0a73f5e82b55b82f50f9";
+  sha512.source = "11dcbb9238fc487efc4d751661820d5be7ca2a98b39c0e1eb6b2aac8e5ecbddb945a8cf6a3076ed5308c57a75ab7cf2fe8813e2256c76f3c2b637c5b2213d36d";
   hasRunfiles = true;
   version = "1.0";
 };
 "tikzmark" = {
   stripPrefix = 0;
-  sha512.run = "c82b3a03095dea429e18b0ae091661f517613841e0183ed8f67223ae60df416609478fec4a9804573f3f2a7b274d19dc5406b79606c2afffdbeee0dc50af3de9";
-  sha512.doc = "1af647ce2d1ef8b29497d410f80a7807b93959534b4b0507282b514433696971d6a07c4c5bcfc416e9f702f0f3df394572955202adc7cd33d73143ea022d5087";
-  sha512.source = "9ace0451a6d5c8445d53d998e69e86940d748ce1ea024a76f990322a9764aea8c1d16ce719e3ee0aea942e7cef31986f0e31243ecb6c85a7d88cbdb483cef50d";
+  sha512.run = "b74427bc030edaeb1b63441db99e0cfd1eb5df48a49a707b60c6657645cb45459cc98f0b65909285c9b78ce796951319e4d08001acf01ebb10135596f879ead4";
+  sha512.doc = "c65b40beb4b2a8bb865fb6a8d8d688acaf8bb16b5d1cdfd44cb7b15e3bc224abaadd351607e19434356420533c7facb59b1c83d770df59059c7bdab4a77579fb";
+  sha512.source = "9831fcb6ddc2341cf12fbaa12d45d0d33012462dd8bc195e43a48c6bbee5833f0d594f322043f054b2a9b13e5f056b1730dd594cd7a4e2ce657a0287fd728c47";
   hasRunfiles = true;
   version = "1.3";
 };
+"tikzmarmots" = {
+  stripPrefix = 0;
+  sha512.run = "582c2f1576aa8e0f7a5fb95cfb524f5dd915c9cefc0f456259da1da30289aa8acd41fd5a725190e399d8a721f7f422a978d3ad0e0a66c86c363823d74259ddcd";
+  sha512.doc = "91fb2f153fbba3766f287248acb896e0fb85aa2e7955a85d3d7192797be864eaf0eec29c101f328fa7fbcec3b3cfe2dbe171003f4df742846da24cfce253661a";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "tikzorbital" = {
   stripPrefix = 0;
-  sha512.run = "f067c40251b58c10701eb4e27a13ac78c6fabaa4a5782fec1a2f4816d1a212da0bce8e4eb75fd7f0880c6b0054ad1ebe6d8963aca14afa36c2f9823a1f6075de";
-  sha512.doc = "02afc31c7ed603d9eda98bc7ff0f9a745fc57f8e9cf719ba2afb40d967e2df269e031ee1e25a9cbb0c725d0e5c5aacb8c2910a527a1ddb929f21d384e32805e4";
+  sha512.run = "6a90bfd545f3701d2bf3459244c94aec9e2db9ef1a9142dc2b15e5cc12e6b4bccde72e57fe93c93d95ad305d8fc62bcf77a5914dd9c1aa3d1f658d7936ce20ee";
+  sha512.doc = "24fe8fda7492ab6f0cd0732d7a6f01a8ed1a3f144199ddcb0a4d8fa3a764272d4f7aa3f615f099c10f7f935a8dc95ccf57dc25bcc201f099b79564147f03ec4a";
   hasRunfiles = true;
 };
 "tikzpagenodes" = {
   stripPrefix = 0;
-  sha512.run = "d81587ab7a906e27e1367d24ea716018f2793731f61dd701442b171149c40113e67059118aff80bab0e73302fafd66544150d03b16866925da81483118608943";
-  sha512.doc = "9ac16fc42cd3be5efd1bbbfbac2043487526c80e15f7713ea2258d2a402483ebebd7aab591bffa7571e5214b07cbf28553057a70eeabe6df6d2b710b542dc2fa";
-  sha512.source = "30065dddb60720879f05c033d4ca781b0dc7870e30960f29b75a32291fb1e90918294011a0cdc7981cc4c5a4232868f131c0bd43243f6b962f93f45d6dd71d37";
+  sha512.run = "39092afd4a64f83423e7c1a40919cb6cd8caa6c2f4ce6f5976433bc711aa6f35fffcfdeb0fc2a4b1796f52bdbace4df2da390ef605299194ce45a6c1e2ef19ac";
+  sha512.doc = "e142d8d546ead9be8ba8d9e997b8e7b79fc0d17f7f6f9fcc6052d3f9fd8bbf5f48617e00070fbc2a7f2eb963be03c335331bee7adc89767158d1d8443cfcb90e";
+  sha512.source = "a8cbc21203fd53c60d449ca86882e56777a956e1ace5bc260bb222f94902638e296d63cee925ae436032091e186ef17817c4027ce89d619196723f9bc47db414";
   hasRunfiles = true;
   version = "1.1";
 };
 "tikzpeople" = {
   stripPrefix = 0;
-  sha512.run = "b36e8ba68f3692c55b091d8524e63e47e72a2612010f2e4d54497652fa681b0b27169fbb1a397da312bd3ba17cd078e713087161145e0933c3a8cb10be55ed45";
-  sha512.doc = "f79b01931fcb1b7d627859c4f7ed2d954179e79c1d64add45705755c9e57ebd371470e7b6d05ac1b373eaecf690e6d4e5aec76f50ea710236ad26ce2f4399128";
+  sha512.run = "d2cca717823257a6ea8e493fb818922e179c078ee383d432f8f2a1f77d45b4ac186b4f6cbb574917fa90b9fe2c6ae663a5e69fc7442161a703cb3f6bba53cd7c";
+  sha512.doc = "c372d252e82bbf5f1d519dde1d02bb3bf9f2d67e49ca7b9131e86efe1fd71e4905d325822f07f0118e2020e209841ada8cee543c41c3ae46b0a0f5a662b5e5bd";
   hasRunfiles = true;
   version = "0.4";
 };
 "tikzpfeile" = {
   stripPrefix = 0;
-  sha512.run = "6f8a4d50446566a00e0dc346dd9ece94a12e5c9f596f21e9381c02954676a89787c7174ee4cc8fb7e2a5a40bc27c20aaa79a283034a52a23f5165a5a8f18b2b2";
-  sha512.doc = "cf74ac0b0877d472f3f5879d76a252156764ddcc04730a6e2dee8571c055f334c910034a1f27f8dfce6b4119c3aac4a1dae2cf8e4d94f3bf47fba60d9f0fbb02";
-  sha512.source = "82a30288b4722f869895e62318f2161117cfe7c0b8f37cac7dda90fdee1fa82f94af1d5353d10e73188be0fba199734d9964c42195af1989ae4bd8fe317d2987";
+  sha512.run = "8d8b7a10e0215fe06a00d6da312d1f235c63f7235ffaa730b4bded9da97f59c3bee771fcf2d21b7c8a2e356c2e4cfedab6b3ec68d46c30a05163389d62860a7b";
+  sha512.doc = "577c51ee3c6c7c9588ac90511999450bfbc93df95f0c82c58fc6d012c757ffa2aa455c1aa3979f716df2ed1b74211da3d31fe1e149cf0be5d855e6f6272a6c05";
+  sha512.source = "d9df867e705a13405e2547463f29503a5f3cb48ceb28a1410abb472e8cf9a215f4e3e66212e020adbead8cccd5e58c291ed4fdb6b3e088856e6a57a83c52cd98";
   hasRunfiles = true;
   version = "1.0";
 };
 "tikzposter" = {
   stripPrefix = 0;
-  sha512.run = "abc82b602958d74cbbd3813ee6cb143c918addb382437e7b78503d822e16524c4f07612f4f3a1b978747caee6370ca44890ea20fe15c7c153c65126b2d5e814a";
-  sha512.doc = "da194c97c48b910d04bb903a91326bc37ee11f997912cdf51f5d6156715de3668314674aa8f1158dc148d2e00ac8b2826ea4c7fa6492a367f9d13fc2b59c9970";
-  sha512.source = "8fdb57fefd3f569f850e414d0eadf2ab7e2f5b93d0ae1c329a3b7f663dbb26096a87acbba5a196cd525049c4fe0341e4787c1ee1518f4f8bc58bb727cf398cf8";
+  sha512.run = "7d046aba011aea541db634d1cf528e104b20cd57db2073d7b5237331ee4974e3e8e9264a23433a9b869740fceae94241f04f94a68edb07afc995e32c4d24a68a";
+  sha512.doc = "fbd2e1083fa01c04091881cf4962056703535b1dc61f18f7b8752f6e28819fd834cff3505492e9f338a965fb4f78dd66b03b3bc6dbcfb533428ec031bb2e8821";
+  sha512.source = "99b88881af12efa789cc8cc1868346df17100cc3ab33049327dbc996727a5ade97baef541537834333b3e39741d04fab2743e4bfa7b08b138c888403c272b3ed";
   hasRunfiles = true;
   version = "2.0";
 };
 "tikzscale" = {
   stripPrefix = 0;
-  sha512.run = "6594bbbb4c54296138abd787dd495ebb41c1765defba40f7937a90896be09a99cc7188f603279d7c557e98ce7793d92e4a45c0e33637d1b9310dc67e130a1d8d";
-  sha512.doc = "dc749cbaaec879069271f7f28bbec7a172a633608668dbdbd3181eefa855160975bb00a8723402e6dff2cd4bf9ed3be178aede9dd85889a18c77500b12e3f320";
-  sha512.source = "cef68cf24ee48c1f7bbaf2c1c7092f847baf6745ebbfcb057cf8b47c7fb9be132f9033ba00302764334112a9f13cba7c4d5429e48fe2a899a9da4a0ac9f91371";
+  sha512.run = "9cc57d98900a248a2bd9ec9c3ea7fc9d18aa535f89fc3f34e8f7d5b65b833d2f98995aa9e5bb580d4393c69b5211d48a7b121f17d9b9e45ac4a9a2b3305d5141";
+  sha512.doc = "f7359692fed4520eee57fa62563732ccd5c9717f53a48de940891092282cd436002236f42380657a143db5cce9d7925f4aa7b97cbf6497951b61eb1229b83c59";
+  sha512.source = "573bbec5737a29c486094a413f5a6777c9ddad258d10b955889485e7a521dfc15b1b196cbd96d2ad5ecc4b98e38858a976091324522e70bccbba5060025101d2";
   hasRunfiles = true;
   version = "0.2.6";
 };
 "tikzsymbols" = {
   stripPrefix = 0;
-  sha512.run = "8f840954b891b05b2fc25e3a14ed3b0b2a552a344e6fd21e8d5ee04816b0c286e483d76c7e39a62905a7609d0be37c867f714fa5ef2d4750e890c7735b61a1fb";
-  sha512.doc = "f21a91f7de71c47858528ff8d00d48f7cfc1f06caa5cbdba7508deeaf5fe544cf989479b5786480d97243c32852437551f5b8363c0ec2575dda555dd624dad66";
-  sha512.source = "2b89ecdbaeee401a3fca0df30c4fb7dc17e830e3d7675a378d1441848371c0a2179da1f5fcabdedab09e3d5d557d18604af534b01c900464c7232abdbefa3f93";
+  sha512.run = "64f61bbacc083de9219f75bba96bca9c3e9f3da3c0b549b54e2f9b6e42e67c31c100e93cbc6b2f505809305687c93da90e89487924d9802afe81203b1a1ad0bf";
+  sha512.doc = "875a616d47df9d481032fdb3a529c3e802fa70ab606a52baab3e42eacb4fcecef895c169d6b45b4c0bf78bb0b0ae5fd880a96604b27ea0a6994c27c527b2dc47";
+  sha512.source = "0ceabd4c126d46bdb6839bb2162d6c68cedac3d5a9c1b15efd8edb920b1089d136ff8789bc90c29523d8bb27478dd94c5797355b767721da19cffdc16fb49803";
   hasRunfiles = true;
-  version = "4.07";
+  version = "4.10a";
 };
 "timbreicmc" = {
   stripPrefix = 0;
-  sha512.run = "4b61957dc4a6aa9ed0f608cc99d8926b47334a129ab1e2f231d3a70a327d5cf631d71dcf439c790f09448bf06f7836af11b20b1691ddb9c9288f9b0dc3aa496a";
-  sha512.doc = "8119763e875a9d2b504367f6b206e1be882fa4d0fac2e54c84a6c634a3df0697c0ecf0b631aca04a7a16ea48b31fb5550fafd02e43e4fccdc2711ad10cda094b";
-  sha512.source = "8070ba13021b907c36911b4edac904ad1701b84fa3c5597a6c3ae91284568fb54db81f7b42856386d8f304d9c64941f81199440e11b9f8e180af3d4305d5f9fa";
+  sha512.run = "3fbb18e947779e05fee128c996e4c9a1df7fac4c597ad5bf3514b17e80d09c0e0b815a16a17a11ba9476fb3a2944201577c536635217c232e3b6451a783888ee";
+  sha512.doc = "8de9ef7c62b2f747813b5cca5c5823a6bdd008a135b617f2fdb104f4931e77b483d97449fa355055a551155921f4fadb4e8d958788cdd31896df14ace19d2a29";
+  sha512.source = "c91c626f185f058b269ea9a0f3e5519309bbc55ab6f1967b9e49f8ddf6882e83fe7aafbb224dbdaa524aaba4016890d29dc7502e544b3ecce9fdce4ac5bb63e6";
   hasRunfiles = true;
   version = "1.2";
 };
 "times" = {
   stripPrefix = 0;
-  sha512.run = "269854e7b121399b16a52bf57baeeb8c1a05cdb29100c94f757af8376d966746037b1766d7b773216debe836e594dc7ec44f9bacfa9b4ee57cea033d1a25811c";
+  sha512.run = "92e9920308e630e387441f88e4fbeb0706a07cc84ab218dd3888ff9bb8924b923ee1e4e1c48108c6a37ae67fd8ac08ef92ca354330e079d033750c624a302b45";
   hasRunfiles = true;
 };
 "timetable" = {
   stripPrefix = 0;
-  sha512.run = "e421912b028a6f709b7e6bb3848942ee75a00aefa4ac00527dcddf5dc89d1414a468916d45a84d0057908e97de750082bbcc063bac00f8d40abf32ddc7f1c05b";
+  sha512.run = "1b3dfd57513b6ec8f1dba13e419bade0fff7e7c83e665e84a2be738c70c3d3c92fcf8682a1f4521a4615959bea2e2524843b661d3c4bfd3f27383cfded37ad4c";
   hasRunfiles = true;
 };
 "timing-diagrams" = {
   stripPrefix = 0;
-  sha512.run = "066de60830d599fba72e970dfece8802bd2c7d570a35c7059ea9e74ade07e67e9f0df8be6c2aae030d075dfa5eab8fa875b33589aa7b89c6272a96055d26518b";
-  sha512.doc = "397ceb2d257ff658acfeb8bbb19f9843e0a004c3ad1a9968556b37ff298747b15a5c3a8fd1b7b568c68fd0d4f1fdd9e4090ab3a86ac8a5df4ce2fde8656533cc";
+  sha512.run = "b032b77ec9b3e878a0b862bf28eee2205ad2ee08a74205e9c52f671eee9ddebd0c8244794306d6374a692e6f4f2ad05e9ca89557229c34015869eeca60e971d1";
+  sha512.doc = "f123ab7adb5052da373a5615e2139d2068b488c8496e891b432ff43c3cf249e3d77d9b8d339a2aeb1dc47c899d1764c9c1bb8deaba2ae22d3a4795342567eb94";
   hasRunfiles = true;
 };
 "tinos" = {
   stripPrefix = 0;
-  sha512.run = "1667cba16ea1238e2194fc70137ba92ad2ab422c54d7f66e2cfbe79d09c37181782a52c05b8a75dde47b6d92b69e8f3f0300ad5e3d0b5400cadd5905661b4a0d";
-  sha512.doc = "071bd6c5f11a5053fd5ff69b981859ae6b3306b66121bbb596558d095600986d2812529cf22136ffb3834b06746182796be7f65cb18aaee410715fc2051678fa";
+  sha512.run = "a34cc0040576e2455dd20cce2e552304a77e12c44aae3c7cc1e0277094cdbb93b4017d44b57360eb172caa6667dee4b550c258153a4cc8e472b464c252ebb674";
+  sha512.doc = "d34fd4fc47420d9bbc2fd7b6e79c986a21db3687b9c6b3ef0cd504ddfa57231941b7d030cd447e43a6520475c243793b80bc741c3df546404e3c34fb6ed84bb4";
   hasRunfiles = true;
 };
 "tipa" = {
   stripPrefix = 0;
-  sha512.run = "26e8071b2b5439704a1cc9600467d72c6dd9541a51af7a78bf4ec9c4048d392e8f436c1f0f1cff5d88b348dfc48a2acaaaf0f4a228dcfd37f3172e735303d513";
-  sha512.doc = "4ff4cf48bb995917a9c1654ec8dd5cbfc61cfff0c0e344d4f4bf9809751ab1eabd45f8929bfff8694f3040a90bd7890045d85a70b522a550ffb3a14047b0708c";
+  sha512.run = "03b02e4d6ec957a0261007eecbd8740bc7098d34510d4bc28a991002f865d3f709e7230a439f3537cd264272cdce0bf17fee4e119e05dd961e234ad6f35360bc";
+  sha512.doc = "a1e7b303deef85a73e3f260e8abe9728bc7187188009f0a531f92260b7002724eca1562b4073764085547645fcf01e6fdbafc1fc4b222065fc32ae8fbab5f5a7";
   hasRunfiles = true;
   version = "1.3";
 };
 "tipa-de" = {
   stripPrefix = 0;
-  sha512.run = "1cd5c7f7c4a0aab624bfd8526b4cf628ce0e4b0fec1bda362fec4b2f82f817a64454b4d4403ed60bacd60686159372f7643bf2ba211d2d946d6ab2e12a78e5e5";
-  sha512.doc = "4c8fe6f776ae94ad75bc68789287f2bef254f951beb41c26e091d1aba289c8518fada89acf55e11ef0f6b4e1c06374bed8c67fdca2f9256c644daaf724420968";
+  sha512.run = "9902f170f026090feadbb4221162b26198eaec7cdfbba3556b92399d6a24da28d55a7d70bfe29acd3bbf0578c8e3a3926d4b5e0b10a5c07648ce7c1abcf7806d";
+  sha512.doc = "3416e7504b35434726242ff057d0812ad9226ef366439917f2580cdd4589a458d4e02aa4f51cc977a72824314db3fce29f283204b7c9d37f41609840a65ba432";
   version = "1.3";
 };
 "tipfr" = {
   stripPrefix = 0;
-  sha512.run = "a63645fded366441d16de4b6abaf3252ff5e3fadd88480f9a6123caf0c73819d09db3d3eec4b7e50eabc783e67c8be70637c3711739f0558a7e00cfe90a68269";
-  sha512.doc = "22fcb11b5b35225a63b71bdb185fad47c41121e42fb6fc24da10472dabd7c65de2d916c8242816cd3365edef6d4ed7aa2217ad3fe5c2fd0c801d8467de1345c6";
+  sha512.run = "1a271dc707ef49310c64f7533bf0430d2caf14fdc1f2566d4b4dd8454e9aa850c790fb42f9e537589d91aa741ecb753f83423f36f0d5f760e0c27e0048923bdd";
+  sha512.doc = "e59fccbbea15795960f5c79e00e9a359d1b7a302205b7415cd4b03c2eb0039c975e9eae0b7beeeb9e45c9470fef13204c6379f48be99c00fed7bfa900a2416ea";
   hasRunfiles = true;
   version = "1.5";
 };
 "titlecaps" = {
   stripPrefix = 0;
-  sha512.run = "0eb465d5cd75276698991311f7c0ffda97a1525bd48f41a22e06d3e8d6df1b762924e4877e86b3d813dedaa2ae63e1f54ced9f92680b0b8977262139f953e5a8";
-  sha512.doc = "a083e92c258a1e12c958b5a1660299905611e32e3f5500e42acbfb8c719c7158cdbd3cb4a5acc638214d6952b737c6d52aa0b601423210fffd0268ad1b34f1f2";
+  sha512.run = "5b97360a1b2280d85f315857eb72954dbb91cb7ce4490840741d2f8270561c88faa688dd777318f6caf6ce644fbfa11024aa950dcb14b39e5d96dff33d022e29";
+  sha512.doc = "08b0e76c39625ccbed4bef4bb51e6a2544cadeb41518a676ba9a48077ea747534cc96d567f3fe15b8cd889ff035f5464934454223474c51a8967605e50d53a9f";
   hasRunfiles = true;
   version = "1.2";
 };
 "titlefoot" = {
   stripPrefix = 0;
-  sha512.run = "38c86a4ce8fc7f47db3de1eec5ea1ee5bc58dc533f6c3a8a986ba67fc47db855a5aa59d58ec092d039f9fc81c16266d7e91455c65f6ba69cc438abbd92efe498";
+  sha512.run = "ea72c965f14a46ec4a49839026c7e5d27c24a2e3fb411e8fcf4e3cc281025b2ddacdef3a8ca73cb748c5aefa82b43eed884aa4e870994215eb8b4f0a3dd93cf1";
   hasRunfiles = true;
 };
 "titlepages" = {
   stripPrefix = 0;
-  sha512.run = "ca88d856ce88b7544ffea94bdfe5b8ae8dd0aedee262a5d5c4fc923b20c74c7d4c3bc78e2236cc04c4f1ec85da3d9fe06aa09a73f412330217dd413778c14606";
-  sha512.doc = "c5a131f9a63f2f453e60560729852f0c5b5ca09191715decce9d66b09da3c944280c463a131a88a59f5daea8f0fdfd6c035432111a7164a6fb2fb5e712cf3cc2";
+  sha512.run = "3a2893109a4acf5dab02d7efaea7ab5e077c47675de5944dcd15bac716206bd0abba849d302a8db5b11ea7f40796d31d0152e7e4788d52aa70036bedbf11e2a3";
+  sha512.doc = "30ba4ce9ad0253ad5f5d9812d08838aaf5d8ca0776375bae9d6b4c5e625482bee21576ccfe36822ef6d34b1d352e573fa0551f2aae9a4d821fc706c31c02e359";
 };
 "titlepic" = {
   stripPrefix = 0;
-  sha512.run = "0fbeab9d90719c6d6a8e476b46c5d5d37b80ee32e624fa2baa6b2118e4fcf04125a8c47c0798d0d7fcd121ab33d32100a1b775e4bb66166eb8bdc17af64eb1f1";
-  sha512.doc = "35263346c41e2b33dcea203a34011010ded70c6ee145825ab7bec68af4c9cea4783afc91ecc28d758d1c941f23cb94e45db10f471dd58e14eea86bcf576f83fa";
+  sha512.run = "0519ecc0324de8489ba623be429f19abef15bfd34bc387cabcb2f5d19cac0621ac17bbb1ed838852d5567d383a49fdd88008ca8303d88517637456115b692bdd";
+  sha512.doc = "bf8e1861c7f49a714b1ea72f03ac6178652e92047d58ccd4c49ef48cce39e3664a4dd6d92830f3c2f4d49e55eefe2d07971a95dd7f54df17171ad584db5d912d";
   hasRunfiles = true;
   version = "1.2";
 };
 "titleref" = {
   stripPrefix = 0;
-  sha512.run = "aec102d211744b0a5a6b0d9df220aac43217c94b890c2ad2e4ffe4f18636e691c79ed9c809974543ff7735b82c8b7301df03f942aa32a97588c2f6fc48515a28";
-  sha512.doc = "ed4476f51ec99b0260776b105e981ed1133eb870f98416c18bac9e9f3f57045a2e83305953b92d8f636e2502d5f656bbcabdd7b24f379873c173ce777e4cf653";
+  sha512.run = "f7c34a1c3f416f4d2b7d1d739c82d218924d6c43307ba605da4adaa735048a6095b25dc719268b82e88fe03716c449d0d867ed626f4c59d1915f9a129bfd149c";
+  sha512.doc = "bc67f48f4477e397e0231c3f83cfcda4e467e5cdb5089f0d004b099ad1e884335ae184858be0fd8761c6022333cedd9ea5bad178eb51fef4ec59bc590db0aaea";
   hasRunfiles = true;
   version = "3.1";
 };
 "titlesec" = {
   stripPrefix = 0;
-  sha512.run = "6e0dd8528c1f59274213be66225e5967312bf24c8d553ea207c83363dc5fad4fc6de2b5f68e3704fbdebda4136fe6104c5b505ba2befea55024781e501603ffa";
-  sha512.doc = "aedc11e072868414e67ce6960f8428c981b201c955fbce7abab382f81f1b54c969c973c7352bd025ff98c8690876a29eb1d7f529d45b114bd751c8d9012f234b";
+  sha512.run = "64ca860a2d1d9f8a7bf5b8a53e505a6b1d1c279ff07ef532ecbbe78d20d5c56abfd14622e6f3e72e27f72c5fe5279492cad6b6b42ee0ef0fe60157488ad48e52";
+  sha512.doc = "8851d819bfd4e30474c71e836989b6a8c1355c143abad0af686815874a8f851e8353f631f9bf3033b9c726697309c53b9d3f82d354c84e26cdf8ccf1222dcf21";
   hasRunfiles = true;
   version = "2.10.2";
 };
 "titling" = {
   stripPrefix = 0;
-  sha512.run = "46a2aaa660c1a2542f26f6a1c8810aa3fee6d4b2ea4eaa95809f17d39f1e5c14a3fdf353c2f8005b916c1083da75922386b3811712c6266130e3a8870cb7cc13";
-  sha512.doc = "ceb409c17af537d44e88bb64e90ab325e842401329fc1d4a72f6c5de1ea1e06d1b3741c5fac4fc0370855f58d7cdb82ab200755ffd858f45c5d6655505350cde";
-  sha512.source = "03f4f11ccbf8218290849a01b2829953ab6ef62ae58550f285d5554db7548d06f0a17ea2b886915f8472570ce0b8c2128cd01f14d1ed3030907aca7ca91c432d";
+  sha512.run = "56c1395fb3d47346c9b5bf2fe838d0e35903b71471c86d78292d706235fcd42c6f1aa9719e3be899d1fc1befc0fdcd918979a0f8d7f790ca45196542bef22859";
+  sha512.doc = "bd44edc1a228c2bdda3ef555b71b52a31d15f4f297bee17483b483fe273e91563d70c8411b1aba68be3b81fb14615148ad9efa9bb29d85d918f4cf7987736e0f";
+  sha512.source = "631dd4fc22bf06d007ae35d09d6603c93d8812db4a4b77fb53b605cb8b5fc122f1b44e4325d456f0959d2f006ff85fc8d388c1a64d191639ab8ad09cfab579ee";
   hasRunfiles = true;
   version = "2.1d";
 };
 "tkz-base" = {
   stripPrefix = 0;
-  sha512.run = "67f9f00e1569b39422cf025007b11a678c33d350dd17b4a26c2e2a84f0eea2aa5825cd9eb2c7f470ecd39c3ff9046e7412aa1805b7ed898736657c0b018068c4";
-  sha512.doc = "3062b7e934fd65c6ae2f9d8a1af58ed819060820853df4b0c4141efea57389e7064e529dca821211273ba7a9a003535f5c35514a56e3193042ee0b05bde6e595";
+  sha512.run = "cd864c12b4e989e36618328069425df9e8788bb87f22a6c9bd676977abbd43d50fe06d4d55c5c892536f64ea9c2738e644b8b83df648dc5c064379e6376de03b";
+  sha512.doc = "7899e18353d11d971015513546c7a4429fa63db2eab28538d7ba659bfdbdbc62be7315010783e5cea022c4a7550f0ca750e8591b6ea6ac8cc2b7d1c822ec875b";
   hasRunfiles = true;
   version = "1.16";
 };
 "tkz-berge" = {
   stripPrefix = 0;
-  sha512.run = "708cd11957dd75d9fd7e26f5c5520ed4b1278b09141d9b7032b0c3f52921ce269a490378708db924a505703f8dd597f1a1db1f7f770fd32feebc293fa459503c";
-  sha512.doc = "a74b04ab8ac8a3f4459cd21c99418a68320915c0e156951ad654e2a3314740be89c57f14ab1e782fa01274f8db8732dafb3a2908859fb42382ebe0c0931372c5";
+  sha512.run = "8b2f66a0f9388240219e9f5f06e1eaa65ddd5157a8e9d5f5c0528f4b9e9f4b45c65839df5c4cdb79dfc9f8d6803c3ed0b394ab4cc4bae59f209ee863311cf587";
+  sha512.doc = "7e926653afe5642e36da17312e366dc38aa75a6a55d6b9ba82b490f63a7b3da3a1c092c0b1a5925971bf7be18f7ff88ef0a41219d7c8ea8b77858b4996bff750";
   hasRunfiles = true;
   version = "1.00c";
 };
 "tkz-doc" = {
   stripPrefix = 0;
-  sha512.run = "f31191b3cc25e89d6c55dad34ffad1a3bd6c6ef5649ebc5727b299b07c021b371c2acd5a9d47fdf4717c102ccc4ce08088b991b579e8c5c69ae596071aafee37";
-  sha512.doc = "227924d07d8e29a606d7b3285db6a98207aebced74094aeaeb680e63b3d4378285be1dc429ada40be8f6ab2036d0151edff39a5d8a9951590a737950c11594c4";
+  sha512.run = "7493a568bf51eb5594ef77f30792a60501c30670c374ab5a370f1bbc0cccf93b79ef36528cbd1d006a40392a2351899bd9ad558d25221e5d7ac127b3b2fa6d94";
+  sha512.doc = "ec9e94c922940e85d8351dece5d90b5bcfea226cf33520a243b79c87f5a14d1bf91ed619dd81540c73363b4e51364a1e4681ad3e67e744e53f175e03394ac283";
   hasRunfiles = true;
   version = "1.1c";
 };
 "tkz-euclide" = {
   stripPrefix = 0;
-  sha512.run = "b4b39215cda7ed78c3875c3c1490f6f69ac4769f590d406765ba116674dc2f35da512bde27e264fb1aa3de8f052f3cdcb99e9022dfbb0d4a109d7adcb09eb30e";
-  sha512.doc = "55307fe27424783a8569261d73c2205b33a022f556e00a104c1ed5c7b7a538b41e39a9d093d6b5fa11147398d58dfb12ec4e4ea51e3f7374eef31dcecdcd7675";
+  sha512.run = "cb555fbc171220c6ca8181cc11fa41924b45f1c07b38bd23236ad1d4db5ba07b814cc8c98d8efad99521634dc3ebb42ede2f85d3e678624eb0a388ab65d9ebe7";
+  sha512.doc = "69092084aeb2c14a18a6f03020aaaebd7ea24b251ae225109586020e42366636082d68f1159a8517cf7df3e86ba16e884c508c73a6b6490f14b91cc43ff1b433";
   hasRunfiles = true;
   version = "1.16c";
 };
 "tkz-fct" = {
   stripPrefix = 0;
-  sha512.run = "c0cc7992c6fa5cc38102d60f6df5fa78ded8daafa5395e4d491924f187b572208c3d2c024254449a0a435956939661e743715cbbd03bce37eeefdde92ea8551b";
-  sha512.doc = "8ea9559112f658b1659227fc6976eac8bc7271878fe5d599503bc03a00106d87d8c5f4794547d92ea2f5d44cd9334f783c27201f5042dc6a472a85f4aa84c648";
+  sha512.run = "2e8f6671918358dbe6a44add04248a5986ec7b5cf03e4d0264f2631557eb0734830bf76d7ac0335fb5b7a71ab794081fcb7dae2b237e60c61590812e67b9b2d1";
+  sha512.doc = "0fb0cfb7e63be1619e589fab20e1923c24adfb413d7cf3a25ab3e052b8e98fd06aaaf024d1dfdd284fdf1495e0fafcf82b793e8bff6107ab7ad9e85300f6a900";
   hasRunfiles = true;
   version = "1.16c";
 };
 "tkz-graph" = {
   stripPrefix = 0;
-  sha512.run = "ab4106c9b99b837bb90f6aacaa534a1385cc69d7a008bffda698a3aa43182592cd864c37eaa0d8c4788632014e4d91ca75f545940527d84494b02652bb7da226";
-  sha512.doc = "dc4ce440a693a2be755f6915b43af4e763a753d90389dd8849b18bff7b3c1ee972fc5361a849c1be340974f47cb05b91b05f20f6d05ff5a8aa4d63be05315088";
+  sha512.run = "a94af131724ac5e14b81d11e95e60be60e2f8fe555abda1c1c8e2e806d62ce91b0c97d01964d901ac97ee2366d0d3f9edf325aaf8d9770fea5208ba1ba706e76";
+  sha512.doc = "f5f32a4622abb6735c609a4c86711a450e4fbaddaa8bc30e63d5d15d5902a91713c4a17f8eb86f5a9835535452b3975250a8dd9a8514c11fd0e908729efd268c";
   hasRunfiles = true;
   version = "1.00";
 };
 "tkz-kiviat" = {
   stripPrefix = 0;
-  sha512.run = "2cc482b0b243db4f632da0c1c4576a5118a56d0ae9b888004cdd9dc9eb1125ade4734d248d88b49bad18052c23ed218f3b001f0371784dde5d1579940685183f";
-  sha512.doc = "1f67c5602f8b877b1dbbe85dfbdaed83987dbfcbd74820adb14fb29ffb3ecceee2f47e55df95ae9888b1414a05a44ee19e5a6bb26306d03f44ea4340b87ec978";
+  sha512.run = "544b5e55f97450ce912781560c9c03186e09f446fe1127a929dfd078dfe2967cd21fb59a4a917e3ecc18e21d3f33dde024f3005ccbc66ed904f26b8a53bcfb6b";
+  sha512.doc = "90f6db2ec4d6b78ee4f2f986e6a1857c60883f7cab248c07dea60f1d2487f4f0f678a9d832da300ed3eba3fefe6f1d96815163a2341776dfdf1840a17d306b90";
   hasRunfiles = true;
   version = "0.1";
 };
 "tkz-linknodes" = {
   stripPrefix = 0;
-  sha512.run = "130a0427da8bf66332b166ec627b53e38c1918356a931672167f7bfda3d253c5c22f0b31b690bc8f5bd101ba1fe59051f4dda58554f1c41d148c5041a8015dc5";
-  sha512.doc = "10f717bcbc55f1c82d90bdc63fc0ae0afae4eba4aa3fe510a14e8c1834a5fd864c2fcf5c92d82e14e1c5a12dd8bb3ae838baefbc5b41af7b46840b61361d7c71";
+  sha512.run = "ca068fabf71ef821125ab8a885ebd7f98e480f7174ffb59083da048cc41965e4b7d52cc8bf4ffa21fe8e3a15bc20194c8588214d885134b309cc8bf88de34d61";
+  sha512.doc = "2a68e9791a0dc64c861164e78970c9a4f65ac2ff25a75c226e5e37dc39f27b2197323d3e655fd64dcaf02cb2e4a3e0dcb73f422a52b67259dd314171685fec79";
   hasRunfiles = true;
   version = "1.0c";
 };
 "tkz-orm" = {
   stripPrefix = 0;
-  sha512.run = "2a74f3141facce7feff41bc263ce211b9f3f51100cb90ea22ac2f4cc77000d90d9b84e5159a3722d0cfca5cef1e8ab3648a03e9ab486fd1600f017a2d2c242bb";
-  sha512.doc = "d40482e6a0b8f44cbc962172a4eabde6c4e77110bab9237f0fe290bc1337cc18e8aeebe15e6a0d811d9b8d9379052dc10d86fa21610b58b3f37e96a651dfbdf7";
+  sha512.run = "da26599afc19eea1138709b88257f3bcc8689e653e69411d70ca35f99545ae4fbaa041bf4f9fc0bb726350fff9dc8209fe8828f15a65c57c0d9493b61560a73f";
+  sha512.doc = "4f210d43a5e35fbfdd5c5b1bb6d6588a2c662c1d90ee2ebb8a4b9b854534785d37a82c123c5b1ec9b7b390da5244c9929b93dde18c89ff3a539d6818f35219b2";
   hasRunfiles = true;
   version = "0.1.4";
 };
 "tkz-tab" = {
   stripPrefix = 0;
-  sha512.run = "a06e3622f798710d231f3d5c0ad622492b93e22798c7f715b680b191a58da1f0adad0f72c6b122a09e0e790685fc9e1d46bfecf6d1ca91edd67857c9b3be6b36";
-  sha512.doc = "dbc470004bfe709073df7358958facf91b16b3a154a5e81dac8078a27e513188ebe2d953ec395af8f9005c472a9e6c9249f6ca5530a36d817d4a85e21ee09e80";
+  sha512.run = "354d973da2d2d2344e60dec20b734e51fc2f8c93bc74eaa0eb27c18b0e033ba4f1774fd35be59f5d153cb98dabc5f4cf7c7dfd886d99853d142035b4902234d0";
+  sha512.doc = "48de188c2e5363ec85b276d94a8849762ec283a6807ff4bfc18982db66e945aa109aece12e9a87d34049f772cda23e8027ee0790bdf6f7f0e3dd34eead3cc80d";
   hasRunfiles = true;
   version = "1.3c";
 };
+"tlc-article" = {
+  stripPrefix = 0;
+  sha512.run = "99f352e53a1f475b88e4d25e68ca166a09f3474662de6f296739ad755e36adbe5b65f1e4b4402a54f4f9ffe157983a439e2876409cff629e2aa6bf48bae977a4";
+  sha512.doc = "e7a3a8b029e9bfa0de36bce89de432231e4136d749a5418d967574bcedcd0ebba74f1eb7fb7d6f83202365936878c937b704f89ebf8852eee7bb561e9f30f3b6";
+  hasRunfiles = true;
+  version = "1.0.10";
+};
 "tlc2" = {
   stripPrefix = 0;
-  sha512.run = "92c91144df78677b5942d52f7c28e644e0955de9817d032ad173430a04dfaceef1a04082f7488125832c6fce313fe64117864a53fbfaa7f245b98d8df10c88a8";
-  sha512.doc = "cd5d281e9727911b28b9e4444183d4ab11eb064adefbb0ddbbe652f434779845833b32eaceb6fd551a9c1bdd45c1d50d1d1a97a89f419c6a785e66390823dc7f";
+  sha512.run = "460b1f5825b677e0b684f2c804501815eb3b4ba437e6e3abc4d59e6deff9647f5ef1f30d42b0f5d1e32eaabec8901ce4e46f2aebacb2c2ca0a3b310c99fafac5";
+  sha512.doc = "14f74ca9def0a417be1e35cbc4e2b27ecd708d8ba91a4cc7cf6bad6553a894c3848c965e3f978aa69b6446d408362c0c19e34b8ca55dcb89ffb7fc52126115f5";
 };
 "tlcockpit" = {
-  sha512.run = "e8d65672ebc256497951d28c933c03a9bf827e8149806c659df2a7c297d11e110ac41878f58ad0bad890ad01d5673a56863be2b27ff33d4a3ef727a47db3cedd";
-  sha512.doc = "ac448fcc4a19650e1862a978e78058cbcefe3c63e2865297563021f0a89274ed5b8c4e3491fa221c0e295acd602ae1184ea2132780784ad56d14dfe6d7d3dc94";
-  sha512.source = "105af1c1f7feb46bb9a2594c48a7b312e22833e59fb8a2d7bcedf4ab33468a4a3f968ccd1df4559a50964f738df2fe4c33119964d5c4ad3a02d9a4d093000bc7";
+  sha512.run = "f6af9c2a111c8926b30ec83ba3a36cd602593b906d7a2b2d89fbbe8d16bebe04bbd7e9a19c3016e2cca8fc75631c217d9335db6965f20530253259ecf23b3178";
+  sha512.doc = "3f94ee8a153b54911f33bb9e9bee48452d3ab41d272e59a32005426535fcd9c2215276c37cee8ed652427b0787398654ecc27081c9c8480781ee1095a2f1939f";
+  sha512.source = "73ced1e4412c90fefe09cb2b374383b34218516a8739e110b601a3b1389888ed5816a99619d9c3d13645e2fa4aa06c05c0b8529994868f06a814b678915b537e";
   hasRunfiles = true;
 };
 "tlshell" = {
-  sha512.run = "621e3a30788c0a323d0ba846b03b58195cbaedcc0066f69560b67ffe7f65537967d06bf906c65c16f0c240f8e82f6be92e80f8bda5d860d52f6ed515ccfa429f";
-  sha512.doc = "afd11109c100905b4460194ebde3dbcecdca5b5d783c00d25a2a964d3f79e7b18b854b51501006e6157347185cb10e33fd948617fd186641a789038e6ee60203";
+  sha512.run = "84b185ef60e540d2ce7b2765258a4d62216b82e7400278c1e177ebcaea02a3d39662791a7e799a2373be4e836079a731fd602f3f92e69abb4311bbb166032051";
+  sha512.doc = "260a7f402db652259bd5f1e50abee725630aa06ae0a06590ad32e546f7bb6506b7ac9db466f4967d8f029c378b820265e50502187f1b84ab88bace2a1c84bb68";
   hasRunfiles = true;
 };
 "tocbibind" = {
   stripPrefix = 0;
-  sha512.run = "1184f94dbb9b6eec7982a64f37487ce879ba36a814a92fadc24d947f235ee4dbbf29523c201817db6d61a8148ee8bdff0a4b76e67bebe85019182ede3b6aa99e";
-  sha512.doc = "b1b68c4d952d71e7e10bfa790399099e48af66e47f1b1fbf24b09cede6c66304651bb0403a1dc462c864fe4279ebb3f5f40ac63ed226f775037db91a305d479f";
-  sha512.source = "85a705c8c2ac39168cdc401398d7603cd840eff7cba6db369d39b1e4530890bcf39a8e623e34624fb8a6b88a9f785d26aa3c2472323331db1d481cf519ae3596";
+  sha512.run = "f606c82a7cfd97f75a928ab97f8eb516a613a7afa96a67df2aaf56c5473b769287670f899aa8ae8f7fd88ffea9fe3be2d7972b41df5bb7029f3d64cab58c835d";
+  sha512.doc = "2aff69ded6528a291fcac06f36f268203ab2cb623f0d564ba22ce2622c7fecc9453e61ed097e3a1886a3e49d8ed98d15f57c74c5a54da0afbae845f7cb495ccd";
+  sha512.source = "9e663c34537c35d1b6d8fdbd36a1b6f107d0ac2d5a276f7dfb6c02b58a5eed3441862b1c1831c60e04c121459e175d1c2bc301d041bdada24e0b0af5474f4f17";
   hasRunfiles = true;
   version = "1.5k";
 };
 "tocdata" = {
   stripPrefix = 0;
-  sha512.run = "0089758d88772f3999e2657aecd788c09b0c7494d0014383e5a1a92a0192c2e4eb1329e73a83c2a914138df7d773832def01923245752d5fd4ef086e5488d287";
-  sha512.doc = "d06500f32fa9caac2e4ea7c947dcc5ad7d8b6532936d035ce042c572f62f3a7c411bb94ea5f468bb916768546a223bc882ff2ae2c075d33145583be960a12576";
-  sha512.source = "48d3b5a94282187ac840be8e8f61c45a907a68e1ca0849fecc1baf753061880d34d2d48fc17a1a548a9568c98dc2af2135dfc348e20b04213cae9a12edd09c1b";
+  sha512.run = "e58bde9d4e97abfb7d0d46f75618fe16d74db0e9d4833ee42c4aebf678b66f334704db4bcb17179911a953de2056638420d2610bd867528614dfdda7a6658cd6";
+  sha512.doc = "c9654d086e4c57225a8ee2af2cdc0f7d29064f687864eaf46beb9854f7ecdd95bef4d260cbab0be8be126cf665d098b3e370c96cb458af087c0a1ad4346a4bd3";
+  sha512.source = "c89a541c257eed59575c86cdc6e97d5ed1dacaa433b04f622a4df402e96cbdea7f18dd818340e1dc4adc44559acdcc36f2a65959ead7779c487ced08cafb32a5";
   hasRunfiles = true;
   version = "0.12";
 };
 "tocloft" = {
   stripPrefix = 0;
-  sha512.run = "58cb7a6e47974e57d9a3372b3ad5474277940caf90d168dce69da8da2578edafde963ab7cd23ed6e47e0a831caeed21b2e82c9e82ab5782f762e33e29a654ac2";
-  sha512.doc = "9c8afc29ed61269bcc86e8ff5e03a7b2646dbbb7d2c35f52139b6280e36f5e3987144aa5cfedd41fa26412219babff59d7ec67ff9b670ee19db61fc125b085d4";
-  sha512.source = "d555cc94afe5a6bd1bb46438cf4dba8f227b47bb0b558f50760154461e4daad8bed3e6f995dcc5e3ca43c304533365c072da253a763b1d14ba51b47601d40490";
+  sha512.run = "62c87a4a96a6f89a1ed2ec3084fef17a80e0bdf02339b83f1e050bb9ef62a88cc1a714a89e9b59b9acd16dba0d6dd529f5def0069c1fdfc4d7ac4b31e72f60a9";
+  sha512.doc = "5b091e46e8fba109af22fbe81b778f116d8d0810193f9f68d1469bd178844a7f2cec8421f0fc7173fded8daba83470e292319c834e0e1cc04174aa47d17dba3a";
+  sha512.source = "c7da1c52ac5dcf2256af7f1454e1d77339707a3847547cb9d46b6404e849ec033d7eb2a6c00570043531187c4870210c586933964b63909f0b9bcb152b92c1bb";
   hasRunfiles = true;
   version = "2.3i";
 };
 "tocvsec2" = {
   stripPrefix = 0;
-  sha512.run = "4b659504f4d2905b733a5fe3bafa062b38429bdbd1e408fa70c932ed11c7075e7f4e963e4e015387112c6678923e8e3ffbd55009c4ff87055b951114014da86c";
-  sha512.doc = "4534146951d42b0c17c2d63b1dd3ee395cc03fd6e44f3321169d7a10c0a4507283209967c6cbfc16531bf727cde15a13af1375db284b47c6f3925bd08bb48985";
-  sha512.source = "d67641af69ca38f1bd5019db1c7c0a25c87532139aa3fc366a024ddd44c5c2cd095da43e81810e51fa0cf8ea651556a79a89418b67f6b87385e1db7d34f86c82";
+  sha512.run = "fa0aee2a131fa32c0535d8f44629fdf9969dc564ded49415c32c94f8101693842cd88e821d4201954432d5c707b5e8dcc4a78d35f9143b0977251acfb4c847d8";
+  sha512.doc = "6065cadf125241e4cf4bc58b5e665fd4f522491ff2bc2cf130c8805c0448f3daa6d7c1f95136d169c2a5dc5219ccbd53a40463f1f77cf36eab46f42fa3dc2b69";
+  sha512.source = "c8dd21085e66f7d07ded0fa25291a8d23ae8a5694c679f7126d9c43c61e92719eb1d67f6d9890cfab5be083a75b33aa21de9a9be85948e813b50951733111dcc";
   hasRunfiles = true;
   version = "1.3a";
 };
 "todo" = {
   stripPrefix = 0;
-  sha512.run = "cf20e8a0d198a769562fda4e33f867711b5b7653d60e3707316091289210a5a145c92a4d704cd2fc87fccd724d52d55e071bb32a5c2976650e9ae4fe319b83e5";
-  sha512.doc = "cc440f25a794e70eaa576caa9ebe033344820baa37b57134324934f46bb5b1375a054d74c6ae996850e5a2efde88869587d4074aa072060580fba3208671ccd4";
-  sha512.source = "633766f999dec76cd3952a84b8da20e0e58affaab58aff91baf707572a4f3c5dba2f6ef8b6fa7bb10b6debd9ccc94a810d919888b3005f41c0bd94c7b0092e07";
+  sha512.run = "d5a2db825f80a53a5d0a0910b29c5174df73e16c68726e0c0893b42592b7ab89872fe6709d98365289a62af05a02b7664037345ee676e44d838c7382208f2bf6";
+  sha512.doc = "d17281c6b463f0704dfc2cdd481732594c96c245aa780dddbc58d99e4fbc06bbb6b879443f92e4c34ef8de5f8ae4fec9fab442207f05a87058fa98762d58b4cd";
+  sha512.source = "beff3e2bf9b5dc04fe015db3af8b6d0080500b905210dbaf69cfebc6c630239eecbef3e498116e1194864bf27cd6572a21cf50b7735f56a6c004a5449b969c08";
   hasRunfiles = true;
   version = "2.142";
 };
 "todonotes" = {
   stripPrefix = 0;
-  sha512.run = "8ef1a655d294ea573f0257b560ea37b327f4f9cf6857dccf37a75ba8934f9de33b2ee67b79cb04792f87d1d665b1002fabf14e304e9776d9018efb74c1ad2252";
-  sha512.doc = "aaa45808147d23ae5282405a9d5a18895c831574c2456fae29590e60841d54b2efeabfea8cd701a23e6dca7f355cb90f66fb89c6dd878fe994b445a1f81407b7";
-  sha512.source = "eb7910ec7bb48aa04ceaab4b673db91306c23be509c3e29ea2586a39b6d2d6fc024d69df2c1bd478be31e2f4a52dbda152de8523b258647729233df67cef096b";
+  sha512.run = "5d36d07c057ae8251c104224f7fa9621b8da1011eec896d5a90f65564998097c1fb21f40395d1b87f29edbcbb988af5eb370baf90afb76736827186bd49e4431";
+  sha512.doc = "d35abdca098b6e8ce558276b384326e1c03d34081b3781a32e7fa1b47c946b8a71b0530d6bc2344d6c780dc45a16bf76625382951fe9e9751b4907f46171713f";
+  sha512.source = "bcca83eff442591ba7adc96f958fc3213684c0eaa26de13c8d8eb2234931085bd0d317395d331de886be85ad68195c451be5dcd073b1075a22191d6a5ccc8ba6";
   hasRunfiles = true;
-  version = "1.0.5";
+  version = "1.0.7";
 };
 "tokenizer" = {
   stripPrefix = 0;
-  sha512.run = "7d31a7a7c822192e2f89011b89f00aad1eb2c08c698684c21559f024378ae00290a45574fbadca9af62d14b7ac8aeaf6256e17501a59bcc23c3fbddc976e326b";
-  sha512.doc = "0128275813e663932a71e37ee498410fd23201af80e036d119c93ecf49d0a9b8cc602eecb2ec9f8ba6ae6f457170fad09b9216d5d7645d604448bb17ec1324d5";
+  sha512.run = "e28c24f6b13b3d8941bab47605da41fe794fd8ab1e107f287eabe2258ce034bce1aba90e5b056ef1a0841bb785015b529ace02260558998d4158971e901888ed";
+  sha512.doc = "22127d17f364aaa8156e3abd034ad5e0f8bd3e5228c649263ae2e6d6ffb0e0bb6c07be2fd6735de48913bb3db661318bb19edb9d037d8a0fb038610bff7b1a7d";
   hasRunfiles = true;
   version = "1.1.0";
 };
 "toolbox" = {
   stripPrefix = 0;
-  sha512.run = "b106d6829565ba24dadbb02c634a3926b76311f72ca3911fc16f07e87fb7977879b41fe3f7da6d9c061974309afc19b8c8826badc4bf83cac4e5f9955924704e";
-  sha512.doc = "6906794a6b6bde001cbe230cc56dd64cac7daf5955ab2f9a367cff9d5f59a1119c3f88fd906081f64b3fdd2d9d1800445e73db7345c40e741c689d04b7d545bf";
-  sha512.source = "24800a98f65c668f32c9e5383aeb6cca1cf7b5d14f8b382631a82688580dcc959f4fdb37adc0975546765049e7e161577c2e34e4d170eac26c90ec837dba08f3";
+  sha512.run = "6ed0d262bf3990726ee2ffe1bfddc915c7492de4f60d87406a2f135d2f59411a795f3c70b9b3b0d3ea70ba0e1c1c57d49494ac98293858514aba73a9eb73aa06";
+  sha512.doc = "f35361a96520440322f1645cbbbae8e0a9dae1d72b7e52793deb2d4793cf4e3967d1e766896dd1bbe15a0c1bc3dc291c91a6e287b5b4c4def4c4f6bfccc059b2";
+  sha512.source = "a2e22945a07807561d7de1a7cccfc2dc7faf91df430145e71f4a4c43e7fabac5587de6d71271b23140308835f73d736224964eba6fa9f08defcd9d05d4a5626d";
   hasRunfiles = true;
   version = "5.1";
 };
 "tools" = {
   stripPrefix = 0;
-  sha512.run = "b1fa5fa084e467bce8232ffa2ab7ccd59a5ed7f877b88cfd5e55a4c6e876c75e20f99be9bae29bd7e7d42593348a0d90fe491d544ef0ef5ca54bd37bdfe91137";
-  sha512.doc = "b5168d52553a1ef685f961b61223e11d8c39da38b65eb6de2382602467b1727ed71b86498b01528c0fc1d5e74ed6ff480a8202f4a5af43f5be98207ea09eeb94";
-  sha512.source = "f455c4a7c8010ae6ae7108e9b7856b44de6a22b38d89863696bd599a80b47c40f4401f680b940b8843d7bb0dfe9b737f8832cf8d4c9b138359daef41792fe286";
+  sha512.run = "0ad59a4a857a9391d3c40d59c54e7ecd8e8fba03d0c0d971d64d3c5a3b9ea9b736da5372b9a29d1db8b423b6bc257fa6a73146664c697ccb9e68ce4179f58e58";
+  sha512.doc = "5be29b52f9d0b9f545dd253588671315cd469eea624275f80e85c662175997d725dbc2b92bfd0fc3547372d5a12ec696e38b588cb7c5ecbfc2a963ec6d2901e4";
+  sha512.source = "b1c4e0176516a6276497949c1abba71affacfc3930afe4c8b003e9bfe79bd52a118e84df5a688bfa4362486ac8aa142930fe72c1a0984ebb94eca5034fcea2ff";
   hasRunfiles = true;
 };
 "topfloat" = {
   stripPrefix = 0;
-  sha512.run = "812ee742703d7092eddd235df27dbcd441cdea6799c379c302088c3c4bc956f86a8a31f12a26e563f50428c37c40ce28fa531273b4b619fa85db0fee55fcb302";
-  sha512.doc = "d5798dbda4d686999a6b62446dc22f2e618bd2e550d7f13b598ad68ad704fe780db937abf415b26a42b740ae4a5e3733794eca4380180b4da58be5428e73ae55";
+  sha512.run = "ffe30c3803c551cb07426db90b46584be05e2e8cefd5dc48e1e49f7c1b464d06c8397684528d8ab868ae2c5885677d2329f39eea340ae280c2321d23f706438a";
+  sha512.doc = "5d8fd706a20e64299c4326a14f4c0764b8db742ff972efe518140915d43bf2be77137e52f35f137f1e529aa9ff4ee2f19a0a9494d5e3f105dced6847567b3b33";
   hasRunfiles = true;
 };
+"topletter" = {
+  stripPrefix = 0;
+  sha512.run = "0239579cfe921d4eb6cba678c404edc37eff6184ae73e7fb7bcda91fa7da3a953230ed163a42555a6b559b184ff92fefdbc7395c71c0b8de3f800c5d9048aca1";
+  sha512.doc = "f87ad9f13808ec750f6a21592cc51ab9c41e8dcb6f0a0ad489dc7bf0addfd6a554387841af936c41796862ed80220e8ec5330fffdcd7e475aa726dd136f8b007";
+  sha512.source = "89811b2091a107e1520c51e55ba1e51e9f6dcd6fe95e9014bc06fad4e47fddc5f15fdbcfc53ea707eb432e4560438172c4416a977556e2d3853fbaec6a44a32a";
+  hasRunfiles = true;
+  version = "0.3.0";
+};
 "toptesi" = {
   stripPrefix = 0;
-  sha512.run = "30afd6244275a5b7795010b454afb7dddfaac4e7041c5b29a36abc8abef3f43552f97f100ac6e7f8ccba7f2a028bd40a5a809758c1f7d8d110639c4bfa618586";
-  sha512.doc = "a3d31165add35dec8c2f6b0cd049fb6ed4cda90dbe779466a4b87f0abe14ba520bfc3d6b4e8b1b2f373b51b74cebe18957dc930faef3e39f1bcceb25d036ba69";
-  sha512.source = "1a6d8c50f644edd84b30c6756df525a002f1735bfac1698b9cb81959ac68df2cf25400ad9f7b27f076715bf73a09ee8ba5e2aa77cb2b71b2919b1980f7696935";
+  sha512.run = "d06ec15da058182744eacc332fe3f1b8e5154894a1f3aa49cbe8b1c11ca983f838a70316951d4aee75b918c547d8dc821afe741e77144cce353985b70c339549";
+  sha512.doc = "925161133ee5a6b8f96f3eaef22df1bee239aacb95fcdd76eb8a42dae5c9b9db742ea0689a394c712daf6609423eda65d913f79d2ad09166e879fa730dac06ae";
+  sha512.source = "7d0339e646dc107b605b688dfee0fdaa702544b65a940710de44cee4e36ca7145a44eab5cff11a65392fb8a07ceccdaa2e08bc869394199763c5488d2c6abbde";
   hasRunfiles = true;
-  version = "6.1.12";
+  version = "6.2.04";
 };
 "totcount" = {
   stripPrefix = 0;
-  sha512.run = "38a82c15394320d018b37b345648ed20acee57fb0243f8ed2132b8db29cb266f114eb120ba16725818e82afa2f76dfeef4c01cd2e8276366142f702292afafa9";
-  sha512.doc = "c54eee73d3233c2492cbd913186e8cda2e195054804fde2ccc42eb5dab59693f8ac8df5e795e4d7e26293880ae55080ad03b2f18d83ffad3f1c2b36190a7b619";
-  sha512.source = "a55d529212b61aefc6fd465b4ad28b5c5d31a519e629ecc867177d292964636b7b573ec0f19cb8a25c1ff526225cebbdd3bbe0a785fdce756887f04212be7eed";
+  sha512.run = "78a7ad616add4cf64e45c20ad79461864820a45670aaa963b08e8945147199aab369e4e62606790709b61c97dbd420edda489f9655f8f927fa71c2c8d0de4ed5";
+  sha512.doc = "5e76edf6efbdaa0d5bfd30ceb4a32a2589107aa9226b51e3e1ea0a90fd1ec35604d8537e15c9f25b64e2811da925076169c2f2dda0ad943e44037363e8b1728a";
+  sha512.source = "c9a5c9db495f96bb4141eb9814d62222cc2e1a1d4c5665e289caf810e2aaf72e32af6024275dd1c7a8ed54601bb667b84f0b81253e34f8752505b6e65d553b19";
   hasRunfiles = true;
   version = "1.2";
 };
 "totpages" = {
   stripPrefix = 0;
-  sha512.run = "d7e6e2a484054876e3e65ef442a29167970b8006a36fcddb3fee855059d6bda3986fff30ee3d8eee7308a208324d6e68646f2dc8e78e0d9f0f6b657dc56a8acb";
-  sha512.doc = "7ff93bbc143dcf8cb97fd956f9bf715d451eff86b6e35ee2dc165185ad69ba9fa4848734d7edd0c736120c5611fed3603a18fad3fa83e391ae5bd249143b3e96";
-  sha512.source = "c756f9ab7b6dc4444c784ded06f922f7b17354575217c0e740ba73c268f2b950b8c7060755ee029065760ec55c8f8949821c74f3b9b3c5e9c933f2ba13954242";
+  sha512.run = "1e11a89f261a839ca347ff035101c6226f717adcb40e5b0d7e6f95c91df3142dd53231f65a699bc958eb6ec02bbf73883a326909425d8b35a50eee1786856274";
+  sha512.doc = "fbab7138ad40d46c6800b55d485cd82201ede2f64d46aa223f5dcc9b5b145542096b76b3872dea01e7fa5828e74e6f2473b9cb43662fb467c8bb97c191d039a1";
+  sha512.source = "a6c4ac683ff4d5dc2b9ef9aa2eaf9f95ce5a68f9bff18ac8b8e06cb071ba49bdc8d537396be664a91ea8fe24baee5efadc83f9d5553a517afd9c00014f36cdad";
   hasRunfiles = true;
   version = "2.00";
 };
 "tpic2pdftex" = {
-  sha512.run = "ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5";
-  sha512.doc = "e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708";
+  sha512.run = "00882413d47ebfabde2ba7da4a2b878c40c5ab3d74d1dcb5924f7cc098112dfe4e77ef31f4b59240f7b6fa913124fbb9a89337663fc2cfe538b63d103cc411ba";
+  sha512.doc = "238a9fb1251e29eef20ca51c162b7bd48aa0c2051d1734074f97dec496f6d91eed7d1822096f09a5b51e83ad6d060e87726e0a5e852ae1a8abd4be5cdd076c74";
 };
 "tpslifonts" = {
   stripPrefix = 0;
-  sha512.run = "4e4bf42b19da7ca60251e1d3579ac8bbe6a942f8030753a4172f5bfb1fb0353b8f186030cba4e0877b21c957c01ca4213fba251fd12223c44280b569d85a38d6";
-  sha512.doc = "4e25613e17617ec0e4847e39e72bdf311aad51faad24ea5b421f99a423295ef295f7b1608ec4ecceb00bbb69197a8bf68770f28d2aea62e6af8b8f12c7ec2f9d";
-  sha512.source = "160bed719ba905fc7f8d3e18212eec6ab2dcb4ee1ae0f2f80e09d9893c86def22fed070619e4d853b2d8f3047db40c46c480edd2bc978ddaa398c9e5460b2f6a";
+  sha512.run = "a3d1f622fa81fda8d7d697397114e1aa67165a672eccbfcf50658b63df2dd1675e001a13a9511f45aaa3ed1dc87115ab8d2b69ea89e6c4c839433ce7d9fccefb";
+  sha512.doc = "c2780e9e734dbd461de9e3181f919c31624bd5867c17a9d8163582f22f86913cf0bf700f355e74128198d7502782cc4d89d4fa0b950f0768571546dd6848c011";
+  sha512.source = "ef2b7897f7665bb635b35b321f5c14c557b02948ef278a14d8a7875b425ebf7ab4c55404d5057b08a10a38590bc242da021ad350a99ecfecd6728e25207514b2";
   hasRunfiles = true;
   version = "0.6";
 };
 "tqft" = {
   stripPrefix = 0;
-  sha512.run = "b7f1620aa7a08565939778823ce41d595f5e15409213631ca7689194c49c54dc76b90179c97c9b58d3d7515a87271fc4fb08029f2d0f943d0283dddd8fedd236";
-  sha512.doc = "c039bd855a4227f12d6d4b75776b5232ae07e528ff146f22b5dee917f13ab20c14830ce514961cb215ffa4c2cafc3d7499a17c40d579fa94b5168f8e9c98d243";
-  sha512.source = "0101ced175969804bf6f8bb4071a082e1ad0c70e7604343d9c2b394b133168b034d1d94866d49f29af237bfc578f34fa690c5f8199be9b91c7386655f7b0e673";
+  sha512.run = "445370c1f8a0dd49bb5eb394f8029a31fb8b6c0ddc8ae21b0b83b13d81ba001dba3fbd55c3c5259dd6987e60785366deba7df07c1a5468a0b01e66847bf79f97";
+  sha512.doc = "a33a84481ffe1f3e7e7b844cc5be4dd983fbaddfbf19537a612a17fbb09ba0f1a8e1ec394d6a274481198235e53cfb04189324ead2a638ffc1fb8bd5b7875e47";
+  sha512.source = "aea5f99d5baac95c19045dfd093509e71947dbcf7273542f5439d56ae79519bbc64fd4c08aaea34495839b7acb5e7b6d144d742b752dc90addac729fe2f84366";
   hasRunfiles = true;
   version = "2.1";
 };
 "tracklang" = {
   stripPrefix = 0;
-  sha512.run = "16d17db4296c25f43d4c15035d3fae4b015ebc6e017e037430b958b3309c512dc53083fc08be7a209cc358194284e215bb2c0cdcad3bea9557c6100bfbb7cc00";
-  sha512.doc = "3e177ca7ec3ef04715024b19580d706f7a5c5af4bb132028ee4b6c8aeef0734805de944b39aba661d4c243dfe49f13e234bab2c98bd6d3906b1aa8fadea72fbf";
-  sha512.source = "51a622306518bc172f7babd833f1596498b84758a955e9e09b1ac7b19c585897b34f6144bbeb8e9039afb8949e02c3a3d8b92da374392800afe89bad9feccb8e";
+  sha512.run = "aa692bbdbbbe66bceb62ac818f9b8be09804f2be6f31ba8f7a1530b747603869a4f5c488461f0954cf8aef6794a20bc8c89bbc298aea95c906802f5c68e0b535";
+  sha512.doc = "a24b7bcfd2e07b9b63c3f3f04665ecff87260bf5b5523e8a99c4ef631b373948b801f0dcc86d6f8c6d5f4e0bac11ab375c0ad236b6de9c900020e4938a7aeba0";
+  sha512.source = "e093e3be0ea26a110e5105f405b312a3c61c73e9af50514aaa90c3ed7d6f0420810925091d9c19749e7176991e74345451e4ef64bd65bcb62437c6454e9cc4e3";
   hasRunfiles = true;
   version = "1.3.5";
 };
 "trajan" = {
   stripPrefix = 0;
-  sha512.run = "53961380de5deffa31f8d32a82efc7f8834cd351771021398fc14457f863531cfbcf7195b9049f3349d77699affdac7f06596335991e8f2110b4005f005129c8";
-  sha512.doc = "6bcc9c459d3834390ef849ed4c6b2cdec857dcd3ead0ffd43db43a89ef77cdbe170d260f534955a93b3665bac33ddc078bf057a0915f31e829477a1fd13500f5";
-  sha512.source = "524fdf7d61009bf65d5275406ab2afd5e76f1e62a1c7fab70d9633c9f53895fd956b8917038a4232e2f5c0b79a2607891b9b0bd4f06fda1374a6e04a3443f269";
+  sha512.run = "28260362cebdfdf0c2e0d0c4176fed65135443e0ae490c3c94c59676a031cfbd5af41c5ad9129df8f8c556b82fdbd14c24a0b5fb5063ebef6719c41253a0cdb7";
+  sha512.doc = "43b32d39d21024f4bc41d30a145490abb99bdcb963f1455b4b07881116e82db193be1f4a41d12766a572fde46f1d30984a16e6f5dc54293c27d0b6c12e6de285";
+  sha512.source = "03ae3729ceac2e2ac188ec792e1175f8fd8876f202f5762811da476843a22e01ba4184784f55e948d36c9cbcddaa30d5bc1c092ffe80b795b3ca7491fbae32b8";
   hasRunfiles = true;
   version = "1.1";
 };
 "tram" = {
   stripPrefix = 0;
-  sha512.run = "6bd751356b43cb6214758ead392181e5a0bcfb44f4d3581a0fddb6c2660d7568aa3acd1cd2b712ad6fb10bfd564f737f18f4740198efbeb1fb4f603eb6b9740a";
-  sha512.doc = "f7ebb837ff63b567e2e0fe4ebcfba236d7dbde470cb1a87a8d416f00791bdd673176dca4ffe82a7bc5cc02f885aa12cfb5fb1525a4f2007dbf07a08069ecc1ae";
+  sha512.run = "be6b1e93aaa16766b242c86722039a41b8ca9bd9be3dbc2581ae73d330fb945e95f332bcf413fedb4f190db35e69ee57e705169526247e241f55c48bbd69468a";
+  sha512.doc = "21a4b7407a7b8dcee62b42037e441165b1829b0bc8057dd277c14f69f1cd58a8df333834e2f617c53e2b5889db613b65d032788d65c37306f60396d6f211fad7";
   hasRunfiles = true;
   version = "0.2";
 };
 "translation-array-fr" = {
   stripPrefix = 0;
-  sha512.run = "00d0173c1be22a03d7cd342a6f512cf6ce5c17fe03fda810d631e94c056dc30ee33e344f12b7e0f16070b137c864c2301c21ce25b0c65f02b5e33830cfcebfd2";
-  sha512.doc = "e7b7269d2e34fb6ccbdfdad39d973f201cc896c99c6f92a1e84de0d9d81626052c0b73b1467e0b130ae83708f39f9ad92cac40a9edbe48ba1ecbad09f95c6b91";
+  sha512.run = "3546f0cebc2befd5651e94adcf345aa621118755b7da66cda985a8d9b5613f078a4e0ff3a1e22880462855dbbfda1a66b7e9d6e9b21ea5599d00900e9c843545";
+  sha512.doc = "f79c133af7dfb61fc5c4006359132696ca54bf6fd91e5765c7aba5acb3d2809e0723268e85667bf9899c1c09f615ee632c7054d36015b1c7b9a2692d548c6f1d";
 };
 "translation-arsclassica-de" = {
   stripPrefix = 0;
-  sha512.run = "bffd9f3e4358421dcd0b665210437ce1beb4dafaee34ae01d3d9bd5dd870d59eb47a4a65176d293f6d261ab91daf5b75b1ba3e99e2dd04c54956f50b1c0fc66b";
-  sha512.doc = "74cbcac673e52af0ae38c252fa921fd38e05bd7ab5470c7cc91efe46bad84a78c8f9b6d888e60a4da8f2f677c1e7e782ab7968eda2e71f6fa56b6cd47aa90788";
+  sha512.run = "50ccb423c0c911d35b3da600bd0b5960126594d9ab1092767a9f5d35b79fd27ecac24f191d4ddcb0c71cb177a77a476af38b5695cb4c250938fd8aea572c2322";
+  sha512.doc = "da156d6300b3961eaf7a1e6ddc67908b0fadb3aeae0b7f5be1e4b96bf1de6c3268b07cad1da04340fabd1c8e6a49849b77c49f81a7b8058ca16309bffe5fb5e1";
 };
 "translation-biblatex-de" = {
   stripPrefix = 0;
-  sha512.run = "6a062eeff1ca7e0ca87bcb67c11bd1ad721cda37557b9d2c8a2d069e49a53c4f368a32dceed4135ab2bfc7508496de2b41f4886d8f39b6471cf40369fb39709a";
-  sha512.doc = "51f35c0b3569eaffae0e01a2895c602aca016d883ecc93364b98f6c2a0b8303f17e150936dbc0d9b516f73d368e06733cc31cb07909785f964d5045c11926220";
+  sha512.run = "98a1275744715cf411a84ce28fbc6204a8e4ebcc8d6c1ebeec4ba3a6289fc1efb9245a73d950ec47727e87b2eba68a0031b7a94196f6cd0cde1fafea9c236cc1";
+  sha512.doc = "19802b1149a57554e7ebd0f7553eb4fbe1dfd0910ce5f2cb98fea461b71028f4bead4e4b23f546cbc312b7d593b4cda9827674b4c12977e6a2e4d34e648511a4";
   version = "3.0";
 };
 "translation-chemsym-de" = {
   stripPrefix = 0;
-  sha512.run = "fd1f0be6dfda7c853be711eac5ff8bc0f6819cde88d60cab0058d2c79243e9f8a7ab90e223a11d84e3c68d5a8692e88ba614a35df33002ca32c4005cd892d491";
-  sha512.doc = "602caeb175ad882de0973783cc676ad68800bfa4bdd41e8214d87c5d5c1dcec613535ec167b731fa324a1fdf61f6f0dbeb526888bdb6390cae3eccf108624998";
+  sha512.run = "2ef2e1ef5cdba05893e0996d058d5bfd9938b2d2519c8bf8f7b5202034603b0511f0b8ab37728d441cd3e6a6bcee296fe0d88f6464ea593389d048f81a5ea2eb";
+  sha512.doc = "bd243e07ec07d1b5b6e00876196392e7a6ecb93011f0525a7593e656b88a13a7a6a60f4ce25a779e8cb8fa629d78c201fcfe9b38d874f64d8a3757cfa49e97d3";
 };
 "translation-dcolumn-fr" = {
   stripPrefix = 0;
-  sha512.run = "e1657d9b2692b9096eb2bbeaf2130c33446f27af02c576ea5144802021fb625ba59cbcba0d5defa042e79389257ef4d49c72c9da2f720e562ec3f6652ebc99e1";
-  sha512.doc = "517955188cabd14de35741113da1541ff808c8ce2f7835f45e53f45954f001767d49d28fb2350c6e84c3a5d877505f4b0c9e7a3c6fad744ccc3e282eac1b2556";
+  sha512.run = "97ab66da2c021b5acbd454f15a05bae28975c7befea15ffe358065419f007b63196e0c4e8879ba9917e945b68f6c119326a804af91cf34c6851d163fae823e31";
+  sha512.doc = "8c30033d032dd57f1ca5e8d84fd0294be65c1ff43514279f114c0ffcf14e051a299df569b722021f14c9fa575935b6b226ce3e322a76ca3f48577332fdf00e32";
 };
 "translation-ecv-de" = {
   stripPrefix = 0;
-  sha512.run = "7e555bd21053353120ca69b762036908aa8d29b7101acf4ffb4e43474a53dd63a8b7420d630a2744e2f1b0f795387675c80afb5b6d9b8a23bb6e68671d82c312";
-  sha512.doc = "d7214a224f6ea6f520381e59c67c2ac7949167e3ee39827fa5f720560bca11d5905089377b68652b998e3bbfa6a467af9d24f32250cb78ec545c298eb68e7d4f";
+  sha512.run = "6ad6423a72c851c381b96cdf81bf521451685c12d807a9ce76900971326e1cb99b846de571ec966d14bc945cb7161a3d90359f80cfe16e16c5ba347c93d8bcd5";
+  sha512.doc = "0b204bb6d006f7a17a0f6e6b496c6c423720a99b4f15c1acd8bc01aa8c41ce2526afe4af3efe93fa08addf6969ab0ac53300d14a3e8afbca9cd40fd1d002595e";
 };
 "translation-enumitem-de" = {
   stripPrefix = 0;
-  sha512.run = "d012d0c30281edc14b0f8df9e1a9691db2f69508703cc8c9b5ada011549cff58ed899625ba48ae62c451b20244c9eca0cea884a9606c435a304449e9b06340f7";
-  sha512.doc = "0c93367014abdb2ff7fc2cbe3665ec6f7d82886271fc5d522e3841c9f9a115f440812ecb080cae8ba246da520044c7253b0a3d1f8bd7e42948375623f8856b1a";
+  sha512.run = "a68c379a8462b1faacbbb29ecb94f0fdb2e9b8a339a8385a96770050374952029b704f52e74317ab3e3fcc6758b3eb2742f2e55dc045505da512acf71fd4d32a";
+  sha512.doc = "3282422d1370a0c13400c01ce227d5bb04b1c9e0953886de62dbaf06034e1288c0566205a557afc79f7790d550787488343d3cd0039b6526edc72ae0b7332502";
 };
 "translation-europecv-de" = {
   stripPrefix = 0;
-  sha512.run = "cc95094eebb16dd34aac35ca181e191eb9ca5bc8eeee89ca99b1cc8c379a9b807e8eb6206716797b6a98a25b89d0e7f94737dccbb171750a3f2c077d54dc6da6";
-  sha512.doc = "4b4f99589ea321e9bc721c663cefc0d453bc97d59de507c5fdafeb96fdd706568a7d3b1711fb228b353880e536157ed9c623fd682d6fad408fab32a82896970b";
+  sha512.run = "9339f5f61c2a4cdf4e784299833fedea3fe98cf965ee3c998c0e4d92070abe45258df0a4a86530f77c6402694d5b6bc6cc743edd9183365317aa0ad22f25f955";
+  sha512.doc = "7616f897bb053c1eae82d6600c936e86fa81b91feeafcaa5bc2399508dbe4f475b28bdf39640d94c43004b50e6d604ef98eacddcd19a6ad3df9331e072ed5a8e";
 };
 "translation-filecontents-de" = {
   stripPrefix = 0;
-  sha512.run = "82338be58406a97e0e5030efb61b1b03af45c4bce2edd3aae321f2e69ef14fac014643777dac22511b98e306cc4d7304c0c30b3567658d3205f7a51ef7df2704";
-  sha512.doc = "3bd9fd043195d5335559a405bd2b890d66fcd27c150147a49e57b5029fec84ddd55ea3fbbe8de73ea0a566833e34a9a05d11a076cb930bff9b9ff23ce2e650e3";
+  sha512.run = "40ee281979ad588e61d1d496b50be41326447794dae101cf0e4f9367ce67c73e7a84093944240941e6731321a1e3b6817c6ff67f85772ff1353dc3e6f9084cd3";
+  sha512.doc = "f723b4d3b343c30fc67815288b9cf5a19adc9b32237be6afa3d573a123adab851a8d999040fc1ec5167ba14f60d343cab3519d46dbbbed9d576ba3f46f5e6e6c";
 };
 "translation-moreverb-de" = {
   stripPrefix = 0;
-  sha512.run = "f91ef9289ea8a593b5afa7b1d53c4335e93a649da17040bff3471aef9463d7e6e181ebac547ba9a7d768ea5591b06779ded6f415f51b9e1768b936b574bfd694";
-  sha512.doc = "63dc14db09616f5ac7c3db8ddbc8ca9a06a0e47ed44831b95f6aafb5163636e95ef6052f46b7cdb1c7b9ecbd28a830cf66b86afb7c0bdaf66d7c9a8bd6bb10eb";
+  sha512.run = "78788cdaa5435afc4b2c6d307cd40c2fbd74a56ddfb0a68ab48810f07e330d5280c454c425512362c4a5d2b9254884becda05636f842c355f4dc57543d0d49c2";
+  sha512.doc = "ec6396776e6d1a86ff4750642a4c00dacbb3ee5bc9d46cfaf70f82237f636e422e74a410711deffdb9708e050c86feb148052c9979a0ad5b780e7d3e08c67304";
 };
 "translation-natbib-fr" = {
   stripPrefix = 0;
-  sha512.run = "1e4deef3cdcde92c67c970a3526872670ffeb217189df7c3903007efe224153d848d81f415fcdc7fe9e46c32bac13b0f4773f43d5027e1bbff4ddf0a7c152015";
-  sha512.doc = "b94d895cb6e232c53cb5254e156a9a895dba82d8404978eef1394c0ea825611794dd2489c94eddcf3d93cdc734c8565ff7c48cfc11f56fd3881105ba26ce277b";
+  sha512.run = "803db1ac9b90f0937eec87d94c500dd7377216b5a80382ff8e8568b0f619b15adfec29738c447630197b208ef04ec2a0775243543b7d5102477f249ee80c78ce";
+  sha512.doc = "698f4d3ec1637d4135de74607d275416298392961766221f010c98dbd82ebe8725878a278362bcdce886b5600e9767a0f39ec29a7f0de418a5277b8104b30842";
 };
 "translation-tabbing-fr" = {
   stripPrefix = 0;
-  sha512.run = "d2bfe68317406d5c29f92937c65ab86eaaa4cdf96c6bdd15e165762fc12888f6420751d4ec98222b06be104b5d9201dda2d807b6ad6ee199c98960302ee63ea0";
-  sha512.doc = "751d3c1752ff3b861720488408d212019e61e7063d22622f48f14108b0031c7d0f040812d46a25ba9d183bb0d969f6abb89a3e91acd2953a85e3070a1ad0eaf9";
+  sha512.run = "0c4ee0e86394d9f22662683db6fcf1bcf1c0ef2c3f6be2870871aa91fb795ae589107ea46ad2514c5d7b015981faa7814decb364fd1fcd8a15a1cdd4355a75b7";
+  sha512.doc = "5f10a26d798a9c5638cefc6681074b4ef7be9d1a7691d8e2204786689805b1b1ba9a8dc6802d9018264adedade04136e986a5832fef6d63531f1535fed6fb70d";
 };
 "translations" = {
   stripPrefix = 0;
-  sha512.run = "505e2dccaef014ba127fbd0512436794273f60478b15bbd4eadff5a66d02532bad6fb2bf36c633021a30f8ee0150d0c30633807fb07f19dec080b37c6be1292a";
-  sha512.doc = "5f8301bd6d32008f4040ae5e537451095b7a19e0fa7797a0b6b2795482c3def5d52b268c1c74c485ab868cb62cb4ae098dd529c67d650816bb299bafaa93039d";
+  sha512.run = "b7dcd71962eac0a2eb646f3d97901c7601097fca2fca997e46227dba77b4c491603dde0afdc09c503c307958e7ce0264c60dbffdc4b520301159e4cebf096a68";
+  sha512.doc = "762f90b5aa4602839370c6cae33a71e0a43875b3768d65b235591eeb9e065d84c5ad28911bfa60130d891e1dd5898ac3ff7cc002260a258338bc817939724f04";
   hasRunfiles = true;
   version = "1.7a";
 };
 "translator" = {
   stripPrefix = 0;
-  sha512.run = "0e3763d64bd7a4930c59c5cae60129bbc4e8d332c118b05aac1c40fcc3a21f5f33891fab469cbb0981710a4841ea73d1825ddd60b5c97984b0391b2ed0c2e15b";
-  sha512.doc = "cd7114b9dcb1bb8be08c49fdf44aa4df9b6a3ec172d9e8e4dd74313ebb14a2304ad10dfdfd964ee3aa4581ee98d69e488f055034fedbd95cbd9337f600325031";
+  sha512.run = "13f8950f3a0780e84aafa9eff5370cd854aa4b284ee2e7b9d9fb219aa9fc0880216d0cc936005db6ae59b20a791ad6fb830af5d8237e720000bf4857227145d1";
+  sha512.doc = "ae5735b346790432969bf9938c84493cdf5f7c12505773278f02052ff65c4151883d06744a50f2e80107019ff10e67b50d25170dbf7f5f6d334c21c90ca617f1";
   hasRunfiles = true;
   version = "1.12";
 };
 "tree-dvips" = {
   stripPrefix = 0;
-  sha512.run = "76512a752e6c569264598818e0bc5bbae87018711bf00c28bf9be4877f52e09ef1ffb5e1ae7a582fbf560af23adb02b4ee8409e620d65aac605866ba89491fd6";
-  sha512.doc = "34d381b405e456cde4b234590c5ba3258054611c52211f2ac9f24a241973ff4708167c2c772ad3d8c9b91766f5b03cc6f76e7f5f775640d33a67ec8ee5d4091d";
+  sha512.run = "9af2c24dcabad33122503db3a4a32230a7c939d8ce50a0a6e2691e77f2c7365bd9138bd0878da5a1de5d4d988581afaea4b3e08b14d1bb9e875f827b64686d70";
+  sha512.doc = "70f62250f620000e77a003444ef0f19d92861beafd8047581efdcd86feb6d69f21f3b65c5ccfc513a9c8fcd8d9ef6b3e0241591eeabfd76ea90cb482155642ca";
   hasRunfiles = true;
   version = ".91";
 };
 "treetex" = {
   stripPrefix = 0;
-  sha512.run = "f5b0722844192555c0a35dc4bb7ffb104e798e5f850cc28d67cf851977b078e1a088e78c09706282e640e6a18eb6bce66ed0c824c6df2e9d94dcd7fe690b4516";
-  sha512.doc = "fb419773f8d3679d89fdd020964f46889c6c52e0a6e64ebef30bf10274b6a67611ea1fc036ae93ccfbccbd0fb77703b42a3ca29b88b31e3309d5a31bfb31b602";
+  sha512.run = "94853e7bae28d6aacdb312a11eb8c4f1a45c564518d86bbac1e1a7829a2600e07324b513f48666f8e3460baa667eb7acb3311a940f42d9540f3c561b5e87afb9";
+  sha512.doc = "962cbce5cd193c465218189ca628ce768b6e37bb446188c9e1d15f7ab57af944e00caf09957bcfb8a305818720c61879c6b0e0d831d3b32345973cf6756ff1ac";
   hasRunfiles = true;
 };
 "trfsigns" = {
   stripPrefix = 0;
-  sha512.run = "325579260d2aab36e381697615023a6f7bc8e154e0a5240b1ca784a44dc96fda25d7f1a5277ef0a4b202121e0a385ed55594fd7db8cf872531dc3e909d1ee1bd";
-  sha512.doc = "447ec287965fc58850dad04921254ce228f032ba3b9771db9d92d842722ed02810738685a4c03cc04f6e82ac14f2195c165fe895e9f2d2e39d9feffc3ad657fb";
-  sha512.source = "d803055b3b67d730054139b2f9d3596e4f1fe33e09e4ab89a18fbf101d5ee73f4503c633390a46aa0fb4d2be74d54216ff2dc7b65b0b38d6b7f74ef3650d176a";
+  sha512.run = "01e57d02b49f75bf4bcea4894e4f2aadc9400dd1b96b9c6bfa6fca454f676eb59930412776c7f6b4cfe50127622e2063ba5d64919b55dd49f94bbc93e7bccedd";
+  sha512.doc = "b8b454c07cf532d957c24434d6b7c3b7dd8a222d7f118671ff2446c1ecb419f61f3a2f4f9f7a7b89e0a775de9946cf2e908292ebc5a8ceb5d485ddeb8ee64c76";
+  sha512.source = "3514a610c6f19daa68fae04c9ca4b29423c3d3fb5561b9e2a917e7a8d4a56582ba6cc40df902c43bd4f08b15db11a8eca62cdeebf75b44278c0439e698bcc326";
   hasRunfiles = true;
   version = "1.01";
 };
 "trigonometry" = {
   stripPrefix = 0;
-  sha512.run = "360f0a8e20e129012933c75369772829bc170e6d65b7dc82f88b7c1ad3bcb0cc24b7540985a6447a95e3d161c349c0f588a446eb9f4336955f288ead883e7c7c";
-  sha512.doc = "16e0866e744da00b21e3205afb972022ea125d9b9917ba5dbf656726832419911572fc69e4b06d735dd678597a04ab549bde29ae4e65a7d1862e584990d82839";
+  sha512.run = "e033fc8a8764b18205c3609a395a9ade6d34f45d2b16d1af65248c39f056b655a57edc4beaaaf1d4113d5519318e9d362ad461e9ab37410bac6386432764e97d";
+  sha512.doc = "bdd9ca71433ac8cb159a3b1458961daa9f04391507d2ad77b54fe9b743e8f851d66309508cacca82df614fb6f2da1b2359e9701f2ffa25b413616b840cbc95c4";
   hasRunfiles = true;
 };
 "trimspaces" = {
   stripPrefix = 0;
-  sha512.run = "d66f08fd2e0e22633ba0256e5868edb33396b02dd27a5145469dc7ba1e801c9e945be8f970777323179bd135d37771b4c10699d64e56a854549b78b7e60b5395";
-  sha512.doc = "e83c1c1f910bbe5a59c379a7b1d7572868a952ec6320a2eedb1034ed91f35eb2d4ab3b1de27bd661396e17f8b2a6d9a54382d2c428abf3db16ded77c02ced59f";
-  sha512.source = "58f176effc414a1bd0f223fcbffee421514dad0d16c0ee856af2ef087ec0f7d56942caf03b3bd7ccbf46129b77d7350897f5bd7ce73ce19f5e7ac2cf8f4b4e1c";
+  sha512.run = "02fe89c73fac17de6f206722bb9de4f8628e88f4de0bdc692eea5dbed7ed7fac82fb423fa636f0a93339b424a08fd3e4c288ed0cbfe24959ce0d0cfff3eab78c";
+  sha512.doc = "0bf4ed6d199526d32dc79d1a79a2b4990c2896eaa994e9c4ccc6f948807ef75afa4b40a892b171def91b787368c69747e181e5d34ba2498cb4d4af21c3696e49";
+  sha512.source = "cf1de6864db32a06cf71e1f4aa834608fffb6b553e152c63c072793b570dd5fca53531f35ad3f7b0714a76c480b898fbec3f2c70ec9a097b775ff9197f535716";
   hasRunfiles = true;
   version = "1.1";
 };
 "trivfloat" = {
   stripPrefix = 0;
-  sha512.run = "3c409476d34ce423b79a9409056322ce327fc07fa96210dc5ac4595bd8506d6cf3810caeb7af20a0d1a403632e180749628982fc6f697fa46b2d16e0f2c7467b";
-  sha512.doc = "a11eaf789ee470db2489c28b4037e8e2cb518c7b0c27a3f2510753f28398cacb8dac5f9edeca91d487f081994490922788d05bf8d9e387fd2ce6a4222bfeca7e";
-  sha512.source = "34266f980635e5652f24a9e1df26e4f394ddb10713ad9df5fdbf85f2506b72d804332c4431b5a82cef1e7a0bc816fcc6c2a05b545f9832f7cb58d00e2f4b79fe";
+  sha512.run = "5d152dc9ef9dfa1bebaab6a92a6df61d580749f9eabda0e963915011920ac1d53dbcc6ff99ade67263ae07ebd330a04f0bf940e6ee64a26c4c844e4d97033d9a";
+  sha512.doc = "eb1ff7b87390ae439d1064e467e042bfca2a8b287dfa28db93250ea6af6c3cb797f7f8a203f4035e92b2305bc71b9ef6e1ca440625ce283c2f8d11c134b44baa";
+  sha512.source = "ac7c4d6bb3fa0d11561e530227fb872b532c48978788402eec0f231e14053a0486e532296e2bcddb5f65b0a33b04cf7b9a644898695ede8dcd2c064e3ab95a45";
   hasRunfiles = true;
   version = "1.3b";
 };
 "trsym" = {
   stripPrefix = 0;
-  sha512.run = "fbbb87e65f7c525a3e933eb707e2813e10e843d56a679ccf349f3390ae7a720a404531741e493a505d503bee670bc73a0a70e277cb7b568d4cf3a6650f073aba";
-  sha512.doc = "472479b87ea6f0bbecb3e8e0a97c51da8bc289be94cec683f1e264b3fcc7c43f9469a7b12dde001fdfce980e361cdb63789b6d4b8be265b8314b5d814e6b62e0";
-  sha512.source = "e4d691a5bf4215bf114f5f75e64186eab42e3c2ba05a2fe7a19efa5f0d241f96d76f58510b16a1d7e038a098fe641a49757fdb95b82fd413f983fdb445ffc09e";
+  sha512.run = "fcc854e3368ea4610a4c45086ae97e95b37a047d5c9ceade2df60cf01496baddd34deae651229a71128d175c4ba66c2d59c2d5cf53d60452a34f41f55d1c2a47";
+  sha512.doc = "f537426a53f9558a3b0eedd028b97cb3f3fa854aa1180259592111630f18c5b92697d5348b2f91cbc8411c02e5b50e91c9a63e804d9beee33f9a1f543f075e8a";
+  sha512.source = "c37404c9c4b7897a07d2a86f6d99788784bd380b40f9c78a525efaf8926b90ebf02fd104025f91ece3079212590bb3f22e442a0f8c04e5e73ee64b70b7a17246";
   hasRunfiles = true;
   version = "1.0";
 };
 "truncate" = {
   stripPrefix = 0;
-  sha512.run = "cd782c0365d6bd8df8e32dd9cbc6e6089e0c84bd0d8d3d77fe034ba8ef1e25203c1092b87c9a00d787c5fc78ef5ef5b69d772f94b5d8fdd6bd1ae1434339d863";
-  sha512.doc = "2af48690c3a23f41e0760bfff093e4630f7a06539d1eda219c567ae189acf7b5731e7ca97f9f58b6174283d46dbbd57e79eeaf4cba88423e4a8470671463a3d9";
+  sha512.run = "e29f5387851e2fe04b3a06e10affc9448c60ecd803359c64af6327bdfc07ed1d57c4f0e8506826998493473abd60ccf01f7d7d64c91e328e1e64cfc9dbcf29da";
+  sha512.doc = "be4dbb367fc308c4052015ff94b54777dbbf0a73281bfe488665081777d0e91077fc845802f5c1b5e83c04dd361550d1c4eab34d5de493a576a4acea5b565d65";
   hasRunfiles = true;
   version = "3.6";
 };
 "tsemlines" = {
   stripPrefix = 0;
-  sha512.run = "02e6d5542f8dd57f6ed14d69dc092edd03a5439bdda94f6bf4213d12de13b98400d7d73ad4efcd892e2356f1c6b0457f8e26325fa087aba8308f852f96361967";
+  sha512.run = "4d5c9964c84d2c7b2c2da3c342500f40c80213adf8f766b037bc57d4e7df3d210fa55e415c316b48faa93b21a08c386c98afd9a481b7a668e9a6a8430349fde4";
   hasRunfiles = true;
   version = "1.0";
 };
 "ttfutils" = {
-  sha512.run = "cf913210f9c94edd4506d7352e68be32e1c4faa6512a1d9edb16975139686d3f0a1d7fbe718673fd49c3ace65484f640c993f35b0280bb6deffb320012985061";
-  sha512.doc = "83f8efb51aac0771523d68ab2d89fbf6c9bd96be1864e82d29694cd8c41abd964a326e1c715d5d62650a0803e83851ab67e8efb87c5ed08317e059747e7dbddc";
+  sha512.run = "2a47d9087190a92e55840aeb4131227a1fcfcc25fde0ddc31ccb955a8dd8bc56177a4b010ab40d9f36264db4017e6110df65f1824c1a9bfce84c3bd3dc7e9d0a";
+  sha512.doc = "2ec4d42316941ef63ca005b04c00813a1d4897f8119695136b3c9dd32b1dc83b64066b48cef88aea0ebbfe08510eb0421df7bd02661f305182d16dc3a9d2e04b";
   hasRunfiles = true;
 };
 "tucv" = {
   stripPrefix = 0;
-  sha512.run = "024aa71594138d774ffcb0a510f9b8db67827027e6818f0e19cebb702dc54fb8d0773b7203cff79081b526b730d930350cea89531199f93972af95b5650af24c";
-  sha512.doc = "2b6c9c28f26d5305094939ccd7f833b6ab70ec790cc4b8fcc7982c1b51326f736b8d72dae611024f0940dff1a4c8b9c236cab0f902c63bc6e20553495477aec9";
-  sha512.source = "3ae122ba667a570a145f4893c826052b95c9c9d1122c1d077b3ce000e277075f3758ad72304f145a41bda1bd0766ee9a43fa8d348c4badfd90871f0ac59f09f8";
+  sha512.run = "0dc5943490a200aebfb115214f93e64570aafe60d4dc539468175e04c3a6b6c1645ec2a8f1047413d0fc6454098bf24480c20aafe83074640345e79a5e49b3d4";
+  sha512.doc = "2900dcadac28e3feae91df4bfad0732f4c20fc57df45c1a913bcb56b497be5747106089ec2a0888160876d349cbdfc746b076218287e1fe2eefa48ef21ed41d5";
+  sha512.source = "6891d4dcf126e1bc90d9868e26aba8f3aab2492004df916d5acc141693000a0f5dbbff9a19fc64f6befa820a45f689ffd2df3311ae67cf1e390c451b5c2f6b32";
   hasRunfiles = true;
   version = "1.0";
 };
 "tudscr" = {
   stripPrefix = 0;
-  sha512.run = "f386c4d68ee455d3982bef46db376d22e5fd8f77e290a8b5445c490b5cb2114d633efb46cf10c2bf93c06c761bb5f494644e9a831eb0e74215ecc7e0e630df93";
-  sha512.doc = "1e8cd33cab2250d24609a6c12e675742ea22a4b3c2b6a6003a00ee5b28a76cbb88a1e802d0bafaf2444effa41b0f5b997bd35b64d1806adc6066a5a3b84f8ef2";
-  sha512.source = "259c93323bae8913c608f23ff13343fb5bbaa158657581fca653e84388fb26462ed5f847a8e946ace469ad283adb22c62dee514336ccea29b669774a74cf7544";
+  sha512.run = "73cf72438d00c255fad2979190160e99c8c39d35c4abdb7c06a5c89999798a50064bf51a98a6a1af9172937d57a9901f8adbdc7aad573c0111cb4d5f32199bd3";
+  sha512.doc = "14669dcd4214f1d082e85d024101de50959cc955f76b54fd29eb6c8d687d509ec3bf7d23b8e774623ad8badd40986f4be33f17fc7126f3224ac660c5efcc3711";
+  sha512.source = "68c9377615e7154b579105a1f41095a80edf9233be42286117877208f0002d70061789132ff3c4fb5283ac42f4174beafcba9a3481e81b0e46d8a75866d58443";
   hasRunfiles = true;
   version = "2.05m";
 };
@@ -25699,612 +26414,621 @@ tl: { # no indentation
   deps."paralist" = tl."paralist";
   deps."sauerj" = tl."sauerj";
   deps."placeins" = tl."placeins";
-  sha512.run = "130b2f1ad3ebe724ec2acf259a380cf4a6004d2571be9ed7fd8d32f31daec2e36f089c6b5f49a6112b63f2f4aa44a3f633578b16c2fede7af1cf4e3b87e7caca";
-  sha512.doc = "bd707e76608502e77fa4d7c4a56e15f903f9672bca328f23bb1441830e920e9a49958046ca5cc25f8f12bd8b9a37ce0d7c8566bb6491266699b28f3e61dbecba";
+  sha512.run = "dfb5608993c7513bb3e57ce87611a5667800c61c2b111dd7eed5774e70d8e3e588f6c69c661ccf6245b28c6f0e0dc9cff0c381eb26b95638afdf8adb72569dd3";
+  sha512.doc = "2f1b694fd9322dd4896b9d1b0898ecfeaa3a28422041f1b13c1ee0fd3dc1ded8a8b6bb2bb1f0c6098cd2836e07109844b554c009315f3100f131f09bde80dc3a";
   hasRunfiles = true;
   version = "3.5.2";
 };
 "tugboat" = {
   stripPrefix = 0;
-  sha512.run = "b6a385f61e1e229d6aa70a27afe068085f2c81d74c80a562237d323488ec3446974fe48474c3240742c38a9a5e1be26851ab44c2488e9a2b4c8815bfca5c1df1";
-  sha512.doc = "dcebb95fb5a25e972e6f697d05860e43d09da2299ed4bd0ab94b000516a82e8d855e13aa18f806565348eed2b1c2d02684580d2f65f5ad35cf8d12e393970265";
-  sha512.source = "8b406972b87983dea3fab4bbd16e102c1d2a880712eb288dd039ecfa430d855e9998fb75b59c7ea81c284ad6f70ab0dbf55557e45efb0081f1b3953dca32eaff";
+  sha512.run = "d1956d104e59bf427de8895f15c459f2e4dffe3b3a0c1726071113c410ece4280d8640264b29bb774036daf82ed657aabc1fdfc614380794a4ccc7fb8831b504";
+  sha512.doc = "6ff9c30bf49e318e102ce521d72969193e3d02fe39dbdd8db5a6eaf04f291dfd94c082463d883c78572a79816aa49b2856a1c2cbe0d5979da3beb924a273a76e";
+  sha512.source = "7420060e9ded4960da7fc92dd1ddc44270f45d8bd6fae8e18103a6d62baad093ba9281b5805feaa6671f51afbda03ad93eca2780bf298eab08fb69bf596a20d5";
   hasRunfiles = true;
   version = "2.19";
 };
 "tugboat-plain" = {
   stripPrefix = 0;
-  sha512.run = "a9baddd670fdcff2ae57e39c67e3a339c254b47b9f1bdee929f5f484c73d25503f00c62ef1275586b656c4b2e26e49d0032d5551e1acc33a7289a4ca11f89a64";
-  sha512.doc = "91224027a7ca5384518e7b46dbce76510be5bc83cc92d43520fbbab11e8d18e0ca5bd416683ca8559f4bcb7e2da6c9c8ae116985ca534922cd6d78c22f04c586";
+  sha512.run = "7dd700df6efb9534897210f81430957ab6557c27f6fdc776dc870130f3e5936a317dcd33d200ca10107f6ef6afaebb547ff9623ea171526fece41a62bdf353d7";
+  sha512.doc = "076ec5d3d8baef942d7e05a1b68604b05e4e0cc574e98cd87c1e024b698d32360f60a8a7b71da9739f35187ffd02626870574ffc212c0036541f2a36a6e94efb";
   hasRunfiles = true;
   version = "1.23";
 };
 "tui" = {
   stripPrefix = 0;
-  sha512.run = "71240f5d1c528a965b17fbddf5910602c5ecbc7180f3b9796e4e7df22dec4a96ce63dbd116ce2bb099f240887b91c8625d300f5cb86a40120679fb1dbecae7d5";
-  sha512.doc = "64966dbd391a9f8942c8037a36115d62c4fff07046679ec3ed7c9f3ca2f2658aaab60b5515b3685212299083b836e7a4c5879a419c16d8637d5819c0189b6998";
+  sha512.run = "c39044ec235178420bb43fb860a38a843f8582523b31961eb5994c5ddb04f6f4266bc2e9d62aa2ea8e7254d7af283718fc19d27167a4af42697be160ebb602ea";
+  sha512.doc = "df4c75617c4d46c571309fb9d0a60908ae2e15ca761c9f45ddce050cf8dba239048b4268dc43a83e5bae5a2313bad78c3b912c5cf32eaea580423823bb6ba0ef";
   hasRunfiles = true;
   version = "1.9";
 };
 "turabian" = {
   stripPrefix = 0;
-  sha512.run = "61d420232affa337e2ad08ed5878f60a53789242297fb68d76959a4414d5af8eacc897486d75ba93c261b6b335dd95603f791807e122a3bcdc1a668f003acea1";
-  sha512.doc = "fb6adfefe5d1d9bcb33f3d26d162fe4f431b4b4c01cae43e0273fb7a1057b0edc0c2e3ca8f9449c9123c358f3d4d8acf5bc07ff475d4892e1c0b0b78ba49f832";
+  sha512.run = "94e16f44ac5d554ca6bfbd6294b5b36d5dfbb282ab67444d53acca4da4cbacd619138ede47921a6582a03a57b5db9d36e546efde92b2e8ed9f67dfb1a8dbc9ff";
+  sha512.doc = "20ee8c74e4e758882df22501717ab38c33be5d9c5e5eaf0d54904cf6bdb0387524c17d10b47ec50da97afb4d94e76b77eb281569b8a0f53d93062ae1f210313a";
   hasRunfiles = true;
   version = "0.1.0";
 };
 "turabian-formatting" = {
   stripPrefix = 0;
-  sha512.run = "d459e842c580518e4f5ba821207abaf04f0874bcf64aa53894a59fa8ea418b9cee04b9abffa5732938612c77e6fedabd1513bf428462494c97e3e0eb61af7b81";
-  sha512.doc = "8a9e37a1204a88f889d1638564146ab2a322c25c27f9cf044315de21add41b86ebde3f525718a4ea1bf9022741e71928fee25df7217935658f71227658aaa83f";
+  sha512.run = "8fafd77c2572a787542f37f59a87c958031b95f7bcf6e48630465b97e6d92b82d16524633295561422d99c52f3ec3c42b46ccc1155f00a2a5d54c3b908d5d229";
+  sha512.doc = "abf60bc3ccb3a2855aebc8ed03ac3b7177e31f271206a9775b4d353484bf36696a78aade3b3230d8999627f1126a14b544a38d16a8b7651f6ef0669b912c632a";
   hasRunfiles = true;
 };
 "turkmen" = {
   stripPrefix = 0;
-  sha512.run = "cc566d4a90100f8dfae2e92fd31e86321bc877e73621f7bd4c3733d0e7530b6af6cbd4e5adc1c34421e839ae4e26edf4948bc4bec9ee31b8522b2a1e384cd615";
-  sha512.doc = "d60448287afafbf2b0c1bae27d4f4ebcf571eabb0118a1d3a082371f60a071cd25ac8ed0bb14080c73162cb02b61efe86af9c480038a19d0eeabb553fe26e58d";
-  sha512.source = "cc9f6709475ef0cdae27069353c917f4909cd577a31560e732dbcfaa22e887fc882ccbe57b25210d59a1d39bdc38b91a68a16b455f379fd30be13d83dda442c7";
+  sha512.run = "38a4a7ab8823461364310a1e542673be715d81e89d1345954250b39be0fd7b97d8e95f08e20a2a491636cf305d024c29138cd89b671711a583f116811c3c2ca3";
+  sha512.doc = "2c7c024773519d83f15d01bc54d3b29b5eb903ef01cb5ecdc439cf92a63071cd27b81c16c83c2c410c72f6b22b57735aa14e54dbc42276417b70eaf4ebcd1d8b";
+  sha512.source = "7c638d830f2e5fd87a0cfb7e64bfe34eb9de16d9147540cf94d902d1552ec169276f836bac295c483f85746560f0f551f40d05ba6787a1506a723e7ff72f9055";
   hasRunfiles = true;
   version = "0.2";
 };
 "turnstile" = {
   stripPrefix = 0;
-  sha512.run = "15bbee2e7eda013a4a0f1675272785420be7f94febe8ca5dfa0ab8299a767ac5736b84c38c5c0b31a7cce37c2871d3317708a26faef5348525f0c14eb74356d1";
-  sha512.doc = "440cc5b16efe7598e2c799144daec9843ba9addd9a4be30c73d9007adf4d99ee83e71d2119dbaffcf3fbceb7ebf034efba16b3613031a948e945a4b1a26cf303";
-  sha512.source = "39ec499e216b161cc9e5038da1884555c70f482eacb477bc6d96317ad5acf7962b6fcffb54e9f8ca37ace710543b4729f781bb658be0db8a9a0248abc5636e25";
+  sha512.run = "6973830ac1bd7b0654a92933dc1578954ad7f2d76c7587968fe4cfb6ec769831249c20bf582d10a928ec909099bd895329a4f2dd20bf299b0d9f0a279efd3f08";
+  sha512.doc = "938f5a87f0e7907b766bf48a26b26c783305c0ad838447812f675957f83305d82ceb94f7ded0e6b3b37358ba3310a3d0d149cbe999d9ee73144ba45c89de4929";
+  sha512.source = "f70dcafbb77be7eea077f63eda48b3af740da3aa9a03c86e3a10c2369a26b132c2d82fe95893722460beb93003b216d5a938fdffa75ddaceb22f3a5f8a7718c0";
   hasRunfiles = true;
   version = "1.0";
 };
 "turnthepage" = {
   stripPrefix = 0;
-  sha512.run = "78b092fa660074b7e3408f8158d28245debd8d29ad4dced79b8f795497aca12a71f6671295564291cfccc1809a2da97697588d95ed9bf42f0cfb2cb2bdcad43e";
-  sha512.doc = "89be8ca12b484d4b72705bcd22e6061f71837896bce34c9e9906e74997904497df9346a8af079fd50f2409ccf3b07dafdaf1db33cee2edbae2fc8efe101d3b9e";
+  sha512.run = "88db62484bfed423fbd463860d86d252e43a8f60711d21b752b2561e0f11ab2e944f7ab7917f8e1b34d8ef38b834f937b66902160380fcc819020d78cb018eff";
+  sha512.doc = "55ccc9aec58822730f71f5ba1fe56e100ec2ff86a591b6e190dc116026a48a840fc3da6cd8b298ebb90b675b9b37c6d4fba876f5ed75a9f36be65afba1bf0a2a";
   hasRunfiles = true;
   version = "1.3a";
 };
 "twoinone" = {
   stripPrefix = 0;
-  sha512.run = "85ebafc665167358605ef3bfc92180a52302991672155c10cd3c097cb81e397a90c4f3b26027594bca058db250121251abb10d9fe8e422359aa930adbd5cedad";
-  sha512.doc = "6c7199de6f3a3dfadfcd175955e139121df314007861434026333e28214e151e5cb9084f90645e2106a11d8cdc996dfdfa3edc1b4aa6aa50fc7aed717290fb3c";
+  sha512.run = "4f1bbebc544f7662e0314e4f82f97ba4a3110d01c9362944147a2401c0c4b8d21ef89717230165d0ea1ec9ca85cda1f48c2809657c15c4bcafcc66738f9563a5";
+  sha512.doc = "38d1b831fae92c352ce1eebcc24c7e3825c479749648c296415efffbdf372b864a352a1186c44e416be56403b45ca3407cdb37602986d3d734ed5d28018ed3dd";
   hasRunfiles = true;
 };
 "twoup" = {
   stripPrefix = 0;
-  sha512.run = "7a3b51b75141f8c18f5eb5a010ef64c3c21ae63051c467a6857370a37ed9973e403dbc16495238504f3ab3841ead18d61e35ed3d4352e3252d34dc23f5fce694";
-  sha512.doc = "7ee5aaf508d99fa7da7c12b606d95a6f0fe06c62786ef59c1921037900e19cc4c186895e1a553627b8aa514fe2a5d3e19d9e2e9796f4a1cfd4b4c13b44ef7161";
-  sha512.source = "832107bb528a5e703f8776d825b6321c24187f6f645439200e52be65baaebea67cbfe58aca86fa88dab63d067dfd83e139d912e79e8a163d2d9684352bbac893";
+  sha512.run = "b9b9bed377ee07e9f0b4475b7c85a6b75cb6e886b65b274def8a4de5787b5519e24f42cc85c8b2e6ca961c787a03286bafcb57fb9552f9e7d4952a1d6cc41fc4";
+  sha512.doc = "1d4bf19cc6fadc1044acbbe016ae65f5cf5118eaad04123504b177d46ebee56cdcfc7691971eb4a24f61a8b94e355775b6e6e0fd8bce3023b1c91f3c51c3faf2";
+  sha512.source = "7319eeaa766a8f381920819edba99fcc2bd085f88250526ecdb6b39bc18ce3cedda2e103f2a71c449f5d1cb27f5d2d1c2852ebf2f2452eb98ea57a5dcd100e04";
   hasRunfiles = true;
   version = "1.3";
 };
 "txfonts" = {
   stripPrefix = 0;
-  sha512.run = "4f8d3fae48d13de5f7eac45544fc9df59b48eb2bad72dd2aff269b4995028ece5a0e19d483c51d7d16df800878b375d7c5eb8a613c826107b8b6ca9d67a1d70d";
-  sha512.doc = "6c49c523afedfea212b3540f339964cb3a4da84f9411d241bf8285afc1769eff4f7c716b2227c556d0cb5571c926f68b051fdca7b4a00604472be2ae06926fd6";
+  sha512.run = "8c890f04c7c47d479d35407e0d2f4c2e4c3be435d98d1ea6e5d6cfbaadcbc1e626ebe78e5e1ce12799d16cbf76a86c5fbf41c529b358a65f4439dc2aeb5c60fa";
+  sha512.doc = "b4671941f2942ff2a929a48e45d040e9b6e22591d4582a52f9fed425e87549916a9d4747a22d46b657d4ead7612d81a6101a853cac70646c39d38ce68b9483df";
   hasRunfiles = true;
 };
 "txfontsb" = {
   stripPrefix = 0;
-  sha512.run = "2e5dfc46012f741960fe38414f9648aa4293a024bc4e778e98cd9b4a2c43c2c9cf8dcc871ad4cc36cb175046c8f52132080ca0a2e3cea9e8003d47d49138c905";
-  sha512.doc = "f4946a137c1f993e35082a626ca7139058e9f81bedb26ad96854cbea9c033e99fc032a71c85cd88b2c1202017fbe71e74f648103f1071a8aa1b91e71ceed8b1e";
-  sha512.source = "28c75ab04e24b43253aa7c216070b6ee240a720c8e8a81beb36fbff75d2a6d60b52695185c282f94947d2124490af9000bf6b439563aaf2d8f5c7d2c89b1fd75";
+  sha512.run = "42ebcc0137a987c9d1cdb6b801bcd02a4e201ba8b53d144dd275111b27c1db9613dbad6d8d7fa52c94b140c0bc90a57936eadef1e9adbf96a8473ee1066d0957";
+  sha512.doc = "dcec58f168748b5081bc95ffcc85f23e18c123fce0133f390b76c8c8a1b7fbf9359a8066851befb72e2945851e28e9bcd1062f12ef708925d1971a47e61e4c5b";
+  sha512.source = "10a5caf9f961f834fb61ec2e806cd06ef8e0204da3b5befa599b59d8cce275690933322a55ac0eb1feecc7ad0c451c58ba5120b38f5a4bb679986c2ee931986e";
   hasRunfiles = true;
   version = "1.1";
 };
 "txgreeks" = {
   stripPrefix = 0;
-  sha512.run = "b412d09d2801122926c9cb0a10769a9d0fbd9b116ca1221fbc8b87179c36e0f810b20c60e11dd074ef5e7f1484a1cb892fb827235849585c0efdeae12076bfe9";
-  sha512.doc = "08a9d072cf865dfc4fd3f113e2f47cab05326c30eed75bc2712b5bcee72384ebed88b3b6d27450f3a4b13c13a05a5876d01ad88a5eb08814bc8d3e43c9b6f232";
-  sha512.source = "3131a5b1893517726ba7140e4843b47975a3ad372417bd57a8c15d3292f2df7320ab59f49ef0356b0b9d45badf9ccd81b866540fcabbe4a123aabf051483c33a";
+  sha512.run = "09ff7391f6986c014503a5e5de37c3b3dcc62d087ce08d9b9546e6637f7d23ba218b8cde9fd724c5e94a8e2e8a8a9fe405f44bbd2cb8f73a32156511c1eb158e";
+  sha512.doc = "3867db9b02d342fc4938a52813bd39ede470155f63d0ccaeaa2f0d03a34e3ee7e80d9ce3ac1e676225f51813015122914c700f7fcc714fbc8aad4f347dd62685";
+  sha512.source = "f269dd78bb738cade5f592a7888c6a1b53c261a0185c256e6ab6f144bee60a2eff2e70e272d6e4f96b190c59cc5b498e4d3fb5e3377e1004c675174d89761add";
   hasRunfiles = true;
   version = "1.0";
 };
 "txuprcal" = {
   stripPrefix = 0;
-  sha512.run = "28a6f9a105ff2783e5a64c1c39246d539e4035303b3aac47a64a93bc5a2532e657889d6ed7cf871e869f1412423bcf93ffea0da144736c17b895e6a88d48d826";
-  sha512.doc = "aaaf5d947b46548e29a1d361cde1dce768bb2a35711bf55e6cd2697162f7dae1f4a7b9c78a9028133268962fb984e503b7745d7c7e7b746ea6b20c9bf1119eca";
+  sha512.run = "e0bd84918e1e7a7f768421cf4c3908093b84e7f26c1cfb0d22c384251e7899949acae75a8ffd7992c384acf88bdae34d1c76c12be00bbf4b150e6f545735910d";
+  sha512.doc = "a987944053baceeb32748b0d729166ea5e932f2707f8ba0b143d3689a75745780f4d5e2528ee962ced97d48883daf69a3ec524509cf58b5740ca3f56c2bdea7d";
   hasRunfiles = true;
   version = "1.00";
 };
 "type1cm" = {
   stripPrefix = 0;
-  sha512.run = "36faa62fe329acd51920f93f5e65265b5c03de246b7de807f97d4b171236094dff9b0836f69689b5164e3b51fc1bcb0f39355253a95d08be73bafd396173de7d";
-  sha512.doc = "81667d071b87b7f2070815de7fcef230938b129a38f2a58d127f277514760e8cff31180e5898b323b5d046ee8a2ac46cacbba7f113b95763d1a054b5717e1cee";
-  sha512.source = "10025238d480f2277886532a2fb8e8c4dec82bd222cdb2fc05df177a30cc48dab7c1b0b2a34f46fd9449678cef9dfa17c1e3ded86eb8d08695c7c4cb0d48624c";
+  sha512.run = "9b4623d1d87f75de97c30904b24c558eb15d3dc704a83af319bc80b7f660bfb421f2295abdf389a660229a23b3ceeb8376c87057124579e5136900a334a6bbc5";
+  sha512.doc = "6bfb713c0003bbd6ee5bbbbfe8c1ccc2e0835b88a041ece6170f0ccc742232d467be232884c6b9a5279765bdcbe900a68b56a6819685ed5694c19f9bcf6dc2a2";
+  sha512.source = "bc6ff709e7f5fa7efc9f6da4b80b8531910ced07cfbba0d2a42e732eaa20763547224f101fe0e426ed77539ca6b3cf23440c5194308996291da3affb5090329b";
   hasRunfiles = true;
 };
 "typed-checklist" = {
   stripPrefix = 0;
-  sha512.run = "43ef4d31f58a17f723662ae53f4ab112c10948a0cc23c8ff93d2cdf56d80b8d2bfe26288d76e700f9b67df4906c8c6e807b58c365f93772e924a2c63e150f814";
-  sha512.doc = "a5e7444c2ea8bbbd7877d7258812b1e8476b5d9f9092514eeb6d79ac676a572db8c3dfb148d91995e8f10146ce1bec946c30abdefd38d2ca6b51b290ec4206e6";
-  sha512.source = "e2648407e2758d896cb4f36ccc3cc9ae0ab39e7d322f0e097ad41a064e32eee3baac226d90adf39bf7363cb1ce6c668f02a7baa7b2131d275ef0d6dbc77ed479";
+  sha512.run = "584dd15839f24f33fea91037fccb2ce2060fa228b3ad898d8250e49e4ef6aed69d727b7fe62794f18758cf3ef1aecef4e4dbf15603090d1b1422e9526bdd7788";
+  sha512.doc = "db5c90a4d1d22554d7de2491d1545ec2fabe92da8e8111823169411c8308d4fa27faa989ce19cf03d98dcd5de7dd627f25cb8c7e1e991f306a1b6ad4130d6e21";
+  sha512.source = "81347628b5e06f3bafed5a04abf0cfdb4bb95df25c7bf69c2c899227c2e851b0f3283f8be53d0063518f10ed7cdd543f6184b7e595a34a9b62f51d2ef75ebada";
   hasRunfiles = true;
   version = "1.4";
 };
 "typeface" = {
   stripPrefix = 0;
-  sha512.run = "d08ccc6470a1cc399b23c0c27d2db6b7c4df000ee00d65cbedf84359bb9310f8798d6f62d385c873ea2ebbd6555b6e2506c33526776d4ffcdc7bf7bffad5b5df";
-  sha512.doc = "54941aca5031adaf02d3feb3da1de48523f2c873a064f6ff0be375e302d908dbe2ebdba4960656ae53fbd020fe22258703c8afba792270877f6d346fd2e3a36b";
-  sha512.source = "f620ee9df320ccfac42630a2efb881c8558b8e08f758a89a7c04f87da463cc029fd0e4d649bb67577ea1370f780c27675de9778d7dd6eb7d0ceed45152236f99";
+  sha512.run = "555c7f1a1e8fda81b7a1765bc4b32319be31cadaadc7b1c268af6a3e4d60de2035517a669aed43a9400d81be8b4b5c12a43c923c5a48641f512c79db74f59fd1";
+  sha512.doc = "f33add74aaa83391fbe59890ddaa0083b2bea861e44f5b67e536abfb17aab40ee4897bbe0d4dfca55ace433017be134c9fdd028a3337f5d4cfe9a42c49ba7623";
+  sha512.source = "84b926fafbfa104fc29b09e85519a07dff8a772f5b569dc2d76dd6bbdeb0ad845ffddd10e3c89ae9ed72ff7af261f5b2b6abeee71119b60008883223affb675b";
   hasRunfiles = true;
   version = "0.1";
 };
 "typehtml" = {
   stripPrefix = 0;
-  sha512.run = "de1851d236c3db9ae48aec32072ec720bfbd70984afe04b5a9864826dd8c2e676ef52b1cda977bdfadb586338d49a8d58167a631e042940ddb1703b5d2ebb4d9";
-  sha512.doc = "b5c02876a6ea7c0a4123a8fb4dcb42e11a0655e370b1865c492c0232465925ed434eaa3c6a3e2731a9b0713cd8dc55b26353ebc3f65e2058104a8e7b1fcb1cc5";
-  sha512.source = "d6d1642a816b2cf1182e3c2d258ff091689afb718f837a5022dc8486cd6eba18532d54cf7c449264491141fa722a3a2d672a3274b5af974d43666f40a99c7ce4";
+  sha512.run = "98146acc3acb9416994a9243a9dcbe8fd968beb1a2199fcb3a1343174b11ffaa478d89d9547529e783a1ebe663605c1b44e8ec6ce0bfa4271dfece4922931156";
+  sha512.doc = "0c11e58e8770783eb324e8f1db33867e0b767fef9d8518568b4de6fbd570a228b0846c205911e7e5ff77e0a53cabb2b640baa41852c1e479fc0f09a491168928";
+  sha512.source = "bd55dfeec26836a2a89e3949764ccab5ac3a55b1fbf048ec431c03761ae8574d37cf54ca506bedd97857eb703c9a0151bf265001cedebc0c376743522234c810";
   hasRunfiles = true;
 };
 "typeoutfileinfo" = {
-  sha512.run = "826932569691b88e7212eba3b0582f495a0fcf1355594e6b1243ea83880eb6241094748fd7e4419219e9392a8d093f5249250ba3cacc8a9df861e3732befa5e8";
-  sha512.doc = "277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de";
+  sha512.run = "6ec7f66900e58f700343b16cdb458fa7e1985554521e58cd6030c90d0f1acb65a04aa85d652c0462393dfe91c3b46376c822048193a2eefc185839aa644a3674";
+  sha512.doc = "308511eb35047697a60a153bb0b8fdf1f73f805a7c9686146e0279dbb44500bb12becdeb8cc0a10137fabe87a83a3457746a63aa02110342fe9b8e0a433c2c42";
   hasRunfiles = true;
   version = "0.31";
 };
 "typewriter" = {
   stripPrefix = 0;
-  sha512.run = "bc79ca7a4f7e290045236ce66ef02d4d4ac7c38c0b33d127c13d0549e469121b868fbe6615fe14d2cc87a7e9a18a451bff5429cd0435f9b0f1b6afe8fec082bb";
-  sha512.doc = "4096b9e4a5603cd8a92b0e23ee4acc9b52bc1b9fbd72821c5be0260a0b161f810cd12755a125c74f634bacd0742cb0f7c81219ab7b9f317b092cb213ad04845c";
+  sha512.run = "b378d6f4c342fe5eaee25778fd040003c9fbf2c6d63f9e5d17aa5bbc067488b67175af4e20de8fa7f87fe009d43b3b95f768907a207b74250552be6396e4984a";
+  sha512.doc = "0c1f8af962e9a351b20b1000f170394ae7f310a8219be8381744c2ceaa171f926ac96bffbf5b781308925b21c264551c2eba1fd5735b5d85011468120d5d38e7";
   hasRunfiles = true;
   version = "1.1";
 };
 "typicons" = {
   stripPrefix = 0;
-  sha512.run = "7a85e8c19b51054b335c05770023f5332eed8854ebf8fece367c6d0546844f0abc93f045e640e87f82f362061c97d00d73772c25c2852d32771aeb83926a9619";
-  sha512.doc = "acb7d658f9c2bdd2d38cd6e7ed9f034ce9294f50df2a19961436b03ed12b21addda6858bdf34078de43036f48d108df0c8a16fac630bd86cc522076bdf2bdec0";
+  sha512.run = "a66d03244fbf2a5f2b6c90411d9ec750295071adb137ab549af6932f104911b096fddf6a515ebef4a02ef6b6c3d1ac683415289717f5e6f8d661890f503a49e5";
+  sha512.doc = "46125880cee45f6614aa052e63d9f5178114c41257fb1d6fdf0a68fa4eec6712036f13d5ceb3f5ef22fd8fa76168bc103ab7b138e7e3911d4e6408bc4244400d";
   hasRunfiles = true;
   version = "2.0.7";
 };
 "typoaid" = {
   stripPrefix = 0;
-  sha512.run = "ccdbbaeb8ec62dad83f8a63a65058e1a85557d263cbfe550026618934ef47af8fa727296e7e51fefd1d93c4f522aa280ce4bba8c0cba6773e3911b1d2cc66a6f";
-  sha512.doc = "aa8303ef52aac0adb85afd1834e53cfff534bfe96f036d8dd397a16fb7262f4963767048355f8fa67ab84a8c4e32c9324aa9ce24fdd5bd05e59ac57b78e6e0b4";
+  sha512.run = "da7c5a7e42a225d5d8a86e08294fd74a1a4066123894174d5c187ccf3d70a205762cbca39354ab5fb954faf4df713c00ab5ac64ea654708f0aede15ab01b5ebb";
+  sha512.doc = "f5bc487393ce1f65e4741b1f803312b47c456ea1b00909641eea1ac2bc9b54d029466106487d396d0164521ef2416a2505ea8526841526f0d87348ef748a4c6d";
   hasRunfiles = true;
   version = "0.4.7";
 };
 "typogrid" = {
   stripPrefix = 0;
-  sha512.run = "ec8fda6d14d6d0064472d6137231a0f41e340e034f09259db245624ef6cfa6d9f9b85d3441501ab1f8bf00b2e2f6b9f185dcf268341e53e281b03b6690c6d7ae";
-  sha512.doc = "3e9aa503044f074e80c7f15ef4c7daa8af6e21edafbaf569827e9fac409377b8ae9d7508692ac60b025a957551b01c0f60c037762ba4eb073a98e33fac09bea4";
-  sha512.source = "d09ae679b2138d253ff0d77ef152642e2e9ad1f89c40ec1f809b370f7637444379351b9966c3d02e5b71b5f920c1ed799649c2cc45f1b728c8b56fb6b5578208";
+  sha512.run = "359814d4a759597fa6775e4a62fed6b1fc49edcd95c4fe7ff5abab7137e19c2f0c0c7279430f84cf41433396c128c13ba7d0052ea652f6ebbb2ba767a62e6025";
+  sha512.doc = "5a5f821c21226695649510aa7b1b6e7ace9a564a2137a8f4d7fe3fb552c00c2fcfb6647c204603d24774bfec5f5e48484104e88318bb54372f8f5723a418a454";
+  sha512.source = "ea89fbfe0d8655c0ad755a6531aac405e1b6dd312788bbdfa2cc81b518d84992d9b737f2ab8714fdf6d67f16d8f0980ab5e7e6a05927bd874654673e27e6d426";
   hasRunfiles = true;
   version = "0.21";
 };
 "uaclasses" = {
   stripPrefix = 0;
-  sha512.run = "4162b423801483f01e64bd5c5d8e6f97be6e3a90ed3ba1717e9ca2a3eca117fc3e3fa1d6e7c0a1c80f451c3143516c9f6acf8fe36f5f46e2d137d3c882f6e49c";
-  sha512.doc = "6ce5e26a22e5f70c7ef81f11432556805135f2956f6ddf61aa2faf29c10ef207483d7a44e23b1691e5446654d47a450c4eff812c64b91785a8777e124e823122";
-  sha512.source = "3ac73deee187fd680df2c1cac403bb6c47cb7aa4f2c09c5158588239215fa9e5292a64093e6da7c36d75f7200f37835208c0c9e9e60aefa3d64bebfda8cc47e8";
+  sha512.run = "6c34f5a9c36018ce1930433d1775e5df98110f3d973ce0ce193cae82b4f0f73f6d242893227461848450174656a0650ab48b781118b407f50aaba7c44cce7689";
+  sha512.doc = "b1e1f5a568adbbcb4185ba76d6b581e067cb6a682057e797b0c92630f03c551367e1afcb184033d719b47fc0db191a09ff04756ae00324711e6828aa232e8802";
+  sha512.source = "f66764e73857b70400c571f0940286eee955ad8878cd195528ee86785a6f33a280560282cbe7a6fe25a2aec7bdeb44e539b15893606eeaab87fee710f016cfa2";
   hasRunfiles = true;
 };
 "uafthesis" = {
   stripPrefix = 0;
-  sha512.run = "017300846768d04941c95af370924f6616823060ba5ba46907ec2fc7ce689cb3a583bc7f5ea7b6f5412033510030d93cd658df26a7511740fd5c93a73860a17a";
-  sha512.doc = "b19de52cd69725b086198b1ab1aa0f0fd2a5a86a87173fb7993fbf8b35b5193941b98a94716183bddfc25e160651e19d7d66b1cc9bacf3547d212ec7555dc4f8";
+  sha512.run = "bedf63580d6b2fdd2132654a89c3e1b57e129699842d09a459602e24d29159213b15669e972ac2766513ce401a17e11a8b8c551a61c03efa768032ea7ca5cc2c";
+  sha512.doc = "78bd664866d4cdb9b7ddfafd52713aef46cca6e19a999c9acc0f4ad06eda05b253452927af64041888bb492be30a1410de04d1acbbd077c20bf1f3419c6a72ff";
   hasRunfiles = true;
   version = "12.12";
 };
 "uantwerpendocs" = {
   stripPrefix = 0;
-  sha512.run = "7dc58d6721eb2a101149d6c8c5c30eeea439db39faab78555839b92addb414c0700e62027a1d6520b2666dd625a9e579d09fd255c4fb3ba9ccf514a4bc3ab618";
-  sha512.doc = "cc93ab3871bedab176d160991aee4e9b562462cb21d1c1731ddece9ab66b79c209138bb28194593e221d5552cf3bb5682414fa1a011b2ba521ba91963c978d4a";
-  sha512.source = "44bed226132229368d69607adb2e352617e49914e16cd0d84266e1ed748b3fe5e24171f03c6603ac24c5e304b107211cfd3ea43703e3c39614a160a5b74aaae1";
+  sha512.run = "eb7e61e9487bf4a623f909ca143748e948da7911d65a6b9e78a167119c94f456f556b4858832fcbadae1c83ce139172b4ba9eaddc0d67b89529f7fc8fac6c893";
+  sha512.doc = "0ac24e4dc5d9e25b3ebbc1e4ee47e43286a47cfaa30b2904a3840ab7f7bba8e02c054b92f018bb68c258552f871b46b8089f97d7d091c088f132ff014d9812e1";
+  sha512.source = "b50f740eba5dc61e4e16f9f04bd3d02cf5fec95987f523694f26bec1db404103d339662dc2d70380a3f1edd3d8cdda4dcee3ae2489f60b3cb95189297d52119d";
   hasRunfiles = true;
-  version = "1.9";
+  version = "2.1";
 };
 "uassign" = {
   stripPrefix = 0;
-  sha512.run = "96be4e1c43cc070e7e5128d627740e2cea284923a54fd6c89e37131e2f52cc4552aecabd15f6c471c5d78af2690033157c1bf752bae02b34918c7378cae2d302";
-  sha512.doc = "abb26cbad9c60c895dd7e193b5e5ab06f4dbf33529d7e0e59e18f141156e7b49141bdea2f2e3039c2138f6f66390d91d34e92f3529eef9a4d0631fab3da3b91c";
+  sha512.run = "b71a22632a1d53d6aa9e3e9dbbbe0d6795b329c831f44a2a0f702eb6aa785f73f75410e14260b2e5c965794c8f16d2421595a8249b3c04a3392e8172c65d0635";
+  sha512.doc = "c07a5b2e4c604d68a7f306c10233168982cb7c450be7fa8c1ae7d49d4ef627cbb48699d5693cf47c39a539214d548d06c7338ef3c8a3dd875620d7440460b972";
   hasRunfiles = true;
   version = "1.01";
 };
 "ucbthesis" = {
   stripPrefix = 0;
-  sha512.run = "3e7f013d265bc0d9ec43e182ce0d8ecb7894b49a6dd4799ddb8aa8bf6725d89d972f8412e737a49cd0985d9217331a3981550cb1a56c5a06afce23a6b2e6f6ba";
-  sha512.doc = "67c38767fa42f33d9feeb70e2ccb285a1c6178e246b69a38052197aeb9021c4e0fce5788e677c270df727eae978df51820a7668b54df6d015ceca12a83cb1640";
+  sha512.run = "1a069b62104af94a97cd723141c641b9aabc6172f026367270ad6c5ac576dfec1976ca9eba80c2ef42590702d41cd82258c8562d9c7ce4c2f4d86262e1f996a1";
+  sha512.doc = "784b117bac86296079e813b51baa86f76bffbc136e467b986e206b73547668a0df891d31fb0086872befddc0486c083fac4627b61e1140caba15c763c7afe8f4";
   hasRunfiles = true;
   version = "3.5";
 };
 "ucdavisthesis" = {
   stripPrefix = 0;
-  sha512.run = "47ead726f6ce5aef508657b573e17a76d5c7833e740fc8f928d94b842cbc05c1fd92077d16343eebf704c4cf2bccc0cbc58c376fbd3b0b54b60f84811a6b33ad";
-  sha512.doc = "81fdc26002b145636e1bcd6c608613926bd68ce152403a2a38f057bc67bd3d1977ea083bdf31bd273d0e9ea2f123d7476fbe7d72f1fc75d6b9e9f96f859902de";
-  sha512.source = "ce8a93f031f712692d443ef9cef5b4d4a520455329993bd61e47f4753db1c820325edaae691fe20cf925e3b6ea2ba42d82bc264300de67a434a4653ff4a022bc";
+  sha512.run = "a218ab7b0f85fac3b8c59f20a2fba3d620e3332b35073fd7112e47b23a9f8a79990dc98adda24422ca51c0cb1b9d07353738cd7014d52963e67122549c815cc1";
+  sha512.doc = "41f92ea37c1989e7138670d749a2e15c3b5eae1bab907248597d45473b1e57a782cba66a29bb891ee742210fbbaaf9008bab394b494618bc1c8005e09256dda7";
+  sha512.source = "57dc07ecb16e323a45b599177df13ff9441635761a2dd5fd0f647044acb2405facd0dcca753359f04b4f29a91298456a8fcdcce983f5b791641a3f3d52091396";
   hasRunfiles = true;
   version = "1.3";
 };
 "ucharcat" = {
   stripPrefix = 0;
-  sha512.run = "7c27ddbb806f8e4203175a6ebc40a180503a3d3e2c00d54945cef820370c1de336f0f23613c6a60f41ce60b71129717d871b2cf4685f7032697e8287ac1a43d2";
-  sha512.doc = "ef8b3c9570dcb86817bf1b6cafb4d61417a99ca000bdf798f5ba288b9722668914dac1d61f23cfaf5daae3449465edde091d94c3af347c4d3f57f51d6f605688";
-  sha512.source = "558e2895a44364217155323d0c7592fcd9c6730ae35d998e2135f95bd420ad8c8724627b0616cb649ed12cdb20fe75a02fcf545180d081537fe148a44cd1bc2c";
+  sha512.run = "28832a734e22f55263670383d9b01ddb8762d154296f4f04176ef67904de459b78ea4d02f6979a9d1dcb72d63cb902655d0cd10262ea552629c4c8c15ae85bf9";
+  sha512.doc = "798be5f16941f103cf5c8460eafb0617b63a646e110f4b87684e5544840926fbfb7faa456362f0339e5210e7155558a006fc6d6f4a35c5b2533ca68282550392";
+  sha512.source = "2cb7815be55a08cadfcde6cf0d2be5dd5d94c3fa85ab6c0cd45d565ceae951f5ee87ee74b1023d86466404066fdc6db58010d6daa82ca65ed003a9674a21db2f";
   hasRunfiles = true;
   version = "0.03";
 };
 "ucharclasses" = {
   stripPrefix = 0;
-  sha512.run = "d65167188f41ee8c6e97951324657dbb4132d0c13e34503139c865c50fc4f772f4e6533534d541e5e057b36777ced4fc628f8b12d95ad4c401d66b1c86ef7a4b";
-  sha512.doc = "c263be2adb6f0f46c087dc8a936620d40651c85047674dcde4344014dff970dc1b8861f433b99c1181c55cfa5852f18a686dd636410d4c46945d9806f1ea5168";
+  sha512.run = "c644db7fa3ae006ac8ccf347d90d399ff0508edbfe1441ec6923cc7242e36c7ed22b0cb26c6ce7f38f4e40a0d8f38fb808dcb15322840682ea80dfbcf324c9ef";
+  sha512.doc = "837248e7218c73fadd76333c8a19cf03af0f6d16262433f00cc1eaca557f8aee2df57e64b2430a23fa89ef09c8655fa17e88442a413496c1c2a3071f08202c5a";
   hasRunfiles = true;
   version = "2.3.0";
 };
 "ucs" = {
   stripPrefix = 0;
-  sha512.run = "6040c9de9f0a343bbba02ed00a6575587d7d866d053b491cf36e6244e8aedb0db3f76a0591275b8cdbab8c718922d4b71bc95981b927444cd3983243b7d08b10";
-  sha512.doc = "572e2b8c334bfbb556d23253ffdcbbd5a80fd954fa56cdff3807ccc7a6c5b630fcb20779d486a4f5d3a5be2fa7b93ccbb74f303199e6977857feacdd0dce33dc";
+  sha512.run = "c0dd75d44aa94349d82128a03b97ce1b0598b1bb0840ae3cbd18e542ec9479981c7cf7941ae8b78107302904859618d523c5a1d36794fd4301b38657d342254d";
+  sha512.doc = "d283f7ae94465e9ed2a1a19052b569b72589ddf16bdc5220b3ddaeda2979a996079546f25d8a60b8ea81bb48e988cd877e7ad90fbcb7f0efd3f552ec8d5925a8";
   hasRunfiles = true;
   version = "2.2";
 };
+"ucsmonograph" = {
+  stripPrefix = 0;
+  sha512.run = "1c85c117e9a303c0f4e2f1fbadff2abc18d305caa1e71696882a17fd4bdd2b7bf65e715827781bc9537507f10fa75e5f79dbeef09241da4eea307fa3135c8700";
+  sha512.doc = "4890b4c353829c6237815b32b3ae218c366cecea4672180a423b685ed79260727be69f676e64c5cb1c4f1085faae27407030cf87e64e5b03d600d263baea0ed1";
+  sha512.source = "ffd9a267b08c5d21b41a40cd4805a7999f3e73afc2984eea5286c1674bf60c8ec90d3e1d891cc4feb60d73fae7b993d96d792a94c5ce7ea77c13342a4ecaa0d9";
+  hasRunfiles = true;
+  version = "1.1.0";
+};
 "ucthesis" = {
   stripPrefix = 0;
-  sha512.run = "ae7b6857e7a0ecf6bde928ce85af80b911b56be74819c69fae4966a3a4cd6f297d882f71ac112b81da1e98124796aa9b6f6f481bac5ad23ffdb4365c7b2fdbdc";
-  sha512.doc = "49e6fc199e49d0003031620dacc4d04a443c8327722f34b65d260e65f54bfdb69948d6d63fb3704cdb91b7251ffc17555a304006b40d3b161c48e47044fee971";
+  sha512.run = "eb1e5be6f1791df1ab905d34c93d2019ef75148bf7519e0797fa4486072c7772d2ad5ad4807d602d9e7512d1ae95f5365b8d6eb28c011293daf9a427b151ee70";
+  sha512.doc = "ced7b7cc77c991afa70b09d0d6adac043dd1294fda60b1185a680740ac3bb96ec8af78bd9340663363b1c40388f6713d835b8b46dcff76fd7620c848875a5927";
   hasRunfiles = true;
   version = "3.2";
 };
 "udesoftec" = {
   stripPrefix = 0;
-  sha512.run = "39efd4f2c9930ff92eef0629255e62919c55ba8a308dacb01e81c9341c6c5ccee9302d12bfa06ada07ba7451b87c9a600ac7a481ea4b13a7e49c2b7d0cb2924e";
-  sha512.doc = "1b6051e2e330b76f95aae7cd314aa9b15db80205026579e4324e8a4f58019c31d5210c72a43b63c7e4cbda30ca805b7080a368e5aac454a105c8393df9366716";
-  sha512.source = "c40fd69f2cfd79d125d8888dfc06ebe751c40a6880c0e6a2b16c3828fb018cd0de451a6f25895e7c28abeb9d78694d004aa66688a43a93116dd8fd050f16b451";
+  sha512.run = "a82778c8e50b42614820bffc5c2f92b62abcfba7425e6f51d75de131352cb0045534c167bda6bf9e04d8bb42c9e601132315331000fe348e6d10bbd607f39347";
+  sha512.doc = "1b74a9e27ee46fbd081b2ececd90039ce62957a04c9fc3a0b86ebb48c9f3732188c1dcc02bc89fb38fe2c0530ef508b6de70c97428e6aa7a7d237865f35b244c";
+  sha512.source = "c2a524dd996851d187604109100a1c5adca2d5d82e317c0cd2b9fa419db90b96128d06ca19001da09ba63e0c7d1e6255a3cd718a39d4564707d26563d1bf7467";
   hasRunfiles = true;
-  version = "1.6.0";
+  version = "1.6.2";
 };
 "uebungsblatt" = {
   stripPrefix = 0;
-  sha512.run = "6d8a6659c27349cc6d42dd7de0c7797e87b7427d516d019352aab29140502e6cea2203a4c912769b20b8bd53c28246be427f7e96cd00db624a4f642e040985e9";
-  sha512.doc = "6131ac5248840b4d74c5940ae955bb8f23d36a2d71efe0792e435f88845189901fb68cb92365099d0601a1d66e1c2e5e81301514cdfe68b0085d4ddc189037fa";
+  sha512.run = "e6e7a28d6f692c90c226eea2de00b349e0f5e0b405306a99cd85735acc791458cbed66d6ff31da2013bbfe19adeaba2af63ebfc0026e5a5025717c0f9b1f27f2";
+  sha512.doc = "f7c2a45f56a417f3387bc4fe812c704cb32610d0c287fd76eeb617334baff97fa985ea51714d634eb6ad5642b0f75e2bc48d35ce370dd3d26b5c962974af2ebf";
   hasRunfiles = true;
   version = "1.5.0";
 };
 "uestcthesis" = {
   stripPrefix = 0;
-  sha512.run = "08a41971cb9f873cb30cbe77e087c570bdbe060546f86906f8c605916c1aa61a36e1a4fe1ba63c89d613f15811671f1d1d4e42e7946610ef763325836b0c7465";
-  sha512.doc = "a2df16c7c3626d34ef69040beb524e9a26b1d9f006f28a53b84c83e09e176d58a56c59ec30719868433e2093876626d9bb79d9d5e663e86067fa68f27d41d980";
+  sha512.run = "d6721c39b39bfef99b99d634b45e7fb23b4a4522438372a9e4015999f964409e97a862f0c6401611eac667ea303077d38f852a45f12f93e55c516f7a77698f00";
+  sha512.doc = "21d033621b80c33c9a926204423c3cc4fb8e7952103916ab59d59fdc8d2b41fe7571a7f91c3023bb28d8315349f198d16d2014c38d3384e99024f29df4639798";
   hasRunfiles = true;
   version = "1.1.0";
 };
 "uhc" = {
   stripPrefix = 0;
-  sha512.run = "930344bfa9b8a6f9f2328b6e17afe16d4e9d87efe4334d0cea71219628a741f032360a370a86d6e6f0ab5b6dbdb5eddba060118af71d16bcad9c387357911c26";
-  sha512.doc = "df7dc49f2109ab83f6e05729394d77a1b3c746c89e46bf5014d3760cc8d44c415754a85bc8df4871024f4cc3fdafc962ef3c0cbcfeeb2d291e0106005c05b7ec";
+  sha512.run = "c5b941f31dfe935b50d35f0c64adfcf4c0d008dc3c16a91a6b293e104086cb9711b8cb74465caf6b20918b64231c0a6abd6a778f7d35c31dceee2157a8268542";
+  sha512.doc = "7d1fb63d72d7c3741af17fd79749cdcc8742a86db94686b8b83371b43b175dc03c800135dc36d97aaac18e42695caba47f1bbf35ecb81981394d0350db94f709";
   hasRunfiles = true;
 };
 "uhhassignment" = {
   stripPrefix = 0;
-  sha512.run = "f946e2eb2efa7a7960668020ee42680e707c6f93dbddfa502effb689de92387cbea10f4404c501f6d4f697a9f626884c3f48efe780e19dde9f52f1a1e37acab3";
-  sha512.doc = "117834ca4b5d0926ea7b23b8a8e34bdd8c1e93ae447d5d07b01edb8a86d34cb3a9dd2fc0123dd02ced94138e2598159f6921bdae718dc5d78eae616048bab0b2";
-  sha512.source = "a1a759536e568b1f599a6a2be69a4acbf1a94f900b02d7a0461e85412bb6db3f1e335b3ea6dc990962c97328bdec72d2987fbd76620e9041c0a36052e774c449";
+  sha512.run = "6b93f31b91044ed2f1456b530b791155c6c9e9383bd4d69bc42d37af69d944964e7fb6cdce7aeae9bb71fa5be8315ce3f224e2d506dc52fa83403671bd25ea23";
+  sha512.doc = "c8ebc4b6955f5e9f61ac78a6a47d89ba6b3a8aca7d15c1f86c37944e9288c17a07d228f37a0a12b0cce5a937ef0350ab0641f629972b4592f2a829ef090346cb";
+  sha512.source = "9c322f8e0508e067a22ae20d60042fa903f7db0393426375ad5440782d6b3fd4c4e392369815946306e6c16217792040d9c4e5623b8e6ff4bc404c666249996b";
   hasRunfiles = true;
   version = "1.0";
 };
 "uhrzeit" = {
   stripPrefix = 0;
-  sha512.run = "cdb467c0a096cc98420d2ff9f25cba954c761dd41c8edaf1bcd761e4add4cbe008ee82e649dbdf72baf7041b26f554a7793a3d05c4fc064fa2ef044769562805";
-  sha512.doc = "07c170dee05d5cfe5a52e21b698e7b79ee9e6caecadb5aca0c4cc78809e11837efed82f2b651e46b62719a53ed21c856e89a57d1ac775949785c614a1d3b75ea";
+  sha512.run = "17a8892efa35b456cabb8926cfa899294bf76d8f93b7afbd9e5fb835bbae200934a3267022a9d4fb2a4152318ede995304a0f97667b8eca6ee71fae85d84caf2";
+  sha512.doc = "5f706747bdda480856f7a4c86563ffbbbaea928cd703ebd227794a7f3ff2684491e4709f48319fa9e0d2379d181d84c267f7a7219ea13653ae1e5fe227ac5814";
   hasRunfiles = true;
   version = "0.2c";
 };
 "uiucredborder" = {
   stripPrefix = 0;
-  sha512.run = "4f89b95bbc12e4f2fa18a1d48e11bbe8bb0c9f7da7fa09565f0ad17d8cdf66720effc5aa44e02f3ec350ab9d873da3e90832fa4264c0a0f659fc6a144a103075";
-  sha512.doc = "0bd8531c45618ba7d6bf74d0f5be48b7c9e51b90c24e70e04d94d5624b213a61a4f05ed52490bc89a1184f17db21f05454372555e4eac2d8f8cc237fab2d9910";
-  sha512.source = "91e8db700b8de5f2e15c4ea639b25e513cbcf3a61b46eb732eeee8ecca9827afec951ec9c8178a1732c1f1ac888478f40d02facf31d8efff30126a96845c4f76";
+  sha512.run = "7ea242fe600ae4e0410147a574ace47403c0f00910afd75752f3cf65ee478617f553f3d5d0d9577540ae7794507d3b2548f1d00b43052879e1d6fd45345511ef";
+  sha512.doc = "b663bd149b9a163fec6246e17d989cc7235921897ef8b87aa93061812e9c2bca1191767a21404ca22f8b5b458771d0e0702368e579e566b672015bd3bce83dc2";
+  sha512.source = "18c1faac754a27e8d37e8065a56967cd9aa34edb0b8e22e96e503df330748ddac767a340f9a23be8887eedefff623c95e644d0d2088b795cac7ccc4b6d615642";
   hasRunfiles = true;
   version = "1.00";
 };
 "uiucthesis" = {
   stripPrefix = 0;
-  sha512.run = "481d89210e2a1a0d188783ed06340b111d8451e6a90e7b1537ed2d956b23db8016a6adfd61c657c37c05d8f5659c4dd7f98756f154e8fd2c57c2a3cfdfb33836";
-  sha512.doc = "cf635aa88f1650cff74c4a624c60805e2e705738ef76604e921b861db67a0902385be4a78800119f8d575c33a08805ec996851ee055214f0332e9293367974ee";
-  sha512.source = "39d28460796bc75e65814da335a36eb2efbc295c35bbadd245891b0f962ebc2b89974b2b14732e70cbb66edcccdffc5cfc1f5a71c4a30cbdd642847b8eff9832";
+  sha512.run = "8a30b902f1ed56795d501a28a985dd7ab243222560392df3207e04369b60638ca94a067b9c8c4bcd80db85dbe9e9a39c403c13b739fbbae21c5b3f631ec11847";
+  sha512.doc = "78adc6173546fecd946c5c4b633ea6d3a6c966c7f669adcad427a6d12085733cd7d3dbb4ea3f158ea02a135451119ec64333f41c27b3aad60ee485dc0aedb659";
+  sha512.source = "3bbe1a519eaa81b36ff85713f712a3e63d2c387edb1e0520caca35c47e322b4c5f137a2e408f7316d8a598143b2e2d211e4babe77b9a4e42dc47bb5e02e084d0";
   hasRunfiles = true;
   version = "2.25";
 };
 "ukrhyph" = {
   stripPrefix = 0;
-  sha512.run = "8debf2b9e549336f0eb8371a7781aafc7555f7d09a216edb44787c59025a477e91f0a11868bf672afb050c85bce1fc198067d738eee19861852a7b96788d3829";
-  sha512.doc = "6e426ed9bdfd97145613330d613d7c43c15c40e2c7524938f569004e2ba67adc8622a5ae3b58f51e868d74b83618651d107e7f5e52f4077c21e66e0468497a8c";
+  sha512.run = "6fb3cdd284fbbe6042eb6e73e40aca4fa5abc28ba639cb1f1c1871f5031f8a7a876a73500da865a29ba996193abfd501f3b70b58480050500610277e5d217dee";
+  sha512.doc = "be92315332fe79f7f368454941aed5cbab40b5e45de75d45cefab796ee8e66d6a0fe7579d4d69c589aada5dffcb85ec71bc4ea81af647bc726469e8d94ea5e1e";
   hasRunfiles = true;
 };
 "ulem" = {
   stripPrefix = 0;
-  sha512.run = "187cd38533f8e5f2a51c3c5ae8937284a9ea3bef5ffe6ec58f25c7840e446a1bd8e49b22624f1b5abcbbc7039170be79d1d9dd56e9c8a349a139a69c9f15fe40";
-  sha512.doc = "825278cee1cb386275c222918c45d2a078088e6847c4b74d1470022810e0a37c38ff6cf14b3059aa18fbaf28aaf02b862effa1fca15705c0fbcdead03d335b84";
+  sha512.run = "651a4ef2a5459d0df8a769b8d13009e9d6f842cab2c0b4ab727afa3781fbdf1b8b8d5d449209c542b60407ebd51d9ffe8e6441a5928fe16ff26311a36dd91770";
+  sha512.doc = "6ae65864db274f4570a08faee23c178b0197df9889f8f93a52664714bf39259f62ea3b9b4db9d1fc5562dc0001ed9afe9ea40ef773a8d874b74ebf6982cacb6e";
   hasRunfiles = true;
 };
 "ulqda" = {
-  sha512.run = "5a10ba524da981b8646447cf188ca6a28035d263825b912124729ee7174367e481066008bc147efce11d9c43744dc29f5d3ec518ba80047788e32d24979c733c";
-  sha512.doc = "4bf3c7df0c6b5e46deba426f0035c7b79b2a0c563a3b4078f883aa5387622af01c7d084c2f0c962951818096b15c588b4f607e1801ff4e8f6b6086f8c253f401";
-  sha512.source = "6c59587a4619723ff14049b990296751670c80ddfc59c7d5d42b3aac2f71aaaa83107d69489e71af75478206d428aaa2fb1d7125eeba6c9beb07981c3d8b51b5";
+  sha512.run = "35ecffe16e2809e7ecdedd65d8f1debc20b9028dbb6b21ccc2a9845f48389f9308b4ef4905a18b605b8692e00df80a2c6825a69d187e8600bf8b5cdabaf2d6ed";
+  sha512.doc = "983f62f0a6788ca090cc0d5b29ae85da62d8c63abfa374cf7a3a847ec722ccd7abb479088d72934db25a0406478203de603e7f5a5e26ca55c802d6d7b2da0c61";
+  sha512.source = "96db76666987c7037b6fb97e1646caa3e1b7b9b10f922b7573e572d5cfac1be18010fb35ce61f51fc9c37e28ecad8011757c1b3bc9840c3d86a8798071effbe0";
   hasRunfiles = true;
   version = "1.1";
 };
 "ulthese" = {
   stripPrefix = 0;
-  sha512.run = "e1a918b8850e8560dd79fb3a8cf4e2d07e9fc93c512baf7e56a18a78472a44fc40e85aae8aba0ba10543dd60ba9274ed0c81d39879f88c6d9c9070cbac0d8238";
-  sha512.doc = "b013153e132d92866189e2ef2b938daaeeca65d90bc457f412c901bc39949091520ca0fbe9774822e90ba6704402684fca2baaa5f3b86be5e308a36acc12a574";
-  sha512.source = "1b6d3c28806b88a1946ab9f0af3eb31e91c6b2dc42cb7d0d763bd246ae56cc71f211643e806e13b7b23b4b3792bc31554cc2ff160d81ca6ed0ff690f9a2853cb";
+  sha512.run = "fc3a62d4a6d691700810758c53b920697a2ad5ab721f9c90832e6571d5a67f52d252b1ace2577f4c73e673a05af6f32427ab5be3c215c2882b32046b56d73561";
+  sha512.doc = "93bb236274b905342352e12d3bbb5ef9f9f2bb3dee4a2f50c89fcf2e3b3944f3ac0e0e4f36bc3e4c88d32dfdb4d79a2eb5a110b9eb8f9c8d0f57d92ba32c61bc";
+  sha512.source = "0bf4895433d551d0212e1c58b101c36f796068b2afa540bc35b7d9c28325c181a6f5d49d5387c7c3673fbc6fd416d0c7388028c14d12e08d4d5c4ba897911c8c";
   hasRunfiles = true;
   version = "4.4";
 };
 "umbclegislation" = {
   stripPrefix = 0;
-  sha512.run = "c5dd33dbd6e6c0e277204dc3e0a099662d396d4b69d860e8f61cb714c19948ce80c61ef65848f5c98e0cce41da7a8b36c4daef8605990bfbd64e68eb0e2e92a3";
-  sha512.doc = "42c2f2304270a6560afaf1228e7d2521e57ae0d2a1c311c507e11952df890d0983392ba2a98be1b3ee5754d3cebfa54abfb93f57b7abf25701cf3fe5220d5fde";
+  sha512.run = "f6418e7108d549aeab5da21181d6c3ea379b881ff7d3967b4845d0aae799d6e69a523b38b11527779c028410df6cd943bba38acb81c1e5b2312b72efea888a12";
+  sha512.doc = "8b3d6e3b89c820100751e232b15d27b163a5668b88be3150edbcf2714ee582b94be4d0aa1368fe7684c257aacd9e63d90e82b240fd817a1bbf7b5c068110496b";
   hasRunfiles = true;
   version = "2016-6-8";
 };
 "umich-thesis" = {
   stripPrefix = 0;
-  sha512.run = "ed4a8f4456d2e11c38dbfe2f48d7501357db62684a30a3e00e74c2a93cd28a4420a1f553d6ded60a6bc29df0713e7f41d4ca8f7693c1124caf15b0bff0ee2bd6";
-  sha512.doc = "2390e9572fbc395192d9afa92699b7f0c97c695979643aebc4298c95f787933e65cc0a7afc01caf6390b14deba3383b2ca364959fb8ebe0d2d90d680dcb24b42";
+  sha512.run = "e4356533a2d03441fb04e2618989e9d4ae2b8378f342cdb86be03b5763bd1f97ae1c2aa0355cc68f1bcc9416ceb1e0d3532b32dba67b5b4a0cd6de3795a5919d";
+  sha512.doc = "2b378c4573edb1bd818af2dfd47392095a3f0dcc0e7ecebdec9e0a57ecdcc88739cc741daaa6f5fec3e66a172a7534f1a2081eb3bd72463e86db3093518f6b7f";
   hasRunfiles = true;
   version = "1.20";
 };
 "uml" = {
   stripPrefix = 0;
-  sha512.run = "3ec262652d34f9ab9ce8e1dadd9f747e6054bd45cc37c0a4d50c799d20df57dacd6e5082561ef24c068f674873d4f7cad6c1e79fbe34b25d1c219c81af949660";
-  sha512.doc = "6e22b543bb6020fc9378199b9000300d0785f0c9715e4e166266e2d724d8cfe82e7dbd5d1d961c6e312e3c8166e7707f572721e10bae8617d2591b16712f8d80";
-  sha512.source = "5bbbb3568fd2f3361ba03a0aea9bb695e6d5ead3d2fc3a9e01bed27509b93acedd0816d3dc1c82e84395099bbcfb35bb8290e91b88ebaf63c7b4bb7797176b9a";
+  sha512.run = "d2f49e8645f924330acd33682dbf1f46d1d5550c9a2ddf82c8112b498609ef2611f4bc540efebe70b12012204d217b9f0faa25073fc2a2765fa68f47de54bd9e";
+  sha512.doc = "503705409c253113fef9304d53a34696ce299206a7a5e22ca2562e6e7ab527ddf3576d73b460daa44df21ff9798809187f238f72e0685c3dbf40086fb450971b";
+  sha512.source = "033dc7209335b1f98564240eeecf22607fc81a521d7b061b43968d7e35bcdc0daca0e3d68abae23fe36dd629d149ddd58e864edfa78edd87b72dc714478c65fa";
   hasRunfiles = true;
   version = "0.11";
 };
 "umlaute" = {
   stripPrefix = 0;
-  sha512.run = "2179377cec3d9a72892073e001391ecd86f0aa7a3a90038e97cbba13b1ff8e1d950a48619a1e6d8569fbc782a7ac4f100fdcc346d3288ec134b064ffd2931040";
-  sha512.doc = "cdddf03566f34a60def67429cc3e125ed000e4c9155e0b6c612b9bf61b81722f5d08a16f4b2c6650884aae282fab7ad634a6bfef9c434651a4f35aa7f74118d5";
-  sha512.source = "828476eb73b51d4b777f751d2462a6cefbda706a554098134d10f834ab97e37676834736a17fdf195535fdf40a2ef27ba7ccef47ced0d1af6164e04c6e99aabb";
+  sha512.run = "18adab55047a35e4abab1dab9c033ce9a021c622d43c87d10fb373234de68c1f6ec4d8925dd39915259381fcbd0771ab777b6de50ab96f128e505382994b451d";
+  sha512.doc = "884183a077a52153c35f5b225944a520de58e7baf65543a3b3176092172b113628d68008d5a3d9cb1a0ea59dc5f18d89713004a1d9d048fe131fc85e84327d94";
+  sha512.source = "9be7d5dff5a87c83add3258223f1dc46578e3cae4cbd65b4378d96d31a513a2c92615c64d9097137918c6d3320414edf46e7bdc0de34dabe3e7e50194135c60a";
   hasRunfiles = true;
   version = "2.1";
 };
 "umoline" = {
   stripPrefix = 0;
-  sha512.run = "bb3a003bf37367ca72586484b9779cd1a3059caf3d9c41797baccdf66d1cb09def1ba51c8c240c5f49704666487eaf8c8f08ae9619c171bd0b907d585bd692b5";
-  sha512.doc = "9f3962c6d6c22a9b8599d957e0fa90d4e0d19b026978c49cad716ec8f9aa3727bc05e1c5524da2d420a6b1c6ff5c14b536c6ae805b80f34d4f67c7df31e1c637";
-  sha512.source = "e28ff9eb8ecfb740ffa2acd5fbab1a8b0a0736a99132784610b4f40aa71d75b75f51f25c19917efdd5411ed30281fc9c3be4eecce45f05f3e3a8e2ac217a6bbb";
+  sha512.run = "b3a504e9381d1f8692b3981736fb7b12aec5d597021bde6b57ca5dbd080ada6422f4236620ae37542e794cdb8c04ad03ec53791d3bb1e47b21f2b000f9ec7ea2";
+  sha512.doc = "0a5337740bac6212046d4625e0e31a61af4850212b6c28273f232ec5d39a879e39bb38cfbb4a074f6f83556bdab076cb1b052841d2fbc5b0415ed6dec7f3545d";
+  sha512.source = "11604e8db93761c78c77185d2f9fd2da1f396b8bcb83526f0d35a3cf434e4408ca1983945b18abe6ba3066a1d87a81026df4b0c3ee9eef59c1ccd3acf1909900";
   hasRunfiles = true;
 };
 "umthesis" = {
   stripPrefix = 0;
-  sha512.run = "5db79f468f6699934123c026fc24ff6a12cfc92f068b8a8475504f7591edc1b94e15ceb8764a6e12c90cf66d192a6e10031bd2fbe4300933a4a43e02f6cb5d1c";
-  sha512.doc = "6704c4b910e59ca6d7afe1f0a3bda6cee662a39ac7a29ff5cbd697c117ff1888dc0d99d42b6de9a089d9e35413e13a46291b6ed3be376eebd961494e19b41847";
+  sha512.run = "d9b8ee84f99be8b59c7bbe3c6f70df3dc05ec418e1c88661f3b2d2f11968e1718b0b028ee8d91b6b8ca3d9aec67bf5ed6452646667396a24a7e8f2e733b78dab";
+  sha512.doc = "608ff5e0aa17204f64be63991469a9583cedfecf37e0c59029d03808769225aec2919d58d3bdf5ccf0a44b878f12d5b30ead9943012078aae29503e243e7d20a";
   hasRunfiles = true;
   version = "0.2";
 };
 "umtypewriter" = {
   stripPrefix = 0;
-  sha512.run = "b793016348f89ea380d3deab82feda6a5881a3df5a990e11edcdc26b573789f45d16d9c7295e9a258b42609b7d09f74e5e73ac8e2ef8784f66b762317fcc53f6";
+  sha512.run = "ee7094c6b9ee2d512f93c67e972c924cc3d689bd234fa9af8624a504286858834bbe0d0a182631f9a78c1c9fd603b90408c2caad50bed349b57d3993e0566847";
   hasRunfiles = true;
   version = "001.002";
 };
 "unamth-template" = {
   stripPrefix = 0;
-  sha512.run = "a0326d37540aaad8d62a113cb602dfb809491077eed27ea20730a5240858fe5b03679637623a19f021b54f5389bae5ef3661d8a754c0c655550139b56121c23b";
-  sha512.doc = "0cc7fe3febae9031d42066a5ca0e8bca03b4d8c26f766b78f88c61111b0808d77e4362bfa2c4f9908791a6d01398bec28f7a50b35de9e9fb7c1998ce3528a78d";
+  sha512.run = "63e0abcb8693574cdd84b05b8b3db5d27ee0ee7629af3728025d5c5fe2a934242cb47cd4fc1bc3d31260cc3ce2308b411a1a32286260c36175c06c52e98133be";
+  sha512.doc = "59d3f7caff2930178ae87843246b6422b2c7c33276b892cb5aeef638c56a189eb4a3c6ae61dfe8f59871a55dc0b0b965e6cf9b97401149de9f08517b7b334f33";
   version = "2.0";
 };
 "unamthesis" = {
   stripPrefix = 0;
-  sha512.run = "879a5a2918c9f29111f0c6f7620cdc64a1af6887ff66b66e18df84c35daaba85495b86248685b79435e56a2146ec814a827745716a7546729651de9c93aa7a28";
-  sha512.doc = "b2f0e29aa6ca5a90592a2f4e15fee4e69c16631cc7bab1906fd33419f932dafb186052f978a58ecb0b8178933330d9e28080ffc8cfb3ac7a0e73fed35d6e9029";
+  sha512.run = "03f178f402d9c8d08756f45bbe683a971e60ea40458979d5aabdd3ce9b3251f4500fd042ae1a085ca3303ee9c8c71932629d8c728db9d64abf29cce265c01bc5";
+  sha512.doc = "b17e9b318ec316a9b5bf90f1980e184de2e864172279e102be069342d77a08970b756b7ea69015feab068d84fa6b086e245b7463572c86bd59c5ed4c6bd046d7";
   hasRunfiles = true;
   version = "2.1";
 };
 "undergradmath" = {
   stripPrefix = 0;
-  sha512.run = "6327d3c54c3c923e7d87a0be8de29570b92d7c0b06a3c7fbb09979bee5a5d8ec6fd20c80eebd089431e22dafbe842bbf159e483e9e1cbc03deaa6a794970f2f7";
-  sha512.doc = "1fc9fd60be499675c466a27e91f625c586e1cefa2603014398ce2b7f568a966e586c57ba55fc484843931ad7a42917b19e849541c6ca0e4ca461f814fae6a7f1";
+  sha512.run = "80c57244bae43b1290a63b4e078d707547693d5352d054ed38ec6b5e496722b77b28968904a06023e6d8f004787790fc2c3365cb9559611f9fcfc26b99d20a8b";
+  sha512.doc = "a162d6a95b80ba3e7bcdba37242439ce400a481b1fab4683d4821cf30b18c4a4fd264c3762b9cc09f9dca408c4bad2cd648f386ba5cacfd9ff8ff6622b6f380b";
 };
 "underlin" = {
   stripPrefix = 0;
-  sha512.run = "6b2ad205da01f280a2ab5ae490857d1423ecaef0a403265cf3e158cca48bebcaef4b4ce387b1d8ec402b3abd21ee97b83c9fcc47da5e0a41dc9ad0cdaa51b050";
-  sha512.doc = "8bfea3a9692c01e82ca9aae13c0a8c5bc411408e8062626875fb058ca426b6ee8ad34be03320b13ee4f79ff570fcf3987b481ce7869d3fc0650a36b3d5832564";
-  sha512.source = "031b51426396f7e0cdb05fed7b376cd374e3eac3ead192cb52e9504ac7121c106ab1f57b59f309b688013321a3480b9e2810e55fd58063db2269d7353d9efa45";
+  sha512.run = "5086622372147fbc0a2a1ba9276b35c1941e927820f0d3cb933976fee364df12eca03504c987ef476fbd19833f4ae851e1ace2e3b816d6180adaec88beb76282";
+  sha512.doc = "d5630c930399ecc85671eacd9db0af181b7d428930105234aa8543e5de45f4437db77c0066cf3911f865d53bbc3ee368e39f8e3b7a8dfddc2f8d042bf6443540";
+  sha512.source = "1d41281fe52a1b154bf3c6a7e4fc0e32bce1bb10c583f045e292d297c6c6fd7cc5e5eed291488aa13e51e769e5faf6fef632d0213238c93df9ff53d43cf9fb3c";
   hasRunfiles = true;
   version = "1.01";
 };
 "underoverlap" = {
   stripPrefix = 0;
-  sha512.run = "fade1b5bdd0bc59531953a766ddf8086328a640b7d073f87d0671b3d6b76183a2e0e2bc8003e44d152dfc4248e7ec0139bc90754014488d39dc136c6f31ab200";
-  sha512.doc = "6adc74500968a0a0ddb382150346bda68dd91c09d5c632053d323b73abd88baf66b6aae8a670f54254897195b65b35a3991f730b27788725c10048bbece62976";
+  sha512.run = "45b17cfaae8c14d7751f286f617aaf07867f2cc8dc7a2189470cae24e95e9bbfa91cfd7763763293efca0386a5b897e7a8f51aa891519fa19419fa8899c91150";
+  sha512.doc = "4a85d844b4bbdc28bc2064c9a809d6a9f4fed20edb883cdaf5fe0024c08f6a4e970915ebfafb50cf1376d83129bdfe4873e773119220d47b618208f415305022";
   hasRunfiles = true;
   version = "0.0.1-r1";
 };
 "underscore" = {
   stripPrefix = 0;
-  sha512.run = "fa082b278b87321b334fbeb16b15ff0d780522eca6ea4b0b964165538c3755cb0f83ea9c3e0d25616eebd88145a3709adf06e4e9dde2d611d5ed420c6a148aa4";
-  sha512.doc = "32920104a747036b110f3d93f2013c36f39295925c9956615444af0218c18dcddb1cb163cf61ea43749d1775cb9829846ce6e6cbee1806f36307e5fedc61956b";
+  sha512.run = "e8d870367653f156f53708e91f5022787bfcfbd9c4e0e9be600c4e4dd620489b1dbeec6b1ea7bb0f39ebd8b72b69d99b419850963b5861dfa0d9edb040ec58a3";
+  sha512.doc = "4e5f69e81d4eaca8bcfaedb1af0f5c7e312f335af73cc61344f0ebeb169c3b39164a9da7bfd4790c28ee0234412d8a57d70ec85cf77702cab062a7a66d31d9e5";
   hasRunfiles = true;
 };
 "undolabl" = {
   stripPrefix = 0;
-  sha512.run = "d2229903f6db2a9826da59bf3733f03a9c9ffb21a7d9f9373012df5133be8c67708d38e4750f4989b8ea0b456345da2e0136ed27a3635cb954a9a6da3fcd0a2e";
-  sha512.doc = "ec0838a2e9dbcb7a70a193924183f7183aca02eb75a7db6267690db1328c34d1530a80f52da8f459a6fff60647ea15d33bcfc1c34f501a27e1c21a62f122aa76";
-  sha512.source = "eb137bff7ba40aff9883cb236a730da30c20a272b50933df030b2b0649adec50baed4b9eddaef1673003c1f0ec039a64776f9a2cb1ecddc01fcc93c021c8d24f";
+  sha512.run = "6ad5aa73c7a36627deaf75c675268e170261960e64ce8d2971153f949177a9d1a0e0de16eed1e7eaac8ec024a0efa6d2b97b98bb67f629c9e79a4f13ece25d9b";
+  sha512.doc = "4b738a4b18fd78af720da1cfc4754c494b976e929e53a35893f6448e439acac14eba2ac211e0d3e18a32c515357e5b1141689e70074057186481b2a9dc5a0e08";
+  sha512.source = "1484b8639b88b8a0a4eced95673b404be69fe1f850dcbcf15478833fff68f3c8bc55f76ebe4f33bcaa591fb7e01234b17eb4a46d907f00f7075ac1bd15265464";
   hasRunfiles = true;
   version = "1.0l";
 };
 "unfonts-core" = {
   stripPrefix = 0;
-  sha512.run = "2ec586f37727d8d2683c4d27cfe7da22ffd3eff9b1a43456046b28a46dcf2619027cee230edb73571f440ced65e13fd979363f2e6d4915b39acb7d544234c3c1";
-  sha512.doc = "2982d643ba83df3fe14b937aada73be63eb4ec38151641a19efc91fa8ef11ae90cf4f7dacc7eca3a96e92e178d1e78ac3af837ffd4b9fba4440f96244ac70f4e";
+  sha512.run = "25a6f70ff421456b2692c88d0c223966ed40cdfabffecdd759250c245fce1767c7c140a705a521a02569c65906a1d06fb5827c6601c08967cc8a5d3bdcb5527e";
+  sha512.doc = "14cd0ea078bc420d2ff9b1411bf08774c096ae2d4b6d799e705163b401359f6acfcd6517bcf1a31174eec5e73c44071833101dd402d7d368d9ac9e1441ead8df";
   hasRunfiles = true;
 };
 "unfonts-extra" = {
   stripPrefix = 0;
-  sha512.run = "ff7a1e2d6cfef0790f2d5009b0f2325b06ce420d4795d055e15114938fca041ea25478e1edebad1e245e059f5207be165eaba4838e4eca0c838664e484e51283";
-  sha512.doc = "72f37118a5335bbb7bec3800ed8bf0693906562f481242476a9490a0c64bb6f3fe564b2573bc59b655572ad7489d07f8a77ca4e31199e60d437bdac26dacaefa";
+  sha512.run = "641b46ebc11b092c0bb36be41e1ae7c95ccc9f9dea3825b1ce4e66a7a516ec001fce30c1913b42e62bad81b1edc3e7bc504e5c341b0ec7f02c3f00addd5c9e30";
+  sha512.doc = "bb174edc90a71e6e13264b7ea27b319942df9fbd2401c43f933df0c78a0dfd1c7786b95bc88b0f4cb0a4b817d80599d7c323f34e3ca3215b4a2419aecfb01938";
   hasRunfiles = true;
 };
 "uni-wtal-ger" = {
   stripPrefix = 0;
-  sha512.run = "c9efab7a1294052fb8fd63d9baa690376cae5efaa8f2b5e5bf177770a22ce1b49c1bc76492316c90344c3f9a80a05042819b6442d2caf5699b3439bc7419ed8e";
-  sha512.doc = "10baa9e80faa60cab7304f57f9aacfd376e9dcdbcbdc667d18aeb85f551fdc15957dead882201ef73856058f1f583afa39bbdb5acdf7c9f5c61396a878efa2f2";
+  sha512.run = "ad6c326a82f559d943c4b96c58791791c195cd695ad620848d221729b0b236d00050895952dcbda9a52557fe1ac3fb4c346f619986c3d509fffa7d7aed275aa6";
+  sha512.doc = "45893052f93f113353e1d4d4b8ea658f58dbb8ffda9633c87cf8de1b13a756013f61e5ffb55c2e8a5e8048c30221c873d8c05f30ab2a8e94d93b0beebbec001a";
   hasRunfiles = true;
   version = "0.2";
 };
 "uni-wtal-lin" = {
   stripPrefix = 0;
-  sha512.run = "8c54532c3afa248fc60f13053d2c8b9d69878d04a573f2811721e2c5dd967642cb9932717ec12ded4a2ba4a3140b7dad9ede0921c87e8640525af096617f149d";
-  sha512.doc = "73d75daa2ce6b4b1e70cd15d39f197ae26ee24e4140a52069afc6b6336f71121925053ffdcf6b4b4d74c5c0e2d102011a5349ac57c4d82d51544e38930146ab1";
+  sha512.run = "ad19fe37f8e798488e57e07685832dcdca32f2cbf7b3a02ae4b9431bbdaef1355962d5fdc7ebf18547851523670f46a5a001c125ea0d1495bd64b62daf38e282";
+  sha512.doc = "8e4b5fe0f0c461ae349fd7fd448faabaf803902c19dbf36b5d8947e7cf01be6e8fc47bc58d673c11e5d6232bfca8d5127ab16284a5bf62b5f64c8508423173c2";
   hasRunfiles = true;
   version = "0.2";
 };
 "unicode-bidi" = {
   stripPrefix = 0;
-  sha512.run = "debb96a70304a45d4786abb7aab268ad7a193207c207e5ab0fb3757c0a34aa02bed8b772dbb1d8516eee9d09b31029129b041e16849451f2d4ef9e57163036a2";
-  sha512.doc = "724a0315a5623f40378842c231de85d03165ff83f5938fdee873a66c011060c1b748da4894f57b7a8d56f415674ff26cf49fc508ee4c132b3d94279bc9e44808";
+  sha512.run = "7eaf7b2ba19a7bccfd820337dc2591b7fb394a4feaeab4d40feb58a5ae24f37e964b7c127ce05d3e4a677d11d581c2ea13d736f44b4d020b84eb78a387e3810e";
+  sha512.doc = "c3cc3c16dbbd9ba78f1068d9f577ff3ec4cde162c88e622f35c8d91691c89ee1ce156fda722bc1955d8cabfa8c8ab3ef53af4ce5b126f817ae94dfdd0f30ca3b";
   hasRunfiles = true;
   version = "0.01";
 };
 "unicode-data" = {
   stripPrefix = 0;
-  sha512.run = "f747c6df34a91abfd016b9c90009fcdcdf7f24df0b9028fd0b9495a8e5b2bdd1ca6ec16c3a155220f231acba7d7c3582a4732b7501f38c88147581792d414308";
-  sha512.doc = "fbd500e4afa8c725846093f2a2dc7464f0ed75b6bd50e9f2864afd29fcc9eeb660898e6c2406f3bdd69bc881b53318f7b69b0fb312579415458f2a28c899d90f";
+  sha512.run = "a0594897023fb617b702716ed8cded7df5a5074f73390fb6b7a0f76998c831335a7356b68fbea2a9f49121e286c9aa5d0a562459ed08136d6fded7ad96157b04";
+  sha512.doc = "5336adefb7d0909d4131331cfa1370ee44155a762d6ebd58c05c7d0b5116903eb65f5a6db1dbb3a90dac916f680c9abd5e0143aad761a465ebc5251f18d904a6";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7";
 };
 "unicode-math" = {
   stripPrefix = 0;
   deps."fontspec" = tl."fontspec";
-  sha512.run = "80b619f109df7f24765c2ac7c648c99e484f60b7d1ad74afbfc01ee4b22f5308aa2fc2630ea091ddf3ca66a2b29950a3a4349697af9cb0aebb480c2265b7f909";
-  sha512.doc = "ab606cb63ee5262e04727ae27b5e0826d33096cf87731c0130605b485b32e02983b8e5643e0fb4eb8be6610db52c228f200c1e1fb2d569451d8add118bc9e096";
-  sha512.source = "579a85ddcd7b5ee57a928a1bf7de26d9dd29c8c61d98f14896e347eff133bc213eb82e7c1f8eb6aa54ab0c8ab7624ceb01b203a0cb07dff177efc2f0358fb7dd";
+  sha512.run = "f00b3cd2569a15232d7ce01bc77a4ea02a3ebcb1fd8f6cef5c901a68a68757bc9e49ea84897ccdb05a902c3afd0a72603ab4b991b6a56338abf9bf1a6e5911f7";
+  sha512.doc = "d79a62dfc064d17feac121bdca1a828e2b8e2edc98fe551d5a6a3582b021e9f76a53332ce08a965b72255c08707abd672fddafbe5b357ddde113bd45125bac1c";
+  sha512.source = "77c6c0992fa3f8f1bd26bed872153013abd556b34f8ccbf0a4eea50dae25ea5d3c5bd04f2b01456aea75e9d071ac9063677ec6aa84dfb7f913532a02c7a2a792";
   hasRunfiles = true;
-  version = "0.8l";
+  version = "0.8m";
 };
 "unisugar" = {
   stripPrefix = 0;
-  sha512.run = "eacac714260f47badd945b6efc2deb863246157e66065a70b6c6d877473cb6977946ac9c2ba7dd5287e26ee49a1dd327d1431138905ca53007a36cf395d283f4";
-  sha512.doc = "c6fafe077a2dee4e5a4add8a24626086c42344be31781443e9be0dbf213100b709b8f886187e96b2d2300a5eeff21c6fb6dedba2f918fd78fa4235ad465dcf0e";
+  sha512.run = "4b05bacc34745c56160713370e907c15e09c5f2a16d64465fe91993586d680c4d451c2d4f199907a017c63f339fe2d50f8a6d90825284c16f8423efdd3ea3ae1";
+  sha512.doc = "1205afb4e84072c918d22c05b32e8d48963c08db7eac6f71268622d2d1c4d4a8430fb2cd0775e9182366fee88c93b1e9f633522110186fe064301863f105fd07";
   hasRunfiles = true;
   version = "0.92";
 };
 "unitn-bimrep" = {
   stripPrefix = 0;
-  sha512.run = "c4a00747cc3c45b43ff1708e8758fb80283580b0c5a2a2f4e768b5ca212c2213e4ef43a58e5867baeb294312f2d04d409d7f5104224cd50f6d9cc301565d502d";
-  sha512.doc = "a73cf4f5ea693c64dd4d1fbdeb712496f3e9a2487c7d2dab585e11a9896265d86cf1c2c2d9de28ecf9b3d86b50ea01a2cb2331d93048347feafde0cfbd00fc99";
+  sha512.run = "f224bcd89abb7e22a263a91f1dbf3a7a23fd1f852a5f8fe68693557bcdc513daefcbce3880a951e12fb777a159be6adf5913d05b783eb6ac282868ed282e3419";
+  sha512.doc = "bfc5d6361d427eadbb346b6f75189ad2c3ad64dd78fc5e333127c7b6b6706c80780cd05a0ec64e5687e5f1cab0f7ec2ae449235369b8e71e4ae37065270f03b6";
   hasRunfiles = true;
 };
 "units" = {
   stripPrefix = 0;
-  sha512.run = "6e636879627c824c52a612b086377f5226821e6f09c6e4d1d8229e28916460345b449a7f7fa64502a82345af5c36e8d6286e3f2659a408b2bbdb9360a946e01b";
-  sha512.doc = "192d6ab08edc98c12c2ae8d5120c7142e30f240ddd9fab7b976a501f08203ffa4b07ead9b0e80d452210c88688b90ff12891ff625f22886f714d97419492bf71";
-  sha512.source = "1ac901f632eda7e6e30227a0fc3917d59c12ded1aaf0c01e0d6750ffec61054aa696536f1d3e0deb4b33c5b92f3682f84c652f817f957301795337039e3eda7a";
+  sha512.run = "28f2a463964c2e2c11f4c80a76f30fd2e499fd85ca15d9d05f367fe11faf41d578953a72a09a1c07d4cd810873acb06c98df736f770e4f2a9993d9177ee3dbd9";
+  sha512.doc = "96cab20caf466acf264009962380470a04622737ae8d869659a2d29a99aeed685d7e226a6602b268d6a822c82cfda482a662b0d6f75a16d2767030ed2626a4ec";
+  sha512.source = "ecf8b2678e3639cbc043490c13c4c538071225af2fd2a80ed4b6827608f597e0eafefabd9a520dfcc3fd1b744c3a28ac7abc3764cea77ba1f5ca4b0962849f2a";
   hasRunfiles = true;
   version = "0.9b";
 };
 "unitsdef" = {
   stripPrefix = 0;
-  sha512.run = "e593b0b97864a802e3170518e94a64dd0a99d7722ddf31d73448e2829dd254690275102bd633271cd1d75701310d402ca0ad5ad1cb46cb9aac1498373d12cc1e";
-  sha512.doc = "6b46080236572743089334e3afebc1b7348accaa81c803174843c074935e3ed3b20276707ac8e62ce74ac764813892bc9bc019bcae513f7d2f40e2ecb50ddbf3";
-  sha512.source = "cf5fc216e8e4a1e047abbc332eec26d6da2610dee09bdbe77fdac464024c0a94d2ef2abb234c493f00c4699ee66131a58aaa60bc308d285256257d1efaa8b25b";
+  sha512.run = "3a8c36e547e4e0b52927b73cbba04b8bff5b36f6a5b83e2278c6be0ffeafedb5b5ee636c4a9aace4aab571e46e914fbfae67a9332f39795c1c7ba8452a87f8f4";
+  sha512.doc = "f3b37b47bc2549397b1677bb45f74db110968788ef6dd907e88648c35578f2d75f74ed69e6313460ebede5f684fde1b37cf0e38f01831587783bb3a663ea1622";
+  sha512.source = "04308644c930404deda79d1c325e1fe312c47cef447d90dc3dedf06f22dc90732ff66997e1e37c4877c7d0b95a6500e7ba2d2fab1bb0752e5d3a8dcf45b60c5f";
   hasRunfiles = true;
   version = "0.2";
 };
 "universa" = {
   stripPrefix = 0;
-  sha512.run = "ef3a39ca2859694c99e1049c4aea4cefda59180e65f55e9b0dae2473b940bf587f6acd48f3f43146e82d185583213282886b857d22fb70a203bb6b1acdb2c164";
-  sha512.doc = "e7781aad2c8505723508a21f377fca8d01144348c873fa57ef2659b9a84d7f0cb6369712bbba3100b23fae8ef664d321d3fc8995b4a8f027f758270fd5c2a937";
-  sha512.source = "f06a93e8f2322d8ad3d3b5de9e8cab99437487e0a84dc6b55cbdaa14619660c3aec2c5c189b4bc17a62cc6a82c90ec56aeedda219226344c010bc9117b5b21e1";
+  sha512.run = "95eebe4e3ca3e3af35fafee7f28de98ccf2563168880181f9575e2278d36b5adf19afb354cca515cc614c27fad0593571b2552687cd6a2fcee2bc3d51df570ad";
+  sha512.doc = "0c63f6bc9661743f13ed20e091f25c71facf04d73dcedc703ff0c56ef5922c8e3a5788596143822fd0dc2bda021198f7c924949098bd0bfb9b55118bb421af33";
+  sha512.source = "0ef329aa2d1921002e1d0b98a08fe966fba0679eb7481fa74485d7746ad4319a78e63eece6694c13047b6355e3aff865881edab7f9519153465fd18311b15f6e";
   hasRunfiles = true;
   version = "2.0";
 };
 "universalis" = {
   stripPrefix = 0;
-  sha512.run = "980228057b0a5b35cc6e88f5a82c6fa289300598be900f2984476f927a802bac63056c901656734a2b8f5a16a9f72f4633c4955ddfab368135b46ce196e3bfa3";
-  sha512.doc = "0060a949aa85272b75160194b21b94c5b280fd4df386722c43505cdda5639208423bad41a6758a8690bfa9c60a49913256dc9607e9ebaf6f2c917ddaab51f900";
+  sha512.run = "7c2486109b3668f40cc8ad4c6fc6108371cffc75b8a483ce393bbf174fe5a49f42fd2c0e22cf2b01e916a5cf5f41f3b45f32776514eec9e6d2f46236e1bb6fd2";
+  sha512.doc = "3ee5d3b4c3601aca78af820621695c64ef17518cbc44c934a1aaca098617d30df8e35132287066f514d870f3c7932febe63872f226d191c1f6505fbdb31b182f";
   hasRunfiles = true;
 };
 "univie-ling" = {
   stripPrefix = 0;
-  sha512.run = "521f2591a76e5ba038fb058ac56507fd740c9f825a4fbafdbd1c86d1a1a739fb464976eb9cc36f0e46ac38bcfb6a8554a5887ff9a975c324a03b356fa047aeff";
-  sha512.doc = "51603922bc0a7f3c101d07146d54162e1ea450e3a5d2171414af1c13b3968fae862273cc4846793650dbe4cec3fa1e9fd39081702a138d0aa58fe599bb1189aa";
+  sha512.run = "70d5f389f9adf71c8281952a2123ef37c408cd1a22545d8f343f52d0ebd963d36ae626c63f354bcde273537f30fe971e60919e84fa82bb74b8bbd966bbb17a2b";
+  sha512.doc = "5dc246fbbaa3f5caf2260f85951f99dcce27738e94a5ed63279a341b006d5b00998a772db7bdc0dbe71f4a7eaf1f8530eacae1c8f020f3d2e6704509c2aac523";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4";
 };
 "unravel" = {
   stripPrefix = 0;
-  sha512.run = "3d8032b80c2af8c242ffa38a7d21adade61ad3d2e086b64c271eab1c2f4b174651591502a9ce85089d7254b97923a9f781431613b4b7a0827ec6cdad8d1286fe";
-  sha512.doc = "b8f55b7607b9e13a72e5ecf2b03bcc06fef516772122d47b88d33fffe24220b56a8a4a1baad6f9c1dd357f657a3113827e348ef9f089d3f14f4502f1da5a271c";
-  sha512.source = "2633d33c3d7e239bdb3b2d6b41d8795f8c141e1ad01f963953b68ac10ed41b6d87762178af259ef2fefb6b1cbc1320bb9ccafaca486b160675fee761a9e7c217";
+  sha512.run = "ecfbe919d577394f62ae58b4b7f49c89dc09fd643b83e74095ffc362ca4c40b5afd2e3545aed0b7285f1361ba45645ecc25d983ecd20c62bd9ff803dd0b7cb8c";
+  sha512.doc = "ddb524fa31a98063428a2d5b1ce15191c2cfba061e5186a7470c345ab08d9d1c88911af6c996e90064fd0ae7cdfd283fd949dea0c778bb6202f909cdfc16f648";
+  sha512.source = "4b2a12bd3dfbd290bf65902d34e6bf80590e0deceee7bcd058b9ef717a3712e4bf4732253cb876db70847645544ea1dbf600d86ed08f7e6db59be0ae07e0a240";
   hasRunfiles = true;
-  version = "0.2";
+  version = "0.2e";
 };
 "unswcover" = {
   stripPrefix = 0;
-  sha512.run = "e4a16657065c07c451dab4759bc1965a6bea0b3d464054281b8c00533e85538ef9da647b81fd85b513c630fdf57c178e047c862128e0255a54be0dcd992d4771";
-  sha512.doc = "abb788aebbacd95a27e5aa131d4a5bb4cf44557bf809e69aefd3b2f626e37f1ba9e8a8c227d34fe49bba064779e225546ab98a22e841c9ba96d3692fd7f4c860";
+  sha512.run = "f11892e323581f99921d0af0f70ee0087f7fda5d236c0f48b74eafef1bdf24beff32d109cebbfe71c849427ac06c376cdc4ad54b271f7463810c1cea6ded55df";
+  sha512.doc = "bb927b45d50cfe7b89fe483647d33a80ac720882fd171feccaf5f49ea2fa92479746b25a1caae6d7722403717c1677fd401610e2b59519b738854d986d1818e9";
   hasRunfiles = true;
   version = "1.0";
 };
 "uothesis" = {
   stripPrefix = 0;
-  sha512.run = "3ef3d27220e4358cb89901fd8b0d77ad48d89499553f8cda17aa7a3107d560b8a4292586b25352b111cc215eac5357d01ba248e5cf528aa76b2270ffb7a5e2d8";
-  sha512.doc = "6f0149a8a3ff6b81bbd109928b9eba488c220e74dd61a8b427b51b94151b15e5f61e3e01c5413c1307f4e11f6c0af7d48c6cef48b741dc8ffe0b6f39c41c6acf";
-  sha512.source = "956fb1ee399aa5859fdebb2f0547c41031554a7de97caef60d1c156c6e5bc0e374b7d05a129583ffd4d24112a77e4ba78bf7e6250277a126cdd2674322a08f30";
+  sha512.run = "a5b2ffbef8aa8998144247e45613018fb7ec64a0f82a8f7d906f65b8e03c807ee8ee093a81b485d0e4e65b89289fa151bf9ef5a50dafd2a0621c85cfe8a3c81c";
+  sha512.doc = "b18be526270ea1bcff8605c6ab848dc23839b383bcbb1d6970c21c3c8116270b83408989abfefd0fdcf53c9156ead435da8407eeb06e55fbeb7e14fbb125e11c";
+  sha512.source = "1370b4afdc919d78616108bfe3b43467355a96fa9cda9d9f947644524eb91f62e4813ed1223e5d1bd22057cb2ac7ada0b689cce3f4f8a232d2d08844d774949b";
   hasRunfiles = true;
   version = "2.5.6";
 };
 "uowthesis" = {
   stripPrefix = 0;
-  sha512.run = "7bd54c377eca0c8a0b4030c5f25204bed91f87db37d4ac2e0f799db3a46e58c89abd4b2d12ba7150b51f43b6046089f6a8789b695623c555e63c0be3d8bc28c9";
-  sha512.doc = "2b093510cfde10151c4893341b8d95d4281a59367888b73f8cc5e83e1931d61389930605931200e6d9f02f3570d5ee5eec054472a6067d3942d54e4ab88c14fe";
+  sha512.run = "f358fa5fda9f1a4b9c922a41688c28ad59725dbe842b44b6b3f4ffb95d2e8a722fbd231623b38d3bbf3db83f0aceea8f52d252f7ca1b36d5c8dc4876db97103f";
+  sha512.doc = "5a9df90acd930c299a8657d17d3e5ce48f56b6b0d5c14aa133013b0942b94a096478017fde294ef33cabd8d248f07af633f5776518c0545ae85e86ac16e0096f";
   hasRunfiles = true;
   version = "1.0a";
 };
 "uowthesistitlepage" = {
   stripPrefix = 0;
-  sha512.run = "15406d9b837a284b9487a4ebe9d2c98c7efea671e8cff62894d7ebfa8bd8078233c3968ead63d9422f971697d1a886ffaed2515b5dd5329e8fb71816db6c27ee";
-  sha512.doc = "4c002e2ea1f1366b0cd83a2aa1b150c760ce819d0ea7b03d437937c48103a359615c7a4026f74c4a9aff39101abcf99689857d31fde6b30c1dbd6c6c0e8582f4";
+  sha512.run = "e44a61225ca9341a5301fc7173752f7aec582c5bc4e43bea785a57ebb76127d1df0a4039b3ab88851d5f977b5faf1f6314483998d8147d46358692ab58dd9b7f";
+  sha512.doc = "f2469ea483fecce0130ac9eb00d6432f0929e9bba29bb6409629e61b529ce850aa2277f55b4d10404d273a7bfed71868cd8cfcbcef6c2058611dae4750613c2c";
   hasRunfiles = true;
   version = "3.0.1";
 };
 "upca" = {
   stripPrefix = 0;
-  sha512.run = "f98f6041cd37bb09dce4b1be267fa45564fd0973749850043ea372eaf536970be36a729924f24bb946ac3992a2343de76a1987b93832b6180ada447508275bf2";
-  sha512.doc = "4eef00c398997953c5547dcebee2297d5ab2c7f6a70d7515e80c40a163c23caf4e38dc3525681573813a1069b28f3499fcb65511b92430638159e1ca0604d2d4";
+  sha512.run = "61afe08dad74b10a805dde5831f741135e9ac64f061748e4b3d5fe030eb81bdd37cb82b31c65ace6c98ec94f399935eb9de48a0af950357e078aeab8a89c8018";
+  sha512.doc = "3924171febea1a2d9255f0b93a2fdb1ca826e5662f4f8134d8351465b097649b3b295e0d1f1227b7c90ccf1a7e8a16c3dc97ae03475e4d9a0c5fab51b74de687";
   hasRunfiles = true;
 };
 "updmap-map" = {
   stripPrefix = 0;
-  sha512.run = "3b0603407126eb41edd7a6be8271a2d8f0ea5669622c2471eefe891e0875ed95e2fc168aaab2db1e13a084e0fc029877ef021d80bcc96bb9327ec3ce7a446c24";
+  sha512.run = "8ec5a0ec7545b1b2d4c69b122f78b996075dbf5e6506a7f459e9e2bad7a6c9456c48ac0306173544b35910968c00f9b18de3b7063242b9913393ee327785d600";
   hasRunfiles = true;
 };
 "uplatex" = {
   deps."uptex" = tl."uptex";
+  deps."babel" = tl."babel";
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
-  deps."babel" = tl."babel";
   deps."latex" = tl."latex";
   deps."latex-fonts" = tl."latex-fonts";
   deps."uptex-fonts" = tl."uptex-fonts";
-  sha512.run = "d029cc32d2e1a9b2cba3cdb4571d69f718cb2e1f438c0d93cf62a2b5e0c9b7dc8da48df7187a820a4a20ef3f0596086de00fd570fc52f9e972ed1e18b07cc296";
-  sha512.doc = "6baa4991b27af95149bf3d1008231ada28468f8bcc5b22d13038c5b0b6890b0e9288f98a27a89fe2ed639c4f963d292ff8d4a9b9ccb2eb7176df7b45ca7a3039";
-  sha512.source = "07ff77c2c1ba7631c3f195e618322a0e4fdcb411830a3d514a5e779606df316437f82fdaafc136a78b328bb9a9b13338b31542db279b80294f7349f91dac87df";
+  deps."platex" = tl."platex";
+  sha512.run = "17c2a14fa7842d267b965e9eafa58e9e431c2528bbfe50aed58c1eed48a0724fac5973cd23ae92019c5faaf7f9e8c85fdf9a8b15370f3ace95b7e2125281547d";
+  sha512.doc = "e613a2c041f211153733fe0f4289b25e2ed0e9874452e9de67d041e371868c5706b1efda627c5b2957013e3dcf89ffb0053482df4de634a781198cf877108d38";
+  sha512.source = "77f975350f829290455d8be919aa652863af076666364e402f363043d942766b5933a93a2b834e8d1f48e0de0570037e21a621db5955a9781d75c8103b924158";
   hasRunfiles = true;
 };
 "upmethodology" = {
   stripPrefix = 0;
-  sha512.run = "be5b2f86cae1be727bdf0d1651176f0003fe96e5d9884fef6b1b440443962c45c78776612018887170a6e9c9c11d17d79f27b885a9f283228506277dd7ba98c7";
-  sha512.doc = "42081c0208885ede3e74a01dc17185c35b76910e61e2d13ea1dfdf55a789ed86fe0ac0eda569a9a68ead333ed007a711c5804fd4cfef2043590d1a02c7de4962";
+  sha512.run = "dddecba9f1ce6bbb3b74519c790ca269d63d0a801feb0135836c0462bc74e63bf82d8e60f24c95709211f43e62df224c22d846436974afa790298bd2dcfa6f75";
+  sha512.doc = "3409b4192bdcc27d9ae0c69163037980fe2615448805e921900751e8ac66f93bf46fc1a4c5a347796d8c993fbed199fb9b0a4b2f7cf2e76c4b24375b965ba64c";
   hasRunfiles = true;
   version = "20171210";
 };
 "uppunctlm" = {
   stripPrefix = 0;
-  sha512.run = "81a726521b1bc06576bb51edf7bc3da9acc3cba36da252ba2e2921baf7d4404caf0e8dff4542337df4c0c7ce20a26bef240d1dbeae6f39a5705ba5b4af65079c";
-  sha512.doc = "6c73f22c89024f3d4e12b90610645a88355ba8353a7e1e8fb440e2ff410230b581b4dd8633d7bcd71ef6500d7d6d3bace3d37a621355118ffb125920eafde089";
+  sha512.run = "a0d57274c66c5f8ac2aa200956d6143d129ee48daca1203f37186d61f0b1d6b2417ed86cfe70216e558b17322abfb95d135f9fe2bbe6b9a683c9bc5cd4dee084";
+  sha512.doc = "b0f29edae73cd64eb50b06de6136583f2e028e06b89fe9ea3c01c7a0cb6154885f8904fc733ff8c6a36577f1d2dbcec953ec0defe4b9937836c389b5fa02a935";
   hasRunfiles = true;
   version = "0.1";
 };
 "upquote" = {
   stripPrefix = 0;
-  sha512.run = "3d767e4155037f7364645f402e1a12351a231650dc3b85ce6f532094fe9c63784f760620b7ea63261ab29ba920e69d43e3d867269fdb8c9893d48c69a101a5ea";
-  sha512.doc = "cc00ca9fb80a4735b5b89e15ad33e7b581f72ce6cfa5582e7e3f58be9a5b19a36c4729d5b753d2081d2f5479fa80fac80dbc4a27b54000ab2a7c3a0d67de3158";
-  sha512.source = "65d51610438d40701494ea7b69dd6246da14a082766fa87a081307f1ce0a76992fef998112a49b8c19c439dbd8435ba97093087e38a7f1580548af28206f0738";
+  sha512.run = "b66a26aed2933068525f7822f407ee31909805a80283bab6143b83a5260f75b04f74d27081782d81a6a05d8e2857d0219bc5ec0c64298d3171138904bb7f4e1a";
+  sha512.doc = "e8912c7dd11a0825eb2466f857f4b310472e6dbacc223f93738af04e2882f59e1c9a92cb110a2ff557fbc978b273afad5aba4154a1c750c70dcbb0078711d528";
+  sha512.source = "cc74cd741ea9e280fc08c10eedbee67d0a293c16c9693411afa5bc080c55b6e25d1d2fb528aa95a09b1b7f044c182dadb795f3bee0adecb3a257dc4665ef1e56";
   hasRunfiles = true;
   version = "1.3";
 };
@@ -26317,725 +27041,739 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."etex" = tl."etex";
   deps."ptex-base" = tl."ptex-base";
-  sha512.run = "46949e4d39d63844a994a81caeb66d32aa27f89365b3e5ed1531dcffb73fb7edc833b9aaae01198abb3ca5c88dba5344cce238b83bed5e91e769ac7ee41ad129";
-  sha512.doc = "b30cadda6a2190de0fa2a64a578b286e021795f66221df61c1f3a23ebd513f94f1c687d89eb7d9d3b58e69311b4356a6c0bd55e1f4683bcdbbf0a0a82b3d68b9";
+  sha512.run = "c0395e78834da8d5e883d84815b735b438a430a44882b080defb3dc97a511fd11d9cf3c9c4ff2f5943a3251ddd28e4372889b18b0caec101ac7e27ad404d1982";
+  sha512.doc = "c6a798c02058c41de3d0e583497812ec4459a86b31283281856c6a3e387f70cf08c0e6f4c38367960a46f700b2cfa0b2bebdb22cea1302ca5ae2b310b56806df";
   version = "1.20";
 };
 "uptex-base" = {
   stripPrefix = 0;
-  sha512.run = "8f53655d3f9a132a1e1b79ef20cf4f3261b2b9665c37bc4c1f96573f6082e9e80ec900029d36aeeabf2624e532b45c9e813b2582fd673da5d6e2a8dba2d2d019";
-  sha512.doc = "09d9995ca57e3c74dffa38c8436d0025a34806ea56ffda7378d9eace10699ebfaa8905620256234f3e5bbf592bb477b21dceb70da75e1f7036da9e2bf6c9ec52";
+  sha512.run = "c00436876871f95fd07ff8f4c8b3a03817f72dbc5595f64a00c70eba801a0a859121c7731e9b2594e0569e19730deaca6bdf924dca71b2e38a4a0f58ca3d9428";
+  sha512.doc = "aa6c0aa1dacb82fea01268b8468944e52d02d33e7f13b7dedcdc217b73ea0777d0691e7e22ce98ce834173d65302f94f12289123da849e28a16763491ddb16ac";
   hasRunfiles = true;
 };
 "uptex-fonts" = {
   stripPrefix = 0;
-  sha512.run = "f01f63aa7cb9ef68bd8a053c4e7164b502b49a6660a20fbfd13549da75fc90ca057e0ac8566509013700dfab9ad026f6f61b0c3b33648a6760ffc8d99743622d";
-  sha512.doc = "8a5912742d52edb89eadf781a7d07f473cec54ac5edb16332c4730af42c6f60178c9f95fc1c5439af79e375af071e25fb43083b54fab4f14377ee07f7d2d48ab";
+  sha512.run = "35a766b6239e67d7af1de1b5137c9693c2e2171608f8c433c31018ba9543d3fdd7da5719cc8c49e85189d57edceb4646201c5fa93a0dc4b2b50f949d597ec40e";
+  sha512.doc = "e0c752979bc2dc8a0994af2c632c2e97830bbf736319ece2d1edc93e7cc47adf908c1f3edbfa6f6753e1f2cae25371ca1028d7191a008547bb53b3f2045a9f14";
   hasRunfiles = true;
 };
 "upzhkinsoku" = {
   stripPrefix = 0;
-  sha512.run = "eaaa272f278c014bc307f790c91b5992eed81b7252ad04106de577825cd4880e84ecdc2a6bea595d833d44bd6591dc8bf89c6074b266aacd8aa98b3e8c35d714";
-  sha512.doc = "a7e355217b66cf03b3ce9cbf39f4d86a1e7a04543f3a34c1ba6e0b4faf42e38e3a8d238c3bba70e130f0e23b431d5555741d86bdbc3fcede5d7b53a0cf778b63";
+  sha512.run = "c4da9bd204eb0ee7f75ad2ea419f92d19b834a71e81d7af5b4aebc6643d6d9a505a6b97b51a933e3ca31fb5e8c0f0722ff60ee5912095eea4c2308d16332c2df";
+  sha512.doc = "15aa74ab601072c0c76982ca580ce3446a608d0d74072bc5e4ff9377a5b3e76ce769901df8ce0d7260554000a1270b21d443335a2dfa48d49e0ca13c7c9c0f4b";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.5";
 };
 "urcls" = {
   stripPrefix = 0;
-  sha512.run = "07fe9bf00ce0450ad8c71c565e3b15023f1f13a5357b5b964699c1370a24af4838c700c223bb50de7f29d9309ababfd13eae6fc40403179231b0776e0faf1997";
-  sha512.doc = "f43364e37e164b85b063df0de0f9fddf445e61c52bc559ee321f7af19b19233097f4a6c03d9b0317d0afad725c193fc13c0252cc07e613fb65b3f5ecf55fbfe0";
+  sha512.run = "d8576b6df821b498b23d706a16c320cc147eee9f51c25d1bdc54a73faf61a3b26c9853646db223b6b5d06bee799690658230634fe757c1321046f36955f4e9bd";
+  sha512.doc = "741aa5f2de314d980c68b397c5435068c008d3ac91b07e8f03e7cdf84999bfafb16548aafc74ecb9e138948bfee7290e779e104b78611a6eebc95a06227aadea";
   hasRunfiles = true;
   version = "2.0";
 };
 "uri" = {
   stripPrefix = 0;
-  sha512.run = "b87b29ca3612b66ff486dce9f25b5e34c4870b425ee3a772ae9e0e5f09f6632896159bd63998bfb5f6006a4d960f2f6162c9a9f1d048e6de163ec56e6320a7b8";
-  sha512.doc = "78957e02114b403e0faa96461fe5320f0f6218758fc65abf10b200f73f5197b461ff8092300c3c45e66f39e4aa856d23bf7510d42d91f6192ac6c0eaf3701646";
-  sha512.source = "9f25e06c9bdaab51454e8203c15c83aa00e27ed39813fe709db7e6668dafd18ac5b47e55b22d244bb3dbf1ce7c644abe3147645ee11ace65b2952ba1b23f9671";
+  sha512.run = "7577ec78b3b77f82d69603023fb8e353d7de785c30c2ebccbc6d1fc480811f8ee6b6c7373830295419809cfd5937e42fb9c81ea125d5edb3159d1f56cf7dfbda";
+  sha512.doc = "9b7a408523bc852ab0438f296fe37d5ebbd5313aaa6bb687233fed34f8d15383ddb6acf42773ee559ba5460c481fe3d751cb41c01f1e018fd056aa497997f0c5";
+  sha512.source = "52f0bb1cfd35cd204d85d388f976bc416c0980ecdb0400b5438709a33fe583f6245c353a9883b8c5b978b3c1a5ff39d847d4ce3cf88a21b41ff441eb4de0d6fc";
   hasRunfiles = true;
   version = "1.0a";
 };
 "url" = {
   stripPrefix = 0;
-  sha512.run = "a048f7f0d8c658862f0beba21d5c76508adf887dd9530b410082c99f6ed0d04c9e232645c42ce42c55f8fb7732226825955e3cd5642d7f20a8c916ebcd906a20";
-  sha512.doc = "ec678563ea26b5e013d631b9ced49c870f95556bf9f29259b9f35e2ba1a25150e613cf7fd7cf03e12fdc2323e2124dc617b3cc3bb164a9e7df2365b252d75858";
+  sha512.run = "71d250915fb64e6b2486edbcec98040b510668d05678d2486acf35108e86b58f4079d154b4713d9f313cfe874507abf684cce3d3b744df43fe96df56a12ae498";
+  sha512.doc = "fc8794ac8a58dfa17b2e54782edd90a8698d2a87db3b0fede21dd476693ebda20d7478687ca0a72d1c5beb8a9d6ecce961521305d0eb4ff26f78ab3e53ec79f2";
   hasRunfiles = true;
   version = "3.4";
 };
 "urlbst" = {
-  sha512.run = "2ecb34025d8f321ebaf1d0cf9efa2b6a26b8b5d06d89f024defdc6c9cf9ed876fecd0b8799abd8ccf866d1b526d6f612dd1fdd643de6023128a613bbf8f57037";
-  sha512.doc = "02876e2d1527bb368af941133d5ff7ca5beef914758524b098e0b747d42ca0be10248c8cda91f66e3a6ad068e74c3bc4d4cf601bc499f988f5d7052a22ed365b";
-  sha512.source = "d39b25fd16876c906bb5c516be6e610a6c87328460b566d0066bf3b8b24e24d0e0541b60d88dcbb7a0dc6ec8958d0b83d6545224b51d149276260372b0a4a0a8";
+  sha512.run = "9a15845881da342ad2c950c1a7973af53edac11fc6812e59c5d8de7e59271b4c1775a9c073edd7c34d4171fff454d025f44d114089be6022c1128ca093aeebee";
+  sha512.doc = "430f93a3b21bc318bfda14b45d4dc3ef53a4e1ce345c7d86d4ae05592afb9f0a2c8a9b7e23b00f0426059846ab6e2c9d6d43d9d124285ac097e0e29ef8cb47a6";
+  sha512.source = "ab695136d3c112887b6752f5852a4c8cc5d5c713f356a68e362500bec9e1842716a9f27252165bc91114ba534e4e4e8b25382903cb39135b3c42269da535f920";
   hasRunfiles = true;
   version = "0.7";
 };
 "urwchancal" = {
   stripPrefix = 0;
-  sha512.run = "5909744feeed3027944b57763a74ca6624465f7a57c3b6d13e53f7eaefd56ec0b1df36abbf6a23558efcdfd267f701182890b7160571a949eb713ff76393d662";
-  sha512.doc = "189f13023be2d8eeb732b643d808acbee6ae844f36a12f54c080f506f1c6bdd72fca96fa53918b1b9a0ab532f0e5f26116ed56a034fed8e9aa7cb163caf9552e";
+  sha512.run = "5c69d8d55736ff21fe445e6f4dd257ca60607be5c7103c2b588167f09481f1aae8603a7e3f946371c5ac007558234c92bfa3e30ab1d476abba1681e5ae6d537b";
+  sha512.doc = "c186da4fc4f6d7e4c0162f7b22053da4ee05aa3c45e3d96be379f703b03b0d20ca609a73616cafa329a5fec4d458c9f5638dbca42dbf54deb5046524dd0bcddf";
   hasRunfiles = true;
   version = "1";
 };
 "usebib" = {
   stripPrefix = 0;
-  sha512.run = "de17d06096457177df9743dd65a1df2c150aae1405713efe0c59d9b0bce56cc0b0f3532c6b54adc5d0bf58beda89abda7934a9a1eacb00b4e3410d70793eacfe";
-  sha512.doc = "c60a4095fed8c455270c95cf2215636344d90c00d1f79ac6273939a1fcdf19509c42bbd2347391c323a832ac106744d49c961a215d16c56b98b8763aa2569429";
-  sha512.source = "b4947777346c3475be56faf5da7290aae07339885cab76d40fff28251c4a1eb09cadfac166779bb0c29c64df7c04775f7cabca82293d141da43b3fcecc14bd79";
+  sha512.run = "906022395242210eb8cb9966e979120c14b22073337f6f9926b78955635f60e86ccbc5a97e8de519cbfa6eb9e4d39e21b326ef3435e9c0cc4d550544562cd423";
+  sha512.doc = "a8f26c88ac142cda34e9cfdc0b7492a4432c432743e92685764958a4f02d9e1cbec7ea901ab572873df791e40319638814c05951a3d72886f8611ee22ace39e4";
+  sha512.source = "97cd15038f55d589930860fb5d9d866aa9357425555c5ff8d91c1f81b867ee565d236bf08fd4715e145645a92715df232c04beb6bfe29e6bc1b45613d05c73d5";
   hasRunfiles = true;
   version = "1.0a";
 };
 "ushort" = {
   stripPrefix = 0;
-  sha512.run = "bc70323d807e36c9c14e546eb85f7cead9c001b451ff1b23cdfc7b0b77b6a4a8195407a0914649ce88363e435187468a990a9ef456e450ef6e4cf8c761250795";
-  sha512.doc = "776d23ebf15049b12fcd7c3a611c11b746df3309a4953405a60dae2ae7b9b4e26cb547057e2eb37ccc1fc8f3ec08443cb8a674372d837a2fdfdf0468bf040f23";
-  sha512.source = "b6571b106367c793e4262d17f6802d2654848293e301b69602aed64ba2adb9087c14043859a26a0435443a2fb9bedf2f8b18d7021a1a0dcceb3aa345f7762e16";
+  sha512.run = "8689be17fd5b62df28668c76616ac622f6f6fe4a7739c8fbea3cb12d137d59ce4c608997c056dc80a15009270d30b92386922228f5e80b50aaa1205f7db7797c";
+  sha512.doc = "24977660595c9fd0a293ff76ba3cc3800806dd99320c47e27328b66fc4fac50222107b0f969c67aa1dee626f02dfed54dcc12e15362f94169e8faecf9061f73e";
+  sha512.source = "fd3b2dfbc4a4a8403fec9fcdd452eb395285d7aab49ec5522335d60d393a425fbff99d7da4d3e4a4ed5d17e9b796fb56c072790ce1340a15ed955f4f200156b8";
   hasRunfiles = true;
   version = "2.2";
 };
 "uspace" = {
   stripPrefix = 0;
-  sha512.run = "8c0638e93a5b022721e5fe4968a3a4ab7833bece542e926e6c8de58c42364b9bf247180eed3cc20363e310ccc2a6f9f6a8f8ee0515f40d523a50af32b654db07";
-  sha512.doc = "e6479beae605014009f1f83f2949759056d3ef2d7da135b4098400d3118eb702d1e6c88dfa683c136165d7559478be38606add25cd6cb2ea00a2eb498cc3d7a0";
+  sha512.run = "09163467113ad6ee5dfb7ef1353ac6405009a2bfead7994e0d30499e764902962141eab6c6e320b86008e1dac0828a50896a96b069c160569b37d47639826c92";
+  sha512.doc = "4b20fda9c074196e2bb998dcd6e107004b6d86394872665b62b09f37c853c1554428198d0c26d7d8989a25e0e9e9970a5f6abc7f6132c8682c84608806c39df3";
   hasRunfiles = true;
   version = "0.04";
 };
 "uspatent" = {
   stripPrefix = 0;
-  sha512.run = "8db58a0aabfb62436ae3315ddc52a7f389a505c3ec48e335dc340ca1921746de64fda48827588954f03395ab2564fc24b051b093a0a463c21f8ff75616b42034";
-  sha512.doc = "fa19f00551d14097bd3ac217eb52d2bda20e00c9027be15ee802d3e219c242f207bce0805a71f4bf03dd048d0e05fb052227a14b4430884eaaab30fff338caf3";
+  sha512.run = "3374a588041b3c310b1309ef8f7898898c45ee36e87605b45fbb4b36d1393ce31f6035100461766d233cb17dd9cb15be08f9336ae03d0b9baa630d2e3b5f4379";
+  sha512.doc = "0ade06caabd9b2f0ac391c2e6e094fbb75b3e13f7a2b587d3cd473fc05d8c3cc2f22cc27bb6b6591e36f97f9e464f68106b0727fd0156820df4e4071f5ac1d37";
   hasRunfiles = true;
   version = "1.0";
 };
 "ut-thesis" = {
   stripPrefix = 0;
-  sha512.run = "02b3689d0a61b1e4ea09ba216be5dc5f5c04abfb91ac894a718dfd297461b316f7d94217e19f6bc4fffd9d452245d68f7a5a5f2fd05f96691422d7bdfd151324";
-  sha512.doc = "69d628fa48491ca1004e5ed9ae32489f6bb7274bb0991ff744853784bdf84ab1217dacaf9327cff88864655edb603e529ade5c149ce9d6dd928bfda1cbc2e0da";
+  sha512.run = "2b328115998db9ad4c0beb4f0d54a0f7bc8af87326c092e3cd23bdc46fb91d014adab14e2309fb7fd367d400ae71e34e9d7061cf8feac263f6318a40d1fea387";
+  sha512.doc = "1c385988647f9f1597a6b4a2485f2eb9145f7d4219c0d957286cce13848130e014541cdaa1c7e30fbc861f719fb8b79b38ac46cc66c14327faeb23b1bb1187b7";
   hasRunfiles = true;
   version = "2.1";
 };
 "utf8mex" = {
   stripPrefix = 0;
-  sha512.run = "88e1e92d9c8e76005a4a8ba4c9f07a481de9e6c665476c26630d73ec4a3d7d11194a501163e93b9af1b7c6141f6a847277b155272f16d9357f5b579d8d78855c";
-  sha512.doc = "3ae93491cd484e39552273cec22d7b295a7a8b12259b67bd803bdab60d2919678c72b4ee46d4a0e41425bdb2cb29fd53b5c880690141dffea8c9417561af4939";
+  sha512.run = "e762f0e7f6185a2f0f9d17e9ea308a0cfec4aedd5ced7cb0fb1ecc6f5b0307e238d985a765e561c86e279c71bcc484d2b0840b0ba211287971d1f2f205babd8d";
+  sha512.doc = "aca9b55ca76c8902b6acbc3c33d1448c0ce249580dc359b80ea0769bf447805a785b822291cb0398846d3053330f8ed6cad70a32f23cdd99819a03af7f6b3482";
   hasRunfiles = true;
 };
 "utopia" = {
   stripPrefix = 0;
-  sha512.run = "ec0f969658c9a42dd24825f3b9b349c891ba444b065fa7a1e14bc22e0fc061cd22596b2df03d0a87b0d4027095593e4a829cb12157d025be13924db868b36fe1";
-  sha512.doc = "89be4d89836bbea7eba764a75f92b68330d58504c892033be126f87d1f45a1a3e93ec34f9b6d97b46b6f92cd52e53cc8aa442c86777be22ccdc1c325a1cb9582";
+  sha512.run = "7c6763817db49e2b3c07353e215e6a8c262812adfcad42665831442de2840347827441ff00dd3f0d993d5ab95d5657ebf399d1bdfe6cc3b4a6605222558f0338";
+  sha512.doc = "ac0768fe9028432d8eb1af3dccd6347af36c0ee7386697c0b8444a0251615a29ba81cd4149d0a7b2e649d76c77e1e5c6a6f001b9f33e59cfd88554d3b7c37954";
   hasRunfiles = true;
 };
 "uwmslide" = {
   stripPrefix = 0;
-  sha512.run = "75c9ad8ee29c6bc04ab0b46a291e0d17205561979b6db222b40ef44a7917582c863765fee35173a16802562d65ce08da0c2331e056f96084a140e3bd2530c240";
-  sha512.doc = "dfad1b49232e4920b0d9cffe02672a979e9fd4304fa242f35fd12e6e333d4852bc58b949cbdcd79cfe64d3438f5b4d66ba370523a4e658c1c79ea9adc506bf85";
+  sha512.run = "2d966b9cf1523d1c712403d05bdbd97ce943bdbee1657950e3f57624cb1d80aeb317ab8006c32cb09fd1331b89199570fdcc75b9fa6719f53ece2daf483011bb";
+  sha512.doc = "0a6919e511ea031c324067612fa141af12f715bed0ccb8cd3f9941843599d5763b744f5826107494b7d7b4236d50da1b9bdbdb87b5e21429cfea327a8351f5e0";
   hasRunfiles = true;
 };
 "uwthesis" = {
   stripPrefix = 0;
-  sha512.run = "a42c9498461376c061f1cfbeb421b4d8682d4b73b29d4020b4095e1315c80a9d43ef7805397ee647dc17d2f12543eb38e6adefcb8274fbcdd2b78259b60d2025";
-  sha512.doc = "d0f0069f0b99d67289cdd29a29d3710dc9d08b0c1f0c723d1ed02833919cea34e2a0d3ed7ac9f3e3dd199750a3a3a3e4cb68e2c81a36c71a6e10080b04169bb1";
+  sha512.run = "d0900f3afb0789308a70240019464f62c807b1ec74801b1fff05975522b1455a6705a7489535c0c217235eabac236c8da765b9b850b9d92ce6071feb0d1a18d1";
+  sha512.doc = "4eef580f9cb4213d44d7b574369268772456aebbcb34d8d386249e0677990066f688a6940b67eb1f9229bed8588e6476fb4d8d81b448ae3d7528ea04ec6e3ea2";
   hasRunfiles = true;
   version = "6.13";
 };
 "vak" = {
   stripPrefix = 0;
-  sha512.run = "4f8f910ec2202efb0ef3c15960efc2b74311ef2fed128cbfc92fff4aed2e98e7ab079b7658e8b93a9dcfdc303995ffdef9d87ee3059b1c7f9b77c56f1165ad0d";
-  sha512.doc = "cfc5f1eb5146620485fa57afa54e109f998a0eeeade804d57dd077bc89e186a4051bc668ac6db0e1ee2a37cc54a1dde0e069ec5e5105ed3d5b861bee423ccf94";
+  sha512.run = "66abd86448520ee3e957ca7f9495fd748f8cc55ae5af675c328796bb8ae349a00b7b399c1c0c2bca1b14a57082adb5b974265f3482b5e6cedc9b24354b7c870f";
+  sha512.doc = "64c9e5e3629b8e617dd1975fb6ba77561717a4487159230279b9528b6b4a3b15731773b744373569548826fa1705107cf32bd025377a9b318af6dd9b33071d8c";
   hasRunfiles = true;
 };
 "vancouver" = {
   stripPrefix = 0;
-  sha512.run = "ed54016a754c978993947a7b0658a21969d9f1a0dc2880ff0e25f75bdd823756280b62debdc0294badaaa96404b8d54284e10a139714384d34a31bf15db5acb0";
-  sha512.doc = "c634afad923e065d038d68b9d21f07d5920afb0fadda2e9bea4c9fb9da500e84611f24c359d1cf1028ae9cf019c4850eddd92f5e00783a59f556c34e02b7d22f";
+  sha512.run = "685e492a3e5dc160370db6be6c46a472b058fe744492fd0acb09afad678fcf7a8af09034c1b69e3ad0ab7be49168af4306552a406afeac7413d66fdfa98c2852";
+  sha512.doc = "79fdadc7f603014535db26f593dc53537f976860e2f0290a238af1bb2c7fcfe33433d30d58cf2f256d013260e457a9244875665532faf6bbe777cff7c458151d";
   hasRunfiles = true;
 };
 "variablelm" = {
   stripPrefix = 0;
-  sha512.run = "c44a716dc8d098d0393010d23128b696ee863da874b1f604ecadcd1fca4cb354950aef0b765cfa0c8a520687bde5edae8a3a1ba0caef65d179b383a9adeb2876";
-  sha512.doc = "1fdc66bd2e6adb93112dbf7fd6c13ea695f1e7a3c966292690263a6ba1a27c229c23dcaaef2cbde332f079ab8f79ccbea24d6b1bf9060c637362d1000b56448a";
+  sha512.run = "945dae157738645f77da150864b184d0b4e8a0f5266acd212e49b48504473306fa37e94390baa2696d006af50dd07f7c3c3781b2b6300160d6b813856d1f808e";
+  sha512.doc = "eff4f9f383e86a5074010fae059f8c23852b0570a87bf523d5e805676184b2ce901bba1fd9d03e8c277f419102045a5ddf8bd8c84dcdfa976c1b9a1817324f44";
   hasRunfiles = true;
   version = "1.1.2";
 };
 "variations" = {
   stripPrefix = 0;
-  sha512.run = "144d090c93292c834083cc2d80568eb0e12dedd360034d6b3b6ed4bbd27091818bf750b21886aa28e64e275b16e606a5f393ddc49f3d1ee57af4e8b93eeec5ee";
-  sha512.doc = "e4bd628f70723f16fe798cae3884baef4e1f071b602a82ede1ffaefc99037028c9b8d821d8858a7ddd59aff950e4683b579ddd25e7f6cc3fe81b4a6cdccc65a4";
+  sha512.run = "68d7d22926a18fecc3e3f34be2da97d6cebf7c66c793b76544b3536439066a01483e96fa4161e8c2b2875387896a68399d4249004c8bab77f41fdd0fb9e00d8e";
+  sha512.doc = "4dc8c58f167833b087af5d5407fdccea6afe3b633e37a5addddadcf9ed0ff2d96b80457b5693dcac8120fc2e8a092312137fe090dc4717d90bf267fd80c75d86";
   hasRunfiles = true;
   version = "0.3";
 };
 "varindex" = {
   stripPrefix = 0;
-  sha512.run = "113e2770f40818935ea697c37562770eb06f3b84de2d36d13d0fe79f30534b1860469d8d28daa06717a6c7ccfd2c8fe291c9f6f2e52389ece1b00196e93b5c51";
-  sha512.doc = "a28099df285e8f234d0bf7f5bb39c2b9528230bfc8590e56a56125c3d9384cfe00787c62be51ff1cb1cad749b398276aefd1f1c42df9d6593aa17d32035d4ae3";
-  sha512.source = "06b79c7d6e52c7712479e5871c0cd1d9fb8c36fad192e1f883f7bbaea0f2b6ea6c0f3fa0b6ab71eaf8b59f9e895b95b2717b4616927198db592042f9b9239f72";
+  sha512.run = "97f1b43a8eefa934e15ac372635813d4855e408edd8444a9e36ea5a4a792690073306cfcde3e04129df3f117e21307f3fb5a1e45915cb7d33b17eaa045da852e";
+  sha512.doc = "7538b1029cb1404502ceda4bbd178b13d28433286365d53a9043572e42bc12958329bdf18a5601086bce02e7217f1f562443c9ff8d1e92ad3aa0afe6f99f95c8";
+  sha512.source = "900d8368e1a23b5ea815e02931d3ae50c89fc39a51d793ef67eacd674e8a0226495aa35abf66502bdc7bb1d4c4c52c4cff459949b07a7b9d06c72b338129546c";
   hasRunfiles = true;
   version = "2.3";
 };
 "varisize" = {
   stripPrefix = 0;
-  sha512.run = "d8d28349adf92d096458b837b5dfd6d06f4934c60895d5c5d4d55687d7d228d185860e9a445aa400c85efe31aac315213e1e7400380ec8b0d265baca0230fd3a";
-  sha512.doc = "e5ce8f0f935398705605619f8f7da7a2cb65628882396d377d8198f762fc7b40e41c4d8bdd8b39a9ad955ff51e3a88ecb2a56f41718ffc05e2af53bdedf8bdb1";
+  sha512.run = "78c39f244ef4259027add7db35ad8f94505f6d8bdb4eb0a358dd727f56eecddcd3840d01152cee3c91ca425ebd2e23838691c9aabf291af5fbdd1a7d6997b486";
+  sha512.doc = "565042ecba184ff876287655f954fc0e2d9b62b7f3158aad1dcad9337ff00c0c333eadf0def88b49cf9661744b8920b55c6aece47c25c2ab40a39ad4775662c9";
   hasRunfiles = true;
 };
 "varsfromjobname" = {
   stripPrefix = 0;
-  sha512.run = "d3a84c95f98f5f7be20285fbe382b2f080e7c5aa228596915f4f811bec1e97bb405d06ff4737497983b8d0929f29920a42efb4b1bc1a059162289f4f081ab68a";
-  sha512.doc = "4a71dd2bbc7616ea56a143381ba25dc30c1bf3f2c18bc7316c4b28a3237f199324af39ba74c6c27e345dea5690c6d81e56f45c22aee6581349e0233cafd927a7";
+  sha512.run = "6741e090323f24e053bbbad85e67c1c3539ea1333efbebda780fac975b17ace14d51cb6a14dc58db961179aee0d84c083940fbb66dbad67e371c0237c8e8d147";
+  sha512.doc = "9cb2eef233536b0e4958f86a3ea039b9282f057b732d436da5c987a282b95c40bfbf21fda0f44aaaa9b20da7fd895478782823b6f101871a3c4178c02b3890c5";
   hasRunfiles = true;
   version = "1.0";
 };
 "varwidth" = {
   stripPrefix = 0;
-  sha512.run = "9c2d87702157248f09d2c4c4fcfa1990659cdb2207aa6aef1a9fc9c5831edadbb3e003a99e564b9317cbd4eedc14f4f46e617d791f903f3f19ca0842574d093c";
-  sha512.doc = "888c6c1f896d926ba94780f4da333b29b2493a8b103f3f007f590e33fb1c6b47dc74b56faadaee1080a1ec37a004a80a0353b1efc1803b49c5ba66c7a459a9c6";
+  sha512.run = "d60737f34d84f150cdbdc5a55687d20c1f45775372d42ca853561daa6e95b8d5a731923a4af3a95493598ab0215789ad9c415e95f79074c13121aea325ae4dd5";
+  sha512.doc = "c05e9bcc9ef11fe2691e37a852cdbcbd7569e41937dc7ea673eb0df2ed43eff98b7abba45cfda2b41f27696d316a40b57f3e0dbded07a3e64cf3e262fe7c74b8";
   hasRunfiles = true;
   version = "0.92";
 };
 "vaucanson-g" = {
   stripPrefix = 0;
-  sha512.run = "d25a487e38560cef9ad96072d58239222e61ff554ffd3efd1508203ce52793259209059a923e4e27dfb9f306211e949811efde0b0e08c3435447a276b5c47bdd";
-  sha512.doc = "b4ea4f80c1dd7112610441435da5c33576c2ba0dac1af2c5b2d6113ab77939f0fe557a983e6a7af97417a9c8e4523bb81c5f1ad456a7166bb289edb67d2c693c";
+  sha512.run = "ae94a1617e57ecf5c5a88cc24ad27798f476f8e53d81032835b91951cfc8d22aa88fc0c08cefc4b14441aa9a25e57f3a5f1f842f10c6ff229c1eb71782c481ca";
+  sha512.doc = "a38cea5234e1def6c1f32c8825c321cb8ea48743e2363f3d6dfbff8bbfea68f9b8567d1456afcc3fbb12525db37573980d60b3c3fc7be6b4069a6819a2722edd";
   hasRunfiles = true;
   version = "0.4";
 };
 "vdmlisting" = {
   stripPrefix = 0;
-  sha512.run = "29af64b2aa8c1b9aedd13665c5ab8e826a1fe46ed10ad45dbdfa19214cfbfb3aad0bde0772a77df900554e8536335732e4f503809e462afc2af8653df871c5d0";
-  sha512.doc = "0a7bf3753ea83f991f9b21b1430b9d16311ca486c589390869f14e7b39471e6171b90f8e9188bdf5260c2b2d9d55918529395108c128d7813f81beea74c90e3f";
+  sha512.run = "e55c00ef9e7ae7199aeb4bff6611afbef1290fbd427db4dc1ba72426440ef97b5f18113b7cff02d95af267f7ee723fd6af8460c8fc02f8142db894667e36d921";
+  sha512.doc = "a3a23f8f6bb1156f4ba8222189efe3db6ef97aef7e86bc41ed050eb69032e97cf88a06ff6a28c9038d16b904670b61d598274e010e9ad9ca5bd1d5a3b1787c33";
   hasRunfiles = true;
   version = "1.0";
 };
 "velthuis" = {
   deps."xetex-devanagari" = tl."xetex-devanagari";
-  sha512.run = "85e692d1a5f5935f48587ab5133b0ebfcf119b2c3f609a90c41f15782f9314432ef8e00bde38ef31a0116758417f0385a3b3969ad3cb1fd61023c8c963e355d6";
-  sha512.doc = "18ea2180ac1968dc15b110c940f0143dcf262ced2365ba3a7518e569f2e350a304b5fc927f5067db9da11fb726c1a411044fa0f9783f31abb0b3ffd96251b77d";
+  sha512.run = "d85b017b5e2e0061669f7d9542529c794fb35991596e03da301cbe919c5c3e44ecf82407041560648a345422c437bfbec9cc2eae86ea4352f0d2408e4e26f7e5";
+  sha512.doc = "ca70ae67cf10b9064d2d8d1bcd4215fd94271b41683912c688722857c4941e51244d9a7df2ad8c7b7bfa90ea9e3679ad677793ed05bffa23fdc29a5572aa2211";
   hasRunfiles = true;
   version = "2.17";
 };
 "venn" = {
   stripPrefix = 0;
-  sha512.run = "220cabd0e18031a35f4a46f3ff63bae3ddf1f8b85ed3e24f06986a6c7b4bad1d4059e949af3ece82b011173bc62ec91de30c14065d336dca69a1260874375610";
-  sha512.doc = "1dd98edcdefb19f327365fb878396879b2ceb57bd18ae10f4bc6605766a65fbec5a826458c81d3b19b460aa6bec3fdefa667e6114919d43dba49a3c1b179b9c8";
+  sha512.run = "0a4eb406026419d367b2a0c2eb487b869c24ca3871746d9f1b2dda1c2295c80fea721e97f79b2ee66634247f66d0fbbccd1fe6aa4ff3da2e07fb05223acae721";
+  sha512.doc = "d55d2bf1ea7d15534dd533a820ff1851a9cad0ffdb279a1cfaa5e8038476458ace981be1a24f6826b37f876bc48b8b182b74bef1752089445a9bdaef15eac90e";
   hasRunfiles = true;
 };
 "venndiagram" = {
   stripPrefix = 0;
-  sha512.run = "f8cc4a26f9a9a905b49de652f63540058f7a7e30ba3ede26a2baec2a8c3ac309c667282b011a16fa71f0180063cd73fd7dffaed0dbebf50422921583b173e81d";
-  sha512.doc = "7bcc53d92651d56cb6c1b7115fe451f71c18d191f0dd2d73501b0893cb45c469a48a877d7857e4f145f68ed583f3969796f8c8e6d041e5f4ca5d8a61c8337dc8";
-  sha512.source = "37d54ce8f87404ac5cf8229ffcbdec728ab8321ca8e9e2eef4bbb255349ea03df04761d7450863dded75a482074a0f4cfab53debd8734f68145420f5b1151a55";
+  sha512.run = "6cd24d8b144cd7a38434be0ab515b0fe2d36cad3e07b3dc357362e9b2870da135d3d7259d3dc275fc4ae3b7e4f093bcad90db6737b27c3ef72ef25f2a7ff1976";
+  sha512.doc = "e1a034ba7171aa94c5fe51aab4b799501989563144ff9f8053e8a690dada38d86df2539afc97c0ba4fb89fa6eacb80c9bf50e2436d3bfa567590aaa1af4d1e19";
+  sha512.source = "76e7ee055e2e51473ff3c94976fc3f7b02c2b39528eda46c4f6017776b0ebc665a91bc945e52f82ecc2adaeb3eede22f86a8a2aab9fde9a32ba8a20c80b08c9c";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "venturisadf" = {
   stripPrefix = 0;
-  sha512.run = "8d5f7633cbf6807088099a5bd7d37cb7d9715ad94b240e3e91e3892b005f54a7365526ee6250bd45c3cb785884cb27e91c448744db588af549e88f71be277944";
-  sha512.doc = "80a4533f2c69e8ad046dbb2df4077a339a3ab5e1931c5f33ee46015f5461c746345bdd7783a883fbc5146837e82360c0637643c6df39be34ee77e1fd360c9a75";
-  sha512.source = "1f9a748faa5e89ebeb7252ed72046c43cbd9a9edcf66d306229ec08594de0d83df47b858668c6e4f2f353d086c6d710a4f2982fc97e8902647c1e63b7e1e37d4";
+  sha512.run = "041f6c01a01ac10cad0c015c6630826316e85cad3351bd4530cf36f123a14c55620c3eb345237a06109d827047cd5a07e4ec4a1d85ccf5028a4890145f84820b";
+  sha512.doc = "eafad77636b169442e6af82f584fbb594425ba1122b4b31e76bec69f030f1478e2a6aa6d39f69b0a75c777a6fc42c8855e9781006f3ee7601d19c5cdaa5756f3";
+  sha512.source = "25d2450bb022e5b6344743b020c73877a99df02f29ba7ab17243568c5afd6c93240d3ee81b155a317c0a2cf614945f2f9a3414027869d98505519eaf0587841a";
   hasRunfiles = true;
   version = "1.005";
 };
 "verbasef" = {
   stripPrefix = 0;
-  sha512.run = "703cd01991687983c97052be98cc9ab41a7f602429b7c89cee91dbde30f94dc98404cc246a761e593c15fe7bbf89e890d973caaca66712b6fe62efc85387b539";
-  sha512.doc = "65e513d8d5ad754c377dcb2ca3d0d128d046ed2d73f2814e58de5a9cb58e14a8d513ec473e16d94d4430ad2431910ea844e28f1231317e2ecc796142c9ae7a45";
+  sha512.run = "21f7a77c7f15f72503b9876a5ebc356bafd47797f9472ace5e8b438dad8d02ed491a0f3b0f0dd24521ce3f39edc3002192c93ff5ff60042790cad77e71755c4c";
+  sha512.doc = "7a290e13fbb737f8b4729871afbaecce97695007c43b351161695bc061ac855639ab8016f28c8fc85c033ddde40de49e9f1e8cd3efc85ca96a5d54226c45204f";
   hasRunfiles = true;
   version = "1.1";
 };
 "verbatimbox" = {
   stripPrefix = 0;
-  sha512.run = "8c7103844c15405fecd23e5a68b71de4c18e656a4254fcd6b1734ae614a29f49d145b5c71d5d91e88cb40eca03fe765ab4be2b9d9b89520b0370872526fdb70f";
-  sha512.doc = "cb4e2970ba29a61b24764a74b4dab473adc934aa127083f9bbf5499ef9f238dcc98e95c23842e0b4a7c701d22f4b8acb4ab6bc80b78792962709fbee73a68ec9";
+  sha512.run = "0b0d4d840f4716460f7dccb52b7f2d38b91874f883b190052abbf4516d145ee79b0b58d9ab0cd00449721e53d3324515e35a6c03eb016c1484a94bda9eb1ef23";
+  sha512.doc = "f4133ed395e39c869730533dbff9a02fc626b53a368169001d4cfae1ec5170ca076cb2768694fbdc072fe9f3c76b9e77d595aaa0288dbf968acfd8086fdd95d0";
   hasRunfiles = true;
   version = "3.13";
 };
 "verbatimcopy" = {
   stripPrefix = 0;
-  sha512.run = "b2479d2b0b816166e9b19ef64aff5ff9253801afb3fcebadccceb884d018a0440b33231f74697c9e27db312b302e3f06392157dbdce49f3238bfc81628577cbb";
-  sha512.doc = "006e8af11330e33aca5e18bbc8b80668754f09d94d0885eae40b50a5f9de26585ee3a3582997004fd5342015be236fe2d8134c6dde4127acfc050a0e354883a0";
+  sha512.run = "0220d9b4e19ce7a91bbf0daa8aafc22f77359d97c9373b9c9089cd21012a8e1b6cf90f330ffcc9178b2c5f18e3016556ff8841c81a917d0d9238b9cd62031efb";
+  sha512.doc = "5d9c8cba0ee55a8389e69da62ca15436a9b6efc79984d123e024e445286f8b56c46bacd5aa25aca09feaaff3b8cb7e192c3993f9165653493410c5399fdf93f8";
   hasRunfiles = true;
   version = "0.06";
 };
 "verbdef" = {
   stripPrefix = 0;
-  sha512.run = "3ee993ad30235287c4c407c6bc31035540e144d9f25d0f4046941ce0326b64d8c9d26f3e06b5f48c5d0982341ad33283f1d7378be90bbd723c2663588aa9da30";
-  sha512.doc = "14485706005570f39ad314f00147e9858c78b0deff3b260a224823035b262c873a7288e83566c0c1b7eb177b54409eec61ca2eb150504f8b8c64c1cc9be5dadb";
+  sha512.run = "ed881cad5125ab7ccd8e5a0eeeacb3b9bf91e9985081f4b2f74abb34a6b4eca96e63dd06a85f60de53e2e2cb8832fdc3e899df2742dac79761e0397848f169bc";
+  sha512.doc = "5fd36263d670abcfc45d60d6318301b1e731bdab1517274340551387298330e031afcef856bb6cf07de07e002cb4028dd57010305729be072d09c5aff72d9609";
   hasRunfiles = true;
   version = "0.2";
 };
 "verbments" = {
   stripPrefix = 0;
-  sha512.run = "16778f074cec840dc82a1656d1dd6d0d551555d41a8eb06a09bc6881bfa641a0107117de3fab85289dc096ba461055bea4cd80b3041f826342e9dd51b170ed85";
-  sha512.doc = "4cffafddc3d222fce0f871ef3ff3994151cf92b9bae671681282d3de658912234841d09cc1394698534c28c250744957b13e6f89dc8696b5a2fe252aec2384af";
+  sha512.run = "7a2933844f0ea399c3e55f4e32c62b7681ff72ced34102903b4d54b016830e4c6a8e55c4e3d46b113b859d47c8b2af2da2d77b1916ab801d987cbaee6b1db537";
+  sha512.doc = "3663ce117db9f34e9b4217e3a8b184feea47e9d64be6201ccbc81f5a1d4bf851b9f5767bae5d207a884556dfe09e472ea2ce11682feb2c46a10e542c71b56ef5";
   hasRunfiles = true;
   version = "1.2";
 };
 "verse" = {
   stripPrefix = 0;
-  sha512.run = "e9268859dc46339e19d037edf8876dacc4bf2e79d4510139efba32332c971ebe4be8889814da5536e722cc6050ad8b851ba0a83c7ad31299a85ade16d6705a92";
-  sha512.doc = "c80cdaa1a85a66c92f22d4f48186d451ade2f1843d15706b5bfbc7862a2e2d0466b5c6f737ba09d5ddd691ff7a1b77dcdc1aa5a00624eecff7985bee254ca475";
-  sha512.source = "f72c05ed8d98d363e9a705a07f2ad0931b64fb982c39140a18d3f3fb5bf94cc3142f899c1b12445bd4db0fc73473b3504cfca8ba6754c97e69d872a3a21c09ce";
+  sha512.run = "2aa188b13b48aa3855174db7899622906cd13087382cf157f38934fcc8152e0bda0c58be0e457e9effb0bf920bff5c4c819f549d7d6518027862ab9ecde2f336";
+  sha512.doc = "107704fee4d4438d08e3a682c2954ca3fba3b6bfbfa716d7d0890f0867ae658b51067a5cd1704110e0db80258553d5282845233788ac00a5445973759bf2a600";
+  sha512.source = "5bae294cb546024d60aa1b47638a70e8d95a5f7e89bc8f57e78510205a3aed5f4d1416ffe82326f94ceb4d017e1ef7b8a40b08f0f03db8bb9c2c0b4090c0ebd6";
   hasRunfiles = true;
   version = "2.4b";
 };
 "version" = {
   stripPrefix = 0;
-  sha512.run = "0530902a91b1af296740b09f1055a62bd14b0e7fa5671e968fb327215e9dfed20476d27fc85167f8500c6b8602518b62c152422ec569168e85f25975c491606e";
-  sha512.doc = "e7d2498b9e3a5267ed2ea85461a399ec6c81a40e19de344f344b863fffd5d869bd80bd029b370b43e9659eff673fee16535302775c7f50137819282270ff2813";
+  sha512.run = "70885ddcebb3fb2efd0a5a642f48044c2c28a642cb19d37189198cbbfbe59e15c7eb98fee3180e755d3e469435063185886f01f829439ad34969dfe21847e274";
+  sha512.doc = "be2f5723626602b4a97c88d109651cbcbff21c0e8231b005131d764ae4368177fe42bd61f8bc8f38e8de09ab1f5becb74c550b29b183cf2e6e4ab10c199f988e";
   hasRunfiles = true;
   version = "2.0";
 };
 "versions" = {
   stripPrefix = 0;
-  sha512.run = "cc7bf9de2c27855456ed7ce4426b28dfdb35daa439c47aa9f847a6862847143b718eb3358374ae69564b9d66699719b76edd19c3e66f385465c0339f3db3dcb6";
-  sha512.doc = "16983b4adf7332ff37eebac56c171634d821ec9fcc9145c0aee3fb21ce23810f1f50893f17f7bf69b88cda4d107a3ef367f53f8dc31352e3ccfe24bbd6f344b4";
+  sha512.run = "a2a7840109bb19ccaadb18480ed69eead3a6a763408cd0d8cdbd915aeca929508fc9094fdcaae799db05e45138c1a04959155940101ba953a4e2ade33b71318e";
+  sha512.doc = "40cd08fc92d339d792a7d816b4011d78192625825f42b8de599a7ccd3da703875bdf48e3a11a7574388cffd2386dd35606f3285f93c20abd91b95d916fed0ce6";
   hasRunfiles = true;
   version = "0.55";
 };
 "versonotes" = {
   stripPrefix = 0;
-  sha512.run = "5977387bdef61fd200c6efd66aabaf2ee9f3fe0c532a0bf22021b918af4dfac19b90505fce52c9b038a3c6a20570b125f79ab9127bdf91e75a402f42f38bf2f6";
-  sha512.doc = "04f73b195e52f99b4b191fd018402a2b1b846d74e87f98229f7486fae4b91691346d4a16f32801a5246c53568db24b6a35c1217331b9cd0b7b8147683216b34c";
-  sha512.source = "d6385781215386bd726885f263493a323d1a1217439b85d4eb9a862e0c041a0438eeea98270e3665ebb4222ab0a3e9f8b073b5784d911ddfe8ce1127f4d270ac";
+  sha512.run = "efeea0bc043f397f11e80775016d4aab33e23e317fe0312547b98e45e07458f01e683a8a0e9b5f965e204d5dfd5699163a9fc7df35a6e2d67b06b7d143383683";
+  sha512.doc = "d859bf6b5dd2abd0f0e9513b82f17b5627e23a6aa3cd3282fd23073d13ca972182a46e4b60e246b928463119f85eb1a3e0d67efa09a135384900e341efc0c048";
+  sha512.source = "321de2b5e0e04ea19cc47546e3e8c0b2426dc67ca9bbf29d84e3d7e6195bf339dab80299f863bdf57d36e2fb5b345a43b86907c211ff70b4201a1be13aa3b26c";
   hasRunfiles = true;
   version = "0.3";
 };
 "vertbars" = {
   stripPrefix = 0;
-  sha512.run = "35e2db964bf32ee96271e5424a81a03553d4463f8aaccd0e24a549a81c7e22b0eff5408cf0a40fc81336fcf68e32796ce19262fcffbdd43b935d9e52947f957c";
-  sha512.doc = "92fbb940bc7839781966835d90d348675ff3a657d2b04100907ded70621606d8522fd52ee82521ce4a0e833fb039433158f95c6ed5e417069774af25f6e5cfdf";
-  sha512.source = "ce8075cfa604f8ebb7837f2746e543b542dcd38b4665ce50dfe9761ed28d8e4d896b84382a9cc36abd9c06a6aee02d4d78341a6cb1d3e3d451c04b3a34e8aaf2";
+  sha512.run = "829402bfa81013c0c2441a7126fa70973a7dc09751ed4765e3862a04738113fbcc0a61715e010d544e878829e539bcb1e57c2fdad1bec1b5c343aefb60ef7e97";
+  sha512.doc = "92d71d669da3d6401ac0f6ccb0d8ad89b6fbc962cd386c5eb9cee7e2f6deb58c0a6a0a60307e89c35646aaf0ed8638540c92e712445e1b9deebbaa842f3ee351";
+  sha512.source = "168040f693d5bad361a04404175e7c8f41d4e5f43443040e8c7e0d371733549a26d5d3e861286abbba5a8539ae6a928040904776cf2347f4e92b4d13c0032199";
   hasRunfiles = true;
   version = "1.0b";
 };
 "vgrid" = {
   stripPrefix = 0;
-  sha512.run = "4cba75a0aa88a52ae335672e38134afeb74d0f31128b7c88220d073b708e0c0c0a33a2488f03b582d310a462191ef9d172826edad9ecaac839a87d1768a2fba9";
-  sha512.doc = "d8c8dea805682ca51f7cd9f03d3082e6670c28dcab8deda9486f7af0980d39093e9c19c3b05e58f508db73485be7e873168342a587b12b672e5a80141b3bd071";
-  sha512.source = "0a368537381a92b2ee0f066e9da28d40b92e4dc664ec93dab4a902ac8c27be95a322f7810f70a1a55fd4bd079e19278ac40cdfc4928865f798fe05fa329183c0";
+  sha512.run = "5a427518a114754c53500974f0c7a71df2f80b6ec8ead5a108d1c8267b460e0199124f50429c60e7bce2d883860abc04b47d51a0972cd0daa80c9dde084431ce";
+  sha512.doc = "bd72f8a4806d53f5d3477636631ab92fb4526adb35cc56bdb6fb5df0713885bb38adee1b5d0210d17630019b64e2ee727c1f09666d392940a7bf15e1545d0843";
+  sha512.source = "e0dda066c4ef7f75df635c36b01c1f7f45712390a9a91c78c25f22d072b978dd0c435fc9443e132f0b8c3a2905106a414c161f01de8cc06e437781c81f575199";
   hasRunfiles = true;
   version = "0.1";
 };
 "vhistory" = {
   stripPrefix = 0;
-  sha512.run = "3378749d1e6f63009e145bfc54d421b6daf65fc96d4b2e7028dcce2e16e0ed3d4839d3ddc412ce6f54018ca163e718563b77fee0e4e85cc8d798ba87a87377f9";
-  sha512.doc = "cf7bdcada1e81e493cba66d6f14e8a372fe806f06d47037259a6cf5cffbb86b5ac536b1ee2872f4e5ded6c94f8221a924f94d09332032898678bfb0221abdb39";
+  sha512.run = "690ef235478d4b0ceef6f8eee7655742e215d863775bdc6971c4f72314d7866f2a060e10bd33b2e53ae0ee079654aec82ca091d13eea0bea1e1457fd65762492";
+  sha512.doc = "54b5da2db5bc04fd1c31ddb62688ec140594462d3240c63462c2a9425f6526ed70a38b886ecfef4e2023859fbf28ea33db2ab521b090d3aead44e325d8f1967d";
   hasRunfiles = true;
   version = "1.6.1";
 };
 "visualfaq" = {
   stripPrefix = 0;
-  sha512.run = "221ccea0c672f0a435a6b03470b7f23f669215cfe06e0f6ef22ec966d652e5a07dc80cf729955629fa3c72f7f467909d1b7c96df92d6b93e871768a2b5b290d2";
-  sha512.doc = "6ea2dbe6f31a56a4936b426ab1999a8a1fc58d67338993fbf34cd5eb03a7f9dcf993b9f512a3878179fe5196a4542155178bce446d366ee8336491005c46738a";
+  sha512.run = "d5f4a79fa63a64f151227364d1e8a9af8c276d9b308c0bd7d61af6f48efc5adbf63196c6f67560b7ed520cf83c541ba95543f765b1a5fd61af648c7a0878ba14";
+  sha512.doc = "83f1e6e679b695b5b853630cc826b5b2a18310445e6b15a7e4b39237a3cc57b8c01f34f6b975b97403231d5ac76aa3813eb7dcecc6392503dd48188ff45abf23";
 };
 "visualpstricks" = {
   stripPrefix = 0;
-  sha512.run = "10f6aabb3d1ab6fec7840fbf54afb69584dffd35e13f99309daa26bfaf78a75e6afc14097204521f02b201451d359b1203ef1b7b39f10d95bfff7008904a47cb";
-  sha512.doc = "ee4e706f4bed027c3cab75bbc0f0d1e80368eda2627b34bcd39158339cc412efd396b92f79f4b827b709b4b376d875528352475fbf4ea1873631729f5e59270e";
+  sha512.run = "e201f8418dc127782c642aa1f7f6611ce3e5a639a0e575307313e635a75964fc5a2314918e20575a4de451497ade109b4d9c80c0d097496bb9bad4fadd48432b";
+  sha512.doc = "fb2fe87967ce1de498a30c0e7bfcc6d3e5feb812ad57b8c77b83491974000fec287b07b0e797ca8189d30804df04dea958800c44b5fda3dcd7d9fd85bf493a15";
   version = "2.3";
 };
 "visualtikz" = {
   stripPrefix = 0;
-  sha512.run = "a9fe628792ecedbee7d11e88a18939dca95eab71c6cd7574575dbd6485f22d8c1b733968c7899578376cb1a6b2d94f62a3060928b18673f206db50cbda49fbd8";
-  sha512.doc = "fa3921ea02045ada57866bb79f2b618d4189f721b454e36ee669f3c50e8c3f92339ff3df8a79138abc70752a0ce9684771ac69c67ab1b7f9d44827e557b3ff43";
+  sha512.run = "857d09b891d0cc36e56e39a6e935662592e04afec64e282ff62052a3da6ca1341bdb1af004ed9fe3da235db825b22afe4aa5ddc280f5bf52c28565586c208199";
+  sha512.doc = "2f0138f92a0fc96df1b044829f88b242aab6f63f5b58b49d716c5caff6f7b5bb2332ba5c569af86839620cc198cf11a14748e12f7ab66378b5d5f898430f475a";
   version = "0.65";
 };
 "vlna" = {
-  sha512.run = "df12335226c0667fcf0d4f89b52810f4e861e6f8d748290e63e87d9f66d9ae67f24855f3c030332d743a5d844ef4741e875cc137cea9cdf936ce6141f05376fb";
-  sha512.doc = "ed6dfe6c76149403be2455760dd2c9d5fe9e797aa4d0cf596e24db91d222c1c6d61e7aa5c6161e55c4ffce1e5edfb86e48b67ab41f89fb03113a8d024ee4990a";
+  sha512.run = "5597afdddf004e2c9b0d7cc4afddcf4aa71f72c3b7766b685109af91fc1bbf06a5267a8b1f150946466ecbf587f030be245902f3554c858ba4fc78d7abe0d768";
+  sha512.doc = "b3671d9bf704ff7722d9824bd0760db8f99a2ba12387f1fbad3062681d3753aa51ed505f55732876f353dba629d1759fc25284fa7324c2a386cdab8eb8b6492b";
 };
 "vmargin" = {
   stripPrefix = 0;
-  sha512.run = "9732fa2f418f2dac86bf935a96c447496c0c9ec8883ffa8087cc9fe88da06fccdbdd35b743a69de4b288eed5a19221816ba6d23fb1c0eae9daa5c72a572c8dda";
-  sha512.doc = "e5fae51005452b261f3c1eb045f80b3607e6c1f0ec0bf24ef9e0da77fc0c7c19ade9a4b9043596b0d5e4ff7275385de0d90a0a7300ced2c14635325f26da15c0";
-  sha512.source = "d594bbdaa34c275628cf205cfee92cfdd58fe708d33b8bb42604321bff8fa0738fe724c70848cc7970391cca04825ac436d45beea5ffd61109c022583d4eeabd";
+  sha512.run = "502f074a833b3b8aab18318ed3b8c806b1c0d943000e8126063ec7046d7e01cbbe675232eb1be7a1915e9d8639690fa4c0591b21e3382b8f2f9d664952999830";
+  sha512.doc = "cbc916d8c21daa87f0f3e10ad84db552e0650edb072cc8beffd545372c48562c52d8c529180482c85dfd33b131794fc8a0797936225ddcacf319d539302d95a2";
+  sha512.source = "6b23a64f009054ced47c7d7b3ba60fb34bd2cbdb13e4fd80c1593ec4638f1ee0ce2f42e7918ed9a6475f93f1c30572dfed0b9d3dff7ce17c356d828e4724b867";
   hasRunfiles = true;
   version = "2.5";
 };
 "vntex" = {
   stripPrefix = 0;
-  sha512.run = "99b08ef76394ebb31ebc65e9f910e7f105c6a96a55a7fdfb77832f09267e9e2d4f9600fae20b155d82b9ec1b744baf7269caa55c7e2eb39b9a70463a4e8f4df0";
-  sha512.doc = "6779ce781ec4da3487ede65a0a9e258f4b42153d9f3c0035a782939121246eb56c83545ca22748e3cf000873fb94aebf0f4706cd9e6f431d4d73016d2c1a62d3";
-  sha512.source = "74820a6e3123595af13d36d796d783a75f87d57dc520f673d4b8bbd62af15e33a3467dff97c83a78b524e9846d1d526f374e3791f7de8f0cd6bac14fbf9f6b3e";
+  sha512.run = "91461215b7a75913ac1c0d421dfade77baab1012fe2110facf1feaeba0262977f864af423d17dd2f7e5c711121456ee387be97aa13c5d45f65248f8db95236da";
+  sha512.doc = "7805f8c11add784272c435acdef550ea53e448914e305acdf8f4c3b4bc3379d842e9f1d23d2ff01d938820f1dd137935de866f83c296d671ebe4cc278e90529f";
+  sha512.source = "74fa9818520a60467623dafb3de8b41ce77d15804462b1a1bc49f391cae87a22a743515e3a5fe2328b3677de053626a74484f13cf8d5466c05d221c761708f66";
   hasRunfiles = true;
   version = "3.2";
 };
 "vocaltract" = {
   stripPrefix = 0;
-  sha512.run = "b4080bdb42c15bc0623e01791e0024ca5d8f7dd52f305d23889fbaf7af46af0b62624864b48d07e8195169ccf41a8eff6c965e92bd5e4b6b3d77e12fd1401d6b";
-  sha512.doc = "5b84090b86151b795538a4a9518619a60e99db05e7bb31a12fb63c74ef27276e46d6fe91a460c29c31d42439555dc1b4a818fa0c138d0d768e79740be8a1d95d";
+  sha512.run = "dba51704cd5536910d6f405a7b5e5bb9307bf56408443dd16528f10488979fe589dd947fe2b5a81a635cbf4b7472fab319f77d6b3f7b9488dc5a609e5d869a09";
+  sha512.doc = "99abc17150cf7255b8df0df6217652b71f46fd58ef8ac0e3750ca265e76a0651bc1769ba9c417758579dc2705e6fad3354a59d667fa9c3903b397b9aeea20aea";
   hasRunfiles = true;
   version = "1";
 };
 "volumes" = {
   stripPrefix = 0;
-  sha512.run = "7c6ce7e22d0fc607d605a9397e63564a1d6bed01cb214584151cc6198cdb621d25c12c79cd343d3b03938ccab851b50c13d54c8f95cc3c3ce993b2b132e55d10";
-  sha512.doc = "ed92bf1ad992fd1916a8ba4a65db80927131c896a2a3690c6f73aed825eabcf6f3a7b2f77c291374f36792e87109528f3a075c02728bc3ce32efea59b718c583";
-  sha512.source = "9aefbd98980f4705adedc25b04397d979bef466eb63a318748091550be4fed04973ea70487a3d98307f6688ba31957a1343b428919f5ab09911cce8cfec2105e";
+  sha512.run = "aba3f48dba00f9d59100cf31136618e73b2f47e04024a911de23de6b88dbdd4fc26aa424e38116961a2928c30896faa6d1a4c34fac5b61212545fe7498f6c333";
+  sha512.doc = "e404bc057717244ecbc425b627b2a619d475be3d68d265d0334bc924882367a24cbb1fea286e9c0120a7f126e1a144f1bec96a3ac2942cb56ae6355f9467affd";
+  sha512.source = "a1c5a90cc9918765a29caed7a65af1edaf8202de1a4d53af6a909d16bee655c703305a780e359bccef5dca308f3e11b045fca08b514d9a60cc64351b574f3c73";
   hasRunfiles = true;
   version = "1.0";
 };
 "voss-mathcol" = {
   stripPrefix = 0;
-  sha512.run = "6d88d495a320f2b3aea001a3f82fb914edbd8442e024c121cfcc25d70a02b9dfb94015f6dd39c59feae2c571de90980862fc7dcc2457418c67e07ce518d3587b";
-  sha512.doc = "f2add19457add6311f59b8a8ecde14e53d0aabfa26698aa109cef1a3c63eb83eeeac32c16818d2ec3483373b9e42bc873a93cd899626b46a363772ff07466894";
+  sha512.run = "6bd093cf627af99ba67ccf2e814f331c82fb9febe5a2e21c413b07e4f9bc34bfb8d574e196b9df5ec7b54fa25003f995c7bf638396c198852bb4ac9f571b8c22";
+  sha512.doc = "a8fc6741f39b5610630826ae5e84110e1138ba3aea6ee8c7c2b666d913d229cbb88740f8a6cb6760b422acb6afa234bfc695be804aaa03c88b1033b9574a5500";
   version = "0.1";
 };
 "vpe" = {
-  sha512.run = "3ced079e1acee1f7194d1256c18ac8acee994f23c29dc08a1466bd3b4e2c2cbd54df2af73165309cdd058e596edf3fd4f177f49fa0cc3faf92c6d1ea11b3d4e6";
-  sha512.doc = "cf494e0a5540ddf35b55e8ace82f88ad6db9c5d538b598b8d0f32cef6955ee6f0806860bb62bf327282a230a8ab02d43178a782c76ae43ec83f9c55448984353";
+  sha512.run = "dc1f5ae9a5d7df20bde4ebceb0fba865137da5ed2bfdcb6da59c9da56f3b71e93097b22c4b87641202dc15a873f081d7b2e8183606af1a2ae1419c26e9c7029a";
+  sha512.doc = "d8ccaa23c9cb3705c25976b53425788346e85c382d3dec6b0a7cc00a589d8ec3a8c4fe7ddf6999f6b4c250191131f4bb4e7b064e7e51de113b3af6f5d46e2794";
   hasRunfiles = true;
   version = "0.2";
 };
 "vruler" = {
   stripPrefix = 0;
-  sha512.run = "e7c5755d090c1d7aac2cbb1f4f020d973839e7b04195dcdc3fffa5698dd46d19e3187e27ada8699096afce3c0db0ca82ffd6b3764a0504daac6e5c0d2a546bb8";
-  sha512.doc = "68476924223d7ca483c7d57d4f4d687ed24e33d79810dc90e55517cfe9421044a4c63aac4910b7bd5eba5c733cbc10e6bf0a559458e56864ffa4f9171f9a64d0";
+  sha512.run = "aaea39da4b29dafeb5e906ca3fe220c17477862b61a0b58fa9067a55081305d4591a469cb0d414a4a842fdaa41eeadf050111b0859982d3cd9f1f9df95559735";
+  sha512.doc = "1dc79d73a3f3eee3b000547058b90be63cd14b184f242e4bc9548b98a750389b7379c6d000020b65732dedec2eb082df685f38497cced192c0779f9b538b5cd4";
   hasRunfiles = true;
   version = "2.3";
 };
 "vwcol" = {
   stripPrefix = 0;
-  sha512.run = "df0630ff51d01629a018767c6b987c31b040ec1c672a30fc4beafcc60ab1d333a448ca1c7366032608834be5da6a0de186ada2c5ff75ae5d111086c655cde8d2";
-  sha512.doc = "02cb0528e376fb2d855b5e0b8b9df4280a976ea73d4a66d318ddc3dd25f6166af9ee0a75eac7deaadaa5bd91df380ecf29578ad26bb629bf127aa065930578d5";
-  sha512.source = "efedd1d49a871c51a515b9d5e290c55be7f7c901949635bc2fb17e59404c493f8112af1a0a6da7173c142fd140ad8b30c584cc824510d0e3e2b53a0936c28a15";
+  sha512.run = "24e4bb08f550976d926ec61b978dafa4074df60ebd93b28962cdf7173c7c3c352e1616655610d205b4f90cb33475a0efb801e5135c6ea4f4e9b573ee42eae229";
+  sha512.doc = "e40bb3ec002898ea27c8dbbd433ddd734d69a1ad367668682477fd4df3764d278699f17a0fba209ea455095196d3a89035f15a26567c77aab73209b8f666b8cb";
+  sha512.source = "36a5eda8e631acc2b601768f9bf0872696af9131ce5de9240bb5554ea30ee9a49115ada4c323e47c8c5090013c5a47a2c8aa2f018de5a3720e31abb1c04e928d";
   hasRunfiles = true;
   version = "0.2";
 };
 "wadalab" = {
   stripPrefix = 0;
-  sha512.run = "f56e1a7e831bd987cce8de2595e6c94bd28a5e1f7f3196dfc48a20593967de89274052d2938e03fcaa8ee84d911264825c86e8eb0abb87cecede4577d1cad2f2";
-  sha512.doc = "824eb3cafa6e2f8feb1834ffe79885fff32537845da3939e3f63f9eda6594fb64ee25b8506c3a1ca0a53b2e1c22f4da2fae52db759ce03602a2738f13dbb7e05";
+  sha512.run = "4c4c83919e8904384a64cf06b37cd0da7207972d5f04e7d01a24aa913cfc3179464444c7a4cfeae9afe2f39c2ad2719890a9d3bbad7477ea83d6323d3cbcf089";
+  sha512.doc = "309dcec0da56034e69c5ce2d46211e1eadc78ecec5f8c14272346e6772bef0e5ec1b1e9bd6b4ee16c94c9b7d4e2ec9d9c836597c98d5572f722c9d0ff0b3aead";
   hasRunfiles = true;
 };
 "wallcalendar" = {
   stripPrefix = 0;
-  sha512.run = "bf6308e4f4474ce8e45fe538f92c7d1e436ee3b29b3d0ecd8a4954be9f67eb6770eab66fdfc2e49c12c7292e12d189590dcb9f54dc6f5f429fe5df14bb3f91a7";
-  sha512.doc = "9bdd8ee42f49356627e480f69634a94f8b0d3ec592a3c3b946c62b4da92022be8d5aed0ba4f77bd11e62c8a5648ddb307c0f74af7a9ca7d29dd6a8c5e2e52a59";
+  sha512.run = "eda4a231bfe61e75fff31c733a1512e6ed932b11e43d341ae826cdaa913b10093e0550141de3bd629cc8924e1b71546a112b71e15027f8580964c1b28a41de3f";
+  sha512.doc = "ddd9defa6b22324b448c19e512b5f21fad30db7ebc8da14bdb4423844c5cc0c3f4e5e346ae8fd70092e9cbe62ee6aecb19740f9eebbc9def84348677185b7b58";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "wallpaper" = {
   stripPrefix = 0;
-  sha512.run = "ce3540dfe6606cc012d09fbeff286f42e279f6f3a2e12e65ad76a933a0603e86e3c2cb62adf1af308109326f2c52901aa3f62ab6318145c798690e08579959e2";
-  sha512.doc = "c9e3f3e45dbe9bd20149c383505beb98cdffcf528450c17f715389526d760c9e065d9d7e86c2863c2bde32f9e92ab19a2ceb39bef94a289b52862516adaa80ce";
+  sha512.run = "2f06153c57b31a72236dcef69cff1e10d85f2dcbfbfac3b6a5ed8b0c8e003294fc04120ac30b8c827d94816017e1fa042206a1932746ee33b1a30b24ebe2c28d";
+  sha512.doc = "c27022dff148948218133b27eea53e6620a05d2459b28b561b4047a6d125a159e38f524565c9c0d70b42af9cb0536d685855265f7f83e7c0620fd0b4b2ee5064";
   hasRunfiles = true;
   version = "1.10";
 };
 "warning" = {
   stripPrefix = 0;
-  sha512.run = "f32a6307c6ab2ada39cff2b915b633a8002c4262505135feb6e7ba099224f0ceaad432a1a184db3139520608343d6c2a70e0762fc411fb8a7f90e82aa02bed97";
-  sha512.doc = "c0a1027566e1fd6cbc870a90421c8e5fb08a0f419b71788de28efde5de7284e61a266bd5d940f27ba645974c3d8fa81da56f94a4b9c64a64139db216dca1d372";
+  sha512.run = "c22639947fa19f6a40e184a8656f9982627306bc7352728934a187b817e58b154e3516e035cb36b3940caf50269869d771d00efddae225c5130a0af1375670ea";
+  sha512.doc = "9ecb806c26eb861bfd93f0c8a411534469b747c4a0b44ddaad17313bd2995eef24b627deb32b39a882e89757dc62ca348898c1796fac1b4f92ba819ef3bda000";
   hasRunfiles = true;
   version = "0.01";
 };
 "warpcol" = {
   stripPrefix = 0;
-  sha512.run = "9b95b049a26cfa575e23bee2797f648d19d231811615a4a6dfc14d6767b315f3be2ede437fb817e601eee23e69c3ace272bd8cff1e627558639a44fb8a6bbd17";
-  sha512.doc = "5a20776d664d64512cc6536b021449e2adddc9fdbc5eac1bad3392f813362cc2fac99bc2ad11532780fbdaa74553a2eeb7c2de806b8649586e3a4200294506ad";
-  sha512.source = "9dea27463723b4e5af43e7f5ea5f1a77def46be8dbbbfce314c7b1ff4b40f535d6ba39f7a2131f9fc987bd22ca5d3074bb6189794367aa74a8f4db194ffe77d6";
+  sha512.run = "a20c55e054a221a528c716ab9646835b84963474509b366b85577fe97f93920f462c0b6b9b795cd7f979ca8493cef5b306346d2076c29d3c9cb41f646c1ca96e";
+  sha512.doc = "4ae9e56b62742baf75502133e3b90a24599015d21a3d880ee33c42a831aa33d93ac0526a2cbb92d06a8102e3c9861bcb094bc0cd7e77e1d2dc15eee25d4d6dbe";
+  sha512.source = "69890754e3f2a4d38200c534e8dc04418eb9c4ed25af4199c931433a51b6439e57bff7b1759c5794ca0fb494f3eef1af4cc83b9d957c582b67261a3a91fc9606";
   hasRunfiles = true;
   version = "1.0c";
 };
 "was" = {
   stripPrefix = 0;
-  sha512.run = "fb8a0f2b95e51cca718a35fb725eb5c16492d5be86838ea12ecec27bb36eef06099887bf652935f66b6035a42a712d76a00c53d6a0660f1dd0e361da227d4f41";
-  sha512.doc = "66df71afa5a989ebbdfa2569d880db07fefbff17ea191b78bdf5ae2e2e89a5724d957c80e75f8b70372d40bca0675a91aaa5d85123d10c40c5535cbb4258cb95";
-  sha512.source = "16185e4ee69d36210b443fb00f8845cc424947369f8caca12b94239362e6a470b4600323d866b1377879a71c35dd807ac70f8d7d66f03910e55eb6b3005c6951";
+  sha512.run = "f24fba8cb51ad5a2562dfec2338c7c3e21a9d368138ac3bbeb8663850a1efd2808860cc57a6ab2fcf25cccbdf6b7b98facf09d67a633622a6c8e2f1cafc6ff95";
+  sha512.doc = "0786e5ac4f7f023ddc9e6d431dadb513f227382185c73c69446781c53f4d5db9fd3df58da6d1ba9cb56ce5d948e3c317450cc196bb5161ae10608cf4959551c6";
+  sha512.source = "af8e9d2ccac305b627a0d5d4c083a222efe233abf59af1a1f61e81fe09c4c2235b3ea181c64d222300eddd5d07139a3c91430b1187b237e5716d2836cfbcedc0";
   hasRunfiles = true;
 };
 "wasy" = {
   stripPrefix = 0;
-  sha512.run = "21f53e15fc9c17fe4e4679b694fb53ec363eed497bb8be82925a582b963983512a60945bf7bbd883aeb1a21f98ce58555abf9e8ca2dcd4cbf8954d4fc3f64049";
-  sha512.doc = "e536924389587fdfa8e06072878317318bb964e4759fb9ac1f7a8fd16a213cbe9faad882ebe6cb471d2707e6c04221707a02ee79be2d3ddea095130e90a6b321";
+  sha512.run = "20086528deacd51fc9409cfbb1b331ed5d2a8f811acc078c01d50e5e218506f8390992f2e99a584a7ebbe3b3bc791440d16d7a88f26080a8b03f9b18fdcca673";
+  sha512.doc = "0d06b09042f0d39813cde309ba95cc4da9c838f0ada85e4d3e782c6453082f8958819f11a8c2fa9096acdec1a33fbda385ae2c4e261da1380699d2da07a303db";
   hasRunfiles = true;
 };
 "wasy2-ps" = {
   stripPrefix = 0;
   deps."wasy" = tl."wasy";
-  sha512.run = "49dfa4f3ac6d1172994e54fc36b4135c5961d81d6adb0e7108deec5753183159d0de8ac52089741daa923264908c0650a6761f8df631d4c7190b7399847773de";
-  sha512.doc = "fd667ffe1e8137eeac031f53565291ef31ecc3c44674026a895f9e28ada661130da4bb1521490354659796f42ee3b6a76fb4538705b486de5108db4e13adad53";
+  sha512.run = "a550a9e398861ce2d7af32d891cec739915e07d60bd278ea436fb5594b41dc767f3f4460160d0510ee8e95fc5621fe7def019dc8bf3b078d1fad0da5430ce67c";
+  sha512.doc = "a8037485d4ea22271d0b493b9cb5a1ff8b57453f2dad20d8effd4842d9bc0f242c426180f7fed615cfa85ac89aabdd081f5ccd6b43ca9c01c5671434d2da3169";
   hasRunfiles = true;
 };
 "wasysym" = {
   stripPrefix = 0;
-  sha512.run = "c3f76a8fe29de467257fece6424d6a662ee24481eb3814b4c461e729651eac363599ff95209b6b4c6129845ed3499e5b617458ad5ba02140912f5aedfa4ae57e";
-  sha512.doc = "83414b348d627af48c64081c8b57697481a8fd56117417f118c4bede623c184a5bffc2b61e28441a70f4b076c6b85891c6aabd7a2dcee2085a22e6df9431583a";
-  sha512.source = "4a10464c61d4084c14c652cfd7e70997015d0da13decbd8d073ee43e485f0a0a46370988e7ee327a7b5aa0ab12f5b132ba65694a153d48d5d8b31fc208bda7c4";
+  sha512.run = "e2daf57770c64066669617e9d695314ab99b2aa150ae6c2a606aefcd0ab7e3101d4bd9b0c91d7dbd9b9300a4fc28f42d430cfcd0dd343fa4f1adf06aabe8db16";
+  sha512.doc = "cdd4453082336fc18a6cdd15759817e4210436bef7fc27ff6f1edfc6c149fb0c5bfb35d2708c547dc9633492cc21b600ebf5d0b807f37e236a7d58beb0b28684";
+  sha512.source = "fa69d3431491f87e81fc345216c631bd4d50acf17af90c2122f2adff19a7c8b8761b9423fdc23c62920b23842c3bb52ab9c8fdc5d0662e62718622f33cc051b1";
   hasRunfiles = true;
   version = "2.0";
 };
 "web" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "4cacd38f024a88dbe411798b0694e4badf7f04da229585435cd3cb41b1fad5b1521e21e6d4994e05f78e4a35668f73fbdf4ba124e40a5f6d0b52c41be253e848";
-  sha512.doc = "681362ed0f6734f366069490b81e9a0c94957203178154fe2c99ca34f10020c747db6dc876d0696e08c1cfaea84ebcc87eb8d74d1198d2d56104ea94b619b7e1";
+  sha512.run = "1aef5727386f9fe6da990ebd9d2abb3f15d5230c671d4346ac5b3b38782c4f00746a02b40e78c97fe0928556a8af1e737ccddbb9d17b811ca9acc5ad2309c0a6";
+  sha512.doc = "7c9beb38e6b200e729d245a24ec3806182d435565390fe616bb81628ca5d0a9b5abef3a6509e6634fb50a4d3f7d1153497382637ed005ff015406dbcacdab8cc";
   version = "4.5";
 };
 "webguide" = {
   stripPrefix = 0;
-  sha512.run = "5307d2c50f2702c7afefda91e9041ab2fa0847a47e2cb712d3db057cdf6fb2311106725bb3be50f4f8467e88141f0e2d7ed7aa298c652dc428cac7d0a9881db3";
-  sha512.doc = "8d96176da1fe74c2e2a6c3ad0596241eb86a94cad68235d0a710488e4eddabd7195ffefc7fede969f00e2d51be9c555328441e570596a2407a2b742c8d587bf1";
+  sha512.run = "01f868905c228df2dfc883f4432b51edad6bd47df5cc244fc97c6476c04eb3863b11f062c6690f41df89c5fa9465070c999be245b94c4f33f5296032f3018ac6";
+  sha512.doc = "701297d37a915e3a780a98d81a3c74362399a9030c3c22956796547cea6858ea8ee5b91cff0bc82c3d5ab3d42016cca997dbf26d7fd45ab8ef194011583c64a9";
 };
 "widetable" = {
   stripPrefix = 0;
-  sha512.run = "2a16057f676a92a01f6a764b86bae37c3b1720b61bbf1bd7baa62de348b797b32a3f6e78345e3542c780f845f4ace4436399794f245b533a4b1f7bd5ade8b673";
-  sha512.doc = "ca76c32f37a7ad222ce121dd52fa2e351540a99e564e626af4a786d46f1ce9f46374f85bfd61cf2e502fab664440625ce97d5690fb74720d5be260a97372baf8";
-  sha512.source = "0ff7be62e55f3781e796ec5a22b7f6b2540c7277d344a86c7b5872ddfbdd9634404bf9cec1586fab1ee83df3eb77e65f85da3e90edd5e3522c7a3ef76061b97b";
+  sha512.run = "f7b695d0c73adfceffcd08f62c2458870fb58f67e3dad8452eba9ffa487f421833ebe98c290b882e0d32a71fa590b3a534485df5fa9d8e8d563fc2615d1e7af9";
+  sha512.doc = "053300df635b72a9be6b7f3c83985212b362b608a9e9526437378f7e4e02824cde7f8efeb62a42c80a5446521e361f12c1acdb5530f26a7c0e397627cef73625";
+  sha512.source = "7d688aa4ae6851b95d4bc1a98731894aa0c4bdf2060d7a45e94d1a11adaa1ba6555c984d4b36e0798f6678f68f699aff7453410491969fb3e0f191072f941cf3";
   hasRunfiles = true;
   version = "1.4";
 };
 "williams" = {
   stripPrefix = 0;
-  sha512.run = "fcbbb693096a30265720d384978c1eeb371945f71cda1e8674358ce2dad1a77e9e5422efcfd14e42619863a9ffeee040416bcad44a65dab18e71a7ad7d1f4768";
-  sha512.doc = "ab18936b17a871410b97f7ba953d799ebb5720e3bbe959a11ab1b259fcac0eb9f047e84e5e3382fc7c0916e181bae2c9e905e1f185f81233fe66a50d187e3dc8";
+  sha512.run = "276150360782a32f03e6ff0932223be61773269a49e2ab922932e2eea0a0ef7aae1f398484efd09bacb0faad68af98b583cb40da23a4dd8a83e6a26ffa07e091";
+  sha512.doc = "70839ef82e14ef6feca7c34f9947e8eebefd8aa3659887cf0b4f1f83cb63b0f9577a0ff064e4cf54a7340e70ef1ade4f755f65338b00c3bd6f0316183a80587a";
   hasRunfiles = true;
 };
 "withargs" = {
   stripPrefix = 0;
-  sha512.run = "054bf1aa91a2a1f2e3e97583bd6cc833967295ef477324788b827990f8d87888d207f88b2586904af92cbd909f1a5b9544d762c467bf52561ab13f92785fe139";
-  sha512.doc = "d22c0ccf48329392a665963337c02b335531c0fb1a12e3458de97a97476e8ad40123125b94ccea5ce044be0eceef1656b2239b5ed6826192fd682ac637776f45";
+  sha512.run = "62f77511c3bdf60f29f5ef3f0002cb80b9153cce5fe2ede9f97e41848ad21fb1c554c6c7ae1271221b925bed3346cc8fd3e40631a5f336914fd7feee89b84bc6";
+  sha512.doc = "95f6ffadb75e3d3a0d497064f24010aae69041ddc23e12fbef82a0108aa9a37a9363fd89ce927b47fdf494f373239dd87336739026cf6a81a912d0704131b9aa";
   hasRunfiles = true;
   version = "0.2.0";
 };
 "witharrows" = {
   stripPrefix = 0;
-  sha512.run = "86d36d2bff381dfe6e48b949c54ae2c0c367a8c55023991c4d8b97468a55fbaa31a32e7328b9a98234a614b719cd83df2e9acecc72c22cbf319b290dc9041db5";
-  sha512.doc = "678e2892ad4e08b84d06b2fe610bf8bc96e44163b27f7f588b21ca7feb3891cda284a288c210725278b6b105b7f2aa5f27b6a93f07d77cb9c9a0b864730312c4";
-  sha512.source = "b733d62b3472650cfb9773d10020a2814944b072be84091520294655e341f1b1928696e6376af0d6f6c85a999945bd57233d99f154cb1583b28bf0716bac0bb3";
+  sha512.run = "822f85b81e81e0bf85ab65d7360c758763eaf2cd15e4c763783b5efd35714592388030d59b0ef9d721da9c1a7beb693ad68bd0ee318d1129e6992c5882ff4ce9";
+  sha512.doc = "19054bf29ffdb75dd947cba9d4ab69715fcefa249aab29a3c544be9540fa978cda1ca1a606f75d03e045cfbbfbe73139bc9e0eaee27ec045dda969ed7a7e97b7";
+  sha512.source = "2c76575df6246d3046ae03369a0f02ca9bcd33c0d7d7b4dc94098e65f1df5f93dae71ec63fc8776e4719fe66f02735c771fa217751b777e30434afac068dd423";
   hasRunfiles = true;
-  version = "1.5";
+  version = "1.9";
 };
 "wnri" = {
   stripPrefix = 0;
-  sha512.run = "e2c54640e160234d6547fa8f6c9284a0150e4e40e9b4f720271aaddd52a3c6928abc991b387f5bf780e50307a1162114a55a924163e03f3e5f949f2a153cea61";
-  sha512.doc = "4f4e9789cc007160cbb3831454ca5713b251c0eb6824083f896cda70eccb20d45c6e67ad03c0692fa5be4f00d13c94b622f627dd3365b2ecf5925eb4b5891587";
+  sha512.run = "783f1a2cd770049866d73316f6119159a4bdeb9e2074288a7bf25c2dd070d46ac18cf1bd549a20fe575cbe40eca1c1f9caf0b0da6ca76afcb866c942fe980ee1";
+  sha512.doc = "8ea47a7ee52485f605472b229e75cac805e73da735fb5f59fb2b2fc1d45088d3ad38ca616f5ccc29926cd3baf7ba2e11ade0a852bd9510234dcba746e51e51b4";
   hasRunfiles = true;
 };
 "wnri-latex" = {
   stripPrefix = 0;
-  sha512.run = "25280a8c40376618f36212ac7f526aeec5ed9e28a6b4a28f731a5923453ca50e5bf5fe47ea2e83117a655df2c7ff63d81e3171b103e0c03c9707b85649e23242";
-  sha512.doc = "24f888e92f4d64cf93f6734e0333f299b3e669a477ebd0122295344a05012b8c791dbffb104d94efa25fb702ede420d7ee4e2d58e7e71a743e072d955483f1e0";
-  sha512.source = "9119e3ff1ef3d272ebd97788112cf872f7bb1b8b48efd0bf01f1c3e180e89a0145cd799c064db481a2b10a28e82f2cb7b9663358a4acd6258c798832591a9a1c";
+  sha512.run = "8acfd65b6938f5e3441c6f013c91d75c03247c6d995dacbaf39ab48b8386e5d8a63b5ddc3876fbb394c1da31804344923321565d8d40a69d4a4616f3522c0899";
+  sha512.doc = "7d367f5f7f7387999f5f447cf617722e3a8fef2939b4d5d9abcef2e92878728188ec65327d7fbe5723b96b9649f95ed552d462927a751ae57bce791c5521b9f4";
+  sha512.source = "d694ace4457c5c25f5332f87c7c969ac7d717b06c365e250c199eeb398861e592da241612f89f4ca026856d7fb8bdb2b20f05855a58fcd59fcf19983091a90cd";
   hasRunfiles = true;
   version = "1.0b";
 };
 "wordcount" = {
-  sha512.run = "bccf12e11d89162799dff3b7f0a37d6e698608874e91ddd4b6ecb0628db966d7090c55b7e369cc980fbf1b95ec1885dad89dbc3c7bfc32bb084a328f3b2e833d";
-  sha512.doc = "16db496320089c30e371713d38a6e8b8adbc1fe7288de75dcbededcb045c9c70f958583cd4e1c9b7c366bcfa40e8cbed3d93703cd1da26785a54efb3a5c17939";
+  sha512.run = "898fd8c647eb5fe5fdf189708f84fba6d5b709315c8f41c6a259a6551a560511e3d9322f6b06e3cb8f7a737b14be7bb95faa9601dd54476a97d415c74d605cf6";
+  sha512.doc = "1a79bc6af253b5ab2646498b475a0e33c34396c95f7674cc448db9d81a8156f5f0971ed5a179b926eba043108a9cd18fef8bc6f69e47afe48f923b37faa099d7";
   hasRunfiles = true;
   version = "1.7";
 };
 "wordlike" = {
   stripPrefix = 0;
-  sha512.run = "43c828be59a799ea557109e88e176537db287af9228c0064cee614c635b1ae9cf1ef1b79c48425a62da1753347412ee1f2840f9cdb269ce85f0b1fed8d00eabe";
-  sha512.doc = "8ddbb38d4035a35099f4555ed7f3038ef0b7bdc77ec75525c18f9f7e153b2d88ace3985e14881bf739c88ca87ca4bfec339848da96077880636a38bab83a4965";
-  sha512.source = "9bf8f99d1d3346adda06af67b1f63e7dd497609b41c9206b9e4eeae29e5e930d3ac4b6c675089939d66eed301951dc88030f1ad70f5c47362fcb8469372f23bd";
+  sha512.run = "4547ae4289891121d1c4c16e00af403c4823da16adca9e1095d198ce0a0b9678338475044470a7bba74c98b4c6072434c2242d10b7c3d8fa6f7a7750b33e944d";
+  sha512.doc = "3ec5bb5ecaffe02ad931aa3a3d932629f7c36383624e10185e7e3c53887a0ab05b8e623054386b42e71927dde8168fe11236cb4c5b6361cd1d4049fdd1f52090";
+  sha512.source = "39a07851739d4c9183860c2c74110eec3caee1a908a26970dfce935f29397ff116f734b1a2dde4eb26170af3a0734e34a8ec6c64ea9b0be38742991408cdb673";
   hasRunfiles = true;
   version = "1.2b";
 };
+"worksheet" = {
+  stripPrefix = 0;
+  sha512.run = "e5a663f5469a03a528077df7cc02887c1411dce9ae6c3f8373f0e7e2627857d59bd79216d77d0e258d04a0fcfa158bb5ce9ee41786a4a3a0d1cfb9c61f57013c";
+  sha512.doc = "1225a2331432b64b9d25c265ce06ea8b2e7ccf8dc70e2f9880dd3d9eb0bdcffa77888deeaf6d807ddbbed71cff366a26da7f5e5b017f22c900d937f53602333f";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "wrapfig" = {
   stripPrefix = 0;
-  sha512.run = "ddf1fea020063f590faf8fc779a8e77a64ce44f6eb7d0290cebe234dd1c3a75b36544f8e2b59fd06cc9b8b7065bc0b51521a422e3fa7c5cebcec381d52742c85";
-  sha512.doc = "d0c9afcce12c7fe4533992ac2eef6574df41da4e0e0ab7d2feef74ff1ef0810646fcd35b1d6250d8b57b59c78727ad6c6f4cadd8f5f56956f2742575cf7b68e3";
+  sha512.run = "bc470ae1e609612d7138a9317a27cd181f0f61850b730687c17f9379bf6081da8b775f9940766f7c4bf5d188de5e4c69ca4cc908fa8846498635c00fbc3aa427";
+  sha512.doc = "c839b746a0ba3f7efca07b7cb49cc643a8f55c9150b02dfcc0f3ed6c8138f4dcf7ca5fcd98c600501647434afed7f2a3f9976c984e58c993fe8c335d2be62142";
   hasRunfiles = true;
   version = "3.6";
 };
 "wsemclassic" = {
   stripPrefix = 0;
-  sha512.run = "222bb107f9b97254e736829c1d6a2483da671ddd1b7f336ab90ced545e8d981305a382fb531ac11890cc7b670d46f06da53de0fca3000f922407eea2a54bd25e";
-  sha512.doc = "674b0520d4d9226de9f74b46f9db3f5ea5cbd67013ecf6f32da2cb4515c44bbf33706d8367ca8f7dc383119a1d5ad4065006468ab98084e2a7ea831bf5bcb852";
-  sha512.source = "a59703d66693855fab4f144a7bda4c68ffd77967025a6a269c26d075fc238c094bfbdfd0736c9ce6618034f8b97e88c5e4073f487af200409c62c056ffc723c7";
+  sha512.run = "3a9aa02c2c18415ee5f5b90aa59f1c283f2c41d6041d6ee6403fce57e3bae76de9e8fd6c3862981d9f591c6fce50a7350c6ba5b30218e7054f7fdaf44095f80e";
+  sha512.doc = "422dd9b1b543592b65d0a883c7ed900b0cde12a117189ae9bcf3ac537e43a8c28b6afdaae28a7d8a1ef5bf8c34a6f2c5d0e449f1d6656b785ecf804345c16efb";
+  sha512.source = "e9f139aeb2b898a93f6fbc28e6b90b7038f764ebf56698d6482fb755513a0d523a1ccef3cb7313a9ada0e5fe222675cd9b580800f7b8ad40cdf2410baeff1abf";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "wsuipa" = {
   stripPrefix = 0;
-  sha512.run = "5af4db059c3cf9c8b26491554c71870c6f117d3f0673c6f7ddc48f0432b1921c4f05946fd9b17a5fd11cd58a8863cc6f47cc71232639a1b29ce22a3961ded99a";
-  sha512.doc = "c0b110b090febbec41c5d649aa0484634624e7ec14e16edd8d3510ff034554a5538a5afda6a22b9f9db596fbff0e47313db5b844979b8dc7071e914287a48321";
+  sha512.run = "8c3559bf1fad59d42669f2b82d987f7035036978d94ceba2e931d51f4abd8f9835c85a8be36184c5a77ee1aa32fd0068a7c36e1ce9a88a9b8d52015e47e31745";
+  sha512.doc = "11cedab5f6a3953686f9237c2b8026650c5ff39341e59a1634e56fe10ac8b84cf6c16066c4cd859f01669385e38320ec158214579522d089a75544027121cf2d";
   hasRunfiles = true;
 };
 "wtref" = {
   stripPrefix = 0;
-  sha512.run = "303e8dc6e8c4fe352ea606ec18ceff93ba6d026ca759f49175e13f3ff9dccffaf53ab79c3c040eb388a73d643b74744c84b9674d1421ccfe626116a17928a2c7";
-  sha512.doc = "fa877a1294aa75ed6770d46906f88f6ca5907892bf3b2d20e90259dd1127f0fa6a38e799ceae2be67c46e22a4cdb2815b1fb3603b1f261d030ad8b967222b132";
+  sha512.run = "7b3f7aaaf73b6efb18ea232ae766dcb7db9fe89f8fe070d13376836d018a9fefe4ec1587c87fdd9888783ff8ab5178333e8b21c8d812ed2192470d4ee18f1e8f";
+  sha512.doc = "6e9cf169f752a71c647042762e3a3bfb0bc693b2d740331700d52f2ffeef0a0b04a9f9f1e2d39bb2a6a69fe54702a51302ac84ef0b41286410037dbda01c8079";
   hasRunfiles = true;
   version = "0.3.2";
 };
 "xargs" = {
   stripPrefix = 0;
-  sha512.run = "1b4006d68d7c0b3afd5f566d666c5c8a545394cd3e0d345caf66b10221776b1331aebd5eba5d7fa559de2cbd6b6d72b560f6d30b7cfe740f7ece97fe723cd121";
-  sha512.doc = "27f461307fdc77f39acf2f8f831a9d9be008c5527612431def5e0cd742a3036575621fa0e36d85c6270d7ece7864d27606916ea0f9b8330fe355dbadfcbc429c";
-  sha512.source = "57e5399f665cceb230dcb94dc1d02a3e1b1b17ab1a8ff0fb2fff73bb84791d4ee57ef44b0717c3395e26891d84c5c984392dc9207d5a30bc44e2d7cbcee4b1e7";
+  sha512.run = "cf18d00693709fa78ca5e64458eb177d6eee678229e9b6892228f98578f4a050d3c1cbf9115b6bd8de7088fd8a737cb0412943f63a6e4307481f57e9df293061";
+  sha512.doc = "e01dba16f0a7d575810a0e53ce371127f77f11a6db9705b735fafb2e372a51e03d1faa323c1f2bc6c0a73ab0749315197c18e9a66104ec702932e0a398637574";
+  sha512.source = "f04cc16636c9ba9a7ec1d8df066b8d27b27c1a9b5d36c7c15df2699e62a6714e057b6496054f66c1319b260f59d70d4562b35765e814957f0516984e569da4b0";
   hasRunfiles = true;
   version = "1.1";
 };
 "xassoccnt" = {
   stripPrefix = 0;
-  sha512.run = "bc978c330003a5de5710ed225ed397261e318310f7fb597da252e0bdc0d683c132e8686a41db03de027ffda35f59e481d214290b2cc5ccf27a31f00e81f1c423";
-  sha512.doc = "624525491daa342bdd461b945f7460ac603f0ecbed9fe1561d878df997b4ceaed4dad6f688fb27b5e0f5ff390eef021bec8307bd8fc3086993e8934bc60e589c";
+  sha512.run = "d5bcf8d6473eb62076544c1744651a4d74c5e64993b7d4bff5b06e554e701bd9891ce790fdbcb854fe1b47f9926575169bb3df585ac70d4ff1fb3263adf28645";
+  sha512.doc = "ba15802a58ff4a221c480f4aee7654d5b86da6ca7a5471c115573a0ffc6e0ab913e25ed7cbb6a2b515b02b7814a4d8b118e9d20ab6fc9973b5eb2b7990b1fd16";
+  hasRunfiles = true;
+  version = "1.6a";
+};
+"xbmks" = {
+  stripPrefix = 0;
+  sha512.run = "37396d791674227c4e930cd83e4967ee94d0ba9d49fabb7ff1022970ced0e3fffacf621bbaf56cc78fdf9cb6001fba045ae91c2f1c50920e14a385879fa07b19";
+  sha512.doc = "07907497b197aa07ea5b0e2022ffa48a8e0fb124871e91fb873f3e6a133baf83fd220443dd6f2b29954a0bf3349d60e7f7c18c1803ef9de59e1e61678cabe579";
+  sha512.source = "43f221fd963ce8047c7aff6dc97c8a3392e2c2dd0bbd80a3225a084cd03aa8c1139f4714c3ffa06981bdf7aab89f849252ea0753dfe7d49a2ad5c4273eae0cec";
   hasRunfiles = true;
-  version = "1.6";
 };
 "xcharter" = {
   stripPrefix = 0;
-  sha512.run = "56bef619fff49cd3d6955773c1b6e6d1590319fa078d4b12b7e6e56c9eae6b80f0bf9505974c4e7c57e587e0ea0ebd9f3c67855d9a91fcff573e01ca91921a16";
-  sha512.doc = "919866034508b25fcbbd5f06e7669516d8e9b9a4bf566012dc1238f0a99015b9e372a5d0b96f048384c4de53f26e461d7320928fdc428519fbafc5cb3b33ab74";
+  sha512.run = "3a6ab95d322fdebd7095dd55970cf3bdfd21c0b64dbb08d874ea65509d4ff6d8532415c7121bb290253bc56221baac7a881f6b7cf1d37f1788412205466dc481";
+  sha512.doc = "f2bf3cc3c422b5c4e233556ab528e49b00f284ef27f59e92c2cf819d7251ad84676bcd3a15d43e030e7205823c25f76d7a68d0905723eac92cd95f43de9a3bf1";
   hasRunfiles = true;
-  version = "1.112";
+  version = "1.115";
 };
 "xcite" = {
   stripPrefix = 0;
-  sha512.run = "44ebd2f3b2483f75d07f6af33b4e0fdebc64d72e77c00791880c13dd99ee8b304ec2f2c0f8782d8a446bdb3d81dd50e6d386ddadc6c3cce413509f055cb8d3c2";
-  sha512.doc = "848a5774d9ddaa7806a11be067d9de8a5cdd6c1d8a545bdacc79f6ec0a61804db4b78110747e792db64ad3d8bf5301eb35ad6a25ead38c505db3724aedf0744f";
-  sha512.source = "f99d309c7939d864be018f8b33833534d15981a84307aa77249ce3ee259c4649d509ab1322be6318a4cbae85b753b37b594694b39beb628f6cbafbd6f688a151";
+  sha512.run = "4cdc39cfc0e11ca50a468a3de488b4c3484b864d9721a9f179aeea18bc3f2c98b115c579630edcaeec7077991ae3976c8c3da4d810cc2e5293329f8140450a81";
+  sha512.doc = "a136d9f9aff2f605c398b6cf5ecbfffa95e4439184da6a074f21ebd1f0aeefb6a178150492ad4c174278f20006b33c2bcb0a0d15594b1a5c6a607e1d882d1c88";
+  sha512.source = "5e5990b30d3536b60a3d23b04e292cdc612bc8acf5f93693d05020272f1d13844d7c9d7f5854637ed039ce183860140f78bbd1b0c3e3795d9fb8dec52323e68f";
   hasRunfiles = true;
   version = "1.0";
 };
 "xcjk2uni" = {
   stripPrefix = 0;
-  sha512.run = "fca63871433f92f18e236a07deb709781c855687f02653f3286dbc1c2286c92f6f9556c806b409308a72c28ac4aaeadf2d86fab54c3c9803e0f3a62011d4e704";
-  sha512.doc = "6932725504fcb9891618437c9d20a52ca23a856036beebd4d52480d961352ccac478c0bb7430585b9fed74adc04ca56f68721663eaaab8b4f2bc24a6880d6ed3";
-  sha512.source = "3ac753719e7d9661df5f4ea6d19c87710c8b7e197837fd341341c7599a9a67d506449ec80124f9ab97d752f15186ed04c64ccc0733c6fe73ab3b380abef92125";
+  sha512.run = "d979e307e504a56c2be3012726e2b77c3280d0074dafc4e61897160ea363b3da12899db9cdf423c33e48e0aa524f03fda9ecbc5205ac39d530de4e60bb5d5992";
+  sha512.doc = "0ed71b9cee37f5e8bc8e85c0dfabb1346107e46ca8d24016eab49893f8b2400a5b699c39685c889c94dabae38008224559acf5264d58f3a541b189e18372159a";
+  sha512.source = "e52f4b681809e3947d04b184606179025c8d3a0f53ba88a7bdb81d8ab12c27be20276a4c71e58556e1dd5d7e840e6bb1a08efc01b479f39c89d18a77e05c5a97";
   hasRunfiles = true;
   version = "0.7";
 };
 "xcntperchap" = {
   stripPrefix = 0;
-  sha512.run = "58cc5a0b8d7ccdbad2503f1f2b3b816824f21bb439beaa6f090cdb845440faf4198feb625a3ccc7a76aed7c1539895f7c1de1b378ac67ce3acbb21de8f9e7ad8";
-  sha512.doc = "5da884bc269eee3557f791ed4c1b5c6043c6c2ec99c38d25bee8bfded3e96ec7125855e4ee0c7d03bfb63501ba27443aea0b3f852354178dd2cb04f70b209c9b";
+  sha512.run = "4efa9ff805e4ebc03e3260ca768a665f8746d47745b88adb27a5b846d616fbf5bddb58e19742d78f48d882adfc6adae41133abf9edc6917931817bf42157559f";
+  sha512.doc = "5207a6ee25adbcad7650c15a259d10823ba611a891865a3ec7d0c064debf303b7cd279bbfed9d182e521b2941ac6af9d22648f1a7c69c504a495f1acbb207459";
   hasRunfiles = true;
   version = "0.5";
 };
 "xcolor" = {
   stripPrefix = 0;
-  sha512.run = "fbb4b15ec7a7fa3f19f928844d8c4b96ae974ca2262f8e1b7ccf6f6a7a87772dd3270445c3778b896afba7c390e32cdb96e21c38069f8109e10dd67c100f17bf";
-  sha512.doc = "58d7256c992e58b0117cde5fabb7f80c9aeb3fc6cdfd67ef82f687da88fa70d7f62650abce7200a5624b9e926e7577e49d67a34d7e9de7bafaf42271fd50b1dc";
-  sha512.source = "f083851438561f7b85f3df3d04df2194d31e2608ff39c3cbd778dae782e7cd78826ddff4798baba977be0b213d3012d315c5fb064a460840f03e44a56bed2f58";
+  sha512.run = "329c9baf359638e43a649c2c77449292ca6aa0440991f650e811ee6896a24b4a95769d3963ffcccb6bb11fb7b07f465eb40014b3e19394d1d97d312289d0922f";
+  sha512.doc = "fa45209e8b3eddd8ef2c053a3e6c59a05376c00b21a3e0f6d39a5f5e024db024196682d25a4e43b37a70b28f61a9bf99ba15e6cf12edbd69baaf46ac50d43299";
+  sha512.source = "0067aed0426cd3bfe37a7adc130c3927f4dee8055f24d34165af7b75a1595372385d91dc109d42a262df5876d5ac52288c5c4a0cf650b2657df260f668abe816";
   hasRunfiles = true;
   version = "2.12";
 };
 "xcolor-material" = {
   stripPrefix = 0;
-  sha512.run = "3482581c3203a3e1192079a846dd04a6211e96eaa61dc4d193cb9bd74433c7fb0fe25c8f145bf6dbad932ffaac7b69e78eb67e3ac62451b182760dadbe3e283e";
-  sha512.doc = "8979fe74a34dbf4900cf594fd5d9a53aa750faf7b0373d11e2cdd7679b9daf1e271c43dafc0cebee570ea8785309fdc6aeddb793583e1c5f76a1f45525824ff3";
-  sha512.source = "5ffa2e82b0f0433999fbe7c10014f68ec3fcf8206d39f239e539dde4d79aaa4deb3a226f83c94fbb7725a0b4b0e96ed3370959bb4817df99daeac6ea52cea414";
+  sha512.run = "fb3478ce75b3673d39e61010334da9a389d50561cfb274cbb6d06edee825d23daee4d8223dd3bdcb36ebd7f6892b39af68c575c4519e0e6129c106d1b54e73b3";
+  sha512.doc = "923420250cebec3139f95fabcce09620b25b653e3b1bfa5579196c2b067df04a3ea220eaa84677ccc3615a778678d458adb5bdb9954b3eb4ef264d2d32d03d4f";
+  sha512.source = "6f14d559ee3645820888aa664ac2e3f4bee1d0843da4fbd61c9216293ee008335e267d458f788f983ea7f7604b068c2cac18ffe91519cfc825af17c8179ef8ed";
   hasRunfiles = true;
   version = "0.1";
 };
 "xcolor-solarized" = {
   stripPrefix = 0;
-  sha512.run = "a45eb06c15084c53dcd666c3807aab97f50f08d84ec423da84f805aa6b36fe6960babae921e6e3999323120dd8a39cad2e400175f03b8d33d0c9a1144c1ad612";
-  sha512.doc = "81b6d0189d782369f34ec9742f1edc9df18b14eb47b6d8b0ee30a241e5e59fae945d5ec6850dfccb8dedbd01417566ffe260b827476fec44bf82e738699f0ad8";
-  sha512.source = "4b7bc6224328117f8e61552a8a9341883832c73ed7736e0a1412a35ecce7abaa8ea9d29d51c90f341f0403894a56b866fe7d1f707438c02d661e425a7b6ebdcc";
+  sha512.run = "b5b93f98086aa50e2a0ec237b1910c4905fb589a7ba961ccaea6e5fe580e75cc06bae63d10ebf8e882a74bb673dc701f01253ad87706454591958ee6ab394416";
+  sha512.doc = "d106e7d163db052c5a4c3d1ceb78d408410c1528912a590e9ed4c09b0f24e0845402117a34c7fd3e3df6dff73617e524f6f17ba021aef8080036d8da20a03c14";
+  sha512.source = "566feea117d9c01025a2e1b7fdee544f662da7b6f805de233ea167fadf4f56ae273eb2db78e941f2f4a210fbac8cfee4e4e350897503484d4ff426fe0fb69ffc";
   hasRunfiles = true;
   version = "0.4";
 };
 "xcomment" = {
   stripPrefix = 0;
-  sha512.run = "d4c1f367679a7e7c826fc4f10fceef2db6920d11f641e155ba3277f422f461628febaf2348e1709ed0e75355257f94786f0e93dfd2251f7a8295510038dcdf40";
-  sha512.doc = "6a501b4a30432b549db22dc754ef98e11a44fc69b11f488b2ae56308a86ecf1f21b0959b735eab33e7480cdb79891b62a02f54521b0489296e544765cd1b2c8e";
+  sha512.run = "8867f647e4456e28edde05baf8aaaefc56336026d6411af061b053b1b370e047173e34dead98364240b07eec2c30f5a060823bc790f33ec468b0d5599ebcb883";
+  sha512.doc = "6881b16ac0151914fa7d82409bc4f55e95e3bf93eb71523267d03713fe33b8d1870f3b0f199008db6f17297b87a912ded730f89e99671d403733e84d154aae87";
   hasRunfiles = true;
   version = "1.3";
 };
 "xcookybooky" = {
   stripPrefix = 0;
-  sha512.run = "2dacd2b82e131cf280d3d6abe588b1d454f2fe2d7ff2c991fbf1c6682a9a1046146a2361c31bc748bbb2d717daccbd1f5f72a964e72846890000a239da6b4c0d";
-  sha512.doc = "cf3796917ec9a032dfb362dd5eb5f1aa8a49927fa6fabe431226728e7b97e6713619dc3e5efeb5a7b4de9b1e9628d09f6e2bf811bd24b3468f11392ffaad7a6c";
-  sha512.source = "46fa79ac06a68a4ae4c6b53f17872677969e6500618f0f1badb248ad5482f9b2138dd6272393cd8cc65fd9d2bc116ee53a7abebef68e9a795e976c402e2b07df";
+  sha512.run = "75f3287628f1bb47f8355c3dc52dfc7ecd82bface859837d88065334f4d5a4db1c472c68543d388684b6ad957db2c6bce2ed5511293be59c7d8a73f146c26eab";
+  sha512.doc = "c75b8792d3716c75080e2f6597d4e6cf18e77988cca5519794660fd398b04cd44fd0cedac75320c0507b435ae2d3f162cfd38ae41079e310e3a013071c1f4d26";
+  sha512.source = "47aad6f64e15e4ae7b359e8cee15389b568745bee532c97a23c245eabd1cc631702960a642f2839883b59050110365b0cadbe43822909a11830503f8f2f49544";
   hasRunfiles = true;
   version = "1.5";
 };
 "xdoc" = {
   stripPrefix = 0;
-  sha512.run = "e1bbfc9934bef78fab24eb03030a14003103823b0278cbb81827d4ad41e3a45f7d60ffb1cdb1d1a7cad5d02d61528017c898ddeaeb7017b15a51e08cabf24a71";
-  sha512.doc = "fb831ce551088ee01c3f2bcc2bd678d1cc8ab6768ec0bc9472afe5b390b67296d95a754b36731be206ec9307aacd14a2dd6ba1779ba09ade1a4b3a58b6104723";
-  sha512.source = "39ea74a9c1ffe0ff17047aedda78305bbe109bc2ae2dda51c5249083246521ede91a25553107b8dce495e81718b2c782f5d82523d2983b98357d43c89fa26be3";
+  sha512.run = "2397833bf12a53123453b96ce580bc4434eec98939b81660b020d7147aaad9b2890a0bf57749bbee601641b8fee12ccb3edb886a3b8ea39b18fa763b40f6ab9f";
+  sha512.doc = "fc9e2024ca811959e1a8f98b57e4f5a747114b92ed079fabecfb86860e2808f3ca4b7d33129c50b7fe1f230bb162069d7d2ee3a5ff798615f33c6a4f8016a417";
+  sha512.source = "da4949c2cc31092a1c6cd59ce6b0642801aae5a39c7d8a0faf9c5ff259e52cf7427a985d71725225af2fe653b7e617b103720e985311d2dde897adce0d0dfaee";
   hasRunfiles = true;
   version = "prot2.5";
 };
 "xduthesis" = {
   stripPrefix = 0;
-  sha512.run = "17883a9355c1e6806cbd8221aacdd85cbb56cbba6a49d806e80515be935de0bff1658abd8679da71f3d71eb4637bf9fc5866cf705cc5b4b80dba85ce613da33b";
-  sha512.doc = "4831e30c92e8252d604cc2ec25dece8b5b5974afd8b9270abd6fe21fd7d406374cdcc0540e5e4a22bc2e4195d1aa8652b9e9e474e9bd4d884b4a3e3889ac505f";
-  sha512.source = "dbc25025ad64eb6125ffbd25d5458a14eef9f8097934b4330c45dfb7dd31bc2137458b1bb2c92042afaf6d4fcac8cfe2d8e40c296f2ba6ea943a73f07bf6219a";
+  sha512.run = "af0512163bc0dc196d8816245b9e77d4f9f5f84b324f457e1087467c22dfaf9c790f0e87995cad9546b950f31b2bdf690ccbe9070ac8619dfcb191d6076e2f6b";
+  sha512.doc = "9047ae71cc7edea927b46bf240909c93d6f268c568dad974e131a5c76b98b35eb45eb893358c0b94c6cf0ef5243e442ec1967352685e5c0c51d916a18cd9241b";
+  sha512.source = "8cb1c75b9e5b491fae309be42819dde6e072c459cc20dcabe734747f579bbd328d23a520953024435fae115c02f7d115747a625b8aa53527631c84e372449ae8";
   hasRunfiles = true;
   version = "1.00";
 };
 "xdvi" = {
-  sha512.run = "fa90081d46bd2a57f873cbbe2ac7081b63a0dc425903996f69d5ed15091a136a30e266e82df17fed22c69a9b79b44485435c5e3a75869654f15ceee0aafa1d4c";
-  sha512.doc = "0743ee508fad46b0b3b04a5fe5e1401b2ffa302f43fb361e016bd4461dd3e542a248736fa2b7625fc83d1cfc29ca90a8e48a6553a0754fb245c910a6af6c2dc8";
+  sha512.run = "c0c5598e3683dcf6e9eb435f7a9a6d3065c79738b697d67ddc42a8ceca56a72d94f98ff06415d5c044f971b3f4f9bc58006db0b90f67d2c6b0bb2cc3138f5f08";
+  sha512.doc = "c28f70bab7e44e3b20358beb24a420227e1cb90511619d45fd04db81a2e126452acbf2e75eeaf04bfb70c6aca8a51bc1f64594ae153124d394bd14074ea5c18f";
   hasRunfiles = true;
   version = "22.87.03";
 };
 "xebaposter" = {
   stripPrefix = 0;
-  sha512.run = "3aa82dcba71de4047f73daa3993c44d2d0e6e58642eb11c2862315c9e50ef3765bb7b55973a5861b04878df6d11144a888770a56f485a22bde08b124a725bab8";
-  sha512.doc = "4daad101d3dd4597fec0c48dca77bfc7ccc7cc034f9426be5b7dfbc7bca1c2edb0bb288407cecc17c0219282f088bd3a7675ec98e6bae25138c99b98b606c1f2";
+  sha512.run = "75c400b4d66787272723e857046b2244990cbf3153d0a38d181dbf4b7f2600a9a4983ed67b813685967d7a7a0f665160ba5ed77468bbefee56a1af95e0eb32c6";
+  sha512.doc = "728715baeed069a5ba01dd837fea5a405db1904981e63d269fd824cca12b294de8865692a2dbe2e88caece8fc3739bb7db6c6326e5f1bf8a3cae6a585bc3e854";
   hasRunfiles = true;
   version = "2.51";
 };
 "xechangebar" = {
   stripPrefix = 0;
-  sha512.run = "20a14493f8f1b0716c42605c35e3543fd42620a6ad0a8eac378d44e8d806d7451077d3dc6bc0ffac72ca2e66fd02619c0334cfd82fe739238ea13f2b0c019ac6";
-  sha512.doc = "bc09a7c82f59ceadceb1b3b2cdd057eed1f7992881e9351795ca3dac7e31ae42608b4a38f17de7ae38270cd1d430445d3a9dc15e4a16319e3c8f518e2cca96da";
+  sha512.run = "a908453c719734e633fca6a9c7b40d8b42c1aa62428d18eb48e5cedb92bc46bbaaf717f126f35299a23a32f551ddb9058bdbbf910451abfaa465bb4ae4081665";
+  sha512.doc = "30aef39d5bdf36f98cfbecad45d604c46cbbacbfd16565805257da8a1031c65e8f29069f449bdfe9758d2ab17d4cb0d495d19c37a2e02557808718087e64f6ea";
   hasRunfiles = true;
   version = "1.0";
 };
 "xecjk" = {
   stripPrefix = 0;
-  sha512.run = "cfd266de19d1d448ec6f28bc0eade1f5f55d18fb0953b80413b26ce0b4fd116800d6fec05ff8ba57514ce50cbe878c0ee1d8547646c09465ff48e0c9bacd956b";
-  sha512.doc = "fa464bc7fb06f381705c1a650fcd38be5cfe275c0b0f9d1bc190e9fa6894cfbe8b50a963f965ee6934a350bf938faa79b2e5edaa921956a911feacc9dad20160";
-  sha512.source = "7f4ca550a39e0d587d2b2eec72bb444a72a329363ac3fd8825d264d4be917bd106cf038be6b0c7292163e035f0285bd62c8b649ba0dd9ab7181235368f2c1e80";
+  sha512.run = "ae78f7c8652f159a8ae46e4d49f4163021e7d3f19490eaf72c42d3d148e228d3ac36fbfc475d6893ca8586cc802be8a2cbc6a1597b1f92971e277aa9c9c5d5ac";
+  sha512.doc = "e4a0fc598e0afad77e54e0f621291287006381a58ef6e7d5f7f42bc3c4def72de277107dce7ac5277b8ebf3a51cfb3a023670fa36fc3849033aad10dd28d6c54";
+  sha512.source = "7ab0c4cc0247c76ed195434cb84ff7d00a713976dfd688f169b3de705c36d63daea5edd1a2b06019dcdd7f88e1569c4e0a3936e8e32043718d9332eff86b1649";
   hasRunfiles = true;
-  version = "3.6.1";
+  version = "3.7.1";
 };
 "xecolor" = {
   stripPrefix = 0;
-  sha512.run = "ce32eebc5cd6d58950369d3d6b34167fc22613dfb5cbc5a30fedd231976216ac0c6b29cc9bea7e83226429e2dfc2f5983fd63a79687e1fa4bf540c287e3a6689";
-  sha512.doc = "77b5bacc05dc6b0cda3b0a105fb11a61547f850b94c4c87ed6b9f1ab6522f2d669726e57cb1735ea7a332799a4378064b97c71f78c96fed58a573a7725fd1a45";
+  sha512.run = "a11229e257150b331438619404ae148c21ca45d54aac5720b1235eb9ca6b78660ae246ad5dafb32a92f19be69c67a0638c40fd3736e76e350d88a1e74bbebbb4";
+  sha512.doc = "3e06d4c8451620c39783475c4bdc674fcfa28c5bc7000126dc2b1c97cc3295d3bd661b7ced95c74c61950eb51acec10d7ce153d9af33fcaa654bd8fcf624e88d";
   hasRunfiles = true;
   version = "0.1";
 };
 "xecyr" = {
-  sha512.run = "27789d966edaf89028a0c5e40ea0905f57afadf8d2bf36ac7f1d225a91f2f17f0c31129c0275a546084da430cbfe55b3e7c4a976d5d6f58edc97e85c6b95ed8b";
-  sha512.doc = "5273e472c394d60a332caf4581bb6340c2b4d8c446fc204f8063142f77f9c4967ba29054bdba5e07dcaa0e487ee967712ed96a1a0a2e8f9d3bf6779cec03a81c";
+  sha512.run = "f502f7375f5a6423af8820f6c0a5d9e85ce85b5508d30ab2f2442f7bb24d108ce0b190ce7f42b47eed699f3de5f2eb426ead338b674cccaee160547e8f441c0b";
+  sha512.doc = "4d5fdda631df9683103ce264cc064d6d4adabc7827dba4ece949a10bb2d50948a5495b46091935cdf941c177542a0f9397933e86c1f1eb97fb161d03dc48f057";
   hasRunfiles = true;
   version = "1.1";
 };
 "xeindex" = {
   stripPrefix = 0;
-  sha512.run = "c033d7423c8ac670c13c28ecd1dffb505bc11c1f1f863401b11115f902836808dc7f118739d470556c32922cba1e30eb67b8d6c6eaf090f866e72e7f358efd91";
-  sha512.doc = "0eee841378b5ebd6138c22f6a73a28e9df5f4892c0a5f39d9aabba508276108f0143557ae6a28e5c3d273b9540f6c8c60ead90d03bb4708b22d6289eecda0b6b";
+  sha512.run = "09ebfd24e056025fd799c025005da2d5d932cc2f1fab48201da7c9446968654943339188c1af458ad33046fa9fa63ecf6d66f6798826557781b916ef05249041";
+  sha512.doc = "922a4893a5e70a10a62e5cf0419fbc1617227acc88aa0aa9c69e1c84dcd1c67c29fbe51349cd4f66ee2424837d8248be7401d01d295247c5324e971599d4ecd6";
   hasRunfiles = true;
   version = "0.3";
 };
 "xellipsis" = {
   stripPrefix = 0;
-  sha512.run = "396c94843968e1392b58bebb1e00bc39a029b7826a82d647e003e335559c2d8ee4d87d72ab961f73297fe3e74f9daee94b1115368b89bb9795f1a546c76c3bd0";
-  sha512.doc = "d6f5320924c44865dfd54144e9b9bb38f0b477186144be9f5d07736ea3cbf32f991fc16e161e032d8691481685df33b9a30d392bbfd897be96becc6cf85d8243";
-  sha512.source = "903d56cb682d53fe450e252da25b68cf46e4513a74a035abbe244eb93b952dadca1c5b226fa6cd1f6ec051ed1f72cec42cc512f1fc1ae51046fa310987583ea8";
+  sha512.run = "61b15fc6274c833c5606932fc45715f89c8f9b2ec16c8b245952dda8d7531a5cde74dc676c6a32f188a7fa2ddc30fd0feccc51a7499fa87981a55c10fa924b2d";
+  sha512.doc = "272410d8b196c60551336cd5703775fe39225a9ff51d466e861f7f06fd0b6c0a0a0306afade0a72d3d4518ce8a1fbb389d05ab244ef8b7f12320e81497e3091e";
+  sha512.source = "8ebb3c94c0fdfac250557bc16b1787f01ac6daa4f30bbcb042358652fa4f70fcdeac61504d21cce92525d5242012f980bc097c0f14ffb50edff665b611300803";
   hasRunfiles = true;
-  version = "1.2";
+  version = "2.0";
 };
 "xepersian" = {
   stripPrefix = 0;
-  sha512.run = "f2396774b510246dbafe97b46c6062366a1e886b48c9803b48fd81df1b3bc47113ce1c2abf4ee61e45c30fa1617f9d76eeade5ec68ca17440efe8acb1daae958";
-  sha512.doc = "fc4ac27786952a00ae67cef05e07b2019aa40b6267bb794b47396bee7447bf8ebf3bc70af6dabb0a4d4ed8c5bd7c368bb40920c6932495bc8dc4c46c4d3e0623";
-  sha512.source = "cbc880310d4c4130d92f9bd8e18ce99acb54831ada309e16c3b344ca72faa306a625c90f71e32f9941a55a230a89cac9dd9306e313f7a6553968aa1ee4e4193f";
+  sha512.run = "68c0654ad919a818f983509ca46b7ce3a63e7d590b67edc521116dbc8b1f54c659af7c6a225cf982019ca59440dda55b3cf99708995d711e481f7ad41f2a73a3";
+  sha512.doc = "4637d7cddbc9c52bc8fa1da07b48cdd24e74d85395899213b025c4947e83dd7506d6905c068ae96370fa7abc52d1833f84de70ed8b9aa4fda4befc757d97c3c3";
+  sha512.source = "b86e4f0d948b34e2606d9c7920e7dbf961a8b983a80fb36e0fd274843c9bd861c0261a93c9d29c6ae2261087dda9c90032ea4d5b31814d149f0b207f6d6f3755";
   hasRunfiles = true;
-  version = "21.1";
+  version = "21.3";
 };
 "xesearch" = {
   stripPrefix = 0;
-  sha512.run = "b0b0dd42f81fa0b1a06555f7300837ac518eb19f6017e956811e068385aaf725c68047b3b4fb92f1fb77c42f497818358e8ea71e9579daec7740c331ee73e645";
-  sha512.doc = "f2d4e4a84630f671f16812deca3e2f28c4404e8440ccb553854934eb4973b45b1a536745012d7b86c776b13edc6562eeba876aaeaa31eaa569f32be6a45e89fd";
+  sha512.run = "5b75ebac31948dab9cb6df7df31cbd29fcb223e5c5d0be907a495aac7a43669d2f86e29b295f9f488edb074681fff404cec57b2ea6805c64786333ab65a7810d";
+  sha512.doc = "8e0a8e640d746c20bce0e1103d54af502ff51f29208e4975bc4d653dff9ad4f3623245d636551faa4a3346249a7094535ab8f6f3edbb1a5c5cb941bb534c33c4";
   hasRunfiles = true;
 };
 "xespotcolor" = {
   stripPrefix = 0;
-  sha512.run = "64baf3959c9bf1d039233b2ef5aec50e3de4b01d846833ce9bb47e32f5869b132786c10af8c486163fb27788de70d920e1f8c8b966577f55254a626633b2a07a";
-  sha512.doc = "ebaae19a5c40ee8b2a9138a3830fb6687aa8ef349a19bba3aec825d2804997e829753d72ba111f160d3933ba2ea5a10d06605b6c2b604aa1a58be92fd900b5cb";
-  sha512.source = "d8fe04069598783852127a0d7d2ab71b2c268ec1b070494caacf909621dae8e467ed4e6b8cd34d1e110d4629b2559d0b2d7f2f48398703c2fb1686255cbc5288";
+  sha512.run = "f918440fe86ed958cc7657cf9cf774626bb1d3da91ccc10398514e94558315bd55fab349df4901f486651d82d9fc03b851ceabcea344cd2c480447d5c7c45a03";
+  sha512.doc = "5904aeeb570d9de8825ee10981c7db17c18c640c6ad8a69fa1961ddeed354762b5dcaeb9ad16e5741a4a45fc85e9679055f51321c316aa3b962a791f7c4db184";
+  sha512.source = "444cf69f33f04a23f0415afa7885778b06601373d96b3a8fce22988be08d3efd3a39ceb49ced3b2c81a61f4aa60621156406e11ad4751661a1e4ef20b38abc85";
   hasRunfiles = true;
   version = "2.0a";
 };
@@ -27050,158 +27788,165 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."babel" = tl."babel";
   deps."latex-fonts" = tl."latex-fonts";
-  sha512.run = "7bbcfc2283775c7ec8e7ca08b09ae0b8161598f9dc43de1a11147bb23669d5f7971cd62daa74670008a2097c63dfdf4146e7cd6024b7509f3edc4e1859f9aa4f";
-  sha512.doc = "62ae2218568b36d8db3890d772b4fb89802813bd780bb964dbc68e9638e097174e21ca756ad815b9924b022b413adaa009d700fd026fa8e5e772da6f4f9c8771";
+  sha512.run = "4c4a8b51d53818e1585b08f3bdd1f534a53a7f960993116961ef6f0e6b5e1e4cdb5efcd8f74a57b202ee2387c392732824dc771f5adfbcb40cc94e21aa5476bd";
+  sha512.doc = "c4b6a2023b9881e6c258ace323210d4af222390c08987ae6a4e300e3ac6f795595db50acdef1ae99cd45c0a6401baaa61d6759191afde5862293969099dd3023";
   hasRunfiles = true;
 };
 "xetex-devanagari" = {
   stripPrefix = 0;
-  sha512.run = "edd2c40d99c047765a96e778e92db4cfd3b3ef9044d3cda320c8019911ffff2b2bfc3cad4319cbdf3850bab68b5abf4a91c249db3dac10e2f0de2b978076d16a";
-  sha512.doc = "deb051cb19d44f438ac1f3b7716fb66fc6538ca1ce33c1b84976d6904715d17ef65e4a2fd015f168d908b6905d0a2de5621d8b03150e45b7f5dcfb68f2eeecc5";
+  sha512.run = "c25ef95bfec0a9c6c394b37959f6192d15861b75ccc9b86af0041b213640e14395de8c0b4d87cb8e5221ef56d18b0f67eb7ac1b6ed1632658938bc96b4ee77da";
+  sha512.doc = "6e2d9af2a10ac03db7f9228d2a451a6087f6c5bd3ebe7034822b875caeece8e1dabc7db4a33d2d688607c131f106198da181eb202be755950e6bead50130416a";
   hasRunfiles = true;
   version = "0.5";
 };
 "xetex-itrans" = {
   stripPrefix = 0;
-  sha512.run = "152fddff5ddb74ae989b5a21937913735a8abe12eab3eb188137e23fc6e9715a093dbd05c661c0680a316682e8e3f6e0d298ea54e4ccf03a93f5fe482569b2c9";
-  sha512.doc = "db43156294adc446bd7c9b437af10e3b8cb1b6b63d3ea7637b932954ce0ea07dd285d00b45f60550067897f8c93529455dcb0f2bd5a771ec9c2eae8885c01ba8";
+  sha512.run = "8ca2f503c48ff5730e8ad9249a10b1c608de5100a90cbec697092a1c99d2f0226e24c9e9620f341ccc33027146c1b1246ba240a734eeb09c287acfeee7fae4a5";
+  sha512.doc = "bef0166c038dff3a78c7462e95a469be9e872b029e4dead2996bfd275050fc229c16f3fbd107ce0aad0140caf533bac433b652e5920f037ce410afd8188beceb";
   hasRunfiles = true;
   version = "4.2";
 };
 "xetex-pstricks" = {
   stripPrefix = 0;
-  sha512.run = "5287de779bb1c8970adb0a1620cc52c51f5d407afb72da6c1304039f27b440123e08a8318c1514bed36f4a626436582c975c60b50228bd9dc739ea2746e7000d";
-  sha512.doc = "81932135c8644c147e0ddfb14ac1e55bf0c0f52ef47f64a0ba53f9de571916175c4ab6e50bb9404e35f94951231fffd30f73886211e37d738f77be0fb4938e54";
+  sha512.run = "a4e01a4bd9db6f8782f136c6d7922872880dda72a9855669c2313b209eca7b02dcb353907c5ebe0624c5543fc31b7f57de7eb8486dc0f5152a8f3077b4532f08";
+  sha512.doc = "31382f44509d41c2916f03528fcb22582db583a9491e6d6c3aee6c72c08e27072e35ca06c00327a42604ac4f8e6d99e05b616e192907c2577b26fc3c968af51f";
   hasRunfiles = true;
 };
 "xetex-tibetan" = {
   stripPrefix = 0;
-  sha512.run = "eacdd8f4cbacc0da1a52290c843f677895653bd4e370939f122c652b2a276c3d21bb3de020ea4b6a54ab1dd1f8b74e60ea45eebfd4e2ad67ae40c5ce9d0eb63a";
-  sha512.doc = "95afdd9eb07ef085a43cc15551f783cf7333d19d3969e573d8733a4aebcae355e6ee1ff638271aa007cbcb363a85d1fb604c34cb3e001c54e71150f3ae033c83";
+  sha512.run = "5d7dd16a6691a820475e3cd56d13f35d3de0a513396a96939aaaf6824a106cd1f52b91e49fdda14b1174a25eff59c6d362508d3cd444bdb5950af2a04f222958";
+  sha512.doc = "a185f02a82a11ad5bdfd9de7f8714f4a19cbe455844afde16e8daeeab8470977ee3759eb71ad8c4de7cc7c098b1a8ba5af6f4c69bafa178b650795edd7368fd0";
   hasRunfiles = true;
   version = "0.1";
 };
 "xetexconfig" = {
   stripPrefix = 0;
-  sha512.run = "a6b6b69b363abad698bcff1a6adab956795b2b61b2d9bc9f1c26694d62746a6564afd1da3f8d2ee05c03081166b90ff071cd1454ddcc83cba69c38d8a0c434a0";
+  sha512.run = "83e5b131704a05544330ea1806ea4269a500357838f88f99b6a71a65acc8714719550b5159f1e1fb8a114c37e038312ed21df18d74245b2c3e4f35a4f6dd2477";
   hasRunfiles = true;
 };
 "xetexfontinfo" = {
   stripPrefix = 0;
-  sha512.run = "812cd84870011dab795d51d3f6920ecbdebaef14680edc180feb8fc82269dac7ea6a57af47f35a2cca60bd8c846ff94c867f7493fb34cb13a88424dee841c6fa";
-  sha512.doc = "3701b2f461fcee38a4541597309f8f382811833a84e4ce724a54d98b08debd222e147d1e1c5789462f8a76a487dac8c8219d4bb42d63f2d3eaa94e13ef004022";
+  sha512.run = "30f2828c44acea2929482929ed765eca04f5025de00fb2d1ed4a7f909f974e5f077bbd6eddc932202514999ebf857e8a2b184b9b83c4964a06ec472496b180cb";
+  sha512.doc = "be5db6eb188d912e776aedc35078fb832c41de9a34093247693f199dc63c89b323705a66c0573a89e5218aa227edbc104301f15a636773fc10e701d40e27c6b1";
   hasRunfiles = true;
 };
 "xetexko" = {
   stripPrefix = 0;
-  sha512.run = "76a1a11b41bba197df1f9ec5a12952c23822ed6d3bbd71d2a975f5bcf2dc280b5d853aef109c7f704a4810711e8d8874f9b1b0df47e89b00ac688d0101845c5f";
-  sha512.doc = "cadbffb852da91c1b6381d58436be92149a2a86d74cd3b837d8b900855a7e16684a01871a6e00576ce132e3a7c843ad6cfe82dcc09f379793eaf73cf571299ef";
+  sha512.run = "1455e0374a3fef0b226b4a3bc78a9d5d6ffad5e2894a6e0666a2f7727b59484d622cbd32731447975d18927b136accb6ef701080ee89473bb9c31834ae99c2a8";
+  sha512.doc = "a6022a7b410c99c8077118e8725295403e52a85ce73a7aa11d85b100605dc234dfc864c3f0330b3f65688229e8c99b7f85c09946bb15f6604c0776f12dd4f692";
   hasRunfiles = true;
-  version = "2.17";
+  version = "2.21";
 };
 "xetexref" = {
   stripPrefix = 0;
-  sha512.run = "f218c61033ed30317b59fdf517865ace0b5c46198494f71b2f0fd1c1a10c1b9da4e29e0be65f9155ab9b5466b0b16b2ba576770a0df2a65d368c5a4439828082";
-  sha512.doc = "0f6a2e2880b82e23617e849e2b5f010e73877a9f8430d00297b927aab27cc728e63e2869cd295ae75b2fbf62d219c905c14102c6e43f4168e427b1428b16baf6";
+  sha512.run = "b6e54397e45efd11a2164499ec54e405fb16dcd8e5b908dc7e382282e49abf7264d9c30ae6aa9b35f974f69b4b2c54f2bc54247633d75baec36fba9c71187691";
+  sha512.doc = "5367b0b0ac8b9655e4d9fde0df68781db2b1b1fc47cd7bbf596fe1a04eaa0bdc4a3749b7b502eb4ecd9f23d70c36e18f9c81af758d9650f3e8a19495e8e2ba97";
 };
 "xevlna" = {
   stripPrefix = 0;
-  sha512.run = "0604f40779cce8520cdfac2fede50ccd276e9de8da27c3c6674b558d72d265a036dcf3f2c726d36bf86a51dc1abe96d62ca7396fedd7641808f1aee8050af4de";
-  sha512.doc = "78d66ad5b5c5d194b72c60139e7f7a438f1430cda18961572be8ae74b75ff61825ecfec040b09cc18525634595e89e02a519f4ad8716fc6c4b6ce1e8ca0bb70f";
+  sha512.run = "3c7fdbf1d3cbd8307dadb6c777cf1c85463325d781005c098f8192e3163fe7f64548b5c4027e51534a4d4db05d58d46ba2e4c4e9a91f23144514db144a35a8a3";
+  sha512.doc = "22abee47faa73d45d4c491ced84352b756e1493a19099dcab08e10c39292ca044ae351d0c20db7c51fd7ac2e6af9bbb1ac76d304d1f5c87a09e2728dc62eabdd";
   hasRunfiles = true;
   version = "1.1";
 };
+"xfakebold" = {
+  stripPrefix = 0;
+  sha512.run = "5280f916a16e48fb85751eb3b074a2890790d23d775dc0c3276107bab9e2015027c2b9fb8d63e7f6570029ac3f7fc1c2f7da05bb0b32b9891ad68cb04e123ef3";
+  sha512.doc = "8eaac6452c8210076e9c4c5957b6d3f9ccea469d5e08f616c7bc9547d0ffb98fa9e724a1a99e15e78b230683b89b5132959156c80202d8adc43741179e632ab1";
+  hasRunfiles = true;
+  version = "0.04";
+};
 "xfor" = {
   stripPrefix = 0;
-  sha512.run = "8bf8c36084f5330cb00696be8cc1b0bc2fc3a8bf25cd91249d5177f66b708095f40a18a938ccbcc20a21dace6057ddba5d59aa8c89d56aea1e755ad23bc7ca0c";
-  sha512.doc = "7ea9fb8d92f799c133b8cbf8b546ee58a41481c4e0784d4e3011ee553adf693f5809382a544e8be8d98559d2f54d2f18398e5b2cf805c5497287bbddf0ba9c4c";
-  sha512.source = "5ab442c4d70ede5540c1f464e7ee9a0bfb4cb833b030d70e2563f3182e36a7246d7c10200d0601fe52e00ff5f64726ddd5d60a0c4bb73654d2e58132c7281ea7";
+  sha512.run = "83cce9cd64407a3c2d7a6a9828b49ead14f211a30a1a76174097761ae3352acfa65f4d08fe4c4c1b5cf70875c83b28a8a3b174cbd2e9f9f83b109cbdac23f61d";
+  sha512.doc = "28c8480e8ec4a8dd4704dc7cf08c18aa6802825c0ec99ad3d5f9e72f7016f8857b8d384ce129f97470259072da57b201e7ae079aad0c640d7a9b69041a48d922";
+  sha512.source = "e59c4e0097a3fad651117c7a7d18d71efe08d2136db3aa88b8275fca28666b7e2de77c93b1922da8ee505bef3906cd5be9da16a9effb6626a8439f4b16106aea";
   hasRunfiles = true;
   version = "1.05";
 };
 "xgreek" = {
   stripPrefix = 0;
-  sha512.run = "f039c8f1713744a35fca6cbf6fa55f906b2e9faeec21cd04b18c5991d2efe24abaf1e294cd59b4e9526c89d0882d35ea30283efed3c025805775337830384b29";
-  sha512.doc = "2a47f781ba0d070c3a0cfcfece08dc185b381fa1ce5140b451c0b9ffd55ecaedf445b1d11479bc21ba91d2db92812bc7e0d59e1a52a6571ee2e387a9b31697c0";
-  sha512.source = "78922dbf2548f11ce47bc869eed799b83afd475ecbdc3f1b44a858423cf5a8764359cc073af84a35441b5953140c854c26cb4cc1af51ad8f5595b45de0cb38a2";
+  sha512.run = "7d65570a4fdf1d26ae08ef1142fb0a1d5912e4c72db04784727ab292523bb1f5156186ab1993cd0f905b68c2ba9186e7bd634c0655d07169f34f4a2734e3acee";
+  sha512.doc = "05f2941ae636fbe90a5f76b56daaad04235ee4bf86d07f88ad1398f5571da2500ce0bc43fa97cec0a559198acb1e337702435fbe69b4975bc411ce6dfb4cfc8c";
+  sha512.source = "9b2f9873792d64bffad2de4236d6adf007a676d428186d55323eba8621b2bebdae7efd420cb20f8e998926cc894eeeeba41cc8050653fde68002edede21e2f9b";
   hasRunfiles = true;
   version = "3.0.1";
 };
 "xhfill" = {
   stripPrefix = 0;
-  sha512.run = "15641433aec0e5a56c8d744d3e6a6063584ad53fac84559e5ebe483306914ef4a0e70adc4da70fe60b008091fe24cda132517051d5c99223102ec290d1f371a5";
-  sha512.doc = "962b3378e526e49ec6e640999c0964b755c0f6b2ec1b2ad1c8c6963c24e19e4f5bd0bd18f9f7c84ded40957ce64179dc586b16ec42a867e9e6b74be8072406f9";
+  sha512.run = "a77b74deab39670366a61c34d9c10adb6303a1f84802764c14d633a8deee6bfe09cc1fc5c04e50d46243ef07326bef76e767f3968df17eab70111f292a7b1cec";
+  sha512.doc = "f8cb4572154fc26d0c4e08dd9dd59055b1fc7937a1bb0622e1724a6e9bd6dd20a7fadff3477bd47a186b26ccf3886ee8d38af5e4c48af5d83a15066bbfee3769";
   hasRunfiles = true;
   version = "1.01";
 };
 "xifthen" = {
   stripPrefix = 0;
-  sha512.run = "b9797e341839fd0a7d32746fb5d85eb75091dcd25dc70f4d51d9f3fa40f3870a70717e2eb7a57134261a251aca1b2e0f5c87e066bd221bc224e6abb728a82060";
-  sha512.doc = "d75fe68ef4a8a427bfb6334d3d0d10cbb436efb67c998b03343103e95bef90d231e75bad52ab9779a5b4cb6337347474b20096d0d69d0fdadfca72c4bcaa156d";
+  sha512.run = "e66387225b3103fab548c875e35f631d7b06a2a9cad9e89f8c3cf5876036425b26e5427e0674e01e26691ea3207a1f835da88b22b063dba2a45d003845a03f24";
+  sha512.doc = "376e73b6b656f5d9665b1dc30d685a2d5b4bd7ebab7b546be56171bb11195a37adefbb1594837ed216df2e4d084e89fa2a32d5507ee80ddb5de430f383c414bf";
   hasRunfiles = true;
   version = "1.4.0";
 };
 "xii" = {
   stripPrefix = 0;
-  sha512.run = "0057eaecc2fbc45f2d08bf51a82069c676e9f3ac44a24118e2747105901e669f873ab4efad49d47ca1108de0a3d7162d71ce4aa61385e9df012f607350b208f9";
-  sha512.doc = "19dd5f95b0d624424b20508cefa3302489f1528f138029ad6a7d350219c0ce617e19e45472b665ba7ecc97af703df3a119cb9c1239dfa98f4f3c9b67b4a05578";
+  sha512.run = "9d119e156c72756996a5a79c0839ea70d12ef7f9e161bd918bae8da51a64bc052f292a9c449b51cb3219536f695dcf3b65ca0c6abc192d59d19561569ed09117";
+  sha512.doc = "0acb0cedb2fc055085d482fd716526cd763c5117befd5865fa0be675d7457e19711016f4b4102370f40de1c46bb249afc41b0aed74156d4c05e503bc12aab598";
 };
 "xii-lat" = {
   stripPrefix = 0;
-  sha512.run = "9cbbe13d44d71e2b383f5863d1b4d488eaedcfdf556422890103eed5230ed96582fde2dfcdc51721de41a6152bb94408b9b109d60e899329064545532a5534ff";
-  sha512.doc = "81ce884c6f81843af4efb9bba99c2bf95c43b108a2b18c55f54725493d6ad8b8a1d62c504a2f6554ec4a9a4fbaaf6adb2abd4d293b28baded6fbf0a63455a552";
+  sha512.run = "31d023dd7322dc0143775391ab2250e98ca543e48e77d410d5512c4761dea79c18f2f65f21dce06dc69d9e99186e2991114d554873085b98bce4cd411f292d63";
+  sha512.doc = "1749bf5354cb5583bd9cc75b5524df67f217c01cd12390c3f116096af8a9a9fd1b34e1794dcb581c3511408bea3778429bfc57e2385ac8a7471fc371c48877ea";
 };
 "xindy" = {
-  sha512.run = "0caec7677fa78816a427a0eb1fb7f89570711df0904da308ef1455ac044e61dca9bac89320aa453dce1a027d34e6bd95b5314e6a0ce20726c8ced6c2e26e2e74";
-  sha512.doc = "136ce6181156a74106991ec7b8ce99fbbd2abba11976a951bf7bfcc7eee758fe14f12de66f8853e08dfd1e423acff9cca537899c6dd2b43190a2c3b7e3a6bf9d";
+  sha512.run = "f8e1e5880db961daac6e0f97aeab3f3ee643a2c50ba27def1aa94fe4938c4408622acbc34313202ae37ec0c32acefdfb06c58d4da789e08375b5b3b92eae990a";
+  sha512.doc = "7600f602f77e527e20fa3eb000c581f4b055116ba7cfc1483180aee1113a77ebe274097d09298c3c677dd5aa556d8ab3f348bfa5edd204fd7db09c21cbee1bc5";
   hasRunfiles = true;
   version = "2.5.1";
 };
 "xint" = {
   stripPrefix = 0;
-  sha512.run = "bfb36e864c1dc7b3d890befe632e0ade3cb3b0092549b0e9670d6bedcda35bf3b74ddf7664c1c661281d6ca3bb213b30732c03828c5e6425867fc265d4568ebe";
-  sha512.doc = "ff2b2ad8c68b220d720a70c5c39302a56d5a879cd499310079932a5281b73630a417a837f939a8ad4c5c6944d33a92b625966a8a0ccdde3a162251a160c07d88";
-  sha512.source = "5cd416e4008147f4a8a6db6ecf9931af2d1d2c7bc88e5dde30bb228ad5c90fa21a262118b0f932fad689c6da5606934e9ca11743a6e745a0ac68817ddfc60702";
+  sha512.run = "cebda5c2232b47727e62c69c39a49e47240e8d9b538af712abac95ff152b9e681fcd2a65ca8cdaa6f3fcc64fd152de758ce96d258acefcb34f040b8aa92bacc4";
+  sha512.doc = "8797ea3a77f01b8d152c55e12eb6080bedc75a6f904d87711e1ece2ec03a9065aa20e207fdd79583e86629697a681c156b91c3cf9298058019eb37cb7aa79dff";
+  sha512.source = "78d1d6c0d094fd3270d1909bc454182d8442db4702a8a5950b5a3acc52edf120d2350f7de7ee4f7c55393a93132f58b760ddaa7f1efef488813c2ab625ace4b9";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.3c";
 };
 "xits" = {
   stripPrefix = 0;
-  sha512.run = "240b6fe00a26e9ef2b59373d334318fb1030ae7ff832d9a20b15e1a8081b805cc7d021f8eb6c35d8782756e4cdcae4d6e46b6a29ab1804e2d55fb2fc7808a915";
-  sha512.doc = "78a2a72e599374a71cf0d1fd2fcbfe34390e0df60ff383b35eb94bf45193496b4a04f414b597127007a31f8d866bdce421c734991b2d39d843c6442b37acddd4";
-  sha512.source = "c3df71950c0da3a6deb5011946834638b96d9319f116ba4f595d78692e7bf8dfe22962c8958d967c2054d207f0086766850ad5a9a122347a4ba30d284efc017c";
+  sha512.run = "f4be1804ec739c10afa1ef3e5702ab1ce881fdf9406b7a0efbc989bc1e5c1ba0152fdeaf1584eb6ab83becfd7a9a8e1b9752b3f955725965d4eb58049a0b0f21";
+  sha512.doc = "696135d685e709c71e02cceb68a82efdd0eeae84564046f9c1546cb62920ce0ee23c508b96db3df77314dfeb238d8bf66afc1cae0a078cae8bc45e472a8a4f01";
+  sha512.source = "db4b2b657c7a7e10211903b96984aeca5470919b43612752903d5c1cf75db06c88694b7fa206cd28a8b046a7cd1d94bf2e643e91e353f79a803634a9355199fb";
   hasRunfiles = true;
   version = "1.108";
 };
 "xkeyval" = {
   stripPrefix = 0;
-  sha512.run = "acb82c41d3f15bce4ffef3c86cc1fd26ceb39c3ba25aebb62cdc9de730883f23440836f50f4250543fc5a6b002b92e7509796fe4edeb2fafd0db84dd9fe57f38";
-  sha512.doc = "06c8621061e35417ea30d82dbbd1947a8c588e89baff79110004bf0c02300591e73b94e0ee17b88caccbdccd224ee61a7e9c1397273d701588b87f754b385a8c";
-  sha512.source = "b45d2bccf8f9615818e972b8bb88f677e62e8f6a6498704e1f71a06fdb8b6ebed95eb471e67b0463f5d3876711e7bd3d04a921b92e596123de6b915b1012fa97";
+  sha512.run = "870a4e05d6ea23e68e148e23ce04edc9042d153d7a21567a2f1b83c303a0b9a180756622839538d39f38b5c00c78c7566a1b086d003176d6898988a024ea0b7f";
+  sha512.doc = "66671bdb1391c25f0628d71ab9e67ff0afb3a3df8802d12ef75d0d64cf541016847b496a6607f5d2e6851564fda8541f2dc71b35219a495d826934d56a550bc7";
+  sha512.source = "6bbb762cdb639cf2ada621a9a216031da7b41f023c474a453fc69a38a7a28aa1eb9cda0a5db480fec0347aab38b5b83c63ee7349ea14dbfac8672b1e8830ee4e";
   hasRunfiles = true;
   version = "2.7a";
 };
 "xlop" = {
   stripPrefix = 0;
-  sha512.run = "b697a472f0a3db34d6261c09192a88355c5d25f4f6418c38b7f20ef3ddf22e0b14282c6eba63154aecba7b04d067f5cd6b990ba1d754aebd728e9429ec08aed3";
-  sha512.doc = "1c86160e7f78599720f8c4439bf9dd54e6ee8843e0fab05027810ee1cb1dbfc7642806d8742603106914b7d004eb27d6659e3f5468b3c9af3cc23c97829b6cd5";
-  sha512.source = "246d2ff227d6ab8ff9367f0ab26458e408f4919f84edba84a06c97c057ad4c217fdac5efe8dbae56bea66f4ec0133e9e94ce444cbac4a3c70e3d88b413b7de08";
+  sha512.run = "0893b45c73c9e7d5e5fa371218c83fad04dfde1d172e26b718d09400b7eb70027ba86b34d840f7007ad1a30a75b7b19af00ffc879904dd6de111c3f23ab695a9";
+  sha512.doc = "6b6dafa739ce5b7f15749372893373bb9e5cf3f6848f0158bf6255cb1a4ac6be11bea574af46b8e07c0afa3d96bf0957e242d5c0c52fa5324d78515db4d47ceb";
+  sha512.source = "4e767c58e878d5642896532313b4e6be598b983981cce52fc0ed5f12289f346030ff09e542d879e01fdcbd529aa449ca59d328c10830caace1e01eaf1019c01d";
   hasRunfiles = true;
   version = "0.26";
 };
 "xltabular" = {
   stripPrefix = 0;
-  sha512.run = "ec621fdea692c794a2d85e17dfedff2a0089456b1e9fabde590b97737530d25a52a7ea09c0f434fad1070797b3b0ba00abb47f4e1d4d4a449b3505068dbf5bda";
-  sha512.doc = "357df1495dcb6f5c3b59be01b4ecb96096e8cd9335c403f6e18f22e19fee096e3e583ca928aa0ff67182e038217a88594f3a1416562e2a87e665902b95e4c934";
+  sha512.run = "5f719ad0c25577e6dff128650319453ea2f13a0cdb0bab4cb18f3525f9442d23987a02d09daf0e892d8e1516e1ca0a137f7caeb7a14b473bd067ec7f525f5b69";
+  sha512.doc = "07f8cea846e9591ea12de61238366177665821d04eab7e7602c0b7ca3ed8d3a667f4092938c24692b5d6c65ecf1382689c6efc6cf197c41904535d0503c17b32";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.1a";
 };
 "xltxtra" = {
   stripPrefix = 0;
   deps."metalogo" = tl."metalogo";
-  sha512.run = "04a4c8b97ef73c943f4ce2b20fae952be7c1d745ef173fbaafe8706219b41c1bc25534336fa03b019990baba7e947509029680c2e8993dcdc0759233405b5a16";
-  sha512.doc = "46fa53bfbe6ad5cf63afa4c3deda98cdd468db3187920a6478411b7fff0f634f7ffa5aacad1d9b27ba89ef44c962e4c774fe9f429a9856d9879b9a8d40297282";
-  sha512.source = "dc786d5ad240a795dd502e430810f6bf9eb63e74b3505d1267636de38bb17d4a6000a4486855f660ad5228c7e9717c5b84cbe47205c2e53ad588240ba939a1ac";
+  sha512.run = "d9107b2ca270f63d07444965a4db71e7ccbfc934d29634993e419cbcee521947e4084e05eac3cd734b80a110cb7b207913397d7c01a7352b4fa72256484bfbdd";
+  sha512.doc = "929a719c231ae491304f6919d68d1d88bdaa1538a1e60a347a51e610e4fe78428b5bf9103d7a6bd5aa4bd5f0f673cbfff9ce5aaadbe61acee8d4e4ed8bd2b93d";
+  sha512.source = "de49e89913d88e73ad758ee2a6877e2769ed3607048d17154695661ce980c122bb12588418fec62c1205ba0e22322bf025731279b6ebb9eb8d8a5be0d9393760";
   hasRunfiles = true;
   version = "0.6";
 };
@@ -27216,417 +27961,424 @@ tl: { # no indentation
   deps."latex-fonts" = tl."latex-fonts";
   deps."latexconfig" = tl."latexconfig";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "372346ddb45b3f39c787fb13c824ce1e31f8979bc138d0ff7ac2efecebae3e24eae58f9b966b802473bd319920c0225cca92a4dea1205dc58ce38692907bf2c9";
-  sha512.doc = "54bdf11fe24d9eaca4b5ea81ff3b539a59dd205fad3e4dddee39bf01c55537285ae7837a32eacdcc7c4567e15ce5ed8916ea38c26bef040ba7338cc4d08b56e3";
+  sha512.run = "3e381ca5c3246069846c11e752aa22f9473039b91e5b79e70646c1ac9372f3ca5baa081e8799b7aed0c89df49415b7cd693ef3f97d20ca68d66913c82ac83047";
+  sha512.doc = "4af76e16b742e45c6e4ef1badba7962f326f2319b3ff9b6b4cfb7f0868f497f39e24b4072de5444368bd2241c361ef7ce9ddfaff16919289e89cfa7dec43de29";
   hasRunfiles = true;
   version = "0.8";
 };
 "xmltexconfig" = {
   stripPrefix = 0;
-  sha512.run = "5975c6ad46ae19faa919ed51c9434c66e123aed17d953c2b1d1166653378b85142ba6775afe72daf3e20ef7fbbe18eef85e40e2fc82a279065680be14e9f65dd";
+  sha512.run = "26a268cbea2f9a6b92fa764663b9abf7313cdc0e797429d9c982dbfc5ef8b26a0134ffbd630384339f88cb5da02cb02d31966de691ca36f2ea7e108ad137bc2d";
   hasRunfiles = true;
 };
 "xmpincl" = {
   stripPrefix = 0;
-  sha512.run = "187ba854c921ecb36dadf064059b2f9cab8a89684120598e368a537602de74841efe1f76ae1a92fcd52f0ff87aca6702291eb1c0ff6568de78d67f54b0bb561c";
-  sha512.doc = "f7b171a1aa88bc386f97c507681abb5e3b979550608d69315295563b533b70c9aa00fc765555da0793c33dd0f6a342c0860e8e8629b340b7bd07d92b86e4857b";
-  sha512.source = "157aa64815161f9af0857132dfd842966ade6fc7b22e4dc841d1e3b7c6a73a78e8e27093601d7be4df625520ed28dd6945dbb4c228dd52b7976f156a3caae95b";
+  sha512.run = "295bba4dfb93f0487d7cd402447afe2f8582a09b21c95ea2fd7f76e77065821a1453f11b1d5ed6fdc809b292691623bf183a6b8a590b0436b350a168e93828cb";
+  sha512.doc = "c94c016350c3fd4e4c37d61f03ff5a9c2347f52c599dd20305934141e940ae3538b0a849cc3fb8583c67c0d0cb520a69ddfb6e62d8de8905ded1f045cca1b1c7";
+  sha512.source = "677ad2a928042a9082a4b80bbb75e1d60bcabf01635a05acf54d8bcd1fef2fc741627113afddbf7ac3d472a2eb3b1d0f334cde3047702fbe2cb67acff0382ea5";
   hasRunfiles = true;
   version = "2.2";
 };
 "xnewcommand" = {
   stripPrefix = 0;
-  sha512.run = "e60b51540b84f0f19f4da9ff2923090efbb11324c0d5090b6c2c5009c1045665e000049af5eaeac3ec61ee6e87b106ea4953b31e6cb97f09bc06323263dfa383";
-  sha512.doc = "d5b57b9ad4ea7782b312a36985ec6a71a8f8f1c09733dc8728f803d133f07c5a9c6e40c4eb856426299850d21672854c5eed3d04c0fab5b14a896452d7dc823a";
+  sha512.run = "22dfc77201819efacf8ef0041a61ee7119468d1ce2c83b5733f16dcd6e2f8191012406941032307dbf4b245d94c2b9909a77ce9fe9be4abe2092e93eaac97cf5";
+  sha512.doc = "510ccde6b1993b5f7e7d5b9c539780a3a1a487de88793bedd0023215b6e7e2e40c29332efafa1e3510c0a0e8a54bebc1ba8482e0a65e411ca8831003d4bea4e1";
   hasRunfiles = true;
   version = "1.2";
 };
 "xoptarg" = {
   stripPrefix = 0;
-  sha512.run = "9258015e6cf77808598ea3b89a1f7f4e97c2b2f91914e1dd3c22ac399d5f8363e55e5f4ec2fe793484b7adb565411d9155b9b7ffac05ccbad4c4df2a0e430de3";
-  sha512.doc = "266b733a2497c9286397e5c4393a5156272dbe967077b85a13a738aced80e0989dd9957e90ebe4e85438484b1a060c69c22d6da1693c46ca972f11bb6add7d46";
+  sha512.run = "af0ac82f29cdc92bfec80bb4ed298287ce2e8928cde4cbbfe1942f5e8a890d3c177b7d642ad9f662cb6e255cc939f86018149a9cfe18260b4e4a847181000c0d";
+  sha512.doc = "ecc52aeaf8b602b74d412196be984c0d0d50af7c0e728ddc1268c88217b444363f3bc664e8a9146eb92ce6fb381cc6393067f7a224805e860961d6d924c13dd8";
   hasRunfiles = true;
   version = "1.0";
 };
 "xpatch" = {
   stripPrefix = 0;
-  sha512.run = "db706416b89c40fffa384f53249724cfcb113a5aea0d99489a4dc563fbb8d4e41faeab6961460f70fd2cfdcbd7fe61b5038f4a07fd2d47b53a9810da4e1ba6b9";
-  sha512.doc = "8b3613ee0656805fab32943cc32fae3e31235eb801567356d9151b5a880c5da9a4607a9e8b731231521f7e5c76d805e9ebbeeb201dbc741490401d09e886f93f";
-  sha512.source = "0ba47c3903cae4a5def161e236aedcfae843e38587ffab1bfd827f94d098a8fd182dd3ebfa0fba6db153cb193a2db1226117f2b7504e75b003b3eb9942cfdb41";
+  sha512.run = "bdcb85949023725eca43a1c5216a5ce99f55840debecf1ed4e083ffb1373a5f3ec25658c1269243292c6845441fd7f9b3a5f66fb0ebe73278458e20d4dd0b3aa";
+  sha512.doc = "6864b64f2baafdb0076768b575c1e2ad38a3c8b344efca1ef83b1b0f2b276b37c712d6a90ae2ee16c64d014e85f540d1fc135e6e702fa7762ea83949db07905f";
+  sha512.source = "5040c7e7180ffab4d9eb5a8c261d87864456988c803c1b6c52972c88c4cb220f6bdcdb80a0c42c56f936c74f5e2ef94e557a0e12e9757f5188fc36654eec397f";
   hasRunfiles = true;
   version = "0.2";
 };
 "xpeek" = {
   stripPrefix = 0;
-  sha512.run = "021ec730bbe93f2eea4442cbb24e8e82d35de0a99a5dc94ab795583677f8a894453a77a1998753abe5a75804a3823e8e7340f3ebb7c157a69de5417ed4c2490d";
-  sha512.doc = "11b727cab3332882954140c83a7f10318507854900d5c19d92bbf2796d030a9e556e0a8240370c71ef33ef1069d4612a2fd7185e4e48137804ba189697daa63c";
-  sha512.source = "1033ea5fe21ecf52edf089909d1911fe76fa5391353bafa98d2437e0b83fd7157b83fefc0401af6e1ba3c6ef6efb0d2b2f9e19ce55942154a234d4c073401af6";
+  sha512.run = "606c9fda3f29869f330bc204410ab88bfe6db6d3327cf0a534f166a2f6bbce8383f48b3b3a210faba497355ae92eec9d28851ba70d76029300a5853bd00574e3";
+  sha512.doc = "4a0094650a5bb0e959fa3f070a698bdc4af5012daea622cf1d2c86702631a7f0d02a71e9393f552fcb55f8bad2bbc5d5add97bab5f5ea839702ba57812ce977e";
+  sha512.source = "968765fcbed214b179649672f302b93f5cd12f5818323bb6556801359907bcd054606640b815ca85b47d716377f74638db9eaccf5c49703c83865cb1e51001fe";
   hasRunfiles = true;
   version = "0.2";
 };
 "xpiano" = {
   stripPrefix = 0;
-  sha512.run = "311a5d2b306fe619ce04374542a4f1e68b2713a3f1246783360d21aa7cded6337b1c2ee7527a8566049c3641128d0e40dfc34fde509f02fc5fb70e84296f64e1";
-  sha512.doc = "2cf5d2f18af43e28fb3735047bc9806f55aa8a2f61b00f5fac694238463b7cce0daaa2510b40a4e5085070f53c22a90af7a2696e7ec791622fbea882940b80c7";
-  sha512.source = "83a330a140d1bdffcf5dc7e0e377276cccc62ca76cd6ac590d78e069d718132aaec3b17b259d722071802d2e8e8468c5713692b1e2e0cfde8309edf48525bde0";
+  sha512.run = "cfefa5bf086110f80720a6884ed03e35dee223391b18563390a5844f3dd1bd38daadc7802fdca95affe54594137ac87dbba1eb8067dc7e1d522f5ebfe0f3bcdb";
+  sha512.doc = "72be73a4847da5721c2f3499655f3005e2ff2376c0515f39ee3bded42b11e85677ccb8544fcd4c482e52ada35d2b341d84934ab4393cda831546162aa2e990c1";
+  sha512.source = "fa7bd44ca647a96b9246468483440dba87e51bb2fb3cc86a984eeb768d407546934ea12f96bdcc4c782d76c260d94faa66e4b2fe8327d3837078c3168556bc62";
   hasRunfiles = true;
   version = "1.0";
 };
 "xpicture" = {
   stripPrefix = 0;
-  sha512.run = "3962ca64d0bfbdde0d14302809c4f6b748668702ccccf49d96446351916b20fba8f42a210bf95ca40f065d5427a10a8d938746a0d936ebc2e24efcba230a28bf";
-  sha512.doc = "af8be0ea970aee7cf72c268b30823c7a4e982e5a0136e7330770352a16d68d05fc497811198aae710ea8c2d38ce17c806c94c60e5f28e061b5f1829b6e370394";
-  sha512.source = "3d1c5063e12f46c98a2d071be4ea5489acde99c6ab8b08f3ce3e1ae318c2c27ab63d9c24d38f0787ced99be3f585c964917d969adfc3f8e840663889f9d0ec88";
+  sha512.run = "93c8c9a572407f50a2a9067ba625bb1245b95ca3ab013f6f19e6ae51648fb0b62e0517e01f642acd0cbba147ff40f47438e1f90040595877824d037caec3847c";
+  sha512.doc = "05f796dd3924554457db2772e5b6612bd1f3ec35e66b28974d650edd0bd078c7d636df076b98f82f48f012ad6537f1320da4c144a0eb2bfa99825daa51decbce";
+  sha512.source = "029dc5c127f2249f4b262b753544bf91007de53ccb7a5136f0524bb6a8765224ed39fa4b7fc5bf097fa3848d1a3d632688f2c366b758c0b4f504d2beb40207a6";
   hasRunfiles = true;
   version = "1.2a";
 };
 "xpinyin" = {
   stripPrefix = 0;
-  sha512.run = "425f8fa28c6d9d819324516792c37da2c59226d7a1f7409793fadce0cfe7b078aebccb4e653f089499f023bf67c561687b862ebdfb2c3d4e4a22b49aeb8e91bc";
-  sha512.doc = "275d79f53eb1380c694a9436aac4935bccd236da7faf4eeda211b946a9941febdce922bbf072f3442d46377c5edead912fbd7bedc04286ca39d05da3fde838d7";
-  sha512.source = "6aad6f3dd47dccaa5d6dfcdb8a0eb7d2fc91ddf23871e93e3102c59ef8ffedb112265f35b6dce200df1534d6596054f7af4f524081106377738cd70a9b884c34";
+  sha512.run = "2b86ba27690c215f9bfe1b4c464e7fde3fbe4715f4e671bbd194f4f2fa223edaaa5e910ae624fd9bdce9bab347317238080b6e0c2e69e7c5fd8b5365d46beb19";
+  sha512.doc = "37276b25a2365c6ccd1178ffa3f4cfddfcebb9af67f83b10a1a501394718f6014afd896ae3ca928203e50413e5f02e63c511e7880e9420466b2ca86727cd2159";
+  sha512.source = "e472f33155a31c3a423afe0a88e9e688c66e5191e14d2111c612bf0713c28833f70b0ec40d437f9d13bb3e0bbdfc625afd536f8505ce52235bbabe518c867f00";
   hasRunfiles = true;
   version = "2.6";
 };
 "xprintlen" = {
   stripPrefix = 0;
-  sha512.run = "4e671bdb93908250bf5236020d5b4ff3f0145faf1315da75c433b8142b4b21caa7b6c8bea32c99a1515c25bbf1069e7377c8b3f20a628d50eb10bf72faeaf4a4";
-  sha512.doc = "3b0277814a12a2d023cdd8c4a23fd25f3a58c1a037357905e304295dfdc880ba18b3de3c415268ef880a4470a2eb3a8dc172fa9f833eabb18cea7513d253a8fa";
+  sha512.run = "f1bf6eb609e15cc02d382aabcd6c1acf7d9d2fe92777858a8727a9f55fc68717694846590d4f1b8d873b470c3933c6db7b36ec894ed1fcfdcf9cb24844a9d838";
+  sha512.doc = "d137770c9f83721d5d113b8f5bc5d91758ecbb1af2f11b18565130ff0fcbd3dc370b35facdd026af597e2181248292650febdbb2e80ecf59702c7f680c29ebbc";
   hasRunfiles = true;
   version = "1.0";
 };
 "xpunctuate" = {
   stripPrefix = 0;
-  sha512.run = "aaf1673a27e951b3e47449fed4be3b5879064155a5b890abf16ff030d6654c88539b5a3f9abbe1d95ce0de4753fa0b34df73463fe4dc75b004219e4453aa14b7";
-  sha512.doc = "9def6fab787ac5cfe1531549c642fd2265819fbd4f4bcde3a0b7a6e94a156c5de3b06fd8d1570619c0b9c8ad8fb05d1c21f1c96c4a7a525bb6519be57d9ce568";
-  sha512.source = "fbcd9ebcf760f796e6daf0ffd50c4a44084659751befbc4e1bf8024d5fa18bcc03badaccb2bb73883fdc386bc1aad2a345b55acc1b84b50a5a99b84db01fbea5";
+  sha512.run = "96e227a1e184c2169e947af9ca4f7510640b3ab9f987f4f91ec3d15896bab29060087b355ac7cb3d7eb0c8773a0ba4f3119c80e70eb826e6a6b4ae1203b3b94e";
+  sha512.doc = "6906568c6c7600eeeeb99706e0735f5e8a5e8c469a0008a60981494f36f830bcdb9fc2a826f52421ea4f2b8842526a487e97b6741a3a9319e96a546320d83b17";
+  sha512.source = "51e4bba0ce5d5fd596be625120ba84a161c0488777001e2f4dc3ba4a296dfb944cd8e571001ed51e03e4f60c1bd38d5d03e3ae517b76d65d7f57bc3df0418604";
   hasRunfiles = true;
   version = "1.0";
 };
 "xq" = {
   stripPrefix = 0;
-  sha512.run = "9c2b01c27ebef43ae4356acee9f208cff327b967e7ba9c9c9616bf907494f7b064e7cb82d013b9692cc1fbee528870e9766606935f4b48cead7cddfdaffd84af";
-  sha512.doc = "33b22af669fed28d70027845e65dc9250941aadc4eccfe86341fb07f9cb3766995df610a0c68b891b2947814fbd9499d3d85ef444f30d77eea60ab8d47d687d6";
+  sha512.run = "bcaa78b9e4304d92cfdb38d956f6c43b2786afa4cd4f9a0a42ee1f01301470cf2bc2db226adea339d3207371de45a96cf501da3b81ff99d85f1625caac2ffc2b";
+  sha512.doc = "78b364c799692c6bed7a10cc53ad05ad2073b457664cd849090c998e53c5f09492595c641df83824c1e0630a678ba30eebd140bedfbf3a4c6e685dc2f9ee8b83";
   hasRunfiles = true;
   version = "0.4";
 };
 "xsavebox" = {
   stripPrefix = 0;
-  sha512.run = "c0638f1e5ea250452a9443c67ca9e7ef0777d052f71ae3f31a012fe62502191d2843ccda6e2b858467f8be1a4b4a3bce04ea59d1508d884e20ab7e7f4153a083";
-  sha512.doc = "8f0b4fd707f842752400ea07255aa30c197e805ca7e2fde9809b60bdabc8bb869b721952b85c0ca21ad33c75ccbacb89dc722d4eea965ac71a2f678898b367af";
-  sha512.source = "0b24eb2d3ea7b7700a155cd43626a458823811bc328a0ea5745319a6e7372ded4c4a09f778e9742b6c7fd0f078b0a9e1881bb584f78bf3b4040fadd3ab724190";
+  sha512.run = "bf374d7f9ad1b305ebcc245a5dd9c628f2c94914a6d9b9344686eec0a682b57cb028d844fd00a77415a5949e6da89f672df8e841ad3539337d9c85ebd0f3657c";
+  sha512.doc = "d4fdcfadfb882c6382a74e1af0df86505e2ff39be2e0c64d3ec31f44e3c68f968d7c475cb6acfbbfcb35eac28661904f72b970795266ebb2f5039e66213c1c2e";
+  sha512.source = "649441960f2819110b543975cc80fdb0387466dc609b47a6c59a3262dd8808437bdf9c5ae6493ce77d29e22952270b188f51cfd5e7ad5caa184bdbe1a6c6328b";
   hasRunfiles = true;
-  version = "0.9";
+  version = "0.12";
 };
 "xsim" = {
   stripPrefix = 0;
-  sha512.run = "610be9a9498b44f146dc711cb4c7a52eaa3bf500a2fd8a0fc69988f10b4cee9b10362f6180d333e2ef462d4c37f71314ba6823961497b18d896f7171c8dfee2d";
-  sha512.doc = "db82f0ed225371b9be8f406691d49eedfe5d26bb2212c21207c122ceee8644e7d0da3b6f88ecfb3a239cb61a460696f605ef0f4ec2c0eaa6a42516ca3a0e7dac";
+  sha512.run = "1861dc96daf23b925ec9fc7a60123bbbb246c8ae30e312e28b0a49c23113cc6c9f7a4ddd81b0f3deea5c178de8900f55e84331cfefe87ecdea11d5899ecebc53";
+  sha512.doc = "93ebbe49300c57191a217d50df8a2efd41d5cc37d74ca728cb97e55cd24e86462f74619ab252b5829ae7b635ea5fd933ca5538ae591c3a445fc74ed6d79d4644";
   hasRunfiles = true;
   version = "0.11";
 };
 "xskak" = {
   stripPrefix = 0;
-  sha512.run = "ee08aac07e949fdd86f63eb5f730a8d28ce76a419c927f030dbb07904824f6928b9803e216a6772219436f2a5b2afc06556660bdb11985d714e47db8e57e829a";
-  sha512.doc = "bcc115d2657e99044cf689dae837efff0f4a4480a4592126a2d5b64e2d54be902403cab54685a05516f51e2e130b28817eb5d97ae29b648d462250ed980369cb";
-  sha512.source = "91f482e0ac3d798507583729fde18a1a014c6f5e71507fb10f4c893613661488953529f78496bac476a6dab9d3d896d0b6eb902eb166b77b78c90148afad0375";
+  sha512.run = "cc3faf88c971a023308fb4b1f23ba960e3af3e044b4ff3ac1522e4e31f8ef71932b5d9511e8ed1ab6efdfbe7bd1256a2e18baea321e89a6daf420676f425ee63";
+  sha512.doc = "bb342aaeea3950f032b3f81841a9c2174a11ad18f15a14659e40f7e0548b0c57e7efb50e7b58d224be7de4700807f5ead4524553f35615ddd7d333f92b7ea718";
+  sha512.source = "2f7d7a08e516e06c083b3ea8ae103de171701c74cda34d0fc9bb16904fb98f216a27073aa9dae7b490e6b2228d2f156bc1ed1ce3a7155acefb647ba8519716a1";
   hasRunfiles = true;
   version = "1.4";
 };
 "xstring" = {
   stripPrefix = 0;
-  sha512.run = "1def725f1f2f833985a821f274c40c09e2fc5eb226cccfc2a97a57b58e731c4dcd9f32e1b3ee57c5bb6399880568c1549d093b96834e8cc84401137f5bc1f0ce";
-  sha512.doc = "4d213d2fb30ffed679a3abd25b65cfc1559f0ab5ae54f4ba3ca49013da493ad583b2e07fc0604e14896c2e92e3b4d0066420f951650aa414d6750cbcd439b21c";
+  sha512.run = "5060a414d76c4a06d47256e95e195fab532c3e3a84159f06519ef449b6a4c2ac6cfe4deab13f58961c01aefcc0739b654373c9b0d9061665fb43263599478ff5";
+  sha512.doc = "d55a72b306bd9706452a276d36e5bfb6e47cb8878dce161827d2d4cb8230a08df8b89c971b1cfb6bd14e4a263ac1e48d4b566c6514d7647521f97f406e0a9d67";
   hasRunfiles = true;
   version = "1.7c";
 };
 "xtab" = {
   stripPrefix = 0;
-  sha512.run = "d93bb00632b0bd4d26fdcf13ac38f2e1db8d71300c0cdac49d8b9b96eda5e90ca4f350a904cbd3bad5cba7aeeb3a61ef8b0b8cdc48bcbc5bbc45fdbd4b3eda1e";
-  sha512.doc = "3c94779c7c3974f02a921bb22fa85795a3a2ee034053df8964f9e76048bb10fcfe65a8a4ce8dc41777afed31a86d529f7f106a468bcd8e253748c7f005c42812";
-  sha512.source = "059968bf7b3a92ad8531b1e6be84b82d7b13e7b7a86f580e2a9e7262506929bbaba0b15489d77638bd0b2a4042740fbd91f37fc090cbde7b60309f6777d730e5";
+  sha512.run = "ca85c140e4c8a5ea4c6d7995ba3ab398eea8c9f9d24e0ec2d0e3a157e344ac2e64c8c9878a8498acfbb653b60bc912217257b8bd67325a1e5864c2f61fad61e9";
+  sha512.doc = "2f3d9d0e2f8ffc9dce82ce400d9556d10cea0cd1d5eb409f23c6e463ac377f0a17a4ed103e9a25606a32e07439a64635ccb7579dd5b2d4e5209051bb4054134c";
+  sha512.source = "2a9eef14c5595836b174fcdb944a434f4e1e6611bafe36f9e39f0f393e2d3a4bded7649799561ee5a31aaeaae21b6822fa3532839e456d885562d16464c88fe0";
   hasRunfiles = true;
   version = "2.3f";
 };
+"xtuthesis" = {
+  stripPrefix = 0;
+  sha512.run = "13a166e1a798d485eb40c99687e88baa7677fee87a1908c407226bdb217c949924ef477dc4cf6262d108748730f00b822da1e855f79119b8c09f792b3df9fd9a";
+  sha512.doc = "95584b648df62a481b6fb83594684a5c25634815774a953035c8af9a0ab82350718e08bb6b6d0cab05c521d3caafdd9e56dead1edcf43b03ede7ab67b7fcbf42";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "xunicode" = {
   stripPrefix = 0;
   deps."tipa" = tl."tipa";
-  sha512.run = "0f308a694f9a9053cd65ec2dcec86771b211ce7d34ec3baf2f9a90f5a7ca3d9d209ca33d2dec4853b368e070e8a4be464aaeb6bd64ba35ee03ab5287864fcaa2";
-  sha512.doc = "29ef434a1832f9c21b327856d074fff3db3d9e6094ac251b9e00cb224fff058806b7a491e9c166570b41ebbc2d1db084b90fac68a26f45e70196623b6754f9fc";
+  sha512.run = "48f64fa5f60271fae0c9b8c206338677e0bc82ae35e78e685d1f77a30604f09431a6c2afe50d8aafcef1741ecfe5446cb47851c6dd4cb11e986b60e640ea15e2";
+  sha512.doc = "7a1abf2dd807c92bb2a5354fc95d5db18a9da81ca007a285ae67f037970b718b8761a6c297bedd938ec63f2965a136076dc8b12faf6425752e321181ca4dc4b9";
   hasRunfiles = true;
   version = "0.981";
 };
 "xurl" = {
   stripPrefix = 0;
-  sha512.run = "a923f447d5937a648b9c132f570501f268de2c2a2ac10f21ab81f18525591a40fa987d91566cce686c53d08c5f2468e0b64f090782206b59b4e154ff9a28af42";
-  sha512.doc = "e529a2f544105e4d6ca49d2a1cff98e14268b328c936b435fcaa5853fec07228b128c3b8e9ed224991b09a2850c56b1e65d1cbbb08cfe3ad18d1aee6e40ea0c4";
+  sha512.run = "24f72addf5886af8ef6d80cdebbe1f75d8a5f4f4431cfb4d1babf473fec3679fe2d40f5abb55ccade34fee3f4f5d5de14ed0f2cf03021006b1e03b181de8cb77";
+  sha512.doc = "3a727a8093cbfd000774f5ed1cc269e7254482f8b2b9b867d504ec572e9bb9f431b31eccdb5082891ea8b3c62e87e5420cceb1571a2137fcd77c8357ece49c39";
   hasRunfiles = true;
-  version = "0.03";
+  version = "0.04";
 };
 "xwatermark" = {
   stripPrefix = 0;
-  sha512.run = "2725b2d08ca2568c0f590407916cff6b821d6293b24fc78eb7e8db0342311d29ea5dec325a649cfafd5f9fa0c1340a184011800c8dfd3817ca5a139a7704fe4c";
-  sha512.doc = "b48d6735a9d70e0e7f5617f46b484917106816f9b7dcd865cb7d75a629ce518c35397d867928f6d4ac723697e8637accc97ba314e6644c0ae51fb1e651bef506";
+  sha512.run = "237d1c619948e93b7640a27d388111b3cb626e46e1c30224c9a08ae00179ddf4e9a36c1c9f4dc4bdab0d5ba0360ec0b849b96c8eda9f1d0bca63adaf6dba4e08";
+  sha512.doc = "c3afc4f4590e2d34fb1f8d6f6e2fe4542175566918b2113b92e12c35a3b2257194d465e4e9a3a2a67eee0d26f2d7a24da534db61e3dbc53d4f962e8dd8e353c6";
   hasRunfiles = true;
   version = "1.5.2d";
 };
 "xyling" = {
   stripPrefix = 0;
-  sha512.run = "ba8e8397dc67e5a90d34ac15689ead70be033ca36307fb0c2ffccb638edad8f20a2c88230f917db6174412e097615f2a9e4ee22b183d33f32b970eaf65d598e7";
-  sha512.doc = "4d33c281badea7844d00d9d125122f56cf4719e62756d4eedc64ad63fbd46d90fbf9debadbab54f3196582a9a12ccf48b23c98f0df16e0bdf0d53accf8fbb1df";
+  sha512.run = "f088809c8a24b47273ca65190bebf554c9f2dd9a552fc0a8c80d102505acd2b963a9695c4eaccc5c1a840d246fe7764600ea85a51782198fb63dda2d9de34f12";
+  sha512.doc = "f74b23c8d4d4e1179b1d7db6fb07b8cbddb47cb528bd55af30c07f074240218135d05deaaf3379be8d61cb30a6aafdba8e756b73d5da450a15595a159f1a5010";
   hasRunfiles = true;
   version = "1.1";
 };
 "xymtex" = {
   stripPrefix = 0;
-  sha512.run = "f2b11c0eaaf02b379350746ae6bc9c786bced638eb6a1585b84df311c00cfaed0c4715ab39502a76bdceff31e62b61876f4c186e94c386708a23f1fb6753cccf";
-  sha512.doc = "649ee3fcb13f6407bf52c957deffa93c715d8d6af5cdc0b3d3caeb5031997eea559bed47d332ff5115a6c4656b34a5f1bb409bcc601d6198ff9e78a8fe56f26a";
-  sha512.source = "cb05fab76836e4ae36745a7fa7ff0bd0d3458c422361a81628e1f8a4d389b55bcaf6cd8b6c1c52321b0252029b03f3fe5cb007d16e6a410cb6e4e92c8a1d381c";
+  sha512.run = "75eb39c0a4f5d458d41f4577408abac1a286699aad1ed1baa6775b7ab91ffb1c64b50b475973436a0c08b410b594cafb1d0609a9c2cbbb31cb5b56764f2dcd62";
+  sha512.doc = "e48c57b22ee22baa32c5595010f095d35711c9bf0bd72933248d730204369e882df80a5cfabebbd19059f25c1ee3261228b293e8e8d693e4381b7a8d200bf78d";
+  sha512.source = "25342068d6c0bbb8971456388bfd89702586ebd6526015c835f5c76db7efc39e6418d40266ec78763d22d3ad4bfb4c7937ea1de95807266105036c092d57cc61";
   hasRunfiles = true;
   version = "5.06";
 };
 "xypic" = {
   stripPrefix = 0;
-  sha512.run = "0d6fe0c2fdb0a8037ea7859da95b6bdcc88d237231539e371f6c847c1818447d77c5fc90f944eadaf548fbcd540ec7d408f5c0b819376a8437f1784f4593382f";
-  sha512.doc = "9f2ca1f120378e4ce52d96d7622a7f22a301c02ceaa2a19ce14d775073961aef01d1fb65202bce2ce1d8b88801749e2d642a0b2d52518d7c70317e8c62d9d2bc";
+  sha512.run = "279443d948442972a0687a57a17c336236f80629c733b4eb16a6c9e3f51507c63a92d7e91d01948ad3fd19ac62668f8552d4718cc56de182d67ccfff3643a057";
+  sha512.doc = "f5412a4855ae872c4db22f9d2d1caf45999d51ce34cc033fb15bc602d1854c792283fc968352d7ef71a7d374b1c4642e1683371b16f473f0c46cb9afab244b0d";
   hasRunfiles = true;
   version = "3.8.9";
 };
 "xypic-tut-pt" = {
   stripPrefix = 0;
-  sha512.run = "ed799d983ad93f8fabd21e0a5f59e6e7013eee04cd764b7e30c8a3d73d46adddc0582320e6d091ed59940f4abeb1d8cd66af3937b374be923d15dd7a91f6c8a5";
-  sha512.doc = "24bb3acdb66190e34bc56cb5696ea17be0a14fd25cf0a519e44b676bdf8b1bccf7987da307bf0d1f0288918dd15e589c05ecc0eeb351f7aeb2a870396a9d55fd";
+  sha512.run = "7c95135ca19749bbdfc68a81a870fb9a385def4e634d334b486af94e65bf6a679f56c957cbf678cdb3c1cc2e40a69586325c4d4136f791ec90d728a48a85caf9";
+  sha512.doc = "076012386598121cf55b714ea791190d205880d090967bfe99cf99f46890411fb0b09626ece55838ffc3996c062e45beac179ae312798bc2c2423a4d57303502";
 };
 "xytree" = {
   stripPrefix = 0;
-  sha512.run = "03e846ab94d61fa98c67bbcdb91c81ac95c39344225adb82808c8ed82e8e202b7e86cbf86d35cc4468845f83d3b5709e84db5ed1a603c66ad98f961c1de365fc";
-  sha512.doc = "093d1ac991099efc0dc4a7307503ec029b05dfd293092a1307045acbced5f2573a46ce4de14c5763fe35f16ca178f88e4695acd46564aa6fab424ee9b66bf2a1";
+  sha512.run = "cce2bbdb8d5277e0ebff99b2bbed60d0b2b8d6377f160f9441c611fcfc1cc730ed50a427e715b9af30cbcc638a285169d1aeb0738b99255ec36974eb1429bf6e";
+  sha512.doc = "531a441471dfe20645408c8899fb35188e41e1292bd2c149e2901d61749a8b878d399899b9f4c9b5392bf3db6d4de4ea4e73e136e9d110f5e52cb09900a07b40";
   hasRunfiles = true;
   version = "1.5";
 };
 "yafoot" = {
   stripPrefix = 0;
-  sha512.run = "f8b683d8a5ad91edc8edac6ee5f95dd9a93db4997265c1bb5aa29ae43e9f9e90ac7e641545d519694fbd569bd1b017947012abf109a5b5ab6e42797fa2a931b3";
-  sha512.doc = "3b11b5065ec6a37529f74fa966e837fa3c05514807877ed64989c17be747126a15452f0d7391fed1b997552c5c3f1e7e0c5eef6401bb51acafbff0b859b73c4f";
-  sha512.source = "2139fbec95a07272dbcdc1d89d9b43ca2a995a6a8f5c341bee1e0e3a5aabc13acc9c6b6b6a847d9a0de0f158db6a223798b02080b884367041dd0578fe623e56";
+  sha512.run = "ebf2f6b00276f33c885561aff90e18522bc11a8da515ddb41b82f934ab2a689f0a0cb957e3ad7d4211d8b2e99e832ce5ab7646114f477389b1b1a30a70cdb538";
+  sha512.doc = "16a6b63f55fffdf3560e626846b81bf14440ae714145c0d9255c5f01f34c8737bfdd20583347f7e7bb05d9bdf2eebc15b2682d18b840e2f8daf39d0d2225775d";
+  sha512.source = "9d6f7fe7f42ea58328b0bb43cafe4d45792744da6636aead37bf0d6e567f1988ba852d6a8cb7ceadbcf49418ba59b85edb18d99e02ba25da72b7001b5a9bd748";
   hasRunfiles = true;
 };
 "yagusylo" = {
   stripPrefix = 0;
-  sha512.run = "8434d283042d996c132351c6b705323d61ef14b50e1566764404ac24e1c1dccaf883ca0edecb5ffd71a278a3ed29d9bc32ae5515c6cf5e72c32e6924250d4646";
-  sha512.doc = "890bf592bc9de8ffeef12bfa9b7dfdb1bd473aa122adf659dc9ee61c50e52182316e6e818b7254e01c997d3387a181bcb61214db9745aaeb0381b7143f777215";
-  sha512.source = "59c1ebfa0ac15fb92970614ba9b7c510d46b64edca6b6da23cc342772fe3aa669f51897693f739ed0d52283e054e7cfff25be38f2ded229b11d06fde96c920e8";
+  sha512.run = "c892b8d8d65d27d24a5e2a83620ec680c7affaaf745516da9ea2c66d619ee3052e7822ee1fbd9decf12f070d2a9dd0eb7f0c098870ebb2d4f6de7d77a2c9664c";
+  sha512.doc = "45f157c6cddda3924048473fcf03b8c04828c125347ab8d0fc4489f9739843b00004dabc7777125425a5e828d003271adae323fda154d78ee5898036d415c210";
+  sha512.source = "59de94ecf829e0e05074d1698d9c161232723eaed000a6653811ad2610702eaacf65a0350645b1ea96657543a41e36d3b7bcabba1e7009f394624b84025f8649";
   hasRunfiles = true;
   version = "1.2";
 };
 "yaletter" = {
   stripPrefix = 0;
-  sha512.run = "19eb5944e8560c184c5b5390888059a363d03cc3d4140dcbdc8adfc71d9c82b2963d2ebe47b95ffc50517a95acb3780b3e9df31ef83301da88a262216af08f04";
-  sha512.doc = "30984adfce8837fe2ca79e11b9270c907aefc9d4fd4a4724de88216c53e7ad89c982d80df4f33354474d08e37bc4a1dbd4f2aad73d9b9e31b0c7d4bfc8a7a20c";
-  sha512.source = "6ec7aa56bd2141ff322ba14f902c2a7e3cbab9adc15a807e015b1874e3fe0d76767fdec6fcb60609d3d1ebcb85f321eb1d32823b489ed4184451ece5aeb704f1";
+  sha512.run = "1de125dceae7f40b392fc0302f20363f7f9fa71e4b421686157a3d590a98be6d28561f8481d9e3dd4cc09bd5f6ed3f86bfbc58fdd27482a130f4fb148ae7d7d2";
+  sha512.doc = "05830e1e7ff45db7e629d25462c3fe3a3840bd9cc01ea272f3ea5f75867f6193ea5404bdeb9a7afc345a85d091e4689bdb2759aa2e92a2bf8b39314956efe48c";
+  sha512.source = "213f827712d0ccfd3b45f518e850ec46eeca374034fe112522694ae8dbbaf4222243e457f930aae917c5d07d6338ed34d57c0e6e82dac72f291aaae89e3a58c1";
   hasRunfiles = true;
   version = "1.1";
 };
 "yannisgr" = {
   stripPrefix = 0;
-  sha512.run = "0d5059793bf65a149bb491e8448b65cc8a8ded213b70af66800dedf9cf9bce66a4c384287203b95c4162b665139a45fdbafa52e3f1a9fe5fb54de781ec53660b";
-  sha512.doc = "174fdf12c5fa80bde25b5d519115a275d1fa41990b4167549cd7b5c1417af86cb5b342ea29d6dbf912d7b3ef50d008ed646094e41a1c0c68208e897279c5fb3b";
+  sha512.run = "9568f257477e633152a7e4ac180fab2cb88e800f32aa83990d8dee7c802c5c18f7e968c0a69c1ea12b8d6f571ce688aef8a9d23717c942cc7b47e6d9db4e62e5";
+  sha512.doc = "0eee79945fa7b22592c28618a996d1336840ac72fd51787ba93b40ca03b435c97b3ff150ede653f4069471b5f8c5d9891b3db931d95ea9a8562489f94a8401f3";
   hasRunfiles = true;
 };
 "yathesis" = {
   stripPrefix = 0;
-  sha512.run = "126341a0ac1cec451e59539d2841b3b59b5dacf8b5f7bfc544160486b1c0c644b0abc1f30d6c69da74b7563c1188227361942eec92b341d18b7b815b9aa7bbfd";
-  sha512.doc = "a05e461f8facdc7c5baf454a0711c9d2028d2408a50c30cd6e613c3a8b1d2e5db8901efb21cd738cbeb2701705ef005b20bbe71e14dbef820436468f27453a57";
-  sha512.source = "2ea4d9dd39532781681fa551ec739c5f0fba905bef546ae17d0d4dc5a4ff2c71058f1986353650ff6f4f1330435d24dabf4007c96963959673e4c409ff669a48";
+  sha512.run = "1461f610322417d6b9d81149857882116dd529a79c327731a0490d10180d26f6b4943dbd7ad8c038a124d4f4c0cc0b9f630a18386b25b1e637a53e858e4eb1e9";
+  sha512.doc = "3f48399e1b70b314f8b3eaf081a62beaf99abbba8663adca54602bbea4c9ec0a84ebad9f6d244c8e37da6cb7db911dbdba916140f0926b3b4025d2e624d6c4bc";
+  sha512.source = "0a469937e6402bca80c7f5cd812c23f225e802f84d9229ff7180dc6ad7118cf41f56e2e7bb0ba2aac611b34f7ba229501ab53e5198bc63300e8abea757b2c6fa";
   hasRunfiles = true;
-  version = "0.99p";
+  version = "0.99t";
 };
 "yax" = {
   stripPrefix = 0;
-  sha512.run = "2602ad4d5487fc3ff982b9921c0f16b19b658d0d225cc4b40be98be4b7d6ac86666475955644d04d8ec0fabca8c566b1fd219797d2dbbec8b6d9becfeeb6d0f3";
-  sha512.doc = "ead74dc1ee40a1b28cda1665969e3e21f1c1f153d6af1b74e1c1473c0edd79225e74a054416f0d04c432721c7ad80540d28566735e570234371d290033c9afd1";
+  sha512.run = "093f5c2fb8b68387079f4d6417af4657e40e7c59e225450897d678aee7a97c5db05f1889187d8678c796b03f9612ae4b3b1db15a7649f6ae0824bc82cf7d2864";
+  sha512.doc = "d3d21f054d03cd4d7eee01352b0e23a2755ddee77848f7468a62db4cda4581baa6b48aefe270eff20713c4181fef69d59d0e86a40bd52a794cdfc37ed15f1aa4";
   hasRunfiles = true;
   version = "1.03";
 };
 "ycbook" = {
   stripPrefix = 0;
-  sha512.run = "fe26ad86d17d9fd6d114299f234687f9a90fc85a93095735a914a38b8ffa5dc569a74a3b1826c00f67e94f3841e054d1be26b52dd09316c8dbaf7db45e135864";
-  sha512.doc = "8b509284134d70935e208dff4bca9c76cc25414f00a001aa37ce782828e2ed3a121ce0543cd38e08d9541f039ccc1019fb6df632fbcc02fbc6512f857b1d2945";
+  sha512.run = "4176b76bd032ae85a41507dba02d46a8da7a453ef8624d659ca43a8a15d6aef7626c74c74d7442cc2211e411fcd663682c7199f7486e12b434f61ed2023803c9";
+  sha512.doc = "2891b2941e5cf93aa8c08feff587b06b021a2ff6537cd3bfa4e5c19e4a01a38066e7d2d001b6bd467fc4816c72f002ea434592848ecb49f5d64afeb8af9bb2fc";
   hasRunfiles = true;
 };
 "ydoc" = {
   stripPrefix = 0;
-  sha512.run = "5b56d208b94cabff5deacfbc86a62fd98ec14ea8009e0fd9bc8095f0d615da6a3fc85b0a4e6d0c5fd3edd27a68a69801c41c843baa8215d83f1bd2ae98bdf575";
-  sha512.doc = "c0adb341f57b6edd9d7b589925d40063fef0d93b5308571716f54098debb04b3ce41a20d3305b5bfa34fcc0599e09caa0672595617f5feae5af9bd00dfd968e2";
-  sha512.source = "32bfb0905ba91d2e1d5b40f0a729cc88b104bdd8696044700e0b37e5772de0ed009599b81db9463b73f64dccc143a425525814d6c8869ed39bb4acd3c7edeea1";
+  sha512.run = "1799f5f254abaf212ffe1414bb7cca287b2d2ce67d244eb7291724a45664064b4e2cb8f6f7842da79e3e9b7348344df0bcb12639413f1e5dd837f4c7ceba4beb";
+  sha512.doc = "64493f010032f5766a368d5a5383a7a1125520df496c44ab2878f4c3b883c21067828c215e2c664ab7e84789d5cd2f77ad54b6aa6dbe7b629b9e4b020ec46924";
+  sha512.source = "03eb90e0801692c280c9a11cbb800f9ac5e2060bd1b6c54846d6a8d54b9a5931accf0b31c6ccbdaa11856b343187aa24be4df8f6db26097ed8cabeaba3eae818";
   hasRunfiles = true;
   version = "0.6alpha";
 };
 "yfonts" = {
   stripPrefix = 0;
-  sha512.run = "07a44ec2b9818b501eb969f27edded644f078a5cb9075f8da66ed713feba6640fd5b625955d86b433281866133fa830d790ced9b05e7e2a115d714b67e968438";
-  sha512.doc = "fe0d57553b23e09604cfd26993e6efbf1b0c8ade56e928031c8a661ed1be89e5b230a8485eccba2607f0a2e3f69dbb015b6a6a67895833847c19b4a2c17d321c";
-  sha512.source = "3cb426abedb13ff30a70b7880a340f4fc731f9c8832f26392e40687f731e0de0f956564892941b98cba6ce27c75c0e9e7cc32ad9c79d7b03f0b1c301e5ff06e9";
+  sha512.run = "3255afcb65edec91b190c4e3e48f83ddd62f3f0fe180b5d752864dc75092d34073a907711092fccb3f5de6941207d2f733681400600196a0d37f282618230e3b";
+  sha512.doc = "eb52f8e4e23e5b5bae98c3a55cb6fc070161c72c49eb44d600f8e91e13c9c9ca0f583ea4cd7461527d4ba18ecc7de400cdc705b2416e45c4ee9dcf82033059a6";
+  sha512.source = "26c297fcae6d7aaec140d8d8668f8f8898e6946694a93dee00d1194fcb70a3cd7cf8a449029076b1e888704deb5d93e03fb7e152ea1e67034fe3142458796751";
   hasRunfiles = true;
   version = "1.3";
 };
 "yfonts-t1" = {
   stripPrefix = 0;
-  sha512.run = "53edbddc6ae8cff047fea05ee37ca728b4f4eba3867093aae353818ef8871a79f77be48aa47d68d5894f054983e9d648e83d9c082cb39d6e1fec3537983f2e72";
-  sha512.doc = "21dbf278a706fb4d0e13f9907518bbad768292e2a62160689a99c59ec4c8b75bd9fe1ea40474d80460f00c6c4ab9a31aea7b2584b8b2b8e19232da89fa9a82f6";
+  sha512.run = "51183e1ef759241e39aabe3ce1e4d9ffc42b3292f5c046be534b2f470191630faa488396eaf5981bf03e3ae970d5ef34dffc8194e30d155d86e38947fe1096ad";
+  sha512.doc = "892273edc0bbe58622e8073ac2cb4a92a33cac4aa6db339bace7f81f42fca04bf05b86aab4b138d16e7da3db42ced68c10459278cd192d7d0d47e1c73e66c8a0";
   hasRunfiles = true;
   version = "1.0";
 };
 "yhmath" = {
   stripPrefix = 0;
-  sha512.run = "e47e7a3cc3637695b3215a82216fab575046f2b03cab494f6a09bce3c831549706934d7933e330c07602e06840c7fc44f779f4b7faeada50a5bc051559d5b0a1";
-  sha512.doc = "a789251d027c5246266318c7bd182a4c593e6681718c70147fc2f9cab8e0c50e292e2660afd2bf1d1b33d698d515e6a872a2cea1a06d9a7bb5fcb1e104760ab2";
-  sha512.source = "24867e97f50d814bb61d0cb3f706145cce5f47a9a4bb1bdc4550175a8e044e420b3b7701a1c2e00367041f749981c04f3feba9c1f97ff82f9ce55fbed0fd3f93";
+  sha512.run = "1e1e4748966b4597951db97bfb56ae2219b83442c28d451cfd157be61ff24fb75d50799ff044165ad6681ad111232a60a8b04344a2fc255e710d6f29911d3a98";
+  sha512.doc = "8c7b3a58a71ad06e6d15d1a7586a45dfcebf4e72635e3bc994d742a4491fdfa7ad88b040de45938a798fe09b298280a19afa8db45a0a712e2f0c242cc0ac5330";
+  sha512.source = "aeb2fc4f780bee0cf981a7d626fd608b4bb8dffbbf350c601877e50c971da9585dba1d0240d923451f2db962ba1e4d9dc714b9e6d36c9f0486490960fa465503";
   hasRunfiles = true;
   version = "1.3";
 };
 "yinit-otf" = {
   stripPrefix = 0;
-  sha512.run = "3e667e26a28e4e52a9d58c998ec481446f5454c5aa5e660fc078b86d4543f8b8e4f005119ba6dc1f6367e9e6cc0ef4ee991ab3b52395c222ae172015242c9f68";
-  sha512.doc = "2b425a209493d33378f67fd2608427d1e9e0c493aa1acc98a79f5fc150f6df5b677e39f74602b77c0ca4d4409d545dc7dc179b5cd2d6d9d6e42f455f21da14a3";
+  sha512.run = "21cb91ff568075a8b8fe82ff71412c394af1b3310e25ca93d6040085000547e98e8fd2ffee60629b66a51805aa1b078d7ef6d9d9d2430900c034d8e5bfa7315b";
+  sha512.doc = "cac9586bddb6525fcaed08560d85bd7ff75226bbb7d328b0cdfea560ffece5f605513c4a134bb5bdf8557bc26aa03139b97b80937d88eac1cc88d5e2a472910c";
   hasRunfiles = true;
   version = "1.0";
 };
 "york-thesis" = {
   stripPrefix = 0;
-  sha512.run = "cabe584e8d801a4fbde37e7eaed10aad8b91a16534dd5a2a0abbd5d845a382b0d70c398b9dd297c731ff9ebdea82dbff0034b9c4279b47b45e8ac52de544e20f";
-  sha512.doc = "b59bf2c7085c0980f0e1507d461a64cd97d8902f79019045b821ceb1802a5e5ebd7620dc1fce621beed6674526b8572d63b6eb8f0b5733c77e66f1c92e70b295";
-  sha512.source = "088375bfb5eb7d55150761e9e322f93e8282735740a30176c3c8e03e720692b3212ddbda85410429e477d95841f396b43a3998d6d03a55b8d3edde0ff592b1ca";
+  sha512.run = "411c372d39f07f11c7aed7a69a7691245067e331e2acfc759261a7a311ef459869d3d6fa469f632a0a6ae740d480c7412045cd07621384982fcfa8f40b37b4ab";
+  sha512.doc = "0af7779d4eb614c86ff8d9105badb64f941613fb1e7052be42ed59ab289770db2369bf1483a1d5df3490b746cc37d0993ac87a673c61be30e87c855b4f41d4eb";
+  sha512.source = "4b781126780d728fc04e3ba50d77b2357a8c9605b8133464c7bd21fb4dca6eb6dc2fe4377b77efa7940839079e3391e1ddcba2e668e7c2d98e08a8a4f9e643fc";
   hasRunfiles = true;
   version = "3.6";
 };
 "youngtab" = {
   stripPrefix = 0;
-  sha512.run = "2098df5192788fc881a72309aa33db1abdfee01199759837a7edbcf2973a15d821c516f194e66623e9153ba0a916efeeccab2f4a5ae17dd1a47ab2eecb2568c5";
-  sha512.doc = "c95ef6db6c64707fbe77082d21fbcf794acf5e4ef84c5ef731281cf9eb3599d25c64d42ddf047cf37cbb7e08454d7b58d92633dfb672471dfc8f97eaca36eeea";
-  sha512.source = "6b42ebf0307cc0bbac4336ee75d133865c4b7691b53fa6371394e6c8134b4a7b4682c18ef17d9964b6466ff9b344508dea7579b4db15a7d54f45e9fb18c9725c";
+  sha512.run = "a8bb1ac115714408677799d49b988d0883ece1f3b9c61e84df13e8f982a8183be14dcabe6c835999cee367a204d5f7e234a8cfac4078c355177c38bd1a05c827";
+  sha512.doc = "42725a42aa6f28caa2dbf30eec3807948caa1f6989c80573dd483c5ac0ff670ba546e5790860cfb57c64e9f9bdd117af62511cf20bcbbbf606c74ba33240c5a9";
+  sha512.source = "a65c1c3ca479ce4450e7edc5ce9c893b56628a5176b28a7f1191207de1a995ac058bacc58db48e139c29f941f8cc6a29f3f7c241d4e88dfd53830fcfea923de6";
   hasRunfiles = true;
   version = "1.1";
 };
 "yplan" = {
-  sha512.run = "03e65ecfa1acf545fee2b1d24cd903d675a80e6632a6ceeb5c996f62eaf51cdeb01848891f571f296f0e17847de476c5944a3aa271d4e9282546dcf63c1c5742";
-  sha512.doc = "379340ff1c616b289248814994e8aa207187ec170fb590be9ea7e5bc1352de4a70ba40032383e6dea55445625007033e6f1e0702086ecd112e42c2cf8a6eb991";
+  sha512.run = "d075d36e7e0811960cfdc5b2d2d8bdfa77e5de0729ade23c0479fa28a9436b29d4733b90b8771a4c6c9ea95c49a1109f1ba05d3b60796ed8012ce707c5eaf19d";
+  sha512.doc = "51af550d04ec0bd0db422ac9eaf5e9370e118515a8944cbf67d81ac5da55f2b57e4f42f87f7b124cf35a76b80a9c604058f835ae5a8ef0c11e28327f2df3310b";
   hasRunfiles = true;
 };
 "ytableau" = {
   stripPrefix = 0;
-  sha512.run = "7064b1a8f05972018fadb87df7ebefd0fe6f1b58196ece04b1f63107eef3af68e398a3a1bde176df84363802882ffcc4cf3fe3b3298efb934cb4b42d65077f8e";
-  sha512.doc = "488a983eeebd0837ba4d8abff1b4c510fe8fe19b0ac8a5df4b03d85d2c4e710e1d38bd68dde41a11c9e7944b2bec2bc63a5ef8b73396829afffddf71adb29c32";
-  sha512.source = "646fa552fadca33406c195ac17b2d20504439f39dd8f62d85fe4f66b6a476424cce08599e69571ac7d05a28252f406fb0c092f55bdbf00524d1967a231a9dc04";
+  sha512.run = "3bb5a430587caa6ef20a9a0bff2cdc6a8c94d2b62d56f080f61cef88476e44dacd7765ed1bdec4be64c04f6f34e701281344b2f93c7172a0c0789a6b9aedd3cc";
+  sha512.doc = "3cb50fcfe26bfa93c59fa5fddc5ea34c0a777cd89914f17fa4d85de9e57b58784dfa990650ac053cd082ae5e82e74c32f9eaeddbc75cf4cbcf1d0d5258336d0f";
+  sha512.source = "9daff52c34e222509ff8cc65d2e63252aaf6b361d0add60858aa0c36f691d135e96bf73f2d4dc9c610ea9b25a01e6a9982dcb24619fa93926e762fc0460db28d";
   hasRunfiles = true;
   version = "1.3";
 };
 "zapfchan" = {
   stripPrefix = 0;
-  sha512.run = "80712edc4144d7406d28fca276d019c4252f99bc410c335e732b0acd6c2ebf897532bb6f294a6e3d5a5f2ec9cef7865aad370149a7077e30d9726125d6eb197c";
+  sha512.run = "23cf9bb3768023b3652459a51c5e6aaaf5c57f16700d028ddbd6f0d54933c1ca3a0672465182713e8b154b6d8f695cd280be2ddfa8bf593be27830b1e993fb54";
   hasRunfiles = true;
 };
 "zapfding" = {
   stripPrefix = 0;
-  sha512.run = "d7efd293f6e0616d1a633615f9bb79970c829fb99a7d5c1b6c217058ee74f29492fbc303a35951140a135d7742b58609c693df4eeb1ecdc5f63cd9fcdb177d11";
+  sha512.run = "07084ef589a0e5778e674af7f0b23a4d3cd12b4f53c571d0aeb90bb8076635729b0ede6c58a3488b6a68ffa18962791178e91acf242c047cf8e244dd67afeb5d";
   hasRunfiles = true;
 };
 "zebra-goodies" = {
   stripPrefix = 0;
-  sha512.run = "f0608efb6c96cd64f33b0c852095e68e3c0a97e0e2dcfcc3caee56fef79921a1f1ae20a4c7c067544db2acdac8927d34069d335649f00cb06ae40bc7e2fd50d0";
-  sha512.doc = "ef825174f23067ade818f6dd286746e0deef4a6f53c373f1f2fa4313843c28ec34101bb06fb33c851f842e797a7abf0cdca69033098dc39deea7929ea575dc0b";
+  sha512.run = "f469e0e90bfce97d20ecf17526a2d6bb86a6565bb92cab17326b93f7bde70212aee91d1fa1845e776427a5316ac68a8351212318f3318ab53afc75ee13d7e708";
+  sha512.doc = "04f087a4b519f16ed3ae98679d5252122b1756fb96cc640877b96576137f1ac5491bc3b345ea3be41f4226f4776499891ff99e24472cfbfda5a4aeaf7b0081f4";
   hasRunfiles = true;
   version = "0.3.0";
 };
 "zed-csp" = {
   stripPrefix = 0;
-  sha512.run = "e6a16956777e2be1664676398fb875a04e036e26257edc3b16aec8f90620965b961f8e0f6f96ca50612eefbe1beff3294a8e2c1cae2cb4cf6cfcc64689775445";
-  sha512.doc = "8bafeec32b90fa138a4a8f3f96e3d4030f0e6aff25be8c1e317a1f6a7ee13f8a9e6201fab34088400a9700a651c5f318cc11d4f69897471077d08e721d6c0473";
+  sha512.run = "3cf15991397b10698f6a13a7bfce959b40286d53b019e31f6932db1a886b01d7cbf6c3abe1737e111119b8cb46a36856725e76623784ed915a21008a55771ff2";
+  sha512.doc = "0f41bf535583c7c88a04174798ac24b141cfc123f149017377244a16b89a8604b3e86bf3ed98a72a2bf8c1b8d7ae80494695f9199fa6615352e258c0fb263d0d";
   hasRunfiles = true;
 };
 "zhlipsum" = {
   stripPrefix = 0;
-  sha512.run = "6c2b66c82ceb2273ceae78c1e50549688f42fbc5573bfdc6122c96aca409505dd48c4d53a1b474ecbce6c18bc795fbd37f9091a6190f8c335f495b080fe9d1d1";
-  sha512.doc = "8877f4ea910e87eac8fba68e5c86bf12df52a36af9f091505022f1ac052fd63798c5d4e89aa446a3fd1206cc52c64f95b06d9a3013b5be4cd6f95b48c4c20bb1";
-  sha512.source = "4a948518500f5204a054b16f43048d8560927398044d788cd978d401141b0264c5b440f86d9b7d621422283d7bc43d5b5b58612fb9c57e29d4e10d6d413788a9";
+  sha512.run = "62a8a11f292bfe0078114ad21fd61ba6e3e8f8f50a501c7c8469629b28bf97e2ab1126bc267611e30460466ec41cbcfe5272f271d0b78fb8bd135f85d546c4c2";
+  sha512.doc = "cb7bf928e35a802128ef8f27da552d1f786d58af00b11a298bee0e02312ba02110a2c9d10a6bd7f6f3491d7949ad6ab12f28fe34b078d8df1c226c90e35a1cd3";
+  sha512.source = "513e761b42b2d1833e99446cd53b0fdf405b6e4c1593ab0c92f045b9dd53a9b453849b8c48f648b753d41e6cb3b41c6bcd7236d07ee0104cebe8111b942b9ced";
   hasRunfiles = true;
-  version = "0.5";
+  version = "1.1.0";
 };
 "zhmetrics" = {
   stripPrefix = 0;
-  sha512.run = "fe75c05a1465b57c5f23744148a51681ecbe47af0384ebcfd15aedd4f35c6e38484f2e39bfc02c2e2661296aebd1a7f47d9798d87f062fafbae7ce5c949b7112";
-  sha512.doc = "1c8fafe2d52c7b108423cd2859666dc89e2c161236fb2c9904a63966a04de0600715b785be90348fbf6ab4bf3a414565a0b1d03e483c2f7239c3f621023a8a71";
-  sha512.source = "c7d8ef65b0fd9872f9d8fed5289f798d47805f530d2ae5d3aa39ccb630d9d635b236949f7d11bbc9a4cd10ce370ca42ae72891b38a852e7abd47854f0811e516";
+  sha512.run = "734ba26f0e6e8c899ea5aa714cd9931a1e8f643c23f0f4e3ab2638581e9ae2f77b016ca83bccf3bc52dedab0312a1221364200b21ae701de29a40348e5e7bd8d";
+  sha512.doc = "0d2b13ed70a0c2c13ca91b27c5e56e258a902b7845c5dd6ee1bc8489bd792be53ee88d9e728bb5c42ba0ebc9e5a0d982a9362e00a5cdc8ae7900b52e3514eb50";
+  sha512.source = "528612152fc7841353b3d40937f11a89c0393dd1d1b6d7d02c772f6a00e0d9704f1df132470366a238b58d2d6752e111eee7677a9cbcf35f5945d215a9a58497";
   hasRunfiles = true;
   version = "r206";
 };
 "zhmetrics-uptex" = {
   stripPrefix = 0;
-  sha512.run = "6a3a7150b6bb2a3fd2d265bc39adc510434abf782180d45844801de80f8f8585e1e5c75ee1f6de5258496b0550ac692d415dde6d78aad8b0a12a848b5ab139fa";
-  sha512.doc = "7e52b16f4b7bf1d1c08513cfb8e27553cc71db8e1811049337bc5beaff4a4c5c74c859603f6d0fce5df5a72e88e935fd367c198b9c9bdf20eab4e30eaced5c62";
+  sha512.run = "dd8c62cb9c60dff6e9f2ae5a6d88797af8e4a855c7bbe1c081063582e2816cfec3991a75b27f28044a7fb82052a37272d5b69d47fa26b669499ddb2be9a20b1f";
+  sha512.doc = "11bbbef58e291bbda6b375ab59399a95c4f19f020be659e9f264f24737cb28f9f32a5c829bca4dcf78dedfa200523b439464eda1f11b8d887771714c71c2cf66";
   hasRunfiles = true;
   version = "1.0";
 };
 "zhnumber" = {
   stripPrefix = 0;
-  sha512.run = "8aa786cacd5d434e44b3d53e8908b11d1c33d83463945202f0a54f4ec9eba15274b08133d01265b2e577990ccf7754d2f5786339fe269330d317800c12c2b3e0";
-  sha512.doc = "9f127cc8a79714ad84da483e5bbd7cab6d5cb76c9c5c0a37f86901e98481fc163128e91b1358f5fe4ee446294c6718401c0baa97b7cb03cca0fda443d86b818e";
-  sha512.source = "7c6bc41d720aa6c6f2e4b0c8f6dad6055bf3fd7814b4e6fa1ab266110dfea5685fa13a58268314a51564df55a05fc2d759edf56c304f03b3b77009991ab0ae07";
+  sha512.run = "32420fa4d172a21f4356b9eb5e527fd682a06c15045bbded9bb5efe7a711df3d7c7f6d49833c701d4a3f6f5f19dec5f94e41be592ed930bdb349bbe3245f6215";
+  sha512.doc = "a26e510201781eaba0bad2e7da2050c85cfe3e53b1cb51788ebbc9b93259a222e66dabcb64b183a3193622d12ffa3f7cfca58dedf631b9e789b5cb50c3a9dae2";
+  sha512.source = "a166c409039690ade7cecf2203d9368375dcb94b5c7a80793acba73a828b21aafa1b02e8ed0ed63cce79f61e69bcee738115b52eae067f5b6979b8817bbd1612";
   hasRunfiles = true;
   version = "2.6";
 };
 "zhspacing" = {
   stripPrefix = 0;
-  sha512.run = "4dee6b15de743255ceb4525b96ab43e67fc57512396a5217ea5d0971fb7ee879851901659f2162764e0e82de2b14d986818757703905743bef0c809a4fd580bc";
-  sha512.doc = "0232956c6b105b02dcc036be0fb5bf761dd99119ed9a339db2c882bdff9ddc5ed17b351cdb0dd297c76760b298306db268794f73567873c62d7eb361a60e0fd7";
+  sha512.run = "57147fc36a324d1b30507d3bb4905cefd1b409675342b9b4a307c2c0fbae145c728469ba5703298bf99073c09818c9d3afd19b5fa6c73f154a4b5e932268b720";
+  sha512.doc = "f1b285ea912cab8181bab4c0e423c138afbe9939e5a9c29097bd2a6b4da83e389962e9bee2b5ed4b0d0add231366605a481771902abcf93234efc4120440f228";
   hasRunfiles = true;
 };
 "ziffer" = {
   stripPrefix = 0;
-  sha512.run = "7c4d9c89a328c231c561832243bfa936f46b28c21a16ca492df74f8d2dc13eac387cf401434360de99f9a17bdfdbf83ae3b233bb5fa1696e90279c05f9cb9ad6";
-  sha512.doc = "e7d8756c98917b3207a67c07492ea3e01dddbaa4d69485ea5f9c50c939fce316b067079c1de6673cb07fbe9243191af4be0c91f48e0cee51d9369f6461ebc20c";
+  sha512.run = "f241b7d3124bc0529c46033a390b3c561d07575bb1908d0614ac417c82d93e25501daf080324396f021562683624a261ce94731efebe5dab2bf7c1c66927fbcd";
+  sha512.doc = "3423fb0f85e8f99b9e543580d50fc49f3a8d73b9f6168d1f13512023f532b56e7edbf932831f9d3172cd7fa9c844f2751c544a741b359f26d658a69c7dab41e5";
   hasRunfiles = true;
   version = "2.1";
 };
 "zlmtt" = {
   stripPrefix = 0;
-  sha512.run = "5cdf0579ac6584fc73688ebffd9f18016c20c76fdd01f0b8be7331762700924ce77cb912b34dca15da078f472d46f506d1cae5e2d2e9ee1944fb772c7f27b6a2";
-  sha512.doc = "834220fc28cda484b15cca0b896124a98f3664686582490c19582644524cdedd111e0ec500cdb4fbd45dd0a4c3ec9d647ee4a5a4de699f6b6ed16a67e7221312";
+  sha512.run = "2c1b06550725880daf93c06fac7c386c27627d4fdad391706725b2514a16be1037dbe86fc9f3f3083cdf1d47175fba297f18d1fd26fdb2f392aa7e45ae624e77";
+  sha512.doc = "f2fa605beb0a02aa2a55f19f7310ca295891b64e1ef2bba7311ba375191edbf915ad9b74747cc3661bc983af7c876e8a7f5997bcaed2be230cbd5d3e292cdfa7";
   hasRunfiles = true;
   version = "1.01";
 };
 "zwgetfdate" = {
   stripPrefix = 0;
-  sha512.run = "ed7bdc7394b104d78a6302027589ef5a2ed8b27de3747285e75d1ea76d84026f406693e0c49a59ff5c6df38ab65704042aee9e154f77e092e4c520d9fc2568ec";
-  sha512.doc = "154ceb58eb1ebadb022d28244e962cc4851af8234efec7d5e78689383c81b02747873104dc8a46932afa17bc063db23015f171284beeac8a749b7c650a417566";
+  sha512.run = "82f490b04b42d371b1c48c6c0e326a96fe46b9a4c8e1ab981151a6809cbab09de7a7c9cd1cb5041ac6e513bca7d56cd602e1ab5c52c9a4077e3abba18d8fc378";
+  sha512.doc = "2a3c7b87f0aeb0c55fa0f716d469a57378e0f62751df18ee791cb6188b44f5faa0187c7b541586fe05d354befae85233b816e960ef72d8d8c02119962fd693f0";
   hasRunfiles = true;
 };
 "zwpagelayout" = {
   stripPrefix = 0;
-  sha512.run = "9a58f48ba19e82ad7ebab471a419c83b037d0e314cf2bd2b72799228bac68356cf286091f0735689d6171a5d0707b04a8dbfbf4e5a7a940846fe7e86a96fbcbf";
-  sha512.doc = "0a31ba65d49cbc111d6a5ca3ff1b2f9aa91614a23d6606aad1d5b9d37cd40f0f72c95bdfd56e56cb5f408279870e867282d862d0267d8e829fde608a49c079de";
+  sha512.run = "9e836b46dac6c9ba2436c2eff15107bb2dc801fe640465fde643b3ff09df58f30e724fe0bf702467850b20db14c72dcf6387ce60be872a15d17d06056f285713";
+  sha512.doc = "60869f08713337fef6519f8feea0641e6111ce1932edba1a678cc21803325cb826c172d3357ec5f1580dabe7e6c43455289835c463cf68e86e4c1a1b59c8ddc7";
   hasRunfiles = true;
   version = "1.4d";
 };
 "zxjafbfont" = {
   stripPrefix = 0;
-  sha512.run = "2c06d1017fdff9b772ec8f9c7992a23c644fb7dba00d8b8776066c7fe4c8bee5ffc0b0257f03aa4925e0811ea19bf4c59b05ee76adab3cb41b326d7b4775683e";
-  sha512.doc = "3e86815f7b5d23b58b15bfa81d24b7ce30c6ee9028912635656a7fb4125ba1906073e2d9e834c2085cef4eb0162d06625906459d958283224db33cdad9140b07";
+  sha512.run = "73a17776e44f63ceef2132ddda5411d5b3362e21e2e40d2629d44638abab4c0a63a04ac11e9ad815a5dddf88f37d592baac86939c8b9c21099a1909c6e1fc7cc";
+  sha512.doc = "e64220aeb4a648dcf8966f020f01761b133cfd13ca8792a97884a83b3976987907377017592e0b8841051d0ce2d7034ef45b7bf7126b27dc04473a6c92b59b02";
   hasRunfiles = true;
   version = "0.2";
 };
 "zxjafont" = {
   stripPrefix = 0;
-  sha512.run = "a3b7f328a8b0f7a10464f073dba017dfecb28a9e185ad01b5f73bfa4f62ff354c4ae360a78f9311d15203505dce40a207cccd9bfdc3a854b3584df9ad3dccf93";
-  sha512.doc = "e77f9ca52e69a9d66393ab231aa6505b3726f17c4e4de958e4f3e484df80eb63557dd59e23a11c6022d36468b7e8b546d2ddc5dd9ddcd4746bdad29576478c12";
+  sha512.run = "fc34c9efdd78bce9698a5bf8b298f3d179aa9f083807bda63967d974cc7cac3c4aad51beeb969e324d305ca2e4fbaa61f3a659c75a4ed9a17d703c1bf6ba5c91";
+  sha512.doc = "755eb5876c626f3e26d80d8ab5fd8d45204b107d88f8405fa8101d5c82a6b66af7566d75bbc53972738b069bc8ca2bd72a1e45bf1edb01ce3c7de0706b3cbc6f";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.4";
 };
 "zxjatype" = {
   stripPrefix = 0;
-  sha512.run = "83ac3fd469f8335bf09757c8ffc2a40eac820e29a1af2da858f570ea86238f1ba982dbe634fa0048482d9632f76ca547118da4387000c4772cb899e4b3cb404a";
-  sha512.doc = "ffe2454057c766401c6ae98c885ae523179ae6f1d125e789b0cf39c189c270cbfde76484fcd870b7fafd3f2bb7293b8482b1526f843f0003176ef2dbe4c8ef1a";
+  sha512.run = "f841768bc993d83d6ba2a0d6a2893601647834613e401efee5aa3b445941951b8f4c787648b4acc67382b2b4fe950a47727f630413bf9259e8956b1a402769b2";
+  sha512.doc = "01446eb58a7f397f7d2ed2772f4d0cfbfcc6dce2a79b855dff7f80b5acf7fecd4ccde78916a9833f1878a9d8c0ec092e472ee0b51a28fc27c0a43f40d67cb733";
   hasRunfiles = true;
-  version = "0.6b";
+  version = "0.6c";
 };
 }

From 2737f17d382e659abb4a88d498fb930342f8b103 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 27 Aug 2018 10:40:45 +0200
Subject: [PATCH 0068/3253] texlive: add detailed upgrade instructions in
 separate file

---
 .../typesetting/tex/texlive/UPGRADING.md      | 68 +++++++++++++++++++
 .../tools/typesetting/tex/texlive/default.nix | 24 -------
 2 files changed, 68 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/tools/typesetting/tex/texlive/UPGRADING.md

diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
new file mode 100644
index 000000000000..67ea7c4fe185
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
@@ -0,0 +1,68 @@
+# Notes on maintaining/upgrading
+
+## Upgrading texlive.bin
+
+texlive contains a few binaries, defined in bin.nix and released once a year.
+
+In order to reduce closure size for users who just need a few of them, we split it into
+packages such as core, core-big, xvdi, etc. This requires making assumptions
+about dependencies between the projects that may change between releases; if
+you upgrade you may have to do some work here.
+
+
+## Updating the package set
+
+texlive contains several thousand packages from CTAN, defined in pkgs.nix.
+
+The CTAN mirrors are not version-controlled and continuously moving,
+with more than 100 updates per month.
+
+To create a consistent and reproducible package set in nixpkgs, we snapshot CTAN
+and generate nix expressions for all packages in texlive at that point.
+
+We mirror CTAN sources of this snapshot on community-operated servers and on IPFS.
+
+To upgrade the package snapshot, follow this process:
+
+
+### Snapshot sources and texlive package database
+
+Mirror the current CTAN archive to our mirror(s) and IPFS (URLs in `default.nix`).
+See <https://tug.org/texlive/acquire-mirror.html> for instructions.
+
+
+### Upgrade package information from texlive package database
+
+
+```
+$ curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \
+           | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix
+```
+
+This will download a current snapshot of the CTAN package database `texlive.tlpdb.xz`
+and regenerate all of the sha512 hashes for the current upstream distribution in `pkgs.nix`.
+
+
+### Build packages locally and generate fix hashes
+
+To save disk space and prevent unnecessary rebuilds, texlive packages are built
+as fixed-output derivations whose hashes are contained in `fixedHashes.nix`.
+
+Updating the list of fixed hashes requires a local build of *all* packages,
+which is a resource-intensive process:
+
+
+```
+# move fixedHashes away, otherwise build will fail on updated packages
+$ mv fixedHashes.nix fixedHashes-old.nix
+# start with empty fixedHashes
+$ echo '{}' > fixedHashes.nix
+$ nix-build ../../../../.. -Q --no-out-link -A texlive.scheme-full.pkgs | ./fixHashes.sh > ./fixedHashes-new.nix
+# The script wrongly includes the nix store path to `biber`, which is a separate nixpkgs package
+$ grep -v -F '/nix/store/' fixedHashes-new.nix > fixedHashes.nix 
+```
+
+### Commit changes
+
+Commit the updated `pkgs.nix` and `fixedHashes.nix` to the repository.
+
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index c10b9c992968..755640e1a7b6 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -1,30 +1,6 @@
 /* TeX Live user docs
   - source: ../../../../../doc/languages-frameworks/texlive.xml
   - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive
-
-  Note on upgrading: The texlive package contains a few binaries, defined in
-  bin.nix and released once a year, and several thousand packages from CTAN,
-  defined in pkgs.nix.
-
-  The CTAN mirrors are continuously moving, with more than 100 updates per
-  month. Due to the size of the distribution, we snapshot it and generate nix
-  expressions for all packages in texlive at that point.
-
-  To upgrade this snapshot, run the following:
-  $ curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \
-             | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix
-
-  This will regenerate all of the sha512 hashes for the current upstream
-  distribution. You may want to find a more stable mirror, put the distribution
-  on IPFS, or contact a maintainer to get the tarballs from that point in time
-  into a more stable location, so that nix users who are building from source
-  can reproduce your work.
-
-  Upgrading the bin: texlive itself is a large collection of binaries. In order
-  to reduce closure size for users who just need a few of them, we split it into
-  packages such as core, core-big, xvdi, etc. This requires making assumptions
-  about dependencies between the projects that may change between releases; if
-  you upgrade you may have to do some work here.
 */
 { stdenv, lib, fetchurl, runCommand, writeText, buildEnv
 , callPackage, ghostscriptX, harfbuzz, poppler_min

From ac03d2e571b22621cc84fa7111adb538285cb71f Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 28 Aug 2018 17:50:30 +0200
Subject: [PATCH 0069/3253] texlive.bin.core-big: remove unneeded compiler
 flags

---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 2975e1007ab0..06913d444567 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -200,7 +200,6 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
   '';
 
   preBuild = "cd texk/web2c";
-  CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2018 is out?
   enableParallelBuilding = true;
 
   doCheck = false; # fails

From 831551a9a19bba96b593cb9fa3e862fb039d792e Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 28 Aug 2018 17:54:52 +0200
Subject: [PATCH 0070/3253] texlive.bin.core-big: disable luatex53

build failed on Darwin
Patch by @veprbl
---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 06913d444567..53fac978ebb0 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -176,8 +176,12 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
     ++ withSystemLibs [ "kpathsea" "ptexenc" "cairo" "harfbuzz" "icu" "graphite2" ]
     ++ map (prog: "--disable-${prog}") # don't build things we already have
       [ "tex" "ptex" "eptex" "uptex" "euptex" "aleph" "pdftex"
-        "web-progs" "synctex" "luajittex" "mfluajit" # luajittex is mostly not needed, see:
+        "web-progs" "synctex"
+        # build fails on Darwin with luatex53
+        "luatex53" # TODO probably can be removed when TexLive 2019 is out
+        # luajittex is mostly not needed, see:
         # http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
+        "luajittex" "mfluajit"
       ];
 
   configureScript = ":";
@@ -185,7 +189,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
   # we use static libtexlua, because it's only used by a single binary
   postConfigure = ''
     mkdir ./WorkDir && cd ./WorkDir
-    for path in libs/{teckit,lua52,lua53} texk/web2c; do
+    # TODO add lua53 here when luatex53 is enabled again
+    for path in libs/{teckit,lua52} texk/web2c; do
       (
         if [[ "$path" =~ "libs/lua5" ]]; then
           extraConfig="--enable-static --disable-shared"

From 5c9ebf4fc7a159d31d6b98b474ce6ef431d11316 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 28 Aug 2018 18:07:27 +0200
Subject: [PATCH 0071/3253] biber: 2.10 -> 2.11

2.11 is the version used in TexLive 2018
---
 pkgs/tools/typesetting/biber/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index 8dd4e98e0e13..ea9b68f02b9e 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -5,13 +5,13 @@
 
 perlPackages.buildPerlModule rec {
   name = "biber-${version}";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "plk";
     repo = "biber";
     rev = "v${version}";
-    sha256 = "0f6bb1iprl92iamxqlr8fc99mxr9n3722frd1ak9pbzh3m6c2ny6";
+    sha256 = "0qgkc1k9n36yfmndwz879pak6mjphld0p85lzn9g2ng0vhxsifzz";
   };
 
   buildInputs = with perlPackages; [

From 20d88c1a4bbda5c46e227b5777f86df66c775624 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 29 Aug 2018 03:04:44 +0200
Subject: [PATCH 0072/3253] texlive: add IPFS URL for package source snapshot

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 755640e1a7b6..4904a60822a0 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -112,11 +112,12 @@ let
         # TODO: remove when there is a reliable long-term solution
         https://cat3.de/texlive-2018/tlnet/archive
 
-        # TODO: Add another snapshot mirror
-
-        # TODO: Add IPFS storage or host snapshot elsewhere,
+        # TODO: Add second, faster and more reliable snapshot mirror,
         # maybe on one of our project's servers
 
+        # IPFS seeded by the mirror above - this may be quite slow
+        https://ipfs.io/ipfs/QmT4Z67wXin1Z9DhvqwSSkSZSuu8hT6LgDyMu6CBm9Tb7t/tlnet/archive
+
         # The canonical source moves quickly and will be broken almost immediately
         http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/archive
 

From 383de74f883ab544ef2c9811f5735592160a765d Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 28 Aug 2018 11:06:04 +0200
Subject: [PATCH 0073/3253] patch-shebangs: filename on unsupported shebang

Show the filename on unsupported shebang error.
Simplifies debugging packages with large set of scripts.
---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 1433d1e1f144..d5586fccae67 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -32,7 +32,7 @@ patchShebangs() {
             # - options: something starting with a '-'
             # - environment variables: foo=bar
             if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
-                echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+                echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
                 exit 1
             fi
             newPath="$(command -v "$arg0" || true)"

From f9943cd28a2520831f27aceadec598ef04b8019c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 29 Aug 2018 21:28:46 +0200
Subject: [PATCH 0074/3253] =?UTF-8?q?pango:=201.42.1=20=E2=86=92=201.42.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a horrendous bug that crashes IRC clients, text editors, terminal
emulators that receive invalid Unicode sequence.
---
 pkgs/development/libraries/pango/default.nix | 42 ++++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 28f8a221700d..6b5a0a359715 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,37 +1,45 @@
 { stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
-, libintl, gobjectIntrospection, darwin, fribidi
+, libintl, gobjectIntrospection, darwin, fribidi, gnome3
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
 }:
 
 with stdenv.lib;
 
 let
-  ver_maj = "1.42";
-  ver_min = "1";
-in
-stdenv.mkDerivation rec {
-  name = "pango-${ver_maj}.${ver_min}";
+  pname = "pango";
+  version = "1.42.4";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
-  buildInputs = [ gobjectIntrospection ];
-  nativeBuildInputs = [ pkgconfig ]
-    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-       Carbon
-       CoreGraphics
-       CoreText
-    ]);
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+  buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    Carbon
+    CoreGraphics
+    CoreText
+  ]);
   propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
 
   enableParallelBuilding = true;
 
-  configureFlags = optional stdenv.isDarwin "--without-x";
+  # Fontconfig error: Cannot load default config file
+  FONTCONFIG_FILE = makeFontsConf {
+    fontDirectories = [ freefont_ttf ];
+  };
 
-  doCheck = false; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file"
+  doCheck = false; # /layout/valid-1.markup: FAIL
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
 
   meta = with stdenv.lib; {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";

From 03c1f567d5933b3290b5e485e5d7e0ccb2a4e608 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 30 Aug 2018 12:50:36 +0200
Subject: [PATCH 0075/3253] systemd: don't use options from fstab on remount

Include fix by @aszlig to fix remount with comment/application-specific
fstab options.
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 912ba5b5e0ef..9dac740f9a55 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -27,8 +27,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "67c553805a9ebee2dce7c3a350b4abd4d7a489c2";
-    sha256 = "114vq71gcddi4qm2hyrj5jsas9599s0h5mg65jfpvxhfyaw54cpv";
+    rev = "21efe60844fda21039c052442076dabcf8643a90";
+    sha256 = "0aqifjsb0kaxnqy5nlmzvyzgfd99lm60k1494lbnnk8ahdh8ab07";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From cc1b9b408e26a1ce54f20534b8dc7b5164046f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:28:41 +0200
Subject: [PATCH 0076/3253] gst_all_1.gstreamer: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/core/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5845c8c50db2..b4a324d68d96 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.14.0";
+  name = "gstreamer-${version}";
+  version = "1.14.2";
 
   meta = with lib ;{
     description = "Open source multimedia framework";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw";
+    sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb";
   };
 
   patches = [

From a29e9edfc0684539bc70dfe39ac5f70d06802538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:29:12 +0200
Subject: [PATCH 0077/3253] gst_all_1.gst-plugins-base: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/base/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dd4007bd142b..a5f8e3406423 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -9,7 +9,8 @@
 , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.14.0";
+  name = "gst-plugins-base-${version}";
+  version = "1.14.2";
 
   meta = with lib; {
     description = "Base plugins and helper libraries";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y";
+    sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4";
   };
 
   outputs = [ "out" "dev" ];

From effef4f3ecfdb60f340091fd7091d99820e77d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:29:46 +0200
Subject: [PATCH 0078/3253] gst_all_1.gst-plugins-good: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/good/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 99d27523b1c9..45f700e158a9 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -15,7 +15,8 @@ let
   inherit (stdenv.lib) optional optionals;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.14.0";
+  name = "gst-plugins-good-${version}";
+  version = "1.14.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka";
+    sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0";
   };
 
   outputs = [ "out" "dev" ];

From 03c7e30aee9204b065fd98abb806ac8a1da8b6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:30:00 +0200
Subject: [PATCH 0079/3253] gst_all_1.gst-plugins-bad: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 96e02c605f54..3f030b7469e1 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -17,7 +17,8 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.14.0";
+  name = "gst-plugins-bad-${version}";
+  version = "1.14.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd";
+    sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil";
   };
 
   outputs = [ "out" "dev" ];

From 65b5563d12b44c78c5fe7c2b0a882a01f3922645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:30:13 +0200
Subject: [PATCH 0080/3253] gst_all_1.gst-plugins-ugly: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/ugly/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 004bb0715f26..b5256bf4b4c7 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -6,7 +6,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.14.0";
+  name = "gst-plugins-ugly-${version}";
+  version = "1.14.2";
 
   meta = with lib; {
     description = "Gstreamer Ugly Plugins";
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z";
+    sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m";
   };
 
   outputs = [ "out" "dev" ];

From d7b47e966ca6e990cd8dd5d0138aab5629d4d8dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:30:39 +0200
Subject: [PATCH 0081/3253] gst_all_1.gst-editing-services: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/ges/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 895f298c8269..d2c3cbcc6ac3 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.14.0";
+  name = "gstreamer-editing-services-${version}";
+  version = "1.14.2";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd";
+    sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5";
   };
 
   outputs = [ "out" "dev" ];

From d273db48c6e95d6547f02845f1921211f113c0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 29 Aug 2018 16:05:48 +0000
Subject: [PATCH 0082/3253] nixos/shells: avoid overriding the environment for
 child shells

A shared exported guard `__NIXOS_SET_ENVIRONMENT_DONE` is introduced that can
be used to prevent child shells from sourcing `system.build.setEnvironment`
the second time.

This fixes e.g. `nix run derivation` when run from e.g. ZSH through the console or
ssh. Before this Bash would resource the common environment resetting the `PATH`
environment variable.

We also export `system.build.setEnvironment` to `/etc/set-environment` making it
easy to reset the common environment with `. /etc/set-environment` when
needed and to grep for environment variables in `/etc` (which was the
motivation of #30418).

This reverts changes made in b00a3fc6fd82834114771f2115a2b032f0ebfe29
(the original #30418).
---
 nixos/modules/config/shells-environment.nix | 9 +++++++++
 nixos/modules/programs/bash/bash.nix        | 4 +++-
 nixos/modules/programs/fish.nix             | 4 +++-
 nixos/modules/programs/zsh/zsh.nix          | 4 +++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9dc4749b08d1..41b1b32768ff 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -162,8 +162,17 @@ in
         /bin/sh
       '';
 
+    # For resetting environment with `. /etc/set-environment` when needed
+    # and discoverability (see motivation of #30418).
+    environment.etc."set-environment".source = config.system.build.setEnvironment;
+
     system.build.setEnvironment = pkgs.writeText "set-environment"
        ''
+         # DO NOT EDIT -- this file has been generated automatically.
+
+         # Prevent this file from being sourced by child shells.
+         export __NIXOS_SET_ENVIRONMENT_DONE=1
+
          ${exportedEnvVars}
 
          ${cfg.extraInit}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 69a1a482d074..e5f5c8d09438 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -126,7 +126,9 @@ in
     programs.bash = {
 
       shellInit = ''
-        ${config.system.build.setEnvironment.text}
+        if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+            . ${config.system.build.setEnvironment}
+        fi
 
         ${cfge.shellInit}
       '';
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c8d94a47be28..40b3ff37289f 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -109,7 +109,9 @@ in
       set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
       
       # source the NixOS environment config
-      fenv source ${config.system.build.setEnvironment}
+      if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+          fenv source ${config.system.build.setEnvironment}
+      end
 
       # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
       set -e fish_function_path
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 42d4e1d4ada0..c6ab637160d5 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -103,7 +103,9 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
+        if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+            . ${config.system.build.setEnvironment}
+        fi
 
         ${cfge.shellInit}
 

From 8952375b484ecb65593be4e81fb8cc5ffde09428 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 29 Aug 2018 16:05:53 +0000
Subject: [PATCH 0083/3253] nixos/shells: fix indent everywhere

to comply with `doc/coding-conventions.xml`
---
 nixos/modules/config/shells-environment.nix | 18 +++++++++---------
 nixos/modules/programs/bash/bash.nix        |  8 ++++----
 nixos/modules/programs/fish.nix             | 15 +++++++--------
 nixos/modules/programs/zsh/zsh.nix          | 10 +++++-----
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 41b1b32768ff..b6dcb9aed4e7 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -167,19 +167,19 @@ in
     environment.etc."set-environment".source = config.system.build.setEnvironment;
 
     system.build.setEnvironment = pkgs.writeText "set-environment"
-       ''
-         # DO NOT EDIT -- this file has been generated automatically.
+      ''
+        # DO NOT EDIT -- this file has been generated automatically.
 
-         # Prevent this file from being sourced by child shells.
-         export __NIXOS_SET_ENVIRONMENT_DONE=1
+        # Prevent this file from being sourced by child shells.
+        export __NIXOS_SET_ENVIRONMENT_DONE=1
 
-         ${exportedEnvVars}
+        ${exportedEnvVars}
 
-         ${cfg.extraInit}
+        ${cfg.extraInit}
 
-         # ~/bin if it exists overrides other bin directories.
-         export PATH="$HOME/bin:$PATH"
-       '';
+        # ~/bin if it exists overrides other bin directories.
+        export PATH="$HOME/bin:$PATH"
+      '';
 
     system.activationScripts.binsh = stringAfter [ "stdio" ]
       ''
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index e5f5c8d09438..424e1506b4c5 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -168,11 +168,11 @@ in
 
         # Read system-wide modifications.
         if test -f /etc/profile.local; then
-          . /etc/profile.local
+            . /etc/profile.local
         fi
 
         if [ -n "''${BASH_VERSION:-}" ]; then
-          . /etc/bashrc
+            . /etc/bashrc
         fi
       '';
 
@@ -193,12 +193,12 @@ in
 
         # We are not always an interactive shell.
         if [ -n "$PS1" ]; then
-          ${cfg.interactiveShellInit}
+            ${cfg.interactiveShellInit}
         fi
 
         # Read system-wide modifications.
         if test -f /etc/bashrc.local; then
-          . /etc/bashrc.local
+            . /etc/bashrc.local
         fi
       '';
 
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 40b3ff37289f..c3f742acde2e 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -27,7 +27,7 @@ in
         '';
         type = types.bool;
       };
-      
+
       vendor.config.enable = mkOption {
         type = types.bool;
         default = true;
@@ -43,7 +43,7 @@ in
           Whether fish should use completion files provided by other packages.
         '';
       };
-      
+
       vendor.functions.enable = mkOption {
         type = types.bool;
         default = true;
@@ -107,7 +107,7 @@ in
       # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
       # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
       set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
-      
+
       # source the NixOS environment config
       if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
           fenv source ${config.system.build.setEnvironment}
@@ -125,7 +125,7 @@ in
         set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
         fenv source /etc/fish/foreign-env/shellInit > /dev/null
         set -e fish_function_path[1]
-        
+
         ${cfg.shellInit}
 
         # and leave a note so we don't source this config section again from
@@ -139,7 +139,7 @@ in
         set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
         fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
         set -e fish_function_path[1]
-        
+
         ${cfg.loginShellInit}
 
         # and leave a note so we don't source this config section again from
@@ -151,12 +151,11 @@ in
       status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
       and begin
         ${fishAliases}
-        
 
         set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
         fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
         set -e fish_function_path[1]
-        
+
         ${cfg.promptInit}
         ${cfg.interactiveShellInit}
 
@@ -172,7 +171,7 @@ in
       ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
       ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
       ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
-    
+
     environment.systemPackages = [ pkgs.fish ];
 
     environment.shells = [
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index c6ab637160d5..2ef575f8f642 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -70,7 +70,7 @@ in
       promptInit = mkOption {
         default = ''
           if [ "$TERM" != dumb ]; then
-            autoload -U promptinit && promptinit && prompt walters
+              autoload -U promptinit && promptinit && prompt walters
           fi
         '';
         description = ''
@@ -113,7 +113,7 @@ in
 
         # Read system-wide modifications.
         if test -f /etc/zshenv.local; then
-          . /etc/zshenv.local
+            . /etc/zshenv.local
         fi
       '';
 
@@ -132,7 +132,7 @@ in
 
         # Read system-wide modifications.
         if test -f /etc/zprofile.local; then
-          . /etc/zprofile.local
+            . /etc/zprofile.local
         fi
       '';
 
@@ -158,7 +158,7 @@ in
 
         # Tell zsh how to find installed completions
         for p in ''${(z)NIX_PROFILES}; do
-          fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+            fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
         done
 
         ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
@@ -173,7 +173,7 @@ in
 
         # Read system-wide modifications.
         if test -f /etc/zshrc.local; then
-          . /etc/zshrc.local
+            . /etc/zshrc.local
         fi
       '';
 

From ab539ab86343f290650b98937dbac6e17063ed13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Aug 2018 15:27:26 +0200
Subject: [PATCH 0084/3253] libinput: make .bin the first output

That's the convention:
---
 nixos/modules/services/x11/hardware/libinput.nix | 2 +-
 pkgs/development/libraries/libinput/default.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index d0a87f183b6f..7c3e35884eab 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -205,7 +205,7 @@ in {
       })
     ];
 
-    services.udev.packages = [ pkgs.libinput ];
+    services.udev.packages = [ pkgs.libinput.out ];
 
     services.xserver.config =
       ''
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 61c8095911f6..fc6971e77cea 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4";
   };
 
-  outputs = [ "out" "dev" "bin" ];
+  outputs = [ "bin" "out" "dev" ];
 
   mesonFlags = [
     (mkFlag documentationSupport "documentation")

From 5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Aug 2018 18:01:07 +0200
Subject: [PATCH 0085/3253] procps(-ng): drop the bootstrapping hack

On master/staging the bootstrap mistake has been fixed,
and it no longer pulls procps, so such a hack isn't required.
---
 pkgs/os-specific/linux/procps-ng/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index dd269c447df8..272812ccb588 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -2,12 +2,8 @@
 
 # `ps` with systemd support is able to properly report different
 # attributes like unit name, so we want to have it on linux.
-# The strange `boostrap` condition is here because `procps` can be
-# pulled in to early in bootstrap process, when `stdenv` is not yet
-# functional enought to build `systemd` (or its dependencies).
-# See https://github.com/NixOS/nixpkgs/pull/43817#issuecomment-408346135
-, withSystemd ? stdenv.isLinux && !(lib.hasPrefix "bootstrap" stdenv.name)
-, systemd
+, withSystemd ? stdenv.isLinux
+, systemd ? null
 
 # procps is mostly Linux-only. Most commands require a running Linux
 # system (or very similar like that found in Cygwin). The one

From 8fc6472ace275f24a0530eb191d5d89bc8aee35e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Aug 2018 19:47:11 +0200
Subject: [PATCH 0086/3253] gnome-documents, tlaplus: fix glib references

---
 pkgs/applications/science/logic/tlaplus/toolbox.nix    | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix
index 342d91cf5825..f1116a27c0be 100644
--- a/pkgs/applications/science/logic/tlaplus/toolbox.nix
+++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation {
       --run "set -x; cd $out/toolbox" \
       --add-flags "-data ~/.tla-toolbox" \
       --prefix PATH : "${jre}/bin" \
-      --prefix LD_LIBRARY_PATH : "${swt}/lib:${gtk}/lib:${libXtst}/lib:${glib}/lib"
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}"
 
     echo -e "\nCreating TLA Toolbox icons..."
     pushd "$src"
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 9948f9d909b2..f8ce9545a33d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication"
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication"
   '';
 
   passthru = {

From 80b25db15cdbb3971ae739a6eca998da6845c174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Aug 2018 19:45:19 +0200
Subject: [PATCH 0087/3253] treewide: use glib tools from build-time $PATH

Using explicit output feels more flaky in case we e.g. move the binary.
(No strong opinion on my side, feel free to revert if you think so.)
---
 pkgs/applications/audio/gradio/default.nix                  | 2 +-
 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/tracker-miners/default.nix       | 2 +-
 pkgs/desktops/gnome-3/core/tracker/default.nix              | 2 +-
 pkgs/desktops/gnome-3/extensions/caffeine/default.nix       | 2 +-
 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 2 +-
 pkgs/desktops/gnome-3/extensions/volume-mixer.nix           | 2 +-
 pkgs/desktops/gnome-3/misc/pidgin/default.nix               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index ed34c3118c68..0e636c532b46 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+    glib-compile-schemas "$out"/share/glib-2.0/schemas
   '';
 
   patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index da117a536911..5ae579417aec 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/gsettings-schemas/$name
     mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+    glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index 67c43311123c..f33970251d5b 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
   '';
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index a0da1b7147d2..5d6b326d21d8 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+    glib-compile-schemas "$out/share/glib-2.0/schemas"
   '';
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index d556c5e55ca4..cc9451597169 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     ${bash}/bin/bash ./update-locale.sh
-    ${glib.dev}/bin/glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
+    glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas
   '';
 
   installPhase = ''
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 395e90d263ef..b4b34d91c18e 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
-    ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+    glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
   '';
 
   installPhase = ''
diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
index 1487efe0a23f..19ced0b5252c 100644
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
-    ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
+    glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
   '';
 
   installPhase = ''
diff --git a/pkgs/desktops/gnome-3/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
index a5dd1480d3db..c11fdfa6099e 100644
--- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix
+++ b/pkgs/desktops/gnome-3/misc/pidgin/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
     mkdir -p "$schemas_dir"
     mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */
-    ${glib.dev}/bin/glib-compile-schemas "$schemas_dir"
+    glib-compile-schemas "$schemas_dir"
 
     locale_dir="$share_dir/locale"
     mkdir -p "$locale_dir"

From 3947c7b2a4eeedc316868a25b6fb63490ac5c5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:31:18 +0200
Subject: [PATCH 0088/3253] gst_all_1.gst-vaapi: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 7255894f3b1f..be7ee8f12787 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "1.14.0";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
-    sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4";
+    sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z";
   };
 
   outputs = [ "out" "dev" ];

From 8c971f0fca72dacec3dec0540547f4cc0edb6548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:31:41 +0200
Subject: [PATCH 0089/3253] gst_all_1.gst-rtsp-server: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 9ff799b0a27b..4166f357cdaa 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -3,7 +3,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-rtsp-server-1.14.0";
+  name = "gst-rtsp-server-${version}";
+  version = "1.14.2";
 
   meta = with stdenv.lib; {
     description = "Gstreamer RTSP server";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
-    sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb";
+    sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p";
   };
 
   outputs = [ "out" "dev" ];

From 538c733c0da4d88f56a3e326cad1e18881657d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:32:04 +0200
Subject: [PATCH 0090/3253] gst_all_1.gst-validate: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/validate/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index bd33d9c52807..63893bbc523e 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.14.0";
+  name = "gst-validate-${version}";
+  version = "1.14.2";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk";
+    sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa";
   };
 
   outputs = [ "out" "dev" ];

From 00a879ccda2c34e385c811a84619718d114d660b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:32:23 +0200
Subject: [PATCH 0091/3253] gst_all_1.gst-libav: 1.14.0 -> 1.14.2

---
 pkgs/development/libraries/gstreamer/libav/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 564b37fab794..f78015704fce 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,8 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.14.0";
+  name = "gst-libav-${version}";
+  version = "1.14.2";
 
   meta = {
     homepage = https://gstreamer.freedesktop.org;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv";
+    sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca";
   };
 
   outputs = [ "out" "dev" ];

From d87c8f6cad4afddcf1c28ca25cdbc318f6762906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 30 Aug 2018 13:48:05 +0200
Subject: [PATCH 0092/3253] =?UTF-8?q?pythonPackages.gst-python:=201.14.0?=
 =?UTF-8?q?=20=E2=86=92=201.14.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/python-modules/gst-python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index bc855b5bc1cf..49f44bb16e44 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "gst-python";
-  version = "1.14.0";
+  version = "1.14.2";
   name = "${pname}-${version}";
 in buildPythonPackage rec {
   inherit pname version;
@@ -15,7 +15,7 @@ in buildPythonPackage rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0";
+    sha256 = "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w";
   };
 
   outputs = [ "out" "dev" ];

From 8aa09a2887a2a187b6b68e32c1a221e654f7c762 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 31 Aug 2018 01:04:44 +0200
Subject: [PATCH 0093/3253] cmake_2_8: fix build, restore search-path.patch

cmake 3.12 update in #44910 modified search-path.patch
and broke cmake 2.8. This restores the previous version
of the patch as search-path-2.8.patch
---
 .../tools/build-managers/cmake/2.8.nix        |  2 +-
 .../cmake/search-path-2.8.patch               | 92 +++++++++++++++++++
 2 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/search-path-2.8.patch

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index a57d20e2702a..c6f7bab66c9d 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in our libc.
-    [ ./search-path.patch ] ++
+    [ ./search-path-2.8.patch ] ++
     optional (hostPlatform != buildPlatform) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "https://public.kitware.com/Bug/file_download.php?"
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch b/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
new file mode 100644
index 000000000000..9fc949661686
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch
@@ -0,0 +1,92 @@
+diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake
+--- cmake-2.8.12.2/Modules/Platform/Linux.cmake	2014-01-16 21:15:08.000000000 +0400
++++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake	2016-04-13 22:00:32.928575740 +0300
+@@ -36,22 +36,11 @@
+   # checking the platform every time.  This option is advanced enough
+   # that only package maintainers should need to adjust it.  They are
+   # capable of providing a setting on the command line.
+-  if(EXISTS "/etc/debian_version")
+-    set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  else()
+-    set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
+-      "Install .so files without execute permission.")
+-  endif()
++  set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
++    "Install .so files without execute permission.")
+ endif()
+ 
+ # Match multiarch library directory names.
+ set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
+ 
+ include(Platform/UnixPaths)
+-
+-# Debian has lib64 paths only for compatibility so they should not be
+-# searched.
+-if(EXISTS "/etc/debian_version")
+-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+-endif()
+diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake
+--- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake	2014-01-16 21:15:08.000000000 +0400
++++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake	2016-04-14 00:09:10.106362636 +0300
+@@ -32,9 +32,6 @@
+ # List common installation prefixes.  These will be used for all
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+-  # Standard
+-  /usr/local /usr /
+-
+   # CMake install location
+   "${_CMAKE_INSTALL_DIR}"
+ 
+@@ -44,44 +41,26 @@
+ 
+ # List common include file locations not under the common prefixes.
+ list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+-  # Windows API on Cygwin
+-  /usr/include/w32api
+-
+-  # X11
+-  /usr/X11R6/include /usr/include/X11
+-
+-  # Other
+-  /usr/pkg/include
+-  /opt/csw/include /opt/include
+-  /usr/openwin/include
++  @libc_dev@/include
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+-  # Windows API on Cygwin
+-  /usr/lib/w32api
+-
+-  # X11
+-  /usr/X11R6/lib /usr/lib/X11
+-
+-  # Other
+-  /usr/pkg/lib
+-  /opt/csw/lib /opt/lib
+-  /usr/openwin/lib
++  @libc_lib@/lib
+   )
+ 
+ list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
+-  /usr/pkg/bin
++  @libc_bin@/bin
+   )
+ 
+ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+-  /lib /usr/lib /usr/lib32 /usr/lib64
++  @libc_lib@/lib
+   )
+ 
+ list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  @libc_dev@/include
+   )
+ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+-  /usr/include
++  @libc_dev@/include
+   )
+ 
+ # Enable use of lib64 search path variants by default.

From 07d33b002400649f9f3f42e574020ea719651e8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 30 Aug 2018 23:09:50 -0700
Subject: [PATCH 0094/3253] augeas: 1.10.1 -> 1.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
augeas
---
 pkgs/tools/system/augeas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index 93ce48644634..4ba876668223 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "augeas-${version}";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchurl {
     url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "0k9nssn7lk58cl5zv3c8kv2zx9cm2yks3sj7q4fd6qdjz9m2bnsj";
+    sha256 = "1c507qj6dfn2dnsl27w94zs9r45xrgm07y8bqba9ry2s0psfhg1r";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ readline libxml2 ];

From e2d8e06a9fcb11deec09e32c7d636cb300f7f82d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Fri, 31 Aug 2018 08:34:55 +0200
Subject: [PATCH 0095/3253] gnupg22: 2.2.9 -> 2.2.10 (#45809)

See https://lists.gnu.org/archive/html/info-gnu/2018-08/msg00010.html
for release information
---
 pkgs/tools/security/gnupg/22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index ded07cb5dad3..06a06f5721c9 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.9";
+  version = "2.2.10";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0r11mx8nkh7ysrnshs560amha5csx8zcaggb5kxcksx1zymyly32";
+    sha256 = "05f9804g72pffdxgvxjmjzkfcpjg1x221g9rwcr8fi51hrxd77br";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 4d4da6e598183d926759041a709433009067a369 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Fri, 31 Aug 2018 11:05:30 +0200
Subject: [PATCH 0096/3253] libgpgerror: 1.28 -> 1.32 (#45850)

---
 pkgs/development/libraries/libgpg-error/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index ccac20c90774..a68e45101aca 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -17,21 +17,13 @@
   };
 in stdenv.mkDerivation (rec {
   name = "libgpg-error-${version}";
-  version = "1.28";
+  version = "1.32";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry";
+    sha256 = "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3";
   };
 
-  patches = [
-    # Fix builds on ARM, AArch64
-    (fetchpatch {
-      url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch";
-      sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0";
-    })
-  ];
-
   postPatch = ''
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
   '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) ''

From 01f68e8f6bbd3cd3bbf30bb733a1135fe153459c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 31 Aug 2018 04:46:46 -0700
Subject: [PATCH 0097/3253] wayland: 1.15.0 -> 1.16.0 (#45795)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
wayland
---
 pkgs/development/libraries/wayland/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index fce0dae6c731..866b1232aef5 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb";
+    sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
   };
 
   configureFlags = [ "--with-scanner" "--disable-documentation" ];

From 51680c6560ec3f777bf5e4f921dedd3f5bd4b8a4 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 31 Aug 2018 20:57:29 +0900
Subject: [PATCH 0098/3253] podofo: patch for compatibility with cmake 3.12
 (#45857)

---
 pkgs/development/libraries/podofo/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 9a43470de3b7..bcc57f09af45 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5, pkgconfig, libidn, expat
+, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch
 , gcc5 # TODO(@Dridus) remove this at next hash break
 }:
 
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
 
+  patches = [
+    # https://sourceforge.net/p/podofo/tickets/24/
+    (fetchpatch {
+      url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
+      extraPrefix = "";
+      sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
+    })
+  ];
+
   # TODO(@Dridus) remove the ++ ghc5 at next hash break
   nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
 

From 98787edf30015f680c54a5f23208703327d737db Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 31 Aug 2018 23:10:37 +0900
Subject: [PATCH 0099/3253] curaengine: patch for compatibility with cmake 3.12
 (#45869)

---
 pkgs/applications/misc/curaengine/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index ba9a98c616b3..75d1936ba857 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libarcus, stb }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, libarcus, stb }:
 
 stdenv.mkDerivation rec {
   name = "curaengine-${version}";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "083jmhzmb60rmqw0fhbnlxyblzkmpn3k6zc75xq90x5g3h60wib4";
   };
 
+  patches = [
+    # Fixed upstream, but not yet released
+    (fetchpatch {
+      url = "https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch";
+      sha256 = "1hxbslzhkvdg8p33mvlbrpw62gwfqpsdbfca6yhdng9hifl86j3f";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libarcus stb ];
 

From 78d842e8fbbcfeab892a1726ef40cf8cd97cf863 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 31 Aug 2018 23:18:05 +0900
Subject: [PATCH 0100/3253] pbrt: 2017-01-12 -> 2018-08-15; cmake 3.12
 compatibility (#45863)

---
 pkgs/applications/graphics/pbrt/default.nix   | 11 +++++---
 .../graphics/pbrt/openexr-cmake-3.12.patch    | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch

diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 1c582df50dea..3cc7166b4e46 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -2,17 +2,22 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2017-01-12";
+  version = "2018-08-15";
   name = "pbrt-v3-${version}";
 
   src = fetchFromGitHub {
-    rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
+    rev = "86b5821308088deea70b207bc8c22219d0103d65";
     owner  = "mmp";
     repo   = "pbrt-v3";
-    sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
+    sha256 = "0f7ivsczba6zfk5f0bba1js6dcwf6w6jrkiby147qp1sx5k35cv8";
     fetchSubmodules = true;
   };
 
+  patches = [
+    # https://github.com/mmp/pbrt-v3/issues/196
+    ./openexr-cmake-3.12.patch
+  ];
+
   buildInputs = [ git flex bison cmake zlib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
new file mode 100644
index 000000000000..2993922a1ecf
--- /dev/null
+++ b/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
@@ -0,0 +1,26 @@
+diff -ur a/src/ext/openexr/CMakeLists.txt b/src/ext/openexr/CMakeLists.txt
+--- a/src/ext/openexr/CMakeLists.txt	1970-01-01 09:00:01.000000000 +0900
++++ b/src/ext/openexr/CMakeLists.txt	2018-08-31 21:44:56.490714484 +0900
+@@ -26,22 +26,4 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/config
+ )
+ 
+-add_custom_target(CopyIlmBaseLibs
+-  COMMAND ${CMAKE_COMMAND} -E copy_directory
+-  ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Half/$<CONFIGURATION>
+-  ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
+-  COMMAND ${CMAKE_COMMAND} -E copy_directory
+-  ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/IlmThread/$<CONFIGURATION>
+-  ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
+-  COMMAND ${CMAKE_COMMAND} -E copy_directory
+-  ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Iex/$<CONFIGURATION>
+-  ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
+-  COMMAND ${CMAKE_COMMAND} -E copy_directory
+-  ${CMAKE_CURRENT_BINARY_DIR}/IlmBase/Imath/$<CONFIGURATION>
+-  ${CMAKE_CURRENT_BINARY_DIR}/OpenEXR/IlmImf/$<CONFIGURATION>
+-)
+-add_dependencies(CopyIlmBaseLibs Iex Imath IlmThread Half)
+-
+ add_subdirectory(OpenEXR OpenEXR)
+-add_dependencies(b44ExpLogTable CopyIlmBaseLibs)
+-add_dependencies(dwaLookups CopyIlmBaseLibs)

From 12b5435198004eb3ebaccf34d7831ec7652845e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 31 Aug 2018 10:34:32 -0700
Subject: [PATCH 0101/3253] ethtool: 4.17 -> 4.18 (#45833)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
ethtool
---
 pkgs/tools/misc/ethtool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 0e0bc37ad537..105733e00333 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.17";
+  version = "4.18";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "11f5503mgcwjn1q4dvhjiqwnw3zmp2gbhirjvgfr71y72ys1wsy4";
+    sha256 = "0461nwqp1z9a89nmxf7kq0r4jfl9c7fg55c71lfmc5y0siaqb54h";
   };
 
   meta = with stdenv.lib; {

From 90464f60490b965b482b82cd6b747bb4577c2786 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sat, 1 Sep 2018 17:52:33 +0900
Subject: [PATCH 0102/3253] qgis: patch for compatibility with cmake 3.12
 (#45880)

---
 pkgs/applications/gis/qgis/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 8f06a659f60c..744aef20fda6 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
 , qjson, qca2, txt2tags, openssl, darwin, pkgconfig
 , withGrass ? true, grass, IOKit, ApplicationServices
@@ -37,6 +37,14 @@ stdenv.mkDerivation rec {
     sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a";
   };
 
+  patches = [
+    # https://github.com/qgis/QGIS/pull/7765
+    (fetchpatch {
+      url = "https://github.com/qgis/QGIS/commit/6b61ef361a77f057dc29eb07463007bd9012b253.patch";
+      sha256 = "1xibcahm18n7nxff1xvwwzjf505hvhiw5dk12is7aclv49h0rdf7";
+    })
+  ];
+
   # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system
   # installed frameworks
   # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the

From cbd926228184aaf5aad6321da7ddf8a4d5f430fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 1 Sep 2018 16:49:38 +0200
Subject: [PATCH 0103/3253] coreutils: disable a new test for now

As discussed in #42880, this test and functionality is new,
and apparently noone will look deeper for now.
---
 pkgs/tools/misc/coreutils/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index d06d761d9a5b..96cb9c3ec940 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
     sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
     sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
+    sed '2i print "Skipping env -S test";  exit 0;' -i ./tests/misc/env-S.pl
     substituteInPlace ./tests/install/install-C.sh \
       --replace 'mode3=2755' 'mode3=1755'
   '';

From 0fa04d646d65152d70e32f75d5f2a9518dce176e Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 1 Sep 2018 18:28:23 +0000
Subject: [PATCH 0104/3253] alternative for iproute module (#41801)

---
 nixos/doc/manual/release-notes/rl-1809.xml |  2 +-
 nixos/modules/config/iproute2.nix          | 35 ++++++++++++++--------
 pkgs/os-specific/linux/iproute/default.nix |  7 ++---
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 421208ec0f8c..f6504778939b 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -91,7 +91,7 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
     <para>
      When enabled the <literal>iproute2</literal> will copy the files expected
      by ip route (e.g., <filename>rt_tables</filename>) in
-     <filename>/run/iproute2</filename>. This allows to write aliases for
+     <filename>/etc/iproute2</filename>. This allows to write aliases for
      routing tables for instance.
     </para>
    </listitem>
diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix
index 881ad671a627..a1d9ebcec66b 100644
--- a/nixos/modules/config/iproute2.nix
+++ b/nixos/modules/config/iproute2.nix
@@ -4,20 +4,29 @@ with lib;
 
 let
   cfg = config.networking.iproute2;
-  confDir = "/run/iproute2";
 in
 {
-  options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files";
-
-  config = mkMerge [
-    ({ nixpkgs.config.iproute2.confDir = confDir; })
-
-    (mkIf cfg.enable {
-      system.activationScripts.iproute2 = ''
-        cp -R ${pkgs.iproute}/etc/iproute2 ${confDir}
-        chmod -R 664 ${confDir}
-        chmod +x ${confDir}
+  options.networking.iproute2 = {
+    enable = mkEnableOption "copy IP route configuration files";
+    rttablesExtraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Verbatim lines to add to /etc/iproute2/rt_tables
       '';
-    })
-  ];
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/bpf_pinning"; };
+    environment.etc."iproute2/ematch_map"  = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/ematch_map";  };
+    environment.etc."iproute2/group"       = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/group";       };
+    environment.etc."iproute2/nl_protos"   = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/nl_protos";   };
+    environment.etc."iproute2/rt_dsfield"  = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_dsfield";  };
+    environment.etc."iproute2/rt_protos"   = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_protos";   };
+    environment.etc."iproute2/rt_realms"   = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_realms";   };
+    environment.etc."iproute2/rt_scopes"   = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_scopes";   };
+    environment.etc."iproute2/rt_tables"   = { mode = "0644"; text = (fileContents "${pkgs.iproute}/etc/iproute2/rt_tables")
+                                                                   + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); };
+  };
 }
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index f1abf0fbe925..13135844aa7a 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,6 +1,4 @@
-{ fetchurl, stdenv, config, flex, bash, bison, db, iptables, pkgconfig
-, libelf
-}:
+{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -28,9 +26,8 @@ stdenv.mkDerivation rec {
     "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
   ];
 
-  # enable iproute2 module if you want this folder to be created
   buildFlags = [
-    "CONFDIR=${config.iproute2.confDir or "/run/iproute2"}"
+    "CONFDIR=/etc/iproute2"
   ];
 
   installFlags = [

From 542a86037d57e4657919fb5130c7bf819d91d2c3 Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Sun, 2 Sep 2018 06:42:34 +0200
Subject: [PATCH 0105/3253] poppler 0.61: patch against CVE-2018-13988 (#45916)

Out of bounds vulnerability in versions up to 0.62.

Generally, we use a newer poppler version but some pkgs still depend on
0.61. Patch named in https://nvd.nist.gov/vuln/detail/CVE-2018-13988.
---
 pkgs/development/libraries/poppler/0.61.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 4456cd7ff285..1e86b19ad5af 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
-, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
 , introspectionSupport ? false, gobjectIntrospection ? null
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-13988";
+      url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
+      sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
+    })
+  ];
+
   buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
 
   # TODO: reduce propagation to necessary libs

From f865d0feabfafbb30a9e0659e19a30cb0dc24481 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 2 Sep 2018 05:05:34 +0200
Subject: [PATCH 0106/3253] nixos: Split paras by \n\n in option descriptions

What annoyed me for a long time was the fact, that in order to break
into a new paragraph, you need to insert </para><para> in the
description attribute of an option.

Now we will automatically create <para/> elements for every block that
is separated by two consecutive newlines.

I first tried to do this within options-to-docbook.xsl, but it turns
out[1] that this isn't directly possible with XSLT 1.0, so I added
another XSLT file that postprocesses the option descriptions that are
now enclosed in <nixos:option-description/> by options-to-docbook.xsl.

The splitting itself is a bit more involved, because we can't simply
split on every \n\n because we'd also split text nodes of elements, for
example:

  <screen><![CDATA[

    one line

    another one

  ]]></screen>

This would create one <para/> element for "one line" and another for
"another line", which we obviously don't want because <screen/> is used
to display verbatim contents of what a user is seeing on the screen.

So what we do instead is splitting *only* the top-level text nodes
within the outermost <para/> and leave all elements as-is. If there are
more than one <para/> elements at the top-level, we simply don't process
it at all, because the description then already contains </para><para>.

https://www.mhonarc.org/archive/html/xsl-list/2012-09/msg00319.html

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @domenkozar
---
 nixos/doc/manual/default.nix                  |   4 +-
 nixos/doc/manual/options-to-docbook.xsl       |  11 +-
 .../postprocess-option-descriptions.xsl       | 115 ++++++++++++++++++
 3 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 nixos/doc/manual/postprocess-option-descriptions.xsl

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index be28c2c17afd..aaa6e0da545f 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -90,7 +90,9 @@ let
     fi
     ${buildPackages.libxslt.bin}/bin/xsltproc \
       --stringparam revision '${revision}' \
-      -o $out ${./options-to-docbook.xsl} $optionsXML
+      -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML
+    ${buildPackages.libxslt.bin}/bin/xsltproc \
+      -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml
   '';
 
   sources = lib.sourceFilesBySuffices ./. [".xml"];
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 2038b0dff63e..72ac89d4ff62 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -4,6 +4,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:str="http://exslt.org/strings"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
+                xmlns:nixos="tag:nixos.org"
                 xmlns="http://docbook.org/ns/docbook"
                 extension-element-prefixes="str"
                 >
@@ -30,10 +31,12 @@
 
             <listitem>
 
-              <para>
-                <xsl:value-of disable-output-escaping="yes"
-                              select="attr[@name = 'description']/string/@value" />
-              </para>
+              <nixos:option-description>
+                <para>
+                  <xsl:value-of disable-output-escaping="yes"
+                                select="attr[@name = 'description']/string/@value" />
+                </para>
+              </nixos:option-description>
 
               <xsl:if test="attr[@name = 'type']">
                 <para>
diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixos/doc/manual/postprocess-option-descriptions.xsl
new file mode 100644
index 000000000000..1201c7612c2e
--- /dev/null
+++ b/nixos/doc/manual/postprocess-option-descriptions.xsl
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                xmlns:exsl="http://exslt.org/common"
+                xmlns:db="http://docbook.org/ns/docbook"
+                xmlns:nixos="tag:nixos.org"
+                extension-element-prefixes="str exsl">
+  <xsl:output method='xml' encoding="UTF-8" />
+
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template name="break-up-description">
+    <xsl:param name="input" />
+    <xsl:param name="buffer" />
+
+    <!-- Every time we have two newlines following each other, we want to
+         break it into </para><para>. -->
+    <xsl:variable name="parbreak" select="'&#xa;&#xa;'" />
+
+    <!-- Similar to "(head:tail) = input" in Haskell. -->
+    <xsl:variable name="head" select="$input[1]" />
+    <xsl:variable name="tail" select="$input[position() &gt; 1]" />
+
+    <xsl:choose>
+      <xsl:when test="$head/self::text() and contains($head, $parbreak)">
+        <!-- If the haystack provided to str:split() directly starts or
+             ends with $parbreak, it doesn't generate a <token/> for that,
+             so we are doing this here. -->
+        <xsl:variable name="splitted-raw">
+          <xsl:if test="starts-with($head, $parbreak)"><token /></xsl:if>
+          <xsl:for-each select="str:split($head, $parbreak)">
+            <token><xsl:value-of select="node()" /></token>
+          </xsl:for-each>
+          <!-- Something like ends-with($head, $parbreak), but there is
+               no ends-with() in XSLT, so we need to use substring(). -->
+          <xsl:if test="
+            substring($head, string-length($head) -
+                             string-length($parbreak) + 1) = $parbreak
+          "><token /></xsl:if>
+        </xsl:variable>
+        <xsl:variable name="splitted"
+                      select="exsl:node-set($splitted-raw)/token" />
+        <!-- The buffer we had so far didn't contain any text nodes that
+             contain a $parbreak, so we can put the buffer along with the
+             first token of $splitted into a para element. -->
+        <para xmlns="http://docbook.org/ns/docbook">
+          <xsl:apply-templates select="exsl:node-set($buffer)" />
+          <xsl:apply-templates select="$splitted[1]/node()" />
+        </para>
+        <!-- We have already emitted the first splitted result, so the
+             last result is going to be set as the new $buffer later
+             because its contents may not be directly followed up by a
+             $parbreak. -->
+        <xsl:for-each select="$splitted[position() &gt; 1
+                              and position() &lt; last()]">
+          <para xmlns="http://docbook.org/ns/docbook">
+            <xsl:apply-templates select="node()" />
+          </para>
+        </xsl:for-each>
+        <xsl:call-template name="break-up-description">
+          <xsl:with-param name="input" select="$tail" />
+          <xsl:with-param name="buffer" select="$splitted[last()]/node()" />
+        </xsl:call-template>
+      </xsl:when>
+      <!-- Either non-text node or one without $parbreak, which we just
+           want to buffer and continue recursing. -->
+      <xsl:when test="$input">
+        <xsl:call-template name="break-up-description">
+          <xsl:with-param name="input" select="$tail" />
+          <!-- This essentially appends $head to $buffer. -->
+          <xsl:with-param name="buffer">
+            <xsl:if test="$buffer">
+              <xsl:for-each select="exsl:node-set($buffer)">
+                <xsl:apply-templates select="." />
+              </xsl:for-each>
+            </xsl:if>
+            <xsl:apply-templates select="$head" />
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:when>
+      <!-- No more $input, just put the remaining $buffer in a para. -->
+      <xsl:otherwise>
+        <para xmlns="http://docbook.org/ns/docbook">
+          <xsl:apply-templates select="exsl:node-set($buffer)" />
+        </para>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="nixos:option-description">
+    <xsl:choose>
+      <!--
+        Only process nodes that are comprised of a single <para/> element,
+        because if that's not the case the description already contains
+        </para><para> in between and we need no further processing.
+      -->
+      <xsl:when test="count(db:para) > 1">
+        <xsl:apply-templates select="node()" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="break-up-description">
+          <xsl:with-param name="input"
+                          select="exsl:node-set(db:para/node())" />
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>

From 7fbfba7c66b5d30056011205b35807058d3bbc2a Mon Sep 17 00:00:00 2001
From: Utku Demir <me@utdemir.com>
Date: Sun, 2 Sep 2018 19:22:07 +1200
Subject: [PATCH 0107/3253] bluejeans-gui: init at 1.6.39

---
 .../instant-messengers/bluejeans/default.nix  | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/bluejeans/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
new file mode 100644
index 000000000000..e98c68ff67c2
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
+, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
+, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
+}:
+
+stdenv.mkDerivation rec {
+  name = "bluejeans-${version}";
+  version = "1.36.9";
+
+  src =
+    fetchurl {
+      url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm";
+      sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
+    };
+
+  buildInputs = [ patchelf rpmextract ];
+
+  libPath =
+    stdenv.lib.makeLibraryPath
+       [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib
+         freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
+         libXi libXext libXfixes libXcomposite alsaLib
+       ];
+
+  buildCommand = ''
+    mkdir -p $out/bin/
+    cd $out
+    rpmextract $src
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      opt/bluejeans/bluejeans-bin
+    patchelf \
+      --set-rpath ${libPath} \
+      opt/bluejeans/bluejeans-bin
+    patchelf \
+      --replace-needed libudev.so.0 libudev.so.1 \
+      opt/bluejeans/bluejeans-bin
+    ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans
+    substituteInPlace $out/bin/bluejeans \
+      --replace '#!/bin/bash' '#!${bash}/bin/bash'
+    chmod +x $out/bin/bluejeans
+  '';
+
+  meta = {
+    description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day.";
+    license = stdenv.lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1143fe8de01b..bba65db99426 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15586,6 +15586,12 @@ with pkgs;
 
   bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
 
+  bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans {
+    gconf = pkgs.gnome2.GConf;
+    inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage
+                        libXi libXext libXfixes libXcomposite;
+  };
+
   bombono = callPackage ../applications/video/bombono {};
 
   bomi = libsForQt5.callPackage ../applications/video/bomi {

From 96dc7a1c54d6762e6413f18316dba051e788db7b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:11:20 +0200
Subject: [PATCH 0108/3253] ilixi: update homepage

---
 pkgs/development/libraries/ilixi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
index 99f6df9c5f06..bb6e23937c05 100644
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Lightweight C++ GUI toolkit for embedded Linux systems";
-    homepage = http://ilixi.org/;
+    homepage = https://github.com/ilixi/ilixi;
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

From e8c6b0f763cfd769a30ea8be584ff170a47b7721 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:13:36 +0200
Subject: [PATCH 0109/3253] iso-codes: update homepage + add license

---
 pkgs/development/libraries/iso-codes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index d78c59e9c25a..80154f504d41 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext python3 ];
 
   meta = with stdenv.lib; {
-    homepage = http://pkg-isocodes.alioth.debian.org/;
+    homepage = https://salsa.debian.org/iso-codes-team/iso-codes;
     description = "Various ISO codes packaged as XML files";
-    maintainers = [ ];
+    license = licenses.lgpl21;
     platforms = platforms.all;
   };
 }

From 964b1224318f252c3f7bbc621d5bd4a4b461d4ca Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:18:15 +0200
Subject: [PATCH 0110/3253] liblas: update homepage

---
 pkgs/development/libraries/libLAS/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index de796307de1a..7bd2a1ec5738 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
-    homepage = https://www.liblas.org;
+    homepage = https://liblas.org;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.michelk ];

From 564f722495531c0944d37ea990c6ead54cfea3b4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:20:55 +0200
Subject: [PATCH 0111/3253] libmowgli: add license + update homepage

---
 pkgs/development/libraries/libmowgli/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index b23701837fa0..512add5616a0 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -3,15 +3,16 @@
 stdenv.mkDerivation rec {
   name = "libmowgli-${version}";
   version = "2.1.3";
-  
+
   src = fetchurl {
     url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz";
     sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp";
   };
-  
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "A development framework for C providing high performance and highly flexible algorithms";
-    homepage = http://www.atheme.org/projects/mowgli.shtml;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = https://github.com/atheme/libmowgli-2;
+    license = licenses.isc;
+    platforms = platforms.unix;
   };
 }

From b9c53e32ca6198ef7e192296dbdb418d63e84c15 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:27:28 +0200
Subject: [PATCH 0112/3253] libtar: update homepage

---
 pkgs/development/libraries/libtar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index 8123bf7ba84e..481e7ad83cc3 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C library for manipulating POSIX tar files";
-    homepage = http://www.feep.net/libtar/;
+    homepage = http://repo.or.cz/libtar;
     license = licenses.bsd3;
     platforms = with platforms; linux ++ darwin;
     maintainers = [ maintainers.bjornfor ];

From c7f081a9219c28bc194b03d98bf192c32500bffd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:28:24 +0200
Subject: [PATCH 0113/3253] libwebsockets: update homepage

---
 pkgs/development/libraries/libwebsockets/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 1147c9606ad4..9cd0aabcf097 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
       use minimal CPU and memory resources, and provide fast
       throughput in both directions.
     '';
-    homepage = https://libwebsockets.org/trac/libwebsockets;
+    homepage = https://libwebsockets.org;
     license = stdenv.lib.licenses.lgpl21;
-    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From e7f853acf36c983fb5821d18de5242ee31066d18 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:33:12 +0200
Subject: [PATCH 0114/3253] openslp: update homepage

---
 pkgs/development/libraries/openslp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 3e178d92013e..537b67c5a3c3 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://openslp.org/;
+    homepage = http://www.openslp.org/;
     description = "An open-source implementation of the IETF Service Location Protocol";
     maintainers = with maintainers; [ ttuegel ];
     license = licenses.bsd3;

From b6c721f6e958b05def71295134e4080cd182b50d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:44:46 +0200
Subject: [PATCH 0115/3253] pokersource: update homepage

---
 pkgs/development/libraries/poker-eval/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix
index f6e7ed56adc4..51cc72ffd402 100644
--- a/pkgs/development/libraries/poker-eval/default.nix
+++ b/pkgs/development/libraries/poker-eval/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://pokersource.org/poker-eval/;
+    homepage = http://pokersource.sourceforge.net;
     description = "Poker hand evaluator";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [stdenv.lib.maintainers.mtreskin];

From 58d03b427fce172208759e15043517dd28c17467 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:49:41 +0200
Subject: [PATCH 0116/3253] soqt,soxt: update homepage

---
 pkgs/development/libraries/soqt/default.nix | 2 +-
 pkgs/development/libraries/soxt/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index fdad4e21b0b6..9769596621b1 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {
-    homepage = http://www.coin3d.org/;
+    homepage = https://bitbucket.org/Coin3D/coin/wiki/Home;
     license = stdenv.lib.licenses.gpl2Plus;
     description = "Glue between Coin high-level 3D visualization library and Qt";
 
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index 13f037960b08..c219d5bfb362 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.coin3d.org/;
+    homepage = https://bitbucket.org/Coin3D/coin/wiki/Home;
     license = licenses.bsd3;
     description = "A GUI binding for using Open Inventor with Xt/Motif";
     maintainers = with maintainers; [ tmplt ];

From 4a901e44db2393a34b76b40aeef6a2315086d6dc Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:53:01 +0200
Subject: [PATCH 0117/3253] tcllib: update homepage

---
 pkgs/development/libraries/tcllib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 6ffbe5dc60c5..24b1d477b8a0 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tcl ];
 
   meta = {
-    homepage = http://tcl.activestate.com/software/tcllib/;
+    homepage = https://sourceforge.net/projects/tcllib/;
     description = "Tcl-only library of standard routines for Tcl";
     license = stdenv.lib.licenses.tcltk;
     platforms = stdenv.lib.platforms.unix;

From 93a09d47065238be8f0a62b2768a455f8c09f7c2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:54:39 +0200
Subject: [PATCH 0118/3253] vrpn: update homepage

---
 pkgs/development/libraries/vrpn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix
index ddeecce21c61..0ae5ba147cb7 100644
--- a/pkgs/development/libraries/vrpn/default.nix
+++ b/pkgs/development/libraries/vrpn/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       set of physical devices (tracker, etc.) used in a virtual-reality
       (VR) system.
     '';
-    homepage    = http://www.vrpn.org/;
+    homepage    = https://github.com/vrpn/vrpn;
     license     = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License
     platforms   = platforms.linux;
     maintainers = with maintainers; [ ludo ];

From d9649ea38b87572843da3c1cb57db677e6812a49 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 20:55:47 +0200
Subject: [PATCH 0119/3253] splint: update homepage

---
 pkgs/development/tools/analysis/splint/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix
index 2d6129dd3764..57a83e54d705 100644
--- a/pkgs/development/tools/analysis/splint/default.nix
+++ b/pkgs/development/tools/analysis/splint/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://splint.org/;
+    homepage = http://www.splint.org/;
     description = "Annotation-assisted lightweight static analyzer for C";
 
     longDescription = ''

From c6878ad519556924f6f90756f03cab11404aa5a5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 21:00:38 +0200
Subject: [PATCH 0120/3253] dfu-util: update homepage

---
 pkgs/development/tools/misc/dfu-util/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix
index d0a68caace68..2657e570106e 100644
--- a/pkgs/development/tools/misc/dfu-util/default.nix
+++ b/pkgs/development/tools/misc/dfu-util/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       phones. With dfu-util you are able to download firmware to your device or
       upload firmware from it.
     '';
-    homepage = http://dfu-util.gnumonks.org/;
+    homepage = http://dfu-util.sourceforge.net;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.fpletz ];

From b3e2cd96c15ff1ab3b8473195c979ceb2fb1caca Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 2 Sep 2018 16:45:00 -0400
Subject: [PATCH 0121/3253] 18.09 -> 19.03

Name coming in the future.
---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 770bde1f44b3..360de6347ae2 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.09
+19.03
\ No newline at end of file

From e144899b7492d8fdc48c685516347ba7788245a5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 2 Sep 2018 17:17:59 -0400
Subject: [PATCH 0122/3253] =?UTF-8?q?release-notes:=20Adds=2019.03=20?=
 =?UTF-8?q?=E2=80=94=20Koi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manual/release-notes/release-notes.xml    |  1 +
 nixos/doc/manual/release-notes/rl-1903.xml    | 58 +++++++++++++++++++
 nixos/modules/misc/version.nix                |  2 +-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 nixos/doc/manual/release-notes/rl-1903.xml

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 94f176186b6e..a222bfa29d5a 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -8,6 +8,7 @@
   This section lists the release notes for each stable version of NixOS and
   current unstable revision.
  </para>
+ <xi:include href="rl-1903.xml" />
  <xi:include href="rl-1809.xml" />
  <xi:include href="rl-1803.xml" />
  <xi:include href="rl-1709.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
new file mode 100644
index 000000000000..9ae34dd58ab0
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -0,0 +1,58 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-19.03">
+ <title>Release 19.03 (“Koi”, 2019/03/??)</title>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-19.03-highlights">
+  <title>Highlights</title>
+
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-19.03-new-services">
+  <title>New Services</title>
+
+  <para>
+   The following new services were added since the last release:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-19.03-notable-changes">
+  <title>Other Notable Changes</title>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+</section>
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 63717e0c6a81..c593adcdae6e 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -84,7 +84,7 @@ in
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: the first letter is bumped on every release.  It's an animal.
-      codeName = "Jellyfish";
+      codeName = "Koi";
     };
 
     # Generate /etc/os-release.  See

From f828bb313b49251602e6ddb0132b5792bdcc5405 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 18:50:40 -0400
Subject: [PATCH 0123/3253] valadoc: fix build

---
 pkgs/development/tools/valadoc/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 8f9087ee3b3a..6515e220f3d5 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ];
   buildInputs = [ graphviz glib gnome3.libgee expat ];
 
-  preConfigure = "./autogen.sh";
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "valadoc";
@@ -20,10 +18,10 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "valadoc is a documentation generator for generating API documentation from Vala source code";
-    homepage = https://valadoc.org;
-    license = stdenv.lib.licenses.gpl2;
+    description = "A documentation generator for generating API documentation from Vala source code";
+    homepage    = https://valadoc.org;
+    license     = licenses.gpl2;
     maintainers = with maintainers; [ sternenseemann ];
-    platforms = with platforms; linux;
+    platforms   = platforms.linux;
   };
 }

From 029b9924f1b2b024e4e18750c3aec1588b7d0fbb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 2 Sep 2018 18:56:38 -0400
Subject: [PATCH 0124/3253] linux: 4.19-rc1 -> 4.19-rc2

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 44f267bf7151..1f45348824a0 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc1";
-  modDirVersion = "4.19.0-rc1";
+  version = "4.19-rc2";
+  modDirVersion = "4.19.0-rc2";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "14c9xg9sv0jrdri36das97vdbybi7vmcy59mj9wmgaz81cdk3wg5";
+    sha256 = "0a5ip4dxv5y1mdi03m5rnz2l9k6kv30gciss6fag41lwsfwwln3z";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 451e04fb4d1d258db8773e347c7cdaaaba1a9aad Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 18:59:23 -0400
Subject: [PATCH 0125/3253] SkypeExport: fix build

---
 .../networking/instant-messengers/SkypeExport/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
index 9ec9a3451bef..163f0ba3f497 100644
--- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
+++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake, boost166 }:
 
 stdenv.mkDerivation rec {
   name = "SkypeExport-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost ];
+  buildInputs = [ boost166 ];
 
   preConfigure = "cd src/SkypeExport/_gccbuild/linux";
   installPhase = "install -Dt $out/bin SkypeExport";

From 4652f2f87ebfa82b3c9fde3dd0cd7a84fe90ff58 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 3 Sep 2018 01:08:29 +0200
Subject: [PATCH 0126/3253] nixos: Document option description changes

This adds a release notes entry to make users (and especially
developers) aware so they no longer need to use </para><para> in option
descriptions as this is now done automatically on every two consecutive
newlines.

More details can be found in the commit message of f865d0feabfafbb30a9e.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/doc/manual/release-notes/rl-1809.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 421208ec0f8c..30e98a23bdfa 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -528,6 +528,14 @@ inherit (pkgs.nixos {
       to <literal>true</literal>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      NixOS option descriptions are now automatically broken up into individual
+      paragraphs if the text contains two consecutive newlines, so it's no
+      longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start
+      a new paragraph.
+    </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>

From 6ed0823e1507c0674c8eb4cabb73ba30874a45e1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:31:04 -0400
Subject: [PATCH 0127/3253] xfce4-mixer: fix build

---
 pkgs/desktops/xfce4-13/xfce4-mixer/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
index 266b05199ddb..a4bc0a3eaddb 100644
--- a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
@@ -1,5 +1,10 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ mkXfceDerivation, automakeAddFlags, dbus-glib, gtk2, libxfce4ui, libxfce4util, xfce4-panel, xfconf, gst-plugins-base, libunique }:
 
+let
+  gst_plugins_minimal = gst-plugins-base.override {
+    minimalDeps = true;
+  };
+in
 mkXfceDerivation rec {
   category = "apps";
   pname = "xfce4-mixer";
@@ -16,7 +21,9 @@ mkXfceDerivation rec {
 
   buildInputs = [
     dbus-glib
+    gst_plugins_minimal
     gtk2
+    libunique
     libxfce4ui
     libxfce4util
     xfce4-panel

From 347638ccfee74c06cae53983ea741d39d1efc032 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Sep 2018 01:23:35 +0200
Subject: [PATCH 0128/3253] nix: 2.0.4 -> 2.1

---
 nixos/modules/installer/tools/nix-fallback-paths.nix |  8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 7c5414257b46..6611a6ca0790 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
-  i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
-  aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
-  x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
+  x86_64-linux = "/nix/store/r9i30v8nasafg2851wflg71ln49fw03y-nix-2.1";
+  i686-linux = "/nix/store/dsg3pr7wwrk51f7la9wgby173j18llqh-nix-2.1";
+  aarch64-linux = "/nix/store/m3qgnch4xin21pmd1azas8kkcp9rhkr6-nix-2.1";
+  x86_64-darwin = "/nix/store/n7fvy0k555gwkkdszdkhi3h0aahca8h3-nix-2.1";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index bc07dd457f38..a447fbf22827 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -29,7 +29,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optionals is20 [ brotli ] # Since 1.12
+      ++ lib.optionals is20 [ brotli boost ]
       ++ lib.optional withLibseccomp libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           ((aws-sdk-cpp.override {
@@ -40,8 +40,7 @@ let
               url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch;
               sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1";
             })];
-          }))
-      ++ lib.optional fromGit boost;
+          }));
 
     propagatedBuildInputs = [ boehmgc ];
 
@@ -51,7 +50,7 @@ let
     preConfigure =
       # Copy libboost_context so we don't get all of Boost in our closure.
       # https://github.com/NixOS/nixpkgs/issues/45462
-      lib.optionalString fromGit
+      lib.optionalString is20
       ''
         mkdir -p $out/lib
         cp ${boost}/lib/libboost_context* $out/lib
@@ -148,10 +147,10 @@ in rec {
   }) // { perl-bindings = nix1; };
 
   nixStable = (common rec {
-    name = "nix-2.0.4";
+    name = "nix-2.1";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b";
+      sha256 = "0ed68e0c50f13810768fcf510abb2c56d735172c39a325aac7453ccf7ae152fc";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 

From 8e15622cf36ba78f69b539e6a991079f2d46a965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:15:59 +0100
Subject: [PATCH 0129/3253] python.pkgs.inflect: 0.2.5 -> 1.0.0

---
 .../python-modules/inflect/default.nix            | 15 +++++++++++++++
 pkgs/top-level/python-packages.nix                | 10 +---------
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/inflect/default.nix

diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix
new file mode 100644
index 000000000000..94b0fc801fa9
--- /dev/null
+++ b/pkgs/development/python-modules/inflect/default.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six }:
+
+buildPythonPackage rec {
+  pname = "inflect";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ll34l5b2wsbcw9i2hvkhmq6szxrp7fzc2hjmpz1cvny81bhg3kx";
+  };
+
+  buildInputs = [ setuptools_scm ];
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2b45e979a3a..bcda67d2beee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17067,15 +17067,7 @@ EOF
     propagatedBuildInputs = with self; [ inflect more-itertools six ];
   };
 
-  inflect = buildPythonPackage rec {
-    name = "inflect-${version}";
-    version = "0.2.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/inflect/${name}.tar.gz";
-      sha256 = "065866j9msrivbr74yrag53ch0lav7xz18qvjkiblkhinbfch510";
-    };
-  };
+  inflect = callPackage ../development/python-modules/inflect { };
 
   more-itertools = callPackage ../development/python-modules/more-itertools { };
 

From 97b73d6a58600f3c647592eadbd110d3a968fac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:17:06 +0100
Subject: [PATCH 0130/3253] python.pkgs.jaraco.stream: 1.1.1 -> 1.2

---
 .../python-modules/jaraco_stream/default.nix      | 13 +++++++++++++
 pkgs/top-level/python-packages.nix                | 15 +--------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_stream/default.nix

diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix
new file mode 100644
index 000000000000..5788a52dfff7
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_stream/default.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm, six }:
+
+buildPythonPackage rec {
+  pname = "jaraco.stream";
+  version = "1.2";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06qsjyab56vi0ikr819ghb7f8ymf09n92vla7gcn8j12113m2mib";
+  };
+  doCheck = false;
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcda67d2beee..0ac94bc76f39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17087,21 +17087,8 @@ EOF
     buildInputs = with self; [ setuptools_scm ];
   };
 
-  jaraco_stream = buildPythonPackage rec {
-    name = "jaraco.stream-${version}";
-    version = "1.1.1";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.stream/${name}.tar.gz";
-      sha256 = "0iwg5ljc2z8wwyl2wv7lldwviwd0q4rsccascyqvqqs0l2rcn4gi";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ six ];
-  };
+  jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
 
   tempora= callPackage ../development/python-modules/tempora { };
 

From b3e9520a0ce0e36c7ce368acaa11d061117e9185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:17:36 +0100
Subject: [PATCH 0131/3253] python.pkgs.jaraco.classes: 1.4 -> 1.5

---
 .../python-modules/jaraco_classes/default.nix     | 13 +++++++++++++
 pkgs/top-level/python-packages.nix                | 15 +--------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_classes/default.nix

diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix
new file mode 100644
index 000000000000..35c70c3c0330
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_classes/default.nix
@@ -0,0 +1,13 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm, six }:
+
+buildPythonPackage rec {
+  pname = "jaraco.classes";
+  version = "1.5";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "002zsifikv6qwigkjlij7jhyvbwv6793m8h9ckbkx2jizmgc80fi";
+  };
+  doCheck = false;
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ac94bc76f39..2b814d02bbbf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17073,20 +17073,7 @@ EOF
 
   jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
 
-  jaraco_classes = buildPythonPackage rec {
-    name = "jaraco.classes-${version}";
-    version = "1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.classes/${name}.tar.gz";
-      sha256 = "1yn1wa6m5rdhk4grmnycx3i5pzzdlwfx83h944c9g5rqggmg612h";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-  };
-
+  jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
 
   jaraco_stream = callPackage ../development/python-modules/jaraco_stream { };
 

From 6b1b6c84bf188f016b29071c57b744187c499c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:18:24 +0100
Subject: [PATCH 0132/3253] python.pkgs.jaraco.itertools: 1.7.1 -> 2.4

---
 .../python-modules/jaraco_itertools/default.nix  | 14 ++++++++++++++
 pkgs/top-level/python-packages.nix               | 16 +---------------
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_itertools/default.nix

diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix
new file mode 100644
index 000000000000..c7a66c890407
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_itertools/default.nix
@@ -0,0 +1,14 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm
+, inflect, more-itertools, six }:
+
+buildPythonPackage rec {
+  pname = "jaraco.itertools";
+  version = "2.4";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18cwjbnnnbwld70s3r24sys3blcss84d9ha9hhxsg2d35f9vywd5";
+  };
+  doCheck = false;
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ inflect more-itertools six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b814d02bbbf..bc95c5952af5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17051,21 +17051,7 @@ EOF
     '';
   };
 
-  jaraco_itertools = buildPythonPackage rec {
-    name = "jaraco.itertools-${version}";
-    version = "1.7.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.itertools/${name}.tar.gz";
-      sha256 = "0yvxp5nwhy4wc4naq5v152vbnxqcn5k031g089chq2lk5kr7np5z";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ inflect more-itertools six ];
-  };
+  jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };
 
   inflect = callPackage ../development/python-modules/inflect { };
 

From c4bf056c085518abf4ca9740480eb59cdcb6aa21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:18:59 +0100
Subject: [PATCH 0133/3253] python.pkgs.jaraco.collections: 1.3.2 -> 1.5.3

---
 .../jaraco_collections/default.nix            | 20 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------------
 2 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_collections/default.nix

diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix
new file mode 100644
index 000000000000..0f2e53715cc3
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_collections/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm
+, six, jaraco_classes }:
+
+buildPythonPackage rec {
+  pname = "jaraco.collections";
+  version = "1.5.3";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05cmcq5k39bx73kjr00xfm2yr0npyrv89cxdh41ni6x8pkki1jyr";
+  };
+
+  doCheck = false;
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ six jaraco_classes ];
+
+  # break dependency cycle
+  patchPhase = ''
+    sed -i "/'jaraco.text',/d" setup.py
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc95c5952af5..4bfcf8871629 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17030,26 +17030,7 @@ EOF
     propagatedBuildInputs = with self; [ jaraco_functools jaraco_collections ];
   };
 
-  jaraco_collections = buildPythonPackage rec {
-    name = "jaraco.collections-${version}";
-    version = "1.3.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.collections/${name}.tar.gz";
-      sha256 = "0mvyn9d4bs5zw9z84wwsbgff6s28vg6h4i8qhyb667fqi7xgr1w5";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ six jaraco_classes ];
-
-    # break dependency cycle
-    patchPhase = ''
-      sed -i "/'jaraco.text',/d" setup.py
-    '';
-  };
+  jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
 
   jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };
 

From 7cd2bf48f78bd8465c884f39e6a87c3cb4bfffae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:20:00 +0100
Subject: [PATCH 0134/3253] python.pkgs.jaraco_text: 1.7 -> 1.10.1

---
 .../python-modules/jaraco_text/default.nix       | 14 ++++++++++++++
 pkgs/top-level/python-packages.nix               | 16 +---------------
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_text/default.nix

diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix
new file mode 100644
index 000000000000..01309e0c4d92
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -0,0 +1,14 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm
+, jaraco_functools, jaraco_collections }:
+
+buildPythonPackage rec {
+  pname = "jaraco.text";
+  version = "1.10.1";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh";
+  };
+  doCheck = false;
+  buildInputs =[ setuptools_scm ];
+  propagatedBuildInputs = [ jaraco_functools jaraco_collections ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bfcf8871629..93bf55127ac4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17014,21 +17014,7 @@ EOF
     propagatedBuildInputs = with self; [ tempora six ];
   };
 
-  jaraco_text = buildPythonPackage rec {
-    name = "jaraco.text-${version}";
-    version = "1.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.text/${name}.tar.gz";
-      sha256 = "07ccc0zc28sb1kyfyviw3n8f581qynrshqvqg1xsp4gkf1m2ibhh";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ jaraco_functools jaraco_collections ];
-  };
+  jaraco_text = callPackage ../development/python-modules/jaraco_text { };
 
   jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
 

From 9bc1b13983ae8da91295c00714a9dd40203e45bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:20:50 +0100
Subject: [PATCH 0135/3253] python.pkgs.jaraco_logging: 1.5 -> 1.5.2

---
 .../python-modules/jaraco_logging/default.nix    | 14 ++++++++++++++
 pkgs/top-level/python-packages.nix               | 16 +---------------
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/jaraco_logging/default.nix

diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix
new file mode 100644
index 000000000000..2aeb0dc3fa40
--- /dev/null
+++ b/pkgs/development/python-modules/jaraco_logging/default.nix
@@ -0,0 +1,14 @@
+{ buildPythonPackage, fetchPypi, setuptools_scm
+, tempora, six }:
+
+buildPythonPackage rec {
+  pname = "jaraco.logging";
+  version = "1.5.2";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "199pgwx9ziab3gxg6p0c24z8dp3bjpsvvshnmlph9zjsssq0xc93";
+  };
+  doCheck = false;
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ tempora six ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93bf55127ac4..ba9dcb0868ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16998,21 +16998,7 @@ EOF
     ];
   };
 
-  jaraco_logging = buildPythonPackage rec {
-    name = "jaraco.logging-${version}";
-    version = "1.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jaraco.logging/${name}.tar.gz";
-      sha256 = "1lvw9zphiymiiar47kd0x0dbc9x2jks8w1kirg3ff8nd80k95j05";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [ tempora six ];
-  };
+  jaraco_logging = callPackage ../development/python-modules/jaraco_logging { };
 
   jaraco_text = callPackage ../development/python-modules/jaraco_text { };
 

From 35c9408ca4a78792227a3cbc47857fa3d99ec8b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 3 Sep 2018 01:21:37 +0100
Subject: [PATCH 0136/3253] python.pkgs.irc: 14.2.2 -> 16.4

---
 .../python-modules/irc/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +-------------
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/irc/default.nix

diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix
new file mode 100644
index 000000000000..2df571dde8e6
--- /dev/null
+++ b/pkgs/development/python-modules/irc/default.nix
@@ -0,0 +1,25 @@
+{ buildPythonPackage, fetchPypi
+, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
+, setuptools_scm }:
+
+buildPythonPackage rec {
+  pname = "irc";
+  version = "16.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0l2fh2aqs54w4xihckgyz575qkd6mgzbp3zll4g0z9j6h88ghqf1";
+  };
+
+  doCheck = false;
+
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [
+    six
+    jaraco_logging
+    jaraco_text
+    jaraco_stream
+    pytz
+    jaraco_itertools
+  ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba9dcb0868ed..354d2f341904 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16979,24 +16979,7 @@ EOF
 
   python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { };
 
-  irc = buildPythonPackage rec {
-    name = "irc-${version}";
-    version = "14.2.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/irc/${name}.tar.gz";
-      sha256 = "0a6qjl4fjj98wxc8gaf5rxg94v7a0ydjdiw6pcka5fy814xl2i28";
-    };
-
-    doCheck = false;
-
-    buildInputs = with self; [ setuptools_scm ];
-
-    propagatedBuildInputs = with self; [
-      six jaraco_logging jaraco_text jaraco_stream jaraco_stream pytz
-      jaraco_itertools
-    ];
-  };
+  irc = callPackage ../development/python-modules/irc { };
 
   jaraco_logging = callPackage ../development/python-modules/jaraco_logging { };
 

From e3ee9c098a64deb30e8d9edb180e613b93046f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 08:31:01 +0200
Subject: [PATCH 0137/3253] Revert "Merge #42880: coreutils: 8.29 -> 8.30"

This reverts commit edc13bae5462f7d088897bf6a268cc12c32f1aaf, reversing
changes made to 90464f60490b965b482b82cd6b747bb4577c2786.
Bootstrap tools generation is broken, and I don't know why yet.
---
 pkgs/tools/misc/coreutils/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 582f8d8f05f9..3d1c7145698c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "coreutils-8.30";
+  name = "coreutils-8.29";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
+    sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
   };
 
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
     sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
     sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
     sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
-    sed '2i print "Skipping env -S test";  exit 0;' -i ./tests/misc/env-S.pl
     substituteInPlace ./tests/install/install-C.sh \
       --replace 'mode3=2755' 'mode3=1755'
   '';

From 185f0015f230a26bbd1fdea156e5ea6fbb2f288a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 30 Aug 2018 17:10:39 -0500
Subject: [PATCH 0138/3253] opendht: rework module to use autoreconfHook, and
 use multiple outputs

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/libraries/opendht/default.nix | 49 ++++++++-----------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index bd7d252e1a08..49d70bc211a6 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -1,14 +1,6 @@
-{ stdenv
-, fetchFromGitHub
-, autoconf
-, automake
-, libtool
-, pkgconfig
-, nettle
-, gnutls
-, msgpack
-, readline
-, libargon2
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, nettle, gnutls, msgpack, readline, libargon2
 }:
 
 stdenv.mkDerivation rec {
@@ -22,27 +14,26 @@ stdenv.mkDerivation rec {
     sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp";
   };
 
-  buildInputs = [
-    autoconf
-    automake
-    libtool
-    pkgconfig
-    nettle
-    gnutls
-    msgpack
-    readline
-    libargon2
-  ];
+  nativeBuildInputs =
+    [ autoreconfHook
+      pkgconfig
+    ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  buildInputs =
+    [ nettle
+      gnutls
+      msgpack
+      readline
+      libargon2
+    ];
+
+  outputs = [ "out" "lib" "dev" "man" ];
 
   meta = with stdenv.lib; {
     description = "A C++11 Kademlia distributed hash table implementation";
-    homepage = https://github.com/savoirfairelinux/opendht;
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ taeer olynch ];
-    platforms = platforms.linux;
+    homepage    = https://github.com/savoirfairelinux/opendht;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ taeer olynch thoughtpolice ];
+    platforms   = platforms.linux;
   };
 }

From 252c0d4c82b70ede96cb669485f78aaa99400921 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 3 Sep 2018 12:38:50 +0200
Subject: [PATCH 0139/3253] opencv: 3.4.2 -> 3.4.3

---
 pkgs/development/libraries/opencv/3.x.nix       | 11 +++--------
 pkgs/development/libraries/opencv/fix-dnn.patch | 13 -------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencv/fix-dnn.patch

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 81d106a2a40c..dd87fa932604 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -35,20 +35,20 @@
 }:
 
 let
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv";
     rev    = version;
-    sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
+    sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
   };
 
   contribSrc = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_contrib";
     rev    = version;
-    sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
+    sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
   };
 
   # Contrib must be built in order to enable Tesseract support:
@@ -145,11 +145,6 @@ stdenv.mkDerivation rec {
     cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
   '';
 
-  # TODO: remove the following patch once commit
-  # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
-  # is released.
-  patches = [ ./fix-dnn.patch ];
-
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
   # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
deleted file mode 100644
index 62234a43e461..000000000000
--- a/pkgs/development/libraries/opencv/fix-dnn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index 730c752ce..abbce0453 100644
---- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
-     std::ifstream fs(filename, std::ifstream::in);
-     CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
-     IstreamInputStream input(&fs);
--    return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
-+    return google::protobuf::TextFormat::Parser().Parse(&input, proto);
- }
- 
- bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {

From 7de2b6240b005203e2015f110598ac4805cf24f8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 3 Sep 2018 14:13:00 +0200
Subject: [PATCH 0140/3253] purple-matrix: 2016-07-11 -> 2018-08-02

This also fixes the build.
---
 .../pidgin-plugins/purple-matrix/default.nix  | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index a6d893fd95a4..d4a26a266c30 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -1,30 +1,32 @@
-{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser } :
+{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
 
 let
-  version = "2016-07-11";
+  version = "2018-08-03";
 in
 stdenv.mkDerivation rec {
   name = "purple-matrix-unstable-${version}";
 
   src = fetchgit {
     url = "https://github.com/matrix-org/purple-matrix";
-    rev = "f9d36198a57de1cd1740a3ae11c2ad59b03b724a";
-    sha256 = "1mmyvc70gslniphmcpk8sfl6ylik6dnprqghx4n47gsj1sb1cy00";
+    rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
+    sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pidgin json-glib glib http-parser ];
+  buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
 
-  installPhase = ''
-    install -Dm755 -t $out/lib/pidgin/ libmatrix.so
-    for size in 16 22 48; do
-      install -TDm644 matrix-"$size"px.png $out/pixmaps/pidgin/protocols/$size/matrix.png
-    done
-  '';
+  hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
 
-  meta = {
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PLUGIN_DIR_PURPLE=/lib/pidgin/"
+    "DATA_ROOT_DIR_PURPLE=/share"
+  ];
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/matrix-org/purple-matrix;
     description = "Matrix support for Pidgin / libpurple";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ symphorien ];
   };
 }

From 608730af4404f40586ba1e764fbc8576451ec513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 14:10:54 +0200
Subject: [PATCH 0141/3253] lib/trivial.nix: fix missing parens

Broken in 62dca7c9a; the tricky thing is that it depends on nix version.
Explanation: https://github.com/NixOS/nix/issues/629
---
 lib/trivial.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index b75e81eb7352..e702b8cdcc9f 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -36,18 +36,18 @@ rec {
 
   /* bitwise “and” */
   bitAnd = builtins.bitAnd
-    or import ./zip-int-bits.nix
-      (a: b: if a==1 && b==1 then 1 else 0);
+    or (import ./zip-int-bits.nix
+        (a: b: if a==1 && b==1 then 1 else 0));
 
   /* bitwise “or” */
   bitOr = builtins.bitOr
-    or import ./zip-int-bits.nix
-      (a: b: if a==1 || b==1 then 1 else 0);
+    or (import ./zip-int-bits.nix
+        (a: b: if a==1 || b==1 then 1 else 0));
 
   /* bitwise “xor” */
   bitXor = builtins.bitXor
-    or import ./zip-int-bits.nix
-      (a: b: if a!=b then 1 else 0);
+    or (import ./zip-int-bits.nix
+        (a: b: if a!=b then 1 else 0));
 
   /* bitwise “not” */
   bitNot = builtins.sub (-1);

From 7a58a44474d48f4e55a053134d9d4bfe8757cc97 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 3 Sep 2018 14:22:32 +0200
Subject: [PATCH 0142/3253] imv: 2.1.3 -> 3.0.0

---
 pkgs/applications/graphics/imv/default.nix | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index e9a0dccd30a9..f02184d98527 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage, fontconfig }:
+{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf
+, freeimage, fontconfig, pkgconfig
+, asciidoc, docbook_xsl, libxslt, cmocka
+}:
 
 stdenv.mkDerivation rec {
   name = "imv-${version}";
-  version = "2.1.3";
+  version = "3.0.0";
 
-  src = fetchgit {
-    url = "https://github.com/eXeC64/imv.git";
-    rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7";
-    sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7";
+  src = fetchFromGitHub {
+    owner  = "eXeC64";
+    repo   = "imv";
+    rev    = "v${version}";
+    sha256 = "0j5aykdkm1g518ism5y5flhwxvjvl92ksq989fhl2wpnv0la82jp";
   };
 
-  buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ];
+  buildInputs = [
+    SDL2 SDL2_ttf freeimage fontconfig pkgconfig
+    asciidoc docbook_xsl libxslt cmocka
+  ];
 
-  configurePhase = "substituteInPlace Makefile --replace /usr $out";
+  installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ];
 
   meta = with stdenv.lib; {
     description = "A command line image viewer for tiling window managers";

From 66d6e847bb2e6ec3bd44146cd03bc3749c965c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 3 Sep 2018 13:23:16 +0100
Subject: [PATCH 0143/3253] nix-prefetch-git: needs findutils as it depends on
 find/xargs

---
 .../tools/package-management/nix-prefetch-scripts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 69e978d3439d..ba47847f28b6 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix
+  git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix, findutils
 }:
 
 let mkPrefetchScript = tool: src: deps:
@@ -28,7 +28,7 @@ let mkPrefetchScript = tool: src: deps:
 in rec {
   nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ];
   nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
-  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils ];
+  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils findutils ];
   nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [ mercurial ];
   nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ];
 

From 8d7439eb19892bb91653fb597398b30828d7d8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 14:23:35 +0200
Subject: [PATCH 0144/3253] tarball job: more --show-trace

Without that I couldn't well do the grandparent commit.
---
 pkgs/top-level/make-tarball.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index f7f128547bae..a0c99847274a 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -54,7 +54,7 @@ releaseTools.sourceTarball rec {
     mkdir $TMPDIR/foo
     ln -s $(readlink -f .) $TMPDIR/foo/bar
     p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace)
-    p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox)
+    p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace)
     if [ "$p1" != "$p2" ]; then
         echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
         exit 1
@@ -63,9 +63,9 @@ releaseTools.sourceTarball rec {
     # Run the regression tests in `lib'.
     if
         # `set -e` doesn't work inside here, so need to && instead :(
-        res="$(nix-instantiate --eval --strict lib/tests/misc.nix)" \
+        res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \
         && [[ "$res" == "[ ]" ]] \
-        && res="$(nix-instantiate --eval --strict lib/tests/systems.nix)" \
+        && res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \
         && [[ "$res" == "[ ]" ]]
     then
         true

From 0a5b8ef8c4661580959e792c4e6b2135233f9cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 14:39:33 +0200
Subject: [PATCH 0145/3253] knot-dns: 2.7.1 -> 2.7.2

https://lists.nic.cz/pipermail/knot-dns-users/2018-August/001423.html
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 047729aa937f..3837f06264b7 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "7d6ae20ada0f0ee7700d5df17f47f86b49eb21ee34977d0d70de6a0947371381";
+    sha256 = "cb70b2ee1c7ecbaad8774a1e0c449a68c6a6f7c9d60595524f003201d6e38431";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 25a14fc261b0ffd5a4b157c5f663d025913fc3b5 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Mon, 3 Sep 2018 14:42:48 +0200
Subject: [PATCH 0146/3253] nixos docs: system restart to apply containers nat

---
 nixos/doc/manual/administration/container-networking.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 4b977d1d82eb..8aca329c8f1f 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -52,4 +52,7 @@ $ ping -c1 10.233.4.2
 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 </programlisting>
  </para>
+ <para>
+  You may need to restart your system for the changes to take effect.
+ </para>
 </section>

From 56a35b39f7ed01d63aa97be57961da59b981518b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 3 Sep 2018 15:09:20 +0200
Subject: [PATCH 0147/3253] vapoursynth-mvtools: 19 -> 20

---
 .../libraries/vapoursynth-mvtools/default.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index c2ab61c6bd17..ecc6b7c30fc7 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
-  vapoursynth, yasm, fftwFloat
+  vapoursynth, nasm, fftwFloat
 }:
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-mvtools-${version}";
-  version = "19";
+  version = "20";
 
   src = fetchFromGitHub {
-    owner = "dubhater";
-    repo  = "vapoursynth-mvtools";
+    owner  = "dubhater";
+    repo   = "vapoursynth-mvtools";
     rev    = "v${version}";
-    sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp";
+    sha256 = "0nbq04wbmz7xqfcfpdvgg0p8xhh2xdcwhhx5gwr4j8bm611v0npz";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     autoreconfHook
-    yasm vapoursynth fftwFloat
+    nasm vapoursynth fftwFloat
   ];
 
   configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ];

From 5a27c2bdcdedce811671b669fa2b32fdbe24e9e0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 3 Sep 2018 15:09:28 +0200
Subject: [PATCH 0148/3253] vapoursynth: R43 -> R44

---
 pkgs/development/libraries/vapoursynth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 7344f3a7e2bb..2d3af9b70c57 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
-  version = "R43";
+  version = "R44";
 
   src = fetchFromGitHub {
     owner  = "vapoursynth";
     repo   = "vapoursynth";
     rev    = version;
-    sha256 = "01yzxggjxr6fz3wj81z6vgp9m4jqddyk73i22kz2x620cpdgb9j9";
+    sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];

From 9173c37e057691f9b813529440e50287dbbd6adc Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 3 Sep 2018 13:15:43 +0000
Subject: [PATCH 0149/3253] perlPackages.UNIVERSALref: broken with perl 5.26+

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 51d1a1c2215e..aea2e458d21b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17056,6 +17056,7 @@ let
      meta = {
        description = "Turns ref() into a multimethod";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+       broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling'
      };
   };
 

From 875bb6bcb98de45bcc54c50cf4428ca9e3b1f7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 3 Sep 2018 15:47:04 +0200
Subject: [PATCH 0150/3253] vowpalwabbit: fix build against boost-python.

Patch setup.py to look for libboost_python{Major}{Minor}.
---
 .../python-modules/vowpalwabbit/default.nix      |  9 ++++++++-
 .../vowpalwabbit/vowpal-wabbit-find-boost.diff   | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index a8661fd3a985..6ee6e42e97d9 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -9,13 +9,20 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "0b517371fc64f1c728a0af42a31fa93def27306e9b4d25d6e5fd01bcff1b7304";
   };
+
+  # Should be fixed in next Python release after 8.5.0:
+  # https://github.com/JohnLangford/vowpal_wabbit/pull/1533
+  patches = [
+    ./vowpal-wabbit-find-boost.diff
+  ];
+
   # vw tries to write some explicit things to home
   # python installed: The directory '/homeless-shelter/.cache/pip/http'
   preInstall = ''
     export HOME=$PWD
   '';
 
-  buildInputs = [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+  buildInputs = [ python.pkgs.boost zlib.dev clang ncurses pytest docutils pygments ];
   propagatedBuildInputs = [ numpy scipy scikitlearn ];
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
new file mode 100644
index 000000000000..0e7b13c01030
--- /dev/null
+++ b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
@@ -0,0 +1,16 @@
+--- vowpalwabbit-8.5.0.orig/setup.py	2018-09-03 14:27:22.833621339 +0200
++++ vowpalwabbit-8.5.0/setup.py	2018-09-03 14:37:18.076127914 +0200
+@@ -25,12 +25,7 @@
+     """Find correct boost-python library information """
+     if system == 'Linux':
+         # use version suffix if present
+-        boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
+-        if sys.version_info.major == 3:
+-            for candidate in ['-py36', '-py35', '-py34', '3']:
+-                boost_lib = 'boost_python{}'.format(candidate)
+-                if find_library(boost_lib):
+-                    exit
++        boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
+         if not find_library(boost_lib):
+             boost_lib = "boost_python"
+     elif system == 'Darwin':

From 0d388e1bb6981ccffe08920e22000bee80a44446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 16:29:35 +0200
Subject: [PATCH 0151/3253] aefs: fix meta.homepage

---
 pkgs/tools/filesystems/aefs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix
index 9ea4d092548f..9344ada8f93e 100644
--- a/pkgs/tools/filesystems/aefs/default.nix
+++ b/pkgs/tools/filesystems/aefs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ fuse ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.st.ewi.tudelft.nl/~dolstra/aefs/;
+    homepage = https://nixos.org/~edolstra/aefs/;
     description = "A cryptographic filesystem implemented in userspace using FUSE";
     platforms = platforms.linux;
     maintainers = [ maintainers.eelco ];

From 9b48a677316ec1e34821e19bf8af68ef0dda6fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 16:53:02 +0200
Subject: [PATCH 0152/3253] treewide: fix various links (homepage, src)

---
 pkgs/development/libraries/jbig2dec/default.nix      | 4 ++--
 pkgs/development/libraries/libsigcxx/1.2.nix         | 2 +-
 pkgs/development/libraries/libsigcxx/default.nix     | 2 +-
 pkgs/os-specific/linux/lm-sensors/default.nix        | 5 +++--
 pkgs/tools/graphics/imgur-screenshot/default.nix     | 2 +-
 pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix | 2 +-
 pkgs/tools/networking/dnscrypt-wrapper/default.nix   | 2 +-
 pkgs/tools/networking/dnsperf/default.nix            | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index cc838be0f4f0..1839d5519fcc 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jbig2dec-0.14";
 
   src = fetchurl {
-    url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/jbig2dec-0.14.tar.gz";
     sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11";
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails 1 of 4 tests
 
   meta = {
-    homepage = https://www.ghostscript.com/jbig2dec.html;
+    homepage = https://www.jbig2dec.com/;
     description = "Decoder implementation of the JBIG2 image compression format";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 9fc6ff86773b..38e5ffcb4de0 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ m4];
 
   meta = {
-    homepage = http://libsigc.sourceforge.net/;
+    homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
     description = "A typesafe callback system for standard C++";
     branch = "1.2";
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index def5ee0e19a2..8eba5377bc34 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = http://libsigc.sourceforge.net/;
+    homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
     description = "A typesafe callback system for standard C++";
     license = licenses.lgpl21;
     platforms = platforms.all;
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index af52dc551ddd..04ce60c87b04 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2"
+      # "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" # dead
+      # https://github.com/lm-sensors/lm-sensors/releases/... # only generated tarballs
       "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
     ];
     sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.lm-sensors.org/;
+    homepage = https://hwmon.wiki.kernel.org/lm_sensors;
     description = "Tools for reading hardware sensors";
     license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index e9f1ad5dacd7..8db5b6c7dea7 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool for easy screencapping and uploading to imgur";
-    homepage = https://https://github.com/jomo/imgur-screenshot/;
+    homepage = https://github.com/jomo/imgur-screenshot/;
     platforms = platforms.linux;
     license = licenses.mit;
     maintainers = with maintainers; [ lw ];
diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
index 6120b821bf41..d555a74ffb1a 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool for securing communications between a client and a DNS resolver";
-    homepage = https://dnscrypt.org/;
+    homepage = https://dnscrypt.info/;
     license = licenses.isc;
     maintainers = with maintainers; [ joachifm jgeerds ];
     # upstream claims OSX support, but Hydra fails
diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
index 4351fd84dcdb..7ed1dbf3220e 100644
--- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix
+++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool for adding dnscrypt support to any name resolver";
-    homepage = https://dnscrypt.org/;
+    homepage = https://dnscrypt.info/;
     license = licenses.isc;
     maintainers = with maintainers; [ tstrobel joachifm ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
index 015046f2bdaa..9d6b85092efc 100644
--- a/pkgs/tools/networking/dnsperf/default.nix
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     outputsToInstall = outputs; # The man pages and PDFs are likely useful to most.
 
     description = "Tools for DNS benchmaring";
-    homepage = https://nominum.com/measurement-tools/;
+    homepage = https://www.akamai.com/us/en/products/network-operator/measurement-tools.jsp;
     license = licenses.isc;
     platforms = platforms.unix;
     maintainers = [ maintainers.vcunat ];

From 3db3ae3700f6e3ced14cf33da05ae91a06d8e5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 3 Sep 2018 16:54:14 +0200
Subject: [PATCH 0153/3253] fixup! treewide: fix various links (homepage, src)

---
 pkgs/development/libraries/jbig2dec/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 1839d5519fcc..04a165866faf 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "jbig2dec-0.14";
 
   src = fetchurl {
-    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/jbig2dec-0.14.tar.gz";
+    url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/${name}.tar.gz";
     sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11";
   };
 

From d22be10e667d233fe38ae6b8f23dc8505798492b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 9 May 2018 13:44:39 -0400
Subject: [PATCH 0154/3253] geant4: refactor cmakeFlags to use lists

---
 .../libraries/physics/geant4/default.nix      | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 87af069c18a5..8b3166cdea0b 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -58,24 +58,22 @@ let
       inherit version src;
       name = "geant4-${version}";
 
-      multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
-
-      cmakeFlags = ''
-        ${multiThreadingFlag}
-        -DGEANT4_INSTALL_DATA=OFF
-        -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
-        -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
-        -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
-        -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
-        -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
-        -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
-        -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
-        -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
-        -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
-        -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
-        -DINVENTOR_INCLUDE_DIR=${coin3d}/include
-        -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
-      '';
+      cmakeFlags = [
+        "-DGEANT4_INSTALL_DATA=OFF"
+        "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+        "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+        "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+        "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+        "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+        "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+        "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+        "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
+        "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+        "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+        "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+        "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+      ] ++ stdenv.lib.optional multiThreadingCapable
+        "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}";
 
       enableParallelBuilding = true;
       buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];

From d7ab0f40266f22781b74ec17f99dd30251f98e7d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 9 May 2018 13:45:57 -0400
Subject: [PATCH 0155/3253] geant4: only supply requested dependencies, sort
 out *BuildInputs

---
 .../libraries/physics/geant4/default.nix           | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 8b3166cdea0b..e80277ec0442 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -70,14 +70,20 @@ let
         "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
         "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
         "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+      ] ++ stdenv.lib.optional multiThreadingCapable
+        "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+        ++ stdenv.lib.optionals enableInventor [
         "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
         "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
-      ] ++ stdenv.lib.optional multiThreadingCapable
-        "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}";
+      ];
 
       enableParallelBuilding = true;
-      buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
-      propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
+      nativeBuildInputs =  [ cmake ];
+      buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+        ++ stdenv.lib.optionals enableGDML [ xercesc ]
+        ++ stdenv.lib.optionals enableXM [ motif ]
+        ++ stdenv.lib.optionals enableQT [ qt ]
+        ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
 
       postFixup = ''
         # Don't try to export invalid environment variables.

From ecfa538e058a9e81155a6ec6ea79c75c5bc26f35 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 9 May 2018 13:51:53 -0400
Subject: [PATCH 0156/3253] gean4: use motif for enableXM by default (lesstif
 is deprecated, see #17359)

---
 pkgs/top-level/all-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e09e89b0b90e..2452b73f9610 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21305,9 +21305,6 @@ with pkgs;
 
     # For enableQT.
     qt = null; # qt4SDK or qt5SDK
-
-    # For enableXM.
-    motif = null; # motif or lesstif
   };
 
   cernlib = callPackage ../development/libraries/physics/cernlib { };

From 537de20645479f49d64a6021a062850a3b4d6d64 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 16 May 2018 17:09:07 -0400
Subject: [PATCH 0157/3253] geant4: remove multi version infrastructure

Nobody maintains this and this does not contribute anything towards
making reproducible research. Also this was missing recurseIntoAttrs, so
Hydra used to not see it.
---
 .../libraries/physics/geant4/default.nix      | 130 ++++++++----------
 .../libraries/physics/geant4/fetch.nix        |  29 ----
 .../libraries/physics/geant4/g4py/default.nix |  93 ++++++-------
 3 files changed, 96 insertions(+), 156 deletions(-)
 delete mode 100644 pkgs/development/libraries/physics/geant4/fetch.nix

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index e80277ec0442..2130e3feffa3 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -50,83 +50,67 @@ assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWra
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
 assert enableInventor -> libXpm != null;
 
-let
-  buildGeant4 =
-    { version, src, multiThreadingCapable ? false }:
+stdenv.mkDerivation rec {
+  version = "10.4.1";
+  name = "geant4-${version}";
 
-    stdenv.mkDerivation rec {
-      inherit version src;
-      name = "geant4-${version}";
-
-      cmakeFlags = [
-        "-DGEANT4_INSTALL_DATA=OFF"
-        "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
-        "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
-        "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
-        "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
-        "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
-        "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
-        "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
-        "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
-        "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
-        "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
-      ] ++ stdenv.lib.optional multiThreadingCapable
-        "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
-        ++ stdenv.lib.optionals enableInventor [
-        "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
-        "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
-      ];
-
-      enableParallelBuilding = true;
-      nativeBuildInputs =  [ cmake ];
-      buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
-        ++ stdenv.lib.optionals enableGDML [ xercesc ]
-        ++ stdenv.lib.optionals enableXM [ motif ]
-        ++ stdenv.lib.optionals enableQT [ qt ]
-        ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
-
-      postFixup = ''
-        # Don't try to export invalid environment variables.
-        sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
-      '';
-
-      setupHook = ./geant4-hook.sh;
-
-      passthru = {
-        data = import ./datasets.nix { inherit stdenv fetchurl; };
-      };
-
-      # Set the myriad of envars required by Geant4 if we use a nix-shell.
-      shellHook = ''
-        source $out/nix-support/setup-hook
-      '';
-
-      meta = with stdenv.lib; {
-        description = "A toolkit for the simulation of the passage of particles through matter";
-        longDescription = ''
-          Geant4 is a toolkit for the simulation of the passage of particles through matter.
-          Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
-          The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
-        '';
-        homepage = http://www.geant4.org;
-        license = licenses.g4sl;
-        maintainers = with maintainers; [ tmplt ];
-        platforms = platforms.all;
-      };
-    };
-
-  fetchGeant4 = import ./fetch.nix {
-    inherit stdenv fetchurl;
+  src = fetchurl{
+    url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+    sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
   };
 
-in {
-  v10_0_2 = buildGeant4 {
-    inherit (fetchGeant4.v10_0_2) version src;
-    multiThreadingCapable = true;
+  cmakeFlags = [
+    "-DGEANT4_INSTALL_DATA=OFF"
+    "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+    "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+    "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+    "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+    "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+    "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+    "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+    "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+    "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals enableInventor [
+    "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+    "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+  ];
+
+  enableParallelBuilding = true;
+  nativeBuildInputs =  [ cmake ];
+  buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+    ++ stdenv.lib.optionals enableGDML [ xercesc ]
+    ++ stdenv.lib.optionals enableXM [ motif ]
+    ++ stdenv.lib.optionals enableQT [ qt ]
+    ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
+
+  postFixup = ''
+    # Don't try to export invalid environment variables.
+    sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+  '';
+
+  setupHook = ./geant4-hook.sh;
+
+  passthru = {
+    data = import ./datasets.nix { inherit stdenv fetchurl; };
   };
 
-  v10_4_1 = buildGeant4 {
-    inherit (fetchGeant4.v10_4_1) version src;
-    multiThreadingCapable = true;
+  # Set the myriad of envars required by Geant4 if we use a nix-shell.
+  shellHook = ''
+    source $out/nix-support/setup-hook
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A toolkit for the simulation of the passage of particles through matter";
+    longDescription = ''
+      Geant4 is a toolkit for the simulation of the passage of particles through matter.
+      Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+      The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+    '';
+    homepage = http://www.geant4.org;
+    license = licenses.g4sl;
+    maintainers = with maintainers; [ tmplt ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
deleted file mode 100644
index 5d539b480d7d..000000000000
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }:
-  {
-    inherit version src;
-  };
-
-in {
-  v10_0_2 = fetch {
-    version = "10.0.2";
-
-    src = fetchurl{
-      url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
-      sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
-    };
-  };
-
-  v10_4_1 = fetch {
-    version = "10.4.1";
-
-    src = fetchurl{
-      url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
-      sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
-    };
-  };
-
-}
-
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index ee332171158d..8d6dfdca47d0 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -8,67 +8,52 @@
 , boost
 }:
 
-let
-  buildG4py = 
-    { version, src, geant4}:
+stdenv.mkDerivation rec {
+  inherit (geant4) version src;
+  name = "g4py-${version}";
 
-    stdenv.mkDerivation rec {
-      inherit version src geant4;
-      name = "g4py-${version}";
+  # ./configure overwrites $PATH, which clobbers everything.
+  patches = [ ./configure.patch ];
+  patchFlags = "-p0";
 
-      # ./configure overwrites $PATH, which clobbers everything.
-      patches = [ ./configure.patch ];
-      patchFlags = "-p0";
+  configurePhase = ''
+    export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
 
-      configurePhase = ''
-        export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+    source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
+    cd environments/g4py
 
-        source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
-        cd environments/g4py
+    ./configure linux64 --prefix=$prefix \
+                        --with-g4install-dir=${geant4} \
+                        --with-python-incdir=${python}/include/python${python.majorVersion} \
+                        --with-python-libdir=${python}/lib \
+                        --with-boost-incdir=${boost.dev}/include \
+                        --with-boost-libdir=${boost.out}/lib
+  '';
 
-        ./configure linux64 --prefix=$prefix \
-                            --with-g4install-dir=${geant4} \
-                            --with-python-incdir=${python}/include/python${python.majorVersion} \
-                            --with-python-libdir=${python}/lib \
-                            --with-boost-incdir=${boost.dev}/include \
-                            --with-boost-libdir=${boost.out}/lib
-      '';
+  enableParallelBuilding = true;
+  buildInputs = [ geant4 boost python ];
 
-      enableParallelBuilding = true;
-      buildInputs = [ geant4 boost python ];
+  setupHook = ./setup-hook.sh;
 
-      setupHook = ./setup-hook.sh;
+  # Make sure we set PYTHONPATH
+  shellHook = ''
+    source $out/nix-support/setup-hook
+  '';
 
-      # Make sure we set PYTHONPATH
-      shellHook = ''
-        source $out/nix-support/setup-hook
-      '';
-
-      meta = {
-        description = "Python bindings and utilities for Geant4";
-        longDescription = ''
-          Geant4 is a toolkit for the simulation of the passage of particles
-          through matter.  Its areas of application include high energy,
-          nuclear and accelerator physics, as well as studies in medical and
-          space science.  The two main reference papers for Geant4 are
-          published in Nuclear Instruments and Methods in Physics Research A
-          506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
-          (2006) 270-278.
-        '';
-        homepage = http://www.geant4.org;
-        license = stdenv.lib.licenses.g4sl;
-        maintainers = [ ];
-        platforms = stdenv.lib.platforms.all;
-      };
-    };
-
-    fetchGeant4 = import ../fetch.nix {
-      inherit stdenv fetchurl;
-    };
-
-in {
-  v10_0_2 = buildG4py {
-    inherit (fetchGeant4.v10_0_2) version src;
-    geant4 = geant4.v10_0_2;
+  meta = {
+    description = "Python bindings and utilities for Geant4";
+    longDescription = ''
+      Geant4 is a toolkit for the simulation of the passage of particles
+      through matter.  Its areas of application include high energy,
+      nuclear and accelerator physics, as well as studies in medical and
+      space science.  The two main reference papers for Geant4 are
+      published in Nuclear Instruments and Methods in Physics Research A
+      506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
+      (2006) 270-278.
+    '';
+    homepage = http://www.geant4.org;
+    license = stdenv.lib.licenses.g4sl;
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 4d33e289b521228c7e0437d4135d132cc56d0236 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 16 May 2018 17:55:07 -0400
Subject: [PATCH 0158/3253] g4py: fix after bump to 10.04.1

---
 .../physics/geant4/g4py/configure.patch       | 12 --------
 .../libraries/physics/geant4/g4py/default.nix | 29 +++++++------------
 2 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/physics/geant4/g4py/configure.patch

diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
deleted file mode 100644
index 886618abd34a..000000000000
--- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- environments/g4py/configure	2014-03-17 22:47:05.000000000 +1100
-+++ environments/g4py/configure	2014-09-01 15:33:46.523637686 +1000
-@@ -4,9 +4,6 @@
- # ======================================================================
- export LANG=C
- 
--PATH=/bin:/usr/bin
--export PATH
--
- # ======================================================================
- # testing the echo features
- # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index 8d6dfdca47d0..197b842ff476 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, cmake, xercesc
 
 # The target version of Geant4
 , geant4
@@ -8,30 +8,23 @@
 , boost
 }:
 
+let
+  # g4py does not support MT and will fail to build against MT geant
+  geant4_nomt = geant4.override { enableMultiThreading = false; };
+in
+
 stdenv.mkDerivation rec {
-  inherit (geant4) version src;
+  inherit (geant4_nomt) version src;
   name = "g4py-${version}";
 
-  # ./configure overwrites $PATH, which clobbers everything.
-  patches = [ ./configure.patch ];
-  patchFlags = "-p0";
+  sourceRoot = "geant4.10.04.p01/environments/g4py";
 
-  configurePhase = ''
-    export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ geant4_nomt xercesc boost python ];
 
-    source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
-    cd environments/g4py
-
-    ./configure linux64 --prefix=$prefix \
-                        --with-g4install-dir=${geant4} \
-                        --with-python-incdir=${python}/include/python${python.majorVersion} \
-                        --with-python-libdir=${python}/lib \
-                        --with-boost-incdir=${boost.dev}/include \
-                        --with-boost-libdir=${boost.out}/lib
-  '';
+  GEANT4_INSTALL = geant4_nomt;
 
   enableParallelBuilding = true;
-  buildInputs = [ geant4 boost python ];
 
   setupHook = ./setup-hook.sh;
 

From f3049d020ab065c61541bb551ad5eab70cdc49f0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 17 May 2018 12:45:41 -0400
Subject: [PATCH 0159/3253] geant4: move parameter definitions from
 all-packages, use system zlib, use qt5

---
 .../libraries/physics/geant4/default.nix      | 41 ++++++-------------
 pkgs/top-level/all-packages.nix               | 21 +---------
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 2130e3feffa3..57d6a87b5943 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -1,55 +1,40 @@
-{ enableMultiThreading ? false
+{ enableMultiThreading ? true
 , enableG3toG4         ? false
 , enableInventor       ? false
 , enableGDML           ? false
 , enableQT             ? false
 , enableXM             ? false
-, enableOpenGLX11      ? false
+, enableOpenGLX11      ? true
 , enableRaytracerX11   ? false
 
 # Standard build environment with cmake.
 , stdenv, fetchurl, cmake
 
 # Optional system packages, otherwise internal GEANT4 packages are used.
-, clhep ? null
-, expat ? null
-, zlib  ? null
+, clhep ? null # not packaged currently
+, expat
+, zlib
 
 # For enableGDML.
-, xercesc ? null
+, xercesc
 
 # For enableQT.
-, qt ? null # qt4SDK or qt5SDK
+, qtbase
 
 # For enableXM.
-, motif ? null # motif or lesstif
+, motif
 
 # For enableInventor
 , coin3d
 , soxt
-, libXpm ? null
+, libXpm
 
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined ? null
-, xlibsWrapper ? null
-, libXmu ? null
+, libGLU_combined
+, xlibsWrapper
+, libXmu
 }:
 
-# G4persistency library with support for GDML
-assert enableGDML -> xercesc != null;
-
-# If enableQT, Qt4/5 User Interface and Visualization drivers.
-assert enableQT -> qt != null;
-
-# Motif User Interface and Visualisation drivers.
-assert enableXM -> motif != null;
-
-# OpenGL/X11 User Interface and Visualisation drivers.
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined   != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
-assert enableInventor -> libXpm != null;
-
 stdenv.mkDerivation rec {
   version = "10.4.1";
   name = "geant4-${version}";
@@ -82,7 +67,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
     ++ stdenv.lib.optionals enableGDML [ xercesc ]
     ++ stdenv.lib.optionals enableXM [ motif ]
-    ++ stdenv.lib.optionals enableQT [ qt ]
+    ++ stdenv.lib.optionals enableQT [ qtbase ]
     ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2452b73f9610..e8152077633f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21286,26 +21286,7 @@ with pkgs;
 
   fastnlo = callPackage ../development/libraries/physics/fastnlo { };
 
-  geant4 = callPackage ../development/libraries/physics/geant4 {
-    enableMultiThreading = true;
-    enableG3toG4         = false;
-    enableInventor       = false;
-    enableGDML           = false;
-    enableQT             = false;
-    enableXM             = false;
-    enableOpenGLX11      = true;
-    enableRaytracerX11   = false;
-
-    # Optional system packages, otherwise internal GEANT4 packages are used.
-    clhep = null;
-    zlib  = null;
-
-    # For enableGDML.
-    xercesc = null;
-
-    # For enableQT.
-    qt = null; # qt4SDK or qt5SDK
-  };
+  geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
 
   cernlib = callPackage ../development/libraries/physics/cernlib { };
 

From fc4f99a8dd0b0e02d453f20e3fc1d60effdf3364 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 16 Aug 2018 14:48:03 -0400
Subject: [PATCH 0160/3253] g4py: fix for new boost

---
 .../libraries/physics/geant4/g4py/default.nix       | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index 197b842ff476..551d61af3ada 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -11,6 +11,7 @@
 let
   # g4py does not support MT and will fail to build against MT geant
   geant4_nomt = geant4.override { enableMultiThreading = false; };
+  boost_python = boost.override { enablePython = true; inherit python; };
 in
 
 stdenv.mkDerivation rec {
@@ -20,10 +21,20 @@ stdenv.mkDerivation rec {
   sourceRoot = "geant4.10.04.p01/environments/g4py";
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ geant4_nomt xercesc boost python ];
+  buildInputs = [ geant4_nomt xercesc boost_python python ];
 
   GEANT4_INSTALL = geant4_nomt;
 
+  preConfigure = ''
+    # Fix for boost 1.67+
+    substituteInPlace CMakeLists.txt \
+    --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})"
+    for f in `find . -name CMakeLists.txt`; do
+      substituteInPlace "$f" \
+        --replace "boost_python" "\''${Boost_LIBRARIES}"
+    done
+  '';
+
   enableParallelBuilding = true;
 
   setupHook = ./setup-hook.sh;

From eac06ed0702638b7e9a058e5412940474ff872ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Sep 2018 17:13:02 +0200
Subject: [PATCH 0161/3253] Manual: Random indentation fixes

---
 doc/configuration.xml |  42 ++++++------
 doc/functions.xml     | 150 ++++++++++++++++++++++--------------------
 2 files changed, 101 insertions(+), 91 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index c91f38f30930..af74f3f9c01f 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -325,7 +325,7 @@
     };
   };
 }
-    </screen>
+</screen>
 
    <para>
     To install it into our environment, you can just run <literal>nix-env -iA
@@ -347,7 +347,7 @@
     };
   };
 }
-    </screen>
+</screen>
 
    <para>
     <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
@@ -383,7 +383,7 @@
     };
   };
 }
-    </screen>
+</screen>
 
    <para>
     This provides us with some useful documentation for using our packages.
@@ -395,15 +395,15 @@
 {
   packageOverrides = pkgs: with pkgs; rec {
     myProfile = writeText "my-profile" ''
-export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
-export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+      export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+      export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
     '';
     myPackages = pkgs.buildEnv {
       name = "my-packages";
       paths = [
         (runCommand "profile" {} ''
-mkdir -p $out/etc/profile.d
-cp ${myProfile} $out/etc/profile.d/my-profile.sh
+          mkdir -p $out/etc/profile.d
+          cp ${myProfile} $out/etc/profile.d/my-profile.sh
         '')
         aspell
         bc
@@ -421,7 +421,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
     };
   };
 }
-    </screen>
+</screen>
 
    <para>
     For this to work fully, you must also have this script sourced when you are
@@ -438,7 +438,7 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
     fi
   done
 fi
-    </screen>
+</screen>
 
    <para>
     Now just run <literal>source $HOME/.profile</literal> and you can starting
@@ -459,16 +459,16 @@ fi
 {
   packageOverrides = pkgs: with pkgs; rec {
     myProfile = writeText "my-profile" ''
-export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
-export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
-export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
+      export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+      export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+      export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
     '';
     myPackages = pkgs.buildEnv {
       name = "my-packages";
       paths = [
         (runCommand "profile" {} ''
-mkdir -p $out/etc/profile.d
-cp ${myProfile} $out/etc/profile.d/my-profile.sh
+          mkdir -p $out/etc/profile.d
+          cp ${myProfile} $out/etc/profile.d/my-profile.sh
         '')
         aspell
         bc
@@ -485,17 +485,17 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
       pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ];
       extraOutputsToInstall = [ "man" "doc" "info" ];
       postBuild = ''
-          if [ -x $out/bin/install-info -a -w $out/share/info ]; then
-            shopt -s nullglob
-            for i in $out/share/info/*.info $out/share/info/*.info.gz; do
-                $out/bin/install-info $i $out/share/info/dir
-            done
-          fi
+        if [ -x $out/bin/install-info -a -w $out/share/info ]; then
+          shopt -s nullglob
+          for i in $out/share/info/*.info $out/share/info/*.info.gz; do
+              $out/bin/install-info $i $out/share/info/dir
+          done
+        fi
       '';
     };
   };
 }
-    </screen>
+</screen>
 
    <para>
     <literal>postBuild</literal> tells Nixpkgs to run a command after building
diff --git a/doc/functions.xml b/doc/functions.xml
index ec188e234543..3cfc6884bd26 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -1,7 +1,7 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
-	 xml:id="chap-functions">
+         xml:id="chap-functions">
  <title>Functions reference</title>
  <para>
   The nixpkgs repository has several utility functions to manipulate Nix
@@ -31,12 +31,16 @@
    <para>
     Example usages:
 <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
-<programlisting>import pkgs.path { overlays = [ (self: super: {
-    foo = super.foo.override { barSupport = true ; };
-  })]};</programlisting>
-<programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
-    mydep = pkgs.mydep.override { ... };
-  }</programlisting>
+<programlisting>
+import pkgs.path { overlays = [ (self: super: {
+  foo = super.foo.override { barSupport = true ; };
+  })]};
+</programlisting>
+<programlisting>
+mypkg = pkgs.callPackage ./mypkg.nix {
+  mydep = pkgs.mydep.override { ... };
+  }
+</programlisting>
    </para>
 
    <para>
@@ -61,9 +65,11 @@
 
    <para>
     Example usage:
-<programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
-    separateDebugInfo = true;
-  });</programlisting>
+<programlisting>
+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+  separateDebugInfo = true;
+});
+</programlisting>
    </para>
 
    <para>
@@ -134,14 +140,16 @@
 
    <para>
     Example usage:
-<programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
-    name = "sed-4.2.2-pre";
-    src = fetchurl {
-      url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
-      sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
-    };
-    patches = [];
-  });</programlisting>
+<programlisting>
+mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+  name = "sed-4.2.2-pre";
+  src = fetchurl {
+    url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
+    sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
+  };
+  patches = [];
+});
+</programlisting>
    </para>
 
    <para>
@@ -181,8 +189,10 @@
 
    <para>
     Example usage:
-<programlisting>f = { a, b }: { result = a+b; }
-  c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
+<programlisting>
+f = { a, b }: { result = a+b; };
+c = lib.makeOverridable f { a = 1; b = 2; };
+</programlisting>
    </para>
 
    <para>
@@ -482,29 +492,29 @@ merge:"diff3"
    <example xml:id='ex-dockerTools-buildImage'>
     <title>Docker build</title>
 <programlisting>
-  buildImage {
-    name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
-    tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
+buildImage {
+  name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
+  tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
 
-    fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
-    fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
-    fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
+  fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
+  fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
+  fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
 
-    contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
-    runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
-      #!${stdenv.shell}
-      mkdir -p /data
-    '';
+  contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
+  runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
+    #!${stdenv.shell}
+    mkdir -p /data
+  '';
 
-    config = { <co xml:id='ex-dockerTools-buildImage-8' />
-      Cmd = [ "/bin/redis-server" ];
-      WorkingDir = "/data";
-      Volumes = {
-        "/data" = {};
-      };
+  config = { <co xml:id='ex-dockerTools-buildImage-8' />
+    Cmd = [ "/bin/redis-server" ];
+    WorkingDir = "/data";
+    Volumes = {
+      "/data" = {};
     };
-  }
-  </programlisting>
+  };
+}
+</programlisting>
    </example>
 
    <para>
@@ -647,15 +657,15 @@ merge:"diff3"
    <example xml:id='ex-dockerTools-pullImage'>
     <title>Docker pull</title>
 <programlisting>
-  pullImage {
-    imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
-    imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
-    finalImageTag = "1.11";  <co xml:id='ex-dockerTools-pullImage-3' />
-    sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
-    os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
-    arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
-  }
-  </programlisting>
+pullImage {
+  imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
+  imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
+  finalImageTag = "1.11";  <co xml:id='ex-dockerTools-pullImage-3' />
+  sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
+  os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
+  arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
+}
+</programlisting>
    </example>
 
    <calloutlist>
@@ -677,9 +687,9 @@ merge:"diff3"
       exactly which image you want. By default it will match the OS and
       architecture of the host the command is run on.
 <programlisting>
-  $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
-  sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-  </programlisting>
+$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
+sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+</programlisting>
       This argument is required.
      </para>
     </callout>
@@ -737,13 +747,13 @@ merge:"diff3"
    <example xml:id='ex-dockerTools-exportImage'>
     <title>Docker export</title>
 <programlisting>
-  exportImage {
-    fromImage = someLayeredImage;
-    fromImageName = null;
-    fromImageTag = null;
+exportImage {
+  fromImage = someLayeredImage;
+  fromImageName = null;
+  fromImageTag = null;
 
-    name = someLayeredImage.name;
-  }
+  name = someLayeredImage.name;
+}
   </programlisting>
    </example>
 
@@ -774,19 +784,19 @@ merge:"diff3"
    <example xml:id='ex-dockerTools-shadowSetup'>
     <title>Shadow base files</title>
 <programlisting>
-  buildImage {
-    name = "shadow-basic";
+buildImage {
+  name = "shadow-basic";
 
-    runAsRoot = ''
-      #!${stdenv.shell}
-      ${shadowSetup}
-      groupadd -r redis
-      useradd -r -g redis redis
-      mkdir /data
-      chown redis:redis /data
-    '';
-  }
-  </programlisting>
+  runAsRoot = ''
+    #!${stdenv.shell}
+    ${shadowSetup}
+    groupadd -r redis
+    useradd -r -g redis redis
+    mkdir /data
+    chown redis:redis /data
+  '';
+}
+</programlisting>
    </example>
 
    <para>

From 5fccac2b8d77a660a968809519710a5bb7838e63 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 3 Sep 2018 11:18:11 -0400
Subject: [PATCH 0162/3253] kernel: Remove Copperhead

The patches are unmaintained and suggest a false sense of security
---
 nixos/release.nix                             |    1 -
 nixos/tests/kernel-copperhead.nix             |   19 -
 .../linux/kernel/copperhead-4-14.patch        | 2864 -----------------
 .../linux/kernel/copperhead-4-16.patch        | 2571 ---------------
 .../linux/kernel/linux-copperhead-lts.nix     |   30 -
 pkgs/os-specific/linux/kernel/patches.nix     |   10 -
 pkgs/top-level/all-packages.nix               |   10 -
 7 files changed, 5505 deletions(-)
 delete mode 100644 nixos/tests/kernel-copperhead.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/copperhead-4-14.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/copperhead-4-16.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 1013053b5b3b..17f51d977c98 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -327,7 +327,6 @@ in rec {
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.kafka = callSubTests tests/kafka.nix {};
-  tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
   tests.kubernetes.dns = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/dns.nix {};
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
deleted file mode 100644
index 652fbf055373..000000000000
--- a/nixos/tests/kernel-copperhead.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "kernel-copperhead";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { pkgs, ... }:
-    {
-      boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
-    };
-
-  testScript =
-    ''
-      $machine->succeed("uname -a");
-      $machine->succeed("uname -s | grep 'Linux'");
-      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'");
-      $machine->succeed("uname -a | grep 'hardened'");
-    '';
-})
diff --git a/pkgs/os-specific/linux/kernel/copperhead-4-14.patch b/pkgs/os-specific/linux/kernel/copperhead-4-14.patch
deleted file mode 100644
index 78112d164f06..000000000000
--- a/pkgs/os-specific/linux/kernel/copperhead-4-14.patch
+++ /dev/null
@@ -1,2864 +0,0 @@
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 0380a45ecf4b..39956a3ef645 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -490,16 +490,6 @@
-			nosocket -- Disable socket memory accounting.
-			nokmem -- Disable kernel memory accounting.
-
--	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
--			Format: { "0" | "1" }
--			See security/selinux/Kconfig help text.
--			0 -- check protection applied by kernel (includes
--				any implied execute protection).
--			1 -- check protection requested by application.
--			Default value is set via a kernel config option.
--			Value can be changed at runtime via
--				/selinux/checkreqprot.
--
-	cio_ignore=	[S390]
-			See Documentation/s390/CommonIO for details.
-	clk_ignore_unused
-@@ -2899,6 +2889,11 @@
-			the specified number of seconds.  This is to be used if
-			your oopses keep scrolling off the screen.
-
-+	extra_latent_entropy
-+			Enable a very simple form of latent entropy extraction
-+			from the first 4GB of memory as the bootmem allocator
-+			passes the memory pages to the buddy allocator.
-+
-	pcbit=		[HW,ISDN]
-
-	pcd.		[PARIDE]
-diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
-index 694968c7523c..002d86416ef8 100644
---- a/Documentation/sysctl/kernel.txt
-+++ b/Documentation/sysctl/kernel.txt
-@@ -91,6 +91,7 @@ show up in /proc/sys/kernel:
- - sysctl_writes_strict
- - tainted
- - threads-max
-+- tiocsti_restrict
- - unknown_nmi_panic
- - watchdog
- - watchdog_thresh
-@@ -999,6 +1000,26 @@ available RAM pages threads-max is reduced accordingly.
-
- ==============================================================
-
-+tiocsti_restrict:
-+
-+This toggle indicates whether unprivileged users are prevented
-+from using the TIOCSTI ioctl to inject commands into other processes
-+which share a tty session.
-+
-+When tiocsti_restrict is set to (0) there are no restrictions(accept
-+the default restriction of only being able to injection commands into
-+one's own tty). When tiocsti_restrict is set to (1), users must
-+have CAP_SYS_ADMIN to use the TIOCSTI ioctl.
-+
-+When user namespaces are in use, the check for the capability
-+CAP_SYS_ADMIN is done against the user namespace that originally
-+opened the tty.
-+
-+The kernel config option CONFIG_SECURITY_TIOCSTI_RESTRICT sets the
-+default value of tiocsti_restrict.
-+
-+==============================================================
-+
- unknown_nmi_panic:
-
- The value in this file affects behavior of handling NMI. When the
-diff --git a/Makefile b/Makefile
-index 787cf6605209..e4fda5330730 100644
---- a/Makefile
-+++ b/Makefile
-@@ -710,6 +710,9 @@ endif
- KBUILD_CFLAGS += $(stackp-flag)
-
- ifeq ($(cc-name),clang)
-+ifdef CONFIG_LOCAL_INIT
-+KBUILD_CFLAGS   += -fsanitize=local-init
-+endif
- KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
- KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
- KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 400b9e1b2f27..4637096f7902 100644
---- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -440,6 +440,11 @@ config GCC_PLUGIN_LATENT_ENTROPY
-	  is some slowdown of the boot process (about 0.5%) and fork and
-	  irq processing.
-
-+	  When extra_latent_entropy is passed on the kernel command line,
-+	  entropy will be extracted from up to the first 4GB of RAM while the
-+	  runtime memory allocator is being initialized.  This costs even more
-+	  slowdown of the boot process.
-+
-	  Note that entropy extracted this way is not cryptographically
-	  secure!
-
-@@ -533,7 +538,7 @@ config CC_STACKPROTECTOR
- choice
-	prompt "Stack Protector buffer overflow detection"
-	depends on HAVE_CC_STACKPROTECTOR
--	default CC_STACKPROTECTOR_NONE
-+	default CC_STACKPROTECTOR_STRONG
-	help
-	  This option turns on the "stack-protector" GCC feature. This
-	  feature puts, at the beginning of functions, a canary value on
-@@ -735,7 +740,7 @@ config ARCH_MMAP_RND_BITS
-	int "Number of bits to use for ASLR of mmap base address" if EXPERT
-	range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX
-	default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT
--	default ARCH_MMAP_RND_BITS_MIN
-+	default ARCH_MMAP_RND_BITS_MAX
-	depends on HAVE_ARCH_MMAP_RND_BITS
-	help
-	  This value can be used to select the number of bits to use to
-@@ -769,7 +774,7 @@ config ARCH_MMAP_RND_COMPAT_BITS
-	int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT
-	range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX
-	default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT
--	default ARCH_MMAP_RND_COMPAT_BITS_MIN
-+	default ARCH_MMAP_RND_COMPAT_BITS_MAX
-	depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
-	help
-	  This value can be used to select the number of bits to use to
-@@ -952,6 +957,7 @@ config ARCH_HAS_REFCOUNT
-
- config REFCOUNT_FULL
-	bool "Perform full reference count validation at the expense of speed"
-+	default y
-	help
-	  Enabling this switches the refcounting infrastructure from a fast
-	  unchecked atomic_t implementation to a fully state checked
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 2d5f7aca156d..aa4839a74c6a 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -918,6 +918,7 @@ endif
-
- config ARM64_SW_TTBR0_PAN
-	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
-+	default y
-	help
-	  Enabling this option prevents the kernel from accessing
-	  user-space memory directly by pointing TTBR0_EL1 to a reserved
-@@ -1044,6 +1045,7 @@ config RANDOMIZE_BASE
-	bool "Randomize the address of the kernel image"
-	select ARM64_MODULE_PLTS if MODULES
-	select RELOCATABLE
-+	default y
-	help
-	  Randomizes the virtual address at which the kernel image is
-	  loaded, as a security feature that deters exploit attempts
-diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
-index cc6bd559af85..01d5442d4722 100644
---- a/arch/arm64/Kconfig.debug
-+++ b/arch/arm64/Kconfig.debug
-@@ -45,6 +45,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
- config DEBUG_WX
-	bool "Warn on W+X mappings at boot"
-	select ARM64_PTDUMP_CORE
-+	default y
-	---help---
-	  Generate a warning if any W+X mappings are found at boot.
-
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 34480e9af2e7..26304242250c 100644
---- a/arch/arm64/configs/defconfig
-+++ b/arch/arm64/configs/defconfig
-@@ -1,4 +1,3 @@
--CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_AUDIT=y
- CONFIG_NO_HZ_IDLE=y
-diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
-index 33be513ef24c..6f0c0e3ef0dd 100644
---- a/arch/arm64/include/asm/elf.h
-+++ b/arch/arm64/include/asm/elf.h
-@@ -114,10 +114,10 @@
-
- /*
-  * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is above 4GB to leave the entire 32-bit address
-+ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-  * space open for things that want to use the area for 32-bit pointers.
-  */
--#define ELF_ET_DYN_BASE		(2 * TASK_SIZE_64 / 3)
-+#define ELF_ET_DYN_BASE		0x100000000UL
-
- #ifndef __ASSEMBLY__
-
-@@ -158,10 +158,10 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
- /* 1GB of VA */
- #ifdef CONFIG_COMPAT
- #define STACK_RND_MASK			(test_thread_flag(TIF_32BIT) ? \
--						0x7ff >> (PAGE_SHIFT - 12) : \
--						0x3ffff >> (PAGE_SHIFT - 12))
-+						((1UL << mmap_rnd_compat_bits) - 1) >> (PAGE_SHIFT - 12) : \
-+						((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
- #else
--#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))
-+#define STACK_RND_MASK			(((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
- #endif
-
- #ifdef __AARCH64EB__
-diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
-index 9e773732520c..91359f45b5fc 100644
---- a/arch/arm64/kernel/process.c
-+++ b/arch/arm64/kernel/process.c
-@@ -419,9 +419,9 @@ unsigned long arch_align_stack(unsigned long sp)
- unsigned long arch_randomize_brk(struct mm_struct *mm)
- {
-	if (is_compat_task())
--		return randomize_page(mm->brk, SZ_32M);
-+		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
-	else
--		return randomize_page(mm->brk, SZ_1G);
-+		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
- }
-
- /*
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 7483cd514c32..835a86c45fb0 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1153,8 +1153,7 @@ config VM86
-        default X86_LEGACY_VM86
-
- config X86_16BIT
--	bool "Enable support for 16-bit segments" if EXPERT
--	default y
-+	bool "Enable support for 16-bit segments"
-	depends on MODIFY_LDT_SYSCALL
-	---help---
-	  This option is required by programs like Wine to run 16-bit
-@@ -2228,7 +2227,7 @@ config COMPAT_VDSO
- choice
-	prompt "vsyscall table for legacy applications"
-	depends on X86_64
--	default LEGACY_VSYSCALL_EMULATE
-+	default LEGACY_VSYSCALL_NONE
-	help
-	  Legacy user code that does not know how to find the vDSO expects
-	  to be able to issue three syscalls by calling fixed addresses in
-@@ -2318,8 +2317,7 @@ config CMDLINE_OVERRIDE
-	  be set to 'N' under normal conditions.
-
- config MODIFY_LDT_SYSCALL
--	bool "Enable the LDT (local descriptor table)" if EXPERT
--	default y
-+	bool "Enable the LDT (local descriptor table)"
-	---help---
-	  Linux can allow user programs to install a per-process x86
-	  Local Descriptor Table (LDT) using the modify_ldt(2) system
-diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 6293a8768a91..add82e0f1df3 100644
---- a/arch/x86/Kconfig.debug
-+++ b/arch/x86/Kconfig.debug
-@@ -101,6 +101,7 @@ config EFI_PGT_DUMP
- config DEBUG_WX
-	bool "Warn on W+X mappings at boot"
-	select X86_PTDUMP_CORE
-+	default y
-	---help---
-	  Generate a warning if any W+X mappings are found at boot.
-
-diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
-index e32fc1f274d8..d08acc76502a 100644
---- a/arch/x86/configs/x86_64_defconfig
-+++ b/arch/x86/configs/x86_64_defconfig
-@@ -1,5 +1,4 @@
- # CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_TASKSTATS=y
-diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
-index 1911310959f8..bba8dbbc07a8 100644
---- a/arch/x86/entry/vdso/vma.c
-+++ b/arch/x86/entry/vdso/vma.c
-@@ -203,55 +203,9 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
- }
-
- #ifdef CONFIG_X86_64
--/*
-- * Put the vdso above the (randomized) stack with another randomized
-- * offset.  This way there is no hole in the middle of address space.
-- * To save memory make sure it is still in the same PTE as the stack
-- * top.  This doesn't give that many random bits.
-- *
-- * Note that this algorithm is imperfect: the distribution of the vdso
-- * start address within a PMD is biased toward the end.
-- *
-- * Only used for the 64-bit and x32 vdsos.
-- */
--static unsigned long vdso_addr(unsigned long start, unsigned len)
--{
--	unsigned long addr, end;
--	unsigned offset;
--
--	/*
--	 * Round up the start address.  It can start out unaligned as a result
--	 * of stack start randomization.
--	 */
--	start = PAGE_ALIGN(start);
--
--	/* Round the lowest possible end address up to a PMD boundary. */
--	end = (start + len + PMD_SIZE - 1) & PMD_MASK;
--	if (end >= TASK_SIZE_MAX)
--		end = TASK_SIZE_MAX;
--	end -= len;
--
--	if (end > start) {
--		offset = get_random_int() % (((end - start) >> PAGE_SHIFT) + 1);
--		addr = start + (offset << PAGE_SHIFT);
--	} else {
--		addr = start;
--	}
--
--	/*
--	 * Forcibly align the final address in case we have a hardware
--	 * issue that requires alignment for performance reasons.
--	 */
--	addr = align_vdso_addr(addr);
--
--	return addr;
--}
--
- static int map_vdso_randomized(const struct vdso_image *image)
- {
--	unsigned long addr = vdso_addr(current->mm->start_stack, image->size-image->sym_vvar_start);
--
--	return map_vdso(image, addr);
-+	return map_vdso(image, 0);
- }
- #endif
-
-diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 3a091cea36c5..0931c05a3348 100644
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
-@@ -249,11 +249,11 @@ extern int force_personality32;
-
- /*
-  * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is above 4GB to leave the entire 32-bit address
-+ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-  * space open for things that want to use the area for 32-bit pointers.
-  */
- #define ELF_ET_DYN_BASE		(mmap_is_ia32() ? 0x000400000UL : \
--						  (DEFAULT_MAP_WINDOW / 3 * 2))
-+						  0x100000000UL)
-
- /* This yields a mask that user programs can use to figure out what
-    instruction set this CPU supports.  This could be done in user space,
-@@ -312,8 +312,8 @@ extern unsigned long get_mmap_base(int is_legacy);
-
- #ifdef CONFIG_X86_32
-
--#define __STACK_RND_MASK(is32bit) (0x7ff)
--#define STACK_RND_MASK (0x7ff)
-+#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
-+#define STACK_RND_MASK ((1UL << mmap_rnd_bits) - 1)
-
- #define ARCH_DLINFO		ARCH_DLINFO_IA32
-
-@@ -322,7 +322,11 @@ extern unsigned long get_mmap_base(int is_legacy);
- #else /* CONFIG_X86_32 */
-
- /* 1GB for 64bit, 8MB for 32bit */
--#define __STACK_RND_MASK(is32bit) ((is32bit) ? 0x7ff : 0x3fffff)
-+#ifdef CONFIG_COMPAT
-+#define __STACK_RND_MASK(is32bit) ((is32bit) ? (1UL << mmap_rnd_compat_bits) - 1 : (1UL << mmap_rnd_bits) - 1)
-+#else
-+#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
-+#endif
- #define STACK_RND_MASK __STACK_RND_MASK(mmap_is_ia32())
-
- #define ARCH_DLINFO							\
-@@ -380,5 +384,4 @@ struct va_alignment {
- } ____cacheline_aligned;
-
- extern struct va_alignment va_align;
--extern unsigned long align_vdso_addr(unsigned long);
- #endif /* _ASM_X86_ELF_H */
-diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
-index 704f31315dde..bb82b6344a7b 100644
---- a/arch/x86/include/asm/tlbflush.h
-+++ b/arch/x86/include/asm/tlbflush.h
-@@ -253,6 +253,7 @@ static inline void cr4_set_bits(unsigned long mask)
-	unsigned long cr4;
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	if ((cr4 | mask) != cr4) {
-		cr4 |= mask;
-		this_cpu_write(cpu_tlbstate.cr4, cr4);
-@@ -266,6 +267,7 @@ static inline void cr4_clear_bits(unsigned long mask)
-	unsigned long cr4;
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	if ((cr4 & ~mask) != cr4) {
-		cr4 &= ~mask;
-		this_cpu_write(cpu_tlbstate.cr4, cr4);
-@@ -278,6 +280,7 @@ static inline void cr4_toggle_bits(unsigned long mask)
-	unsigned long cr4;
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	cr4 ^= mask;
-	this_cpu_write(cpu_tlbstate.cr4, cr4);
-	__write_cr4(cr4);
-@@ -386,6 +389,7 @@ static inline void __native_flush_tlb_global(void)
-	raw_local_irq_save(flags);
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	/* toggle PGE */
-	native_write_cr4(cr4 ^ X86_CR4_PGE);
-	/* write old PGE again and flush TLBs */
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 48e98964ecad..a94dc690612f 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -1637,7 +1637,6 @@ void cpu_init(void)
-	wrmsrl(MSR_KERNEL_GS_BASE, 0);
-	barrier();
-
--	x86_configure_nx();
-	x2apic_setup();
-
-	/*
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 988a98f34c66..dc36d2d9078a 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -40,6 +40,8 @@
- #include <asm/desc.h>
- #include <asm/prctl.h>
- #include <asm/spec-ctrl.h>
-+#include <asm/elf.h>
-+#include <linux/sizes.h>
-
- /*
-  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
-@@ -719,7 +721,10 @@ unsigned long arch_align_stack(unsigned long sp)
-
- unsigned long arch_randomize_brk(struct mm_struct *mm)
- {
--	return randomize_page(mm->brk, 0x02000000);
-+	if (mmap_is_ia32())
-+		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
-+	else
-+		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
- }
-
- /*
-diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
-index a63fe77b3217..e1085e76043e 100644
---- a/arch/x86/kernel/sys_x86_64.c
-+++ b/arch/x86/kernel/sys_x86_64.c
-@@ -54,13 +54,6 @@ static unsigned long get_align_bits(void)
-	return va_align.bits & get_align_mask();
- }
-
--unsigned long align_vdso_addr(unsigned long addr)
--{
--	unsigned long align_mask = get_align_mask();
--	addr = (addr + align_mask) & ~align_mask;
--	return addr | get_align_bits();
--}
--
- static int __init control_va_addr_alignment(char *str)
- {
-	/* guard against enabling this on other CPU families */
-@@ -122,10 +115,7 @@ static void find_start_end(unsigned long addr, unsigned long flags,
-	}
-
-	*begin	= get_mmap_base(1);
--	if (in_compat_syscall())
--		*end = task_size_32bit();
--	else
--		*end = task_size_64bit(addr > DEFAULT_MAP_WINDOW);
-+	*end	= get_mmap_base(0);
- }
-
- unsigned long
-@@ -206,7 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
-
-	info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-	info.length = len;
--	info.low_limit = PAGE_SIZE;
-+	info.low_limit = get_mmap_base(1);
-	info.high_limit = get_mmap_base(0);
-
-	/*
-diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 3141e67ec24c..e93173193f60 100644
---- a/arch/x86/mm/init_32.c
-+++ b/arch/x86/mm/init_32.c
-@@ -558,7 +558,7 @@ static void __init pagetable_init(void)
-	permanent_kmaps_init(pgd_base);
- }
-
--pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
-+pteval_t __supported_pte_mask __ro_after_init = ~(_PAGE_NX | _PAGE_GLOBAL);
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
-
- /* user-defined highmem size */
-@@ -865,7 +865,7 @@ int arch_remove_memory(u64 start, u64 size)
- #endif
- #endif
-
--int kernel_set_to_readonly __read_mostly;
-+int kernel_set_to_readonly __ro_after_init;
-
- void set_kernel_text_rw(void)
- {
-@@ -917,12 +917,11 @@ void mark_rodata_ro(void)
-	unsigned long start = PFN_ALIGN(_text);
-	unsigned long size = PFN_ALIGN(_etext) - start;
-
-+	kernel_set_to_readonly = 1;
-	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
-	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
-		size >> 10);
-
--	kernel_set_to_readonly = 1;
--
- #ifdef CONFIG_CPA_DEBUG
-	printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
-		start, start+size);
-diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index 642357aff216..8bbf93ce3cd2 100644
---- a/arch/x86/mm/init_64.c
-+++ b/arch/x86/mm/init_64.c
-@@ -65,7 +65,7 @@
-  * around without checking the pgd every time.
-  */
-
--pteval_t __supported_pte_mask __read_mostly = ~0;
-+pteval_t __supported_pte_mask __ro_after_init = ~0;
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
-
- int force_personality32;
-@@ -1185,7 +1185,7 @@ void __init mem_init(void)
-	mem_init_print_info(NULL);
- }
-
--int kernel_set_to_readonly;
-+int kernel_set_to_readonly __ro_after_init;
-
- void set_kernel_text_rw(void)
- {
-@@ -1234,9 +1234,8 @@ void mark_rodata_ro(void)
-
-	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
-	       (end - start) >> 10);
--	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
--
-	kernel_set_to_readonly = 1;
-+	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
-
-	/*
-	 * The rodata/data/bss/brk section (but not the kernel text!)
-diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 01e2b353a2b9..9aeddca4a29f 100644
---- a/block/blk-softirq.c
-+++ b/block/blk-softirq.c
-@@ -20,7 +20,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
-  * Softirq action handler - move entries to local list and loop over them
-  * while passing them to the queue registered handler.
-  */
--static __latent_entropy void blk_done_softirq(struct softirq_action *h)
-+static __latent_entropy void blk_done_softirq(void)
- {
-	struct list_head *cpu_list, local_list;
-
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 473f150d6b22..65a65f9824ed 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -5141,7 +5141,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
-	struct ata_port *ap;
-	unsigned int tag;
-
--	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-+	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-	ap = qc->ap;
-
-	qc->flags = 0;
-@@ -5158,7 +5158,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
-	struct ata_port *ap;
-	struct ata_link *link;
-
--	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-+	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
-	ap = qc->ap;
-	link = qc->dev->link;
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index c28dca0c613d..d4813f0d25ca 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -9,7 +9,6 @@ source "drivers/tty/Kconfig"
-
- config DEVMEM
-	bool "/dev/mem virtual device support"
--	default y
-	help
-	  Say Y here if you want to support the /dev/mem device.
-	  The /dev/mem device is used to access areas of physical
-@@ -568,7 +567,6 @@ config TELCLOCK
- config DEVPORT
-	bool "/dev/port character device"
-	depends on ISA || PCI
--	default y
-	help
-	  Say Y here if you want to support the /dev/port device. The /dev/port
-	  device is similar to /dev/mem, but for I/O ports.
-diff --git a/drivers/media/dvb-frontends/cx24116.c b/drivers/media/dvb-frontends/cx24116.c
-index e105532bfba8..e07d52bb9b62 100644
---- a/drivers/media/dvb-frontends/cx24116.c
-+++ b/drivers/media/dvb-frontends/cx24116.c
-@@ -1462,7 +1462,7 @@ static int cx24116_tune(struct dvb_frontend *fe, bool re_tune,
-	return cx24116_read_status(fe, status);
- }
-
--static int cx24116_get_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo cx24116_get_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
-index d37cb7762bd6..97e0feff0ede 100644
---- a/drivers/media/dvb-frontends/cx24117.c
-+++ b/drivers/media/dvb-frontends/cx24117.c
-@@ -1555,7 +1555,7 @@ static int cx24117_tune(struct dvb_frontend *fe, bool re_tune,
-	return cx24117_read_status(fe, status);
- }
-
--static int cx24117_get_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo cx24117_get_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/dvb-frontends/cx24120.c b/drivers/media/dvb-frontends/cx24120.c
-index 7f11dcc94d85..01da670760ba 100644
---- a/drivers/media/dvb-frontends/cx24120.c
-+++ b/drivers/media/dvb-frontends/cx24120.c
-@@ -1491,7 +1491,7 @@ static int cx24120_tune(struct dvb_frontend *fe, bool re_tune,
-	return cx24120_read_status(fe, status);
- }
-
--static int cx24120_get_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo cx24120_get_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
-index 1d59d1d3bd82..41cd0e9ea199 100644
---- a/drivers/media/dvb-frontends/cx24123.c
-+++ b/drivers/media/dvb-frontends/cx24123.c
-@@ -1005,7 +1005,7 @@ static int cx24123_tune(struct dvb_frontend *fe,
-	return retval;
- }
-
--static int cx24123_get_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo cx24123_get_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
-index f6ebbb47b9b2..3e0d8cbd76da 100644
---- a/drivers/media/dvb-frontends/cxd2820r_core.c
-+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
-@@ -403,7 +403,7 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
-	return DVBFE_ALGO_SEARCH_ERROR;
- }
-
--static int cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo cxd2820r_get_frontend_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_CUSTOM;
- }
-diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c
-index e8ac8c3e2ec0..e0f4ba8302d1 100644
---- a/drivers/media/dvb-frontends/mb86a20s.c
-+++ b/drivers/media/dvb-frontends/mb86a20s.c
-@@ -2055,7 +2055,7 @@ static void mb86a20s_release(struct dvb_frontend *fe)
-	kfree(state);
- }
-
--static int mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo mb86a20s_get_frontend_algo(struct dvb_frontend *fe)
- {
-         return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/dvb-frontends/s921.c b/drivers/media/dvb-frontends/s921.c
-index 274544a3ae0e..9ef9b9bc1bd2 100644
---- a/drivers/media/dvb-frontends/s921.c
-+++ b/drivers/media/dvb-frontends/s921.c
-@@ -464,7 +464,7 @@ static int s921_tune(struct dvb_frontend *fe,
-	return rc;
- }
-
--static int s921_get_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo s921_get_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/pci/bt8xx/dst.c b/drivers/media/pci/bt8xx/dst.c
-index 7166d2279465..fa682f9fdc4b 100644
---- a/drivers/media/pci/bt8xx/dst.c
-+++ b/drivers/media/pci/bt8xx/dst.c
-@@ -1657,7 +1657,7 @@ static int dst_tune_frontend(struct dvb_frontend* fe,
-	return 0;
- }
-
--static int dst_get_tuning_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo dst_get_tuning_algo(struct dvb_frontend *fe)
- {
-	return dst_algo ? DVBFE_ALGO_HW : DVBFE_ALGO_SW;
- }
-diff --git a/drivers/media/pci/pt1/va1j5jf8007s.c b/drivers/media/pci/pt1/va1j5jf8007s.c
-index f75f69556be7..d913a6050e8c 100644
---- a/drivers/media/pci/pt1/va1j5jf8007s.c
-+++ b/drivers/media/pci/pt1/va1j5jf8007s.c
-@@ -98,7 +98,7 @@ static int va1j5jf8007s_read_snr(struct dvb_frontend *fe, u16 *snr)
-	return 0;
- }
-
--static int va1j5jf8007s_get_frontend_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo va1j5jf8007s_get_frontend_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/media/pci/pt1/va1j5jf8007t.c b/drivers/media/pci/pt1/va1j5jf8007t.c
-index 63fda79a75c0..4115c3ccd4a8 100644
---- a/drivers/media/pci/pt1/va1j5jf8007t.c
-+++ b/drivers/media/pci/pt1/va1j5jf8007t.c
-@@ -88,7 +88,7 @@ static int va1j5jf8007t_read_snr(struct dvb_frontend *fe, u16 *snr)
-	return 0;
- }
-
--static int va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
-+static enum dvbfe_algo va1j5jf8007t_get_frontend_algo(struct dvb_frontend *fe)
- {
-	return DVBFE_ALGO_HW;
- }
-diff --git a/drivers/misc/lkdtm_core.c b/drivers/misc/lkdtm_core.c
-index 981b3ef71e47..9883da1da383 100644
---- a/drivers/misc/lkdtm_core.c
-+++ b/drivers/misc/lkdtm_core.c
-@@ -78,7 +78,7 @@ static irqreturn_t jp_handle_irq_event(unsigned int irq,
-	return 0;
- }
-
--static void jp_tasklet_action(struct softirq_action *a)
-+static void jp_tasklet_action(void)
- {
-	lkdtm_handler();
-	jprobe_return();
-diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
-index b811442c5ce6..4f62a63cbcb1 100644
---- a/drivers/tty/Kconfig
-+++ b/drivers/tty/Kconfig
-@@ -122,7 +122,6 @@ config UNIX98_PTYS
-
- config LEGACY_PTYS
-	bool "Legacy (BSD) PTY support"
--	default y
-	---help---
-	  A pseudo terminal (PTY) is a software device consisting of two
-	  halves: a master and a slave. The slave device behaves identical to
-diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 562d31073f9a..2184b9b5485f 100644
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -171,6 +171,7 @@ static void free_tty_struct(struct tty_struct *tty)
-	put_device(tty->dev);
-	kfree(tty->write_buf);
-	tty->magic = 0xDEADDEAD;
-+	put_user_ns(tty->owner_user_ns);
-	kfree(tty);
- }
-
-@@ -2154,11 +2155,19 @@ static int tty_fasync(int fd, struct file *filp, int on)
-  *	FIXME: may race normal receive processing
-  */
-
-+int tiocsti_restrict = IS_ENABLED(CONFIG_SECURITY_TIOCSTI_RESTRICT);
-+
- static int tiocsti(struct tty_struct *tty, char __user *p)
- {
-	char ch, mbz = 0;
-	struct tty_ldisc *ld;
-
-+	if (tiocsti_restrict &&
-+		!ns_capable(tty->owner_user_ns, CAP_SYS_ADMIN)) {
-+		dev_warn_ratelimited(tty->dev,
-+			"Denied TIOCSTI ioctl for non-privileged process\n");
-+		return -EPERM;
-+	}
-	if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
-		return -EPERM;
-	if (get_user(ch, p))
-@@ -2841,6 +2850,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx)
-	tty->index = idx;
-	tty_line_name(driver, idx, tty->name);
-	tty->dev = tty_get_device(tty);
-+	tty->owner_user_ns = get_user_ns(current_user_ns());
-
-	return tty;
- }
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 442be7f312f6..788557d5c454 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -38,6 +38,8 @@
- #define USB_VENDOR_GENESYS_LOGIC		0x05e3
- #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01
-
-+extern int deny_new_usb;
-+
- /* Protect struct usb_device->state and ->children members
-  * Note: Both are also protected by ->dev.sem, except that ->state can
-  * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
-@@ -4806,6 +4808,12 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
-			goto done;
-		return;
-	}
-+
-+	if (deny_new_usb) {
-+		dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
-+		goto done;
-+	}
-+
-	if (hub_is_superspeed(hub->hdev))
-		unit_load = 150;
-	else
-diff --git a/fs/exec.c b/fs/exec.c
-index 0da4d748b4e6..69fcee853363 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -62,6 +62,7 @@
- #include <linux/oom.h>
- #include <linux/compat.h>
- #include <linux/vmalloc.h>
-+#include <linux/random.h>
-
- #include <linux/uaccess.h>
- #include <asm/mmu_context.h>
-@@ -321,6 +322,8 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
-	arch_bprm_mm_init(mm, vma);
-	up_write(&mm->mmap_sem);
-	bprm->p = vma->vm_end - sizeof(void *);
-+	if (randomize_va_space)
-+		bprm->p ^= get_random_int() & ~PAGE_MASK;
-	return 0;
- err:
-	up_write(&mm->mmap_sem);
-diff --git a/fs/namei.c b/fs/namei.c
-index 0b46b858cd42..3ae8e72341da 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -902,8 +902,8 @@ static inline void put_link(struct nameidata *nd)
-		path_put(&last->link);
- }
-
--int sysctl_protected_symlinks __read_mostly = 0;
--int sysctl_protected_hardlinks __read_mostly = 0;
-+int sysctl_protected_symlinks __read_mostly = 1;
-+int sysctl_protected_hardlinks __read_mostly = 1;
-
- /**
-  * may_follow_link - Check symlink following for unsafe situations
-diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
-index 5f93cfacb3d1..cea0d7d3b23e 100644
---- a/fs/nfs/Kconfig
-+++ b/fs/nfs/Kconfig
-@@ -195,4 +195,3 @@ config NFS_DEBUG
-	bool
-	depends on NFS_FS && SUNRPC_DEBUG
-	select CRC32
--	default y
-diff --git a/fs/pipe.c b/fs/pipe.c
-index 8ef7d7bef775..b82f305ec13d 100644
---- a/fs/pipe.c
-+++ b/fs/pipe.c
-@@ -38,7 +38,7 @@ unsigned int pipe_max_size = 1048576;
- /*
-  * Minimum pipe size, as required by POSIX
-  */
--unsigned int pipe_min_size = PAGE_SIZE;
-+unsigned int pipe_min_size __read_only = PAGE_SIZE;
-
- /* Maximum allocatable pages per user. Hard limit is unset by default, soft
-  * matches default values.
-diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
-index 1ade1206bb89..60b0f76dec47 100644
---- a/fs/proc/Kconfig
-+++ b/fs/proc/Kconfig
-@@ -39,7 +39,6 @@ config PROC_KCORE
- config PROC_VMCORE
-	bool "/proc/vmcore support"
-	depends on PROC_FS && CRASH_DUMP
--	default y
-         help
-         Exports the dump image of crashed kernel in ELF format.
-
-diff --git a/fs/stat.c b/fs/stat.c
-index 873785dae022..d3c2ada8b9c7 100644
---- a/fs/stat.c
-+++ b/fs/stat.c
-@@ -40,8 +40,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
-	stat->gid = inode->i_gid;
-	stat->rdev = inode->i_rdev;
-	stat->size = i_size_read(inode);
--	stat->atime = inode->i_atime;
--	stat->mtime = inode->i_mtime;
-+	if (is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
-+		stat->atime = inode->i_ctime;
-+		stat->mtime = inode->i_ctime;
-+	} else {
-+		stat->atime = inode->i_atime;
-+		stat->mtime = inode->i_mtime;
-+	}
-	stat->ctime = inode->i_ctime;
-	stat->blksize = i_blocksize(inode);
-	stat->blocks = inode->i_blocks;
-@@ -75,9 +80,14 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
-	stat->result_mask |= STATX_BASIC_STATS;
-	request_mask &= STATX_ALL;
-	query_flags &= KSTAT_QUERY_FLAGS;
--	if (inode->i_op->getattr)
--		return inode->i_op->getattr(path, stat, request_mask,
--					    query_flags);
-+	if (inode->i_op->getattr) {
-+		int retval = inode->i_op->getattr(path, stat, request_mask, query_flags);
-+		if (!retval && is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
-+			stat->atime = stat->ctime;
-+			stat->mtime = stat->ctime;
-+		}
-+		return retval;
-+	}
-
-	generic_fillattr(inode, stat);
-	return 0;
-diff --git a/include/linux/cache.h b/include/linux/cache.h
-index 750621e41d1c..e7157c18c62c 100644
---- a/include/linux/cache.h
-+++ b/include/linux/cache.h
-@@ -31,6 +31,8 @@
- #define __ro_after_init __attribute__((__section__(".data..ro_after_init")))
- #endif
-
-+#define __read_only __ro_after_init
-+
- #ifndef ____cacheline_aligned
- #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
- #endif
-diff --git a/include/linux/capability.h b/include/linux/capability.h
-index f640dcbc880c..2b4f5d651f19 100644
---- a/include/linux/capability.h
-+++ b/include/linux/capability.h
-@@ -207,6 +207,7 @@ extern bool has_capability_noaudit(struct task_struct *t, int cap);
- extern bool has_ns_capability_noaudit(struct task_struct *t,
-				      struct user_namespace *ns, int cap);
- extern bool capable(int cap);
-+extern bool capable_noaudit(int cap);
- extern bool ns_capable(struct user_namespace *ns, int cap);
- extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
- #else
-@@ -232,6 +233,10 @@ static inline bool capable(int cap)
- {
-	return true;
- }
-+static inline bool capable_noaudit(int cap)
-+{
-+	return true;
-+}
- static inline bool ns_capable(struct user_namespace *ns, int cap)
- {
-	return true;
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index cc613f20e5a6..7606596d6c2e 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -3392,4 +3392,15 @@ static inline bool dir_relax_shared(struct inode *inode)
- extern bool path_noexec(const struct path *path);
- extern void inode_nohighmem(struct inode *inode);
-
-+extern int device_sidechannel_restrict;
-+
-+static inline bool is_sidechannel_device(const struct inode *inode)
-+{
-+	umode_t mode;
-+	if (!device_sidechannel_restrict)
-+		return false;
-+	mode = inode->i_mode;
-+	return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
-+}
-+
- #endif /* _LINUX_FS_H */
-diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
-index bdaf22582f6e..326ff15d4637 100644
---- a/include/linux/fsnotify.h
-+++ b/include/linux/fsnotify.h
-@@ -181,6 +181,9 @@ static inline void fsnotify_access(struct file *file)
-	struct inode *inode = path->dentry->d_inode;
-	__u32 mask = FS_ACCESS;
-
-+	if (is_sidechannel_device(inode))
-+		return;
-+
-	if (S_ISDIR(inode->i_mode))
-		mask |= FS_ISDIR;
-
-@@ -199,6 +202,9 @@ static inline void fsnotify_modify(struct file *file)
-	struct inode *inode = path->dentry->d_inode;
-	__u32 mask = FS_MODIFY;
-
-+	if (is_sidechannel_device(inode))
-+		return;
-+
-	if (S_ISDIR(inode->i_mode))
-		mask |= FS_ISDIR;
-
-diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index b041f94678de..a5e0175c79e0 100644
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -518,9 +518,9 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
- extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
- extern unsigned long get_zeroed_page(gfp_t gfp_mask);
-
--void *alloc_pages_exact(size_t size, gfp_t gfp_mask);
-+void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
- void free_pages_exact(void *virt, size_t size);
--void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);
-+void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
-
- #define __get_free_page(gfp_mask) \
-		__get_free_pages((gfp_mask), 0)
-diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 776f90f3a1cd..3f5c47000059 100644
---- a/include/linux/highmem.h
-+++ b/include/linux/highmem.h
-@@ -191,6 +191,13 @@ static inline void clear_highpage(struct page *page)
-	kunmap_atomic(kaddr);
- }
-
-+static inline void verify_zero_highpage(struct page *page)
-+{
-+	void *kaddr = kmap_atomic(page);
-+	BUG_ON(memchr_inv(kaddr, 0, PAGE_SIZE));
-+	kunmap_atomic(kaddr);
-+}
-+
- static inline void zero_user_segments(struct page *page,
-	unsigned start1, unsigned end1,
-	unsigned start2, unsigned end2)
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 69c238210325..ee487ea4f48f 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -485,7 +485,7 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
-
- struct softirq_action
- {
--	void	(*action)(struct softirq_action *);
-+	void	(*action)(void);
- };
-
- asmlinkage void do_softirq(void);
-@@ -500,7 +500,7 @@ static inline void do_softirq_own_stack(void)
- }
- #endif
-
--extern void open_softirq(int nr, void (*action)(struct softirq_action *));
-+extern void __init open_softirq(int nr, void (*action)(void));
- extern void softirq_init(void);
- extern void __raise_softirq_irqoff(unsigned int nr);
-
-diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
-index df32d2508290..c992d130b94d 100644
---- a/include/linux/kobject_ns.h
-+++ b/include/linux/kobject_ns.h
-@@ -46,7 +46,7 @@ struct kobj_ns_type_operations {
-	void (*drop_ns)(void *);
- };
-
--int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
-+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
- int kobj_ns_type_registered(enum kobj_ns_type type);
- const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent);
- const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj);
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index f23215854c80..98df98c44cc0 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -525,7 +525,7 @@ static inline int is_vmalloc_or_module_addr(const void *x)
- }
- #endif
-
--extern void *kvmalloc_node(size_t size, gfp_t flags, int node);
-+extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __attribute__((alloc_size(1)));
- static inline void *kvmalloc(size_t size, gfp_t flags)
- {
-	return kvmalloc_node(size, flags, NUMA_NO_NODE);
-diff --git a/include/linux/percpu.h b/include/linux/percpu.h
-index 296bbe49d5d1..b26652c9a98d 100644
---- a/include/linux/percpu.h
-+++ b/include/linux/percpu.h
-@@ -129,7 +129,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
-				pcpu_fc_populate_pte_fn_t populate_pte_fn);
- #endif
-
--extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
-+extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
- extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
- extern bool is_kernel_percpu_address(unsigned long addr);
-
-@@ -137,8 +137,8 @@ extern bool is_kernel_percpu_address(unsigned long addr);
- extern void __init setup_per_cpu_areas(void);
- #endif
-
--extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp);
--extern void __percpu *__alloc_percpu(size_t size, size_t align);
-+extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __attribute__((alloc_size(1)));
-+extern void __percpu *__alloc_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
- extern void free_percpu(void __percpu *__pdata);
- extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
-
-diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index 8e22f24ded6a..b7fecdfa6de5 100644
---- a/include/linux/perf_event.h
-+++ b/include/linux/perf_event.h
-@@ -1165,6 +1165,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
- int perf_event_max_stack_handler(struct ctl_table *table, int write,
-				 void __user *buffer, size_t *lenp, loff_t *ppos);
-
-+static inline bool perf_paranoid_any(void)
-+{
-+	return sysctl_perf_event_paranoid > 2;
-+}
-+
- static inline bool perf_paranoid_tracepoint_raw(void)
- {
-	return sysctl_perf_event_paranoid > -1;
-diff --git a/include/linux/slab.h b/include/linux/slab.h
-index ae5ed6492d54..fd0786124504 100644
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -146,8 +146,8 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *);
- /*
-  * Common kmalloc functions provided by all allocators
-  */
--void * __must_check __krealloc(const void *, size_t, gfp_t);
--void * __must_check krealloc(const void *, size_t, gfp_t);
-+void * __must_check __krealloc(const void *, size_t, gfp_t) __attribute__((alloc_size(2)));
-+void * __must_check krealloc(const void *, size_t, gfp_t) __attribute((alloc_size(2)));
- void kfree(const void *);
- void kzfree(const void *);
- size_t ksize(const void *);
-@@ -324,7 +324,7 @@ static __always_inline int kmalloc_index(size_t size)
- }
- #endif /* !CONFIG_SLOB */
-
--void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc;
-+void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
- void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags) __assume_slab_alignment __malloc;
- void kmem_cache_free(struct kmem_cache *, void *);
-
-@@ -348,7 +348,7 @@ static __always_inline void kfree_bulk(size_t size, void **p)
- }
-
- #ifdef CONFIG_NUMA
--void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc;
-+void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
- void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node) __assume_slab_alignment __malloc;
- #else
- static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
-@@ -473,7 +473,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
-  * for general use, and so are not documented here. For a full list of
-  * potential flags, always refer to linux/gfp.h.
-  */
--static __always_inline void *kmalloc(size_t size, gfp_t flags)
-+static __always_inline __attribute__((alloc_size(1))) void *kmalloc(size_t size, gfp_t flags)
- {
-	if (__builtin_constant_p(size)) {
-		if (size > KMALLOC_MAX_CACHE_SIZE)
-@@ -513,7 +513,7 @@ static __always_inline int kmalloc_size(int n)
-	return 0;
- }
-
--static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-+static __always_inline __attribute__((alloc_size(1))) void *kmalloc_node(size_t size, gfp_t flags, int node)
- {
- #ifndef CONFIG_SLOB
-	if (__builtin_constant_p(size) &&
-diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index 39fa09bcde23..0b7a48cd883b 100644
---- a/include/linux/slub_def.h
-+++ b/include/linux/slub_def.h
-@@ -120,6 +120,11 @@ struct kmem_cache {
-	unsigned long random;
- #endif
-
-+#ifdef CONFIG_SLAB_CANARY
-+	unsigned long random_active;
-+	unsigned long random_inactive;
-+#endif
-+
- #ifdef CONFIG_NUMA
-	/*
-	 * Defragmentation by allocating from a remote node.
-diff --git a/include/linux/string.h b/include/linux/string.h
-index cfd83eb2f926..b9ecb42c762d 100644
---- a/include/linux/string.h
-+++ b/include/linux/string.h
-@@ -234,10 +234,16 @@ void __read_overflow2(void) __compiletime_error("detected read beyond size of ob
- void __read_overflow3(void) __compiletime_error("detected read beyond size of object passed as 3rd parameter");
- void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter");
-
-+#ifdef CONFIG_FORTIFY_SOURCE_STRICT_STRING
-+#define __string_size(p) __builtin_object_size(p, 1)
-+#else
-+#define __string_size(p) __builtin_object_size(p, 0)
-+#endif
-+
- #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
- __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	if (__builtin_constant_p(size) && p_size < size)
-		__write_overflow();
-	if (p_size < size)
-@@ -247,7 +253,7 @@ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
-
- __FORTIFY_INLINE char *strcat(char *p, const char *q)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	if (p_size == (size_t)-1)
-		return __builtin_strcat(p, q);
-	if (strlcat(p, q, p_size) >= p_size)
-@@ -258,7 +264,7 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q)
- __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
- {
-	__kernel_size_t ret;
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-
-	/* Work around gcc excess stack consumption issue */
-	if (p_size == (size_t)-1 ||
-@@ -273,7 +279,7 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
- extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen);
- __FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	__kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size);
-	if (p_size <= ret && maxlen != ret)
-		fortify_panic(__func__);
-@@ -285,8 +291,8 @@ extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy);
- __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
- {
-	size_t ret;
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __real_strlcpy(p, q, size);
-	ret = strlen(q);
-@@ -306,8 +312,8 @@ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
- __FORTIFY_INLINE char *strncat(char *p, const char *q, __kernel_size_t count)
- {
-	size_t p_len, copy_len;
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __builtin_strncat(p, q, count);
-	p_len = strlen(p);
-@@ -420,8 +426,8 @@ __FORTIFY_INLINE void *kmemdup(const void *p, size_t size, gfp_t gfp)
- /* defined after fortified strlen and memcpy to reuse them */
- __FORTIFY_INLINE char *strcpy(char *p, const char *q)
- {
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __builtin_strcpy(p, q);
-	memcpy(p, q, strlen(q) + 1);
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 1dd587ba6d88..9a9a04fb641d 100644
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -13,6 +13,7 @@
- #include <uapi/linux/tty.h>
- #include <linux/rwsem.h>
- #include <linux/llist.h>
-+#include <linux/user_namespace.h>
-
-
- /*
-@@ -335,6 +336,7 @@ struct tty_struct {
-	/* If the tty has a pending do_SAK, queue it here - akpm */
-	struct work_struct SAK_work;
-	struct tty_port *port;
-+	struct user_namespace *owner_user_ns;
- } __randomize_layout;
-
- /* Each of a tty's open files has private_data pointing to tty_file_private */
-@@ -344,6 +346,8 @@ struct tty_file_private {
-	struct list_head list;
- };
-
-+extern int tiocsti_restrict;
-+
- /* tty magic number */
- #define TTY_MAGIC		0x5401
-
-diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 1e5d8c392f15..66d0e49c9987 100644
---- a/include/linux/vmalloc.h
-+++ b/include/linux/vmalloc.h
-@@ -68,19 +68,19 @@ static inline void vmalloc_init(void)
- }
- #endif
-
--extern void *vmalloc(unsigned long size);
--extern void *vzalloc(unsigned long size);
--extern void *vmalloc_user(unsigned long size);
--extern void *vmalloc_node(unsigned long size, int node);
--extern void *vzalloc_node(unsigned long size, int node);
--extern void *vmalloc_exec(unsigned long size);
--extern void *vmalloc_32(unsigned long size);
--extern void *vmalloc_32_user(unsigned long size);
--extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
-+extern void *vmalloc(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vzalloc(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_user(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
-+extern void *vzalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
-+extern void *vmalloc_exec(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_32(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_32_user(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __attribute__((alloc_size(1)));
- extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
-			unsigned long start, unsigned long end, gfp_t gfp_mask,
-			pgprot_t prot, unsigned long vm_flags, int node,
--			const void *caller);
-+			const void *caller) __attribute__((alloc_size(1)));
- #ifndef CONFIG_MMU
- extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
- static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
-diff --git a/init/Kconfig b/init/Kconfig
-index 46075327c165..0c78750bc76d 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -309,6 +309,7 @@ config USELIB
- config AUDIT
-	bool "Auditing support"
-	depends on NET
-+	default y
-	help
-	  Enable auditing infrastructure that can be used with another
-	  kernel subsystem, such as SELinux (which requires this for
-@@ -1052,6 +1053,12 @@ config CC_OPTIMIZE_FOR_SIZE
-
- endchoice
-
-+config LOCAL_INIT
-+	bool "Zero uninitialized locals"
-+	help
-+	  Zero-fill uninitialized local variables, other than variable-length
-+	  arrays. Requires compiler support.
-+
- config SYSCTL
-	bool
-
-@@ -1361,8 +1368,7 @@ config SHMEM
-	  which may be appropriate on small systems without swap.
-
- config AIO
--	bool "Enable AIO support" if EXPERT
--	default y
-+	bool "Enable AIO support"
-	help
-	  This option enables POSIX asynchronous I/O which may by used
-	  by some high performance threaded applications. Disabling
-@@ -1491,7 +1497,7 @@ config VM_EVENT_COUNTERS
-
- config SLUB_DEBUG
-	default y
--	bool "Enable SLUB debugging support" if EXPERT
-+	bool "Enable SLUB debugging support"
-	depends on SLUB && SYSFS
-	help
-	  SLUB has extensive debug support features. Disabling these can
-@@ -1515,7 +1521,6 @@ config SLUB_MEMCG_SYSFS_ON
-
- config COMPAT_BRK
-	bool "Disable heap randomization"
--	default y
-	help
-	  Randomizing heap placement makes heap exploits harder, but it
-	  also breaks ancient binaries (including anything libc5 based).
-@@ -1562,7 +1567,6 @@ endchoice
-
- config SLAB_MERGE_DEFAULT
-	bool "Allow slab caches to be merged"
--	default y
-	help
-	  For reduced kernel memory fragmentation, slab caches can be
-	  merged when they share the same size and other characteristics.
-@@ -1575,9 +1579,9 @@ config SLAB_MERGE_DEFAULT
-	  command line.
-
- config SLAB_FREELIST_RANDOM
--	default n
-	depends on SLAB || SLUB
-	bool "SLAB freelist randomization"
-+	default y
-	help
-	  Randomizes the freelist order used on creating new pages. This
-	  security feature reduces the predictability of the kernel slab
-@@ -1586,12 +1590,56 @@ config SLAB_FREELIST_RANDOM
- config SLAB_FREELIST_HARDENED
-	bool "Harden slab freelist metadata"
-	depends on SLUB
-+	default y
-	help
-	  Many kernel heap attacks try to target slab cache metadata and
-	  other infrastructure. This options makes minor performance
-	  sacrifies to harden the kernel slab allocator against common
-	  freelist exploit methods.
-
-+config SLAB_HARDENED
-+	default y
-+	depends on SLUB
-+	bool "Hardened SLAB infrastructure"
-+	help
-+          Make minor performance sacrifices to harden the kernel slab
-+          allocator.
-+
-+config SLAB_CANARY
-+	depends on SLUB
-+	depends on !SLAB_MERGE_DEFAULT
-+	bool "SLAB canaries"
-+	default y
-+	help
-+	  Place canaries at the end of kernel slab allocations, sacrificing
-+	  some performance and memory usage for security.
-+
-+	  Canaries can detect some forms of heap corruption when allocations
-+	  are freed and as part of the HARDENED_USERCOPY feature. It provides
-+	  basic use-after-free detection for HARDENED_USERCOPY.
-+
-+	  Canaries absorb small overflows (rendering them harmless), mitigate
-+	  non-NUL terminated C string overflows on 64-bit via a guaranteed zero
-+	  byte and provide basic double-free detection.
-+
-+config SLAB_SANITIZE
-+	bool "Sanitize SLAB allocations"
-+	depends on SLUB
-+	default y
-+	help
-+	  Zero fill slab allocations on free, reducing the lifetime of
-+	  sensitive data and helping to mitigate use-after-free bugs.
-+
-+	  For slabs with debug poisoning enabling, this has no impact.
-+
-+config SLAB_SANITIZE_VERIFY
-+	depends on SLAB_SANITIZE && PAGE_SANITIZE
-+	default y
-+	bool "Verify sanitized SLAB allocations"
-+	help
-+	  Verify that newly allocated slab allocations are zeroed to detect
-+	  write-after-free bugs.
-+
- config SLUB_CPU_PARTIAL
-	default y
-	depends on SLUB && SMP
-diff --git a/kernel/audit.c b/kernel/audit.c
-index 5b34d3114af4..e57930192ce1 100644
---- a/kernel/audit.c
-+++ b/kernel/audit.c
-@@ -1573,6 +1573,9 @@ static int __init audit_enable(char *str)
-	audit_default = !!simple_strtol(str, NULL, 0);
-	if (!audit_default)
-		audit_initialized = AUDIT_DISABLED;
-+        else
-+		audit_initialized = AUDIT_UNINITIALIZED;
-+
-	audit_enabled = audit_default;
-	audit_ever_enabled = !!audit_enabled;
-
-diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
-index d203a5d6b726..2a6c3e2c57a6 100644
---- a/kernel/bpf/core.c
-+++ b/kernel/bpf/core.c
-@@ -539,7 +539,7 @@ void __weak bpf_jit_free(struct bpf_prog *fp)
-	bpf_prog_unlock_free(fp);
- }
-
--int bpf_jit_harden __read_mostly;
-+int bpf_jit_harden __read_mostly = 2;
-
- static int bpf_jit_blind_insn(const struct bpf_insn *from,
-			      const struct bpf_insn *aux,
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 4e933219fec6..0f37db32a2b1 100644
---- a/kernel/bpf/syscall.c
-+++ b/kernel/bpf/syscall.c
-@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(prog_idr_lock);
- static DEFINE_IDR(map_idr);
- static DEFINE_SPINLOCK(map_idr_lock);
-
--int sysctl_unprivileged_bpf_disabled __read_mostly;
-+int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
-
- static const struct bpf_map_ops * const bpf_map_types[] = {
- #define BPF_PROG_TYPE(_id, _ops)
-diff --git a/kernel/capability.c b/kernel/capability.c
-index 1e1c0236f55b..452062fe45ce 100644
---- a/kernel/capability.c
-+++ b/kernel/capability.c
-@@ -431,6 +431,12 @@ bool capable(int cap)
-	return ns_capable(&init_user_ns, cap);
- }
- EXPORT_SYMBOL(capable);
-+
-+bool capable_noaudit(int cap)
-+{
-+	return ns_capable_noaudit(&init_user_ns, cap);
-+}
-+EXPORT_SYMBOL(capable_noaudit);
- #endif /* CONFIG_MULTIUSER */
-
- /**
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index cb8274d7824f..c1b3d232b0a4 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -397,8 +397,13 @@ static cpumask_var_t perf_online_mask;
-  *   0 - disallow raw tracepoint access for unpriv
-  *   1 - disallow cpu events for unpriv
-  *   2 - disallow kernel profiling for unpriv
-+ *   3 - disallow all unpriv perf event use
-  */
-+#ifdef CONFIG_SECURITY_PERF_EVENTS_RESTRICT
-+int sysctl_perf_event_paranoid __read_mostly = 3;
-+#else
- int sysctl_perf_event_paranoid __read_mostly = 2;
-+#endif
-
- /* Minimum for 512 kiB + 1 user control page */
- int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -9941,6 +9946,9 @@ SYSCALL_DEFINE5(perf_event_open,
-	if (flags & ~PERF_FLAG_ALL)
-		return -EINVAL;
-
-+	if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
-+		return -EACCES;
-+
-	err = perf_copy_attr(attr_uptr, &attr);
-	if (err)
-		return err;
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 98c91bd341b4..dbb9540ee61c 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -102,6 +102,11 @@
-
- #define CREATE_TRACE_POINTS
- #include <trace/events/task.h>
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#else
-+#define unprivileged_userns_clone 0
-+#endif
-
- /*
-  * Minimum number of threads to boot the kernel
-@@ -1554,6 +1559,10 @@ static __latent_entropy struct task_struct *copy_process(
-	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
-		return ERR_PTR(-EINVAL);
-
-+	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
-+		if (!capable(CAP_SYS_ADMIN))
-+			return ERR_PTR(-EPERM);
-+
-	/*
-	 * Thread groups must share signals as well, and detached threads
-	 * can only be started up within the thread group.
-@@ -2347,6 +2356,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
-	if (unshare_flags & CLONE_NEWNS)
-		unshare_flags |= CLONE_FS;
-
-+	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
-+		err = -EPERM;
-+		if (!capable(CAP_SYS_ADMIN))
-+			goto bad_unshare_out;
-+	}
-+
-	err = check_unshare_flags(unshare_flags);
-	if (err)
-		goto bad_unshare_out;
-diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
-index 0972a8e09d08..00dde7aad47a 100644
---- a/kernel/power/snapshot.c
-+++ b/kernel/power/snapshot.c
-@@ -1136,7 +1136,7 @@ void free_basic_memory_bitmaps(void)
-
- void clear_free_pages(void)
- {
--#ifdef CONFIG_PAGE_POISONING_ZERO
-+#if defined(CONFIG_PAGE_POISONING_ZERO) || defined(CONFIG_PAGE_SANITIZE)
-	struct memory_bitmap *bm = free_pages_map;
-	unsigned long pfn;
-
-@@ -1153,7 +1153,7 @@ void clear_free_pages(void)
-	}
-	memory_bm_position_reset(bm);
-	pr_info("PM: free pages cleared after restore\n");
--#endif /* PAGE_POISONING_ZERO */
-+#endif /* PAGE_POISONING_ZERO || PAGE_SANITIZE */
- }
-
- /**
-diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
-index a64eee0db39e..4d7de378fe4c 100644
---- a/kernel/rcu/tiny.c
-+++ b/kernel/rcu/tiny.c
-@@ -164,7 +164,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
-	}
- }
-
--static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
-+static __latent_entropy void rcu_process_callbacks(void)
- {
-	__rcu_process_callbacks(&rcu_sched_ctrlblk);
-	__rcu_process_callbacks(&rcu_bh_ctrlblk);
-diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 3e3650e94ae6..7ecd7a5d04b3 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
-@@ -2918,7 +2918,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
- /*
-  * Do RCU core processing for the current CPU.
-  */
--static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
-+static __latent_entropy void rcu_process_callbacks(void)
- {
-	struct rcu_state *rsp;
-
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 5c09ddf8c832..f5db6ece105a 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -8986,7 +8986,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
-  * run_rebalance_domains is triggered when needed from the scheduler tick.
-  * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
-  */
--static __latent_entropy void run_rebalance_domains(struct softirq_action *h)
-+static __latent_entropy void run_rebalance_domains(void)
- {
-	struct rq *this_rq = this_rq();
-	enum cpu_idle_type idle = this_rq->idle_balance ?
-diff --git a/kernel/softirq.c b/kernel/softirq.c
-index e89c3b0cff6d..0d3ebd520931 100644
---- a/kernel/softirq.c
-+++ b/kernel/softirq.c
-@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
- EXPORT_SYMBOL(irq_stat);
- #endif
-
--static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
-+static struct softirq_action softirq_vec[NR_SOFTIRQS] __ro_after_init __aligned(PAGE_SIZE);
-
- DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
-
-@@ -281,7 +281,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
-		kstat_incr_softirqs_this_cpu(vec_nr);
-
-		trace_softirq_entry(vec_nr);
--		h->action(h);
-+		h->action();
-		trace_softirq_exit(vec_nr);
-		if (unlikely(prev_count != preempt_count())) {
-			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-@@ -444,7 +444,7 @@ void __raise_softirq_irqoff(unsigned int nr)
-	or_softirq_pending(1UL << nr);
- }
-
--void open_softirq(int nr, void (*action)(struct softirq_action *))
-+void __init open_softirq(int nr, void (*action)(void))
- {
-	softirq_vec[nr].action = action;
- }
-@@ -486,7 +486,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
- }
- EXPORT_SYMBOL(__tasklet_hi_schedule);
-
--static __latent_entropy void tasklet_action(struct softirq_action *a)
-+static __latent_entropy void tasklet_action(void)
- {
-	struct tasklet_struct *list;
-
-@@ -522,7 +522,7 @@ static __latent_entropy void tasklet_action(struct softirq_action *a)
-	}
- }
-
--static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
-+static __latent_entropy void tasklet_hi_action(void)
- {
-	struct tasklet_struct *list;
-
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 069550540a39..822783a174aa 100644
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -66,6 +66,7 @@
- #include <linux/kexec.h>
- #include <linux/bpf.h>
- #include <linux/mount.h>
-+#include <linux/tty.h>
-
- #include <linux/uaccess.h>
- #include <asm/processor.h>
-@@ -98,12 +99,19 @@
- #if defined(CONFIG_SYSCTL)
-
- /* External variables not in a header file. */
-+#if IS_ENABLED(CONFIG_USB)
-+int deny_new_usb __read_mostly = 0;
-+EXPORT_SYMBOL(deny_new_usb);
-+#endif
- extern int suid_dumpable;
- #ifdef CONFIG_COREDUMP
- extern int core_uses_pid;
- extern char core_pattern[];
- extern unsigned int core_pipe_limit;
- #endif
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#endif
- extern int pid_max;
- extern int pid_max_min, pid_max_max;
- extern int percpu_pagelist_fraction;
-@@ -115,40 +123,43 @@ extern int sysctl_nr_trim_pages;
-
- /* Constants used for minimum and  maximum */
- #ifdef CONFIG_LOCKUP_DETECTOR
--static int sixty = 60;
-+static int sixty __read_only = 60;
- #endif
-
--static int __maybe_unused neg_one = -1;
-+static int __maybe_unused neg_one __read_only = -1;
-
- static int zero;
--static int __maybe_unused one = 1;
--static int __maybe_unused two = 2;
--static int __maybe_unused four = 4;
--static unsigned long one_ul = 1;
--static int one_hundred = 100;
--static int one_thousand = 1000;
-+static int __maybe_unused one __read_only = 1;
-+static int __maybe_unused two __read_only = 2;
-+static int __maybe_unused four __read_only = 4;
-+static unsigned long one_ul __read_only = 1;
-+static int one_hundred __read_only = 100;
-+static int one_thousand __read_only = 1000;
- #ifdef CONFIG_PRINTK
--static int ten_thousand = 10000;
-+static int ten_thousand __read_only = 10000;
- #endif
- #ifdef CONFIG_PERF_EVENTS
--static int six_hundred_forty_kb = 640 * 1024;
-+static int six_hundred_forty_kb __read_only = 640 * 1024;
- #endif
-
- /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
--static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-+static unsigned long dirty_bytes_min __read_only = 2 * PAGE_SIZE;
-
- /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
--static int maxolduid = 65535;
--static int minolduid;
-+static int maxolduid __read_only = 65535;
-+static int minolduid __read_only;
-
--static int ngroups_max = NGROUPS_MAX;
-+static int ngroups_max __read_only = NGROUPS_MAX;
- static const int cap_last_cap = CAP_LAST_CAP;
-
- /*this is needed for proc_doulongvec_minmax of sysctl_hung_task_timeout_secs */
- #ifdef CONFIG_DETECT_HUNG_TASK
--static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
-+static unsigned long hung_task_timeout_max __read_only = (LONG_MAX/HZ);
- #endif
-
-+int device_sidechannel_restrict __read_mostly = 1;
-+EXPORT_SYMBOL(device_sidechannel_restrict);
-+
- #ifdef CONFIG_INOTIFY_USER
- #include <linux/inotify.h>
- #endif
-@@ -286,19 +297,19 @@ static struct ctl_table sysctl_base_table[] = {
- };
-
- #ifdef CONFIG_SCHED_DEBUG
--static int min_sched_granularity_ns = 100000;		/* 100 usecs */
--static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
--static int min_wakeup_granularity_ns;			/* 0 usecs */
--static int max_wakeup_granularity_ns = NSEC_PER_SEC;	/* 1 second */
-+static int min_sched_granularity_ns __read_only = 100000;		/* 100 usecs */
-+static int max_sched_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
-+static int min_wakeup_granularity_ns __read_only;			/* 0 usecs */
-+static int max_wakeup_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
- #ifdef CONFIG_SMP
--static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
--static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1;
-+static int min_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_NONE;
-+static int max_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_END-1;
- #endif /* CONFIG_SMP */
- #endif /* CONFIG_SCHED_DEBUG */
-
- #ifdef CONFIG_COMPACTION
--static int min_extfrag_threshold;
--static int max_extfrag_threshold = 1000;
-+static int min_extfrag_threshold __read_only;
-+static int max_extfrag_threshold __read_only = 1000;
- #endif
-
- static struct ctl_table kern_table[] = {
-@@ -512,6 +523,15 @@ static struct ctl_table kern_table[] = {
-		.proc_handler	= proc_dointvec,
-	},
- #endif
-+#ifdef CONFIG_USER_NS
-+	{
-+		.procname	= "unprivileged_userns_clone",
-+		.data		= &unprivileged_userns_clone,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec,
-+	},
-+#endif
- #ifdef CONFIG_PROC_SYSCTL
-	{
-		.procname	= "tainted",
-@@ -853,6 +873,37 @@ static struct ctl_table kern_table[] = {
-		.extra1		= &zero,
-		.extra2		= &two,
-	},
-+#endif
-+#if defined CONFIG_TTY
-+	{
-+		.procname	= "tiocsti_restrict",
-+		.data		= &tiocsti_restrict,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec_minmax_sysadmin,
-+		.extra1		= &zero,
-+		.extra2		= &one,
-+	},
-+#endif
-+	{
-+		.procname	= "device_sidechannel_restrict",
-+		.data		= &device_sidechannel_restrict,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec_minmax_sysadmin,
-+		.extra1		= &zero,
-+		.extra2		= &one,
-+	},
-+#if IS_ENABLED(CONFIG_USB)
-+	{
-+		.procname	= "deny_new_usb",
-+		.data		= &deny_new_usb,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec_minmax_sysadmin,
-+		.extra1		= &zero,
-+		.extra2		= &one,
-+	},
- #endif
-	{
-		.procname	= "ngroups_max",
-diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 9fe525f410bf..6a85b0e1292e 100644
---- a/kernel/time/timer.c
-+++ b/kernel/time/timer.c
-@@ -1624,7 +1624,7 @@ static inline void __run_timers(struct timer_base *base)
- /*
-  * This function runs timers and the timer-tq in bottom half context.
-  */
--static __latent_entropy void run_timer_softirq(struct softirq_action *h)
-+static __latent_entropy void run_timer_softirq(void)
- {
-	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
-
-diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index c490f1e4313b..dd03bd39d7bf 100644
---- a/kernel/user_namespace.c
-+++ b/kernel/user_namespace.c
-@@ -24,6 +24,9 @@
- #include <linux/projid.h>
- #include <linux/fs_struct.h>
-
-+/* sysctl */
-+int unprivileged_userns_clone;
-+
- static struct kmem_cache *user_ns_cachep __read_mostly;
- static DEFINE_MUTEX(userns_state_mutex);
-
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 62d0e25c054c..3953072277eb 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -937,6 +937,7 @@ endmenu # "Debug lockups and hangs"
-
- config PANIC_ON_OOPS
-	bool "Panic on Oops"
-+	default y
-	help
-	  Say Y here to enable the kernel to panic when it oopses. This
-	  has the same effect as setting oops=panic on the kernel command
-@@ -946,7 +947,7 @@ config PANIC_ON_OOPS
-	  anything erroneous after an oops which could result in data
-	  corruption or other issues.
-
--	  Say N if unsure.
-+	  Say Y if unsure.
-
- config PANIC_ON_OOPS_VALUE
-	int
-@@ -1319,6 +1320,7 @@ config DEBUG_BUGVERBOSE
- config DEBUG_LIST
-	bool "Debug linked list manipulation"
-	depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
-+	default y
-	help
-	  Enable this to turn on extended checks in the linked-list
-	  walking routines.
-@@ -1932,6 +1934,7 @@ config MEMTEST
- config BUG_ON_DATA_CORRUPTION
-	bool "Trigger a BUG when data corruption is detected"
-	select DEBUG_LIST
-+	default y
-	help
-	  Select this option if the kernel should BUG when it encounters
-	  data corruption in kernel memory structures when they get checked
-@@ -1952,7 +1955,7 @@ config STRICT_DEVMEM
-	bool "Filter access to /dev/mem"
-	depends on MMU && DEVMEM
-	depends on ARCH_HAS_DEVMEM_IS_ALLOWED
--	default y if TILE || PPC
-+	default y
-	---help---
-	  If this option is disabled, you allow userspace (root) access to all
-	  of memory, including kernel and userspace memory. Accidental
-@@ -1971,6 +1974,7 @@ config STRICT_DEVMEM
- config IO_STRICT_DEVMEM
-	bool "Filter I/O access to /dev/mem"
-	depends on STRICT_DEVMEM
-+	default y
-	---help---
-	  If this option is disabled, you allow userspace (root) access to all
-	  io-memory regardless of whether a driver is actively using that
-diff --git a/lib/irq_poll.c b/lib/irq_poll.c
-index 86a709954f5a..6f15787fcb1b 100644
---- a/lib/irq_poll.c
-+++ b/lib/irq_poll.c
-@@ -75,7 +75,7 @@ void irq_poll_complete(struct irq_poll *iop)
- }
- EXPORT_SYMBOL(irq_poll_complete);
-
--static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
-+static void __latent_entropy irq_poll_softirq(void)
- {
-	struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
-	int rearm = 0, budget = irq_poll_budget;
-diff --git a/lib/kobject.c b/lib/kobject.c
-index 34f847252c02..4fda329de614 100644
---- a/lib/kobject.c
-+++ b/lib/kobject.c
-@@ -956,9 +956,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
-
-
- static DEFINE_SPINLOCK(kobj_ns_type_lock);
--static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
-+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __ro_after_init;
-
--int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
-+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
- {
-	enum kobj_ns_type type = ops->type;
-	int error;
-diff --git a/lib/nlattr.c b/lib/nlattr.c
-index 3d8295c85505..3fa3b3409d69 100644
---- a/lib/nlattr.c
-+++ b/lib/nlattr.c
-@@ -341,6 +341,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
- {
-	int minlen = min_t(int, count, nla_len(src));
-
-+	BUG_ON(minlen < 0);
-+
-	memcpy(dest, nla_data(src), minlen);
-	if (count > minlen)
-		memset(dest + minlen, 0, count - minlen);
-diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 86c3385b9eb3..c482070e379b 100644
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -1591,7 +1591,7 @@ char *device_node_string(char *buf, char *end, struct device_node *dn,
-	return widen_string(buf, buf - buf_start, end, spec);
- }
-
--int kptr_restrict __read_mostly;
-+int kptr_restrict __read_mostly = 2;
-
- /*
-  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-diff --git a/mm/Kconfig b/mm/Kconfig
-index 59efbd3337e0..c070e14ec83d 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -319,7 +319,8 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
-	depends on MMU
--        default 4096
-+	default 32768 if ARM || (ARM64 && COMPAT)
-+	default 65536
-         help
-	  This is the portion of low virtual memory which should be protected
-	  from userspace allocation.  Keeping a user from writing to low pages
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 11f96fad5271..632e7f9a710e 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -220,6 +220,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
-
-	newbrk = PAGE_ALIGN(brk);
-	oldbrk = PAGE_ALIGN(mm->brk);
-+	/* properly handle unaligned min_brk as an empty heap */
-+	if (min_brk & ~PAGE_MASK) {
-+		if (brk == min_brk)
-+			newbrk -= PAGE_SIZE;
-+		if (mm->brk == min_brk)
-+			oldbrk -= PAGE_SIZE;
-+	}
-	if (oldbrk == newbrk)
-		goto set_brk;
-
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 1d7693c35424..8963a3b4d37c 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -67,6 +67,7 @@
- #include <linux/ftrace.h>
- #include <linux/lockdep.h>
- #include <linux/nmi.h>
-+#include <linux/random.h>
-
- #include <asm/sections.h>
- #include <asm/tlbflush.h>
-@@ -98,6 +99,15 @@ int _node_numa_mem_[MAX_NUMNODES];
- DEFINE_MUTEX(pcpu_drain_mutex);
- DEFINE_PER_CPU(struct work_struct, pcpu_drain);
-
-+bool __meminitdata extra_latent_entropy;
-+
-+static int __init setup_extra_latent_entropy(char *str)
-+{
-+	extra_latent_entropy = true;
-+	return 0;
-+}
-+early_param("extra_latent_entropy", setup_extra_latent_entropy);
-+
- #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
- volatile unsigned long latent_entropy __latent_entropy;
- EXPORT_SYMBOL(latent_entropy);
-@@ -1063,6 +1073,13 @@ static __always_inline bool free_pages_prepare(struct page *page,
-		debug_check_no_obj_freed(page_address(page),
-					   PAGE_SIZE << order);
-	}
-+
-+	if (IS_ENABLED(CONFIG_PAGE_SANITIZE)) {
-+		int i;
-+		for (i = 0; i < (1 << order); i++)
-+			clear_highpage(page + i);
-+	}
-+
-	arch_free_page(page, order);
-	kernel_poison_pages(page, 1 << order, 0);
-	kernel_map_pages(page, 1 << order, 0);
-@@ -1278,6 +1295,21 @@ static void __init __free_pages_boot_core(struct page *page, unsigned int order)
-	__ClearPageReserved(p);
-	set_page_count(p, 0);
-
-+	if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
-+		unsigned long hash = 0;
-+		size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
-+		const unsigned long *data = lowmem_page_address(page);
-+
-+		for (index = 0; index < end; index++)
-+			hash ^= hash + data[index];
-+#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
-+		latent_entropy ^= hash;
-+		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
-+#else
-+		add_device_randomness((const void *)&hash, sizeof(hash));
-+#endif
-+	}
-+
-	page_zone(page)->managed_pages += nr_pages;
-	set_page_refcounted(page);
-	__free_pages(page, order);
-@@ -1718,8 +1750,8 @@ static inline int check_new_page(struct page *page)
-
- static inline bool free_pages_prezeroed(void)
- {
--	return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
--		page_poisoning_enabled();
-+	return IS_ENABLED(CONFIG_PAGE_SANITIZE) ||
-+		(IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) && page_poisoning_enabled());
- }
-
- #ifdef CONFIG_DEBUG_VM
-@@ -1776,6 +1808,11 @@ static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags
-
-	post_alloc_hook(page, order, gfp_flags);
-
-+	if (IS_ENABLED(CONFIG_PAGE_SANITIZE_VERIFY)) {
-+		for (i = 0; i < (1 << order); i++)
-+			verify_zero_highpage(page + i);
-+	}
-+
-	if (!free_pages_prezeroed() && (gfp_flags & __GFP_ZERO))
-		for (i = 0; i < (1 << order); i++)
-			clear_highpage(page + i);
-diff --git a/mm/slab.h b/mm/slab.h
-index 485d9fbb8802..436461588804 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -311,7 +311,11 @@ static inline bool is_root_cache(struct kmem_cache *s)
- static inline bool slab_equal_or_root(struct kmem_cache *s,
-				      struct kmem_cache *p)
- {
-+#ifdef CONFIG_SLAB_HARDENED
-+	return p == s;
-+#else
-	return true;
-+#endif
- }
-
- static inline const char *cache_name(struct kmem_cache *s)
-@@ -363,18 +367,26 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
-	 * to not do even the assignment. In that case, slab_equal_or_root
-	 * will also be a constant.
-	 */
--	if (!memcg_kmem_enabled() &&
-+	if (!IS_ENABLED(CONFIG_SLAB_HARDENED) &&
-+	    !memcg_kmem_enabled() &&
-	    !unlikely(s->flags & SLAB_CONSISTENCY_CHECKS))
-		return s;
-
-	page = virt_to_head_page(x);
-+#ifdef CONFIG_SLAB_HARDENED
-+	BUG_ON(!PageSlab(page));
-+#endif
-	cachep = page->slab_cache;
-	if (slab_equal_or_root(cachep, s))
-		return cachep;
-
-	pr_err("%s: Wrong slab cache. %s but object is from %s\n",
-	       __func__, s->name, cachep->name);
-+#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
-+	BUG_ON(1);
-+#else
-	WARN_ON_ONCE(1);
-+#endif
-	return s;
- }
-
-@@ -399,7 +411,7 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
-	 * back there or track user information then we can
-	 * only use the space before that information.
-	 */
--	if (s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER))
-+	if ((s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER)) || IS_ENABLED(CONFIG_SLAB_CANARY))
-		return s->inuse;
-	/*
-	 * Else we can use all the padding etc for the allocation
-diff --git a/mm/slab_common.c b/mm/slab_common.c
-index 65212caa1f2a..d8bf8a75f445 100644
---- a/mm/slab_common.c
-+++ b/mm/slab_common.c
-@@ -26,10 +26,10 @@
-
- #include "slab.h"
-
--enum slab_state slab_state;
-+enum slab_state slab_state __ro_after_init;
- LIST_HEAD(slab_caches);
- DEFINE_MUTEX(slab_mutex);
--struct kmem_cache *kmem_cache;
-+struct kmem_cache *kmem_cache __ro_after_init;
-
- static LIST_HEAD(slab_caches_to_rcu_destroy);
- static void slab_caches_to_rcu_destroy_workfn(struct work_struct *work);
-@@ -49,7 +49,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
- /*
-  * Merge control. If this is set then no merging of slab caches will occur.
-  */
--static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
-+static bool slab_nomerge __ro_after_init = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
-
- static int __init setup_slab_nomerge(char *str)
- {
-@@ -927,7 +927,7 @@ EXPORT_SYMBOL(kmalloc_dma_caches);
-  * of two cache sizes there. The size of larger slabs can be determined using
-  * fls.
-  */
--static s8 size_index[24] = {
-+static s8 size_index[24] __ro_after_init = {
-	3,	/* 8 */
-	4,	/* 16 */
-	5,	/* 24 */
-diff --git a/mm/slub.c b/mm/slub.c
-index 41c01690d116..591dd60d37f3 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -125,6 +125,16 @@ static inline int kmem_cache_debug(struct kmem_cache *s)
- #endif
- }
-
-+static inline bool has_sanitize(struct kmem_cache *s)
-+{
-+	return IS_ENABLED(CONFIG_SLAB_SANITIZE) && !(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON));
-+}
-+
-+static inline bool has_sanitize_verify(struct kmem_cache *s)
-+{
-+	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
-+}
-+
- void *fixup_red_left(struct kmem_cache *s, void *p)
- {
-	if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
-@@ -297,6 +307,35 @@ static inline void set_freepointer(struct kmem_cache *s, void *object, void *fp)
-	*(void **)freeptr_addr = freelist_ptr(s, fp, freeptr_addr);
- }
-
-+#ifdef CONFIG_SLAB_CANARY
-+static inline unsigned long *get_canary(struct kmem_cache *s, void *object)
-+{
-+	if (s->offset)
-+		return object + s->offset + sizeof(void *);
-+	return object + s->inuse;
-+}
-+
-+static inline unsigned long get_canary_value(const void *canary, unsigned long value)
-+{
-+	return (value ^ (unsigned long)canary) & CANARY_MASK;
-+}
-+
-+static inline void set_canary(struct kmem_cache *s, void *object, unsigned long value)
-+{
-+	unsigned long *canary = get_canary(s, object);
-+	*canary = get_canary_value(canary, value);
-+}
-+
-+static inline void check_canary(struct kmem_cache *s, void *object, unsigned long value)
-+{
-+	unsigned long *canary = get_canary(s, object);
-+	BUG_ON(*canary != get_canary_value(canary, value));
-+}
-+#else
-+#define set_canary(s, object, value)
-+#define check_canary(s, object, value)
-+#endif
-+
- /* Loop over all objects in a slab */
- #define for_each_object(__p, __s, __addr, __objects) \
-	for (__p = fixup_red_left(__s, __addr); \
-@@ -484,13 +523,13 @@ static inline void *restore_red_left(struct kmem_cache *s, void *p)
-  * Debug settings:
-  */
- #if defined(CONFIG_SLUB_DEBUG_ON)
--static int slub_debug = DEBUG_DEFAULT_FLAGS;
-+static int slub_debug __ro_after_init = DEBUG_DEFAULT_FLAGS;
- #else
--static int slub_debug;
-+static int slub_debug __ro_after_init;
- #endif
-
--static char *slub_debug_slabs;
--static int disable_higher_order_debug;
-+static char *slub_debug_slabs __ro_after_init;
-+static int disable_higher_order_debug __ro_after_init;
-
- /*
-  * slub is about to manipulate internal object metadata.  This memory lies
-@@ -550,6 +589,9 @@ static struct track *get_track(struct kmem_cache *s, void *object,
-	else
-		p = object + s->inuse;
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		p = (void *)p + sizeof(void *);
-+
-	return p + alloc;
- }
-
-@@ -688,6 +730,9 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
-	else
-		off = s->inuse;
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		off += sizeof(void *);
-+
-	if (s->flags & SLAB_STORE_USER)
-		off += 2 * sizeof(struct track);
-
-@@ -817,6 +862,9 @@ static int check_pad_bytes(struct kmem_cache *s, struct page *page, u8 *p)
-		/* Freepointer is placed after the object. */
-		off += sizeof(void *);
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		off += sizeof(void *);
-+
-	if (s->flags & SLAB_STORE_USER)
-		/* We also have user information there */
-		off += 2 * sizeof(struct track);
-@@ -1416,8 +1464,9 @@ static void setup_object(struct kmem_cache *s, struct page *page,
-				void *object)
- {
-	setup_object_debug(s, page, object);
-+	set_canary(s, object, s->random_inactive);
-	kasan_init_slab_obj(s, object);
--	if (unlikely(s->ctor)) {
-+	if (unlikely(s->ctor) && !has_sanitize_verify(s)) {
-		kasan_unpoison_object_data(s, object);
-		s->ctor(object);
-		kasan_poison_object_data(s, object);
-@@ -2717,9 +2766,21 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
-		stat(s, ALLOC_FASTPATH);
-	}
-
--	if (unlikely(gfpflags & __GFP_ZERO) && object)
-+	if (has_sanitize_verify(s) && object) {
-+		size_t offset = s->offset ? 0 : sizeof(void *);
-+		BUG_ON(memchr_inv(object + offset, 0, s->object_size - offset));
-+		if (s->ctor)
-+			s->ctor(object);
-+		if (unlikely(gfpflags & __GFP_ZERO) && offset)
-+			memset(object, 0, sizeof(void *));
-+	} else if (unlikely(gfpflags & __GFP_ZERO) && object)
-		memset(object, 0, s->object_size);
-
-+	if (object) {
-+		check_canary(s, object, s->random_inactive);
-+		set_canary(s, object, s->random_active);
-+	}
-+
-	slab_post_alloc_hook(s, gfpflags, 1, &object);
-
-	return object;
-@@ -2926,6 +2987,27 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
-	void *tail_obj = tail ? : head;
-	struct kmem_cache_cpu *c;
-	unsigned long tid;
-+	bool sanitize = has_sanitize(s);
-+
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY) || sanitize) {
-+		__maybe_unused int offset = s->offset ? 0 : sizeof(void *);
-+		void *x = head;
-+
-+		while (1) {
-+			check_canary(s, x, s->random_active);
-+			set_canary(s, x, s->random_inactive);
-+
-+			if (sanitize) {
-+				memset(x + offset, 0, s->object_size - offset);
-+				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && s->ctor)
-+					s->ctor(x);
-+			}
-+			if (x == tail_obj)
-+				break;
-+			x = get_freepointer(s, x);
-+		}
-+	}
-+
- redo:
-	/*
-	 * Determine the currently cpus per cpu slab.
-@@ -3104,7 +3186,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
-			  void **p)
- {
-	struct kmem_cache_cpu *c;
--	int i;
-+	int i, k;
-
-	/* memcg and kmem_cache debug support */
-	s = slab_pre_alloc_hook(s, flags);
-@@ -3141,13 +3223,29 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
-	local_irq_enable();
-
-	/* Clear memory outside IRQ disabled fastpath loop */
--	if (unlikely(flags & __GFP_ZERO)) {
-+	if (has_sanitize_verify(s)) {
-+		int j;
-+
-+		for (j = 0; j < i; j++) {
-+			size_t offset = s->offset ? 0 : sizeof(void *);
-+			BUG_ON(memchr_inv(p[j] + offset, 0, s->object_size - offset));
-+			if (s->ctor)
-+				s->ctor(p[j]);
-+			if (unlikely(flags & __GFP_ZERO) && offset)
-+				memset(p[j], 0, sizeof(void *));
-+		}
-+	} else if (unlikely(flags & __GFP_ZERO)) {
-		int j;
-
-		for (j = 0; j < i; j++)
-			memset(p[j], 0, s->object_size);
-	}
-
-+	for (k = 0; k < i; k++) {
-+		check_canary(s, p[k], s->random_inactive);
-+		set_canary(s, p[k], s->random_active);
-+	}
-+
-	/* memcg and kmem_cache debug support */
-	slab_post_alloc_hook(s, flags, size, p);
-	return i;
-@@ -3179,9 +3277,9 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);
-  * and increases the number of allocations possible without having to
-  * take the list_lock.
-  */
--static int slub_min_order;
--static int slub_max_order = PAGE_ALLOC_COSTLY_ORDER;
--static int slub_min_objects;
-+static int slub_min_order __ro_after_init;
-+static int slub_max_order __ro_after_init = PAGE_ALLOC_COSTLY_ORDER;
-+static int slub_min_objects __ro_after_init;
-
- /*
-  * Calculate the order of allocation given an slab object size.
-@@ -3351,6 +3449,7 @@ static void early_kmem_cache_node_alloc(int node)
-	init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);
-	init_tracking(kmem_cache_node, n);
- #endif
-+	set_canary(kmem_cache_node, n, kmem_cache_node->random_active);
-	kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
-		      GFP_KERNEL);
-	init_kmem_cache_node(n);
-@@ -3507,6 +3606,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
-		size += sizeof(void *);
-	}
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		size += sizeof(void *);
-+
- #ifdef CONFIG_SLUB_DEBUG
-	if (flags & SLAB_STORE_USER)
-		/*
-@@ -3577,6 +3679,10 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
- #ifdef CONFIG_SLAB_FREELIST_HARDENED
-	s->random = get_random_long();
- #endif
-+#ifdef CONFIG_SLAB_CANARY
-+	s->random_active = get_random_long();
-+	s->random_inactive = get_random_long();
-+#endif
-
-	if (need_reserve_slab_rcu && (s->flags & SLAB_TYPESAFE_BY_RCU))
-		s->reserved = sizeof(struct rcu_head);
-@@ -3841,6 +3947,8 @@ const char *__check_heap_object(const void *ptr, unsigned long n,
-		offset -= s->red_left_pad;
-	}
-
-+	check_canary(s, (void *)ptr - offset, s->random_active);
-+
-	/* Allow address range falling entirely within object size. */
-	if (offset <= object_size && n <= object_size - offset)
-		return NULL;
-@@ -3859,7 +3967,11 @@ static size_t __ksize(const void *object)
-	page = virt_to_head_page(object);
-
-	if (unlikely(!PageSlab(page))) {
-+#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
-+		BUG_ON(!PageCompound(page));
-+#else
-		WARN_ON(!PageCompound(page));
-+#endif
-		return PAGE_SIZE << compound_order(page);
-	}
-
-@@ -4724,7 +4836,7 @@ enum slab_stat_type {
- #define SO_TOTAL	(1 << SL_TOTAL)
-
- #ifdef CONFIG_MEMCG
--static bool memcg_sysfs_enabled = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
-+static bool memcg_sysfs_enabled __ro_after_init = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
-
- static int __init setup_slub_memcg_sysfs(char *str)
- {
-diff --git a/mm/swap.c b/mm/swap.c
-index a77d68f2c1b6..d1f1d75f4d1f 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
-@@ -92,6 +92,13 @@ static void __put_compound_page(struct page *page)
-	if (!PageHuge(page))
-		__page_cache_release(page);
-	dtor = get_compound_page_dtor(page);
-+	if (!PageHuge(page))
-+		BUG_ON(dtor != free_compound_page
-+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-+			&& dtor != free_transhuge_page
-+#endif
-+		);
-+
-	(*dtor)(page);
- }
-
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 6ca771f2f25b..6da2c9c3e6a5 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4095,7 +4095,7 @@ int netif_rx_ni(struct sk_buff *skb)
- }
- EXPORT_SYMBOL(netif_rx_ni);
-
--static __latent_entropy void net_tx_action(struct softirq_action *h)
-+static __latent_entropy void net_tx_action(void)
- {
-	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-
-@@ -5609,7 +5609,7 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)
-	return work;
- }
-
--static __latent_entropy void net_rx_action(struct softirq_action *h)
-+static __latent_entropy void net_rx_action(void)
- {
-	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-	unsigned long time_limit = jiffies +
-diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
-index f48fe6fc7e8c..d78c52835c08 100644
---- a/net/ipv4/Kconfig
-+++ b/net/ipv4/Kconfig
-@@ -261,6 +261,7 @@ config IP_PIMSM_V2
-
- config SYN_COOKIES
-	bool "IP: TCP syncookie support"
-+	default y
-	---help---
-	  Normal TCP/IP networking is open to an attack known as "SYN
-	  flooding". This denial-of-service attack prevents legitimate remote
-diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 54deaa1066cf..211f97bd5ee3 100644
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -37,6 +37,7 @@ static int vmlinux_section_warnings = 1;
- static int warn_unresolved = 0;
- /* How a symbol is exported */
- static int sec_mismatch_count = 0;
-+static int writable_fptr_count = 0;
- static int sec_mismatch_verbose = 1;
- static int sec_mismatch_fatal = 0;
- /* ignore missing files */
-@@ -965,6 +966,7 @@ enum mismatch {
-	ANY_EXIT_TO_ANY_INIT,
-	EXPORT_TO_INIT_EXIT,
-	EXTABLE_TO_NON_TEXT,
-+	DATA_TO_TEXT
- };
-
- /**
-@@ -1091,6 +1093,12 @@ static const struct sectioncheck sectioncheck[] = {
-	.good_tosec = {ALL_TEXT_SECTIONS , NULL},
-	.mismatch = EXTABLE_TO_NON_TEXT,
-	.handler = extable_mismatch_handler,
-+},
-+/* Do not reference code from writable data */
-+{
-+	.fromsec = { DATA_SECTIONS, NULL },
-+	.bad_tosec = { ALL_TEXT_SECTIONS, NULL },
-+	.mismatch = DATA_TO_TEXT
- }
- };
-
-@@ -1240,10 +1248,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
-			continue;
-		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
-			continue;
--		if (sym->st_value == addr)
--			return sym;
-		/* Find a symbol nearby - addr are maybe negative */
-		d = sym->st_value - addr;
-+		if (d == 0)
-+			return sym;
-		if (d < 0)
-			d = addr - sym->st_value;
-		if (d < distance) {
-@@ -1402,7 +1410,11 @@ static void report_sec_mismatch(const char *modname,
-	char *prl_from;
-	char *prl_to;
-
--	sec_mismatch_count++;
-+	if (mismatch->mismatch == DATA_TO_TEXT)
-+		writable_fptr_count++;
-+	else
-+		sec_mismatch_count++;
-+
-	if (!sec_mismatch_verbose)
-		return;
-
-@@ -1526,6 +1538,14 @@ static void report_sec_mismatch(const char *modname,
-		fatal("There's a special handler for this mismatch type, "
-		      "we should never get here.");
-		break;
-+	case DATA_TO_TEXT:
-+#if 0
-+		fprintf(stderr,
-+		"The %s %s:%s references\n"
-+		"the %s %s:%s%s\n",
-+		from, fromsec, fromsym, to, tosec, tosym, to_p);
-+#endif
-+		break;
-	}
-	fprintf(stderr, "\n");
- }
-@@ -2539,6 +2559,14 @@ int main(int argc, char **argv)
-		}
-	}
-	free(buf.p);
-+	if (writable_fptr_count) {
-+		if (!sec_mismatch_verbose) {
-+			warn("modpost: Found %d writable function pointer(s).\n"
-+			     "To see full details build your kernel with:\n"
-+			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-+			     writable_fptr_count);
-+		}
-+	}
-
-	return err;
- }
-diff --git a/security/Kconfig b/security/Kconfig
-index 87f2a6f842fd..7bdbb7edf5bf 100644
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -8,7 +8,7 @@ source security/keys/Kconfig
-
- config SECURITY_DMESG_RESTRICT
-	bool "Restrict unprivileged access to the kernel syslog"
--	default n
-+	default y
-	help
-	  This enforces restrictions on unprivileged users reading the kernel
-	  syslog via dmesg(8).
-@@ -18,10 +18,34 @@ config SECURITY_DMESG_RESTRICT
-
-	  If you are unsure how to answer this question, answer N.
-
-+config SECURITY_PERF_EVENTS_RESTRICT
-+	bool "Restrict unprivileged use of performance events"
-+	depends on PERF_EVENTS
-+	default y
-+	help
-+	  If you say Y here, the kernel.perf_event_paranoid sysctl
-+	  will be set to 3 by default, and no unprivileged use of the
-+	  perf_event_open syscall will be permitted unless it is
-+	  changed.
-+
-+config SECURITY_TIOCSTI_RESTRICT
-+	bool "Restrict unprivileged use of tiocsti command injection"
-+	default y
-+	help
-+	  This enforces restrictions on unprivileged users injecting commands
-+	  into other processes which share a tty session using the TIOCSTI
-+	  ioctl. This option makes TIOCSTI use require CAP_SYS_ADMIN.
-+
-+	  If this option is not selected, no restrictions will be enforced
-+	  unless the tiocsti_restrict sysctl is explicitly set to (1).
-+
-+	  If you are unsure how to answer this question, answer N.
-+
- config SECURITY
-	bool "Enable different security models"
-	depends on SYSFS
-	depends on MULTIUSER
-+	default y
-	help
-	  This allows you to choose different security modules to be
-	  configured into your kernel.
-@@ -48,6 +72,7 @@ config SECURITYFS
- config SECURITY_NETWORK
-	bool "Socket and Networking Security Hooks"
-	depends on SECURITY
-+	default y
-	help
-	  This enables the socket and networking security hooks.
-	  If enabled, a security module can use these hooks to
-@@ -155,6 +180,7 @@ config HARDENED_USERCOPY
-	depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
-	select BUG
-	imply STRICT_DEVMEM
-+	default y
-	help
-	  This option checks for obviously wrong memory regions when
-	  copying memory to/from the kernel (via copy_to_user() and
-@@ -178,10 +204,36 @@ config HARDENED_USERCOPY_PAGESPAN
- config FORTIFY_SOURCE
-	bool "Harden common str/mem functions against buffer overflows"
-	depends on ARCH_HAS_FORTIFY_SOURCE
-+	default y
-	help
-	  Detect overflows of buffers in common string and memory functions
-	  where the compiler can determine and validate the buffer sizes.
-
-+config FORTIFY_SOURCE_STRICT_STRING
-+	bool "Harden common functions against buffer overflows"
-+	depends on FORTIFY_SOURCE
-+	depends on EXPERT
-+	help
-+	  Perform stricter overflow checks catching overflows within objects
-+	  for common C string functions rather than only between objects.
-+
-+	  This is not yet intended for production use, only bug finding.
-+
-+config PAGE_SANITIZE
-+	bool "Sanitize pages"
-+	default y
-+	help
-+	  Zero fill page allocations on free, reducing the lifetime of
-+	  sensitive data and helping to mitigate use-after-free bugs.
-+
-+config PAGE_SANITIZE_VERIFY
-+	bool "Verify sanitized pages"
-+	depends on PAGE_SANITIZE
-+	default y
-+	help
-+	  Verify that newly allocated pages are zeroed to detect
-+	  write-after-free bugs.
-+
- config STATIC_USERMODEHELPER
-	bool "Force all usermode helper calls through a single binary"
-	help
-diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
-index 8af7a690eb40..6539694b0fd3 100644
---- a/security/selinux/Kconfig
-+++ b/security/selinux/Kconfig
-@@ -2,7 +2,7 @@ config SECURITY_SELINUX
-	bool "NSA SELinux Support"
-	depends on SECURITY_NETWORK && AUDIT && NET && INET
-	select NETWORK_SECMARK
--	default n
-+	default y
-	help
-	  This selects NSA Security-Enhanced Linux (SELinux).
-	  You will also need a policy configuration and a labeled filesystem.
-@@ -79,23 +79,3 @@ config SECURITY_SELINUX_AVC_STATS
-	  This option collects access vector cache statistics to
-	  /selinux/avc/cache_stats, which may be monitored via
-	  tools such as avcstat.
--
--config SECURITY_SELINUX_CHECKREQPROT_VALUE
--	int "NSA SELinux checkreqprot default value"
--	depends on SECURITY_SELINUX
--	range 0 1
--	default 0
--	help
--	  This option sets the default value for the 'checkreqprot' flag
--	  that determines whether SELinux checks the protection requested
--	  by the application or the protection that will be applied by the
--	  kernel (including any implied execute for read-implies-exec) for
--	  mmap and mprotect calls.  If this option is set to 0 (zero),
--	  SELinux will default to checking the protection that will be applied
--	  by the kernel.  If this option is set to 1 (one), SELinux will
--	  default to checking the protection requested by the application.
--	  The checkreqprot flag may be changed from the default via the
--	  'checkreqprot=' boot parameter.  It may also be changed at runtime
--	  via /selinux/checkreqprot if authorized by policy.
--
--	  If you are unsure how to answer this question, answer 0.
-diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
-index 1649cd18eb0b..067f35559aa7 100644
---- a/security/selinux/include/objsec.h
-+++ b/security/selinux/include/objsec.h
-@@ -150,6 +150,6 @@ struct pkey_security_struct {
-	u32	sid;	/* SID of pkey */
- };
-
--extern unsigned int selinux_checkreqprot;
-+extern const unsigned int selinux_checkreqprot;
-
- #endif /* _SELINUX_OBJSEC_H_ */
-diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
-index 00eed842c491..8f7b8d7e6f91 100644
---- a/security/selinux/selinuxfs.c
-+++ b/security/selinux/selinuxfs.c
-@@ -41,16 +41,7 @@
- #include "objsec.h"
- #include "conditional.h"
-
--unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
--
--static int __init checkreqprot_setup(char *str)
--{
--	unsigned long checkreqprot;
--	if (!kstrtoul(str, 0, &checkreqprot))
--		selinux_checkreqprot = checkreqprot ? 1 : 0;
--	return 1;
--}
--__setup("checkreqprot=", checkreqprot_setup);
-+const unsigned int selinux_checkreqprot;
-
- static DEFINE_MUTEX(sel_mutex);
-
-@@ -610,10 +601,9 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
-		return PTR_ERR(page);
-
-	length = -EINVAL;
--	if (sscanf(page, "%u", &new_value) != 1)
-+	if (sscanf(page, "%u", &new_value) != 1 || new_value)
-		goto out;
-
--	selinux_checkreqprot = new_value ? 1 : 0;
-	length = count;
- out:
-	kfree(page);
-diff --git a/security/yama/Kconfig b/security/yama/Kconfig
-index 96b27405558a..485c1b85c325 100644
---- a/security/yama/Kconfig
-+++ b/security/yama/Kconfig
-@@ -1,7 +1,7 @@
- config SECURITY_YAMA
-	bool "Yama support"
-	depends on SECURITY
--	default n
-+	default y
-	help
-	  This selects Yama, which extends DAC support with additional
-	  system-wide security settings beyond regular Linux discretionary
diff --git a/pkgs/os-specific/linux/kernel/copperhead-4-16.patch b/pkgs/os-specific/linux/kernel/copperhead-4-16.patch
deleted file mode 100644
index f0a4bc940347..000000000000
--- a/pkgs/os-specific/linux/kernel/copperhead-4-16.patch
+++ /dev/null
@@ -1,2571 +0,0 @@
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 9824d049367e..6ff72316ff0a 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -496,16 +496,6 @@
-			nosocket -- Disable socket memory accounting.
-			nokmem -- Disable kernel memory accounting.
-
--	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
--			Format: { "0" | "1" }
--			See security/selinux/Kconfig help text.
--			0 -- check protection applied by kernel (includes
--				any implied execute protection).
--			1 -- check protection requested by application.
--			Default value is set via a kernel config option.
--			Value can be changed at runtime via
--				/selinux/checkreqprot.
--
-	cio_ignore=	[S390]
-			See Documentation/s390/CommonIO for details.
-	clk_ignore_unused
-@@ -2946,6 +2936,11 @@
-			the specified number of seconds.  This is to be used if
-			your oopses keep scrolling off the screen.
-
-+	extra_latent_entropy
-+			Enable a very simple form of latent entropy extraction
-+			from the first 4GB of memory as the bootmem allocator
-+			passes the memory pages to the buddy allocator.
-+
-	pcbit=		[HW,ISDN]
-
-	pcd.		[PARIDE]
-diff --git a/Makefile b/Makefile
-index ded9e8480d74..2e948bb78142 100644
---- a/Makefile
-+++ b/Makefile
-@@ -734,6 +734,9 @@ endif
- endif
-
- ifeq ($(cc-name),clang)
-+ifdef CONFIG_LOCAL_INIT
-+KBUILD_CFLAGS   += -fsanitize=local-init
-+endif
- KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
- KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
- KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
-diff --git a/arch/Kconfig b/arch/Kconfig
-index 76c0b54443b1..63a2d30f807f 100644
---- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -454,6 +454,11 @@ config GCC_PLUGIN_LATENT_ENTROPY
-	  is some slowdown of the boot process (about 0.5%) and fork and
-	  irq processing.
-
-+	  When extra_latent_entropy is passed on the kernel command line,
-+	  entropy will be extracted from up to the first 4GB of RAM while the
-+	  runtime memory allocator is being initialized.  This costs even more
-+	  slowdown of the boot process.
-+
-	  Note that entropy extracted this way is not cryptographically
-	  secure!
-
-@@ -747,7 +752,7 @@ config ARCH_MMAP_RND_BITS
-	int "Number of bits to use for ASLR of mmap base address" if EXPERT
-	range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX
-	default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT
--	default ARCH_MMAP_RND_BITS_MIN
-+	default ARCH_MMAP_RND_BITS_MAX
-	depends on HAVE_ARCH_MMAP_RND_BITS
-	help
-	  This value can be used to select the number of bits to use to
-@@ -781,7 +786,7 @@ config ARCH_MMAP_RND_COMPAT_BITS
-	int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT
-	range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX
-	default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT
--	default ARCH_MMAP_RND_COMPAT_BITS_MIN
-+	default ARCH_MMAP_RND_COMPAT_BITS_MAX
-	depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
-	help
-	  This value can be used to select the number of bits to use to
-@@ -968,6 +973,7 @@ config ARCH_HAS_REFCOUNT
-
- config REFCOUNT_FULL
-	bool "Perform full reference count validation at the expense of speed"
-+	default y
-	help
-	  Enabling this switches the refcounting infrastructure from a fast
-	  unchecked atomic_t implementation to a fully state checked
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index be665760f2bd..5fb9026c9762 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -988,6 +988,7 @@ endif
-
- config ARM64_SW_TTBR0_PAN
-	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
-+	default y
-	help
-	  Enabling this option prevents the kernel from accessing
-	  user-space memory directly by pointing TTBR0_EL1 to a reserved
-@@ -1141,6 +1142,7 @@ config RANDOMIZE_BASE
-	bool "Randomize the address of the kernel image"
-	select ARM64_MODULE_PLTS if MODULES
-	select RELOCATABLE
-+	default y
-	help
-	  Randomizes the virtual address at which the kernel image is
-	  loaded, as a security feature that deters exploit attempts
-diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
-index cc6bd559af85..01d5442d4722 100644
---- a/arch/arm64/Kconfig.debug
-+++ b/arch/arm64/Kconfig.debug
-@@ -45,6 +45,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
- config DEBUG_WX
-	bool "Warn on W+X mappings at boot"
-	select ARM64_PTDUMP_CORE
-+	default y
-	---help---
-	  Generate a warning if any W+X mappings are found at boot.
-
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 634b373785c4..5b255a6db6a7 100644
---- a/arch/arm64/configs/defconfig
-+++ b/arch/arm64/configs/defconfig
-@@ -1,4 +1,3 @@
--CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_AUDIT=y
- CONFIG_NO_HZ_IDLE=y
-diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
-index fac1c4de7898..34786ca166e4 100644
---- a/arch/arm64/include/asm/elf.h
-+++ b/arch/arm64/include/asm/elf.h
-@@ -114,10 +114,10 @@
-
- /*
-  * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is above 4GB to leave the entire 32-bit address
-+ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-  * space open for things that want to use the area for 32-bit pointers.
-  */
--#define ELF_ET_DYN_BASE		(2 * TASK_SIZE_64 / 3)
-+#define ELF_ET_DYN_BASE		0x100000000UL
-
- #ifndef __ASSEMBLY__
-
-@@ -158,10 +158,10 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
- /* 1GB of VA */
- #ifdef CONFIG_COMPAT
- #define STACK_RND_MASK			(test_thread_flag(TIF_32BIT) ? \
--						0x7ff >> (PAGE_SHIFT - 12) : \
--						0x3ffff >> (PAGE_SHIFT - 12))
-+						((1UL << mmap_rnd_compat_bits) - 1) >> (PAGE_SHIFT - 12) : \
-+						((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
- #else
--#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))
-+#define STACK_RND_MASK			(((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
- #endif
-
- #ifdef __AARCH64EB__
-diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
-index c0da6efe5465..f308b521c114 100644
---- a/arch/arm64/kernel/process.c
-+++ b/arch/arm64/kernel/process.c
-@@ -481,9 +481,9 @@ unsigned long arch_align_stack(unsigned long sp)
- unsigned long arch_randomize_brk(struct mm_struct *mm)
- {
-	if (is_compat_task())
--		return randomize_page(mm->brk, SZ_32M);
-+		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
-	else
--		return randomize_page(mm->brk, SZ_1G);
-+		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
- }
-
- /*
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 0fa71a78ec99..d78d44944374 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -1208,8 +1208,7 @@ config VM86
-        default X86_LEGACY_VM86
-
- config X86_16BIT
--	bool "Enable support for 16-bit segments" if EXPERT
--	default y
-+	bool "Enable support for 16-bit segments"
-	depends on MODIFY_LDT_SYSCALL
-	---help---
-	  This option is required by programs like Wine to run 16-bit
-@@ -2299,7 +2298,7 @@ config COMPAT_VDSO
- choice
-	prompt "vsyscall table for legacy applications"
-	depends on X86_64
--	default LEGACY_VSYSCALL_EMULATE
-+	default LEGACY_VSYSCALL_NONE
-	help
-	  Legacy user code that does not know how to find the vDSO expects
-	  to be able to issue three syscalls by calling fixed addresses in
-@@ -2380,8 +2379,7 @@ config CMDLINE_OVERRIDE
-	  be set to 'N' under normal conditions.
-
- config MODIFY_LDT_SYSCALL
--	bool "Enable the LDT (local descriptor table)" if EXPERT
--	default y
-+	bool "Enable the LDT (local descriptor table)"
-	---help---
-	  Linux can allow user programs to install a per-process x86
-	  Local Descriptor Table (LDT) using the modify_ldt(2) system
-diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 192e4d2f9efc..343c2f1b13da 100644
---- a/arch/x86/Kconfig.debug
-+++ b/arch/x86/Kconfig.debug
-@@ -101,6 +101,7 @@ config EFI_PGT_DUMP
- config DEBUG_WX
-	bool "Warn on W+X mappings at boot"
-	select X86_PTDUMP_CORE
-+	default y
-	---help---
-	  Generate a warning if any W+X mappings are found at boot.
-
-diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
-index e32fc1f274d8..d08acc76502a 100644
---- a/arch/x86/configs/x86_64_defconfig
-+++ b/arch/x86/configs/x86_64_defconfig
-@@ -1,5 +1,4 @@
- # CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SYSVIPC=y
- CONFIG_POSIX_MQUEUE=y
- CONFIG_BSD_PROCESS_ACCT=y
- CONFIG_TASKSTATS=y
-diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
-index 5b8b556dbb12..a569f08b4478 100644
---- a/arch/x86/entry/vdso/vma.c
-+++ b/arch/x86/entry/vdso/vma.c
-@@ -204,55 +204,9 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
- }
-
- #ifdef CONFIG_X86_64
--/*
-- * Put the vdso above the (randomized) stack with another randomized
-- * offset.  This way there is no hole in the middle of address space.
-- * To save memory make sure it is still in the same PTE as the stack
-- * top.  This doesn't give that many random bits.
-- *
-- * Note that this algorithm is imperfect: the distribution of the vdso
-- * start address within a PMD is biased toward the end.
-- *
-- * Only used for the 64-bit and x32 vdsos.
-- */
--static unsigned long vdso_addr(unsigned long start, unsigned len)
--{
--	unsigned long addr, end;
--	unsigned offset;
--
--	/*
--	 * Round up the start address.  It can start out unaligned as a result
--	 * of stack start randomization.
--	 */
--	start = PAGE_ALIGN(start);
--
--	/* Round the lowest possible end address up to a PMD boundary. */
--	end = (start + len + PMD_SIZE - 1) & PMD_MASK;
--	if (end >= TASK_SIZE_MAX)
--		end = TASK_SIZE_MAX;
--	end -= len;
--
--	if (end > start) {
--		offset = get_random_int() % (((end - start) >> PAGE_SHIFT) + 1);
--		addr = start + (offset << PAGE_SHIFT);
--	} else {
--		addr = start;
--	}
--
--	/*
--	 * Forcibly align the final address in case we have a hardware
--	 * issue that requires alignment for performance reasons.
--	 */
--	addr = align_vdso_addr(addr);
--
--	return addr;
--}
--
- static int map_vdso_randomized(const struct vdso_image *image)
- {
--	unsigned long addr = vdso_addr(current->mm->start_stack, image->size-image->sym_vvar_start);
--
--	return map_vdso(image, addr);
-+	return map_vdso(image, 0);
- }
- #endif
-
-diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 0d157d2a1e2a..770c8ae97f92 100644
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
-@@ -249,11 +249,11 @@ extern int force_personality32;
-
- /*
-  * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is above 4GB to leave the entire 32-bit address
-+ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-  * space open for things that want to use the area for 32-bit pointers.
-  */
- #define ELF_ET_DYN_BASE		(mmap_is_ia32() ? 0x000400000UL : \
--						  (DEFAULT_MAP_WINDOW / 3 * 2))
-+						  0x100000000UL)
-
- /* This yields a mask that user programs can use to figure out what
-    instruction set this CPU supports.  This could be done in user space,
-@@ -313,8 +313,8 @@ extern bool mmap_address_hint_valid(unsigned long addr, unsigned long len);
-
- #ifdef CONFIG_X86_32
-
--#define __STACK_RND_MASK(is32bit) (0x7ff)
--#define STACK_RND_MASK (0x7ff)
-+#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
-+#define STACK_RND_MASK ((1UL << mmap_rnd_bits) - 1)
-
- #define ARCH_DLINFO		ARCH_DLINFO_IA32
-
-@@ -323,7 +323,11 @@ extern bool mmap_address_hint_valid(unsigned long addr, unsigned long len);
- #else /* CONFIG_X86_32 */
-
- /* 1GB for 64bit, 8MB for 32bit */
--#define __STACK_RND_MASK(is32bit) ((is32bit) ? 0x7ff : 0x3fffff)
-+#ifdef CONFIG_COMPAT
-+#define __STACK_RND_MASK(is32bit) ((is32bit) ? (1UL << mmap_rnd_compat_bits) - 1 : (1UL << mmap_rnd_bits) - 1)
-+#else
-+#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
-+#endif
- #define STACK_RND_MASK __STACK_RND_MASK(mmap_is_ia32())
-
- #define ARCH_DLINFO							\
-@@ -381,5 +385,4 @@ struct va_alignment {
- } ____cacheline_aligned;
-
- extern struct va_alignment va_align;
--extern unsigned long align_vdso_addr(unsigned long);
- #endif /* _ASM_X86_ELF_H */
-diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
-index 84137c22fdfa..4f197404cab9 100644
---- a/arch/x86/include/asm/tlbflush.h
-+++ b/arch/x86/include/asm/tlbflush.h
-@@ -261,6 +261,7 @@ static inline void cr4_set_bits(unsigned long mask)
-
-	local_irq_save(flags);
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	if ((cr4 | mask) != cr4)
-		__cr4_set(cr4 | mask);
-	local_irq_restore(flags);
-@@ -273,6 +274,7 @@ static inline void cr4_clear_bits(unsigned long mask)
-
-	local_irq_save(flags);
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	if ((cr4 & ~mask) != cr4)
-		__cr4_set(cr4 & ~mask);
-	local_irq_restore(flags);
-@@ -283,6 +285,7 @@ static inline void cr4_toggle_bits_irqsoff(unsigned long mask)
-	unsigned long cr4;
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+        BUG_ON(cr4 != __read_cr4());
-	__cr4_set(cr4 ^ mask);
- }
-
-@@ -389,6 +392,7 @@ static inline void __native_flush_tlb_global(void)
-	raw_local_irq_save(flags);
-
-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
-+	BUG_ON(cr4 != __read_cr4());
-	/* toggle PGE */
-	native_write_cr4(cr4 ^ X86_CR4_PGE);
-	/* write old PGE again and flush TLBs */
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 5f74f94244e1..9c9fdb5ef52e 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -1662,7 +1662,6 @@ void cpu_init(void)
-	wrmsrl(MSR_KERNEL_GS_BASE, 0);
-	barrier();
-
--	x86_configure_nx();
-	x2apic_setup();
-
-	/*
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 30ca2d1a9231..bde0a18cd9f9 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -39,6 +39,8 @@
- #include <asm/desc.h>
- #include <asm/prctl.h>
- #include <asm/spec-ctrl.h>
-+#include <asm/elf.h>
-+#include <linux/sizes.h>
-
- /*
-  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
-@@ -718,7 +720,10 @@ unsigned long arch_align_stack(unsigned long sp)
-
- unsigned long arch_randomize_brk(struct mm_struct *mm)
- {
--	return randomize_page(mm->brk, 0x02000000);
-+	if (mmap_is_ia32())
-+		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
-+	else
-+		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
- }
-
- /*
-diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
-index 676774b9bb8d..5ad7a95382b0 100644
---- a/arch/x86/kernel/sys_x86_64.c
-+++ b/arch/x86/kernel/sys_x86_64.c
-@@ -54,13 +54,6 @@ static unsigned long get_align_bits(void)
-	return va_align.bits & get_align_mask();
- }
-
--unsigned long align_vdso_addr(unsigned long addr)
--{
--	unsigned long align_mask = get_align_mask();
--	addr = (addr + align_mask) & ~align_mask;
--	return addr | get_align_bits();
--}
--
- static int __init control_va_addr_alignment(char *str)
- {
-	/* guard against enabling this on other CPU families */
-@@ -122,10 +115,7 @@ static void find_start_end(unsigned long addr, unsigned long flags,
-	}
-
-	*begin	= get_mmap_base(1);
--	if (in_compat_syscall())
--		*end = task_size_32bit();
--	else
--		*end = task_size_64bit(addr > DEFAULT_MAP_WINDOW);
-+	*end	= get_mmap_base(0);
- }
-
- unsigned long
-@@ -210,7 +200,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
-
-	info.flags = VM_UNMAPPED_AREA_TOPDOWN;
-	info.length = len;
--	info.low_limit = PAGE_SIZE;
-+	info.low_limit = get_mmap_base(1);
-	info.high_limit = get_mmap_base(0);
-
-	/*
-diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 396e1f0151ac..6526b19579dc 100644
---- a/arch/x86/mm/init_32.c
-+++ b/arch/x86/mm/init_32.c
-@@ -558,7 +558,7 @@ static void __init pagetable_init(void)
-	permanent_kmaps_init(pgd_base);
- }
-
--pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
-+pteval_t __supported_pte_mask __ro_after_init = ~(_PAGE_NX | _PAGE_GLOBAL);
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
-
- /* user-defined highmem size */
-@@ -866,7 +866,7 @@ int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
- #endif
- #endif
-
--int kernel_set_to_readonly __read_mostly;
-+int kernel_set_to_readonly __ro_after_init;
-
- void set_kernel_text_rw(void)
- {
-@@ -918,12 +918,11 @@ void mark_rodata_ro(void)
-	unsigned long start = PFN_ALIGN(_text);
-	unsigned long size = PFN_ALIGN(_etext) - start;
-
-+	kernel_set_to_readonly = 1;
-	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
-	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
-		size >> 10);
-
--	kernel_set_to_readonly = 1;
--
- #ifdef CONFIG_CPA_DEBUG
-	printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
-		start, start+size);
-diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index af11a2890235..b2d28d38c01e 100644
---- a/arch/x86/mm/init_64.c
-+++ b/arch/x86/mm/init_64.c
-@@ -65,7 +65,7 @@
-  * around without checking the pgd every time.
-  */
-
--pteval_t __supported_pte_mask __read_mostly = ~0;
-+pteval_t __supported_pte_mask __ro_after_init = ~0;
- EXPORT_SYMBOL_GPL(__supported_pte_mask);
-
- int force_personality32;
-@@ -1195,7 +1195,7 @@ void __init mem_init(void)
-	mem_init_print_info(NULL);
- }
-
--int kernel_set_to_readonly;
-+int kernel_set_to_readonly __ro_after_init;
-
- void set_kernel_text_rw(void)
- {
-@@ -1244,9 +1244,8 @@ void mark_rodata_ro(void)
-
-	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
-	       (end - start) >> 10);
--	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
--
-	kernel_set_to_readonly = 1;
-+	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
-
-	/*
-	 * The rodata/data/bss/brk section (but not the kernel text!)
-diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 01e2b353a2b9..9aeddca4a29f 100644
---- a/block/blk-softirq.c
-+++ b/block/blk-softirq.c
-@@ -20,7 +20,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
-  * Softirq action handler - move entries to local list and loop over them
-  * while passing them to the queue registered handler.
-  */
--static __latent_entropy void blk_done_softirq(struct softirq_action *h)
-+static __latent_entropy void blk_done_softirq(void)
- {
-	struct list_head *cpu_list, local_list;
-
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 0df21f046fc6..6f8d9bf71bba 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -5151,7 +5151,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
-	struct ata_port *ap;
-	unsigned int tag;
-
--	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-+	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-	ap = qc->ap;
-
-	qc->flags = 0;
-@@ -5168,7 +5168,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
-	struct ata_port *ap;
-	struct ata_link *link;
-
--	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-+	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
-	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
-	ap = qc->ap;
-	link = qc->dev->link;
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index c28dca0c613d..d4813f0d25ca 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -9,7 +9,6 @@ source "drivers/tty/Kconfig"
-
- config DEVMEM
-	bool "/dev/mem virtual device support"
--	default y
-	help
-	  Say Y here if you want to support the /dev/mem device.
-	  The /dev/mem device is used to access areas of physical
-@@ -568,7 +567,6 @@ config TELCLOCK
- config DEVPORT
-	bool "/dev/port character device"
-	depends on ISA || PCI
--	default y
-	help
-	  Say Y here if you want to support the /dev/port device. The /dev/port
-	  device is similar to /dev/mem, but for I/O ports.
-diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
-index b811442c5ce6..4f62a63cbcb1 100644
---- a/drivers/tty/Kconfig
-+++ b/drivers/tty/Kconfig
-@@ -122,7 +122,6 @@ config UNIX98_PTYS
-
- config LEGACY_PTYS
-	bool "Legacy (BSD) PTY support"
--	default y
-	---help---
-	  A pseudo terminal (PTY) is a software device consisting of two
-	  halves: a master and a slave. The slave device behaves identical to
-diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 83c58a20d16f..32ef2e3a8482 100644
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -41,6 +41,8 @@
- #define USB_TP_TRANSMISSION_DELAY	40	/* ns */
- #define USB_TP_TRANSMISSION_DELAY_MAX	65535	/* ns */
-
-+extern int deny_new_usb;
-+
- /* Protect struct usb_device->state and ->children members
-  * Note: Both are also protected by ->dev.sem, except that ->state can
-  * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
-@@ -4847,6 +4849,12 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
-			goto done;
-		return;
-	}
-+
-+	if (deny_new_usb) {
-+		dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
-+		goto done;
-+	}
-+
-	if (hub_is_superspeed(hub->hdev))
-		unit_load = 150;
-	else
-diff --git a/fs/exec.c b/fs/exec.c
-index 7eb8d21bcab9..171f31b3bf05 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -62,6 +62,7 @@
- #include <linux/oom.h>
- #include <linux/compat.h>
- #include <linux/vmalloc.h>
-+#include <linux/random.h>
-
- #include <linux/uaccess.h>
- #include <asm/mmu_context.h>
-@@ -321,6 +322,8 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
-	arch_bprm_mm_init(mm, vma);
-	up_write(&mm->mmap_sem);
-	bprm->p = vma->vm_end - sizeof(void *);
-+	if (randomize_va_space)
-+		bprm->p ^= get_random_int() & ~PAGE_MASK;
-	return 0;
- err:
-	up_write(&mm->mmap_sem);
-diff --git a/fs/namei.c b/fs/namei.c
-index b61d6aa9279d..255c2dc36189 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -883,8 +883,8 @@ static inline void put_link(struct nameidata *nd)
-		path_put(&last->link);
- }
-
--int sysctl_protected_symlinks __read_mostly = 0;
--int sysctl_protected_hardlinks __read_mostly = 0;
-+int sysctl_protected_symlinks __read_mostly = 1;
-+int sysctl_protected_hardlinks __read_mostly = 1;
-
- /**
-  * may_follow_link - Check symlink following for unsafe situations
-diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
-index 5f93cfacb3d1..cea0d7d3b23e 100644
---- a/fs/nfs/Kconfig
-+++ b/fs/nfs/Kconfig
-@@ -195,4 +195,3 @@ config NFS_DEBUG
-	bool
-	depends on NFS_FS && SUNRPC_DEBUG
-	select CRC32
--	default y
-diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
-index 1ade1206bb89..60b0f76dec47 100644
---- a/fs/proc/Kconfig
-+++ b/fs/proc/Kconfig
-@@ -39,7 +39,6 @@ config PROC_KCORE
- config PROC_VMCORE
-	bool "/proc/vmcore support"
-	depends on PROC_FS && CRASH_DUMP
--	default y
-         help
-         Exports the dump image of crashed kernel in ELF format.
-
-diff --git a/fs/stat.c b/fs/stat.c
-index 873785dae022..d3c2ada8b9c7 100644
---- a/fs/stat.c
-+++ b/fs/stat.c
-@@ -40,8 +40,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
-	stat->gid = inode->i_gid;
-	stat->rdev = inode->i_rdev;
-	stat->size = i_size_read(inode);
--	stat->atime = inode->i_atime;
--	stat->mtime = inode->i_mtime;
-+	if (is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
-+		stat->atime = inode->i_ctime;
-+		stat->mtime = inode->i_ctime;
-+	} else {
-+		stat->atime = inode->i_atime;
-+		stat->mtime = inode->i_mtime;
-+	}
-	stat->ctime = inode->i_ctime;
-	stat->blksize = i_blocksize(inode);
-	stat->blocks = inode->i_blocks;
-@@ -75,9 +80,14 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
-	stat->result_mask |= STATX_BASIC_STATS;
-	request_mask &= STATX_ALL;
-	query_flags &= KSTAT_QUERY_FLAGS;
--	if (inode->i_op->getattr)
--		return inode->i_op->getattr(path, stat, request_mask,
--					    query_flags);
-+	if (inode->i_op->getattr) {
-+		int retval = inode->i_op->getattr(path, stat, request_mask, query_flags);
-+		if (!retval && is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
-+			stat->atime = stat->ctime;
-+			stat->mtime = stat->ctime;
-+		}
-+		return retval;
-+	}
-
-	generic_fillattr(inode, stat);
-	return 0;
-diff --git a/include/linux/cache.h b/include/linux/cache.h
-index 750621e41d1c..e7157c18c62c 100644
---- a/include/linux/cache.h
-+++ b/include/linux/cache.h
-@@ -31,6 +31,8 @@
- #define __ro_after_init __attribute__((__section__(".data..ro_after_init")))
- #endif
-
-+#define __read_only __ro_after_init
-+
- #ifndef ____cacheline_aligned
- #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
- #endif
-diff --git a/include/linux/capability.h b/include/linux/capability.h
-index f640dcbc880c..2b4f5d651f19 100644
---- a/include/linux/capability.h
-+++ b/include/linux/capability.h
-@@ -207,6 +207,7 @@ extern bool has_capability_noaudit(struct task_struct *t, int cap);
- extern bool has_ns_capability_noaudit(struct task_struct *t,
-				      struct user_namespace *ns, int cap);
- extern bool capable(int cap);
-+extern bool capable_noaudit(int cap);
- extern bool ns_capable(struct user_namespace *ns, int cap);
- extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
- #else
-@@ -232,6 +233,10 @@ static inline bool capable(int cap)
- {
-	return true;
- }
-+static inline bool capable_noaudit(int cap)
-+{
-+	return true;
-+}
- static inline bool ns_capable(struct user_namespace *ns, int cap)
- {
-	return true;
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index c6baf767619e..31904f3d38a6 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -3407,4 +3407,15 @@ static inline bool dir_relax_shared(struct inode *inode)
- extern bool path_noexec(const struct path *path);
- extern void inode_nohighmem(struct inode *inode);
-
-+extern int device_sidechannel_restrict;
-+
-+static inline bool is_sidechannel_device(const struct inode *inode)
-+{
-+	umode_t mode;
-+	if (!device_sidechannel_restrict)
-+		return false;
-+	mode = inode->i_mode;
-+	return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
-+}
-+
- #endif /* _LINUX_FS_H */
-diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
-index bdaf22582f6e..326ff15d4637 100644
---- a/include/linux/fsnotify.h
-+++ b/include/linux/fsnotify.h
-@@ -181,6 +181,9 @@ static inline void fsnotify_access(struct file *file)
-	struct inode *inode = path->dentry->d_inode;
-	__u32 mask = FS_ACCESS;
-
-+	if (is_sidechannel_device(inode))
-+		return;
-+
-	if (S_ISDIR(inode->i_mode))
-		mask |= FS_ISDIR;
-
-@@ -199,6 +202,9 @@ static inline void fsnotify_modify(struct file *file)
-	struct inode *inode = path->dentry->d_inode;
-	__u32 mask = FS_MODIFY;
-
-+	if (is_sidechannel_device(inode))
-+		return;
-+
-	if (S_ISDIR(inode->i_mode))
-		mask |= FS_ISDIR;
-
-diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index 1a4582b44d32..4d445a8fe7f2 100644
---- a/include/linux/gfp.h
-+++ b/include/linux/gfp.h
-@@ -513,9 +513,9 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
- extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
- extern unsigned long get_zeroed_page(gfp_t gfp_mask);
-
--void *alloc_pages_exact(size_t size, gfp_t gfp_mask);
-+void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
- void free_pages_exact(void *virt, size_t size);
--void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);
-+void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
-
- #define __get_free_page(gfp_mask) \
-		__get_free_pages((gfp_mask), 0)
-diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 776f90f3a1cd..3f5c47000059 100644
---- a/include/linux/highmem.h
-+++ b/include/linux/highmem.h
-@@ -191,6 +191,13 @@ static inline void clear_highpage(struct page *page)
-	kunmap_atomic(kaddr);
- }
-
-+static inline void verify_zero_highpage(struct page *page)
-+{
-+	void *kaddr = kmap_atomic(page);
-+	BUG_ON(memchr_inv(kaddr, 0, PAGE_SIZE));
-+	kunmap_atomic(kaddr);
-+}
-+
- static inline void zero_user_segments(struct page *page,
-	unsigned start1, unsigned end1,
-	unsigned start2, unsigned end2)
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 69c238210325..ee487ea4f48f 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -485,7 +485,7 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
-
- struct softirq_action
- {
--	void	(*action)(struct softirq_action *);
-+	void	(*action)(void);
- };
-
- asmlinkage void do_softirq(void);
-@@ -500,7 +500,7 @@ static inline void do_softirq_own_stack(void)
- }
- #endif
-
--extern void open_softirq(int nr, void (*action)(struct softirq_action *));
-+extern void __init open_softirq(int nr, void (*action)(void));
- extern void softirq_init(void);
- extern void __raise_softirq_irqoff(unsigned int nr);
-
-diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
-index 069aa2ebef90..cb9e3637a620 100644
---- a/include/linux/kobject_ns.h
-+++ b/include/linux/kobject_ns.h
-@@ -45,7 +45,7 @@ struct kobj_ns_type_operations {
-	void (*drop_ns)(void *);
- };
-
--int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
-+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
- int kobj_ns_type_registered(enum kobj_ns_type type);
- const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent);
- const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj);
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index a4e9bdbec490..0fe7ebd0f462 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -535,7 +535,7 @@ static inline int is_vmalloc_or_module_addr(const void *x)
- }
- #endif
-
--extern void *kvmalloc_node(size_t size, gfp_t flags, int node);
-+extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __attribute__((alloc_size(1)));
- static inline void *kvmalloc(size_t size, gfp_t flags)
- {
-	return kvmalloc_node(size, flags, NUMA_NO_NODE);
-diff --git a/include/linux/percpu.h b/include/linux/percpu.h
-index 296bbe49d5d1..b26652c9a98d 100644
---- a/include/linux/percpu.h
-+++ b/include/linux/percpu.h
-@@ -129,7 +129,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
-				pcpu_fc_populate_pte_fn_t populate_pte_fn);
- #endif
-
--extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
-+extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
- extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
- extern bool is_kernel_percpu_address(unsigned long addr);
-
-@@ -137,8 +137,8 @@ extern bool is_kernel_percpu_address(unsigned long addr);
- extern void __init setup_per_cpu_areas(void);
- #endif
-
--extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp);
--extern void __percpu *__alloc_percpu(size_t size, size_t align);
-+extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __attribute__((alloc_size(1)));
-+extern void __percpu *__alloc_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
- extern void free_percpu(void __percpu *__pdata);
- extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
-
-diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index 7546822a1d74..320033b310d2 100644
---- a/include/linux/perf_event.h
-+++ b/include/linux/perf_event.h
-@@ -1151,6 +1151,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
- int perf_event_max_stack_handler(struct ctl_table *table, int write,
-				 void __user *buffer, size_t *lenp, loff_t *ppos);
-
-+static inline bool perf_paranoid_any(void)
-+{
-+	return sysctl_perf_event_paranoid > 2;
-+}
-+
- static inline bool perf_paranoid_tracepoint_raw(void)
- {
-	return sysctl_perf_event_paranoid > -1;
-diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 231abc8976c5..b0bf5d4a4934 100644
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -177,8 +177,8 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *);
- /*
-  * Common kmalloc functions provided by all allocators
-  */
--void * __must_check __krealloc(const void *, size_t, gfp_t);
--void * __must_check krealloc(const void *, size_t, gfp_t);
-+void * __must_check __krealloc(const void *, size_t, gfp_t) __attribute__((alloc_size(2)));
-+void * __must_check krealloc(const void *, size_t, gfp_t) __attribute((alloc_size(2)));
- void kfree(const void *);
- void kzfree(const void *);
- size_t ksize(const void *);
-@@ -351,7 +351,7 @@ static __always_inline int kmalloc_index(size_t size)
- }
- #endif /* !CONFIG_SLOB */
-
--void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc;
-+void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
- void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags) __assume_slab_alignment __malloc;
- void kmem_cache_free(struct kmem_cache *, void *);
-
-@@ -375,7 +375,7 @@ static __always_inline void kfree_bulk(size_t size, void **p)
- }
-
- #ifdef CONFIG_NUMA
--void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc;
-+void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
- void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node) __assume_slab_alignment __malloc;
- #else
- static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
-@@ -497,7 +497,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
-  * for general use, and so are not documented here. For a full list of
-  * potential flags, always refer to linux/gfp.h.
-  */
--static __always_inline void *kmalloc(size_t size, gfp_t flags)
-+static __always_inline __attribute__((alloc_size(1))) void *kmalloc(size_t size, gfp_t flags)
- {
-	if (__builtin_constant_p(size)) {
-		if (size > KMALLOC_MAX_CACHE_SIZE)
-@@ -537,7 +537,7 @@ static __always_inline int kmalloc_size(int n)
-	return 0;
- }
-
--static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
-+static __always_inline __attribute__((alloc_size(1))) void *kmalloc_node(size_t size, gfp_t flags, int node)
- {
- #ifndef CONFIG_SLOB
-	if (__builtin_constant_p(size) &&
-diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index 8ad99c47b19c..91fea0d0db3b 100644
---- a/include/linux/slub_def.h
-+++ b/include/linux/slub_def.h
-@@ -120,6 +120,11 @@ struct kmem_cache {
-	unsigned long random;
- #endif
-
-+#ifdef CONFIG_SLAB_CANARY
-+	unsigned long random_active;
-+	unsigned long random_inactive;
-+#endif
-+
- #ifdef CONFIG_NUMA
-	/*
-	 * Defragmentation by allocating from a remote node.
-diff --git a/include/linux/string.h b/include/linux/string.h
-index dd39a690c841..00d16d874c0a 100644
---- a/include/linux/string.h
-+++ b/include/linux/string.h
-@@ -235,10 +235,16 @@ void __read_overflow2(void) __compiletime_error("detected read beyond size of ob
- void __read_overflow3(void) __compiletime_error("detected read beyond size of object passed as 3rd parameter");
- void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter");
-
-+#ifdef CONFIG_FORTIFY_SOURCE_STRICT_STRING
-+#define __string_size(p) __builtin_object_size(p, 1)
-+#else
-+#define __string_size(p) __builtin_object_size(p, 0)
-+#endif
-+
- #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
- __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	if (__builtin_constant_p(size) && p_size < size)
-		__write_overflow();
-	if (p_size < size)
-@@ -248,7 +254,7 @@ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
-
- __FORTIFY_INLINE char *strcat(char *p, const char *q)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	if (p_size == (size_t)-1)
-		return __builtin_strcat(p, q);
-	if (strlcat(p, q, p_size) >= p_size)
-@@ -259,7 +265,7 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q)
- __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
- {
-	__kernel_size_t ret;
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-
-	/* Work around gcc excess stack consumption issue */
-	if (p_size == (size_t)-1 ||
-@@ -274,7 +280,7 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
- extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen);
- __FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen)
- {
--	size_t p_size = __builtin_object_size(p, 0);
-+	size_t p_size = __string_size(p);
-	__kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size);
-	if (p_size <= ret && maxlen != ret)
-		fortify_panic(__func__);
-@@ -286,8 +292,8 @@ extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy);
- __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
- {
-	size_t ret;
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __real_strlcpy(p, q, size);
-	ret = strlen(q);
-@@ -307,8 +313,8 @@ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
- __FORTIFY_INLINE char *strncat(char *p, const char *q, __kernel_size_t count)
- {
-	size_t p_len, copy_len;
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __builtin_strncat(p, q, count);
-	p_len = strlen(p);
-@@ -421,8 +427,8 @@ __FORTIFY_INLINE void *kmemdup(const void *p, size_t size, gfp_t gfp)
- /* defined after fortified strlen and memcpy to reuse them */
- __FORTIFY_INLINE char *strcpy(char *p, const char *q)
- {
--	size_t p_size = __builtin_object_size(p, 0);
--	size_t q_size = __builtin_object_size(q, 0);
-+	size_t p_size = __string_size(p);
-+	size_t q_size = __string_size(q);
-	if (p_size == (size_t)-1 && q_size == (size_t)-1)
-		return __builtin_strcpy(p, q);
-	memcpy(p, q, strlen(q) + 1);
-diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 1e5d8c392f15..66d0e49c9987 100644
---- a/include/linux/vmalloc.h
-+++ b/include/linux/vmalloc.h
-@@ -68,19 +68,19 @@ static inline void vmalloc_init(void)
- }
- #endif
-
--extern void *vmalloc(unsigned long size);
--extern void *vzalloc(unsigned long size);
--extern void *vmalloc_user(unsigned long size);
--extern void *vmalloc_node(unsigned long size, int node);
--extern void *vzalloc_node(unsigned long size, int node);
--extern void *vmalloc_exec(unsigned long size);
--extern void *vmalloc_32(unsigned long size);
--extern void *vmalloc_32_user(unsigned long size);
--extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
-+extern void *vmalloc(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vzalloc(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_user(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
-+extern void *vzalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
-+extern void *vmalloc_exec(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_32(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *vmalloc_32_user(unsigned long size) __attribute__((alloc_size(1)));
-+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __attribute__((alloc_size(1)));
- extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
-			unsigned long start, unsigned long end, gfp_t gfp_mask,
-			pgprot_t prot, unsigned long vm_flags, int node,
--			const void *caller);
-+			const void *caller) __attribute__((alloc_size(1)));
- #ifndef CONFIG_MMU
- extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
- static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
-diff --git a/init/Kconfig b/init/Kconfig
-index e37f4b2a6445..49c20dea1afd 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -296,6 +296,7 @@ config USELIB
- config AUDIT
-	bool "Auditing support"
-	depends on NET
-+	default y
-	help
-	  Enable auditing infrastructure that can be used with another
-	  kernel subsystem, such as SELinux (which requires this for
-@@ -1039,6 +1040,12 @@ config CC_OPTIMIZE_FOR_SIZE
-
- endchoice
-
-+config LOCAL_INIT
-+	bool "Zero uninitialized locals"
-+	help
-+	  Zero-fill uninitialized local variables, other than variable-length
-+	  arrays. Requires compiler support.
-+
- config SYSCTL
-	bool
-
-@@ -1296,8 +1303,7 @@ config SHMEM
-	  which may be appropriate on small systems without swap.
-
- config AIO
--	bool "Enable AIO support" if EXPERT
--	default y
-+	bool "Enable AIO support"
-	help
-	  This option enables POSIX asynchronous I/O which may by used
-	  by some high performance threaded applications. Disabling
-@@ -1502,7 +1508,7 @@ config VM_EVENT_COUNTERS
-
- config SLUB_DEBUG
-	default y
--	bool "Enable SLUB debugging support" if EXPERT
-+	bool "Enable SLUB debugging support"
-	depends on SLUB && SYSFS
-	help
-	  SLUB has extensive debug support features. Disabling these can
-@@ -1526,7 +1532,6 @@ config SLUB_MEMCG_SYSFS_ON
-
- config COMPAT_BRK
-	bool "Disable heap randomization"
--	default y
-	help
-	  Randomizing heap placement makes heap exploits harder, but it
-	  also breaks ancient binaries (including anything libc5 based).
-@@ -1573,7 +1578,6 @@ endchoice
-
- config SLAB_MERGE_DEFAULT
-	bool "Allow slab caches to be merged"
--	default y
-	help
-	  For reduced kernel memory fragmentation, slab caches can be
-	  merged when they share the same size and other characteristics.
-@@ -1586,9 +1590,9 @@ config SLAB_MERGE_DEFAULT
-	  command line.
-
- config SLAB_FREELIST_RANDOM
--	default n
-	depends on SLAB || SLUB
-	bool "SLAB freelist randomization"
-+	default y
-	help
-	  Randomizes the freelist order used on creating new pages. This
-	  security feature reduces the predictability of the kernel slab
-@@ -1597,12 +1601,56 @@ config SLAB_FREELIST_RANDOM
- config SLAB_FREELIST_HARDENED
-	bool "Harden slab freelist metadata"
-	depends on SLUB
-+	default y
-	help
-	  Many kernel heap attacks try to target slab cache metadata and
-	  other infrastructure. This options makes minor performance
-	  sacrifies to harden the kernel slab allocator against common
-	  freelist exploit methods.
-
-+config SLAB_HARDENED
-+	default y
-+	depends on SLUB
-+	bool "Hardened SLAB infrastructure"
-+	help
-+          Make minor performance sacrifices to harden the kernel slab
-+          allocator.
-+
-+config SLAB_CANARY
-+	depends on SLUB
-+	depends on !SLAB_MERGE_DEFAULT
-+	bool "SLAB canaries"
-+	default y
-+	help
-+	  Place canaries at the end of kernel slab allocations, sacrificing
-+	  some performance and memory usage for security.
-+
-+	  Canaries can detect some forms of heap corruption when allocations
-+	  are freed and as part of the HARDENED_USERCOPY feature. It provides
-+	  basic use-after-free detection for HARDENED_USERCOPY.
-+
-+	  Canaries absorb small overflows (rendering them harmless), mitigate
-+	  non-NUL terminated C string overflows on 64-bit via a guaranteed zero
-+	  byte and provide basic double-free detection.
-+
-+config SLAB_SANITIZE
-+	bool "Sanitize SLAB allocations"
-+	depends on SLUB
-+	default y
-+	help
-+	  Zero fill slab allocations on free, reducing the lifetime of
-+	  sensitive data and helping to mitigate use-after-free bugs.
-+
-+	  For slabs with debug poisoning enabling, this has no impact.
-+
-+config SLAB_SANITIZE_VERIFY
-+	depends on SLAB_SANITIZE && PAGE_SANITIZE
-+	default y
-+	bool "Verify sanitized SLAB allocations"
-+	help
-+	  Verify that newly allocated slab allocations are zeroed to detect
-+	  write-after-free bugs.
-+
- config SLUB_CPU_PARTIAL
-	default y
-	depends on SLUB && SMP
-diff --git a/kernel/audit.c b/kernel/audit.c
-index 227db99b0f19..aec52b408543 100644
---- a/kernel/audit.c
-+++ b/kernel/audit.c
-@@ -1578,6 +1578,9 @@ static int __init audit_enable(char *str)
-
-	if (audit_default == AUDIT_OFF)
-		audit_initialized = AUDIT_DISABLED;
-+	else if (!audit_ever_enabled)
-+		audit_initialized = AUDIT_UNINITIALIZED;
-+
-	if (audit_set_enabled(audit_default))
-		panic("audit: error setting audit state (%d)\n", audit_default);
-
-diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
-index ba03ec39efb3..47ed9081b668 100644
---- a/kernel/bpf/core.c
-+++ b/kernel/bpf/core.c
-@@ -302,7 +302,7 @@ struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,
- #ifdef CONFIG_BPF_JIT
- /* All BPF JIT sysctl knobs here. */
- int bpf_jit_enable   __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON);
--int bpf_jit_harden   __read_mostly;
-+int bpf_jit_harden   __read_mostly = 2;
- int bpf_jit_kallsyms __read_mostly;
-
- static __always_inline void
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 43f95d190eea..8e353f596873 100644
---- a/kernel/bpf/syscall.c
-+++ b/kernel/bpf/syscall.c
-@@ -42,7 +42,7 @@ static DEFINE_SPINLOCK(prog_idr_lock);
- static DEFINE_IDR(map_idr);
- static DEFINE_SPINLOCK(map_idr_lock);
-
--int sysctl_unprivileged_bpf_disabled __read_mostly;
-+int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
-
- static const struct bpf_map_ops * const bpf_map_types[] = {
- #define BPF_PROG_TYPE(_id, _ops)
-diff --git a/kernel/capability.c b/kernel/capability.c
-index 1e1c0236f55b..452062fe45ce 100644
---- a/kernel/capability.c
-+++ b/kernel/capability.c
-@@ -431,6 +431,12 @@ bool capable(int cap)
-	return ns_capable(&init_user_ns, cap);
- }
- EXPORT_SYMBOL(capable);
-+
-+bool capable_noaudit(int cap)
-+{
-+	return ns_capable_noaudit(&init_user_ns, cap);
-+}
-+EXPORT_SYMBOL(capable_noaudit);
- #endif /* CONFIG_MULTIUSER */
-
- /**
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index ca7298760c83..910ac6cc9f07 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -397,8 +397,13 @@ static cpumask_var_t perf_online_mask;
-  *   0 - disallow raw tracepoint access for unpriv
-  *   1 - disallow cpu events for unpriv
-  *   2 - disallow kernel profiling for unpriv
-+ *   3 - disallow all unpriv perf event use
-  */
-+#ifdef CONFIG_SECURITY_PERF_EVENTS_RESTRICT
-+int sysctl_perf_event_paranoid __read_mostly = 3;
-+#else
- int sysctl_perf_event_paranoid __read_mostly = 2;
-+#endif
-
- /* Minimum for 512 kiB + 1 user control page */
- int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -9921,6 +9926,9 @@ SYSCALL_DEFINE5(perf_event_open,
-	if (flags & ~PERF_FLAG_ALL)
-		return -EINVAL;
-
-+	if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
-+		return -EACCES;
-+
-	err = perf_copy_attr(attr_uptr, &attr);
-	if (err)
-		return err;
-diff --git a/kernel/fork.c b/kernel/fork.c
-index e5d9d405ae4e..c4be89c51f25 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -103,6 +103,11 @@
-
- #define CREATE_TRACE_POINTS
- #include <trace/events/task.h>
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#else
-+#define unprivileged_userns_clone 0
-+#endif
-
- /*
-  * Minimum number of threads to boot the kernel
-@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process(
-	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
-		return ERR_PTR(-EINVAL);
-
-+	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
-+		if (!capable(CAP_SYS_ADMIN))
-+			return ERR_PTR(-EPERM);
-+
-	/*
-	 * Thread groups must share signals as well, and detached threads
-	 * can only be started up within the thread group.
-@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
-	if (unshare_flags & CLONE_NEWNS)
-		unshare_flags |= CLONE_FS;
-
-+	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
-+		err = -EPERM;
-+		if (!capable(CAP_SYS_ADMIN))
-+			goto bad_unshare_out;
-+	}
-+
-	err = check_unshare_flags(unshare_flags);
-	if (err)
-		goto bad_unshare_out;
-diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
-index 3d37c279c090..0789ca413f09 100644
---- a/kernel/power/snapshot.c
-+++ b/kernel/power/snapshot.c
-@@ -1138,7 +1138,7 @@ void free_basic_memory_bitmaps(void)
-
- void clear_free_pages(void)
- {
--#ifdef CONFIG_PAGE_POISONING_ZERO
-+#if defined(CONFIG_PAGE_POISONING_ZERO) || defined(CONFIG_PAGE_SANITIZE)
-	struct memory_bitmap *bm = free_pages_map;
-	unsigned long pfn;
-
-@@ -1155,7 +1155,7 @@ void clear_free_pages(void)
-	}
-	memory_bm_position_reset(bm);
-	pr_info("free pages cleared after restore\n");
--#endif /* PAGE_POISONING_ZERO */
-+#endif /* PAGE_POISONING_ZERO || PAGE_SANITIZE */
- }
-
- /**
-diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
-index a64eee0db39e..4d7de378fe4c 100644
---- a/kernel/rcu/tiny.c
-+++ b/kernel/rcu/tiny.c
-@@ -164,7 +164,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
-	}
- }
-
--static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
-+static __latent_entropy void rcu_process_callbacks(void)
- {
-	__rcu_process_callbacks(&rcu_sched_ctrlblk);
-	__rcu_process_callbacks(&rcu_bh_ctrlblk);
-diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 491bdf39f276..28f51c774671 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
-@@ -2906,7 +2906,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
- /*
-  * Do RCU core processing for the current CPU.
-  */
--static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
-+static __latent_entropy void rcu_process_callbacks(void)
- {
-	struct rcu_state *rsp;
-
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 5eb3ffc9be84..a60c59cbbaee 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -9387,7 +9387,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
-  * run_rebalance_domains is triggered when needed from the scheduler tick.
-  * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
-  */
--static __latent_entropy void run_rebalance_domains(struct softirq_action *h)
-+static __latent_entropy void run_rebalance_domains(void)
- {
-	struct rq *this_rq = this_rq();
-	enum cpu_idle_type idle = this_rq->idle_balance ?
-diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 24d243ef8e71..4ed8a162cd70 100644
---- a/kernel/softirq.c
-+++ b/kernel/softirq.c
-@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
- EXPORT_SYMBOL(irq_stat);
- #endif
-
--static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
-+static struct softirq_action softirq_vec[NR_SOFTIRQS] __ro_after_init __aligned(PAGE_SIZE);
-
- DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
-
-@@ -282,7 +282,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
-		kstat_incr_softirqs_this_cpu(vec_nr);
-
-		trace_softirq_entry(vec_nr);
--		h->action(h);
-+		h->action();
-		trace_softirq_exit(vec_nr);
-		if (unlikely(prev_count != preempt_count())) {
-			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-@@ -444,7 +444,7 @@ void __raise_softirq_irqoff(unsigned int nr)
-	or_softirq_pending(1UL << nr);
- }
-
--void open_softirq(int nr, void (*action)(struct softirq_action *))
-+void __init open_softirq(int nr, void (*action)(void))
- {
-	softirq_vec[nr].action = action;
- }
-@@ -486,7 +486,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
- }
- EXPORT_SYMBOL(__tasklet_hi_schedule);
-
--static __latent_entropy void tasklet_action(struct softirq_action *a)
-+static __latent_entropy void tasklet_action(void)
- {
-	struct tasklet_struct *list;
-
-@@ -522,7 +522,7 @@ static __latent_entropy void tasklet_action(struct softirq_action *a)
-	}
- }
-
--static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
-+static __latent_entropy void tasklet_hi_action(void)
- {
-	struct tasklet_struct *list;
-
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index f98f28c12020..861e8b721161 100644
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -99,12 +99,19 @@
- #if defined(CONFIG_SYSCTL)
-
- /* External variables not in a header file. */
-+#if IS_ENABLED(CONFIG_USB)
-+int deny_new_usb __read_mostly = 0;
-+EXPORT_SYMBOL(deny_new_usb);
-+#endif
- extern int suid_dumpable;
- #ifdef CONFIG_COREDUMP
- extern int core_uses_pid;
- extern char core_pattern[];
- extern unsigned int core_pipe_limit;
- #endif
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#endif
- extern int pid_max;
- extern int pid_max_min, pid_max_max;
- extern int percpu_pagelist_fraction;
-@@ -116,40 +123,43 @@ extern int sysctl_nr_trim_pages;
-
- /* Constants used for minimum and  maximum */
- #ifdef CONFIG_LOCKUP_DETECTOR
--static int sixty = 60;
-+static int sixty __read_only = 60;
- #endif
-
--static int __maybe_unused neg_one = -1;
-+static int __maybe_unused neg_one __read_only = -1;
-
- static int zero;
--static int __maybe_unused one = 1;
--static int __maybe_unused two = 2;
--static int __maybe_unused four = 4;
--static unsigned long one_ul = 1;
--static int one_hundred = 100;
--static int one_thousand = 1000;
-+static int __maybe_unused one __read_only = 1;
-+static int __maybe_unused two __read_only = 2;
-+static int __maybe_unused four __read_only = 4;
-+static unsigned long one_ul __read_only = 1;
-+static int one_hundred __read_only = 100;
-+static int one_thousand __read_only = 1000;
- #ifdef CONFIG_PRINTK
--static int ten_thousand = 10000;
-+static int ten_thousand __read_only = 10000;
- #endif
- #ifdef CONFIG_PERF_EVENTS
--static int six_hundred_forty_kb = 640 * 1024;
-+static int six_hundred_forty_kb __read_only = 640 * 1024;
- #endif
-
- /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
--static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
-+static unsigned long dirty_bytes_min __read_only = 2 * PAGE_SIZE;
-
- /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
--static int maxolduid = 65535;
--static int minolduid;
-+static int maxolduid __read_only = 65535;
-+static int minolduid __read_only;
-
--static int ngroups_max = NGROUPS_MAX;
-+static int ngroups_max __read_only = NGROUPS_MAX;
- static const int cap_last_cap = CAP_LAST_CAP;
-
- /*this is needed for proc_doulongvec_minmax of sysctl_hung_task_timeout_secs */
- #ifdef CONFIG_DETECT_HUNG_TASK
--static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
-+static unsigned long hung_task_timeout_max __read_only = (LONG_MAX/HZ);
- #endif
-
-+int device_sidechannel_restrict __read_mostly = 1;
-+EXPORT_SYMBOL(device_sidechannel_restrict);
-+
- #ifdef CONFIG_INOTIFY_USER
- #include <linux/inotify.h>
- #endif
-@@ -289,19 +299,19 @@ static struct ctl_table sysctl_base_table[] = {
- };
-
- #ifdef CONFIG_SCHED_DEBUG
--static int min_sched_granularity_ns = 100000;		/* 100 usecs */
--static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
--static int min_wakeup_granularity_ns;			/* 0 usecs */
--static int max_wakeup_granularity_ns = NSEC_PER_SEC;	/* 1 second */
-+static int min_sched_granularity_ns __read_only = 100000;		/* 100 usecs */
-+static int max_sched_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
-+static int min_wakeup_granularity_ns __read_only;			/* 0 usecs */
-+static int max_wakeup_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
- #ifdef CONFIG_SMP
--static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
--static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1;
-+static int min_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_NONE;
-+static int max_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_END-1;
- #endif /* CONFIG_SMP */
- #endif /* CONFIG_SCHED_DEBUG */
-
- #ifdef CONFIG_COMPACTION
--static int min_extfrag_threshold;
--static int max_extfrag_threshold = 1000;
-+static int min_extfrag_threshold __read_only;
-+static int max_extfrag_threshold __read_only = 1000;
- #endif
-
- static struct ctl_table kern_table[] = {
-@@ -515,6 +525,15 @@ static struct ctl_table kern_table[] = {
-		.proc_handler	= proc_dointvec,
-	},
- #endif
-+#ifdef CONFIG_USER_NS
-+	{
-+		.procname	= "unprivileged_userns_clone",
-+		.data		= &unprivileged_userns_clone,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec,
-+	},
-+#endif
- #ifdef CONFIG_PROC_SYSCTL
-	{
-		.procname	= "tainted",
-@@ -856,6 +875,26 @@ static struct ctl_table kern_table[] = {
-		.extra1		= &zero,
-		.extra2		= &two,
-	},
-+#endif
-+	{
-+		.procname	= "device_sidechannel_restrict",
-+		.data		= &device_sidechannel_restrict,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec_minmax_sysadmin,
-+		.extra1		= &zero,
-+		.extra2		= &one,
-+	},
-+#if IS_ENABLED(CONFIG_USB)
-+	{
-+		.procname	= "deny_new_usb",
-+		.data		= &deny_new_usb,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec_minmax_sysadmin,
-+		.extra1		= &zero,
-+		.extra2		= &one,
-+	},
- #endif
-	{
-		.procname	= "ngroups_max",
-diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 23788100e214..5577a58d1c7a 100644
---- a/kernel/time/hrtimer.c
-+++ b/kernel/time/hrtimer.c
-@@ -1413,7 +1413,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now,
-	}
- }
-
--static __latent_entropy void hrtimer_run_softirq(struct softirq_action *h)
-+static __latent_entropy void hrtimer_run_softirq(void)
- {
-	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
-	unsigned long flags;
-diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 4a4fd567fb26..be236ef42690 100644
---- a/kernel/time/timer.c
-+++ b/kernel/time/timer.c
-@@ -1672,7 +1672,7 @@ static inline void __run_timers(struct timer_base *base)
- /*
-  * This function runs timers and the timer-tq in bottom half context.
-  */
--static __latent_entropy void run_timer_softirq(struct softirq_action *h)
-+static __latent_entropy void run_timer_softirq(void)
- {
-	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
-
-diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 246d4d4ce5c7..f64432b45cec 100644
---- a/kernel/user_namespace.c
-+++ b/kernel/user_namespace.c
-@@ -26,6 +26,9 @@
- #include <linux/bsearch.h>
- #include <linux/sort.h>
-
-+/* sysctl */
-+int unprivileged_userns_clone;
-+
- static struct kmem_cache *user_ns_cachep __read_mostly;
- static DEFINE_MUTEX(userns_state_mutex);
-
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 64155e310a9f..0c002bbb8f75 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -945,6 +945,7 @@ endmenu # "Debug lockups and hangs"
-
- config PANIC_ON_OOPS
-	bool "Panic on Oops"
-+	default y
-	help
-	  Say Y here to enable the kernel to panic when it oopses. This
-	  has the same effect as setting oops=panic on the kernel command
-@@ -954,7 +955,7 @@ config PANIC_ON_OOPS
-	  anything erroneous after an oops which could result in data
-	  corruption or other issues.
-
--	  Say N if unsure.
-+	  Say Y if unsure.
-
- config PANIC_ON_OOPS_VALUE
-	int
-@@ -1309,6 +1310,7 @@ config DEBUG_BUGVERBOSE
- config DEBUG_LIST
-	bool "Debug linked list manipulation"
-	depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
-+	default y
-	help
-	  Enable this to turn on extended checks in the linked-list
-	  walking routines.
-@@ -1949,6 +1951,7 @@ config MEMTEST
- config BUG_ON_DATA_CORRUPTION
-	bool "Trigger a BUG when data corruption is detected"
-	select DEBUG_LIST
-+	default y
-	help
-	  Select this option if the kernel should BUG when it encounters
-	  data corruption in kernel memory structures when they get checked
-@@ -1988,6 +1991,7 @@ config STRICT_DEVMEM
- config IO_STRICT_DEVMEM
-	bool "Filter I/O access to /dev/mem"
-	depends on STRICT_DEVMEM
-+	default y
-	---help---
-	  If this option is disabled, you allow userspace (root) access to all
-	  io-memory regardless of whether a driver is actively using that
-diff --git a/lib/irq_poll.c b/lib/irq_poll.c
-index 86a709954f5a..6f15787fcb1b 100644
---- a/lib/irq_poll.c
-+++ b/lib/irq_poll.c
-@@ -75,7 +75,7 @@ void irq_poll_complete(struct irq_poll *iop)
- }
- EXPORT_SYMBOL(irq_poll_complete);
-
--static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
-+static void __latent_entropy irq_poll_softirq(void)
- {
-	struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
-	int rearm = 0, budget = irq_poll_budget;
-diff --git a/lib/kobject.c b/lib/kobject.c
-index d20a97a7e168..7afe7fcfa6c9 100644
---- a/lib/kobject.c
-+++ b/lib/kobject.c
-@@ -954,9 +954,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
-
-
- static DEFINE_SPINLOCK(kobj_ns_type_lock);
--static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
-+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __ro_after_init;
-
--int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
-+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
- {
-	enum kobj_ns_type type = ops->type;
-	int error;
-diff --git a/lib/nlattr.c b/lib/nlattr.c
-index dfa55c873c13..c6b0436f473d 100644
---- a/lib/nlattr.c
-+++ b/lib/nlattr.c
-@@ -364,6 +364,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
- {
-	int minlen = min_t(int, count, nla_len(src));
-
-+	BUG_ON(minlen < 0);
-+
-	memcpy(dest, nla_data(src), minlen);
-	if (count > minlen)
-		memset(dest + minlen, 0, count - minlen);
-diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 38b509cc6b46..6b3bf13d57d6 100644
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
-@@ -1344,7 +1344,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
-	return string(buf, end, uuid, spec);
- }
-
--int kptr_restrict __read_mostly;
-+int kptr_restrict __read_mostly = 2;
-
- static noinline_for_stack
- char *restricted_pointer(char *buf, char *end, const void *ptr,
-diff --git a/mm/Kconfig b/mm/Kconfig
-index e07608f64d47..18937911b87a 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -319,7 +319,8 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
-	depends on MMU
--        default 4096
-+	default 32768 if ARM || (ARM64 && COMPAT)
-+	default 65536
-         help
-	  This is the portion of low virtual memory which should be protected
-	  from userspace allocation.  Keeping a user from writing to low pages
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 03ca089cce0f..9bf52aa6b042 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -220,6 +220,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
-
-	newbrk = PAGE_ALIGN(brk);
-	oldbrk = PAGE_ALIGN(mm->brk);
-+	/* properly handle unaligned min_brk as an empty heap */
-+	if (min_brk & ~PAGE_MASK) {
-+		if (brk == min_brk)
-+			newbrk -= PAGE_SIZE;
-+		if (mm->brk == min_brk)
-+			oldbrk -= PAGE_SIZE;
-+	}
-	if (oldbrk == newbrk)
-		goto set_brk;
-
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 1741dd23e7c1..462ce9910e43 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -68,6 +68,7 @@
- #include <linux/ftrace.h>
- #include <linux/lockdep.h>
- #include <linux/nmi.h>
-+#include <linux/random.h>
-
- #include <asm/sections.h>
- #include <asm/tlbflush.h>
-@@ -101,6 +102,15 @@ int _node_numa_mem_[MAX_NUMNODES];
- DEFINE_MUTEX(pcpu_drain_mutex);
- DEFINE_PER_CPU(struct work_struct, pcpu_drain);
-
-+bool __meminitdata extra_latent_entropy;
-+
-+static int __init setup_extra_latent_entropy(char *str)
-+{
-+	extra_latent_entropy = true;
-+	return 0;
-+}
-+early_param("extra_latent_entropy", setup_extra_latent_entropy);
-+
- #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
- volatile unsigned long latent_entropy __latent_entropy;
- EXPORT_SYMBOL(latent_entropy);
-@@ -1069,6 +1079,13 @@ static __always_inline bool free_pages_prepare(struct page *page,
-		debug_check_no_obj_freed(page_address(page),
-					   PAGE_SIZE << order);
-	}
-+
-+	if (IS_ENABLED(CONFIG_PAGE_SANITIZE)) {
-+		int i;
-+		for (i = 0; i < (1 << order); i++)
-+			clear_highpage(page + i);
-+	}
-+
-	arch_free_page(page, order);
-	kernel_poison_pages(page, 1 << order, 0);
-	kernel_map_pages(page, 1 << order, 0);
-@@ -1286,6 +1303,21 @@ static void __init __free_pages_boot_core(struct page *page, unsigned int order)
-	__ClearPageReserved(p);
-	set_page_count(p, 0);
-
-+	if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
-+		unsigned long hash = 0;
-+		size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
-+		const unsigned long *data = lowmem_page_address(page);
-+
-+		for (index = 0; index < end; index++)
-+			hash ^= hash + data[index];
-+#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
-+		latent_entropy ^= hash;
-+		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
-+#else
-+		add_device_randomness((const void *)&hash, sizeof(hash));
-+#endif
-+	}
-+
-	page_zone(page)->managed_pages += nr_pages;
-	set_page_refcounted(page);
-	__free_pages(page, order);
-@@ -1754,8 +1786,8 @@ static inline int check_new_page(struct page *page)
-
- static inline bool free_pages_prezeroed(void)
- {
--	return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
--		page_poisoning_enabled();
-+	return IS_ENABLED(CONFIG_PAGE_SANITIZE) ||
-+		(IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) && page_poisoning_enabled());
- }
-
- #ifdef CONFIG_DEBUG_VM
-@@ -1812,6 +1844,11 @@ static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags
-
-	post_alloc_hook(page, order, gfp_flags);
-
-+	if (IS_ENABLED(CONFIG_PAGE_SANITIZE_VERIFY)) {
-+		for (i = 0; i < (1 << order); i++)
-+			verify_zero_highpage(page + i);
-+	}
-+
-	if (!free_pages_prezeroed() && (gfp_flags & __GFP_ZERO))
-		for (i = 0; i < (1 << order); i++)
-			clear_highpage(page + i);
-diff --git a/mm/slab.h b/mm/slab.h
-index 51813236e773..e0d1b194a454 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -312,7 +312,11 @@ static inline bool is_root_cache(struct kmem_cache *s)
- static inline bool slab_equal_or_root(struct kmem_cache *s,
-				      struct kmem_cache *p)
- {
-+#ifdef CONFIG_SLAB_HARDENED
-+	return p == s;
-+#else
-	return true;
-+#endif
- }
-
- static inline const char *cache_name(struct kmem_cache *s)
-@@ -364,18 +368,26 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
-	 * to not do even the assignment. In that case, slab_equal_or_root
-	 * will also be a constant.
-	 */
--	if (!memcg_kmem_enabled() &&
-+	if (!IS_ENABLED(CONFIG_SLAB_HARDENED) &&
-+	    !memcg_kmem_enabled() &&
-	    !unlikely(s->flags & SLAB_CONSISTENCY_CHECKS))
-		return s;
-
-	page = virt_to_head_page(x);
-+#ifdef CONFIG_SLAB_HARDENED
-+	BUG_ON(!PageSlab(page));
-+#endif
-	cachep = page->slab_cache;
-	if (slab_equal_or_root(cachep, s))
-		return cachep;
-
-	pr_err("%s: Wrong slab cache. %s but object is from %s\n",
-	       __func__, s->name, cachep->name);
-+#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
-+	BUG_ON(1);
-+#else
-	WARN_ON_ONCE(1);
-+#endif
-	return s;
- }
-
-@@ -400,7 +412,7 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
-	 * back there or track user information then we can
-	 * only use the space before that information.
-	 */
--	if (s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER))
-+	if ((s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER)) || IS_ENABLED(CONFIG_SLAB_CANARY))
-		return s->inuse;
-	/*
-	 * Else we can use all the padding etc for the allocation
-diff --git a/mm/slab_common.c b/mm/slab_common.c
-index 10f127b2de7c..3637ef72c5b4 100644
---- a/mm/slab_common.c
-+++ b/mm/slab_common.c
-@@ -26,10 +26,10 @@
-
- #include "slab.h"
-
--enum slab_state slab_state;
-+enum slab_state slab_state __ro_after_init;
- LIST_HEAD(slab_caches);
- DEFINE_MUTEX(slab_mutex);
--struct kmem_cache *kmem_cache;
-+struct kmem_cache *kmem_cache __ro_after_init;
-
- #ifdef CONFIG_HARDENED_USERCOPY
- bool usercopy_fallback __ro_after_init =
-@@ -57,7 +57,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
- /*
-  * Merge control. If this is set then no merging of slab caches will occur.
-  */
--static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
-+static bool slab_nomerge __ro_after_init = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
-
- static int __init setup_slab_nomerge(char *str)
- {
-@@ -968,7 +968,7 @@ EXPORT_SYMBOL(kmalloc_dma_caches);
-  * of two cache sizes there. The size of larger slabs can be determined using
-  * fls.
-  */
--static s8 size_index[24] = {
-+static s8 size_index[24] __ro_after_init = {
-	3,	/* 8 */
-	4,	/* 16 */
-	5,	/* 24 */
-diff --git a/mm/slub.c b/mm/slub.c
-index e381728a3751..76dd844d978a 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -125,6 +125,16 @@ static inline int kmem_cache_debug(struct kmem_cache *s)
- #endif
- }
-
-+static inline bool has_sanitize(struct kmem_cache *s)
-+{
-+	return IS_ENABLED(CONFIG_SLAB_SANITIZE) && !(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON));
-+}
-+
-+static inline bool has_sanitize_verify(struct kmem_cache *s)
-+{
-+	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
-+}
-+
- void *fixup_red_left(struct kmem_cache *s, void *p)
- {
-	if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
-@@ -299,6 +309,35 @@ static inline void set_freepointer(struct kmem_cache *s, void *object, void *fp)
-	*(void **)freeptr_addr = freelist_ptr(s, fp, freeptr_addr);
- }
-
-+#ifdef CONFIG_SLAB_CANARY
-+static inline unsigned long *get_canary(struct kmem_cache *s, void *object)
-+{
-+	if (s->offset)
-+		return object + s->offset + sizeof(void *);
-+	return object + s->inuse;
-+}
-+
-+static inline unsigned long get_canary_value(const void *canary, unsigned long value)
-+{
-+	return (value ^ (unsigned long)canary) & CANARY_MASK;
-+}
-+
-+static inline void set_canary(struct kmem_cache *s, void *object, unsigned long value)
-+{
-+	unsigned long *canary = get_canary(s, object);
-+	*canary = get_canary_value(canary, value);
-+}
-+
-+static inline void check_canary(struct kmem_cache *s, void *object, unsigned long value)
-+{
-+	unsigned long *canary = get_canary(s, object);
-+	BUG_ON(*canary != get_canary_value(canary, value));
-+}
-+#else
-+#define set_canary(s, object, value)
-+#define check_canary(s, object, value)
-+#endif
-+
- /* Loop over all objects in a slab */
- #define for_each_object(__p, __s, __addr, __objects) \
-	for (__p = fixup_red_left(__s, __addr); \
-@@ -486,13 +525,13 @@ static inline void *restore_red_left(struct kmem_cache *s, void *p)
-  * Debug settings:
-  */
- #if defined(CONFIG_SLUB_DEBUG_ON)
--static slab_flags_t slub_debug = DEBUG_DEFAULT_FLAGS;
-+static slab_flags_t slub_debug __ro_after_init = DEBUG_DEFAULT_FLAGS;
- #else
--static slab_flags_t slub_debug;
-+static slab_flags_t slub_debug __ro_after_init;
- #endif
-
--static char *slub_debug_slabs;
--static int disable_higher_order_debug;
-+static char *slub_debug_slabs __ro_after_init;
-+static int disable_higher_order_debug __ro_after_init;
-
- /*
-  * slub is about to manipulate internal object metadata.  This memory lies
-@@ -552,6 +591,9 @@ static struct track *get_track(struct kmem_cache *s, void *object,
-	else
-		p = object + s->inuse;
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		p = (void *)p + sizeof(void *);
-+
-	return p + alloc;
- }
-
-@@ -690,6 +732,9 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
-	else
-		off = s->inuse;
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		off += sizeof(void *);
-+
-	if (s->flags & SLAB_STORE_USER)
-		off += 2 * sizeof(struct track);
-
-@@ -819,6 +864,9 @@ static int check_pad_bytes(struct kmem_cache *s, struct page *page, u8 *p)
-		/* Freepointer is placed after the object. */
-		off += sizeof(void *);
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		off += sizeof(void *);
-+
-	if (s->flags & SLAB_STORE_USER)
-		/* We also have user information there */
-		off += 2 * sizeof(struct track);
-@@ -1420,8 +1468,9 @@ static void setup_object(struct kmem_cache *s, struct page *page,
-				void *object)
- {
-	setup_object_debug(s, page, object);
-+	set_canary(s, object, s->random_inactive);
-	kasan_init_slab_obj(s, object);
--	if (unlikely(s->ctor)) {
-+	if (unlikely(s->ctor) && !has_sanitize_verify(s)) {
-		kasan_unpoison_object_data(s, object);
-		s->ctor(object);
-		kasan_poison_object_data(s, object);
-@@ -2719,9 +2768,21 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
-		stat(s, ALLOC_FASTPATH);
-	}
-
--	if (unlikely(gfpflags & __GFP_ZERO) && object)
-+	if (has_sanitize_verify(s) && object) {
-+		size_t offset = s->offset ? 0 : sizeof(void *);
-+		BUG_ON(memchr_inv(object + offset, 0, s->object_size - offset));
-+		if (s->ctor)
-+			s->ctor(object);
-+		if (unlikely(gfpflags & __GFP_ZERO) && offset)
-+			memset(object, 0, sizeof(void *));
-+	} else if (unlikely(gfpflags & __GFP_ZERO) && object)
-		memset(object, 0, s->object_size);
-
-+	if (object) {
-+		check_canary(s, object, s->random_inactive);
-+		set_canary(s, object, s->random_active);
-+	}
-+
-	slab_post_alloc_hook(s, gfpflags, 1, &object);
-
-	return object;
-@@ -2928,6 +2989,27 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
-	void *tail_obj = tail ? : head;
-	struct kmem_cache_cpu *c;
-	unsigned long tid;
-+	bool sanitize = has_sanitize(s);
-+
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY) || sanitize) {
-+		__maybe_unused int offset = s->offset ? 0 : sizeof(void *);
-+		void *x = head;
-+
-+		while (1) {
-+			check_canary(s, x, s->random_active);
-+			set_canary(s, x, s->random_inactive);
-+
-+			if (sanitize) {
-+				memset(x + offset, 0, s->object_size - offset);
-+				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && s->ctor)
-+					s->ctor(x);
-+			}
-+			if (x == tail_obj)
-+				break;
-+			x = get_freepointer(s, x);
-+		}
-+	}
-+
- redo:
-	/*
-	 * Determine the currently cpus per cpu slab.
-@@ -3106,7 +3188,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
-			  void **p)
- {
-	struct kmem_cache_cpu *c;
--	int i;
-+	int i, k;
-
-	/* memcg and kmem_cache debug support */
-	s = slab_pre_alloc_hook(s, flags);
-@@ -3143,13 +3225,29 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
-	local_irq_enable();
-
-	/* Clear memory outside IRQ disabled fastpath loop */
--	if (unlikely(flags & __GFP_ZERO)) {
-+	if (has_sanitize_verify(s)) {
-+		int j;
-+
-+		for (j = 0; j < i; j++) {
-+			size_t offset = s->offset ? 0 : sizeof(void *);
-+			BUG_ON(memchr_inv(p[j] + offset, 0, s->object_size - offset));
-+			if (s->ctor)
-+				s->ctor(p[j]);
-+			if (unlikely(flags & __GFP_ZERO) && offset)
-+				memset(p[j], 0, sizeof(void *));
-+		}
-+	} else if (unlikely(flags & __GFP_ZERO)) {
-		int j;
-
-		for (j = 0; j < i; j++)
-			memset(p[j], 0, s->object_size);
-	}
-
-+	for (k = 0; k < i; k++) {
-+		check_canary(s, p[k], s->random_inactive);
-+		set_canary(s, p[k], s->random_active);
-+	}
-+
-	/* memcg and kmem_cache debug support */
-	slab_post_alloc_hook(s, flags, size, p);
-	return i;
-@@ -3181,9 +3279,9 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);
-  * and increases the number of allocations possible without having to
-  * take the list_lock.
-  */
--static int slub_min_order;
--static int slub_max_order = PAGE_ALLOC_COSTLY_ORDER;
--static int slub_min_objects;
-+static int slub_min_order __ro_after_init;
-+static int slub_max_order __ro_after_init = PAGE_ALLOC_COSTLY_ORDER;
-+static int slub_min_objects __ro_after_init;
-
- /*
-  * Calculate the order of allocation given an slab object size.
-@@ -3353,6 +3451,7 @@ static void early_kmem_cache_node_alloc(int node)
-	init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);
-	init_tracking(kmem_cache_node, n);
- #endif
-+	set_canary(kmem_cache_node, n, kmem_cache_node->random_active);
-	kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
-		      GFP_KERNEL);
-	init_kmem_cache_node(n);
-@@ -3509,6 +3608,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
-		size += sizeof(void *);
-	}
-
-+	if (IS_ENABLED(CONFIG_SLAB_CANARY))
-+		size += sizeof(void *);
-+
- #ifdef CONFIG_SLUB_DEBUG
-	if (flags & SLAB_STORE_USER)
-		/*
-@@ -3579,6 +3681,10 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
- #ifdef CONFIG_SLAB_FREELIST_HARDENED
-	s->random = get_random_long();
- #endif
-+#ifdef CONFIG_SLAB_CANARY
-+	s->random_active = get_random_long();
-+	s->random_inactive = get_random_long();
-+#endif
-
-	if (need_reserve_slab_rcu && (s->flags & SLAB_TYPESAFE_BY_RCU))
-		s->reserved = sizeof(struct rcu_head);
-@@ -3846,6 +3952,8 @@ void __check_heap_object(const void *ptr, unsigned long n, struct page *page,
-		offset -= s->red_left_pad;
-	}
-
-+	check_canary(s, (void *)ptr - offset, s->random_active);
-+
-	/* Allow address range falling entirely within usercopy region. */
-	if (offset >= s->useroffset &&
-	    offset - s->useroffset <= s->usersize &&
-@@ -3879,7 +3987,11 @@ static size_t __ksize(const void *object)
-	page = virt_to_head_page(object);
-
-	if (unlikely(!PageSlab(page))) {
-+#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
-+		BUG_ON(!PageCompound(page));
-+#else
-		WARN_ON(!PageCompound(page));
-+#endif
-		return PAGE_SIZE << compound_order(page);
-	}
-
-@@ -4744,7 +4856,7 @@ enum slab_stat_type {
- #define SO_TOTAL	(1 << SL_TOTAL)
-
- #ifdef CONFIG_MEMCG
--static bool memcg_sysfs_enabled = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
-+static bool memcg_sysfs_enabled __ro_after_init = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
-
- static int __init setup_slub_memcg_sysfs(char *str)
- {
-diff --git a/mm/swap.c b/mm/swap.c
-index 0f17330dd0e5..6e52cb476ef5 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
-@@ -92,6 +92,13 @@ static void __put_compound_page(struct page *page)
-	if (!PageHuge(page))
-		__page_cache_release(page);
-	dtor = get_compound_page_dtor(page);
-+	if (!PageHuge(page))
-+		BUG_ON(dtor != free_compound_page
-+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-+			&& dtor != free_transhuge_page
-+#endif
-+		);
-+
-	(*dtor)(page);
- }
-
-diff --git a/net/core/dev.c b/net/core/dev.c
-index ace13bea3e50..77a1519c52b7 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4196,7 +4196,7 @@ int netif_rx_ni(struct sk_buff *skb)
- }
- EXPORT_SYMBOL(netif_rx_ni);
-
--static __latent_entropy void net_tx_action(struct softirq_action *h)
-+static __latent_entropy void net_tx_action(void)
- {
-	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-
-@@ -5745,7 +5745,7 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)
-	return work;
- }
-
--static __latent_entropy void net_rx_action(struct softirq_action *h)
-+static __latent_entropy void net_rx_action(void)
- {
-	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-	unsigned long time_limit = jiffies +
-diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
-index f48fe6fc7e8c..d78c52835c08 100644
---- a/net/ipv4/Kconfig
-+++ b/net/ipv4/Kconfig
-@@ -261,6 +261,7 @@ config IP_PIMSM_V2
-
- config SYN_COOKIES
-	bool "IP: TCP syncookie support"
-+	default y
-	---help---
-	  Normal TCP/IP networking is open to an attack known as "SYN
-	  flooding". This denial-of-service attack prevents legitimate remote
-diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 9917f928d0fd..784e0e2fc839 100644
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -37,6 +37,7 @@ static int vmlinux_section_warnings = 1;
- static int warn_unresolved = 0;
- /* How a symbol is exported */
- static int sec_mismatch_count = 0;
-+static int writable_fptr_count = 0;
- static int sec_mismatch_verbose = 1;
- static int sec_mismatch_fatal = 0;
- /* ignore missing files */
-@@ -965,6 +966,7 @@ enum mismatch {
-	ANY_EXIT_TO_ANY_INIT,
-	EXPORT_TO_INIT_EXIT,
-	EXTABLE_TO_NON_TEXT,
-+	DATA_TO_TEXT
- };
-
- /**
-@@ -1091,6 +1093,12 @@ static const struct sectioncheck sectioncheck[] = {
-	.good_tosec = {ALL_TEXT_SECTIONS , NULL},
-	.mismatch = EXTABLE_TO_NON_TEXT,
-	.handler = extable_mismatch_handler,
-+},
-+/* Do not reference code from writable data */
-+{
-+	.fromsec = { DATA_SECTIONS, NULL },
-+	.bad_tosec = { ALL_TEXT_SECTIONS, NULL },
-+	.mismatch = DATA_TO_TEXT
- }
- };
-
-@@ -1240,10 +1248,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
-			continue;
-		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
-			continue;
--		if (sym->st_value == addr)
--			return sym;
-		/* Find a symbol nearby - addr are maybe negative */
-		d = sym->st_value - addr;
-+		if (d == 0)
-+			return sym;
-		if (d < 0)
-			d = addr - sym->st_value;
-		if (d < distance) {
-@@ -1402,7 +1410,11 @@ static void report_sec_mismatch(const char *modname,
-	char *prl_from;
-	char *prl_to;
-
--	sec_mismatch_count++;
-+	if (mismatch->mismatch == DATA_TO_TEXT)
-+		writable_fptr_count++;
-+	else
-+		sec_mismatch_count++;
-+
-	if (!sec_mismatch_verbose)
-		return;
-
-@@ -1526,6 +1538,14 @@ static void report_sec_mismatch(const char *modname,
-		fatal("There's a special handler for this mismatch type, "
-		      "we should never get here.");
-		break;
-+	case DATA_TO_TEXT:
-+#if 0
-+		fprintf(stderr,
-+		"The %s %s:%s references\n"
-+		"the %s %s:%s%s\n",
-+		from, fromsec, fromsym, to, tosec, tosym, to_p);
-+#endif
-+		break;
-	}
-	fprintf(stderr, "\n");
- }
-@@ -2539,6 +2559,14 @@ int main(int argc, char **argv)
-		}
-	}
-	free(buf.p);
-+	if (writable_fptr_count) {
-+		if (!sec_mismatch_verbose) {
-+			warn("modpost: Found %d writable function pointer(s).\n"
-+			     "To see full details build your kernel with:\n"
-+			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-+			     writable_fptr_count);
-+		}
-+	}
-
-	return err;
- }
-diff --git a/security/Kconfig b/security/Kconfig
-index c4302067a3ad..1b1e9368cae5 100644
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -8,7 +8,7 @@ source security/keys/Kconfig
-
- config SECURITY_DMESG_RESTRICT
-	bool "Restrict unprivileged access to the kernel syslog"
--	default n
-+	default y
-	help
-	  This enforces restrictions on unprivileged users reading the kernel
-	  syslog via dmesg(8).
-@@ -18,10 +18,21 @@ config SECURITY_DMESG_RESTRICT
-
-	  If you are unsure how to answer this question, answer N.
-
-+config SECURITY_PERF_EVENTS_RESTRICT
-+	bool "Restrict unprivileged use of performance events"
-+	depends on PERF_EVENTS
-+	default y
-+	help
-+	  If you say Y here, the kernel.perf_event_paranoid sysctl
-+	  will be set to 3 by default, and no unprivileged use of the
-+	  perf_event_open syscall will be permitted unless it is
-+	  changed.
-+
- config SECURITY
-	bool "Enable different security models"
-	depends on SYSFS
-	depends on MULTIUSER
-+	default y
-	help
-	  This allows you to choose different security modules to be
-	  configured into your kernel.
-@@ -48,6 +59,7 @@ config SECURITYFS
- config SECURITY_NETWORK
-	bool "Socket and Networking Security Hooks"
-	depends on SECURITY
-+	default y
-	help
-	  This enables the socket and networking security hooks.
-	  If enabled, a security module can use these hooks to
-@@ -155,6 +167,7 @@ config HARDENED_USERCOPY
-	depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
-	select BUG
-	imply STRICT_DEVMEM
-+	default y
-	help
-	  This option checks for obviously wrong memory regions when
-	  copying memory to/from the kernel (via copy_to_user() and
-@@ -167,7 +180,6 @@ config HARDENED_USERCOPY
- config HARDENED_USERCOPY_FALLBACK
-	bool "Allow usercopy whitelist violations to fallback to object size"
-	depends on HARDENED_USERCOPY
--	default y
-	help
-	  This is a temporary option that allows missing usercopy whitelists
-	  to be discovered via a WARN() to the kernel log, instead of
-@@ -192,10 +204,36 @@ config HARDENED_USERCOPY_PAGESPAN
- config FORTIFY_SOURCE
-	bool "Harden common str/mem functions against buffer overflows"
-	depends on ARCH_HAS_FORTIFY_SOURCE
-+	default y
-	help
-	  Detect overflows of buffers in common string and memory functions
-	  where the compiler can determine and validate the buffer sizes.
-
-+config FORTIFY_SOURCE_STRICT_STRING
-+	bool "Harden common functions against buffer overflows"
-+	depends on FORTIFY_SOURCE
-+	depends on EXPERT
-+	help
-+	  Perform stricter overflow checks catching overflows within objects
-+	  for common C string functions rather than only between objects.
-+
-+	  This is not yet intended for production use, only bug finding.
-+
-+config PAGE_SANITIZE
-+	bool "Sanitize pages"
-+	default y
-+	help
-+	  Zero fill page allocations on free, reducing the lifetime of
-+	  sensitive data and helping to mitigate use-after-free bugs.
-+
-+config PAGE_SANITIZE_VERIFY
-+	bool "Verify sanitized pages"
-+	depends on PAGE_SANITIZE
-+	default y
-+	help
-+	  Verify that newly allocated pages are zeroed to detect
-+	  write-after-free bugs.
-+
- config STATIC_USERMODEHELPER
-	bool "Force all usermode helper calls through a single binary"
-	help
-diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
-index 8af7a690eb40..6539694b0fd3 100644
---- a/security/selinux/Kconfig
-+++ b/security/selinux/Kconfig
-@@ -2,7 +2,7 @@ config SECURITY_SELINUX
-	bool "NSA SELinux Support"
-	depends on SECURITY_NETWORK && AUDIT && NET && INET
-	select NETWORK_SECMARK
--	default n
-+	default y
-	help
-	  This selects NSA Security-Enhanced Linux (SELinux).
-	  You will also need a policy configuration and a labeled filesystem.
-@@ -79,23 +79,3 @@ config SECURITY_SELINUX_AVC_STATS
-	  This option collects access vector cache statistics to
-	  /selinux/avc/cache_stats, which may be monitored via
-	  tools such as avcstat.
--
--config SECURITY_SELINUX_CHECKREQPROT_VALUE
--	int "NSA SELinux checkreqprot default value"
--	depends on SECURITY_SELINUX
--	range 0 1
--	default 0
--	help
--	  This option sets the default value for the 'checkreqprot' flag
--	  that determines whether SELinux checks the protection requested
--	  by the application or the protection that will be applied by the
--	  kernel (including any implied execute for read-implies-exec) for
--	  mmap and mprotect calls.  If this option is set to 0 (zero),
--	  SELinux will default to checking the protection that will be applied
--	  by the kernel.  If this option is set to 1 (one), SELinux will
--	  default to checking the protection requested by the application.
--	  The checkreqprot flag may be changed from the default via the
--	  'checkreqprot=' boot parameter.  It may also be changed at runtime
--	  via /selinux/checkreqprot if authorized by policy.
--
--	  If you are unsure how to answer this question, answer 0.
-diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
-index 3d54468ce334..ceafb908afde 100644
---- a/security/selinux/include/objsec.h
-+++ b/security/selinux/include/objsec.h
-@@ -154,6 +154,6 @@ struct bpf_security_struct {
-	u32 sid;  /*SID of bpf obj creater*/
- };
-
--extern unsigned int selinux_checkreqprot;
-+extern const unsigned int selinux_checkreqprot;
-
- #endif /* _SELINUX_OBJSEC_H_ */
-diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
-index 00eed842c491..8f7b8d7e6f91 100644
---- a/security/selinux/selinuxfs.c
-+++ b/security/selinux/selinuxfs.c
-@@ -41,16 +41,7 @@
- #include "objsec.h"
- #include "conditional.h"
-
--unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
--
--static int __init checkreqprot_setup(char *str)
--{
--	unsigned long checkreqprot;
--	if (!kstrtoul(str, 0, &checkreqprot))
--		selinux_checkreqprot = checkreqprot ? 1 : 0;
--	return 1;
--}
--__setup("checkreqprot=", checkreqprot_setup);
-+const unsigned int selinux_checkreqprot;
-
- static DEFINE_MUTEX(sel_mutex);
-
-@@ -610,10 +601,9 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
-		return PTR_ERR(page);
-
-	length = -EINVAL;
--	if (sscanf(page, "%u", &new_value) != 1)
-+	if (sscanf(page, "%u", &new_value) != 1 || new_value)
-		goto out;
-
--	selinux_checkreqprot = new_value ? 1 : 0;
-	length = count;
- out:
-	kfree(page);
-diff --git a/security/yama/Kconfig b/security/yama/Kconfig
-index 96b27405558a..485c1b85c325 100644
---- a/security/yama/Kconfig
-+++ b/security/yama/Kconfig
-@@ -1,7 +1,7 @@
- config SECURITY_YAMA
-	bool "Yama support"
-	depends on SECURITY
--	default n
-+	default y
-	help
-	  This selects Yama, which extends DAC support with additional
-	  system-wide security settings beyond regular Linux discretionary
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
deleted file mode 100644
index 366cfd39e4af..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
-
-with stdenv.lib;
-
-let
-  version = "4.14.44";
-  revision = "a";
-  sha256 = "1alvhpwy9xzppwsag7qh1lkk3l4piyh2fv27w37il6gclja4dxkf";
-
-  # modVersion needs to be x.y.z, will automatically add .0 if needed
-  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-
-  # branchVersion needs to be x.y
-  branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  modDirVersion = "${modVersion}-hardened";
-in
-buildLinux (args // {
-  inherit modDirVersion;
-
-  version = "${version}-${revision}";
-  extraMeta.branch = "${branchVersion}";
-
-  src = fetchFromGitHub {
-    inherit sha256;
-    owner = "copperhead";
-    repo = "linux-hardened";
-    rev = "${version}.${revision}";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 143671428c41..d54e0153229d 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -28,16 +28,6 @@ rec {
     patch = ./tag-hardened.patch;
   };
 
-  copperhead_4_14 = rec {
-    name = "copperhead-4.14";
-    patch = ./copperhead-4-14.patch;
-  };
-
-  copperhead_4_16 = rec {
-    name = "copperhead-4.16";
-    patch = ./copperhead-4-16.patch;
-  };
-
   # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6
   iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec {
     name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e09e89b0b90e..b4ad53040523 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13924,14 +13924,6 @@ with pkgs;
       ];
   };
 
-  linux_copperhead_lts = (linux_4_14.override {
-    kernelPatches = linux_4_14.kernelPatches ++ [
-      kernelPatches.copperhead_4_14
-      kernelPatches.tag_hardened
-     ];
-    modDirVersionArg = linux_4_14.modDirVersion + "-hardened";
-  });
-
   # linux mptcp is based on the 4.4 kernel
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
@@ -14273,8 +14265,6 @@ with pkgs;
 
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
-  linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts);
-
   # Samus kernels
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);
   linuxPackages_samus_latest = linuxPackages_samus_4_12;

From b06ad6199fbcc5e47fdb3db061d537ddf1f65666 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 3 Sep 2018 17:35:39 +0200
Subject: [PATCH 0163/3253] nix.perl-bindings: Fix build

---
 pkgs/tools/package-management/nix/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a447fbf22827..edb78d1b63a8 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -152,7 +152,10 @@ in rec {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
       sha256 = "0ed68e0c50f13810768fcf510abb2c56d735172c39a325aac7453ccf7ae152fc";
     };
-  }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
+  }) // { perl-bindings = perl-bindings {
+    nix = nixStable;
+    needsBoost = true;
+  }; };
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-2.1${suffix}";

From 9069908680ec3ceda4a02a98a493fb95eb3db919 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 20:01:37 -0400
Subject: [PATCH 0164/3253] amule: fix build

---
 pkgs/tools/networking/p2p/amule/default.nix   |   3 +
 pkgs/tools/networking/p2p/amule/gcc47.patch   |  21 --
 .../tools/networking/p2p/amule/upnp-1.8.patch | 230 ++++++++++++++++++
 3 files changed, 233 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/amule/gcc47.patch
 create mode 100644 pkgs/tools/networking/p2p/amule/upnp-1.8.patch

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index a74242ba5e17..b9a4360abfb9 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -22,6 +22,9 @@ mkDerivation rec {
     ++ lib.optional httpServer libpng
     ++ lib.optional client libX11;
 
+  # See: https://github.com/amule-project/amule/issues/126
+  patches = [ ./upnp-1.8.patch ];
+
   enableParallelBuilding = true;
 
   configureFlags = [
diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch
deleted file mode 100644
index e776dda3240e..000000000000
--- a/pkgs/tools/networking/p2p/amule/gcc47.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# http://code.google.com/p/amule/source/detail?r=10772
-diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
---- aMule-2.3.1.orig//src/ObservableQueue.h	2012-04-22 19:40:05.560084120 +0200
-+++ aMule-2.3.1/src/ObservableQueue.h	2012-04-22 19:40:32.479085322 +0200
-@@ -331,14 +331,14 @@
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STARTING ), o );
-+	this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
- 
- 
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STOPPING ), o );
-+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
- 
- 
\ No newline at end of file
diff --git a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch b/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
new file mode 100644
index 000000000000..3f5502582a25
--- /dev/null
+++ b/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
@@ -0,0 +1,230 @@
+--- a/src/UPnPBase.cpp
++++ b/src/UPnPBase.cpp
+@@ -29,22 +29,12 @@
+
+ #ifdef ENABLE_UPNP
+
+-// check for broken Debian-hacked libUPnP
+ #include <upnp.h>
+-#ifdef STRING_H			// defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
+-#define BROKEN_DEBIAN_LIBUPNP
+-#endif
+
+ #include "UPnPBase.h"
+
+ #include <algorithm>		// For transform()
+
+-#ifdef BROKEN_DEBIAN_LIBUPNP
+-  #define GET_UPNP_STRING(a) UpnpString_get_String(a)
+-#else
+-  #define GET_UPNP_STRING(a) (a)
+-#endif
+-
+ std::string stdEmptyString;
+
+ const char s_argument[] = "argument";
+@@ -1127,7 +1117,7 @@
+
+
+ // This function is static
+-int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
++int CUPnPControlPoint::Callback(Upnp_EventType EventType, const void *Event, void * /*Cookie*/)
+ {
+ 	std::ostringstream msg;
+ 	std::ostringstream msg2;
+@@ -1149,24 +1139,24 @@
+ 		msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
+ 		// UPnP Discovery
+ upnpDiscovery:
+-		struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
++		UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
+ 		IXML_Document *doc = NULL;
+ 		int ret;
+-		if (d_event->ErrCode != UPNP_E_SUCCESS) {
+-			msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
++		if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
++			msg << UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)) << ".";
+ 			AddDebugLogLineC(logUPnP, msg);
+ 		}
+ 		// Get the XML tree device description in doc
+-		ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
++		ret = UpnpDownloadXmlDoc(UpnpDiscovery_get_Location_cstr(d_event), &doc);
+ 		if (ret != UPNP_E_SUCCESS) {
+ 			msg << "Error retrieving device description from " <<
+-				d_event->Location << ": " <<
++				UpnpDiscovery_get_Location_cstr(d_event) << ": " <<
+ 				UpnpGetErrorMessage(ret) <<
+ 				"(" << ret << ").";
+ 			AddDebugLogLineC(logUPnP, msg);
+ 		} else {
+ 			msg2 << "Retrieving device description from " <<
+-				d_event->Location << ".";
++				UpnpDiscovery_get_Location_cstr(d_event) << ".";
+ 			AddDebugLogLineN(logUPnP, msg2);
+ 		}
+ 		if (doc) {
+@@ -1195,7 +1185,7 @@
+ 				}
+ 				// Add the root device to our list
+ 				upnpCP->AddRootDevice(rootDevice, urlBase,
+-					d_event->Location, d_event->Expires);
++					UpnpDiscovery_get_Location_cstr(d_event), UpnpDiscovery_get_Expires(d_event));
+ 			}
+ 			// Free the XML doc tree
+ 			IXML::Document::Free(doc);
+@@ -1216,28 +1206,28 @@
+ 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
+ 		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
+ 		// UPnP Device Removed
+-		struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
+-		if (dab_event->ErrCode != UPNP_E_SUCCESS) {
++		UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
++		if (UpnpDiscovery_get_ErrCode(dab_event) != UPNP_E_SUCCESS) {
+ 			msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
+-				UpnpGetErrorMessage(dab_event->ErrCode) <<
++				UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(dab_event)) <<
+ 				".";
+ 			AddDebugLogLineC(logUPnP, msg);
+ 		}
+-		std::string devType = dab_event->DeviceType;
++		std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
+ 		// Check for an InternetGatewayDevice and removes it from the list
+ 		std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
+ 		if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
+-			upnpCP->RemoveRootDevice(dab_event->DeviceId);
++			upnpCP->RemoveRootDevice(UpnpDiscovery_get_DeviceID_cstr(dab_event));
+ 		}
+ 		break;
+ 	}
+ 	case UPNP_EVENT_RECEIVED: {
+ 		//fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
+ 		// Event reveived
+-		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
+-		const std::string Sid = e_event->Sid;
++		UpnpEvent *e_event = (UpnpEvent *)Event;
++		const std::string Sid = UpnpEvent_get_SID_cstr(e_event);
+ 		// Parses the event
+-		upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
++		upnpCP->OnEventReceived(Sid, UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event));
+ 		break;
+ 	}
+ 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
+@@ -1252,16 +1242,15 @@
+ 		//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
+ 		msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
+ upnpEventRenewalComplete:
+-		struct Upnp_Event_Subscribe *es_event =
+-			(struct Upnp_Event_Subscribe *)Event;
+-		if (es_event->ErrCode != UPNP_E_SUCCESS) {
++		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
++		if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) {
+ 			msg << "Error in Event Subscribe Callback";
+ 			UPnP::ProcessErrorMessage(
+-				msg.str(), es_event->ErrCode, NULL, NULL);
++				msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
+ 		} else {
+ #if 0
+ 			TvCtrlPointHandleSubscribeUpdate(
+-				GET_UPNP_STRING(es_event->PublisherUrl),
++				UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
+ 				es_event->Sid,
+ 				es_event->TimeOut );
+ #endif
+@@ -1280,29 +1269,29 @@
+ 		msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
+ 		msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
+ upnpEventSubscriptionExpired:
+-		struct Upnp_Event_Subscribe *es_event =
+-			(struct Upnp_Event_Subscribe *)Event;
++		UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
+ 		Upnp_SID newSID;
+ 		memset(newSID, 0, sizeof(Upnp_SID));
+ 		int TimeOut = 1801;
+ 		int ret = UpnpSubscribe(
+ 			upnpCP->m_UPnPClientHandle,
+-			GET_UPNP_STRING(es_event->PublisherUrl),
++
++			UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
+ 			&TimeOut,
+ 			newSID);
+ 		if (ret != UPNP_E_SUCCESS) {
+ 			msg << "Error Subscribing to EventURL";
+ 			UPnP::ProcessErrorMessage(
+-				msg.str(), es_event->ErrCode, NULL, NULL);
++				msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
+ 		} else {
+ 			ServiceMap::iterator it =
+-				upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));
++				upnpCP->m_ServiceMap.find(UpnpEventSubscribe_get_PublisherUrl_cstr(es_event));
+ 			if (it != upnpCP->m_ServiceMap.end()) {
+ 				CUPnPService &service = *(it->second);
+ 				service.SetTimeout(TimeOut);
+ 				service.SetSID(newSID);
+ 				msg2 << "Re-subscribed to EventURL '" <<
+-					GET_UPNP_STRING(es_event->PublisherUrl) <<
++					UpnpEventSubscribe_get_PublisherUrl_cstr(es_event) <<
+ 					"' with SID == '" <<
+ 					newSID << "'.";
+ 				AddDebugLogLineC(logUPnP, msg2);
+@@ -1321,17 +1310,16 @@
+ 	case UPNP_CONTROL_ACTION_COMPLETE: {
+ 		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
+ 		// This is here if we choose to do this asynchronously
+-		struct Upnp_Action_Complete *a_event =
+-			(struct Upnp_Action_Complete *)Event;
+-		if (a_event->ErrCode != UPNP_E_SUCCESS) {
++		UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
++		if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) {
+ 			UPnP::ProcessErrorMessage(
+ 				"UpnpSendActionAsync",
+-				a_event->ErrCode, NULL,
+-				a_event->ActionResult);
++				UpnpActionComplete_get_ErrCode(a_event), NULL,
++				UpnpActionComplete_get_ActionResult(a_event));
+ 		} else {
+ 			// Check the response document
+ 			UPnP::ProcessActionResponse(
+-				a_event->ActionResult,
++				UpnpActionComplete_get_ActionResult(a_event),
+ 				"<UpnpSendActionAsync>");
+ 		}
+ 		/* No need for any processing here, just print out results.
+@@ -1342,12 +1330,11 @@
+ 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
+ 		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
+ 		msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
+-		struct Upnp_State_Var_Complete *sv_event =
+-			(struct Upnp_State_Var_Complete *)Event;
+-		if (sv_event->ErrCode != UPNP_E_SUCCESS) {
++		UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
++		if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) {
+ 			msg << "m_UpnpGetServiceVarStatusAsync";
+ 			UPnP::ProcessErrorMessage(
+-				msg.str(), sv_event->ErrCode, NULL, NULL);
++				msg.str(), UpnpStateVarComplete_get_ErrCode(sv_event), NULL, NULL);
+ 		} else {
+ #if 0
+ 			// Warning: The use of UpnpGetServiceVarStatus and
+--- a/src/UPnPBase.h
++++ b/src/UPnPBase.h
+@@ -490,9 +490,19 @@
+ 	// Callback function
+ 	static int Callback(
+ 		Upnp_EventType EventType,
+-		void* Event,
++		const void* Event,
+ 		void* Cookie);
+
++#if UPNP_VERSION < 10800
++	/* in libupnp 1.6 Event is not const */
++	static int Callback(
++		Upnp_EventType EventType,
++		void* Event,
++		void* Cookie) {
++		return Callback(EventType, (const void *)Event, Cookie);
++	}
++#endif
++
+ private:
+ 	void OnEventReceived(
+ 		const std::string &Sid,
\ No newline at end of file

From acfa8cb2a98f96d96c46b52c7563f0be3bf4e700 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 3 Sep 2018 10:15:47 -0700
Subject: [PATCH 0165/3253] ledger: Enable building of tests, and concurrent
 make

---
 pkgs/applications/office/ledger/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 387a71aa04ee..10b971463e3f 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ];
 
+  buildPhase = "make -j$NIX_BUILD_CORES";
+  checkPhase = "ctest -j$NIX_BUILD_CORES";
+
+  doCheck = true;
+
   # Skip byte-compiling of emacs-lisp files because this is currently
   # broken in ledger...
   postInstall = ''

From 9d1bd7c8806366b299d32e40cf8545b07da901bd Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 3 Sep 2018 10:18:13 -0700
Subject: [PATCH 0166/3253] Revert "ledger: Enable building of tests, and
 concurrent make"

This reverts commit acfa8cb2a98f96d96c46b52c7563f0be3bf4e700.

This fails because none of the tests seems to be working for the version
that's in nixpkgs master.
---
 pkgs/applications/office/ledger/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index 10b971463e3f..387a71aa04ee 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ];
 
-  buildPhase = "make -j$NIX_BUILD_CORES";
-  checkPhase = "ctest -j$NIX_BUILD_CORES";
-
-  doCheck = true;
-
   # Skip byte-compiling of emacs-lisp files because this is currently
   # broken in ledger...
   postInstall = ''

From 97816bed335aaa55e8a897835d96602db9f080d2 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 4 Sep 2018 02:21:45 +0900
Subject: [PATCH 0167/3253] pythonPackages.alot: install zsh completion

---
 pkgs/development/python-modules/alot/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index dd06d4dde7a6..7c4e15f85683 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -47,6 +47,8 @@ buildPythonPackage rec {
     mkdir -p $out/share/{applications,alot}
     cp -r extra/themes $out/share/alot
 
+    install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
+
     sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
   '';
 

From fcccb9e5ca1102d470e5a9463b1dd63dd6ee6e61 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 3 Sep 2018 20:29:39 +0200
Subject: [PATCH 0168/3253] gitea: 1.5.0 -> 1.5.1 (#45968)

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.1
---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 592b348d03fd..c6eb563155f6 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca";
+    sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r";
   };
 
   patches = [ ./static-root-path.patch ];

From af5430808176d5da4b3d7fcaae41aef242926d76 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Mon, 3 Sep 2018 19:09:06 +0200
Subject: [PATCH 0169/3253] scuttlebot and git-ssb: init at 11.4.3 and 2.3.6

---
 .../node-packages/node-packages-v8.json       |    2 +
 .../node-packages/node-packages-v8.nix        | 4252 ++++++++++++++---
 2 files changed, 3616 insertions(+), 638 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 6ac941eb7c48..38d5008ad8c5 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -30,6 +30,7 @@
 , "fetch-bower"
 , "forever"
 , "git-run"
+, "git-ssb"
 , "git-standup"
 , "graphql-cli"
 , "grunt-cli"
@@ -95,6 +96,7 @@
 , "react-tools"
 , "react-native-cli"
 , "s3http"
+, "scuttlebot"
 , "semver"
 , "serve"
 , "shout"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 0e6970dbea18..3efef820a9b5 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -31,6 +31,15 @@ let
         sha512 = "QAZIFrfVRkjvMkUHIQKZXZ3La0V5t12w5PWrhihYEabHwzIZV/txQd/kSYHgYPXC4s5OURxsXZop9f0BzI2QIQ==";
       };
     };
+    "@babel/code-frame-7.0.0" = {
+      name = "_at_babel_slash_code-frame";
+      packageName = "@babel/code-frame";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz";
+        sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==";
+      };
+    };
     "@babel/generator-7.0.0-beta.38" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -40,6 +49,15 @@ let
         sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA==";
       };
     };
+    "@babel/highlight-7.0.0" = {
+      name = "_at_babel_slash_highlight";
+      packageName = "@babel/highlight";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz";
+        sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
+      };
+    };
     "@babel/runtime-7.0.0" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -193,13 +211,13 @@ let
         sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
       };
     };
-    "@lerna/add-3.1.4" = {
+    "@lerna/add-3.2.0" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "3.1.4";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-3.1.4.tgz";
-        sha512 = "jC4k1EkniPA003Fj8NQkRjdue29BJRRPfbnTqPCmhjmwQKy2dj71256o28eBYoWcouUivA0voz+r+H9sLMqbfA==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz";
+        sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw==";
       };
     };
     "@lerna/batch-packages-3.1.2" = {
@@ -211,22 +229,22 @@ let
         sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
       };
     };
-    "@lerna/bootstrap-3.1.4" = {
+    "@lerna/bootstrap-3.2.0" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "3.1.4";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.1.4.tgz";
-        sha512 = "GN3/ll73hXQzsFEKW1d6xgMKf6t4kxTXDGhiMF1uc8DdbrK1arA1MMWhXrjMYJAaMldMzNnGeE3Kb1MxKxXWPw==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz";
+        sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw==";
       };
     };
-    "@lerna/changed-3.1.3" = {
+    "@lerna/changed-3.2.0" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "3.1.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.1.3.tgz";
-        sha512 = "6KyyAl/qcxFeKOfuTDJlgh3aNOf6KQDxckEitmOFRi9scIZd7Igj/V9DQSvKoMORGk8wBwbpeLNJ9TN9xbm4qw==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz";
+        sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg==";
       };
     };
     "@lerna/check-working-tree-3.1.0" = {
@@ -256,13 +274,13 @@ let
         sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g==";
       };
     };
-    "@lerna/cli-3.1.4" = {
+    "@lerna/cli-3.2.0" = {
       name = "_at_lerna_slash_cli";
       packageName = "@lerna/cli";
-      version = "3.1.4";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.1.4.tgz";
-        sha512 = "e63YpwIgXU87gGDpqxr2mQnkxwIIt03FtgWlAId7uySVwTLT7j5u0yMbFR1CVkWvUSBY76JSCsX5u/Z1CfJUpQ==";
+        url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz";
+        sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==";
       };
     };
     "@lerna/collect-updates-3.1.0" = {
@@ -463,13 +481,13 @@ let
         sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ==";
       };
     };
-    "@lerna/npm-publish-3.0.6" = {
+    "@lerna/npm-publish-3.2.0" = {
       name = "_at_lerna_slash_npm-publish";
       packageName = "@lerna/npm-publish";
-      version = "3.0.6";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.6.tgz";
-        sha512 = "PlvKr958TowEOOe2yNtmUi/Ot42TS/edlmA7rj+XtDUR51AN3RB9G6b25TElyrnDksj1ayb3mOF7I2uf1gbyOw==";
+        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz";
+        sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw==";
       };
     };
     "@lerna/npm-run-script-3.0.0" = {
@@ -526,13 +544,13 @@ let
         sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ==";
       };
     };
-    "@lerna/publish-3.1.3" = {
+    "@lerna/publish-3.2.1" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.1.3";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.1.3.tgz";
-        sha512 = "vlHs1ll3HEbTVgO0hVFo9dMKixV9XO3T7OBCK835j8fw4TL/0y+YjmNjH5Y5Uyh02hZxcy/iosZNyGccu/fG3w==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz";
+        sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw==";
       };
     };
     "@lerna/resolve-symlink-3.0.0" = {
@@ -562,13 +580,13 @@ let
         sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA==";
       };
     };
-    "@lerna/run-lifecycle-3.0.0" = {
+    "@lerna/run-lifecycle-3.2.0" = {
       name = "_at_lerna_slash_run-lifecycle";
       packageName = "@lerna/run-lifecycle";
-      version = "3.0.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0.tgz";
-        sha512 = "kfq6eC5mCreTk7GusZyvF0/BfU9FDEt8JaUgzNKLrK1Sj6z2RO8uSpFsUlj+7OuV4wo0I+rdTdJOAFoW8C0GZw==";
+        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz";
+        sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg==";
       };
     };
     "@lerna/run-parallel-batches-3.0.0" = {
@@ -607,13 +625,13 @@ let
         sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
       };
     };
-    "@lerna/version-3.1.3" = {
+    "@lerna/version-3.2.0" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "3.1.3";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-3.1.3.tgz";
-        sha512 = "cKJc0FbSEJWdVLBpWgK1tM4nzwpVJ4IC3ESzEvTWYB0fIU/SAcf+m8x7d/kl8XtlybsKGegdMEgBWvzooaDQ9A==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz";
+        sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA==";
       };
     };
     "@lerna/write-log-file-3.0.0" = {
@@ -967,31 +985,31 @@ let
         sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==";
       };
     };
-    "@types/node-10.9.2" = {
+    "@types/node-10.9.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.9.2";
+      version = "10.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.9.2.tgz";
-        sha512 = "pwZnkVyCGJ3LsQ0/3flQK5lCFao4esIzwUVzzk5NvL9vnkEyDhNf4fhHzUMHvyr56gNZywWTS2MR0euabMSz4A==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz";
+        sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==";
       };
     };
-    "@types/node-6.0.116" = {
+    "@types/node-6.0.117" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.0.116";
+      version = "6.0.117";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz";
-        sha512 = "vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz";
+        sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg==";
       };
     };
-    "@types/node-8.10.28" = {
+    "@types/node-8.10.29" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.28";
+      version = "8.10.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz";
-        sha512 = "iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz";
+        sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==";
       };
     };
     "@types/range-parser-1.2.2" = {
@@ -1543,6 +1561,15 @@ let
         sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
       };
     };
+    "abstract-leveldown-4.0.3" = {
+      name = "abstract-leveldown";
+      packageName = "abstract-leveldown";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz";
+        sha512 = "qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA==";
+      };
+    };
     "abstract-random-access-1.1.2" = {
       name = "abstract-random-access";
       packageName = "abstract-random-access";
@@ -1732,13 +1759,13 @@ let
         sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
       };
     };
-    "addons-linter-1.2.6" = {
+    "addons-linter-1.3.1" = {
       name = "addons-linter";
       packageName = "addons-linter";
-      version = "1.2.6";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.2.6.tgz";
-        sha512 = "8WjSUoleic9x3gS8SZF0kIvffrX7WkiRPF8Xs8CZi7Yu/Xq0qX9LOYG2Q66t9ThmTeMItt/24FxirqqdyFLGgw==";
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.1.tgz";
+        sha512 = "Oaj8q8hXWwGhrzlMTM7LUxj5ZUxi8k8/pg0V/NlA3usgClngl7jXW4GRlobdoOao8KEnW95y/WNNMeoTbxYe4w==";
       };
     };
     "addr-to-ip-port-1.5.1" = {
@@ -1957,6 +1984,15 @@ let
         sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
       };
     };
+    "aligned-block-file-1.1.3" = {
+      name = "aligned-block-file";
+      packageName = "aligned-block-file";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.3.tgz";
+        sha512 = "ai/S+nZ9XMjC0ReZfq94OLGCICVBJyhNiKWmF1J+/GVZZaXtYV805plMi9obaWjfNl/QljB+VOsT+wQ7R858xA==";
+      };
+    };
     "almond-0.3.3" = {
       name = "almond";
       packageName = "almond";
@@ -2236,13 +2272,13 @@ let
         sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg==";
       };
     };
-    "apollo-cache-control-0.2.2" = {
+    "apollo-cache-control-0.2.3" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.2.2";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.2.tgz";
-        sha512 = "N5A1hO6nHZBCR+OCV58IlE7k6hZrFJZTf/Ab2WD8wduLSa0qLLRlCp3rXvD05+jpWa6sdKw03whW2omJ+SyT+w==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz";
+        sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w==";
       };
     };
     "apollo-cache-inmemory-1.2.9" = {
@@ -2272,22 +2308,22 @@ let
         sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng==";
       };
     };
-    "apollo-datasource-0.1.2" = {
+    "apollo-datasource-0.1.3" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.2.tgz";
-        sha512 = "AbUxS7Qkz9+T+g19zKRJiA+tBVGVVunzXwd4ftDSYGx1VrF5LJJO7Gc57bk719gWIZneZ02HsVCEZd6NxFF8RQ==";
+        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz";
+        sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw==";
       };
     };
-    "apollo-engine-reporting-0.0.2" = {
+    "apollo-engine-reporting-0.0.3" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "0.0.2";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.2.tgz";
-        sha512 = "Fe/1oxC8rUXRrBTMUiqs5PSb6hnMOJHuttJMhs83u5POfplc4QrKJZtEEU4Ui8mxeJGaGNWbWf+D4q645xdQLA==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz";
+        sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ==";
       };
     };
     "apollo-engine-reporting-protobuf-0.0.1" = {
@@ -2380,22 +2416,22 @@ let
         sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig==";
       };
     };
-    "apollo-server-core-2.0.4" = {
+    "apollo-server-core-2.0.5" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.4.tgz";
-        sha512 = "6kNaQYZfX2GvAT1g9ih0rodfRl4hPL1jXb7b+FvQ1foFR5Yyb3oqL2DOcP65gQi/7pGhyNRUAncPU18Vo3u9rQ==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz";
+        sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw==";
       };
     };
-    "apollo-server-env-2.0.2" = {
+    "apollo-server-env-2.0.3" = {
       name = "apollo-server-env";
       packageName = "apollo-server-env";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.2.tgz";
-        sha512 = "LsSh2TSF1Sh+TnKxCv2To+UNTnoPpBGCXn6fPsmiNqVaBaSagfZEU/aaSu3ftMlmfXr4vXAfYNUDMKEi+7E6Bg==";
+        url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz";
+        sha512 = "uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ==";
       };
     };
     "apollo-server-errors-2.0.2" = {
@@ -2407,22 +2443,22 @@ let
         sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg==";
       };
     };
-    "apollo-server-express-2.0.4" = {
+    "apollo-server-express-2.0.5" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.4.tgz";
-        sha512 = "9mxcFpnTgQTmrsvVRRofEY7N1bJYholjv99IfN8puu5lhNqj8ZbOPZYrw+zd+Yh4rZSonwx76ZzTRzM00Yllfw==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz";
+        sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA==";
       };
     };
-    "apollo-tracing-0.2.2" = {
+    "apollo-tracing-0.2.3" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.2.2";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.2.tgz";
-        sha512 = "zrpLRvaAqtzGufc1GfV+691xQtzq5elfBydg/7wzuaFszlMH66hkLas5Dw36drUX21CbCljOuGYvYzqSiKykuQ==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz";
+        sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA==";
       };
     };
     "apollo-upload-client-8.1.0" = {
@@ -2452,6 +2488,15 @@ let
         sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b";
       };
     };
+    "append-batch-0.0.1" = {
+      name = "append-batch";
+      packageName = "append-batch";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.1.tgz";
+        sha1 = "9224858e556997ccc07f11f1ee9a128532aa0d25";
+      };
+    };
     "append-buffer-1.0.2" = {
       name = "append-buffer";
       packageName = "append-buffer";
@@ -2493,7 +2538,7 @@ let
       packageName = "applicationinsights";
       version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
         sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
@@ -3163,6 +3208,24 @@ let
         sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw==";
       };
     };
+    "async-single-1.0.5" = {
+      name = "async-single";
+      packageName = "async-single";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-single/-/async-single-1.0.5.tgz";
+        sha1 = "125dd09de95d3ea30a378adbed021092179b03c9";
+      };
+    };
+    "async-write-2.1.0" = {
+      name = "async-write";
+      packageName = "async-write";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz";
+        sha1 = "1e762817d849ce44bfac07925a42036787061b15";
+      };
+    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -3172,6 +3235,15 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
+    "asyncmemo-1.0.0" = {
+      name = "asyncmemo";
+      packageName = "asyncmemo";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asyncmemo/-/asyncmemo-1.0.0.tgz";
+        sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1";
+      };
+    };
     "atob-2.1.2" = {
       name = "atob";
       packageName = "atob";
@@ -3190,6 +3262,33 @@ let
         sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4";
       };
     };
+    "atomic-file-0.0.1" = {
+      name = "atomic-file";
+      packageName = "atomic-file";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atomic-file/-/atomic-file-0.0.1.tgz";
+        sha1 = "6c36658f6c4ece33fba3877731e7c25fc82999bb";
+      };
+    };
+    "atomic-file-1.1.5" = {
+      name = "atomic-file";
+      packageName = "atomic-file";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz";
+        sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ==";
+      };
+    };
+    "attach-ware-1.1.1" = {
+      name = "attach-ware";
+      packageName = "attach-ware";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/attach-ware/-/attach-ware-1.1.1.tgz";
+        sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3";
+      };
+    };
     "auto-bind-1.2.1" = {
       name = "auto-bind";
       packageName = "auto-bind";
@@ -3204,17 +3303,17 @@ let
       packageName = "aws-sdk";
       version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+        url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.303.0" = {
+    "aws-sdk-2.307.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.303.0";
+      version = "2.307.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.303.0.tgz";
-        sha512 = "3AMEO/+aKNKvnIg1StF30Itbhs1SdUrUirCqlggS4bhLLOvyJVTrY+tJwASnPGsye4ffD6Qw8LRnaCytvDKkoQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz";
+        sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg==";
       };
     };
     "aws-sign-0.2.1" = {
@@ -3384,7 +3483,7 @@ let
       packageName = "azure-arm-network";
       version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
+        url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz";
         sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig==";
       };
     };
@@ -3447,7 +3546,7 @@ let
       packageName = "azure-arm-website";
       version = "0.11.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
+        url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
         sha1 = "51942423e1238ec19e551926353a8e9f73bc534a";
       };
     };
@@ -3672,7 +3771,7 @@ let
       packageName = "babel-plugin-syntax-jsx";
       version = "6.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
+        url = "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
         sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946";
       };
     };
@@ -3681,7 +3780,7 @@ let
       packageName = "babel-plugin-syntax-object-rest-spread";
       version = "6.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
+        url = "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
         sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
       };
     };
@@ -3717,7 +3816,7 @@ let
       packageName = "babel-polyfill";
       version = "6.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz";
+        url = "http://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz";
         sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422";
       };
     };
@@ -3829,6 +3928,15 @@ let
         sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
       };
     };
+    "bail-1.0.3" = {
+      name = "bail";
+      packageName = "bail";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
+        sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==";
+      };
+    };
     "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
@@ -3928,6 +4036,15 @@ let
         sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
       };
     };
+    "base64-url-2.2.0" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.0.tgz";
+        sha512 = "Y4qHHAE+rWjmAFPQmHPiiD+hWwM/XvuFLlP6kVxlwZJK7rjiE2uIQR9tZ37iEr1E6iCj9799yxMAmiXzITb3lQ==";
+      };
+    };
     "base64id-0.1.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -3946,6 +4063,15 @@ let
         sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
+    "bash-color-0.0.4" = {
+      name = "bash-color";
+      packageName = "bash-color";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz";
+        sha1 = "e9be8ce33540cada4881768c59bd63865736e913";
+      };
+    };
     "basic-auth-1.0.4" = {
       name = "basic-auth";
       packageName = "basic-auth";
@@ -4108,13 +4234,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.34" = {
+    "big-integer-1.6.35" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.34";
+      version = "1.6.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.34.tgz";
-        sha512 = "+w6B0Uo0ZvTSzDkXjoBCTNK0oe+aVL+yPi7kwGZm8hd8+Nj1AFPoxoq1Bl/mEu/G/ivOkUc1LRqVR0XeWFUzuA==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz";
+        sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ==";
       };
     };
     "big.js-3.2.0" = {
@@ -4248,7 +4374,7 @@ let
       packageName = "bittorrent-dht";
       version = "6.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz";
+        url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz";
         sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6";
       };
     };
@@ -4261,13 +4387,13 @@ let
         sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ==";
       };
     };
-    "bittorrent-dht-8.4.0" = {
+    "bittorrent-dht-9.0.0" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
-      version = "8.4.0";
+      version = "9.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz";
-        sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ==";
+        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz";
+        sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ==";
       };
     };
     "bittorrent-peerid-1.3.0" = {
@@ -4360,6 +4486,15 @@ let
         sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA==";
       };
     };
+    "blake2s-1.0.1" = {
+      name = "blake2s";
+      packageName = "blake2s";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blake2s/-/blake2s-1.0.1.tgz";
+        sha1 = "1598822a320ece6aa401ba982954f82f61b0cd7b";
+      };
+    };
     "blob-0.0.2" = {
       name = "blob";
       packageName = "blob";
@@ -4410,7 +4545,7 @@ let
       packageName = "bluebird";
       version = "2.9.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz";
+        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz";
         sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8";
       };
     };
@@ -4419,17 +4554,17 @@ let
       packageName = "bluebird";
       version = "2.9.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
+        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz";
         sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3";
       };
     };
-    "bluebird-3.5.1" = {
+    "bluebird-3.5.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.5.1";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
-        sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz";
+        sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==";
       };
     };
     "blueimp-md5-2.10.0" = {
@@ -4684,6 +4819,15 @@ let
         sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
       };
     };
+    "broadcast-stream-0.2.2" = {
+      name = "broadcast-stream";
+      packageName = "broadcast-stream";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/broadcast-stream/-/broadcast-stream-0.2.2.tgz";
+        sha1 = "79e7bb14a9abba77f72ac9258220242a8fd3919d";
+      };
+    };
     "broadway-0.3.6" = {
       name = "broadway";
       packageName = "broadway";
@@ -4878,7 +5022,7 @@ let
       packageName = "buffer";
       version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
+        url = "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
         sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
       };
     };
@@ -4887,17 +5031,17 @@ let
       packageName = "buffer";
       version = "4.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        url = "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
         sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
       };
     };
-    "buffer-5.2.0" = {
+    "buffer-5.2.1" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.2.0";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz";
-        sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
+        sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -5476,13 +5620,13 @@ let
         sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
       };
     };
-    "capture-stack-trace-1.0.0" = {
+    "capture-stack-trace-1.0.1" = {
       name = "capture-stack-trace";
       packageName = "capture-stack-trace";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
-        sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
+        url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
+        sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
       };
     };
     "caseless-0.11.0" = {
@@ -5539,6 +5683,15 @@ let
         sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==";
       };
     };
+    "ccount-1.0.3" = {
+      name = "ccount";
+      packageName = "ccount";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
+        sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==";
+      };
+    };
     "center-align-0.1.3" = {
       name = "center-align";
       packageName = "center-align";
@@ -5580,7 +5733,7 @@ let
       packageName = "chalk";
       version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
         sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
       };
     };
@@ -5589,7 +5742,7 @@ let
       packageName = "chalk";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+        url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
         sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
       };
     };
@@ -5598,7 +5751,7 @@ let
       packageName = "chalk";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+        url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
         sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
       };
     };
@@ -5607,7 +5760,7 @@ let
       packageName = "chalk";
       version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        url = "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
         sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
@@ -5625,7 +5778,7 @@ let
       packageName = "chalk";
       version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
+        url = "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz";
         sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==";
       };
     };
@@ -5656,6 +5809,33 @@ let
         sha512 = "Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA==";
       };
     };
+    "character-entities-1.2.2" = {
+      name = "character-entities";
+      packageName = "character-entities";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
+        sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==";
+      };
+    };
+    "character-entities-html4-1.1.2" = {
+      name = "character-entities-html4";
+      packageName = "character-entities-html4";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+        sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==";
+      };
+    };
+    "character-entities-legacy-1.1.2" = {
+      name = "character-entities-legacy";
+      packageName = "character-entities-legacy";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==";
+      };
+    };
     "character-parser-1.2.1" = {
       name = "character-parser";
       packageName = "character-parser";
@@ -5674,6 +5854,15 @@ let
         sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
       };
     };
+    "character-reference-invalid-1.1.2" = {
+      name = "character-reference-invalid";
+      packageName = "character-reference-invalid";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==";
+      };
+    };
     "chardet-0.4.2" = {
       name = "chardet";
       packageName = "chardet";
@@ -5683,13 +5872,13 @@ let
         sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2";
       };
     };
-    "chardet-0.5.0" = {
+    "chardet-0.7.0" = {
       name = "chardet";
       packageName = "chardet";
-      version = "0.5.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz";
-        sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g==";
+        url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz";
+        sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
     "charenc-0.0.2" = {
@@ -5701,6 +5890,15 @@ let
         sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
       };
     };
+    "charwise-3.0.1" = {
+      name = "charwise";
+      packageName = "charwise";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/charwise/-/charwise-3.0.1.tgz";
+        sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw==";
+      };
+    };
     "check-error-1.0.2" = {
       name = "check-error";
       packageName = "check-error";
@@ -5746,6 +5944,24 @@ let
         sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db";
       };
     };
+    "chloride-2.2.10" = {
+      name = "chloride";
+      packageName = "chloride";
+      version = "2.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chloride/-/chloride-2.2.10.tgz";
+        sha512 = "CbU1ISGiB2JBV6PDXx7hkl8D94d2TPD1BANUMFbr8rZYKJi8De2d3Hu2XDIOLAhXf+8yhoFOdjtLG6fxz3QByQ==";
+      };
+    };
+    "chloride-test-1.2.2" = {
+      name = "chloride-test";
+      packageName = "chloride-test";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.2.tgz";
+        sha1 = "178686a85e9278045112e96e8c791793f9a10aea";
+      };
+    };
     "chmodr-1.0.2" = {
       name = "chmodr";
       packageName = "chmodr";
@@ -5953,15 +6169,6 @@ let
         sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
       };
     };
-    "cli-0.6.6" = {
-      name = "cli";
-      packageName = "cli";
-      version = "0.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz";
-        sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3";
-      };
-    };
     "cli-1.0.1" = {
       name = "cli";
       packageName = "cli";
@@ -6412,6 +6619,15 @@ let
         sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
       };
     };
+    "collapse-white-space-1.0.4" = {
+      name = "collapse-white-space";
+      packageName = "collapse-white-space";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+        sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==";
+      };
+    };
     "collection-visit-1.0.0" = {
       name = "collection-visit";
       packageName = "collection-visit";
@@ -7177,6 +7393,15 @@ let
         sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a";
       };
     };
+    "cont-1.0.3" = {
+      name = "cont";
+      packageName = "cont";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cont/-/cont-1.0.3.tgz";
+        sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0";
+      };
+    };
     "content-disposition-0.5.0" = {
       name = "content-disposition";
       packageName = "content-disposition";
@@ -7223,6 +7448,60 @@ let
         sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578";
       };
     };
+    "continuable-1.1.8" = {
+      name = "continuable";
+      packageName = "continuable";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable/-/continuable-1.1.8.tgz";
+        sha1 = "dc877b474160870ae3bcde87336268ebe50597d5";
+      };
+    };
+    "continuable-1.2.0" = {
+      name = "continuable";
+      packageName = "continuable";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable/-/continuable-1.2.0.tgz";
+        sha1 = "08277468d41136200074ccf87294308d169f25b6";
+      };
+    };
+    "continuable-hash-0.1.4" = {
+      name = "continuable-hash";
+      packageName = "continuable-hash";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable-hash/-/continuable-hash-0.1.4.tgz";
+        sha1 = "81c74d41771d8c92783e1e00e5f11b34d6dfc78c";
+      };
+    };
+    "continuable-list-0.1.6" = {
+      name = "continuable-list";
+      packageName = "continuable-list";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable-list/-/continuable-list-0.1.6.tgz";
+        sha1 = "87cf06ec580716e10dff95fb0b84c5f0e8acac5f";
+      };
+    };
+    "continuable-para-1.2.0" = {
+      name = "continuable-para";
+      packageName = "continuable-para";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable-para/-/continuable-para-1.2.0.tgz";
+        sha1 = "445510f649459dd0fc35c872015146122731c583";
+      };
+    };
+    "continuable-series-1.2.0" = {
+      name = "continuable-series";
+      packageName = "continuable-series";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/continuable-series/-/continuable-series-1.2.0.tgz";
+        sha1 = "3243397ae93a71d655b3026834a51590b958b9e8";
+      };
+    };
     "conventional-changelog-angular-1.6.6" = {
       name = "conventional-changelog-angular";
       packageName = "conventional-changelog-angular";
@@ -7718,13 +7997,13 @@ let
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "create-torrent-3.32.1" = {
+    "create-torrent-3.33.0" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "3.32.1";
+      version = "3.33.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.1.tgz";
-        sha512 = "8spZUeFyVc+2mGnWBRTuLOhuHmHrmUomFWf7QvxztCEvTpn5SIrvF8F+HKdkzBPM9B7v/2w+f/65jqLWBXSndg==";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.33.0.tgz";
+        sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA==";
       };
     };
     "cron-1.3.0" = {
@@ -8006,13 +8285,13 @@ let
         sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8";
       };
     };
-    "csslint-0.10.0" = {
+    "csslint-1.0.5" = {
       name = "csslint";
       packageName = "csslint";
-      version = "0.10.0";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz";
-        sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805";
+        url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
+        sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9";
       };
     };
     "csso-3.5.1" = {
@@ -8798,6 +9077,15 @@ let
         sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
       };
     };
+    "deferred-leveldown-3.0.0" = {
+      name = "deferred-leveldown";
+      packageName = "deferred-leveldown";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz";
+        sha512 = "ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ==";
+      };
+    };
     "define-properties-1.1.3" = {
       name = "define-properties";
       packageName = "define-properties";
@@ -9014,6 +9302,15 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
+    "detab-1.0.2" = {
+      name = "detab";
+      packageName = "detab";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detab/-/detab-1.0.2.tgz";
+        sha1 = "01bc2a4abe7bc7cc67c3039808edbae47049a0ee";
+      };
+    };
     "detect-file-1.0.0" = {
       name = "detect-file";
       packageName = "detect-file";
@@ -9221,13 +9518,13 @@ let
         sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718";
       };
     };
-    "dispensary-0.21.0" = {
+    "dispensary-0.22.0" = {
       name = "dispensary";
       packageName = "dispensary";
-      version = "0.21.0";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.21.0.tgz";
-        sha512 = "p7qK1sLukrOGYVVcea63lN9CSiE8wO61cweOjtG6MnKoeC9uKHRIO1iJuE5izcX0BeimhkqrQwEMrFWC1yOyAw==";
+        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.22.0.tgz";
+        sha512 = "iwpIOQ4T+fJ55PAPE4G7b8MubUN8dGyZa78VrD6A+XqSnqs844npoGvpwSEETnn064JaaS4gqLcgAfTGR4p2+g==";
       };
     };
     "diveSync-0.3.0" = {
@@ -9716,13 +10013,22 @@ let
         sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3";
       };
     };
-    "ecstatic-3.2.1" = {
+    "ecstatic-3.3.0" = {
       name = "ecstatic";
       packageName = "ecstatic";
-      version = "3.2.1";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz";
-        sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg==";
+        url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.0.tgz";
+        sha512 = "EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw==";
+      };
+    };
+    "ed2curve-0.1.4" = {
+      name = "ed2curve";
+      packageName = "ed2curve";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ed2curve/-/ed2curve-0.1.4.tgz";
+        sha1 = "94a44248bb87da35db0eff7af0aa576168117f59";
       };
     };
     "editions-1.3.4" = {
@@ -9734,13 +10040,13 @@ let
         sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==";
       };
     };
-    "editions-2.0.1" = {
+    "editions-2.0.2" = {
       name = "editions";
       packageName = "editions";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-2.0.1.tgz";
-        sha512 = "GNBqG7eF4lxz/jPGM1A/oazdRW9D86OMeggfvCXuA9kcxBJ8fcWO1O8q73pepQlwR8+KecxrgGduwdNeZJ0R9Q==";
+        url = "https://registry.npmjs.org/editions/-/editions-2.0.2.tgz";
+        sha512 = "0B8aSTWUu9+JW99zHoeogavCi+lkE5l35FK0OKe0pCobixJYoeof3ZujtqYzSsU2MskhRadY5V9oWUuyG4aJ3A==";
       };
     };
     "editor-1.0.0" = {
@@ -9861,6 +10167,15 @@ let
         sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
       };
     };
+    "emoji-named-characters-1.0.2" = {
+      name = "emoji-named-characters";
+      packageName = "emoji-named-characters";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-named-characters/-/emoji-named-characters-1.0.2.tgz";
+        sha1 = "cdeb36d0e66002c4b9d7bf1dfbc3a199fb7d409b";
+      };
+    };
     "emoji-regex-6.1.1" = {
       name = "emoji-regex";
       packageName = "emoji-regex";
@@ -9870,6 +10185,15 @@ let
         sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
       };
     };
+    "emoji-server-1.0.0" = {
+      name = "emoji-server";
+      packageName = "emoji-server";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-server/-/emoji-server-1.0.0.tgz";
+        sha1 = "d063cfee9af118cc5aeefbc2e9b3dd5085815c63";
+      };
+    };
     "emojis-list-2.1.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
@@ -9906,6 +10230,15 @@ let
         sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
+    "encoding-down-4.0.1" = {
+      name = "encoding-down";
+      packageName = "encoding-down";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz";
+        sha512 = "AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ==";
+      };
+    };
     "end-of-stream-0.1.5" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
@@ -10113,6 +10446,15 @@ let
         sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g==";
       };
     };
+    "epidemic-broadcast-trees-6.3.4" = {
+      name = "epidemic-broadcast-trees";
+      packageName = "epidemic-broadcast-trees";
+      version = "6.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/epidemic-broadcast-trees/-/epidemic-broadcast-trees-6.3.4.tgz";
+        sha512 = "ucs3AI3ebPCDFGw8B0SUBwzcY2WqKrbJeqYeeX9KF+XvsO7GFEe0L+1hXPfJcEScfGPByXJNACkYwUFnNaOueQ==";
+      };
+    };
     "err-code-1.1.2" = {
       name = "err-code";
       packageName = "err-code";
@@ -10437,13 +10779,13 @@ let
         sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
       };
     };
-    "eslint-5.4.0" = {
+    "eslint-5.5.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "5.4.0";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz";
-        sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
+        sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -10694,7 +11036,7 @@ let
       packageName = "eventemitter2";
       version = "0.4.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
@@ -10950,6 +11292,15 @@ let
         sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
       };
     };
+    "explain-error-1.0.4" = {
+      name = "explain-error";
+      packageName = "explain-error";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/explain-error/-/explain-error-1.0.4.tgz";
+        sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929";
+      };
+    };
     "express-2.5.11" = {
       name = "express";
       packageName = "express";
@@ -11157,12 +11508,21 @@ let
         sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
       };
     };
+    "extend.js-0.0.2" = {
+      name = "extend.js";
+      packageName = "extend.js";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
+        sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
+      };
+    };
     "external-editor-1.1.1" = {
       name = "external-editor";
       packageName = "external-editor";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
+        url = "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz";
         sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b";
       };
     };
@@ -11171,17 +11531,17 @@ let
       packageName = "external-editor";
       version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
+        url = "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz";
         sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==";
       };
     };
-    "external-editor-3.0.1" = {
+    "external-editor-3.0.3" = {
       name = "external-editor";
       packageName = "external-editor";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz";
-        sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q==";
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz";
+        sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==";
       };
     };
     "extglob-0.3.2" = {
@@ -11346,6 +11706,15 @@ let
         sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==";
       };
     };
+    "fast-future-1.0.2" = {
+      name = "fast-future";
+      packageName = "fast-future";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz";
+        sha1 = "8435a9aaa02d79248d17d704e76259301d99280a";
+      };
+    };
     "fast-glob-2.2.2" = {
       name = "fast-glob";
       packageName = "fast-glob";
@@ -11369,17 +11738,17 @@ let
       packageName = "fast-json-patch";
       version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
+        url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
         sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
       };
     };
-    "fast-json-patch-2.0.6" = {
+    "fast-json-patch-2.0.7" = {
       name = "fast-json-patch";
       packageName = "fast-json-patch";
-      version = "2.0.6";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz";
-        sha1 = "86fff8f8662391aa819722864d632e603e6ee605";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.7.tgz";
+        sha512 = "DQeoEyPYxdTtfmB3yDlxkLyKTdbJ6ABfFGcMynDqjvGhPYLto/pZyb/dG2Nyd/n9CArjEWN9ZST++AFmgzgbGw==";
       };
     };
     "fast-json-stable-stringify-2.0.0" = {
@@ -11823,13 +12192,13 @@ let
         sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
       };
     };
-    "firefox-profile-1.1.0" = {
+    "firefox-profile-1.2.0" = {
       name = "firefox-profile";
       packageName = "firefox-profile";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz";
-        sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA==";
+        url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.2.0.tgz";
+        sha512 = "TTEFfPOkyaz4EWx/5ZDQC1mJAe3a+JgVcchpIfD4Tvx1UspwlTJRJxOYA35x/z2iJcxaF6aW2rdh6oj6qwgd2g==";
       };
     };
     "first-chunk-stream-1.0.0" = {
@@ -11949,6 +12318,88 @@ let
         sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg==";
       };
     };
+    "flumecodec-0.0.0" = {
+      name = "flumecodec";
+      packageName = "flumecodec";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.0.tgz";
+        sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b";
+      };
+    };
+    "flumecodec-0.0.1" = {
+      name = "flumecodec";
+      packageName = "flumecodec";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz";
+        sha1 = "ae049a714386bb83e342657a82924b70364a90d6";
+      };
+    };
+    "flumedb-0.4.9" = {
+      name = "flumedb";
+      packageName = "flumedb";
+      version = "0.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz";
+        sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw==";
+      };
+    };
+    "flumelog-offset-3.3.1" = {
+      name = "flumelog-offset";
+      packageName = "flumelog-offset";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz";
+        sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA==";
+      };
+    };
+    "flumeview-hashtable-1.0.4" = {
+      name = "flumeview-hashtable";
+      packageName = "flumeview-hashtable";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.0.4.tgz";
+        sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw==";
+      };
+    };
+    "flumeview-level-3.0.5" = {
+      name = "flumeview-level";
+      packageName = "flumeview-level";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz";
+        sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA==";
+      };
+    };
+    "flumeview-query-6.3.0" = {
+      name = "flumeview-query";
+      packageName = "flumeview-query";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-6.3.0.tgz";
+        sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw==";
+      };
+    };
+    "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = {
+      name = "flumeview-query";
+      packageName = "flumeview-query";
+      version = "6.2.0";
+      src = fetchgit {
+        url = "git://github.com/mmckegg/flumeview-query";
+        rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733";
+        sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f";
+      };
+    };
+    "flumeview-reduce-1.3.13" = {
+      name = "flumeview-reduce";
+      packageName = "flumeview-reduce";
+      version = "1.3.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz";
+        sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ==";
+      };
+    };
     "flush-write-stream-1.0.3" = {
       name = "flush-write-stream";
       packageName = "flush-write-stream";
@@ -12606,13 +13057,13 @@ let
         sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
       };
     };
-    "generate-function-2.2.0" = {
+    "generate-function-2.3.1" = {
       name = "generate-function";
       packageName = "generate-function";
-      version = "2.2.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.2.0.tgz";
-        sha512 = "EYWRyUEUdNSsmfMZ2udk1AaxEmJQBaCNgfh+FJo0lcUvP42nyR/Xe30kCyxZs7e6t47bpZw0HftWF+KFjD/Lzg==";
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz";
+        sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==";
       };
     };
     "generate-object-property-1.2.0" = {
@@ -12768,13 +13219,13 @@ let
         sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
       };
     };
-    "getmac-1.4.5" = {
+    "getmac-1.4.6" = {
       name = "getmac";
       packageName = "getmac";
-      version = "1.4.5";
+      version = "1.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getmac/-/getmac-1.4.5.tgz";
-        sha512 = "Y4Zu6i3zXAnH+Q2zSdnV8SSmyu3BisdfQhsH8YLsC/7vTxgNTTT/JzHWmU3tZEim8hvaCtZLaE5E95wo8P4oGQ==";
+        url = "https://registry.npmjs.org/getmac/-/getmac-1.4.6.tgz";
+        sha512 = "3JPwiIr4P6Sgr6y6SVXX0+l2mrB6pyf4Cdyua7rvEV7SveWQkAp11vrkNym8wvRxzLrBenKRcwe93asdghuwWg==";
       };
     };
     "getpass-0.1.6" = {
@@ -12822,6 +13273,15 @@ let
         sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664";
       };
     };
+    "git-packidx-parser-1.0.0" = {
+      name = "git-packidx-parser";
+      packageName = "git-packidx-parser";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-packidx-parser/-/git-packidx-parser-1.0.0.tgz";
+        sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6";
+      };
+    };
     "git-raw-commits-1.3.6" = {
       name = "git-raw-commits";
       packageName = "git-raw-commits";
@@ -12840,6 +13300,15 @@ let
         sha1 = "5282659dae2107145a11126112ad3216ec5fa65f";
       };
     };
+    "git-remote-ssb-2.0.4" = {
+      name = "git-remote-ssb";
+      packageName = "git-remote-ssb";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-remote-ssb/-/git-remote-ssb-2.0.4.tgz";
+        sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906";
+      };
+    };
     "git-rev-sync-1.9.1" = {
       name = "git-rev-sync";
       packageName = "git-rev-sync";
@@ -12858,6 +13327,15 @@ let
         sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==";
       };
     };
+    "git-ssb-web-2.8.0" = {
+      name = "git-ssb-web";
+      packageName = "git-ssb-web";
+      version = "2.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-ssb-web/-/git-ssb-web-2.8.0.tgz";
+        sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g==";
+      };
+    };
     "gitconfiglocal-1.0.0" = {
       name = "gitconfiglocal";
       packageName = "gitconfiglocal";
@@ -13156,6 +13634,15 @@ let
         sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
+    "globby-4.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
+      };
+    };
     "globby-5.0.0" = {
       name = "globby";
       packageName = "globby";
@@ -13206,7 +13693,7 @@ let
       packageName = "got";
       version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz";
+        url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
         sha1 = "d9430ba32f6a30218243884418767340aafc0400";
       };
     };
@@ -13215,7 +13702,7 @@ let
       packageName = "got";
       version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
+        url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz";
         sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
       };
     };
@@ -13224,7 +13711,7 @@ let
       packageName = "got";
       version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz";
+        url = "http://registry.npmjs.org/got/-/got-6.7.1.tgz";
         sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0";
       };
     };
@@ -13332,7 +13819,7 @@ let
       packageName = "graphql";
       version = "0.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz";
+        url = "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz";
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
@@ -13408,13 +13895,13 @@ let
         sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw==";
       };
     };
-    "graphql-extensions-0.1.2" = {
+    "graphql-extensions-0.1.3" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.2.tgz";
-        sha512 = "A81kfGtOKG0/1sDQGm23u60bkTuk9VDof0SrQrz7yNpPLY48JF11b8+4LNlYfEBVvceDbLAs1KRfyLQskJjJSg==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz";
+        sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA==";
       };
     };
     "graphql-import-0.4.5" = {
@@ -13507,6 +13994,15 @@ let
         sha1 = "d2c177e2f1b17d87f81072cd05311c0754baa420";
       };
     };
+    "graphreduce-3.0.4" = {
+      name = "graphreduce";
+      packageName = "graphreduce";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphreduce/-/graphreduce-3.0.4.tgz";
+        sha1 = "bf442d0a878e83901e5ef3e652d23ffb5b831ed7";
+      };
+    };
     "gray-matter-2.1.1" = {
       name = "gray-matter";
       packageName = "gray-matter";
@@ -13849,6 +14345,15 @@ let
         sha1 = "6414c82913697da51590397dafb12f22967811ce";
       };
     };
+    "has-network-0.0.1" = {
+      name = "has-network";
+      packageName = "has-network";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-network/-/has-network-0.0.1.tgz";
+        sha1 = "3eea7b44caa9601797124be8ba89d228c4101499";
+      };
+    };
     "has-symbol-support-x-1.4.2" = {
       name = "has-symbol-support-x";
       packageName = "has-symbol-support-x";
@@ -13975,6 +14480,15 @@ let
         sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
       };
     };
+    "hashlru-2.2.1" = {
+      name = "hashlru";
+      packageName = "hashlru";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hashlru/-/hashlru-2.2.1.tgz";
+        sha1 = "10f2099a0d7c05a40f2beaf5c1d39cf2f7dabf36";
+      };
+    };
     "hashring-3.2.0" = {
       name = "hashring";
       packageName = "hashring";
@@ -14020,6 +14534,15 @@ let
         sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==";
       };
     };
+    "he-0.5.0" = {
+      name = "he";
+      packageName = "he";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz";
+        sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2";
+      };
+    };
     "he-1.1.1" = {
       name = "he";
       packageName = "he";
@@ -14074,6 +14597,15 @@ let
         sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
       };
     };
+    "highlight.js-9.12.0" = {
+      name = "highlight.js";
+      packageName = "highlight.js";
+      version = "9.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
+        sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+      };
+    };
     "hiredis-0.4.1" = {
       name = "hiredis";
       packageName = "hiredis";
@@ -14164,6 +14696,15 @@ let
         sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
       };
     };
+    "hoox-0.0.1" = {
+      name = "hoox";
+      packageName = "hoox";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz";
+        sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
+      };
+    };
     "hosted-git-info-2.7.1" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -14785,6 +15326,15 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
+    "increment-buffer-1.0.1" = {
+      name = "increment-buffer";
+      packageName = "increment-buffer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/increment-buffer/-/increment-buffer-1.0.1.tgz";
+        sha1 = "65076d75189d808b39ad13ab5b958e05216f9e0d";
+      };
+    };
     "indent-string-2.1.0" = {
       name = "indent-string";
       packageName = "indent-string";
@@ -15046,6 +15596,15 @@ let
         sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg==";
       };
     };
+    "int53-0.2.4" = {
+      name = "int53";
+      packageName = "int53";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/int53/-/int53-0.2.4.tgz";
+        sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86";
+      };
+    };
     "int64-buffer-0.1.10" = {
       name = "int64-buffer";
       packageName = "int64-buffer";
@@ -15109,6 +15668,24 @@ let
         sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
+    "invert-kv-2.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+      };
+    };
+    "ip-0.3.3" = {
+      name = "ip";
+      packageName = "ip";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz";
+        sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4";
+      };
+    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -15181,6 +15758,15 @@ let
         sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79";
       };
     };
+    "irregular-plurals-1.4.0" = {
+      name = "irregular-plurals";
+      packageName = "irregular-plurals";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz";
+        sha1 = "2ca9b033651111855412f16be5d77c62a458a766";
+      };
+    };
     "is-3.2.1" = {
       name = "is";
       packageName = "is";
@@ -15235,6 +15821,24 @@ let
         sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
       };
     };
+    "is-alphabetical-1.0.2" = {
+      name = "is-alphabetical";
+      packageName = "is-alphabetical";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==";
+      };
+    };
+    "is-alphanumerical-1.0.2" = {
+      name = "is-alphanumerical";
+      packageName = "is-alphanumerical";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==";
+      };
+    };
     "is-arguments-1.0.2" = {
       name = "is-arguments";
       packageName = "is-arguments";
@@ -15343,6 +15947,15 @@ let
         sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
       };
     };
+    "is-decimal-1.0.2" = {
+      name = "is-decimal";
+      packageName = "is-decimal";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==";
+      };
+    };
     "is-descriptor-0.1.6" = {
       name = "is-descriptor";
       packageName = "is-descriptor";
@@ -15388,6 +16001,15 @@ let
         sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
       };
     };
+    "is-electron-2.1.0" = {
+      name = "is-electron";
+      packageName = "is-electron";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-electron/-/is-electron-2.1.0.tgz";
+        sha512 = "dkg5xT383+M6zIbbXW/z7n2nz4SFUi2OSyhntnFYkRdtV+HVEfdjEK+5AWisfYgkpe3WYjTIuh7toaKmSfFVWw==";
+      };
+    };
     "is-equal-shallow-0.1.3" = {
       name = "is-equal-shallow";
       packageName = "is-equal-shallow";
@@ -15514,6 +16136,15 @@ let
         sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
       };
     };
+    "is-hexadecimal-1.0.2" = {
+      name = "is-hexadecimal";
+      packageName = "is-hexadecimal";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==";
+      };
+    };
     "is-installed-globally-0.1.0" = {
       name = "is-installed-globally";
       packageName = "is-installed-globally";
@@ -15955,6 +16586,15 @@ let
         sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
+    "is-valid-domain-0.0.5" = {
+      name = "is-valid-domain";
+      packageName = "is-valid-domain";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz";
+        sha1 = "48e70319fcb43009236e96b37f9843889ce7b513";
+      };
+    };
     "is-valid-glob-1.0.0" = {
       name = "is-valid-glob";
       packageName = "is-valid-glob";
@@ -16423,13 +17063,22 @@ let
         sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe";
       };
     };
-    "jshint-2.8.0" = {
+    "jshint-2.9.6" = {
       name = "jshint";
       packageName = "jshint";
-      version = "2.8.0";
+      version = "2.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz";
-        sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44";
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
+        sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+      };
+    };
+    "json-buffer-2.0.11" = {
+      name = "json-buffer";
+      packageName = "json-buffer";
+      version = "2.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz";
+        sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f";
       };
     };
     "json-buffer-3.0.0" = {
@@ -16905,7 +17554,7 @@ let
       packageName = "k-bucket";
       version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz";
+        url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz";
         sha1 = "afc532545f69d466293e887b00d5fc73377c3abb";
       };
     };
@@ -16914,7 +17563,7 @@ let
       packageName = "k-bucket";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz";
+        url = "http://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz";
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
@@ -16936,6 +17585,15 @@ let
         sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ==";
       };
     };
+    "k-bucket-5.0.0" = {
+      name = "k-bucket";
+      packageName = "k-bucket";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz";
+        sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w==";
+      };
+    };
     "k-rpc-3.7.0" = {
       name = "k-rpc";
       packageName = "k-rpc";
@@ -17189,6 +17847,24 @@ let
         sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
       };
     };
+    "kvgraph-0.1.0" = {
+      name = "kvgraph";
+      packageName = "kvgraph";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kvgraph/-/kvgraph-0.1.0.tgz";
+        sha1 = "068eed75b8d9bae75c1219da41eea0e433cd748c";
+      };
+    };
+    "kvset-1.0.0" = {
+      name = "kvset";
+      packageName = "kvset";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kvset/-/kvset-1.0.0.tgz";
+        sha1 = "24f68db8ecb155498c9ecb56aef40ae24509872f";
+      };
+    };
     "labeled-stream-splicer-2.0.1" = {
       name = "labeled-stream-splicer";
       packageName = "labeled-stream-splicer";
@@ -17279,6 +17955,15 @@ let
         sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
       };
     };
+    "lcid-2.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+      };
+    };
     "lead-1.0.0" = {
       name = "lead";
       packageName = "lead";
@@ -17333,6 +18018,51 @@ let
         sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
       };
     };
+    "level-3.0.2" = {
+      name = "level";
+      packageName = "level";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level/-/level-3.0.2.tgz";
+        sha512 = "2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg==";
+      };
+    };
+    "level-codec-6.2.0" = {
+      name = "level-codec";
+      packageName = "level-codec";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz";
+        sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4";
+      };
+    };
+    "level-codec-8.0.0" = {
+      name = "level-codec";
+      packageName = "level-codec";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz";
+        sha512 = "gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q==";
+      };
+    };
+    "level-errors-1.1.2" = {
+      name = "level-errors";
+      packageName = "level-errors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz";
+        sha512 = "Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w==";
+      };
+    };
+    "level-iterator-stream-2.0.3" = {
+      name = "level-iterator-stream";
+      packageName = "level-iterator-stream";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz";
+        sha512 = "I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig==";
+      };
+    };
     "level-packager-0.18.0" = {
       name = "level-packager";
       packageName = "level-packager";
@@ -17342,6 +18072,15 @@ let
         sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
       };
     };
+    "level-packager-2.1.1" = {
+      name = "level-packager";
+      packageName = "level-packager";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz";
+        sha512 = "6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw==";
+      };
+    };
     "level-post-1.0.7" = {
       name = "level-post";
       packageName = "level-post";
@@ -17369,6 +18108,15 @@ let
         sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9";
       };
     };
+    "leveldown-3.0.2" = {
+      name = "leveldown";
+      packageName = "leveldown";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-3.0.2.tgz";
+        sha512 = "+ANRScj1npQQzv6e4DYAKRjVQZZ+ahMoubKrNP68nIq+l9bYgb+WiXF+14oTcQTg2f7qE9WHGW7rBG9nGSsA+A==";
+      };
+    };
     "levelup-0.18.6" = {
       name = "levelup";
       packageName = "levelup";
@@ -17387,6 +18135,15 @@ let
         sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
       };
     };
+    "levelup-2.0.2" = {
+      name = "levelup";
+      packageName = "levelup";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz";
+        sha512 = "us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w==";
+      };
+    };
     "leven-1.0.2" = {
       name = "leven";
       packageName = "leven";
@@ -17459,6 +18216,24 @@ let
         sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64";
       };
     };
+    "libsodium-0.7.3" = {
+      name = "libsodium";
+      packageName = "libsodium";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.3.tgz";
+        sha512 = "ld+deUNqSsZYbAobUs63UyduPq8ICp/Ul/5lbvBIYpuSNWpPRU0PIxbW+xXipVZtuopR6fIz9e0tTnNuPMNeqw==";
+      };
+    };
+    "libsodium-wrappers-0.7.3" = {
+      name = "libsodium-wrappers";
+      packageName = "libsodium-wrappers";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.3.tgz";
+        sha512 = "dw5Jh6TZ5qc5rQVZe3JrSO/J05CE+DmAPnqD7Q2glBUE969xZ6o3fchnUxyPlp6ss3x0MFxmdJntveFN+XTg1g==";
+      };
+    };
     "lie-3.1.1" = {
       name = "lie";
       packageName = "lie";
@@ -17626,7 +18401,7 @@ let
       packageName = "lodash";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
         sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
       };
     };
@@ -17635,7 +18410,7 @@ let
       packageName = "lodash";
       version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
         sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
       };
     };
@@ -17644,7 +18419,7 @@ let
       packageName = "lodash";
       version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz";
         sha1 = "d41b8b33530cb3be088853208ad30092d2c27961";
       };
     };
@@ -17653,25 +18428,16 @@ let
       packageName = "lodash";
       version = "3.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
-    "lodash-3.7.0" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "3.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
-        sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
-      };
-    };
     "lodash-4.13.1" = {
       name = "lodash";
       packageName = "lodash";
       version = "4.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
         sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68";
       };
     };
@@ -17680,7 +18446,7 @@ let
       packageName = "lodash";
       version = "4.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz";
         sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432";
       };
     };
@@ -17707,7 +18473,7 @@ let
       packageName = "lodash";
       version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
+        url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
         sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9";
       };
     };
@@ -18647,6 +19413,15 @@ let
         sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21";
       };
     };
+    "log-symbols-1.0.2" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+      };
+    };
     "log-symbols-2.2.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
@@ -18737,6 +19512,15 @@ let
         sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
       };
     };
+    "longest-streak-1.0.0" = {
+      name = "longest-streak";
+      packageName = "longest-streak";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz";
+        sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965";
+      };
+    };
     "longjohn-0.2.12" = {
       name = "longjohn";
       packageName = "longjohn";
@@ -18764,6 +19548,15 @@ let
         sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749";
       };
     };
+    "looper-4.0.0" = {
+      name = "looper";
+      packageName = "looper";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/looper/-/looper-4.0.0.tgz";
+        sha1 = "7706aded59a99edca06e6b54bb86c8ec19c95155";
+      };
+    };
     "loose-envify-1.4.0" = {
       name = "loose-envify";
       packageName = "loose-envify";
@@ -18782,6 +19575,15 @@ let
         sha512 = "r4w0WrhIHV1lOTVGbTg4Toqwso5x6C8pM7Q/Nto2vy4c7yUSdTYVYlj16uHVX3MT1StpSELDv8yrqGx41MBsDA==";
       };
     };
+    "lossy-store-1.2.3" = {
+      name = "lossy-store";
+      packageName = "lossy-store";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lossy-store/-/lossy-store-1.2.3.tgz";
+        sha1 = "562e2a9203d8661f60e8712de407fbdadf275dc9";
+      };
+    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -18917,6 +19719,15 @@ let
         sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
       };
     };
+    "lrucache-1.0.3" = {
+      name = "lrucache";
+      packageName = "lrucache";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lrucache/-/lrucache-1.0.3.tgz";
+        sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434";
+      };
+    };
     "lstream-0.0.4" = {
       name = "lstream";
       packageName = "lstream";
@@ -18944,6 +19755,15 @@ let
         sha1 = "10851a06d9964b971178441c23c9e52698eece34";
       };
     };
+    "ltgt-2.2.1" = {
+      name = "ltgt";
+      packageName = "ltgt";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz";
+        sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5";
+      };
+    };
     "lunr-0.7.2" = {
       name = "lunr";
       packageName = "lunr";
@@ -18976,7 +19796,7 @@ let
       packageName = "magnet-uri";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
+        url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
         sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
       };
     };
@@ -18985,17 +19805,17 @@ let
       packageName = "magnet-uri";
       version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz";
+        url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz";
         sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8";
       };
     };
-    "magnet-uri-5.2.3" = {
+    "magnet-uri-5.2.4" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.2.3";
+      version = "5.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.3.tgz";
-        sha512 = "INWVwcpWfZTVM+Yb4EXVBpm0FTd8Q98Fn5x7nuHv1hkFDRELgdIM+eJ3zYLbNTFpFPYtHs6B+sx8exs29IYwgA==";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.4.tgz";
+        sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg==";
       };
     };
     "mailcomposer-2.1.0" = {
@@ -19034,13 +19854,13 @@ let
         sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
-    "make-error-1.3.4" = {
+    "make-error-1.3.5" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz";
-        sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
+        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
       };
     };
     "make-error-cause-1.2.2" = {
@@ -19088,6 +19908,33 @@ let
         sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
       };
     };
+    "map-filter-reduce-2.2.1" = {
+      name = "map-filter-reduce";
+      packageName = "map-filter-reduce";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz";
+        sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2";
+      };
+    };
+    "map-filter-reduce-3.1.0" = {
+      name = "map-filter-reduce";
+      packageName = "map-filter-reduce";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz";
+        sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w==";
+      };
+    };
+    "map-merge-1.1.0" = {
+      name = "map-merge";
+      packageName = "map-merge";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz";
+        sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34";
+      };
+    };
     "map-obj-1.0.1" = {
       name = "map-obj";
       packageName = "map-obj";
@@ -19169,6 +20016,15 @@ let
         sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
       };
     };
+    "markdown-table-0.4.0" = {
+      name = "markdown-table";
+      packageName = "markdown-table";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz";
+        sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1";
+      };
+    };
     "marked-0.3.19" = {
       name = "marked";
       packageName = "marked";
@@ -19214,6 +20070,15 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
+    "mdmanifest-1.0.8" = {
+      name = "mdmanifest";
+      packageName = "mdmanifest";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdmanifest/-/mdmanifest-1.0.8.tgz";
+        sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8";
+      };
+    };
     "mdn-data-1.1.4" = {
       name = "mdn-data";
       packageName = "mdn-data";
@@ -19304,6 +20169,15 @@ let
         sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
       };
     };
+    "mem-3.0.1" = {
+      name = "mem";
+      packageName = "mem";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz";
+        sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ==";
+      };
+    };
     "mem-fs-1.1.3" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -19795,7 +20669,7 @@ let
       packageName = "minimist";
       version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
         sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
       };
     };
@@ -19804,7 +20678,7 @@ let
       packageName = "minimist";
       version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
@@ -19813,7 +20687,7 @@ let
       packageName = "minimist";
       version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
         sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
       };
     };
@@ -19822,7 +20696,7 @@ let
       packageName = "minimist";
       version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
         sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
       };
     };
@@ -19831,7 +20705,7 @@ let
       packageName = "minimist";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
@@ -19912,7 +20786,7 @@ let
       packageName = "mkdirp";
       version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
         sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
       };
     };
@@ -19921,7 +20795,7 @@ let
       packageName = "mkdirp";
       version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
         sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
       };
     };
@@ -19930,7 +20804,7 @@ let
       packageName = "mkdirp";
       version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
         sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
       };
     };
@@ -19939,7 +20813,7 @@ let
       packageName = "mkdirp";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
@@ -19975,7 +20849,7 @@ let
       packageName = "mocha";
       version = "2.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
+        url = "http://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz";
         sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
       };
     };
@@ -20029,7 +20903,7 @@ let
       packageName = "moment";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+        url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
         sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
       };
     };
@@ -20056,7 +20930,7 @@ let
       packageName = "moment";
       version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
+        url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz";
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
@@ -20083,7 +20957,7 @@ let
       packageName = "mongoose";
       version = "3.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+        url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
         sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
       };
     };
@@ -20096,6 +20970,15 @@ let
         sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
       };
     };
+    "monotonic-timestamp-0.0.9" = {
+      name = "monotonic-timestamp";
+      packageName = "monotonic-timestamp";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz";
+        sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603";
+      };
+    };
     "mooremachine-2.2.1" = {
       name = "mooremachine";
       packageName = "mooremachine";
@@ -20110,7 +20993,7 @@ let
       packageName = "morgan";
       version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
+        url = "http://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
         sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
       };
     };
@@ -20155,7 +21038,7 @@ let
       packageName = "mpath";
       version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+        url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
         sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
       };
     };
@@ -20164,7 +21047,7 @@ let
       packageName = "mpath";
       version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
+        url = "http://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
         sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e";
       };
     };
@@ -20339,6 +21222,24 @@ let
         sha1 = "6462f1b204109ccc644601650110a828443d66e2";
       };
     };
+    "multiblob-1.13.0" = {
+      name = "multiblob";
+      packageName = "multiblob";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz";
+        sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb";
+      };
+    };
+    "multiblob-http-0.4.2" = {
+      name = "multiblob-http";
+      packageName = "multiblob-http";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz";
+        sha512 = "hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw==";
+      };
+    };
     "multicast-dns-4.0.1" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
@@ -20429,6 +21330,15 @@ let
         sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
       };
     };
+    "multiserver-1.13.3" = {
+      name = "multiserver";
+      packageName = "multiserver";
+      version = "1.13.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz";
+        sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg==";
+      };
+    };
     "multistream-2.1.1" = {
       name = "multistream";
       packageName = "multistream";
@@ -20528,6 +21438,33 @@ let
         sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ==";
       };
     };
+    "muxrpc-6.4.1" = {
+      name = "muxrpc";
+      packageName = "muxrpc";
+      version = "6.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.1.tgz";
+        sha512 = "r8+tucKMmQiYd8NWGQqAA5r+SlYuU30D/WbYo7E/PztG/jmizQJY5NfmLIJ+GWo+dEC6kIxkr0eY+U0uZexTNg==";
+      };
+    };
+    "muxrpc-validation-2.0.1" = {
+      name = "muxrpc-validation";
+      packageName = "muxrpc-validation";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-2.0.1.tgz";
+        sha1 = "cd650d172025fe9d064230aab38ca6328dd16f2f";
+      };
+    };
+    "muxrpcli-1.1.0" = {
+      name = "muxrpcli";
+      packageName = "muxrpcli";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-1.1.0.tgz";
+        sha1 = "4ae9ba986ab825c4a5c12fcb71c6daa81eab5158";
+      };
+    };
     "mv-2.1.1" = {
       name = "mv";
       packageName = "mv";
@@ -20627,13 +21564,13 @@ let
         sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw==";
       };
     };
-    "nanoid-1.2.1" = {
+    "nanoid-1.2.2" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.1.tgz";
-        sha512 = "S1QSG+TQtsqr2/ujHZcNT0OxygffUaUT755qTc/SPKfQ0VJBlOO6qb1425UYoHXPvCZ3pWgMVCuy1t7+AoCxnQ==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz";
+        sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA==";
       };
     };
     "nanolru-1.0.0" = {
@@ -21114,7 +22051,7 @@ let
       packageName = "node-fetch";
       version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz";
+        url = "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz";
         sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5";
       };
     };
@@ -21217,6 +22154,15 @@ let
         sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d";
       };
     };
+    "node-polyglot-1.0.0" = {
+      name = "node-polyglot";
+      packageName = "node-polyglot";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-polyglot/-/node-polyglot-1.0.0.tgz";
+        sha1 = "25b4d1d9d8eb02b48271c96000c4e6d366eef689";
+      };
+    };
     "node-pre-gyp-0.6.39" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
@@ -21415,13 +22361,13 @@ let
         sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "nodemon-1.18.3" = {
+    "nodemon-1.18.4" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.18.3";
+      version = "1.18.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz";
-        sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g==";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz";
+        sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg==";
       };
     };
     "nodesecurity-npm-utils-6.0.0" = {
@@ -21442,6 +22388,15 @@ let
         sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
       };
     };
+    "non-private-ip-1.4.4" = {
+      name = "non-private-ip";
+      packageName = "non-private-ip";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-1.4.4.tgz";
+        sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg==";
+      };
+    };
     "noop-logger-0.1.1" = {
       name = "noop-logger";
       packageName = "noop-logger";
@@ -21532,6 +22487,15 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
+    "normalize-uri-1.1.1" = {
+      name = "normalize-uri";
+      packageName = "normalize-uri";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.1.tgz";
+        sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw==";
+      };
+    };
     "normalize-url-2.0.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
@@ -21555,7 +22519,7 @@ let
       packageName = "npm";
       version = "3.10.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+        url = "http://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
@@ -21649,6 +22613,15 @@ let
         sha512 = "q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ==";
       };
     };
+    "npm-prefix-1.2.0" = {
+      name = "npm-prefix";
+      packageName = "npm-prefix";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz";
+        sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0";
+      };
+    };
     "npm-registry-client-0.2.27" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -21807,7 +22780,7 @@ let
       packageName = "numeral";
       version = "1.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
+        url = "http://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz";
         sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f";
       };
     };
@@ -21947,6 +22920,15 @@ let
         sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==";
       };
     };
+    "object-inspect-1.6.0" = {
+      name = "object-inspect";
+      packageName = "object-inspect";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+      };
+    };
     "object-keys-1.0.12" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -22046,12 +23028,48 @@ let
         sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a";
       };
     };
+    "observ-0.2.0" = {
+      name = "observ";
+      packageName = "observ";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/observ/-/observ-0.2.0.tgz";
+        sha1 = "0bc39b3e29faa5f9e6caa5906cb8392df400aa68";
+      };
+    };
+    "observ-debounce-1.1.1" = {
+      name = "observ-debounce";
+      packageName = "observ-debounce";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/observ-debounce/-/observ-debounce-1.1.1.tgz";
+        sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707";
+      };
+    };
+    "obv-0.0.0" = {
+      name = "obv";
+      packageName = "obv";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/obv/-/obv-0.0.0.tgz";
+        sha1 = "edeab8468f91d4193362ed7f91d0b96dd39a79c1";
+      };
+    };
+    "obv-0.0.1" = {
+      name = "obv";
+      packageName = "obv";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/obv/-/obv-0.0.1.tgz";
+        sha1 = "cb236106341536f0dac4815e06708221cad7fb5e";
+      };
+    };
     "octicons-3.5.0" = {
       name = "octicons";
       packageName = "octicons";
       version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
+        url = "http://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
         sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30";
       };
     };
@@ -22064,6 +23082,15 @@ let
         sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
       };
     };
+    "on-change-network-0.0.2" = {
+      name = "on-change-network";
+      packageName = "on-change-network";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-change-network/-/on-change-network-0.0.2.tgz";
+        sha1 = "d977249477f91726949d80e82346dab6ef45216b";
+      };
+    };
     "on-finished-2.2.1" = {
       name = "on-finished";
       packageName = "on-finished";
@@ -22091,6 +23118,15 @@ let
         sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
       };
     };
+    "on-wakeup-1.0.1" = {
+      name = "on-wakeup";
+      packageName = "on-wakeup";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-wakeup/-/on-wakeup-1.0.1.tgz";
+        sha1 = "00d79d987dde7c8117bee74bb4903f6f6dafa52b";
+      };
+    };
     "once-1.1.1" = {
       name = "once";
       packageName = "once";
@@ -22163,13 +23199,13 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "ono-4.0.6" = {
+    "ono-4.0.7" = {
       name = "ono";
       packageName = "ono";
-      version = "4.0.6";
+      version = "4.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-4.0.6.tgz";
-        sha512 = "fJc3tfcgNzIEpDmZIyPRZkYrhoSoexXNnEN4I0QyVQ9l7NMw3sBFeG26/UpCdSXyAOr4wqr9+/ym/769sZakSw==";
+        url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz";
+        sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA==";
       };
     };
     "open-0.0.2" = {
@@ -22190,6 +23226,15 @@ let
         sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
       };
     };
+    "opencollective-postinstall-2.0.0" = {
+      name = "opencollective-postinstall";
+      packageName = "opencollective-postinstall";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.0.tgz";
+        sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg==";
+      };
+    };
     "opener-1.4.2" = {
       name = "opener";
       packageName = "opener";
@@ -22393,7 +23438,7 @@ let
       packageName = "os-locale";
       version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+        url = "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
         sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
       };
     };
@@ -22406,6 +23451,15 @@ let
         sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
       };
     };
+    "os-locale-3.0.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.0.tgz";
+        sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg==";
+      };
+    };
     "os-name-1.0.3" = {
       name = "os-name";
       packageName = "os-name";
@@ -22568,6 +23622,15 @@ let
         sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca";
       };
     };
+    "p-pipe-1.2.0" = {
+      name = "p-pipe";
+      packageName = "p-pipe";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz";
+        sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9";
+      };
+    };
     "p-reduce-1.0.0" = {
       name = "p-reduce";
       packageName = "p-reduce";
@@ -22685,6 +23748,24 @@ let
         sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17";
       };
     };
+    "packet-stream-2.0.4" = {
+      name = "packet-stream";
+      packageName = "packet-stream";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz";
+        sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw==";
+      };
+    };
+    "packet-stream-codec-1.1.2" = {
+      name = "packet-stream-codec";
+      packageName = "packet-stream-codec";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz";
+        sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
+      };
+    };
     "pacote-9.1.0" = {
       name = "pacote";
       packageName = "pacote";
@@ -22766,6 +23847,15 @@ let
         sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
       };
     };
+    "parse-entities-1.1.2" = {
+      name = "parse-entities";
+      packageName = "parse-entities";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
+        sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==";
+      };
+    };
     "parse-filepath-1.0.2" = {
       name = "parse-filepath";
       packageName = "parse-filepath";
@@ -22964,15 +24054,6 @@ let
         sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
       };
     };
-    "parserlib-0.2.5" = {
-      name = "parserlib";
-      packageName = "parserlib";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz";
-        sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117";
-      };
-    };
     "parserlib-1.1.1" = {
       name = "parserlib";
       packageName = "parserlib";
@@ -23225,13 +24306,13 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
-    "path-loader-1.0.7" = {
+    "path-loader-1.0.8" = {
       name = "path-loader";
       packageName = "path-loader";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.7.tgz";
-        sha512 = "FIorK5Wwz8LzyklCCsPnHI2ieelYbnnGvEtBC4DxW8MkdzBbGKKhxoDH1pDPnQN5ll+gT7t77fac/VD7Vi1kFA==";
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz";
+        sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w==";
       };
     };
     "path-parse-1.0.6" = {
@@ -23523,22 +24604,13 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pino-4.17.6" = {
+    "pino-5.0.4" = {
       name = "pino";
       packageName = "pino";
-      version = "4.17.6";
+      version = "5.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-4.17.6.tgz";
-        sha512 = "LFDwmhyWLBnmwO/2UFbWu1jEGVDzaPupaVdx0XcZ3tIAx1EDEBauzxXf2S0UcFK7oe+X9MApjH0hx9U1XMgfCA==";
-      };
-    };
-    "pino-5.0.0-rc.4" = {
-      name = "pino";
-      packageName = "pino";
-      version = "5.0.0-rc.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-5.0.0-rc.4.tgz";
-        sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog==";
+        url = "https://registry.npmjs.org/pino/-/pino-5.0.4.tgz";
+        sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ==";
       };
     };
     "pino-std-serializers-2.2.1" = {
@@ -23676,6 +24748,15 @@ let
         sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==";
       };
     };
+    "plur-2.1.2" = {
+      name = "plur";
+      packageName = "plur";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz";
+        sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a";
+      };
+    };
     "pluralize-1.2.1" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -23811,6 +24892,15 @@ let
         sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
       };
     };
+    "prebuild-install-4.0.0" = {
+      name = "prebuild-install";
+      packageName = "prebuild-install";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz";
+        sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA==";
+      };
+    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -23906,7 +24996,7 @@ let
       packageName = "printf";
       version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
+        url = "http://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
         sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
       };
     };
@@ -23946,6 +25036,15 @@ let
         sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
       };
     };
+    "private-box-0.2.1" = {
+      name = "private-box";
+      packageName = "private-box";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz";
+        sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0";
+      };
+    };
     "probe-image-size-4.0.0" = {
       name = "probe-image-size";
       packageName = "probe-image-size";
@@ -24450,6 +25549,60 @@ let
         sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3";
       };
     };
+    "pull-abortable-4.0.0" = {
+      name = "pull-abortable";
+      packageName = "pull-abortable";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz";
+        sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843";
+      };
+    };
+    "pull-abortable-4.1.1" = {
+      name = "pull-abortable";
+      packageName = "pull-abortable";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz";
+        sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1";
+      };
+    };
+    "pull-block-filter-1.0.0" = {
+      name = "pull-block-filter";
+      packageName = "pull-block-filter";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-block-filter/-/pull-block-filter-1.0.0.tgz";
+        sha1 = "cf4ef3bbb91ec8b97e1ed31889a6691271e603a7";
+      };
+    };
+    "pull-box-stream-1.0.13" = {
+      name = "pull-box-stream";
+      packageName = "pull-box-stream";
+      version = "1.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-box-stream/-/pull-box-stream-1.0.13.tgz";
+        sha1 = "c3e240398eab3f5951b2ed1078c5988bf7a0a2b9";
+      };
+    };
+    "pull-buffered-0.3.4" = {
+      name = "pull-buffered";
+      packageName = "pull-buffered";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-buffered/-/pull-buffered-0.3.4.tgz";
+        sha512 = "rs5MtSaB1LQfXyer2uderwS4ypsTdmh9VC4wZC0WZsIBKqHiy7tFqNZ0QP1ln544N+yQGXEBRbwYn59iO6Ub9w==";
+      };
+    };
+    "pull-cache-0.0.0" = {
+      name = "pull-cache";
+      packageName = "pull-cache";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-cache/-/pull-cache-0.0.0.tgz";
+        sha1 = "f9b81fa689ecf2a2d8f10f78ace63bd58980e7bb";
+      };
+    };
     "pull-cat-1.1.11" = {
       name = "pull-cat";
       packageName = "pull-cat";
@@ -24459,6 +25612,42 @@ let
         sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
       };
     };
+    "pull-cont-0.0.0" = {
+      name = "pull-cont";
+      packageName = "pull-cont";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.0.0.tgz";
+        sha1 = "3fac48b81ac97b75ba01332088b0ce7af8c1be0e";
+      };
+    };
+    "pull-cont-0.1.1" = {
+      name = "pull-cont";
+      packageName = "pull-cont";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.1.1.tgz";
+        sha1 = "df1d580e271757ba9acbaeba20de2421d660d618";
+      };
+    };
+    "pull-core-1.1.0" = {
+      name = "pull-core";
+      packageName = "pull-core";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-core/-/pull-core-1.1.0.tgz";
+        sha1 = "3d8127d6dac1475705c9800961f59d66c8046c8a";
+      };
+    };
+    "pull-cursor-3.0.0" = {
+      name = "pull-cursor";
+      packageName = "pull-cursor";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-cursor/-/pull-cursor-3.0.0.tgz";
+        sha512 = "95lZVSF2eSEdOmUtlOBaD9p5YOvlYeCr5FBv2ySqcj/4rpaXI6d8OH+zPHHjKAf58R8QXJRZuyfHkcCX8TZbAg==";
+      };
+    };
     "pull-defer-0.2.3" = {
       name = "pull-defer";
       packageName = "pull-defer";
@@ -24468,6 +25657,159 @@ let
         sha512 = "/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA==";
       };
     };
+    "pull-file-0.5.0" = {
+      name = "pull-file";
+      packageName = "pull-file";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-file/-/pull-file-0.5.0.tgz";
+        sha1 = "b3ca405306e082f9d4528288933badb2b656365b";
+      };
+    };
+    "pull-file-1.1.0" = {
+      name = "pull-file";
+      packageName = "pull-file";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-file/-/pull-file-1.1.0.tgz";
+        sha1 = "1dd987605d6357a0d23c1e4b826f7915a215129c";
+      };
+    };
+    "pull-flatmap-0.0.1" = {
+      name = "pull-flatmap";
+      packageName = "pull-flatmap";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-flatmap/-/pull-flatmap-0.0.1.tgz";
+        sha1 = "13d494453e8f6d478e7bbfade6f8fe0197fa6bb7";
+      };
+    };
+    "pull-fs-1.1.6" = {
+      name = "pull-fs";
+      packageName = "pull-fs";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-fs/-/pull-fs-1.1.6.tgz";
+        sha1 = "f184f6a7728bb4d95641376bead69f6f66df47cd";
+      };
+    };
+    "pull-git-pack-1.0.2" = {
+      name = "pull-git-pack";
+      packageName = "pull-git-pack";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-git-pack/-/pull-git-pack-1.0.2.tgz";
+        sha512 = "WZzAAs9ap+QBHliP3E7sCn9kRfMNbdtFVOU0wRRtbY8x6+SUGeCpIkeYUcl9K/KgkL+2XZeyKXzPZ688IyfMbQ==";
+      };
+    };
+    "pull-git-pack-concat-0.2.1" = {
+      name = "pull-git-pack-concat";
+      packageName = "pull-git-pack-concat";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-git-pack-concat/-/pull-git-pack-concat-0.2.1.tgz";
+        sha1 = "b7c8334c3a4961fc5b595a34d1d4224da6082d55";
+      };
+    };
+    "pull-git-packidx-parser-1.0.0" = {
+      name = "pull-git-packidx-parser";
+      packageName = "pull-git-packidx-parser";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-git-packidx-parser/-/pull-git-packidx-parser-1.0.0.tgz";
+        sha1 = "2d8bf0afe4824897ee03840bfe4f5a86afecca21";
+      };
+    };
+    "pull-git-remote-helper-2.0.0" = {
+      name = "pull-git-remote-helper";
+      packageName = "pull-git-remote-helper";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-git-remote-helper/-/pull-git-remote-helper-2.0.0.tgz";
+        sha1 = "7285269ca0968466e3812431ddc2ac357df141be";
+      };
+    };
+    "pull-git-repo-1.2.1" = {
+      name = "pull-git-repo";
+      packageName = "pull-git-repo";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-git-repo/-/pull-git-repo-1.2.1.tgz";
+        sha512 = "nHOicXiFryxuO9J+EhYY0cFC4n4mvsDabj6ts6BYgRbWAbp/gQUa+Hzfy05uey+HLz7XaR7N8XC+xGBgsYCmsg==";
+      };
+    };
+    "pull-glob-1.0.7" = {
+      name = "pull-glob";
+      packageName = "pull-glob";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-glob/-/pull-glob-1.0.7.tgz";
+        sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2";
+      };
+    };
+    "pull-goodbye-0.0.2" = {
+      name = "pull-goodbye";
+      packageName = "pull-goodbye";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz";
+        sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171";
+      };
+    };
+    "pull-handshake-1.1.4" = {
+      name = "pull-handshake";
+      packageName = "pull-handshake";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-handshake/-/pull-handshake-1.1.4.tgz";
+        sha1 = "6000a0fd018884cdfd737254f8cc60ab2a637791";
+      };
+    };
+    "pull-hash-1.0.0" = {
+      name = "pull-hash";
+      packageName = "pull-hash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-hash/-/pull-hash-1.0.0.tgz";
+        sha1 = "fcad4d2507bf2c2b3231f653dc9bfb2db4f0d88c";
+      };
+    };
+    "pull-hyperscript-0.2.2" = {
+      name = "pull-hyperscript";
+      packageName = "pull-hyperscript";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-hyperscript/-/pull-hyperscript-0.2.2.tgz";
+        sha1 = "ca4a65833631854f575a4e2985568c9901f56383";
+      };
+    };
+    "pull-identify-filetype-1.1.0" = {
+      name = "pull-identify-filetype";
+      packageName = "pull-identify-filetype";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-identify-filetype/-/pull-identify-filetype-1.1.0.tgz";
+        sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d";
+      };
+    };
+    "pull-inactivity-2.1.2" = {
+      name = "pull-inactivity";
+      packageName = "pull-inactivity";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.2.tgz";
+        sha1 = "37a3d6ebbfac292cd435f5e481e5074c8c1fad75";
+      };
+    };
+    "pull-kvdiff-0.0.0" = {
+      name = "pull-kvdiff";
+      packageName = "pull-kvdiff";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-kvdiff/-/pull-kvdiff-0.0.0.tgz";
+        sha1 = "9b6627d0e332d98288e47d471602161f41ff1353";
+      };
+    };
     "pull-level-2.0.4" = {
       name = "pull-level";
       packageName = "pull-level";
@@ -24486,6 +25828,78 @@ let
         sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5";
       };
     };
+    "pull-looper-1.0.0" = {
+      name = "pull-looper";
+      packageName = "pull-looper";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-looper/-/pull-looper-1.0.0.tgz";
+        sha512 = "djlD60A6NGe5goLdP5pgbqzMEiWmk1bInuAzBp0QOH4vDrVwh05YDz6UP8+pOXveKEk8wHVP+rB2jBrK31QMPA==";
+      };
+    };
+    "pull-many-1.0.8" = {
+      name = "pull-many";
+      packageName = "pull-many";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-many/-/pull-many-1.0.8.tgz";
+        sha1 = "3dadd9b6d156c545721bda8d0003dd8eaa06293e";
+      };
+    };
+    "pull-next-1.0.1" = {
+      name = "pull-next";
+      packageName = "pull-next";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-next/-/pull-next-1.0.1.tgz";
+        sha1 = "03f4d7d19872fc1114161e88db6ecf4c65e61e56";
+      };
+    };
+    "pull-notify-0.1.1" = {
+      name = "pull-notify";
+      packageName = "pull-notify";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-notify/-/pull-notify-0.1.1.tgz";
+        sha1 = "6f86ff95d270b89c3ebf255b6031b7032dc99cca";
+      };
+    };
+    "pull-paginate-1.0.0" = {
+      name = "pull-paginate";
+      packageName = "pull-paginate";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-paginate/-/pull-paginate-1.0.0.tgz";
+        sha1 = "63ad58efa1066bc701aa581a98a3c41e6aec7fc2";
+      };
+    };
+    "pull-pair-1.1.0" = {
+      name = "pull-pair";
+      packageName = "pull-pair";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-pair/-/pull-pair-1.1.0.tgz";
+        sha1 = "7ee427263fdf4da825397ac0a05e1ab4b74bd76d";
+      };
+    };
+    "pull-paramap-1.2.2" = {
+      name = "pull-paramap";
+      packageName = "pull-paramap";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-paramap/-/pull-paramap-1.2.2.tgz";
+        sha1 = "51a4193ce9c8d7215d95adad45e2bcdb8493b23a";
+      };
+    };
+    "pull-ping-2.0.2" = {
+      name = "pull-ping";
+      packageName = "pull-ping";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-ping/-/pull-ping-2.0.2.tgz";
+        sha1 = "7bc4a340167dad88f682a196c63485735c7a0894";
+      };
+    };
     "pull-pushable-2.2.0" = {
       name = "pull-pushable";
       packageName = "pull-pushable";
@@ -24495,6 +25909,69 @@ let
         sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581";
       };
     };
+    "pull-rate-1.0.2" = {
+      name = "pull-rate";
+      packageName = "pull-rate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz";
+        sha1 = "17b231ad5f359f675826670172b0e590c8964e8d";
+      };
+    };
+    "pull-reader-1.3.1" = {
+      name = "pull-reader";
+      packageName = "pull-reader";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz";
+        sha512 = "CBkejkE5nX50SiSEzu0Qoz4POTJMS/mw8G6aj3h3M/RJoKgggLxyF0IyTZ0mmpXFlXRcLmLmIEW4xeYn7AeDYw==";
+      };
+    };
+    "pull-sink-through-0.0.0" = {
+      name = "pull-sink-through";
+      packageName = "pull-sink-through";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz";
+        sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f";
+      };
+    };
+    "pull-skip-footer-0.1.0" = {
+      name = "pull-skip-footer";
+      packageName = "pull-skip-footer";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-skip-footer/-/pull-skip-footer-0.1.0.tgz";
+        sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f";
+      };
+    };
+    "pull-stream-2.27.0" = {
+      name = "pull-stream";
+      packageName = "pull-stream";
+      version = "2.27.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz";
+        sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068";
+      };
+    };
+    "pull-stream-2.28.4" = {
+      name = "pull-stream";
+      packageName = "pull-stream";
+      version = "2.28.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz";
+        sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4";
+      };
+    };
+    "pull-stream-3.5.0" = {
+      name = "pull-stream";
+      packageName = "pull-stream";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+        sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
+      };
+    };
     "pull-stream-3.6.9" = {
       name = "pull-stream";
       packageName = "pull-stream";
@@ -24504,6 +25981,51 @@ let
         sha512 = "hJn4POeBrkttshdNl0AoSCVjMVSuBwuHocMerUdoZ2+oIUzrWHFTwJMlbHND7OiKLVgvz6TFj8ZUVywUMXccbw==";
       };
     };
+    "pull-stream-to-stream-1.3.4" = {
+      name = "pull-stream-to-stream";
+      packageName = "pull-stream-to-stream";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stream-to-stream/-/pull-stream-to-stream-1.3.4.tgz";
+        sha1 = "3f81d8216bd18d2bfd1a198190471180e2738399";
+      };
+    };
+    "pull-stringify-1.2.2" = {
+      name = "pull-stringify";
+      packageName = "pull-stringify";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz";
+        sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c";
+      };
+    };
+    "pull-through-1.0.18" = {
+      name = "pull-through";
+      packageName = "pull-through";
+      version = "1.0.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-through/-/pull-through-1.0.18.tgz";
+        sha1 = "8dd62314263e59cf5096eafbb127a2b6ef310735";
+      };
+    };
+    "pull-traverse-1.0.3" = {
+      name = "pull-traverse";
+      packageName = "pull-traverse";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-traverse/-/pull-traverse-1.0.3.tgz";
+        sha1 = "74fb5d7be7fa6bd7a78e97933e199b7945866938";
+      };
+    };
+    "pull-utf8-decoder-1.0.2" = {
+      name = "pull-utf8-decoder";
+      packageName = "pull-utf8-decoder";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-utf8-decoder/-/pull-utf8-decoder-1.0.2.tgz";
+        sha1 = "a7afa2384d1e6415a5d602054126cc8de3bcbce7";
+      };
+    };
     "pull-window-2.1.4" = {
       name = "pull-window";
       packageName = "pull-window";
@@ -24513,6 +26035,33 @@ let
         sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0";
       };
     };
+    "pull-write-1.1.4" = {
+      name = "pull-write";
+      packageName = "pull-write";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-write/-/pull-write-1.1.4.tgz";
+        sha1 = "dddea31493b48f6768b84a281d01eb3b531fe0b8";
+      };
+    };
+    "pull-write-file-0.2.4" = {
+      name = "pull-write-file";
+      packageName = "pull-write-file";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-write-file/-/pull-write-file-0.2.4.tgz";
+        sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef";
+      };
+    };
+    "pull-ws-3.3.1" = {
+      name = "pull-ws";
+      packageName = "pull-ws";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz";
+        sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA==";
+      };
+    };
     "pump-0.3.5" = {
       name = "pump";
       packageName = "pump";
@@ -24585,6 +26134,24 @@ let
         sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
+    "push-stream-10.0.3" = {
+      name = "push-stream";
+      packageName = "push-stream";
+      version = "10.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz";
+        sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87";
+      };
+    };
+    "push-stream-to-pull-stream-1.0.3" = {
+      name = "push-stream-to-pull-stream";
+      packageName = "push-stream-to-pull-stream";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.3.tgz";
+        sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw==";
+      };
+    };
     "q-1.0.1" = {
       name = "q";
       packageName = "q";
@@ -24828,15 +26395,6 @@ let
         sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
       };
     };
-    "quick-format-unescaped-1.1.2" = {
-      name = "quick-format-unescaped";
-      packageName = "quick-format-unescaped";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz";
-        sha1 = "0ca581de3174becef25ac3c2e8956342381db698";
-      };
-    };
     "quick-format-unescaped-3.0.0" = {
       name = "quick-format-unescaped";
       packageName = "quick-format-unescaped";
@@ -25071,6 +26629,15 @@ let
         sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
       };
     };
+    "rc-0.5.5" = {
+      name = "rc";
+      packageName = "rc";
+      version = "0.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
+        sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
+      };
+    };
     "rc-1.2.8" = {
       name = "rc";
       packageName = "rc";
@@ -25557,6 +27124,15 @@ let
         sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63";
       };
     };
+    "relative-url-1.0.2" = {
+      name = "relative-url";
+      packageName = "relative-url";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz";
+        sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287";
+      };
+    };
     "relaxed-json-1.0.1" = {
       name = "relaxed-json";
       packageName = "relaxed-json";
@@ -25566,6 +27142,24 @@ let
         sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4";
       };
     };
+    "remark-3.2.3" = {
+      name = "remark";
+      packageName = "remark";
+      version = "3.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz";
+        sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f";
+      };
+    };
+    "remark-html-2.0.2" = {
+      name = "remark-html";
+      packageName = "remark-html";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz";
+        sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92";
+      };
+    };
     "remove-array-items-1.0.0" = {
       name = "remove-array-items";
       packageName = "remove-array-items";
@@ -25593,6 +27187,15 @@ let
         sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
       };
     };
+    "remove-markdown-0.1.0" = {
+      name = "remove-markdown";
+      packageName = "remove-markdown";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz";
+        sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9";
+      };
+    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -25697,7 +27300,7 @@ let
       packageName = "request";
       version = "2.16.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz";
+        url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
         sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
       };
     };
@@ -25706,7 +27309,7 @@ let
       packageName = "request";
       version = "2.67.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz";
+        url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz";
         sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
@@ -25715,7 +27318,7 @@ let
       packageName = "request";
       version = "2.74.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz";
+        url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz";
         sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
       };
     };
@@ -25724,7 +27327,7 @@ let
       packageName = "request";
       version = "2.79.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
+        url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz";
         sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
       };
     };
@@ -25769,7 +27372,7 @@ let
       packageName = "request";
       version = "2.9.203";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
+        url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
@@ -25890,6 +27493,15 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
+    "resolve-1.7.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
+        sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==";
+      };
+    };
     "resolve-1.8.1" = {
       name = "resolve";
       packageName = "resolve";
@@ -26129,7 +27741,7 @@ let
       packageName = "rimraf";
       version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
         sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
       };
     };
@@ -26138,7 +27750,7 @@ let
       packageName = "rimraf";
       version = "2.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
@@ -26147,7 +27759,7 @@ let
       packageName = "rimraf";
       version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz";
         sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82";
       };
     };
@@ -26156,7 +27768,7 @@ let
       packageName = "rimraf";
       version = "2.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
         sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
       };
     };
@@ -26340,22 +27952,22 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "rxjs-5.5.11" = {
+    "rxjs-5.5.12" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "5.5.11";
+      version = "5.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz";
-        sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz";
+        sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
       };
     };
-    "rxjs-6.2.2" = {
+    "rxjs-6.3.1" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.2.2";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz";
-        sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz";
+        sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA==";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -26520,6 +28132,24 @@ let
         sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==";
       };
     };
+    "secret-handshake-1.1.13" = {
+      name = "secret-handshake";
+      packageName = "secret-handshake";
+      version = "1.1.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz";
+        sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A==";
+      };
+    };
+    "secret-stack-4.1.0" = {
+      name = "secret-stack";
+      packageName = "secret-stack";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz";
+        sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w==";
+      };
+    };
     "secure-keys-1.0.0" = {
       name = "secure-keys";
       packageName = "secure-keys";
@@ -26529,6 +28159,15 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
+    "secure-scuttlebutt-18.2.0" = {
+      name = "secure-scuttlebutt";
+      packageName = "secure-scuttlebutt";
+      version = "18.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz";
+        sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg==";
+      };
+    };
     "seek-bzip-1.0.5" = {
       name = "seek-bzip";
       packageName = "seek-bzip";
@@ -26781,6 +28420,15 @@ let
         sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
+    "separator-escape-0.0.0" = {
+      name = "separator-escape";
+      packageName = "separator-escape";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.0.tgz";
+        sha1 = "e433676932020454e3c14870c517ea1de56c2fa4";
+      };
+    };
     "sequence-2.2.1" = {
       name = "sequence";
       packageName = "sequence";
@@ -26988,6 +28636,15 @@ let
         sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
+    "sha.js-2.4.5" = {
+      name = "sha.js";
+      packageName = "sha.js";
+      version = "2.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
+        sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
+      };
+    };
     "shallow-clone-0.1.2" = {
       name = "shallow-clone";
       packageName = "shallow-clone";
@@ -27078,6 +28735,15 @@ let
         sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==";
       };
     };
+    "shellsubstitute-1.2.0" = {
+      name = "shellsubstitute";
+      packageName = "shellsubstitute";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz";
+        sha1 = "e4f702a50c518b0f6fe98451890d705af29b6b70";
+      };
+    };
     "shellwords-0.1.1" = {
       name = "shellwords";
       packageName = "shellwords";
@@ -27888,6 +29554,33 @@ let
         sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==";
       };
     };
+    "sodium-browserify-1.2.4" = {
+      name = "sodium-browserify";
+      packageName = "sodium-browserify";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.4.tgz";
+        sha512 = "IYcxKje/uf/c3a7VhZYJLlUxWMcktfbD4AjqHjUD1/VWKjj0Oq5wNbX8wjJOWVO9UhUMqJQiOn2xFbzKWBmy5w==";
+      };
+    };
+    "sodium-browserify-tweetnacl-0.2.3" = {
+      name = "sodium-browserify-tweetnacl";
+      packageName = "sodium-browserify-tweetnacl";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.3.tgz";
+        sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e";
+      };
+    };
+    "sodium-chloride-1.1.0" = {
+      name = "sodium-chloride";
+      packageName = "sodium-chloride";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz";
+        sha1 = "247a234b88867f6dff51332b605f193a65bf6839";
+      };
+    };
     "sodium-javascript-0.5.5" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
@@ -27915,13 +29608,13 @@ let
         sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
-    "sonic-boom-0.5.0" = {
+    "sonic-boom-0.6.1" = {
       name = "sonic-boom";
       packageName = "sonic-boom";
-      version = "0.5.0";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.5.0.tgz";
-        sha512 = "IqUrLNxgsUQGVyMLW8w8vELMa1BZIQ/uBjBuxLK0jg7HqWwedCgmBLqvgMFGihhXCoQ8w5m2vcnMs47C4KYxuQ==";
+        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.1.tgz";
+        sha512 = "3qx6XXDeG+hPNa+jla1H6BMBLcjLl8L8NRERLVeIf/EuPqoqmq4K8owG29Xu7OypT/7/YT/0uKW6YitsKA+nLQ==";
       };
     };
     "sorcery-0.10.0" = {
@@ -28275,6 +29968,15 @@ let
         sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
       };
     };
+    "split-buffer-1.0.0" = {
+      name = "split-buffer";
+      packageName = "split-buffer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz";
+        sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027";
+      };
+    };
     "split-string-3.1.0" = {
       name = "split-string";
       packageName = "split-string";
@@ -28347,6 +30049,195 @@ let
         sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173";
       };
     };
+    "ssb-avatar-0.2.0" = {
+      name = "ssb-avatar";
+      packageName = "ssb-avatar";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-avatar/-/ssb-avatar-0.2.0.tgz";
+        sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39";
+      };
+    };
+    "ssb-blobs-1.1.5" = {
+      name = "ssb-blobs";
+      packageName = "ssb-blobs";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.5.tgz";
+        sha512 = "DeeInkFU8oN1mYlPVrqrm9tupf6wze4HuowK7N2vv/O+UeSLuYPU1p4HrxSqdAPvUabr0OtvbFA6z1T4nw+9fw==";
+      };
+    };
+    "ssb-client-4.6.0" = {
+      name = "ssb-client";
+      packageName = "ssb-client";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.0.tgz";
+        sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
+      };
+    };
+    "ssb-config-2.2.0" = {
+      name = "ssb-config";
+      packageName = "ssb-config";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz";
+        sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc";
+      };
+    };
+    "ssb-ebt-5.2.2" = {
+      name = "ssb-ebt";
+      packageName = "ssb-ebt";
+      version = "5.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz";
+        sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw==";
+      };
+    };
+    "ssb-friends-2.4.0" = {
+      name = "ssb-friends";
+      packageName = "ssb-friends";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz";
+        sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae";
+      };
+    };
+    "ssb-git-0.5.0" = {
+      name = "ssb-git";
+      packageName = "ssb-git";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz";
+        sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4";
+      };
+    };
+    "ssb-git-repo-2.8.3" = {
+      name = "ssb-git-repo";
+      packageName = "ssb-git-repo";
+      version = "2.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-git-repo/-/ssb-git-repo-2.8.3.tgz";
+        sha512 = "7GVq5Ael/get+3Ot5exLdRWU8psSQNv/SkyO0KUhjoc4VfTdz8XuN1K195LKiyL/7u31A50KmkG9U9twb+1rGQ==";
+      };
+    };
+    "ssb-issues-1.0.0" = {
+      name = "ssb-issues";
+      packageName = "ssb-issues";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz";
+        sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5";
+      };
+    };
+    "ssb-keys-7.0.16" = {
+      name = "ssb-keys";
+      packageName = "ssb-keys";
+      version = "7.0.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz";
+        sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ==";
+      };
+    };
+    "ssb-links-3.0.3" = {
+      name = "ssb-links";
+      packageName = "ssb-links";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz";
+        sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw==";
+      };
+    };
+    "ssb-marked-0.5.4" = {
+      name = "ssb-marked";
+      packageName = "ssb-marked";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.5.4.tgz";
+        sha1 = "e2f0a17854d968a41e707dee6161c783f907330f";
+      };
+    };
+    "ssb-marked-0.6.0" = {
+      name = "ssb-marked";
+      packageName = "ssb-marked";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.6.0.tgz";
+        sha1 = "8171472058673e4e76ec187c40c88c1e484bc544";
+      };
+    };
+    "ssb-mentions-0.1.2" = {
+      name = "ssb-mentions";
+      packageName = "ssb-mentions";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-mentions/-/ssb-mentions-0.1.2.tgz";
+        sha1 = "d0442708e3af5e245a7af9c1abd8f89ab03c80c0";
+      };
+    };
+    "ssb-msg-schemas-6.3.0" = {
+      name = "ssb-msg-schemas";
+      packageName = "ssb-msg-schemas";
+      version = "6.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-msg-schemas/-/ssb-msg-schemas-6.3.0.tgz";
+        sha1 = "23c12443d4e5a0c4817743638ee0ca93ce6ddc85";
+      };
+    };
+    "ssb-msgs-5.2.0" = {
+      name = "ssb-msgs";
+      packageName = "ssb-msgs";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz";
+        sha1 = "c681da5cd70c574c922dca4f03c521538135c243";
+      };
+    };
+    "ssb-pull-requests-1.0.0" = {
+      name = "ssb-pull-requests";
+      packageName = "ssb-pull-requests";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz";
+        sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118";
+      };
+    };
+    "ssb-query-2.2.1" = {
+      name = "ssb-query";
+      packageName = "ssb-query";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz";
+        sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA==";
+      };
+    };
+    "ssb-ref-2.11.2" = {
+      name = "ssb-ref";
+      packageName = "ssb-ref";
+      version = "2.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz";
+        sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA==";
+      };
+    };
+    "ssb-validate-3.0.10" = {
+      name = "ssb-validate";
+      packageName = "ssb-validate";
+      version = "3.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz";
+        sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ==";
+      };
+    };
+    "ssb-ws-2.1.1" = {
+      name = "ssb-ws";
+      packageName = "ssb-ws";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz";
+        sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ==";
+      };
+    };
     "ssh-config-1.1.3" = {
       name = "ssh-config";
       packageName = "ssh-config";
@@ -28437,6 +30328,15 @@ let
         sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==";
       };
     };
+    "stack-0.1.0" = {
+      name = "stack";
+      packageName = "stack";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack/-/stack-0.1.0.tgz";
+        sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2";
+      };
+    };
     "stack-trace-0.0.10" = {
       name = "stack-trace";
       packageName = "stack-trace";
@@ -28464,6 +30364,15 @@ let
         sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
       };
     };
+    "statistics-3.3.0" = {
+      name = "statistics";
+      packageName = "statistics";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statistics/-/statistics-3.3.0.tgz";
+        sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa";
+      };
+    };
     "statsd-parser-0.0.4" = {
       name = "statsd-parser";
       packageName = "statsd-parser";
@@ -28896,6 +30805,15 @@ let
         sha1 = "5bcfad39f4649bb2d031292e19bcf0b510d4b242";
       };
     };
+    "string.prototype.trim-1.1.2" = {
+      name = "string.prototype.trim";
+      packageName = "string.prototype.trim";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz";
+        sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea";
+      };
+    };
     "string2compact-1.3.0" = {
       name = "string2compact";
       packageName = "string2compact";
@@ -28932,6 +30850,15 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
+    "stringify-entities-1.3.2" = {
+      name = "stringify-entities";
+      packageName = "stringify-entities";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
+        sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==";
+      };
+    };
     "stringstream-0.0.6" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -29189,7 +31116,7 @@ let
       packageName = "superagent";
       version = "0.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+        url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
         sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
       };
     };
@@ -29198,7 +31125,7 @@ let
       packageName = "superagent";
       version = "1.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
+        url = "http://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz";
         sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55";
       };
     };
@@ -29500,6 +31427,15 @@ let
         sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
       };
     };
+    "tape-4.9.1" = {
+      name = "tape";
+      packageName = "tape";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz";
+        sha512 = "6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw==";
+      };
+    };
     "tar-0.1.17" = {
       name = "tar";
       packageName = "tar";
@@ -30085,6 +32021,15 @@ let
         sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
       };
     };
+    "to-vfile-1.0.0" = {
+      name = "to-vfile";
+      packageName = "to-vfile";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz";
+        sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba";
+      };
+    };
     "toidentifier-1.0.0" = {
       name = "toidentifier";
       packageName = "toidentifier";
@@ -30135,17 +32080,17 @@ let
       packageName = "torrent-discovery";
       version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz";
+        url = "http://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz";
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-discovery-9.0.2" = {
+    "torrent-discovery-9.1.1" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "9.0.2";
+      version = "9.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.0.2.tgz";
-        sha512 = "UpkOyi/QUXRAwts8vSsFu/jRQ1mwGkaqv2OxLTJGr4DJKCiXpLHZ1+A4rxabcOWinM9RiqmS5mAjDuFfPHiJvw==";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.1.tgz";
+        sha512 = "3mHf+bxVCVLrlkPJdAoMbPMY1hpTZVeWw5hNc2pPFm+HCc2DS0HgVFTBTSWtB8vQPWA1hSEZpqJ+3QfdXxDE1g==";
       };
     };
     "torrent-piece-1.1.2" = {
@@ -30328,6 +32273,15 @@ let
         sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
       };
     };
+    "trim-lines-1.1.1" = {
+      name = "trim-lines";
+      packageName = "trim-lines";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.1.tgz";
+        sha512 = "X+eloHbgJGxczUk1WSjIvn7aC9oN3jVE3rQfRVKcgpavi3jxtCn0VVKtjOBj64Yop96UYn/ujJRpTbCdAF1vyg==";
+      };
+    };
     "trim-newlines-1.0.0" = {
       name = "trim-newlines";
       packageName = "trim-newlines";
@@ -30373,6 +32327,15 @@ let
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
+    "trim-trailing-lines-1.1.1" = {
+      name = "trim-trailing-lines";
+      packageName = "trim-trailing-lines";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==";
+      };
+    };
     "truncate-2.0.1" = {
       name = "truncate";
       packageName = "truncate";
@@ -30490,6 +32453,15 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "tweetnacl-auth-0.3.1" = {
+      name = "tweetnacl-auth";
+      packageName = "tweetnacl-auth";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl-auth/-/tweetnacl-auth-0.3.1.tgz";
+        sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
+      };
+    };
     "twig-1.12.0" = {
       name = "twig";
       packageName = "twig";
@@ -30576,7 +32548,7 @@ let
       packageName = "typescript";
       version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
+        url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
         sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==";
       };
     };
@@ -30657,7 +32629,7 @@ let
       packageName = "uglify-js";
       version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
         sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
       };
     };
@@ -30666,7 +32638,7 @@ let
       packageName = "uglify-js";
       version = "2.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
         sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
       };
     };
@@ -30675,7 +32647,7 @@ let
       packageName = "uglify-js";
       version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
         sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
       };
     };
@@ -30697,6 +32669,15 @@ let
         sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==";
       };
     };
+    "uglify-js-3.4.9" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
+        sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
+      };
+    };
     "uglify-to-browserify-1.0.2" = {
       name = "uglify-to-browserify";
       packageName = "uglify-to-browserify";
@@ -30778,6 +32759,15 @@ let
         sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
       };
     };
+    "uint48be-1.0.2" = {
+      name = "uint48be";
+      packageName = "uint48be";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uint48be/-/uint48be-1.0.2.tgz";
+        sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA==";
+      };
+    };
     "uint64be-2.0.2" = {
       name = "uint64be";
       packageName = "uint64be";
@@ -30949,6 +32939,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "unherit-1.1.1" = {
+      name = "unherit";
+      packageName = "unherit";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
+        sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==";
+      };
+    };
     "unicode-5.2.0-0.7.5" = {
       name = "unicode-5.2.0";
       packageName = "unicode-5.2.0";
@@ -30967,6 +32966,15 @@ let
         sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459";
       };
     };
+    "unified-2.1.4" = {
+      name = "unified";
+      packageName = "unified";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unified/-/unified-2.1.4.tgz";
+        sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba";
+      };
+    };
     "union-value-1.0.0" = {
       name = "union-value";
       packageName = "union-value";
@@ -31030,6 +33038,33 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
+    "unist-util-is-2.1.2" = {
+      name = "unist-util-is";
+      packageName = "unist-util-is";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==";
+      };
+    };
+    "unist-util-visit-1.4.0" = {
+      name = "unist-util-visit";
+      packageName = "unist-util-visit";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz";
+        sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==";
+      };
+    };
+    "unist-util-visit-parents-2.0.1" = {
+      name = "unist-util-visit-parents";
+      packageName = "unist-util-visit-parents";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz";
+        sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==";
+      };
+    };
     "universalify-0.1.2" = {
       name = "universalify";
       packageName = "universalify";
@@ -31381,13 +33416,13 @@ let
         sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
-    "ut_metadata-3.2.2" = {
+    "ut_metadata-3.3.0" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.2.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz";
-        sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA==";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.3.0.tgz";
+        sha512 = "IK+ke9yL6a4oPLz/3oSW9TW7m9Wr4RG+5kW5aS2YulzEU1QDGAtago/NnOlno91fo3fSO7mnsqzn3NXNXdv8nA==";
       };
     };
     "ut_pex-1.2.1" = {
@@ -31678,13 +33713,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "validator-10.7.0" = {
+    "validator-10.7.1" = {
       name = "validator";
       packageName = "validator";
-      version = "10.7.0";
+      version = "10.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-10.7.0.tgz";
-        sha512 = "7Z4kif6HeMLroCQZvh8lwCtmPOqBTkTkt5ibXtJR8sOkzWdjW+YIJOZUpPFlfq59zYvnpSPVd4UX5QYnSCLWgA==";
+        url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz";
+        sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ==";
       };
     };
     "validator-5.2.0" = {
@@ -31692,7 +33727,7 @@ let
       packageName = "validator";
       version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
+        url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
         sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
       };
     };
@@ -31701,7 +33736,7 @@ let
       packageName = "validator";
       version = "9.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
         sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
       };
     };
@@ -31840,6 +33875,51 @@ let
         sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
       };
     };
+    "vfile-1.4.0" = {
+      name = "vfile";
+      packageName = "vfile";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz";
+        sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
+      };
+    };
+    "vfile-find-down-1.0.0" = {
+      name = "vfile-find-down";
+      packageName = "vfile-find-down";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz";
+        sha1 = "84a4d66d03513f6140a84e0776ef0848d4f0ad95";
+      };
+    };
+    "vfile-find-up-1.0.0" = {
+      name = "vfile-find-up";
+      packageName = "vfile-find-up";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz";
+        sha1 = "5604da6fe453b34350637984eb5fe4909e280390";
+      };
+    };
+    "vfile-reporter-1.5.0" = {
+      name = "vfile-reporter";
+      packageName = "vfile-reporter";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz";
+        sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418";
+      };
+    };
+    "vfile-sort-1.0.0" = {
+      name = "vfile-sort";
+      packageName = "vfile-sort";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz";
+        sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4";
+      };
+    };
     "vhost-3.0.2" = {
       name = "vhost";
       packageName = "vhost";
@@ -31939,13 +34019,13 @@ let
         sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
       };
     };
-    "vlc-command-1.1.1" = {
+    "vlc-command-1.1.2" = {
       name = "vlc-command";
       packageName = "vlc-command";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz";
-        sha1 = "349b85def831f980cd6eec560b1990fd989eaf92";
+        url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz";
+        sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q==";
       };
     };
     "vm-browserify-0.0.4" = {
@@ -32191,13 +34271,13 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-sources-1.1.0" = {
+    "webpack-sources-1.2.0" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz";
-        sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz";
+        sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==";
       };
     };
     "websocket-driver-0.7.0" = {
@@ -32227,13 +34307,13 @@ let
         sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw==";
       };
     };
-    "webtorrent-0.102.2" = {
+    "webtorrent-0.102.4" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.102.2";
+      version = "0.102.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.2.tgz";
-        sha512 = "9+thCKf9zfs9OTMkNqSp3whqKlYd4f/VkBCsx+HkD5dh9O5oWf2lxfAMq1P411WiSY0PqBS77jxjQilYeYYskw==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.4.tgz";
+        sha512 = "Oa7NatbPlESqf5ETwgVUOXAbUjiZr7XNFbHhd88BRm+4vN9u3JgeIbF9Gnuxb5s26cHxPYpGJRVTtBsc6Z6w9Q==";
       };
     };
     "whatwg-fetch-2.0.4" = {
@@ -32335,6 +34415,15 @@ let
         sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
+    "which-pm-runs-1.0.0" = {
+      name = "which-pm-runs";
+      packageName = "which-pm-runs";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz";
+        sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb";
+      };
+    };
     "wide-align-1.1.3" = {
       name = "wide-align";
       packageName = "wide-align";
@@ -32506,6 +34595,15 @@ let
         sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
       };
     };
+    "word-wrap-1.2.3" = {
+      name = "word-wrap";
+      packageName = "word-wrap";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+      };
+    };
     "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
@@ -32547,7 +34645,7 @@ let
       packageName = "wrap-ansi";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        url = "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
         sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
@@ -32758,13 +34856,13 @@ let
         sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ==";
       };
     };
-    "xml-1.0.0" = {
+    "xml-1.0.1" = {
       name = "xml";
       packageName = "xml";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz";
-        sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe";
+        url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz";
+        sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
       };
     };
     "xml-name-validator-2.0.1" = {
@@ -33353,13 +35451,13 @@ let
         sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "zero-fill-2.2.3" = {
-      name = "zero-fill";
-      packageName = "zero-fill";
-      version = "2.2.3";
+    "zerr-1.0.4" = {
+      name = "zerr";
+      packageName = "zerr";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz";
-        sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9";
+        url = "https://registry.npmjs.org/zerr/-/zerr-1.0.4.tgz";
+        sha1 = "62814dd799eff8361f2a228f41f705c5e19de4c9";
       };
     };
     "zip-dir-1.0.2" = {
@@ -33654,7 +35752,7 @@ in
       sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
     };
     dependencies = [
-      sources."@types/node-8.10.28"
+      sources."@types/node-8.10.29"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
@@ -33854,7 +35952,7 @@ in
       sources."from-0.1.7"
       sources."fs.realpath-1.0.0"
       sources."galaxy-0.1.12"
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       (sources."getpass-0.1.7" // {
         dependencies = [
@@ -34259,7 +36357,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.2.0"
+      sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -34546,7 +36644,7 @@ in
       sources."long-2.4.0"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.2.3"
+      sources."magnet-uri-5.2.4"
       sources."map-obj-1.0.1"
       (sources."mdns-js-1.0.1" // {
         dependencies = [
@@ -34925,7 +37023,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-1.2.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."big-integer-1.6.34"
+      sources."big-integer-1.6.35"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       sources."body-parser-1.18.2"
@@ -34952,7 +37050,7 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-transform-tools-1.7.0"
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.2.0"
+      sources."buffer-5.2.1"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-1.1.1"
@@ -35083,7 +37181,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."function-bind-1.1.1"
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."get-assigned-identifiers-1.2.0"
       (sources."getpass-0.1.7" // {
@@ -35439,7 +37537,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.9.2"
+      sources."@types/node-10.9.4"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -35787,7 +37885,7 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."ci-info-1.4.0"
@@ -36522,7 +38620,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.303.0"
+      sources."aws-sdk-2.307.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
@@ -36624,10 +38722,10 @@ in
   elm-test = nodeEnv.buildNodePackage {
     name = "elm-test";
     packageName = "elm-test";
-    version = "0.18.12";
+    version = "0.18.13-beta";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz";
-      sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg==";
+      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz";
+      sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -36696,7 +38794,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.1.2"
       sources."fstream-1.0.11"
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       (sources."getpass-0.1.7" // {
         dependencies = [
@@ -37083,40 +39181,31 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "5.4.0";
+    version = "5.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz";
-      sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
+      sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
     };
     dependencies = [
+      sources."@babel/code-frame-7.0.0"
+      sources."@babel/highlight-7.0.0"
       sources."acorn-5.7.2"
       sources."acorn-jsx-4.1.1"
       sources."ajv-6.5.3"
       sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."arrify-1.0.1"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
-      (sources."chalk-2.4.1" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."chardet-0.4.2"
+      sources."chalk-2.4.1"
+      sources."chardet-0.7.0"
       sources."circular-json-0.3.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -37138,7 +39227,7 @@ in
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."external-editor-2.2.0"
+      sources."external-editor-3.0.3"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
@@ -37151,14 +39240,13 @@ in
       sources."globals-11.7.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
-      sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-5.2.0"
+      sources."inquirer-6.2.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.1"
@@ -37166,7 +39254,7 @@ in
       sources."is-promise-2.1.0"
       sources."is-resolvable-1.1.0"
       sources."isexe-2.0.0"
-      sources."js-tokens-3.0.2"
+      sources."js-tokens-4.0.0"
       sources."js-yaml-3.12.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
@@ -37201,7 +39289,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-5.5.11"
+      sources."rxjs-6.3.1"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."shebang-command-1.2.0"
@@ -37210,18 +39298,14 @@ in
       sources."slice-ansi-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      (sources."strip-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."symbol-observable-1.0.1"
+      sources."supports-color-5.5.0"
       sources."table-4.0.3"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
+      sources."tslib-1.9.3"
       sources."type-check-0.3.2"
       sources."uri-js-4.2.2"
       sources."which-1.3.1"
@@ -37247,34 +39331,25 @@ in
       sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA==";
     };
     dependencies = [
+      sources."@babel/code-frame-7.0.0"
+      sources."@babel/highlight-7.0.0"
       sources."acorn-5.7.2"
       sources."acorn-jsx-4.1.1"
       sources."ajv-6.5.3"
       sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."arrify-1.0.1"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
-      (sources."chalk-2.4.1" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-        ];
-      })
-      sources."chardet-0.4.2"
+      sources."chalk-2.4.1"
+      sources."chardet-0.7.0"
       sources."circular-json-0.3.3"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -37287,7 +39362,7 @@ in
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-5.4.0"
+      sources."eslint-5.5.0"
       sources."eslint-scope-4.0.0"
       sources."eslint-utils-1.3.1"
       sources."eslint-visitor-keys-1.0.0"
@@ -37297,7 +39372,7 @@ in
       sources."esrecurse-4.2.1"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."external-editor-2.2.0"
+      sources."external-editor-3.0.3"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
@@ -37310,14 +39385,13 @@ in
       sources."globals-11.7.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
-      sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inquirer-5.2.0"
+      sources."inquirer-6.2.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-path-cwd-1.0.0"
       sources."is-path-in-cwd-1.0.1"
@@ -37325,7 +39399,7 @@ in
       sources."is-promise-2.1.0"
       sources."is-resolvable-1.1.0"
       sources."isexe-2.0.0"
-      sources."js-tokens-3.0.2"
+      sources."js-tokens-4.0.0"
       sources."js-yaml-3.12.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
@@ -37363,7 +39437,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-5.5.11"
+      sources."rxjs-6.3.1"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."shebang-command-1.2.0"
@@ -37372,18 +39446,14 @@ in
       sources."slice-ansi-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string-width-2.1.1"
-      (sources."strip-ansi-4.0.0" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-        ];
-      })
+      sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."symbol-observable-1.0.1"
       sources."table-4.0.3"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
+      sources."tslib-1.9.3"
       sources."type-check-0.3.2"
       sources."uri-js-4.2.2"
       sources."which-1.3.1"
@@ -37403,10 +39473,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.1.7";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz";
-      sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e";
+      url = "https://registry.npmjs.org/emojione/-/emojione-4.0.0.tgz";
+      sha512 = "ATFSRHrK838NoTUE96j9rpmS1R4a/qpK1maQURGdFtarpWloEttjjIBBWbSFqsUxC0Vot6P2WXmSlotvZoegxw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -37817,6 +39887,181 @@ in
     production = true;
     bypassCache = true;
   };
+  git-ssb = nodeEnv.buildNodePackage {
+    name = "git-ssb";
+    packageName = "git-ssb";
+    version = "2.3.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/git-ssb/-/git-ssb-2.3.6.tgz";
+      sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ==";
+    };
+    dependencies = [
+      sources."asyncmemo-1.0.0"
+      sources."chloride-2.2.10"
+      sources."chloride-test-1.2.2"
+      sources."deep-equal-1.0.1"
+      sources."deep-extend-0.4.2"
+      sources."diff-3.5.0"
+      sources."ed2curve-0.1.4"
+      sources."emoji-named-characters-1.0.2"
+      sources."explain-error-1.0.4"
+      sources."generate-function-2.3.1"
+      sources."generate-object-property-1.2.0"
+      sources."git-packidx-parser-1.0.0"
+      sources."git-remote-ssb-2.0.4"
+      sources."git-ssb-web-2.8.0"
+      sources."hashlru-2.2.1"
+      sources."highlight.js-9.12.0"
+      sources."increment-buffer-1.0.1"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."ip-1.1.5"
+      sources."is-electron-2.1.0"
+      sources."is-my-ip-valid-1.0.0"
+      sources."is-my-json-valid-2.19.0"
+      sources."is-property-1.0.2"
+      sources."is-valid-domain-0.0.5"
+      sources."json-buffer-2.0.11"
+      sources."jsonpointer-4.0.1"
+      sources."kvgraph-0.1.0"
+      sources."kvset-1.0.0"
+      sources."libsodium-0.7.3"
+      sources."libsodium-wrappers-0.7.3"
+      sources."looper-4.0.0"
+      sources."lrucache-1.0.3"
+      sources."mime-db-1.36.0"
+      sources."mime-types-2.1.20"
+      sources."minimist-1.2.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.2"
+      sources."multicb-1.2.2"
+      sources."multiserver-1.13.3"
+      sources."muxrpc-6.4.1"
+      sources."nan-2.11.0"
+      sources."node-gyp-build-3.4.0"
+      sources."node-polyglot-1.0.0"
+      sources."non-private-ip-1.4.4"
+      sources."options-0.0.6"
+      sources."os-homedir-1.0.2"
+      sources."packet-stream-2.0.4"
+      sources."packet-stream-codec-1.1.2"
+      sources."pako-1.0.6"
+      sources."private-box-0.2.1"
+      sources."progress-1.1.8"
+      sources."pull-block-filter-1.0.0"
+      sources."pull-box-stream-1.0.13"
+      sources."pull-buffered-0.3.4"
+      sources."pull-cache-0.0.0"
+      sources."pull-cat-1.1.11"
+      sources."pull-core-1.1.0"
+      sources."pull-git-pack-1.0.2"
+      (sources."pull-git-pack-concat-0.2.1" // {
+        dependencies = [
+          sources."looper-3.0.0"
+        ];
+      })
+      sources."pull-git-packidx-parser-1.0.0"
+      sources."pull-git-remote-helper-2.0.0"
+      sources."pull-git-repo-1.2.1"
+      (sources."pull-goodbye-0.0.2" // {
+        dependencies = [
+          sources."pull-stream-3.5.0"
+        ];
+      })
+      sources."pull-handshake-1.1.4"
+      sources."pull-hash-1.0.0"
+      sources."pull-hyperscript-0.2.2"
+      (sources."pull-identify-filetype-1.1.0" // {
+        dependencies = [
+          sources."pull-stream-2.28.4"
+        ];
+      })
+      sources."pull-kvdiff-0.0.0"
+      sources."pull-looper-1.0.0"
+      sources."pull-many-1.0.8"
+      sources."pull-paginate-1.0.0"
+      sources."pull-pair-1.1.0"
+      sources."pull-paramap-1.2.2"
+      sources."pull-pushable-2.2.0"
+      sources."pull-reader-1.3.1"
+      sources."pull-skip-footer-0.1.0"
+      sources."pull-stream-3.6.9"
+      (sources."pull-through-1.0.18" // {
+        dependencies = [
+          sources."looper-3.0.0"
+        ];
+      })
+      sources."pull-ws-3.3.1"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."deep-extend-0.6.0"
+        ];
+      })
+      sources."relative-url-1.0.2"
+      sources."remove-markdown-0.1.0"
+      sources."safe-buffer-5.1.2"
+      sources."secret-handshake-1.1.13"
+      sources."semver-5.5.1"
+      sources."separator-escape-0.0.0"
+      sources."sha.js-2.4.5"
+      sources."smart-buffer-4.0.1"
+      sources."socks-2.2.1"
+      sources."sodium-browserify-1.2.4"
+      (sources."sodium-browserify-tweetnacl-0.2.3" // {
+        dependencies = [
+          sources."sha.js-2.4.11"
+        ];
+      })
+      sources."sodium-chloride-1.1.0"
+      sources."sodium-native-2.2.1"
+      sources."split-buffer-1.0.0"
+      sources."ssb-avatar-0.2.0"
+      sources."ssb-client-4.6.0"
+      sources."ssb-config-2.2.0"
+      sources."ssb-git-0.5.0"
+      sources."ssb-git-repo-2.8.3"
+      sources."ssb-issues-1.0.0"
+      sources."ssb-keys-7.0.16"
+      sources."ssb-marked-0.6.0"
+      (sources."ssb-mentions-0.1.2" // {
+        dependencies = [
+          sources."ssb-marked-0.5.4"
+        ];
+      })
+      (sources."ssb-msg-schemas-6.3.0" // {
+        dependencies = [
+          sources."pull-stream-2.27.0"
+        ];
+      })
+      sources."ssb-msgs-5.2.0"
+      sources."ssb-pull-requests-1.0.0"
+      sources."ssb-ref-2.11.2"
+      (sources."stream-to-pull-stream-1.7.2" // {
+        dependencies = [
+          sources."looper-3.0.0"
+        ];
+      })
+      sources."strip-json-comments-2.0.1"
+      sources."through-2.2.7"
+      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-auth-0.3.1"
+      sources."ultron-1.0.2"
+      sources."ws-1.1.5"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "git hosting on secure-scuttlebutt (ssb)";
+      homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256;
+      license = "Fair";
+    };
+    production = true;
+    bypassCache = true;
+  };
   git-standup = nodeEnv.buildNodePackage {
     name = "git-standup";
     packageName = "git-standup";
@@ -37885,7 +40130,7 @@ in
       sources."babel-runtime-6.26.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."iconv-lite-0.4.19"
@@ -37900,7 +40145,7 @@ in
       sources."call-me-maybe-1.0.1"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."change-case-3.0.2"
@@ -38203,7 +40448,7 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."ono-4.0.6"
+      sources."ono-4.0.7"
       sources."open-0.0.5"
       sources."opn-5.3.0"
       sources."ora-1.4.0"
@@ -38285,7 +40530,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-5.5.11"
+      sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.1"
       sources."safer-buffer-2.1.2"
       sources."scuid-1.1.0"
@@ -38357,7 +40602,7 @@ in
       sources."utils-merge-1.0.1"
       sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.4"
-      sources."validator-10.7.0"
+      sources."validator-10.7.1"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
@@ -39173,28 +41418,46 @@ in
   htmlhint = nodeEnv.buildNodePackage {
     name = "htmlhint";
     packageName = "htmlhint";
-    version = "0.9.13";
+    version = "0.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz";
-      sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88";
+      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz";
+      sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw==";
     };
     dependencies = [
-      sources."async-1.4.2"
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-2.6.1"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
-      (sources."cli-0.6.6" // {
+      sources."buffer-from-1.1.1"
+      sources."caseless-0.12.0"
+      sources."cli-1.0.1"
+      sources."clone-2.1.2"
+      sources."co-4.6.0"
+      sources."colors-1.3.2"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.17.1"
+      sources."concat-map-0.0.1"
+      (sources."concat-stream-1.6.2" // {
         dependencies = [
-          sources."glob-3.2.11"
-          sources."minimatch-0.3.0"
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
         ];
       })
-      sources."colors-1.0.3"
-      sources."commander-2.6.0"
-      sources."concat-map-0.0.1"
       sources."console-browserify-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."csslint-0.10.0"
+      sources."csslint-1.0.5"
+      sources."cycle-1.0.3"
+      sources."dashdash-1.14.1"
       sources."date-now-0.1.4"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
@@ -39204,42 +41467,114 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
+      sources."ecc-jsbn-0.1.2"
       sources."entities-1.0.0"
+      sources."es6-promise-4.2.4"
       sources."exit-0.1.2"
-      sources."glob-5.0.15"
+      sources."extend-3.0.2"
+      sources."extract-zip-1.6.7"
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fd-slicer-1.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-extra-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.0"
+      sources."hasha-2.2.0"
       sources."htmlparser2-3.8.3"
+      sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."is-dotfile-1.0.3"
       sources."is-extglob-1.0.0"
       sources."is-glob-2.0.1"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
       sources."isarray-0.0.1"
-      (sources."jshint-2.8.0" // {
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      (sources."jshint-2.9.6" // {
         dependencies = [
-          sources."minimatch-2.0.10"
+          sources."strip-json-comments-1.0.4"
         ];
       })
-      sources."lodash-3.7.0"
-      sources."lru-cache-2.7.3"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kew-0.7.0"
+      sources."klaw-1.3.1"
+      sources."lodash-4.17.10"
+      sources."mime-db-1.36.0"
+      sources."mime-types-2.1.20"
       sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
       sources."parse-glob-3.0.4"
-      sources."parserlib-0.2.5"
+      sources."parserlib-1.1.1"
       sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
+      sources."phantom-4.0.12"
+      sources."phantomjs-prebuilt-2.1.16"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."psl-1.1.29"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
+      sources."request-2.88.0"
+      sources."request-progress-2.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."shelljs-0.3.0"
-      sources."sigmund-1.0.1"
+      sources."split-1.0.1"
+      sources."sshpk-1.14.2"
+      sources."stack-trace-0.0.10"
       sources."string_decoder-0.10.31"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
+      sources."throttleit-1.0.0"
+      sources."through-2.3.8"
+      sources."tough-cookie-2.4.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."unicode-5.2.0-0.7.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      (sources."winston-2.4.4" // {
+        dependencies = [
+          sources."async-1.0.0"
+          sources."colors-1.0.3"
+        ];
+      })
       sources."wrappy-1.0.2"
-      sources."xml-1.0.0"
+      sources."xml-1.0.1"
+      sources."yauzl-2.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "A Static Code Analysis Tool for HTML";
-      homepage = "https://github.com/yaniswang/HTMLHint#readme";
+      description = "The Static Code Analysis Tool for your HTML";
+      homepage = "https://github.com/thedaviddias/HTMLHint#readme";
       license = "MIT";
     };
     production = true;
@@ -39263,7 +41598,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.4.8"
+      sources."uglify-js-3.4.9"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -39298,7 +41633,7 @@ in
       sources."@types/minimatch-3.0.3"
       sources."@types/minimist-1.2.0"
       sources."@types/ncp-2.0.1"
-      sources."@types/node-6.0.116"
+      sources."@types/node-6.0.117"
       sources."@types/rimraf-2.0.2"
       sources."@types/rx-4.1.1"
       sources."@types/rx-core-4.0.3"
@@ -39332,9 +41667,9 @@ in
       sources."brace-expansion-1.1.11"
       sources."bytes-3.0.0"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.1"
-      sources."chardet-0.5.0"
+      sources."chardet-0.7.0"
       sources."chownr-1.0.1"
       sources."ci-info-1.4.0"
       sources."cli-boxes-1.0.0"
@@ -39373,7 +41708,7 @@ in
       sources."esutils-2.0.2"
       sources."execa-0.7.0"
       sources."extend-3.0.2"
-      sources."external-editor-3.0.1"
+      sources."external-editor-3.0.3"
       sources."fast-levenshtein-2.0.6"
       sources."figures-2.0.0"
       sources."file-uri-to-path-1.0.0"
@@ -39504,7 +41839,7 @@ in
       sources."rimraf-2.6.2"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.2.2"
+      sources."rxjs-6.3.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
@@ -39812,7 +42147,7 @@ in
       sources."deep-equal-1.0.1"
       sources."error-7.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."fast-json-patch-2.0.6"
+      sources."fast-json-patch-2.0.7"
       sources."fs.realpath-1.0.0"
       sources."get-func-name-2.0.0"
       sources."glob-7.1.3"
@@ -39841,7 +42176,7 @@ in
       sources."opentracing-0.14.3"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
-      sources."rxjs-5.5.11"
+      sources."rxjs-5.5.12"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.1"
       sources."string-template-0.2.1"
@@ -39901,7 +42236,7 @@ in
     };
     dependencies = [
       sources."babylon-7.0.0-beta.19"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."catharsis-0.8.9"
       sources."escape-string-regexp-1.0.5"
       sources."graceful-fs-4.1.11"
@@ -40199,10 +42534,10 @@ in
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
     packageName = "json-refs";
-    version = "3.0.9";
+    version = "3.0.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.9.tgz";
-      sha512 = "7N8yDNktol+fIQBQmCoaHwAxvga102kgil/awf8TrGHIhQh2o788inzS6QygfY0B++Z7v5NCAAmCddU+qJf6hA==";
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz";
+      sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -40229,7 +42564,7 @@ in
       sources."mime-types-2.1.20"
       sources."ms-2.0.0"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.7"
+      sources."path-loader-1.0.8"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -40281,7 +42616,7 @@ in
       sources."boxen-1.3.0"
       sources."bytes-3.0.0"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."ci-info-1.4.0"
@@ -40417,7 +42752,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.0"
       sources."ms-2.0.0"
-      sources."nanoid-1.2.1"
+      sources."nanoid-1.2.2"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -40577,7 +42912,7 @@ in
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.11.0"
       sources."blob-0.0.4"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."body-parser-1.18.3"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -41471,20 +43806,20 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.1.4";
+    version = "3.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.1.4.tgz";
-      sha512 = "DetcjFPZmClvHbTOUX3ynBEfzWPLIRhwnoCMw57iNV1lWyW3ERLj6B2Iz6XtWOwW6E+fBrmK5tYV9t0OXuSF6A==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz";
+      sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ==";
     };
     dependencies = [
-      sources."@lerna/add-3.1.4"
+      sources."@lerna/add-3.2.0"
       sources."@lerna/batch-packages-3.1.2"
-      sources."@lerna/bootstrap-3.1.4"
-      sources."@lerna/changed-3.1.3"
+      sources."@lerna/bootstrap-3.2.0"
+      sources."@lerna/changed-3.2.0"
       sources."@lerna/check-working-tree-3.1.0"
       sources."@lerna/child-process-3.0.0"
       sources."@lerna/clean-3.1.3"
-      sources."@lerna/cli-3.1.4"
+      sources."@lerna/cli-3.2.0"
       sources."@lerna/collect-updates-3.1.0"
       sources."@lerna/command-3.1.3"
       sources."@lerna/conventional-commits-3.0.2"
@@ -41507,23 +43842,23 @@ in
       sources."@lerna/npm-conf-3.0.0"
       sources."@lerna/npm-dist-tag-3.0.0"
       sources."@lerna/npm-install-3.0.0"
-      sources."@lerna/npm-publish-3.0.6"
+      sources."@lerna/npm-publish-3.2.0"
       sources."@lerna/npm-run-script-3.0.0"
       sources."@lerna/output-3.0.0"
       sources."@lerna/package-3.0.0"
       sources."@lerna/package-graph-3.1.2"
       sources."@lerna/project-3.0.0"
       sources."@lerna/prompt-3.0.0"
-      sources."@lerna/publish-3.1.3"
+      sources."@lerna/publish-3.2.1"
       sources."@lerna/resolve-symlink-3.0.0"
       sources."@lerna/rimraf-dir-3.0.0"
       sources."@lerna/run-3.1.3"
-      sources."@lerna/run-lifecycle-3.0.0"
+      sources."@lerna/run-lifecycle-3.2.0"
       sources."@lerna/run-parallel-batches-3.0.0"
       sources."@lerna/symlink-binary-3.1.4"
       sources."@lerna/symlink-dependencies-3.1.4"
       sources."@lerna/validation-error-3.0.0"
-      sources."@lerna/version-3.1.3"
+      sources."@lerna/version-3.2.0"
       sources."@lerna/write-log-file-3.0.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.1"
@@ -41571,7 +43906,7 @@ in
       })
       sources."bcrypt-pbkdf-1.0.2"
       sources."block-stream-0.0.9"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
@@ -41613,9 +43948,10 @@ in
       })
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      (sources."cliui-2.1.0" // {
+      (sources."cliui-4.1.0" // {
         dependencies = [
-          sources."wordwrap-0.0.2"
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
         ];
       })
       sources."clone-1.0.4"
@@ -41665,9 +44001,10 @@ in
       sources."dateformat-3.0.3"
       sources."debug-2.6.9"
       sources."debuglog-1.0.1"
-      sources."decamelize-1.2.0"
+      sources."decamelize-2.0.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
+          sources."decamelize-1.2.0"
           sources."map-obj-1.0.1"
         ];
       })
@@ -41739,7 +44076,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."find-up-2.1.0"
+      sources."find-up-3.0.0"
       sources."flush-write-stream-1.0.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
@@ -41763,6 +44100,7 @@ in
         dependencies = [
           sources."camelcase-2.1.1"
           sources."camelcase-keys-2.1.0"
+          sources."decamelize-1.2.0"
           sources."indent-string-2.1.0"
           sources."map-obj-1.0.1"
           sources."meow-3.7.0"
@@ -41883,7 +44221,7 @@ in
       sources."lazy-cache-1.0.4"
       sources."lcid-1.0.0"
       sources."load-json-file-4.0.0"
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.10"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.sortby-4.7.0"
@@ -41900,7 +44238,12 @@ in
       sources."mem-1.1.0"
       (sources."meow-4.0.1" // {
         dependencies = [
+          sources."find-up-2.1.0"
+          sources."locate-path-2.0.0"
           sources."minimist-1.2.0"
+          sources."p-limit-1.3.0"
+          sources."p-locate-2.0.0"
+          sources."p-try-1.0.0"
           sources."read-pkg-up-3.0.0"
         ];
       })
@@ -41989,12 +44332,13 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
+      sources."p-limit-2.0.0"
+      sources."p-locate-3.0.0"
       sources."p-map-1.2.0"
       sources."p-map-series-1.0.0"
+      sources."p-pipe-1.2.0"
       sources."p-reduce-1.0.0"
-      sources."p-try-1.0.0"
+      sources."p-try-2.0.0"
       sources."p-waterfall-1.0.0"
       sources."pacote-9.1.0"
       sources."parallel-transform-1.1.0"
@@ -42010,7 +44354,15 @@ in
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      sources."pkg-dir-2.0.0"
+      (sources."pkg-dir-2.0.0" // {
+        dependencies = [
+          sources."find-up-2.1.0"
+          sources."locate-path-2.0.0"
+          sources."p-limit-1.3.0"
+          sources."p-locate-2.0.0"
+          sources."p-try-1.0.0"
+        ];
+      })
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.0"
       sources."promise-inflight-1.0.1"
@@ -42071,7 +44423,7 @@ in
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."run-queue-1.0.3"
-      sources."rxjs-5.5.11"
+      sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -42197,6 +44549,9 @@ in
       (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."camelcase-1.2.1"
+          sources."cliui-2.1.0"
+          sources."decamelize-1.2.0"
+          sources."wordwrap-0.0.2"
           sources."yargs-3.10.0"
         ];
       })
@@ -42251,19 +44606,7 @@ in
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-12.0.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."cliui-4.1.0"
-          sources."decamelize-2.0.0"
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-limit-2.0.0"
-          sources."p-locate-3.0.0"
-          sources."p-try-2.0.0"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."yargs-12.0.1"
       sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -43317,7 +45660,7 @@ in
       sources."longest-1.0.1"
       sources."lru-cache-2.7.3"
       sources."lru-queue-0.1.0"
-      sources."make-error-1.3.4"
+      sources."make-error-1.3.5"
       sources."make-error-cause-1.2.2"
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
@@ -43529,7 +45872,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typescript-2.7.2"
-      (sources."uglify-js-3.4.8" // {
+      (sources."uglify-js-3.4.9" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -43674,7 +46017,7 @@ in
       sources."mime-types-2.1.20"
       sources."ms-2.0.0"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.7"
+      sources."path-loader-1.0.8"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -44029,7 +46372,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.34"
+      sources."big-integer-1.6.35"
       sources."block-stream-0.0.9"
       sources."body-parser-1.18.2"
       sources."boom-2.10.1"
@@ -44389,10 +46732,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.18.3";
+    version = "1.18.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz";
-      sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g==";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz";
+      sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -44424,7 +46767,7 @@ in
       })
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.1"
       sources."chokidar-2.0.4"
       sources."ci-info-1.4.0"
@@ -45279,10 +47622,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.4.0";
+    version = "6.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.4.0.tgz";
-      sha512 = "k0VteQaxRuI1mREBxCtLUksesD2ZmX5gxjXNEjTmTrxQ3SHW22InkCKyX4NzoeGAYtgmDg5MuE7rcXYod7xgug==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz";
+      sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -45470,7 +47813,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."argparse-1.0.10"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       (sources."boxen-1.3.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -45479,7 +47822,7 @@ in
         ];
       })
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
       sources."ci-info-1.4.0"
       sources."cint-8.2.1"
@@ -45822,7 +48165,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       (sources."body-parser-1.18.3" // {
         dependencies = [
           sources."content-type-1.0.4"
@@ -46154,7 +48497,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.34"
+      sources."big-integer-1.6.35"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -46272,7 +48615,7 @@ in
       sources."lodash-3.10.1"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.2.3"
+      sources."magnet-uri-5.2.4"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
       sources."mime-2.3.1"
@@ -46354,7 +48697,7 @@ in
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."rxjs-5.5.11"
+      sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
@@ -46476,7 +48819,7 @@ in
       })
       sources."boom-0.3.8"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.2.0"
+      sources."buffer-5.2.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -46883,7 +49226,7 @@ in
       sources."form-data-1.0.1"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       (sources."getpass-0.1.7" // {
         dependencies = [
@@ -46979,10 +49322,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.13.6";
+    version = "2.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
-      sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz";
+      sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -48047,6 +50390,583 @@ in
     production = true;
     bypassCache = true;
   };
+  scuttlebot = nodeEnv.buildNodePackage {
+    name = "scuttlebot";
+    packageName = "scuttlebot";
+    version = "11.4.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz";
+      sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg==";
+    };
+    dependencies = [
+      sources."abstract-leveldown-4.0.3"
+      (sources."aligned-block-file-1.1.3" // {
+        dependencies = [
+          sources."obv-0.0.0"
+        ];
+      })
+      sources."ansi-escapes-1.4.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."anymatch-1.3.2"
+      sources."append-batch-0.0.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.2.1"
+      sources."arrify-1.0.1"
+      sources."async-each-1.0.1"
+      sources."async-single-1.0.5"
+      sources."async-write-2.1.0"
+      sources."atomic-file-0.0.1"
+      sources."attach-ware-1.1.1"
+      sources."bail-1.0.3"
+      sources."balanced-match-1.0.0"
+      sources."base64-url-2.2.0"
+      sources."bash-color-0.0.4"
+      sources."binary-extensions-1.11.0"
+      sources."binary-search-1.3.4"
+      sources."bindings-1.3.0"
+      sources."bl-1.2.2"
+      sources."blake2s-1.0.1"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."broadcast-stream-0.2.2"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.1"
+      sources."bytewise-1.1.0"
+      sources."bytewise-core-1.2.3"
+      sources."camelcase-2.1.1"
+      sources."ccount-1.0.3"
+      sources."chalk-1.1.3"
+      sources."character-entities-1.2.2"
+      sources."character-entities-html4-1.1.2"
+      sources."character-entities-legacy-1.1.2"
+      sources."character-reference-invalid-1.1.2"
+      sources."charwise-3.0.1"
+      sources."chloride-2.2.10"
+      sources."chloride-test-1.2.2"
+      sources."chokidar-1.7.0"
+      sources."chownr-1.0.1"
+      sources."cli-cursor-1.0.2"
+      sources."co-3.1.0"
+      sources."code-point-at-1.1.0"
+      sources."collapse-white-space-1.0.4"
+      sources."commander-2.17.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."console-control-strings-1.1.0"
+      sources."cont-1.0.3"
+      sources."continuable-1.2.0"
+      (sources."continuable-hash-0.1.4" // {
+        dependencies = [
+          sources."continuable-1.1.8"
+        ];
+      })
+      (sources."continuable-list-0.1.6" // {
+        dependencies = [
+          sources."continuable-1.1.8"
+        ];
+      })
+      sources."continuable-para-1.2.0"
+      sources."continuable-series-1.2.0"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-5.1.0"
+      sources."debug-2.6.9"
+      sources."decompress-response-3.3.0"
+      sources."deep-equal-1.0.1"
+      sources."deep-extend-0.6.0"
+      sources."deferred-leveldown-3.0.0"
+      sources."define-properties-1.1.3"
+      sources."defined-1.0.0"
+      sources."delegates-1.0.0"
+      sources."detab-1.0.2"
+      sources."detect-libc-1.0.3"
+      sources."ed2curve-0.1.4"
+      sources."elegant-spinner-1.0.1"
+      sources."emoji-named-characters-1.0.2"
+      sources."emoji-server-1.0.0"
+      (sources."encoding-down-4.0.1" // {
+        dependencies = [
+          sources."level-codec-8.0.0"
+        ];
+      })
+      sources."end-of-stream-1.4.1"
+      sources."epidemic-broadcast-trees-6.3.4"
+      sources."errno-0.1.7"
+      sources."es-abstract-1.12.0"
+      sources."es-to-primitive-1.1.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."exit-hook-1.1.1"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      sources."expand-template-1.1.1"
+      sources."explain-error-1.0.4"
+      sources."extend-3.0.2"
+      sources."extend.js-0.0.2"
+      sources."extglob-0.3.2"
+      sources."fast-future-1.0.2"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."flumecodec-0.0.1"
+      sources."flumedb-0.4.9"
+      (sources."flumelog-offset-3.3.1" // {
+        dependencies = [
+          sources."looper-4.0.0"
+        ];
+      })
+      (sources."flumeview-hashtable-1.0.4" // {
+        dependencies = [
+          sources."atomic-file-1.1.5"
+        ];
+      })
+      (sources."flumeview-level-3.0.5" // {
+        dependencies = [
+          sources."obv-0.0.0"
+        ];
+      })
+      (sources."flumeview-query-6.3.0" // {
+        dependencies = [
+          sources."map-filter-reduce-3.1.0"
+        ];
+      })
+      (sources."flumeview-reduce-1.3.13" // {
+        dependencies = [
+          sources."atomic-file-1.1.5"
+          sources."flumecodec-0.0.0"
+          sources."obv-0.0.0"
+        ];
+      })
+      sources."for-each-0.3.3"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."fs-constants-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.2.4"
+      sources."function-bind-1.1.1"
+      sources."gauge-2.7.4"
+      sources."github-from-package-0.0.0"
+      sources."glob-6.0.4"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      sources."globby-4.1.0"
+      sources."graceful-fs-4.1.11"
+      sources."graphreduce-3.0.4"
+      sources."has-1.0.3"
+      sources."has-ansi-2.0.0"
+      sources."has-network-0.0.1"
+      sources."has-unicode-2.0.1"
+      sources."hashlru-2.2.1"
+      sources."he-0.5.0"
+      sources."hoox-0.0.1"
+      sources."increment-buffer-1.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."int53-0.2.4"
+      sources."ip-0.3.3"
+      sources."irregular-plurals-1.4.0"
+      sources."is-alphabetical-1.0.2"
+      sources."is-alphanumerical-1.0.2"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
+      sources."is-decimal-1.0.2"
+      sources."is-dotfile-1.0.3"
+      sources."is-electron-2.1.0"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-2.0.1"
+      sources."is-hexadecimal-1.0.2"
+      sources."is-number-2.1.0"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."is-regex-1.0.4"
+      sources."is-symbol-1.0.1"
+      sources."is-valid-domain-0.0.5"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-2.1.0"
+      sources."json-buffer-2.0.11"
+      sources."kind-of-3.2.2"
+      sources."level-3.0.2"
+      sources."level-codec-6.2.0"
+      sources."level-errors-1.1.2"
+      sources."level-iterator-stream-2.0.3"
+      sources."level-packager-2.1.1"
+      sources."level-post-1.0.7"
+      (sources."level-sublevel-6.6.5" // {
+        dependencies = [
+          (sources."abstract-leveldown-0.12.4" // {
+            dependencies = [
+              sources."xtend-3.0.0"
+            ];
+          })
+          sources."bl-0.8.2"
+          sources."deferred-leveldown-0.2.0"
+          sources."isarray-0.0.1"
+          (sources."levelup-0.19.1" // {
+            dependencies = [
+              sources."xtend-3.0.0"
+            ];
+          })
+          sources."ltgt-2.1.3"
+          sources."prr-0.0.0"
+          sources."readable-stream-1.0.34"
+          sources."semver-5.1.1"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      (sources."leveldown-3.0.2" // {
+        dependencies = [
+          sources."nan-2.10.0"
+        ];
+      })
+      sources."levelup-2.0.2"
+      sources."libsodium-0.7.3"
+      sources."libsodium-wrappers-0.7.3"
+      sources."log-symbols-1.0.2"
+      sources."log-update-1.0.2"
+      sources."longest-streak-1.0.0"
+      sources."looper-3.0.0"
+      sources."lossy-store-1.2.3"
+      sources."lru-cache-4.1.3"
+      sources."ltgt-2.2.1"
+      sources."map-filter-reduce-2.2.1"
+      sources."map-merge-1.1.0"
+      sources."markdown-table-0.4.0"
+      sources."math-random-1.0.1"
+      sources."mdmanifest-1.0.8"
+      sources."micromatch-2.3.11"
+      sources."mimic-response-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."monotonic-timestamp-0.0.9"
+      sources."ms-2.0.0"
+      (sources."multiblob-1.13.0" // {
+        dependencies = [
+          sources."deep-extend-0.2.11"
+          sources."minimist-0.0.10"
+          sources."pull-file-0.5.0"
+          sources."rc-0.5.5"
+          sources."rimraf-2.2.8"
+          sources."strip-json-comments-0.1.3"
+        ];
+      })
+      sources."multiblob-http-0.4.2"
+      sources."multicb-1.2.2"
+      sources."multiserver-1.13.3"
+      sources."muxrpc-6.4.1"
+      (sources."muxrpc-validation-2.0.1" // {
+        dependencies = [
+          sources."pull-stream-2.28.4"
+        ];
+      })
+      (sources."muxrpcli-1.1.0" // {
+        dependencies = [
+          sources."pull-stream-2.28.4"
+        ];
+      })
+      (sources."mv-2.1.1" // {
+        dependencies = [
+          sources."rimraf-2.4.5"
+        ];
+      })
+      sources."nan-2.11.0"
+      sources."ncp-2.0.0"
+      sources."node-abi-2.4.3"
+      sources."node-gyp-build-3.4.0"
+      (sources."non-private-ip-1.4.4" // {
+        dependencies = [
+          sources."ip-1.1.5"
+        ];
+      })
+      sources."noop-logger-0.1.1"
+      sources."normalize-path-2.1.1"
+      sources."normalize-uri-1.1.1"
+      sources."npm-prefix-1.2.0"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."object-inspect-1.6.0"
+      sources."object-keys-1.0.12"
+      sources."object.omit-2.0.1"
+      sources."observ-0.2.0"
+      sources."observ-debounce-1.1.1"
+      sources."obv-0.0.1"
+      sources."on-change-network-0.0.2"
+      sources."on-wakeup-1.0.1"
+      sources."once-1.4.0"
+      sources."onetime-1.1.0"
+      sources."opencollective-postinstall-2.0.0"
+      sources."options-0.0.6"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."packet-stream-2.0.4"
+      sources."packet-stream-codec-1.1.2"
+      sources."parse-entities-1.1.2"
+      sources."parse-glob-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."plur-2.1.2"
+      sources."prebuild-install-4.0.0"
+      sources."preserve-0.2.0"
+      sources."private-box-0.2.1"
+      sources."process-nextick-args-2.0.0"
+      sources."prr-1.0.1"
+      sources."pseudomap-1.0.2"
+      sources."pull-abortable-4.1.1"
+      sources."pull-box-stream-1.0.13"
+      sources."pull-cat-1.1.11"
+      sources."pull-cont-0.0.0"
+      sources."pull-core-1.1.0"
+      (sources."pull-cursor-3.0.0" // {
+        dependencies = [
+          sources."looper-4.0.0"
+        ];
+      })
+      sources."pull-defer-0.2.3"
+      sources."pull-file-1.1.0"
+      sources."pull-flatmap-0.0.1"
+      (sources."pull-fs-1.1.6" // {
+        dependencies = [
+          sources."pull-file-0.5.0"
+        ];
+      })
+      sources."pull-glob-1.0.7"
+      (sources."pull-goodbye-0.0.2" // {
+        dependencies = [
+          sources."pull-stream-3.5.0"
+        ];
+      })
+      sources."pull-handshake-1.1.4"
+      sources."pull-hash-1.0.0"
+      (sources."pull-inactivity-2.1.2" // {
+        dependencies = [
+          sources."pull-abortable-4.0.0"
+        ];
+      })
+      sources."pull-level-2.0.4"
+      sources."pull-live-1.0.1"
+      (sources."pull-looper-1.0.0" // {
+        dependencies = [
+          sources."looper-4.0.0"
+        ];
+      })
+      sources."pull-many-1.0.8"
+      sources."pull-next-1.0.1"
+      sources."pull-notify-0.1.1"
+      sources."pull-pair-1.1.0"
+      (sources."pull-paramap-1.2.2" // {
+        dependencies = [
+          sources."looper-4.0.0"
+        ];
+      })
+      sources."pull-ping-2.0.2"
+      sources."pull-pushable-2.2.0"
+      sources."pull-rate-1.0.2"
+      sources."pull-reader-1.3.1"
+      sources."pull-sink-through-0.0.0"
+      sources."pull-stream-3.6.9"
+      sources."pull-stream-to-stream-1.3.4"
+      sources."pull-stringify-1.2.2"
+      sources."pull-through-1.0.18"
+      sources."pull-traverse-1.0.3"
+      sources."pull-utf8-decoder-1.0.2"
+      (sources."pull-window-2.1.4" // {
+        dependencies = [
+          sources."looper-2.0.0"
+        ];
+      })
+      (sources."pull-write-1.1.4" // {
+        dependencies = [
+          sources."looper-4.0.0"
+        ];
+      })
+      sources."pull-write-file-0.2.4"
+      sources."pull-ws-3.3.1"
+      sources."pump-2.0.1"
+      sources."push-stream-10.0.3"
+      sources."push-stream-to-pull-stream-1.0.3"
+      (sources."randomatic-3.1.0" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."rc-1.2.8"
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.1.0"
+      sources."regex-cache-0.4.4"
+      sources."relative-url-1.0.2"
+      sources."remark-3.2.3"
+      sources."remark-html-2.0.2"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."resolve-1.7.1"
+      sources."restore-cursor-1.0.1"
+      sources."resumer-0.0.0"
+      (sources."rimraf-2.6.2" // {
+        dependencies = [
+          sources."glob-7.1.3"
+        ];
+      })
+      sources."safe-buffer-5.1.2"
+      sources."secret-handshake-1.1.13"
+      (sources."secret-stack-4.1.0" // {
+        dependencies = [
+          sources."ip-1.1.5"
+        ];
+      })
+      (sources."secure-scuttlebutt-18.2.0" // {
+        dependencies = [
+          sources."deep-equal-0.2.2"
+        ];
+      })
+      sources."semver-5.5.1"
+      sources."separator-escape-0.0.0"
+      sources."set-blocking-2.0.0"
+      sources."set-immediate-shim-1.0.1"
+      sources."sha.js-2.4.5"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."shellsubstitute-1.2.0"
+      sources."signal-exit-3.0.2"
+      sources."simple-concat-1.0.0"
+      sources."simple-get-2.8.1"
+      sources."smart-buffer-4.0.1"
+      (sources."socks-2.2.1" // {
+        dependencies = [
+          sources."ip-1.1.5"
+        ];
+      })
+      sources."sodium-browserify-1.2.4"
+      (sources."sodium-browserify-tweetnacl-0.2.3" // {
+        dependencies = [
+          sources."sha.js-2.4.11"
+        ];
+      })
+      sources."sodium-chloride-1.1.0"
+      sources."sodium-native-2.2.1"
+      sources."split-buffer-1.0.0"
+      sources."ssb-blobs-1.1.5"
+      sources."ssb-client-4.6.0"
+      (sources."ssb-config-2.2.0" // {
+        dependencies = [
+          sources."deep-extend-0.4.2"
+        ];
+      })
+      sources."ssb-ebt-5.2.2"
+      (sources."ssb-friends-2.4.0" // {
+        dependencies = [
+          sources."pull-cont-0.1.1"
+        ];
+      })
+      sources."ssb-keys-7.0.16"
+      sources."ssb-links-3.0.3"
+      sources."ssb-msgs-5.2.0"
+      (sources."ssb-query-2.2.1" // {
+        dependencies = [
+          sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map"
+          sources."map-filter-reduce-3.1.0"
+        ];
+      })
+      (sources."ssb-ref-2.11.2" // {
+        dependencies = [
+          sources."ip-1.1.5"
+        ];
+      })
+      sources."ssb-validate-3.0.10"
+      sources."ssb-ws-2.1.1"
+      sources."stack-0.1.0"
+      sources."statistics-3.3.0"
+      sources."stream-to-pull-stream-1.7.2"
+      sources."string-width-1.0.2"
+      sources."string.prototype.trim-1.1.2"
+      sources."string_decoder-1.1.1"
+      sources."stringify-entities-1.3.2"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-2.0.0"
+      (sources."tape-4.9.1" // {
+        dependencies = [
+          sources."glob-7.1.3"
+        ];
+      })
+      (sources."tar-fs-1.16.3" // {
+        dependencies = [
+          sources."pump-1.0.3"
+        ];
+      })
+      sources."tar-stream-1.6.1"
+      sources."text-table-0.2.0"
+      sources."through-2.3.8"
+      sources."to-buffer-1.1.1"
+      sources."to-vfile-1.0.0"
+      sources."trim-0.0.1"
+      sources."trim-lines-1.1.1"
+      sources."trim-trailing-lines-1.1.1"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."tweetnacl-auth-0.3.1"
+      sources."typedarray-0.0.6"
+      sources."typewise-1.0.3"
+      sources."typewise-core-1.2.0"
+      sources."typewiselite-1.0.0"
+      sources."uint48be-1.0.2"
+      sources."ultron-1.0.2"
+      sources."unherit-1.1.1"
+      sources."unified-2.1.4"
+      sources."unist-util-is-2.1.2"
+      sources."unist-util-visit-1.4.0"
+      sources."unist-util-visit-parents-2.0.1"
+      sources."untildify-2.1.0"
+      sources."user-home-2.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."vfile-1.4.0"
+      sources."vfile-find-down-1.0.0"
+      sources."vfile-find-up-1.0.0"
+      sources."vfile-reporter-1.5.0"
+      sources."vfile-sort-1.0.0"
+      sources."ware-1.3.0"
+      sources."which-1.3.1"
+      sources."which-pm-runs-1.0.0"
+      sources."wide-align-1.1.3"
+      sources."word-wrap-1.2.3"
+      sources."wrap-fn-0.1.5"
+      sources."wrappy-1.0.2"
+      sources."ws-1.1.5"
+      sources."xtend-4.0.1"
+      sources."yallist-2.1.2"
+      sources."zerr-1.0.4"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "network protocol layer for secure-scuttlebutt";
+      homepage = https://github.com/ssbc/scuttlebot;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
@@ -49148,7 +52068,7 @@ in
       sources."bytes-1.0.0"
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
@@ -49444,7 +52364,7 @@ in
       sources."nan-2.11.0"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
-      (sources."nodemon-1.18.3" // {
+      (sources."nodemon-1.18.4" // {
         dependencies = [
           sources."debug-3.1.0"
           sources."supports-color-5.5.0"
@@ -49482,7 +52402,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      (sources."path-loader-1.0.7" // {
+      (sources."path-loader-1.0.8" // {
         dependencies = [
           sources."debug-3.1.0"
           sources."qs-6.5.2"
@@ -49701,7 +52621,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."valid-url-1.0.9"
-      sources."validator-10.7.0"
+      sources."validator-10.7.1"
       sources."which-1.3.1"
       sources."widest-line-2.0.0"
       sources."window-size-0.1.0"
@@ -49776,10 +52696,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.95.0";
+    version = "0.96.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.95.0.tgz";
-      sha512 = "vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA==";
+      url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz";
+      sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -49897,7 +52817,7 @@ in
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.4.8"
+      sources."uglify-js-3.4.9"
       sources."universalify-0.1.2"
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
@@ -50105,10 +53025,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.0.1";
+    version = "3.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz";
-      sha512 = "zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz";
+      sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -50139,7 +53059,7 @@ in
       sources."array-uniq-1.0.3"
       sources."asynckit-0.4.0"
       sources."balanced-match-1.0.0"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       (sources."boxen-1.3.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -50150,7 +53070,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
       sources."ci-info-1.4.0"
       sources."cli-boxes-1.0.0"
@@ -50229,7 +53149,7 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
-      sources."make-error-1.3.4"
+      sources."make-error-1.3.5"
       sources."make-error-cause-1.2.2"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
@@ -50339,10 +53259,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.4.8";
+    version = "3.4.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz";
-      sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz";
+      sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==";
     };
     dependencies = [
       sources."commander-2.17.1"
@@ -50395,7 +53315,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."blob-0.0.4"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."blueimp-md5-2.10.0"
       sources."body-parser-1.18.3"
       sources."brace-expansion-1.1.11"
@@ -50463,7 +53383,7 @@ in
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."editions-2.0.1"
+      sources."editions-2.0.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       (sources."engine.io-3.2.0" // {
@@ -50532,7 +53452,7 @@ in
       sources."gauge-2.7.4"
       sources."get-caller-file-1.0.3"
       sources."get-stream-3.0.0"
-      sources."getmac-1.4.5"
+      sources."getmac-1.4.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."graceful-fs-4.1.11"
@@ -50845,7 +53765,7 @@ in
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bl-1.2.2"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
       sources."buffer-alloc-1.2.0"
@@ -50854,12 +53774,12 @@ in
       sources."buffer-fill-1.0.0"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."caw-2.0.1"
       sources."center-align-0.1.3"
       sources."chalk-2.4.1"
-      sources."chardet-0.5.0"
+      sources."chardet-0.7.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-width-2.2.0"
@@ -50910,7 +53830,7 @@ in
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
       sources."extend-shallow-2.0.1"
-      sources."external-editor-3.0.1"
+      sources."external-editor-3.0.3"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
@@ -51041,7 +53961,7 @@ in
       sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.2.2"
+      sources."rxjs-6.3.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       (sources."seek-bzip-1.0.5" // {
@@ -51149,7 +54069,7 @@ in
       sources."@types/graphql-0.12.6"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
-      sources."@types/node-10.9.2"
+      sources."@types/node-10.9.4"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-5.1.2"
@@ -51170,11 +54090,11 @@ in
       sources."ansi-styles-3.2.1"
       sources."anymatch-2.0.0"
       sources."apollo-cache-1.1.16"
-      sources."apollo-cache-control-0.2.2"
+      sources."apollo-cache-control-0.2.3"
       sources."apollo-cache-inmemory-1.2.9"
       sources."apollo-client-2.4.1"
-      sources."apollo-datasource-0.1.2"
-      sources."apollo-engine-reporting-0.0.2"
+      sources."apollo-datasource-0.1.3"
+      sources."apollo-engine-reporting-0.0.3"
       sources."apollo-engine-reporting-protobuf-0.0.1"
       sources."apollo-link-1.2.2"
       sources."apollo-link-context-1.0.8"
@@ -51185,11 +54105,11 @@ in
       sources."apollo-link-state-0.4.1"
       sources."apollo-link-ws-1.0.8"
       sources."apollo-server-caching-0.1.2"
-      sources."apollo-server-core-2.0.4"
-      sources."apollo-server-env-2.0.2"
+      sources."apollo-server-core-2.0.5"
+      sources."apollo-server-env-2.0.3"
       sources."apollo-server-errors-2.0.2"
-      sources."apollo-server-express-2.0.4"
-      sources."apollo-tracing-0.2.2"
+      sources."apollo-server-express-2.0.5"
+      sources."apollo-tracing-0.2.3"
       sources."apollo-upload-client-8.1.0"
       sources."apollo-utilities-1.0.20"
       sources."argparse-1.0.10"
@@ -51256,11 +54176,11 @@ in
       sources."cache-base-1.0.1"
       sources."call-me-maybe-1.0.1"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."caw-2.0.1"
       sources."chalk-2.4.1"
-      sources."chardet-0.5.0"
+      sources."chardet-0.7.0"
       sources."chokidar-2.0.4"
       sources."ci-info-1.4.0"
       (sources."class-utils-0.3.6" // {
@@ -51410,7 +54330,11 @@ in
       sources."express-history-api-fallback-2.2.1"
       sources."extend-3.0.2"
       sources."extend-shallow-2.0.1"
-      sources."external-editor-3.0.1"
+      (sources."external-editor-3.0.3" // {
+        dependencies = [
+          sources."iconv-lite-0.4.24"
+        ];
+      })
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -51472,7 +54396,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graphql-0.13.2"
       sources."graphql-anywhere-4.1.18"
-      sources."graphql-extensions-0.1.2"
+      sources."graphql-extensions-0.1.3"
       sources."graphql-subscriptions-0.5.8"
       sources."graphql-tag-2.9.2"
       sources."graphql-tools-3.1.1"
@@ -51608,7 +54532,7 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.11.0"
-      sources."nanoid-1.2.1"
+      sources."nanoid-1.2.2"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -51620,7 +54544,7 @@ in
       sources."node-fetch-2.2.0"
       sources."node-ipc-9.1.1"
       sources."node-notifier-5.2.1"
-      sources."nodemon-1.18.3"
+      sources."nodemon-1.18.4"
       sources."nopt-1.0.10"
       sources."normalize-path-2.1.1"
       sources."npm-conf-1.1.3"
@@ -51731,7 +54655,7 @@ in
       sources."retry-0.10.1"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.2.2"
+      sources."rxjs-6.3.1"
       sources."safe-buffer-5.1.1"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -52000,7 +54924,7 @@ in
       sources."form-data-1.0.1"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       (sources."getpass-0.1.7" // {
         dependencies = [
@@ -52167,7 +55091,7 @@ in
       sources."base64-js-1.3.0"
       sources."big.js-3.2.0"
       sources."binary-extensions-1.11.0"
-      sources."bluebird-3.5.1"
+      sources."bluebird-3.5.2"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -52550,7 +55474,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
       sources."watchpack-1.6.0"
-      (sources."webpack-sources-1.1.0" // {
+      (sources."webpack-sources-1.2.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -52587,7 +55511,7 @@ in
       sources."bencode-2.0.0"
       sources."binary-search-1.3.4"
       sources."bitfield-2.0.0"
-      (sources."bittorrent-dht-8.4.0" // {
+      (sources."bittorrent-dht-9.0.0" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -52596,6 +55520,7 @@ in
       (sources."bittorrent-protocol-3.0.1" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."readable-stream-2.3.6"
         ];
       })
       (sources."bittorrent-tracker-9.10.1" // {
@@ -52605,7 +55530,11 @@ in
         ];
       })
       sources."blob-to-buffer-1.2.8"
-      sources."block-stream2-1.1.0"
+      (sources."block-stream2-1.1.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."browserify-package-json-1.0.1"
@@ -52625,15 +55554,23 @@ in
           sources."mime-1.6.0"
         ];
       })
-      sources."chunk-store-stream-3.0.1"
+      (sources."chunk-store-stream-3.0.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."clivas-0.2.0"
       sources."closest-to-2.0.0"
       sources."colour-0.7.1"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
+      (sources."concat-stream-1.6.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."core-util-is-1.0.2"
-      sources."create-torrent-3.32.1"
+      sources."create-torrent-3.33.0"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
       sources."defined-1.0.0"
@@ -52644,7 +55581,7 @@ in
       })
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
-      (sources."ecstatic-3.2.1" // {
+      (sources."ecstatic-3.3.0" // {
         dependencies = [
           sources."mime-1.6.0"
         ];
@@ -52652,7 +55589,11 @@ in
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
       sources."executable-4.1.1"
-      sources."filestream-4.1.3"
+      (sources."filestream-4.1.3" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."flatten-1.0.2"
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
@@ -52675,8 +55616,12 @@ in
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."junk-2.1.0"
-      sources."k-bucket-4.0.1"
-      sources."k-rpc-5.0.0"
+      sources."k-bucket-5.0.0"
+      (sources."k-rpc-5.0.0" // {
+        dependencies = [
+          sources."k-bucket-4.0.1"
+        ];
+      })
       sources."k-rpc-socket-1.8.0"
       sources."last-one-wins-1.0.4"
       (sources."load-ip-set-2.1.0" // {
@@ -52686,10 +55631,14 @@ in
       })
       sources."long-2.4.0"
       sources."lru-3.1.0"
-      sources."magnet-uri-5.2.3"
+      sources."magnet-uri-5.2.4"
       sources."mdns-js-0.5.0"
       sources."mdns-js-packet-0.2.0"
-      sources."mediasource-2.2.2"
+      (sources."mediasource-2.2.2" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."memory-chunk-store-1.3.0"
       sources."mime-2.3.1"
       sources."mimic-response-1.0.1"
@@ -52702,14 +55651,22 @@ in
       })
       sources."moment-2.22.2"
       sources."mp4-box-encoding-1.3.0"
-      sources."mp4-stream-2.0.3"
+      (sources."mp4-stream-2.0.3" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."ms-2.0.0"
       (sources."multicast-dns-6.2.3" // {
         dependencies = [
           sources."thunky-1.0.2"
         ];
       })
-      sources."multistream-2.1.1"
+      (sources."multistream-2.1.1" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
@@ -52744,8 +55701,12 @@ in
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      sources."range-slice-stream-1.2.0"
-      sources."readable-stream-2.3.6"
+      (sources."range-slice-stream-1.2.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+        ];
+      })
+      sources."readable-stream-3.0.2"
       sources."record-cache-1.1.0"
       (sources."render-media-3.1.3" // {
         dependencies = [
@@ -52765,12 +55726,14 @@ in
       (sources."simple-peer-9.1.2" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."readable-stream-2.3.6"
         ];
       })
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-7.2.0" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."readable-stream-2.3.6"
         ];
       })
       sources."speedometer-1.1.0"
@@ -52784,7 +55747,7 @@ in
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."to-arraybuffer-1.0.1"
-      (sources."torrent-discovery-9.0.2" // {
+      (sources."torrent-discovery-9.1.1" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -52798,7 +55761,7 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
-      (sources."ut_metadata-3.2.2" // {
+      (sources."ut_metadata-3.3.0" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -52807,11 +55770,10 @@ in
       sources."utf-8-validate-5.0.1"
       sources."util-deprecate-1.0.2"
       sources."videostream-2.5.1"
-      sources."vlc-command-1.1.1"
-      (sources."webtorrent-0.102.2" // {
+      sources."vlc-command-1.1.2"
+      (sources."webtorrent-0.102.4" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."readable-stream-3.0.2"
           sources."simple-get-3.0.3"
         ];
       })
@@ -52822,7 +55784,6 @@ in
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
-      sources."zero-fill-2.2.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -52836,27 +55797,35 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "2.8.0";
+    version = "2.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-2.8.0.tgz";
-      sha512 = "3JuPYU3yrefysm3pvGwRP5k9plRMPUeLo5KLp2TSnE9g4t7x6SeIWZEWWG3jwVeFsPQuIj3sAuVHEDO5ai9mCw==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.1.tgz";
+      sha512 = "sK5ebAiUNJFG+KfFjjvWks9ihecy0TdVCrrnSW/tZ15QFO6u4LCIQKCuBr7FyGMjC+IOGJFB7pS1ZbyPNJ72GQ==";
     };
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.9.2"
+      sources."@types/node-10.9.4"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.7.2"
-      sources."acorn-jsx-4.1.1"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
       sources."adbkit-2.11.0"
       sources."adbkit-logcat-1.1.0"
       sources."adbkit-monkey-1.0.1"
-      (sources."addons-linter-1.2.6" // {
+      (sources."addons-linter-1.3.1" // {
         dependencies = [
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.6"
-          sources."yargs-12.0.1"
+          (sources."yargs-12.0.1" // {
+            dependencies = [
+              sources."os-locale-2.1.0"
+            ];
+          })
         ];
       })
       sources."adm-zip-0.4.11"
@@ -52945,7 +55914,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."buffer-5.2.0"
+      sources."buffer-5.2.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -52959,7 +55928,7 @@ in
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
       sources."camelcase-4.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       (sources."chalk-2.4.0" // {
         dependencies = [
@@ -53021,7 +55990,7 @@ in
       sources."crc-3.8.0"
       sources."crc32-stream-2.0.0"
       sources."create-error-class-3.0.2"
-      sources."cross-spawn-6.0.5"
+      sources."cross-spawn-5.1.0"
       sources."crx-parser-0.1.2"
       sources."crypto-random-string-1.0.0"
       sources."css-select-1.2.0"
@@ -53050,15 +56019,12 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."detect-indent-4.0.0"
-      (sources."dispensary-0.21.0" // {
+      (sources."dispensary-0.22.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
           sources."async-2.6.1"
-          sources."chalk-2.4.1"
-          sources."pino-4.17.6"
+          sources."os-locale-2.1.0"
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.9"
-          sources."supports-color-5.5.0"
           sources."yargs-12.0.1"
         ];
       })
@@ -53106,6 +56072,7 @@ in
       (sources."eslint-5.0.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
+          sources."cross-spawn-6.0.5"
           sources."debug-3.1.0"
           sources."globals-11.7.0"
           sources."strip-ansi-4.0.0"
@@ -53113,8 +56080,6 @@ in
       })
       (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
         dependencies = [
-          sources."acorn-3.3.0"
-          sources."acorn-jsx-3.0.1"
           sources."ajv-4.11.8"
           sources."ajv-keywords-1.5.1"
           sources."ansi-escapes-1.4.0"
@@ -53144,7 +56109,11 @@ in
       })
       sources."eslint-scope-4.0.0"
       sources."eslint-visitor-keys-1.0.0"
-      sources."espree-4.0.0"
+      (sources."espree-4.0.0" // {
+        dependencies = [
+          sources."acorn-jsx-4.1.1"
+        ];
+      })
       sources."esprima-3.1.3"
       sources."esquery-1.0.1"
       sources."esrecurse-4.2.1"
@@ -53152,11 +56121,7 @@ in
       sources."esutils-2.0.2"
       sources."event-emitter-0.3.5"
       sources."event-to-promise-0.8.0"
-      (sources."execa-0.7.0" // {
-        dependencies = [
-          sources."cross-spawn-5.1.0"
-        ];
-      })
+      sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -53192,11 +56157,11 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-parse-1.0.3"
-      sources."fast-json-patch-2.0.6"
+      sources."fast-json-patch-2.0.7"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
       sources."fast-redact-1.1.14"
-      sources."fast-safe-stringify-1.2.3"
+      sources."fast-safe-stringify-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
@@ -53207,7 +56172,7 @@ in
         ];
       })
       sources."find-up-3.0.0"
-      (sources."firefox-profile-1.1.0" // {
+      (sources."firefox-profile-1.2.0" // {
         dependencies = [
           sources."async-2.5.0"
           sources."fs-extra-4.0.3"
@@ -53242,7 +56207,7 @@ in
           sources."which-1.2.4"
         ];
       })
-      sources."generate-function-2.2.0"
+      sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.3"
       sources."get-stream-3.0.0"
@@ -53270,7 +56235,7 @@ in
       sources."graphlib-2.1.5"
       sources."growly-1.3.0"
       sources."har-schema-2.0.0"
-      (sources."har-validator-5.0.3" // {
+      (sources."har-validator-5.1.0" // {
         dependencies = [
           sources."ajv-5.5.2"
           sources."fast-deep-equal-1.1.0"
@@ -53539,7 +56504,7 @@ in
       sources."npm-run-path-2.0.2"
       sources."nth-check-1.0.1"
       sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.8.2"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -53561,11 +56526,20 @@ in
       sources."opn-5.3.0"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
-      sources."os-locale-2.1.0"
+      (sources."os-locale-3.0.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."execa-0.10.0"
+          sources."invert-kv-2.0.0"
+          sources."lcid-2.0.0"
+          sources."mem-3.0.1"
+        ];
+      })
       sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
+      sources."p-is-promise-1.1.0"
       sources."p-limit-2.0.0"
       sources."p-locate-3.0.0"
       sources."p-try-2.0.0"
@@ -53593,12 +56567,7 @@ in
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
-      (sources."pino-5.0.0-rc.4" // {
-        dependencies = [
-          sources."fast-safe-stringify-2.0.6"
-          sources."quick-format-unescaped-3.0.0"
-        ];
-      })
+      sources."pino-5.0.4"
       sources."pino-std-serializers-2.2.1"
       sources."pluralize-7.0.0"
       sources."po2json-0.4.5"
@@ -53626,10 +56595,11 @@ in
       })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
+      sources."psl-1.1.29"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."quick-format-unescaped-1.1.2"
+      sources."quick-format-unescaped-3.0.0"
       (sources."raw-body-2.3.3" // {
         dependencies = [
           sources."iconv-lite-0.4.23"
@@ -53667,7 +56637,7 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      sources."request-2.87.0"
+      sources."request-2.88.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-uncached-1.0.3"
@@ -53680,7 +56650,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-3.1.2"
       sources."rx-lite-aggregates-4.0.8"
-      sources."rxjs-5.5.11"
+      sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safe-regex-1.1.0"
@@ -53710,11 +56680,19 @@ in
       sources."shellwords-0.1.1"
       (sources."sign-addon-0.3.1" // {
         dependencies = [
+          sources."ajv-5.5.2"
           sources."babel-polyfill-6.16.0"
           sources."es6-error-4.0.0"
+          sources."fast-deep-equal-1.1.0"
+          sources."har-validator-5.0.3"
+          sources."json-schema-traverse-0.3.1"
           sources."mz-2.5.0"
+          sources."oauth-sign-0.8.2"
+          sources."punycode-1.4.1"
           sources."regenerator-runtime-0.9.6"
+          sources."request-2.87.0"
           sources."source-map-support-0.4.6"
+          sources."tough-cookie-2.3.4"
         ];
       })
       sources."signal-exit-3.0.2"
@@ -53824,7 +56802,7 @@ in
       })
       sources."socks-1.1.10"
       sources."socks-proxy-agent-3.0.1"
-      sources."sonic-boom-0.5.0"
+      sources."sonic-boom-0.6.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       (sources."source-map-support-0.5.3" // {
@@ -53840,7 +56818,6 @@ in
       sources."spdx-license-ids-3.0.0"
       sources."split-0.3.3"
       sources."split-string-3.1.0"
-      sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
       (sources."static-extend-0.1.2" // {
@@ -53896,7 +56873,6 @@ in
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
       sources."through-2.3.8"
-      sources."through2-2.0.3"
       sources."thunkify-2.1.2"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
@@ -53907,7 +56883,7 @@ in
       sources."to-regex-range-2.1.1"
       sources."toml-2.3.3"
       sources."tosource-1.0.0"
-      (sources."tough-cookie-2.3.4" // {
+      (sources."tough-cookie-2.4.3" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
@@ -54118,10 +57094,10 @@ in
       sources."call-me-maybe-1.0.1"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."capture-stack-trace-1.0.0"
+      sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
-      sources."chardet-0.5.0"
+      sources."chardet-0.7.0"
       sources."ci-info-1.4.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -54227,7 +57203,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."external-editor-3.0.1"
+      sources."external-editor-3.0.3"
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -54309,7 +57285,7 @@ in
           sources."chardet-0.4.2"
           sources."external-editor-2.2.0"
           sources."inquirer-5.2.0"
-          sources."rxjs-5.5.11"
+          sources."rxjs-5.5.12"
         ];
       })
       sources."into-stream-3.1.0"
@@ -54547,7 +57523,7 @@ in
       sources."root-check-1.0.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
-      sources."rxjs-6.2.2"
+      sources."rxjs-6.3.1"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"

From f46d23996c5fc2172051a81baca1704259ed7edc Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 3 Sep 2018 14:51:28 -0400
Subject: [PATCH 0170/3253] Revert "arrow-cpp: 0.9.0 -> 0.10.0" (#45990)

Hold off the upgrade until parquet 1.5.0 is released.

This reverts commit 72d630779d69b0aff30f47bc8423e10d1dba50b9.
---
 pkgs/development/libraries/arrow-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 8e89aeb21a24..952f7435c069 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.10.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
+    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";

From 66385a66dc4ad9a4d6fe7288d5072f509f6be3af Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 20:07:12 -0400
Subject: [PATCH 0171/3253] imgcat: fix build

---
 pkgs/applications/graphics/imgcat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix
index ad2cb4198d2d..a98029dd5807 100644
--- a/pkgs/applications/graphics/imgcat/default.nix
+++ b/pkgs/applications/graphics/imgcat/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "imgcat-${version}";
   version = "2.3.0";
 
-  buildTools = [ autoconf automake libtool ncurses ];
+  buildInputs = [ autoconf automake libtool ncurses ];
 
   preConfigure = ''
     ${autoconf}/bin/autoconf

From a3db67282d88072918a93f9e9ee6e490123040f4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 2 Sep 2018 23:51:12 -0400
Subject: [PATCH 0172/3253] photoflow: 2018-03-06 -> 2018-08-28

---
 pkgs/applications/graphics/photoflow/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index ffef558e84dd..2d42ea3f18f9 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobjectIntrospection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }:
 
 stdenv.mkDerivation {
-  name = "photoflow-unstable-2018-03-06";
+  name = "photoflow-unstable-2018-08-28";
 
   src = fetchFromGitHub {
     owner = "aferrero2707";
     repo = "PhotoFlow";
-    rev = "f9bbea183fa02412d1d17075955d2284eeaf8174";
-    sha256 = "1fsk7kdmlkd64wcswbxrl87aqwmzqak6p3s38ggxzx2h51fa7lmf";
+    rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38";
+    sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9";
   };
 
   nativeBuildInputs = [
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
     homepage = https://aferrero2707.github.io/PhotoFlow/;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.MtP ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From 3149f84a924263416fdbef09d84c9f8df76bb516 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 3 Sep 2018 00:18:38 -0400
Subject: [PATCH 0173/3253] sayonara: 1.0.0-git5-20180115 ->
 1.1.1-git1-20180828

---
 pkgs/applications/audio/sayonara/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix
index 1bf1a8b2c49e..fbe90c5377df 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/applications/audio/sayonara/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, qt5, zlib, taglib, pkgconfig, pcre, gst_all_1 }:
 
 let
-  version = "1.0.0-git5-20180115";
+  version = "1.1.1-git1-20180828";
 in
 stdenv.mkDerivation {
   name = "sayonara-player-${version}";
 
   src = fetchurl {
     url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";
-    sha256 = "1fl7zplnrrvbv1xm4g348bpd46jj39jvbm808hyjjq92i64wqg37";
+    sha256 = "0rvy47qvavrp03zjdrw025dmq9fq5aaii3q1qq8b94byarl0c5kn";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     { description = "Sayonara music player";
       homepage = https://sayonara-player.com/;
       license = licenses.gpl3;
-      platforms = qt5.qtbase.meta.platforms;
+      platforms = platforms.linux;
       maintainers = [ maintainers.deepfire ];
     };
 }

From ac52817bd90881acf2d27ffca834c78b27551601 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 3 Sep 2018 19:08:20 +0000
Subject: [PATCH 0174/3253] libguestfs-appliance: do not build on Hydra

---
 pkgs/development/libraries/libguestfs/appliance.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
index d47b0902818d..9c2b317ab086 100644
--- a/pkgs/development/libraries/libguestfs/appliance.nix
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@@ -4,4 +4,8 @@ fetchzip {
   name = "libguestfs-appliance-1.38.0";
   url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
   sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76";
+
+  meta = {
+    hydraPlatforms = []; # Hydra fails with "Output limit exceeded"
+  };
 }

From 507dfccdf811f391b6195081007b0d10cf9e9d7d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 3 Sep 2018 15:31:12 -0400
Subject: [PATCH 0175/3253] photoflow: mark broken for aarch64

---
 pkgs/applications/graphics/photoflow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix
index 2d42ea3f18f9..6f3bf69889c5 100644
--- a/pkgs/applications/graphics/photoflow/default.nix
+++ b/pkgs/applications/graphics/photoflow/default.nix
@@ -51,5 +51,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.MtP ];
     platforms = platforms.linux;
+    broken = stdenv.isAarch64;
   };
 }

From 395d9077b2dfdd6e44cd0fa27101d3f3183d7361 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Mon, 3 Sep 2018 21:37:01 +0200
Subject: [PATCH 0176/3253] ddcutil: 0.9.1 -> 0.9.2 (#45977)

---
 pkgs/tools/misc/ddcutil/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 35c18954bf3f..ec2a2e4b7dd7 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "0chs5bfw4yjnr7brhxxqydybcxdkjv4gnik2s0cvjzcj3bqnz73b";
+    sha256 = "0mpd3j570yyfm9ki5in9i92nzg25ahmdfp2f7yby7xnqiy53zd8w";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     homepage    = http://www.ddcutil.com/;
     description = "Query and change Linux monitor settings using DDC/CI and USB";
     license     = licenses.gpl2;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }

From 059c0ac6eb814fba9677c7a2393bd8d870950230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Sep 2018 16:37:54 -0300
Subject: [PATCH 0177/3253] qt5dxcb-plugin: init at 1.1.11 (#45966)

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/qt5dxcb-plugin/default.nix         | 40 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 0162f85c37f0..3343d836f61a 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -13,6 +13,7 @@ let
     };
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
+    qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
 
   };
 
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
new file mode 100644
index 000000000000..3754de3ea980
--- /dev/null
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "qt5dxcb-plugin";
+  version = "1.1.11";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    qtx11extras
+    libSM
+    mtdev
+    cairo
+  ];
+
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags INSTALL_PATH=$out/$qtPluginPrefix/platforms"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Qt platform theme integration plugin for DDE";
+    homepage = https://github.com/linuxdeepin/qt5dxcb-plugin;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From 882f6c96d2121e2762ddcae7080c5a07f33fab95 Mon Sep 17 00:00:00 2001
From: Urban Skudnik <urban.skudnik@gmail.com>
Date: Mon, 3 Sep 2018 20:57:32 +0200
Subject: [PATCH 0178/3253] backblaze-b2: Fix autocompletion support

backblaze v1.3.6 incorporates[1] a fix[2] for autocompletion that replaced
`have` function with `_have`. The postInstall hook therefore needs
to be updated to replace `_have`.

[1] https://github.com/Backblaze/B2_Command_Line_Tool#136-august-21-2018
[2] https://github.com/Backblaze/B2_Command_Line_Tool/pull/497
---
 pkgs/development/tools/backblaze-b2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 6b133d959ccb..79041b055579 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -33,7 +33,7 @@ buildPythonApplication rec {
   postInstall = ''
     mv "$out/bin/b2" "$out/bin/backblaze-b2"
 
-    sed 's/^have b2 \&\&$/_have backblaze-b2 \&\&/'  -i contrib/bash_completion/b2
+    sed 's/^_have b2 \&\&$/_have backblaze-b2 \&\&/'  -i contrib/bash_completion/b2
     sed 's/^\(complete -F _b2\) b2/\1 backblaze-b2/' -i contrib/bash_completion/b2
 
     mkdir -p "$out/etc/bash_completion.d"

From fe7e89ba3b57b6d3a75fd0b7d08f13ba98f79700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 3 Sep 2018 21:48:13 +0200
Subject: [PATCH 0179/3253] vowpal-wabbit: fix Darwin build.

- Follow the same logic for finding boost-python as for Linux.
- Set DYLD_LIBRARY_PATH so that ctypes find_library can find
  boost-python.
- Do not use '-mt' suffix when linking against boost-serialization
  and boost-program_options on Darwin.
---
 .../python-modules/vowpalwabbit/default.nix   |  9 ++++--
 .../vowpal-wabbit-find-boost.diff             | 28 +++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 6ee6e42e97d9..6530ce28a9e3 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,5 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang, ncurses
-, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, boost, zlib, clang
+, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "vowpalwabbit";
@@ -25,6 +25,11 @@ buildPythonPackage rec {
   buildInputs = [ python.pkgs.boost zlib.dev clang ncurses pytest docutils pygments ];
   propagatedBuildInputs = [ numpy scipy scikitlearn ];
 
+  # Python ctypes.find_library uses DYLD_LIBRARY_PATH.
+  preConfigure = lib.optionalString stdenv.isDarwin ''
+    export DYLD_LIBRARY_PATH="${python.pkgs.boost}/lib"
+  '';
+
   checkPhase = ''
     # check-manifest requires a git clone, not a tarball
     # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
index 0e7b13c01030..645956594bf6 100644
--- a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
+++ b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
@@ -1,8 +1,11 @@
---- vowpalwabbit-8.5.0.orig/setup.py	2018-09-03 14:27:22.833621339 +0200
-+++ vowpalwabbit-8.5.0/setup.py	2018-09-03 14:37:18.076127914 +0200
-@@ -25,12 +25,7 @@
+--- vowpalwabbit-8.5.0.orig/setup.py	2018-09-03 20:32:39.000000000 +0200
++++ vowpalwabbit-8.5.0/setup.py	2018-09-03 20:34:09.000000000 +0200
+@@ -23,18 +23,11 @@
+ 
+ def find_boost():
      """Find correct boost-python library information """
-     if system == 'Linux':
+-    if system == 'Linux':
++    if system == 'Linux' or system == 'Darwin':
          # use version suffix if present
 -        boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
 -        if sys.version_info.major == 3:
@@ -13,4 +16,19 @@
 +        boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
          if not find_library(boost_lib):
              boost_lib = "boost_python"
-     elif system == 'Darwin':
+-    elif system == 'Darwin':
+-        boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
+     elif system == 'Cygwin':
+         boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
+     else:
+--- vowpalwabbit-8.5.0.orig/src/Makefile	2018-09-03 20:32:40.000000000 +0200
++++ vowpalwabbit-8.5.0/src/Makefile	2018-09-03 21:42:30.000000000 +0200
+@@ -37,7 +37,7 @@
+   NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
+ endif
+ ifeq ($(UNAME), Darwin)
+-  LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z
++  LIBS = -lboost_program_options -lboost_serialization -l pthread -l z
+   # On Macs, the location isn't always clear
+   #	brew uses /usr/local
+   #	but /opt/local seems to be preferred by some users

From 9889c0f2417fe38016ccf8cf126e5b2a9f561f91 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 3 Sep 2018 21:52:56 +0200
Subject: [PATCH 0180/3253] Revert "[cpan2nix]
 perlPackages.GetoptLongDescriptive: 0.102 -> 0.103"

It broke perlPackages.MouseXGetOpt

This reverts commit ad47c381bda2d38cddb96e15efd4ea5b4836f542.
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aea2e458d21b..046f4a4eaba5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6465,10 +6465,10 @@ let
   };
 
   GetoptLongDescriptive = buildPerlPackage rec {
-    name = "Getopt-Long-Descriptive-0.103";
+    name = "Getopt-Long-Descriptive-0.102";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "70e1bae7404a9dfb638b5d12e5bd4ea97e3bee743a4555909307d68e0111f4b2";
+      sha256 = "9ad4b98f294aa0515cc3150a1ae878d39e470762b78d8bd9df055eba9dea2846";
     };
     buildInputs = [ CPANMetaCheck TestFatal TestWarnings ];
     propagatedBuildInputs = [ ParamsValidate SubExporter ];

From e33be2ab56c4398e335cd910ce43a7ae377be547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Mon, 3 Sep 2018 21:59:36 +0200
Subject: [PATCH 0181/3253] Keras: fix build by updating expected dependencies.
 (#45992)

Keras expects keras_preprocessing 1.0.2 and 1.0.4. 1.0.3 and 1.0.5
are respectively in nixpkgs.

ZHF #45960
---
 pkgs/development/python-modules/keras/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index ea699c9c04a9..43f3bd935d24 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -25,6 +25,14 @@ buildPythonPackage rec {
     keras-applications keras-preprocessing
   ];
 
+  # Keras 2.2.2 expects older versions of keras_applications
+  # and keras_preprocessing. These substitutions can be removed
+  # for for the next Keras release.
+  postPatch = ''
+    substituteInPlace setup.py --replace "keras_applications==1.0.4" "keras_applications==1.0.5"
+    substituteInPlace setup.py --replace "keras_preprocessing==1.0.2" "keras_preprocessing==1.0.3"
+  '';
+
   # Couldn't get tests working
   doCheck = false;
 

From c36bfa7211e949a0f115f448e1d493403ff3b799 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 3 Sep 2018 20:04:05 +0000
Subject: [PATCH 0182/3253] perlPackages.TestAggregate: broken with perl 5.26+
 (#46003)

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 046f4a4eaba5..8903436d5955 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14925,6 +14925,7 @@ let
     meta = {
       description = "Aggregate C<*.t> tests to make them run faster";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133
     };
   };
 

From 114fe007db04adfdb92baec84a351459c9004172 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Mon, 3 Sep 2018 22:10:02 +0200
Subject: [PATCH 0183/3253] pirate-get: 0.3.1 -> 0.3.2 (#45975)

---
 pkgs/tools/networking/pirate-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix
index 5258d53a18ae..3acf625fd00b 100644
--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/pkgs/tools/networking/pirate-get/default.nix
@@ -4,13 +4,13 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "pirate-get";
-  version = "0.3.1";
+  version = "0.3.2";
 
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9d7cc4b15dd8c6a82f9e03a666372e38613ccafdc846ad4c1226ba936beea68d";
+    sha256 = "1iirip12zrxm2nqsib5wfqqnlfmhh432y3kkyih9crk4q2p914df";
   };
 
   propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ];

From 328cf82838021b96aa8fdca78588cb800cbfdf4b Mon Sep 17 00:00:00 2001
From: baracoder <baracoder@googlemail.com>
Date: Mon, 3 Sep 2018 22:14:07 +0200
Subject: [PATCH 0184/3253] dotnet-sdk: 2.1.302 -> 2.1.401 (#45979)

---
 pkgs/development/compilers/dotnet/sdk/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 50057f91e804..0e28e041cc5d 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,12 +12,13 @@ let
   rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
 in
   stdenv.mkDerivation rec {
-    version = "2.1.302";
+    version = "2.1.401";
     name = "dotnet-sdk-${version}";
 
     src = fetchurl {
       url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
-      sha256 = "1a8z9q69cd9a33j7fr7907abm5z4qiivw5k379cgsjmmvxwyvjia";
+      # use sha512 from the download page
+      sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654";
     };
 
     unpackPhase = "tar xvzf $src";

From 3dd579f7b1192f28aacdc235c058a932657d24cc Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 3 Sep 2018 22:14:39 +0200
Subject: [PATCH 0185/3253] urlwatch: 2.13 -> 2.14 (#45989)

---
 pkgs/tools/networking/urlwatch/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index ecaf498da42d..850a33db58cf 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,21 +2,22 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.13";
+  version = "2.14";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "0rspb5j02mmb0r2dnfryx7jaczvb22lsnysgrr1l9iag0djcgdf5";
+    sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b";
   };
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
     keyring
+    lxml
     minidb
-    pyyaml
     pycodestyle
+    pyyaml
     requests
   ];
 

From ca850897c87b45038981a740690c3ada6b4e7986 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Mon, 3 Sep 2018 22:15:11 +0200
Subject: [PATCH 0186/3253] pdns-recursor: 4.1.3 -> 4.1.4 (#45984)

---
 pkgs/servers/dns/pdns-recursor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 286447352fc0..933609ac268a 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "12x8gm6771wh2xaqad3p5y08p5pimp6k9h830s0487mwg9glacy1";
+    sha256 = "0l5mf45r3x1z5mg95zpbyms88zv307hsrrx4h6jm9zm3pr9l77xi";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 435eccf15e366a3f6d66a0b9e8d2ae2bf92719fe Mon Sep 17 00:00:00 2001
From: aanderse <aaron@fosslib.net>
Date: Mon, 3 Sep 2018 16:33:38 -0400
Subject: [PATCH 0187/3253] kodi: fix nfs support (#46006)

libnfs is required to be in the LD_LIBRARY_PATH for kodi if you want nfs support
see: https://www.reddit.com/r/NixOS/comments/9aiquo/how_to_enable_nfs_support_in_kodi/
---
 pkgs/applications/video/kodi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 5ca678a2e175..454665455c51 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -189,7 +189,7 @@ in stdenv.mkDerivation rec {
         wrapProgram $out/bin/$p \
           --prefix PATH            ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
-              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ]}"
+              ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
       done
 
       substituteInPlace $out/share/xsessions/kodi.desktop \

From 7422953eb0619d34a0ad38e76926dfe05c40ff03 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 21:52:21 +0200
Subject: [PATCH 0188/3253] lsof: add license + update homepage

lib/licenses: add purdue style BSD license
---
 lib/licenses.nix                             | 5 +++++
 pkgs/development/tools/misc/lsof/default.nix | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c442d74c857c..6f0e4217c196 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -546,6 +546,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Public Domain";
   };
 
+  purdueBsd = {
+    fullName = " Purdue BSD-Style License"; # also know as lsof license
+    url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
+  };
+
   qpl = spdx {
     spdxId = "QPL-1.0";
     fullName = "Q Public License 1.0";
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 28c2660ac3d7..0a5a3c487810 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -51,15 +51,16 @@ stdenv.mkDerivation rec {
     cp lsof $out/bin
   '';
 
-  meta = {
-    homepage = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/;
+  meta = with stdenv.lib; {
+    homepage = https://people.freebsd.org/~abe/;
     description = "A tool to list open files";
     longDescription = ''
       List open files. Can show what process has opened some file,
       socket (IPv6/IPv4/UNIX local), or partition (by opening a file
       from it).
     '';
-    maintainers = [ stdenv.lib.maintainers.dezgeg ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.unix;
+    license = licenses.purdueBsd;
   };
 }

From 2fefff2fba8594dbaedff2350e677df06c4c7d69 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:00:56 +0200
Subject: [PATCH 0189/3253] gnugo: fix homepage

---
 pkgs/games/gnugo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix
index 6b053d9d53cd..133a00b67bb2 100644
--- a/pkgs/games/gnugo/default.nix
+++ b/pkgs/games/gnugo/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GNU Go - A computer go player";
-    homepage = http://http://www.gnu.org/software/gnugo/;
+    homepage = http://www.gnu.org/software/gnugo/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
   };

From 6600a405c22819f882f09e0ad2ba8667ce4421d8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:06:28 +0200
Subject: [PATCH 0190/3253] rogue: add license

---
 pkgs/games/rogue/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix
index bb93fafa3b50..c8af2331b080 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/games/rogue/default.nix
@@ -17,10 +17,11 @@ stdenv.mkDerivation {
   # Fix build for recent ncurses versions
   NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://rogue.rogueforge.net/rogue-5-4/;
     description = "The final version of the original Rogue game developed for the UNIX operating system";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = platforms.all;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.eelco ];
   };
 }

From ee8b87a3596c4011e0be33ff9acd3d0c06cc27eb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:08:22 +0200
Subject: [PATCH 0191/3253] urbanterror: update homepage

---
 pkgs/games/urbanterror/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index afff5a5c9eb3..8ceff15b93d0 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       tactical shooter; somewhat realism based, but the motto is "fun over
       realism". This results in a very unique, enjoyable and addictive game.
     '';
-    homepage = http://www.urbanterror.net;
+    homepage = http://www.urbanterror.info;
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ astsmtl fpletz ];
     platforms = platforms.linux;

From 34831e0537f8f0edb3460c3a1650a23339419234 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:11:48 +0200
Subject: [PATCH 0192/3253] talkfilters: update homepage

---
 pkgs/misc/talkfilters/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix
index 4b3158b7a3d5..8154e417e065 100644
--- a/pkgs/misc/talkfilters/default.nix
+++ b/pkgs/misc/talkfilters/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Converts English text into text that mimics a stereotyped or humorous dialect";
-    homepage = "http://http://www.hyperrealm.com/${pname}";
+    homepage = http://www.hyperrealm.com/talkfilters/talkfilters.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ikervagyok ];
     platforms = with stdenv.lib.platforms; unix;

From be7730621577722d6dd9718d69627b6c1f222da3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:14:32 +0200
Subject: [PATCH 0193/3253] i2c-tools: update homepage

---
 pkgs/os-specific/linux/i2c-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index eacac156c975..3f90b91f10d8 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Set of I2C tools for Linux";
-    homepage = http://www.lm-sensors.org/wiki/I2CTools;
+    homepage = https://i2c.wiki.kernel.org/index.php/I2C_Tools;
     license = licenses.gpl2;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;

From 91b570203be39ad54760b5cb43f45e4ba794d5bc Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 3 Sep 2018 22:35:09 +0200
Subject: [PATCH 0194/3253] pmount: update homepage

---
 pkgs/os-specific/linux/pmount/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index f0f706157ed1..cd0e277b2c6b 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory"
 
   meta = {
-    homepage = http://pmount.alioth.debian.org/;
+    homepage = https://bazaar.launchpad.net/~fourmond/pmount/main/files;
     description = "Mount removable devices as normal user";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;

From 8954c1f71919af8fe9eeae966aa1e8861cc4de5c Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Mon, 3 Sep 2018 23:38:15 +0300
Subject: [PATCH 0195/3253] ion: broken on darwin (#46010)

---
 pkgs/shells/ion/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 1333bfd873fa..239eeb89c8ba 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -21,5 +21,6 @@ buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
   };
 }

From 31ccd1fd76a90218c04934df6bf4e0f272c6a506 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Tue, 4 Sep 2018 00:23:23 +0300
Subject: [PATCH 0196/3253] rclone: 1.42 -> 1.43 (#46009)

---
 pkgs/applications/networking/sync/rclone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 337c166a79ac..54d612387ac4 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.42";
+  version = "1.43";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj";
+    sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx";
   };
 
   outputs = [ "bin" "out" "man" ];

From 3549879b459cbfbc7f8550e5c712b66ca9e2591d Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 3 Sep 2018 21:24:38 +0000
Subject: [PATCH 0197/3253] gede: 2.6.1 -> 2.10.9 (#45995)

reverting to qt 5.9 fixed the build.
---
 pkgs/development/tools/misc/gede/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 9e8ce3d93314..9db0062023ce 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gede-${version}";
-  version = "2.6.1";
+  version = "2.10.9";
 
   src = fetchurl {
     url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
-    sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r";
+    sha256 = "0av9v3r6x6anjjm4hzn8wxnvrqc8zp1g7570m5ndg7cgc3sy3bg6";
   };
 
   nativeBuildInputs = [ qmake makeWrapper python ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Graphical frontend (GUI) to GDB";
     homepage = http://gede.acidron.com;
     license = licenses.bsd2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ juliendehos ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4ad53040523..1ba704b375d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8270,7 +8270,7 @@ with pkgs;
 
   funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
 
-  gede = libsForQt5.callPackage ../development/tools/misc/gede { };
+  gede = libsForQt59.callPackage ../development/tools/misc/gede { };
 
   gdbgui = callPackage ../development/tools/misc/gdbgui { };
 

From bfb14fbe72037a5abf947649fd6a53ffdeb39e54 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 25 Aug 2018 19:40:26 +0200
Subject: [PATCH 0198/3253] thonny: init at 3.0.0b3

---
 pkgs/applications/editors/thonny/default.nix | 43 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/editors/thonny/default.nix

diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
new file mode 100644
index 000000000000..a4ea354ebf69
--- /dev/null
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromBitbucket, python3 }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "thonny";
+  version = "3.0.0b3";
+
+  src = fetchFromBitbucket {
+    owner = "plas";
+    repo = pname;
+    rev = "a511d4539c532b6dddf6d7f1586d30e1ac35bd86";
+    sha256 = "1s3pp97r6p3j81idglnml4faxryk7saszxmv3gys1agdfj75qczr";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [ jedi pyserial tkinter docutils pylint ];
+
+  preInstall = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/thonny" \
+       --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi})
+  '';
+
+  # Tests need a DISPLAY
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python IDE for beginners";
+    longDescription = ''
+      Thonny is a Python IDE for beginners. It supports different ways
+      of stepping through the code, step-by-step expression
+      evaluation, detailed visualization of the call stack and a mode
+      for explaining the concepts of references and heap.
+    '';
+    homepage = https://www.thonny.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cce255e3728a..08e8ffabb7ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18736,6 +18736,8 @@ with pkgs;
 
   nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { };
 
+  thonny = callPackage ../applications/editors/thonny { };
+
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome2) libIDL;
     libpng = libpng_apng;

From 9d6ff38f706c29cd376a52323c8f8018ac93aca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Mon, 3 Sep 2018 23:42:57 +0200
Subject: [PATCH 0199/3253] magit-todos: fix build by providing git as input.
 (#45999)

magit-todos requires git during builds. Fixes #45868.
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix    | 6 ++++++
 .../editors/emacs-modes/melpa-stable-packages.nix           | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index bec845b815ce..addae2674684 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -146,6 +146,12 @@ self:
           (attrs.nativeBuildInputs or []) ++ [ external.git ];
       });
 
+      magit-todos = super.magit-todos.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       # missing OCaml
       merlin = markBroken super.merlin;
 
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 61086b96230e..98927cbd9873 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -151,6 +151,12 @@ self:
             (attrs.nativeBuildInputs or []) ++ [ external.git ];
         });
 
+      magit-todos = super.magit-todos.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       # missing OCaml
       merlin = markBroken super.merlin;
 

From 9692b7997c0b7349f75aecc897a0da43bc4eeda3 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Mon, 3 Sep 2018 23:52:27 +0200
Subject: [PATCH 0200/3253] pythonPackages.authres: fix broken homepage

---
 pkgs/development/python-modules/authres/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix
index b5aad787dfbf..a0ec276f22d7 100644
--- a/pkgs/development/python-modules/authres/default.nix
+++ b/pkgs/development/python-modules/authres/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
       Authentication-Results Headers generation and parsing for
       Python/Python3.
     '';
-    homepage = https://launchpad.net/authres;
+    homepage = https://launchpad.net/authentication-results-python;
     license = licenses.bsd3;
     maintainers = with maintainers; [ leenaars ];
   };

From 408eacbc896ecc6d0e25238963ecbd412d78ce3c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 3 Sep 2018 23:56:40 +0200
Subject: [PATCH 0201/3253] openblas: fix pkg-config alias name

Turns out the filename is important. It should be `cblas`, not
`openblas-cblas`.
---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3f271d015027..2efabcdd05e0 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec {
     # Write pkgconfig aliases. Upstream report:
     # https://github.com/xianyi/OpenBLAS/issues/1740
     for alias in blas cblas lapack; do
-      cat <<EOF > $out/lib/pkgconfig/openblas-$alias.pc
+      cat <<EOF > $out/lib/pkgconfig/$alias.pc
 Name: $alias
 Version: ${version}
 Description: $alias provided by the OpenBLAS package.

From 7c915abd52ad8b87f59d7752911704ce3cc38605 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 00:20:48 +0200
Subject: [PATCH 0202/3253] gnss-sdr: set boost version to 1.66 (#46014)

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ba704b375d9..9a9cdbcab12d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16322,7 +16322,7 @@ with pkgs;
 
   gksu = callPackage ../applications/misc/gksu { };
 
-  gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
+  gnss-sdr = callPackage ../applications/misc/gnss-sdr { boost=boost166; };
 
   gnuradio = callPackage ../applications/misc/gnuradio {
     inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;

From e8fe244a7111c11ccaf69d075baba36a5b419bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Sep 2018 19:22:57 -0300
Subject: [PATCH 0203/3253] qt5integration: init at 0.3.5 (#46012)

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/qt5integration/default.nix         | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/desktops/deepin/qt5integration/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 3343d836f61a..b315df1f39ed 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -14,6 +14,7 @@ let
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
     qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
+    qt5integration = callPackage ./qt5integration { };
 
   };
 
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
new file mode 100644
index 000000000000..28e06bae42d2
--- /dev/null
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt
+, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype
+, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "qt5integration";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    qt5dxcb-plugin
+    mtdev
+    lxqt.libqtxdg
+    qtstyleplugins
+    qtx11extras
+    qtmultimedia
+    qtsvg
+  ];
+
+  postPatch = ''
+    sed -i dstyleplugin/dstyleplugin.pro \
+           platformthemeplugin/qt5deepintheme-plugin.pro \
+           iconengineplugins/svgiconengine/svgiconengine.pro \
+           imageformatplugins/svg/svg.pro \
+      -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Qt platform theme integration plugins for DDE";
+    homepage = https://github.com/linuxdeepin/qt5integration;
+    license = with licenses; [ gpl3 lgpl2Plus bsd2 ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From efef4acc7e9328dd6eb2c38a4c39ea99cb2322aa Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 3 Sep 2018 15:34:30 +0200
Subject: [PATCH 0204/3253] masscan: 1.0.4 -> 1.0.5

---
 pkgs/tools/security/masscan/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 26497659d23d..e33681c45e0e 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "masscan-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner  = "robertdavidgraham";
     repo   = "masscan";
-    rev    = "39061a5e9ef158dde1e6618f6fbf379739934a73";
-    sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf";
+    rev    = "${version}";
+    sha256 = "0q0c7bsf0pbl8napry1qyg0gl4pd8wn872h4mz9b56dx4rx90vqg";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/etc/masscan
 
     cp data/exclude.conf $out/etc/masscan
-    cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.hml
+    cp -t $out/share/doc/masscan doc/algorithm.js doc/howto-afl.md doc/bot.html
     cp doc/masscan.8 $out/share/man/man8/masscan.8
     cp LICENSE $out/share/licenses/masscan/LICENSE
 

From 6c8cea6315d98881d6183ae0df0e41380eb36cc4 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 3 Sep 2018 22:28:15 +0000
Subject: [PATCH 0205/3253] hdaps-gl: init at 0.0.5 (#45986)

---
 pkgs/tools/misc/hdaps-gl/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/hdaps-gl/default.nix

diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix
new file mode 100644
index 000000000000..8b19cd038951
--- /dev/null
+++ b/pkgs/tools/misc/hdaps-gl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip, freeglut, libGL, libGLU }:
+
+let version = "0.0.5"; in
+stdenv.mkDerivation {
+      name = "hdaps-gl-${version}";
+      src = fetchzip {
+            url = "mirror://sourceforge/project/hdaps/hdaps-gl/hdaps-gl-${version}/hdaps-gl-${version}.tar.gz";
+            sha256 = "16fk4k0lvr4c95vd6c7qdylcqa1h5yjp3xm4xwipdjbp0bvsgxq4";
+      };
+
+      buildInputs = [ freeglut libGL libGLU ];
+
+      # the Makefile has no install target
+      installPhase = ''
+            install -Dt $out/bin ./hdaps-gl
+      '';
+
+      meta = with stdenv.lib; {
+            description = "GL-based laptop model that rotates in real-time via hdaps";
+            homepage = https://sourceforge.net/projects/hdaps/;
+            license = licenses.gpl2;
+            platforms = platforms.linux;
+            maintainers = [ maintainers.symphorien ];
+      };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a9cdbcab12d..75f595c7605a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3082,6 +3082,8 @@ with pkgs;
 
   hdapsd = callPackage ../os-specific/linux/hdapsd { };
 
+  hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
+
   hddtemp = callPackage ../tools/misc/hddtemp { };
 
   hdf4 = callPackage ../tools/misc/hdf4 {

From d5b0c4d5c2fb59316ee85125e9df49cb30b85b74 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 4 Sep 2018 00:35:17 +0200
Subject: [PATCH 0206/3253] imv: build only on x86_64 linux

---
 pkgs/applications/graphics/imv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index f02184d98527..9def3f16ad03 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/eXeC64/imv; 
     license     = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
-    platforms   = platforms.unix;
+    platforms   = [ "x86_64-linux" ];
   };
 }
 

From a2f490c5764c1372d72bd512707d1c703dacdcbc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 3 Sep 2018 16:02:02 -0700
Subject: [PATCH 0207/3253] mkvtoolnix: 25.0.0 -> 26.0.0 (#45812)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mkvtoolnix
---
 pkgs/applications/video/mkvtoolnix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index ef01ac4cdae3..3f0fb0e8022c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "25.0.0";
+  version = "26.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "04m57719q7q0h0gcj1b2bh8xbdcl5bijic4hw71xf9xd19a95k78";
+    sha256 = "0dq0lbr6kzj455mv4z6a851n7ff3xlmsxklijiyp4drn1jf0q1pb";
   };
 
   nativeBuildInputs = [

From e4f4debcb961ba413b38e77cbdfffb3465074f6a Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 3 Sep 2018 18:08:39 -0500
Subject: [PATCH 0208/3253] swift: 4.1 -> 4.1.3 (#45777)

---
 pkgs/development/compilers/swift/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 9c1a36585907..3bc96288f837 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -36,9 +36,9 @@
 }:
 
 let
-  v_major = "4.1";
-  version = "${v_major}-RELEASE";
-  version_friendly = "${v_major}";
+  v_base = "4.1.3";
+  version = "${v_base}-RELEASE";
+  version_friendly = "${v_base}";
 
   tag = "refs/tags/swift-${version}";
   fetch = { repo, sha256, fetchSubmodules ? false }:
@@ -58,7 +58,7 @@ let
     };
     llvm = fetch {
       repo = "swift-llvm";
-      sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh";
+      sha256 = "0q5cv4iydm8c1kcax32573y3q2cbpihwgj5aa8ws1fnpy4jvq934";
     };
     compilerrt = fetch {
       repo = "swift-compiler-rt";
@@ -70,7 +70,7 @@ let
     };
     lldb = fetch {
       repo = "swift-lldb";
-      sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m";
+      sha256 = "1d0pa7xm289bjb6r52hkkmlngkqkwbwgixnmm30bin2q18mkxk7s";
     };
     llbuild = fetch {
       repo = "swift-llbuild";
@@ -86,7 +86,7 @@ let
     };
     foundation = fetch {
       repo = "swift-corelibs-foundation";
-      sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw";
+      sha256 = "1bhrag63rmz41bg2g6ap01qrdpq37hislgf5hg6myy2v69q7mahx";
     };
     libdispatch = fetch {
       repo = "swift-corelibs-libdispatch";
@@ -95,7 +95,7 @@ let
     };
     swift = fetch {
       repo = "swift";
-      sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky";
+      sha256 = "1ydx11pkvaasgjbr29lnha0lpnak758gd5l0aqzmp3q6mcyvfm7a";
     };
   };
 

From e7a82cac35ecd7b1fb656bee587716ae07e85288 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 4 Sep 2018 01:13:55 +0200
Subject: [PATCH 0209/3253] swift: broken on aarch64

never built according to available hydra logs
---
 pkgs/development/compilers/swift/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 3bc96288f837..233eb6647c09 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -287,6 +287,7 @@ stdenv.mkDerivation rec {
     # Swift doesn't support 32bit Linux, unknown on other platforms.
     platforms = platforms.linux;
     badPlatforms = platforms.i686;
+    broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
   };
 }
 

From 767803b3d26d69420dd0674a5f988c2cdabe1797 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Sep 2018 23:15:14 +0200
Subject: [PATCH 0210/3253] =?UTF-8?q?gnome3.tracker:=202.1.2=20=E2=86=92?=
 =?UTF-8?q?=202.1.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/tracker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index a0da1b7147d2..06c41937d12e 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "tracker";
-  version = "2.1.2";
+  version = "2.1.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1sf923f3ya3gj5s90da8qkqqvjj3fdll7xrjgscpb6yhgv0kzqsi";
+    sha256 = "00gimpn2ydv3yka25cmw3i0n402d2nhx7992byvq4yvhr77rni22";
   };
 
   nativeBuildInputs = [

From a502b155f0ab15a4287e3176e5e3ce47ada38091 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 20:17:32 +0200
Subject: [PATCH 0211/3253] gnome3.libgweather: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/libgweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index beab02465272..23405af50d3b 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk, gettext, libsoup
-, gtk-doc, docbook_xsl, gobjectIntrospection, tzdata, geocode-glib, vala, gnome3 }:
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobjectIntrospection, python3, tzdata, geocode-glib, vala, gnome3 }:
 
 let
   pname = "libgweather";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobjectIntrospection python3 ];
   buildInputs = [ glib gtk libsoup libxml2 geocode-glib ];
 
   postPatch = ''

From 9c4323b5de604d3436f99467d4ed81c7943fdfb1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 20:35:09 +0200
Subject: [PATCH 0212/3253] gnome3.gnome-power-manager: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index 70ed4403f100..a7861dcf74d9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -7,6 +7,7 @@
 , meson
 , ninja
 , upower
+, python3
 , desktop-file-utils
 , wrapGAppsHook
 , gnome3 }:
@@ -37,6 +38,7 @@ in stdenv.mkDerivation rec {
     gettext
 
     # needed by meson_post_install.sh
+    python3
     glib.dev
     desktop-file-utils
   ];

From 9879ed55ae4098c59f6baf1574c93d17d8e094a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 20:36:10 +0200
Subject: [PATCH 0213/3253] feedreader: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 .../networking/feedreaders/feedreader/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
index d2991c3ba1c9..158b02cff5b9 100644
--- a/pkgs/applications/networking/feedreaders/feedreader/default.nix
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext, python3
 , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite
 }:
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [
     meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
-    glibcLocales wrapGAppsHook
+    python3 glibcLocales wrapGAppsHook
   ];
 
   buildInputs = [

From 804a26e6b7986f7439588ff4e0d75b60f1daf3a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 21:13:45 +0200
Subject: [PATCH 0214/3253] gnome3.dconf-editor: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 57c102d89cc5..13d73fa34d2f 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3
+{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, dbus-glib, gtk3, gnome3, python3
 , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobjectIntrospection }:
 
 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
   };
 
-  nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja vala libxslt pkgconfig wrapGAppsHook gettext docbook_xsl libxml2 gobjectIntrospection python3 ];
 
   buildInputs = [ glib dbus-glib gtk3 gnome3.defaultIconTheme gnome3.dconf ];
 

From bf38aea59b1b3d81a66f42f8e21669d2cec69101 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 21:14:58 +0200
Subject: [PATCH 0215/3253] gnome3.gnome-calculator: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 794f37fcbbdc..2f4743ee2633 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
-, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection
+, gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection, python3
 , gnome3, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala gettext itstool wrapGAppsHook
+    meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3
     gobjectIntrospection # for finding vapi files
   ];
 

From 69fa70ad468b6877aa68c8c320fc7737024b74a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 21:16:59 +0200
Subject: [PATCH 0216/3253] gnomeExtensions.mediaplayer: add python3 for
 install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
index f64a0ef3f27e..6038443944f2 100644
--- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja }:
+{ stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-mediaplayer-${version}";
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson
     ninja
+    python3
   ];
   buildInputs = [
     glib

From 5043df2499e99d2aa79fb7337b4b7bedbcf34547 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 21:28:16 +0200
Subject: [PATCH 0217/3253] gnome3.devhelp: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index 63fa2ebddcff..aa0f545c2dbd 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, glib, amtk, appstream-glib, gobjectIntrospection
+, glib, amtk, appstream-glib, gobjectIntrospection, python3
 , webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection python3 ];
   buildInputs = [
     glib gtk3 webkitgtk amtk
     gnome3.defaultIconTheme gsettings-desktop-schemas

From 0c4e69dd783d6e9977181e55f8d322a48f6c9c9b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:01:24 +0200
Subject: [PATCH 0218/3253] gnome3.gnome-calendar: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 347cd7a16ae0..05275fa01ac5 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib
+{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
 , gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
 , glib, gnome-online-accounts, gsettings-desktop-schemas }:
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
   buildInputs = [
     gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
     gsettings-desktop-schemas gnome3.defaultIconTheme

From d99291efab6e8b5477ec723c3595798d07877b5a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:03:47 +0200
Subject: [PATCH 0219/3253] gnome3.gnome-documents: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 9948f9d909b2..196331ec52ec 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -4,7 +4,7 @@
 , gnome-desktop, libzapojit, libgepub
 , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
 , gobjectIntrospection, inkscape, poppler_utils
-, desktop-file-utils, wrapGAppsHook }:
+, desktop-file-utils, wrapGAppsHook, python3 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-documents-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [ "-Dgetting-started=true" ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
+    meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
     inkscape poppler_utils # building getting started
   ];
   buildInputs = [

From af472866215bde79a6d109a66b753762aa819725 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:07:30 +0200
Subject: [PATCH 0220/3253] gnome3.gnome-characters: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 92ce0eb8debb..8b497fbf433d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
 , gobjectIntrospection, gjs, libunistring }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobjectIntrospection ];
   buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
 
   mesonFlags = [

From dd8d38fcf025e376d0320f86cb36ba48ae51a06c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:09:03 +0200
Subject: [PATCH 0221/3253] gnome3.bijiben: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/bijiben/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 06510c8f34ac..38c729a1c429 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -1,5 +1,5 @@
 { stdenv, meson, ninja, gettext, fetchurl, pkgconfig
-, wrapGAppsHook, itstool, desktop-file-utils
+, wrapGAppsHook, itstool, desktop-file-utils, python3
 , glib, gtk3, evolution-data-server
 , libuuid, webkitgtk, zeitgeist
 , gnome3, libxml2 }:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook
+    meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils python3 wrapGAppsHook
   ];
 
   buildInputs = [

From 091ed8f2f8b5b756b09608276f14c91b0b142bc3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:09:41 +0200
Subject: [PATCH 0222/3253] gnome3.eog: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index e5483333d403..8459ba2c126b 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
 , gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
-, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }:
+, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection, python3 }:
 
 let
   pname = "eog";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection python3 ];
 
   buildInputs = [
     libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi

From 3e3972a054a1fead7b61639d0bed886dfb2af5e4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:15:58 +0200
Subject: [PATCH 0223/3253] gnome3.gnome-todo: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 8e506b52270a..3a9f33f46f00 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
 , gettext, gnome3, glib, gtk, libpeas
 , gnome-online-accounts, gsettings-desktop-schemas
 , evolution-data-server, libxml2, libsoup, libical, rest, json-glib }:
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext wrapGAppsHook
+    meson ninja pkgconfig gettext python3 wrapGAppsHook
   ];
   buildInputs = [
     glib gtk libpeas gnome-online-accounts

From 3d899d0ddd99ec10ce6a84acff2070e9f502e978 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:16:26 +0200
Subject: [PATCH 0224/3253] gnome3.gnome-disk-utility: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 2eb66b02627b..a572e617766e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, meson, ninja, gtk, glib, wrapGAppsHook, libnotify
+, meson, ninja, gtk, glib, wrapGAppsHook, python3, libnotify
 , itstool, gnome3, libxml2
 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext itstool libxslt docbook_xsl
-    wrapGAppsHook libxml2
+    wrapGAppsHook python3 libxml2
   ];
   buildInputs = [
     gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3

From 1914e5124904c415d22833359179142ef35d7770 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:20:43 +0200
Subject: [PATCH 0225/3253] gnome3.gnome-contacts: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index 5799e613d5bc..a9541d64b03c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, gettext, fetchurl, evolution-data-server
-, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, gtk3, glib, cheese
+, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
 , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
 , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
 , vala, meson, ninja }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ evolution-data-server ];
 
   nativeBuildInputs = [
-    meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 wrapGAppsHook
+    meson ninja pkgconfig vala gettext libxslt docbook_xsl docbook_xml_dtd_42 python3 wrapGAppsHook
   ];
 
   buildInputs = [

From 88759d117d59deecce08657db5acc450e4d39bab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:22:54 +0200
Subject: [PATCH 0226/3253] gnome3.gnome-chess: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index aebd72d65df2..01e23384b8ea 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, vala, pkgconfig, wrapGAppsHook, gobjectIntrospection
-, gettext, itstool, libxml2, gnome3, glib, gtk3, librsvg }:
+, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1";
   };
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 wrapGAppsHook gobjectIntrospection ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobjectIntrospection ];
   buildInputs = [ glib gtk3 librsvg gnome3.defaultIconTheme ];
 
   postPatch = ''

From b8a7e2a116d227e7971bf714f1dd1a8a94a4765a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:23:44 +0200
Subject: [PATCH 0227/3253] gnome3.gnome-control-center: add python3 for
 install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 6d5777614118..6a57e4cdff48 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -5,7 +5,7 @@
 , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
 , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
 , docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
-, fontconfig, sound-theme-freedesktop, grilo }:
+, fontconfig, sound-theme-freedesktop, grilo, python3 }:
 
 let
   pname = "gnome-control-center";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext wrapGAppsHook libtool libxslt docbook_xsl
-    shared-mime-info
+    shared-mime-info python3
   ];
 
   buildInputs = with gnome3; [

From 9ab012d0f17b7b67459c722d1d3c3eea5e10bdff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:24:37 +0200
Subject: [PATCH 0228/3253] gnome3.swell-foop: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/games/swell-foop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index 13b6f57d0fd2..b7dc6203b8a9 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, vala, glib, gtk3, gnome3, desktop-file-utils
-, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook }:
+, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }:
 
 let
   pname = "swell-foop";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook itstool gettext libxml2 desktop-file-utils ];
+  nativeBuildInputs = [ meson ninja vala pkgconfig wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
   buildInputs = [ glib gtk3 gnome3.defaultIconTheme clutter clutter-gtk ];
 
   postPatch = ''

From 18f3e118805310550a34d17a4df89791679f4f4b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:26:09 +0200
Subject: [PATCH 0229/3253] gnome3.atomix: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/games/atomix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index 8ea4b82ca039..f7a18f4c5c31 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3
 , gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }:
 
 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1k8bvwywpvw5f13pw40brk6c3rz2mdz9cd4zhcawg7qdm77dvcvb";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
   buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.defaultIconTheme ];
 
   postPatch = ''

From 19225529c91f9a7d74628e59483250c63256ceff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 22:38:13 +0200
Subject: [PATCH 0230/3253] gnome-mpv: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/video/gnome-mpv/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix
index 1bb77ffc4a80..75a299d46c7d 100644
--- a/pkgs/applications/video/gnome-mpv/default.nix
+++ b/pkgs/applications/video/gnome-mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja
+{ stdenv, fetchFromGitHub, meson, ninja, python3
 , gettext, pkgconfig, desktop-file-utils, wrapGAppsHook
 , appstream-glib, epoxy, glib, gtk3, mpv
 }:
@@ -15,13 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4";
   };
 
-  nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja python3 appstream-glib gettext pkgconfig desktop-file-utils wrapGAppsHook ];
   buildInputs = [ epoxy glib gtk3 mpv ];
 
   enableParallelBuilding = true;
 
   postPatch = ''
-    patchShebangs .
+    patchShebangs meson_post_install.py
+    patchShebangs src/generate_authors.py
     sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py
   '';
 

From 3a8b13ef8fd7846d12ae8e090d106ae95ff6a279 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:13:02 +0200
Subject: [PATCH 0231/3253] lollypop: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/audio/lollypop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index ffaa94575275..2256fa1893db 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec  {
     gobjectIntrospection
     meson
     ninja
+    python36Packages.python
     pkgconfig
     wrapGAppsHook
     wrapPython

From 6c701f6578cd6e1e06ec0d4490daa26c4356acbe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:17:52 +0200
Subject: [PATCH 0232/3253] pulseeffects: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/audio/pulseeffects/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 0949611224df..46d4f971420a 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -4,6 +4,7 @@
 , ninja
 , pkgconfig
 , itstool
+, python3
 , libxml2
 , desktop-file-utils
 , wrapGAppsHook
@@ -58,6 +59,7 @@ in stdenv.mkDerivation rec {
     pkgconfig
     libxml2
     itstool
+    python3
     desktop-file-utils
     wrapGAppsHook
   ];

From 123556ed5f3a11d8a477cec81303d7f39416674b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:18:20 +0200
Subject: [PATCH 0233/3253] corebird: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/networking/corebird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 56947d6650e4..5dd4cbb52c2a 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40
 , meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobjectIntrospection
-, glib-networking }:
+, glib-networking, python3 }:
 
 stdenv.mkDerivation rec {
   version = "1.7.4";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja vala_0_40 pkgconfig wrapGAppsHook
+    meson ninja vala_0_40 pkgconfig wrapGAppsHook python3
     gobjectIntrospection # for setup hook
   ];
 

From 9efc9b5d9154e05767485dc4707e360bf0633eee Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:24:09 +0200
Subject: [PATCH 0234/3253] networkmanagerapplet: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/tools/networking/network-manager/applet.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix
index d516a2b5ee87..4725b0a7d72f 100644
--- a/pkgs/tools/networking/network-manager/applet.nix
+++ b/pkgs/tools/networking/network-manager/applet.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
-, libgudev, jansson, wrapGAppsHook, gobjectIntrospection
+, libgudev, jansson, wrapGAppsHook, gobjectIntrospection, python3
 , libappindicator-gtk3, withGnome ? false }:
 
 let
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
     libappindicator-gtk3
   ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
 
-  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
+  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
 
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file

From b1da4f7856f6c5d812b8b349c14c02d92e6d988b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:47:04 +0200
Subject: [PATCH 0235/3253] moka-icon-theme: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/data/icons/moka-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 2b4bb5d67c3b..17892679a7ea 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, gtk3, faba-icon-theme }:
+{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
   };
 
-  nativeBuildInputs = [ meson ninja gtk3 faba-icon-theme ];
+  nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ];
 
   postPatch = ''
     patchShebangs meson/post_install.py

From 1189b3275f4e120106acd239a37d2cd647d6769f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:47:28 +0200
Subject: [PATCH 0236/3253] paper-icon-theme: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/data/icons/paper-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 34c949519baa..b16c9b076824 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v";
   };
 
-  nativeBuildInputs = [ meson ninja gtk3 ];
+  nativeBuildInputs = [ meson ninja gtk3 python3 ];
 
   postPatch = ''
     patchShebangs meson/post_install.py

From bf98e44d2315be2c7758c12c5ecd380d52c43e63 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:50:27 +0200
Subject: [PATCH 0237/3253] faba-icon-theme: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/data/icons/faba-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix
index e9d9efcfcb02..07d2b5ecf02c 100644
--- a/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/pkgs/data/icons/faba-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, gtk3, elementary-icon-theme }:
+{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
-  nativeBuildInputs = [ meson ninja gtk3 elementary-icon-theme ];
+  nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ];
 
   postPatch = ''
     patchShebangs meson/post_install.py

From 577d1370f10a8c28fcc3c92e0917c6062eea673e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:54:26 +0200
Subject: [PATCH 0238/3253] transporter: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/networking/transporter/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index d084461a9b2d..55abd22b605c 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -5,6 +5,7 @@
 , pkgconfig
 , granite
 , vala_0_40
+, python3
 , gnome3
 , libxml2
 , gettext
@@ -37,6 +38,7 @@ in stdenv.mkDerivation rec {
     ninja
     pkgconfig
     vala_0_40
+    python3
     wrapGAppsHook
   ];
 

From 58a372625294c00c0a87a541d19daf5b4372509b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:55:43 +0200
Subject: [PATCH 0239/3253] gnome-builder: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/editors/gnome-builder/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index db2d07db31e7..6fcf9d7d3a9d 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -52,6 +52,7 @@ in stdenv.mkDerivation {
     meson
     ninja
     pkgconfig
+    python3
     python3.pkgs.wrapPython
     wrapGAppsHook
   ];

From ef01ca3adeddfbe60fcae0e4640913d5a4e951f1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:56:34 +0200
Subject: [PATCH 0240/3253] tootle: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/misc/tootle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index b2aab54c1047..d15b8111fb0b 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig
+, meson, ninja, pkgconfig, python3
 , gnome3, vala, gobjectIntrospection, wrapGAppsHook
 , gtk3, granite
 , json-glib, glib, glib-networking
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     sha256 = "022h1rh1jk3m1f9al0s1rylmnqnkydyc81idfc8jf1g0frnvn5i6";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig python3 vala gobjectIntrospection wrapGAppsHook ];
   buildInputs = [
     gtk3 granite json-glib glib glib-networking
     gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas

From 726e7499610e452d9e2d8b24e3c0453cedcd792e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:57:10 +0200
Subject: [PATCH 0241/3253] sequeler: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/misc/sequeler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 35242822d4a0..cc676bb28e2e 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, desktop-file-utils
+, meson, ninja, pkgconfig, vala, gobjectIntrospection, gettext, wrapGAppsHook, python3, desktop-file-utils
 , gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
 
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ];
+  nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];
 
   buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
 

From 50b6311f69293f464cd5426da2b390e62dce1498 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 3 Sep 2018 23:59:42 +0200
Subject: [PATCH 0242/3253] pitivi: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/video/pitivi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index cea85f553b5f..adb5d237f54f 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
 , python3Packages, gst, gtk3
 , gobjectIntrospection, librsvg, gnome3, libnotify
 , meson, ninja
@@ -43,7 +43,7 @@ in python3Packages.buildPythonApplication rec {
     patchShebangs ./getenvvar.py
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig intltool itstool python3 wrapGAppsHook ];
 
   buildInputs = [
     gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound

From 2431f9101cc764fc44f4ee5e53a96f1e807e8022 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:00:39 +0200
Subject: [PATCH 0243/3253] gnome3.gnome-mines: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 33672054a373..297e1a9ed7bf 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }:
+, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   # gobjectIntrospection for finding vapi files
-  nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool python3 libxml2 wrapGAppsHook ];
   buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
 
   postPatch = ''

From b39e9834cb2c551cec6a0291ddd16ed1d213f28c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:01:35 +0200
Subject: [PATCH 0244/3253] gnome3.gnome-screenshot: add python3 for install
 script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index f5b33c88f574..c92280ed5663 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
-, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils
+, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
 , gnome3 }:
 
 let
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     patchShebangs build-aux/postinstall.py
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
   buildInputs = [
     gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas

From cc4c51df934f5c074081d8c0a953394e61b17fbd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:02:40 +0200
Subject: [PATCH 0245/3253] gnome3.epiphany: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 9613606f777a..01232b0f9977 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu
 , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
 , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
-, sqlite, gcr, isocodes, desktop-file-utils
+, sqlite, gcr, isocodes, desktop-file-utils, python3
 , gdk_pixbuf, gst_all_1, json-glib }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [ "-Dunit_tests=false" ];
 
   nativeBuildInputs = [
-    meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils
+    meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils python3
   ];
 
   buildInputs = [

From 1d1af9cc4d5335a91fbdfe199a7175a7c0ba6b9c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:04:46 +0200
Subject: [PATCH 0246/3253] gnome3.nautilus: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 5beabd08fa3a..33beb8a87d37 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop-file-utils, python3, wrapGAppsHook
 , gtk, gnome3, gnome-autoar, dbus-glib, shared-mime-info, libnotify, libexif
 , exempi, librsvg, tracker, tracker-miners, gnome-desktop, gexiv2, libselinux, gdk_pixbuf }:
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop-file-utils ];
+  nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext python3 wrapGAppsHook desktop-file-utils ];
 
   buildInputs = [
     dbus-glib shared-mime-info libexif gtk exempi libnotify libselinux

From 4b50a184f3fd1669059c0e77299c1dfa08ff2087 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:06:28 +0200
Subject: [PATCH 0247/3253] gnome3.simple-scan: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index e4458b7d0a3f..8596a059ca5d 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
 , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp
 , libxml2, sane-backends, vala, gnome3, gobjectIntrospection }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb
                 gtk libwebp packagekit sane-backends vala ];
   nativeBuildInputs = [
-    meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2
+    meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2
     # For setup hook
     gobjectIntrospection
   ];

From b3e4a1a64c8d64e0a448e01860d9c0ec54d20e15 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:08:26 +0200
Subject: [PATCH 0248/3253] gnome3.gnome-tweaks: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 41206b71d42a..0ff21a6b0dd8 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook
+    meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
   ];
   buildInputs = [
     gtk3 glib gnome3.gsettings-desktop-schemas

From 5f33edda40c897442c4769b4ea35ed3ebd4c82b3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:11:58 +0200
Subject: [PATCH 0249/3253] gnome3.gnome-boxes: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index aee315124f8e..b6679ccc2695 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk
+, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk, python3
 , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
 , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
 , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   doCheck = true;
 
   nativeBuildInputs = [
-    meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
+    meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils python3
   ];
 
   # Required for USB redirection PolicyKit rules file

From 2e1acfce13834947edcb97e277e9591ef18bf715 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:12:46 +0200
Subject: [PATCH 0250/3253] casync: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/applications/networking/sync/casync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index bea6a0780ed9..8d9b941e26e4 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, meson, ninja, pkgconfig, sphinx
+, meson, ninja, pkgconfig, python3, sphinx
 , acl, curl, fuse, libselinux, udev, xz, zstd
 , fuseSupport ? true
 , selinuxSupport ? true
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
                 ++ stdenv.lib.optionals (fuseSupport) [ fuse ]
                 ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ]
                 ++ stdenv.lib.optionals (udevSupport) [ udev ];
-  nativeBuildInputs = [ meson ninja pkgconfig sphinx ];
+  nativeBuildInputs = [ meson ninja pkgconfig python3 sphinx ];
   checkInputs = [ glibcLocales rsync ];
 
   postPatch = ''

From d7c0d9a7f83b7f80e08888c040ea8a2ab7ca5f71 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 4 Sep 2018 00:13:41 +0200
Subject: [PATCH 0251/3253] gnome3.file-roller: add python3 for install script

Meson no longer propagates it so we need to re-add it.
---
 pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 42f0ddc6e4bb..bd97393b7b69 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
-, file, json-glib, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
+, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   LANG = "en_US.UTF-8"; # postinstall.py
 
-  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook glibcLocales desktop-file-utils ];
+  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
 
   buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
 

From ff8d974ec0350956601d0d0b1e15b65f900ab803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Sep 2018 22:45:51 -0300
Subject: [PATCH 0252/3253] deepin-menu: init at 3.3.10

---
 pkgs/desktops/deepin/deepin-menu/default.nix | 40 ++++++++++++++++++++
 pkgs/desktops/deepin/default.nix             |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-menu/default.nix

diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
new file mode 100644
index 000000000000..df0dcc379070
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+  qt5integration }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-menu";
+  version = "3.3.10";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1666821c2irs2hjgr3kvivij6c2fgjva8323kplrz75w2lz518xb";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    qt5integration
+  ];
+
+  postPatch = ''
+    sed -i deepin-menu.pro -e "s,/usr,$out,"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Deepin menu service";
+    homepage = https://github.com/linuxdeepin/deepin-menu;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index b315df1f39ed..15e108a651aa 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
+    deepin-menu = callPackage ./deepin-menu { };
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;

From 3451488235170f5c5fa35abd94d7aebdc5714fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 3 Sep 2018 23:06:56 -0300
Subject: [PATCH 0253/3253] deepin-terminal: add dependency on deepin-menu

---
 pkgs/desktops/deepin/deepin-terminal/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 7ace219dbf5d..2ce7885807ac 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json-glib, gobjectIntrospection }:
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
+  ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
+  json-glib, gobjectIntrospection, deepin-menu }:
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     gobjectIntrospection
   ];
 
-  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
+  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ];
 
   meta = with stdenv.lib; {
     description = "The default terminal emulation for Deepin";
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
      '';
     homepage = https://github.com/linuxdeepin/deepin-terminal;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 69d418aeac5e56e3cf7752cc22290fd35ee9c4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 4 Sep 2018 07:43:53 +0200
Subject: [PATCH 0254/3253] vowpalwabbit: mark broken on aarch64.

---
 pkgs/development/python-modules/vowpalwabbit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 6530ce28a9e3..9bc2bbc27047 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage rec {
     description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
     homepage    = https://github.com/JohnLangford/vowpal_wabbit;
     license     = licenses.bsd3;
+    broken      = stdenv.isAarch64;
     maintainers = with maintainers; [ teh ];
   };
 }

From 0f1125975a271ae970a88f04a78ebcbe97b2d89a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 4 Sep 2018 07:41:08 +0000
Subject: [PATCH 0255/3253] psi: specify license (#43716)

---
 .../networking/instant-messengers/psi-plus/default.nix       | 1 +
 .../networking/instant-messengers/psi/default.nix            | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 7c6f33935dc0..6425ae25d4d2 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "XMPP (Jabber) client";
     maintainers = with maintainers; [ orivej ];
+    license = licenses.gpl2;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 37d9de8794e5..daa9d04cfb53 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Psi, an XMPP (Jabber) client";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 5e9aafb316c47ff96bd500c6310e7facb4afa3af Mon Sep 17 00:00:00 2001
From: Alexander Kahl <ak@sodosopa.io>
Date: Tue, 4 Sep 2018 09:35:58 +0200
Subject: [PATCH 0256/3253] semodule-utils: init at 2.7

---
 .../linux/semodule-utils/default.nix          | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/semodule-utils/default.nix

diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix
new file mode 100644
index 000000000000..10ba1a3c7d07
--- /dev/null
+++ b/pkgs/os-specific/linux/semodule-utils/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, libsepol }:
+
+stdenv.mkDerivation rec {
+  name = "semodule-utils-${version}";
+  version = "2.7";
+
+  inherit (libsepol) se_release se_url;
+
+  src = fetchurl {
+    url = "${se_url}/${se_release}/${name}.tar.gz";
+    sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch";
+  };
+
+  buildInputs = [ libsepol ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "SELinux policy core utilities (packaging additions)";
+    license = licenses.gpl2;
+    inherit (libsepol.meta) homepage platforms;
+    maintainers = [ maintainers.e-user ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4ad53040523..4c21d085c77c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14510,6 +14510,8 @@ with pkgs;
 
   policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
 
+  semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
+
   powerdns = callPackage ../servers/dns/powerdns { };
 
   dnsdist = callPackage ../servers/dns/dnsdist { };

From 2e0befd22e607918c317a60a0a8595094f8551e3 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 4 Sep 2018 08:35:52 +0000
Subject: [PATCH 0257/3253] libsignal-protocol-c: init at 2.3.2

---
 .../libsignal-protocol-c/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/libsignal-protocol-c/default.nix

diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix
new file mode 100644
index 000000000000..379361a7031e
--- /dev/null
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "libsignal-protocol-c";
+  version = "2.3.2";
+
+  src = fetchFromGitHub {
+    owner = "signalapp";
+    repo = "libsignal-protocol-c";
+    rev = "v${version}";
+    sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ openssl ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "Signal Protocol C Library";
+    homepage = https://github.com/signalapp/libsignal-protocol-c;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75f595c7605a..887c57031114 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10388,6 +10388,8 @@ with pkgs;
 
   libserialport = callPackage ../development/libraries/libserialport { };
 
+  libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
+
   libsoundio = callPackage ../development/libraries/libsoundio {
     inherit (darwin.apple_sdk.frameworks) AudioUnit;
   };

From 6767396e380b39128e5decf30d6cb87481a75490 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 4 Sep 2018 08:39:13 +0000
Subject: [PATCH 0258/3253] psi-plus: 1.2.235 -> 1.3.410

---
 .../instant-messengers/psi-plus/default.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 6425ae25d4d2..0fdd8dfb4bd3 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, cmake
 , qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
-, libgcrypt, libotr, html-tidy, libgpgerror
+, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
 }:
 
 stdenv.mkDerivation rec {
   name = "psi-plus-${version}";
-  version = "1.2.235";
+  version = "1.3.410";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "0rc65gs6m3jxg407r99kikdylvrar5mq7x5m66ma604yk5igwg47";
+    sha256 = "02m984z2dfmlx522q9x1z0aalvi2mi48s5ghhs80hr5afnfyc5w6";
   };
 
   resources = fetchFromGitHub {
     owner = "psi-plus";
     repo = "resources";
-    rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
-    sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
+    rev = "c0bfb8a025eeec82cd0a23a559e0aa3da15c3ec3";
+    sha256 = "1q7v01w085vk7ml6gwis7j409w6f5cplpm7c0ajs4i93c4j53xdf";
   };
 
   postUnpack = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
     libidn qca2-qt5 libXScrnSaver hunspell
-    libgcrypt libotr html-tidy libgpgerror
+    libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
   ];
 
   enableParallelBuilding = true;

From 9f3707d83aad3726e451ee11a18b7af52d3aeceb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 4 Sep 2018 10:32:05 +0100
Subject: [PATCH 0259/3253] cargo-download: add Security build input on darwin

---
 .../package-management/cargo-download/default.nix      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-download/default.nix b/pkgs/tools/package-management/cargo-download/default.nix
index 3459f1db553c..398e007c3702 100644
--- a/pkgs/tools/package-management/cargo-download/default.nix
+++ b/pkgs/tools/package-management/cargo-download/default.nix
@@ -1,5 +1,11 @@
-{ lib, buildPlatform, buildRustCrate, fetchgit }:
+{ stdenv, lib, fetchgit, darwin, buildPlatform
+, buildRustCrate, defaultCrateOverrides }:
 
 ((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_download {}).override {
-
+  crateOverrides = defaultCrateOverrides // {
+    cargo-download = attrs: {
+      buildInputs = lib.optional stdenv.isDarwin
+        darwin.apple_sdk.frameworks.Security;
+    };
+  };
 }

From 93a594715881e626a61488042a5796d253914f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Tue, 4 Sep 2018 11:37:54 +0200
Subject: [PATCH 0260/3253] mxnet: 1.1.0 -> 1.2.1 (#46026)

Update and fix the build:

- Perl is a build-time requirement.
- Fix hardcoded /bin/bash invocation.
---
 .../science/math/mxnet/default.nix            | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index ce9c214b3f0c..a3043bcf6952 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchgit, cmake
-, opencv, gtest, openblas, liblapack
+{ stdenv, lib, fetchurl, bash, cmake
+, opencv, gtest, openblas, liblapack, perl
 , cudaSupport ? false, cudatoolkit, nvidia_x11
 , cudnnSupport ? false, cudnn
 }:
@@ -8,16 +8,17 @@ assert cudnnSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
   name = "mxnet-${version}";
-  version = "1.1.0";
+  version = "1.2.1";
 
-  # Submodules needed
-  src = fetchgit {
-    url = "https://github.com/apache/incubator-mxnet";
-    rev = "refs/tags/${version}";
-    sha256 = "1qgns0c70a1gfyil96h17ms736nwdkp9kv496gvs9pkzqzvr6cpz";
+  # Fetching from git does not work at the time (1.2.1) due to an
+  # incorrect hash in one of the submodules. The provided tarballs
+  # contain all necessary sources.
+  src = fetchurl {
+    url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz";
+    sha256 = "053zbdgs4j8l79ipdz461zc7wyfbfcflmi5bw7lj2q08zm1glnb2";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [ opencv gtest openblas liblapack ]
               ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
@@ -30,6 +31,11 @@ stdenv.mkDerivation rec {
     ] else [ "-DUSE_CUDA=OFF" ])
     ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
 
+  postPatch = ''
+    substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
+      --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+
   installPhase = ''
     install -Dm755 libmxnet.so $out/lib/libmxnet.so
     cp -r ../include $out

From 205f3e941a6fff6b8bb12fc20dfdd76ba3d64455 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 4 Sep 2018 09:24:38 +0000
Subject: [PATCH 0261/3253] swift-im: fix build with Qt 5.11 and split QtWebKit

---
 .../networking/instant-messengers/swift-im/default.nix |  4 +++-
 .../instant-messengers/swift-im/qt-5.11.patch          | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch

diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
index e3b3d7191892..8316c560b069 100644
--- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
   };
 
-  patches = [ ./scons.patch ];
+  patches = [ ./qt-5.11.patch ./scons.patch ];
 
   nativeBuildInputs = [ pkgconfig qttools scons ];
 
@@ -28,6 +28,8 @@ in stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [
     "-I${libxml2.dev}/include/libxml2"
     "-I${miniupnpc}/include/miniupnpc"
+    "-I${qtwebkit.dev}/include/QtWebKit"
+    "-I${qtwebkit.dev}/include/QtWebKitWidgets"
   ];
 
   buildPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
new file mode 100644
index 000000000000..911e7570427f
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/qt-5.11.patch
@@ -0,0 +1,10 @@
+--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
++++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+@@ -8,6 +8,7 @@
+
+ #include <set>
+
++#include <QAbstractItemModel>
+ #include <QWizard>
+
+ #include <Swiften/Base/Override.h>

From 17b6efaf3d27c369df5d6dd66370d5251102fa94 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 4 Sep 2018 11:24:03 +0200
Subject: [PATCH 0262/3253] go_1_11: Only allow one of GOARM=5, 6 or 7

---
 pkgs/development/compilers/go/1.11.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 55cc654b0aa9..237f74e319f7 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
            else if stdenv.targetPlatform.isAarch32 then "arm"
            else if stdenv.targetPlatform.isAarch64 then "arm64"
            else throw "Unsupported system";
-  GOARM = stdenv.targetPlatform.parsed.cpu.version or "";
+  GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
   GO386 = 387; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
   GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";

From 61df695f65fe3102536f152c36cca45753f303d6 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 4 Sep 2018 19:27:19 +0900
Subject: [PATCH 0263/3253] khal: add zsh completion

---
 pkgs/applications/misc/khal/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index ede85aeada5a..f9c929c21bfb 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -46,6 +46,10 @@ in with python.pkgs; buildPythonApplication rec {
   nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
   checkInputs = [ pytest ];
 
+  postInstall = ''
+    install -D misc/__khal $out/share/zsh/site-functions/__khal
+  '';
+
   checkPhase = ''
     py.test
   '';

From 4295e225f568a61836bcb89e92aa27cbdcd4f19f Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon-git@lschuermann.xyz>
Date: Tue, 4 Sep 2018 13:30:07 +0200
Subject: [PATCH 0264/3253] libvmi: fix libxenctrl dynamic loading (#45865)

libvmi uses dlopen() to only require libxenctrl if the Xen hypervisor is used,
which failed because libxenctrl could not be found.
Add xen libraries to libvmi's RUNPATH using patchelf.
---
 pkgs/development/libraries/libvmi/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 28cfe56d59b8..44b2a81b2d3c 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -15,6 +15,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libvmi-${version}";
   version = "0.12.0";
+  libVersion = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "libvmi";
@@ -28,6 +29,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = optional (!xenSupport) "--disable-xen";
 
+  # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here
+  postFixup = optionalString xenSupport ''
+    libvmi="$out/lib/libvmi.so.${libVersion}"
+    oldrpath=$(patchelf --print-rpath "$libvmi")
+    patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://libvmi.com/";
     description = "A C library for virtual machine introspection";

From e65617d8238d647fcd63938a8fbad9a7ed9de7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Sep 2018 08:44:21 -0300
Subject: [PATCH 0265/3253] deepin-shortcut-viewer: init at 1.3.5

---
 .../deepin/deepin-shortcut-viewer/default.nix | 37 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix

diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
new file mode 100644
index 000000000000..1bb112b76f6e
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
+  qt5integration
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-shortcut-viewer";
+  version = "1.3.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    qt5integration
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Pop-up shortcut viewer for Deepin applications";
+    homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 15e108a651aa..d8fc63e4f912 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -8,6 +8,7 @@ let
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
     deepin-menu = callPackage ./deepin-menu { };
+    deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;

From b99077f5b13860f1fed05c69fa71d7e0a0379cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 4 Sep 2018 08:45:16 -0300
Subject: [PATCH 0266/3253] deepin-terminal: add dependency on
 deepin-shortcut-viewer; enable parallel building

---
 .../deepin/deepin-terminal/default.nix        | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index 2ce7885807ac..26146b8ab477 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
   ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
-  json-glib, gobjectIntrospection, deepin-menu }:
+  json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer
+}:
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
@@ -27,12 +28,27 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    pkgconfig vala cmake ninja gettext
-    # For setup hook
-    gobjectIntrospection
+    pkgconfig
+    vala
+    cmake
+    ninja
+    gettext
+    gobjectIntrospection # For setup hook
   ];
 
-  buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib deepin-menu ];
+  buildInputs = [
+    gtk3
+    vte
+    libgee
+    wnck
+    librsvg
+    libsecret
+    json-glib
+    deepin-menu
+    deepin-shortcut-viewer
+  ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "The default terminal emulation for Deepin";

From 12723b105cc6b2a07ab0ad70dd8f1cf60dfd8f86 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 4 Sep 2018 21:13:35 +0900
Subject: [PATCH 0267/3253] firefox-bin: 61.0.2 -> 62.0

---
 .../browsers/firefox-bin/release_sources.nix  | 796 +++++++++---------
 1 file changed, 403 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 13808fca99fe..594cf175e9eb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,995 @@
 {
-  version = "61.0.2";
+  version = "62.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ach/firefox-62.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715";
+      sha512 = "68a0802cccd72ffd36bc9188fb96b819b6357b889630173294f92af4dcf719389d678232b986ff6aeb258d2cd149d670d70c2bc90309dc61fb359b1d3011cc6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/af/firefox-62.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413";
+      sha512 = "afdb463bc4bb5f0f3ba95a0af9430d5407a707b7cdd181c44ba0d343230d75e16a3078bc1f412dce8248991b8e752480be885355e394c1e4a4465c7c1929075e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/an/firefox-62.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d";
+      sha512 = "c54b5365a97c44559aeac1c50a5d22250eabb94180987e3745bc875e7f2d7a843fd1282946cf5f27e53f4e0e6958a00376e6f761333e9bd5fd9ae7f6c081e1a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ar/firefox-62.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9";
+      sha512 = "08d5c5aefa22408c15a44646ef1b82ec3100a8bd69beb68a1d34029d2b0b554e110092ea5ee905bd866393cf506cd658591bba2e6f670943b21187015d99a836";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/as/firefox-62.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb";
+      sha512 = "c403ca739506adc934e3453bff0e282ed514580895dcab70d41ac92499feabaa0d811a821b4441b988a3c12320735794d891620e06c8f081f13882f3bb6a56e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ast/firefox-62.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc";
+      sha512 = "8d0e1c648c9eb8ddf8987360be83238eb6daf578f090687071ad5a63ff76028ebb4a988115a8ff9f7c40dc3522f06b4f79626f2ec8371040c76501457b93bcc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/az/firefox-62.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e";
+      sha512 = "2cc58aa3833572ae3a97e0d2b70caf19f5429d360da8d3587399a3ef71b48bd1565b0a6eb560c032c45984930e74ad072ca6806686a18cbd7a0ee24805524a64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/be/firefox-62.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c";
+      sha512 = "fa196010cf483c3f8a4bf63934cb54f543fd00bf8cee45d76aac29675a2b95757f687f8584e7f9122fa1e82b007aa13ef06f0c8fed7dcdea059223f3607db0ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bg/firefox-62.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b";
+      sha512 = "e0f107ab8248ee3e1bdb30ed081e415f03dba9068599f9596706dc4fb907be7737a9f2378e347aeedd667f2526a5b5753c4f35b004da6db6dfc9ca1593e9c91e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-BD/firefox-62.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484";
+      sha512 = "794d93fa5bc61186b3cc1d7866a13d155420d6f829e9b20377c8bd8ed66418b92eac08e843170893a23249fefd7fb4c5a93df89fc9249b8de00ad803b9aad0ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-IN/firefox-62.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a";
+      sha512 = "1ba17cf852e267f1adf9192d0081e03b7d96f4a23cb83ff1a67f31d7340b234037a6def0c821fb4a872fd011999b14b464a3041d308cf5135382c2164f9832c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/br/firefox-62.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f";
+      sha512 = "7ff933244cabb95fbdad1a64ae900f6fd694dacf1d76621865b4a2066624c31f0686c4dff53add7523749d6f5befe6ec7bbf0160e426e1a02457f8d3d5e15016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bs/firefox-62.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64";
+      sha512 = "dfd9a7b8f2f355f274dca7941349512339aeaa9da4412681a4e933cf0e1e9396d57d60887fca59c341e70496dd7073647794fbb4c8bcd1abd7b5062ee6809b53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ca/firefox-62.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e";
+      sha512 = "3785649ca22ab7882f751d0c2223589b7c8b5fa04bb0786ba5f64be405ba89a665244e7f4882d77a85569c46da9f6bc1d3fc95f0ff77e57f02cb8a7dc22f5b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cak/firefox-62.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca";
+      sha512 = "e367d02bf8c743f7a5c42b6ca19521813ba31f6a6525f4fbd4ecf418c9927a083d218ded1ae8b11084d4cc5707f97312b327a40735d638e1d3ea07056dce7070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cs/firefox-62.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2";
+      sha512 = "cfa21baf935d6e325b6ea13d19796ae7adb51bfa6923f7f13e5138628f8064154bbfc5a4a0131a147383b2bf723e1abc46a79b698b2682602faa9a8f80b5e6cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cy/firefox-62.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e";
+      sha512 = "0a9ad3a8ba02b863194fe4ba347be568fdb92bd72352251220f673349b77ebdb2b2c6e828e98c1c757fe3d4484783528e5f0129ae994a2f0226a17040a2f8c7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/da/firefox-62.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6";
+      sha512 = "21ce01d959f36084dacdcd52cd26440a67e724c79361ed1897371fe4b33a853c72fc4feec6fee446ef47c1ce29c4a88392266bfca08189f1d99127ca637b8be1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/de/firefox-62.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913";
+      sha512 = "cae69bd2193db9888ed3a415ed7147dc3002c05029a6cf3e7a010259919dfb0f209055b20e259459f008b99317a215cf6962ab173fac0f1e57c86341571d0eae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/dsb/firefox-62.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c";
+      sha512 = "4583f05b675973a2818b06baf771474b7bff9ec741c2e606cce13f6e4b153f92fadfb0c15d91c4a25d492a38fc3c48180cb6c7ea5e433aa774a9fffe26f4e593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/el/firefox-62.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c";
+      sha512 = "4419885f9b6510edbf2797a047a08c97008731ce4fad19cda1fde4ab70b8912c9aa96df533f9b138d843303e549baa30ff9338bd9531b3044bdcc521cff14678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-CA/firefox-62.0.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-x86_64";
+      sha512 = "86cf4dda9c21faea5d5031f423c7badb1876b225ad618fa8c1dd49803d65aec1032bedfded3278dc19d84c1f88688cd4ba31a27ad6f706ad55e9b407e3151f9a";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-GB/firefox-62.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc";
+      sha512 = "278d00ec48c2d88d3aa5bedbc9443e82f367a2c9f8261f624eef42fcbfb83d74a3f35d6ad450ef3974ca8a19f7e654c93c40c1941264a2372fafdbb803c08f40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-US/firefox-62.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5";
+      sha512 = "f4dfc51d6c8f9ccac869691ea4efb0f5fd8257d661698dba4eb7cc9fb7d28314e00a09ec595d424186cc928c8a6f9f93af0efcb3651eaa4fa40f81cfda73770d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-ZA/firefox-62.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb";
+      sha512 = "f6036fe984da3057e76d324c76a2cfb17903d73f3e6bc7884338bb0ef0f9f68ef69e94ee93331f81e17a8eacc40827263c74e5aeb9a70420c7cf0670a205c61c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eo/firefox-62.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd";
+      sha512 = "011a742e57cdc2134115ea294782716bdc49ac4d2d7b06bfed048f75d18a5780cb93a16cd0ec6b8017e6b8299a5b260015adfcb3f093883703ed9403768555f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-AR/firefox-62.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb";
+      sha512 = "f86be240d21d47eda8bb04ff6b502ccee3c94afd6763239c5a79e094532facb8e8beefdf024c089d35ecffbd687febde5a4f10f362fd3c4d71bdabdc3ef1ce04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-CL/firefox-62.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400";
+      sha512 = "e6be4bff771e5c64d35fdce320fcd80283c964e16fa938824adfa6dff9c69c721ee9184a1f37de86ac42f730ebc7b4c8355d151306e761bc96308868d6d349a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-ES/firefox-62.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e";
+      sha512 = "32473438f9d39f53249faef39e467546db58b3dce905cc1f4c0250b5fcf5ff2eb671baef0ab179b27ea47bd85bc5684f9bd4846c785f2454076035711642a7d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-MX/firefox-62.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06";
+      sha512 = "e81563bd3cc51241b129f084d4d9f5e8b7f34c1f5517f041bbf6992b50e0ad4fdf33fb36f0d1cc22d2bf9eb0bcbd0515a1b21b5cbb8d084cadd0f5d9d80c7b3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/et/firefox-62.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020";
+      sha512 = "5827c7dac8e12610e731e92128ed66f8f107c19de99937a730e7439b26dc404cf518145467cb702fb395d9cb3a0f4ad45c92484ffb053d88dc7ac858781f4ed0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eu/firefox-62.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396";
+      sha512 = "c59ad7413f47ac19e9cd3a267150066099f561a455913714a18afd1b0e284202364f009cbe0361f5941b96d57b43c3d7d778235c9b9123133f864e75479556da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fa/firefox-62.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4";
+      sha512 = "fc3a1caac599a418ab0ce2208fa921dd40912e80ff075bf7d90ef64379057e83332483c1a7a44dece95a38be523d0ea2f92a57b45c300f032b174dde4812e5f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ff/firefox-62.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6";
+      sha512 = "629c2b79571980bfdbf9bece6760d1553cc002f91f26fe46d58d4fa5040f437b6a8b9b6ff41cdcb3d615c479c66a17d87d878fca65025070a31073165098ed26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fi/firefox-62.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64";
+      sha512 = "4393019f9dec44bc62985d84f95585de0a26736a923f873b92d87f7d46d11f8f3e8af53812696ed4d312fad51c3bdd34026cd7ef933fd047f771441245b30213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fr/firefox-62.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1";
+      sha512 = "9d9afd43288fe6719b8d4f76c4542a26dd4b36376abcc8a0d8111c701bf397345451ccec5bc5ed1f2c2927549c62a429d4d97470d850d0c83ef8362c40531f0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fy-NL/firefox-62.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3";
+      sha512 = "12050decaa38a27ead08d67130d43ba36666728d3920cf40ad2dc0eb18de6a204e81dfff72cc0a33022b0d96097ec83fb36c88b463707f04669e5c907b8cac15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ga-IE/firefox-62.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514";
+      sha512 = "fb028d4b55cb5758eddb89a506b68d322c758d2e8ce01151a30678dd01c4ce625c9a051650a2e115705dbe02967f0db5894a4476d6460ff08313d4767dad9b7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gd/firefox-62.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7";
+      sha512 = "a1173104e4be1fdb6cf3a0c8c997075d40e5eb950dc2482107b5795adb2590575c1c79f50daca87227de6426f4ad9d756233f95a0ddd3aa6e949ab773d319db2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gl/firefox-62.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83";
+      sha512 = "b6b46ec64e4386c9196d1f5362674667e46b5006b756cdc164e6c1c42ebff417c57cacceee949d2e9a5f55c76b82471ed9cfa01cbddd8ab74d6669c6870864d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gn/firefox-62.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df";
+      sha512 = "3c35f52d34d57dfbfe43d8df6be4f04bc10c79b3b9e08949525a503952ebecb90e59d99565c44adf25addff6f713088bce3034513eea3108a37c02b0921e2f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gu-IN/firefox-62.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3";
+      sha512 = "0bdaed369d5318c59b929193686960ea2ed2173027c2cdb0384936d724585a9f8db058cd00d5a9d4b5ff8182a59c65066a9daf70e1e0b0d6013b3753e6f36adf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/he/firefox-62.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6";
+      sha512 = "07074488f2b83055b66300b357e8fd4cd94dea52c359227cf33908a0abdfcf1bb969dbc8d00454c42e5b83f35651aadfd8492507deb5a229d3e70b329753a86d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hi-IN/firefox-62.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa";
+      sha512 = "8e6b126bbd13b6ca9ecdf088a049e28328942c5153937198b851ddfdf1705211a03c6dbe71e95b3afd8f7d3889705d2c6a1bb0b135e34ba389830cff519dfbf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hr/firefox-62.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a";
+      sha512 = "d1c36d8cff63d070a827d24d3e95a823a1e302cd42a48ec50edd34ca3f76678f65897f060ff5365a677525e938baca6df512f27b0fa039eac6b78fcfd347b440";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hsb/firefox-62.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078";
+      sha512 = "384393359093655a50c6052cf25ba413fcc02000685fc6e97f15e3668cd93421dfd3fe95d266bd4ae5e687105ce7a4c364aef92faec9a5c01f6f5336c134fa21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hu/firefox-62.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1";
+      sha512 = "05c76472230f7ca011fd5f936568b50cfb646ce7efdde65d1640f0d4ccb31196873a8e5aa32ca6bc796e80400d52ea4c191e334270c04ed92354b6744ff4cb50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hy-AM/firefox-62.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7";
+      sha512 = "cd3f20095f0c31e20fb383089141f1aa22ba8f8e7734370fd377ba900cb71ba1f2e76e196bf30cf3e3a8139bd667575d139b03969ca3ceb3f2e1c231e70431bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ia/firefox-62.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e";
+      sha512 = "834d2f397c3eefa2da5b184dcb4537ff28d26ade5ba985f916c4921473774d79a63cc97f3c72e49e19f37b4285a6efbc0bfd8ca78159b4a9e643027fbc4fc830";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/id/firefox-62.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676";
+      sha512 = "25b18c83fa9899f54a6fea9c617582c06b6ace769deb95e2ee6d1f3f4d32ce1654041605072096fb434c483b2f47913a35b4cdf392989db108f48ac9376d62ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/is/firefox-62.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45";
+      sha512 = "596a5ae84a71ee3a5f1ba4896b794cd103d2bce08a505faa38ea6df9cdc5380d7b97b2c4b3c80cb525007bc2f08dfa2bccc2634a135e653c79b913c1624f56ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/it/firefox-62.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13";
+      sha512 = "46bb6c5d0e575acdd510b72375677fefc3feba3c7ca2d1ad4a84f82ebfb3e7d14a9b419964850f6b640adad0970b105b3ae45bdee4a8a47200c5ac7f290c204e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ja/firefox-62.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496";
+      sha512 = "031a4aebd4d676f724c95812dab0fa4ca289fe4144417ffb28c6c4579580666bfa690737f544a3b09f5e07c7661200c334c4a336ea45700b6e8fbf5bbe5cd81c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ka/firefox-62.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da";
+      sha512 = "14979e42ecff3c9005fd229a5516d36a72958ef810766a64963c2a6028c31e0717ca9079abe6103ece951c5ade140adbd35227dcb73c6101a145f1bc9e241721";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kab/firefox-62.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a";
+      sha512 = "16189c288a8807afc94b1d781a3afad833a52c16ad8a805787b7ba5603ed6988bffe34d9c9a98ea3db0eda25341ff24430ab68b59a1cf9724bd16246a52c1847";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kk/firefox-62.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143";
+      sha512 = "c4a35a83e41df1149c1ab38d8f243753865a50d6d896b89499bee42db45c8237b9b8d6599fb3c932717977c5e460ce7adc6c93d561fa69a4704e1931fc11d21f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/km/firefox-62.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04";
+      sha512 = "dadea116c3bce18f18f2bfb3652ee1d26b3cd11442b8e941565772d202d2a8a2e7d6277a1737f39c63947b2972ed8a84680b4c7dc351563c5ff11abeebd6205f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kn/firefox-62.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8";
+      sha512 = "dd6109e92bdc9a7b3c8e08d9e104691a1ee449f9f915b5a4090ca471089ea000da34dda44883f10f72f4a5ca21078263663444a413ab1f1e7599f85f01f3700a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ko/firefox-62.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db";
+      sha512 = "1dc4383f48dc1aedb80c373398a5539649397f1660664181c97ecfaa17eac2c503a976ae15b1e7607a83ed90e3b4f6c3b15d1bd60e13e22b8f071d91d373fab6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lij/firefox-62.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51";
+      sha512 = "a26d5e50807efe3d4e3e01d10b0131ecbde0ef141f13310db4b01adcbac63d003db073ee24620745ab551ecba92965a5055e553b31fcfbd2df9af0a8913c7823";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lt/firefox-62.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48";
+      sha512 = "dd99282b5eea3a1e4518644acdd9bebdcb1532cde148f8c60fc83177fd39757e98e7fe3cc54c681305c699a085788a14cd44e93e5f10e11a6812afae10b2db8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lv/firefox-62.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07";
+      sha512 = "4be6a61d0ccf424ced36aad978f6419d00afb3db93751c1cd9f6d1ec0c2db8530e77099efbdd8883b333fc2dcb315143088423c359debdc7da5808853aa99268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mai/firefox-62.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6";
+      sha512 = "71aa1872d28a5f741df79e4f1490b110fd9bc13e9f6c4f2aea8d5028b434d02f0bff859613dcac258e0af7e8840b5a5b37fe80eb6d94d4712e83b96d971a46bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mk/firefox-62.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15";
+      sha512 = "5b9e7e8f865675c0488fb9f7e965dc37b35ff53f0ab84c3cc0d37f9baab0084bf5981e4a1dc65557a02f83de7a92302c5cc72c7c25c20baa484fc6abc552c279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ml/firefox-62.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547";
+      sha512 = "d3ea17e668e021f9f002d775df1117c51e7b5bd92780b014bbdd869f93e50400e290a35e4f056c4ce8a235fc2851b630d24ddb3b8e6ccce7c21b65a94fe9816b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mr/firefox-62.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015";
+      sha512 = "9022898d857eae94054ed357cc5d06bae72ea38fe2f1efb6d09baa6b18d55cb8a75a5c0f2b312458366e2146b36d12407373e8862278ef348e588a893c068a17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ms/firefox-62.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676";
+      sha512 = "c81f40e528ec7f141de902432f1f367023a39889794a46de8b271e9c4bebcfbb4b6124dc8e0b86c560214c493d650389829a04c3f4a4d121b3243ae66092a100";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/my/firefox-62.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416";
+      sha512 = "ba942bcab35045de32a2d7914bf7f953dd1f683ff0d142246035df830d4528b47f195b8a6b96c95b62e2d03e89215c938072ae23b19af41bbbbc40bed3d0212e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nb-NO/firefox-62.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13";
+      sha512 = "dc86c87a0e51105bd89ee579711aea9e61904f17afae27236ad12bf754831dd592f9ef938ab35d037b2da884aa301044eb71462a6c4ad26af97e9911e6356bd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ne-NP/firefox-62.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc";
+      sha512 = "9bb1e18c015696ee9b17853a942537bf462101e687107771d34c4f62d3cb3f7d9debbbba9efdcf7acafd8a9f8c4f8c197b2df15c80b9c5a562ca1ee765867b3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nl/firefox-62.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74";
+      sha512 = "2fa2082a1a9cd71f0ae7019507055e6109292bdacc9ad4c860aa5ca9ea6896c37609a083981df309d2c53811674261147053ee6247908ec1ce7a2e030d320443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nn-NO/firefox-62.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116";
+      sha512 = "4665302f9850b93c4cf178c3e2397e299716ccf92e4fbec9762892b17960f275c1167396de4073b899d4bdbd73bf06f87f10c36be7eda22934faaaa78925e8dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/oc/firefox-62.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0";
+      sha512 = "d0b9a462b7157a1452a54e2fd3d9d0c38ab478eb6c6391350c8c7c9c581e425262f42d33fdd0ac9e50eb8cf77f0d8b71372cf15b079254c2294f5bb613337bd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/or/firefox-62.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017";
+      sha512 = "555135a96975771bc9bef17601f1e2a2e308e07ba3681164512f2939da1892ac592a8f69264a365dfad36a473306d6d33712fc6868bc809ad5d5a3ef16eaf5e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pa-IN/firefox-62.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5";
+      sha512 = "a1d01ebf734b6357ecdddb3601b9062216c040966d633e282d61a28ecb830b5edb5152dff4c46a3cc273034fdc7110cc56858cbf31c6e90ada6efeb4130c510a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pl/firefox-62.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66";
+      sha512 = "701b496e7d20e8eff7484db6bf5e15f1bac769fc97f69de028a0dcbfe0f681d0a9031242b30367833f8cf1f8fbb1acd6d469a225152bf5b220a38b369c740381";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-BR/firefox-62.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f";
+      sha512 = "c4b3be3a9483ed76f7b8334998d75b293db031329852ec59ce8ae13e1184a541f2f35b5d1bce413ecf525d482277d27d7470444e477f297e361751d07cf64920";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-PT/firefox-62.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c";
+      sha512 = "389ffbbd4dfeb1c7149a02cdbcb70479be32ac8e91683570093f99e38b4c541f145ec27fc3cbe54f70ec3ebc21e5c0ded3b18124307976befd8f2ae1839c5dc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/rm/firefox-62.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90";
+      sha512 = "cf9b89f1828bec694147528a0db8a8ec4530fb60e8a1957b77c8202e95459217c95bea2f104ec303922074c3528321f775fd955080b5e012b8941bb7f6575bdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ro/firefox-62.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b";
+      sha512 = "44e3ac3e35af41616c1dfab41edb172b4dd92bc622aa53b8626375d782235ce3e9540e72e14b1d25dc19f4e44db5717fede7429b1fb245b644c20f2e13c0d7e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ru/firefox-62.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d";
+      sha512 = "7b38581a552ae9df2222ef9bd8f2c272cd98458d4a11c55a8f942870411d08c72da0c1dc5c4354b8e2e17d0a97794e4f2d59446a394e3c95376f5e7ee296d57b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/si/firefox-62.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd";
+      sha512 = "dbb7cc9c9efd5c1305cb7c770db67ace1b10c2afa55d2dc9b8de896629e4e69e79bdc5d06cf3d7900635d03420c32e0dcb1b0b8ead25ab8fb3cd12a154eaf0c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sk/firefox-62.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052";
+      sha512 = "04f9b7c1977aff8144ad53a2bb7bc5aaaa11054cb8bd00b1747ab7ec34e3664d1fb3adf65b49b5d5acbbde2e1ab45ee642033e3ab57e99d5973ec853a1a6194c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sl/firefox-62.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f";
+      sha512 = "3202a009f73fab2326611c65ee97a8249f5ccf047365874db92da588c5cb8693ad1a7b7852511bbab10a9146d0beb7cefdc79d3269c3b7404205d616a7394dfa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/son/firefox-62.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029";
+      sha512 = "a4f718670b73af088e87910197a78dace22d9e04bf268e4653709eebfa499ffa4a97b4048e4ac80c6a847afa598b0e19bdff07c6a7d6e164dfbf3d09f1070593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sq/firefox-62.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb";
+      sha512 = "8b67dfcd41328b677bb33a640c1045b3643368b8c0004cb55027d36ac2f3fb9cc99c272d132c355567ab0505a50d34fab80f6fdb8598cef09ea9806e19d6107e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sr/firefox-62.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1";
+      sha512 = "51834193c037ca0e23f2c73800a351debd8327908f7c6b378a89424ea86b01a272bed893df59b1102760303592604812794c7ac70effcd50c20fbd676f4b5640";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sv-SE/firefox-62.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b";
+      sha512 = "8763a55b6a3f7ffb75afe854aaa54bd7bd5a5ee8dbd741f4348fd29ce015603f81cd98bed3547c628dafe98dfa800a97b64e281606223fbb400c03a0af332018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ta/firefox-62.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a";
+      sha512 = "82d687d98f2e75b637e76416ed1b749d1af18c7ac140eab32f8fdf99238fec76f3f926caaf212fb42f054d51d8c807536da8cb0ac5354ad123a3030fdf46690d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/te/firefox-62.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698";
+      sha512 = "2a690bbaf6f8ba90f98c2761d6ac6030fe17d384478a3bf7c07875bc6e3e6285f154e3e21db4b639602f205cc03360fb36bcfe26473ec48cb1749a65b781875d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/th/firefox-62.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877";
+      sha512 = "ebc344d1439fc4fdb71d772b047466e5bc19a04a83de09e64e9c820d19bc057f3deeff5d0ec9bd9cb11ed2079f4bff459f3727b0ba92fb7426e2e186bd0cb4f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/tr/firefox-62.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6";
+      sha512 = "9096da5a647463a3643e3e5f21dc51ee9be87d857004285de7dab164255103bca4ceb9d8474fce587ae497397c753803b8157c40d05dd8d3310d59e97965ca0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uk/firefox-62.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137";
+      sha512 = "f9f609eb7f3050e95bff33de4b88d8e17949c4c167d3bbd7a9901cb0d19926a37f72e40a6bdde1f6c7610a3ffc67d7fbcfaf298659e519aca16592714c70bb4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ur/firefox-62.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380";
+      sha512 = "35a755f1c1d93d9d8e4bd813c83a332a1cee74989d993921f987e023da90a851863f83b56a41c58878f5aed07b4e08e0ca9d3f4d4ccc8610544516bf903855c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uz/firefox-62.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc";
+      sha512 = "d957def873388aa5f5051ed3ab5cf51196f8b5fc83e2fc4b56476f63357ff26ef38e6f3d469cf4f117b094c3e31a0f561b1f5c0a90c85e827436ecfe0d61e98d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/vi/firefox-62.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71";
+      sha512 = "e7f10deacc80f55928f3f6ea4dff80142e790cf9dc814c38f173cd03ea59de45438fda5cce1073b0c9e1b528870c7d979d16254b038bd351834def51944193f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/xh/firefox-62.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71";
+      sha512 = "0e64c9a9c1ebada345f02d6dd40d2ab1ae157ee238b8716b011aeddfb18775c1594ae0f7706c4ddda97ca01c44304391570f526524f4f19d3eb5580a1839c19a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-CN/firefox-62.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0";
+      sha512 = "cf1381aeb00f19fa6f8665ffbda8a9c6c19939a29e16fb49a2cf9097dbb2674eaf4e32b658dfb126645540582c52ad86e87a9679c1dabe03757d57032e0d3d4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-TW/firefox-62.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6";
+      sha512 = "9d28b0b773227d7efc611e300250d518b303b9e03396092420e8195872c6e8c78aed6f9985e491bb01f75c541299bb7f0cf78abdf25d3a8587b085e3f6489e0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ach/firefox-62.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a";
+      sha512 = "6de54e5cde101eff5c1edd43b7f3286f10cd631398f646608e0d6f22c9dc6d8dc2a3346c8d5fa9caf6ab1a82af8708ba3ee17fcf605d0404e2beb5d10b623ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/af/firefox-62.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e";
+      sha512 = "29c5898b88cda4a1f365b8792789c854b954b4d6533ed7a556f7d0e3dde3f7705adf5a6c3bf14444268648ad3b3002eef49dac200d5eb89cbda5ee33e1cb4d4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/an/firefox-62.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3";
+      sha512 = "484a8277cca9e437d8372f750403c71c5e4923b28b776b5809f58debb8d0d3ceb5d523df05691f326d06efba5970e27bb06abffcefc500748b04e99ee41664bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ar/firefox-62.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f";
+      sha512 = "7e3deb89acab69012c5f1aa99219ec0ff0cb380ae5f1dd71eea078bee4434855c612c808a574bcf46512d2eb77b3e8f9c26ea524ece97b02699b2434d8cacf45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/as/firefox-62.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e";
+      sha512 = "0836d6d22d13096db35f5ee3da13cd4a8504a55de73ce24897a8e4903eca5b7d56f244321d2b6b623a357b1741d419957f67ee65e71d1c71606db24bbbd95631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ast/firefox-62.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87";
+      sha512 = "247817ddfd24b97b991ac916311e01871a831197c92025d3a2ea97937fe993869c7a12e118b32baa3aaca49ae469dfaa8e892150731b6dfdca1c4e0929c2ba08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/az/firefox-62.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a";
+      sha512 = "4f0977cc5ce9e01c311d256d239a3e89dcc1db5b78b4c08f08999d7c52731fd58fce08c9f77a80fde1176a0a5289b5c59f06eb790cedd3625d96928dbdec46da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/be/firefox-62.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84";
+      sha512 = "294adf3029076f9dceb32a54330d63b10ba9219d9f688e3c7246e04fdff2ff10bdc24b577f48b18935c35b8d9acb2437a7d6cc3533fd6441b9027ca67e7cacc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bg/firefox-62.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8";
+      sha512 = "41b78104367cd25e67a38b71d3db6054995caa28fd0c4dfa0ebb494d2293c92c20a347fd763f88b65d31a514987c607102206390b2dc41335d00aabd9d5d589d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-BD/firefox-62.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b";
+      sha512 = "79241d9dc44b5ad35ed76f7b33bc8be8bf7f5da09855df9e34354994554aff2ddd2dfe8a2a3410916887568fc92a70927b8cae4747f20d0dacb067206eec3d7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-IN/firefox-62.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e";
+      sha512 = "5194de3d21783d335a11c824cd46b0e01ea512f900a7e3fb45ed2567501acd27d5f5bf8dd68f146ff550f6ae4c70089d539f56823cf7280f02b67d5111715760";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/br/firefox-62.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee";
+      sha512 = "59dfe19ea10c4698067a8ca70143b160ed5a73c38e0f6ed3a14d9a60209378acfaa1f8b09647a1a96d519e6fd6a34cb7e2a8bc3cc276653842c2bb3a6ee3cbe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bs/firefox-62.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039";
+      sha512 = "7e6069ecc137c1b0b479159fc8eb323a8c417c81edd8c7d54498c47cea4f1a2fd4a1cc52bed17b899ca72df8b0fbaf88e1794b17f86086d249011ccb592ce5d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ca/firefox-62.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926";
+      sha512 = "932ce6517bd55ddbd927eb28935bc99ff5576ee924d239dc490fa79b3d90dd77f579a7b16c0b4fe4ddf8fedb4e825664aee7fe246145ebbe19c8f8841d098464";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cak/firefox-62.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce";
+      sha512 = "38c4ed4be2e79145056bfbc5a476e3a03c4f1f6aed1ccb834a7ddb2576f99fc52305b93939145ee1e7ae9144b656e857bfcc6b084ea4b501c3a574e10d7438a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cs/firefox-62.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938";
+      sha512 = "1d569ba50f84ada02f0962e0418ee7f26e79fe19cc09f50dee4350a59262ddc87440dabbf10129d73172e512eff5904062f60561f4bd2d4eda395bc67af90dd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cy/firefox-62.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755";
+      sha512 = "9294f39bf32de7eb2a1bc2480cf7f7e51dcdd124d3281f9e45c4729b6926002f8ac99c30403ea53a5c6857077633ec08e0c35f5160ea8e08a7f5f881e8a90748";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/da/firefox-62.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335";
+      sha512 = "77bde4fc9cacdec311b513045f3f026c44d7c199cfe0520cde20ed711c1cdb40d6b64483944f4da47b8fb280764899ff5931a8e5639bd0a8a4e03425835d8f2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/de/firefox-62.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68";
+      sha512 = "b2bf1a5fc4536c3c0822d84c7f0138f04f6bf4597804eff101502d3d782f2b22fc54dff966c2f32821471622cb1602050de1c51aaf9f64c63314f8ba002ea201";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/dsb/firefox-62.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9";
+      sha512 = "812842664c8b0088f33acc42ae1581a33cb2527d3aaea0ed102fdc27a088c06008b96a3a052f95a900694d869591311dd986bea2e828a02238aaff854a77aaf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/el/firefox-62.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e";
+      sha512 = "f1116c938bed2333309d32c13ef69f806418c14fb8a2fc10f63c932d8d8ae169aa76a8e3835eb6bb2d61cde7c8d8dfec56240b8280695f1c2273899bb7c8aa4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-CA/firefox-62.0.tar.bz2";
+      locale = "en-CA";
+      arch = "linux-i686";
+      sha512 = "ba07c206a4b4ee0bf27ff82e8ea14e3ddff262fec11e088a114253ef4a4a81951cd5c85cf6eb9f6e1ba06f97be0bf5787f5e26c65b7f2aadfedf27f968146efe";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-GB/firefox-62.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344";
+      sha512 = "558c10ec35144d696e1458a4b70de954ed3c8d3f05d5d1ae492374ee3b90752a93d55e6e41de30a64a3ee3b9e68bab88aa479066b849971d78121961ce2aaab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-US/firefox-62.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697";
+      sha512 = "51d606c5d9fdc2d6b611b1fea06c54ee4a6ac7666b4dce0a26dbaec99d110a2e304f88108d307b011f27312f8b935fcbf473f87b52056a465b667f8ecff9a48f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-ZA/firefox-62.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb";
+      sha512 = "b88ea68f4eabf086ff2f3fa6752cc42bd19391029d4c0565342bf24d90817717e5f07f774e164df234eeb735e426491adf35784dd9096475635365912e57ba62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eo/firefox-62.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67";
+      sha512 = "b97c269786efad57ff954d27ec69a4983e18a7ee4e0ffdc6925268830104103a99a31247359eba915be0710455f0626379b801d5fbcf501f30e3cc0b9736eb32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-AR/firefox-62.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e";
+      sha512 = "a5fd087a8852f39e1208b388a2507981af3d989a8b86b1b0e2e83adcc9f6a494116050ff811e8b2225fd113ef1e689bace73a617c0e569df627df7e9c655a14e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-CL/firefox-62.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86";
+      sha512 = "bdf7aeb5fbb80711d7b8dd7ac30e544847e00f015f7bb8835315f5ee3023458bf781a368f0dcf11c57737fb1d0f077352c0eab28d32e801861bba36bce5e52cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-ES/firefox-62.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04";
+      sha512 = "47bf0dbb55435016312a6f6650033f28710471e7aaf14e0dc83488f1ff87e559de552fd95d5a58864420032392f84de06d8a1916efb8128423826c7e4577ab44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-MX/firefox-62.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6";
+      sha512 = "79e42f01744b05df6c1c7928743914ac28f3dd696a6918a08000a531b050fda95ca621ce0484c216f2eadf728db867707c1ec45188c70bb91ee611eaff7ac565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/et/firefox-62.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2";
+      sha512 = "8489f6dcc733debebe1acbaa86cd093e5dcbdb4c8d60480414ec1e27710bf57590fef3a29fb208e9eeaa5d8858e5807d7cf0be5130d57bfe308b7653de431db4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eu/firefox-62.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061";
+      sha512 = "92f49ebaf7777962eb2d1b13043a10e82cebcad1a0f43a3527d7e7a5a31e720b812febda86051125e64d5f0355225dcb6cb496df5ace1ed10c2c6a4cfbe16cf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fa/firefox-62.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d";
+      sha512 = "1bf258264b77fc9cece834363a12c34be719121afd55378e23fb2af9cf20da2a7ef4ffdb2d39c34c9970ea5d259a47c894b6f9d703ecf75834a2239844d783e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ff/firefox-62.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386";
+      sha512 = "0b60ade68d6f4b9f1fda4a3ce36fe54e69583efa5ecb41443f0f92d394257449c2d5ca7124d1e194fc7394ba0daeb67f828de4aaf13f78c89aff8dc273213ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fi/firefox-62.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2";
+      sha512 = "f5cd4ed69914705a01765cce884e3f3fd66cea53e85d33da378087ac7ccbc9afcb1b2ebaa78bb4ffbdca2fc34b2ce4aebad6d55fdff44b8740a815265026d2dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fr/firefox-62.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f";
+      sha512 = "3dc1eda7eba9e0112b246a370a296c6f5e11f318e514d08fc800d198afa5fc692f13ba66fa7b2ec891929c53572ade6caed21f967b880262cb36718fd76e18c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fy-NL/firefox-62.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263";
+      sha512 = "576b0645bb3c2367138e3f385282f77c72040b0a4c75ac5f39163a7f1e23a34e7702305857ae2250c96adcebd587c1cb83b1e7d129667307089b38842bc4e175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ga-IE/firefox-62.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c";
+      sha512 = "416cad5b5859bf1565f7e68fd3a53ca8b180609a488e2201f70d42eda3186fb1e22c647016c67fd3068d67b50af678bc6dcd96194001511844afff43e31611bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gd/firefox-62.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd";
+      sha512 = "167ac1a9411d1cc3ab052d3b206de6a119e8b56854b7e9588ed68815e7c9b9e1722210951a8b731e944aeb8b2890095cdfa7d73b03b473a5ac99a90095de6917";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gl/firefox-62.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9";
+      sha512 = "efefb9e9d53be16fda773e8f40073c357c4b46cedecedcfd311e890a45810b7fbfb368ea3e93b07efd0f9111b9fa7a67808298c0ce98be2c8bc7eff354f7efb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gn/firefox-62.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9";
+      sha512 = "044c8e610d639ac8830b00ba2e4e2ff8e1bf827c3f91101edd45a6d478b5b8b99c1100c9fb2273a6fd378826f0bcbaf8817cdf1e3303bdb1b9b0e0c01cf095ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gu-IN/firefox-62.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284";
+      sha512 = "433bc4b580bb3d164ad78a21ef8894e053b4c6d972d5e4aa46a9b8ac27cdf38e395164eb46e24815cc645d8048c237371a3abbd1bb639e69b65efbeff00a30b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/he/firefox-62.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287";
+      sha512 = "d6acd3b06216d4b0f0856cb6576c36381dd9f48bfbd3543e410eb0e0e5aa11977cf3d68b38b0be7b6700831c1561e2a8dc75eb5193637bbd2484673d83bd3a1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hi-IN/firefox-62.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe";
+      sha512 = "49856be15be3ab0ca687f8d6616c481d61bc0380133b043d394cdcd21d1f7cd8816b2bca5538f2e601a32ffa8c51745e89f537f62bfa853da42759db70186ee1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hr/firefox-62.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93";
+      sha512 = "0040ba7333a13820e4c0a85fb24c30131d4b477da3da9e4e04296088d1c0e938fd495777aedbe3bec22533a6c4766be902adbd8b470a81380fe4dd23f831d0f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hsb/firefox-62.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e";
+      sha512 = "715d14b52fb82f255300dbc828ab05fd578f61325cdf4d4cf86f1a47e22fc1856b57bb459941a4bfa8d325b7168fb0e39c075122b56de3455933fa89927f025f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hu/firefox-62.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469";
+      sha512 = "deac0b43865960d665f13a2f0a77cd9413ba9b3172fd2660695464b5f72944f4013f6d9a47801e528db63c3e05496aa7df890624a39ddc6651ff5e8d0d02883e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hy-AM/firefox-62.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17";
+      sha512 = "22e134785777ea4e4fd72cdc7f17765d5bf8e943be33a0991baada71fb254f60f9ce9b68b4ba5640dc807a6db0e4ac3c81784a7a33e5096cda1833b22336f9de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ia/firefox-62.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb";
+      sha512 = "91112a783ed4402cec7ce357e68806609b202bd1553c649271ccf4cb90a724ec612951b3acfe0eb64646957870726cb40f66b4a233cc0b73fdeed51083d6894a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/id/firefox-62.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b";
+      sha512 = "8b87e2f13550334a96bde04fb7d61ac963548e35de2717b8738fd14fafb015944403a1bf175e2c13ceb7d4f482f5a6d56b57b44cf015b6dabfac3fed77d86f81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/is/firefox-62.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d";
+      sha512 = "8ea8972b5dc06bd12844fbafff92f6f493f604ebe03139043435fb5f761098cee81c0ccd42b67bcf3c7d1b370f3382858c08d4c14eb24a75fb851e78c51c296c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/it/firefox-62.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274";
+      sha512 = "b50a422dcd94d6ea69ab22426d6f79b3997313bf4e0e17f2af31d8b64ee85d603cde1768a730b279a10ff87639ba2af26185bdb81ea4bcb7b61947b1836ab700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ja/firefox-62.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8";
+      sha512 = "f52d31f997b291e2a0c9cedaafbcb5bc3ffd2148b52700eb5c140846f2809613c9061f339728b1810bc5f899fd208a3eedad06ace984dad41fac0a057c101ec1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ka/firefox-62.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829";
+      sha512 = "e155d5c70de47d6f96f3f0e34ee317e90ac1aaeee4be68ed265d4bec46d52e6d67d7a140f3fb135dd086d9d6cfb5e8f80063a85f07e8b2197b23233a122efbb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kab/firefox-62.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75";
+      sha512 = "153ed4ce1692e6691222779860a066b27dc9a5e747d79f4e1bd3273541d849d4b093062b3ff8d702786542fe99caefcde13f63cada7d0f67f461531aa32603a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kk/firefox-62.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad";
+      sha512 = "dd88ca465251b9489e766c268755a66babdcaa5962d40ddb4ebdc3f100a31f34b9b962bcf5fb5a0e46b2871e7ebb8d4169982a3a7174bbdaf5e6716274321ae3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/km/firefox-62.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15";
+      sha512 = "ccb473d36522f34c889ae3d211a1cd4ebf4e60da341c51c34cf05d9d8d75615b91eb4b00e327409c6fe406aaeaa07f8eec53c364bec50ae87c48c37ac1602e69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kn/firefox-62.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3";
+      sha512 = "e1c718690141b6e89f4df017d5804efe07a1dfa838f1c23ca14b90438458278bfe90e178abb5ad6c52d43a993b6a65664c0e801a9f58ac57f9300a9bb6f9679a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ko/firefox-62.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4";
+      sha512 = "e916fddce4044fd924f7aded0b0c082f82bb50fe0f7587d7aed4782d545be8b0dad67ed4d2c41bc75360f6ed7c236bd7c40cb3503b472792f1b27c8f0742f597";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lij/firefox-62.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5";
+      sha512 = "ab86bf8a92b05bc5defee073afa19ab00be704ce49a2d26f032edcbb60d9e5ef4e7a6196d31bec8d6e090c586a88d6e9b69f576ed5e587ca09dcfb60a0661b3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lt/firefox-62.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4";
+      sha512 = "d716f7fc2c4015f97962d07ba7ffd6903675a6c36416765f2e81da43f9e4aba759b3ff31bd82bb7cf64c7d8b99f9d7454716f4ce6daa022f9fa31f4a49d9efee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lv/firefox-62.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463";
+      sha512 = "453e0bbf9eb2e9678ed029ecb797b701b4b39e030f9555bcca7eb6d56676bb44366e2d1ccc613b12a09f95d99ed08f9d3f34cfc9dd16cf38c9ab8e162dbae3e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mai/firefox-62.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e";
+      sha512 = "75e863c56d68cf2304f0c6c2f1861ce025d934d033341c23d3b95a70e73bfe66334c3beb77d9fd597f7b4091baf70729419ce452131009ccf03d2d33d16621c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mk/firefox-62.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e";
+      sha512 = "bb87f94a4de4984544477837cde4186a55309eec70b85f0cffaf0cfe747b7c761d9a6553adfa1ab1fba72d732be855e2bb46e4c7f22a0f25529207b42b6da396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ml/firefox-62.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b";
+      sha512 = "5754b4a0a3c6c67191f4ef3dda7bc208766ed8171de772d4250033039b2b39dddc3bee800a28fffe41c68cfca82a5c9c6005625fc6bb5bf232b256d7bd58de71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mr/firefox-62.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86";
+      sha512 = "04e40c1d060b848cf957af34079f6d1cdd12589b0f31932f15b5ebf837e37d84d332fe3ee4a54c501ac47050233f891ec6617802d03472ae9d7e45baca809adc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ms/firefox-62.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04";
+      sha512 = "1b84fd0960c4952ff42bc50595683da47545fec9ab10d7b3fee3e3541b2a47aee084526766fb2bbf17dad413f4dd2dc458cb0c3e8153b7ef897a9573292abe2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/my/firefox-62.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c";
+      sha512 = "95fd60b8c2e9b0add3163c67a5b46e794f0105621293017838fdce48cf90a0b0bd62bcefec2693fa16b0616260b39587bf3c619b506d56b072f0c715398307ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nb-NO/firefox-62.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06";
+      sha512 = "05c83c17e5470f009ab369d0c8a1c64cb8ecc008161fe1ced3ca85e9065f36f7ee4e220f8ed7a0320305ac31b35a035b5c8f7525b3b04c6b96e95e4044418f33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ne-NP/firefox-62.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51";
+      sha512 = "2ad4756b8800554c54aa1f47effe512de332a61fcd7571e27ae83bd5e0100cd8b60fd5d8381764f9bc2b1d925ec4b53fc3c6c6a88840cb12f57e9acba892dc5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nl/firefox-62.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832";
+      sha512 = "a3ba32bb48a6bc386d49e4ec703f51cda3bf917673e23965d7f5e7977dc8ae0696b375535aa04d1a416b6b5655cb3302cb9738a238d9cc8a6bcb78dda52afae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nn-NO/firefox-62.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89";
+      sha512 = "35bac6119415eaca5c8d9fd2d57e0a550abcd7d069454202a02ce6418f9e47ae59563224763008f23d49604cde09ad251dc8785d2205d4e9623c138a97b69533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/oc/firefox-62.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85";
+      sha512 = "40d3e74b204da461cdd79163cc838e538a5dbb8c4e693a59d801202363cfba4bf48e01bcc87d247dce6b1fdad0a24f2bdd15272399e407b26293156698f7bf7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/or/firefox-62.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc";
+      sha512 = "2220ecdcb26b459ebb0fb3380bb8b9430c1a09aa899418b18a765a4ba76c8d35480f59b71edaf6047e0eae04146ec6dd6bf25ccb619f559a260ff6f2828a0db0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pa-IN/firefox-62.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6";
+      sha512 = "91425dba14c27a3bbb744cf5added1545c071f466c6cfb77d7b2ff0b0b5ab289ffcb56821023e50d12deb4ff29cc5ae490c028420384da84811c661d277017f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pl/firefox-62.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11";
+      sha512 = "a5581c2e2d7de1187967af10802c4a6577a5bbf9a0ab56448b0695ca3fdee845117fa364ea53149b81a5aeb3ddab22c58ff65863fc981445bd34858766fb438c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-BR/firefox-62.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66";
+      sha512 = "70a9cc592980afbaa3efa37b57e190f6bd6c76fe975ee16b3a3b2e3498c65e792a83870f569836fe79fabc289c201b7f6764d4d512f9d561058eb496d1bc1cf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-PT/firefox-62.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6";
+      sha512 = "8e1d94b4b3e01e684387b4e3c9439ee1df9712cef607f370d63ff0072876c2ad9e22a978fcaba14c03802c8fd5b559c6dc412fdadaa6a01425bb491852c4ce02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/rm/firefox-62.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8";
+      sha512 = "77500b96558c055ea90750d99aeb096d789a920fac4fd368b95a032cfa565ea0ee1259503ef0d198c4802bbeeb847a3ca22f06ae79b6e554c54d336a99f61687";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ro/firefox-62.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840";
+      sha512 = "e3cfec0059f0372d2b3764a4c3809b7a8c9ee6e795bb1d8eccf663feb1d054be58c15569b8dcad55b5ad37a1332d950f5286ad88ca5db55441c1cb3dd879bb8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ru/firefox-62.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5";
+      sha512 = "91077e66da0403828807fe1a3ee274ac162898efafd651b3c243c315c9f0f1cfb88925e738b9bf25fa7fc0c7b747f2a9f2a5a1c77b87cb83d3aa620475239822";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/si/firefox-62.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a";
+      sha512 = "f770321771e965776b55d7681783e3782b7ce4df3c3d7cce581a3de1db0f8fc8c3ded3d606fc7f7f61e62b33986e8e05ff64e49427a8cb85b68b7b6fe43f6c3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sk/firefox-62.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063";
+      sha512 = "150792fbeebcd0969fdbef0827b617f83383bcaaf3eed9dac0790aa0ffb893d4498dae29eb480fda05a2feaca0428cf600bfb3398dfbcc921e92cf2ca01c7a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sl/firefox-62.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b";
+      sha512 = "d423c10683ba690a8d8eec50e4e966b7233d565e2c35b5fdd70aa917908daab5d01f847c32f7e24c604aa19ab941ca70c6e6613b39271d01f1370dbd974800fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/son/firefox-62.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72";
+      sha512 = "7f1d638cbd729b51d959b0b1ee0e4ec5473f5478bf315c890fd9df20e3065861a5c8447399e973cac78bd078d2a1f0e1bad829f6b462ec6ffc55e7748760677a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sq/firefox-62.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74";
+      sha512 = "823b4b5043e3fd8fcf0bcb345d00dbfa38e6e03fdf172a30c272f51eee7f9057ec99423c7117ab8d21e9037bcc1e19a7082401a0b25514e2258542aef4c4af80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sr/firefox-62.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2";
+      sha512 = "a08ef0de87e4f01c11b20301e45e98d3bf10bbd4d2699de56f66470d7f4298aec3744f44888ba46ec1293fb713487f6df20bb9f5682a57827993f0ddd28cdde3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sv-SE/firefox-62.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a";
+      sha512 = "e3e65e32e5e11547e220bb34d0009257f3c4f18aec0fe961f310ef4b76311d8d885a01d6bc4420c2b97687b886c3d00c09d43af0c6c7eaca8e6a804d78d4bfe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ta/firefox-62.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc";
+      sha512 = "47753ccbe4471ab3d3de3ea11992cd332251868ae3a7772e860531d013c657f5ff559d34592fedf7b52ecf3a54476dc2e0fc68119170afb9c482fccd04a36776";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/te/firefox-62.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4";
+      sha512 = "90327dd95f3a597692cf5ea54258c31ed813261f102a7f668f5bc5062499a6bfe64d2d241dc33ffdc5cd152802e7d462c7ffdbe4498825ad88be48d21031919b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/th/firefox-62.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46";
+      sha512 = "652a7bf7f2a7c6fa27edbd5e78cfecd2df661e1a7a01cc532b1caaed53bd40025aaee2126dd1116e77ef9e050777e78e96537ed2decfe493caa1d03c7bbb0646";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/tr/firefox-62.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388";
+      sha512 = "f98d45b831f51a0caa47fcaaaf1ed37f267035e1f1ab95ae0cfbafa06f03b89f99b7a7accb9812644f862b819c2bb294f5a3454ece80f775359ac77734a99d44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uk/firefox-62.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35";
+      sha512 = "6c67554c87c7941fec8193bfcdd9d5d0af906d13ab237e0ddd97733816d2df27fee5e11eb450e85f9143f71049219e8ef9c6cd4d327faf3e335247130cdd26f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ur/firefox-62.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4";
+      sha512 = "0c90e5575d057d9f32c18a102d2db7848f8821d71edb3cb9ae4f2565a1cc2851da7fb1bd493e81dca003a50a9f26454af8cf0ef7f947ea42aa22baf20abc06d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uz/firefox-62.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa";
+      sha512 = "fc35bb30011063bda8c256b6c405bffae55ae7d67ce5809367aaadaddb1094acfe0186f2cd84b2dceb55a76358ee46e29ec013058e035123a7797b5ac49b6e4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/vi/firefox-62.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c";
+      sha512 = "0c6a94f811ba509dc468b31f9448eba7f1004e6652a418db8ef84d03d79ff850237bd7555b8f73d515f8a0c546df371a18bc51ccd3dad069bc481f58f9a4c989";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xh/firefox-62.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0";
+      sha512 = "b113f1f4a81a7cac63a8604a8152bf651ebee3ad48eaabef84d09d3576b37b529f56c04fc9fd1b3326364aeaefad77cc123a97b662c85665c7f239384f5c6d7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-CN/firefox-62.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356";
+      sha512 = "7c3da83ebdfbcaf8a67ac8cf953d648dd3eb54d1c9f6e74680b00ef94e01a0384a53d27c4a78312e25e284209f3e4c53661958347e3250eb820a20873e66c3fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-TW/firefox-62.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6";
+      sha512 = "659ea2bbd51d99a0c3573043a55ee580839e5f0323c57bb7b086ebc41a19f493baadecf67b64443b5abcf5db69e7e82e0c965a40b151d141557cda04b3ce6d52";
     }
     ];
 }

From 26cbfe1035547ddb885f66e52aa0ecc33239ae1f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 4 Sep 2018 21:16:46 +0900
Subject: [PATCH 0268/3253] firefox: 61.0.2 -> 62.0

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 984d80167c39..3559135a01dd 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "61.0.2";
+    version = "62.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2";
+      sha512 = "0byxslbgr37sm1ra3wywl5c2a39qbkjwc227yp4j2l930m5j86m5g7rmv8zm944vv5vnyzmwhym972si229fm2lwq74p4xam5rfv948";
     };
 
     patches = nixpkgsPatches ++ [

From 90ab6c8400c5c68e32113441e8dc4166dae50e98 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 4 Sep 2018 01:13:46 +0200
Subject: [PATCH 0269/3253] monero: 0.12.0.0 -> 0.12.3.0

---
 pkgs/applications/altcoins/monero/default.nix | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index cbba1ecba145..a4a884707a98 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchgit
 , cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
@@ -11,25 +11,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.12.0.0";
+  version = "0.12.3.0";
 
-  src = fetchFromGitHub {
-    owner  = "monero-project";
-    repo   = "monero";
+  src = fetchgit {
+    url    = "https://github.com/monero-project/monero.git";
     rev    = "v${version}";
-    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
+    sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
-  patches = [
-    # fix daemon crash, remove with 0.12.1.0 update
-    (fetchpatch {
-      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
-      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
-    })
-  ];
-
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
     "-DReadline_ROOT_DIR=${readline.dev}"
-  ];
+  ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
 
   hardeningDisable = [ "fortify" ];
 

From fd95d306095b664977285078a2169874c4766b1b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 4 Sep 2018 12:11:19 +0200
Subject: [PATCH 0270/3253] monero-gui: 0.12.0.0 -> 0.12.3.0

---
 .../altcoins/monero-gui/default.nix           |  7 ++-
 .../altcoins/monero-gui/move-log-file.patch   | 55 ++++++++-----------
 .../monero-gui/move-translations-dir.patch    | 15 +++--
 3 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 2aff86ae1d38..49b8db51bcc8 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "monero-gui-${version}";
-  version = "0.12.0.0";
+  version = "0.12.3.0";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl";
+    sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
@@ -70,7 +70,8 @@ stdenv.mkDerivation rec {
     cp ${desktopItem}/share/applications/* $out/share/applications
 
     # install translations
-    cp -r release/bin/translations $out/share/
+    mkdir -p $out/share/translations
+    cp translations/*.qm $out/share/translations/
 
     # install icons
     for n in 16 24 32 48 64 96 128 256; do
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
index 08840c6a65e8..74f817d81350 100644
--- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -1,38 +1,27 @@
 diff --git a/main.cpp b/main.cpp
-index c03b160..a8ea263 100644
+index 79223c0..e80b317 100644
 --- a/main.cpp
 +++ b/main.cpp
-@@ -80,14 +80,16 @@ int main(int argc, char *argv[])
- //    qDebug() << "High DPI auto scaling - enabled";
- //#endif
- 
--    // Log settings
--    Monero::Wallet::init(argv[0], "monero-wallet-gui");
--//    qInstallMessageHandler(messageHandler);
--
-     MainApp app(argc, argv);
- 
-     qDebug() << "app startd";
- 
-+    // Log settings
-+    QString logfile =
-+      QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-+      + "/monero-wallet-gui.log";
-+    Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
-+
-     app.setApplicationName("monero-core");
-     app.setOrganizationDomain("getmonero.org");
-     app.setOrganizationName("monero-project");
-diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
-index 74649ce..fe1efc6 100644
---- a/src/libwalletqt/Wallet.cpp
-+++ b/src/libwalletqt/Wallet.cpp
-@@ -729,7 +729,7 @@ QString Wallet::getWalletLogPath() const
- #ifdef Q_OS_MACOS
-     return QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs/" + filename;
- #else
--    return QCoreApplication::applicationDirPath() + "/" + filename;
-+    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + filename;
+@@ -115,6 +115,9 @@ int main(int argc, char *argv[])
+     QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
+         QCoreApplication::translate("main", "Log to specified file"),
+         QCoreApplication::translate("main", "file"));
++    logPathOption.setDefaultValue(
++        QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
++        + "/monero-wallet-gui.log");
+     parser.addOption(logPathOption);
+     parser.addHelpOption();
+     parser.process(app);
+diff --git a/Logger.cpp b/Logger.cpp
+index 660bafc..dae24d4 100644
+--- a/Logger.cpp
++++ b/Logger.cpp
+@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log";
+ #elif defined(Q_OS_MAC)
+     static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs";
+ #else // linux + bsd
+-    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0);
++    static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0);
  #endif
- }
+ 
  
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
index 29bb56301547..ff17ce5da1c0 100644
--- a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
+++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
@@ -1,14 +1,13 @@
 diff --git a/TranslationManager.cpp b/TranslationManager.cpp
-index fa39d35..5a410f7 100644
+index e7fc52a..83534cc 100644
 --- a/TranslationManager.cpp
 +++ b/TranslationManager.cpp
-@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language)
- #ifdef Q_OS_MACX
-     QString dir = qApp->applicationDirPath() + "/../Resources/translations";
- #else
+@@ -25,7 +25,7 @@ bool TranslationManager::setLanguage(const QString &language)
+         return true;
+     }
+ 
 -    QString dir = qApp->applicationDirPath() + "/translations";
 +    QString dir = qApp->applicationDirPath() + "/../share/translations";
- #endif
- 
      QString filename = "monero-core_" + language;
-
+ 
+     qDebug("%s: loading translation file '%s' from '%s'",

From 3bc898035d7e4402ca9257b8e348545868433520 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Tue, 4 Sep 2018 15:55:46 +0200
Subject: [PATCH 0271/3253] gildas: fix makefile rule

---
 .../science/astronomy/gildas/default.nix            |  2 +-
 .../astronomy/gildas/gag-font-bin-rule.patch        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index ee19077065e0..8b01ef0c7713 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
 
-  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
+  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
 
   configurePhase=''
     substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
new file mode 100644
index 000000000000..61ddc37c7fd4
--- /dev/null
+++ b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
@@ -0,0 +1,13 @@
+diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
+--- gildas-src-aug18a/kernel/etc/Makefile	2016-09-09 09:39:37.000000000 +0200
++++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile	2018-09-04 12:03:11.000000000 +0200
+@@ -29,7 +29,8 @@
+ 
+ SEDEXE=sed -e 's?source tree?executable tree?g'
+ 
+-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
++$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
++	$(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
+ ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
+ 	$(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
+ else

From 31919bce6ba59e7fb117b34bd2b1f460ef208053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 4 Sep 2018 14:22:20 +0200
Subject: [PATCH 0272/3253] nix-daemon service: Ensure `ssh` is on PATH. Fixes
 #46038.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes a regression introduced in commit
  700e21d6dac4683ef40f20127a6eb2a74b9bd8c6

nix needs ssh on path for the SSH substituter functionality,
not only the distributed builds functionality.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/modules/services/misc/nix-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index c0eb882c58f3..ec56e75992be 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -400,8 +400,8 @@ in
     systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
     systemd.services.nix-daemon =
-      { path = [ nix pkgs.utillinux ]
-          ++ optionals cfg.distributedBuilds [ config.programs.ssh.package pkgs.gzip ]
+      { path = [ nix pkgs.utillinux config.programs.ssh.package ]
+          ++ optionals cfg.distributedBuilds [ pkgs.gzip ]
           ++ optionals (!isNix20) [ pkgs.openssl.bin ];
 
         environment = cfg.envVars

From d376ceb6ff676edebc6410d7cfc10e30875f50f9 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Tue, 4 Sep 2018 10:44:38 -0400
Subject: [PATCH 0273/3253] all-cabal-hashes: update snapshot to Hackage at
 2018-09-04T11:59:40Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index fce8f44bd3ff..a2d04640d591 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
-  sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz";
+  sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl";
 }

From c19136b1cda1ae95430ae27fceb2223064d7cfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 4 Sep 2018 18:06:47 +0200
Subject: [PATCH 0274/3253] ghostscript: 9.22 -> 9.24 (security)

The $doc stuff needed changes, probably because of ghostscript newly
reacting to some configure flags that stdenv passes.
 - share/ghostscript/9.22/doc was an ugly location for documentation,
   and I didn't like their new share/ghostscript/9.24 either,
   so that got changed to share/doc/ghostscript/9.24
 - their process no longer installs examples, apparently,
   but I don't expect that would be any problem for us
---
 pkgs/misc/ghostscript/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 5839b076c0de..42e5e5c379c8 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,8 +9,9 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
   version = "9.${ver_min}";
-  ver_min = "22";
-  sha256 = "1fyi4yvdj39bjgs10klr31cda1fbx1ar7a7b7yz7v68gykk65y61";
+  ver_min = "24";
+  # ghostscript*.tar.xz in https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9xx/SHA512SUMS
+  sha512 = "dcbeeb5d3dd5ccaf949dc4be68363c50b1d35e647be4790a50b1bbf5f259f1d9181f705be27bfca708c4d270f945ff4b24e3db10b57800c1ee0ea7a40931c547";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${name}.tar.xz";
-    inherit sha256;
+    inherit sha512;
   };
 
   outputs = [ "out" "man" "doc" ];
@@ -89,8 +90,8 @@ stdenv.mkDerivation rec {
 
     cp -r Resource "$out/share/ghostscript/${version}"
 
-    mkdir -p "$doc/share/ghostscript/${version}"
-    mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
+    mkdir -p "$doc/share/doc/ghostscript"
+    mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

From 7cdb44e7936e9bd45a719085c8edaf138bc681db Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Tue, 4 Sep 2018 18:44:01 +0200
Subject: [PATCH 0275/3253] mpv: resorted support options alphabetically

---
 pkgs/applications/video/mpv/default.nix | 134 ++++++++++++------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index c384455d6722..bb96ed372e48 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -3,42 +3,42 @@
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
 
-, x11Support ? stdenv.isLinux,
-    libGLU_combined       ? null,
-    libX11     ? null,
-    libXext    ? null,
-    libXxf86vm ? null,
-    libXrandr  ? null
-
 , waylandSupport ? false
   , wayland           ? null
   , wayland-protocols ? null
   , libxkbcommon      ? null
 
-, rubberbandSupport  ? true,  rubberband    ? null
-, xineramaSupport    ? true,  libXinerama   ? null
-, xvSupport          ? true,  libXv         ? null
-, sdl2Support        ? true,  SDL2          ? null
+, x11Support ? stdenv.isLinux
+  , libGLU_combined ? null
+  , libX11          ? null
+  , libXext         ? null
+  , libXxf86vm      ? null
+  , libXrandr       ? null
+
 , alsaSupport        ? true,  alsaLib       ? null
-, screenSaverSupport ? true,  libXScrnSaver ? null
-, cmsSupport         ? true,  lcms2         ? null
-, vdpauSupport       ? true,  libvdpau      ? null
-, dvdreadSupport     ? true,  libdvdread    ? null
-, dvdnavSupport      ? true,  libdvdnav     ? null
 , bluraySupport      ? true,  libbluray     ? null
-, speexSupport       ? true,  speex         ? null
-, theoraSupport      ? true,  libtheora     ? null
-, pulseSupport       ? true,  libpulseaudio ? null
 , bs2bSupport        ? true,  libbs2b       ? null
 , cacaSupport        ? true,  libcaca       ? null
-, libpngSupport      ? true,  libpng        ? null
-, youtubeSupport     ? true,  youtube-dl    ? null
-, vaapiSupport       ? true,  libva         ? null
+, cmsSupport         ? true,  lcms2         ? null
 , drmSupport         ? true,  libdrm        ? null
-, openalSupport      ? false, openalSoft    ? null
-, vapoursynthSupport ? false, vapoursynth   ? null
+, dvdnavSupport      ? true,  libdvdnav     ? null
+, dvdreadSupport     ? true,  libdvdread    ? null
+, libpngSupport      ? true,  libpng        ? null
+, pulseSupport       ? true,  libpulseaudio ? null
+, rubberbandSupport  ? true,  rubberband    ? null
+, screenSaverSupport ? true,  libXScrnSaver ? null
+, sdl2Support        ? true,  SDL2          ? null
+, speexSupport       ? true,  speex         ? null
+, theoraSupport      ? true,  libtheora     ? null
+, vaapiSupport       ? true,  libva         ? null
+, vdpauSupport       ? true,  libvdpau      ? null
+, xineramaSupport    ? true,  libXinerama   ? null
+, xvSupport          ? true,  libXv         ? null
+, youtubeSupport     ? true,  youtube-dl    ? null
 , archiveSupport     ? false, libarchive    ? null
 , jackaudioSupport   ? false, libjack2      ? null
+, openalSupport      ? false, openalSoft    ? null
+, vapoursynthSupport ? false, vapoursynth   ? null
 }:
 
 with stdenv.lib;
@@ -46,32 +46,32 @@ with stdenv.lib;
 let
   available = x: x != null;
 in
-assert x11Support         -> all available [libGLU_combined libX11 libXext libXxf86vm libXrandr];
-assert waylandSupport     -> all available [wayland wayland-protocols libxkbcommon];
-assert rubberbandSupport  -> available rubberband;
-assert xineramaSupport    -> x11Support && available libXinerama;
-assert xvSupport          -> x11Support && available libXv;
-assert sdl2Support        -> available SDL2;
 assert alsaSupport        -> available alsaLib;
-assert screenSaverSupport -> available libXScrnSaver;
-assert cmsSupport         -> available lcms2;
-assert vdpauSupport       -> available libvdpau;
-assert dvdreadSupport     -> available libdvdread;
-assert dvdnavSupport      -> available libdvdnav;
+assert archiveSupport     -> available libarchive;
 assert bluraySupport      -> available libbluray;
-assert speexSupport       -> available speex;
-assert theoraSupport      -> available libtheora;
-assert openalSupport      -> available openalSoft;
-assert pulseSupport       -> available libpulseaudio;
 assert bs2bSupport        -> available libbs2b;
 assert cacaSupport        -> available libcaca;
-assert libpngSupport      -> available libpng;
-assert youtubeSupport     -> available youtube-dl;
-assert vapoursynthSupport -> available vapoursynth;
-assert jackaudioSupport   -> available libjack2;
-assert archiveSupport     -> available libarchive;
-assert vaapiSupport       -> available libva;
+assert cmsSupport         -> available lcms2;
 assert drmSupport         -> available libdrm;
+assert dvdnavSupport      -> available libdvdnav;
+assert dvdreadSupport     -> available libdvdread;
+assert jackaudioSupport   -> available libjack2;
+assert libpngSupport      -> available libpng;
+assert openalSupport      -> available openalSoft;
+assert pulseSupport       -> available libpulseaudio;
+assert rubberbandSupport  -> available rubberband;
+assert screenSaverSupport -> available libXScrnSaver;
+assert sdl2Support        -> available SDL2;
+assert speexSupport       -> available speex;
+assert theoraSupport      -> available libtheora;
+assert vaapiSupport       -> available libva;
+assert vapoursynthSupport -> available vapoursynth;
+assert vdpauSupport       -> available libvdpau;
+assert waylandSupport     -> all available [ wayland wayland-protocols libxkbcommon ];
+assert x11Support         -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ];
+assert xineramaSupport    -> x11Support && available libXinerama;
+assert xvSupport          -> x11Support && available libXv;
+assert youtubeSupport     -> available youtube-dl;
 
 let
   # Purity: Waf is normally downloaded by bootstrap.py, but
@@ -115,13 +115,13 @@ in stdenv.mkDerivation rec {
     "--disable-static-build"
     "--disable-build-date" # Purity
     "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
-    (enableFeature archiveSupport "libarchive")
-    (enableFeature dvdreadSupport "dvdread")
-    (enableFeature dvdnavSupport "dvdnav")
-    (enableFeature openalSupport "openal")
-    (enableFeature vaapiSupport "vaapi")
-    (enableFeature waylandSupport "wayland")
-    (enableFeature stdenv.isLinux "dvbin")
+    (enableFeature archiveSupport  "libarchive")
+    (enableFeature dvdnavSupport   "dvdnav")
+    (enableFeature dvdreadSupport  "dvdread")
+    (enableFeature openalSupport   "openal")
+    (enableFeature vaapiSupport    "vaapi")
+    (enableFeature waylandSupport  "wayland")
+    (enableFeature stdenv.isLinux  "dvbin")
   ];
 
   configurePhase = ''
@@ -137,32 +137,32 @@ in stdenv.mkDerivation rec {
     ffmpeg_4 freetype libass libpthreadstubs
     lua luasocket libuchardet
   ] ++ optional alsaSupport        alsaLib
-    ++ optional xvSupport          libXv
-    ++ optional theoraSupport      libtheora
-    ++ optional xineramaSupport    libXinerama
-    ++ optional dvdreadSupport     libdvdread
+    ++ optional archiveSupport     libarchive
     ++ optional bluraySupport      libbluray
+    ++ optional bs2bSupport        libbs2b
+    ++ optional cacaSupport        libcaca
+    ++ optional cmsSupport         lcms2
+    ++ optional drmSupport         libdrm
+    ++ optional dvdreadSupport     libdvdread
     ++ optional jackaudioSupport   libjack2
+    ++ optional libpngSupport      libpng
+    ++ optional openalSupport      openalSoft
     ++ optional pulseSupport       libpulseaudio
     ++ optional rubberbandSupport  rubberband
     ++ optional screenSaverSupport libXScrnSaver
-    ++ optional cmsSupport        lcms2
-    ++ optional vdpauSupport       libvdpau
-    ++ optional speexSupport       speex
-    ++ optional bs2bSupport        libbs2b
-    ++ optional openalSupport      openalSoft
-    ++ optional libpngSupport      libpng
-    ++ optional youtubeSupport     youtube-dl
     ++ optional sdl2Support        SDL2
-    ++ optional cacaSupport        libcaca
+    ++ optional speexSupport       speex
+    ++ optional theoraSupport      libtheora
     ++ optional vaapiSupport       libva
-    ++ optional drmSupport         libdrm
     ++ optional vapoursynthSupport vapoursynth
-    ++ optional archiveSupport     libarchive
+    ++ optional vdpauSupport       libvdpau
+    ++ optional xineramaSupport    libXinerama
+    ++ optional xvSupport          libXv
+    ++ optional youtubeSupport     youtube-dl
     ++ optional stdenv.isDarwin    libiconv
     ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
-    ++ optionals x11Support        [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
     ++ optionals waylandSupport    [ wayland wayland-protocols libxkbcommon ]
+    ++ optionals x11Support        [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
     ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
       CoreFoundation Cocoa CoreAudio
     ]);

From 14837a8277e4b751d8a8154b656321e40a5e34d4 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Tue, 4 Sep 2018 18:46:31 +0200
Subject: [PATCH 0276/3253] mpv: add cddaSupport-flag to play Audio CDs

Introduced `cddaSupport` for `mpv` which defaults to false. By enabling
it, `mpv` will be compiled with cdda support (`libcdio{,-paranoia}`) to
play audio CDs.
---
 pkgs/applications/video/mpv/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index bb96ed372e48..9d843a3bfefb 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -15,6 +15,10 @@
   , libXxf86vm      ? null
   , libXrandr       ? null
 
+, cddaSupport ? false
+  , libcdio          ? null
+  , libcdio-paranoia ? null
+
 , alsaSupport        ? true,  alsaLib       ? null
 , bluraySupport      ? true,  libbluray     ? null
 , bs2bSupport        ? true,  libbs2b       ? null
@@ -51,6 +55,7 @@ assert archiveSupport     -> available libarchive;
 assert bluraySupport      -> available libbluray;
 assert bs2bSupport        -> available libbs2b;
 assert cacaSupport        -> available libcaca;
+assert cddaSupport        -> all available [libcdio libcdio-paranoia];
 assert cmsSupport         -> available lcms2;
 assert drmSupport         -> available libdrm;
 assert dvdnavSupport      -> available libdvdnav;
@@ -116,6 +121,7 @@ in stdenv.mkDerivation rec {
     "--disable-build-date" # Purity
     "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
     (enableFeature archiveSupport  "libarchive")
+    (enableFeature cddaSupport     "cdda")
     (enableFeature dvdnavSupport   "dvdnav")
     (enableFeature dvdreadSupport  "dvdread")
     (enableFeature openalSupport   "openal")
@@ -160,6 +166,7 @@ in stdenv.mkDerivation rec {
     ++ optional xvSupport          libXv
     ++ optional youtubeSupport     youtube-dl
     ++ optional stdenv.isDarwin    libiconv
+    ++ optionals cddaSupport       [ libcdio libcdio-paranoia ]
     ++ optionals dvdnavSupport     [ libdvdnav libdvdnav.libdvdread ]
     ++ optionals waylandSupport    [ wayland wayland-protocols libxkbcommon ]
     ++ optionals x11Support        [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]

From a3f6a4b9b6c7fe800af23b2744000c7d5b3a5d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 4 Sep 2018 18:50:15 +0200
Subject: [PATCH 0277/3253] ghostscript: fix nitpicks after the update

- unused lcms2 input
- reference $out -> $doc
---
 pkgs/misc/ghostscript/default.nix     | 14 ++++++++------
 pkgs/misc/ghostscript/doc-no-ref.diff |  7 +++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/misc/ghostscript/doc-no-ref.diff

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 42e5e5c379c8..54ad32622756 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
-, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
+, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
 , libiconv, ijs
 , x11Support ? false, xlibsWrapper ? null
 , cupsSupport ? false, cups ? null
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     inherit sha512;
   };
 
+  patches = [
+    ./urw-font-files.patch
+    ./doc-no-ref.diff
+  ];
+
   outputs = [ "out" "man" "doc" ];
 
   enableParallelBuilding = true;
@@ -50,16 +55,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoconf ];
   buildInputs =
     [ zlib expat openssl
-      libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
+      libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
       libiconv ijs
     ]
     ++ lib.optional x11Support xlibsWrapper
     ++ lib.optional cupsSupport cups
     ;
-
-  patches = [
-    ./urw-font-files.patch
-  ];
+  # No lcms2; upstream "is in process of forking it" and thus won't use one from a library.
 
   preConfigure = ''
     # requires in-tree (heavily patched) openjpeg
diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/misc/ghostscript/doc-no-ref.diff
new file mode 100644
index 000000000000..7380ba2f9953
--- /dev/null
+++ b/pkgs/misc/ghostscript/doc-no-ref.diff
@@ -0,0 +1,7 @@
+Kill the reference from libgc.so to the documentation directory.
+It's bad for closure, and probably not really good for anything.
+--- a/base/gs.mak
++++ b/base/gs.mak
+@@ -538,1 +538,1 @@
+-	$(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 $(GS_DOCDIR) -x 22
++	$(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 /no-path-to-docs -x 22

From 72cf7f513d1aedf1248933938c66ded4fc2d720d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 3 Sep 2018 15:07:20 -0500
Subject: [PATCH 0278/3253] libreoffice-{fresh,still}: upgrade and clean

* libreoffice-still: -> 6.0.6.2
  * (newer than our current 'fresh!')
* libreoffice-fresh: -> 6.1.0.3
  * 6.1.1(.1) is currently pre-release, FWIW
* Use normal gcc, not gcc5
  * dropping 'glibc' from buildInputs fixed this (?)
* remove many fixes/touchups/workarounds/hacks
  * hopefully everything still works for everyone
* disable online update since that seems unlikely to work anyway
* fix autogen/configure invocations
* disable libnumbertext in 6.1.x since not packaged
* drop 'touch solenv/inc/target.mk' as unclear what it was for
  and doesn't seem to be currently needed
* cleanup link gen a bit[1]
* split checks to check phase

[1]
primary motivation was to stop creating links like:

'libreoffice-6.0.5.2/src/-libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'
'libreoffice-6.0.5.2/src/libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'

This is mostly accomplished by simply using the 'md5name' field
which the python script kindly generates for us
(including the use of non-md5 if md5 is not set or empty).
---
 .../libreoffice/default-primary-src.nix       |   8 +-
 .../office/libreoffice/default.nix            | 159 +++---
 .../libreoffice/libreoffice-srcs-still.nix    | 452 ++++++++++--------
 .../office/libreoffice/libreoffice-srcs.nix   | 173 ++++---
 .../office/libreoffice/still-primary-src.nix  |   8 +-
 .../applications/office/libreoffice/still.nix | 172 +++----
 pkgs/top-level/all-packages.nix               |   7 +-
 7 files changed, 531 insertions(+), 448 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 87fe343613e5..446efe78d256 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -2,9 +2,9 @@
 
 rec {
   major = "6";
-  minor = "0";
-  patch = "5";
-  tweak = "2";
+  minor = "1";
+  patch = "0";
+  tweak = "3";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn";
+    sha256 = "54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 22c044d199a3..2de1ed92dea8 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
 , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, bluez5, libtool, carlito
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@@ -34,22 +34,28 @@ let
   };
 
   srcs = {
-    third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
-        url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
-        sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
-        name = "unowinreg.dll";
-      }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix));
+    third_party =
+      map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
+      ((import ./libreoffice-srcs.nix) ++ [
+        (rec {
+          name = "unowinreg.dll";
+          url = "https://dev-www.libreoffice.org/extern/${md5name}";
+          sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
+          md5 = "185d60944ea767075d27247c3162b3bc";
+          md5name = "${md5}-${name}";
+        })
+      ]);
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr";
+      sha256 = "140i0q6nyi2l6nv2b3n7s7mggm2rb1ws3h9awa9y6m2iads54qm7";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9";
+      sha256 = "0ayssl5ivhyzxi3gz3h4yhp8hq7ihig6n6iijbks5f1sm7dwridv";
     };
 
   };
@@ -58,26 +64,18 @@ in stdenv.mkDerivation rec {
 
   inherit (primary-src) src;
 
-  # Openoffice will open libcups dynamically, so we link it directly
-  # to make its dlopen work.
-  # It also seems not to mention libdl explicitly in some places.
-  NIX_LDFLAGS = "-lcups -ldl";
-
   # For some reason librdf_redland sometimes refers to rasqal.h instead
   # of rasqal/rasqal.h
-  # And LO refers to gpgme++ by no-path name
-  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
-
-  # If we call 'configure', 'make' will then call configure again without parameters.
-  # It's their system.
-  configureScript = "./autogen.sh";
-  dontUseCmakeConfigure = true;
+  NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
 
   patches = [ ./xdg-open-brief.patch ];
 
   postUnpack = ''
     mkdir -v $sourceRoot/src
-  '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+  '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
+      ln -sfv ${f} $sourceRoot/src/${f.md5name}
+      ln -sfv ${f} $sourceRoot/src/${f.name}
+    ''))
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
     ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
@@ -85,14 +83,20 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
+
+    # configure checks for header 'gpgme++/gpgmepp_version.h',
+    # and if it is found (no matter where) uses a hardcoded path
+    # in what presumably is an effort to make it possible to write
+    # '#include <context.h>' instead of '#include <gpgmepp/context.h>'.
+    #
+    # Fix this path to point to where the headers can actually be found instead.
+    substituteInPlace configure.ac --replace \
+      'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
+      'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
   '';
 
   QT4DIR = qt4;
 
-  # Fix boost 1.59 compat
-  # Try removing in the next version
-  CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
-
   preConfigure = ''
     configureFlagsArray=(
       "--with-parallelism=$NIX_BUILD_CORES"
@@ -101,69 +105,72 @@ in stdenv.mkDerivation rec {
 
     chmod a+x ./bin/unpack-sources
     patchShebangs .
-    # It is used only as an indicator of the proper current directory
-    touch solenv/inc/target.mk
-
-    # BLFS patch for Glibc 2.23 renaming isnan
-    sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
 
     # This is required as some cppunittests require fontconfig configured
     cp "${fontsConf}" fonts.conf
     sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf
     export FONTCONFIG_FILE="$PWD/fonts.conf"
+
+    NOCONFIGURE=1 ./autogen.sh
   '';
 
-  # fetch_Download_item tries to interpret the name as a variable name
-  # Let it do so…
-  postConfigure = ''
-    sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
-    sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+  postConfigure =
+    # fetch_Download_item tries to interpret the name as a variable name, let it do so...
+    ''
+      sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
+      sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+    ''
+    # Test fixups
+    # May need to be revisited/pruned, left alone for now.
+    + ''
+      # unit test sd_tiledrendering seems to be fragile
+      # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+      echo > ./sd/CppunitTest_sd_tiledrendering.mk
+      sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+      # one more fragile test?
+      sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # this I actually hate, this should be a data consistency test!
+      sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # rendering-dependent test
+      sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+      # tilde expansion in path processing checks the existence of $HOME
+      sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+      # rendering-dependent: on my computer the test table actually doesn't fit…
+      # interesting fact: test disabled on macOS by upstream
+      sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+      # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
+      sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
+      # one more fragile test?
+      sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # rendering-dependent tests
+      sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+      sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+      sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+      sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+      sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+      sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
+      # not sure about this fragile test
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+    ''
+    # This to avoid using /lib:/usr/lib at linking
+    + ''
+    sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
 
-    # unit test sd_tiledrendering seems to be fragile
-    # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
-    echo > ./sd/CppunitTest_sd_tiledrendering.mk
-    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
-    # one more fragile test?
-    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
-    # this I actually hate, this should be a data consistency test!
-    sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
-    # rendering-dependent test
-    sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
-    # tilde expansion in path processing checks the existence of $HOME
-    sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
-    # rendering-dependent: on my computer the test table actually doesn't fit…
-    # interesting fact: test disabled on macOS by upstream
-    sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
-    # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
-    sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
-    # one more fragile test?
-    sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
-    # rendering-dependent tests
-    sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
-    sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
-    sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
-    sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
-    sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
-    sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
-    # not sure about this fragile test
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-  '';
+    find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
+    '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
 
   enableParallelBuilding = true;
 
   buildPhase = ''
-    # This to avoid using /lib:/usr/lib at linking
-    sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
-
-    find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
-
-    make
+    make build-nocheck
   '';
 
+  doCheck = true;
+
   # It installs only things to $out/lib/libreoffice
   postInstall = ''
     mkdir -p $out/bin $out/share/desktop
@@ -195,11 +202,11 @@ in stdenv.mkDerivation rec {
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
     "--disable-report-builder"
+    "--disable-online-update"
     "--enable-python=system"
     "--enable-dbus"
     "--enable-release-build"
     (lib.enableFeature kdeIntegration "kde4")
-    "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
     "--with-ant-home=${ant}/lib/ant"
@@ -213,9 +220,13 @@ in stdenv.mkDerivation rec {
     "--with-system-openldap"
     "--with-system-coinmp"
 
+    "--with-alloc=system"
+
     # Without these, configure does not finish
     "--without-junit"
 
+    "--disable-libnumbertext" # system-libnumbertext"
+
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
     "--disable-odk"
@@ -260,7 +271,7 @@ in stdenv.mkDerivation rec {
       gst_all_1.gst-plugins-base glib
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
-      mdds bluez5 glibc libcmis libwps libabw libzmf libtool
+      mdds bluez5 libcmis libwps libabw libzmf libtool
       libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
       librevenge libe-book libmwaw glm glew ncurses epoxy
       libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 36500166dccf..94e2564d1133 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -1,10 +1,10 @@
 [
   {
-    name = "libabw-0.1.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2";
-    sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199";
+    name = "libabw-0.1.2.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
+    sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
     md5 = "";
-    md5name = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199-libabw-0.1.1.tar.bz2";
+    md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
   }
   {
     name = "commons-logging-1.2-src.tar.gz";
@@ -28,11 +28,11 @@
     md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
   }
   {
-    name = "boost_1_63_0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2";
-    sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+    name = "boost_1_65_1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
+    sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
     md5 = "";
-    md5name = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0-boost_1_63_0.tar.bz2";
+    md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
   }
   {
     name = "breakpad.zip";
@@ -56,18 +56,18 @@
     md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
   }
   {
-    name = "cairo-1.14.8.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz";
-    sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20";
+    name = "cairo-1.14.10.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz";
+    sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09";
     md5 = "";
-    md5name = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20-cairo-1.14.8.tar.xz";
+    md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz";
   }
   {
-    name = "libcdr-0.1.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";
-    sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d";
+    name = "libcdr-0.1.4.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";
+    sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d";
     md5 = "";
-    md5name = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d-libcdr-0.1.3.tar.bz2";
+    md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz";
   }
   {
     name = "clucene-core-2.3.3.4.tar.gz";
@@ -90,13 +90,6 @@
     md5 = "";
     md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz";
   }
-  {
-    name = "collada2gltf-master-cb1d97788a.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
-    sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb";
-    md5 = "4b87018f7fff1d054939d19920b751a0";
-    md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2";
-  }
   {
     name = "cppunit-1.14.0.tar.gz";
     url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";
@@ -112,18 +105,18 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.52.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
-    sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+    name = "curl-7.60.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
+    sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
     md5 = "";
-    md5name = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae-curl-7.52.1.tar.gz";
+    md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
   }
   {
-    name = "libe-book-0.1.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2";
-    sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850";
+    name = "libe-book-0.1.3.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz";
+    sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9";
     md5 = "";
-    md5name = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850-libe-book-0.1.2.tar.bz2";
+    md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz";
   }
   {
     name = "libepoxy-1.3.1.tar.bz2";
@@ -140,18 +133,25 @@
     md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
   }
   {
-    name = "libetonyek-0.1.6.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2";
-    sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78";
+    name = "libepubgen-0.1.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
+    sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
     md5 = "";
-    md5name = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78-libetonyek-0.1.6.tar.bz2";
+    md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
   }
   {
-    name = "expat-2.2.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2";
-    sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f";
+    name = "libetonyek-0.1.7.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
+    sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
     md5 = "";
-    md5name = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f-expat-2.2.3.tar.bz2";
+    md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
+  }
+  {
+    name = "expat-2.2.5.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
+    sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
+    md5 = "";
+    md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
   }
   {
     name = "Firebird-3.0.0.32483-0.tar.bz2";
@@ -161,11 +161,11 @@
     md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2";
   }
   {
-    name = "fontconfig-2.12.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2";
-    sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3";
+    name = "fontconfig-2.12.6.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2";
+    sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017";
     md5 = "";
-    md5name = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3-fontconfig-2.12.1.tar.bz2";
+    md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2";
   }
   {
     name = "crosextrafonts-20130214.tar.gz";
@@ -216,20 +216,6 @@
     md5 = "e7a384790b13c29113e22e596ade9687";
     md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";
   }
-  {
-    name = "open-sans-font-ttf-1.10.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
-    sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8";
-    md5 = "7a15edea7d415ac5150ea403e27401fd";
-    md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz";
-  }
-  {
-    name = "pt-serif-font-1.0000W.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
-    sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa";
-    md5 = "c3c1a8ba7452950636e871d25020ce0d";
-    md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz";
-  }
   {
     name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz";
     url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz";
@@ -252,18 +238,74 @@
     md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz";
   }
   {
-    name = "libfreehand-0.1.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";
-    sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877";
+    name = "noto-fonts-20171024.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz";
+    sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994";
     md5 = "";
-    md5name = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877-libfreehand-0.1.1.tar.bz2";
+    md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz";
   }
   {
-    name = "freetype-2.7.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2";
-    sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88";
+    name = "culmus-0.131.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz";
+    sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b";
     md5 = "";
-    md5name = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88-freetype-2.7.1.tar.bz2";
+    md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz";
+  }
+  {
+    name = "libre-hebrew-1.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz";
+    sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a";
+    md5 = "";
+    md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz";
+  }
+  {
+    name = "alef-1.001.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz";
+    sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52";
+    md5 = "";
+    md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
+  }
+  {
+    name = "amiri-0.109.zip";
+    url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
+    sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+    md5 = "";
+    md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+  }
+  {
+    name = "ttf-kacst_2.01+mry.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz";
+    sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56";
+    md5 = "";
+    md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
+  }
+  {
+    name = "ReemKufi-0.6.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
+    sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+    md5 = "";
+    md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+  }
+  {
+    name = "Scheherazade-2.100.zip";
+    url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip";
+    sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5";
+    md5 = "";
+    md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
+  }
+  {
+    name = "libfreehand-0.1.2.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
+    sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac";
+    md5 = "";
+    md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
+  }
+  {
+    name = "freetype-2.8.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
+    sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
+    md5 = "";
+    md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
   }
   {
     name = "glm-0.9.4.6-libreoffice.zip";
@@ -273,11 +315,11 @@
     md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip";
   }
   {
-    name = "gpgme-1.8.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2";
-    sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33";
+    name = "gpgme-1.9.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
+    sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
     md5 = "";
-    md5name = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33-gpgme-1.8.0.tar.bz2";
+    md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
   }
   {
     name = "graphite2-minimal-1.3.10.tgz";
@@ -287,11 +329,11 @@
     md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
   }
   {
-    name = "harfbuzz-1.4.8.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.4.8.tar.bz2";
-    sha256 = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131";
+    name = "harfbuzz-1.7.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
+    sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
     md5 = "";
-    md5name = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131-harfbuzz-1.4.8.tar.bz2";
+    md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -301,11 +343,11 @@
     md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
   }
   {
-    name = "hunspell-1.6.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
-    sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
-    md5 = "047c3feb121261b76dc16cdb62f54483";
-    md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+    name = "hunspell-1.6.2.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz";
+    sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4";
+    md5 = "";
+    md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz";
   }
   {
     name = "hyphen-2.8.8.tar.gz";
@@ -315,11 +357,18 @@
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
-    name = "icu4c-58_1-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
-    sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309";
-    md5 = "1901302aaff1c1633ef81862663d2917";
-    md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz";
+    name = "icu4c-60_2-src.tgz";
+    url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
+    sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+    md5 = "";
+    md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+  }
+  {
+    name = "icu4c-60_2-data.zip";
+    url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
+    sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+    md5 = "";
+    md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -399,18 +448,18 @@
     md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
   }
   {
-    name = "libjpeg-turbo-1.5.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz";
-    sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c";
+    name = "libjpeg-turbo-1.5.2.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz";
+    sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528";
     md5 = "";
-    md5name = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c-libjpeg-turbo-1.5.1.tar.gz";
+    md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
   }
   {
-    name = "language-subtag-registry-2017-12-14.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2";
-    sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362";
+    name = "language-subtag-registry-2018-03-30.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
+    sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
     md5 = "";
-    md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2";
+    md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -448,25 +497,18 @@
     md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2";
   }
   {
-    name = "libexttextcat-3.4.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
-    sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163";
-    md5 = "10d61fbaa6a06348823651b1bd7940fe";
-    md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2";
+    name = "libexttextcat-3.4.5.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz";
+    sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8";
+    md5 = "";
+    md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
   }
   {
-    name = "libgltf-0.1.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";
-    sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da";
+    name = "libgpg-error-1.27.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
+    sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
     md5 = "";
-    md5name = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da-libgltf-0.1.0.tar.gz";
-  }
-  {
-    name = "libgpg-error-1.26.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2";
-    sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69";
-    md5 = "";
-    md5name = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69-libgpg-error-1.26.tar.bz2";
+    md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
   }
   {
     name = "liblangtag-0.6.2.tar.bz2";
@@ -483,25 +525,25 @@
     md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
   }
   {
-    name = "xmlsec1-1.2.24.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz";
-    sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc";
+    name = "xmlsec1-1.2.25.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz";
+    sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2";
     md5 = "";
-    md5name = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc-xmlsec1-1.2.24.tar.gz";
+    md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
   }
   {
-    name = "libxml2-2.9.4.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
-    sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c";
-    md5 = "ae249165c173b1ff386ee8ad676815f5";
-    md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz";
+    name = "libxml2-2.9.8.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz";
+    sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732";
+    md5 = "";
+    md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz";
   }
   {
-    name = "libxslt-1.1.29.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
-    sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce";
-    md5 = "a129d3c44c022de3b9dcf6d6f288d72e";
-    md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz";
+    name = "libxslt-1.1.32.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz";
+    sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460";
+    md5 = "";
+    md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz";
   }
   {
     name = "lp_solve_5.5.tar.gz";
@@ -518,11 +560,11 @@
     md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
   }
   {
-    name = "mdds-1.2.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2";
-    sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d";
+    name = "mdds-1.3.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2";
+    sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1";
     md5 = "";
-    md5name = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d-mdds-1.2.2.tar.bz2";
+    md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2";
   }
   {
     name = "mDNSResponder-576.30.4.tar.gz";
@@ -532,18 +574,18 @@
     md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
   }
   {
-    name = "libmspub-0.1.2.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2";
-    sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a";
+    name = "libmspub-0.1.3.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
+    sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
     md5 = "";
-    md5name = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a-libmspub-0.1.2.tar.bz2";
+    md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
   }
   {
-    name = "libmwaw-0.3.11.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz";
-    sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a";
+    name = "libmwaw-0.3.13.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
+    sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
     md5 = "";
-    md5name = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a-libmwaw-0.3.11.tar.xz";
+    md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
   }
   {
     name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -560,18 +602,18 @@
     md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
   }
   {
-    name = "neon-0.30.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
-    sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd";
-    md5 = "231adebe5c2f78fded3e3df6e958878e";
-    md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz";
+    name = "neon-0.30.2.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
+    sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
+    md5 = "";
+    md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
   }
   {
-    name = "nss-3.29.5-with-nspr-4.13.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz";
-    sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4";
+    name = "nss-3.33-with-nspr-4.17.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz";
+    sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4";
     md5 = "";
-    md5name = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4-nss-3.29.5-with-nspr-4.13.1.tar.gz";
+    md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";
@@ -595,32 +637,25 @@
     md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
   }
   {
-    name = "OpenCOLLADA-master-6509aa13af.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2";
-    sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4";
+    name = "openldap-2.4.45.tgz";
+    url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
+    sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
     md5 = "";
-    md5name = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4-OpenCOLLADA-master-6509aa13af.tar.bz2";
+    md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
-    name = "openldap-2.4.44.tgz";
-    url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz";
-    sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400";
+    name = "openssl-1.0.2m.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
+    sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
     md5 = "";
-    md5name = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400-openldap-2.4.44.tgz";
+    md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
   }
   {
-    name = "openssl-1.0.2k.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz";
-    sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0";
+    name = "liborcus-0.13.3.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
+    sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
     md5 = "";
-    md5name = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0-openssl-1.0.2k.tar.gz";
-  }
-  {
-    name = "liborcus-0.12.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz";
-    sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908";
-    md5 = "";
-    md5name = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908-liborcus-0.12.1.tar.gz";
+    md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -630,18 +665,18 @@
     md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
   }
   {
-    name = "libpagemaker-0.0.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2";
-    sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33";
+    name = "libpagemaker-0.0.4.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz";
+    sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d";
     md5 = "";
-    md5name = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33-libpagemaker-0.0.3.tar.bz2";
+    md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
-    name = "pdfium-3064.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2";
-    sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883";
+    name = "pdfium-3235.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
+    sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
     md5 = "";
-    md5name = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883-pdfium-3064.tar.bz2";
+    md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
   }
   {
     name = "pixman-0.34.0.tar.gz";
@@ -651,18 +686,18 @@
     md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz";
   }
   {
-    name = "libpng-1.6.28.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz";
-    sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2";
+    name = "libpng-1.6.34.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz";
+    sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6";
     md5 = "";
-    md5name = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2-libpng-1.6.28.tar.gz";
+    md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
   }
   {
-    name = "poppler-0.56.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz";
-    sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173";
+    name = "poppler-0.66.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";
+    sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7";
     md5 = "";
-    md5name = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173-poppler-0.56.0.tar.xz";
+    md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz";
   }
   {
     name = "postgresql-9.2.1.tar.bz2";
@@ -672,11 +707,18 @@
     md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";
   }
   {
-    name = "Python-3.5.4.tgz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
-    sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
+    name = "Python-3.5.5.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz";
+    sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009";
     md5 = "";
-    md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+    md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz";
+  }
+  {
+    name = "libqxp-0.0.1.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz";
+    sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73";
+    md5 = "";
+    md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz";
   }
   {
     name = "raptor2-2.0.15.tar.gz";
@@ -721,11 +763,11 @@
     md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
   }
   {
-    name = "libstaroffice-0.0.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz";
-    sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6";
+    name = "libstaroffice-0.0.5.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
+    sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
     md5 = "";
-    md5name = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6-libstaroffice-0.0.3.tar.xz";
+    md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
   }
   {
     name = "swingExSrc.zip";
@@ -742,32 +784,32 @@
     md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
   }
   {
-    name = "libvisio-0.1.5.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2";
-    sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e";
+    name = "libvisio-0.1.6.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
+    sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
     md5 = "";
-    md5name = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e-libvisio-0.1.5.tar.bz2";
+    md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
   }
   {
-    name = "libwpd-0.10.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";
-    sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d";
+    name = "libwpd-0.10.2.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz";
+    sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610";
     md5 = "";
-    md5name = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d-libwpd-0.10.1.tar.bz2";
+    md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz";
   }
   {
-    name = "libwpg-0.3.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2";
-    sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59";
+    name = "libwpg-0.3.2.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";
+    sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33";
     md5 = "";
-    md5name = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59-libwpg-0.3.1.tar.bz2";
+    md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
   }
   {
-    name = "libwps-0.4.6.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz";
-    sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0";
+    name = "libwps-0.4.8.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
+    sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
     md5 = "";
-    md5name = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0-libwps-0.4.6.tar.xz";
+    md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
   }
   {
     name = "xsltml_2.1.2.zip";
@@ -784,10 +826,10 @@
     md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz";
   }
   {
-    name = "libzmf-0.0.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";
-    sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b";
+    name = "libzmf-0.0.2.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";
+    sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22";
     md5 = "";
-    md5name = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b-libzmf-0.0.1.tar.bz2";
+    md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
   }
 ]
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 66d1baed2dae..57495404eb97 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -28,11 +28,11 @@
     md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
   }
   {
-    name = "boost_1_65_1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2";
-    sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
+    name = "boost_1_66_0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2";
+    sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
     md5 = "";
-    md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2";
+    md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2";
   }
   {
     name = "breakpad.zip";
@@ -133,18 +133,18 @@
     md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz";
   }
   {
-    name = "libepubgen-0.1.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2";
-    sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633";
+    name = "libepubgen-0.1.1.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz";
+    sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad";
     md5 = "";
-    md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2";
+    md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz";
   }
   {
-    name = "libetonyek-0.1.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz";
-    sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac";
+    name = "libetonyek-0.1.8.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz";
+    sha256 = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d";
     md5 = "";
-    md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz";
+    md5name = "9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d-libetonyek-0.1.8.tar.xz";
   }
   {
     name = "expat-2.2.5.tar.bz2";
@@ -266,11 +266,11 @@
     md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz";
   }
   {
-    name = "amiri-0.109.zip";
-    url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip";
-    sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6";
+    name = "Amiri-0.111.zip";
+    url = "http://dev-www.libreoffice.org/src/Amiri-0.111.zip";
+    sha256 = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166";
     md5 = "";
-    md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip";
+    md5name = "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166-Amiri-0.111.zip";
   }
   {
     name = "ttf-kacst_2.01+mry.tar.gz";
@@ -280,11 +280,11 @@
     md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz";
   }
   {
-    name = "ReemKufi-0.6.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz";
-    sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b";
+    name = "ReemKufi-0.7.zip";
+    url = "http://dev-www.libreoffice.org/src/ReemKufi-0.7.zip";
+    sha256 = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f";
     md5 = "";
-    md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz";
+    md5name = "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f-ReemKufi-0.7.zip";
   }
   {
     name = "Scheherazade-2.100.zip";
@@ -329,11 +329,11 @@
     md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
   }
   {
-    name = "harfbuzz-1.7.0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2";
-    sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029";
+    name = "harfbuzz-1.7.4.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2";
+    sha256 = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b";
     md5 = "";
-    md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2";
+    md5name = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b-harfbuzz-1.7.4.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -357,18 +357,18 @@
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
-    name = "icu4c-60_2-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz";
-    sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418";
+    name = "icu4c-61_1-src.tgz";
+    url = "http://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz";
+    sha256 = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef";
     md5 = "";
-    md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz";
+    md5name = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef-icu4c-61_1-src.tgz";
   }
   {
-    name = "icu4c-60_2-data.zip";
-    url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip";
-    sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9";
+    name = "icu4c-61_1-data.zip";
+    url = "http://dev-www.libreoffice.org/src/icu4c-61_1-data.zip";
+    sha256 = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a";
     md5 = "";
-    md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip";
+    md5name = "d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a-icu4c-61_1-data.zip";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -455,11 +455,11 @@
     md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz";
   }
   {
-    name = "language-subtag-registry-2018-03-30.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";
-    sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854";
+    name = "language-subtag-registry-2018-04-23.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2";
+    sha256 = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878";
     md5 = "";
-    md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2";
+    md5name = "14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878-language-subtag-registry-2018-04-23.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -476,11 +476,11 @@
     md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz";
   }
   {
-    name = "libassuan-2.4.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2";
-    sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71";
+    name = "libassuan-2.5.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
+    sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";
     md5 = "";
-    md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2";
+    md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";
   }
   {
     name = "libatomic_ops-7_2d.zip";
@@ -517,6 +517,13 @@
     md5 = "";
     md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2";
   }
+  {
+    name = "libnumbertext-1.0.4.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz";
+    sha256 = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b";
+    md5 = "";
+    md5name = "349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b-libnumbertext-1.0.4.tar.xz";
+  }
   {
     name = "ltm-1.0.zip";
     url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip";
@@ -552,6 +559,13 @@
     md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
     md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
   }
+  {
+    name = "lxml-4.1.1.tgz";
+    url = "http://dev-www.libreoffice.org/src/lxml-4.1.1.tgz";
+    sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e";
+    md5 = "";
+    md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz";
+  }
   {
     name = "mariadb_client-2.0.0-src.tar.gz";
     url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
@@ -574,18 +588,18 @@
     md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz";
   }
   {
-    name = "libmspub-0.1.3.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz";
-    sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97";
+    name = "libmspub-0.1.4.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";
+    sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba";
     md5 = "";
-    md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz";
+    md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
   }
   {
-    name = "libmwaw-0.3.13.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz";
-    sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea";
+    name = "libmwaw-0.3.14.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz";
+    sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9";
     md5 = "";
-    md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz";
+    md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz";
   }
   {
     name = "mysql-connector-c++-1.1.4.tar.gz";
@@ -644,18 +658,18 @@
     md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
-    name = "openssl-1.0.2m.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz";
-    sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f";
+    name = "openssl-1.0.2o.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz";
+    sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d";
     md5 = "";
-    md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
+    md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz";
   }
   {
-    name = "liborcus-0.13.3.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
-    sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
+    name = "liborcus-0.13.4.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz";
+    sha256 = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b";
     md5 = "";
-    md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
+    md5name = "bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b-liborcus-0.13.4.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -672,11 +686,11 @@
     md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
-    name = "pdfium-3235.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2";
-    sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f";
+    name = "pdfium-3426.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2";
+    sha256 = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957";
     md5 = "";
-    md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2";
+    md5name = "80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957-pdfium-3426.tar.bz2";
   }
   {
     name = "pixman-0.34.0.tar.gz";
@@ -693,11 +707,11 @@
     md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz";
   }
   {
-    name = "poppler-0.59.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";
-    sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641";
+    name = "poppler-0.66.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";
+    sha256 = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7";
     md5 = "";
-    md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz";
+    md5name = "2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7-poppler-0.66.0.tar.xz";
   }
   {
     name = "postgresql-9.2.1.tar.bz2";
@@ -707,11 +721,11 @@
     md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";
   }
   {
-    name = "Python-3.5.4.tgz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz";
-    sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44";
+    name = "Python-3.5.5.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz";
+    sha256 = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009";
     md5 = "";
-    md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz";
+    md5name = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009-Python-3.5.5.tar.xz";
   }
   {
     name = "libqxp-0.0.1.tar.xz";
@@ -763,11 +777,11 @@
     md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
   }
   {
-    name = "libstaroffice-0.0.5.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz";
-    sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982";
+    name = "libstaroffice-0.0.6.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz";
+    sha256 = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4";
     md5 = "";
-    md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz";
+    md5name = "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4-libstaroffice-0.0.6.tar.xz";
   }
   {
     name = "swingExSrc.zip";
@@ -776,6 +790,13 @@
     md5 = "35c94d2df8893241173de1d16b6034c0";
     md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip";
   }
+  {
+    name = "twaindsm_2.4.1.orig.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz";
+    sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6";
+    md5 = "";
+    md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz";
+  }
   {
     name = "ucpp-1.3.2.tar.gz";
     url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
@@ -805,11 +826,11 @@
     md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz";
   }
   {
-    name = "libwps-0.4.8.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz";
-    sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e";
+    name = "libwps-0.4.9.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz";
+    sha256 = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922";
     md5 = "";
-    md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz";
+    md5name = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922-libwps-0.4.9.tar.xz";
   }
   {
     name = "xsltml_2.1.2.zip";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 22216af3723c..6719b953ad16 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -1,9 +1,9 @@
 { fetchurl }:
 
 rec {
-  major = "5";
-  minor = "4";
-  patch = "7";
+  major = "6";
+  minor = "0";
+  patch = "6";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv";
+    sha256 = "f1666430abf616a3813e4c886b51f157366f592102ae0e874abc17f3d58c6a8e";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 1808eec8c2b1..aff0817a865e 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
+{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
 , IOCompress, zlib, libjpeg, expat, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, cups, xorg, libcmis, carlito
-, openssl, gperf, cppunit, GConf, ORBit2, poppler
+, icu, boost, jdk, ant, cups, xorg, libcmis
+, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
 , librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, bluez5, libtool
+, fontsConf, pkgconfig, bluez5, libtool, carlito
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
@@ -34,22 +34,28 @@ let
   };
 
   srcs = {
-    third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec {
-        url = "https://dev-www.libreoffice.org/extern/${md5}-${name}";
-        sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
-        name = "unowinreg.dll";
-      }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix));
+    third_party =
+      map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
+      ((import ./libreoffice-srcs-still.nix) ++ [
+        (rec {
+          name = "unowinreg.dll";
+          url = "https://dev-www.libreoffice.org/extern/${md5name}";
+          sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
+          md5 = "185d60944ea767075d27247c3162b3bc";
+          md5name = "${md5}-${name}";
+        })
+      ]);
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk";
+      sha256 = "0hi7m5y9gxwqn5i2nsyqyz1vdiz2bxn26sd3i0958ghhwv3zqmdb";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl";
+      sha256 = "0pp8xs3mqna6fh1jd4h1xjyr4v0fsrik10rri5if5n3z1vfg0jby";
     };
 
   };
@@ -58,26 +64,18 @@ in stdenv.mkDerivation rec {
 
   inherit (primary-src) src;
 
-  # Openoffice will open libcups dynamically, so we link it directly
-  # to make its dlopen work.
-  # It also seems not to mention libdl explicitly in some places.
-  NIX_LDFLAGS = "-lcups -ldl";
-
   # For some reason librdf_redland sometimes refers to rasqal.h instead
   # of rasqal/rasqal.h
-  # And LO refers to gpgme++ by no-path name
-  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal -I${gpgme.dev}/include/gpgme++";
-
-  # If we call 'configure', 'make' will then call configure again without parameters.
-  # It's their system.
-  configureScript = "./autogen.sh";
-  dontUseCmakeConfigure = true;
+  NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
 
   patches = [ ./xdg-open-brief.patch ];
 
   postUnpack = ''
     mkdir -v $sourceRoot/src
-  '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+  '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
+      ln -sfv ${f} $sourceRoot/src/${f.md5name}
+      ln -sfv ${f} $sourceRoot/src/${f.name}
+    ''))
   + ''
     ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
     ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}
@@ -85,14 +83,20 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
+
+    # configure checks for header 'gpgme++/gpgmepp_version.h',
+    # and if it is found (no matter where) uses a hardcoded path
+    # in what presumably is an effort to make it possible to write
+    # '#include <context.h>' instead of '#include <gpgmepp/context.h>'.
+    #
+    # Fix this path to point to where the headers can actually be found instead.
+    substituteInPlace configure.ac --replace \
+      'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
+      'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
   '';
 
   QT4DIR = qt4;
 
-  # Fix boost 1.59 compat
-  # Try removing in the next version
-  CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED";
-
   preConfigure = ''
     configureFlagsArray=(
       "--with-parallelism=$NIX_BUILD_CORES"
@@ -101,68 +105,72 @@ in stdenv.mkDerivation rec {
 
     chmod a+x ./bin/unpack-sources
     patchShebangs .
-    # It is used only as an indicator of the proper current directory
-    touch solenv/inc/target.mk
-
-    # BLFS patch for Glibc 2.23 renaming isnan
-    sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
 
     # This is required as some cppunittests require fontconfig configured
     cp "${fontsConf}" fonts.conf
     sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf
     export FONTCONFIG_FILE="$PWD/fonts.conf"
+
+    NOCONFIGURE=1 ./autogen.sh
   '';
 
-  # fetch_Download_item tries to interpret the name as a variable name
-  # Let it do so…
-  postConfigure = ''
-    sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
-    sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+  postConfigure =
+    # fetch_Download_item tries to interpret the name as a variable name, let it do so...
+    ''
+      sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
+      sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+    ''
+    # Test fixups
+    # May need to be revisited/pruned, left alone for now.
+    + ''
+      # unit test sd_tiledrendering seems to be fragile
+      # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+      echo > ./sd/CppunitTest_sd_tiledrendering.mk
+      sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+      # one more fragile test?
+      sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # this I actually hate, this should be a data consistency test!
+      sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # rendering-dependent test
+      sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
+      # tilde expansion in path processing checks the existence of $HOME
+      sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
+      # rendering-dependent: on my computer the test table actually doesn't fit…
+      # interesting fact: test disabled on macOS by upstream
+      sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
+      # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
+      sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
+      # one more fragile test?
+      sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
+      # rendering-dependent tests
+      sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+      sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
+      sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
+      sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+      sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+      sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
+      # not sure about this fragile test
+      sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+    ''
+    # This to avoid using /lib:/usr/lib at linking
+    + ''
+    sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
 
-    # unit test sd_tiledrendering seems to be fragile
-    # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
-    echo > ./sd/CppunitTest_sd_tiledrendering.mk
-    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
-    # one more fragile test?
-    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
-    # rendering-dependent test
-    sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
-    # tilde expansion in path processing checks the existence of $HOME
-    sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
-    # rendering-dependent: on my computer the test table actually doesn't fit…
-    # interesting fact: test disabled on macOS by upstream
-    sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
-    # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
-    sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
-    # one more fragile test?
-    sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
-    # rendering-dependent tests
-    sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
-    sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
-    sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
-    sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
-    # not sure about this fragile test
-    sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-  '';
+    find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
+    '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
 
   enableParallelBuilding = true;
 
   buildPhase = ''
-    # This is required as some cppunittests require fontconfig configured
-    export FONTCONFIG_FILE=${fontsConf}
-
-    # This to avoid using /lib:/usr/lib at linking
-    sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
-
-    find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
-
-    make
+    make build-nocheck
   '';
 
+  doCheck = true;
+
   # It installs only things to $out/lib/libreoffice
   postInstall = ''
     mkdir -p $out/bin $out/share/desktop
@@ -194,11 +202,11 @@ in stdenv.mkDerivation rec {
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
     "--disable-report-builder"
+    "--disable-online-update"
     "--enable-python=system"
     "--enable-dbus"
     "--enable-release-build"
     (lib.enableFeature kdeIntegration "kde4")
-    "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
     "--with-ant-home=${ant}/lib/ant"
@@ -212,6 +220,8 @@ in stdenv.mkDerivation rec {
     "--with-system-openldap"
     "--with-system-coinmp"
 
+    "--with-alloc=system"
+
     # Without these, configure does not finish
     "--without-junit"
 
@@ -234,8 +244,10 @@ in stdenv.mkDerivation rec {
     "--without-system-liblangtag"
     "--without-system-libmspub"
     "--without-system-libpagemaker"
-    "--without-system-libgltf"
     "--without-system-libstaroffice"
+    "--without-system-libepubgen"
+    "--without-system-libqxp"
+    "--without-system-mdds"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
     "--without-system-xmlsec"
@@ -257,10 +269,10 @@ in stdenv.mkDerivation rec {
       gst_all_1.gst-plugins-base glib
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends unzip vigra which zip zlib
-      mdds bluez5 glibc libcmis libwps libabw libzmf libtool
-      libxshmfence libatomic_ops graphite2 harfbuzz gpgme
+      mdds bluez5 libcmis libwps libabw libzmf libtool
+      libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
       librevenge libe-book libmwaw glm glew ncurses epoxy
-      libodfgen CoinMP librdf_rasqal defaultIconTheme
+      libodfgen CoinMP librdf_rasqal defaultIconTheme gettext
     ]
     ++ lib.optional kdeIntegration kdelibs4;
   nativeBuildInputs = [ wrapGAppsHook gdb ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ff605bbd09..45e46a581b14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17280,15 +17280,12 @@ with pkgs;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
     };
-    # checking whether g++ supports C++14 or C++11... configure: error: no
-    # Still relevant: 2018-04-13
-    stdenv = overrideCC stdenv gcc5;
   };
 
-  libreoffice-unwrapped =callPackage ../applications/office/libreoffice
+  libreoffice-unwrapped = callPackage ../applications/office/libreoffice
   (libreoffice-args // {
   });
-  libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix
+  libreoffice-still-unwrapped = callPackage ../applications/office/libreoffice/still.nix
   (libreoffice-args // {
       poppler = poppler_0_61;
   });

From 20a4a4b5933db55b769d48c532b6bf906738b821 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 1 Sep 2018 11:57:08 +0200
Subject: [PATCH 0279/3253] pythonPackages.pytest.setupHook: run in correct
 phase

It was reported that the 2nd solution wasn't working as expected because
it was ran in the wrong phase.

This commit creates a new phase, in between the installCheckPhase and distPhase.
---
 pkgs/development/python-modules/pytest/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 3770f62f1a5b..6146159ad0ab 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,9 +29,11 @@ buildPythonPackage rec {
 
   # Remove .pytest_cache when using py.test in a Nix build
   setupHook = writeText "pytest-hook" ''
-    postFixupHooks+=(
-        'find $out -name .pytest_cache -type d -exec rm -rf {} +'
-    )
+    pytestcachePhase() {
+        find $out -name .pytest_cache -type d -exec rm -rf {} +
+    }
+
+    preDistPhases+=" pytestcachePhase"
   '';
 
   meta = with stdenv.lib; {

From b75ea627c6f290c0764d5ab8103dfd82ca309caa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 1 Sep 2018 11:57:31 +0200
Subject: [PATCH 0280/3253] pythonPackages.autobahn: run hooks

---
 pkgs/development/python-modules/autobahn/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 87a337a154dd..04aa9411247e 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -21,7 +21,9 @@ buildPythonPackage rec {
     (stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
 
   checkPhase = ''
+    runHook preCheck
     USE_TWISTED=true py.test $out
+    runHook postCheck
   '';
 
   meta = with stdenv.lib; {

From 1ee3c294bfdb32bdbe9a8f4c7ac3e462d6c344ce Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 18 Aug 2018 17:59:02 +0000
Subject: [PATCH 0281/3253] all-packages.nix: rename emacs functions Gen -> For

This was introduced when it was unclear which suffix was better, but now it's
clear that the "For" convention won.
---
 pkgs/top-level/aliases.nix      |  2 ++
 pkgs/top-level/all-packages.nix | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ae7137d3a6a4..c05f01ec839e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -81,6 +81,8 @@ mapAliases ({
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
   emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
   emacsMelpa = emacs25PackagesNg; # for backward compatibility
+  emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
+  emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
   enblendenfuse = enblend-enfuse; # 2015-09-30
   evolution_data_server = evolution-data-server; # added 2018-02-25
   etcdctl = etcd; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ff605bbd09..946b97121770 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16022,7 +16022,7 @@ with pkgs;
       ImageCaptureCore GSS ImageIO;
   };
 
-  emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
+  emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 
     autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
@@ -16165,10 +16165,10 @@ with pkgs;
     cask = callPackage ../applications/editors/emacs-modes/cask { };
   };
 
-  emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages;
-  emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages;
+  emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages;
+  emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages;
 
-  emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
+  emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
     inherit lib newScope stdenv;
     inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch;
     inherit emacs texinfo makeWrapper runCommand writeText;
@@ -16190,9 +16190,9 @@ with pkgs;
     };
   };
 
-  emacs25PackagesNg = emacsPackagesNgGen emacs25;
+  emacs25PackagesNg = emacsPackagesNgFor emacs25;
   emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
-  emacs26PackagesNg = emacsPackagesNgGen emacs26;
+  emacs26PackagesNg = emacsPackagesNgFor emacs26;
   emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
   emacsWithPackages = emacsPackagesNg.emacsWithPackages;
 

From 033ed93da2c739842283068325f5c31bc5dacd40 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 18 Aug 2018 18:15:14 +0000
Subject: [PATCH 0282/3253] all-packages.nix: cleanup a bit

---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 946b97121770..383c4838942e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8496,7 +8496,7 @@ with pkgs;
   gn = callPackage ../development/tools/build-managers/gn { };
 
   nixbang = callPackage ../development/tools/misc/nixbang {
-      pythonPackages = python3Packages;
+    pythonPackages = python3Packages;
   };
 
   nexus = callPackage ../development/tools/repository-managers/nexus { };
@@ -12827,8 +12827,8 @@ with pkgs;
 
   rdf4store = callPackage ../servers/http/4store { };
 
-  apacheHttpd = pkgs.apacheHttpd_2_4;
   apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
+  apacheHttpd = pkgs.apacheHttpd_2_4;
 
   apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
     inherit apacheHttpd;
@@ -12852,8 +12852,8 @@ with pkgs;
     subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
   };
 
-  apacheHttpdPackages = apacheHttpdPackagesFor pkgs.apacheHttpd pkgs.apacheHttpdPackages;
   apacheHttpdPackages_2_4 = apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4;
+  apacheHttpdPackages = apacheHttpdPackages_2_4;
 
   appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
 

From 590ce7d1ae5512360da09257c4bf8936fc6b6827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 4 Sep 2018 20:27:25 +0200
Subject: [PATCH 0283/3253] mxnet: fix library dependencies.

- mxnet now builds the open source MKL DNN library. However, this
  was not included with the build.
- mxnet builds its own OpenMP library, even when OpenMP is provided
  by the system. This leads to problems, so remove the included
  OpenMP implementation:

  https://github.com/apache/incubator-mxnet/pull/12160
---
 pkgs/applications/science/math/mxnet/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index a3043bcf6952..990d3f1a5d59 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -34,11 +34,14 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \
       --replace "/bin/bash" "${bash}/bin/bash"
+
+    # Build against the system version of OpenMP. 
+    # https://github.com/apache/incubator-mxnet/pull/12160
+    rm -rf 3rdparty/openmp
   '';
 
-  installPhase = ''
-    install -Dm755 libmxnet.so $out/lib/libmxnet.so
-    cp -r ../include $out
+  postInstall = ''
+    rm "$out"/lib/*.a
   '';
 
   enableParallelBuilding = true;

From 19ac91770736ffb012a8003085be640417464d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 4 Sep 2018 20:30:31 +0200
Subject: [PATCH 0284/3253] python[23]Packages.graphviz: 0.5.2 -> 0.9

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0bc38b0f8dfe..5c039f1f9ee8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7937,11 +7937,11 @@ in {
 
   graphviz = buildPythonPackage rec {
     name = "graphviz-${version}";
-    version = "0.5.2";
+    version = "0.9";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/graphviz/${name}.zip";
-      sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0";
+      sha256 = "14r9brj4r31b3qy1nnn34v3l4h0n39bqxg9sn2fz4p3pp5mglnl6";
     };
 
     propagatedBuildInputs = [ pkgs.graphviz ];

From e57e92bfa2515b1b7ff5ad2db2e7d503e7ae24fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 4 Sep 2018 20:35:05 +0200
Subject: [PATCH 0285/3253] python[23]Packages.mxnet: fix build

Relax graphviz, numpy, requests dependency version bounds.
---
 pkgs/top-level/python-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c039f1f9ee8..63028eeaa838 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1788,6 +1788,13 @@ in {
 
     doCheck = !isPy3k;
 
+    postPatch = ''
+      substituteInPlace python/setup.py \
+      --replace "graphviz<0.9.0" "graphviz<0.10.0" \
+      --replace "numpy<=1.15.0" "numpy<1.16.0" \
+      --replace "requests<2.19.0" "requests<2.20.0"
+    '';
+
     preConfigure = ''
       cd python
     '';

From 16e776fde7130e9722e400a1606ba79526359898 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Tue, 4 Sep 2018 19:16:01 +0000
Subject: [PATCH 0286/3253] sound-juicer: fix build (#46051)

---
 pkgs/applications/audio/sound-juicer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index e38f38dad78c..f402721e180d 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec{
     gst_all_1.gst-libav
   ];
 
+  NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral";
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;

From 88ae8f7d55efa457c95187011eb410d097108445 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 4 Sep 2018 21:19:31 +0200
Subject: [PATCH 0287/3253] dconf module: add dconf to services.dbus.packages

Some programs like eog seem to need dconf accessible on dbus.
Without this change I get

(eog:1738): dconf-WARNING **: 21:20:52.770: failed to commit changes to
dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name
ca.desrt.dconf was not provided by any .service files
---
 nixos/modules/programs/dconf.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index b7d8a345e65c..9c9765b06b6f 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -32,6 +32,8 @@ in
     environment.etc = optionals (cfg.profiles != {})
       (mapAttrsToList mkDconfProfile cfg.profiles);
 
+    services.dbus.packages = [ pkgs.gnome3.dconf ];
+
     environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
       "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
     # https://github.com/NixOS/nixpkgs/pull/31891

From e37c21ce950e8975887f2beb5e648a3ad521a1a6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 4 Sep 2018 14:55:05 -0500
Subject: [PATCH 0288/3253] musl: 1.1.19 -> 1.1.20

---
 pkgs/os-specific/linux/musl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 9628ec516763..a24900ce337a 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.19";
+  version = "1.1.20";
 
   src = fetchurl {
     url    = "https://www.musl-libc.org/releases/musl-${version}.tar.gz";
-    sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv";
+    sha256 = "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4";
   };
 
   enableParallelBuilding = true;

From 080a6385ff0fa6b3152d31a9a028f30b3a68baf8 Mon Sep 17 00:00:00 2001
From: Lenz Weber <mail@lenzw.de>
Date: Tue, 4 Sep 2018 20:44:06 +0200
Subject: [PATCH 0289/3253] zfs-unstable: 64e9696 -> c197a77

---
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index c689faad492f..e6807f1214cc 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -180,10 +180,10 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2018-08-13";
+    version = "2018-09-02";
 
-    rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c";
-    sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf";
+    rev = "c197a77c3cf36531e4cf79e524e1ccf7ec00cc4c";
+    sha256 = "0rk835nnl4w5km8qxcr1wdpr9xasssnrmsxhjlqjy0ry3qcb2197";
     isUnstable = true;
 
     extraPatches = [

From 98ef33ec74c4792f14175d27241352e270d1b5d7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 4 Sep 2018 16:19:43 -0400
Subject: [PATCH 0290/3253] oh-my-zsh: 2018-07-29 -> 2018-09-03

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 6f9e338dabaa..22aa478d743c 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2018-07-29";
+  version = "2018-09-03";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "5fa7824ea59ec12a976f348a83399e66699456ea";
-    sha256 = "1ry46jxk7k4ndh4gic9v7c19gsqmcag8bng92pp7vw0fj0b0ij6k";
+    rev = "69e637c35578305e19dbfc520e65c514180db6ef";
+    sha256 = "067qwvdlghjb2kcv4fydnnbwss2kb4fgn1qib88ygz82fpvb0cwf";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 62086c6be6560e1f34a19cb909c74a33fbc3b6c3 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 4 Sep 2018 22:39:01 +0200
Subject: [PATCH 0291/3253] nixos/tests/novacomd: prevent non-deterministic
 failure

A sporadic failure occured on Hydra because a request was sent
to the daemon after the systemd unit was started, but before the
daemon was actually listening. Fix by checking for open port first.
---
 nixos/tests/novacomd.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 2b56aee0a2e7..4eb60c0feb5c 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -9,12 +9,16 @@ import ./make-test.nix ({ pkgs, ...} : {
   };
 
   testScript = ''
-    startAll;
+    $machine->waitForUnit("multi-user.target");
 
+    # multi-user.target wants novacomd.service, but let's make sure
     $machine->waitForUnit("novacomd.service");
 
     # Check status and try connecting with novacom
     $machine->succeed("systemctl status novacomd.service >&2");
+    # to prevent non-deterministic failure,
+    # make sure the daemon is really listening
+    $machine->waitForOpenPort(6968);
     $machine->succeed("novacom -l");
 
     # Stop the daemon, double-check novacom fails if daemon isn't working
@@ -23,6 +27,8 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     # And back again for good measure
     $machine->startJob("novacomd");
+    # make sure the daemon is really listening
+    $machine->waitForOpenPort(6968);
     $machine->succeed("novacom -l");
   '';
 })

From 69e4e4934d0dc9e9a0c991abbcd00b7e81519c79 Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Tue, 4 Sep 2018 23:19:26 +0200
Subject: [PATCH 0292/3253] Allow the definition of extra options on
 commandline

I stumbled upon an issue with the Alertmanager that required
an additional comand line option. See https://groups.google.com/forum/#!msg/prometheus-users/-5wd-P13xCI/lGLBHHgnBgAJ
---
 .../monitoring/prometheus/alertmanager.nix    | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 8a47c9f1e7d8..8a44cf7fd8f6 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -9,6 +9,15 @@ let
     if cfg.configText != null then
       pkgs.writeText "alertmanager.yml" cfg.configText
     else mkConfigFile;
+  cmdlineArgs = cfg.extraFlags ++ [
+    "--config.file ${alertmanagerYml}"
+    "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
+    "--log.level ${cfg.logLevel}"
+    ] ++ (optional (cfg.webExternalUrl != null)
+      "--web.external-url ${cfg.webExternalUrl}"
+    ) ++ (optional (cfg.logFormat != null)
+      "--log.format ${cfg.logFormat}"
+  );
 in {
   options = {
     services.prometheus.alertmanager = {
@@ -99,6 +108,14 @@ in {
           Open port in firewall for incoming connections.
         '';
       };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the Alertmanager.
+        '';
+      };
     };
   };
 
@@ -111,11 +128,7 @@ in {
       after    = [ "network.target" ];
       script = ''
         ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \
-        --config.file ${alertmanagerYml} \
-        --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-        --log.level ${cfg.logLevel} \
-        ${optionalString (cfg.webExternalUrl != null) ''--web.external-url ${cfg.webExternalUrl} \''}
-        ${optionalString (cfg.logFormat != null) "--log.format ${cfg.logFormat}"}
+          ${concatStringsSep " \\\n  " cmdlineArgs}
       '';
 
       serviceConfig = {

From d93aa1c50fc8a83be1c709f905d8c94e1677845f Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 4 Sep 2018 16:25:51 -0500
Subject: [PATCH 0293/3253] sudo: 1.8.24 -> 1.8.25 (#46057)

https://www.sudo.ws/stable.html

(may need to scroll to the 1.8.25 notes
afternewer versions are released)
---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 71cf239d72cb..03c400751451 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.24";
+  name = "sudo-1.8.25";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l";
+    sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx";
   };
 
   prePatch = ''

From 59f5a65e72fc3e1708069a6d5a21127d985c8489 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 4 Sep 2018 16:32:43 -0500
Subject: [PATCH 0294/3253] zsh: 5.5.1 -> 5.6 (#46052)

Security, see:

https://github.com/zsh-users/zsh/blob/zsh-5.6/NEWS#L7
---
 pkgs/shells/zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 3259dbbd9bc6..100657312da0 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-  version = "5.5.1";
+  version = "5.6";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "0bm9n7lycdzvw5hmgi4a920pqbb5yxvmyhfxx8jbign2hzgf7g01";
+    sha256 = "1kz57w4l0jank67a2hiz6y5idbff5avwg52zdxx3qnflkjvkn2kx";
   };
 
 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "10705qnnr3p416bwfjaip9r7yw187vczzjrk60yg79dfwy4slk3p";
+    sha256 = "1vik7s3q5hvazvgw4jm4b90qlk6zcry0s314xw1liarspkd721g3";
   };
 
   buildInputs = [ ncurses pcre ];

From 33fa23f6b389ed3c439bc938887c5dbcd2a53336 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 4 Sep 2018 21:38:07 +0000
Subject: [PATCH 0295/3253] dbus-sharp-2_0: fix build (#46060)

---
 pkgs/development/libraries/dbus-sharp/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 40c633dda523..855dd9f3832e 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dbus-sharp-${version}";
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ mono ];
+
+  # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+  # See: https://github.com/NixOS/nixpkgs/pull/46060
+  buildInputs = [ mono48 ];
 
   dontStrip = true;
 

From f50aa1cd4ed4a6f505b4ab3c7c54063ee3cefe84 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 4 Sep 2018 23:39:15 +0200
Subject: [PATCH 0296/3253] pythonPackages.glances: 3.0 -> 3.0.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0bc38b0f8dfe..f74f9ace2fdf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5916,14 +5916,14 @@ in {
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "3.0";
+    version = "3.0.1";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "19pymw104l05af710ph69znqiz9av3if7436kigjlwd65gxnghkc";
+      sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x";
     };
 
     # Requires access to /sys/class/power_supply

From 6b74b16579b64a3c064c1e173dda84fcfa6d8127 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 4 Sep 2018 23:44:05 +0200
Subject: [PATCH 0297/3253] kitty: 0.11.3 -> 0.12.0 (#46067)

---
 pkgs/applications/misc/kitty/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index c34167b4ddb8..70b580cd0f8a 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -2,12 +2,12 @@
   fontconfig, pkgconfig, ncurses, imagemagick, xsel,
   libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
   libxkbcommon, libXi, libXext, wayland-protocols, wayland,
-  which
+  which, dbus
 }:
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.11.3";
+  version = "0.12.0";
   name = "kitty-${version}";
   format = "other";
 
@@ -15,13 +15,13 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1fql8ayxvip8hgq9gy0dhqfvngv13gh5bf71vnc3agd80kzq1n73";
+    sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm";
   };
 
   buildInputs = [
     fontconfig glfw ncurses libunistring harfbuzz libX11
     libXrandr libXinerama libXcursor libxkbcommon libXi libXext
-    wayland-protocols wayland
+    wayland-protocols wayland dbus
   ];
 
   nativeBuildInputs = [ pkgconfig which sphinx ];

From b7d408713c7a29ee6bb9ab594e225984f1a114b1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 4 Sep 2018 23:45:30 +0200
Subject: [PATCH 0298/3253] puredata: 0.48-0 -> 0.48-2 (#46065)

---
 pkgs/applications/audio/puredata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 6aca7e9ce226..354b7c4b6c7b 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "puredata-${version}";
-  version = "0.48-0";
+  version = "0.48-2";
 
   src = fetchurl {
     url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
-    sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny";
+    sha256 = "0p86hncgzkrl437v2wch2fg9iyn6mnrgbn811sh9pwmrjj2f06v8";
   };
 
   nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];

From a36b861f804e0645fea97f39cc3a09985813938e Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 4 Sep 2018 16:47:21 -0500
Subject: [PATCH 0299/3253] liblangtag: bump to CLDR 33.1 unicode data (#46050)

http://cldr.unicode.org/index/downloads/cldr-33-1
---
 pkgs/development/libraries/liblangtag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 6d9085e1741b..8ebfa53b7d13 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   core_zip = fetchurl {
     # please update if an update is available
-    url = "http://www.unicode.org/Public/cldr/33/core.zip";
-    sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s";
+    url = "http://www.unicode.org/Public/cldr/33.1/core.zip";
+    sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp";
   };
 
   language_subtag_registry = fetchurl {

From 24ce88615e32f1bea04c74c748a0fd14f59b0726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Sep 2018 22:51:01 +0100
Subject: [PATCH 0300/3253] radare2: 2.8.0 -> 2.9.0

---
 pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 85559269f279..76df2d4fd642 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -86,12 +86,12 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "19251";
-    gittap = "2.8.0";
-    gittip = "a76b965410aba07b4ef8b96d90b25b271c2003dd";
-    rev = "2.8.0";
-    version = "2.8.0";
-    sha256 = "1d9rkzc3vychy2h1bnywwx4why83rr18r0lvvl1cqx87ad5awcjk";
+    version_commit = "19349";
+    gittap = "2.9.0";
+    gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8";
+    rev = "2.9.0";
+    version = "2.9.0";
+    sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw";
     cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
   };

From 7931d455a469a3f5ac533f13f4f713ea8cb9c1cf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 22:03:51 +0000
Subject: [PATCH 0301/3253] stdenv: linux: cleanup a bit

---
 pkgs/stdenv/linux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index de58178a34ba..b29a96314d2c 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -343,8 +343,8 @@ in
       # Mainly avoid reference to bootstrap tools
       allowedRequisites = with prevStage; with lib;
         # Simple executable tools
-        concatMap (p: [ (getBin p) (getLib p) ])
-          [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
+        concatMap (p: [ (getBin p) (getLib p) ]) [
+            gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
             gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
           ]
         # Library dependencies

From 409270826112d035934a6b7a0969aa47dac0bf35 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 21:13:00 +0000
Subject: [PATCH 0302/3253] treewide: cleanup some references to bash

---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a981ffea7081..301bc2694c4f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   inherit cc libc_bin libc_dev libc_lib bintools coreutils_bin;
-  shell = getBin shell + stdenv.lib.optionalString (stdenv ? shellPath) stdenv.shellPath;
+  shell = getBin shell + shell.shellPath or "";
   gnugrep_bin = if nativeTools then "" else gnugrep;
 
   inherit targetPrefix infixSalt;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 383c4838942e..e67d038c1ca1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6222,7 +6222,7 @@ with pkgs;
 
   ### SHELLS
 
-  runtimeShell = "${runtimeShellPackage}/bin/bash";
+  runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
   runtimeShellPackage = bash;
 
   bash = lowPrio (callPackage ../shells/bash/4.4.nix { });

From 63b7bc847cfdfe6c5d43eac69802c2b1cb7c0912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Sep 2018 23:08:39 +0100
Subject: [PATCH 0303/3253] radare2-cutter: add mic92 as maintainer

---
 pkgs/development/tools/analysis/radare2/cutter.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 4269661a4ff3..95b456fd2b79 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "A Qt and C++ GUI for radare2 reverse engineering framework";
     homepage = src.meta.homepage;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ mic92 dtzWill ];
   };
 }

From a56fd17938917fcdb461c67c24b3bec8f7d7c033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Sep 2018 22:51:35 +0100
Subject: [PATCH 0304/3253] radare2-cutter: 1.7 -> 1.7.1

---
 pkgs/development/tools/analysis/radare2/cutter.nix  |  4 ++--
 pkgs/development/tools/analysis/radare2/default.nix | 12 ++++++------
 pkgs/development/tools/analysis/radare2/update.py   | 13 ++++++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 95b456fd2b79..659d6a94f5eb 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -8,7 +8,7 @@
 , python3 }:
 
 let
-  version = "1.7";
+  version = "1.7.1";
 in
 stdenv.mkDerivation rec {
   name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "0z9wzxd5hw0ivakrg3xiv4zx1rjj032hlmizq0pxj22xjrj1gg9n";
+    sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 76df2d4fd642..f10b820a73ea 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -96,12 +96,12 @@ in {
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
   };
   r2-for-cutter = generic {
-    version_commit = "19251";
-    gittap = "2.8.0-118-gb0547831f";
-    gittip = "b0547831f127b7357e3c93bc43933482a4d6213b";
-    rev = "b0547831f127b7357e3c93bc43933482a4d6213b";
-    version = "2018-08-07";
-    sha256 = "1ix42kipd1aayb494ajbxawzc1cwikm9fxk343d1kchxx4a30a1m";
+    version_commit = "19349";
+    gittap = "2.8.0-189-gf82b28982";
+    gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
+    rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
+    version = "2018-08-14";
+    sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
     cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
   };
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index fae6a52a3920..45920fd1e4bf 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -13,6 +13,8 @@ from datetime import datetime
 from pathlib import Path
 from typing import Dict
 
+SCRIPT_DIR = Path(__file__).parent.resolve()
+
 
 def sh(*args: str) -> str:
     out = subprocess.check_output(list(args))
@@ -34,8 +36,17 @@ def get_radare2_rev() -> str:
     return release["tag_name"]
 
 
+def get_cutter_version() -> str:
+    version_expr = """
+(with import <nixpkgs> {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version)
+"""
+    with SCRIPT_DIR:
+        return sh("nix", "eval", "--raw", version_expr.strip())
+
+
 def get_r2_cutter_rev() -> str:
-    url = "https://api.github.com/repos/radareorg/cutter/contents/"
+    version = get_cutter_version()
+    url = f"https://api.github.com/repos/radareorg/cutter/contents?ref=v{version}"
     with urllib.request.urlopen(url) as response:
         data = json.load(response)  # type: ignore
     for entry in data:

From d814c98ec86d632e706ca71263e09be60eb23eb5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 5 Sep 2018 01:02:06 +0200
Subject: [PATCH 0305/3253] python.pkgs.pytest-fixture-config: disable tests
 (#46021)

Tests seem to fail on all recent versions even outside of our build
system. The upstream CI tests seem to somehow succeed but I wasn't able
to reproduce that locally. For not it is probably best to disable them.
---
 .../python-modules/pytest-fixture-config/default.nix      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix
index df700526d1b4..67ceebef3057 100644
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools-git, pytest, six }:
+, setuptools-git, pytest }:
 
 buildPythonPackage rec {
   pname = "pytest-fixture-config";
@@ -14,11 +14,7 @@ buildPythonPackage rec {
 
   buildInputs = [ pytest ];
 
-  checkInputs = [ six ];
-
-  checkPhase = ''
-    py.test
-  '';
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set.";

From de825a4eaacdfe092e7023159f351cbe6c9a988d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Sep 2018 00:22:31 +0100
Subject: [PATCH 0306/3253] dino: 2018-07-08 -> 2018-09-05

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 3682097e302f..777057b327b0 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-07-08";
+  name = "dino-unstable-2018-09-05";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849";
-    sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi";
+    rev = "79e0aee5fdb90830fad748fdfae717cb5fbf91f9";
+    sha256 = "1sfh729fg6c5ds3rcma13paqnvv58jln34s93j74jnca19wgn7k5";
     fetchSubmodules = true;
   };
 

From 107de747c7044736738916ff1442dd7f275955d2 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 4 Sep 2018 13:29:40 -0700
Subject: [PATCH 0307/3253] linux_4_18: HID: core: fix grouping by application

This patch fixes #45165

commit f07b3c1da92d ("HID: generic: create one input report per
application type") was effectively the same as MULTI_INPUT:
hidinput->report was never set, so hidinput_match_application()
always returned null.

Fix that by testing against the real application.

Note that this breaks some old eGalax touchscreens that expect MULTI_INPUT
instead of HID_QUIRK_INPUT_PER_APP. Enable this quirk for backward
compatibility on all non-Win8 touchscreens.

link: https://bugzilla.kernel.org/show_bug.cgi?id=200847
link: https://bugzilla.kernel.org/show_bug.cgi?id=200849
link: https://bugs.archlinux.org/task/59699
link: https://github.com/NixOS/nixpkgs/issues/45165

Cc: stable@vger.kernel.org # v4.18+
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 pkgs/top-level/all-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ff605bbd09..2425dcf5b280 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14016,6 +14016,18 @@ with pkgs;
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+
+        # https://github.com/NixOS/nixpkgs/issues/45165
+        # TODO: remove this patch once it is merged upstream and released.
+        (rec {
+          name = "hid-core-fix-grouping-by-application";
+          patch = fetchpatch {
+            name = name + ".patch";
+            # https://patchwork.kernel.org/patch/10587369/
+            url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a;
+            sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m";
+          };
+        })
       ];
   };
 

From 4f8a248b236d239b4b5de3b80e96d8ccfa36cbe1 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 4 Sep 2018 17:10:27 -0700
Subject: [PATCH 0308/3253] kernel: increase build timeout to two hours

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 2cc83e62d11e..97921f07e82c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -247,6 +247,7 @@ let
           maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
+        timeout = 7200; # 2 hours
       } // extraMeta;
     };
 in

From d23c357f1c0248c7f38260d696082ace77758df4 Mon Sep 17 00:00:00 2001
From: Urban Skudnik <urban.skudnik@gmail.com>
Date: Mon, 3 Sep 2018 17:21:43 +0200
Subject: [PATCH 0309/3253] hcloud: Add autocomplete support for bash and zsh

Currently one would need to manually run the command to generate
completion and insert it into `.bashrc`/`.zshrc` to get the
autocompletion to work. This patch will automatically generate
both docs and save them to correct position so it should continue
to work even if user changes the shell at a later stage.
---
 pkgs/development/tools/hcloud/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 877080508d40..b3fa6f852f76 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -14,6 +14,19 @@ buildGoPackage rec {
 
   buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
 
+  postInstall = ''
+    mkdir -p \
+      $bin/etc/bash_completion.d \
+      $bin/share/zsh/vendor-completions
+
+    # Add bash completions
+    $bin/bin/hcloud completion bash > "$bin/etc/bash_completion.d/hcloud"
+
+    # Add zsh completions
+    echo "#compdef hcloud" > "$bin/share/zsh/vendor-completions/_hcloud"
+    $bin/bin/hcloud completion zsh >> "$bin/share/zsh/vendor-completions/_hcloud"
+  '';
+
   meta = {
     description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers";
     homepage = https://github.com/hetznercloud/cli;

From c63ca0a431a7a3bdf2aaae05b2acca86d8c1e7bd Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 01:08:14 +0000
Subject: [PATCH 0310/3253] stdenv: implement enableParallelChecking option

Works similarly to `enableParallelBuilding`, but is set by default when
`enableParallelBuilding` is set. In my experience most packages that build
fine in parallel also check fine in parallel.
---
 pkgs/stdenv/generic/make-derivation.nix | 2 ++
 pkgs/stdenv/generic/setup.sh            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index e1ce3200e8c9..3f35dce2eb29 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -227,6 +227,8 @@ rec {
           inherit doCheck doInstallCheck;
 
           inherit outputs;
+        } // lib.optionalAttrs (attrs.enableParallelBuilding or false) {
+          enableParallelChecking = attrs.enableParallelChecking or true;
         } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
           NIX_HARDENING_ENABLE = enabledHardeningOptions;
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 141e94c5ed46..e51dc1f1a0a6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1044,7 +1044,7 @@ checkPhase() {
         # Old bash empty array hack
         # shellcheck disable=SC2086
         local flagsArray=(
-            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
             $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
             ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
             ${checkTarget}
@@ -1176,7 +1176,7 @@ installCheckPhase() {
         # Old bash empty array hack
         # shellcheck disable=SC2086
         local flagsArray=(
-            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
             $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
             $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
             ${installCheckTarget:-installcheck}

From 20106e1066f8174ebb3c018966699181d1cf3706 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 01:12:48 +0000
Subject: [PATCH 0311/3253] gettext: disable parallel checking

---
 pkgs/development/libraries/gettext/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4531a5a01d4c..1b2f6bbc2225 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
   gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;
 
   enableParallelBuilding = true;
+  enableParallelChecking = false; # fails sometimes
 
   meta = with lib; {
     description = "Well integrated set of translation tools and documentation";

From e48f2d02268fe926ef16cbd8b2a87391bea739c4 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 01:13:16 +0000
Subject: [PATCH 0312/3253] tor: disable parallel checking

---
 pkgs/tools/security/tor/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index bb49e478910d..b03c753b0a32 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "geoip" ];
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libevent openssl zlib ] ++
     stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
@@ -37,14 +35,17 @@ stdenv.mkDerivation rec {
       --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
   '';
 
+  enableParallelBuilding = true;
+  enableParallelChecking = false; # 4 tests fail randomly
+
+  doCheck = true;
+
   postInstall = ''
     mkdir -p $geoip/share/tor
     mv $out/share/tor/geoip{,6} $geoip/share/tor
     rm -rf $out/share/tor
   '';
 
-  doCheck = true;
-
   passthru.updateScript = import ./update.nix {
     inherit (stdenv) lib;
     inherit

From e9fe3a334bf0b4509358b9c5d9cc5d9fcd0b6d9c Mon Sep 17 00:00:00 2001
From: Urban Skudnik <urban.skudnik@gmail.com>
Date: Wed, 5 Sep 2018 03:36:56 +0200
Subject: [PATCH 0313/3253] restic: Fix autocomplete for zsh

zsh requires for files to be prepended with underscore to be
recognized as widgets, see [1] for more details.

[1] https://github.com/NixOS/nixpkgs/pull/46001#issuecomment-418567160
---
 pkgs/tools/backup/restic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index feb7b4802630..453e31f5d13a 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -27,7 +27,7 @@ buildGoPackage rec {
     cp restic $bin/bin/
     $bin/bin/restic generate \
       --bash-completion $bin/etc/bash_completion.d/restic.sh \
-      --zsh-completion $bin/share/zsh/vendor-completions/restic.sh \
+      --zsh-completion $bin/share/zsh/vendor-completions/_restic \
       --man $bin/share/man/man1
   '';
 

From 83a0d5d0139c0650b74e83cb2160907ddcf7a7d5 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 4 Sep 2018 22:03:56 -0400
Subject: [PATCH 0314/3253] solarus: 1.4.5 -> 1.5.3

---
 pkgs/games/solarus/default.nix  | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix
index 6f7876e48723..23abadf66ae5 100644
--- a/pkgs/games/solarus/default.nix
+++ b/pkgs/games/solarus/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
   SDL2, SDL2_image, SDL2_ttf, physfs,
-  openal, libmodplug, libvorbis}:
+  openal, libmodplug, libvorbis,
+  qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "solarus-${version}";
-  version = "1.4.5";
+  version = "1.5.3";
 
-  src = fetchFromGitHub {
-    owner = "christopho";
+  src = fetchFromGitLab {
+    owner = "solarus-games";
     repo = "solarus";
-    rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e";
-    sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v";
+    rev = "v1.5.3";
+    sha256 = "035hkdw3a1ryasj5wfa1xla1xmpnc3hjp4s20sl9ywip41675vaz";
   };
 
   buildInputs = [ cmake luajit SDL2
     SDL2_image SDL2_ttf physfs
-    openal libmodplug libvorbis ];
+    openal libmodplug libvorbis
+    qtbase qttools ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 436c44609ec9..23d24aa04732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20157,7 +20157,7 @@ with pkgs;
     lua = lua5_1;
   };
 
-  solarus = callPackage ../games/solarus { };
+  solarus = libsForQt5.callPackage ../games/solarus { };
 
   solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
 

From 455f8151fdeaba4e5fbbd9e17640f25ed70e0f50 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 4 Sep 2018 22:04:33 -0400
Subject: [PATCH 0315/3253] solarus-quest-editor: 1.4.5 -> 1.5.3

---
 .../tools/solarus-quest-editor/default.nix    | 27 ++++++++++-----
 ...beab62594f73e57190c49848c848487214cf.patch | 33 +++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch

diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix
index 3df6d3de3e16..5a340d309495 100644
--- a/pkgs/development/tools/solarus-quest-editor/default.nix
+++ b/pkgs/development/tools/solarus-quest-editor/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, luajit,
+{ stdenv, fetchFromGitLab, cmake, luajit,
   SDL2, SDL2_image, SDL2_ttf, physfs,
   openal, libmodplug, libvorbis, solarus,
-  qtbase, qttools }:
+  qtbase, qttools, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "solarus-quest-editor-${version}";
-  version = "1.4.5";
+  version = "1.5.3";
     
-  src = fetchFromGitHub {
-    owner = "christopho";
+  src = fetchFromGitLab {
+    owner = "solarus-games";
     repo = "solarus-quest-editor";
-    rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df";
-    sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f";
+    rev = "v1.5.3";
+    sha256 = "1b9mg04yy4pnrl745hbc82rz79k0f8ci3wv7gvsm3a998q8m98si";
   };
   
   buildInputs = [ cmake luajit SDL2
@@ -19,7 +19,18 @@ stdenv.mkDerivation rec {
     openal libmodplug libvorbis
     solarus qtbase qttools ];
     
-  patches = [ ./patches/fix-install.patch ];
+  patches = [
+    ./patches/fix-install.patch
+
+    # Next two patches should be fine to remove for next release.
+    # This commit fixes issues AND adds features *sighs*
+    ./patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
+
+    (fetchpatch {
+      url = https://gitlab.com/solarus-games/solarus-quest-editor/commit/8f308463030c18cd4f7c8a6052028fff3b7ca35a.patch;
+      sha256 = "1jq48ghhznrp47q9lq2rhh48a1z4aylyy4qaniaqyfyq3vihrchr";
+    })
+  ];
 
   meta = with stdenv.lib; {
     description = "The editor for the Zelda-like ARPG game engine, Solarus";
diff --git a/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
new file mode 100644
index 000000000000..73e817fcfbe8
--- /dev/null
+++ b/pkgs/development/tools/solarus-quest-editor/patches/partial-f285beab62594f73e57190c49848c848487214cf.patch
@@ -0,0 +1,33 @@
+From f285beab62594f73e57190c49848c848487214cf Mon Sep 17 00:00:00 2001
+From: stdgregwar <gregoirehirt@gmail.com>
+Date: Sun, 1 Jul 2018 00:00:41 +0200
+Subject: [PATCH] Shader previewer base
+
+
+diff --git a/include/widgets/tileset_view.h b/include/widgets/tileset_view.h
+index 615f432..799a4c6 100644
+--- a/include/widgets/tileset_view.h
++++ b/include/widgets/tileset_view.h
+@@ -23,6 +23,7 @@
+ #include "pattern_separation.h"
+ #include <QGraphicsView>
+ #include <QPointer>
++#include <QMenu>
+ 
+ class QAction;
+ 
+diff --git a/src/widgets/text_editor.cpp b/src/widgets/text_editor.cpp
+index 4f2ff68..90080a9 100644
+--- a/src/widgets/text_editor.cpp
++++ b/src/widgets/text_editor.cpp
+@@ -26,6 +26,7 @@
+ #include <QList>
+ #include <QPlainTextEdit>
+ #include <QScrollBar>
++#include <QAction>
+ #include <QTextStream>
+ #include <QUndoStack>
+ 
+-- 
+2.18.0
+

From 7e0dd4c261591dabbfa4a6ea345b8c26b74783c2 Mon Sep 17 00:00:00 2001
From: Kenny Shen <qoelet@users.noreply.github.com>
Date: Wed, 5 Sep 2018 05:52:55 +0000
Subject: [PATCH 0316/3253] prettyping: init 1.0.1 (#46008)

---
 pkgs/tools/networking/prettyping/default.nix | 25 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/prettyping/default.nix

diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix
new file mode 100644
index 000000000000..36700195a1bd
--- /dev/null
+++ b/pkgs/tools/networking/prettyping/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "${program}-${version}";
+  program = "prettyping";
+  version = "1.0.1";
+  src = fetchFromGitHub {
+    owner = "denilsonsa";
+    repo = program;
+    rev = "v${version}";
+    sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf";
+  };
+
+  installPhase = ''
+    install -Dt $out/bin prettyping
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/denilsonsa/prettyping;
+    description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read";
+    license = with licenses; [ mit ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ qoelet ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34f8d73f5828..9fab60de0bf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4738,6 +4738,8 @@ with pkgs;
 
   pptpd = callPackage ../tools/networking/pptpd {};
 
+  prettyping = callPackage ../tools/networking/prettyping { };
+
   prey-bash-client = callPackage ../tools/security/prey { };
 
   profile-cleaner = callPackage ../tools/misc/profile-cleaner { };

From c722db75ba35d7bc86d5e83c457ab34e88698041 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Aug 2018 16:51:54 +0000
Subject: [PATCH 0317/3253] ocamlPackages.{tyxml,lwt}: always enable camlp4
 support

---
 pkgs/development/ocaml-modules/lwt/default.nix   | 2 +-
 pkgs/development/ocaml-modules/tyxml/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 345ca037fec9..739e6e1e43a8 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
 , ocaml, findlib, cppo
 , ocaml-migrate-parsetree, ppx_tools_versioned, result
-, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, withP4 ? true
 , camlp4 ? null
 }:
 
diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index b34c9279c307..a38040e6e1fe 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, uutf, markup, ppx_tools_versioned, re
-, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07"
+, withP4 ? true
 , camlp4 ? null
 }:
 

From 7ec9a333df36daa7829142d93965ab134ded438d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 5 Sep 2018 02:23:29 -0400
Subject: [PATCH 0318/3253] qtchan: Fixes build from Qt upgrade. (#46082)

Uses an upstream fix.
---
 pkgs/applications/networking/browsers/qtchan/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index f6bc05371f30..df956addf5cc 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt, makeWrapper }:
+{ stdenv, fetchFromGitHub, fetchpatch, qt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtchan-${version}";
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/siavash119/qtchan/commit/718abeee5cf4aca8c99b35b26f43909362a29ee6.patch;
+      sha256 = "11b72l5njvfsyapd479hp4yfvwwb1mhq3f077hwgg0waz5l7n00z";
+    })
+  ];
+
   enableParallelBuilding = true;
   nativeBuildInputs = [ qt.qmake makeWrapper ];
   buildInputs = [ qt.qtbase ];

From a394d08f1188fc612c5760218af4395653cfd662 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 5 Sep 2018 02:39:29 -0400
Subject: [PATCH 0319/3253] qmapshack: 1.11.1 -> 1.12.0 (#46084)

---
 pkgs/applications/misc/qmapshack/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 3b9e76aee4b8..a2c8c75dc245 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+{ stdenv, fetchurl, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 stdenv.mkDerivation rec {
   name = "qmapshack-${version}";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://bitbucket.org/maproom/qmapshack/downloads/${name}.tar.gz";
-    sha256 = "0yqilfldmfw8m18jbkffv4ar1px6kjs0zlgb216bnhahcr1y8r9y";
+    sha256 = "0d5p60kq9pa2hfql4nr8p42n88lr42jrsryrsllvaj45b8b6kvih";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
+  buildInputs = [ qtscript qtwebengine gdal proj routino quazip ];
 
   cmakeFlags = [
     "-DROUTINO_XML_PATH=${routino}/share/routino"

From c59d9d371ecca2b7cc5798aecb75252a9c396f8a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 5 Sep 2018 03:28:50 -0400
Subject: [PATCH 0320/3253] qtkeychain: Fixes Qt4 build. (#46085)

---
 .../0001-Fixes-build-with-Qt4.patch           | 25 +++++++++++++++++++
 .../libraries/qtkeychain/default.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch

diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
new file mode 100644
index 000000000000..4cd7214e61e2
--- /dev/null
+++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
@@ -0,0 +1,25 @@
+From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel <samuel@dionne-riel.com>
+Date: Tue, 4 Sep 2018 23:19:29 -0400
+Subject: [PATCH] Fixes build with Qt4.
+
+---
+ keychain_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keychain_unix.cpp b/keychain_unix.cpp
+index 30b26c3..b27ebef 100644
+--- a/keychain_unix.cpp
++++ b/keychain_unix.cpp
+@@ -91,7 +91,7 @@ static bool isKwallet5Available()
+     // a wallet can be opened.
+ 
+     iface.setTimeout(500);
+-    QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
++    QDBusMessage reply = iface.call("networkWallet");
+     return reply.type() == QDBusMessage::ReplyMessage;
+ }
+ 
+-- 
+2.16.4
+
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 220c6241096d..2b3c88d58860 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
   };
 
+  patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
+
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
     ++ stdenv.lib.optional stdenv.isDarwin [
        # correctly detect the compiler

From ffb094f939fd1065908d01f31718f94669761f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 5 Sep 2018 08:17:34 +0200
Subject: [PATCH 0321/3253] thinc: relax dependency version requirements

---
 pkgs/development/python-modules/thinc/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 88e6c8d16742..321b1fb11816 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -35,7 +35,9 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace "msgpack-python==" "msgpack-python>=" \
-      --replace "msgpack-numpy==" "msgpack-numpy>="
+      --replace "msgpack-numpy==" "msgpack-numpy>=" \
+      --replace "plac>=0.9,<1.0" "plac>=0.9" \
+      --replace "hypothesis>=2,<3" "hypothesis>=2"
   '';
 
   propagatedBuildInputs = [

From e3cae4a2e596d63f5b3876e4e740a5ae2cb3521d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Wed, 5 Sep 2018 10:36:03 +0200
Subject: [PATCH 0322/3253] gnumeric: 1.12.39 -> 1.12.43 (#46088)

goffice: 0.10.39 -> 0.10.43
---
 pkgs/applications/office/gnumeric/default.nix  | 4 ++--
 pkgs/development/libraries/goffice/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index e196b1bd0d77..c155d696d39f 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -9,11 +9,11 @@ let
   isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
   isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
 in stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.39";
+  name = "gnumeric-1.12.43";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f";
+    sha256 = "87c9abd6260cf29401fa1e0fcce374e8c7bcd1986608e4049f6037c9d32b5fd5";
   };
 
   configureFlags = [ "--disable-component" ];
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6155b8b18bd0..4795f45812b2 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.39";
+  name = "goffice-0.10.43";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f";
+    sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From da8475736ee9f68e3ccfb845fe7955e877731a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 5 Sep 2018 08:38:52 +0200
Subject: [PATCH 0323/3253] spacy: relax dependency versions

---
 pkgs/development/python-modules/spacy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index dc0509e226c0..0667565c0de8 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -37,7 +37,8 @@ buildPythonPackage rec {
       --replace "ftfy==" "ftfy>=" \
       --replace "msgpack-python==" "msgpack-python>=" \
       --replace "msgpack-numpy==" "msgpack-numpy>=" \
-      --replace "pathlib" "pathlib; python_version<\"3.4\""
+      --replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
   '';
 
   propagatedBuildInputs = [

From cf0342a2610d948214427b750276428771aa1578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 5 Sep 2018 10:42:48 +0200
Subject: [PATCH 0324/3253] gnome3.tracker: 2.1.3 -> 2.1.4 (#46086)

Fix build with format-security flag
---
 pkgs/desktops/gnome-3/core/tracker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 06c41937d12e..891d4a70a5f7 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "tracker";
-  version = "2.1.3";
+  version = "2.1.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00gimpn2ydv3yka25cmw3i0n402d2nhx7992byvq4yvhr77rni22";
+    sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
   };
 
   nativeBuildInputs = [

From a885e886b6d5942dcc9b92e8fb530a70fe4d8926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Wed, 5 Sep 2018 11:09:55 +0200
Subject: [PATCH 0325/3253] nullidentdmod: Init at 1.3 (#46040)

---
 pkgs/servers/identd/nullidentdmod/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/servers/identd/nullidentdmod/default.nix

diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix
new file mode 100644
index 000000000000..fdad63d67af4
--- /dev/null
+++ b/pkgs/servers/identd/nullidentdmod/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
+  name = "nullidentdmod-${version}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "Acidhub";
+    repo = "nullidentdmod";
+    rev = "v${version}";
+    sha256 = "1ahwm5pyidc6m07rh5ls2lc25kafrj233nnbcybprgl7bqdq1b0k";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    install -Dm755 nullidentdmod $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple identd that just replies with a random string or customized userid";
+    license = licenses.gpl2;
+    homepage = http://acidhub.click/NullidentdMod;
+    maintainers = with maintainers; [ das_j ];
+    platforms = platforms.linux; # Must be run by systemd
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24c1234cbc6b..f563f0dfe243 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13287,6 +13287,8 @@ with pkgs;
 
   newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
 
+  nullidentdmod = callPackage ../servers/identd/nullidentdmod {};
+
   riemann = callPackage ../servers/monitoring/riemann { };
   riemann-dash = callPackage ../servers/monitoring/riemann-dash { };
 

From 902b35a4888e7a58ea13ba7a378fbd17299c35c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 29 Aug 2018 10:01:10 +0100
Subject: [PATCH 0326/3253] vala_0_34: 0.34.17 -> 0.34.18

---
 pkgs/development/compilers/vala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index a4a8aa980b62..6e9e844e771a 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -45,8 +45,8 @@ let
 in rec {
   vala_0_34 = generic {
     major   = "0.34";
-    minor   = "17";
-    sha256  = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2";
+    minor   = "18";
+    sha256  = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
   };
 
   vala_0_36 = generic {

From c67c39cfdbf7291b29ccd158f95fb127ec32b361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 29 Aug 2018 10:01:30 +0100
Subject: [PATCH 0327/3253] vala_0_36: 0.36.13 -> 0.36.15

---
 pkgs/development/compilers/vala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 6e9e844e771a..f8d5ad3dbe1c 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -51,8 +51,8 @@ in rec {
 
   vala_0_36 = generic {
     major   = "0.36";
-    minor   = "13";
-    sha256  = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k";
+    minor   = "15";
+    sha256  = "11lnwjbhiz2l7g6y1f0jb0s81ymgssinlil3alibzcwmzpk175ix";
   };
 
   vala_0_38 = generic {

From c2ef18ae8bbb976d6e1f27d03cff57fe6eae49b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 29 Aug 2018 10:01:53 +0100
Subject: [PATCH 0328/3253] vala_0_38: 0.38.9 -> 0.38.10

---
 pkgs/development/compilers/vala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index f8d5ad3dbe1c..fb2d9fc535af 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -57,8 +57,8 @@ in rec {
 
   vala_0_38 = generic {
     major   = "0.38";
-    minor   = "9";
-    sha256  = "1dh1qacfsc1nr6hxwhn9lqmhnq39rv8gxbapdmj1v65zs96j3fn3";
+    minor   = "10";
+    sha256  = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
     extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
   };
 

From b76cf0b54c6d6108466a7ca67e4a952e6017bca7 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Wed, 5 Sep 2018 12:17:05 +0200
Subject: [PATCH 0329/3253] gildas: ignore clang warnings for unused command
 line arguments

See #46044
---
 pkgs/applications/science/astronomy/gildas/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 8b01ef0c7713..d74eee4190df 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
+
   configurePhase=''
     substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
     substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env}

From 4cd94bb5b89821dcd7478420e3e8fa48d591a5e7 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 5 Sep 2018 14:33:51 +0300
Subject: [PATCH 0330/3253] wireguard: 0.0.20180809 -> 0.0.20180904

---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 96e2a094ac0a..f93596b8e8fb 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180809";
+  version = "0.0.20180904";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "07sbaignf8l4lndfxypgacaf2qmgyfkv1j5z7kn0cw5mgfsphmkx";
+    sha256 = "0slf6lchzhb2san1hsqnny1sdmxq8rzqwz355f33zsgaj6qh1gmk";
   };
 
   sourceRoot = "source/src/tools";

From f685edba08787e1d3021324871110a5f5495f221 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Sep 2018 08:21:33 -0400
Subject: [PATCH 0331/3253] linux: 4.4.153 -> 4.4.154

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 7c5f345e3400..0872856c1190 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.153";
+  version = "4.4.154";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00jlajwbq7w5cxzzaa5mib5qvihqab3ysfq401b71ji2bi8ma8qg";
+    sha256 = "1j00y6hgj4c82y3j0gaqj68kf46fwxz1y5wx6ry5sgxnr3xp12z0";
   };
 } // (args.argsOverride or {}))

From 92010b7a88f9cf5fe76dbb6134153826d091a1dd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Sep 2018 08:21:43 -0400
Subject: [PATCH 0332/3253] linux: 4.9.124 -> 4.9.125

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index ed0075b7876b..068cf25f0053 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.124";
+  version = "4.9.125";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04a3iqy6divkd9bamn60d0v8jkls2jbip7qn0m82dlcdikab19jw";
+    sha256 = "1jqi25ld83l57lzcbhrzdnmsj4isz686ivdj0wfsrgxyc7pxwr57";
   };
 } // (args.argsOverride or {}))

From de9a2fd061478e6fd5bc49ccf72432523d2c55ff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Sep 2018 08:21:51 -0400
Subject: [PATCH 0333/3253] linux: 4.14.67 -> 4.14.68

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 000764eca9b3..eee2b132ae29 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.67";
+  version = "4.14.68";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1fkha288nv5vk2l13dj0xj09c2pxvipysdaaga7sfcvjq9nhajrz";
+    sha256 = "1446sbyysrv6hws35nnippa1mz4g31w7sc433svg4fq3jwavy7br";
   };
 } // (args.argsOverride or {}))

From 25cad43f85ae4b956bf4839d2b6c4b2a7ee06092 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Sep 2018 08:22:02 -0400
Subject: [PATCH 0334/3253] linux: 4.18.5 -> 4.18.6

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index e76beadc27bf..22bbd73f9859 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.5";
+  version = "4.18.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1ga7ys6s5d9dk1ly9722sbik1y6kbc3w6nw9pw86zpzdh0v0l2gv";
+    sha256 = "1518q822fs28sfdqwsibj3bpibzj5r2dqfr0skv7l8cid3yrgnq5";
   };
 } // (args.argsOverride or {}))

From d89b1f0fbf4abacef99c5fe7d1280241d070a925 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 5 Sep 2018 15:53:38 +0200
Subject: [PATCH 0335/3253] spotify: 1.0.88.353.g15c26ea1-14 ->
 1.0.83.316.ge96b6e67-5

The recent update is broken. Playing a song causes spotify to segfault.
This is probably
https://community.spotify.com/t5/Desktop-Linux/Segfault-with-the-new-update/td-p/4554830#,
which was recognized by upstream and will hopefully be fixed soon.
---
 pkgs/applications/audio/spotify/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1639ab34b6cf..81cda4edaedb 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,14 +5,14 @@
 let
   # TO UPDATE: just execute the ./update.sh script (won't do anything if there is no update)
   # "rev" decides what is actually being downloaded
-  version = "1.0.88.353.g15c26ea1-14";
+  version = "1.0.83.316.ge96b6e67-5";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
-  # More exapmles of api usage:
+  # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "19";
+  rev = "17";
 
 
   deps = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "3a068cbe3c1fca84ae67e28830216f993aa459947517956897c3b3f63063005c9db646960e85185b149747ffc302060c208a7f9968ea69d50a3496067089f3db";
+    sha512 = "19bbr4142shsl4qrikf48vq7kyrd4k4jbsada13qxicxps46a9bx51vjm2hkijqv739c1gdkgzwx7llyk95z26lhrz53shm2n5ij8xi";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];

From 348a153781bf5a65df5e9f3d65d5db0dddbe8256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Wed, 5 Sep 2018 16:22:52 +0200
Subject: [PATCH 0336/3253] pythonPackages.thinc: fix darwin build (#46092)

thinc uses Accelerate on macOS as a blas library. Add the necessary
dependencies to allow building on unsandboxed Darwin machines.
---
 pkgs/development/python-modules/thinc/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 321b1fb11816..6217a4200574 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -6,6 +6,7 @@
 , pytest
 , cython
 , cymem
+, darwin
 , msgpack-numpy
 , msgpack-python
 , preshed
@@ -40,6 +41,10 @@ buildPythonPackage rec {
       --replace "hypothesis>=2,<3" "hypothesis>=2"
   '';
 
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    Accelerate CoreFoundation CoreGraphics CoreVideo
+  ]);
+
   propagatedBuildInputs = [
    cython
    cymem

From 7cafc36d28a60d3be28a96d09607f39f5f348f08 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 5 Sep 2018 15:33:57 +0100
Subject: [PATCH 0337/3253] cargo-edit: 0.2.0 -> 0.3.0

---
 .../package-management/cargo-edit/Cargo.nix   | 3148 +++++++++++++++++
 .../cargo-edit/cargo-edit.nix                 | 1905 ----------
 .../package-management/cargo-edit/default.nix |    9 +-
 3 files changed, 3153 insertions(+), 1909 deletions(-)
 create mode 100644 pkgs/tools/package-management/cargo-edit/Cargo.nix
 delete mode 100644 pkgs/tools/package-management/cargo-edit/cargo-edit.nix

diff --git a/pkgs/tools/package-management/cargo-edit/Cargo.nix b/pkgs/tools/package-management/cargo-edit/Cargo.nix
new file mode 100644
index 000000000000..fa6cfaab387f
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-edit/Cargo.nix
@@ -0,0 +1,3148 @@
+# Generated by carnix 0.7.2: carnix nix
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+    abi = buildPlatform.parsed.abi.name;
+    include = includedFiles: src: builtins.filterSource (path: type:
+      lib.lists.any (f:
+        let p = toString (src + ("/" + f)); in
+        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+      ) includedFiles
+    ) src;
+    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+    mapFeatures = features: map (fun: fun { features = features; });
+    mkFeatures = feat: lib.lists.foldl (features: featureName:
+      if feat.${featureName} or false then
+        [ featureName ] ++ features
+      else
+        features
+    ) [] (builtins.attrNames feat);
+in
+rec {
+  cargo_edit = f: cargo_edit_0_3_0 { features = cargo_edit_0_3_0_features { cargo_edit_0_3_0 = f; }; };
+  __all = [ (cargo_edit {}) ];
+  adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "adler32";
+    version = "1.0.3";
+    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
+    sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb";
+    inherit dependencies buildDependencies features;
+  };
+  aho_corasick_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "aho-corasick";
+    version = "0.6.6";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0ap5lv1q6ylmzq70bjgg66dsa6p9926gwv2q4z0chfjnii8hczq8";
+    libName = "aho_corasick";
+    crateBin = [ {  name = "aho-corasick-dot";  path = "src/main.rs"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ansi_term";
+    version = "0.11.0";
+    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
+    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
+    inherit dependencies buildDependencies features;
+  };
+  arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "arrayvec";
+    version = "0.4.7";
+    authors = [ "bluss" ];
+    sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4";
+    inherit dependencies buildDependencies features;
+  };
+  ascii_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ascii";
+    version = "0.7.1";
+    authors = [ "Thomas Bahn <thomas@thomas-bahn.net>" "Torbjørn Birch Moltu <t.b.moltu@lyse.net>" "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "0fy9rh316vcc4v0k8d1p2gi3a3wpiwj5bm2mw0yqzs8xvz6yd1ax";
+    inherit dependencies buildDependencies features;
+  };
+  assert_cli_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "assert_cli";
+    version = "0.6.3";
+    authors = [ "Pascal Hertleif <killercup@gmail.com>" "Ed Page <eopage@gmail.com>" ];
+    sha256 = "1yx4phpiqvs83gin33hnqcl30dsp3imzvfbahmp4qqpmpp5hzgcv";
+    crateBin = [ {  name = "assert_fixture"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "atty";
+    version = "0.2.11";
+    authors = [ "softprops <d.tangren@gmail.com>" ];
+    sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20";
+    inherit dependencies buildDependencies features;
+  };
+  backtrace_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "backtrace";
+    version = "0.3.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
+    sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm";
+    inherit dependencies buildDependencies features;
+  };
+  backtrace_sys_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "backtrace-sys";
+    version = "0.1.23";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0sx7h7bl5j5dj4hlk7bcf8fwbhrxrvq2hfpy70vw2140gnlrl9dw";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "base64";
+    version = "0.9.2";
+    authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ];
+    sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1";
+    inherit dependencies buildDependencies features;
+  };
+  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bitflags";
+    version = "0.9.1";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
+    inherit dependencies buildDependencies features;
+  };
+  bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bitflags";
+    version = "1.0.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw";
+    inherit dependencies buildDependencies features;
+  };
+  build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "build_const";
+    version = "0.2.1";
+    authors = [ "Garrett Berg <vitiral@gmail.com>" ];
+    sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl";
+    inherit dependencies buildDependencies features;
+  };
+  byteorder_1_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "byteorder";
+    version = "1.2.4";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "095xbm5bi23fkbfb97kg81x02dymfmd2kp5nl93rvw6dar2kpwyw";
+    inherit dependencies buildDependencies features;
+  };
+  bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bytes";
+    version = "0.4.9";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6";
+    inherit dependencies buildDependencies features;
+  };
+  cargo_edit_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cargo-edit";
+    version = "0.3.0";
+    authors = [ "Without Boats <lee@libertad.ucsd.edu>" "Pascal Hertleif <killercup@gmail.com>" "Sebastian Garrido <sebasgarcep@gmail.com>" "Jonas Platte <mail@jonasplatte.de>" "Benjamin Gill <git@bgill.eu>" "Andronik Ordian <write@reusable.software>" ];
+    sha256 = "1zyf52x82slh27s6bzc6pmmbgp7cfr1xpmsp7i3zy0nd1p4gd13f";
+    crateBin = [ {  name = "cargo-add";  path = "src/bin/add/main.rs"; } {  name = "cargo-rm";  path = "src/bin/rm/main.rs"; } {  name = "cargo-upgrade";  path = "src/bin/upgrade/main.rs"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  cargo_metadata_0_5_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cargo_metadata";
+    version = "0.5.8";
+    authors = [ "Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>" ];
+    sha256 = "0vkkvpxmspkx80iq6vlrh8972g1b9f8qb92qy75daz43x16qnbd2";
+    inherit dependencies buildDependencies features;
+  };
+  cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cc";
+    version = "1.0.18";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx";
+    inherit dependencies buildDependencies features;
+  };
+  cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cfg-if";
+    version = "0.1.4";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4";
+    inherit dependencies buildDependencies features;
+  };
+  chrono_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "chrono";
+    version = "0.4.5";
+    authors = [ "Kang Seonghoon <public+rust@mearie.org>" "Brandon W Maister <quodlibetor@gmail.com>" ];
+    sha256 = "0v3gpbkaxjsskil0si321bak9p0k1sfz43cx9p50kvx0s5p3x0yr";
+    inherit dependencies buildDependencies features;
+  };
+  colored_1_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "colored";
+    version = "1.6.1";
+    authors = [ "Thomas Wickham <mackwic@gmail.com>" ];
+    sha256 = "0n3ja64sdiafp751nyq97c8rvrn8xqw036461i7q4n47yiqxn8rw";
+    inherit dependencies buildDependencies features;
+  };
+  combine_3_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "combine";
+    version = "3.3.6";
+    authors = [ "Markus Westerlind <marwes91@gmail.com>" ];
+    sha256 = "1wzxpn0ipz1n7d9ygcc8rh9a59lk4mh2jq5asxa7cgqgdzbhicys";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation-sys";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crc";
+    version = "1.8.1";
+    authors = [ "Rui Hu <code@mrhooray.com>" ];
+    sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-deque";
+    version = "0.3.1";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-epoch";
+    version = "0.4.3";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3";
+    inherit dependencies buildDependencies features;
+  };
+  crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crossbeam-utils";
+    version = "0.3.2";
+    authors = [ "The Crossbeam Project Developers" ];
+    sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql";
+    inherit dependencies buildDependencies features;
+  };
+  difference_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "difference";
+    version = "2.0.0";
+    authors = [ "Johann Hofmann <mail@johann-hofmann.com>" ];
+    sha256 = "1rk24wxxkhhw8drhda229dfy2nb64vvcz0ras6lq7va6wswlrc49";
+    crateBin = [ {  name = "difference"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  docopt_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "docopt";
+    version = "1.0.0";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "009xdzqzyrx0yq390vbjbr6m9s8pyazq5r6gf7bchygy9r4p40hr";
+    crateBin = [ {  name = "docopt-wordlist";  path = "src/wordlist.rs"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "dtoa";
+    version = "0.4.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
+    inherit dependencies buildDependencies features;
+  };
+  either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "either";
+    version = "1.5.0";
+    authors = [ "bluss" ];
+    sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
+    inherit dependencies buildDependencies features;
+  };
+  encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "encoding_rs";
+    version = "0.7.2";
+    authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ];
+    sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q";
+    inherit dependencies buildDependencies features;
+  };
+  env_proxy_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "env_proxy";
+    version = "0.2.0";
+    authors = [ "Ivan Nejgebauer <inejge@gmail.com>" ];
+    sha256 = "178vn5agzxbq6a7pgpkvaf74ilsqk8d010r4qbbf88l9cs2g8qz2";
+    inherit dependencies buildDependencies features;
+  };
+  environment_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "environment";
+    version = "0.1.1";
+    authors = [ "Freyskeyd <simon.paitrault@gmail.com>" ];
+    sha256 = "1dx1xi9851lvigfic05j9r2d5rf71v9b4bg2mh7jj6z6qccfq8nb";
+    inherit dependencies buildDependencies features;
+  };
+  error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "error-chain";
+    version = "0.11.0";
+    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
+    sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
+    inherit dependencies buildDependencies features;
+  };
+  failure_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "failure";
+    version = "0.1.1";
+    authors = [ "Without Boats <boats@mozilla.com>" ];
+    sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk";
+    inherit dependencies buildDependencies features;
+  };
+  failure_derive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "failure_derive";
+    version = "0.1.1";
+    authors = [ "Without Boats <woboats@gmail.com>" ];
+    sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i";
+    procMacro = true;
+    inherit dependencies buildDependencies features;
+  };
+  foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "foreign-types";
+    version = "0.3.2";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8";
+    inherit dependencies buildDependencies features;
+  };
+  foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "foreign-types-shared";
+    version = "0.1.1";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
+    inherit dependencies buildDependencies features;
+  };
+  fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "fuchsia-zircon";
+    version = "0.3.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
+    inherit dependencies buildDependencies features;
+  };
+  fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "fuchsia-zircon-sys";
+    version = "0.3.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
+    inherit dependencies buildDependencies features;
+  };
+  futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures";
+    version = "0.1.23";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21";
+    inherit dependencies buildDependencies features;
+  };
+  futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures-cpupool";
+    version = "0.1.8";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c";
+    inherit dependencies buildDependencies features;
+  };
+  httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "httparse";
+    version = "1.3.2";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper";
+    version = "0.11.27";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper-tls";
+    version = "0.1.4";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "1242mxvkgkm936fcsfcmmwwb5blclf0xld4d6gqzbvhlfc9yhnl8";
+    inherit dependencies buildDependencies features;
+  };
+  idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "idna";
+    version = "0.1.5";
+    authors = [ "The rust-url developers" ];
+    sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy";
+    inherit dependencies buildDependencies features;
+  };
+  iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "iovec";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r";
+    inherit dependencies buildDependencies features;
+  };
+  itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "itoa";
+    version = "0.4.2";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v";
+    inherit dependencies buildDependencies features;
+  };
+  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "kernel32-sys";
+    version = "0.2.2";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+    libName = "kernel32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "language-tags";
+    version = "0.2.2";
+    authors = [ "Pyfisch <pyfisch@gmail.com>" ];
+    sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy";
+    inherit dependencies buildDependencies features;
+  };
+  lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "0.2.11";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
+    inherit dependencies buildDependencies features;
+  };
+  lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "1.0.2";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r";
+    inherit dependencies buildDependencies features;
+  };
+  lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazycell";
+    version = "0.6.0";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ];
+    sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r";
+    inherit dependencies buildDependencies features;
+  };
+  libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libc";
+    version = "0.2.42";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx";
+    inherit dependencies buildDependencies features;
+  };
+  libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libflate";
+    version = "0.1.16";
+    authors = [ "Takeru Ohta <phjgt308@gmail.com>" ];
+    sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n";
+    inherit dependencies buildDependencies features;
+  };
+  linked_hash_map_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "linked-hash-map";
+    version = "0.5.1";
+    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
+    sha256 = "1f29c7j53z7w5v0g115yii9dmmbsahr93ak375g48vi75v3p4030";
+    inherit dependencies buildDependencies features;
+  };
+  log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "log";
+    version = "0.3.9";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
+    inherit dependencies buildDependencies features;
+  };
+  log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "log";
+    version = "0.4.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250";
+    inherit dependencies buildDependencies features;
+  };
+  matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "matches";
+    version = "0.1.7";
+    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "memchr";
+    version = "2.0.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
+    sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
+    inherit dependencies buildDependencies features;
+  };
+  memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "memoffset";
+    version = "0.2.1";
+    authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ];
+    sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
+    inherit dependencies buildDependencies features;
+  };
+  mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mime";
+    version = "0.3.8";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3";
+    inherit dependencies buildDependencies features;
+  };
+  mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mime_guess";
+    version = "2.0.0-alpha.6";
+    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
+    sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db";
+    inherit dependencies buildDependencies features;
+  };
+  mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mio";
+    version = "0.6.15";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa";
+    inherit dependencies buildDependencies features;
+  };
+  miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "miow";
+    version = "0.2.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
+    inherit dependencies buildDependencies features;
+  };
+  native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "native-tls";
+    version = "0.1.5";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf";
+    inherit dependencies buildDependencies features;
+  };
+  net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "net2";
+    version = "0.2.33";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq";
+    inherit dependencies buildDependencies features;
+  };
+  nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "nodrop";
+    version = "0.1.12";
+    authors = [ "bluss" ];
+    sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d";
+    inherit dependencies buildDependencies features;
+  };
+  num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-integer";
+    version = "0.1.39";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-traits";
+    version = "0.2.5";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num_cpus";
+    version = "1.8.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl";
+    version = "0.9.24";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl-sys";
+    version = "0.9.33";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6";
+    build = "build/main.rs";
+    inherit dependencies buildDependencies features;
+  };
+  pad_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pad";
+    version = "0.1.5";
+    authors = [ "Ben S <ogham@bsago.me>" ];
+    sha256 = "081qzwl58r1rn5b7m5pvy2xyfk4amm59f3i1gf95417s71gd4j53";
+    inherit dependencies buildDependencies features;
+  };
+  percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "percent-encoding";
+    version = "1.0.1";
+    authors = [ "The rust-url developers" ];
+    sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_codegen";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs";
+    inherit dependencies buildDependencies features;
+  };
+  phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_generator";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k";
+    inherit dependencies buildDependencies features;
+  };
+  phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "phf_shared";
+    version = "0.7.22";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pkg-config";
+    version = "0.3.12";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh";
+    inherit dependencies buildDependencies features;
+  };
+  pretty_assertions_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pretty_assertions";
+    version = "0.5.1";
+    authors = [ "Colin Kiegel <kiegel@gmx.de>" "Florent Fayolle <florent.fayolle69@gmail.com>" ];
+    sha256 = "0vlfprmgch79bvnp02mr8ham8wld0yrx29nbx6sv1srf5djzplj1";
+    inherit dependencies buildDependencies features;
+  };
+  proc_macro2_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "proc-macro2";
+    version = "0.4.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1qmfx3z2xvsgwsqqkhri339i4spk5wkxf5y4j8sg47ggig2y00rh";
+    inherit dependencies buildDependencies features;
+  };
+  quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "quote";
+    version = "0.3.15";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
+    inherit dependencies buildDependencies features;
+  };
+  quote_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "quote";
+    version = "0.6.4";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1x3sxi9vpn4sayj4lbi0wh483b4iphwfsfkkk2gj3z89sqw3wkwg";
+    inherit dependencies buildDependencies features;
+  };
+  rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rand";
+    version = "0.4.2";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
+    inherit dependencies buildDependencies features;
+  };
+  redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "redox_syscall";
+    version = "0.1.40";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
+    libName = "syscall";
+    inherit dependencies buildDependencies features;
+  };
+  redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "redox_termios";
+    version = "0.1.1";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
+    libPath = "src/lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  regex_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex";
+    version = "1.0.3";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0ksq2bc2g0xhrkpzzfr8l2vidw6c04mwgynwjbwcx7shfrwgw0lx";
+    inherit dependencies buildDependencies features;
+  };
+  regex_syntax_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex-syntax";
+    version = "0.6.2";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw";
+    inherit dependencies buildDependencies features;
+  };
+  relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "relay";
+    version = "0.1.1";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r";
+    inherit dependencies buildDependencies features;
+  };
+  remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "remove_dir_all";
+    version = "0.5.1";
+    authors = [ "Aaronepower <theaaronepower@gmail.com>" ];
+    sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7";
+    inherit dependencies buildDependencies features;
+  };
+  reqwest_0_8_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "reqwest";
+    version = "0.8.7";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1wfc77jir16xcjcdjn988f8bpaldd0la1gf1piphfxydp8i7gr56";
+    inherit dependencies buildDependencies features;
+  };
+  rustc_demangle_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rustc-demangle";
+    version = "0.1.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
+    inherit dependencies buildDependencies features;
+  };
+  safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "safemem";
+    version = "0.2.0";
+    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
+    sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm";
+    inherit dependencies buildDependencies features;
+  };
+  schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "schannel";
+    version = "0.1.13";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ];
+    sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3";
+    inherit dependencies buildDependencies features;
+  };
+  scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "scoped-tls";
+    version = "0.1.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla";
+    inherit dependencies buildDependencies features;
+  };
+  scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "scopeguard";
+    version = "0.3.3";
+    authors = [ "bluss" ];
+    sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework";
+    version = "0.1.16";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework-sys";
+    version = "0.1.16";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver";
+    version = "0.9.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
+    sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63";
+    inherit dependencies buildDependencies features;
+  };
+  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver-parser";
+    version = "0.7.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
+    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
+    inherit dependencies buildDependencies features;
+  };
+  serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde";
+    version = "1.0.70";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  serde_derive_1_0_75_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_derive";
+    version = "1.0.75";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "15v35aj079qg4dqhs8wjyinqifxgbkw8zf4sk44h43q3xha6znqy";
+    procMacro = true;
+    inherit dependencies buildDependencies features;
+  };
+  serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_json";
+    version = "1.0.24";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1";
+    inherit dependencies buildDependencies features;
+  };
+  serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_urlencoded";
+    version = "0.5.2";
+    authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ];
+    sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0";
+    inherit dependencies buildDependencies features;
+  };
+  siphasher_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "siphasher";
+    version = "0.2.3";
+    authors = [ "Frank Denis <github@pureftpd.org>" ];
+    sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
+    inherit dependencies buildDependencies features;
+  };
+  slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slab";
+    version = "0.4.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
+    inherit dependencies buildDependencies features;
+  };
+  strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "strsim";
+    version = "0.7.0";
+    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
+    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
+    inherit dependencies buildDependencies features;
+  };
+  syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "syn";
+    version = "0.11.11";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
+    inherit dependencies buildDependencies features;
+  };
+  syn_0_14_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "syn";
+    version = "0.14.5";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0b3xx5aa1shaz2i8mrvc7pmrj5lq2n6gmxyv2h1d7637gdky9smg";
+    inherit dependencies buildDependencies features;
+  };
+  synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "synom";
+    version = "0.11.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
+    inherit dependencies buildDependencies features;
+  };
+  synstructure_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "synstructure";
+    version = "0.6.1";
+    authors = [ "Michael Layzell <michael@thelayzells.com>" ];
+    sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk";
+    inherit dependencies buildDependencies features;
+  };
+  tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tempdir";
+    version = "0.3.7";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
+    inherit dependencies buildDependencies features;
+  };
+  termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "termcolor";
+    version = "0.3.6";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z";
+    inherit dependencies buildDependencies features;
+  };
+  termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "termion";
+    version = "1.5.1";
+    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
+    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
+    inherit dependencies buildDependencies features;
+  };
+  thread_local_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "thread_local";
+    version = "0.3.6";
+    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
+    sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i";
+    inherit dependencies buildDependencies features;
+  };
+  time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "time";
+    version = "0.1.40";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio";
+    version = "0.1.7";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-codec";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ];
+    sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-core";
+    version = "0.1.17";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-executor";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-fs";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-io";
+    version = "0.1.7";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-reactor";
+    version = "0.1.2";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-service";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-tcp";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-threadpool";
+    version = "0.1.5";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-timer";
+    version = "0.2.4";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-tls";
+    version = "0.1.4";
+    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-udp";
+    version = "0.1.1";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9";
+    inherit dependencies buildDependencies features;
+  };
+  toml_edit_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "toml_edit";
+    version = "0.1.3";
+    authors = [ "Andronik Ordian <write@reusable.software>" ];
+    sha256 = "0g5v5d141phzjk2crrgb0xcm65ysw76a01y75y597cmrg9ic6bjm";
+    inherit dependencies buildDependencies features;
+  };
+  try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "try-lock";
+    version = "0.1.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3";
+    inherit dependencies buildDependencies features;
+  };
+  ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ucd-util";
+    version = "0.1.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
+    inherit dependencies buildDependencies features;
+  };
+  unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicase";
+    version = "1.4.2";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicase";
+    version = "2.1.0";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-bidi";
+    version = "0.3.4";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
+    libName = "unicode_bidi";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-normalization";
+    version = "0.1.7";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-width";
+    version = "0.1.5";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-xid";
+    version = "0.0.4";
+    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-xid";
+    version = "0.1.0";
+    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
+    sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
+    inherit dependencies buildDependencies features;
+  };
+  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unreachable";
+    version = "1.0.0";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
+    inherit dependencies buildDependencies features;
+  };
+  url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "url";
+    version = "1.7.1";
+    authors = [ "The rust-url developers" ];
+    sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i";
+    inherit dependencies buildDependencies features;
+  };
+  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "utf8-ranges";
+    version = "1.0.0";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
+    inherit dependencies buildDependencies features;
+  };
+  uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "uuid";
+    version = "0.6.5";
+    authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ];
+    sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf";
+    inherit dependencies buildDependencies features;
+  };
+  vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "vcpkg";
+    version = "0.2.4";
+    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
+    sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml";
+    inherit dependencies buildDependencies features;
+  };
+  version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "version_check";
+    version = "0.1.4";
+    authors = [ "Sergio Benitez <sb@sergio.bz>" ];
+    sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck";
+    inherit dependencies buildDependencies features;
+  };
+  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "void";
+    version = "1.0.2";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
+    inherit dependencies buildDependencies features;
+  };
+  want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "want";
+    version = "0.0.4";
+    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
+    sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.2.8";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.3.5";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-build";
+    version = "0.1.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+    libName = "build";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-i686-pc-windows-gnu";
+    version = "0.4.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-x86_64-pc-windows-gnu";
+    version = "0.4.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "wincolor";
+    version = "0.1.6";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47";
+    inherit dependencies buildDependencies features;
+  };
+  ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ws2_32-sys";
+    version = "0.2.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc";
+    libName = "ws2_32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {};
+  adler32_1_0_3_features = f: updateFeatures f (rec {
+    adler32_1_0_3.default = (f.adler32_1_0_3.default or true);
+  }) [];
+  aho_corasick_0_6_6 = { features?(aho_corasick_0_6_6_features {}) }: aho_corasick_0_6_6_ {
+    dependencies = mapFeatures features ([ memchr_2_0_1 ]);
+  };
+  aho_corasick_0_6_6_features = f: updateFeatures f (rec {
+    aho_corasick_0_6_6.default = (f.aho_corasick_0_6_6.default or true);
+    memchr_2_0_1.default = true;
+  }) [ memchr_2_0_1_features ];
+  ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
+    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  ansi_term_0_11_0_features = f: updateFeatures f (rec {
+    ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.errhandlingapi = true;
+    winapi_0_3_5.processenv = true;
+  }) [ winapi_0_3_5_features ];
+  arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ {
+    dependencies = mapFeatures features ([ nodrop_0_1_12 ]);
+    features = mkFeatures (features.arrayvec_0_4_7 or {});
+  };
+  arrayvec_0_4_7_features = f: updateFeatures f (rec {
+    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true);
+    arrayvec_0_4_7.serde =
+      (f.arrayvec_0_4_7.serde or false) ||
+      (f.arrayvec_0_4_7.serde-1 or false) ||
+      (arrayvec_0_4_7.serde-1 or false);
+    arrayvec_0_4_7.std =
+      (f.arrayvec_0_4_7.std or false) ||
+      (f.arrayvec_0_4_7.default or false) ||
+      (arrayvec_0_4_7.default or false);
+    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false);
+  }) [ nodrop_0_1_12_features ];
+  ascii_0_7_1 = { features?(ascii_0_7_1_features {}) }: ascii_0_7_1_ {
+    features = mkFeatures (features.ascii_0_7_1 or {});
+  };
+  ascii_0_7_1_features = f: updateFeatures f (rec {
+    ascii_0_7_1.default = (f.ascii_0_7_1.default or true);
+  }) [];
+  assert_cli_0_6_3 = { features?(assert_cli_0_6_3_features {}) }: assert_cli_0_6_3_ {
+    dependencies = mapFeatures features ([ colored_1_6_1 difference_2_0_0 environment_0_1_1 failure_0_1_1 failure_derive_0_1_1 serde_json_1_0_24 ]);
+  };
+  assert_cli_0_6_3_features = f: updateFeatures f (rec {
+    assert_cli_0_6_3.default = (f.assert_cli_0_6_3.default or true);
+    colored_1_6_1.default = true;
+    difference_2_0_0.default = true;
+    environment_0_1_1.default = true;
+    failure_0_1_1.default = true;
+    failure_derive_0_1_1.default = true;
+    serde_json_1_0_24.default = true;
+  }) [ colored_1_6_1_features difference_2_0_0_features environment_0_1_1_features failure_0_1_1_features failure_derive_0_1_1_features serde_json_1_0_24_features ];
+  atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ {
+    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  atty_0_2_11_features = f: updateFeatures f (rec {
+    atty_0_2_11.default = (f.atty_0_2_11.default or true);
+    libc_0_2_42.default = (f.libc_0_2_42.default or false);
+    termion_1_5_1.default = true;
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwinbase = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.processenv = true;
+    winapi_0_3_5.winbase = true;
+  }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ];
+  backtrace_0_3_9 = { features?(backtrace_0_3_9_features {}) }: backtrace_0_3_9_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 rustc_demangle_0_1_9 ])
+      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
+      ++ (if features.backtrace_0_3_9.backtrace-sys or false then [ backtrace_sys_0_1_23 ] else [])) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ ]
+      ++ (if features.backtrace_0_3_9.winapi or false then [ winapi_0_3_5 ] else [])) else []);
+    features = mkFeatures (features.backtrace_0_3_9 or {});
+  };
+  backtrace_0_3_9_features = f: updateFeatures f (rec {
+    backtrace_0_3_9.addr2line =
+      (f.backtrace_0_3_9.addr2line or false) ||
+      (f.backtrace_0_3_9.gimli-symbolize or false) ||
+      (backtrace_0_3_9.gimli-symbolize or false);
+    backtrace_0_3_9.backtrace-sys =
+      (f.backtrace_0_3_9.backtrace-sys or false) ||
+      (f.backtrace_0_3_9.libbacktrace or false) ||
+      (backtrace_0_3_9.libbacktrace or false);
+    backtrace_0_3_9.coresymbolication =
+      (f.backtrace_0_3_9.coresymbolication or false) ||
+      (f.backtrace_0_3_9.default or false) ||
+      (backtrace_0_3_9.default or false);
+    backtrace_0_3_9.dbghelp =
+      (f.backtrace_0_3_9.dbghelp or false) ||
+      (f.backtrace_0_3_9.default or false) ||
+      (backtrace_0_3_9.default or false);
+    backtrace_0_3_9.default = (f.backtrace_0_3_9.default or true);
+    backtrace_0_3_9.dladdr =
+      (f.backtrace_0_3_9.dladdr or false) ||
+      (f.backtrace_0_3_9.default or false) ||
+      (backtrace_0_3_9.default or false);
+    backtrace_0_3_9.findshlibs =
+      (f.backtrace_0_3_9.findshlibs or false) ||
+      (f.backtrace_0_3_9.gimli-symbolize or false) ||
+      (backtrace_0_3_9.gimli-symbolize or false);
+    backtrace_0_3_9.gimli =
+      (f.backtrace_0_3_9.gimli or false) ||
+      (f.backtrace_0_3_9.gimli-symbolize or false) ||
+      (backtrace_0_3_9.gimli-symbolize or false);
+    backtrace_0_3_9.libbacktrace =
+      (f.backtrace_0_3_9.libbacktrace or false) ||
+      (f.backtrace_0_3_9.default or false) ||
+      (backtrace_0_3_9.default or false);
+    backtrace_0_3_9.libunwind =
+      (f.backtrace_0_3_9.libunwind or false) ||
+      (f.backtrace_0_3_9.default or false) ||
+      (backtrace_0_3_9.default or false);
+    backtrace_0_3_9.memmap =
+      (f.backtrace_0_3_9.memmap or false) ||
+      (f.backtrace_0_3_9.gimli-symbolize or false) ||
+      (backtrace_0_3_9.gimli-symbolize or false);
+    backtrace_0_3_9.object =
+      (f.backtrace_0_3_9.object or false) ||
+      (f.backtrace_0_3_9.gimli-symbolize or false) ||
+      (backtrace_0_3_9.gimli-symbolize or false);
+    backtrace_0_3_9.rustc-serialize =
+      (f.backtrace_0_3_9.rustc-serialize or false) ||
+      (f.backtrace_0_3_9.serialize-rustc or false) ||
+      (backtrace_0_3_9.serialize-rustc or false);
+    backtrace_0_3_9.serde =
+      (f.backtrace_0_3_9.serde or false) ||
+      (f.backtrace_0_3_9.serialize-serde or false) ||
+      (backtrace_0_3_9.serialize-serde or false);
+    backtrace_0_3_9.serde_derive =
+      (f.backtrace_0_3_9.serde_derive or false) ||
+      (f.backtrace_0_3_9.serialize-serde or false) ||
+      (backtrace_0_3_9.serialize-serde or false);
+    backtrace_0_3_9.winapi =
+      (f.backtrace_0_3_9.winapi or false) ||
+      (f.backtrace_0_3_9.dbghelp or false) ||
+      (backtrace_0_3_9.dbghelp or false);
+    backtrace_sys_0_1_23.default = true;
+    cfg_if_0_1_4.default = true;
+    libc_0_2_42.default = true;
+    rustc_demangle_0_1_9.default = true;
+    winapi_0_3_5.dbghelp = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.processthreadsapi = true;
+    winapi_0_3_5.std = true;
+    winapi_0_3_5.winnt = true;
+  }) [ cfg_if_0_1_4_features rustc_demangle_0_1_9_features backtrace_sys_0_1_23_features libc_0_2_42_features winapi_0_3_5_features ];
+  backtrace_sys_0_1_23 = { features?(backtrace_sys_0_1_23_features {}) }: backtrace_sys_0_1_23_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+    buildDependencies = mapFeatures features ([ cc_1_0_18 ]);
+  };
+  backtrace_sys_0_1_23_features = f: updateFeatures f (rec {
+    backtrace_sys_0_1_23.default = (f.backtrace_sys_0_1_23.default or true);
+    cc_1_0_18.default = true;
+    libc_0_2_42.default = true;
+  }) [ libc_0_2_42_features cc_1_0_18_features ];
+  base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ {
+    dependencies = mapFeatures features ([ byteorder_1_2_4 safemem_0_2_0 ]);
+  };
+  base64_0_9_2_features = f: updateFeatures f (rec {
+    base64_0_9_2.default = (f.base64_0_9_2.default or true);
+    byteorder_1_2_4.default = true;
+    safemem_0_2_0.default = true;
+  }) [ byteorder_1_2_4_features safemem_0_2_0_features ];
+  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
+    features = mkFeatures (features.bitflags_0_9_1 or {});
+  };
+  bitflags_0_9_1_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
+    bitflags_0_9_1.example_generated =
+      (f.bitflags_0_9_1.example_generated or false) ||
+      (f.bitflags_0_9_1.default or false) ||
+      (bitflags_0_9_1.default or false);
+  }) [];
+  bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
+    features = mkFeatures (features.bitflags_1_0_3 or {});
+  };
+  bitflags_1_0_3_features = f: updateFeatures f (rec {
+    bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
+  }) [];
+  build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ {
+    features = mkFeatures (features.build_const_0_2_1 or {});
+  };
+  build_const_0_2_1_features = f: updateFeatures f (rec {
+    build_const_0_2_1.default = (f.build_const_0_2_1.default or true);
+    build_const_0_2_1.std =
+      (f.build_const_0_2_1.std or false) ||
+      (f.build_const_0_2_1.default or false) ||
+      (build_const_0_2_1.default or false);
+  }) [];
+  byteorder_1_2_4 = { features?(byteorder_1_2_4_features {}) }: byteorder_1_2_4_ {
+    features = mkFeatures (features.byteorder_1_2_4 or {});
+  };
+  byteorder_1_2_4_features = f: updateFeatures f (rec {
+    byteorder_1_2_4.default = (f.byteorder_1_2_4.default or true);
+    byteorder_1_2_4.std =
+      (f.byteorder_1_2_4.std or false) ||
+      (f.byteorder_1_2_4.default or false) ||
+      (byteorder_1_2_4.default or false);
+  }) [];
+  bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ {
+    dependencies = mapFeatures features ([ byteorder_1_2_4 iovec_0_1_2 ]);
+    features = mkFeatures (features.bytes_0_4_9 or {});
+  };
+  bytes_0_4_9_features = f: updateFeatures f (rec {
+    byteorder_1_2_4.default = true;
+    byteorder_1_2_4.i128 =
+      (f.byteorder_1_2_4.i128 or false) ||
+      (bytes_0_4_9.i128 or false) ||
+      (f.bytes_0_4_9.i128 or false);
+    bytes_0_4_9.default = (f.bytes_0_4_9.default or true);
+    iovec_0_1_2.default = true;
+  }) [ byteorder_1_2_4_features iovec_0_1_2_features ];
+  cargo_edit_0_3_0 = { features?(cargo_edit_0_3_0_features {}) }: cargo_edit_0_3_0_ {
+    dependencies = mapFeatures features ([ atty_0_2_11 cargo_metadata_0_5_8 docopt_1_0_0 env_proxy_0_2_0 error_chain_0_11_0 pad_0_1_5 regex_1_0_3 reqwest_0_8_7 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 termcolor_0_3_6 toml_edit_0_1_3 ]);
+    features = mkFeatures (features.cargo_edit_0_3_0 or {});
+  };
+  cargo_edit_0_3_0_features = f: updateFeatures f (rec {
+    atty_0_2_11.default = true;
+    cargo_edit_0_3_0.add =
+      (f.cargo_edit_0_3_0.add or false) ||
+      (f.cargo_edit_0_3_0.default or false) ||
+      (cargo_edit_0_3_0.default or false);
+    cargo_edit_0_3_0.default = (f.cargo_edit_0_3_0.default or true);
+    cargo_edit_0_3_0.rm =
+      (f.cargo_edit_0_3_0.rm or false) ||
+      (f.cargo_edit_0_3_0.default or false) ||
+      (cargo_edit_0_3_0.default or false);
+    cargo_edit_0_3_0.upgrade =
+      (f.cargo_edit_0_3_0.upgrade or false) ||
+      (f.cargo_edit_0_3_0.default or false) ||
+      (cargo_edit_0_3_0.default or false);
+    cargo_metadata_0_5_8.default = true;
+    docopt_1_0_0.default = true;
+    env_proxy_0_2_0.default = true;
+    error_chain_0_11_0.default = true;
+    pad_0_1_5.default = true;
+    regex_1_0_3.default = true;
+    reqwest_0_8_7.default = true;
+    semver_0_9_0.default = true;
+    semver_0_9_0.serde = true;
+    serde_1_0_70.default = true;
+    serde_derive_1_0_75.default = true;
+    serde_json_1_0_24.default = true;
+    termcolor_0_3_6.default = true;
+    toml_edit_0_1_3.default = true;
+  }) [ atty_0_2_11_features cargo_metadata_0_5_8_features docopt_1_0_0_features env_proxy_0_2_0_features error_chain_0_11_0_features pad_0_1_5_features regex_1_0_3_features reqwest_0_8_7_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features termcolor_0_3_6_features toml_edit_0_1_3_features ];
+  cargo_metadata_0_5_8 = { features?(cargo_metadata_0_5_8_features {}) }: cargo_metadata_0_5_8_ {
+    dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 ]);
+    features = mkFeatures (features.cargo_metadata_0_5_8 or {});
+  };
+  cargo_metadata_0_5_8_features = f: updateFeatures f (rec {
+    cargo_metadata_0_5_8.backtrace =
+      (f.cargo_metadata_0_5_8.backtrace or false) ||
+      (f.cargo_metadata_0_5_8.default or false) ||
+      (cargo_metadata_0_5_8.default or false);
+    cargo_metadata_0_5_8.default = (f.cargo_metadata_0_5_8.default or true);
+    error_chain_0_11_0.backtrace =
+      (f.error_chain_0_11_0.backtrace or false) ||
+      (cargo_metadata_0_5_8.backtrace or false) ||
+      (f.cargo_metadata_0_5_8.backtrace or false);
+    error_chain_0_11_0.default = (f.error_chain_0_11_0.default or false);
+    semver_0_9_0.default = true;
+    semver_0_9_0.serde = true;
+    serde_1_0_70.default = true;
+    serde_derive_1_0_75.default = true;
+    serde_json_1_0_24.default = true;
+  }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features ];
+  cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.cc_1_0_18 or {});
+  };
+  cc_1_0_18_features = f: updateFeatures f (rec {
+    cc_1_0_18.default = (f.cc_1_0_18.default or true);
+    cc_1_0_18.rayon =
+      (f.cc_1_0_18.rayon or false) ||
+      (f.cc_1_0_18.parallel or false) ||
+      (cc_1_0_18.parallel or false);
+  }) [];
+  cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {};
+  cfg_if_0_1_4_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true);
+  }) [];
+  chrono_0_4_5 = { features?(chrono_0_4_5_features {}) }: chrono_0_4_5_ {
+    dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ]
+      ++ (if features.chrono_0_4_5.time or false then [ time_0_1_40 ] else []));
+    features = mkFeatures (features.chrono_0_4_5 or {});
+  };
+  chrono_0_4_5_features = f: updateFeatures f (rec {
+    chrono_0_4_5.clock =
+      (f.chrono_0_4_5.clock or false) ||
+      (f.chrono_0_4_5.default or false) ||
+      (chrono_0_4_5.default or false);
+    chrono_0_4_5.default = (f.chrono_0_4_5.default or true);
+    chrono_0_4_5.time =
+      (f.chrono_0_4_5.time or false) ||
+      (f.chrono_0_4_5.clock or false) ||
+      (chrono_0_4_5.clock or false);
+    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false);
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
+    time_0_1_40.default = true;
+  }) [ num_integer_0_1_39_features num_traits_0_2_5_features time_0_1_40_features ];
+  colored_1_6_1 = { features?(colored_1_6_1_features {}) }: colored_1_6_1_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 ]);
+    features = mkFeatures (features.colored_1_6_1 or {});
+  };
+  colored_1_6_1_features = f: updateFeatures f (rec {
+    colored_1_6_1.default = (f.colored_1_6_1.default or true);
+    lazy_static_1_0_2.default = true;
+  }) [ lazy_static_1_0_2_features ];
+  combine_3_3_6 = { features?(combine_3_3_6_features {}) }: combine_3_3_6_ {
+    dependencies = mapFeatures features ([ ascii_0_7_1 byteorder_1_2_4 either_1_5_0 memchr_2_0_1 unreachable_1_0_0 ]);
+    features = mkFeatures (features.combine_3_3_6 or {});
+  };
+  combine_3_3_6_features = f: updateFeatures f (rec {
+    ascii_0_7_1.default = true;
+    byteorder_1_2_4.default = true;
+    combine_3_3_6.default = (f.combine_3_3_6.default or true);
+    combine_3_3_6.regex =
+      (f.combine_3_3_6.regex or false) ||
+      (f.combine_3_3_6.doc or false) ||
+      (combine_3_3_6.doc or false);
+    combine_3_3_6.std =
+      (f.combine_3_3_6.std or false) ||
+      (f.combine_3_3_6.default or false) ||
+      (combine_3_3_6.default or false);
+    either_1_5_0.default = true;
+    memchr_2_0_1.default = (f.memchr_2_0_1.default or false);
+    memchr_2_0_1.use_std =
+      (f.memchr_2_0_1.use_std or false) ||
+      (combine_3_3_6.std or false) ||
+      (f.combine_3_3_6.std or false);
+    unreachable_1_0_0.default = true;
+  }) [ ascii_0_7_1_features byteorder_1_2_4_features either_1_5_0_features memchr_2_0_1_features unreachable_1_0_0_features ];
+  core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
+  };
+  core_foundation_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true);
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
+  core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+  };
+  core_foundation_sys_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true);
+    libc_0_2_42.default = true;
+  }) [ libc_0_2_42_features ];
+  crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ {
+    buildDependencies = mapFeatures features ([ build_const_0_2_1 ]);
+    features = mkFeatures (features.crc_1_8_1 or {});
+  };
+  crc_1_8_1_features = f: updateFeatures f (rec {
+    build_const_0_2_1.default = true;
+    crc_1_8_1.default = (f.crc_1_8_1.default or true);
+    crc_1_8_1.std =
+      (f.crc_1_8_1.std or false) ||
+      (f.crc_1_8_1.default or false) ||
+      (crc_1_8_1.default or false);
+  }) [ build_const_0_2_1_features ];
+  crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ {
+    dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]);
+  };
+  crossbeam_deque_0_3_1_features = f: updateFeatures f (rec {
+    crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true);
+    crossbeam_epoch_0_4_3.default = true;
+    crossbeam_utils_0_3_2.default = true;
+  }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ];
+  crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ {
+    dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ]
+      ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else []));
+    features = mkFeatures (features.crossbeam_epoch_0_4_3 or {});
+  };
+  crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec {
+    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false);
+    arrayvec_0_4_7.use_union =
+      (f.arrayvec_0_4_7.use_union or false) ||
+      (crossbeam_epoch_0_4_3.nightly or false) ||
+      (f.crossbeam_epoch_0_4_3.nightly or false);
+    cfg_if_0_1_4.default = true;
+    crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true);
+    crossbeam_epoch_0_4_3.lazy_static =
+      (f.crossbeam_epoch_0_4_3.lazy_static or false) ||
+      (f.crossbeam_epoch_0_4_3.use_std or false) ||
+      (crossbeam_epoch_0_4_3.use_std or false);
+    crossbeam_epoch_0_4_3.use_std =
+      (f.crossbeam_epoch_0_4_3.use_std or false) ||
+      (f.crossbeam_epoch_0_4_3.default or false) ||
+      (crossbeam_epoch_0_4_3.default or false);
+    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false);
+    crossbeam_utils_0_3_2.use_std =
+      (f.crossbeam_utils_0_3_2.use_std or false) ||
+      (crossbeam_epoch_0_4_3.use_std or false) ||
+      (f.crossbeam_epoch_0_4_3.use_std or false);
+    lazy_static_1_0_2.default = true;
+    memoffset_0_2_1.default = true;
+    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false);
+  }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ];
+  crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.crossbeam_utils_0_3_2 or {});
+  };
+  crossbeam_utils_0_3_2_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true);
+    crossbeam_utils_0_3_2.use_std =
+      (f.crossbeam_utils_0_3_2.use_std or false) ||
+      (f.crossbeam_utils_0_3_2.default or false) ||
+      (crossbeam_utils_0_3_2.default or false);
+  }) [ cfg_if_0_1_4_features ];
+  difference_2_0_0 = { features?(difference_2_0_0_features {}) }: difference_2_0_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.difference_2_0_0 or {});
+  };
+  difference_2_0_0_features = f: updateFeatures f (rec {
+    difference_2_0_0.default = (f.difference_2_0_0.default or true);
+    difference_2_0_0.getopts =
+      (f.difference_2_0_0.getopts or false) ||
+      (f.difference_2_0_0.bin or false) ||
+      (difference_2_0_0.bin or false);
+  }) [];
+  docopt_1_0_0 = { features?(docopt_1_0_0_features {}) }: docopt_1_0_0_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 regex_1_0_3 serde_1_0_70 serde_derive_1_0_75 strsim_0_7_0 ]);
+  };
+  docopt_1_0_0_features = f: updateFeatures f (rec {
+    docopt_1_0_0.default = (f.docopt_1_0_0.default or true);
+    lazy_static_1_0_2.default = true;
+    regex_1_0_3.default = true;
+    serde_1_0_70.default = true;
+    serde_derive_1_0_75.default = true;
+    strsim_0_7_0.default = true;
+  }) [ lazy_static_1_0_2_features regex_1_0_3_features serde_1_0_70_features serde_derive_1_0_75_features strsim_0_7_0_features ];
+  dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {};
+  dtoa_0_4_3_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true);
+  }) [];
+  either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.either_1_5_0 or {});
+  };
+  either_1_5_0_features = f: updateFeatures f (rec {
+    either_1_5_0.default = (f.either_1_5_0.default or true);
+    either_1_5_0.use_std =
+      (f.either_1_5_0.use_std or false) ||
+      (f.either_1_5_0.default or false) ||
+      (either_1_5_0.default or false);
+  }) [];
+  encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.encoding_rs_0_7_2 or {});
+  };
+  encoding_rs_0_7_2_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true);
+    encoding_rs_0_7_2.simd =
+      (f.encoding_rs_0_7_2.simd or false) ||
+      (f.encoding_rs_0_7_2.simd-accel or false) ||
+      (encoding_rs_0_7_2.simd-accel or false);
+  }) [ cfg_if_0_1_4_features ];
+  env_proxy_0_2_0 = { features?(env_proxy_0_2_0_features {}) }: env_proxy_0_2_0_ {
+    dependencies = mapFeatures features ([ log_0_3_9 url_1_7_1 ]);
+  };
+  env_proxy_0_2_0_features = f: updateFeatures f (rec {
+    env_proxy_0_2_0.default = (f.env_proxy_0_2_0.default or true);
+    log_0_3_9.default = true;
+    url_1_7_1.default = true;
+  }) [ log_0_3_9_features url_1_7_1_features ];
+  environment_0_1_1 = { features?(environment_0_1_1_features {}) }: environment_0_1_1_ {};
+  environment_0_1_1_features = f: updateFeatures f (rec {
+    environment_0_1_1.default = (f.environment_0_1_1.default or true);
+  }) [];
+  error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_9 ] else []));
+    features = mkFeatures (features.error_chain_0_11_0 or {});
+  };
+  error_chain_0_11_0_features = f: updateFeatures f (rec {
+    backtrace_0_3_9.default = true;
+    error_chain_0_11_0.backtrace =
+      (f.error_chain_0_11_0.backtrace or false) ||
+      (f.error_chain_0_11_0.default or false) ||
+      (error_chain_0_11_0.default or false);
+    error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true);
+    error_chain_0_11_0.example_generated =
+      (f.error_chain_0_11_0.example_generated or false) ||
+      (f.error_chain_0_11_0.default or false) ||
+      (error_chain_0_11_0.default or false);
+  }) [ backtrace_0_3_9_features ];
+  failure_0_1_1 = { features?(failure_0_1_1_features {}) }: failure_0_1_1_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.failure_0_1_1.backtrace or false then [ backtrace_0_3_9 ] else [])
+      ++ (if features.failure_0_1_1.failure_derive or false then [ failure_derive_0_1_1 ] else []));
+    features = mkFeatures (features.failure_0_1_1 or {});
+  };
+  failure_0_1_1_features = f: updateFeatures f (rec {
+    backtrace_0_3_9.default = true;
+    failure_0_1_1.backtrace =
+      (f.failure_0_1_1.backtrace or false) ||
+      (f.failure_0_1_1.std or false) ||
+      (failure_0_1_1.std or false);
+    failure_0_1_1.default = (f.failure_0_1_1.default or true);
+    failure_0_1_1.derive =
+      (f.failure_0_1_1.derive or false) ||
+      (f.failure_0_1_1.default or false) ||
+      (failure_0_1_1.default or false);
+    failure_0_1_1.failure_derive =
+      (f.failure_0_1_1.failure_derive or false) ||
+      (f.failure_0_1_1.derive or false) ||
+      (failure_0_1_1.derive or false);
+    failure_0_1_1.std =
+      (f.failure_0_1_1.std or false) ||
+      (f.failure_0_1_1.default or false) ||
+      (failure_0_1_1.default or false);
+    failure_derive_0_1_1.default = true;
+  }) [ backtrace_0_3_9_features failure_derive_0_1_1_features ];
+  failure_derive_0_1_1 = { features?(failure_derive_0_1_1_features {}) }: failure_derive_0_1_1_ {
+    dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 synstructure_0_6_1 ]);
+    features = mkFeatures (features.failure_derive_0_1_1 or {});
+  };
+  failure_derive_0_1_1_features = f: updateFeatures f (rec {
+    failure_derive_0_1_1.default = (f.failure_derive_0_1_1.default or true);
+    failure_derive_0_1_1.std =
+      (f.failure_derive_0_1_1.std or false) ||
+      (f.failure_derive_0_1_1.default or false) ||
+      (failure_derive_0_1_1.default or false);
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = true;
+    synstructure_0_6_1.default = true;
+  }) [ quote_0_3_15_features syn_0_11_11_features synstructure_0_6_1_features ];
+  foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ {
+    dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]);
+  };
+  foreign_types_0_3_2_features = f: updateFeatures f (rec {
+    foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true);
+    foreign_types_shared_0_1_1.default = true;
+  }) [ foreign_types_shared_0_1_1_features ];
+  foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {};
+  foreign_types_shared_0_1_1_features = f: updateFeatures f (rec {
+    foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true);
+  }) [];
+  fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
+    dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
+  };
+  fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
+    bitflags_1_0_3.default = true;
+    fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
+    fuchsia_zircon_sys_0_3_3.default = true;
+  }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
+  fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
+  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
+    fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
+  }) [];
+  futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ {
+    features = mkFeatures (features.futures_0_1_23 or {});
+  };
+  futures_0_1_23_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = (f.futures_0_1_23.default or true);
+    futures_0_1_23.use_std =
+      (f.futures_0_1_23.use_std or false) ||
+      (f.futures_0_1_23.default or false) ||
+      (futures_0_1_23.default or false);
+    futures_0_1_23.with-deprecated =
+      (f.futures_0_1_23.with-deprecated or false) ||
+      (f.futures_0_1_23.default or false) ||
+      (futures_0_1_23.default or false);
+  }) [];
+  futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]);
+    features = mkFeatures (features.futures_cpupool_0_1_8 or {});
+  };
+  futures_cpupool_0_1_8_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = (f.futures_0_1_23.default or false);
+    futures_0_1_23.use_std = true;
+    futures_0_1_23.with-deprecated =
+      (f.futures_0_1_23.with-deprecated or false) ||
+      (futures_cpupool_0_1_8.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_8.with-deprecated or false);
+    futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true);
+    futures_cpupool_0_1_8.with-deprecated =
+      (f.futures_cpupool_0_1_8.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_8.default or false) ||
+      (futures_cpupool_0_1_8.default or false);
+    num_cpus_1_8_0.default = true;
+  }) [ futures_0_1_23_features num_cpus_1_8_0_features ];
+  httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ {
+    features = mkFeatures (features.httparse_1_3_2 or {});
+  };
+  httparse_1_3_2_features = f: updateFeatures f (rec {
+    httparse_1_3_2.default = (f.httparse_1_3_2.default or true);
+    httparse_1_3_2.std =
+      (f.httparse_1_3_2.std or false) ||
+      (f.httparse_1_3_2.default or false) ||
+      (httparse_1_3_2.default or false);
+  }) [];
+  hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ {
+    dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ]);
+    features = mkFeatures (features.hyper_0_11_27 or {});
+  };
+  hyper_0_11_27_features = f: updateFeatures f (rec {
+    base64_0_9_2.default = true;
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    futures_cpupool_0_1_8.default = true;
+    httparse_1_3_2.default = true;
+    hyper_0_11_27.default = (f.hyper_0_11_27.default or true);
+    hyper_0_11_27.http =
+      (f.hyper_0_11_27.http or false) ||
+      (f.hyper_0_11_27.compat or false) ||
+      (hyper_0_11_27.compat or false);
+    hyper_0_11_27.server-proto =
+      (f.hyper_0_11_27.server-proto or false) ||
+      (f.hyper_0_11_27.default or false) ||
+      (hyper_0_11_27.default or false);
+    hyper_0_11_27.tokio-proto =
+      (f.hyper_0_11_27.tokio-proto or false) ||
+      (f.hyper_0_11_27.server-proto or false) ||
+      (hyper_0_11_27.server-proto or false);
+    iovec_0_1_2.default = true;
+    language_tags_0_2_2.default = true;
+    log_0_4_3.default = true;
+    mime_0_3_8.default = true;
+    net2_0_2_33.default = true;
+    percent_encoding_1_0_1.default = true;
+    relay_0_1_1.default = true;
+    time_0_1_40.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_service_0_1_0.default = true;
+    unicase_2_1_0.default = true;
+    want_0_0_4.default = true;
+  }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ];
+  hyper_tls_0_1_4 = { features?(hyper_tls_0_1_4_features {}) }: hyper_tls_0_1_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]);
+  };
+  hyper_tls_0_1_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    hyper_0_11_27.default = (f.hyper_0_11_27.default or false);
+    hyper_tls_0_1_4.default = (f.hyper_tls_0_1_4.default or true);
+    native_tls_0_1_5.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_service_0_1_0.default = true;
+    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false);
+  }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ];
+  idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ {
+    dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
+  };
+  idna_0_1_5_features = f: updateFeatures f (rec {
+    idna_0_1_5.default = (f.idna_0_1_5.default or true);
+    matches_0_1_7.default = true;
+    unicode_bidi_0_3_4.default = true;
+    unicode_normalization_0_1_7.default = true;
+  }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
+  iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ {
+    dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []);
+  };
+  iovec_0_1_2_features = f: updateFeatures f (rec {
+    iovec_0_1_2.default = (f.iovec_0_1_2.default or true);
+    libc_0_2_42.default = true;
+    winapi_0_2_8.default = true;
+  }) [ libc_0_2_42_features winapi_0_2_8_features ];
+  itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ {
+    features = mkFeatures (features.itoa_0_4_2 or {});
+  };
+  itoa_0_4_2_features = f: updateFeatures f (rec {
+    itoa_0_4_2.default = (f.itoa_0_4_2.default or true);
+    itoa_0_4_2.std =
+      (f.itoa_0_4_2.std or false) ||
+      (f.itoa_0_4_2.default or false) ||
+      (itoa_0_4_2.default or false);
+  }) [];
+  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.language_tags_0_2_2 or {});
+  };
+  language_tags_0_2_2_features = f: updateFeatures f (rec {
+    language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true);
+    language_tags_0_2_2.heapsize =
+      (f.language_tags_0_2_2.heapsize or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+    language_tags_0_2_2.heapsize_plugin =
+      (f.language_tags_0_2_2.heapsize_plugin or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+  }) [];
+  lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazy_static_0_2_11 or {});
+  };
+  lazy_static_0_2_11_features = f: updateFeatures f (rec {
+    lazy_static_0_2_11.compiletest_rs =
+      (f.lazy_static_0_2_11.compiletest_rs or false) ||
+      (f.lazy_static_0_2_11.compiletest or false) ||
+      (lazy_static_0_2_11.compiletest or false);
+    lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true);
+    lazy_static_0_2_11.nightly =
+      (f.lazy_static_0_2_11.nightly or false) ||
+      (f.lazy_static_0_2_11.spin_no_std or false) ||
+      (lazy_static_0_2_11.spin_no_std or false);
+    lazy_static_0_2_11.spin =
+      (f.lazy_static_0_2_11.spin or false) ||
+      (f.lazy_static_0_2_11.spin_no_std or false) ||
+      (lazy_static_0_2_11.spin_no_std or false);
+  }) [];
+  lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazy_static_1_0_2 or {});
+  };
+  lazy_static_1_0_2_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true);
+    lazy_static_1_0_2.nightly =
+      (f.lazy_static_1_0_2.nightly or false) ||
+      (f.lazy_static_1_0_2.spin_no_std or false) ||
+      (lazy_static_1_0_2.spin_no_std or false);
+    lazy_static_1_0_2.spin =
+      (f.lazy_static_1_0_2.spin or false) ||
+      (f.lazy_static_1_0_2.spin_no_std or false) ||
+      (lazy_static_1_0_2.spin_no_std or false);
+  }) [];
+  lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazycell_0_6_0 or {});
+  };
+  lazycell_0_6_0_features = f: updateFeatures f (rec {
+    lazycell_0_6_0.clippy =
+      (f.lazycell_0_6_0.clippy or false) ||
+      (f.lazycell_0_6_0.nightly-testing or false) ||
+      (lazycell_0_6_0.nightly-testing or false);
+    lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true);
+    lazycell_0_6_0.nightly =
+      (f.lazycell_0_6_0.nightly or false) ||
+      (f.lazycell_0_6_0.nightly-testing or false) ||
+      (lazycell_0_6_0.nightly-testing or false);
+  }) [];
+  libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ {
+    features = mkFeatures (features.libc_0_2_42 or {});
+  };
+  libc_0_2_42_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = (f.libc_0_2_42.default or true);
+    libc_0_2_42.use_std =
+      (f.libc_0_2_42.use_std or false) ||
+      (f.libc_0_2_42.default or false) ||
+      (libc_0_2_42.default or false);
+  }) [];
+  libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ {
+    dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_4 crc_1_8_1 ]);
+  };
+  libflate_0_1_16_features = f: updateFeatures f (rec {
+    adler32_1_0_3.default = true;
+    byteorder_1_2_4.default = true;
+    crc_1_8_1.default = true;
+    libflate_0_1_16.default = (f.libflate_0_1_16.default or true);
+  }) [ adler32_1_0_3_features byteorder_1_2_4_features crc_1_8_1_features ];
+  linked_hash_map_0_5_1 = { features?(linked_hash_map_0_5_1_features {}) }: linked_hash_map_0_5_1_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.linked_hash_map_0_5_1 or {});
+  };
+  linked_hash_map_0_5_1_features = f: updateFeatures f (rec {
+    linked_hash_map_0_5_1.default = (f.linked_hash_map_0_5_1.default or true);
+    linked_hash_map_0_5_1.heapsize =
+      (f.linked_hash_map_0_5_1.heapsize or false) ||
+      (f.linked_hash_map_0_5_1.heapsize_impl or false) ||
+      (linked_hash_map_0_5_1.heapsize_impl or false);
+    linked_hash_map_0_5_1.serde =
+      (f.linked_hash_map_0_5_1.serde or false) ||
+      (f.linked_hash_map_0_5_1.serde_impl or false) ||
+      (linked_hash_map_0_5_1.serde_impl or false);
+    linked_hash_map_0_5_1.serde_test =
+      (f.linked_hash_map_0_5_1.serde_test or false) ||
+      (f.linked_hash_map_0_5_1.serde_impl or false) ||
+      (linked_hash_map_0_5_1.serde_impl or false);
+  }) [];
+  log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ {
+    dependencies = mapFeatures features ([ log_0_4_3 ]);
+    features = mkFeatures (features.log_0_3_9 or {});
+  };
+  log_0_3_9_features = f: updateFeatures f (rec {
+    log_0_3_9.default = (f.log_0_3_9.default or true);
+    log_0_3_9.use_std =
+      (f.log_0_3_9.use_std or false) ||
+      (f.log_0_3_9.default or false) ||
+      (log_0_3_9.default or false);
+    log_0_4_3.default = true;
+    log_0_4_3.max_level_debug =
+      (f.log_0_4_3.max_level_debug or false) ||
+      (log_0_3_9.max_level_debug or false) ||
+      (f.log_0_3_9.max_level_debug or false);
+    log_0_4_3.max_level_error =
+      (f.log_0_4_3.max_level_error or false) ||
+      (log_0_3_9.max_level_error or false) ||
+      (f.log_0_3_9.max_level_error or false);
+    log_0_4_3.max_level_info =
+      (f.log_0_4_3.max_level_info or false) ||
+      (log_0_3_9.max_level_info or false) ||
+      (f.log_0_3_9.max_level_info or false);
+    log_0_4_3.max_level_off =
+      (f.log_0_4_3.max_level_off or false) ||
+      (log_0_3_9.max_level_off or false) ||
+      (f.log_0_3_9.max_level_off or false);
+    log_0_4_3.max_level_trace =
+      (f.log_0_4_3.max_level_trace or false) ||
+      (log_0_3_9.max_level_trace or false) ||
+      (f.log_0_3_9.max_level_trace or false);
+    log_0_4_3.max_level_warn =
+      (f.log_0_4_3.max_level_warn or false) ||
+      (log_0_3_9.max_level_warn or false) ||
+      (f.log_0_3_9.max_level_warn or false);
+    log_0_4_3.release_max_level_debug =
+      (f.log_0_4_3.release_max_level_debug or false) ||
+      (log_0_3_9.release_max_level_debug or false) ||
+      (f.log_0_3_9.release_max_level_debug or false);
+    log_0_4_3.release_max_level_error =
+      (f.log_0_4_3.release_max_level_error or false) ||
+      (log_0_3_9.release_max_level_error or false) ||
+      (f.log_0_3_9.release_max_level_error or false);
+    log_0_4_3.release_max_level_info =
+      (f.log_0_4_3.release_max_level_info or false) ||
+      (log_0_3_9.release_max_level_info or false) ||
+      (f.log_0_3_9.release_max_level_info or false);
+    log_0_4_3.release_max_level_off =
+      (f.log_0_4_3.release_max_level_off or false) ||
+      (log_0_3_9.release_max_level_off or false) ||
+      (f.log_0_3_9.release_max_level_off or false);
+    log_0_4_3.release_max_level_trace =
+      (f.log_0_4_3.release_max_level_trace or false) ||
+      (log_0_3_9.release_max_level_trace or false) ||
+      (f.log_0_3_9.release_max_level_trace or false);
+    log_0_4_3.release_max_level_warn =
+      (f.log_0_4_3.release_max_level_warn or false) ||
+      (log_0_3_9.release_max_level_warn or false) ||
+      (f.log_0_3_9.release_max_level_warn or false);
+    log_0_4_3.std =
+      (f.log_0_4_3.std or false) ||
+      (log_0_3_9.use_std or false) ||
+      (f.log_0_3_9.use_std or false);
+  }) [ log_0_4_3_features ];
+  log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
+    features = mkFeatures (features.log_0_4_3 or {});
+  };
+  log_0_4_3_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    log_0_4_3.default = (f.log_0_4_3.default or true);
+  }) [ cfg_if_0_1_4_features ];
+  matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {};
+  matches_0_1_7_features = f: updateFeatures f (rec {
+    matches_0_1_7.default = (f.matches_0_1_7.default or true);
+  }) [];
+  memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_42 ] else []));
+    features = mkFeatures (features.memchr_2_0_1 or {});
+  };
+  memchr_2_0_1_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = (f.libc_0_2_42.default or false);
+    libc_0_2_42.use_std =
+      (f.libc_0_2_42.use_std or false) ||
+      (memchr_2_0_1.use_std or false) ||
+      (f.memchr_2_0_1.use_std or false);
+    memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
+    memchr_2_0_1.libc =
+      (f.memchr_2_0_1.libc or false) ||
+      (f.memchr_2_0_1.default or false) ||
+      (memchr_2_0_1.default or false) ||
+      (f.memchr_2_0_1.use_std or false) ||
+      (memchr_2_0_1.use_std or false);
+    memchr_2_0_1.use_std =
+      (f.memchr_2_0_1.use_std or false) ||
+      (f.memchr_2_0_1.default or false) ||
+      (memchr_2_0_1.default or false);
+  }) [ libc_0_2_42_features ];
+  memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {};
+  memoffset_0_2_1_features = f: updateFeatures f (rec {
+    memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true);
+  }) [];
+  mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ {
+    dependencies = mapFeatures features ([ unicase_2_1_0 ]);
+  };
+  mime_0_3_8_features = f: updateFeatures f (rec {
+    mime_0_3_8.default = (f.mime_0_3_8.default or true);
+    unicase_2_1_0.default = true;
+  }) [ unicase_2_1_0_features ];
+  mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ {
+    dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]);
+    buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]);
+    features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {});
+  };
+  mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec {
+    mime_0_3_8.default = true;
+    mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true);
+    phf_0_7_22.default = true;
+    phf_0_7_22.unicase = true;
+    phf_codegen_0_7_22.default = true;
+    unicase_1_4_2.default = true;
+  }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ];
+  mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ {
+    dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ])
+      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []);
+    features = mkFeatures (features.mio_0_6_15 or {});
+  };
+  mio_0_6_15_features = f: updateFeatures f (rec {
+    fuchsia_zircon_0_3_3.default = true;
+    fuchsia_zircon_sys_0_3_3.default = true;
+    iovec_0_1_2.default = true;
+    kernel32_sys_0_2_2.default = true;
+    lazycell_0_6_0.default = true;
+    libc_0_2_42.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = (f.mio_0_6_15.default or true);
+    mio_0_6_15.with-deprecated =
+      (f.mio_0_6_15.with-deprecated or false) ||
+      (f.mio_0_6_15.default or false) ||
+      (mio_0_6_15.default or false);
+    miow_0_2_1.default = true;
+    net2_0_2_33.default = true;
+    slab_0_4_0.default = true;
+    winapi_0_2_8.default = true;
+  }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ];
+  miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ {
+    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]);
+  };
+  miow_0_2_1_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = true;
+    miow_0_2_1.default = (f.miow_0_2_1.default or true);
+    net2_0_2_33.default = (f.net2_0_2_33.default or false);
+    winapi_0_2_8.default = true;
+    ws2_32_sys_0_2_1.default = true;
+  }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ];
+  native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ {
+    dependencies = mapFeatures features ([ lazy_static_0_2_11 ])
+      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else [])
+      ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []);
+  };
+  native_tls_0_1_5_features = f: updateFeatures f (rec {
+    lazy_static_0_2_11.default = true;
+    libc_0_2_42.default = true;
+    native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true);
+    openssl_0_9_24.default = true;
+    schannel_0_1_13.default = true;
+    security_framework_0_1_16.OSX_10_8 = true;
+    security_framework_0_1_16.default = true;
+    security_framework_sys_0_1_16.default = true;
+    tempdir_0_3_7.default = true;
+  }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ];
+  net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ])
+      ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+    features = mkFeatures (features.net2_0_2_33 or {});
+  };
+  net2_0_2_33_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    libc_0_2_42.default = true;
+    net2_0_2_33.default = (f.net2_0_2_33.default or true);
+    net2_0_2_33.duration =
+      (f.net2_0_2_33.duration or false) ||
+      (f.net2_0_2_33.default or false) ||
+      (net2_0_2_33.default or false);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.handleapi = true;
+    winapi_0_3_5.winsock2 = true;
+    winapi_0_3_5.ws2def = true;
+    winapi_0_3_5.ws2ipdef = true;
+    winapi_0_3_5.ws2tcpip = true;
+  }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ];
+  nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.nodrop_0_1_12 or {});
+  };
+  nodrop_0_1_12_features = f: updateFeatures f (rec {
+    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true);
+    nodrop_0_1_12.nodrop-union =
+      (f.nodrop_0_1_12.nodrop-union or false) ||
+      (f.nodrop_0_1_12.use_union or false) ||
+      (nodrop_0_1_12.use_union or false);
+    nodrop_0_1_12.std =
+      (f.nodrop_0_1_12.std or false) ||
+      (f.nodrop_0_1_12.default or false) ||
+      (nodrop_0_1_12.default or false);
+  }) [];
+  num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ {
+    dependencies = mapFeatures features ([ num_traits_0_2_5 ]);
+    features = mkFeatures (features.num_integer_0_1_39 or {});
+  };
+  num_integer_0_1_39_features = f: updateFeatures f (rec {
+    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true);
+    num_integer_0_1_39.std =
+      (f.num_integer_0_1_39.std or false) ||
+      (f.num_integer_0_1_39.default or false) ||
+      (num_integer_0_1_39.default or false);
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
+    num_traits_0_2_5.i128 =
+      (f.num_traits_0_2_5.i128 or false) ||
+      (num_integer_0_1_39.i128 or false) ||
+      (f.num_integer_0_1_39.i128 or false);
+    num_traits_0_2_5.std =
+      (f.num_traits_0_2_5.std or false) ||
+      (num_integer_0_1_39.std or false) ||
+      (f.num_integer_0_1_39.std or false);
+  }) [ num_traits_0_2_5_features ];
+  num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ {
+    features = mkFeatures (features.num_traits_0_2_5 or {});
+  };
+  num_traits_0_2_5_features = f: updateFeatures f (rec {
+    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true);
+    num_traits_0_2_5.std =
+      (f.num_traits_0_2_5.std or false) ||
+      (f.num_traits_0_2_5.default or false) ||
+      (num_traits_0_2_5.default or false);
+  }) [];
+  num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ]);
+  };
+  num_cpus_1_8_0_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true);
+  }) [ libc_0_2_42_features ];
+  openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ {
+    dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]);
+    features = mkFeatures (features.openssl_0_9_24 or {});
+  };
+  openssl_0_9_24_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = true;
+    foreign_types_0_3_2.default = true;
+    lazy_static_1_0_2.default = true;
+    libc_0_2_42.default = true;
+    openssl_0_9_24.default = (f.openssl_0_9_24.default or true);
+    openssl_sys_0_9_33.default = true;
+  }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ];
+  openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ])
+      ++ (if abi == "msvc" then mapFeatures features ([]) else []);
+    buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]);
+  };
+  openssl_sys_0_9_33_features = f: updateFeatures f (rec {
+    cc_1_0_18.default = true;
+    libc_0_2_42.default = true;
+    openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true);
+    pkg_config_0_3_12.default = true;
+  }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ];
+  pad_0_1_5 = { features?(pad_0_1_5_features {}) }: pad_0_1_5_ {
+    dependencies = mapFeatures features ([ unicode_width_0_1_5 ]);
+  };
+  pad_0_1_5_features = f: updateFeatures f (rec {
+    pad_0_1_5.default = (f.pad_0_1_5.default or true);
+    unicode_width_0_1_5.default = true;
+  }) [ unicode_width_0_1_5_features ];
+  percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
+  percent_encoding_1_0_1_features = f: updateFeatures f (rec {
+    percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
+  }) [];
+  phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_shared_0_7_22 ]);
+    features = mkFeatures (features.phf_0_7_22 or {});
+  };
+  phf_0_7_22_features = f: updateFeatures f (rec {
+    phf_0_7_22.default = (f.phf_0_7_22.default or true);
+    phf_shared_0_7_22.core =
+      (f.phf_shared_0_7_22.core or false) ||
+      (phf_0_7_22.core or false) ||
+      (f.phf_0_7_22.core or false);
+    phf_shared_0_7_22.default = true;
+    phf_shared_0_7_22.unicase =
+      (f.phf_shared_0_7_22.unicase or false) ||
+      (phf_0_7_22.unicase or false) ||
+      (f.phf_0_7_22.unicase or false);
+  }) [ phf_shared_0_7_22_features ];
+  phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]);
+  };
+  phf_codegen_0_7_22_features = f: updateFeatures f (rec {
+    phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true);
+    phf_generator_0_7_22.default = true;
+    phf_shared_0_7_22.default = true;
+  }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ];
+  phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ {
+    dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]);
+  };
+  phf_generator_0_7_22_features = f: updateFeatures f (rec {
+    phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true);
+    phf_shared_0_7_22.default = true;
+    rand_0_4_2.default = true;
+  }) [ phf_shared_0_7_22_features rand_0_4_2_features ];
+  phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ {
+    dependencies = mapFeatures features ([ siphasher_0_2_3 ]
+      ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else []));
+    features = mkFeatures (features.phf_shared_0_7_22 or {});
+  };
+  phf_shared_0_7_22_features = f: updateFeatures f (rec {
+    phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true);
+    siphasher_0_2_3.default = true;
+    unicase_1_4_2.default = true;
+  }) [ siphasher_0_2_3_features unicase_1_4_2_features ];
+  pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {};
+  pkg_config_0_3_12_features = f: updateFeatures f (rec {
+    pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true);
+  }) [];
+  pretty_assertions_0_5_1 = { features?(pretty_assertions_0_5_1_features {}) }: pretty_assertions_0_5_1_ {
+    dependencies = mapFeatures features ([ ansi_term_0_11_0 difference_2_0_0 ]);
+  };
+  pretty_assertions_0_5_1_features = f: updateFeatures f (rec {
+    ansi_term_0_11_0.default = true;
+    difference_2_0_0.default = true;
+    pretty_assertions_0_5_1.default = (f.pretty_assertions_0_5_1.default or true);
+  }) [ ansi_term_0_11_0_features difference_2_0_0_features ];
+  proc_macro2_0_4_9 = { features?(proc_macro2_0_4_9_features {}) }: proc_macro2_0_4_9_ {
+    dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
+    features = mkFeatures (features.proc_macro2_0_4_9 or {});
+  };
+  proc_macro2_0_4_9_features = f: updateFeatures f (rec {
+    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or true);
+    proc_macro2_0_4_9.proc-macro =
+      (f.proc_macro2_0_4_9.proc-macro or false) ||
+      (f.proc_macro2_0_4_9.default or false) ||
+      (proc_macro2_0_4_9.default or false) ||
+      (f.proc_macro2_0_4_9.nightly or false) ||
+      (proc_macro2_0_4_9.nightly or false);
+    unicode_xid_0_1_0.default = true;
+  }) [ unicode_xid_0_1_0_features ];
+  quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
+  quote_0_3_15_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = (f.quote_0_3_15.default or true);
+  }) [];
+  quote_0_6_4 = { features?(quote_0_6_4_features {}) }: quote_0_6_4_ {
+    dependencies = mapFeatures features ([ proc_macro2_0_4_9 ]);
+    features = mkFeatures (features.quote_0_6_4 or {});
+  };
+  quote_0_6_4_features = f: updateFeatures f (rec {
+    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false);
+    proc_macro2_0_4_9.proc-macro =
+      (f.proc_macro2_0_4_9.proc-macro or false) ||
+      (quote_0_6_4.proc-macro or false) ||
+      (f.quote_0_6_4.proc-macro or false);
+    quote_0_6_4.default = (f.quote_0_6_4.default or true);
+    quote_0_6_4.proc-macro =
+      (f.quote_0_6_4.proc-macro or false) ||
+      (f.quote_0_6_4.default or false) ||
+      (quote_0_6_4.default or false);
+  }) [ proc_macro2_0_4_9_features ];
+  rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
+    dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
+      ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+    features = mkFeatures (features.rand_0_4_2 or {});
+  };
+  rand_0_4_2_features = f: updateFeatures f (rec {
+    fuchsia_zircon_0_3_3.default = true;
+    libc_0_2_42.default = true;
+    rand_0_4_2.default = (f.rand_0_4_2.default or true);
+    rand_0_4_2.i128_support =
+      (f.rand_0_4_2.i128_support or false) ||
+      (f.rand_0_4_2.nightly or false) ||
+      (rand_0_4_2.nightly or false);
+    rand_0_4_2.libc =
+      (f.rand_0_4_2.libc or false) ||
+      (f.rand_0_4_2.std or false) ||
+      (rand_0_4_2.std or false);
+    rand_0_4_2.std =
+      (f.rand_0_4_2.std or false) ||
+      (f.rand_0_4_2.default or false) ||
+      (rand_0_4_2.default or false);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.ntsecapi = true;
+    winapi_0_3_5.profileapi = true;
+    winapi_0_3_5.winnt = true;
+  }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ];
+  redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {};
+  redox_syscall_0_1_40_features = f: updateFeatures f (rec {
+    redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true);
+  }) [];
+  redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
+    dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]);
+  };
+  redox_termios_0_1_1_features = f: updateFeatures f (rec {
+    redox_syscall_0_1_40.default = true;
+    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
+  }) [ redox_syscall_0_1_40_features ];
+  regex_1_0_3 = { features?(regex_1_0_3_features {}) }: regex_1_0_3_ {
+    dependencies = mapFeatures features ([ aho_corasick_0_6_6 memchr_2_0_1 regex_syntax_0_6_2 thread_local_0_3_6 utf8_ranges_1_0_0 ]);
+    features = mkFeatures (features.regex_1_0_3 or {});
+  };
+  regex_1_0_3_features = f: updateFeatures f (rec {
+    aho_corasick_0_6_6.default = true;
+    memchr_2_0_1.default = true;
+    regex_1_0_3.default = (f.regex_1_0_3.default or true);
+    regex_1_0_3.pattern =
+      (f.regex_1_0_3.pattern or false) ||
+      (f.regex_1_0_3.unstable or false) ||
+      (regex_1_0_3.unstable or false);
+    regex_1_0_3.use_std =
+      (f.regex_1_0_3.use_std or false) ||
+      (f.regex_1_0_3.default or false) ||
+      (regex_1_0_3.default or false);
+    regex_syntax_0_6_2.default = true;
+    thread_local_0_3_6.default = true;
+    utf8_ranges_1_0_0.default = true;
+  }) [ aho_corasick_0_6_6_features memchr_2_0_1_features regex_syntax_0_6_2_features thread_local_0_3_6_features utf8_ranges_1_0_0_features ];
+  regex_syntax_0_6_2 = { features?(regex_syntax_0_6_2_features {}) }: regex_syntax_0_6_2_ {
+    dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
+  };
+  regex_syntax_0_6_2_features = f: updateFeatures f (rec {
+    regex_syntax_0_6_2.default = (f.regex_syntax_0_6_2.default or true);
+    ucd_util_0_1_1.default = true;
+  }) [ ucd_util_0_1_1_features ];
+  relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+  };
+  relay_0_1_1_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    relay_0_1_1.default = (f.relay_0_1_1.default or true);
+  }) [ futures_0_1_23_features ];
+  remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ {
+    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  remove_dir_all_0_5_1_features = f: updateFeatures f (rec {
+    remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.errhandlingapi = true;
+    winapi_0_3_5.fileapi = true;
+    winapi_0_3_5.std = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.winerror = true;
+  }) [ winapi_0_3_5_features ];
+  reqwest_0_8_7 = { features?(reqwest_0_8_7_features {}) }: reqwest_0_8_7_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_4 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]);
+    features = mkFeatures (features.reqwest_0_8_7 or {});
+  };
+  reqwest_0_8_7_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    encoding_rs_0_7_2.default = true;
+    futures_0_1_23.default = true;
+    hyper_0_11_27.default = (f.hyper_0_11_27.default or false);
+    hyper_tls_0_1_4.default = true;
+    libflate_0_1_16.default = true;
+    log_0_4_3.default = true;
+    mime_guess_2_0_0_alpha_6.default = true;
+    native_tls_0_1_5.default = true;
+    reqwest_0_8_7.default = (f.reqwest_0_8_7.default or true);
+    serde_1_0_70.default = true;
+    serde_json_1_0_24.default = true;
+    serde_urlencoded_0_5_2.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false);
+    url_1_7_1.default = true;
+    uuid_0_6_5.default = true;
+    uuid_0_6_5.v4 = true;
+  }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_4_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ];
+  rustc_demangle_0_1_9 = { features?(rustc_demangle_0_1_9_features {}) }: rustc_demangle_0_1_9_ {};
+  rustc_demangle_0_1_9_features = f: updateFeatures f (rec {
+    rustc_demangle_0_1_9.default = (f.rustc_demangle_0_1_9.default or true);
+  }) [];
+  safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {};
+  safemem_0_2_0_features = f: updateFeatures f (rec {
+    safemem_0_2_0.default = (f.safemem_0_2_0.default or true);
+  }) [];
+  schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]);
+  };
+  schannel_0_1_13_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = true;
+    schannel_0_1_13.default = (f.schannel_0_1_13.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.lmcons = true;
+    winapi_0_3_5.minschannel = true;
+    winapi_0_3_5.schannel = true;
+    winapi_0_3_5.securitybaseapi = true;
+    winapi_0_3_5.sysinfoapi = true;
+    winapi_0_3_5.timezoneapi = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.wincrypt = true;
+    winapi_0_3_5.winerror = true;
+  }) [ lazy_static_1_0_2_features winapi_0_3_5_features ];
+  scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ {
+    features = mkFeatures (features.scoped_tls_0_1_2 or {});
+  };
+  scoped_tls_0_1_2_features = f: updateFeatures f (rec {
+    scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true);
+  }) [];
+  scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ {
+    features = mkFeatures (features.scopeguard_0_3_3 or {});
+  };
+  scopeguard_0_3_3_features = f: updateFeatures f (rec {
+    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true);
+    scopeguard_0_3_3.use_std =
+      (f.scopeguard_0_3_3.use_std or false) ||
+      (f.scopeguard_0_3_3.default or false) ||
+      (scopeguard_0_3_3.default or false);
+  }) [];
+  security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ {
+    dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]);
+    features = mkFeatures (features.security_framework_0_1_16 or {});
+  };
+  security_framework_0_1_16_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = true;
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+    security_framework_0_1_16.OSX_10_10 =
+      (f.security_framework_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_11 or false);
+    security_framework_0_1_16.OSX_10_11 =
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_0_1_16.OSX_10_12 or false) ||
+      (security_framework_0_1_16.OSX_10_12 or false);
+    security_framework_0_1_16.OSX_10_8 =
+      (f.security_framework_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_0_1_16.OSX_10_9 or false) ||
+      (security_framework_0_1_16.OSX_10_9 or false);
+    security_framework_0_1_16.OSX_10_9 =
+      (f.security_framework_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_0_1_16.OSX_10_10 or false) ||
+      (security_framework_0_1_16.OSX_10_10 or false);
+    security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true);
+    security_framework_sys_0_1_16.OSX_10_10 =
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (security_framework_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_0_1_16.OSX_10_10 or false);
+    security_framework_sys_0_1_16.OSX_10_11 =
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_0_1_16.OSX_10_11 or false) ||
+      (security_framework_0_1_16.OSX_10_12 or false) ||
+      (f.security_framework_0_1_16.OSX_10_12 or false);
+    security_framework_sys_0_1_16.OSX_10_8 =
+      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
+      (security_framework_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_0_1_16.OSX_10_8 or false);
+    security_framework_sys_0_1_16.OSX_10_9 =
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (security_framework_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_0_1_16.OSX_10_9 or false);
+    security_framework_sys_0_1_16.default = true;
+  }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ];
+  security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
+    features = mkFeatures (features.security_framework_sys_0_1_16 or {});
+  };
+  security_framework_sys_0_1_16_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_42.default = true;
+    security_framework_sys_0_1_16.OSX_10_10 =
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_11 or false);
+    security_framework_sys_0_1_16.OSX_10_11 =
+      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_12 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_12 or false);
+    security_framework_sys_0_1_16.OSX_10_8 =
+      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_9 or false);
+    security_framework_sys_0_1_16.OSX_10_9 =
+      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
+      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
+      (security_framework_sys_0_1_16.OSX_10_10 or false);
+    security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true);
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
+  semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ {
+    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]
+      ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_70 ] else []));
+    features = mkFeatures (features.semver_0_9_0 or {});
+  };
+  semver_0_9_0_features = f: updateFeatures f (rec {
+    semver_0_9_0.default = (f.semver_0_9_0.default or true);
+    semver_0_9_0.serde =
+      (f.semver_0_9_0.serde or false) ||
+      (f.semver_0_9_0.ci or false) ||
+      (semver_0_9_0.ci or false);
+    semver_parser_0_7_0.default = true;
+    serde_1_0_70.default = true;
+  }) [ semver_parser_0_7_0_features serde_1_0_70_features ];
+  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
+  semver_parser_0_7_0_features = f: updateFeatures f (rec {
+    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
+  }) [];
+  serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.serde_1_0_70 or {});
+  };
+  serde_1_0_70_features = f: updateFeatures f (rec {
+    serde_1_0_70.default = (f.serde_1_0_70.default or true);
+    serde_1_0_70.serde_derive =
+      (f.serde_1_0_70.serde_derive or false) ||
+      (f.serde_1_0_70.derive or false) ||
+      (serde_1_0_70.derive or false);
+    serde_1_0_70.std =
+      (f.serde_1_0_70.std or false) ||
+      (f.serde_1_0_70.default or false) ||
+      (serde_1_0_70.default or false);
+    serde_1_0_70.unstable =
+      (f.serde_1_0_70.unstable or false) ||
+      (f.serde_1_0_70.alloc or false) ||
+      (serde_1_0_70.alloc or false);
+  }) [];
+  serde_derive_1_0_75 = { features?(serde_derive_1_0_75_features {}) }: serde_derive_1_0_75_ {
+    dependencies = mapFeatures features ([ proc_macro2_0_4_9 quote_0_6_4 syn_0_14_5 ]);
+    features = mkFeatures (features.serde_derive_1_0_75 or {});
+  };
+  serde_derive_1_0_75_features = f: updateFeatures f (rec {
+    proc_macro2_0_4_9.default = true;
+    quote_0_6_4.default = true;
+    serde_derive_1_0_75.default = (f.serde_derive_1_0_75.default or true);
+    syn_0_14_5.default = true;
+    syn_0_14_5.visit = true;
+  }) [ proc_macro2_0_4_9_features quote_0_6_4_features syn_0_14_5_features ];
+  serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]);
+    features = mkFeatures (features.serde_json_1_0_24 or {});
+  };
+  serde_json_1_0_24_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = true;
+    itoa_0_4_2.default = true;
+    serde_1_0_70.default = true;
+    serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true);
+    serde_json_1_0_24.indexmap =
+      (f.serde_json_1_0_24.indexmap or false) ||
+      (f.serde_json_1_0_24.preserve_order or false) ||
+      (serde_json_1_0_24.preserve_order or false);
+  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ];
+  serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]);
+  };
+  serde_urlencoded_0_5_2_features = f: updateFeatures f (rec {
+    dtoa_0_4_3.default = true;
+    itoa_0_4_2.default = true;
+    serde_1_0_70.default = true;
+    serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true);
+    url_1_7_1.default = true;
+  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ];
+  siphasher_0_2_3 = { features?(siphasher_0_2_3_features {}) }: siphasher_0_2_3_ {};
+  siphasher_0_2_3_features = f: updateFeatures f (rec {
+    siphasher_0_2_3.default = (f.siphasher_0_2_3.default or true);
+  }) [];
+  slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {};
+  slab_0_4_0_features = f: updateFeatures f (rec {
+    slab_0_4_0.default = (f.slab_0_4_0.default or true);
+  }) [];
+  strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
+  strsim_0_7_0_features = f: updateFeatures f (rec {
+    strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
+  }) [];
+  syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
+      ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
+      ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
+    features = mkFeatures (features.syn_0_11_11 or {});
+  };
+  syn_0_11_11_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = (f.syn_0_11_11.default or true);
+    syn_0_11_11.parsing =
+      (f.syn_0_11_11.parsing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.printing =
+      (f.syn_0_11_11.printing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.quote =
+      (f.syn_0_11_11.quote or false) ||
+      (f.syn_0_11_11.printing or false) ||
+      (syn_0_11_11.printing or false);
+    syn_0_11_11.synom =
+      (f.syn_0_11_11.synom or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    syn_0_11_11.unicode-xid =
+      (f.syn_0_11_11.unicode-xid or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    synom_0_11_3.default = true;
+    unicode_xid_0_0_4.default = true;
+  }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
+  syn_0_14_5 = { features?(syn_0_14_5_features {}) }: syn_0_14_5_ {
+    dependencies = mapFeatures features ([ proc_macro2_0_4_9 unicode_xid_0_1_0 ]
+      ++ (if features.syn_0_14_5.quote or false then [ quote_0_6_4 ] else []));
+    features = mkFeatures (features.syn_0_14_5 or {});
+  };
+  syn_0_14_5_features = f: updateFeatures f (rec {
+    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false);
+    proc_macro2_0_4_9.proc-macro =
+      (f.proc_macro2_0_4_9.proc-macro or false) ||
+      (syn_0_14_5.proc-macro or false) ||
+      (f.syn_0_14_5.proc-macro or false);
+    quote_0_6_4.default = (f.quote_0_6_4.default or false);
+    quote_0_6_4.proc-macro =
+      (f.quote_0_6_4.proc-macro or false) ||
+      (syn_0_14_5.proc-macro or false) ||
+      (f.syn_0_14_5.proc-macro or false);
+    syn_0_14_5.clone-impls =
+      (f.syn_0_14_5.clone-impls or false) ||
+      (f.syn_0_14_5.default or false) ||
+      (syn_0_14_5.default or false);
+    syn_0_14_5.default = (f.syn_0_14_5.default or true);
+    syn_0_14_5.derive =
+      (f.syn_0_14_5.derive or false) ||
+      (f.syn_0_14_5.default or false) ||
+      (syn_0_14_5.default or false);
+    syn_0_14_5.parsing =
+      (f.syn_0_14_5.parsing or false) ||
+      (f.syn_0_14_5.default or false) ||
+      (syn_0_14_5.default or false);
+    syn_0_14_5.printing =
+      (f.syn_0_14_5.printing or false) ||
+      (f.syn_0_14_5.default or false) ||
+      (syn_0_14_5.default or false);
+    syn_0_14_5.proc-macro =
+      (f.syn_0_14_5.proc-macro or false) ||
+      (f.syn_0_14_5.default or false) ||
+      (syn_0_14_5.default or false);
+    syn_0_14_5.quote =
+      (f.syn_0_14_5.quote or false) ||
+      (f.syn_0_14_5.printing or false) ||
+      (syn_0_14_5.printing or false);
+    unicode_xid_0_1_0.default = true;
+  }) [ proc_macro2_0_4_9_features quote_0_6_4_features unicode_xid_0_1_0_features ];
+  synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
+    dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
+  };
+  synom_0_11_3_features = f: updateFeatures f (rec {
+    synom_0_11_3.default = (f.synom_0_11_3.default or true);
+    unicode_xid_0_0_4.default = true;
+  }) [ unicode_xid_0_0_4_features ];
+  synstructure_0_6_1 = { features?(synstructure_0_6_1_features {}) }: synstructure_0_6_1_ {
+    dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 ]);
+    features = mkFeatures (features.synstructure_0_6_1 or {});
+  };
+  synstructure_0_6_1_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = true;
+    syn_0_11_11.visit = true;
+    synstructure_0_6_1.default = (f.synstructure_0_6_1.default or true);
+  }) [ quote_0_3_15_features syn_0_11_11_features ];
+  tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
+    dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]);
+  };
+  tempdir_0_3_7_features = f: updateFeatures f (rec {
+    rand_0_4_2.default = true;
+    remove_dir_all_0_5_1.default = true;
+    tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
+  }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ];
+  termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ {
+    dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []);
+  };
+  termcolor_0_3_6_features = f: updateFeatures f (rec {
+    termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true);
+    wincolor_0_1_6.default = true;
+  }) [ wincolor_0_1_6_features ];
+  termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
+    dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else [])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []);
+  };
+  termion_1_5_1_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    redox_termios_0_1_1.default = true;
+    termion_1_5_1.default = (f.termion_1_5_1.default or true);
+  }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ];
+  thread_local_0_3_6 = { features?(thread_local_0_3_6_features {}) }: thread_local_0_3_6_ {
+    dependencies = mapFeatures features ([ lazy_static_1_0_2 ]);
+  };
+  thread_local_0_3_6_features = f: updateFeatures f (rec {
+    lazy_static_1_0_2.default = true;
+    thread_local_0_3_6.default = (f.thread_local_0_3_6.default or true);
+  }) [ lazy_static_1_0_2_features ];
+  time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ {
+    dependencies = mapFeatures features ([ libc_0_2_42 ])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
+  };
+  time_0_1_40_features = f: updateFeatures f (rec {
+    libc_0_2_42.default = true;
+    redox_syscall_0_1_40.default = true;
+    time_0_1_40.default = (f.time_0_1_40.default or true);
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwinbase = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.ntdef = true;
+    winapi_0_3_5.profileapi = true;
+    winapi_0_3_5.std = true;
+    winapi_0_3_5.sysinfoapi = true;
+    winapi_0_3_5.timezoneapi = true;
+  }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ];
+  tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]);
+  };
+  tokio_0_1_7_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    mio_0_6_15.default = true;
+    tokio_0_1_7.default = (f.tokio_0_1_7.default or true);
+    tokio_executor_0_1_2.default = true;
+    tokio_fs_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_tcp_0_1_0.default = true;
+    tokio_threadpool_0_1_5.default = true;
+    tokio_timer_0_2_4.default = true;
+    tokio_udp_0_1_1.default = true;
+  }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ];
+  tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]);
+  };
+  tokio_codec_0_1_0_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true);
+    tokio_io_0_1_7.default = true;
+  }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ];
+  tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]);
+  };
+  tokio_core_0_1_17_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    iovec_0_1_2.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    scoped_tls_0_1_2.default = true;
+    tokio_0_1_7.default = true;
+    tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true);
+    tokio_executor_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_timer_0_2_4.default = true;
+  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ];
+  tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+    features = mkFeatures (features.tokio_executor_0_1_2 or {});
+  };
+  tokio_executor_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true);
+    tokio_executor_0_1_2.futures2 =
+      (f.tokio_executor_0_1_2.futures2 or false) ||
+      (f.tokio_executor_0_1_2.unstable-futures or false) ||
+      (tokio_executor_0_1_2.unstable-futures or false);
+  }) [ futures_0_1_23_features ];
+  tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]);
+  };
+  tokio_fs_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true);
+    tokio_io_0_1_7.default = true;
+    tokio_threadpool_0_1_5.default = true;
+  }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ];
+  tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]);
+  };
+  tokio_io_0_1_7_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true);
+  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ];
+  tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]);
+  };
+  tokio_reactor_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    slab_0_4_0.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true);
+  }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ];
+  tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 ]);
+  };
+  tokio_service_0_1_0_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true);
+  }) [ futures_0_1_23_features ];
+  tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
+    features = mkFeatures (features.tokio_tcp_0_1_0 or {});
+  };
+  tokio_tcp_0_1_0_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    iovec_0_1_2.default = true;
+    mio_0_6_15.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true);
+    tokio_tcp_0_1_0.futures2 =
+      (f.tokio_tcp_0_1_0.futures2 or false) ||
+      (f.tokio_tcp_0_1_0.unstable-futures or false) ||
+      (tokio_tcp_0_1_0.unstable-futures or false);
+  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
+  tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ {
+    dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]);
+  };
+  tokio_threadpool_0_1_5_features = f: updateFeatures f (rec {
+    crossbeam_deque_0_3_1.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    num_cpus_1_8_0.default = true;
+    rand_0_4_2.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true);
+  }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ];
+  tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]);
+  };
+  tokio_timer_0_2_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    tokio_executor_0_1_2.default = true;
+    tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true);
+  }) [ futures_0_1_23_features tokio_executor_0_1_2_features ];
+  tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ])
+      ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else [])
+      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([]) else []);
+  };
+  tokio_tls_0_1_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    native_tls_0_1_5.default = true;
+    tokio_core_0_1_17.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true);
+  }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ];
+  tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ {
+    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
+  };
+  tokio_udp_0_1_1_features = f: updateFeatures f (rec {
+    bytes_0_4_9.default = true;
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    mio_0_6_15.default = true;
+    tokio_codec_0_1_0.default = true;
+    tokio_io_0_1_7.default = true;
+    tokio_reactor_0_1_2.default = true;
+    tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true);
+  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
+  toml_edit_0_1_3 = { features?(toml_edit_0_1_3_features {}) }: toml_edit_0_1_3_ {
+    dependencies = mapFeatures features ([ chrono_0_4_5 combine_3_3_6 linked_hash_map_0_5_1 ]);
+    features = mkFeatures (features.toml_edit_0_1_3 or {});
+  };
+  toml_edit_0_1_3_features = f: updateFeatures f (rec {
+    chrono_0_4_5.default = true;
+    combine_3_3_6.default = true;
+    linked_hash_map_0_5_1.default = true;
+    toml_edit_0_1_3.default = (f.toml_edit_0_1_3.default or true);
+  }) [ chrono_0_4_5_features combine_3_3_6_features linked_hash_map_0_5_1_features ];
+  try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {};
+  try_lock_0_1_0_features = f: updateFeatures f (rec {
+    try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true);
+  }) [];
+  ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
+  ucd_util_0_1_1_features = f: updateFeatures f (rec {
+    ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
+  }) [];
+  unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ {
+    dependencies = mapFeatures features ([]);
+    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
+    features = mkFeatures (features.unicase_1_4_2 or {});
+  };
+  unicase_1_4_2_features = f: updateFeatures f (rec {
+    unicase_1_4_2.default = (f.unicase_1_4_2.default or true);
+    unicase_1_4_2.heapsize =
+      (f.unicase_1_4_2.heapsize or false) ||
+      (f.unicase_1_4_2.heap_size or false) ||
+      (unicase_1_4_2.heap_size or false);
+    unicase_1_4_2.heapsize_plugin =
+      (f.unicase_1_4_2.heapsize_plugin or false) ||
+      (f.unicase_1_4_2.heap_size or false) ||
+      (unicase_1_4_2.heap_size or false);
+    version_check_0_1_4.default = true;
+  }) [ version_check_0_1_4_features ];
+  unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ {
+    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
+    features = mkFeatures (features.unicase_2_1_0 or {});
+  };
+  unicase_2_1_0_features = f: updateFeatures f (rec {
+    unicase_2_1_0.default = (f.unicase_2_1_0.default or true);
+    version_check_0_1_4.default = true;
+  }) [ version_check_0_1_4_features ];
+  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
+    dependencies = mapFeatures features ([ matches_0_1_7 ]);
+    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
+  };
+  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
+    matches_0_1_7.default = true;
+    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
+    unicode_bidi_0_3_4.flame =
+      (f.unicode_bidi_0_3_4.flame or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.flamer =
+      (f.unicode_bidi_0_3_4.flamer or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.serde =
+      (f.unicode_bidi_0_3_4.serde or false) ||
+      (f.unicode_bidi_0_3_4.with_serde or false) ||
+      (unicode_bidi_0_3_4.with_serde or false);
+  }) [ matches_0_1_7_features ];
+  unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
+  unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
+    unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
+  }) [];
+  unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ {
+    features = mkFeatures (features.unicode_width_0_1_5 or {});
+  };
+  unicode_width_0_1_5_features = f: updateFeatures f (rec {
+    unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true);
+  }) [];
+  unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
+    features = mkFeatures (features.unicode_xid_0_0_4 or {});
+  };
+  unicode_xid_0_0_4_features = f: updateFeatures f (rec {
+    unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
+  }) [];
+  unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
+    features = mkFeatures (features.unicode_xid_0_1_0 or {});
+  };
+  unicode_xid_0_1_0_features = f: updateFeatures f (rec {
+    unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
+  }) [];
+  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
+    dependencies = mapFeatures features ([ void_1_0_2 ]);
+  };
+  unreachable_1_0_0_features = f: updateFeatures f (rec {
+    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
+    void_1_0_2.default = (f.void_1_0_2.default or false);
+  }) [ void_1_0_2_features ];
+  url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ {
+    dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]);
+    features = mkFeatures (features.url_1_7_1 or {});
+  };
+  url_1_7_1_features = f: updateFeatures f (rec {
+    idna_0_1_5.default = true;
+    matches_0_1_7.default = true;
+    percent_encoding_1_0_1.default = true;
+    url_1_7_1.default = (f.url_1_7_1.default or true);
+    url_1_7_1.encoding =
+      (f.url_1_7_1.encoding or false) ||
+      (f.url_1_7_1.query_encoding or false) ||
+      (url_1_7_1.query_encoding or false);
+    url_1_7_1.heapsize =
+      (f.url_1_7_1.heapsize or false) ||
+      (f.url_1_7_1.heap_size or false) ||
+      (url_1_7_1.heap_size or false);
+  }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ];
+  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
+  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
+    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
+  }) [];
+  uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]
+      ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else []));
+    features = mkFeatures (features.uuid_0_6_5 or {});
+  };
+  uuid_0_6_5_features = f: updateFeatures f (rec {
+    cfg_if_0_1_4.default = true;
+    rand_0_4_2.default = true;
+    uuid_0_6_5.byteorder =
+      (f.uuid_0_6_5.byteorder or false) ||
+      (f.uuid_0_6_5.u128 or false) ||
+      (uuid_0_6_5.u128 or false);
+    uuid_0_6_5.default = (f.uuid_0_6_5.default or true);
+    uuid_0_6_5.md5 =
+      (f.uuid_0_6_5.md5 or false) ||
+      (f.uuid_0_6_5.v3 or false) ||
+      (uuid_0_6_5.v3 or false);
+    uuid_0_6_5.nightly =
+      (f.uuid_0_6_5.nightly or false) ||
+      (f.uuid_0_6_5.const_fn or false) ||
+      (uuid_0_6_5.const_fn or false);
+    uuid_0_6_5.rand =
+      (f.uuid_0_6_5.rand or false) ||
+      (f.uuid_0_6_5.v3 or false) ||
+      (uuid_0_6_5.v3 or false) ||
+      (f.uuid_0_6_5.v4 or false) ||
+      (uuid_0_6_5.v4 or false) ||
+      (f.uuid_0_6_5.v5 or false) ||
+      (uuid_0_6_5.v5 or false);
+    uuid_0_6_5.sha1 =
+      (f.uuid_0_6_5.sha1 or false) ||
+      (f.uuid_0_6_5.v5 or false) ||
+      (uuid_0_6_5.v5 or false);
+    uuid_0_6_5.std =
+      (f.uuid_0_6_5.std or false) ||
+      (f.uuid_0_6_5.default or false) ||
+      (uuid_0_6_5.default or false) ||
+      (f.uuid_0_6_5.use_std or false) ||
+      (uuid_0_6_5.use_std or false);
+  }) [ cfg_if_0_1_4_features rand_0_4_2_features ];
+  vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {};
+  vcpkg_0_2_4_features = f: updateFeatures f (rec {
+    vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true);
+  }) [];
+  version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {};
+  version_check_0_1_4_features = f: updateFeatures f (rec {
+    version_check_0_1_4.default = (f.version_check_0_1_4.default or true);
+  }) [];
+  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
+    features = mkFeatures (features.void_1_0_2 or {});
+  };
+  void_1_0_2_features = f: updateFeatures f (rec {
+    void_1_0_2.default = (f.void_1_0_2.default or true);
+    void_1_0_2.std =
+      (f.void_1_0_2.std or false) ||
+      (f.void_1_0_2.default or false) ||
+      (void_1_0_2.default or false);
+  }) [];
+  want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ {
+    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]);
+  };
+  want_0_0_4_features = f: updateFeatures f (rec {
+    futures_0_1_23.default = true;
+    log_0_4_3.default = true;
+    try_lock_0_1_0.default = true;
+    want_0_0_4.default = (f.want_0_0_4.default or true);
+  }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ];
+  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
+  winapi_0_2_8_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
+  }) [];
+  winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ {
+    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
+      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
+    features = mkFeatures (features.winapi_0_3_5 or {});
+  };
+  winapi_0_3_5_features = f: updateFeatures f (rec {
+    winapi_0_3_5.default = (f.winapi_0_3_5.default or true);
+    winapi_i686_pc_windows_gnu_0_4_0.default = true;
+    winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
+  }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
+  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
+  winapi_build_0_1_1_features = f: updateFeatures f (rec {
+    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
+  }) [];
+  winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
+  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+    winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
+  }) [];
+  winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
+  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
+    winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
+  }) [];
+  wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ {
+    dependencies = mapFeatures features ([ winapi_0_3_5 ]);
+  };
+  wincolor_0_1_6_features = f: updateFeatures f (rec {
+    winapi_0_3_5.consoleapi = true;
+    winapi_0_3_5.default = true;
+    winapi_0_3_5.minwindef = true;
+    winapi_0_3_5.processenv = true;
+    winapi_0_3_5.winbase = true;
+    winapi_0_3_5.wincon = true;
+    wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true);
+  }) [ winapi_0_3_5_features ];
+  ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  ws2_32_sys_0_2_1_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+    ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true);
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+}
diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
deleted file mode 100644
index 7224c11f183f..000000000000
--- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
+++ /dev/null
@@ -1,1905 +0,0 @@
-# Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone
-{ pkgs }:
-
-with pkgs;
-let kernel = stdenv.buildPlatform.parsed.kernel.name;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  cargo_edit = f: cargo_edit_0_2_0 { features = cargo_edit_0_2_0_features { cargo_edit_0_2_0 = f; }; };
-  adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "adler32";
-    version = "1.0.0";
-    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
-    sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w";
-    inherit dependencies buildDependencies features;
-  };
-  advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "advapi32-sys";
-    version = "0.2.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7";
-    libName = "advapi32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "aho-corasick";
-    version = "0.6.3";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k";
-    libName = "aho_corasick";
-    crateBin = [ {  name = "aho-corasick-dot"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  assert_cli_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "assert_cli";
-    version = "0.4.0";
-    authors = [ "Pascal Hertleif <killercup@gmail.com>" ];
-    sha256 = "0jq138q0wma5b149ixjv43al19xnzwgp67s908mh4cma1ar4rxbn";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace";
-    version = "0.3.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
-    sha256 = "0cj0ynv5p2f5ghisw58yjwrw4gvpji6sh12kk9j0228j7bhjznv7";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_sys_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace-sys";
-    version = "0.1.11";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "06c6s9hsygix25awgcfa1gnzvihc7kvv5apnmf6p15l4phwzz6x6";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  base64_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "base64";
-    version = "0.6.0";
-    authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ];
-    sha256 = "0ql1rmczbnww3iszc0pfc6mqa47ravpsdf525vp6s8r32nyzspl5";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.9.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "1.1.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp";
-    inherit dependencies buildDependencies features;
-  };
-  bytes_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bytes";
-    version = "0.4.4";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "028l4zlrjbr62y92slr84zil8h1bypqr7g545i566gf7cbss7hsp";
-    inherit dependencies buildDependencies features;
-  };
-  cargo_edit_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cargo-edit";
-    version = "0.2.0";
-    authors = [ "Without Boats <lee@libertad.ucsd.edu>" "Pascal Hertleif <killercup@gmail.com>" "Sebastian Garrido <sebasgarcep@gmail.com>" "Jonas Platte <mail@jonasplatte.de>" "Benjamin Gill <git@bgill.eu>" "Andronik Ordian <write@reusable.software>" ];
-    src = ./.;
-    crateBin = [ {  name = "cargo-add";  path = "src/bin/add/main.rs"; } {  name = "cargo-rm";  path = "src/bin/rm/main.rs"; } {  name = "cargo-upgrade";  path = "src/bin/upgrade/main.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cfg-if";
-    version = "0.1.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
-    inherit dependencies buildDependencies features;
-  };
-  colored_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "colored";
-    version = "1.5.2";
-    authors = [ "Thomas Wickham <mackwic@gmail.com>" ];
-    sha256 = "0d7c6vpqzlabph7qr29hdjgsks8z9hqcarzl8z5dfb8cnnrfrhzn";
-    inherit dependencies buildDependencies features;
-  };
-  core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "core-foundation";
-    version = "0.2.3";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm";
-    inherit dependencies buildDependencies features;
-  };
-  core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "core-foundation-sys";
-    version = "0.2.3";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  crypt32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "crypt32-sys";
-    version = "0.2.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1vy1q3ayc7f4wiwyxw31hd12cvs7791x3by6ka9wbxhm5gzfs3d0";
-    libName = "crypt32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dbghelp-sys";
-    version = "0.2.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq";
-    libName = "dbghelp";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  difference_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "difference";
-    version = "1.0.0";
-    authors = [ "Johann Hofmann <mail@johann-hofmann.com>" ];
-    sha256 = "0r1p2diin8zykfiifv6v9i3ajimdb1rg6qzxkrfw2n2iy57846qn";
-    crateBin = [ {  name = "difference"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "docopt";
-    version = "0.8.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss";
-    crateBin = [ {  name = "docopt-wordlist";  path = "src/wordlist.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dtoa";
-    version = "0.4.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
-    inherit dependencies buildDependencies features;
-  };
-  error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "error-chain";
-    version = "0.10.0";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
-    sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z";
-    inherit dependencies buildDependencies features;
-  };
-  foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "foreign-types";
-    version = "0.2.0";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh";
-    inherit dependencies buildDependencies features;
-  };
-  futures_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures";
-    version = "0.1.14";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1s53l50dy9abbycc88ghz1s76yfacygrxr3vnkl132m9ja0qi9nl";
-    inherit dependencies buildDependencies features;
-  };
-  futures_cpupool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures-cpupool";
-    version = "0.1.5";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1i001y0qv8pvvqd2ch1gsxw97286bcf789mlnhaindjzhm7x8fi6";
-    inherit dependencies buildDependencies features;
-  };
-  gcc_0_3_51_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "gcc";
-    version = "0.3.51";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0h2lnfakbvyn7lzpi5x41y30d5pzwz3172bdjzxxm4j59ipby563";
-    inherit dependencies buildDependencies features;
-  };
-  getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "getopts";
-    version = "0.2.14";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a";
-    inherit dependencies buildDependencies features;
-  };
-  httparse_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "httparse";
-    version = "1.2.3";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93";
-    inherit dependencies buildDependencies features;
-  };
-  hyper_0_11_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "hyper";
-    version = "0.11.1";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0al73rns6d18f09v872hasr5sf56mpzg4cpzi9g0118fy6v2z21a";
-    inherit dependencies buildDependencies features;
-  };
-  hyper_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "hyper-tls";
-    version = "0.1.2";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0n39sb8sc2pzdg501nshmv35q0r9pnrfjh8r1pdlygwxgcni9n3d";
-    inherit dependencies buildDependencies features;
-  };
-  idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "idna";
-    version = "0.1.4";
-    authors = [ "The rust-url developers" ];
-    sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336";
-    inherit dependencies buildDependencies features;
-  };
-  iovec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "iovec";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "01gmbcaamfms70ll964wj3akqbj5bf6zzi7nfj5y2hvzjxd959sj";
-    inherit dependencies buildDependencies features;
-  };
-  itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.3.1";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "language-tags";
-    version = "0.2.2";
-    authors = [ "Pyfisch <pyfisch@gmail.com>" ];
-    sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "0.2.8";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
-    inherit dependencies buildDependencies features;
-  };
-  lazycell_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazycell";
-    version = "0.4.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ];
-    sha256 = "1vgxv62l8qh3m8gvjyrd7wkx44hih724ivssc1mwj7vq9gnhgl0d";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.26";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0938y1yh2sr08zy8vpgj9wqk3nildip4ngpy2krvarzc8aqgvxrc";
-    inherit dependencies buildDependencies features;
-  };
-  libflate_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libflate";
-    version = "0.1.10";
-    authors = [ "Takeru Ohta <phjgt308@gmail.com>" ];
-    sha256 = "123m6wz1qvczv8fnak0k71hb7gj2kkiw3sj3rv55gfmir2kgf6gk";
-    inherit dependencies buildDependencies features;
-  };
-  log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "log";
-    version = "0.3.8";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006";
-    inherit dependencies buildDependencies features;
-  };
-  matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "matches";
-    version = "0.1.6";
-    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
-    sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  memchr_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memchr";
-    version = "1.0.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "071m5y0zm9p1k7pzqm20f44ixvmycf71xsrpayqaypxrjwchnkxm";
-    inherit dependencies buildDependencies features;
-  };
-  mime_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "mime";
-    version = "0.3.2";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "10yv7sq2gbq8xdh4imrga3wqiar652y8y31f8jqxw313pwsks3m5";
-    inherit dependencies buildDependencies features;
-  };
-  mio_0_6_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "mio";
-    version = "0.6.9";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0fbx9mxqqzcp0jzm1xkg9h4l4l43vphv3zca4zpdc8ahadvfw6qh";
-    inherit dependencies buildDependencies features;
-  };
-  miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "miow";
-    version = "0.2.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
-    inherit dependencies buildDependencies features;
-  };
-  native_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "native-tls";
-    version = "0.1.4";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0q5y5i96mfpjbhx8y7w9rdq65mksw67m60bw4xqlybc8y6jkr99v";
-    inherit dependencies buildDependencies features;
-  };
-  net2_0_2_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "net2";
-    version = "0.2.30";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1gd7r0d646sa3fdj7rwyyx43fj7m9amqvmn0h4gv6sqcwgb7rlad";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
-    inherit dependencies buildDependencies features;
-  };
-  num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num_cpus";
-    version = "1.6.2";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl";
-    version = "0.9.14";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0z8bza11x7fbhzsa3xrp4hzv4sl83102yxaiigmsdh2a480xg6jl";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_sys_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl-sys";
-    version = "0.9.14";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0wq8hanw6lsm7h49ql62b3z5immbk8dcbp61vddd0pi5rk53cb2w";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pad_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pad";
-    version = "0.1.4";
-    authors = [ "Ben S <ogham@bsago.me>" ];
-    sha256 = "1ca30d5s6yx1cb5qa3hwxgl53m69cnn037disw3kr6cv7sy7mw1n";
-    inherit dependencies buildDependencies features;
-  };
-  percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "percent-encoding";
-    version = "1.0.0";
-    authors = [ "The rust-url developers" ];
-    sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
-    inherit dependencies buildDependencies features;
-  };
-  pretty_assertions_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pretty_assertions";
-    version = "0.2.1";
-    authors = [ "Colin Kiegel <kiegel@gmx.de>" ];
-    sha256 = "06i0q8xjs1kbv3g0amx997axm93znwvpmj560vxrzn7s55hb9a8i";
-    inherit dependencies buildDependencies features;
-  };
-  pulldown_cmark_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pulldown-cmark";
-    version = "0.0.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "08wgdjqjnaz8yjvamdwcf1cqz18z795frkmbal9rgp9g2i1yrzwy";
-    inherit dependencies buildDependencies features;
-  };
-  quick_error_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quick-error";
-    version = "1.2.0";
-    authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ];
-    sha256 = "1gc95wll0algrl2cqrym6x97sg07hslczn6wkbnkxfikrfissmga";
-    inherit dependencies buildDependencies features;
-  };
-  quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quote";
-    version = "0.3.15";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.15";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
-    inherit dependencies buildDependencies features;
-  };
-  redox_syscall_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_syscall";
-    version = "0.1.26";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "0hfnc05jwlkkkjpvzzfbx8anzgc2n81n92pmvb065hkqlarbjz85";
-    libName = "syscall";
-    inherit dependencies buildDependencies features;
-  };
-  regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex";
-    version = "0.2.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7";
-    inherit dependencies buildDependencies features;
-  };
-  regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex-syntax";
-    version = "0.4.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls";
-    inherit dependencies buildDependencies features;
-  };
-  reqwest_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "reqwest";
-    version = "0.7.1";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0w3x0f6wmha09jcv83dkw00gpl11afi2k4gsavl43ccfdfa4b2nh";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_demangle_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc-demangle";
-    version = "0.1.4";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0q7myf1m5r7cilayw5r2n5qraxwlcpdr7s2mq8c63pxrz48h24qv";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc_version";
-    version = "0.1.7";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
-    inherit dependencies buildDependencies features;
-  };
-  safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "safemem";
-    version = "0.2.0";
-    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
-    sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm";
-    inherit dependencies buildDependencies features;
-  };
-  schannel_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "schannel";
-    version = "0.1.7";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ];
-    sha256 = "1np6wzxwj8r4kqmmz0a3w9dfs2zfwh0m7mrv7xpzxkpm4c4hcn5f";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scoped-tls";
-    version = "0.1.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5";
-    inherit dependencies buildDependencies features;
-  };
-  secur32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "secur32-sys";
-    version = "0.2.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0sp46ix9mx1156bidpfiq30xxsgmpva5jffls3259kxjqlxifcnx";
-    libName = "secur32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  security_framework_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "security-framework";
-    version = "0.1.14";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0xxxasrqls0ssflxjl2bf6bvljig0piy13pscbgkxd4zqw7w8i7q";
-    inherit dependencies buildDependencies features;
-  };
-  security_framework_sys_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "security-framework-sys";
-    version = "0.1.14";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "15ggkd39aq01yzrg0fxchciz9gf5wncl7k3mgvqmi7vk7hfhkcw7";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver";
-    version = "0.1.20";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
-    inherit dependencies buildDependencies features;
-  };
-  semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver";
-    version = "0.7.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
-    sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8";
-    inherit dependencies buildDependencies features;
-  };
-  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver-parser";
-    version = "0.7.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
-    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
-    inherit dependencies buildDependencies features;
-  };
-  serde_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "1.0.10";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1p71hm8xpa7gfmhr2hzb4ah1ajhsmf3gh3i1fknf9ch8dn0qfycv";
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive";
-    version = "1.0.10";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1m5if144vqsjx9fk6g7b9x0cy8mam6w78yghv3fykngminklcjw6";
-    procMacro = true;
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_internals_0_15_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive_internals";
-    version = "0.15.1";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0s2i03rv2sppywan0z5qiif65b2wqc6lp5r5l71mz4nigrh04zrj";
-    inherit dependencies buildDependencies features;
-  };
-  serde_json_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_json";
-    version = "1.0.2";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0vabw2zciy8vy0hgj0khm1vwbvng4whwry7ylfl3ypd0inx84mn6";
-    inherit dependencies buildDependencies features;
-  };
-  serde_urlencoded_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_urlencoded";
-    version = "0.5.1";
-    authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ];
-    sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl";
-    inherit dependencies buildDependencies features;
-  };
-  skeptic_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "skeptic";
-    version = "0.5.0";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" ];
-    sha256 = "06vf19309psngmx61sg33czbkx1cg9bmw0wr66n9mqdhvwa4y52d";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "slab";
-    version = "0.3.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k";
-    inherit dependencies buildDependencies features;
-  };
-  smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "smallvec";
-    version = "0.2.1";
-    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
-    sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.6.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
-    inherit dependencies buildDependencies features;
-  };
-  syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "syn";
-    version = "0.11.11";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
-    inherit dependencies buildDependencies features;
-  };
-  synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "synom";
-    version = "0.11.3";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
-    inherit dependencies buildDependencies features;
-  };
-  take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "take";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd";
-    inherit dependencies buildDependencies features;
-  };
-  tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tempdir";
-    version = "0.3.5";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz";
-    inherit dependencies buildDependencies features;
-  };
-  thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "thread_local";
-    version = "0.3.4";
-    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr";
-    inherit dependencies buildDependencies features;
-  };
-  time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "time";
-    version = "0.1.38";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_core_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-core";
-    version = "0.1.8";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1wikhmk648j13dxy4dpi435dm943ph5bf4ldfhpxn23cbzlr2kcp";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_io_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-io";
-    version = "0.1.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "07ab05gmzq0xmi5h26wpvjzircax5bwfjgc3zzn62ll4rarz4pva";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-proto";
-    version = "0.1.1";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-service";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-tls";
-    version = "0.1.3";
-    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0ib58y81qr64m3gg0pn7k06b71r8b05cmvakzpgfqdsw0qj08sva";
-    inherit dependencies buildDependencies features;
-  };
-  toml_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml";
-    version = "0.4.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "12v5l461czglhspc0crn29brb9p67xx7n6karrrs87slvq4xc7f1";
-    inherit dependencies buildDependencies features;
-  };
-  unicase_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicase";
-    version = "2.0.0";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "1nmidnfn5cwp6dr6aln2ffk8yvdfsf3si3bq1znss5swi3i5v64w";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-bidi";
-    version = "0.3.4";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
-    libName = "unicode_bidi";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-normalization";
-    version = "0.1.5";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-width";
-    version = "0.1.4";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-xid";
-    version = "0.0.4";
-    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
-    inherit dependencies buildDependencies features;
-  };
-  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unreachable";
-    version = "1.0.0";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
-    inherit dependencies buildDependencies features;
-  };
-  url_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "url";
-    version = "1.5.1";
-    authors = [ "The rust-url developers" ];
-    sha256 = "1l2m7jdl2x09fdz60mjk63f61m3fjk1w5ykiadi9lxayg3bvppcw";
-    inherit dependencies buildDependencies features;
-  };
-  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "utf8-ranges";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
-    inherit dependencies buildDependencies features;
-  };
-  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "void";
-    version = "1.0.2";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ws2_32-sys";
-    version = "0.2.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc";
-    libName = "ws2_32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
-  adler32_1_0_0_features = f: updateFeatures f (rec {
-    adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
-  }) [];
-  advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  advapi32_sys_0_2_0_features = f: updateFeatures f (rec {
-    advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ {
-    dependencies = mapFeatures features ([ memchr_1_0_1 ]);
-  };
-  aho_corasick_0_6_3_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true);
-    memchr_1_0_1.default = true;
-  }) [ memchr_1_0_1_features ];
-  assert_cli_0_4_0 = { features?(assert_cli_0_4_0_features {}) }: assert_cli_0_4_0_ {
-    dependencies = mapFeatures features ([ colored_1_5_2 difference_1_0_0 error_chain_0_10_0 ]);
-    buildDependencies = mapFeatures features ([ skeptic_0_5_0 ]);
-  };
-  assert_cli_0_4_0_features = f: updateFeatures f (rec {
-    assert_cli_0_4_0.default = (f.assert_cli_0_4_0.default or true);
-    colored_1_5_2.default = true;
-    difference_1_0_0.default = true;
-    error_chain_0_10_0.default = true;
-    skeptic_0_5_0.default = true;
-  }) [ colored_1_5_2_features difference_1_0_0_features error_chain_0_10_0_features skeptic_0_5_0_features ];
-  backtrace_0_3_2 = { features?(backtrace_0_3_2_features {}) }: backtrace_0_3_2_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_2 libc_0_2_26 rustc_demangle_0_1_4 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_2.backtrace-sys or false then [ backtrace_sys_0_1_11 ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_2.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else [])
-      ++ (if features.backtrace_0_3_2.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else [])
-      ++ (if features.backtrace_0_3_2.winapi or false then [ winapi_0_2_8 ] else [])) else []);
-    features = mkFeatures (features.backtrace_0_3_2 or {});
-  };
-  backtrace_0_3_2_features = f: updateFeatures f (rec {
-    backtrace_0_3_2.backtrace-sys =
-      (f.backtrace_0_3_2.backtrace-sys or false) ||
-      (f.backtrace_0_3_2.libbacktrace or false) ||
-      (backtrace_0_3_2.libbacktrace or false);
-    backtrace_0_3_2.coresymbolication =
-      (f.backtrace_0_3_2.coresymbolication or false) ||
-      (f.backtrace_0_3_2.default or false) ||
-      (backtrace_0_3_2.default or false);
-    backtrace_0_3_2.dbghelp =
-      (f.backtrace_0_3_2.dbghelp or false) ||
-      (f.backtrace_0_3_2.default or false) ||
-      (backtrace_0_3_2.default or false);
-    backtrace_0_3_2.dbghelp-sys =
-      (f.backtrace_0_3_2.dbghelp-sys or false) ||
-      (f.backtrace_0_3_2.dbghelp or false) ||
-      (backtrace_0_3_2.dbghelp or false);
-    backtrace_0_3_2.default = (f.backtrace_0_3_2.default or true);
-    backtrace_0_3_2.dladdr =
-      (f.backtrace_0_3_2.dladdr or false) ||
-      (f.backtrace_0_3_2.default or false) ||
-      (backtrace_0_3_2.default or false);
-    backtrace_0_3_2.kernel32-sys =
-      (f.backtrace_0_3_2.kernel32-sys or false) ||
-      (f.backtrace_0_3_2.dbghelp or false) ||
-      (backtrace_0_3_2.dbghelp or false);
-    backtrace_0_3_2.libbacktrace =
-      (f.backtrace_0_3_2.libbacktrace or false) ||
-      (f.backtrace_0_3_2.default or false) ||
-      (backtrace_0_3_2.default or false);
-    backtrace_0_3_2.libunwind =
-      (f.backtrace_0_3_2.libunwind or false) ||
-      (f.backtrace_0_3_2.default or false) ||
-      (backtrace_0_3_2.default or false);
-    backtrace_0_3_2.rustc-serialize =
-      (f.backtrace_0_3_2.rustc-serialize or false) ||
-      (f.backtrace_0_3_2.serialize-rustc or false) ||
-      (backtrace_0_3_2.serialize-rustc or false);
-    backtrace_0_3_2.serde =
-      (f.backtrace_0_3_2.serde or false) ||
-      (f.backtrace_0_3_2.serialize-serde or false) ||
-      (backtrace_0_3_2.serialize-serde or false);
-    backtrace_0_3_2.serde_derive =
-      (f.backtrace_0_3_2.serde_derive or false) ||
-      (f.backtrace_0_3_2.serialize-serde or false) ||
-      (backtrace_0_3_2.serialize-serde or false);
-    backtrace_0_3_2.winapi =
-      (f.backtrace_0_3_2.winapi or false) ||
-      (f.backtrace_0_3_2.dbghelp or false) ||
-      (backtrace_0_3_2.dbghelp or false);
-    backtrace_sys_0_1_11.default = true;
-    cfg_if_0_1_2.default = true;
-    dbghelp_sys_0_2_0.default = true;
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_26.default = true;
-    rustc_demangle_0_1_4.default = true;
-    winapi_0_2_8.default = true;
-  }) [ cfg_if_0_1_2_features libc_0_2_26_features rustc_demangle_0_1_4_features backtrace_sys_0_1_11_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  backtrace_sys_0_1_11 = { features?(backtrace_sys_0_1_11_features {}) }: backtrace_sys_0_1_11_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-    buildDependencies = mapFeatures features ([ gcc_0_3_51 ]);
-  };
-  backtrace_sys_0_1_11_features = f: updateFeatures f (rec {
-    backtrace_sys_0_1_11.default = (f.backtrace_sys_0_1_11.default or true);
-    gcc_0_3_51.default = true;
-    libc_0_2_26.default = true;
-  }) [ libc_0_2_26_features gcc_0_3_51_features ];
-  base64_0_6_0 = { features?(base64_0_6_0_features {}) }: base64_0_6_0_ {
-    dependencies = mapFeatures features ([ byteorder_1_1_0 safemem_0_2_0 ]);
-  };
-  base64_0_6_0_features = f: updateFeatures f (rec {
-    base64_0_6_0.default = (f.base64_0_6_0.default or true);
-    byteorder_1_1_0.default = true;
-    safemem_0_2_0.default = true;
-  }) [ byteorder_1_1_0_features safemem_0_2_0_features ];
-  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
-    features = mkFeatures (features.bitflags_0_9_1 or {});
-  };
-  bitflags_0_9_1_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
-    bitflags_0_9_1.example_generated =
-      (f.bitflags_0_9_1.example_generated or false) ||
-      (f.bitflags_0_9_1.default or false) ||
-      (bitflags_0_9_1.default or false);
-  }) [];
-  byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ {
-    features = mkFeatures (features.byteorder_1_1_0 or {});
-  };
-  byteorder_1_1_0_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true);
-    byteorder_1_1_0.std =
-      (f.byteorder_1_1_0.std or false) ||
-      (f.byteorder_1_1_0.default or false) ||
-      (byteorder_1_1_0.default or false);
-  }) [];
-  bytes_0_4_4 = { features?(bytes_0_4_4_features {}) }: bytes_0_4_4_ {
-    dependencies = mapFeatures features ([ byteorder_1_1_0 iovec_0_1_0 ]);
-  };
-  bytes_0_4_4_features = f: updateFeatures f (rec {
-    byteorder_1_1_0.default = true;
-    bytes_0_4_4.default = (f.bytes_0_4_4.default or true);
-    iovec_0_1_0.default = true;
-  }) [ byteorder_1_1_0_features iovec_0_1_0_features ];
-  cargo_edit_0_2_0 = { features?(cargo_edit_0_2_0_features {}) }: cargo_edit_0_2_0_ {
-    dependencies = mapFeatures features ([ docopt_0_8_1 pad_0_1_4 quick_error_1_2_0 regex_0_2_2 reqwest_0_7_1 semver_0_7_0 serde_1_0_10 serde_derive_1_0_10 serde_json_1_0_2 toml_0_4_2 ]);
-    features = mkFeatures (features.cargo_edit_0_2_0 or {});
-  };
-  cargo_edit_0_2_0_features = f: updateFeatures f (rec {
-    cargo_edit_0_2_0.default = (f.cargo_edit_0_2_0.default or true);
-    docopt_0_8_1.default = true;
-    pad_0_1_4.default = true;
-    quick_error_1_2_0.default = true;
-    regex_0_2_2.default = true;
-    reqwest_0_7_1.default = true;
-    semver_0_7_0.default = true;
-    semver_0_7_0.serde = true;
-    serde_1_0_10.default = true;
-    serde_derive_1_0_10.default = true;
-    serde_json_1_0_2.default = true;
-    toml_0_4_2.default = true;
-  }) [ docopt_0_8_1_features pad_0_1_4_features quick_error_1_2_0_features regex_0_2_2_features reqwest_0_7_1_features semver_0_7_0_features serde_1_0_10_features serde_derive_1_0_10_features serde_json_1_0_2_features toml_0_4_2_features ];
-  cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {};
-  cfg_if_0_1_2_features = f: updateFeatures f (rec {
-    cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true);
-  }) [];
-  colored_1_5_2 = { features?(colored_1_5_2_features {}) }: colored_1_5_2_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_8 ]);
-    features = mkFeatures (features.colored_1_5_2 or {});
-  };
-  colored_1_5_2_features = f: updateFeatures f (rec {
-    colored_1_5_2.default = (f.colored_1_5_2.default or true);
-    lazy_static_0_2_8.default = true;
-  }) [ lazy_static_0_2_8_features ];
-  core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ {
-    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]);
-  };
-  core_foundation_0_2_3_features = f: updateFeatures f (rec {
-    core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true);
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_26.default = true;
-  }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ];
-  core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-  };
-  core_foundation_sys_0_2_3_features = f: updateFeatures f (rec {
-    core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true);
-    libc_0_2_26.default = true;
-  }) [ libc_0_2_26_features ];
-  crypt32_sys_0_2_0 = { features?(crypt32_sys_0_2_0_features {}) }: crypt32_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  crypt32_sys_0_2_0_features = f: updateFeatures f (rec {
-    crypt32_sys_0_2_0.default = (f.crypt32_sys_0_2_0.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  dbghelp_sys_0_2_0_features = f: updateFeatures f (rec {
-    dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  difference_1_0_0 = { features?(difference_1_0_0_features {}) }: difference_1_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.difference_1_0_0 or {});
-  };
-  difference_1_0_0_features = f: updateFeatures f (rec {
-    difference_1_0_0.default = (f.difference_1_0_0.default or true);
-    difference_1_0_0.getopts =
-      (f.difference_1_0_0.getopts or false) ||
-      (f.difference_1_0_0.bin or false) ||
-      (difference_1_0_0.bin or false);
-  }) [];
-  docopt_0_8_1 = { features?(docopt_0_8_1_features {}) }: docopt_0_8_1_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_8 regex_0_2_2 serde_1_0_10 serde_derive_1_0_10 strsim_0_6_0 ]);
-  };
-  docopt_0_8_1_features = f: updateFeatures f (rec {
-    docopt_0_8_1.default = (f.docopt_0_8_1.default or true);
-    lazy_static_0_2_8.default = true;
-    regex_0_2_2.default = true;
-    serde_1_0_10.default = true;
-    serde_derive_1_0_10.default = true;
-    strsim_0_6_0.default = true;
-  }) [ lazy_static_0_2_8_features regex_0_2_2_features serde_1_0_10_features serde_derive_1_0_10_features strsim_0_6_0_features ];
-  dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {};
-  dtoa_0_4_1_features = f: updateFeatures f (rec {
-    dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true);
-  }) [];
-  error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.error_chain_0_10_0.backtrace or false then [ backtrace_0_3_2 ] else []));
-    features = mkFeatures (features.error_chain_0_10_0 or {});
-  };
-  error_chain_0_10_0_features = f: updateFeatures f (rec {
-    backtrace_0_3_2.default = true;
-    error_chain_0_10_0.backtrace =
-      (f.error_chain_0_10_0.backtrace or false) ||
-      (f.error_chain_0_10_0.default or false) ||
-      (error_chain_0_10_0.default or false);
-    error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true);
-    error_chain_0_10_0.example_generated =
-      (f.error_chain_0_10_0.example_generated or false) ||
-      (f.error_chain_0_10_0.default or false) ||
-      (error_chain_0_10_0.default or false);
-  }) [ backtrace_0_3_2_features ];
-  foreign_types_0_2_0 = { features?(foreign_types_0_2_0_features {}) }: foreign_types_0_2_0_ {};
-  foreign_types_0_2_0_features = f: updateFeatures f (rec {
-    foreign_types_0_2_0.default = (f.foreign_types_0_2_0.default or true);
-  }) [];
-  futures_0_1_14 = { features?(futures_0_1_14_features {}) }: futures_0_1_14_ {
-    features = mkFeatures (features.futures_0_1_14 or {});
-  };
-  futures_0_1_14_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = (f.futures_0_1_14.default or true);
-    futures_0_1_14.use_std =
-      (f.futures_0_1_14.use_std or false) ||
-      (f.futures_0_1_14.default or false) ||
-      (futures_0_1_14.default or false);
-    futures_0_1_14.with-deprecated =
-      (f.futures_0_1_14.with-deprecated or false) ||
-      (f.futures_0_1_14.default or false) ||
-      (futures_0_1_14.default or false);
-  }) [];
-  futures_cpupool_0_1_5 = { features?(futures_cpupool_0_1_5_features {}) }: futures_cpupool_0_1_5_ {
-    dependencies = mapFeatures features ([ futures_0_1_14 num_cpus_1_6_2 ]);
-    features = mkFeatures (features.futures_cpupool_0_1_5 or {});
-  };
-  futures_cpupool_0_1_5_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = (f.futures_0_1_14.default or false);
-    futures_0_1_14.use_std = true;
-    futures_0_1_14.with-deprecated =
-      (f.futures_0_1_14.with-deprecated or false) ||
-      (futures_cpupool_0_1_5.with-deprecated or false) ||
-      (f.futures_cpupool_0_1_5.with-deprecated or false);
-    futures_cpupool_0_1_5.default = (f.futures_cpupool_0_1_5.default or true);
-    futures_cpupool_0_1_5.with-deprecated =
-      (f.futures_cpupool_0_1_5.with-deprecated or false) ||
-      (f.futures_cpupool_0_1_5.default or false) ||
-      (futures_cpupool_0_1_5.default or false);
-    num_cpus_1_6_2.default = true;
-  }) [ futures_0_1_14_features num_cpus_1_6_2_features ];
-  gcc_0_3_51 = { features?(gcc_0_3_51_features {}) }: gcc_0_3_51_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.gcc_0_3_51 or {});
-  };
-  gcc_0_3_51_features = f: updateFeatures f (rec {
-    gcc_0_3_51.default = (f.gcc_0_3_51.default or true);
-    gcc_0_3_51.rayon =
-      (f.gcc_0_3_51.rayon or false) ||
-      (f.gcc_0_3_51.parallel or false) ||
-      (gcc_0_3_51.parallel or false);
-  }) [];
-  getopts_0_2_14 = { features?(getopts_0_2_14_features {}) }: getopts_0_2_14_ {};
-  getopts_0_2_14_features = f: updateFeatures f (rec {
-    getopts_0_2_14.default = (f.getopts_0_2_14.default or true);
-  }) [];
-  httparse_1_2_3 = { features?(httparse_1_2_3_features {}) }: httparse_1_2_3_ {
-    features = mkFeatures (features.httparse_1_2_3 or {});
-  };
-  httparse_1_2_3_features = f: updateFeatures f (rec {
-    httparse_1_2_3.default = (f.httparse_1_2_3.default or true);
-    httparse_1_2_3.std =
-      (f.httparse_1_2_3.std or false) ||
-      (f.httparse_1_2_3.default or false) ||
-      (httparse_1_2_3.default or false);
-  }) [];
-  hyper_0_11_1 = { features?(hyper_0_11_1_features {}) }: hyper_0_11_1_ {
-    dependencies = mapFeatures features ([ base64_0_6_0 bytes_0_4_4 futures_0_1_14 futures_cpupool_0_1_5 httparse_1_2_3 language_tags_0_2_2 log_0_3_8 mime_0_3_2 percent_encoding_1_0_0 time_0_1_38 tokio_core_0_1_8 tokio_io_0_1_2 tokio_proto_0_1_1 tokio_service_0_1_0 unicase_2_0_0 ]);
-    features = mkFeatures (features.hyper_0_11_1 or {});
-  };
-  hyper_0_11_1_features = f: updateFeatures f (rec {
-    base64_0_6_0.default = true;
-    bytes_0_4_4.default = true;
-    futures_0_1_14.default = true;
-    futures_cpupool_0_1_5.default = true;
-    httparse_1_2_3.default = true;
-    hyper_0_11_1.default = (f.hyper_0_11_1.default or true);
-    language_tags_0_2_2.default = true;
-    log_0_3_8.default = true;
-    mime_0_3_2.default = true;
-    percent_encoding_1_0_0.default = true;
-    time_0_1_38.default = true;
-    tokio_core_0_1_8.default = true;
-    tokio_io_0_1_2.default = true;
-    tokio_proto_0_1_1.default = true;
-    tokio_service_0_1_0.default = true;
-    unicase_2_0_0.default = true;
-  }) [ base64_0_6_0_features bytes_0_4_4_features futures_0_1_14_features futures_cpupool_0_1_5_features httparse_1_2_3_features language_tags_0_2_2_features log_0_3_8_features mime_0_3_2_features percent_encoding_1_0_0_features time_0_1_38_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_0_0_features ];
-  hyper_tls_0_1_2 = { features?(hyper_tls_0_1_2_features {}) }: hyper_tls_0_1_2_ {
-    dependencies = mapFeatures features ([ futures_0_1_14 hyper_0_11_1 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 tokio_tls_0_1_3 ]);
-  };
-  hyper_tls_0_1_2_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = true;
-    hyper_0_11_1.default = true;
-    hyper_tls_0_1_2.default = (f.hyper_tls_0_1_2.default or true);
-    native_tls_0_1_4.default = true;
-    tokio_core_0_1_8.default = true;
-    tokio_io_0_1_2.default = true;
-    tokio_service_0_1_0.default = true;
-    tokio_tls_0_1_3.default = true;
-  }) [ futures_0_1_14_features hyper_0_11_1_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features tokio_tls_0_1_3_features ];
-  idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
-    dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]);
-  };
-  idna_0_1_4_features = f: updateFeatures f (rec {
-    idna_0_1_4.default = (f.idna_0_1_4.default or true);
-    matches_0_1_6.default = true;
-    unicode_bidi_0_3_4.default = true;
-    unicode_normalization_0_1_5.default = true;
-  }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_5_features ];
-  iovec_0_1_0 = { features?(iovec_0_1_0_features {}) }: iovec_0_1_0_ {
-    dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []);
-  };
-  iovec_0_1_0_features = f: updateFeatures f (rec {
-    iovec_0_1_0.default = (f.iovec_0_1_0.default or true);
-    libc_0_2_26.default = true;
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_26_features winapi_0_2_8_features ];
-  itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {};
-  itoa_0_3_1_features = f: updateFeatures f (rec {
-    itoa_0_3_1.default = (f.itoa_0_3_1.default or true);
-  }) [];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.language_tags_0_2_2 or {});
-  };
-  language_tags_0_2_2_features = f: updateFeatures f (rec {
-    language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true);
-    language_tags_0_2_2.heapsize =
-      (f.language_tags_0_2_2.heapsize or false) ||
-      (f.language_tags_0_2_2.heap_size or false) ||
-      (language_tags_0_2_2.heap_size or false);
-    language_tags_0_2_2.heapsize_plugin =
-      (f.language_tags_0_2_2.heapsize_plugin or false) ||
-      (f.language_tags_0_2_2.heap_size or false) ||
-      (language_tags_0_2_2.heap_size or false);
-  }) [];
-  lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_0_2_8 or {});
-  };
-  lazy_static_0_2_8_features = f: updateFeatures f (rec {
-    lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true);
-    lazy_static_0_2_8.nightly =
-      (f.lazy_static_0_2_8.nightly or false) ||
-      (f.lazy_static_0_2_8.spin_no_std or false) ||
-      (lazy_static_0_2_8.spin_no_std or false);
-    lazy_static_0_2_8.spin =
-      (f.lazy_static_0_2_8.spin or false) ||
-      (f.lazy_static_0_2_8.spin_no_std or false) ||
-      (lazy_static_0_2_8.spin_no_std or false);
-  }) [];
-  lazycell_0_4_0 = { features?(lazycell_0_4_0_features {}) }: lazycell_0_4_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazycell_0_4_0 or {});
-  };
-  lazycell_0_4_0_features = f: updateFeatures f (rec {
-    lazycell_0_4_0.clippy =
-      (f.lazycell_0_4_0.clippy or false) ||
-      (f.lazycell_0_4_0.nightly-testing or false) ||
-      (lazycell_0_4_0.nightly-testing or false);
-    lazycell_0_4_0.default = (f.lazycell_0_4_0.default or true);
-    lazycell_0_4_0.nightly =
-      (f.lazycell_0_4_0.nightly or false) ||
-      (f.lazycell_0_4_0.nightly-testing or false) ||
-      (lazycell_0_4_0.nightly-testing or false);
-  }) [];
-  libc_0_2_26 = { features?(libc_0_2_26_features {}) }: libc_0_2_26_ {
-    features = mkFeatures (features.libc_0_2_26 or {});
-  };
-  libc_0_2_26_features = f: updateFeatures f (rec {
-    libc_0_2_26.default = (f.libc_0_2_26.default or true);
-    libc_0_2_26.use_std =
-      (f.libc_0_2_26.use_std or false) ||
-      (f.libc_0_2_26.default or false) ||
-      (libc_0_2_26.default or false);
-  }) [];
-  libflate_0_1_10 = { features?(libflate_0_1_10_features {}) }: libflate_0_1_10_ {
-    dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_1_0 ]);
-  };
-  libflate_0_1_10_features = f: updateFeatures f (rec {
-    adler32_1_0_0.default = true;
-    byteorder_1_1_0.default = true;
-    libflate_0_1_10.default = (f.libflate_0_1_10.default or true);
-  }) [ adler32_1_0_0_features byteorder_1_1_0_features ];
-  log_0_3_8 = { features?(log_0_3_8_features {}) }: log_0_3_8_ {
-    features = mkFeatures (features.log_0_3_8 or {});
-  };
-  log_0_3_8_features = f: updateFeatures f (rec {
-    log_0_3_8.default = (f.log_0_3_8.default or true);
-    log_0_3_8.use_std =
-      (f.log_0_3_8.use_std or false) ||
-      (f.log_0_3_8.default or false) ||
-      (log_0_3_8.default or false);
-  }) [];
-  matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
-  matches_0_1_6_features = f: updateFeatures f (rec {
-    matches_0_1_6.default = (f.matches_0_1_6.default or true);
-  }) [];
-  memchr_1_0_1 = { features?(memchr_1_0_1_features {}) }: memchr_1_0_1_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-    features = mkFeatures (features.memchr_1_0_1 or {});
-  };
-  memchr_1_0_1_features = f: updateFeatures f (rec {
-    libc_0_2_26.default = (f.libc_0_2_26.default or false);
-    libc_0_2_26.use_std =
-      (f.libc_0_2_26.use_std or false) ||
-      (memchr_1_0_1.use_std or false) ||
-      (f.memchr_1_0_1.use_std or false);
-    memchr_1_0_1.default = (f.memchr_1_0_1.default or true);
-    memchr_1_0_1.use_std =
-      (f.memchr_1_0_1.use_std or false) ||
-      (f.memchr_1_0_1.default or false) ||
-      (memchr_1_0_1.default or false);
-  }) [ libc_0_2_26_features ];
-  mime_0_3_2 = { features?(mime_0_3_2_features {}) }: mime_0_3_2_ {
-    dependencies = mapFeatures features ([ unicase_2_0_0 ]);
-  };
-  mime_0_3_2_features = f: updateFeatures f (rec {
-    mime_0_3_2.default = (f.mime_0_3_2.default or true);
-    unicase_2_0_0.default = true;
-  }) [ unicase_2_0_0_features ];
-  mio_0_6_9 = { features?(mio_0_6_9_features {}) }: mio_0_6_9_ {
-    dependencies = mapFeatures features ([ iovec_0_1_0 lazycell_0_4_0 log_0_3_8 net2_0_2_30 slab_0_3_0 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []);
-    features = mkFeatures (features.mio_0_6_9 or {});
-  };
-  mio_0_6_9_features = f: updateFeatures f (rec {
-    iovec_0_1_0.default = true;
-    kernel32_sys_0_2_2.default = true;
-    lazycell_0_4_0.default = true;
-    libc_0_2_26.default = true;
-    log_0_3_8.default = true;
-    mio_0_6_9.default = (f.mio_0_6_9.default or true);
-    mio_0_6_9.with-deprecated =
-      (f.mio_0_6_9.with-deprecated or false) ||
-      (f.mio_0_6_9.default or false) ||
-      (mio_0_6_9.default or false);
-    miow_0_2_1.default = true;
-    net2_0_2_30.default = true;
-    slab_0_3_0.default = true;
-    winapi_0_2_8.default = true;
-  }) [ iovec_0_1_0_features lazycell_0_4_0_features log_0_3_8_features net2_0_2_30_features slab_0_3_0_features libc_0_2_26_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ];
-  miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ {
-    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_30 winapi_0_2_8 ws2_32_sys_0_2_1 ]);
-  };
-  miow_0_2_1_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    miow_0_2_1.default = (f.miow_0_2_1.default or true);
-    net2_0_2_30.default = (f.net2_0_2_30.default or false);
-    winapi_0_2_8.default = true;
-    ws2_32_sys_0_2_1.default = true;
-  }) [ kernel32_sys_0_2_2_features net2_0_2_30_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ];
-  native_tls_0_1_4 = { features?(native_tls_0_1_4_features {}) }: native_tls_0_1_4_ {
-    dependencies = (if !(kernel == "windows" || kernel == "darwin") then mapFeatures features ([ openssl_0_9_14 ]) else [])
-      ++ (if kernel == "darwin" then mapFeatures features ([ security_framework_0_1_14 security_framework_sys_0_1_14 tempdir_0_3_5 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_7 ]) else []);
-  };
-  native_tls_0_1_4_features = f: updateFeatures f (rec {
-    native_tls_0_1_4.default = (f.native_tls_0_1_4.default or true);
-    openssl_0_9_14.default = true;
-    schannel_0_1_7.default = true;
-    security_framework_0_1_14.OSX_10_8 = true;
-    security_framework_0_1_14.default = true;
-    security_framework_sys_0_1_14.default = true;
-    tempdir_0_3_5.default = true;
-  }) [ openssl_0_9_14_features security_framework_0_1_14_features security_framework_sys_0_1_14_features tempdir_0_3_5_features schannel_0_1_7_features ];
-  net2_0_2_30 = { features?(net2_0_2_30_features {}) }: net2_0_2_30_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_2 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ]) else [])
-      ++ (if kernel == "i686-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "i686-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "x86_64-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else [])
-      ++ (if kernel == "x86_64-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []);
-    features = mkFeatures (features.net2_0_2_30 or {});
-  };
-  net2_0_2_30_features = f: updateFeatures f (rec {
-    cfg_if_0_1_2.default = true;
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_26.default = true;
-    net2_0_2_30.default = (f.net2_0_2_30.default or true);
-    net2_0_2_30.duration =
-      (f.net2_0_2_30.duration or false) ||
-      (f.net2_0_2_30.default or false) ||
-      (net2_0_2_30.default or false);
-    winapi_0_2_8.default = true;
-    ws2_32_sys_0_2_1.default = true;
-  }) [ cfg_if_0_1_2_features libc_0_2_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ws2_32_sys_0_2_1_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features ];
-  num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
-  num_traits_0_1_40_features = f: updateFeatures f (rec {
-    num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
-  }) [];
-  num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-  };
-  num_cpus_1_6_2_features = f: updateFeatures f (rec {
-    libc_0_2_26.default = true;
-    num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true);
-  }) [ libc_0_2_26_features ];
-  openssl_0_9_14 = { features?(openssl_0_9_14_features {}) }: openssl_0_9_14_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_8 libc_0_2_26 openssl_sys_0_9_14 ]);
-    features = mkFeatures (features.openssl_0_9_14 or {});
-  };
-  openssl_0_9_14_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = true;
-    foreign_types_0_2_0.default = true;
-    lazy_static_0_2_8.default = true;
-    libc_0_2_26.default = true;
-    openssl_0_9_14.default = (f.openssl_0_9_14.default or true);
-    openssl_sys_0_9_14.default = true;
-  }) [ bitflags_0_9_1_features foreign_types_0_2_0_features lazy_static_0_2_8_features libc_0_2_26_features openssl_sys_0_9_14_features ];
-  openssl_sys_0_9_14 = { features?(openssl_sys_0_9_14_features {}) }: openssl_sys_0_9_14_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-    buildDependencies = mapFeatures features ([ gcc_0_3_51 pkg_config_0_3_9 ]);
-  };
-  openssl_sys_0_9_14_features = f: updateFeatures f (rec {
-    gcc_0_3_51.default = true;
-    libc_0_2_26.default = true;
-    openssl_sys_0_9_14.default = (f.openssl_sys_0_9_14.default or true);
-    pkg_config_0_3_9.default = true;
-  }) [ libc_0_2_26_features gcc_0_3_51_features pkg_config_0_3_9_features ];
-  pad_0_1_4 = { features?(pad_0_1_4_features {}) }: pad_0_1_4_ {
-    dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
-  };
-  pad_0_1_4_features = f: updateFeatures f (rec {
-    pad_0_1_4.default = (f.pad_0_1_4.default or true);
-    unicode_width_0_1_4.default = true;
-  }) [ unicode_width_0_1_4_features ];
-  percent_encoding_1_0_0 = { features?(percent_encoding_1_0_0_features {}) }: percent_encoding_1_0_0_ {};
-  percent_encoding_1_0_0_features = f: updateFeatures f (rec {
-    percent_encoding_1_0_0.default = (f.percent_encoding_1_0_0.default or true);
-  }) [];
-  pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
-  pkg_config_0_3_9_features = f: updateFeatures f (rec {
-    pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
-  }) [];
-  pretty_assertions_0_2_1 = { features?(pretty_assertions_0_2_1_features {}) }: pretty_assertions_0_2_1_ {
-    dependencies = mapFeatures features ([ difference_1_0_0 ]);
-  };
-  pretty_assertions_0_2_1_features = f: updateFeatures f (rec {
-    difference_1_0_0.default = true;
-    pretty_assertions_0_2_1.default = (f.pretty_assertions_0_2_1.default or true);
-  }) [ difference_1_0_0_features ];
-  pulldown_cmark_0_0_3 = { features?(pulldown_cmark_0_0_3_features {}) }: pulldown_cmark_0_0_3_ {
-    dependencies = mapFeatures features ([ getopts_0_2_14 ]);
-  };
-  pulldown_cmark_0_0_3_features = f: updateFeatures f (rec {
-    getopts_0_2_14.default = true;
-    pulldown_cmark_0_0_3.default = (f.pulldown_cmark_0_0_3.default or true);
-  }) [ getopts_0_2_14_features ];
-  quick_error_1_2_0 = { features?(quick_error_1_2_0_features {}) }: quick_error_1_2_0_ {};
-  quick_error_1_2_0_features = f: updateFeatures f (rec {
-    quick_error_1_2_0.default = (f.quick_error_1_2_0.default or true);
-  }) [];
-  quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
-  quote_0_3_15_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = (f.quote_0_3_15.default or true);
-  }) [];
-  rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ]);
-  };
-  rand_0_3_15_features = f: updateFeatures f (rec {
-    libc_0_2_26.default = true;
-    rand_0_3_15.default = (f.rand_0_3_15.default or true);
-  }) [ libc_0_2_26_features ];
-  redox_syscall_0_1_26 = { features?(redox_syscall_0_1_26_features {}) }: redox_syscall_0_1_26_ {};
-  redox_syscall_0_1_26_features = f: updateFeatures f (rec {
-    redox_syscall_0_1_26.default = (f.redox_syscall_0_1_26.default or true);
-  }) [];
-  regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ {
-    dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_1 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]);
-    features = mkFeatures (features.regex_0_2_2 or {});
-  };
-  regex_0_2_2_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_3.default = true;
-    memchr_1_0_1.default = true;
-    regex_0_2_2.default = (f.regex_0_2_2.default or true);
-    regex_0_2_2.simd =
-      (f.regex_0_2_2.simd or false) ||
-      (f.regex_0_2_2.simd-accel or false) ||
-      (regex_0_2_2.simd-accel or false);
-    regex_syntax_0_4_1.default = true;
-    thread_local_0_3_4.default = true;
-    utf8_ranges_1_0_0.default = true;
-  }) [ aho_corasick_0_6_3_features memchr_1_0_1_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ];
-  regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {};
-  regex_syntax_0_4_1_features = f: updateFeatures f (rec {
-    regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true);
-  }) [];
-  reqwest_0_7_1 = { features?(reqwest_0_7_1_features {}) }: reqwest_0_7_1_ {
-    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 hyper_0_11_1 hyper_tls_0_1_2 libflate_0_1_10 log_0_3_8 native_tls_0_1_4 serde_1_0_10 serde_json_1_0_2 serde_urlencoded_0_5_1 tokio_core_0_1_8 tokio_io_0_1_2 tokio_tls_0_1_3 url_1_5_1 ]);
-    features = mkFeatures (features.reqwest_0_7_1 or {});
-  };
-  reqwest_0_7_1_features = f: updateFeatures f (rec {
-    bytes_0_4_4.default = true;
-    futures_0_1_14.default = true;
-    hyper_0_11_1.default = true;
-    hyper_tls_0_1_2.default = true;
-    libflate_0_1_10.default = true;
-    log_0_3_8.default = true;
-    native_tls_0_1_4.default = true;
-    reqwest_0_7_1.default = (f.reqwest_0_7_1.default or true);
-    serde_1_0_10.default = true;
-    serde_json_1_0_2.default = true;
-    serde_urlencoded_0_5_1.default = true;
-    tokio_core_0_1_8.default = true;
-    tokio_io_0_1_2.default = true;
-    tokio_tls_0_1_3.default = true;
-    url_1_5_1.default = true;
-  }) [ bytes_0_4_4_features futures_0_1_14_features hyper_0_11_1_features hyper_tls_0_1_2_features libflate_0_1_10_features log_0_3_8_features native_tls_0_1_4_features serde_1_0_10_features serde_json_1_0_2_features serde_urlencoded_0_5_1_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_tls_0_1_3_features url_1_5_1_features ];
-  rustc_demangle_0_1_4 = { features?(rustc_demangle_0_1_4_features {}) }: rustc_demangle_0_1_4_ {};
-  rustc_demangle_0_1_4_features = f: updateFeatures f (rec {
-    rustc_demangle_0_1_4.default = (f.rustc_demangle_0_1_4.default or true);
-  }) [];
-  rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ {
-    dependencies = mapFeatures features ([ semver_0_1_20 ]);
-  };
-  rustc_version_0_1_7_features = f: updateFeatures f (rec {
-    rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true);
-    semver_0_1_20.default = true;
-  }) [ semver_0_1_20_features ];
-  safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {};
-  safemem_0_2_0_features = f: updateFeatures f (rec {
-    safemem_0_2_0.default = (f.safemem_0_2_0.default or true);
-  }) [];
-  schannel_0_1_7 = { features?(schannel_0_1_7_features {}) }: schannel_0_1_7_ {
-    dependencies = mapFeatures features ([ advapi32_sys_0_2_0 crypt32_sys_0_2_0 kernel32_sys_0_2_2 lazy_static_0_2_8 secur32_sys_0_2_0 winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  schannel_0_1_7_features = f: updateFeatures f (rec {
-    advapi32_sys_0_2_0.default = true;
-    crypt32_sys_0_2_0.default = true;
-    kernel32_sys_0_2_2.default = true;
-    lazy_static_0_2_8.default = true;
-    schannel_0_1_7.default = (f.schannel_0_1_7.default or true);
-    secur32_sys_0_2_0.default = true;
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ advapi32_sys_0_2_0_features crypt32_sys_0_2_0_features kernel32_sys_0_2_2_features lazy_static_0_2_8_features secur32_sys_0_2_0_features winapi_0_2_8_features winapi_build_0_1_1_features ];
-  scoped_tls_0_1_0 = { features?(scoped_tls_0_1_0_features {}) }: scoped_tls_0_1_0_ {};
-  scoped_tls_0_1_0_features = f: updateFeatures f (rec {
-    scoped_tls_0_1_0.default = (f.scoped_tls_0_1_0.default or true);
-  }) [];
-  secur32_sys_0_2_0 = { features?(secur32_sys_0_2_0_features {}) }: secur32_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  secur32_sys_0_2_0_features = f: updateFeatures f (rec {
-    secur32_sys_0_2_0.default = (f.secur32_sys_0_2_0.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  security_framework_0_1_14 = { features?(security_framework_0_1_14_features {}) }: security_framework_0_1_14_ {
-    dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_26 security_framework_sys_0_1_14 ]);
-    features = mkFeatures (features.security_framework_0_1_14 or {});
-  };
-  security_framework_0_1_14_features = f: updateFeatures f (rec {
-    core_foundation_0_2_3.default = true;
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_26.default = true;
-    security_framework_0_1_14.OSX_10_10 =
-      (f.security_framework_0_1_14.OSX_10_10 or false) ||
-      (f.security_framework_0_1_14.OSX_10_11 or false) ||
-      (security_framework_0_1_14.OSX_10_11 or false);
-    security_framework_0_1_14.OSX_10_8 =
-      (f.security_framework_0_1_14.OSX_10_8 or false) ||
-      (f.security_framework_0_1_14.OSX_10_9 or false) ||
-      (security_framework_0_1_14.OSX_10_9 or false);
-    security_framework_0_1_14.OSX_10_9 =
-      (f.security_framework_0_1_14.OSX_10_9 or false) ||
-      (f.security_framework_0_1_14.OSX_10_10 or false) ||
-      (security_framework_0_1_14.OSX_10_10 or false);
-    security_framework_0_1_14.default = (f.security_framework_0_1_14.default or true);
-    security_framework_sys_0_1_14.OSX_10_10 =
-      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
-      (security_framework_0_1_14.OSX_10_10 or false) ||
-      (f.security_framework_0_1_14.OSX_10_10 or false);
-    security_framework_sys_0_1_14.OSX_10_11 =
-      (f.security_framework_sys_0_1_14.OSX_10_11 or false) ||
-      (security_framework_0_1_14.OSX_10_11 or false) ||
-      (f.security_framework_0_1_14.OSX_10_11 or false);
-    security_framework_sys_0_1_14.OSX_10_8 =
-      (f.security_framework_sys_0_1_14.OSX_10_8 or false) ||
-      (security_framework_0_1_14.OSX_10_8 or false) ||
-      (f.security_framework_0_1_14.OSX_10_8 or false);
-    security_framework_sys_0_1_14.OSX_10_9 =
-      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
-      (security_framework_0_1_14.OSX_10_9 or false) ||
-      (f.security_framework_0_1_14.OSX_10_9 or false);
-    security_framework_sys_0_1_14.default = true;
-  }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_26_features security_framework_sys_0_1_14_features ];
-  security_framework_sys_0_1_14 = { features?(security_framework_sys_0_1_14_features {}) }: security_framework_sys_0_1_14_ {
-    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]);
-    features = mkFeatures (features.security_framework_sys_0_1_14 or {});
-  };
-  security_framework_sys_0_1_14_features = f: updateFeatures f (rec {
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_26.default = true;
-    security_framework_sys_0_1_14.OSX_10_10 =
-      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
-      (f.security_framework_sys_0_1_14.OSX_10_11 or false) ||
-      (security_framework_sys_0_1_14.OSX_10_11 or false);
-    security_framework_sys_0_1_14.OSX_10_8 =
-      (f.security_framework_sys_0_1_14.OSX_10_8 or false) ||
-      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
-      (security_framework_sys_0_1_14.OSX_10_9 or false);
-    security_framework_sys_0_1_14.OSX_10_9 =
-      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
-      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
-      (security_framework_sys_0_1_14.OSX_10_10 or false);
-    security_framework_sys_0_1_14.default = (f.security_framework_sys_0_1_14.default or true);
-  }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ];
-  semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {};
-  semver_0_1_20_features = f: updateFeatures f (rec {
-    semver_0_1_20.default = (f.semver_0_1_20.default or true);
-  }) [];
-  semver_0_7_0 = { features?(semver_0_7_0_features {}) }: semver_0_7_0_ {
-    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]
-      ++ (if features.semver_0_7_0.serde or false then [ serde_1_0_10 ] else []));
-    features = mkFeatures (features.semver_0_7_0 or {});
-  };
-  semver_0_7_0_features = f: updateFeatures f (rec {
-    semver_0_7_0.default = (f.semver_0_7_0.default or true);
-    semver_0_7_0.serde =
-      (f.semver_0_7_0.serde or false) ||
-      (f.semver_0_7_0.ci or false) ||
-      (semver_0_7_0.ci or false);
-    semver_parser_0_7_0.default = true;
-    serde_1_0_10.default = true;
-  }) [ semver_parser_0_7_0_features serde_1_0_10_features ];
-  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
-  semver_parser_0_7_0_features = f: updateFeatures f (rec {
-    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
-  }) [];
-  serde_1_0_10 = { features?(serde_1_0_10_features {}) }: serde_1_0_10_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_1_0_10 or {});
-  };
-  serde_1_0_10_features = f: updateFeatures f (rec {
-    serde_1_0_10.default = (f.serde_1_0_10.default or true);
-    serde_1_0_10.serde_derive =
-      (f.serde_1_0_10.serde_derive or false) ||
-      (f.serde_1_0_10.derive or false) ||
-      (serde_1_0_10.derive or false) ||
-      (f.serde_1_0_10.playground or false) ||
-      (serde_1_0_10.playground or false);
-    serde_1_0_10.std =
-      (f.serde_1_0_10.std or false) ||
-      (f.serde_1_0_10.default or false) ||
-      (serde_1_0_10.default or false);
-    serde_1_0_10.unstable =
-      (f.serde_1_0_10.unstable or false) ||
-      (f.serde_1_0_10.alloc or false) ||
-      (serde_1_0_10.alloc or false);
-  }) [];
-  serde_derive_1_0_10 = { features?(serde_derive_1_0_10_features {}) }: serde_derive_1_0_10_ {
-    dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_15_1 syn_0_11_11 ]);
-  };
-  serde_derive_1_0_10_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = true;
-    serde_derive_1_0_10.default = (f.serde_derive_1_0_10.default or true);
-    serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or false);
-    syn_0_11_11.default = true;
-    syn_0_11_11.visit = true;
-  }) [ quote_0_3_15_features serde_derive_internals_0_15_1_features syn_0_11_11_features ];
-  serde_derive_internals_0_15_1 = { features?(serde_derive_internals_0_15_1_features {}) }: serde_derive_internals_0_15_1_ {
-    dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]);
-  };
-  serde_derive_internals_0_15_1_features = f: updateFeatures f (rec {
-    serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or true);
-    syn_0_11_11.default = (f.syn_0_11_11.default or false);
-    syn_0_11_11.parsing = true;
-    synom_0_11_3.default = true;
-  }) [ syn_0_11_11_features synom_0_11_3_features ];
-  serde_json_1_0_2 = { features?(serde_json_1_0_2_features {}) }: serde_json_1_0_2_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_40 serde_1_0_10 ]);
-    features = mkFeatures (features.serde_json_1_0_2 or {});
-  };
-  serde_json_1_0_2_features = f: updateFeatures f (rec {
-    dtoa_0_4_1.default = true;
-    itoa_0_3_1.default = true;
-    num_traits_0_1_40.default = true;
-    serde_1_0_10.default = true;
-    serde_json_1_0_2.default = (f.serde_json_1_0_2.default or true);
-    serde_json_1_0_2.linked-hash-map =
-      (f.serde_json_1_0_2.linked-hash-map or false) ||
-      (f.serde_json_1_0_2.preserve_order or false) ||
-      (serde_json_1_0_2.preserve_order or false);
-  }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_40_features serde_1_0_10_features ];
-  serde_urlencoded_0_5_1 = { features?(serde_urlencoded_0_5_1_features {}) }: serde_urlencoded_0_5_1_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 serde_1_0_10 url_1_5_1 ]);
-  };
-  serde_urlencoded_0_5_1_features = f: updateFeatures f (rec {
-    dtoa_0_4_1.default = true;
-    itoa_0_3_1.default = true;
-    serde_1_0_10.default = true;
-    serde_urlencoded_0_5_1.default = (f.serde_urlencoded_0_5_1.default or true);
-    url_1_5_1.default = true;
-  }) [ dtoa_0_4_1_features itoa_0_3_1_features serde_1_0_10_features url_1_5_1_features ];
-  skeptic_0_5_0 = { features?(skeptic_0_5_0_features {}) }: skeptic_0_5_0_ {
-    dependencies = mapFeatures features ([ pulldown_cmark_0_0_3 tempdir_0_3_5 ]);
-  };
-  skeptic_0_5_0_features = f: updateFeatures f (rec {
-    pulldown_cmark_0_0_3.default = true;
-    skeptic_0_5_0.default = (f.skeptic_0_5_0.default or true);
-    tempdir_0_3_5.default = true;
-  }) [ pulldown_cmark_0_0_3_features tempdir_0_3_5_features ];
-  slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {};
-  slab_0_3_0_features = f: updateFeatures f (rec {
-    slab_0_3_0.default = (f.slab_0_3_0.default or true);
-  }) [];
-  smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {};
-  smallvec_0_2_1_features = f: updateFeatures f (rec {
-    smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true);
-  }) [];
-  strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
-  strsim_0_6_0_features = f: updateFeatures f (rec {
-    strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
-  }) [];
-  syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
-      ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
-      ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
-    features = mkFeatures (features.syn_0_11_11 or {});
-  };
-  syn_0_11_11_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = true;
-    syn_0_11_11.default = (f.syn_0_11_11.default or true);
-    syn_0_11_11.parsing =
-      (f.syn_0_11_11.parsing or false) ||
-      (f.syn_0_11_11.default or false) ||
-      (syn_0_11_11.default or false);
-    syn_0_11_11.printing =
-      (f.syn_0_11_11.printing or false) ||
-      (f.syn_0_11_11.default or false) ||
-      (syn_0_11_11.default or false);
-    syn_0_11_11.quote =
-      (f.syn_0_11_11.quote or false) ||
-      (f.syn_0_11_11.printing or false) ||
-      (syn_0_11_11.printing or false);
-    syn_0_11_11.synom =
-      (f.syn_0_11_11.synom or false) ||
-      (f.syn_0_11_11.parsing or false) ||
-      (syn_0_11_11.parsing or false);
-    syn_0_11_11.unicode-xid =
-      (f.syn_0_11_11.unicode-xid or false) ||
-      (f.syn_0_11_11.parsing or false) ||
-      (syn_0_11_11.parsing or false);
-    synom_0_11_3.default = true;
-    unicode_xid_0_0_4.default = true;
-  }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
-  synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
-    dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
-  };
-  synom_0_11_3_features = f: updateFeatures f (rec {
-    synom_0_11_3.default = (f.synom_0_11_3.default or true);
-    unicode_xid_0_0_4.default = true;
-  }) [ unicode_xid_0_0_4_features ];
-  take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {};
-  take_0_1_0_features = f: updateFeatures f (rec {
-    take_0_1_0.default = (f.take_0_1_0.default or true);
-  }) [];
-  tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ {
-    dependencies = mapFeatures features ([ rand_0_3_15 ]);
-  };
-  tempdir_0_3_5_features = f: updateFeatures f (rec {
-    rand_0_3_15.default = true;
-    tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true);
-  }) [ rand_0_3_15_features ];
-  thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_8 unreachable_1_0_0 ]);
-  };
-  thread_local_0_3_4_features = f: updateFeatures f (rec {
-    lazy_static_0_2_8.default = true;
-    thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true);
-    unreachable_1_0_0.default = true;
-  }) [ lazy_static_0_2_8_features unreachable_1_0_0_features ];
-  time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ {
-    dependencies = mapFeatures features ([ libc_0_2_26 ])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_26 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
-  };
-  time_0_1_38_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    libc_0_2_26.default = true;
-    redox_syscall_0_1_26.default = true;
-    time_0_1_38.default = (f.time_0_1_38.default or true);
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_26_features redox_syscall_0_1_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-  tokio_core_0_1_8 = { features?(tokio_core_0_1_8_features {}) }: tokio_core_0_1_8_ {
-    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 iovec_0_1_0 log_0_3_8 mio_0_6_9 scoped_tls_0_1_0 slab_0_3_0 tokio_io_0_1_2 ]);
-  };
-  tokio_core_0_1_8_features = f: updateFeatures f (rec {
-    bytes_0_4_4.default = true;
-    futures_0_1_14.default = true;
-    iovec_0_1_0.default = true;
-    log_0_3_8.default = true;
-    mio_0_6_9.default = true;
-    scoped_tls_0_1_0.default = true;
-    slab_0_3_0.default = true;
-    tokio_core_0_1_8.default = (f.tokio_core_0_1_8.default or true);
-    tokio_io_0_1_2.default = true;
-  }) [ bytes_0_4_4_features futures_0_1_14_features iovec_0_1_0_features log_0_3_8_features mio_0_6_9_features scoped_tls_0_1_0_features slab_0_3_0_features tokio_io_0_1_2_features ];
-  tokio_io_0_1_2 = { features?(tokio_io_0_1_2_features {}) }: tokio_io_0_1_2_ {
-    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 log_0_3_8 ]);
-  };
-  tokio_io_0_1_2_features = f: updateFeatures f (rec {
-    bytes_0_4_4.default = true;
-    futures_0_1_14.default = true;
-    log_0_3_8.default = true;
-    tokio_io_0_1_2.default = (f.tokio_io_0_1_2.default or true);
-  }) [ bytes_0_4_4_features futures_0_1_14_features log_0_3_8_features ];
-  tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ {
-    dependencies = mapFeatures features ([ futures_0_1_14 log_0_3_8 net2_0_2_30 rand_0_3_15 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 ]);
-  };
-  tokio_proto_0_1_1_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = true;
-    log_0_3_8.default = true;
-    net2_0_2_30.default = true;
-    rand_0_3_15.default = true;
-    slab_0_3_0.default = true;
-    smallvec_0_2_1.default = true;
-    take_0_1_0.default = true;
-    tokio_core_0_1_8.default = true;
-    tokio_io_0_1_2.default = true;
-    tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true);
-    tokio_service_0_1_0.default = true;
-  }) [ futures_0_1_14_features log_0_3_8_features net2_0_2_30_features rand_0_3_15_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features ];
-  tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ {
-    dependencies = mapFeatures features ([ futures_0_1_14 ]);
-  };
-  tokio_service_0_1_0_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = true;
-    tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true);
-  }) [ futures_0_1_14_features ];
-  tokio_tls_0_1_3 = { features?(tokio_tls_0_1_3_features {}) }: tokio_tls_0_1_3_ {
-    dependencies = mapFeatures features ([ futures_0_1_14 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 ])
-      ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else [])
-      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([]) else []);
-  };
-  tokio_tls_0_1_3_features = f: updateFeatures f (rec {
-    futures_0_1_14.default = true;
-    native_tls_0_1_4.default = true;
-    tokio_core_0_1_8.default = true;
-    tokio_io_0_1_2.default = true;
-    tokio_tls_0_1_3.default = (f.tokio_tls_0_1_3.default or true);
-  }) [ futures_0_1_14_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features ];
-  toml_0_4_2 = { features?(toml_0_4_2_features {}) }: toml_0_4_2_ {
-    dependencies = mapFeatures features ([ serde_1_0_10 ]);
-  };
-  toml_0_4_2_features = f: updateFeatures f (rec {
-    serde_1_0_10.default = true;
-    toml_0_4_2.default = (f.toml_0_4_2.default or true);
-  }) [ serde_1_0_10_features ];
-  unicase_2_0_0 = { features?(unicase_2_0_0_features {}) }: unicase_2_0_0_ {
-    buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]);
-    features = mkFeatures (features.unicase_2_0_0 or {});
-  };
-  unicase_2_0_0_features = f: updateFeatures f (rec {
-    rustc_version_0_1_7.default = true;
-    unicase_2_0_0.default = (f.unicase_2_0_0.default or true);
-  }) [ rustc_version_0_1_7_features ];
-  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
-    dependencies = mapFeatures features ([ matches_0_1_6 ]);
-    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
-  };
-  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
-    matches_0_1_6.default = true;
-    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
-    unicode_bidi_0_3_4.flame =
-      (f.unicode_bidi_0_3_4.flame or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.flamer =
-      (f.unicode_bidi_0_3_4.flamer or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.serde =
-      (f.unicode_bidi_0_3_4.serde or false) ||
-      (f.unicode_bidi_0_3_4.with_serde or false) ||
-      (unicode_bidi_0_3_4.with_serde or false);
-  }) [ matches_0_1_6_features ];
-  unicode_normalization_0_1_5 = { features?(unicode_normalization_0_1_5_features {}) }: unicode_normalization_0_1_5_ {};
-  unicode_normalization_0_1_5_features = f: updateFeatures f (rec {
-    unicode_normalization_0_1_5.default = (f.unicode_normalization_0_1_5.default or true);
-  }) [];
-  unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
-    features = mkFeatures (features.unicode_width_0_1_4 or {});
-  };
-  unicode_width_0_1_4_features = f: updateFeatures f (rec {
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
-  }) [];
-  unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
-    features = mkFeatures (features.unicode_xid_0_0_4 or {});
-  };
-  unicode_xid_0_0_4_features = f: updateFeatures f (rec {
-    unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
-  }) [];
-  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
-    dependencies = mapFeatures features ([ void_1_0_2 ]);
-  };
-  unreachable_1_0_0_features = f: updateFeatures f (rec {
-    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
-    void_1_0_2.default = (f.void_1_0_2.default or false);
-  }) [ void_1_0_2_features ];
-  url_1_5_1 = { features?(url_1_5_1_features {}) }: url_1_5_1_ {
-    dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]);
-    features = mkFeatures (features.url_1_5_1 or {});
-  };
-  url_1_5_1_features = f: updateFeatures f (rec {
-    idna_0_1_4.default = true;
-    matches_0_1_6.default = true;
-    percent_encoding_1_0_0.default = true;
-    url_1_5_1.default = (f.url_1_5_1.default or true);
-    url_1_5_1.encoding =
-      (f.url_1_5_1.encoding or false) ||
-      (f.url_1_5_1.query_encoding or false) ||
-      (url_1_5_1.query_encoding or false);
-    url_1_5_1.heapsize =
-      (f.url_1_5_1.heapsize or false) ||
-      (f.url_1_5_1.heap_size or false) ||
-      (url_1_5_1.heap_size or false);
-  }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_0_features ];
-  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
-  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
-    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
-  }) [];
-  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
-    features = mkFeatures (features.void_1_0_2 or {});
-  };
-  void_1_0_2_features = f: updateFeatures f (rec {
-    void_1_0_2.default = (f.void_1_0_2.default or true);
-    void_1_0_2.std =
-      (f.void_1_0_2.std or false) ||
-      (f.void_1_0_2.default or false) ||
-      (void_1_0_2.default or false);
-  }) [];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f (rec {
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f (rec {
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-  ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  ws2_32_sys_0_2_1_features = f: updateFeatures f (rec {
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-    ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true);
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-}
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 37f543b66b64..19c08541ea60 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }:
+{ stdenv, lib, buildPlatform, fetchgit, fetchFromGitHub, darwin
+, buildRustCrate, defaultCrateOverrides }:
 
-((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override {
+((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_edit {}).override {
   crateOverrides = defaultCrateOverrides // {
     cargo-edit = attrs: rec {
       name = "cargo-edit-${version}";
-      version = "0.2.0";
+      version = "0.3.0";
 
       src = fetchFromGitHub {
         owner = "killercup";
         repo = "cargo-edit";
         rev = "v${version}";
-        sha256 = "1jxppbb7s50pwg24qxf79fqvm1clwm2zdnv0xlkay7y05nd5bc0c";
+        sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0";
       };
 
       propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

From c9fcabcf4b268a6e0d49c16b0045c193dd4f1477 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 14:34:58 +0000
Subject: [PATCH 0338/3253] nix: fix a tiny option bug

---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index edb78d1b63a8..74e3963b733f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -74,7 +74,7 @@ let
           stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system
       ) ''--with-system=${stdenv.hostPlatform.nix.system}''
          # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50
-      ++ lib.optional (!libseccomp.meta.available) "--disable-seccomp-sandboxing";
+      ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing";
 
     makeFlags = "profiledir=$(out)/etc/profile.d";
 

From bf0cec40ca6bcf88c92c8549ca9d4cffa8374ae5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 5 Sep 2018 16:35:12 +0200
Subject: [PATCH 0339/3253] qutebrowser: 1.4.1 -> 1.4.2 (#46096)

---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 47a273e99f98..5ffb8a076bc8 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,12 +28,12 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.4.1";
+  version = "1.4.2";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0n2z92vb91gpfchdm9wsm712r9grbvxwdp4npl5c1nbq247dxwm3";
+    sha256 = "1pnj47mllg1x34qakxs7s59x8mj262nfhdxgihsb2h2ywjq4fpgx";
   };
 
   # Needs tox

From 4e735835e01a85ba29a6e1a8b5161e4a495e42da Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 14:35:15 +0000
Subject: [PATCH 0340/3253] nix: make AWS support optional

---
 pkgs/tools/package-management/nix/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 74e3963b733f..7b4517624164 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
-, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
+, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
 , busybox-sandbox-shell
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , withLibseccomp ? libseccomp.meta.available, libseccomp
+, withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
 }:
 
 let
@@ -31,7 +32,7 @@ let
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals is20 [ brotli boost ]
       ++ lib.optional withLibseccomp libseccomp
-      ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
+      ++ lib.optional (withAWS && is20)
           ((aws-sdk-cpp.override {
             apis = ["s3" "transfer"];
             customMemoryManagement = false;

From ba52f4cb76cbc8cc877077bd19c1ab3811c244e6 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 5 Sep 2018 16:48:14 +0200
Subject: [PATCH 0341/3253] statsd: mark broken, disable nixos test (#46097)

It's broken with node v8 and the upstream project is dead
(last commit Nov. 2016), see #45946 and
https://github.com/etsy/statsd/issues/646
---
 nixos/release.nix                             | 2 +-
 pkgs/development/node-packages/default-v8.nix | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 17f51d977c98..0fd8d694641f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -399,7 +399,7 @@ in rec {
   tests.slurm = callTest tests/slurm.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.snapper = callTest tests/snapper.nix {};
-  tests.statsd = callTest tests/statsd.nix {};
+  #tests.statsd = callTest tests/statsd.nix {}; # statsd is broken: #45946
   tests.strongswan-swanctl = callTest tests/strongswan-swanctl.nix {};
   tests.sudo = callTest tests/sudo.nix {};
   tests.systemd = callTest tests/systemd.nix {};
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 3b7182e27b37..e67a91b90a14 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -77,6 +77,12 @@ nodePackages // {
     '';
   };
 
+  statsd = nodePackages.statsd.override {
+    # broken with node v8, dead upstream,
+    # see #45946 and https://github.com/etsy/statsd/issues/646
+    meta.broken = true;
+  };
+
   webdrvr = nodePackages.webdrvr.override {
     buildInputs = [ pkgs.phantomjs ];
 

From 7fac51740a151a7b78c5fbe225b7ef49933825e5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Wed, 5 Sep 2018 16:55:35 +0200
Subject: [PATCH 0342/3253] libgsf: 1.14.42 -> 1.14.44 (#46054)

---
 pkgs/development/libraries/libgsf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 20a08885142a..bcd37396bf7f 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -2,11 +2,11 @@
 , python, perl, gdk_pixbuf, libiconv, libintl }:
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.42";
+  name = "libgsf-1.14.44";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";
+    sha256 = "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];

From 11e2009821decf55aa20589447076aab5f998464 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 6 Sep 2018 00:11:02 +0900
Subject: [PATCH 0343/3253] haskellPackages.tensorflow-mnist-input-data: fetch

Prefetch data so that the package doesn't try to connect to the internet.
---
 .../configuration-tensorflow.nix              | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index dfc93686405c..d1ca474ba4f4 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -62,6 +62,30 @@ in
     { mkDerivation, base, bytestring, Cabal, cryptonite, directory
     , filepath, HTTP, network-uri, stdenv
     }:
+
+    let
+      urlPrefix = "http://yann.lecun.com/exdb/mnist/";
+
+      # File names relative to 'urlPrefix' and their sha256.
+      fileInfos = [
+        [ "train-images-idx3-ubyte.gz"
+         "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609"
+        ]
+
+        [ "train-labels-idx1-ubyte.gz"
+         "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c"
+        ]
+
+        [ "t10k-images-idx3-ubyte.gz"
+         "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6"
+        ]
+
+        [ "t10k-labels-idx1-ubyte.gz"
+         "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6"
+        ]
+      ];
+      downloads = map (x: pkgs.fetchurl { url = urlPrefix + builtins.head x; sha256= builtins.tail x;}) fileInfos;
+    in
     mkDerivation {
       pname = "tensorflow-mnist-input-data";
       version = "0.1.0.0";
@@ -71,6 +95,9 @@ in
         base bytestring Cabal cryptonite directory filepath HTTP
         network-uri
       ];
+      preConfigure = pkgs.lib.strings.concatStringsSep "\n" (
+          map (x: "cp ${x} data/$(stripHash ${x})") downloads
+        );
       libraryHaskellDepends = [ base ];
       homepage = "https://github.com/tensorflow/haskell#readme";
       description = "Downloader of input data for training MNIST";

From 6abd75067ab70a33bb49f2ea6f141967af79a61d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 15:17:01 +0000
Subject: [PATCH 0344/3253] ffmpeg: add support for libssh and speex (#46078)

---
 pkgs/development/libraries/ffmpeg/generic.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7d72de2a2ded..89e06f8b8d92 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus
+, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
+, x264, x265, xvidcore, zlib, libopus, speex
 , openglSupport ? false, libGLU_combined ? null
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -128,6 +128,7 @@ stdenv.mkDerivation rec {
       "--enable-libmp3lame"
       (ifMinVer "1.2" "--enable-iconv")
       "--enable-libtheora"
+      "--enable-libssh"
       (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
       "--enable-vdpau"
       "--enable-libvorbis"
@@ -141,6 +142,7 @@ stdenv.mkDerivation rec {
       "--enable-libxvid"
       "--enable-zlib"
       (ifMinVer "2.8" "--enable-libopus")
+      "--enable-libspeex"
       (ifMinVer "2.8" "--enable-libx265")
     # Developer flags
       (enableFeature debugDeveloper "debug")
@@ -157,8 +159,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
 
   buildInputs = [
-    bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
-    libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
+    bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
+    libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
   ] ++ optional openglSupport libGLU_combined
     ++ optional vpxSupport libvpx
     ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM

From a9a380b259df806bb351a2c4a013ed7858813988 Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Thu, 6 Sep 2018 00:38:23 +0800
Subject: [PATCH 0345/3253] pythonPackages.tflearn: 0.2.1 -> 0.3.2 (#46102)

---
 .../python-modules/tflearn/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +------------
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/tflearn/default.nix

diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix
new file mode 100644
index 000000000000..341c1da56801
--- /dev/null
+++ b/pkgs/development/python-modules/tflearn/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, fetchurl, pytest, scipy, h5py
+, pillow, tensorflow }:
+
+buildPythonPackage rec {
+  pname = "tflearn";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "034lvbslcivyj64r4w6xmr90ckmyxmrnkka9kal50x4175h02n1z";
+  };
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ scipy h5py pillow tensorflow ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Deep learning library featuring a higher-level API for TensorFlow";
+    homepage    = "https://github.com/tflearn/tflearn";
+    license     = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ef8626d72ed..9b98a1af7891 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16809,22 +16809,7 @@ EOF
     cudaSupport = true;
   };
 
-  tflearn = buildPythonPackage rec {
-    name = "tflearn-0.2.1";
-
-    meta = {
-      description = "Deep learning library featuring a higher-level API for TensorFlow";
-      homepage    = "https://github.com/tflearn/tflearn";
-      license     = licenses.mit;
-    };
-
-    propagatedBuildInputs = with self; [ scipy h5py pillow tensorflow ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tflearn/${name}.tar.gz";
-      sha256 = "1n884c4j35409id2bncyj5fvmmfpdqj3pk6wrv0s1znnvs0lkii0";
-    };
-  };
+  tflearn = callPackage ../development/python-modules/tflearn { };
 
   simpleai = buildPythonPackage rec {
      version = "0.7.11";

From 2ad99bcc82050fc9cdcfca7b582386394c30b316 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 00:28:02 +0000
Subject: [PATCH 0346/3253] texinfo: fix perl issues by applying patches from
 upstream

---
 .../development/tools/misc/texinfo/common.nix |  3 ++
 .../development/tools/misc/texinfo/perl.patch | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/tools/misc/texinfo/perl.patch

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index 101298cd3052..c6877ed4d1a1 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  # TODO: fix on mass rebuild
+  ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch;
+
   # We need a native compiler to build perl XS extensions
   # when cross-compiling.
   depsBuildBuild = [ buildPackages.stdenv.cc perl ];
diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/pkgs/development/tools/misc/texinfo/perl.patch
new file mode 100644
index 000000000000..e651b37371c7
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/perl.patch
@@ -0,0 +1,43 @@
+Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/
+Author: gavin
+--- trunk/tp/Texinfo/Parser.pm  2018-06-04 19:51:36 UTC (rev 8006)
++++ trunk/tp/Texinfo/Parser.pm  2018-07-13 15:31:28 UTC (rev 8007)
+@@ -5531,11 +5531,11 @@
+     }
+   } elsif ($command eq 'clickstyle') {
+     # REMACRO
+-    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+       $args = ['@'.$1];
+       $self->{'clickstyle'} = $1;
+       $remaining = $line;
+-      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+       $has_comment = 1 if (defined($4));
+     } else {
+       $self->line_error (sprintf($self->__(
+--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2018-07-13 15:31:28 UTC (rev 8007)
++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c       2018-07-13 15:39:29 UTC (rev 8008)
+@@ -248,6 +248,11 @@
+ 
+   dTHX;
+ 
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++  /* needed due to thread-safe locale handling in newer perls */
++  switch_to_global_locale();
++#endif
++
+   if (setlocale (LC_CTYPE, "en_US.UTF-8")
+       || setlocale (LC_CTYPE, "en_US.utf8"))
+     goto success;
+@@ -320,6 +325,10 @@
+     {
+ success: ;
+       free (utf8_locale);
++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
++      /* needed due to thread-safe locale handling in newer perls */
++      sync_locale();
++#endif
+       /*
+       fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
+       fprintf (stderr, "character encoding is: %s\n",

From 0b89ece569b44635404c019fe090711549853371 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 21:53:19 +0000
Subject: [PATCH 0347/3253] Revert "texinfoInteractive: fixup build by using
 older perl"

This reverts commit 7a22083e1271869294a074cbe7a971f2d8abb4f4.
---
 pkgs/top-level/all-packages.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f563f0dfe243..67385abb505b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8743,13 +8743,9 @@ with pkgs;
   texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
   texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { };
   texinfo = texinfo6;
-  texinfoInteractive = appendToName "interactive" (texinfo.override {
-    interactive = true;
-    # doCheck = true -> some xlocale.h problem with perl 5.28.0
-    # (it's mistakenly trying to include the non-existent header)
-    perl = perl526;
-    buildPackages = buildPackages // { perl = buildPackages.perl526; };
-  });
+  texinfoInteractive = appendToName "interactive" (
+    texinfo.override { interactive = true; }
+  );
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 

From eadb7b1589ddc11dadf98daab3fd82f2074fa12c Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Wed, 5 Sep 2018 19:06:18 +0200
Subject: [PATCH 0348/3253] qutebrowser: patch scripts (#37316)

---
 .../networking/browsers/qutebrowser/default.nix   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5ffb8a076bc8..a3b6c0364169 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -71,15 +71,26 @@ in python3Packages.buildPythonApplication rec {
     install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
     install -Dm644 misc/qutebrowser.desktop \
         "$out/share/applications/qutebrowser.desktop"
+
+    # Install icons
     for i in 16 24 32 48 64 128 256 512; do
         install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \
             "$out/share/icons/hicolor/''${i}x''${i}/apps/qutebrowser.png"
     done
     install -Dm644 icons/qutebrowser.svg \
         "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
+
+    # Install scripts
+    sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh
+    install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh
     install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
-    install -Dm755 -t "$out/share/qutebrowser/scripts/" \
-      scripts/{importer.py,dictcli.py,keytester.py,open_url_in_instance.sh,utils.py}
+
+    # Install and patch python scripts
+    buildPythonPath "$out $propagatedBuildInputs"
+    for i in importer dictcli keytester utils; do
+      install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py
+      patchPythonScript "$out/share/qutebrowser/scripts/$i.py"
+    done
   '';
 
   postFixup = lib.optionalString (! withWebEngineDefault) ''

From f0a0ccabcc51ccee0884c6a1656c2de07750feef Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Sep 2018 17:12:13 +0000
Subject: [PATCH 0349/3253] ocamlPackages.seq: init at 0.1

---
 .../development/ocaml-modules/seq/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/seq/default.nix

diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix
new file mode 100644
index 000000000000..f4918b420c40
--- /dev/null
+++ b/pkgs/development/ocaml-modules/seq/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
+
+stdenv.mkDerivation rec {
+  version = "0.1";
+  name = "ocaml${ocaml.version}-seq-${version}";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "seq";
+    rev = version;
+    sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Compatibility package for OCaml’s standard iterator type starting from 4.07";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7b6af70ebcf9..f5e5cfb3972b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -564,6 +564,8 @@ let
 
     result = callPackage ../development/ocaml-modules/ocaml-result { };
 
+    seq = callPackage ../development/ocaml-modules/seq { };
+
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
     spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };

From 48708a9c43edfef3e8ef479df641bf5be0216f46 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Sep 2018 17:14:47 +0000
Subject: [PATCH 0350/3253] ocamlPackages.re: 1.7.3 -> 1.8.0

---
 pkgs/development/ocaml-modules/re/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index c6f1b6d17581..4994ceca7fb3 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "re is not available for OCaml ${ocaml.version}"
@@ -6,14 +6,15 @@ else
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-re-${version}";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchzip {
     url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz";
-    sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr";
+    sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i";
   };
 
   buildInputs = [ ocaml findlib jbuilder ounit ];
+  propagatedBuildInputs = [ seq ];
 
   doCheck = true;
   checkPhase = "jbuilder runtest";

From 7e740131902cb455e20383431cf16b3ea4ab7c79 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Wed, 5 Sep 2018 11:31:58 -0700
Subject: [PATCH 0351/3253] gocode: c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1 ->
 00e7f5ac290aeb20a3d8d31e737ae560a191a1d5 (#46107)

Also, switch to the now-maintained fork of gocode available at github.com/mdempsky/gocode
---
 pkgs/development/tools/gocode/default.nix | 41 +++++++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index a20e1658988c..64921ec6e10e 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -1,20 +1,47 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gocode-${version}";
-  version = "20170903-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+  version = "20180727-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "00e7f5ac290aeb20a3d8d31e737ae560a191a1d5";
 
-  goPackagePath = "github.com/nsf/gocode";
+  goPackagePath = "github.com/mdempsky/gocode";
 
   # we must allow references to the original `go` package,
   # because `gocode` needs to dig into $GOROOT to provide completions for the
   # standard packages.
   allowGoReference = true;
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "mdempsky";
+    repo = "gocode";
     inherit rev;
-    url = "https://github.com/nsf/gocode";
-    sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
+    sha256 = "0vrwjq4r90za47hm88yx5h2mvkv7y4yaj2xbx3skg62wq2drsq31";
+  };
+
+  preBuild = ''
+    # getting an error building the testdata because they contain invalid files
+    # on purpose as part of the testing.
+    rm -r go/src/$goPackagePath/internal/suggest/testdata
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An autocompletion daemon for the Go programming language";
+    longDescription = ''
+      Gocode is a helper tool which is intended to be integrated with your
+      source code editor, like vim, neovim and emacs. It provides several
+      advanced capabilities, which currently includes:
+
+        - Context-sensitive autocompletion
+
+      It is called daemon, because it uses client/server architecture for
+      caching purposes. In particular, it makes autocompletions very fast.
+      Typical autocompletion time with warm cache is 30ms, which is barely
+      noticeable.
+    '';
+    homepage = https://github.com/mdempsky/gocode;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ kalbasit ];
   };
 }

From 318c9296faff4ed6eec0ec508c696c4dc9a6598c Mon Sep 17 00:00:00 2001
From: Renato Garcia <fgarcia.renato@gmail.com>
Date: Wed, 5 Sep 2018 16:46:17 -0300
Subject: [PATCH 0352/3253] snakemake: add maintainers (#46117)

---
 maintainers/maintainer-list.nix                      | 5 +++++
 pkgs/applications/science/misc/snakemake/default.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6356c0c7cefe..bd266dda300c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3396,6 +3396,11 @@
     github = "relrod";
     name = "Ricky Elrod";
   };
+  renatoGarcia = {
+    email = "fgarcia.renato@gmail.com";
+    github = "renatoGarcia";
+    name = "Renato Garcia";
+  };
   renzo = {
     email = "renzocarbonara@gmail.com";
     github = "k0001";
diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 6b0570814f2b..6f04d436877f 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -37,5 +37,6 @@ python.buildPythonPackage rec {
       workflows are essentially Python scripts extended by declarative code to define
       rules. Rules describe how to create output files from input files.
     '';
+    maintainers = with maintainers; [ helkafen renatoGarcia ];
   };
 }

From 085cc293237629b7c2ac8d2275cdca312d682046 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Wed, 5 Sep 2018 22:26:25 +0200
Subject: [PATCH 0353/3253] pythonPackages.pymetar: fix license

---
 pkgs/development/python-modules/pymetar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index a918528bdf87..4b7388d49dbd 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A command-line tool to show the weather report by a given station ID";
     homepage = http://www.schwarzvogel.de/software/pymetar.html;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ erosennin ];
   };
 }

From ee841c57bf29959bd604c0668c30f3ce526aa6bd Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Wed, 5 Sep 2018 22:32:08 +0200
Subject: [PATCH 0354/3253] pythonPackages.pymetar: 0.21 -> 1.0

---
 pkgs/development/python-modules/pymetar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index 4b7388d49dbd..d41eec818183 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pymetar";
-  version = "0.21";
+  version = "1.0";
 
-  disabled = isPy3k;
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k";
+    sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
   };
 
   meta = with stdenv.lib; {

From f70dc57ad3b63211cdc348bb3346139519aefced Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 5 Sep 2018 22:36:17 +0200
Subject: [PATCH 0355/3253] nixos/tests/opensmtpd: prevent non-deterministic
 failure (#46071)

A sporadic failure occured on Hydra because a request was sent
to smtpd after the systemd unit was started, but before the daemon
was actually listening. Fix by checking for open ports first.
---
 nixos/tests/opensmtpd.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 5079779f35b4..4c0cbca21010 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -102,11 +102,17 @@ import ./make-test.nix {
   testScript = ''
     startAll;
 
-    $client->waitForUnit("network.target");
+    $client->waitForUnit("network-online.target");
     $smtp1->waitForUnit('opensmtpd');
     $smtp2->waitForUnit('opensmtpd');
     $smtp2->waitForUnit('dovecot2');
 
+    # To prevent sporadic failures during daemon startup, make sure
+    # services are listening on their ports before sending requests
+    $smtp1->waitForOpenPort(25);
+    $smtp2->waitForOpenPort(25);
+    $smtp2->waitForOpenPort(143);
+
     $client->succeed('send-a-test-mail');
     $smtp1->waitUntilFails('smtpctl show queue | egrep .');
     $smtp2->waitUntilFails('smtpctl show queue | egrep .');

From df05618f2a075c2c727bdcb6d44741d5d5c2ef16 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 5 Sep 2018 22:48:47 +0200
Subject: [PATCH 0356/3253] nixos/activation: fix activation script for
 non-POSIX shells (#46042)

This fixes an issue with shells like fish that are not fully POSIX
compliant. The syntax `ENV=val cmd' doesn't work properly in there.

This issue has been addressed in #45932 and #45945, however it has been
recommended to use a single shell (`stdenv.shell' which is either
`bash' or `sh') to significantly reduce the maintenance overload in the
future.

See https://github.com/NixOS/nixpkgs/issues/45897#issuecomment-417923464

Fixes #45897

/cc @FRidh @xaverdh @etu
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 nixos/modules/system/activation/top-level.nix              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index b3fe6caf62dc..c3e469e4b8a1 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -419,7 +419,7 @@ while (my $f = <$listActiveUsers>) {
     my ($uid, $name) = ($+{uid}, $+{user});
     print STDERR "reloading user units for $name...\n";
 
-    system("su", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+    system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
 }
 
 close $listActiveUsers;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index fff88e2c2bf3..9797ef641e4f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -115,6 +115,7 @@ let
 
       inherit (pkgs) utillinux coreutils;
       systemd = config.systemd.package;
+      inherit (pkgs.stdenv) shell;
 
       inherit children;
       kernelParams = config.boot.kernelParams;

From e5d9c16f2a046ccc063683e57e1fca5f931c0b91 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 5 Sep 2018 23:01:15 +0200
Subject: [PATCH 0357/3253] gnu-smalltalk: fix build

disable format hardening
---
 pkgs/development/compilers/gnu-smalltalk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 21c0a5ede91b..39d1652fc700 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
 
+  hardeningDisable = [ "format" ];
+
   installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
 
   # For some reason the tests fail if executated with nix-build, but pass if

From 7de5708e9ed312b331bbf0953f4fd30ea8a94e22 Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Wed, 5 Sep 2018 22:56:18 +0200
Subject: [PATCH 0358/3253] pythonPackages.pymetar: enable tests

---
 pkgs/development/python-modules/pymetar/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index d41eec818183..339ddcbc7910 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
+{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pymetar";
@@ -11,6 +11,16 @@ buildPythonPackage rec {
     sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
   };
 
+  checkPhase = ''
+    cd testing/smoketest
+    tar xzf reports.tgz
+    mkdir logs
+    patchShebangs runtests.sh
+    substituteInPlace runtests.sh --replace "break" "exit 1"  # fail properly
+    export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}"
+    ./runtests.sh
+  '';
+
   meta = with stdenv.lib; {
     description = "A command-line tool to show the weather report by a given station ID";
     homepage = http://www.schwarzvogel.de/software/pymetar.html;

From c90f96ad32ff948cfe13cf55db1c77ef338aa23d Mon Sep 17 00:00:00 2001
From: Utku Demir <me@utdemir.com>
Date: Thu, 6 Sep 2018 09:12:12 +1200
Subject: [PATCH 0359/3253] kakoune: 2018.08.05 -> 2018.09.04

---
 pkgs/applications/editors/kakoune/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index ad408081e1fd..e50625fa0e89 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-unstable-${version}";
-  version = "2018-08-05";
+  version = "2018.09.04";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6";
-    sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3";
+    rev = "v${version}";
+    sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];

From 12c0dd5432e8d43c05e4ed81239ab2ea358c2943 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <gillmanash@gmail.com>
Date: Wed, 5 Sep 2018 12:37:28 +0100
Subject: [PATCH 0360/3253] python.pkgs.nipype: Futures is python 2 only. Also
 fix building.

---
 pkgs/development/python-modules/nipype/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 8b0ee06b3495..a092123da826 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -18,6 +18,8 @@
 , psutil
 , pydot
 , pytest
+, pytest_xdist
+, pytest-forked
 , scipy
 , simplejson
 , traits
@@ -47,8 +49,6 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace nipype/interfaces/base/tests/test_core.py \
       --replace "/usr/bin/env bash" "${bash}/bin/bash"
-
-    rm pytest.ini
   '';
 
   propagatedBuildInputs = [
@@ -56,7 +56,6 @@ buildPythonPackage rec {
     dateutil
     funcsigs
     future
-    futures
     networkx
     nibabel
     numpy
@@ -70,9 +69,10 @@ buildPythonPackage rec {
     xvfbwrapper
   ] ++ stdenv.lib.optional (!isPy3k) [
     configparser
+    futures
   ];
 
-  checkInputs = [ pytest mock pytestcov codecov which glibcLocales ];
+  checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ];
 
   checkPhase = ''
     LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype

From 041043420f38842f4fb83bb5c3589ac374a80580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 5 Sep 2018 23:28:31 +0200
Subject: [PATCH 0361/3253] python.pkgs.py3status: fix build

---
 pkgs/development/python-modules/py3status/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 8a7dcc63f572..fd42faaad213 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , requests
 , pytz
 , tzlocal
@@ -19,10 +20,18 @@
 buildPythonPackage rec {
   pname = "py3status";
   version = "3.12";
+  
   src = fetchPypi {
     inherit pname version;
     sha256 = "c9ef49f72c2d83976d2841ab7e70faee3c77f4d7dbb2d3390ef0f0509473ea9a";
   };
+
+  # ImportError: cannot import name '_to_ascii'
+  patches = fetchpatch {
+    url = "${meta.homepage}/commit/8a48e01cb68b514b532f56037e4f5a6c19662de5.patch";
+    sha256 = "0v1yja5lvdjk6vh13lvh07n7aw5hjcy7v9lrs2dfb0y0cjw4kx9n";
+  };
+
   doCheck = false;
   propagatedBuildInputs = [ pytz requests tzlocal ];
   buildInputs = [ file ];

From f6ffd9c8ba35543712ec39029917c78e9480f5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 5 Sep 2018 22:54:18 +0100
Subject: [PATCH 0362/3253] iana-etc: 20180711 -> 20180905

---
 pkgs/data/misc/iana-etc/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index e6c33fc260e8..af8270e6eefa 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchzip }:
 
 let
-  version = "20180711";
+  version = "20180905";
 in fetchzip {
   name = "iana-etc-${version}";
-
   url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
-  sha256 = "0vbgk3paix2v4rlh90a8yh1l39s322awng06izqj44zcg704fjbj";
+  sha256 = "1vl3by24xddl267cjq9bcwb7yvfd7gqalwgd5sgx8i7kz9bk40q2";
 
   postFetch = ''
     tar -xzvf $downloadedFile --strip-components=1

From f051f66c9abe9bdc96bf754021625035ecb17238 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 5 Sep 2018 23:04:26 +0200
Subject: [PATCH 0363/3253] phe: init at 1.4.0

---
 .../python-modules/phe/default.nix            | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/phe/default.nix

diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix
new file mode 100644
index 000000000000..b016a9bd92c3
--- /dev/null
+++ b/pkgs/development/python-modules/phe/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } :
+
+let
+  pname = "phe";
+  version = "1.4.0";
+in
+
+buildPythonPackage {
+  inherit pname version;
+
+  # https://github.com/n1analytics/python-paillier/issues/51
+  disabled = isPyPy || ! isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wzlk7d24kp0f5kpm0kvvc88mm42144f5cg9pcpb1dsfha75qy5m";
+  };
+
+  buildInputs = [ click gmpy2 numpy ];
+
+  # 29/233 tests fail
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A library for Partially Homomorphic Encryption in Python";
+    homepage = https://github.com/n1analytics/python-paillier;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ba335146ce3..d962649f71b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3732,6 +3732,8 @@ in {
     };
   };
 
+  phe = callPackage ../development/python-modules/phe { };
+
   phpserialize = callPackage ../development/python-modules/phpserialize { };
 
   plaid-python = callPackage ../development/python-modules/plaid-python { };

From 7339a4004c8080a00ab64100a1c45c1ac1d40432 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 5 Sep 2018 23:33:42 +0200
Subject: [PATCH 0364/3253] gmpy: move outside python-packages.nix

---
 .../python-modules/gmpy/default.nix           | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------------
 2 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/gmpy/default.nix

diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix
new file mode 100644
index 000000000000..81af4b5e5501
--- /dev/null
+++ b/pkgs/development/python-modules/gmpy/default.nix
@@ -0,0 +1,24 @@
+{ buildPythonPackage, fetchurl, isPyPy, gmp } :
+
+let
+  pname = "gmpy";
+  version = "1.17";
+in
+
+buildPythonPackage {
+  inherit pname version;
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gmpy/${pname}-${version}.zip";
+    sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14";
+  };
+
+  buildInputs = [ gmp ];
+
+  meta = {
+    description = "GMP or MPIR interface to Python 2.4+ and 3.x";
+    homepage = http://code.google.com/p/gmpy/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d962649f71b4..c77cd8b64947 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2624,25 +2624,7 @@ in {
 
   GeoIP = callPackage ../development/python-modules/GeoIP { };
 
-  gmpy = buildPythonPackage rec {
-    name = "gmpy-1.17";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gmpy/${name}.zip";
-      sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14";
-    };
-
-    buildInputs = [
-      pkgs.gcc
-      pkgs.gmp
-    ];
-
-    meta = {
-      description = "GMP or MPIR interface to Python 2.4+ and 3.x";
-      homepage = http://code.google.com/p/gmpy/;
-    };
-  };
+  gmpy = callPackage ../development/python-modules/gmpy { };
 
   gmpy2 = buildPythonPackage rec {
     name = "gmpy2-2.0.6";

From e053386c9236f7f67b203c55ce6a63f39990f805 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 5 Sep 2018 23:34:08 +0200
Subject: [PATCH 0365/3253] gmpy2: 2.0.6 -> 2.0.8

Also move outside python-packages.nix
---
 .../python-modules/gmpy2/default.nix          | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +----------------
 2 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/gmpy2/default.nix

diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
new file mode 100644
index 000000000000..5d1f82356a01
--- /dev/null
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl, isPyPy, gmp, mpfr, libmpc } :
+
+let
+  pname = "gmpy2";
+  version = "2.0.8";
+in
+
+buildPythonPackage {
+  inherit pname version;
+
+  disabled = isPyPy;
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gmpy2/${pname}-${version}.zip";
+    sha256 = "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx";
+  };
+
+  buildInputs = [ gmp mpfr libmpc ];
+
+  meta = with stdenv.lib; {
+    description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
+    homepage = http://code.google.com/p/gmpy/;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c77cd8b64947..7e9e362b3dea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2626,28 +2626,7 @@ in {
 
   gmpy = callPackage ../development/python-modules/gmpy { };
 
-  gmpy2 = buildPythonPackage rec {
-    name = "gmpy2-2.0.6";
-    disabled = isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gmpy2/${name}.zip";
-      sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4";
-    };
-
-    buildInputs = [
-      pkgs.gcc
-      pkgs.gmp
-      pkgs.mpfr
-      pkgs.libmpc
-    ];
-
-    meta = {
-      description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
-      homepage = http://code.google.com/p/gmpy/;
-      license = licenses.gpl3Plus;
-    };
-  };
+  gmpy2 = callPackage ../development/python-modules/gmpy2 { };
 
   gmusicapi = with pkgs; buildPythonPackage rec {
     name = "gmusicapi-10.1.0";

From 1510f324a31880c7f7727f11ae8270d35e384fa4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 6 Sep 2018 01:12:03 +0200
Subject: [PATCH 0366/3253] nix: 2.1 -> 2.1.1

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6611a6ca0790..cb182a08a830 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/r9i30v8nasafg2851wflg71ln49fw03y-nix-2.1";
-  i686-linux = "/nix/store/dsg3pr7wwrk51f7la9wgby173j18llqh-nix-2.1";
-  aarch64-linux = "/nix/store/m3qgnch4xin21pmd1azas8kkcp9rhkr6-nix-2.1";
-  x86_64-darwin = "/nix/store/n7fvy0k555gwkkdszdkhi3h0aahca8h3-nix-2.1";
+  x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
+  i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
+  aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
+  x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7b4517624164..7d78fef39742 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
   }) // { perl-bindings = nix1; };
 
   nixStable = (common rec {
-    name = "nix-2.1";
+    name = "nix-2.1.1";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "0ed68e0c50f13810768fcf510abb2c56d735172c39a325aac7453ccf7ae152fc";
+      sha256 = "63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b";
     };
   }) // { perl-bindings = perl-bindings {
     nix = nixStable;

From f89d6d92b7b4b79015836f12c5a114f53fa4eccb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 5 Sep 2018 21:02:09 -0400
Subject: [PATCH 0367/3253] linux: Remove 4.17

---
 pkgs/os-specific/linux/kernel/linux-4.17.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 11 -----------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.17.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
deleted file mode 100644
index 5c13f366221e..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "4.17.19";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3cb6069caf8..26409db6d01d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14003,16 +14003,6 @@ with pkgs;
       ];
   };
 
-  linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ];
-  };
-
   linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -14235,7 +14225,6 @@ with pkgs;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
-  linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17);
   linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
   # Don't forget to update linuxPackages_latest!
 

From 5704642a3f8dd29ef6e280de69171186ca327b6a Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:25:40 -0400
Subject: [PATCH 0368/3253] pythonPackages.pytest-faulthandler: init at 1.5.0

 - compatible with 2.7 and 3+
 - all test pass.
---
 .../pytest-faulthandler/default.nix           | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-faulthandler/default.nix

diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix
new file mode 100644
index 000000000000..852de1fd49cd
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+, pytest-mock
+, pythonOlder
+, faulthandler
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-faulthandler";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d";
+  };
+
+  buildInputs = [ setuptools_scm pytest ];
+  checkInputs = [ pytest-mock ];
+  propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Py.test plugin that activates the fault handler module for tests";
+    homepage = https://github.com/pytest-dev/pytest-faulthandler;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb58f67c5970..267d283cbb90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1885,6 +1885,8 @@ in {
 
   pytest-django = callPackage ../development/python-modules/pytest-django { };
 
+  pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { };
+
   pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { };
 
   pytest-forked = callPackage ../development/python-modules/pytest-forked { };

From 3a56e314b85a7bec2d19fb156713562e5ae3a7b1 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:27:47 -0400
Subject: [PATCH 0369/3253] pythonPackages.python-lz4: init at 2.1.0

Fetching from github repository instead of pypi so that all tests can
be run.

 - compatible with 2.7, 3+
 - all tests pass
---
 .../python-modules/python-lz4/default.nix     | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-lz4/default.nix

diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix
new file mode 100644
index 000000000000..a0fe6666d849
--- /dev/null
+++ b/pkgs/development/python-modules/python-lz4/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestrunner
+, pytest
+, psutil
+, setuptools_scm
+, pkgconfig
+, isPy3k
+, future
+}:
+
+buildPythonPackage rec {
+  pname = "python-lz4";
+  version = "2.1.0";
+
+  # get full repository inorder to run tests
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6";
+  };
+
+  buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
+  checkInputs = [ pytest psutil ];
+  propagatedBuildInputs = lib.optionals (!isPy3k) [ future ];
+
+  # give a hint to setuptools_scm on package version
+  preBuild = ''
+    export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
+  '';
+
+  meta = {
+     description = "LZ4 Bindings for Python";
+     homepage = https://github.com/python-lz4/python-lz4;
+     license = lib.licenses.bsd0;
+     maintainers = with lib.maintainers; [ costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 267d283cbb90..26b31958c32f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -461,6 +461,8 @@ in {
 
   python-hosts = callPackage ../development/python-modules/python-hosts { };
 
+  python-lz4 = callPackage ../development/python-modules/python-lz4 { };
+
   python3-openid = callPackage ../development/python-modules/python3-openid { };
 
   python-periphery = callPackage ../development/python-modules/python-periphery { };

From 05890dda3db11a77c13d4aa88084bc6a6680e772 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:30:26 -0400
Subject: [PATCH 0370/3253] pythonPackages.joblib: 0.12.1 -> 0.12.2

In order to get all the tests passing the Github repository was
downloaded instead of from pypi so that the `conftest.py` is
available.

In addition to updating the version:

  - compatible with 2.7, 3+ now
  - all tests are running and passing
---
 .../python-modules/joblib/default.nix         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 8b42e6e1ea1d..d96752ba05f3 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -1,29 +1,36 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , sphinx
 , numpydoc
 , pytest
+, python-lz4
 }:
 
 
 buildPythonPackage rec {
   pname = "joblib";
-  version = "0.12.1";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "68e6128e4734196616a39e2d48830ec7d61551c7f5748849e4c91478d2444524";
+  version = "0.12.4";
+
+  # get full repository inorder to run tests
+  src = fetchFromGitHub {
+    owner = "joblib";
+    repo = pname;
+    rev = version;
+    sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
   };
 
   checkInputs = [ sphinx numpydoc pytest ];
+  propagatedBuildInputs = [ python-lz4 ];
 
   checkPhase = ''
-    py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
+    py.test joblib
   '';
 
   meta = {
     description = "Lightweight pipelining: using Python functions as pipeline jobs";
     homepage = https://pythonhosted.org/joblib/;
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ costrouc ];
   };
 }

From 7b920172dbd64f27e34568605a4894981158c65e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:32:52 -0400
Subject: [PATCH 0371/3253] pythonPackages.pytest-repeat: init at 0.6.0

 - compatible with 2.7, 3+
 - all tests pass and running
---
 .../python-modules/pytest-repeat/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-repeat/default.nix

diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix
new file mode 100644
index 000000000000..eca14c8289a9
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-repeat/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-repeat";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "84aba2fcca5dc2f32ae626a01708f469f17b3384ec3d1f507698077f274909d6";
+  };
+
+  buildInputs = [ setuptools_scm pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Pytest plugin for repeating tests";
+    homepage = https://github.com/pytest-dev/pytest-repeat;
+    maintainers = with lib.maintainers; [ costrouc ];
+    license = lib.licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26b31958c32f..fb86b350cc7f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1913,6 +1913,8 @@ in {
 
   pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
 
+  pytest-repeat = callPackage ../development/python-modules/pytest-repeat { };
+
   pytestrunner = callPackage ../development/python-modules/pytestrunner { };
 
   pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };

From 4f70170f8ab2b97f371f018e89e157219d22dcb6 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 8 Aug 2018 15:36:58 -0400
Subject: [PATCH 0372/3253] pythonPackages.distributed: 1.15.1 -> 1.22.1

The github repository was downloaded instead of the pypi repository
for testing (needed `conftest.py`). Major work was done on the
underlying dependencies to make distributed work on python 2.7,
3+. Note that the test **do** take a significant amount of time (10-15
minutes).

 - moved to `python-modules`
 - compatible with 2.7, 3+
 - all tests pass (previously tests were not run)
---
 .../python-modules/distributed/default.nix    | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +---------
 2 files changed, 61 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/distributed/default.nix

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
new file mode 100644
index 000000000000..d909a6993a04
--- /dev/null
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytest-repeat
+, pytest-faulthandler
+, pytest-timeout
+, mock
+, joblib
+, click
+, cloudpickle
+, dask
+, msgpack
+, psutil
+, six
+, sortedcontainers
+, tblib
+, toolz
+, tornado
+, zict
+, pyyaml
+, pythonOlder
+, futures
+, singledispatch
+}:
+
+buildPythonPackage rec {
+  pname = "distributed";
+  version = "1.22.1";
+
+  # get full repository need conftest.py to run tests
+  src = fetchFromGitHub {
+    owner = "dask";
+    repo = pname;
+    rev = version;
+    sha256 = "0xvx55rhbhlyys3kjndihwq6y6260qzy9mr3miclh5qddaiw2d5z";
+  };
+
+  checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
+  propagatedBuildInputs = [
+      click cloudpickle dask msgpack psutil six
+      sortedcontainers tblib toolz tornado zict pyyaml
+  ] ++ lib.optional (pythonOlder "3.2") [ futures ]
+    ++ lib.optional (pythonOlder "3.4") [ singledispatch ];
+
+  # tests take about 10-15 minutes
+  # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses
+  # these tests are not critical to the library (only the cli)
+  checkPhase = ''
+    py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests"
+  '';
+
+  meta = {
+    description = "Distributed computation in Python.";
+    homepage = http://distributed.readthedocs.io/en/latest/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ teh costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb86b350cc7f..114e41b30dec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -272,6 +272,8 @@ in {
 
   distorm3 = callPackage ../development/python-modules/distorm3 { };
 
+  distributed = callPackage ../development/python-modules/distributed { };
+
   dogtail = callPackage ../development/python-modules/dogtail { };
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
@@ -1982,34 +1984,6 @@ in {
 
   zict = callPackage ../development/python-modules/zict { };
 
-  distributed = buildPythonPackage rec {
-
-    name = "distributed-${version}";
-    version = "1.15.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/distributed/${name}.tar.gz";
-      sha256 = "037a07sdf2ch1d360nqwqz3b4ld8msydng7mw4i5s902v7xr05l6";
-    };
-
-    buildInputs = with self; [ pytest docutils ];
-    propagatedBuildInputs = with self; [
-      dask six boto3 s3fs tblib locket msgpack-python click cloudpickle tornado
-      psutil botocore zict lz4 sortedcollections sortedcontainers
-    ] ++ (if !isPy3k then [ singledispatch ] else []);
-
-    # py.test not picking up local config file, even when running
-    # manually: E ValueError: no option named '--runslow'
-    doCheck = false;
-
-    meta = {
-      description = "Distributed computation in Python.";
-      homepage = "http://distributed.readthedocs.io/en/latest/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ teh ];
-    };
-  };
-
   digital-ocean = callPackage ../development/python-modules/digitalocean { };
 
   leather = callPackage ../development/python-modules/leather { };

From 63cf879d6cc895e9210702c6f0cfc894a80aa35c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 6 Sep 2018 00:04:28 -0400
Subject: [PATCH 0373/3253] pythonPackages.pymatgen: 2018.8.10 -> 2018.9.1

Also 2018.8.10 does not build in previous state because auto updating
from pypi did not account for a new requirement `networkx`. This has
been added.
---
 pkgs/development/python-modules/pymatgen/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix
index d810a5d6b4df..523e7f808064 100644
--- a/pkgs/development/python-modules/pymatgen/default.nix
+++ b/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas }:
+{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }:
 
 buildPythonPackage rec {
   pname = "pymatgen";
-  version = "2018.8.10";
+  version = "2018.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603";
+    sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18";
   };
 
   nativeBuildInputs = [ glibcLocales ];
-  propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas ];
-  
+  propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ];
+
   # No tests in pypi tarball.
   doCheck = false;
 
@@ -22,4 +22,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ psyanticy ];
   };
 }
-

From 6bd8799448dd3d4a7f92f569202010e1fe5b9a33 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 08:43:04 +0200
Subject: [PATCH 0374/3253] haskellPackages.tensorflow-mnist-input-data: use an
 attribute set to specify the data files

This is more understandable and safer than using a nested list.
---
 .../configuration-tensorflow.nix              | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index d1ca474ba4f4..10ee30d81c85 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -64,27 +64,17 @@ in
     }:
 
     let
-      urlPrefix = "http://yann.lecun.com/exdb/mnist/";
-
-      # File names relative to 'urlPrefix' and their sha256.
-      fileInfos = [
-        [ "train-images-idx3-ubyte.gz"
-         "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609"
-        ]
-
-        [ "train-labels-idx1-ubyte.gz"
-         "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c"
-        ]
-
-        [ "t10k-images-idx3-ubyte.gz"
-         "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6"
-        ]
-
-        [ "t10k-labels-idx1-ubyte.gz"
-         "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6"
-        ]
-      ];
-      downloads = map (x: pkgs.fetchurl { url = urlPrefix + builtins.head x; sha256= builtins.tail x;}) fileInfos;
+      fileInfos = {
+        "train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609";
+        "train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c";
+        "t10k-images-idx3-ubyte.gz"  = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6";
+        "t10k-labels-idx1-ubyte.gz"  = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6";
+      };
+      downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256:
+                    pkgs.fetchurl {
+                      url = "http://yann.lecun.com/exdb/mnist/${name}";
+                      inherit sha256;
+                    });
     in
     mkDerivation {
       pname = "tensorflow-mnist-input-data";

From 641025d410ec7212996ba9d7cea4d12ce8218886 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 08:44:19 +0200
Subject: [PATCH 0375/3253] haskellPackages.tensorflow-mnist-input-data: link
 data files instead of copying

This prevents duplication in the nix store.
---
 pkgs/development/haskell-modules/configuration-tensorflow.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index 10ee30d81c85..dedcaf0cbc76 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -86,7 +86,7 @@ in
         network-uri
       ];
       preConfigure = pkgs.lib.strings.concatStringsSep "\n" (
-          map (x: "cp ${x} data/$(stripHash ${x})") downloads
+          map (x: "ln -s ${x} data/$(stripHash ${x})") downloads
         );
       libraryHaskellDepends = [ base ];
       homepage = "https://github.com/tensorflow/haskell#readme";

From a5f08c17e5034ad00c170e1599d19f6d77aa19ca Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 08:49:17 +0200
Subject: [PATCH 0376/3253] haskellPackages.tensorflow-mnist: fix missing
 dependency on tensorflow-mnist-input-data

---
 .../haskell-modules/configuration-tensorflow.nix            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index dedcaf0cbc76..43a3b82923ba 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -55,9 +55,11 @@ in
   tensorflow-logging = super.tensorflow-logging.override {
     inherit proto-lens;
   };
-  tensorflow-mnist = super.tensorflow-mnist.override {
+  tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override {
     inherit proto-lens;
-  };
+    # https://github.com/tensorflow/haskell/issues/215
+    tensorflow-mnist-input-data = self.tensorflow-mnist-input-data;
+  }) (_drv: { broken = false; });
   tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage (
     { mkDerivation, base, bytestring, Cabal, cryptonite, directory
     , filepath, HTTP, network-uri, stdenv

From 39d35e77ee51c24c688d028f0dc0b9fb761db1d7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 08:54:12 +0200
Subject: [PATCH 0377/3253] Revert "libtensorflow: fix hashes for darwin and
 cuda downloads"

This reverts commit 93ed13f86b624dc3214f58d09c3f3318f9900afa.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
---
 pkgs/development/libraries/libtensorflow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index b4e616409c4f..2bc83b31423a 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -38,12 +38,12 @@ in stdenv.mkDerivation rec {
     sha256 =
       if system == "linux-x86_64" then
         if cudaSupport
-        then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn"
+        then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
         else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
       else if system == "darwin-x86_64" then
         if cudaSupport
         then unavailable
-        else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59"
+        else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657"
       else unavailable;
   };
 

From 6e14b9fc2d738b18948d221367899c16db92f622 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 08:56:09 +0200
Subject: [PATCH 0378/3253] Revert "libtensorflow: 1.9.0 -> 1.10.0"

This reverts commit 713991132eb7b01f5732a301da4d377bafe32e8b.

libtensorflow is only used by the Haskell tensorflow packages and they
don't work with tensorflow-1.10 yet. So the easiest solution is to
just revert this commit and add it back when they do gain support.
---
 pkgs/development/libraries/libtensorflow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index 2bc83b31423a..e6cd140c4e4b 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -31,7 +31,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "libtensorflow";
-  version = "1.10.0";
+  version = "1.9.0";
   name = "${pname}-${version}";
   src = fetchurl {
     url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
       if system == "linux-x86_64" then
         if cudaSupport
         then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
-        else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
+        else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21"
       else if system == "darwin-x86_64" then
         if cudaSupport
         then unavailable

From 1fc5a6d2b6bf3acfd5e4761fd2cb0c549c6045f0 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 6 Sep 2018 09:00:07 +0200
Subject: [PATCH 0379/3253] haskell: build the tensorflow packages on hydra
 since they now build successfully

---
 .../haskell-modules/configuration-hackage2nix.yaml          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3aee4857f993..4a26fcbffc17 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9054,12 +9054,6 @@ dont-distribute-packages:
   temporary-resourcet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow-core-ops:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow-logging:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow-opgen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow-ops:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow-proto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensorflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   term-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termcolor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]

From ec7d4a80893c1337f53008135acdd044bf5d0257 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 2 Sep 2018 17:04:57 +0200
Subject: [PATCH 0380/3253] skaware: update tools & libraries to summer 2018
 release

https://www.mail-archive.com/skaware@list.skarnet.org/msg01217.html

No support for yet.
---
 pkgs/development/libraries/skalibs/default.nix    | 4 ++--
 pkgs/os-specific/linux/s6-linux-utils/default.nix | 5 +++--
 pkgs/tools/misc/execline/default.nix              | 5 +++--
 pkgs/tools/misc/s6-portable-utils/default.nix     | 4 ++--
 pkgs/tools/networking/s6-dns/default.nix          | 4 ++--
 pkgs/tools/networking/s6-networking/default.nix   | 5 +++--
 pkgs/tools/system/s6-rc/default.nix               | 4 ++--
 pkgs/tools/system/s6/default.nix                  | 5 +++--
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 9d5bd170e20d..85b1b060700f 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.6.4.0";
+  version = "2.7.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/skalibs";
     rev = "refs/tags/v${version}";
-    sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
+    sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm";
   };
 
   outputs = [ "lib" "dev" "doc" "out" ];
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index dbef7c41c067..1c07dd6f0544 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.4.0.2";
+  version = "2.5.0.0";
 
 in stdenv.mkDerivation rec {
 
@@ -10,13 +10,14 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
-    sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip";
+    sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq";
   };
 
   outputs = [ "bin" "dev" "doc" "out" ];
 
   dontDisableStatic = true;
 
+  # TODO: nsss support
   configureFlags = [
     "--enable-absolute-paths"
     "--bindir=\${bin}/bin"
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 360808f4280b..70301cc89e62 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.5.0.0";
+  version = "2.5.0.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/execline";
     rev = "refs/tags/v${version}";
-    sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn";
+    sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q";
   };
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
@@ -20,6 +20,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # TODO: nsss support
   configureFlags = [
     "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 5f56daf3a48d..c11bd13c799a 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
-  version = "2.2.1.1";
+  version = "2.2.1.2";
 
   src = fetchurl {
     url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka";
+    sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih";
   };
 
   outputs = [ "bin" "dev" "doc" "out" ];
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 29d66e4be2ce..ee669b8f9282 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.0.0";
+  version = "2.3.0.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-dns";
     rev = "refs/tags/v${version}";
-    sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb";
+    sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
   };
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index f7278d5c6a24..d96cff167d90 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -9,7 +9,7 @@
 let
   inherit (stdenv) lib;
 
-  version = "2.3.0.2";
+  version = "2.3.0.3";
 
   sslSupportEnabled = sslSupport != false;
   sslLibs = {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-networking";
     rev = "refs/tags/v${version}";
-    sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42";
+    sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc";
   };
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # TODO: nsss support
   configureFlags = [
     "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 40c999d80f13..b5cfa8ea4425 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.4.0.1";
+  version = "0.4.1.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-rc";
     rev = "refs/tags/v${version}";
-    sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw";
+    sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805";
   };
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index d7ade3cdb290..85140bce1ec9 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.7.1.1";
+  version = "2.7.2.0";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6";
     rev = "refs/tags/v${version}";
-    sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav";
+    sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az";
   };
 
   # NOTE lib: cannot split lib from bin at the moment,
@@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # TODO: nsss support
   configureFlags = [
     "--enable-absolute-paths"
     "--libdir=\${out}/lib"

From 57b431590b3c555469f4ebeffa2dc524ef806293 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 2 Sep 2018 17:37:44 +0200
Subject: [PATCH 0381/3253] skaware: bundle all skaware packages into an
 attrset

They are normally updated in lockstep, this makes maintenance more
convenient.
---
 pkgs/top-level/all-packages.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38755b611e54..dccad6918ca5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2385,7 +2385,7 @@ with pkgs;
 
   exempi = callPackage ../development/libraries/exempi { };
 
-  execline = callPackage ../tools/misc/execline { };
+  execline = skawarePackages.execline;
 
   exif = callPackage ../tools/graphics/exif { };
 
@@ -5066,13 +5066,13 @@ with pkgs;
 
   s3gof3r = callPackage ../tools/networking/s3gof3r { };
 
-  s6-dns = callPackage ../tools/networking/s6-dns { };
+  s6-dns = skawarePackages.s6-dns;
 
-  s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
+  s6-linux-utils = skawarePackages.s6-linux-utils;
 
-  s6-networking = callPackage ../tools/networking/s6-networking { };
+  s6-networking = skawarePackages.s6-networking;
 
-  s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
+  s6-portable-utils = skawarePackages.s6-portable-utils;
 
   sablotron = callPackage ../tools/text/xml/sablotron { };
 
@@ -12003,7 +12003,19 @@ with pkgs;
 
   shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
 
-  skalibs = callPackage ../development/libraries/skalibs { };
+  skalibs = skawarePackages.skalibs;
+
+  skawarePackages = recurseIntoAttrs {
+    skalibs = callPackage ../development/libraries/skalibs { };
+    execline = callPackage ../tools/misc/execline { };
+
+    s6 = callPackage ../tools/system/s6 { };
+    s6-dns = callPackage ../tools/networking/s6-dns { };
+    s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
+    s6-networking = callPackage ../tools/networking/s6-networking { };
+    s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
+    s6-rc = callPackage ../tools/system/s6-rc { };
+  };
 
   skydive = callPackage ../tools/networking/skydive { };
 
@@ -13415,9 +13427,9 @@ with pkgs;
     boost = boost159;
   };
 
-  s6 = callPackage ../tools/system/s6 { };
+  s6 = skawarePackages.s6;
 
-  s6-rc = callPackage ../tools/system/s6-rc { };
+  s6-rc = skawarePackages.s6-rc;
 
   supervise = callPackage ../tools/system/supervise { };
 

From 0071ae1d4f1a18542b19a815d06d2b7bbf292dd4 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 2 Sep 2018 23:31:26 +0200
Subject: [PATCH 0382/3253] skawarePackages: factor out the common parts

Introduce a `skawarePackages.buildPackage` function that contains the
common setup, removing a lot of duplication.
In particular, we require that the build directory has to be empty
after the `fixupPhase`, to make sure every relevant file is moved to
the outputs.

A next step would be to deduplicate the `configureFlags` attributes
and only require a `skawareInputs` field.
---
 .../skaware/build-skaware-package.nix         | 128 ++++++++++++++++++
 .../development/libraries/skalibs/default.nix |  45 ++----
 .../linux/s6-linux-utils/default.nix          |  34 ++---
 pkgs/tools/misc/execline/default.nix          |  39 ++----
 pkgs/tools/misc/s6-portable-utils/default.nix |  42 ++----
 pkgs/tools/networking/s6-dns/default.nix      |  40 ++----
 .../networking/s6-networking/default.nix      |  41 ++----
 pkgs/tools/system/s6-rc/default.nix           |  40 ++----
 pkgs/tools/system/s6/default.nix              |  40 ++----
 pkgs/top-level/all-packages.nix               |   2 +
 10 files changed, 228 insertions(+), 223 deletions(-)
 create mode 100644 pkgs/build-support/skaware/build-skaware-package.nix

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
new file mode 100644
index 000000000000..5f6951cb25fa
--- /dev/null
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -0,0 +1,128 @@
+{ stdenv, fetchgit, writeScript, file }:
+let lib = stdenv.lib;
+in {
+  # : string
+  pname
+  # : string
+, version
+  # : string
+, sha256
+  # : string
+, description
+  # : list Platform
+, platforms ? lib.platforms.all
+  # : list string
+, outputs ? [ "bin" "lib" "dev" "doc" "out" ]
+  # TODO(Profpatsch): automatically infer most of these
+  # : list string
+, configureFlags
+  # mostly for moving and deleting files from the build directory
+  # : lines
+, postInstall
+  # : list Maintainer
+, maintainers ? []
+
+
+}:
+
+let
+
+  # File globs that can always be deleted
+  commonNoiseFiles = [
+    ".gitignore"
+    "Makefile"
+    "INSTALL"
+    "configure"
+    "patch-for-solaris"
+    "src/**/*"
+    "tools/**/*"
+    "package/**/*"
+    "config.mak"
+  ];
+
+  # File globs that should be moved to $doc
+  commonMetaFiles = [
+    "COPYING"
+    "AUTHORS"
+    "NEWS"
+    "CHANGELOG"
+    "README"
+    "README.*"
+  ];
+
+  globWith = stdenv.lib.concatMapStringsSep "\n";
+  rmNoise = globWith (f:
+    ''rm -rf ${f}'') commonNoiseFiles;
+  mvMeta = globWith
+    (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'')
+    commonMetaFiles;
+
+  # Move & remove actions, taking the package doc directory
+  commonFileActions = writeScript "common-file-actions.sh" ''
+    #!${stdenv.shell}
+    set -e
+    DOCDIR="$1"
+    shopt -s globstar extglob nullglob
+    ${rmNoise}
+    mkdir -p "$DOCDIR"
+    ${mvMeta}
+  '';
+
+
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchgit {
+    url = "git://git.skarnet.org/${pname}";
+    rev = "refs/tags/v${version}";
+    inherit sha256;
+  };
+
+  inherit outputs;
+
+  dontDisableStatic = true;
+  enableParallelBuilding = true;
+
+  configureFlags = configureFlags ++ [
+    "--enable-absolute-paths"
+    (if stdenv.isDarwin
+      then "--disable-shared"
+      else "--enable-shared")
+  ]
+    # On darwin, the target triplet from -dumpmachine includes version number,
+    # but skarnet.org software uses the triplet to test binary compatibility.
+    # Explicitly setting target ensures code can be compiled against a skalibs
+    # binary built on a different version of darwin.
+    # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
+    ++ (lib.optional stdenv.isDarwin
+         "--build=${stdenv.hostPlatform.system}");
+
+  # TODO(Profpatsch): ensure that there is always a $doc output!
+  postInstall = ''
+    echo "Cleaning & moving common files"
+    mkdir -p $doc/share/doc/${pname}
+    ${commonFileActions} $doc/share/doc/${pname}
+
+    ${postInstall}
+  '';
+
+  postFixup = ''
+    echo "Checking for remaining source files"
+    rem=$(find -mindepth 1 -xtype f -print0 \
+           | tee $TMP/remaining-files)
+    if [[ "$rem" != "" ]]; then
+      echo "ERROR: These files should be either moved or deleted:"
+      cat $TMP/remaining-files | xargs -0 ${file}/bin/file
+      exit 1
+    fi
+  '';
+
+  meta = {
+    homepage = "https://skarnet.org/software/${pname}/";
+    inherit description platforms;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with lib.maintainers;
+      [ pmahoney Profpatsch ] ++ maintainers;
+  };
+
+}
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 85b1b060700f..98977381f0f1 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,51 +1,30 @@
-{ stdenv, fetchgit }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "skalibs";
   version = "2.7.0.0";
+  sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm";
 
-in stdenv.mkDerivation rec {
-
-  name = "skalibs-${version}";
-
-  src = fetchgit {
-    url = "git://git.skarnet.org/skalibs";
-    rev = "refs/tags/v${version}";
-    sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm";
-  };
+  description = "A set of general-purpose C programming libraries";
 
   outputs = [ "lib" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   configureFlags = [
-    "--enable-force-devr"       # assume /dev/random works
+    # assume /dev/random works
+    "--enable-force-devr"
     "--libdir=\${lib}/lib"
     "--dynlibdir=\${lib}/lib"
     "--includedir=\${dev}/include"
     "--sysdepdir=\${lib}/lib/skalibs/sysdeps"
-  ]
-  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  # On darwin, the target triplet from -dumpmachine includes version number, but
-  # skarnet.org software uses the triplet to test binary compatibility.
-  # Explicitly setting target ensures code can be compiled against a skalibs
-  # binary built on a different version of darwin.
-  # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/skalibs
+    rm -rf sysdeps.cfg
+    rm libskarnet.*
+
     mv doc $doc/share/doc/skalibs/html
   '';
 
-  meta = {
-    homepage = http://skarnet.org/software/skalibs/;
-    description = "A set of general-purpose C programming libraries";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 1c07dd6f0544..95dd3736c040 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -1,25 +1,19 @@
-{ stdenv, fetchurl, skalibs }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "s6-linux-utils";
   version = "2.5.0.0";
+  sha256 = "0wbxwki2alyym6dm44s5ajp9ndw6sgrqvizkznz71c30i0dlxrnf";
 
-in stdenv.mkDerivation rec {
-
-  name = "s6-linux-utils-${version}";
-
-  src = fetchurl {
-    url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
-    sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq";
-  };
+  description = "A set of minimalistic Linux-specific system utilities";
+  platforms = stdenv.lib.platforms.linux;
 
   outputs = [ "bin" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
   # TODO: nsss support
   configureFlags = [
-    "--enable-absolute-paths"
     "--bindir=\${bin}/bin"
     "--includedir=\${dev}/include"
     "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
@@ -29,16 +23,10 @@ in stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6-networking/
-    mv doc $doc/share/doc/s6-networking/html
+    # remove all s6 executables from build directory
+    rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
+
+    mv doc $doc/share/doc/s6-linux-utils/html
   '';
 
-  meta = {
-    homepage = http://www.skarnet.org/software/s6-linux-utils/;
-    description = "A set of minimalistic Linux-specific system utilities";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 70301cc89e62..00faab0a66f8 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -1,28 +1,18 @@
-{ stdenv, fetchgit, skalibs }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "execline";
   version = "2.5.0.1";
+  sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q";
 
-in stdenv.mkDerivation rec {
-
-  name = "execline-${version}";
-
-  src = fetchgit {
-    url = "git://git.skarnet.org/execline";
-    rev = "refs/tags/v${version}";
-    sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q";
-  };
+  description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   # TODO: nsss support
   configureFlags = [
-    "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
     "--dynlibdir=\${lib}/lib"
     "--bindir=\${bin}/bin"
@@ -31,22 +21,15 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs.dev}/include"
     "--with-lib=${skalibs.lib}/lib"
     "--with-dynlib=${skalibs.lib}/lib"
-  ]
-  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/execline
+    # remove all execline executables from build directory
+    rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libexecline.*
+
     mv doc $doc/share/doc/execline/html
     mv examples $doc/share/doc/execline/examples
   '';
 
-  meta = {
-    homepage = http://skarnet.org/software/execline/;
-    description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index c11bd13c799a..04874dedc6e6 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,47 +1,35 @@
-{ stdenv, fetchurl, skalibs }:
+{ stdenv, skawarePackages }:
 
-with stdenv.lib;
+with skawarePackages;
 
-stdenv.mkDerivation rec {
-  name = "s6-portable-utils-${version}";
+let
+  pname = "s6-portable-utils";
+
+in buildPackage {
+  pname = pname;
   version = "2.2.1.2";
+  sha256 = "1zfanja5mbyafmzw28dlx1bb3fixa7lidbs62sxf849ly3z0zqp2";
 
-  src = fetchurl {
-    url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih";
-  };
+  description = "A set of tiny general Unix utilities optimized for simplicity and small size";
 
   outputs = [ "bin" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
   configureFlags = [
-    "--enable-absolute-paths"
     "--bindir=\${bin}/bin"
     "--includedir=\${dev}/include"
     "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
     "--with-include=${skalibs.dev}/include"
     "--with-lib=${skalibs.lib}/lib"
     "--with-dynlib=${skalibs.lib}/lib"
-  ]
-  # On darwin, the target triplet from -dumpmachine includes version number, but
-  # skarnet.org software uses the triplet to test binary compatibility.
-  # Explicitly setting target ensures code can be compiled against a skalibs
-  # binary built on a different version of darwin.
-  # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6-portable-utils/
-    mv doc $doc/share/doc/s6-portable-utils/html
+    # remove all s6 executables from build directory
+    rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
+    rm seekablepipe
+
+    mv doc $doc/share/doc/${pname}/html
   '';
 
-  meta = {
-    homepage = http://www.skarnet.org/software/s6-portable-utils/;
-    description = "A set of tiny general Unix utilities optimized for simplicity and small size";
-    platforms = platforms.all;
-    license = licenses.isc;
-    maintainers = with maintainers; [ pmahoney Profpatsch ];
-  };
 
 }
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index ee669b8f9282..6d514d56ed39 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -1,27 +1,17 @@
-{ stdenv, fetchgit, skalibs }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "s6-dns";
   version = "2.3.0.1";
+  sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
 
-in stdenv.mkDerivation rec {
-
-  name = "s6-dns-${version}";
-
-  src = fetchgit {
-    url = "git://git.skarnet.org/s6-dns";
-    rev = "refs/tags/v${version}";
-    sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
-  };
+  description = "A suite of DNS client programs and libraries for Unix systems";
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   configureFlags = [
-    "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
     "--libexecdir=\${lib}/libexec"
     "--dynlibdir=\${lib}/lib"
@@ -31,21 +21,15 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs.dev}/include"
     "--with-lib=${skalibs.lib}/lib"
     "--with-dynlib=${skalibs.lib}/lib"
-  ]
-  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6-dns/
+    # remove all s6-dns executables from build directory
+    rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libs6dns.*
+    rm libskadns.*
+
     mv doc $doc/share/doc/s6-dns/html
   '';
 
-  meta = {
-    homepage = http://www.skarnet.org/software/s6-dns/;
-    description = "A suite of DNS client programs and libraries for Unix systems";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index d96cff167d90..032287ece835 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, execline, fetchgit, s6, s6-dns, skalibs
+{ stdenv, skawarePackages
 
 # Whether to build the TLS/SSL tools and what library to use
 # acceptable values: "libressl", false
@@ -6,11 +6,9 @@
 , sslSupport ? "libressl" , libressl
 }:
 
+with skawarePackages;
 let
   inherit (stdenv) lib;
-
-  version = "2.3.0.3";
-
   sslSupportEnabled = sslSupport != false;
   sslLibs = {
     "libressl" = libressl;
@@ -19,25 +17,18 @@ let
 in
 assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
-stdenv.mkDerivation rec {
 
-  name = "s6-networking-${version}";
+buildPackage {
+  pname = "s6-networking";
+  version = "2.3.0.3";
+  sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc";
 
-  src = fetchgit {
-    url = "git://git.skarnet.org/s6-networking";
-    rev = "refs/tags/v${version}";
-    sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc";
-  };
+  description = "A suite of small networking utilities for Unix systems";
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   # TODO: nsss support
   configureFlags = [
-    "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
     "--libexecdir=\${lib}/libexec"
     "--dynlibdir=\${lib}/lib"
@@ -61,20 +52,16 @@ stdenv.mkDerivation rec {
        "--enable-ssl=${sslSupport}"
        "--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
        "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
-     ])
-  ++ (lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+       "--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib"
+     ]);
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6-networking/
+    # remove all s6 executables from build directory
+    rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
+    rm minidentd
+    rm libs6net.* libstls.*
+
     mv doc $doc/share/doc/s6-networking/html
   '';
 
-  meta = {
-    homepage = http://www.skarnet.org/software/s6-networking/;
-    description = "A suite of small networking utilities for Unix systems";
-    platforms = lib.platforms.all;
-    license = lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index b5cfa8ea4425..3edb0c0fb608 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -1,27 +1,18 @@
-{ stdenv, execline, fetchgit, skalibs, s6 }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "s6-rc";
   version = "0.4.1.0";
+  sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805";
 
-in stdenv.mkDerivation rec {
-
-  name = "s6-rc-${version}";
-
-  src = fetchgit {
-    url = "git://git.skarnet.org/s6-rc";
-    rev = "refs/tags/v${version}";
-    sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805";
-  };
+  description = "A service manager for s6-based systems";
+  platforms = stdenv.lib.platforms.linux;
 
   outputs = [ "bin" "lib" "dev" "doc" "out" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   configureFlags = [
-    "--enable-absolute-paths"
     "--libdir=\${lib}/lib"
     "--libexecdir=\${lib}/libexec"
     "--dynlibdir=\${lib}/lib"
@@ -37,22 +28,15 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs.lib}/lib"
     "--with-dynlib=${execline.lib}/lib"
     "--with-dynlib=${s6.out}/lib"
-  ]
-  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6-rc/
+    # remove all s6 executables from build directory
+    rm $(find -name "s6-rc-*" -type f -mindepth 1 -maxdepth 1 -executable)
+    rm s6-rc libs6rc.*
+
     mv doc $doc/share/doc/s6-rc/html
     mv examples $doc/share/doc/s6-rc/examples
   '';
 
-  meta = {
-    homepage = http://skarnet.org/software/s6-rc/;
-    description = "A service manager for s6-based systems";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 85140bce1ec9..f459c6242606 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -1,32 +1,21 @@
-{ stdenv, execline, fetchgit, skalibs }:
+{ stdenv, skawarePackages }:
 
-let
+with skawarePackages;
 
+buildPackage {
+  pname = "s6";
   version = "2.7.2.0";
+  sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az";
 
-in stdenv.mkDerivation rec {
-
-  name = "s6-${version}";
-
-  src = fetchgit {
-    url = "git://git.skarnet.org/s6";
-    rev = "refs/tags/v${version}";
-    sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az";
-  };
+  description = "skarnet.org's small & secure supervision software suite";
 
   # NOTE lib: cannot split lib from bin at the moment,
   # since some parts of lib depend on executables in bin.
   # (the `*_startf` functions in `libs6`)
-
   outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ];
 
-  dontDisableStatic = true;
-
-  enableParallelBuilding = true;
-
   # TODO: nsss support
   configureFlags = [
-    "--enable-absolute-paths"
     "--libdir=\${out}/lib"
     "--libexecdir=\${out}/libexec"
     "--dynlibdir=\${out}/lib"
@@ -39,22 +28,15 @@ in stdenv.mkDerivation rec {
     "--with-lib=${execline.lib}/lib"
     "--with-dynlib=${skalibs.lib}/lib"
     "--with-dynlib=${execline.lib}/lib"
-  ]
-  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
-  ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+  ];
 
   postInstall = ''
-    mkdir -p $doc/share/doc/s6/
+    # remove all s6 executables from build directory
+    rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libs6.*
+
     mv doc $doc/share/doc/s6/html
     mv examples $doc/share/doc/s6/examples
   '';
 
-  meta = {
-    homepage = http://www.skarnet.org/software/s6/;
-    description = "skarnet.org's small & secure supervision software suite";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
-  };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dccad6918ca5..7d5e65e4d4bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12006,6 +12006,8 @@ with pkgs;
   skalibs = skawarePackages.skalibs;
 
   skawarePackages = recurseIntoAttrs {
+    buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { };
+
     skalibs = callPackage ../development/libraries/skalibs { };
     execline = callPackage ../tools/misc/execline { };
 

From e8f336fac272a92ac063b4ecd65f680518971044 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 3 Sep 2018 10:10:46 +0200
Subject: [PATCH 0383/3253] skawarePackages.nsss: init at 0.0.1.0

---
 pkgs/development/libraries/nsss/default.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  5 ++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/nsss/default.nix

diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
new file mode 100644
index 000000000000..bd56acb76e6c
--- /dev/null
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+  pname = "nsss";
+  version = "0.0.1.0";
+  sha256 = "0pw7qk4j4q4sl3h01bbqcr44ppxkdvaw08xlhsnnkiv9jypfwx7w";
+
+  description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
+
+  # TODO: nsss support
+  configureFlags = [
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+  ];
+
+  postInstall = ''
+    # remove all nsss executables from build directory
+    rm $(find -name "nsssd-*" -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libnsss.* libnsssd.*
+
+    mv doc $doc/share/doc/nsss/html
+    mv examples $doc/share/doc/nsss/examples
+  '';
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d5e65e4d4bc..fd0bf1a76da8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11311,6 +11311,8 @@ with pkgs;
 
   nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
 
+  nsss = skawarePackages.nsss;
+
   ntbtls = callPackage ../development/libraries/ntbtls { };
 
   ntk = callPackage ../development/libraries/audio/ntk { };
@@ -12017,6 +12019,9 @@ with pkgs;
     s6-networking = callPackage ../tools/networking/s6-networking { };
     s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
     s6-rc = callPackage ../tools/system/s6-rc { };
+
+    nsss = callPackage ../development/libraries/nsss { };
+
   };
 
   skydive = callPackage ../tools/networking/skydive { };

From 4616ef1f4135cb1908893362371ecbca6b067d24 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 4 Sep 2018 21:55:47 +0200
Subject: [PATCH 0384/3253] skaware: switch from git repos to tarballs

It should be more performant this way.
---
 pkgs/build-support/skaware/build-skaware-package.nix | 7 +++----
 pkgs/development/libraries/nsss/default.nix          | 2 +-
 pkgs/development/libraries/skalibs/default.nix       | 2 +-
 pkgs/os-specific/linux/s6-linux-utils/default.nix    | 2 +-
 pkgs/tools/misc/execline/default.nix                 | 2 +-
 pkgs/tools/misc/s6-portable-utils/default.nix        | 2 +-
 pkgs/tools/networking/s6-dns/default.nix             | 2 +-
 pkgs/tools/networking/s6-networking/default.nix      | 2 +-
 pkgs/tools/system/s6-rc/default.nix                  | 2 +-
 pkgs/tools/system/s6/default.nix                     | 2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 5f6951cb25fa..51921fdfbdc7 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, writeScript, file }:
+{ stdenv, fetchurl, writeScript, file }:
 let lib = stdenv.lib;
 in {
   # : string
@@ -72,9 +72,8 @@ let
 in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
-  src = fetchgit {
-    url = "git://git.skarnet.org/${pname}";
-    rev = "refs/tags/v${version}";
+  src = fetchurl {
+    url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
index bd56acb76e6c..6c4a23ccaf28 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "nsss";
   version = "0.0.1.0";
-  sha256 = "0pw7qk4j4q4sl3h01bbqcr44ppxkdvaw08xlhsnnkiv9jypfwx7w";
+  sha256 = "0f285bvpvhk40cqjpkc1jb36il0fkzzzjmc89gbbq3awl3w4r1i0";
 
   description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
 
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 98977381f0f1..0667e1265b34 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "skalibs";
   version = "2.7.0.0";
-  sha256 = "068pkbl91mi35amlhv491dwrbzyfifrlxijss0g2vf693xvx6lxm";
+  sha256 = "0mnprdf4w4ami0db22rwd111m037cdmn2p8xa4i8cbwxcrv4sjcn";
 
   description = "A set of general-purpose C programming libraries";
 
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 95dd3736c040..0d208a6eb55f 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "s6-linux-utils";
   version = "2.5.0.0";
-  sha256 = "0wbxwki2alyym6dm44s5ajp9ndw6sgrqvizkznz71c30i0dlxrnf";
+  sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq";
 
   description = "A set of minimalistic Linux-specific system utilities";
   platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 00faab0a66f8..f0dc3ab64604 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "execline";
   version = "2.5.0.1";
-  sha256 = "0d4gvixz7xja03hnwc2bf13xrgh1jq27ij4m1jlrpgrzhfpqz37q";
+  sha256 = "0j8hwdw8wn0rv8njdza8fbgmvyjg7hqp3qlbw00i7fwskr7d21wd";
 
   description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
 
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 04874dedc6e6..ae4385a0048a 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -8,7 +8,7 @@ let
 in buildPackage {
   pname = pname;
   version = "2.2.1.2";
-  sha256 = "1zfanja5mbyafmzw28dlx1bb3fixa7lidbs62sxf849ly3z0zqp2";
+  sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih";
 
   description = "A set of tiny general Unix utilities optimized for simplicity and small size";
 
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 6d514d56ed39..f422dabaff64 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "s6-dns";
   version = "2.3.0.1";
-  sha256 = "0flxkrnff2c28514k2nxv2y41k38pbiwd8dxlqaxgs2cl27i0ggb";
+  sha256 = "16ymalc4yxbwc0kapwmissxlw2bdk4sx3b33zp1gwx3n6hkcgh8c";
 
   description = "A suite of DNS client programs and libraries for Unix systems";
 
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 032287ece835..3f0e83ad9ce0 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -21,7 +21,7 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 buildPackage {
   pname = "s6-networking";
   version = "2.3.0.3";
-  sha256 = "06kv2l31ch0zw538bpivgnwymb056x5hpmqafglffgkbq3izp7wc";
+  sha256 = "1kfjl7da6wkmyq1mvq9irkbzk2wbi0axjfbcw5cym5y11mqswsjs";
 
   description = "A suite of small networking utilities for Unix systems";
 
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 3edb0c0fb608..2712186ec5d1 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "s6-rc";
   version = "0.4.1.0";
-  sha256 = "1as7jhlp4cvh1bzvcli1hk1pbdzkac8gys1h379blymfy8hmp805";
+  sha256 = "1xl37xi509pcm5chcvn8l7gb952sr5mkpxhpkbsxhsllj791bfa2";
 
   description = "A service manager for s6-based systems";
   platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index f459c6242606..031439d56d5c 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -5,7 +5,7 @@ with skawarePackages;
 buildPackage {
   pname = "s6";
   version = "2.7.2.0";
-  sha256 = "07j4is7kxkynschwbf83q5rw1872kg3ij2vhxyfp3bg71k5pw1az";
+  sha256 = "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g";
 
   description = "skarnet.org's small & secure supervision software suite";
 

From 9f0efc084c30516bba320f60e3066e1eef020c2a Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Thu, 6 Sep 2018 10:02:48 +0000
Subject: [PATCH 0385/3253] pyopenssl: Disable some tests, for libressl
 support. (#46072)

---
 .../python-modules/pyopenssl/default.nix      | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 035c70f3995a..d6b966b6df3c 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -11,6 +11,41 @@
 , glibcLocales
 }:
 
+with stdenv.lib;
+
+
+let
+  # https://github.com/pyca/pyopenssl/issues/791
+  # These tests, we disable in the case that libressl is passed in as openssl.
+  failingLibresslTests = [
+    "test_op_no_compression"
+    "test_npn_advertise_error"
+    "test_npn_select_error"
+    "test_npn_client_fail"
+    "test_npn_success"
+    "test_use_certificate_chain_file_unicode"
+    "test_use_certificate_chain_file_bytes"
+    "test_add_extra_chain_cert"
+    "test_set_session_id_fail"
+    "test_verify_with_revoked"
+    "test_set_notAfter"
+    "test_set_notBefore"
+  ];
+
+  disabledTests = [
+    # https://github.com/pyca/pyopenssl/issues/692
+    # These tests, we disable always.
+    "test_set_default_verify_paths"
+    "test_fallback_default_verify_paths"
+  ] ++ (optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests);
+
+  # Compose the final string expression, including the "-k" and the single quotes.
+  testExpression = optionalString (disabledTests != [])
+    "-k 'not ${concatStringsSep " and not " disabledTests}'";
+
+in
+
+
 buildPythonPackage rec {
   pname = "pyOpenSSL";
   version = "18.0.0";
@@ -22,16 +57,10 @@ buildPythonPackage rec {
 
   outputs = [ "out" "dev" ];
 
-  preCheck = ''
-    sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py
-    # https://github.com/pyca/pyopenssl/issues/692
-    sed -i 's/test_fallback_default_verify_paths/noop/' tests/test_ssl.py
-  '';
-
   checkPhase = ''
     runHook preCheck
     export LANG="en_US.UTF-8"
-    py.test
+    py.test tests ${testExpression}
     runHook postCheck
   '';
 
@@ -43,4 +72,4 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ cryptography pyasn1 idna ];
 
   checkInputs = [ pytest pretend flaky glibcLocales ];
-}
\ No newline at end of file
+}

From a0a71e9be623ca7069e28708955de9a552d21eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= <teo@nullable.se>
Date: Thu, 6 Sep 2018 12:32:53 +0200
Subject: [PATCH 0386/3253] kops: 1.9.0 -> 1.10.0

---
 pkgs/applications/networking/cluster/kops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 5f7a2e8e2843..6ffe40d6a3de 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.9.0";
+  version = "1.10.0";
 
   goPackagePath = "k8s.io/kops";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7";
+    sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp";
   };
 
   buildInputs = [go-bindata];

From 7c1b85cf6de1dc431e5736bff8adf01224e6abe5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Sep 2018 12:18:25 +0200
Subject: [PATCH 0387/3253] signal-desktop: 1.15.5 -> 1.16.0

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 516abb4c9c00..99cd8371aa94 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -55,11 +55,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.15.5";
+  version = "1.16.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k";
+    sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 9e25ebc03ad0e303a9e3c3b4c2f49376be75266d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 26 Jul 2018 19:40:23 +0200
Subject: [PATCH 0388/3253] nixos/iperf: Init the module

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/networking/iperf3.nix | 87 ++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 nixos/modules/services/networking/iperf3.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..0a42ecc20a2e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -518,6 +518,7 @@
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
   ./services/networking/iodine.nix
+  ./services/networking/iperf3.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/iwd.nix
   ./services/networking/keepalived/default.nix
diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix
new file mode 100644
index 000000000000..742404a5692f
--- /dev/null
+++ b/nixos/modules/services/networking/iperf3.nix
@@ -0,0 +1,87 @@
+{ config, lib, pkgs, ... }: with lib;
+let
+  cfg = config.services.iperf3;
+
+  api = {
+    enable = mkEnableOption "iperf3 network throughput testing server";
+    port = mkOption {
+      type        = types.ints.u16;
+      default     = 5201;
+      description = "Server port to listen on for iperf3 client requsts.";
+    };
+    affinity = mkOption {
+      type        = types.nullOr types.ints.unsigned;
+      default     = null;
+      description = "CPU affinity for the process.";
+    };
+    bind = mkOption {
+      type        = types.nullOr types.str;
+      default     = null;
+      description = "Bind to the specific interface associated with the given address.";
+    };
+    verbose = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = "Give more detailed output.";
+    };
+    forceFlush = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = "Force flushing output at every interval.";
+    };
+    debug = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = "Emit debugging output.";
+    };
+    rsaPrivateKey = mkOption {
+      type        = types.nullOr types.path;
+      default     = null;
+      description = "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client.";
+    };
+    authorizedUsersFile = mkOption {
+      type        = types.nullOr types.path;
+      default     = null;
+      description = "Path to the configuration file containing authorized users credentials to run iperf tests.";
+    };
+    extraFlags = mkOption {
+      type        = types.listOf types.str;
+      default     = [ ];
+      description = "Extra flags to pass to iperf3(1).";
+    };
+  };
+
+  imp = {
+    systemd.services.iperf3 = {
+      description = "iperf3 daemon";
+      unitConfig.Documentation = "man:iperf3(1) https://iperf.fr/iperf-doc.php";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        Restart = "on-failure";
+        RestartSec = 2;
+        DynamicUser = true;
+        PrivateDevices = true;
+        CapabilityBoundingSet = "";
+        NoNewPrivileges = true;
+        ExecStart = ''
+          ${pkgs.iperf3}/bin/iperf \
+            --server \
+            --port ${toString cfg.port} \
+            ${optionalString (cfg.affinity != null) "--affinity ${toString cfg.affinity}"} \
+            ${optionalString (cfg.bind != null) "--bind ${cfg.bind}"} \
+            ${optionalString (cfg.rsaPrivateKey != null) "--rsa-private-key-path ${cfg.rsaPrivateKey}"} \
+            ${optionalString (cfg.authorizedUsersFile != null) "--authorized-users-path ${cfg.authorizedUsersFile}"} \
+            ${optionalString cfg.verbose "--verbose"} \
+            ${optionalString cfg.debug "--debug"} \
+            ${optionalString cfg.forceFlush "--forceflush"} \
+            ${escapeShellArgs cfg.extraFlags}
+        '';
+      };
+    };
+  };
+in {
+  options.services.iperf3 = api;
+  config = mkIf cfg.enable imp;
+}

From 1245621497fcf4326eb758e5784a1da3b5c43351 Mon Sep 17 00:00:00 2001
From: Yannik Sander <me@ysndr.de>
Date: Thu, 6 Sep 2018 14:49:57 +0200
Subject: [PATCH 0389/3253] build with pythonPackages

---
 pkgs/applications/misc/solaar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index afe944e868e7..e26071dd3612 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,5 +1,5 @@
-{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}:
-python34Packages.buildPythonApplication rec {
+{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}:
+pythonPackages.buildPythonApplication rec {
   name = "solaar-unstable-${version}";
   version = "2018-02-02";
   namePrefix = "";
@@ -10,7 +10,7 @@ python34Packages.buildPythonApplication rec {
     sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3";
   };
 
-  propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3];
+  propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3];
   postInstall = ''
     wrapProgram "$out/bin/solaar" \
       --prefix PYTHONPATH : "$PYTHONPATH" \

From 656b59e3db7a95e9b943aedfcfce239305573705 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 6 Sep 2018 15:09:48 +0200
Subject: [PATCH 0390/3253] monkeysphere: 0.37 -> 0.41

TODO(WIP): This needs more testing and a module.
---
 pkgs/tools/security/monkeysphere/default.nix  | 15 +++--
 .../security/monkeysphere/monkeysphere.patch  | 65 +++++++------------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index d1266ca495ed..badea48cec48 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, perl, makeWrapper, perlPackages }:
+{ stdenv, fetchurl, makeWrapper
+, perl, perlPackages, libassuan, libgcrypt
+}:
 
 stdenv.mkDerivation rec {
   name = "monkeysphere-${version}";
-  version = "0.37";
+  version = "0.41";
 
   src = fetchurl {
-    url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz";
-    sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m";
+    url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
+    sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
   };
 
-  buildInputs = [ makeWrapper perl ];
+  buildInputs = [ makeWrapper perl libassuan libgcrypt ];
 
   patches = [ ./monkeysphere.patch ];
 
@@ -43,7 +45,8 @@ stdenv.mkDerivation rec {
       TLS/SSL communications through the normal use of tools you are
       familiar with, such as your web browser0 or secure shell.
     '';
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     platforms = platforms.all;
+    maintainers = with maintainers; [ primeos ];
   };
 }
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch
index 8b343b93454f..f341ee747bbc 100644
--- a/pkgs/tools/security/monkeysphere/monkeysphere.patch
+++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch
@@ -1,51 +1,34 @@
-diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile
---- monkeysphere-0.37/Makefile	2014-08-06 19:27:38.000000000 +0200
-+++ monkeysphere-0.37-patched/Makefile	2015-07-31 19:51:57.539373097 +0200
-@@ -42,11 +42,11 @@ install: all installman
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
- 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
- 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
- 	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
- 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
- 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
-@@ -59,8 +59,8 @@ install: all installman
- 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem
- 	ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki
- 	install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
--	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23
-+	sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28
- 	install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
- 	install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
- 	install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
-diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms
---- monkeysphere-0.37/src/share/checkperms	2014-08-06 19:27:38.000000000 +0200
-+++ monkeysphere-0.37-patched/src/share/checkperms	2015-07-31 19:52:18.170675985 +0200
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ clean:
+ replaced/%: %
+ 	mkdir -p $(dir $@)
+ 	sed < $< > $@ \
+-	-e 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' \
++	-e 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' \
+ 	-e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \
+ 	-e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):'
+ 
+diff --git a/src/share/checkperms b/src/share/checkperms
+--- a/src/share/checkperms
++++ b/src/share/checkperms
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -T
 +#!/usr/bin/perl
  
  # checkperms: ensure as best we can that a given file can only be
  # modified by the given user (or the superuser, naturally).  This
-diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans
---- monkeysphere-0.37/src/share/keytrans	2014-08-06 19:27:38.000000000 +0200
-+++ monkeysphere-0.37-patched/src/share/keytrans	2015-07-31 20:13:36.664514290 +0200
+diff --git a/src/share/keytrans b/src/share/keytrans
+--- a/src/share/keytrans
++++ b/src/share/keytrans
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -T
 +#!/usr/bin/perl
  
  # keytrans: this is an RSA key translation utility; it is capable of
  # transforming RSA keys (both public keys and secret keys) between
-@@ -1069,7 +1069,7 @@ sub packetwalk {
+@@ -1083,7 +1083,7 @@ sub packetwalk {
  
  
  for (basename($0)) {
@@ -54,7 +37,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
      my $rsa;
      my $stdin;
  
-@@ -1107,7 +1107,7 @@ for (basename($0)) {
+@@ -1121,7 +1121,7 @@ for (basename($0)) {
  		      }
  		     );
    }
@@ -63,7 +46,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
        my $fpr = shift;
        my $instream;
        open($instream,'-');
-@@ -1123,7 +1123,7 @@ for (basename($0)) {
+@@ -1137,7 +1137,7 @@ for (basename($0)) {
  	die "No matching key found.\n";
        }
    }
@@ -72,7 +55,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
        my $fpr = shift;
        my $instream;
        open($instream,'-');
-@@ -1139,7 +1139,7 @@ for (basename($0)) {
+@@ -1153,7 +1153,7 @@ for (basename($0)) {
  	die "No matching key found.\n";
        }
    }
@@ -81,7 +64,7 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
        my $fpr = shift;
        my $instream;
        open($instream,'-');
-@@ -1151,7 +1151,7 @@ for (basename($0)) {
+@@ -1165,7 +1165,7 @@ for (basename($0)) {
  	die "No matching key found.\n";
        }
    }
@@ -90,3 +73,5 @@ diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/sh
      # subcommands when keytrans is invoked directly are UNSUPPORTED,
      # UNDOCUMENTED, and WILL NOT BE MAINTAINED.
      my $subcommand = shift;
+-- 
+2.16.3

From 037813906d09062d2b7330893bfb36ce412e8889 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 10 Aug 2018 15:15:22 +0800
Subject: [PATCH 0391/3253] wp-cli: use 1 store path instead of 4

---
 pkgs/development/tools/wp-cli/default.nix | 56 ++++++++++++-----------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 2f5552945714..780accd76bfd 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,42 +1,46 @@
 { stdenv, lib, fetchurl, writeScript, writeText, php }:
 
 let
-  name = "wp-cli-${version}";
   version = "2.0.0";
 
-  src = fetchurl {
-    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp";
-  };
-
   completion = fetchurl {
     url    = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
     sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
   };
 
-  bin = writeScript "wp" ''
-    #! ${stdenv.shell}
-
-    set -euo pipefail
-
-    exec ${lib.getBin php}/bin/php \
-      -c ${ini} \
-      -f ${src} -- "$@"
-  '';
-
-  ini = writeText "wp-cli.ini" ''
-    [PHP]
-    memory_limit = -1 ; no limit as composer uses a lot of memory
-
-    [Phar]
-    phar.readonly = Off
-  '';
-
 in stdenv.mkDerivation rec {
-  inherit name version;
+  name = "wp-cli-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
+    sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp";
+  };
 
   buildCommand = ''
-    install -Dm755 ${bin}        $out/bin/wp
+    dir=$out/share/wp-cli
+    mkdir -p $out/bin $dir
+
+    cat <<_EOF > $out/bin/wp
+#!${stdenv.shell}
+
+set -euo pipefail
+
+exec ${lib.getBin php}/bin/php \\
+  -c $dir/php.ini \\
+  -f $dir/wp-cli -- "\$@"
+_EOF
+    chmod 0755 $out/bin/wp
+
+    cat <<_EOF > $dir/php.ini
+[PHP]
+memory_limit = -1 ; no limit as composer uses a lot of memory
+
+[Phar]
+phar.readonly = Off
+_EOF
+
+    install -Dm644 ${src}        $dir/wp-cli
     install -Dm644 ${completion} $out/share/bash-completion/completions/wp
 
     # this is a very basic run test

From a278414b32ad99bf11ce63c2ef0c970920bf761d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 6 Sep 2018 21:35:56 +0800
Subject: [PATCH 0392/3253] wp-cli: 2.0.0 -> 2.0.1

---
 pkgs/development/tools/wp-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index 780accd76bfd..e2250297c8eb 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, writeScript, writeText, php }:
 
 let
-  version = "2.0.0";
+  version = "2.0.1";
 
   completion = fetchurl {
     url    = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp";
+    sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg";
   };
 
   buildCommand = ''

From f66257cfcea37acd0d24b99b74694898f3493fd5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 6 Sep 2018 09:21:38 -0400
Subject: [PATCH 0393/3253] doc: Add release notes for top-level
 {build,host,target}Platform deprecation

I forgot to do this in e51f736076548459f36a1250de4bf6867f880b66.
---
 nixos/doc/manual/release-notes/rl-1809.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 63775d503c98..9ec465d8955e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -544,6 +544,13 @@ inherit (pkgs.nixos {
       a new paragraph.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated.
+      Please use their equivalents in <literal>stdenv</literal> instead:
+      <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
+    </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>

From 6ea0c3e2714d79df33a5fa9bfd7d5259e4475b4d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Sep 2018 17:16:34 +0300
Subject: [PATCH 0394/3253] matrix-synapse: 0.33.3 -> 0.33.3.1

---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 74cd233710cd..2aea521611c4 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in python2Packages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.33.3";
+  version = "0.33.3.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0yxxrs8yrrkp3pffdfab8apdmyhdcl90wgmglryy4q8vsksxn7d4";
+    sha256 = "0q7rjh2qwj1ym5alnv9dvgw07bm7kk7igfai9ix72c6n7qb4z4i3";
   };
 
   patches = [

From 5b58c6ac7648bc6a216e5bebd394680227de1e85 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@icloud.com>
Date: Thu, 6 Sep 2018 16:10:21 +0200
Subject: [PATCH 0395/3253] gildas: add alternative url for the source code
 (#46145)

For each new release, the upstream developers of Gildas move the
source code of the previous release to a different directory. Add this
directory to the list of url to avoid build failure at each new
release.
---
 pkgs/applications/science/astronomy/gildas/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index d74eee4190df..82575d9c6ff0 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   name = "gildas-${version}";
 
   src = fetchurl {
-    url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
+    # For each new release, the upstream developers of Gildas move the
+    # source code of the previous release to a different directory
+    urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
+      "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
     sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
   };
 

From 32a2d08b232fb132189ffc90806ad3270612493a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Thu, 6 Sep 2018 12:46:38 +0200
Subject: [PATCH 0396/3253] nixos/nullidentdmod: Init

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/networking/nullidentdmod.nix     | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 nixos/modules/services/networking/nullidentdmod.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..f50abe1d766f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -552,6 +552,7 @@
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
+  ./services/networking/nullidentdmod.nix
   ./services/networking/nylon.nix
   ./services/networking/ocserv.nix
   ./services/networking/oidentd.nix
diff --git a/nixos/modules/services/networking/nullidentdmod.nix b/nixos/modules/services/networking/nullidentdmod.nix
new file mode 100644
index 000000000000..786b5227dbad
--- /dev/null
+++ b/nixos/modules/services/networking/nullidentdmod.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }: with lib; let
+  cfg = config.services.nullidentdmod;
+
+in {
+  options.services.nullidentdmod = with types; {
+    enable = mkEnableOption "Enable the nullidentdmod identd daemon";
+
+    userid = mkOption {
+      type = nullOr str;
+      description = "User ID to return. Set to null to return a random string each time.";
+      default = null;
+      example = "alice";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.sockets.nullidentdmod = {
+      description = "Socket for identd (NullidentdMod)";
+      listenStreams = [ "113" ];
+      socketConfig.Accept = true;
+      wantedBy = [ "sockets.target" ];
+    };
+
+    systemd.services."nullidentdmod@" = {
+      description = "NullidentdMod service";
+      serviceConfig = {
+        DynamicUser = true;
+        ExecStart = "${pkgs.nullidentdmod}/bin/nullidentdmod${optionalString (cfg.userid != null) " ${cfg.userid}"}";
+        StandardInput = "socket";
+        StandardOutput = "socket";
+      };
+    };
+  };
+}

From f3bc6aec00cc5c7ce5dcd2afa1bd7eee897dac06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 07:38:41 -0700
Subject: [PATCH 0397/3253] xcbutilxrm: 1.2 -> 1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
xcb-util-xrm
---
 pkgs/servers/x11/xorg/xcb-util-xrm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index 5a315b99b08b..0a008227b9fb 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2";
+  version = "1.3";
   name = "xcb-util-xrm-${version}";
 
   src = fetchurl {
     url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp";
+    sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h";
   };
 
   nativeBuildInputs = [ pkgconfig m4 ];

From 4a4fab3855a0e146db25253188727369ec373b75 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 5 Sep 2018 11:15:13 +0300
Subject: [PATCH 0398/3253] parity-beta: 2.0.1 -> 2.0.3

---
 pkgs/applications/altcoins/parity/beta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index fe58579e6b57..fc772246cfc1 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "2.0.1";
-  sha256      = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs";
-  cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9";
+  version     = "2.0.3";
+  sha256      = "1yf3ln4ksk8613kqkpsh16cj8xwx761q6czy57rs8kfh7pgc2pzb";
+  cargoSha256 = "1jayk4ngwbg0rv7x1slkl2z46czgy2hnfcxc0dhaz4xpbp2bjqq8";
   patches     = [ ./patches/vendored-sources-2.0.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 5dff1d0ca4cb9f1dc1a32d4ccee20ef42a7081c1 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 6 Sep 2018 18:26:22 +0300
Subject: [PATCH 0399/3253] parity: 1.11.8 -> 1.11.10

---
 pkgs/applications/altcoins/parity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 993bc3615aa8..234364e73364 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,6 +1,6 @@
 let
-  version     = "1.11.8";
-  sha256      = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19";
+  version     = "1.11.10";
+  sha256      = "15sk6dvc8h1bdm6v7xlq517km0bakb9f13h1n7ixj311vahnmk15";
   cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8";
   patches     = [ ./patches/vendored-sources-1.11.patch ];
 in

From c1219b6892765b4dd5f2e2196a925f40e85f8b2a Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 4 Sep 2018 03:06:48 -0400
Subject: [PATCH 0400/3253] gambit: 4.8.9 -> 4.9.0

---
 pkgs/development/compilers/gambit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 36aa73f7274b..812b83389601 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, callPackage, fetchurl }:
 
 callPackage ./build.nix {
-  version = "4.8.9";
+  version = "4.9.0";
 
   SRC = fetchurl {
-    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
-    sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
+    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_0-devel.tgz";
+    sha256 = "0wyfpjs244zrbrdil9rfkdgcawvms84z0r77qwhwadghma4dqgjf";
   };
   inherit stdenv;
 }

From ccbb218866fbe4798f065e0ccfecefaa29dc76d7 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Thu, 6 Sep 2018 11:42:16 -0400
Subject: [PATCH 0401/3253] gerbil: 0.12-RELEASE -> 0.13

---
 pkgs/development/compilers/gerbil/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 6fa9fcc3de88..e0f4ca4324f0 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, callPackage, fetchurl, gambit }:
 
 callPackage ./build.nix {
-  version = "0.12-RELEASE";
-  git-version = "0.12";
+  version = "0.13";
+  git-version = "0.13";
   GAMBIT = gambit;
   SRC = fetchurl {
-    url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz";
-    sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq";
+    url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz";
+    sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l";
   };
   inherit stdenv;
 }

From 7306e54c2ca1c8c2c5582efe413b7249718d7eb2 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 4 Sep 2018 03:07:54 -0400
Subject: [PATCH 0402/3253] gambit-unstable: 2018-08-06 -> 2018-09-03

---
 pkgs/development/compilers/gambit/unstable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 41d0ee930bf0..067a409ac1c3 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,12 +1,12 @@
 { stdenv, callPackage, fetchgit }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-08-06";
-# git-version = "4.8.9-77-g91a4ad2c";
+  version = "unstable-2018-09-03";
+# git-version = "4.9.0";
   SRC = fetchgit {
     url = "https://github.com/feeley/gambit.git";
-    rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f";
-    sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p";
+    rev = "7cdc7e7b9194b2c088c0667efaf7686a4ffd0d8a";
+    sha256 = "06mmi8jkinihfirz4gjfw2lhxhskiqf3d47sihzx10r60asyqcxg";
   };
   inherit stdenv;
 }

From 6c64d944909787337b2db59d5bed3a89f3909a25 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 4 Sep 2018 03:08:34 -0400
Subject: [PATCH 0403/3253] gerbil-unstable: 2018-08-11 -> 2018-09-06

---
 pkgs/development/compilers/gerbil/unstable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index 66ead04b5429..bd9c3994dd49 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,13 +1,13 @@
 { stdenv, callPackage, fetchgit, gambit-unstable }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-08-11";
-  git-version = "0.13-DEV-542-g274e1a22";
+  version = "unstable-2018-09-06";
+  git-version = "0.14-DEV";
   GAMBIT = gambit-unstable;
   SRC = fetchgit {
     url = "https://github.com/vyzo/gerbil.git";
-    rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686";
-    sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s";
+    rev = "184cb635c82517d5d75d7966dcdf1d25ad863dac";
+    sha256 = "1ljzbpc36i9zpzfwra5hpfbgzj1dyzzp50h5jf976n8qr9x4l7an";
   };
   inherit stdenv;
 }

From fc2c606a7ac8fb48be4181f777d029bd75c0c58a Mon Sep 17 00:00:00 2001
From: Paul TREHIOU <nyanloutre@users.noreply.github.com>
Date: Thu, 6 Sep 2018 18:02:33 +0200
Subject: [PATCH 0404/3253] jackett: 0.9.41 -> 0.10.160 (#46114)

* jackett: update mono to 5.8

Jackett needs mono version >= 5.8

https://github.com/Jackett/Jackett/blob/master/README.md#supported-systems

* jackett: 0.9.41 -> 0.10.160
---
 pkgs/servers/jackett/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 774f8df94a7d..49f7b59ddc6f 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.9.41";
+  version = "0.10.160";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0ndzn1p876rkj56g6vscgkmyzi1k0gmqby4rmrb4ilxzjpskii8m";
+    sha256 = "1msy11s89r63vcan6d8mjn2jic1zwvl2j852mjj06bfb3yldx6vq";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd0bf1a76da8..3d0e6ae15da8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3356,7 +3356,7 @@ with pkgs;
   jaaa = callPackage ../applications/audio/jaaa { };
 
   jackett = callPackage ../servers/jackett {
-    mono = mono50;
+    mono = mono5;
   };
 
   jade = callPackage ../tools/text/sgml/jade { };

From 0e2aa97f3aa1341693885511fd78394b828c6477 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 26 Jul 2018 20:45:55 +0200
Subject: [PATCH 0405/3253] lib/trivial: add assertMsg

---
 lib/default.nix |  3 ++-
 lib/trivial.nix | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/default.nix b/lib/default.nix
index dd6fcec75e21..fd3be3c6f4bc 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -59,7 +59,8 @@ let
     inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot
       boolToString mergeAttrs flip mapNullable inNixShell min max
       importJSON warn info nixpkgsVersion version mod compare
-      splitByAndCompare functionArgs setFunctionArgs isFunction;
+      splitByAndCompare functionArgs setFunctionArgs isFunction
+      assertMsg;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index e702b8cdcc9f..bba284548d98 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -188,6 +188,26 @@ rec {
   warn = msg: builtins.trace "WARNING: ${msg}";
   info = msg: builtins.trace "INFO: ${msg}";
 
+  /* Print a trace message if pred is false.
+     Intended to be used to augment asserts with helpful error messages.
+
+     Example:
+       assertMsg false "nope"
+       => false
+       stderr> trace: nope
+
+       assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
+       stderr> trace: foo is not bar, silly
+       stderr> assert failed at …
+
+     Type:
+       assertMsg :: Bool -> String -> Bool
+  */
+  assertMsg = pred: msg:
+    if pred
+    then true
+    else builtins.trace msg false;
+
 
   ## Function annotations
 

From 320cdecd1697020cb367adc1f8408dbf689ca254 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 6 Aug 2018 01:35:48 +0200
Subject: [PATCH 0406/3253] lib/trivial: add assertOneOf

---
 lib/default.nix |  2 +-
 lib/trivial.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/default.nix b/lib/default.nix
index fd3be3c6f4bc..358c8ca0b8f9 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -60,7 +60,7 @@ let
       boolToString mergeAttrs flip mapNullable inNixShell min max
       importJSON warn info nixpkgsVersion version mod compare
       splitByAndCompare functionArgs setFunctionArgs isFunction
-      assertMsg;
+      assertMsg assertOneOf;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index bba284548d98..f1001ee10ca3 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -203,11 +203,29 @@ rec {
      Type:
        assertMsg :: Bool -> String -> Bool
   */
+  # TODO(Profpatsch): add tests that check stderr
   assertMsg = pred: msg:
     if pred
     then true
     else builtins.trace msg false;
 
+  /* Specialized `assertMsg` for checking if val is one of the elements
+     of a list. Useful for checking enums.
+
+     Example:
+       let sslLibrary = "libressl"
+       in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
+       => false
+       stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
+
+     Type:
+       assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
+  */
+  assertOneOf = name: val: xs: assertMsg
+    (lib.elem val xs)
+    "${name} must be one of ${
+      lib.generators.toPretty {} xs}, but is: ${
+        lib.generators.toPretty {} val}";
 
   ## Function annotations
 

From 3e45b61a9920466a8ea06b8ad9350d56ade435bc Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 6 Aug 2018 01:36:09 +0200
Subject: [PATCH 0407/3253] lib/trivial: add a few examples of usage of
 assertMsg/assertOneOf

---
 lib/lists.nix                                     | 7 +++++--
 lib/strings.nix                                   | 7 +++++--
 lib/types.nix                                     | 8 ++++++--
 pkgs/applications/misc/lilyterm/default.nix       | 5 ++---
 pkgs/applications/science/math/ripser/default.nix | 3 ++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 288882924fff..9a75f179e964 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -509,7 +509,8 @@ rec {
        => 3
   */
   last = list:
-    assert list != []; elemAt list (length list - 1);
+    assert assertMsg (list != []) "lists.last: list must not be empty!";
+    elemAt list (length list - 1);
 
   /* Return all elements but the last
 
@@ -517,7 +518,9 @@ rec {
        init [ 1 2 3 ]
        => [ 1 2 ]
   */
-  init = list: assert list != []; take (length list - 1) list;
+  init = list:
+    assert assertMsg (list != []) "lists.init: list must not be empty!";
+    take (length list - 1) list;
 
 
   /* return the image of the cross product of some lists by a function
diff --git a/lib/strings.nix b/lib/strings.nix
index 833f69d2fbfe..0c4095bb55cd 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -410,7 +410,7 @@ rec {
       components = splitString "/" url;
       filename = lib.last components;
       name = builtins.head (splitString sep filename);
-    in assert name !=  filename; name;
+    in assert name != filename; name;
 
   /* Create an --{enable,disable}-<feat> string that can be passed to
      standard GNU Autoconf scripts.
@@ -468,7 +468,10 @@ rec {
       strw = lib.stringLength str;
       reqWidth = width - (lib.stringLength filler);
     in
-      assert strw <= width;
+      assert lib.assertMsg (strw <= width)
+        "fixedWidthString: requested string length (${
+          toString width}) must not be shorter than actual length (${
+            toString strw})";
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
   /* Format a number adding leading zeroes up to fixed width.
diff --git a/lib/types.nix b/lib/types.nix
index 4d6ac51c8988..441af98cb9b6 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -119,7 +119,9 @@ rec {
       let
         betweenDesc = lowest: highest:
           "${toString lowest} and ${toString highest} (both inclusive)";
-        between = lowest: highest: assert lowest <= highest;
+        between = lowest: highest:
+          assert lib.assertMsg (lowest <= highest)
+            "ints.between: lowest must be smaller than highest";
           addCheck int (x: x >= lowest && x <= highest) // {
             name = "intBetween";
             description = "integer between ${betweenDesc lowest highest}";
@@ -439,7 +441,9 @@ rec {
     # Either value of type `finalType` or `coercedType`, the latter is
     # converted to `finalType` using `coerceFunc`.
     coercedTo = coercedType: coerceFunc: finalType:
-      assert coercedType.getSubModules == null;
+      assert assertMsg (coercedType.getSubModules == null)
+        "coercedTo: coercedType must not have submodules (it’s a ${
+          coercedType.description})";
       mkOptionType rec {
         name = "coercedTo";
         description = "${finalType.description} or ${coercedType.description} convertible to it";
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 72cb1e85802a..948ae7b14a11 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, lib, fetchurl, fetchFromGitHub
 , pkgconfig
 , autoconf, automake, intltool, gettext
 , gtk, vte
 
-# "stable" or "git"
 , flavour ? "stable"
 }:
 
-assert flavour == "stable" || flavour == "git";
+assert lib.assertOneOf "flavour" flavour [ "stable"  "git" ];
 
 let
   stuff =
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index 21948a279d07..5e0b7fc300ba 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -8,7 +8,8 @@
 
 with stdenv.lib;
 
-assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
+assert assertOneOf "fileFormat" fileFormat
+  ["lowerTriangularCsv" "upperTriangularCsv" "dipha"];
 assert useGoogleHashmap -> sparsehash != null;
 
 let

From efdf618330a22f837f0e5e446028e918a5b4dd8a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 8 Aug 2018 19:26:52 +0200
Subject: [PATCH 0408/3253] lib: move assertMsg and assertOneOf to their own
 library file

Since the `assertOneOf` uses `lib.generators`, they are not really trivial
anymore and should go into their own library file.
---
 lib/asserts.nix | 44 ++++++++++++++++++++++++++++++++++++++++++++
 lib/default.nix |  9 +++++----
 lib/lists.nix   |  4 ++--
 lib/trivial.nix | 40 +---------------------------------------
 lib/types.nix   |  2 +-
 5 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 lib/asserts.nix

diff --git a/lib/asserts.nix b/lib/asserts.nix
new file mode 100644
index 000000000000..8a5f1fb3feb7
--- /dev/null
+++ b/lib/asserts.nix
@@ -0,0 +1,44 @@
+{ lib }:
+
+rec {
+
+  /* Print a trace message if pred is false.
+     Intended to be used to augment asserts with helpful error messages.
+
+     Example:
+       assertMsg false "nope"
+       => false
+       stderr> trace: nope
+
+       assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
+       stderr> trace: foo is not bar, silly
+       stderr> assert failed at …
+
+     Type:
+       assertMsg :: Bool -> String -> Bool
+  */
+  # TODO(Profpatsch): add tests that check stderr
+  assertMsg = pred: msg:
+    if pred
+    then true
+    else builtins.trace msg false;
+
+  /* Specialized `assertMsg` for checking if val is one of the elements
+     of a list. Useful for checking enums.
+
+     Example:
+       let sslLibrary = "libressl"
+       in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
+       => false
+       stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
+
+     Type:
+       assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
+  */
+  assertOneOf = name: val: xs: assertMsg
+    (lib.elem val xs)
+    "${name} must be one of ${
+      lib.generators.toPretty {} xs}, but is: ${
+        lib.generators.toPretty {} val}";
+
+}
diff --git a/lib/default.nix b/lib/default.nix
index 358c8ca0b8f9..d7a05fec8338 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -38,10 +38,11 @@ let
     systems = callLibs ./systems;
 
     # misc
+    asserts = callLibs ./asserts.nix;
     debug = callLibs ./debug.nix;
-
     generators = callLibs ./generators.nix;
     misc = callLibs ./deprecated.nix;
+
     # domain-specific
     fetchers = callLibs ./fetchers.nix;
 
@@ -59,9 +60,7 @@ let
     inherit (trivial) id const concat or and bitAnd bitOr bitXor bitNot
       boolToString mergeAttrs flip mapNullable inNixShell min max
       importJSON warn info nixpkgsVersion version mod compare
-      splitByAndCompare functionArgs setFunctionArgs isFunction
-      assertMsg assertOneOf;
-
+      splitByAndCompare functionArgs setFunctionArgs isFunction;
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
     inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
@@ -118,6 +117,8 @@ let
       unknownModule mkOption;
     inherit (types) isType setType defaultTypeMerge defaultFunctor
       isOptionType mkOptionType;
+    inherit (asserts)
+      assertMsg assertOneOf;
     inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
       traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
diff --git a/lib/lists.nix b/lib/lists.nix
index 9a75f179e964..9ecd8f220038 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -509,7 +509,7 @@ rec {
        => 3
   */
   last = list:
-    assert assertMsg (list != []) "lists.last: list must not be empty!";
+    assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
     elemAt list (length list - 1);
 
   /* Return all elements but the last
@@ -519,7 +519,7 @@ rec {
        => [ 1 2 ]
   */
   init = list:
-    assert assertMsg (list != []) "lists.init: list must not be empty!";
+    assert lib.assertMsg (list != []) "lists.init: list must not be empty!";
     take (length list - 1) list;
 
 
diff --git a/lib/trivial.nix b/lib/trivial.nix
index f1001ee10ca3..b1eea0bf1247 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -171,7 +171,7 @@ rec {
     builtins.fromJSON (builtins.readFile path);
 
 
-  ## Warnings and asserts
+  ## Warnings
 
   /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
      to expand to Nix builtins that carry metadata so that Nix can filter out
@@ -188,44 +188,6 @@ rec {
   warn = msg: builtins.trace "WARNING: ${msg}";
   info = msg: builtins.trace "INFO: ${msg}";
 
-  /* Print a trace message if pred is false.
-     Intended to be used to augment asserts with helpful error messages.
-
-     Example:
-       assertMsg false "nope"
-       => false
-       stderr> trace: nope
-
-       assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
-       stderr> trace: foo is not bar, silly
-       stderr> assert failed at …
-
-     Type:
-       assertMsg :: Bool -> String -> Bool
-  */
-  # TODO(Profpatsch): add tests that check stderr
-  assertMsg = pred: msg:
-    if pred
-    then true
-    else builtins.trace msg false;
-
-  /* Specialized `assertMsg` for checking if val is one of the elements
-     of a list. Useful for checking enums.
-
-     Example:
-       let sslLibrary = "libressl"
-       in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
-       => false
-       stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
-
-     Type:
-       assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
-  */
-  assertOneOf = name: val: xs: assertMsg
-    (lib.elem val xs)
-    "${name} must be one of ${
-      lib.generators.toPretty {} xs}, but is: ${
-        lib.generators.toPretty {} val}";
 
   ## Function annotations
 
diff --git a/lib/types.nix b/lib/types.nix
index 441af98cb9b6..4e44e7521c4b 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -441,7 +441,7 @@ rec {
     # Either value of type `finalType` or `coercedType`, the latter is
     # converted to `finalType` using `coerceFunc`.
     coercedTo = coercedType: coerceFunc: finalType:
-      assert assertMsg (coercedType.getSubModules == null)
+      assert lib.assertMsg (coercedType.getSubModules == null)
         "coercedTo: coercedType must not have submodules (it’s a ${
           coercedType.description})";
       mkOptionType rec {

From 13050ccc0b315082ea20bc418448204b071bb9c8 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 6 Sep 2018 01:33:10 +0900
Subject: [PATCH 0409/3253] python3Packages.genanki: init at 0.6.0

Library to generate anki flashcards.
---
 .../python-modules/genanki/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/genanki/default.nix

diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix
new file mode 100644
index 000000000000..bcc462e7237d
--- /dev/null
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner
+}:
+
+buildPythonPackage rec {
+  pname = "genanki";
+  version = "0.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74";
+  };
+
+  propagatedBuildInputs = [
+		pytestrunner
+    cached-property
+    frozendict
+    pystache
+    pyyaml
+  ];
+
+  checkInputs = [ pytest ];
+
+  disabled = !isPy3k;
+
+  # relies on upstream anki
+	doCheck = false;
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/kerrickstaley/genanki;
+    description = "Generate Anki decks programmatically";
+    license = licenses.mit;
+    maintainers = with maintainers; [ teto ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 137463b74db6..dcb9961c01fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -298,6 +298,8 @@ in {
 
   fire = callPackage ../development/python-modules/fire { };
 
+  genanki = callPackage ../development/python-modules/genanki { };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };

From 1d6fd659570082ef852407f08d0f78ada8209da8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 6 Sep 2018 12:13:27 -0400
Subject: [PATCH 0410/3253] pythonPackages.geopandas: 0.3.0 -> 0.4.0

Additionally fix issue with tests failing for 18.09 release.

Tests required url fetch. Disabled with "not web".
---
 pkgs/development/python-modules/geopandas/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index cab25a60f3b4..976df0952615 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,23 +1,23 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
 , pandas, shapely, fiona, descartes, pyproj
-, pytest }:
+, pytest, Rtree }:
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.3.0";
+  version = "0.4.0";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "0maafafr7sjjmlg2f19bizg06c8a5z5igmbcgq6kgmi7rklx8xxz";
+    sha256 = "025zpgck5pnmidvzk0805pr345rd7k6z66qb2m34gjh1814xjkhv";
   };
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest Rtree ];
 
   checkPhase = ''
-    py.test geopandas
+    py.test geopandas -m "not web"
   '';
 
   propagatedBuildInputs = [

From 3fc7c5b5913e254615698e5bfe7e4084b816f435 Mon Sep 17 00:00:00 2001
From: xplat <james@place.org>
Date: Thu, 6 Sep 2018 13:18:34 -0400
Subject: [PATCH 0411/3253] opam: 1.2.2 -> 2.0.0 (#45806)

---
 pkgs/development/tools/ocaml/opam/1.2.2.nix   |  92 +++++++++++++
 pkgs/development/tools/ocaml/opam/default.nix | 106 ++++++++------
 .../tools/ocaml/opam/opam-mccs-darwin.patch   |  18 +++
 .../tools/ocaml/opam/opam-pull-3487.patch     |  23 ++++
 .../tools/ocaml/opam/opam-shebangs.patch      | 128 +++++++++++++++++
 pkgs/development/tools/ocaml/opam/opam.nix.pl | 130 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +-
 7 files changed, 457 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/opam/1.2.2.nix
 create mode 100644 pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch
 create mode 100644 pkgs/development/tools/ocaml/opam/opam-pull-3487.patch
 create mode 100644 pkgs/development/tools/ocaml/opam/opam-shebangs.patch
 create mode 100755 pkgs/development/tools/ocaml/opam/opam.nix.pl

diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix
new file mode 100644
index 000000000000..7e84719ae47d
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix
@@ -0,0 +1,92 @@
+{ stdenv, lib, fetchurl, makeWrapper,
+  ocaml, unzip, ncurses, curl, aspcud
+}:
+
+assert lib.versionAtLeast ocaml.version "3.12.1";
+
+let
+  srcs = {
+    cudf = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz";
+      sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701";
+    };
+    extlib = fetchurl {
+      url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
+      sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
+    };
+    ocaml_re = fetchurl {
+      url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
+      sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
+    };
+    ocamlgraph = fetchurl {
+      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz";
+      sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f";
+    };
+    dose3 = fetchurl {
+      url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz";
+      sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e";
+    };
+    cmdliner = fetchurl {
+      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz";
+      sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a";
+    };
+    uutf = fetchurl {
+      url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz";
+      sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877";
+    };
+    jsonm = fetchurl {
+      url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz";
+      sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
+    };
+    opam = fetchurl {
+      url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
+      sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
+    };
+  };
+in stdenv.mkDerivation rec {
+  name = "opam-${version}";
+  version = "1.2.2";
+
+  buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
+
+  src = srcs.opam;
+
+  postUnpack = ''
+    ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
+    ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
+    ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
+    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
+    ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
+    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
+    ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name}
+    ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name}
+  '';
+
+  preConfigure = ''
+    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+  '';
+
+  postConfigure = "make lib-ext";
+
+  # Dirty, but apparently ocp-build requires a TERM
+  makeFlags = ["TERM=screen"];
+
+  # change argv0 to "opam" as a workaround for
+  # https://github.com/ocaml/opam/issues/2142
+  postInstall = ''
+    mv $out/bin/opam $out/bin/.opam-wrapped
+    makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
+      --argv0 "opam" \
+      --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A package manager for OCaml";
+    homepage = http://opam.ocamlpro.com/;
+    maintainers = [ maintainers.henrytill ];
+    platforms = platforms.all;
+    license = licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 7e84719ae47d..8e89dd3fadd2 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -1,69 +1,87 @@
-{ stdenv, lib, fetchurl, makeWrapper,
-  ocaml, unzip, ncurses, curl, aspcud
+{ stdenv, lib, fetchurl, makeWrapper, getconf,
+  ocaml, unzip, ncurses, curl, aspcud, bubblewrap
 }:
 
-assert lib.versionAtLeast ocaml.version "3.12.1";
+assert lib.versionAtLeast ocaml.version "4.02.3";
 
 let
   srcs = {
+    cmdliner = fetchurl {
+      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz";
+      sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1";
+    };
+    cppo = fetchurl {
+      url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz";
+      sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7";
+    };
     cudf = fetchurl {
-      url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz";
-      sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701";
-    };
-    extlib = fetchurl {
-      url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz";
-      sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021";
-    };
-    ocaml_re = fetchurl {
-      url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz";
-      sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f";
-    };
-    ocamlgraph = fetchurl {
-      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz";
-      sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f";
+      url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz";
+      sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr";
     };
     dose3 = fetchurl {
-      url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz";
-      sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e";
+      url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz";
+      sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm";
     };
-    cmdliner = fetchurl {
-      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz";
-      sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a";
+    extlib = fetchurl {
+      url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz";
+      sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
     };
-    uutf = fetchurl {
-      url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz";
-      sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877";
+    jbuilder = fetchurl {
+      url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz";
+      sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10";
     };
-    jsonm = fetchurl {
-      url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz";
-      sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73";
+    mccs = fetchurl {
+      url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz";
+      sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4";
+    };
+    ocamlgraph = fetchurl {
+      url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
+      sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr";
+    };
+    opam-file-format = fetchurl {
+      url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz";
+      sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb";
+    };
+    re = fetchurl {
+      url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz";
+      sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr";
+    };
+    result = fetchurl {
+      url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz";
+      sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk";
     };
     opam = fetchurl {
-      url = "https://github.com/ocaml/opam/archive/1.2.2.zip";
-      sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e";
+      url = "https://github.com/ocaml/opam/archive/2.0.0.zip";
+      sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8";
     };
   };
 in stdenv.mkDerivation rec {
   name = "opam-${version}";
-  version = "1.2.2";
+  version = "2.0.0";
 
-  buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
+  buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
 
   src = srcs.opam;
 
   postUnpack = ''
-    ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name}
-    ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name}
-    ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name}
-    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name}
-    ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name}
-    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name}
-    ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name}
-    ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name}
+    ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz
+    ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz
+    ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz
+    ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz
+    ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz
+    ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz
+    ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz
+    ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz
+    ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz
+    ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz
+    ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz
   '';
 
+  patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ];
+
   preConfigure = ''
     substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+    patchShebangs src/state/shellscripts
   '';
 
   postConfigure = "make lib-ext";
@@ -71,13 +89,17 @@ in stdenv.mkDerivation rec {
   # Dirty, but apparently ocp-build requires a TERM
   makeFlags = ["TERM=screen"];
 
+  outputs = [ "out" "installer" ];
+  setOutputFlags = false;
+
   # change argv0 to "opam" as a workaround for
   # https://github.com/ocaml/opam/issues/2142
   postInstall = ''
     mv $out/bin/opam $out/bin/.opam-wrapped
     makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
       --argv0 "opam" \
-      --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
+      --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin
+    $out/bin/opam-installer --prefix=$installer opam-installer.install
   '';
 
   doCheck = false;
@@ -87,6 +109,6 @@ in stdenv.mkDerivation rec {
     homepage = http://opam.ocamlpro.com/;
     maintainers = [ maintainers.henrytill ];
     platforms = platforms.all;
-    license = licenses.lgpl21Plus;
   };
 }
+# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch
diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch
new file mode 100644
index 000000000000..501242c40a01
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch
@@ -0,0 +1,18 @@
+diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch
+new file mode 100644
+index 00000000..157e2094
+--- /dev/null
++++ b/src_ext/patches/mccs/build-on-darwin.patch
+@@ -0,0 +1,12 @@
++diff --git a/src/context_flags.ml b/src/context_flags.ml
++index 7470030..6e07370 100644
++--- a/src/context_flags.ml
+++++ b/src/context_flags.ml
++@@ -24,6 +24,7 @@ let ifc c x = if c then x else []
++ 
++ let cxxflags =
++   let flags =
+++    (ifc (Config.system = "macosx") ["-x"; "c++"]) @
++     (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @
++     (ifc useGLPK ["-DUSEGLPK"]) @
++     (ifc useCOIN ["-DUSECOIN"]) @
diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch
new file mode 100644
index 000000000000..e047c8298bc3
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch
@@ -0,0 +1,23 @@
+diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
+index 6f5d7dbea..3e1a3e1b4 100755
+--- a/src/state/shellscripts/bwrap.sh
++++ b/src/state/shellscripts/bwrap.sh
+@@ -1,4 +1,6 @@
+-#!/bin/bash -ue
++#!/usr/bin/env bash
++
++set -ue
+ 
+ if ! command -v bwrap >/dev/null; then
+     echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2
+@@ -11,7 +13,9 @@ fi
+ 
+ ARGS=(--unshare-net --new-session)
+ ARGS=("${ARGS[@]}" --proc /proc --dev /dev)
+-ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var)
++ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp)
++ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp)
++ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var)
+ 
+ add_mounts() {
+     case "$1" in
diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
new file mode 100644
index 000000000000..f74ac84ca6b2
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch
@@ -0,0 +1,128 @@
+diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml
+index eca13a7c..1fd66f43 100644
+--- a/src/client/opamInitDefaults.ml
++++ b/src/client/opamInitDefaults.ml
+@@ -35,11 +35,15 @@ let eval_variables = [
+ let os_filter os =
+   FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os)
+ 
++let os_distribution_filter distro =
++  FOp (FIdent ([], OpamVariable.of_string "os-distribution", None), `Eq, FString distro)
++
+ let linux_filter = os_filter "linux"
+ let macos_filter = os_filter "macos"
+ let openbsd_filter = os_filter "openbsd"
+ let freebsd_filter = os_filter "freebsd"
+ let sandbox_filter = FOr (linux_filter, macos_filter)
++let nixos_filter = os_distribution_filter "nixos"
+ 
+ let gpatch_filter = FOr (openbsd_filter, freebsd_filter)
+ let patch_filter = FNot gpatch_filter
+@@ -50,6 +54,11 @@ let wrappers ~sandboxing () =
+     CString t, None;
+   ] in
+   let w = OpamFile.Wrappers.empty in
++  let w = { w with
++            OpamFile.Wrappers.
++            pre_build = [[CString "%{hooks}%/shebangs.sh", None], Some nixos_filter];
++          }
++  in
+   if sandboxing then
+     { w with
+       OpamFile.Wrappers.
+@@ -113,6 +122,7 @@ let required_tools ~sandboxing () =
+ let init_scripts () = [
+   ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter;
+   ("sandbox.sh", OpamScript.sandbox_exec), Some macos_filter;
++  ("shebangs.sh", OpamScript.patch_shebangs), Some nixos_filter;
+ ]
+ 
+ module I = OpamFile.InitConfig
+diff --git a/src/state/opamScript.mli b/src/state/opamScript.mli
+index 03449970..83de0b53 100644
+--- a/src/state/opamScript.mli
++++ b/src/state/opamScript.mli
+@@ -20,3 +20,4 @@ val env_hook : string
+ val env_hook_zsh : string
+ val env_hook_csh : string
+ val env_hook_fish : string
++val patch_shebangs : string
+diff --git a/src/state/shellscripts/patch_shebangs.sh b/src/state/shellscripts/patch_shebangs.sh
+new file mode 100755
+index 00000000..3ea84e2d
+--- /dev/null
++++ b/src/state/shellscripts/patch_shebangs.sh
+@@ -0,0 +1,73 @@
++#!/usr/bin/env bash
++# This setup hook causes the fixup phase to rewrite all script
++# interpreter file names (`#!  /path') to paths found in $PATH.  E.g.,
++# /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
++# /usr/bin/env gets special treatment so that ".../bin/env python" is
++# rewritten to /nix/store/<hash>/bin/python.  Interpreters that are
++# already in the store are left untouched.
++
++header() { echo "$1"; }
++stopNest() { true; }
++
++fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
++
++patchShebangs() {
++    local dir="$1"
++    header "patching script interpreter paths in $dir"
++    local f
++    local oldPath
++    local newPath
++    local arg0
++    local args
++    local oldInterpreterLine
++    local newInterpreterLine
++
++    find "$dir" -type f -perm -0100 | while read f; do
++        if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
++            # missing shebang => not a script
++            continue
++        fi
++
++        oldInterpreterLine=$(head -1 "$f" | tail -c+3)
++        read -r oldPath arg0 args <<< "$oldInterpreterLine"
++
++        if $(echo "$oldPath" | grep -q "/bin/env$"); then
++            # Check for unsupported 'env' functionality:
++            # - options: something starting with a '-'
++            # - environment variables: foo=bar
++            if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
++                echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
++                exit 1
++            fi
++            newPath="$(command -v "$arg0" || true)"
++        else
++            if [ "$oldPath" = "" ]; then
++                # If no interpreter is specified linux will use /bin/sh. Set
++                # oldpath="/bin/sh" so that we get /nix/store/.../sh.
++                oldPath="/bin/sh"
++            fi
++            newPath="$(command -v "$(basename "$oldPath")" || true)"
++            args="$arg0 $args"
++        fi
++
++        # Strip trailing whitespace introduced when no arguments are present
++        newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')"
++
++        if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
++            if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
++                echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
++                # escape the escape chars so that sed doesn't interpret them
++                escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
++                # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281
++                touch -r "$f" "$f.timestamp"
++                sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
++                touch -r "$f.timestamp" "$f"
++                rm "$f.timestamp"
++            fi
++        fi
++    done
++
++    stopNest
++}
++
++patchShebangs .
diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl
new file mode 100755
index 000000000000..1862add452d6
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl
@@ -0,0 +1,130 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings qw<all>;
+use Getopt::Std;
+
+my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n";
+
+our $opt_v;
+our $opt_p;
+our $opt_r;
+our $opt_t;
+getopts "v:p:t:r:";
+
+my $OPAM_RELEASE = $opt_v // "2.0.0";
+my $OPAM_TAG = $opt_t // $OPAM_RELEASE;
+my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam";
+my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip";
+my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`;
+chomp $OPAM_RELEASE_SHA256;
+
+my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
+my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
+my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m
+  or die "could not parse ocaml version bound\n";
+
+print <<"EOF";
+{ stdenv, lib, fetchurl, makeWrapper, getconf,
+  ocaml, unzip, ncurses, curl, aspcud, bubblewrap
+}:
+
+assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
+
+let
+  srcs = {
+EOF
+
+my %urls = ();
+my %md5s = ();
+
+open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources");
+while (<SOURCES>) {
+  if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
+    $urls{$1} = $2;
+  } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {
+    $md5s{$1} = $2;
+  }
+}
+for my $src (sort keys %urls) {
+  my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`;
+  system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2";
+  die "md5 check failed for $urls{$src}\n" if $?;
+  print <<"EOF";
+    $src = fetchurl {
+      url = "$urls{$src}";
+      sha256 = "$sha256";
+    };
+EOF
+}
+
+print <<"EOF";
+    opam = fetchurl {
+      url = "$OPAM_RELEASE_URL";
+      sha256 = "$OPAM_RELEASE_SHA256";
+    };
+  };
+in stdenv.mkDerivation rec {
+  name = "opam-\${version}";
+  version = "$OPAM_RELEASE";
+
+  buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
+
+  src = srcs.opam;
+
+  postUnpack = ''
+EOF
+for my $src (sort keys %urls) {
+  my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/
+    or die "could not find extension for $urls{$src}\n";
+  print <<"EOF";
+    ln -sv \${srcs.$src} \$sourceRoot/src_ext/$src$ext
+EOF
+}
+print <<'EOF';
+  '';
+
+EOF
+if (defined $opt_p) {
+  print "  patches = [ ";
+  for my $patch (split /[, ]/, $opt_p) {
+    $patch =~ s/^(?=[^\/]*$)/.\//;
+    print "$patch ";
+  }
+  print "];\n\n";
+}
+print <<'EOF';
+  preConfigure = ''
+    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"
+    patchShebangs src/state/shellscripts
+  '';
+
+  postConfigure = "make lib-ext";
+
+  # Dirty, but apparently ocp-build requires a TERM
+  makeFlags = ["TERM=screen"];
+
+  outputs = [ "out" "installer" ];
+  setOutputFlags = false;
+
+  # change argv0 to "opam" as a workaround for
+  # https://github.com/ocaml/opam/issues/2142
+  postInstall = ''
+    mv $out/bin/opam $out/bin/.opam-wrapped
+    makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
+      --argv0 "opam" \
+      --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin
+    $out/bin/opam-installer --prefix=$installer opam-installer.install
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A package manager for OCaml";
+    homepage = http://opam.ocamlpro.com/;
+    maintainers = [ maintainers.henrytill ];
+    platforms = platforms.all;
+  };
+}
+EOF
+print $gencmd;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d0e6ae15da8..abf914f87103 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7135,7 +7135,8 @@ with pkgs;
 
   opaline = callPackage ../development/tools/ocaml/opaline { };
 
-  opam = callPackage ../development/tools/ocaml/opam {
+  opam = callPackage ../development/tools/ocaml/opam { };
+  opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix {
     inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
   };
 

From 7cf3891b75af8506a03dc9054dc0e6e746beadc6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 10:41:27 -0700
Subject: [PATCH 0412/3253] tortoisehg: 4.6.1 -> 4.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tortoisehg
---
 pkgs/applications/version-management/tortoisehg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 5a37857fa479..71369709b5da 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.6.1";
+    version = "4.7";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik";
+      sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From 6d3a2f6f441805f91e604b12939895a147fd2690 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 11:01:24 -0700
Subject: [PATCH 0413/3253] linuxPackages.sysdig: 0.22.1 -> 0.23.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
sysdig
---
 pkgs/os-specific/linux/sysdig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 9b0f3ff767c2..20ecdb5b5773 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "sysdig-${version}";
-  version = "0.22.1";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0";
+    sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh";
   };
 
   buildInputs = [

From c42f0f95bb0c96bc3ae54ad80a107b643d5c5637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 6 Sep 2018 20:22:56 +0200
Subject: [PATCH 0414/3253] home-assistant: 0.77.2 -> 0.77.3

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 12b96b3da125..a67de2dab1aa 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.77.2";
+  version = "0.77.3";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ccc9bee51b99..e6bbd4ab259d 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -75,7 +75,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.77.2";
+  hassVersion = "0.77.3";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -90,7 +90,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0lqm8n54cs4ji9bqp1z70qswgqv8n9vl8jbip7c2f3icqx19zg10";
+    sha256 = "1c459iqbkhs6dv563zld6qb9avpx3h0fnxng476zahj9x9m5rzk6";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index b14d76050f90..e04de7effcd4 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180831.0";
+  version = "20180903.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0f897bed934bc2d557db04f8c76ad143db9514ea71943a0038c5bfb3b2151ec";
+    sha256 = "54ba2ad2d1043952885f432d900025bd3eb11de180ac5147342cff585f44d4f9";
   };
 
   propagatedBuildInputs = [ user-agents ];

From 7bcc2870c75a6cf1b4058b856489203753eb5684 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 6 Sep 2018 14:40:43 -0400
Subject: [PATCH 0415/3253] pythonPackages.jupyterlab_launcher: refactor
 (#46178)

jupyterlab_launcher does not support python version < 3.5. Disabled
for older versions
---
 .../development/python-modules/jupyterlab_launcher/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
index 1831b47ee792..af29b9155a58 100644
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -1,7 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }:
+{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }:
 buildPythonPackage rec {
   pname = "jupyterlab_launcher";
   version = "0.13.1";
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;

From 788cab1ae7c58d900e30a0f6f1429d0599bacfa3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 07:44:03 -0700
Subject: [PATCH 0416/3253] woeusb: 3.2.1 -> 3.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
woeusb
---
 pkgs/tools/misc/woeusb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 9c6211b13dfe..e75baac669a3 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.1";
+  version = "3.2.2";
   name = "woeusb-${version}";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1";
+    sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3";
   };
 
   buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];

From 765a8c8cd53df402999c0bc67c8b532358d685d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 30 Aug 2018 11:56:29 -0700
Subject: [PATCH 0417/3253] plantuml: 1.2018.9 -> 1.2018.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
plantuml
---
 pkgs/tools/misc/plantuml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 51844c8e5faa..08df665aede6 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2018.9";
+  version = "1.2018.10";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn";
+    sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs";
   };
 
   # It's only a .jar file and a shell wrapper

From 56a605c8b9bce331bd562778b8f56cd957a8c90f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 6 Sep 2018 15:14:29 -0400
Subject: [PATCH 0418/3253] nix-plugins: 4.0.5 -> 5.0.0.

Fixes build against nix 2.1.
---
 pkgs/development/libraries/nix-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index ff8a54f87f2a..d3a4b21b4b61 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "4.0.5"; in
+let version = "5.0.0"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny";
+    sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 43c8aa89a6b62181c3c3604f79a3a9db82581aee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 12:44:14 -0700
Subject: [PATCH 0419/3253] remmina: 1.2.31.3 -> 1.2.31.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
remmina
---
 pkgs/applications/networking/remote/remmina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 14ab36c78fd2..fb138a1e8d45 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.2.31.3";
+  version = "1.2.31.4";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
     owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "0lvang4587wz292c3k3s8n4icc25cia1phmij34ndrl1f9lg34dp";
+    sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 574f2a33c05ccfebe125229468a8540713f6d33b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:14 +0000
Subject: [PATCH 0420/3253] kodiPlugins.steam-launcher: fix what is clearly a
 bug

---
 pkgs/applications/video/kodi/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 5a0583202e6d..2ba23e72a2ed 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -246,7 +246,7 @@ rec {
       maintainers = with maintainers; [ edwtjo ];
     };
   }).override {
-    propagatedBuildinputs = [ steam ];
+    propagatedBuildInputs = [ steam ];
   };
 
   pdfreader = mkKodiPlugin rec {

From 88d69df250a546952666ead4068d400446cfec84 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:16 +0000
Subject: [PATCH 0421/3253] kodi: wrapper: simplify

---
 pkgs/applications/video/kodi/wrapper.nix | 58 ++++++------------------
 1 file changed, 14 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index e6d3fbb090fc..27a7a9d34662 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -1,54 +1,24 @@
-{ stdenv, lib, makeWrapper, kodi, plugins }:
+{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }:
 
-let
+buildEnv {
+  name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}";
 
-  p = builtins.parseDrvName kodi.name;
-
-in
-
-stdenv.mkDerivation {
-
-  name = "kodi-" + p.version;
-  version = p.version;
+  paths = [ kodi ] ++ plugins;
+  pathsToLink = [ "/share" ];
 
   buildInputs = [ makeWrapper ];
 
-  buildCommand = ''
-    mkdir -p $out/share/kodi/addons
-    ${stdenv.lib.concatMapStrings
-        (plugin: "ln -s ${plugin.out
-                            + plugin.kodiPlugin
-                            + "/" + plugin.namespace
-                          } $out/share/kodi/addons/.;") plugins}
-    $(for plugin in ${kodi}/share/kodi/addons/*
+  postBuild = ''
+    mkdir $out/bin
+    for exe in kodi{,-standalone}
     do
-      $(ln -s $plugin/ $out/share/kodi/addons/.)
-    done)
-    $(for share in ${kodi}/share/kodi/*
-    do
-      $(ln -s $share $out/share/kodi/.)
-    done)
-    $(for passthrough in icons xsessions applications
-    do
-      ln -s ${kodi}/share/$passthrough $out/share/
-    done)
-    $(for exe in kodi{,-standalone}
-    do
-    makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
-      --prefix KODI_HOME : $out/share/kodi;
-    done)
+      makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
+        --prefix KODI_HOME : $out/share/kodi
+    done
   '';
 
-  preferLocalBuild = true;
-
-  meta = with kodi.meta; {
-    inherit license homepage;
-    description = description
-                + " (with plugins: "
-                + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins))
-                + ")";
-
-    platforms = stdenv.lib.platforms.linux;
+  meta = kodi.meta // {
+    description = kodi.meta.description
+                + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})";
   };
-
 }

From 02557dade2d31be4921f52687db411b3f1137baf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:18 +0000
Subject: [PATCH 0422/3253] kodi: passthu pythonPackages

---
 pkgs/applications/video/kodi/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 454665455c51..9272d3c8e269 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
-, pkgconfig, cmake, gnumake, yasm, python2
+, pkgconfig, cmake, gnumake, yasm, python2Packages
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
 , gettext, pcre-cpp, yajl, fribidi, which
@@ -119,7 +119,7 @@ in stdenv.mkDerivation rec {
 
     buildInputs = [
       gnutls libidn libtasn1 nasm p11-kit
-      libxml2 yasm python2
+      libxml2 yasm python2Packages.python
       boost libmicrohttpd
       gettext pcre-cpp yajl fribidi libva libdrm
       openssl gperf tinyxml2 taglib libssh swig jre
@@ -187,7 +187,7 @@ in stdenv.mkDerivation rec {
     postInstall = ''
       for p in $(ls $out/bin/) ; do
         wrapProgram $out/bin/$p \
-          --prefix PATH            ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \
+          --prefix PATH            ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
               ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}"
       done
@@ -200,6 +200,10 @@ in stdenv.mkDerivation rec {
 
     installCheckPhase = "$out/bin/kodi --version";
 
+    passthru = {
+      pythonPackages = python2Packages;
+    };
+
     meta = with stdenv.lib; {
       description = "Media center";
       homepage    = https://kodi.tv/;

From 1d64f70bd75277bd5a69bc9f89c06ece24ed0877 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:19 +0000
Subject: [PATCH 0423/3253] kodi: wrapper: set PYTHONPATH from plugins

---
 pkgs/applications/video/kodi/wrapper.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix
index 27a7a9d34662..d0dc9274a105 100644
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@@ -13,6 +13,7 @@ buildEnv {
     for exe in kodi{,-standalone}
     do
       makeWrapper ${kodi}/bin/$exe $out/bin/$exe \
+        --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \
         --prefix KODI_HOME : $out/share/kodi
     done
   '';

From e883b86c0e894328eb7cb88f287c1c52047d51f1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:21 +0000
Subject: [PATCH 0424/3253] kodiPlugins: inline commons.nix

---
 pkgs/applications/video/kodi/commons.nix | 83 ------------------------
 pkgs/applications/video/kodi/plugins.nix | 78 +++++++++++++++++++++-
 2 files changed, 76 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/applications/video/kodi/commons.nix

diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
deleted file mode 100644
index eff9b7871069..000000000000
--- a/pkgs/applications/video/kodi/commons.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ stdenv, fetchFromGitHub
-, cmake, kodiPlain, libcec_platform, tinyxml }:
-
-rec {
-
-  pluginDir = "/share/kodi/addons";
-
-  kodi-platform = stdenv.mkDerivation rec {
-    project = "kodi-platform";
-    version = "17.1";
-    name = "${project}-${version}";
-
-    src = fetchFromGitHub {
-      owner = "xbmc";
-      repo = project;
-      rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
-      sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
-    };
-
-    buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
-
-  };
-
-  mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
-    inherit src meta sourceDir;
-
-    name = "kodi-plugin-${plugin}-${version}";
-
-    passthru = {
-      kodiPlugin = pluginDir;
-      namespace = namespace;
-    };
-
-    dontStrip = true;
-
-    installPhase = ''
-      ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
-      d=$out${pluginDir}/${namespace}
-      mkdir -p $d
-      sauce="."
-      [ -d ${namespace} ] && sauce=${namespace}
-      cp -R "$sauce/"* $d
-    '';
-
-  };
-
-  mkKodiPlugin = mkKodiAPIPlugin;
-
-  mkKodiABIPlugin = { plugin, namespace, version, src, meta
-                    , extraBuildInputs ? [], sourceDir ? null, ... }:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
-    inherit src meta sourceDir;
-
-    name = "kodi-plugin-${plugin}-${version}";
-
-    passthru = {
-      kodiPlugin = pluginDir;
-      namespace = namespace;
-    };
-
-    dontStrip = true;
-
-    buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
-               ++ extraBuildInputs;
-
-    # disables check ensuring install prefix is that of kodi
-    cmakeFlags = [
-      "-DOVERRIDE_PATHS=1"
-    ];
-
-    # kodi checks for plugin .so libs existance in the addon folder (share/...)
-    # and the non-wrapped kodi lib/... folder before even trying to dlopen
-    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
-    installPhase = let n = namespace; in ''
-      make install
-      ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version}
-    '';
-
-  };
-}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 2ba23e72a2ed..e2e4dd28f8f5 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,10 +1,84 @@
 { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
+, cmake, kodiPlain, libcec_platform, tinyxml
 , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
 
-with (callPackage ./commons.nix {});
-
 rec {
 
+  pluginDir = "/share/kodi/addons";
+
+  kodi-platform = stdenv.mkDerivation rec {
+    project = "kodi-platform";
+    version = "17.1";
+    name = "${project}-${version}";
+
+    src = fetchFromGitHub {
+      owner = "xbmc";
+      repo = project;
+      rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+      sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+    };
+
+    buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
+  };
+
+  mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+    inherit src meta sourceDir;
+
+    name = "kodi-plugin-${plugin}-${version}";
+
+    passthru = {
+      kodiPlugin = pluginDir;
+      namespace = namespace;
+    };
+
+    dontStrip = true;
+
+    installPhase = ''
+      ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+      d=$out${pluginDir}/${namespace}
+      mkdir -p $d
+      sauce="."
+      [ -d ${namespace} ] && sauce=${namespace}
+      cp -R "$sauce/"* $d
+    '';
+
+  };
+
+  mkKodiABIPlugin = { plugin, namespace, version, src, meta
+                    , extraBuildInputs ? [], sourceDir ? null, ... }:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+    inherit src meta sourceDir;
+
+    name = "kodi-plugin-${plugin}-${version}";
+
+    passthru = {
+      kodiPlugin = pluginDir;
+      namespace = namespace;
+    };
+
+    dontStrip = true;
+
+    buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
+               ++ extraBuildInputs;
+
+    # disables check ensuring install prefix is that of kodi
+    cmakeFlags = [
+      "-DOVERRIDE_PATHS=1"
+    ];
+
+    # kodi checks for plugin .so libs existance in the addon folder (share/...)
+    # and the non-wrapped kodi lib/... folder before even trying to dlopen
+    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+    installPhase = let n = namespace; in ''
+      make install
+      ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
+    '';
+
+  };
+
   advanced-launcher = mkKodiPlugin rec {
 
     plugin = "advanced-launcher";

From 031e1cf674fddd71e998102cdd681ec5211c968a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:40:22 +0000
Subject: [PATCH 0425/3253] kodiPlugins: simplify, generalize, implement
 kodiWithPlugins

---
 pkgs/applications/video/kodi/plugins.nix | 103 ++++++++++++-----------
 1 file changed, 56 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index e2e4dd28f8f5..f2ceacdd799f 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -2,10 +2,36 @@
 , cmake, kodiPlain, libcec_platform, tinyxml
 , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
 
-rec {
+with stdenv.lib;
+
+let self = rec {
 
   pluginDir = "/share/kodi/addons";
 
+  kodi = kodiPlain;
+
+  # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix
+  toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: {
+    # Use passthru in order to prevent rebuilds when possible.
+    passthru = (oldAttrs.passthru or {})// {
+      kodiPluginFor = kodi;
+      requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs;
+    };
+  });
+
+  # Check whether a derivation provides a Kodi plugin.
+  hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi;
+
+  # Get list of required Kodi plugins given a list of derivations.
+  requiredKodiPlugins = drvs: let
+      modules = filter hasKodiPlugin drvs;
+    in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules));
+
+  kodiWithPlugins = func: callPackage ./wrapper.nix {
+    inherit kodi;
+    plugins = requiredKodiPlugins (func self);
+  };
+
   kodi-platform = stdenv.mkDerivation rec {
     project = "kodi-platform";
     version = "17.1";
@@ -21,18 +47,10 @@ rec {
     buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
   };
 
-  mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
-    inherit src meta sourceDir;
-
+  mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args:
+  toKodiPlugin (stdenv.mkDerivation (rec {
     name = "kodi-plugin-${plugin}-${version}";
 
-    passthru = {
-      kodiPlugin = pluginDir;
-      namespace = namespace;
-    };
-
     dontStrip = true;
 
     installPhase = ''
@@ -43,22 +61,12 @@ rec {
       [ -d ${namespace} ] && sauce=${namespace}
       cp -R "$sauce/"* $d
     '';
+  } // args));
 
-  };
-
-  mkKodiABIPlugin = { plugin, namespace, version, src, meta
-                    , extraBuildInputs ? [], sourceDir ? null, ... }:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
-    inherit src meta sourceDir;
-
+  mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args:
+  toKodiPlugin (stdenv.mkDerivation (rec {
     name = "kodi-plugin-${plugin}-${version}";
 
-    passthru = {
-      kodiPlugin = pluginDir;
-      namespace = namespace;
-    };
-
     dontStrip = true;
 
     buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
@@ -76,8 +84,7 @@ rec {
       make install
       ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version}
     '';
-
-  };
+  } // args));
 
   advanced-launcher = mkKodiPlugin rec {
 
@@ -92,7 +99,7 @@ rec {
       sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=85724;
       description = "A program launcher for Kodi";
       longDescription = ''
@@ -122,7 +129,7 @@ rec {
       sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=287826;
       description = "A program launcher for Kodi";
       longDescription = ''
@@ -149,7 +156,7 @@ rec {
       sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Add support for different gaming controllers.";
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
@@ -173,7 +180,7 @@ rec {
     // (mkController "ps")
     // (mkController "snes");
 
-  exodus = (mkKodiPlugin rec {
+  exodus = mkKodiPlugin rec {
 
     plugin = "exodus";
     namespace = "plugin.video.exodus";
@@ -184,13 +191,14 @@ rec {
       sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
     };
 
-    meta = with stdenv.lib; {
+    buildInputs = [ unzip ];
+
+    meta = {
       description = "A streaming plugin for Kodi";
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
     };
-
-  }).override { buildInputs = [ unzip ]; };
+  };
 
   hyper-launcher = let
     pname = "hyper-launcher";
@@ -202,7 +210,7 @@ rec {
       rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
       sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
     };
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=258159;
       description = "A ROM launcher for Kodi that uses HyperSpin assets.";
       maintainers = with maintainers; [ edwtjo ];
@@ -233,7 +241,7 @@ rec {
       sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Binary addon for raw joystick input.";
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
@@ -257,7 +265,7 @@ rec {
       sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=67110;
       description = "Watch content from SVT Play";
       longDescription = ''
@@ -286,7 +294,7 @@ rec {
 
     extraBuildInputs = [ libusb ];
 
-    meta = with stdenv.lib; {
+    meta = {
       description = "Binary addon for steam controller.";
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
@@ -294,7 +302,7 @@ rec {
 
   };
 
-  steam-launcher = (mkKodiPlugin rec {
+  steam-launcher = mkKodiPlugin rec {
 
     plugin = "steam-launcher";
     namespace = "script.steam.launcher";
@@ -307,7 +315,9 @@ rec {
       sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm";
     };
 
-    meta = with stdenv.lib; {
+    propagatedBuildInputs = [ steam ];
+
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=157499;
       description = "Launch Steam in Big Picture Mode from Kodi";
       longDescription = ''
@@ -319,8 +329,6 @@ rec {
       '';
       maintainers = with maintainers; [ edwtjo ];
     };
-  }).override {
-    propagatedBuildInputs = [ steam ];
   };
 
   pdfreader = mkKodiPlugin rec {
@@ -336,7 +344,7 @@ rec {
       sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://forum.kodi.tv/showthread.php?tid=187421;
       description = "A comic book reader";
       maintainers = with maintainers; [ edwtjo ];
@@ -356,7 +364,7 @@ rec {
       sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/kodi-pvr/pvr.hts;
       description = "Kodi's Tvheadend HTSP client addon";
       platforms = platforms.all;
@@ -378,7 +386,7 @@ rec {
       sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/kodi-pvr/pvr.hdhomerun;
       description = "Kodi's HDHomeRun PVR client addon";
       platforms = platforms.all;
@@ -402,7 +410,7 @@ rec {
       sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/kodi-pvr/pvr.iptvsimple;
       description = "Kodi's IPTV Simple client addon";
       platforms = platforms.all;
@@ -426,7 +434,7 @@ rec {
       sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
     };
 
-    meta = with stdenv.lib; {
+    meta = {
       homepage = https://github.com/osmc/skin.osmc;
       description = "The default skin for OSMC";
       platforms = platforms.all;
@@ -434,4 +442,5 @@ rec {
       license = licenses.cc-by-nc-sa-30;
     };
   };
-}
+
+}; in self

From f72cba212cef160eb82a9f3c7cbf0e983f7af9d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 14:22:26 -0700
Subject: [PATCH 0426/3253] picard-tools: 2.18.11 -> 2.18.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
picard-tools
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 0ddbdab4c1b1..c141e6087bfc 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.11";
+  version = "2.18.12";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89";
+    sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm";
   };
 
   buildInputs = [ jre makeWrapper ];

From 597ecd0226a4704efd760955ff10824098fea2b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 15:15:47 -0700
Subject: [PATCH 0427/3253] altcoins.parity-ui: 0.2.8 -> 0.3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
parity-ui
---
 pkgs/applications/altcoins/parity-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index 8566e6037d6f..ec2e571e3f0b 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
   name = "parity-ui-${version}";
-  version = "0.2.8";
+  version = "0.3.4";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
-    sha256 = "1nyarq73jdknhax68cq2i868sznghzj70kvk4ixypxnjb1q6a53a";
+    sha256 = "1xbd00r9ph8w2d6d2c5xg4b5l74ljzs50rpc6kahfznypmh4kr73";
     name = "${name}.deb";
   };
 

From c909dc2da402ebfdddf66aef3e69092908c32f61 Mon Sep 17 00:00:00 2001
From: qoli <qoli@protonmail.com>
Date: Thu, 6 Sep 2018 15:27:57 -0700
Subject: [PATCH 0428/3253] Disable temperamental shutdown_close_pipe test on
 Aarch32.

---
 pkgs/development/libraries/libuv/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index a0ace84bc67d..50b43c4e043d 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
         "multiple_listen" "delayed_accept"
         "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
         "tty_pty"
+      ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+        # I observe this test failing with some regularity on ARMv7:
+        # https://github.com/libuv/libuv/issues/1871
+        "shutdown_close_pipe"
       ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''

From b710f4a85c80723dea90f9be826f2d6b26d36e61 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 15:41:10 -0700
Subject: [PATCH 0429/3253] kdeApplications.okteta: 0.25.2 -> 0.25.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
okteta
---
 pkgs/applications/editors/okteta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index efe728f68494..a2337483bf1f 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "okteta-${version}";
-  version = "0.25.2";
+  version = "0.25.3";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
-    sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p";
+    sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai";
   };
 
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

From 423e46a24f240a6e9a6ddcb788db51989f57eb58 Mon Sep 17 00:00:00 2001
From: Alexander Shpilkin <ashpilkin@gmail.com>
Date: Fri, 7 Sep 2018 01:56:46 +0300
Subject: [PATCH 0430/3253] nixos/networkd: support MULTICAST flag on links

Support Multicast= option in [Link] section of network units,
introduced in systemd/systemd#9118.
---
 nixos/modules/system/boot/networkd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 4bacf0f126a4..8e748dd27d7d 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -249,11 +249,12 @@ let
   # .network files have a [Link] section with different options than in .netlink files
   checkNetworkLink = checkUnitConfig "Link" [
     (assertOnlyFields [
-      "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline"
+      "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline"
     ])
     (assertMacAddress "MACAddress")
     (assertByteFormat "MTUBytes")
     (assertValueOneOf "ARP" boolValues)
+    (assertValueOneOf "Multicast" boolValues)
     (assertValueOneOf "Unmanaged" boolValues)
     (assertValueOneOf "RquiredForOnline" boolValues)
   ];

From 6d803b41c5f44619f4c6dbb9d1023e38e2ce287f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 15:57:40 -0700
Subject: [PATCH 0431/3253] oniguruma: 6.8.2 -> 6.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
onig
---
 pkgs/development/libraries/oniguruma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index f9a75801e101..956c8b58ffc1 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "onig-${version}";
-  version = "6.8.2";
+  version = "6.9.0";
 
   src = fetchFromGitHub {
     owner = "kkos";
     repo = "oniguruma";
     rev = "v${version}";
-    sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd";
+    sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h";
   };
 
   nativeBuildInputs = [ cmake ];

From 8fdb6fba30a22c15bd86fb756a49559b9e5d590c Mon Sep 17 00:00:00 2001
From: Alexander Shpilkin <ashpilkin@gmail.com>
Date: Fri, 7 Sep 2018 02:01:21 +0300
Subject: [PATCH 0432/3253] nixos/networkd: fix handling of RequiredForOnline

---
 nixos/modules/system/boot/networkd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 8e748dd27d7d..5f1de572e5b1 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -256,7 +256,7 @@ let
     (assertValueOneOf "ARP" boolValues)
     (assertValueOneOf "Multicast" boolValues)
     (assertValueOneOf "Unmanaged" boolValues)
-    (assertValueOneOf "RquiredForOnline" boolValues)
+    (assertValueOneOf "RequiredForOnline" boolValues)
   ];
 
 

From 0a3f07077b003905ab42ac26a067afcd79e823fa Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 6 Sep 2018 23:32:44 +0900
Subject: [PATCH 0433/3253] firefox-esr: 60.1.0esr -> 60.2.0esr, mark 52.9.0esr
 insecure

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3559135a01dd..11222cc65ba3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -60,6 +60,7 @@ rec {
 
     meta = firefox.meta // {
       description = "A web browser built from Firefox Extended Support Release source tree";
+      knownVulnerabilities = [ "Support ended in August 2018." ];
     };
     updateScript = callPackage ./update.nix {
       attrPath = "firefox-esr-52-unwrapped";
@@ -69,10 +70,10 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.1.0esr";
+    version = "60.2.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6";
+      sha512 = "1nf7nsycvzafvy4jjli5xh59d2mac17gfx91a1jh86f41w6qcsi3lvkfa8xhxsq8wfdsmqk1f4hmqzyx63h4m691qji7838g2nk49k7";
     };
 
     patches = nixpkgsPatches ++ [

From ecf73103abf1897a3121de2c7e87490b437266aa Mon Sep 17 00:00:00 2001
From: Alexander Shpilkin <ashpilkin@gmail.com>
Date: Fri, 7 Sep 2018 02:23:12 +0300
Subject: [PATCH 0434/3253] nixos/networkd: do not require gateway for routes

A route via a tunnel interface does not require a gateway to be
specified, so do not check for the Gateway= field on routes at all.
---
 nixos/modules/system/boot/networkd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 5f1de572e5b1..63a6f7fbe099 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -208,7 +208,6 @@ let
       "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck"
       "MTUBytes"
     ])
-    (assertHasField "Gateway")
   ];
 
   checkDhcp = checkUnitConfig "DHCP" [

From e5b17f61efa0b1f90f610b067212c209ac310ccf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Sep 2018 16:57:44 -0700
Subject: [PATCH 0435/3253] rednotebook: 2.3 -> 2.6.1 (#46200)

---
 pkgs/applications/editors/rednotebook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index 9456ea3150a4..8b37f0b74d5b 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.3";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     rev = "v${version}";
-    sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
+    sha256 = "1x6acx0hagsawx84cv55qz17p8qjpq1v1zaf8rmm6ifsslsxw91h";
   };
 
   # We have not packaged tests.

From a1f5f62b293ff05eb4c99555d73797fd250428df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 17:17:48 -0700
Subject: [PATCH 0436/3253] mediainfo: 18.05 -> 18.08

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mediainfo
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 5b2f8125f72c..d222ad1e53e0 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.05";
+  version = "18.08";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+    sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From c8c091f09343e52bdc240596b5c7b9a2b04047b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 17:26:08 -0700
Subject: [PATCH 0437/3253] mediainfo-gui: 18.05 -> 18.08

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mediainfo-gui
---
 pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index b6ec3305cb3a..3ff07ba20084 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "18.05";
+  version = "18.08";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
+    sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 105ef781aee2fdb1f6985e61de2fefda4b683631 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 18:18:47 -0700
Subject: [PATCH 0438/3253] libmediainfo: 18.05 -> 18.08

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libmediainfo
---
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 3ba513f90781..c4f41663c848 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.05";
+  version = "18.08";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
+    sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From dd74f16b366a9d8d2e4e3e806fb8ab57016965cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 18:33:20 -0700
Subject: [PATCH 0439/3253] kubernetes-helm: 2.9.1 -> 2.10.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
helm
---
 pkgs/applications/networking/cluster/helm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index d09e65a4caae..a84852f197dd 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn"
+             then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
              else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
   pname = "helm";
-  version = "2.9.1";
+  version = "2.10.0";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From 06e41e4639ad183d2ad86625f5ab1d2d25a072fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 18:49:50 -0700
Subject: [PATCH 0440/3253] libdrm: 2.4.93 -> 2.4.94

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libdrm
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5107d8898d46..761216f420bb 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.93";
+  name = "libdrm-2.4.94";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f";
+    sha256 = "1ghn3l1dv1rsp9z6jpmy4ryna1s8rm4xx0ds532041bnlfq5jg5p";
   };
 
   outputs = [ "out" "dev" "bin" ];

From cdf82f6ddd2f3f6a849db2625f36fead123508a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 19:30:21 -0700
Subject: [PATCH 0441/3253] kipi-plugins: 5.2.0 -> 5.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
kipi-plugins
---
 pkgs/applications/graphics/kipi-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 48a94a5253d0..f7faba7c41a5 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name    = "kipi-plugins-${version}";
-  version = "5.2.0";
+  version = "5.9.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
-    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+    sha256 = "06qdalf2mwx2f43p3bljy3vn5bk8n3x539kha6ky2vzxvkp343b6";
   };
 
   prePatch = ''

From baf51804f0e616ffd2b56d78b9767377a7940406 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 19:54:40 -0700
Subject: [PATCH 0442/3253] jmol: 14.29.17 -> 14.29.19

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
jmol
---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index d5dae364cc3d..80415189d457 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,7 +17,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.29.17";
+  version = "14.29.19";
   pname = "jmol";
   name = "${pname}-${version}";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk";
+    sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5";
   };
 
   patchPhase = ''

From cb787e9426ef91bdb95b944db47244657ae96523 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 20:04:28 -0700
Subject: [PATCH 0443/3253] htslib: 1.7 -> 1.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
htslib
---
 pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 48548bd72652..2ee9144b316d 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "htslib";
-  version = "1.7";
+  version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6";
+    sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
   };
 
   # perl is only used during the check phase.

From 0f5d197545449fdf096bccb950a1782116718eb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 22:04:59 -0700
Subject: [PATCH 0444/3253] godot: 3.0.4 -> 3.0.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/godot/versions
---
 pkgs/development/tools/godot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index d3ed7624b7a1..e22b8b25eaa4 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "3.0.4";
+  version = "3.0.6";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4";
+    sha256 = "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ef043c727fcef41a918192f47187cdaea0b5485f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 22:17:55 -0700
Subject: [PATCH 0445/3253] linuxPackages.evdi: 1.5.0 -> 1.5.0.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/evdi/versions
---
 pkgs/os-specific/linux/evdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 730df56a6429..79a943895740 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "evdi-${version}";
-  version = "1.5.0";
+  version = "1.5.0.2";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
     rev = "v${version}";
-    sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs";
+    sha256 = "1wjk023lpjxnspfl34c6rzkrixahfdzdkmc3hnmrdw12s3i6ca5x";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 86585082ff31b4007cc9568933e3496d31d5d804 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 22:33:37 -0700
Subject: [PATCH 0446/3253] frostwire-bin: 6.7.1 -> 6.7.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/frostwire/versions
---
 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index d1d3bf880cc5..25deef0aef94 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.7.1";
+  version = "6.7.2";
   name = "frostwire-${version}";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "1crhiksgky65wvb4fvqablsvixj04hbaacz23mskwrc63n4jaz0p";
+    sha256 = "1dxk2cmwbn4ahkmr8qpiq1dpkkyswg5wz1cnv36izafpr87lxfvj";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 30df34f7dde53a0056268a3dc7b285e8d0df31d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 23:07:15 -0700
Subject: [PATCH 0447/3253] flow: 0.79.0 -> 0.80.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flow/versions
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index bc9bb5d5fa3d..00b129706284 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.79.0";
+  version = "0.80.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1m8239jl0kmpgmk81mak6k3hmmikji6bb3v0zaknb1z3jl8aa1wb";
+    sha256 = "0jixisimqwbr46gh9357ya0rscv46svm6kqnawkq1shlf9nwa3lx";
   };
 
   installPhase = ''

From a12c1aebb7aae84fa36c779495e3b8754e38c039 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 23:23:56 -0700
Subject: [PATCH 0448/3253] duplicity: 0.7.18 -> 0.7.18.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duplicity/versions
---
 pkgs/tools/backup/duplicity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index e0c3ea4cf018..9fbe05c725ef 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "duplicity-${version}";
-  version = "0.7.18";
+  version = "0.7.18.1";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz";
-    sha256 = "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b";
+    sha256 = "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9";
   };
 
   buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];

From b1d6d159aaaf24f7d7a33d7f4c78a81b851c151e Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 02:28:12 -0400
Subject: [PATCH 0449/3253] pythonPackages.pyslurm: 20180604 -> 20180811
 (#46187)

Update version to support latest version of slurm. Fixes since
previously did not build.
---
 pkgs/development/python-modules/pyslurm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 9057c3970e15..24704bd8f309 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20180604";
+  version = "20180811";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc";
-    sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj";
+    rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05";
+    sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr";
   };
 
   buildInputs = [ cython slurm ];

From b5b48c0a91ef37841839619511c48f1887dbe964 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 02:38:41 -0400
Subject: [PATCH 0450/3253] pythonPackages.locustio: 0.8.1 -> 0.9.0 (#46191)

Fixing build issue. Additionally fetching from github becuase pypi
packge does not come with README which is a buildtime dependency.
---
 .../python-modules/locustio/default.nix       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index c3e27c8b36a0..18875f840644 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -1,8 +1,8 @@
 { buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , mock
 , unittest2
-, msgpack-python
+, msgpack
 , requests
 , flask
 , gevent
@@ -11,18 +11,16 @@
 
 buildPythonPackage rec {
   pname = "locustio";
-  version = "0.8.1";
+  version = "0.9.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61";
+  src = fetchFromGitHub {
+    owner = "locustio";
+    repo = "locust";
+    rev = "${version}";
+    sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd";
   };
 
-  patchPhase = ''
-    sed -i s/"pyzmq=="/"pyzmq>="/ setup.py
-  '';
-
-  propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ];
+  propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
   buildInputs = [ mock unittest2 ];
 
   meta = {

From 6586765a8f94c1540a928c249258a571d246946d Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 02:41:24 -0400
Subject: [PATCH 0451/3253] pythonPackages.phonopy: refactor (#46161)

Fixing phonopy not building. Tests were moved on Jul 30.
---
 pkgs/development/python-modules/phonopy/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix
index cf15ccc18fce..903b2b90c300 100644
--- a/pkgs/development/python-modules/phonopy/default.nix
+++ b/pkgs/development/python-modules/phonopy/default.nix
@@ -10,9 +10,12 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ];
-  
+
   checkPhase = ''
-    cd test/phonopy
+    cd test
+    # dynamic structure factor test ocassionally fails do to roundoff
+    # see issue https://github.com/atztogo/phonopy/issues/79
+    rm spectrum/test_dynamic_structure_factor.py
     ${python.interpreter} -m unittest discover -b
     cd ../..
   '';
@@ -24,4 +27,3 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ psyanticy ];
   };
 }
-

From 427e4910ec670a7c4f70bb0632933a86d089e0e7 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 03:26:07 -0400
Subject: [PATCH 0452/3253] pythonPackages.ordered-set: add missing dependency
 (#46183)

missing dependency for doing tests (pytestrunner) added three months
ago June https://github.com/LuminosoInsight/ordered-set/commit/c0b9308988a0c5953d98aecef63bb61f3a758609.
---
 pkgs/development/python-modules/ordered-set/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix
index bf20f7827be3..4044ad3f2fd1 100644
--- a/pkgs/development/python-modules/ordered-set/default.nix
+++ b/pkgs/development/python-modules/ordered-set/default.nix
@@ -1,10 +1,10 @@
-{ buildPythonPackage, fetchPypi, lib, pytest }:
+{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   pname = "ordered-set";
   version = "3.0.1";
 
-  buildInputs = [ pytest ];
+  buildInputs = [ pytest pytestrunner ];
 
   src = fetchPypi {
     inherit pname version;
@@ -21,6 +21,3 @@ buildPythonPackage rec {
     maintainers = [ lib.maintainers.MostAwesomeDude ];
   };
 }
-
-
-

From 29cdfe021872dbb2e6a01f2f52a19737430a9a0e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 7 Sep 2018 00:54:22 -0700
Subject: [PATCH 0453/3253] linuxPackages.bcc: 0.6.1 -> 0.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bcc/versions
---
 pkgs/os-specific/linux/bcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index a02127ab7989..5a40368f3ceb 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -4,14 +4,14 @@
 }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "0.6.1";
+  version = "0.7.0";
   name = "bcc-${version}";
 
   src = fetchFromGitHub {
     owner  = "iovisor";
     repo   = "bcc";
     rev    = "v${version}";
-    sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj";
+    sha256 = "1ww7l0chx2ivw9d2ahxjyhxmh6hz3w5z69r4lz02f0361rnrvk7f";
   };
 
   format = "other";

From 0e4197b34bf5dd877817165fedcb9401f019d656 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 7 Sep 2018 11:36:20 +0300
Subject: [PATCH 0454/3253] julia: readd julia_06 name, make julia an alias
 that selects a version, as we usually do for incompatible versions

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abf914f87103..0bbf7fb622c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6908,7 +6908,7 @@ with pkgs;
 
   jikes = callPackage ../development/compilers/jikes { };
 
-  julia = callPackage ../development/compilers/julia {
+  julia_06 = callPackage ../development/compilers/julia {
     gmp = gmp6;
     openblas = openblasCompat;
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
@@ -6927,6 +6927,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
+  julia = julia_06;
+
   jwasm =  callPackage ../development/compilers/jwasm { };
 
   kotlin = callPackage ../development/compilers/kotlin { };

From 54b665286880074d26026658e301245e9b4f596a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 7 Sep 2018 11:37:39 +0300
Subject: [PATCH 0455/3253] julia: add garrison as maintainer

suggested in
https://github.com/NixOS/nixpkgs/pull/44191#discussion_r215802530

participates in upstream development
---
 pkgs/development/compilers/julia/shared.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index 41c9c57bd034..e07c2c04b92d 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -211,7 +211,7 @@ stdenv.mkDerivation rec {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = https://julialang.org/;
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ raskin rob ];
+    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     broken = stdenv.isi686;
   };

From 1d497bbff1932942c1243650267d998ca7cbc6dd Mon Sep 17 00:00:00 2001
From: David Smith <shmish111@gmail.com>
Date: Wed, 1 Aug 2018 13:36:16 +0100
Subject: [PATCH 0456/3253] nixos/riemann: refactor config

Previously it was only possible to use very simple Riemann config.
For more complicated scenarios you need a directory of clojure
files and the config file that riemann starts with should be in this
directory.
---
 nixos/modules/services/monitoring/riemann.nix | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix
index 237de53456f9..13d2b1cc0602 100644
--- a/nixos/modules/services/monitoring/riemann.nix
+++ b/nixos/modules/services/monitoring/riemann.nix
@@ -17,9 +17,9 @@ let
 
   launcher = writeScriptBin "riemann" ''
     #!/bin/sh
-    exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \
+    exec ${jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOpts} \
       -cp ${classpath} \
-      riemann.bin ${writeText "riemann-config.clj" riemannConfig}
+      riemann.bin ${cfg.configFile}
   '';
 
 in {
@@ -37,7 +37,8 @@ in {
       config = mkOption {
         type = types.lines;
         description = ''
-          Contents of the Riemann configuration file.
+          Contents of the Riemann configuration file. For more complicated
+          config you should use configFile.
         '';
       };
       configFiles = mkOption {
@@ -47,7 +48,15 @@ in {
           Extra files containing Riemann configuration. These files will be
           loaded at runtime by Riemann (with Clojure's
           <literal>load-file</literal> function) at the end of the
-          configuration.
+          configuration if you use the config option, this is ignored if you
+          use configFile.
+        '';
+      };
+      configFile = mkOption {
+        type = types.str;
+        description = ''
+          A Riemann config file. Any files in the same directory as this file
+          will be added to the classpath by Riemann.
         '';
       };
       extraClasspathEntries = mkOption {
@@ -77,6 +86,10 @@ in {
       group = "riemann";
     };
 
+    services.riemann.configFile = mkDefault (
+      writeText "riemann-config.clj" riemannConfig
+    );
+
     systemd.services.riemann = {
       wantedBy = [ "multi-user.target" ];
       path = [ inetutils ];
@@ -84,6 +97,7 @@ in {
         User = "riemann";
         ExecStart = "${launcher}/bin/riemann";
       };
+      serviceConfig.LimitNOFILE = 65536;
     };
 
   };

From 66e12889621e33d0bbd33ceffc88835fdbeaf17c Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 05:25:53 -0400
Subject: [PATCH 0457/3253] pythonPackages.kubernetes: add missing dependency
 (#46179)

fix build issue from missing dependency `adal`. This is due to `adal`
being added as a dependency in July
23rd. https://github.com/kubernetes-client/python/commit/9afec55f4a765b62e9e5b67dffa9d8f68a520987#diff-b4ef698db8ca845e5845c4618278f29a
---
 pkgs/development/python-modules/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 030766eb6982..55d29729db83 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
-  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth,
+  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal,
   isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
-  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ];
+  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ];
 
   meta = with stdenv.lib; {
     description = "Kubernetes python client";

From ec0f3bc0fb3444f08c17daca8e66c2fc01ae2232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 7 Sep 2018 02:26:59 -0700
Subject: [PATCH 0458/3253] calamares: 3.2.1 -> 3.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/calamares/versions
---
 pkgs/tools/misc/calamares/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index e154e217e951..c799b08bd446 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.2.1";
+  version = "3.2.2";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9";
+    sha256 = "14hsv2m0jza33kf68l3rhqfjj7224fmvgvk1kg2qwhvplpjdn16v";
   };
 
   buildInputs = [

From d710765f52f71e0cc6cf331678677a36aabfda1c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 4 Sep 2018 14:42:54 +0200
Subject: [PATCH 0459/3253] google-cloud-sdk: 206.0.0 -> 215.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 8b98636b3475..016ea957f6c7 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -19,18 +19,18 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645";
+      sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a";
+      sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "206.0.0";
+  version = "215.0.0";
 
   src = fetchurl (sources name stdenv.hostPlatform.system);
 

From 52d3fc4780dc8ba92627474118e8aaf2edfdde2c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 7 Sep 2018 12:22:56 +0200
Subject: [PATCH 0460/3253] monkeysphere: Wrap all relevant programs

---
 pkgs/tools/security/monkeysphere/default.nix | 37 ++++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index badea48cec48..bafe8cdf500b 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, makeWrapper
-, perl, perlPackages, libassuan, libgcrypt
+, perl, libassuan, libgcrypt
+, perlPackages, lockfileProgs, gnupg
 }:
 
 stdenv.mkDerivation rec {
@@ -11,27 +12,33 @@ stdenv.mkDerivation rec {
     sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
   };
 
-  buildInputs = [ makeWrapper perl libassuan libgcrypt ];
-
   patches = [ ./monkeysphere.patch ];
 
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl libassuan libgcrypt ];
+
   makeFlags = ''
     PREFIX=/
     DESTDIR=$(out)
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/openpgp2ssh --prefix PERL5LIB : \
-      "${with perlPackages; stdenv.lib.makePerlPath [
-        CryptOpenSSLRSA
-        CryptOpenSSLBignum
-      ]}"
-    wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\
-      "${with perlPackages; stdenv.lib.makePerlPath [
-        CryptOpenSSLRSA
-        CryptOpenSSLBignum
-      ]}"
-  '';
+  postFixup =
+    let wrapMonkeysphere = runtimeDeps: program:
+          "wrapProgram $out/bin/${program} --prefix PERL5LIB : "
+            + (with perlPackages; stdenv.lib.makePerlPath [
+                CryptOpenSSLRSA
+                CryptOpenSSLBignum
+              ])
+            + stdenv.lib.optionalString
+                (builtins.length runtimeDeps > 0)
+                " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"
+            + "\n";
+        wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings
+          (wrapMonkeysphere runtimeDeps)
+          programs;
+    in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ]
+      + wrapPrograms [ ] [ "../share/monkeysphere/keytrans" "openpgp2ssh" ]
+      + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ];
 
   meta = with stdenv.lib; {
     homepage = http://web.monkeysphere.info/;

From d261df5fc15d41a4745e1f1482fd630d207d3f79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Fri, 7 Sep 2018 12:58:53 +0200
Subject: [PATCH 0461/3253] python2Packages.spacy_models: update all models to
 version 2.0.0 (#46182)

Update the model list to those models that are compatibly with the
latest spaCy version:

https://github.com/explosion/spacy-models/blob/master/compatibility.json

The updated model file evaluates to the following packages:

python2Packages.spacy_models.de_core_news_sm
python2Packages.spacy_models.en_core_web_lg
python2Packages.spacy_models.en_core_web_md
python2Packages.spacy_models.en_core_web_sm
python2Packages.spacy_models.en_vectors_web_lg
python2Packages.spacy_models.es_core_news_md
python2Packages.spacy_models.es_core_news_sm
python2Packages.spacy_models.fr_core_news_md
python2Packages.spacy_models.fr_core_news_sm
python2Packages.spacy_models.it_core_news_sm
python2Packages.spacy_models.nl_core_news_sm
python2Packages.spacy_models.pt_core_news_sm
python2Packages.spacy_models.xx_ent_wiki_sm
python3Packages.spacy_models.de_core_news_sm
python3Packages.spacy_models.en_core_web_lg
python3Packages.spacy_models.en_core_web_md
python3Packages.spacy_models.en_core_web_sm
python3Packages.spacy_models.en_vectors_web_lg
python3Packages.spacy_models.es_core_news_md
python3Packages.spacy_models.es_core_news_sm
python3Packages.spacy_models.fr_core_news_md
python3Packages.spacy_models.fr_core_news_sm
python3Packages.spacy_models.it_core_news_sm
python3Packages.spacy_models.nl_core_news_sm
python3Packages.spacy_models.pt_core_news_sm
python3Packages.spacy_models.xx_ent_wiki_sm
---
 .../python-modules/spacy/models.json          | 82 +++++++++++++------
 1 file changed, 59 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index e9c163c65259..34b8082872b7 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,42 +1,78 @@
 [{
-  "pname": "es_core_web_md",
-  "version": "1.0.0",
-  "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s",
+  "pname": "de_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a",
   "license": "cc-by-sa-40"
 },
 {
-  "pname": "fr_depvec_web_lg",
-  "version": "1.0.0",
-  "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka",
-  "license": "cc-by-nc-sa-40"
+  "pname": "en_core_web_lg",
+  "version": "2.0.0",
+  "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw",
+  "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_md",
-  "version": "1.2.1",
-  "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3",
-  "license": "cc-by-sa-40"
-},
-{
-  "pname": "en_depent_web_md",
-  "version": "1.2.1",
-  "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52",
+  "version": "2.0.0",
+  "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_sm",
-  "version": "1.2.0",
-  "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528",
+  "version": "2.0.0",
+  "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx",
   "license": "cc-by-sa-40"
 },
 {
-  "pname": "de_core_news_md",
-  "version": "1.0.0",
-  "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g",
+  "pname": "en_vectors_web_lg",
+  "version": "2.0.0",
+  "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw",
   "license": "cc-by-sa-40"
 },
 {
-  "pname": "en_vectors_glove_md",
-  "version": "1.0.0",
-  "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6",
+  "pname": "es_core_news_md",
+  "version": "2.0.0",
+  "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "es_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "fr_core_news_md",
+  "version": "2.0.0",
+  "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "fr_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "it_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "nl_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "pt_core_news_sm",
+  "version": "2.0.0",
+  "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g",
+  "license": "cc-by-sa-40"
+},
+{
+  "pname": "xx_ent_wiki_sm",
+  "version": "2.0.0",
+  "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35",
   "license": "cc-by-sa-40"
 }]

From b54987715bf9240622a4d135217fe2201d7cd3d0 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sat, 6 Jan 2018 13:25:13 +0000
Subject: [PATCH 0462/3253] weechat: add NixOS module

---
 nixos/modules/module-list.nix           |  1 +
 nixos/modules/services/misc/weechat.nix | 67 +++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 nixos/modules/services/misc/weechat.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..d3d298840de0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -406,6 +406,7 @@
   ./services/misc/taskserver
   ./services/misc/tzupdate.nix
   ./services/misc/uhub.nix
+  ./services/misc/weechat.nix
   ./services/misc/xmr-stak.nix
   ./services/misc/zookeeper.nix
   ./services/monitoring/apcupsd.nix
diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
new file mode 100644
index 000000000000..535a7f9ef91f
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.weechat;
+in
+
+{
+  options.services.weechat = {
+    enable = mkEnableOption "weechat";
+    init = mkOption {
+      description = "Weechat commands applied at start, one command per line.";
+      example = ''
+        /set relay.network.password correct-horse-battery-staple
+        /relay add weechat 9001
+      '';
+      type = types.str;
+      default = "";
+    };
+    root = mkOption {
+      description = "Weechat state directory.";
+      type = types.str;
+      default = "/var/lib/weechat";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users = {
+      users.weechat = {
+        createHome = true;
+        group = "weechat";
+        home = cfg.root;
+      };
+    };
+
+    systemd.services.weechat = {
+      environment.WEECHAT_HOME = cfg.root;
+      serviceConfig = {
+        User = "weechat";
+        Group = "weechat";
+      };
+      script = "exec ${pkgs.screen}/bin/screen -D -m ${pkgs.weechat}/bin/weechat";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network.target" ];
+    };
+
+    systemd.paths.weechat-fifo = {
+      pathConfig = {
+        PathExists = "${cfg.root}/weechat_fifo";
+        Unit = "weechat-apply-init.service";
+      };
+      wantedBy = [ "multi-user.target" ];
+    };
+
+    systemd.services.weechat-apply-init = let
+      initFile = pkgs.writeText "weechat-init" cfg.init;
+    in {
+      script = "sed 's/^/*/' ${initFile} > ${cfg.root}/weechat_fifo";
+      serviceConfig = {
+        Type = "oneshot";
+        User = "weechat";
+        Group = "weechat";
+      };
+    };
+  };
+}

From a8efe614123e6be5ecd0661c9a9f07e9a6c57ec3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 5 Sep 2018 17:01:45 +0200
Subject: [PATCH 0463/3253] weechat: 2.1 -> 2.2; improve package configuration

This aims to make the `weechat` package even more configurable. It
allows to specify scripts and commands using the `configure` function
inside a `weechat.override` expression.

The package can be configured like this:

```
with import <nixpkgs> { };
weechat.override {
  plugins = { availablePlugins, ... }: {
    plugins = builtins.attrValues availablePlugins;

    init = ''
      /set foo bar
      /server add freenode chat.freenode.org
    '';

    scripts = [ "/path/to/script.py" ];
  };
}
```

All commands are passed to `weechat --run-command "/set foo bar;/server ..."`.

The `plugins' attribute is not necessarily required anymore, if it's
sufficient to add `init' commands, the `plugins' will be
`builtins.attrValues availablePlugins' by default.

Additionally the result contains `weechat` and `weechat-headless`
(introduced in WeeChat 2.1) now.
---
 doc/package-notes.xml                         |  51 ++++++++
 .../irc/weechat/aggregate-commands.patch      | 110 ++++++++++++++++++
 .../networking/irc/weechat/default.nix        |  90 ++++++++------
 .../irc/weechat/scripts/default.nix           |  11 ++
 .../weechat-matrix-bridge/default.nix         |   2 +
 .../weechat-matrix-bridge/library-path.patch  |   0
 .../weechat/scripts}/weechat-xmpp/default.nix |   2 +
 .../scripts}/weechat-xmpp/libpath.patch       |   0
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   8 +-
 10 files changed, 236 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/weechat/aggregate-commands.patch
 create mode 100644 pkgs/applications/networking/irc/weechat/scripts/default.nix
 rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-matrix-bridge/default.nix (96%)
 rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-matrix-bridge/library-path.patch (100%)
 rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-xmpp/default.nix (95%)
 rename pkgs/applications/networking/{instant-messengers => irc/weechat/scripts}/weechat-xmpp/libpath.patch (100%)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index c2aef8937b06..1f088e8aaa0e 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -671,6 +671,8 @@ overrides = super: self: rec {
     plugins = with availablePlugins; [ python perl ];
   }
 }</programlisting>
+    If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal>
+    attribute, <literal>availablePlugins</literal> will be used automatically.
   </para>
 
   <para>
@@ -704,6 +706,55 @@ overrides = super: self: rec {
 }; }
 </programlisting>
   </para>
+  <para>
+    WeeChat allows to set defaults on startup using the <literal>--run-command</literal>.
+    The <literal>configure</literal> method can be used to pass commands to the program:
+<programlisting>weechat.override {
+  configure = { availablePlugins, ... }: {
+    init = ''
+      /set foo bar
+      /server add freenode chat.freenode.org
+    '';
+  };
+}</programlisting>
+    Further values can be added to the list of commands when running
+    <literal>weechat --run-command "your-commands"</literal>.
+  </para>
+  <para>
+    Additionally it's possible to specify scripts to be loaded when starting <literal>weechat</literal>.
+    These will be loaded before the commands from <literal>init</literal>:
+<programlisting>weechat.override {
+  configure = { availablePlugins, ... }: {
+    scripts = with pkgs.weechatScripts; [
+      weechat-xmpp weechat-matrix-bridge wee-slack
+    ];
+    init = ''
+      /set plugins.var.python.jabber.key "val"
+    '':
+  };
+}</programlisting>
+  </para>
+  <para>
+    In <literal>nixpkgs</literal> there's a subpackage which contains derivations for
+    WeeChat scripts. Such derivations expect a <literal>passthru.scripts</literal> attribute
+    which contains a list of all scripts inside the store path. Furthermore all scripts
+    have to live in <literal>$out/share</literal>. An exemplary derivation looks like this:
+<programlisting>{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "exemplary-weechat-script";
+  src = fetchurl {
+    url = "https://scripts.tld/your-scripts.tar.gz";
+    sha256 = "...";
+  };
+  passthru.scripts = [ "foo.py" "bar.lua" ];
+  installPhase = ''
+    mkdir $out/share
+    cp foo.py $out/share
+    cp bar.lua $out/share
+  '';
+}</programlisting>
+  </para>
  </section>
  <section xml:id="sec-citrix">
   <title>Citrix Receiver</title>
diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
new file mode 100644
index 000000000000..41e3c54a2d57
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch
@@ -0,0 +1,110 @@
+diff --git a/src/core/wee-command.c b/src/core/wee-command.c
+index 91c3c068d..8105e4171 100644
+--- a/src/core/wee-command.c
++++ b/src/core/wee-command.c
+@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list)
+ void
+ command_startup (int plugins_loaded)
+ {
++    int i;
++
+     if (plugins_loaded)
+     {
+         command_exec_list (CONFIG_STRING(config_startup_command_after_plugins));
+-        command_exec_list (weechat_startup_commands);
++        if (weechat_startup_commands)
++        {
++            for (i = 0; i < weelist_size (weechat_startup_commands); i++)
++            {
++                command_exec_list (
++                    weelist_string (
++                        weelist_get (weechat_startup_commands, i)));
++            }
++        }
+     }
+     else
+         command_exec_list (CONFIG_STRING(config_startup_command_before_plugins));
+diff --git a/src/core/weechat.c b/src/core/weechat.c
+index f74598ad5..ff2e539d1 100644
+--- a/src/core/weechat.c
++++ b/src/core/weechat.c
+@@ -60,6 +60,7 @@
+ #include "wee-eval.h"
+ #include "wee-hdata.h"
+ #include "wee-hook.h"
++#include "wee-list.h"
+ #include "wee-log.h"
+ #include "wee-network.h"
+ #include "wee-proxy.h"
+@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0;             /* remove init/deinit of gnutls      */
+                                        /* (useful with valgrind/electric-f.)*/
+ int weechat_no_gcrypt = 0;             /* remove init/deinit of gcrypt      */
+                                        /* (useful with valgrind)            */
+-char *weechat_startup_commands = NULL; /* startup commands (-r flag)        */
++struct t_weelist *weechat_startup_commands = NULL; /* startup commands      */
++                                                   /* (option -r)           */
+ 
+ 
+ /*
+@@ -152,9 +154,13 @@ weechat_display_usage ()
+           "  -h, --help               display this help\n"
+           "  -l, --license            display WeeChat license\n"
+           "  -p, --no-plugin          don't load any plugin at startup\n"
+-          "  -r, --run-command <cmd>  run command(s) after startup\n"
+-          "                           (many commands can be separated by "
+-          "semicolons)\n"
++          "  -P, --plugins <plugins>  load only these plugins at startup\n"
++          "                           (see /help weechat.plugin.autoload)\n"
++          "  -r, --run-command <cmd>  run command(s) after startup;\n"
++          "                           many commands can be separated by "
++          "semicolons,\n"
++          "                           this option can be given multiple "
++          "times\n"
+           "  -s, --no-script          don't load any script at startup\n"
+           "      --upgrade            upgrade WeeChat using session files "
+           "(see /help upgrade in WeeChat)\n"
+@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[])
+         {
+             if (i + 1 < argc)
+             {
+-                if (weechat_startup_commands)
+-                    free (weechat_startup_commands);
+-                weechat_startup_commands = strdup (argv[++i]);
++                if (!weechat_startup_commands)
++                    weechat_startup_commands = weelist_new ();
++                weelist_add (weechat_startup_commands, argv[++i],
++                             WEECHAT_LIST_POS_END, NULL);
+             }
+             else
+             {
+@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash)
+         free (weechat_home);
+     if (weechat_local_charset)
+         free (weechat_local_charset);
++    if (weechat_startup_commands)
++        weelist_free (weechat_startup_commands);
+ 
+     if (crash)
+         abort ();
+diff --git a/src/core/weechat.h b/src/core/weechat.h
+index 9420ff415..cbb565a03 100644
+--- a/src/core/weechat.h
++++ b/src/core/weechat.h
+@@ -96,6 +96,8 @@
+ /* name of environment variable with an extra lib dir */
+ #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR"
+ 
++struct t_weelist;
++
+ /* global variables and functions */
+ extern int weechat_headless;
+ extern int weechat_debug_core;
+@@ -112,7 +114,7 @@ extern char *weechat_local_charset;
+ extern int weechat_plugin_no_dlclose;
+ extern int weechat_no_gnutls;
+ extern int weechat_no_gcrypt;
+-extern char *weechat_startup_commands;
++extern struct t_weelist *weechat_startup_commands;
+ 
+ extern void weechat_term_check ();
+ extern void weechat_shutdown (int return_code, int crash);
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 16162435e09a..eaf7410a3171 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -12,7 +12,8 @@
 , tclSupport ? true, tcl
 , extraBuildInputs ? []
 , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; }
-, runCommand }:
+, runCommand, buildEnv
+}:
 
 let
   inherit (pythonPackages) python;
@@ -29,12 +30,12 @@ let
   weechat =
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.1";
+      version = "2.2";
       name = "weechat-${version}";
 
       src = fetchurl {
         url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8";
+        sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -69,6 +70,13 @@ let
         done
       '';
 
+      # remove when bumping to the latest version.
+      # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c`
+      # from weechat upstream to weechat-2.2.
+      patches = [
+        ./aggregate-commands.patch
+      ];
+
       meta = {
         homepage = http://www.weechat.org/;
         description = "A fast, light and extensible chat client";
@@ -78,38 +86,38 @@ let
           on https://nixos.org/nixpkgs/manual/#sec-weechat .
         '';
         license = stdenv.lib.licenses.gpl3;
-        maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ];
+        maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ];
         platforms = stdenv.lib.platforms.unix;
       };
     };
 in if configure == null then weechat else
   let
     perlInterpreter = perl;
-    config = configure {
-      availablePlugins = let
-          simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
-        in rec {
-          python = {
-            pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
-            withPackages = pkgsFun: (python // {
-              extraEnv = ''
-                export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
-              '';
-            });
-          };
-          perl = (simplePlugin "perl") // {
+    availablePlugins = let
+        simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";};
+      in rec {
+        python = {
+          pluginFile = "${weechat.python}/lib/weechat/plugins/python.so";
+          withPackages = pkgsFun: (python // {
             extraEnv = ''
-              export PATH="${perlInterpreter}/bin:$PATH"
+              export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}"
             '';
-          };
-          tcl = simplePlugin "tcl";
-          ruby = simplePlugin "ruby";
-          guile = simplePlugin "guile";
-          lua = simplePlugin "lua";
+          });
         };
+        perl = (simplePlugin "perl") // {
+          extraEnv = ''
+            export PATH="${perlInterpreter}/bin:$PATH"
+          '';
+        };
+        tcl = simplePlugin "tcl";
+        ruby = simplePlugin "ruby";
+        guile = simplePlugin "guile";
+        lua = simplePlugin "lua";
       };
 
-    inherit (config) plugins;
+    config = configure { inherit availablePlugins; };
+
+    plugins = config.plugins or (builtins.attrValues availablePlugins);
 
     pluginsDir = runCommand "weechat-plugins" {} ''
       mkdir -p $out/plugins
@@ -117,13 +125,29 @@ in if configure == null then weechat else
         ln -s $plugin $out/plugins
       done
     '';
-  in (writeScriptBin "weechat" ''
-    #!${stdenv.shell}
-    export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
-    ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
-    exec ${weechat}/bin/weechat "$@"
-  '') // {
-    name = weechat.name;
-    unwrapped = weechat;
-    meta = weechat.meta;
+
+    init = let
+      init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or "");
+
+      mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}");
+
+      scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
+        [ ] (config.scripts or []));
+    in "${scripts}\n${init}";
+
+    mkWeechat = bin: (writeScriptBin bin ''
+      #!${stdenv.shell}
+      export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
+      ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
+      exec ${weechat}/bin/${bin} "$@" --run-command "${init}"
+    '') // {
+      inherit (weechat) name meta;
+      unwrapped = weechat;
+    };
+  in buildEnv {
+    name = "weechat-bin-env";
+    paths = [
+      (mkWeechat "weechat")
+      (mkWeechat "weechat-headless")
+    ];
   }
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
new file mode 100644
index 000000000000..2a524bc4efae
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -0,0 +1,11 @@
+{ callPackage, luaPackages, pythonPackages }:
+
+{
+  weechat-xmpp = callPackage ./weechat-xmpp {
+    inherit (pythonPackages) pydns;
+  };
+
+  weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
+    inherit (luaPackages) cjson;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
similarity index 96%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 4a8ffaaa261a..1018e46ec625 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
       --replace "__NIX_LIB_PATH__" "$out/lib/?.so"
   '';
 
+  passthru.scripts = [ "olm.lua" "matrix.lua" ];
+
   installPhase = ''
     mkdir -p $out/{share,lib}
 
diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
similarity index 95%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
index 4b92d1212c55..dad5b9c5e02a 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
     })
   ];
 
+  passthru.scripts = [ "jabber.py" ];
+
   meta = with stdenv.lib; {
     description = "A fork of the jabber plugin for weechat";
     homepage = "https://github.com/sleduc/weechat-xmpp";
diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch
rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c05f01ec839e..fed02f40134d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -292,6 +292,8 @@ mapAliases ({
   vimprobable2Wrapper = vimprobable2; # added 2015-01
   virtviewer = virt-viewer; # added 2015-12-24
   vorbisTools = vorbis-tools; # added 2016-01-26
+  weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06
+  weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
   wireguard = wireguard-tools; # added 2018-05-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38755b611e54..c630965604c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19175,13 +19175,7 @@ with pkgs;
     guile = guile_2_0;
   };
 
-  weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge {
-    inherit (luaPackages) cjson;
-  };
-
-  weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {
-    inherit (pythonPackages) pydns;
-  };
+  weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { };
 
   westonLite = weston.override {
     pango = null;

From 71e6dfdaeac64673ede9f38acd938cf27b1b70cc Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 6 Sep 2018 15:17:52 +0100
Subject: [PATCH 0464/3253] strongswan: set the right dir for TLS CA cert

This fixes an issue where the strongswan NM client is not able to
connect to a VPN. By default it tries to load the trust CA from
/usr/share/ca-certificates which doesn't exist in NixOS and most modern
distros.

See debian-related issue:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835095
---
 pkgs/tools/networking/strongswan/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 2f19294784ec..d176c08829e5 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -78,7 +78,10 @@ stdenv.mkDerivation rec {
          "--with-tss=trousers"
          "--enable-aikgen"
          "--enable-sqlite" ]
-    ++ optional enableNetworkManager "--enable-nm";
+    ++ optionals enableNetworkManager [
+         "--enable-nm"
+         "--with-nm-ca-dir=/etc/ssl/certs"
+    ];
 
   postInstall = ''
     # this is needed for l2tp

From 18d419141df4958e8438b7883d6c061609f8170b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 5 Sep 2018 17:01:57 +0200
Subject: [PATCH 0465/3253] nixos/weechat: cleanup module, add module
 documentation

This adds several improvements the previously introduced
`services.weechat` module:

* Dropped `services.weechat.init` as the initialization script can now
  be done on package-level since 2af41719bc using the `configure`
  function.

* Added `sessionName` option to explicitly configure a name for the
  `screen` session (by default: weechat-screen).

* Added `binary` option to configure the binary name (e.g.
  `weechat-headless`).

* Added docs regarding `screen` session and `weechat.service`.
---
 nixos/modules/services/misc/weechat.nix | 47 ++++++++-----------
 nixos/modules/services/misc/weechat.xml | 61 +++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 29 deletions(-)
 create mode 100644 nixos/modules/services/misc/weechat.xml

diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
index 535a7f9ef91f..1fcfb440485d 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixos/modules/services/misc/weechat.nix
@@ -9,28 +9,33 @@ in
 {
   options.services.weechat = {
     enable = mkEnableOption "weechat";
-    init = mkOption {
-      description = "Weechat commands applied at start, one command per line.";
-      example = ''
-        /set relay.network.password correct-horse-battery-staple
-        /relay add weechat 9001
-      '';
-      type = types.str;
-      default = "";
-    };
     root = mkOption {
       description = "Weechat state directory.";
       type = types.str;
       default = "/var/lib/weechat";
     };
+    sessionName = mkOption {
+      description = "Name of the `screen' session for weechat.";
+      default = "weechat-screen";
+      type = types.str;
+    };
+    binary = mkOption {
+      description = "Binary to execute (by default \${weechat}/bin/weechat).";
+      example = literalExample ''
+        ''${pkgs.weechat}/bin/weechat-headless
+      '';
+      default = "${pkgs.weechat}/bin/weechat";
+    };
   };
 
   config = mkIf cfg.enable {
     users = {
+      groups.weechat = {};
       users.weechat = {
         createHome = true;
         group = "weechat";
         home = cfg.root;
+        isSystemUser = true;
       };
     };
 
@@ -39,29 +44,13 @@ in
       serviceConfig = {
         User = "weechat";
         Group = "weechat";
+        RemainAfterExit = "yes";
       };
-      script = "exec ${pkgs.screen}/bin/screen -D -m ${pkgs.weechat}/bin/weechat";
+      script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
       wantedBy = [ "multi-user.target" ];
       wants = [ "network.target" ];
     };
-
-    systemd.paths.weechat-fifo = {
-      pathConfig = {
-        PathExists = "${cfg.root}/weechat_fifo";
-        Unit = "weechat-apply-init.service";
-      };
-      wantedBy = [ "multi-user.target" ];
-    };
-
-    systemd.services.weechat-apply-init = let
-      initFile = pkgs.writeText "weechat-init" cfg.init;
-    in {
-      script = "sed 's/^/*/' ${initFile} > ${cfg.root}/weechat_fifo";
-      serviceConfig = {
-        Type = "oneshot";
-        User = "weechat";
-        Group = "weechat";
-      };
-    };
   };
+
+  meta.doc = ./weechat.xml;
 }
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
new file mode 100644
index 000000000000..de86dede2eb5
--- /dev/null
+++ b/nixos/modules/services/misc/weechat.xml
@@ -0,0 +1,61 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-services-weechat">
+
+<title>WeeChat</title>
+<para><link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.</para>
+
+<section><title>Basic Usage</title>
+<para>
+By default, the module creates a
+<literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit
+which runs the chat client in a detached
+<literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session.
+
+</para>
+
+<para>
+This can be done by enabling the <literal>weechat</literal> service:
+
+<programlisting>
+{ ... }:
+
+{
+  <link linkend="opt-services.weechat.enable">services.weechat.enable</link> = true;
+}
+</programlisting>
+</para>
+<para>
+The service is managed by a dedicated user
+named <literal>weechat</literal> in the state directory
+<literal>/var/lib/weechat</literal>.
+</para>
+</section>
+<section><title>Re-attaching to WeeChat</title>
+<para>
+WeeChat runs in a screen session owned by a dedicated user. To explicitly
+allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked
+by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support:
+
+<programlisting>
+{
+  <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = ''
+    multiuser on
+    acladd normal_user
+  '';
+}
+</programlisting>
+
+Now, the session can be re-attached like this:
+
+<programlisting>
+screen -r weechat-screen
+</programlisting>
+</para>
+<para>
+<emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
+</para>
+</section>
+</chapter>

From f5becfb5b02f9071472abe61e86460e41dbb7a5c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 6 Sep 2018 15:10:37 +0200
Subject: [PATCH 0466/3253] weechatScripts.wee-slack: init at 2.1.1

---
 .../irc/weechat/scripts/default.nix           |  2 ++
 .../irc/weechat/scripts/wee-slack/default.nix | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix

diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 2a524bc4efae..21038a2fa966 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -8,4 +8,6 @@
   weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
     inherit (luaPackages) cjson;
   };
+
+  wee-slack = callPackage ./wee-slack { };
 }
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
new file mode 100644
index 000000000000..1b6e52157449
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "wee-slack-${version}";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    repo = "wee-slack";
+    owner = "wee-slack";
+    rev = "v${version}";
+    sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc";
+  };
+
+  passthru.scripts = [ "wee_slack.py" ];
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp wee_slack.py $out/share/wee_slack.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/wee-slack/wee-slack;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+    description = ''
+      A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc..
+    '';
+  };
+}

From 969104922005f4c99e87193bb2102984b7af4ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 7 Sep 2018 10:05:17 -0300
Subject: [PATCH 0467/3253] cogl: Add GL_ARB_shader_texture_lod and
 copy_sub_image support

---
 pkgs/development/libraries/cogl/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index e06c71c15db4..c624f9537fb3 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
 , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3
 , mesa_noglu
 , gstreamerSupport ? true, gst_all_1 }:
@@ -14,6 +14,23 @@ in stdenv.mkDerivation rec {
     sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
   };
 
+  patches = [
+    # Some deepin packages need the following patches. They have been
+    # submitted by Fedora on the GNOME Bugzilla
+    # (https://bugzilla.gnome.org/787443). Upstream thinks the patch
+    # could be merged, but dev can not make a new release.
+
+    (fetchpatch {
+      url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589;
+      sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998";
+    })
+
+    (fetchpatch {
+      url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
+      sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig libintl ];
 
   configureFlags = [

From d113ca46a789a37160a781df295965f486ceafa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 7 Sep 2018 10:06:41 -0300
Subject: [PATCH 0468/3253] clutter: enable evdev input (needed by some Deepin
 packages)

---
 pkgs/development/libraries/clutter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 705aa7252d1f..d8150fd11508 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib,
-gobjectIntrospection, gtk3, gnome3
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
+, gobjectIntrospection, gtk3, gnome3, libinput, libgudev, libxkbcommon
 }:
 
 let
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json-glib gobjectIntrospection libxcb
+      atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

From 6d81d8254c56ea3820a5daa339b31915d2c73580 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 7 Sep 2018 13:07:10 +0200
Subject: [PATCH 0469/3253] monkeysphere: Correctly wrap the keytrans aliases
 (subcommands)

---
 pkgs/tools/security/monkeysphere/default.nix  | 33 +++++++++-----
 .../security/monkeysphere/monkeysphere.patch  | 45 -------------------
 2 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index bafe8cdf500b..f4def72b728c 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -23,22 +23,31 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup =
-    let wrapMonkeysphere = runtimeDeps: program:
-          "wrapProgram $out/bin/${program} --prefix PERL5LIB : "
-            + (with perlPackages; stdenv.lib.makePerlPath [
-                CryptOpenSSLRSA
-                CryptOpenSSLBignum
-              ])
-            + stdenv.lib.optionalString
-                (builtins.length runtimeDeps > 0)
-                " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"
-            + "\n";
+    let wrapperArgs = runtimeDeps:
+          "--prefix PERL5LIB : "
+          + (with perlPackages; stdenv.lib.makePerlPath [
+              CryptOpenSSLRSA
+              CryptOpenSSLBignum
+            ])
+          + stdenv.lib.optionalString
+              (builtins.length runtimeDeps > 0)
+              " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}";
+        wrapMonkeysphere = runtimeDeps: program:
+          "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n";
         wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings
           (wrapMonkeysphere runtimeDeps)
           programs;
     in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ]
-      + wrapPrograms [ ] [ "../share/monkeysphere/keytrans" "openpgp2ssh" ]
-      + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ];
+      + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ]
+      + ''
+        # These 4 programs depend on the program name ($0):
+        for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do
+          rm $out/bin/$program
+          ln -sf keytrans $out/share/monkeysphere/$program
+          makeWrapper $out/share/monkeysphere/$program $out/bin/$program \
+            ${wrapperArgs [ ]}
+        done
+      '';
 
   meta = with stdenv.lib; {
     homepage = http://web.monkeysphere.info/;
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch
index f341ee747bbc..fdf4b9335b19 100644
--- a/pkgs/tools/security/monkeysphere/monkeysphere.patch
+++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch
@@ -28,50 +28,5 @@ diff --git a/src/share/keytrans b/src/share/keytrans
  
  # keytrans: this is an RSA key translation utility; it is capable of
  # transforming RSA keys (both public keys and secret keys) between
-@@ -1083,7 +1083,7 @@ sub packetwalk {
- 
- 
- for (basename($0)) {
--  if (/^pem2openpgp$/) {
-+  if (/pem2openpgp/) {
-     my $rsa;
-     my $stdin;
- 
-@@ -1121,7 +1121,7 @@ for (basename($0)) {
- 		      }
- 		     );
-   }
--  elsif (/^openpgp2ssh$/) {
-+  elsif (/openpgp2ssh/) {
-       my $fpr = shift;
-       my $instream;
-       open($instream,'-');
-@@ -1137,7 +1137,7 @@ for (basename($0)) {
- 	die "No matching key found.\n";
-       }
-   }
--  elsif (/^openpgp2pem$/) {
-+  elsif (/openpgp2pem/) {
-       my $fpr = shift;
-       my $instream;
-       open($instream,'-');
-@@ -1153,7 +1153,7 @@ for (basename($0)) {
- 	die "No matching key found.\n";
-       }
-   }
--  elsif (/^openpgp2spki$/) {
-+  elsif (/openpgp2spki/) {
-       my $fpr = shift;
-       my $instream;
-       open($instream,'-');
-@@ -1165,7 +1165,7 @@ for (basename($0)) {
- 	die "No matching key found.\n";
-       }
-   }
--  elsif (/^keytrans$/) {
-+  elsif (/keytrans/) {
-     # subcommands when keytrans is invoked directly are UNSUPPORTED,
-     # UNDOCUMENTED, and WILL NOT BE MAINTAINED.
-     my $subcommand = shift;
 -- 
 2.16.3

From 2b49b7f608dd9411a48e2e7245225aba3cdf23b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 7 Sep 2018 10:22:12 -0300
Subject: [PATCH 0470/3253] deepin-mutter: init at 3.20.34

---
 .../desktops/deepin/deepin-mutter/default.nix | 61 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-mutter/default.nix

diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix
new file mode 100644
index 000000000000..e397ab53576d
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-mutter/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
+  libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
+  libstartup_notification, libinput, cogl, clutter, systemd
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-mutter";
+  version = "3.20.34";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libtool
+    gnome3.gnome-common
+  ];
+
+  buildInputs = [
+    gnome3.gtk
+    gnome3.gnome-desktop
+    gnome3.gsettings-desktop-schemas
+    gnome3.libgudev
+    gnome3.zenity
+    upower
+    xorg.libxkbfile
+    libxkbcommon
+    libcanberra-gtk3
+    libstartup_notification
+    libinput
+    xkeyboard_config
+    cogl
+    clutter
+    systemd
+  ];
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--enable-native-backend"
+    "--enable-compile-warnings=minimum"
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Base window manager for deepin, fork of gnome mutter";
+    homepage = https://github.com/linuxdeepin/deepin-mutter;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index d8fc63e4f912..c1438012ef51 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -8,6 +8,7 @@ let
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
     deepin-menu = callPackage ./deepin-menu { };
+    deepin-mutter = callPackage ./deepin-mutter { };
     deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;

From 2bec98ae06d21932872a4e9d80fa22bce09db91f Mon Sep 17 00:00:00 2001
From: Andrey Golovizin <ag@sologoc.com>
Date: Fri, 7 Sep 2018 12:13:15 +0200
Subject: [PATCH 0471/3253] pythonPackages.psycopg2: 2.7.1 -> 2.7.5

---
 .../python-modules/psycopg2/default.nix       | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/psycopg2/default.nix

diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
new file mode 100644
index 000000000000..9d15ea694c73
--- /dev/null
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildPythonPackage, isPyPy, fetchPypi, postgresql, openssl }:
+
+buildPythonPackage rec {
+  pname = "psycopg2";
+  version = "2.7.5";
+
+  disabled = isPyPy;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17klx964gw8z0znl0raz3by8vdc7cq5gxj4pdcrfcina84nrdkzc";
+  };
+
+  buildInputs = lib.optional stdenv.isDarwin openssl;
+  propagatedBuildInputs = [ postgresql ];
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "PostgreSQL database adapter for the Python programming language";
+    license = with licenses; [ gpl2 zpl20 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcb9961c01fe..e8bd6950f91a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9776,21 +9776,7 @@ in {
 
   psutil = callPackage ../development/python-modules/psutil { };
 
-  psycopg2 = buildPythonPackage rec {
-    name = "psycopg2-2.7.1";
-    disabled = isPyPy;
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/psycopg2/${name}.tar.gz";
-      sha256 = "86c9355f5374b008c8479bc00023b295c07d508f7c3b91dbd2e74f8925b1d9c6";
-    };
-    buildInputs = optional stdenv.isDarwin pkgs.openssl;
-    propagatedBuildInputs = with self; [ pkgs.postgresql ];
-    doCheck = false;
-    meta = {
-      description = "PostgreSQL database adapter for the Python programming language";
-      license = with licenses; [ gpl2 zpl20 ];
-    };
-  };
+  psycopg2 = callPackage ../development/python-modules/psycopg2 {};
 
   ptpython = callPackage ../development/python-modules/ptpython {};
 

From 11c3fe2258ab086f582a3377c3d3b572e6ad41f8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 6 Sep 2018 14:50:50 -0400
Subject: [PATCH 0472/3253] pythonPackages.selectors2: init at 2.0.1

Added package becuase now dependency of ncclient.
---
 .../python-modules/selectors2/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/selectors2/default.nix

diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix
new file mode 100644
index 000000000000..030178fef830
--- /dev/null
+++ b/pkgs/development/python-modules/selectors2/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, nose, psutil, mock }:
+
+buildPythonPackage rec {
+  version = "2.0.1";
+  pname = "selectors2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884";
+  };
+
+  checkInputs = [ nose psutil mock ];
+
+  checkPhase = ''
+    # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064
+    # Trick to disable certain tests that depend on timing which
+    # will always fail on hydra
+    export TRAVIS=""
+    nosetests tests/test_selectors2.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.github.com/SethMichaelLarson/selectors2;
+    description = "Back-ported, durable, and portable selectors";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 137463b74db6..3ba3cfa6f2f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -536,6 +536,8 @@ in {
 
   seekpath = callPackage ../development/python-modules/seekpath { };
 
+  selectors2 = callPackage ../development/python-modules/selectors2 { };
+
   serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
 
   simpleeval = callPackage ../development/python-modules/simpleeval { };

From a726956b42c92e7a30323d0c3fedbde032db93e3 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 6 Sep 2018 14:51:24 -0400
Subject: [PATCH 0473/3253] pythonPackages.ncclient: refactor

adding selectors2 as dependency of ncclient. Added recently 20 days
ago in August. https://github.com/ncclient/ncclient/commit/8ef20f282877097c8f51604679277db49c39f80c
---
 pkgs/development/python-modules/ncclient/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 9dc7710ff28f..9933e849d0be 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , paramiko
+, selectors2
 , lxml
 , libxml2
 , libxslt
@@ -21,7 +22,7 @@ buildPythonPackage rec {
   checkInputs = [ nose rednose ];
 
   propagatedBuildInputs = [
-    paramiko lxml libxml2 libxslt
+    paramiko lxml libxml2 libxslt selectors2
   ];
 
   checkPhase = ''

From 68bdaad07801af50ae281579b21772bc0184267b Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Thu, 6 Sep 2018 21:56:05 +0200
Subject: [PATCH 0474/3253] hyperscrypt-font: init at 1.1

---
 pkgs/data/fonts/hyperscrypt/default.nix | 40 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/data/fonts/hyperscrypt/default.nix

diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix
new file mode 100644
index 000000000000..80516eb0293c
--- /dev/null
+++ b/pkgs/data/fonts/hyperscrypt/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchzip, lib }:
+
+let
+  version = "1.1";
+  pname = "HyperScrypt";
+in
+
+fetchzip rec {
+  name = "${lib.toLower pname}-font-${version}";
+  url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip";
+  sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m";
+  postFetch = ''
+    mkdir -p $out/share/fonts/{truetype,opentype}
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf
+    unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://velvetyne.fr/fonts/hyper-scrypt/;
+    description = "A modern stencil typeface inspired by stained glass technique";
+    longDescription = ''
+      The Hyper Scrypt typeface was designed for the Hyper Chapelle
+      exhibition. It was commissioned by AAAAA Atelier to Studio
+      Triple's designer Jérémy Landes.  Hyper Scrypt is a modern
+      stencil typeface inspired by the stained glass technique used in
+      the Metz cathedral. It borrows the stained glass method, drawing
+      holes for the light with black lead. This creates a reverse
+      typeface, where the shapes of the letters are drawn by their
+      counters. Hyper Scrypt is at the intersection between 3 metals :
+      the sacred lead of stained glass, the lead of print characters
+      and the heavy metal. Despite its organic look inherited for the
+      molted metal, Hyper Scrypt is based upon a rigorous grid,
+      allowing some neat alignements between shapes in multi lines
+      layouts.
+      '';
+    license = licenses.ofl;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ff605bbd09..1fef7fba2ad9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14939,6 +14939,8 @@ with pkgs;
 
   hanazono = callPackage ../data/fonts/hanazono { };
 
+  hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { };
+
   ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
 
   ibm-plex = callPackage ../data/fonts/ibm-plex { };

From 82f980828df4037b98c11a6490d4f8916b01f570 Mon Sep 17 00:00:00 2001
From: stites <sam@stites.io>
Date: Fri, 7 Sep 2018 10:27:03 -0400
Subject: [PATCH 0475/3253] add stites to maintainers list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6356c0c7cefe..6585203ca216 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3888,6 +3888,11 @@
     github = "StillerHarpo";
     name = "Florian Engel";
   };
+  stites = {
+    email = "sam@stites.io";
+    github = "stites";
+    name = "Sam Stites";
+  };
   stumoss = {
     email = "samoss@gmail.com";
     github = "stumoss";

From f1c30cf77227c2f1964921fa26a2675dd671ff93 Mon Sep 17 00:00:00 2001
From: stites <sam@stites.io>
Date: Fri, 7 Sep 2018 10:27:27 -0400
Subject: [PATCH 0476/3253] noti: init at 3.1.0

---
 pkgs/tools/misc/noti/default.nix | 38 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/noti/default.nix

diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
new file mode 100644
index 000000000000..ac5b4199c216
--- /dev/null
+++ b/pkgs/tools/misc/noti/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "noti-${version}";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "variadico";
+    repo = "noti";
+    rev = "${version}";
+    sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823";
+  };
+
+  goPackagePath = "github.com/variadico/noti";
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}")
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/man/man{1,5}/
+    cp $src/docs/man/noti.1      $out/share/man/man1/
+    cp $src/docs/man/noti.yaml.5 $out/share/man/man5/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Monitor a process and trigger a notification.";
+    longDescription = ''
+      Monitor a process and trigger a notification.
+
+      Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone.
+    '';
+    homepage = https://github.com/variadico/noti;
+    license = licenses.mit;
+    maintainers = [ maintainers.stites ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f563f0dfe243..ede07a467810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1462,6 +1462,8 @@ with pkgs;
 
   noteshrink = callPackage ../tools/misc/noteshrink { };
 
+  noti = callPackage ../tools/misc/noti { };
+
   nrsc5 = callPackage ../applications/misc/nrsc5 { };
 
   nwipe = callPackage ../tools/security/nwipe { };

From d7861ab8b665bdf7665a4e6b58ee6a779a96019b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 7 Sep 2018 17:32:42 +0300
Subject: [PATCH 0477/3253] sbcl: 1.4.7 -> 1.4.10

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a860aa7dc734..34855838fe8b 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.7";
+  version = "1.4.10";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm";
+    sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh";
   };
 
   patchPhase = ''

From 8d063d92a4c4337ae01590f1eff4d417ed8fb412 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 7 Sep 2018 11:36:28 -0400
Subject: [PATCH 0478/3253] geant4: limit platforms to linux

---
 pkgs/development/libraries/physics/geant4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 57d6a87b5943..7123858b8edc 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.geant4.org;
     license = licenses.g4sl;
     maintainers = with maintainers; [ tmplt ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From 79ba5560206e84e11f3bf652ac05594bb166a972 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Sep 2018 08:48:26 -0700
Subject: [PATCH 0479/3253] bear: 2.3.12 -> 2.3.13 (#46308)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bear/versions
---
 pkgs/development/tools/build-managers/bear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index fb12b5a9c14a..51e8d12d3147 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bear-${version}";
-  version = "2.3.12";
+  version = "2.3.13";
 
   src = fetchFromGitHub {
     owner = "rizsotto";
     repo = "Bear";
     rev = version;
-    sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw";
+    sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z";
   };
 
   nativeBuildInputs = [ cmake ];

From 6ae3f9a3f78551d6cb5a769a5003bd1f61ad7f9d Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Fri, 7 Sep 2018 17:56:17 +0200
Subject: [PATCH 0480/3253] phpPackages.composer: 1.6.5 -> 1.7.2 (#46203)

---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index ef6da6ed8042..e8c97f12676e 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -335,11 +335,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.6.5";
+    version = "1.7.2";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7";
+      sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c";
     };
 
     unpackPhase = ":";

From da63c86e3ee6c17d9490a76e1c0068137cc76b31 Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Fri, 7 Sep 2018 17:56:43 +0200
Subject: [PATCH 0481/3253] phpPackages.psysh: 0.9.6 -> 0.9.8 (#46206)

---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index e8c97f12676e..7b071e7c35cc 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -504,11 +504,11 @@ let
 
   psysh = pkgs.stdenv.mkDerivation rec {
     name = "psysh-${version}";
-    version = "0.9.6";
+    version = "0.9.8";
 
     src = pkgs.fetchurl {
       url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
-      sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6";
+      sha256 = "0xs9bl0hplkm2hajmm4qca65bm2x7wnx4vbmk0d2jxpvwrgqgnzd";
     };
 
     phases = [ "installPhase" ];

From 9466627d366b9b22b597093ff10cbf47b0aade28 Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Fri, 7 Sep 2018 17:57:37 +0200
Subject: [PATCH 0482/3253] phpPackages.xdebug26: 2.6.0 -> 2.6.1 (#46205)

---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 7b071e7c35cc..f235cb639df4 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -198,9 +198,9 @@ let
   };
 
   xdebug26 = assert isPhp7; buildPecl {
-    name = "xdebug-2.6.0";
+    name = "xdebug-2.6.1";
 
-    sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm";
+    sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns";
 
     doCheck = true;
     checkTarget = "test";

From 7521f2863d41724f68c66f7d8cb414d39dcbdfcb Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 7 Sep 2018 13:19:00 +0200
Subject: [PATCH 0483/3253] sage: fix numpy and scipy integration

---
 ...{numpy-1.14.3.patch => numpy-1.15.1.patch} | 207 +++++++++++++-----
 .../science/math/sage/sage-src.nix            |  15 +-
 2 files changed, 166 insertions(+), 56 deletions(-)
 rename pkgs/applications/science/math/sage/patches/{numpy-1.14.3.patch => numpy-1.15.1.patch} (78%)

diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
similarity index 78%
rename from pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
rename to pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
index 5927bc116096..9e855ba4ad94 100644
--- a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch
+++ b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch
@@ -1,5 +1,5 @@
 diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst
-index 79b4205fd3..9a89bd2136 100644
+index 2347a1190d..f5b0fe71a4 100644
 --- a/src/doc/en/faq/faq-usage.rst
 +++ b/src/doc/en/faq/faq-usage.rst
 @@ -338,7 +338,7 @@ ints. For example::
@@ -174,7 +174,7 @@ index 5b89cd75ee..e50b2ea5d4 100644
  This creates a random 5x5 matrix ``A``, and solves `Ax=b` where
  ``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg`
 diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx
-index df85cce43d..34ea164be0 100644
+index 60f37f7557..4ac3dedf1d 100644
 --- a/src/sage/calculus/riemann.pyx
 +++ b/src/sage/calculus/riemann.pyx
 @@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values,
@@ -248,7 +248,7 @@ index df85cce43d..34ea164be0 100644
  
      TESTS::
 diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py
-index 61b1003002..4baee9cbbd 100644
+index 0a9bd61267..d2193cc2d6 100644
 --- a/src/sage/combinat/fully_packed_loop.py
 +++ b/src/sage/combinat/fully_packed_loop.py
 @@ -72,11 +72,11 @@ def _make_color_list(n, colors=None,  color_map=None, randomize=False):
@@ -269,10 +269,10 @@ index 61b1003002..4baee9cbbd 100644
          ['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue']
      """
 diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx
-index c37700d14e..49b7298d0b 100644
+index 28779365df..3ab0282861 100644
 --- a/src/sage/finance/time_series.pyx
 +++ b/src/sage/finance/time_series.pyx
-@@ -109,8 +109,8 @@ cdef class TimeSeries:
+@@ -111,8 +111,8 @@ cdef class TimeSeries:
  
              sage: import numpy
              sage: v = numpy.array([[1,2], [3,4]], dtype=float); v
@@ -283,7 +283,7 @@ index c37700d14e..49b7298d0b 100644
              sage: finance.TimeSeries(v)
              [1.0000, 2.0000, 3.0000, 4.0000]
              sage: finance.TimeSeries(v[:,0])
-@@ -2098,14 +2098,14 @@ cdef class TimeSeries:
+@@ -2100,14 +2100,14 @@ cdef class TimeSeries:
  
              sage: w[0] = 20
              sage: w
@@ -301,7 +301,7 @@ index c37700d14e..49b7298d0b 100644
              sage: v
              [20.0000, -3.0000, 4.5000, -2.0000]
 diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py
-index 931a4b41e4..bf33fc483d 100644
+index aff552f450..7a6df931e7 100644
 --- a/src/sage/functions/hyperbolic.py
 +++ b/src/sage/functions/hyperbolic.py
 @@ -214,7 +214,7 @@ class Function_coth(GinacFunction):
@@ -341,7 +341,7 @@ index 931a4b41e4..bf33fc483d 100644
          return arctanh(1.0 / x)
  
 diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py
-index 017c85a96f..33fbb499c5 100644
+index ed6365bef4..99b8b04dad 100644
 --- a/src/sage/functions/orthogonal_polys.py
 +++ b/src/sage/functions/orthogonal_polys.py
 @@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction):
@@ -379,10 +379,10 @@ index 017c85a96f..33fbb499c5 100644
              array([ 0.2 , -0.96])
          """
 diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py
-index 679384c907..d63b295a4c 100644
+index 1883daa3e6..9885222817 100644
 --- a/src/sage/functions/other.py
 +++ b/src/sage/functions/other.py
-@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction):
+@@ -389,7 +389,7 @@ class Function_ceil(BuiltinFunction):
              sage: import numpy
              sage: a = numpy.linspace(0,2,6)
              sage: ceil(a)
@@ -391,7 +391,7 @@ index 679384c907..d63b295a4c 100644
  
          Test pickling::
  
-@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction):
+@@ -553,7 +553,7 @@ class Function_floor(BuiltinFunction):
              sage: import numpy
              sage: a = numpy.linspace(0,2,6)
              sage: floor(a)
@@ -400,7 +400,7 @@ index 679384c907..d63b295a4c 100644
              sage: floor(x)._sympy_()
              floor(x)
  
-@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds):
+@@ -869,7 +869,7 @@ def sqrt(x, *args, **kwds):
              sage: import numpy
              sage: a = numpy.arange(2,5)
              sage: sqrt(a)
@@ -409,11 +409,35 @@ index 679384c907..d63b295a4c 100644
          """
          if isinstance(x, float):
              return math.sqrt(x)
+diff --git a/src/sage/functions/spike_function.py b/src/sage/functions/spike_function.py
+index 1e021de3fe..56635ca98f 100644
+--- a/src/sage/functions/spike_function.py
++++ b/src/sage/functions/spike_function.py
+@@ -157,7 +157,7 @@ class SpikeFunction:
+             sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+             A spike function with spikes at [-3.0, -1.0, 2.0]
+             sage: P = S.plot_fft_abs(8)
+-            sage: p = P[0]; p.ydata
++            sage: p = P[0]; p.ydata  # abs tol 1e-8
+             [5.0, 5.0, 3.367958691924177, 3.367958691924177, 4.123105625617661, 4.123105625617661, 4.759921664218055, 4.759921664218055]
+         """
+         w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+@@ -176,8 +176,8 @@ class SpikeFunction:
+             sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S
+             A spike function with spikes at [-3.0, -1.0, 2.0]
+             sage: P = S.plot_fft_arg(8)
+-            sage: p = P[0]; p.ydata
+-            [0.0, 0.0, -0.211524990023434..., -0.211524990023434..., 0.244978663126864..., 0.244978663126864..., -0.149106180027477..., -0.149106180027477...]
++            sage: p = P[0]; p.ydata  # abs tol 1e-8
++            [0.0, 0.0, -0.211524990023434, -0.211524990023434, 0.244978663126864, 0.244978663126864, -0.149106180027477, -0.149106180027477]
+         """
+         w = self.vector(samples = samples, xmin=xmin, xmax=xmax)
+         xmin, xmax = self._ranges(xmin, xmax)
 diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py
-index e7e7a311cd..e7ff78a9de 100644
+index 501e7ff6b6..5f760912f0 100644
 --- a/src/sage/functions/trig.py
 +++ b/src/sage/functions/trig.py
-@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction):
+@@ -724,7 +724,7 @@ class Function_arccot(GinacFunction):
              sage: import numpy
              sage: a = numpy.arange(2, 5)
              sage: arccot(a)
@@ -422,7 +446,7 @@ index e7e7a311cd..e7ff78a9de 100644
          """
          return math.pi/2 - arctan(x)
  
-@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction):
+@@ -780,7 +780,7 @@ class Function_arccsc(GinacFunction):
              sage: import numpy
              sage: a = numpy.arange(2, 5)
              sage: arccsc(a)
@@ -431,7 +455,7 @@ index e7e7a311cd..e7ff78a9de 100644
          """
          return arcsin(1.0/x)
  
-@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction):
+@@ -838,7 +838,7 @@ class Function_arcsec(GinacFunction):
              sage: import numpy
              sage: a = numpy.arange(2, 5)
              sage: arcsec(a)
@@ -440,7 +464,7 @@ index e7e7a311cd..e7ff78a9de 100644
          """
          return arccos(1.0/x)
  
-@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction):
+@@ -913,13 +913,13 @@ class Function_arctan2(GinacFunction):
              sage: a = numpy.linspace(1, 3, 3)
              sage: b = numpy.linspace(3, 6, 3)
              sage: atan2(a, b)
@@ -458,10 +482,10 @@ index e7e7a311cd..e7ff78a9de 100644
          TESTS::
  
 diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx
-index 19a1d37df0..5780dfae1c 100644
+index 12136f1773..491bf22e62 100644
 --- a/src/sage/matrix/constructor.pyx
 +++ b/src/sage/matrix/constructor.pyx
-@@ -494,8 +494,8 @@ class MatrixFactory(object):
+@@ -503,8 +503,8 @@ def matrix(*args, **kwds):
          [7 8 9]
          Full MatrixSpace of 3 by 3 dense matrices over Integer Ring
          sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n
@@ -473,10 +497,31 @@ index 19a1d37df0..5780dfae1c 100644
          [  1 1/2]
          [1/3 1/4]
 diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx
-index 48e0a8a97f..1be5d35b19 100644
+index 66e54a79a4..0498334f4b 100644
 --- a/src/sage/matrix/matrix_double_dense.pyx
 +++ b/src/sage/matrix/matrix_double_dense.pyx
-@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -606,6 +606,9 @@ cdef class Matrix_double_dense(Matrix_dense):
+             [ 3.0 + 9.0*I 4.0 + 16.0*I 5.0 + 25.0*I]
+             [6.0 + 36.0*I 7.0 + 49.0*I 8.0 + 64.0*I]
+             sage: B.condition()
++            doctest:warning
++            ...
++            ComplexWarning: Casting complex values to real discards the imaginary part
+             203.851798...
+             sage: B.condition(p='frob')
+             203.851798...
+@@ -654,9 +657,7 @@ cdef class Matrix_double_dense(Matrix_dense):
+             True
+             sage: B = A.change_ring(CDF)
+             sage: B.condition()
+-            Traceback (most recent call last):
+-            ...
+-            LinAlgError: Singular matrix
++            +Infinity
+ 
+         Improper values of ``p`` are caught.  ::
+ 
+@@ -2519,7 +2520,7 @@ cdef class Matrix_double_dense(Matrix_dense):
              sage: P.is_unitary(algorithm='orthonormal')
              Traceback (most recent call last):
              ...
@@ -485,7 +530,7 @@ index 48e0a8a97f..1be5d35b19 100644
  
          TESTS::
  
-@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3635,8 +3636,8 @@ cdef class Matrix_double_dense(Matrix_dense):
              [0.0 1.0 2.0]
              [3.0 4.0 5.0]
              sage: m.numpy()
@@ -496,7 +541,7 @@ index 48e0a8a97f..1be5d35b19 100644
  
          Alternatively, numpy automatically calls this function (via
          the magic :meth:`__array__` method) to convert Sage matrices
-@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense):
+@@ -3647,16 +3648,16 @@ cdef class Matrix_double_dense(Matrix_dense):
              [0.0 1.0 2.0]
              [3.0 4.0 5.0]
              sage: numpy.array(m)
@@ -518,10 +563,10 @@ index 48e0a8a97f..1be5d35b19 100644
              dtype('complex128')
  
 diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py
-index c698ba5e97..b743bab354 100644
+index ccbd208810..c3f9a65093 100644
 --- a/src/sage/matrix/special.py
 +++ b/src/sage/matrix/special.py
-@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -706,7 +706,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
  
          sage: import numpy
          sage: entries = numpy.array([1.2, 5.6]); entries
@@ -530,7 +575,7 @@ index c698ba5e97..b743bab354 100644
          sage: A = diagonal_matrix(3, entries); A
          [1.2 0.0 0.0]
          [0.0 5.6 0.0]
-@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
+@@ -716,7 +716,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True):
  
          sage: j = numpy.complex(0,1)
          sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries
@@ -540,10 +585,10 @@ index c698ba5e97..b743bab354 100644
          [2.0 + 1.0*I         0.0         0.0]
          [        0.0         8.1         0.0]
 diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx
-index 230f142117..2ab1c0ae68 100644
+index 37d92c1282..955d083b34 100644
 --- a/src/sage/modules/free_module_element.pyx
 +++ b/src/sage/modules/free_module_element.pyx
-@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+@@ -988,7 +988,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
              sage: v.numpy()
              array([1, 2, 5/6], dtype=object)
              sage: v.numpy(dtype=float)
@@ -552,7 +597,7 @@ index 230f142117..2ab1c0ae68 100644
              sage: v.numpy(dtype=int)
              array([1, 2, 0])
              sage: import numpy
-@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
+@@ -999,7 +999,7 @@ cdef class FreeModuleElement(Vector):   # abstract base class
          be more efficient but may have unintended consequences::
  
              sage: v.numpy(dtype=None)
@@ -596,22 +641,6 @@ index 39fc2970de..2badf98284 100644
          """
          if dtype is None or dtype is self._vector_numpy.dtype:
              from copy import copy
-diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py
-index 17b5ebb84b..92ce35c502 100644
---- a/src/sage/numerical/optimize.py
-+++ b/src/sage/numerical/optimize.py
-@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args)
-                 else:
-                     min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0]
-         elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression):
--            min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+            min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
-     elif isinstance(cons, function_type) or isinstance(cons, Expression):
--        min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args)
-+        min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args)
-     return vector(RDF, min)
- 
- 
 diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx
 index ad9693da62..758fb709b7 100644
 --- a/src/sage/plot/complex_plot.pyx
@@ -649,6 +678,76 @@ index ad9693da62..758fb709b7 100644
      """
      import numpy
      cdef unsigned int i, j, imax, jmax
+diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py
+index 5d28473731..fc4b2046c0 100644
+--- a/src/sage/plot/histogram.py
++++ b/src/sage/plot/histogram.py
+@@ -53,10 +53,17 @@ class Histogram(GraphicPrimitive):
+         """
+         import numpy as np
+         self.datalist=np.asarray(datalist,dtype=float)
++        if 'normed' in options:
++            from sage.misc.superseded import deprecation
++            deprecation(25260, "the 'normed' option is deprecated. Use 'density' instead.")
+         if 'linestyle' in options:
+             from sage.plot.misc import get_matplotlib_linestyle
+             options['linestyle'] = get_matplotlib_linestyle(
+                     options['linestyle'], return_type='long')
++        if options.get('range', None):
++            # numpy.histogram performs type checks on "range" so this must be
++            # actual floats
++            options['range'] = [float(x) for x in options['range']]
+         GraphicPrimitive.__init__(self, options)
+ 
+     def get_minmax_data(self):
+@@ -80,10 +87,14 @@ class Histogram(GraphicPrimitive):
+             {'xmax': 4.0, 'xmin': 0, 'ymax': 2, 'ymin': 0}
+ 
+         TESTS::
+-
+             sage: h = histogram([10,3,5], normed=True)[0]
+-            sage: h.get_minmax_data()  # rel tol 1e-15
+-            {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.4761904761904765, 'ymin': 0}
++            doctest:warning...:
++            DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead.
++            See https://trac.sagemath.org/25260 for details.
++            sage: h.get_minmax_data()
++            doctest:warning ...:
++            VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy.
++            {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0}
+         """
+         import numpy
+ 
+@@ -152,7 +163,7 @@ class Histogram(GraphicPrimitive):
+                 'rwidth': 'The relative width of the bars as a fraction of the bin width',
+                 'cumulative': '(True or False) If True, then a histogram is computed in which each bin gives the counts in that bin plus all bins for smaller values.  Negative values give a reversed direction of accumulation.',
+                 'range': 'A list [min, max] which define the range of the histogram. Values outside of this range are treated as outliers and omitted from counts.',
+-                'normed': 'Deprecated alias for density',
++                'normed': 'Deprecated. Use density instead.',
+                 'density': '(True or False) If True, the counts are normalized to form a probability density. (n/(len(x)*dbin)',
+                 'weights': 'A sequence of weights the same length as the data list. If supplied, then each value contributes its associated weight to the bin count.',
+                 'stacked': '(True or False) If True, multiple data are stacked on top of each other.',
+@@ -199,7 +210,7 @@ class Histogram(GraphicPrimitive):
+             subplot.hist(self.datalist.transpose(), **options)
+ 
+ 
+-@options(aspect_ratio='automatic',align='mid', weights=None, range=None, bins=10, edgecolor='black')
++@options(aspect_ratio='automatic', align='mid', weights=None, range=None, bins=10, edgecolor='black')
+ def histogram(datalist, **options):
+     """
+     Computes and draws the histogram for list(s) of numerical data.
+@@ -231,8 +242,9 @@ def histogram(datalist, **options):
+     - ``linewidth`` -- (float) width of the lines defining the bars
+     - ``linestyle`` -- (default: 'solid') Style of the line. One of 'solid'
+       or '-', 'dashed' or '--', 'dotted' or ':', 'dashdot' or '-.'
+-    - ``density`` -- (boolean - default: False) If True, the counts are
+-      normalized to form a probability density.
++    - ``density`` -- (boolean - default: False) If True, the result is the
++      value of the probability density function at the bin, normalized such
++      that the integral over the range is 1.
+     - ``range`` -- A list [min, max] which define the range of the
+       histogram. Values outside of this range are treated as outliers and
+       omitted from counts
 diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py
 index 23f5e61446..3b1b51d7cf 100644
 --- a/src/sage/plot/line.py
@@ -718,7 +817,7 @@ index f3da57c370..3806f4b32f 100644
          TESTS:
  
 diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx
-index f66cd898b9..35995886d5 100644
+index 1b119e323f..3290b00695 100644
 --- a/src/sage/probability/probability_distribution.pyx
 +++ b/src/sage/probability/probability_distribution.pyx
 @@ -130,7 +130,17 @@ cdef class ProbabilityDistribution:
@@ -741,10 +840,10 @@ index f66cd898b9..35995886d5 100644
          import pylab
          l = [float(self.get_random_element()) for _ in range(num_samples)]
 diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx
-index a0bfe080f5..7d95e7a1a8 100644
+index 12ca1b222b..9bad7dae0c 100644
 --- a/src/sage/rings/rational.pyx
 +++ b/src/sage/rings/rational.pyx
-@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement):
+@@ -1041,7 +1041,7 @@ cdef class Rational(sage.structure.element.FieldElement):
              dtype('O')
  
              sage: numpy.array([1, 1/2, 3/4])
@@ -754,10 +853,10 @@ index a0bfe080f5..7d95e7a1a8 100644
          if mpz_cmp_ui(mpq_denref(self.value), 1) == 0:
              if mpz_fits_slong_p(mpq_numref(self.value)):
 diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx
-index 4c630867a4..64e2187f5b 100644
+index 9b90c8833e..1ce05b937d 100644
 --- a/src/sage/rings/real_mpfr.pyx
 +++ b/src/sage/rings/real_mpfr.pyx
-@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
+@@ -1439,7 +1439,7 @@ cdef class RealNumber(sage.structure.element.RingElement):
  
              sage: import numpy
              sage: numpy.arange(10.0)
@@ -767,10 +866,10 @@ index 4c630867a4..64e2187f5b 100644
              dtype('float64')
              sage: numpy.array([1.000000000000000000000000000000000000]).dtype
 diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py
-index 3d270ebf9d..1144f168e3 100644
+index de31fe9883..7a33ea6f5b 100644
 --- a/src/sage/schemes/elliptic_curves/height.py
 +++ b/src/sage/schemes/elliptic_curves/height.py
-@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight:
+@@ -1627,18 +1627,18 @@ class EllipticCurveCanonicalHeight:
          even::
  
              sage: H.wp_on_grid(v,4)
@@ -798,10 +897,10 @@ index 3d270ebf9d..1144f168e3 100644
          tau = self.tau(v)
          fk, err = self.fk_intervals(v, 15, CDF)
 diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx
-index 2dcb0492b9..2b1a06385c 100644
+index 9da38002e8..d61e74bf82 100644
 --- a/src/sage/symbolic/ring.pyx
 +++ b/src/sage/symbolic/ring.pyx
-@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism):
+@@ -1136,7 +1136,7 @@ cdef class NumpyToSRMorphism(Morphism):
          sage: cos(numpy.int('2'))
          cos(2)
          sage: numpy.cos(numpy.int('2'))
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 7fd49fe205cc..f74da33f4026 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -94,9 +94,20 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     })
 
-    # Only formatting changes.
+    (fetchpatch {
+      name = "matplotlib-2.2.2";
+      url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0";
+      sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34";
+    })
+
+    (fetchpatch {
+      name = "scipy-1.1.0";
+      url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378";
+      sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7";
+    })
+
     # https://trac.sagemath.org/ticket/25260
-    ./patches/numpy-1.14.3.patch
+    ./patches/numpy-1.15.1.patch
 
     # https://trac.sagemath.org/ticket/25862
     ./patches/eclib-20180710.patch

From e2b4644f9c30a8e08e140a8fb7ff3adec3d23c9e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 7 Sep 2018 18:29:07 +0200
Subject: [PATCH 0484/3253] weechat: fix quoting for ${}  syntax

In my previous PR I missed that ${sec.foobar} (syntax to retrieve
secrets in a weechat runtime) breaks the shell evaluation.

Furthermore `;` shall be used rather than `\n` to concat scripts and the
init config.
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index eaf7410a3171..a9de275559db 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -133,13 +133,13 @@ in if configure == null then weechat else
 
       scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv)
         [ ] (config.scripts or []));
-    in "${scripts}\n${init}";
+    in "${scripts};${init}";
 
     mkWeechat = bin: (writeScriptBin bin ''
       #!${stdenv.shell}
       export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
       ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
-      exec ${weechat}/bin/${bin} "$@" --run-command "${init}"
+      exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init}
     '') // {
       inherit (weechat) name meta;
       unwrapped = weechat;

From 2729373cd1924b3e8ece946e5435efc760002113 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Sep 2018 10:19:10 -0700
Subject: [PATCH 0485/3253] clib: 1.8.0 -> 1.8.1 (#46292)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clib/versions
---
 pkgs/tools/package-management/clib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix
index 795a605b3b63..158db426c615 100644
--- a/pkgs/tools/package-management/clib/default.nix
+++ b/pkgs/tools/package-management/clib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, curl  }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.0";
+  version = "1.8.1";
   name = "clib-${version}";
 
   src = fetchFromGitHub {
     rev    = version;
     owner  = "clibs";
     repo   = "clib";
-    sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk";
+    sha256 = "1kl8amlw0106jsvv71a7nifhff1jdvgsrxr7l7hfr75i506q8976";
   };
 
   hardeningDisable = [ "fortify" ];

From d68a9d9db9cb2f69b5fef6e8c4a87b9ae3e499d0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Sep 2018 14:28:04 -0400
Subject: [PATCH 0486/3253] gcc-*: Clean up crossStageStatic logic

54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
---
 pkgs/development/compilers/gcc/4.8/default.nix      | 4 +---
 pkgs/development/compilers/gcc/4.9/default.nix      | 4 +---
 pkgs/development/compilers/gcc/5/default.nix        | 4 +---
 pkgs/development/compilers/gcc/6/default.nix        | 4 +---
 pkgs/development/compilers/gcc/7/default.nix        | 4 +---
 pkgs/development/compilers/gcc/8/default.nix        | 4 +---
 pkgs/development/compilers/gcc/builder.sh           | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 4 +---
 8 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index ed185b4be1a2..735377ec6f98 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -199,9 +199,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 3f13562c1b8c..e202e3b7e4e7 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -208,9 +208,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 497ca40c3ae6..c4c429134416 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -213,9 +213,7 @@ stdenv.mkDerivation ({
         )
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 3f5d3172d12f..2137b1fb1fe0 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -217,9 +217,7 @@ stdenv.mkDerivation ({
         )
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 30c1611f5fb3..4c09f81a4d31 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -190,9 +190,7 @@ stdenv.mkDerivation ({
         )
     else "");
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 727cd9cbdbd7..ab9f8be70b9c 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -185,9 +185,7 @@ stdenv.mkDerivation ({
         )
     else "");
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index a3250f4021a5..75e70006d749 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
         )
     fi
 
-    if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then
+    if test "$crossStageStatic" == 1; then
         # We don't want the gcc build to assume there will be a libc providing
         # limits.h in this stagae
         makeFlagsArray+=(
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index dd6de818117f..2e6ec3af5677 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -152,9 +152,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 55d8a539ad3384394b473d3d3155e1ff92865b2b Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 7 Sep 2018 22:04:22 +0400
Subject: [PATCH 0487/3253] gn: 20180423 -> 20180830

gn sources have been moved into separate repository which greatly
simplify build process.
---
 .../tools/build-managers/gn/default.nix       | 122 +++---------------
 1 file changed, 18 insertions(+), 104 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 399486c4d902..06af89dac7ae 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,107 +1,26 @@
-{ stdenv, lib, fetchgit, fetchzip, fetchpatch
-, libevent, ninja, python, darwin }:
+{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin
+, git, ninja, python }:
 
-let
-  depsGit = {
-    "tools/gn" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/src/tools/gn";
-      rev = "0fa417a0d2d8484e9a5a636e3301da322f586601";
-      sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0";
-    };
-    "base" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/src/base";
-      rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e";
-      sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f";
-    };
-    "build" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/src/build";
-      rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9";
-      sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl";
-    };
-    "config" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/src/build/config";
-      rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb";
-      sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40";
-    };
-    "testing/gtest" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/testing/gtest";
-      rev = "585ec31ea716f08233a815e680fc0d4699843938";
-      sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
-    };
-    "third_party/apple_apsl" = fetchzip {
-      url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
-      sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
-      stripRoot = false;
-    };
-    "buildtools/third_party/libc++/trunk" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx";
-      rev = "ece1de8658d749e19c12cacd4458cc330eca94e3";
-      sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg";
-    };
-    "buildtools/third_party/libc++abi/trunk" = fetchgit {
-      url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi";
-      rev = "52c7a3760aef1df328a9bc957f686410872f0dc0";
-      sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s";
-    };
+stdenv.mkDerivation rec {
+  name = "gn-${version}";
+  version = "20180830";
+
+  src = fetchgit {
+    url = "https://gn.googlesource.com/gn";
+    rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
+    leaveDotGit = true;  # gen.py uses "git describe" to generate last_commit_position.h
+    deepClone = true;
+    sha256 = "1276jwk3424i78zp21f6hp7idvg6r8qxp8sdfaw8ilkmp7ss19c8";
   };
 
-in stdenv.mkDerivation rec {
-  name = "gn-${version}";
-  version = "20180423";
-  sourceRoot = ".";
-
-  unpackPhase = ''
-    ${lib.concatStringsSep "\n" (
-      lib.mapAttrsToList (n: v: ''
-        mkdir -p $sourceRoot/${n}
-        if [ -d ${v} ]; then
-          cp -r ${v}/* $sourceRoot/${n}
-        else
-          mkdir -p $sourceRoot/${n}
-          pushd $sourceRoot/${n}
-          unpackFile ${v}
-          popd
-        fi
-      '') depsGit)}
-
-    chmod u+w -R $sourceRoot
-  '';
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
-      sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
-    })
-  ];
-
   postPatch = ''
-    # Disable libevent bootstrapping (we will provide it).
-    sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
-      tools/gn/bootstrap/bootstrap.py
-
     # FIXME Needed with old Apple SDKs
     substituteInPlace base/mac/foundation_util.mm \
       --replace "NSArray<NSString*>*" "NSArray*"
-    substituteInPlace base/mac/sdk_forward_declarations.h \
-      --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
-      --replace "NSArray<VNRequest*>*" "NSArray*" \
-      --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
-
-    # Patch shebangs (for sandbox build)
-    patchShebangs build
   '';
 
-  # FIXME again this shouldn't be necessary but I can't figure out a better way
-  NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
-
-  NIX_LDFLAGS = "-levent";
-
-  nativeBuildInputs = [ ninja python ];
-  buildInputs = [ libevent ]
-
-  # FIXME These dependencies shouldn't be needed but can't find a way
-  # around it. Chromium pulls this in while bootstrapping GN.
-  ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
+  nativeBuildInputs = [ ninja python git ];
+  buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
     libobjc
     cctools
 
@@ -109,25 +28,20 @@ in stdenv.mkDerivation rec {
     ApplicationServices
     Foundation
     AppKit
-    ImageCaptureCore
-    CoreBluetooth
-    IOBluetooth
-    CoreWLAN
-    Quartz
-    Cocoa
   ]);
 
   buildPhase = ''
-    python tools/gn/bootstrap/bootstrap.py -s
+    python build/gen.py --no-sysroot
+    ninja -j $NIX_BUILD_CORES -C out gn
   '';
 
   installPhase = ''
-    install -vD out/Release/gn "$out/bin/gn"
+    install -vD out/gn "$out/bin/gn"
   '';
 
   meta = with lib; {
     description = "A meta-build system that generates NinjaBuild files";
-    homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
+    homepage = https://gn.googlesource.com/gn;
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ stesie matthewbauer ];

From 2895560f4fc0e9fb1231cef572292d2aa1f3f70b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 7 Sep 2018 14:05:37 -0400
Subject: [PATCH 0488/3253] pythonPackages.markerlib: init at 0.6.0

---
 .../python-modules/markerlib/default.nix      | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/markerlib/default.nix

diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix
new file mode 100644
index 000000000000..640b11a6f280
--- /dev/null
+++ b/pkgs/development/python-modules/markerlib/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "0.6.0";
+  pname = "markerlib";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae";
+  };
+
+  buildInputs = [ setuptools ];
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/dholth/markerlib/;
+    description = "A compiler for PEP 345 environment markers";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 137463b74db6..e93e5411738c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -334,6 +334,8 @@ in {
 
   mail-parser = callPackage ../development/python-modules/mail-parser { };
 
+  markerlib = callPackage ../development/python-modules/markerlib { };
+
   monty = callPackage ../development/python-modules/monty { };
 
   mpi4py = callPackage ../development/python-modules/mpi4py {

From 64c13ec01ccb5574716aa54bdcef98ae1a319565 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Sep 2018 11:12:53 -0700
Subject: [PATCH 0489/3253] smenu: 0.9.13 -> 0.9.14 (#46189)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
smenu
---
 pkgs/tools/misc/smenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index 30475047c4f7..b5c963307dfd 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.13";
+  version = "0.9.14";
   name = "smenu-${version}";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
     repo   = "smenu";
     rev    = "v${version}";
-    sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5";
+    sha256 = "1q2jvzia5ggkifkawm791p2nkmnpm6cmd5x3al7zf76gpdm6j87d";
   };
 
   buildInputs = [ ncurses ];

From 0bb9b3c233fae8bfc846bcf20b951b72670e05e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Sep 2018 11:14:07 -0700
Subject: [PATCH 0490/3253] pmd: 6.5.0 -> 6.7.0 (#46213)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
pmd
---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 78dd57789622..187b2d7b03f9 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.5.0";
+  version = "6.7.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw";
+    sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c";
   };
 
   installPhase = ''

From 22deabca3998ddaab493b2c014eaac9cdb445cf6 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Fri, 7 Sep 2018 20:31:27 +0200
Subject: [PATCH 0491/3253] openrct2: 0.2.0 -> 0.2.1

---
 pkgs/games/openrct2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e5783ec5396f..e41caa3db978 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -5,20 +5,20 @@
 
 let
   name = "openrct2-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
   openrct2-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${version}";
-    sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px";
+    sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq";
   };
 
   objects-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "objects";
-    rev = "v1.0.2";
-    sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04";
+    rev = "v1.0.6";
+    sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm";
   };
 
   title-sequences-src = fetchFromGitHub {

From 5cfdec6e94574e8e08068e2de5e8ef2a375bb894 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 7 Sep 2018 20:59:12 +0200
Subject: [PATCH 0492/3253] lib: Improve overrideExisting implementation

---
 lib/attrsets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 1e4142562fa6..9bac69af34f3 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -440,7 +440,7 @@ rec {
       => { a = { b = 6; d = 2; }; }
   */
   overrideExisting = old: new:
-    old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old));
+    mapAttrs (name: value: new.${name} or value) old;
 
   /* Get a package output.
      If no output is found, fallback to `.out` and then to the default.

From fa76f75c7bf2bcb88d3d25c1f7716c730628317d Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 7 Sep 2018 21:03:38 +0200
Subject: [PATCH 0493/3253] youtube-dl: 2018.08.28 -> 2018.09.01

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7ed8f3bfd71b..8284e4af34d4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.08.28";
+  version = "2018.09.01";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi";
+    sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8ef940a038c9a4bbd020f164c33a78385867dbfa Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 7 Sep 2018 21:03:57 +0200
Subject: [PATCH 0494/3253] youtube-dl: fix youtube video download

---
 pkgs/tools/misc/youtube-dl/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 8284e4af34d4..e497f2a698c7 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,6 @@
 { lib, fetchurl, buildPythonPackage
 , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
+, fetchpatch
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
 # manpage argument in place in case someone wants to use this derivation to
@@ -22,6 +23,15 @@ buildPythonPackage rec {
     sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036";
   };
 
+  patches = [
+    # https://github.com/rg3/youtube-dl/pull/17464
+    (fetchpatch {
+      name = "youtube-js-player-fix.patch";
+      url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch";
+      sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg";
+    })
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
   propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;

From 4d16b2036be2ec317b89c31136263973df6847ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 7 Sep 2018 21:30:24 +0200
Subject: [PATCH 0495/3253] kde-applications: 18.08.0 -> 18.08.1

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1712 ++++++++++++++++----------------
 2 files changed, 857 insertions(+), 857 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c7cc617f163c..d4830a9e2390 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.08.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index decf0f4a314f..bc7b7407d6ab 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1715 +3,1715 @@
 
 {
   akonadi = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz";
-      sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz";
-      name = "akonadi-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz";
+      sha256 = "0fipz3xnbgqk7f9pxfm3p38fniddb76scpb80fvb2v6gn0snlabi";
+      name = "akonadi-18.08.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz";
-      sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5";
-      name = "akonadi-calendar-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-18.08.1.tar.xz";
+      sha256 = "1knwr8s1qn13fan1pq31pr3dk219cmv96mwvd36ir0bd2l7vkmcs";
+      name = "akonadi-calendar-18.08.1.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz";
-      sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr";
-      name = "akonadi-calendar-tools-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz";
+      sha256 = "1l4idxwi9h0bff1cwwsm7s4m9bcw4vp4ip5r87vc7687hhphc27l";
+      name = "akonadi-calendar-tools-18.08.1.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz";
-      sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86";
-      name = "akonadiconsole-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz";
+      sha256 = "031garrv2q3rv6qjjkzm3rmmd25f6j17sz2yv4hn3zgzydkjjskn";
+      name = "akonadiconsole-18.08.1.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz";
-      sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m";
-      name = "akonadi-contacts-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-contacts-18.08.1.tar.xz";
+      sha256 = "1p7192f7n6g7ihj05f7zzqpzl33sbvzsg479lkl120rmvzbjhfxn";
+      name = "akonadi-contacts-18.08.1.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz";
-      sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24";
-      name = "akonadi-import-wizard-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-import-wizard-18.08.1.tar.xz";
+      sha256 = "0x80nfa04ffwdvv861ahpgrbnx48ad28ii5glcg5pp5a840jx72s";
+      name = "akonadi-import-wizard-18.08.1.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz";
-      sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80";
-      name = "akonadi-mime-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-mime-18.08.1.tar.xz";
+      sha256 = "04xf5kbf30y5g4amx1x3nvkfypid232l4jamx3lnhia5x4kn2q5g";
+      name = "akonadi-mime-18.08.1.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz";
-      sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q";
-      name = "akonadi-notes-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-notes-18.08.1.tar.xz";
+      sha256 = "1ib7a7y37mq0dj0arxg2f41a30d8i637359ixhcf9sgpcs3xysns";
+      name = "akonadi-notes-18.08.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz";
-      sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s";
-      name = "akonadi-search-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akonadi-search-18.08.1.tar.xz";
+      sha256 = "0r7bwfjq9z6ky3riap5gnffzb9k7hwslfprk0jad63dl0djj4qzw";
+      name = "akonadi-search-18.08.1.tar.xz";
     };
   };
   akregator = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz";
-      sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c";
-      name = "akregator-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz";
+      sha256 = "1js6fbz7hhj0pyjgaz5zhi5bbyw2l9v2gkpj8f8jw4ria2hiz4w8";
+      name = "akregator-18.08.1.tar.xz";
     };
   };
   analitza = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz";
-      sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7";
-      name = "analitza-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz";
+      sha256 = "11zzrgjl2fjbpjagzpzff0aq83ss5037pj4g83wi3qqvlkhphzf2";
+      name = "analitza-18.08.1.tar.xz";
     };
   };
   ark = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz";
-      sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75";
-      name = "ark-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ark-18.08.1.tar.xz";
+      sha256 = "1k95qnjn4xgi0dnypfiwa86n0zwckkh5qnc54mv9g1xvvzah04cq";
+      name = "ark-18.08.1.tar.xz";
     };
   };
   artikulate = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz";
-      sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8";
-      name = "artikulate-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz";
+      sha256 = "1cvd6sm45j2gg0ga7j3vyz89lrl1ghlwq6516rsxrvsy3vg7vdmy";
+      name = "artikulate-18.08.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz";
-      sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8";
-      name = "audiocd-kio-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/audiocd-kio-18.08.1.tar.xz";
+      sha256 = "11wz5glih8jf9l85ncfhg91nyvh7s6q25gfy0vnqk8k0a98h0ghi";
+      name = "audiocd-kio-18.08.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz";
-      sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9";
-      name = "baloo-widgets-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/baloo-widgets-18.08.1.tar.xz";
+      sha256 = "1ab86j0akmz8vqkg3xhx1qlp27ndsg183irhfap313maw88bzwxp";
+      name = "baloo-widgets-18.08.1.tar.xz";
     };
   };
   blinken = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz";
-      sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm";
-      name = "blinken-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz";
+      sha256 = "0xzk8ddgr55sil00dl6b00m0x5az81yhd1cklr6mahjgg7w822br";
+      name = "blinken-18.08.1.tar.xz";
     };
   };
   bomber = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz";
-      sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix";
-      name = "bomber-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz";
+      sha256 = "0x4z8fa2klhabr99al3iyyf9aq3pm8rk1gi6cjghjgwrrcav7an7";
+      name = "bomber-18.08.1.tar.xz";
     };
   };
   bovo = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz";
-      sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va";
-      name = "bovo-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz";
+      sha256 = "1jwq9wjkdhy8bvkxg4lvb1m4qqw0zr84ws096nk6pccqk7xlkpr2";
+      name = "bovo-18.08.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz";
-      sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2";
-      name = "calendarsupport-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz";
+      sha256 = "0hh8jr81hcqyhm9fp0s27g52077d9li8x8rrg3bd18lw3flib0fq";
+      name = "calendarsupport-18.08.1.tar.xz";
     };
   };
   cantor = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz";
-      sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy";
-      name = "cantor-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz";
+      sha256 = "05cvyrf17lvh85qrcg1yf8x2c9d3l9wgbvnlhw4idx06crhvwvbb";
+      name = "cantor-18.08.1.tar.xz";
     };
   };
   cervisia = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz";
-      sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7";
-      name = "cervisia-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz";
+      sha256 = "1hir8ssr2yjjkly8kh8qdxqlgaa29q94kpsrk1crcdl67vrc8pph";
+      name = "cervisia-18.08.1.tar.xz";
     };
   };
   dolphin = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz";
-      sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy";
-      name = "dolphin-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz";
+      sha256 = "1f8w1315kg5mnz0jfdbynw5kapg529kwr3qc98nh83q4vfrjr7yj";
+      name = "dolphin-18.08.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz";
-      sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv";
-      name = "dolphin-plugins-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/dolphin-plugins-18.08.1.tar.xz";
+      sha256 = "0wa09n3x255d3rn5sndvyybawj2aq0sm0fdvqz7sbnm1c67g6akd";
+      name = "dolphin-plugins-18.08.1.tar.xz";
     };
   };
   dragon = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz";
-      sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6";
-      name = "dragon-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz";
+      sha256 = "1r9zdia4r1g77c456zi1yv3vjrccww6lqrhplwg90bw8091isc7s";
+      name = "dragon-18.08.1.tar.xz";
     };
   };
   eventviews = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz";
-      sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj";
-      name = "eventviews-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz";
+      sha256 = "0h5aqjncsmhgjqsj65j12bx4rb5rf4604fs6h04lda8jrk2qla3y";
+      name = "eventviews-18.08.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz";
-      sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn";
-      name = "ffmpegthumbs-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz";
+      sha256 = "11gwrw3fm6di4z5a04jqxfvm176mh20h8pfpv0c0zq9qipr1khkc";
+      name = "ffmpegthumbs-18.08.1.tar.xz";
     };
   };
   filelight = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz";
-      sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9";
-      name = "filelight-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz";
+      sha256 = "03sz1bnz7w3b4227hvfidi225ci5i83z022fgkb632b0dp2l9m8p";
+      name = "filelight-18.08.1.tar.xz";
     };
   };
   granatier = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz";
-      sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q";
-      name = "granatier-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz";
+      sha256 = "062qh639n1k919n67k2xn5h829gr0ncczif9mffw8ggvqqrzh560";
+      name = "granatier-18.08.1.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz";
-      sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp";
-      name = "grantlee-editor-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/grantlee-editor-18.08.1.tar.xz";
+      sha256 = "0wl8ii23wh1xakf6vcsv7n259kw0b3lpz7qnfmhz8nwj3k890g9q";
+      name = "grantlee-editor-18.08.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz";
-      sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv";
-      name = "grantleetheme-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz";
+      sha256 = "1ydi89smsim4lvgwclm9xsnldimsy45b69qsipz9vhhck4pccd7n";
+      name = "grantleetheme-18.08.1.tar.xz";
     };
   };
   gwenview = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz";
-      sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl";
-      name = "gwenview-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz";
+      sha256 = "0p32v9y2gz5q4j1vz0yqw90qg8l7nbyzxqn7pqwrzbhlycsx7mp9";
+      name = "gwenview-18.08.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz";
-      sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j";
-      name = "incidenceeditor-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz";
+      sha256 = "0da1jba66pvjar5wxcx2q9dhfwj2mlwk17h0j9xc9kgxj2y0bzx9";
+      name = "incidenceeditor-18.08.1.tar.xz";
     };
   };
   juk = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz";
-      sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9";
-      name = "juk-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/juk-18.08.1.tar.xz";
+      sha256 = "17mylgsw11nc64y0if3imrs2hsxwfdflnn1a4f5p64awrzid04mc";
+      name = "juk-18.08.1.tar.xz";
     };
   };
   k3b = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz";
-      sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md";
-      name = "k3b-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz";
+      sha256 = "1vv7pr1i3vj778m763mv1bzrq29kaqm02hnllhgq4dcci3hafn6a";
+      name = "k3b-18.08.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz";
-      sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11";
-      name = "kaccounts-integration-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kaccounts-integration-18.08.1.tar.xz";
+      sha256 = "18nbj4vyakhxvzy35j4b7iap06lp7zwhfpylfpnshjbcrb724qzs";
+      name = "kaccounts-integration-18.08.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz";
-      sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l";
-      name = "kaccounts-providers-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kaccounts-providers-18.08.1.tar.xz";
+      sha256 = "0ygiyv5fxf6b62sfibm621cz5cxin6qa1mnjpdxfj72xj8p7dbd7";
+      name = "kaccounts-providers-18.08.1.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz";
-      sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc";
-      name = "kaddressbook-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz";
+      sha256 = "0917d7m2nvgadkns8im7fzzqp2m5i21m4nrw75hv6bil7v0cshnn";
+      name = "kaddressbook-18.08.1.tar.xz";
     };
   };
   kajongg = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz";
-      sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y";
-      name = "kajongg-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kajongg-18.08.1.tar.xz";
+      sha256 = "0apjydg0q9yvvnlirhhvri2bqwzrkrq85fzphi49pr5ki3ah03dz";
+      name = "kajongg-18.08.1.tar.xz";
     };
   };
   kalarm = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz";
-      sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq";
-      name = "kalarm-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz";
+      sha256 = "1558nls14a22pwjnk59fpgmb4ddrdvzf3rdhl0nf6kkgr0ma0p1w";
+      name = "kalarm-18.08.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz";
-      sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll";
-      name = "kalarmcal-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz";
+      sha256 = "02shp4m85frjs4kp5n2kv3nz5frjfrckm7zkjlnwn6lrg6jz7q0f";
+      name = "kalarmcal-18.08.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz";
-      sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224";
-      name = "kalgebra-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz";
+      sha256 = "1996vbcvbpkvmya291w2kxfjwkm3baqflx04drrglildsrn6q07w";
+      name = "kalgebra-18.08.1.tar.xz";
     };
   };
   kalzium = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz";
-      sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x";
-      name = "kalzium-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz";
+      sha256 = "0sp89xi94xpix1gpz1s7qya1ki7lbbx93yr17bmhlp4dhyfqbzw5";
+      name = "kalzium-18.08.1.tar.xz";
     };
   };
   kamera = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz";
-      sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw";
-      name = "kamera-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz";
+      sha256 = "03p94azchdgr19mbgpgkvb3rlddik3bjl6iy3j0yd99frlns15ck";
+      name = "kamera-18.08.1.tar.xz";
     };
   };
   kamoso = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz";
-      sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd";
-      name = "kamoso-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kamoso-18.08.1.tar.xz";
+      sha256 = "11hm8q2v3x1rhm2smiqm9gmscbpdkyfb6x4sl0xrnm36m7ps54qb";
+      name = "kamoso-18.08.1.tar.xz";
     };
   };
   kanagram = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz";
-      sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn";
-      name = "kanagram-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz";
+      sha256 = "0mq8qrvvn30axhizzlzhzp5vl9q1ys7s7p5v525flyyz9fs011dz";
+      name = "kanagram-18.08.1.tar.xz";
     };
   };
   kapman = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz";
-      sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h";
-      name = "kapman-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz";
+      sha256 = "0grq9yllpaa267lx654n39mj7ll0g2pj6s42fq7b7236naqyna3d";
+      name = "kapman-18.08.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz";
-      sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb";
-      name = "kapptemplate-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz";
+      sha256 = "1dp9831hzmh9gd3qwvfyb2ihindl5c42jvmmrhnmfbz1j199z98w";
+      name = "kapptemplate-18.08.1.tar.xz";
     };
   };
   kate = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz";
-      sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67";
-      name = "kate-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kate-18.08.1.tar.xz";
+      sha256 = "1jsdk6jfff36fcb1x0vxl0iqa1xrl0400bm7fhp1gv9m553pkysa";
+      name = "kate-18.08.1.tar.xz";
     };
   };
   katomic = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz";
-      sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s";
-      name = "katomic-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz";
+      sha256 = "0cd8l7hn89xr5spq107nqxz7dx12drvv70siqx896d8lfpkmh96d";
+      name = "katomic-18.08.1.tar.xz";
     };
   };
   kbackup = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz";
-      sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9";
-      name = "kbackup-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kbackup-18.08.1.tar.xz";
+      sha256 = "15x75biiwixiw0j329pcxhh5sfyqm82x2rdfb0nqp0zz01cwicv6";
+      name = "kbackup-18.08.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz";
-      sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb";
-      name = "kblackbox-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz";
+      sha256 = "00xd6k9ndm1jbr1j2mhi8xfcxqdiwzwnb1cvr35a22r414lbc3cw";
+      name = "kblackbox-18.08.1.tar.xz";
     };
   };
   kblocks = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz";
-      sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1";
-      name = "kblocks-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz";
+      sha256 = "0y9hfxb9rpijpkm1r697v1w5q3gny8pa3ax5y0qq6695j2h7c52p";
+      name = "kblocks-18.08.1.tar.xz";
     };
   };
   kblog = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz";
-      sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783";
-      name = "kblog-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz";
+      sha256 = "0ickxhz7y098zx88308774kkz8wf6v51ydlnbmnayb8lyaw8ms8i";
+      name = "kblog-18.08.1.tar.xz";
     };
   };
   kbounce = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz";
-      sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm";
-      name = "kbounce-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz";
+      sha256 = "1k2qmdhm3sllxhsz6hhs94fndm1lrifhh7md2lmws2l2977ymkpi";
+      name = "kbounce-18.08.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz";
-      sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489";
-      name = "kbreakout-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz";
+      sha256 = "06mxh67pyg7fv8x152kd79xzrfnlw22x4x3iklhbngsk1cqsg62r";
+      name = "kbreakout-18.08.1.tar.xz";
     };
   };
   kbruch = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz";
-      sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f";
-      name = "kbruch-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz";
+      sha256 = "0m4m1xqp2aqkqs7cgj8z5c6b3s64d330bfgsq7mnm2wakmc69x9g";
+      name = "kbruch-18.08.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz";
-      sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0";
-      name = "kcachegrind-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz";
+      sha256 = "0llqmziq0h6wx3inxc2rmph1qs68fb34q09fvhfasg43l8y8a6cm";
+      name = "kcachegrind-18.08.1.tar.xz";
     };
   };
   kcalc = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz";
-      sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6";
-      name = "kcalc-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz";
+      sha256 = "139pjh31k9cy608h7yl9kxq48x6dsm5c0gcbndqc6nsjwd88ck04";
+      name = "kcalc-18.08.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz";
-      sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5";
-      name = "kcalcore-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz";
+      sha256 = "0kf92imqm9lqisfy3i25qn0g588p35w23xl0vmx75i67pzr3jcjn";
+      name = "kcalcore-18.08.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz";
-      sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl";
-      name = "kcalutils-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz";
+      sha256 = "1z346k9aniv3bq9c1dak3x5hzymi71ygns773r4agzm4kdn8ghwh";
+      name = "kcalutils-18.08.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz";
-      sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq";
-      name = "kcharselect-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz";
+      sha256 = "06r9q03rs00zqs0dpb0wxa9663pc2i51hsf83c0z9jnkpq6sjijb";
+      name = "kcharselect-18.08.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz";
-      sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l";
-      name = "kcolorchooser-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz";
+      sha256 = "027afkj0mllvnwdrrfjnpp4769dp5ixrdmd17r59q2hja0wz6cpf";
+      name = "kcolorchooser-18.08.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz";
-      sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii";
-      name = "kcontacts-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz";
+      sha256 = "1y0drw7n9mhyq84brqxz4rr666pqj5ww94f2i8k34chdzkcqsr52";
+      name = "kcontacts-18.08.1.tar.xz";
     };
   };
   kcron = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz";
-      sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq";
-      name = "kcron-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz";
+      sha256 = "1blalii8b6i8b1cknwcarbj84m6rrffsjamgnzyz6l81l43b0j9m";
+      name = "kcron-18.08.1.tar.xz";
     };
   };
   kdav = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz";
-      sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1";
-      name = "kdav-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz";
+      sha256 = "046h72gvcc9wxq0rn5ribf3lr03q6zq6acz2c3kxsbdw6kbypb2x";
+      name = "kdav-18.08.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz";
-      sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br";
-      name = "kdebugsettings-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz";
+      sha256 = "0n6lvccm803g9ilwwdka0srvak14i8lk5g149c6qmd73wywqdk84";
+      name = "kdebugsettings-18.08.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz";
-      sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi";
-      name = "kde-dev-scripts-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kde-dev-scripts-18.08.1.tar.xz";
+      sha256 = "1y162wn5mpi0c3wa8vjb2al2mizz292jzj22wvdzp19vliy32j95";
+      name = "kde-dev-scripts-18.08.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz";
-      sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf";
-      name = "kde-dev-utils-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kde-dev-utils-18.08.1.tar.xz";
+      sha256 = "1w5r7w7s5iaaxaxicd42nh2dhmc7anfqpv9n92rrk1hwpmjbphg5";
+      name = "kde-dev-utils-18.08.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz";
-      sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw";
-      name = "kdeedu-data-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdeedu-data-18.08.1.tar.xz";
+      sha256 = "0gpg1haawwi1d1p1pwzx2127kkdpg4i833312cl637v5qgvg7xhc";
+      name = "kdeedu-data-18.08.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz";
-      sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a";
-      name = "kdegraphics-mobipocket-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-mobipocket-18.08.1.tar.xz";
+      sha256 = "13jw2gn3wc946zdgr2hi1nsd6m518idn4q5wq0ym715mfbfs17zn";
+      name = "kdegraphics-mobipocket-18.08.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz";
-      sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw";
-      name = "kdegraphics-thumbnailers-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-thumbnailers-18.08.1.tar.xz";
+      sha256 = "0h9h5d81bjmjcgbxh3sy776rddpxxcwyj0jjix67q37kndbap4k0";
+      name = "kdegraphics-thumbnailers-18.08.1.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz";
-      sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67";
-      name = "kdenetwork-filesharing-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdenetwork-filesharing-18.08.1.tar.xz";
+      sha256 = "1bfqk57d1xfqbig1r8cymlp0pgsfmrix5nr4m1a015rmpqnvb92d";
+      name = "kdenetwork-filesharing-18.08.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz";
-      sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923";
-      name = "kdenlive-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz";
+      sha256 = "1ampvjlxn3q8l3mi4nap4lq3hgxzmp6ic88hzmkdj41vpm01flpf";
+      name = "kdenlive-18.08.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz";
-      sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1";
-      name = "kdepim-addons-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdepim-addons-18.08.1.tar.xz";
+      sha256 = "0fgggq0dl4qy0wha4jjarxgjly54s9fpqkm2macfq2bgvdbsjrgj";
+      name = "kdepim-addons-18.08.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz";
-      sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495";
-      name = "kdepim-apps-libs-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdepim-apps-libs-18.08.1.tar.xz";
+      sha256 = "0v4vvrjh1amlrvmf61cjfb2yr1j4j0qypf5349spnnlwjjrxn2hw";
+      name = "kdepim-apps-libs-18.08.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz";
-      sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar";
-      name = "kdepim-runtime-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdepim-runtime-18.08.1.tar.xz";
+      sha256 = "0133d86z1fggzg15jk2p8pg42zcv3khikpgdlyvz4si3canmvkwj";
+      name = "kdepim-runtime-18.08.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz";
-      sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb";
-      name = "kdesdk-kioslaves-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdesdk-kioslaves-18.08.1.tar.xz";
+      sha256 = "1nn4bzywd42ijbzlcnkdlr84n1p6argrd1gz91yyyrhqark7ma76";
+      name = "kdesdk-kioslaves-18.08.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz";
-      sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc";
-      name = "kdesdk-thumbnailers-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdesdk-thumbnailers-18.08.1.tar.xz";
+      sha256 = "1c133n4qf9jkgzhccipspwk3r8mbja0k8556ng0wxnhayzmv2sx9";
+      name = "kdesdk-thumbnailers-18.08.1.tar.xz";
     };
   };
   kdf = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz";
-      sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg";
-      name = "kdf-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz";
+      sha256 = "1m5hwfhzvikh7isakbvzyc3y98zdky4iz8vdsi7nnyb6d8n2hbrr";
+      name = "kdf-18.08.1.tar.xz";
     };
   };
   kdialog = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz";
-      sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli";
-      name = "kdialog-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz";
+      sha256 = "0s8a3y8sjhyq8lf3i8r6ligg1s9nbhxsd34vncw3lkbq60xkyhrr";
+      name = "kdialog-18.08.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz";
-      sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq";
-      name = "kdiamond-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz";
+      sha256 = "0vcqdadb9kbmxnycaba6g9hiiyxqybqiw1i4zldlw5x4gnj7dcv2";
+      name = "kdiamond-18.08.1.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz";
-      sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl";
-      name = "keditbookmarks-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz";
+      sha256 = "10nzhsyia1q0m26icqb20qh8s8n6r5vlb5q498gw8dv3rzsmh6sf";
+      name = "keditbookmarks-18.08.1.tar.xz";
     };
   };
   kfind = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz";
-      sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h";
-      name = "kfind-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz";
+      sha256 = "15w4cdvz35yyfyfaxb4mnxynlbryixydkwmx7lkmhlwnk3zjmskr";
+      name = "kfind-18.08.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz";
-      sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp";
-      name = "kfloppy-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz";
+      sha256 = "07v3q4jiw728s9akwhy27hczp4hxhp7f8c6g59gdqm0ply0vgxk6";
+      name = "kfloppy-18.08.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz";
-      sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr";
-      name = "kfourinline-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz";
+      sha256 = "03g8g0s2214fqkqp4lyh9m8f382s8xwzi0yqz0yigyq1w5igcl9p";
+      name = "kfourinline-18.08.1.tar.xz";
     };
   };
   kgeography = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz";
-      sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5";
-      name = "kgeography-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz";
+      sha256 = "1pqs2sk88idzc8xr85qy689palkf5y5l4pfqkd9xfkb87041rl93";
+      name = "kgeography-18.08.1.tar.xz";
     };
   };
   kget = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz";
-      sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4";
-      name = "kget-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kget-18.08.1.tar.xz";
+      sha256 = "1ax6sdkpvzg37sp05fx083h0nn78a2zpfpr2l74j3qwq2yssy298";
+      name = "kget-18.08.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz";
-      sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv";
-      name = "kgoldrunner-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz";
+      sha256 = "1wbdranw0fq8qynn13d0wkb7fckfzqbz2g920gyx2igw0bblcj0y";
+      name = "kgoldrunner-18.08.1.tar.xz";
     };
   };
   kgpg = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz";
-      sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx";
-      name = "kgpg-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz";
+      sha256 = "1i3g7x18khnyvwnvgpnv6xdfbv29w65x8d8ml60zb8siipbnlwb5";
+      name = "kgpg-18.08.1.tar.xz";
     };
   };
   khangman = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz";
-      sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2";
-      name = "khangman-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz";
+      sha256 = "1nc9lbjxlwr4aqsl6idjyhqxd5wampcz7a6zgq6py03n8mr811qy";
+      name = "khangman-18.08.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz";
-      sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay";
-      name = "khelpcenter-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz";
+      sha256 = "1k60yqnpkplj0k0b8h27zyhviqs6ddwhygmv7cpmnwa1d7kvhdwi";
+      name = "khelpcenter-18.08.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz";
-      sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85";
-      name = "kidentitymanagement-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz";
+      sha256 = "0w1lmfcjq2fb65l3vd9qzq037j7r3dd49aqh8bnrwkjslshy7iwz";
+      name = "kidentitymanagement-18.08.1.tar.xz";
     };
   };
   kig = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz";
-      sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb";
-      name = "kig-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kig-18.08.1.tar.xz";
+      sha256 = "1haf21widyfi0afixyfczk944l048w8dvlmgkwvfqhmgiiz52g72";
+      name = "kig-18.08.1.tar.xz";
     };
   };
   kigo = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz";
-      sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr";
-      name = "kigo-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz";
+      sha256 = "1dmb3cmbi473wpkbnv895nyxxhqmp09ihghvxir77khjpmask04a";
+      name = "kigo-18.08.1.tar.xz";
     };
   };
   killbots = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz";
-      sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm";
-      name = "killbots-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz";
+      sha256 = "184glirpf8jzy91769d13rck3vnh96s171h6sfqab755857wj960";
+      name = "killbots-18.08.1.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz";
-      sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq";
-      name = "kimagemapeditor-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz";
+      sha256 = "1w0yinp58f7x4ss2m069736faagwil7ay8gd5w79a5frqizsj36d";
+      name = "kimagemapeditor-18.08.1.tar.xz";
     };
   };
   kimap = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz";
-      sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq";
-      name = "kimap-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz";
+      sha256 = "0na135np2li231kzxfjy4wb5bbgkkyll66x8jd4y0lxvc4cwipfd";
+      name = "kimap-18.08.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz";
-      sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n";
-      name = "kio-extras-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kio-extras-18.08.1.tar.xz";
+      sha256 = "03q68bc53q656pw733g2j2wkbag6hbqpwszkap2h4pn011cihgyw";
+      name = "kio-extras-18.08.1.tar.xz";
     };
   };
   kiriki = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz";
-      sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b";
-      name = "kiriki-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz";
+      sha256 = "1kc2flpfqvfijrazvnk7mk03myy7f7lqia1r9lxg1g3xx095jqhz";
+      name = "kiriki-18.08.1.tar.xz";
     };
   };
   kiten = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz";
-      sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj";
-      name = "kiten-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz";
+      sha256 = "1i1pgfxvcqh5jbbk39b6rlc0s67z2naw5glxhkg3nrvxy9yxw9n2";
+      name = "kiten-18.08.1.tar.xz";
     };
   };
   kitinerary = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz";
-      sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l";
-      name = "kitinerary-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kitinerary-18.08.1.tar.xz";
+      sha256 = "0bv1nwwi2mc0l3vfvx29d46l7b876qf4bch9g84zmdcas37w786l";
+      name = "kitinerary-18.08.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz";
-      sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2";
-      name = "kjumpingcube-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz";
+      sha256 = "1qfzydbpd86zsb0yfy5xdaqlbh1awm70lg1nzbqn99rl47vsm85b";
+      name = "kjumpingcube-18.08.1.tar.xz";
     };
   };
   kldap = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz";
-      sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0";
-      name = "kldap-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz";
+      sha256 = "1knf61whi1raj66z55a8535rj911na15zkq0vcb8djz6cg3xw29r";
+      name = "kldap-18.08.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz";
-      sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c";
-      name = "kleopatra-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz";
+      sha256 = "0g65qxz6v1glh86fvgpb89ay1221qbnz97mnzw8fb26aar838s8y";
+      name = "kleopatra-18.08.1.tar.xz";
     };
   };
   klettres = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz";
-      sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8";
-      name = "klettres-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz";
+      sha256 = "0k5c9j9w0d95fzs7103nx13cxz9q5ivn34wq8px0ma9jaig1w1j9";
+      name = "klettres-18.08.1.tar.xz";
     };
   };
   klickety = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz";
-      sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0";
-      name = "klickety-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz";
+      sha256 = "1zx7f4hpcgfrfbgmmhfj9p9l604bzhg06zznfgq40774m4d5m992";
+      name = "klickety-18.08.1.tar.xz";
     };
   };
   klines = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz";
-      sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy";
-      name = "klines-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/klines-18.08.1.tar.xz";
+      sha256 = "1wwvzvwshxj03s3ywpg65lfj32xcd3yj4y7fhdms8xjn0b341grc";
+      name = "klines-18.08.1.tar.xz";
     };
   };
   kmag = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz";
-      sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f";
-      name = "kmag-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz";
+      sha256 = "1a1xml73yhfrqzw37apgmf1f88x58ws09vfdrp8zchawskcm3yi2";
+      name = "kmag-18.08.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz";
-      sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb";
-      name = "kmahjongg-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz";
+      sha256 = "1rdimx9kdm9n3g4856672z0spwsj5ihd40yx17vbzc3lhyqnk0w1";
+      name = "kmahjongg-18.08.1.tar.xz";
     };
   };
   kmail = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz";
-      sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr";
-      name = "kmail-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz";
+      sha256 = "12097jncdx5zdsr99lmsvhiymarymgbd004vmxm6rni0hq1aqzkl";
+      name = "kmail-18.08.1.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz";
-      sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r";
-      name = "kmail-account-wizard-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmail-account-wizard-18.08.1.tar.xz";
+      sha256 = "0jzqqn07q0jsggss2r5pjgp0fhfgngvv0rjzyh12lzsn4l8iyd6z";
+      name = "kmail-account-wizard-18.08.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz";
-      sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8";
-      name = "kmailtransport-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz";
+      sha256 = "196cjbnzqcp1ayqpn4vy8ah55nskhv07xrfrm8h0baxj90jd01xn";
+      name = "kmailtransport-18.08.1.tar.xz";
     };
   };
   kmbox = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz";
-      sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4";
-      name = "kmbox-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz";
+      sha256 = "0sjl64cjr2dxvjklpdl2p25vjbvzi0w42m5s3fzlqam9avmckfia";
+      name = "kmbox-18.08.1.tar.xz";
     };
   };
   kmime = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz";
-      sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw";
-      name = "kmime-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz";
+      sha256 = "00jxsnwkx4c9x1cm7w6r5z39d4962d0w6b8irdczix4r660xf56x";
+      name = "kmime-18.08.1.tar.xz";
     };
   };
   kmines = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz";
-      sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn";
-      name = "kmines-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz";
+      sha256 = "0csjr16s6jjj6z0963kc5jqwywjf9mvsa8c7x751h76kci1x53b0";
+      name = "kmines-18.08.1.tar.xz";
     };
   };
   kmix = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz";
-      sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh";
-      name = "kmix-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz";
+      sha256 = "1i5wgdmr8sml9cqjlgmi2i4v8lgksa7pnp91cgj75bmcy68sv0gj";
+      name = "kmix-18.08.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz";
-      sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf";
-      name = "kmousetool-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz";
+      sha256 = "0drpzdsry3xj4wm50850wf9rg3banbfaspbrmj1vwinbyz6f7pwz";
+      name = "kmousetool-18.08.1.tar.xz";
     };
   };
   kmouth = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz";
-      sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm";
-      name = "kmouth-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz";
+      sha256 = "0ywadz614w308vsss7b25xx4ddqyabr15miz9x7izffh67dhvm97";
+      name = "kmouth-18.08.1.tar.xz";
     };
   };
   kmplot = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz";
-      sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd";
-      name = "kmplot-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz";
+      sha256 = "1287pk524lfqvadq2rc8226v9qiwqh80fj1gjhsw6y3vhj88dpvg";
+      name = "kmplot-18.08.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz";
-      sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q";
-      name = "knavalbattle-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz";
+      sha256 = "0jxzgv06mysjalm0gfig3h6a9b84nkrq1qchi47h9x8cfaspba9r";
+      name = "knavalbattle-18.08.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz";
-      sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj";
-      name = "knetwalk-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz";
+      sha256 = "1bg4jaijvhb312cpwrfr4chmxj3fcj3k9caw5xwzrgdgw7prrbax";
+      name = "knetwalk-18.08.1.tar.xz";
     };
   };
   knotes = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz";
-      sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig";
-      name = "knotes-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz";
+      sha256 = "1cihancavh5z5781gy6h8cikwbsw2p5hb2wbwakzjs3ld31nsjcv";
+      name = "knotes-18.08.1.tar.xz";
     };
   };
   kolf = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz";
-      sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132";
-      name = "kolf-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz";
+      sha256 = "1ngzjmlhx471rfy486fpglpihydskrvwiqnl6xrp6fw1wg9pbd6b";
+      name = "kolf-18.08.1.tar.xz";
     };
   };
   kollision = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz";
-      sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp";
-      name = "kollision-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz";
+      sha256 = "0is63m9zw8s53pf73c2a7f2wkvrsg70wk49x6rpzb28jmsgm1xi2";
+      name = "kollision-18.08.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz";
-      sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi";
-      name = "kolourpaint-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz";
+      sha256 = "101vz981kl006q8kirs9d9bsp1bpjzcl22bbswgjny6niqlzd5lm";
+      name = "kolourpaint-18.08.1.tar.xz";
     };
   };
   kompare = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz";
-      sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx";
-      name = "kompare-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz";
+      sha256 = "0ksdf5c6a3rhq0r8g8hiai53pzk37jiicislfik6y8f71rq0crqv";
+      name = "kompare-18.08.1.tar.xz";
     };
   };
   konqueror = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz";
-      sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq";
-      name = "konqueror-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/konqueror-18.08.1.tar.xz";
+      sha256 = "0bz9vyagcrm7yihrx464hkf30y5rx6p9cvx8hq0sblvb7m4308y7";
+      name = "konqueror-18.08.1.tar.xz";
     };
   };
   konquest = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz";
-      sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s";
-      name = "konquest-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz";
+      sha256 = "1y3afkna2xg47qk9iwh3gsxbp1plf5y7k87svk8nzbh6aa8pillx";
+      name = "konquest-18.08.1.tar.xz";
     };
   };
   konsole = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz";
-      sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77";
-      name = "konsole-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz";
+      sha256 = "05i9mkw4ygpy6ilqkkm5s7m9kva9ds0gr5gszci7z52m7y67s27d";
+      name = "konsole-18.08.1.tar.xz";
     };
   };
   kontact = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz";
-      sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j";
-      name = "kontact-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz";
+      sha256 = "136sfr6gwf2cdlc54hc5p1wzcrjpnan0rzmzs21cwpp9gsvmsjvq";
+      name = "kontact-18.08.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz";
-      sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n";
-      name = "kontactinterface-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz";
+      sha256 = "1w96wyr5kinaghnaima1pcq5hz8qyzvvyjpsk3dg8h3is86npvkb";
+      name = "kontactinterface-18.08.1.tar.xz";
     };
   };
   kopete = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz";
-      sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk";
-      name = "kopete-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kopete-18.08.1.tar.xz";
+      sha256 = "0i38hvnp1qiwva6gd3p7zs962bhi5fviysr8wzm7296f1hv1rz4k";
+      name = "kopete-18.08.1.tar.xz";
     };
   };
   korganizer = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz";
-      sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1";
-      name = "korganizer-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz";
+      sha256 = "0wdpcjar64f8bii3xbbj08dfnd0290xwdvlr09p1pfmlllp09l0v";
+      name = "korganizer-18.08.1.tar.xz";
     };
   };
   kpat = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz";
-      sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml";
-      name = "kpat-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kpat-18.08.1.tar.xz";
+      sha256 = "0cmdfmd8pcwwwq4hjcfjscdl36p9gmw9shmqimjnqm60i5ivlz65";
+      name = "kpat-18.08.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz";
-      sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q";
-      name = "kpimtextedit-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz";
+      sha256 = "0v47hb9nvx3bq3ybsqng6546qxk5yi66kd0mm2g7bdx9iq060x0j";
+      name = "kpimtextedit-18.08.1.tar.xz";
     };
   };
   kpkpass = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz";
-      sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl";
-      name = "kpkpass-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kpkpass-18.08.1.tar.xz";
+      sha256 = "11d125rd35p44phksxrbzaixasgrsa4z9ym98h69ylyk2mm8h9lk";
+      name = "kpkpass-18.08.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz";
-      sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk";
-      name = "kqtquickcharts-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz";
+      sha256 = "1qki34i42hzr0zg0hydg4axsakfl7fydl23sn2xlvxyixw8yvcwi";
+      name = "kqtquickcharts-18.08.1.tar.xz";
     };
   };
   krdc = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz";
-      sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr";
-      name = "krdc-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz";
+      sha256 = "05fkpwcl1ivprvqy8x1h8akc2fxqnfh80vbis1k1gy8wanizigg9";
+      name = "krdc-18.08.1.tar.xz";
     };
   };
   kreversi = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz";
-      sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm";
-      name = "kreversi-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz";
+      sha256 = "1srn6czbhmlglnmnkg9pl9qs1b98ckfralydivk14y40m24s4j0b";
+      name = "kreversi-18.08.1.tar.xz";
     };
   };
   krfb = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz";
-      sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm";
-      name = "krfb-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz";
+      sha256 = "0p4jyl8dya1xvhisv30h86hnjyjc9sqaqj0d2zx447nqm479k9kw";
+      name = "krfb-18.08.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz";
-      sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi";
-      name = "kross-interpreters-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kross-interpreters-18.08.1.tar.xz";
+      sha256 = "1vkai4v553anbbdb38rccfg65zww93gw2v05kmr0hk62n13lqbh2";
+      name = "kross-interpreters-18.08.1.tar.xz";
     };
   };
   kruler = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz";
-      sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh";
-      name = "kruler-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz";
+      sha256 = "13gksm8mpnlvsi5v4a4fpbqb4mxq3l6giycwryi0qrh6bw33xak9";
+      name = "kruler-18.08.1.tar.xz";
     };
   };
   kshisen = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz";
-      sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4";
-      name = "kshisen-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz";
+      sha256 = "07w7rps4wh8ibhjnk1s80x9p1mvnl5yw37fnjz3byknk2a10lcm4";
+      name = "kshisen-18.08.1.tar.xz";
     };
   };
   ksirk = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz";
-      sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn";
-      name = "ksirk-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz";
+      sha256 = "0rqjxfrnbbmcx07l0rlyfv8mlka5hm4a59q8zsk6x2vii18yhi49";
+      name = "ksirk-18.08.1.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz";
-      sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s";
-      name = "ksmtp-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz";
+      sha256 = "0kznmx1qbv3kf0cqxwqgfwy1k79awrf6v46ni97h2fwrw90af9w9";
+      name = "ksmtp-18.08.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz";
-      sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833";
-      name = "ksnakeduel-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz";
+      sha256 = "0l0b94mx948zas3q27qn2dpvwfiqyd08zv2izl947prwg4mvmb0q";
+      name = "ksnakeduel-18.08.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz";
-      sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk";
-      name = "kspaceduel-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz";
+      sha256 = "1fjk0i2f72kzzg321w96989nqw0zfvv9iyv28ywg2pjb62nj9z2x";
+      name = "kspaceduel-18.08.1.tar.xz";
     };
   };
   ksquares = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz";
-      sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja";
-      name = "ksquares-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz";
+      sha256 = "0m30yw3hwh9jmwfwabnmjg2l19q4c4b8qcxp2ywp2xzxggvs3ssd";
+      name = "ksquares-18.08.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz";
-      sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id";
-      name = "ksudoku-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz";
+      sha256 = "1ma0009prjmi59jym0qbfqan7iyp3h4pa7q5sdqykk77mlqm1z81";
+      name = "ksudoku-18.08.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz";
-      sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah";
-      name = "ksystemlog-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz";
+      sha256 = "0c05gzqn51mg7ag6nyir1z3jdy5wd4bfka8lx2gigf6kjqyq4yny";
+      name = "ksystemlog-18.08.1.tar.xz";
     };
   };
   kteatime = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz";
-      sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2";
-      name = "kteatime-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz";
+      sha256 = "0przpgn2kwvnmfsqxncb1wx4xxr696j6zpgwwx3bhqfd89dc0bgm";
+      name = "kteatime-18.08.1.tar.xz";
     };
   };
   ktimer = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz";
-      sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js";
-      name = "ktimer-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz";
+      sha256 = "0bwkxl619d4gar2piyk63lds85sz43gghg02cifsjvdvjfqfqbhp";
+      name = "ktimer-18.08.1.tar.xz";
     };
   };
   ktnef = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz";
-      sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi";
-      name = "ktnef-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz";
+      sha256 = "184isgr9c5amwrlzlkji9q0dhl06936r2axdn5kjy2shbn7j7hz2";
+      name = "ktnef-18.08.1.tar.xz";
     };
   };
   ktouch = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz";
-      sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms";
-      name = "ktouch-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz";
+      sha256 = "1z23i7h6s31b3az6fk22whp1zs7np20wji5bcwvck1cv5a0nlpvc";
+      name = "ktouch-18.08.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz";
-      sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54";
-      name = "ktp-accounts-kcm-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-accounts-kcm-18.08.1.tar.xz";
+      sha256 = "1pnq61vjvzs3lnxf52ski36arxyy5930gdh3858d7nq66dqcvw19";
+      name = "ktp-accounts-kcm-18.08.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz";
-      sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd";
-      name = "ktp-approver-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-approver-18.08.1.tar.xz";
+      sha256 = "0sxp79rscfph5iscbpcqyp08szfipnsb0a3k4idlxfxp8bxv1kr2";
+      name = "ktp-approver-18.08.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz";
-      sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz";
-      name = "ktp-auth-handler-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-auth-handler-18.08.1.tar.xz";
+      sha256 = "18lnffiq0wh02j140ya3474sbq6nbb5yj6yavhm1dl0y0pap4mxl";
+      name = "ktp-auth-handler-18.08.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz";
-      sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h";
-      name = "ktp-call-ui-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-call-ui-18.08.1.tar.xz";
+      sha256 = "1mqgwblz86qbdfhlzncc5wzvqwhki4kx5afbihgynjr13d4jjldp";
+      name = "ktp-call-ui-18.08.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz";
-      sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak";
-      name = "ktp-common-internals-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-common-internals-18.08.1.tar.xz";
+      sha256 = "1r4ac7q8hpsldwagz4hsslsx962vxq8hmlhjs5r5h5c89r2qhpil";
+      name = "ktp-common-internals-18.08.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz";
-      sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w";
-      name = "ktp-contact-list-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-list-18.08.1.tar.xz";
+      sha256 = "09zfmqhpm907x1fcd3v7cvbgxx8sy1krjyidand77adl8ayiq59c";
+      name = "ktp-contact-list-18.08.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz";
-      sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s";
-      name = "ktp-contact-runner-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-runner-18.08.1.tar.xz";
+      sha256 = "0cv65v2kkfqg6kny3zl3k0kg5af3wbi42jjni0r37rsgaknmg45x";
+      name = "ktp-contact-runner-18.08.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz";
-      sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski";
-      name = "ktp-desktop-applets-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-desktop-applets-18.08.1.tar.xz";
+      sha256 = "04pkknx46zkn5v7946s23n4m1gr28w1cwpsyz8mkww8xfxk52x2y";
+      name = "ktp-desktop-applets-18.08.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz";
-      sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg";
-      name = "ktp-filetransfer-handler-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-filetransfer-handler-18.08.1.tar.xz";
+      sha256 = "07m25ydhpa92d6pqgrhj6mvhirsf6c1i1xnxjmybrmf8v4cy1z8v";
+      name = "ktp-filetransfer-handler-18.08.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz";
-      sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf";
-      name = "ktp-kded-module-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-kded-module-18.08.1.tar.xz";
+      sha256 = "0f8m3avph7w8yrlgpwsf6ykgbzzj7mrh973v2w6gw2iwz2ps0bbm";
+      name = "ktp-kded-module-18.08.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz";
-      sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7";
-      name = "ktp-send-file-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-send-file-18.08.1.tar.xz";
+      sha256 = "1d9k2xmyrxk4s6dr1a0dgi4j4j5y5f73r57aldr5k821w425ssmg";
+      name = "ktp-send-file-18.08.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz";
-      sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57";
-      name = "ktp-text-ui-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktp-text-ui-18.08.1.tar.xz";
+      sha256 = "07ydrwsg2xv6vxsp6n2li6d5dfc92bdikdjqq266dqb35mb6wbx4";
+      name = "ktp-text-ui-18.08.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz";
-      sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn";
-      name = "ktuberling-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz";
+      sha256 = "176fdw99ni02nz3kv62dbiw7887a5kvmxsm8bg3viwyymcs8aay8";
+      name = "ktuberling-18.08.1.tar.xz";
     };
   };
   kturtle = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz";
-      sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0";
-      name = "kturtle-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz";
+      sha256 = "1r3w5hbzw2f4794j690wgm7x3dfxfyqnaylhjcrxqmqydkc54w2c";
+      name = "kturtle-18.08.1.tar.xz";
     };
   };
   kubrick = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz";
-      sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn";
-      name = "kubrick-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz";
+      sha256 = "0nwd0n8rx7dzbwjvkhnmvb2g4g7lasng7745klcdwk40ww223b60";
+      name = "kubrick-18.08.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz";
-      sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69";
-      name = "kwalletmanager-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz";
+      sha256 = "08hr7ii6dybbmipppay2gxiwak8rqbrxrwbjz0206cyav16bbp7q";
+      name = "kwalletmanager-18.08.1.tar.xz";
     };
   };
   kwave = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz";
-      sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp";
-      name = "kwave-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz";
+      sha256 = "1gsxzpf8ij7bw6s4dbdl8kvyz21wy76dxi4wqwdggi29gvxzpi76";
+      name = "kwave-18.08.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz";
-      sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km";
-      name = "kwordquiz-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz";
+      sha256 = "0bkxvw2g64r2k87m05mdxwh25lbixcga406x9i64z5dmgpsb7d9m";
+      name = "kwordquiz-18.08.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz";
-      sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4";
-      name = "libgravatar-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz";
+      sha256 = "0axmf5ph5ahs4124fi016hjj559472k2apgfsbnf9q80d6y25lgf";
+      name = "libgravatar-18.08.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz";
-      sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x";
-      name = "libkcddb-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz";
+      sha256 = "1qy3zid9n7irkiz6vizmhwljrg3wcxxgcch58nmacg7fdxwcnnn1";
+      name = "libkcddb-18.08.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz";
-      sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8";
-      name = "libkcompactdisc-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz";
+      sha256 = "075i81gpb4c1wgzbv6nnvhgkz2sww0y5zqh8sxw67r46rz4rjwak";
+      name = "libkcompactdisc-18.08.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz";
-      sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x";
-      name = "libkdcraw-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz";
+      sha256 = "0fp01s9fw3m9li5v8cd2zmvy6xrysdqddzcal1xm5df2qj6xnk1d";
+      name = "libkdcraw-18.08.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz";
-      sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70";
-      name = "libkdegames-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz";
+      sha256 = "05xqmg0g08gd45d1q1wblyj5002fvcs72iazif6j7lj9zy60x3qw";
+      name = "libkdegames-18.08.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz";
-      sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l";
-      name = "libkdepim-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz";
+      sha256 = "0rq7y5r15d1r8s9v1mip780xyh11011j1w2id0cbll9a3fhjfgy9";
+      name = "libkdepim-18.08.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz";
-      sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn";
-      name = "libkeduvocdocument-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz";
+      sha256 = "1nchaip5rcgvazbn3bsiycsa5wcvqj3c0xz48isaz1rmirw4dkan";
+      name = "libkeduvocdocument-18.08.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz";
-      sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had";
-      name = "libkexiv2-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz";
+      sha256 = "0v0g626hjpksb8kxgp0kzx84a6hf3qq66if2hxh82kis5xdzbj4l";
+      name = "libkexiv2-18.08.1.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz";
-      sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0";
-      name = "libkgapi-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz";
+      sha256 = "0rsfk8n4z67m371vnglin16l33ankv0i60l07c8znr7jllkyzf7r";
+      name = "libkgapi-18.08.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz";
-      sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan";
-      name = "libkgeomap-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz";
+      sha256 = "1mnf43bpklyxh1schphndc7izknnzn3ymwppq4anysb9k603s7n4";
+      name = "libkgeomap-18.08.1.tar.xz";
     };
   };
   libkipi = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz";
-      sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d";
-      name = "libkipi-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz";
+      sha256 = "166njf2w6qy30xiccagnpsb7ggcvqmdkp1djahfwmvjwqqxqq9ic";
+      name = "libkipi-18.08.1.tar.xz";
     };
   };
   libkleo = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz";
-      sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c";
-      name = "libkleo-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz";
+      sha256 = "1q1s335rmh2k2hmx4k67ik9wy2wa4n271fv21k6sg0l3h58z3fc6";
+      name = "libkleo-18.08.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz";
-      sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83";
-      name = "libkmahjongg-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz";
+      sha256 = "0vvmm0mp2s5bl28vn7nq49b3izfy1myxx7c55qq6h3pmml70alp9";
+      name = "libkmahjongg-18.08.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz";
-      sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27";
-      name = "libkomparediff2-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz";
+      sha256 = "114w3xcd31i0y5fk4cr9d075mmvx746hsnm6grc8mkhi6diplxs1";
+      name = "libkomparediff2-18.08.1.tar.xz";
     };
   };
   libksane = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz";
-      sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0";
-      name = "libksane-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz";
+      sha256 = "0vi0kph8klnm3br9f9ifs5zgnncw83wrvk3kmxc412i28216qgf1";
+      name = "libksane-18.08.1.tar.xz";
     };
   };
   libksieve = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz";
-      sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b";
-      name = "libksieve-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz";
+      sha256 = "06agi9wkj455sx0inn6hiahmqlfjaa3ffr8i7zfs2rfzw78qvg20";
+      name = "libksieve-18.08.1.tar.xz";
     };
   };
   lokalize = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz";
-      sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5";
-      name = "lokalize-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz";
+      sha256 = "1k5vn3jnvqvdc4bn1hdfjjp3snfcpc5i3925kns760vpvdm4a9in";
+      name = "lokalize-18.08.1.tar.xz";
     };
   };
   lskat = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz";
-      sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13";
-      name = "lskat-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz";
+      sha256 = "11snjlsmcsh4nkcfdzjdl0jia8g350xj2hgilqk5b9jir0j8rsyp";
+      name = "lskat-18.08.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz";
-      sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd";
-      name = "mailcommon-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz";
+      sha256 = "1791ph0r5b9a0k2qgjrbxsz8drg23v5bdn832d695yy9q9rgxvwx";
+      name = "mailcommon-18.08.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz";
-      sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs";
-      name = "mailimporter-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz";
+      sha256 = "1rnmhfi54a9vlmvqjv2hsj967q886dkbv6nqn5imz11s8a97anb9";
+      name = "mailimporter-18.08.1.tar.xz";
     };
   };
   marble = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz";
-      sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf";
-      name = "marble-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/marble-18.08.1.tar.xz";
+      sha256 = "1vc6l68fvqdncvpmd8995v4hawi4w4zn3yjfpnghgvmvs30bak4p";
+      name = "marble-18.08.1.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz";
-      sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj";
-      name = "mbox-importer-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/mbox-importer-18.08.1.tar.xz";
+      sha256 = "1sqn11404xc9k76kz9zmm526dkzlk1ywnf15128plvyj6576wwaq";
+      name = "mbox-importer-18.08.1.tar.xz";
     };
   };
   messagelib = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz";
-      sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx";
-      name = "messagelib-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz";
+      sha256 = "17z8c60dnhwzgpls3b6hsvyjgjpjybw7cfkc05xn1yihi5gr2rxs";
+      name = "messagelib-18.08.1.tar.xz";
     };
   };
   minuet = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz";
-      sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6";
-      name = "minuet-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz";
+      sha256 = "06jwrra25v2al0jw7dvp7h41jmw48d784ky74xi9lx4ma4h4vsvg";
+      name = "minuet-18.08.1.tar.xz";
     };
   };
   okular = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz";
-      sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn";
-      name = "okular-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/okular-18.08.1.tar.xz";
+      sha256 = "1in053a3ir4qw2fabrv69g6kxr2hmdwq360kikmwdgsb6a7a8sjk";
+      name = "okular-18.08.1.tar.xz";
     };
   };
   palapeli = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz";
-      sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1";
-      name = "palapeli-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz";
+      sha256 = "17c6xlmjz8nnnvp4xa27yzrx2vrsjlznjm2awj70z923js5kzfhl";
+      name = "palapeli-18.08.1.tar.xz";
     };
   };
   parley = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz";
-      sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6";
-      name = "parley-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/parley-18.08.1.tar.xz";
+      sha256 = "1bwj806qm2g3n57f1svaz6x5y238xl0b3pmp4cg29a9c090gcj0r";
+      name = "parley-18.08.1.tar.xz";
     };
   };
   picmi = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz";
-      sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x";
-      name = "picmi-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz";
+      sha256 = "0bc3zs5ql1yfriq3pbxc0cb010n8rygqglpz8c2qinnsgf9wb305";
+      name = "picmi-18.08.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz";
-      sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd";
-      name = "pimcommon-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz";
+      sha256 = "0h8g374bdnf9nm43flz9wg1ddcdppqxng1vq58vqlviiy32qf86p";
+      name = "pimcommon-18.08.1.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz";
-      sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz";
-      name = "pim-data-exporter-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/pim-data-exporter-18.08.1.tar.xz";
+      sha256 = "01spb3lfs3rsl1h6d6lrszssj1rnbv1p21np75x4rm7qxzdn7wy7";
+      name = "pim-data-exporter-18.08.1.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz";
-      sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c";
-      name = "pim-sieve-editor-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/pim-sieve-editor-18.08.1.tar.xz";
+      sha256 = "09npw10dgzk7z3022d1np4qvmbwb07lxjj2nd4k1hxnkcjaz242d";
+      name = "pim-sieve-editor-18.08.1.tar.xz";
     };
   };
   poxml = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz";
-      sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz";
-      name = "poxml-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz";
+      sha256 = "1zazxxh4j8ihlb5v33b5wgj4ddqqhd809lzhxq28dq0mg7wvqcm8";
+      name = "poxml-18.08.1.tar.xz";
     };
   };
   print-manager = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz";
-      sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn";
-      name = "print-manager-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/print-manager-18.08.1.tar.xz";
+      sha256 = "0ixamp14m3p13j1c6nc9x6043600k2anfw12mn1yg4f8q5fb6dnf";
+      name = "print-manager-18.08.1.tar.xz";
     };
   };
   rocs = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz";
-      sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx";
-      name = "rocs-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz";
+      sha256 = "1kchipj3q29zfp60l81q52m6gb4fcmawcl42rvzr4mxf4h7dw72n";
+      name = "rocs-18.08.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz";
-      sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743";
-      name = "signon-kwallet-extension-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/signon-kwallet-extension-18.08.1.tar.xz";
+      sha256 = "1wf9xffjxyqn5vwwnp4wbn22lby5vc396snc3imdp1bx4z5ffck4";
+      name = "signon-kwallet-extension-18.08.1.tar.xz";
     };
   };
   spectacle = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz";
-      sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr";
-      name = "spectacle-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/spectacle-18.08.1.tar.xz";
+      sha256 = "0xvw6l0712gmb3dvq9hnyp7r160rvmvmm3mvgapj4z5c00m8a1d7";
+      name = "spectacle-18.08.1.tar.xz";
     };
   };
   step = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz";
-      sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg";
-      name = "step-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/step-18.08.1.tar.xz";
+      sha256 = "1b7cvrhdbfkqg72phbgbl15v8c4nr6b1b9fw8i1vam028a97bq8z";
+      name = "step-18.08.1.tar.xz";
     };
   };
   svgpart = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz";
-      sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa";
-      name = "svgpart-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz";
+      sha256 = "07mm5vzd5lslr5x7r71ac3hp3s779i89nz4d84550pk0qdn3qpmb";
+      name = "svgpart-18.08.1.tar.xz";
     };
   };
   sweeper = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz";
-      sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51";
-      name = "sweeper-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/sweeper-18.08.1.tar.xz";
+      sha256 = "1vmdk38j03qj0l5gc27dc242j0cj7k2c5zfq2xrvjb44rxfirdy4";
+      name = "sweeper-18.08.1.tar.xz";
     };
   };
   syndication = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz";
-      sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71";
-      name = "syndication-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/syndication-18.08.1.tar.xz";
+      sha256 = "0lirbr8zb1j5kalki6v98wmcg5z25xj1wamszd81h9wlkgk5aqd0";
+      name = "syndication-18.08.1.tar.xz";
     };
   };
   umbrello = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz";
-      sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px";
-      name = "umbrello-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz";
+      sha256 = "16p283jz5v5j40i1i7c9fk36bhs2k30rk17l3nikmf0qd7j5n6ir";
+      name = "umbrello-18.08.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.08.0";
+    version = "18.08.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz";
-      sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm";
-      name = "zeroconf-ioslave-18.08.0.tar.xz";
+      url = "${mirror}/stable/applications/18.08.1/src/zeroconf-ioslave-18.08.1.tar.xz";
+      sha256 = "0m1yhm17chz49xs6nh1n8dqdkbnr8kkig9p2f9nmvypnfagygpsi";
+      name = "zeroconf-ioslave-18.08.1.tar.xz";
     };
   };
 }

From c098f143b4a1325734f636d3e12abb2275ba9532 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 7 Sep 2018 23:34:47 +0400
Subject: [PATCH 0496/3253] chromium: 68.0.3440.106 -> 69.0.3497.81

Also update to build with external gn.
---
 .../networking/browsers/chromium/common.nix    | 13 ++-----------
 .../patches/remove-webp-include-68.patch       | 12 ------------
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 3 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ebc700a7f37c..6b9f7225c84f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
+{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
 
 # default dependencies
 , bzip2, flac, speex, libopus
@@ -139,11 +139,6 @@ let
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
       ./patches/fix-freetype.patch
       ./patches/nix_plugin_paths_68.patch
-    ]  ++ optionals (versionRange "68" "69") [
-      ./patches/remove-webp-include-68.patch
-      (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
-      (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs")
-    ]  ++ optionals (versionAtLeast version "69") [
       ./patches/remove-webp-include-69.patch
     ] ++ optional enableWideVine ./patches/widevine.patch;
 
@@ -243,15 +238,11 @@ let
     configurePhase = ''
       runHook preConfigure
 
-      # Build gn
-      python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
-      PATH="$PWD/out/Release:$PATH"
-
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gn_files.py \
         --system-libraries ${toString gnSystemLibraries}
-      gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
+      ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt
 
       # Fail if `gn gen` contains a WARNING.
       grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1
diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
deleted file mode 100644
index 1995bf1fa8f5..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -8,7 +8,7 @@
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
- #include "third_party/libjpeg/jpeglib.h"          // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
-+#define WEBP_MAX_DIMENSION 16383
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
-
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 89b6a7ce3121..ebf730129079 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw";
-    sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s";
-    version = "69.0.3497.32";
+    sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+    sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs";
+    version = "69.0.3497.81";
   };
   dev = {
-    sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c";
-    sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm";
-    version = "70.0.3521.2";
+    sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1";
+    sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj";
+    version = "70.0.3538.9";
   };
   stable = {
-    sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh";
-    sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj";
-    version = "68.0.3440.106";
+    sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
+    sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7";
+    version = "69.0.3497.81";
   };
 }

From c6a51bf12b8c31e826339be719e23751166dd2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 7 Sep 2018 21:38:17 +0200
Subject: [PATCH 0497/3253] plasma5: 5.13.4 -> 5.13.5

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 360 ++++++++++++++++----------------
 2 files changed, 181 insertions(+), 181 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index acf769f02e33..fc1850b3c2a4 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 752493b1a70d..a6c3cb66f6a2 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,363 +3,363 @@
 
 {
   bluedevil = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz";
-      sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk";
-      name = "bluedevil-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz";
+      sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg";
+      name = "bluedevil-5.13.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz";
-      sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84";
-      name = "breeze-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz";
+      sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0";
+      name = "breeze-5.13.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz";
-      sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09";
-      name = "breeze-grub-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz";
+      sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr";
+      name = "breeze-grub-5.13.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz";
-      sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0";
-      name = "breeze-gtk-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz";
+      sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3";
+      name = "breeze-gtk-5.13.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz";
-      sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20";
-      name = "breeze-plymouth-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz";
+      sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57";
+      name = "breeze-plymouth-5.13.5.tar.xz";
     };
   };
   discover = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz";
-      sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc";
-      name = "discover-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz";
+      sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d";
+      name = "discover-5.13.5.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz";
-      sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz";
-      name = "drkonqi-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz";
+      sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk";
+      name = "drkonqi-5.13.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz";
-      sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d";
-      name = "kactivitymanagerd-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz";
+      sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq";
+      name = "kactivitymanagerd-5.13.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz";
-      sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37";
-      name = "kde-cli-tools-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz";
+      sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp";
+      name = "kde-cli-tools-5.13.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz";
-      sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd";
-      name = "kdecoration-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz";
+      sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs";
+      name = "kdecoration-5.13.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz";
-      sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605";
-      name = "kde-gtk-config-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz";
+      sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6";
+      name = "kde-gtk-config-5.13.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz";
-      sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04";
-      name = "kdeplasma-addons-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz";
+      sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1";
+      name = "kdeplasma-addons-5.13.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz";
-      sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw";
-      name = "kgamma5-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz";
+      sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn";
+      name = "kgamma5-5.13.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz";
-      sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x";
-      name = "khotkeys-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz";
+      sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp";
+      name = "khotkeys-5.13.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz";
-      sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9";
-      name = "kinfocenter-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz";
+      sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl";
+      name = "kinfocenter-5.13.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz";
-      sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98";
-      name = "kmenuedit-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz";
+      sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0";
+      name = "kmenuedit-5.13.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz";
-      sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3";
-      name = "kscreen-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz";
+      sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77";
+      name = "kscreen-5.13.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz";
-      sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r";
-      name = "kscreenlocker-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz";
+      sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18";
+      name = "kscreenlocker-5.13.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz";
-      sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36";
-      name = "ksshaskpass-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz";
+      sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81";
+      name = "ksshaskpass-5.13.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz";
-      sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0";
-      name = "ksysguard-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz";
+      sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j";
+      name = "ksysguard-5.13.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz";
-      sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p";
-      name = "kwallet-pam-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz";
+      sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac";
+      name = "kwallet-pam-5.13.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz";
-      sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1";
-      name = "kwayland-integration-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz";
+      sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds";
+      name = "kwayland-integration-5.13.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz";
-      sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6";
-      name = "kwin-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz";
+      sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm";
+      name = "kwin-5.13.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz";
-      sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb";
-      name = "kwrited-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz";
+      sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya";
+      name = "kwrited-5.13.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz";
-      sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309";
-      name = "libkscreen-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz";
+      sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k";
+      name = "libkscreen-5.13.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz";
-      sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh";
-      name = "libksysguard-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz";
+      sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6";
+      name = "libksysguard-5.13.5.tar.xz";
     };
   };
   milou = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz";
-      sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad";
-      name = "milou-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz";
+      sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv";
+      name = "milou-5.13.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz";
-      sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2";
-      name = "oxygen-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz";
+      sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd";
+      name = "oxygen-5.13.5.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz";
-      sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb";
-      name = "plasma-browser-integration-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz";
+      sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy";
+      name = "plasma-browser-integration-5.13.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz";
-      sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx";
-      name = "plasma-desktop-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz";
+      sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp";
+      name = "plasma-desktop-5.13.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz";
-      sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq";
-      name = "plasma-integration-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz";
+      sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2";
+      name = "plasma-integration-5.13.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz";
-      sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq";
-      name = "plasma-nm-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz";
+      sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi";
+      name = "plasma-nm-5.13.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz";
-      sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k";
-      name = "plasma-pa-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz";
+      sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8";
+      name = "plasma-pa-5.13.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz";
-      sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa";
-      name = "plasma-sdk-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz";
+      sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga";
+      name = "plasma-sdk-5.13.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz";
-      sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf";
-      name = "plasma-tests-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz";
+      sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d";
+      name = "plasma-tests-5.13.5.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz";
-      sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j";
-      name = "plasma-vault-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz";
+      sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z";
+      name = "plasma-vault-5.13.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz";
-      sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh";
-      name = "plasma-workspace-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz";
+      sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3";
+      name = "plasma-workspace-5.13.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz";
-      sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm";
-      name = "plasma-workspace-wallpapers-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz";
+      sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg";
+      name = "plasma-workspace-wallpapers-5.13.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz";
-      sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506";
-      name = "plymouth-kcm-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz";
+      sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1";
+      name = "plymouth-kcm-5.13.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.13.4";
+    version = "1-5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz";
-      sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836";
-      name = "polkit-kde-agent-1-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz";
+      sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6";
+      name = "polkit-kde-agent-1-5.13.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz";
-      sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl";
-      name = "powerdevil-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz";
+      sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn";
+      name = "powerdevil-5.13.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz";
-      sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0";
-      name = "sddm-kcm-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz";
+      sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch";
+      name = "sddm-kcm-5.13.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz";
-      sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4";
-      name = "systemsettings-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz";
+      sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv";
+      name = "systemsettings-5.13.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz";
-      sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m";
-      name = "user-manager-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz";
+      sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8";
+      name = "user-manager-5.13.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.13.4";
+    version = "5.13.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz";
-      sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi";
-      name = "xdg-desktop-portal-kde-5.13.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz";
+      sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f";
+      name = "xdg-desktop-portal-kde-5.13.5.tar.xz";
     };
   };
 }

From 48bdf31f58b40dfb7f781033c100c87e2dd729f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 29 Aug 2018 14:55:21 +0200
Subject: [PATCH 0498/3253] androidndk: Fix `make_standalone_toolchain.py`

Python path needs to be absolute and the generated scripts will use also
an absolute path to `bash`.
---
 pkgs/development/mobile/androidenv/androidndk.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index b79741fca23d..eb7e78152801 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, libcxx, version, sha256
+, platformTools, python3, libcxx, version, sha256, bash
 , fullNDK ? false # set to true if you want other parts of the NDK
                   # that is not used by Nixpkgs like sources,
                   # examples, docs, or LLVM toolchains
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
     cd $out/libexec
     unzip -qq $src
 
-    patchShebangs ${pkg_path}
-
     # so that it doesn't fail because of read-only permissions set
     cd -
     ${if (version == "10e") then
@@ -50,9 +48,15 @@ stdenv.mkDerivation rec {
           patch -p1 \
             --no-backup-if-mismatch \
             -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" }
+
+          sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+          sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
           wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
         ''
     }
+
+    patchShebangs ${pkg_path}
+
     cd ${pkg_path}
 
   '' + lib.optionalString (!fullNDK) ''

From db784d883c4fbc276a1c639c8ff675a5fe805cac Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 7 Sep 2018 21:55:41 +0200
Subject: [PATCH 0499/3253] sage: re-add pkg-config aliases

Those were removed because they were added to openblas itself. There was
an error with that however and it will take some time until the fix
makes its way through staging. For the time being, reverting this part
of 26d5d030fe498b64a307af35ff96ff215ccd967a will fix the sage build.
This commit should be reverted once
408eacbc896ecc6d0e25238963ecbd412d78ce3c is in master.
---
 pkgs/applications/science/math/sage/default.nix | 10 +++++++---
 .../science/math/sage/openblas-pc.nix           | 17 +++++++++++++++++
 .../applications/science/math/sage/sage-env.nix |  6 +++---
 .../science/math/sage/sage-with-env.nix         |  6 ++++++
 pkgs/applications/science/math/sage/sagelib.nix |  7 ++++++-
 5 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/science/math/sage/openblas-pc.nix

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 08e3a752b8b6..7e62f0cf75ee 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -21,7 +21,7 @@ let
 
       sagelib = self.callPackage ./sagelib.nix {
         inherit flint ecl arb;
-        inherit sage-src pynac singular;
+        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
         linbox = nixpkgs.linbox.override { withSage = true; };
       };
 
@@ -41,13 +41,13 @@ let
       };
 
       sage-env = self.callPackage ./sage-env.nix {
-        inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv;
+        inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
       };
 
       sage-with-env = self.callPackage ./sage-with-env.nix {
         inherit pythonEnv;
-        inherit sage-src pynac singular;
+        inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
         pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
         three = nodePackages_8_x.three;
       };
@@ -60,6 +60,10 @@ let
     };
   };
 
+  openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; };
+  openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; };
+  openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; };
+
   sage-src = callPackage ./sage-src.nix {};
 
   pythonRuntimeDeps = with python.pkgs; [
diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix
new file mode 100644
index 000000000000..f4669a6557e9
--- /dev/null
+++ b/pkgs/applications/science/math/sage/openblas-pc.nix
@@ -0,0 +1,17 @@
+{ openblasCompat
+, writeTextFile
+, name
+}:
+
+writeTextFile {
+  name = "openblas-${name}-pc-${openblasCompat.version}";
+  destination = "/lib/pkgconfig/${name}.pc";
+  text = ''
+    Name: ${name}
+    Version: ${openblasCompat.version}
+
+    Description: ${name} for SageMath, provided by the OpenBLAS package.
+    Cflags: -I${openblasCompat}/include
+    Libs: -L${openblasCompat}/lib -lopenblas
+  '';
+}
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 74c2e0aa0360..317eb6e16c49 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -37,7 +37,7 @@
 , lcalc
 , rubiks
 , flintqs
-, openblasCompat
+, openblas-cblas-pc
 , flint
 , gmp
 , mpfr
@@ -98,9 +98,9 @@ writeTextFile rec {
     export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
         # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case
         # for it outside of the tests. However since singular and openblas are runtime dependencies anyways
-        # it doesn't really hurt to include.
+        # and openblas-cblas-pc is tiny, it doesn't really hurt to include.
         singular
-        openblasCompat
+        openblas-cblas-pc
       ])
     }'
     export SAGE_ROOT='${sage-src}'
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 8ccf8b5a4938..63b9772b8231 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -4,6 +4,9 @@
 , sage-env
 , sage-src
 , openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
 , pkg-config
 , three
 , singular
@@ -29,6 +32,9 @@ let
     makeWrapper
     pkg-config
     openblasCompat # lots of segfaults with regular (64 bit) openblas
+    openblas-blas-pc
+    openblas-cblas-pc
+    openblas-lapack-pc
     singular
     three
     pynac
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix
index c1dbcf38304e..abcefba5e260 100644
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@@ -3,6 +3,9 @@
 , buildPythonPackage
 , arb
 , openblasCompat
+, openblas-blas-pc
+, openblas-cblas-pc
+, openblas-lapack-pc
 , brial
 , cliquer
 , cypari2
@@ -56,7 +59,9 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     iml
     perl
-    openblasCompat
+    openblas-blas-pc
+    openblas-cblas-pc
+    openblas-lapack-pc
     jupyter_core
   ];
 

From 0b6da47fe322f9760b393b0c0f073b9b5d6d38a3 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 7 Sep 2018 22:01:15 +0200
Subject: [PATCH 0500/3253] kubernetes-helm: fix darwin hash

---
 pkgs/applications/networking/cluster/helm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index a84852f197dd..bd00404b536b 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -6,7 +6,7 @@ let
          else "darwin-amd64";
   checksum = if isLinux
              then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
-             else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv";
+             else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
   pname = "helm";
   version = "2.10.0";
 in

From dd0b3dafc9c3b77fe6ab972d0f39394a2bb8b53e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 29 Aug 2018 18:31:38 +0200
Subject: [PATCH 0501/3253] androidndk: Add `makeStandaloneToolchain` support

Example:
```
let
  toolchain = (androidenv.androidndk.makeStandaloneToolchain 24 "arm64");
in
...
```
---
 .../mobile/androidenv/androidndk.nix          | 164 ++++++++++--------
 1 file changed, 87 insertions(+), 77 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index eb7e78152801..dc693accbf4b 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,100 +1,110 @@
 { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, libcxx, version, sha256, bash
+, platformTools, python3, libcxx, version, sha256, bash, runCommand
 , fullNDK ? false # set to true if you want other parts of the NDK
                   # that is not used by Nixpkgs like sources,
                   # examples, docs, or LLVM toolchains
 }:
 
-stdenv.mkDerivation rec {
-  name = "android-ndk-r${version}";
-  inherit version;
+let
+  makeStandaloneToolchain = api: arch: let
+      full_ndk = (ndk true);
+    in runCommand "makeStandaloneToolchain-${version}" {} ''
+      ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out
+    '';
+  ndk = fullNDK: stdenv.mkDerivation rec {
+    name = "android-ndk-r${version}";
+    inherit version;
 
-  src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
+    src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
       url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
       inherit sha256;
     } else throw "platform ${stdenv.hostPlatform.system} not supported!";
 
-  phases = "buildPhase";
+    phases = "buildPhase";
 
-  nativeBuildInputs = [ unzip makeWrapper file ];
+    nativeBuildInputs = [ unzip makeWrapper file ];
 
-  buildCommand = let
-    bin_path = "$out/bin";
-    pkg_path = "$out/libexec/${name}";
-    sed_script_1 =
-      "'s|^PROGDIR=`dirname $0`" +
-      "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
-    runtime_paths = (lib.makeBinPath [
-      coreutils file findutils
-      gawk gnugrep gnused
-      jdk python3 which
-    ]) + ":${platformTools}/platform-tools";
-  in ''
-    mkdir -pv $out/libexec
-    cd $out/libexec
-    unzip -qq $src
+    buildCommand = let
+      bin_path = "$out/bin";
+      pkg_path = "$out/libexec/${name}";
+      sed_script_1 =
+        "'s|^PROGDIR=`dirname $0`" +
+        "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
+      runtime_paths = (lib.makeBinPath [
+        coreutils file findutils
+        gawk gnugrep gnused
+        jdk python3 which
+      ]) + ":${platformTools}/platform-tools";
+    in ''
+      mkdir -pv $out/libexec
+      cd $out/libexec
+      unzip -qq $src
 
-    # so that it doesn't fail because of read-only permissions set
-    cd -
-    ${if (version == "10e") then
-        ''
-          patch -p1 \
-            --no-backup-if-mismatch \
-            -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
-        ''
-      else
-        ''
-          patch -p1 \
-            --no-backup-if-mismatch \
-            -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_${version}.patch" }
+      # so that it doesn't fail because of read-only permissions set
+      cd -
+      ${if (version == "10e") then
+          ''
+            patch -p1 \
+              --no-backup-if-mismatch \
+              -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
+          ''
+        else
+          ''
+            patch -p1 \
+              --no-backup-if-mismatch \
+              -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" }
 
-          sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
-          sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
-          wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
-        ''
-    }
+            sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+            sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py
+            wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+          ''
+      }
 
-    patchShebangs ${pkg_path}
+      patchShebangs ${pkg_path}
 
-    cd ${pkg_path}
+      cd ${pkg_path}
 
-  '' + lib.optionalString (!fullNDK) ''
-    # Steps to reduce output size
-    rm -rf docs sources tests
-    # We only support cross compiling with gcc for now
-    rm -rf toolchains/*-clang* toolchains/llvm*
-  '' +
+    '' + lib.optionalString (!fullNDK) ''
+      # Steps to reduce output size
+      rm -rf docs sources tests
+      # We only support cross compiling with gcc for now
+      rm -rf toolchains/*-clang* toolchains/llvm*
+    '' +
 
-  ''
-    find ${pkg_path}/toolchains \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm -0100 \) \
-        \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
-    # fix ineffective PROGDIR / MYNDKDIR determination
-    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
-    do
-        sed -i -e ${sed_script_1} $i
-    done
+    ''
+      find ${pkg_path}/toolchains \( \
+          \( -type f -a -name "*.so*" \) -o \
+          \( -type f -a -perm -0100 \) \
+          \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
+                            --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
+      # fix ineffective PROGDIR / MYNDKDIR determination
+      for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
+      do
+          sed -i -e ${sed_script_1} $i
+      done
 
-    # wrap
-    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
-    do
-        wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
-    done
-    # make some executables available in PATH
-    mkdir -pv ${bin_path}
-    for i in \
-        ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
-    do
-        ln -sf ${pkg_path}/$i ${bin_path}/$i
-    done
-  '';
+      # wrap
+      for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
+      do
+          wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
+      done
+      # make some executables available in PATH
+      mkdir -pv ${bin_path}
+      for i in \
+          ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
+      do
+          ln -sf ${pkg_path}/$i ${bin_path}/$i
+      done
+    '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-    license = stdenv.lib.licenses.asl20;
+    meta = {
+      platforms = stdenv.lib.platforms.linux;
+      hydraPlatforms = [];
+      license = stdenv.lib.licenses.asl20;
+    };
   };
-}
+  passthru = {
+    inherit makeStandaloneToolchain;
+  };
+in lib.extendDerivation true passthru (ndk fullNDK)

From fd59d5642e4c140820410dc13fd0dd646fc785de Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:11:27 +0200
Subject: [PATCH 0502/3253] pigz: add license

---
 pkgs/tools/compression/pigz/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index a2668f73ceb2..7d4cdc2df86d 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -28,9 +28,10 @@ stdenv.mkDerivation {
       install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.zlib.net/pigz/;
     description = "A parallel implementation of gzip for multi-core machines";
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.zlib;
+    platforms = platforms.unix;
   };
 }

From 1e98674c792f3c6e82c44f0b1410e5b317b25e4a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:13:59 +0200
Subject: [PATCH 0503/3253] zdelta: add license

---
 pkgs/tools/compression/zdelta/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix
index 01050c5ee821..20748c31ab81 100644
--- a/pkgs/tools/compression/zdelta/default.nix
+++ b/pkgs/tools/compression/zdelta/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
 	  homepage = http://cis.poly.edu/zdelta;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
 }

From 735a7de05164ce5238261f5fbb625fb5a109debc Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:15:14 +0200
Subject: [PATCH 0504/3253] bashmount: add license

---
 pkgs/tools/filesystems/bashmount/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix
index 579258f63f98..cd0f3ea23229 100644
--- a/pkgs/tools/filesystems/bashmount/default.nix
+++ b/pkgs/tools/filesystems/bashmount/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/jamielinux/bashmount;
     description = "A menu-driven bash script for the management of removable media with udisks";
     maintainers = [ maintainers.koral ];
+    license = licenses.gpl2;
     platforms = platforms.all;
   };
 }

From ee58a5b30d6e60407b44fbb02ddade6c20fd8763 Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Tue, 4 Sep 2018 18:31:32 -0500
Subject: [PATCH 0505/3253] v8_6_x: 6.2.414.27 -> 6.9.427.14

---
 pkgs/development/libraries/v8/6_x.nix | 124 +++++++++++++++-----------
 1 file changed, 73 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix
index adebedbf2ac1..85d0c0d91bb5 100644
--- a/pkgs/development/libraries/v8/6_x.nix
+++ b/pkgs/development/libraries/v8/6_x.nix
@@ -13,82 +13,102 @@ let
               else "ia32";
   git_url = "https://chromium.googlesource.com";
 
+  # This data is from the DEPS file in the root of a V8 checkout
   deps = {
     "base/trace_event/common" = fetchgit {
-      url = "${git_url}/chromium/src/base/trace_event/common.git";
-      rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9";
-      sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p";
+      url    = "${git_url}/chromium/src/base/trace_event/common.git";
+      rev    = "211b3ed9d0481b4caddbee1322321b86a483ca1f";
+      sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7";
     };
     "build" = fetchgit {
-      url = "${git_url}/chromium/src/build.git";
-      rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367";
-      sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k";
+      url    = "${git_url}/chromium/src/build.git";
+      rev    = "7315579e388589b62236ad933f09afd1e838d234";
+      sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71";
     };
     "buildtools" = fetchgit {
-      url = "${git_url}/chromium/buildtools.git";
-      rev = "5af0a3a8b89827a8634132080a39ab4b63dee489";
-      sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1";
+      url    = "${git_url}/chromium/buildtools.git";
+      rev    = "0dd5c6f980d22be96b728155249df2da355989d9";
+      sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr";
     };
     "test/benchmarks/data" = fetchgit {
-      url = "${git_url}/v8/deps/third_party/benchmarks.git";
-      rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
+      url    = "${git_url}/v8/deps/third_party/benchmarks.git";
+      rev    = "05d7188267b4560491ff9155c5ee13e207ecd65f";
       sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
     };
     "test/mozilla/data" = fetchgit {
-      url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
-      rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
+      url    = "${git_url}/v8/deps/third_party/mozilla-tests.git";
+      rev    = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
       sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
     };
     "test/test262/data" = fetchgit {
-      url = "${git_url}/external/github.com/tc39/test262.git";
-      rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91";
-      sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4";
+      url    = "${git_url}/external/github.com/tc39/test262.git";
+      rev    = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef";
+      sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3";
     };
     "test/test262/harness" = fetchgit {
-      url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
-      rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
+      url    = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
+      rev    = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
       sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
     };
     "test/wasm-js" = fetchgit {
-      url = "${git_url}/external/github.com/WebAssembly/spec.git";
-      rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c";
-      sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr";
+      url    = "${git_url}/external/github.com/WebAssembly/spec.git";
+      rev    = "2113ea7e106f8a964e0445ba38f289d2aa845edd";
+      sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx";
     };
-    "testing/gmock" = fetchgit {
-      url = "${git_url}/external/googlemock.git";
-      rev = "0421b6f358139f02e102c9c332ce19a33faf75be";
-      sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";
+    "third_party/depot_tools" = fetchgit {
+      url    = "${git_url}/chromium/tools/depot_tools.git";
+      rev    = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82";
+      sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s";
     };
-    "testing/gtest" = fetchgit {
-      url = "${git_url}/external/github.com/google/googletest.git";
-      rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
-      sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
+    "third_party/googletest/src" = fetchgit {
+      url    = "${git_url}/external/github.com/google/googletest.git";
+      rev    = "ce468a17c434e4e79724396ee1b51d86bfc8a88b";
+      sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23";
     };
     "third_party/icu" = fetchgit {
-      url = "${git_url}/chromium/deps/icu.git";
-      rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6";
-      sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b";
+      url    = "${git_url}/chromium/deps/icu.git";
+      rev    = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529";
+      sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9";
     };
     "third_party/instrumented_libraries" = fetchgit {
-      url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
-      rev = "644afd349826cb68204226a16c38bde13abe9c3c";
-      sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa";
+      url    = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
+      rev    = "323cf32193caecbf074d1a0cb5b02b905f163e0f";
+      sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231";
     };
-    # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template)
     "third_party/jinja2" = fetchgit {
-      url = "${git_url}/chromium/src/third_party/jinja2.git";
-      rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
-      sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
+      url    = "${git_url}/chromium/src/third_party/jinja2.git";
+      rev    = "b41863e42637544c2941b574c7877d3e1f663e25";
+      sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r";
     };
     "third_party/markupsafe" = fetchgit {
-      url = "${git_url}/chromium/src/third_party/markupsafe.git";
-      rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
+      url    = "${git_url}/chromium/src/third_party/markupsafe.git";
+      rev    = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
       sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
     };
+    "third_party/proguard" = fetchgit {
+      url    = "${git_url}/chromium/src/third_party/proguard.git";
+      rev    = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e";
+      sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1";
+    };
     "tools/clang" = fetchgit {
-      url = "${git_url}/chromium/src/tools/clang.git";
-      rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe";
-      sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf";
+      url    = "${git_url}/chromium/src/tools/clang.git";
+      rev    = "c0b1d892b2bc1291eb287d716ca239c1b03fb215";
+      sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z";
+    };
+    "tools/gyp" = fetchgit {
+      url    = "${git_url}/external/gyp.git";
+      rev    = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
+      sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
+    };
+    "tools/luci-go" = fetchgit {
+      url    = "${git_url}/chromium/src/tools/luci-go.git";
+      rev    = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c";
+      sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld";
+    };
+    "tools/swarming_client" = fetchgit {
+      url    = "${git_url}/infra/luci/client-py.git";
+      rev    = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a";
+      sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi";
     };
   };
 
@@ -96,7 +116,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "v8-${version}";
-  version = "6.2.414.27";
+  version = "6.9.427.14";
 
   inherit doCheck;
 
@@ -104,7 +124,7 @@ stdenv.mkDerivation rec {
     owner = "v8";
     repo = "v8";
     rev = version;
-    sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2";
+    sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x";
   };
 
   postUnpack = ''
@@ -133,11 +153,13 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     tools/dev/v8gen.py -vv ${arch}.release -- \
-        is_component_build=true \
-        ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \
-        is_clang=false \
-        linux_use_bundled_binutils=false \
-        treat_warnings_as_errors=false
+        is_component_build=true               \
+        ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
+        is_clang=false                        \
+        linux_use_bundled_binutils=false      \
+        treat_warnings_as_errors=false        \
+        use_custom_libcxx=false               \
+        use_custom_libcxx_for_host=false
   '';
 
   nativeBuildInputs = [ gn ninja pkgconfig ];

From 58213481f660b451aa914f4be00847ea44c7823f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 Sep 2018 23:37:31 +0200
Subject: [PATCH 0506/3253] pecita: download from official source

The file upstream has not been changed for a long time so should be
safe to avoid the archive URL.
---
 pkgs/data/fonts/pecita/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index b57cf22569d2..a90ff42a8e2a 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchzip}:
+{ stdenv, fetchurl }:
 
 let
+
   version = "5.4";
-in fetchzip rec {
+
+in
+
+fetchurl rec {
   name = "pecita-${version}";
 
-  url = "http://archive.rycee.net/pecita/${name}.tar.xz";
+  url = "http://pecita.eu/b/Pecita.otf";
+
+  downloadToTemp = true;
 
   postFetch = ''
-    tar xJvf $downloadedFile --strip-components=1
     mkdir -p $out/share/fonts/opentype
-    cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf
+    cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf
   '';
 
+  recursiveHash = true;
   sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm";
 
   meta = with stdenv.lib; {

From 8060dadf69b99305d9f723894303d825a604a722 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:17:34 +0200
Subject: [PATCH 0507/3253] curlftpfs: update meta data

---
 pkgs/tools/filesystems/curlftpfs/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix
index 4af7c9fb8c26..5636909093e6 100644
--- a/pkgs/tools/filesystems/curlftpfs/default.nix
+++ b/pkgs/tools/filesystems/curlftpfs/default.nix
@@ -11,7 +11,11 @@ stdenv.mkDerivation {
 
   doCheck = false; # fails, doesn't work well too, btw
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Filesystem for accessing FTP hosts based on FUSE and libcurl";
+    homepage = http://curlftpfs.sourceforge.net;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+
   };
 }

From 5f2d66ccc6e39cb0fee97b94b915d4e8e59b35ca Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:19:35 +0200
Subject: [PATCH 0508/3253] fatresize: add license

---
 pkgs/tools/filesystems/fatresize/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix
index 9af14b051261..7bb5dd415a6a 100644
--- a/pkgs/tools/filesystems/fatresize/default.nix
+++ b/pkgs/tools/filesystems/fatresize/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, parted, utillinux }:
 
 stdenv.mkDerivation rec {
-  
+
   version = "1.0.2";
   name = "fatresize-${version}";
 
@@ -9,31 +9,32 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2";
     sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm";
   };
-  
+
   buildInputs = [ parted utillinux ];
-  
+
   # This patch helps this unmantained piece of software to be built against recent parted
   # It basically modifies the detection scheme for parted version (the current one has no micro version defined)
   # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted
   # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params
   patches = [ ./fatresize_parted_nix.patch ];
-  
+
   preConfigure = ''
     echo "Replacing calls to ped_free with free ..."
     substituteInPlace ./fatresize.c --replace ped_free free
   '';
-  
+
   # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives
   # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG
   makeFlags = ''
     LDFLAGS=-lparted-fs-resize
   '';
-  
+
   propagatedBuildInputs = [ parted utillinux ];
-  
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "The FAT16/FAT32 non-destructive resizer";
     homepage = https://sourceforge.net/projects/fatresize;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From 4516ca5480dc19bd41ea88b34a8dfa24034ea59d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:22:13 +0200
Subject: [PATCH 0509/3253] jfsutils: add license + homepage

---
 pkgs/tools/filesystems/jfsutils/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix
index 244f3e294a86..acc7a91d93f5 100644
--- a/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/pkgs/tools/filesystems/jfsutils/default.nix
@@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libuuid ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "IBM JFS utilities";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://jfs.sourceforge.net;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }

From 4f83467ba42b00714f317fd56987fbc6a38b96a1 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:23:41 +0200
Subject: [PATCH 0510/3253] mtools: add license

---
 pkgs/tools/filesystems/mtools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index e7a9963f6501..f153e59019e3 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/mtools/;
     description = "Utilities to access MS-DOS disks";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ ];
+    platforms = platforms.unix;
+    license = licenses.gpl3;
   };
 }

From d3485885b208c6992d3c318a723716196ac26145 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:25:24 +0200
Subject: [PATCH 0511/3253] mtpfs: add licenses

---
 pkgs/tools/filesystems/mtpfs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix
index afe51caa8772..bf048113714f 100644
--- a/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/pkgs/tools/filesystems/mtpfs/default.nix
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
     sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/cjd/mtpfs;
     description = "FUSE Filesystem providing access to MTP devices";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.qknight ];
+    platforms = platforms.all;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.qknight ];
   };
 }

From aae4e1ddc20bc30a395198cad44859bc367d8284 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:29:04 +0200
Subject: [PATCH 0512/3253] nilfs-utils: add licenses

---
 pkgs/tools/filesystems/nilfs-utils/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix
index 6b56a8aadfa0..eccd72ceb238 100644
--- a/pkgs/tools/filesystems/nilfs-utils/default.nix
+++ b/pkgs/tools/filesystems/nilfs-utils/default.nix
@@ -46,14 +46,11 @@ stdenv.mkDerivation rec {
     find . -name .libs | xargs rm -rf
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "NILFS utilities";
-    maintainers = with stdenv.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with stdenv.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license =  with licenses; [ gpl2 lgpl21 ];
     downloadPage = "http://nilfs.sourceforge.net/en/download.html";
     updateWalker = true;
   };

From fa6bfc59746533c559382218c99e264a97c98120 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:32:12 +0200
Subject: [PATCH 0513/3253] reiser4progs: add license, update homepage

---
 pkgs/tools/filesystems/reiser4progs/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 59d8e8aa4389..967a8ee43bef 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace ./run-ldconfig true
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
-    homepage = http://www.namesys.com/;
+    homepage = https://sourceforge.net/projects/reiser4/;
     description = "Reiser4 utilities";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 9a46c0f384fc2025d69cea4ab2ea4a3625738710 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:34:31 +0200
Subject: [PATCH 0514/3253] relfs: add license

---
 pkgs/tools/filesystems/relfs/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 9a8c3ecb0fc8..04a15dfa22be 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -40,10 +40,12 @@ stdenv.mkDerivation rec {
 		chmod a+x \$out/bin/relfs_grant;
   '';
 
-	meta = {
+	meta = with stdenv.lib; {
 		description = "A relational filesystem on top of FUSE";
-    maintainers = [stdenv.lib.maintainers.raskin];
-		platforms = stdenv.lib.platforms.linux;
+    homepage = http://relfs.sourceforge.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     broken = true;
 	};
 }

From 0f61edc465a643d48471a0b96b362694419f3ecb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:38:03 +0200
Subject: [PATCH 0515/3253] wfds: add license

---
 pkgs/tools/filesystems/wdfs/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix
index dc725b5078f0..135373e09f42 100644
--- a/pkgs/tools/filesystems/wdfs/default.nix
+++ b/pkgs/tools/filesystems/wdfs/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [fuse glib neon];
-  meta = {
+
+  meta = with stdenv.lib; {
     homepage = http://noedler.de/projekte/wdfs/;
+    license = licenses.gpl2;
     description = "User-space filesystem that allows to mount a webdav share";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From f92f9a2b6f2883f446f8582403819c5ccde1f1a0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:39:15 +0200
Subject: [PATCH 0516/3253] bchunk: add license

---
 pkgs/tools/cd-dvd/bchunk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix
index 6828ef7d61d3..aa47edcb96c4 100644
--- a/pkgs/tools/cd-dvd/bchunk/default.nix
+++ b/pkgs/tools/cd-dvd/bchunk/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     homepage = http://he.fi/bchunk/;
     description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks";
     platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From e016d1eabb34e83bf5dbd845bbb516e02aaf074e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:40:38 +0200
Subject: [PATCH 0517/3253] cdrdao: add license

---
 pkgs/tools/cd-dvd/cdrdao/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index 25d94593f5ef..a17b03025032 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/pkgs/tools/cd-dvd/cdrdao/default.nix
@@ -28,9 +28,10 @@ stdenv.mkDerivation {
   # Needed on gcc >= 6.
   NIX_CFLAGS_COMPILE = "-Wno-narrowing";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode";
     homepage = http://cdrdao.sourceforge.net/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From 0bdf24f9a50df8c5328b22f454df8bdab2c80b72 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 7 Sep 2018 22:43:36 +0200
Subject: [PATCH 0518/3253] lsdvd: add license

---
 pkgs/tools/cd-dvd/lsdvd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix
index 6a3f92a57c2d..56ec8e19f54e 100644
--- a/pkgs/tools/cd-dvd/lsdvd/default.nix
+++ b/pkgs/tools/cd-dvd/lsdvd/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
   buildInputs = [ libdvdread ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/lsdvd/;
     description = "Display information about audio, video, and subtitle tracks on a DVD";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 7de251551a12def35ca27e2131a5bf0fe3817c5c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 21:50:55 +0200
Subject: [PATCH 0519/3253] xvkbd: update homepage

---
 pkgs/tools/X11/xvkbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 7221555ed33f..06824f882a44 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       facility to enter characters onto other clients (softwares) by clicking on a
       keyboard displayed on the screen.
     '';
-    homepage = http://homepage3.nifty.com/tsato/xvkbd/;
+    homepage = http://t-sato.in.coocan.jp/xvkbd;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.bennofs ];
     platforms = platforms.linux;

From 72ce407703d48f4f7c580b872f3b8aad6cc4ae73 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 21:55:11 +0200
Subject: [PATCH 0520/3253] x2x: update license + homepage

---
 pkgs/tools/X11/x2x/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index dd529011557a..24cf4f6b2e16 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
     cp x2x.1 $out/man/man1/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Allows the keyboard, mouse on one X display to be used to control another X display";
-    homepage = http://x2x.dottedmag.net;
-    license = "BSD";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://github.com/dottedmag/x2x;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }

From 4f0010dbec1f8668d2441eb9fcf3cc648c19cf8a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 22:00:16 +0200
Subject: [PATCH 0521/3253] euca2ools: update homepage

---
 pkgs/tools/virtualization/euca2ools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index ce628ff84b5e..5b310992afb6 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -15,7 +15,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = [ boto m2crypto ];
 
   meta = {
-    homepage = http://open.eucalyptus.com/downloads;
+    homepage = https://github.com/eucalyptus/euca2ools;
     description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services";
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.linux;

From e4620658d0dcb9a8bd7a698fc315365ce82a01c7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 22:00:43 +0200
Subject: [PATCH 0522/3253] nitrogen: update homepage

---
 pkgs/tools/X11/nitrogen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index f53ab38672bd..eda5703d6a86 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       multi-head with Xinerama. Wallpapers are browsable with a convenient GUI,
       and settings are stored in a human-readable config file.
     '';
-    homepage = http://projects.l3ib.org/nitrogen/;
+    homepage = https://github.com/l3ib/nitrogen;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.auntie ];

From fb89213cf650a4a847ee7481ae767a2f2ebdabf2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 22:16:31 +0200
Subject: [PATCH 0523/3253] x11-ssh-askpass: update src + homepage, add license

---
 pkgs/tools/networking/x11-ssh-askpass/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index 4061d5284aa6..896a2ff4daaa 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
   outputs = [ "out" "man" ];
 
   src = fetchurl {
-    url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz;
-    sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7";
+    url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz;
+    sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88";
   };
 
   nativeBuildInputs = [ imake ];
@@ -24,11 +24,10 @@ stdenv.mkDerivation {
 
   installTargets = [ "install" "install.man" ];
 
-  meta = {
-    homepage = http://www.jmknoble.net/software/x11-ssh-askpass/;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sigmavirus24/x11-ssh-askpass;
     description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
-
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [];
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
 }

From 218ac50fd47cb6155dd05885bb3676804036910d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 01:02:55 +0200
Subject: [PATCH 0524/3253] pythonPackages.trio: fix build (#46342)

Fixes the build for `python3Packages.trio' for the next ZHF iteration.
Please refer to the Hydra build for further reference: https://hydra.nixos.org/build/80617356

`python3Packages.sniffio` is needed for the build, otherwise the build
aborts with an error like this:

```
  Could not find a version that satisfies the requirement sniffio (from trio==0.6.0) (from versions: )
No matching distribution found for sniffio (from trio==0.6.0)
```

See #45960
---
 .../python-modules/sniffio/default.nix        | 30 +++++++++++++++++++
 .../python-modules/trio/default.nix           |  2 ++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/sniffio/default.nix

diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix
new file mode 100644
index 000000000000..9893bc5828a0
--- /dev/null
+++ b/pkgs/development/python-modules/sniffio/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "sniffio";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf";
+  };
+
+  # breaks with the following error:
+  # > TypeError: 'encoding' is an invalid keyword argument for this function
+  disabled = !isPy3k;
+
+  buildInputs = [ glibcLocales ];
+
+  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+  # no tests distributed with PyPI
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/python-trio/sniffio;
+    license = licenses.asl20;
+    description = "Sniff out which async library your code is running under";
+  };
+}
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 4924fa527c62..89addb377dc4 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -8,6 +8,7 @@
 , pytest
 , pyopenssl
 , trustme
+, sniffio
 }:
 
 buildPythonPackage rec {
@@ -31,6 +32,7 @@ buildPythonPackage rec {
     async_generator
     idna
     outcome
+    sniffio
   ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 091694633930..2eae6212cd4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -574,6 +574,8 @@ in {
 
   trio = callPackage ../development/python-modules/trio {};
 
+  sniffio = callPackage ../development/python-modules/sniffio { };
+
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
   toml = callPackage ../development/python-modules/toml { };

From f60fea5742e3e379f5060991daae94dafa67ea1f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 4 Sep 2018 22:28:32 +0200
Subject: [PATCH 0525/3253] netselect: update homepage + license

---
 pkgs/tools/networking/netselect/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix
index 6015ff9fbc7c..ef00d8602feb 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/pkgs/tools/networking/netselect/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "netselect-0.3";
-  
+
   src = fetchurl {
     url = http://alumnit.ca/~apenwarr/netselect/netselect-0.3.tar.gz;
     sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy";
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
       --replace "-g root" "" \
       --replace "4755"    "0755"
   '';
-  
-  meta = {
-    homepage = http://alumnit.ca/~apenwarr/netselect/;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/apenwarr/netselect;
     description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\"";
-    license = "BSD";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }

From 17eda398322401c4fccd335a3221aaf3e75b16b9 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 00:32:30 +0200
Subject: [PATCH 0526/3253] numix-*: update homepage

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 2 +-
 pkgs/data/icons/numix-icon-theme-square/default.nix | 2 +-
 pkgs/data/icons/numix-icon-theme/default.nix        | 2 +-
 pkgs/misc/themes/numix/default.nix                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5ac0998fb291..68b967e715d4 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Numix icon theme (circle version)";
-    homepage = https://numixproject.org;
+    homepage = https://numixproject.github.io;
     license = licenses.gpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 875e10259276..ec6972c4cac7 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Numix icon theme (square version)";
-    homepage = https://numixproject.org;
+    homepage = https://numixproject.github.io;
     license = licenses.gpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 35f624a00f5b..9aaed97dc273 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Numix icon theme";
-    homepage = https://numixproject.org;
+    homepage = https://numixproject.github.io;
     license = licenses.gpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index f7b5f3d91af4..4fb412481095 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)";
-    homepage = https://numixproject.org;
+    homepage = https://numixproject.github.io;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From 0f8c58afd223c366482602804bf5b5231c0820c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 8 Sep 2018 01:38:56 +0200
Subject: [PATCH 0527/3253] kdecoration-viewer: Fixes build (#46339)

---
 pkgs/tools/misc/kdecoration-viewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
index 62783bb30dff..5c2e410cd930 100644
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -2,13 +2,13 @@
 , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
 
 stdenv.mkDerivation rec {
-  name = "kdecoration-viewer-2015-08-20";
+  name = "kdecoration-viewer-2018-07-24";
 
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "kdecoration-viewer";
-    rev = "d7174acee01475fbdb71cfd48ca49d487a141701";
-    sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
+    rev = "6e50b39c651bbf92fd7e7116d43bf57288254288";
+    sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From af3fdb44ee43568228ee1b7f4dd5619c87c94f7b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 7 Sep 2018 19:43:33 -0400
Subject: [PATCH 0528/3253] nvidia_x11: include drm_mode_connector patch

---
 pkgs/os-specific/linux/nvidia-x11/default.nix |  2 ++
 .../linux/nvidia-x11/drm_mode_connector.patch | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d9f24874058b..d9ff157e1429 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,6 +22,8 @@ rec {
     sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q";
     settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r";
     persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58";
+
+    patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
   };
 
   beta = stable; # not enough interest to maintain beta ATM
diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch
new file mode 100644
index 000000000000..58cf06fae45f
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch
@@ -0,0 +1,24 @@
+diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c	2018-09-07 17:38:31.807453997 -0400
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c	2018-09-07 17:39:22.446185824 -0400
+@@ -226,7 +226,7 @@
+ 
+ 
+     if (nv_connector->edid != NULL) {
+-        drm_mode_connector_update_edid_property(
++        drm_connector_update_edid_property(
+             connector, nv_connector->edid);
+     }
+ 
+diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-09-07 17:38:31.807453997 -0400
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-09-07 17:39:35.083798484 -0400
+@@ -216,7 +216,7 @@
+ 
+     /* Attach encoder and connector */
+ 
+-    ret = drm_mode_connector_attach_encoder(connector, encoder);
++    ret = drm_connector_attach_encoder(connector, encoder);
+ 
+     if (ret != 0) {
+         NV_DRM_DEV_LOG_ERR(

From 320a587b7e862bda6b10eff4d90f25753703185d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Sep 2018 19:00:54 -0500
Subject: [PATCH 0529/3253] kconfig-frontends: 3.12.0.0 -> 4.11.0.1

---
 pkgs/development/tools/misc/kconfig-frontends/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index d1415569ca33..869ab3a39c50 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   basename = "kconfig-frontends";
-  version = "3.12.0.0";
+  version = "4.11.0.1";
   name = "${basename}-${version}";
 
   src = fetchurl {
-    sha256 = "01zlph9bq2xzznlpmfpn0zrmhf2iqw02yh1q7g7adgkl5jk1a9pa";
+    sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3";
     url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
   };
 

From 3c42848ec75e5911904888ad518c87bdda625ed2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Sep 2018 19:31:33 -0500
Subject: [PATCH 0530/3253] kconfig-frontends: patch+wrap python shebang to fix
 kconfig-diff

---
 pkgs/development/tools/misc/kconfig-frontends/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index 869ab3a39c50..8a49465a8c2f 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses }:
+{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
 
 stdenv.mkDerivation rec {
   basename = "kconfig-frontends";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bison flex gperf ncurses ];
+  buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
 
   hardeningDisable = [ "format" ];
 
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     "--enable-frontends=conf,mconf,nconf"
   ];
 
+  postInstall = ''
+    wrapPythonPrograms
+  '';
+
   meta = with stdenv.lib; {
     description = "Out of Linux tree packaging of the kconfig infrastructure";
     longDescription = ''

From 4fcf281e536f2690f4c69f4019d3ee3b30a3e7b5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Sep 2018 19:36:51 -0500
Subject: [PATCH 0531/3253] kconfig-frontends: don't disable format hardening,
 doesn't seem needed

---
 pkgs/development/tools/misc/kconfig-frontends/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index 8a49465a8c2f..bceb15f11659 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
 
-  hardeningDisable = [ "format" ];
-
   configureFlags = [
     "--enable-frontends=conf,mconf,nconf"
   ];

From f0f8229ee398a5c4fbc1bef2d5074710ac7f4a71 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 00:37:30 +0200
Subject: [PATCH 0532/3253] gssdp: enable docs, tests, gir and split outputs

---
 pkgs/development/libraries/gssdp/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index d48ba9082af2..0d77018eee5f 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
 
 stdenv.mkDerivation rec {
   name = "gssdp-${version}";
   version = "1.0.2";
 
+  outputs = [ "out" "bin" "dev" "devdoc" ];
+
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz";
+    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libsoup ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  buildInputs = [ libsoup gtk3 ];
   propagatedBuildInputs = [ glib ];
 
+  configureFlags = [
+    "--enable-gtk-doc"
+  ];
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = http://www.gupnp.org/;
-    license = licenses.lgpl2;
+    license = licenses.lgpl2Plus;
     platforms = platforms.all;
   };
 }

From bd55a78f6d15416a075a7efc79f179b13c0d9482 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 7 Sep 2018 20:58:00 -0400
Subject: [PATCH 0533/3253] nanorc: Init at 2018-09-05

---
 .../editors/nano/nanorc/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/editors/nano/nanorc/default.nix

diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix
new file mode 100644
index 000000000000..fb30036e146f
--- /dev/null
+++ b/pkgs/applications/editors/nano/nanorc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nanorc-${version}";
+  version = "2018-09-05";
+
+  src = fetchFromGitHub {
+    owner = "scopatz";
+    repo = "nanorc";
+    rev = "1e589cb729d24fba470228d429e6dde07973d597";
+    sha256 = "136yxr38lzrfv8bar0c6c56rh54q9s94zpwa19f425crh44drppl";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share
+
+    install *.nanorc $out/share/
+  '';
+
+  meta = {
+    description = "Improved Nano Syntax Highlighting Files";
+    homepage = https://github.com/scopatz/nanorc;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ nequissimus ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06a7aaa9a68a..2fbddb94b1b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17843,6 +17843,8 @@ with pkgs;
 
   nanoblogger = callPackage ../applications/misc/nanoblogger { };
 
+  nanorc = callPackage ../applications/editors/nano/nanorc { };
+
   navipowm = callPackage ../applications/misc/navipowm { };
 
   navit = libsForQt5.callPackage ../applications/misc/navit { };

From 1aaea3839b1ff01718d6a02407672a08406a5df5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 00:45:35 +0200
Subject: [PATCH 0534/3253] gupnp: enable docs, gir and split outputs

---
 pkgs/development/libraries/gupnp/default.nix  | 39 ++++++++++++-------
 .../libraries/gupnp/fix-requires.patch        |  9 +++++
 2 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/libraries/gupnp/fix-requires.patch

diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 963b93ef6917..7ec6199dc076 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,28 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
- 
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
+
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
-  majorVersion = "1.0";
-  version = "${majorVersion}.2";
+  version = "1.0.2";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
+    url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz";
     sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  patches = [
+    # Nix’s pkg-config ignores Requires.private
+    # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
+    # We are essentialy reverting the following patch for now
+    # https://bugzilla.gnome.org/show_bug.cgi?id=685477
+    # at least until Requires.internal or something is implemented
+    # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
+    ./fix-requires.patch
+  ];
+
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
   propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
 
-  postInstall = ''
-    ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include
-    ln -sv ${libxml2.dev}/include/*/libxml $out/include
-    ln -sv ${gssdp}/include/*/libgssdp $out/include
-  '';
+  configureFlags = [
+    "--enable-gtk-doc"
+  ];
 
-  meta = {
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     homepage = http://www.gupnp.org/;
     description = "An implementation of the UPnP specification";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch
new file mode 100644
index 000000000000..4538fc55460f
--- /dev/null
+++ b/pkgs/development/libraries/gupnp/fix-requires.patch
@@ -0,0 +1,9 @@
+--- a/gupnp-1.0.pc.in
++++ b/gupnp-1.0.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-1.0
+ Cflags: -I${includedir}/gupnp-1.0
+-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4
++Requires.private: @UUID_LIBS@

From 5bee539f1cacf5b8708c41edaaf2146fe347ae36 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 00:58:52 +0200
Subject: [PATCH 0535/3253] gupnp-dlna: enable docs, tests and split outputs

---
 .../libraries/gupnp-dlna/default.nix          | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 75818f756921..aba95889b698 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,22 +1,34 @@
-{ stdenv, fetchurl, pkgconfig,  gobjectIntrospection, gupnp, gst-plugins-base }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-dlna-${version}";
-  majorVersion = "0.10";
-  version = "${majorVersion}.5";
+  version = "0.10.5";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
   };
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
-  buildInputs = [ gupnp gst-plugins-base ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
 
-  meta = {
+  configureFlags = [
+    "--enable-gtk-doc"
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    chmod +x tests/test-discoverer.sh.in
+    patchShebangs tests/test-discoverer.sh.in
+  '';
+
+  meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GUPnP/;
     description = "Library to ease DLNA-related bits for applications using GUPnP";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }

From 0f063f97a6db56c751e5e56dde3b3dac31a942bd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 01:13:16 +0200
Subject: [PATCH 0536/3253] =?UTF-8?q?gupnp:=201.0.2=20=E2=86=92=201.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gupnp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 7ec6199dc076..45adf46ff36f 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gupnp-${version}";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz";
-    sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi";
+    sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr";
   };
 
   patches = [

From 05506a27850c777cefc4b58bceeb12fcd1845872 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 01:25:51 +0200
Subject: [PATCH 0537/3253] gupnp-av: enable docs, gir, tests and split outputs

---
 .../libraries/gupnp-av/default.nix            | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 9b61f4b648e1..7491da7c3e2f 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gupnp-av-${version}";
-  majorVersion = "0.12";
-  version = "${majorVersion}.10";
+  version = "0.12.10";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
   };
-  
-  nativeBuildInputs = [ pkgconfig ];
+
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ gupnp glib libxml2 ];
 
-  meta = {
+  configureFlags = [
+    "--enable-gtk-doc"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     homepage = http://gupnp.org/;
     description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }

From b18461b085a319b1bc8b09144c6af0cb6058a7bf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Sep 2018 03:07:59 +0200
Subject: [PATCH 0538/3253] =?UTF-8?q?gupnp-igd:=200.2.4=20=E2=86=92=200.2.?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gupnp-igd/default.nix           | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 182905e9546a..50107959786d 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
- 
+{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
+
 stdenv.mkDerivation rec {
   name = "gupnp-igd-${version}";
-  majorVersion = "0.2";
-  version = "${majorVersion}.4";
+  version = "0.2.5";
+
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
-    sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
+    url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   propagatedBuildInputs = [ glib gupnp ];
 
-  meta = {
+  configureFlags = [
+    "--enable-gtk-doc"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Library to handle UPnP IGD port mapping";
     homepage = http://www.gupnp.org/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
   };
 }
-

From feb18af0609de04f8e19e4b7edf76b014ce82729 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 00:11:34 +0200
Subject: [PATCH 0539/3253] gnome3.rygel: init at 0.36.2

---
 pkgs/desktops/gnome-3/core/rygel/default.nix | 54 ++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/rygel/default.nix

diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
new file mode 100644
index 000000000000..ef0886328974
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobjectIntrospection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }:
+
+let
+  pname = "rygel";
+  version = "0.36.2";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  # TODO: split out lib
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook
+  ];
+  buildInputs = [
+    glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info
+  ] ++ (with gst_all_1; [
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+  ]);
+
+  configureFlags = [
+    "--with-systemduserunitdir=$(out)/lib/systemd/user"
+    "--enable-apidocs"
+    "--sysconfdir=/etc"
+  ];
+
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+  ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "gnome3.${pname}";
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices";
+    homepage = https://wiki.gnome.org/Projects/Rygel;
+    license = licenses.lgpl21Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d90440d5f557..5112f8b496f5 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -216,6 +216,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   rest = callPackage ./core/rest { };
 
+  rygel = callPackage ./core/rygel { };
+
   simple-scan = callPackage ./core/simple-scan { };
 
   sushi = callPackage ./core/sushi { };

From 60ae12f5de19c784de869f81f1074236a8db1c6b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Aug 2018 11:16:39 +0200
Subject: [PATCH 0540/3253] nixos/rygel: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/gnome3/rygel.nix        | 30 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/rygel.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..b1ae2f356cd6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -245,6 +245,7 @@
   ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/gpaste.nix
   ./services/desktops/gnome3/gvfs.nix
+  ./services/desktops/gnome3/rygel.nix
   ./services/desktops/gnome3/seahorse.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
new file mode 100644
index 000000000000..55d5e703aa19
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -0,0 +1,30 @@
+# rygel service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.gnome3.rygel = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable Rygel UPnP Mediaserver.
+
+          You will need to also allow UPnP connections in firewall, see the following <link xlink:href="https://github.com/NixOS/nixpkgs/pull/45045#issuecomment-416030795">comment</link>.
+        '';
+        type = types.bool;
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf config.services.gnome3.rygel.enable {
+    environment.systemPackages = [ pkgs.gnome3.rygel ];
+
+    services.dbus.packages = [ pkgs.gnome3.rygel ];
+
+    systemd.packages = [ pkgs.gnome3.rygel ];
+  };
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index faf5214130db..eb86f7b53bb6 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -110,6 +110,7 @@ in {
     services.gnome3.gnome-terminal-server.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
     services.gnome3.gvfs.enable = true;
+    services.gnome3.rygel.enable = mkDefault true;
     services.gnome3.seahorse.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;

From f223f417fa57719e79aaa59ef2d1cef3b6171129 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 7 Sep 2018 02:18:36 -0400
Subject: [PATCH 0541/3253] swift-corelibs.corefoundation: update and modernize

This actually makes it useful to the Darwin stdenv, which I'll soon be
adjusting to use this library
---
 .../darwin/swift-corelibs/corefoundation.nix  | 76 +++++++++++++++----
 .../darwin/swift-corelibs/default.nix         |  4 +-
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 969168fa54ba..1dea55cccc9e 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -1,32 +1,78 @@
-{ stdenv, fetchFromGitHub, python, ninja, libxml2 }:
+{ stdenv, fetchFromGitHub, fetchurl, python, ninja, libxml2, objc4, ICU, curl }:
 
-stdenv.mkDerivation {
+let
+  # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but
+  # isn't available publicly, so instead we grab an older version of the same file that did
+  # not use sysdir.h, but provided the same functionality. Luckily it's simple :) hack hack
+  sysdir-free-system-directories = fetchurl {
+    url    = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c";
+    sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc";
+  };
+in stdenv.mkDerivation {
   name = "swift-corefoundation";
 
   src = fetchFromGitHub {
     owner  = "apple";
     repo   = "swift-corelibs-foundation";
-    rev    = "dce4233f583ec15190b240d6116396bf9641cd57";
-    sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr";
+    rev    = "85c640e7ce50e6ca61a134c72270e214bc63fdba"; # https://github.com/apple/swift-corelibs-foundation/pull/1686
+    sha256 = "0z2v278wy7jh0c92g1dszd8hj8naxari660sqx6yab5dwapd46qc";
   };
 
-  buildInputs = [ ninja python libxml2 ];
+  buildInputs = [ ninja python libxml2 objc4 ICU curl ];
+
+  sourceRoot = "source/CoreFoundation";
 
   patchPhase = ''
-    substituteInPlace CoreFoundation/build.py \
-      --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \
+    cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c
+
+    # In order, since I can't comment individual lines:
+    # 1. Disable dispatch support for now
+    # 2. For the linker too
+    # 3. Use the legit CoreFoundation.h, not the one telling you not to use it because of Swift
+    substituteInPlace build.py \
+      --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \
+      --replace "cf.LDFLAGS += '-ldispatch" '#' \
+      --replace "Base.subproj/SwiftRuntime/CoreFoundation.h" 'Base.subproj/CoreFoundation.h'
+
+    # Includes xpc for some initialization routine that they don't define anyway, so no harm here
+    substituteInPlace PlugIn.subproj/CFBundlePriv.h \
+      --replace '#if (TARGET_OS_MAC' '#if (0'
+
+    # Why do we define __GNU__? Is that normal?
+    substituteInPlace Base.subproj/CFAsmMacros.h \
+      --replace '#if defined(__GNU__) ||' '#if 0 &&'
+
+    # The MIN macro doesn't seem to be defined sensibly for us. Not sure if our stdenv or their bug
+    substituteInPlace Base.subproj/CoreFoundation_Prefix.h \
+      --replace '#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX' '#if 1'
+
+    # Somehow our ICU doesn't have this, probably because it's too old (we'll update it soon when we update the rest of the SDK)
+    substituteInPlace Locale.subproj/CFLocale.c \
+      --replace '#if U_ICU_VERSION_MAJOR_NUM' '#if 0 //'
   '';
 
-  configurePhase = ":";
+  BUILD_DIR = "./Build";
+  CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs
+  LDFLAGS = "-install_name ${placeholder "out"}/Frameworks/CoreFoundation.framework/CoreFoundation -current_version 1234.56.7 -compatibility_version 150.0.0 -init ___CFInitialize";
+  configurePhase = "../configure --sysroot unused";
 
-  buildPhase = ''
-    cd CoreFoundation
-    ../configure --sysroot unused
-    ninja
-  '';
+  enableParallelBuilding = true;
+  buildPhase = "ninja -j $NIX_BUILD_CORES";
 
+  # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now
+  # Also, this includes a bunch of private headers in the framework, which is not what we want
   installPhase = ''
-    mkdir -p $out/lib
-    cp ../Build/CoreFoundation/libCoreFoundation.a $out/lib
+    base="$out/Library/Frameworks/CoreFoundation.framework"
+    mkdir -p $base/Versions/A/{Headers,PrivateHeaders,Modules}
+
+    cp ./Build/CoreFoundation/libCoreFoundation.dylib $base/Versions/A/CoreFoundation
+    cp ./Build/CoreFoundation/usr/include/CoreFoundation/*.h $base/Versions/A/Headers
+    cp ./Build/CoreFoundation/usr/include/CoreFoundation/module.modulemap $base/Versions/A/Modules
+
+    ln -s A $base/Versions/Current
+
+    for i in CoreFoundation Headers Modules; do
+      ln -s Versions/Current/$i $base/$i
+    done
   '';
 }
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
index dd652dc56273..0d96b8fd008e 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/default.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix
@@ -1,7 +1,7 @@
-{callPackage, darwin}:
+{ callPackage, darwin }:
 
 rec {
-  corefoundation = callPackage ./corefoundation.nix {};
+  corefoundation = callPackage ./corefoundation.nix { inherit (darwin) objc4 ICU; };
   libdispatch = callPackage ./libdispatch.nix {
    inherit (darwin) apple_sdk_sierra xnu;
   };

From 2031c0ebfeba4cd2bf24058030da95a56c9b6e91 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 04:06:58 -0400
Subject: [PATCH 0542/3253] mono-addins: fix build (#46354)

---
 pkgs/development/libraries/mono-addins/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec3..780f68e7d485 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:
 
 stdenv.mkDerivation rec {
   name = "mono-addins-${version}";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ mono gtk-sharp-2_0 ];
+
+  # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+  buildInputs = [ mono48 gtk-sharp-2_0 ];
 
   dontStrip = true;
 

From 5a166ffd4733ff7049c2c57d42beb3ed4c15cbbf Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 10:16:48 +0200
Subject: [PATCH 0543/3253] boo: remove, broken since Jun 2016

marked broken in June 2016, no visible attempt to fix it,
so let's get rid of it
---
 pkgs/development/compilers/boo/config.patch | 45 --------------------
 pkgs/development/compilers/boo/default.nix  | 46 ---------------------
 pkgs/top-level/all-packages.nix             |  4 --
 3 files changed, 95 deletions(-)
 delete mode 100644 pkgs/development/compilers/boo/config.patch
 delete mode 100644 pkgs/development/compilers/boo/default.nix

diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch
deleted file mode 100644
index f6e0eee29b1b..000000000000
--- a/pkgs/development/compilers/boo/config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/default.build b/default.build
-index e48fd9e..b0dee4f 100644
---- a/default.build
-+++ b/default.build
-@@ -23,14 +23,14 @@
- 	<property name="skip.ast" value="False" />
- 	<property name="skip.vs" value="False" />
- 
--	<property name="gsv.name" value="gtksourceview-1.0" />
-+	<property name="gsv.name" value="gtksourceview-2.0" />
- 	
- 	<property name="build.dir" value="build" dynamic="True"/>
- 	<property name="distrobuild.dir" value="distrobuild"/>
- 	<property name="docs.dir" value="docs" />
- 	<property name="examples.dir" value="examples" />
- 
--	<property name="install.prefix" value="/usr/local" />
-+	<property name="install.prefix" value="$out" />
- 	<property name="install.destdir" value="/" />
- 
- 	<property name="install.share" value="${path::combine(install.prefix,'share')}" />
-@@ -575,9 +575,9 @@
- 		key files for mime detection, etc
- 		-->
- 
--		<property name="sharedmime.prefix" value="${pkg-config::get-variable('shared-mime-info','prefix')}" />
-+		<property name="sharedmime.prefix" value="$out" />
- 		<property name="fakeroot.sharedmime" value="${fakeroot}/${sharedmime.prefix}" />
--		<property name="gsv.prefix" value="${pkg-config::get-variable(gsv.name,'prefix')}" />
-+		<property name="gsv.prefix" value="$out" />
- 		<property name="fakeroot.gsv" value="${fakeroot}/${gsv.prefix}" />
- 
- 		<mkdir dir="${fakeroot.boolib}"/>
-@@ -707,9 +707,9 @@
- 		key files for mime detection, etc
- 		-->
- 
--		<property name="sharedmime.prefix" value="${pkg-config::get-variable('shared-mime-info','prefix')}" />
-+		<property name="sharedmime.prefix" value="$out" />
- 		<property name="fakeroot.sharedmime" value="${fakeroot}/${sharedmime.prefix}" />
--		<property name="gsv.prefix" value="${pkg-config::get-variable(gsv.name,'prefix')}" />
-+		<property name="gsv.prefix" value="$out" />
- 		<property name="fakeroot.gsv" value="${fakeroot}/${gsv.prefix}" />
- 		
- 		<foreach item="File" property="filename">
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
deleted file mode 100644
index ec5e08ffda40..000000000000
--- a/pkgs/development/compilers/boo/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant
-, shared-mime-info, gtksourceview, gtk2 }:
-
-let
-  release = "alpha";
-in stdenv.mkDerivation rec {
-  name = "boo-${version}";
-  version = "2013-10-21";
-
-  src = fetchFromGitHub {
-    owner = "boo-lang";
-    repo = "boo";
-
-    rev = "${release}";
-    sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    mono makeWrapper nant shared-mime-info gtksourceview
-    gtk2
-  ];
-
-  patches = [ ./config.patch ];
-
-  postPatch = ''
-    sed -e 's|\$out|'$out'|' -i default.build
-  '';
-
-  buildPhase = ''
-    nant -t:mono-4.5
-  '';
-
-  installPhase = ''
-    nant install
-    cp $out/lib/mono/boo/*.dll $out/lib/boo/
-  '';
-
-  dontStrip = true;
-
-  meta = with stdenv.lib; {
-    description = "The Boo Programming Language";
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fbddb94b1b7..8c36b24bcf28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6310,10 +6310,6 @@ with pkgs;
 
   binaryen = callPackage ../development/compilers/binaryen { };
 
-  boo = callPackage ../development/compilers/boo {
-    inherit (gnome2) gtksourceview;
-  };
-
   colm = callPackage ../development/compilers/colm { };
 
   fetchegg = callPackage ../build-support/fetchegg { };

From dc84de59d13953d3e906a6e2d27b232b4d3ef5ce Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 10:11:51 +0200
Subject: [PATCH 0544/3253] nant: remove

- our version is from 2015
- it doesn't build
- upstream project is dead, last release 2012, last commit Oct 2016.
- used by only 1 nixpkgs package: `boo`, marked broken since 2016.
---
 .../tools/build-managers/nant/default.nix     | 71 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 73 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/nant/default.nix

diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
deleted file mode 100644
index c394d87e09ec..000000000000
--- a/pkgs/development/tools/build-managers/nant/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
-, targetVersion ? "4.5" }:
-
-let
-   version = "2015-11-15";
-
-  src = fetchFromGitHub {
-    owner = "nant";
-    repo = "nant";
-    rev = "19bec6eca205af145e3c176669bbd57e1712be2a";
-    sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l";
-  };
-
-  nant-bootstrapped = stdenv.mkDerivation {
-    name = "nant-bootstrapped-${version}";
-    inherit src;
-
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ mono makeWrapper ];
-
-    buildFlags = "bootstrap";
-
-    dontStrip = true;
-
-    installPhase = ''
-      mkdir -p $out/lib/nant-bootstrap
-      cp -r bootstrap/* $out/lib/nant-bootstrap
-
-      mkdir -p $out/bin
-      makeWrapper "${mono}/bin/mono" $out/bin/nant \
-        --add-flags "$out/lib/nant-bootstrap/NAnt.exe"
-    '';
-  };
-
-in stdenv.mkDerivation {
-  name = "nant-${version}";
-  inherit src;
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ mono makeWrapper nant-bootstrapped ];
-
-  dontStrip = true;
-
-  buildPhase = ''
-    nant -t:mono-${targetVersion}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/nant
-    cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/
-
-    mkdir -p $out/bin
-    makeWrapper "${mono}/bin/mono" $out/bin/nant \
-      --add-flags "$out/lib/nant/NAnt.exe"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://nant.sourceforge.net;
-    description = "NAnt is a free .NET build tool";
-
-    longDescription = ''
-      NAnt is a free .NET build tool. In theory it is kind of like make without
-      make's wrinkles. In practice it's a lot like Ant.
-    '';
-
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zohl ];
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c36b24bcf28..f5ca0d6a1f3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8492,8 +8492,6 @@ with pkgs;
 
   nailgun = callPackage ../development/tools/nailgun { };
 
-  nant = callPackage ../development/tools/build-managers/nant { };
-
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
   gn = callPackage ../development/tools/build-managers/gn { };

From 2953d4c9947fbc152ccda2e8941c2a4f9c908f12 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 10:24:22 +0200
Subject: [PATCH 0545/3253] banshee: remove

- was broken since June 2016 because it depends on `boo`
- no visible attempts to fix in over 2 years
---
 pkgs/applications/audio/banshee/default.nix | 57 ---------------------
 pkgs/top-level/all-packages.nix             |  5 --
 2 files changed, 62 deletions(-)
 delete mode 100644 pkgs/applications/audio/banshee/default.nix

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
deleted file mode 100644
index 8a4e8893c8d3..000000000000
--- a/pkgs/applications/audio/banshee/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
-, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
-, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
-, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
-, libmtp, libgpod, mono-zeroconf }:
-
-stdenv.mkDerivation rec {
-  name = "banshee-${version}";
-  version = "2.6.2";
-
-  src = fetchurl {
-    url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz";
-    sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p";
-  };
-
-  dontStrip = true;
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [
-    gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good
-    gst-plugins-bad gst-plugins-ugly gst-ffmpeg
-    mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
-    gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
-    gio-sharp libmtp libgpod mono-zeroconf
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  postPatch = ''
-    patchShebangs data/desktop-files/update-desktop-file.sh
-    patchShebangs build/private-icon-theme-installer
-    sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure
-  '';
-
-  postInstall = let
-    ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ];
-
-    monoGACPrefix = lib.concatStringsSep ":" [
-      mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0
-      boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
-      gio-sharp libmtp libgpod mono-zeroconf
-    ];
-  in ''
-    sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \
-        -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \
-        -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \
-        -e 's| mono | ${mono}/bin/mono |' \
-        -i $out/bin/banshee
-  '';
-  meta = with lib; {
-    homepage = "http://banshee.fm/";
-    description = "A music player written in C# using GNOME technologies";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.zohl ];
-    license = licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5ca0d6a1f3d..b61f74415944 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15527,11 +15527,6 @@ with pkgs;
 
   barrier = callPackage ../applications/misc/barrier {};
 
-  banshee = callPackage ../applications/audio/banshee {
-    gconf = pkgs.gnome2.GConf;
-    libgpod = pkgs.libgpod.override { monoSupport = true; };
-  };
-
   bashSnippets = callPackage ../applications/misc/bashSnippets { };
 
   batik = callPackage ../applications/graphics/batik { };

From 182f1fc2c8f046f97e0c9f5626e9647b66f24ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 8 Sep 2018 09:29:28 +0100
Subject: [PATCH 0546/3253] vim-plugins: remove .git extension from spec

---
 pkgs/misc/vim-plugins/vim-plugin-names | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f2a46ee8a806..a49542c88e03 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -6,7 +6,7 @@
 "github:alvan/vim-closetag"
 "github:amiorin/ctrlp-z"
 "github:andreshazard/vim-logreview"
-"github:andsild/peskcolor.vim.git"
+"github:andsild/peskcolor.vim"
 "github:andviro/flake8-vim"
 "github:ap/vim-css-color"
 "github:bazelbuild/vim-bazel"
@@ -40,7 +40,7 @@
 "github:eagletmt/ghcmod-vim"
 "github:eagletmt/neco-ghc"
 "github:editorconfig/editorconfig-vim"
-"github:ehamberg/vim-cute-python.git"
+"github:ehamberg/vim-cute-python"
 "github:eikenb/acp"
 "github:elixir-lang/vim-elixir"
 "github:elmcast/elm-vim"
@@ -79,7 +79,7 @@
 "github:itchyny/vim-gitbranch"
 "github:ivanov/vim-ipython"
 "github:jacoborus/tender.vim"
-"github:janko-m/vim-test.git"
+"github:janko-m/vim-test"
 "github:JazzCore/ctrlp-cmatcher"
 "github:jceb/vim-hier"
 "github:jceb/vim-orgmode"
@@ -150,7 +150,7 @@
 "github:megaannum/forms"
 "github:megaannum/self"
 "github:mfukar/robotframework-vim"
-"github:mhinz/vim-grepper.git"
+"github:mhinz/vim-grepper"
 "github:mhinz/vim-signify"
 "github:mhinz/vim-startify"
 "github:michaeljsmith/vim-indent-object"
@@ -178,7 +178,7 @@
 "github:raichoo/purescript-vim"
 "github:reedes/vim-pencil"
 "github:reedes/vim-wordy"
-"github:rhysd/committia.vim.git"
+"github:rhysd/committia.vim"
 "github:rhysd/vim-grammarous"
 "github:rhysd/vim-operator-surround"
 "github:Rip-Rip/clang_complete"
@@ -206,7 +206,7 @@
 "github:shougo/neomru.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"
-"github:shougo/neoyank.vim.git"
+"github:shougo/neoyank.vim"
 "github:shougo/tabpagebuffer.vim"
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
@@ -269,7 +269,7 @@
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/Improved-AnsiEsc"
 "github:vim-scripts/matchit.zip"
-"github:vim-scripts/mayansmoke.git"
+"github:vim-scripts/mayansmoke"
 "github:vim-scripts/random.vim"
 "github:vim-scripts/Rename"
 "github:vim-scripts/ReplaceWithRegister"

From a02002debacc30a151494c0c7b069e0ef2800a60 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 11:20:47 +0200
Subject: [PATCH 0547/3253] pythonPackages.pycaption: fix build (#46356)

The `beaitufulsoup4` package distributed by `nixpkgs` is now at `4.6.3`.

Additionally it fixes `gnomecaption` which depends on the broken
`pycaption` package.

See https://hydra.nixos.org/build/81000247
See https://hydra.nixos.org/build/80723223

Addresses #45960
---
 pkgs/development/python-modules/pycaption/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix
index d4ed6088409b..468011e2a807 100644
--- a/pkgs/development/python-modules/pycaption/default.nix
+++ b/pkgs/development/python-modules/pycaption/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   prePatch = ''
     substituteInPlace setup.py \
       --replace 'beautifulsoup4>=4.2.1,<4.5.0' \
-                'beautifulsoup4>=4.2.1,<=4.6.0'
+                'beautifulsoup4>=4.2.1,<=4.6.3'
   '';
 
   # don't require enum34 on python >= 3.4

From 1b4f19ca73c6bc1bf1298a8dc252e6c5e337e8e5 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 8 Sep 2018 13:29:16 +0200
Subject: [PATCH 0548/3253] Remove outdated external package
 emacs-find-file-in-project

---
 pkgs/top-level/emacs-packages.nix | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index ba82bd217fdc..6cd80613526b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -178,7 +178,7 @@ let
       for file in elpy.el elpy-pkg.el; do
         substituteInPlace $file \
             --replace "company \"0.8.2\"" "company \"${company.version}\"" \
-            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \
+            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${melpaPackages.find-file-in-project.version}\"" \
             --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
             --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
             --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
@@ -226,31 +226,6 @@ let
   ess-R-object-popup =
     callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };
 
-  find-file-in-project = melpaBuild rec {
-    pname = "find-file-in-project";
-    version = "3.5";
-    src = fetchFromGitHub {
-      owner  = "technomancy";
-      repo   = pname;
-      rev    = "53a8d8174f915d9dcf5ac6954b1c0cae61266177";
-      sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd";
-    };
-    recipe = writeText "recipe" ''
-      (find-file-in-project
-       :repo "technomancy/find-file-in-project"
-       :fetcher github)
-    '';
-    meta = {
-      description = "Quick access to project files in Emacs";
-      longDescription = ''
-        Find files in a project quickly.
-        This program provides a couple methods for quickly finding any file in a
-        given project. It depends on GNU find.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
   filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };
 
   font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };

From cd20437f8113f2d1ad6ad240405b3f016acad935 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 19:00:34 -0700
Subject: [PATCH 0549/3253] josm: 14066 -> 14178

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
josm
---
 pkgs/applications/misc/josm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index e753c5ded95c..fc10bc852e5c 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "14066";
+  version = "14178";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia";
+    sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r";
   };
 
   buildInputs = [ jre10 makeWrapper ];

From a0d7b889110893c2a27178dd5d7ef327dd834d74 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 13:04:19 +0200
Subject: [PATCH 0550/3253] nixos/sks: Add a dataDir option

---
 nixos/modules/services/security/sks.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 62308428f326..acc2a128b151 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -27,6 +27,20 @@ in
         ";
       };
 
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/db/sks";
+        example = "/var/lib/sks";
+        # TODO: The default might change to "/var/lib/sks" as this is more
+        # common. There's also https://github.com/NixOS/nixpkgs/issues/26256
+        # and "/var/db" is not FHS compliant (seems to come from BSD).
+        description = ''
+          Data directory (-basedir) for SKS, where the database and all
+          configuration files are located (e.g. KDB, PTree, membership and
+          sksconf).
+        '';
+      };
+
       hkpAddress = mkOption {
         default = [ "127.0.0.1" "::1" ];
         type = types.listOf types.str;
@@ -51,7 +65,7 @@ in
     
     users.users.sks = {
       createHome = true;
-      home = "/var/db/sks";
+      home = cfg.dataDir;
       isSystemUser = true;
       shell = "${pkgs.coreutils}/bin/true";
     };

From 6764d41ecc7ef10745abc02d09e4211e12345fd9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 13:32:53 +0200
Subject: [PATCH 0551/3253] nixos/sks: Update the descriptions and add
 meta.maintainers

TODO: Merge this module with https://github.com/NixOS/nixpkgs/pull/24516
---
 nixos/modules/services/security/sks.nix | 41 ++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index acc2a128b151..5e4b1a71fdd9 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -3,28 +3,26 @@
 with lib;
 
 let
-
   cfg = config.services.sks;
-
   sksPkg = cfg.package;
 
-in
-
-{
+in {
+  meta.maintainers = with maintainers; [ primeos calbrecht jcumming ];
 
   options = {
 
     services.sks = {
 
-      enable = mkEnableOption "sks";
+      enable = mkEnableOption ''
+        SKS (synchronizing key server for OpenPGP) and start the database
+        server. You need to create "''${dataDir}/dump/*.gpg" for the initial
+        import'';
 
       package = mkOption {
         default = pkgs.sks;
         defaultText = "pkgs.sks";
         type = types.package;
-        description = "
-          Which sks derivation to use.
-        ";
+        description = "Which SKS derivation to use.";
       };
 
       dataDir = mkOption {
@@ -44,17 +42,16 @@ in
       hkpAddress = mkOption {
         default = [ "127.0.0.1" "::1" ];
         type = types.listOf types.str;
-        description = "
-          Wich ip addresses the sks-keyserver is listening on.
-        ";
+        description = ''
+          Domain names, IPv4 and/or IPv6 addresses to listen on for HKP
+          requests.
+        '';
       };
 
       hkpPort = mkOption {
         default = 11371;
-        type = types.int;
-        description = "
-          Which port the sks-keyserver is listening on.
-        ";
+        type = types.ints.u16;
+        description = "HKP port to listen on.";
       };
     };
   };
@@ -76,19 +73,21 @@ in
       home = config.users.users.sks.home;
       user = config.users.users.sks.name;
     in {
-      sks-keyserver = {
+      "sks-db" = {
+        description = "SKS database server";
+        after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         preStart = ''
           mkdir -p ${home}/dump
-          ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
-          ${pkgs.sks}/bin/sks cleandb || true
-          ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
+          ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
+          ${sksPkg}/bin/sks cleandb || true
+          ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
         '';
         serviceConfig = {
           WorkingDirectory = home;
           User = user;
           Restart = "always";
-          ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
+          ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
         };
       };
     };

From 2c751dcdc9d38a8fd58ff6b241b048839de49511 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 8 Sep 2018 07:58:50 -0400
Subject: [PATCH 0552/3253] yabause: 0.9.14 -> 0.9.15 (#46353)

+ fixes for Qt 5.11 build.
---
 .../0001-Fixes-for-Qt-5.11-upgrade.patch      | 67 +++++++++++++++++++
 pkgs/misc/emulators/yabause/default.nix       | 17 +++--
 .../yabause/emu-compatibility.com.patch       | 10 ---
 3 files changed, 77 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
 delete mode 100644 pkgs/misc/emulators/yabause/emu-compatibility.com.patch

diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
new file mode 100644
index 000000000000..43539ef4ca58
--- /dev/null
+++ b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch
@@ -0,0 +1,67 @@
+From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel <samuel@dionne-riel.com>
+Date: Sat, 8 Sep 2018 00:44:08 -0400
+Subject: [PATCH] Fixes for Qt 5.11 upgrade
+
+---
+ src/qt/ui/UICheatRaw.cpp | 2 --
+ src/qt/ui/UICheatRaw.h   | 2 +-
+ src/qt/ui/UICheats.cpp   | 2 ++
+ src/qt/ui/UIHexInput.h   | 2 ++
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp
+index 4ad82d77..3f78486b 100755
+--- a/src/qt/ui/UICheatRaw.cpp
++++ b/src/qt/ui/UICheatRaw.cpp
+@@ -20,8 +20,6 @@
+ #include "UIHexInput.h"
+ #include "../QtYabause.h"
+ 
+-#include <QButtonGroup>
+-
+ UICheatRaw::UICheatRaw( QWidget* p )
+ 	: QDialog( p )
+ {
+diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h
+index d97b429d..20318c67 100755
+--- a/src/qt/ui/UICheatRaw.h
++++ b/src/qt/ui/UICheatRaw.h
+@@ -21,7 +21,7 @@
+ 
+ #include "ui_UICheatRaw.h"
+ 
+-class QButtonGroup;
++#include <QButtonGroup>
+ 
+ class UICheatRaw : public QDialog, public Ui::UICheatRaw
+ {
+diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp
+index c6027972..44d341c3 100755
+--- a/src/qt/ui/UICheats.cpp
++++ b/src/qt/ui/UICheats.cpp
+@@ -21,6 +21,8 @@
+ #include "UICheatRaw.h"
+ #include "../CommonDialogs.h"
+ 
++#include <QButtonGroup>
++
+ UICheats::UICheats( QWidget* p )
+ 	: QDialog( p )
+ {
+diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h
+index f333b016..4bd8aed4 100644
+--- a/src/qt/ui/UIHexInput.h
++++ b/src/qt/ui/UIHexInput.h
+@@ -22,6 +22,8 @@
+ #include "ui_UIHexInput.h"
+ #include "../QtYabause.h"
+ 
++#include <QValidator>
++
+ class HexValidator : public QValidator
+ {
+    Q_OBJECT
+-- 
+2.16.4
+
diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix
index e7237fd4454c..a2d462fd990e 100644
--- a/pkgs/misc/emulators/yabause/default.nix
+++ b/pkgs/misc/emulators/yabause/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined
+{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined
 , freeglut ? null, openal ? null, SDL2 ? null }:
 
 stdenv.mkDerivation rec {
   name = "yabause-${version}";
-  # 0.9.15 only works with OpenGL 3.2 or later:
-  # https://github.com/Yabause/yabause/issues/349
-  version = "0.9.14";
+  version = "0.9.15";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz";
-    sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm";
+    sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ];
+  buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ];
 
-  patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ];
+  patches = [
+    ./linkage-rwx-linux-elf.patch
+    # Fixes derived from
+    # https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73
+    ./0001-Fixes-for-Qt-5.11-upgrade.patch
+  ];
 
   cmakeFlags = [
     "-DYAB_NETWORK=ON"
diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
deleted file mode 100644
index 5f13d2ee1837..000000000000
--- a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/qt/ui/UIYabause.ui	2017-09-28 13:23:04.636014753 +0000
-+++ b/src/qt/ui/UIYabause.ui	2017-09-28 13:23:21.945763537 +0000
-@@ -230,7 +230,6 @@
-     <property name="title">
-      <string>&amp;Help</string>
-     </property>
--    <addaction name="aHelpEmuCompatibility"/>
-     <addaction name="aHelpAbout"/>
-    </widget>
-    <widget class="QMenu" name="mTools">

From 56b3c5b2dde6d05dee8fde4f21cdf78a1578b89a Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sat, 8 Sep 2018 05:10:51 -0700
Subject: [PATCH 0553/3253] nixos/networkmanager: fix VPN plugin service
 definition targets (#46201)

---
 .../modules/services/networking/networkmanager.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d5af4648e8f9..2d76e0676b24 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -406,25 +406,25 @@ in {
       { source = configFile;
         target = "NetworkManager/NetworkManager.conf";
       }
-      { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name";
+      { source = "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name";
         target = "NetworkManager/VPN/nm-openvpn-service.name";
       }
-      { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name";
+      { source = "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name";
         target = "NetworkManager/VPN/nm-vpnc-service.name";
       }
-      { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
+      { source = "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name";
         target = "NetworkManager/VPN/nm-openconnect-service.name";
       }
-      { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
+      { source = "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name";
         target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
       }
-      { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name";
+      { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name";
         target = "NetworkManager/VPN/nm-l2tp-service.name";
       }
-      { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
+      { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name";
         target = "NetworkManager/VPN/nm-strongswan-service.name";
       }
-      { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+      { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
         target = "NetworkManager/VPN/nm-iodine-service.name";
       }
     ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])

From 37032db5835aec5b04a0c1201e504a878a5aabb7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 14:19:24 +0200
Subject: [PATCH 0554/3253] chessx: fix build (#46359)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://hydra.nixos.org/build/80998335.

Upstream doesn't support QT 5.11 ATM which broke compilation:

```
src/dialogs/savedialog.cpp: In constructor ‘SaveDialog::SaveDialog(QWidget*, Qt::WindowFlags)’:
src/dialogs/savedialog.cpp:37:34: error: invalid use of incomplete type ‘class QButtonGroup’
     group = new QButtonGroup(this);
```

The Arch community recommends to use an older QT version to fix
this (https://aur.archlinux.org/packages/chessx/).

Furthermore the `QT_PLUGIN_PATH` wasn't set properly which broke the
runtime since QT coudln't find the `xcb` plugin:

```
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could be initialized.
Reinstalling the application may fix this problem.
```

Finally, some minor style fixes were made for consistent indentation.

Addresses #45960
---
 pkgs/games/chessx/default.nix   | 38 ++++++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index c8d23fcc9de6..e4ec4dffa1db 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,30 +1,41 @@
-{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl, makeWrapper
+, lib
+}:
+
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
   version = "1.4.6";
+
   src = fetchurl {
     url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
     sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd";
   };
+
   buildInputs = [
-   qtbase
-   qtsvg
-   qttools
-   qtmultimedia
-   zlib
+    qtbase
+    qtsvg
+    qttools
+    qtmultimedia
+    zlib
   ];
-  nativeBuildInputs = [ pkgconfig qmake ];
+
+  nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
 
   # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
   enableParallelBuilding = false;
 
   installPhase = ''
-      runHook preInstall
-      mkdir -p "$out/bin"
-      mkdir -p "$out/share/applications"
-      cp -pr release/chessx "$out/bin"
-      cp -pr unix/chessx.desktop "$out/share/applications"
-      runHook postInstall
+    runHook preInstall
+
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/applications"
+    cp -pr release/chessx "$out/bin"
+    cp -pr unix/chessx.desktop "$out/share/applications"
+
+    wrapProgram $out/bin/chessx \
+      --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -32,5 +43,6 @@ stdenv.mkDerivation rec {
     description = "ChessX allows you to browse and analyse chess games";
     license = licenses.gpl2;
     maintainers = [maintainers.luispedro];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fbddb94b1b7..bd80143651bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19730,7 +19730,7 @@ with pkgs;
 
   chessdb = callPackage ../games/chessdb { };
 
-  chessx = libsForQt5.callPackage ../games/chessx { };
+  chessx = libsForQt59.callPackage ../games/chessx { };
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
 

From 3b4ab85f01673e7573f5e740fa50bbaf0174c03b Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sat, 8 Sep 2018 15:21:25 +0300
Subject: [PATCH 0555/3253] ripgrep: 0.9.0 -> 0.10.0 (#46331)

---
 pkgs/tools/text/ripgrep/default.nix | 15 +++++++++++----
 pkgs/top-level/all-packages.nix     |  5 ++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index f70f0f3d75b2..81c88ecad9e5 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt  }:
+{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt
+, Security
+, withPCRE2 ? false, pcre2 ? null
+}:
 
 rustPlatform.buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = version;
-    sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj";
+    sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb";
   };
 
-  cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih";
+  cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr";
+
+  cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
 
   nativeBuildInputs = [ asciidoc docbook_xsl libxslt ];
+  buildInputs = (stdenv.lib.optional withPCRE2 pcre2)
+    ++ (stdenv.lib.optional stdenv.isDarwin Security);
 
   preFixup = ''
     mkdir -p "$out/man/man1"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd80143651bd..7e0425b26b9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2911,7 +2911,10 @@ with pkgs;
   }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];});
 
   grin = callPackage ../tools/text/grin { };
-  ripgrep = callPackage ../tools/text/ripgrep { };
+
+  ripgrep = callPackage ../tools/text/ripgrep {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   grive2 = callPackage ../tools/filesystems/grive2 { };
 

From f2c5b98649f20619a61dd43171023bd2b191ed7e Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 4 Aug 2018 14:09:56 +0200
Subject: [PATCH 0556/3253] maintainers: add 'yarny' (= myself)

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecec7bbaf7e3..e15337497f09 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4518,6 +4518,11 @@
     github = "y0no";
     name = "Yoann Ono";
   };
+  yarny = {
+    email = "41838844+Yarny0@users.noreply.github.com";
+    github = "Yarny0";
+    name = "Yarny";
+  };
   yarr = {
     email = "savraz@gmail.com";
     github = "Eternity-Yarr";

From a08b633fe7b636556ece29cc75448254b6ac3d28 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 4 Aug 2018 14:10:28 +0200
Subject: [PATCH 0557/3253] HylaFAX+: init at 5.6.0

Create the top-level packages attribute
'hylafaxplus' that builds HylaFAX+ .

Note:
The nobody uid and the nogroup gid
are hardcoded in the package.
The package build recipe file
contains options to modify these ids.
---
 pkgs/servers/hylafaxplus/config.site          | 20 ++++
 pkgs/servers/hylafaxplus/default.nix          | 95 +++++++++++++++++++
 .../servers/hylafaxplus/post-install-check.sh |  7 ++
 pkgs/servers/hylafaxplus/post-install.sh      | 24 +++++
 pkgs/servers/hylafaxplus/post-patch.sh        | 25 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 173 insertions(+)
 create mode 100644 pkgs/servers/hylafaxplus/config.site
 create mode 100644 pkgs/servers/hylafaxplus/default.nix
 create mode 100644 pkgs/servers/hylafaxplus/post-install-check.sh
 create mode 100644 pkgs/servers/hylafaxplus/post-install.sh
 create mode 100644 pkgs/servers/hylafaxplus/post-patch.sh

diff --git a/pkgs/servers/hylafaxplus/config.site b/pkgs/servers/hylafaxplus/config.site
new file mode 100644
index 000000000000..7c8014449216
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/config.site
@@ -0,0 +1,20 @@
+@config_maxgid@
+DIR_BIN="@out_@/bin"
+DIR_FONTMAP="@out_@/share/ghostscript/@ghostscript_version@"
+DIR_LIB="@out_@/lib"
+DIR_LIBDATA="@out_@/spool/etc"
+DIR_LIBEXEC="@out_@/spool/bin"
+DIR_LOCKS=/var/lock
+DIR_MAN="@out_@/share/man"
+DIR_SBIN="@out_@/spool/bin"
+DIR_SPOOL="@out_@/spool"
+FONTMAP="@ghostscript@/share/ghostscript/@ghostscript_version@"
+PATH_AFM="@ghostscript@/share/ghostscript/fonts"
+PATH_DPSRIP="@out_@/spool/bin/ps2fax"
+PATH_EGETTY="@coreutils@/bin/false"
+PATH_GSRIP="@ghostscript@/bin/gs"
+PATH_IMPRIP="@coreutils@/bin/false"
+PATH_SENDMAIL="@coreutils@/bin/false"
+PATH_VGETTY="@coreutils@/bin/false"
+SYSVINIT=no
+TIFFBIN="@libtiff@/bin"
diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
new file mode 100644
index 000000000000..410d24974268
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -0,0 +1,95 @@
+{ stdenv
+, lib
+, fakeroot
+, fetchurl
+, libfaketime
+, substituteAll
+## runtime dependencies
+, coreutils
+, file
+, findutils
+, gawk
+, ghostscript
+, gnugrep
+, gnused
+, libtiff
+, psmisc
+, sharutils
+, utillinux
+, zlib
+## optional packages (using `null` disables some functionality)
+, jbigkit ? null
+, lcms2 ? null  # for colored faxes
+, openldap ? null
+, pam ? null
+## system-dependent settings that have to be hardcoded
+, maxgid ? 65534  # null -> try to auto-detect (bad on linux)
+, maxuid ? 65534  # null -> hardcoded value 60002
+}:
+
+let
+
+  name = "hylafaxplus-${version}";
+  version = "5.6.0";
+  sha256 = "128514kw9kb5cvznm87z7gis1mpyx4bcqrxx4xa7cbfj1v3v81fr";
+
+  configSite = substituteAll {
+    name = "hylafaxplus-config.site";
+    src = ./config.site;
+    config_maxgid = lib.optionalString (maxgid!=null) ''CONFIG_MAXGID=${builtins.toString maxgid}'';
+    ghostscript_version = ghostscript.version;
+    out_ = "@out@";  # "out" will be resolved in post-install.sh
+    inherit coreutils ghostscript libtiff;
+  };
+
+  postPatch = substituteAll {
+    name = "hylafaxplus-post-patch.sh";
+    src = ./post-patch.sh;
+    inherit configSite;
+    maxuid = lib.optionalString (maxuid!=null) (builtins.toString maxuid);
+    faxcover_binpath = lib.makeBinPath
+      [stdenv.shellPackage coreutils];
+    faxsetup_binpath = lib.makeBinPath
+      [stdenv.shellPackage coreutils findutils gnused gnugrep gawk];
+  };
+
+  postInstall = substituteAll {
+    name = "hylafaxplus-post-install.sh";
+    src = ./post-install.sh;
+    inherit fakeroot libfaketime;
+  };
+
+in
+
+stdenv.mkDerivation {
+  inherit name version;
+  src = fetchurl {
+    url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz";
+    inherit sha256;
+  };
+  # Note that `configure` (and maybe `faxsetup`) are looking
+  # for a couple of standard binaries in the `PATH` and
+  # hardcode their absolute paths in the new package.
+  buildInputs = [
+    file  # for `file` command
+    ghostscript
+    libtiff
+    psmisc  # for `fuser` command
+    sharutils  # for `uuencode` command
+    utillinux  # for `agetty` command
+    zlib
+    jbigkit  # optional
+    lcms2  # optional
+    openldap  # optional
+    pam  # optional
+  ];
+  postPatch = ''. ${postPatch}'';
+  dontAddPrefix = true;
+  postInstall = ''. ${postInstall}'';
+  postInstallCheck = ''. ${./post-install-check.sh}'';
+  meta.description = "enterprise-class system for sending and receiving facsimiles";
+  meta.homepage = http://hylafax.sourceforge.net;
+  meta.license = lib.licenses.bsd3;
+  meta.maintainers = [ lib.maintainers.yarny ];
+  meta.platforms = lib.platforms.linux;
+}
diff --git a/pkgs/servers/hylafaxplus/post-install-check.sh b/pkgs/servers/hylafaxplus/post-install-check.sh
new file mode 100644
index 000000000000..2850738edccc
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/post-install-check.sh
@@ -0,0 +1,7 @@
+# check if the package contains all the files needed
+for x in faxq faxquit hfaxd faxcron faxqclean faxgetty
+do
+  test -x "$out/spool/bin/$x"
+done
+test -d "$out/spool/config"
+test -f "$out/spool/etc/setup.cache"
diff --git a/pkgs/servers/hylafaxplus/post-install.sh b/pkgs/servers/hylafaxplus/post-install.sh
new file mode 100644
index 000000000000..ddc7c3f85eda
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/post-install.sh
@@ -0,0 +1,24 @@
+# Parts of the `install` make target don't
+# dare to set file modes (or owners), but put the
+# needed commands in a new file called `root.sh`.
+# We execute the `chmod` commands of
+# this script to set execute bits.
+sed '/chown/d;/chgrp/d' --in-place root.sh
+. root.sh
+
+# We run `faxsetup` to prepare some config files
+# that the admin would have to create otherwise.
+# Since `faxsetup` is quite picky about its environment,
+# we have to prepare some dummy files.
+# `faxsetup` stores today's date in the output files,
+# so we employ faketime to simulate a deterministic date.
+echo "uucp:x:0" >> "$TMPDIR/passwd.dummy"  # dummy uucp user
+touch "$out/spool/etc/config.dummy"  # dummy modem config
+mkdir "$TMPDIR/lock.dummy"  # dummy lock dir
+"@libfaketime@/bin/faketime" -f "$(date --utc --date=@$SOURCE_DATE_EPOCH '+%F %T')" \
+  "@fakeroot@/bin/fakeroot" -- \
+  "$out/spool/bin/faxsetup" -with-DIR_LOCKS="$TMPDIR/lock.dummy" -with-PASSWD="$TMPDIR/passwd.dummy"
+rm "$out/spool/etc/config.dummy"
+
+# Ensure all binaries are reachable within the spooling area.
+ln --symbolic --target-directory="$out/spool/bin/" "$out/bin/"*
diff --git a/pkgs/servers/hylafaxplus/post-patch.sh b/pkgs/servers/hylafaxplus/post-patch.sh
new file mode 100644
index 000000000000..6ec5937147e2
--- /dev/null
+++ b/pkgs/servers/hylafaxplus/post-patch.sh
@@ -0,0 +1,25 @@
+# `configure` (maybe others) set `POSIXLY_CORRECT`, which
+# breaks the gcc wrapper script of nixpkgs (maybe others).
+# We simply un-export `POSIXLY_CORRECT` after each export so
+# its effects don't apply within nixpkgs wrapper scripts.
+grep -rlF POSIXLY_CORRECT | xargs \
+  sed '/export *POSIXLY_CORRECT/a export -n POSIXLY_CORRECT' -i
+
+# Replace strange default value for the nobody account.
+if test -n "@maxuid@"
+then
+  for f in util/faxadduser.c hfaxd/manifest.h
+  do
+    substituteInPlace "$f" --replace 60002 "@maxuid@"
+  done
+fi
+
+# Replace hardcoded `PATH` variables with proper paths.
+# Note: `findutils` is needed for `faxcron`.
+substituteInPlace faxcover/edit-faxcover.sh.in \
+  --replace 'PATH=/bin' 'PATH="@faxcover_binpath@"'
+substituteInPlace etc/faxsetup.sh.in \
+  --replace 'PATH=/bin' 'PATH="@faxsetup_binpath@"'
+
+# Create `config.site`
+substitute "@configSite@" config.site --subst-var out
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fbddb94b1b7..e6d055848dce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3196,6 +3196,8 @@ with pkgs;
 
   hwinfo = callPackage ../tools/system/hwinfo { };
 
+  hylafaxplus = callPackage ../servers/hylafaxplus { };
+
   i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
 
   i2p = callPackage ../tools/networking/i2p {};

From 12fa95f2d696b6babb365a27efef140e7113cc34 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 4 Aug 2018 17:08:54 +0200
Subject: [PATCH 0558/3253] modules: HylaFAX server configuration

This commit adds the following
* the uucp user
* options for HylaFAX server to control startup and modems
* systemd services for HylaFAX server processes
  including faxgettys for modems
* systemd services to maintain the HylaFAX spool area,
  including cleanup with faxcron and faxqclean
* default configuration for all server processes
  for a minimal working configuration

Some notes:

* HylaFAX configuration cannot be initialized with faxsetup
  (as it would be common on other Linux distributions).
  The hylafaxplus package contains a template spool area.
* Modems are controlled by faxgetty.
  Send-only configuration (modems controlled by faxq)
  is not supported by this configuration setup.
* To enable the service, one or more modems must be defined with
  config.services.hylafax.modems .
* Sending mail *should* work:
  HylaFAX will use whatever is in
  config.services.mail.sendmailSetuidWrapper.program
  unless overridden with the sendmailPath option.
* The admin has to create a hosts.hfaxd file somewhere
  (e.g. in /etc) before enabling HylaFAX.
  This file controls access to the server (see hosts.hfaxd(5) ).
  Sadly, HylaFAX does not permit account-based access
  control as is accepts connections via TCP only.
* Active fax polling should work; I can't test it.
* Passive fax polling is not supported by HylaFAX.
* Pager transmissions (with sendpage) are disabled by default.
  I have never tested or used these.
* Incoming data/voice/"extern"al calls
  won't be handled by default.
  I have never tested or used these.
---
 nixos/modules/misc/ids.nix                    |   2 +-
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/hylafax/default.nix   |  29 ++
 .../networking/hylafax/faxq-default.nix       |  12 +
 .../services/networking/hylafax/faxq-wait.sh  |  29 ++
 .../networking/hylafax/hfaxd-default.nix      |  10 +
 .../networking/hylafax/modem-default.nix      |  22 +
 .../services/networking/hylafax/options.nix   | 375 ++++++++++++++++++
 .../services/networking/hylafax/spool.sh      | 111 ++++++
 .../services/networking/hylafax/systemd.nix   | 249 ++++++++++++
 10 files changed, 839 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/networking/hylafax/default.nix
 create mode 100644 nixos/modules/services/networking/hylafax/faxq-default.nix
 create mode 100755 nixos/modules/services/networking/hylafax/faxq-wait.sh
 create mode 100644 nixos/modules/services/networking/hylafax/hfaxd-default.nix
 create mode 100644 nixos/modules/services/networking/hylafax/modem-default.nix
 create mode 100644 nixos/modules/services/networking/hylafax/options.nix
 create mode 100755 nixos/modules/services/networking/hylafax/spool.sh
 create mode 100644 nixos/modules/services/networking/hylafax/systemd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 8292cdc995e0..aafeb997c326 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -53,7 +53,7 @@
       tomcat = 16;
       #audio = 17; # unused
       #floppy = 18; # unused
-      #uucp = 19; # unused
+      uucp = 19;
       #lp = 20; # unused
       #proc = 21; # unused
       pulseaudio = 22; # must match `pulseaudio' GID
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3f3123798f59..f51a30aec2e9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -517,6 +517,7 @@
   ./services/networking/heyefi.nix
   ./services/networking/hostapd.nix
   ./services/networking/htpdate.nix
+  ./services/networking/hylafax/default.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
   ./services/networking/iodine.nix
diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix
new file mode 100644
index 000000000000..6e28e8c5d8bc
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/default.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+  imports = [
+    ./options.nix
+    ./systemd.nix
+  ];
+
+  config = lib.modules.mkIf config.services.hylafax.enable {
+    environment.systemPackages = [ pkgs.hylafaxplus ];
+    users.users.uucp = {
+      uid = config.ids.uids.uucp;
+      group = "uucp";
+      description = "Unix-to-Unix CoPy system";
+      isSystemUser = true;
+      inherit (config.users.users.nobody) home;
+    };
+    assertions = [{
+      assertion = config.services.hylafax.modems != {};
+      message = ''
+        HylaFAX cannot be used without modems.
+        Please define at least one modem with
+        <option>config.services.hylafax</option>.
+      '';
+    }];
+  };
+
+}
diff --git a/nixos/modules/services/networking/hylafax/faxq-default.nix b/nixos/modules/services/networking/hylafax/faxq-default.nix
new file mode 100644
index 000000000000..a2630ce66b71
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/faxq-default.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+# see man:hylafax-config(5)
+
+{
+
+  ModemGroup = [ ''"any:.*"'' ];
+  ServerTracing = "0x78701";
+  SessionTracing = "0x78701";
+  UUCPLockDir = "/var/lock";
+
+}
diff --git a/nixos/modules/services/networking/hylafax/faxq-wait.sh b/nixos/modules/services/networking/hylafax/faxq-wait.sh
new file mode 100755
index 000000000000..8c39e9d20c18
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/faxq-wait.sh
@@ -0,0 +1,29 @@
+#! @shell@ -e
+
+# skip this if there are no modems at all
+if ! stat -t "@spoolAreaPath@"/etc/config.* >/dev/null 2>&1
+then
+  exit 0
+fi
+
+echo "faxq started, waiting for modem(s) to initialize..."
+
+for i in `seq @timeoutSec@0 -1 0`  # gracefully timeout
+do
+  sleep 0.1
+  # done if status files exist, but don't mention initialization
+  if \
+    stat -t "@spoolAreaPath@"/status/* >/dev/null 2>&1 \
+    && \
+    ! grep --silent --ignore-case 'initializing server' \
+    "@spoolAreaPath@"/status/*
+  then
+    echo "modem(s) apparently ready"
+    exit 0
+  fi
+  # if i reached 0, modems probably failed to initialize
+  if test $i -eq 0
+  then
+    echo "warning: modem initialization timed out"
+  fi
+done
diff --git a/nixos/modules/services/networking/hylafax/hfaxd-default.nix b/nixos/modules/services/networking/hylafax/hfaxd-default.nix
new file mode 100644
index 000000000000..8999dae57f41
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/hfaxd-default.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+# see man:hfaxd(8)
+
+{
+
+  ServerTracing = "0x91";
+  XferLogFile = "/clientlog";
+
+}
diff --git a/nixos/modules/services/networking/hylafax/modem-default.nix b/nixos/modules/services/networking/hylafax/modem-default.nix
new file mode 100644
index 000000000000..7529b5b0aafd
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/modem-default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+# see man:hylafax-config(5)
+
+{
+
+  TagLineFont = "etc/LiberationSans-25.pcf";
+  TagLineLocale = ''en_US.UTF-8'';
+
+  AdminGroup = "root";  # groups that can change server config
+  AnswerRotary = "fax";  # don't accept anything else but faxes
+  LogFileMode = "0640";
+  PriorityScheduling = true;
+  RecvFileMode = "0640";
+  ServerTracing = "0x78701";
+  SessionTracing = "0x78701";
+  UUCPLockDir = "/var/lock";
+
+  SendPageCmd = ''${pkgs.coreutils}/bin/false'';  # prevent pager transmit
+  SendUUCPCmd = ''${pkgs.coreutils}/bin/false'';  # prevent UUCP transmit
+
+}
diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix
new file mode 100644
index 000000000000..4ac6d3fa8432
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/options.nix
@@ -0,0 +1,375 @@
+{ config, lib, pkgs, ... }:
+
+let
+
+  inherit (lib.options) literalExample mkEnableOption mkOption;
+  inherit (lib.types) bool enum int lines loaOf nullOr path str submodule;
+  inherit (lib.modules) mkDefault mkIf mkMerge;
+
+  commonDescr = ''
+    Values can be either strings or integers
+    (which will be added to the config file verbatimly)
+    or lists thereof
+    (which will be translated to multiple
+    lines with the same configuration key).
+    Boolean values are translated to "Yes" or "No".
+    The default contains some reasonable
+    configuration to yield an operational system.
+  '';
+
+  str1 = lib.types.addCheck str (s: s!="");  # non-empty string
+  int1 = lib.types.addCheck int (i: i>0);  # positive integer
+
+  configAttrType =
+    # Options in HylaFAX configuration files can be
+    # booleans, strings, integers, or list thereof
+    # representing multiple config directives with the same key.
+    # This type definition resolves all
+    # those types into a list of strings.
+    let
+      inherit (lib.types) attrsOf coercedTo listOf;
+      innerType = coercedTo bool (x: if x then "Yes" else "No")
+        (coercedTo int (toString) str);
+    in
+      attrsOf (coercedTo innerType lib.singleton (listOf innerType));
+
+  cfg = config.services.hylafax;
+
+  modemConfigOptions = { name, config, ... }: {
+    options = {
+      name = mkOption {
+        type = str1;
+        example = "ttyS1";
+        description = ''
+          Name of modem device,
+          will be searched for in <filename>/dev</filename>.
+        '';
+      };
+      type = mkOption {
+        type = str1;
+        example = "cirrus";
+        description = ''
+          Name of modem configuration file,
+          will be searched for in <filename>config</filename>
+          in the spooling area directory.
+        '';
+      };
+      config = mkOption {
+        type = configAttrType;
+        example = {
+          AreaCode = "49";
+          LocalCode = "30";
+          FAXNumber = "123456";
+          LocalIdentifier = "LostInBerlin";
+        };
+        description = ''
+          Attribute set of values for the given modem.
+          ${commonDescr}
+          Options defined here override options in
+          <option>commonModemConfig</option> for this modem.
+        '';
+      };
+    };
+    config.name = mkDefault name;
+    config.config.Include = [ "config/${config.type}" ];
+  };
+
+  defaultConfig =
+    let
+      inherit (config.security) wrapperDir;
+      inherit (config.services.mail.sendmailSetuidWrapper) program;
+      mkIfDefault = cond: value: mkIf cond (mkDefault value);
+      noWrapper = config.services.mail.sendmailSetuidWrapper==null;
+      # If a sendmail setuid wrapper exists,
+      # we add the path to the default configuration file.
+      # Otherwise, we use `false` to provoke
+      # an error if hylafax tries to use it.
+      c.sendmailPath = mkMerge [
+        (mkIfDefault noWrapper ''${pkgs.coreutils}/bin/false'')
+        (mkIfDefault (!noWrapper) ''${wrapperDir}/${program}'')
+      ];
+      importDefaultConfig = file:
+        lib.attrsets.mapAttrs
+        (lib.trivial.const mkDefault)
+        (import file { inherit pkgs; });
+      c.commonModemConfig = importDefaultConfig ./modem-default.nix;
+      c.faxqConfig = importDefaultConfig ./faxq-default.nix;
+      c.hfaxdConfig = importDefaultConfig ./hfaxd-default.nix;
+    in
+      c;
+
+  localConfig =
+    let
+      c.hfaxdConfig.UserAccessFile = cfg.userAccessFile;
+      c.faxqConfig = lib.attrsets.mapAttrs
+        (lib.trivial.const (v: mkIf (v!=null) v))
+        {
+          AreaCode = cfg.areaCode;
+          CountryCode = cfg.countryCode;
+          LongDistancePrefix = cfg.longDistancePrefix;
+          InternationalPrefix = cfg.internationalPrefix;
+        };
+      c.commonModemConfig = c.faxqConfig;
+    in
+      c;
+
+in
+
+
+{
+
+
+  options.services.hylafax = {
+
+    enable = mkEnableOption ''HylaFAX server'';
+
+    autostart = mkOption {
+      type = bool;
+      default = true;
+      example = false;
+      description = ''
+        Autostart the HylaFAX queue manager at system start.
+        If this is <literal>false</literal>, the queue manager
+        will still be started if there are pending
+        jobs or if a user tries to connect to it.
+      '';
+    };
+
+    countryCode = mkOption {
+      type = nullOr str1;
+      default = null;
+      example = "49";
+      description = ''Country code for server and all modems.'';
+    };
+
+    areaCode = mkOption {
+      type = nullOr str1;
+      default = null;
+      example = "30";
+      description = ''Area code for server and all modems.'';
+    };
+
+    longDistancePrefix = mkOption {
+      type = nullOr str;
+      default = null;
+      example = "0";
+      description = ''Long distance prefix for server and all modems.'';
+    };
+
+    internationalPrefix = mkOption {
+      type = nullOr str;
+      default = null;
+      example = "00";
+      description = ''International prefix for server and all modems.'';
+    };
+
+    spoolAreaPath = mkOption {
+      type = path;
+      default = "/var/spool/fax";
+      description = ''
+        The spooling area will be created/maintained
+        at the location given here.
+      '';
+    };
+
+    userAccessFile = mkOption {
+      type = path;
+      default = "/etc/hosts.hfaxd";
+      description = ''
+        The <filename>hosts.hfaxd</filename>
+        file entry in the spooling area
+        will be symlinked to the location given here.
+        This file must exist and be
+        readable only by the <literal>uucp</literal> user.
+        See hosts.hfaxd(5) for details.
+        This configuration permits access for all users:
+        <literal>
+          environment.etc."hosts.hfaxd" = {
+            mode = "0600";
+            user = "uucp";
+            text = ".*";
+          };
+        </literal>
+        Note that host-based access can be controlled with
+        <option>config.systemd.sockets.hylafax-hfaxd.listenStreams</option>;
+        by default, only 127.0.0.1 is permitted to connect.
+      '';
+    };
+
+    sendmailPath = mkOption {
+      type = path;
+      example = literalExample "''${pkgs.postfix}/bin/sendmail";
+      # '' ;  # fix vim
+      description = ''
+        Path to <filename>sendmail</filename> program.
+        The default uses the local sendmail wrapper
+        (see <option>config.services.mail.sendmailSetuidWrapper</option>),
+        otherwise the <filename>false</filename>
+        binary to cause an error if used.
+      '';
+    };
+
+    hfaxdConfig = mkOption {
+      type = configAttrType;
+      example.RecvqProtection = "0400";
+      description = ''
+        Attribute set of lines for the global
+        hfaxd config file <filename>etc/hfaxd.conf</filename>.
+        ${commonDescr}
+      '';
+    };
+
+    faxqConfig = mkOption {
+      type = configAttrType;
+      example = {
+        InternationalPrefix = "00";
+        LongDistancePrefix = "0";
+      };
+      description = ''
+        Attribute set of lines for the global
+        faxq config file <filename>etc/config</filename>.
+        ${commonDescr}
+      '';
+    };
+
+    commonModemConfig = mkOption {
+      type = configAttrType;
+      example = {
+        InternationalPrefix = "00";
+        LongDistancePrefix = "0";
+      };
+      description = ''
+        Attribute set of default values for
+        modem config files <filename>etc/config.*</filename>.
+        ${commonDescr}
+        Think twice before changing
+        paths of fax-processing scripts.
+      '';
+    };
+
+    modems = mkOption {
+      type = loaOf (submodule [ modemConfigOptions ]);
+      default = {};
+      example.ttyS1 = {
+        type = "cirrus";
+        config = {
+          FAXNumber = "123456";
+          LocalIdentifier = "Smith";
+        };
+      };
+      description = ''
+        Description of installed modems.
+        At least on modem must be defined
+        to enable the HylaFAX server.
+      '';
+    };
+
+    spoolExtraInit = mkOption {
+      type = lines;
+      default = "";
+      example = ''chmod 0755 .  # everyone may read my faxes'';
+      description = ''
+        Additional shell code that is executed within the
+        spooling area directory right after its setup.
+      '';
+    };
+
+    faxcron.enable.spoolInit = mkEnableOption ''
+      Purge old files from the spooling area with
+      <filename>faxcron</filename>
+      each time the spooling area is initialized.
+    '';
+    faxcron.enable.frequency = mkOption {
+      type = nullOr str1;
+      default = null;
+      example = "daily";
+      description = ''
+        Purge old files from the spooling area with
+        <filename>faxcron</filename> with the given frequency
+        (see systemd.time(7)).
+      '';
+    };
+    faxcron.infoDays = mkOption {
+      type = int1;
+      default = 30;
+      description = ''
+        Set the expiration time for data in the
+        remote machine information directory in days.
+      '';
+    };
+    faxcron.logDays = mkOption {
+      type = int1;
+      default = 30;
+      description = ''
+        Set the expiration time for
+        session trace log files in days.
+      '';
+    };
+    faxcron.rcvDays = mkOption {
+      type = int1;
+      default = 7;
+      description = ''
+        Set the expiration time for files in
+        the received facsimile queue in days.
+      '';
+    };
+
+    faxqclean.enable.spoolInit = mkEnableOption ''
+      Purge old files from the spooling area with
+      <filename>faxqclean</filename>
+      each time the spooling area is initialized.
+    '';
+    faxqclean.enable.frequency = mkOption {
+      type = nullOr str1;
+      default = null;
+      example = "daily";
+      description = ''
+        Purge old files from the spooling area with
+        <filename>faxcron</filename> with the given frequency
+        (see systemd.time(7)).
+      '';
+    };
+    faxqclean.archiving = mkOption {
+      type = enum [ "never" "as-flagged" "always" ];
+      default = "as-flagged";
+      example = "always";
+      description = ''
+        Enable or suppress job archiving:
+        <literal>never</literal> disables job archiving,
+        <literal>as-flagged</literal> archives jobs that
+        have been flagged for archiving by sendfax,
+        <literal>always</literal> forces archiving of all jobs.
+        See also sendfax(1) and faxqclean(8).
+      '';
+    };
+    faxqclean.doneqMinutes = mkOption {
+      type = int1;
+      default = 15;
+      example = literalExample ''24*60'';
+      description = ''
+        Set the job
+        age threshold (in minutes) that controls how long
+        jobs may reside in the doneq directory.
+      '';
+    };
+    faxqclean.docqMinutes = mkOption {
+      type = int1;
+      default = 60;
+      example = literalExample ''24*60'';
+      description = ''
+        Set the document
+        age threshold (in minutes) that controls how long
+        unreferenced files may reside in the docq directory.
+      '';
+    };
+
+  };
+
+
+  config.services.hylafax =
+    mkIf
+    (config.services.hylafax.enable)
+    (mkMerge [ defaultConfig localConfig ])
+  ;
+
+}
diff --git a/nixos/modules/services/networking/hylafax/spool.sh b/nixos/modules/services/networking/hylafax/spool.sh
new file mode 100755
index 000000000000..31e930e8c597
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/spool.sh
@@ -0,0 +1,111 @@
+#! @shell@ -e
+
+# The following lines create/update the HylaFAX spool directory:
+# Subdirectories/files with persistent data are kept,
+# other directories/files are removed/recreated,
+# mostly from the template spool
+# directory in the HylaFAX package.
+
+# This block explains how the spool area is
+# derived from the spool template in the HylaFAX package:
+#
+#                  + capital letter: directory; file otherwise
+#                  + P/p: persistent directory
+#                  + F/f: directory with symlinks per entry
+#                  + T/t: temporary data
+#                  + S/s: single symlink into package
+#                  |
+#                  | + u: change ownership to uucp:uucp
+#                  | + U: ..also change access mode to user-only
+#                  | |
+# archive          P U
+# bin              S
+# client           T u  (client connection info)
+# config           S
+# COPYRIGHT        s
+# dev              T u  (maybe some FIFOs)
+# docq             P U
+# doneq            P U
+# etc              F    contains customized config files!
+# etc/hosts.hfaxd  f
+# etc/xferfaxlog   f
+# info             P u  (database of called devices)
+# log              P u  (communication logs)
+# pollq            P U
+# recvq            P u
+# sendq            P U
+# status           T u  (modem status info files)
+# tmp              T U
+
+
+shopt -s dotglob  # if bash sees "*", it also includes dot files
+lnsym () { ln --symbol "$@" ; }
+lnsymfrc () { ln --symbolic --force "$@" ; }
+cprd () { cp --remove-destination "$@" ; }
+update () { install --owner=@faxuser@ --group=@faxgroup@ "$@" ; }
+
+
+## create/update spooling area
+
+update --mode=0750 -d "@spoolAreaPath@"
+cd "@spoolAreaPath@"
+
+persist=(archive docq doneq info log pollq recvq sendq)
+
+# remove entries that don't belong here
+touch dummy  # ensure "*" resolves to something
+for k in *
+do
+  keep=0
+  for j in "${persist[@]}" xferfaxlog clientlog faxcron.lastrun
+  do
+    if test "$k" == "$j"
+    then
+      keep=1
+      break
+    fi
+  done
+  if test "$keep" == "0"
+  then
+    rm --recursive "$k"
+  fi
+done
+
+# create persistent data directories (unless they exist already)
+update --mode=0700 -d "${persist[@]}"
+chmod 0755 info log recvq
+
+# create ``xferfaxlog``, ``faxcron.lastrun``, ``clientlog``
+touch clientlog faxcron.lastrun xferfaxlog
+chown @faxuser@:@faxgroup@ clientlog faxcron.lastrun xferfaxlog
+
+# create symlinks for frozen directories/files
+lnsym --target-directory=. "@hylafax@"/spool/{COPYRIGHT,bin,config}
+
+# create empty temporary directories
+update --mode=0700 -d client dev status
+update -d tmp
+
+
+## create and fill etc
+
+install -d "@spoolAreaPath@/etc"
+cd "@spoolAreaPath@/etc"
+
+# create symlinks to all files in template's etc
+lnsym --target-directory=. "@hylafax@/spool/etc"/*
+
+# set LOCKDIR in setup.cache
+sed --regexp-extended 's|^(UUCP_LOCKDIR=).*$|\1'"'@lockPath@'|g" --in-place setup.cache
+
+# etc/{xferfaxlog,lastrun} are stored in the spool root
+lnsymfrc --target-directory=. ../xferfaxlog
+lnsymfrc --no-target-directory ../faxcron.lastrun lastrun
+
+# etc/hosts.hfaxd is provided by the NixOS configuration
+lnsymfrc --no-target-directory "@userAccessFile@" hosts.hfaxd
+
+# etc/config and etc/config.${DEVID} must be copied:
+# hfaxd reads these file after locking itself up in a chroot
+cprd --no-target-directory "@globalConfigPath@" config
+cprd --target-directory=. "@modemConfigPath@"/*
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
new file mode 100644
index 000000000000..91d9c1a37da6
--- /dev/null
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -0,0 +1,249 @@
+{ config, lib, pkgs, ... }:
+
+
+let
+
+  inherit (lib) mkIf mkMerge;
+  inherit (lib) concatStringsSep optionalString;
+
+  cfg = config.services.hylafax;
+  mapModems = lib.flip map (lib.attrValues cfg.modems);
+
+  mkConfigFile = name: conf:
+    # creates hylafax config file,
+    # makes sure "Include" is listed *first*
+    let
+      mkLines = conf:
+        (lib.concatLists
+        (lib.flip lib.mapAttrsToList conf
+        (k: map (v: ''${k}: ${v}'')
+      )));
+      include = mkLines { Include = conf.Include or []; };
+      other = mkLines ( conf // { Include = []; } );
+    in
+      pkgs.writeText ''hylafax-config${name}''
+      (concatStringsSep "\n" (include ++ other));
+
+  globalConfigPath = mkConfigFile "" cfg.faxqConfig;
+
+  modemConfigPath =
+    let
+      mkModemConfigFile = { config, name, ... }:
+        mkConfigFile ''.${name}''
+        (cfg.commonModemConfig // config);
+      mkLine = { name, type, ... }@modem: ''
+        # check if modem config file exists:
+        test -f "${pkgs.hylafaxplus}/spool/config/${type}"
+        ln \
+          --symbolic \
+          --no-target-directory \
+          "${mkModemConfigFile modem}" \
+          "$out/config.${name}"
+      '';
+    in
+      pkgs.runCommand "hylafax-config-modems" {}
+      ''mkdir --parents "$out/" ${concatStringsSep "\n" (mapModems mkLine)}'';
+
+  setupSpoolScript = pkgs.substituteAll {
+    name = "hylafax-setup-spool.sh";
+    src = ./spool.sh;
+    isExecutable = true;
+    inherit (pkgs.stdenv) shell;
+    hylafax = pkgs.hylafaxplus;
+    faxuser = "uucp";
+    faxgroup = "uucp";
+    lockPath = "/var/lock";
+    inherit globalConfigPath modemConfigPath;
+    inherit (cfg) sendmailPath spoolAreaPath userAccessFile;
+  };
+
+  waitFaxqScript = pkgs.substituteAll {
+    # This script checks the modems status files
+    # and waits until all modems report readiness.
+    name = "hylafax-faxq-wait-start.sh";
+    src = ./faxq-wait.sh;
+    isExecutable = true;
+    timeoutSec = toString 10;
+    inherit (pkgs.stdenv) shell;
+    inherit (cfg) spoolAreaPath;
+  };
+
+  sockets."hylafax-hfaxd" = {
+    description = "HylaFAX server socket";
+    documentation = [ "man:hfaxd(8)" ];
+    wantedBy = [ "multi-user.target" ];
+    listenStreams = [ "127.0.0.1:4559" ];
+    socketConfig.FreeBind = true;
+    socketConfig.Accept = true;
+  };
+
+  paths."hylafax-faxq" = {
+    description = "HylaFAX queue manager sendq watch";
+    documentation = [ "man:faxq(8)" "man:sendq(5)" ];
+    wantedBy = [ "multi-user.target" ];
+    pathConfig.PathExistsGlob = [ ''${cfg.spoolAreaPath}/sendq/q*'' ];
+  };
+
+  timers = mkMerge [
+    (
+      mkIf (cfg.faxcron.enable.frequency!=null)
+      { "hylafax-faxcron".timerConfig.Persistent = true; }
+    )
+    (
+      mkIf (cfg.faxqclean.enable.frequency!=null)
+      { "hylafax-faxqclean".timerConfig.Persistent = true; }
+    )
+  ];
+
+  hardenService =
+    # Add some common systemd service hardening settings,
+    # but allow each service (here) to override
+    # settings by explicitely setting those to `null`.
+    # More hardening would be nice but makes
+    # customizing hylafax setups very difficult.
+    # If at all, it should only be added along
+    # with some options to customize it.
+    let
+      hardening = {
+        PrivateDevices = true;  # breaks /dev/tty...
+        PrivateNetwork = true;
+        PrivateTmp = true;
+        ProtectControlGroups = true;
+        #ProtectHome = true;  # breaks custom spool dirs
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        #ProtectSystem = "strict";  # breaks custom spool dirs
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+      };
+      filter = key: value: (value != null) || ! (lib.hasAttr key hardening);
+      apply = service: lib.filterAttrs filter (hardening // (service.serviceConfig or {}));
+    in
+      service: service // { serviceConfig = apply service; };
+
+  services."hylafax-spool" = {
+    description = "HylaFAX spool area preparation";
+    documentation = [ "man:hylafax-server(4)" ];
+    script = ''
+      ${setupSpoolScript}
+      cd "${cfg.spoolAreaPath}"
+      ${cfg.spoolExtraInit}
+      if ! test -f "${cfg.spoolAreaPath}/etc/hosts.hfaxd"
+      then
+        echo hosts.hfaxd is missing
+        exit 1
+      fi
+    '';
+    serviceConfig.ExecStop = ''${setupSpoolScript}'';
+    serviceConfig.RemainAfterExit = true;
+    serviceConfig.Type = "oneshot";
+    unitConfig.RequiresMountsFor = [ cfg.spoolAreaPath ];
+  };
+
+  services."hylafax-faxq" = {
+    description = "HylaFAX queue manager";
+    documentation = [ "man:faxq(8)" ];
+    requires = [ "hylafax-spool.service" ];
+    after = [ "hylafax-spool.service" ];
+    wants = mapModems ( { name, ... }: ''hylafax-faxgetty@${name}.service'' );
+    wantedBy = mkIf cfg.autostart [ "multi-user.target" ];
+    serviceConfig.Type = "forking";
+    serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/faxq -q "${cfg.spoolAreaPath}"'';
+    # This delays the "readiness" of this service until
+    # all modems are initialized (or a timeout is reached).
+    # Otherwise, sending a fax with the fax service
+    # stopped will always yield a failed send attempt:
+    # The fax service is started when the job is created with
+    # `sendfax`, but modems need some time to initialize.
+    serviceConfig.ExecStartPost = [ ''${waitFaxqScript}'' ];
+    # faxquit fails if the pipe is already gone
+    # (e.g. the service is already stopping)
+    serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}"'';
+    # disable some systemd hardening settings
+    serviceConfig.PrivateDevices = null;
+    serviceConfig.RestrictRealtime = null;
+  };
+
+  services."hylafax-hfaxd@" = {
+    description = "HylaFAX server";
+    documentation = [ "man:hfaxd(8)" ];
+    after = [ "hylafax-faxq.service" ];
+    requires = [ "hylafax-faxq.service" ];
+    serviceConfig.StandardInput = "socket";
+    serviceConfig.StandardOutput = "socket";
+    serviceConfig.ExecStart = ''${pkgs.hylafaxplus}/spool/bin/hfaxd -q "${cfg.spoolAreaPath}" -d -I'';
+    unitConfig.RequiresMountsFor = [ cfg.userAccessFile ];
+    # disable some systemd hardening settings
+    serviceConfig.PrivateDevices = null;
+    serviceConfig.PrivateNetwork = null;
+  };
+
+  services."hylafax-faxcron" = rec {
+    description = "HylaFAX spool area maintenance";
+    documentation = [ "man:faxcron(8)" ];
+    after = [ "hylafax-spool.service" ];
+    requires = [ "hylafax-spool.service" ];
+    wantedBy = mkIf cfg.faxcron.enable.spoolInit requires;
+    startAt = mkIf (cfg.faxcron.enable.frequency!=null) cfg.faxcron.enable.frequency;
+    serviceConfig.ExecStart = concatStringsSep " " [
+      ''${pkgs.hylafaxplus}/spool/bin/faxcron''
+      ''-q "${cfg.spoolAreaPath}"''
+      ''-info ${toString cfg.faxcron.infoDays}''
+      ''-log  ${toString cfg.faxcron.logDays}''
+      ''-rcv  ${toString cfg.faxcron.rcvDays}''
+    ];
+  };
+
+  services."hylafax-faxqclean" = rec {
+    description = "HylaFAX spool area queue cleaner";
+    documentation = [ "man:faxqclean(8)" ];
+    after = [ "hylafax-spool.service" ];
+    requires = [ "hylafax-spool.service" ];
+    wantedBy = mkIf cfg.faxqclean.enable.spoolInit requires;
+    startAt = mkIf (cfg.faxqclean.enable.frequency!=null) cfg.faxqclean.enable.frequency;
+    serviceConfig.ExecStart = concatStringsSep " " [
+      ''${pkgs.hylafaxplus}/spool/bin/faxqclean''
+      ''-q "${cfg.spoolAreaPath}"''
+      ''-v''
+      (optionalString (cfg.faxqclean.archiving!="never") ''-a'')
+      (optionalString (cfg.faxqclean.archiving=="always")  ''-A'')
+      ''-j ${toString (cfg.faxqclean.doneqMinutes*60)}''
+      ''-d ${toString (cfg.faxqclean.docqMinutes*60)}''
+    ];
+  };
+
+  mkFaxgettyService = { name, ... }:
+    lib.nameValuePair ''hylafax-faxgetty@${name}'' rec {
+      description = "HylaFAX faxgetty for %I";
+      documentation = [ "man:faxgetty(8)" ];
+      bindsTo = [ "dev-%i.device" ];
+      requires = [ "hylafax-spool.service" ];
+      after = bindsTo ++ requires;
+      before = [ "hylafax-faxq.service" "getty.target" ];
+      unitConfig.StopWhenUnneeded = true;
+      unitConfig.AssertFileNotEmpty = ''${cfg.spoolAreaPath}/etc/config.%I'';
+      serviceConfig.UtmpIdentifier = "%I";
+      serviceConfig.TTYPath = "/dev/%I";
+      serviceConfig.Restart = "always";
+      serviceConfig.KillMode = "process";
+      serviceConfig.IgnoreSIGPIPE = false;
+      serviceConfig.ExecStart = ''-${pkgs.hylafaxplus}/spool/bin/faxgetty -q "${cfg.spoolAreaPath}" /dev/%I'';
+      # faxquit fails if the pipe is already gone
+      # (e.g. the service is already stopping)
+      serviceConfig.ExecStop = ''-${pkgs.hylafaxplus}/spool/bin/faxquit -q "${cfg.spoolAreaPath}" %I'';
+      # disable some systemd hardening settings
+      serviceConfig.PrivateDevices = null;
+      serviceConfig.RestrictRealtime = null;
+    };
+
+  modemServices =
+    lib.listToAttrs (mapModems mkFaxgettyService);
+
+in
+
+{
+  config.systemd = mkIf cfg.enable {
+    inherit sockets timers paths;
+    services = lib.mapAttrs (lib.const hardenService) (services // modemServices);
+  };
+}

From 2ed07fdb2bf30a202a44976d0263d8c44e20b5b3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 14:42:12 +0200
Subject: [PATCH 0559/3253] drgeo: add license + homepage

---
 pkgs/applications/science/geometry/drgeo/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix
index 8db1beedebbb..e233b91bbc91 100644
--- a/pkgs/applications/science/geometry/drgeo/default.nix
+++ b/pkgs/applications/science/geometry/drgeo/default.nix
@@ -20,8 +20,10 @@ stdenv.mkDerivation rec {
     cp drgeo.desktop.in drgeo.desktop
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Interactive geometry program";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://sourceforge.net/projects/ofset;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 258c202565cae23ad4e6b17670d9ab4313c31090 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 14:44:43 +0200
Subject: [PATCH 0560/3253] prooftree: add license

---
 pkgs/applications/science/logic/prooftree/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 01dfc35f6e0d..2d5fcfd2d261 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation (rec {
   dontAddPrefix = true;
   configureFlags = [ "--prefix" "$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A program for proof-tree visualization";
     longDescription = ''
       Prooftree is a program for proof-tree visualization during interactive
@@ -35,7 +35,8 @@ stdenv.mkDerivation (rec {
       shift-click).
     '';
     homepage = http://askra.de/software/prooftree;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.jwiegley ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.jwiegley ];
+    license = licenses.gpl3;
   };
 })

From 1cff2dd135ef9d267017cf414dff9e0baf48452d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 14:48:19 +0200
Subject: [PATCH 0561/3253] pynac: add license

---
 pkgs/applications/science/math/pynac/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 1a059aeb1670..9bbb695a331b 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
       of the full GiNaC, and it is *only* meant to be used as a Python library.
     '';
     homepage    = http://pynac.org;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ timokau ];
     platforms   = platforms.linux;
   };

From 70e254d6bd2100b09bf869137d87640ae27b89fe Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 14:51:28 +0200
Subject: [PATCH 0562/3253] root: add license

---
 pkgs/applications/science/misc/root/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index e966e798ae6d..2ec1ded68a26 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -67,10 +67,11 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://root.cern.ch/;
     description = "A data analysis framework";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.veprbl ];
+    license = licenses.lgpl21;
   };
 }

From c2ff374951cbd743b6189750bbfc616b58b9f1fb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 14:55:41 +0200
Subject: [PATCH 0563/3253] bazaar: add license

---
 pkgs/applications/version-management/bazaar/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index fea6fb358303..097c1e86a897 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec {
       --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://bazaar-vcs.org/;
     description = "A distributed version control system that Just Works";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
   };
 }

From 499b7e892713ec104de26cece63bcfac055adc4c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:01:25 +0200
Subject: [PATCH 0564/3253] bzr-tools: add license

---
 pkgs/applications/version-management/bazaar/tools.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index 0ad3c6079acd..82c87f30b711 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -3,7 +3,7 @@
 python2Packages.buildPythonApplication rec {
   name = "bzr-tools-${version}";
   version = "2.6.0";
-  
+
   src = fetchurl {
     url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
     sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
@@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Bazaar plugins";
     homepage = http://wiki.bazaar.canonical.com/BzrTools;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From 9f29e4c9c7c42085e9e3ed8b9833a02eb1b5380d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:04:33 +0200
Subject: [PATCH 0565/3253] cvs2svn: add license

---
 pkgs/applications/version-management/cvs2svn/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 90a9f26045f3..5dc0c48b0f78 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
   /* !!! maybe we should absolutise the program names in
      $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to convert CVS repositories to Subversion repositories";
     homepage = http://cvs2svn.tigris.org/;
-    maintainers = [ lib.maintainers.makefu ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.makefu ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }

From edb1bfcd320e6c0184d4a80951f7c2b5fc702d5f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:07:58 +0200
Subject: [PATCH 0566/3253] guitone: add license

---
 pkgs/applications/version-management/guitone/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix
index 88074a0862c1..33d2eb89ad08 100644
--- a/pkgs/applications/version-management/guitone/default.nix
+++ b/pkgs/applications/version-management/guitone/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Qt4 based GUI for monotone";
-    homepage = http://guitone.thomaskeller.biz;
+    homepage = https://guitone.thomaskeller.biz;
     downloadPage = https://code.monotone.ca/p/guitone/;
+    license = stdenv.lib.licenses.gpl3;
     inherit (qt4.meta) platforms;
   };
 }

From ae795a6acd5923b179f1a30a9f40fb6edd5e1d69 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:12:27 +0200
Subject: [PATCH 0567/3253] monotone: add license

---
 .../applications/version-management/monotone/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 4282f48654e6..0606c58c09d5 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ boost zlib botan libidn lua pcre sqlite expect 
+  buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
     openssl gmp bzip2 ];
 
   postInstall = ''
@@ -33,9 +33,10 @@ stdenv.mkDerivation rec {
 
   #doCheck = true; # some tests fail (and they take VERY long)
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free distributed version control system";
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From bcedf59d84201679939836b5997c024497e10b1d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 8 Sep 2018 15:15:41 +0200
Subject: [PATCH 0568/3253] perl-packages: remove rycee from maintainers

I no longer use or develop Perl regularly so cannot vouch for these
packages anymore.
---
 pkgs/top-level/perl-packages.nix | 72 --------------------------------
 1 file changed, 72 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8903436d5955..4d3bd223d412 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1250,7 +1250,6 @@ let
     meta = {
       description = "Serves PODs right from your Catalyst application";
       license = stdenv.lib.licenses.bsd3;
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -1478,7 +1477,6 @@ let
     propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ];
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -1506,7 +1504,6 @@ let
     meta = {
       description = "Catalyst Plugin for Log::Handler";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 
@@ -1534,7 +1531,6 @@ let
     meta = {
       description = "Per-session custom expiry times";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 
@@ -1572,7 +1568,6 @@ let
     meta = {
       description = "File storage backend for session data";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 
@@ -1614,7 +1609,6 @@ let
     meta = {
       description = "Handle passing of status messages between screens of a web application";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ stdenv.lib.maintainers.rycee ];
     };
   };
 
@@ -1629,7 +1623,6 @@ let
     meta = {
       description = "CSV view class";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -1752,7 +1745,6 @@ let
     meta = {
       description = "Handle Common Gateway Interface requests and responses";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -1895,7 +1887,6 @@ let
     meta = {
       description = "Unified cache handling interface";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -2509,7 +2500,6 @@ let
       homepage = https://github.com/rjbs/Config-INI;
       description = "Simple .ini-file format";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -2568,7 +2558,6 @@ let
       homepage = https://github.com/rjbs/Config-MVP;
       description = "Multivalue-property package-oriented configuration";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -2801,7 +2790,6 @@ let
     meta = {
       description = "Read and write Changes files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -3074,7 +3062,6 @@ let
     meta = with stdenv.lib; {
       description = "Perl wrapper around OpenSSL's AES library";
       license = with licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
       platforms = platforms.unix;
     };
   };
@@ -3561,7 +3548,6 @@ let
     meta = {
       description = "Domain and host name validation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -3576,7 +3562,6 @@ let
     meta = {
       description = "IPv4 and IPv6 validation methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -3590,7 +3575,6 @@ let
     meta = {
       description = "Common URL validation methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -3823,7 +3807,6 @@ let
     meta = {
       description = "Parse and format MySQL dates and times";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -4333,7 +4316,6 @@ let
     meta = {
       description = "Adding keywords to perl, in perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -4495,7 +4477,6 @@ let
     meta = {
       description = "Perl extension for 32 bit Jenkins Hashing Algorithm";
       license = stdenv.lib.licenses.artistic2;
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -4915,7 +4896,6 @@ let
       homepage = https://github.com/rjbs/Email-Abstract;
       description = "Unified interface to mail representations";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -4967,7 +4947,6 @@ let
       homepage = https://github.com/rjbs/Email-Date-Format;
       description = "Produce RFC 2822 date strings";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -5009,7 +4988,6 @@ let
       homepage = https://github.com/rjbs/Email-MIME;
       description = "Easy MIME message handling";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -5038,7 +5016,6 @@ let
       homepage = https://github.com/rjbs/Email-MIME-ContentType;
       description = "Parse a MIME Content-Type Header";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
     propagatedBuildInputs = [ Encode ];
   };
@@ -5054,7 +5031,6 @@ let
       homepage = https://github.com/rjbs/Email-MIME-Encodings;
       description = "A unified interface to MIME encoding and decoding";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ rycee ];
     };
   };
 
@@ -5069,7 +5045,6 @@ let
       homepage = https://github.com/rjbs/Email-Send;
       description = "Simply Sending Email";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
     buildInputs = [ MIMETools MailTools ];
   };
@@ -5102,7 +5077,6 @@ let
       homepage = https://github.com/rjbs/Email-Sender;
       description = "A library for sending email";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -5117,7 +5091,6 @@ let
       homepage = https://github.com/rjbs/Email-Simple;
       description = "Simple parsing of RFC2822 message format and headers";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -5140,7 +5113,6 @@ let
     propagatedBuildInputs = [ EmailValid ];
     meta = {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -5220,7 +5192,6 @@ let
     meta = {
       description = "Determine the locale encoding";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -5936,7 +5907,6 @@ let
     meta = {
       description = "Determine MIME types of data or files using libmagic";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -6053,7 +6023,6 @@ let
     meta = {
       description = "Read a file backwards by lines";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -6239,7 +6208,6 @@ let
       homepage = https://github.com/tommybutler/file-util/wiki;
       description = "Easy, versatile, portable file handling";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -6352,7 +6320,6 @@ let
     meta = {
       description = "Validation with simple chains of constraints";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
     buildInputs = [ CGI ];
   };
@@ -6868,7 +6835,6 @@ let
     meta = {
       description = "Provide the stuff missing in Hash::Util";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -7591,7 +7557,6 @@ let
     meta = {
       description = "Alternative but compatible interface to modules that export symbols";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -7694,7 +7659,6 @@ let
     meta = {
       description = "Open an HTML file with automatic charset detection";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -7825,7 +7789,6 @@ let
     meta = {
       description = "IO::Socket with read/write timeout";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -8785,7 +8748,6 @@ let
       homepage = https://github.com/preaction/Log-Any;
       description = "Bringing loggers and listeners together";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -8830,7 +8792,6 @@ let
     meta = {
       description = "Log messages to several outputs";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -8890,7 +8851,6 @@ let
       homepage = https://mschilli.github.io/log4perl/;
       description = "Log4j implementation for Perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -9221,7 +9181,6 @@ let
     meta = {
       description = "Various e-mail related modules";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -9510,7 +9469,6 @@ let
     meta = {
       description = "Low-calorie MIME generator (DEPRECATED)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -9551,7 +9509,6 @@ let
       homepage = https://github.com/rjbs/mixin-linewise;
       description = "Write your linewise code for handles; this does the rest";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -10095,7 +10052,6 @@ let
     meta = {
       description = "Minimalist Object Orientation (with Moose compatibility)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -10403,7 +10359,6 @@ let
       homepage = https://github.com/gfx/mousex-getopt;
       description = "A Mouse role for processing command line options";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -10504,7 +10459,6 @@ let
       homepage = https://github.com/moose/MooseX-Getopt;
       description = "A Moose role for processing command line options";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -10763,7 +10717,6 @@ let
       homepage = https://github.com/moose/MooseX-Types;
       description = "Organise your Moose types in libraries";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -11060,7 +11013,6 @@ let
     meta = {
       description = "Manages IPv4 and IPv6 addresses and subnets";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -11253,7 +11205,6 @@ let
     meta = {
       description = "Work with TLD names";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -11794,7 +11745,6 @@ let
       homepage = https://github.com/dluxhu/perl-parallel-forkmanager;
       description = "A simple parallel processing fork manager";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -12189,7 +12139,6 @@ let
     meta = {
       description = "A PerlIO layer that adds read & write timeout to a handle";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -12811,7 +12760,6 @@ let
       homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger;
       description = "A thing that takes a string of Perl and rewrites its documentation";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -12852,7 +12800,6 @@ let
       homepage = https://github.com/neilb/Pod-POM;
       description = "POD Object Model";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -12866,7 +12813,6 @@ let
     meta = {
       description = "Generate the TOC of a POD with Pod::POM";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -13041,7 +12987,6 @@ let
       homepage = https://github.com/rjbs/Pod-Weaver;
       description = "Weave together a Pod document from an outline";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -13105,7 +13050,6 @@ let
       homepage = https://github.com/sanko/readonly;
       description = "Facility for creating read-only scalars, arrays, hashes";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -13130,7 +13074,6 @@ let
       homepage = https://github.com/PerlRedis/perl-redis;
       description = "Perl binding for Redis database";
       license = stdenv.lib.licenses.artistic2;
-      maintainers = [ maintainers.rycee ];
       platforms   = stdenv.lib.platforms.unix;
     };
   };
@@ -13318,7 +13261,6 @@ let
     meta = {
       description = "Roles. Like a nouvelle cuisine portion size slice of Moose";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -13593,7 +13535,6 @@ let
       homepage = https://github.com/rjbs/Software-License;
       description = "Packages that provide templated software licenses";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14147,7 +14088,6 @@ let
       homepage = https://github.com/rjbs/Sub-Exporter-ForMethods;
       description = "Helper routines for using Sub::Exporter to build methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14201,7 +14141,6 @@ let
     meta = {
       description = "Tool for inspecting subroutines";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14228,7 +14167,6 @@ let
       homepage = https://github.com/p5sagit/Sub-Name;
       description = "(Re)name a sub";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14408,7 +14346,6 @@ let
     meta = {
       description = "Perl interface to the UNIX syslog(3) calls";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14797,7 +14734,6 @@ let
     meta = {
       description = "Format a header and rows into a table";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14873,7 +14809,6 @@ let
     meta = {
       description = "Distribution with a rich set of tools built upon the Test2 framework";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -14964,7 +14899,6 @@ let
     meta = {
       description = "Easily create test classes in an xUnit/JUnit style";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -15173,7 +15107,6 @@ let
       homepage = https://github.com/rjbs/Test-Fatal;
       description = "Incredibly simple helpers for testing code with exceptions";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -15860,7 +15793,6 @@ let
     meta = {
       description = "Basic utilities for writing tests";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -16015,7 +15947,6 @@ let
       homepage = https://github.com/karenetheridge/Test-Warnings;
       description = "Test for warnings and the lack of them";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -16212,7 +16143,6 @@ let
     meta = {
       description = "Comma-separated values manipulator (using XS or PurePerl)";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -16226,7 +16156,6 @@ let
     meta = {
       description = "Encoding aware Text::CSV";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -16734,7 +16663,6 @@ let
       homepage = https://github.com/rjbs/Throwable;
       description = "A role for classes that can be thrown";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 

From ffb5eca618071552eb9e88286b3cce222c454a44 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:15:58 +0200
Subject: [PATCH 0569/3253] vcprompt: add license

---
 pkgs/applications/version-management/vcprompt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix
index 4afb1b20e32c..c2bf0a4183c1 100644
--- a/pkgs/applications/version-management/vcprompt/default.nix
+++ b/pkgs/applications/version-management/vcprompt/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage    = http://hg.gerg.ca/vcprompt;
     maintainers = with maintainers; [ cstrahan ];
     platforms   = with platforms; linux ++ darwin;
+    license = licenses.gpl2Plus;
   };
 }

From 6960a96a0c7fa7dcfb3282ef352942a68515a3ad Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 15:20:39 +0200
Subject: [PATCH 0570/3253] jbake: fix sandbox build (#46363)

See https://hydra.nixos.org/build/80999410

Without a sandbox the `checkPhase` breaks with the following error:

```
/nix/store/i6vl5lwlz5jbkg4r6p340dwmj6fha3xq-stdenv-linux/setup: bin/jbake: /usr/bin/env: bad interpreter: No such file or directory
jbake did not return correct version
```

Running `patchShebangs` before fixes the issue.

Addresses #45960
---
 pkgs/development/tools/jbake/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 152cddc101d6..9c3094fb4fec 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper jre ];
 
+  postPatch = "patchShebangs .";
+
   installPhase = ''
     mkdir -p $out
     cp -vr * $out

From 2be3ed40622e5b8baeb6f6998389be781d43763f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:27:50 +0200
Subject: [PATCH 0571/3253] tivodecode: add license

---
 pkgs/applications/video/tivodecode/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix
index b158bc924605..83ca41e201c9 100644
--- a/pkgs/applications/video/tivodecode/default.nix
+++ b/pkgs/applications/video/tivodecode/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
     sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file";
     homepage = http://tivodecode.sourceforge.net;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.bsd3;
   };
 }

From 6e6e41b56e2fe1b02a2a5c1576ebbfb54b3aed27 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:28:10 +0200
Subject: [PATCH 0572/3253] xine-ui: add license

---
 pkgs/applications/video/xine-ui/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 69fc68a69deb..4dfc3fd052a2 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "xine-ui-0.99.10";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/xine/${name}.tar.xz";
     sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
   };
-  
+
   nativeBuildInputs = [ pkgconfig shared-mime-info ];
 
   buildInputs =
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
   patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
 
   configureFlags = [ "--with-readline=${readline.dev}" ];
-  
+
   LIRC_CFLAGS="-I${lirc}/include";
   LIRC_LIBS="-L ${lirc}/lib -llirc_client";
 #NIX_LDFLAGS = "-lXext -lgcc_s";
 
-  meta = { 
+  meta = with stdenv.lib; {
     homepage = http://www.xine-project.org/;
     description = "Xlib-based interface to Xine, a video player";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From d18bf127350bc6de4b2370d295e09e3ced8bc1bd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 15:28:25 +0200
Subject: [PATCH 0573/3253] fbpanel: add license

---
 pkgs/applications/window-managers/fbpanel/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index b521240b48f5..0c13691a36ac 100644
--- a/pkgs/applications/window-managers/fbpanel/default.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     description = "A stand-alone panel";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 
   passthru = {

From de6544b50e53e0e843f95d876f4cca743fed00e0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 16:16:26 +0200
Subject: [PATCH 0574/3253] pdf2htmlEX: mark as broken

See https://hydra.nixos.org/build/81003667

The build is currently broken on Hydra due to the following error:

```
CairoFontEngine.cc:681:17: error: 'void Object::free()' is private within this context
```

This issue is was also reported in AUR (https://aur.archlinux.org/packages/pdf2htmlex/)
and in the upstream issue tracker (https://github.com/coolwanglu/pdf2htmlEX/issues/753) with
no answer until now.

The current README.md states that the project is no longer under active
development and it seems as there are currently no active maintainers
who could fix this:

* https://github.com/coolwanglu/pdf2htmlEX/commit/5d0a2239fcf6ef60a1140edb917fad69d751d6e3
* https://github.com/coolwanglu/pdf2htmlEX/issues/772
---
 pkgs/tools/typesetting/pdf2htmlEX/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index e0f3681f43d8..ad9684910c0b 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl3Plus;
     maintainers = [ maintainers.taktoa ];
     platforms   = with platforms; linux;
+    broken      = true; # 2018-09-08
   };
 }

From d02c6a56cc8af61825625943ff38e469154a91d6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 14:14:01 +0200
Subject: [PATCH 0575/3253] sks: Copy the web examples to $webSamples for the
 module

---
 pkgs/servers/sks/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index fe4029db1c14..e4f5ea1f57c9 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
   };
 
+  outputs = [ "out" "webSamples" ];
+
   buildInputs = [ ocaml zlib db perl camlp4 ];
 
   makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
@@ -26,6 +28,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "./sks unit_test";
 
+  # Copy the web examples for the NixOS module
+  postInstall = "cp -R sampleWeb $webSamples";
+
   meta = with stdenv.lib; {
     description = "An easily deployable & decentralized OpenPGP keyserver";
     longDescription = ''

From a0d3d098ffd027a4a6a0b3d7db7edd59dcfb78af Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 15:19:40 +0200
Subject: [PATCH 0576/3253] nixos/sks: Add a webroot option

The module will now, by default, serve a simple webpage via the built-in
web server (instead of displaying an error message).
---
 nixos/modules/services/security/sks.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 5e4b1a71fdd9..009b5980813f 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -53,6 +53,21 @@ in {
         type = types.ints.u16;
         description = "HKP port to listen on.";
       };
+
+      webroot = mkOption {
+        type = types.path;
+        default = "${sksPkg.webSamples}/OpenPKG";
+        defaultText = "\${pkgs.sks.webSamples}/OpenPKG";
+        description = ''
+	  Source directory (will be symlinked) for the files the built-in
+	  webserver should serve. SKS (''${pkgs.sks.webSamples}) provides the
+	  following examples: "HTML5", "OpenPKG", and "XHTML+ES". The index
+	  file can be named index.html, index.htm, index.xhtm, or index.xhtml.
+	  Files with the extensions .css, .es, .js, .jpg, .jpeg, .png, or .gif
+	  are supported. Subdirectories and filenames with anything other than
+          alphanumeric characters and the '.' character will be ignored.
+        '';
+      };
     };
   };
 
@@ -78,6 +93,7 @@ in {
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         preStart = ''
+          ln -sfT "${cfg.webroot}" web
           mkdir -p ${home}/dump
           ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
           ${sksPkg}/bin/sks cleandb || true

From a6934b2389f9e2bb55675fc93498d949adb3bb40 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 16:08:37 +0200
Subject: [PATCH 0577/3253] sks: Adapt the package to NixOS (pkgs.db provides
 only "db_stat")

---
 pkgs/servers/sks/adapt-to-nixos.patch | 27 +++++++++++++++++++++++++++
 pkgs/servers/sks/default.nix          |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/sks/adapt-to-nixos.patch

diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/servers/sks/adapt-to-nixos.patch
new file mode 100644
index 000000000000..b4403e8c7bc7
--- /dev/null
+++ b/pkgs/servers/sks/adapt-to-nixos.patch
@@ -0,0 +1,27 @@
+--- a/version.ml	2018-09-08 15:56:18.919154257 +0200
++++ b/version.ml	2018-09-08 15:56:07.544028575 +0200
+@@ -24,16 +24,6 @@
+ 
+ let run () =
+   let bdb_version = Bdb.version () in
+-  let dbstats_dir =
+-    let split = Str.regexp_string "." in
+-    let major_minor_string major minor =
+-      sprintf "Further details about the BDB environment can be seen by \
+-	  executing\ndb%s.%s_stat -x in the KDB and Ptree directories\n" major minor
+-    in
+-    match Str.split split bdb_version with
+-    | major :: minor :: _ -> major_minor_string major minor
+-    | [] | _ :: []        -> major_minor_string "X"   "Y"
+-  in
+   printf "SKS version %s%s\n"
+     Common.version Common.version_suffix;
+ 	
+@@ -44,5 +34,6 @@
+          requirement for recon of SKS %s\n"
+       Common.compatible_version_string;
+ 	
+-  printf "%s" dbstats_dir
++  printf "Further details about the BDB environment can be seen by executing\n\
++    db_stat -x in the KDB and PTree directories\n"
+ 
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index e4f5ea1f57c9..deeeabda7451 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
   };
 
+  # pkgs.db provides db_stat, not db$major.$minor_stat
+  patches = [ ./adapt-to-nixos.patch ];
+
   outputs = [ "out" "webSamples" ];
 
   buildInputs = [ ocaml zlib db perl camlp4 ];

From eb0050ca458870deb17e0bedfdf1eeda3c67bf9e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 16:10:29 +0200
Subject: [PATCH 0578/3253] nixos/sks: Use a group and don't add sks to
 systemPackages

Without a group the gid will default to 65534 (2^16 - 2) which maps to
"nogroup". IMO it makes more sense to explicitly set a valid group.

Adding pkgs.sks to environment.systemPackages is not required (IIRC we
want to avoid bloating environment.systemPackages). Instead it seems
like a better idea to make the relevant binaries available to the user
sks and enable useDefaultShell so that "su -l sks" can be used for
manual interaction (that way the files will always have the correct
owner).
---
 nixos/modules/services/security/sks.nix | 29 ++++++++++++++-----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index 009b5980813f..e285b94b170a 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -73,20 +73,22 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ sksPkg ];
-    
-    users.users.sks = {
-      createHome = true;
-      home = cfg.dataDir;
-      isSystemUser = true;
-      shell = "${pkgs.coreutils}/bin/true";
+    users = {
+      users.sks = {
+        isSystemUser = true;
+        description = "SKS user";
+        home = cfg.dataDir;
+        createHome = true;
+        group = "sks";
+        useDefaultShell = true;
+        packages = [ sksPkg pkgs.db ];
+      };
+      groups.sks = { };
     };
 
     systemd.services = let
       hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
       hkpPort = builtins.toString cfg.hkpPort;
-      home = config.users.users.sks.home;
-      user = config.users.users.sks.name;
     in {
       "sks-db" = {
         description = "SKS database server";
@@ -94,14 +96,15 @@ in {
         wantedBy = [ "multi-user.target" ];
         preStart = ''
           ln -sfT "${cfg.webroot}" web
-          mkdir -p ${home}/dump
-          ${sksPkg}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
+          mkdir -p dump
+          ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/
           ${sksPkg}/bin/sks cleandb || true
           ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
         '';
         serviceConfig = {
-          WorkingDirectory = home;
-          User = user;
+          WorkingDirectory = "~";
+          User = "sks";
+          Group = "sks";
           Restart = "always";
           ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
         };

From 16650af8c34e468cee61d6826c72cbc79eb114c2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 8 Sep 2018 10:44:02 -0400
Subject: [PATCH 0579/3253] curl: 7.61.0 -> 7.61.1

---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d42cdcd4a347..dda97d34d869 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
 assert gssSupport -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.61.0";
+  name = "curl-7.61.1";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${name}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
     ];
-    sha256 = "173ccmnnr4qcawzgn7vm0ciyzphanzghigdgavg88nyg45lk6vsz";
+    sha256 = "1f8rljpa98g7ry7qyvv6657cmvgrwmam9mdbjklv45lspiykf253";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];

From 53ef5441bb261bcb52b5ffe7cab77ba46114e7e9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 8 Sep 2018 16:45:58 +0200
Subject: [PATCH 0580/3253] nixos/sks: Make the webroot option optional

That way the built-in web server is usable by default but users can use
$HOME/web directly (instead of having to use a symlink), if they want to
customize the webpage.
---
 nixos/modules/services/security/sks.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
index e285b94b170a..9f0261038d5b 100644
--- a/nixos/modules/services/security/sks.nix
+++ b/nixos/modules/services/security/sks.nix
@@ -55,17 +55,18 @@ in {
       };
 
       webroot = mkOption {
-        type = types.path;
+        type = types.nullOr types.path;
         default = "${sksPkg.webSamples}/OpenPKG";
         defaultText = "\${pkgs.sks.webSamples}/OpenPKG";
         description = ''
-	  Source directory (will be symlinked) for the files the built-in
-	  webserver should serve. SKS (''${pkgs.sks.webSamples}) provides the
-	  following examples: "HTML5", "OpenPKG", and "XHTML+ES". The index
-	  file can be named index.html, index.htm, index.xhtm, or index.xhtml.
-	  Files with the extensions .css, .es, .js, .jpg, .jpeg, .png, or .gif
-	  are supported. Subdirectories and filenames with anything other than
-          alphanumeric characters and the '.' character will be ignored.
+          Source directory (will be symlinked, if not null) for the files the
+          built-in webserver should serve. SKS (''${pkgs.sks.webSamples})
+          provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES".
+          The index file can be named index.html, index.htm, index.xhtm, or
+          index.xhtml. Files with the extensions .css, .es, .js, .jpg, .jpeg,
+          .png, or .gif are supported. Subdirectories and filenames with
+          anything other than alphanumeric characters and the '.' character
+          will be ignored.
         '';
       };
     };
@@ -95,7 +96,8 @@ in {
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         preStart = ''
-          ln -sfT "${cfg.webroot}" web
+          ${lib.optionalString (cfg.webroot != null)
+            "ln -sfT \"${cfg.webroot}\" web"}
           mkdir -p dump
           ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/
           ${sksPkg}/bin/sks cleandb || true

From 91ddedf4a00031802ebaa6fb2da2fced9e2e1b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:26:43 -0300
Subject: [PATCH 0581/3253] deepin-sound-theme: init at 15.10.3

---
 .../deepin/deepin-sound-theme/default.nix     | 23 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-sound-theme/default.nix

diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
new file mode 100644
index 000000000000..f12419a615b3
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "deepin-sound-theme-${version}";
+  version = "15.10.3";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "deepin-sound-theme";
+    rev = version;
+    sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Deepin sound theme";
+    homepage = https://github.com/linuxdeepin/deepin-sound-theme;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index c1438012ef51..50d777492839 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -10,6 +10,7 @@ let
     deepin-menu = callPackage ./deepin-menu { };
     deepin-mutter = callPackage ./deepin-mutter { };
     deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
+    deepin-sound-theme = callPackage ./deepin-sound-theme { };
     deepin-terminal = callPackage ./deepin-terminal {
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;

From 2c7c248a534bab9f9f6adbfb1e4c31934574d2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:30:30 -0300
Subject: [PATCH 0582/3253] go-gir-generator: init at 1.0.4

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/go-gir-generator/default.nix       | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/deepin/go-gir-generator/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 50d777492839..dff959bd9b08 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -17,6 +17,7 @@ let
     };
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
+    go-gir-generator = callPackage ./go-gir-generator { };
     qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
     qt5integration = callPackage ./qt5integration { };
 
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
new file mode 100644
index 000000000000..cc05f6f055b0
--- /dev/null
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "go-gir-generator";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    go
+  ];
+
+  buildInputs = [
+    gobjectIntrospection
+    libgudev
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "HOME=$(TMP)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Generate static golang bindings for GObject";
+    homepage = https://github.com/linuxdeepin/go-gir-generator;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From a36e9a415c5e575c044175c0d7f0f6f7d41efa16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:32:00 -0300
Subject: [PATCH 0583/3253] go-lib: init at 1.2.16.1

---
 pkgs/desktops/deepin/default.nix        |  1 +
 pkgs/desktops/deepin/go-lib/default.nix | 34 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/desktops/deepin/go-lib/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index dff959bd9b08..4aa5e6c3bbb8 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -18,6 +18,7 @@ let
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
     go-gir-generator = callPackage ./go-gir-generator { };
+    go-lib = callPackage ./go-lib { };
     qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
     qt5integration = callPackage ./qt5integration { };
 
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
new file mode 100644
index 000000000000..44de8889df28
--- /dev/null
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
+  mobile-broadband-provider-info
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "go-lib";
+  version = "1.2.16.1";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q";
+  };
+
+  buildInputs = [
+    glib
+    xorg.libX11
+    gdk_pixbuf
+    pulseaudio
+    mobile-broadband-provider-info
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Go bindings for Deepin Desktop Environment development";
+    homepage = https://github.com/linuxdeepin/go-lib;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From 3f28e941e490c605d427342f0d85e0f7e3a0f2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:33:13 -0300
Subject: [PATCH 0584/3253] go-dbus-generator: init at 0.6.6

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/go-dbus-generator/default.nix      | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/desktops/deepin/go-dbus-generator/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4aa5e6c3bbb8..3a9a2e24b062 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -17,6 +17,7 @@ let
     };
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
+    go-dbus-generator = callPackage ./go-dbus-generator { };
     go-gir-generator = callPackage ./go-gir-generator { };
     go-lib = callPackage ./go-lib { };
     qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
new file mode 100644
index 000000000000..2933c58f8d95
--- /dev/null
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, go, go-lib }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "go-dbus-generator";
+  version = "0.6.6";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb";
+  };
+
+  nativeBuildInputs = [
+    go
+    go-lib
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "GOPATH=$(GGOPATH):${go-lib}/share/gocode"
+    "HOME=$(TMP)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Convert dbus interfaces to go-lang or qml wrapper code";
+    homepage = https://github.com/linuxdeepin/go-dbus-generator;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From c1d1207463d5894e17cc32c584eacea56faeaa97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:35:45 -0300
Subject: [PATCH 0585/3253] go-dbus-factory: init at 0.0.7.1

---
 pkgs/desktops/deepin/default.nix              |  1 +
 .../deepin/go-dbus-factory/default.nix        | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/desktops/deepin/go-dbus-factory/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 3a9a2e24b062..1d52038cdd92 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -17,6 +17,7 @@ let
     };
     dtkcore = callPackage ./dtkcore { };
     dtkwidget = callPackage ./dtkwidget { };
+    go-dbus-factory = callPackage ./go-dbus-factory { };
     go-dbus-generator = callPackage ./go-dbus-generator { };
     go-gir-generator = callPackage ./go-gir-generator { };
     go-lib = callPackage ./go-lib { };
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
new file mode 100644
index 000000000000..a488bd7202cb
--- /dev/null
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "go-dbus-factory";
+  version = "0.0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "GoLang DBus factory for the Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/go-dbus-factory;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From 2c57a6a70450009489ce2efd97e3fc764a9e081f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 8 Sep 2018 12:36:43 -0300
Subject: [PATCH 0586/3253] dbus-factory: init at 3.1.17

---
 pkgs/desktops/deepin/dbus-factory/default.nix | 30 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dbus-factory/default.nix

diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
new file mode 100644
index 000000000000..66d28cbcaf3e
--- /dev/null
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dbus-factory";
+  version = "3.1.17";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256";
+  };
+
+  nativeBuildInputs = [
+    jq
+    libxml2
+    go-dbus-generator
+  ];
+
+  makeFlags = [ "GOPATH=$(out)/share/gocode" ];
+
+  meta = with stdenv.lib; {
+    description = "Generates static DBus bindings for Golang and QML at build-time";
+    homepage = https://github.com/linuxdeepin/dbus-factory;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 1d52038cdd92..49da151eefee 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -3,6 +3,7 @@
 let
   packages = self: with self; {
 
+    dbus-factory = callPackage ./dbus-factory { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };

From bda4992564e03f7645506700e178af09dcc2c40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sat, 8 Sep 2018 18:14:53 +0200
Subject: [PATCH 0587/3253] treewide: Fix variables in homepages

---
 pkgs/data/fonts/medio/default.nix    | 2 +-
 pkgs/data/fonts/penna/default.nix    | 2 +-
 pkgs/data/fonts/route159/default.nix | 2 +-
 pkgs/data/fonts/seshat/default.nix   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix
index 8b484b3b5efd..aa805b6f0825 100644
--- a/pkgs/data/fonts/medio/default.nix
+++ b/pkgs/data/fonts/medio/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dotcolon.net/font/{pname}/";
+    homepage = "http://dotcolon.net/font/${pname}/";
     description = "Serif font designed by Sora Sagano";
     longDescription = ''
       Medio is a serif font designed by Sora Sagano, based roughly
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix
index 893553a62ce2..b1244c47bf1b 100644
--- a/pkgs/data/fonts/penna/default.nix
+++ b/pkgs/data/fonts/penna/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dotcolon.net/font/{pname}/";
+    homepage = "http://dotcolon.net/font/${pname}/";
     description = "Geometric sans serif designed by Sora Sagano";
     longDescription = ''
      Penna is a geometric sans serif designed by Sora Sagano,
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix
index 7e2480a77dc5..892078a1151b 100644
--- a/pkgs/data/fonts/route159/default.nix
+++ b/pkgs/data/fonts/route159/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dotcolon.net/font/{pname}/";
+    homepage = "http://dotcolon.net/font/${pname}/";
     description = "A weighted sans serif font";
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars ];
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix
index 36e4f2fa10ff..6b22716f1ebb 100644
--- a/pkgs/data/fonts/seshat/default.nix
+++ b/pkgs/data/fonts/seshat/default.nix
@@ -18,7 +18,7 @@ fetchzip rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dotcolon.net/font/{pname}/";
+    homepage = "http://dotcolon.net/font/${pname}/";
     description = "Roman body font designed for main text by Sora Sagano";
     longDescription = ''
       Seshat is a Roman body font designed for the main text. By

From 9ef77854f7f304aa941444e929e70e1e4465bbc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sat, 8 Sep 2018 18:30:00 +0200
Subject: [PATCH 0588/3253] treewide: Use http/https for homepages

---
 pkgs/development/coq-modules/QuickChick/default.nix      | 2 +-
 pkgs/development/coq-modules/category-theory/default.nix | 2 +-
 pkgs/development/coq-modules/coq-haskell/default.nix     | 2 +-
 pkgs/development/python-modules/urlgrabber/default.nix   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 35cf63af8627..fc88a1c33eed 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = git://github.com/QuickChick/QuickChick.git;
+    homepage = https://github.com/QuickChick/QuickChick;
     description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 795c177bc80d..c707fcdbd6be 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = git://github.com/jwiegley/category-theory.git;
+    homepage = https://github.com/jwiegley/category-theory;
     description = "A formalization of category theory in Coq for personal study and practical work";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index a66e941a8c9c..9d9a4cb5f1a1 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = git://github.com/jwiegley/coq-haskell.git;
+    homepage = https://github.com/jwiegley/coq-haskell;
     description = "A library for formalizing Haskell types and functions in Coq";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index f399f4d426ee..528846d72381 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pycurl ];
 
   meta = with stdenv.lib; {
-    homepage = "urlgrabber.baseurl.org";
+    homepage = http://urlgrabber.baseurl.org;
     license = licenses.lgpl2Plus;
     description = "Python module for downloading files";
     maintainers = with maintainers; [ qknight ];

From 9c97f37761a5eaa7387aabcd2c3cc631a2b712a3 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sat, 8 Sep 2018 12:12:11 -0500
Subject: [PATCH 0589/3253] nixos/zeronet: Fix TOR permissions, add torAlways
 option

---
 nixos/modules/services/networking/zeronet.nix | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index 2377cb2c8f11..8b60799891ca 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -12,6 +12,8 @@ let
       log_dir = ${cfg.logDir}
     '' + lib.optionalString (cfg.port != null) ''
       ui_port = ${toString cfg.port}
+    '' + lib.optionalString (cfg.torAlways) ''
+      tor = always
     '' + cfg.extraConfig;
   };
 in with lib; {
@@ -35,11 +37,17 @@ in with lib; {
     port = mkOption {
       type = types.nullOr types.int;
       default = null;
-      example = 15441;
-      description = "Optional zeronet port.";
+      example = 43110;
+      description = "Optional zeronet web UI port.";
     };
 
     tor = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Use TOR for zeronet traffic where possible.";
+    };
+
+    torAlways = mkOption {
       type = types.bool;
       default = false;
       description = "Use TOR for all zeronet traffic.";
@@ -60,9 +68,13 @@ in with lib; {
     services.tor = mkIf cfg.tor {
       enable = true;
       controlPort = 9051;
-      extraConfig = "CookieAuthentication 1";
+      extraConfig = ''
+        CacheDirectoryGroupReadable 1
+        CookieAuthentication 1
+        CookieAuthFileGroupReadable 1
+      '';
     };
-    
+
     systemd.services.zeronet = {
       description = "zeronet";
       after = [ "network.target" (optionalString cfg.tor "tor.service") ];

From 4f6c4030dc36c25f3c51e9bdd43fa4bc76724d14 Mon Sep 17 00:00:00 2001
From: countingsort <niclas@countingsort.com>
Date: Sat, 8 Sep 2018 19:44:25 +0200
Subject: [PATCH 0590/3253] bunny: 1.1 -> 1.2

---
 pkgs/tools/package-management/bunny/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index c73f3fb524cd..623c7a5b2f6b 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bunny-${version}";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitLab {
     owner = "tim241";
     repo = "bunny";
     rev = version;
-    sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki";
+    sha256 = "13qsgv4n4c96pgm2l5kvwxpk97x2jpk3wp2m56vdj07hcgywgj3h";
   };
 
   dontBuild = true;

From 4795c2a23afab62618dd2a7ab38866515e2c0ae9 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 18:42:18 +0200
Subject: [PATCH 0591/3253] darwin.maloader: mark as broken

no successfull build in Hydra history back to 2017-08-21
---
 pkgs/os-specific/darwin/maloader/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix
index 133266ec95aa..d1df820615df 100644
--- a/pkgs/os-specific/darwin/maloader/default.nix
+++ b/pkgs/os-specific/darwin/maloader/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation {
     homepage = https://github.com/shinh/maloader;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # 2018-09-08, no succesful build since 2017-08-21
   };
 }

From 4c2388dee3939f229379feb5adba18c619f3d91b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 19:08:18 +0200
Subject: [PATCH 0592/3253] clasp-common-lisp: mark as broken

no successful hydra build since 2018-01-03
---
 pkgs/development/compilers/clasp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 6ff2028e3c16..2c260e110d60 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
     homepage = "https://github.com/drmeister/clasp";
+    broken = true; # 2018-09-08, no successful build since 2018-01-03
   };
 }

From 15fedb51b347cab71a312ea6ad5e09d835178957 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 8 Sep 2018 19:14:46 +0200
Subject: [PATCH 0593/3253] frab: mark as broken

No successful hydra build since 2018-02-14.
The build fails in the ruby gem json-1.8.3, which we cannot
mark directly as broken in nixpkgs, so we mark this as broken.
---
 pkgs/servers/web-apps/frab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix
index 657bd423f3f4..d6a5128b8130 100644
--- a/pkgs/servers/web-apps/frab/default.nix
+++ b/pkgs/servers/web-apps/frab/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     description = "Web-based conference planning and management system";
     homepage = https://github.com/frab/frab;
     license = licenses.mit;
+    broken = true; # 2018-09-08; no successful hydra build since 2018-02-14
   };
 }

From cb380983ed941e5e40fa7423c26f363636a42233 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 8 Sep 2018 13:29:54 -0400
Subject: [PATCH 0594/3253] qt5.qtwebkit: Fixes modules src being subtly
 broken.

b785d4813e5d0f428b9563b3cea7cc6953fc24db introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
---
 .../libraries/qt-5/5.11/default.nix           | 23 +++++++++++--------
 .../libraries/qt-5/modules/qtwebkit.nix       |  5 ----
 pkgs/development/libraries/qt-5/qtModule.nix  |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 2a706fc7b6e8..d65fe9d219c0 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -34,7 +34,18 @@ let
   qtCompatVersion = "5.11";
 
   mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
+    # Community port of the now unmaintained upstream qtwebkit.
+    qtwebkit = {
+      src = fetchFromGitHub {
+        owner = "annulen";
+        repo = "webkit";
+        rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
+        sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
+      };
+      version = "5.212-alpha-01-26-2018";
+    };
+  };
 
   patches = {
     qtbase = [
@@ -102,15 +113,7 @@ let
       qtwayland = callPackage ../modules/qtwayland.nix {};
       qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
       qtwebengine = callPackage ../modules/qtwebengine.nix {};
-      qtwebkit = callPackage ../modules/qtwebkit.nix {
-        src = fetchFromGitHub {
-          owner = "annulen";
-          repo = "webkit";
-          rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
-          sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
-        };
-        version = "5.212-alpha-01-26-2018";
-      };
+      qtwebkit = callPackage ../modules/qtwebkit.nix {};
       qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
       qtx11extras = callPackage ../modules/qtx11extras.nix {};
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 833433fabeca..970ee2e5c807 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -5,8 +5,6 @@
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
 , darwin
 , flashplayerFix ? false
-, src ? null
-, version ? null
 }:
 
 let
@@ -35,9 +33,6 @@ qtModule {
 
   cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ];
 
-  inherit src;
-  inherit version;
-
   __impureHostDeps = optionals (stdenv.isDarwin) [
     "/usr/lib/libicucore.dylib"
   ];
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index e18564aaabe2..84a9d30918b1 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,7 +8,7 @@ args:
 
 let
   inherit (args) name;
-  version = if (args.version or null) == null then srcs."${name}".version else args.version;
+  version = args.version or srcs."${name}".version;
   src = args.src or srcs."${name}".src;
 in
 

From 39ed38f017b285af1b74f6ba58d218a476ea490f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 8 Sep 2018 20:24:31 +0200
Subject: [PATCH 0595/3253] sequeler: 0.6.0 -> 0.6.1

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.1
---
 pkgs/applications/misc/sequeler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index cc676bb28e2e..ba4984a0f155 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  version = "0.6.0";
+  version = "0.6.1";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai";
+    sha256 = "1gafd8bmwpby7gjzfr7q25rrdmyh1f175fxc1yrcr5nplfyzwfnb";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];

From 8c6cf3de3d1d448ba17b5d0433068862d7f6efc9 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 8 Sep 2018 21:24:15 +0200
Subject: [PATCH 0596/3253] cryptsetup: enable and fix tests (#46346)

Some tests use O_DIRECT which is filesystem dependent and fails in a
sandbox as well as on some filesystems without sandboxing.
Patch out O_DIRECT and disable the 4 test cases that still fail in a
sandbox. See discussion in #46151.
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 10 ++++++++++
 .../cryptsetup/disable-failing-tests.patch    | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 178fc7d91408..2b5c3817ddf7 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -14,8 +14,16 @@ stdenv.mkDerivation rec {
     sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx";
   };
 
+  # Disable 4 test cases that fail in a sandbox
+  patches = [ ./disable-failing-tests.patch ];
+
   postPatch = ''
     patchShebangs tests
+
+    # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs)
+    # and on several filesystem types (btrfs, zfs) without sandboxing.
+    # Remove it, see discussion in #46151
+    substituteInPlace tests/unit-utils-io.c --replace "| O_DIRECT" ""
   '';
 
   NIX_LDFLAGS = "-lgcc_s";
@@ -30,6 +38,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ lvm2 json_c openssl libuuid popt ]
     ++ stdenv.lib.optional enablePython python2;
 
+  doCheck = true;
+
   meta = {
     homepage = https://gitlab.com/cryptsetup/cryptsetup/;
     description = "LUKS for dm-crypt";
diff --git a/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
new file mode 100644
index 000000000000..1504bf3e1511
--- /dev/null
+++ b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch
@@ -0,0 +1,19 @@
+diff -ur a/tests/blockwise-compat b/tests/blockwise-compat
+--- a/tests/blockwise-compat	2018-09-08 12:23:11.706555098 +0200
++++ b/tests/blockwise-compat	2018-09-08 12:24:24.444393460 +0200
+@@ -148,15 +148,11 @@
+ 	# device/file fn_name length
+ 	RUN "P" $1 read_buffer $BSIZE
+ 	RUN "P" $1 read_buffer $((2*BSIZE))
+-	RUN "F" $1 read_buffer $((BSIZE-1))
+-	RUN "F" $1 read_buffer $((BSIZE+1))
+ 	RUN "P" $1 read_buffer 0
+ 
+ 	RUN "P" $1 write_buffer $BSIZE
+ 	RUN "P" $1 write_buffer $((2*BSIZE))
+ 
+-	RUN "F" $1 write_buffer $((BSIZE-1))
+-	RUN "F" $1 write_buffer $((BSIZE+1))
+ 	RUN "F" $1 write_buffer 0
+ 
+ 	# basic blockwise functions

From 73e75a7d165abd693d6c6c900abd919827939b24 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Sat, 8 Sep 2018 21:32:04 +0200
Subject: [PATCH 0597/3253] pythonPackages.confluent-kafka: fix build (#46380)

cc #45960
---
 pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index 0638ea3a36d2..a0183e4595c4 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}:
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}:
 
 buildPythonPackage rec {
   version = "0.11.5";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f";
   };
 
-  buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
+  buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ;
 
   # Tests fail for python3 under this pypi release
   doCheck = if isPy3k then false else true;

From 113f4d7b445e90b17a636584bbda40155baa3409 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 8 Sep 2018 21:35:33 +0200
Subject: [PATCH 0598/3253] pythonPackages.persistent: fix build (#46364)

Documentation-related tests failed, the docs didn't build correctly
because of missing dependencies sphinx and manuel. Add them.
---
 pkgs/development/python-modules/persistent/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix
index 542a68728af1..721385f3ed6a 100644
--- a/pkgs/development/python-modules/persistent/default.nix
+++ b/pkgs/development/python-modules/persistent/default.nix
@@ -1,12 +1,14 @@
 { buildPythonPackage
 , fetchPypi
 , zope_interface
+, sphinx, manuel
 }:
 
 buildPythonPackage rec {
   pname = "persistent";
   version = "4.4.2";
 
+  nativeBuildInputs = [ sphinx manuel ];
   propagatedBuildInputs = [ zope_interface ];
 
   src = fetchPypi {

From b19cdc31c12ee262b9892f2f60903483bf5a7f31 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Sat, 8 Sep 2018 13:13:23 -0700
Subject: [PATCH 0599/3253] vkquake: fix build

---
 pkgs/games/quakespasm/vulkan.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 2cf09e2ec938..6f69c6469503 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -1,4 +1,5 @@
-{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }:
+{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }:
+
 stdenv.mkDerivation rec {
   name = "vkquake-${version}";
   majorVersion = "1.00";
@@ -13,8 +14,12 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/Quake";
 
+  nativeBuildInputs = [
+    makeWrapper vulkan-headers
+  ];
+
   buildInputs = [
-    makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev
+    gzip SDL2 libvorbis libmad vulkan-loader
   ];
 
   buildFlags = [ "DO_USERDIRS=1" ];

From 0b2b7b2d537ddc988cae617e33918e1c73a23c13 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Thu, 12 Apr 2018 15:32:14 -0700
Subject: [PATCH 0600/3253] steamcmd: init at 20180104

---
 pkgs/games/steam/default.nix    |  1 +
 pkgs/games/steam/steamcmd.nix   | 46 +++++++++++++++++++++++++++++++++
 pkgs/games/steam/steamcmd.sh    | 24 +++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 4 files changed, 73 insertions(+)
 create mode 100644 pkgs/games/steam/steamcmd.nix
 create mode 100644 pkgs/games/steam/steamcmd.sh

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index e8a911bebd5e..5aab54b83221 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -19,6 +19,7 @@ let
         then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
         else null;
     };
+    steamcmd = callPackage ./steamcmd.nix { };
   };
 
 in self
diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix
new file mode 100644
index 000000000000..6a2c7fe01b4f
--- /dev/null
+++ b/pkgs/games/steam/steamcmd.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, steam-run, bash
+, steamRoot ? "~/.local/share/Steam"
+}:
+
+stdenv.mkDerivation rec {
+  name = "steamcmd-${version}";
+  version = "20180104"; # According to steamcmd_linux.tar.gz mtime
+
+  src = fetchurl {
+    url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz;
+    sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf";
+  };
+
+  # The source tarball does not have a single top-level directory.
+  preUnpack = ''
+    mkdir $name
+    cd $name
+    sourceRoot=.
+  '';
+
+  buildInputs = [ bash steam-run ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/steamcmd/linux32
+    install -Dm755 steamcmd.sh $out/share/steamcmd/steamcmd.sh
+    install -Dm755 linux32/* $out/share/steamcmd/linux32
+
+    mkdir -p $out/bin
+    substitute ${./steamcmd.sh} $out/bin/steamcmd \
+      --subst-var shell \
+      --subst-var out \
+      --subst-var-by steamRoot "${steamRoot}" \
+      --subst-var-by steamRun ${steam-run}
+    chmod 0755 $out/bin/steamcmd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Steam command-line tools";
+    homepage = "https://developer.valvesoftware.com/wiki/SteamCMD";
+    platforms = platforms.linux;
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ tadfisher ];
+  };
+}
diff --git a/pkgs/games/steam/steamcmd.sh b/pkgs/games/steam/steamcmd.sh
new file mode 100644
index 000000000000..e092a4fedbe9
--- /dev/null
+++ b/pkgs/games/steam/steamcmd.sh
@@ -0,0 +1,24 @@
+#!@bash@/bin/bash -e
+
+# Always run steamcmd in the user's Steam root.
+STEAMROOT=@steamRoot@
+
+# Create a facsimile Steam root if it doesn't exist.
+if [ ! -e "$STEAMROOT" ]; then
+  mkdir -p "$STEAMROOT"/{appcache,config,logs,Steamapps/common}
+  mkdir -p ~/.steam
+  ln -sf "$STEAMROOT" ~/.steam/root
+  ln -sf "$STEAMROOT" ~/.steam/steam
+fi
+
+# Copy the system steamcmd install to the Steam root. If we don't do
+# this, steamcmd assumes the path to `steamcmd` is the Steam root.
+# Note that symlinks don't work here.
+if [ ! -e "$STEAMROOT/steamcmd.sh" ]; then
+  mkdir -p "$STEAMROOT/linux32"
+  # steamcmd.sh will replace these on first use
+  cp @out@/share/steamcmd/steamcmd.sh "$STEAMROOT/."
+  cp @out@/share/steamcmd/linux32/* "$STEAMROOT/linux32/."
+fi
+
+@steamRun@/bin/steam-run "$STEAMROOT/steamcmd.sh" "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3cb6069caf8..7aefe4edd667 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20210,6 +20210,8 @@ with pkgs;
     nativeOnly = true;
   }).run;
 
+  steamcmd = steamPackages.steamcmd;
+
   linux-steam-integration = callPackage ../games/linux-steam-integration {
     gtk = pkgs.gtk3;
   };

From 50ea36953e324b1dd4af4baea6e7712afb5c6745 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 8 Sep 2018 23:12:22 +0200
Subject: [PATCH 0601/3253] testssl: 2.9.5-5 -> 2.9.5-6

Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-6
---
 pkgs/applications/networking/testssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 5a548d5ff65f..cc0cffb6e3b3 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -2,7 +2,7 @@
 , dnsutils, coreutils, openssl, nettools, utillinux, procps }:
 
 let
-  version = "2.9.5-5";
+  version = "2.9.5-6";
 
 in stdenv.mkDerivation rec {
   name = "testssl.sh-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "drwetter";
     repo = "testssl.sh";
     rev = "v${version}";
-    sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r";
+    sha256 = "0wn7lxz0ibv59v0acbsk5z3rsmr65zr1q7n4kxva1cw5xzq9ya6k";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7a5b42161f59d7398d1f88af10c178ce592ff387 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 02:36:31 +0200
Subject: [PATCH 0602/3253] slurm: 17.11.9-2 -> 18.08.0-1

---
 pkgs/servers/computing/slurm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index a191d7a721d5..ba0e57bb2be8 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "slurm-${version}";
-  version = "17.11.9-2";
+  version = "18.08.0-1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${builtins.replaceStrings ["."] ["-"] name}";
-    sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy";
+    sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq";
   };
 
   outputs = [ "out" "dev" ];

From 0051772890908ec8323d4fe1c4ffdb8498f3b759 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 2 Sep 2018 02:37:29 +0200
Subject: [PATCH 0603/3253] nixos/slurm: add option clusterName

slurm 18.08 requires ClusterName to be set
(set to default).
---
 nixos/modules/services/computing/slurm/slurm.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 1e1c5bc9f035..09174ed39f5e 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -8,6 +8,7 @@ let
   # configuration file can be generated by http://slurm.schedmd.com/configurator.html
   configFile = pkgs.writeTextDir "slurm.conf"
     ''
+      ClusterName=${cfg.clusterName}
       ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
       ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
       ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
@@ -105,6 +106,15 @@ in
         '';
       };
 
+      clusterName = mkOption {
+        type = types.str;
+        default = "default";
+        example = "myCluster";
+        description = ''
+          Necessary to distinguish accounting records in a multi-cluster environment.
+        '';
+      };
+
       nodeName = mkOption {
         type = types.nullOr types.str;
         default = null;

From 7dd2f4ec9c5e4c5b53f912554cb899dbacae6f10 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 8 Sep 2018 23:16:37 +0200
Subject: [PATCH 0604/3253] pyslurm: 20180811 -> 20180908

---
 pkgs/development/python-modules/pyslurm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 24704bd8f309..f004ab1054dd 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20180811";
+  version = "20180908";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "2d4f0553de971309b7e465d4d64528b8a5fafb05";
-    sha256 = "1cy57gyvvmzx0c8fx4h6p8dgan0ay6pdivdf24k1xiancjnw20xr";
+    rev = "50dc113e99d82e70e84fc2e812333733708be4ed";
+    sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k";
   };
 
   buildInputs = [ cython slurm ];

From 9110f768cf4069348e8025e1fb45ce43a62ab39a Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sat, 8 Sep 2018 21:12:44 +0100
Subject: [PATCH 0605/3253] pyre: 0.9.0 -> 0.11.0

---
 pkgs/development/tools/pyre/default.nix       | 80 ++++++++++++++++---
 .../tools/pyre/pyre-bdist-wheel.patch         | 43 ++++++++++
 2 files changed, 113 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/pyre/pyre-bdist-wheel.patch

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index 1d7f8025bb0e..a62310878ba2 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript }:
+{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
+, jbuilder, python3, rsync, fetchpatch }:
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
-  version = "0.0.10";
+  pyre-version = "0.0.11";
   versionFile = writeScript "version.ml" ''
     cat > "./version.ml" <<EOF
+    open Core
     let build_info () =
-    "pyre-nixpkgs ${version}"
+    "pyre-nixpkgs ${pyre-version}"
     let version () =
-    "${version}"
+    "${pyre-version}"
+
+    let log_version_banner () =
+      Log.info "Running as pid: %d" (Pid.to_int (Unix.getpid ()));
+      Log.info "Version: %s" (version ());
     EOF
   '';
-in stdenv.mkDerivation {
-  name = "pyre-${version}";
+ pyre-bin = stdenv.mkDerivation {
+  name = "pyre-${pyre-version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "pyre-check";
-    rev = "v${version}";
-    sha256 = "17fk2izq434jsr8dfz828754356qdwa6zv0lbzm6z1kgq4jg7brv";
+    rev = "v${pyre-version}";
+    sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -33,6 +39,8 @@ in stdenv.mkDerivation {
     ppx_deriving_yojson
     ocamlbuild
     ppxlib
+    jbuilder
+    ounit
     # python36Packages.python36Full # TODO
   ];
 
@@ -41,13 +49,15 @@ in stdenv.mkDerivation {
     export HOME=.
 
     # "external" because https://github.com/facebook/pyre-check/pull/8/files
-    sed "s/%VERSION%/external ${version}/" Makefile.template > Makefile
+    sed "s/%VERSION%/external ${pyre-version}/" Makefile.template > Makefile
+    sed "s/%VERSION%/external/" dune.in > dune
 
     cp ${versionFile} ./scripts/generate-version-number.sh
 
     mkdir $(pwd)/build
     export OCAMLFIND_DESTDIR=$(pwd)/build
     export OCAMLPATH=$OCAMLPATH:$(pwd)/build
+
     make release
   '';
 
@@ -60,7 +70,7 @@ in stdenv.mkDerivation {
   # Improvement for a future version.
   installPhase = ''
     mkdir -p $out/bin
-    cp _build/all/main.native $out/bin/pyre.bin
+    cp ./_build/default/main.exe $out/bin/pyre.bin
   '';
 
   meta = with stdenv.lib; {
@@ -70,4 +80,54 @@ in stdenv.mkDerivation {
     platforms = with platforms; linux;
     maintainers = with maintainers; [ teh ];
   };
+};
+typeshed = stdenv.mkDerivation {
+  name = "typeshed";
+  # typeshed doesn't have versions, it seems to be synchronized with
+  # mypy relases. I'm assigning a random version here (same as pyre).
+  version = pyre-version;
+  src = fetchFromGitHub {
+    owner = "python";
+    repo = "typeshed";
+    rev = "a08c6ea";
+    sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk";
+  };
+  phases = [ "unpackPhase" "installPhase" ];
+  installPhase = "cp -r $src $out";
+};
+in python3.pkgs.buildPythonApplication rec {
+  pname = "pyre-check";
+  version = pyre-version;
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "pyre-check";
+    rev = "v${pyre-version}";
+    sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l";
+  };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch";
+      sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy";
+    })
+    ./pyre-bdist-wheel.patch
+  ];
+
+  # The build-pypi-package script does some funky stuff with build
+  # directories - easier to patch it a bit than to replace it
+  # completely though:
+  postPatch = ''
+    mkdir ./build
+    substituteInPlace scripts/build-pypi-package.sh \
+        --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \
+        --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build"
+  '';
+
+  buildInputs = [ pyre-bin rsync ];
+  propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ];
+  buildPhase = ''
+    bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed}
+    cp -r build/dist dist
+  '';
+
+  doCheck = false; # can't open file 'nix_run_setup':
 }
diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
new file mode 100644
index 000000000000..1b6fea024e03
--- /dev/null
+++ b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch
@@ -0,0 +1,43 @@
+diff --git a/scripts/build-pypi-package.sh b/scripts/build-pypi-package.sh
+index 1035591..bb8cbae 100755
+--- a/scripts/build-pypi-package.sh
++++ b/scripts/build-pypi-package.sh
+@@ -98,7 +98,7 @@ rsync -avm --filter='- tests/' --filter='+ */' --filter='-! *.py' "${SCRIPTS_DIR
+ sed -i -e "/__version__/s/= \".*\"/= \"${PACKAGE_VERSION}\"/" "${BUILD_ROOT}/${MODULE_NAME}/version.py"
+ 
+ # Copy binary files.
+-BINARY_FILE="${SCRIPTS_DIRECTORY}/../_build/default/main.exe"
++BINARY_FILE="NIX_BINARY_FILE"
+ if [[ ! -f "${BINARY_FILE}" ]]; then
+   echo "The binary file ${BINARY_FILE} does not exist."
+   echo "Have you run 'make' in the toplevel directory?"
+@@ -146,7 +146,7 @@ def find_typeshed_files(base):
+         result.append((target, files))
+     return result
+ 
+-with open('README.md') as f:
++with open('README.md', encoding='utf8') as f:
+     long_description = f.read()
+ 
+ setup(
+@@ -205,20 +205,3 @@ fi
+ 
+ # Build.
+ python3 setup.py bdist_wheel
+-
+-# Move artifact outside the build directory.
+-mkdir -p "${SCRIPTS_DIRECTORY}/dist"
+-files_count="$(find "${BUILD_ROOT}/dist/" -type f | wc -l | tr -d ' ')"
+-[[ "${files_count}" == '1' ]] || \
+-  die "${files_count} files created in ${BUILD_ROOT}/dist, but only one was expected"
+-source_file="$(find "${BUILD_ROOT}/dist/" -type f)"
+-destination="$(basename "${source_file}")"
+-destination="${destination/%-any.whl/-${WHEEL_DISTRIBUTION_PLATFORM}.whl}"
+-mv "${source_file}" "${SCRIPTS_DIRECTORY}/dist/${destination}"
+-
+-# Cleanup.
+-cd "${SCRIPTS_DIRECTORY}"
+-rm -rf "${BUILD_ROOT}"
+-
+-printf '\nAll done. Build artifact available at:\n  %s\n' "${SCRIPTS_DIRECTORY}/dist/${destination}"
+-exit 0

From fe0b5273cc9add01d97bfb5f35266f3027fd975d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 21:49:06 +0000
Subject: [PATCH 0606/3253] nixos/release.nix: make `makeNetboot` more like
 `makeIso`

---
 nixos/release.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0fd8d694641f..167f2bca6b5a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -95,16 +95,19 @@ let
 
   buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix {
     inherit system;
-    modules = [ module versionModule ] ++ singleton
+    modules = [ configuration module versionModule ] ++ singleton
       ({ ... }:
       { fileSystems."/".device  = mkDefault "/dev/sda1";
         boot.loader.grub.device = mkDefault "/dev/sda";
       });
   }).config));
 
-  makeNetboot = config:
+  makeNetboot = { module, system, ... }:
     let
-      configEvaled = import lib/eval-config.nix config;
+      configEvaled = import lib/eval-config.nix {
+        inherit system;
+        modules = [ module versionModule ];
+      };
       build = configEvaled.config.system.build;
       kernelTarget = configEvaled.pkgs.stdenv.hostPlatform.platform.kernelTarget;
     in
@@ -139,11 +142,8 @@ in rec {
   initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk);
 
   netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot {
+    module = ./modules/installer/netboot/netboot-minimal.nix;
     inherit system;
-    modules = [
-      ./modules/installer/netboot/netboot-minimal.nix
-      versionModule
-    ];
   });
 
   iso_minimal = forAllSystems (system: makeIso {

From c3593f359950f7013b163ed9d41e75fc79d39c3a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 21:49:08 +0000
Subject: [PATCH 0607/3253] nixos/release.nix: import lib once

---
 nixos/release.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 167f2bca6b5a..890ef73bb2c4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,10 +1,11 @@
-{ nixpkgs ? { outPath = (import ../lib).cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
+with import ../lib;
+
+{ nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
 , stableBranch ? false
 , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
 }:
 
 with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };
-with import ../lib;
 
 let
 

From 4e5e240770ac2ccecccded59187202137b0c2177 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 21:49:12 +0000
Subject: [PATCH 0608/3253] nixos/release.nix: add `configuration` parameter

---
 nixos/release.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 890ef73bb2c4..8032e0a88a83 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -3,6 +3,7 @@ with import ../lib;
 { nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
 , stableBranch ? false
 , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
+, configuration ? {}
 }:
 
 with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; };
@@ -52,7 +53,7 @@ let
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
-      modules = [ module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
+      modules = [ configuration module versionModule { isoImage.isoBaseName = "nixos-${type}"; } ];
     }).config.system.build.isoImage);
 
 
@@ -63,7 +64,7 @@ let
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
-      modules = [ module versionModule ];
+      modules = [ configuration module versionModule ];
     }).config.system.build.sdImage);
 
 
@@ -76,7 +77,7 @@ let
 
       config = (import lib/eval-config.nix {
         inherit system;
-        modules = [ module versionModule ];
+        modules = [ configuration module versionModule ];
       }).config;
 
       tarball = config.system.build.tarball;

From fb0e0dcbc65a7b54bcf98b37b16b06412f0b042f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 8 Sep 2018 16:38:51 -0500
Subject: [PATCH 0609/3253] xdg/mime.nix: ensure $out/share/mime/packages
 exists

For update-mime-database to work, you must have to have some mime
packages installed. In some DEs like XFCE this is not guaranteed to
happen. In that case just skip the update-mime-database call.

Fixes #46162
---
 nixos/modules/config/xdg/mime.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index f1b672234a34..eb8ac2a54ace 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -23,7 +23,7 @@ with lib;
     ];
 
     environment.extraSetup = ''
-      if [ -w $out/share/mime ]; then
+      if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
         XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
       fi
 

From b23f6a37146aaf7f87788658594585a391da86ce Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 21:43:42 +0000
Subject: [PATCH 0610/3253] nixos: xdg: fix indent and eol spaces

---
 nixos/modules/config/xdg/mime.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index eb8ac2a54ace..4323a49ea1dd 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -7,7 +7,7 @@ with lib;
       type = types.bool;
       default = true;
       description = ''
-        Whether to install files to support the 
+        Whether to install files to support the
         <link xlink:href="https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html">XDG Shared MIME-info specification</link> and the
         <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html">XDG MIME Applications specification</link>.
       '';
@@ -17,18 +17,18 @@ with lib;
   config = mkIf config.xdg.mime.enable {
     environment.pathsToLink = [ "/share/mime" ];
 
-    environment.systemPackages = [ 
-      # this package also installs some useful data, as well as its utilities 
-      pkgs.shared-mime-info 
+    environment.systemPackages = [
+      # this package also installs some useful data, as well as its utilities
+      pkgs.shared-mime-info
     ];
 
     environment.extraSetup = ''
       if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
-        XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
+          XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
       fi
 
       if [ -w $out/share/applications ]; then
-        ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
+          ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
       fi
     '';
   };

From 7705c76c49cf2958e56dc3293ea1fc5dd9aabfbf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 23:04:51 +0000
Subject: [PATCH 0611/3253] git: use default texinfo

---
 pkgs/applications/version-management/git-and-tools/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2093c86b050c..10c3d3391d60 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -4,7 +4,6 @@
 args @ {config, lib, pkgs}: with args; with pkgs;
 let
   gitBase = callPackage ./git {
-    texinfo = texinfo5;
     svnSupport = false;         # for git-svn support
     guiSupport = false;         # requires tcl/tk
     sendEmailSupport = false;   # requires plenty of perl libraries

From 53c9efe9e51fa7355a4a41c559f08d4b2cff496e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 8 Sep 2018 23:04:55 +0000
Subject: [PATCH 0612/3253] gpgme: use default texinfo

---
 pkgs/development/libraries/gpgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 71fe23ea6b0d..416ecb5631ed 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -2,7 +2,7 @@
 , file, which
 , autoreconfHook
 , git
-, texinfo5
+, texinfo
 , qtbase ? null
 , withPython ? false, swig2 ? null, python ? null
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     [ libgpgerror glib libassuan pth ]
     ++ lib.optional (qtbase != null) qtbase;
 
-  nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
+  nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
   ++ lib.optionals withPython [ python swig2 which ];
 
   postPatch =''

From 5e94e2bc7c2f349d44a74bf935b4bc4ff950b89f Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sat, 8 Sep 2018 13:32:24 -0700
Subject: [PATCH 0613/3253] wkhtmltopdf: 0.12.4 -> 0.12.5, use Qt5

---
 pkgs/tools/graphics/wkhtmltopdf/default.nix   | 112 +-----------------
 pkgs/tools/graphics/wkhtmltopdf/makefix.patch |  24 ----
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 7 insertions(+), 133 deletions(-)
 delete mode 100644 pkgs/tools/graphics/wkhtmltopdf/makefix.patch

diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 3ecd91aaca14..14ba0f8c2a9a 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,113 +1,21 @@
-{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg
-, openssl, libX11, libXext, libXrender, overrideDerivation }:
+{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg
+, openssl, libX11, libXext, libXrender }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.4";
+  version = "0.12.5";
   name = "wkhtmltopdf-${version}";
 
   src = fetchFromGitHub {
     owner  = "wkhtmltopdf";
     repo   = "wkhtmltopdf";
     rev    = version;
-    sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2";
+    sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1";
   };
 
-  wkQt = overrideDerivation qt4 (deriv: {
-    name = "qt-mod-4.8.7";
-    enableParallelBuilding = true;
-    src = fetchFromGitHub {
-      owner  = "wkhtmltopdf";
-      repo   = "qt";
-      rev    = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
-      sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
-    };
-    configureFlags =
-      ''
-        -dbus-linked
-        -glib
-        -no-separate-debug-info
-        -openssl-linked
-        -qdbus
-        -v
-      ''
-      + # This is taken from the wkhtml build script that we don't run
-      ''
-        -confirm-license
-        -exceptions
-        -fast
-        -graphicssystem raster
-        -iconv
-        -largefile
-        -no-3dnow
-        -no-accessibility
-        -no-audio-backend
-        -no-avx
-        -no-cups
-        -no-dbus
-        -no-declarative
-        -no-glib
-        -no-gstreamer
-        -no-gtkstyle
-        -no-icu
-        -no-javascript-jit
-        -no-libmng
-        -no-libtiff
-        -nomake demos
-        -nomake docs
-        -nomake examples
-        -nomake tests
-        -nomake tools
-        -nomake translations
-        -no-mitshm
-        -no-mmx
-        -no-multimedia
-        -no-nas-sound
-        -no-neon
-        -no-nis
-        -no-opengl
-        -no-openvg
-        -no-pch
-        -no-phonon
-        -no-phonon-backend
-        -no-qt3support
-        -no-rpath
-        -no-scripttools
-        -no-sm
-        -no-sql-ibase
-        -no-sql-mysql
-        -no-sql-odbc
-        -no-sql-psql
-        -no-sql-sqlite
-        -no-sql-sqlite2
-        -no-sse
-        -no-sse2
-        -no-sse3
-        -no-sse4.1
-        -no-sse4.2
-        -no-ssse3
-        -no-stl
-        -no-xcursor
-        -no-xfixes
-        -no-xinerama
-        -no-xinput
-        -no-xkb
-        -no-xrandr
-        -no-xshape
-        -no-xsync
-        -opensource
-        -release
-        -static
-        -system-libjpeg
-        -system-libpng
-        -system-zlib
-        -webkit
-        -xmlpatterns
-      '';
-  });
-
   buildInputs = [
-    wkQt fontconfig freetype libpng zlib libjpeg openssl
+    fontconfig freetype libpng zlib libjpeg openssl
     libX11 libXext libXrender
+    qt5.qtwebkit qt5.qtsvg
   ];
 
   prePatch = ''
@@ -116,14 +24,6 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  patches = [
-    (fetchpatch {
-      name = "make-0.12.4-compile.patch";
-      url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch";
-      sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1";
-    })
-  ];
-
   configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
deleted file mode 100644
index 0642a23afa9e..000000000000
--- a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur a/src/image/image.pro b/src/image/image.pro
---- a/src/image/image.pro	2014-08-28 14:07:51.024561967 +0200
-+++ b/src/image/image.pro	2014-08-28 14:08:22.383623390 +0200
-@@ -25,7 +25,7 @@
- 
- unix {
-     man.path=$$INSTALLBASE/share/man/man1
--    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
-+    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
- 
-     QMAKE_EXTRA_TARGETS += man
-     INSTALLS += man
-diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro
---- a/src/pdf/pdf.pro	2014-08-28 14:10:02.305818775 +0200
-+++ b/src/pdf/pdf.pro	2014-08-28 14:09:47.360789555 +0200
-@@ -25,7 +25,7 @@
- 
- unix {
-     man.path=$$INSTALLBASE/share/man/man1
--    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz
-+    man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz
- 
-     QMAKE_EXTRA_TARGETS += man
-     INSTALLS += man
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e0425b26b9d..9e9dd3afa251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6045,9 +6045,7 @@ with pkgs;
 
   wireguard-go = callPackage ../tools/networking/wireguard-go { };
 
-  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
-    overrideDerivation = lib.overrideDerivation;
-  };
+  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
 
   wml = callPackage ../development/web/wml { };
 

From c69933f71b8e6c1336d8320a75ff4b8eac5dddf7 Mon Sep 17 00:00:00 2001
From: "Scott W. Dunlop" <swdunlop@gmail.com>
Date: Sat, 8 Sep 2018 23:09:06 +0000
Subject: [PATCH 0614/3253] nats-streaming-server: init at 0.11.0

---
 .../servers/nats-streaming-server/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/servers/nats-streaming-server/default.nix

diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix
new file mode 100644
index 000000000000..8270fa398214
--- /dev/null
+++ b/pkgs/servers/nats-streaming-server/default.nix
@@ -0,0 +1,26 @@
+{  buildGoPackage, fetchFromGitHub, lib  }:
+
+with lib;
+
+buildGoPackage rec {
+  name = "nats-streaming-server-${version}";
+  version = "0.11.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/nats-io/nats-streaming-server";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "nats-io";
+    repo = "nats-streaming-server";
+	sha256 = "0skkx3f7dpbf6nqpsbsk8ssn8hl55s9k76a5y5ksyqar5bdxvds5";
+  };
+
+  meta = {
+    description = "NATS Streaming System Server";
+    license = licenses.asl20;
+    maintainers = [ maintainers.swdunlop ];
+    homepage = https://nats.io/;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b107fa5929a9..9d4bbd42c661 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13126,6 +13126,8 @@ with pkgs;
 
   nas = callPackage ../servers/nas { };
 
+  nats-streaming-server = callPackage ../servers/nats-streaming-server { };
+
   neard = callPackage ../servers/neard { };
 
   nginx = nginxStable;

From 10a412f251d2139d9e094669c0d0478b7ea7e1bd Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 9 Sep 2018 02:04:34 +0200
Subject: [PATCH 0615/3253] almonds: update license

---
 pkgs/applications/science/math/almonds/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix
index 96613f4e38a6..b5d9632c551d 100644
--- a/pkgs/applications/science/math/almonds/default.nix
+++ b/pkgs/applications/science/math/almonds/default.nix
@@ -20,8 +20,7 @@ with python3.pkgs; buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "Terminal Mandelbrot fractal viewer";
     homepage = https://github.com/Tenchi2xh/Almonds;
-    # No license has been specified
-    license = licenses.unfree;
+    license = licenses.mit;
     maintainers = with maintainers; [ infinisil ];
   };
 }

From 4ada74e293212434114ac87a679c1432650f4b40 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 12 Jul 2018 08:42:52 +0000
Subject: [PATCH 0616/3253] dwarf-fortress: Support multiple unfuck/dfhack/TWBT
 versions

---
 pkgs/games/dwarf-fortress/default.nix         | 52 +++++++++++++------
 pkgs/games/dwarf-fortress/dfhack/default.nix  | 21 ++++++--
 pkgs/games/dwarf-fortress/dfhack/dfhack.json  | 38 ++++++++++++++
 .../dwarf-therapist/dwarf-therapist.in        | 26 ++++++++++
 .../dwarf-therapist/wrapper.nix               | 19 ++++---
 pkgs/games/dwarf-fortress/game.nix            |  3 --
 pkgs/games/dwarf-fortress/lazy-pack.nix       |  2 +-
 pkgs/games/dwarf-fortress/twbt/default.nix    | 25 ++++++---
 pkgs/games/dwarf-fortress/twbt/twbt.json      | 32 ++++++++++++
 pkgs/games/dwarf-fortress/unfuck.json         | 26 ++++++++++
 pkgs/games/dwarf-fortress/unfuck.nix          | 32 ++++++------
 pkgs/games/dwarf-fortress/wrapper/default.nix | 46 ++++++++--------
 12 files changed, 244 insertions(+), 78 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/dfhack/dfhack.json
 create mode 100644 pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
 create mode 100644 pkgs/games/dwarf-fortress/twbt/twbt.json
 create mode 100644 pkgs/games/dwarf-fortress/unfuck.json

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index aa4ff210812b..87bcc44b8156 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -5,7 +5,8 @@
 # This directory menaces with spikes of Nix code. It is terrifying.
 #
 # If this is your first time here, you should probably install the dwarf-fortress-full package,
-# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`.
+# for instance with:
+# `environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];`
 #
 # You can adjust its settings by using override, or compile your own package by
 # using the other packages here. Take a look at lazy-pack.nix to get an idea of
@@ -24,11 +25,36 @@ let
   callPackage = pkgs.newScope self;
 
   df-games = lib.listToAttrs (map (dfVersion: {
-    name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}";
-    value = callPackage ./wrapper {
-      inherit (self) themes;
-      dwarf-fortress = callPackage ./game.nix { inherit dfVersion; };
-    };
+    name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; 
+    value =
+      let
+        # I can't believe this syntax works. Spikes of Nix code indeed...
+        dwarf-fortress = callPackage ./game.nix {
+          inherit dfVersion;
+          inherit dwarf-fortress-unfuck;
+        };
+
+        # unfuck is linux-only right now, we will only use it there.
+        dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; }
+                                else null;
+
+        twbt = callPackage ./twbt { inherit dfVersion; };
+
+        dfhack = callPackage ./dfhack {
+          inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
+          inherit dfVersion;
+          inherit twbt;
+          stdenv = gccStdenv;
+        };
+      in
+      callPackage ./wrapper {
+        inherit (self) themes;
+
+        dwarf-fortress = dwarf-fortress;
+        dwarf-fortress-unfuck = dwarf-fortress-unfuck;
+        twbt = twbt;
+        dfhack = dfhack;
+      };
   }) (lib.attrNames self.df-hashes));
 
   self = rec {
@@ -37,17 +63,8 @@ let
 
     dwarf-fortress-full = callPackage ./lazy-pack.nix { };
 
-    dfhack = callPackage ./dfhack {
-      inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
-      stdenv = gccStdenv;
-    };
-
     soundSense = callPackage ./soundsense.nix { };
 
-    # unfuck is linux-only right now, we will only use it there.
-    dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
-                            else null;
-
     dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
       inherit (dwarf-fortress) dwarf-fortress;
       dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
@@ -59,8 +76,9 @@ let
 
     legends-browser = callPackage ./legends-browser {};
 
-    twbt = callPackage ./twbt {};
-    themes = recurseIntoAttrs (callPackage ./themes { });
+    themes = recurseIntoAttrs (callPackage ./themes {
+      stdenv = stdenvNoCC;
+    });
 
     # aliases
     phoebus-theme = themes.phoebus;
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 4a8c84cf92dc..1c88cab02193 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -3,14 +3,25 @@
 , enableStoneSense ? false,  allegro5, libGLU_combined
 , enableTWBT ? true, twbt
 , SDL
+, dfVersion
 }:
 
+with lib;
+
 let
-  dfVersion = "0.44.12";
-  version = "${dfVersion}-r1";
+  dfhack-releases = builtins.fromJSON (builtins.readFile ./dfhack.json);
+
+  release = if hasAttr dfVersion dfhack-releases
+            then getAttr dfVersion dfhack-releases
+            else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}";
+
+  version = release.dfHackRelease;
+
+  warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!"
+                                  else null;
 
   # revision of library/xml submodule
-  xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
+  xmlRev = release.xmlRev;
 
   arch =
     if stdenv.hostPlatform.system == "x86_64-linux" then "64"
@@ -41,8 +52,8 @@ let
     src = fetchFromGitHub {
       owner = "DFHack";
       repo = "dfhack";
-      sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
-      rev = version;
+      rev = release.dfHackRelease;
+      sha256 = release.sha256;
       fetchSubmodules = true;
     };
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/dfhack.json b/pkgs/games/dwarf-fortress/dfhack/dfhack.json
new file mode 100644
index 000000000000..d1907fb38afb
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/dfhack.json
@@ -0,0 +1,38 @@
+{
+  "0.43.05": {
+    "dfHackRelease": "0.43.05-r3.1",
+    "sha256": "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl",
+    "xmlRev": "860a9041a75305609643d465123a4b598140dd7f",
+    "prerelease": false
+  },
+  "0.44.05": {
+    "dfHackRelease": "0.44.05-r2",
+    "sha256": "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9",
+    "xmlRev": "2794f8a6d7405d4858bac486a0bb17b94740c142",
+    "prerelease": false
+  },
+  "0.44.09": {
+    "dfHackRelease": "0.44.09-r1",
+    "sha256": "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk",
+    "xmlRev": "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5",
+    "prerelease": false
+  },
+  "0.44.10": {
+    "dfHackRelease": "0.44.10-r2",
+    "sha256": "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i",
+    "xmlRev": "321bd48b10c4c3f694cc801a7dee6be392c09b7b",
+    "prerelease": false
+  },
+  "0.44.11": {
+    "dfHackRelease": "0.44.11-beta2.1",
+    "sha256": "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2",
+    "xmlRev": "f27ebae6aa8fb12c46217adec5a812cd49a905c8",
+    "prerelease": true
+  },
+  "0.44.12": {
+    "dfHackRelease": "0.44.12-r1",
+    "sha256": "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy",
+    "xmlRev": "23500e4e9bd1885365d0a2ef1746c321c1dd5094",
+    "prerelease": false
+  }
+}
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
new file mode 100644
index 000000000000..77936c430e2b
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in
@@ -0,0 +1,26 @@
+#!@stdenv_shell@ -e
+
+[ -z "$DT_DIR" ] && DT_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dwarftherapist"
+
+install_dir="@install@"
+therapist_dir="@therapist@"
+
+cat <<EOF >&2
+Using $DT_DIR as Dwarf Therapist overlay directory.
+EOF
+
+update_path() {
+  local path="$1"
+
+  mkdir -p "$DT_DIR/$(dirname "$path")"
+  if [ ! -e "$DT_DIR/$path" ] || [ -L "$DT_DIR/$path" ]; then
+    rm -f "$DT_DIR/$path"
+    ln -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path"
+  fi
+}
+
+cd "$install_dir/share/dwarftherapist"
+update_path memory_layouts
+
+QT_QPA_PLATFORM_PLUGIN_PATH="@qt_plugin_path@" \
+  exec "$therapist_dir/bin/dwarftherapist" "$@"
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 322a21ec3ad9..f86ef4bea7ab 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }:
+{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }:
 
 let
   platformSlug = if stdenv.targetPlatform.is32bit then
@@ -7,6 +7,8 @@ let
 
 in symlinkJoin {
   name = "dwarf-therapist-${dwarf-therapist.version}";
+  
+  wrapper = ./dwarf-therapist.in;
 
   paths = [ dwarf-therapist ];
 
@@ -14,13 +16,18 @@ in symlinkJoin {
 
   passthru = { inherit dwarf-fortress dwarf-therapist; };
 
-  postBuild = ''
-    # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
-    # therefore uses many relative paths.
-    wrapProgram $out/bin/dwarftherapist \
-      --run "cd $out/share/dwarftherapist"
+  buildCommand = ''
+    mkdir -p $out/bin
     ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist
+    substitute $wrapper $out/bin/dwarftherapist \
+      --subst-var-by stdenv_shell ${stdenv.shell} \
+      --subst-var-by install $out \
+      --subst-var-by therapist ${dwarf-therapist} \
+      --subst-var-by qt_plugin_path "${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"
 
+    chmod 755 $out/bin/dwarftherapist
+
+    # Fix up memory layouts
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
     origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 2547bb83f3f5..b5c80a0a56dc 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -42,9 +42,6 @@ let
 
 in
 
-assert dwarf-fortress-unfuck != null ->
-       dwarf-fortress-unfuck.dfVersion == dfVersion;
-
 stdenv.mkDerivation {
   name = "dwarf-fortress-${dfVersion}";
 
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index 3e0d3dcc6d73..ca7ae4024289 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -6,7 +6,7 @@
 , enableDFHack ? stdenvNoCC.isLinux
 , enableTWBT ? enableDFHack
 , enableSoundSense ? true
-, enableStoneSense ? false  # StoneSense is currently broken.
+, enableStoneSense ? true
 , enableDwarfTherapist ? true, dwarf-therapist
 , enableLegendsBrowser ? true, legends-browser
 , theme ? themes.phoebus
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index d90812f5d05e..1bdbddb56de4 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -1,14 +1,28 @@
-{ stdenvNoCC, fetchurl, unzip }:
+{ stdenvNoCC, lib, fetchurl, unzip
+, dfVersion
+}:
 
+with lib;
+
+let
+  twbt-releases = builtins.fromJSON (builtins.readFile ./twbt.json);
+
+  release = if hasAttr dfVersion twbt-releases
+            then getAttr dfVersion twbt-releases
+            else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}";
+
+  warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!"
+                                  else null;
+
+in
 
 stdenvNoCC.mkDerivation rec {
   name = "twbt-${version}";
-  version = "6.54";
-  dfVersion = "0.44.12";
+  version = release.twbtRelease;
 
   src = fetchurl {
     url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
-    sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
+    sha256 = release.sha256;
   };
 
   sourceRoot = ".";
@@ -24,10 +38,9 @@ stdenvNoCC.mkDerivation rec {
     cp -a *.png $art/data/art/
   '';
 
-  
   meta = with stdenvNoCC.lib; {
     description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface.";
-    maintainers = with maintainers; [ Baughn ];
+    maintainers = with maintainers; [ Baughn numinit ];
     license = licenses.mit;
     platforms = platforms.linux;
     homepage = https://github.com/mifki/df-twbt;
diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json
new file mode 100644
index 000000000000..b455ff017fcd
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/twbt/twbt.json
@@ -0,0 +1,32 @@
+{
+  "0.43.05": {
+    "twbtRelease": "6.22",
+    "sha256": "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7",
+    "prerelease": false
+  },
+  "0.44.05": {
+    "twbtRelease": "6.35",
+    "sha256": "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g",
+    "prerelease": false
+  },
+  "0.44.09": {
+    "twbtRelease": "6.41",
+    "sha256": "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44",
+    "prerelease": false
+  },
+  "0.44.10": {
+    "twbtRelease": "6.49",
+    "sha256": "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz",
+    "prerelease": false
+  },
+  "0.44.11": {
+    "twbtRelease": "6.51",
+    "sha256": "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5",
+    "prerelease": true
+  },
+  "0.44.12": {
+    "twbtRelease": "6.53",
+    "sha256": "05qc9x4zm0pamwg7j12j0084dq2sj7825fhd3l0wxfinphzk3was",
+    "prerelease": false
+  }
+}
diff --git a/pkgs/games/dwarf-fortress/unfuck.json b/pkgs/games/dwarf-fortress/unfuck.json
new file mode 100644
index 000000000000..f7a4974c575c
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/unfuck.json
@@ -0,0 +1,26 @@
+{
+  "0.43.05": {
+    "unfuckRelease": "0.43.05",
+    "sha256": "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"
+  },
+  "0.44.05": {
+    "unfuckRelease": "0.44.05",
+    "sha256": "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"
+  },
+  "0.44.09": {
+    "unfuckRelease": "0.44.09",
+    "sha256": "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"
+  },
+  "0.44.10": {
+    "unfuckRelease": "0.44.10",
+    "sha256": "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"
+  },
+  "0.44.11": {
+    "unfuckRelease": "0.44.11.1",
+    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
+  },
+  "0.44.12": {
+    "unfuckRelease": "0.44.12",
+    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
+  }
+}
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 0c5a81a52f0f..732003118713 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,18 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake
+{ stdenv, lib, fetchFromGitHub, cmake
 , libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft
 , ncurses, glib, gtk2, libsndfile, zlib
+, dfVersion
 }:
 
-let dfVersion = "0.44.12"; in
+with lib;
+
+let
+  unfuck-releases = builtins.fromJSON (builtins.readFile ./unfuck.json);
+
+  release = if hasAttr dfVersion unfuck-releases
+            then getAttr dfVersion unfuck-releases
+            else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}";
+in
 
 stdenv.mkDerivation {
-  name = "dwarf_fortress_unfuck-${dfVersion}";
+  name = "dwarf_fortress_unfuck-${release.unfuckRelease}";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "dwarf_fortress_unfuck";
-    rev = dfVersion;
-    sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+    rev = release.unfuckRelease;
+    sha256 = release.sha256;
   };
 
   cmakeFlags = [
@@ -20,23 +29,12 @@ stdenv.mkDerivation {
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 
-  makeFlags = [
-    ''CFLAGS="-fkeep-inline-functions"''
-    ''CXXFLAGS="-fkeep-inline-functions"''
-  ];
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libSM SDL SDL_image SDL_ttf glew openalSoft
     ncurses gtk2 libsndfile zlib libGL
   ];
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace \
-      'set(CMAKE_BUILD_TYPE Release)' \
-      'set(CMAKE_BUILD_TYPE Debug)'
-  '';
-
   # Don't strip unused symbols; dfhack hooks into some of them.
   dontStrip = true;
 
@@ -56,6 +54,6 @@ stdenv.mkDerivation {
     homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;
     license = licenses.free;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar numinit ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 6efe004fa9e8..105143916d10 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll
+{ stdenv, lib, buildEnv, substituteAll
+, dwarf-fortress, dwarf-fortress-unfuck
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
 , enableStoneSense ? false
@@ -37,34 +38,12 @@ let
     paths = themePkg ++ pkgs;
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
     ignoreCollisions = true;
-
-    postBuild = ''
-      # De-symlink init.txt
-      cp $out/data/init/init.txt init.txt
-      rm $out/data/init/init.txt
-      mv init.txt $out/data/init/init.txt
-    '' + lib.optionalString enableDFHack ''
-      rm $out/hack/symbols.xml
-      substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
-        --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
-                  $(cat ${dwarf-fortress}/hash.md5)
-    '' + lib.optionalString enableTWBT ''
-      substituteInPlace $out/data/init/init.txt \
-        --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
-    '' + ''
-      substituteInPlace $out/data/init/init.txt \
-        --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
-        --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
-        --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
-    '';
   };
 in
 
 stdenv.mkDerivation rec {
   name = "dwarf-fortress-${dwarf-fortress.dfVersion}";
 
-  compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs;
-
   dfInit = substituteAll {
     name = "dwarf-fortress-init";
     src = ./dwarf-fortress-init.in;
@@ -99,5 +78,26 @@ stdenv.mkDerivation rec {
     chmod 755 $out/bin/soundsense
   '';
 
+  postBuild = ''
+    # De-symlink init.txt
+    cp $out/data/init/init.txt init.txt
+    rm $out/data/init/init.txt
+    mv init.txt $out/data/init/init.txt
+  '' + lib.optionalString enableDFHack ''
+    rm $out/hack/symbols.xml
+    echo "[$out/hack/symbols.xml] $(cat ${dwarf-fortress}/hash.md5.orig) => $(cat ${dwarf-fortress}/hash.md5)"
+    substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
+      --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
+                $(cat ${dwarf-fortress}/hash.md5)
+  '' + lib.optionalString enableTWBT ''
+    substituteInPlace $out/data/init/init.txt \
+      --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
+  '' + ''
+    substituteInPlace $out/data/init/init.txt \
+      --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
+      --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
+      --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
+  '';
+
   preferLocalBuild = true;
 }

From f14d3b4795c173f5ff353031b8d32afab7090ab9 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 03:58:37 +0000
Subject: [PATCH 0617/3253] Fix dfhack's Dwarf Fortress MD5 in the correct
 environment

---
 .../dwarf-therapist/wrapper.nix               | 18 ++++---
 pkgs/games/dwarf-fortress/wrapper/default.nix | 54 +++++++++++--------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index f86ef4bea7ab..6e3a13692a72 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -30,11 +30,17 @@ in symlinkJoin {
     # Fix up memory layouts
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
-    origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
-    patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
-    substitute \
-      ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \
-      $out/share/dwarftherapist/memory_layouts/${inifile} \
-      --replace "$origmd5" "$patchedmd5"
+    orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8)
+    patched_md5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8)
+    input_file="${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile}"
+    output_file="$out/share/dwarftherapist/memory_layouts/${inifile}"
+
+    echo "[Dwarf Therapist Wrapper] Fixing Dwarf Fortress MD5 prefix:"
+    echo "  Input:   $input_file"
+    echo "  Search:  $orig_md5"
+    echo "  Output:  $output_file"
+    echo "  Replace: $patched_md5"
+
+    substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
   '';
 }
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 105143916d10..33523270b19d 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -37,6 +37,39 @@ let
 
     paths = themePkg ++ pkgs;
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
+
+    postBuild = ''
+      # De-symlink init.txt
+      cp $out/data/init/init.txt init.txt
+      rm -f $out/data/init/init.txt
+      mv init.txt $out/data/init/init.txt
+    '' + lib.optionalString enableDFHack ''
+      # De-symlink symbols.xml
+      rm $out/hack/symbols.xml
+
+      # Patch the MD5
+      orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig")
+      patched_md5=$(cat "${dwarf-fortress}/hash.md5")
+      input_file="${dfhack_}/hack/symbols.xml"
+      output_file="$out/hack/symbols.xml"
+
+      echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:"
+      echo "  Input:   $input_file"
+      echo "  Search:  $orig_md5"
+      echo "  Output:  $output_file"
+      echo "  Replace: $patched_md5"
+
+      substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
+    '' + lib.optionalString enableTWBT ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
+    '' + ''
+      substituteInPlace $out/data/init/init.txt \
+        --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
+        --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
+        --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
+    '';
+
     ignoreCollisions = true;
   };
 in
@@ -78,26 +111,5 @@ stdenv.mkDerivation rec {
     chmod 755 $out/bin/soundsense
   '';
 
-  postBuild = ''
-    # De-symlink init.txt
-    cp $out/data/init/init.txt init.txt
-    rm $out/data/init/init.txt
-    mv init.txt $out/data/init/init.txt
-  '' + lib.optionalString enableDFHack ''
-    rm $out/hack/symbols.xml
-    echo "[$out/hack/symbols.xml] $(cat ${dwarf-fortress}/hash.md5.orig) => $(cat ${dwarf-fortress}/hash.md5)"
-    substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \
-      --replace $(cat ${dwarf-fortress}/hash.md5.orig) \
-                $(cat ${dwarf-fortress}/hash.md5)
-  '' + lib.optionalString enableTWBT ''
-    substituteInPlace $out/data/init/init.txt \
-      --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
-  '' + ''
-    substituteInPlace $out/data/init/init.txt \
-      --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
-      --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
-      --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
-  '';
-
   preferLocalBuild = true;
 }

From 7a5521537a1715ac7f7f5e420cef865304383b82 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 05:38:30 +0000
Subject: [PATCH 0618/3253] Let the user override dfVersion in
 dwarf-fortress-full

---
 pkgs/games/dwarf-fortress/default.nix   | 47 +++++++++++++++++++------
 pkgs/games/dwarf-fortress/lazy-pack.nix | 17 ++++++---
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 87bcc44b8156..1ee33fb27f36 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -6,26 +6,48 @@
 #
 # If this is your first time here, you should probably install the dwarf-fortress-full package,
 # for instance with:
-# `environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];`
+#
+# environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ];
 #
 # You can adjust its settings by using override, or compile your own package by
-# using the other packages here. Take a look at lazy-pack.nix to get an idea of
-# how.
+# using the other packages here.
+#
+# For example, you can enable the FPS indicator, disable the intro, pick a
+# theme other than phoebus (the default for dwarf-fortress-full), _and_ use
+# an older version with something like:
+#
+# environment.systemPackages = [
+#   (pkgs.dwarf-fortress-packages.dwarf-fortress-full.override {
+#      dfVersion = "0.44.11";
+#      theme = "cla";
+#      enableIntro = false;
+#      enableFPS = true;
+#   })
+# ]
+#
+# Take a look at lazy-pack.nix to see all the other options.
 #
 # You will find the configuration files in ~/.local/share/df_linux/data/init. If
 # you un-symlink them and edit, then the scripts will avoid overwriting your
 # changes on later launches, but consider extending the wrapper with your
 # desired options instead.
-#
-# Although both dfhack and dwarf therapist are included in the lazy pack, you
-# can only use one at a time. DFHack does have therapist-like features, so this
-# may or may not be a problem.
+
+with lib;
 
 let
   callPackage = pkgs.newScope self;
 
+  # The latest Dwarf Fortress version. Maintainers: when a new version comes
+  # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
+  # this.
+  latestVersion = "0.44.12";
+
+  # Converts a version to a package name.
+  versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
+
+  # A map of names to each Dwarf Fortress package we know about.
   df-games = lib.listToAttrs (map (dfVersion: {
-    name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; 
+    name = versionToName dfVersion;
     value =
       let
         # I can't believe this syntax works. Spikes of Nix code indeed...
@@ -59,9 +81,14 @@ let
 
   self = rec {
     df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
-    dwarf-fortress = df-games.dwarf-fortress_0_44_12;
+    
+    dwarf-fortress = getAttr (versionToName latestVersion) df-games;
 
-    dwarf-fortress-full = callPackage ./lazy-pack.nix { };
+    dwarf-fortress-full = callPackage ./lazy-pack.nix {
+      inherit versionToName;
+      inherit latestVersion;
+      inherit df-games;
+    };
 
     soundSense = callPackage ./soundsense.nix { };
 
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index ca7ae4024289..a05ea49ce814 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -1,8 +1,9 @@
-{ stdenvNoCC, lib, buildEnv
-, dwarf-fortress, themes
+{ stdenvNoCC, lib, buildEnv, callPackage
+, df-games, themes, latestVersion, versionToName
+, dfVersion ? latestVersion
   # This package should, at any given time, provide an opinionated "optimal"
   # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and
-  # should contain every utility available.
+  # should contain every utility available unless you disable them.
 , enableDFHack ? stdenvNoCC.isLinux
 , enableTWBT ? enableDFHack
 , enableSoundSense ? true
@@ -16,6 +17,14 @@
 , enableFPS ? false
 }:
 
+with lib;
+
+let
+  dfGame = versionToName dfVersion;
+  dwarf-fortress = if hasAttr dfGame df-games
+                   then getAttr dfGame df-games
+                   else throw "Unknown Dwarf Fortress version: ${dfVersion}";
+in
 buildEnv {
   name = "dwarf-fortress-full";
   paths = [
@@ -28,7 +37,7 @@ buildEnv {
 
   meta = with stdenvNoCC.lib; {
     description = "An opinionated wrapper for Dwarf Fortress";
-    maintainers = with maintainers; [ Baughn ];
+    maintainers = with maintainers; [ Baughn numinit ];
     license = licenses.mit;
     platforms = platforms.all;
     homepage = https://github.com/NixOS/nixpkgs/;

From fe847fcc929b824596aa049b08f06c8af9519a68 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 06:41:27 +0000
Subject: [PATCH 0619/3253] Therapist needs to depend on the DF version, since
 it uses its MD5

---
 pkgs/games/dwarf-fortress/default.nix         | 36 +++++++++----------
 pkgs/games/dwarf-fortress/lazy-pack.nix       |  3 +-
 pkgs/games/dwarf-fortress/wrapper/default.nix |  3 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 1ee33fb27f36..88a6d72bc485 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -64,10 +64,18 @@ let
 
         dfhack = callPackage ./dfhack {
           inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
-          inherit dfVersion;
-          inherit twbt;
+          inherit dfVersion twbt;
           stdenv = gccStdenv;
         };
+
+        dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
+          inherit dwarf-fortress;
+          dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
+            texlive = pkgs.texlive.combine {
+              inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+            };
+          };
+        };
       in
       callPackage ./wrapper {
         inherit (self) themes;
@@ -76,41 +84,33 @@ let
         dwarf-fortress-unfuck = dwarf-fortress-unfuck;
         twbt = twbt;
         dfhack = dfhack;
+        dwarf-therapist = dwarf-therapist;
       };
   }) (lib.attrNames self.df-hashes));
 
   self = rec {
     df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
-    
+
+    # Aliases for the latest Dwarf Fortress and the selected Therapist install
     dwarf-fortress = getAttr (versionToName latestVersion) df-games;
+    dwarf-therapist = dwarf-fortress.dwarf-therapist;
+    dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
 
     dwarf-fortress-full = callPackage ./lazy-pack.nix {
-      inherit versionToName;
-      inherit latestVersion;
-      inherit df-games;
+      inherit df-games versionToName latestVersion;
     };
-
+    
     soundSense = callPackage ./soundsense.nix { };
 
-    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix {
-      inherit (dwarf-fortress) dwarf-fortress;
-      dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist {
-        texlive = pkgs.texlive.combine {
-          inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
-        };
-      };
-    };
-
     legends-browser = callPackage ./legends-browser {};
 
     themes = recurseIntoAttrs (callPackage ./themes {
       stdenv = stdenvNoCC;
     });
 
-    # aliases
+    # Theme aliases
     phoebus-theme = themes.phoebus;
     cla-theme = themes.cla;
-    dwarf-fortress-original = dwarf-fortress.dwarf-fortress;
   };
 
 in self // df-games
diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix
index a05ea49ce814..3a81dcc9c931 100644
--- a/pkgs/games/dwarf-fortress/lazy-pack.nix
+++ b/pkgs/games/dwarf-fortress/lazy-pack.nix
@@ -8,7 +8,7 @@
 , enableTWBT ? enableDFHack
 , enableSoundSense ? true
 , enableStoneSense ? true
-, enableDwarfTherapist ? true, dwarf-therapist
+, enableDwarfTherapist ? true
 , enableLegendsBrowser ? true, legends-browser
 , theme ? themes.phoebus
 # General config options:
@@ -24,6 +24,7 @@ let
   dwarf-fortress = if hasAttr dfGame df-games
                    then getAttr dfGame df-games
                    else throw "Unknown Dwarf Fortress version: ${dfVersion}";
+  dwarf-therapist = dwarf-fortress.dwarf-therapist;
 in
 buildEnv {
   name = "dwarf-fortress-full";
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 33523270b19d..8d9f06ffe143 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, buildEnv, substituteAll
 , dwarf-fortress, dwarf-fortress-unfuck
+, dwarf-therapist
 , enableDFHack ? false, dfhack
 , enableSoundSense ? false, soundSense, jdk
 , enableStoneSense ? false
@@ -89,7 +90,7 @@ stdenv.mkDerivation rec {
   runDFHack = ./dfhack.in;
   runSoundSense = ./soundSense.in;
 
-  passthru = { inherit dwarf-fortress; };
+  passthru = { inherit dwarf-fortress dwarf-therapist; };
 
   buildCommand = ''
     mkdir -p $out/bin

From 870f05c975d95e9f05e0e2de3b039e4eef08d6c5 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 07:02:50 +0000
Subject: [PATCH 0620/3253] Fix dangling DFHack "Git:" version text

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 1c88cab02193..5dcdeda7ba28 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -32,6 +32,10 @@ let
     #! ${stdenv.shell}
     if [ "$*" = "describe --tags --long" ]; then
       echo "${version}-unknown"
+    elif [ "$*" = "describe --tags --abbrev=8 --long" ]; then
+      echo "${version}-unknown"
+    elif [ "$*" = "describe --tags --abbrev=8 --exact-match" ]; then
+      echo "${version}"
     elif [ "$*" = "rev-parse HEAD" ]; then
       if [ "$(dirname "$(pwd)")" = "xml" ]; then
         echo "${xmlRev}"

From 5f1013d87576f89d391670e17725a897204a6cb9 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 07:34:26 +0000
Subject: [PATCH 0621/3253] Use stdenv.mkDerivation for Therapist wrapper

---
 pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6e3a13692a72..071ab2af0c5c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -5,7 +5,9 @@ let
     "linux32" else "linux64";
   inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
 
-in symlinkJoin {
+in
+  
+stdenv.mkDerivation rec {
   name = "dwarf-therapist-${dwarf-therapist.version}";
   
   wrapper = ./dwarf-therapist.in;
@@ -43,4 +45,6 @@ in symlinkJoin {
 
     substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
   '';
+
+  preferLocalBuild = true;
 }

From 2cd2571edd0fef223e65d9039059871e3ab61d1c Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 9 Sep 2018 07:03:53 +0000
Subject: [PATCH 0622/3253] Update twbt to 6.54

---
 pkgs/games/dwarf-fortress/twbt/twbt.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json
index b455ff017fcd..f7de1c14e6b6 100644
--- a/pkgs/games/dwarf-fortress/twbt/twbt.json
+++ b/pkgs/games/dwarf-fortress/twbt/twbt.json
@@ -25,8 +25,8 @@
     "prerelease": true
   },
   "0.44.12": {
-    "twbtRelease": "6.53",
-    "sha256": "05qc9x4zm0pamwg7j12j0084dq2sj7825fhd3l0wxfinphzk3was",
+    "twbtRelease": "6.54",
+    "sha256": "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh",
     "prerelease": false
   }
 }

From 213b5457fc0a343d71c9ee1a84ea3722b3b05388 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 9 Sep 2018 07:12:36 +0000
Subject: [PATCH 0623/3253] Inline JSON files

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 39 +++++++++++++++++++-
 pkgs/games/dwarf-fortress/dfhack/dfhack.json | 38 -------------------
 pkgs/games/dwarf-fortress/themes/default.nix |  2 +-
 pkgs/games/dwarf-fortress/twbt/default.nix   | 33 ++++++++++++++++-
 pkgs/games/dwarf-fortress/twbt/twbt.json     | 32 ----------------
 pkgs/games/dwarf-fortress/unfuck.json        | 26 -------------
 pkgs/games/dwarf-fortress/unfuck.nix         | 27 +++++++++++++-
 7 files changed, 97 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/games/dwarf-fortress/dfhack/dfhack.json
 delete mode 100644 pkgs/games/dwarf-fortress/twbt/twbt.json
 delete mode 100644 pkgs/games/dwarf-fortress/unfuck.json

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 5dcdeda7ba28..d65bdab84911 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -9,7 +9,44 @@
 with lib;
 
 let
-  dfhack-releases = builtins.fromJSON (builtins.readFile ./dfhack.json);
+  dfhack-releases = {
+    "0.43.05" = {
+      dfHackRelease = "0.43.05-r3.1";
+      sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl";
+      xmlRev = "860a9041a75305609643d465123a4b598140dd7f";
+      prerelease = false;
+    };
+    "0.44.05" = {
+      dfHackRelease = "0.44.05-r2";
+      sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
+      xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142";
+      prerelease = false;
+    };
+    "0.44.09" = {
+      dfHackRelease = "0.44.09-r1";
+      sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk";
+      xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
+      prerelease = false;
+    };
+    "0.44.10" = {
+      dfHackRelease = "0.44.10-r2";
+      sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i";
+      xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b";
+      prerelease = false;
+    };
+    "0.44.11" = {
+      dfHackRelease = "0.44.11-beta2.1";
+      sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2";
+      xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8";
+      prerelease = true;
+    };
+    "0.44.12" = {
+      dfHackRelease = "0.44.12-r1";
+      sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
+      xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
+      prerelease = false;
+    };
+  };
 
   release = if hasAttr dfVersion dfhack-releases
             then getAttr dfVersion dfhack-releases
diff --git a/pkgs/games/dwarf-fortress/dfhack/dfhack.json b/pkgs/games/dwarf-fortress/dfhack/dfhack.json
deleted file mode 100644
index d1907fb38afb..000000000000
--- a/pkgs/games/dwarf-fortress/dfhack/dfhack.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "0.43.05": {
-    "dfHackRelease": "0.43.05-r3.1",
-    "sha256": "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl",
-    "xmlRev": "860a9041a75305609643d465123a4b598140dd7f",
-    "prerelease": false
-  },
-  "0.44.05": {
-    "dfHackRelease": "0.44.05-r2",
-    "sha256": "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9",
-    "xmlRev": "2794f8a6d7405d4858bac486a0bb17b94740c142",
-    "prerelease": false
-  },
-  "0.44.09": {
-    "dfHackRelease": "0.44.09-r1",
-    "sha256": "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk",
-    "xmlRev": "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5",
-    "prerelease": false
-  },
-  "0.44.10": {
-    "dfHackRelease": "0.44.10-r2",
-    "sha256": "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i",
-    "xmlRev": "321bd48b10c4c3f694cc801a7dee6be392c09b7b",
-    "prerelease": false
-  },
-  "0.44.11": {
-    "dfHackRelease": "0.44.11-beta2.1",
-    "sha256": "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2",
-    "xmlRev": "f27ebae6aa8fb12c46217adec5a812cd49a905c8",
-    "prerelease": true
-  },
-  "0.44.12": {
-    "dfHackRelease": "0.44.12-r1",
-    "sha256": "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy",
-    "xmlRev": "23500e4e9bd1885365d0a2ef1746c321c1dd5094",
-    "prerelease": false
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
index 0b8eb23a7b9d..feb4782d7c32 100644
--- a/pkgs/games/dwarf-fortress/themes/default.nix
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -1,4 +1,4 @@
-{lib, fetchFromGitHub}:
+{lib, fetchFromGitHub, ...}:
 
 with builtins;
 
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index 1bdbddb56de4..7c80c1012462 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -5,7 +5,38 @@
 with lib;
 
 let
-  twbt-releases = builtins.fromJSON (builtins.readFile ./twbt.json);
+  twbt-releases = {
+    "0.43.05" = {
+      twbtRelease = "6.22";
+      sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7";
+      prerelease = false;
+    };
+    "0.44.05" = {
+      twbtRelease = "6.35";
+      sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g";
+      prerelease = false;
+    };
+    "0.44.09" = {
+      twbtRelease = "6.41";
+      sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44";
+      prerelease = false;
+    };
+    "0.44.10" = {
+      twbtRelease = "6.49";
+      sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
+      prerelease = false;
+    };
+    "0.44.11" = {
+      twbtRelease = "6.51";
+      sha256 = "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5";
+      prerelease = true;
+    };
+    "0.44.12" = {
+      twbtRelease = "6.54";
+      sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
+      prerelease = false;
+    };
+  };
 
   release = if hasAttr dfVersion twbt-releases
             then getAttr dfVersion twbt-releases
diff --git a/pkgs/games/dwarf-fortress/twbt/twbt.json b/pkgs/games/dwarf-fortress/twbt/twbt.json
deleted file mode 100644
index f7de1c14e6b6..000000000000
--- a/pkgs/games/dwarf-fortress/twbt/twbt.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "0.43.05": {
-    "twbtRelease": "6.22",
-    "sha256": "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7",
-    "prerelease": false
-  },
-  "0.44.05": {
-    "twbtRelease": "6.35",
-    "sha256": "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g",
-    "prerelease": false
-  },
-  "0.44.09": {
-    "twbtRelease": "6.41",
-    "sha256": "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44",
-    "prerelease": false
-  },
-  "0.44.10": {
-    "twbtRelease": "6.49",
-    "sha256": "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz",
-    "prerelease": false
-  },
-  "0.44.11": {
-    "twbtRelease": "6.51",
-    "sha256": "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5",
-    "prerelease": true
-  },
-  "0.44.12": {
-    "twbtRelease": "6.54",
-    "sha256": "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh",
-    "prerelease": false
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/unfuck.json b/pkgs/games/dwarf-fortress/unfuck.json
deleted file mode 100644
index f7a4974c575c..000000000000
--- a/pkgs/games/dwarf-fortress/unfuck.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "0.43.05": {
-    "unfuckRelease": "0.43.05",
-    "sha256": "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"
-  },
-  "0.44.05": {
-    "unfuckRelease": "0.44.05",
-    "sha256": "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"
-  },
-  "0.44.09": {
-    "unfuckRelease": "0.44.09",
-    "sha256": "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"
-  },
-  "0.44.10": {
-    "unfuckRelease": "0.44.10",
-    "sha256": "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"
-  },
-  "0.44.11": {
-    "unfuckRelease": "0.44.11.1",
-    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
-  },
-  "0.44.12": {
-    "unfuckRelease": "0.44.12",
-    "sha256": "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"
-  }
-}
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 732003118713..c4d01b3ff392 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -7,7 +7,32 @@
 with lib;
 
 let
-  unfuck-releases = builtins.fromJSON (builtins.readFile ./unfuck.json);
+  unfuck-releases = {
+    "0.43.05" = {
+      unfuckRelease = "0.43.05";
+      sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2";
+    };
+    "0.44.05" = {
+      unfuckRelease = "0.44.05";
+      sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
+    };
+    "0.44.09" = {
+      unfuckRelease = "0.44.09";
+      sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm";
+    };
+    "0.44.10" = {
+      unfuckRelease = "0.44.10";
+      sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
+    };
+    "0.44.11" = {
+      unfuckRelease = "0.44.11.1";
+      sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+    };
+    "0.44.12" = {
+      unfuckRelease = "0.44.12";
+      sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
+    };
+  };
 
   release = if hasAttr dfVersion unfuck-releases
             then getAttr dfVersion unfuck-releases

From 7bda775331b503f5d5d814309d5ae635c1d36162 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 9 Sep 2018 10:30:58 +0200
Subject: [PATCH 0624/3253] imv: Include i686-linux in platforms attribute

The package builds and works fine on i686-linux, so there is no need to
fail evaluation on those systems.

Signed-off-by: aszlig <aszlig@nix.build>
Issue: #45976
Cc: @rnhmjoj, @xeji
---
 pkgs/applications/graphics/imv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 9def3f16ad03..cdbf5f446875 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage    = https://github.com/eXeC64/imv; 
     license     = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
-    platforms   = [ "x86_64-linux" ];
+    platforms   = [ "i686-linux" "x86_64-linux" ];
   };
 }
 

From 97acac9a81cb16992c8f6ff856ffcbeede667eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 9 Sep 2018 09:45:45 +0100
Subject: [PATCH 0625/3253] doc/vim: improve plugin documentation

---
 doc/languages-frameworks/vim.section.md | 70 ++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d6a4fe8da8d..26aa9c25f06f 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -5,11 +5,16 @@ date: 2016-06-25
 ---
 # User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
 
-You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
+Both Neovim and Vim can be configured to include your favorite plugins
+and additional libraries.
+
 Loading can be deferred; see examples.
 
-Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load
-packages.
+At the moment we support three different methods for managing plugins:
+
+- Vim packages (*recommend*)
+- VAM (=vim-addon-manager)
+- Pathogen
 
 ## Custom configuration
 
@@ -25,7 +30,19 @@ vim_configurable.customize {
 }
 ```
 
-## Vim packages
+For Neovim the `configure` argument can be overridden to achieve the same:
+
+```
+neovim.override {
+  configure = {
+    customRC = ''
+      # here your custom configuration goes!
+    '';
+  };
+}
+```
+
+## Managing plugins with Vim packages
 
 To store you plugins in Vim packages the following example can be used:
 
@@ -38,13 +55,50 @@ vim_configurable.customize {
     opt = [ phpCompletion elm-vim ];
     # To automatically load a plugin when opening a filetype, add vimrc lines like:
     # autocmd FileType php :packadd phpCompletion
-  }
-};
+  };
+}
 ```
 
-## VAM
+For Neovim the syntax is
 
-### dependencies by Vim plugins
+```
+neovim.override {
+  configure = {
+    customRC = ''
+      # here your custom configuration goes!
+    '';
+    packages.myVimPackage = with pkgs.vimPlugins; {
+      # see examples below how to use custom packages
+      start = [ ];
+      opt = [ ];
+    };
+  };
+}
+```
+
+The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable:
+
+```
+{
+  packageOverrides = pkgs: with pkgs; {
+    myVim = vim_configurable.customize {
+      name = "vim-with-plugins";
+      # add here code from the example section
+    };
+    myNeovim = neovim.override {
+      configure = {
+      # add here code from the example section
+      };
+    };
+  };
+}
+```
+
+After that you can install your special grafted `myVim` or `myNeovim` packages.
+
+## Managing plugins with VAM
+
+### Handling dependencies of Vim plugins
 
 VAM introduced .json files supporting dependencies without versioning
 assuming that "using latest version" is ok most of the time.

From dfcf07d9d381f1911ac9117d5f477b83f444a03f Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Sun, 9 Sep 2018 11:34:18 +0200
Subject: [PATCH 0626/3253] pythonPackages.django-raster: fix build (#46413)

---
 pkgs/development/python-modules/django-raster/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 19ef783fe759..39634b8d293a 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, buildPythonPackage, fetchPypi,
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
   numpy, django_colorful, pillow, psycopg2,
-  pyparsing, django, celery
+  pyparsing, django_2_1, celery, boto3
 }:
 buildPythonPackage rec {
   version = "0.6";
   pname = "django-raster";
 
+  disabled = !isPy3k;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8";
@@ -15,7 +17,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
-                            pyparsing django celery ];
+                            pyparsing django_2_1 celery boto3 ];
 
   meta = with stdenv.lib; {
     description = "Basic raster data integration for Django";

From 1ac912bf1b964f0703b1bd8b10fb445006cdc383 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Sep 2018 05:37:29 -0400
Subject: [PATCH 0627/3253] texlive: Adds patch for missing synctex header.
 (#46376)

This seems like a known issue as other distributions (ArchLinux here)
have patches fixing the issue.

This hopefully fixes more than one dependant builds for ZHF 18.09.
---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 53fac978ebb0..e3528ce699d1 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -32,6 +32,11 @@ let
         url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.64.patch?h=packages/texlive-bin;
         sha256 = "0443d074zl3c5raba8jyhavish706arjcd80ibb84zwnwck4ai0w";
       })
+      (fetchurl {
+        name = "synctex-missing-header.patch";
+        url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/synctex-missing-header.patch?h=packages/texlive-bin&id=da56abf0f8a1e85daca0ec0f031b8fa268519e6b;
+        sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
+      })
     ];
 
     configureFlags = [

From 5b1b4adb2acdc7b28273356f2f5deb4522f78ae0 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Sun, 9 Sep 2018 12:10:18 +0200
Subject: [PATCH 0628/3253] pythonPackages.CDDB: fix darwin build (#46412)

---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2eae6212cd4d..e08a394ae433 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1456,6 +1456,8 @@ in {
 
     disabled = !isPy27;
 
+    buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ];
+
     src = pkgs.fetchurl {
       url = "http://cddb-py.sourceforge.net/${name}.tar.gz";
       sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w";

From c020a59ccd5ee57706e7461ababebd3366102b2b Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Sun, 9 Sep 2018 12:13:36 +0200
Subject: [PATCH 0629/3253] pythonPackages.tifffile: fix python 2 build
 (#46415)

---
 pkgs/development/python-modules/tifffile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 159051b9a6a8..3910ddf07256 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder
-, numpy, nose, enum34, futures }:
+, numpy, nose, enum34, futures, pathlib }:
 
 buildPythonPackage rec {
   pname = "tifffile";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ numpy ]
-    ++ lib.optional isPy27 futures
+    ++ lib.optional isPy27 [ futures pathlib ]
     ++ lib.optional (pythonOlder "3.0") enum34;
 
   meta = with stdenv.lib; {

From 953199fd829f0b9d3c3ed95cf2e1b138d2268a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 9 Sep 2018 09:46:35 +0100
Subject: [PATCH 0630/3253] vim-plugins: rewrite updater

A new python script has been added to replace the aged viml-based
updater. The new updater has the following advantages:

- use rss feeds to check for updates quicker
- parallel downloads & better caching
- uses proper override mechanism instead of text substitution
- update generated files in-place instead of having to insert updated plugins manually

Automatically reading `dependencies` from the plugins directory has been
not re-implemented.
This has been mostly been used by Mark Weber's plugins, which seem to
no longer receive regular updates.
This could be implemented in future as required.
---
 doc/languages-frameworks/vim.section.md |   12 +
 pkgs/misc/vim-plugins/default.nix       | 3403 ++---------------------
 pkgs/misc/vim-plugins/generated.nix     | 2941 ++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names  |  586 ++--
 4 files changed, 3404 insertions(+), 3538 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/generated.nix

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 26aa9c25f06f..f0a6559c3d51 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -179,6 +179,18 @@ Sample output2:
     ]
 
 
+## Adding new plugins to nixpkgs
+
+In `pkgs/misc/vim-plugins/vim-plugin-names` we store the plugin names
+for all vim plugins we automatically generate plugins for.
+The format of this file `github username/github repository`:
+For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+After adding your plugin to this file run the `./update.py` in the same folder.
+This will updated a file called `generated.nix` and make your plugin accessible in the
+`vimPlugins` attribute set (`vimPlugins.nerdtree` in our example).
+If additional steps to the build process of the plugin are required, add an
+override to the `pkgs/misc/vim-plugins/default.nix` in the same directory.
+
 ## Important repositories
 
 - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index d251b2da45c6..0b6ad80acbdb 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,5 +1,6 @@
 # TODO check that no license information gets lost
-{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby
+{ callPackage, config, lib, stdenv
+, python, cmake, vim, vimUtils, ruby
 , which, fetchgit, llvmPackages, rustPlatform
 , xkb_switch, fzf, skim
 , python3, boost, icu, ncurses
@@ -16,43 +17,24 @@ let
 
   inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
+  generated = callPackage ./generated.nix {
+    inherit buildVimPluginFrom2Nix;
+  };
 
 # TL;DR
 # * Add your plugin to ./vim-plugin-names
-#   * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names
-# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"`
-# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
-#       update ./vim-plugin-names to contain only plugins which need generation
-# Copy the generated expression(s) into this file from the ./result file.
-# If plugin is complicated then make changes to ./vim2nix/additional-nix-code
-
-# This attrs contains two sections:
-# The first contains plugins added manually, the second contains plugins
-# generated by call nix#ExportPluginsForNix.
-# Documentation & usage see vim-utils.nix.
-# attribute names should be the same as used by vim-pi to make dependency
-# resolution work
-self = rec {
-  # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations
-  # which recreates this the following derivations based on ./vim-plugin-names
-  pluginnames2nix = vimUtils.pluginnames2Nix {
-    name = "vim-plugin-names-to-nix";
-    namefiles = [./vim-plugin-names];
-  };
-
-  # Section I
-  vim-addon-vim2nix = vim2nix;
-
-  vim2nix = buildVimPluginFrom2Nix { # use it to update plugins
+# * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
+# * run ./update.py
+#
+# If additional modifications to the build process are required,
+# use add an override to this file.
+self = generated // (with generated; {
+  vim2nix = buildVimPluginFrom2Nix {
     name = "vim2nix";
     src = ./vim2nix;
     dependencies = ["vim-addon-manager"];
   };
 
-
-  # Section II
-  # Update with vimUtils.vimPlugins.pluginnames2Nix command
-
   fzfWrapper = buildVimPluginFrom2Nix {
     name = fzf.name;
     src = fzf.src;
@@ -108,328 +90,7 @@ self = rec {
     dependencies = [];
   };
 
-  # missing dependency, using additional-nix-code results in an invalid expression
-  vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2018-06-02";
-    src = fetchgit {
-      url = "https://github.com/shougo/vimshell.vim";
-      rev = "03bf7673a5098918a533000d67dca97546695237";
-      sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi";
-    };
-    dependencies = [ "vimproc-vim" ];
-  };
-
-  # --- generated packages bellow this line ---
-
-  vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-auto-save-2017-11-08";
-    src = fetchgit {
-      url = "https://github.com/907th/vim-auto-save";
-      rev = "66643afb55a1fcd3a9b4336f868f58da45bff397";
-      sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p";
-    };
-    dependencies = [];
-
-  };
-
-  vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2018-05-28";
-    src = fetchgit {
-      url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "3c50ddb50635f7899b4339a64bc02333cdd24a4b";
-      sha256 = "1zw7b3zxgsmj149z238qx2palqysdywqgsxgj2z37kc8is8dpdpy";
-    };
-    dependencies = [];
-
-  };
-
-  ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2017-11-01";
-    src = fetchgit {
-      url = "https://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13";
-      sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1";
-    };
-    dependencies = [];
-
-  };
-
-  ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-cmatcher-2015-10-15";
-    src = fetchgit {
-      url = "https://github.com/JazzCore/ctrlp-cmatcher";
-      rev = "6c36334f106b6fd981d23e724e9a618734cab43a";
-      sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q";
-    };
-    dependencies = [];
-    buildInputs = [ python ];
-    buildPhase = ''
-      patchShebangs .
-      ./install.sh
-    '';
-  };
-
-  julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "julia-vim-2018-07-01";
-    src = fetchgit {
-      url = "https://github.com/JuliaEditorSupport/julia-vim";
-      rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2";
-      sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06";
-    };
-    dependencies = [];
-
-  };
-
-  zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zeavim-vim-2018-03-22";
-    src = fetchgit {
-      url = "https://github.com/KabbAmine/zeavim.vim";
-      rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa";
-      sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj";
-    };
-    dependencies = [];
-
-  };
-
-  vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2018-08-19";
-    src = fetchgit {
-      url = "https://github.com/LnL7/vim-nix";
-      rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18";
-      sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-actions-2018-01-18";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-actions";
-      rev = "540cae09832ba6abf9fc63c55781bf86584c33ac";
-      sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-async-2017-03-20";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-async";
-      rev = "eca316a4480f68c2cb62128f3187dc7b2002afde";
-      sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q";
-    };
-    dependencies = ["vim-addon-signs"];
-
-  };
-
-  vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-background-cmd-2015-12-11";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-background-cmd";
-      rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a";
-      sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4";
-    };
-    dependencies = ["vim-addon-mw-utils"];
-
-  };
-
-  vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-commenting-2013-06-10";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-commenting";
-      rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
-      sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-completion-2015-02-10";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-completion";
-      rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
-      sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr";
-    };
-    dependencies = ["tlib"];
-
-  };
-
-  vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-errorformats-2014-11-05";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-errorformats";
-      rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-goto-thing-at-cursor-2012-01-11";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
-      rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0";
-    };
-    dependencies = ["tlib"];
-
-  };
-
-  vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-local-vimrc-2015-03-19";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-local-vimrc";
-      rev = "6a27f95b35befa70cd0d049329cd0920566c764b";
-      sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2017-05-07";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-manager";
-      rev = "2434225ae48e608c2b6ac86c8da1c62209da746f";
-      sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb";
-    };
-    dependencies = [];
-    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
-  };
-
-  vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mru-2013-08-08";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-mru";
-      rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
-      sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm";
-    };
-    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
-
-  };
-
-  vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-mw-utils-2018-03-09";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-mw-utils";
-      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
-      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-nix-2017-09-11";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-nix";
-      rev = "3001a9db5f816dd7af11384f15415bddd146ef86";
-      sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy";
-    };
-    dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-other-2014-07-15";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-other";
-      rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6";
-    };
-    dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
-
-  };
-
-  vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-php-manual-2015-01-01";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-php-manual";
-      rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
-      sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-signs-2013-04-19";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-signs";
-      rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy";
-    };
-    dependencies = [];
-
-  };
-
-  vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2017-02-11";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-sql";
-      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
-      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
-    };
-    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
-
-  };
-
-  vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-syntax-checker-2017-06-26";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-syntax-checker";
-      rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
-      sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-toggle-buffer-2012-01-13";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-toggle-buffer";
-      rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-xdebug-2014-08-29";
-    src = fetchgit {
-      url = "https://github.com/MarcWeber/vim-addon-xdebug";
-      rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
-      sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw";
-    };
-    dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
-
-  };
-
-  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2018-07-04";
-    src = fetchgit {
-      url = "https://github.com/Quramy/tsuquyomi";
-      rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65";
-      sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l";
-    };
-    dependencies = [];
-
-  };
-
-  clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2018-01-18";
-    src = fetchgit {
-      url = "https://github.com/Rip-Rip/clang_complete";
-      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
-      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
-    };
-    dependencies = [];
+  clang_complete = clang_complete.overrideAttrs(old: {
     # In addition to the arguments you pass to your compiler, you also need to
     # specify the path of the C++ std header (if you are using C++).
     # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
@@ -441,1591 +102,24 @@ self = rec {
       substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
         --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
     '';
-  };
+  });
 
-  riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "riv-vim-2018-06-21";
-    src = fetchgit {
-      url = "https://github.com/Rykka/riv.vim";
-      rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8";
-      sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch";
-    };
-    dependencies = [];
-
-  };
-
-  ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ultisnips-2018-04-30";
-    src = fetchgit {
-      url = "https://github.com/SirVer/ultisnips";
-      rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba";
-      sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3";
-    };
-    dependencies = [];
-
-  };
-
-  vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hoogle-2018-03-04";
-    src = fetchgit {
-      url = "https://github.com/Twinside/vim-hoogle";
-      rev = "871d104c92e33cb238506f2805f1652561978cc8";
-      sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n";
-    };
-    dependencies = [];
-
-  };
-
-  vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-07-06";
-    src = fetchgit {
-      url = "https://github.com/airblade/vim-gitgutter";
-      rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca";
-      sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l";
-    };
-    dependencies = [];
-
-  };
-
-  Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Spacegray-vim-2018-06-20";
-    src = fetchgit {
-      url = "https://github.com/ajh17/Spacegray.vim";
-      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
-      sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
-    };
-    dependencies = [];
-
-  };
-
-  nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdtree-git-plugin-2017-03-12";
-    src = fetchgit {
-      url = "https://github.com/albfan/nerdtree-git-plugin";
-      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
-      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
-    };
-    dependencies = [];
-
-  };
-
-  vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-colors-solarized-2011-05-09";
-    src = fetchgit {
-      url = "https://github.com/altercation/vim-colors-solarized";
-      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-closetag-2018-05-15";
-    src = fetchgit {
-      url = "https://github.com/alvan/vim-closetag";
-      rev = "17367f433e095a66a8a885ab628033ce2a635aa1";
-      sha256 = "11qkk1vsihw2sv1vdn94xjwm2p5hvisjv5h1arpdyxpnz45rs6vh";
-    };
-    dependencies = [];
-
-  };
-
-  ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-z-2015-10-17";
-    src = fetchgit {
-      url = "https://github.com/amiorin/ctrlp-z";
-      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
-      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
-    };
-    dependencies = [];
-
-  };
-
-  vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-logreview-2017-07-08";
-    src = fetchgit {
-      url = "https://github.com/andreshazard/vim-logreview";
-      rev = "b7b66ab338e904127d796af49235b8c29742f18f";
-      sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3";
-    };
-    dependencies = [];
-
-  };
-
-  peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "peskcolor-vim-git-2016-06-11";
-    src = fetchgit {
-      url = "https://github.com/andsild/peskcolor.vim.git";
-      rev = "cba4fc739bbebacd503158f6509d9c226651f363";
-      sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq";
-    };
-    dependencies = [];
-
-  };
-
-  flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "flake8-vim-2017-02-17";
-    src = fetchgit {
-      url = "https://github.com/andviro/flake8-vim";
-      rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
-      sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
-    };
-    dependencies = [];
-
-  };
-
-  vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2018-03-06";
-    src = fetchgit {
-      url = "https://github.com/ap/vim-css-color";
-      rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032";
-      sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx";
-    };
-    dependencies = [];
-
-  };
-
-  vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-bazel-2018-01-10";
-    src = fetchgit {
-      url = "https://github.com/bazelbuild/vim-bazel";
-      rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3";
-      sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy";
-    };
-    dependencies = ["maktaba"];
-
-  };
-
-  clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/bbchung/clighter8";
-      rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181";
-      sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg";
-    };
-    dependencies = [];
+  clighter8 = clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
         -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
     '';
-  };
+  });
 
-  neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/benekastah/neomake";
-      rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163";
-      sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0";
-    };
-    dependencies = [];
-
-  };
-
-  vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hdevtools-2017-03-11";
-    src = fetchgit {
-      url = "https://github.com/bitc/vim-hdevtools";
-      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
-      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
-    };
-    dependencies = [];
-
-  };
-
-  vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-trailing-whitespace-2017-09-22";
-    src = fetchgit {
-      url = "https://github.com/bronson/vim-trailing-whitespace";
-      rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
-      sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
-    };
-    dependencies = [];
-
-  };
-
-  vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-toml-2018-06-15";
-    src = fetchgit {
-      url = "https://github.com/cespare/vim-toml";
-      rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80";
-      sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n";
-    };
-    dependencies = [];
-
-  };
-
-  denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-extra-2018-07-19";
-    src = fetchgit {
-      url = "https://github.com/chemzqm/denite-extra";
-      rev = "10836562703ebfe6552204e63b9b4293236d6d0f";
-      sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6";
-    };
-    dependencies = [];
-
-  };
-
-  denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-git-2018-07-19";
-    src = fetchgit {
-      url = "https://github.com/chemzqm/denite-git";
-      rev = "edd2c202e05c3f84e31b94a841fef236b923d559";
-      sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd";
-    };
-    dependencies = [];
-
-  };
-
-  concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "concealedyank-vim-2013-03-24";
-    src = fetchgit {
-      url = "https://github.com/chikatoike/concealedyank.vim";
-      rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd";
-      sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb";
-    };
-    dependencies = [];
-
-  };
-
-  sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sourcemap-vim-2012-09-19";
-    src = fetchgit {
-      url = "https://github.com/chikatoike/sourcemap.vim";
-      rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
-      sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350";
-    };
-    dependencies = [];
-
-  };
-
-  CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2018-07-18";
-    src = fetchgit {
-      url = "https://github.com/chrisbra/CheckAttach";
-      rev = "0f1f2e78071d7f805a0a679955cb4486f692b753";
-      sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc";
-    };
-    dependencies = [];
-
-  };
-
-  csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "csv-vim-2018-06-24";
-    src = fetchgit {
-      url = "https://github.com/chrisbra/csv.vim";
-      rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a";
-      sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy";
-    };
-    dependencies = [];
-
-  };
-
-  sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sparkup-2012-06-10";
-    src = fetchgit {
-      url = "https://github.com/chrisgeo/sparkup";
-      rev = "6fbfceef890e705c47b42b27be743ffed6f9296e";
-      sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm";
-    };
-    dependencies = [];
-
-  };
-
-  base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "base16-vim-2018-05-24";
-    src = fetchgit {
-      url = "https://github.com/chriskempson/base16-vim";
-      rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d";
-      sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk";
-    };
-    dependencies = [];
-
-  };
-
-  vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sort-motion-2018-07-15";
-    src = fetchgit {
-      url = "https://github.com/christoomey/vim-sort-motion";
-      rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
-      sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
-    };
-    dependencies = [];
-
-  };
-
-  vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2018-07-13";
-    src = fetchgit {
-      url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "18b775fbccde5ff02e516c014290650bb40e257d";
-      sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj";
-    };
-    dependencies = [];
-
-  };
-
-  spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2018-03-29";
-    src = fetchgit {
-      url = "https://github.com/ctjhoa/spacevim";
-      rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
-      sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
-    };
-    dependencies = [];
-
-  };
-
-  ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2018-06-28";
-    src = fetchgit {
-      url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
-      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
-    };
-    dependencies = [];
-
-  };
-
-  vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim2hs-2014-04-16";
-    src = fetchgit {
-      url = "https://github.com/dag/vim2hs";
-      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b";
-    };
-    dependencies = [];
-
-  };
-
-  quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "quickfixstatus-2011-09-02";
-    src = fetchgit {
-      url = "https://github.com/dannyob/quickfixstatus";
-      rev = "fd3875b914fc51bbefefa8c4995588c088163053";
-      sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v";
-    };
-    dependencies = [];
-
-  };
-
-  agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "agda-vim-2018-05-23";
-    src = fetchgit {
-      url = "https://github.com/derekelkins/agda-vim";
-      rev = "24169e70c1dbd784349b1551b6a3753680d9bb87";
-      sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6";
-    };
-    dependencies = [];
-
-  };
-
-  vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-scala-2017-11-10";
-    src = fetchgit {
-      url = "https://github.com/derekwyatt/vim-scala";
-      rev = "0b909e24f31d94552eafae610da0f31040c08f2b";
-      sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5";
-    };
-    dependencies = [];
-
-  };
-
-  vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-table-mode-2018-05-16";
-    src = fetchgit {
-      url = "https://github.com/dhruvasagar/vim-table-mode";
-      rev = "5483e163bd0a67e729e0e8436315f33f9e126baf";
-      sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw";
-    };
-    dependencies = [];
-
-  };
-
-  vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2017-04-07";
-    src = fetchgit {
-      url = "https://github.com/digitaltoad/vim-jade";
-      rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975";
-      sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y";
-    };
-    dependencies = [];
-
-  };
-
-  pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pony-vim-syntax-2017-09-26";
-    src = fetchgit {
-      url = "https://github.com/dleonard0/pony-vim-syntax";
-      rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc";
-      sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr";
-    };
-    dependencies = [];
-
-  };
-
-  vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/dracula/vim";
-      rev = "d329d61c1752807059aef388c4e9629296760a35";
-      sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm";
-    };
-    dependencies = [];
-
-  };
-
-  xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "xptemplate-2017-12-06";
-    src = fetchgit {
-      url = "https://github.com/drmingdrmer/xptemplate";
-      rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3";
-      sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p";
-    };
-    dependencies = [];
-
-  };
-
-  ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-vim-2016-06-19";
-    src = fetchgit {
-      url = "https://github.com/eagletmt/ghcmod-vim";
-      rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff";
-      sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a";
-    };
-    dependencies = [];
-
-  };
-
-  neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2018-05-13";
-    src = fetchgit {
-      url = "https://github.com/eagletmt/neco-ghc";
-      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
-      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
-    };
-    dependencies = [];
-
-  };
-
-  editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "editorconfig-vim-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/editorconfig/editorconfig-vim";
-      rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4";
-      sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x";
-    };
-    dependencies = [];
-
-  };
-
-  vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-cute-python-git-2016-04-04";
-    src = fetchgit {
-      url = "https://github.com/ehamberg/vim-cute-python.git";
-      rev = "d7a6163f794500447242df2bedbe20bd751b92da";
-      sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf";
-    };
-    dependencies = [];
-
-  };
-
-  acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "acp-2013-02-05";
-    src = fetchgit {
-      url = "https://github.com/eikenb/acp";
-      rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e";
-      sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg";
-    };
-    dependencies = [];
-
-  };
-
-  vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-05-25";
-    src = fetchgit {
-      url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "b916c00a7cdb6099dbebb6096eab55794751e2b3";
-      sha256 = "1scg80j7kjjqfcswddwsig166zmipa9q6rm0kh8779i7qflgg4g0";
-    };
-    dependencies = [];
-
-  };
-
-  elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2018-06-18";
-    src = fetchgit {
-      url = "https://github.com/elmcast/elm-vim";
-      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
-      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
-    };
-    dependencies = [];
-
-  };
-
-  vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-json-2018-01-10";
-    src = fetchgit {
-      url = "https://github.com/elzr/vim-json";
-      rev = "3727f089410e23ae113be6222e8a08dd2613ecf2";
-      sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/embear/vim-localvimrc";
-      rev = "a3cb22a68625e022df1da402361801cc817bcec5";
-      sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc";
-    };
-    dependencies = [];
-
-  };
-
-  vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-haskellConcealPlus-2016-05-13";
-    src = fetchgit {
-      url = "https://github.com/enomsg/vim-haskellConcealPlus";
-      rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03";
-      sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr";
-    };
-    dependencies = [];
-
-  };
-
-  ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ensime-vim-2018-04-21";
-    src = fetchgit {
-      url = "https://github.com/ensime/ensime-vim";
-      rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2";
-      sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320";
-    };
-    dependencies = ["vimproc" "vimshell" "self" "forms"];
-    passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-  };
-
-  supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "supertab-2017-11-14";
-    src = fetchgit {
-      url = "https://github.com/ervandew/supertab";
-      rev = "40fe711e088e2ab346738233dd5adbb1be355172";
-      sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db";
-    };
-    dependencies = [];
-
-  };
-
-  YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "YUNOcommit-vim-2014-11-26";
-    src = fetchgit {
-      url = "https://github.com/esneider/YUNOcommit.vim";
-      rev = "981082055a73ef076d7e27477874d2303153a448";
-      sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
-    };
-    dependencies = [];
-
-  };
-
-  vim-lastplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-lastplace-2017-06-13";
-    src = fetchgit {
-      url = "https://github.com/farmergreg/vim-lastplace";
-      rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55";
-      sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja";
-    };
-    dependencies = [];
-
-  };
-
-  vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/fatih/vim-go";
-      rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585";
-      sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-isort-2017-03-12";
-    src = fetchgit {
-      url = "https://github.com/fisadev/vim-isort";
-      rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda";
-      sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m";
-    };
-    dependencies = [];
-    postPatch = ''
-      substituteInPlace ftplugin/python_vimisort.vim \
-          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
-    '';
-  };
-
-  vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-colorschemes-2017-08-22";
-    src = fetchgit {
-      url = "https://github.com/flazz/vim-colorschemes";
-      rev = "eab315701f4627967fd62582eefc4e37a3745786";
-      sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
-    };
-    dependencies = [];
-
-  };
-
-  floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2017-08-02";
-    src = fetchgit {
-      url = "https://github.com/floobits/floobits-neovim";
-      rev = "9ccd5a8d5d28261b9686717d61a32b756f38f189";
-      sha256 = "02njg49qz9bfzggpn7z5c7w1wa1k5hxly66904wizl601fa6c664";
-    };
-    dependencies = [];
-
-  };
-
-  psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2018-03-11";
-    src = fetchgit {
-      url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
-      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
-    };
-    dependencies = [];
-
-  };
-
-  vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snipmate-2017-04-20";
-    src = fetchgit {
-      url = "https://github.com/garbas/vim-snipmate";
-      rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e";
-      sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj";
-    };
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-
-  };
-
-  vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2018-02-02";
-    src = fetchgit {
-      url = "https://github.com/gmarik/vundle";
-      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
-      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
-    };
-    dependencies = [];
-
-  };
-
-  csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "csapprox-2013-07-26";
-    src = fetchgit {
-      url = "https://github.com/godlygeek/csapprox";
-      rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd";
-      sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6";
-    };
-    dependencies = [];
-
-  };
-
-  tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tabular-2016-05-04";
-    src = fetchgit {
-      url = "https://github.com/godlygeek/tabular";
-      rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367";
-      sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz";
-    };
-    dependencies = [];
-
-  };
-
-  vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-codefmt-2018-06-06";
-    src = fetchgit {
-      url = "https://github.com/google/vim-codefmt";
-      rev = "78f646545c4e1254fc413242e5c204a2dc79665d";
-      sha256 = "0ysnjsc7nybm374k039655y1wijkh8p2m0hsfxf9cxf79yjinyql";
-    };
-    dependencies = ["maktaba"];
-
-  };
-
-  vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsonnet-2018-04-10";
-    src = fetchgit {
-      url = "https://github.com/google/vim-jsonnet";
-      rev = "1425166887329363381194adc457b02b663b1354";
-      sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j";
-    };
-    dependencies = [];
-
-  };
-
-  vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-maktaba-2018-05-06";
-    src = fetchgit {
-      url = "https://github.com/google/vim-maktaba";
-      rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d";
-      sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3";
-    };
-    dependencies = [];
-
-  };
-
-  gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gitv-2018-06-10";
-    src = fetchgit {
-      url = "https://github.com/gregsexton/gitv";
-      rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
-      sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
-    };
-    dependencies = ["fugitive"];
-
-  };
-
-  xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "xterm-color-table-vim-2013-12-31";
-    src = fetchgit {
-      url = "https://github.com/guns/xterm-color-table.vim";
-      rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4";
-      sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19";
-    };
-    dependencies = [];
-
-  };
-
-  vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2018-05-05";
-    src = fetchgit {
-      url = "https://github.com/heavenshell/vim-jsdoc";
-      rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503";
-      sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm";
-    };
-    dependencies = [];
-
-  };
-
-  vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-leader-guide-2017-03-18";
-    src = fetchgit {
-      url = "https://github.com/hecal3/vim-leader-guide";
-      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
-      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
-    };
-    dependencies = [];
-
-  };
-
-  vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2018-07-19";
-    src = fetchgit {
-      url = "https://github.com/honza/vim-snippets";
-      rev = "1143432afdb3a97b606b081700eead5b4f499d4d";
-      sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf";
-    };
-    dependencies = [];
-
-  };
-
-  idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2017-12-04";
-    src = fetchgit {
-      url = "https://github.com/idris-hackers/idris-vim";
-      rev = "091ed6b267749927777423160eeab520109dd9c1";
-      sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-SyntaxRange-2018-03-09";
-    src = fetchgit {
-      url = "https://github.com/inkarkat/vim-SyntaxRange";
-      rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3";
-      sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr";
-    };
-    dependencies = [];
-
-  };
-
-  vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-extradite-2015-09-22";
-    src = fetchgit {
-      url = "https://github.com/int3/vim-extradite";
-      rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
-      sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i";
-    };
-    dependencies = [];
-
-  };
-
-  calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2018-07-04";
-    src = fetchgit {
-      url = "https://github.com/itchyny/calendar.vim";
-      rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b";
-      sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r";
-    };
-    dependencies = [];
-
-  };
-
-  lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2018-07-05";
-    src = fetchgit {
-      url = "https://github.com/itchyny/lightline.vim";
-      rev = "0532dff598abca9975d3f80128eaadadbf1d91d4";
-      sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc";
-    };
-    dependencies = [];
-
-  };
-
-  thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2017-04-24";
-    src = fetchgit {
-      url = "https://github.com/itchyny/thumbnail.vim";
-      rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00";
-      sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5";
-    };
-    dependencies = [];
-
-  };
-
-  vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-cursorword-2017-10-19";
-    src = fetchgit {
-      url = "https://github.com/itchyny/vim-cursorword";
-      rev = "4878d6185b99131c5f610cc6ad0e223439ac4601";
-      sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf";
-    };
-    dependencies = [];
-
-  };
-
-  vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitbranch-2017-05-28";
-    src = fetchgit {
-      url = "https://github.com/itchyny/vim-gitbranch";
-      rev = "8118dc1cdd387bd609852be4bf350360ce881193";
-      sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j";
-    };
-    dependencies = [];
-
-  };
-
-  vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ipython-2015-06-23";
-    src = fetchgit {
-      url = "https://github.com/ivanov/vim-ipython";
-      rev = "42499f094b805b90b683afa5009cee99abd0bb75";
-      sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
-    };
-    dependencies = [];
-
-  };
-
-  tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tender-vim-2017-03-14";
-    src = fetchgit {
-      url = "https://github.com/jacoborus/tender.vim";
-      rev = "6b0497a59233b3e67fb528a498069eb1d24743f9";
-      sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn";
-    };
-    dependencies = [];
-
-  };
-
-  vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-test-git-2018-07-10";
-    src = fetchgit {
-      url = "https://github.com/janko-m/vim-test.git";
-      rev = "e24477e81e91fe90c5d914849848027cb09a7c86";
-      sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b";
-    };
-    dependencies = [];
-
-  };
-
-  vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hier-2011-08-27";
-    src = fetchgit {
-      url = "https://github.com/jceb/vim-hier";
-      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
-      sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
-    };
-    dependencies = [];
-    buildInputs = [ vim ];
-  };
-
-  vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/jceb/vim-orgmode";
-      rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c";
-      sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx";
-    };
-    dependencies = [];
-
-  };
-
-  vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2018-05-02";
-    src = fetchgit {
-      url = "https://github.com/jeetsukumaran/vim-buffergator";
-      rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916";
-      sha256 = "1b6sw5858h3v7p46v1fiy06jnfwiwqsfqwhr46ia12d0rfdm538c";
-    };
-    dependencies = [];
-
-  };
-
-  tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tslime-vim-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/jgdavey/tslime.vim";
-      rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0";
-      sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x";
-    };
-    dependencies = [];
-
-  };
-
-  vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-docbk-2015-04-01";
-    src = fetchgit {
-      url = "https://github.com/jhradilek/vim-docbk";
-      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
-      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
-    };
-    dependencies = [];
-
-  };
-
-  auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2017-07-03";
-    src = fetchgit {
-      url = "https://github.com/jiangmiao/auto-pairs";
-      rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
-      sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
-    };
-    dependencies = [];
-
-  };
-
-  vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2018-05-05";
-    src = fetchgit {
-      url = "https://github.com/jistr/vim-nerdtree-tabs";
-      rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
-      sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
-    };
-    dependencies = [];
-
-  };
-
-  zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zenburn-2018-04-29";
-    src = fetchgit {
-      url = "https://github.com/jnurmine/zenburn";
-      rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd";
-      sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi";
-    };
-    dependencies = [];
-
-  };
-
-  vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-colorstepper-2016-01-28";
-    src = fetchgit {
-      url = "https://github.com/jonbri/vim-colorstepper";
-      rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05";
-      sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs";
-    };
-    dependencies = [];
-
-  };
-
-  vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xdebug-2012-08-15";
-    src = fetchgit {
-      url = "https://github.com/joonty/vim-xdebug";
-      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
-      sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw";
-    };
-    dependencies = [];
-    postInstall = false;
-  };
-
-  fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/junegunn/fzf.vim";
-      rev = "6ce58caad320be3cf9ff5d275191f88524edf326";
-      sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf";
-    };
-    dependencies = [];
-
-  };
-
-  goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-vim-2017-06-01";
-    src = fetchgit {
-      url = "https://github.com/junegunn/goyo.vim";
-      rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592";
-      sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj";
-    };
-    dependencies = [];
-
-  };
-
-  limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "limelight-vim-2016-06-24";
-    src = fetchgit {
-      url = "https://github.com/junegunn/limelight.vim";
-      rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
-      sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
-    };
-    dependencies = [];
-
-  };
-
-  vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2017-06-03";
-    src = fetchgit {
-      url = "https://github.com/junegunn/vim-easy-align";
-      rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
-      sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774";
-    };
-    dependencies = [];
-
-  };
-
-  vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dashboard-2017-08-08";
-    src = fetchgit {
-      url = "https://github.com/junegunn/vim-github-dashboard";
-      rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6";
-      sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y";
-    };
-    dependencies = [];
-
-  };
-
-  vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2017-03-20";
-    src = fetchgit {
-      url = "https://github.com/junegunn/vim-peekaboo";
-      rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49";
-      sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m";
-    };
-    dependencies = [];
-
-  };
-
-  vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eighties-2016-12-15";
-    src = fetchgit {
-      url = "https://github.com/justincampbell/vim-eighties";
-      rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
-      sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
-    };
-    dependencies = [];
-
-  };
-
-  vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-niceblock-2018-01-30";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-niceblock";
-      rev = "178629a8b81da2fa614bd6c19e7797e325ee9153";
-      sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0";
-    };
-    dependencies = [];
-
-  };
-
-  vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-operator-replace-2015-02-25";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-operator-replace";
-      rev = "1345a556a321a092716e149d4765a5e17c0e9f0f";
-      sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q";
-    };
-    dependencies = [];
-
-  };
-
-  vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-operator-user-2015-02-17";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-operator-user";
-      rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa";
-      sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb";
-    };
-    dependencies = [];
-
-  };
-
-  vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tabpagecd-2013-11-29";
-    src = fetchgit {
-      url = "https://github.com/kana/vim-tabpagecd";
-      rev = "8b71a03a037608fa5918f5096812577cec6355e4";
-      sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm";
-    };
-    dependencies = [];
-
-  };
-
-  vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2018-02-27";
-    src = fetchgit {
-      url = "https://github.com/kchmck/vim-coffee-script";
-      rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb";
-      sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x";
-    };
-    dependencies = [];
-
-  };
-
-  swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "swift-vim-2018-07-21";
-    src = fetchgit {
-      url = "https://github.com/keith/swift.vim";
-      rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab";
-      sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153";
-    };
-    dependencies = [];
-
-  };
-
-  rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow_parentheses-vim-2013-03-04";
-    src = fetchgit {
-      url = "https://github.com/kien/rainbow_parentheses.vim";
-      rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
-      sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7";
-    };
-    dependencies = [];
-
-  };
-
-  fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fastfold-2018-06-02";
-    src = fetchgit {
-      url = "https://github.com/konfekt/fastfold";
-      rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30";
-      sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r";
-    };
-    dependencies = [];
-
-  };
-
-  vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2018-07-06";
-    src = fetchgit {
-      url = "https://github.com/kshenoy/vim-signature";
-      rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc";
-      sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm";
-    };
-    dependencies = [];
-
-  };
-
-  vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2017-02-20";
-    src = fetchgit {
-      url = "https://github.com/lambdalisue/vim-gista";
-      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
-      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
-    };
-    dependencies = [];
-
-  };
-
-  latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "latex-box-2015-06-01";
-    src = fetchgit {
-      url = "https://github.com/latex-box-team/latex-box";
-      rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
-      sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl";
-    };
-    dependencies = [];
-
-  };
-
-  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2018-03-08";
-    src = fetchgit {
-      url = "https://github.com/leafgarland/typescript-vim";
-      rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5";
-      sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4";
-    };
-    dependencies = [];
-
-  };
-
-  vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ledger-2017-12-12";
-    src = fetchgit {
-      url = "https://github.com/ledger/vim-ledger";
-      rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";
-      sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";
-    };
-    dependencies = [];
-
-  };
-
-  vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jinja-2016-11-16";
-    src = fetchgit {
-      url = "https://github.com/lepture/vim-jinja";
-      rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
-      sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
-    };
-    dependencies = [];
-
-  };
-
-  vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/lervag/vimtex";
-      rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c";
-      sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n";
-    };
-    dependencies = [];
-
-  };
-
-  cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cosco-vim-2018-02-15";
-    src = fetchgit {
-      url = "https://github.com/lfilho/cosco.vim";
-      rev = "434dc68b93b8f42babe1887a269145ce39c97edf";
-      sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv";
-    };
-    dependencies = [];
-
-  };
-
-  vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2018-06-05";
-    src = fetchgit {
-      url = "https://github.com/lokaltog/vim-easymotion";
-      rev = "1a0244c90c3ff46219cf9597bb13662be4232407";
-      sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy";
-    };
-    dependencies = [];
-
-  };
-
-  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-lawrencium-2017-01-10";
-    src = fetchgit {
-      url = "https://github.com/ludovicchabant/vim-lawrencium";
-      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
-      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
-    };
-    dependencies = [];
-
-  };
-
-  rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rainbow-2018-06-19";
-    src = fetchgit {
-      url = "https://github.com/luochen1990/rainbow";
-      rev = "549724c2123c5a06834676963be0d76d5c37abc1";
-      sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf";
-    };
-    dependencies = [];
-
-  };
-
-  vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2017-03-27";
-    src = fetchgit {
-      url = "https://github.com/lyokha/vim-xkbswitch";
-      rev = "a85ebddb9038e6b05138c48868a319a9e13d1868";
-      sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr";
-    };
-    dependencies = [];
-    patchPhase = ''
-      substituteInPlace plugin/xkbswitch.vim \
-              --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
-    '';
-    buildInputs = [ xkb_switch ];
-  };
-
-  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2018-06-01";
-    src = fetchgit {
-      url = "https://github.com/machakann/vim-highlightedyank";
-      rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a";
-      sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk";
-    };
-    dependencies = [];
-
-  };
-
-  tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tagbar-2017-12-17";
-    src = fetchgit {
-      url = "https://github.com/majutsushi/tagbar";
-      rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
-      sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9";
-    };
-    dependencies = [];
-
-  };
-
-  vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsbeautify-2018-01-31";
-    src = fetchgit {
-      url = "https://github.com/maksimr/vim-jsbeautify";
-      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
-      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
-    };
-    dependencies = [];
-
-  };
-
-  Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Jenkinsfile-vim-syntax-2018-04-03";
-    src = fetchgit {
-      url = "https://github.com/martinda/Jenkinsfile-vim-syntax";
-      rev = "45418b171e06f63e0814cac6a656832384708aba";
-      sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p";
-    };
-    dependencies = [];
-
-  };
-
-  gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gist-vim-2016-10-10";
-    src = fetchgit {
-      url = "https://github.com/mattn/gist-vim";
-      rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
-      sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
-    };
-    dependencies = [];
-
-  };
-
-  webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "webapi-vim-2018-03-14";
-    src = fetchgit {
-      url = "https://github.com/mattn/webapi-vim";
-      rev = "252250381a9509257bfb06b9f95441e41e3e23b5";
-      sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a";
-    };
-    dependencies = [];
-
-  };
-
-  undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2018-07-02";
-    src = fetchgit {
-      url = "https://github.com/mbbill/undotree";
-      rev = "a80159c9f5c238575b63984b8bc610bc5de6b233";
-      sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl";
-    };
-    dependencies = [];
-
-  };
-
-  forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "forms-2012-11-28";
-    src = fetchgit {
-      url = "https://github.com/megaannum/forms";
-      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
-      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
-    };
-    dependencies = ["self"];
-
-  };
-
-  self = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "self-2014-05-28";
-    src = fetchgit {
-      url = "https://github.com/megaannum/self";
-      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
-      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
-    };
-    dependencies = [];
-
-  };
-
-  robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "robotframework-vim-2017-04-14";
-    src = fetchgit {
-      url = "https://github.com/mfukar/robotframework-vim";
-      rev = "75d5b371a4da2a090a2872d55bd0dead013f334e";
-      sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad";
-    };
-    dependencies = [];
-
-  };
-
-  vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grepper-git-2018-04-24";
-    src = fetchgit {
-      url = "https://github.com/mhinz/vim-grepper.git";
-      rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4";
-      sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g";
-    };
-    dependencies = [];
-
-  };
-
-  vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/mhinz/vim-signify";
-      rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc";
-      sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59";
-    };
-    dependencies = [];
-
-  };
-
-  vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2018-07-21";
-    src = fetchgit {
-      url = "https://github.com/mhinz/vim-startify";
-      rev = "8cde338d1f35057fd64146090c960a55b953dcd9";
-      sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29";
-    };
-    dependencies = [];
-
-  };
-
-  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-object-2018-04-08";
-    src = fetchgit {
-      url = "https://github.com/michaeljsmith/vim-indent-object";
-      rev = "5c5b24c959478929b54a9e831a8e2e651a465965";
-      sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19";
-    };
-    dependencies = [];
-
-  };
-
-  ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ack-vim-2018-02-28";
-    src = fetchgit {
-      url = "https://github.com/mileszs/ack.vim";
-      rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042";
-      sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm";
-    };
-    dependencies = [];
-
-  };
-
-  vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-yapf-2018-06-05";
-    src = fetchgit {
-      url = "https://github.com/mindriot101/vim-yapf";
-      rev = "cae79733a1a39732c5305d4a89cd093d17cb917d";
-      sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc";
-    };
-    dependencies = [];
+  command-t = command-t.overrideAttrs(old: {
+    buildInputs = [ ruby rake ];
     buildPhase = ''
-      substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
+      rake make
+      rm ruby/command-t/ext/command-t/*.o
     '';
-  };
+  });
 
-  lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lushtags-2017-04-19";
-    src = fetchgit {
-      url = "https://github.com/mkasa/lushtags";
-      rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf";
-      sha256 = "1si5n07k4r8kji4whglav9q59ksv6bi5v58xbpc2l5bavlk8kn6n";
-    };
-    dependencies = [];
-
-  };
-
-  gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gruvbox-2018-02-25";
-    src = fetchgit {
-      url = "https://github.com/morhetz/gruvbox";
-      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
-      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
-    };
-    dependencies = [];
-
-  };
-
-  hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "hlint-refactor-vim-2015-12-05";
-    src = fetchgit {
-      url = "https://github.com/mpickering/hlint-refactor-vim";
-      rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
-      sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
-    };
-    dependencies = [];
-
-  };
-
-  vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-guides-2018-05-14";
-    src = fetchgit {
-      url = "https://github.com/nathanaelkane/vim-indent-guides";
-      rev = "54d889a63716ee2f1818aa2ec5082db47147147b";
-      sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2";
-    };
-    dependencies = [];
-
-  };
-
-  vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-stylish-haskell-2015-05-10";
-    src = fetchgit {
-      url = "https://github.com/nbouscal/vim-stylish-haskell";
-      rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
-      sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j";
-    };
-    dependencies = [];
-
-  };
-
-  vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easygit-2018-07-08";
-    src = fetchgit {
-      url = "https://github.com/neoclide/vim-easygit";
-      rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a";
-      sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8";
-    };
-    dependencies = [];
-
-  };
-
-  haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2018-05-22";
-    src = fetchgit {
-      url = "https://github.com/neovimhaskell/haskell-vim";
-      rev = "b1ac46807835423c4a4dd063df6d5b613d89c731";
-      sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br";
-    };
-    dependencies = [];
-
-  };
-
-  cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2018-02-01";
-    src = fetchgit {
-      url = "https://github.com/nixprime/cpsm";
-      rev = "8a4a0a05162762b857b656d51b59a5bf01850877";
-      sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b";
-    };
-    dependencies = [];
+  cpsm = cpsm.overrideAttrs(old: {
     buildInputs = [
       python3
       stdenv
@@ -2039,170 +133,119 @@ self = rec {
       export PY3=ON
       ./install.sh
     '';
-  };
+	});
 
-  vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-iced-coffee-script-2013-12-27";
-    src = fetchgit {
-      url = "https://github.com/noc7c9/vim-iced-coffee-script";
-      rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
-      sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7";
-    };
-    dependencies = [];
+  ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
+    buildInputs = [ python ];
+    buildPhase = ''
+      patchShebangs .
+      ./install.sh
+    '';
+  });
 
-  };
+  deoplete-go = deoplete-go.overrideAttrs(old: {
+    buildInputs = [ python3 ];
+    buildPhase = ''
+      pushd ./rplugin/python3/deoplete/ujson
+      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
+      popd
+      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+   '';
+  });
 
-  shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "shabadou-vim-2016-07-19";
-    src = fetchgit {
-      url = "https://github.com/osyo-manga/shabadou.vim";
-      rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1";
-      sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870";
-    };
-    dependencies = [];
+  ensime-vim = ensime-vim.overrideAttrs(old: {
+    passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
+    dependencies = ["vimproc" "vimshell" "self" "forms"];
+  });
 
-  };
+  forms = forms.overrideAttrs(old: {
+		dependencies = ["self"];
+	});
 
-  vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-textobj-multiblock-2014-06-02";
-    src = fetchgit {
-      url = "https://github.com/osyo-manga/vim-textobj-multiblock";
-      rev = "670a5ba57d73fcd793f480e262617c6eb0103355";
-      sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf";
-    };
-    dependencies = [];
+  gitv = gitv.overrideAttrs(old: {
+		dependencies = ["gitv"];
+	});
 
-  };
+  taglist = taglist.overrideAttrs(old: {
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
+  });
 
-  vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2017-12-03";
-    src = fetchgit {
-      url = "https://github.com/osyo-manga/vim-watchdogs";
-      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
-      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
-    };
-    dependencies = [];
+  vimshell-vim = vimshell-vim.overrideAttrs(old: {
+    dependencies = [ "vimproc-vim" ];
+  });
 
-  };
+  vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
+  });
 
-  vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-javascript-2018-07-14";
-    src = fetchgit {
-      url = "https://github.com/pangloss/vim-javascript";
-      rev = "39e332a3c36c0115e1eab85c34cf121b7585869d";
-      sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw";
-    };
-    dependencies = [];
+  vim-addon-actions = vim-addon-actions.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  });
 
-  };
+  vim-addon-async = vim-addon-async.overrideAttrs(old: {
+    dependencies = [ "vim-addon-signs" ];
+  });
 
-  vim-qml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-qml-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/peterhoeg/vim-qml";
-      rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a";
-      sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc";
-    };
-    dependencies = [];
+  vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" ];
+  });
 
-  };
+  vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
+    dependencies = [ "tlib" ];
+  });
 
-  vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2018-06-05";
-    src = fetchgit {
-      url = "https://github.com/plasticboy/vim-markdown";
-      rev = "6d2cb3c06cd546fd4bee4136679db3a3d5de97fa";
-      sha256 = "17izjzgpwpl6i1vvz2hcd7ympgxyjmsb0k62rhvl15jmx06c3ysz";
-    };
-    dependencies = [];
+  vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = [ "tlib" ];
+  });
 
-  };
+  vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
+    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
+  });
 
-  python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/python-mode/python-mode";
-      rev = "d241974f40e8d206f9970e51fb0069951862ba35";
-      sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci";
-    };
-    dependencies = [];
+  vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
+    dependencies = [
+      "vim-addon-completion"
+      "vim-addon-goto-thing-at-cursor"
+      "vim-addon-errorformats"
+      "vim-addon-actions"
+      "vim-addon-mw-utils" "tlib"
+    ];
+  });
 
-  };
+  vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
+    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
+  });
 
-  vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2018-05-13";
-    src = fetchgit {
-      url = "https://github.com/racer-rust/vim-racer";
-      rev = "cd663ddacc89fb3cbbb9649f7cd36528960b1fe9";
-      sha256 = "1k75ypgiy13l28mndi6p95lc818k04imlm7xk0y9sck8bsny1vhi";
-    };
-    dependencies = [];
+  vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = ["vim-addon-mw-utils" "tlib"];
+  });
 
-  };
+  vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  });
 
-  awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "awesome-vim-colorschemes-2018-01-20";
-    src = fetchgit {
-      url = "https://github.com/rafi/awesome-vim-colorschemes";
-      rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d";
-      sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z";
-    };
-    dependencies = [];
+  vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
+  });
 
-  };
+  vim-bazel = vim-bazel.overrideAttrs(old: {
+    dependencies = ["maktaba"];
+  });
 
-  purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "purescript-vim-2018-07-05";
-    src = fetchgit {
-      url = "https://github.com/raichoo/purescript-vim";
-      rev = "ab8547cef5827f046d43ba57203acb6692b7ef06";
-      sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33";
-    };
-    dependencies = [];
+  vim-codefmt = vim-codefmt.overrideAttrs(old: {
+		dependencies = ["maktaba"];
+	});
 
-  };
+  vim-easytags = vim-easytags.overrideAttrs(old: {
+		dependencies = ["vim-misc"];
+	});
 
-  vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pencil-2017-06-14";
-    src = fetchgit {
-      url = "https://github.com/reedes/vim-pencil";
-      rev = "2dcd974b7255e4af83cf79a208f04a3489065e22";
-      sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0";
-    };
-    dependencies = [];
-
-  };
-
-  vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wordy-2018-03-10";
-    src = fetchgit {
-      url = "https://github.com/reedes/vim-wordy";
-      rev = "14b9dbf76a82e29273a74768573900361200467f";
-      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
-    };
-    dependencies = [];
-
-  };
-
-  committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "committia-vim-git-2018-07-14";
-    src = fetchgit {
-      url = "https://github.com/rhysd/committia.vim.git";
-      rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279";
-      sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1";
-    };
-    dependencies = [];
-
-  };
-
-  vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2018-06-22";
-    src = fetchgit {
-      url = "https://github.com/rhysd/vim-grammarous";
-      rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8";
-      sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk";
-    };
-    dependencies = [];
+  vim-grammarous = vim-grammarous.overrideAttrs(old: {
     # use `:GrammarousCheck` to initialize checking
     # In neovim, you also want to use set
     #   let g:grammarous#show_first_error = 1
@@ -2213,302 +256,48 @@ self = rec {
         inherit languagetool;
       })
     ];
-  };
+  });
 
-  vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-operator-surround-2017-12-23";
-    src = fetchgit {
-      url = "https://github.com/rhysd/vim-operator-surround";
-      rev = "001c0da077b5b38a723151b19760d220e02363db";
-      sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh";
-    };
-    dependencies = [];
+  vim-hier = vim-hier.overrideAttrs(old: {
+    buildInputs = [ vim ];
+  });
 
-  };
+  vim-isort = vim-isort.overrideAttrs(old: {
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+        --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';
+  });
 
-  vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-puppet-2018-04-12";
-    src = fetchgit {
-      url = "https://github.com/rodjek/vim-puppet";
-      rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097";
-      sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv";
-    };
-    dependencies = [];
+	vim-snipmate = vim-snipmate.overrideAttrs(old: {
+		dependencies = ["vim-addon-mw-utils" "tlib"];
+	});
 
-  };
 
-  nvim-cm-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-cm-racer-2017-07-27";
-    src = fetchgit {
-      url = "https://github.com/roxma/nvim-cm-racer";
-      rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2";
-      sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx";
-    };
-    dependencies = [];
+  vim-wakatime = vim-wakatime.overrideAttrs(old: {
+    buildInputs = [ python ];
+  });
 
-  };
+  vim-xdebug = vim-xdebug.overrideAttrs(old: {
+    postInstall = false;
+  });
 
-  nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nvim-completion-manager-2018-04-18";
-    src = fetchgit {
-      url = "https://github.com/roxma/nvim-completion-manager";
-      rev = "3ef5ade36e7321aace4e9e22da216202bdcd65f1";
-      sha256 = "0vfcnvdcxhs3in4pwcqjb5h3ns7ik53n4xb1h9r94w1gfw00lh1l";
-    };
-    dependencies = [];
+  vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
+    patchPhase = ''
+      substituteInPlace plugin/xkbswitch.vim \
+        --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+    '';
+    buildInputs = [ xkb_switch ];
+  });
 
-  };
+  vim-yapf = vim-yapf.overrideAttrs(old: {
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
+    '';
+  });
 
-  rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2018-07-17";
-    src = fetchgit {
-      url = "https://github.com/rust-lang/rust.vim";
-      rev = "2fa74427456a68e9e90f542567f851df50d48a8c";
-      sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46";
-    };
-    dependencies = [];
-
-  };
-
-  vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-devicons-2018-06-21";
-    src = fetchgit {
-      url = "https://github.com/ryanoasis/vim-devicons";
-      rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26";
-      sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg";
-    };
-    dependencies = [];
-
-  };
-
-  neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-07-16";
-    src = fetchgit {
-      url = "https://github.com/sbdchd/neoformat";
-      rev = "f20e73193f2260d4437d160759d6b623a74a5a35";
-      sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp";
-    };
-    dependencies = [];
-
-  };
-
-  nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdcommenter-2018-06-21";
-    src = fetchgit {
-      url = "https://github.com/scrooloose/nerdcommenter";
-      rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78";
-      sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx";
-    };
-    dependencies = [];
-
-  };
-
-  nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nerdtree-2018-06-15";
-    src = fetchgit {
-      url = "https://github.com/scrooloose/nerdtree";
-      rev = "d6032c876c6d6932ab7f07e262a16c9a85a31d5b";
-      sha256 = "0s7z60rcdkziqqjc45adfqykpznv7aagfyfi5ybsxi5w4b8f2b9s";
-    };
-    dependencies = [];
-
-  };
-
-  syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "syntastic-2018-07-16";
-    src = fetchgit {
-      url = "https://github.com/scrooloose/syntastic";
-      rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9";
-      sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q";
-    };
-    dependencies = [];
-
-  };
-
-  deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-rust-2017-07-18";
-    src = fetchgit {
-      url = "https://github.com/sebastianmarkow/deoplete-rust";
-      rev = "0a86e502113910c33448b337c4d50cabea120d25";
-      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
-    };
-    dependencies = [];
-
-  };
-
-  vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2018-07-08";
-    src = fetchgit {
-      url = "https://github.com/sheerun/vim-polyglot";
-      rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751";
-      sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p";
-    };
-    dependencies = [];
-
-  };
-
-  context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "context_filetype-vim-2018-04-01";
-    src = fetchgit {
-      url = "https://github.com/shougo/context_filetype.vim";
-      rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a";
-      sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2";
-    };
-    dependencies = [];
-
-  };
-
-  denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "denite-nvim-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/shougo/denite.nvim";
-      rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8";
-      sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r";
-    };
-    dependencies = [];
-
-  };
-
-  deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2018-07-22";
-    src = fetchgit {
-      url = "https://github.com/shougo/deoplete.nvim";
-      rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73";
-      sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz";
-    };
-    dependencies = [];
-
-  };
-
-  echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "echodoc-vim-2018-03-26";
-    src = fetchgit {
-      url = "https://github.com/shougo/echodoc.vim";
-      rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015";
-      sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr";
-    };
-    dependencies = [];
-
-  };
-
-  neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-syntax-2017-10-01";
-    src = fetchgit {
-      url = "https://github.com/shougo/neco-syntax";
-      rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3";
-      sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip";
-    };
-    dependencies = [];
-
-  };
-
-  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-10-01";
-    src = fetchgit {
-      url = "https://github.com/shougo/neco-vim";
-      rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9";
-      sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73";
-    };
-    dependencies = [];
-
-  };
-
-  neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2018-03-28";
-    src = fetchgit {
-      url = "https://github.com/shougo/neocomplete.vim";
-      rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
-      sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
-    };
-    dependencies = [];
-
-  };
-
-  neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoinclude-vim-2018-05-22";
-    src = fetchgit {
-      url = "https://github.com/shougo/neoinclude.vim";
-      rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a";
-      sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg";
-    };
-    dependencies = [];
-
-  };
-
-  neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomru-vim-2017-10-01";
-    src = fetchgit {
-      url = "https://github.com/shougo/neomru.vim";
-      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
-      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
-    };
-    dependencies = [];
-
-  };
-
-  neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2018-06-17";
-    src = fetchgit {
-      url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "e5946e9ec4c68965dbabfaaf2584b1c057738afd";
-      sha256 = "114w2vm28075bz85867lz0rzam1m0wk7dkbkm1lm0jbknbpk606n";
-    };
-    dependencies = [];
-
-  };
-
-  neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-07-19";
-    src = fetchgit {
-      url = "https://github.com/shougo/neosnippet.vim";
-      rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb";
-      sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4";
-    };
-    dependencies = [];
-
-  };
-
-  neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoyank-vim-git-2018-03-26";
-    src = fetchgit {
-      url = "https://github.com/shougo/neoyank.vim.git";
-      rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef";
-      sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928";
-    };
-    dependencies = [];
-
-  };
-
-  tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tabpagebuffer-vim-2014-09-30";
-    src = fetchgit {
-      url = "https://github.com/shougo/tabpagebuffer.vim";
-      rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc";
-      sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f";
-    };
-    dependencies = [];
-
-  };
-
-  unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2018-06-17";
-    src = fetchgit {
-      url = "https://github.com/shougo/unite.vim";
-      rev = "c175ba7df239a5971e4c189ecbc9486b160fbde2";
-      sha256 = "16j5vhmqs04y5rps5g86bgpf91w067gyw9rz47hf0y0a52niy436";
-    };
-    dependencies = [];
-
-  };
-
-  vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2018-01-07";
-    src = fetchgit {
-      url = "https://github.com/shougo/vimproc.vim";
-      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
-      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
-    };
-    dependencies = [];
+  vimproc-vim = vimproc-vim.overrideAttrs(old: {
     buildInputs = [ which ];
 
     buildPhase = ''
@@ -2518,904 +307,31 @@ self = rec {
         --replace vimproc_linux32.so vimproc_unix.so
       make -f make_unix.mak
     '';
-  };
+  });
 
-  fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-gitlab-vim-2018-07-04";
-    src = fetchgit {
-      url = "https://github.com/shumphrey/fugitive-gitlab.vim";
-      rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838";
-      sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d";
-    };
-    dependencies = [];
+  YankRing-vim = YankRing-vim.overrideAttrs(old: {
+    sourceRoot = ".";
+  });
 
-  };
-
-  gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gundo-vim-2017-05-09";
-    src = fetchgit {
-      url = "https://github.com/sjl/gundo.vim";
-      rev = "46c443ee9d5854320eb965a1fdee781ba83a070e";
-      sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2";
-    };
-    dependencies = [];
-
-  };
-
-  splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "splice-vim-2017-09-03";
-    src = fetchgit {
-      url = "https://github.com/sjl/splice.vim";
-      rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
-      sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
-    };
-    dependencies = [];
-
-  };
-
-  last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "last256-2017-06-11";
-    src = fetchgit {
-      url = "https://github.com/sk1418/last256";
-      rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0";
-      sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv";
-    };
-    dependencies = [];
-
-  };
-
-  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2018-06-25";
-    src = fetchgit {
-      url = "https://github.com/slashmili/alchemist.vim";
-      rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648";
-      sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma";
-    };
-    dependencies = [];
-
-  };
-
-  vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-smalls-2015-05-02";
-    src = fetchgit {
-      url = "https://github.com/t9md/vim-smalls";
-      rev = "9619eae81626bd63f88165e0520c467698264e34";
-      sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad";
-    };
-    dependencies = [];
-
-  };
-
-  vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hardtime-2017-03-31";
-    src = fetchgit {
-      url = "https://github.com/takac/vim-hardtime";
-      rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b";
-      sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5";
-    };
-    dependencies = [];
-
-  };
-
-  vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-expand-region-2013-08-19";
-    src = fetchgit {
-      url = "https://github.com/terryma/vim-expand-region";
-      rev = "966513543de0ddc2d673b5528a056269e7917276";
-      sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv";
-    };
-    dependencies = [];
-
-  };
-
-  vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-07-16";
-    src = fetchgit {
-      url = "https://github.com/terryma/vim-multiple-cursors";
-      rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d";
-      sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw";
-    };
-    dependencies = [];
-
-  };
-
-  vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimpreviewpandoc-2018-05-12";
-    src = fetchgit {
-      url = "https://github.com/tex/vimpreviewpandoc";
-      rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
-      sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
-    };
-    dependencies = [];
-
-  };
-
-  vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ft-diff_fold-2013-02-10";
-    src = fetchgit {
-      url = "https://github.com/thinca/vim-ft-diff_fold";
-      rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87";
-      sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma";
-    };
-    dependencies = [];
-
-  };
-
-  vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-prettyprint-2016-07-16";
-    src = fetchgit {
-      url = "https://github.com/thinca/vim-prettyprint";
-      rev = "d6060d2b1ff1cff71714e126addd3b10883ade12";
-      sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9";
-    };
-    dependencies = [];
-
-  };
-
-  vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2018-06-19";
-    src = fetchgit {
-      url = "https://github.com/thinca/vim-quickrun";
-      rev = "825f9f195521646f7001f10cad8627c48017311f";
-      sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa";
-    };
-    dependencies = [];
-
-  };
-
-  vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-scouter-2014-08-10";
-    src = fetchgit {
-      url = "https://github.com/thinca/vim-scouter";
-      rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc";
-      sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8";
-    };
-    dependencies = [];
-
-  };
-
-  vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-themis-2017-12-28";
-    src = fetchgit {
-      url = "https://github.com/thinca/vim-themis";
-      rev = "691cd3912ba318dbd8d9fa0035fee629b424766d";
-      sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd";
-    };
-    dependencies = [];
-
-  };
-
-  molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "molokai-2015-11-11";
-    src = fetchgit {
-      url = "https://github.com/tomasr/molokai";
-      rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
-      sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
-    };
-    dependencies = [];
-
-  };
-
-  vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-solidity-2018-04-17";
-    src = fetchgit {
-      url = "https://github.com/tomlion/vim-solidity";
-      rev = "569bbbedc3898236d5912fed0caf114936112ae4";
-      sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx";
-    };
-    dependencies = [];
-
-  };
-
-  tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib_vim-2018-04-08";
-    src = fetchgit {
-      url = "https://github.com/tomtom/tlib_vim";
-      rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b";
-      sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx";
-    };
-    dependencies = [];
-
-  };
-
-  vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-abolish-2017-03-10";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-abolish";
-      rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd";
-      sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m";
-    };
-    dependencies = [];
-
-  };
-
-  vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-commentary-2018-07-11";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-commentary";
-      rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a";
-      sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6";
-    };
-    dependencies = [];
-
-  };
-
-  vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-dispatch";
-      rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b";
-      sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh";
-    };
-    dependencies = [];
-
-  };
-
-  vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2018-07-13";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-eunuch";
-      rev = "e5f4f955d53e07192fb330ff272604c1b8290532";
-      sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za";
-    };
-    dependencies = [];
-
-  };
-
-  vim-fireplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fireplace-2018-06-01";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-fireplace";
-      rev = "1ef0f0726cadd96547a5f79103b66339f170da02";
-      sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4";
-    };
-    dependencies = [];
-
-  };
-
-  vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-flagship-2018-07-24";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-flagship";
-      rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff";
-      sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f";
-    };
-    dependencies = [];
-
-  };
-
-  vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-fugitive-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-fugitive";
-      rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac";
-      sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v";
-    };
-    dependencies = [];
-
-  };
-
-  vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pathogen-2018-04-05";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-pathogen";
-      rev = "06da921608b971fb47603671bcafdb2843992eb3";
-      sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi";
-    };
-    dependencies = [];
-
-  };
-
-  vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-projectionist-2018-07-24";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-projectionist";
-      rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a";
-      sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz";
-    };
-    dependencies = [];
-
-  };
-
-  vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-repeat-2018-07-02";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-repeat";
-      rev = "43d2678fa59d068c815d8298331c195e850ff5a7";
-      sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0";
-    };
-    dependencies = [];
-
-  };
-
-  vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-rhubarb-2018-07-21";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-rhubarb";
-      rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a";
-      sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9";
-    };
-    dependencies = [];
-
-  };
-
-  vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-scriptease-2018-07-18";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-scriptease";
-      rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300";
-      sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4";
-    };
-    dependencies = [];
-
-  };
-
-  vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sensible-2018-07-16";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-sensible";
-      rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525";
-      sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q";
-    };
-    dependencies = [];
-
-  };
-
-  vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-sleuth-2018-05-24";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-sleuth";
-      rev = "478e495d40434fb42c655ea2881c8c6b114ecd49";
-      sha256 = "1dicdxxfd5sywk02hbpknbr100n96qggy3zy5v520dxdknq0sccz";
-    };
-    dependencies = [];
-
-  };
-
-  vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-speeddating-2017-05-24";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-speeddating";
-      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
-      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
-    };
-    dependencies = [];
-
-  };
-
-  vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-surround-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-surround";
-      rev = "597068870b8f093a8b2d11536c62ff31222ee8d0";
-      sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x";
-    };
-    dependencies = [];
-
-  };
-
-  vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tbone-2018-06-27";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-tbone";
-      rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737";
-      sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4";
-    };
-    dependencies = [];
-
-  };
-
-  vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-vinegar-2018-06-20";
-    src = fetchgit {
-      url = "https://github.com/tpope/vim-vinegar";
-      rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63";
-      sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8";
-    };
-    dependencies = [];
-
-  };
-
-  hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "hasksyn-2014-09-03";
-    src = fetchgit {
-      url = "https://github.com/travitch/hasksyn";
-      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
-      sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
-    };
-    dependencies = [];
-
-  };
-
-  vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-haskellconceal-2017-06-15";
-    src = fetchgit {
-      url = "https://github.com/twinside/vim-haskellconceal";
-      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
-      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
-    };
-    dependencies = [];
-
-  };
-
-  caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "caw-vim-2018-06-16";
-    src = fetchgit {
-      url = "https://github.com/tyru/caw.vim";
-      rev = "e82ae00f3fc03289d4054b44f100025a1bc81939";
-      sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc";
-    };
-    dependencies = [];
-
-  };
-
-  open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "open-browser-vim-2018-04-26";
-    src = fetchgit {
-      url = "https://github.com/tyru/open-browser.vim";
-      rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
-      sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
-    };
-    dependencies = [];
-
-  };
-
-  neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-look-2018-01-21";
-    src = fetchgit {
-      url = "https://github.com/ujihisa/neco-look";
-      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
-      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
-    };
-    dependencies = [];
-
-  };
-
-  youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/valloric/youcompleteme";
-      rev = "15362d9cb8ec054c929e9a202252825eabe47e58";
-      sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy";
-    };
-    dependencies = [];
+  youcompleteme = youcompleteme.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
-                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
+        "'ycm_path_to_python_interpreter', '${python}/bin/python'"
 
       rm -r third_party/ycmd
       ln -s ${ycmd}/lib/ycmd third_party
     '';
 
     meta = {
-      description = "Fastest non utf-8 aware word and C completion engine for Vim";
+      description = "A code-completion engine for Vim";
       homepage = https://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
       platforms = stdenv.lib.platforms.unix;
     };
-  };
-
-  vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-07-24";
-    src = fetchgit {
-      url = "https://github.com/vim-airline/vim-airline";
-      rev = "59f3669a42728406da6d1b948608cae120d1453f";
-      sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025";
-    };
-    dependencies = [];
-
-  };
-
-  vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2018-06-14";
-    src = fetchgit {
-      url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "b35f952a6ae6768ae2c6a9f4febc7945cc311f74";
-      sha256 = "1j9y9irrzsq1bwp3b22ls016byi0yc9ymigzhw0n180rk6nb36c7";
-    };
-    dependencies = [];
-
-  };
-
-  vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc";
-      rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb";
-      sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk";
-    };
-    dependencies = [];
-
-  };
-
-  vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-after-2017-11-22";
-    src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc-after";
-      rev = "844f27debf4d72811049167f97191a3b551ddfd5";
-      sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf";
-    };
-    dependencies = [];
-
-  };
-
-  vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2017-04-13";
-    src = fetchgit {
-      url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3";
-      sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw";
-    };
-    dependencies = [];
-
-  };
-
-  vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-ruby-2018-07-08";
-    src = fetchgit {
-      url = "https://github.com/vim-ruby/vim-ruby";
-      rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf";
-      sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs";
-    };
-    dependencies = [];
-
-  };
-
-  Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Colour-Sampler-Pack-2012-11-29";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/Colour-Sampler-Pack";
-      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
-      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
-    };
-    dependencies = [];
-
-  };
-
-  Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Improved-AnsiEsc-2015-08-25";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/Improved-AnsiEsc";
-      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
-      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
-    };
-    dependencies = [];
-
-  };
-
-  Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Rename-2011-08-30";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/Rename";
-      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
-      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
-    };
-    dependencies = [];
-
-  };
-
-  ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ReplaceWithRegister-2014-10-30";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/ReplaceWithRegister";
-      rev = "832efc23111d19591d495dc72286de2fb0b09345";
-      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
-    };
-    dependencies = [];
-
-  };
-
-  YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "YankRing-vim-2015-07-28";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/YankRing.vim";
-      rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65";
-      sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw";
-    };
-    dependencies = [];
-
-  };
-
-  a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "a-vim-2010-11-06";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/a.vim";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
-    };
-    dependencies = [];
-
-  };
-
-  align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "align-2012-08-07";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/align";
-      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
-      sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
-    };
-    dependencies = [];
-
-  };
-
-  argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "argtextobj-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/argtextobj.vim";
-      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
-      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
-    };
-    dependencies = [];
-
-  };
-
-  bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "bats-vim-2013-07-03";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/bats.vim";
-      rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a";
-      sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx";
-    };
-    dependencies = [];
-
-  };
-
-  changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "changeColorScheme-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/changeColorScheme.vim";
-      rev = "b041d49f828629d72f2232531a230d1ec5de2405";
-      sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
-    };
-    dependencies = [];
-
-  };
-
-  matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "matchit-zip-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/matchit.zip";
-      rev = "ced6c409c9beeb0b4142d21906606bd194411d1d";
-      sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm";
-    };
-    dependencies = [];
-
-  };
-
-  mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "mayansmoke-git-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/mayansmoke.git";
-      rev = "168883af7aec05f139af251f47eadd5dfb802c9d";
-      sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd";
-    };
-    dependencies = [];
-
-  };
-
-  random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "random-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/random.vim";
-      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
-      sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
-    };
-    dependencies = [];
-
-  };
-
-  tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tabmerge-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/tabmerge";
-      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
-      sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
-    };
-    dependencies = [];
-
-  };
-
-  taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "taglist-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/taglist.vim";
-      rev = "53041fbc45398a9af631a20657e109707a455339";
-      sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd";
-    };
-    dependencies = [];
-
-  };
-
-  wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "wombat256-vim-2010-10-17";
-    src = fetchgit {
-      url = "https://github.com/vim-scripts/wombat256.vim";
-      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
-      sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
-    };
-    dependencies = [];
-
-  };
-
-  vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimoutliner-2018-07-04";
-    src = fetchgit {
-      url = "https://github.com/vimoutliner/vimoutliner";
-      rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
-      sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
-    };
-    dependencies = [];
-
-  };
-
-  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2018-07-21";
-    src = fetchgit {
-      url = "https://github.com/vimwiki/vimwiki";
-      rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4";
-      sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc";
-    };
-    dependencies = [];
-
-  };
-
-  dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dhall-vim-2018-07-23";
-    src = fetchgit {
-      url = "https://github.com/vmchale/dhall-vim";
-      rev = "5bdddb86e660f172841109a28e2a98efb76448ce";
-      sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq";
-    };
-    dependencies = [];
-
-  };
-
-  ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ale-2018-07-25";
-    src = fetchgit {
-      url = "https://github.com/w0rp/ale";
-      rev = "79ffdde267323a206a96227904549c370f27decf";
-      sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg";
-    };
-    dependencies = [];
-
-  };
-
-  vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2018-07-14";
-    src = fetchgit {
-      url = "https://github.com/wakatime/vim-wakatime";
-      rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf";
-      sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2";
-    };
-    dependencies = [];
-    buildInputs = [ python ];
-  };
-
-  targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "targets-vim-2018-05-27";
-    src = fetchgit {
-      url = "https://github.com/wellle/targets.vim";
-      rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75";
-      sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q";
-    };
-    dependencies = [];
-
-  };
-
-  vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dirdiff-2018-01-30";
-    src = fetchgit {
-      url = "https://github.com/will133/vim-dirdiff";
-      rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c";
-      sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1";
-    };
-    dependencies = [];
-
-  };
-
-  command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-11-16";
-    src = fetchgit {
-      url = "https://github.com/wincent/command-t";
-      rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6";
-      sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r";
-    };
-    dependencies = [];
-    buildInputs = [ ruby rake ];
-    buildPhase = ''
-      rake make
-      rm ruby/command-t/ext/command-t/*.o
-    '';
-  };
-
-  vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easytags-2015-07-01";
-    src = fetchgit {
-      url = "https://github.com/xolox/vim-easytags";
-      rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
-      sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
-    };
-    dependencies = ["vim-misc"];
-
-  };
-
-  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-misc-2015-05-21";
-    src = fetchgit {
-      url = "https://github.com/xolox/vim-misc";
-      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
-      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
-    };
-    dependencies = [];
-
-  };
-
-  vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-latex-live-preview-2017-11-09";
-    src = fetchgit {
-      url = "https://github.com/xuhdev/vim-latex-live-preview";
-      rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624";
-      sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy";
-    };
-    dependencies = [];
-
-  };
-
-  nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "nim-vim-2018-05-20";
-    src = fetchgit {
-      url = "https://github.com/zah/nim.vim";
-      rev = "704dd5d63cac54c22fe25c6efbcf18796df412e7";
-      sha256 = "0azk3m33c47ja24iirlrjqphmd8rzlivinqkx69izmd7l150ds2m";
-    };
-    dependencies = [];
-
-  };
-
-  deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2018-07-03";
-    src = fetchgit {
-      url = "https://github.com/zchee/deoplete-go";
-      rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd";
-      sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq";
-    };
-    dependencies = [];
-    buildInputs = [ python3 ];
-    buildPhase = ''
-      pushd ./rplugin/python3/deoplete/ujson
-      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
-      popd
-      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
-    '';
-  };
-
-  deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2018-07-10";
-    src = fetchgit {
-      url = "https://github.com/zchee/deoplete-jedi";
-      rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8";
-      sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6";
-    };
-    dependencies = [];
-
-  };
-
-  zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-07-18";
-    src = fetchgit {
-      url = "https://github.com/zig-lang/zig.vim";
-      rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe";
-      sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck";
-    };
-    dependencies = [];
-
-  };
-
-} // lib.optionalAttrs (config.allowAliases or true) (with self; {
-
+  });
+}) // lib.optionalAttrs (config.allowAliases or true) (with self; {
   # aliasess
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
@@ -3431,7 +347,7 @@ self = rec {
   Colour_Sampler_Pack = Colour-Sampler-Pack;
   command_T           = command-t; # backwards compat, added 2014-10-18
   commentary          = vim-commentary;
-  committia           = committia-vim-git;
+  committia           = committia-vim;
   concealedyank       = concealedyank-vim;
   context-filetype    = context_filetype-vim;
   Cosco               = cosco-vim;
@@ -3439,7 +355,7 @@ self = rec {
   CSApprox            = csapprox;
   csv                 = csv-vim;
   ctrlp               = ctrlp-vim;
-  cute-python         = vim-cute-python-git;
+  cute-python         = vim-cute-python;
   denite              = denite-nvim;
   easy-align          = vim-easy-align;
   easygit             = vim-easygit;
@@ -3465,19 +381,16 @@ self = rec {
   ipython             = vim-ipython;
   latex-live-preview  = vim-latex-live-preview;
   maktaba             = vim-maktaba;
-  mayansmoke          = mayansmoke-git;
   multiple-cursors    = vim-multiple-cursors;
   necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
   neocomplete         = neocomplete-vim;
   neoinclude          = neoinclude-vim;
   neomru              = neomru-vim;
   neosnippet          = neosnippet-vim;
-  neoyank             = neoyank-vim-git;
   The_NERD_Commenter  = nerdcommenter;
   The_NERD_tree       = nerdtree;
   open-browser        = open-browser-vim;
   pathogen            = vim-pathogen;
-  peskcolor           = peskcolor-vim-git;
   polyglot            = vim-polyglot;
   prettyprint         = vim-prettyprint;
   quickrun            = vim-quickrun;
@@ -3511,8 +424,7 @@ self = rec {
   tslime              = tslime-vim;
   unite               = unite-vim;
   UltiSnips           = ultisnips;
-  vim-grepper         = vim-grepper-git;
-  vim-test            = vim-test-git;
+  vim-addon-vim2nix   = vim2nix;
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   vinegar             = vim-vinegar;
@@ -3524,5 +436,6 @@ self = rec {
   YouCompleteMe       = youcompleteme;
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
+
 });
 in self
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
new file mode 100644
index 000000000000..45c5f950babb
--- /dev/null
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -0,0 +1,2941 @@
+# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!
+{ buildVimPluginFrom2Nix, fetchFromGitHub }:
+
+{
+  a-vim = buildVimPluginFrom2Nix {
+    name = "a-vim-2010-11-06";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
+    };
+  };
+
+  ack-vim = buildVimPluginFrom2Nix {
+    name = "ack-vim-2018-02-27";
+    src = fetchFromGitHub {
+      owner = "mileszs";
+      repo = "ack.vim";
+      rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042";
+      sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm";
+    };
+  };
+
+  acp = buildVimPluginFrom2Nix {
+    name = "acp-2013-02-05";
+    src = fetchFromGitHub {
+      owner = "eikenb";
+      repo = "acp";
+      rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e";
+      sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg";
+    };
+  };
+
+  agda-vim = buildVimPluginFrom2Nix {
+    name = "agda-vim-2018-05-23";
+    src = fetchFromGitHub {
+      owner = "derekelkins";
+      repo = "agda-vim";
+      rev = "24169e70c1dbd784349b1551b6a3753680d9bb87";
+      sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6";
+    };
+  };
+
+  alchemist-vim = buildVimPluginFrom2Nix {
+    name = "alchemist-vim-2018-09-02";
+    src = fetchFromGitHub {
+      owner = "slashmili";
+      repo = "alchemist.vim";
+      rev = "35e7e3062d1661b1c081765ed05bd8f0f5265183";
+      sha256 = "08i2nzsaq73iz8wkryq5nly3hl0xb3zy16zk7k28bslvyj3ricnc";
+    };
+  };
+
+  ale = buildVimPluginFrom2Nix {
+    name = "ale-2018-09-07";
+    src = fetchFromGitHub {
+      owner = "w0rp";
+      repo = "ale";
+      rev = "0ae4ea23c8573f9c693fcd5cd5ff9a3acc795b58";
+      sha256 = "005lmxhh07agdqa6qlk5f4vd3z2im8drrjy6ficrmwy7idp7cjyn";
+    };
+  };
+
+  align = buildVimPluginFrom2Nix {
+    name = "align-2012-08-08";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "align";
+      rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
+      sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
+    };
+  };
+
+  argtextobj-vim = buildVimPluginFrom2Nix {
+    name = "argtextobj-vim-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "argtextobj.vim";
+      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
+      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
+    };
+  };
+
+  auto-pairs = buildVimPluginFrom2Nix {
+    name = "auto-pairs-2017-07-03";
+    src = fetchFromGitHub {
+      owner = "jiangmiao";
+      repo = "auto-pairs";
+      rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
+      sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
+    };
+  };
+
+  awesome-vim-colorschemes = buildVimPluginFrom2Nix {
+    name = "awesome-vim-colorschemes-2018-01-20";
+    src = fetchFromGitHub {
+      owner = "rafi";
+      repo = "awesome-vim-colorschemes";
+      rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d";
+      sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z";
+    };
+  };
+
+  base16-vim = buildVimPluginFrom2Nix {
+    name = "base16-vim-2018-05-24";
+    src = fetchFromGitHub {
+      owner = "chriskempson";
+      repo = "base16-vim";
+      rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d";
+      sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk";
+    };
+  };
+
+  bats-vim = buildVimPluginFrom2Nix {
+    name = "bats-vim-2013-07-03";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "bats.vim";
+      rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a";
+      sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx";
+    };
+  };
+
+  calendar-vim = buildVimPluginFrom2Nix {
+    name = "calendar-vim-2018-08-05";
+    src = fetchFromGitHub {
+      owner = "itchyny";
+      repo = "calendar.vim";
+      rev = "1f20b779171d4d3a20abd47508692fbae32e3188";
+      sha256 = "01aiaslaww117kdwf7qxjc647g6bxcqr694mi3l0llblq549ih5l";
+    };
+  };
+
+  caw-vim = buildVimPluginFrom2Nix {
+    name = "caw-vim-2018-06-15";
+    src = fetchFromGitHub {
+      owner = "tyru";
+      repo = "caw.vim";
+      rev = "e82ae00f3fc03289d4054b44f100025a1bc81939";
+      sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc";
+    };
+  };
+
+  changeColorScheme-vim = buildVimPluginFrom2Nix {
+    name = "changeColorScheme-vim-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "changeColorScheme.vim";
+      rev = "b041d49f828629d72f2232531a230d1ec5de2405";
+      sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
+    };
+  };
+
+  CheckAttach = buildVimPluginFrom2Nix {
+    name = "CheckAttach-2018-09-02";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "CheckAttach";
+      rev = "e9167ad91e85d401441b8ac64b8dcbe3d0cf4df7";
+      sha256 = "1xif7lplm35scb36pzh2mq24j2khyzriiaqa2lzhwfilb7nq9c91";
+    };
+  };
+
+  clang_complete = buildVimPluginFrom2Nix {
+    name = "clang_complete-2018-01-18";
+    src = fetchFromGitHub {
+      owner = "Rip-Rip";
+      repo = "clang_complete";
+      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
+      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
+    };
+  };
+
+  clighter8 = buildVimPluginFrom2Nix {
+    name = "clighter8-2018-07-25";
+    src = fetchFromGitHub {
+      owner = "bbchung";
+      repo = "clighter8";
+      rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181";
+      sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg";
+    };
+  };
+
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix {
+    name = "Colour-Sampler-Pack-2012-11-30";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Colour-Sampler-Pack";
+      rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
+      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
+    };
+  };
+
+  command-t = buildVimPluginFrom2Nix {
+    name = "command-t-2017-11-17";
+    src = fetchFromGitHub {
+      owner = "wincent";
+      repo = "command-t";
+      rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6";
+      sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r";
+      fetchSubmodules = true;
+    };
+  };
+
+  committia-vim = buildVimPluginFrom2Nix {
+    name = "committia-vim-2018-08-16";
+    src = fetchFromGitHub {
+      owner = "rhysd";
+      repo = "committia.vim";
+      rev = "293a0078ec8fc6e302fa49f48db5fd609d27ab20";
+      sha256 = "12s0976agvxkayvxm86ppk97x1sbdrgg8gkc97fpac83vah7lc1r";
+    };
+  };
+
+  concealedyank-vim = buildVimPluginFrom2Nix {
+    name = "concealedyank-vim-2013-03-24";
+    src = fetchFromGitHub {
+      owner = "chikatoike";
+      repo = "concealedyank.vim";
+      rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd";
+      sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb";
+    };
+  };
+
+  context_filetype-vim = buildVimPluginFrom2Nix {
+    name = "context_filetype-vim-2018-08-30";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "context_filetype.vim";
+      rev = "5392e3f0f3ff82b7149818a5700680f4bbcfea45";
+      sha256 = "0xnqn96qnlvpvqc4sx8vmnryfqgcxrgczlmadgkms18gd3ib6i0z";
+    };
+  };
+
+  cosco-vim = buildVimPluginFrom2Nix {
+    name = "cosco-vim-2018-08-07";
+    src = fetchFromGitHub {
+      owner = "lfilho";
+      repo = "cosco.vim";
+      rev = "5752622192d9b27b3a5a274a5455613b56df6386";
+      sha256 = "01byd7j4gl7zb1bh61p839ka04x2sm0rgwvbb126az7dr6gpclyf";
+    };
+  };
+
+  cpsm = buildVimPluginFrom2Nix {
+    name = "cpsm-2018-09-08";
+    src = fetchFromGitHub {
+      owner = "nixprime";
+      repo = "cpsm";
+      rev = "900023c56dfdd200841d5c2f2f7000f332d2614f";
+      sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p";
+    };
+  };
+
+  csapprox = buildVimPluginFrom2Nix {
+    name = "csapprox-2013-07-27";
+    src = fetchFromGitHub {
+      owner = "godlygeek";
+      repo = "csapprox";
+      rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd";
+      sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6";
+    };
+  };
+
+  csv-vim = buildVimPluginFrom2Nix {
+    name = "csv-vim-2018-08-21";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "csv.vim";
+      rev = "23bc07d2f6b755f2194210dcebf912093849404d";
+      sha256 = "0c2m2nvm5j6hsyhhjqlh9g1df7zhxwxsb9n2mamicncaqay7kx9x";
+    };
+  };
+
+  ctrlp-cmatcher = buildVimPluginFrom2Nix {
+    name = "ctrlp-cmatcher-2015-10-15";
+    src = fetchFromGitHub {
+      owner = "JazzCore";
+      repo = "ctrlp-cmatcher";
+      rev = "6c36334f106b6fd981d23e724e9a618734cab43a";
+      sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q";
+    };
+  };
+
+  ctrlp-py-matcher = buildVimPluginFrom2Nix {
+    name = "ctrlp-py-matcher-2017-11-01";
+    src = fetchFromGitHub {
+      owner = "FelikZ";
+      repo = "ctrlp-py-matcher";
+      rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13";
+      sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1";
+    };
+  };
+
+  ctrlp-z = buildVimPluginFrom2Nix {
+    name = "ctrlp-z-2015-10-17";
+    src = fetchFromGitHub {
+      owner = "amiorin";
+      repo = "ctrlp-z";
+      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
+      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
+    };
+  };
+
+  ctrlp-vim = buildVimPluginFrom2Nix {
+    name = "ctrlp-vim-2018-06-28";
+    src = fetchFromGitHub {
+      owner = "ctrlpvim";
+      repo = "ctrlp.vim";
+      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
+      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
+    };
+  };
+
+  denite-extra = buildVimPluginFrom2Nix {
+    name = "denite-extra-2018-08-13";
+    src = fetchFromGitHub {
+      owner = "chemzqm";
+      repo = "denite-extra";
+      rev = "8e46f87ceb619d0db93bac58120fe01584e565fd";
+      sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz";
+    };
+  };
+
+  denite-git = buildVimPluginFrom2Nix {
+    name = "denite-git-2018-07-19";
+    src = fetchFromGitHub {
+      owner = "chemzqm";
+      repo = "denite-git";
+      rev = "edd2c202e05c3f84e31b94a841fef236b923d559";
+      sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd";
+    };
+  };
+
+  denite-nvim = buildVimPluginFrom2Nix {
+    name = "denite-nvim-2018-09-05";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "denite.nvim";
+      rev = "2771c7ae323c2a24341e0f6a83b81f1a1559df0c";
+      sha256 = "07gmrsn815i91wzw9d326kwlph9bqcli75dzg6c8gl0r5vib2v5b";
+    };
+  };
+
+  deoplete-go = buildVimPluginFrom2Nix {
+    name = "deoplete-go-2018-08-21";
+    src = fetchFromGitHub {
+      owner = "zchee";
+      repo = "deoplete-go";
+      rev = "c1bdcfa71dcdaec8a1be8f396fc681e104e93a05";
+      sha256 = "0v9i6gz150m7dl7hwk1jzk8f0l23rbagfwwmvhn45akgjyxk4dmq";
+      fetchSubmodules = true;
+    };
+  };
+
+  deoplete-jedi = buildVimPluginFrom2Nix {
+    name = "deoplete-jedi-2018-08-10";
+    src = fetchFromGitHub {
+      owner = "zchee";
+      repo = "deoplete-jedi";
+      rev = "12e6d8f745efd64e08d474fa3b3d35c8c1fa0305";
+      sha256 = "1ni1sfnh2bnl42m4fvwcc003b7ng501j21njk3wx5d395g5p4w81";
+      fetchSubmodules = true;
+    };
+  };
+
+  deoplete-rust = buildVimPluginFrom2Nix {
+    name = "deoplete-rust-2017-07-18";
+    src = fetchFromGitHub {
+      owner = "sebastianmarkow";
+      repo = "deoplete-rust";
+      rev = "0a86e502113910c33448b337c4d50cabea120d25";
+      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
+    };
+  };
+
+  deoplete-nvim = buildVimPluginFrom2Nix {
+    name = "deoplete-nvim-2018-09-02";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "deoplete.nvim";
+      rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
+      sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
+    };
+  };
+
+  dhall-vim = buildVimPluginFrom2Nix {
+    name = "dhall-vim-2018-07-30";
+    src = fetchFromGitHub {
+      owner = "vmchale";
+      repo = "dhall-vim";
+      rev = "2693bfaf9167ac69ee96c1165b4354f03f4d8b24";
+      sha256 = "0qm6z8z70cxqqlmxgq497w96nv5sn2gbxnc74balbhpk17bms4m0";
+    };
+  };
+
+  echodoc-vim = buildVimPluginFrom2Nix {
+    name = "echodoc-vim-2018-07-29";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "echodoc.vim";
+      rev = "7b2b1853c4d88fc5ed929bf062a9f3136e051335";
+      sha256 = "1apxla41as44jnrrgxhgrz9g88q3y4mlpdbrb218fw5w3hyw51qj";
+    };
+  };
+
+  editorconfig-vim = buildVimPluginFrom2Nix {
+    name = "editorconfig-vim-2018-07-25";
+    src = fetchFromGitHub {
+      owner = "editorconfig";
+      repo = "editorconfig-vim";
+      rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4";
+      sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x";
+      fetchSubmodules = true;
+    };
+  };
+
+  elm-vim = buildVimPluginFrom2Nix {
+    name = "elm-vim-2018-06-18";
+    src = fetchFromGitHub {
+      owner = "elmcast";
+      repo = "elm-vim";
+      rev = "e51e2e43ad617c26205a84453481d3ac152c8fec";
+      sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b";
+    };
+  };
+
+  ensime-vim = buildVimPluginFrom2Nix {
+    name = "ensime-vim-2018-04-20";
+    src = fetchFromGitHub {
+      owner = "ensime";
+      repo = "ensime-vim";
+      rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2";
+      sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320";
+    };
+  };
+
+  fastfold = buildVimPluginFrom2Nix {
+    name = "fastfold-2018-06-03";
+    src = fetchFromGitHub {
+      owner = "konfekt";
+      repo = "fastfold";
+      rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30";
+      sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r";
+    };
+  };
+
+  flake8-vim = buildVimPluginFrom2Nix {
+    name = "flake8-vim-2017-02-17";
+    src = fetchFromGitHub {
+      owner = "andviro";
+      repo = "flake8-vim";
+      rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795";
+      sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g";
+      fetchSubmodules = true;
+    };
+  };
+
+  floobits-neovim = buildVimPluginFrom2Nix {
+    name = "floobits-neovim-2018-08-01";
+    src = fetchFromGitHub {
+      owner = "floobits";
+      repo = "floobits-neovim";
+      rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8";
+      sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx";
+    };
+  };
+
+  forms = buildVimPluginFrom2Nix {
+    name = "forms-2012-11-28";
+    src = fetchFromGitHub {
+      owner = "megaannum";
+      repo = "forms";
+      rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75";
+      sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74";
+    };
+  };
+
+  fugitive-gitlab-vim = buildVimPluginFrom2Nix {
+    name = "fugitive-gitlab-vim-2018-07-04";
+    src = fetchFromGitHub {
+      owner = "shumphrey";
+      repo = "fugitive-gitlab.vim";
+      rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838";
+      sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d";
+    };
+  };
+
+  fzf-vim = buildVimPluginFrom2Nix {
+    name = "fzf-vim-2018-09-07";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "fzf.vim";
+      rev = "8fa84e0fdf97842d94caee8d50584836edf5b509";
+      sha256 = "0di5xmd3i9m034npr6zc1f793jcj1vsy95wdyhpf55b6hclm7bbd";
+    };
+  };
+
+  ghcmod-vim = buildVimPluginFrom2Nix {
+    name = "ghcmod-vim-2016-06-19";
+    src = fetchFromGitHub {
+      owner = "eagletmt";
+      repo = "ghcmod-vim";
+      rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff";
+      sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a";
+    };
+  };
+
+  gist-vim = buildVimPluginFrom2Nix {
+    name = "gist-vim-2016-10-10";
+    src = fetchFromGitHub {
+      owner = "mattn";
+      repo = "gist-vim";
+      rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63";
+      sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17";
+    };
+  };
+
+  gitv = buildVimPluginFrom2Nix {
+    name = "gitv-2018-06-10";
+    src = fetchFromGitHub {
+      owner = "gregsexton";
+      repo = "gitv";
+      rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2";
+      sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn";
+    };
+  };
+
+  goyo-vim = buildVimPluginFrom2Nix {
+    name = "goyo-vim-2017-05-31";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "goyo.vim";
+      rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592";
+      sha256 = "10racxq8zfj2fpl09vbvv5hbnr4xmm4ba75kgyp9byjapzkbq1pi";
+    };
+  };
+
+  gruvbox = buildVimPluginFrom2Nix {
+    name = "gruvbox-2018-02-25";
+    src = fetchFromGitHub {
+      owner = "morhetz";
+      repo = "gruvbox";
+      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
+      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
+    };
+  };
+
+  gundo-vim = buildVimPluginFrom2Nix {
+    name = "gundo-vim-2017-05-09";
+    src = fetchFromGitHub {
+      owner = "sjl";
+      repo = "gundo.vim";
+      rev = "46c443ee9d5854320eb965a1fdee781ba83a070e";
+      sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2";
+    };
+  };
+
+  haskell-vim = buildVimPluginFrom2Nix {
+    name = "haskell-vim-2018-05-22";
+    src = fetchFromGitHub {
+      owner = "neovimhaskell";
+      repo = "haskell-vim";
+      rev = "b1ac46807835423c4a4dd063df6d5b613d89c731";
+      sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br";
+    };
+  };
+
+  hasksyn = buildVimPluginFrom2Nix {
+    name = "hasksyn-2014-09-04";
+    src = fetchFromGitHub {
+      owner = "travitch";
+      repo = "hasksyn";
+      rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
+      sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
+    };
+  };
+
+  hlint-refactor-vim = buildVimPluginFrom2Nix {
+    name = "hlint-refactor-vim-2015-12-05";
+    src = fetchFromGitHub {
+      owner = "mpickering";
+      repo = "hlint-refactor-vim";
+      rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
+      sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
+    };
+  };
+
+  idris-vim = buildVimPluginFrom2Nix {
+    name = "idris-vim-2017-12-04";
+    src = fetchFromGitHub {
+      owner = "idris-hackers";
+      repo = "idris-vim";
+      rev = "091ed6b267749927777423160eeab520109dd9c1";
+      sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1";
+    };
+  };
+
+  Improved-AnsiEsc = buildVimPluginFrom2Nix {
+    name = "Improved-AnsiEsc-2015-08-26";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Improved-AnsiEsc";
+      rev = "e1c59a8e9203fab6b9150721f30548916da73351";
+      sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz";
+    };
+  };
+
+  Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
+    name = "Jenkinsfile-vim-syntax-2018-04-04";
+    src = fetchFromGitHub {
+      owner = "martinda";
+      repo = "Jenkinsfile-vim-syntax";
+      rev = "45418b171e06f63e0814cac6a656832384708aba";
+      sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p";
+    };
+  };
+
+  julia-vim = buildVimPluginFrom2Nix {
+    name = "julia-vim-2018-09-09";
+    src = fetchFromGitHub {
+      owner = "JuliaEditorSupport";
+      repo = "julia-vim";
+      rev = "3018668f89ca4bf125d1d57effdea88b07a3b466";
+      sha256 = "13fn3566ql4fcqzh6lfb6qj2xyqyvz70psc67k184k88arqm3y55";
+    };
+  };
+
+  last256 = buildVimPluginFrom2Nix {
+    name = "last256-2017-06-10";
+    src = fetchFromGitHub {
+      owner = "sk1418";
+      repo = "last256";
+      rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0";
+      sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv";
+    };
+  };
+
+  latex-box = buildVimPluginFrom2Nix {
+    name = "latex-box-2015-06-01";
+    src = fetchFromGitHub {
+      owner = "latex-box-team";
+      repo = "latex-box";
+      rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
+      sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl";
+    };
+  };
+
+  lightline-vim = buildVimPluginFrom2Nix {
+    name = "lightline-vim-2018-09-01";
+    src = fetchFromGitHub {
+      owner = "itchyny";
+      repo = "lightline.vim";
+      rev = "166f179cf89320b1b6f95def3a49fda448f4f711";
+      sha256 = "04vcv5ig854n5yaibhwjbqwjiw0rbk7laiysn8s5lj1abycg92qq";
+    };
+  };
+
+  limelight-vim = buildVimPluginFrom2Nix {
+    name = "limelight-vim-2016-06-23";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "limelight.vim";
+      rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
+      sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
+    };
+  };
+
+  lushtags = buildVimPluginFrom2Nix {
+    name = "lushtags-2017-04-19";
+    src = fetchFromGitHub {
+      owner = "mkasa";
+      repo = "lushtags";
+      rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf";
+      sha256 = "03saw1w5pybj6yywzi8hinciv18znimm7k0h34k4pqp5gi1jfaql";
+    };
+  };
+
+  matchit-zip = buildVimPluginFrom2Nix {
+    name = "matchit-zip-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "matchit.zip";
+      rev = "ced6c409c9beeb0b4142d21906606bd194411d1d";
+      sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm";
+    };
+  };
+
+  mayansmoke = buildVimPluginFrom2Nix {
+    name = "mayansmoke-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "mayansmoke";
+      rev = "168883af7aec05f139af251f47eadd5dfb802c9d";
+      sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd";
+    };
+  };
+
+  molokai = buildVimPluginFrom2Nix {
+    name = "molokai-2015-11-11";
+    src = fetchFromGitHub {
+      owner = "tomasr";
+      repo = "molokai";
+      rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
+      sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
+    };
+  };
+
+  neco-ghc = buildVimPluginFrom2Nix {
+    name = "neco-ghc-2018-05-13";
+    src = fetchFromGitHub {
+      owner = "eagletmt";
+      repo = "neco-ghc";
+      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
+      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
+    };
+  };
+
+  neco-look = buildVimPluginFrom2Nix {
+    name = "neco-look-2018-01-21";
+    src = fetchFromGitHub {
+      owner = "ujihisa";
+      repo = "neco-look";
+      rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c";
+      sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj";
+    };
+  };
+
+  neco-syntax = buildVimPluginFrom2Nix {
+    name = "neco-syntax-2017-10-01";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neco-syntax";
+      rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3";
+      sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip";
+    };
+  };
+
+  neco-vim = buildVimPluginFrom2Nix {
+    name = "neco-vim-2017-10-01";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neco-vim";
+      rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9";
+      sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73";
+    };
+  };
+
+  neocomplete-vim = buildVimPluginFrom2Nix {
+    name = "neocomplete-vim-2018-03-28";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neocomplete.vim";
+      rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
+      sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
+    };
+  };
+
+  neoformat = buildVimPluginFrom2Nix {
+    name = "neoformat-2018-09-05";
+    src = fetchFromGitHub {
+      owner = "sbdchd";
+      repo = "neoformat";
+      rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6";
+      sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks";
+    };
+  };
+
+  neoinclude-vim = buildVimPluginFrom2Nix {
+    name = "neoinclude-vim-2018-05-21";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neoinclude.vim";
+      rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a";
+      sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg";
+    };
+  };
+
+  neomake = buildVimPluginFrom2Nix {
+    name = "neomake-2018-09-07";
+    src = fetchFromGitHub {
+      owner = "benekastah";
+      repo = "neomake";
+      rev = "28f6991f3546195e764052d5e1c731432ac8f706";
+      sha256 = "1sw4c5h8w6yw3dfybar72dzxvf44yypkhcvi15zxklvicb4xak9p";
+    };
+  };
+
+  neomru-vim = buildVimPluginFrom2Nix {
+    name = "neomru-vim-2017-10-01";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neomru.vim";
+      rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
+      sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
+    };
+  };
+
+  neosnippet-snippets = buildVimPluginFrom2Nix {
+    name = "neosnippet-snippets-2018-08-30";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neosnippet-snippets";
+      rev = "a2e90c49850fff72e923f92f1672c3dc18e2f99b";
+      sha256 = "0qfmiamy3y3h2dqpg965g801bfi9c7cnqgal3ybb66xs79afgi99";
+    };
+  };
+
+  neosnippet-vim = buildVimPluginFrom2Nix {
+    name = "neosnippet-vim-2018-07-30";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neosnippet.vim";
+      rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830";
+      sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza";
+    };
+  };
+
+  neoyank-vim = buildVimPluginFrom2Nix {
+    name = "neoyank-vim-2018-03-26";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "neoyank.vim";
+      rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef";
+      sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928";
+    };
+  };
+
+  nerdcommenter = buildVimPluginFrom2Nix {
+    name = "nerdcommenter-2018-07-31";
+    src = fetchFromGitHub {
+      owner = "scrooloose";
+      repo = "nerdcommenter";
+      rev = "fdf950f20b3907c6a6fa0bc5c7ac0aeb567841dd";
+      sha256 = "17b742fzybdcsf623n6xz21kb11xk2wz6w24iwdh8pkmqqh5mgzp";
+    };
+  };
+
+  nerdtree = buildVimPluginFrom2Nix {
+    name = "nerdtree-2018-08-25";
+    src = fetchFromGitHub {
+      owner = "scrooloose";
+      repo = "nerdtree";
+      rev = "808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e";
+      sha256 = "1isnx83ay3r4f7bkfck98pq92m1kyafa96zzliyjdlgbplwmjq9y";
+    };
+  };
+
+  nerdtree-git-plugin = buildVimPluginFrom2Nix {
+    name = "nerdtree-git-plugin-2017-03-12";
+    src = fetchFromGitHub {
+      owner = "albfan";
+      repo = "nerdtree-git-plugin";
+      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
+      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+    };
+  };
+
+  nim-vim = buildVimPluginFrom2Nix {
+    name = "nim-vim-2018-08-16";
+    src = fetchFromGitHub {
+      owner = "zah";
+      repo = "nim.vim";
+      rev = "7d1211cc1588d8970e44435c612405f41ab5a36b";
+      sha256 = "1s28sk7d73vckh37xhld99i8kkx2dxcvsiv8ixlkhgg1pdcchd6d";
+    };
+  };
+
+  nvim-cm-racer = buildVimPluginFrom2Nix {
+    name = "nvim-cm-racer-2017-07-27";
+    src = fetchFromGitHub {
+      owner = "roxma";
+      repo = "nvim-cm-racer";
+      rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2";
+      sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx";
+    };
+  };
+
+  nvim-completion-manager = buildVimPluginFrom2Nix {
+    name = "nvim-completion-manager-2018-07-27";
+    src = fetchFromGitHub {
+      owner = "roxma";
+      repo = "nvim-completion-manager";
+      rev = "45a026afb8b309b3b80f2c1b5910f72a54a9b563";
+      sha256 = "0znwgry4ill0nxm096hc8s9vf20rf9xcq3dz8y8h7xlqzzsycl7a";
+    };
+  };
+
+  open-browser-vim = buildVimPluginFrom2Nix {
+    name = "open-browser-vim-2018-04-26";
+    src = fetchFromGitHub {
+      owner = "tyru";
+      repo = "open-browser.vim";
+      rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246";
+      sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db";
+    };
+  };
+
+  peskcolor-vim = buildVimPluginFrom2Nix {
+    name = "peskcolor-vim-2016-06-11";
+    src = fetchFromGitHub {
+      owner = "andsild";
+      repo = "peskcolor.vim";
+      rev = "cba4fc739bbebacd503158f6509d9c226651f363";
+      sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq";
+    };
+  };
+
+  pony-vim-syntax = buildVimPluginFrom2Nix {
+    name = "pony-vim-syntax-2017-09-26";
+    src = fetchFromGitHub {
+      owner = "dleonard0";
+      repo = "pony-vim-syntax";
+      rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc";
+      sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr";
+    };
+  };
+
+  psc-ide-vim = buildVimPluginFrom2Nix {
+    name = "psc-ide-vim-2018-03-11";
+    src = fetchFromGitHub {
+      owner = "frigoeu";
+      repo = "psc-ide-vim";
+      rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
+      sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
+    };
+  };
+
+  purescript-vim = buildVimPluginFrom2Nix {
+    name = "purescript-vim-2018-07-05";
+    src = fetchFromGitHub {
+      owner = "raichoo";
+      repo = "purescript-vim";
+      rev = "ab8547cef5827f046d43ba57203acb6692b7ef06";
+      sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33";
+    };
+  };
+
+  python-mode = buildVimPluginFrom2Nix {
+    name = "python-mode-2018-04-29";
+    src = fetchFromGitHub {
+      owner = "python-mode";
+      repo = "python-mode";
+      rev = "f94b0d7b21714f950f5878b430fbfde21c3b7ad9";
+      sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n";
+    };
+  };
+
+  quickfixstatus = buildVimPluginFrom2Nix {
+    name = "quickfixstatus-2011-09-03";
+    src = fetchFromGitHub {
+      owner = "dannyob";
+      repo = "quickfixstatus";
+      rev = "fd3875b914fc51bbefefa8c4995588c088163053";
+      sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v";
+    };
+  };
+
+  rainbow = buildVimPluginFrom2Nix {
+    name = "rainbow-2018-07-31";
+    src = fetchFromGitHub {
+      owner = "luochen1990";
+      repo = "rainbow";
+      rev = "d7bb89e6a6fae25765ee16020ea7a85d43bd6e41";
+      sha256 = "0zh2x1bm0sq00gq6350kckjl1fhwqdxl3b8d3k9lb1736xggd1p8";
+    };
+  };
+
+  rainbow_parentheses-vim = buildVimPluginFrom2Nix {
+    name = "rainbow_parentheses-vim-2013-03-05";
+    src = fetchFromGitHub {
+      owner = "kien";
+      repo = "rainbow_parentheses.vim";
+      rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
+      sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7";
+    };
+  };
+
+  random-vim = buildVimPluginFrom2Nix {
+    name = "random-vim-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "random.vim";
+      rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
+      sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
+    };
+  };
+
+  Rename = buildVimPluginFrom2Nix {
+    name = "Rename-2011-08-31";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "Rename";
+      rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
+      sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
+    };
+  };
+
+  ReplaceWithRegister = buildVimPluginFrom2Nix {
+    name = "ReplaceWithRegister-2014-10-31";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "ReplaceWithRegister";
+      rev = "832efc23111d19591d495dc72286de2fb0b09345";
+      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
+    };
+  };
+
+  riv-vim = buildVimPluginFrom2Nix {
+    name = "riv-vim-2018-06-20";
+    src = fetchFromGitHub {
+      owner = "Rykka";
+      repo = "riv.vim";
+      rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8";
+      sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch";
+    };
+  };
+
+  robotframework-vim = buildVimPluginFrom2Nix {
+    name = "robotframework-vim-2017-04-14";
+    src = fetchFromGitHub {
+      owner = "mfukar";
+      repo = "robotframework-vim";
+      rev = "75d5b371a4da2a090a2872d55bd0dead013f334e";
+      sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad";
+    };
+  };
+
+  rust-vim = buildVimPluginFrom2Nix {
+    name = "rust-vim-2018-09-08";
+    src = fetchFromGitHub {
+      owner = "rust-lang";
+      repo = "rust.vim";
+      rev = "b7fc97c5f757c2b9f1e911dd4a800678d202d083";
+      sha256 = "1h0n55y7ybjaxxrch0fnq1c74h994d539qi62ba3x1k7sh5am887";
+    };
+  };
+
+  self = buildVimPluginFrom2Nix {
+    name = "self-2014-05-28";
+    src = fetchFromGitHub {
+      owner = "megaannum";
+      repo = "self";
+      rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f";
+      sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn";
+    };
+  };
+
+  shabadou-vim = buildVimPluginFrom2Nix {
+    name = "shabadou-vim-2016-07-19";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "shabadou.vim";
+      rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1";
+      sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870";
+    };
+  };
+
+  sourcemap-vim = buildVimPluginFrom2Nix {
+    name = "sourcemap-vim-2012-09-19";
+    src = fetchFromGitHub {
+      owner = "chikatoike";
+      repo = "sourcemap.vim";
+      rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
+      sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350";
+    };
+  };
+
+  Spacegray-vim = buildVimPluginFrom2Nix {
+    name = "Spacegray-vim-2018-06-21";
+    src = fetchFromGitHub {
+      owner = "ajh17";
+      repo = "Spacegray.vim";
+      rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81";
+      sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9";
+    };
+  };
+
+  spacevim = buildVimPluginFrom2Nix {
+    name = "spacevim-2018-03-29";
+    src = fetchFromGitHub {
+      owner = "ctjhoa";
+      repo = "spacevim";
+      rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
+      sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
+    };
+  };
+
+  sparkup = buildVimPluginFrom2Nix {
+    name = "sparkup-2012-06-11";
+    src = fetchFromGitHub {
+      owner = "chrisgeo";
+      repo = "sparkup";
+      rev = "6fbfceef890e705c47b42b27be743ffed6f9296e";
+      sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm";
+    };
+  };
+
+  splice-vim = buildVimPluginFrom2Nix {
+    name = "splice-vim-2017-09-03";
+    src = fetchFromGitHub {
+      owner = "sjl";
+      repo = "splice.vim";
+      rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d";
+      sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx";
+    };
+  };
+
+  supertab = buildVimPluginFrom2Nix {
+    name = "supertab-2017-11-14";
+    src = fetchFromGitHub {
+      owner = "ervandew";
+      repo = "supertab";
+      rev = "40fe711e088e2ab346738233dd5adbb1be355172";
+      sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db";
+    };
+  };
+
+  swift-vim = buildVimPluginFrom2Nix {
+    name = "swift-vim-2018-07-22";
+    src = fetchFromGitHub {
+      owner = "keith";
+      repo = "swift.vim";
+      rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab";
+      sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153";
+    };
+  };
+
+  syntastic = buildVimPluginFrom2Nix {
+    name = "syntastic-2018-08-27";
+    src = fetchFromGitHub {
+      owner = "scrooloose";
+      repo = "syntastic";
+      rev = "0295d8241db23e24b120e0360a899cb375793a1e";
+      sha256 = "1fpfsc8snmkkbsjb4j1l872sgr840q73rdykr29w1q68q4m06vbc";
+    };
+  };
+
+  tabmerge = buildVimPluginFrom2Nix {
+    name = "tabmerge-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "tabmerge";
+      rev = "074e5f06f26e7108a0570071a0f938a821768c06";
+      sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
+    };
+  };
+
+  tabpagebuffer-vim = buildVimPluginFrom2Nix {
+    name = "tabpagebuffer-vim-2014-09-30";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "tabpagebuffer.vim";
+      rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc";
+      sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f";
+    };
+  };
+
+  tabular = buildVimPluginFrom2Nix {
+    name = "tabular-2016-05-04";
+    src = fetchFromGitHub {
+      owner = "godlygeek";
+      repo = "tabular";
+      rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367";
+      sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz";
+    };
+  };
+
+  tagbar = buildVimPluginFrom2Nix {
+    name = "tagbar-2017-12-17";
+    src = fetchFromGitHub {
+      owner = "majutsushi";
+      repo = "tagbar";
+      rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70";
+      sha256 = "130rxvlkqzlqh09w6fpmq7x3b7s4s56qxly9m4jh6s2jrab1cxak";
+    };
+  };
+
+  taglist-vim = buildVimPluginFrom2Nix {
+    name = "taglist-vim-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "taglist.vim";
+      rev = "53041fbc45398a9af631a20657e109707a455339";
+      sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd";
+    };
+  };
+
+  targets-vim = buildVimPluginFrom2Nix {
+    name = "targets-vim-2018-05-27";
+    src = fetchFromGitHub {
+      owner = "wellle";
+      repo = "targets.vim";
+      rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75";
+      sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q";
+    };
+  };
+
+  tender-vim = buildVimPluginFrom2Nix {
+    name = "tender-vim-2017-03-14";
+    src = fetchFromGitHub {
+      owner = "jacoborus";
+      repo = "tender.vim";
+      rev = "6b0497a59233b3e67fb528a498069eb1d24743f9";
+      sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn";
+    };
+  };
+
+  thumbnail-vim = buildVimPluginFrom2Nix {
+    name = "thumbnail-vim-2017-04-24";
+    src = fetchFromGitHub {
+      owner = "itchyny";
+      repo = "thumbnail.vim";
+      rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00";
+      sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5";
+    };
+  };
+
+  tlib_vim = buildVimPluginFrom2Nix {
+    name = "tlib_vim-2018-04-08";
+    src = fetchFromGitHub {
+      owner = "tomtom";
+      repo = "tlib_vim";
+      rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b";
+      sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx";
+    };
+  };
+
+  tslime-vim = buildVimPluginFrom2Nix {
+    name = "tslime-vim-2018-07-23";
+    src = fetchFromGitHub {
+      owner = "jgdavey";
+      repo = "tslime.vim";
+      rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0";
+      sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x";
+    };
+  };
+
+  tsuquyomi = buildVimPluginFrom2Nix {
+    name = "tsuquyomi-2018-08-03";
+    src = fetchFromGitHub {
+      owner = "Quramy";
+      repo = "tsuquyomi";
+      rev = "05e6515f6d21545959ac4eb570c917e1d225b1f1";
+      sha256 = "0hbd2d8zb86c8ncrrm4zyj92j523xay2lwk2k9arwacn8fj42hir";
+    };
+  };
+
+  typescript-vim = buildVimPluginFrom2Nix {
+    name = "typescript-vim-2018-08-15";
+    src = fetchFromGitHub {
+      owner = "leafgarland";
+      repo = "typescript-vim";
+      rev = "db131b8cd42973ed26928e9e445c1a745a98cff8";
+      sha256 = "1l7wbwv3xirl9nvjb2f693knxsif5qanjknd9lija8m7gnwagzm4";
+    };
+  };
+
+  ultisnips = buildVimPluginFrom2Nix {
+    name = "ultisnips-2018-04-30";
+    src = fetchFromGitHub {
+      owner = "SirVer";
+      repo = "ultisnips";
+      rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba";
+      sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3";
+    };
+  };
+
+  undotree = buildVimPluginFrom2Nix {
+    name = "undotree-2018-09-07";
+    src = fetchFromGitHub {
+      owner = "mbbill";
+      repo = "undotree";
+      rev = "364c73dae83bbaa552fa901dbcb082be22f846f4";
+      sha256 = "1swjgdgbr63a5xp9nlmcpa5f31r1jc9n4wqz4sgmhrcdc4xxq8ah";
+    };
+  };
+
+  unite-vim = buildVimPluginFrom2Nix {
+    name = "unite-vim-2018-08-06";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "unite.vim";
+      rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586";
+      sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v";
+    };
+  };
+
+  vim = buildVimPluginFrom2Nix {
+    name = "vim-2018-07-23";
+    src = fetchFromGitHub {
+      owner = "dracula";
+      repo = "vim";
+      rev = "d329d61c1752807059aef388c4e9629296760a35";
+      sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm";
+    };
+  };
+
+  vim-abolish = buildVimPluginFrom2Nix {
+    name = "vim-abolish-2018-08-02";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-abolish";
+      rev = "40e8b973971beb5da279a499231464ae1d959c8b";
+      sha256 = "0ibhd9d57cwb2kls99wmbyl49w7v2niwqrf3pp7191pj46157720";
+    };
+  };
+
+  vim-addon-actions = buildVimPluginFrom2Nix {
+    name = "vim-addon-actions-2018-01-18";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-actions";
+      rev = "540cae09832ba6abf9fc63c55781bf86584c33ac";
+      sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6";
+    };
+  };
+
+  vim-addon-async = buildVimPluginFrom2Nix {
+    name = "vim-addon-async-2017-03-20";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-async";
+      rev = "eca316a4480f68c2cb62128f3187dc7b2002afde";
+      sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q";
+    };
+  };
+
+  vim-addon-background-cmd = buildVimPluginFrom2Nix {
+    name = "vim-addon-background-cmd-2015-12-11";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-background-cmd";
+      rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a";
+      sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4";
+    };
+  };
+
+  vim-addon-commenting = buildVimPluginFrom2Nix {
+    name = "vim-addon-commenting-2013-06-10";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-commenting";
+      rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
+      sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc";
+    };
+  };
+
+  vim-addon-completion = buildVimPluginFrom2Nix {
+    name = "vim-addon-completion-2015-02-10";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-completion";
+      rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
+      sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr";
+    };
+  };
+
+  vim-addon-errorformats = buildVimPluginFrom2Nix {
+    name = "vim-addon-errorformats-2014-11-05";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-errorformats";
+      rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
+      sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1";
+    };
+  };
+
+  vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
+    name = "vim-addon-goto-thing-at-cursor-2012-01-10";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-goto-thing-at-cursor";
+      rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
+      sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0";
+    };
+  };
+
+  vim-addon-local-vimrc = buildVimPluginFrom2Nix {
+    name = "vim-addon-local-vimrc-2015-03-19";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-local-vimrc";
+      rev = "6a27f95b35befa70cd0d049329cd0920566c764b";
+      sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h";
+    };
+  };
+
+  vim-addon-manager = buildVimPluginFrom2Nix {
+    name = "vim-addon-manager-2018-07-27";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-manager";
+      rev = "d9e865f3c2de5d9b7eabbc976f606cf1b89e29ea";
+      sha256 = "0mgm2dqw8js9gajkrvm5n3k9m1grjxcrfc9xdzb3jxw1c0njdhcy";
+    };
+  };
+
+  vim-addon-mru = buildVimPluginFrom2Nix {
+    name = "vim-addon-mru-2013-08-08";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-mru";
+      rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
+      sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm";
+    };
+  };
+
+  vim-addon-mw-utils = buildVimPluginFrom2Nix {
+    name = "vim-addon-mw-utils-2018-03-09";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-mw-utils";
+      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
+      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
+    };
+  };
+
+  vim-addon-nix = buildVimPluginFrom2Nix {
+    name = "vim-addon-nix-2017-09-11";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-nix";
+      rev = "3001a9db5f816dd7af11384f15415bddd146ef86";
+      sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy";
+    };
+  };
+
+  vim-addon-other = buildVimPluginFrom2Nix {
+    name = "vim-addon-other-2014-07-15";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-other";
+      rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
+      sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6";
+    };
+  };
+
+  vim-addon-php-manual = buildVimPluginFrom2Nix {
+    name = "vim-addon-php-manual-2015-01-01";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-php-manual";
+      rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
+      sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir";
+    };
+  };
+
+  vim-addon-signs = buildVimPluginFrom2Nix {
+    name = "vim-addon-signs-2013-04-19";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-signs";
+      rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
+      sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy";
+    };
+  };
+
+  vim-addon-sql = buildVimPluginFrom2Nix {
+    name = "vim-addon-sql-2017-02-11";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-sql";
+      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
+      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
+    };
+  };
+
+  vim-addon-syntax-checker = buildVimPluginFrom2Nix {
+    name = "vim-addon-syntax-checker-2017-06-26";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-syntax-checker";
+      rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344";
+      sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9";
+    };
+  };
+
+  vim-addon-toggle-buffer = buildVimPluginFrom2Nix {
+    name = "vim-addon-toggle-buffer-2012-01-13";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-toggle-buffer";
+      rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
+      sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03";
+    };
+  };
+
+  vim-addon-xdebug = buildVimPluginFrom2Nix {
+    name = "vim-addon-xdebug-2014-08-29";
+    src = fetchFromGitHub {
+      owner = "MarcWeber";
+      repo = "vim-addon-xdebug";
+      rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
+      sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw";
+    };
+  };
+
+  vim-airline = buildVimPluginFrom2Nix {
+    name = "vim-airline-2018-09-07";
+    src = fetchFromGitHub {
+      owner = "vim-airline";
+      repo = "vim-airline";
+      rev = "d342c3cb1e1365d7cfd0328bb0bc20321db34125";
+      sha256 = "19p8w2jyigzfq0qqqgc4gw82scqpjxfy0h4w1f6c0vrjbnk6xxx9";
+    };
+  };
+
+  vim-airline-themes = buildVimPluginFrom2Nix {
+    name = "vim-airline-themes-2018-09-05";
+    src = fetchFromGitHub {
+      owner = "vim-airline";
+      repo = "vim-airline-themes";
+      rev = "725789c110fbab52f8c18021f9d043839d7e31ed";
+      sha256 = "15k5s8yysnvm0swfi27g2yhrnkb8kzvswb58k1jbzb65nwdw139z";
+    };
+  };
+
+  vim-auto-save = buildVimPluginFrom2Nix {
+    name = "vim-auto-save-2017-11-08";
+    src = fetchFromGitHub {
+      owner = "907th";
+      repo = "vim-auto-save";
+      rev = "66643afb55a1fcd3a9b4336f868f58da45bff397";
+      sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p";
+    };
+  };
+
+  vim-autoformat = buildVimPluginFrom2Nix {
+    name = "vim-autoformat-2018-09-08";
+    src = fetchFromGitHub {
+      owner = "Chiel92";
+      repo = "vim-autoformat";
+      rev = "98233b8f353fa5d237e89859a8f1b91c14c21397";
+      sha256 = "18xb803vx11wx9yhxvp6aq8kh0vbidxmwhwrjfcslrw0k1zis3yl";
+    };
+  };
+
+  vim-bazel = buildVimPluginFrom2Nix {
+    name = "vim-bazel-2018-01-11";
+    src = fetchFromGitHub {
+      owner = "bazelbuild";
+      repo = "vim-bazel";
+      rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3";
+      sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy";
+    };
+  };
+
+  vim-buffergator = buildVimPluginFrom2Nix {
+    name = "vim-buffergator-2018-05-02";
+    src = fetchFromGitHub {
+      owner = "jeetsukumaran";
+      repo = "vim-buffergator";
+      rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916";
+      sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c";
+    };
+  };
+
+  vim-closetag = buildVimPluginFrom2Nix {
+    name = "vim-closetag-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "alvan";
+      repo = "vim-closetag";
+      rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb";
+      sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy";
+    };
+  };
+
+  vim-codefmt = buildVimPluginFrom2Nix {
+    name = "vim-codefmt-2018-08-17";
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "vim-codefmt";
+      rev = "18fe8fbd7a6c0875f922aa682f5dec81b9f4e554";
+      sha256 = "0fzhwxcg4yx6zm1ndzp4vmrsi4za9kxymqbrrsj9zk46lm4bv74h";
+    };
+  };
+
+  vim-coffee-script = buildVimPluginFrom2Nix {
+    name = "vim-coffee-script-2018-02-27";
+    src = fetchFromGitHub {
+      owner = "kchmck";
+      repo = "vim-coffee-script";
+      rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb";
+      sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x";
+    };
+  };
+
+  vim-colors-solarized = buildVimPluginFrom2Nix {
+    name = "vim-colors-solarized-2011-05-09";
+    src = fetchFromGitHub {
+      owner = "altercation";
+      repo = "vim-colors-solarized";
+      rev = "528a59f26d12278698bb946f8fb82a63711eec21";
+      sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1";
+    };
+  };
+
+  vim-colorschemes = buildVimPluginFrom2Nix {
+    name = "vim-colorschemes-2017-08-22";
+    src = fetchFromGitHub {
+      owner = "flazz";
+      repo = "vim-colorschemes";
+      rev = "eab315701f4627967fd62582eefc4e37a3745786";
+      sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k";
+    };
+  };
+
+  vim-colorstepper = buildVimPluginFrom2Nix {
+    name = "vim-colorstepper-2016-01-28";
+    src = fetchFromGitHub {
+      owner = "jonbri";
+      repo = "vim-colorstepper";
+      rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05";
+      sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs";
+    };
+  };
+
+  vim-commentary = buildVimPluginFrom2Nix {
+    name = "vim-commentary-2018-07-27";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-commentary";
+      rev = "141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a";
+      sha256 = "0nncs32ayfhr557aiynq7b0sc7rxqwv7xanram53x1wvmfy14zf0";
+    };
+  };
+
+  vim-css-color = buildVimPluginFrom2Nix {
+    name = "vim-css-color-2018-08-11";
+    src = fetchFromGitHub {
+      owner = "ap";
+      repo = "vim-css-color";
+      rev = "22211783b5bcc052748c80fad7d2916b595da09c";
+      sha256 = "12z965xij9393m6jkwkn32ykfgnjqjdhy7571cihmvhknvhd0dsk";
+    };
+  };
+
+  vim-cursorword = buildVimPluginFrom2Nix {
+    name = "vim-cursorword-2017-10-19";
+    src = fetchFromGitHub {
+      owner = "itchyny";
+      repo = "vim-cursorword";
+      rev = "4878d6185b99131c5f610cc6ad0e223439ac4601";
+      sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf";
+    };
+  };
+
+  vim-cute-python = buildVimPluginFrom2Nix {
+    name = "vim-cute-python-2016-04-04";
+    src = fetchFromGitHub {
+      owner = "ehamberg";
+      repo = "vim-cute-python";
+      rev = "d7a6163f794500447242df2bedbe20bd751b92da";
+      sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf";
+    };
+  };
+
+  vim-devicons = buildVimPluginFrom2Nix {
+    name = "vim-devicons-2018-06-21";
+    src = fetchFromGitHub {
+      owner = "ryanoasis";
+      repo = "vim-devicons";
+      rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26";
+      sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg";
+    };
+  };
+
+  vim-dirdiff = buildVimPluginFrom2Nix {
+    name = "vim-dirdiff-2018-01-31";
+    src = fetchFromGitHub {
+      owner = "will133";
+      repo = "vim-dirdiff";
+      rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c";
+      sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1";
+    };
+  };
+
+  vim-dispatch = buildVimPluginFrom2Nix {
+    name = "vim-dispatch-2018-08-20";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-dispatch";
+      rev = "4566b8892715361f9952fa4c29c05035fdede09d";
+      sha256 = "1v1wmvasymllvjgg8kfh8zag99mlbaf366v9byvp8fpskzaza1nz";
+    };
+  };
+
+  vim-docbk = buildVimPluginFrom2Nix {
+    name = "vim-docbk-2015-04-01";
+    src = fetchFromGitHub {
+      owner = "jhradilek";
+      repo = "vim-docbk";
+      rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e";
+      sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d";
+    };
+  };
+
+  vim-easy-align = buildVimPluginFrom2Nix {
+    name = "vim-easy-align-2017-06-03";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "vim-easy-align";
+      rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
+      sha256 = "16yis2wlgi8v0h04hiqmnkm9qrby4kbc2fvkw4szfsbg5m3qx0fc";
+    };
+  };
+
+  vim-easygit = buildVimPluginFrom2Nix {
+    name = "vim-easygit-2018-07-08";
+    src = fetchFromGitHub {
+      owner = "neoclide";
+      repo = "vim-easygit";
+      rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a";
+      sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8";
+    };
+  };
+
+  vim-easymotion = buildVimPluginFrom2Nix {
+    name = "vim-easymotion-2018-06-04";
+    src = fetchFromGitHub {
+      owner = "lokaltog";
+      repo = "vim-easymotion";
+      rev = "1a0244c90c3ff46219cf9597bb13662be4232407";
+      sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy";
+    };
+  };
+
+  vim-easytags = buildVimPluginFrom2Nix {
+    name = "vim-easytags-2015-07-01";
+    src = fetchFromGitHub {
+      owner = "xolox";
+      repo = "vim-easytags";
+      rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
+      sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
+    };
+  };
+
+  vim-eighties = buildVimPluginFrom2Nix {
+    name = "vim-eighties-2016-12-15";
+    src = fetchFromGitHub {
+      owner = "justincampbell";
+      repo = "vim-eighties";
+      rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
+      sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
+    };
+  };
+
+  vim-elixir = buildVimPluginFrom2Nix {
+    name = "vim-elixir-2018-08-17";
+    src = fetchFromGitHub {
+      owner = "elixir-lang";
+      repo = "vim-elixir";
+      rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b";
+      sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04";
+    };
+  };
+
+  vim-eunuch = buildVimPluginFrom2Nix {
+    name = "vim-eunuch-2018-08-10";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-eunuch";
+      rev = "632d92e85d4b6d5413ee4a643ce570efb09c8d6b";
+      sha256 = "0mw2wxr4y5r1j3lj4ilihs83l2afsr0lnxzy73v1hsahs70vayx8";
+    };
+  };
+
+  vim-expand-region = buildVimPluginFrom2Nix {
+    name = "vim-expand-region-2013-08-19";
+    src = fetchFromGitHub {
+      owner = "terryma";
+      repo = "vim-expand-region";
+      rev = "966513543de0ddc2d673b5528a056269e7917276";
+      sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv";
+    };
+  };
+
+  vim-extradite = buildVimPluginFrom2Nix {
+    name = "vim-extradite-2015-09-22";
+    src = fetchFromGitHub {
+      owner = "int3";
+      repo = "vim-extradite";
+      rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
+      sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i";
+    };
+  };
+
+  vim-fireplace = buildVimPluginFrom2Nix {
+    name = "vim-fireplace-2018-06-01";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-fireplace";
+      rev = "1ef0f0726cadd96547a5f79103b66339f170da02";
+      sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4";
+    };
+  };
+
+  vim-flagship = buildVimPluginFrom2Nix {
+    name = "vim-flagship-2018-08-15";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-flagship";
+      rev = "66abd2fc519f4339ec751874279c14da7833dd99";
+      sha256 = "0ijfa076a5jr6gi11j2zcgh5c7kj0vlwipzk1myjc1a77pss7nlg";
+    };
+  };
+
+  vim-ft-diff_fold = buildVimPluginFrom2Nix {
+    name = "vim-ft-diff_fold-2013-02-10";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-ft-diff_fold";
+      rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87";
+      sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma";
+    };
+  };
+
+  vim-fugitive = buildVimPluginFrom2Nix {
+    name = "vim-fugitive-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-fugitive";
+      rev = "4bf30ce907f74cbf442b41f85c25967c397a3413";
+      sha256 = "0k0rp4r4783dszbcag82ijrnkvp7hd5jrqsmpi45v4gxdxfj6slm";
+    };
+  };
+
+  vim-gista = buildVimPluginFrom2Nix {
+    name = "vim-gista-2017-02-20";
+    src = fetchFromGitHub {
+      owner = "lambdalisue";
+      repo = "vim-gista";
+      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
+      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
+    };
+  };
+
+  vim-gitbranch = buildVimPluginFrom2Nix {
+    name = "vim-gitbranch-2017-05-27";
+    src = fetchFromGitHub {
+      owner = "itchyny";
+      repo = "vim-gitbranch";
+      rev = "8118dc1cdd387bd609852be4bf350360ce881193";
+      sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j";
+    };
+  };
+
+  vim-gitgutter = buildVimPluginFrom2Nix {
+    name = "vim-gitgutter-2018-08-15";
+    src = fetchFromGitHub {
+      owner = "airblade";
+      repo = "vim-gitgutter";
+      rev = "50a7062909d91a290fae04219887b1b45f3138db";
+      sha256 = "1bgpy85dxvn40ybzxih25gysy941jvylxm0fmkd5qpwkf7xm26wq";
+    };
+  };
+
+  vim-github-dashboard = buildVimPluginFrom2Nix {
+    name = "vim-github-dashboard-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "vim-github-dashboard";
+      rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010";
+      sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x";
+    };
+  };
+
+  vim-go = buildVimPluginFrom2Nix {
+    name = "vim-go-2018-09-06";
+    src = fetchFromGitHub {
+      owner = "fatih";
+      repo = "vim-go";
+      rev = "fb173c3a849fdc47a267e905cee5e29a88797d61";
+      sha256 = "0i3kprznlys1pa6ii6rbcsxar2zwsygc4hv22h0svmpajbzwvfp9";
+    };
+  };
+
+  vim-grammarous = buildVimPluginFrom2Nix {
+    name = "vim-grammarous-2018-08-05";
+    src = fetchFromGitHub {
+      owner = "rhysd";
+      repo = "vim-grammarous";
+      rev = "d52086d0f99e8008be9fa717bfaa0ee028f09e29";
+      sha256 = "1p48p2ml284ssylnd6dr7dwb5kpq6arkfzg0d8y94317cmzagpkx";
+    };
+  };
+
+  vim-grepper = buildVimPluginFrom2Nix {
+    name = "vim-grepper-2018-04-23";
+    src = fetchFromGitHub {
+      owner = "mhinz";
+      repo = "vim-grepper";
+      rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4";
+      sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g";
+    };
+  };
+
+  vim-hardtime = buildVimPluginFrom2Nix {
+    name = "vim-hardtime-2017-03-31";
+    src = fetchFromGitHub {
+      owner = "takac";
+      repo = "vim-hardtime";
+      rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b";
+      sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5";
+    };
+  };
+
+  vim-haskellconceal = buildVimPluginFrom2Nix {
+    name = "vim-haskellconceal-2017-06-15";
+    src = fetchFromGitHub {
+      owner = "twinside";
+      repo = "vim-haskellconceal";
+      rev = "802f82a5afee56e9e1251e6f756104a3bd114234";
+      sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r";
+    };
+  };
+
+  vim-haskellConcealPlus = buildVimPluginFrom2Nix {
+    name = "vim-haskellConcealPlus-2018-08-07";
+    src = fetchFromGitHub {
+      owner = "enomsg";
+      repo = "vim-haskellConcealPlus";
+      rev = "12608ecab20c3eda9a89a55931397b5e020f38a4";
+      sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0";
+    };
+  };
+
+  vim-hdevtools = buildVimPluginFrom2Nix {
+    name = "vim-hdevtools-2017-03-11";
+    src = fetchFromGitHub {
+      owner = "bitc";
+      repo = "vim-hdevtools";
+      rev = "4ffdace7002915cb10d663a2c56386286c5b8e37";
+      sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka";
+    };
+  };
+
+  vim-hier = buildVimPluginFrom2Nix {
+    name = "vim-hier-2011-08-27";
+    src = fetchFromGitHub {
+      owner = "jceb";
+      repo = "vim-hier";
+      rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
+      sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
+    };
+  };
+
+  vim-highlightedyank = buildVimPluginFrom2Nix {
+    name = "vim-highlightedyank-2018-06-01";
+    src = fetchFromGitHub {
+      owner = "machakann";
+      repo = "vim-highlightedyank";
+      rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a";
+      sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk";
+    };
+  };
+
+  vim-hoogle = buildVimPluginFrom2Nix {
+    name = "vim-hoogle-2018-03-04";
+    src = fetchFromGitHub {
+      owner = "Twinside";
+      repo = "vim-hoogle";
+      rev = "871d104c92e33cb238506f2805f1652561978cc8";
+      sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n";
+    };
+  };
+
+  vim-iced-coffee-script = buildVimPluginFrom2Nix {
+    name = "vim-iced-coffee-script-2013-12-26";
+    src = fetchFromGitHub {
+      owner = "noc7c9";
+      repo = "vim-iced-coffee-script";
+      rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
+      sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7";
+    };
+  };
+
+  vim-indent-guides = buildVimPluginFrom2Nix {
+    name = "vim-indent-guides-2018-05-14";
+    src = fetchFromGitHub {
+      owner = "nathanaelkane";
+      repo = "vim-indent-guides";
+      rev = "54d889a63716ee2f1818aa2ec5082db47147147b";
+      sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2";
+    };
+  };
+
+  vim-indent-object = buildVimPluginFrom2Nix {
+    name = "vim-indent-object-2018-04-08";
+    src = fetchFromGitHub {
+      owner = "michaeljsmith";
+      repo = "vim-indent-object";
+      rev = "5c5b24c959478929b54a9e831a8e2e651a465965";
+      sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19";
+    };
+  };
+
+  vim-ipython = buildVimPluginFrom2Nix {
+    name = "vim-ipython-2015-06-23";
+    src = fetchFromGitHub {
+      owner = "ivanov";
+      repo = "vim-ipython";
+      rev = "42499f094b805b90b683afa5009cee99abd0bb75";
+      sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
+    };
+  };
+
+  vim-isort = buildVimPluginFrom2Nix {
+    name = "vim-isort-2018-08-22";
+    src = fetchFromGitHub {
+      owner = "fisadev";
+      repo = "vim-isort";
+      rev = "2fbab3401b7f81ac7f629e34e4f40a7e52934a99";
+      sha256 = "09vq27jqmzp01qg5zssxcr93nmhly7cnc728qa4ivvmqkgg4myz1";
+    };
+  };
+
+  vim-jade = buildVimPluginFrom2Nix {
+    name = "vim-jade-2017-04-07";
+    src = fetchFromGitHub {
+      owner = "digitaltoad";
+      repo = "vim-jade";
+      rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975";
+      sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y";
+    };
+  };
+
+  vim-javascript = buildVimPluginFrom2Nix {
+    name = "vim-javascript-2018-08-29";
+    src = fetchFromGitHub {
+      owner = "pangloss";
+      repo = "vim-javascript";
+      rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28";
+      sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl";
+    };
+  };
+
+  vim-jinja = buildVimPluginFrom2Nix {
+    name = "vim-jinja-2016-11-16";
+    src = fetchFromGitHub {
+      owner = "lepture";
+      repo = "vim-jinja";
+      rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
+      sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
+    };
+  };
+
+  vim-jsbeautify = buildVimPluginFrom2Nix {
+    name = "vim-jsbeautify-2018-01-31";
+    src = fetchFromGitHub {
+      owner = "maksimr";
+      repo = "vim-jsbeautify";
+      rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624";
+      sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq";
+      fetchSubmodules = true;
+    };
+  };
+
+  vim-jsdoc = buildVimPluginFrom2Nix {
+    name = "vim-jsdoc-2018-05-05";
+    src = fetchFromGitHub {
+      owner = "heavenshell";
+      repo = "vim-jsdoc";
+      rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503";
+      sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm";
+    };
+  };
+
+  vim-json = buildVimPluginFrom2Nix {
+    name = "vim-json-2018-01-10";
+    src = fetchFromGitHub {
+      owner = "elzr";
+      repo = "vim-json";
+      rev = "3727f089410e23ae113be6222e8a08dd2613ecf2";
+      sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1";
+    };
+  };
+
+  vim-jsonnet = buildVimPluginFrom2Nix {
+    name = "vim-jsonnet-2018-04-11";
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "vim-jsonnet";
+      rev = "1425166887329363381194adc457b02b663b1354";
+      sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j";
+    };
+  };
+
+  vim-lastplace = buildVimPluginFrom2Nix {
+    name = "vim-lastplace-2017-06-13";
+    src = fetchFromGitHub {
+      owner = "farmergreg";
+      repo = "vim-lastplace";
+      rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55";
+      sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja";
+    };
+  };
+
+  vim-latex-live-preview = buildVimPluginFrom2Nix {
+    name = "vim-latex-live-preview-2017-11-09";
+    src = fetchFromGitHub {
+      owner = "xuhdev";
+      repo = "vim-latex-live-preview";
+      rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624";
+      sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy";
+    };
+  };
+
+  vim-lawrencium = buildVimPluginFrom2Nix {
+    name = "vim-lawrencium-2017-01-11";
+    src = fetchFromGitHub {
+      owner = "ludovicchabant";
+      repo = "vim-lawrencium";
+      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
+      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+    };
+  };
+
+  vim-leader-guide = buildVimPluginFrom2Nix {
+    name = "vim-leader-guide-2017-03-18";
+    src = fetchFromGitHub {
+      owner = "hecal3";
+      repo = "vim-leader-guide";
+      rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e";
+      sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw";
+    };
+  };
+
+  vim-ledger = buildVimPluginFrom2Nix {
+    name = "vim-ledger-2017-12-12";
+    src = fetchFromGitHub {
+      owner = "ledger";
+      repo = "vim-ledger";
+      rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d";
+      sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01";
+    };
+  };
+
+  vim-localvimrc = buildVimPluginFrom2Nix {
+    name = "vim-localvimrc-2018-08-21";
+    src = fetchFromGitHub {
+      owner = "embear";
+      repo = "vim-localvimrc";
+      rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623";
+      sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar";
+    };
+  };
+
+  vim-logreview = buildVimPluginFrom2Nix {
+    name = "vim-logreview-2017-07-08";
+    src = fetchFromGitHub {
+      owner = "andreshazard";
+      repo = "vim-logreview";
+      rev = "b7b66ab338e904127d796af49235b8c29742f18f";
+      sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3";
+    };
+  };
+
+  vim-maktaba = buildVimPluginFrom2Nix {
+    name = "vim-maktaba-2018-05-07";
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "vim-maktaba";
+      rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d";
+      sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3";
+    };
+  };
+
+  vim-markdown = buildVimPluginFrom2Nix {
+    name = "vim-markdown-2018-07-30";
+    src = fetchFromGitHub {
+      owner = "plasticboy";
+      repo = "vim-markdown";
+      rev = "f19506b1bfe5e60c39581dd53f6913a09385f5dd";
+      sha256 = "0x0lsynmwg41fq8zf7149a2anj2b7fnm0d7b0vqnj3dwdwrjj5a1";
+    };
+  };
+
+  vim-misc = buildVimPluginFrom2Nix {
+    name = "vim-misc-2015-05-21";
+    src = fetchFromGitHub {
+      owner = "xolox";
+      repo = "vim-misc";
+      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
+      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
+    };
+  };
+
+  vim-multiple-cursors = buildVimPluginFrom2Nix {
+    name = "vim-multiple-cursors-2018-08-10";
+    src = fetchFromGitHub {
+      owner = "terryma";
+      repo = "vim-multiple-cursors";
+      rev = "dd9289af03abafa76b28c503e20747ff7d7d89e5";
+      sha256 = "082y4xsvsq2psllds7bncshzjsvh48l4200mri9vkv3f5mydz985";
+    };
+  };
+
+  vim-nerdtree-tabs = buildVimPluginFrom2Nix {
+    name = "vim-nerdtree-tabs-2018-05-05";
+    src = fetchFromGitHub {
+      owner = "jistr";
+      repo = "vim-nerdtree-tabs";
+      rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b";
+      sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa";
+    };
+  };
+
+  vim-niceblock = buildVimPluginFrom2Nix {
+    name = "vim-niceblock-2018-09-06";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-niceblock";
+      rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5";
+      sha256 = "1d0rx7s10jl1q9y5s4235imizbyxrgkm4dxh5ankcr8s617l7mz2";
+    };
+  };
+
+  vim-nix = buildVimPluginFrom2Nix {
+    name = "vim-nix-2018-08-27";
+    src = fetchFromGitHub {
+      owner = "LnL7";
+      repo = "vim-nix";
+      rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe";
+      sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06";
+    };
+  };
+
+  vim-operator-replace = buildVimPluginFrom2Nix {
+    name = "vim-operator-replace-2015-02-24";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-operator-replace";
+      rev = "1345a556a321a092716e149d4765a5e17c0e9f0f";
+      sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q";
+    };
+  };
+
+  vim-operator-surround = buildVimPluginFrom2Nix {
+    name = "vim-operator-surround-2017-12-22";
+    src = fetchFromGitHub {
+      owner = "rhysd";
+      repo = "vim-operator-surround";
+      rev = "001c0da077b5b38a723151b19760d220e02363db";
+      sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh";
+    };
+  };
+
+  vim-operator-user = buildVimPluginFrom2Nix {
+    name = "vim-operator-user-2015-02-17";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-operator-user";
+      rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa";
+      sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb";
+    };
+  };
+
+  vim-orgmode = buildVimPluginFrom2Nix {
+    name = "vim-orgmode-2018-07-25";
+    src = fetchFromGitHub {
+      owner = "jceb";
+      repo = "vim-orgmode";
+      rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c";
+      sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx";
+    };
+  };
+
+  vim-pandoc = buildVimPluginFrom2Nix {
+    name = "vim-pandoc-2018-08-13";
+    src = fetchFromGitHub {
+      owner = "vim-pandoc";
+      repo = "vim-pandoc";
+      rev = "d0911146c68512defcf9d947542b06d7f7eed37e";
+      sha256 = "13qqwpmnzida7bm57r306w3fpb397h6b2gxclq9in0ccq5h92xid";
+    };
+  };
+
+  vim-pandoc-after = buildVimPluginFrom2Nix {
+    name = "vim-pandoc-after-2017-11-21";
+    src = fetchFromGitHub {
+      owner = "vim-pandoc";
+      repo = "vim-pandoc-after";
+      rev = "844f27debf4d72811049167f97191a3b551ddfd5";
+      sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf";
+    };
+  };
+
+  vim-pandoc-syntax = buildVimPluginFrom2Nix {
+    name = "vim-pandoc-syntax-2017-04-13";
+    src = fetchFromGitHub {
+      owner = "vim-pandoc";
+      repo = "vim-pandoc-syntax";
+      rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3";
+      sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw";
+    };
+  };
+
+  vim-pathogen = buildVimPluginFrom2Nix {
+    name = "vim-pathogen-2018-04-05";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-pathogen";
+      rev = "06da921608b971fb47603671bcafdb2843992eb3";
+      sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi";
+    };
+  };
+
+  vim-peekaboo = buildVimPluginFrom2Nix {
+    name = "vim-peekaboo-2017-03-20";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "vim-peekaboo";
+      rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49";
+      sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m";
+    };
+  };
+
+  vim-pencil = buildVimPluginFrom2Nix {
+    name = "vim-pencil-2017-06-14";
+    src = fetchFromGitHub {
+      owner = "reedes";
+      repo = "vim-pencil";
+      rev = "2dcd974b7255e4af83cf79a208f04a3489065e22";
+      sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0";
+    };
+  };
+
+  vim-polyglot = buildVimPluginFrom2Nix {
+    name = "vim-polyglot-2018-07-08";
+    src = fetchFromGitHub {
+      owner = "sheerun";
+      repo = "vim-polyglot";
+      rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751";
+      sha256 = "1yyqsy3q1kjvlqffc10zn3kl0k468xj8mycc22xp1hp1zrkxcf5x";
+    };
+  };
+
+  vim-prettyprint = buildVimPluginFrom2Nix {
+    name = "vim-prettyprint-2016-07-16";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-prettyprint";
+      rev = "d6060d2b1ff1cff71714e126addd3b10883ade12";
+      sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9";
+    };
+  };
+
+  vim-projectionist = buildVimPluginFrom2Nix {
+    name = "vim-projectionist-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-projectionist";
+      rev = "285a6946a646e0f29e18fc16fe963cb2b3ab1f27";
+      sha256 = "0nmn0f8q8sh1fxss94ga7k1by1ajgf4ms8s30f212h09d2k3j5x5";
+    };
+  };
+
+  vim-puppet = buildVimPluginFrom2Nix {
+    name = "vim-puppet-2018-04-12";
+    src = fetchFromGitHub {
+      owner = "rodjek";
+      repo = "vim-puppet";
+      rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097";
+      sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv";
+    };
+  };
+
+  vim-qml = buildVimPluginFrom2Nix {
+    name = "vim-qml-2018-07-22";
+    src = fetchFromGitHub {
+      owner = "peterhoeg";
+      repo = "vim-qml";
+      rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a";
+      sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc";
+    };
+  };
+
+  vim-quickrun = buildVimPluginFrom2Nix {
+    name = "vim-quickrun-2018-09-06";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-quickrun";
+      rev = "0a78a3fe79b3607e01543cd33d8f2d8aceb35909";
+      sha256 = "1alpirkl6gi840ja21wn62gfmcyri6669p8r2c0qyjsajwx8gm8y";
+    };
+  };
+
+  vim-racer = buildVimPluginFrom2Nix {
+    name = "vim-racer-2018-08-26";
+    src = fetchFromGitHub {
+      owner = "racer-rust";
+      repo = "vim-racer";
+      rev = "9c0a05e8b97700ee5d3e742fab889cf40e9e7b88";
+      sha256 = "1gywh4xqbc7z15nvqr0v3h0n51fpaik8z1is0pxvpmj0fwzds0b3";
+    };
+  };
+
+  vim-repeat = buildVimPluginFrom2Nix {
+    name = "vim-repeat-2018-07-02";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-repeat";
+      rev = "43d2678fa59d068c815d8298331c195e850ff5a7";
+      sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0";
+    };
+  };
+
+  vim-rhubarb = buildVimPluginFrom2Nix {
+    name = "vim-rhubarb-2018-08-22";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-rhubarb";
+      rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b";
+      sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n";
+    };
+  };
+
+  vim-ruby = buildVimPluginFrom2Nix {
+    name = "vim-ruby-2018-08-13";
+    src = fetchFromGitHub {
+      owner = "vim-ruby";
+      repo = "vim-ruby";
+      rev = "68aa43c524b20aaaa269265d315a87b89e6d0148";
+      sha256 = "027lyy5wjgi0p23qxiaxssbargdv81ip2z04l7c2wgx4lgs5mi86";
+    };
+  };
+
+  vim-scala = buildVimPluginFrom2Nix {
+    name = "vim-scala-2017-11-10";
+    src = fetchFromGitHub {
+      owner = "derekwyatt";
+      repo = "vim-scala";
+      rev = "0b909e24f31d94552eafae610da0f31040c08f2b";
+      sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5";
+    };
+  };
+
+  vim-scouter = buildVimPluginFrom2Nix {
+    name = "vim-scouter-2014-08-10";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-scouter";
+      rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc";
+      sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8";
+    };
+  };
+
+  vim-scriptease = buildVimPluginFrom2Nix {
+    name = "vim-scriptease-2018-07-27";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-scriptease";
+      rev = "2619a1f5f63b670578ed0a504a6f844807804436";
+      sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl";
+    };
+  };
+
+  vim-sensible = buildVimPluginFrom2Nix {
+    name = "vim-sensible-2018-07-16";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-sensible";
+      rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525";
+      sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q";
+    };
+  };
+
+  vim-signature = buildVimPluginFrom2Nix {
+    name = "vim-signature-2018-07-06";
+    src = fetchFromGitHub {
+      owner = "kshenoy";
+      repo = "vim-signature";
+      rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc";
+      sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm";
+    };
+  };
+
+  vim-signify = buildVimPluginFrom2Nix {
+    name = "vim-signify-2018-08-05";
+    src = fetchFromGitHub {
+      owner = "mhinz";
+      repo = "vim-signify";
+      rev = "40d1a4ee19ac61ad772dfcedc4d4bd21810f1c0b";
+      sha256 = "1gvj2dqq96mf8h2jdyxr21jrvhr6r9bq9lsxgagvzi4ab81fm507";
+    };
+  };
+
+  vim-sleuth = buildVimPluginFrom2Nix {
+    name = "vim-sleuth-2018-08-19";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-sleuth";
+      rev = "7a104e34c10c6f3581c6e98da7834d765d0b067c";
+      sha256 = "0i147vhrrkarir36ysyaic42d22hk38cnpaqzqck7b2zdwnqrvbv";
+    };
+  };
+
+  vim-smalls = buildVimPluginFrom2Nix {
+    name = "vim-smalls-2015-05-02";
+    src = fetchFromGitHub {
+      owner = "t9md";
+      repo = "vim-smalls";
+      rev = "9619eae81626bd63f88165e0520c467698264e34";
+      sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad";
+    };
+  };
+
+  vim-snipmate = buildVimPluginFrom2Nix {
+    name = "vim-snipmate-2017-04-20";
+    src = fetchFromGitHub {
+      owner = "garbas";
+      repo = "vim-snipmate";
+      rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e";
+      sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj";
+    };
+  };
+
+  vim-snippets = buildVimPluginFrom2Nix {
+    name = "vim-snippets-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "honza";
+      repo = "vim-snippets";
+      rev = "1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9";
+      sha256 = "0ska56i77dd2n2c428c9hsl2zskyag41xfsl5dg00dyjv4amvnin";
+    };
+  };
+
+  vim-solidity = buildVimPluginFrom2Nix {
+    name = "vim-solidity-2018-04-17";
+    src = fetchFromGitHub {
+      owner = "tomlion";
+      repo = "vim-solidity";
+      rev = "569bbbedc3898236d5912fed0caf114936112ae4";
+      sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx";
+    };
+  };
+
+  vim-sort-motion = buildVimPluginFrom2Nix {
+    name = "vim-sort-motion-2018-07-15";
+    src = fetchFromGitHub {
+      owner = "christoomey";
+      repo = "vim-sort-motion";
+      rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5";
+      sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb";
+    };
+  };
+
+  vim-speeddating = buildVimPluginFrom2Nix {
+    name = "vim-speeddating-2017-05-24";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-speeddating";
+      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
+      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
+    };
+  };
+
+  vim-startify = buildVimPluginFrom2Nix {
+    name = "vim-startify-2018-08-02";
+    src = fetchFromGitHub {
+      owner = "mhinz";
+      repo = "vim-startify";
+      rev = "187e46aea30e242ef214cbfb20afc0ad49d38171";
+      sha256 = "15gmqm5qscnj70icibdjlw68r5zk1p5xzbznbzhar8l1yd5kkqgk";
+    };
+  };
+
+  vim-stylish-haskell = buildVimPluginFrom2Nix {
+    name = "vim-stylish-haskell-2018-08-31";
+    src = fetchFromGitHub {
+      owner = "nbouscal";
+      repo = "vim-stylish-haskell";
+      rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf";
+      sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw";
+    };
+  };
+
+  vim-surround = buildVimPluginFrom2Nix {
+    name = "vim-surround-2018-07-23";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-surround";
+      rev = "597068870b8f093a8b2d11536c62ff31222ee8d0";
+      sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x";
+    };
+  };
+
+  vim-SyntaxRange = buildVimPluginFrom2Nix {
+    name = "vim-SyntaxRange-2018-03-09";
+    src = fetchFromGitHub {
+      owner = "inkarkat";
+      repo = "vim-SyntaxRange";
+      rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3";
+      sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr";
+    };
+  };
+
+  vim-table-mode = buildVimPluginFrom2Nix {
+    name = "vim-table-mode-2018-05-16";
+    src = fetchFromGitHub {
+      owner = "dhruvasagar";
+      repo = "vim-table-mode";
+      rev = "5483e163bd0a67e729e0e8436315f33f9e126baf";
+      sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw";
+    };
+  };
+
+  vim-tabpagecd = buildVimPluginFrom2Nix {
+    name = "vim-tabpagecd-2013-11-29";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-tabpagecd";
+      rev = "8b71a03a037608fa5918f5096812577cec6355e4";
+      sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm";
+    };
+  };
+
+  vim-tbone = buildVimPluginFrom2Nix {
+    name = "vim-tbone-2018-06-28";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-tbone";
+      rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737";
+      sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4";
+    };
+  };
+
+  vim-test = buildVimPluginFrom2Nix {
+    name = "vim-test-2018-08-30";
+    src = fetchFromGitHub {
+      owner = "janko-m";
+      repo = "vim-test";
+      rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c";
+      sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb";
+    };
+  };
+
+  vim-textobj-multiblock = buildVimPluginFrom2Nix {
+    name = "vim-textobj-multiblock-2014-06-02";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "vim-textobj-multiblock";
+      rev = "670a5ba57d73fcd793f480e262617c6eb0103355";
+      sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf";
+    };
+  };
+
+  vim-themis = buildVimPluginFrom2Nix {
+    name = "vim-themis-2017-12-27";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-themis";
+      rev = "691cd3912ba318dbd8d9fa0035fee629b424766d";
+      sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd";
+    };
+  };
+
+  vim-tmux-navigator = buildVimPluginFrom2Nix {
+    name = "vim-tmux-navigator-2018-07-13";
+    src = fetchFromGitHub {
+      owner = "christoomey";
+      repo = "vim-tmux-navigator";
+      rev = "18b775fbccde5ff02e516c014290650bb40e257d";
+      sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj";
+    };
+  };
+
+  vim-toml = buildVimPluginFrom2Nix {
+    name = "vim-toml-2018-06-15";
+    src = fetchFromGitHub {
+      owner = "cespare";
+      repo = "vim-toml";
+      rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80";
+      sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n";
+    };
+  };
+
+  vim-trailing-whitespace = buildVimPluginFrom2Nix {
+    name = "vim-trailing-whitespace-2017-09-23";
+    src = fetchFromGitHub {
+      owner = "bronson";
+      repo = "vim-trailing-whitespace";
+      rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
+      sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
+    };
+  };
+
+  vim-vinegar = buildVimPluginFrom2Nix {
+    name = "vim-vinegar-2018-08-06";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-vinegar";
+      rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
+      sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
+    };
+  };
+
+  vim-wakatime = buildVimPluginFrom2Nix {
+    name = "vim-wakatime-2018-07-14";
+    src = fetchFromGitHub {
+      owner = "wakatime";
+      repo = "vim-wakatime";
+      rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf";
+      sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2";
+    };
+  };
+
+  vim-watchdogs = buildVimPluginFrom2Nix {
+    name = "vim-watchdogs-2017-12-03";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "vim-watchdogs";
+      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
+      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
+    };
+  };
+
+  vim-wordy = buildVimPluginFrom2Nix {
+    name = "vim-wordy-2018-03-10";
+    src = fetchFromGitHub {
+      owner = "reedes";
+      repo = "vim-wordy";
+      rev = "14b9dbf76a82e29273a74768573900361200467f";
+      sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk";
+    };
+  };
+
+  vim-xdebug = buildVimPluginFrom2Nix {
+    name = "vim-xdebug-2012-08-15";
+    src = fetchFromGitHub {
+      owner = "joonty";
+      repo = "vim-xdebug";
+      rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
+      sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw";
+    };
+  };
+
+  vim-xkbswitch = buildVimPluginFrom2Nix {
+    name = "vim-xkbswitch-2017-03-27";
+    src = fetchFromGitHub {
+      owner = "lyokha";
+      repo = "vim-xkbswitch";
+      rev = "a85ebddb9038e6b05138c48868a319a9e13d1868";
+      sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr";
+    };
+  };
+
+  vim-yapf = buildVimPluginFrom2Nix {
+    name = "vim-yapf-2018-06-05";
+    src = fetchFromGitHub {
+      owner = "mindriot101";
+      repo = "vim-yapf";
+      rev = "cae79733a1a39732c5305d4a89cd093d17cb917d";
+      sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc";
+    };
+  };
+
+  vim2hs = buildVimPluginFrom2Nix {
+    name = "vim2hs-2014-04-16";
+    src = fetchFromGitHub {
+      owner = "dag";
+      repo = "vim2hs";
+      rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
+      sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b";
+    };
+  };
+
+  vimoutliner = buildVimPluginFrom2Nix {
+    name = "vimoutliner-2018-07-04";
+    src = fetchFromGitHub {
+      owner = "vimoutliner";
+      repo = "vimoutliner";
+      rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
+      sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
+    };
+  };
+
+  vimpreviewpandoc = buildVimPluginFrom2Nix {
+    name = "vimpreviewpandoc-2018-05-12";
+    src = fetchFromGitHub {
+      owner = "tex";
+      repo = "vimpreviewpandoc";
+      rev = "266d14d362f6c069863b2d63edb683e802e7e3ee";
+      sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly";
+    };
+  };
+
+  vimproc-vim = buildVimPluginFrom2Nix {
+    name = "vimproc-vim-2018-01-07";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "vimproc.vim";
+      rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
+      sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
+    };
+  };
+
+  vimshell-vim = buildVimPluginFrom2Nix {
+    name = "vimshell-vim-2018-06-02";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "vimshell.vim";
+      rev = "03bf7673a5098918a533000d67dca97546695237";
+      sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi";
+    };
+  };
+
+  vimtex = buildVimPluginFrom2Nix {
+    name = "vimtex-2018-09-06";
+    src = fetchFromGitHub {
+      owner = "lervag";
+      repo = "vimtex";
+      rev = "2777bda5d774bd4b96580ecc8cffbff7b9801a33";
+      sha256 = "0r5x666z9zmn7ad7c378l97mqk65xv3ayqxqf3nypvq0ni5ax9hw";
+    };
+  };
+
+  vimwiki = buildVimPluginFrom2Nix {
+    name = "vimwiki-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "vimwiki";
+      repo = "vimwiki";
+      rev = "f55ec31675e372e2f59d51322b445ea91191ec2b";
+      sha256 = "1qjczzj35nwhv1lrl9cf1bdpisr5vlwhf444apzj9c9pcjymc00z";
+    };
+  };
+
+  vundle = buildVimPluginFrom2Nix {
+    name = "vundle-2018-02-03";
+    src = fetchFromGitHub {
+      owner = "gmarik";
+      repo = "vundle";
+      rev = "9a38216a1c0c597f978d73547d37681fc689c90d";
+      sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c";
+    };
+  };
+
+  webapi-vim = buildVimPluginFrom2Nix {
+    name = "webapi-vim-2018-03-14";
+    src = fetchFromGitHub {
+      owner = "mattn";
+      repo = "webapi-vim";
+      rev = "252250381a9509257bfb06b9f95441e41e3e23b5";
+      sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a";
+    };
+  };
+
+  wombat256-vim = buildVimPluginFrom2Nix {
+    name = "wombat256-vim-2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "wombat256.vim";
+      rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
+      sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
+    };
+  };
+
+  xptemplate = buildVimPluginFrom2Nix {
+    name = "xptemplate-2017-12-06";
+    src = fetchFromGitHub {
+      owner = "drmingdrmer";
+      repo = "xptemplate";
+      rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3";
+      sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p";
+    };
+  };
+
+  xterm-color-table-vim = buildVimPluginFrom2Nix {
+    name = "xterm-color-table-vim-2014-01-01";
+    src = fetchFromGitHub {
+      owner = "guns";
+      repo = "xterm-color-table.vim";
+      rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4";
+      sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19";
+    };
+  };
+
+  YankRing-vim = buildVimPluginFrom2Nix {
+    name = "YankRing-vim-2015-07-29";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "YankRing.vim";
+      rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65";
+      sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw";
+    };
+  };
+
+  youcompleteme = buildVimPluginFrom2Nix {
+    name = "youcompleteme-2018-08-19";
+    src = fetchFromGitHub {
+      owner = "valloric";
+      repo = "youcompleteme";
+      rev = "e018777b38eedaa23b96cfee40382d000e464e31";
+      sha256 = "1j4r6gkjs7kk2nwhmlwzm1nzzwrk96sr8xfbj0vwa847bsq3p591";
+      fetchSubmodules = true;
+    };
+  };
+
+  YUNOcommit-vim = buildVimPluginFrom2Nix {
+    name = "YUNOcommit-vim-2014-11-26";
+    src = fetchFromGitHub {
+      owner = "esneider";
+      repo = "YUNOcommit.vim";
+      rev = "981082055a73ef076d7e27477874d2303153a448";
+      sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
+    };
+  };
+
+  zeavim-vim = buildVimPluginFrom2Nix {
+    name = "zeavim-vim-2018-03-22";
+    src = fetchFromGitHub {
+      owner = "KabbAmine";
+      repo = "zeavim.vim";
+      rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa";
+      sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj";
+    };
+  };
+
+  zenburn = buildVimPluginFrom2Nix {
+    name = "zenburn-2018-04-29";
+    src = fetchFromGitHub {
+      owner = "jnurmine";
+      repo = "zenburn";
+      rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd";
+      sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi";
+    };
+  };
+
+  zig-vim = buildVimPluginFrom2Nix {
+    name = "zig-vim-2018-08-02";
+    src = fetchFromGitHub {
+      owner = "zig-lang";
+      repo = "zig.vim";
+      rev = "c10a46c0b960c9e0b7ea9a7286b0ff9abccd19f3";
+      sha256 = "1vk9ny3jrk175srkbcxhj5jl2lvq5y98ms9mwl90ry49cqk9ciaj";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a49542c88e03..e582127ef474 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,293 +1,293 @@
-"github:907th/vim-auto-save"
-"github:airblade/vim-gitgutter"
-"github:ajh17/Spacegray.vim"
-"github:albfan/nerdtree-git-plugin"
-"github:altercation/vim-colors-solarized"
-"github:alvan/vim-closetag"
-"github:amiorin/ctrlp-z"
-"github:andreshazard/vim-logreview"
-"github:andsild/peskcolor.vim"
-"github:andviro/flake8-vim"
-"github:ap/vim-css-color"
-"github:bazelbuild/vim-bazel"
-"github:bbchung/clighter8"
-"github:benekastah/neomake"
-"github:bitc/vim-hdevtools"
-"github:bronson/vim-trailing-whitespace"
-"github:cespare/vim-toml"
-"github:chemzqm/denite-extra"
-"github:chemzqm/denite-git"
-"github:Chiel92/vim-autoformat"
-"github:chikatoike/concealedyank.vim"
-"github:chikatoike/sourcemap.vim"
-"github:chrisbra/CheckAttach"
-"github:chrisbra/csv.vim"
-"github:chrisgeo/sparkup"
-"github:chriskempson/base16-vim"
-"github:christoomey/vim-sort-motion"
-"github:christoomey/vim-tmux-navigator"
-"github:ctjhoa/spacevim"
-"github:ctrlpvim/ctrlp.vim"
-"github:dag/vim2hs"
-"github:dannyob/quickfixstatus"
-"github:derekelkins/agda-vim"
-"github:derekwyatt/vim-scala"
-"github:dhruvasagar/vim-table-mode"
-"github:digitaltoad/vim-jade"
-"github:dleonard0/pony-vim-syntax"
-"github:dracula/vim"
-"github:drmingdrmer/xptemplate"
-"github:eagletmt/ghcmod-vim"
-"github:eagletmt/neco-ghc"
-"github:editorconfig/editorconfig-vim"
-"github:ehamberg/vim-cute-python"
-"github:eikenb/acp"
-"github:elixir-lang/vim-elixir"
-"github:elmcast/elm-vim"
-"github:elzr/vim-json"
-"github:embear/vim-localvimrc"
-"github:enomsg/vim-haskellConcealPlus"
-"github:ensime/ensime-vim"
-"github:ervandew/supertab"
-"github:esneider/YUNOcommit.vim"
-"github:farmergreg/vim-lastplace"
-"github:fatih/vim-go"
-"github:FelikZ/ctrlp-py-matcher"
-"github:fisadev/vim-isort"
-"github:flazz/vim-colorschemes"
-"github:floobits/floobits-neovim"
-"github:frigoeu/psc-ide-vim"
-"github:garbas/vim-snipmate"
-"github:gmarik/vundle"
-"github:godlygeek/csapprox"
-"github:godlygeek/tabular"
-"github:google/vim-codefmt"
-"github:google/vim-jsonnet"
-"github:google/vim-maktaba"
-"github:gregsexton/gitv"
-"github:guns/xterm-color-table.vim"
-"github:heavenshell/vim-jsdoc"
-"github:hecal3/vim-leader-guide"
-"github:honza/vim-snippets"
-"github:idris-hackers/idris-vim"
-"github:inkarkat/vim-SyntaxRange"
-"github:int3/vim-extradite"
-"github:itchyny/calendar.vim"
-"github:itchyny/lightline.vim"
-"github:itchyny/thumbnail.vim"
-"github:itchyny/vim-cursorword"
-"github:itchyny/vim-gitbranch"
-"github:ivanov/vim-ipython"
-"github:jacoborus/tender.vim"
-"github:janko-m/vim-test"
-"github:JazzCore/ctrlp-cmatcher"
-"github:jceb/vim-hier"
-"github:jceb/vim-orgmode"
-"github:jeetsukumaran/vim-buffergator"
-"github:jgdavey/tslime.vim"
-"github:jhradilek/vim-docbk"
-"github:jiangmiao/auto-pairs"
-"github:jistr/vim-nerdtree-tabs"
-"github:jnurmine/zenburn"
-"github:jonbri/vim-colorstepper"
-"github:joonty/vim-xdebug"
-"github:JuliaEditorSupport/julia-vim"
-"github:junegunn/fzf.vim"
-"github:junegunn/goyo.vim"
-"github:junegunn/limelight.vim"
-"github:junegunn/vim-easy-align"
-"github:junegunn/vim-github-dashboard"
-"github:junegunn/vim-peekaboo"
-"github:justincampbell/vim-eighties"
-"github:KabbAmine/zeavim.vim"
-"github:kana/vim-niceblock"
-"github:kana/vim-operator-replace"
-"github:kana/vim-operator-user"
-"github:kana/vim-tabpagecd"
-"github:kchmck/vim-coffee-script"
-"github:keith/swift.vim"
-"github:kien/rainbow_parentheses.vim"
-"github:konfekt/fastfold"
-"github:kshenoy/vim-signature"
-"github:lambdalisue/vim-gista"
-"github:latex-box-team/latex-box"
-"github:leafgarland/typescript-vim"
-"github:ledger/vim-ledger"
-"github:lepture/vim-jinja"
-"github:lervag/vimtex"
-"github:lfilho/cosco.vim"
-"github:LnL7/vim-nix"
-"github:lokaltog/vim-easymotion"
-"github:ludovicchabant/vim-lawrencium"
-"github:luochen1990/rainbow"
-"github:lyokha/vim-xkbswitch"
-"github:machakann/vim-highlightedyank"
-"github:majutsushi/tagbar"
-"github:maksimr/vim-jsbeautify"
-"github:MarcWeber/vim-addon-actions"
-"github:MarcWeber/vim-addon-async"
-"github:MarcWeber/vim-addon-background-cmd"
-"github:MarcWeber/vim-addon-commenting"
-"github:MarcWeber/vim-addon-completion"
-"github:MarcWeber/vim-addon-errorformats"
-"github:MarcWeber/vim-addon-goto-thing-at-cursor"
-"github:MarcWeber/vim-addon-local-vimrc"
-"github:MarcWeber/vim-addon-manager"
-"github:MarcWeber/vim-addon-mru"
-"github:MarcWeber/vim-addon-mw-utils"
-"github:MarcWeber/vim-addon-nix"
-"github:MarcWeber/vim-addon-other"
-"github:MarcWeber/vim-addon-php-manual"
-"github:MarcWeber/vim-addon-signs"
-"github:MarcWeber/vim-addon-sql"
-"github:MarcWeber/vim-addon-syntax-checker"
-"github:MarcWeber/vim-addon-toggle-buffer"
-"github:MarcWeber/vim-addon-xdebug"
-"github:martinda/Jenkinsfile-vim-syntax"
-"github:mattn/gist-vim"
-"github:mattn/webapi-vim"
-"github:mbbill/undotree"
-"github:megaannum/forms"
-"github:megaannum/self"
-"github:mfukar/robotframework-vim"
-"github:mhinz/vim-grepper"
-"github:mhinz/vim-signify"
-"github:mhinz/vim-startify"
-"github:michaeljsmith/vim-indent-object"
-"github:mileszs/ack.vim"
-"github:mindriot101/vim-yapf"
-"github:mkasa/lushtags"
-"github:morhetz/gruvbox"
-"github:mpickering/hlint-refactor-vim"
-"github:nathanaelkane/vim-indent-guides"
-"github:nbouscal/vim-stylish-haskell"
-"github:neoclide/vim-easygit"
-"github:neovimhaskell/haskell-vim"
-"github:nixprime/cpsm"
-"github:noc7c9/vim-iced-coffee-script"
-"github:osyo-manga/shabadou.vim"
-"github:osyo-manga/vim-textobj-multiblock"
-"github:osyo-manga/vim-watchdogs"
-"github:pangloss/vim-javascript"
-"github:peterhoeg/vim-qml"
-"github:plasticboy/vim-markdown"
-"github:python-mode/python-mode"
-"github:Quramy/tsuquyomi"
-"github:racer-rust/vim-racer"
-"github:rafi/awesome-vim-colorschemes"
-"github:raichoo/purescript-vim"
-"github:reedes/vim-pencil"
-"github:reedes/vim-wordy"
-"github:rhysd/committia.vim"
-"github:rhysd/vim-grammarous"
-"github:rhysd/vim-operator-surround"
-"github:Rip-Rip/clang_complete"
-"github:rodjek/vim-puppet"
-"github:roxma/nvim-cm-racer"
-"github:roxma/nvim-completion-manager"
-"github:rust-lang/rust.vim"
-"github:ryanoasis/vim-devicons"
-"github:ryanoasis/vim-devicons"
-"github:Rykka/riv.vim"
-"github:sbdchd/neoformat"
-"github:scrooloose/nerdcommenter"
-"github:scrooloose/nerdtree"
-"github:scrooloose/syntastic"
-"github:sebastianmarkow/deoplete-rust"
-"github:sheerun/vim-polyglot"
-"github:shougo/context_filetype.vim"
-"github:shougo/denite.nvim"
-"github:shougo/deoplete.nvim"
-"github:shougo/echodoc.vim"
-"github:shougo/neco-syntax"
-"github:shougo/neco-vim"
-"github:shougo/neocomplete.vim"
-"github:shougo/neoinclude.vim"
-"github:shougo/neomru.vim"
-"github:shougo/neosnippet-snippets"
-"github:shougo/neosnippet.vim"
-"github:shougo/neoyank.vim"
-"github:shougo/tabpagebuffer.vim"
-"github:shougo/unite.vim"
-"github:shougo/vimproc.vim"
-"github:shumphrey/fugitive-gitlab.vim"
-"github:SirVer/ultisnips"
-"github:sjl/gundo.vim"
-"github:sjl/splice.vim"
-"github:sk1418/last256"
-"github:slashmili/alchemist.vim"
-"github:t9md/vim-smalls"
-"github:takac/vim-hardtime"
-"github:terryma/vim-expand-region"
-"github:terryma/vim-multiple-cursors"
-"github:tex/vimpreviewpandoc"
-"github:thinca/vim-ft-diff_fold"
-"github:thinca/vim-prettyprint"
-"github:thinca/vim-quickrun"
-"github:thinca/vim-scouter"
-"github:thinca/vim-themis"
-"github:tomasr/molokai"
-"github:tomlion/vim-solidity"
-"github:tomtom/tlib_vim"
-"github:tpope/vim-abolish"
-"github:tpope/vim-commentary"
-"github:tpope/vim-dispatch"
-"github:tpope/vim-eunuch"
-"github:tpope/vim-fireplace"
-"github:tpope/vim-flagship"
-"github:tpope/vim-fugitive"
-"github:tpope/vim-pathogen"
-"github:tpope/vim-projectionist"
-"github:tpope/vim-repeat"
-"github:tpope/vim-rhubarb"
-"github:tpope/vim-scriptease"
-"github:tpope/vim-sensible"
-"github:tpope/vim-sleuth"
-"github:tpope/vim-speeddating"
-"github:tpope/vim-surround"
-"github:tpope/vim-tbone"
-"github:tpope/vim-vinegar"
-"github:travitch/hasksyn"
-"github:twinside/vim-haskellconceal"
-"github:Twinside/vim-hoogle"
-"github:tyru/caw.vim"
-"github:tyru/open-browser.vim"
-"github:ujihisa/neco-look"
-"github:valloric/youcompleteme"
-"github:vim-airline/vim-airline"
-"github:vim-airline/vim-airline-themes"
-"github:vimoutliner/vimoutliner"
-"github:vim-pandoc/vim-pandoc"
-"github:vim-pandoc/vim-pandoc-after"
-"github:vim-pandoc/vim-pandoc-syntax"
-"github:vim-ruby/vim-ruby"
-"github:vim-scripts/align"
-"github:vim-scripts/argtextobj.vim"
-"github:vim-scripts/a.vim"
-"github:vim-scripts/bats.vim"
-"github:vim-scripts/changeColorScheme.vim"
-"github:vim-scripts/Colour-Sampler-Pack"
-"github:vim-scripts/Improved-AnsiEsc"
-"github:vim-scripts/matchit.zip"
-"github:vim-scripts/mayansmoke"
-"github:vim-scripts/random.vim"
-"github:vim-scripts/Rename"
-"github:vim-scripts/ReplaceWithRegister"
-"github:vim-scripts/tabmerge"
-"github:vim-scripts/taglist.vim"
-"github:vim-scripts/wombat256.vim"
-"github:vim-scripts/YankRing.vim"
-"github:vimwiki/vimwiki"
-"github:vmchale/dhall-vim"
-"github:w0rp/ale"
-"github:wakatime/vim-wakatime"
-"github:wellle/targets.vim"
-"github:will133/vim-dirdiff"
-"github:wincent/command-t"
-"github:xolox/vim-easytags"
-"github:xolox/vim-misc"
-"github:xuhdev/vim-latex-live-preview"
-"github:zah/nim.vim"
-"github:zchee/deoplete-go"
-"github:zchee/deoplete-jedi"
-"github:zig-lang/zig.vim"
+907th/vim-auto-save
+airblade/vim-gitgutter
+ajh17/Spacegray.vim
+albfan/nerdtree-git-plugin
+altercation/vim-colors-solarized
+alvan/vim-closetag
+amiorin/ctrlp-z
+andreshazard/vim-logreview
+andsild/peskcolor.vim
+andviro/flake8-vim
+ap/vim-css-color
+bazelbuild/vim-bazel
+bbchung/clighter8
+benekastah/neomake
+bitc/vim-hdevtools
+bronson/vim-trailing-whitespace
+cespare/vim-toml
+chemzqm/denite-extra
+chemzqm/denite-git
+Chiel92/vim-autoformat
+chikatoike/concealedyank.vim
+chikatoike/sourcemap.vim
+chrisbra/CheckAttach
+chrisbra/csv.vim
+chrisgeo/sparkup
+chriskempson/base16-vim
+christoomey/vim-sort-motion
+christoomey/vim-tmux-navigator
+ctjhoa/spacevim
+ctrlpvim/ctrlp.vim
+dag/vim2hs
+dannyob/quickfixstatus
+derekelkins/agda-vim
+derekwyatt/vim-scala
+dhruvasagar/vim-table-mode
+digitaltoad/vim-jade
+dleonard0/pony-vim-syntax
+dracula/vim
+drmingdrmer/xptemplate
+eagletmt/ghcmod-vim
+eagletmt/neco-ghc
+editorconfig/editorconfig-vim
+ehamberg/vim-cute-python
+eikenb/acp
+elixir-lang/vim-elixir
+elmcast/elm-vim
+elzr/vim-json
+embear/vim-localvimrc
+enomsg/vim-haskellConcealPlus
+ensime/ensime-vim
+ervandew/supertab
+esneider/YUNOcommit.vim
+farmergreg/vim-lastplace
+fatih/vim-go
+FelikZ/ctrlp-py-matcher
+fisadev/vim-isort
+flazz/vim-colorschemes
+floobits/floobits-neovim
+frigoeu/psc-ide-vim
+garbas/vim-snipmate
+gmarik/vundle
+godlygeek/csapprox
+godlygeek/tabular
+google/vim-codefmt
+google/vim-jsonnet
+google/vim-maktaba
+gregsexton/gitv
+guns/xterm-color-table.vim
+heavenshell/vim-jsdoc
+hecal3/vim-leader-guide
+honza/vim-snippets
+idris-hackers/idris-vim
+inkarkat/vim-SyntaxRange
+int3/vim-extradite
+itchyny/calendar.vim
+itchyny/lightline.vim
+itchyny/thumbnail.vim
+itchyny/vim-cursorword
+itchyny/vim-gitbranch
+ivanov/vim-ipython
+jacoborus/tender.vim
+janko-m/vim-test
+JazzCore/ctrlp-cmatcher
+jceb/vim-hier
+jceb/vim-orgmode
+jeetsukumaran/vim-buffergator
+jgdavey/tslime.vim
+jhradilek/vim-docbk
+jiangmiao/auto-pairs
+jistr/vim-nerdtree-tabs
+jnurmine/zenburn
+jonbri/vim-colorstepper
+joonty/vim-xdebug
+JuliaEditorSupport/julia-vim
+junegunn/fzf.vim
+junegunn/goyo.vim
+junegunn/limelight.vim
+junegunn/vim-easy-align
+junegunn/vim-github-dashboard
+junegunn/vim-peekaboo
+justincampbell/vim-eighties
+KabbAmine/zeavim.vim
+kana/vim-niceblock
+kana/vim-operator-replace
+kana/vim-operator-user
+kana/vim-tabpagecd
+kchmck/vim-coffee-script
+keith/swift.vim
+kien/rainbow_parentheses.vim
+konfekt/fastfold
+kshenoy/vim-signature
+lambdalisue/vim-gista
+latex-box-team/latex-box
+leafgarland/typescript-vim
+ledger/vim-ledger
+lepture/vim-jinja
+lervag/vimtex
+lfilho/cosco.vim
+LnL7/vim-nix
+lokaltog/vim-easymotion
+ludovicchabant/vim-lawrencium
+luochen1990/rainbow
+lyokha/vim-xkbswitch
+machakann/vim-highlightedyank
+majutsushi/tagbar
+maksimr/vim-jsbeautify
+MarcWeber/vim-addon-actions
+MarcWeber/vim-addon-async
+MarcWeber/vim-addon-background-cmd
+MarcWeber/vim-addon-commenting
+MarcWeber/vim-addon-completion
+MarcWeber/vim-addon-errorformats
+MarcWeber/vim-addon-goto-thing-at-cursor
+MarcWeber/vim-addon-local-vimrc
+MarcWeber/vim-addon-manager
+MarcWeber/vim-addon-mru
+MarcWeber/vim-addon-mw-utils
+MarcWeber/vim-addon-nix
+MarcWeber/vim-addon-other
+MarcWeber/vim-addon-php-manual
+MarcWeber/vim-addon-signs
+MarcWeber/vim-addon-sql
+MarcWeber/vim-addon-syntax-checker
+MarcWeber/vim-addon-toggle-buffer
+MarcWeber/vim-addon-xdebug
+martinda/Jenkinsfile-vim-syntax
+mattn/gist-vim
+mattn/webapi-vim
+mbbill/undotree
+megaannum/forms
+megaannum/self
+mfukar/robotframework-vim
+mhinz/vim-grepper
+mhinz/vim-signify
+mhinz/vim-startify
+michaeljsmith/vim-indent-object
+mileszs/ack.vim
+mindriot101/vim-yapf
+mkasa/lushtags
+morhetz/gruvbox
+mpickering/hlint-refactor-vim
+nathanaelkane/vim-indent-guides
+nbouscal/vim-stylish-haskell
+neoclide/vim-easygit
+neovimhaskell/haskell-vim
+nixprime/cpsm
+noc7c9/vim-iced-coffee-script
+osyo-manga/shabadou.vim
+osyo-manga/vim-textobj-multiblock
+osyo-manga/vim-watchdogs
+pangloss/vim-javascript
+peterhoeg/vim-qml
+plasticboy/vim-markdown
+python-mode/python-mode
+Quramy/tsuquyomi
+racer-rust/vim-racer
+rafi/awesome-vim-colorschemes
+raichoo/purescript-vim
+reedes/vim-pencil
+reedes/vim-wordy
+rhysd/committia.vim
+rhysd/vim-grammarous
+rhysd/vim-operator-surround
+Rip-Rip/clang_complete
+rodjek/vim-puppet
+roxma/nvim-cm-racer
+roxma/nvim-completion-manager
+rust-lang/rust.vim
+ryanoasis/vim-devicons
+Rykka/riv.vim
+sbdchd/neoformat
+scrooloose/nerdcommenter
+scrooloose/nerdtree
+scrooloose/syntastic
+sebastianmarkow/deoplete-rust
+sheerun/vim-polyglot
+shougo/context_filetype.vim
+shougo/denite.nvim
+shougo/deoplete.nvim
+shougo/echodoc.vim
+shougo/neco-syntax
+shougo/neco-vim
+shougo/neocomplete.vim
+shougo/neoinclude.vim
+shougo/neomru.vim
+shougo/neosnippet-snippets
+shougo/neosnippet.vim
+shougo/neoyank.vim
+shougo/tabpagebuffer.vim
+shougo/unite.vim
+shougo/vimproc.vim
+shougo/vimshell.vim
+shumphrey/fugitive-gitlab.vim
+SirVer/ultisnips
+sjl/gundo.vim
+sjl/splice.vim
+sk1418/last256
+slashmili/alchemist.vim
+t9md/vim-smalls
+takac/vim-hardtime
+terryma/vim-expand-region
+terryma/vim-multiple-cursors
+tex/vimpreviewpandoc
+thinca/vim-ft-diff_fold
+thinca/vim-prettyprint
+thinca/vim-quickrun
+thinca/vim-scouter
+thinca/vim-themis
+tomasr/molokai
+tomlion/vim-solidity
+tomtom/tlib_vim
+tpope/vim-abolish
+tpope/vim-commentary
+tpope/vim-dispatch
+tpope/vim-eunuch
+tpope/vim-fireplace
+tpope/vim-flagship
+tpope/vim-fugitive
+tpope/vim-pathogen
+tpope/vim-projectionist
+tpope/vim-repeat
+tpope/vim-rhubarb
+tpope/vim-scriptease
+tpope/vim-sensible
+tpope/vim-sleuth
+tpope/vim-speeddating
+tpope/vim-surround
+tpope/vim-tbone
+tpope/vim-vinegar
+travitch/hasksyn
+twinside/vim-haskellconceal
+Twinside/vim-hoogle
+tyru/caw.vim
+tyru/open-browser.vim
+ujihisa/neco-look
+valloric/youcompleteme
+vim-airline/vim-airline
+vim-airline/vim-airline-themes
+vimoutliner/vimoutliner
+vim-pandoc/vim-pandoc
+vim-pandoc/vim-pandoc-after
+vim-pandoc/vim-pandoc-syntax
+vim-ruby/vim-ruby
+vim-scripts/align
+vim-scripts/argtextobj.vim
+vim-scripts/a.vim
+vim-scripts/bats.vim
+vim-scripts/changeColorScheme.vim
+vim-scripts/Colour-Sampler-Pack
+vim-scripts/Improved-AnsiEsc
+vim-scripts/matchit.zip
+vim-scripts/mayansmoke
+vim-scripts/random.vim
+vim-scripts/Rename
+vim-scripts/ReplaceWithRegister
+vim-scripts/tabmerge
+vim-scripts/taglist.vim
+vim-scripts/wombat256.vim
+vim-scripts/YankRing.vim
+vimwiki/vimwiki
+vmchale/dhall-vim
+w0rp/ale
+wakatime/vim-wakatime
+wellle/targets.vim
+will133/vim-dirdiff
+wincent/command-t
+xolox/vim-easytags
+xolox/vim-misc
+xuhdev/vim-latex-live-preview
+zah/nim.vim
+zchee/deoplete-go
+zchee/deoplete-jedi
+zig-lang/zig.vim

From 836ce9d91ee08fb4dd6487593a488a39c938b945 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 9 Sep 2018 05:16:41 -0700
Subject: [PATCH 0631/3253] nextcloud: 13.0.5 -> 13.0.6 (#46236)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
nextcloud
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3245666d8ec3..8a0a848aa5d6 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.5";
+  version = "13.0.6";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451";
+    sha256 = "1m38k5jafz2lniy6fmq17xffkgaqs6rl4w789sqpniva1fb9xz4h";
   };
 
   installPhase = ''

From bbcf5eb13078b4bcfcbb7c977b53beac3f80ef02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 9 Sep 2018 14:37:30 +0200
Subject: [PATCH 0632/3253] cgit: use full path of groff in man2html

groff may not be installed system-wide or may be outside cgit's path
(e.g. when running cgit using uwsgi). As a result, the man2html filter
fails. Replace groff by its full path in man2html.
---
 .../version-management/git-and-tools/cgit/default.nix        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 3fb227909040..5bfd74344e8c 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
 , docbook_xsl, pkgconfig, luajit
-, gzip, bzip2, xz
+, groff, gzip, bzip2, xz
 , python, wrapPython, pygments, markdown
 }:
 
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
         -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
         -e 's|"xz"|"${xz.bin}/bin/xz"|' \
         -i ui-snapshot.c
+
+    substituteInPlace filters/html-converters/man2html \
+      --replace 'groff' '${groff}/bin/groff'
   '';
 
   # Give cgit a git source tree and pass configuration parameters (as make

From 68102e793df3bcbc6301444be78842bca509d474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 9 Sep 2018 09:50:22 -0300
Subject: [PATCH 0633/3253] xsettingsd: git-2015-06-14 -> 1.0.0

- Update to version 1.0.0
- Install man pages
- Fix license
- Add maintainer
---
 pkgs/tools/X11/xsettingsd/default.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 239b01e1345d..2f84711e61c4 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -1,39 +1,38 @@
-{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }:
+{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "xsettingsd-${version}";
-  version = "git-2015-06-14";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "derat";
     repo = "xsettingsd";
-    rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be";
-    sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s";
+    rev = "v${version}";
+    sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v";
   };
 
   patches = [
     ./SConstruct.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libX11 scons ];
+  nativeBuildInputs = [ scons pkgconfig ];
+
+  buildInputs = [ libX11 ];
+
   buildPhase = ''
-    mkdir -p "$out"
-    scons \
-      -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-      "prefix=$out"
+    scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
   '';
   
   installPhase = ''
-    mkdir -p "$out"/bin
-    install xsettingsd "$out"/bin
-    install dump_xsettings "$out"/bin
+    install -D -t "$out"/bin xsettingsd dump_xsettings
+    install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1
   '';
 
   meta = with stdenv.lib; {
     description = "Provides settings to X11 applications via the XSETTINGS specification";
     homepage = https://github.com/derat/xsettingsd;
-    license = licenses.bsd2;
+    license = licenses.bsd3;
     platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 4e282e295f6da95993c68b8f19d1a56762b352c7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 9 Sep 2018 14:54:16 +0200
Subject: [PATCH 0634/3253] altcoins.btc1: fix darwin build (#46398)

Only hexdump was needed from utillinux which is also available on darwin
through the unixtools meta package.
---
 pkgs/applications/altcoins/btc1.nix    | 17 +++++++++--------
 pkgs/applications/altcoins/default.nix |  7 +++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
index 95e03ee6a213..2f85a8947972 100644
--- a/pkgs/applications/altcoins/btc1.nix
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
+, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, AppKit
+, withGui ? !stdenv.isDarwin
+}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
@@ -12,11 +14,10 @@ stdenv.mkDerivation rec{
     sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db48 boost zlib
-                  miniupnpc protobuf libevent]
-                  ++ optionals stdenv.isLinux [ utillinux ]
-                  ++ optionals withGui [ qt4 qrencode ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ];
+  buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ]
+    ++ optionals withGui [ qt4 qrencode ]
+    ++ optional stdenv.isDarwin AppKit;
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 95d79a8650fd..4236cd7910bc 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -32,8 +32,11 @@ rec {
     boost = boost165; withGui = false;
   };
 
-  btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
-  btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };
+  btc1 = callPackage ./btc1.nix {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+    boost = boost165;
+  };
+  btc1d = btc1.override { withGui = false; };
 
   cryptop = python3.pkgs.callPackage ./cryptop { };
 

From 939debc7a419b6924c0bc1460ed7debad0942e35 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 9 Sep 2018 15:16:24 +0200
Subject: [PATCH 0635/3253] bullet: fix darwin build

The examples fail with an opengl related issue:

    Undefined symbols for architecture x86_64:
      "SimpleOpenGL3App::SimpleOpenGL3App(char const*, int, int, bool)", referenced from:
          _main in main_opengl_single_example.o
      "_useShadowMap", referenced from:
          GL_ShapeDrawer::drawScene(btDiscreteDynamicsWorld const*, bool, int) in GL_ShapeDrawer.o
    ld: symbol(s) not found for architecture x86_64

And the tests need an extra dependencly, possibley related to
https://github.com/bulletphysics/bullet3/issues/819

    ld: library not found for -lBussIK

/cc ZHF #45961
---
 pkgs/development/libraries/bullet/default.nix | 30 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 4d94faa9566a..fca5e8d70a3b 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }:
+{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+, Cocoa,  OpenGL
+}:
 
 stdenv.mkDerivation rec {
   name = "bullet-${version}";
@@ -11,10 +13,9 @@ stdenv.mkDerivation rec {
     sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3";
   };
 
-  buildInputs = [ cmake ] ++
-    (if stdenv.isDarwin
-     then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
-     else [libGLU_combined freeglut]);
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
   patches = [ ./gwen-narrowing.patch ];
 
@@ -28,25 +29,26 @@ stdenv.mkDerivation rec {
     "-DBUILD_CPU_DEMOS=OFF"
     "-DINSTALL_EXTRA_LIBS=ON"
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\""
     "-DOPENGL_FOUND=true"
-    "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
-    "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
-    "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework"
-    "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework"
+    "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
+    "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
+    "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework"
+    "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework"
+    "-DBUILD_BULLET2_DEMOS=OFF"
+    "-DBUILD_UNIT_TESTS=OFF"
   ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A professional free 3D Game Multiphysics Library";
     longDescription = ''
       Bullet 3D Game Multiphysics Library provides state of the art collision
       detection, soft body and rigid body dynamics.
     '';
     homepage = http://bulletphysics.org;
-    license = stdenv.lib.licenses.zlib;
-    maintainers = with stdenv.lib.maintainers; [ aforemny ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ aforemny ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e0425b26b9d..132c71064cf0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22213,7 +22213,9 @@ with pkgs;
     inherit (gnome2) gtksourceview;
   };
 
-  bullet = callPackage ../development/libraries/bullet {};
+  bullet = callPackage ../development/libraries/bullet {
+    inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
+  };
 
   spdlog = callPackage ../development/libraries/spdlog { };
 

From c4d8d4b4d6d1b7fc1f2d88d2b784c819fd6b76b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 9 Sep 2018 14:44:54 +0100
Subject: [PATCH 0636/3253] pyre: substituting %VERSION% in Makefile no longer
 required

---
 pkgs/development/tools/pyre/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index a62310878ba2..b51f6344c9b7 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -49,7 +49,7 @@ let
     export HOME=.
 
     # "external" because https://github.com/facebook/pyre-check/pull/8/files
-    sed "s/%VERSION%/external ${pyre-version}/" Makefile.template > Makefile
+    cp Makefile.template Makefile
     sed "s/%VERSION%/external/" dune.in > dune
 
     cp ${versionFile} ./scripts/generate-version-number.sh

From 2a5fa8b016ef1670b0fba9d0ba09537a29250f5e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 9 Sep 2018 13:56:58 +0000
Subject: [PATCH 0637/3253] webkitgtk24x: do not warn about
 expansion-to-defined

It fills the log.
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 1a17ae53313b..707abf1d30e6 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -77,7 +77,10 @@ stdenv.mkDerivation rec {
     "--disable-credential-storage"
   ];
 
-  NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT=";
+  NIX_CFLAGS_COMPILE = [
+    "-DU_NOEXCEPT="
+    "-Wno-expansion-to-defined"
+  ];
 
   dontAddDisableDepTrack = true;
 

From be32141cb023952ba83addb37990060b5dfe26f7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 9 Sep 2018 13:50:55 +0000
Subject: [PATCH 0638/3253] webkitgtk24x: prune libtool files

This fixes the build of claws-mail.override { enablePluginFancy = true; },
otherwise the linking fails to find transitive gst libraries.
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 707abf1d30e6..7b62de69123d 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
-, pkgconfig, which, gettext, gobjectIntrospection
+, pkgconfig, which, gettext, gobjectIntrospection, pruneLibtoolFiles
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
 , gst-plugins-base, libobjc
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl python ruby bison gperf flex
-    pkgconfig which gettext gobjectIntrospection
+    pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles
   ];
 
   buildInputs = [

From 05f122c5612e76e643f504275a35e6e05223bda9 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 9 Sep 2018 17:00:51 +0200
Subject: [PATCH 0639/3253] spl/zfs: 0.7.9 -> 0.7.10

---
 pkgs/os-specific/linux/spl/default.nix | 5 ++---
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 146e1c276965..6e22de4bcf62 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -10,13 +10,13 @@ assert kernel != null;
 
 stdenv.mkDerivation rec {
   name = "spl-${version}-${kernel.version}";
-  version = "0.7.9";
+  version = "0.7.10";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";
+    sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26";
   };
 
   patches = [ ./install_prefix.patch ];
@@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
-    broken = stdenv.lib.versionAtLeast kernel.version "4.18";
   };
 }
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index e6807f1214cc..e7cca579d624 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -158,12 +158,12 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = "4.18";
+    # incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.9";
+    version = "0.7.10";
 
-    sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n";
+    sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1";
 
     extraPatches = [
       (fetchpatch {

From 136fb311c7c0079db24e22f9d29656cdffb05e5e Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sun, 9 Sep 2018 17:14:59 +0200
Subject: [PATCH 0640/3253] elpy: fix build dep

---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 6cd80613526b..a83c3baaa4a0 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -178,7 +178,7 @@ let
       for file in elpy.el elpy-pkg.el; do
         substituteInPlace $file \
             --replace "company \"0.8.2\"" "company \"${company.version}\"" \
-            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${melpaPackages.find-file-in-project.version}\"" \
+            --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \
             --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
             --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
             --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""

From 4d8bb9a34aa3de134133980551b45dc4768f3ddc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 9 Sep 2018 11:20:07 -0400
Subject: [PATCH 0641/3253] dockerTools: unpin go version

The linked PR has been merged, and in fact dockerTools has upgraded to the
latest `go1.11` compiler:

https://github.com/moby/moby/pull/35739
https://github.com/moby/moby/pull/37358
---
 pkgs/top-level/all-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc71d5ec6892..188956719884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -129,8 +129,7 @@ with pkgs;
 
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
 
-  # go 1.9 pin until https://github.com/moby/moby/pull/35739
-  dockerTools = callPackage ../build-support/docker { go = go_1_9; };
+  dockerTools = callPackage ../build-support/docker { };
 
   docker_compose = pythonPackages.docker_compose;
 

From 9dc661aa72e27fa9fdf38c16976a757626d5dd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 9 Sep 2018 18:47:26 +0200
Subject: [PATCH 0642/3253] nixos/i2pd: Update options to encompass recent
 additions to the daemon

Also:
  * switch to flat sysdir
  * remove nixos default reseeds, rely on program defaults
  * refactor config expressions
---
 nixos/modules/services/networking/i2pd.nix | 618 ++++++++++++++-------
 1 file changed, 408 insertions(+), 210 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 3afafaf3fed5..0e9b354cfcaf 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,6 +8,17 @@ let
 
   homeDir = "/var/lib/i2pd";
 
+  strOpt = k: v: k + " = " + v;
+  boolOpt = k: v: k + " = " + boolToString v;
+  intOpt = k: v: k + " = " + toString v;
+  lstOpt = k: xs: k + " = " + concatStringsSep "," xs;
+  optionalNullString = o: s: optional (! isNull s) (strOpt o s);
+  optionalNullBool = o: b: optional (! isNull b) (boolOpt o b);
+  optionalNullInt = o: i: optional (! isNull i) (intOpt o i);
+  optionalEmptyList = o: l: optional ([] != l) (lstOpt o l);
+
+  mkEnableTrueOption = name: mkEnableOption name // { default = true; };
+
   mkEndpointOpt = name: addr: port: {
     enable = mkEnableOption name;
     name = mkOption {
@@ -18,42 +29,54 @@ let
     address = mkOption {
       type = types.str;
       default = addr;
-      description = "Bind address for ${name} endpoint. Default: " + addr;
+      description = "Bind address for ${name} endpoint.";
     };
     port = mkOption {
       type = types.int;
       default = port;
-      description = "Bind port for ${name} endoint. Default: " + toString port;
+      description = "Bind port for ${name} endoint.";
     };
   };
 
-  mkKeyedEndpointOpt = name: addr: port: keyFile:
+  i2cpOpts = name: {
+    length = mkOption {
+      type = types.int;
+      description = "Guaranteed minimum hops for ${name} tunnels.";
+      default = 3;
+    };
+    quantity = mkOption {
+      type = types.int;
+      description = "Number of simultaneous ${name} tunnels.";
+      default = 5;
+    };
+  };
+
+  mkKeyedEndpointOpt = name: addr: port: keyloc:
     (mkEndpointOpt name addr port) // {
       keys = mkOption {
-        type = types.str;
-        default = "";
+        type = with types; nullOr str;
+        default = keyloc;
         description = ''
           File to persist ${lib.toUpper name} keys.
         '';
       };
+      inbound = i2cpOpts name;
+      outbound = i2cpOpts name;
+      latency.min = mkOption {
+        type = with types; nullOr int;
+        description = "Min latency for tunnels.";
+        default = null;
+      };
+      latency.max = mkOption {
+        type = with types; nullOr int;
+        description = "Max latency for tunnels.";
+        default = null;
+      };
     };
 
-  commonTunOpts = let
-    i2cpOpts = {
-      length = mkOption {
-        type = types.int;
-        description = "Guaranteed minimum hops.";
-        default = 3;
-      };
-      quantity = mkOption {
-        type = types.int;
-        description = "Number of simultaneous tunnels.";
-        default = 5;
-      };
-    };
-  in name: {
-    outbound = i2cpOpts;
-    inbound = i2cpOpts;
+  commonTunOpts = name: {
+    outbound = i2cpOpts name;
+    inbound = i2cpOpts name;
     crypto.tagsToSend = mkOption {
       type = types.int;
       description = "Number of ElGamal/AES tags to send.";
@@ -70,94 +93,142 @@ let
     };
   } // mkEndpointOpt name "127.0.0.1" 0;
 
-  i2pdConf = pkgs.writeText "i2pd.conf" ''
-    # DO NOT EDIT -- this file has been generated automatically.
-    loglevel = ${cfg.logLevel}
-
-    ipv4 = ${boolToString cfg.enableIPv4}
-    ipv6 = ${boolToString cfg.enableIPv6}
-    notransit = ${boolToString cfg.notransit}
-    floodfill = ${boolToString cfg.floodfill}
-    netid = ${toString cfg.netid}
-    ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
-    ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
-
-    [limits]
-    transittunnels = ${toString cfg.limits.transittunnels}
-
-    [upnp]
-    enabled = ${boolToString cfg.upnp.enable}
-    name = ${cfg.upnp.name}
-
-    [precomputation]
-    elgamal = ${boolToString cfg.precomputation.elgamal}
-
-    [reseed]
-    verify = ${boolToString cfg.reseed.verify}
-    file = ${cfg.reseed.file}
-    urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
-
-    [addressbook]
-    defaulturl = ${cfg.addressbook.defaulturl}
-    subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
-
-    ${flip concatMapStrings
+  sec = name: "\n[" + name + "]";
+  notice = "# DO NOT EDIT -- this file has been generated automatically.";
+  i2pdConf = let
+    opts = [
+      notice
+      (strOpt "loglevel" cfg.logLevel)
+      (boolOpt "logclftime" cfg.logCLFTime)
+      (boolOpt "ipv4" cfg.enableIPv4)
+      (boolOpt "ipv6" cfg.enableIPv6)
+      (boolOpt "notransit" cfg.notransit)
+      (boolOpt "floodfill" cfg.floodfill)
+      (intOpt "netid" cfg.netid)
+    ] ++ (optionalNullInt "bandwidth" cfg.bandwidth)
+      ++ (optionalNullInt "port" cfg.port)
+      ++ (optionalNullString "family" cfg.family)
+      ++ (optionalNullString "datadir" cfg.dataDir)
+      ++ (optionalNullInt "share" cfg.share)
+      ++ (optionalNullBool "ssu" cfg.ssu)
+      ++ (optionalNullBool "ntcp" cfg.ntcp)
+      ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy)
+      ++ (optionalNullString "ifname" cfg.ifname)
+      ++ (optionalNullString "ifname4" cfg.ifname4)
+      ++ (optionalNullString "ifname6" cfg.ifname6)
+      ++ [
+      (sec "limits")
+      (intOpt "transittunnels" cfg.limits.transittunnels)
+      (intOpt "coresize" cfg.limits.coreSize)
+      (intOpt "openfiles" cfg.limits.openFiles)
+      (intOpt "ntcphard" cfg.limits.ntcpHard)
+      (intOpt "ntcpsoft" cfg.limits.ntcpSoft)
+      (intOpt "ntcpthreads" cfg.limits.ntcpThreads)
+      (sec "upnp")
+      (boolOpt "enabled" cfg.upnp.enable)
+      (sec "precomputation")
+      (boolOpt "elgamal" cfg.precomputation.elgamal)
+      (sec "reseed")
+      (boolOpt "verify" cfg.reseed.verify)
+    ] ++ (optionalNullString "file" cfg.reseed.file)
+      ++ (optionalEmptyList "urls" cfg.reseed.urls)
+      ++ (optionalNullString "floodfill" cfg.reseed.floodfill)
+      ++ (optionalNullString "zipfile" cfg.reseed.zipfile)
+      ++ (optionalNullString "proxy" cfg.reseed.proxy)
+      ++ [
+      (sec "trust")
+      (boolOpt "enabled" cfg.trust.enable)
+      (boolOpt "hidden" cfg.trust.hidden)
+    ] ++ (optionalEmptyList "routers" cfg.trust.routers)
+      ++ (optionalNullString "family" cfg.trust.family)
+      ++ [
+      (sec "websockets")
+      (boolOpt "enabled" cfg.websocket.enable)
+      (strOpt "address" cfg.websocket.address)
+      (intOpt "port" cfg.websocket.port)
+      (sec "exploratory")
+      (intOpt "inbound.length" cfg.exploratory.inbound.length)
+      (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity)
+      (intOpt "outbound.length" cfg.exploratory.outbound.length)
+      (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity)
+      (sec "ntcp2")
+      (boolOpt "enabled" cfg.ntcp2.enable)
+      (boolOpt "published" cfg.ntcp2.published)
+      (intOpt "port" cfg.ntcp2.port)
+      (sec "addressbook")
+      (strOpt "defaulturl" cfg.addressbook.defaulturl)
+    ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
+      ++ (flip map
       (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
-      (proto: ''
-        [${proto.name}]
-        enabled = ${boolToString proto.enable}
-        address = ${proto.address}
-        port = ${toString proto.port}
-        ${if proto ? keys then "keys = ${proto.keys}" else ""}
-        ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
-        ${if proto ? user then "user = ${proto.user}" else ""}
-        ${if proto ? pass then "pass = ${proto.pass}" else ""}
-        ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
-        ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
-      '')
-    }
-  '';
+      (proto: let protoOpts = [
+        (sec proto.name)
+        (boolOpt "enabled" proto.enable)
+        (strOpt "address" proto.address)
+        (intOpt "port" proto.port)
+        ] ++ (if proto ? keys then optionalNullString "keys" proto.keys else [])
+        ++ (if proto ? auth then optionalNullBool "auth" proto.auth else [])
+        ++ (if proto ? user then optionalNullString "user" proto.user else [])
+        ++ (if proto ? pass then optionalNullString "pass" proto.pass else [])
+        ++ (if proto ? strictHeaders then optionalNullBool "strictheaders" proto.strictHeaders else [])
+        ++ (if proto ? hostname then optionalNullString "hostname" proto.hostname else [])
+        ++ (if proto ? outproxy then optionalNullString "outproxy" proto.outproxy else [])
+        ++ (if proto ? outproxyPort then optionalNullInt "outproxyport" proto.outproxyPort else [])
+        ++ (if proto ? outproxyEnable then optionalNullBool "outproxy.enabled" proto.outproxyEnable else []);
+        in (concatStringsSep "\n" protoOpts)
+      ));
+  in
+    pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts);
 
-  i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
-    # DO NOT EDIT -- this file has been generated automatically.
-    ${flip concatMapStrings
+  tunnelConf = let opts = [
+    notice
+    (flip map
       (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
-      (tun: ''
-        [${tun.name}]
-        type = client
-        destination = ${tun.destination}
-        destinationport = ${toString tun.destinationPort}
-        keys = ${tun.keys}
-        address = ${tun.address}
-        port = ${toString tun.port}
-        inbound.length = ${toString tun.inbound.length}
-        outbound.length = ${toString tun.outbound.length}
-        inbound.quantity = ${toString tun.inbound.quantity}
-        outbound.quantity = ${toString tun.outbound.quantity}
-        crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
-      '')
-    }
-    ${flip concatMapStrings
+      (tun: let outTunOpts = [
+        (sec tun.name)
+        "type = client"
+        (intOpt "port" tun.port)
+        (strOpt "destination" tun.destination)
+        ] ++ (if tun ? destinationPort then optionalNullInt "destinationport" tun.destinationPort else [])
+        ++ (if tun ? keys then
+            optionalNullString "keys" tun.keys else [])
+        ++ (if tun ? address then
+            optionalNullString "address" tun.address else [])
+        ++ (if tun ? inbound.length then
+            optionalNullInt "inbound.length" tun.inbound.length else [])
+        ++ (if tun ? inbound.quantity then
+            optionalNullInt "inbound.quantity" tun.inbound.quantity else [])
+        ++ (if tun ? outbound.length then
+            optionalNullInt "outbound.length" tun.outbound.length else [])
+        ++ (if tun ? outbound.quantity then
+            optionalNullInt "outbound.quantity" tun.outbound.quantity else [])
+        ++ (if tun ? crypto.tagsToSend then
+            optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []);
+        in concatStringsSep "\n" outTunOpts))
+    (flip map
       (collect (tun: tun ? port && tun ? address) cfg.inTunnels)
-      (tun: ''
-        [${tun.name}]
-        type = server
-        destination = ${tun.destination}
-        keys = ${tun.keys}
-        host = ${tun.address}
-        port = ${toString tun.port}
-        inport = ${toString tun.inPort}
-        accesslist = ${builtins.concatStringsSep "," tun.accessList}
-      '')
-    }
-  '';
+      (tun: let inTunOpts = [
+        (sec tun.name)
+        "type = server"
+        (intOpt "port" tun.port)
+        (strOpt "host" tun.address)
+      ] ++ (if tun ? destination then
+            optionalNullString "destination" tun.destination else [])
+        ++ (if tun ? keys then
+            optionalNullString "keys" tun.keys else [])
+        ++ (if tun ? inPort then
+            optionalNullInt "inport" tun.inPort else [])
+        ++ (if tun ? accessList then
+            optionalEmptyList "accesslist" tun.accessList else []);
+        in concatStringsSep "\n" inTunOpts))];
+    in pkgs.writeText "i2pd-tunnels.conf" opts;
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
     exec ${pkgs.i2pd}/bin/i2pd \
       ${if isNull cfg.address then "" else "--host="+cfg.address} \
+      --service \
       --conf=${i2pdConf} \
-      --tunconf=${i2pdTunnelConf}
+      --tunconf=${tunnelConf}
   '';
 
 in
@@ -170,9 +241,7 @@ in
 
     services.i2pd = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
+      enable = mkEnableOption "I2Pd daemon" // {
         description = ''
           Enables I2Pd as a running service upon activation.
           Please read http://i2pd.readthedocs.io/en/latest/ for further
@@ -192,6 +261,8 @@ in
         '';
       };
 
+      logCLFTime = mkEnableOption "Full CLF-formatted date and time to log";
+
       address = mkOption {
         type = with types; nullOr str;
         default = null;
@@ -200,17 +271,72 @@ in
         '';
       };
 
-      notransit = mkOption {
-        type = types.bool;
-        default = false;
+      family = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Specify a family the router belongs to.
+        '';
+      };
+
+      dataDir = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Alternative path to storage of i2pd data (RI, keys, peer profiles, ...)
+        '';
+      };
+
+      share = mkOption {
+        type = types.int;
+        default = 100;
+        description = ''
+          Limit of transit traffic from max bandwidth in percents.
+        '';
+      };
+
+      ifname = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Network interface to bind to.
+        '';
+      };
+
+      ifname4 = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          IPv4 interface to bind to.
+        '';
+      };
+
+      ifname6 = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          IPv6 interface to bind to.
+        '';
+      };
+
+      ntcpProxy = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Proxy URL for NTCP transport.
+        '';
+      };
+
+      ntcp = mkEnableTrueOption "ntcp";
+      ssu = mkEnableTrueOption "ssu";
+
+      notransit = mkEnableOption "notransit" // {
         description = ''
           Tells the router to not accept transit tunnels during startup.
         '';
       };
 
-      floodfill = mkOption {
-        type = types.bool;
-        default = false;
+      floodfill = mkEnableOption "floodfill" // {
         description = ''
           If the router is declared to be unreachable and needs introduction nodes.
         '';
@@ -241,51 +367,20 @@ in
         '';
       };
 
-      enableIPv4 = mkOption {
-        type = types.bool;
-        default = true;
+      enableIPv4 = mkEnableTrueOption "IPv4 connectivity";
+      enableIPv6 = mkEnableOption "IPv6 connectivity";
+      nat = mkEnableTrueOption "NAT bypass";
+
+      upnp.enable = mkEnableOption "UPnP service discovery";
+      upnp.name = mkOption {
+        type = types.str;
+        default = "I2Pd";
         description = ''
-          Enables IPv4 connectivity. Enabled by default.
+          Name i2pd appears in UPnP forwardings list.
         '';
       };
 
-      enableIPv6 = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables IPv6 connectivity. Disabled by default.
-        '';
-      };
-
-      nat = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Assume router is NATed. Enabled by default.
-        '';
-      };
-
-      upnp = {
-        enable = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Enables UPnP.
-          '';
-        };
-
-        name = mkOption {
-          type = types.str;
-          default = "I2Pd";
-          description = ''
-            Name i2pd appears in UPnP forwardings list.
-          '';
-        };
-      };
-
-      precomputation.elgamal = mkOption {
-        type = types.bool;
-        default = true;
+      precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // {
         description = ''
           Whenever to use precomputated tables for ElGamal.
           <command>i2pd</command> defaults to <literal>false</literal>
@@ -296,76 +391,154 @@ in
         '';
       };
 
-      reseed = {
-        verify = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Request SU3 signature verification
-          '';
-        };
+      reseed.verify = mkEnableOption "SU3 signature verification";
 
-        file = mkOption {
-          type = types.str;
-          default = "";
-          description = ''
-            Full path to SU3 file to reseed from
-          '';
-        };
-
-        urls = mkOption {
-          type = with types; listOf str;
-          default = [
-            "https://reseed.i2p-project.de/"
-            "https://i2p.mooo.com/netDb/"
-            "https://netdb.i2p2.no/"
-            "https://us.reseed.i2p2.no:444/"
-            "https://uk.reseed.i2p2.no:444/"
-            "https://i2p.manas.ca:8443/"
-          ];
-          description = ''
-            Reseed URLs
-          '';
-        };
+      reseed.file = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Full path to SU3 file to reseed from.
+        '';
       };
 
-      addressbook = {
-       defaulturl = mkOption {
-          type = types.str;
-          default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt";
-          description = ''
-            AddressBook subscription URL for initial setup
-          '';
-        };
-       subscriptions = mkOption {
-          type = with types; listOf str;
-          default = [
-            "http://inr.i2p/export/alive-hosts.txt"
-            "http://i2p-projekt.i2p/hosts.txt"
-            "http://stats.i2p/cgi-bin/newhosts.txt"
-          ];
-          description = ''
-            AddressBook subscription URLs
-          '';
-        };
+      reseed.urls = mkOption {
+        type = with types; listOf str;
+        default = [];
+        description = ''
+          Reseed URLs.
+        '';
+      };
+
+      reseed.floodfill = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Path to router info of floodfill to reseed from.
+        '';
+      };
+
+      reseed.zipfile = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Path to local .zip file to reseed from.
+        '';
+      };
+
+      reseed.proxy = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          URL for reseed proxy, supports http/socks.
+        '';
+      };
+
+     addressbook.defaulturl = mkOption {
+        type = types.str;
+        default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt";
+        description = ''
+          AddressBook subscription URL for initial setup
+        '';
+      };
+     addressbook.subscriptions = mkOption {
+        type = with types; listOf str;
+        default = [
+          "http://inr.i2p/export/alive-hosts.txt"
+          "http://i2p-projekt.i2p/hosts.txt"
+          "http://stats.i2p/cgi-bin/newhosts.txt"
+        ];
+        description = ''
+          AddressBook subscription URLs
+        '';
+      };
+
+      trust.enable = mkEnableOption "Explicit trust options";
+
+      trust.family = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        description = ''
+          Router Familiy to trust for first hops.
+        '';
+      };
+
+      trust.routers = mkOption {
+        type = with types; listOf str;
+        default = [];
+        description = ''
+          Only connect to the listed routers.
+        '';
+      };
+
+      trust.hidden = mkEnableOption "Router concealment.";
+
+      websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666;
+
+      exploratory.inbound = i2cpOpts "exploratory";
+      exploratory.outbound = i2cpOpts "exploratory";
+
+      ntcp2.enable = mkEnableTrueOption "NTCP2.";
+      ntcp2.published = mkEnableOption "NTCP2 publication.";
+      ntcp2.port = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          Port to listen for incoming NTCP2 connections (0=auto).
+        '';
       };
 
       limits.transittunnels = mkOption {
         type = types.int;
         default = 2500;
         description = ''
-          Maximum number of active transit sessions
+          Maximum number of active transit sessions.
+        '';
+      };
+
+      limits.coreSize = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          Maximum size of corefile in Kb (0 - use system limit).
+        '';
+      };
+
+      limits.openFiles = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          Maximum number of open files (0 - use system default).
+        '';
+      };
+
+      limits.ntcpHard = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          Maximum number of active transit sessions.
+        '';
+      };
+
+      limits.ntcpSoft = mkOption {
+        type = types.int;
+        default = 0;
+        description = ''
+          Threshold to start probabalistic backoff with ntcp sessions (default: use system limit).
+        '';
+      };
+
+      limits.ntcpThreads = mkOption {
+        type = types.int;
+        default = 1;
+        description = ''
+          Maximum number of threads used by NTCP DH worker.
         '';
       };
 
       proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // {
-        auth = mkOption {
-          type = types.bool;
-          default = false;
-          description = ''
-            Enable authentication for webconsole.
-          '';
-        };
+
+        auth = mkEnableOption "Webconsole authentication";
+
         user = mkOption {
           type = types.str;
           default = "i2pd";
@@ -373,6 +546,7 @@ in
             Username for webconsole access
           '';
         };
+
         pass = mkOption {
           type = types.str;
           default = "i2pd";
@@ -380,11 +554,35 @@ in
             Password for webconsole access.
           '';
         };
+
+        strictHeaders = mkOption {
+          type = with types; nullOr bool;
+          default = null;
+          description = ''
+            Enable strict host checking on WebUI.
+          '';
+        };
+
+        hostname = mkOption {
+          type = with types; nullOr str;
+          default = null;
+          description = ''
+            Expected hostname for WebUI.
+          '';
+        };
       };
 
-      proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "";
-      proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "")
+      proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat")
       // {
+        outproxy = mkOption {
+          type = with types; nullOr str;
+          default = null;
+          description = "Upstream outproxy bind address.";
+        };
+      };
+      proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "socksproxy-keys.dat")
+      // {
+        outproxyEnable = mkEnableOption "SOCKS outproxy";
         outproxy = mkOption {
           type = types.str;
           default = "127.0.0.1";
@@ -408,8 +606,8 @@ in
           { name, ... }: {
             options = {
               destinationPort = mkOption {
-                type = types.int;
-                default = 0;
+                type = with types; nullOr int;
+                default = null;
                 description = "Connect to particular port at destination.";
               };
             } // commonTunOpts name;

From d4e89680d2400a28de8fee772070680458e9e1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 9 Sep 2018 20:39:15 +0200
Subject: [PATCH 0643/3253] pythonPackages.flask_ldap_login: Fix build

---
 .../python-modules/flask-ldap-login/default.nix        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index b95e694a232f..02f4290d9590 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
@@ -11,6 +11,14 @@ buildPythonPackage rec {
     sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
   };
 
+  patches = [
+    # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41
+    (fetchpatch {
+      url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch;
+      sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48";
+    })
+  ];
+
   checkInputs = [ nose mock flask_testing ];
   propagatedBuildInputs = [ flask flask_wtf ldap ];
 

From 8a53488904df856b9e947c03f83372952989c970 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sun, 9 Sep 2018 20:39:17 +0200
Subject: [PATCH 0644/3253] opentracker: 2016-10-02 -> 2018-05-26

---
 pkgs/applications/networking/p2p/opentracker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index abddc22c285c..83ddb456153c 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, libowfat, zlib }:
 
 stdenv.mkDerivation {
-  name = "opentracker-2016-10-02";
+  name = "opentracker-2018-05-26";
 
   src = fetchgit {
     url = "git://erdgeist.org/opentracker";
-    rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61";
-    sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl";
+    rev = "6411f1567f64248b0d145493c2e61004d2822623";
+    sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j";
   };
 
   buildInputs = [ libowfat zlib ];

From 25f8753bf446b9a9f6ccf0cb0e643306ec49f172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 9 Sep 2018 20:39:46 +0200
Subject: [PATCH 0645/3253] pythonPackages.flask_ldap_login: 0.3.0 -> 0.3.4

---
 .../python-modules/flask-ldap-login/default.nix      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index 02f4290d9590..9aae92df30e2 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
+{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
 buildPythonPackage rec {
   pname = "flask-ldap-login";
-  version = "0.3.0";
+  version = "0.3.4";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
+  src = fetchFromGitHub {
+    owner = "ContinuumIO";
+    repo = "flask-ldap-login";
+    rev = version;
+    sha256 = "1l6zahqhwn5g9fmhlvjv80288b5h2fk5mssp7amdkw5ysk570wzp";
   };
 
   patches = [

From 063aa389dfaa29b697acf2db72610324b1b6aa39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 9 Sep 2018 20:56:34 +0200
Subject: [PATCH 0646/3253] pythonPackages.libusb1: Fix darwin build

---
 pkgs/development/python-modules/libusb1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index 245ea90038ea..a460fb8a1185 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271";
   };
 
-  postPatch = lib.optionalString stdenv.isLinux ''
+  postPatch = ''
     substituteInPlace usb1/libusb1.py --replace \
       "ctypes.util.find_library(base_name)" \
       "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"

From d0413d1ac95460ff669cb5f5f4509e024454d21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 9 Sep 2018 21:19:29 +0200
Subject: [PATCH 0647/3253] racket: warn to avoid repeating #45952

---
 pkgs/development/interpreters/racket/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e8b6cc93c2c1..1f2a28cb8fb8 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -36,7 +36,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "7.0";
+  version = "7.0"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
     fetchurl rec {

From 88cf02421bcf92e3e67a065b261abaa3ac78353a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 15:09:20 -0700
Subject: [PATCH 0648/3253] osinfo-db: 20180531 -> 20180903

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
osinfo-db
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 9919fb57f7cc..93ee6d38c7c3 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180531";
+  name = "osinfo-db-20180903";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x";
+    sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From a4b040e69f4f56a5e9e8df15b2941fdceca06bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Sun, 9 Sep 2018 21:33:45 +0200
Subject: [PATCH 0649/3253] pythonPackages.cozy: Disable on python2 (#46436)

Cozy does not support python2.
---
 pkgs/development/python-modules/cozy/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix
index 0feca2773b37..7515891456e9 100644
--- a/pkgs/development/python-modules/cozy/default.nix
+++ b/pkgs/development/python-modules/cozy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchFromGitHub, lib,
+{ buildPythonPackage, isPy3k, fetchFromGitHub, lib,
   z3, ply, python-igraph, oset, ordered-set, dictionaries }:
 
 buildPythonPackage {
@@ -29,6 +29,8 @@ buildPythonPackage {
     $out/bin/cozy --help
   '';
 
+  disabled = !isPy3k;
+
   meta = {
     description = "The collection synthesizer";
     homepage = https://cozy.uwplse.org/;

From b667a76eacc60a8485f1dff82f7ff47417b8545e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 9 Sep 2018 21:48:52 +0200
Subject: [PATCH 0650/3253] pythonPackages.flask_ldap_login: Disable on python3

---
 pkgs/development/python-modules/flask-ldap-login/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix
index 9aae92df30e2..99b57dac816f 100644
--- a/pkgs/development/python-modules/flask-ldap-login/default.nix
+++ b/pkgs/development/python-modules/flask-ldap-login/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch
 , flask, flask_wtf, flask_testing, ldap
 , mock, nose }:
 
 buildPythonPackage rec {
   pname = "flask-ldap-login";
   version = "0.3.4";
+  disabled = isPy3k;
 
   src = fetchFromGitHub {
     owner = "ContinuumIO";

From b633fc4fb4b3bbd44b4bbb1d29d3f3fa642991f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 9 Sep 2018 22:09:34 +0200
Subject: [PATCH 0651/3253] pythonPackages.libusb1: Disable flaky test

---
 pkgs/development/python-modules/libusb1/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix
index a460fb8a1185..8a9b5da68ef9 100644
--- a/pkgs/development/python-modules/libusb1/default.nix
+++ b/pkgs/development/python-modules/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }:
 
 buildPythonPackage rec {
   pname = "libusb1";
@@ -17,8 +17,12 @@ buildPythonPackage rec {
 
   buildInputs = [ libusb1 ];
 
+  checkInputs = [ pytest ];
+
   checkPhase = ''
-    ${python.interpreter} -m usb1.testUSB1
+    # USBPollerThread is unreliable. Let's not test it.
+    # See: https://github.com/vpelletier/python-libusb1/issues/16
+    py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py
   '';
 
   meta = with stdenv.lib; {

From 8473168bef1dfe142d12189366eef85fc59ba585 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Sep 2018 22:12:52 +0200
Subject: [PATCH 0652/3253] mtxclient: init at 0.1.0

---
 .../libraries/mtxclient/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/mtxclient/default.nix

diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
new file mode 100644
index 000000000000..465a70576356
--- /dev/null
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }:
+
+stdenv.mkDerivation rec {
+  name = "mtxclient-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "mujx";
+    repo = "mtxclient";
+    rev = "v${version}";
+    sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp";
+  };
+
+  postPatch = ''
+    ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
+  '';
+
+  cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ boost openssl zlib libsodium olm ];
+
+  meta = with stdenv.lib; {
+    description = "Client API library for Matrix, built on top of Boost.Asio";
+    homepage = https://github.com/mujx/mtxclient;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc71d5ec6892..a7f3f7b05679 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11244,6 +11244,8 @@ with pkgs;
 
   mtpfs = callPackage ../tools/filesystems/mtpfs { };
 
+  mtxclient = callPackage ../development/libraries/mtxclient { };
+
   mu = callPackage ../tools/networking/mu {
     texinfo = texinfo4;
   };

From 4d11a37c69d2914c24250dd3eea780bef6be0932 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Sep 2018 22:13:24 +0200
Subject: [PATCH 0653/3253] spdlog_1: init 1.1.0

---
 pkgs/development/libraries/spdlog/default.nix | 66 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  9 ++-
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1c9e67f87675..a96cd455f554 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -1,32 +1,46 @@
 { stdenv, fetchFromGitHub, cmake }:
 
-stdenv.mkDerivation rec {
-  name = "spdlog-${version}";
-  version = "0.14.0";
+let
+  generic = { version, sha256 }:
+    stdenv.mkDerivation {
+      name = "spdlog-${version}";
+      inherit version;
 
-  src = fetchFromGitHub {
-    owner  = "gabime";
-    repo   = "spdlog";
-    rev    = "v${version}";
+      src = fetchFromGitHub {
+        owner  = "gabime";
+        repo   = "spdlog";
+        rev    = "v${version}";
+        inherit sha256;
+      };
+
+      nativeBuildInputs = [ cmake ];
+
+      # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
+
+      outputs = [ "out" "doc" ];
+
+      postInstall = ''
+        mkdir -p $out/share/doc/spdlog
+        cp -rv ../example $out/share/doc/spdlog
+      '';
+
+      meta = with stdenv.lib; {
+        description    = "Very fast, header only, C++ logging library.";
+        homepage       = https://github.com/gabime/spdlog;
+        license        = licenses.mit;
+        maintainers    = with maintainers; [ obadz ];
+        platforms      = platforms.all;
+      };
+    };
+in
+{
+  spdlog_1 = generic {
+    version = "1.1.0";
+    sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f";
+  };
+
+  spdlog_0 = generic {
+    version = "0.14.0";
     sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
   };
-
-  nativeBuildInputs = [ cmake ];
-
-  # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
-
-  outputs = [ "out" "doc" ];
-
-  postInstall = ''
-    mkdir -p $out/share/doc/spdlog
-    cp -rv ../example $out/share/doc/spdlog
-  '';
-
-  meta = with stdenv.lib; {
-    description    = "Very fast, header only, C++ logging library.";
-    homepage       = https://github.com/gabime/spdlog;
-    license        = licenses.mit;
-    maintainers    = with maintainers; [ obadz ];
-    platforms      = platforms.all;
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7f3f7b05679..182eb55557e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2347,7 +2347,9 @@ with pkgs;
 
   enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
 
-  cryfs = callPackage ../tools/filesystems/cryfs { };
+  cryfs = callPackage ../tools/filesystems/cryfs {
+    spdlog = spdlog_0;
+  };
 
   encfs = callPackage ../tools/filesystems/encfs {
     tinyxml2 = tinyxml-2;
@@ -22217,7 +22219,10 @@ with pkgs;
 
   bullet = callPackage ../development/libraries/bullet {};
 
-  spdlog = callPackage ../development/libraries/spdlog { };
+  inherit (callPackages ../development/libraries/spdlog { })
+    spdlog_0 spdlog_1;
+
+  spdlog = spdlog_1;
 
   dart = callPackage ../development/interpreters/dart { };
   dart_stable = dart.override { version = "1.24.3"; };

From ff8fc5c46c81095d63c688072c91915a3e5cc41d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Sep 2018 22:14:27 +0200
Subject: [PATCH 0654/3253] nheko: 0.4.3 -> 0.5.5

---
 .../instant-messengers/nheko/default.nix      | 63 ++++---------
 .../nheko/external-deps.patch                 | 94 -------------------
 .../instant-messengers/nheko/fetchurls.patch  | 21 -----
 3 files changed, 17 insertions(+), 161 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index cf9558b4b955..6716305df8b5 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,39 +1,9 @@
-{
-  lib, stdenv, fetchFromGitHub, fetchurl,
-  cmake, doxygen, lmdb, qt5, qtmacextras
+{ lib, stdenv, fetchFromGitHub, fetchurl
+, cmake, lmdb, qt5, qtmacextras, mtxclient
+, boost, spdlog, olm, pkgconfig
 }:
 
 let
-  json_hpp = fetchurl {
-    url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp;
-    sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733";
-  };
-
-  variant_hpp = fetchurl {
-    url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp;
-    sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq";
-  };
-
-  matrix-structs = stdenv.mkDerivation rec {
-    name = "matrix-structs-git";
-
-    src = fetchFromGitHub {
-      owner = "mujx";
-      repo = "matrix-structs";
-      rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e";
-      sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6";
-    };
-
-    postUnpack = ''
-      cp ${json_hpp} "$sourceRoot/include/json.hpp"
-      cp ${variant_hpp} "$sourceRoot/include/variant.hpp"
-    '';
-
-    patches = [ ./fetchurls.patch ];
-
-    nativeBuildInputs = [ cmake doxygen ];
-  };
-
   tweeny = fetchFromGitHub {
     owner = "mobius3";
     repo = "tweeny";
@@ -50,19 +20,15 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.4.3";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv";
+    sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i";
   };
 
-  # This patch is likely not strictly speaking needed, but will help detect when
-  # a dependency is updated, so that the fetches up there can be updated too
-  patches = [ ./external-deps.patch ];
-
   # If, on Darwin, you encounter the error
   #   error: must specify at least one argument for '...' parameter of variadic
   #   macro [-Werror,-Wgnu-zero-variadic-macro-arguments]
@@ -79,25 +45,30 @@ stdenv.mkDerivation rec {
   #  export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments
   #'';
 
+  postPatch = ''
+    mkdir -p .deps/include/
+    ln -s ${tweeny}/include .deps/include/tweeny
+    ln -s ${spdlog} .deps/spdlog
+  '';
+
   cmakeFlags = [
-    "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a"
-    "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs"
-    "-DTWEENY_INCLUDE_DIR=${tweeny}/include"
+    "-DTWEENY_INCLUDE_DIR=.deps/include"
     "-DLMDBXX_INCLUDE_DIR=${lmdbxx}"
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny
+    mtxclient olm boost lmdb spdlog
+    qt5.qtbase qt5.qtmultimedia qt5.qttools
   ] ++ lib.optional stdenv.isDarwin qtmacextras;
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Desktop client for the Matrix protocol";
-    maintainers = with maintainers; [ ekleog ];
-    platforms = platforms.all;
+    maintainers = with maintainers; [ ekleog fpletz ];
+    platforms = platforms.unix;
     license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
deleted file mode 100644
index fa388edfb75a..000000000000
--- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake
-index 3b9817d..e69de29 100644
---- a/cmake/LMDBXX.cmake
-+++ b/cmake/LMDBXX.cmake
-@@ -1,23 +0,0 @@
--include(ExternalProject)
--
--#
--# Build lmdbxx.
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx)
--
--set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT})
--
--ExternalProject_Add(
--  lmdbxx
--
--  GIT_REPOSITORY https://github.com/bendiken/lmdbxx
--  GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02
--
--  BUILD_IN_SOURCE 1
--  SOURCE_DIR ${LMDBXX_ROOT}
--  CONFIGURE_COMMAND ""
--  BUILD_COMMAND ""
--  INSTALL_COMMAND ""
--)
-diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
-index cef00f6..e69de29 100644
---- a/cmake/MatrixStructs.cmake
-+++ b/cmake/MatrixStructs.cmake
-@@ -1,33 +0,0 @@
--include(ExternalProject)
--
--#
--# Build matrix-structs.
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
--set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include)
--set(MATRIX_STRUCTS_LIBRARY matrix_structs)
--
--link_directories(${MATRIX_STRUCTS_ROOT})
--
--set(WINDOWS_FLAGS "")
--
--if(MSVC)
--    set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
--endif()
--
--ExternalProject_Add(
--  MatrixStructs
--
--  GIT_REPOSITORY https://github.com/mujx/matrix-structs
--  GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e
--
--  BUILD_IN_SOURCE 1
--  SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
--  CONFIGURE_COMMAND ${CMAKE_COMMAND}
--    -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
--    ${WINDOWS_FLAGS}
--  BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
--  INSTALL_COMMAND ""
--)
-diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake
-index 537ac92..e69de29 100644
---- a/cmake/Tweeny.cmake
-+++ b/cmake/Tweeny.cmake
-@@ -1,23 +0,0 @@
--include(ExternalProject)
--
--#
--# Build tweeny
--#
--
--set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
--set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny)
--
--set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include)
--
--ExternalProject_Add(
--  Tweeny
--
--  GIT_REPOSITORY https://github.com/mobius3/tweeny
--  GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf
--
--  BUILD_IN_SOURCE 1
--  SOURCE_DIR ${TWEENY_ROOT}
--  CONFIGURE_COMMAND ""
--  BUILD_COMMAND ""
--  INSTALL_COMMAND ""
--)
diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch
deleted file mode 100644
index e2f72f600ed8..000000000000
--- a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 077ac37..c639d71 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,16 +18,6 @@ include(Doxygen)
- #
- include(CompilerFlags)
- 
--file(DOWNLOAD
--    "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp"
--    ${PROJECT_SOURCE_DIR}/include/json.hpp
--    EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733)
--
--file(DOWNLOAD
--    "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp"
--    ${PROJECT_SOURCE_DIR}/include/variant.hpp
--    EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a")
--
- include_directories(include)
- 
- set(SRC

From 4ab5625c9524c8e73f8f9d2c3c7ada276e60a63e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Sun, 9 Sep 2018 22:18:34 +0200
Subject: [PATCH 0655/3253] castxml: Fix build (#46442)

---
 pkgs/development/tools/castxml/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index 603b155ee4f9..aea94633bae3 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
     sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj";
   };
 
+  cmakeFlags = [
+    "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}"
+    "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}"
+  ];
+
   buildInputs = [
     cmake
     llvmPackages.clang-unwrapped
@@ -25,11 +30,6 @@ stdenv.mkDerivation rec {
 
   propagatedbuildInputs = [ llvmPackages.libclang ];
 
-  preConfigure = ''
-    cmakeFlagsArray+=(
-     ${if withMan then "-DSPHINX_MAN=ON" else ""}
-  )'';
-
   # 97% tests passed, 96 tests failed out of 2866
   # mostly because it checks command line and nix append -isystem and all
   doCheck=false;

From 5e0c468737111064e0449d4507c3754afb90face Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Sun, 9 Sep 2018 22:40:49 +0200
Subject: [PATCH 0656/3253] pythonPackages.fiona: Fix darwin build (#46435)

---
 pkgs/development/python-modules/fiona/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index e6d347b440d3..0e6ab256d0d8 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -12,6 +12,8 @@ buildPythonPackage rec {
     sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2";
   };
 
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   buildInputs = [
     gdal
   ];

From 6f891ff66ecc12db70de1ec1b6089eaa7336a34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Sun, 9 Sep 2018 22:42:17 +0200
Subject: [PATCH 0657/3253] pythonPackages.joblib: Disable flaky test (#46439)

The test `test_nested_parallelism_limit` fails on darwin.
---
 pkgs/development/python-modules/joblib/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix
index 7164fd1197b8..91406c5331fb 100644
--- a/pkgs/development/python-modules/joblib/default.nix
+++ b/pkgs/development/python-modules/joblib/default.nix
@@ -18,7 +18,9 @@ buildPythonPackage rec {
   checkInputs = [ sphinx numpydoc pytest ];
 
   checkPhase = ''
-    py.test -k 'not test_disk_used and not test_nested_parallel_warnings' joblib/test
+    py.test -k 'not test_disk_used and \
+                not test_nested_parallel_warnings and \
+                not test_nested_parallelism_limit' joblib/test
   '';
 
   meta = {

From b47c5870f47bc27a1afafe2561dfe5523b97853b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 9 Sep 2018 23:16:07 +0200
Subject: [PATCH 0658/3253] nano: 2.9.8 -> 3.0

Changelog: http://lists.gnu.org/archive/html/info-nano/2018-09/msg00000.html

Also updated the nix highlighting for nano
---
 pkgs/applications/editors/nano/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 64b8e48b2881..9c50d8e8b78e 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -14,17 +14,17 @@ let
   nixSyntaxHighlight = fetchFromGitHub {
     owner = "seitz";
     repo = "nanonix";
-    rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10";
-    sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h";
+    rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab";
+    sha256 = "0773s5iz8aw9npgyasb0r2ybp6gvy2s9sq51az8w7h52bzn5blnn";
   };
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.9.8";
+  version = "3.0";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2";
+    sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 2785958760386e8098fea9df4be8c3c54ff02032 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 03:39:14 -0400
Subject: [PATCH 0659/3253] bookworm: init at 1.0.0

---
 pkgs/applications/office/bookworm/default.nix | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/office/bookworm/default.nix

diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
new file mode 100644
index 000000000000..45c794c82ea5
--- /dev/null
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, libxml2, cmake, ninja, gtk3, granite, gnome3
+, gobjectIntrospection, sqlite, poppler, poppler_utils, html2text, unzip, unar, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "bookworm";
+  version = "1.0.0";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "babluboy";
+    repo = pname;
+    rev = version;
+    sha256 = "0nv1nxird0s0qfhh8fr82mkj4qimhklw1bwcjwmvjdsvsxxs9520";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gobjectIntrospection
+    libxml2
+    ninja
+    pkgconfig
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = with gnome3; [
+    glib
+    granite
+    gtk3
+    html2text
+    libgee
+    poppler
+    sqlite
+    webkitgtk
+  ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : "${stdenv.lib.makeBinPath [ unzip unar poppler_utils html2text ]}"
+    )
+  '';
+
+   meta = with stdenv.lib; {
+     description = "A simple, focused eBook reader";
+     longDescription = ''
+       Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc.
+     '';
+     homepage = https://babluboy.github.io/bookworm/;
+     license = licenses.gpl3Plus;
+     platforms = platforms.linux;
+   };
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06a7aaa9a68a..d77d022beb9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15701,6 +15701,8 @@ with pkgs;
 
   browsh = callPackage ../applications/networking/browsers/browsh { };
 
+  bookworm = callPackage ../applications/office/bookworm { };
+
   chromium = callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     pulseSupport = config.pulseaudio or true;

From 73ae8e53e24bf5bf31dbf09b003bf2d4207321a0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 9 Sep 2018 14:36:03 -0700
Subject: [PATCH 0660/3253] rPackages.RPostgres: fix configure paths and
 includes

closes #46208
---
 pkgs/development/r-modules/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 9bbab76d4a2f..a2c586c06a96 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -906,6 +906,14 @@ let
       TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
     });
 
+    RPostgres = old.RPostgres.overrideDerivation (attrs: {
+      preConfigure = ''
+        export INCLUDE_DIR=${pkgs.postgresql}/include
+        export LIB_DIR=${pkgs.postgresql.lib}/lib
+        patchShebangs configure
+        '';
+    });
+
     OpenMx = old.OpenMx.overrideDerivation (attrs: {
       preConfigure = ''
         patchShebangs configure

From fc5daa7b68409a1a9f0794b8672ab9d11c8751c7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 7 Sep 2018 17:25:04 -0500
Subject: [PATCH 0661/3253] mesa: 18.1.7 -> 18.1.8

https://www.mesa3d.org/relnotes/18.1.8.html
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index fb02366f1c1b..c8eee42a2527 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "18.1.7";
+  version = "18.1.8";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306";
+    sha256 = "bd1be67fe9c73b517765264ac28911c84144682d28dbff140e1c2deb2f44c21b";
   };
 
   prePatch = "patchShebangs .";

From 8ccdd29578790ad643d83fcc67508f27c8a82981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 9 Sep 2018 23:19:41 +0100
Subject: [PATCH 0662/3253] vim-plugins: add missing update.py

This file was accidentally not included in 953199fd829f0b9d3c3ed95cf2e1b138d2268a3b
---
 pkgs/misc/vim-plugins/update.py | 327 ++++++++++++++++++++++++++++++++
 1 file changed, 327 insertions(+)
 create mode 100755 pkgs/misc/vim-plugins/update.py

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
new file mode 100755
index 000000000000..fbdceea2a9af
--- /dev/null
+++ b/pkgs/misc/vim-plugins/update.py
@@ -0,0 +1,327 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p python3 nix -i python3
+
+# format:
+# $ nix run nixpkgs.python3Packages.black -c black update.py
+# type-check:
+# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py
+# linted:
+# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
+
+import functools
+import json
+import os
+import subprocess
+import sys
+import traceback
+import urllib.error
+import urllib.request
+import xml.etree.ElementTree as ET
+from datetime import datetime
+from multiprocessing.dummy import Pool
+from pathlib import Path
+from typing import Dict, List, Optional, Tuple, Union
+from urllib.parse import urljoin, urlparse
+
+ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry"
+ATOM_LINK = "{http://www.w3.org/2005/Atom}link"
+ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"
+
+ROOT = Path(__file__).parent
+
+
+class Repo:
+    def __init__(self, owner: str, name: str) -> None:
+        self.owner = owner
+        self.name = name
+
+    def url(self, path: str) -> str:
+        return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
+
+    def __repr__(self) -> str:
+        return f"Repo({self.owner}, {self.name})"
+
+    def has_submodules(self) -> bool:
+        try:
+            urllib.request.urlopen(self.url("blob/master/.gitmodules")).close()
+        except urllib.error.HTTPError as e:
+            if e.code == 404:
+                return False
+            else:
+                raise
+        return True
+
+    def latest_commit(self) -> Tuple[str, datetime]:
+        with urllib.request.urlopen(self.url("commits/master.atom")) as req:
+            xml = req.read()
+            root = ET.fromstring(xml)
+            latest_entry = root.find(ATOM_ENTRY)
+            assert latest_entry is not None, f"No commits found in repository {self}"
+            commit_link = latest_entry.find(ATOM_LINK)
+            assert commit_link is not None, f"No link tag found feed entry {xml}"
+            url = urlparse(commit_link.get("href"))
+            updated_tag = latest_entry.find(ATOM_UPDATED)
+            assert (
+                updated_tag is not None and updated_tag.text is not None
+            ), f"No updated tag found feed entry {xml}"
+            updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
+            return Path(url.path).name, updated
+
+    def prefetch_git(self, ref: str) -> str:
+        data = subprocess.check_output(
+            ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]
+        )
+        return json.loads(data)["sha256"]
+
+    def prefetch_github(self, ref: str) -> str:
+        data = subprocess.check_output(
+            ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")]
+        )
+        return data.strip().decode("utf-8")
+
+
+class Plugin:
+    def __init__(
+        self,
+        name: str,
+        commit: str,
+        has_submodules: bool,
+        sha256: str,
+        date: Optional[datetime] = None,
+    ) -> None:
+        self.name = name
+        self.commit = commit
+        self.has_submodules = has_submodules
+        self.sha256 = sha256
+        self.date = date
+
+    @property
+    def normalized_name(self) -> str:
+        return self.name.replace(".", "-")
+
+    @property
+    def version(self) -> str:
+        assert self.date is not None
+        return self.date.strftime("%Y-%m-%d")
+
+    def as_json(self) -> Dict[str, str]:
+        copy = self.__dict__.copy()
+        del copy["date"]
+        return copy
+
+
+GET_PLUGINS = """(with import <nixpkgs> {};
+let
+  hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
+  getChecksum = name: value:
+    if hasChecksum value then {
+      submodules = value.src.fetchSubmodules or false;
+      sha256 = value.src.outputHash;
+      rev = value.src.rev;
+    } else null;
+  checksums = lib.mapAttrs getChecksum vimPlugins;
+in lib.filterAttrs (n: v: v != null) checksums)"""
+
+
+def get_current_plugins() -> List[Plugin]:
+    out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS])
+    data = json.loads(out)
+    plugins = []
+    for name, attr in data.items():
+        p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"])
+        plugins.append(p)
+    return plugins
+
+
+def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin:
+    repo = Repo(user, repo_name)
+    commit, date = repo.latest_commit()
+    has_submodules = repo.has_submodules()
+    cached_plugin = cache[commit]
+    if cached_plugin is not None:
+        cached_plugin.date = date
+        return cached_plugin
+
+    print(f"prefetch {user}/{repo_name}")
+    if has_submodules:
+        sha256 = repo.prefetch_git(commit)
+    else:
+        sha256 = repo.prefetch_github(commit)
+
+    return Plugin(repo_name, commit, has_submodules, sha256, date=date)
+
+
+def print_download_error(plugin: str, ex: Exception):
+    print(f"{plugin}: {ex}", file=sys.stderr)
+    ex_traceback = ex.__traceback__
+    tb_lines = [
+        line.rstrip("\n")
+        for line in traceback.format_exception(ex.__class__, ex, ex_traceback)
+    ]
+    print("\n".join(tb_lines))
+
+
+def check_results(
+    results: List[Tuple[str, str, Union[Exception, Plugin]]]
+) -> List[Tuple[str, Plugin]]:
+    failures: List[Tuple[str, Exception]] = []
+    plugins = []
+    for (owner, name, result) in results:
+        if isinstance(result, Exception):
+            failures.append((name, result))
+        else:
+            plugins.append((owner, result))
+
+    print(f"{len(results) - len(failures)} plugins were checked", end="")
+    if len(failures) == 0:
+        print()
+    else:
+        print(f", {len(failures)} plugin(s) could not be downloaded:\n")
+
+        for (plugin, exception) in failures:
+            print_download_error(plugin, exception)
+    return plugins
+
+
+def load_plugin_spec() -> List[Tuple[str, str]]:
+    plugin_file = ROOT.joinpath("vim-plugin-names")
+    plugins = []
+    with open(plugin_file) as f:
+        for line in f:
+            spec = line.strip()
+            parts = spec.split("/")
+            if len(parts) != 2:
+                msg = f"Invalid repository {spec}, must be in the format owner/repo"
+                print(msg, file=sys.stderr)
+                sys.exit(1)
+            plugins.append((parts[0], parts[1]))
+    return plugins
+
+
+def get_cache_path() -> Optional[Path]:
+    xdg_cache = os.environ.get("XDG_CACHE_HOME", None)
+    if xdg_cache is None:
+        home = os.environ.get("HOME", None)
+        if home is None:
+            return None
+        xdg_cache = str(Path(home, ".cache"))
+
+    return Path(xdg_cache, "vim-plugin-cache.json")
+
+
+class Cache:
+    def __init__(self, initial_plugins: List[Plugin]) -> None:
+        self.cache_file = get_cache_path()
+
+        downloads = {}
+        for plugin in initial_plugins:
+            downloads[plugin.commit] = plugin
+        downloads.update(self.load())
+        self.downloads = downloads
+
+    def load(self) -> Dict[str, Plugin]:
+        if self.cache_file is None or not self.cache_file.exists():
+            return {}
+
+        downloads: Dict[str, Plugin] = {}
+        with open(self.cache_file) as f:
+            data = json.load(f)
+            for attr in data.values():
+                p = Plugin(
+                    attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"]
+                )
+                downloads[attr["commit"]] = p
+        return downloads
+
+    def store(self) -> None:
+        if self.cache_file is None:
+            return
+
+        os.makedirs(self.cache_file.parent, exist_ok=True)
+        with open(self.cache_file, "w+") as f:
+            data = {}
+            for name, attr in self.downloads.items():
+                data[name] = attr.as_json()
+            json.dump(data, f, indent=4, sort_keys=True)
+
+    def __getitem__(self, key: str) -> Optional[Plugin]:
+        return self.downloads.get(key, None)
+
+    def __setitem__(self, key: str, value: Plugin) -> None:
+        self.downloads[key] = value
+
+
+def prefetch(
+    args: Tuple[str, str], cache: Cache
+) -> Tuple[str, str, Union[Exception, Plugin]]:
+    assert len(args) == 2
+    owner, repo = args
+    try:
+        plugin = prefetch_plugin(owner, repo, cache)
+        cache[plugin.commit] = plugin
+        return (owner, repo, plugin)
+    except Exception as e:
+        return (owner, repo, e)
+
+
+header = (
+    "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!"
+)
+
+
+def generate_nix(plugins: List[Tuple[str, Plugin]]):
+    sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
+
+    with open(ROOT.joinpath("generated.nix"), "w+") as f:
+        f.write(header)
+        f.write(
+            """
+{ buildVimPluginFrom2Nix, fetchFromGitHub }:
+
+{"""
+        )
+        for owner, plugin in sorted_plugins:
+            if plugin.has_submodules:
+                submodule_attr = "\n      fetchSubmodules = true;"
+            else:
+                submodule_attr = ""
+
+            f.write(
+                f"""
+  {plugin.normalized_name} = buildVimPluginFrom2Nix {{
+    name = "{plugin.normalized_name}-{plugin.version}";
+    src = fetchFromGitHub {{
+      owner = "{owner}";
+      repo = "{plugin.name}";
+      rev = "{plugin.commit}";
+      sha256 = "{plugin.sha256}";{submodule_attr}
+    }};
+  }};
+"""
+            )
+        f.write("}")
+    print("updated generated.nix")
+
+
+def main() -> None:
+    plugin_names = load_plugin_spec()
+    current_plugins = get_current_plugins()
+    cache = Cache(current_plugins)
+
+    prefetch_with_cache = functools.partial(prefetch, cache=cache)
+
+    try:
+        # synchronous variant for debugging
+        # results = map(prefetch_with_cache, plugins)
+        pool = Pool(processes=30)
+        results = pool.map(prefetch_with_cache, plugin_names)
+    finally:
+        cache.store()
+
+    plugins = check_results(results)
+
+    generate_nix(plugins)
+
+
+if __name__ == "__main__":
+    main()

From 0f760506be44da7b34dcea36c9b14557a3331a9a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 03:45:57 -0400
Subject: [PATCH 0663/3253] quilter: init at 1.6.3

---
 pkgs/applications/editors/quilter/default.nix | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/editors/quilter/default.nix

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
new file mode 100644
index 000000000000..4d4cb0239bf3
--- /dev/null
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3
+, granite, gtk3, desktop-file-utils, gnome3, gtksourceview, webkitgtk, gtkspell3
+, discount, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "quilter";
+  version = "1.6.3";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "lainsce";
+    repo = pname;
+    rev = version;
+    sha256 = "1wa0i6dgg6fgb7q9z33v9qmn1a1dn3ik58v1f3a49dvd5xyf8q6q";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    discount
+    granite
+    gtk3
+    gtksourceview
+    gtkspell3
+    webkitgtk
+    gnome3.libgee
+  ];
+
+  patches = [
+    # Fix build with vala 0.42 - Drop these in next release
+    (fetchpatch {
+      url = "https://github.com/lainsce/quilter/commit/a58838213cd7f2d33048c7b34b96dc8875612624.patch";
+      sha256 = "1a4w1zql4zfk8scgrrssrm9n3sh5fsc1af5zvrqk8skbv7f2c80n";
+    })
+    (fetchpatch {
+      url = "https://github.com/lainsce/quilter/commit/d1800ce830343a1715bc83da3339816554896be5.patch";
+      sha256 = "0xl5iz8bgx5661vbbq8qa1wkfvw9d3da67x564ckjfi05zq1vddz";
+    })
+    # Correct libMarkdown dependency discovery: See https://github.com/lainsce/quilter/pull/170
+    (fetchpatch {
+      url = "https://github.com/lainsce/quilter/commit/8b1f3a60bd14cb86c1c62f9917c5f0c12bc4e459.patch";
+      sha256 = "1kjc6ygf9yjvqfa4xhzxiava3338swp9wbjhpfaa3pyz3ayh188n";
+    })
+    # post_install script cleanups: See https://github.com/lainsce/quilter/pull/171
+    (fetchpatch {
+      url = "https://github.com/lainsce/quilter/commit/55bf3b10cd94fcc40b0867bbdb1931a09f577922.patch";
+      sha256 = "1330amichaif2qfrh4qkxwqbcpr87ipik7vzjbjdm2bv3jz9353r";
+    })
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Focus on your writing - designed for elementary OS";
+    homepage    = https://github.com/lainsce/quilter;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d77d022beb9c..59b9d9addbc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18279,6 +18279,8 @@ with pkgs;
 
   quirc = callPackage ../tools/graphics/quirc {};
 
+  quilter = callPackage ../applications/editors/quilter { };
+
   quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {};
 
   falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { };

From 59821548f09724f115592803aef0a4d7331ea2df Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 04:07:55 -0400
Subject: [PATCH 0664/3253] notejot: init at 1.4.5

---
 pkgs/applications/misc/notejot/default.nix | 47 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/misc/notejot/default.nix

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
new file mode 100644
index 000000000000..59ba45e6f376
--- /dev/null
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+, gtk3, gnome3, gtksourceview, json-glib, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "notejot";
+  version = "1.4.5";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "lainsce";
+    repo = pname;
+    rev = version;
+    sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb";
+  };
+
+  nativeBuildInputs = [
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gnome3.libgee
+    granite
+    gtk3
+    gtksourceview
+    json-glib
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Stupidly-simple sticky notes applet";
+    homepage    = https://github.com/lainsce/notejot;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59b9d9addbc2..64e0f9750ef4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17873,6 +17873,8 @@ with pkgs;
     gmime = gmime3;
   };
 
+  notejot = callPackage ../applications/misc/notejot { };
+
   notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };
 
   muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { };

From 38659741779ce821dd765c7a0b9d7f8a0c016f71 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 04:28:54 -0400
Subject: [PATCH 0665/3253] taxi: init at 0.0.1

---
 .../networking/ftp/taxi/default.nix           | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/networking/ftp/taxi/default.nix

diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix
new file mode 100644
index 000000000000..503b685ce28c
--- /dev/null
+++ b/pkgs/applications/networking/ftp/taxi/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite
+, gtk3, gnome3, libsoup, libsecret, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "taxi";
+  version = "0.0.1";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Alecaddd";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "01c552w68576pnsyqbwy3hjhbww6vys3r3s0wxjdiscjqj1aawqg";
+  };
+
+  nativeBuildInputs = [
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gnome3.libgee
+    granite
+    gtk3
+    libsecret
+    libsoup
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The FTP Client that drives you anywhere";
+    homepage    = https://github.com/Alecaddd/taxi;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64e0f9750ef4..e55817f92b4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17793,6 +17793,8 @@ with pkgs;
 
   typora = callPackage ../applications/editors/typora { };
 
+  taxi = callPackage ../applications/networking/ftp/taxi { };
+
   librep = callPackage ../development/libraries/librep { };
 
   rep-gtk = callPackage ../development/libraries/rep-gtk { };

From 5a9d853d2291a259a0590ac66e372f52fdbc4620 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 05:53:48 -0400
Subject: [PATCH 0666/3253] meteo: init at 0.8.5

---
 .../networking/weather/meteo/default.nix      | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/networking/weather/meteo/default.nix

diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
new file mode 100644
index 000000000000..6d431a436ada
--- /dev/null
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, granite, gtk3
+, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk
+, libappindicator, desktop-file-utils, appstream, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "meteo";
+  version = "0.8.5";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitLab {
+    owner = "bitseater";
+    repo = pname;
+    rev = version;
+    sha256 = "1mc2djhkg0nzcjmy87l1wqwni48vgpqh8s1flr90pipk12a1mh7n";
+  };
+
+  nativeBuildInputs = [
+    appstream
+    desktop-file-utils
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    clutter
+    clutter-gtk
+    gnome3.geocode-glib
+    gtk3
+    json-glib
+    libappindicator
+    libchamplain
+    libsoup
+    webkitgtk
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Know the forecast of the next hours & days";
+    homepage    = https://gitlab.com/bitseater/meteo;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e55817f92b4f..01438136deb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17451,6 +17451,8 @@ with pkgs;
 
   mediathekview = callPackage ../applications/video/mediathekview { };
 
+  meteo = callPackage ../applications/networking/weather/meteo { };
+
   meld = callPackage ../applications/version-management/meld { };
 
   meme = callPackage ../applications/graphics/meme { };

From 93d68d85f17c1b9b4414d7796017e3b47d401dcf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 06:13:13 -0400
Subject: [PATCH 0667/3253] hashit: init at 0.2.0

---
 pkgs/tools/misc/hashit/default.nix | 39 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/hashit/default.nix

diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix
new file mode 100644
index 000000000000..69d73aafff92
--- /dev/null
+++ b/pkgs/tools/misc/hashit/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, cmake, vala, python3, gnome3, gtk3, granite, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "hashit";
+  version = "0.2.0";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "artemanufrij";
+    repo = pname;
+    rev = version;
+    sha256 = "1d2g7cm7hhs354waidak9xkhhcvqlwnsl9d0bar9p82gfnpjdg7v";
+  };
+
+  nativeBuildInputs = [
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    granite
+    gtk3
+    gnome3.libgee
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A simple app for checking usual checksums";
+    homepage    = https://github.com/artemanufrij/hashit;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01438136deb2..8bde5b6ce938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16853,6 +16853,8 @@ with pkgs;
     inherit (gnome2) gnome_python;
   };
 
+  hashit = callPackage ../tools/misc/hashit { };
+
   hello = callPackage ../applications/misc/hello { };
   hello-unfree = callPackage ../applications/misc/hello-unfree { };
 

From 805dd4534d5f73fb5dfeffeaab8f370083c1ab06 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 07:04:07 -0400
Subject: [PATCH 0668/3253] vocal: init at 2.2.0

---
 pkgs/applications/audio/vocal/default.nix | 52 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/audio/vocal/default.nix

diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
new file mode 100644
index 000000000000..97f59ee5f94f
--- /dev/null
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, vala, gtk3, libxml2, granite, webkitgtk, clutter-gtk
+, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "vocal";
+  version = "2.2.0";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "needle-and-thread";
+    repo = pname;
+    rev = version;
+    sha256 = "09cm4azyaa9fmfymygf25gf0klpm5p04k6bc1i90jhw0f1im8sgl";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gobjectIntrospection
+    libxml2
+    ninja
+    pkgconfig
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = with gst_all_1; [
+    clutter-gst
+    clutter-gtk
+    gnome3.libgee
+    granite
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+    json-glib
+    libnotify
+    libunity
+    sqlite
+    webkitgtk
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The podcast client for the modern free desktop";
+    longDescription = ''
+      Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals.
+    '';
+    homepage = https://github.com/needle-and-thread/vocal;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bde5b6ce938..f1fc43725548 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19146,6 +19146,8 @@ with pkgs;
 
   vnstat = callPackage ../applications/networking/vnstat { };
 
+  vocal = callPackage ../applications/audio/vocal { };
+
   vogl = libsForQt5.callPackage ../development/tools/vogl { };
 
   volnoti = callPackage ../applications/misc/volnoti { };

From 7d7086cc1d97f83f3c8354c32100b577c00448d1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 8 Sep 2018 08:45:29 -0400
Subject: [PATCH 0669/3253] aesop: init at 1.0.5

---
 pkgs/applications/office/aesop/default.nix | 49 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/office/aesop/default.nix

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
new file mode 100644
index 000000000000..cf816a281221
--- /dev/null
+++ b/pkgs/applications/office/aesop/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite, gtk3, gnome3
+, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "aesop";
+  version = "1.0.5";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "lainsce";
+    repo = pname;
+    rev = version;
+    sha256 = "17hjg4qcy8q9xl170yapbhn9vdsn3jf537jsggq51pp0fnhvsnqs";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    gobjectIntrospection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gnome3.libgee
+    granite
+    gtk3
+    json-glib
+    libsoup
+    poppler
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The simplest PDF viewer around";
+    homepage    = https://github.com/lainsce/aesop;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1fc43725548..2fbca1aedfec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15498,6 +15498,8 @@ with pkgs;
 
   autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
 
+  aesop = callPackage ../applications/office/aesop { };
+
   avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
 
   avrdudess = callPackage ../applications/misc/avrdudess { };

From 8d2cd63c1be113622ab80b2fa5f598c3996ed995 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 8 Aug 2018 08:19:28 -0500
Subject: [PATCH 0670/3253] spidermonkey_52: don't use jemalloc w/musl

---
 pkgs/development/interpreters/spidermonkey/52.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index ecbb1abb40ca..7c6844fdec09 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
     "--with-intl-api"
     "--enable-readline"
     "--enable-shared-js"
-  ];
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc";
 
   enableParallelBuilding = true;
 

From 9bdec58bc0c67411c2ec66a0b937c240be49d497 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 9 Sep 2018 18:26:41 -0500
Subject: [PATCH 0671/3253] wal-g: 0.1.10 -> 0.1.12

---
 pkgs/tools/backup/wal-g/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index 9c2fb0c0b002..0cd18dae1c27 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -2,18 +2,18 @@
 
 buildGoPackage rec {
   name = "wal-g-${version}";
-  version = "0.1.10";
+  version = "0.1.12";
 
   src = fetchFromGitHub {
     owner  = "wal-g";
     repo   = "wal-g";
     rev    = "v${version}";
-    sha256 = "0klqnrrjzzxcj3clg7vapmbga1vqsfh8mkci5r2ir1bjp0z1xfnp";
+    sha256 = "06k71xz96jpg6966xj48a8j07v0vk37b5v2k1bnqrbin4sma3s0c";
   };
 
   goPackagePath = "github.com/wal-g/wal-g";
   meta = {
-    homepage = https://github.com/wal-g/wal-g;
+    inherit (src.meta) homepage;
     license = stdenv.lib.licenses.asl20;
     description = "An archival restoration tool for Postgres";
     maintainers = [ stdenv.lib.maintainers.ocharles ];

From 13728ed2b59d929925411c4a3923bf01dd89f5d2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Sep 2018 19:29:23 -0400
Subject: [PATCH 0672/3253] linux: 4.4.154 -> 4.4.155

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0872856c1190..66df462f5960 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.154";
+  version = "4.4.155";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1j00y6hgj4c82y3j0gaqj68kf46fwxz1y5wx6ry5sgxnr3xp12z0";
+    sha256 = "1nbd88x3m4w2ffwgjnf8ry5p2z7al54q1lvl2kv3fz8hmr5qq28q";
   };
 } // (args.argsOverride or {}))

From d40f4159ed9d99ce46228af7b450e3ac956675b4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Sep 2018 19:29:35 -0400
Subject: [PATCH 0673/3253] linux: 4.9.125 -> 4.9.126

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 068cf25f0053..1bd29569e011 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.125";
+  version = "4.9.126";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1jqi25ld83l57lzcbhrzdnmsj4isz686ivdj0wfsrgxyc7pxwr57";
+    sha256 = "1davk0c760if20h3f9r18lcvb7lqzlx0chxlph7ld5nlaz3ncskd";
   };
 } // (args.argsOverride or {}))

From 276b2ab8925a5dcf710c0e25b21b95f74f6089d2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Sep 2018 19:29:46 -0400
Subject: [PATCH 0674/3253] linux: 4.14.68 -> 4.14.69

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index eee2b132ae29..58cc1ab25da4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.68";
+  version = "4.14.69";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1446sbyysrv6hws35nnippa1mz4g31w7sc433svg4fq3jwavy7br";
+    sha256 = "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1";
   };
 } // (args.argsOverride or {}))

From ea765b2e2b7bf4a5301650917ae96c516c6e198c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 9 Sep 2018 19:30:23 -0400
Subject: [PATCH 0675/3253] linux: 4.18.6 -> 4.18.7

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 22bbd73f9859..f6f92d65938b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.6";
+  version = "4.18.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1518q822fs28sfdqwsibj3bpibzj5r2dqfr0skv7l8cid3yrgnq5";
+    sha256 = "0cgpb8zx7ckd9lmmaas6r1vszbz9lhrn4w1njw3yaw9a4rg44fzh";
   };
 } // (args.argsOverride or {}))

From cf3795a25ecbd00e6d5dc7125806fe2785b67afd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 9 Sep 2018 20:34:47 -0400
Subject: [PATCH 0676/3253] dbeaver: 5.1.6 -> 5.2.0

---
 pkgs/applications/misc/dbeaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 35698a323319..77cad142d41d 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.1.6";
+  version = "5.2.0";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn";
+    sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf";
   };
 
   installPhase = ''

From 502b37ae6391e52b3a319c4ebf49e3358c50a440 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 10 Sep 2018 02:10:47 +0000
Subject: [PATCH 0677/3253] nixos/initrd-network: multiple fixes

 * acquire DHCP on the interfaces with networking.interface.$name.useDHCP == true or on all interfaces if networking.useDHCP == true (was only only "eth0")
 * respect "mtu" if it was in DHCP answer (it happens in the wild)
 * acquire and set up staticroutes (unlike others clients, udhcpc does not do the query by default); this supersedes https://github.com/NixOS/nixpkgs/pull/41829
---
 nixos/modules/system/boot/initrd-network.nix | 30 ++++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 33862b0965cc..1019b8db6dab 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -6,11 +6,23 @@ let
 
   cfg = config.boot.initrd.network;
 
+  dhcpinterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
+
   udhcpcScript = pkgs.writeScript "udhcp-script"
     ''
       #! /bin/sh
       if [ "$1" = bound ]; then
-        ip address add "$ip/$mask" dev "$interface"
+        if [ -n "$mtu" ]; then
+          ip address add "$ip/$mask" dev "$interface" mtu "$mtu"
+        else
+          ip address add "$ip/$mask" dev "$interface"
+        fi
+        if [ -n "$staticroutes" ]; then
+          echo "$staticroutes" \
+            | sed -r "s@(\S+) (\S+)@ ip route add \"\1\" via \"\2\" dev \"$interface\" ; @g" \
+            | sed -r "s@ via \"0\.0\.0\.0\"@@g" \
+            | /bin/sh
+        fi
         if [ -n "$router" ]; then
           ip route add default via "$router" dev "$interface"
         fi
@@ -92,18 +104,24 @@ in
       ''
 
       # Otherwise, use DHCP.
-      + optionalString config.networking.useDHCP ''
+      + optionalString (config.networking.useDHCP || dhcpinterfaces != []) ''
         if [ -z "$hasNetwork" ]; then
 
           # Bring up all interfaces.
-          for iface in $(cd /sys/class/net && ls); do
+          for iface in $(ls /sys/class/net/); do
             echo "bringing up network interface $iface..."
             ip link set "$iface" up
           done
 
-          # Acquire a DHCP lease.
-          echo "acquiring IP address via DHCP..."
-          udhcpc --quit --now --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
+          # Acquire DHCP leases.
+          for iface in ${ if config.networking.useDHCP then
+                            "$(ls /sys/class/net/ | grep -v ^lo$)"
+                          else
+                            lib.concatMapStringsSep " " lib.escapeShellArg dhcpinterfaces
+                        }; do
+            echo "acquiring IP address via DHCP on $iface..."
+            udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
+          done
         fi
       ''
 

From 16edfb22b814bf689a112de978bae97c334dd5e0 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 10 Sep 2018 02:39:15 +0000
Subject: [PATCH 0678/3253] oops

---
 nixos/modules/system/boot/initrd-network.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 1019b8db6dab..720a9ffd53d6 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -12,10 +12,9 @@ let
     ''
       #! /bin/sh
       if [ "$1" = bound ]; then
+        ip address add "$ip/$mask" dev "$interface"
         if [ -n "$mtu" ]; then
-          ip address add "$ip/$mask" dev "$interface" mtu "$mtu"
-        else
-          ip address add "$ip/$mask" dev "$interface"
+          ip link set mtu "$mtu" dev "$interface"
         fi
         if [ -n "$staticroutes" ]; then
           echo "$staticroutes" \

From 78bc2f9800db2036471963702e038b4f9371593d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 10 Sep 2018 02:39:28 +0000
Subject: [PATCH 0679/3253] aseprite-unfree: 1.2.4 -> 1.2.9

---
 .../applications/editors/aseprite/default.nix | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 429b2430fce2..7af3742349a6 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
+{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig
+, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
 , libX11, libXext, libXcursor, libXxf86vm
 , unfree ? false
 , cmark
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   name = "aseprite-${version}";
-  version = if unfree then "1.2.4" else "1.1.7";
+  version = if unfree then "1.2.9" else "1.1.7";
 
   src = fetchFromGitHub {
     owner = "aseprite";
@@ -19,16 +19,27 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     fetchSubmodules = true;
     sha256 = if unfree
-      then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3"
+      then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd"
       else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib
+    curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib
     libX11 libXext libXcursor libXxf86vm
-  ] ++ lib.optionals unfree [ cmark ];
+  ] ++ lib.optionals unfree [ cmark harfbuzz ];
+
+  patches = lib.optionals unfree [
+    (fetchpatch {
+      url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch";
+      sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9";
+    })
+    (fetchpatch {
+      url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch";
+      sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91";
+    })
+  ];
 
   postPatch = ''
     sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
@@ -49,6 +60,7 @@ stdenv.mkDerivation rec {
     "-DWITH_WEBP_SUPPORT=ON"
   ] ++ lib.optionals unfree [
     "-DUSE_SHARED_CMARK=ON"
+    "-DUSE_SHARED_HARFBUZZ=ON"
     # Aseprite needs internal freetype headers.
     "-DUSE_SHARED_FREETYPE=OFF"
     # Disable libarchive programs.

From bbf37b8c4528ac080b691226ada83305e2159917 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 3 Sep 2018 22:46:25 +0900
Subject: [PATCH 0680/3253] emacs: allow X and cli-only builds on Darwin

---
 pkgs/applications/editors/emacs/default.nix | 32 ++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 0a304fabe600..c1bfdf8157da 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,8 +4,9 @@
 , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
 , systemd ? null
 , withX ? !stdenv.isDarwin
-, withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
+, withNS ? stdenv.isDarwin
+, withGTK2 ? false, gtk2-x11 ? null
+, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
 , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
@@ -13,10 +14,12 @@
 
 assert (libXft != null) -> libpng != null;      # probably a bug
 assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
-assert withGTK2 -> withX || stdenv.isDarwin;
-assert withGTK3 -> withX || stdenv.isDarwin;
-assert withGTK2 -> !withGTK3 && gtk2 != null;
-assert withGTK3 -> !withGTK2 && gtk3 != null;
+assert withNS -> !withX;
+assert withNS -> stdenv.isDarwin;
+assert (withGTK2 && !withNS) -> withX;
+assert (withGTK3 && !withNS) -> withX;
+assert withGTK2 -> !withGTK3 && gtk2-x11 != null;
+assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
 assert withXwidgets -> withGTK3 && webkitgtk != null;
 
 let
@@ -56,19 +59,22 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
     ++ lib.optionals withX
       [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
-        imagemagick gconf m17n_lib libotf ]
-    ++ lib.optional (withX && withGTK2) gtk2
-    ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
+        imagemagick gconf ]
+    ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
+    ++ lib.optional (withX && withGTK2) gtk2-x11
+    ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
     ++ lib.optionals (withX && withXwidgets) [ webkitgtk ];
 
-  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
+  propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ];
 
   hardeningDisable = [ "format" ];
 
   configureFlags = [ "--with-modules" ] ++
-   (if stdenv.isDarwin
-      then [ "--with-ns" "--disable-ns-self-contained" ]
+    (lib.optional stdenv.isDarwin
+      (lib.withFeature withNS "ns")) ++
+    (if withNS
+      then [ "--disable-ns-self-contained" ]
     else if withX
       then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
       else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
@@ -103,7 +109,7 @@ stdenv.mkDerivation rec {
       cp $srcdir/TAGS $dstdir
       echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
     done
-  '' + lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString withNS ''
     mkdir -p $out/Applications
     mv nextstep/Emacs.app $out/Applications
   '';

From f7888652b89691930eccd1a5937934d5fd5e7703 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 10:20:01 -0700
Subject: [PATCH 0681/3253] stunnel: 5.46 -> 5.49

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
stunnel
---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index bbef1f285c33..d2b9a54183d0 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.46";
+  version = "5.49";
 
   src = fetchurl {
     url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn";
+    sha256 = "0plmdnwmhjjganhprsw9a8w3h5w43hyirpizy8cmq5w278hl2rix";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
   };

From 6682d041426f814e9cf57895f71a16caae1f62f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 23:42:12 -0700
Subject: [PATCH 0682/3253] duo-unix: 1.9.20 -> 1.10.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duo-unix/versions
---
 pkgs/tools/security/duo-unix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 729f85a73fce..3ef07c44f501 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "duo-unix-${version}";
-  version = "1.9.20";
+  version = "1.10.4";
 
   src = fetchurl {
     url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "0zxrpdbgi8k8jbqg5yxjv3b0lz9kpk89pglwb3lqlvzscbxdv5qj";
+    sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp";
   };
 
   buildInputs = [ pam openssl zlib ];

From aba0fe5d62d35638ee1fd9be2d6cb0c84c6ac403 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 17:00:47 -0700
Subject: [PATCH 0683/3253] metabase: 0.30.0 -> 0.30.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
metabase
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 5387a93b5e62..ac6dd44a8441 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.30.0";
+  version = "0.30.1";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1wnzd2g1qxqpqjsqq1kfr0zrvjvqg54dvznbhf3637b0iqq3ahkh";
+    sha256 = "13035yhbhsr4xg48hanbf8qchwyk6j59c90qkbjr914xcyvj6scc";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1700698691b24b845bfd22414bd068b307fbdad5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 17:55:37 -0700
Subject: [PATCH 0684/3253] lttng-ust: 2.10.1 -> 2.10.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
lttng-ust
---
 pkgs/development/tools/misc/lttng-ust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index b708ce490d29..039e5b1ec542 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-ust-${version}";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07";
+    sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4";
   };
 
   buildInputs = [ python ];

From f188e90ba1aeb5cef6011324be41af19558cc6e5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 14:04:32 -0700
Subject: [PATCH 0685/3253] qmmp: 1.2.2 -> 1.2.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
qmmp
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index dc12baefed14..f58e75c9e263 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.2.2";
+  name = "qmmp-1.2.3";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79";
+    sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j";
   };
 
   buildInputs =

From b7c0e4079646ad816366754283f06d872de2b219 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Mon, 10 Sep 2018 09:13:30 +0300
Subject: [PATCH 0686/3253] rclone: 1.43 -> 1.43.1 (#46448)

---
 pkgs/applications/networking/sync/rclone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 54d612387ac4..13e69427aa48 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.43";
+  version = "1.43.1";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx";
+    sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx";
   };
 
   outputs = [ "bin" "out" "man" ];

From 8fc2799e02975c7f44c761db6959af9804478649 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 10 Sep 2018 01:14:37 -0500
Subject: [PATCH 0687/3253] qemu: port musl patch to new version (#46449)

---
 .../virtualization/qemu/default.nix           |  5 +---
 .../virtualization/qemu/sigrtminmax.patch     | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/virtualization/qemu/sigrtminmax.patch

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index bbb2a099666b..596bc9dd9e09 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -84,10 +84,7 @@ stdenv.mkDerivation rec {
       url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch;
       sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k";
     })
-    (fetchpatch {
-      url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch;
-      sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6";
-    })
+    ./sigrtminmax.patch
     (fetchpatch {
       url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch;
       sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch
new file mode 100644
index 000000000000..41050447ac64
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/sigrtminmax.patch
@@ -0,0 +1,30 @@
+From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 17 Aug 2018 00:22:35 -0500
+Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0
+
+---
+ linux-user/signal.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/linux-user/signal.c b/linux-user/signal.c
+index 602b631b92..87f9240134 100644
+--- a/linux-user/signal.c
++++ b/linux-user/signal.c
+@@ -26,6 +26,13 @@
+ #include "trace.h"
+ #include "signal-common.h"
+ 
++#ifndef __SIGRTMIN
++#define __SIGRTMIN 32
++#endif
++#ifndef __SIGRTMAX
++#define __SIGRTMAX (NSIG-1)
++#endif
++
+ struct target_sigaltstack target_sigaltstack_used = {
+     .ss_sp = 0,
+     .ss_size = 0,
+-- 
+2.18.0
+

From 30500d23bcd1c0d0b36bf8a56a5bc174d947b659 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 10 Sep 2018 01:43:55 -0500
Subject: [PATCH 0688/3253] busybox: 1.29.2 -> 1.29.3 (#46458)

---
 pkgs/os-specific/linux/busybox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 69fe94a1fe47..71ad6203e325 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -32,14 +32,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.29.2";
+  name = "busybox-1.29.3";
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
     url = "https://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7";
+    sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];

From ba5176551e2facd5c9e4d43c0b1393f5608a058a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Sep 2018 03:47:17 -0300
Subject: [PATCH 0689/3253] dtkwm: init at 2.0.9 (#46461)

---
 pkgs/desktops/deepin/default.nix       |  1 +
 pkgs/desktops/deepin/dtkwm/default.nix | 39 ++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dtkwm/default.nix

diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 49da151eefee..99ae05642d97 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -17,6 +17,7 @@ let
       wnck = pkgs.libwnck3;
     };
     dtkcore = callPackage ./dtkcore { };
+    dtkwm = callPackage ./dtkwm { };
     dtkwidget = callPackage ./dtkwidget { };
     go-dbus-factory = callPackage ./go-dbus-factory { };
     go-dbus-generator = callPackage ./go-dbus-generator { };
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
new file mode 100644
index 000000000000..46ed7bcc3bef
--- /dev/null
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dtkwm";
+  version = "2.0.9";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    dtkcore
+    qtx11extras
+  ];
+
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags \
+      QT_HOST_DATA=$out \
+      INCLUDE_INSTALL_DIR=$out/include \
+      LIB_INSTALL_DIR=$out/lib"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Deepin graphical user interface library";
+    homepage = https://github.com/linuxdeepin/dtkwm;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}

From e5b904818b656a596a541ee9f6ac694c8bda2476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Sep 2018 03:48:02 -0300
Subject: [PATCH 0690/3253] dde-calendar: init at 1.2.5 (#46460)

---
 pkgs/desktops/deepin/dde-calendar/default.nix | 44 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dde-calendar/default.nix

diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
new file mode 100644
index 000000000000..ad6b0f1912a6
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
+  deepin-gettext-tools, dtkcore, dtkwidget
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "dde-calendar";
+  version = "1.2.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1a5zxpz7zncw6mrzv8zmn0j1vk0c8fq0m1xhmnwllffzybrhn4y7";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    qttools
+    deepin-gettext-tools
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+  ];
+
+  postPatch = ''
+    patchShebangs .
+    sed -i translate_desktop.sh \
+      -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
+    sed -i com.deepin.Calendar.service \
+      -e "s,/usr,$out,"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Calendar for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/dde-calendar;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 99ae05642d97..d2e5536a74aa 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -4,6 +4,7 @@ let
   packages = self: with self; {
 
     dbus-factory = callPackage ./dbus-factory { };
+    dde-calendar = callPackage ./dde-calendar { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };

From 6852e6ed253c16e4a088297357ada8681f52e72a Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Mon, 10 Sep 2018 17:29:30 +0800
Subject: [PATCH 0691/3253] init et-book package

---
 maintainers/maintainer-list.nix     |  5 +++++
 pkgs/data/fonts/et-book/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/data/fonts/et-book/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecec7bbaf7e3..3ed1957650d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1847,6 +1847,11 @@
     github = "jerith666";
     name = "Matt McHenry";
   };
+  jethro = {
+    email = "jethrokuan95@gmail.com";
+    github = "jethrokuan";
+    name = "Jethro Kuan";
+  };
   jfb = {
     email = "james@yamtime.com";
     github = "tftio";
diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix
new file mode 100644
index 000000000000..79f2a2e66ca7
--- /dev/null
+++ b/pkgs/data/fonts/et-book/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+fetchFromGitHub rec {
+  rev = "1.0";
+  name = "et-book-${rev}";
+  owner = "jethrokuan";
+  repo = "et-book";
+  sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2";
+
+  postFetch = ''
+    tar -xzf $downloadedFile
+    mkdir -p $out/share/fonts/truetype
+    cp -t $out/share/fonts/truetype ${name}/*.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Font for ET Book";
+    license = licenses.free;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jethro ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd7dca53c84c..02a53902f815 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -151,6 +151,8 @@ with pkgs;
 
   ebook2cw = callPackage ../applications/misc/ebook2cw { };
 
+  etBook = callPackage ../data/fonts/et-book { };
+
   fetchbower = callPackage ../build-support/fetchbower {
     inherit (nodePackages) bower2nix;
   };

From ee897b64ffc87c75b32d01882be82d442615eedd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Sep 2018 16:08:52 +0200
Subject: [PATCH 0692/3253] pythonPackages.mahotas: fix build, move expression

See https://hydra.nixos.org/build/80828287

Moves `mahotas` out of `python-packages.nix` into its own file and fixes
broken test cases by skipping them using nosetest's `@nottest`
annotation.

These tests broke from time to time in a sandbox and are therefore
considered impure.

Addresses #45960
---
 .../python-modules/mahotas/default.nix        | 33 ++++++++++++++++++
 .../mahotas/disable-impure-tests.patch        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +---------------
 3 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/mahotas/default.nix
 create mode 100644 pkgs/development/python-modules/mahotas/disable-impure-tests.patch

diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix
new file mode 100644
index 000000000000..a7e92e0b5b8e
--- /dev/null
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }:
+
+buildPythonPackage rec {
+  pname = "mahotas";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "luispedro";
+    repo = "mahotas";
+    rev = "v${version}";
+    sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r";
+  };
+
+  # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed
+  patches = [ ./disable-impure-tests.patch ];
+
+  propagatedBuildInputs = [ numpy imread pillow scipy ];
+  checkInputs = [ nose ];
+
+  checkPhase= ''
+    python setup.py test
+  '';
+
+  disabled = stdenv.isi686; # Failing tests
+
+  meta = with stdenv.lib; {
+    description = "Computer vision package based on numpy";
+    homepage = http://mahotas.readthedocs.io/;
+    maintainers = with maintainers; [ luispedro ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
new file mode 100644
index 000000000000..a61503f9522e
--- /dev/null
+++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
@@ -0,0 +1,34 @@
+diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py
+index 8a8183b..0d34c9f 100644
+--- a/mahotas/tests/test_colors.py
++++ b/mahotas/tests/test_colors.py
+@@ -2,7 +2,9 @@ import mahotas
+ import numpy as np
+ from mahotas.tests.utils import luispedro_jpg
+ from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia
++from nose.tools import nottest
+ 
++@nottest
+ def test_colors():
+     f = luispedro_jpg()
+     lab = rgb2lab(f)
+diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py
+index 462f467..2381793 100644
+--- a/mahotas/tests/test_features_shape.py
++++ b/mahotas/tests/test_features_shape.py
+@@ -2,6 +2,7 @@ import mahotas.features.shape
+ import numpy as np
+ import mahotas as mh
+ from mahotas.features.shape import roundness, eccentricity
++from nose.tools import nottest
+ 
+ def test_eccentricity():
+     D = mh.disk(32, 2)
+@@ -29,6 +30,7 @@ def test_zeros():
+     I[8:4:12] = 1
+     assert eccentricity(I) == 0
+ 
++@nottest
+ def test_ellipse_axes():
+     Y,X = np.mgrid[:1024,:1024]
+     Y = Y/1024.
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2eae6212cd4d..7437443ad9c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1712,35 +1712,7 @@ in {
 
   idna = callPackage ../development/python-modules/idna { };
 
-  mahotas = buildPythonPackage rec {
-    name = "python-mahotas-${version}";
-    version = "1.4.2";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz";
-      sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m";
-    };
-
-    buildInputs = with self; [
-      nose
-      pillow
-      scipy
-    ];
-    propagatedBuildInputs = with self; [
-      numpy
-      imread
-    ];
-
-    disabled = stdenv.isi686; # Failing tests
-
-    meta = with stdenv.lib; {
-      description = "Computer vision package based on numpy";
-      homepage = http://mahotas.readthedocs.io/;
-      maintainers = with maintainers; [ luispedro ];
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
+  mahotas = callPackage ../development/python-modules/mahotas { };
 
   MDP = callPackage ../development/python-modules/mdp {};
 

From a2bb5d69173623a4ab7d84a4e1af2aa310be09cc Mon Sep 17 00:00:00 2001
From: Toon Nolten <toonn@toonn.io>
Date: Mon, 10 Sep 2018 11:48:49 +0200
Subject: [PATCH 0693/3253] ranger: 1.9.1 -> 1.9.2 (#46454)

* ranger: 1.9.1 -> 1.9.2

* Change maintainer attribute name to match usage
---
 maintainers/maintainer-list.nix           | 5 +++++
 pkgs/applications/misc/ranger/default.nix | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecec7bbaf7e3..5397845d728a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4163,6 +4163,11 @@
     github = "tomsmeets";
     name = "Tom Smeets";
   };
+  toonn = {
+    email = "nnoot@toonn.io";
+    github = "toonn";
+    name = "Toon Nolten";
+  };
   travisbhartwell = {
     email = "nafai@travishartwell.net";
     github = "travisbhartwell";
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 33b8c33033ea..6d883d89de31 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null;
 
 python3Packages.buildPythonApplication rec {
   name = "ranger-${version}";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "ranger";
     repo = "ranger";
     rev = "v${version}";
-    sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj";
+    sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax";
   };
 
   checkInputs = with python3Packages; [ pytest ];
@@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec {
     homepage = http://ranger.github.io/;
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = [ maintainers.magnetophon ];
+    maintainers = [ maintainers.toonn maintainers.magnetophon ];
   };
 }

From 00064c21cc328fb96b631917220acbc26f232f96 Mon Sep 17 00:00:00 2001
From: Amine Chikhaoui <amine.chikhaoui91@gmail.com>
Date: Mon, 10 Sep 2018 11:53:45 +0200
Subject: [PATCH 0694/3253] ZHF 18.09: fix crypsetup build with python enabled.
 (#46468)

Fixes https://hydra.nixos.org/build/81028247.
---
 pkgs/os-specific/linux/cryptsetup/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
index 2b5c3817ddf7..4eec4754ca9a 100644
--- a/pkgs/os-specific/linux/cryptsetup/default.nix
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs tests
+    ${stdenv.lib.optionalString enablePython ''
+      patchShebangs ./python/pycryptsetup-test.py
+    ''}
 
     # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs)
     # and on several filesystem types (btrfs, zfs) without sandboxing.

From 6d6cbd316d5f5c12c002c86b919d1f923b0d87fe Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 10 Sep 2018 11:59:51 +0200
Subject: [PATCH 0695/3253] pythonmagick: fix build (#46469)

The original build broke with the following linker issue:

```
  CXXLD    _PythonMagick.la
/nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/ld: cannot find -l-L/nix/store/4gh6ynzsd5ndx37hmkl62xa8z30k43y1-imagemagick-6.9.9-34/lib
collect2: error: ld returned 1 exit status
```

This happens since `BOOST_PYTHON_LIB` wasn't set properly, however
`_PythonMagick.la` was linked with `-l$(BOOST_PYTHON_LIB)
$(MAGICK_LIBS)`. With an empty `BOOST_PYTHON_LIB` the linker got
confused.

To work around this, the `boost` library directory needs to be specified
explicitly. To ensure that the changes take effect, the original
`configure` script shipped with `$src` needs to be removed and recreated
using the `autoreconfHook`.

Additionally the `imagemagick` license (https://spdx.org/licenses/ImageMagick.html)
needs to be added to `lib/licenses.nix` to document the proper license
of `pythonmagick` in the meta section.
---
 lib/licenses.nix                                 |  5 +++++
 .../graphics/PythonMagick/default.nix            | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 6f0e4217c196..c4db280645a4 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -355,6 +355,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Independent JPEG Group License";
   };
 
+  imagemagick = spdx {
+    fullName = "ImageMagick License";
+    spdxId = "imagemagick";
+  };
+
   inria-compcert = {
     fullName  = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
     url       = "http://compcert.inria.fr/doc/LICENSE";
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index f0b4a991f74a..938df76e2572 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -1,6 +1,6 @@
 # This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`.
 
-{stdenv, fetchurl, python, boost, pkgconfig, imagemagick}:
+{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "pythonmagick-${version}";
@@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [python boost imagemagick];
+  postPatch = ''
+    rm configure
+  '';
 
-  meta = {
+  configureFlags = [ "--with-boost=${python.pkgs.boost}" ];
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ python python.pkgs.boost imagemagick ];
+
+  meta = with stdenv.lib; {
     homepage = http://www.imagemagick.org/script/api.php;
+    license = licenses.imagemagick;
+    description = "PythonMagick provides object oriented bindings for the ImageMagick Library.";
   };
 }

From 080b2fdd8c756f9784ab0940f256ef65c3e444fa Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 10 Sep 2018 13:00:00 +0200
Subject: [PATCH 0696/3253] openbsm: fix linux build

See https://hydra.nixos.org/build/80705916

To fix the linux build the patch `bsm-add-audit_token_to_pid.patch`
mustn't be applied during Linux builds, only for Darwin as it's an
Apple-only fix.

The compiler failure occurred because `audit_token_t` is part of
`<mach/mach.h>` which is not available on Linux.

Addresses #45960
---
 pkgs/development/libraries/openbsm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a9559c6abfba..136665425280 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
   };
 
-  patches = [ ./bsm-add-audit_token_to_pid.patch ];
+  patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];
 
   meta = {
     homepage = http://www.openbsm.org/;

From ea99e30dc2305ca64ad5000611baa8f015c75867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 10 Sep 2018 13:17:15 +0200
Subject: [PATCH 0697/3253] kde-frameworks: 5.49 -> 5.50

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 632 +++++++++---------
 2 files changed, 321 insertions(+), 313 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 48f009f8d3e0..1292d9cc7b33 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.50/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4f866974b61b..278de2d2a1ff 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,635 @@
 
 {
   attica = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz";
-      sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn";
-      name = "attica-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/attica-5.50.0.tar.xz";
+      sha256 = "0iyaxh92qsh25dl3y18235x9c39jvxgzvfmz96vs5rjkyjnnh88w";
+      name = "attica-5.50.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz";
-      sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph";
-      name = "baloo-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/baloo-5.50.0.tar.xz";
+      sha256 = "07n90b2mz1d0anknwf271dp2w9hn2kdb0903zqsqnhmix1jqpfy6";
+      name = "baloo-5.50.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz";
-      sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard";
-      name = "bluez-qt-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/bluez-qt-5.50.0.tar.xz";
+      sha256 = "028rdw97c042c1xcb2gwa6n4fcpn0wx4ilgh5j584afps6rg2k3b";
+      name = "bluez-qt-5.50.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz";
-      sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph";
-      name = "breeze-icons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz";
+      sha256 = "1zhlylry01w3x72q8ipjgijkicjp3wyv9p183awvg3znkblghhgw";
+      name = "breeze-icons-5.50.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz";
-      sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0";
-      name = "extra-cmake-modules-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/extra-cmake-modules-5.50.0.tar.xz";
+      sha256 = "1284gv6l1cck0y6phc9xphs1bl4ayk5a0nwzykhc8ncnkjqb0cyx";
+      name = "extra-cmake-modules-5.50.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz";
-      sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx";
-      name = "frameworkintegration-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/frameworkintegration-5.50.0.tar.xz";
+      sha256 = "14nq6v5xnznc7c7zdfvals4998cmlgdw4i7pz9hfbs35v0pswd03";
+      name = "frameworkintegration-5.50.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz";
-      sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim";
-      name = "kactivities-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kactivities-5.50.0.tar.xz";
+      sha256 = "0jbri8whf91skxc0zg72bx0m7aym8ka801ncp9kxbjdcj1mbz451";
+      name = "kactivities-5.50.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz";
-      sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f";
-      name = "kactivities-stats-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kactivities-stats-5.50.0.tar.xz";
+      sha256 = "0h6dl0522sl7glzk4rz7qj5642il2nr2jwmknbwv3ljhxba9qdrs";
+      name = "kactivities-stats-5.50.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz";
-      sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559";
-      name = "kapidox-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kapidox-5.50.0.tar.xz";
+      sha256 = "11hp0qpndy9s8g6x95s8lk7abkp1yvqraa1cdvvsdhn71izmsmqz";
+      name = "kapidox-5.50.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz";
-      sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0";
-      name = "karchive-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/karchive-5.50.0.tar.xz";
+      sha256 = "1jh1cyvdg680swyq2nmcpk4cfqmy67v49jl76nm1b5399zcs282l";
+      name = "karchive-5.50.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz";
-      sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8";
-      name = "kauth-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kauth-5.50.0.tar.xz";
+      sha256 = "15pk78a76897y4rym5ln1l5zm3n64rprl7k5bwkp4qzhwy7gzv7p";
+      name = "kauth-5.50.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz";
-      sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53";
-      name = "kbookmarks-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kbookmarks-5.50.0.tar.xz";
+      sha256 = "1lvsarcwjkmx14bni9akxrrr11zsvr9fv47ahw97kj9p3wdb1sy9";
+      name = "kbookmarks-5.50.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz";
-      sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q";
-      name = "kcmutils-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kcmutils-5.50.0.tar.xz";
+      sha256 = "1q9z8p20fn6k8yrhy0nq77yg4ra5vnpq6hq9mr7jkjqni9b0h3np";
+      name = "kcmutils-5.50.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz";
-      sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz";
-      name = "kcodecs-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kcodecs-5.50.0.tar.xz";
+      sha256 = "13gh7vys0xxpfqzjbxwr65p6d6jgcg0wr9ir1xqbkc368kay4n7b";
+      name = "kcodecs-5.50.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz";
-      sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi";
-      name = "kcompletion-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kcompletion-5.50.0.tar.xz";
+      sha256 = "1n0frkk2phf6a0rcrsf011jb2f66sisjy9lmmiy1czy533y3iraz";
+      name = "kcompletion-5.50.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz";
-      sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf";
-      name = "kconfig-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kconfig-5.50.0.tar.xz";
+      sha256 = "0jb4lq3k8lyjksgj728hgf0h81v6fxy1kyp17sv0cjrs6n3z8ry8";
+      name = "kconfig-5.50.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz";
-      sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz";
-      name = "kconfigwidgets-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kconfigwidgets-5.50.0.tar.xz";
+      sha256 = "102al35g2c6v091zm086lvhbym0j0f81zpn6wsk5wr0xc569lagj";
+      name = "kconfigwidgets-5.50.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz";
-      sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj";
-      name = "kcoreaddons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kcoreaddons-5.50.0.tar.xz";
+      sha256 = "1b7m4an322hk89n1svy3345106kphhn0ha7q21k5b3bwphszrx28";
+      name = "kcoreaddons-5.50.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz";
-      sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3";
-      name = "kcrash-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kcrash-5.50.0.tar.xz";
+      sha256 = "00n2ynhp1dbp75wkx9wm4mlyf5q3cbrk7k563mdihw88mzmmyvl4";
+      name = "kcrash-5.50.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz";
-      sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh";
-      name = "kdbusaddons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdbusaddons-5.50.0.tar.xz";
+      sha256 = "0ijvg4j97j4fv063phg086s9db6nj5gfgic5gcqg99h9hznbqkym";
+      name = "kdbusaddons-5.50.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz";
-      sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9";
-      name = "kdeclarative-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdeclarative-5.50.0.tar.xz";
+      sha256 = "1fwfzvadqh4rfyklygs17mkikh5m0m4flka91wbhw6jg6w7bvc4c";
+      name = "kdeclarative-5.50.0.tar.xz";
     };
   };
   kded = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz";
-      sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc";
-      name = "kded-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kded-5.50.0.tar.xz";
+      sha256 = "1hfh2l40s2mz4qh2wirfa8lnixvvl6y0agh3l5ii0jw93wvyci01";
+      name = "kded-5.50.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz";
-      sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi";
-      name = "kdelibs4support-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/kdelibs4support-5.50.0.tar.xz";
+      sha256 = "12ilp1cnpfhd8f4zsnwwq428cip43yq3xj0px91ndfrgq8chg05l";
+      name = "kdelibs4support-5.50.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz";
-      sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd";
-      name = "kdesignerplugin-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdesignerplugin-5.50.0.tar.xz";
+      sha256 = "00dhhars7ab7zjsz992yswcns5zijzyy84fpym2hg1avxinm31x5";
+      name = "kdesignerplugin-5.50.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz";
-      sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k";
-      name = "kdesu-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdesu-5.50.0.tar.xz";
+      sha256 = "095vddhhlc8kyhrmygccvhzbhl6bkscnfrx3vf96anm68zyk4g3f";
+      name = "kdesu-5.50.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz";
-      sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n";
-      name = "kdewebkit-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdewebkit-5.50.0.tar.xz";
+      sha256 = "0p5h58mcwyjkrbyq66360blx001j4997dk7z85a3hf64hhv7k10h";
+      name = "kdewebkit-5.50.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz";
-      sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr";
-      name = "kdnssd-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdnssd-5.50.0.tar.xz";
+      sha256 = "05d2y205mvdbgmmm0h4agbg4xf48x1xc2lgfvjnpgx8ilb5136pi";
+      name = "kdnssd-5.50.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz";
-      sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl";
-      name = "kdoctools-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kdoctools-5.50.0.tar.xz";
+      sha256 = "1zgjf7ib8qlgjkkhkgd3b679b672cgsbiqsshbp0f1hn25ig4dqy";
+      name = "kdoctools-5.50.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz";
-      sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn";
-      name = "kemoticons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kemoticons-5.50.0.tar.xz";
+      sha256 = "194rhxwf7h3mmb990l0p6l6lrf181c0scikj4h2ngmnjklgvajsg";
+      name = "kemoticons-5.50.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz";
-      sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80";
-      name = "kfilemetadata-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kfilemetadata-5.50.0.tar.xz";
+      sha256 = "063148xbnrgplzfgqdiwyzdj2rix97xln1x72kn3qprxzc5y257l";
+      name = "kfilemetadata-5.50.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz";
-      sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl";
-      name = "kglobalaccel-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kglobalaccel-5.50.0.tar.xz";
+      sha256 = "1dwp9h7lf1lagwhm2yd2wx130s1kacjinw95f4sznxdw943vp1b3";
+      name = "kglobalaccel-5.50.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz";
-      sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk";
-      name = "kguiaddons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kguiaddons-5.50.0.tar.xz";
+      sha256 = "1apz11issmj8c8zw4l88grl38m6nhgwpxb1j9h9v6khjvkwxr987";
+      name = "kguiaddons-5.50.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz";
-      sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp";
-      name = "kholidays-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kholidays-5.50.0.tar.xz";
+      sha256 = "0zjkmsjq4m7d2gmsa0m613ny92xcb3w9zbkbsvnh8ci7ghiscz1j";
+      name = "kholidays-5.50.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz";
-      sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64";
-      name = "khtml-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/khtml-5.50.0.tar.xz";
+      sha256 = "1r1qz3pyqifrzinjz83rhb5fgw5si8xmac7jkmn8w82j2kb41bxa";
+      name = "khtml-5.50.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz";
-      sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz";
-      name = "ki18n-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/ki18n-5.50.0.tar.xz";
+      sha256 = "1y6baizaynphbsfc2b93dh2nah23jh8a3rcbqn7whrdln0f31z19";
+      name = "ki18n-5.50.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz";
-      sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m";
-      name = "kiconthemes-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kiconthemes-5.50.0.tar.xz";
+      sha256 = "0ip0py0lx3rhjg6wzhdxrbzckmq4n1pnfbzm996wqka6aa4dwzry";
+      name = "kiconthemes-5.50.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz";
-      sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv";
-      name = "kidletime-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kidletime-5.50.0.tar.xz";
+      sha256 = "1kqghslwvis72h1sw6r4vrwsz0mwqzf5shj6m5mxqk6jv9wbfni1";
+      name = "kidletime-5.50.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz";
-      sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4";
-      name = "kimageformats-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kimageformats-5.50.0.tar.xz";
+      sha256 = "0kndxzkcjm9syb6k7zzw2jxdfm1gw6gasq78issypxwc1zci5nvb";
+      name = "kimageformats-5.50.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz";
-      sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95";
-      name = "kinit-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kinit-5.50.0.tar.xz";
+      sha256 = "1lgalvd81skdncdhd0pwng0vvy54f5wi2wwpqcil22y3860jfb4i";
+      name = "kinit-5.50.0.tar.xz";
     };
   };
   kio = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz";
-      sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k";
-      name = "kio-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kio-5.50.0.tar.xz";
+      sha256 = "1bnjal43rpsbabwq756xswj1cbhbrqxgjpjccjgxqml7csa3yhh1";
+      name = "kio-5.50.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz";
-      sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz";
-      name = "kirigami2-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kirigami2-5.50.0.tar.xz";
+      sha256 = "0jc4xrs0il5b7s7hzi4ff7jn30r8kgg4fzqxrhwqix9rcxn3nrxl";
+      name = "kirigami2-5.50.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz";
-      sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg";
-      name = "kitemmodels-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kitemmodels-5.50.0.tar.xz";
+      sha256 = "1c4yfqibizrm0zw9kijgkx4pq0r9f12nrw2dnw90g8q7s0pg7q36";
+      name = "kitemmodels-5.50.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz";
-      sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp";
-      name = "kitemviews-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kitemviews-5.50.0.tar.xz";
+      sha256 = "0wghvj5f1xkm9rf6rg50m399z25m1rfvd67ixr0lqwnhag1r32n8";
+      name = "kitemviews-5.50.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz";
-      sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g";
-      name = "kjobwidgets-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kjobwidgets-5.50.0.tar.xz";
+      sha256 = "0jc7hiid2b2bpj0xw2clrzkplnqi7x1lhh5za2c37dlynndy609q";
+      name = "kjobwidgets-5.50.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz";
-      sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0";
-      name = "kjs-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/kjs-5.50.0.tar.xz";
+      sha256 = "1jfdcg725mwcfigqhp2srshvj7vhzxb3yhpwij8c0gwmzm0h1lxv";
+      name = "kjs-5.50.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz";
-      sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m";
-      name = "kjsembed-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/kjsembed-5.50.0.tar.xz";
+      sha256 = "1iacz8x0idlswg0lwiv2i1k2qklhkk6ih6nhkajq4dy6ajnpbn7a";
+      name = "kjsembed-5.50.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz";
-      sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx";
-      name = "kmediaplayer-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/kmediaplayer-5.50.0.tar.xz";
+      sha256 = "0wz8ln45wkslh5c7dq8dijj19xr1xqxi5svv58a3hr5vbcyw3sjm";
+      name = "kmediaplayer-5.50.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz";
-      sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk";
-      name = "knewstuff-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/knewstuff-5.50.0.tar.xz";
+      sha256 = "1imh0hl056hpmrvdlmb68v0wclx3isr6l8sdqrzh3snmjm3jdwhd";
+      name = "knewstuff-5.50.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz";
-      sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9";
-      name = "knotifications-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/knotifications-5.50.0.tar.xz";
+      sha256 = "0xj62kbrlq4ib7kibwrmsbf84nv6klbh3v7rb34alacvvaf5lljs";
+      name = "knotifications-5.50.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz";
-      sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa";
-      name = "knotifyconfig-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/knotifyconfig-5.50.0.tar.xz";
+      sha256 = "01l4wn9khdd28rbi2qbpaqrgjp6achg6wbpaixwph2y2g9zgixdz";
+      name = "knotifyconfig-5.50.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz";
-      sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd";
-      name = "kpackage-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kpackage-5.50.0.tar.xz";
+      sha256 = "0bx1hzjl5m9893s97mlhrrshagfkng36rxa0bwm7y8sbh4rnnj8p";
+      name = "kpackage-5.50.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz";
-      sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k";
-      name = "kparts-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kparts-5.50.0.tar.xz";
+      sha256 = "1zwa0pyy0sa3j0yrdggl33gx3a48zvz68nl8r7b7ak445iwmx821";
+      name = "kparts-5.50.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz";
-      sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv";
-      name = "kpeople-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kpeople-5.50.0.tar.xz";
+      sha256 = "0vc81g2i5wznfav4nh5c8cp31aridiwg9ksg0gaa2q41882w560b";
+      name = "kpeople-5.50.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz";
-      sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0";
-      name = "kplotting-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kplotting-5.50.0.tar.xz";
+      sha256 = "18xw8q426sapim7532f0syb5nwf0vhx9h6xp52lyljj98l88vydw";
+      name = "kplotting-5.50.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz";
-      sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg";
-      name = "kpty-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kpty-5.50.0.tar.xz";
+      sha256 = "0slk8nwh94p8xp3q91wmda2v3ipmsvd4fpdsdfz4w2j0kh6nd6w5";
+      name = "kpty-5.50.0.tar.xz";
     };
   };
   kross = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz";
-      sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz";
-      name = "kross-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/portingAids/kross-5.50.0.tar.xz";
+      sha256 = "1g0i34z4rhrsnq41plavq880r3c17fki69vs3wjvzmybfn0klha2";
+      name = "kross-5.50.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz";
-      sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19";
-      name = "krunner-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/krunner-5.50.0.tar.xz";
+      sha256 = "03igg111n7c6ys0xm075hlr8k0g599pwgha7wi02k8dbbc2q20g8";
+      name = "krunner-5.50.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz";
-      sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z";
-      name = "kservice-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kservice-5.50.0.tar.xz";
+      sha256 = "0y0yk1gr7nd0svk4vkbyy1igy2klmwmsv8wwx1bvfkkg3yshz199";
+      name = "kservice-5.50.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz";
-      sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj";
-      name = "ktexteditor-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/ktexteditor-5.50.0.tar.xz";
+      sha256 = "00h75yy17npwzhz572k1784h2gw5gynhl9gxbj0i9zbis1nfi1m2";
+      name = "ktexteditor-5.50.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz";
-      sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1";
-      name = "ktextwidgets-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/ktextwidgets-5.50.0.tar.xz";
+      sha256 = "18z108si2cr38np3wcd7hkjjqhs661j2xv0zf8837mm9di4bgjiz";
+      name = "ktextwidgets-5.50.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz";
-      sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79";
-      name = "kunitconversion-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kunitconversion-5.50.0.tar.xz";
+      sha256 = "0f37ap98rzc575vjf1hhh51bbjvgn00g9mdnp9x3lmi5l6npvwj4";
+      name = "kunitconversion-5.50.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz";
-      sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z";
-      name = "kwallet-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kwallet-5.50.0.tar.xz";
+      sha256 = "14hlcly6x9ybczxg63nwsgv7kah1sx0haxlyllma4rwmh8a85ji5";
+      name = "kwallet-5.50.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz";
-      sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6";
-      name = "kwayland-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kwayland-5.50.0.tar.xz";
+      sha256 = "021pqsv59svj6j4g6alcgrsdi5bybx8i1skpf1v5nf5fc6f17bqb";
+      name = "kwayland-5.50.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz";
-      sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92";
-      name = "kwidgetsaddons-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kwidgetsaddons-5.50.0.tar.xz";
+      sha256 = "0yvd1b15vjk03jdwpyd97z1wn892amp3jkx3s7ff8nc8ax7fyc4m";
+      name = "kwidgetsaddons-5.50.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz";
-      sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp";
-      name = "kwindowsystem-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kwindowsystem-5.50.0.tar.xz";
+      sha256 = "0gmk7hp4z7ly6hm0z479hv5vqlmzfr4c9p6r572agzbpc8m682v9";
+      name = "kwindowsystem-5.50.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz";
-      sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa";
-      name = "kxmlgui-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kxmlgui-5.50.0.tar.xz";
+      sha256 = "1ga81jd0ad5jkb9wdh5hwzzq9axw6pcy4jz1vlc9s2xywyaq931l";
+      name = "kxmlgui-5.50.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz";
-      sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06";
-      name = "kxmlrpcclient-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/kxmlrpcclient-5.50.0.tar.xz";
+      sha256 = "03xqxb08kbzs1m0sxpgq8lzf4809kkhl7yc17svq7y00xgq3h36r";
+      name = "kxmlrpcclient-5.50.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz";
-      sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2";
-      name = "modemmanager-qt-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/modemmanager-qt-5.50.0.tar.xz";
+      sha256 = "1w7im3ihcpqvjiw7rj7iakxpyhzlaams0r900kh0mv4zfdyl9szs";
+      name = "modemmanager-qt-5.50.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz";
-      sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z";
-      name = "networkmanager-qt-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/networkmanager-qt-5.50.0.tar.xz";
+      sha256 = "168bzsvsh3i1w3840nickg7rv0hncaiiv6sc1sycg4n6v7773dzl";
+      name = "networkmanager-qt-5.50.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz";
-      sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g";
-      name = "oxygen-icons5-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/oxygen-icons5-5.50.0.tar.xz";
+      sha256 = "1ajx9y4wqzi55dmz360j7ha987m3wzs2zbnrm49lipgd55c8n3nc";
+      name = "oxygen-icons5-5.50.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz";
-      sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv";
-      name = "plasma-framework-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/plasma-framework-5.50.0.tar.xz";
+      sha256 = "01p0friqdhzjkssd655rdsfxp2hdqaf34ypqzx7xwnw3wj1971r8";
+      name = "plasma-framework-5.50.0.tar.xz";
     };
   };
   prison = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz";
-      sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d";
-      name = "prison-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/prison-5.50.0.tar.xz";
+      sha256 = "1v62dq44li0wwrgiiwad2hjj2vzcypa3i9qp0gwc8kkzg162b62d";
+      name = "prison-5.50.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz";
-      sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz";
-      name = "purpose-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/purpose-5.50.0.tar.xz";
+      sha256 = "11m5391mjf4r89frvvdq9jlkylp67h87x0g3mx00yfc004bsyi6f";
+      name = "purpose-5.50.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz";
-      sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj";
-      name = "qqc2-desktop-style-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/qqc2-desktop-style-5.50.0.tar.xz";
+      sha256 = "0ml88m6hb1llzl7kaykkny7v717grvzh8jnlwdyla2lv4rvvz7d8";
+      name = "qqc2-desktop-style-5.50.0.tar.xz";
     };
   };
   solid = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz";
-      sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp";
-      name = "solid-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/solid-5.50.0.tar.xz";
+      sha256 = "1y8sclp8lqf4hkqvbm1mmklrjvkxpvz3bb8qqbi5xhd5p9vf6z0h";
+      name = "solid-5.50.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz";
-      sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3";
-      name = "sonnet-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/sonnet-5.50.0.tar.xz";
+      sha256 = "13ddp5l9vnyqg05xadc4d1j0xfl8ain4qprq3iw82ygrchyrzm0d";
+      name = "sonnet-5.50.0.tar.xz";
+    };
+  };
+  syndication = {
+    version = "5.50.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.50/syndication-5.50.0.tar.xz";
+      sha256 = "1i73blq2fdzvzfg1p6715fv5m40yd6vcvnbg1pfmbr3696qy4mb3";
+      name = "syndication-5.50.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz";
-      sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v";
-      name = "syntax-highlighting-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/syntax-highlighting-5.50.0.tar.xz";
+      sha256 = "10iw8fhqgvsn4jgf81d9xy8aac07acn45rysnvj9wpm3cmxqxmd4";
+      name = "syntax-highlighting-5.50.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.49.0";
+    version = "5.50.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz";
-      sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7";
-      name = "threadweaver-5.49.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.50/threadweaver-5.50.0.tar.xz";
+      sha256 = "11j82nq5pr7rk94bnfzanpj3b41dqjl9cgk2b3h326y7bphcrkyf";
+      name = "threadweaver-5.50.0.tar.xz";
     };
   };
 }

From 02feb90d4e2bd9f2ad000a1a5a4a1d621f79aea9 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Mon, 10 Sep 2018 13:34:28 +0200
Subject: [PATCH 0698/3253] safe-money: Fix dependencies for safe-money-*

They all depend on safe-money-0.7, but hackage2nix made them incorrectly
depend on safe-money-0.6

We should be able to remove this 'hack' as soon as the new Stackage LTS
comes out, as safe-money-0.7 will then be the default version.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ef55272d6e97..2e293f1031b0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1130,4 +1130,12 @@ self: super: {
 
   # https://github.com/snapframework/xmlhtml/pull/37
   xmlhtml = doJailbreak super.xmlhtml;
+
+  # https://github.com/NixOS/nixpkgs/issues/46467
+  safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; };
+  safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; };
+  safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; };
+  safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
+  safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From ac679e721f257b408006fd88645c0738799e0b4c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 10 Sep 2018 13:22:24 +0100
Subject: [PATCH 0699/3253] earlyoom: fix version number (#46481)

earlyoom's Makefile attempts to detect the current version using git,
but we don't keep .git in its source, so this fails. We can however
set the VERSION environment variable to override this, as we now do.
---
 pkgs/os-specific/linux/earlyoom/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
index 081996dfd42b..52333c109ee0 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -1,19 +1,19 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "earlyoom-${version}";
-  version = "0.11";
+  name = "earlyoom-${VERSION}";
+  # This environment variable is read by make to set the build version.
+  VERSION = "0.11";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "earlyoom";
-    rev = "08b7ed8e72feed2eec2e558ba2cfacbf6d469594";
+    rev = "v${VERSION}";
     sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl";
   };
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp earlyoom $out/bin
+    install -D earlyoom $out/bin/earlyoom
   '';
 
   meta = {

From d1818ad6b10e8880f166a0c678389ea89dec88ce Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Mon, 10 Sep 2018 15:12:22 +1000
Subject: [PATCH 0700/3253] bazel: add bazel_jdk10 variant

---
 .../development/tools/build-managers/bazel/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 6a25aef8b36a..49d6abdc0098 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,11 +1,13 @@
 { stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper
 , jdk, zip, unzip, bash, writeCBin, coreutils
 , which, python, perl, gnused, gnugrep, findutils
+# Apple dependencies
+, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
+# Allow to independently override the jdks used to build and run respectively
+, buildJdk ? jdk, runJdk ? jdk
 # Always assume all markers valid (don't redownload dependencies).
 # Also, don't clean up environment variables.
 , enableNixHacks ? false
-# Apple dependencies
-, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
 }:
 
 let
@@ -152,7 +154,7 @@ stdenv.mkDerivation rec {
      + genericPatches;
 
   buildInputs = [
-    jdk
+    buildJdk
   ];
 
   nativeBuildInputs = [
@@ -190,7 +192,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
-    wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
+    wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}"
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
     mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
     cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26409db6d01d..230f077602fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7954,6 +7954,11 @@ with pkgs;
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
   };
+  bazel_jdk10 = callPackage ../development/tools/build-managers/bazel {
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+    runJdk = jdk10;
+  };
 
   bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
   buildifier = bazel-buildtools;

From 162a176d34bf828985d442462732ebe3f7d6e0f3 Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Mon, 10 Sep 2018 22:18:12 +0800
Subject: [PATCH 0701/3253] update to use original repo

---
 pkgs/data/fonts/et-book/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix
index 79f2a2e66ca7..cbbc75f32855 100644
--- a/pkgs/data/fonts/et-book/default.nix
+++ b/pkgs/data/fonts/et-book/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub }:
 
 fetchFromGitHub rec {
-  rev = "1.0";
-  name = "et-book-${rev}";
-  owner = "jethrokuan";
+  rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031";
+  name = "et-book-${builtins.substring 0 6 rev}";
+  owner = "edwardtufte";
   repo = "et-book";
   sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2";
 
   postFetch = ''
     tar -xzf $downloadedFile
     mkdir -p $out/share/fonts/truetype
-    cp -t $out/share/fonts/truetype ${name}/*.ttf
+    cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf
   '';
 
   meta = with stdenv.lib; {

From 96b25ee5bd0616b278b7658f8c52db398cbbcb28 Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Mon, 10 Sep 2018 22:31:41 +0800
Subject: [PATCH 0702/3253] fix wrong license

---
 pkgs/data/fonts/et-book/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix
index cbbc75f32855..58586ba7db65 100644
--- a/pkgs/data/fonts/et-book/default.nix
+++ b/pkgs/data/fonts/et-book/default.nix
@@ -14,8 +14,8 @@ fetchFromGitHub rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Font for ET Book";
-    license = licenses.free;
+    description = "The typeface used in Edward Tufte’s books.";
+    license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ jethro ];
   };

From a7166cdc35263b2ea1266226580d0831637cd293 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 17:06:54 +0200
Subject: [PATCH 0703/3253] pythonPackages.us: fix build

Required jellyfish==0.5.6 but we have 0.6.1. Loosen requirements.
---
 pkgs/development/python-modules/us/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix
index eb001410ce5f..53b5bc9ad166 100644
--- a/pkgs/development/python-modules/us/default.nix
+++ b/pkgs/development/python-modules/us/default.nix
@@ -15,6 +15,13 @@ buildPythonPackage rec {
     sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09";
   };
 
+  # Upstream requires jellyfish==0.5.6 but we have 0.6.1
+  postPatch = ''
+    substituteInPlace setup.py --replace "jellyfish==" "jellyfish>="
+  '';
+
+  doCheck = false; # pypi version doesn't include tests
+
   meta = {
     description = "A package for easily working with US and state metadata";
     longDescription = ''

From bb1f3422e0c62bba962b40db10d1e929039bec03 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 17:19:05 +0200
Subject: [PATCH 0704/3253] pythonPackages.readme_renderer: fix build

Disable one test case that has failed since last bleach update.
---
 pkgs/development/python-modules/readme_renderer/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix
index 4690dcc89bc8..d6c333ce36de 100644
--- a/pkgs/development/python-modules/readme_renderer/default.nix
+++ b/pkgs/development/python-modules/readme_renderer/default.nix
@@ -27,7 +27,8 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    py.test
+    # disable one failing test case
+    py.test -k "not test_invalid_link"
   '';
 
   meta = {

From 7c96603af93e0066bfd9a078813a9c9152ba9e9e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 9 Sep 2018 20:42:59 -0400
Subject: [PATCH 0705/3253] pacman: substitute paths in repo-add

---
 pkgs/tools/package-management/pacman/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index 8423caa49d59..461e8ff1ec5d 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
 
+  postFixup = ''
+    substituteInPlace $out/bin/repo-add \
+      --replace bsdtar "${libarchive}/bin/bsdtar"
+  '';
+
   meta = with lib; {
     description = "A simple library-based package manager";
     homepage = https://www.archlinux.org/pacman/;

From 4a6b5503aaaa5ec280d6bb09919789f31db0fd17 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 10 Sep 2018 11:40:41 -0400
Subject: [PATCH 0706/3253] linux: 4.19-rc2 -> 4.19-rc3

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 1f45348824a0..3be377205824 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc2";
-  modDirVersion = "4.19.0-rc2";
+  version = "4.19-rc3";
+  modDirVersion = "4.19.0-rc3";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0a5ip4dxv5y1mdi03m5rnz2l9k6kv30gciss6fag41lwsfwwln3z";
+    sha256 = "0n372r1j3m2q47hwl8b1r57jq1b4fdhmadgvcvik6fpsvcw74w27";
   };
 
   # Should the testing kernels ever be built on Hydra?

From d2a885a3b5d387952f2343e42507ebc00b9cdbbc Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 17:32:50 +0200
Subject: [PATCH 0707/3253] pythonPackages.pyfakefs: 3.4.1 -> 3.4.3, fix build

Update and disable some failing test cases
---
 .../python-modules/pyfakefs/default.nix        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index cfb575c7675e..3208a512e591 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python, pytest, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "3.4.1";
+  version = "3.4.3";
   pname = "pyfakefs";
 
   # no tests in PyPI tarball
@@ -10,22 +10,26 @@ buildPythonPackage rec {
     owner = "jmcgeheeiv";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i8kq7sl8bczr927hllgfhsmirjqjh89c9184kcqmprc13ac4kxy";
+    sha256 = "0rhbkcb5h2x8kmyxivr5jr1db2xvmpjdbsfjxl142qhfb29hr2hp";
   };
 
   postPatch = ''
     # test doesn't work in sandbox
-    substituteInPlace tests/fake_filesystem_test.py \
+    substituteInPlace pyfakefs/tests/fake_filesystem_test.py \
       --replace "test_expand_root" "notest_expand_root"
-    substituteInPlace tests/fake_os_test.py \
-      --replace "test_append_mode" "notest_append_mode"
+    substituteInPlace pyfakefs/tests/fake_os_test.py \
+      --replace "test_path_links_not_resolved" "notest_path_links_not_resolved" \
+      --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
+    substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
+      --replace "test_copy_real_file" "notest_copy_real_file"
   '';
 
   checkInputs = [ pytest glibcLocales ];
 
   checkPhase = ''
-    LC_ALL=en_US.UTF-8 ${python.interpreter} -m tests.all_tests
-    py.test tests/pytest_plugin_test.py
+    export LC_ALL=en_US.UTF-8
+    ${python.interpreter} -m pyfakefs.tests.all_tests
+    ${python.interpreter} -m pytest pyfakefs/tests/pytest_plugin_test.py
   '';
 
   meta = with stdenv.lib; {

From 80ecef8e4beb007aa558f123f8ac66b69b4f0a90 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 18:05:40 +0200
Subject: [PATCH 0708/3253] pythonPackages.pydub: fix build and tests

- remove obsolete patch that caused build failure
- no tests were run because required data files were missing in pypi
  version; use github version instead
---
 .../python-modules/pydub/default.nix          | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index 28a76da4bd96..e9ce74263c2c 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
 
 buildPythonPackage rec {
   pname = "pydub";
   version = "0.22.1";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "20beff39e9959a3b2cb4392802aecb9b2417837fff635d2b00b5ef5f5326d313";
+  # pypi version doesn't include required data files for tests
+  src = fetchFromGitHub {
+    owner = "jiaaro";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv";
   };
 
-  patches = [
-    ./pyaudioop-python3.patch
-  ];
-
   checkInputs = [ scipy ffmpeg-full ];
 
+  checkPhase = ''
+    python test/test.py
+  '';
+
   meta = with stdenv.lib; {
     description = "Manipulate audio with a simple and easy high level interface.";
     homepage    = "http://pydub.com/";

From 40c469e56bcb894078a837d87070d7ef92f88e46 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 18:19:01 +0200
Subject: [PATCH 0709/3253] pythonPackages.pydub: remove obsolete patch

---
 .../pydub/pyaudioop-python3.patch             | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pydub/pyaudioop-python3.patch

diff --git a/pkgs/development/python-modules/pydub/pyaudioop-python3.patch b/pkgs/development/python-modules/pydub/pyaudioop-python3.patch
deleted file mode 100644
index 58c56db5b8a5..000000000000
--- a/pkgs/development/python-modules/pydub/pyaudioop-python3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git i/pydub/pyaudioop.py w/pydub/pyaudioop.py
-index 8f8f017..aa6bb8c 100644
---- i/pydub/pyaudioop.py
-+++ w/pydub/pyaudioop.py
-@@ -1,4 +1,4 @@
--import __builtin__
-+import builtins
- import math
- import struct
- from fractions import gcd
-@@ -79,7 +79,7 @@ def _get_minval(size, signed=True):
- def _get_clipfn(size, signed=True):
-     maxval = _get_maxval(size, signed)
-     minval = _get_minval(size, signed)
--    return lambda val: __builtin__.max(min(val, maxval), minval)
-+    return lambda val: builtins.max(min(val, maxval), minval)
- 
- 
- def _overflow(val, size, signed=True):
-@@ -109,7 +109,7 @@ def max(cp, size):
-     if len(cp) == 0:
-         return 0
- 
--    return __builtin__.max(abs(sample) for sample in _get_samples(cp, size))
-+    return builtins.max(abs(sample) for sample in _get_samples(cp, size))
- 
- 
- def minmax(cp, size):
-@@ -117,8 +117,8 @@ def minmax(cp, size):
- 
-     max_sample, min_sample = 0, 0
-     for sample in _get_samples(cp, size):
--        max_sample = __builtin__.max(sample, max_sample)
--        min_sample = __builtin__.min(sample, min_sample)
-+        max_sample = builtins.max(sample, max_sample)
-+        min_sample = builtins.min(sample, min_sample)
- 
-     return min_sample, max_sample
- 
-@@ -542,4 +542,4 @@ def lin2adpcm(cp, size, state):
- 
- 
- def adpcm2lin(cp, size, state):
--    raise NotImplementedError()
-\ No newline at end of file
-+    raise NotImplementedError()

From 404b224529c59e485e1ea062d22e4f7581373070 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 10 Sep 2018 17:47:58 +0100
Subject: [PATCH 0710/3253] govendor: init at 1.0.9 (#46485)

---
 pkgs/development/tools/govendor/default.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/govendor/default.nix

diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix
new file mode 100644
index 000000000000..2030c8ba444a
--- /dev/null
+++ b/pkgs/development/tools/govendor/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "govendor-${version}";
+  version = "1.0.9";
+
+  goPackagePath = "github.com/kardianos/govendor";
+
+  src = fetchFromGitHub {
+    owner = "kardianos";
+    repo = "govendor";
+    rev = "v${version}";
+    sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/kardianos/govendor";
+    description = "Go vendor tool that works with the standard vendor file";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2243d3324a55..7961a769fac0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14466,6 +14466,8 @@ with pkgs;
 
   govers = callPackage ../development/tools/govers { };
 
+  govendor = callPackage ../development/tools/govendor { };
+
   gotools = callPackage ../development/tools/gotools { };
 
   gotop = callPackage ../tools/system/gotop { };

From fe1d9edfa7c7a25384bef968a6282542eac55849 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 10 Sep 2018 19:58:29 +0200
Subject: [PATCH 0711/3253] androidStudioPackages.beta: 3.2.0.24 -> 3.2.0.25

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 199793a44fb7..38d252b345d1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2";
   };
   betaVersion = {
-    version = "3.2.0.24"; # "Android Studio 3.2 RC 2"
-    build = "181.4974118";
-    sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz";
+    version = "3.2.0.25"; # "Android Studio 3.2 RC 3"
+    build = "181.4987877";
+    sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
   };
   latestVersion = { # canary & dev
     version = "3.3.0.7"; # "Android Studio 3.3 Canary 8"

From 08b89237748ff446b6063dd8c2d7eb0626cce342 Mon Sep 17 00:00:00 2001
From: Oscar Vargas Torres <vargas.torres.oscar@gmail.com>
Date: Mon, 10 Sep 2018 13:32:33 -0500
Subject: [PATCH 0712/3253] ammonite: 1.1.2 -> 1.2.0

---
 pkgs/development/tools/ammonite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index f139e296d35e..0e98d63fdd3e 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.1.2";
+  version = "1.2.0";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc";
+    sha256 = "08kh4j9jsg3c3ks9q5f01i13d1ak701vjviy5wb3y6xsajg62nfj";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 8f4c5c72accb86392f218a05e80d5bf655f0a0b5 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 10 Sep 2018 20:50:27 +0200
Subject: [PATCH 0713/3253] vimPlugins: Fix update.py, add/update plugins

---
 pkgs/misc/vim-plugins/default.nix      |  23 +-
 pkgs/misc/vim-plugins/generated.nix    | 437 +++++++++++++++++++------
 pkgs/misc/vim-plugins/update.py        |  12 +-
 pkgs/misc/vim-plugins/vim-plugin-names |  25 +-
 4 files changed, 375 insertions(+), 122 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0b6ad80acbdb..4507b1125df8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -111,7 +111,7 @@ self = generated // (with generated; {
     '';
   });
 
-  command-t = command-t.overrideAttrs(old: {
+  command_T = command_T.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -309,7 +309,7 @@ self = generated // (with generated; {
     '';
   });
 
-  YankRing-vim = YankRing-vim.overrideAttrs(old: {
+  yankring = yankring.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
@@ -332,9 +332,9 @@ self = generated // (with generated; {
     };
   });
 }) // lib.optionalAttrs (config.allowAliases or true) (with self; {
-  # aliasess
+  # aliases
   airline             = vim-airline;
-  alternative         = a-vim; # backwards compat, added 2014-10-21
+  a-vim               = alternative; # backwards compat, added 2018-09-10
   bats                = bats-vim;
   calendar            = calendar-vim;
   coffee-script       = vim-coffee-script;
@@ -343,9 +343,8 @@ self = generated // (with generated; {
   solarized           = vim-colors-solarized;
   colors-solarized    = vim-colors-solarized;
   caw                 = caw-vim;
-  colorsamplerpack    = Colour_Sampler_Pack;
-  Colour_Sampler_Pack = Colour-Sampler-Pack;
-  command_T           = command-t; # backwards compat, added 2014-10-18
+  Colour_Sampler_Pack = colorsamplerpack;
+  command-t           = command_T; # backwards compat, added 2018-09-10
   commentary          = vim-commentary;
   committia           = committia-vim;
   concealedyank       = concealedyank-vim;
@@ -382,7 +381,7 @@ self = generated // (with generated; {
   latex-live-preview  = vim-latex-live-preview;
   maktaba             = vim-maktaba;
   multiple-cursors    = vim-multiple-cursors;
-  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  neco-ghc            = necoGhc; # backwards compat, added 2018-09-10
   neocomplete         = neocomplete-vim;
   neoinclude          = neoinclude-vim;
   neomru              = neomru-vim;
@@ -427,12 +426,12 @@ self = generated // (with generated; {
   vim-addon-vim2nix   = vim2nix;
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
-  vinegar             = vim-vinegar;
-  watchdogs           = vim-watchdogs;
+  vim-vinegar         = vinegar; # backwards compat, added 2018-09-10
+  vim-watchdogs       = watchdogs; # backwards compat, added 2018-09-10
   WebAPI              = webapi-vim;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
-  yankring            = YankRing-vim;
-  Yankring            = YankRing-vim;
+  YankRing-vim        = yankring;
+  Yankring            = yankring;
   YouCompleteMe       = youcompleteme;
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 45c5f950babb..88a91824ea06 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2,16 +2,6 @@
 { buildVimPluginFrom2Nix, fetchFromGitHub }:
 
 {
-  a-vim = buildVimPluginFrom2Nix {
-    name = "a-vim-2010-11-06";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "a.vim";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
-    };
-  };
-
   ack-vim = buildVimPluginFrom2Nix {
     name = "ack-vim-2018-02-27";
     src = fetchFromGitHub {
@@ -53,12 +43,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-07";
+    name = "ale-2018-09-10";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "0ae4ea23c8573f9c693fcd5cd5ff9a3acc795b58";
-      sha256 = "005lmxhh07agdqa6qlk5f4vd3z2im8drrjy6ficrmwy7idp7cjyn";
+      rev = "99e9417ef901824200040c6a2d3e84f2e0ff4b8e";
+      sha256 = "1y7yp1wyghhgvmylkbdi3wbvqcw026mfaajhgna53xd3fl7z3bgd";
     };
   };
 
@@ -72,6 +62,16 @@
     };
   };
 
+  alternative = buildVimPluginFrom2Nix {
+    name = "alternative-2010-11-06";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
+    };
+  };
+
   argtextobj-vim = buildVimPluginFrom2Nix {
     name = "argtextobj-vim-2010-10-18";
     src = fetchFromGitHub {
@@ -182,8 +182,8 @@
     };
   };
 
-  Colour-Sampler-Pack = buildVimPluginFrom2Nix {
-    name = "Colour-Sampler-Pack-2012-11-30";
+  colorsamplerpack = buildVimPluginFrom2Nix {
+    name = "colorsamplerpack-2012-11-30";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -192,8 +192,8 @@
     };
   };
 
-  command-t = buildVimPluginFrom2Nix {
-    name = "command-t-2017-11-17";
+  command_T = buildVimPluginFrom2Nix {
+    name = "command_T-2017-11-17";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -293,16 +293,6 @@
     };
   };
 
-  ctrlp-z = buildVimPluginFrom2Nix {
-    name = "ctrlp-z-2015-10-17";
-    src = fetchFromGitHub {
-      owner = "amiorin";
-      repo = "ctrlp-z";
-      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
-      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
-    };
-  };
-
   ctrlp-vim = buildVimPluginFrom2Nix {
     name = "ctrlp-vim-2018-06-28";
     src = fetchFromGitHub {
@@ -313,6 +303,16 @@
     };
   };
 
+  ctrlp-z = buildVimPluginFrom2Nix {
+    name = "ctrlp-z-2015-10-17";
+    src = fetchFromGitHub {
+      owner = "amiorin";
+      repo = "ctrlp-z";
+      rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
+      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
+    };
+  };
+
   denite-extra = buildVimPluginFrom2Nix {
     name = "denite-extra-2018-08-13";
     src = fetchFromGitHub {
@@ -343,6 +343,27 @@
     };
   };
 
+  deol-nvim = buildVimPluginFrom2Nix {
+    name = "deol-nvim-2018-06-07";
+    src = fetchFromGitHub {
+      owner = "Shougo";
+      repo = "deol.nvim";
+      rev = "195e63e10f320c0dc5c7e6372fe4f6ba96e93dd8";
+      sha256 = "0zb0pa1z847hpbb726i2vmryqap0yvdwnib4r8v1a7h06vvj17qy";
+    };
+  };
+
+  deoplete-clang = buildVimPluginFrom2Nix {
+    name = "deoplete-clang-2018-07-01";
+    src = fetchFromGitHub {
+      owner = "zchee";
+      repo = "deoplete-clang";
+      rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97";
+      sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i";
+      fetchSubmodules = true;
+    };
+  };
+
   deoplete-go = buildVimPluginFrom2Nix {
     name = "deoplete-go-2018-08-21";
     src = fetchFromGitHub {
@@ -365,13 +386,13 @@
     };
   };
 
-  deoplete-rust = buildVimPluginFrom2Nix {
-    name = "deoplete-rust-2017-07-18";
+  deoplete-julia = buildVimPluginFrom2Nix {
+    name = "deoplete-julia-2018-06-11";
     src = fetchFromGitHub {
-      owner = "sebastianmarkow";
-      repo = "deoplete-rust";
-      rev = "0a86e502113910c33448b337c4d50cabea120d25";
-      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
+      owner = "JuliaEditorSupport";
+      repo = "deoplete-julia";
+      rev = "d60b976910685c99ca773c974e91c44eeda03a19";
+      sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf";
     };
   };
 
@@ -385,6 +406,26 @@
     };
   };
 
+  deoplete-rust = buildVimPluginFrom2Nix {
+    name = "deoplete-rust-2017-07-18";
+    src = fetchFromGitHub {
+      owner = "sebastianmarkow";
+      repo = "deoplete-rust";
+      rev = "0a86e502113910c33448b337c4d50cabea120d25";
+      sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h";
+    };
+  };
+
+  deoplete-ternjs = buildVimPluginFrom2Nix {
+    name = "deoplete-ternjs-2018-06-05";
+    src = fetchFromGitHub {
+      owner = "carlitux";
+      repo = "deoplete-ternjs";
+      rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57";
+      sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i";
+    };
+  };
+
   dhall-vim = buildVimPluginFrom2Nix {
     name = "dhall-vim-2018-07-30";
     src = fetchFromGitHub {
@@ -396,12 +437,12 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-07-29";
+    name = "echodoc-vim-2018-09-09";
     src = fetchFromGitHub {
       owner = "shougo";
       repo = "echodoc.vim";
-      rev = "7b2b1853c4d88fc5ed929bf062a9f3136e051335";
-      sha256 = "1apxla41as44jnrrgxhgrz9g88q3y4mlpdbrb218fw5w3hyw51qj";
+      rev = "781b1622029cd89350e6383da8ead834fb0cedd2";
+      sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a";
     };
   };
 
@@ -607,6 +648,36 @@
     };
   };
 
+  incsearch-easymotion-vim = buildVimPluginFrom2Nix {
+    name = "incsearch-easymotion-vim-2016-01-18";
+    src = fetchFromGitHub {
+      owner = "haya14busa";
+      repo = "incsearch-easymotion.vim";
+      rev = "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5";
+      sha256 = "1bscr3xs1zggm9qzk1mb88fkc8qj6yrnkxmqwwyr75sf1xzy74mk";
+    };
+  };
+
+  incsearch-vim = buildVimPluginFrom2Nix {
+    name = "incsearch-vim-2017-11-24";
+    src = fetchFromGitHub {
+      owner = "haya14busa";
+      repo = "incsearch.vim";
+      rev = "25e2547fb0566460f5999024f7a0de7b3775201f";
+      sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1";
+    };
+  };
+
+  intero-neovim = buildVimPluginFrom2Nix {
+    name = "intero-neovim-2018-08-07";
+    src = fetchFromGitHub {
+      owner = "parsonsmatt";
+      repo = "intero-neovim";
+      rev = "9bb546e37adc1ffda28ff33922c506c15ed67b10";
+      sha256 = "173kc8xrbmkhrc9ssaz6h5w1zisxsgz4bibihgj9bx60ibn4kaa7";
+    };
+  };
+
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     name = "Jenkinsfile-vim-syntax-2018-04-04";
     src = fetchFromGitHub {
@@ -707,16 +778,6 @@
     };
   };
 
-  neco-ghc = buildVimPluginFrom2Nix {
-    name = "neco-ghc-2018-05-13";
-    src = fetchFromGitHub {
-      owner = "eagletmt";
-      repo = "neco-ghc";
-      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
-      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
-    };
-  };
-
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-01-21";
     src = fetchFromGitHub {
@@ -747,6 +808,16 @@
     };
   };
 
+  necoGhc = buildVimPluginFrom2Nix {
+    name = "necoGhc-2018-05-13";
+    src = fetchFromGitHub {
+      owner = "eagletmt";
+      repo = "neco-ghc";
+      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
+      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
+    };
+  };
+
   neocomplete-vim = buildVimPluginFrom2Nix {
     name = "neocomplete-vim-2018-03-28";
     src = fetchFromGitHub {
@@ -778,12 +849,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-07";
+    name = "neomake-2018-09-09";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "28f6991f3546195e764052d5e1c731432ac8f706";
-      sha256 = "1sw4c5h8w6yw3dfybar72dzxvf44yypkhcvi15zxklvicb4xak9p";
+      rev = "11c6797b258dfe1c0b4ee8536f2bb961003a3f76";
+      sha256 = "0lsrz6m29ghhz57m1ay2v26i0838czhmm6a06yfy39dy99sa02il";
     };
   };
 
@@ -838,12 +909,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-08-25";
+    name = "nerdtree-2018-09-10";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e";
-      sha256 = "1isnx83ay3r4f7bkfck98pq92m1kyafa96zzliyjdlgbplwmjq9y";
+      rev = "15d06b676dfcd92ac9a0bc375668d127f9822539";
+      sha256 = "1v1w4yg6mgmz0q00in0y46wcmcgh6gxx8szws5cmvwv43d5c18qs";
     };
   };
 
@@ -1027,13 +1098,23 @@
     };
   };
 
+  rtorrent-syntax-file = buildVimPluginFrom2Nix {
+    name = "rtorrent-syntax-file-2016-03-19";
+    src = fetchFromGitHub {
+      owner = "ccarpita";
+      repo = "rtorrent-syntax-file";
+      rev = "885ca182c02bbbed4b62a3fcfe6fe62fa5b419ca";
+      sha256 = "1vhvmwnwi6862cckl8dqr8pgy0inrr0c31lic89826yv7mfl9mbz";
+    };
+  };
+
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-09-08";
+    name = "rust-vim-2018-09-09";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "b7fc97c5f757c2b9f1e911dd4a800678d202d083";
-      sha256 = "1h0n55y7ybjaxxrch0fnq1c74h994d539qi62ba3x1k7sh5am887";
+      rev = "1eb6598a72ff2746118451147817c718e40b5769";
+      sha256 = "114xhwn1bdykh6vzic4k3xfpmkm7myfhixxw98qbxsnb2i068wl5";
     };
   };
 
@@ -1207,6 +1288,16 @@
     };
   };
 
+  tern_for_vim = buildVimPluginFrom2Nix {
+    name = "tern_for_vim-2017-11-27";
+    src = fetchFromGitHub {
+      owner = "ternjs";
+      repo = "tern_for_vim";
+      rev = "3cffc28f280fc599d3f997b1c8c00ddc78d8fc21";
+      sha256 = "0idzkc65lw9zg4xq60w2nnvdgbdhngqccqwh1bzkvkzlmr7s43cl";
+    };
+  };
+
   thumbnail-vim = buildVimPluginFrom2Nix {
     name = "thumbnail-vim-2017-04-24";
     src = fetchFromGitHub {
@@ -1287,13 +1378,23 @@
     };
   };
 
+  verilog_systemverilog-vim = buildVimPluginFrom2Nix {
+    name = "verilog_systemverilog-vim-2018-09-06";
+    src = fetchFromGitHub {
+      owner = "vhda";
+      repo = "verilog_systemverilog.vim";
+      rev = "2cb0da6a325f19bf662c60c5363bb59e98442c33";
+      sha256 = "1gyyaqj7assryaprxm9a3zcnappr3lvqmgphapa53qq6s6vmljw5";
+    };
+  };
+
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-07-23";
+    name = "vim-2018-09-09";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "d329d61c1752807059aef388c4e9629296760a35";
-      sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm";
+      rev = "fa16b1f1e04933aa9a28312e566d54040b8f4c3b";
+      sha256 = "0v73f327gn0zpgpgl4f9pim35y4qmkrqgyh1zg2z5ivdvns5yyif";
     };
   };
 
@@ -1498,12 +1599,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-07";
+    name = "vim-airline-2018-09-10";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "d342c3cb1e1365d7cfd0328bb0bc20321db34125";
-      sha256 = "19p8w2jyigzfq0qqqgc4gw82scqpjxfy0h4w1f6c0vrjbnk6xxx9";
+      rev = "da8035d8a83c85197d27a258465d8373ec6d5cd4";
+      sha256 = "1c2lh1w6qjgkian7ml5krwfc2m3g79bpz8rvpk1c93bn9zfz82h7";
     };
   };
 
@@ -1517,6 +1618,26 @@
     };
   };
 
+  vim-android = buildVimPluginFrom2Nix {
+    name = "vim-android-2018-07-31";
+    src = fetchFromGitHub {
+      owner = "hsanson";
+      repo = "vim-android";
+      rev = "c5647d65b4413c1a91712a80044e034aa705b858";
+      sha256 = "0b70m6yv1w103zdya966r0632q7djmfcp78mw19y9sca0p2d0gm9";
+    };
+  };
+
+  vim-anzu = buildVimPluginFrom2Nix {
+    name = "vim-anzu-2018-02-28";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "vim-anzu";
+      rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2";
+      sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00";
+    };
+  };
+
   vim-auto-save = buildVimPluginFrom2Nix {
     name = "vim-auto-save-2017-11-08";
     src = fetchFromGitHub {
@@ -1557,6 +1678,16 @@
     };
   };
 
+  vim-bufferline = buildVimPluginFrom2Nix {
+    name = "vim-bufferline-2016-02-09";
+    src = fetchFromGitHub {
+      owner = "bling";
+      repo = "vim-bufferline";
+      rev = "651fd010aa9613a4b8636a4af8a2db0d22800262";
+      sha256 = "0zls47a3v8dv3h63drbak1mxf3j2x3scvclk7bjwzlk2yp447das";
+    };
+  };
+
   vim-closetag = buildVimPluginFrom2Nix {
     name = "vim-closetag-2018-09-03";
     src = fetchFromGitHub {
@@ -1677,6 +1808,16 @@
     };
   };
 
+  vim-dirvish = buildVimPluginFrom2Nix {
+    name = "vim-dirvish-2018-06-20";
+    src = fetchFromGitHub {
+      owner = "justinmk";
+      repo = "vim-dirvish";
+      rev = "c273c462d774ed2db5f6d382265cf5897e554de0";
+      sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d";
+    };
+  };
+
   vim-dispatch = buildVimPluginFrom2Nix {
     name = "vim-dispatch-2018-08-20";
     src = fetchFromGitHub {
@@ -1720,7 +1861,7 @@
   vim-easymotion = buildVimPluginFrom2Nix {
     name = "vim-easymotion-2018-06-04";
     src = fetchFromGitHub {
-      owner = "lokaltog";
+      owner = "easymotion";
       repo = "vim-easymotion";
       rev = "1a0244c90c3ff46219cf9597bb13662be4232407";
       sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy";
@@ -1758,12 +1899,12 @@
   };
 
   vim-eunuch = buildVimPluginFrom2Nix {
-    name = "vim-eunuch-2018-08-10";
+    name = "vim-eunuch-2018-09-09";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-eunuch";
-      rev = "632d92e85d4b6d5413ee4a643ce570efb09c8d6b";
-      sha256 = "0mw2wxr4y5r1j3lj4ilihs83l2afsr0lnxzy73v1hsahs70vayx8";
+      rev = "10da325fb032a1acfa9222d273459f53bad30ba4";
+      sha256 = "125n4amz3vmc83yv76vidsnma5w2braa69dcpj858ahnzhh329qj";
     };
   };
 
@@ -1818,12 +1959,22 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-03";
+    name = "vim-fugitive-2018-09-09";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "4bf30ce907f74cbf442b41f85c25967c397a3413";
-      sha256 = "0k0rp4r4783dszbcag82ijrnkvp7hd5jrqsmpi45v4gxdxfj6slm";
+      rev = "d4fb2a2f5c2023f477beae6aef47cf0457351e6e";
+      sha256 = "1m2pa29rf44ykmiy9za511v1cla8kb071yly7h2yyfmw7600swwq";
+    };
+  };
+
+  vim-ghost = buildVimPluginFrom2Nix {
+    name = "vim-ghost-2018-08-23";
+    src = fetchFromGitHub {
+      owner = "raghur";
+      repo = "vim-ghost";
+      rev = "666a76c0783270eeb1ac1e0027df6f801a067bfd";
+      sha256 = "1c5jyipcj4hi703dcdim1123p2yp4h67ci4f9kgaz9h65lmz4xn5";
     };
   };
 
@@ -1868,12 +2019,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-06";
+    name = "vim-go-2018-09-10";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "fb173c3a849fdc47a267e905cee5e29a88797d61";
-      sha256 = "0i3kprznlys1pa6ii6rbcsxar2zwsygc4hv22h0svmpajbzwvfp9";
+      rev = "5b9058e1232786c682be79b8a00510d3bd63eba9";
+      sha256 = "14jcjdq48cnpdvp6k2lanr1chvkgky7xnz8zbcqhw2ma27zy16jf";
     };
   };
 
@@ -1888,12 +2039,22 @@
   };
 
   vim-grepper = buildVimPluginFrom2Nix {
-    name = "vim-grepper-2018-04-23";
+    name = "vim-grepper-2018-09-10";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-grepper";
-      rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4";
-      sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g";
+      rev = "f61a745c1e19c80427a251f556f28fc31e962f6d";
+      sha256 = "0l465qpphyi2c53hfwhc6fvj1s7vs2yc2l2spw387av6yqw83m9g";
+    };
+  };
+
+  vim-gutentags = buildVimPluginFrom2Nix {
+    name = "vim-gutentags-2018-06-13";
+    src = fetchFromGitHub {
+      owner = "ludovicchabant";
+      repo = "vim-gutentags";
+      rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e";
+      sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4";
     };
   };
 
@@ -1957,6 +2118,16 @@
     };
   };
 
+  vim-hindent = buildVimPluginFrom2Nix {
+    name = "vim-hindent-2018-07-31";
+    src = fetchFromGitHub {
+      owner = "alx741";
+      repo = "vim-hindent";
+      rev = "f8e84c199fd00a3ccaf5bbbc97786bde9a4faa13";
+      sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6";
+    };
+  };
+
   vim-hoogle = buildVimPluginFrom2Nix {
     name = "vim-hoogle-2018-03-04";
     src = fetchFromGitHub {
@@ -2018,12 +2189,22 @@
   };
 
   vim-jade = buildVimPluginFrom2Nix {
-    name = "vim-jade-2017-04-07";
+    name = "vim-jade-2018-09-10";
     src = fetchFromGitHub {
       owner = "digitaltoad";
       repo = "vim-jade";
-      rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975";
-      sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y";
+      rev = "3f341b48e46a84891e19d449a5e336bcfc5a57a0";
+      sha256 = "15gpb1a9d80gz8nzgl0w6wpnlxnrxd4qra2xj56jmmywsabkvqxk";
+    };
+  };
+
+  vim-javacomplete2 = buildVimPluginFrom2Nix {
+    name = "vim-javacomplete2-2018-08-20";
+    src = fetchFromGitHub {
+      owner = "artur-shaik";
+      repo = "vim-javacomplete2";
+      rev = "2567a4f3ba2b1b902fd85ca24726aba3bf61aaa5";
+      sha256 = "17mlip2mxv9sj2pxmj3clb7ax6m545pa5ynbr80vxww99537gxpr";
     };
   };
 
@@ -2268,6 +2449,16 @@
     };
   };
 
+  vim-pager = buildVimPluginFrom2Nix {
+    name = "vim-pager-2015-08-26";
+    src = fetchFromGitHub {
+      owner = "lambdalisue";
+      repo = "vim-pager";
+      rev = "a657d508b4d5a23aada7585c9f1e0063914c0c45";
+      sha256 = "10xm77pia916zf9i2llyhs89s653r98l6zq8cswm7cw61bjfxvv6";
+    };
+  };
+
   vim-pandoc = buildVimPluginFrom2Nix {
     name = "vim-pandoc-2018-08-13";
     src = fetchFromGitHub {
@@ -2328,6 +2519,16 @@
     };
   };
 
+  vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
+    name = "vim-plugin-AnsiEsc-2018-05-10";
+    src = fetchFromGitHub {
+      owner = "powerman";
+      repo = "vim-plugin-AnsiEsc";
+      rev = "9df135fd4a564559aad0f6d28ae6975678cedcaf";
+      sha256 = "06s6fz3jw6pmy08nqzlvzhcgnv2d2p0vs863hqvd39amhg1xa5nf";
+    };
+  };
+
   vim-polyglot = buildVimPluginFrom2Nix {
     name = "vim-polyglot-2018-07-08";
     src = fetchFromGitHub {
@@ -2349,12 +2550,12 @@
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
-    name = "vim-projectionist-2018-09-03";
+    name = "vim-projectionist-2018-09-09";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "285a6946a646e0f29e18fc16fe963cb2b3ab1f27";
-      sha256 = "0nmn0f8q8sh1fxss94ga7k1by1ajgf4ms8s30f212h09d2k3j5x5";
+      rev = "ee68be42d26a8879b871c051e85ce0dfae7364f0";
+      sha256 = "1x1v6q6gqw1f5h0rshj8q7x5cip78x2p6xdj05dglqdq1wz4w28i";
     };
   };
 
@@ -2578,6 +2779,16 @@
     };
   };
 
+  vim-stylishask = buildVimPluginFrom2Nix {
+    name = "vim-stylishask-2018-07-05";
+    src = fetchFromGitHub {
+      owner = "alx741";
+      repo = "vim-stylishask";
+      rev = "62608c70af8fafbbc9712238dafd2c5a433ed179";
+      sha256 = "12vj2kf82kvmd6smimgnz9yy97n7bvrji063ig3wlicxwmz62fdr";
+    };
+  };
+
   vim-surround = buildVimPluginFrom2Nix {
     name = "vim-surround-2018-07-23";
     src = fetchFromGitHub {
@@ -2688,13 +2899,23 @@
     };
   };
 
-  vim-vinegar = buildVimPluginFrom2Nix {
-    name = "vim-vinegar-2018-08-06";
+  vim-unimpaired = buildVimPluginFrom2Nix {
+    name = "vim-unimpaired-2018-07-26";
     src = fetchFromGitHub {
       owner = "tpope";
-      repo = "vim-vinegar";
-      rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
-      sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
+      repo = "vim-unimpaired";
+      rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da";
+      sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv";
+    };
+  };
+
+  vim-visualstar = buildVimPluginFrom2Nix {
+    name = "vim-visualstar-2015-08-27";
+    src = fetchFromGitHub {
+      owner = "thinca";
+      repo = "vim-visualstar";
+      rev = "a18cd0e7a03311ac709595c1d261ed44b45c9098";
+      sha256 = "0yz6ci4i84xxrgazjfa5nsj3q8733p0b6vwcljk1l7ghdfiflvy4";
     };
   };
 
@@ -2708,16 +2929,6 @@
     };
   };
 
-  vim-watchdogs = buildVimPluginFrom2Nix {
-    name = "vim-watchdogs-2017-12-03";
-    src = fetchFromGitHub {
-      owner = "osyo-manga";
-      repo = "vim-watchdogs";
-      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
-      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
-    };
-  };
-
   vim-wordy = buildVimPluginFrom2Nix {
     name = "vim-wordy-2018-03-10";
     src = fetchFromGitHub {
@@ -2809,12 +3020,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-06";
+    name = "vimtex-2018-09-09";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "2777bda5d774bd4b96580ecc8cffbff7b9801a33";
-      sha256 = "0r5x666z9zmn7ad7c378l97mqk65xv3ayqxqf3nypvq0ni5ax9hw";
+      rev = "cad3b43eca41b75cedab9ac86241f006aa3202ea";
+      sha256 = "1nnn2xri8n6j34nq4l4b11m2n7aglj61ks156caqhkgdkskf0ks4";
     };
   };
 
@@ -2828,6 +3039,16 @@
     };
   };
 
+  vinegar = buildVimPluginFrom2Nix {
+    name = "vinegar-2018-08-06";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-vinegar";
+      rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
+      sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
+    };
+  };
+
   vundle = buildVimPluginFrom2Nix {
     name = "vundle-2018-02-03";
     src = fetchFromGitHub {
@@ -2838,6 +3059,16 @@
     };
   };
 
+  watchdogs = buildVimPluginFrom2Nix {
+    name = "watchdogs-2017-12-03";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "vim-watchdogs";
+      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
+      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
+    };
+  };
+
   webapi-vim = buildVimPluginFrom2Nix {
     name = "webapi-vim-2018-03-14";
     src = fetchFromGitHub {
@@ -2878,8 +3109,8 @@
     };
   };
 
-  YankRing-vim = buildVimPluginFrom2Nix {
-    name = "YankRing-vim-2015-07-29";
+  yankring = buildVimPluginFrom2Nix {
+    name = "yankring-2015-07-29";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
@@ -2889,12 +3120,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-08-19";
+    name = "youcompleteme-2018-09-09";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "e018777b38eedaa23b96cfee40382d000e464e31";
-      sha256 = "1j4r6gkjs7kk2nwhmlwzm1nzzwrk96sr8xfbj0vwa847bsq3p591";
+      rev = "487b8ab2b4d5bcaece29a17a26818a62616e21b5";
+      sha256 = "1r0sdcllnqgi376hbj1f31irppqw1qqx7rna1jvj5qvi5d81s2nr";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index fbdceea2a9af..c19b439493c6 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -163,14 +163,14 @@ def print_download_error(plugin: str, ex: Exception):
 
 def check_results(
     results: List[Tuple[str, str, Union[Exception, Plugin]]]
-) -> List[Tuple[str, Plugin]]:
+) -> List[Tuple[str, str, Plugin]]:
     failures: List[Tuple[str, Exception]] = []
     plugins = []
     for (owner, name, result) in results:
         if isinstance(result, Exception):
             failures.append((name, result))
         else:
-            plugins.append((owner, result))
+            plugins.append((owner, name, result))
 
     print(f"{len(results) - len(failures)} plugins were checked", end="")
     if len(failures) == 0:
@@ -269,8 +269,8 @@ header = (
 )
 
 
-def generate_nix(plugins: List[Tuple[str, Plugin]]):
-    sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower())
+def generate_nix(plugins: List[Tuple[str, str, Plugin]]):
+    sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
 
     with open(ROOT.joinpath("generated.nix"), "w+") as f:
         f.write(header)
@@ -280,7 +280,7 @@ def generate_nix(plugins: List[Tuple[str, Plugin]]):
 
 {"""
         )
-        for owner, plugin in sorted_plugins:
+        for owner, repo, plugin in sorted_plugins:
             if plugin.has_submodules:
                 submodule_attr = "\n      fetchSubmodules = true;"
             else:
@@ -292,7 +292,7 @@ def generate_nix(plugins: List[Tuple[str, Plugin]]):
     name = "{plugin.normalized_name}-{plugin.version}";
     src = fetchFromGitHub {{
       owner = "{owner}";
-      repo = "{plugin.name}";
+      repo = "{repo}";
       rev = "{plugin.commit}";
       sha256 = "{plugin.sha256}";{submodule_attr}
     }};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e582127ef474..8bcfc667da34 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -4,16 +4,22 @@ ajh17/Spacegray.vim
 albfan/nerdtree-git-plugin
 altercation/vim-colors-solarized
 alvan/vim-closetag
+alx741/vim-hindent
+alx741/vim-stylishask
 amiorin/ctrlp-z
 andreshazard/vim-logreview
 andsild/peskcolor.vim
 andviro/flake8-vim
 ap/vim-css-color
+artur-shaik/vim-javacomplete2
 bazelbuild/vim-bazel
 bbchung/clighter8
 benekastah/neomake
 bitc/vim-hdevtools
+bling/vim-bufferline
 bronson/vim-trailing-whitespace
+carlitux/deoplete-ternjs
+ccarpita/rtorrent-syntax-file
 cespare/vim-toml
 chemzqm/denite-extra
 chemzqm/denite-git
@@ -39,6 +45,7 @@ dracula/vim
 drmingdrmer/xptemplate
 eagletmt/ghcmod-vim
 eagletmt/neco-ghc
+easymotion/vim-easymotion
 editorconfig/editorconfig-vim
 ehamberg/vim-cute-python
 eikenb/acp
@@ -66,9 +73,12 @@ google/vim-jsonnet
 google/vim-maktaba
 gregsexton/gitv
 guns/xterm-color-table.vim
+haya14busa/incsearch-easymotion.vim
+haya14busa/incsearch.vim
 heavenshell/vim-jsdoc
 hecal3/vim-leader-guide
 honza/vim-snippets
+hsanson/vim-android
 idris-hackers/idris-vim
 inkarkat/vim-SyntaxRange
 int3/vim-extradite
@@ -91,6 +101,7 @@ jistr/vim-nerdtree-tabs
 jnurmine/zenburn
 jonbri/vim-colorstepper
 joonty/vim-xdebug
+JuliaEditorSupport/deoplete-julia
 JuliaEditorSupport/julia-vim
 junegunn/fzf.vim
 junegunn/goyo.vim
@@ -99,6 +110,7 @@ junegunn/vim-easy-align
 junegunn/vim-github-dashboard
 junegunn/vim-peekaboo
 justincampbell/vim-eighties
+justinmk/vim-dirvish
 KabbAmine/zeavim.vim
 kana/vim-niceblock
 kana/vim-operator-replace
@@ -110,6 +122,7 @@ kien/rainbow_parentheses.vim
 konfekt/fastfold
 kshenoy/vim-signature
 lambdalisue/vim-gista
+lambdalisue/vim-pager
 latex-box-team/latex-box
 leafgarland/typescript-vim
 ledger/vim-ledger
@@ -117,7 +130,7 @@ lepture/vim-jinja
 lervag/vimtex
 lfilho/cosco.vim
 LnL7/vim-nix
-lokaltog/vim-easymotion
+ludovicchabant/vim-gutentags
 ludovicchabant/vim-lawrencium
 luochen1990/rainbow
 lyokha/vim-xkbswitch
@@ -166,15 +179,19 @@ neovimhaskell/haskell-vim
 nixprime/cpsm
 noc7c9/vim-iced-coffee-script
 osyo-manga/shabadou.vim
+osyo-manga/vim-anzu
 osyo-manga/vim-textobj-multiblock
 osyo-manga/vim-watchdogs
 pangloss/vim-javascript
+parsonsmatt/intero-neovim
 peterhoeg/vim-qml
 plasticboy/vim-markdown
+powerman/vim-plugin-AnsiEsc
 python-mode/python-mode
 Quramy/tsuquyomi
 racer-rust/vim-racer
 rafi/awesome-vim-colorschemes
+raghur/vim-ghost
 raichoo/purescript-vim
 reedes/vim-pencil
 reedes/vim-wordy
@@ -196,6 +213,7 @@ sebastianmarkow/deoplete-rust
 sheerun/vim-polyglot
 shougo/context_filetype.vim
 shougo/denite.nvim
+Shougo/deol.nvim
 shougo/deoplete.nvim
 shougo/echodoc.vim
 shougo/neco-syntax
@@ -218,6 +236,7 @@ sk1418/last256
 slashmili/alchemist.vim
 t9md/vim-smalls
 takac/vim-hardtime
+ternjs/tern_for_vim
 terryma/vim-expand-region
 terryma/vim-multiple-cursors
 tex/vimpreviewpandoc
@@ -226,6 +245,7 @@ thinca/vim-prettyprint
 thinca/vim-quickrun
 thinca/vim-scouter
 thinca/vim-themis
+thinca/vim-visualstar
 tomasr/molokai
 tomlion/vim-solidity
 tomtom/tlib_vim
@@ -246,6 +266,7 @@ tpope/vim-sleuth
 tpope/vim-speeddating
 tpope/vim-surround
 tpope/vim-tbone
+tpope/vim-unimpaired
 tpope/vim-vinegar
 travitch/hasksyn
 twinside/vim-haskellconceal
@@ -254,6 +275,7 @@ tyru/caw.vim
 tyru/open-browser.vim
 ujihisa/neco-look
 valloric/youcompleteme
+vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
 vimoutliner/vimoutliner
@@ -288,6 +310,7 @@ xolox/vim-easytags
 xolox/vim-misc
 xuhdev/vim-latex-live-preview
 zah/nim.vim
+zchee/deoplete-clang
 zchee/deoplete-go
 zchee/deoplete-jedi
 zig-lang/zig.vim

From fb4345384022232042f00626bd8b8adece2a8fc2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 10 Sep 2018 21:37:56 +0200
Subject: [PATCH 0714/3253] cloc: 1.76 -> 1.78

---
 pkgs/tools/misc/cloc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 97c0251d9d64..0eff3f0c3916 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "cloc-${version}";
-  version = "1.76";
+  version = "1.78";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    rev = "v${version}";
-    sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7";
+    rev = version;
+    sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2";
   };
 
   setSourceRoot = ''

From 5cb824f4c4d23cb6a9177700e8e6ccaa2ff116fb Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:08:48 +0200
Subject: [PATCH 0715/3253] arx-libertatis: 2017-10-30 -> 2018-08-26 (#46039)

---
 pkgs/games/arx-libertatis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index e000f743173b..1ac5ce5007d9 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "arx-libertatis-${version}";
-  version = "2017-10-30";
+  version = "2018-08-26";
 
   src = fetchFromGitHub {
     owner  = "arx";
     repo   = "ArxLibertatis";
-    rev    = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3";
-    sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5";
+    rev    = "7b551739cc22fa25dae83bcc1a2b784ddecc729c";
+    sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n";
   };
 
   buildInputs = [

From 50789a0b19ba7bb93c8b7bb6711f8870f4cfd9cd Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 10 Sep 2018 20:13:45 +0000
Subject: [PATCH 0716/3253] perlPackages: ZHF 18.09 (#46493)

---
 pkgs/top-level/perl-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d3bd223d412..6bf58f5db28d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2620,6 +2620,7 @@ let
     prePatch = ''
       # Attempts to use network.
       rm t/01-proxy-http.t
+      rm t/01-proxy-proc-safeexec.t
     '';
     meta = {
       description = "A generic connection to a hierarchical-structured data set";
@@ -9988,10 +9989,10 @@ let
     };
   };
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-7.93";
+    name = "Mojolicious-7.88";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d";
+      sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785";
     };
     meta = {
       homepage = https://mojolicious.org/;
@@ -11645,6 +11646,8 @@ let
       sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
     };
     buildInputs = [ pkgs.zookeeper_mt ];
+    # fix "error: format not a string literal and no format arguments [-Werror=format-security]"
+    hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format";
     NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
     NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
     meta = {

From aad2acfab7c210d8f14c299f3768c76c4bfc7b87 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:11:06 +0200
Subject: [PATCH 0717/3253] bsd-finger: add license

---
 pkgs/tools/networking/bsd-finger/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index 25f795d52c2c..d011665a492b 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
 
   preInstall = '' mkdir -p $out/man/man1 $out/bin '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.bsdOriginal;
   };
 }

From 19148bd2f19c5273506c4b5171c768d8ad0bd285 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:12:55 +0200
Subject: [PATCH 0718/3253] carddav-util: add license

---
 pkgs/tools/networking/carddav-util/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 86a13ba90e65..7cc89bebf477 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -31,9 +31,10 @@ stdenv.mkDerivation rec {
       --prefix PATH : "$prefix/bin:$PATH"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/ljanyst/carddav-util;
     description = "A CardDAV import/export utility";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.isc;
   };
 }

From 5d42f2b37fb68cd0805b0bff31f22d3e2f2f7306 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:14:40 +0200
Subject: [PATCH 0719/3253] cksfv: add license

---
 pkgs/tools/networking/cksfv/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index c14770fb32be..3098b091dc64 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "cksfv-1.3.14";
-  
+
   src = fetchurl {
     url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2";
     sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://zakalwe.fi/~shd/foss/cksfv/;
     description = "A tool for verifying files against a SFV checksum file";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.gpl2;
   };
 }

From 4dcdb693af38d6c091fea6bb5e06148c13de7728 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:15:57 +0200
Subject: [PATCH 0720/3253] dhcpd: add license

---
 pkgs/tools/networking/dhcpcd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 1fe29b8b96ff..a03d2a123932 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -34,10 +34,11 @@ stdenv.mkDerivation rec {
     find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = https://roy.marples.name/projects/dhcpcd;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ eelco fpletz ];
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ eelco fpletz ];
   };
 }

From 0f6134f8ad54b6171771a57398f3ee87445c4c16 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:20:19 +0200
Subject: [PATCH 0721/3253] dhcpdump: add license, update homepage

---
 pkgs/tools/networking/dhcpdump/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index af4b03ab700b..8ed9d1d1d706 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
     cp dhcpdump $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses";
-    homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://www.mavetju.org/unix/dhcpdump-man.php;
+    platforms = platforms.linux;
+    license = licenses.bsd2;
   };
 }

From 6d859b3b1e4dfa9abe43c995f889a9741c68ec0f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:22:10 +0200
Subject: [PATCH 0722/3253] driftnet: add license

---
 pkgs/tools/networking/driftnet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 5b39ca464601..bf0a43ce5153 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/deiv/driftnet;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From 28bac355998729b180248bdcd5856087c7764a7f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:23:27 +0200
Subject: [PATCH 0723/3253] fdm: add license

---
 pkgs/tools/networking/fdm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix
index 3984922abe28..54e205390666 100644
--- a/pkgs/tools/networking/fdm/default.nix
+++ b/pkgs/tools/networking/fdm/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux;
     homepage = https://github.com/nicm/fdm;
     downloadPage = https://github.com/nicm/fdm/releases;
+    license = licenses.isc;
   };
 }

From 460c0145e7fc313349a0912802ef606bb6e811b4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:26:36 +0200
Subject: [PATCH 0724/3253] gvpe: add license + homepage

---
 pkgs/tools/networking/gvpe/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index 07676cb18712..bcc68a2a19f7 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
     sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A protected multinode virtual network";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = with stdenv.lib.platforms; linux ++ freebsd;
+    homepage = http://software.schmorp.de/pkg/gvpe.html;
+    maintainers = [ maintainers.raskin ];
+    platforms = with platforms; linux ++ freebsd;
+    license = licenses.gpl2;
   };
 }

From bb27094df1b67c6fa7c6dcb4a3dc40b146f7dbb7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:28:59 +0200
Subject: [PATCH 0725/3253] libreswan: add license

---
 pkgs/tools/networking/libreswan/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index fd2461f51719..9a0b8c9ebf54 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -76,10 +76,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://libreswan.org;
     description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
-    maintainers = [ stdenv.lib.maintainers.afranchuk ];
+    platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.afranchuk ];
   };
 }

From a8bc08c6332eb7f9a02c86f35cb9e9a1a796d157 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:31:33 +0200
Subject: [PATCH 0726/3253] miniupnpc: add license

---
 pkgs/tools/networking/miniupnpc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 902055e0d798..b4c2a6ea3970 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -19,10 +19,11 @@ let
 
       makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
-      meta = {
+      meta = with stdenv.lib; {
         homepage = http://miniupnp.free.fr/;
         description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-        platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin;
+        platforms = with platforms; linux ++ freebsd ++ darwin;
+        license = licenses.bsd3;
       };
     };
 in {

From cdf332f254427568cc26de1f51ef1b31c0a1f6e8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:32:49 +0200
Subject: [PATCH 0727/3253] miniupnpd: add license

---
 pkgs/tools/networking/miniupnpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 07112d1497af..f794a4e27c7a 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://miniupnp.free.fr/;
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";
     platforms = platforms.linux;
+    license = licenses.bsd3;
   };
 }

From 4d24db6e0c568c0988c968a1bba1d8a4e9fae31b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:34:25 +0200
Subject: [PATCH 0728/3253] ncftp: add license

---
 pkgs/tools/networking/ncftp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix
index 0a0eadbfcba4..90ac44aa375a 100644
--- a/pkgs/tools/networking/ncftp/default.nix
+++ b/pkgs/tools/networking/ncftp/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.ncftp.com/ncftp/;
     maintainers = with maintainers; [ bjornfor ];
     platforms = platforms.unix;
+    license = licenses.clArtistic;
   };
 }

From 3f1849e29cb37facafac5690143130a57f1d2a9b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:40:21 +0200
Subject: [PATCH 0729/3253] philter: add license + homepage

---
 pkgs/tools/networking/philter/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index f8f37e05a72e..5dff64e27c5c 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -18,8 +18,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Mail sorter for Maildirs";
+    homepage = http://philter.sourceforge.net;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 
   passthru = {

From d2b062760dc390ee02a2a311e762fef0a88d6885 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:41:18 +0200
Subject: [PATCH 0730/3253] polygraph: add license

---
 pkgs/tools/networking/polygraph/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix
index c05e44fb1c07..0b679bc60b53 100644
--- a/pkgs/tools/networking/polygraph/default.nix
+++ b/pkgs/tools/networking/polygraph/default.nix
@@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openssl zlib ncurses ];
-  
+
   meta = with stdenv.lib; {
     homepage = http://www.web-polygraph.org;
     description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries";
     platforms = platforms.linux;
+    license = licenses.asl20;
     maintainers = [ maintainers.lethalman ];
   };
 }

From 44d84db9409de4215d53fd7912b7eb6d9c1b9a40 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:43:07 +0200
Subject: [PATCH 0731/3253] polysh: add license

---
 pkgs/tools/networking/polysh/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix
index b94ec8e429fa..2a70218f2879 100644
--- a/pkgs/tools/networking/polysh/default.nix
+++ b/pkgs/tools/networking/polysh/default.nix
@@ -11,14 +11,15 @@ buildPythonApplication rec {
           sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4";
         };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool to aggregate several remote shells into one";
     longDescription = ''
       Polysh is a tool to aggregate several remote shells into one. It
       is used to launch an interactive remote shell on many machines
       at once.
     '';
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    maintainers = [ maintainers.astsmtl ];
     homepage = http://guichaz.free.fr/polysh/;
+    license = licenses.gpl2;
   };
 }

From 50a7adf43a13b8db0e1e1b1b4b8e103b789819cc Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:44:15 +0200
Subject: [PATCH 0732/3253] pptpd: add license

---
 pkgs/tools/networking/pptpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix
index d5464b97a335..4c29cd949ee6 100644
--- a/pkgs/tools/networking/pptpd/default.nix
+++ b/pkgs/tools/networking/pptpd/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "The PPTP Server for Linux";
     platforms   = platforms.linux;
     maintainers = with maintainers; [ obadz ];
+    license = licenses.gpl2;
   };
 }

From ff633d166ff7380a4b1a84284ccbcfc6f31cb39a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:45:28 +0200
Subject: [PATCH 0733/3253] quicktun: add license

---
 pkgs/tools/networking/quicktun/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index ceee8cca1aae..3d7dc68e3578 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://wiki.ucis.nl/QuickTun;
     maintainers = [ maintainers.fpletz ];
     platforms = platforms.unix;
+    license = licenses.bsd2;
   };
 }

From 9e94e8ae4aef44f53cfc188e79c67e2096b69578 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:48:02 +0200
Subject: [PATCH 0734/3253] rp-pppoe: add license

---
 pkgs/tools/networking/rp-pppoe/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
index b2584a4f4974..2beb8aec3893 100644
--- a/pkgs/tools/networking/rp-pppoe/default.nix
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
     sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@'
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Roaring Penguin Point-to-Point over Ethernet tool";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
     homepage = https://www.roaringpenguin.com/products/pppoe;
+    license = licenses.gpl2Plus;
   };
 }

From 6e9477385476b83a9e4fe3435bb3b02e12d56ccf Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:49:56 +0200
Subject: [PATCH 0735/3253] vde2: add license

---
 pkgs/tools/networking/vde2/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 39674d22aa1d..ac87a5c10e9f 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -20,9 +20,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://vde.sourceforge.net/;
     description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From fc080c22f80a612c2a9ca59b640925ddba59b753 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:52:21 +0200
Subject: [PATCH 0736/3253] vlan: add license

---
 pkgs/tools/networking/vlan/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix
index 41ece0537ab4..1684da45ccc3 100644
--- a/pkgs/tools/networking/vlan/default.nix
+++ b/pkgs/tools/networking/vlan/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
       cp vconfig.8 $out/share/man/man8/
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "User mode programs to enable VLANs on Ethernet devices";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
 }

From 4e8871e7b4fdb3b3afc77df8bab7dc35595f4262 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 10 Sep 2018 21:55:44 +0200
Subject: [PATCH 0737/3253] webalizer: update meta data

---
 pkgs/tools/networking/webalizer/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index 67a95f32b619..e9b9452c7563 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation {
   preConfigure =
     ''
       substituteInPlace ./configure \
-        --replace "--static" "" 
+        --replace "--static" ""
     '';
 
-  buildInputs = [zlib libpng gd geoip db]; 
+  buildInputs = [zlib libpng gd geoip db];
 
   configureFlags = [
     "--enable-dns"
@@ -23,7 +23,10 @@ stdenv.mkDerivation {
     "--enable-shared"
   ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Web server log file analysis program";
+    homepage = http://www.webalizer.org;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From fd7e69be1c71ec8d8e1d87a93ae121915fb84212 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:17:00 +0200
Subject: [PATCH 0738/3253] antimony: 0.9.3 -> 2018-10-17 (#46486)

---
 .../graphics/antimony/default.nix             | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 334a5a33dadf..aa6305ce8311 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,29 +1,34 @@
-{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }:
+{ stdenv, fetchFromGitHub, libpng, python3
+, libGLU_combined, qtbase, ncurses
+, cmake, flex, lemon
+}:
 
 let
-  gitRev    = "020910c25614a3752383511ede5a1f5551a8bd39";
-  gitBranch = "master";
+  gitRev    = "60a58688e552f12501980c4bdab034ab0f2ba059";
+  gitBranch = "develop";
   gitTag    = "0.9.3";
 in
   stdenv.mkDerivation rec {
     name    = "antimony-${version}";
-    version = gitTag;
+    version = "2018-07-17";
 
     src = fetchFromGitHub {
-      owner = "mkeeter";
-      repo = "antimony";
-      rev = gitTag;
-      sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4";
+      owner  = "mkeeter";
+      repo   = "antimony";
+      rev    = gitRev;
+      sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl";
     };
 
     patches = [ ./paths-fix.patch ];
 
     postPatch = ''
-       sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+       sed -i "s,/usr/local,$out,g" \
+       app/CMakeLists.txt app/app/app.cpp app/app/main.cpp
+       sed -i "s,python-py35,python36," CMakeLists.txt
     '';
 
     buildInputs = [
-      libpng python3 (boost.override { python = python3; })
+      libpng python3 python3.pkgs.boost
       libGLU_combined qtbase ncurses
     ];
 
@@ -41,6 +46,7 @@ in
       description = "A computer-aided design (CAD) tool from a parallel universe";
       homepage    = "https://github.com/mkeeter/antimony";
       license     = licenses.mit;
+      maintainers = with maintainers; [ rnhmjoj ];
       platforms   = platforms.linux;
     };
   }

From bc036397a3ff83a01df820e232ef845cb16ed6bb Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 22:36:14 +0200
Subject: [PATCH 0739/3253] pythonPackages.pydub: fix aarch64 build

one test failed due to rounding errors, disable it
---
 pkgs/development/python-modules/pydub/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix
index e9ce74263c2c..0770c78b674b 100644
--- a/pkgs/development/python-modules/pydub/default.nix
+++ b/pkgs/development/python-modules/pydub/default.nix
@@ -11,6 +11,13 @@ buildPythonPackage rec {
     sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv";
   };
 
+
+  # disable a test that fails on aarch64 due to rounding errors
+  postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
+    substituteInPlace test/test.py \
+      --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
+  '';
+
   checkInputs = [ scipy ffmpeg-full ];
 
   checkPhase = ''

From bd02a1931a4d8c6bf239de534890c64b16a33ab4 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 10 Sep 2018 22:42:23 +0200
Subject: [PATCH 0740/3253] pythonPackages.pyfakefs: fix darwin build

One test failed on darwin due to case-insensitive file system,
disable it.
---
 pkgs/development/python-modules/pyfakefs/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix
index 3208a512e591..64d547ce97ed 100644
--- a/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/pkgs/development/python-modules/pyfakefs/default.nix
@@ -22,7 +22,11 @@ buildPythonPackage rec {
       --replace "test_append_mode_tell_linux_windows" "notest_append_mode_tell_linux_windows"
     substituteInPlace pyfakefs/tests/fake_filesystem_unittest_test.py \
       --replace "test_copy_real_file" "notest_copy_real_file"
-  '';
+  '' + (stdenv.lib.optionalString stdenv.isDarwin ''
+    # this test fails on darwin due to case-insensitive file system
+    substituteInPlace pyfakefs/tests/fake_os_test.py \
+      --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir"
+  '');
 
   checkInputs = [ pytest glibcLocales ];
 

From b1bee94d72128a9af79a08a0c1ae9e3932a45f7b Mon Sep 17 00:00:00 2001
From: Niclas <33751841+countingsort@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:53:30 +0200
Subject: [PATCH 0741/3253] bunny: 1.2 -> 1.3 (#46498)

---
 pkgs/tools/package-management/bunny/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix
index 623c7a5b2f6b..cb99e5af055b 100644
--- a/pkgs/tools/package-management/bunny/default.nix
+++ b/pkgs/tools/package-management/bunny/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bunny-${version}";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitLab {
     owner = "tim241";
     repo = "bunny";
     rev = version;
-    sha256 = "13qsgv4n4c96pgm2l5kvwxpk97x2jpk3wp2m56vdj07hcgywgj3h";
+    sha256 = "0nh2h5kj9b0nkb6yrzf4if7anfdmy9vijzy4bl3s7qck0nzbpy8s";
   };
 
   dontBuild = true;

From 2047e28c7fe94a8541f19ac2c57cf4866a318c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Sep 2018 18:00:14 -0300
Subject: [PATCH 0742/3253] lxqt: mv contents of base, core and optional to
 parent directory (#46484)

---
 .../{optional => }/compton-conf/default.nix   |  0
 pkgs/desktops/lxqt/default.nix                | 62 +++++++++----------
 .../lxqt/{core => }/libfm-qt/default.nix      |  0
 .../lxqt/{base => }/liblxqt/default.nix       |  0
 .../lxqt/{base => }/libqtxdg/default.nix      |  0
 .../lxqt/{base => }/libsysstat/default.nix    |  0
 .../{optional => }/lximage-qt/default.nix     |  0
 .../lxqt/{core => }/lxqt-about/default.nix    |  0
 .../lxqt/{core => }/lxqt-admin/default.nix    |  0
 .../{base => }/lxqt-build-tools/default.nix   |  0
 .../lxqt/{core => }/lxqt-config/default.nix   |  0
 .../{core => }/lxqt-globalkeys/default.nix    |  0
 .../lxqt/{core => }/lxqt-l10n/default.nix     |  0
 .../{core => }/lxqt-notificationd/default.nix |  0
 .../lxqt-openssh-askpass/default.nix          |  0
 .../lxqt/{core => }/lxqt-panel/default.nix    |  0
 .../{core => }/lxqt-policykit/default.nix     |  0
 .../lxqt-powermanagement/default.nix          |  0
 .../lxqt/{core => }/lxqt-qtplugin/default.nix |  0
 .../lxqt/{core => }/lxqt-runner/default.nix   |  0
 .../lxqt/{core => }/lxqt-session/default.nix  |  0
 .../lxqt/{core => }/lxqt-sudo/default.nix     |  0
 .../lxqt/{core => }/lxqt-themes/default.nix   |  0
 .../lxqt/{optional => }/obconf-qt/default.nix |  0
 .../{core => }/pavucontrol-qt/default.nix     |  0
 .../lxqt/{core => }/pcmanfm-qt/default.nix    |  0
 .../lxqt/{optional => }/qlipper/default.nix   |  0
 .../lxqt/{optional => }/qps/default.nix       |  0
 .../lxqt/{optional => }/qterminal/default.nix |  0
 .../lxqt/{core => }/qtermwidget/0.7.1.nix     |  0
 .../lxqt/{core => }/qtermwidget/default.nix   |  0
 .../{optional => }/screengrab/default.nix     |  0
 32 files changed, 31 insertions(+), 31 deletions(-)
 rename pkgs/desktops/lxqt/{optional => }/compton-conf/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/libfm-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/liblxqt/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/libqtxdg/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/libsysstat/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/lximage-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-about/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-admin/default.nix (100%)
 rename pkgs/desktops/lxqt/{base => }/lxqt-build-tools/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-config/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-globalkeys/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-l10n/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-notificationd/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-openssh-askpass/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-panel/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-policykit/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-powermanagement/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-qtplugin/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-runner/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-session/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-sudo/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/lxqt-themes/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/obconf-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/pavucontrol-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/pcmanfm-qt/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qlipper/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qps/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/qterminal/default.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/qtermwidget/0.7.1.nix (100%)
 rename pkgs/desktops/lxqt/{core => }/qtermwidget/default.nix (100%)
 rename pkgs/desktops/lxqt/{optional => }/screengrab/default.nix (100%)

diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/compton-conf/default.nix
rename to pkgs/desktops/lxqt/compton-conf/default.nix
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 015807ec684e..62b8aaf25abe 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -7,44 +7,44 @@ let
     # - https://github.com/lxqt/lxqt/wiki/Building-from-source
 
     ### BASE
-    libqtxdg = callPackage ./base/libqtxdg { };
-    lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
-    libsysstat = callPackage ./base/libsysstat { };
-    liblxqt = callPackage ./base/liblxqt { };
+    libqtxdg = callPackage ./libqtxdg { };
+    lxqt-build-tools = callPackage ./lxqt-build-tools { };
+    libsysstat = callPackage ./libsysstat { };
+    liblxqt = callPackage ./liblxqt { };
 
     ### CORE 1
-    libfm-qt = callPackage ./core/libfm-qt { };
-    lxqt-about = callPackage ./core/lxqt-about { };
-    lxqt-admin = callPackage ./core/lxqt-admin { };
-    lxqt-config = callPackage ./core/lxqt-config { };
-    lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
-    lxqt-l10n = callPackage ./core/lxqt-l10n { };
-    lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
-    lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { };
-    lxqt-policykit = callPackage ./core/lxqt-policykit { };
-    lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { };
-    lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { };
-    lxqt-session = callPackage ./core/lxqt-session { };
-    lxqt-sudo = callPackage ./core/lxqt-sudo { };
-    lxqt-themes = callPackage ./core/lxqt-themes { };
-    pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { };
-    qtermwidget = callPackage ./core/qtermwidget { };
+    libfm-qt = callPackage ./libfm-qt { };
+    lxqt-about = callPackage ./lxqt-about { };
+    lxqt-admin = callPackage ./lxqt-admin { };
+    lxqt-config = callPackage ./lxqt-config { };
+    lxqt-globalkeys = callPackage ./lxqt-globalkeys { };
+    lxqt-l10n = callPackage ./lxqt-l10n { };
+    lxqt-notificationd = callPackage ./lxqt-notificationd { };
+    lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { };
+    lxqt-policykit = callPackage ./lxqt-policykit { };
+    lxqt-powermanagement = callPackage ./lxqt-powermanagement { };
+    lxqt-qtplugin = callPackage ./lxqt-qtplugin { };
+    lxqt-session = callPackage ./lxqt-session { };
+    lxqt-sudo = callPackage ./lxqt-sudo { };
+    lxqt-themes = callPackage ./lxqt-themes { };
+    pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { };
+    qtermwidget = callPackage ./qtermwidget { };
     # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0
-    qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { };
+    qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { };
 
     ### CORE 2
-    lxqt-panel = callPackage ./core/lxqt-panel { };
-    lxqt-runner = callPackage ./core/lxqt-runner { };
-    pcmanfm-qt = callPackage ./core/pcmanfm-qt { };
+    lxqt-panel = callPackage ./lxqt-panel { };
+    lxqt-runner = callPackage ./lxqt-runner { };
+    pcmanfm-qt = callPackage ./pcmanfm-qt { };
 
     ### OPTIONAL
-    qterminal = callPackage ./optional/qterminal { };
-    compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
-    obconf-qt = callPackage ./optional/obconf-qt { };
-    lximage-qt = callPackage ./optional/lximage-qt { };
-    qps = callPackage ./optional/qps { };
-    screengrab = callPackage ./optional/screengrab { };
-    qlipper = callPackage ./optional/qlipper { };
+    qterminal = callPackage ./qterminal { };
+    compton-conf = pkgs.qt5.callPackage ./compton-conf { };
+    obconf-qt = callPackage ./obconf-qt { };
+    lximage-qt = callPackage ./lximage-qt { };
+    qps = callPackage ./qps { };
+    screengrab = callPackage ./screengrab { };
+    qlipper = callPackage ./qlipper { };
 
     preRequisitePackages = [
       pkgs.gvfs # virtual file systems support for PCManFM-QT
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/libfm-qt/default.nix
rename to pkgs/desktops/lxqt/libfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/liblxqt/default.nix
rename to pkgs/desktops/lxqt/liblxqt/default.nix
diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libqtxdg/default.nix
rename to pkgs/desktops/lxqt/libqtxdg/default.nix
diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/libsysstat/default.nix
rename to pkgs/desktops/lxqt/libsysstat/default.nix
diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/lximage-qt/default.nix
rename to pkgs/desktops/lxqt/lximage-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-about/default.nix
rename to pkgs/desktops/lxqt/lxqt-about/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-admin/default.nix
rename to pkgs/desktops/lxqt/lxqt-admin/default.nix
diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
rename to pkgs/desktops/lxqt/lxqt-build-tools/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-config/default.nix
rename to pkgs/desktops/lxqt/lxqt-config/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
rename to pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
rename to pkgs/desktops/lxqt/lxqt-l10n/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
rename to pkgs/desktops/lxqt/lxqt-notificationd/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
rename to pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-panel/default.nix
rename to pkgs/desktops/lxqt/lxqt-panel/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
rename to pkgs/desktops/lxqt/lxqt-policykit/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
rename to pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
rename to pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-runner/default.nix
rename to pkgs/desktops/lxqt/lxqt-runner/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-session/default.nix
rename to pkgs/desktops/lxqt/lxqt-session/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
rename to pkgs/desktops/lxqt/lxqt-sudo/default.nix
diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/lxqt-themes/default.nix
rename to pkgs/desktops/lxqt/lxqt-themes/default.nix
diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/obconf-qt/default.nix
rename to pkgs/desktops/lxqt/obconf-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
rename to pkgs/desktops/lxqt/pavucontrol-qt/default.nix
diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
rename to pkgs/desktops/lxqt/pcmanfm-qt/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qlipper/default.nix
rename to pkgs/desktops/lxqt/qlipper/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qps/default.nix
rename to pkgs/desktops/lxqt/qps/default.nix
diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/qterminal/default.nix
rename to pkgs/desktops/lxqt/qterminal/default.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix
rename to pkgs/desktops/lxqt/qtermwidget/0.7.1.nix
diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/core/qtermwidget/default.nix
rename to pkgs/desktops/lxqt/qtermwidget/default.nix
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
similarity index 100%
rename from pkgs/desktops/lxqt/optional/screengrab/default.nix
rename to pkgs/desktops/lxqt/screengrab/default.nix

From cc68ac9807683e91df2c2b895243ccc402f4f849 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 10 Sep 2018 22:45:36 +0200
Subject: [PATCH 0743/3253] zsh: 5.6 -> 5.6.1

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
---
 pkgs/shells/zsh/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 100657312da0..656414aabfcc 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-  version = "5.6";
+  version = "5.6.1";
 
   documentation = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "1kz57w4l0jank67a2hiz6y5idbff5avwg52zdxx3qnflkjvkn2kx";
+    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
+    sha256 = "15j8w1ddfparfnqymx67rycgfdl50xcrnd6p1d6q9n3n0462jjmn";
   };
 
 in
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   name = "zsh-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "1vik7s3q5hvazvgw4jm4b90qlk6zcry0s314xw1liarspkd721g3";
+    url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
+    sha256 = "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm";
   };
 
   buildInputs = [ ncurses pcre ];

From 1cf44e6a07b5ba66dcf015bb729d44b6418f0486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 10 Sep 2018 22:41:23 +0100
Subject: [PATCH 0744/3253] opentracker: use https for downloading

---
 pkgs/applications/networking/p2p/opentracker/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index 83ddb456153c..46c482818f8b 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "opentracker-2018-05-26";
 
   src = fetchgit {
-    url = "git://erdgeist.org/opentracker";
+    url = "https://erdgeist.org/gitweb/opentracker";
     rev = "6411f1567f64248b0d145493c2e61004d2822623";
     sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j";
   };
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   buildInputs = [ libowfat zlib ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc
-    cp opentracker $out/bin
-    cp opentracker.conf.sample $out/share/doc
+    runHook preInstall
+    install -D opentracker $out/bin/opentracker
+    install -D opentracker.conf.sample $out/share/doc/opentracker.conf.sample
     runHook postInstall
   '';
 

From 6d8a48e5856c3f686da11cba9278560f458e9148 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Sep 2018 15:07:37 -0700
Subject: [PATCH 0745/3253] gitAndTools.svn-all-fast-export: 1.0.12 -> 1.0.13
 (#46173)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
svn-all-fast-export
---
 .../git-and-tools/svn-all-fast-export/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 17fb74945dc4..35c6d33d74da 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
 
 let
-  version = "1.0.12";
+  version = "1.0.13";
 in
 stdenv.mkDerivation {
   name = "svn-all-fast-export-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v";
+    sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From 19ae5948a689d73043f99d55ce9210110ed50996 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Sep 2018 15:08:41 -0700
Subject: [PATCH 0746/3253] papirus-icon-theme: 20180401 -> 20180816 (#46230)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
papirus-icon-theme
---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index c0f4727f48fb..1efd4145ce03 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "papirus-icon-theme-${version}";
-  version = "20180401";
+  version = "20180816";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = version;
-    sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil";
+    sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk";
   };
 
   nativeBuildInputs = [ gtk3 ];

From a026fea9e6443239060e747b320cab8028ad61ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Sep 2018 15:12:50 -0700
Subject: [PATCH 0747/3253] mate.mate-session-manager: 1.20.1 -> 1.21.0
 (#46239)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mate-session-manager
---
 pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 47657375bbab..38881e425762 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-session-manager-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5";
+    sha256 = "1556kn4sk41x70m8cx200g4c9q3wndnhdxj4vp93sw262yqmk9mn";
   };
 
   nativeBuildInputs = [

From dc6b36b994c05debb881c049fadaae353507e0b7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Sep 2018 00:25:49 +0200
Subject: [PATCH 0748/3253] perl-Module-Build-XSUtil: fix darwin build

While building the tests LD gets called with -mmacosx-version-min=10.10
which is a CC flag, causing the build to fail with LD=ld.  This is
pretty common with perl packages.

/cc ZHF #45961
---
 pkgs/top-level/perl-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6bf58f5db28d..14ac1ca2e2c6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9650,11 +9650,12 @@ let
       sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh";
     };
     buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ];
+    propagatedBuildInputs = [ DevelCheckCompiler ];
+    perlPreHook = "export LD=$CC";
     meta = {
       description = "A Module::Build class for building XS modules";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    propagatedBuildInputs = [ DevelCheckCompiler ];
   };
 
   ModuleCPANTSAnalyse = buildPerlPackage rec {

From 5e8fd8792b043c437c07e353f20a6ccb09f8283d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Sep 2018 00:48:15 +0200
Subject: [PATCH 0749/3253] perl-Mouse: fix darwin build

/cc ZHF #45961
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14ac1ca2e2c6..2ec4efed8863 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10884,6 +10884,7 @@ let
       sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l";
     };
     buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ];
+    perlPreHook = "export LD=$CC";
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";
     hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
   };

From 7d238e6da8a2146ab3c76d52b5ec2fd6dd59444e Mon Sep 17 00:00:00 2001
From: Armando Ramirez <armando.m.ramirez@gmail.com>
Date: Mon, 10 Sep 2018 22:51:56 +0000
Subject: [PATCH 0750/3253] Allow doCheck config of buildGoPackage

---
 pkgs/development/go-modules/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 9b6f80e0f837..3faa4c268ac0 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -170,6 +170,7 @@ go.stdenv.mkDerivation (
     runHook postBuild
   '';
 
+  doCheck = args.doCheck or false;
   checkPhase = args.checkPhase or ''
     runHook preCheck
 

From f2836b36228800851237ec4a958da61ada355e30 Mon Sep 17 00:00:00 2001
From: Marica Odagaki <ento.entotto@gmail.com>
Date: Mon, 10 Sep 2018 16:52:14 -0800
Subject: [PATCH 0751/3253] aws-vault: 4.1.0 -> 4.3.0

---
 pkgs/tools/admin/aws-vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 4f8b1bc1368f..6e0bf2d147a3 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -2,7 +2,7 @@
 buildGoPackage rec {
   name = "${pname}-${version}";
   pname = "aws-vault";
-  version = "4.1.0";
+  version = "4.3.0";
 
   goPackagePath = "github.com/99designs/${pname}";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "99designs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04cdynqmkbs7bkl2aay4sjxq49i90fg048lw0ssw1fpwldbvnl6j";
+    sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp";
   };
 
   meta = with lib; {

From 962712524eba87ab3993e2095a8387b1b8ee7b72 Mon Sep 17 00:00:00 2001
From: Marica Odagaki <ento.entotto@gmail.com>
Date: Mon, 10 Sep 2018 16:52:53 -0800
Subject: [PATCH 0752/3253] aws-vault: pass the app version to the linker

Otherwise, "aws-vault --version" just outputs "dev"
---
 pkgs/tools/admin/aws-vault/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 6e0bf2d147a3..71360f8030c5 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -13,6 +13,12 @@ buildGoPackage rec {
     sha256 = "0cwzvw1rcvg7y3m8dahr9r05s4i9apnfw5xhiaf0rlkdh3vy33wp";
   };
 
+  # set the version. see: aws-vault's Makefile
+  buildFlagsArray = ''
+    -ldflags=
+    -X main.Version=v${version}
+  '';
+
   meta = with lib; {
     description = "A vault for securely storing and accessing AWS credentials in development environments";
     homepage = "https://github.com/99designs/aws-vault";

From bc7c56f2a499d41f508793399f116de38dfac9e4 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Tue, 11 Sep 2018 03:06:29 +0200
Subject: [PATCH 0753/3253] taskjuggler: 3.5.0 -> 3.6.0

---
 .../misc/taskjuggler/Gemfile.lock             | 14 ++--
 .../applications/misc/taskjuggler/default.nix | 13 ++--
 pkgs/applications/misc/taskjuggler/gemset.nix | 66 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock
index d1642e76fa65..ebd04c20ea6d 100644
--- a/pkgs/applications/misc/taskjuggler/Gemfile.lock
+++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock
@@ -1,15 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    taskjuggler (3.5.0)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.1)
+    taskjuggler (3.6.0)
       mail (>= 2.4.3)
       term-ansicolor (>= 1.0.7)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    tins (1.6.0)
+    tins (1.16.3)
 
 PLATFORMS
   ruby
@@ -18,4 +18,4 @@ DEPENDENCIES
   taskjuggler
 
 BUNDLED WITH
-   1.10.5
+   1.14.6
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
index c5429b6c8510..f3f9285b312d 100644
--- a/pkgs/applications/misc/taskjuggler/default.nix
+++ b/pkgs/applications/misc/taskjuggler/default.nix
@@ -1,16 +1,21 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp, ruby }:
 
-bundlerEnv {
-  name = "taskjuggler-3.5.0";
+bundlerApp {
+  pname = "taskjuggler";
 
   inherit ruby;
   gemdir = ./.;
 
+  exes = [
+    "tj3" "tj3client" "tj3d" "tj3man" "tj3ss_receiver" "tj3ss_sender"
+    "tj3ts_receiver" "tj3ts_sender" "tj3ts_summary" "tj3webd"
+  ];
+
   meta = {
-    broken = true; # needs ruby 2.0
     description = "A modern and powerful project management tool";
     homepage    = http://taskjuggler.org/;
     license     = lib.licenses.gpl2;
     platforms   = lib.platforms.unix;
+    maintainers = [ lib.maintainers.manveru ];
   };
 }
diff --git a/pkgs/applications/misc/taskjuggler/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix
index e65ab3451a62..24c1e4311777 100644
--- a/pkgs/applications/misc/taskjuggler/gemset.nix
+++ b/pkgs/applications/misc/taskjuggler/gemset.nix
@@ -1,47 +1,55 @@
 {
-  "mail" = {
-    version = "2.6.3";
+  mail = {
+    dependencies = ["mini_mime"];
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";
       type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
     };
-    dependencies = [
-      "mime-types"
-    ];
+    version = "2.7.0";
   };
-  "mime-types" = {
-    version = "2.6.1";
+  mini_mime = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
       type = "gem";
-      sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv";
     };
+    version = "1.0.1";
   };
-  "taskjuggler" = {
-    version = "3.5.0";
+  taskjuggler = {
+    dependencies = ["mail" "term-ansicolor"];
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "0ky3cydl3szhdyxsy4k6zxzjlbll7mlq025aj6xd5jmh49k3pfbp";
       type = "gem";
-      sha256 = "0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2";
     };
-    dependencies = [
-      "mail"
-      "term-ansicolor"
-    ];
+    version = "3.6.0";
   };
-  "term-ansicolor" = {
-    version = "1.3.2";
+  term-ansicolor = {
+    dependencies = ["tins"];
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "1b1wq9ljh7v3qyxkk8vik2fqx2qzwh5lval5f92llmldkw7r7k7b";
       type = "gem";
-      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
     };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "tins" = {
     version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
-    };
   };
-}
+  tins = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["http://rubygems.org"];
+      sha256 = "0g95xs4nvx5n62hb4fkbkd870l9q3y9adfc4h8j21phj9mxybkb8";
+      type = "gem";
+    };
+    version = "1.16.3";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40440f1b379f..4cc58a009fba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18794,7 +18794,7 @@ with pkgs;
   teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
-  uaskjuggler = callPackage ../applications/misc/taskjuggler { };
+  taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
   tasknc = callPackage ../applications/misc/tasknc { };
 

From f384fdb24091c028c23a977ad0f463c90b585c30 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 11 Sep 2018 10:01:45 +0800
Subject: [PATCH 0754/3253] pulseaudio-modules-bt: init at unstable-2018-09-11

---
 .../audio/pulseaudio-modules-bt/default.nix   | 63 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/default.nix

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
new file mode 100644
index 000000000000..e3d07fcc2457
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -0,0 +1,63 @@
+{ stdenv
+, runCommand
+, fetchFromGitHub
+, libpulseaudio
+, pulseaudio
+, pkgconfig
+, libtool
+, cmake
+, bluez
+, dbus
+, sbc
+}:
+
+let
+  pulseSources = runCommand "pulseaudio-sources" {} ''
+    mkdir $out
+    tar -xf ${pulseaudio.src}
+    mv pulseaudio*/* $out/
+  '';
+
+in stdenv.mkDerivation rec {
+  name = "pulseaudio-modules-bt-${version}";
+  version = "unstable-2018-09-11";
+
+  src = fetchFromGitHub {
+    owner = "EHfive";
+    repo = "pulseaudio-modules-bt";
+    rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc";
+    sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    cmake
+  ];
+
+  buildInputs = [
+    libpulseaudio
+    pulseaudio
+    libtool
+    bluez
+    dbus
+    sbc
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-L${pulseaudio}/lib/pulseaudio"
+  ];
+
+  prePatch = ''
+    rm -r pa
+    ln -s ${pulseSources} pa
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/EHfive/pulseaudio-modules-bt;
+    description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ adisbladis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40440f1b379f..249e96610841 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13706,6 +13706,8 @@ with pkgs;
 
   bluez5 = callPackage ../os-specific/linux/bluez { };
 
+  pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { };
+
   bluez = bluez5;
 
   inherit (python3Packages) bedup;

From 36b5ffa40bb4cfd98c86e94a396add4f5d3b9f5a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:28:05 -0500
Subject: [PATCH 0755/3253] nodejs: use https for downloading

---
 pkgs/development/web/nodejs/nodejs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index b2ee7528814f..ea764ef22e6e 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -42,7 +42,7 @@ in
     name = "${baseName}-${version}";
 
     src = fetchurl {
-      url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
+      url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz";
       inherit sha256;
     };
 

From bfdfb73ff154967e80caa98e8717993b037383dd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:28:20 -0500
Subject: [PATCH 0756/3253] nodejs-6_x: 6.14.3 -> 6.14.4

---
 pkgs/development/web/nodejs/v6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 2e94923441fc..7250613e8628 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "6.14.3";
-    sha256 = "1jbrfk875aimm65wni059rrydmhp4z0hrxskq3ci6jvykxr8gwg3";
+    version = "6.14.4";
+    sha256 = "03zc6jhid6jyi871zlcrkjqffmrpxh01z2xfsl3xp2vzg2czqjws";
   }

From d24f81b825935dee3ce6e8019036a3abdc1a9695 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Mon, 10 Sep 2018 21:33:19 -0700
Subject: [PATCH 0757/3253] bazel: 0.16.0 -> 0.16.1

---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 49d6abdc0098..ff9cc3eb45aa 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  version = "0.16.0";
+  version = "0.16.1";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1ca9pncnj6v4r1kvgxys7607wpz4d2ic6g0i7lpsc2zg2qwmjc67";
+    sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9";
   };
 
   sourceRoot = ".";

From 2430a13bcaf96a9516e9347a4b675bb712e863bf Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 11 Sep 2018 02:23:16 -0400
Subject: [PATCH 0758/3253] installer: refactor

---
 .../cd-dvd/installation-cd-graphical-base.nix | 49 +++++++++++++++
 .../installation-cd-graphical-gnome.nix       | 63 +------------------
 .../cd-dvd/installation-cd-graphical-kde.nix  | 47 +++-----------
 3 files changed, 61 insertions(+), 98 deletions(-)
 create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
new file mode 100644
index 000000000000..228ef371d252
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -0,0 +1,49 @@
+# This module contains the basic configuration for building a graphical NixOS
+# installation CD.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ./installation-cd-base.nix ];
+
+  services.xserver = {
+    enable = true;
+
+    # Don't start the X server by default.
+    autorun = mkForce false;
+
+    # Automatically login as root.
+    displayManager.slim = {
+      enable = true;
+      defaultUser = "root";
+      autoLogin = true;
+    };
+
+  };
+
+  # Provide networkmanager for easy wireless configuration.
+  networking.networkmanager.enable = true;
+  networking.wireless.enable = mkForce false;
+
+  # KDE complains if power management is disabled (to be precise, if
+  # there is no power management backend such as upower).
+  powerManagement.enable = true;
+
+  environment.systemPackages = [
+    # Include gparted for partitioning disks.
+    pkgs.gparted
+
+    # Include some editors.
+    pkgs.vim
+    pkgs.bvi # binary editor
+    pkgs.joe
+
+    # Firefox for reading the manual.
+    pkgs.firefox
+
+    pkgs.glxinfo
+  ];
+
+}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 4c4e69d60d9c..42b5ec882272 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -6,47 +6,11 @@
 with lib;
 
 {
-  imports = [ ./installation-cd-base.nix ];
+  imports = [ ./installation-cd-graphical-base.nix ];
 
-  services.xserver = {
-    enable = true;
-    # GDM doesn't start in virtual machines with ISO
-    displayManager.slim = {
-      enable = true;
-      defaultUser = "root";
-      autoLogin = true;
-    };
-    desktopManager.gnome3 = {
-      enable = true;
-      extraGSettingsOverrides = ''
-        [org.gnome.desktop.background]
-        show-desktop-icons=true
+  services.xserver.desktopManager.gnome3.enable = true;
 
-        [org.gnome.nautilus.desktop]
-        trash-icon-visible=false
-        volumes-visible=false
-        home-icon-visible=false
-        network-icon-visible=false
-      '';
-
-      extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];
-    };
-  };
-
-  environment.systemPackages =
-    [ # Include gparted for partitioning disks.
-      pkgs.gparted
-
-      # Include some editors.
-      pkgs.vim
-      pkgs.bvi # binary editor
-      pkgs.joe
-
-      pkgs.glxinfo
-    ];
-
-  # Don't start the X server by default.
-  services.xserver.autorun = mkForce false;
+  services.xserver.displayManager.slim.enable = mkForce false;
 
   # Auto-login as root.
   services.xserver.displayManager.gdm.autoLogin = {
@@ -54,25 +18,4 @@ with lib;
     user = "root";
   };
 
-  system.activationScripts.installerDesktop = let
-    # Must be executable
-    desktopFile = pkgs.writeScript "nixos-manual.desktop" ''
-      [Desktop Entry]
-      Version=1.0
-      Type=Link
-      Name=NixOS Manual
-      URL=${config.system.build.manual.manual}/share/doc/nixos/index.html
-      Icon=system-help
-    '';
-
-  # use cp and chmod +x, we must be sure the apps are in the nix store though
-  in ''
-    mkdir -p /root/Desktop
-    ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
-    cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
-    chmod a+rx /root/Desktop/gnome-terminal.desktop
-    cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
-    chmod a+rx /root/Desktop/gparted.desktop
-  '';
-
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index 63227d573495..f71ed46c7e9e 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -1,23 +1,14 @@
 # This module defines a NixOS installation CD that contains X11 and
-# KDE 5.
+# Plasma5.
 
 { config, lib, pkgs, ... }:
 
 with lib;
 
 {
-  imports = [ ./installation-cd-base.nix ];
+  imports = [ ./installation-cd-graphical-base.nix ];
 
   services.xserver = {
-    enable = true;
-
-    # Automatically login as root.
-    displayManager.slim = {
-      enable = true;
-      defaultUser = "root";
-      autoLogin = true;
-    };
-
     desktopManager.plasma5 = {
       enable = true;
       enableQt4Support = false;
@@ -27,34 +18,14 @@ with lib;
     synaptics.enable = true;
   };
 
-  environment.systemPackages =
-    [ pkgs.glxinfo
-
-      # Include gparted for partitioning disks.
-      pkgs.gparted
-
-      # Firefox for reading the manual.
-      pkgs.firefox
-
-      # Include some editors.
-      pkgs.vim
-      pkgs.bvi # binary editor
-      pkgs.joe
-    ];
-
-  # Provide networkmanager for easy wireless configuration.
-  networking.networkmanager.enable = true;
-  networking.wireless.enable = mkForce false;
-
-  # KDE complains if power management is disabled (to be precise, if
-  # there is no power management backend such as upower).
-  powerManagement.enable = true;
-
-  # Don't start the X server by default.
-  services.xserver.autorun = mkForce false;
+  environment.systemPackages = with pkgs; [
+    # Graphical text editor
+    kate
+  ];
 
   system.activationScripts.installerDesktop = let
-    desktopFile = pkgs.writeText "nixos-manual.desktop" ''
+
+    manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" ''
       [Desktop Entry]
       Version=1.0
       Type=Application
@@ -65,7 +36,7 @@ with lib;
 
   in ''
     mkdir -p /root/Desktop
-    ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
+    ln -sfT ${manualDesktopFile} /root/Desktop/nixos-manual.desktop
     ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
     ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
   '';

From a33df7750ef16440e4810440d40f63937bafc3ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Sep 2018 23:56:15 -0700
Subject: [PATCH 0759/3253] log4cplus: 1.2.0 -> 2.0.2 (#46233)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
log4cplus
---
 pkgs/development/libraries/log4cplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 3fdad73d9fa5..7a390021d1fa 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 let
-  name = "log4cplus-1.2.0";
+  name = "log4cplus-2.0.2";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
-    sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338";
+    sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4";
   };
 
   meta = {

From f201f8c3fdb51e3bf45cc2bcbcf982843c147c4f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 11 Sep 2018 11:15:03 +0200
Subject: [PATCH 0760/3253] pythonPackages.pytestflakes: fix build (#46500)

- disable a failing test case that looks broken
- remove pytestcache depencency that was dropped upstream
---
 pkgs/development/python-modules/pytest-flakes/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index f8823b966da0..52cfed14150a 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytestpep8, pytest, pyflakes, pytestcache }:
+, pytestpep8, pytest, pyflakes }:
 
 buildPythonPackage rec {
   pname = "pytest-flakes";
@@ -11,10 +11,11 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pytestpep8 pytest ];
-  propagatedBuildInputs = [ pyflakes pytestcache ];
+  propagatedBuildInputs = [ pyflakes ];
 
+  # disable one test case that looks broken
   checkPhase = ''
-    py.test test_flakes.py
+    py.test test_flakes.py -k 'not test_syntax_error'
   '';
 
   meta = with stdenv.lib; {

From 7a42623c23c3753c5f4a9edace3576a01b5bc543 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 10 Sep 2018 21:44:48 +0200
Subject: [PATCH 0761/3253] networking.hostId: fix cmd in description

1. Simplify the command by reading directly from /etc/machine-id which
is already a random, lower-case hex string
2. Previously, the command output could be too short because of missing
leading digits. This is now fixed.
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 20a740ce1f0c..815523093dde 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -341,7 +341,7 @@ in
         You should try to make this ID unique among your machines. You can
         generate a random 32-bit ID using the following commands:
 
-        <literal>cksum /etc/machine-id | while read c rest; do printf "%x" $c; done</literal>
+        <literal>head -c 8 /etc/machine-id</literal>
 
         (this derives it from the machine-id that systemd generates) or
 

From c8ccc433dfe372164387504587596defcf0b8578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Tue, 11 Sep 2018 10:38:04 +0100
Subject: [PATCH 0762/3253] nixos/hylafax: show correct option in warning
 message.

---
 nixos/modules/services/networking/hylafax/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/hylafax/default.nix b/nixos/modules/services/networking/hylafax/default.nix
index 6e28e8c5d8bc..4c63b822d165 100644
--- a/nixos/modules/services/networking/hylafax/default.nix
+++ b/nixos/modules/services/networking/hylafax/default.nix
@@ -21,7 +21,7 @@
       message = ''
         HylaFAX cannot be used without modems.
         Please define at least one modem with
-        <option>config.services.hylafax</option>.
+        <option>config.services.hylafax.modems</option>.
       '';
     }];
   };

From 14d98576045d566af5c3c5697181a12a80cceab7 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 11 Sep 2018 17:29:27 +0900
Subject: [PATCH 0763/3253] pythonPackages.khard: zsh autocompletion

'cos that's cool
---
 pkgs/applications/misc/khard/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 3c5184d54632..35c3c9748492 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -40,6 +40,10 @@ in with python.pkgs; buildPythonApplication rec {
     unidecode
   ];
 
+  postInstall = ''
+    install -D misc/zsh/_khard $out/share/zsh/site-functions/
+  '';
+
   # Fails; but there are no tests anyway.
   doCheck = false;
 

From d30c97096bf6c6faed7c5906ecb435a04f04871c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 11 Sep 2018 18:48:19 +0900
Subject: [PATCH 0764/3253] gitAndTools.git-extras: install zsh completion

because there are so many freaking commands !
---
 .../version-management/git-and-tools/git-extras/default.nix   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index 1ea60272c338..7b6dd8aacb44 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "DESTDIR=$(out) PREFIX=" ];
 
+  postInstall = ''
+    install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tj/git-extras;
     description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";

From 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 11 Sep 2018 12:04:00 +0200
Subject: [PATCH 0765/3253] Revert "top-level: Deprecate top-level
 `{build,host,target}Platform`"

This reverts commit e51f736076548459f36a1250de4bf6867f880b66.
---
 doc/cross-compilation.xml | 10 +++++++---
 pkgs/top-level/stage.nix  | 16 +++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b3..3b90596bcc2c 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,9 +47,13 @@
 
    <para>
     In Nixpkgs, these three platforms are defined as attribute sets under the
-    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and
-    <literal>targetPlatform</literal>. They are always defined as attributes in
-    the standard environment. That means one can access them like:
+    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
+    and <literal>targetPlatform</literal>. All three are always defined as
+    attributes in the standard environment, and at the top level. That means
+    one can get at them just like a dependency in a function that is imported
+    with <literal>callPackage</literal>:
+<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>
+    , or just off <varname>stdenv</varname>:
 <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
     .
    </para>
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index ff09fa5ad1fd..06978d1067bf 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -79,17 +79,11 @@ let
 
   # The old identifiers for cross-compiling. These should eventually be removed,
   # and the packages that rely on them refactored accordingly.
-  platformCompat = self: super: {
-    buildPlatform = lib.warn
-      "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`."
-      super.stdenv.buildPlatform;
-    hostPlatform = lib.warn
-      "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`."
-      super.stdenv.hostPlatform;
-    targetPlatform = lib.warn
-      "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`."
-      super.stdenv.targetPlatform;
-    inherit (super.stdenv.hostPlatform) system;
+  platformCompat = self: super: let
+    inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
+  in {
+    inherit buildPlatform hostPlatform targetPlatform;
+    inherit (buildPlatform) system;
   };
 
   splice = self: super: import ./splice.nix lib self (buildPackages != null);

From ed5283fcf54083464c38867c00d2e1e6b04f0330 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 11 Sep 2018 12:33:02 +0200
Subject: [PATCH 0766/3253] tor-browser-bundle-bin: 7.5.6 -> 8.0

---
 .../tor-browser-bundle-bin/default.nix        | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index ffa5d4472527..d922de7d6a55 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -14,7 +14,7 @@
 , freetype
 , gdk_pixbuf
 , glib
-, gtk2
+, gtk3
 , libxcb
 , libX11
 , libXext
@@ -70,7 +70,7 @@ let
     freetype
     gdk_pixbuf
     glib
-    gtk2
+    gtk3
     libxcb
     libX11
     libXext
@@ -101,7 +101,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.6";
+  version = "8.0";
 
   lang = "en-US";
 
@@ -111,7 +111,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s";
+      sha256 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79";
     };
 
     "i686-linux" = fetchurl {
@@ -119,7 +119,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461";
+      sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx";
     };
   };
 in
@@ -154,10 +154,14 @@ stdenv.mkDerivation rec {
     pushd "$TBB_IN_STORE"
 
     # Set ELF interpreter
-    for exe in firefox TorBrowser/Tor/tor ; do
+    for exe in firefox.real TorBrowser/Tor/tor ; do
+      echo "Setting ELF interpreter on $exe ..." >&2
       patchelf --set-interpreter "$interp" "$exe"
     done
 
+    # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
+    mv firefox.real firefox
+
     # The final libPath.  Note, we could split this into firefoxLibPath
     # and torLibPath for accuracy, but this is more convenient ...
     libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
@@ -219,7 +223,7 @@ stdenv.mkDerivation rec {
 
     // Insist on using IPC for communicating with Tor
     //
-    // Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
+    // Defaults to creating \$TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
     lockPref("extensions.torlauncher.control_port_use_ipc", true);
     lockPref("extensions.torlauncher.socks_port_use_ipc", true);
 
@@ -245,10 +249,6 @@ stdenv.mkDerivation rec {
     sed -i "$FONTCONFIG_FILE" \
         -e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>,"
 
-    # Move default extension overrides into distribution dir, to avoid
-    # having to synchronize between local state and store.
-    mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
-
     # Preload extensions by moving into the runtime instead of storing under the
     # user's profile directory.
     mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
@@ -384,11 +384,7 @@ stdenv.mkDerivation rec {
     cp $desktopItem/share/applications"/"* $out/share/applications
     sed -i $out/share/applications/torbrowser.desktop \
         -e "s,Exec=.*,Exec=$out/bin/tor-browser," \
-        -e "s,Icon=.*,Icon=$out/share/pixmaps/torbrowser.png,"
-
-    # Install icons
-    mkdir -p $out/share/pixmaps
-    cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
+        -e "s,Icon=.*,Icon=web-browser,"
 
     # Check installed apps
     echo "Checking bundled Tor ..."

From 35df0f7f0cd0bf8c504c5287144d5fe1acd491db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 11 Sep 2018 12:47:16 +0100
Subject: [PATCH 0767/3253] dep2nix: 0.0.1 -> 0.0.2

---
 pkgs/development/tools/dep2nix/default.nix |  10 +-
 pkgs/development/tools/dep2nix/deps.nix    | 145 ---------------------
 2 files changed, 5 insertions(+), 150 deletions(-)
 delete mode 100644 pkgs/development/tools/dep2nix/deps.nix

diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index 6367f6be2981..14cce35f19e2 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, buildGoPackage
-, makeWrapper, nix-prefetch-git }:
+, makeWrapper, nix-prefetch-scripts }:
 
 buildGoPackage rec {
   name = "dep2nix-${version}";
-  version = "0.0.1";
+  version = "0.0.2";
 
   goPackagePath = "github.com/nixcloud/dep2nix";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "nixcloud";
     repo = "dep2nix";
     rev = version;
-    sha256 = "05b06wgcy88fb5ccqwq3mfhrhcblr1akpxgsf44kgbdwf5nzz87g";
+    sha256 = "17csgnd6imr1l0gpirsvr5qg7z0mpzxj211p2nwqilrvbp8zj7vg";
   };
 
   nativeBuildInputs = [
@@ -20,10 +20,10 @@ buildGoPackage rec {
 
   postFixup = ''
     wrapProgram $bin/bin/dep2nix \
-      --prefix PATH : ${nix-prefetch-git}/bin
+      --prefix PATH : ${nix-prefetch-scripts}/bin
   '';
 
-  goDeps = ./deps.nix;
+  goDeps = src + "/deps.nix";
 
   meta = with stdenv.lib; {
     description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`";
diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix
deleted file mode 100644
index fc9280e9df5b..000000000000
--- a/pkgs/development/tools/dep2nix/deps.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-
-  # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
-  [
-  
-    {
-      goPackagePath  = "github.com/Masterminds/semver";
-      fetch = {
-        type = "git";
-        url = "https://github.com/Masterminds/semver";
-        rev =  "a93e51b5a57ef416dac8bb02d11407b6f55d8929";
-        sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/Masterminds/vcs";
-      fetch = {
-        type = "git";
-        url = "https://github.com/Masterminds/vcs";
-        rev =  "6f1c6d150500e452704e9863f68c2559f58616bf";
-        sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/armon/go-radix";
-      fetch = {
-        type = "git";
-        url = "https://github.com/armon/go-radix";
-        rev =  "1fca145dffbcaa8fe914309b1ec0cfc67500fe61";
-        sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/boltdb/bolt";
-      fetch = {
-        type = "git";
-        url = "https://github.com/boltdb/bolt";
-        rev =  "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
-        sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/golang/dep";
-      fetch = {
-        type = "git";
-        url = "https://github.com/CrushedPixel/dep";
-        rev =  "fa9f32339c8855ebe7e7bc66e549036a7e06d37a";
-        sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/golang/protobuf";
-      fetch = {
-        type = "git";
-        url = "https://github.com/golang/protobuf";
-        rev =  "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175";
-        sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/jmank88/nuts";
-      fetch = {
-        type = "git";
-        url = "https://github.com/jmank88/nuts";
-        rev =  "8b28145dffc87104e66d074f62ea8080edfad7c8";
-        sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/nightlyone/lockfile";
-      fetch = {
-        type = "git";
-        url = "https://github.com/nightlyone/lockfile";
-        rev =  "6a197d5ea61168f2ac821de2b7f011b250904900";
-        sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/pelletier/go-toml";
-      fetch = {
-        type = "git";
-        url = "https://github.com/pelletier/go-toml";
-        rev =  "acdc4509485b587f5e675510c4f2c63e90ff68a8";
-        sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/pkg/errors";
-      fetch = {
-        type = "git";
-        url = "https://github.com/pkg/errors";
-        rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
-        sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-      };
-    }
-    
-    {
-      goPackagePath  = "github.com/sdboyer/constext";
-      fetch = {
-        type = "git";
-        url = "https://github.com/sdboyer/constext";
-        rev =  "836a144573533ea4da4e6929c235fd348aed1c80";
-        sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w";
-      };
-    }
-    
-    {
-      goPackagePath  = "golang.org/x/net";
-      fetch = {
-        type = "git";
-        url = "https://go.googlesource.com/net";
-        rev =  "dc948dff8834a7fe1ca525f8d04e261c2b56e70d";
-        sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg";
-      };
-    }
-    
-    {
-      goPackagePath  = "golang.org/x/sync";
-      fetch = {
-        type = "git";
-        url = "https://go.googlesource.com/sync";
-        rev =  "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
-        sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
-      };
-    }
-    
-    {
-      goPackagePath  = "golang.org/x/sys";
-      fetch = {
-        type = "git";
-        url = "https://go.googlesource.com/sys";
-        rev =  "37707fdb30a5b38865cfb95e5aab41707daec7fd";
-        sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
-      };
-    }
-    
-]

From e8621a45a2e8b7d593e0bbd0953950aa6257e0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 11 Sep 2018 12:56:14 +0100
Subject: [PATCH 0768/3253] dep2nix: fix eval (no IFD)

---
 pkgs/development/tools/dep2nix/default.nix |   2 +-
 pkgs/development/tools/dep2nix/deps.nix    | 145 +++++++++++++++++++++
 2 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/dep2nix/deps.nix

diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
index 14cce35f19e2..e7033c44dd49 100644
--- a/pkgs/development/tools/dep2nix/default.nix
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
       --prefix PATH : ${nix-prefetch-scripts}/bin
   '';
 
-  goDeps = src + "/deps.nix";
+  goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
     description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`";
diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix
new file mode 100644
index 000000000000..fc9280e9df5b
--- /dev/null
+++ b/pkgs/development/tools/dep2nix/deps.nix
@@ -0,0 +1,145 @@
+
+  # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
+  [
+  
+    {
+      goPackagePath  = "github.com/Masterminds/semver";
+      fetch = {
+        type = "git";
+        url = "https://github.com/Masterminds/semver";
+        rev =  "a93e51b5a57ef416dac8bb02d11407b6f55d8929";
+        sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/Masterminds/vcs";
+      fetch = {
+        type = "git";
+        url = "https://github.com/Masterminds/vcs";
+        rev =  "6f1c6d150500e452704e9863f68c2559f58616bf";
+        sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/armon/go-radix";
+      fetch = {
+        type = "git";
+        url = "https://github.com/armon/go-radix";
+        rev =  "1fca145dffbcaa8fe914309b1ec0cfc67500fe61";
+        sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/boltdb/bolt";
+      fetch = {
+        type = "git";
+        url = "https://github.com/boltdb/bolt";
+        rev =  "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
+        sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/golang/dep";
+      fetch = {
+        type = "git";
+        url = "https://github.com/CrushedPixel/dep";
+        rev =  "fa9f32339c8855ebe7e7bc66e549036a7e06d37a";
+        sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/golang/protobuf";
+      fetch = {
+        type = "git";
+        url = "https://github.com/golang/protobuf";
+        rev =  "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175";
+        sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/jmank88/nuts";
+      fetch = {
+        type = "git";
+        url = "https://github.com/jmank88/nuts";
+        rev =  "8b28145dffc87104e66d074f62ea8080edfad7c8";
+        sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/nightlyone/lockfile";
+      fetch = {
+        type = "git";
+        url = "https://github.com/nightlyone/lockfile";
+        rev =  "6a197d5ea61168f2ac821de2b7f011b250904900";
+        sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/pelletier/go-toml";
+      fetch = {
+        type = "git";
+        url = "https://github.com/pelletier/go-toml";
+        rev =  "acdc4509485b587f5e675510c4f2c63e90ff68a8";
+        sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/pkg/errors";
+      fetch = {
+        type = "git";
+        url = "https://github.com/pkg/errors";
+        rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+        sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/sdboyer/constext";
+      fetch = {
+        type = "git";
+        url = "https://github.com/sdboyer/constext";
+        rev =  "836a144573533ea4da4e6929c235fd348aed1c80";
+        sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/net";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/net";
+        rev =  "dc948dff8834a7fe1ca525f8d04e261c2b56e70d";
+        sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/sync";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/sync";
+        rev =  "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
+        sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/sys";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/sys";
+        rev =  "37707fdb30a5b38865cfb95e5aab41707daec7fd";
+        sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
+      };
+    }
+    
+]

From 2c18d48c0e687f083dcd80f53efa3ed9c2be3984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 8 Sep 2018 22:39:55 +0100
Subject: [PATCH 0769/3253] datadog-agent: 6.1.4 -> 6.4.2

---
 pkgs/tools/networking/dd-agent/6.nix     |  24 +-
 pkgs/tools/networking/dd-agent/README.md |   8 +
 pkgs/tools/networking/dd-agent/deps.nix  | 975 ++++++++++++++++++++---
 3 files changed, 887 insertions(+), 120 deletions(-)
 create mode 100644 pkgs/tools/networking/dd-agent/README.md

diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix
index 56a71595cea7..c095a77fda05 100644
--- a/pkgs/tools/networking/dd-agent/6.nix
+++ b/pkgs/tools/networking/dd-agent/6.nix
@@ -1,26 +1,27 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig }:
+{ stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd }:
 
 let
   # keep this in sync with github.com/DataDog/agent-payload dependency
-  payloadVersion = "4.7";
+  payloadVersion = "4.7.1";
 
 in buildGoPackage rec {
   name = "datadog-agent-${version}";
-  version = "6.1.4";
+  version = "6.4.2";
   owner   = "DataDog";
   repo    = "datadog-agent";
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev    = "a8ee76deb11fa334470d9b8f2356214999980894";
-    sha256 = "06grcwwbfvcw1k1d4nqrasrf76qkpik1gsw60zwafllfd9ffhl1v";
+    rev    = "155fddb3547919bd54530dfdb250e0cb2defae7d";
+    sha256 = "0l7ic0p2h27x386k1gzzm20af2s06cpalmqz0h0c5zq4wszmw5zy";
   };
 
   subPackages = [
     "cmd/agent"
     "cmd/dogstatsd"
     "cmd/py-launcher"
-    "cmd/cluster-agent"
+    # Does not compile: go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/main.go:31:12: undefined: app.ClusterAgentCmd
+    #"cmd/cluster-agent"
   ];
   goDeps = ./deps.nix;
   goPackagePath = "github.com/${owner}/${repo}";
@@ -29,9 +30,11 @@ in buildGoPackage rec {
   python = pythonPackages.python;
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ systemd ];
   PKG_CONFIG_PATH = "${python}/lib/pkgconfig";
 
-  buildFlagsArray = let
+
+  preBuild = let
     ldFlags = stdenv.lib.concatStringsSep " " [
       "-X ${goPackagePath}/pkg/version.Commit=${src.rev}"
       "-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
@@ -39,10 +42,9 @@ in buildGoPackage rec {
       "-X ${goPackagePath}/pkg/collector/py.pythonHome=${python}"
       "-r ${python}/lib"
     ];
-  in [
-    "-ldflags=${ldFlags}"
-  ];
-  buildFlags = "-tags cpython";
+  in ''
+    buildFlagsArray=( "-tags" "ec2 systemd cpython process log" "-ldflags" "${ldFlags}")
+  '';
 
   # DataDog use paths relative to the agent binary, so fix these.
   postPatch = ''
diff --git a/pkgs/tools/networking/dd-agent/README.md b/pkgs/tools/networking/dd-agent/README.md
new file mode 100644
index 000000000000..b04af72aef10
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/README.md
@@ -0,0 +1,8 @@
+To update v6 (v5 is deprecated and should be removed):
+
+1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `6.nix`
+2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent`
+3. `git checkout <tag>`
+4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz`
+5. `deps2nix`
+6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/deps.nix`
diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix
index 7a8fc69b2a42..eddd16e0ab9d 100644
--- a/pkgs/tools/networking/dd-agent/deps.nix
+++ b/pkgs/tools/networking/dd-agent/deps.nix
@@ -1,353 +1,1110 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "github.com/DataDog/agent-payload";
+    goPackagePath  = "bitbucket.org/ww/goautoneg";
+    fetch = {
+      type = "hg";
+      url = "https://bitbucket.org/ww/goautoneg";
+      rev =  "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
+      sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/agent-payload";
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/agent-payload";
-      rev = "3b793015ecfa5b829e8a466bd7cce836891502cc";
-      sha256 = "0lg7c1whmvk4a13mrivdjfzfxqan07kvs2calgylncy7yf4szdp6";
+      rev =  "c76e9d5be7457cafb7b3e056c6e8ae127b1f0431";
+      sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873";
     };
   }
   {
-    goPackagePath = "github.com/DataDog/gohai";
+    goPackagePath  = "github.com/DataDog/gohai";
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/gohai";
-      rev = "d80d0f562a71fa2380fbeccc93ba5a2e325606e4";
-      sha256 = "1frslms7f5i8dc8n0v9pb64mf4zdj3q2c005qxajl8j8i9nhj7yb";
+      rev =  "508b4f7bfc834501c944ab00e99b6f0e760f5ea7";
+      sha256 = "0qnhckvj3sk9rwc3dxz48zhx5p8ajg71azhi3y1l7ac6ayzpsc7f";
     };
   }
   {
-    goPackagePath = "github.com/DataDog/mmh3";
+    goPackagePath  = "github.com/DataDog/mmh3";
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/mmh3";
-      rev = "2cfb68475274527a10701355c739f31dd404718c";
+      rev =  "2cfb68475274527a10701355c739f31dd404718c";
       sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b";
     };
   }
   {
-    goPackagePath = "github.com/beevik/ntp";
+    goPackagePath  = "github.com/DataDog/zstd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/zstd";
+      rev =  "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab";
+      sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev =  "67921128fb397dd80339870d2193d6b1e6856fd4";
+      sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/NYTimes/gziphandler";
+    fetch = {
+      type = "git";
+      url = "https://github.com/NYTimes/gziphandler";
+      rev =  "2600fb119af974220d3916a5916d6e31176aac1b";
+      sha256 = "0bh6qqz2iyrnxhhj02s8mqayqwqxy182ldxh97q1vg7phlbm52xx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/purell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/purell";
+      rev =  "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4";
+      sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/urlesc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/urlesc";
+      rev =  "de5bf2ad457846296e2031421a34e2568e304e35";
+      sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/StackExchange/wmi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/StackExchange/wmi";
+      rev =  "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
+      sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "bff41fb23b7550368282029f6478819d6a99ae0f";
+      sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beevik/ntp";
     fetch = {
       type = "git";
       url = "https://github.com/beevik/ntp";
-      rev = "cb3dae3a7588ae35829eb5724df611cd75152fba";
+      rev =  "cb3dae3a7588ae35829eb5724df611cd75152fba";
       sha256 = "0nc6f7d0xw23y18z9qxrmm8kvnywihassyk706mn9v4makmhalnz";
     };
   }
   {
-    goPackagePath = "github.com/cihub/seelog";
+    goPackagePath  = "github.com/beorn7/perks";
     fetch = {
       type = "git";
-      url = "https://github.com/cihub/seelog";
-      rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4";
-      sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl";
+      url = "https://github.com/beorn7/perks";
+      rev =  "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
     };
   }
   {
-    goPackagePath = "github.com/docker/docker";
+    goPackagePath  = "github.com/cenkalti/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenkalti/backoff";
+      rev =  "2ea60e5f094469f9e65adb9cd103795b73ae743e";
+      sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cihub/seelog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cihub/seelog";
+      rev =  "d2c6e5aa9fbfdd1c624e140287063c7730654115";
+      sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/clbanning/mxj";
+    fetch = {
+      type = "git";
+      url = "https://github.com/clbanning/mxj";
+      rev =  "1f00e0bf9bacd7ea9c93d27594d1d1f5a41bac36";
+      sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev =  "c9504f61fc7f29b0ad30bf8bab02d9e1b600e962";
+      sha256 = "1ap8zhfz6pcn2ipn27s84ihpyrvpjrb48mpy4n5pr6khrni83p1a";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/go-semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-semver";
+      rev =  "8ab6407b697782a06568d4b7f1db25550ec2e4c6";
+      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/go-systemd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/go-systemd";
+      rev =  "40e2722dffead74698ca12a750f64ef313ddce05";
+      sha256 = "0kq7aa0pbn8gv9ny2a1gfx3ybsqyryfwz9gv7fck6zfc8xxbl1fa";
+    };
+  }
+  {
+    goPackagePath  = "github.com/coreos/pkg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/pkg";
+      rev =  "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+      sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev =  "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
+      sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/docker";
     fetch = {
       type = "git";
       url = "https://github.com/docker/docker";
-      rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363";
+      rev =  "092cba3727bb9b4a2f0e922cd6c0f93ea270e363";
       sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
     };
   }
   {
-    goPackagePath = "github.com/dsnet/compress";
+    goPackagePath  = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev =  "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
+      sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev =  "47565b4f722fb6ceae66b95f853feed578a4a51c";
+      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dsnet/compress";
     fetch = {
       type = "git";
       url = "https://github.com/dsnet/compress";
-      rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f";
+      rev =  "cc9eb1d7ad760af14e8f918698f745e80377af4f";
       sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx";
     };
   }
   {
-    goPackagePath = "github.com/fatih/color";
+    goPackagePath  = "github.com/dustin/go-humanize";
     fetch = {
       type = "git";
-      url = "https://github.com/fatih/color";
-      rev = "507f6050b8568533fb3f5504de8e5205fa62a114";
-      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+      url = "https://github.com/dustin/go-humanize";
+      rev =  "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
+      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
     };
   }
   {
-    goPackagePath = "github.com/fsnotify/fsnotify";
+    goPackagePath  = "github.com/elazarl/go-bindata-assetfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/elazarl/go-bindata-assetfs";
+      rev =  "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43";
+      sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/emicklei/go-restful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful";
+      rev =  "3658237ded108b4134956c1b3050349d93e7b895";
+      sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/emicklei/go-restful-swagger12";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful-swagger12";
+      rev =  "dcef7f55730566d41eae5db10e7d6981829720f6";
+      sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/evanphx/json-patch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/evanphx/json-patch";
+      rev =  "afac545df32f2287a079e2dfb7ba2745a643747e";
+      sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fsnotify/fsnotify";
     fetch = {
       type = "git";
       url = "https://github.com/fsnotify/fsnotify";
-      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
       sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
     };
   }
   {
-    goPackagePath = "github.com/go-ini/ini";
+    goPackagePath  = "github.com/geoffgarside/ber";
+    fetch = {
+      type = "git";
+      url = "https://github.com/geoffgarside/ber";
+      rev =  "0b763e6b6fb1cb7422c29cd9195a3abf625651fb";
+      sha256 = "04k9k6805mvgp6gxs53frvlpp45hvkvrpj1jl1hc27ldwv5gpjrk";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
+      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ini/ini";
     fetch = {
       type = "git";
       url = "https://github.com/go-ini/ini";
-      rev = "bda519ae5f4cbc60d391ff8610711627a08b86ae";
-      sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs";
+      rev =  "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5";
+      sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a";
     };
   }
   {
-    goPackagePath = "github.com/gogo/protobuf";
+    goPackagePath  = "github.com/go-ole/go-ole";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ole/go-ole";
+      rev =  "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506";
+      sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonpointer";
+      rev =  "3a0015ad55fa9873f41605d3e8f28cd279c32ab2";
+      sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonreference";
+      rev =  "3fb327e6747da3043567ee86abd02bb6376b6be2";
+      sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/spec";
+      rev =  "bcff419492eeeb01f76e77d2ebc714dc97b607f5";
+      sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/swag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/swag";
+      rev =  "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5";
+      sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/gogo/protobuf";
-      rev = "1ef32a8b9fc3f8ec940126907cedb5998f6318e4";
-      sha256 = "0zk2n0n35ksskr5cd83k5k8wg21ckrcggjy88bym2s21ngj5w4fh";
+      rev =  "1adfc126b41513cc696b209667c8656ea7aac67c";
+      sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
     };
   }
   {
-    goPackagePath = "github.com/golang/snappy";
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/groupcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/groupcache";
+      rev =  "24b0969c4cb722950103eed87108c8d291a8df00";
+      sha256 = "0rj588dxg4ncanj8vcsixi00161xq54nz7siv47d5ijmzgxs82zf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/snappy";
     fetch = {
       type = "git";
       url = "https://github.com/golang/snappy";
-      rev = "553a641470496b2327abcac10b36396bd98e45c9";
-      sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
+      rev =  "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
+      sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
     };
   }
   {
-    goPackagePath = "github.com/gorilla/mux";
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+      sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "7c663266750e7d82587642f65e60bc4083f1f84e";
+      sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev =  "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
+      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gorilla/mux";
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/mux";
-      rev = "ded0c29b24f96f46cf349e6701b099db601cf8ec";
-      sha256 = "125dxfxs7his95fd2r28bn1rpb78pldfgm3lmw84ha1c0v5gfh33";
+      rev =  "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
+      sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/hcl";
+    goPackagePath  = "github.com/hashicorp/consul";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/consul";
+      rev =  "fb848fc48818f58690db09d14640513aa6bf3c02";
+      sha256 = "0ra38xrh6ghcnix8w6gjs33yr2ra1n5jvf8lww4csr4dgw5bh5b1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev =  "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
+      sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-rootcerts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-rootcerts";
+      rev =  "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
+      sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "0fb14efe8c47ae851c0034ed7a448854d3d34cf3";
+      sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/hcl";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      rev =  "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
       sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
     };
   }
   {
-    goPackagePath = "github.com/kardianos/osext";
+    goPackagePath  = "github.com/hashicorp/serf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/serf";
+      rev =  "d6574a5bb1226678d7010325fb6c985db20ee458";
+      sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hectane/go-acl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hectane/go-acl";
+      rev =  "7f56832555fc229dad908c67d65ed3ce6156b70c";
+      sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
+    };
+  }
+  {
+    goPackagePath  = "github.com/howeyc/gopass";
+    fetch = {
+      type = "git";
+      url = "https://github.com/howeyc/gopass";
+      rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
+      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "9316a62528ac99aaecb4e47eadd6dc8aa6533d58";
+      sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "0b12d6b5";
+      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "f2b4162afba35581b6d4a50d3b8f34e33c144682";
+      sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/k-sone/snmpgo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/k-sone/snmpgo";
+      rev =  "de09377ff34857b08afdc16ea8c7c2929eb1fc6e";
+      sha256 = "0fia82msxviawcp5w4j4ll9n7z3gfjjvigqcq0d94cshj9ras10j";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kardianos/osext";
     fetch = {
       type = "git";
       url = "https://github.com/kardianos/osext";
-      rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
+      rev =  "ae77be60afb1dcacde03767a8c37337fad28ac14";
       sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
     };
   }
   {
-    goPackagePath = "github.com/magiconair/properties";
+    goPackagePath  = "github.com/kubernetes-incubator/custom-metrics-apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
+      rev =  "e61f72fec56ab519d74ebd396cd3fcf31b084558";
+      sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lxn/walk";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lxn/walk";
+      rev =  "02935bac0ab8448d5f9bf72ebeeb7ca0d5553f9b";
+      sha256 = "0m0dva6nyv6vxc188c9003g5ylxb6clmlcvqjgaibbcrxkxjw1d5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lxn/win";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lxn/win";
+      rev =  "7e1250ba2e7749fb9eb865da9ee93fb5a2fe73f1";
+      sha256 = "1n5ksvy3va3zd0iqpl64advjscm2w9n8kxn45ahahvbrbi7zy1zw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/magiconair/properties";
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev = "2c9e9502788518c97fe44e8955cd069417ee89df";
-      sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl";
+      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
     };
   }
   {
-    goPackagePath = "github.com/mholt/archiver";
+    goPackagePath  = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev =  "3fdea8d05856a0c8df22ed4bc71b3219245e4485";
+      sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "0360b2af4f38e8d38c7fce2a9f4e702702d73a39";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev =  "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mholt/archiver";
     fetch = {
       type = "git";
       url = "https://github.com/mholt/archiver";
-      rev = "e4ef56d48eb029648b0e895bb0b6a393ef0829c3";
-      sha256 = "1krxyh6iq0s0rwhz7gg6dn795j9qq64rsgq9nivav7fhrqpgr6hb";
+      rev =  "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df";
+      sha256 = "1r2gcxh8gkyn1l0h7sshachg2fxz6542lbqcar9zym6n2dni30mm";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/mapstructure";
+    goPackagePath  = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev =  "3864e76763d94a6df2f9960b16a20a33da9f9a66";
+      sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
-      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+      rev =  "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
     };
   }
   {
-    goPackagePath = "github.com/nwaples/rardecode";
+    goPackagePath  = "github.com/mitchellh/reflectwalk";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/reflectwalk";
+      rev =  "63d60e9d0dbc60cf9164e6510889b0db6683d98c";
+      sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
+      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
+    };
+  }
+  {
+    goPackagePath  = "github.com/nwaples/rardecode";
     fetch = {
       type = "git";
       url = "https://github.com/nwaples/rardecode";
-      rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6";
+      rev =  "e06696f847aeda6f39a8f0b7cdff193b7690aef6";
       sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw";
     };
   }
   {
-    goPackagePath = "github.com/patrickmn/go-cache";
+    goPackagePath  = "github.com/openshift/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/openshift/api";
+      rev =  "0d921e363e951d89f583292c60d013c318df64dc";
+      sha256 = "171xac4hr665q08mp17fld2zfpp95h9mjws2wikcr0brwq878p3s";
+    };
+  }
+  {
+    goPackagePath  = "github.com/patrickmn/go-cache";
     fetch = {
       type = "git";
       url = "https://github.com/patrickmn/go-cache";
-      rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
+      rev =  "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
       sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
     };
   }
   {
-    goPackagePath = "github.com/pelletier/go-toml";
+    goPackagePath  = "github.com/pborman/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/uuid";
+      rev =  "e790cca94e6cc75c7064b1332e63811d4aae1a53";
+      sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pelletier/go-toml";
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
-      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+      rev =  "c01d1270ff3e442a8a57cddc1c92dc1138598194";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
     };
   }
   {
-    goPackagePath = "github.com/pierrec/lz4";
+    goPackagePath  = "github.com/pierrec/lz4";
     fetch = {
       type = "git";
       url = "https://github.com/pierrec/lz4";
-      rev = "ed8d4cc3b461464e69798080a0092bd028910298";
-      sha256 = "0flsn2ka108lb63gkxfzl90bkhndh1znnscv4v1k6j5h2s3zksls";
+      rev =  "1958fd8fff7f115e79725b1288e0b878b3e06b00";
+      sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps";
     };
   }
   {
-    goPackagePath = "github.com/pierrec/xxHash";
+    goPackagePath  = "github.com/pkg/errors";
     fetch = {
       type = "git";
-      url = "https://github.com/pierrec/xxHash";
-      rev = "a0006b13c722f7f12368c00a3d3c2ae8a999a0c6";
-      sha256 = "1hf7hqrqx0cbgx0alfwnqs0mrxg9rnwsijn5d0lv06w6vzqbvnzj";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
     };
   }
   {
-    goPackagePath = "github.com/shirou/gopsutil";
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev =  "c5b7fccd204277076155f10851dad72b76a49317";
+      sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev =  "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev =  "7600349dcfe1abd18d72d3a1770870d9800a7801";
+      sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev =  "7d6f385de8bea29190f15ba9931442a0eaef9af7";
+      sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/samuel/go-zookeeper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/samuel/go-zookeeper";
+      rev =  "c4fab1ac1bec58281ad0667dc3f0907a9476ac47";
+      sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/sbinet/go-python";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sbinet/go-python";
+      rev =  "f976f61134dc6f5b4920941eb1b0e7cec7e4ef4c";
+      sha256 = "15l7wip7kr1z6v3315m9y0070wmwq447q7gwz6490xwnclrq85kl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shirou/gopsutil";
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
-      sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
+      rev =  "eeb1d38d69593f121e060d24d17f7b1f0936b203";
+      sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
     };
   }
   {
-    goPackagePath = "github.com/spf13/afero";
+    goPackagePath  = "github.com/shirou/w32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/w32";
+      rev =  "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
+      sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/afero";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
-      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+      rev =  "787d034dfe70e44075ccc060d346146ef53270ad";
+      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
     };
   }
   {
-    goPackagePath = "github.com/spf13/cast";
+    goPackagePath  = "github.com/spf13/cast";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cast";
-      rev = "8965335b8c7107321228e3e3702cab9832751bac";
+      rev =  "8965335b8c7107321228e3e3702cab9832751bac";
       sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
     };
   }
   {
-    goPackagePath = "github.com/spf13/cobra";
+    goPackagePath  = "github.com/spf13/cobra";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
       sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
     };
   }
   {
-    goPackagePath = "github.com/spf13/jwalterweatherman";
+    goPackagePath  = "github.com/spf13/jwalterweatherman";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+      rev =  "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
       sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
     };
   }
   {
-    goPackagePath = "github.com/spf13/pflag";
+    goPackagePath  = "github.com/spf13/pflag";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      rev =  "583c0c0531f06d5278b7d917446061adc344b5cd";
       sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
     };
   }
   {
-    goPackagePath = "github.com/spf13/viper";
+    goPackagePath  = "github.com/spf13/viper";
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "8dc2790b029dc41e2b8ff772c63c26adbb1db70d";
-      sha256 = "147zq6v34pgb79r4m0m2mwm8739jxwawxs8mpqvvhq7gxwvhng40";
+      rev =  "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
+      sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
     };
   }
   {
-    goPackagePath = "github.com/stretchr/testify";
+    goPackagePath  = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev =  "477a77ecc69700c7cdeb1fa9e129548e1c1c393c";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69";
-      sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691";
+      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
     };
   }
   {
-    goPackagePath = "github.com/ulikunitz/xz";
+    goPackagePath  = "github.com/ugorji/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ugorji/go";
+      rev =  "8c0409fcbb70099c748d71f714529204975f6c3f";
+      sha256 = "0z61j0cniq3n5af0q57dbpyfmidihzimrwnysfphfzwyd0ic4rcv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ulikunitz/xz";
     fetch = {
       type = "git";
       url = "https://github.com/ulikunitz/xz";
-      rev = "0c6b41e72360850ca4f98dc341fd999726ea007f";
+      rev =  "0c6b41e72360850ca4f98dc341fd999726ea007f";
       sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3";
     };
   }
   {
-    goPackagePath = "github.com/urfave/negroni";
+    goPackagePath  = "github.com/urfave/negroni";
     fetch = {
       type = "git";
       url = "https://github.com/urfave/negroni";
-      rev = "22c5532ea862c34fdad414e90f8cc00b4f6f4cab";
-      sha256 = "0jxd10cr3imm96xa01mdgyad4nq6mc7yr49z830fv3vywfr7bac8";
+      rev =  "5dbbc83f748fc3ad38585842b0aedab546d0ea1e";
+      sha256 = "10w4ygc78hgsryxwmjmz8w51d84bjh7jm8j0xfv4vnpz5gscc8dj";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "a49355c7e3f8fe157a85be2f77e6e269a0f89602";
+      sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "640f4622ab692b87c2f3a94265e6f579fe38263d";
-      sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx";
+      rev =  "97aa3a539ec716117a9d15a4659a911f50d13c3c";
+      sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "6f686a352de66814cdd080d970febae7767857a3";
-      sha256 = "1z3pwvxlzq8kghjdsd9xmf184iiz13h8h66ipp626k4rc7kydr03";
+      rev =  "7138fd3d9dc8335c567ca206f4333fb75eb05d56";
+      sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0";
     };
   }
   {
-    goPackagePath = "golang.org/x/text";
+    goPackagePath  = "golang.org/x/text";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
     };
   }
   {
-    goPackagePath = "gopkg.in/yaml.v2";
+    goPackagePath  = "golang.org/x/time";
     fetch = {
       type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      url = "https://go.googlesource.com/time";
+      rev =  "fbb02b2291d28baffd63558aa44b4b56f178d650";
+      sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
     };
   }
   {
-    goPackagePath = "github.com/sbinet/go-python";
+    goPackagePath  = "google.golang.org/genproto";
     fetch = {
       type = "git";
-      url = "https://github.com/sbinet/go-python";
-      rev = "6d13f941744b9332d6ed00dc2cd2722acd79a47e";
-      sha256 = "0x5q4nyv6gck9q33g54gy2ajmyjksxjmzh0jfqqn97jpgf4qfaym";
+      url = "https://github.com/google/go-genproto";
+      rev =  "ff3583edef7de132f219f0efc00e097cabcc0ec0";
+      sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/reflectwalk";
+    goPackagePath  = "google.golang.org/grpc";
     fetch = {
       type = "git";
-      url = "https://github.com/mitchellh/reflectwalk";
-      rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c";
-      sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc";
+      url = "https://github.com/grpc/grpc-go";
+      rev =  "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
+      sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/Knetic/govaluate.v3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Knetic/govaluate";
+      rev =  "d216395917cc49052c7c7094cf57f09657ca08a8";
+      sha256 = "1b0sy89hy5d1720i43ikqfcxr4v6p9g9c7rnbif8s6256a7c2rsq";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "d2d2541c53f18d2a059457998ce2876cc8e67cbf";
+      sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/natefinch/lumberjack.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/natefinch/lumberjack";
+      rev =  "a96e63847dc3c67d17befa69c303767e2f84e54f";
+      sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "d670f9405373e636a5a2765eea47fac0c9bc91a4";
+      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/zorkian/go-datadog-api.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zorkian/go-datadog-api";
+      rev =  "6c08e2322af96e867e5715aedd6ea194c42cf44f";
+      sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "9e5ffd1f1320950b238cfce291b926411f0af722";
+      sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "e386b2658ed20923da8cc9250e552f082899a1ee";
+      sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apiserver";
+      rev =  "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
+      sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "23781f4d6632d88e869066eaebb743857aa1ef9b";
+      sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/kube-openapi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kube-openapi";
+      rev =  "b742be413d0a6f781c123bed504c8fb39264c57d";
+      sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/metrics";
+      rev =  "0d9ea2ac660031c8f2726a735dda29441f396f99";
+      sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
     };
   }
 ]

From 902dea15ec51780eb005597104bd632164e46e62 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Sep 2018 13:34:21 +0100
Subject: [PATCH 0770/3253] cargo-edit: use buildRustPackage instead of Carnix

Saving 3000 lines of Nix code.
---
 .../package-management/cargo-edit/Cargo.nix   | 3148 -----------------
 .../package-management/cargo-edit/default.nix |   41 +-
 2 files changed, 19 insertions(+), 3170 deletions(-)
 delete mode 100644 pkgs/tools/package-management/cargo-edit/Cargo.nix

diff --git a/pkgs/tools/package-management/cargo-edit/Cargo.nix b/pkgs/tools/package-management/cargo-edit/Cargo.nix
deleted file mode 100644
index fa6cfaab387f..000000000000
--- a/pkgs/tools/package-management/cargo-edit/Cargo.nix
+++ /dev/null
@@ -1,3148 +0,0 @@
-# Generated by carnix 0.7.2: carnix nix
-{ lib, buildPlatform, buildRustCrate, fetchgit }:
-let kernel = buildPlatform.parsed.kernel.name;
-    abi = buildPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  cargo_edit = f: cargo_edit_0_3_0 { features = cargo_edit_0_3_0_features { cargo_edit_0_3_0 = f; }; };
-  __all = [ (cargo_edit {}) ];
-  adler32_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "adler32";
-    version = "1.0.3";
-    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
-    sha256 = "1z3mvjgw02mbqk98kizzibrca01d5wfkpazsrp3vkkv3i56pn6fb";
-    inherit dependencies buildDependencies features;
-  };
-  aho_corasick_0_6_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "aho-corasick";
-    version = "0.6.6";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0ap5lv1q6ylmzq70bjgg66dsa6p9926gwv2q4z0chfjnii8hczq8";
-    libName = "aho_corasick";
-    crateBin = [ {  name = "aho-corasick-dot";  path = "src/main.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.11.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
-    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
-    inherit dependencies buildDependencies features;
-  };
-  arrayvec_0_4_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "arrayvec";
-    version = "0.4.7";
-    authors = [ "bluss" ];
-    sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4";
-    inherit dependencies buildDependencies features;
-  };
-  ascii_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ascii";
-    version = "0.7.1";
-    authors = [ "Thomas Bahn <thomas@thomas-bahn.net>" "Torbjørn Birch Moltu <t.b.moltu@lyse.net>" "Simon Sapin <simon.sapin@exyr.org>" ];
-    sha256 = "0fy9rh316vcc4v0k8d1p2gi3a3wpiwj5bm2mw0yqzs8xvz6yd1ax";
-    inherit dependencies buildDependencies features;
-  };
-  assert_cli_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "assert_cli";
-    version = "0.6.3";
-    authors = [ "Pascal Hertleif <killercup@gmail.com>" "Ed Page <eopage@gmail.com>" ];
-    sha256 = "1yx4phpiqvs83gin33hnqcl30dsp3imzvfbahmp4qqpmpp5hzgcv";
-    crateBin = [ {  name = "assert_fixture"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.11";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace";
-    version = "0.3.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
-    sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm";
-    inherit dependencies buildDependencies features;
-  };
-  backtrace_sys_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "backtrace-sys";
-    version = "0.1.23";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0sx7h7bl5j5dj4hlk7bcf8fwbhrxrvq2hfpy70vw2140gnlrl9dw";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  base64_0_9_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "base64";
-    version = "0.9.2";
-    authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ];
-    sha256 = "0g4xxl8jhwjhvr69qlxdmbzd521xcn5j67lhkr20nh7ajvl6k0l1";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.9.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "1.0.3";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw";
-    inherit dependencies buildDependencies features;
-  };
-  build_const_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "build_const";
-    version = "0.2.1";
-    authors = [ "Garrett Berg <vitiral@gmail.com>" ];
-    sha256 = "15249xzi3qlm72p4glxgavwyq70fx2sp4df6ii0sdlrixrrp77pl";
-    inherit dependencies buildDependencies features;
-  };
-  byteorder_1_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "byteorder";
-    version = "1.2.4";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "095xbm5bi23fkbfb97kg81x02dymfmd2kp5nl93rvw6dar2kpwyw";
-    inherit dependencies buildDependencies features;
-  };
-  bytes_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bytes";
-    version = "0.4.9";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1jiqc94j85la9vs165vqpf6s1sah8n3ivnhsfapcjrvbhjawi6i6";
-    inherit dependencies buildDependencies features;
-  };
-  cargo_edit_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cargo-edit";
-    version = "0.3.0";
-    authors = [ "Without Boats <lee@libertad.ucsd.edu>" "Pascal Hertleif <killercup@gmail.com>" "Sebastian Garrido <sebasgarcep@gmail.com>" "Jonas Platte <mail@jonasplatte.de>" "Benjamin Gill <git@bgill.eu>" "Andronik Ordian <write@reusable.software>" ];
-    sha256 = "1zyf52x82slh27s6bzc6pmmbgp7cfr1xpmsp7i3zy0nd1p4gd13f";
-    crateBin = [ {  name = "cargo-add";  path = "src/bin/add/main.rs"; } {  name = "cargo-rm";  path = "src/bin/rm/main.rs"; } {  name = "cargo-upgrade";  path = "src/bin/upgrade/main.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  cargo_metadata_0_5_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cargo_metadata";
-    version = "0.5.8";
-    authors = [ "Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>" ];
-    sha256 = "0vkkvpxmspkx80iq6vlrh8972g1b9f8qb92qy75daz43x16qnbd2";
-    inherit dependencies buildDependencies features;
-  };
-  cc_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.18";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0wcnpa54qvm5921wwrrkn8cwxd5y0p5f4gb1qgyh5imii7rdhpjx";
-    inherit dependencies buildDependencies features;
-  };
-  cfg_if_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cfg-if";
-    version = "0.1.4";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0n5baxk53dvqjymzwynq55wb805b24390qx1n16zi8fjzq90j7k4";
-    inherit dependencies buildDependencies features;
-  };
-  chrono_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "chrono";
-    version = "0.4.5";
-    authors = [ "Kang Seonghoon <public+rust@mearie.org>" "Brandon W Maister <quodlibetor@gmail.com>" ];
-    sha256 = "0v3gpbkaxjsskil0si321bak9p0k1sfz43cx9p50kvx0s5p3x0yr";
-    inherit dependencies buildDependencies features;
-  };
-  colored_1_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "colored";
-    version = "1.6.1";
-    authors = [ "Thomas Wickham <mackwic@gmail.com>" ];
-    sha256 = "0n3ja64sdiafp751nyq97c8rvrn8xqw036461i7q4n47yiqxn8rw";
-    inherit dependencies buildDependencies features;
-  };
-  combine_3_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "combine";
-    version = "3.3.6";
-    authors = [ "Markus Westerlind <marwes91@gmail.com>" ];
-    sha256 = "1wzxpn0ipz1n7d9ygcc8rh9a59lk4mh2jq5asxa7cgqgdzbhicys";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "core-foundation";
-    version = "0.2.3";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm";
-    inherit dependencies buildDependencies features;
-  };
-  core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "core-foundation-sys";
-    version = "0.2.3";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  crc_1_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "crc";
-    version = "1.8.1";
-    authors = [ "Rui Hu <code@mrhooray.com>" ];
-    sha256 = "00m9jjqrddp3bqyanvyxv0hf6s56bx1wy51vcdcxg4n2jdhg109s";
-    inherit dependencies buildDependencies features;
-  };
-  crossbeam_deque_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "crossbeam-deque";
-    version = "0.3.1";
-    authors = [ "The Crossbeam Project Developers" ];
-    sha256 = "1km0mavyp9ddwb7k7kcdmyryi3bwxf0nmr6jqcpyjzvzmxjlkqap";
-    inherit dependencies buildDependencies features;
-  };
-  crossbeam_epoch_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "crossbeam-epoch";
-    version = "0.4.3";
-    authors = [ "The Crossbeam Project Developers" ];
-    sha256 = "18xfgi7h9aq4lqqrqzy366xg885z1hlkbhvycl2i3zhkhkvadhv3";
-    inherit dependencies buildDependencies features;
-  };
-  crossbeam_utils_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "crossbeam-utils";
-    version = "0.3.2";
-    authors = [ "The Crossbeam Project Developers" ];
-    sha256 = "1byx31nkxl48la58571h40ssk94faky26jwz15w40v2gba3v4fql";
-    inherit dependencies buildDependencies features;
-  };
-  difference_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "difference";
-    version = "2.0.0";
-    authors = [ "Johann Hofmann <mail@johann-hofmann.com>" ];
-    sha256 = "1rk24wxxkhhw8drhda229dfy2nb64vvcz0ras6lq7va6wswlrc49";
-    crateBin = [ {  name = "difference"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  docopt_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "docopt";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "009xdzqzyrx0yq390vbjbr6m9s8pyazq5r6gf7bchygy9r4p40hr";
-    crateBin = [ {  name = "docopt-wordlist";  path = "src/wordlist.rs"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  dtoa_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "dtoa";
-    version = "0.4.3";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
-    inherit dependencies buildDependencies features;
-  };
-  either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "either";
-    version = "1.5.0";
-    authors = [ "bluss" ];
-    sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz";
-    inherit dependencies buildDependencies features;
-  };
-  encoding_rs_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "encoding_rs";
-    version = "0.7.2";
-    authors = [ "Henri Sivonen <hsivonen@hsivonen.fi>" ];
-    sha256 = "1c23bi3q4qmi2ci8g7p5j4b4i5abyggvyg6hkl7w4p4r527c9g3q";
-    inherit dependencies buildDependencies features;
-  };
-  env_proxy_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "env_proxy";
-    version = "0.2.0";
-    authors = [ "Ivan Nejgebauer <inejge@gmail.com>" ];
-    sha256 = "178vn5agzxbq6a7pgpkvaf74ilsqk8d010r4qbbf88l9cs2g8qz2";
-    inherit dependencies buildDependencies features;
-  };
-  environment_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "environment";
-    version = "0.1.1";
-    authors = [ "Freyskeyd <simon.paitrault@gmail.com>" ];
-    sha256 = "1dx1xi9851lvigfic05j9r2d5rf71v9b4bg2mh7jj6z6qccfq8nb";
-    inherit dependencies buildDependencies features;
-  };
-  error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "error-chain";
-    version = "0.11.0";
-    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
-    sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7";
-    inherit dependencies buildDependencies features;
-  };
-  failure_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "failure";
-    version = "0.1.1";
-    authors = [ "Without Boats <boats@mozilla.com>" ];
-    sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk";
-    inherit dependencies buildDependencies features;
-  };
-  failure_derive_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "failure_derive";
-    version = "0.1.1";
-    authors = [ "Without Boats <woboats@gmail.com>" ];
-    sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i";
-    procMacro = true;
-    inherit dependencies buildDependencies features;
-  };
-  foreign_types_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "foreign-types";
-    version = "0.3.2";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "105n8sp2djb1s5lzrw04p7ss3dchr5qa3canmynx396nh3vwm2p8";
-    inherit dependencies buildDependencies features;
-  };
-  foreign_types_shared_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "foreign-types-shared";
-    version = "0.1.1";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0b6cnvqbflws8dxywk4589vgbz80049lz4x1g9dfy4s1ppd3g4z5";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon-sys";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
-    inherit dependencies buildDependencies features;
-  };
-  futures_0_1_23_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures";
-    version = "0.1.23";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "075s7sv1iqzf2r3lvb4hk81k5c9xzfcyb8q92h2s35fnypxyqd21";
-    inherit dependencies buildDependencies features;
-  };
-  futures_cpupool_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "futures-cpupool";
-    version = "0.1.8";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0ficd31n5ljiixy6x0vjglhq4fp0v1p4qzxm3v6ymsrb3z080l5c";
-    inherit dependencies buildDependencies features;
-  };
-  httparse_1_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "httparse";
-    version = "1.3.2";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1mm10m2hv1inxzzvm85s6fdmwl9a3q9vik0nzh5qrx2hx5x8fcwl";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  hyper_0_11_27_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "hyper";
-    version = "0.11.27";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "0q5as4lhvh31bzk4qm7j84snrmxyxyaqk040rfk72b42dn98mryi";
-    inherit dependencies buildDependencies features;
-  };
-  hyper_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "hyper-tls";
-    version = "0.1.4";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "1242mxvkgkm936fcsfcmmwwb5blclf0xld4d6gqzbvhlfc9yhnl8";
-    inherit dependencies buildDependencies features;
-  };
-  idna_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "idna";
-    version = "0.1.5";
-    authors = [ "The rust-url developers" ];
-    sha256 = "1gwgl19rz5vzi67rrhamczhxy050f5ynx4ybabfapyalv7z1qmjy";
-    inherit dependencies buildDependencies features;
-  };
-  iovec_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "iovec";
-    version = "0.1.2";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r";
-    inherit dependencies buildDependencies features;
-  };
-  itoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "itoa";
-    version = "0.4.2";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "193a744yd74rmk13hl8xvd9p2hqhdkyf8xkvi1mxm5s10bby0h8v";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "language-tags";
-    version = "0.2.2";
-    authors = [ "Pyfisch <pyfisch@gmail.com>" ];
-    sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "0.2.11";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "1.0.2";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0ix4dmy6zb4v3m75l4alg84fk06y145z52z9pyysc9labw2x5r3r";
-    inherit dependencies buildDependencies features;
-  };
-  lazycell_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazycell";
-    version = "0.6.0";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ];
-    sha256 = "1ax148clinbvp6alxcih8s5i2bg3mc5mi69n3hvzvzbwlm6k532r";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_42_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.42";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "064v49hz1zpl081w8c4vwikrkhaxp06y4i9l7x7wx6bjpwp19pjx";
-    inherit dependencies buildDependencies features;
-  };
-  libflate_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libflate";
-    version = "0.1.16";
-    authors = [ "Takeru Ohta <phjgt308@gmail.com>" ];
-    sha256 = "0l15g61h10bznxsjirwq9c43w17mjpqx6wz0357agskardkdh14n";
-    inherit dependencies buildDependencies features;
-  };
-  linked_hash_map_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "linked-hash-map";
-    version = "0.5.1";
-    authors = [ "Stepan Koltsov <stepan.koltsov@gmail.com>" "Andrew Paseltiner <apaseltiner@gmail.com>" ];
-    sha256 = "1f29c7j53z7w5v0g115yii9dmmbsahr93ak375g48vi75v3p4030";
-    inherit dependencies buildDependencies features;
-  };
-  log_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "log";
-    version = "0.3.9";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
-    inherit dependencies buildDependencies features;
-  };
-  log_0_4_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "log";
-    version = "0.4.3";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1gdmwrbm7s18zcdz4lcdhz975m4gwhi854c7j1rvj1gsr8aca250";
-    inherit dependencies buildDependencies features;
-  };
-  matches_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "matches";
-    version = "0.1.7";
-    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
-    sha256 = "0zx9gi5flyzkh9nx52fyc3k2zz08b9ww1c4yndlfrw72kr8m7yfy";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memchr";
-    version = "2.0.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
-    inherit dependencies buildDependencies features;
-  };
-  memoffset_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memoffset";
-    version = "0.2.1";
-    authors = [ "Gilad Naaman <gilad.naaman@gmail.com>" ];
-    sha256 = "00vym01jk9slibq2nsiilgffp7n6k52a4q3n4dqp0xf5kzxvffcf";
-    inherit dependencies buildDependencies features;
-  };
-  mime_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "mime";
-    version = "0.3.8";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1577adg9zvkd1qdb2nqqg1ryap33p5r4qsw01n9pw162xpisqjm3";
-    inherit dependencies buildDependencies features;
-  };
-  mime_guess_2_0_0_alpha_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "mime_guess";
-    version = "2.0.0-alpha.6";
-    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
-    sha256 = "1k2mdq43gi2qr63b7m5zs624rfi40ysk33cay49jlhq97jwnk9db";
-    inherit dependencies buildDependencies features;
-  };
-  mio_0_6_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "mio";
-    version = "0.6.15";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0a93wxsmkh8x38wxivhn6qdj08pj9f0j3y46p4wv3xclbq8i4aaa";
-    inherit dependencies buildDependencies features;
-  };
-  miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "miow";
-    version = "0.2.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
-    inherit dependencies buildDependencies features;
-  };
-  native_tls_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "native-tls";
-    version = "0.1.5";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "11f75qmbny5pnn6zp0vlvadrvc9ph9qsxiyn4n6q02xyd93pxxlf";
-    inherit dependencies buildDependencies features;
-  };
-  net2_0_2_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "net2";
-    version = "0.2.33";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1qnmajafgybj5wyxz9iffa8x5wgbwd2znfklmhqj7vl6lw1m65mq";
-    inherit dependencies buildDependencies features;
-  };
-  nodrop_0_1_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "nodrop";
-    version = "0.1.12";
-    authors = [ "bluss" ];
-    sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d";
-    inherit dependencies buildDependencies features;
-  };
-  num_integer_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-integer";
-    version = "0.1.39";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1f42ls46cghs13qfzgbd7syib2zc6m7hlmv1qlar6c9mdxapvvbg";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  num_traits_0_2_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num-traits";
-    version = "0.2.5";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0ql203ca6lzppksy4fsfnpz3kq96vwlwvyn3ahvnd9g6k9f5ncj0";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  num_cpus_1_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "num_cpus";
-    version = "1.8.0";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1y6qnd9r8ga6y8mvlabdrr73nc8cshjjlzbvnanzyj9b8zzkfwk2";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_0_9_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl";
-    version = "0.9.24";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0wzm3c11g3ndaqyzq36mcdcm1q4a8pmsyi33ibybhjz28g2z0f79";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_sys_0_9_33_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl-sys";
-    version = "0.9.33";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1q5f7ykkxgniwjrqifx1ssrqjzcf8fi4fzh770xrbyp8n6v14qr6";
-    build = "build/main.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pad_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pad";
-    version = "0.1.5";
-    authors = [ "Ben S <ogham@bsago.me>" ];
-    sha256 = "081qzwl58r1rn5b7m5pvy2xyfk4amm59f3i1gf95417s71gd4j53";
-    inherit dependencies buildDependencies features;
-  };
-  percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "percent-encoding";
-    version = "1.0.1";
-    authors = [ "The rust-url developers" ];
-    sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  phf_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf";
-    version = "0.7.22";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0b58l863rhmqyqsfj2d89nmdzc21g9yvvvq1m4c3a615zpcykb3i";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  phf_codegen_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_codegen";
-    version = "0.7.22";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0k8yx4gr9m6cfrvh21s6bhnh1azz13j4xih88bvm06r6blfl89fs";
-    inherit dependencies buildDependencies features;
-  };
-  phf_generator_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_generator";
-    version = "0.7.22";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "093gla320qb6rbk8z7wqqxl79zrh874sa7sxir31q2p7mrw4b70k";
-    inherit dependencies buildDependencies features;
-  };
-  phf_shared_0_7_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "phf_shared";
-    version = "0.7.22";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0ij9flicfi0ab5vpzdwbizpdyxhk891qxa8nxsqlv4sg4abqang6";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pkg_config_0_3_12_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.12";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0k343rlyv9qmplxwxn8clzkyx1zbplhnvm0psjl6s111fjqmgsgh";
-    inherit dependencies buildDependencies features;
-  };
-  pretty_assertions_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pretty_assertions";
-    version = "0.5.1";
-    authors = [ "Colin Kiegel <kiegel@gmx.de>" "Florent Fayolle <florent.fayolle69@gmail.com>" ];
-    sha256 = "0vlfprmgch79bvnp02mr8ham8wld0yrx29nbx6sv1srf5djzplj1";
-    inherit dependencies buildDependencies features;
-  };
-  proc_macro2_0_4_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "proc-macro2";
-    version = "0.4.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1qmfx3z2xvsgwsqqkhri339i4spk5wkxf5y4j8sg47ggig2y00rh";
-    inherit dependencies buildDependencies features;
-  };
-  quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quote";
-    version = "0.3.15";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
-    inherit dependencies buildDependencies features;
-  };
-  quote_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quote";
-    version = "0.6.4";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1x3sxi9vpn4sayj4lbi0wh483b4iphwfsfkkk2gj3z89sqw3wkwg";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.4.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
-    inherit dependencies buildDependencies features;
-  };
-  redox_syscall_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_syscall";
-    version = "0.1.40";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611";
-    libName = "syscall";
-    inherit dependencies buildDependencies features;
-  };
-  redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_termios";
-    version = "0.1.1";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  regex_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex";
-    version = "1.0.3";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0ksq2bc2g0xhrkpzzfr8l2vidw6c04mwgynwjbwcx7shfrwgw0lx";
-    inherit dependencies buildDependencies features;
-  };
-  regex_syntax_0_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex-syntax";
-    version = "0.6.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw";
-    inherit dependencies buildDependencies features;
-  };
-  relay_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "relay";
-    version = "0.1.1";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "16csfaslbmj25iaxs88p8wcfh2zfpkh9isg9adid0nxjxvknh07r";
-    inherit dependencies buildDependencies features;
-  };
-  remove_dir_all_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "remove_dir_all";
-    version = "0.5.1";
-    authors = [ "Aaronepower <theaaronepower@gmail.com>" ];
-    sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7";
-    inherit dependencies buildDependencies features;
-  };
-  reqwest_0_8_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "reqwest";
-    version = "0.8.7";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1wfc77jir16xcjcdjn988f8bpaldd0la1gf1piphfxydp8i7gr56";
-    inherit dependencies buildDependencies features;
-  };
-  rustc_demangle_0_1_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rustc-demangle";
-    version = "0.1.9";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax";
-    inherit dependencies buildDependencies features;
-  };
-  safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "safemem";
-    version = "0.2.0";
-    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
-    sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm";
-    inherit dependencies buildDependencies features;
-  };
-  schannel_0_1_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "schannel";
-    version = "0.1.13";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ];
-    sha256 = "033zavvq2k6z5akk38vzaglzbxzljaixgmhj9am27nr21dgaj6b3";
-    inherit dependencies buildDependencies features;
-  };
-  scoped_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scoped-tls";
-    version = "0.1.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0nblksgki698cqsclsnd6f1pq4yy34350dn2slaah9dlmx9z5xla";
-    inherit dependencies buildDependencies features;
-  };
-  scopeguard_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "scopeguard";
-    version = "0.3.3";
-    authors = [ "bluss" ];
-    sha256 = "0i1l013csrqzfz6c68pr5pi01hg5v5yahq8fsdmaxy6p8ygsjf3r";
-    inherit dependencies buildDependencies features;
-  };
-  security_framework_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "security-framework";
-    version = "0.1.16";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1kxczsaj8gz4922jl5af2gkxh71rasb6khaf3dp7ldlnw9qf2sbm";
-    inherit dependencies buildDependencies features;
-  };
-  security_framework_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "security-framework-sys";
-    version = "0.1.16";
-    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "0ai2pivdr5fyc7czbkpcrwap0imyy0r8ndarrl3n5kiv0jha1js3";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver";
-    version = "0.9.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
-    sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63";
-    inherit dependencies buildDependencies features;
-  };
-  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver-parser";
-    version = "0.7.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
-    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
-    inherit dependencies buildDependencies features;
-  };
-  serde_1_0_70_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "1.0.70";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1z1gyjf5rrs1k3j1civfzqjqs790651bwf8m31bw2pagclhnazs4";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_1_0_75_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive";
-    version = "1.0.75";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "15v35aj079qg4dqhs8wjyinqifxgbkw8zf4sk44h43q3xha6znqy";
-    procMacro = true;
-    inherit dependencies buildDependencies features;
-  };
-  serde_json_1_0_24_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_json";
-    version = "1.0.24";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1wvvc3y0202my2p00ah8ygl1794nspar9pf39fz1525jd6m6k8a1";
-    inherit dependencies buildDependencies features;
-  };
-  serde_urlencoded_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_urlencoded";
-    version = "0.5.2";
-    authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ];
-    sha256 = "0m5pigng0665qrk4ii1z84pb4lchbsswhgb863yglljskmm056m0";
-    inherit dependencies buildDependencies features;
-  };
-  siphasher_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "siphasher";
-    version = "0.2.3";
-    authors = [ "Frank Denis <github@pureftpd.org>" ];
-    sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
-    inherit dependencies buildDependencies features;
-  };
-  slab_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "slab";
-    version = "0.4.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1qy2vkgwqgj5z4ygdkh040n9yh1vz80v5flxb1xrvw3i4wxs7yx0";
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.7.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
-    inherit dependencies buildDependencies features;
-  };
-  syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "syn";
-    version = "0.11.11";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
-    inherit dependencies buildDependencies features;
-  };
-  syn_0_14_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "syn";
-    version = "0.14.5";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0b3xx5aa1shaz2i8mrvc7pmrj5lq2n6gmxyv2h1d7637gdky9smg";
-    inherit dependencies buildDependencies features;
-  };
-  synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "synom";
-    version = "0.11.3";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
-    inherit dependencies buildDependencies features;
-  };
-  synstructure_0_6_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "synstructure";
-    version = "0.6.1";
-    authors = [ "Michael Layzell <michael@thelayzells.com>" ];
-    sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk";
-    inherit dependencies buildDependencies features;
-  };
-  tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tempdir";
-    version = "0.3.7";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy";
-    inherit dependencies buildDependencies features;
-  };
-  termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "termcolor";
-    version = "0.3.6";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z";
-    inherit dependencies buildDependencies features;
-  };
-  termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "termion";
-    version = "1.5.1";
-    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
-    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
-    inherit dependencies buildDependencies features;
-  };
-  thread_local_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "thread_local";
-    version = "0.3.6";
-    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i";
-    inherit dependencies buildDependencies features;
-  };
-  time_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "time";
-    version = "0.1.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio";
-    version = "0.1.7";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0d5fj90wk05m5vbd924irg1pl1d4fn86jjw5napzanh6vbwsnr66";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_codec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-codec";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" "Bryan Burgers <bryan@burgers.io>" ];
-    sha256 = "0347ygccbj05yn9krjk4ifcy5xbv41xk7yyi9cl2cnxrc285xnm7";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_core_0_1_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-core";
-    version = "0.1.17";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1j6c5q3aakvb1hjx4r95xwl5ms8rp19k4qsr6v6ngwbvr6f9z6rs";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_executor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-executor";
-    version = "0.1.2";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1y4mwqjw438x6jskigz1knvfbpbinxfv6h43s60w6wdb80xmyg48";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_fs_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-fs";
-    version = "0.1.2";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "18rxwslv2hdmij6alpqfcm8aywcd28vw12s826ajgvkskh8jsdh2";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_io_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-io";
-    version = "0.1.7";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "08r46b5lp7929agwal1iaabdhfv309wyvd6cld1g39x5ml8x7hp2";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_reactor_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-reactor";
-    version = "0.1.2";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "11yx7fvyv1c5h097lspfrim1r67axl8y8m22y5mgny8nhly56s4m";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-service";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_tcp_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-tcp";
-    version = "0.1.0";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "19cyajkqvvbn3qqnak0qzivdq6amfjymbc30k7bbqhx4y1pcgqvh";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_threadpool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-threadpool";
-    version = "0.1.5";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "04nzjdjlir33s0z5nh3vh2h4v3vb1rwzv45jdjridrk92rqpb2vc";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_timer_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-timer";
-    version = "0.2.4";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "0imv1k4g583hh61qkh6mpx06ik9accyl4582vq0z61rr484050gi";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-tls";
-    version = "0.1.4";
-    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "07rwv3q6jbg65ln1ahzb4g648l8lcn4hvc0ax3r12bnsi1py7agp";
-    inherit dependencies buildDependencies features;
-  };
-  tokio_udp_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tokio-udp";
-    version = "0.1.1";
-    authors = [ "Carl Lerche <me@carllerche.com>" ];
-    sha256 = "1zsq3bny959dq7cnhdjrlaglrdcm63zn82jpkjs6nrrcfhb9l6z9";
-    inherit dependencies buildDependencies features;
-  };
-  toml_edit_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml_edit";
-    version = "0.1.3";
-    authors = [ "Andronik Ordian <write@reusable.software>" ];
-    sha256 = "0g5v5d141phzjk2crrgb0xcm65ysw76a01y75y597cmrg9ic6bjm";
-    inherit dependencies buildDependencies features;
-  };
-  try_lock_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "try-lock";
-    version = "0.1.0";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "0kfrqrb2xkjig54s3qfy80dpldknr19p3rmp0n82yk5929j879k3";
-    inherit dependencies buildDependencies features;
-  };
-  ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ucd-util";
-    version = "0.1.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
-    inherit dependencies buildDependencies features;
-  };
-  unicase_1_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicase";
-    version = "1.4.2";
-    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
-    sha256 = "0rbnhw2mnhcwrij3vczp0sl8zdfmvf2dlh8hly81kj7132kfj0mf";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  unicase_2_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicase";
-    version = "2.1.0";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1zzn16hh8fdx5pnbbnl32q8m2mh4vpd1jm9pdcv969ik83dw4byp";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-bidi";
-    version = "0.3.4";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
-    libName = "unicode_bidi";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-normalization";
-    version = "0.1.7";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_width_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-width";
-    version = "0.1.5";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-xid";
-    version = "0.0.4";
-    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-xid";
-    version = "0.1.0";
-    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
-    sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
-    inherit dependencies buildDependencies features;
-  };
-  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unreachable";
-    version = "1.0.0";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
-    inherit dependencies buildDependencies features;
-  };
-  url_1_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "url";
-    version = "1.7.1";
-    authors = [ "The rust-url developers" ];
-    sha256 = "1l36pbvlwdnh3zqz4wp5n6jg332wkis9pi2g3vy12xr8k4nfyk8i";
-    inherit dependencies buildDependencies features;
-  };
-  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "utf8-ranges";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
-    inherit dependencies buildDependencies features;
-  };
-  uuid_0_6_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "uuid";
-    version = "0.6.5";
-    authors = [ "Ashley Mannix<ashleymannix@live.com.au>" "Christopher Armstrong" "Dylan DPC<dylan.dpc@gmail.com>" "Hunar Roop Kahlon<hunar.roop@gmail.com>" ];
-    sha256 = "1jy15m4yxxwma0jsy070garhbgfprky23i77rawjkk75vqhnnhlf";
-    inherit dependencies buildDependencies features;
-  };
-  vcpkg_0_2_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vcpkg";
-    version = "0.2.4";
-    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
-    sha256 = "0xgk5axv1qhj4rfn2rca7768wnvzihccnajkgc6im8ndsx371nml";
-    inherit dependencies buildDependencies features;
-  };
-  version_check_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "version_check";
-    version = "0.1.4";
-    authors = [ "Sergio Benitez <sb@sergio.bz>" ];
-    sha256 = "1ghi6bw2qsj53x2vyprs883dbrq8cjzmshlamjsxvmwd2zp13bck";
-    inherit dependencies buildDependencies features;
-  };
-  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "void";
-    version = "1.0.2";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
-    inherit dependencies buildDependencies features;
-  };
-  want_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "want";
-    version = "0.0.4";
-    authors = [ "Sean McArthur <sean@seanmonstar.com>" ];
-    sha256 = "1l1qy4pvg5q71nrzfjldw9xzqhhgicj4slly1bal89hr2aaibpy0";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.3.5";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0cfdsxa5yf832r5i2z7dhdvnryyvhfp3nb32gpcaq502zgjdm3w6";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-i686-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-x86_64-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "wincolor";
-    version = "0.1.6";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47";
-    inherit dependencies buildDependencies features;
-  };
-  ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ws2_32-sys";
-    version = "0.2.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc";
-    libName = "ws2_32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  adler32_1_0_3 = { features?(adler32_1_0_3_features {}) }: adler32_1_0_3_ {};
-  adler32_1_0_3_features = f: updateFeatures f (rec {
-    adler32_1_0_3.default = (f.adler32_1_0_3.default or true);
-  }) [];
-  aho_corasick_0_6_6 = { features?(aho_corasick_0_6_6_features {}) }: aho_corasick_0_6_6_ {
-    dependencies = mapFeatures features ([ memchr_2_0_1 ]);
-  };
-  aho_corasick_0_6_6_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_6.default = (f.aho_corasick_0_6_6.default or true);
-    memchr_2_0_1.default = true;
-  }) [ memchr_2_0_1_features ];
-  ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-  };
-  ansi_term_0_11_0_features = f: updateFeatures f (rec {
-    ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
-    winapi_0_3_5.consoleapi = true;
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.errhandlingapi = true;
-    winapi_0_3_5.processenv = true;
-  }) [ winapi_0_3_5_features ];
-  arrayvec_0_4_7 = { features?(arrayvec_0_4_7_features {}) }: arrayvec_0_4_7_ {
-    dependencies = mapFeatures features ([ nodrop_0_1_12 ]);
-    features = mkFeatures (features.arrayvec_0_4_7 or {});
-  };
-  arrayvec_0_4_7_features = f: updateFeatures f (rec {
-    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or true);
-    arrayvec_0_4_7.serde =
-      (f.arrayvec_0_4_7.serde or false) ||
-      (f.arrayvec_0_4_7.serde-1 or false) ||
-      (arrayvec_0_4_7.serde-1 or false);
-    arrayvec_0_4_7.std =
-      (f.arrayvec_0_4_7.std or false) ||
-      (f.arrayvec_0_4_7.default or false) ||
-      (arrayvec_0_4_7.default or false);
-    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or false);
-  }) [ nodrop_0_1_12_features ];
-  ascii_0_7_1 = { features?(ascii_0_7_1_features {}) }: ascii_0_7_1_ {
-    features = mkFeatures (features.ascii_0_7_1 or {});
-  };
-  ascii_0_7_1_features = f: updateFeatures f (rec {
-    ascii_0_7_1.default = (f.ascii_0_7_1.default or true);
-  }) [];
-  assert_cli_0_6_3 = { features?(assert_cli_0_6_3_features {}) }: assert_cli_0_6_3_ {
-    dependencies = mapFeatures features ([ colored_1_6_1 difference_2_0_0 environment_0_1_1 failure_0_1_1 failure_derive_0_1_1 serde_json_1_0_24 ]);
-  };
-  assert_cli_0_6_3_features = f: updateFeatures f (rec {
-    assert_cli_0_6_3.default = (f.assert_cli_0_6_3.default or true);
-    colored_1_6_1.default = true;
-    difference_2_0_0.default = true;
-    environment_0_1_1.default = true;
-    failure_0_1_1.default = true;
-    failure_derive_0_1_1.default = true;
-    serde_json_1_0_24.default = true;
-  }) [ colored_1_6_1_features difference_2_0_0_features environment_0_1_1_features failure_0_1_1_features failure_derive_0_1_1_features serde_json_1_0_24_features ];
-  atty_0_2_11 = { features?(atty_0_2_11_features {}) }: atty_0_2_11_ {
-    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-  };
-  atty_0_2_11_features = f: updateFeatures f (rec {
-    atty_0_2_11.default = (f.atty_0_2_11.default or true);
-    libc_0_2_42.default = (f.libc_0_2_42.default or false);
-    termion_1_5_1.default = true;
-    winapi_0_3_5.consoleapi = true;
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.minwinbase = true;
-    winapi_0_3_5.minwindef = true;
-    winapi_0_3_5.processenv = true;
-    winapi_0_3_5.winbase = true;
-  }) [ termion_1_5_1_features libc_0_2_42_features winapi_0_3_5_features ];
-  backtrace_0_3_9 = { features?(backtrace_0_3_9_features {}) }: backtrace_0_3_9_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 rustc_demangle_0_1_9 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_9.backtrace-sys or false then [ backtrace_sys_0_1_23 ] else [])) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ ]
-      ++ (if features.backtrace_0_3_9.winapi or false then [ winapi_0_3_5 ] else [])) else []);
-    features = mkFeatures (features.backtrace_0_3_9 or {});
-  };
-  backtrace_0_3_9_features = f: updateFeatures f (rec {
-    backtrace_0_3_9.addr2line =
-      (f.backtrace_0_3_9.addr2line or false) ||
-      (f.backtrace_0_3_9.gimli-symbolize or false) ||
-      (backtrace_0_3_9.gimli-symbolize or false);
-    backtrace_0_3_9.backtrace-sys =
-      (f.backtrace_0_3_9.backtrace-sys or false) ||
-      (f.backtrace_0_3_9.libbacktrace or false) ||
-      (backtrace_0_3_9.libbacktrace or false);
-    backtrace_0_3_9.coresymbolication =
-      (f.backtrace_0_3_9.coresymbolication or false) ||
-      (f.backtrace_0_3_9.default or false) ||
-      (backtrace_0_3_9.default or false);
-    backtrace_0_3_9.dbghelp =
-      (f.backtrace_0_3_9.dbghelp or false) ||
-      (f.backtrace_0_3_9.default or false) ||
-      (backtrace_0_3_9.default or false);
-    backtrace_0_3_9.default = (f.backtrace_0_3_9.default or true);
-    backtrace_0_3_9.dladdr =
-      (f.backtrace_0_3_9.dladdr or false) ||
-      (f.backtrace_0_3_9.default or false) ||
-      (backtrace_0_3_9.default or false);
-    backtrace_0_3_9.findshlibs =
-      (f.backtrace_0_3_9.findshlibs or false) ||
-      (f.backtrace_0_3_9.gimli-symbolize or false) ||
-      (backtrace_0_3_9.gimli-symbolize or false);
-    backtrace_0_3_9.gimli =
-      (f.backtrace_0_3_9.gimli or false) ||
-      (f.backtrace_0_3_9.gimli-symbolize or false) ||
-      (backtrace_0_3_9.gimli-symbolize or false);
-    backtrace_0_3_9.libbacktrace =
-      (f.backtrace_0_3_9.libbacktrace or false) ||
-      (f.backtrace_0_3_9.default or false) ||
-      (backtrace_0_3_9.default or false);
-    backtrace_0_3_9.libunwind =
-      (f.backtrace_0_3_9.libunwind or false) ||
-      (f.backtrace_0_3_9.default or false) ||
-      (backtrace_0_3_9.default or false);
-    backtrace_0_3_9.memmap =
-      (f.backtrace_0_3_9.memmap or false) ||
-      (f.backtrace_0_3_9.gimli-symbolize or false) ||
-      (backtrace_0_3_9.gimli-symbolize or false);
-    backtrace_0_3_9.object =
-      (f.backtrace_0_3_9.object or false) ||
-      (f.backtrace_0_3_9.gimli-symbolize or false) ||
-      (backtrace_0_3_9.gimli-symbolize or false);
-    backtrace_0_3_9.rustc-serialize =
-      (f.backtrace_0_3_9.rustc-serialize or false) ||
-      (f.backtrace_0_3_9.serialize-rustc or false) ||
-      (backtrace_0_3_9.serialize-rustc or false);
-    backtrace_0_3_9.serde =
-      (f.backtrace_0_3_9.serde or false) ||
-      (f.backtrace_0_3_9.serialize-serde or false) ||
-      (backtrace_0_3_9.serialize-serde or false);
-    backtrace_0_3_9.serde_derive =
-      (f.backtrace_0_3_9.serde_derive or false) ||
-      (f.backtrace_0_3_9.serialize-serde or false) ||
-      (backtrace_0_3_9.serialize-serde or false);
-    backtrace_0_3_9.winapi =
-      (f.backtrace_0_3_9.winapi or false) ||
-      (f.backtrace_0_3_9.dbghelp or false) ||
-      (backtrace_0_3_9.dbghelp or false);
-    backtrace_sys_0_1_23.default = true;
-    cfg_if_0_1_4.default = true;
-    libc_0_2_42.default = true;
-    rustc_demangle_0_1_9.default = true;
-    winapi_0_3_5.dbghelp = true;
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.minwindef = true;
-    winapi_0_3_5.processthreadsapi = true;
-    winapi_0_3_5.std = true;
-    winapi_0_3_5.winnt = true;
-  }) [ cfg_if_0_1_4_features rustc_demangle_0_1_9_features backtrace_sys_0_1_23_features libc_0_2_42_features winapi_0_3_5_features ];
-  backtrace_sys_0_1_23 = { features?(backtrace_sys_0_1_23_features {}) }: backtrace_sys_0_1_23_ {
-    dependencies = mapFeatures features ([ libc_0_2_42 ]);
-    buildDependencies = mapFeatures features ([ cc_1_0_18 ]);
-  };
-  backtrace_sys_0_1_23_features = f: updateFeatures f (rec {
-    backtrace_sys_0_1_23.default = (f.backtrace_sys_0_1_23.default or true);
-    cc_1_0_18.default = true;
-    libc_0_2_42.default = true;
-  }) [ libc_0_2_42_features cc_1_0_18_features ];
-  base64_0_9_2 = { features?(base64_0_9_2_features {}) }: base64_0_9_2_ {
-    dependencies = mapFeatures features ([ byteorder_1_2_4 safemem_0_2_0 ]);
-  };
-  base64_0_9_2_features = f: updateFeatures f (rec {
-    base64_0_9_2.default = (f.base64_0_9_2.default or true);
-    byteorder_1_2_4.default = true;
-    safemem_0_2_0.default = true;
-  }) [ byteorder_1_2_4_features safemem_0_2_0_features ];
-  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
-    features = mkFeatures (features.bitflags_0_9_1 or {});
-  };
-  bitflags_0_9_1_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
-    bitflags_0_9_1.example_generated =
-      (f.bitflags_0_9_1.example_generated or false) ||
-      (f.bitflags_0_9_1.default or false) ||
-      (bitflags_0_9_1.default or false);
-  }) [];
-  bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
-    features = mkFeatures (features.bitflags_1_0_3 or {});
-  };
-  bitflags_1_0_3_features = f: updateFeatures f (rec {
-    bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
-  }) [];
-  build_const_0_2_1 = { features?(build_const_0_2_1_features {}) }: build_const_0_2_1_ {
-    features = mkFeatures (features.build_const_0_2_1 or {});
-  };
-  build_const_0_2_1_features = f: updateFeatures f (rec {
-    build_const_0_2_1.default = (f.build_const_0_2_1.default or true);
-    build_const_0_2_1.std =
-      (f.build_const_0_2_1.std or false) ||
-      (f.build_const_0_2_1.default or false) ||
-      (build_const_0_2_1.default or false);
-  }) [];
-  byteorder_1_2_4 = { features?(byteorder_1_2_4_features {}) }: byteorder_1_2_4_ {
-    features = mkFeatures (features.byteorder_1_2_4 or {});
-  };
-  byteorder_1_2_4_features = f: updateFeatures f (rec {
-    byteorder_1_2_4.default = (f.byteorder_1_2_4.default or true);
-    byteorder_1_2_4.std =
-      (f.byteorder_1_2_4.std or false) ||
-      (f.byteorder_1_2_4.default or false) ||
-      (byteorder_1_2_4.default or false);
-  }) [];
-  bytes_0_4_9 = { features?(bytes_0_4_9_features {}) }: bytes_0_4_9_ {
-    dependencies = mapFeatures features ([ byteorder_1_2_4 iovec_0_1_2 ]);
-    features = mkFeatures (features.bytes_0_4_9 or {});
-  };
-  bytes_0_4_9_features = f: updateFeatures f (rec {
-    byteorder_1_2_4.default = true;
-    byteorder_1_2_4.i128 =
-      (f.byteorder_1_2_4.i128 or false) ||
-      (bytes_0_4_9.i128 or false) ||
-      (f.bytes_0_4_9.i128 or false);
-    bytes_0_4_9.default = (f.bytes_0_4_9.default or true);
-    iovec_0_1_2.default = true;
-  }) [ byteorder_1_2_4_features iovec_0_1_2_features ];
-  cargo_edit_0_3_0 = { features?(cargo_edit_0_3_0_features {}) }: cargo_edit_0_3_0_ {
-    dependencies = mapFeatures features ([ atty_0_2_11 cargo_metadata_0_5_8 docopt_1_0_0 env_proxy_0_2_0 error_chain_0_11_0 pad_0_1_5 regex_1_0_3 reqwest_0_8_7 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 termcolor_0_3_6 toml_edit_0_1_3 ]);
-    features = mkFeatures (features.cargo_edit_0_3_0 or {});
-  };
-  cargo_edit_0_3_0_features = f: updateFeatures f (rec {
-    atty_0_2_11.default = true;
-    cargo_edit_0_3_0.add =
-      (f.cargo_edit_0_3_0.add or false) ||
-      (f.cargo_edit_0_3_0.default or false) ||
-      (cargo_edit_0_3_0.default or false);
-    cargo_edit_0_3_0.default = (f.cargo_edit_0_3_0.default or true);
-    cargo_edit_0_3_0.rm =
-      (f.cargo_edit_0_3_0.rm or false) ||
-      (f.cargo_edit_0_3_0.default or false) ||
-      (cargo_edit_0_3_0.default or false);
-    cargo_edit_0_3_0.upgrade =
-      (f.cargo_edit_0_3_0.upgrade or false) ||
-      (f.cargo_edit_0_3_0.default or false) ||
-      (cargo_edit_0_3_0.default or false);
-    cargo_metadata_0_5_8.default = true;
-    docopt_1_0_0.default = true;
-    env_proxy_0_2_0.default = true;
-    error_chain_0_11_0.default = true;
-    pad_0_1_5.default = true;
-    regex_1_0_3.default = true;
-    reqwest_0_8_7.default = true;
-    semver_0_9_0.default = true;
-    semver_0_9_0.serde = true;
-    serde_1_0_70.default = true;
-    serde_derive_1_0_75.default = true;
-    serde_json_1_0_24.default = true;
-    termcolor_0_3_6.default = true;
-    toml_edit_0_1_3.default = true;
-  }) [ atty_0_2_11_features cargo_metadata_0_5_8_features docopt_1_0_0_features env_proxy_0_2_0_features error_chain_0_11_0_features pad_0_1_5_features regex_1_0_3_features reqwest_0_8_7_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features termcolor_0_3_6_features toml_edit_0_1_3_features ];
-  cargo_metadata_0_5_8 = { features?(cargo_metadata_0_5_8_features {}) }: cargo_metadata_0_5_8_ {
-    dependencies = mapFeatures features ([ error_chain_0_11_0 semver_0_9_0 serde_1_0_70 serde_derive_1_0_75 serde_json_1_0_24 ]);
-    features = mkFeatures (features.cargo_metadata_0_5_8 or {});
-  };
-  cargo_metadata_0_5_8_features = f: updateFeatures f (rec {
-    cargo_metadata_0_5_8.backtrace =
-      (f.cargo_metadata_0_5_8.backtrace or false) ||
-      (f.cargo_metadata_0_5_8.default or false) ||
-      (cargo_metadata_0_5_8.default or false);
-    cargo_metadata_0_5_8.default = (f.cargo_metadata_0_5_8.default or true);
-    error_chain_0_11_0.backtrace =
-      (f.error_chain_0_11_0.backtrace or false) ||
-      (cargo_metadata_0_5_8.backtrace or false) ||
-      (f.cargo_metadata_0_5_8.backtrace or false);
-    error_chain_0_11_0.default = (f.error_chain_0_11_0.default or false);
-    semver_0_9_0.default = true;
-    semver_0_9_0.serde = true;
-    serde_1_0_70.default = true;
-    serde_derive_1_0_75.default = true;
-    serde_json_1_0_24.default = true;
-  }) [ error_chain_0_11_0_features semver_0_9_0_features serde_1_0_70_features serde_derive_1_0_75_features serde_json_1_0_24_features ];
-  cc_1_0_18 = { features?(cc_1_0_18_features {}) }: cc_1_0_18_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.cc_1_0_18 or {});
-  };
-  cc_1_0_18_features = f: updateFeatures f (rec {
-    cc_1_0_18.default = (f.cc_1_0_18.default or true);
-    cc_1_0_18.rayon =
-      (f.cc_1_0_18.rayon or false) ||
-      (f.cc_1_0_18.parallel or false) ||
-      (cc_1_0_18.parallel or false);
-  }) [];
-  cfg_if_0_1_4 = { features?(cfg_if_0_1_4_features {}) }: cfg_if_0_1_4_ {};
-  cfg_if_0_1_4_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = (f.cfg_if_0_1_4.default or true);
-  }) [];
-  chrono_0_4_5 = { features?(chrono_0_4_5_features {}) }: chrono_0_4_5_ {
-    dependencies = mapFeatures features ([ num_integer_0_1_39 num_traits_0_2_5 ]
-      ++ (if features.chrono_0_4_5.time or false then [ time_0_1_40 ] else []));
-    features = mkFeatures (features.chrono_0_4_5 or {});
-  };
-  chrono_0_4_5_features = f: updateFeatures f (rec {
-    chrono_0_4_5.clock =
-      (f.chrono_0_4_5.clock or false) ||
-      (f.chrono_0_4_5.default or false) ||
-      (chrono_0_4_5.default or false);
-    chrono_0_4_5.default = (f.chrono_0_4_5.default or true);
-    chrono_0_4_5.time =
-      (f.chrono_0_4_5.time or false) ||
-      (f.chrono_0_4_5.clock or false) ||
-      (chrono_0_4_5.clock or false);
-    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or false);
-    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
-    time_0_1_40.default = true;
-  }) [ num_integer_0_1_39_features num_traits_0_2_5_features time_0_1_40_features ];
-  colored_1_6_1 = { features?(colored_1_6_1_features {}) }: colored_1_6_1_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_2 ]);
-    features = mkFeatures (features.colored_1_6_1 or {});
-  };
-  colored_1_6_1_features = f: updateFeatures f (rec {
-    colored_1_6_1.default = (f.colored_1_6_1.default or true);
-    lazy_static_1_0_2.default = true;
-  }) [ lazy_static_1_0_2_features ];
-  combine_3_3_6 = { features?(combine_3_3_6_features {}) }: combine_3_3_6_ {
-    dependencies = mapFeatures features ([ ascii_0_7_1 byteorder_1_2_4 either_1_5_0 memchr_2_0_1 unreachable_1_0_0 ]);
-    features = mkFeatures (features.combine_3_3_6 or {});
-  };
-  combine_3_3_6_features = f: updateFeatures f (rec {
-    ascii_0_7_1.default = true;
-    byteorder_1_2_4.default = true;
-    combine_3_3_6.default = (f.combine_3_3_6.default or true);
-    combine_3_3_6.regex =
-      (f.combine_3_3_6.regex or false) ||
-      (f.combine_3_3_6.doc or false) ||
-      (combine_3_3_6.doc or false);
-    combine_3_3_6.std =
-      (f.combine_3_3_6.std or false) ||
-      (f.combine_3_3_6.default or false) ||
-      (combine_3_3_6.default or false);
-    either_1_5_0.default = true;
-    memchr_2_0_1.default = (f.memchr_2_0_1.default or false);
-    memchr_2_0_1.use_std =
-      (f.memchr_2_0_1.use_std or false) ||
-      (combine_3_3_6.std or false) ||
-      (f.combine_3_3_6.std or false);
-    unreachable_1_0_0.default = true;
-  }) [ ascii_0_7_1_features byteorder_1_2_4_features either_1_5_0_features memchr_2_0_1_features unreachable_1_0_0_features ];
-  core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ {
-    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
-  };
-  core_foundation_0_2_3_features = f: updateFeatures f (rec {
-    core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true);
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_42.default = true;
-  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
-  core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ {
-    dependencies = mapFeatures features ([ libc_0_2_42 ]);
-  };
-  core_foundation_sys_0_2_3_features = f: updateFeatures f (rec {
-    core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true);
-    libc_0_2_42.default = true;
-  }) [ libc_0_2_42_features ];
-  crc_1_8_1 = { features?(crc_1_8_1_features {}) }: crc_1_8_1_ {
-    buildDependencies = mapFeatures features ([ build_const_0_2_1 ]);
-    features = mkFeatures (features.crc_1_8_1 or {});
-  };
-  crc_1_8_1_features = f: updateFeatures f (rec {
-    build_const_0_2_1.default = true;
-    crc_1_8_1.default = (f.crc_1_8_1.default or true);
-    crc_1_8_1.std =
-      (f.crc_1_8_1.std or false) ||
-      (f.crc_1_8_1.default or false) ||
-      (crc_1_8_1.default or false);
-  }) [ build_const_0_2_1_features ];
-  crossbeam_deque_0_3_1 = { features?(crossbeam_deque_0_3_1_features {}) }: crossbeam_deque_0_3_1_ {
-    dependencies = mapFeatures features ([ crossbeam_epoch_0_4_3 crossbeam_utils_0_3_2 ]);
-  };
-  crossbeam_deque_0_3_1_features = f: updateFeatures f (rec {
-    crossbeam_deque_0_3_1.default = (f.crossbeam_deque_0_3_1.default or true);
-    crossbeam_epoch_0_4_3.default = true;
-    crossbeam_utils_0_3_2.default = true;
-  }) [ crossbeam_epoch_0_4_3_features crossbeam_utils_0_3_2_features ];
-  crossbeam_epoch_0_4_3 = { features?(crossbeam_epoch_0_4_3_features {}) }: crossbeam_epoch_0_4_3_ {
-    dependencies = mapFeatures features ([ arrayvec_0_4_7 cfg_if_0_1_4 crossbeam_utils_0_3_2 memoffset_0_2_1 scopeguard_0_3_3 ]
-      ++ (if features.crossbeam_epoch_0_4_3.lazy_static or false then [ lazy_static_1_0_2 ] else []));
-    features = mkFeatures (features.crossbeam_epoch_0_4_3 or {});
-  };
-  crossbeam_epoch_0_4_3_features = f: updateFeatures f (rec {
-    arrayvec_0_4_7.default = (f.arrayvec_0_4_7.default or false);
-    arrayvec_0_4_7.use_union =
-      (f.arrayvec_0_4_7.use_union or false) ||
-      (crossbeam_epoch_0_4_3.nightly or false) ||
-      (f.crossbeam_epoch_0_4_3.nightly or false);
-    cfg_if_0_1_4.default = true;
-    crossbeam_epoch_0_4_3.default = (f.crossbeam_epoch_0_4_3.default or true);
-    crossbeam_epoch_0_4_3.lazy_static =
-      (f.crossbeam_epoch_0_4_3.lazy_static or false) ||
-      (f.crossbeam_epoch_0_4_3.use_std or false) ||
-      (crossbeam_epoch_0_4_3.use_std or false);
-    crossbeam_epoch_0_4_3.use_std =
-      (f.crossbeam_epoch_0_4_3.use_std or false) ||
-      (f.crossbeam_epoch_0_4_3.default or false) ||
-      (crossbeam_epoch_0_4_3.default or false);
-    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or false);
-    crossbeam_utils_0_3_2.use_std =
-      (f.crossbeam_utils_0_3_2.use_std or false) ||
-      (crossbeam_epoch_0_4_3.use_std or false) ||
-      (f.crossbeam_epoch_0_4_3.use_std or false);
-    lazy_static_1_0_2.default = true;
-    memoffset_0_2_1.default = true;
-    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or false);
-  }) [ arrayvec_0_4_7_features cfg_if_0_1_4_features crossbeam_utils_0_3_2_features lazy_static_1_0_2_features memoffset_0_2_1_features scopeguard_0_3_3_features ];
-  crossbeam_utils_0_3_2 = { features?(crossbeam_utils_0_3_2_features {}) }: crossbeam_utils_0_3_2_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
-    features = mkFeatures (features.crossbeam_utils_0_3_2 or {});
-  };
-  crossbeam_utils_0_3_2_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = true;
-    crossbeam_utils_0_3_2.default = (f.crossbeam_utils_0_3_2.default or true);
-    crossbeam_utils_0_3_2.use_std =
-      (f.crossbeam_utils_0_3_2.use_std or false) ||
-      (f.crossbeam_utils_0_3_2.default or false) ||
-      (crossbeam_utils_0_3_2.default or false);
-  }) [ cfg_if_0_1_4_features ];
-  difference_2_0_0 = { features?(difference_2_0_0_features {}) }: difference_2_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.difference_2_0_0 or {});
-  };
-  difference_2_0_0_features = f: updateFeatures f (rec {
-    difference_2_0_0.default = (f.difference_2_0_0.default or true);
-    difference_2_0_0.getopts =
-      (f.difference_2_0_0.getopts or false) ||
-      (f.difference_2_0_0.bin or false) ||
-      (difference_2_0_0.bin or false);
-  }) [];
-  docopt_1_0_0 = { features?(docopt_1_0_0_features {}) }: docopt_1_0_0_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_2 regex_1_0_3 serde_1_0_70 serde_derive_1_0_75 strsim_0_7_0 ]);
-  };
-  docopt_1_0_0_features = f: updateFeatures f (rec {
-    docopt_1_0_0.default = (f.docopt_1_0_0.default or true);
-    lazy_static_1_0_2.default = true;
-    regex_1_0_3.default = true;
-    serde_1_0_70.default = true;
-    serde_derive_1_0_75.default = true;
-    strsim_0_7_0.default = true;
-  }) [ lazy_static_1_0_2_features regex_1_0_3_features serde_1_0_70_features serde_derive_1_0_75_features strsim_0_7_0_features ];
-  dtoa_0_4_3 = { features?(dtoa_0_4_3_features {}) }: dtoa_0_4_3_ {};
-  dtoa_0_4_3_features = f: updateFeatures f (rec {
-    dtoa_0_4_3.default = (f.dtoa_0_4_3.default or true);
-  }) [];
-  either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.either_1_5_0 or {});
-  };
-  either_1_5_0_features = f: updateFeatures f (rec {
-    either_1_5_0.default = (f.either_1_5_0.default or true);
-    either_1_5_0.use_std =
-      (f.either_1_5_0.use_std or false) ||
-      (f.either_1_5_0.default or false) ||
-      (either_1_5_0.default or false);
-  }) [];
-  encoding_rs_0_7_2 = { features?(encoding_rs_0_7_2_features {}) }: encoding_rs_0_7_2_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
-    features = mkFeatures (features.encoding_rs_0_7_2 or {});
-  };
-  encoding_rs_0_7_2_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = true;
-    encoding_rs_0_7_2.default = (f.encoding_rs_0_7_2.default or true);
-    encoding_rs_0_7_2.simd =
-      (f.encoding_rs_0_7_2.simd or false) ||
-      (f.encoding_rs_0_7_2.simd-accel or false) ||
-      (encoding_rs_0_7_2.simd-accel or false);
-  }) [ cfg_if_0_1_4_features ];
-  env_proxy_0_2_0 = { features?(env_proxy_0_2_0_features {}) }: env_proxy_0_2_0_ {
-    dependencies = mapFeatures features ([ log_0_3_9 url_1_7_1 ]);
-  };
-  env_proxy_0_2_0_features = f: updateFeatures f (rec {
-    env_proxy_0_2_0.default = (f.env_proxy_0_2_0.default or true);
-    log_0_3_9.default = true;
-    url_1_7_1.default = true;
-  }) [ log_0_3_9_features url_1_7_1_features ];
-  environment_0_1_1 = { features?(environment_0_1_1_features {}) }: environment_0_1_1_ {};
-  environment_0_1_1_features = f: updateFeatures f (rec {
-    environment_0_1_1.default = (f.environment_0_1_1.default or true);
-  }) [];
-  error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_9 ] else []));
-    features = mkFeatures (features.error_chain_0_11_0 or {});
-  };
-  error_chain_0_11_0_features = f: updateFeatures f (rec {
-    backtrace_0_3_9.default = true;
-    error_chain_0_11_0.backtrace =
-      (f.error_chain_0_11_0.backtrace or false) ||
-      (f.error_chain_0_11_0.default or false) ||
-      (error_chain_0_11_0.default or false);
-    error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true);
-    error_chain_0_11_0.example_generated =
-      (f.error_chain_0_11_0.example_generated or false) ||
-      (f.error_chain_0_11_0.default or false) ||
-      (error_chain_0_11_0.default or false);
-  }) [ backtrace_0_3_9_features ];
-  failure_0_1_1 = { features?(failure_0_1_1_features {}) }: failure_0_1_1_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.failure_0_1_1.backtrace or false then [ backtrace_0_3_9 ] else [])
-      ++ (if features.failure_0_1_1.failure_derive or false then [ failure_derive_0_1_1 ] else []));
-    features = mkFeatures (features.failure_0_1_1 or {});
-  };
-  failure_0_1_1_features = f: updateFeatures f (rec {
-    backtrace_0_3_9.default = true;
-    failure_0_1_1.backtrace =
-      (f.failure_0_1_1.backtrace or false) ||
-      (f.failure_0_1_1.std or false) ||
-      (failure_0_1_1.std or false);
-    failure_0_1_1.default = (f.failure_0_1_1.default or true);
-    failure_0_1_1.derive =
-      (f.failure_0_1_1.derive or false) ||
-      (f.failure_0_1_1.default or false) ||
-      (failure_0_1_1.default or false);
-    failure_0_1_1.failure_derive =
-      (f.failure_0_1_1.failure_derive or false) ||
-      (f.failure_0_1_1.derive or false) ||
-      (failure_0_1_1.derive or false);
-    failure_0_1_1.std =
-      (f.failure_0_1_1.std or false) ||
-      (f.failure_0_1_1.default or false) ||
-      (failure_0_1_1.default or false);
-    failure_derive_0_1_1.default = true;
-  }) [ backtrace_0_3_9_features failure_derive_0_1_1_features ];
-  failure_derive_0_1_1 = { features?(failure_derive_0_1_1_features {}) }: failure_derive_0_1_1_ {
-    dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 synstructure_0_6_1 ]);
-    features = mkFeatures (features.failure_derive_0_1_1 or {});
-  };
-  failure_derive_0_1_1_features = f: updateFeatures f (rec {
-    failure_derive_0_1_1.default = (f.failure_derive_0_1_1.default or true);
-    failure_derive_0_1_1.std =
-      (f.failure_derive_0_1_1.std or false) ||
-      (f.failure_derive_0_1_1.default or false) ||
-      (failure_derive_0_1_1.default or false);
-    quote_0_3_15.default = true;
-    syn_0_11_11.default = true;
-    synstructure_0_6_1.default = true;
-  }) [ quote_0_3_15_features syn_0_11_11_features synstructure_0_6_1_features ];
-  foreign_types_0_3_2 = { features?(foreign_types_0_3_2_features {}) }: foreign_types_0_3_2_ {
-    dependencies = mapFeatures features ([ foreign_types_shared_0_1_1 ]);
-  };
-  foreign_types_0_3_2_features = f: updateFeatures f (rec {
-    foreign_types_0_3_2.default = (f.foreign_types_0_3_2.default or true);
-    foreign_types_shared_0_1_1.default = true;
-  }) [ foreign_types_shared_0_1_1_features ];
-  foreign_types_shared_0_1_1 = { features?(foreign_types_shared_0_1_1_features {}) }: foreign_types_shared_0_1_1_ {};
-  foreign_types_shared_0_1_1_features = f: updateFeatures f (rec {
-    foreign_types_shared_0_1_1.default = (f.foreign_types_shared_0_1_1.default or true);
-  }) [];
-  fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
-  };
-  fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec {
-    bitflags_1_0_3.default = true;
-    fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
-    fuchsia_zircon_sys_0_3_3.default = true;
-  }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
-  fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
-  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec {
-    fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
-  }) [];
-  futures_0_1_23 = { features?(futures_0_1_23_features {}) }: futures_0_1_23_ {
-    features = mkFeatures (features.futures_0_1_23 or {});
-  };
-  futures_0_1_23_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = (f.futures_0_1_23.default or true);
-    futures_0_1_23.use_std =
-      (f.futures_0_1_23.use_std or false) ||
-      (f.futures_0_1_23.default or false) ||
-      (futures_0_1_23.default or false);
-    futures_0_1_23.with-deprecated =
-      (f.futures_0_1_23.with-deprecated or false) ||
-      (f.futures_0_1_23.default or false) ||
-      (futures_0_1_23.default or false);
-  }) [];
-  futures_cpupool_0_1_8 = { features?(futures_cpupool_0_1_8_features {}) }: futures_cpupool_0_1_8_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 num_cpus_1_8_0 ]);
-    features = mkFeatures (features.futures_cpupool_0_1_8 or {});
-  };
-  futures_cpupool_0_1_8_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = (f.futures_0_1_23.default or false);
-    futures_0_1_23.use_std = true;
-    futures_0_1_23.with-deprecated =
-      (f.futures_0_1_23.with-deprecated or false) ||
-      (futures_cpupool_0_1_8.with-deprecated or false) ||
-      (f.futures_cpupool_0_1_8.with-deprecated or false);
-    futures_cpupool_0_1_8.default = (f.futures_cpupool_0_1_8.default or true);
-    futures_cpupool_0_1_8.with-deprecated =
-      (f.futures_cpupool_0_1_8.with-deprecated or false) ||
-      (f.futures_cpupool_0_1_8.default or false) ||
-      (futures_cpupool_0_1_8.default or false);
-    num_cpus_1_8_0.default = true;
-  }) [ futures_0_1_23_features num_cpus_1_8_0_features ];
-  httparse_1_3_2 = { features?(httparse_1_3_2_features {}) }: httparse_1_3_2_ {
-    features = mkFeatures (features.httparse_1_3_2 or {});
-  };
-  httparse_1_3_2_features = f: updateFeatures f (rec {
-    httparse_1_3_2.default = (f.httparse_1_3_2.default or true);
-    httparse_1_3_2.std =
-      (f.httparse_1_3_2.std or false) ||
-      (f.httparse_1_3_2.default or false) ||
-      (httparse_1_3_2.default or false);
-  }) [];
-  hyper_0_11_27 = { features?(hyper_0_11_27_features {}) }: hyper_0_11_27_ {
-    dependencies = mapFeatures features ([ base64_0_9_2 bytes_0_4_9 futures_0_1_23 futures_cpupool_0_1_8 httparse_1_3_2 iovec_0_1_2 language_tags_0_2_2 log_0_4_3 mime_0_3_8 net2_0_2_33 percent_encoding_1_0_1 relay_0_1_1 time_0_1_40 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 unicase_2_1_0 want_0_0_4 ]);
-    features = mkFeatures (features.hyper_0_11_27 or {});
-  };
-  hyper_0_11_27_features = f: updateFeatures f (rec {
-    base64_0_9_2.default = true;
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    futures_cpupool_0_1_8.default = true;
-    httparse_1_3_2.default = true;
-    hyper_0_11_27.default = (f.hyper_0_11_27.default or true);
-    hyper_0_11_27.http =
-      (f.hyper_0_11_27.http or false) ||
-      (f.hyper_0_11_27.compat or false) ||
-      (hyper_0_11_27.compat or false);
-    hyper_0_11_27.server-proto =
-      (f.hyper_0_11_27.server-proto or false) ||
-      (f.hyper_0_11_27.default or false) ||
-      (hyper_0_11_27.default or false);
-    hyper_0_11_27.tokio-proto =
-      (f.hyper_0_11_27.tokio-proto or false) ||
-      (f.hyper_0_11_27.server-proto or false) ||
-      (hyper_0_11_27.server-proto or false);
-    iovec_0_1_2.default = true;
-    language_tags_0_2_2.default = true;
-    log_0_4_3.default = true;
-    mime_0_3_8.default = true;
-    net2_0_2_33.default = true;
-    percent_encoding_1_0_1.default = true;
-    relay_0_1_1.default = true;
-    time_0_1_40.default = true;
-    tokio_core_0_1_17.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_service_0_1_0.default = true;
-    unicase_2_1_0.default = true;
-    want_0_0_4.default = true;
-  }) [ base64_0_9_2_features bytes_0_4_9_features futures_0_1_23_features futures_cpupool_0_1_8_features httparse_1_3_2_features iovec_0_1_2_features language_tags_0_2_2_features log_0_4_3_features mime_0_3_8_features net2_0_2_33_features percent_encoding_1_0_1_features relay_0_1_1_features time_0_1_40_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features unicase_2_1_0_features want_0_0_4_features ];
-  hyper_tls_0_1_4 = { features?(hyper_tls_0_1_4_features {}) }: hyper_tls_0_1_4_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 hyper_0_11_27 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 tokio_service_0_1_0 tokio_tls_0_1_4 ]);
-  };
-  hyper_tls_0_1_4_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    hyper_0_11_27.default = (f.hyper_0_11_27.default or false);
-    hyper_tls_0_1_4.default = (f.hyper_tls_0_1_4.default or true);
-    native_tls_0_1_5.default = true;
-    tokio_core_0_1_17.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_service_0_1_0.default = true;
-    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false);
-  }) [ futures_0_1_23_features hyper_0_11_27_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_service_0_1_0_features tokio_tls_0_1_4_features ];
-  idna_0_1_5 = { features?(idna_0_1_5_features {}) }: idna_0_1_5_ {
-    dependencies = mapFeatures features ([ matches_0_1_7 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
-  };
-  idna_0_1_5_features = f: updateFeatures f (rec {
-    idna_0_1_5.default = (f.idna_0_1_5.default or true);
-    matches_0_1_7.default = true;
-    unicode_bidi_0_3_4.default = true;
-    unicode_normalization_0_1_7.default = true;
-  }) [ matches_0_1_7_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
-  iovec_0_1_2 = { features?(iovec_0_1_2_features {}) }: iovec_0_1_2_ {
-    dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []);
-  };
-  iovec_0_1_2_features = f: updateFeatures f (rec {
-    iovec_0_1_2.default = (f.iovec_0_1_2.default or true);
-    libc_0_2_42.default = true;
-    winapi_0_2_8.default = true;
-  }) [ libc_0_2_42_features winapi_0_2_8_features ];
-  itoa_0_4_2 = { features?(itoa_0_4_2_features {}) }: itoa_0_4_2_ {
-    features = mkFeatures (features.itoa_0_4_2 or {});
-  };
-  itoa_0_4_2_features = f: updateFeatures f (rec {
-    itoa_0_4_2.default = (f.itoa_0_4_2.default or true);
-    itoa_0_4_2.std =
-      (f.itoa_0_4_2.std or false) ||
-      (f.itoa_0_4_2.default or false) ||
-      (itoa_0_4_2.default or false);
-  }) [];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.language_tags_0_2_2 or {});
-  };
-  language_tags_0_2_2_features = f: updateFeatures f (rec {
-    language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true);
-    language_tags_0_2_2.heapsize =
-      (f.language_tags_0_2_2.heapsize or false) ||
-      (f.language_tags_0_2_2.heap_size or false) ||
-      (language_tags_0_2_2.heap_size or false);
-    language_tags_0_2_2.heapsize_plugin =
-      (f.language_tags_0_2_2.heapsize_plugin or false) ||
-      (f.language_tags_0_2_2.heap_size or false) ||
-      (language_tags_0_2_2.heap_size or false);
-  }) [];
-  lazy_static_0_2_11 = { features?(lazy_static_0_2_11_features {}) }: lazy_static_0_2_11_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_0_2_11 or {});
-  };
-  lazy_static_0_2_11_features = f: updateFeatures f (rec {
-    lazy_static_0_2_11.compiletest_rs =
-      (f.lazy_static_0_2_11.compiletest_rs or false) ||
-      (f.lazy_static_0_2_11.compiletest or false) ||
-      (lazy_static_0_2_11.compiletest or false);
-    lazy_static_0_2_11.default = (f.lazy_static_0_2_11.default or true);
-    lazy_static_0_2_11.nightly =
-      (f.lazy_static_0_2_11.nightly or false) ||
-      (f.lazy_static_0_2_11.spin_no_std or false) ||
-      (lazy_static_0_2_11.spin_no_std or false);
-    lazy_static_0_2_11.spin =
-      (f.lazy_static_0_2_11.spin or false) ||
-      (f.lazy_static_0_2_11.spin_no_std or false) ||
-      (lazy_static_0_2_11.spin_no_std or false);
-  }) [];
-  lazy_static_1_0_2 = { features?(lazy_static_1_0_2_features {}) }: lazy_static_1_0_2_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_1_0_2 or {});
-  };
-  lazy_static_1_0_2_features = f: updateFeatures f (rec {
-    lazy_static_1_0_2.default = (f.lazy_static_1_0_2.default or true);
-    lazy_static_1_0_2.nightly =
-      (f.lazy_static_1_0_2.nightly or false) ||
-      (f.lazy_static_1_0_2.spin_no_std or false) ||
-      (lazy_static_1_0_2.spin_no_std or false);
-    lazy_static_1_0_2.spin =
-      (f.lazy_static_1_0_2.spin or false) ||
-      (f.lazy_static_1_0_2.spin_no_std or false) ||
-      (lazy_static_1_0_2.spin_no_std or false);
-  }) [];
-  lazycell_0_6_0 = { features?(lazycell_0_6_0_features {}) }: lazycell_0_6_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazycell_0_6_0 or {});
-  };
-  lazycell_0_6_0_features = f: updateFeatures f (rec {
-    lazycell_0_6_0.clippy =
-      (f.lazycell_0_6_0.clippy or false) ||
-      (f.lazycell_0_6_0.nightly-testing or false) ||
-      (lazycell_0_6_0.nightly-testing or false);
-    lazycell_0_6_0.default = (f.lazycell_0_6_0.default or true);
-    lazycell_0_6_0.nightly =
-      (f.lazycell_0_6_0.nightly or false) ||
-      (f.lazycell_0_6_0.nightly-testing or false) ||
-      (lazycell_0_6_0.nightly-testing or false);
-  }) [];
-  libc_0_2_42 = { features?(libc_0_2_42_features {}) }: libc_0_2_42_ {
-    features = mkFeatures (features.libc_0_2_42 or {});
-  };
-  libc_0_2_42_features = f: updateFeatures f (rec {
-    libc_0_2_42.default = (f.libc_0_2_42.default or true);
-    libc_0_2_42.use_std =
-      (f.libc_0_2_42.use_std or false) ||
-      (f.libc_0_2_42.default or false) ||
-      (libc_0_2_42.default or false);
-  }) [];
-  libflate_0_1_16 = { features?(libflate_0_1_16_features {}) }: libflate_0_1_16_ {
-    dependencies = mapFeatures features ([ adler32_1_0_3 byteorder_1_2_4 crc_1_8_1 ]);
-  };
-  libflate_0_1_16_features = f: updateFeatures f (rec {
-    adler32_1_0_3.default = true;
-    byteorder_1_2_4.default = true;
-    crc_1_8_1.default = true;
-    libflate_0_1_16.default = (f.libflate_0_1_16.default or true);
-  }) [ adler32_1_0_3_features byteorder_1_2_4_features crc_1_8_1_features ];
-  linked_hash_map_0_5_1 = { features?(linked_hash_map_0_5_1_features {}) }: linked_hash_map_0_5_1_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.linked_hash_map_0_5_1 or {});
-  };
-  linked_hash_map_0_5_1_features = f: updateFeatures f (rec {
-    linked_hash_map_0_5_1.default = (f.linked_hash_map_0_5_1.default or true);
-    linked_hash_map_0_5_1.heapsize =
-      (f.linked_hash_map_0_5_1.heapsize or false) ||
-      (f.linked_hash_map_0_5_1.heapsize_impl or false) ||
-      (linked_hash_map_0_5_1.heapsize_impl or false);
-    linked_hash_map_0_5_1.serde =
-      (f.linked_hash_map_0_5_1.serde or false) ||
-      (f.linked_hash_map_0_5_1.serde_impl or false) ||
-      (linked_hash_map_0_5_1.serde_impl or false);
-    linked_hash_map_0_5_1.serde_test =
-      (f.linked_hash_map_0_5_1.serde_test or false) ||
-      (f.linked_hash_map_0_5_1.serde_impl or false) ||
-      (linked_hash_map_0_5_1.serde_impl or false);
-  }) [];
-  log_0_3_9 = { features?(log_0_3_9_features {}) }: log_0_3_9_ {
-    dependencies = mapFeatures features ([ log_0_4_3 ]);
-    features = mkFeatures (features.log_0_3_9 or {});
-  };
-  log_0_3_9_features = f: updateFeatures f (rec {
-    log_0_3_9.default = (f.log_0_3_9.default or true);
-    log_0_3_9.use_std =
-      (f.log_0_3_9.use_std or false) ||
-      (f.log_0_3_9.default or false) ||
-      (log_0_3_9.default or false);
-    log_0_4_3.default = true;
-    log_0_4_3.max_level_debug =
-      (f.log_0_4_3.max_level_debug or false) ||
-      (log_0_3_9.max_level_debug or false) ||
-      (f.log_0_3_9.max_level_debug or false);
-    log_0_4_3.max_level_error =
-      (f.log_0_4_3.max_level_error or false) ||
-      (log_0_3_9.max_level_error or false) ||
-      (f.log_0_3_9.max_level_error or false);
-    log_0_4_3.max_level_info =
-      (f.log_0_4_3.max_level_info or false) ||
-      (log_0_3_9.max_level_info or false) ||
-      (f.log_0_3_9.max_level_info or false);
-    log_0_4_3.max_level_off =
-      (f.log_0_4_3.max_level_off or false) ||
-      (log_0_3_9.max_level_off or false) ||
-      (f.log_0_3_9.max_level_off or false);
-    log_0_4_3.max_level_trace =
-      (f.log_0_4_3.max_level_trace or false) ||
-      (log_0_3_9.max_level_trace or false) ||
-      (f.log_0_3_9.max_level_trace or false);
-    log_0_4_3.max_level_warn =
-      (f.log_0_4_3.max_level_warn or false) ||
-      (log_0_3_9.max_level_warn or false) ||
-      (f.log_0_3_9.max_level_warn or false);
-    log_0_4_3.release_max_level_debug =
-      (f.log_0_4_3.release_max_level_debug or false) ||
-      (log_0_3_9.release_max_level_debug or false) ||
-      (f.log_0_3_9.release_max_level_debug or false);
-    log_0_4_3.release_max_level_error =
-      (f.log_0_4_3.release_max_level_error or false) ||
-      (log_0_3_9.release_max_level_error or false) ||
-      (f.log_0_3_9.release_max_level_error or false);
-    log_0_4_3.release_max_level_info =
-      (f.log_0_4_3.release_max_level_info or false) ||
-      (log_0_3_9.release_max_level_info or false) ||
-      (f.log_0_3_9.release_max_level_info or false);
-    log_0_4_3.release_max_level_off =
-      (f.log_0_4_3.release_max_level_off or false) ||
-      (log_0_3_9.release_max_level_off or false) ||
-      (f.log_0_3_9.release_max_level_off or false);
-    log_0_4_3.release_max_level_trace =
-      (f.log_0_4_3.release_max_level_trace or false) ||
-      (log_0_3_9.release_max_level_trace or false) ||
-      (f.log_0_3_9.release_max_level_trace or false);
-    log_0_4_3.release_max_level_warn =
-      (f.log_0_4_3.release_max_level_warn or false) ||
-      (log_0_3_9.release_max_level_warn or false) ||
-      (f.log_0_3_9.release_max_level_warn or false);
-    log_0_4_3.std =
-      (f.log_0_4_3.std or false) ||
-      (log_0_3_9.use_std or false) ||
-      (f.log_0_3_9.use_std or false);
-  }) [ log_0_4_3_features ];
-  log_0_4_3 = { features?(log_0_4_3_features {}) }: log_0_4_3_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]);
-    features = mkFeatures (features.log_0_4_3 or {});
-  };
-  log_0_4_3_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = true;
-    log_0_4_3.default = (f.log_0_4_3.default or true);
-  }) [ cfg_if_0_1_4_features ];
-  matches_0_1_7 = { features?(matches_0_1_7_features {}) }: matches_0_1_7_ {};
-  matches_0_1_7_features = f: updateFeatures f (rec {
-    matches_0_1_7.default = (f.matches_0_1_7.default or true);
-  }) [];
-  memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_42 ] else []));
-    features = mkFeatures (features.memchr_2_0_1 or {});
-  };
-  memchr_2_0_1_features = f: updateFeatures f (rec {
-    libc_0_2_42.default = (f.libc_0_2_42.default or false);
-    libc_0_2_42.use_std =
-      (f.libc_0_2_42.use_std or false) ||
-      (memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.use_std or false);
-    memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
-    memchr_2_0_1.libc =
-      (f.memchr_2_0_1.libc or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false) ||
-      (f.memchr_2_0_1.use_std or false) ||
-      (memchr_2_0_1.use_std or false);
-    memchr_2_0_1.use_std =
-      (f.memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false);
-  }) [ libc_0_2_42_features ];
-  memoffset_0_2_1 = { features?(memoffset_0_2_1_features {}) }: memoffset_0_2_1_ {};
-  memoffset_0_2_1_features = f: updateFeatures f (rec {
-    memoffset_0_2_1.default = (f.memoffset_0_2_1.default or true);
-  }) [];
-  mime_0_3_8 = { features?(mime_0_3_8_features {}) }: mime_0_3_8_ {
-    dependencies = mapFeatures features ([ unicase_2_1_0 ]);
-  };
-  mime_0_3_8_features = f: updateFeatures f (rec {
-    mime_0_3_8.default = (f.mime_0_3_8.default or true);
-    unicase_2_1_0.default = true;
-  }) [ unicase_2_1_0_features ];
-  mime_guess_2_0_0_alpha_6 = { features?(mime_guess_2_0_0_alpha_6_features {}) }: mime_guess_2_0_0_alpha_6_ {
-    dependencies = mapFeatures features ([ mime_0_3_8 phf_0_7_22 unicase_1_4_2 ]);
-    buildDependencies = mapFeatures features ([ phf_codegen_0_7_22 unicase_1_4_2 ]);
-    features = mkFeatures (features.mime_guess_2_0_0_alpha_6 or {});
-  };
-  mime_guess_2_0_0_alpha_6_features = f: updateFeatures f (rec {
-    mime_0_3_8.default = true;
-    mime_guess_2_0_0_alpha_6.default = (f.mime_guess_2_0_0_alpha_6.default or true);
-    phf_0_7_22.default = true;
-    phf_0_7_22.unicase = true;
-    phf_codegen_0_7_22.default = true;
-    unicase_1_4_2.default = true;
-  }) [ mime_0_3_8_features phf_0_7_22_features unicase_1_4_2_features phf_codegen_0_7_22_features unicase_1_4_2_features ];
-  mio_0_6_15 = { features?(mio_0_6_15_features {}) }: mio_0_6_15_ {
-    dependencies = mapFeatures features ([ iovec_0_1_2 lazycell_0_6_0 log_0_4_3 net2_0_2_33 slab_0_4_0 ])
-      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 fuchsia_zircon_sys_0_3_3 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []);
-    features = mkFeatures (features.mio_0_6_15 or {});
-  };
-  mio_0_6_15_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_3_3.default = true;
-    fuchsia_zircon_sys_0_3_3.default = true;
-    iovec_0_1_2.default = true;
-    kernel32_sys_0_2_2.default = true;
-    lazycell_0_6_0.default = true;
-    libc_0_2_42.default = true;
-    log_0_4_3.default = true;
-    mio_0_6_15.default = (f.mio_0_6_15.default or true);
-    mio_0_6_15.with-deprecated =
-      (f.mio_0_6_15.with-deprecated or false) ||
-      (f.mio_0_6_15.default or false) ||
-      (mio_0_6_15.default or false);
-    miow_0_2_1.default = true;
-    net2_0_2_33.default = true;
-    slab_0_4_0.default = true;
-    winapi_0_2_8.default = true;
-  }) [ iovec_0_1_2_features lazycell_0_6_0_features log_0_4_3_features net2_0_2_33_features slab_0_4_0_features fuchsia_zircon_0_3_3_features fuchsia_zircon_sys_0_3_3_features libc_0_2_42_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ];
-  miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ {
-    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_33 winapi_0_2_8 ws2_32_sys_0_2_1 ]);
-  };
-  miow_0_2_1_features = f: updateFeatures f (rec {
-    kernel32_sys_0_2_2.default = true;
-    miow_0_2_1.default = (f.miow_0_2_1.default or true);
-    net2_0_2_33.default = (f.net2_0_2_33.default or false);
-    winapi_0_2_8.default = true;
-    ws2_32_sys_0_2_1.default = true;
-  }) [ kernel32_sys_0_2_2_features net2_0_2_33_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ];
-  native_tls_0_1_5 = { features?(native_tls_0_1_5_features {}) }: native_tls_0_1_5_ {
-    dependencies = mapFeatures features ([ lazy_static_0_2_11 ])
-      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([ libc_0_2_42 security_framework_0_1_16 security_framework_sys_0_1_16 tempdir_0_3_7 ]) else [])
-      ++ (if !(kernel == "windows" || kernel == "darwin" || kernel == "ios") then mapFeatures features ([ openssl_0_9_24 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_13 ]) else []);
-  };
-  native_tls_0_1_5_features = f: updateFeatures f (rec {
-    lazy_static_0_2_11.default = true;
-    libc_0_2_42.default = true;
-    native_tls_0_1_5.default = (f.native_tls_0_1_5.default or true);
-    openssl_0_9_24.default = true;
-    schannel_0_1_13.default = true;
-    security_framework_0_1_16.OSX_10_8 = true;
-    security_framework_0_1_16.default = true;
-    security_framework_sys_0_1_16.default = true;
-    tempdir_0_3_7.default = true;
-  }) [ lazy_static_0_2_11_features libc_0_2_42_features security_framework_0_1_16_features security_framework_sys_0_1_16_features tempdir_0_3_7_features openssl_0_9_24_features schannel_0_1_13_features ];
-  net2_0_2_33 = { features?(net2_0_2_33_features {}) }: net2_0_2_33_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 ])
-      ++ (if kernel == "redox" || (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-    features = mkFeatures (features.net2_0_2_33 or {});
-  };
-  net2_0_2_33_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = true;
-    libc_0_2_42.default = true;
-    net2_0_2_33.default = (f.net2_0_2_33.default or true);
-    net2_0_2_33.duration =
-      (f.net2_0_2_33.duration or false) ||
-      (f.net2_0_2_33.default or false) ||
-      (net2_0_2_33.default or false);
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.handleapi = true;
-    winapi_0_3_5.winsock2 = true;
-    winapi_0_3_5.ws2def = true;
-    winapi_0_3_5.ws2ipdef = true;
-    winapi_0_3_5.ws2tcpip = true;
-  }) [ cfg_if_0_1_4_features libc_0_2_42_features winapi_0_3_5_features ];
-  nodrop_0_1_12 = { features?(nodrop_0_1_12_features {}) }: nodrop_0_1_12_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.nodrop_0_1_12 or {});
-  };
-  nodrop_0_1_12_features = f: updateFeatures f (rec {
-    nodrop_0_1_12.default = (f.nodrop_0_1_12.default or true);
-    nodrop_0_1_12.nodrop-union =
-      (f.nodrop_0_1_12.nodrop-union or false) ||
-      (f.nodrop_0_1_12.use_union or false) ||
-      (nodrop_0_1_12.use_union or false);
-    nodrop_0_1_12.std =
-      (f.nodrop_0_1_12.std or false) ||
-      (f.nodrop_0_1_12.default or false) ||
-      (nodrop_0_1_12.default or false);
-  }) [];
-  num_integer_0_1_39 = { features?(num_integer_0_1_39_features {}) }: num_integer_0_1_39_ {
-    dependencies = mapFeatures features ([ num_traits_0_2_5 ]);
-    features = mkFeatures (features.num_integer_0_1_39 or {});
-  };
-  num_integer_0_1_39_features = f: updateFeatures f (rec {
-    num_integer_0_1_39.default = (f.num_integer_0_1_39.default or true);
-    num_integer_0_1_39.std =
-      (f.num_integer_0_1_39.std or false) ||
-      (f.num_integer_0_1_39.default or false) ||
-      (num_integer_0_1_39.default or false);
-    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or false);
-    num_traits_0_2_5.i128 =
-      (f.num_traits_0_2_5.i128 or false) ||
-      (num_integer_0_1_39.i128 or false) ||
-      (f.num_integer_0_1_39.i128 or false);
-    num_traits_0_2_5.std =
-      (f.num_traits_0_2_5.std or false) ||
-      (num_integer_0_1_39.std or false) ||
-      (f.num_integer_0_1_39.std or false);
-  }) [ num_traits_0_2_5_features ];
-  num_traits_0_2_5 = { features?(num_traits_0_2_5_features {}) }: num_traits_0_2_5_ {
-    features = mkFeatures (features.num_traits_0_2_5 or {});
-  };
-  num_traits_0_2_5_features = f: updateFeatures f (rec {
-    num_traits_0_2_5.default = (f.num_traits_0_2_5.default or true);
-    num_traits_0_2_5.std =
-      (f.num_traits_0_2_5.std or false) ||
-      (f.num_traits_0_2_5.default or false) ||
-      (num_traits_0_2_5.default or false);
-  }) [];
-  num_cpus_1_8_0 = { features?(num_cpus_1_8_0_features {}) }: num_cpus_1_8_0_ {
-    dependencies = mapFeatures features ([ libc_0_2_42 ]);
-  };
-  num_cpus_1_8_0_features = f: updateFeatures f (rec {
-    libc_0_2_42.default = true;
-    num_cpus_1_8_0.default = (f.num_cpus_1_8_0.default or true);
-  }) [ libc_0_2_42_features ];
-  openssl_0_9_24 = { features?(openssl_0_9_24_features {}) }: openssl_0_9_24_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_3_2 lazy_static_1_0_2 libc_0_2_42 openssl_sys_0_9_33 ]);
-    features = mkFeatures (features.openssl_0_9_24 or {});
-  };
-  openssl_0_9_24_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = true;
-    foreign_types_0_3_2.default = true;
-    lazy_static_1_0_2.default = true;
-    libc_0_2_42.default = true;
-    openssl_0_9_24.default = (f.openssl_0_9_24.default or true);
-    openssl_sys_0_9_33.default = true;
-  }) [ bitflags_0_9_1_features foreign_types_0_3_2_features lazy_static_1_0_2_features libc_0_2_42_features openssl_sys_0_9_33_features ];
-  openssl_sys_0_9_33 = { features?(openssl_sys_0_9_33_features {}) }: openssl_sys_0_9_33_ {
-    dependencies = mapFeatures features ([ libc_0_2_42 ])
-      ++ (if abi == "msvc" then mapFeatures features ([]) else []);
-    buildDependencies = mapFeatures features ([ cc_1_0_18 pkg_config_0_3_12 ]);
-  };
-  openssl_sys_0_9_33_features = f: updateFeatures f (rec {
-    cc_1_0_18.default = true;
-    libc_0_2_42.default = true;
-    openssl_sys_0_9_33.default = (f.openssl_sys_0_9_33.default or true);
-    pkg_config_0_3_12.default = true;
-  }) [ libc_0_2_42_features cc_1_0_18_features pkg_config_0_3_12_features ];
-  pad_0_1_5 = { features?(pad_0_1_5_features {}) }: pad_0_1_5_ {
-    dependencies = mapFeatures features ([ unicode_width_0_1_5 ]);
-  };
-  pad_0_1_5_features = f: updateFeatures f (rec {
-    pad_0_1_5.default = (f.pad_0_1_5.default or true);
-    unicode_width_0_1_5.default = true;
-  }) [ unicode_width_0_1_5_features ];
-  percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
-  percent_encoding_1_0_1_features = f: updateFeatures f (rec {
-    percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
-  }) [];
-  phf_0_7_22 = { features?(phf_0_7_22_features {}) }: phf_0_7_22_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_22 ]);
-    features = mkFeatures (features.phf_0_7_22 or {});
-  };
-  phf_0_7_22_features = f: updateFeatures f (rec {
-    phf_0_7_22.default = (f.phf_0_7_22.default or true);
-    phf_shared_0_7_22.core =
-      (f.phf_shared_0_7_22.core or false) ||
-      (phf_0_7_22.core or false) ||
-      (f.phf_0_7_22.core or false);
-    phf_shared_0_7_22.default = true;
-    phf_shared_0_7_22.unicase =
-      (f.phf_shared_0_7_22.unicase or false) ||
-      (phf_0_7_22.unicase or false) ||
-      (f.phf_0_7_22.unicase or false);
-  }) [ phf_shared_0_7_22_features ];
-  phf_codegen_0_7_22 = { features?(phf_codegen_0_7_22_features {}) }: phf_codegen_0_7_22_ {
-    dependencies = mapFeatures features ([ phf_generator_0_7_22 phf_shared_0_7_22 ]);
-  };
-  phf_codegen_0_7_22_features = f: updateFeatures f (rec {
-    phf_codegen_0_7_22.default = (f.phf_codegen_0_7_22.default or true);
-    phf_generator_0_7_22.default = true;
-    phf_shared_0_7_22.default = true;
-  }) [ phf_generator_0_7_22_features phf_shared_0_7_22_features ];
-  phf_generator_0_7_22 = { features?(phf_generator_0_7_22_features {}) }: phf_generator_0_7_22_ {
-    dependencies = mapFeatures features ([ phf_shared_0_7_22 rand_0_4_2 ]);
-  };
-  phf_generator_0_7_22_features = f: updateFeatures f (rec {
-    phf_generator_0_7_22.default = (f.phf_generator_0_7_22.default or true);
-    phf_shared_0_7_22.default = true;
-    rand_0_4_2.default = true;
-  }) [ phf_shared_0_7_22_features rand_0_4_2_features ];
-  phf_shared_0_7_22 = { features?(phf_shared_0_7_22_features {}) }: phf_shared_0_7_22_ {
-    dependencies = mapFeatures features ([ siphasher_0_2_3 ]
-      ++ (if features.phf_shared_0_7_22.unicase or false then [ unicase_1_4_2 ] else []));
-    features = mkFeatures (features.phf_shared_0_7_22 or {});
-  };
-  phf_shared_0_7_22_features = f: updateFeatures f (rec {
-    phf_shared_0_7_22.default = (f.phf_shared_0_7_22.default or true);
-    siphasher_0_2_3.default = true;
-    unicase_1_4_2.default = true;
-  }) [ siphasher_0_2_3_features unicase_1_4_2_features ];
-  pkg_config_0_3_12 = { features?(pkg_config_0_3_12_features {}) }: pkg_config_0_3_12_ {};
-  pkg_config_0_3_12_features = f: updateFeatures f (rec {
-    pkg_config_0_3_12.default = (f.pkg_config_0_3_12.default or true);
-  }) [];
-  pretty_assertions_0_5_1 = { features?(pretty_assertions_0_5_1_features {}) }: pretty_assertions_0_5_1_ {
-    dependencies = mapFeatures features ([ ansi_term_0_11_0 difference_2_0_0 ]);
-  };
-  pretty_assertions_0_5_1_features = f: updateFeatures f (rec {
-    ansi_term_0_11_0.default = true;
-    difference_2_0_0.default = true;
-    pretty_assertions_0_5_1.default = (f.pretty_assertions_0_5_1.default or true);
-  }) [ ansi_term_0_11_0_features difference_2_0_0_features ];
-  proc_macro2_0_4_9 = { features?(proc_macro2_0_4_9_features {}) }: proc_macro2_0_4_9_ {
-    dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
-    features = mkFeatures (features.proc_macro2_0_4_9 or {});
-  };
-  proc_macro2_0_4_9_features = f: updateFeatures f (rec {
-    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or true);
-    proc_macro2_0_4_9.proc-macro =
-      (f.proc_macro2_0_4_9.proc-macro or false) ||
-      (f.proc_macro2_0_4_9.default or false) ||
-      (proc_macro2_0_4_9.default or false) ||
-      (f.proc_macro2_0_4_9.nightly or false) ||
-      (proc_macro2_0_4_9.nightly or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ unicode_xid_0_1_0_features ];
-  quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
-  quote_0_3_15_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = (f.quote_0_3_15.default or true);
-  }) [];
-  quote_0_6_4 = { features?(quote_0_6_4_features {}) }: quote_0_6_4_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_4_9 ]);
-    features = mkFeatures (features.quote_0_6_4 or {});
-  };
-  quote_0_6_4_features = f: updateFeatures f (rec {
-    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false);
-    proc_macro2_0_4_9.proc-macro =
-      (f.proc_macro2_0_4_9.proc-macro or false) ||
-      (quote_0_6_4.proc-macro or false) ||
-      (f.quote_0_6_4.proc-macro or false);
-    quote_0_6_4.default = (f.quote_0_6_4.default or true);
-    quote_0_6_4.proc-macro =
-      (f.quote_0_6_4.proc-macro or false) ||
-      (f.quote_0_6_4.default or false) ||
-      (quote_0_6_4.default or false);
-  }) [ proc_macro2_0_4_9_features ];
-  rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
-    dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
-      ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_42 ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-    features = mkFeatures (features.rand_0_4_2 or {});
-  };
-  rand_0_4_2_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_3_3.default = true;
-    libc_0_2_42.default = true;
-    rand_0_4_2.default = (f.rand_0_4_2.default or true);
-    rand_0_4_2.i128_support =
-      (f.rand_0_4_2.i128_support or false) ||
-      (f.rand_0_4_2.nightly or false) ||
-      (rand_0_4_2.nightly or false);
-    rand_0_4_2.libc =
-      (f.rand_0_4_2.libc or false) ||
-      (f.rand_0_4_2.std or false) ||
-      (rand_0_4_2.std or false);
-    rand_0_4_2.std =
-      (f.rand_0_4_2.std or false) ||
-      (f.rand_0_4_2.default or false) ||
-      (rand_0_4_2.default or false);
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.minwindef = true;
-    winapi_0_3_5.ntsecapi = true;
-    winapi_0_3_5.profileapi = true;
-    winapi_0_3_5.winnt = true;
-  }) [ fuchsia_zircon_0_3_3_features libc_0_2_42_features winapi_0_3_5_features ];
-  redox_syscall_0_1_40 = { features?(redox_syscall_0_1_40_features {}) }: redox_syscall_0_1_40_ {};
-  redox_syscall_0_1_40_features = f: updateFeatures f (rec {
-    redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true);
-  }) [];
-  redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
-    dependencies = mapFeatures features ([ redox_syscall_0_1_40 ]);
-  };
-  redox_termios_0_1_1_features = f: updateFeatures f (rec {
-    redox_syscall_0_1_40.default = true;
-    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
-  }) [ redox_syscall_0_1_40_features ];
-  regex_1_0_3 = { features?(regex_1_0_3_features {}) }: regex_1_0_3_ {
-    dependencies = mapFeatures features ([ aho_corasick_0_6_6 memchr_2_0_1 regex_syntax_0_6_2 thread_local_0_3_6 utf8_ranges_1_0_0 ]);
-    features = mkFeatures (features.regex_1_0_3 or {});
-  };
-  regex_1_0_3_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_6.default = true;
-    memchr_2_0_1.default = true;
-    regex_1_0_3.default = (f.regex_1_0_3.default or true);
-    regex_1_0_3.pattern =
-      (f.regex_1_0_3.pattern or false) ||
-      (f.regex_1_0_3.unstable or false) ||
-      (regex_1_0_3.unstable or false);
-    regex_1_0_3.use_std =
-      (f.regex_1_0_3.use_std or false) ||
-      (f.regex_1_0_3.default or false) ||
-      (regex_1_0_3.default or false);
-    regex_syntax_0_6_2.default = true;
-    thread_local_0_3_6.default = true;
-    utf8_ranges_1_0_0.default = true;
-  }) [ aho_corasick_0_6_6_features memchr_2_0_1_features regex_syntax_0_6_2_features thread_local_0_3_6_features utf8_ranges_1_0_0_features ];
-  regex_syntax_0_6_2 = { features?(regex_syntax_0_6_2_features {}) }: regex_syntax_0_6_2_ {
-    dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
-  };
-  regex_syntax_0_6_2_features = f: updateFeatures f (rec {
-    regex_syntax_0_6_2.default = (f.regex_syntax_0_6_2.default or true);
-    ucd_util_0_1_1.default = true;
-  }) [ ucd_util_0_1_1_features ];
-  relay_0_1_1 = { features?(relay_0_1_1_features {}) }: relay_0_1_1_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 ]);
-  };
-  relay_0_1_1_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    relay_0_1_1.default = (f.relay_0_1_1.default or true);
-  }) [ futures_0_1_23_features ];
-  remove_dir_all_0_5_1 = { features?(remove_dir_all_0_5_1_features {}) }: remove_dir_all_0_5_1_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-  };
-  remove_dir_all_0_5_1_features = f: updateFeatures f (rec {
-    remove_dir_all_0_5_1.default = (f.remove_dir_all_0_5_1.default or true);
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.errhandlingapi = true;
-    winapi_0_3_5.fileapi = true;
-    winapi_0_3_5.std = true;
-    winapi_0_3_5.winbase = true;
-    winapi_0_3_5.winerror = true;
-  }) [ winapi_0_3_5_features ];
-  reqwest_0_8_7 = { features?(reqwest_0_8_7_features {}) }: reqwest_0_8_7_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 encoding_rs_0_7_2 futures_0_1_23 hyper_0_11_27 hyper_tls_0_1_4 libflate_0_1_16 log_0_4_3 mime_guess_2_0_0_alpha_6 native_tls_0_1_5 serde_1_0_70 serde_json_1_0_24 serde_urlencoded_0_5_2 tokio_core_0_1_17 tokio_io_0_1_7 tokio_tls_0_1_4 url_1_7_1 uuid_0_6_5 ]);
-    features = mkFeatures (features.reqwest_0_8_7 or {});
-  };
-  reqwest_0_8_7_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    encoding_rs_0_7_2.default = true;
-    futures_0_1_23.default = true;
-    hyper_0_11_27.default = (f.hyper_0_11_27.default or false);
-    hyper_tls_0_1_4.default = true;
-    libflate_0_1_16.default = true;
-    log_0_4_3.default = true;
-    mime_guess_2_0_0_alpha_6.default = true;
-    native_tls_0_1_5.default = true;
-    reqwest_0_8_7.default = (f.reqwest_0_8_7.default or true);
-    serde_1_0_70.default = true;
-    serde_json_1_0_24.default = true;
-    serde_urlencoded_0_5_2.default = true;
-    tokio_core_0_1_17.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or false);
-    url_1_7_1.default = true;
-    uuid_0_6_5.default = true;
-    uuid_0_6_5.v4 = true;
-  }) [ bytes_0_4_9_features encoding_rs_0_7_2_features futures_0_1_23_features hyper_0_11_27_features hyper_tls_0_1_4_features libflate_0_1_16_features log_0_4_3_features mime_guess_2_0_0_alpha_6_features native_tls_0_1_5_features serde_1_0_70_features serde_json_1_0_24_features serde_urlencoded_0_5_2_features tokio_core_0_1_17_features tokio_io_0_1_7_features tokio_tls_0_1_4_features url_1_7_1_features uuid_0_6_5_features ];
-  rustc_demangle_0_1_9 = { features?(rustc_demangle_0_1_9_features {}) }: rustc_demangle_0_1_9_ {};
-  rustc_demangle_0_1_9_features = f: updateFeatures f (rec {
-    rustc_demangle_0_1_9.default = (f.rustc_demangle_0_1_9.default or true);
-  }) [];
-  safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {};
-  safemem_0_2_0_features = f: updateFeatures f (rec {
-    safemem_0_2_0.default = (f.safemem_0_2_0.default or true);
-  }) [];
-  schannel_0_1_13 = { features?(schannel_0_1_13_features {}) }: schannel_0_1_13_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_2 winapi_0_3_5 ]);
-  };
-  schannel_0_1_13_features = f: updateFeatures f (rec {
-    lazy_static_1_0_2.default = true;
-    schannel_0_1_13.default = (f.schannel_0_1_13.default or true);
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.lmcons = true;
-    winapi_0_3_5.minschannel = true;
-    winapi_0_3_5.schannel = true;
-    winapi_0_3_5.securitybaseapi = true;
-    winapi_0_3_5.sysinfoapi = true;
-    winapi_0_3_5.timezoneapi = true;
-    winapi_0_3_5.winbase = true;
-    winapi_0_3_5.wincrypt = true;
-    winapi_0_3_5.winerror = true;
-  }) [ lazy_static_1_0_2_features winapi_0_3_5_features ];
-  scoped_tls_0_1_2 = { features?(scoped_tls_0_1_2_features {}) }: scoped_tls_0_1_2_ {
-    features = mkFeatures (features.scoped_tls_0_1_2 or {});
-  };
-  scoped_tls_0_1_2_features = f: updateFeatures f (rec {
-    scoped_tls_0_1_2.default = (f.scoped_tls_0_1_2.default or true);
-  }) [];
-  scopeguard_0_3_3 = { features?(scopeguard_0_3_3_features {}) }: scopeguard_0_3_3_ {
-    features = mkFeatures (features.scopeguard_0_3_3 or {});
-  };
-  scopeguard_0_3_3_features = f: updateFeatures f (rec {
-    scopeguard_0_3_3.default = (f.scopeguard_0_3_3.default or true);
-    scopeguard_0_3_3.use_std =
-      (f.scopeguard_0_3_3.use_std or false) ||
-      (f.scopeguard_0_3_3.default or false) ||
-      (scopeguard_0_3_3.default or false);
-  }) [];
-  security_framework_0_1_16 = { features?(security_framework_0_1_16_features {}) }: security_framework_0_1_16_ {
-    dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_42 security_framework_sys_0_1_16 ]);
-    features = mkFeatures (features.security_framework_0_1_16 or {});
-  };
-  security_framework_0_1_16_features = f: updateFeatures f (rec {
-    core_foundation_0_2_3.default = true;
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_42.default = true;
-    security_framework_0_1_16.OSX_10_10 =
-      (f.security_framework_0_1_16.OSX_10_10 or false) ||
-      (f.security_framework_0_1_16.OSX_10_11 or false) ||
-      (security_framework_0_1_16.OSX_10_11 or false);
-    security_framework_0_1_16.OSX_10_11 =
-      (f.security_framework_0_1_16.OSX_10_11 or false) ||
-      (f.security_framework_0_1_16.OSX_10_12 or false) ||
-      (security_framework_0_1_16.OSX_10_12 or false);
-    security_framework_0_1_16.OSX_10_8 =
-      (f.security_framework_0_1_16.OSX_10_8 or false) ||
-      (f.security_framework_0_1_16.OSX_10_9 or false) ||
-      (security_framework_0_1_16.OSX_10_9 or false);
-    security_framework_0_1_16.OSX_10_9 =
-      (f.security_framework_0_1_16.OSX_10_9 or false) ||
-      (f.security_framework_0_1_16.OSX_10_10 or false) ||
-      (security_framework_0_1_16.OSX_10_10 or false);
-    security_framework_0_1_16.default = (f.security_framework_0_1_16.default or true);
-    security_framework_sys_0_1_16.OSX_10_10 =
-      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
-      (security_framework_0_1_16.OSX_10_10 or false) ||
-      (f.security_framework_0_1_16.OSX_10_10 or false);
-    security_framework_sys_0_1_16.OSX_10_11 =
-      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
-      (security_framework_0_1_16.OSX_10_11 or false) ||
-      (f.security_framework_0_1_16.OSX_10_11 or false) ||
-      (security_framework_0_1_16.OSX_10_12 or false) ||
-      (f.security_framework_0_1_16.OSX_10_12 or false);
-    security_framework_sys_0_1_16.OSX_10_8 =
-      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
-      (security_framework_0_1_16.OSX_10_8 or false) ||
-      (f.security_framework_0_1_16.OSX_10_8 or false);
-    security_framework_sys_0_1_16.OSX_10_9 =
-      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
-      (security_framework_0_1_16.OSX_10_9 or false) ||
-      (f.security_framework_0_1_16.OSX_10_9 or false);
-    security_framework_sys_0_1_16.default = true;
-  }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_42_features security_framework_sys_0_1_16_features ];
-  security_framework_sys_0_1_16 = { features?(security_framework_sys_0_1_16_features {}) }: security_framework_sys_0_1_16_ {
-    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_42 ]);
-    features = mkFeatures (features.security_framework_sys_0_1_16 or {});
-  };
-  security_framework_sys_0_1_16_features = f: updateFeatures f (rec {
-    core_foundation_sys_0_2_3.default = true;
-    libc_0_2_42.default = true;
-    security_framework_sys_0_1_16.OSX_10_10 =
-      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
-      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
-      (security_framework_sys_0_1_16.OSX_10_11 or false);
-    security_framework_sys_0_1_16.OSX_10_11 =
-      (f.security_framework_sys_0_1_16.OSX_10_11 or false) ||
-      (f.security_framework_sys_0_1_16.OSX_10_12 or false) ||
-      (security_framework_sys_0_1_16.OSX_10_12 or false);
-    security_framework_sys_0_1_16.OSX_10_8 =
-      (f.security_framework_sys_0_1_16.OSX_10_8 or false) ||
-      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
-      (security_framework_sys_0_1_16.OSX_10_9 or false);
-    security_framework_sys_0_1_16.OSX_10_9 =
-      (f.security_framework_sys_0_1_16.OSX_10_9 or false) ||
-      (f.security_framework_sys_0_1_16.OSX_10_10 or false) ||
-      (security_framework_sys_0_1_16.OSX_10_10 or false);
-    security_framework_sys_0_1_16.default = (f.security_framework_sys_0_1_16.default or true);
-  }) [ core_foundation_sys_0_2_3_features libc_0_2_42_features ];
-  semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ {
-    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]
-      ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_70 ] else []));
-    features = mkFeatures (features.semver_0_9_0 or {});
-  };
-  semver_0_9_0_features = f: updateFeatures f (rec {
-    semver_0_9_0.default = (f.semver_0_9_0.default or true);
-    semver_0_9_0.serde =
-      (f.semver_0_9_0.serde or false) ||
-      (f.semver_0_9_0.ci or false) ||
-      (semver_0_9_0.ci or false);
-    semver_parser_0_7_0.default = true;
-    serde_1_0_70.default = true;
-  }) [ semver_parser_0_7_0_features serde_1_0_70_features ];
-  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
-  semver_parser_0_7_0_features = f: updateFeatures f (rec {
-    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
-  }) [];
-  serde_1_0_70 = { features?(serde_1_0_70_features {}) }: serde_1_0_70_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_1_0_70 or {});
-  };
-  serde_1_0_70_features = f: updateFeatures f (rec {
-    serde_1_0_70.default = (f.serde_1_0_70.default or true);
-    serde_1_0_70.serde_derive =
-      (f.serde_1_0_70.serde_derive or false) ||
-      (f.serde_1_0_70.derive or false) ||
-      (serde_1_0_70.derive or false);
-    serde_1_0_70.std =
-      (f.serde_1_0_70.std or false) ||
-      (f.serde_1_0_70.default or false) ||
-      (serde_1_0_70.default or false);
-    serde_1_0_70.unstable =
-      (f.serde_1_0_70.unstable or false) ||
-      (f.serde_1_0_70.alloc or false) ||
-      (serde_1_0_70.alloc or false);
-  }) [];
-  serde_derive_1_0_75 = { features?(serde_derive_1_0_75_features {}) }: serde_derive_1_0_75_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_4_9 quote_0_6_4 syn_0_14_5 ]);
-    features = mkFeatures (features.serde_derive_1_0_75 or {});
-  };
-  serde_derive_1_0_75_features = f: updateFeatures f (rec {
-    proc_macro2_0_4_9.default = true;
-    quote_0_6_4.default = true;
-    serde_derive_1_0_75.default = (f.serde_derive_1_0_75.default or true);
-    syn_0_14_5.default = true;
-    syn_0_14_5.visit = true;
-  }) [ proc_macro2_0_4_9_features quote_0_6_4_features syn_0_14_5_features ];
-  serde_json_1_0_24 = { features?(serde_json_1_0_24_features {}) }: serde_json_1_0_24_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 ]);
-    features = mkFeatures (features.serde_json_1_0_24 or {});
-  };
-  serde_json_1_0_24_features = f: updateFeatures f (rec {
-    dtoa_0_4_3.default = true;
-    itoa_0_4_2.default = true;
-    serde_1_0_70.default = true;
-    serde_json_1_0_24.default = (f.serde_json_1_0_24.default or true);
-    serde_json_1_0_24.indexmap =
-      (f.serde_json_1_0_24.indexmap or false) ||
-      (f.serde_json_1_0_24.preserve_order or false) ||
-      (serde_json_1_0_24.preserve_order or false);
-  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features ];
-  serde_urlencoded_0_5_2 = { features?(serde_urlencoded_0_5_2_features {}) }: serde_urlencoded_0_5_2_ {
-    dependencies = mapFeatures features ([ dtoa_0_4_3 itoa_0_4_2 serde_1_0_70 url_1_7_1 ]);
-  };
-  serde_urlencoded_0_5_2_features = f: updateFeatures f (rec {
-    dtoa_0_4_3.default = true;
-    itoa_0_4_2.default = true;
-    serde_1_0_70.default = true;
-    serde_urlencoded_0_5_2.default = (f.serde_urlencoded_0_5_2.default or true);
-    url_1_7_1.default = true;
-  }) [ dtoa_0_4_3_features itoa_0_4_2_features serde_1_0_70_features url_1_7_1_features ];
-  siphasher_0_2_3 = { features?(siphasher_0_2_3_features {}) }: siphasher_0_2_3_ {};
-  siphasher_0_2_3_features = f: updateFeatures f (rec {
-    siphasher_0_2_3.default = (f.siphasher_0_2_3.default or true);
-  }) [];
-  slab_0_4_0 = { features?(slab_0_4_0_features {}) }: slab_0_4_0_ {};
-  slab_0_4_0_features = f: updateFeatures f (rec {
-    slab_0_4_0.default = (f.slab_0_4_0.default or true);
-  }) [];
-  strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
-  strsim_0_7_0_features = f: updateFeatures f (rec {
-    strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
-  }) [];
-  syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
-      ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
-      ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
-    features = mkFeatures (features.syn_0_11_11 or {});
-  };
-  syn_0_11_11_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = true;
-    syn_0_11_11.default = (f.syn_0_11_11.default or true);
-    syn_0_11_11.parsing =
-      (f.syn_0_11_11.parsing or false) ||
-      (f.syn_0_11_11.default or false) ||
-      (syn_0_11_11.default or false);
-    syn_0_11_11.printing =
-      (f.syn_0_11_11.printing or false) ||
-      (f.syn_0_11_11.default or false) ||
-      (syn_0_11_11.default or false);
-    syn_0_11_11.quote =
-      (f.syn_0_11_11.quote or false) ||
-      (f.syn_0_11_11.printing or false) ||
-      (syn_0_11_11.printing or false);
-    syn_0_11_11.synom =
-      (f.syn_0_11_11.synom or false) ||
-      (f.syn_0_11_11.parsing or false) ||
-      (syn_0_11_11.parsing or false);
-    syn_0_11_11.unicode-xid =
-      (f.syn_0_11_11.unicode-xid or false) ||
-      (f.syn_0_11_11.parsing or false) ||
-      (syn_0_11_11.parsing or false);
-    synom_0_11_3.default = true;
-    unicode_xid_0_0_4.default = true;
-  }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
-  syn_0_14_5 = { features?(syn_0_14_5_features {}) }: syn_0_14_5_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_4_9 unicode_xid_0_1_0 ]
-      ++ (if features.syn_0_14_5.quote or false then [ quote_0_6_4 ] else []));
-    features = mkFeatures (features.syn_0_14_5 or {});
-  };
-  syn_0_14_5_features = f: updateFeatures f (rec {
-    proc_macro2_0_4_9.default = (f.proc_macro2_0_4_9.default or false);
-    proc_macro2_0_4_9.proc-macro =
-      (f.proc_macro2_0_4_9.proc-macro or false) ||
-      (syn_0_14_5.proc-macro or false) ||
-      (f.syn_0_14_5.proc-macro or false);
-    quote_0_6_4.default = (f.quote_0_6_4.default or false);
-    quote_0_6_4.proc-macro =
-      (f.quote_0_6_4.proc-macro or false) ||
-      (syn_0_14_5.proc-macro or false) ||
-      (f.syn_0_14_5.proc-macro or false);
-    syn_0_14_5.clone-impls =
-      (f.syn_0_14_5.clone-impls or false) ||
-      (f.syn_0_14_5.default or false) ||
-      (syn_0_14_5.default or false);
-    syn_0_14_5.default = (f.syn_0_14_5.default or true);
-    syn_0_14_5.derive =
-      (f.syn_0_14_5.derive or false) ||
-      (f.syn_0_14_5.default or false) ||
-      (syn_0_14_5.default or false);
-    syn_0_14_5.parsing =
-      (f.syn_0_14_5.parsing or false) ||
-      (f.syn_0_14_5.default or false) ||
-      (syn_0_14_5.default or false);
-    syn_0_14_5.printing =
-      (f.syn_0_14_5.printing or false) ||
-      (f.syn_0_14_5.default or false) ||
-      (syn_0_14_5.default or false);
-    syn_0_14_5.proc-macro =
-      (f.syn_0_14_5.proc-macro or false) ||
-      (f.syn_0_14_5.default or false) ||
-      (syn_0_14_5.default or false);
-    syn_0_14_5.quote =
-      (f.syn_0_14_5.quote or false) ||
-      (f.syn_0_14_5.printing or false) ||
-      (syn_0_14_5.printing or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ proc_macro2_0_4_9_features quote_0_6_4_features unicode_xid_0_1_0_features ];
-  synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
-    dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
-  };
-  synom_0_11_3_features = f: updateFeatures f (rec {
-    synom_0_11_3.default = (f.synom_0_11_3.default or true);
-    unicode_xid_0_0_4.default = true;
-  }) [ unicode_xid_0_0_4_features ];
-  synstructure_0_6_1 = { features?(synstructure_0_6_1_features {}) }: synstructure_0_6_1_ {
-    dependencies = mapFeatures features ([ quote_0_3_15 syn_0_11_11 ]);
-    features = mkFeatures (features.synstructure_0_6_1 or {});
-  };
-  synstructure_0_6_1_features = f: updateFeatures f (rec {
-    quote_0_3_15.default = true;
-    syn_0_11_11.default = true;
-    syn_0_11_11.visit = true;
-    synstructure_0_6_1.default = (f.synstructure_0_6_1.default or true);
-  }) [ quote_0_3_15_features syn_0_11_11_features ];
-  tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ {
-    dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_1 ]);
-  };
-  tempdir_0_3_7_features = f: updateFeatures f (rec {
-    rand_0_4_2.default = true;
-    remove_dir_all_0_5_1.default = true;
-    tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true);
-  }) [ rand_0_4_2_features remove_dir_all_0_5_1_features ];
-  termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []);
-  };
-  termcolor_0_3_6_features = f: updateFeatures f (rec {
-    termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true);
-    wincolor_0_1_6.default = true;
-  }) [ wincolor_0_1_6_features ];
-  termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
-    dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_42 ]) else [])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 redox_termios_0_1_1 ]) else []);
-  };
-  termion_1_5_1_features = f: updateFeatures f (rec {
-    libc_0_2_42.default = true;
-    redox_syscall_0_1_40.default = true;
-    redox_termios_0_1_1.default = true;
-    termion_1_5_1.default = (f.termion_1_5_1.default or true);
-  }) [ libc_0_2_42_features redox_syscall_0_1_40_features redox_termios_0_1_1_features ];
-  thread_local_0_3_6 = { features?(thread_local_0_3_6_features {}) }: thread_local_0_3_6_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_2 ]);
-  };
-  thread_local_0_3_6_features = f: updateFeatures f (rec {
-    lazy_static_1_0_2.default = true;
-    thread_local_0_3_6.default = (f.thread_local_0_3_6.default or true);
-  }) [ lazy_static_1_0_2_features ];
-  time_0_1_40 = { features?(time_0_1_40_features {}) }: time_0_1_40_ {
-    dependencies = mapFeatures features ([ libc_0_2_42 ])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_40 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_5 ]) else []);
-  };
-  time_0_1_40_features = f: updateFeatures f (rec {
-    libc_0_2_42.default = true;
-    redox_syscall_0_1_40.default = true;
-    time_0_1_40.default = (f.time_0_1_40.default or true);
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.minwinbase = true;
-    winapi_0_3_5.minwindef = true;
-    winapi_0_3_5.ntdef = true;
-    winapi_0_3_5.profileapi = true;
-    winapi_0_3_5.std = true;
-    winapi_0_3_5.sysinfoapi = true;
-    winapi_0_3_5.timezoneapi = true;
-  }) [ libc_0_2_42_features redox_syscall_0_1_40_features winapi_0_3_5_features ];
-  tokio_0_1_7 = { features?(tokio_0_1_7_features {}) }: tokio_0_1_7_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 mio_0_6_15 tokio_executor_0_1_2 tokio_fs_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_tcp_0_1_0 tokio_threadpool_0_1_5 tokio_timer_0_2_4 tokio_udp_0_1_1 ]);
-  };
-  tokio_0_1_7_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    mio_0_6_15.default = true;
-    tokio_0_1_7.default = (f.tokio_0_1_7.default or true);
-    tokio_executor_0_1_2.default = true;
-    tokio_fs_0_1_2.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_reactor_0_1_2.default = true;
-    tokio_tcp_0_1_0.default = true;
-    tokio_threadpool_0_1_5.default = true;
-    tokio_timer_0_2_4.default = true;
-    tokio_udp_0_1_1.default = true;
-  }) [ futures_0_1_23_features mio_0_6_15_features tokio_executor_0_1_2_features tokio_fs_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_tcp_0_1_0_features tokio_threadpool_0_1_5_features tokio_timer_0_2_4_features tokio_udp_0_1_1_features ];
-  tokio_codec_0_1_0 = { features?(tokio_codec_0_1_0_features {}) }: tokio_codec_0_1_0_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 tokio_io_0_1_7 ]);
-  };
-  tokio_codec_0_1_0_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    tokio_codec_0_1_0.default = (f.tokio_codec_0_1_0.default or true);
-    tokio_io_0_1_7.default = true;
-  }) [ bytes_0_4_9_features futures_0_1_23_features tokio_io_0_1_7_features ];
-  tokio_core_0_1_17 = { features?(tokio_core_0_1_17_features {}) }: tokio_core_0_1_17_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 log_0_4_3 mio_0_6_15 scoped_tls_0_1_2 tokio_0_1_7 tokio_executor_0_1_2 tokio_io_0_1_7 tokio_reactor_0_1_2 tokio_timer_0_2_4 ]);
-  };
-  tokio_core_0_1_17_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    iovec_0_1_2.default = true;
-    log_0_4_3.default = true;
-    mio_0_6_15.default = true;
-    scoped_tls_0_1_2.default = true;
-    tokio_0_1_7.default = true;
-    tokio_core_0_1_17.default = (f.tokio_core_0_1_17.default or true);
-    tokio_executor_0_1_2.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_reactor_0_1_2.default = true;
-    tokio_timer_0_2_4.default = true;
-  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features log_0_4_3_features mio_0_6_15_features scoped_tls_0_1_2_features tokio_0_1_7_features tokio_executor_0_1_2_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features tokio_timer_0_2_4_features ];
-  tokio_executor_0_1_2 = { features?(tokio_executor_0_1_2_features {}) }: tokio_executor_0_1_2_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 ]);
-    features = mkFeatures (features.tokio_executor_0_1_2 or {});
-  };
-  tokio_executor_0_1_2_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    tokio_executor_0_1_2.default = (f.tokio_executor_0_1_2.default or true);
-    tokio_executor_0_1_2.futures2 =
-      (f.tokio_executor_0_1_2.futures2 or false) ||
-      (f.tokio_executor_0_1_2.unstable-futures or false) ||
-      (tokio_executor_0_1_2.unstable-futures or false);
-  }) [ futures_0_1_23_features ];
-  tokio_fs_0_1_2 = { features?(tokio_fs_0_1_2_features {}) }: tokio_fs_0_1_2_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 tokio_io_0_1_7 tokio_threadpool_0_1_5 ]);
-  };
-  tokio_fs_0_1_2_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    tokio_fs_0_1_2.default = (f.tokio_fs_0_1_2.default or true);
-    tokio_io_0_1_7.default = true;
-    tokio_threadpool_0_1_5.default = true;
-  }) [ futures_0_1_23_features tokio_io_0_1_7_features tokio_threadpool_0_1_5_features ];
-  tokio_io_0_1_7 = { features?(tokio_io_0_1_7_features {}) }: tokio_io_0_1_7_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 ]);
-  };
-  tokio_io_0_1_7_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    log_0_4_3.default = true;
-    tokio_io_0_1_7.default = (f.tokio_io_0_1_7.default or true);
-  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features ];
-  tokio_reactor_0_1_2 = { features?(tokio_reactor_0_1_2_features {}) }: tokio_reactor_0_1_2_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 mio_0_6_15 slab_0_4_0 tokio_executor_0_1_2 tokio_io_0_1_7 ]);
-  };
-  tokio_reactor_0_1_2_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    log_0_4_3.default = true;
-    mio_0_6_15.default = true;
-    slab_0_4_0.default = true;
-    tokio_executor_0_1_2.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_reactor_0_1_2.default = (f.tokio_reactor_0_1_2.default or true);
-  }) [ futures_0_1_23_features log_0_4_3_features mio_0_6_15_features slab_0_4_0_features tokio_executor_0_1_2_features tokio_io_0_1_7_features ];
-  tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 ]);
-  };
-  tokio_service_0_1_0_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true);
-  }) [ futures_0_1_23_features ];
-  tokio_tcp_0_1_0 = { features?(tokio_tcp_0_1_0_features {}) }: tokio_tcp_0_1_0_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 iovec_0_1_2 mio_0_6_15 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
-    features = mkFeatures (features.tokio_tcp_0_1_0 or {});
-  };
-  tokio_tcp_0_1_0_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    iovec_0_1_2.default = true;
-    mio_0_6_15.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_reactor_0_1_2.default = true;
-    tokio_tcp_0_1_0.default = (f.tokio_tcp_0_1_0.default or true);
-    tokio_tcp_0_1_0.futures2 =
-      (f.tokio_tcp_0_1_0.futures2 or false) ||
-      (f.tokio_tcp_0_1_0.unstable-futures or false) ||
-      (tokio_tcp_0_1_0.unstable-futures or false);
-  }) [ bytes_0_4_9_features futures_0_1_23_features iovec_0_1_2_features mio_0_6_15_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
-  tokio_threadpool_0_1_5 = { features?(tokio_threadpool_0_1_5_features {}) }: tokio_threadpool_0_1_5_ {
-    dependencies = mapFeatures features ([ crossbeam_deque_0_3_1 futures_0_1_23 log_0_4_3 num_cpus_1_8_0 rand_0_4_2 tokio_executor_0_1_2 ]);
-  };
-  tokio_threadpool_0_1_5_features = f: updateFeatures f (rec {
-    crossbeam_deque_0_3_1.default = true;
-    futures_0_1_23.default = true;
-    log_0_4_3.default = true;
-    num_cpus_1_8_0.default = true;
-    rand_0_4_2.default = true;
-    tokio_executor_0_1_2.default = true;
-    tokio_threadpool_0_1_5.default = (f.tokio_threadpool_0_1_5.default or true);
-  }) [ crossbeam_deque_0_3_1_features futures_0_1_23_features log_0_4_3_features num_cpus_1_8_0_features rand_0_4_2_features tokio_executor_0_1_2_features ];
-  tokio_timer_0_2_4 = { features?(tokio_timer_0_2_4_features {}) }: tokio_timer_0_2_4_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 tokio_executor_0_1_2 ]);
-  };
-  tokio_timer_0_2_4_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    tokio_executor_0_1_2.default = true;
-    tokio_timer_0_2_4.default = (f.tokio_timer_0_2_4.default or true);
-  }) [ futures_0_1_23_features tokio_executor_0_1_2_features ];
-  tokio_tls_0_1_4 = { features?(tokio_tls_0_1_4_features {}) }: tokio_tls_0_1_4_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 native_tls_0_1_5 tokio_core_0_1_17 tokio_io_0_1_7 ])
-      ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else [])
-      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([]) else []);
-  };
-  tokio_tls_0_1_4_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    native_tls_0_1_5.default = true;
-    tokio_core_0_1_17.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_tls_0_1_4.default = (f.tokio_tls_0_1_4.default or true);
-  }) [ futures_0_1_23_features native_tls_0_1_5_features tokio_core_0_1_17_features tokio_io_0_1_7_features ];
-  tokio_udp_0_1_1 = { features?(tokio_udp_0_1_1_features {}) }: tokio_udp_0_1_1_ {
-    dependencies = mapFeatures features ([ bytes_0_4_9 futures_0_1_23 log_0_4_3 mio_0_6_15 tokio_codec_0_1_0 tokio_io_0_1_7 tokio_reactor_0_1_2 ]);
-  };
-  tokio_udp_0_1_1_features = f: updateFeatures f (rec {
-    bytes_0_4_9.default = true;
-    futures_0_1_23.default = true;
-    log_0_4_3.default = true;
-    mio_0_6_15.default = true;
-    tokio_codec_0_1_0.default = true;
-    tokio_io_0_1_7.default = true;
-    tokio_reactor_0_1_2.default = true;
-    tokio_udp_0_1_1.default = (f.tokio_udp_0_1_1.default or true);
-  }) [ bytes_0_4_9_features futures_0_1_23_features log_0_4_3_features mio_0_6_15_features tokio_codec_0_1_0_features tokio_io_0_1_7_features tokio_reactor_0_1_2_features ];
-  toml_edit_0_1_3 = { features?(toml_edit_0_1_3_features {}) }: toml_edit_0_1_3_ {
-    dependencies = mapFeatures features ([ chrono_0_4_5 combine_3_3_6 linked_hash_map_0_5_1 ]);
-    features = mkFeatures (features.toml_edit_0_1_3 or {});
-  };
-  toml_edit_0_1_3_features = f: updateFeatures f (rec {
-    chrono_0_4_5.default = true;
-    combine_3_3_6.default = true;
-    linked_hash_map_0_5_1.default = true;
-    toml_edit_0_1_3.default = (f.toml_edit_0_1_3.default or true);
-  }) [ chrono_0_4_5_features combine_3_3_6_features linked_hash_map_0_5_1_features ];
-  try_lock_0_1_0 = { features?(try_lock_0_1_0_features {}) }: try_lock_0_1_0_ {};
-  try_lock_0_1_0_features = f: updateFeatures f (rec {
-    try_lock_0_1_0.default = (f.try_lock_0_1_0.default or true);
-  }) [];
-  ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
-  ucd_util_0_1_1_features = f: updateFeatures f (rec {
-    ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
-  }) [];
-  unicase_1_4_2 = { features?(unicase_1_4_2_features {}) }: unicase_1_4_2_ {
-    dependencies = mapFeatures features ([]);
-    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
-    features = mkFeatures (features.unicase_1_4_2 or {});
-  };
-  unicase_1_4_2_features = f: updateFeatures f (rec {
-    unicase_1_4_2.default = (f.unicase_1_4_2.default or true);
-    unicase_1_4_2.heapsize =
-      (f.unicase_1_4_2.heapsize or false) ||
-      (f.unicase_1_4_2.heap_size or false) ||
-      (unicase_1_4_2.heap_size or false);
-    unicase_1_4_2.heapsize_plugin =
-      (f.unicase_1_4_2.heapsize_plugin or false) ||
-      (f.unicase_1_4_2.heap_size or false) ||
-      (unicase_1_4_2.heap_size or false);
-    version_check_0_1_4.default = true;
-  }) [ version_check_0_1_4_features ];
-  unicase_2_1_0 = { features?(unicase_2_1_0_features {}) }: unicase_2_1_0_ {
-    buildDependencies = mapFeatures features ([ version_check_0_1_4 ]);
-    features = mkFeatures (features.unicase_2_1_0 or {});
-  };
-  unicase_2_1_0_features = f: updateFeatures f (rec {
-    unicase_2_1_0.default = (f.unicase_2_1_0.default or true);
-    version_check_0_1_4.default = true;
-  }) [ version_check_0_1_4_features ];
-  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
-    dependencies = mapFeatures features ([ matches_0_1_7 ]);
-    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
-  };
-  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
-    matches_0_1_7.default = true;
-    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
-    unicode_bidi_0_3_4.flame =
-      (f.unicode_bidi_0_3_4.flame or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.flamer =
-      (f.unicode_bidi_0_3_4.flamer or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.serde =
-      (f.unicode_bidi_0_3_4.serde or false) ||
-      (f.unicode_bidi_0_3_4.with_serde or false) ||
-      (unicode_bidi_0_3_4.with_serde or false);
-  }) [ matches_0_1_7_features ];
-  unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
-  unicode_normalization_0_1_7_features = f: updateFeatures f (rec {
-    unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
-  }) [];
-  unicode_width_0_1_5 = { features?(unicode_width_0_1_5_features {}) }: unicode_width_0_1_5_ {
-    features = mkFeatures (features.unicode_width_0_1_5 or {});
-  };
-  unicode_width_0_1_5_features = f: updateFeatures f (rec {
-    unicode_width_0_1_5.default = (f.unicode_width_0_1_5.default or true);
-  }) [];
-  unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
-    features = mkFeatures (features.unicode_xid_0_0_4 or {});
-  };
-  unicode_xid_0_0_4_features = f: updateFeatures f (rec {
-    unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
-  }) [];
-  unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
-    features = mkFeatures (features.unicode_xid_0_1_0 or {});
-  };
-  unicode_xid_0_1_0_features = f: updateFeatures f (rec {
-    unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
-  }) [];
-  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
-    dependencies = mapFeatures features ([ void_1_0_2 ]);
-  };
-  unreachable_1_0_0_features = f: updateFeatures f (rec {
-    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
-    void_1_0_2.default = (f.void_1_0_2.default or false);
-  }) [ void_1_0_2_features ];
-  url_1_7_1 = { features?(url_1_7_1_features {}) }: url_1_7_1_ {
-    dependencies = mapFeatures features ([ idna_0_1_5 matches_0_1_7 percent_encoding_1_0_1 ]);
-    features = mkFeatures (features.url_1_7_1 or {});
-  };
-  url_1_7_1_features = f: updateFeatures f (rec {
-    idna_0_1_5.default = true;
-    matches_0_1_7.default = true;
-    percent_encoding_1_0_1.default = true;
-    url_1_7_1.default = (f.url_1_7_1.default or true);
-    url_1_7_1.encoding =
-      (f.url_1_7_1.encoding or false) ||
-      (f.url_1_7_1.query_encoding or false) ||
-      (url_1_7_1.query_encoding or false);
-    url_1_7_1.heapsize =
-      (f.url_1_7_1.heapsize or false) ||
-      (f.url_1_7_1.heap_size or false) ||
-      (url_1_7_1.heap_size or false);
-  }) [ idna_0_1_5_features matches_0_1_7_features percent_encoding_1_0_1_features ];
-  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
-  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
-    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
-  }) [];
-  uuid_0_6_5 = { features?(uuid_0_6_5_features {}) }: uuid_0_6_5_ {
-    dependencies = mapFeatures features ([ cfg_if_0_1_4 ]
-      ++ (if features.uuid_0_6_5.rand or false then [ rand_0_4_2 ] else []));
-    features = mkFeatures (features.uuid_0_6_5 or {});
-  };
-  uuid_0_6_5_features = f: updateFeatures f (rec {
-    cfg_if_0_1_4.default = true;
-    rand_0_4_2.default = true;
-    uuid_0_6_5.byteorder =
-      (f.uuid_0_6_5.byteorder or false) ||
-      (f.uuid_0_6_5.u128 or false) ||
-      (uuid_0_6_5.u128 or false);
-    uuid_0_6_5.default = (f.uuid_0_6_5.default or true);
-    uuid_0_6_5.md5 =
-      (f.uuid_0_6_5.md5 or false) ||
-      (f.uuid_0_6_5.v3 or false) ||
-      (uuid_0_6_5.v3 or false);
-    uuid_0_6_5.nightly =
-      (f.uuid_0_6_5.nightly or false) ||
-      (f.uuid_0_6_5.const_fn or false) ||
-      (uuid_0_6_5.const_fn or false);
-    uuid_0_6_5.rand =
-      (f.uuid_0_6_5.rand or false) ||
-      (f.uuid_0_6_5.v3 or false) ||
-      (uuid_0_6_5.v3 or false) ||
-      (f.uuid_0_6_5.v4 or false) ||
-      (uuid_0_6_5.v4 or false) ||
-      (f.uuid_0_6_5.v5 or false) ||
-      (uuid_0_6_5.v5 or false);
-    uuid_0_6_5.sha1 =
-      (f.uuid_0_6_5.sha1 or false) ||
-      (f.uuid_0_6_5.v5 or false) ||
-      (uuid_0_6_5.v5 or false);
-    uuid_0_6_5.std =
-      (f.uuid_0_6_5.std or false) ||
-      (f.uuid_0_6_5.default or false) ||
-      (uuid_0_6_5.default or false) ||
-      (f.uuid_0_6_5.use_std or false) ||
-      (uuid_0_6_5.use_std or false);
-  }) [ cfg_if_0_1_4_features rand_0_4_2_features ];
-  vcpkg_0_2_4 = { features?(vcpkg_0_2_4_features {}) }: vcpkg_0_2_4_ {};
-  vcpkg_0_2_4_features = f: updateFeatures f (rec {
-    vcpkg_0_2_4.default = (f.vcpkg_0_2_4.default or true);
-  }) [];
-  version_check_0_1_4 = { features?(version_check_0_1_4_features {}) }: version_check_0_1_4_ {};
-  version_check_0_1_4_features = f: updateFeatures f (rec {
-    version_check_0_1_4.default = (f.version_check_0_1_4.default or true);
-  }) [];
-  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
-    features = mkFeatures (features.void_1_0_2 or {});
-  };
-  void_1_0_2_features = f: updateFeatures f (rec {
-    void_1_0_2.default = (f.void_1_0_2.default or true);
-    void_1_0_2.std =
-      (f.void_1_0_2.std or false) ||
-      (f.void_1_0_2.default or false) ||
-      (void_1_0_2.default or false);
-  }) [];
-  want_0_0_4 = { features?(want_0_0_4_features {}) }: want_0_0_4_ {
-    dependencies = mapFeatures features ([ futures_0_1_23 log_0_4_3 try_lock_0_1_0 ]);
-  };
-  want_0_0_4_features = f: updateFeatures f (rec {
-    futures_0_1_23.default = true;
-    log_0_4_3.default = true;
-    try_lock_0_1_0.default = true;
-    want_0_0_4.default = (f.want_0_0_4.default or true);
-  }) [ futures_0_1_23_features log_0_4_3_features try_lock_0_1_0_features ];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f (rec {
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_0_3_5 = { features?(winapi_0_3_5_features {}) }: winapi_0_3_5_ {
-    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
-      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
-    features = mkFeatures (features.winapi_0_3_5 or {});
-  };
-  winapi_0_3_5_features = f: updateFeatures f (rec {
-    winapi_0_3_5.default = (f.winapi_0_3_5.default or true);
-    winapi_i686_pc_windows_gnu_0_4_0.default = true;
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
-  }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f (rec {
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-  winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
-  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
-    winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
-  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec {
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ {
-    dependencies = mapFeatures features ([ winapi_0_3_5 ]);
-  };
-  wincolor_0_1_6_features = f: updateFeatures f (rec {
-    winapi_0_3_5.consoleapi = true;
-    winapi_0_3_5.default = true;
-    winapi_0_3_5.minwindef = true;
-    winapi_0_3_5.processenv = true;
-    winapi_0_3_5.winbase = true;
-    winapi_0_3_5.wincon = true;
-    wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true);
-  }) [ winapi_0_3_5_features ];
-  ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  ws2_32_sys_0_2_1_features = f: updateFeatures f (rec {
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-    ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true);
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-}
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 19c08541ea60..916dd26a6ab0 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,28 +1,25 @@
-{ stdenv, lib, buildPlatform, fetchgit, fetchFromGitHub, darwin
-, buildRustCrate, defaultCrateOverrides }:
+{ stdenv, lib, darwin, rustPlatform, fetchFromGitHub }:
 
-((import ./Cargo.nix { inherit lib buildPlatform buildRustCrate fetchgit; }).cargo_edit {}).override {
-  crateOverrides = defaultCrateOverrides // {
-    cargo-edit = attrs: rec {
-      name = "cargo-edit-${version}";
-      version = "0.3.0";
+rustPlatform.buildRustPackage rec {
+  name = "cargo-edit-${version}";
+  version = "0.3.0";
 
-      src = fetchFromGitHub {
-        owner = "killercup";
-        repo = "cargo-edit";
-        rev = "v${version}";
-        sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0";
-      };
+  src = fetchFromGitHub {
+    owner = "killercup";
+    repo = "cargo-edit";
+    rev = "v${version}";
+    sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0";
+  };
 
-      propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+  cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8";
 
-      meta = with stdenv.lib; {
-        description = "A utility for managing cargo dependencies from the command line";
-        homepage = https://github.com/killercup/cargo-edit;
-        license = with licenses; [ mit ];
-        maintainers = with maintainers; [ gerschtli jb55 ];
-        platforms = platforms.all;
-      };
-    };
+  propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+
+  meta = with lib; {
+    description = "A utility for managing cargo dependencies from the command line";
+    homepage = https://github.com/killercup/cargo-edit;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gerschtli jb55 ];
+    platforms = platforms.all;
   };
 }

From 48abf865bc8f7a95143f7a95e2d62b0add243684 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 11 Sep 2018 13:57:45 +0200
Subject: [PATCH 0771/3253] tor: 0.3.3.9 -> 0.3.4.8

---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index bb49e478910d..338afb7b3e17 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -14,11 +14,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.3.9";
+  name = "tor-0.3.4.8";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45";
+    sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2";
   };
 
   outputs = [ "out" "geoip" ];

From e2bdf5ea3b55039ad056a92866064ae7c7c4de2e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 12 Aug 2018 23:07:24 +0200
Subject: [PATCH 0772/3253] zsh-history-substring-search: init at 1.0.1

---
 .../zsh-history-substring-search/default.nix  | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/shells/zsh/zsh-history-substring-search/default.nix

diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
new file mode 100644
index 000000000000..26866f830dbc
--- /dev/null
+++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, zsh }:
+
+stdenv.mkDerivation rec {
+  name = "zsh-history-substring-search-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "zsh-users";
+    repo = "zsh-history-substring-search";
+    rev = "v${version}";
+    sha256 = "0lgmq1xcccnz5cf7vl0r0qj351hwclx9p80cl0qczxry4r2g5qaz";
+  };
+
+  installPhase = ''
+    install -D zsh-history-substring-search.zsh \
+      "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
+  '';
+
+  meta = with lib; {
+    description = "Fish shell history-substring-search for Zsh";
+    homepage = https://github.com/zsh-users/zsh-history-substring-search;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ qyliss ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80721d63914e..9c8c791ea249 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6209,6 +6209,8 @@ with pkgs;
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
 
+  zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
+
   zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
 
   zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };

From 3ffca639a42077048dd6719a7b4d73b9e9e4bb10 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 26 Jun 2018 16:18:17 +0200
Subject: [PATCH 0773/3253] pythonPackages.base58: init at 1.0.0

---
 .../python-modules/base58/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/base58/default.nix

diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix
new file mode 100644
index 000000000000..43b2761f6bca
--- /dev/null
+++ b/pkgs/development/python-modules/base58/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, pyhamcrest }:
+
+buildPythonPackage rec {
+  pname = "base58";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "keis";
+    repo = "base58";
+    rev = "v${version}";
+    sha256 = "0f8isdpvbgw0sqn9bj7hk47y8akpvdl8sn6rkszla0xb92ywj0f6";
+  };
+
+  buildInputs = [ pytest pyhamcrest ];
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Base58 and Base58Check implementation";
+    homepage = https://github.com/keis/base58;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b98a1af7891..940c832afa2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -980,6 +980,8 @@ in {
     inherit (pkgs) gcc wirelesstools;
   };
 
+  base58 = callPackage ../development/python-modules/base58 {};
+
   batinfo = callPackage ../development/python-modules/batinfo {};
 
   bcdoc = callPackage ../development/python-modules/bcdoc {};

From 71a8aafbb8a287fc6f8a7403d6b2847d14598f59 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 26 Jun 2018 16:28:36 +0200
Subject: [PATCH 0774/3253] pythonPackages.block-io: init at 1.1.8

---
 .../python-modules/block-io/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/block-io/default.nix

diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix
new file mode 100644
index 000000000000..c0df26143ec3
--- /dev/null
+++ b/pkgs/development/python-modules/block-io/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }:
+
+buildPythonPackage rec {
+  pname = "block-io";
+  version = "1.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15468pvpcp41ly7kjpmikpyi4av57d9zhf5j1v01j78r1xqqk56g";
+  };
+
+  propagatedBuildInputs = [
+    base58
+    ecdsa
+    pycryptodome
+    requests
+    six
+  ];
+
+  # Tests needs a BlockIO API key to run properly
+  # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io";
+    homepage = https://github.com/BlockIo/block_io-python;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyanloutre ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 940c832afa2c..4e488cfd2947 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1095,6 +1095,8 @@ in {
   };
 
   blessed = callPackage ../development/python-modules/blessed {};
+  
+  block-io = callPackage ../development/python-modules/block-io {};
 
   # Build boost for this specific Python version
   # TODO: use separate output for libboost_python.so

From 5efede93d2707b0b4a28366f6f13ae053a3447e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 10 Sep 2018 01:47:41 -0300
Subject: [PATCH 0775/3253] deepin-image-viewer: init at 1.2.23

---
 .../deepin/deepin-image-viewer/default.nix    | 51 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-image-viewer/default.nix

diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
new file mode 100644
index 000000000000..0ba2e306110a
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
+  qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw,
+  libexif
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-image-viewer";
+  version = "1.2.23";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+    qttools
+  ];
+
+  buildInputs = [
+    qtsvg
+    qtx11extras
+    dtkcore
+    dtkwidget
+    qt5integration
+    freeimage
+    libraw
+    libexif
+  ];
+
+  postPatch = ''
+    patchShebangs .
+    sed -i qimage-plugins/freeimage/freeimage.pro \
+           qimage-plugins/libraw/libraw.pro \
+      -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
+    sed -i viewer/com.deepin.ImageViewer.service \
+      -e "s,/usr,$out,"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Image Viewer for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/deepin-image-viewer;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index d2e5536a74aa..f85d51b2072d 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -9,6 +9,7 @@ let
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
+    deepin-image-viewer = callPackage ./deepin-image-viewer { };
     deepin-menu = callPackage ./deepin-menu { };
     deepin-mutter = callPackage ./deepin-mutter { };
     deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };

From 66f610597848f887f4b73fa66dde6965aac80d0b Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 11 Sep 2018 15:42:15 +0200
Subject: [PATCH 0776/3253] nixos/doc: Add stable pre-release warning (#46473)

---
 nixos/doc/manual/installation/upgrading.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 85e5082575d3..69668b1d4bd6 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -52,10 +52,13 @@
    </listitem>
   </itemizedlist>
   To see what channels are available, go to
-  <link
-xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
+  <link xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
   various channels redirect to a directory that contains the channel’s latest
-  version and includes ISO images and VirtualBox appliances.)
+  version and includes ISO images and VirtualBox appliances.) Please note that
+  during the release process, channels that are not yet released will be
+  present here as well. See the Getting NixOS page
+  <link xlink:href="https://nixos.org/nixos/download.html"/> to find the newest
+  supported stable release.
  </para>
  <para>
   When you first install NixOS, you’re automatically subscribed to the NixOS

From 28ef51244acf83e86e8f46b9b325138ff4d2b784 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Tue, 11 Sep 2018 15:52:46 +0200
Subject: [PATCH 0777/3253] pdftag: init at 1.0.3 (#45666)

---
 pkgs/tools/graphics/pdftag/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/graphics/pdftag/default.nix

diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
new file mode 100644
index 000000000000..6f492a3ccc5d
--- /dev/null
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja
+, gtk3, poppler, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "pdftag";
+  name = "${pname}-${version}";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "arrufat";
+    repo = pname;
+    rev = version;
+    sha256 = "17zk42h0n33b4p8fqlq2riqwcdi8y9m5n0ccydnk6a4x8rli97b3";
+  };
+
+  nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook ];
+  buildInputs = [ gtk3 poppler vala ];
+
+  patchPhase = ''substituteInPlace meson.build \
+    --replace "install_dir: '/usr" "install_dir: '$out"
+  '';
+
+  preInstall = "mkdir -p $out/share/licenses/${pname}";
+
+  meta = with stdenv.lib; {
+    description = "Edit metadata found in PDFs";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80721d63914e..92d1a47d2fef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4594,6 +4594,8 @@ with pkgs;
 
   pdfcrack = callPackage ../tools/security/pdfcrack { };
 
+  pdftag = callPackage ../tools/graphics/pdftag { };
+
   pdf2svg = callPackage ../tools/graphics/pdf2svg { };
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };

From c44504410ba5a3bd76a99e7907533779c2b17694 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 14:09:30 +0300
Subject: [PATCH 0778/3253] pythonPackages.eth-hash: init at 0.1.14

---
 .../python-modules/eth-hash/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/eth-hash/default.nix

diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix
new file mode 100644
index 000000000000..ce5fce1b1cba
--- /dev/null
+++ b/pkgs/development/python-modules/eth-hash/default.nix
@@ -0,0 +1,45 @@
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto,
+  pycryptodome }:
+
+buildPythonPackage rec {
+  pname = "eth-hash";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xpiz0wrxxj11ki9yapvsibl25qnki90bl3d39nqascg14nw17a9";
+  };
+
+  checkInputs = [ pytest ];
+
+  propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ];
+
+  # setuptools-markdown uses pypandoc which is broken at the moment
+  preConfigure = ''
+    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+  '';
+
+  # Run tests separately because we don't want to run tests on tests/backends/
+  # but only on its selected subdirectories. Also, the directories under
+  # tests/backends/ must be run separately because they have identically named
+  # test files so pytest would raise errors because of that.
+  #
+  # Also, tests in tests/core/test_import.py are broken so just ignore them:
+  # https://github.com/ethereum/eth-hash/issues/25
+  # There is a pull request to fix the tests:
+  # https://github.com/ethereum/eth-hash/pull/26
+  checkPhase = ''
+    pytest tests/backends/pycryptodome/
+    pytest tests/backends/pysha3/
+    # pytest tests/core/
+  '';
+
+  disabled = pythonOlder "3.5";
+
+  meta = {
+    description = "The Ethereum hashing function keccak256";
+    homepage = https://github.com/ethereum/eth-hash;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 157f45f3f2a9..1f55ead0053f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1655,6 +1655,8 @@ in {
 
   envs = callPackage ../development/python-modules/envs { };
 
+  eth-hash = callPackage ../development/python-modules/eth-hash { };
+
   jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
 
   jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };

From 175c4f040f985c7fce8c28bf48b2b3993a967f1d Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Tue, 11 Sep 2018 16:24:26 +0100
Subject: [PATCH 0779/3253] haskell generic builder: enable benchmarks if
 doBenchmark is true

---
 pkgs/development/haskell-modules/generic-builder.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1b33954662db..054bd46f9dc2 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -152,6 +152,7 @@ let
     (optionalString (versionOlder "8.4" ghc.version) (enableFeature enableStaticLibraries "static"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+    (enableFeature doBenchmark "benchmarks")
     "--enable-library-vanilla"  # TODO: Should this be configurable?
     "--enable-library-for-ghci" # TODO: Should this be configurable?
   ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [

From 525f4250739361892a30edb5aed6a8499d624d6e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 11 Sep 2018 17:32:53 +0200
Subject: [PATCH 0780/3253] pdsh: set default module to ssh, remove obsolete
 fixes

---
 pkgs/tools/networking/pdsh/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 9239b9e118dc..812d335e8087 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, readline, rsh, ssh, pam }:
+{ stdenv, fetchurl, perl, readline, rsh, ssh }:
 
 stdenv.mkDerivation rec {
   name = "pdsh-2.33";
@@ -8,12 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bwlkl9inj66iwvafg00pi3sk9n673phdi0kcc59y9nn55s0hs3k";
   };
 
-  buildInputs = [perl readline ssh pam];
-
-  /* pdsh uses pthread_cancel(), which requires libgcc_s.so.1 to be
-     loadable at run-time. Adding the flag below ensures that the
-     library can be found. Obviously, though, this is a hack. */
-  NIX_LDFLAGS="-lgcc_s";
+  buildInputs = [ perl readline ssh ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -22,11 +17,11 @@ stdenv.mkDerivation rec {
       "--with-machines=/etc/pdsh/machines"
       ${if readline == null then "--without-readline" else "--with-readline"}
       ${if ssh == null then "--without-ssh" else "--with-ssh"}
-      ${if pam == null then "--without-pam" else "--with-pam"}
       ${if rsh == false then "--without-rsh" else "--with-rsh"}
       "--with-dshgroups"
       "--with-xcpu"
       "--disable-debug"
+      '--with-rcmd-rank-list=ssh,krb4,exec,xcpu,rsh'
     )
   '';
 

From 8a03ec0a32f1ef97a1290a0f0ad75e1f33f1fa46 Mon Sep 17 00:00:00 2001
From: Jesper Geertsen Jonsson <yesbox@users.noreply.github.com>
Date: Sat, 8 Sep 2018 15:04:12 +0200
Subject: [PATCH 0781/3253] Fixes the lldpd service failing to start

Backports a patch that will be included in later upstream versions.
The patch removes a call to /bin/mkdir.
---
 pkgs/tools/networking/lldpd/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 02e4672a1aee..81456c1b852d 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo
 , libevent, readline, net_snmp }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5";
   };
 
+  patches = [
+    # Fixes #44507: The service fails to start due to a /bin/mkdir call.
+    # Should be included in the upstream release after 1.0.1.
+    # Please remove this patch when updating and ensure the NixOS service starts.
+    (fetchpatch {
+      url = "https://github.com/vincentbernat/lldpd/commit/90a50860ebdcdeb5b7dc85790b18bed23c97ec32.patch";
+      sha256 = "005i4ldc4mfzfmvbnid6849ax2i93mx8nkyf8vjv8k73bfpdza8z";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--enable-pie"

From 65fcac82d377af2395d57f8ca45e70ada1a922f2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Sep 2018 16:37:27 +0000
Subject: [PATCH 0782/3253] ocamlPackages.batteries: 2.8.0 -> 2.9.0

---
 pkgs/development/ocaml-modules/batteries/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index e71496e84f04..3da72453a2a0 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,23 +1,19 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }:
 
-let version = "2.8.0"; in
+let version = "2.9.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-batteries-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "1cvgljg8lxvfx0v3367z3p43dysg9m33v8gfy43bhw7fjr1bmyas";
+    sha256 = "1wianim29kkkf4c31k7injjp3ji69ki5krrp6csq8ycswg791dby";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];
   propagatedBuildInputs = [ num ];
 
-  configurePhase = if num != null then ''
-    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
-  '' else "true";      # Skip configure
-
-  doCheck = true;
+  doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07";
   checkTarget = "test test";
 
   createFindlibDestdir = true;

From 84a0dc8191e555eff83d3e23acf70ad6c23fb05f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 11 Sep 2018 20:33:25 +0200
Subject: [PATCH 0783/3253] qutebrowser: Fix patching of standarddir.py

The original patch was broken since https://github.com/qutebrowser/qutebrowser/commit/a85e19a5e1ae6792159fe0922ee5ba57815df132 because an `APPNAME` variable was introduced there.
---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a3b6c0364169..b4932ee0f1b9 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -58,7 +58,7 @@ in python3Packages.buildPythonApplication rec {
   ];
 
   postPatch = ''
-    sed -i "s,/usr/share/qutebrowser,$out/share/qutebrowser,g" qutebrowser/utils/standarddir.py
+    sed -i "s,/usr/share/,$out/share/,g" qutebrowser/utils/standarddir.py
   '' + lib.optionalString withPdfReader ''
     sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
   '';

From 2f15843601d1792157a5afebf738bc993b339b7f Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 11 Sep 2018 14:54:57 +0200
Subject: [PATCH 0784/3253] linphone: fix build of gtk ui

---
 .../networking/instant-messengers/linphone/default.nix      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 1b257ea61dce..510472a73aaa 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
     sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
   };
 
+  cmakeFlags = "-DENABLE_GTK_UI=ON";
+
+  postPatch = ''
+    touch coreapi/liblinphone_gitversion.h
+  '';
+
   buildInputs = [
     readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
     polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip

From b6bfbafe5eab64faac9da8190996e916b242673a Mon Sep 17 00:00:00 2001
From: Stefan Siegl <stesie@brokenpipe.de>
Date: Tue, 11 Sep 2018 17:29:13 +0200
Subject: [PATCH 0785/3253] linphone: add withGui option

---
 .../networking/instant-messengers/linphone/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 510472a73aaa..4282e99a712e 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -4,6 +4,7 @@
 , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
 , libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
 , python, graphviz, belcard
+, withGui ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
   };
 
-  cmakeFlags = "-DENABLE_GTK_UI=ON";
+  cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ];
 
   postPatch = ''
     touch coreapi/liblinphone_gitversion.h

From f61279e45bff6633d5d378e30c4304fbbb279ed3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Sep 2018 21:01:13 +0200
Subject: [PATCH 0786/3253] perl-TestRunCmdLine: disable tests on darwin

/cc ZHF #45961
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2ec4efed8863..714dba45aa2f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15664,6 +15664,7 @@ let
     };
     buildInputs = [ TestRun TestTrap ];
     propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ];
+    doCheck = !stdenv.isDarwin;
     meta = {
       homepage = http://web-cpan.berlios.de/modules/Test-Run/;
       description = "Analyze tests from the command line using Test::Run";

From ffde15da8efcd272edaa864e1b0d8dd72e82fc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Sep 2018 20:54:17 +0100
Subject: [PATCH 0787/3253] cargo-edit: add pkgconfig/openssl on non-darwin

---
 pkgs/tools/package-management/cargo-edit/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 916dd26a6ab0..c0c1d19bfb62 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, darwin, rustPlatform, fetchFromGitHub }:
+{ stdenv, lib, darwin
+, rustPlatform, fetchFromGitHub
+, openssl, pkgconfig }:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-edit-${version}";
@@ -13,6 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8";
 
+  nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
+  buildInputs = lib.optional (!stdenv.isDarwin) openssl;
   propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   meta = with lib; {

From cea6bbfe752d74e9ac9410be0b0a2f4c221c3bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Sep 2018 21:05:50 +0100
Subject: [PATCH 0788/3253] cargo-edit: disable impure check

---
 pkgs/tools/package-management/cargo-edit/default.nix   |  2 ++
 .../cargo-edit/disable-network-based-test.patch        | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index c0c1d19bfb62..e2cc49a3e99a 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optional (!stdenv.isDarwin) openssl;
   propagatedBuildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
+  patches = [ ./disable-network-based-test.patch ];
+
   meta = with lib; {
     description = "A utility for managing cargo dependencies from the command line";
     homepage = https://github.com/killercup/cargo-edit;
diff --git a/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch b/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch
new file mode 100644
index 000000000000..d1044a7fc539
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-edit/disable-network-based-test.patch
@@ -0,0 +1,10 @@
+--- cargo-edit.org/tests/cargo-upgrade.rs	2018-09-11 20:59:04.609532299 +0100
++++ cargo-edit/tests/cargo-upgrade.rs	2018-09-11 20:59:50.829435331 +0100
+@@ -302,6 +302,7 @@
+ }
+ 
+ #[test]
++#[ignore] // requires network
+ fn upgrade_prints_messages() {
+     let (_tmpdir, manifest) = clone_out_test("tests/fixtures/upgrade/Cargo.toml.source");
+ 

From c64d76d0e682aa6094c3171e79475ad5be746b15 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Sep 2018 13:57:25 -0400
Subject: [PATCH 0789/3253] dhcpcd: No need to hack around broken patchShebangs
 anymore

---
 pkgs/tools/networking/dhcpcd/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 1fe29b8b96ff..bb568bd2c1e7 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ udev ];
+  buildInputs = [
+    udev
+    runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
+  ];
 
   preConfigure = "patchShebangs ./configure";
 
@@ -29,11 +32,6 @@ stdenv.mkDerivation rec {
   # Check that the udev plugin got built.
   postInstall = stdenv.lib.optional (udev != null) "[ -e $out/lib/dhcpcd/dev/udev.so ]";
 
-  # TODO shlevy remove once patchShebangs is fixed
-  postFixup = ''
-    find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|'
-  '';
-
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = https://roy.marples.name/projects/dhcpcd;

From 989f24befcbd72d5b52ab699c0dcbcff40e7ff8e Mon Sep 17 00:00:00 2001
From: ivanbrennan <ivan.brennan@gmail.com>
Date: Tue, 11 Sep 2018 16:02:46 -0400
Subject: [PATCH 0790/3253] git2r: add SSH support

When building the devtools R module, which depends on git2r, it reports
that libssh2 cannot be found, and falls back to building without SSH
support. Adding libssh2.dev to git2r's native build inputs fixes this.
---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a2c586c06a96..0fbd2ae6fa70 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -258,7 +258,7 @@ let
     Formula = [ pkgs.gmp ];
     geoCount = [ pkgs.gsl_1 ];
     gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ];
-    git2r = [ pkgs.zlib.dev pkgs.openssl.dev ];
+    git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev ];
     GLAD = [ pkgs.gsl_1 ];
     glpkAPI = [ pkgs.gmp pkgs.glpk ];
     gmp = [ pkgs.gmp.dev ];

From 027b9beb583935a734c3d81dbf09862af3ee8293 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 11 Sep 2018 17:14:12 -0400
Subject: [PATCH 0791/3253] fixup! merge: fixing changes with nixpkgs since
 pull-request

---
 pkgs/development/python-modules/distributed/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index d909a6993a04..987b64439a53 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -50,6 +50,9 @@ buildPythonPackage rec {
     py.test distributed -m "not avoid-travis" -r s --timeout-method=thread --timeout=0 --durations=20 --ignore="distributed/cli/tests"
   '';
 
+  # when tested random tests would fail and not repeatably
+  doCheck = false;
+
   meta = {
     description = "Distributed computation in Python.";
     homepage = http://distributed.readthedocs.io/en/latest/;

From 147246e53e235d5b17106b893966a869b5b60bae Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:18:44 +0200
Subject: [PATCH 0792/3253] cfdg: add license

---
 pkgs/tools/graphics/cfdg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index a4d49edcb447..c65d1302dcaf 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     homepage = https://contextfreeart.org/;
+    license = licenses.gpl2;
     downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   };
 }

From 46d1166b80610e9d6609d910e03fa12981731e09 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 11 Sep 2018 23:22:17 +0200
Subject: [PATCH 0793/3253] pants: fix build (#46545)

See https://hydra.nixos.org/build/80727495

`pants' works with requests==2.19 to build successfully and `nixpkgs' currently uses `requests==2.19.1`.
Patching the version constraint in `setup.py' accordingly fixes the problem.

Addresses #45960
---
 pkgs/development/tools/build-managers/pants/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 1ad52f327e15..02bf9c23cbac 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -17,6 +17,7 @@ in buildPythonApplication rec {
 
   prePatch = ''
     sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
+    substituteInPlace setup.py --replace "requests[security]<2.19,>=2.5.0" "requests[security]<2.20,>=2.5.0"
   '';
 
   # Unnecessary, and causes some really weird behavior around .class files, which

From 85c1a851dcb57897bdd48abc12ad8e4bcf0926c6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:22:22 +0200
Subject: [PATCH 0794/3253] cuneiform: add license + homepage

---
 pkgs/tools/graphics/cuneiform/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index cc899ab104f9..9fcb7ba404d0 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Multi-language OCR system";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    homepage = https://launchpad.net/cuneiform-linux;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.raskin ];
   };
 }

From 2ccbd8bab5f722e91b9cce91191fac3a4f9ec311 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:24:19 +0200
Subject: [PATCH 0795/3253] editres: add license

---
 pkgs/tools/graphics/editres/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index b8f32c33a530..cb83e02689cf 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://cgit.freedesktop.org/xorg/app/editres/;
     description = "A dynamic resource editor for X Toolkit applications";
-
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    platforms = platforms.linux;
   };
 }

From 984a41fe9438f7e81e43ef6264d994071297faf9 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:25:43 +0200
Subject: [PATCH 0796/3253] exif: add liceses, update homepage

---
 pkgs/tools/graphics/exif/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index d6ec68ba3cc5..83fec1287a6b 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libexif popt libintl ];
 
-  meta = {
-    homepage = http://libexif.sourceforge.net/;
+  meta = with stdenv.lib; {
+    homepage = https://libexif.github.io;
     description = "A utility to read and manipulate EXIF data in digital photographs";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl21;
   };
 }

From 5e57452bf88c95421601e5cc13edcdafab511510 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:27:01 +0200
Subject: [PATCH 0797/3253] qrencode: add license

---
 pkgs/tools/graphics/qrencode/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 8e186399d638..7c5aed9b4e23 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     homepage = https://fukuchi.org/works/qrencode/;
     description = "QR code encoder";
     platforms = platforms.all;
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ yegortimoshenko ];
   };
 }

From 65f41e1bc0394dfe14d9541aa9a88ea67ff65260 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Sep 2018 14:27:47 -0700
Subject: [PATCH 0798/3253] avfs: 1.0.5 -> 1.0.6 (#46306)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/avfs/versions
---
 pkgs/tools/filesystems/avfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix
index 3f596947f883..5c44ef239630 100644
--- a/pkgs/tools/filesystems/avfs/default.nix
+++ b/pkgs/tools/filesystems/avfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "avfs-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
   src = fetchurl {
     url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2";
-    sha256 = "0xh1wpd8z3m5jmmv24fg4pvqhpnhygs2385qn5473hwk84gnpkp5";
+    sha256 = "1hz39f7p5vw647xqk161v3nh88qnd599av6nfidpmkh1d9vkl6jc";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 93f08451dd20b0f1bcb21f6a79dc6e52ae345215 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Sep 2018 14:28:55 -0700
Subject: [PATCH 0799/3253] adapta-gtk-theme: 3.94.0.92 -> 3.94.0.132 (#46302)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/adapta-gtk-theme/versions
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 0410af974f61..09fc7a4b4475 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.94.0.92";
+  version = "3.94.0.132";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "18gdsk07954wxsgr8i9kkpc8p6wvdr039lszz8hcplf2134bmb96";
+    sha256 = "11j4mpbw8x2vg0w740v8q3rnwannw2zhp60aj8kirqlgz76lbadl";
   };
 
   preferLocalBuild = true;

From 7d5cd978c4c88c67851d169a3fc8167556568f03 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:31:27 +0200
Subject: [PATCH 0800/3253] cloud-utils: add license

---
 pkgs/tools/misc/cloud-utils/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index fd6df64e5e76..bda8ebcf3b0e 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -30,5 +30,8 @@ stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  meta.platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+    license = licenses.gpl3;
+  };
 }

From 3bb64d88500eb8bd35b4a5e2dc7ea471d13df5f5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:32:49 +0200
Subject: [PATCH 0801/3253] desktop-file-utils: add license

---
 pkgs/tools/misc/desktop-file-utils/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index a6280ff4008a..70bc34954b2c 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
     description = "Command line utilities for working with .desktop files";
     platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.gpl2;
   };
 }

From 67731671949c5f9db88e8a8ed9c6361c8414b245 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:34:10 +0200
Subject: [PATCH 0802/3253] ent: add license

---
 pkgs/tools/misc/ent/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index f4354ad2416c..d4f69340d0ae 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
     cp ent $out/bin/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Pseudorandom Number Sequence Test Program";
     homepage = http://www.fourmilab.ch/random/;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.publicDomain;
   };
 }

From a1bd1839e11c86cdf4546fa1890342568bd7d7b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Sep 2018 14:37:16 -0700
Subject: [PATCH 0803/3253] appstream-glib: 0.7.10 -> 0.7.12 (#46297)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/appstream-glib/versions
---
 pkgs/development/libraries/appstream-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 48dfe9ad894e..39b3d6aba6bd 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
 , libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.10";
+  name = "appstream-glib-0.7.12";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d";
+    sha256 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax";
   };
 
   nativeBuildInputs = [

From 8955ec6c735f3000b00b45fb2c696b92f4d5c3c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Sep 2018 14:38:42 -0700
Subject: [PATCH 0804/3253] debootstrap: 1.0.107 -> 1.0.108 (#46294)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index a11e8a44de92..4e8eb0411d1a 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.107";
+  version = "1.0.108";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1gq5r4fa0hrq4c69l2s0ygnfyvr90k2wqaq15s869hayhnssx4g1";
+    sha256 = "1zfp6i6mskgx3b186sbd1443031h9z01yfqgynhl848faknv4h9f";
   };
 
   buildInputs = [ dpkg gettext gawk perl wget ];

From bc9b55c57c9aac66d04b7e64fceb1017e754dbd2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:40:43 +0200
Subject: [PATCH 0805/3253] kt: add license

---
 pkgs/tools/misc/kt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix
index eb0f78e787ab..be0ceda511c4 100644
--- a/pkgs/tools/misc/kt/default.nix
+++ b/pkgs/tools/misc/kt/default.nix
@@ -18,5 +18,6 @@ buildGoPackage rec {
     homepage = https://github.com/fgeller/kt;
     maintainers = with maintainers; [ utdemir ];
     platforms = with platforms; unix;
+    license = licenses.mit;
   };
 }

From b66ef28841319bf1a281bde4e97c82458839a483 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Mon, 20 Aug 2018 20:30:02 +0200
Subject: [PATCH 0806/3253] buildRustPackage, fetchcargo: optionally use vendor
 config from cargo-vendor

By setting useRealVendorConfig explicitly to true, the actual (slightly
modified) config generated by cargo-vendor is used.

This solves a problem, where the static vendor config in
pkgs/build-support/rust/default.nix would not sufficiently replace all
crates Cargo is looking for.

As useRealVendorConfig (and writeVendorConfig in fetchcargo) default to
false, there should be no breakage in existing cargoSha256 hashes.

Nethertheless, imho using this new feature should become standard. A
possible deprecation path could be:

- introduce this patch
- set useRealVendorConfig explicitly to false whereever cargoSha256 is
  set but migration is not wanted yet.
- after some time, let writeVendorConfig default to true
- when useRealVendorConfig is true everywhere cargoSha256 is set and
  enough time is passed, `assert cargoVendorDir == null ->
  useRealVendorConfig;`, remove old behaviour
- after some time, remove all appearences of useRealVendorConfig and the
  parameter itself
---
 doc/languages-frameworks/rust.section.md   | 11 ++++++++-
 nixos/doc/manual/release-notes/rl-1809.xml | 21 +++++++++++++++++
 pkgs/build-support/rust/default.nix        | 26 ++++++++++++++++------
 pkgs/build-support/rust/fetchcargo.nix     | 10 +++++----
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6588281878a0..737759fd8bd8 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -42,7 +42,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
   };
 
-  cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+  cargoSha256 = "194lzn9xjkc041lmqnm676ydgbhn45xx9jhrhz6lzlg99yr6b880";
+  useRealVendorConfig = true;
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -64,6 +65,14 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
+The `useRealVendorConfig` parameter tells cargo-vendor to include a Cargo
+configuration file in the fetched dependencies. This will fix problems with
+projects, where Crates are downloaded from non-crates.io sources. Please note,
+that currently this parameter defaults to `false` only due to compatibility
+reasons, as setting this to `true` requires a change in `cargoSha256`.
+Eventually this distinction will be deprecated, so please always set
+`useRealVendorConfig` to `true` and make sure to recompute the `cargoSha256`.
+
 To install crates with nix there is also an experimental project called
 [nixcrates](https://github.com/fractalide/nixcrates).
 
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 01421fc5dda7..dd04996925bb 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -551,6 +551,27 @@ inherit (pkgs.nixos {
       <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+	    The <literal>buildRustPackage</literal> function got the new
+	    argument <literal>useRealVendorConfig</literal>, currently
+	    defaulting to <literal>false</literal>. Setting it to
+	    <literal>true</literal> necessates the recomputation of the
+	    <literal>cargoSha256</literal> and fixes a problem with
+	    dependencies, that were fetched from a non-crates.io source.
+	    Eventually only the <literal>true</literal> behaviour will be kept,
+	    so please set it explicitly to <literal>true</literal> and
+	    recompute your <literal>cargoSha256</literal>, so that we can
+	    migrate to the new behaviour and deprecate the option.
+    </para>
+    <para>
+	    While recomputing <literal>cargoSha256</literal>, it is important
+	    to first invalidate the hash (e.g. by changing a digit), so that
+	    Nix actually rebuilds the fixed-output derivation. Otherwise this
+	    could lead to hard to detect errors, where a package seemingly
+	    builds on your computer, but breaks on others!
+    </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 820989a76206..a2dc5df4d926 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -17,9 +17,15 @@ in
 , cargoBuildFlags ? []
 
 , cargoVendorDir ? null
+# This tells cargo-vendor to include a Cargo config file in the fixed-output
+# derivation. This is desirable in every case, so please set it to true.
+# Eventually this will default to true and even later this option and the old
+# behaviour will be removed.
+, useRealVendorConfig ? false
 , ... } @ args:
 
 assert cargoVendorDir == null -> cargoSha256 != "unset";
+assert cargoVendorDir != null -> !useRealVendorConfig;
 
 let
   cargoDeps = if cargoVendorDir == null
@@ -27,6 +33,7 @@ let
         inherit name src srcs sourceRoot cargoUpdateHook;
         patches = cargoPatches;
         sha256 = cargoSha256;
+        writeVendorConfig = useRealVendorConfig;
       }
     else null;
 
@@ -61,14 +68,19 @@ in stdenv.mkDerivation (args // {
     ${setupVendorDir}
 
     mkdir .cargo
-    cat >.cargo/config <<-EOF
-      [source.crates-io]
-      registry = 'https://github.com/rust-lang/crates.io-index'
-      replace-with = 'vendored-sources'
+  '' + (if useRealVendorConfig then ''
+      sed "s|directory = \".*\"|directory = \"$(pwd)/$cargoDepsCopy\"|g" \
+        "$(pwd)/$cargoDepsCopy/.cargo/config" > .cargo/config
+    '' else ''
+      cat >.cargo/config <<-EOF
+        [source.crates-io]
+        registry = 'https://github.com/rust-lang/crates.io-index'
+        replace-with = 'vendored-sources'
 
-      [source.vendored-sources]
-      directory = '$(pwd)/$cargoDepsCopy'
-    EOF
+        [source.vendored-sources]
+        directory = '$(pwd)/$cargoDepsCopy'
+      EOF
+    '') + ''
 
     unset cargoDepsCopy
 
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 2670ed528640..2d8a36a30ace 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,5 +1,5 @@
 { stdenv, cacert, git, rust, cargo-vendor }:
-{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
+{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "", writeVendorConfig ? false }:
 stdenv.mkDerivation {
   name = "${name}-vendor";
   nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ];
@@ -23,9 +23,11 @@ stdenv.mkDerivation {
 
     ${cargoUpdateHook}
 
-    cargo vendor
-
-    cp -ar vendor $out
+    mkdir -p $out
+    cargo vendor $out > config
+  '' + stdenv.lib.optionalString writeVendorConfig ''
+    mkdir $out/.cargo
+    sed "s|directory = \".*\"|directory = \"./vendor\"|g" config > $out/.cargo/config
   '';
 
   outputHashAlgo = "sha256";

From ccf72b853738cba2de2c4b22cfc1668792201bb3 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 8 Sep 2018 14:14:56 +0200
Subject: [PATCH 0807/3253] fetchcargo: normalise cargo config to ensure
 determinism

---
 .../rust/cargo-vendor-normalise.py            | 32 +++++++++++++++++++
 pkgs/build-support/rust/default.nix           |  8 ++---
 pkgs/build-support/rust/fetchcargo.nix        | 13 ++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100755 pkgs/build-support/rust/cargo-vendor-normalise.py

diff --git a/pkgs/build-support/rust/cargo-vendor-normalise.py b/pkgs/build-support/rust/cargo-vendor-normalise.py
new file mode 100755
index 000000000000..194636968564
--- /dev/null
+++ b/pkgs/build-support/rust/cargo-vendor-normalise.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+import toml
+import sys
+
+def escape(s):
+    return '"'+s.replace('"', r'\"').replace("\n", r"\n").replace("\\", "\\\\")+'"'
+
+data = toml.load(sys.stdin)
+
+assert list(data.keys()) == [ "source" ]
+
+# this value is non deterministic
+data["source"]["vendored-sources"]["directory"] = "@vendor@"
+
+result = ""
+inner = data["source"]
+for source in sorted(inner.keys()):
+    result += '[source.{}]\n'.format(escape(source))
+    if source == "vendored-sources":
+        result += '"directory" = "@vendor@"\n'
+    else:
+        for key in sorted(inner[source].keys()):
+            result += '{} = {}\n'.format(escape(key), escape(inner[source][key]))
+    result += "\n"
+
+real = toml.loads(result)
+assert real == data, "output = {} while input = {}".format(real, data)
+
+print(result)
+
+
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a2dc5df4d926..864e42c47619 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
 let
   fetchcargo = import ./fetchcargo.nix {
-    inherit stdenv cacert git rust cargo-vendor;
+    inherit stdenv cacert git rust cargo-vendor python3;
   };
 in
 { name, cargoSha256 ? "unset"
@@ -69,8 +69,8 @@ in stdenv.mkDerivation (args // {
 
     mkdir .cargo
   '' + (if useRealVendorConfig then ''
-      sed "s|directory = \".*\"|directory = \"$(pwd)/$cargoDepsCopy\"|g" \
-        "$(pwd)/$cargoDepsCopy/.cargo/config" > .cargo/config
+      substitute "$(pwd)/$cargoDepsCopy/.cargo/config" .cargo/config \
+      --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
     '' else ''
       cat >.cargo/config <<-EOF
         [source.crates-io]
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 2d8a36a30ace..f04988a7dc13 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,5 +1,14 @@
-{ stdenv, cacert, git, rust, cargo-vendor }:
+{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
 { name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "", writeVendorConfig ? false }:
+let cargo-vendor-normalise = stdenv.mkDerivation {
+  name = "cargo-vendor-normalise";
+  src = ./cargo-vendor-normalise.py;
+  unpackPhase = ":";
+  installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
+  buildInputs = [ (python3.withPackages(ps: [ ps.toml ])) ];
+  preferLocalBuild = true;
+};
+in
 stdenv.mkDerivation {
   name = "${name}-vendor";
   nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ];
@@ -27,7 +36,7 @@ stdenv.mkDerivation {
     cargo vendor $out > config
   '' + stdenv.lib.optionalString writeVendorConfig ''
     mkdir $out/.cargo
-    sed "s|directory = \".*\"|directory = \"./vendor\"|g" config > $out/.cargo/config
+    < config ${cargo-vendor-normalise}/bin/cargo-vendor-normalise > $out/.cargo/config
   '';
 
   outputHashAlgo = "sha256";

From f20b229aa19e92914aba7fe990201be730c07a10 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 9 Sep 2018 15:54:00 +0200
Subject: [PATCH 0808/3253] fectchcargo: don't break old sha256

---
 doc/languages-frameworks/rust.section.md      | 11 +-------
 nixos/doc/manual/release-notes/rl-1809.xml    | 21 ---------------
 pkgs/build-support/rust/default.nix           | 26 +++++--------------
 .../rust/fetchcargo-default-config.toml       |  7 +++++
 pkgs/build-support/rust/fetchcargo.nix        | 17 +++++++-----
 5 files changed, 25 insertions(+), 57 deletions(-)
 create mode 100755 pkgs/build-support/rust/fetchcargo-default-config.toml

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 737759fd8bd8..6588281878a0 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -42,8 +42,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
   };
 
-  cargoSha256 = "194lzn9xjkc041lmqnm676ydgbhn45xx9jhrhz6lzlg99yr6b880";
-  useRealVendorConfig = true;
+  cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -65,14 +64,6 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
-The `useRealVendorConfig` parameter tells cargo-vendor to include a Cargo
-configuration file in the fetched dependencies. This will fix problems with
-projects, where Crates are downloaded from non-crates.io sources. Please note,
-that currently this parameter defaults to `false` only due to compatibility
-reasons, as setting this to `true` requires a change in `cargoSha256`.
-Eventually this distinction will be deprecated, so please always set
-`useRealVendorConfig` to `true` and make sure to recompute the `cargoSha256`.
-
 To install crates with nix there is also an experimental project called
 [nixcrates](https://github.com/fractalide/nixcrates).
 
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index dd04996925bb..01421fc5dda7 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -551,27 +551,6 @@ inherit (pkgs.nixos {
       <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
     </para>
   </listitem>
-  <listitem>
-    <para>
-	    The <literal>buildRustPackage</literal> function got the new
-	    argument <literal>useRealVendorConfig</literal>, currently
-	    defaulting to <literal>false</literal>. Setting it to
-	    <literal>true</literal> necessates the recomputation of the
-	    <literal>cargoSha256</literal> and fixes a problem with
-	    dependencies, that were fetched from a non-crates.io source.
-	    Eventually only the <literal>true</literal> behaviour will be kept,
-	    so please set it explicitly to <literal>true</literal> and
-	    recompute your <literal>cargoSha256</literal>, so that we can
-	    migrate to the new behaviour and deprecate the option.
-    </para>
-    <para>
-	    While recomputing <literal>cargoSha256</literal>, it is important
-	    to first invalidate the hash (e.g. by changing a digit), so that
-	    Nix actually rebuilds the fixed-output derivation. Otherwise this
-	    could lead to hard to detect errors, where a package seemingly
-	    builds on your computer, but breaks on others!
-    </para>
-  </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 864e42c47619..1d5de052f893 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -17,15 +17,9 @@ in
 , cargoBuildFlags ? []
 
 , cargoVendorDir ? null
-# This tells cargo-vendor to include a Cargo config file in the fixed-output
-# derivation. This is desirable in every case, so please set it to true.
-# Eventually this will default to true and even later this option and the old
-# behaviour will be removed.
-, useRealVendorConfig ? false
 , ... } @ args:
 
 assert cargoVendorDir == null -> cargoSha256 != "unset";
-assert cargoVendorDir != null -> !useRealVendorConfig;
 
 let
   cargoDeps = if cargoVendorDir == null
@@ -33,7 +27,6 @@ let
         inherit name src srcs sourceRoot cargoUpdateHook;
         patches = cargoPatches;
         sha256 = cargoSha256;
-        writeVendorConfig = useRealVendorConfig;
       }
     else null;
 
@@ -68,19 +61,12 @@ in stdenv.mkDerivation (args // {
     ${setupVendorDir}
 
     mkdir .cargo
-  '' + (if useRealVendorConfig then ''
-      substitute "$(pwd)/$cargoDepsCopy/.cargo/config" .cargo/config \
-      --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
-    '' else ''
-      cat >.cargo/config <<-EOF
-        [source.crates-io]
-        registry = 'https://github.com/rust-lang/crates.io-index'
-        replace-with = 'vendored-sources'
-
-        [source.vendored-sources]
-        directory = '$(pwd)/$cargoDepsCopy'
-      EOF
-    '') + ''
+    config="$(pwd)/$cargoDepsCopy/.cargo/config";
+    if [[ ! -e $config ]]; then
+      config=${./fetchcargo-default-config.toml};
+    fi;
+    substitute $config .cargo/config \
+    --subst-var-by vendor "$(pwd)/$cargoDepsCopy"
 
     unset cargoDepsCopy
 
diff --git a/pkgs/build-support/rust/fetchcargo-default-config.toml b/pkgs/build-support/rust/fetchcargo-default-config.toml
new file mode 100755
index 000000000000..dd8ebbc32d31
--- /dev/null
+++ b/pkgs/build-support/rust/fetchcargo-default-config.toml
@@ -0,0 +1,7 @@
+[source."crates-io"]
+"replace-with" = "vendored-sources"
+
+[source."vendored-sources"]
+"directory" = "@vendor@"
+
+
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index f04988a7dc13..1a40a362d9b5 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,5 +1,4 @@
 { stdenv, cacert, git, rust, cargo-vendor, python3 }:
-{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "", writeVendorConfig ? false }:
 let cargo-vendor-normalise = stdenv.mkDerivation {
   name = "cargo-vendor-normalise";
   src = ./cargo-vendor-normalise.py;
@@ -9,9 +8,10 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
   preferLocalBuild = true;
 };
 in
+{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
 stdenv.mkDerivation {
   name = "${name}-vendor";
-  nativeBuildInputs = [ cacert cargo-vendor git rust.cargo ];
+  nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise rust.cargo ];
   inherit src srcs patches sourceRoot;
 
   phases = "unpackPhase patchPhase installPhase";
@@ -33,10 +33,15 @@ stdenv.mkDerivation {
     ${cargoUpdateHook}
 
     mkdir -p $out
-    cargo vendor $out > config
-  '' + stdenv.lib.optionalString writeVendorConfig ''
-    mkdir $out/.cargo
-    < config ${cargo-vendor-normalise}/bin/cargo-vendor-normalise > $out/.cargo/config
+    cargo vendor $out | cargo-vendor-normalise > config
+    # fetchcargo used to never keep the config output by cargo vendor
+    # and instead hardcode the config in ./fetchcargo-default-config.toml.
+    # This broke on packages needing git dependencies, so now we keep the config.
+    # But not to break old cargoSha256, if the previous behavior was enough,
+    # we don't store the config.
+    if ! cmp config ${./fetchcargo-default-config.toml} > /dev/null; then
+      install -Dt $out/.cargo config;
+    fi;
   '';
 
   outputHashAlgo = "sha256";

From 7bfa20198afce7830ff2daccb4400f03c9f40e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Sep 2018 21:49:16 +0100
Subject: [PATCH 0809/3253] fetchcargo: add type checking to
 cargo-vendor-normalise.py

---
 .../rust/cargo-vendor-normalise.py            | 61 +++++++++++--------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/pkgs/build-support/rust/cargo-vendor-normalise.py b/pkgs/build-support/rust/cargo-vendor-normalise.py
index 194636968564..2d7a18957184 100755
--- a/pkgs/build-support/rust/cargo-vendor-normalise.py
+++ b/pkgs/build-support/rust/cargo-vendor-normalise.py
@@ -1,32 +1,41 @@
 #!/usr/bin/env python
 
-import toml
 import sys
 
-def escape(s):
-    return '"'+s.replace('"', r'\"').replace("\n", r"\n").replace("\\", "\\\\")+'"'
-
-data = toml.load(sys.stdin)
-
-assert list(data.keys()) == [ "source" ]
-
-# this value is non deterministic
-data["source"]["vendored-sources"]["directory"] = "@vendor@"
-
-result = ""
-inner = data["source"]
-for source in sorted(inner.keys()):
-    result += '[source.{}]\n'.format(escape(source))
-    if source == "vendored-sources":
-        result += '"directory" = "@vendor@"\n'
-    else:
-        for key in sorted(inner[source].keys()):
-            result += '{} = {}\n'.format(escape(key), escape(inner[source][key]))
-    result += "\n"
-
-real = toml.loads(result)
-assert real == data, "output = {} while input = {}".format(real, data)
-
-print(result)
+import toml
 
 
+def quote(s: str) -> str:
+    escaped = s.replace('"', r"\"").replace("\n", r"\n").replace("\\", "\\\\")
+    return '"{}"'.format(escaped)
+
+
+def main() -> None:
+    data = toml.load(sys.stdin)
+
+    assert list(data.keys()) == ["source"]
+
+    # this value is non deterministic
+    data["source"]["vendored-sources"]["directory"] = "@vendor@"
+
+    lines = []
+    inner = data["source"]
+    for source, attrs in sorted(inner.items()):
+        lines.append("[source.{}]".format(quote(source)))
+        if source == "vendored-sources":
+            lines.append('"directory" = "@vendor@"\n')
+        else:
+            for key, value in sorted(attrs.items()):
+                attr = "{} = {}".format(quote(key), quote(value))
+                lines.append(attr)
+        lines.append("")
+
+    result = "\n".join(lines)
+    real = toml.loads(result)
+    assert real == data, "output = {} while input = {}".format(real, data)
+
+    print(result)
+
+
+if __name__ == "__main__":
+    main()

From 33dab23255cedcf83fe1710a35b9b962f41406aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 11 Sep 2018 21:52:06 +0100
Subject: [PATCH 0810/3253] alacritty: switch back to upstream source

Thanks to https://github.com/NixOS/nixpkgs/pull/46362
We can now support git dependencies!
---
 pkgs/applications/misc/alacritty/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4544ed1fba3b..98e93321265e 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,6 +1,6 @@
 { stdenv,
   lib,
-  fetchgit,
+  fetchFromGitHub,
   rustPlatform,
   cmake,
   makeWrapper,
@@ -51,18 +51,16 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-08-30";
+  version = "2018-08-05";
 
-  # At the moment we cannot handle git dependencies in buildRustPackage.
-  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
-  src = fetchgit {
-    url = https://github.com/Mic92/alacritty.git;
-    rev = "rev-${version}";
-    sha256 = "0izvg7dwwb763jc6gnmn47i5zrkxvmh3vssn6vzrrmqhd4j3msmf";
-    fetchSubmodules = true;
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "alacritty";
+    rev = "1adb5cb7fc05054197aa08e0d1fa957df94888ab";
+    sha256 = "06rc7dy1vn59lc5hjh953h9lh0f39c0n0jmrz472mrya722fl2ab";
   };
 
-  cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx";
+  cargoSha256 = "0ms0248bb2lgbzcqks6i0qhn1gaiim3jf1kl17qw52c8an3rc652";
 
   nativeBuildInputs = [
     cmake

From a3e1da17cb10327f1045e22f49dba1f959ac769e Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 11 Sep 2018 23:40:35 +0200
Subject: [PATCH 0811/3253] cargo-vendor-normalise: add a small install check

---
 pkgs/build-support/rust/fetchcargo.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 1a40a362d9b5..eb51e5c4ff9a 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -4,6 +4,13 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
   src = ./cargo-vendor-normalise.py;
   unpackPhase = ":";
   installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
+  doInstallCheck = true;
+  installCheckPhase = ''
+    # check that ./fetchcargo-default-config.toml is a fix point
+    reference=${./fetchcargo-default-config.toml}
+    < $reference $out/bin/cargo-vendor-normalise > test;
+    cmp test $reference
+  '';
   buildInputs = [ (python3.withPackages(ps: [ ps.toml ])) ];
   preferLocalBuild = true;
 };

From 92b36b62b74d86aeb526b117fba9816654473d28 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:44:44 +0200
Subject: [PATCH 0812/3253] mdbtools: add license + homepage

---
 pkgs/tools/misc/mdbtools/default.nix | 6 ++++--
 pkgs/tools/misc/mdbtools/git.nix     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix
index acb3bd9d3773..d251bee71d96 100644
--- a/pkgs/tools/misc/mdbtools/default.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -15,8 +15,10 @@ stdenv.mkDerivation {
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = ".mdb (MS Access) format tools";
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://mdbtools.sourceforge.net;
+    platforms = platforms.unix;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index 2116815ed0c3..b275002e1105 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -26,8 +26,10 @@ stdenv.mkDerivation {
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = ".mdb (MS Access) format tools";
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://mdbtools.sourceforge.net;
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }

From 921f792aca23912e801a98346e83c23740597b16 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:49:22 +0200
Subject: [PATCH 0813/3253] rkflashtool: add license

---
 pkgs/tools/misc/rkflashtool/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
index ff606c6b72bb..fb55b15bbd55 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -24,10 +24,11 @@ stdenv.mkDerivation rec {
     cp rkunpack rkcrc rkflashtool rkparameters rkparametersblock rkunsign rkmisc $out/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/rkflashtool/;
     description = "Tools for flashing Rockchip devices";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.viric ];
+    license = licenses.bsd2;
   };
 }

From 55c0f5167f8f5fb1e02f79397aa6e8953a50e6a1 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:51:16 +0200
Subject: [PATCH 0814/3253] xvfb-run: add license`

---
 pkgs/tools/misc/xvfb-run/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index c4cfc00308e9..bfc2a03e6cb8 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
       --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]}
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From c3bffc172d9f13a8fb35cc753592b81c699f61f0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 11 Sep 2018 23:54:23 +0200
Subject: [PATCH 0815/3253] dar: add license

---
 pkgs/tools/backup/dar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 86f8619f101e..b870c08d755f 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://dar.linux.free.fr;
     description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = with maintainers; [ ];
+    license = licenses.gpl2;
     platforms = platforms.unix;
   };
 }

From 2164e39eaa943d1e5c7a6d729c143f16d5cf291e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 00:11:12 +0200
Subject: [PATCH 0816/3253] aria2: fix darwin build (#46548)

Not released yet, see https://github.com/aria2/aria2/issues/1198

/cc ZHF #45961
---
 pkgs/tools/networking/aria2/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 028691229e3b..873aa66c4212 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook
 , openssl, c-ares, libxml2, sqlite, zlib, libssh2
 , cppunit
 , Security
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "0hwqnjyszasr6049vr5mn48slb48v5kw39cbpbxa68ggmhj9bw6m";
   };
 
+  patches = [
+    # Remove with 1.35.0.
+    (fetchpatch {
+      url = https://github.com/aria2/aria2/commit/e8e04d6f22a507e8374651d3d2343cd9fb986993.patch;
+      sha256 = "1v27nqbsdjgg3ga4n0v9daq21m3cmdpy7d08kp32200pzag87f4y";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++

From a25dcb66077310067ca1b59b2f38046bee752b0a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 12 Sep 2018 01:23:36 +0200
Subject: [PATCH 0817/3253] python3Packages.pyowm: fix python3 build (#46549)

See https://hydra.nixos.org/build/80714323

Version 2.9 requires `geojson==2.x'. To allow 2.4, the constraint
required some patching using `substituteInPlace'.

Addresses #45960
---
 pkgs/development/python-modules/pyowm/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
index 58a8dee155a8..c853965469a9 100644
--- a/pkgs/development/python-modules/pyowm/default.nix
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, requests }:
+{ lib, buildPythonPackage, fetchPypi, requests, geojson }:
 
 buildPythonPackage rec {
   pname = "pyowm";
@@ -9,11 +9,13 @@ buildPythonPackage rec {
     sha256 = "ed175873823a2fedb48e453505c974ca39f3f75006ef1af54fdbcf72e6796849";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [ requests geojson ];
 
   # This may actually break the package.
   postPatch = ''
-    substituteInPlace setup.py --replace "requests>=2.18.2,<2.19" "requests"
+    substituteInPlace setup.py \
+      --replace "requests>=2.18.2,<2.19" "requests"  \
+      --replace "geojson>=2.3.0,<2.4" "geojson<2.5,>=2.3.0"
   '';
 
   # No tests in archive

From 99dad9d7f01429f03054d45da8a6468fca0f8793 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 11 Sep 2018 23:51:25 +0200
Subject: [PATCH 0818/3253] python.pkgs.requests-file: init at 1.4.3

---
 .../python-modules/requests-file/default.nix  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/requests-file/default.nix

diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix
new file mode 100644
index 000000000000..fac222176519
--- /dev/null
+++ b/pkgs/development/python-modules/requests-file/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, requests, six }:
+
+buildPythonPackage rec {
+  pname   = "requests-file";
+  version = "1.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yp2jaxg3v86pia0q512dg3hz6s9y5vzdivsgrba1kds05ial14g";
+  };
+
+  propagatedBuildInputs = [ requests six ];
+
+  meta = {
+    homepage = https://github.com/dashea/requests-file;
+    description = "Transport adapter for fetching file:// URLs with the requests python library";
+    license = lib.licenses.asl20;
+  };
+
+}

From e281f0e68631af7c1ff6e20f1b84683a117b016d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 11 Sep 2018 23:51:50 +0200
Subject: [PATCH 0819/3253] python.pkgs.tldextract: init at 2.2.0

---
 .../python-modules/tldextract/default.nix     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/tldextract/default.nix

diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix
new file mode 100644
index 000000000000..4e494244d314
--- /dev/null
+++ b/pkgs/development/python-modules/tldextract/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage
+, requests, requests-file, idna, pytest
+, responses
+}:
+
+buildPythonPackage rec {
+  pname   = "tldextract";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99";
+  };
+
+  propagatedBuildInputs = [ requests requests-file idna ];
+  checkInputs = [ pytest responses ];
+
+  meta = {
+    homepage = https://github.com/john-kurkowski/tldextract;
+    description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List.";
+    license = lib.licenses.bsd3;
+  };
+
+}

From 75b2058aff6bfa56024439edfc7edaf5c3e7a551 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 12 Sep 2018 01:26:25 +0200
Subject: [PATCH 0820/3253] python.pkgs.pyreadability: init at 0.4.0

---
 .../python-modules/pyreadability/default.nix  | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyreadability/default.nix

diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix
new file mode 100644
index 000000000000..a95074b906e3
--- /dev/null
+++ b/pkgs/development/python-modules/pyreadability/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage
+, requests, chardet, cssselect, lxml
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname   = "PyReadability";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn";
+  };
+
+  propagatedBuildInputs = [ requests chardet cssselect lxml ];
+
+  # ModuleNotFoundError: No module named 'tests'
+  doCheck = false;
+
+  meta = {
+    homepage = https://github.com/hyperlinkapp/python-readability;
+    description = "fast python port of arc90's readability tool, updated to match latest readability.js!";
+    license = lib.licenses.asl20;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ca55835abf6..ed12cf2e17be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2000,6 +2000,8 @@ in {
 
   requests-cache = callPackage ../development/python-modules/requests-cache { };
 
+  requests-file = callPackage ../development/python-modules/requests-file { };
+
   requests-kerberos = callPackage ../development/python-modules/requests-kerberos { };
 
   requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {};
@@ -11141,6 +11143,8 @@ in {
     };
   });
 
+  pyreadability = callPackage ../development/python-modules/pyreadability { };
+
   pyscss = buildPythonPackage rec {
     name = "pyScss-${version}";
     version = "1.3.5";
@@ -17071,6 +17075,8 @@ EOF
 
   textacy = callPackage ../development/python-modules/textacy { };
 
+  tldextract = callPackage ../development/python-modules/tldextract { };
+
   pyemd  = callPackage ../development/python-modules/pyemd { };
 
   pulp  = callPackage ../development/python-modules/pulp { };

From dca577a36c4f90cf31de804ce9fb4e6a1aab259e Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 12 Sep 2018 01:42:17 +0200
Subject: [PATCH 0821/3253] python.pkgs.pykeepass: init at 3.0.2

---
 .../python-modules/pykeepass/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/pykeepass/default.nix

diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
new file mode 100644
index 000000000000..68c35ed0df12
--- /dev/null
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage
+, lxml, pycryptodome, construct
+, argon2_cffi, dateutil, enum34
+}:
+
+buildPythonPackage rec {
+  pname   = "pykeepass";
+  version = "3.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kfnh42nimsbdpwpny2c9df82b2n4fb5fagh54ck06f3x483vd90";
+  };
+
+  propagatedBuildInputs = [
+    lxml pycryptodome construct
+    argon2_cffi dateutil enum34
+  ];
+
+  meta = {
+    homepage = https://github.com/pschmitt/pykeepass;
+    description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
+    license = lib.licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed12cf2e17be..54384028abde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -467,6 +467,8 @@ in {
 
   pykerberos = callPackage ../development/python-modules/pykerberos { };
 
+  pykeepass = callPackage ../development/python-modules/pykeepass { };
+
   pymatgen = callPackage ../development/python-modules/pymatgen { };
 
   pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };

From d117e3ccd8f8e3944d3e2777c06626e5c834a0e1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 12 Sep 2018 03:18:37 +0200
Subject: [PATCH 0822/3253] python.pkgs.construct: 2.8.16 -> 2.9.45

---
 .../python-modules/construct/default.nix      | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix
index 680f6e02cd01..f8e739f0bc7d 100644
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pytest }:
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, six, pytest, arrow
+}:
 
 buildPythonPackage rec {
-  pname = "construct";
-  version = "2.8.16";
-  name = pname + "-" + version;
+  pname   = "construct";
+  version = "2.9.45";
 
   src = fetchFromGitHub {
-    owner = "construct";
-    repo = "construct";
-    rev = "v${version}";
-    sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j";
+    owner  = pname;
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "0ig66xrzswpkhhmw123p2nvr15a9lxz54a1fmycfdh09327c1d3y";
   };
 
   propagatedBuildInputs = [ six ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest arrow ];
 
+  # TODO: figure out missing dependencies
+  doCheck = false;
   checkPhase = ''
-    py.test -k 'not test_numpy' tests
+    py.test -k 'not test_numpy and not test_gallery' tests
   '';
 
   meta = with stdenv.lib; {

From cf2603f144b86201635867c7e19f41fd965b382c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 12 Sep 2018 02:41:03 +0200
Subject: [PATCH 0823/3253] qutebrowser: patch all python scripts

---
 .../browsers/qutebrowser/default.nix          | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index b4932ee0f1b9..b71eea791550 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -55,6 +55,9 @@ in python3Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python3Packages; [
     pyyaml pyqt5 jinja2 pygments
     pypeg2 cssutils pyopengl attrs
+    # scripts and userscripts libs
+    tldextract beautifulsoup4
+    pyreadability pykeepass stem
   ];
 
   postPatch = ''
@@ -81,15 +84,15 @@ in python3Packages.buildPythonApplication rec {
         "$out/share/icons/hicolor/scalable/apps/qutebrowser.svg"
 
     # Install scripts
-    sed -i "s,/usr/bin/qutebrowser,$out/bin/qutebrowser,g" scripts/open_url_in_instance.sh
-    install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/open_url_in_instance.sh
+    sed -i "s,/usr/bin/,$out/bin/,g" scripts/open_url_in_instance.sh
+    install -Dm755 -t "$out/share/qutebrowser/scripts/" $(find scripts -type f)
     install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
 
-    # Install and patch python scripts
+    # Patch python scripts
     buildPythonPath "$out $propagatedBuildInputs"
-    for i in importer dictcli keytester utils; do
-      install -Dm755 -t "$out/share/qutebrowser/scripts/" scripts/$i.py
-      patchPythonScript "$out/share/qutebrowser/scripts/$i.py"
+    scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/)
+    for i in $scripts; do
+      patchPythonScript "$i"
     done
   '';
 
@@ -97,10 +100,10 @@ in python3Packages.buildPythonApplication rec {
     wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit"
   '';
 
-  meta = {
-    homepage = https://github.com/The-Compiler/qutebrowser;
+  meta = with stdenv.lib; {
+    homepage    = https://github.com/The-Compiler/qutebrowser;
     description = "Keyboard-focused browser with a minimal GUI";
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.jagajaga ];
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jagajaga rnhmjoj ];
   };
 }

From 5dc1796a6f87ff0a8adf1694bf47ec95755147ff Mon Sep 17 00:00:00 2001
From: Luke Clifton <Luke.Clifton@cba.com.au>
Date: Wed, 12 Sep 2018 11:40:04 +0800
Subject: [PATCH 0824/3253] vaultenv: 0.5.3 -> 0.8.0

---
 .../tools/haskell/vaultenv/default.nix        | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index b607cc5604cd..6bf5e9be7bf2 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -1,28 +1,35 @@
-{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit
-, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix
-, unordered-containers, utf8-string
+{ mkDerivation, async, base, bytestring, connection, containers
+, directory, hpack, hspec, hspec-discover, hspec-expectations
+, http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
+, optparse-applicative, parser-combinators, retry, stdenv, text
+, unix, unordered-containers, utf8-string, fetchzip
 }:
-
 mkDerivation rec {
   pname = "vaultenv";
-  version = "0.5.3";
+  version = "0.8.0";
 
   src = fetchzip {
     url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
-    sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li";
+    sha256 = "04hrwyy7gsybdwljrks4ym3pshqk1i43f8wpirjx7b0dfjgsd2l5";
   };
 
   buildTools = [ hpack ];
-  preConfigure = "hpack .";
 
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    async base bytestring http-conduit lens lens-aeson
-    optparse-applicative retry text unix unordered-containers
-    utf8-string
+    async base bytestring connection containers http-client
+    http-conduit lens lens-aeson megaparsec mtl optparse-applicative
+    parser-combinators retry text unix unordered-containers utf8-string
   ];
-  homepage = "https://github.com/channable/vaultenv";
+  testHaskellDepends = [
+    async base bytestring connection containers directory hspec
+    hspec-discover hspec-expectations http-client http-conduit lens
+    lens-aeson megaparsec mtl optparse-applicative parser-combinators
+    retry text unix unordered-containers utf8-string
+  ];
+  preConfigure = "hpack";
+  homepage = "https://github.com/channable/vaultenv#readme";
   description = "Runs processes with secrets from HashiCorp Vault";
   license = stdenv.lib.licenses.bsd3;
   maintainers = with stdenv.lib.maintainers; [ lnl7 ];

From 541a13ca0ae42dbdea9369c585b51b23b5a660b3 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 14:11:02 +0300
Subject: [PATCH 0825/3253] pythonPackages.eth-typing: init at 1.1.0

---
 .../python-modules/eth-typing/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/eth-typing/default.nix

diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
new file mode 100644
index 000000000000..070923c83855
--- /dev/null
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, pytest }:
+
+buildPythonPackage rec {
+  pname = "eth-typing";
+  version = "1.3.0";
+
+  # Tests are missing from the PyPI source tarball so let's use GitHub
+  # https://github.com/ethereum/eth-typing/issues/8
+  src = fetchFromGitHub {
+    owner = "ethereum";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0703z7vlsfa3dvgcq22f9rzmj0svyp2a8wc7h73d0aac28ydhpv9";
+  };
+
+  # setuptools-markdown uses pypandoc which is broken at the moment
+  preConfigure = ''
+    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+  '';
+
+  disabled = pythonOlder "3.5";
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest .
+  '';
+
+  meta = {
+    description = "Common type annotations for Ethereum Python packages";
+    homepage = https://github.com/ethereum/eth-typing;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f55ead0053f..a2419d74b1a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1657,6 +1657,8 @@ in {
 
   eth-hash = callPackage ../development/python-modules/eth-hash { };
 
+  eth-typing = callPackage ../development/python-modules/eth-typing { };
+
   jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
 
   jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };

From 9f8e6148c5da6101bd534c3d68549ab00946b441 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 14:12:06 +0300
Subject: [PATCH 0826/3253] pythonPackages.eth-utils: init at 1.2.0

---
 .../python-modules/eth-utils/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/eth-utils/default.nix

diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
new file mode 100644
index 000000000000..cae3f34f0c9f
--- /dev/null
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, eth-hash, eth-typing,
+  cytoolz, hypothesis }:
+
+buildPythonPackage rec {
+  pname = "eth-utils";
+  version = "1.2.1";
+
+  # Tests are missing from the PyPI source tarball so let's use GitHub
+  # https://github.com/ethereum/eth-utils/issues/130
+  src = fetchFromGitHub {
+    owner = "ethereum";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0g8f5vdjh7qd8kgsqqd9qkm6m79rx3w9yp0rf9vpdsv3xfzrkh1w";
+  };
+
+  checkInputs = [ pytest hypothesis ];
+  propagatedBuildInputs = [ eth-hash eth-typing cytoolz ];
+
+  # setuptools-markdown uses pypandoc which is broken at the moment
+  preConfigure = ''
+    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+  '';
+
+  checkPhase = ''
+    pytest .
+  '';
+
+  meta = {
+    description = "Common utility functions for codebases which interact with ethereum";
+    homepage = https://github.com/ethereum/eth-utils;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2419d74b1a2..e74d264d6028 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1659,6 +1659,8 @@ in {
 
   eth-typing = callPackage ../development/python-modules/eth-typing { };
 
+  eth-utils = callPackage ../development/python-modules/eth-utils { };
+
   jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { };
 
   jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { };

From f053daf36ceb956e19a78115e4abdf46058fec25 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 14:13:24 +0300
Subject: [PATCH 0827/3253] pythonPackages.rlp: fix build

---
 pkgs/development/python-modules/rlp/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
index 77ada95b3019..150234a3dd29 100644
--- a/pkgs/development/python-modules/rlp/default.nix
+++ b/pkgs/development/python-modules/rlp/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis, eth-utils }:
 
 buildPythonPackage rec {
   pname = "rlp";
@@ -9,8 +9,18 @@ buildPythonPackage rec {
     sha256 = "040fb5172fa23d27953a886c40cac989fc031d0629db934b5a9edcd2fb28df1e";
   };
 
-  checkInputs = [ pytest ];
-  propagatedBuildInputs = [ ];
+  checkInputs = [ pytest hypothesis ];
+  propagatedBuildInputs = [ eth-utils ];
+
+  # setuptools-markdown uses pypandoc which is broken at the moment
+  preConfigure = ''
+    substituteInPlace setup.py --replace \'setuptools-markdown\' ""
+    substituteInPlace setup.py --replace "long_description_markdown_filename='README.md'," ""
+  '';
+
+  checkPhase = ''
+    pytest .
+  '';
 
   meta = {
     description = "A package for encoding and decoding data in and from Recursive Length Prefix notation";

From 38e86a8f1e7d58ba494a83242ccd580e890741a6 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 15:15:27 +0300
Subject: [PATCH 0828/3253] pythonPackages.python-u2flib-host: init at 3.0.3

---
 .../python-u2flib-host/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-u2flib-host/default.nix

diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix
new file mode 100644
index 000000000000..38785d813138
--- /dev/null
+++ b/pkgs/development/python-modules/python-u2flib-host/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, buildPythonPackage, requests, hidapi }:
+
+buildPythonPackage rec {
+  pname = "python-u2flib-host";
+  version = "3.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02pwafd5kyjpc310ys0pgnd0adff1laz18naxxwsfrllqafqnrxb";
+  };
+
+  propagatedBuildInputs = [ requests hidapi ];
+
+  # Tests fail: "ValueError: underlying buffer has been detached"
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python based U2F host library";
+    homepage = https://github.com/Yubico/python-u2flib-host;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e74d264d6028..db8d8fc463cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16244,6 +16244,8 @@ EOF
 
   potr = callPackage ../development/python-modules/potr {};
 
+  python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { };
+
   pluggy = callPackage ../development/python-modules/pluggy {};
 
   xcffib = callPackage ../development/python-modules/xcffib {};

From 5c9db2f02fba343bcc60fa0c8418495756f6ac1f Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 15:16:08 +0300
Subject: [PATCH 0829/3253] pythonPackages.ledgerblue: fix build inputs

---
 pkgs/development/python-modules/ledgerblue/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index 4f6c2a96c566..d324afcc647a 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
+, pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
 }:
 
 buildPythonPackage rec {
@@ -11,7 +11,12 @@ buildPythonPackage rec {
     sha256 = "3969b3c375c0f3fb60ff1645621ebf2f39fb697a53851620705f27ed7b283097";
   };
 
-  buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+  propagatedBuildInputs = [
+    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex
+  ];
+
+  # No tests
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python library to communicate with Ledger Blue/Nano S";

From c9bf7f67b9ce3e62a40119f8fcb353c67b4268c2 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 15:43:42 +0300
Subject: [PATCH 0830/3253] pythonPackage.pymsgbox: init at 1.0.6

---
 .../python-modules/pymsgbox/default.nix       | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymsgbox/default.nix

diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix
new file mode 100644
index 000000000000..38cc411f54df
--- /dev/null
+++ b/pkgs/development/python-modules/pymsgbox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, tkinter }:
+
+buildPythonPackage rec {
+  pname = "PyMsgBox";
+  version = "1.0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0kmd00w7p6maiyqpqqb2j8m6v2gh9c0h5i198pa02bc1c1m1321q";
+    extension = "zip";
+  };
+
+  propagatedBuildInputs = [ tkinter ];
+
+  # Finding tests fails
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes";
+    homepage = https://github.com/asweigart/PyMsgBox;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db8d8fc463cc..e718fbd33230 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -469,6 +469,8 @@ in {
 
   pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { };
 
+  pymsgbox = callPackage ../development/python-modules/pymsgbox { };
+
   pynisher = callPackage ../development/python-modules/pynisher { };
 
   pyparser = callPackage ../development/python-modules/pyparser { };

From 80b64a2e049a9cb3b722de8520af4cfb08fef52a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 15:44:16 +0300
Subject: [PATCH 0831/3253] pythonPackage.backports-shutil-which: init at 3.5.1

---
 .../backports-shutil-which/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/backports-shutil-which/default.nix

diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
new file mode 100644
index 000000000000..69a80b530d64
--- /dev/null
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "backports.shutil_which";
+  version = "3.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx";
+  };
+
+  # Tests fail: "ValueError: underlying buffer has been detached"
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Backport of shutil.which from Python 3.3";
+    homepage = https://github.com/minrk/backports.shutil_which;
+    license = licenses.psfl;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e718fbd33230..537a1773e54e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -216,6 +216,8 @@ in {
 
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
+  backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
+
   bap = callPackage ../development/python-modules/bap {
     bap = pkgs.ocamlPackages.bap;
   };

From d0ce8834ae3b47ed01482eecb93d1e5e38f7ee01 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 26 Aug 2018 15:44:38 +0300
Subject: [PATCH 0832/3253] pythonPackages.libagent: fix propagatedBuildInputs

---
 .../python-modules/libagent/default.nix            | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 950a0dd5ba6f..f70d538bb8d0 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa
-, semver, keepkey, trezor, mnemonic, ledgerblue, unidecode, mock, pytest
-}:
+{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic,
+  unidecode, mock, pytest , backports-shutil-which, ConfigArgParse,
+  pythondaemon, pymsgbox }:
 
 buildPythonPackage rec {
   pname = "libagent";
@@ -11,12 +11,8 @@ buildPythonPackage rec {
     sha256 = "55af1ad2a6c95aef1fc5588c2002c9e54edbb14e248776b64d00628235ceda3e";
   };
 
-  buildInputs = [
-    ed25519 ecdsa semver keepkey
-    trezor mnemonic ledgerblue
-  ];
-
-  propagatedBuildInputs = [ unidecode ];
+  propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse
+    pythondaemon pymsgbox ecdsa ed25519 mnemonic semver ];
 
   checkInputs = [ mock pytest ];
 

From 8d4afa5f2ef0fbdf042069ac71479bba1104bbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 27 Aug 2018 10:35:54 +0100
Subject: [PATCH 0833/3253] pythonPackage.backports-shutil-which: enable tests

---
 .../python-modules/backports-shutil-which/default.nix    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix
index 69a80b530d64..9900f86567e0 100644
--- a/pkgs/development/python-modules/backports-shutil-which/default.nix
+++ b/pkgs/development/python-modules/backports-shutil-which/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, fetchFromGitHub, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
   pname = "backports.shutil_which";
@@ -9,8 +9,11 @@ buildPythonPackage rec {
     sha256 = "16sa3adkf71862cb9pk747pw80a2f1v5m915ijb4fgj309xrlhyx";
   };
 
-  # Tests fail: "ValueError: underlying buffer has been detached"
-  doCheck = false;
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test test
+  '';
 
   meta = with stdenv.lib; {
     description = "Backport of shutil.which from Python 3.3";

From 494338e04328bb7d34879a070a976b163ba07152 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Sep 2018 02:07:39 -0400
Subject: [PATCH 0834/3253] lollypop: wrap search provider

---
 pkgs/applications/audio/lollypop/default.nix | 45 ++++++++++++--------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 2256fa1893db..6571a45b2a55 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
-, appstream-glib, desktop-file-utils, gobjectIntrospection
-, python36Packages, gnome3, glib, gst_all_1 }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig
+, python3, gtk3, gst_all_1, libsecret, libsoup
+, appstream-glib, desktop-file-utils, gnome3
+, gobjectIntrospection, wrapGAppsHook }:
 
-stdenv.mkDerivation rec  {
+python3.pkgs.buildPythonApplication rec  {
   version = "0.9.522";
   name = "lollypop-${version}";
 
+  format = "other";
+  doCheck = false;
+
   src = fetchgit {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
@@ -13,26 +17,30 @@ stdenv.mkDerivation rec  {
     sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5";
   };
 
-  nativeBuildInputs = with python36Packages; [
+  nativeBuildInputs = with python3.pkgs; [
     appstream-glib
     desktop-file-utils
     gobjectIntrospection
     meson
     ninja
-    python36Packages.python
     pkgconfig
     wrapGAppsHook
-    wrapPython
   ];
 
-  buildInputs = [ glib ] ++ (with gnome3; [
-    gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser
-  ]) ++ (with gst_all_1; [
-    gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
+  buildInputs = with gst_all_1; [
+    gnome3.totem-pl-parser
+    gst-libav
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
     gstreamer
-  ]);
+    gtk3
+    libsecret
+    libsoup
+  ];
 
-  pythonPath = with python36Packages; [
+  pythonPath = with python3.pkgs; [
     beautifulsoup4
     gst-python
     pillow
@@ -42,11 +50,14 @@ stdenv.mkDerivation rec  {
     pylast
   ];
 
-  postFixup = "wrapPythonPrograms";
-
   postPatch = ''
-    chmod +x ./meson_post_install.py
-    patchShebangs ./meson_post_install.py
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+  '';
+
+  preFixup = ''
+    buildPythonPath "$out/libexec/lollypop-sp $pythonPath"
+    patchPythonScript "$out/libexec/lollypop-sp"
   '';
 
   meta = with stdenv.lib; {

From 508e353fd42dd6d2310fe7ba7eb7abad18c5ae2c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 12 Sep 2018 02:25:31 -0400
Subject: [PATCH 0835/3253] eolie: 0.9.35 -> 0.9.36

---
 .../networking/browsers/eolie/default.nix     | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 8d7f4e6cc703..91c5f697132c 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,45 +1,53 @@
-{ stdenv, fetchgit, meson, ninja, pkgconfig, wrapGAppsHook
-, desktop-file-utils, gobjectIntrospection, python36Packages
-, gnome3, gst_all_1, gtkspell3, hunspell }:
+{ stdenv, fetchgit, meson, ninja, pkgconfig
+, python3, gtk3, libsecret, gst_all_1, webkitgtk
+, glib-networking, gtkspell3, hunspell, desktop-file-utils
+, gobjectIntrospection, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
   name = "eolie-${version}";
-  version = "0.9.35";
+  version = "0.9.36";
+
+  format = "other";
+  doCheck = false;
 
   src = fetchgit {
     url = "https://gitlab.gnome.org/World/eolie";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0x3p1fgx1fhrnr7vkkpnl34401r6k6xg2mrjff7ncb1k57q522k7";
+    sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv";
   };
 
-  nativeBuildInputs = with python36Packages; [
+  nativeBuildInputs = [
     desktop-file-utils
     gobjectIntrospection
     meson
     ninja
     pkgconfig
     wrapGAppsHook
-    wrapPython
   ];
 
-  buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
-    glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
-  ]) ++ (with gst_all_1; [
-    gst-libav gst-plugins-base gst-plugins-ugly gstreamer
-  ]);
+  buildInputs = with gst_all_1; [
+    glib-networking
+    gst-libav
+    gst-plugins-base
+    gst-plugins-ugly
+    gstreamer
+    gtk3
+    gtkspell3
+    hunspell
+    libsecret
+    webkitgtk
+  ];
 
-  pythonPath = with python36Packages; [
+  pythonPath = with python3.pkgs; [
     beautifulsoup4
     pycairo
     pygobject3
     python-dateutil
   ];
 
-  postFixup = "wrapPythonPrograms";
-
   postPatch = ''
-    chmod +x meson_post_install.py # patchShebangs requires executable file
+    chmod +x meson_post_install.py
     patchShebangs meson_post_install.py
   '';
 

From 4daba543aa9ce1769cff961df3757c743b783ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 07:45:44 +0100
Subject: [PATCH 0836/3253] vimPlugins: updates

---
 pkgs/misc/vim-plugins/generated.nix | 46 ++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 88a91824ea06..905de1b5b8ab 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -43,12 +43,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-10";
+    name = "ale-2018-09-11";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "99e9417ef901824200040c6a2d3e84f2e0ff4b8e";
-      sha256 = "1y7yp1wyghhgvmylkbdi3wbvqcw026mfaajhgna53xd3fl7z3bgd";
+      rev = "78af99c2566ef8fed443ce253e0de9323b9e5043";
+      sha256 = "0c0bcr5x73fzfmsx65pc4f9j7d9m2z6wq81nyqnn81g3ws96axih";
     };
   };
 
@@ -334,12 +334,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-09-05";
+    name = "denite-nvim-2018-09-11";
     src = fetchFromGitHub {
       owner = "shougo";
       repo = "denite.nvim";
-      rev = "2771c7ae323c2a24341e0f6a83b81f1a1559df0c";
-      sha256 = "07gmrsn815i91wzw9d326kwlph9bqcli75dzg6c8gl0r5vib2v5b";
+      rev = "0fdbdfb154a84bd76deb51ad5159c52779bbe110";
+      sha256 = "0qc6b731g66rbpcss6dss9ak5npdg52pb7v11mc07f534fksqrpj";
     };
   };
 
@@ -529,12 +529,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-09-07";
+    name = "fzf-vim-2018-09-12";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "8fa84e0fdf97842d94caee8d50584836edf5b509";
-      sha256 = "0di5xmd3i9m034npr6zc1f793jcj1vsy95wdyhpf55b6hclm7bbd";
+      rev = "c3954d294a0f6c4fb5a46a1839cd42ec26767dea";
+      sha256 = "0pipa7vgx4vkaysyf195yphggxj5kki66yksfvdvw6yxiicap1ml";
     };
   };
 
@@ -849,12 +849,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-09";
+    name = "neomake-2018-09-11";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "11c6797b258dfe1c0b4ee8536f2bb961003a3f76";
-      sha256 = "0lsrz6m29ghhz57m1ay2v26i0838czhmm6a06yfy39dy99sa02il";
+      rev = "f5d411eb9598b0e82187431a49598f3dce1f9484";
+      sha256 = "1v2ggn8bm0mp6bjyiqf9ria8jmqs4risqdwhcbj77l95ka3znx9z";
     };
   };
 
@@ -913,8 +913,8 @@
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "15d06b676dfcd92ac9a0bc375668d127f9822539";
-      sha256 = "1v1w4yg6mgmz0q00in0y46wcmcgh6gxx8szws5cmvwv43d5c18qs";
+      rev = "b3804dcd71471505048c8a75f301539fc2dce081";
+      sha256 = "0waa6hw9jqxy1jxcm0bx53n0cpindin9jdd5s6jh7310psqpwi1x";
     };
   };
 
@@ -1969,12 +1969,12 @@
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-08-23";
+    name = "vim-ghost-2018-09-12";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "666a76c0783270eeb1ac1e0027df6f801a067bfd";
-      sha256 = "1c5jyipcj4hi703dcdim1123p2yp4h67ci4f9kgaz9h65lmz4xn5";
+      rev = "4e06bc238d23e6eb245a766105c62344a132b3f4";
+      sha256 = "1n5m7xbv4i0bwdqm39n9j6brbjayk4cpq38sqqbvgh3lia7nkbpv";
     };
   };
 
@@ -2019,12 +2019,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-10";
+    name = "vim-go-2018-09-11";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "5b9058e1232786c682be79b8a00510d3bd63eba9";
-      sha256 = "14jcjdq48cnpdvp6k2lanr1chvkgky7xnz8zbcqhw2ma27zy16jf";
+      rev = "925447051422b471490a85bcb196a27c4625b225";
+      sha256 = "0g41i22hr0iq1mpbv0cpzc9h6mwhncn3jv6ydhvbpvjpg8yd3wxg";
     };
   };
 
@@ -2720,12 +2720,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-03";
+    name = "vim-snippets-2018-09-11";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9";
-      sha256 = "0ska56i77dd2n2c428c9hsl2zskyag41xfsl5dg00dyjv4amvnin";
+      rev = "225647b65522b7421a22f138b9b0a10833d39551";
+      sha256 = "1ngdv1rsaa0w742k4bb942x0pd7pmjh7nghkiiv1hl8cryrwhix5";
     };
   };
 

From ac415ca68e1ff86ea52a9ca53ca451067070a315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 07:51:03 +0100
Subject: [PATCH 0837/3253] vimPlugins: do not pick up aliases from nixpkgs

---
 pkgs/misc/vim-plugins/default.nix   |  17 ++--
 pkgs/misc/vim-plugins/generated.nix | 132 ++++++++++++++--------------
 pkgs/misc/vim-plugins/update.py     |   1 +
 3 files changed, 76 insertions(+), 74 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 4507b1125df8..3287c4714be8 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -334,7 +334,7 @@ self = generated // (with generated; {
 }) // lib.optionalAttrs (config.allowAliases or true) (with self; {
   # aliases
   airline             = vim-airline;
-  a-vim               = alternative; # backwards compat, added 2018-09-10
+  alternative         = a-vim; # backwards compat, added 2014-10-21
   bats                = bats-vim;
   calendar            = calendar-vim;
   coffee-script       = vim-coffee-script;
@@ -343,8 +343,9 @@ self = generated // (with generated; {
   solarized           = vim-colors-solarized;
   colors-solarized    = vim-colors-solarized;
   caw                 = caw-vim;
-  Colour_Sampler_Pack = colorsamplerpack;
-  command-t           = command_T; # backwards compat, added 2018-09-10
+  colorsamplerpack    = Colour_Sampler_Pack;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  command_T           = command-t; # backwards compat, added 2014-10-18
   commentary          = vim-commentary;
   committia           = committia-vim;
   concealedyank       = concealedyank-vim;
@@ -381,7 +382,7 @@ self = generated // (with generated; {
   latex-live-preview  = vim-latex-live-preview;
   maktaba             = vim-maktaba;
   multiple-cursors    = vim-multiple-cursors;
-  neco-ghc            = necoGhc; # backwards compat, added 2018-09-10
+  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
   neocomplete         = neocomplete-vim;
   neoinclude          = neoinclude-vim;
   neomru              = neomru-vim;
@@ -426,12 +427,12 @@ self = generated // (with generated; {
   vim-addon-vim2nix   = vim2nix;
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
-  vim-vinegar         = vinegar; # backwards compat, added 2018-09-10
-  vim-watchdogs       = watchdogs; # backwards compat, added 2018-09-10
+  vinegar             = vim-vinegar;
+  watchdogs           = vim-watchdogs;
   WebAPI              = webapi-vim;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
-  YankRing-vim        = yankring;
-  Yankring            = yankring;
+  yankring            = YankRing-vim;
+  Yankring            = YankRing-vim;
   YouCompleteMe       = youcompleteme;
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 905de1b5b8ab..c488c7fe0692 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2,6 +2,16 @@
 { buildVimPluginFrom2Nix, fetchFromGitHub }:
 
 {
+  a-vim = buildVimPluginFrom2Nix {
+    name = "a-vim-2010-11-06";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "a.vim";
+      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
+      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
+    };
+  };
+
   ack-vim = buildVimPluginFrom2Nix {
     name = "ack-vim-2018-02-27";
     src = fetchFromGitHub {
@@ -62,16 +72,6 @@
     };
   };
 
-  alternative = buildVimPluginFrom2Nix {
-    name = "alternative-2010-11-06";
-    src = fetchFromGitHub {
-      owner = "vim-scripts";
-      repo = "a.vim";
-      rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
-    };
-  };
-
   argtextobj-vim = buildVimPluginFrom2Nix {
     name = "argtextobj-vim-2010-10-18";
     src = fetchFromGitHub {
@@ -182,8 +182,8 @@
     };
   };
 
-  colorsamplerpack = buildVimPluginFrom2Nix {
-    name = "colorsamplerpack-2012-11-30";
+  Colour-Sampler-Pack = buildVimPluginFrom2Nix {
+    name = "Colour-Sampler-Pack-2012-11-30";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "Colour-Sampler-Pack";
@@ -192,8 +192,8 @@
     };
   };
 
-  command_T = buildVimPluginFrom2Nix {
-    name = "command_T-2017-11-17";
+  command-t = buildVimPluginFrom2Nix {
+    name = "command-t-2017-11-17";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
@@ -293,16 +293,6 @@
     };
   };
 
-  ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-06-28";
-    src = fetchFromGitHub {
-      owner = "ctrlpvim";
-      repo = "ctrlp.vim";
-      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
-      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
-    };
-  };
-
   ctrlp-z = buildVimPluginFrom2Nix {
     name = "ctrlp-z-2015-10-17";
     src = fetchFromGitHub {
@@ -313,6 +303,16 @@
     };
   };
 
+  ctrlp-vim = buildVimPluginFrom2Nix {
+    name = "ctrlp-vim-2018-06-28";
+    src = fetchFromGitHub {
+      owner = "ctrlpvim";
+      repo = "ctrlp.vim";
+      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
+      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
+    };
+  };
+
   denite-extra = buildVimPluginFrom2Nix {
     name = "denite-extra-2018-08-13";
     src = fetchFromGitHub {
@@ -396,16 +396,6 @@
     };
   };
 
-  deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-09-02";
-    src = fetchFromGitHub {
-      owner = "shougo";
-      repo = "deoplete.nvim";
-      rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
-      sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
-    };
-  };
-
   deoplete-rust = buildVimPluginFrom2Nix {
     name = "deoplete-rust-2017-07-18";
     src = fetchFromGitHub {
@@ -426,6 +416,16 @@
     };
   };
 
+  deoplete-nvim = buildVimPluginFrom2Nix {
+    name = "deoplete-nvim-2018-09-02";
+    src = fetchFromGitHub {
+      owner = "shougo";
+      repo = "deoplete.nvim";
+      rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
+      sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
+    };
+  };
+
   dhall-vim = buildVimPluginFrom2Nix {
     name = "dhall-vim-2018-07-30";
     src = fetchFromGitHub {
@@ -778,6 +778,16 @@
     };
   };
 
+  neco-ghc = buildVimPluginFrom2Nix {
+    name = "neco-ghc-2018-05-13";
+    src = fetchFromGitHub {
+      owner = "eagletmt";
+      repo = "neco-ghc";
+      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
+      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
+    };
+  };
+
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-01-21";
     src = fetchFromGitHub {
@@ -808,16 +818,6 @@
     };
   };
 
-  necoGhc = buildVimPluginFrom2Nix {
-    name = "necoGhc-2018-05-13";
-    src = fetchFromGitHub {
-      owner = "eagletmt";
-      repo = "neco-ghc";
-      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
-      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
-    };
-  };
-
   neocomplete-vim = buildVimPluginFrom2Nix {
     name = "neocomplete-vim-2018-03-28";
     src = fetchFromGitHub {
@@ -2909,6 +2909,16 @@
     };
   };
 
+  vim-vinegar = buildVimPluginFrom2Nix {
+    name = "vim-vinegar-2018-08-06";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-vinegar";
+      rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
+      sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
+    };
+  };
+
   vim-visualstar = buildVimPluginFrom2Nix {
     name = "vim-visualstar-2015-08-27";
     src = fetchFromGitHub {
@@ -2929,6 +2939,16 @@
     };
   };
 
+  vim-watchdogs = buildVimPluginFrom2Nix {
+    name = "vim-watchdogs-2017-12-03";
+    src = fetchFromGitHub {
+      owner = "osyo-manga";
+      repo = "vim-watchdogs";
+      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
+      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
+    };
+  };
+
   vim-wordy = buildVimPluginFrom2Nix {
     name = "vim-wordy-2018-03-10";
     src = fetchFromGitHub {
@@ -3039,16 +3059,6 @@
     };
   };
 
-  vinegar = buildVimPluginFrom2Nix {
-    name = "vinegar-2018-08-06";
-    src = fetchFromGitHub {
-      owner = "tpope";
-      repo = "vim-vinegar";
-      rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296";
-      sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf";
-    };
-  };
-
   vundle = buildVimPluginFrom2Nix {
     name = "vundle-2018-02-03";
     src = fetchFromGitHub {
@@ -3059,16 +3069,6 @@
     };
   };
 
-  watchdogs = buildVimPluginFrom2Nix {
-    name = "watchdogs-2017-12-03";
-    src = fetchFromGitHub {
-      owner = "osyo-manga";
-      repo = "vim-watchdogs";
-      rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03";
-      sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff";
-    };
-  };
-
   webapi-vim = buildVimPluginFrom2Nix {
     name = "webapi-vim-2018-03-14";
     src = fetchFromGitHub {
@@ -3109,8 +3109,8 @@
     };
   };
 
-  yankring = buildVimPluginFrom2Nix {
-    name = "yankring-2015-07-29";
+  YankRing-vim = buildVimPluginFrom2Nix {
+    name = "YankRing-vim-2015-07-29";
     src = fetchFromGitHub {
       owner = "vim-scripts";
       repo = "YankRing.vim";
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index c19b439493c6..210f68d7d599 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -139,6 +139,7 @@ def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin:
     has_submodules = repo.has_submodules()
     cached_plugin = cache[commit]
     if cached_plugin is not None:
+        cached_plugin.name = repo_name
         cached_plugin.date = date
         return cached_plugin
 

From c4a621d4a60e350b5cf0f73db6d2f5500ee361c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 07:51:48 +0100
Subject: [PATCH 0838/3253] vimPlugins: run update script in empty environment

---
 pkgs/misc/vim-plugins/update.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 210f68d7d599..8128c12bce68 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -20,8 +20,9 @@ import xml.etree.ElementTree as ET
 from datetime import datetime
 from multiprocessing.dummy import Pool
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union, Any
 from urllib.parse import urljoin, urlparse
+from tempfile import NamedTemporaryFile
 
 ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry"
 ATOM_LINK = "{http://www.w3.org/2005/Atom}link"
@@ -110,7 +111,7 @@ class Plugin:
         return copy
 
 
-GET_PLUGINS = """(with import <nixpkgs> {};
+GET_PLUGINS = """(with import <localpkgs> {};
 let
   hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;
   getChecksum = name: value:
@@ -123,8 +124,24 @@ let
 in lib.filterAttrs (n: v: v != null) checksums)"""
 
 
+class CleanEnvironment(object):
+    def __enter__(self) -> None:
+        self.old_environ = os.environ.copy()
+        local_pkgs = str(ROOT.joinpath("../../.."))
+        os.environ["NIX_PATH"] = f"localpkgs={local_pkgs}"
+        self.empty_config = NamedTemporaryFile()
+        self.empty_config.write(b"{}")
+        self.empty_config.flush()
+        os.environ["NIXPKGS_CONFIG"] = self.empty_config.name
+
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+        os.environ.update(self.old_environ)
+        self.empty_config.close()
+
+
 def get_current_plugins() -> List[Plugin]:
-    out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS])
+    with CleanEnvironment():
+        out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS])
     data = json.loads(out)
     plugins = []
     for name, attr in data.items():

From 6400d4b4aa74b5a7506b9f39f1fe256cca9887fb Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 12 Sep 2018 10:00:44 +0300
Subject: [PATCH 0839/3253] syncthing: 0.14.48 -> 0.14.50

---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 25d482fd9b06..b7bad13a30d8 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, patches ? [], postInstall ? "" }:
     stdenv.mkDerivation rec {
-      version = "0.14.48";
+      version = "0.14.50";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw";
+        sha256 = "10lilw20mq1zshysb9zrszcpl4slyyxvnbxfqk04nhz0b1gmm9ri";
       };
 
       inherit patches;

From e4393102e673f990521dc109dfd4f27ceca9e437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 01:09:52 +0100
Subject: [PATCH 0840/3253] python-jsonrpc-server: init at 0.0.1

---
 .../python-jsonrpc-server/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-jsonrpc-server/default.nix

diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
new file mode 100644
index 000000000000..508f18e6da00
--- /dev/null
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
+, pytest, mock, pytestcov, coverage
+, future, futures
+}:
+
+buildPythonPackage rec {
+  pname = "python-jsonrpc-server";
+  version = "0.0.1";
+
+  src = fetchFromGitHub {
+    owner = "palantir";
+    repo = "python-jsonrpc-server";
+    rev = version;
+    sha256 = "0p5dj1hxx3yz8vjk59dcp3h6ci1hrjkbzf9lr3vviy0xw327409k";
+  };
+
+  checkInputs = [
+    pytest mock pytestcov coverage
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  propagatedBuildInputs = [ future ]
+    ++ stdenv.lib.optional (pythonOlder "3.2") futures;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/palantir/python-jsonrpc-server;
+    description = "A Python 2 and 3 asynchronous JSON RPC server";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ca55835abf6..614ee48b82b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10837,6 +10837,8 @@ in {
 
   python-language-server = callPackage ../development/python-modules/python-language-server {};
 
+  python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {};
+
   pyls-black = callPackage ../development/python-modules/pyls-black {};
 
   pyls-isort = callPackage ../development/python-modules/pyls-isort {};

From 63668d33b208790ce91e0ec53e263dd18bb5aba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 01:10:11 +0100
Subject: [PATCH 0841/3253] python-language-server: 0.19.0 -> 0.21.2

---
 .../python-modules/python-language-server/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 800c9eba2abb..56c00fa11a9f 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
-, configparser, futures, future, jedi, pluggy
+, configparser, futures, future, jedi, pluggy, python-jsonrpc-server
 , pytest, mock, pytestcov, coverage
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
@@ -20,13 +20,13 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.19.0";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "0glnhnjmsnnh1vs73n9dglknfkhcgp03nkjbpz0phh1jlqrkrwm6";
+    sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7";
   };
 
   # The tests require all the providers, disable otherwise.
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     HOME=$TEMPDIR pytest
   '';
 
-  propagatedBuildInputs = [ jedi pluggy future ]
+  propagatedBuildInputs = [ jedi pluggy future python-jsonrpc-server ]
     ++ stdenv.lib.optional (withProvider "autopep8") autopep8
     ++ stdenv.lib.optional (withProvider "mccabe") mccabe
     ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle

From 60ebc45659503b8cb99326358f014c18e39a9a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 09:10:34 +0100
Subject: [PATCH 0842/3253] vimPlugins.LanguageClient-neovim: 2018-06-12 ->
 2018-09-07

---
 pkgs/misc/vim-plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3287c4714be8..8aebfbc32942 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -50,14 +50,14 @@ self = generated // (with generated; {
   LanguageClient-neovim = let
     LanguageClient-neovim-src = fetchgit {
       url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "5015aa164dc9ad96a0f5fbadaf92a888d16bc0d9";
-      sha256 = "1b3916al2y4hxmmlhqxw4cdliyd42xahc7wmgm8yq1gbvzbhdafg";
+      rev = "59f0299e8f7d7edd0653b5fc005eec74c4bf4aba";
+      sha256 = "0x6729w7v3bxlpvm8jz1ybn23qa0zqfgxl88q2j0bbs6rvp0w1jq";
     };
     LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
       name = "LanguageClient-neovim-bin";
       src = LanguageClient-neovim-src;
 
-      cargoSha256 = "1vafyi650qdaq1f7fc8d4nzrv1i6iz28fs5z66hsnz4xkwb3qq9w";
+      cargoSha256 = "1afmz14j7ma2nrsx0njcqbh2wa430dr10hds78c031286ppgwjls";
       buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
       # FIXME: Use impure version of CoreFoundation because of missing symbols.
@@ -67,7 +67,7 @@ self = generated // (with generated; {
       '';
     };
   in buildVimPluginFrom2Nix {
-    name = "LanguageClient-neovim-2018-06-12";
+    name = "LanguageClient-neovim-2018-09-07";
     src = LanguageClient-neovim-src;
 
     dependencies = [];

From e15ffdf951a4f2dd24c09d9fe95626c48e834b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Sep 2018 09:11:56 +0100
Subject: [PATCH 0843/3253] vimPlugins.ncm2: init at 2018-09-03

This is the new version of neovim completion manager
---
 pkgs/misc/vim-plugins/default.nix      | 10 ++++-
 pkgs/misc/vim-plugins/generated.nix    | 60 ++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  6 +++
 3 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 8aebfbc32942..bd51a08c9cf1 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -164,7 +164,15 @@ self = generated // (with generated; {
 
   gitv = gitv.overrideAttrs(old: {
 		dependencies = ["gitv"];
-	});
+  });
+
+  ncm2 = ncm2.overrideAttrs(old: {
+    dependencies = ["nvim-yarp"];
+  });
+
+  ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = ["ultisnips"];
+  });
 
   taglist = taglist.overrideAttrs(old: {
     setSourceRoot = ''
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index c488c7fe0692..73a6ead6b3b0 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -788,6 +788,56 @@
     };
   };
 
+  ncm2 = buildVimPluginFrom2Nix {
+    name = "ncm2-2018-09-03";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2";
+      rev = "08f026d84b50e8db3d3a4124da63c8c3e0e5e558";
+      sha256 = "07d411p3shm27qmir8hsw88mx3wdmz3am4qi0fqzkhkpkgli70jw";
+    };
+  };
+
+  ncm2-bufword = buildVimPluginFrom2Nix {
+    name = "ncm2-bufword-2018-07-28";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-bufword";
+      rev = "86a92eb3fb217f9ea1e93f890b7e5e0eb1671ca9";
+      sha256 = "02f43rr9apgcjpz4ipnin4v3cvdlx931a0787x87iyr8a0aljg3y";
+    };
+  };
+
+  ncm2-path = buildVimPluginFrom2Nix {
+    name = "ncm2-path-2018-08-01";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-path";
+      rev = "875ae47e171abc2ba6710bb835727bed46d7b329";
+      sha256 = "09vhggrb1nigr8p53gd9ibn3b84dh9yix2ndj2453wnq8ny9x2dc";
+    };
+  };
+
+  ncm2-tmux = buildVimPluginFrom2Nix {
+    name = "ncm2-tmux-2018-07-30";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-tmux";
+      rev = "4f60ee1be57531295075d808e0006c83894096d1";
+      sha256 = "1ihbm65b9bc0y068w6r0k8f9lsc3603npb55chcchpj7z75539yh";
+    };
+  };
+
+  ncm2-ultisnips = buildVimPluginFrom2Nix {
+    name = "ncm2-ultisnips-2018-08-01";
+    src = fetchFromGitHub {
+      owner = "ncm2";
+      repo = "ncm2-ultisnips";
+      rev = "15432d7933cfb855599442a67d6f39ddb706c737";
+      sha256 = "0ixajh08fd5dgdz4h1sdxgiaind1nksk1d4lwyb6n4ijf672pms2";
+    };
+  };
+
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-01-21";
     src = fetchFromGitHub {
@@ -958,6 +1008,16 @@
     };
   };
 
+  nvim-yarp = buildVimPluginFrom2Nix {
+    name = "nvim-yarp-2018-07-27";
+    src = fetchFromGitHub {
+      owner = "roxma";
+      repo = "nvim-yarp";
+      rev = "52317ced0e16f226f0d44878917d0b5f4657b4d4";
+      sha256 = "1xj1n9x1nxjbbpp29x5kkwr0bxziwzn8n2b8z9467hj9w646zyrj";
+    };
+  };
+
   open-browser-vim = buildVimPluginFrom2Nix {
     name = "open-browser-vim-2018-04-26";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8bcfc667da34..fbd74a6625f2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -174,6 +174,11 @@ morhetz/gruvbox
 mpickering/hlint-refactor-vim
 nathanaelkane/vim-indent-guides
 nbouscal/vim-stylish-haskell
+ncm2/ncm2
+ncm2/ncm2-bufword
+ncm2/ncm2-path
+ncm2/ncm2-tmux
+ncm2/ncm2-ultisnips
 neoclide/vim-easygit
 neovimhaskell/haskell-vim
 nixprime/cpsm
@@ -202,6 +207,7 @@ Rip-Rip/clang_complete
 rodjek/vim-puppet
 roxma/nvim-cm-racer
 roxma/nvim-completion-manager
+roxma/nvim-yarp
 rust-lang/rust.vim
 ryanoasis/vim-devicons
 Rykka/riv.vim

From f8a158c3466bb013e776e590871da9f1869667f7 Mon Sep 17 00:00:00 2001
From: Alex Biehl <alex.biehl@target.com>
Date: Tue, 19 Jun 2018 13:18:41 +0200
Subject: [PATCH 0844/3253] Haskell builder: Use $abi/$libname as --libsubdir

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1b33954662db..a0dd2a305f89 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -134,7 +134,7 @@ let
   buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
 
   defaultConfigureFlags = [
-    "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+    "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname"
     (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
     (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
     "--with-gcc=$CC" # Clang won't work without that extra information.

From 88ce4f5e8a2706c28bde0794932cba17cb816286 Mon Sep 17 00:00:00 2001
From: Alexander Biehl <alexbiehl@gmail.com>
Date: Mon, 27 Aug 2018 15:50:37 +0200
Subject: [PATCH 0845/3253] More conservative SCC tagging for Haskell libraries

`all-functions` corresponds to `-fprof-auto` which places an SCC on every binding. It is well known that SCCs hinder GHC from doing its optimization magic and really slows down profiled code to a point where the profiling reports are completely skewed towards things that were completely optimized away in production settings. Concretely this shows up with things like lenses which do not carry runtime overhead when properly simplified.

`exported-functions` corresponds to GHCs `-fprof-auto-exported` which doesn't put SCCs on `INLINE`d code and in turn doesn't influence simplification of this basic but important stuff.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a0dd2a305f89..cdbf119af8c4 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -26,7 +26,7 @@ in
 , editedCabalFile ? null
 , enableLibraryProfiling ? true
 , enableExecutableProfiling ? false
-, profilingDetail ? "all-functions"
+, profilingDetail ? "exported-functions"
 # TODO enable shared libs for cross-compiling
 , enableSharedExecutables ? false
 , enableSharedLibraries ? (ghc.enableShared or false)

From 3c1af1254474e031e79b7c2a9ecd81cbaff231f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Aug 2018 19:27:18 +0200
Subject: [PATCH 0846/3253] LTS Haskell 12.9

---
 .../configuration-hackage2nix.yaml            | 159 +++++++++---------
 1 file changed, 80 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4a26fcbffc17..7b827664cdab 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.7
+  # LTS Haskell 12.9
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -63,7 +63,7 @@ default-package-overrides:
   - aeson-compat ==0.3.8
   - aeson-diff ==1.1.0.5
   - aeson-extra ==0.4.1.1
-  - aeson-generic-compat ==0.0.1.2
+  - aeson-generic-compat ==0.0.1.3
   - aeson-iproute ==0.2
   - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.7
@@ -81,7 +81,7 @@ default-package-overrides:
   - Allure ==0.8.3.0
   - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
-  - alsa-pcm ==0.6.1
+  - alsa-pcm ==0.6.1.1
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
   - alternators ==1.0.0.0
@@ -183,7 +183,7 @@ default-package-overrides:
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.4
   - apply-refact ==0.5.0.0
-  - apportionment ==0.0.0.2
+  - apportionment ==0.0.0.3
   - approximate ==0.3.1
   - app-settings ==0.2.0.11
   - arithmoi ==0.7.0.0
@@ -241,7 +241,7 @@ default-package-overrides:
   - bcrypt ==0.0.11
   - beam-core ==0.7.2.2
   - beam-migrate ==0.3.2.1
-  - bench ==1.0.11
+  - bench ==1.0.12
   - bencode ==0.6.0.0
   - between ==0.11.0.0
   - bhoogle ==0.1.3.5
@@ -306,7 +306,7 @@ default-package-overrides:
   - brick ==0.37.2
   - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
-  - bsb-http-chunked ==0.0.0.2
+  - bsb-http-chunked ==0.0.0.3
   - bson ==0.3.2.6
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
@@ -337,7 +337,7 @@ default-package-overrides:
   - cachix ==0.1.1
   - cachix-api ==0.1.0.1
   - cairo ==0.13.5.0
-  - calendar-recycling ==0.0
+  - calendar-recycling ==0.0.0.1
   - call-stack ==0.1.0
   - capataz ==0.2.0.0
   - carray ==0.1.6.8
@@ -400,7 +400,7 @@ default-package-overrides:
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.3
-  - cmark-gfm ==0.1.4
+  - cmark-gfm ==0.1.5
   - cmdargs ==0.10.20
   - code-builder ==0.1.3
   - codec ==0.2.1
@@ -413,8 +413,8 @@ default-package-overrides:
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
-  - combinatorial ==0.1
-  - comfort-graph ==0.0.3
+  - combinatorial ==0.1.0.1
+  - comfort-graph ==0.0.3.1
   - commutative ==0.0.1.4
   - comonad ==5.0.4
   - compactmap ==0.1.4.2.1
@@ -426,7 +426,7 @@ default-package-overrides:
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - composition-prelude ==1.5.0.8
+  - composition-prelude ==1.5.3.1
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.6.0.0
@@ -470,7 +470,7 @@ default-package-overrides:
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
   - cql ==4.0.1
-  - cql-io ==1.0.1
+  - cql-io ==1.0.1.1
   - credential-store ==0.1.2
   - criterion ==1.4.1.0
   - criterion-measurement ==0.1.1.0
@@ -497,9 +497,9 @@ default-package-overrides:
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
-  - csg ==0.1.0.4
+  - csg ==0.1.0.5
   - csp ==1.4.0
-  - css-syntax ==0.0.7
+  - css-syntax ==0.0.8
   - css-text ==0.1.3.0
   - csv ==0.1.2
   - ctrie ==0.2
@@ -514,9 +514,9 @@ default-package-overrides:
   - cyclotomic ==0.5.1
   - czipwith ==1.0.1.0
   - darcs ==2.14.1
-  - data-accessor ==0.2.2.7
+  - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.15
+  - data-accessor-template ==0.2.1.16
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
@@ -553,7 +553,7 @@ default-package-overrides:
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
   - dbus ==1.0.1
-  - debian-build ==0.10.1.1
+  - debian-build ==0.10.1.2
   - debug ==0.1.1
   - debug-trace-var ==0.2.0
   - Decimal ==0.5.1
@@ -569,9 +569,9 @@ default-package-overrides:
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
   - dhall ==1.15.1
-  - dhall-bash ==1.0.14
-  - dhall-json ==1.2.2
-  - dhall-text ==1.0.11
+  - dhall-bash ==1.0.15
+  - dhall-json ==1.2.3
+  - dhall-text ==1.0.12
   - di ==1.0.1
   - diagrams ==1.4
   - diagrams-builder ==0.8.0.3
@@ -624,7 +624,7 @@ default-package-overrides:
   - DRBG ==0.5.5
   - drifter ==0.2.3
   - drifter-postgresql ==0.2.1
-  - dsp ==0.2.4
+  - dsp ==0.2.4.1
   - dual-tree ==0.2.2
   - dublincore-xml-conduit ==0.1.0.2
   - dunai ==0.4.0.0
@@ -671,7 +671,7 @@ default-package-overrides:
   - errors-ext ==0.4.2
   - error-util ==0.0.1.2
   - ersatz ==0.4.4
-  - etc ==0.4.0.3
+  - etc ==0.4.1.0
   - event ==0.1.4
   - eventful-core ==0.2.0
   - eventful-memory ==0.2.0
@@ -699,7 +699,7 @@ default-package-overrides:
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.9
   - extractable-singleton ==0.0.1
-  - extrapolate ==0.3.1
+  - extrapolate ==0.3.3
   - facts ==0.0.1.0
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
@@ -726,8 +726,8 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
+  - Fin ==0.2.5.0
   - fin ==0.0.1
-  - Fin ==0.2.3.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
@@ -747,6 +747,7 @@ default-package-overrides:
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
+  - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.7
   - fold-debounce-conduit ==0.2.0.1
   - foldl ==1.4.3
@@ -807,7 +808,7 @@ default-package-overrides:
   - genvalidity-path ==0.3.0.2
   - genvalidity-property ==0.2.1.0
   - genvalidity-scientific ==0.2.0.1
-  - genvalidity-text ==0.5.0.2
+  - genvalidity-text ==0.5.1.0
   - genvalidity-time ==0.2.1.0
   - genvalidity-unordered-containers ==0.2.0.3
   - genvalidity-uuid ==0.1.0.2
@@ -860,7 +861,7 @@ default-package-overrides:
   - gloss-rendering ==1.12.0.0
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.14
-  - gnuplot ==0.5.5.2
+  - gnuplot ==0.5.5.3
   - goggles ==0.3.2
   - google-oauth2-jwt ==0.3.0
   - gpolyline ==0.1.0.1
@@ -890,7 +891,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.9
+  - hapistrano ==0.3.5.10
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -944,7 +945,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.6
   - hedgehog-corpus ==0.1.0
-  - hedis ==0.10.3
+  - hedis ==0.10.4
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.2
@@ -981,7 +982,7 @@ default-package-overrides:
   - hopfli ==0.2.2.1
   - hostname ==1.0
   - hostname-validate ==1.0.0
-  - hourglass ==0.2.11
+  - hourglass ==0.2.12
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.8.0.2
   - hpack ==0.28.2
@@ -1001,7 +1002,7 @@ default-package-overrides:
   - HSet ==0.0.1
   - hset ==2.2.0
   - hsexif ==0.6.1.5
-  - hs-functors ==0.1.2.0
+  - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
   - hsinstall ==1.6
@@ -1079,7 +1080,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.6.2.9
+  - hw-prim ==0.6.2.14
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1131,7 +1132,7 @@ default-package-overrides:
   - intern ==0.9.2
   - interpolate ==0.2.0
   - interpolatedstring-perl6 ==1.0.0
-  - interpolation ==0.1.0.2
+  - interpolation ==0.1.0.3
   - IntervalMap ==0.6.0.0
   - intervals ==0.8.1
   - intro ==0.3.2.0
@@ -1163,7 +1164,7 @@ default-package-overrides:
   - iterable ==3.0
   - ixset-typed ==0.4
   - ix-shapable ==0.1.0
-  - jack ==0.7.1.3
+  - jack ==0.7.1.4
   - jmacro ==0.6.15
   - jmacro-rpc ==0.3.3
   - jmacro-rpc-snap ==0.3
@@ -1175,7 +1176,7 @@ default-package-overrides:
   - json ==0.9.2
   - json-feed ==1.0.3
   - json-rpc-client ==0.2.5.0
-  - json-rpc-generic ==0.2.1.4
+  - json-rpc-generic ==0.2.1.5
   - json-rpc-server ==0.2.6.0
   - json-schema ==0.7.4.2
   - JuicyPixels ==3.2.9.5
@@ -1210,18 +1211,18 @@ default-package-overrides:
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
   - language-javascript ==0.6.0.11
-  - language-puppet ==1.3.20
+  - language-puppet ==1.3.20.1
   - lapack-carray ==0.0.2
   - lapack-ffi ==0.0.2
-  - lapack-ffi-tools ==0.1.0.1
+  - lapack-ffi-tools ==0.1.1
   - large-hashable ==0.1.0.4
   - largeword ==1.2.5
-  - latex ==0.1.0.3
+  - latex ==0.1.0.4
   - lattices ==1.7.1.1
   - lawful ==0.1.0.0
   - lazyio ==0.1.0.4
   - lca ==0.3.1
-  - leancheck ==0.7.1
+  - leancheck ==0.7.3
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.2
   - lens ==4.16.1
@@ -1325,10 +1326,10 @@ default-package-overrides:
   - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
   - microlens-contra ==0.1.0.1
-  - microlens-ghc ==0.4.9
+  - microlens-ghc ==0.4.9.1
   - microlens-mtl ==0.1.11.1
   - microlens-platform ==0.3.10
-  - microlens-th ==0.4.2.1
+  - microlens-th ==0.4.2.2
   - microspec ==0.1.0.0
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
@@ -1463,7 +1464,7 @@ default-package-overrides:
   - nsis ==0.3.2
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
-  - numeric-prelude ==0.4.3
+  - numeric-prelude ==0.4.3.1
   - numhask ==0.2.3.1
   - numhask-prelude ==0.1.0.1
   - numhask-range ==0.2.3.1
@@ -1491,7 +1492,7 @@ default-package-overrides:
   - oo-prototypes ==0.1.0.0
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
-  - openexr-write ==0.1.0.1
+  - openexr-write ==0.1.0.2
   - OpenGL ==3.0.2.2
   - OpenGLRaw ==3.3.1.0
   - openpgp-asciiarmor ==0.1.1
@@ -1552,10 +1553,10 @@ default-package-overrides:
   - persistent ==2.8.2
   - persistent-iproute ==0.2.3
   - persistent-mysql ==2.8.1
-  - persistent-mysql-haskell ==0.4.1
+  - persistent-mysql-haskell ==0.4.2
   - persistent-postgresql ==2.8.2.0
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.8.1.2
+  - persistent-sqlite ==2.8.2
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
@@ -1594,7 +1595,7 @@ default-package-overrides:
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
-  - pooled-io ==0.0.2.1
+  - pooled-io ==0.0.2.2
   - portable-lines ==0.1
   - postgresql-binary ==0.12.1.1
   - postgresql-libpq ==0.9.4.1
@@ -1628,9 +1629,9 @@ default-package-overrides:
   - primes ==0.2.1.0
   - primitive ==0.6.3.0
   - prim-uniq ==0.1.0.1
-  - probability ==0.2.5.1
+  - probability ==0.2.5.2
   - process-extras ==0.7.4
-  - product-isomorphic ==0.0.3.2
+  - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.10.0.0
   - profiterole ==0.1
   - profunctors ==5.2.2
@@ -1643,14 +1644,14 @@ default-package-overrides:
   - protobuf-simple ==0.1.0.5
   - protocol-buffers ==2.4.11
   - protocol-buffers-descriptor ==2.4.11
-  - protocol-radius ==0.0.1.0
+  - protocol-radius ==0.0.1.1
   - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.3.1.0
-  - proto-lens-arbitrary ==0.1.2.1
-  - proto-lens-combinators ==0.1.0.10
-  - proto-lens-optparse ==0.1.1.1
+  - proto-lens-arbitrary ==0.1.2.2
+  - proto-lens-combinators ==0.1.0.11
+  - proto-lens-optparse ==0.1.1.2
   - proto-lens-protobuf-types ==0.3.0.1
-  - proto-lens-protoc ==0.3.1.0
+  - proto-lens-protoc ==0.3.1.2
   - protolude ==0.2.2
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
@@ -1743,7 +1744,7 @@ default-package-overrides:
   - rest-stringmap ==0.2.0.7
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
-  - retry ==0.7.6.3
+  - retry ==0.7.7.0
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
   - rhine ==0.4.0.1
@@ -1776,8 +1777,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.3.17
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1826,7 +1827,7 @@ default-package-overrides:
   - servant-lucid ==0.8.1
   - servant-mock ==0.8.4
   - servant-pandoc ==0.5.0.0
-  - servant-ruby ==0.8.0.1
+  - servant-ruby ==0.8.0.2
   - servant-server ==0.14.1
   - servant-static-th ==0.2.2.0
   - servant-streaming ==0.3.0.0
@@ -1845,7 +1846,7 @@ default-package-overrides:
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
-  - setlocale ==1.0.0.6
+  - setlocale ==1.0.0.8
   - sexp-grammar ==2.0.1
   - SHA ==1.6.4.4
   - shake ==0.16.4
@@ -1873,8 +1874,8 @@ default-package-overrides:
   - siphash ==1.0.3
   - size-based ==0.1.1.0
   - skein ==1.0.9.4
-  - skylighting ==0.7.2
-  - skylighting-core ==0.7.2
+  - skylighting ==0.7.3
+  - skylighting-core ==0.7.3
   - slack-web ==0.2.0.6
   - slave-thread ==1.0.2
   - smallcheck ==1.1.5
@@ -1898,7 +1899,7 @@ default-package-overrides:
   - sparkle ==0.7.4
   - sparse-linear-algebra ==0.3.1
   - special-values ==0.1.0.0
-  - speculate ==0.3.2
+  - speculate ==0.3.5
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
@@ -1994,7 +1995,7 @@ default-package-overrides:
   - tao ==1.0.0
   - tao-example ==1.0.0
   - tar ==0.5.1.0
-  - tar-conduit ==0.2.3.1
+  - tar-conduit ==0.2.5
   - tardis ==0.4.1.0
   - tasty ==1.1.0.3
   - tasty-ant-xml ==1.1.4
@@ -2033,11 +2034,11 @@ default-package-overrides:
   - texmath ==0.11.0.1
   - text ==1.2.3.0
   - text-binary ==0.2.1.1
-  - text-builder ==0.5.3.1
+  - text-builder ==0.5.4.3
   - text-conversions ==0.3.0
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
-  - text-ldap ==0.1.1.12
+  - text-ldap ==0.1.1.13
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
@@ -2050,12 +2051,12 @@ default-package-overrides:
   - tfp ==1.0.0.2
   - tf-random ==0.5
   - th-abstraction ==0.2.8.0
-  - th-data-compat ==0.0.2.6
+  - th-data-compat ==0.0.2.7
   - th-desugar ==1.8
   - these ==0.7.4
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
-  - th-lift ==0.7.10
+  - th-lift ==0.7.11
   - th-lift-instances ==0.1.11
   - th-nowq ==0.1.0.2
   - th-orphans ==0.13.6
@@ -2065,7 +2066,7 @@ default-package-overrides:
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-gui ==0.8.2.4
-  - th-reify-compat ==0.0.1.4
+  - th-reify-compat ==0.0.1.5
   - th-reify-many ==0.1.8
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
@@ -2078,7 +2079,7 @@ default-package-overrides:
   - timeit ==2.0
   - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
-  - time-locale-compat ==0.1.1.4
+  - time-locale-compat ==0.1.1.5
   - time-locale-vietnamese ==1.0.0.0
   - time-parsers ==0.1.2.0
   - timerep ==2.0.0.2
@@ -2155,10 +2156,10 @@ default-package-overrides:
   - universe-reverse-instances ==1.0
   - universum ==1.2.0
   - unix-bytestring ==0.3.7.3
-  - unix-compat ==0.5.0.1
+  - unix-compat ==0.5.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.7.0
-  - unliftio-core ==0.1.1.0
+  - unliftio ==0.2.7.1
+  - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.1
@@ -2172,7 +2173,7 @@ default-package-overrides:
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
   - utf8-string ==1.0.1.1
-  - util ==0.1.10.1
+  - util ==0.1.11.0
   - utility-ht ==0.0.14
   - uuid ==1.3.13
   - uuid-types ==1.0.3
@@ -2181,18 +2182,18 @@ default-package-overrides:
   - validity-aeson ==0.2.0.2
   - validity-bytestring ==0.3.0.2
   - validity-containers ==0.3.1.0
-  - validity-path ==0.3.0.1
-  - validity-scientific ==0.2.0.1
-  - validity-text ==0.3.0.1
-  - validity-time ==0.2.0.1
-  - validity-unordered-containers ==0.2.0.1
-  - validity-uuid ==0.1.0.1
-  - validity-vector ==0.2.0.1
+  - validity-path ==0.3.0.2
+  - validity-scientific ==0.2.0.2
+  - validity-text ==0.3.1.0
+  - validity-time ==0.2.0.2
+  - validity-unordered-containers ==0.2.0.2
+  - validity-uuid ==0.1.0.2
+  - validity-vector ==0.2.0.2
   - valor ==0.1.0.0
   - vault ==0.3.1.2
   - vec ==0.1
   - vector ==0.12.0.1
-  - vector-algorithms ==0.7.0.1
+  - vector-algorithms ==0.7.0.4
   - vector-binary-instances ==0.2.4
   - vector-buffer ==0.4.1
   - vector-builder ==0.3.6
@@ -2220,7 +2221,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.24.1
+  - wai-extra ==3.0.24.2
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2

From 1b1cb6305c9bc5c1e1eb2cc0b275b79048dbd7b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Aug 2018 02:31:07 +0200
Subject: [PATCH 0847/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3869e8d54128882292705ca508ade7d32a5f7176.
---
 .../haskell-modules/hackage-packages.nix      | 3887 ++++++++++-------
 1 file changed, 2404 insertions(+), 1483 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c1fb70ee2e6e..dc2e2abed6ab 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2440,18 +2440,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_2_2_0_1" = callPackage
+  "Cabal_2_4_0_0" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, binary
      , bytestring, containers, deepseq, Diff, directory, filepath
      , integer-logarithms, mtl, optparse-applicative, parsec, pretty
      , process, QuickCheck, tagged, tar, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text, time, transformers
-     , tree-diff, unix
+     , tasty-hunit, tasty-quickcheck, temporary, text, time
+     , transformers, tree-diff, unix
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "2.2.0.1";
-       sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
+       version = "2.4.0.0";
+       sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl";
        setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -2461,7 +2461,7 @@ self: {
          array base base-compat base-orphans bytestring containers deepseq
          Diff directory filepath integer-logarithms optparse-applicative
          pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit
-         tasty-quickcheck text tree-diff
+         tasty-quickcheck temporary text tree-diff
        ];
        doCheck = false;
        description = "A framework for packaging Haskell software";
@@ -5391,17 +5391,6 @@ self: {
      }) {};
 
   "Fin" = callPackage
-    ({ mkDerivation, base, natural-induction, peano }:
-     mkDerivation {
-       pname = "Fin";
-       version = "0.2.3.0";
-       sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
-       libraryHaskellDepends = [ base natural-induction peano ];
-       description = "Finite totally-ordered sets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Fin_0_2_5_0" = callPackage
     ({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
      mkDerivation {
        pname = "Fin";
@@ -5412,7 +5401,6 @@ self: {
        ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5768,27 +5756,30 @@ self: {
      }) {};
 
   "Frames" = callPackage
-    ({ mkDerivation, base, contravariant, criterion, deepseq, directory
-     , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
-     , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
-     , pipes-text, pretty, primitive, readable, regex-applicative
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector, vinyl
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , contravariant, criterion, deepseq, directory, discrimination
+     , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes
+     , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty
+     , primitive, readable, regex-applicative, template-haskell
+     , temporary, text, transformers, unordered-containers, vector
+     , vector-th-unbox, vinyl
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.4.0";
-       sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20";
+       version = "0.5.0";
+       sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base contravariant deepseq discrimination ghc-prim hashable pipes
-         pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
-         primitive readable template-haskell text transformers vector vinyl
+         base bytestring containers contravariant deepseq discrimination
+         ghc-prim hashable pipes pipes-bytestring pipes-group pipes-parse
+         pipes-safe primitive readable template-haskell text transformers
+         vector vector-th-unbox vinyl
        ];
        testHaskellDepends = [
-         base directory hspec htoml HUnit pipes pretty regex-applicative
-         template-haskell temporary text unordered-containers vinyl
+         attoparsec base directory foldl hspec htoml HUnit lens pipes pretty
+         regex-applicative template-haskell temporary text
+         unordered-containers vinyl
        ];
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
@@ -5804,8 +5795,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames-beam";
-       version = "0.1.0.1";
-       sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj";
+       version = "0.2.0.0";
+       sha256 = "1fzd41zwx5zmbysk49z2r9ga11z8c0vqqfvb4zgbcm3ivhkn48yi";
        libraryHaskellDepends = [
          base beam-core beam-migrate beam-postgres bytestring conduit Frames
          generics-sop monad-control postgresql-simple process scientific
@@ -9852,6 +9843,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_4_15" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.15";
+       sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring network time ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -10175,8 +10181,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6DB";
-       version = "0.3.0";
-       sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
+       version = "0.3.1";
+       sha256 = "06240z3nbjkf0rgwhvajjw28lckgpsfz5nbzzdqyfzgyg2r4wdcn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -12838,8 +12844,10 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "NameGenerator";
-       version = "0.0.1";
-       sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f";
+       version = "0.0.2";
+       sha256 = "1rnn3i9rvb9z7iqd0hx730gv3n5hc1gbsdqsa0hlq3qxffg3sr8x";
+       revision = "1";
+       editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
        libraryHaskellDepends = [ base containers random ];
        description = "A name generator written in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -14549,12 +14557,12 @@ self: {
      }) {};
 
   "Prelude" = callPackage
-    ({ mkDerivation, base-noprelude }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "Prelude";
-       version = "0.1.0.0";
-       sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj";
-       libraryHaskellDepends = [ base-noprelude ];
+       version = "0.1.0.1";
+       sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6";
+       libraryHaskellDepends = [ base ];
        description = "A Prelude module replacement";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14936,6 +14944,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "QuickCheck_2_12_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, erf, process, random
+     , template-haskell, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "QuickCheck";
+       version = "2.12.1";
+       sha256 = "1xq2cmz1yr63a2f6yz5v6majd0wqagx13xrk4b3xa7y9nbpxixag";
+       libraryHaskellDepends = [
+         base containers deepseq erf random template-haskell tf-random
+         transformers
+       ];
+       testHaskellDepends = [ base deepseq process ];
+       description = "Automatic testing of Haskell programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "QuickCheck-GenT" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, random }:
      mkDerivation {
@@ -14980,6 +15006,8 @@ self: {
        pname = "QuickPlot";
        version = "0.1.0.1";
        sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
+       revision = "1";
+       editedCabalFile = "0ykvkbrf5mavrk9jdl5w01dldwi3x2dwg89hiin95vi8ay0r02gq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -15711,8 +15739,8 @@ self: {
     ({ mkDerivation, base, Cabal, SDL, SDL_gfx }:
      mkDerivation {
        pname = "SDL-gfx";
-       version = "0.6.2.0";
-       sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr";
+       version = "0.7.0.0";
+       sha256 = "1pmhbgdp4f9nz9mpxckx0mrhphccqsfcwfpflxmph5gx4mxk4xb2";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base SDL ];
@@ -18072,10 +18100,10 @@ self: {
     ({ mkDerivation, base, base-orphans }:
      mkDerivation {
        pname = "TypeCompose";
-       version = "0.9.12";
-       sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s";
-       revision = "1";
-       editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3";
+       version = "0.9.13";
+       sha256 = "0cmlldr665mzi0jsb567pn6qbqxr6cyq9ky3mfh1sfls5yhwr5hc";
+       revision = "2";
+       editedCabalFile = "026h1zgp7fj8ccq8rpzcq0s4wdbw2v7fskcj73n40mfhv0gx26y0";
        libraryHaskellDepends = [ base base-orphans ];
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
@@ -21738,17 +21766,6 @@ self: {
      }) {};
 
   "aeson-generic-compat" = callPackage
-    ({ mkDerivation, aeson, base }:
-     mkDerivation {
-       pname = "aeson-generic-compat";
-       version = "0.0.1.2";
-       sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233";
-       libraryHaskellDepends = [ aeson base ];
-       description = "Compatible generic class names of Aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-generic-compat_0_0_1_3" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
        pname = "aeson-generic-compat";
@@ -21757,7 +21774,6 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Compatible generic class names of Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-injector" = callPackage
@@ -21768,8 +21784,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-injector";
-       version = "1.1.0.0";
-       sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf";
+       version = "1.1.1.0";
+       sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp";
        libraryHaskellDepends = [
          aeson base bifunctors deepseq hashable lens servant-docs swagger2
          text unordered-containers
@@ -23385,8 +23401,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-pcm";
-       version = "0.6.1";
-       sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5";
+       version = "0.6.1.1";
+       sha256 = "1mllr9nbm3qb837zgvd6mrpr6f8i272wflv0a45rrpsq50zgcj33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26708,6 +26724,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_8_1" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.8.1";
+       sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -27168,15 +27198,15 @@ self: {
      }) {};
 
   "apecs" = callPackage
-    ({ mkDerivation, async, base, containers, criterion, linear, mtl
-     , QuickCheck, template-haskell, vector
+    ({ mkDerivation, base, containers, criterion, linear, mtl
+     , QuickCheck, stm, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.4.1.1";
-       sha256 = "0ybw09hpjfjm22bza74n57aarv6nhwf5zi27q7q7a6yf5jpa5ccg";
+       version = "0.5.0.0";
+       sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw";
        libraryHaskellDepends = [
-         async base containers mtl template-haskell vector
+         base containers mtl stm template-haskell vector
        ];
        testHaskellDepends = [
          base containers criterion linear QuickCheck vector
@@ -27729,13 +27759,13 @@ self: {
      }) {};
 
   "appendmap" = callPackage
-    ({ mkDerivation, base, containers, hspec }:
+    ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
        pname = "appendmap";
-       version = "0.1.3";
-       sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6";
+       version = "0.1.5";
+       sha256 = "03mr60hgb5593s9vhc5890xwd2pdyismfkvnvw5hxhq26wda5grd";
        libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers hspec ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27895,8 +27925,8 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "apportionment";
-       version = "0.0.0.2";
-       sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m";
+       version = "0.0.0.3";
+       sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Round a set of numbers while maintaining its sum";
        license = stdenv.lib.licenses.bsd3;
@@ -28762,16 +28792,17 @@ self: {
 
   "ascii" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
-     , hashable, text
+     , hashable, semigroups, text
      }:
      mkDerivation {
        pname = "ascii";
-       version = "0.0.4.1";
-       sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
+       version = "0.0.5.1";
+       sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn";
        libraryHaskellDepends = [
-         base blaze-builder bytestring case-insensitive hashable text
+         base blaze-builder bytestring case-insensitive hashable semigroups
+         text
        ];
-       description = "Type-safe, bytestring-based ASCII values. (deprecated)";
+       description = "Type-safe, bytestring-based ASCII values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -28845,8 +28876,8 @@ self: {
      }:
      mkDerivation {
        pname = "ascii-string";
-       version = "1.0.1";
-       sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz";
+       version = "1.0.1.3";
+       sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls";
        libraryHaskellDepends = [
          base bytestring cereal deepseq deferred-folds foldl hashable
          primitive primitive-extras
@@ -29367,6 +29398,8 @@ self: {
        pname = "async";
        version = "2.2.1";
        sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
+       revision = "1";
+       editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hashable stm ];
@@ -29935,19 +29968,20 @@ self: {
 
   "ats-format" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory
-     , file-embed, htoml-megaparsec, language-ats, optparse-applicative
-     , process, text, unordered-containers
+     , file-embed, filepath, htoml-megaparsec, language-ats, megaparsec
+     , optparse-applicative, process, text, unordered-containers
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.2.0.28";
-       sha256 = "0s538j8v0n8sdfi9pbykk2avbi3vg35iw2c9h6vmiyy3zszflqc4";
+       version = "0.2.0.29";
+       sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va";
        isLibrary = false;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal cli-setup ];
+       setupHaskellDepends = [ base Cabal cli-setup filepath ];
        executableHaskellDepends = [
          ansi-wl-pprint base directory file-embed htoml-megaparsec
-         language-ats optparse-applicative process text unordered-containers
+         language-ats megaparsec optparse-applicative process text
+         unordered-containers
        ];
        description = "A source-code formatter for ATS";
        license = stdenv.lib.licenses.bsd3;
@@ -30540,15 +30574,15 @@ self: {
      }) {};
 
   "aur" = callPackage
-    ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
-     , servant-client, tasty, tasty-hunit, text
+    ({ mkDerivation, aeson, base, errors, http-client, http-client-tls
+     , servant, servant-client, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "aur";
-       version = "6.0.0.1";
-       sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0";
+       version = "6.1.0";
+       sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6";
        libraryHaskellDepends = [
-         aeson base http-client servant servant-client text
+         aeson base errors http-client servant servant-client text
        ];
        testHaskellDepends = [
          base http-client http-client-tls tasty tasty-hunit
@@ -30575,6 +30609,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aura" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array
+     , async, aur, base, base-prelude, bytestring, compactable
+     , containers, directory, errors, filepath, freer-simple
+     , generic-lens, http-client, http-client-tls, http-types
+     , language-bash, megaparsec, microlens, microlens-ghc, mtl
+     , mwc-random, network-uri, non-empty-containers
+     , optparse-applicative, paths, pretty-simple, prettyprinter
+     , prettyprinter-ansi-terminal, semigroupoids, stm, tasty
+     , tasty-hunit, text, throttled, time, transformers, typed-process
+     , versions, witherable
+     }:
+     mkDerivation {
+       pname = "aura";
+       version = "2.0.0";
+       sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty algebraic-graphs array async aur base
+         base-prelude bytestring compactable containers directory errors
+         filepath freer-simple generic-lens http-client http-types
+         language-bash megaparsec microlens microlens-ghc mtl mwc-random
+         network-uri non-empty-containers paths pretty-simple prettyprinter
+         prettyprinter-ansi-terminal semigroupoids stm text throttled time
+         transformers typed-process versions witherable
+       ];
+       executableHaskellDepends = [
+         base base-prelude bytestring containers errors freer-simple
+         http-client http-client-tls language-bash microlens
+         non-empty-containers optparse-applicative paths pretty-simple
+         prettyprinter prettyprinter-ansi-terminal text transformers
+         typed-process versions
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring containers errors freer-simple
+         http-client language-bash megaparsec microlens non-empty-containers
+         paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty
+         tasty-hunit text transformers typed-process versions
+       ];
+       description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "authenticate" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, containers, http-conduit, http-types
@@ -30710,6 +30788,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter_1_1_11" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "1.1.11";
+       sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base Cabal directory filepath ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "autom" = callPackage
     ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss
      , JuicyPixels, random, vector
@@ -31037,6 +31130,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_3_5_1" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+     , bytestring, containers, data-binary-ieee754, directory, entropy
+     , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+     , QuickCheck, scientific, semigroups, tagged, template-haskell
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.3.5.1";
+       sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+         semigroups tagged template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         directory entropy extra fail hashable hspec lens lens-aeson mtl
+         pure-zlib QuickCheck scientific semigroups tagged template-haskell
+         text transformers unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -32370,8 +32490,8 @@ self: {
      }:
      mkDerivation {
        pname = "barbies";
-       version = "0.1.3.1";
-       sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5";
+       version = "0.1.4.0";
+       sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada";
        libraryHaskellDepends = [ base bifunctors ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Classes for working with types that can change clothes";
@@ -33145,8 +33265,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleship-combinatorics";
-       version = "0.0.0.1";
-       sha256 = "00zr3798y5h640rdhls4xkaqmj6n90qnxglq7bq8bvxl68a8ibxd";
+       version = "0.0.0.2";
+       sha256 = "1vja3z9xna06cyb3xlx2p7z4drbglbyahr8fs3337phynv2h0v0g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33653,23 +33773,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, process
-     , silently, text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.11";
-       sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative process silently text turtle
-       ];
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bench_1_0_12" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, process
      , silently, text, turtle
      }:
@@ -33684,7 +33787,6 @@ self: {
        ];
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bench-graph" = callPackage
@@ -33897,22 +33999,24 @@ self: {
      }) {};
 
   "betris" = callPackage
-    ({ mkDerivation, base, containers, lens, linear, random, stm
-     , stm-chans, vty
+    ({ mkDerivation, base, containers, lens, linear
+     , optparse-applicative, random, stm, time-units, vty
      }:
      mkDerivation {
        pname = "betris";
-       version = "0.1.0.0";
-       sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222";
+       version = "0.1.1.1";
+       sha256 = "0ggmy2rwwsgq54j29b2a5dkafalww0nrzz89j08wf3gsg90g9p9i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers lens linear random stm stm-chans vty
+         base containers lens linear optparse-applicative random stm
+         time-units vty
        ];
        executableHaskellDepends = [
-         base containers lens linear random stm stm-chans vty
+         base containers lens linear optparse-applicative random stm
+         time-units vty
        ];
-       description = "Braille friendly vertical version of tetris";
+       description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -35403,8 +35507,8 @@ self: {
     ({ mkDerivation, base, monetdb-mapi }:
      mkDerivation {
        pname = "bindings-monetdb-mapi";
-       version = "0.1.0.0";
-       sha256 = "12i1sn508m0vcm6d34l32h8x77ik63l64ix4vmn6c91jbhgakvv3";
+       version = "0.1.0.1";
+       sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl";
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
@@ -35700,8 +35804,8 @@ self: {
      }:
      mkDerivation {
        pname = "bins";
-       version = "0.1.1.0";
-       sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk";
+       version = "0.1.1.1";
+       sha256 = "1v585ppm5g424jn2bkq7ydsdd6bds7gak53288vn4vclnw2rswr8";
        libraryHaskellDepends = [
          base containers finite-typelits ghc-typelits-knownnat
          ghc-typelits-natnormalise math-functions profunctors reflection
@@ -35819,8 +35923,8 @@ self: {
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "1.0.3";
-       sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252";
+       version = "1.0.4";
+       sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c";
        libraryHaskellDepends = [
          async attoparsec base base-prelude bytestring containers exceptions
          hashable primitive stm text transformers unix unordered-containers
@@ -37719,23 +37823,26 @@ self: {
 
   "board-games" = callPackage
     ({ mkDerivation, array, base, cgi, containers, html, httpd-shed
-     , network-uri, QuickCheck, random, transformers, utility-ht
+     , network-uri, non-empty, QuickCheck, random, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "board-games";
-       version = "0.1.0.6";
-       sha256 = "0qry0kacwaiwdcc2wxz08qimvzj9y0vmyc0cc5yq1lyx1sx6wghp";
+       version = "0.2";
+       sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base cgi containers html random transformers utility-ht
+         array base cgi containers html non-empty random transformers
+         utility-ht
        ];
        executableHaskellDepends = [
-         array base cgi containers html httpd-shed network-uri random
-         transformers utility-ht
+         array base cgi containers html httpd-shed network-uri non-empty
+         random transformers utility-ht
        ];
        testHaskellDepends = [
-         array base containers QuickCheck random transformers utility-ht
+         array base containers non-empty QuickCheck random transformers
+         utility-ht
        ];
        description = "Three games for inclusion in a web server";
        license = "GPL";
@@ -38071,8 +38178,8 @@ self: {
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.4";
-       sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7";
+       version = "0.0.0.5";
+       sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5";
        libraryHaskellDepends = [
          base containers directory mtl temporary
        ];
@@ -38568,8 +38675,8 @@ self: {
      }:
      mkDerivation {
        pname = "brainheck";
-       version = "0.1.0.9";
-       sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8";
+       version = "0.1.0.10";
+       sha256 = "10j3wncbdgxz2cb1v6sm6dr7z8jdh7xax8dwsj151sgxjw5n35xm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38666,7 +38773,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_40" = callPackage
+  "brick_0_41_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -38674,8 +38781,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.40";
-       sha256 = "12bd0acbczcrr7mlpfrpjm9qq2ll2rbmgskpdw6lfaxz1iz75cad";
+       version = "0.41.1";
+       sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38979,12 +39086,22 @@ self: {
      }) {};
 
   "bsb-http-chunked" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder }:
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups
+     , tasty, tasty-hedgehog, tasty-hunit
+     }:
      mkDerivation {
        pname = "bsb-http-chunked";
-       version = "0.0.0.2";
-       sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
+       version = "0.0.0.3";
+       sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4";
        libraryHaskellDepends = [ base bytestring bytestring-builder ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder doctest
+         hedgehog tasty tasty-hedgehog tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring deepseq gauge semigroups
+       ];
        description = "Chunked HTTP transfer encoding for bytestring builders";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39311,23 +39428,24 @@ self: {
 
   "bugsnag-haskell" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
-     , case-insensitive, doctest, hspec, http-client, http-client-tls
-     , http-conduit, http-types, iproute, network, parsec
-     , template-haskell, text, th-lift-instances, time, ua-parser, wai
+     , case-insensitive, containers, doctest, Glob, hspec, http-client
+     , http-client-tls, http-conduit, http-types, iproute, network
+     , parsec, template-haskell, text, th-lift-instances, time
+     , ua-parser, unliftio, wai
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.1.3";
-       sha256 = "07z2gw0p6cswzr22378z07jdyrww56mby3bfdlc7gxarxyfzsf9f";
+       version = "0.0.2.0";
+       sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive http-client http-client-tls
-         http-conduit http-types iproute network parsec template-haskell
-         text th-lift-instances time ua-parser wai
+         aeson base bytestring case-insensitive containers Glob http-client
+         http-client-tls http-conduit http-types iproute network parsec
+         template-haskell text th-lift-instances time ua-parser wai
        ];
        testHaskellDepends = [
-         aeson aeson-qq base doctest hspec text time
+         aeson aeson-qq base doctest hspec text time unliftio
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -40011,13 +40129,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bytestring-encoding" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "bytestring-encoding";
+       version = "0.1.0.0";
+       sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+         tasty-th text
+       ];
+       description = "ByteString ↔ Text converter based on GHC.IO.Encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bytestring-encodings" = callPackage
     ({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text
      }:
      mkDerivation {
        pname = "bytestring-encodings";
-       version = "0.2.0.1";
-       sha256 = "0qjqbffp4fa7a95mfsgzhibqblxrxl4qa8kb0yhyb8c1r47r5nn7";
+       version = "0.2.0.2";
+       sha256 = "1x239ihnxxmbfcpm9v79snpdafhammqdsm19pdlnrg02m0ia59pn";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring hedgehog ];
        benchmarkHaskellDepends = [ base bytestring gauge text ];
@@ -40202,6 +40337,8 @@ self: {
        pname = "bytestring-strict-builder";
        version = "0.4.5.1";
        sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q";
+       revision = "1";
+       editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups
        ];
@@ -40795,8 +40932,8 @@ self: {
        pname = "cabal-doctest";
        version = "1.0.6";
        sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
-       revision = "1";
-       editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
+       revision = "2";
+       editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60";
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "A Setup.hs helper for doctests running";
        license = stdenv.lib.licenses.bsd3;
@@ -42112,8 +42249,8 @@ self: {
     ({ mkDerivation, base, containers, html, old-time, utility-ht }:
      mkDerivation {
        pname = "calendar-recycling";
-       version = "0.0";
-       sha256 = "0qvrxq3pgbbska0mqw9wk7wpsiln0i8rbdxnj4jfiv5vpp2n4gm3";
+       version = "0.0.0.1";
+       sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42459,8 +42596,8 @@ self: {
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.1.0.0";
-       sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl";
+       version = "0.2.0.0";
+       sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43568,8 +43705,8 @@ self: {
      }:
      mkDerivation {
        pname = "cayley-client";
-       version = "0.4.6";
-       sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+       version = "0.4.7";
+       sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs";
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring exceptions http-client
          http-conduit lens lens-aeson mtl text transformers
@@ -44839,26 +44976,26 @@ self: {
      , directory, file-embed, filepath, github, hlint, hspec
      , hspec-megaparsec, interpolatedstring-perl6, megaparsec
      , monad-parallel, optparse-applicative, process, QuickCheck
-     , quickcheck-text, range, temporary, text
+     , quickcheck-text, temporary, text
      }:
      mkDerivation {
        pname = "checkmate";
-       version = "0.3.2";
-       sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww";
+       version = "0.4.0";
+       sha256 = "0l5d1wf9pbji0h8qsqhqliv3kvzc6xcryq5zvps375pk8r5l2lvb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers diff-parse directory filepath github megaparsec
-         monad-parallel range text
+         monad-parallel text
        ];
        executableHaskellDepends = [
          base diff-parse directory filepath megaparsec optparse-applicative
-         process range text
+         process text
        ];
        testHaskellDepends = [
          base bytestring diff-parse directory file-embed filepath hlint
          hspec hspec-megaparsec interpolatedstring-perl6 megaparsec
-         QuickCheck quickcheck-text range temporary text
+         QuickCheck quickcheck-text temporary text
        ];
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
@@ -47450,23 +47587,6 @@ self: {
      }) {};
 
   "cmark-gfm" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
-     , criterion, discount, HUnit, markdown, sundown, text
-     }:
-     mkDerivation {
-       pname = "cmark-gfm";
-       version = "0.1.4";
-       sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base HUnit text ];
-       benchmarkHaskellDepends = [
-         base blaze-html cheapskate criterion discount markdown sundown text
-       ];
-       description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cmark-gfm_0_1_5" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, cheapskate
      , criterion, discount, HUnit, markdown, sundown, text
      }:
@@ -47481,7 +47601,6 @@ self: {
        ];
        description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmark-highlight" = callPackage
@@ -48271,6 +48390,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "collapse-duplication" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-show, cassava
+     , containers, hierarchical-clustering, lens, optparse-generic
+     , split
+     }:
+     mkDerivation {
+       pname = "collapse-duplication";
+       version = "0.4.0.1";
+       sha256 = "0azfyayvlw6vmgim98rsmgz5gx2dmwnbk9dwmm23781wdbm448a5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bytestring-show cassava containers
+         hierarchical-clustering lens
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers lens optparse-generic split
+       ];
+       description = "Collapse the duplication output into clones and return their frequencies";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "collapse-util" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48770,10 +48911,8 @@ self: {
      }:
      mkDerivation {
        pname = "combinatorial";
-       version = "0.1";
-       sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9";
-       revision = "1";
-       editedCabalFile = "1bqcg04w48dqk4n1n36j9ykajrmwqdd4qpcjjjfhzvm83z5ypsh7";
+       version = "0.1.0.1";
+       sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4";
        libraryHaskellDepends = [
          array base containers transformers utility-ht
        ];
@@ -48844,8 +48983,8 @@ self: {
      }:
      mkDerivation {
        pname = "comfort-graph";
-       version = "0.0.3";
-       sha256 = "11s3ag5skk07vs4h6xl20hbmlrbxqcwrj54wfpz2fk73347prmmr";
+       version = "0.0.3.1";
+       sha256 = "0qmmz3z9dgjb41rj6g81ppxaj4jswqnnb8bqn2s1dd6hf6cih9n9";
        libraryHaskellDepends = [
          base containers QuickCheck semigroups transformers utility-ht
        ];
@@ -49025,6 +49164,8 @@ self: {
        pname = "comonad-extras";
        version = "4.0";
        sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
+       revision = "1";
+       editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1";
        libraryHaskellDepends = [
          array base comonad containers distributive semigroupoids
          transformers
@@ -49085,6 +49226,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compact-list" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "compact-list";
+       version = "0.1.0";
+       sha256 = "0mg2s7mm908gy5j958abmiylfc05fs4y08dcjz4805ayi9cb1qqd";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ];
+       description = "An append only list in a compact region";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compact-map" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
      mkDerivation {
@@ -49628,19 +49781,19 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.0.8";
-       sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc";
+       version = "1.5.3.1";
+       sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_5_3_1" = callPackage
+  "composition-prelude_2_0_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.5.3.1";
-       sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
+       version = "2.0.0.0";
+       sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5";
        libraryHaskellDepends = [ base ];
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -50067,6 +50220,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency-benchmarks" = callPackage
+    ({ mkDerivation, async, base, bench-graph, bytestring, Chart
+     , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
+     , mtl, random, split, streamly, text, transformers, typed-process
+     }:
+     mkDerivation {
+       pname = "concurrency-benchmarks";
+       version = "0.1.0";
+       sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bench-graph bytestring Chart Chart-diagrams csv directory
+         getopt-generics split text transformers typed-process
+       ];
+       benchmarkHaskellDepends = [
+         async base deepseq gauge mtl random streamly transformers
+       ];
+       description = "Benchmarks to compare concurrency APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "concurrent-barrier" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50116,8 +50291,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-dns-cache";
-       version = "0.1.1";
-       sha256 = "0q6mffxkdag9impmd69nfqvjhpmnb3wy88aqfnlb7q476g84yjkx";
+       version = "0.1.2";
+       sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50550,6 +50725,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-concurrent-map" = callPackage
+    ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+     , resourcet, say, unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit-concurrent-map";
+       version = "0.1.1";
+       sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j";
+       libraryHaskellDepends = [
+         base conduit containers mtl resourcet unliftio unliftio-core vector
+       ];
+       testHaskellDepends = [ base conduit hspec HUnit say ];
+       description = "Concurrent, order-preserving mapping Conduit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "conduit-connection" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, HUnit
      , network, resourcet, test-framework, test-framework-hunit
@@ -51541,8 +51732,8 @@ self: {
     ({ mkDerivation, base, constraints, template-haskell }:
      mkDerivation {
        pname = "constraints-extras";
-       version = "0.1.0.1";
-       sha256 = "12m6z1va1idbqnl7syljgk8hy82vm0lymf262331jmhjb744awpz";
+       version = "0.2.0.0";
+       sha256 = "0id5xaij014vabzkbnl54h8km667vk1mz8dk27kdzfa5vg6pj8j8";
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Utility package for constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -51639,8 +51830,8 @@ self: {
     ({ mkDerivation, base, containers, convert, lens, text, vector }:
      mkDerivation {
        pname = "container";
-       version = "1.1.2";
-       sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj";
+       version = "1.1.5";
+       sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm";
        libraryHaskellDepends = [
          base containers convert lens text vector
        ];
@@ -51823,12 +52014,12 @@ self: {
      }) {};
 
   "contiguous" = callPackage
-    ({ mkDerivation, base, primitive }:
+    ({ mkDerivation, base, deepseq, primitive }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.2.0.0";
-       sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl";
-       libraryHaskellDepends = [ base primitive ];
+       version = "0.3.0.0";
+       sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28";
+       libraryHaskellDepends = [ base deepseq primitive ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51838,8 +52029,8 @@ self: {
     ({ mkDerivation, base, contiguous, primitive }:
      mkDerivation {
        pname = "contiguous-checked";
-       version = "0.2.0.0";
-       sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l";
+       version = "0.3.0.0";
+       sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b";
        libraryHaskellDepends = [ base contiguous primitive ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53145,8 +53336,8 @@ self: {
     ({ mkDerivation, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.6.0";
-       sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb";
+       version = "3.6.1";
+       sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -53242,34 +53433,6 @@ self: {
      }) {};
 
   "cql-io" = callPackage
-    ({ mkDerivation, async, auto-update, base, bytestring, containers
-     , cql, cryptohash, data-default-class, Decimal, exceptions
-     , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
-     , mwc-random, network, raw-strings-qq, retry, semigroups, stm
-     , tasty, tasty-hunit, text, time, tinylog, transformers
-     , transformers-base, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "cql-io";
-       version = "1.0.1";
-       sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q";
-       libraryHaskellDepends = [
-         async auto-update base bytestring containers cql cryptohash
-         data-default-class exceptions hashable HsOpenSSL iproute lens
-         monad-control mtl mwc-random network retry semigroups stm text time
-         tinylog transformers transformers-base unordered-containers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         base containers cql Decimal iproute mtl raw-strings-qq tasty
-         tasty-hunit text time tinylog uuid
-       ];
-       description = "Cassandra CQL client";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cql-io_1_0_1_1" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
      , cql, cryptohash, data-default-class, Decimal, exceptions
      , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
@@ -53490,18 +53653,18 @@ self: {
      }) {crack = null;};
 
   "crackNum" = callPackage
-    ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+    ({ mkDerivation, base, FloatingHex, ieee754, reinterpret-cast }:
      mkDerivation {
        pname = "crackNum";
-       version = "2.1";
-       sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
+       version = "2.2";
+       sha256 = "15327p12jql90j5z02nfzx5fivp7zsbznkg1i79iby59n3njfv40";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base data-binary-ieee754 FloatingHex ieee754
+         base FloatingHex ieee754 reinterpret-cast
        ];
        executableHaskellDepends = [
-         base data-binary-ieee754 FloatingHex ieee754
+         base FloatingHex ieee754 reinterpret-cast
        ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
@@ -54929,38 +55092,6 @@ self: {
      }) {};
 
   "csg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
-     , QuickCheck, simple-vec3, strict, system-filepath, tasty
-     , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
-     }:
-     mkDerivation {
-       pname = "csg";
-       version = "0.1.0.4";
-       sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers QuickCheck simple-vec3 strict
-         transformers
-       ];
-       executableHaskellDepends = [
-         base gloss gloss-raster QuickCheck simple-vec3 strict
-         system-filepath turtle
-       ];
-       testHaskellDepends = [
-         base bytestring doctest doctest-driver-gen simple-vec3 tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion simple-vec3 strict vector
-       ];
-       description = "Analytical CSG (Constructive Solid Geometry) library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "csg_0_1_0_5" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
      , QuickCheck, simple-vec3, strict, system-filepath, tasty
@@ -55144,24 +55275,6 @@ self: {
      }) {};
 
   "css-syntax" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
-     , scientific, text
-     }:
-     mkDerivation {
-       pname = "css-syntax";
-       version = "0.0.7";
-       sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scientific text
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring directory hspec scientific text
-       ];
-       description = "This package implments a parser for the CSS syntax";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "css-syntax_0_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
      , scientific, text
      }:
@@ -55177,7 +55290,6 @@ self: {
        ];
        description = "This package implments a parser for the CSS syntax";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-text" = callPackage
@@ -56556,8 +56668,8 @@ self: {
     ({ mkDerivation, array, base, containers, transformers }:
      mkDerivation {
        pname = "data-accessor";
-       version = "0.2.2.7";
-       sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l";
+       version = "0.2.2.8";
+       sha256 = "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc";
        libraryHaskellDepends = [ array base containers transformers ];
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
@@ -56619,8 +56731,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-accessor-template";
-       version = "0.2.1.15";
-       sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0";
+       version = "0.2.1.16";
+       sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk";
        libraryHaskellDepends = [
          base data-accessor template-haskell utility-ht
        ];
@@ -59320,24 +59432,6 @@ self: {
      }) {};
 
   "debian-build" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, split
-     , transformers
-     }:
-     mkDerivation {
-       pname = "debian-build";
-       version = "0.10.1.1";
-       sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory filepath process split transformers
-       ];
-       executableHaskellDepends = [ base filepath transformers ];
-       description = "Debian package build sequence tools";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "debian-build_0_10_1_2" = callPackage
     ({ mkDerivation, base, directory, filepath, process, split
      , transformers
      }:
@@ -59353,7 +59447,6 @@ self: {
        executableHaskellDepends = [ base filepath transformers ];
        description = "Debian package build sequence tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug" = callPackage
@@ -59776,8 +59869,10 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.6.12";
-       sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8";
+       version = "0.9.1";
+       sha256 = "1s1zz1yq97f3ivm68d8rv75v87li2003qk7w4n9s4nrx118llv6f";
+       revision = "1";
+       editedCabalFile = "0k4jh84a5mivx2wcwpdr9clbfx61j45ijbd8p82cdp77j35nz1gc";
        libraryHaskellDepends = [
          base bytestring containers foldl primitive transformers
        ];
@@ -60623,8 +60718,8 @@ self: {
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.9.4";
-       sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
+       version = "0.9.5";
+       sha256 = "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237";
        libraryHaskellDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
@@ -60808,14 +60903,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "df1_0_2" = callPackage
+  "df1_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , QuickCheck, tasty, tasty-quickcheck, text, time
      }:
      mkDerivation {
        pname = "df1";
-       version = "0.2";
-       sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs";
+       version = "0.3";
+       sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3";
        libraryHaskellDepends = [
          attoparsec base bytestring containers text time
        ];
@@ -60948,37 +61043,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_16_1" = callPackage
+  "dhall_1_17_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
-     , containers, contravariant, criterion, cryptonite, deepseq, Diff
-     , directory, doctest, exceptions, filepath, haskeline, http-client
-     , http-client-tls, insert-ordered-containers, lens-family-core
-     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
-     , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
-     , tasty, tasty-hunit, template-haskell, text, transformers
+     , cborg, containers, contravariant, criterion, cryptonite, deepseq
+     , Diff, directory, doctest, exceptions, filepath, hashable
+     , haskeline, http-client, http-client-tls
+     , insert-ordered-containers, lens-family-core, megaparsec, memory
+     , mockery, mtl, optparse-applicative, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+     , repline, scientific, serialise, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.16.1";
-       sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2";
+       version = "1.17.0";
+       sha256 = "14a74zqsnv00hbv19lhmv78xzl36qnsznmncnzq7jji2aslgwad0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base bytestring case-insensitive containers
+         ansi-terminal base bytestring case-insensitive cborg containers
          contravariant cryptonite Diff directory exceptions filepath
-         haskeline http-client http-client-tls insert-ordered-containers
-         lens-family-core megaparsec memory mtl optparse-applicative parsers
-         prettyprinter prettyprinter-ansi-terminal repline scientific
+         hashable haskeline http-client http-client-tls
+         insert-ordered-containers lens-family-core megaparsec memory mtl
+         optparse-applicative parsers prettyprinter
+         prettyprinter-ansi-terminal repline scientific serialise
          template-haskell text transformers unordered-containers vector
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base deepseq directory doctest filepath insert-ordered-containers
-         mockery prettyprinter tasty tasty-hunit text vector
+         base containers deepseq directory doctest filepath hashable
+         insert-ordered-containers mockery prettyprinter QuickCheck
+         quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
+         text transformers vector
        ];
        benchmarkHaskellDepends = [
-         base containers criterion directory text
+         base bytestring containers criterion directory serialise text
        ];
        description = "A configuration language guaranteed to terminate";
        license = stdenv.lib.licenses.bsd3;
@@ -60992,10 +61092,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.14";
-       sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
-       revision = "1";
-       editedCabalFile = "1ih8w5q0gnys02hv7hnjxxapfqw4gqmd9xfxn7a05cg2gb30mapr";
+       version = "1.0.15";
+       sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61029,15 +61127,13 @@ self: {
 
   "dhall-json" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , insert-ordered-containers, optparse-applicative, text
-     , unordered-containers, yaml
+     , insert-ordered-containers, optparse-applicative, tasty
+     , tasty-hunit, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.2.2";
-       sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d";
-       revision = "1";
-       editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2";
+       version = "1.2.3";
+       sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61048,6 +61144,7 @@ self: {
          aeson aeson-pretty base bytestring dhall optparse-applicative text
          yaml
        ];
+       testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61078,10 +61175,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.5";
-       sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
-       revision = "1";
-       editedCabalFile = "1k9mb8fm5vxm7asqawvv103y63i81n84py42w7hh72rk3wp3xcnk";
+       version = "1.1.6";
+       sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61099,10 +61194,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.11";
-       sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
-       revision = "1";
-       editedCabalFile = "0lrp1aknia3y4cz87vh14ns3f273lbca09ssz138wlf3266ka613";
+       version = "1.0.12";
+       sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -61177,14 +61270,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "di_1_1" = callPackage
+  "di_1_1_1" = callPackage
     ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
      , di-monad, exceptions
      }:
      mkDerivation {
        pname = "di";
-       version = "1.1";
-       sha256 = "1akwhznnnwb9y4rbb4kys2vvwzdmpxdccrnrh65s5c1pw3w517n5";
+       version = "1.1.1";
+       sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk";
        libraryHaskellDepends = [
          base containers df1 di-core di-df1 di-handle di-monad exceptions
        ];
@@ -61468,6 +61561,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.1.1";
        sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
+       revision = "1";
+       editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -62377,21 +62472,21 @@ self: {
      }) {};
 
   "digit" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec
+    ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec
      , parsers, pretty, scientific, semigroupoids, semigroups, tasty
      , tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.6";
-       sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8";
+       version = "0.7";
+       sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
        libraryHaskellDepends = [
-         base lens papa parsers scientific semigroupoids semigroups
+         base lens parsers scientific semigroupoids semigroups
          template-haskell
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty
-         tasty-hedgehog tasty-hspec tasty-hunit text
+         ansi-wl-pprint base hedgehog lens parsec parsers pretty semigroups
+         tasty tasty-hedgehog tasty-hspec tasty-hunit text
        ];
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -64271,6 +64366,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "do-notation" = callPackage
+    ({ mkDerivation, base, indexed }:
+     mkDerivation {
+       pname = "do-notation";
+       version = "0.1.0.1";
+       sha256 = "1ab32s7vjna1zkyvild62jsf9zkqls1bz3zp0fzfn0ykrv3045l8";
+       libraryHaskellDepends = [ base indexed ];
+       testHaskellDepends = [ base indexed ];
+       description = "Generalize do-notation to work on monads and indexed monads simultaneously";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -65558,8 +65665,8 @@ self: {
     ({ mkDerivation, array, base, containers, QuickCheck, random }:
      mkDerivation {
        pname = "dsp";
-       version = "0.2.4";
-       sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y";
+       version = "0.2.4.1";
+       sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers random ];
@@ -66620,8 +66727,8 @@ self: {
      }:
      mkDerivation {
        pname = "ec2-unikernel";
-       version = "0.9.2";
-       sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31";
+       version = "0.9.8";
+       sha256 = "137rq45d0d7ap77wlgiqp5sd2r0jwxkaw4mvxmj1lyi8yc52mxbg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66880,8 +66987,8 @@ self: {
      }:
      mkDerivation {
        pname = "edges";
-       version = "0.11.0.1";
-       sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8";
+       version = "0.11.0.3";
+       sha256 = "02735ky371hvxxxkgal7lzg6v8cmq5s115j6qx459lwj8p42az77";
        libraryHaskellDepends = [
          base cereal cereal-data-dword cereal-vector contravariant
          data-dword deepseq deferred-folds foldl hashable monad-par pointed
@@ -66915,8 +67022,8 @@ self: {
      }:
      mkDerivation {
        pname = "edit";
-       version = "1.0.0.0";
-       sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd";
+       version = "1.0.1.0";
+       sha256 = "0114fcb1cpfrvn01vqq4wcharny0ri412a3gsy888g739k61a4gj";
        libraryHaskellDepends = [
          base comonad deepseq QuickCheck transformers
        ];
@@ -67333,6 +67440,8 @@ self: {
        pname = "either";
        version = "5.0.1";
        sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
+       revision = "1";
+       editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca";
        libraryHaskellDepends = [
          base bifunctors mtl profunctors semigroupoids semigroups
        ];
@@ -68668,8 +68777,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.8";
-       sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb";
+       version = "1.0.9";
+       sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s";
        libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
@@ -69805,16 +69914,16 @@ self: {
      }) {};
 
   "etc" = callPackage
-    ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit
-     , text, typed-process, unliftio
+    ({ mkDerivation, aeson, base, rio, tasty, tasty-hunit
+     , template-haskell, text, typed-process, unliftio
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.4.0.3";
-       sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3";
+       version = "0.4.1.0";
+       sha256 = "1j17g8jij4y782vwpx7b52fv9nwv4v4mygk2hbq6vihzkbrdbd31";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base hashable rio text typed-process unliftio
+         aeson base rio template-haskell text typed-process unliftio
        ];
        testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
        description = "Declarative configuration spec for Haskell projects";
@@ -70157,10 +70266,8 @@ self: {
      }:
      mkDerivation {
        pname = "euler-tour-tree";
-       version = "0.1.0.1";
-       sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4";
-       revision = "1";
-       editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6";
+       version = "0.1.1.0";
+       sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh";
        libraryHaskellDepends = [
          base containers fingertree mtl parser-combinators transformers
          Unique
@@ -70631,6 +70738,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_1_1_6" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, time, transformers-base, unordered-containers
+     , uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.1.6";
+       sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -70875,8 +71017,8 @@ self: {
        pname = "exceptions";
        version = "0.10.0";
        sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
-       revision = "1";
-       editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
+       revision = "2";
+       editedCabalFile = "0aiihbjfrlmxzw9q8idvr6mihhs7kbx9s3w1vj8x3pz27p0ncq7g";
        libraryHaskellDepends = [
          base mtl stm template-haskell transformers transformers-compat
        ];
@@ -71194,6 +71336,8 @@ self: {
        pname = "exitcode";
        version = "0.1.0.1";
        sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
+       revision = "1";
+       editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z";
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids semigroups transformers
        ];
@@ -71682,8 +71826,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "3.1.0.0";
-       sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440";
+       version = "3.1.0.1";
+       sha256 = "1znqhcx5y4mpkbib18nma2c6bw4wxyxlxg3s8kafdalrx61rdhy3";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base doctest HUnit monad-control QuickCheck silently test-framework
@@ -71842,8 +71986,8 @@ self: {
     ({ mkDerivation, base, leancheck, speculate, template-haskell }:
      mkDerivation {
        pname = "extrapolate";
-       version = "0.3.1";
-       sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4";
+       version = "0.3.3";
+       sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2";
        libraryHaskellDepends = [
          base leancheck speculate template-haskell
        ];
@@ -71852,21 +71996,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extrapolate_0_3_2" = callPackage
-    ({ mkDerivation, base, leancheck, speculate, template-haskell }:
-     mkDerivation {
-       pname = "extrapolate";
-       version = "0.3.2";
-       sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj";
-       libraryHaskellDepends = [
-         base leancheck speculate template-haskell
-       ];
-       testHaskellDepends = [ base leancheck speculate ];
-       description = "generalize counter-examples of test properties";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ez-couch" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
      , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -72228,8 +72357,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.9";
-       sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
+       version = "0.6.1.1";
+       sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [
          arithmoi base combinat-compat hspec QuickCheck
@@ -73618,8 +73747,8 @@ self: {
     ({ mkDerivation, base, fftw }:
      mkDerivation {
        pname = "fftwRaw";
-       version = "0.1.0.1";
-       sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz";
+       version = "0.1.0.2";
+       sha256 = "1690x5vllqba39srbp7q3gl2rv30wq941sx4z89fh89axwgp9629";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
        description = "Low level bindings to FFTW";
@@ -74755,6 +74884,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-vector_1_2_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
+     mkDerivation {
+       pname = "fixed-vector";
+       version = "1.2.0.0";
+       sha256 = "19846sgjlsv7qy9nm9l4p2wdms5kvx6y9wm5ffz1hw7h77qy8ryw";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [ base doctest filemanip primitive ];
+       description = "Generic vectors with statically known size";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-vector-binary" = callPackage
     ({ mkDerivation, base, binary, fixed-vector, tasty
      , tasty-quickcheck
@@ -75486,6 +75628,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_15" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.15";
+       sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -76058,6 +76213,8 @@ self: {
        pname = "foldl";
        version = "1.4.3";
        sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk";
+       revision = "1";
+       editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroupoids semigroups text
@@ -76068,6 +76225,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_4_4" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers
+     , contravariant, criterion, hashable, mwc-random, primitive
+     , profunctors, semigroupoids, semigroups, text, transformers
+     , unordered-containers, vector, vector-builder
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.4.4";
+       sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7";
+       libraryHaskellDepends = [
+         base bytestring comonad containers contravariant hashable
+         mwc-random primitive profunctors semigroupoids semigroups text
+         transformers unordered-containers vector vector-builder
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -80775,24 +80953,6 @@ self: {
      }) {};
 
   "genvalidity-text" = callPackage
-    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, text, validity, validity-text
-     }:
-     mkDerivation {
-       pname = "genvalidity-text";
-       version = "0.5.0.2";
-       sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx";
-       libraryHaskellDepends = [
-         array base genvalidity QuickCheck text validity validity-text
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec QuickCheck text
-       ];
-       description = "GenValidity support for Text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-text_0_5_1_0" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
      }:
@@ -80808,7 +80968,6 @@ self: {
        ];
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -81023,20 +81182,21 @@ self: {
      }) {};
 
   "geojson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , filepath, hlint, lens, QuickCheck, semigroups, template-haskell
-     , text, transformers, validation, vector
+    ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific
+     , semigroups, tasty, tasty-hspec, tasty-quickcheck, text
+     , transformers, validation, vector
      }:
      mkDerivation {
        pname = "geojson";
-       version = "1.3.1";
-       sha256 = "0qcngx6dszpqrjsbfvqjgdn2qs3vyv112dwva5kbmwfpg5665xml";
+       version = "1.3.3";
+       sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz";
        libraryHaskellDepends = [
-         aeson base lens semigroups text transformers validation vector
+         aeson base lens scientific semigroups text transformers validation
+         vector
        ];
        testHaskellDepends = [
-         base bytestring directory doctest filepath hlint QuickCheck
-         template-haskell
+         aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text
+         validation
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -82372,6 +82532,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcid_0_7_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time, unix
+     }:
+     mkDerivation {
+       pname = "ghcid";
+       version = "0.7.1";
+       sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cmdargs directory extra filepath process time
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time unix
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time unix
+       ];
+       description = "GHCi based bare bones IDE";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-ajax" = callPackage
     ({ mkDerivation, aeson, base, http-types, text }:
      mkDerivation {
@@ -82929,8 +83116,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gst";
-       version = "1.0.15";
-       sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4";
+       version = "1.0.16";
+       sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -83068,6 +83255,41 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk-declarative" = callPackage
+    ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, mtl, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gi-gtk-declarative";
+       version = "0.1.0";
+       sha256 = "1yqvqbhlgbpq5s77fvqi8f644i059gg64xdkgwr4ka6zdz4fhiaf";
+       libraryHaskellDepends = [
+         base gi-gobject gi-gtk haskell-gi haskell-gi-base
+         haskell-gi-overloading mtl text unordered-containers
+       ];
+       description = "Declarative GTK+ programming in Haskell";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "gi-gtk-declarative-app-simple" = callPackage
+    ({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk
+     , gi-gtk-declarative, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, pipes, pipes-concurrency, text
+     }:
+     mkDerivation {
+       pname = "gi-gtk-declarative-app-simple";
+       version = "0.1.0";
+       sha256 = "157xhfixlf545qzk9v4sav6817fdznxk0kwiin59xn9d3ldp71ak";
+       libraryHaskellDepends = [
+         async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
+         haskell-gi haskell-gi-base haskell-gi-overloading pipes
+         pipes-concurrency text
+       ];
+       description = "Declarative GTK+ programming in Haskell in the style of [Pux](https://github.com/alexmingoia/purescript-pux).";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "gi-gtk-hs" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -84472,23 +84694,20 @@ self: {
   "gitlib-libgit2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, directory, exceptions, fast-logger, filepath, gitlib
-     , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
-     , lifted-async, lifted-base, mmorph, monad-control, monad-loops
-     , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
-     , text-icu, time, transformers, transformers-base
+     , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit, mmorph
+     , monad-loops, mtl, resourcet, stm, stm-conduit, tagged
+     , template-haskell, text, text-icu, time, transformers
+     , transformers-base, unliftio, unliftio-core
      }:
      mkDerivation {
        pname = "gitlib-libgit2";
-       version = "3.1.1";
-       sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
-       revision = "1";
-       editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
+       version = "3.1.2";
+       sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
-         exceptions fast-logger filepath gitlib hlibgit2 lifted-async
-         lifted-base mmorph monad-control monad-loops mtl resourcet stm
-         stm-conduit tagged template-haskell text text-icu time transformers
-         transformers-base
+         exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops
+         mtl resourcet stm stm-conduit tagged template-haskell text text-icu
+         time transformers transformers-base unliftio unliftio-core
        ];
        testHaskellDepends = [
          base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
@@ -84544,17 +84763,17 @@ self: {
 
   "gitlib-test" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , exceptions, gitlib, hspec, hspec-expectations, HUnit
-     , monad-control, tagged, text, time, transformers
+     , exceptions, gitlib, hspec, hspec-expectations, HUnit, tagged
+     , text, time, transformers, unliftio-core
      }:
      mkDerivation {
        pname = "gitlib-test";
-       version = "3.1.0.3";
-       sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
+       version = "3.1.1";
+       sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators exceptions gitlib hspec
-         hspec-expectations HUnit monad-control tagged text time
-         transformers
+         hspec-expectations HUnit tagged text time transformers
+         unliftio-core
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
@@ -85053,6 +85272,8 @@ self: {
        pname = "glirc";
        version = "2.28";
        sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
+       revision = "1";
+       editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -85076,8 +85297,8 @@ self: {
      }:
      mkDerivation {
        pname = "gll";
-       version = "0.4.0.11";
-       sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8";
+       version = "0.4.0.12";
+       sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr";
        libraryHaskellDepends = [
          array base containers pretty random-strings regex-applicative text
          time TypeCompose
@@ -85306,6 +85527,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-export" = callPackage
+    ({ mkDerivation, base, GLFW-b, gloss, gloss-rendering, GLUT
+     , JuicyPixels, OpenGLRaw, vector
+     }:
+     mkDerivation {
+       pname = "gloss-export";
+       version = "0.1.0.0";
+       sha256 = "0m5k8zr90wqh6sjgn5c3mrpffwkq8g42qji8ss77l97a2hcv50dq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base GLFW-b gloss-rendering GLUT JuicyPixels OpenGLRaw vector
+       ];
+       executableHaskellDepends = [ base gloss ];
+       testHaskellDepends = [ base ];
+       description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gloss-game" = callPackage
     ({ mkDerivation, base, gloss, gloss-juicy }:
      mkDerivation {
@@ -85322,8 +85562,10 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-juicy";
-       version = "0.2.2";
-       sha256 = "1w1y8aijdf4ba80rq5i2456xh1yyix4wcfagy102xsyvcldlggpv";
+       version = "0.2.3";
+       sha256 = "0px0i6fvicmsgvp7sl7g37y3163s1i2fm5xcq5b1ar9smwv25gq3";
+       revision = "1";
+       editedCabalFile = "09cbz0854v2dsmv24l40rmx4bq7ic436m4xingw93gvw4fawlfqc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85731,8 +85973,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnuplot";
-       version = "0.5.5.2";
-       sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn";
+       version = "0.5.5.3";
+       sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -88117,6 +88359,8 @@ self: {
        pname = "grapefruit-frp";
        version = "0.1.0.7";
        sha256 = "132jd2dxj964paz6dcyb6sx25dkv271rl2fgw05c7zawrrfnrkxs";
+       revision = "1";
+       editedCabalFile = "14qhyvsf7r04fwm1jwl41gdijx0vrqz7lsqy50hmzpcwixr92013";
        libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
@@ -88145,6 +88389,8 @@ self: {
        pname = "grapefruit-ui";
        version = "0.1.0.7";
        sha256 = "1r2wpn982z33s0p6fgdgslgv9ixanb2pysy71j20cfp1xzh13hdj";
+       revision = "1";
+       editedCabalFile = "0s61spgkw2h12g1wks5zxhrzpqqnmmxcw5kbirblyfl4p59pxpns";
        libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
@@ -88163,6 +88409,8 @@ self: {
        pname = "grapefruit-ui-gtk";
        version = "0.1.0.7";
        sha256 = "0ix6dilj3xv2cvihwq8cfykr8i1yq9w1bn86248r5bg5vhfn4g28";
+       revision = "1";
+       editedCabalFile = "0ahjd2sxh12hr8slz6vkc5gn2wr1h9dgq8q3kc9jq5xjzr66cgbk";
        libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk3 transformers
@@ -88862,8 +89110,8 @@ self: {
      }:
      mkDerivation {
        pname = "greenclip";
-       version = "3.1.1";
-       sha256 = "1axh1q7kcvcnhn4rl704i4gcix5yn5v0sb3bdgjk4vgkd7fv8chw";
+       version = "3.2.0";
+       sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89000,6 +89248,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-core_0_1_2_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, doctest
+     , doctest-discover, hashable, hspec, QuickCheck, scientific
+     , semigroups, text, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "greskell-core";
+       version = "0.1.2.3";
+       sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s";
+       libraryHaskellDepends = [
+         aeson base containers hashable scientific semigroups text
+         unordered-containers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover hspec QuickCheck
+         text unordered-containers vector
+       ];
+       description = "Haskell binding for Gremlin graph query language - core data types and tools";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-websocket" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , greskell-core, hashtables, hspec, safe-exceptions, stm, text
@@ -89211,8 +89481,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog";
-       version = "0.8.0.1";
-       sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r";
+       version = "0.9.0";
+       sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control mtl resourcet safe-exceptions scientific
@@ -89273,8 +89543,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-mysql";
-       version = "0.8.0.1";
-       sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r";
+       version = "0.9.0";
+       sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq";
        libraryHaskellDepends = [
          base bytestring containers groundhog monad-control monad-logger
          mysql mysql-simple resource-pool resourcet text time transformers
@@ -89292,8 +89562,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-postgresql";
-       version = "0.8.0.3";
-       sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl";
+       version = "0.9.0";
+       sha256 = "0r756ccnrwzwl6x9fkrvyws8l00sp9jjqlj5n42jkw7nwwx3i8gy";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers groundhog
          monad-control postgresql-libpq postgresql-simple resource-pool
@@ -89311,8 +89581,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-sqlite";
-       version = "0.8.0.1";
-       sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp";
+       version = "0.9.0";
+       sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb";
        libraryHaskellDepends = [
          base bytestring containers direct-sqlite groundhog monad-control
          resource-pool resourcet text transformers unordered-containers
@@ -89328,8 +89598,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.8.0.2";
-       sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596";
+       version = "0.9.0";
+       sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay";
        libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
@@ -89463,6 +89733,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "grpc-api-etcd" = callPackage
+    ({ mkDerivation, base, proto-lens, proto-lens-protoc }:
+     mkDerivation {
+       pname = "grpc-api-etcd";
+       version = "0.1.0.1";
+       sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf";
+       libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       description = "Generated messages and instances for etcd gRPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "grpc-etcd-client" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class
+     , grpc-api-etcd, http2-client, http2-client-grpc, lens, network
+     , proto-lens, proto-lens-protoc
+     }:
+     mkDerivation {
+       pname = "grpc-etcd-client";
+       version = "0.1.1.0";
+       sha256 = "01x5463h4xc04k3rax10zz7safa65g331jb9ksikjyrbk11rlpl1";
+       libraryHaskellDepends = [
+         base bytestring data-default-class grpc-api-etcd http2-client
+         http2-client-grpc lens network proto-lens proto-lens-protoc
+       ];
+       description = "gRPC client for etcd";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gruff" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel
@@ -89688,6 +89986,25 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
+  "gtk_0_15_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+     , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
+     }:
+     mkDerivation {
+       pname = "gtk";
+       version = "0.15.0";
+       sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k";
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+       libraryHaskellDepends = [
+         array base bytestring cairo containers gio glib mtl pango text
+       ];
+       libraryPkgconfigDepends = [ gtk2 ];
+       description = "Binding to the Gtk+ graphical user interface library";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk2 = pkgs.gnome2.gtk;};
+
   "gtk-helpers" = callPackage
     ({ mkDerivation, array, base, gio, glib, gtk, mtl, process
      , template-haskell
@@ -90021,6 +90338,27 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
 
+  "gtk3_0_15_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+     , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
+     }:
+     mkDerivation {
+       pname = "gtk3";
+       version = "0.15.0";
+       sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+       libraryHaskellDepends = [
+         array base bytestring cairo containers gio glib mtl pango text
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "Binding to the Gtk+ 3 graphical user interface library";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gtk3;};
+
   "gtk3-mac-integration" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, glib
      , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
@@ -92020,8 +92358,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.11.2";
-       sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx";
+       version = "1.12.0";
+       sha256 = "0i3d3kydbna29wvaahwg9mkhykzrbnk6lg62mcbak78z24l1zmzl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92649,8 +92987,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll-dir-list";
-       version = "1.0.0.2";
-       sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76";
+       version = "1.0.0.4";
+       sha256 = "0n7cfamaan0yyrpdfqmjbbgv7cg172hp4zs16zf52l90xdq253h9";
        libraryHaskellDepends = [
          base containers data-default filepath hakyll
        ];
@@ -93396,34 +93734,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.9";
-       sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha";
-       revision = "2";
-       editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_10" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -93447,7 +93757,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -95913,7 +96222,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_7_0_0" = callPackage
+  "haskell-lsp_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
      , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95921,10 +96230,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.7.0.0";
-       sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv";
-       revision = "1";
-       editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln";
+       version = "0.8.0.0";
+       sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95983,15 +96290,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_7_0_0" = callPackage
+  "haskell-lsp-types_0_8_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.7.0.0";
-       sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb";
+       version = "0.8.0.0";
+       sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri scientific text unordered-containers
@@ -98292,8 +98599,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "1.0.2";
-       sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+       version = "1.0.2.1";
+       sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98349,6 +98656,8 @@ self: {
        pname = "hasql";
        version = "1.3.0.3";
        sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
+       revision = "2";
+       editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist
@@ -99057,6 +99366,8 @@ self: {
        pname = "haxl";
        version = "2.0.1.0";
        sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
+       revision = "1";
+       editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99964,6 +100275,8 @@ self: {
        pname = "hdirect";
        version = "0.21.0";
        sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
+       revision = "1";
+       editedCabalFile = "19h5zsxl8knbvkbyv7z0an5hdibi2xslbva5cmck9h5wgc9m874n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base haskell98 pretty ];
@@ -100205,6 +100518,58 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heatitup" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-show, cassava, colour
+     , containers, diagrams-core, diagrams-html5, diagrams-lib
+     , diagrams-pgf, diagrams-rasterific, diagrams-svg, edit-distance
+     , fasta, lens, optparse-applicative, pipes, pipes-bytestring
+     , pipes-csv, safe, string-similarity, stringsearch, suffixtree
+     , vector
+     }:
+     mkDerivation {
+       pname = "heatitup";
+       version = "0.5.3.3";
+       sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bytestring-show cassava colour containers
+         diagrams-lib edit-distance fasta lens pipes pipes-bytestring
+         pipes-csv safe string-similarity stringsearch suffixtree vector
+       ];
+       executableHaskellDepends = [
+         base bytestring colour containers diagrams-core diagrams-html5
+         diagrams-lib diagrams-pgf diagrams-rasterific diagrams-svg fasta
+         lens optparse-applicative pipes pipes-bytestring pipes-csv safe
+         vector
+       ];
+       description = "Find and annotate ITDs";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "heatitup-complete" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, fasta
+     , foldl, lens, optparse-applicative, pipes, pipes-text, safe, text
+     , text-show, turtle, vector
+     }:
+     mkDerivation {
+       pname = "heatitup-complete";
+       version = "0.5.3.3";
+       sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cassava containers fasta foldl lens safe text
+         text-show turtle vector
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers fasta foldl optparse-applicative
+         pipes pipes-text safe text turtle vector
+       ];
+       description = "Find and annotate ITDs with assembly or read pair joining";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "heatshrink" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty
      , tasty-golden, tasty-hunit, text
@@ -100452,31 +100817,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, slave-thread, stm, test-framework
-     , test-framework-hunit, text, time, tls, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.10.3";
-       sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq errors HTTP mtl
-         network network-uri resource-pool scanner stm text time tls
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl slave-thread stm
-         test-framework test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_10_4" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -100499,7 +100839,6 @@ self: {
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -101980,10 +102319,8 @@ self: {
      }:
      mkDerivation {
        pname = "hformat";
-       version = "0.3.3.0";
-       sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j";
-       revision = "1";
-       editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i";
+       version = "0.3.3.1";
+       sha256 = "0wx7qlhdzd8rl2d351hvxzwlyz9yxza625fklp2p66x7khfxlbih";
        libraryHaskellDepends = [
          ansi-terminal base base-unicode-symbols text
        ];
@@ -102243,18 +102580,18 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart
      , Chart-cairo, Chart-diagrams, colour, composition-prelude
      , data-binary-ieee754, data-default, directory, filepath, hspec
-     , lens, monad-loops
+     , lens, monad-loops, spherical
      }:
      mkDerivation {
        pname = "hgis";
-       version = "1.0.0.2";
-       sha256 = "1z730c48pvi6ylb0pjzx2x9jnd03aadpmsx3psrlf2vp0bvm6ims";
+       version = "1.0.0.3";
+       sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring Chart Chart-cairo
          Chart-diagrams colour composition-prelude data-binary-ieee754
-         data-default directory filepath lens monad-loops
+         data-default directory filepath lens monad-loops spherical
        ];
-       testHaskellDepends = [ base hspec ];
+       testHaskellDepends = [ base hspec spherical ];
        doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -106162,8 +106499,8 @@ self: {
        pname = "hookup";
        version = "0.2.2";
        sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
-       revision = "1";
-       editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
+       revision = "2";
+       editedCabalFile = "12x7h7yg0x9gqv9yj2snp3k221yzyphm1l7aixkz1szxp1pndfgy";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
@@ -106392,8 +106729,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.5.1";
-       sha256 = "1hnaxv3vg46a9iqszi3dfjj5kd3gqiagrxz28hi2wvvcpc8zpadn";
+       version = "0.5.2";
+       sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -106665,25 +107002,6 @@ self: {
      }) {};
 
   "hourglass" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
-     , tasty, tasty-hunit, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "hourglass";
-       version = "0.2.11";
-       sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring deepseq gauge mtl old-locale time
-       ];
-       description = "simple performant time related library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hourglass_0_2_12" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
      , tasty, tasty-hunit, tasty-quickcheck, time
      }:
@@ -106700,7 +107018,6 @@ self: {
        ];
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -106909,7 +107226,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_29_7" = callPackage
+  "hpack_0_30_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, infer-license
@@ -106919,8 +107236,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.29.7";
-       sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9";
+       version = "0.30.0";
+       sha256 = "042lsw0pm5ljfd9vap0r1a8xcvfzyswp5rd495v0grdhxmpbqkyx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107726,8 +108043,8 @@ self: {
      }:
      mkDerivation {
        pname = "hriemann";
-       version = "0.3.3.0";
-       sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25";
+       version = "0.3.3.1";
+       sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108016,17 +108333,6 @@ self: {
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "hs-functors";
-       version = "0.1.2.0";
-       sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7";
-       libraryHaskellDepends = [ base transformers ];
-       description = "Functors from products of Haskell and its dual to Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hs-functors_0_1_3_0" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "hs-functors";
@@ -108035,7 +108341,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gchart" = callPackage
@@ -110336,6 +110641,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_5_6" = callPackage
+    ({ mkDerivation, base, hspec-core, hspec-discover
+     , hspec-expectations, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.5.6";
+       sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations QuickCheck
+       ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -110388,6 +110709,8 @@ self: {
        pname = "hspec-core";
        version = "2.4.8";
        sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4";
+       revision = "1";
+       editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack deepseq directory filepath
          hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm
@@ -110415,6 +110738,8 @@ self: {
        pname = "hspec-core";
        version = "2.5.5";
        sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+       revision = "1";
+       editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -110431,6 +110756,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_5_6" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.5.6";
+       sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testToolDepends = [ hspec-meta ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -110486,6 +110839,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_5_6" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.5.6";
+       sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       testToolDepends = [ hspec-meta ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -110662,6 +111035,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-leancheck" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }:
+     mkDerivation {
+       pname = "hspec-leancheck";
+       version = "0.0.2";
+       sha256 = "1780xhwmbvkhca3l6rckbnr92f7i3icarwprdcfnrrdpk4yq9ml8";
+       libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ];
+       testHaskellDepends = [ base hspec leancheck ];
+       description = "LeanCheck support for the Hspec test framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-megaparsec" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
@@ -110678,14 +111063,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-megaparsec_1_1_0" = callPackage
+  "hspec-megaparsec_2_0_0" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
      mkDerivation {
        pname = "hspec-megaparsec";
-       version = "1.1.0";
-       sha256 = "1929fnpys1j7nja1c3limyl6f259gky9dpf98xyyx0pi663qdmf1";
+       version = "2.0.0";
+       sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8";
        libraryHaskellDepends = [
          base containers hspec-expectations megaparsec
        ];
@@ -110720,6 +111105,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-meta_2_5_6" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, HUnit
+     , QuickCheck, quickcheck-io, random, setenv, stm, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec-meta";
+       version = "2.5.6";
+       sha256 = "196dyacvh7liq49ccwd5q0dw6n74igrvhk35zm95i3y8m44ky3a4";
+       revision = "1";
+       editedCabalFile = "0c7dq1vvk09fj6nljwwshgpkszg725hrpgnq9l2aka230sig9vz4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm time transformers
+       ];
+       executableHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm time transformers
+       ];
+       description = "A version of Hspec which is used to test Hspec itself";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-monad-control" = callPackage
     ({ mkDerivation, base, hspec-core, monad-control, transformers
      , transformers-base
@@ -111975,8 +112389,8 @@ self: {
      }:
      mkDerivation {
        pname = "htirage";
-       version = "1.20170804";
-       sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p";
+       version = "2.1.0.20180829";
+       sha256 = "1r0p1xsc7gg9d089z7d60qdfcaxahrzd9z951mr7jrqdi7b2fi3f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck text transformers
@@ -112322,20 +112736,20 @@ self: {
 
   "htoml-megaparsec" = callPackage
     ({ mkDerivation, aeson, base, bytestring, composition-prelude
-     , containers, criterion, deepseq, file-embed, hspec, megaparsec
-     , mtl, tasty, tasty-hspec, tasty-hunit, text, time
-     , unordered-containers, vector
+     , containers, criterion, deepseq, file-embed, megaparsec, mtl
+     , tasty, tasty-hspec, tasty-hunit, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "2.0.0.2";
-       sha256 = "1z0p35l2rjclxkmbvwg6fcfx50ibfd6v7gia5wbnkbgh3cwyp19d";
+       version = "2.1.0.2";
+       sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec megaparsec tasty
+         aeson base bytestring containers file-embed megaparsec tasty
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base criterion text ];
@@ -112457,6 +112871,8 @@ self: {
        pname = "http-api-data";
        version = "0.3.8.1";
        sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf";
+       revision = "1";
+       editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base bytestring containers hashable
@@ -113037,8 +113453,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-monad";
-       version = "0.1.1.2";
-       sha256 = "0s2ajy2iwi7k5zrs6asp5ncyy06jnphp4ncc130cg2kpnf32yyfz";
+       version = "0.1.1.3";
+       sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113407,17 +113823,18 @@ self: {
      }) {};
 
   "http2-client-grpc" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-default-class
-     , http2, http2-client, http2-grpc-types, proto-lens
-     , proto-lens-protoc, text, zlib
+    ({ mkDerivation, async, base, binary, bytestring, case-insensitive
+     , data-default-class, http2, http2-client, http2-grpc-types, lens
+     , proto-lens, proto-lens-protoc, text, tls, zlib
      }:
      mkDerivation {
        pname = "http2-client-grpc";
-       version = "0.2.0.0";
-       sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z";
+       version = "0.5.0.1";
+       sha256 = "0kjzl1a3fis2jzk18ad9kv1bnzplqshf7i2mg20w8jxvl952v494";
        libraryHaskellDepends = [
-         base binary bytestring data-default-class http2 http2-client
-         http2-grpc-types proto-lens proto-lens-protoc text zlib
+         async base binary bytestring case-insensitive data-default-class
+         http2 http2-client http2-grpc-types lens proto-lens
+         proto-lens-protoc text tls zlib
        ];
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
@@ -113426,12 +113843,18 @@ self: {
      }) {};
 
   "http2-grpc-types" = callPackage
-    ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }:
+    ({ mkDerivation, base, binary, bytestring, case-insensitive
+     , proto-lens, zlib
+     }:
      mkDerivation {
        pname = "http2-grpc-types";
-       version = "0.1.0.0";
-       sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl";
-       libraryHaskellDepends = [ base binary bytestring proto-lens zlib ];
+       version = "0.3.0.0";
+       sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5";
+       revision = "1";
+       editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b";
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive proto-lens zlib
+       ];
        description = "Types for gRPC over HTTP2 common for client and servers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114637,8 +115060,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.9";
-       sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d";
+       version = "0.6.2.14";
+       sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala";
        libraryHaskellDepends = [
          base bytestring mmap semigroups transformers vector
        ];
@@ -114653,15 +115076,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_2_13" = callPackage
+  "hw-prim_0_6_2_15" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
      , transformers, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.2.13";
-       sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb";
+       version = "0.6.2.15";
+       sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc";
        libraryHaskellDepends = [
          base bytestring mmap semigroups transformers vector
        ];
@@ -114795,8 +115218,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-simd";
-       version = "0.1.1.1";
-       sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
+       version = "0.1.1.2";
+       sha256 = "0jcd6clhcqdmkcvhvf68xldgmx4n1wp333438ypbwk2mwp1q559l";
        libraryHaskellDepends = [
          base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
          hw-rankselect-base vector
@@ -118355,6 +118778,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "influxdb_1_6_0_8" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, clock, containers, doctest, foldl, http-client
+     , http-types, lens, network, optional-args, QuickCheck, scientific
+     , tagged, template-haskell, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "influxdb";
+       version = "1.6.0.8";
+       sha256 = "1y2xgridlwmgmhvlchpjlpr8w17qscx6ng9hfara5qshll70vp5m";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific tagged text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       description = "Haskell client library for InfluxDB";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "informative" = callPackage
     ({ mkDerivation, base, containers, csv, highlighting-kate
      , http-conduit, monad-logger, pandoc, persistent
@@ -119309,8 +119757,8 @@ self: {
     ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
      mkDerivation {
        pname = "interpolation";
-       version = "0.1.0.2";
-       sha256 = "1qjh0jx6xx1x80diay8q18basfwkrsm9x0yrqd27ig2mi9drp0qq";
+       version = "0.1.0.3";
+       sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
@@ -119461,6 +119909,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "intro_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, dlist
+     , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
+     , unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.5.0.0";
+       sha256 = "0s2xn72d2am24mql3nznrimj308lvzdr44jccm14zx7qq7wpbqr3";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq dlist extra hashable mtl safe
+         text transformers unordered-containers writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq dlist extra hashable lens mtl
+         QuickCheck safe text transformers unordered-containers
+         writer-cps-mtl
+       ];
+       description = "Safe and minimal prelude - Exports only total and safe functions, provides Text and Monad transformers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intro-prelude" = callPackage
     ({ mkDerivation, intro }:
      mkDerivation {
@@ -121389,8 +121860,8 @@ self: {
      }:
      mkDerivation {
        pname = "jack";
-       version = "0.7.1.3";
-       sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c";
+       version = "0.7.1.4";
+       sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122114,8 +122585,8 @@ self: {
     ({ mkDerivation, base, haskeline, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.4.0.0";
-       sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2";
+       version = "0.4.2.0";
+       sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -122936,26 +123407,6 @@ self: {
      }) {};
 
   "json-rpc-generic" = callPackage
-    ({ mkDerivation, aeson, aeson-generic-compat, base, containers
-     , dlist, QuickCheck, quickcheck-simple, scientific, text
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-rpc-generic";
-       version = "0.2.1.4";
-       sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
-       libraryHaskellDepends = [
-         aeson aeson-generic-compat base containers dlist scientific text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base QuickCheck quickcheck-simple text
-       ];
-       description = "Generic encoder and decode for JSON-RPC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json-rpc-generic_0_2_1_5" = callPackage
     ({ mkDerivation, aeson, aeson-generic-compat, base, containers
      , dlist, QuickCheck, quickcheck-simple, scientific, text
      , transformers, unordered-containers, vector
@@ -122973,7 +123424,6 @@ self: {
        ];
        description = "Generic encoder and decode for JSON-RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-server" = callPackage
@@ -123768,6 +124218,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kafka" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "kafka";
+       version = "0.0.0.0";
+       sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
+       doHaddock = false;
+       description = "TBA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kafka-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
      , hspec-discover, network, QuickCheck, snappy, time, zlib
@@ -126680,8 +127141,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.7.1";
-       sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp";
+       version = "0.8.0";
+       sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax";
        libraryHaskellDepends = [ base parsec pretty transformers ];
        testHaskellDepends = [
          base parsec process QuickCheck tasty tasty-expected-failure
@@ -127022,10 +127483,10 @@ self: {
      }:
      mkDerivation {
        pname = "language-glsl";
-       version = "0.2.1";
-       sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0";
+       version = "0.3.0";
+       sha256 = "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1";
        revision = "1";
-       editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v";
+       editedCabalFile = "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec prettyclass ];
@@ -127430,8 +127891,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.20";
-       sha256 = "074k9lk7wqspbn193qa78f1nabv0s27dza9qh7qzni4v95zz5k4r";
+       version = "1.3.20.1";
+       sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127461,22 +127922,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-puppet_1_3_20_1" = callPackage
+  "language-puppet_1_4_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, exceptions, filecache, filepath
      , formatting, Glob, hashable, hruby, hslogger, hspec
      , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
      , megaparsec, memory, mtl, operational, optparse-applicative
-     , parallel-io, parsec, pcre-utils, process, protolude, random
-     , regex-pcre-builtin, scientific, servant, servant-client, split
-     , stm, strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
+     , parallel-io, parsec, parser-combinators, pcre-utils, process
+     , protolude, random, regex-pcre-builtin, scientific, servant
+     , servant-client, split, stm, strict-base-types, temporary, text
+     , time, transformers, unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.20.1";
-       sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
+       version = "1.4.0";
+       sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127485,10 +127946,10 @@ self: {
          case-insensitive containers cryptonite directory exceptions
          filecache filepath formatting hashable hruby hslogger hspec
          http-api-data http-client lens lens-aeson megaparsec memory mtl
-         operational parsec pcre-utils process protolude random
-         regex-pcre-builtin scientific servant servant-client split stm
-         strict-base-types text time transformers unix unordered-containers
-         vector yaml
+         operational parsec parser-combinators pcre-utils process protolude
+         random regex-pcre-builtin scientific servant servant-client split
+         stm strict-base-types text time transformers unix
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring containers Glob hslogger
@@ -127798,8 +128259,8 @@ self: {
      }:
      mkDerivation {
        pname = "lapack-ffi-tools";
-       version = "0.1.0.1";
-       sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w";
+       version = "0.1.1";
+       sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -127912,8 +128373,8 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "latex";
-       version = "0.1.0.3";
-       sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
+       version = "0.1.0.4";
+       sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw";
        libraryHaskellDepends = [ base containers utility-ht ];
        description = "Parse, format and process LaTeX files";
        license = stdenv.lib.licenses.bsd3;
@@ -128529,20 +128990,20 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.7.1";
-       sha256 = "184z6n86jg5vmd5f02qzg62hm14snrk5d9knsf72gayyj4fla1kh";
+       version = "0.7.3";
+       sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
-       description = "Cholesterol-free property-based testing";
+       description = "Enumerative property-based testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "leancheck_0_7_3" = callPackage
+  "leancheck_0_7_4" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.7.3";
-       sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
+       version = "0.7.4";
+       sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
@@ -128616,6 +129077,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "learn-physics_0_6_3" = callPackage
+    ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss
+     , spatial-math, vector-space
+     }:
+     mkDerivation {
+       pname = "learn-physics";
+       version = "0.6.3";
+       sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base gloss gnuplot hmatrix not-gloss spatial-math vector-space
+       ];
+       executableHaskellDepends = [
+         base gloss gnuplot not-gloss spatial-math
+       ];
+       description = "Haskell code for learning physics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "learn-physics-examples" = callPackage
     ({ mkDerivation, base, gloss, gnuplot, learn-physics, not-gloss
      , spatial-math
@@ -129063,11 +129545,25 @@ self: {
        pname = "lens-labels";
        version = "0.2.0.1";
        sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
+       revision = "1";
+       editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_3_0_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.3.0.0";
+       sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn";
+       libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-misc" = callPackage
     ({ mkDerivation, base, lens, tagged, template-haskell }:
      mkDerivation {
@@ -129114,8 +129610,8 @@ self: {
        pname = "lens-properties";
        version = "4.11.1";
        sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
-       revision = "1";
-       editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i";
+       revision = "2";
+       editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482";
        libraryHaskellDepends = [ base lens QuickCheck transformers ];
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
@@ -130928,22 +131424,22 @@ self: {
   "linear-code" = callPackage
     ({ mkDerivation, base, containers, data-default
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths
-     , matrix, QuickCheck, random, random-shuffle, smallcheck, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     , matrix-static, QuickCheck, random, random-shuffle, smallcheck
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "linear-code";
-       version = "0.1.1";
-       sha256 = "0dyz7j6y6ayxd2367pkrln78zr2hx1bygswsy840hjf4xhm30a1b";
+       version = "0.2.0";
+       sha256 = "14d4gmpqx9x9acaldml7hf64fbpdrncn5akgid1scnqv1jzc9197";
        libraryHaskellDepends = [
          base containers data-default ghc-typelits-knownnat
-         ghc-typelits-natnormalise HaskellForMaths matrix random
+         ghc-typelits-natnormalise HaskellForMaths matrix-static random
          random-shuffle
        ];
        testHaskellDepends = [
          base containers data-default ghc-typelits-knownnat
-         ghc-typelits-natnormalise HaskellForMaths matrix QuickCheck random
-         random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
+         ghc-typelits-natnormalise HaskellForMaths matrix-static QuickCheck
+         random random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
@@ -131910,10 +132406,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "list-zip-def";
-       version = "0.1.0.1";
-       sha256 = "07fasgp9vagsqaaikrn38hxf7dbpfrjcrp97dn72pss7adz7yi6h";
+       version = "0.1.0.2";
+       sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89";
        libraryHaskellDepends = [ base ];
-       description = "Provides zips where the combining doesn't stop premature, but instead uses default values";
+       description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -132275,8 +132771,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-ffi-tools";
-       version = "0.0";
-       sha256 = "18lfa6fzpcxp6j95wbi5axm58ipzwn98rx3d1c54zdkjhzrl507x";
+       version = "0.0.0.1";
+       sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -132509,8 +133005,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "3.1.1";
-       sha256 = "0mhlz1jv81rl353qp0vbm39qz15yms9n0xlb0s27jj88yf66zks1";
+       version = "3.1.1.1";
+       sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133433,6 +133929,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "loglevel" = callPackage
+    ({ mkDerivation, base, deepseq, text }:
+     mkDerivation {
+       pname = "loglevel";
+       version = "0.1.0.0";
+       sha256 = "12hck2fb7xdk905428yd1a8dnm1hw1apkhw6fr7zqyxzhfqqm1yz";
+       libraryHaskellDepends = [ base deepseq text ];
+       testHaskellDepends = [ base text ];
+       description = "Log Level Datatype";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "logplex-parse" = callPackage
     ({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }:
      mkDerivation {
@@ -134037,8 +134545,8 @@ self: {
        pname = "lrucaching";
        version = "0.3.3";
        sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
-       revision = "3";
-       editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb";
+       revision = "4";
+       editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9";
        libraryHaskellDepends = [
          base base-compat deepseq hashable psqueues vector
        ];
@@ -134095,8 +134603,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.2.1.0";
-       sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
+       version = "0.4.0.0";
+       sha256 = "0kiddzb7lwwdf96jz4ghvjnwr2hf9jiv8vjjlxwm76k3ab4wx09c";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -135136,8 +135644,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "4.0.2.12";
-       sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9";
+       version = "4.0.2.13";
+       sha256 = "10a7q64dm9vw2a3qzvixlg0632l5h8j6xj9ga3w430fxch618f26";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -135998,18 +136506,18 @@ self: {
   "mandrill" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
-     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
-     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers
+     , http-client-tls, http-types, microlens-th, mtl, old-locale
+     , QuickCheck, raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, unordered-containers
      }:
      mkDerivation {
        pname = "mandrill";
-       version = "0.5.3.4";
-       sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
+       version = "0.5.3.5";
+       sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring containers
-         email-validate http-client http-client-tls http-types lens mtl
-         old-locale QuickCheck text time unordered-containers
+         email-validate http-client http-client-tls http-types microlens-th
+         mtl old-locale QuickCheck text time unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
@@ -136765,15 +137273,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "math-functions_0_3_0_1" = callPackage
+  "math-functions_0_3_0_2" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
      , primitive, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "math-functions";
-       version = "0.3.0.1";
-       sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
+       version = "0.3.0.2";
+       sha256 = "094kf3261b3m07r6gyf63s0pnhw5v0z1q5pzfskl4y8fdjvsp4kb";
        libraryHaskellDepends = [
          base data-default-class deepseq primitive vector vector-th-unbox
        ];
@@ -136783,7 +137291,7 @@ self: {
          vector vector-th-unbox
        ];
        description = "Collection of tools for numeric computations";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -137032,6 +137540,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix-static" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, matrix, semigroups, tasty, tasty-hunit
+     , vector
+     }:
+     mkDerivation {
+       pname = "matrix-static";
+       version = "0.1";
+       sha256 = "0l4p0ahlpgf39wjwrvr6ibxpj5b6kmyn2li6yjbddi0af137ii4q";
+       libraryHaskellDepends = [
+         base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+         semigroups vector
+       ];
+       testHaskellDepends = [
+         base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+         semigroups tasty tasty-hunit vector
+       ];
+       description = "Wrapper around matrix that adds matrix sizes to the type-level";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matsuri" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, MissingH
      , mtl, network, old-locale, split, time, vty, vty-ui, XMPP
@@ -137885,8 +138414,8 @@ self: {
        pname = "megaparsec";
        version = "6.5.0";
        sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
-       revision = "3";
-       editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h";
+       revision = "4";
+       editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -137901,6 +138430,33 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "megaparsec_7_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , criterion, deepseq, hspec, hspec-expectations, mtl
+     , parser-combinators, QuickCheck, scientific, text, transformers
+     , weigh
+     }:
+     mkDerivation {
+       pname = "megaparsec";
+       version = "7.0.0";
+       sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers deepseq mtl
+         parser-combinators scientific text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers hspec
+         hspec-expectations mtl parser-combinators QuickCheck scientific
+         text transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq text weigh
+       ];
+       description = "Monadic parser combinators";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "meldable-heap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -138917,21 +139473,6 @@ self: {
      }) {};
 
   "microlens-ghc" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, microlens
-     , transformers
-     }:
-     mkDerivation {
-       pname = "microlens-ghc";
-       version = "0.4.9";
-       sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
-       libraryHaskellDepends = [
-         array base bytestring containers microlens transformers
-       ];
-       description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-ghc_0_4_9_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, microlens
      , transformers
      }:
@@ -138944,7 +139485,6 @@ self: {
        ];
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
@@ -138979,23 +139519,6 @@ self: {
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell
-     , th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "microlens-th";
-       version = "0.4.2.1";
-       sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
-       libraryHaskellDepends = [
-         base containers microlens template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base microlens ];
-       description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-th_0_4_2_2" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
@@ -139010,7 +139533,6 @@ self: {
        testHaskellDepends = [ base microlens ];
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micrologger" = callPackage
@@ -139192,8 +139714,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-music-box";
-       version = "0.0.0.4";
-       sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p";
+       version = "0.0.0.5";
+       sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -140400,6 +140922,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "modern-uri_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , criterion, deepseq, exceptions, hspec, hspec-discover
+     , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+     , reflection, tagged, template-haskell, text, weigh
+     }:
+     mkDerivation {
+       pname = "modern-uri";
+       version = "0.3.0.0";
+       sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant deepseq exceptions
+         megaparsec mtl profunctors QuickCheck reflection tagged
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq megaparsec text weigh
+       ];
+       description = "Modern library for working with URIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modify-fasta" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -140602,8 +141151,8 @@ self: {
      }:
      mkDerivation {
        pname = "mohws";
-       version = "0.2.1.5";
-       sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9";
+       version = "0.2.1.6";
+       sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -141221,15 +141770,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monad-memo_0_5_0" = callPackage
+  "monad-memo_0_5_1" = callPackage
     ({ mkDerivation, array, base, containers, criterion, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
      , transformers, vector
      }:
      mkDerivation {
        pname = "monad-memo";
-       version = "0.5.0";
-       sha256 = "1ax1myhgnpy7gyb7pxn98424mda317zvji47bdwj2h58rpldqhjm";
+       version = "0.5.1";
+       sha256 = "1zsvp0g2kzjf5zkv1js65jfc1p3yrkr95csp2ljpqx857qy4lnn6";
        libraryHaskellDepends = [
          array base containers primitive transformers vector
        ];
@@ -141966,6 +142515,8 @@ self: {
        pname = "monadplus";
        version = "1.4.2";
        sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
+       revision = "1";
+       editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp";
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
@@ -142053,8 +142604,8 @@ self: {
     ({ mkDerivation, base, bindings-monetdb-mapi }:
      mkDerivation {
        pname = "monetdb-mapi";
-       version = "0.1.0.0";
-       sha256 = "0v7709zvx2q07zymdk2hi4nwaby4a5i02qgs97l5f9s4nwwb5qmr";
+       version = "0.1.0.1";
+       sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0";
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
@@ -146841,16 +147392,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "network_2_7_0_2" = callPackage
+  "network_2_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
      , unix
      }:
      mkDerivation {
        pname = "network";
-       version = "2.7.0.2";
-       sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf";
-       revision = "2";
-       editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w";
+       version = "2.8.0.0";
+       sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring directory doctest hspec HUnit
@@ -148091,6 +148640,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {nfc = null;};
 
+  "ngram" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, cereal-text, containers
+     , optparse-generic, text, zlib
+     }:
+     mkDerivation {
+       pname = "ngram";
+       version = "0.1.0.0";
+       sha256 = "0qk5wgkr69jd9gdy524nsx6r9ss328ynq65k6wn5k7pjkmnfym26";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cereal cereal-text containers text
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal cereal-text containers optparse-generic text
+         zlib
+       ];
+       description = "Ngram models for compressing and classifying text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ngrams-loader" = callPackage
     ({ mkDerivation, attoparsec, base, machines, mtl, parseargs
      , resourcet, sqlite-simple, text
@@ -148864,12 +149434,12 @@ self: {
      }) {};
 
   "non-empty-containers" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
        pname = "non-empty-containers";
-       version = "0.1.1.0";
-       sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc";
-       libraryHaskellDepends = [ base containers ];
+       version = "0.1.2.0";
+       sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii";
+       libraryHaskellDepends = [ base containers semigroupoids ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -149231,6 +149801,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nowdoc" = callPackage
+    ({ mkDerivation, base, bytestring, template-haskell }:
+     mkDerivation {
+       pname = "nowdoc";
+       version = "0.1.1.0";
+       sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg";
+       libraryHaskellDepends = [ base bytestring template-haskell ];
+       testHaskellDepends = [ base bytestring template-haskell ];
+       description = "Here document without variable expansion like PHP Nowdoc";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "np-extras" = callPackage
     ({ mkDerivation, base, containers, numeric-prelude, primes }:
      mkDerivation {
@@ -149406,6 +149988,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ntype" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ntype";
+       version = "0.1.0.0";
+       sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd";
+       libraryHaskellDepends = [ base ];
+       description = "N-ary sum/product types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "null-canvas" = callPackage
     ({ mkDerivation, aeson, base, containers, filepath, scotty, split
      , stm, text, transformers, wai-extra, warp
@@ -149632,8 +150225,8 @@ self: {
      }:
      mkDerivation {
        pname = "numeric-prelude";
-       version = "0.4.3";
-       sha256 = "0bc937gblm8rz68fr3q2ms19hqjwi20wkmn1k1c0b675c2kgky5q";
+       version = "0.4.3.1";
+       sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150334,8 +150927,8 @@ self: {
      }:
      mkDerivation {
        pname = "ochintin-daicho";
-       version = "0.3.1.1";
-       sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln";
+       version = "0.3.4.2";
+       sha256 = "0k7k4rj3356n9d8waw5sjiq97w9wbrhq3bwqr0hr3zh2h5imy5sy";
        libraryHaskellDepends = [
          base bookkeeping mono-traversable text transaction
        ];
@@ -151390,23 +151983,6 @@ self: {
      }) {};
 
   "openexr-write" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
-     , deepseq, directory, hspec, split, vector, vector-split, zlib
-     }:
-     mkDerivation {
-       pname = "openexr-write";
-       version = "0.1.0.1";
-       sha256 = "0f45jgj08fmrj30f167xldapm5lqma4yy95y9mjx6appb7cg5qvd";
-       libraryHaskellDepends = [
-         base binary bytestring data-binary-ieee754 deepseq split vector
-         vector-split zlib
-       ];
-       testHaskellDepends = [ base bytestring directory hspec vector ];
-       description = "Library for writing images in OpenEXR HDR file format";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "openexr-write_0_1_0_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , deepseq, directory, hspec, split, vector, vector-split, zlib
      }:
@@ -151421,7 +151997,6 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec vector ];
        description = "Library for writing images in OpenEXR HDR file format";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openflow" = callPackage
@@ -151901,14 +152476,16 @@ self: {
   "opentok" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-compat, base
      , base-compat, base64-string, bytestring, containers, convertible
-     , either, hscolour, http-client, http-client-tls, http-conduit
-     , http-types, iproute, jose, lens, monad-time, SHA, strings, text
-     , time, transformers, unordered-containers, utf8-string, uuid
+     , either, hscolour, hspec, http-client, http-client-tls
+     , http-conduit, http-types, iproute, jose, lens, monad-time
+     , QuickCheck, quickcheck-instances, SHA, split, strings, tasty
+     , tasty-hspec, tasty-quickcheck, text, time, transformers
+     , unordered-containers, utf8-string, uuid
      }:
      mkDerivation {
        pname = "opentok";
-       version = "0.0.4";
-       sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j";
+       version = "0.0.5";
+       sha256 = "1jcqsa9p1794hgf5ywq605i4rb85dm5qpvznn4n3s4y8d409k6wq";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-compat base base-compat base64-string
          bytestring containers convertible either hscolour http-client
@@ -151916,6 +152493,14 @@ self: {
          monad-time SHA strings text time transformers unordered-containers
          utf8-string uuid
        ];
+       testHaskellDepends = [
+         aeson aeson-casing aeson-compat base base-compat base64-string
+         bytestring containers convertible either hspec http-client
+         http-client-tls http-conduit http-types iproute jose lens
+         monad-time QuickCheck quickcheck-instances SHA split strings tasty
+         tasty-hspec tasty-quickcheck text time transformers
+         unordered-containers utf8-string uuid
+       ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -152094,8 +152679,8 @@ self: {
      }:
      mkDerivation {
        pname = "optima";
-       version = "0.3.0.1";
-       sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85";
+       version = "0.3.0.2";
+       sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg";
        libraryHaskellDepends = [
          attoparsec attoparsec-data base optparse-applicative text
          text-builder
@@ -153531,6 +154116,8 @@ self: {
        pname = "pandoc-citeproc";
        version = "0.14.3.1";
        sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
+       revision = "1";
+       editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -154090,6 +154677,8 @@ self: {
        pname = "papa-bifunctors-export";
        version = "0.3.1";
        sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0";
+       revision = "1";
+       editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m";
        libraryHaskellDepends = [ base bifunctors ];
        description = "export useful functions from `bifunctors`";
        license = stdenv.lib.licenses.bsd3;
@@ -154713,6 +155302,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "paripari" = callPackage
+    ({ mkDerivation, base, bytestring, parser-combinators, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "paripari";
+       version = "0.2.0.0";
+       sha256 = "0lg1bywgy4kfxl9q6jrk9kmww5d26azak023zqj0pg076575yji6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring parser-combinators text
+       ];
+       executableHaskellDepends = [
+         base bytestring parser-combinators text
+       ];
+       testHaskellDepends = [
+         base bytestring parser-combinators tasty tasty-hunit text
+       ];
+       description = "Fast-path parser combinators with fallback for error reporting";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "parport" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -155452,21 +156064,22 @@ self: {
 
   "patat" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
-     , bytestring, containers, directory, filepath, mtl, network
-     , network-uri, optparse-applicative, pandoc, skylighting
-     , terminal-size, text, time, unordered-containers, yaml
+     , base64-bytestring, bytestring, colour, containers, directory
+     , filepath, mtl, network, network-uri, optparse-applicative, pandoc
+     , process, skylighting, terminal-size, text, time
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.7.2.0";
-       sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw";
+       version = "0.8.0.0";
+       sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base bytestring containers
-         directory filepath mtl network network-uri optparse-applicative
-         pandoc skylighting terminal-size text time unordered-containers
-         yaml
+         aeson ansi-terminal ansi-wl-pprint base base64-bytestring
+         bytestring colour containers directory filepath mtl network
+         network-uri optparse-applicative pandoc process skylighting
+         terminal-size text time unordered-containers yaml
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
@@ -157284,31 +157897,6 @@ self: {
      }) {};
 
   "persistent-mysql-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , io-streams, monad-logger, mysql-haskell, network, persistent
-     , persistent-template, resource-pool, resourcet, text, time, tls
-     , transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-mysql-haskell";
-       version = "0.4.1";
-       sha256 = "1wp8va21l03i0wlchlmzik7npvrm4gma4wly0p9rljdwizhgh291";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers io-streams monad-logger
-         mysql-haskell network persistent resource-pool resourcet text time
-         tls transformers unliftio-core
-       ];
-       executableHaskellDepends = [
-         base monad-logger persistent persistent-template transformers
-       ];
-       description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "persistent-mysql-haskell_0_4_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
      , persistent-template, resource-pool, resourcet, text, time, tls
@@ -157506,34 +158094,6 @@ self: {
      }) {inherit (pkgs) sqlite;};
 
   "persistent-sqlite" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, microlens-th, monad-logger, old-locale, persistent
-     , persistent-template, resource-pool, resourcet, sqlite, temporary
-     , text, time, transformers, unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.8.1.2";
-       sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g";
-       configureFlags = [ "-fsystemlib" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers microlens-th monad-logger
-         old-locale persistent resource-pool resourcet text time
-         transformers unliftio-core unordered-containers
-       ];
-       librarySystemDepends = [ sqlite ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template temporary text time
-         transformers
-       ];
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {inherit (pkgs) sqlite;};
-
-  "persistent-sqlite_2_8_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-logger, old-locale, persistent
      , persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -157558,7 +158118,6 @@ self: {
        ];
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
@@ -161245,8 +161804,8 @@ self: {
      }:
      mkDerivation {
        pname = "pomaps";
-       version = "0.0.1.0";
-       sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8";
+       version = "0.0.2.0";
+       sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim lattices
        ];
@@ -161460,8 +162019,8 @@ self: {
      }:
      mkDerivation {
        pname = "pooled-io";
-       version = "0.0.2.1";
-       sha256 = "1l7rgwlkhgxxh9y3ag341zifdjabhmwd6k9hg83rqnnmfs45lh3x";
+       version = "0.0.2.2";
+       sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162386,15 +162945,15 @@ self: {
      , hspec-wai, hspec-wai-json, HTTP, http-types
      , insert-ordered-containers, interpolatedstring-perl6, jose, lens
      , lens-aeson, monad-control, network-uri, optparse-applicative
-     , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe
+     , parsec, process, protolude, Ranged-sets, regex-tdfa, retry
      , scientific, swagger2, text, time, transformers-base, unix
      , unordered-containers, vector, wai, wai-cors, wai-extra
      , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.5.0.0";
-       sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3";
+       version = "5.1.0";
+       sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162403,7 +162962,7 @@ self: {
          contravariant-extras cookie either gitrev hasql hasql-pool
          hasql-transaction heredoc HTTP http-types insert-ordered-containers
          interpolatedstring-perl6 jose lens lens-aeson network-uri
-         optparse-applicative parsec protolude Ranged-sets regex-tdfa safe
+         optparse-applicative parsec protolude Ranged-sets regex-tdfa
          scientific swagger2 text time unordered-containers vector wai
          wai-cors wai-extra wai-middleware-static
        ];
@@ -162551,8 +163110,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.0.6";
-       sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl";
+       version = "2.0.12";
+       sha256 = "0ccbm3hvpffr673kyp1ky9xpq1ig4gspvqv88yp2ifhrpw9wsi39";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -162583,25 +163142,26 @@ self: {
      }) {};
 
   "potoki-core" = callPackage
-    ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
-     , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck
-     , quickcheck-instances, random, rerebase, scanner, stm, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers
-     , unordered-containers, vector
+    ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion
+     , directory, foldl, hashable, ilist, primitive, profunctors, ptr
+     , QuickCheck, quickcheck-instances, random, rerebase, scanner
+     , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.2.8.2";
-       sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g";
+       version = "2.2.13.1";
+       sha256 = "09qr9xh0gzfvqla0mqjwdb3xf8xx82fy5188xml5vp1wq234wv8j";
        libraryHaskellDepends = [
          acquire attoparsec base bytestring directory foldl hashable
-         primitive profunctors ptr scanner stm text transformers
+         primitive profunctors ptr scanner stm text time transformers
          unordered-containers vector
        ];
        testHaskellDepends = [
          acquire attoparsec foldl ilist QuickCheck quickcheck-instances
-         random rerebase tasty tasty-hunit tasty-quickcheck
+         random rerebase split tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163938,24 +164498,27 @@ self: {
      }) {};
 
   "primitive-containers" = callPackage
-    ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim
-     , primitive, primitive-sort, QuickCheck, quickcheck-classes, random
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, aeson, base, containers, contiguous, deepseq
+     , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort
+     , quantification, QuickCheck, quickcheck-classes, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "primitive-containers";
-       version = "0.2.0";
-       sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b";
+       version = "0.3.0";
+       sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x";
        libraryHaskellDepends = [
-         base contiguous primitive primitive-sort
+         aeson base contiguous deepseq hashable primitive primitive-sort
+         quantification text unordered-containers vector
        ];
        testHaskellDepends = [
-         base containers primitive QuickCheck quickcheck-classes tasty
-         tasty-quickcheck
+         aeson base containers HUnit primitive quantification QuickCheck
+         quickcheck-classes tasty tasty-hunit tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [
          base containers gauge ghc-prim primitive random
        ];
+       description = "containers backed by arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -163968,8 +164531,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive-extras";
-       version = "0.6.7";
-       sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny";
+       version = "0.7.0.2";
+       sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d";
        libraryHaskellDepends = [
          base bytestring cereal deferred-folds focus foldl list-t primitive
          profunctors vector
@@ -164032,8 +164595,8 @@ self: {
        pname = "primitive-sort";
        version = "0.1.0.0";
        sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
-       revision = "1";
-       editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w";
+       revision = "2";
+       editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki";
        libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
        testHaskellDepends = [
          base containers doctest HUnit primitive QuickCheck smallcheck tasty
@@ -164273,8 +164836,8 @@ self: {
      }:
      mkDerivation {
        pname = "probability";
-       version = "0.2.5.1";
-       sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk";
+       version = "0.2.5.2";
+       sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers random transformers utility-ht
@@ -164637,18 +165200,6 @@ self: {
      }) {};
 
   "product-isomorphic" = callPackage
-    ({ mkDerivation, base, template-haskell, th-data-compat }:
-     mkDerivation {
-       pname = "product-isomorphic";
-       version = "0.0.3.2";
-       sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl";
-       libraryHaskellDepends = [ base template-haskell th-data-compat ];
-       testHaskellDepends = [ base template-haskell ];
-       description = "Weaken applicative functor on products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "product-isomorphic_0_0_3_3" = callPackage
     ({ mkDerivation, base, template-haskell, th-data-compat }:
      mkDerivation {
        pname = "product-isomorphic";
@@ -164658,7 +165209,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Weaken applicative functor on products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "product-profunctors" = callPackage
@@ -165470,22 +166020,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-family
-     , proto-lens, QuickCheck, text
+  "proto-lens_0_4_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , lens-family, lens-labels, parsec, pretty, text, transformers
+     , void
      }:
      mkDerivation {
-       pname = "proto-lens-arbitrary";
-       version = "0.1.2.1";
-       sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
+       pname = "proto-lens";
+       version = "0.4.0.0";
+       sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring containers lens-family proto-lens QuickCheck text
+         attoparsec base bytestring containers deepseq lens-family
+         lens-labels parsec pretty text transformers void
        ];
-       description = "Arbitrary instances for proto-lens";
+       description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-arbitrary_0_1_2_2" = callPackage
+  "proto-lens-arbitrary" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
@@ -165498,6 +166052,21 @@ self: {
        ];
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "proto-lens-arbitrary_0_1_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.2.3";
+       sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -165508,8 +166077,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.10";
-       sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir";
+       version = "0.1.0.11";
+       sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base data-default-class lens-family proto-lens-protoc transformers
@@ -165523,22 +166092,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-combinators_0_1_0_11" = callPackage
-    ({ mkDerivation, base, Cabal, data-default-class, HUnit
-     , lens-family, lens-family-core, proto-lens, proto-lens-protoc
-     , test-framework, test-framework-hunit, transformers
+  "proto-lens-combinators_0_4" = callPackage
+    ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core
+     , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework
+     , test-framework-hunit, transformers
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.11";
-       sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
-       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       version = "0.4";
+       sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b";
+       setupHaskellDepends = [ base Cabal proto-lens-setup ];
        libraryHaskellDepends = [
-         base data-default-class lens-family proto-lens-protoc transformers
+         base lens-family proto-lens transformers
        ];
        testHaskellDepends = [
          base HUnit lens-family lens-family-core proto-lens
-         proto-lens-protoc test-framework test-framework-hunit
+         proto-lens-runtime test-framework test-framework-hunit
        ];
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
@@ -165566,8 +166135,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
-       version = "0.1.1.1";
-       sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
+       version = "0.1.1.2";
+       sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
@@ -165575,12 +166144,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-optparse_0_1_1_2" = callPackage
+  "proto-lens-optparse_0_1_1_3" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
-       version = "0.1.1.2";
-       sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
+       version = "0.1.1.3";
+       sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd";
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
@@ -165624,17 +166193,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
-  "proto-lens-protobuf-types_0_3_0_2" = callPackage
+  "proto-lens-protobuf-types_0_4_0_0" = callPackage
     ({ mkDerivation, base, Cabal, lens-labels, proto-lens
-     , proto-lens-protoc, protobuf, text
+     , proto-lens-runtime, proto-lens-setup, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.3.0.2";
-       sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx";
-       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       version = "0.4.0.0";
+       sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg";
+       setupHaskellDepends = [ base Cabal proto-lens-setup ];
        libraryHaskellDepends = [
-         base lens-labels proto-lens proto-lens-protoc text
+         base lens-labels proto-lens proto-lens-runtime text
        ];
        libraryToolDepends = [ protobuf ];
        description = "Basic protocol buffer message types";
@@ -165670,32 +166239,6 @@ self: {
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers
-     , data-default-class, deepseq, directory, filepath
-     , haskell-src-exts, lens-family, lens-labels, pretty, process
-     , proto-lens, protobuf, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protoc";
-       version = "0.3.1.0";
-       sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers data-default-class deepseq
-         directory filepath haskell-src-exts lens-family lens-labels pretty
-         process proto-lens text
-       ];
-       libraryToolDepends = [ protobuf ];
-       executableHaskellDepends = [
-         base bytestring containers data-default-class deepseq filepath
-         haskell-src-exts lens-family proto-lens text
-       ];
-       description = "Protocol buffer compiler for the proto-lens library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) protobuf;};
-
-  "proto-lens-protoc_0_3_1_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, deepseq, directory, filepath
      , haskell-src-exts, lens-family, lens-labels, pretty, process
@@ -165719,9 +166262,63 @@ self: {
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) protobuf;};
+
+  "proto-lens-protoc_0_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath
+     , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protoc";
+       version = "0.4.0.0";
+       sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers filepath haskell-src-exts lens-family pretty
+         proto-lens text
+       ];
+       libraryToolDepends = [ protobuf ];
+       executableHaskellDepends = [
+         base bytestring containers lens-family proto-lens text
+       ];
+       description = "Protocol buffer compiler for the proto-lens library";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
+  "proto-lens-runtime" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, filepath
+     , lens-family, lens-labels, proto-lens, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-runtime";
+       version = "0.4.0.1";
+       sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq filepath lens-family lens-labels
+         proto-lens text
+       ];
+       doHaddock = false;
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "proto-lens-setup" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
+     , directory, filepath, process, proto-lens-protoc, temporary, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-setup";
+       version = "0.4.0.0";
+       sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf";
+       libraryHaskellDepends = [
+         base bytestring Cabal containers deepseq directory filepath process
+         proto-lens-protoc temporary text
+       ];
+       description = "Cabal support for codegen with proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -165792,6 +166389,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protobuf-simple_0_1_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
+     , QuickCheck, quickcheck-instances, split, text
+     }:
+     mkDerivation {
+       pname = "protobuf-simple";
+       version = "0.1.1.0";
+       sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 mtl text
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath mtl parsec split text
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 filepath
+         hspec parsec QuickCheck quickcheck-instances split text
+       ];
+       description = "Simple Protocol Buffers library (proto2)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
@@ -165857,22 +166480,6 @@ self: {
      }) {};
 
   "protocol-radius" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, cryptonite
-     , dlist, memory, template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "protocol-radius";
-       version = "0.0.1.0";
-       sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f";
-       libraryHaskellDepends = [
-         base bytestring cereal containers cryptonite dlist memory
-         template-haskell text transformers
-       ];
-       description = "parser and printer for radius protocol packet";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-radius_0_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptonite
      , dlist, memory, template-haskell, text, transformers
      }:
@@ -165886,7 +166493,6 @@ self: {
        ];
        description = "parser and printer for radius protocol packet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-radius-test" = callPackage
@@ -166774,23 +167380,27 @@ self: {
      }) {};
 
   "purescript-iso" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring
-     , containers, monad-control, mtl, QuickCheck, quickcheck-instances
-     , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string
-     , uuid, zeromq4-haskell, zeromq4-simple
+    ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async
+     , attoparsec, attoparsec-uri, base, bytestring, containers
+     , emailaddress, monad-control, mtl, QuickCheck
+     , quickcheck-instances, scientific, stm, strict, tasty
+     , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
+     , zeromq4-simple
      }:
      mkDerivation {
        pname = "purescript-iso";
-       version = "0.0.1.2";
-       sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh";
+       version = "0.0.2";
+       sha256 = "0biam9asa6h1ymzms91lafiw8h5pd7k3n13cmrk8b4lbs8zp48j1";
        libraryHaskellDepends = [
-         aeson async attoparsec-uri base bytestring containers monad-control
-         mtl QuickCheck quickcheck-instances stm strict text time
+         aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+         base bytestring containers emailaddress monad-control mtl
+         QuickCheck quickcheck-instances scientific stm strict text time
          utf8-string uuid zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
-         aeson async attoparsec-uri base bytestring containers monad-control
-         mtl QuickCheck quickcheck-instances stm strict tasty
+         aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+         base bytestring containers emailaddress monad-control mtl
+         QuickCheck quickcheck-instances scientific stm strict tasty
          tasty-quickcheck text time utf8-string uuid zeromq4-haskell
          zeromq4-simple
        ];
@@ -167557,8 +168167,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-cpp-qt5";
-       version = "0.5.0";
-       sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7";
+       version = "0.5.1";
+       sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
@@ -167615,8 +168225,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-qt5";
-       version = "0.5.0";
-       sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3";
+       version = "0.5.1";
+       sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
@@ -167648,8 +168258,8 @@ self: {
      }:
      mkDerivation {
        pname = "quadratic-irrational";
-       version = "0.0.5";
-       sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
+       version = "0.0.6";
+       sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
        libraryHaskellDepends = [
          arithmoi base containers mtl transformers
        ];
@@ -167700,15 +168310,15 @@ self: {
      }) {};
 
   "quantification" = callPackage
-    ({ mkDerivation, aeson, base, containers, ghc-prim, hashable
-     , path-pieces, text, unordered-containers, vector
+    ({ mkDerivation, aeson, base, binary, containers, ghc-prim
+     , hashable, path-pieces, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "quantification";
-       version = "0.4";
-       sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2";
+       version = "0.5.0";
+       sha256 = "0ls8rhy0idrgj9dnd5ajjfi55bhz4qsyncj3ghw3nyrbr0q7j0bk";
        libraryHaskellDepends = [
-         aeson base containers ghc-prim hashable path-pieces text
+         aeson base binary containers ghc-prim hashable path-pieces text
          unordered-containers vector
        ];
        description = "Rage against the quantification";
@@ -168091,6 +168701,8 @@ self: {
        pname = "quickcheck-classes";
        version = "0.4.14.1";
        sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim";
+       revision = "1";
+       editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -168125,8 +168737,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.18";
        sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
-       revision = "1";
-       editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
+       revision = "2";
+       editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific tagged text time
@@ -168302,31 +168914,30 @@ self: {
      }) {};
 
   "quickcheck-state-machine" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring
-     , containers, directory, exceptions, filelock, filepath
-     , http-client, lifted-async, lifted-base, matrix, monad-control
-     , monad-logger, mtl, network, persistent, persistent-postgresql
-     , persistent-template, pretty-show, process, QuickCheck
-     , quickcheck-instances, random, resourcet, servant, servant-client
-     , servant-server, split, stm, strict, string-conversions, tasty
-     , tasty-quickcheck, text, tree-diff, vector, wai, warp
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , directory, doctest, exceptions, filelock, filepath, http-client
+     , lifted-async, matrix, monad-control, monad-logger, mtl, network
+     , persistent, persistent-postgresql, persistent-template
+     , pretty-show, process, QuickCheck, quickcheck-instances, random
+     , resourcet, servant, servant-client, servant-server, split, stm
+     , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck
+     , text, tree-diff, vector, wai, warp
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.4.0";
-       sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q";
+       version = "0.4.2";
+       sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3";
        libraryHaskellDepends = [
-         ansi-wl-pprint async base containers exceptions lifted-async
-         lifted-base matrix monad-control mtl pretty-show QuickCheck random
-         split stm tree-diff vector
+         ansi-wl-pprint base containers exceptions lifted-async matrix
+         monad-control mtl pretty-show QuickCheck split stm tree-diff vector
        ];
        testHaskellDepends = [
-         base bytestring directory filelock filepath http-client
+         base bytestring directory doctest filelock filepath http-client
          lifted-async matrix monad-control monad-logger mtl network
          persistent persistent-postgresql persistent-template process
          QuickCheck quickcheck-instances random resourcet servant
-         servant-client servant-server strict string-conversions tasty
-         tasty-quickcheck text tree-diff vector wai warp
+         servant-client servant-server stm strict string-conversions tasty
+         tasty-hunit tasty-quickcheck text tree-diff vector wai warp
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
@@ -168412,10 +169023,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "quickcheck-with-counterexamples";
-       version = "1.0";
-       sha256 = "0pny7whz16mdmh51jpa7p9f8pa7jpcqqjks797wnj8848ia7ax87";
-       revision = "3";
-       editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8";
+       version = "1.1";
+       sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd";
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -169639,8 +170248,10 @@ self: {
      }:
      mkDerivation {
        pname = "range";
-       version = "0.1.2.0";
-       sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+       version = "0.2.0.0";
+       sha256 = "0pmzm503skr4d1qwkq72mjkq1ba86la1qxb9h25gqc9dzmzy0w3k";
+       revision = "1";
+       editedCabalFile = "0a379q4rw8hsggknwnca4cibr1kmyrmjprdl8fpflpp7wh4vlpwf";
        libraryHaskellDepends = [ base free parsec ];
        testHaskellDepends = [
          base Cabal free QuickCheck random test-framework
@@ -170142,6 +170753,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rattletrap_6_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
+     , bytestring, containers, filepath, http-client, http-client-tls
+     , HUnit, template-haskell, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "rattletrap";
+       version = "6.0.1";
+       sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls template-haskell text
+         transformers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls template-haskell text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base binary binary-bits bytestring containers
+         filepath http-client http-client-tls HUnit template-haskell
+         temporary text transformers
+       ];
+       description = "Parse and generate Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "raven-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
      , network, random, resourcet, text, time, unordered-containers
@@ -170416,19 +171058,20 @@ self: {
   "rdf4h" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
      , criterion, deepseq, directory, filepath, hashable, hgal, HTTP
-     , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , http-conduit, HUnit, hxt, lifted-base, mtl, network-uri, parsec
+     , parsers, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "3.1.0";
-       sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8";
+       version = "3.1.1";
+       sha256 = "0r93mra0r8xdqi062xpsv5svzcinq31k4jjbjay53an6zd1qg9n4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers deepseq filepath
-         hashable hgal HTTP hxt mtl network-uri parsec parsers text
-         unordered-containers
+         hashable hgal HTTP http-conduit hxt lifted-base mtl network-uri
+         parsec parsers text unordered-containers
        ];
        executableHaskellDepends = [ base containers text ];
        testHaskellDepends = [
@@ -170620,8 +171263,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-balsa";
-       version = "0.4";
-       sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h";
+       version = "0.4.0.1";
+       sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1";
        libraryHaskellDepends = [
          alsa-core alsa-seq base containers data-accessor
          data-accessor-transformers event-list extensible-exceptions midi
@@ -170677,8 +171320,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-bunch";
-       version = "1.0";
-       sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn";
+       version = "1.0.0.1";
+       sha256 = "1k4l1zk7jm26iyaa2srillrq8qnwnqkwhpy6shdw6mg4nfby706c";
        libraryHaskellDepends = [
          base non-empty reactive-banana transformers utility-ht
        ];
@@ -170829,8 +171472,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-jack";
-       version = "0.4.1";
-       sha256 = "124fpfv486dm8cpgfdnrmckkk8y6ia4nwzapvnfghkslizzlbfab";
+       version = "0.4.1.1";
+       sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr";
        libraryHaskellDepends = [
          base containers data-accessor event-list explicit-exception
          extensible-exceptions jack midi non-negative random
@@ -170850,8 +171493,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-midyim";
-       version = "0.4.1";
-       sha256 = "1dx07c4d4sw7a797d1ap9ja48lhx37hbizhajgcf1qpilxgd4lvv";
+       version = "0.4.1.1";
+       sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v";
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-transformers event-list
          midi non-negative random reactive-banana-bunch semigroups
@@ -171207,6 +171850,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "record-dot-preprocessor_0_1_4" = callPackage
+    ({ mkDerivation, base, extra, filepath }:
+     mkDerivation {
+       pname = "record-dot-preprocessor";
+       version = "0.1.4";
+       sha256 = "1mj39kdnf3978cc51hh1fnnr0ax3gnqw4fan0f099b7li5y2xlwx";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base extra filepath ];
+       description = "Preprocessor to allow record.field syntax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "record-encode" = callPackage
     ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -171307,8 +171964,8 @@ self: {
      }:
      mkDerivation {
        pname = "records-sop";
-       version = "0.1.0.0";
-       sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1";
+       version = "0.1.0.1";
+       sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc";
        libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
        testHaskellDepends = [
          base deepseq generics-sop hspec should-not-typecheck
@@ -171339,8 +171996,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "recursion";
-       version = "1.2.0.1";
-       sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4";
+       version = "1.2.1.1";
+       sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "A recursion schemes library for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -171505,8 +172162,8 @@ self: {
      }:
      mkDerivation {
        pname = "redis-io";
-       version = "0.7.0";
-       sha256 = "06g630jrb0zxbai4n251plprafn5s9nywd3hgg14vz999wccns0z";
+       version = "1.0.0";
+       sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp";
        libraryHaskellDepends = [
          attoparsec auto-update base bytestring containers exceptions
          iproute monad-control mtl network operational redis-resp
@@ -171543,8 +172200,8 @@ self: {
      }:
      mkDerivation {
        pname = "redis-resp";
-       version = "0.4.0";
-       sha256 = "0clj5b6lbkdc64arb9z4qhbiqkx7mifja8ns7xxc619yhj9dbh4b";
+       version = "1.0.0";
+       sha256 = "12w00zjf901xi6wwb0g6wzbxkbh1iyyd7glxijx9sajv6jgd5365";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-conversion containers dlist
          double-conversion operational semigroups split transformers
@@ -175022,8 +175679,8 @@ self: {
      }:
      mkDerivation {
        pname = "retry";
-       version = "0.7.6.3";
-       sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby";
+       version = "0.7.7.0";
+       sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw";
        libraryHaskellDepends = [
          base data-default-class exceptions ghc-prim random transformers
        ];
@@ -176759,6 +177416,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "row" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "row";
+       version = "0.0.0.0";
+       sha256 = "16iy0b0aqvpn1dnw96h8vp4354774c0lp7fq4qibqwd8bv99mmps";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doHaddock = false;
+       description = "Row types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "row-types" = callPackage
     ({ mkDerivation, base, constraints, criterion, deepseq, hashable
      , text, unordered-containers
@@ -178110,6 +178783,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "salak" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, hspec, QuickCheck, scientific, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "salak";
+       version = "0.1.4";
+       sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr";
+       libraryHaskellDepends = [
+         aeson base directory filepath scientific text unordered-containers
+         vector yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory filepath hspec
+         QuickCheck scientific text unordered-containers vector yaml
+       ];
+       description = "Configuration Loader";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "saltine" = callPackage
     ({ mkDerivation, base, bytestring, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
@@ -179545,6 +180239,8 @@ self: {
        pname = "scotty";
        version = "0.11.2";
        sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x";
+       revision = "1";
+       editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class exceptions fail http-types monad-control mtl
@@ -180453,27 +181149,27 @@ self: {
      }) {};
 
   "secp256k1" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
-     , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , cryptohash, entropy, hspec, hspec-discover, HUnit, mtl
+     , QuickCheck, secp256k1, string-conversions
      }:
      mkDerivation {
        pname = "secp256k1";
-       version = "0.5.3";
-       sha256 = "1fb9n7r64h35822zsa0w2jb214gdfg85ib20ni3caszc1k8rsmck";
-       setupHaskellDepends = [ base Cabal ];
+       version = "1.1.2";
+       sha256 = "0nm8xx9cfn5gj2rqhcmikdkl3grj88xs4wikjbrlazvpyj4rc0q2";
        libraryHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy mtl QuickCheck
-         string-conversions
+         base base16-bytestring bytestring cereal cryptohash entropy hspec
+         HUnit mtl QuickCheck string-conversions
        ];
+       librarySystemDepends = [ secp256k1 ];
        testHaskellDepends = [
-         base base16-bytestring bytestring cereal cryptohash entropy HUnit
-         mtl QuickCheck string-conversions test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base base16-bytestring bytestring cereal cryptohash entropy hspec
+         HUnit mtl QuickCheck string-conversions
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-     }) {};
+     }) {inherit (pkgs) secp256k1;};
 
   "secret-santa" = callPackage
     ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
@@ -180602,14 +181298,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "selda_0_3_2_0" = callPackage
+  "selda_0_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
      , psqueues, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.3.2.0";
-       sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6";
+       version = "0.3.3.1";
+       sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr";
        libraryHaskellDepends = [
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
@@ -182257,8 +182953,8 @@ self: {
        pname = "servant-dhall";
        version = "0.1.0.1";
        sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll";
-       revision = "1";
-       editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33";
+       revision = "2";
+       editedCabalFile = "1zdvk0cx8s1n107yx95vdv0xziwjmr1d6kypr36f1cqdvdh02jir";
        libraryHaskellDepends = [
          base base-compat bytestring dhall http-media megaparsec
          prettyprinter servant text
@@ -182547,6 +183243,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-hmac-auth" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+     , case-insensitive, containers, cryptonite, http-client, http-types
+     , markdown-unlit, memory, mtl, servant, servant-client
+     , servant-client-core, servant-server, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-hmac-auth";
+       version = "0.0.0";
+       sha256 = "08873pwmn2wzhl2r87gx6db3f2j8848g4xq2i4gnwqj23s7sfy0z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring case-insensitive
+         containers cryptonite http-client http-types memory mtl servant
+         servant-client servant-client-core servant-server transformers wai
+       ];
+       executableHaskellDepends = [
+         aeson base http-client servant servant-client servant-server warp
+       ];
+       executableToolDepends = [ markdown-unlit ];
+       testHaskellDepends = [ base ];
+       description = "Servant authentication with HMAC";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-iCalendar" = callPackage
     ({ mkDerivation, base, data-default, http-media, iCalendar, servant
      }:
@@ -182983,24 +183705,26 @@ self: {
   "servant-rawm" = callPackage
     ({ mkDerivation, base, bytestring, doctest, filepath, Glob
      , hspec-wai, http-client, http-media, http-types, lens, resourcet
-     , servant, servant-client, servant-docs, servant-server, tasty
-     , tasty-hspec, tasty-hunit, transformers, wai, wai-app-static, warp
+     , servant, servant-client, servant-client-core, servant-docs
+     , servant-server, tasty, tasty-hspec, tasty-hunit, text
+     , transformers, wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "servant-rawm";
-       version = "0.2.0.2";
-       sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2";
+       version = "0.3.0.0";
+       sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring filepath http-client http-media http-types lens
-         resourcet servant-client servant-docs servant-server wai
-         wai-app-static
+         resourcet servant-client servant-client-core servant-docs
+         servant-server wai wai-app-static
        ];
        testHaskellDepends = [
          base bytestring doctest Glob hspec-wai http-client http-media
-         http-types servant servant-client servant-server tasty tasty-hspec
-         tasty-hunit transformers wai warp
+         http-types servant servant-client servant-client-core
+         servant-server tasty tasty-hspec tasty-hunit text transformers wai
+         warp
        ];
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
@@ -183041,20 +183765,6 @@ self: {
      }) {};
 
   "servant-ruby" = callPackage
-    ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-ruby";
-       version = "0.8.0.1";
-       sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155";
-       libraryHaskellDepends = [ base casing servant-foreign text ];
-       testHaskellDepends = [ base doctest QuickCheck ];
-       description = "Generate a Ruby client from a Servant API with Net::HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-ruby_0_8_0_2" = callPackage
     ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
      , text
      }:
@@ -183066,7 +183776,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-scotty" = callPackage
@@ -183976,6 +184685,8 @@ self: {
        pname = "set-cover";
        version = "0.0.9";
        sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg";
+       revision = "1";
+       editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184076,17 +184787,6 @@ self: {
      }) {};
 
   "setlocale" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "setlocale";
-       version = "1.0.0.6";
-       sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq";
-       libraryHaskellDepends = [ base ];
-       description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "setlocale_1_0_0_8" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "setlocale";
@@ -184095,7 +184795,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setoid" = callPackage
@@ -184557,8 +185256,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.9.0.3";
-       sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
+       version = "1.9.0.5";
+       sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-c shake-cabal shake-ext text
@@ -184580,14 +185279,15 @@ self: {
      }) {};
 
   "shake-cabal" = callPackage
-    ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+    ({ mkDerivation, base, Cabal, composition-prelude, directory
+     , filepath, shake
      }:
      mkDerivation {
        pname = "shake-cabal";
-       version = "0.1.0.4";
-       sha256 = "1in3f31pm253vzcds66pa2ddjl983l2w8j3vj52rykg2dynl625q";
+       version = "0.1.0.5";
+       sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s";
        libraryHaskellDepends = [
-         base Cabal composition-prelude directory shake
+         base Cabal composition-prelude directory filepath shake
        ];
        description = "Shake library for use with cabal";
        license = stdenv.lib.licenses.bsd3;
@@ -185308,6 +186008,8 @@ self: {
        pname = "shelly";
        version = "1.8.1";
        sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
+       revision = "1";
+       editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186308,10 +187010,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.6";
-       sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn";
-       revision = "1";
-       editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx";
+       version = "0.9.7";
+       sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -186352,8 +187052,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-logging";
-       version = "0.2.0.3";
-       sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1";
+       version = "0.2.0.4";
+       sha256 = "13f6562rhk5bb5b2rmn0zsw2pil6qis463kx9d684j2m0qnqifdm";
        libraryHaskellDepends = [
          aeson base bytestring directory exceptions filepath hscolour
          iso8601-time lens mtl simple-effects string-conv text time uuid
@@ -187550,8 +188250,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.7.2";
-       sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch";
+       version = "0.7.3";
+       sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187574,10 +188274,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.7.2";
-       sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
-       revision = "1";
-       editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
+       version = "0.7.3";
+       sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187827,8 +188525,8 @@ self: {
      }:
      mkDerivation {
        pname = "slick";
-       version = "0.1.0.2";
-       sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
+       version = "0.1.1.0";
+       sha256 = "0gqc9z8w9m1dvsnv7g1rsi367akkzp95w96lvx20sdg1gnzbx5rc";
        libraryHaskellDepends = [
          aeson base binary bytestring containers lens lens-aeson mustache
          pandoc shake text time
@@ -190674,6 +191372,24 @@ self: {
        license = "GPL";
      }) {};
 
+  "sox_0_2_3_1" = callPackage
+    ({ mkDerivation, base, containers, explicit-exception
+     , extensible-exceptions, process, sample-frame, semigroups
+     , transformers, unix, utility-ht
+     }:
+     mkDerivation {
+       pname = "sox";
+       version = "0.2.3.1";
+       sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh";
+       libraryHaskellDepends = [
+         base containers explicit-exception extensible-exceptions process
+         sample-frame semigroups transformers unix utility-ht
+       ];
+       description = "Play, write, read, convert audio signals using Sox";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "soxlib" = callPackage
     ({ mkDerivation, base, bytestring, containers, explicit-exception
      , extensible-exceptions, sample-frame, sox, storablevector
@@ -190694,6 +191410,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) sox;};
 
+  "soxlib_0_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, explicit-exception
+     , extensible-exceptions, sample-frame, sox, storablevector
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "soxlib";
+       version = "0.0.3.1";
+       sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring explicit-exception extensible-exceptions
+         sample-frame storablevector transformers utility-ht
+       ];
+       libraryPkgconfigDepends = [ sox ];
+       description = "Write, read, convert audio signals using libsox";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) sox;};
+
   "soyuz" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdargs, containers
      , pretty, QuickCheck, trifecta, uniplate, vector
@@ -191182,8 +191919,8 @@ self: {
     ({ mkDerivation, base, cmdargs, containers, leancheck }:
      mkDerivation {
        pname = "speculate";
-       version = "0.3.2";
-       sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk";
+       version = "0.3.5";
+       sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h";
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
@@ -191191,20 +191928,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "speculate_0_3_4" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, leancheck }:
-     mkDerivation {
-       pname = "speculate";
-       version = "0.3.4";
-       sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv";
-       libraryHaskellDepends = [ base cmdargs containers leancheck ];
-       testHaskellDepends = [ base leancheck ];
-       benchmarkHaskellDepends = [ base leancheck ];
-       description = "discovery of properties about Haskell functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "speculation" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {
@@ -191298,6 +192021,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "spherical" = callPackage
+    ({ mkDerivation, base, composition-prelude }:
+     mkDerivation {
+       pname = "spherical";
+       version = "0.1.2.0";
+       sha256 = "1nbfa0f14rd5wnxyygzf68v5v94wk0gr3rgi48d86ars8ip056f3";
+       libraryHaskellDepends = [ base composition-prelude ];
+       description = "Geometry on a sphere";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sphero" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
      , simple-bluetooth
@@ -191728,6 +192462,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spreadsheet_0_1_3_8" = callPackage
+    ({ mkDerivation, base, explicit-exception, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "spreadsheet";
+       version = "0.1.3.8";
+       sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base explicit-exception transformers utility-ht
+       ];
+       description = "Read and write spreadsheets from and to CSV files in a lazy way";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sprinkles" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , Cabal, case-insensitive, cereal, classy-prelude, containers, curl
@@ -192170,6 +192921,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "squeal-postgresql_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary-parser, bytestring
+     , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec
+     , lifted-base, mmorph, monad-control, mtl, network-ip
+     , postgresql-binary, postgresql-libpq, records-sop, resource-pool
+     , scientific, text, time, transformers, transformers-base
+     , uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "squeal-postgresql";
+       version = "0.4.0.0";
+       sha256 = "10z1rq6jz8g6sv52bh9hjmjsw0pml9m4l04gzi19zxnwa597xk2b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary-parser bytestring bytestring-strict-builder
+         deepseq generics-sop lifted-base mmorph monad-control mtl
+         network-ip postgresql-binary postgresql-libpq records-sop
+         resource-pool scientific text time transformers transformers-base
+         uuid-types vector
+       ];
+       executableHaskellDepends = [
+         base bytestring generics-sop mtl text transformers
+         transformers-base vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest generics-sop hspec text transformers
+         transformers-base vector
+       ];
+       description = "Squeal PostgreSQL Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "squeeze" = callPackage
     ({ mkDerivation, base, Cabal, data-default, directory, extra
      , factory, filepath, mtl, QuickCheck, random, toolshed
@@ -192893,8 +193678,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack2nix";
-       version = "0.2";
-       sha256 = "103cimrwr8j0b1zjpw195mjkfrgcgkicrpygcc5y82nyrl1cc74f";
+       version = "0.2.1";
+       sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194134,12 +194919,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm_2_4_5_0" = callPackage
+  "stm_2_4_5_1" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
-       version = "2.4.5.0";
-       sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
+       version = "2.4.5.1";
+       sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -194238,15 +195023,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm-containers_1_0_1_1" = callPackage
+  "stm-containers_1_1_0_2" = callPackage
     ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
      , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt
      , transformers
      }:
      mkDerivation {
        pname = "stm-containers";
-       version = "1.0.1.1";
-       sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn";
+       version = "1.1.0.2";
+       sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av";
        libraryHaskellDepends = [
          base deferred-folds focus hashable list-t stm-hamt transformers
        ];
@@ -194309,8 +195094,8 @@ self: {
      }:
      mkDerivation {
        pname = "stm-hamt";
-       version = "1.1.2.1";
-       sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q";
+       version = "1.2.0.2";
+       sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w";
        libraryHaskellDepends = [
          base deferred-folds focus hashable list-t primitive
          primitive-extras transformers
@@ -195050,6 +195835,8 @@ self: {
        pname = "streaming";
        version = "0.2.1.0";
        sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1";
+       revision = "2";
+       editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq";
        libraryHaskellDepends = [
          base containers ghc-prim mmorph mtl semigroups transformers
          transformers-base
@@ -195482,6 +196269,8 @@ self: {
        pname = "streaming-with";
        version = "0.2.2.1";
        sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09";
+       revision = "1";
+       editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm";
        libraryHaskellDepends = [
          base exceptions managed streaming-bytestring temporary transformers
        ];
@@ -195512,28 +196301,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_4_1" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, deepseq
+  "streamly_0_5_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
      , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
      , monad-control, mtl, QuickCheck, random, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.4.1";
-       sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy";
+       version = "0.5.0";
+       sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         atomic-primops base containers exceptions ghc-prim heaps
+         atomic-primops base clock containers exceptions ghc-prim heaps
          lockfree-queue monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck random transformers
        ];
        benchmarkHaskellDepends = [
-         atomic-primops base containers deepseq exceptions gauge ghc-prim
-         heaps lockfree-queue monad-control mtl random transformers
+         atomic-primops base clock containers deepseq exceptions gauge
+         ghc-prim heaps lockfree-queue monad-control mtl random transformers
          transformers-base
        ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
@@ -196877,6 +197666,33 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "summoner_1_1_0" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+     , filepath, generic-deriving, gitrev, hedgehog, neat-interpolation
+     , optparse-applicative, process, relude, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland
+     }:
+     mkDerivation {
+       pname = "summoner";
+       version = "1.1.0";
+       sha256 = "01wgnj89f6fpb6f54l9480zqps1g9v76kxf0g4vxpg2jhnzygv2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath
+         generic-deriving gitrev neat-interpolation optparse-applicative
+         process relude text time tomland
+       ];
+       executableHaskellDepends = [ base relude ];
+       testHaskellDepends = [
+         base hedgehog relude tasty tasty-hedgehog tomland
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Tool for creating completely configured production Haskell projects";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -197956,8 +198772,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic";
-       version = "6.3.1.20180213";
-       sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d";
+       version = "6.3.2.20180208";
+       sha256 = "1a6ifwhrn35wfx0lf2gbq203rb882p7hl0yji7rwfrvxrp4ax518";
        libraryHaskellDepends = [
          base containers mono-traversable symantic-document symantic-grammar
          text transformers
@@ -197966,13 +198782,33 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "symantic-cli" = callPackage
+    ({ mkDerivation, base, containers, megaparsec, symantic-document
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "symantic-cli";
+       version = "0.0.0.20180410";
+       sha256 = "0025rgjjz198sh6gb8zzy7283pnb6vza3q3d7x5xl27c77mpivpx";
+       libraryHaskellDepends = [
+         base containers megaparsec symantic-document text transformers
+       ];
+       description = "Library for Command Line Interface (CLI)";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "symantic-document" = callPackage
-    ({ mkDerivation, ansi-terminal, base, text }:
+    ({ mkDerivation, ansi-terminal, base, containers, tasty
+     , tasty-hunit, text, transformers
+     }:
      mkDerivation {
        pname = "symantic-document";
-       version = "0.0.0.20180213";
-       sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm";
-       libraryHaskellDepends = [ ansi-terminal base text ];
+       version = "0.1.2.20180831";
+       sha256 = "1vlxgn9gdd03azqf2csxjiyqsplg68wv3qr6d08zj5dvqskz27by";
+       libraryHaskellDepends = [ ansi-terminal base text transformers ];
+       testHaskellDepends = [
+         base containers tasty tasty-hunit text transformers
+       ];
        description = "Document symantics";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -197983,8 +198819,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-grammar";
-       version = "0.3.0.20180213";
-       sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih";
+       version = "0.3.1.20180831";
+       sha256 = "0n2x5sb5gv9lkhfmq9yfjxfk6q19h71xqbskkg7ar8nglz0jhldp";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [
          base megaparsec tasty tasty-hunit text transformers
@@ -198000,8 +198836,8 @@ self: {
      }:
      mkDerivation {
        pname = "symantic-lib";
-       version = "0.0.3.20180213";
-       sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2";
+       version = "0.0.4.20180831";
+       sha256 = "1agqlz7drckjm8a2swvqiryy7y6kdahq8d24rwkbzn3nw1bnyvk1";
        libraryHaskellDepends = [
          base containers mono-traversable symantic symantic-grammar text
          transformers
@@ -198449,8 +199285,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-core";
-       version = "0.8.2";
-       sha256 = "0r8lik2gmaxn1ay0wyjvq2r51jb8vy99hypvrnhbc6hsjybdh8aa";
+       version = "0.8.2.1";
+       sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq event-list
          explicit-exception filepath non-empty non-negative numeric-prelude
@@ -198497,8 +199333,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-filter";
-       version = "0.4.1";
-       sha256 = "1gbyb50lj5k69vn316lzb27jx5l2p8jn90b4k6zlqb050sp9c26s";
+       version = "0.4.1.1";
+       sha256 = "0130y7v7r6fhclyg4fg4jj07x1lvn8cvh40w43m2j3sdcmzaa25a";
        libraryHaskellDepends = [
          base containers numeric-prelude numeric-quest synthesizer-core
          transformers utility-ht
@@ -198564,8 +199400,8 @@ self: {
      }:
      mkDerivation {
        pname = "synthesizer-midi";
-       version = "0.6.1";
-       sha256 = "02z6sywk047vn2is9fq9nr4agdy9xis9ydbl15pmrb0vlmvpx3qr";
+       version = "0.6.1.1";
+       sha256 = "1f57i0lz8wy9kz6qkpbrpywlf0lxwq44yqgzc9kgrb4gy97p0cm5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198719,6 +199555,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "system-fileio_0_3_16_4" = callPackage
+    ({ mkDerivation, base, bytestring, chell, system-filepath
+     , temporary, text, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "system-fileio";
+       version = "0.3.16.4";
+       sha256 = "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l";
+       libraryHaskellDepends = [
+         base bytestring system-filepath text time unix
+       ];
+       testHaskellDepends = [
+         base bytestring chell system-filepath temporary text time
+         transformers unix
+       ];
+       description = "Consistent filesystem interaction across GHC versions (deprecated)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "system-filepath" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, chell, chell-quickcheck
      , deepseq, QuickCheck, text
@@ -199344,6 +200200,32 @@ self: {
        license = "GPL";
      }) {};
 
+  "tagchup_0_4_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-accessor
+     , explicit-exception, non-empty, old-time, transformers, utility-ht
+     , xml-basic
+     }:
+     mkDerivation {
+       pname = "tagchup";
+       version = "0.4.1.1";
+       sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception
+         non-empty transformers utility-ht xml-basic
+       ];
+       testHaskellDepends = [ base xml-basic ];
+       benchmarkHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception
+         old-time transformers utility-ht xml-basic
+       ];
+       description = "alternative package for processing of tag soups";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell, transformers
      , transformers-compat
@@ -200001,8 +200883,8 @@ self: {
      }:
      mkDerivation {
        pname = "tar-conduit";
-       version = "0.2.3.1";
-       sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
+       version = "0.2.5";
+       sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators directory filepath
          safe-exceptions text unix
@@ -200019,6 +200901,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tar-conduit_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, containers, criterion, deepseq, directory
+     , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
+     }:
+     mkDerivation {
+       pname = "tar-conduit";
+       version = "0.3.0";
+       sha256 = "0g35wiqn0bi31sqnzknq90iy265c7lw15rkyrzc6c2vp6nl86j08";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         safe-exceptions text unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-extra
+         containers deepseq directory filepath hspec QuickCheck weigh
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-combinators containers criterion
+         deepseq directory filepath hspec
+       ];
+       description = "Extract and create tar files using conduit for streaming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mmorph, mtl }:
      mkDerivation {
@@ -200508,6 +201416,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-leancheck" = callPackage
+    ({ mkDerivation, base, leancheck, tasty }:
+     mkDerivation {
+       pname = "tasty-leancheck";
+       version = "0.0.1";
+       sha256 = "06nki1l05hh5r0q2lkn4rmj0cl8hz7r7zc71r64fx2k9z65n5497";
+       libraryHaskellDepends = [ base leancheck tasty ];
+       testHaskellDepends = [ base leancheck tasty ];
+       description = "LeanCheck support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tasty-lens" = callPackage
     ({ mkDerivation, base, lens, smallcheck, smallcheck-lens, tasty
      , tasty-smallcheck
@@ -202121,6 +203041,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-framework-leancheck" = callPackage
+    ({ mkDerivation, base, leancheck, test-framework }:
+     mkDerivation {
+       pname = "test-framework-leancheck";
+       version = "0.0.1";
+       sha256 = "0bwzc0vq28cmy5r966jxhacijd2hkna4magd9aw5wz34dcp4qv13";
+       libraryHaskellDepends = [ base leancheck test-framework ];
+       testHaskellDepends = [ base leancheck test-framework ];
+       description = "LeanCheck support for test-framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "test-framework-program" = callPackage
     ({ mkDerivation, base, directory, process, test-framework }:
      mkDerivation {
@@ -202165,6 +203097,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-framework-quickcheck2_0_3_0_5" = callPackage
+    ({ mkDerivation, base, extensible-exceptions, QuickCheck, random
+     , test-framework
+     }:
+     mkDerivation {
+       pname = "test-framework-quickcheck2";
+       version = "0.3.0.5";
+       sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9";
+       libraryHaskellDepends = [
+         base extensible-exceptions QuickCheck random test-framework
+       ];
+       description = "QuickCheck-2 support for the test-framework package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "test-framework-sandbox" = callPackage
     ({ mkDerivation, ansi-terminal, base, HUnit, lifted-base, mtl
      , temporary, test-framework, test-sandbox, test-sandbox-hunit
@@ -202745,8 +203693,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.5.3.1";
-       sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q";
+       version = "0.5.4.3";
+       sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
@@ -202760,17 +203708,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-builder_0_5_4_1" = callPackage
+  "text-builder_0_6_1_2" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, criterion
-     , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text
+     , deferred-folds, QuickCheck, quickcheck-instances, rerebase
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.5.4.1";
-       sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai";
+       version = "0.6.1.2";
+       sha256 = "0z42bgizn6ya89bnsdjk14y7k6mm5zj1782p97dc1vj9ym81ra18";
        libraryHaskellDepends = [
-         base base-prelude bytestring semigroups text
+         base base-prelude bytestring deferred-folds semigroups text
+         transformers
        ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -202891,6 +203841,8 @@ self: {
        pname = "text-generic-pretty";
        version = "1.2.1";
        sha256 = "1isj8wccd0yrgpmlggd2zykb8d9r77blngsqlbwmqs9gxbyk3wyg";
+       revision = "1";
+       editedCabalFile = "1m512nd5w4z6f12qy10bpjqfmpwkm5wg0kdrvvzc45s4dxmzwbxz";
        libraryHaskellDepends = [
          base containers ghc-prim groom ixset-typed protolude QuickCheck
          string-conversions text time unordered-containers wl-pprint-text
@@ -202999,27 +203951,6 @@ self: {
      }) {};
 
   "text-ldap" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
-     , memory, QuickCheck, quickcheck-simple, random, transformers
-     }:
-     mkDerivation {
-       pname = "text-ldap";
-       version = "0.1.1.12";
-       sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers dlist memory transformers
-       ];
-       executableHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring QuickCheck quickcheck-simple random
-       ];
-       description = "Parser and Printer for LDAP text data stream";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-ldap_0_1_1_13" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
      , memory, QuickCheck, quickcheck-simple, random, transformers
      }:
@@ -203038,7 +203969,6 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-lens" = callPackage
@@ -203333,6 +204263,8 @@ self: {
        pname = "text-show";
        version = "3.7.4";
        sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
+       revision = "1";
+       editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers contravariant generic-deriving
@@ -203365,8 +204297,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.5";
        sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
-       revision = "1";
-       editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a";
+       revision = "2";
+       editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i";
        libraryHaskellDepends = [
          base base-compat-batteries bifunctors binary containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -203800,17 +204732,6 @@ self: {
      }) {};
 
   "th-data-compat" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "th-data-compat";
-       version = "0.0.2.6";
-       sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Compatibility for data definition template of TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-data-compat_0_0_2_7" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-data-compat";
@@ -203819,7 +204740,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
@@ -203996,21 +204916,6 @@ self: {
      }) {};
 
   "th-lift" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
-     }:
-     mkDerivation {
-       pname = "th-lift";
-       version = "0.7.10";
-       sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
-       libraryHaskellDepends = [
-         base ghc-prim template-haskell th-abstraction
-       ];
-       testHaskellDepends = [ base ghc-prim template-haskell ];
-       description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift_0_7_11" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
      }:
      mkDerivation {
@@ -204023,7 +204928,6 @@ self: {
        testHaskellDepends = [ base ghc-prim template-haskell ];
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -204128,17 +205032,6 @@ self: {
      }) {};
 
   "th-reify-compat" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "th-reify-compat";
-       version = "0.0.1.4";
-       sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Compatibility for the result type of TH reify";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-reify-compat_0_0_1_5" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-reify-compat";
@@ -204147,7 +205040,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for the result type of TH reify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-many" = callPackage
@@ -204962,8 +205854,8 @@ self: {
        pname = "tibetan-utils";
        version = "0.1.1.5";
        sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q";
-       revision = "1";
-       editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck";
+       revision = "2";
+       editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf";
        libraryHaskellDepends = [
          base composition-prelude either megaparsec text text-show
        ];
@@ -204974,6 +205866,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tibetan-utils_0_1_1_9" = callPackage
+    ({ mkDerivation, base, composition-prelude, either, hspec
+     , hspec-megaparsec, megaparsec, text, text-show
+     }:
+     mkDerivation {
+       pname = "tibetan-utils";
+       version = "0.1.1.9";
+       sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8";
+       libraryHaskellDepends = [
+         base composition-prelude either megaparsec text text-show
+       ];
+       testHaskellDepends = [
+         base hspec hspec-megaparsec megaparsec text
+       ];
+       description = "Parse and display tibetan numerals";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tic-tac-toe" = callPackage
     ({ mkDerivation, base, glade, gtk, haskell98 }:
      mkDerivation {
@@ -205364,17 +206275,6 @@ self: {
      }) {};
 
   "time-locale-compat" = callPackage
-    ({ mkDerivation, base, old-locale, time }:
-     mkDerivation {
-       pname = "time-locale-compat";
-       version = "0.1.1.4";
-       sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
-       libraryHaskellDepends = [ base old-locale time ];
-       description = "Compatibile module for time-format locale";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "time-locale-compat_0_1_1_5" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
        pname = "time-locale-compat";
@@ -205383,7 +206283,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Compatibile module for time-format locale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-locale-vietnamese" = callPackage
@@ -206870,8 +207769,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.29";
-       sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
+       version = "0.1.0.36";
+       sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -207017,8 +207916,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "total-map";
-       version = "0.0.6";
-       sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj";
+       version = "0.0.7";
+       sha256 = "0chcnvsn3bzjmmp2bq6kxli1c73d477i49jbvnmqwz56an84ink1";
        libraryHaskellDepends = [ base containers ];
        description = "Finitely represented /total/ maps";
        license = stdenv.lib.licenses.bsd3;
@@ -209220,8 +210119,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.41";
-       sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm";
+       version = "1.0.1.42";
+       sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211691,6 +212590,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode_0_0_1_1" = callPackage
+    ({ mkDerivation, base, containers, semigroups, utility-ht }:
+     mkDerivation {
+       pname = "unicode";
+       version = "0.0.1.1";
+       sha256 = "1hgqnplpgaw0pwz0lfr59vmljcf4l5b4ynrhdcic94g18lpsmnvg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers semigroups ];
+       testHaskellDepends = [ base containers utility-ht ];
+       description = "Construct and transform unicode characters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicode-names" = callPackage
     ({ mkDerivation, array, base, containers, unicode-properties }:
      mkDerivation {
@@ -211944,6 +212858,8 @@ self: {
        pname = "uniprot-kb";
        version = "0.1.2.0";
        sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l";
+       revision = "1";
+       editedCabalFile = "0kvw9mzgjz6m1sslywn09n4axkjnwqpi4c5p00p9c81mr9fpbild";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base hspec neat-interpolation QuickCheck text
@@ -212002,8 +212918,8 @@ self: {
      }:
      mkDerivation {
        pname = "unique-logic-tf";
-       version = "0.5";
-       sha256 = "05v9ky3lrh4yzjsfgxa2sz44l7dlsvi5iv4h9rnsj2sd3hj2xcsa";
+       version = "0.5.0.1";
+       sha256 = "1v37bv5bjpkm5085sg4rf7ssbigsivib6fdxjhxyd36zhh08pdjy";
        libraryHaskellDepends = [
          base containers data-ref semigroups transformers utility-ht
        ];
@@ -212210,6 +213126,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "universal" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "universal";
+       version = "0.0.0.0";
+       sha256 = "0qcv0xi65l782yvn25an0qiavn942szs16j8p328i2pc6ggfymb2";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doHaddock = false;
+       description = "Universal";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "universal-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -212415,19 +213347,6 @@ self: {
      }) {};
 
   "unix-compat" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "unix-compat";
-       version = "0.5.0.1";
-       sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
-       revision = "1";
-       editedCabalFile = "0yrdy4dz0zskgpw7c4wgkwskgayqxvch37axwka5z4g5gmic4mnn";
-       libraryHaskellDepends = [ base unix ];
-       description = "Portable POSIX-compatibility layer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unix-compat_0_5_1" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "unix-compat";
@@ -212436,7 +213355,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Portable POSIX-compatibility layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix-fcntl" = callPackage
@@ -212587,8 +213505,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.7.0";
-       sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
+       version = "0.2.7.1";
+       sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
@@ -212601,14 +213519,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_8_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.8.0";
+       sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "unliftio-core";
-       version = "0.1.1.0";
-       sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
-       revision = "1";
-       editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
+       version = "0.1.2.0";
+       sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
        license = stdenv.lib.licenses.mit;
@@ -212958,8 +213895,8 @@ self: {
      }:
      mkDerivation {
        pname = "unused";
-       version = "0.8.0.0";
-       sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n";
+       version = "0.9.0.0";
+       sha256 = "1qxz70a9gry1d4a2bgixssq29hkdvck3s0yccbjgksiy98rk463y";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -213039,6 +213976,16 @@ self: {
        license = "unknown";
      }) {};
 
+  "update-monad" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "update-monad";
+       version = "0.1.0.0";
+       sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns";
+       libraryHaskellDepends = [ base mtl ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "update-nix-fetchgit" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring
      , data-fix, errors, hnix, process, text, time, transformers
@@ -213826,17 +214773,6 @@ self: {
      }) {};
 
   "util" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "util";
-       version = "0.1.10.1";
-       sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
-       libraryHaskellDepends = [ base ];
-       description = "Utilities";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "util_0_1_11_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
@@ -213845,7 +214781,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-exception" = callPackage
@@ -213886,6 +214821,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "util-primitive-control" = callPackage
+    ({ mkDerivation, base, control, primitive, smallcheck, tasty
+     , tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "util-primitive-control";
+       version = "0.1.0.0";
+       sha256 = "104p69sw8jyc2dvarv7573cks3p6fvk5d61qhp9y47nylp4q8iqx";
+       libraryHaskellDepends = [ base control primitive util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       doHaddock = false;
+       description = "Utilities for stateful primitive types and types based on them";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "util-universe" = callPackage
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck
+     , universe-base, universe-instances-base
+     }:
+     mkDerivation {
+       pname = "util-universe";
+       version = "0.1.0.0";
+       sha256 = "1jpi5ic14knr3g8qmz6ls430ll4m9wi5ag1ngmlz46h1zlw53l8y";
+       libraryHaskellDepends = [
+         base universe-base universe-instances-base
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Utilities for universal types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "utility-ht" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -214575,22 +215541,6 @@ self: {
      }) {};
 
   "validity-path" = callPackage
-    ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
-     , validity
-     }:
-     mkDerivation {
-       pname = "validity-path";
-       version = "0.3.0.1";
-       sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
-       libraryHaskellDepends = [ base filepath path validity ];
-       testHaskellDepends = [
-         base filepath genvalidity-hspec hspec path validity
-       ];
-       description = "Validity instances for Path";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-path_0_3_0_2" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
@@ -214604,7 +215554,6 @@ self: {
        ];
        description = "Validity instances for Path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-primitive" = callPackage
@@ -214619,17 +215568,6 @@ self: {
      }) {};
 
   "validity-scientific" = callPackage
-    ({ mkDerivation, base, scientific, validity }:
-     mkDerivation {
-       pname = "validity-scientific";
-       version = "0.2.0.1";
-       sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
-       libraryHaskellDepends = [ base scientific validity ];
-       description = "Validity instances for scientific";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-scientific_0_2_0_2" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
@@ -214638,21 +215576,9 @@ self: {
        libraryHaskellDepends = [ base scientific validity ];
        description = "Validity instances for scientific";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-text" = callPackage
-    ({ mkDerivation, base, bytestring, text, validity }:
-     mkDerivation {
-       pname = "validity-text";
-       version = "0.3.0.1";
-       sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
-       libraryHaskellDepends = [ base bytestring text validity ];
-       description = "Validity instances for text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-text_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
@@ -214661,21 +215587,9 @@ self: {
        libraryHaskellDepends = [ base bytestring text validity ];
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-time" = callPackage
-    ({ mkDerivation, base, time, validity }:
-     mkDerivation {
-       pname = "validity-time";
-       version = "0.2.0.1";
-       sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
-       libraryHaskellDepends = [ base time validity ];
-       description = "Validity instances for time";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-time_0_2_0_2" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
@@ -214684,23 +215598,9 @@ self: {
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-unordered-containers" = callPackage
-    ({ mkDerivation, base, hashable, unordered-containers, validity }:
-     mkDerivation {
-       pname = "validity-unordered-containers";
-       version = "0.2.0.1";
-       sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
-       libraryHaskellDepends = [
-         base hashable unordered-containers validity
-       ];
-       description = "Validity instances for unordered-containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-unordered-containers_0_2_0_2" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
@@ -214711,21 +215611,9 @@ self: {
        ];
        description = "Validity instances for unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-uuid" = callPackage
-    ({ mkDerivation, base, uuid, validity }:
-     mkDerivation {
-       pname = "validity-uuid";
-       version = "0.1.0.1";
-       sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
-       libraryHaskellDepends = [ base uuid validity ];
-       description = "Validity instances for uuid";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-uuid_0_1_0_2" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
@@ -214734,21 +215622,9 @@ self: {
        libraryHaskellDepends = [ base uuid validity ];
        description = "Validity instances for uuid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-vector" = callPackage
-    ({ mkDerivation, base, hashable, validity, vector }:
-     mkDerivation {
-       pname = "validity-vector";
-       version = "0.2.0.1";
-       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
-       libraryHaskellDepends = [ base hashable validity vector ];
-       description = "Validity instances for vector";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "validity-vector_0_2_0_2" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
@@ -214757,7 +215633,6 @@ self: {
        libraryHaskellDepends = [ base hashable validity vector ];
        description = "Validity instances for vector";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "valor" = callPackage
@@ -215270,26 +216145,6 @@ self: {
      }) {};
 
   "vector-algorithms" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primitive
-     , QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "vector-algorithms";
-       version = "0.7.0.1";
-       sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
-       revision = "2";
-       editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring primitive vector ];
-       testHaskellDepends = [
-         base bytestring containers QuickCheck vector
-       ];
-       description = "Efficient algorithms for vector arrays";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-algorithms_0_7_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, primitive
      , QuickCheck, vector
      }:
@@ -215305,7 +216160,6 @@ self: {
        ];
        description = "Efficient algorithms for vector arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-binary" = callPackage
@@ -215580,11 +216434,25 @@ self: {
        pname = "vector-space";
        version = "0.13";
        sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482";
+       revision = "1";
+       editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-space_0_14" = callPackage
+    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+     mkDerivation {
+       pname = "vector-space";
+       version = "0.14";
+       sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3";
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+       description = "Vector & affine spaces, linear maps, and derivatives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-space-map" = callPackage
     ({ mkDerivation, base, containers, doctest, vector-space }:
      mkDerivation {
@@ -216013,6 +216881,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_23" = callPackage
+    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.23";
+       sha256 = "0nxivlnzvnhsk9gn2d7x240n7803fy14pb5knjkxvsw0h0pj8kc6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers directory ghc-prof lens scientific text
+         vector vector-algorithms vty
+       ];
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -216164,18 +217051,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "vinyl_0_9_3" = callPackage
-    ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
-     , lens, linear, microlens, mwc-random, primitive
-     , should-not-typecheck, singletons, tagged, vector
+  "vinyl_0_10_0" = callPackage
+    ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+     , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+     , primitive, should-not-typecheck, singletons, tagged, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "vinyl";
-       version = "0.9.3";
-       sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj";
+       version = "0.10.0";
+       sha256 = "1d1lm9mi9gkcaw0lczbmbn81c3kc5yji3jbp2rjabiwhyi61mj4m";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
-         base doctest hspec lens microlens should-not-typecheck singletons
+         aeson base doctest hspec lens lens-aeson microlens mtl
+         should-not-typecheck singletons text unordered-containers vector
        ];
        benchmarkHaskellDepends = [
          base criterion linear microlens mwc-random primitive tagged vector
@@ -216513,8 +217402,8 @@ self: {
      }:
      mkDerivation {
        pname = "voicebase";
-       version = "0.1.1.1";
-       sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+       version = "0.1.1.2";
+       sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -216681,7 +217570,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_23_1" = callPackage
+  "vty_5_24" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216692,8 +217581,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.23.1";
-       sha256 = "1cd328prv1pddza87a2kfh93l101jg1afs5s951yhr9z93mgd7d9";
+       version = "5.24";
+       sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -217101,36 +217990,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.24.1";
-       sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_24_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -217158,7 +218017,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -218664,6 +219522,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_24" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+     , bytestring, case-insensitive, containers, directory, doctest
+     , gauge, ghc-prim, hashable, hspec, http-client, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.24";
+       sha256 = "1b0iwwmzzfs8x7c5spfn4y0kqwgkk711p1fzf854l6mmvsmiq4sk";
+       libraryHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec http-client http-date http-types http2 HUnit iproute
+         lifted-base network process QuickCheck silently simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers gauge hashable http-date
+         http-types network unix unix-compat
+       ];
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -218681,6 +219574,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "warp-grpc" = callPackage
+    ({ mkDerivation, base, binary, bytestring, case-insensitive
+     , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "warp-grpc";
+       version = "0.1.0.2";
+       sha256 = "1xndsd5li3bzj65pq0ml2c54v470zs14bqzimx4srnkas9kf5dyr";
+       libraryHaskellDepends = [
+         base binary bytestring case-insensitive http-types http2-grpc-types
+         proto-lens wai warp warp-tls
+       ];
+       description = "A minimal gRPC server on top of Warp";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "warp-static" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , mime-types, text, wai-app-static, wai-extra, warp
@@ -220434,8 +221343,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
        pname = "wilton-ffi";
-       version = "0.2.0.0";
-       sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7";
+       version = "0.3.0.1";
+       sha256 = "00ib82h5c35g5qf605pn9qijg4y1xcn1jgjgqbd0imhnhhqyp067";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
        description = "Haskell modules support for Wilton JavaScript runtime";
        license = stdenv.lib.licenses.mit;
@@ -222926,6 +223835,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-basic_0_1_3_1" = callPackage
+    ({ mkDerivation, base, containers, data-accessor
+     , explicit-exception, semigroups, utility-ht
+     }:
+     mkDerivation {
+       pname = "xml-basic";
+       version = "0.1.3.1";
+       sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d";
+       libraryHaskellDepends = [
+         base containers data-accessor explicit-exception semigroups
+         utility-ht
+       ];
+       description = "Basics for XML/HTML representation and processing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-catalog" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, text
      , transformers, uri-conduit, xml-conduit
@@ -223885,16 +224811,12 @@ self: {
      }) {};
 
   "xmonad-spotify" = callPackage
-    ({ mkDerivation, base, containers, dbus, X11, xmonad
-     , xmonad-contrib
-     }:
+    ({ mkDerivation, base, containers, dbus, X11 }:
      mkDerivation {
        pname = "xmonad-spotify";
-       version = "0.1.0.0";
-       sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm";
-       libraryHaskellDepends = [
-         base containers dbus X11 xmonad xmonad-contrib
-       ];
+       version = "0.1.0.1";
+       sha256 = "11j2kd3l8yh3fn7smcggmi8jv66x80df52vwa7kmxchbsxf5qrpi";
+       libraryHaskellDepends = [ base containers dbus X11 ];
        description = "Bind media keys to work with Spotify";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223938,14 +224860,14 @@ self: {
 
   "xmonad-volume" = callPackage
     ({ mkDerivation, alsa-mixer, base, composition-prelude, containers
-     , X11, xmonad
+     , X11
      }:
      mkDerivation {
        pname = "xmonad-volume";
-       version = "0.1.0.0";
-       sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx";
+       version = "0.1.0.1";
+       sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild";
        libraryHaskellDepends = [
-         alsa-mixer base composition-prelude containers X11 xmonad
+         alsa-mixer base composition-prelude containers X11
        ];
        description = "XMonad volume controls";
        license = stdenv.lib.licenses.bsd3;
@@ -224625,15 +225547,15 @@ self: {
 
   "yaml" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
+     , conduit, containers, directory, filepath, hspec, HUnit, mockery
+     , resourcet, scientific, semigroups, template-haskell, temporary
+     , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
        version = "0.8.32";
        sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
-       configureFlags = [ "-fsystem-libyaml" ];
+       configureFlags = [ "-f-system-libyaml" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224641,7 +225563,6 @@ self: {
          filepath resourcet scientific semigroups template-haskell text
          transformers unordered-containers vector
        ];
-       librarySystemDepends = [ libyaml ];
        testHaskellDepends = [
          aeson attoparsec base base-compat bytestring conduit containers
          directory filepath hspec HUnit mockery resourcet scientific
@@ -224650,32 +225571,32 @@ self: {
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
+     }) {};
 
-  "yaml_0_10_0" = callPackage
+  "yaml_0_10_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups
+     , mockery, mtl, raw-strings-qq, resourcet, scientific
      , template-haskell, temporary, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.10.0";
-       sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm";
+       version = "0.10.1.1";
+       sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit containers directory
-         filepath mtl resourcet scientific semigroups template-haskell text
+         filepath mtl resourcet scientific template-haskell text
          transformers unordered-containers vector
        ];
        librarySystemDepends = [ libyaml ];
        testHaskellDepends = [
          aeson attoparsec base base-compat bytestring conduit containers
          directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet
-         scientific semigroups template-haskell temporary text transformers
+         scientific template-haskell temporary text transformers
          unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";

From 11930854a2ad64f86f765904323413afe052e7a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 29 Aug 2018 19:43:31 +0200
Subject: [PATCH 0848/3253] haskell-yaml: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d363d2e87b69..dd599f67bc06 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -314,9 +314,6 @@ self: super: builtins.intersectAttrs super {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
-  # https://github.com/snoyberg/yaml/issues/106
-  yaml = disableCabalFlag super.yaml "system-libyaml";
-
   # The cabal files for these libraries do not list the required system dependencies.
   miniball = overrideCabal super.miniball (drv: {
     librarySystemDepends = [ pkgs.miniball ];

From 1c5d7ad52efb2002bdf5a04b3a699d0d021cc224 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Sep 2018 11:38:33 +0200
Subject: [PATCH 0849/3253] cabal2nix: fix (and clean up)override for hpack
 dependency

---
 .../haskell-modules/configuration-common.nix       | 14 ++++----------
 .../haskell-modules/hackage-packages.nix           |  5 ++++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2e293f1031b0..11772dd7d555 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1074,16 +1074,10 @@ self: super: {
   haddock-library = doJailbreak (dontCheck super.haddock-library);
   haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
 
-  # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
-  # Lets remove this once the LTS has upraded to 0.29.6.
-  hpack = super.hpack_0_29_7;
-
-  # The test suite does not know how to find the 'cabal2nix' binary.
-  cabal2nix = overrideCabal super.cabal2nix (drv: {
-    preCheck = ''
-      export PATH="$PWD/dist/build/cabal2nix:$PATH"
-      export HOME="$TMPDIR/home"
-    '';
+  # The tool needs a newer hpack version than the one mandated by LTS-12.x.
+  cabal2nix = super.cabal2nix.overrideScope (self: super: {
+    hpack = self.hpack_0_30_0;
+    yaml = self.yaml_0_10_1_1;
   });
 
   # Break out of "aeson <1.3, temporary <1.3".
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dc2e2abed6ab..6fda57921886 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -41611,6 +41611,10 @@ self: {
          base Cabal containers directory filepath language-nix lens pretty
          process tasty tasty-golden
        ];
+       preCheck = ''
+         export PATH="$PWD/dist/build/cabal2nix:$PATH"
+         export HOME="$TMPDIR/home"
+       '';
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -202873,7 +202877,6 @@ self: {
        ];
        description = "Terminal emulator configurable in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "termplot" = callPackage

From da86e4255b03510464fd32adca3ccb5fd7e77ede Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 28 Aug 2018 09:55:59 +0900
Subject: [PATCH 0850/3253] haskellPackages.termonad: Add dontCheck and remove
 from dont-distribute-packages.

The doctests for termonad fail to build only with nix.  When building
without nix, the doctests run correctly:

https://github.com/cdepillabout/termonad/issues/15

This PR disables the tests for termonad, as well as removing it from
dont-distribute-packages.
---
 .../haskell-modules/configuration-hackage2nix.yaml            | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7b827664cdab..71dd526c1a3a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9060,7 +9060,6 @@ dont-distribute-packages:
   termcolor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terminal-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  termonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index dd599f67bc06..d016bd6ce8d6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -507,4 +507,8 @@ self: super: builtins.intersectAttrs super {
   LDAP = dontCheck (overrideCabal super.LDAP (drv: {
     librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
   }));
+
+  # Doctests hang only when compiling with nix.
+  # https://github.com/cdepillabout/termonad/issues/15
+  termonad = dontCheck super.termonad;
 }

From 838b4fe552204841b37c2c08e7581409bd428906 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 3 Sep 2018 12:26:48 +0200
Subject: [PATCH 0851/3253] haskell-Cabal: keep a copy of the 2.2.x version
 around in the package set

---
 .../configuration-hackage2nix.yaml            |  1 +
 .../haskell-modules/hackage-packages.nix      | 33 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 71dd526c1a3a..467234b8a25d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2378,6 +2378,7 @@ extra-packages:
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.24.*                     # required for jailbreak-cabal etc.
+  - Cabal == 2.2.*                      # required for jailbreak-cabal etc.
   - colour < 2.3.4                      # newer versions don't support GHC 7.10.x
   - conduit >=1.1 && <1.3               # pre-lts-11.x versions neeed by git-annex 6.20180227
   - conduit-extra >=1.1 && <1.3         # pre-lts-11.x versions neeed by git-annex 6.20180227
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6fda57921886..ee9e9b90fdf9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2440,6 +2440,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_2_2_0_1" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, binary
+     , bytestring, containers, deepseq, Diff, directory, filepath
+     , integer-logarithms, mtl, optparse-applicative, parsec, pretty
+     , process, QuickCheck, tagged, tar, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, text, time, transformers
+     , tree-diff, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "2.2.0.1";
+       sha256 = "0yqa6fm9jvr0ka6b1mf17bf43092dc1bai6mqyiwwwyz0h9k1d82";
+       setupHaskellDepends = [ mtl parsec ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         mtl parsec pretty process text time transformers unix
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bytestring containers deepseq
+         Diff directory filepath integer-logarithms optparse-applicative
+         pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit
+         tasty-quickcheck text tree-diff
+       ];
+       doCheck = false;
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal_2_4_0_0" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, binary
      , bytestring, containers, deepseq, Diff, directory, filepath
@@ -96129,7 +96158,7 @@ self: {
        description = "Haskell interface of the igraph library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {igraph = null;};
+     }) {inherit (pkgs) igraph;};
 
   "haskell-import-graph" = callPackage
     ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text
@@ -117256,7 +117285,7 @@ self: {
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {igraph = null;};
+     }) {inherit (pkgs) igraph;};
 
   "igrf" = callPackage
     ({ mkDerivation, ad, base, polynomial }:

From e6e56bbe32099663b6f78db60c95abecd2fec927 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Sep 2018 09:33:37 -0400
Subject: [PATCH 0852/3253] ghc: Apply fix to abi-hash with backpack.

See https://phabricator.haskell.org/D5123.
---
 pkgs/development/compilers/ghc/8.4.3.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index aa9fab184364..365f401119da 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -99,6 +99,10 @@ stdenv.mkDerivation (rec {
     sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
     extraPrefix = "utils/hsc2hs/";
     stripLen = 1;
+  }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
+    url = "http://tarballs.nixos.org/sha256/${sha256}";
+    name = "D5123.diff";
+    sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
   })] ++ stdenv.lib.optional deterministicProfiling
     (fetchpatch rec {
       url = "http://tarballs.nixos.org/sha256/${sha256}";

From cd41cad074153bedeb2ab98cf59c668183164ed3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 3 Sep 2018 09:34:14 -0400
Subject: [PATCH 0853/3253] haskell.compiler.ghc861: Apply fix to abi-hash with
 backpack.

See https://phabricator.haskell.org/D5123.
---
 pkgs/development/compilers/ghc/8.6.1.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 7fcb52969151..36ef9d0cc73d 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -2,7 +2,7 @@
 
 # build-tools
 , bootPkgs, alex, happy, hscolour
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libiconv ? null, ncurses
 
@@ -90,6 +90,12 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "doc" ];
 
+  patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
+    url = "http://tarballs.nixos.org/sha256/${sha256}";
+    name = "D5123.diff";
+    sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+  })];
+
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.

From 53d34305f69d3e8e217ef2fc68a5727c7c10f9af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Sep 2018 10:27:39 +0200
Subject: [PATCH 0854/3253] haskell-stm: update overrides that use version
 2.4.5.0 to version 2.4.5.1

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghcjs.nix      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 9bd45c9887f1..5684d14caddf 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -40,7 +40,7 @@ self: super: {
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
   parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
-  stm = self.stm_2_4_5_0;
+  stm = self.stm_2_4_5_1;
   text = self.text_1_2_3_0;
 
   # Build jailbreak-cabal with the latest version of Cabal.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f475512a8dab..eca2d111b542 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -39,7 +39,7 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_0;
+  stm = self.stm_2_4_5_1;
   text = self.text_1_2_3_0;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f73172e02d38..5d499c803dae 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,7 +39,7 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_0;
+  stm = self.stm_2_4_5_1;
   text = self.text_1_2_3_0;
 
   # Make sure we can still build Cabal 1.x.
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c79406a94727..7e8bc1a1e8e3 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -25,7 +25,7 @@ self: super:
 
   # GHCJS does not ship with the same core packages as GHC.
   # https://github.com/ghcjs/ghcjs/issues/676
-  stm = self.stm_2_4_5_0;
+  stm = self.stm_2_4_5_1;
   ghc-compact = self.ghc-compact_0_1_0_0;
 
   network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);

From 9d47aaa3b69ad75b3a2699eafdf3d2d92b214d5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Sep 2018 10:33:23 +0200
Subject: [PATCH 0855/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11-9-gb3613cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.
---
 .../haskell-modules/hackage-packages.nix      | 899 ++++++++++++------
 1 file changed, 616 insertions(+), 283 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ee9e9b90fdf9..003d9d259ace 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6103,8 +6103,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUtil";
-       version = "0.10.1";
-       sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3";
+       version = "0.10.2";
+       sha256 = "05x733nk3dbla4y6p7b1nx4pv3b0wm6idhsm7p30z2f968k3hyv9";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath hpp JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
@@ -14973,14 +14973,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_12_1" = callPackage
+  "QuickCheck_2_12_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, erf, process, random
      , template-haskell, tf-random, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.12.1";
-       sha256 = "1xq2cmz1yr63a2f6yz5v6majd0wqagx13xrk4b3xa7y9nbpxixag";
+       version = "2.12.2";
+       sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r";
        libraryHaskellDepends = [
          base containers deepseq erf random template-haskell tf-random
          transformers
@@ -23087,20 +23087,17 @@ self: {
 
   "algebraic-graphs" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, containers
-     , criterion, deepseq, extra, QuickCheck
+     , deepseq, extra, mtl, QuickCheck
      }:
      mkDerivation {
        pname = "algebraic-graphs";
-       version = "0.1.1.1";
-       sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7";
+       version = "0.2";
+       sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8";
        libraryHaskellDepends = [
-         array base base-compat containers deepseq
+         array base base-compat containers deepseq mtl
        ];
        testHaskellDepends = [
-         base base-compat base-orphans containers extra QuickCheck
-       ];
-       benchmarkHaskellDepends = [
-         base base-compat containers criterion
+         array base base-compat base-orphans containers extra QuickCheck
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
@@ -28494,8 +28491,8 @@ self: {
        pname = "arithmoi";
        version = "0.7.0.0";
        sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
-       revision = "2";
-       editedCabalFile = "1db2pcwip682f4zs1qnqzqqdswhqzbsxydy89m6zqm5ddlgrw5sq";
+       revision = "3";
+       editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers exact-pi ghc-prim integer-gmp
@@ -29870,8 +29867,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "atomic-modify";
-       version = "0.1.0.1";
-       sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r";
+       version = "0.1.0.2";
+       sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
@@ -30027,8 +30024,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.2.1.8";
-       sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
+       version = "3.2.2.0";
+       sha256 = "10xwgc7y324fgisqjkx2jk5bq226fj3ayl373m6m1nbnx2qax22w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -30654,6 +30651,8 @@ self: {
        pname = "aura";
        version = "2.0.0";
        sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
+       revision = "1";
+       editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55659,6 +55658,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cue-sheet_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec
+     , mtl, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cue-sheet";
+       version = "2.0.0";
+       sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class exceptions megaparsec
+         mtl QuickCheck text
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-megaparsec megaparsec
+         QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Support for construction, rendering, and parsing of CUE sheets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cufft" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
      , template-haskell
@@ -57483,8 +57506,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "data-forest";
-       version = "0.1.0.6";
-       sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk";
+       version = "0.1.0.7";
+       sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
@@ -59897,17 +59920,16 @@ self: {
      }) {};
 
   "deferred-folds" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, primitive
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , primitive, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.1";
-       sha256 = "1s1zz1yq97f3ivm68d8rv75v87li2003qk7w4n9s4nrx118llv6f";
-       revision = "1";
-       editedCabalFile = "0k4jh84a5mivx2wcwpdr9clbfx61j45ijbd8p82cdp77j35nz1gc";
+       version = "0.9.7";
+       sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0";
        libraryHaskellDepends = [
-         base bytestring containers foldl primitive transformers
+         base bytestring containers foldl hashable primitive transformers
+         unordered-containers vector
        ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
@@ -64403,8 +64425,8 @@ self: {
     ({ mkDerivation, base, indexed }:
      mkDerivation {
        pname = "do-notation";
-       version = "0.1.0.1";
-       sha256 = "1ab32s7vjna1zkyvild62jsf9zkqls1bz3zp0fzfn0ykrv3045l8";
+       version = "0.1.0.2";
+       sha256 = "1xbvphpwbzns4567zbk8baq0zd068dcprp59cjzhbplf9cypiwy9";
        libraryHaskellDepends = [ base indexed ];
        testHaskellDepends = [ base indexed ];
        description = "Generalize do-notation to work on monads and indexed monads simultaneously";
@@ -67500,8 +67522,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "either-list-functions";
-       version = "0.0.0.2";
-       sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d";
+       version = "0.0.0.3";
+       sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
@@ -68422,6 +68444,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.7";
+       sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -70785,6 +70824,8 @@ self: {
        pname = "eventstore";
        version = "1.1.6";
        sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w";
+       revision = "1";
+       editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
          containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -73687,20 +73728,20 @@ self: {
      }) {};
 
   "fficxx" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, data-default
-     , directory, either, errors, filepath, hashable, haskell-src-exts
-     , lens, mtl, process, pureMD5, split, template, template-haskell
-     , text, transformers, unordered-containers
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+     , containers, data-default, directory, either, errors, filepath
+     , hashable, haskell-src-exts, lens, mtl, process, pureMD5, split
+     , template, template-haskell, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "fficxx";
-       version = "0.4.1";
-       sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4";
-       enableSeparateDataOutput = true;
+       version = "0.5";
+       sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy";
        libraryHaskellDepends = [
-         base bytestring Cabal containers data-default directory either
-         errors filepath hashable haskell-src-exts lens mtl process pureMD5
-         split template template-haskell text transformers
+         aeson aeson-pretty base bytestring Cabal containers data-default
+         directory either errors filepath hashable haskell-src-exts lens mtl
+         process pureMD5 split template template-haskell text transformers
          unordered-containers
        ];
        description = "automatic C++ binding generation";
@@ -73712,8 +73753,8 @@ self: {
     ({ mkDerivation, base, bytestring, template-haskell }:
      mkDerivation {
        pname = "fficxx-runtime";
-       version = "0.3";
-       sha256 = "18pzjhfqsr2f783xywmcfkz5isx31iqcyng4j5mbz92q2m166idb";
+       version = "0.5";
+       sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        description = "Runtime for fficxx-generated library";
        license = stdenv.lib.licenses.bsd3;
@@ -75195,8 +75236,8 @@ self: {
      }:
      mkDerivation {
        pname = "fizzbuzz-as-a-service";
-       version = "0.1.0.2";
-       sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk";
+       version = "0.1.0.3";
+       sha256 = "0kzhbavi26qbph6pgna77fbnpfgrxi81h9v92177ycl980k4qdwv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75481,44 +75522,33 @@ self: {
      }) {};
 
   "flight-igc" = callPackage
-    ({ mkDerivation, base, cmdargs, directory, filemanip, filepath
-     , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers
-     }:
+    ({ mkDerivation, base, bytestring, parsec, utf8-string }:
      mkDerivation {
        pname = "flight-igc";
-       version = "0.1.0";
-       sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl";
-       revision = "1";
-       editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec ];
-       executableHaskellDepends = [
-         base cmdargs directory filemanip filepath mtl raw-strings-qq
-         system-filepath transformers
-       ];
-       testHaskellDepends = [ base hlint ];
+       version = "1.0.0";
+       sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9";
+       libraryHaskellDepends = [ base bytestring parsec utf8-string ];
        description = "A parser for IGC files";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flight-kml" = callPackage
-    ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt
+    ({ mkDerivation, aeson, base, detour-via-sci, doctest, hxt
      , hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust
      , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck, template-haskell, time
      }:
      mkDerivation {
        pname = "flight-kml";
-       version = "1.0.0";
-       sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c";
+       version = "1.0.1";
+       sha256 = "1g70vm7qbxsx2azgb759xcpizq5c1ic2173w78jib0f7mpb8qc28";
        libraryHaskellDepends = [
          aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust
          split time
        ];
        testHaskellDepends = [
-         aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path
+         aeson base detour-via-sci doctest hxt hxt-xpath parsec path
          raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck template-haskell time
        ];
@@ -89784,8 +89814,8 @@ self: {
      }:
      mkDerivation {
        pname = "grpc-etcd-client";
-       version = "0.1.1.0";
-       sha256 = "01x5463h4xc04k3rax10zz7safa65g331jb9ksikjyrbk11rlpl1";
+       version = "0.1.1.2";
+       sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr";
        libraryHaskellDepends = [
          base bytestring data-default-class grpc-api-etcd http2-client
          http2-client-grpc lens network proto-lens proto-lens-protoc
@@ -90645,8 +90675,8 @@ self: {
      }:
      mkDerivation {
        pname = "h-gpgme";
-       version = "0.5.0.0";
-       sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp";
+       version = "0.5.1.0";
+       sha256 = "0fdlfi068m23yizkfgsbzjvd1yxmrvmbndsbsvawljq98jc75sgl";
        libraryHaskellDepends = [
          base bindings-gpgme bytestring data-default email-validate time
          transformers unix
@@ -92391,17 +92421,17 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.12.0";
-       sha256 = "0i3d3kydbna29wvaahwg9mkhykzrbnk6lg62mcbak78z24l1zmzl";
+       version = "1.13.0";
+       sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers language-docker megaparsec mtl
-         ShellCheck split text void
+         aeson base bytestring containers directory filepath language-docker
+         megaparsec mtl ShellCheck split text void yaml
        ];
        executableHaskellDepends = [
-         base containers directory filepath gitrev language-docker
-         megaparsec optparse-applicative text yaml
+         base containers gitrev language-docker megaparsec
+         optparse-applicative text
        ];
        testHaskellDepends = [
          aeson base bytestring hspec HUnit language-docker megaparsec
@@ -98091,31 +98121,30 @@ self: {
      }) {};
 
   "haskoin-core" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
-     , bytestring, cereal, conduit, containers, cryptohash, deepseq
-     , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf
-     , QuickCheck, safe, scientific, secp256k1, split
-     , string-conversions, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, unordered-containers
-     , vector
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
+     , cereal, conduit, containers, cryptonite, deepseq, entropy
+     , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
+     , network, QuickCheck, safe, scientific, secp256k1-haskell, split
+     , string-conversions, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.4.2";
-       sha256 = "0nyla9kqgyjahnpf3idi7kzyx8h7q92vk3jql1gl9iq8q9acwnzk";
+       version = "0.5.2";
+       sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b";
        libraryHaskellDepends = [
-         aeson base base16-bytestring byteable bytestring cereal conduit
-         containers cryptohash deepseq either entropy largeword mtl murmur3
-         network pbkdf QuickCheck secp256k1 split string-conversions text
-         time vector
+         aeson array base base16-bytestring bytestring cereal conduit
+         containers cryptonite deepseq entropy hashable memory mtl murmur3
+         network QuickCheck scientific secp256k1-haskell split
+         string-conversions text time transformers unordered-containers
+         vector
        ];
        testHaskellDepends = [
-         aeson base binary bytestring cereal containers HUnit largeword mtl
-         QuickCheck safe scientific secp256k1 split string-conversions
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         unordered-containers vector
+         aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
+         safe split string-conversions text vector
        ];
-       description = "Implementation of the core Bitcoin protocol features";
+       testToolDepends = [ hspec-discover ];
+       description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -98144,34 +98173,25 @@ self: {
      }) {};
 
   "haskoin-node" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, cereal
-     , concurrent-extra, conduit, conduit-extra, containers
-     , data-default, deepseq, either, esqueleto, exceptions
-     , haskoin-core, HUnit, largeword, lifted-async, lifted-base
-     , monad-control, monad-logger, mtl, network, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, random
-     , resource-pool, resourcet, stm, stm-chans, stm-conduit
-     , string-conversions, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time
+    ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
+     , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe
+     , random, resourcet, rocksdb-haskell, rocksdb-query
+     , string-conversions, time, unique, unliftio
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.4.2";
-       sha256 = "0khgdr5qql716d1klajs4y0mkyz0d9h3drahhv8062k64n7a989s";
+       version = "0.5.2";
+       sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih";
        libraryHaskellDepends = [
-         aeson async base bytestring cereal concurrent-extra conduit
-         conduit-extra containers data-default deepseq either esqueleto
-         exceptions haskoin-core largeword lifted-async lifted-base
-         monad-control monad-logger mtl network persistent
-         persistent-template random resource-pool stm stm-chans stm-conduit
-         string-conversions text time
+         base bytestring cereal conduit conduit-extra hashable haskoin-core
+         monad-logger mtl network nqe random resourcet rocksdb-haskell
+         rocksdb-query string-conversions time unique unliftio
        ];
        testHaskellDepends = [
-         base haskoin-core HUnit monad-logger mtl persistent
-         persistent-sqlite QuickCheck resourcet test-framework
-         test-framework-hunit test-framework-quickcheck2
+         base bytestring cereal haskoin-core hspec monad-logger mtl network
+         nqe random rocksdb-haskell unliftio
        ];
-       description = "Implementation of a Bitoin node";
+       description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -98220,6 +98240,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskoin-store" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, conduit
+     , containers, directory, filepath, haskoin-core, haskoin-node
+     , hspec, http-types, monad-logger, mtl, network, nqe
+     , optparse-applicative, random, rocksdb-haskell, rocksdb-query
+     , scotty, string-conversions, text, time, transformers, unliftio
+     }:
+     mkDerivation {
+       pname = "haskoin-store";
+       version = "0.1.3";
+       sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring cereal conduit containers haskoin-core
+         haskoin-node monad-logger mtl network nqe random rocksdb-haskell
+         rocksdb-query string-conversions text time transformers unliftio
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit directory filepath haskoin-core
+         haskoin-node http-types monad-logger nqe optparse-applicative
+         rocksdb-haskell scotty string-conversions text unliftio
+       ];
+       testHaskellDepends = [
+         base haskoin-core haskoin-node hspec monad-logger nqe
+         rocksdb-haskell unliftio
+       ];
+       description = "Storage and index for Bitcoin and Bitcoin Cash";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "haskoin-util" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, either
      , HUnit, mtl, QuickCheck, test-framework, test-framework-hunit
@@ -102003,6 +102054,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hexml_0_3_4" = callPackage
+    ({ mkDerivation, base, bytestring, extra }:
+     mkDerivation {
+       pname = "hexml";
+       version = "0.3.4";
+       sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k";
+       libraryHaskellDepends = [ base bytestring extra ];
+       testHaskellDepends = [ base bytestring ];
+       description = "XML subset DOM parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hexml-lens" = callPackage
     ({ mkDerivation, base, bytestring, contravariant, doctest
      , foundation, hexml, hspec, lens, profunctors, QuickCheck, text
@@ -107259,18 +107323,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_30_0" = callPackage
+  "hpack_0_31_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , http-client, http-client-tls, http-types, HUnit, infer-license
-     , interpolate, mockery, pretty, QuickCheck, scientific
-     , template-haskell, temporary, text, transformers
+     , hspec-discover, http-client, http-client-tls, http-types, HUnit
+     , infer-license, interpolate, mockery, pretty, QuickCheck
+     , scientific, template-haskell, temporary, text, transformers
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.30.0";
-       sha256 = "042lsw0pm5ljfd9vap0r1a8xcvfzyswp5rd495v0grdhxmpbqkyx";
+       version = "0.31.0";
+       sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107292,6 +107356,7 @@ self: {
          QuickCheck scientific template-haskell temporary text transformers
          unordered-containers vector yaml
        ];
+       testToolDepends = [ hspec-discover ];
        description = "A modern format for Haskell packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107693,18 +107758,18 @@ self: {
      }) {};
 
   "hpp" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-trie, directory
-     , filepath, ghc-prim, time, transformers
+    ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim
+     , time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hpp";
-       version = "0.5.2";
-       sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc";
+       version = "0.6.1";
+       sha256 = "1gv2gndbyrppl8qan680kl9kmwv6b5a5j5yrwifzh8rj73s47a6i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bytestring-trie directory filepath ghc-prim time
-         transformers
+         base bytestring directory filepath ghc-prim time transformers
+         unordered-containers
        ];
        executableHaskellDepends = [ base directory filepath time ];
        testHaskellDepends = [ base bytestring transformers ];
@@ -113858,16 +113923,16 @@ self: {
   "http2-client-grpc" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, case-insensitive
      , data-default-class, http2, http2-client, http2-grpc-types, lens
-     , proto-lens, proto-lens-protoc, text, tls, zlib
+     , proto-lens, proto-lens-protoc, text, tls
      }:
      mkDerivation {
        pname = "http2-client-grpc";
-       version = "0.5.0.1";
-       sha256 = "0kjzl1a3fis2jzk18ad9kv1bnzplqshf7i2mg20w8jxvl952v494";
+       version = "0.5.0.3";
+       sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive data-default-class
          http2 http2-client http2-grpc-types lens proto-lens
-         proto-lens-protoc text tls zlib
+         proto-lens-protoc text tls
        ];
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
@@ -118811,7 +118876,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_6_0_8" = callPackage
+  "influxdb_1_6_0_9" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, lens, network, optional-args, QuickCheck, scientific
@@ -118820,8 +118885,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0.8";
-       sha256 = "1y2xgridlwmgmhvlchpjlpr8w17qscx6ng9hfara5qshll70vp5m";
+       version = "1.6.0.9";
+       sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -119479,6 +119544,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "integer-logarithms_1_0_2_2" = callPackage
+    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-logarithms";
+       version = "1.0.2.2";
+       sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms";
+       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Integer logarithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "integer-pure" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -119942,15 +120026,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "intro_0_5_0_0" = callPackage
+  "intro_0_5_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, dlist
      , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
      , unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.5.0.0";
-       sha256 = "0s2xn72d2am24mql3nznrimj308lvzdr44jccm14zx7qq7wpbqr3";
+       version = "0.5.1.0";
+       sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs";
        libraryHaskellDepends = [
          base bytestring containers deepseq dlist extra hashable mtl safe
          text transformers unordered-containers writer-cps-mtl
@@ -119960,7 +120044,7 @@ self: {
          QuickCheck safe text transformers unordered-containers
          writer-cps-mtl
        ];
-       description = "Safe and minimal prelude - Exports only total and safe functions, provides Text and Monad transformers";
+       description = "Safe and minimal prelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -122038,6 +122122,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "japanese-calendar" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "japanese-calendar";
+       version = "0.1.0.0";
+       sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec QuickCheck time ];
+       description = "Data type of Japanese Calendar (Wareki)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "japanese-holidays" = callPackage
     ({ mkDerivation, base, doctest, hspec, QuickCheck
      , quickcheck-instances, time
@@ -124814,21 +124910,26 @@ self: {
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.1.0";
-       sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
+       version = "0.4.0.2";
+       sha256 = "0gg94j983q6bga015h2wiia2a0miy0s70rsxa46g3k0czpkzgyyg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
          parsec regex-tdfa text transformers
        ];
-       executableHaskellDepends = [ base mtl ];
+       executableHaskellDepends = [
+         base bytestring containers deepseq either extra hxt ilist json mtl
+         parsec regex-tdfa text transformers
+       ];
        testHaskellDepends = [
-         base containers directory filepath HUnit hxt ilist json mtl parsec
-         primes tasty tasty-hunit text
+         base bytestring containers deepseq directory either extra filepath
+         HUnit hxt ilist json mtl parsec primes regex-tdfa tasty tasty-hunit
+         text transformers
        ];
        benchmarkHaskellDepends = [
-         base criterion deepseq directory filepath hxt mtl text
+         base bytestring containers criterion deepseq directory either extra
+         filepath hxt ilist json mtl parsec regex-tdfa text transformers
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
@@ -124910,16 +125011,17 @@ self: {
      }:
      mkDerivation {
        pname = "kazura-queue";
-       version = "0.1.0.2";
-       sha256 = "0yywvl9pdy78851cmby6z7f9ivinp83qxfxfmfn68qzavx5m9l0f";
-       libraryHaskellDepends = [
-         async atomic-primops base containers primitive
-       ];
+       version = "0.1.0.4";
+       sha256 = "0zi3b6d97ql3ixml238r50lpmp8aghz2mbc5yi94fyp9xvq42m2y";
+       libraryHaskellDepends = [ atomic-primops base primitive ];
        testHaskellDepends = [
-         async base containers deepseq doctest exceptions free hspec
-         hspec-expectations HUnit mtl QuickCheck transformers
+         async atomic-primops base containers deepseq doctest exceptions
+         free hspec hspec-expectations HUnit mtl primitive QuickCheck
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         atomic-primops base criterion primitive stm
        ];
-       benchmarkHaskellDepends = [ async base containers criterion stm ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126415,6 +126517,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambda-calculus-interpreter" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "lambda-calculus-interpreter";
+       version = "0.1.0.3";
+       sha256 = "0ccvqblggpng130l7i857nh7vdr7yfxv8s8r17bd05ckclp21k0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Lambda Calculus interpreter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lambda-canvas" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, time }:
      mkDerivation {
@@ -130103,8 +130220,8 @@ self: {
      }:
      mkDerivation {
        pname = "lhs2tex";
-       version = "1.20";
-       sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df";
+       version = "1.21";
+       sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -132500,26 +132617,35 @@ self: {
      }) {};
 
   "liszt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, exceptions, filepath, fsnotify, network, reflection
-     , scientific, sendfile, stm, stm-delay, text, transformers
-     , unordered-containers, winery
+    ({ mkDerivation, base, binary, bytestring, cereal, containers, cpu
+     , deepseq, directory, exceptions, filepath, fsnotify, gauge
+     , network, reflection, scientific, sendfile, stm, stm-delay, text
+     , transformers, unordered-containers, vector, vector-th-unbox
+     , winery
      }:
      mkDerivation {
        pname = "liszt";
-       version = "0.1";
-       sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd";
+       version = "0.2";
+       sha256 = "1dy7c1l64ylgyxsi5ivxdc4kikaja4yhakx2z5i1sdk7kc7gkr51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring containers deepseq directory exceptions
-         filepath fsnotify network reflection scientific sendfile stm
-         stm-delay text transformers unordered-containers winery
+         base binary bytestring cereal containers cpu deepseq directory
+         exceptions filepath fsnotify network reflection scientific sendfile
+         stm stm-delay text transformers unordered-containers vector
+         vector-th-unbox winery
        ];
        executableHaskellDepends = [
-         base binary bytestring containers deepseq directory exceptions
-         filepath fsnotify network reflection scientific sendfile stm
-         stm-delay text transformers unordered-containers winery
+         base binary bytestring cereal containers cpu deepseq directory
+         exceptions filepath fsnotify network reflection scientific sendfile
+         stm stm-delay text transformers unordered-containers vector
+         vector-th-unbox winery
+       ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal containers cpu deepseq directory
+         exceptions filepath fsnotify gauge network reflection scientific
+         sendfile stm stm-delay text transformers unordered-containers
+         vector vector-th-unbox winery
        ];
        description = "Append only key-list database";
        license = stdenv.lib.licenses.bsd3;
@@ -137203,6 +137329,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, data-default-class
+     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+     , vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.2.1.0";
+       sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq ghc-prim primitive
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring data-default deepseq hspec QuickCheck
+         safe-exceptions vector
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, directory
      , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -139610,18 +139758,20 @@ self: {
        pname = "microspec";
        version = "0.1.0.0";
        sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71";
+       revision = "1";
+       editedCabalFile = "0cnfj3v6fzck57bgrsnmgz8a9azvz04pm3hv17fg12xzchmp07cq";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Tiny QuickCheck test library with minimal dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microspec_0_2_0_0" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
+  "microspec_0_2_0_1" = callPackage
+    ({ mkDerivation, base, QuickCheck, time }:
      mkDerivation {
        pname = "microspec";
-       version = "0.2.0.0";
-       sha256 = "0nz9achmckza9n6hx7ix7yyh9fhhfjnbszzjssz4mnghcmm8l0wv";
-       libraryHaskellDepends = [ base QuickCheck ];
+       version = "0.2.0.1";
+       sha256 = "1ygkxsj7rm42f245qip8893lm189immmd5ajimp5d1pkzfkw4dnp";
+       libraryHaskellDepends = [ base QuickCheck time ];
        description = "Tiny QuickCheck test library with minimal dependencies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140512,6 +140662,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_0_21_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+     , http-types, lucid, network-uri, servant, servant-lucid, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "0.21.2.0";
+       sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-api-data http-types lucid
+         network-uri servant servant-lucid text transformers vector
+       ];
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -144197,8 +144367,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "multi-instance";
-       version = "0.0.0.2";
-       sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63";
+       version = "0.0.0.3";
+       sha256 = "197jrq0r7va89z2hzhna0v4xmrranq1lgv4ncmbzlzliis6j7m22";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
@@ -145211,8 +145381,8 @@ self: {
     ({ mkDerivation, base, safe-exceptions }:
      mkDerivation {
        pname = "mvar-lock";
-       version = "0.1.0.1";
-       sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r";
+       version = "0.1.0.2";
+       sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg";
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
@@ -147520,8 +147690,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.3.3";
-       sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav";
+       version = "0.3.4";
+       sha256 = "0zzb5jxb6zxwq88qwldzy7qy5b4arz4vnn82ilcz2214w21bhzlp";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
@@ -149896,14 +150066,15 @@ self: {
 
   "nqe" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , containers, exceptions, hspec, stm, stm-conduit, text, unliftio
+     , containers, exceptions, hspec, mtl, stm, stm-conduit, text
+     , unliftio
      }:
      mkDerivation {
        pname = "nqe";
-       version = "0.3.0.0";
-       sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98";
+       version = "0.4.1";
+       sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj";
        libraryHaskellDepends = [
-         base bytestring conduit conduit-extra containers stm unliftio
+         base conduit containers mtl stm unliftio
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra exceptions hspec stm
@@ -155336,13 +155507,13 @@ self: {
      }) {};
 
   "paripari" = callPackage
-    ({ mkDerivation, base, bytestring, parser-combinators, tasty
-     , tasty-hunit, text
+    ({ mkDerivation, base, bytestring, parser-combinators, random
+     , tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "paripari";
-       version = "0.2.0.0";
-       sha256 = "0lg1bywgy4kfxl9q6jrk9kmww5d26azak023zqj0pg076575yji6";
+       version = "0.2.1.0";
+       sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155352,9 +155523,9 @@ self: {
          base bytestring parser-combinators text
        ];
        testHaskellDepends = [
-         base bytestring parser-combinators tasty tasty-hunit text
+         base bytestring parser-combinators random tasty tasty-hunit text
        ];
-       description = "Fast-path parser combinators with fallback for error reporting";
+       description = "Parser combinators with fast-path and slower fallback for error reporting";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -163077,8 +163248,8 @@ self: {
      }:
      mkDerivation {
        pname = "postmark";
-       version = "0.2.3";
-       sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp";
+       version = "0.2.6";
+       sha256 = "0x8nvxhw6wwq9w9dl16gvh6j6la224s2ldakx694518amqd4avrx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163143,8 +163314,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.0.12";
-       sha256 = "0ccbm3hvpffr673kyp1ky9xpq1ig4gspvqv88yp2ifhrpw9wsi39";
+       version = "2.0.15";
+       sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -163183,8 +163354,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.2.13.1";
-       sha256 = "09qr9xh0gzfvqla0mqjwdb3xf8xx82fy5188xml5vp1wq234wv8j";
+       version = "2.2.16";
+       sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d";
        libraryHaskellDepends = [
          acquire attoparsec base bytestring directory foldl hashable
          primitive profunctors ptr scanner stm text time transformers
@@ -167414,7 +167585,7 @@ self: {
 
   "purescript-iso" = callPackage
     ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async
-     , attoparsec, attoparsec-uri, base, bytestring, containers
+     , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
      , emailaddress, monad-control, mtl, QuickCheck
      , quickcheck-instances, scientific, stm, strict, tasty
      , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
@@ -167422,17 +167593,17 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-iso";
-       version = "0.0.2";
-       sha256 = "0biam9asa6h1ymzms91lafiw8h5pd7k3n13cmrk8b4lbs8zp48j1";
+       version = "0.0.3";
+       sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g";
        libraryHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
-         base bytestring containers emailaddress monad-control mtl
+         base bytestring containers deepseq emailaddress monad-control mtl
          QuickCheck quickcheck-instances scientific stm strict text time
          utf8-string uuid zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
          aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
-         base bytestring containers emailaddress monad-control mtl
+         base bytestring containers deepseq emailaddress monad-control mtl
          QuickCheck quickcheck-instances scientific stm strict tasty
          tasty-quickcheck text time utf8-string uuid zeromq4-haskell
          zeromq4-simple
@@ -168785,6 +168956,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-instances_0_3_19" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring
+     , case-insensitive, containers, hashable, old-time, QuickCheck
+     , scientific, tagged, text, time, transformers, transformers-compat
+     , unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-instances";
+       version = "0.3.19";
+       sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p";
+       libraryHaskellDepends = [
+         array base base-compat bytestring case-insensitive containers
+         hashable old-time QuickCheck scientific tagged text time
+         transformers transformers-compat unordered-containers uuid-types
+         vector
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck tagged uuid-types
+       ];
+       description = "Common quickcheck instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-io" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
@@ -170281,16 +170476,14 @@ self: {
      }:
      mkDerivation {
        pname = "range";
-       version = "0.2.0.0";
-       sha256 = "0pmzm503skr4d1qwkq72mjkq1ba86la1qxb9h25gqc9dzmzy0w3k";
-       revision = "1";
-       editedCabalFile = "0a379q4rw8hsggknwnca4cibr1kmyrmjprdl8fpflpp7wh4vlpwf";
+       version = "0.2.1.1";
+       sha256 = "13gfhzplk2ji1d8x4944lv4dy4qg69wjvdwkica407nm10j0lxmc";
        libraryHaskellDepends = [ base free parsec ];
        testHaskellDepends = [
          base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
-       description = "This has a bunch of code for specifying and managing ranges in your code";
+       description = "An efficient and versatile range library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -174022,7 +174215,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "relude_0_2_0" = callPackage
+  "relude_0_3_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
      , tasty-hedgehog, text, transformers, unordered-containers
@@ -174030,10 +174223,8 @@ self: {
      }:
      mkDerivation {
        pname = "relude";
-       version = "0.2.0";
-       sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
-       revision = "1";
-       editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0";
+       version = "0.3.0";
+       sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable mtl stm text
          transformers unordered-containers utf8-string
@@ -176870,6 +177061,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) rocksdb;};
 
+  "rocksdb-query" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, conduit, hspec
+     , resourcet, rocksdb-haskell, unliftio
+     }:
+     mkDerivation {
+       pname = "rocksdb-query";
+       version = "0.1.1";
+       sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw";
+       libraryHaskellDepends = [
+         base bytestring cereal conduit resourcet rocksdb-haskell unliftio
+       ];
+       testHaskellDepends = [
+         base cereal hspec rocksdb-haskell unliftio
+       ];
+       description = "RocksDB database querying library for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "roguestar" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time
      , process
@@ -181204,6 +181413,29 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) secp256k1;};
 
+  "secp256k1-haskell" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1
+     , string-conversions
+     }:
+     mkDerivation {
+       pname = "secp256k1-haskell";
+       version = "0.1.2";
+       sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy QuickCheck
+         string-conversions
+       ];
+       librarySystemDepends = [ secp256k1 ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring cereal entropy hspec HUnit mtl
+         QuickCheck string-conversions
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Bindings for secp256k1 library from Bitcoin Core";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {inherit (pkgs) secp256k1;};
+
   "secret-santa" = callPackage
     ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
      , haskell-qrencode, random
@@ -181909,8 +182141,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.6.0";
-       sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm";
+       version = "0.6.0.2";
+       sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -185554,6 +185786,32 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare_2_0_17" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.17";
+       sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "shakespeare-babel" = callPackage
     ({ mkDerivation, base, classy-prelude, data-default, directory
      , process, shakespeare, template-haskell
@@ -191146,12 +191404,15 @@ self: {
      }) {};
 
   "solve" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, filepath }:
      mkDerivation {
        pname = "solve";
-       version = "1.0";
-       sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
-       libraryHaskellDepends = [ base containers ];
+       version = "1.1";
+       sha256 = "045bj6wskglwg0j0jk0jsqkp4m809g2fy350bi6m84smg64rr3y4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers filepath ];
+       executableHaskellDepends = [ base containers filepath ];
        description = "Solving simple games";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -191637,23 +191898,24 @@ self: {
      , attoparsec-uri, base, bytestring, deepseq, exceptions
      , extractable-singleton, hashable, http-client, http-client-tls
      , http-types, list-t, monad-control, monad-control-aligned, mtl
-     , nested-routes, path, path-extra, pred-trie, stm, strict, text
-     , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
-     , uuid, wai, wai-middleware-content-type, wai-transformers
-     , websockets, websockets-simple, wuss
+     , nested-routes, path, path-extra, pred-trie, purescript-iso, stm
+     , strict, text, tmapchan, tmapmvar, transformers
+     , unordered-containers, urlpath, uuid, wai
+     , wai-middleware-content-type, wai-transformers, websockets
+     , websockets-simple, wuss
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.2.1";
-       sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f";
+       version = "0.0.2.2";
+       sha256 = "0y1s22nfy234jgvvkxc77x0gcrlqb1g5vqni6vdwls6ww9n1jwba";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
          http-client http-client-tls http-types list-t monad-control
          monad-control-aligned mtl nested-routes path path-extra pred-trie
-         stm strict text tmapchan tmapmvar transformers unordered-containers
-         urlpath uuid wai wai-middleware-content-type wai-transformers
-         websockets websockets-simple wuss
+         purescript-iso stm strict text tmapchan tmapmvar transformers
+         unordered-containers urlpath uuid wai wai-middleware-content-type
+         wai-transformers websockets websockets-simple wuss
        ];
        description = "Unified streaming dependency management for web apps";
        license = stdenv.lib.licenses.bsd3;
@@ -192058,8 +192320,8 @@ self: {
     ({ mkDerivation, base, composition-prelude }:
      mkDerivation {
        pname = "spherical";
-       version = "0.1.2.0";
-       sha256 = "1nbfa0f14rd5wnxyygzf68v5v94wk0gr3rgi48d86ars8ip056f3";
+       version = "0.1.2.1";
+       sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p";
        libraryHaskellDepends = [ base composition-prelude ];
        description = "Geometry on a sphere";
        license = stdenv.lib.licenses.bsd3;
@@ -193410,6 +193672,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, file-embed, filepath, hspec, hspec-discover
+     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "2.0.0";
+       sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory filepath
+         megaparsec mtl template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec template-haskell text yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
      , attoparsec, base, base64-bytestring, bindings-uname, bytestring
@@ -193433,8 +193723,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "9";
-       editedCabalFile = "12gbrnhmci2kpz42x7nwfzcq3syp0z2l14fjcakw8bhjmgd9wp34";
+       revision = "10";
+       editedCabalFile = "1985lm9m6pm9mi4h4m2nrn9v2rnnfh14slcnqgyxy6k934xqvg35";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -197699,26 +197989,26 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
-  "summoner_1_1_0" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
-     , filepath, generic-deriving, gitrev, hedgehog, neat-interpolation
-     , optparse-applicative, process, relude, tasty, tasty-discover
-     , tasty-hedgehog, text, time, tomland
+  "summoner_1_1_0_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
+     , directory, filepath, generic-deriving, gitrev, hedgehog
+     , neat-interpolation, optparse-applicative, process, relude, tasty
+     , tasty-discover, tasty-hedgehog, text, time, tomland
      }:
      mkDerivation {
        pname = "summoner";
-       version = "1.1.0";
-       sha256 = "01wgnj89f6fpb6f54l9480zqps1g9v76kxf0g4vxpg2jhnzygv2d";
+       version = "1.1.0.1";
+       sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring directory filepath
+         aeson ansi-terminal base-noprelude bytestring directory filepath
          generic-deriving gitrev neat-interpolation optparse-applicative
          process relude text time tomland
        ];
-       executableHaskellDepends = [ base relude ];
+       executableHaskellDepends = [ base-noprelude relude ];
        testHaskellDepends = [
-         base hedgehog relude tasty tasty-hedgehog tomland
+         base-noprelude hedgehog relude tasty tasty-hedgehog tomland
        ];
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
@@ -201314,8 +201604,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.5";
        sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
-       revision = "1";
-       editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
+       revision = "2";
+       editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -201612,8 +201902,8 @@ self: {
     ({ mkDerivation, base, tasty, tasty-hunit }:
      mkDerivation {
        pname = "tasty-travis";
-       version = "0.2.0.1";
-       sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17";
+       version = "0.2.0.2";
+       sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg";
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fancy Travis CI output for tasty tests";
@@ -202519,7 +202809,6 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libtensorflow;};
 
   "tensorflow-core-ops" = callPackage
@@ -202540,7 +202829,6 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -202569,7 +202857,6 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -202622,7 +202909,6 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -202652,7 +202938,6 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -202670,7 +202955,6 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -203631,6 +203915,29 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "texmath_0_11_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.11.1";
+       sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -203740,7 +204047,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-builder_0_6_1_2" = callPackage
+  "text-builder_0_6_3" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, criterion
      , deferred-folds, QuickCheck, quickcheck-instances, rerebase
      , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
@@ -203748,8 +204055,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.6.1.2";
-       sha256 = "0z42bgizn6ya89bnsdjk14y7k6mm5zj1782p97dc1vj9ym81ra18";
+       version = "0.6.3";
+       sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z";
        libraryHaskellDepends = [
          base base-prelude bytestring deferred-folds semigroups text
          transformers
@@ -204248,8 +204555,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-replace";
-       version = "0.0.0.2";
-       sha256 = "1qd3i8sj6z0vgb2yn345wh16w0lvmqdvywrkpcdsmbc00j8cwkjq";
+       version = "0.0.0.3";
+       sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -212804,13 +213111,17 @@ self: {
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
-    ({ mkDerivation, base, deepseq, prelude-extras }:
+    ({ mkDerivation, adjunctions, base, deepseq, distributive
+     , prelude-extras
+     }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.13";
-       sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
+       version = "0.1.15";
+       sha256 = "087wwdhkma76akzjzi053by43xv18c2a4q1babdsxapzjqpnr19k";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base deepseq prelude-extras ];
+       libraryHaskellDepends = [
+         adjunctions base deepseq distributive prelude-extras
+       ];
        description = "Uniform pairs with class instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215430,12 +215741,18 @@ self: {
      }) {};
 
   "validated-literals" = callPackage
-    ({ mkDerivation, base, bytestring, template-haskell }:
+    ({ mkDerivation, base, bytestring, deepseq, tasty, tasty-hunit
+     , tasty-travis, template-haskell
+     }:
      mkDerivation {
        pname = "validated-literals";
-       version = "0.2.0";
-       sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2";
-       libraryHaskellDepends = [ base bytestring template-haskell ];
+       version = "0.2.0.1";
+       sha256 = "0gvqsmyhcjf1l5a6vkhr7ffnw81l01y0dp05lzkmy8n177412pr4";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [
+         base bytestring deepseq tasty tasty-hunit tasty-travis
+         template-haskell
+       ];
        description = "Compile-time checking for partial smart-constructors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217113,8 +217430,8 @@ self: {
      }:
      mkDerivation {
        pname = "vinyl-gl";
-       version = "0.3.3";
-       sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r";
+       version = "0.3.4";
+       sha256 = "1r4vpilk8l0fm1v5n5lz27l57ciglbr82g5wsj3g4j7rghr14jpf";
        libraryHaskellDepends = [
          base containers GLUtil linear OpenGL tagged transformers vector
          vinyl
@@ -219554,7 +219871,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_2_24" = callPackage
+  "warp_3_2_25" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -219564,8 +219881,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.24";
-       sha256 = "1b0iwwmzzfs8x7c5spfn4y0kqwgkk711p1fzf854l6mmvsmiq4sk";
+       version = "3.2.25";
+       sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -219607,16 +219924,16 @@ self: {
      }) {};
 
   "warp-grpc" = callPackage
-    ({ mkDerivation, base, binary, bytestring, case-insensitive
+    ({ mkDerivation, async, base, binary, bytestring, case-insensitive
      , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls
      }:
      mkDerivation {
        pname = "warp-grpc";
-       version = "0.1.0.2";
-       sha256 = "1xndsd5li3bzj65pq0ml2c54v470zs14bqzimx4srnkas9kf5dyr";
+       version = "0.1.0.3";
+       sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf";
        libraryHaskellDepends = [
-         base binary bytestring case-insensitive http-types http2-grpc-types
-         proto-lens wai warp warp-tls
+         async base binary bytestring case-insensitive http-types
+         http2-grpc-types proto-lens wai warp warp-tls
        ];
        description = "A minimal gRPC server on top of Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -221375,8 +221692,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
        pname = "wilton-ffi";
-       version = "0.3.0.1";
-       sha256 = "00ib82h5c35g5qf605pn9qijg4y1xcn1jgjgqbd0imhnhhqyp067";
+       version = "0.3.0.2";
+       sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
        description = "Haskell modules support for Wilton JavaScript runtime";
        license = stdenv.lib.licenses.mit;
@@ -221445,35 +221762,35 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, cassava
      , containers, cpu, deepseq, directory, gauge, hashable, megaparsec
      , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
-     , scientific, serialise, text, transformers, unordered-containers
-     , vector
+     , scientific, semigroups, serialise, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.2.1";
-       sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj";
+       version = "0.3.1";
+       sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers cpu hashable megaparsec mtl
-         prettyprinter prettyprinter-ansi-terminal scientific text
-         transformers unordered-containers vector
+         prettyprinter prettyprinter-ansi-terminal scientific semigroups
+         text time transformers unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson base bytestring containers cpu hashable megaparsec mtl
-         prettyprinter prettyprinter-ansi-terminal scientific text
-         transformers unordered-containers vector
+         prettyprinter prettyprinter-ansi-terminal scientific semigroups
+         text time transformers unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring containers cpu hashable megaparsec mtl
          prettyprinter prettyprinter-ansi-terminal QuickCheck scientific
-         text transformers unordered-containers vector
+         semigroups text time transformers unordered-containers vector
        ];
        benchmarkHaskellDepends = [
          aeson base binary bytestring cassava containers cpu deepseq
          directory gauge hashable megaparsec mtl prettyprinter
-         prettyprinter-ansi-terminal scientific serialise text transformers
-         unordered-containers vector
+         prettyprinter-ansi-terminal scientific semigroups serialise text
+         time transformers unordered-containers vector
        ];
        description = "Sustainable serialisation library";
        license = stdenv.lib.licenses.bsd3;
@@ -228352,6 +228669,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yggdrasil" = callPackage
+    ({ mkDerivation, base, cryptonite, hspec, memory, mtl, QuickCheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "yggdrasil";
+       version = "0.1.0.0";
+       sha256 = "1w1nlas5fb7zmd0kvzb68ihylpsg7pf084vd1xk60l6n60cc9m4j";
+       libraryHaskellDepends = [
+         base cryptonite memory mtl transformers
+       ];
+       testHaskellDepends = [ base cryptonite hspec QuickCheck ];
+       description = "Executable specifications of composable cryptographic protocols";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "yhccore" = callPackage
     ({ mkDerivation, base, containers, mtl, pretty, uniplate }:
      mkDerivation {

From ee6ecb0eafd65637140c898ae563a2d2c0f530d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Sep 2018 10:35:02 +0200
Subject: [PATCH 0856/3253] all-cabal-hashes: update snapshot to Hackage at
 2018-09-12T08:26:27Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index a2d04640d591..a72c94759fa8 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz";
-  sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz";
+  sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d";
 }

From 5048b0d1f9e908665a01c35f49b2d9816128e089 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 12 Sep 2018 11:47:19 +0300
Subject: [PATCH 0857/3253] lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ;
 regenerate packages

Added a wrapper package that creates symlinks to OpenSSL libraries with
the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and
cl-async-ssl is unhappy because of that.

I continue to dislike cl-postgres and simple-date upstream packaging.
---
 .../lisp-modules/lisp-packages.nix            |   4 +-
 .../lisp-modules/openssl-lib-marked.nix       |  18 +++
 .../quicklisp-to-nix-output/alexandria.nix    |   2 +-
 .../quicklisp-to-nix-output/array-utils.nix   |  16 +--
 .../asdf-system-connections.nix               |   2 +-
 .../bordeaux-threads.nix                      |  14 +--
 .../buildnode-xhtml.nix                       |  13 ++-
 .../quicklisp-to-nix-output/buildnode.nix     |   8 +-
 .../quicklisp-to-nix-output/caveman.nix       |  37 +++---
 .../quicklisp-to-nix-output/chipz.nix         |   2 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |   2 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   2 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |  14 +--
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |  14 +--
 .../quicklisp-to-nix-output/cl-async.nix      |  14 +--
 .../quicklisp-to-nix-output/cl-csv.nix        |  21 ++--
 .../quicklisp-to-nix-output/cl-dbi.nix        |  14 +--
 .../quicklisp-to-nix-output/cl-html-parse.nix |   2 +-
 .../quicklisp-to-nix-output/cl-interpol.nix   |  21 ++--
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   2 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |  14 +--
 .../quicklisp-to-nix-output/cl-markup.nix     |   2 +-
 .../quicklisp-to-nix-output/cl-paths.nix      |   2 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |  23 ++--
 .../cl-ppcre-unicode.nix                      |  14 +--
 .../quicklisp-to-nix-output/cl-ppcre.nix      |  14 +--
 .../quicklisp-to-nix-output/cl-project.nix    |  14 +--
 .../cl-unification.nix                        |   2 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   2 +-
 .../quicklisp-to-nix-output/cl_plus_ssl.nix   |  14 +--
 .../clack-handler-hunchentoot.nix             |  54 +++++++++
 .../quicklisp-to-nix-output/clack-socket.nix  |  16 +--
 .../quicklisp-to-nix-output/clack-test.nix    |  41 ++++---
 .../clack-v1-compat.nix                       |  34 +++---
 .../quicklisp-to-nix-output/clack.nix         |  14 +--
 .../quicklisp-to-nix-output/closer-mop.nix    |  16 +--
 .../quicklisp-to-nix-output/closure-html.nix  |  14 +--
 .../quicklisp-to-nix-output/clss.nix          |  14 +--
 .../quicklisp-to-nix-output/clx.nix           |  14 +--
 .../command-line-arguments.nix                |   2 +-
 .../quicklisp-to-nix-output/css-lite.nix      |   2 +-
 .../css-selectors-simple-tree.nix             |  13 ++-
 .../css-selectors-stp.nix                     |  16 +--
 .../quicklisp-to-nix-output/css-selectors.nix |   9 +-
 .../quicklisp-to-nix-output/dbd-mysql.nix     |  14 +--
 .../quicklisp-to-nix-output/dbd-postgres.nix  |  14 +--
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |  14 +--
 .../quicklisp-to-nix-output/dbi.nix           |  14 +--
 .../quicklisp-to-nix-output/dexador.nix       |  14 +--
 .../documentation-utils.nix                   |  16 +--
 .../quicklisp-to-nix-output/fast-http.nix     |  14 +--
 .../quicklisp-to-nix-output/flexi-streams.nix |  14 +--
 .../quicklisp-to-nix-output/form-fiddle.nix   |  14 +--
 .../quicklisp-to-nix-output/ironclad.nix      |  14 +--
 .../quicklisp-to-nix-output/iterate.nix       |   2 +-
 .../quicklisp-to-nix-output/kmrcl.nix         |   2 +-
 .../lack-component.nix                        |  16 +--
 .../lack-middleware-backtrace.nix             |  14 +--
 .../quicklisp-to-nix-output/lack-util.nix     |  14 +--
 .../quicklisp-to-nix-output/lack.nix          |  14 +--
 .../quicklisp-to-nix-output/lift.nix          |   2 +-
 .../quicklisp-to-nix-output/lisp-unit2.nix    |   5 +-
 .../quicklisp-to-nix-output/lquery.nix        |  14 +--
 .../quicklisp-to-nix-output/map-set.nix       |   2 +-
 .../quicklisp-to-nix-output/marshal.nix       |   2 +-
 .../quicklisp-to-nix-output/md5.nix           |   2 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   2 +-
 .../misc-extensions.nix                       |   2 +-
 .../quicklisp-to-nix-output/mt19937.nix       |   2 +-
 .../named-readtables.nix                      |   2 +-
 .../net_dot_didierverna_dot_asdf-flv.nix      |   2 +-
 .../quicklisp-to-nix-output/nibbles.nix       |  14 +--
 .../quicklisp-to-nix-output/parse-number.nix  |   2 +-
 .../quicklisp-to-nix-output/plump.nix         |  14 +--
 .../quicklisp-to-nix-output/ptester.nix       |   2 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |  16 +--
 .../quicklisp-to-nix-output/rt.nix            |   2 +-
 .../quicklisp-to-nix-output/salza2.nix        |   2 +-
 .../quicklisp-to-nix-output/simple-date.nix   |  26 ++---
 .../quicklisp-to-nix-output/string-case.nix   |  16 +--
 .../quicklisp-to-nix-output/stumpwm.nix       |  16 +--
 .../quicklisp-to-nix-output/swank.nix         |  16 +--
 .../trivial-backtrace.nix                     |   2 +-
 .../trivial-features.nix                      |   2 +-
 .../trivial-gray-streams.nix                  |  16 +--
 .../trivial-indent.nix                        |  16 +--
 .../quicklisp-to-nix-output/trivial-mimes.nix |  16 +--
 .../quicklisp-to-nix-output/trivial-types.nix |   2 +-
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   2 +-
 .../quicklisp-to-nix-output/uffi.nix          |   2 +-
 .../quicklisp-to-nix-output/uiop.nix          |  16 +--
 .../quicklisp-to-nix-output/unit-test.nix     |   2 +-
 .../quicklisp-to-nix-output/usocket.nix       |  14 +--
 .../quicklisp-to-nix-output/vom.nix           |   2 +-
 .../quicklisp-to-nix-output/woo.nix           |  14 +--
 .../quicklisp-to-nix-output/wookie.nix        |  14 +--
 .../quicklisp-to-nix-output/xsubseq.nix       |   2 +-
 .../quicklisp-to-nix-output/yacc.nix          |   2 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   2 +-
 .../quicklisp-to-nix-overrides.nix            |   5 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 105 +++++++++++++-----
 pkgs/development/lisp-modules/shell.nix       |   3 +-
 102 files changed, 666 insertions(+), 522 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/openssl-lib-marked.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index f208b47234c6..5769ee94a1be 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt";
-        sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq";
+        url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt";
+        sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd";
       };
       buildPhase = '' true; '';
       postInstall = ''
diff --git a/pkgs/development/lisp-modules/openssl-lib-marked.nix b/pkgs/development/lisp-modules/openssl-lib-marked.nix
new file mode 100644
index 000000000000..e2c632b8ebad
--- /dev/null
+++ b/pkgs/development/lisp-modules/openssl-lib-marked.nix
@@ -0,0 +1,18 @@
+with import ../../../default.nix {};
+runCommand "openssl-lib-marked" {} ''
+  mkdir -p "$out/lib"
+  for lib in ssl crypto; do
+    version="${(builtins.parseDrvName openssl.name).version}"
+    ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+    version="$(echo "$version" | sed -re 's/[a-z]+$//')"
+    while test -n "$version"; do
+      ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+      nextversion="''${version%.*}"
+      if test "$version" = "$nextversion"; then
+        version=
+      else
+        version="$nextversion"
+      fi
+    done
+  done
+''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 22aa818f8756..9b9486e9758c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index c90a9e091920..9daab46784d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz'';
-    sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz'';
+    sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7'';
   };
 
   packageName = "array-utils";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
-    SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL
-    http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz
-    MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils
-    DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test)
+    SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL
+    http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz
+    MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils
+    DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 4612e6175b91..65df45d95a50 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''asdf-system-connections'';
   version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index f0fc5d4d0c0f..c5305587a029 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''bordeaux-threads'';
-  version = ''v0.8.5'';
+  version = ''v0.8.6'';
 
   parasites = [ "bordeaux-threads/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
-    sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
+    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz'';
+    sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y'';
   };
 
   packageName = "bordeaux-threads";
@@ -21,10 +21,10 @@ rec {
 }
 /* (SYSTEM bordeaux-threads DESCRIPTION
     Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
-    09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL
-    http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz
-    MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME
+    1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL
+    http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz
+    MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME
     bordeaux-threads DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES
+    DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES
     (bordeaux-threads/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 6dbff1d6e56c..ec4e31013f92 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -34,16 +34,17 @@ rec {
      (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
      (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
-     (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
-     (NAME symbol-munger FILENAME symbol-munger)
+     (NAME iterate FILENAME iterate)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
+     (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
     (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
      closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test
-     cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger
-     trivial-features trivial-gray-streams)
+     cxml-xml flexi-streams iterate named-readtables puri split-sequence swank
+     symbol-munger trivial-features trivial-gray-streams)
     VERSION buildnode-20170403-git SIBLINGS
     (buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index ecc1634bfce0..86bdb36c8d23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Tool for building up an xml dom nicely.'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -35,6 +35,7 @@ rec {
      (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+     (NAME named-readtables FILENAME named-readtables)
      (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
      (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
      (NAME trivial-features FILENAME trivial-features)
@@ -42,8 +43,9 @@ rec {
     DEPENDENCIES
     (alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode
      closer-mop closure-common closure-html collectors cxml cxml-dom
-     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
-     split-sequence swank symbol-munger trivial-features trivial-gray-streams)
+     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+     named-readtables puri split-sequence swank symbol-munger trivial-features
+     trivial-gray-streams)
     VERSION 20170403-git SIBLINGS
     (buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml
      buildnode-xul)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 02e6e2bf6045..f3e64cb965e4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''caveman'';
-  version = ''20171019-git'';
+  version = ''20180831-git'';
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
-    sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra'';
+    url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz'';
+    sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s'';
   };
 
   packageName = "caveman";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
-    0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL
-    http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz
-    MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS
+    0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL
+    http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz
+    MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,22 +38,26 @@ rec {
      (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
      (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+     (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+     (NAME clack-socket FILENAME clack-socket)
      (NAME clack-test FILENAME clack-test)
      (NAME clack-v1-compat FILENAME clack-v1-compat)
      (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME http-body FILENAME http-body)
+     (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
      (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
      (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
      (NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
-     (NAME marshal FILENAME marshal) (NAME myway FILENAME myway)
+     (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
+     (NAME myway FILENAME myway)
      (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -67,14 +71,15 @@ rec {
     (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
      cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
      cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
-     cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test
-     clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams
-     http-body ironclad jonathan lack lack-component lack-middleware-backtrace
-     lack-util let-plus local-time map-set marshal myway named-readtables
-     nibbles proc-parse prove quri smart-buffer split-sequence static-vectors
+     cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
+     clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
+     do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
+     ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
+     let-plus local-time map-set marshal md5 myway named-readtables nibbles
+     proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors
      trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
      trivial-mimes trivial-types usocket xsubseq)
-    VERSION 20171019-git SIBLINGS
+    VERSION 20180831-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
      caveman2)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c8f34e0fa17f..a9808173b626 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''chipz'';
   version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index a420c22054f6..531d429df244 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index 42a7bd595853..a413743eb8d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-anonfun'';
   version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d72a9c69ac0f..377c8c2209bc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-repl'';
-  version = ''cl-async-20171130-git'';
+  version = ''cl-async-20180711-git'';
 
   description = ''REPL integration for CL-ASYNC.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
-    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
   };
 
   packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
-    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
-    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
-    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME
+    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME
     cl-async-repl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20171130-git SIBLINGS
+    VERSION cl-async-20180711-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index f7392b880d11..2129c7f83f7a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-ssl'';
-  version = ''cl-async-20171130-git'';
+  version = ''cl-async-20180711-git'';
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
-    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
   };
 
   packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION
     SSL Wrapper around cl-async socket implementation. SHA256
-    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
-    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
-    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME
+    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME
     cl-async-ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20171130-git SIBLINGS
+    VERSION cl-async-20180711-git SIBLINGS
     (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 90638ed56f16..e5a2a0bc7fd3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async'';
-  version = ''20171130-git'';
+  version = ''20180711-git'';
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
-    sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+    sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
   };
 
   packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
-    0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
-    http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
-    MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS
+    1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+    http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+    MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
      cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
      vom)
-    VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
     PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index b0fe8888dcfc..56ccab7b5cd5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-csv'';
-  version = ''20180228-git'';
+  version = ''20180831-git'';
 
   parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
 
   description = ''Facilities for reading and writing CSV format files'';
 
-  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];
+  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz'';
-    sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r'';
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz'';
+    sha256 = ''0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd'';
   };
 
   packageName = "cl-csv";
@@ -21,16 +21,17 @@ rec {
 }
 /* (SYSTEM cl-csv DESCRIPTION
     Facilities for reading and writing CSV format files SHA256
-    1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL
-    http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz
-    MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS
+    0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd URL
+    http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz
+    MD5 4bd0ef366dea9d48c4581ed73a208cf3 NAME cl-csv FILENAME cl-csv DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-unicode FILENAME cl-unicode)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2))
+     (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+     (NAME named-readtables FILENAME named-readtables))
     DEPENDENCIES
     (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
-     lisp-unit2)
-    VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+     lisp-unit2 named-readtables)
+    VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
     (cl-csv/speed-test cl-csv/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 995ef9bc745e..40c1ac7d6a9a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20180430-git'';
+  version = ''20180831-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
-    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
   };
 
   packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
-    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
-    MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS
+    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      dbi named-readtables split-sequence trivial-types)
-    VERSION 20180430-git SIBLINGS
+    VERSION 20180831-git SIBLINGS
     (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 0321572e72a6..61a35f2b58c6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-html-parse'';
   version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index d4ce8531291e..1f58be6c09e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-interpol'';
-  version = ''20171227-git'';
+  version = ''20180711-git'';
 
   parasites = [ "cl-interpol-test" ];
 
   description = '''';
 
-  deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ];
+  deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz'';
-    sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy'';
+    url = ''http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz'';
+    sha256 = ''1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r'';
   };
 
   packageName = "cl-interpol";
@@ -20,11 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
-    1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL
-    http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz
-    MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol
+    1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL
+    http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz
+    MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol
     DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
-     (NAME flexi-streams FILENAME flexi-streams))
-    DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git
-    SIBLINGS NIL PARASITES (cl-interpol-test)) */
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME named-readtables FILENAME named-readtables))
+    DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION
+    20180711-git SIBLINGS NIL PARASITES (cl-interpol-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 825fea4eb906..dfabda0428f0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-l10n-cldr'';
   version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 1aced09d34fd..c950fa292a8b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-libuv'';
-  version = ''20180328-git'';
+  version = ''20180831-git'';
 
   description = ''Low-level libuv bindings for Common Lisp.'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz'';
-    sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p'';
+    url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz'';
+    sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f'';
   };
 
   packageName = "cl-libuv";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
-    SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL
-    http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz
-    MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS
+    SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL
+    http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz
+    MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION
-    20180328-git SIBLINGS NIL PARASITES NIL) */
+    20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 67468edbb6cb..8967b0970c56 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-markup'';
   version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index f546e4711acc..e8034b11c237 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths'';
   version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 60e38a7de720..a0443cb5af08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20180430-git'';
+  version = ''postmodern-20180831-git'';
 
-  parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
+  parasites = [ "cl-postgres/tests" ];
 
   description = ''Low-level client library for PostgreSQL'';
 
-  deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
+  deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
-    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+    sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
   };
 
   packageName = "cl-postgres";
@@ -20,14 +20,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
-    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
-    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres
+    SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+    http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+    MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres
     DEPS
     ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
-     (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
-    DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
-    VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date)
-    PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
+    DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION
+    postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES
+    (cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 7853d5a279a2..e65c0a03ddc5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-unicode'';
-  version = ''cl-ppcre-20171227-git'';
+  version = ''cl-ppcre-20180831-git'';
 
   parasites = [ "cl-ppcre-unicode-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
-    sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+    sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
   };
 
   packageName = "cl-ppcre-unicode";
@@ -21,13 +21,13 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION
     Perl-compatible regular expression library (Unicode) SHA256
-    0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
-    MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME
+    03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+    MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME
     cl-ppcre-unicode DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-ppcre-test FILENAME cl-ppcre-test)
      (NAME cl-unicode FILENAME cl-unicode)
      (NAME flexi-streams FILENAME flexi-streams))
     DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
-    cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+    cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index cbdf3a471461..3f56cf3dfaee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre'';
-  version = ''20171227-git'';
+  version = ''20180831-git'';
 
   parasites = [ "cl-ppcre-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
-    sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+    url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+    sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
   };
 
   packageName = "cl-ppcre";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
-    SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
-    http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
-    MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS
+    SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+    http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+    MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS
     ((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
-    VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+    VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 658ffdb51b82..15fd56107c82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-project'';
-  version = ''20171019-git'';
+  version = ''20180831-git'';
 
   description = ''Generate a skeleton for modern project'';
 
   deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz'';
-    sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q'';
+    url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz'';
+    sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s'';
   };
 
   packageName = "cl-project";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
-    1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL
-    http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz
-    MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project
+    0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL
+    http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz
+    MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
      cl-ppcre let-plus local-time prove uiop)
-    VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4434e711d9de..6d284b7b0120 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
   version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 1b78d0d28983..750da99d5d6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-utilities'';
   version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index a757b3d4a8a0..af0e917425a1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20180328-git'';
+  version = ''cl+ssl-20180831-git'';
 
   parasites = [ "openssl-1.1.0" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz'';
-    sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz'';
+    sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r'';
   };
 
   packageName = "cl+ssl";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL
-    http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz
-    MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+    1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL
+    http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz
+    MD5 56cd0b42cd9f7b8645db330ebc98600c NAME cl+ssl FILENAME cl_plus_ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +33,5 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
      trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES
+    VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES
     (openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
new file mode 100644
index 000000000000..252f9794e769
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -0,0 +1,54 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''clack-handler-hunchentoot'';
+  version = ''clack-20180831-git'';
+
+  description = ''Clack handler for Hunchentoot.'';
+
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+  };
+
+  packageName = "clack-handler-hunchentoot";
+
+  asdFilesToKeep = ["clack-handler-hunchentoot.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
+    SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot
+    FILENAME clack-handler-hunchentoot DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
+     (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME clack-socket FILENAME clack-socket)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME hunchentoot FILENAME hunchentoot) (NAME md5 FILENAME md5)
+     (NAME rfc2388 FILENAME rfc2388)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES
+    (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
+     cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
+     trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
+     usocket)
+    VERSION clack-20180831-git SIBLINGS
+    (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
+     clack-test clack-v1-compat clack t-clack-handler-fcgi
+     t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
+     t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+     clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth
+     clack-middleware-postmodern clack-middleware-rucksack
+     clack-session-store-dbi t-clack-middleware-auth-basic
+     t-clack-middleware-csrf)
+    PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index a4a66ecfa64f..d5163cabe045 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
-  version = ''clack-20180328-git'';
+  version = ''clack-20180831-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
-    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
   };
 
   packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-socket DESCRIPTION NIL SHA256
-    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
-    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
-    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME
-    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS
+    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index be88069fd5d9..1d081fbef581 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-test'';
-  version = ''clack-20180328-git'';
+  version = ''clack-20180831-git'';
 
   description = ''Testing Clack Applications.'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
-    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
   };
 
   packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
-    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
-    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
-    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test
+    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -36,21 +36,24 @@ rec {
      (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
      (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
-     (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http)
-     (NAME fast-io FILENAME fast-io)
+     (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+     (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME http-body FILENAME http-body)
+     (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
      (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
      (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
-     (NAME local-time FILENAME local-time)
+     (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
      (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-backtrace FILENAME trivial-backtrace)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-garbage FILENAME trivial-garbage)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
@@ -61,12 +64,14 @@ rec {
     (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
      chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie
      cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
-     dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack
-     lack-component lack-middleware-backtrace lack-util let-plus local-time
-     named-readtables nibbles proc-parse prove quri smart-buffer split-sequence
-     static-vectors trivial-features trivial-garbage trivial-gray-streams
-     trivial-mimes trivial-types usocket xsubseq)
-    VERSION clack-20180328-git SIBLINGS
+     clack-handler-hunchentoot clack-socket dexador fast-http fast-io
+     flexi-streams http-body hunchentoot ironclad jonathan lack lack-component
+     lack-middleware-backtrace lack-util let-plus local-time md5
+     named-readtables nibbles proc-parse prove quri rfc2388 smart-buffer
+     split-sequence static-vectors trivial-backtrace trivial-features
+     trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
+     xsubseq)
+    VERSION clack-20180831-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-v1-compat clack
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b810de3fd1c8..8b2e2c70453a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20180328-git'';
+  version = ''clack-20180831-git'';
 
   description = '''';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" 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."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" 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" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
-    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
   };
 
   packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
-    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
-    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
-    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME
+    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
@@ -37,19 +37,22 @@ rec {
      (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
      (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+     (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+     (NAME clack-socket FILENAME clack-socket)
      (NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME http-body FILENAME http-body)
+     (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
      (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
      (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
      (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
-     (NAME named-readtables FILENAME named-readtables)
+     (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -63,13 +66,14 @@ rec {
     (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
      chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
      cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot
-     cl-utilities clack clack-test dexador fast-http fast-io flexi-streams
-     http-body ironclad jonathan lack lack-component lack-middleware-backtrace
-     lack-util let-plus local-time marshal named-readtables nibbles proc-parse
-     prove quri smart-buffer split-sequence static-vectors trivial-backtrace
+     cl-utilities clack clack-handler-hunchentoot clack-socket clack-test
+     dexador fast-http fast-io flexi-streams http-body hunchentoot ironclad
+     jonathan lack lack-component lack-middleware-backtrace lack-util let-plus
+     local-time marshal md5 named-readtables nibbles proc-parse prove quri
+     rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
      trivial-features trivial-garbage trivial-gray-streams trivial-mimes
      trivial-types uiop usocket xsubseq)
-    VERSION clack-20180328-git SIBLINGS
+    VERSION clack-20180831-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 08e5ff71cc5c..0b2828d06dfc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20180328-git'';
+  version = ''20180831-git'';
 
   description = ''Web application environment for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
-    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+    sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
   };
 
   packageName = "clack";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
-    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
-    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
-    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS
+    0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+    http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+    MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads ironclad lack lack-component
      lack-middleware-backtrace lack-util nibbles uiop)
-    VERSION 20180328-git SIBLINGS
+    VERSION 20180831-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack-v1-compat
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ec7599f2bd3f..a13537d7e90f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20180430-git'';
+  version = ''20180831-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz'';
-    sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz'';
+    sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg'';
   };
 
   packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL
-    http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz
-    MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL
+    http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz
+    MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 29c90369244a..f55ccecadc61 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closure-html'';
-  version = ''20140826-git'';
+  version = ''20180711-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz'';
-    sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb'';
+    url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
+    sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
   };
 
   packageName = "closure-html";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM closure-html DESCRIPTION NIL SHA256
-    1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL
-    http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz
-    MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME
+    0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
+    http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
+    MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
     closure-html DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME closure-common FILENAME closure-common)
@@ -30,4 +30,4 @@ rec {
     DEPENDENCIES
     (alexandria babel closure-common flexi-streams trivial-features
      trivial-gray-streams)
-    VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 76f50463a6ae..3f6d6ae32ac6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz'';
-    sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r'';
+    url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz'';
+    sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd'';
   };
 
   packageName = "clss";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
-    SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL
-    http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5
-    138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS
+    SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL
+    http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5
+    39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
-    20180131-git SIBLINGS NIL PARASITES NIL) */
+    20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index bd2b0ff19bdb..685e81283688 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20180430-git'';
+  version = ''20180711-git'';
 
   parasites = [ "clx/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz'';
-    sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3'';
+    url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz'';
+    sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h'';
   };
 
   packageName = "clx";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
     An implementation of the X Window System protocol in Lisp. SHA256
-    18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL
-    http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5
-    bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS
-    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git
+    0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL
+    http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5
+    27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git
     SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1ae6fa0f4ec4..e1fb59658528 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''command-line-arguments'';
   version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index bb5ab940638a..f4941aa80cd6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''css-lite'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index ba523ae837d7..c83b29939687 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,8 +36,9 @@ rec {
      (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
      (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
-     (NAME split-sequence FILENAME split-sequence)
+     (NAME iterate FILENAME iterate)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
      (NAME string-case FILENAME string-case) (NAME swank FILENAME swank)
      (NAME symbol-munger FILENAME symbol-munger)
      (NAME trivial-features FILENAME trivial-features)
@@ -46,8 +47,8 @@ rec {
     DEPENDENCIES
     (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode
      closer-mop closure-common closure-html collectors css-selectors cxml
-     cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri
-     split-sequence string-case swank symbol-munger trivial-features
-     trivial-gray-streams yacc)
+     cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate
+     named-readtables puri split-sequence string-case swank symbol-munger
+     trivial-features trivial-gray-streams yacc)
     VERSION css-selectors-20160628-git SIBLINGS
     (css-selectors-stp css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fbe06a179fdd..69ada2ce80a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An implementation of css selectors that interacts with cxml-stp'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,17 +36,19 @@ rec {
      (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test)
      (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)
-     (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
-     (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
+     (NAME iterate FILENAME iterate)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+     (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
+     (NAME symbol-munger FILENAME symbol-munger)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
     DEPENDENCIES
     (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
      closure-common closure-html collectors css-selectors cxml cxml-dom
-     cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number
-     puri split-sequence swank symbol-munger trivial-features
-     trivial-gray-streams xpath yacc)
+     cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate
+     named-readtables parse-number puri split-sequence swank symbol-munger
+     trivial-features trivial-gray-streams xpath yacc)
     VERSION css-selectors-20160628-git SIBLINGS
     (css-selectors-simple-tree css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index 2ad018e5549c..3316f59447d7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''An implementation of css selectors'';
 
-  deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+  deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -37,6 +37,7 @@ rec {
      (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+     (NAME named-readtables FILENAME named-readtables)
      (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
      (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
      (NAME trivial-features FILENAME trivial-features)
@@ -45,8 +46,8 @@ rec {
     DEPENDENCIES
     (alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode
      closer-mop closure-common closure-html collectors cxml cxml-dom
-     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
-     split-sequence swank symbol-munger trivial-features trivial-gray-streams
-     yacc)
+     cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+     named-readtables puri split-sequence swank symbol-munger trivial-features
+     trivial-gray-streams yacc)
     VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp)
     PARASITES (css-selectors-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 6dfa61634f2b..218107e95d6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20180430-git'';
+  version = ''cl-dbi-20180831-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
-    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
   };
 
   packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
-    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS
+    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
      cl-syntax-annot closer-mop dbi named-readtables split-sequence
      trivial-features trivial-types)
-    VERSION cl-dbi-20180430-git SIBLINGS
+    VERSION cl-dbi-20180831-git SIBLINGS
     (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index bb9558fda51e..9387806255ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20180430-git'';
+  version = ''cl-dbi-20180831-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
-    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
   };
 
   packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
-    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
-    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME
+    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME
     dbd-postgres DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
     (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
      closer-mop dbi md5 named-readtables split-sequence trivial-garbage
      trivial-types usocket)
-    VERSION cl-dbi-20180430-git SIBLINGS
+    VERSION cl-dbi-20180831-git SIBLINGS
     (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 6e8e85e72abc..808914068a35 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20180430-git'';
+  version = ''cl-dbi-20180831-git'';
 
   description = ''Database driver for SQLite3.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
-    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
   };
 
   packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
-    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
-    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,5 +38,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
      closer-mop dbi iterate named-readtables split-sequence sqlite
      trivial-features trivial-types uiop)
-    VERSION cl-dbi-20180430-git SIBLINGS
+    VERSION cl-dbi-20180831-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index e75961dd9ace..2de381f44b8e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbi'';
-  version = ''cl-20180430-git'';
+  version = ''cl-20180831-git'';
 
   description = ''Database independent interface for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
-    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+    sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
   };
 
   packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
-    SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
-    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS
+    SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+    MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      named-readtables split-sequence trivial-types)
-    VERSION cl-20180430-git SIBLINGS
+    VERSION cl-20180831-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index d3111b18b22b..2e392928f495 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20180328-git'';
+  version = ''20180831-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz'';
-    sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz'';
+    sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs'';
   };
 
   packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
-    13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL
-    http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz
-    MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS
+    1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL
+    http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz
+    MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
      fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
      split-sequence static-vectors trivial-features trivial-garbage
      trivial-gray-streams trivial-mimes usocket xsubseq)
-    VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7ee5f91a1580..541f1c6a169d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20180228-git'';
+  version = ''20180831-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
   deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz'';
-    sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz'';
+    sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5'';
   };
 
   packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM documentation-utils DESCRIPTION
     A few simple tools to help you with documenting your library. SHA256
-    0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL
-    http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz
-    MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME
+    0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL
+    http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz
+    MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME
     documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
-    DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES
-    NIL) */
+    DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS
+    (multilang-documentation-utils) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 99792023bdd0..82c8603d4a45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-http'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A fast HTTP protocol parser in Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz'';
-    sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg'';
+    url = ''http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz'';
+    sha256 = ''1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm'';
   };
 
   packageName = "fast-http";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp
-    SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL
-    http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz
-    MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS
+    SHA256 1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm URL
+    http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz
+    MD5 d5e839f204b2dd78a390336572d1ee65 NAME fast-http FILENAME fast-http DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME flexi-streams FILENAME flexi-streams)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer
      trivial-features trivial-gray-streams xsubseq)
-    VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS (fast-http-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 7b37e5709e86..08b6d35a1fb9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''flexi-streams'';
-  version = ''20180328-git'';
+  version = ''20180711-git'';
 
   parasites = [ "flexi-streams-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz'';
-    sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11'';
+    url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz'';
+    sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2'';
   };
 
   packageName = "flexi-streams";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
-    SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL
-    http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz
-    MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME
+    SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL
+    http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz
+    MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME
     flexi-streams DEPS
     ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
-    (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES
+    (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES
     (flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 2aa5c0749250..4a23cbf51ee7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
   deps = [ args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz'';
-    sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz'';
+    sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj'';
   };
 
   packageName = "form-fiddle";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM form-fiddle DESCRIPTION
     A collection of utilities to destructure lambda forms. SHA256
-    1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL
-    http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz
-    MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle
+    013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL
+    http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz
+    MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle
     DEPS
     ((NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
-    DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git
+    DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 8061f3844e0b..3d259fc5b6c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''v0.39'';
+  version = ''v0.42'';
 
   parasites = [ "ironclad/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."nibbles" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz'';
-    sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz'';
+    sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr'';
   };
 
   packageName = "ironclad";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM ironclad DESCRIPTION
     A cryptographic toolkit written in pure Common Lisp SHA256
-    0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL
-    http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz
-    MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS
+    1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL
+    http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz
+    MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS
     ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
-    (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES
+    (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES
     (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f85b128652d0..f276ec72736d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''iterate'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index 62a3ae2bb7d1..e5cbad3e9e83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''kmrcl'';
   version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 79f2d38ef10d..94edb06e6aee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
-  version = ''lack-20180430-git'';
+  version = ''lack-20180831-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
-    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
   };
 
   packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-component DESCRIPTION NIL SHA256
-    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
-    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
-    b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME
-    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS
+    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+    fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS
     (lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index c0acbc2f01fc..a98028e0c060 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20180430-git'';
+  version = ''lack-20180831-git'';
 
   description = '''';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
-    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
   };
 
   packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
-    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
-    b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME
+    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+    fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
-    (uiop) VERSION lack-20180430-git SIBLINGS
+    (uiop) VERSION lack-20180831-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-csrf lack-middleware-mount lack-middleware-session
      lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 29fcd359f6b6..3478ac8488b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-util'';
-  version = ''lack-20180430-git'';
+  version = ''lack-20180831-git'';
 
   description = '''';
 
   deps = [ args."ironclad" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
-    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
   };
 
   packageName = "lack-util";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-util DESCRIPTION NIL SHA256
-    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
-    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
-    b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS
+    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+    fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS
     ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
-    DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS
+    DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 9260b06dd830..fdcda10a275f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20180430-git'';
+  version = ''20180831-git'';
 
   description = ''A minimal Clack'';
 
   deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
-    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+    sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
   };
 
   packageName = "lack";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
-    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
-    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
-    b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS
+    0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+    http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+    fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS
     ((NAME ironclad FILENAME ironclad)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
     DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
-    20180430-git SIBLINGS
+    20180831-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index b44c0c8a9874..a3ddc2fd953e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''lift'';
   version = ''20151031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 62197234305a..8d21f88cbf82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Common Lisp library that supports unit testing.'';
 
-  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ];
+  deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
@@ -30,8 +30,9 @@ rec {
      (NAME cl-unicode FILENAME cl-unicode)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME iterate FILENAME iterate)
+     (NAME named-readtables FILENAME named-readtables)
      (NAME symbol-munger FILENAME symbol-munger))
     DEPENDENCIES
     (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
-     symbol-munger)
+     named-readtables symbol-munger)
     VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 1ca094d139db..ad335774cbb5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
   deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz'';
-    sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz'';
+    sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v'';
   };
 
   packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
 }
 /* (SYSTEM lquery DESCRIPTION
     A library to allow jQuery-like HTML/DOM manipulation. SHA256
-    1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL
-    http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz
-    MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS
+    1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL
+    http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz
+    MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS
     ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES
     (array-utils clss documentation-utils form-fiddle plump trivial-indent)
-    VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 006361ed80c1..db25e6ae5347 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''map-set'';
   version = ''20160628-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index c34d79f3d13d..4f6842606b45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''marshal'';
   version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index c65d95d9ef7a..953dd0a58a4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 5647b9a92707..d72e0839d1e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''metabang-bind'';
   version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 3c289fefa9ab..6334804c4f70 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''misc-extensions'';
   version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index 29460307e698..a8cfc070bf99 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''mt19937'';
   version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index e1d6a1477a7b..82d06b1c93b2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''named-readtables'';
   version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 67636d3f6cf3..4e7c84566a0a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''net_dot_didierverna_dot_asdf-flv'';
   version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index d706bc5bad1a..ea6adac9e9f8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''nibbles'';
-  version = ''20180430-git'';
+  version = ''20180831-git'';
 
   parasites = [ "nibbles/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz'';
-    sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g'';
+    url = ''http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz'';
+    sha256 = ''0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la'';
   };
 
   packageName = "nibbles";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM nibbles DESCRIPTION
     A library for accessing octet-addressed blocks of data in big- and little-endian orders
-    SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL
-    http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz
-    MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS
-    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL
+    SHA256 0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la URL
+    http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz
+    MD5 4badf1f066a59c3c270d40be1116ecd5 NAME nibbles FILENAME nibbles DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180831-git SIBLINGS NIL
     PARASITES (nibbles/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index 5c1f90220eb3..e636df0805e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''parse-number'';
   version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 2bde901ad43e..0a1591d7c424 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20180228-git'';
+  version = ''20180831-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz'';
-    sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01'';
+    url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz'';
+    sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf'';
   };
 
   packageName = "plump";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM plump DESCRIPTION
     An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
-    0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL
-    http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz
-    MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS
+    0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL
+    http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz
+    MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
-    20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+    20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index c90b252313bf..ffa2e595c26a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''ptester'';
   version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 41ead034791a..25d535176a6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''rfc2388'';
-  version = ''20130720-git'';
+  version = ''20180831-git'';
 
   description = ''Implementation of RFC 2388'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
-    sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
+    url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
+    sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
   };
 
   packageName = "rfc2388";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256
-    1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
-    http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz
-    MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 FILENAME rfc2388 DEPS NIL
-    DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */
+    1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33 URL
+    http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz
+    MD5 f57e3c588e5e08210516260e67d69226 NAME rfc2388 FILENAME rfc2388 DEPS NIL
+    DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index 8ed7c1a44993..d5be4be7daf4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''rt'';
   version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index d55f7700092c..9056cfbdcca8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''salza2'';
   version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 07b1498f2e3f..b1e89b3eef8a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''simple-date'';
-  version = ''postmodern-20180430-git'';
+  version = ''postmodern-20180831-git'';
 
-  parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
+  parasites = [ "simple-date/postgres-glue" ];
 
   description = '''';
 
-  deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
+  deps = [ args."cl-postgres" args."md5" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
-    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+    sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
   };
 
   packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM simple-date DESCRIPTION NIL SHA256
-    0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
-    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
-    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date
+    062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+    http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+    MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date
     DEPS
-    ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
-     (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
-    DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
-    postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
-    (simple-date/postgres-glue simple-date/tests)) */
+    ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)
+     (NAME usocket FILENAME usocket))
+    DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git
+    SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    (simple-date/postgres-glue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 9cc6338c8b89..17a56c09b7e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''string-case'';
-  version = ''20151218-git'';
+  version = ''20180711-git'';
 
   description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz'';
-    sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw'';
+    url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
+    sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
   };
 
   packageName = "string-case";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM string-case DESCRIPTION
     string-case is a macro that generates specialised decision trees to dispatch on string equality
-    SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL
-    http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz
-    MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case
-    DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z URL
+    http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz
+    MD5 145c4e13f1e90a070b0a95ca979a9680 NAME string-case FILENAME string-case
+    DEPS NIL DEPENDENCIES NIL VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 883e648a2f68..bb39c74c9625 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20180430-git'';
+  version = ''20180831-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz'';
-    sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz'';
+    sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w'';
   };
 
   packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
-    0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL
-    http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz
-    MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS
+    1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL
+    http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz
+    MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS
     ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME clx FILENAME clx))
-    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL
-    PARASITES NIL) */
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS
+    (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 6819e4b25713..9734118526c6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''swank'';
-  version = ''slime-v2.20'';
+  version = ''slime-v2.22'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz'';
-    sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26'';
+    url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz'';
+    sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk'';
   };
 
   packageName = "swank";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM swank DESCRIPTION NIL SHA256
-    0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL
-    http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5
-    115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL
-    DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */
+    0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL
+    http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5
+    edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL
+    DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index a772694b9830..9a4afce3280f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-backtrace'';
   version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 5efc57669552..1a562c2288bb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-features'';
   version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 9a285fea2f18..edb01bd2fc52 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-gray-streams'';
-  version = ''20180328-git'';
+  version = ''20180831-git'';
 
   description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz'';
-    sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f'';
+    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz'';
+    sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170'';
   };
 
   packageName = "trivial-gray-streams";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-gray-streams DESCRIPTION
     Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
-    SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL
-    http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz
-    MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME
-    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git
+    SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL
+    http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz
+    MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME
+    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git
     SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index e044f097701d..4214779af320 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz'';
-    sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz'';
+    sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m'';
   };
 
   packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-indent DESCRIPTION
     A very simple library to allow indentation hints for SWANK. SHA256
-    1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL
-    http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz
-    MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME
-    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+    017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL
+    http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz
+    MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME
+    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 6946141f1121..f06c0d7ebf57 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20180131-git'';
+  version = ''20180831-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz'';
-    sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz'';
+    sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr'';
   };
 
   packageName = "trivial-mimes";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-mimes DESCRIPTION
     Tiny library to detect mime types in files. SHA256
-    0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz
-    MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME
-    trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+    0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz
+    MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME
+    trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 1af66736f30f..8cc04c2c64ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-types'';
   version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 753f21dbcb96..c925382d81d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-utf-8'';
   version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 0ac190993d80..1986f7c88f7a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''uffi'';
   version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index afb8b3885681..fdaa07109b49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''uiop'';
-  version = ''3.3.1'';
+  version = ''3.3.2'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz'';
-    sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz'';
+    sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5'';
   };
 
   packageName = "uiop";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM uiop DESCRIPTION NIL SHA256
-    0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL
-    http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5
-    7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */
+    1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL
+    http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5
+    8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 3a4b05e05269..6c4564967320 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''unit-test'';
   version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index b4b4f4543a10..6d02b9764701 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''usocket'';
-  version = ''0.7.0.1'';
+  version = ''0.7.1'';
 
   description = ''Universal socket library for Common Lisp'';
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
-    sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
+    url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz'';
+    sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw'';
   };
 
   packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
-    1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
-    http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz
-    MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket FILENAME usocket DEPS
+    18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL
+    http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5
+    fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS
     ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
-    (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)
+    (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 11b9351c03ad..6a4751f799ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''vom'';
   version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index cc5c23faf862..4a36b6563534 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''woo'';
-  version = ''20170830-git'';
+  version = ''20180831-git'';
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz'';
-    sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv'';
+    url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz'';
+    sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8'';
   };
 
   packageName = "woo";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
-    SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL
-    http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5
-    3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS
+    SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL
+    http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5
+    93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
      cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
      quri smart-buffer split-sequence static-vectors swap-bytes
      trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
-    VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 8c4afa9697d8..6db21bf9005e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''wookie'';
-  version = ''20180228-git'';
+  version = ''20180831-git'';
 
   description = ''An evented webserver for Common Lisp.'';
 
   deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz'';
-    sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq'';
+    url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz'';
+    sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx'';
   };
 
   packageName = "wookie";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
-    1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL
-    http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz
-    MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS
+    1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL
+    http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz
+    MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME babel-streams FILENAME babel-streams)
      (NAME blackbird FILENAME blackbird)
@@ -49,4 +49,4 @@ rec {
      cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
      flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
      trivial-features trivial-gray-streams vom xsubseq)
-    VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index c70c3f2e1e12..b9ab71744c3a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''xsubseq'';
   version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index 733185e2b26f..c7031f4aa3fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''yacc'';
   version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 090aa670ad9e..74e5d7e97e95 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
 rec {
   baseName = ''zpb-ttf'';
   version = ''1.0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 91493d7431e8..face797fe2a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -48,7 +48,7 @@ in
   cl_plus_ssl = addNativeLibs [pkgs.openssl];
   cl-colors = skipBuildPhase;
   cl-libuv = addNativeLibs [pkgs.libuv];
-  cl-async-ssl = addNativeLibs [pkgs.openssl];
+  cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
   cl-async-test = addNativeLibs [pkgs.openssl];
   clsql = x: {
     propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
@@ -143,7 +143,8 @@ $out/lib/common-lisp/query-fs"
       fiveam md5 usocket
     ];
     parasites = [
-      "simple-date/tests"
+      # Needs pomo? Wants to do queries unconditionally?
+      # "simple-date/tests"
     ];
   };
   cl-postgres = x: {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 71d974d9711b..8a126d4fd986 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,9 +6,6 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
-
-
   "unit-test" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."unit-test" or (x: {}))
@@ -17,14 +14,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "clack-socket" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clack-socket" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack-socket.nix {
-         inherit fetchurl;
-       }));
-
-
   "stefil" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stefil" or (x: {}))
@@ -106,14 +95,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "rfc2388" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."rfc2388" or (x: {}))
-       (import ./quicklisp-to-nix-output/rfc2388.nix {
-         inherit fetchurl;
-       }));
-
-
   "net_dot_didierverna_dot_asdf-flv" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
@@ -142,7 +123,6 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
-           "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -255,6 +235,7 @@ let quicklisp-to-nix-packages = rec {
            "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "puri" = quicklisp-to-nix-packages."puri";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "swank" = quicklisp-to-nix-packages."swank";
@@ -287,6 +268,7 @@ let quicklisp-to-nix-packages = rec {
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "puri" = quicklisp-to-nix-packages."puri";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "swank" = quicklisp-to-nix-packages."swank";
@@ -364,14 +346,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "md5" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."md5" or (x: {}))
-       (import ./quicklisp-to-nix-output/md5.nix {
-         inherit fetchurl;
-       }));
-
-
   "clsql-uffi" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clsql-uffi" or (x: {}))
@@ -498,6 +472,7 @@ let quicklisp-to-nix-packages = rec {
            "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
        }));
 
@@ -510,6 +485,7 @@ let quicklisp-to-nix-packages = rec {
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
        }));
 
 
@@ -565,6 +541,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "rfc2388" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."rfc2388" or (x: {}))
+       (import ./quicklisp-to-nix-output/rfc2388.nix {
+         inherit fetchurl;
+       }));
+
+
   "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."named-readtables" or (x: {}))
@@ -589,6 +573,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "md5" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."md5" or (x: {}))
+       (import ./quicklisp-to-nix-output/md5.nix {
+         inherit fetchurl;
+       }));
+
+
   "map-set" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."map-set" or (x: {}))
@@ -688,11 +680,14 @@ let quicklisp-to-nix-packages = rec {
            "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";
            "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";
@@ -701,14 +696,17 @@ let quicklisp-to-nix-packages = rec {
            "lack-util" = quicklisp-to-nix-packages."lack-util";
            "let-plus" = quicklisp-to-nix-packages."let-plus";
            "local-time" = quicklisp-to-nix-packages."local-time";
+           "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";
@@ -719,6 +717,42 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clack-socket" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-socket" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-socket.nix {
+         inherit fetchurl;
+       }));
+
+
+  "clack-handler-hunchentoot" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-handler-hunchentoot" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-handler-hunchentoot.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";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "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";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "cl-syntax" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-syntax" or (x: {}))
@@ -1056,7 +1090,6 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/simple-date.nix {
          inherit fetchurl;
            "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
-           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -1692,6 +1725,7 @@ let quicklisp-to-nix-packages = rec {
            "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "parse-number" = quicklisp-to-nix-packages."parse-number";
            "puri" = quicklisp-to-nix-packages."puri";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
@@ -1728,6 +1762,7 @@ let quicklisp-to-nix-packages = rec {
            "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "puri" = quicklisp-to-nix-packages."puri";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "string-case" = quicklisp-to-nix-packages."string-case";
@@ -1763,6 +1798,7 @@ let quicklisp-to-nix-packages = rec {
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "puri" = quicklisp-to-nix-packages."puri";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "swank" = quicklisp-to-nix-packages."swank";
@@ -2254,6 +2290,7 @@ let quicklisp-to-nix-packages = rec {
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
        }));
 
 
@@ -2420,12 +2457,15 @@ let quicklisp-to-nix-packages = rec {
            "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";
@@ -2435,11 +2475,13 @@ let quicklisp-to-nix-packages = rec {
            "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";
@@ -2555,6 +2597,8 @@ let quicklisp-to-nix-packages = rec {
            "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";
            "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
            "dexador" = quicklisp-to-nix-packages."dexador";
@@ -2563,6 +2607,7 @@ let quicklisp-to-nix-packages = rec {
            "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";
@@ -2573,12 +2618,14 @@ let quicklisp-to-nix-packages = rec {
            "local-time" = quicklisp-to-nix-packages."local-time";
            "map-set" = quicklisp-to-nix-packages."map-set";
            "marshal" = quicklisp-to-nix-packages."marshal";
+           "md5" = quicklisp-to-nix-packages."md5";
            "myway" = quicklisp-to-nix-packages."myway";
            "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";
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 9eba1e15b799..b3d50b2fb075 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -1,5 +1,6 @@
 with import ../../../default.nix {};
 let
+openssl_lib_marked = import ./openssl-lib-marked.nix;
 self = rec {
   name = "ql-to-nix";
   env = buildEnv { name = name; paths = buildInputs; };
@@ -10,6 +11,6 @@ self = rec {
     lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
   CPATH = "${libfixposix}/include";
-  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";
+  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
 };
 in stdenv.mkDerivation self

From e0c081c6ac817eac903587eca6dadb2dd6a84276 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 12 Sep 2018 11:55:56 +0200
Subject: [PATCH 0858/3253] haskell-cabal2nix: update override for hpack 0.31.0

* pkgs/development/haskell-modules/configuration-common.nix:
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 11772dd7d555..2f89623ecdeb 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1076,7 +1076,7 @@ self: super: {
 
   # The tool needs a newer hpack version than the one mandated by LTS-12.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
-    hpack = self.hpack_0_30_0;
+    hpack = self.hpack_0_31_0;
     yaml = self.yaml_0_10_1_1;
   });
 

From 03a1adddd3616bb1b7b150322761e1b1fe2a00c9 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Wed, 12 Sep 2018 13:26:56 +0200
Subject: [PATCH 0859/3253] lmdbxx: change repo location

Owner changed from bendiken to drycpp
---
 pkgs/development/libraries/lmdbxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 34dfe26ad70b..232a67c23f3b 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.9.14.0";
 
   src = fetchFromGitHub {
-    owner = "bendiken";
+    owner = "drycpp";
     repo = "lmdbxx";
     rev = "${version}";
     sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = {
-    homepage = "https://github.com/bendiken/lmdbxx#readme";
+    homepage = "https://github.com/drycpp/lmdbxx#readme";
     description = "C++11 wrapper for the LMDB embedded B+ tree database library";
     license = stdenv.lib.licenses.unlicense;
     maintainers = with stdenv.lib.maintainers; [ fgaz ];

From 515a7aa4523bf8948d48e517c50e7258fee69bf2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 May 2018 00:52:05 +0200
Subject: [PATCH 0860/3253] acme module: fix self-signed cert with openssl 1.1

---
 nixos/modules/security/acme.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 946da92d80e7..092704c6fc3f 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -302,15 +302,15 @@ in
                       workdir="$(mktemp -d)"
 
                       # Create CA
-                      openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048
-                      openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key
+                      openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048
+                      openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key
                       openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \
                         -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com"
                       openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt
 
                       # Create key
-                      openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048
-                      openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key
+                      openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048
+                      openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key
                       openssl req -new -key $workdir/server.key -out $workdir/server.csr \
                         -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com"
                       openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \

From 1f2babe59f1f5b77e049063b05885d88a668cc62 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 12 Sep 2018 14:47:45 +0300
Subject: [PATCH 0861/3253] android-file-transfer: 3.4 -> 3.5

---
 pkgs/tools/filesystems/android-file-transfer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 40725defbed9..336dc785bbfd 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "android-file-transfer-${version}";
-  version = "3.4";
+  version = "3.5";
   src = fetchFromGitHub {
     owner = "whoozle";
     repo = "android-file-transfer-linux";
     rev = "v${version}";
-    sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc";
+    sha256 = "036hca41ikgnw4maykjdp53l31rm01mgamy9y56i5qqh84cwmls2";
   };
   buildInputs = [ cmake fuse readline pkgconfig qtbase ];
   buildPhase = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with stdenv.lib; {
     description = "Reliable MTP client with minimalistic UI";
-    homepage = http://whoozle.github.io/android-file-transfer-linux/;
+    homepage = https://whoozle.github.io/android-file-transfer-linux/;
     license = licenses.lgpl21;
     maintainers = [ maintainers.xaverdh ];
     platforms = platforms.linux;

From 929f71d3811680e9cbfb437878f454f77aefd35f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Jul 2018 21:03:38 +0200
Subject: [PATCH 0862/3253] grafana module: allow path for extraConfig vals

---
 nixos/modules/services/monitoring/grafana.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 3e801f9b838d..c30647f5460b 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -235,7 +235,7 @@ in {
         but without GF_ prefix
       '';
       default = {};
-      type = types.attrsOf types.str;
+      type = with types; attrsOf (either str path);
     };
   };
 

From d8b7ffc7efa63d03eeaf3ee26555c75b14c43881 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <coudron@iij.ad.jp>
Date: Wed, 12 Sep 2018 21:55:03 +0900
Subject: [PATCH 0863/3253] iproute: add $dev output (#46558)

to provide the user API include/ that was previously dropped.
---
 pkgs/os-specific/linux/iproute/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 13135844aa7a..8f81ec4918ed 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace " netem " " "
   '';
 
+  outputs = [ "out" "dev"];
+
   makeFlags = [
     "DESTDIR="
     "LIBDIR=$(out)/lib"
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     "MANDIR=$(out)/share/man"
     "BASH_COMPDIR=$(out)/share/bash-completion/completions"
     "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
-    "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
+    "HDRDIR=$(dev)/include/iproute2"
   ];
 
   buildFlags = [

From a49f56c3b1a5dc88c1dfbb0412a790033ac0f6c3 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 20 Aug 2018 20:33:49 +0200
Subject: [PATCH 0864/3253] kubernetes: 1.10.5 -> 1.11.3

Fixed minor issue where kube-addon manager complaints about
/opt/namespace.yaml missing.

Added release notes with reference to Kubernetes 1.11 release notes.

closes #43882
---
 nixos/doc/manual/release-notes/rl-1809.xml       |  8 ++++++++
 .../networking/cluster/kubernetes/default.nix    | 16 +++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 9ec465d8955e..9c8cd7c49c8d 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -451,6 +451,14 @@ inherit (pkgs.nixos {
      deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
+   <listitem>
+     <para>
+     The Kubernetes package has been bumped to major version 1.11.
+     Please consult the
+     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link>
+     for details on new features and api changes.
+    </para>
+   </listitem>
    <listitem>
     <para>
      The option
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 01bf3467af95..96dab6aa66a1 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
 , components ? [
     "cmd/kubeadm"
     "cmd/kubectl"
@@ -15,17 +15,16 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.10.5";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2";
+    sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb";
   };
 
-  # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
-  buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
+  buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
 
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./hack
   '';
 
-  WHAT="--use_go_build ${concatStringsSep " " components}";
+  WHAT="${concatStringsSep " " components}";
 
   postBuild = ''
     ./hack/generate-docs.sh
@@ -53,8 +52,11 @@ stdenv.mkDerivation rec {
     cp build/pause/pause "$pause/bin/pause"
     cp -R docs/man/man1 "$man/share/man"
 
+    cp cluster/addons/addon-manager/namespace.yaml $out/share
     cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
     patchShebangs $out/bin/kube-addons
+    substituteInPlace $out/bin/kube-addons \
+      --replace /opt/namespace.yaml $out/share/namespace.yaml
     wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
 
     $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
+    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
   '';
 
   meta = {

From 139eb11a6d471bb78aed90d6da827f66f727c429 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Sep 2018 22:56:51 +0200
Subject: [PATCH 0865/3253] alock: mark linux only

The darwin build fails and it's probably not particularly useful there.

    utils.c:33:19: error: use of undeclared identifier 'CLOCK_MONOTONIC'
        clock_gettime(CLOCK_MONOTONIC, &t);

/cc ZHF #45961
---
 pkgs/misc/screensavers/alock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 596668b0ce96..59d5a146e165 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       xscreensaver and never will. It's just for locking the current
       X session.
     '';
-    platforms = platforms.unix; # Cygwin had problems at one point
+    platforms = platforms.linux;
     maintainers = with maintainers; [ ftrvxmtrx chris-martin ];
     license = licenses.mit;
   };

From 80a4e48e4509a9545e582a4258d9948dca2454c5 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 20:07:49 +0200
Subject: [PATCH 0866/3253] asio: mark broken on darwin

Started to fail since 1.12.1.

    Undefined symbols for architecture x86_64:
      "boost::chrono::steady_clock::now()", referenced from:
          pinger::start_send() in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_msec(long) const in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::wait_duration_usec(long) const in ping.o
          asio::detail::timer_queue<asio::detail::chrono_time_traits<boost::chrono::steady_clock, asio::wait_traits<boost::chrono::steady_clock> > >::get_ready_timers(asio::detail::op_queue<asio::detail::scheduler_operation>&) in ping.o
          pinger::handle_receive(unsigned long) in p

/cc ZHF #45961
---
 pkgs/development/libraries/asio/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 58dd4f614231..72305cb633fb 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
     homepage = http://asio.sourceforge.net/;
     description = "Cross-platform C++ library for network and low-level I/O programming";
     license = licenses.boost;
+    broken = stdenv.isDarwin;  # test when updating to >=1.12.1
     platforms = platforms.unix;
   };
 }

From 37961c65073de7d642d66ea91c66977d8e537e5e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 12 Sep 2018 20:34:17 +0200
Subject: [PATCH 0867/3253] scdoc: 1.4.1 -> 1.4.2

---
 pkgs/tools/typesetting/scdoc/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 16b7a734c22d..bdf074b558e7 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,17 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz";
-    sha256 = "14nabq1hrz5jvilx22yxbqjsd9s4ll0fnl750n1qbyyxw2m6vj9b";
+    sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
       --replace "-static" "" \
       --replace "/usr/local" "$out"
+    # It happens from time to time that the version wasn't updated:
+    sed -iE 's/VERSION=[0-9]\.[0-9]\.[0-9]/VERSION=${version}/' Makefile
   '';
 
   doCheck = true;

From 0fe81b0d543b5e34ef0f7c5d699d65ee7e467186 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 12 Sep 2018 20:35:28 +0200
Subject: [PATCH 0868/3253] androidStudioPackages.{dev,canary}: 3.3.0.7 ->
 3.3.0.9

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 38d252b345d1..2385cd31cfaa 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
   };
   latestVersion = { # canary & dev
-    version = "3.3.0.7"; # "Android Studio 3.3 Canary 8"
-    build = "182.4978721";
-    sha256Hash = "0xa19wrw1a6y7f2jdv8699yqv7g34h3zdw3wc0ql0447afzwg9a9";
+    version = "3.3.0.9"; # "Android Studio 3.3 Canary 10"
+    build = "182.4996246";
+    sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g";
   };
 in rec {
   # Old alias

From f1542f612b1a85871676751e8fd4f1940a6ec514 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 20:49:10 +0200
Subject: [PATCH 0869/3253] atlas: mark broken on darwin

Started to fail since 3.10.3.

    /private/tmp/nix-build-atlas-3.10.3.drv-0/ATLAS/build/bin/ATLrun.sh: line 4: 31119 Segmentation fault: 11  $atldir/$*
    make[3]: *** [Makefile:1695: ssanity_test] Error 139

/cc ZHF #45961
---
 pkgs/development/libraries/science/math/atlas/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8b740bdb6f6d..fb90ed754da9 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation {
     homepage = http://math-atlas.sourceforge.net/;
     description = "Automatically Tuned Linear Algebra Software (ATLAS)";
     license = stdenv.lib.licenses.bsd3;
+    broken = stdenv.isDarwin;  # test when updating to >=3.10.3
     platforms = stdenv.lib.platforms.unix;
 
     longDescription = ''

From d726c0ff1dcf4bbe3ac4fc6df5d0635d9d00e69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 12 Sep 2018 00:17:44 +0200
Subject: [PATCH 0870/3253] scs: Fix darwin build

Additionally we make the unit-test deterministic by specifying a seed
instead of using something random.
---
 .../libraries/science/math/scs/default.nix    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 0539083e823c..f9d1a84b1f03 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
+{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   name = "scs-${version}";
@@ -11,24 +11,30 @@ stdenv.mkDerivation rec {
     sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
   };
 
-  buildInputs = [ blas liblapack gfortran.cc.lib ];
-
   # Actually link and add libgfortran to the rpath
-  patchPhase = ''
-    sed -i 's/#-lgfortran/-lgfortran/' scs.mk
+  postPatch = ''
+    substituteInPlace scs.mk \
+      --replace "#-lgfortran" "-lgfortran" \
+      --replace "gcc" "cc"
   '';
 
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  buildInputs = [ blas liblapack gfortran.cc.lib ];
+
   doCheck = true;
 
-  # Test demo requires passing any int as $1; 42 chosen arbitrarily
-  checkPhase = ''
-    ./out/demo_socp_indirect 42
+  # Test demo requires passing data and seed; numbers chosen arbitrarily.
+  postCheck = ''
+    ./out/demo_socp_indirect 42 0.42 0.42 42
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/lib
     cp -r include $out/
-    cp out/*.a out/*.so $out/lib/
+    cp out/*.a out/*.so out/*.dylib $out/lib/
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {

From cf9d1a6d3043c46c75c2eb60c4627cb77b595bcc Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 20:55:53 +0200
Subject: [PATCH 0871/3253] bitcoin-abc: mark broken on darwin

Last successful build https://hydra.nixos.org/build/74552872.

/cc ZHF #45961
---
 pkgs/applications/altcoins/bitcoin-abc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index bd365e167304..1e11f0eefc4b 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     homepage = https://bitcoinabc.org/;
     maintainers = with maintainers; [ lassulus ];
     license = licenses.mit;
+    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }

From d990bae6ef6448aac894c58b601cd6824ba3f2ba Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 20:58:23 +0200
Subject: [PATCH 0872/3253] bitcoin-classic: mark broken on darwin

Last successful build https://hydra.nixos.org/build/74552951.

/cc ZHF #45961
---
 pkgs/applications/altcoins/bitcoin-classic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 31c8ed6fc8d0..34faf77e980d 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
     homepage = https://bitcoinclassic.com/;
     maintainers = with maintainers; [ jefdaj ];
     license = licenses.mit;
+    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }

From eaff0b74c035077c2b2b1e6e14be6f704247080c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 21:01:03 +0200
Subject: [PATCH 0873/3253] bitcoin-unlimited: mark broken on darwin

/cc ZHF #45961
---
 pkgs/applications/altcoins/bitcoin-unlimited.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 5a67dc565aa7..13ec55bb589d 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.bitcoinunlimited.info/;
     maintainers = with maintainers; [ DmitryTsygankov ];
     license = licenses.mit;
+    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }

From 8f6ede967e00242a2944e88cfb24486814995798 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 21:02:24 +0200
Subject: [PATCH 0874/3253] bitcoin-xt: mark broken on darwin

/cc ZHF #45961
---
 pkgs/applications/altcoins/bitcoin-xt.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index feb2924f8651..cab1b388a126 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec{
     homepage = https://bitcoinxt.software/;
     maintainers = with maintainers; [ jefdaj ];
     license = licenses.mit;
+    broken = stdenv.isDarwin;
     platforms = platforms.unix;
   };
 }

From e7ecf593e27e9505c51fba93c260e892c17cdf06 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 21:04:48 +0200
Subject: [PATCH 0875/3253] ethsign: mark broken on darwin

Could be caused by our older 10.10.5 CoreFoundation.

    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:51:216:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:162:47:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to
    _Cfunc_CFStringCreateWithCStringNoCopy
    go/src/github.com/ethereum/go-ethereum/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go:163:225:
    cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal

/cc ZHF #45961
---
 pkgs/applications/altcoins/ethsign/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
index 35fd4bc718c8..8e89de4d6906 100644
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ b/pkgs/applications/altcoins/ethsign/default.nix
@@ -54,6 +54,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/dapphub/ethsign;
     description = "Make raw signed Ethereum transactions";
+    broken = stdenv.isDarwin;  # test with CoreFoundation 10.11
     license = [licenses.gpl3];
   };
 }

From 1e379f29f7ff009b5c353998bb4d1662b69790b5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 12 Sep 2018 21:05:49 +0200
Subject: [PATCH 0876/3253] electrum: 3.1.3 -> 3.2.3

---
 pkgs/applications/misc/electrum/default.nix | 26 ++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ed2f0626e5d2..95754579c487 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,12 +1,24 @@
 { stdenv, fetchurl, python3, python3Packages, zbar }:
 
+let
+  qdarkstyle = python3Packages.buildPythonPackage rec {
+    pname = "QDarkStyle";
+    version = "2.5.4";
+    src = python3Packages.fetchPypi {
+      inherit pname version;
+      sha256 = "1w715m1i5pycfqcpkrggpn0rs9cakx6cm5v8rggcxnf4p0i0kdiy";
+    };
+    doCheck = false; # no tests
+  };
+in
+
 python3Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "3.1.3";
+  version = "3.2.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "05m28yd3zr9awjhaqikf4rg08j5i4ygm750ip1z27wl446sysniy";
+    sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -17,12 +29,14 @@ python3Packages.buildPythonApplication rec {
     pbkdf2
     protobuf
     pyaes
-    pycrypto
+    pycryptodomex
     pyqt5
     pysocks
+    qdarkstyle
     qrcode
     requests
     tlslite
+    typing
 
     # plugins
     keepkey
@@ -35,10 +49,10 @@ python3Packages.buildPythonApplication rec {
 
   preBuild = ''
     sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
-    pyrcc5 icons.qrc -o gui/qt/icons_rc.py
+    pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py
     # Recording the creation timestamps introduces indeterminism to the build
-    sed -i '/Created: .*/d' gui/qt/icons_rc.py
-    sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" lib/qrscanner.py
+    sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py
+    sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py
   '';
 
   postInstall = ''

From 7880cd67525d58c7da0f4858ef29dd25af0ce89e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 12 Sep 2018 20:21:29 +0100
Subject: [PATCH 0877/3253] vault: 0.10.4 -> 0.11.1

changelog: https://github.com/hashicorp/vault/blob/v0.11.1/CHANGELOG.md
---
 pkgs/tools/security/vault/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index a9e8d8fca351..091b17c6ffe1 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,13 +9,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.10.4";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5";
+    sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70b30adddb62..275529ae561e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22054,9 +22054,7 @@ with pkgs;
 
   valauncher = callPackage ../applications/misc/valauncher { };
 
-  vault = callPackage ../tools/security/vault {
-    go = go_1_10;
-  };
+  vault = callPackage ../tools/security/vault { };
 
   vaultenv = haskellPackages.vaultenv;
 

From 899b7663b0ce22676884989cefdcff668cd20250 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Wed, 12 Sep 2018 21:35:16 +0200
Subject: [PATCH 0878/3253] masterpdfeditor: 5.1.12 -> 5.1.36

---
 pkgs/applications/misc/masterpdfeditor/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 3155ab678d86..c5a125e95adf 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }:
+{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
 
 let
-  version = "5.1.12";
+  version = "5.1.36";
 
 in stdenv.mkDerivation {
   name = "masterpdfeditor-${version}";
 
   src = fetchurl {
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-    sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq";
+    sha256 = "10kydjg9qi6kvzn7ny5nk4xn2fsm47anq3al89hq97ppm9dlvh48";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
   buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ];
 
   dontStrip = true;
 
+  postInstall = ''
+    wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
+  '';
+
   installPhase = ''
     runHook preInstall
 

From c3c427026788e50ce78aa333bd3d515ce863e6ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:41:44 -0700
Subject: [PATCH 0879/3253] worker: 3.15.1 -> 3.15.2 (#46155)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
worker
---
 pkgs/applications/misc/worker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index bfb43d3e49d1..f9267411dda4 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "worker-${version}";
-  version = "3.15.1";
+  version = "3.15.2";
 
   src = fetchurl {
     url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
-    sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi";
+    sha256 = "0km17ls51vp4nxlppf58vvxxymyx6w3xlzjc8wghxpjj098v4pp8";
   };
 
   buildInputs = [ libX11 ];

From a2d959c35fd0f65d8a2e5f56549e7c501e3d90f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:42:44 -0700
Subject: [PATCH 0880/3253] tinyproxy: 1.8.4 -> 1.10.0 (#46171)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tinyproxy
---
 pkgs/tools/networking/tinyproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix
index 8ecc85544354..809286cefe96 100644
--- a/pkgs/tools/networking/tinyproxy/default.nix
+++ b/pkgs/tools/networking/tinyproxy/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec{
   name = "tinyproxy-${version}";
-  version = "1.8.4";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
-    sha256 = "043mfqin5bsba9igm1lqbkp2spibk4j3niyjqc868cnzgx60709c";
+    sha256 = "0gzapnllzyc005l3rs6iarjk1p5fc8mf9ysbck1mbzbd8xg6w35s";
     rev = "${version}";
     repo = "tinyproxy";
     owner = "tinyproxy";

From cdf162eafb9bf593419d69af5253777b91c3da97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:48:50 -0700
Subject: [PATCH 0881/3253] uftp: 4.9.7 -> 4.9.8 (#46175)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
uftp
---
 pkgs/servers/uftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index a484e0382104..768fdf0b46f8 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.7";
+  version = "4.9.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "1gh1zpc6dh690xjhfp5x2ajhwjkchyh5wazr8agm6axxwqhd9gn8";
+    sha256 = "16g54372xy5apk485xz9bp1hfci15mssw7m7givls4lpwhc67379";
   };
 
   buildInputs = [ openssl ];

From c4e8db3de02c7ceee6d0e0d7bb366c1464a34129 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:49:12 -0700
Subject: [PATCH 0882/3253] star: 2.6.0c -> 2.6.1a (#46176)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
star
---
 pkgs/applications/science/biology/star/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index f52df902db6a..c552d9f9de35 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "star-${version}";
-  version = "2.6.0c";
+  version = "2.6.1a";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59";
+    sha256 = "11zs32d96gpjldrylz3nr5r2qrshf0nmzh5nmcy4wrk7y5lz81xc";
   };
 
   sourceRoot = "source/source";

From 626dac304a903aa32dd9096f5a692366f3751b6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:50:40 -0700
Subject: [PATCH 0883/3253] snd: 18.6 -> 18.7 (#46184)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
snd
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 7c96fd364c18..0709917a0442 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.6";
+  name = "snd-18.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z";
+    sha256 = "1d7g043r534shwsq5s4xsywgn5qv96v9wnhdx04j21s9w7fy9ypl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1b5744a42db755aa651278985bd255b2cf304a5d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:52:09 -0700
Subject: [PATCH 0884/3253] radarr: 0.2.0.995 -> 0.2.0.1120 (#46185)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
radarr
---
 pkgs/servers/radarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 5fd23476d7da..8d920af654da 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "radarr-${version}";
-  version = "0.2.0.995";
+  version = "0.2.0.1120";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "04sgs292qz65fcg5vsps0fk2669xzvyfw1rbc5sbbk3hig5lhlns";
+    sha256 = "0vsjaza0k4djb3vnazl2py4qmbxqfyyr0x9p4flq78yn79hp3439";
   };
 
   buildInputs = [ makeWrapper ];

From 0837ff1108f0b3e8292fb525a098a328ee7ca15e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:52:56 -0700
Subject: [PATCH 0885/3253] sec: 2.7.12 -> 2.8.0 (#46199)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
sec
---
 pkgs/tools/admin/sec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index f7b6aaa76c68..dede514729ec 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, perl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "sec-2.7.12";
+  name = "sec-2.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
-    sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa";
+    sha256 = "0q9fhkkh0n0jya4kf5c54smk4xbnv01hqhip2y6fnnj9imwskymz";
   };
 
   buildInputs = [ perl ];

From 124c6581000263b1efe6635e54e460f9aabf166f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:53:27 -0700
Subject: [PATCH 0886/3253] rosegarden: 17.12.1 -> 18.06 (#46188)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
rosegarden
---
 pkgs/applications/audio/rosegarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index e57d85de05a9..0b2bd9507e55 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -3,12 +3,12 @@
 , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
 
 stdenv.mkDerivation (rec {
-  version = "17.12.1";
+  version = "18.06";
   name = "rosegarden-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
-    sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg";
+    sha256 = "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7";
   };
 
   patchPhase = ''

From 69504d47c9c44d2e34274562f2992dbd5dc2e39b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:56:47 -0700
Subject: [PATCH 0887/3253] miniupnpc_2: 2.0.20180203 -> 2.1 (#46250)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
miniupnpc
---
 pkgs/tools/networking/miniupnpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index b4c2a6ea3970..88b4b7fab88f 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -28,8 +28,8 @@ let
     };
 in {
   miniupnpc_2 = generic {
-    version = "2.0.20180203";
-    sha256 = "1dr0qaf2qz49aawgsnv7l41rda5yvdk3qfz2hd5cv9iwav3sipch";
+    version = "2.1";
+    sha256 = "1ik440yspbp3clr4m01xsl9skwyrzcvzb5nbm3i0g9x53vhbb7z1";
   };
   miniupnpc_1 = generic {
     version = "1.9.20160209";

From d8b1223da9efad268484e222c9a1bfbd5a5e8aa5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:57:25 -0700
Subject: [PATCH 0888/3253] tilix: 1.8.3 -> 1.8.5 (#46180)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
tilix
---
 pkgs/applications/misc/tilix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index e101005e44ec..98e320b7aaf5 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "tilix-${version}";
-  version = "1.8.3";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "gnunn1";
     repo = "tilix";
     rev = "${version}";
-    sha256 = "05x2nyyb5w3122j90g0f7lh9jl7xi1nk176sl01vl2ks7zar00dq";
+    sha256 = "1ixhkssz0xn3x75n2iw6gd3hka6bgmgwfgbvblbjhhx8gcpbw3s7";
   };
 
   nativeBuildInputs = [

From 14e7afdd95bc597b2f28f77232b237310dfcf0d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:58:07 -0700
Subject: [PATCH 0889/3253] lynis: 2.6.7 -> 2.6.8 (#46247)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
lynis
---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index bb7a6a0e7724..8158a4fbfd74 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.7";
+  version = "2.6.8";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "0ayil5bzxqaksmr79x0gxy60k8djzg0bs60jfg8qi6128q6srhar";
+    sha256 = "1g7jxjqvzl78fy770vlg6n6l003nvm452i2g3wnrb1fqcwkrm6ax";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From dd43e1d97f73f3771822b322d31459581c5d41c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 13:58:49 -0700
Subject: [PATCH 0890/3253] lockfileProgs: 0.1.17 -> 0.1.18 (#46248)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
lockfile-progs
---
 pkgs/tools/misc/lockfile-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix
index 308b5217a6fc..e851855834a4 100644
--- a/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/pkgs/tools/misc/lockfile-progs/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   _name   = "lockfile-progs";
-  version = "0.1.17";
+  version = "0.1.18";
   name    = "${_name}-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz";
-    sha256 = "04f5cvhrld15w58wkg6k2azywszsc5xp9cbmfx4jylwrak90byq3";
+    sha256 = "1rjwn3fh2hy8hmpr66y8yp7v5i3325v1mk0gr7pqhqbyp6j9aad4";
   };
 
   buildInputs = [ liblockfile ];

From 654a0bd5b5795c99a843d7b7c3b4d1f50272705f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:03:13 -0700
Subject: [PATCH 0891/3253] inboxer: 1.1.2 -> 1.1.4 (#46262)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
inboxer
---
 pkgs/applications/networking/mailreaders/inboxer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 390f68bd105f..4edf61ceaaed 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
-  version = "1.1.2";
+  version = "1.1.4";
 
   meta = with stdenv.lib; {
     description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
-    sha256 = "100185j10dj044mg5p9xlq7fj7n7xki9qw5xn845dgq0dpj8rkrm";
+    sha256 = "1jhx7mghslk8s2h50g8avnspf2v2r8yj0i8hkhw3qy2sa91m3ck1";
   };
 
   unpackPhase = ''

From e077fc1965a7fdfd179bc25d673e7d385e93ee83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:05:48 -0700
Subject: [PATCH 0892/3253] mercurialFull: 4.7 -> 4.7.1 (#46243)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mercurial-full
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 73cf4d74e182..41809e83b457 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "4.7";
+  version = "4.7.1";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
 in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "17rl1lyvr3qa5x73xyiwnv09wwiwjd18f01gvispzyvpgx1v3309";
+    sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From 656330577a3b49bdf9f812a88f2fe3ecfabf38db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:06:42 -0700
Subject: [PATCH 0893/3253] hebcal: 4.13 -> 4.14 (#46269)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
hebcal
---
 pkgs/tools/misc/hebcal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix
index fb6944c1cf36..da231c16cc90 100644
--- a/pkgs/tools/misc/hebcal/default.nix
+++ b/pkgs/tools/misc/hebcal/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "4.13";
+  version = "4.14";
   name = "hebcal-${version}";
 
   src = fetchFromGitHub {
     owner = "hebcal";
     repo = "hebcal";
     rev = "v${version}";
-    sha256 = "0h9hbfkbq620sw9gnnkivv7yi7dnp1k6axzwr0yccbv5cg67xs3h";
+    sha256 = "1zq8f7cigh5r31p03az338sbygkx8gbday35c9acppglci3r8fvc";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From e94947af0ae98104013ec18a770e0e01c4bcc887 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:07:27 -0700
Subject: [PATCH 0894/3253] gromacs: 2018.2 -> 2018.3 (#46275)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gromacs
---
 .../science/molecular-dynamics/gromacs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 295e726c679d..1caa84a69334 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
 
 
 stdenv.mkDerivation {
-  name = "gromacs-2018.2";
+  name = "gromacs-2018.3";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz";
-    sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.3.tar.gz";
+    sha256 = "14d219987h98mv5xgn2846snmslwax8z3cgp5b2njacp4j9a88s4";
   };
 
   buildInputs = [cmake fftw]

From 7f40c3a93cd30ee61976c9a4e7f67b29a97f80fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:10:04 -0700
Subject: [PATCH 0895/3253] gitAndTools.git-imerge: 1.0.0 -> 1.1.0 (#46281)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-imerge/versions
---
 .../version-management/git-and-tools/git-imerge/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
index 49856552aa3b..10e786222710 100644
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-imerge-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "mhagger";
     repo = "git-imerge";
     rev = "v${version}";
-    sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
+    sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];

From 64ab031a579ec1349167791d3a342cb4439d0520 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:11:11 -0700
Subject: [PATCH 0896/3253] focuswriter: 1.6.15 -> 1.6.16 (#46286)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/focuswriter/versions
---
 pkgs/applications/editors/focuswriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 706f2f015b12..000797c9b705 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.15";
+  version = "1.6.16";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q";
+    sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From 7d6c70bc74681221f3eeb616b0842c8ce6a49a8b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:40:50 +0200
Subject: [PATCH 0897/3253] libfakeXinerama: add license

---
 pkgs/tools/X11/xpra/libfakeXinerama.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix
index 4ca509f8b936..d6fab2b19103 100644
--- a/pkgs/tools/X11/xpra/libfakeXinerama.nix
+++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix
@@ -24,10 +24,11 @@ stdenv.mkDerivation  rec {
     ln -s libXinerama.so.1 $out/lib/libXinerama.so
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xpra.org/;
     description = "fakeXinerama for Xpra";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.tstrobel ];
+    license = licenses.gpl2;
   };
 }

From 0052a756d29cb1803bdd667abe991ff0fc75abef Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:42:39 +0200
Subject: [PATCH 0898/3253] xpra: add license

---
 pkgs/tools/X11/xpra/default.nix | 1 +
 pkgs/tools/X11/xpra/gtk3.nix    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index fd7f70004dbf..23270793b34e 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -81,5 +81,6 @@ in buildPythonApplication rec {
     description = "Persistent remote applications for X";
     platforms = platforms.linux;
     maintainers = with maintainers; [ tstrobel offline ];
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 16693b08e110..ceba4269e808 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -68,11 +68,12 @@ buildPythonApplication rec {
   #'';
 
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xpra.org/;
     downloadPage = "https://xpra.org/src/";
     downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
     description = "Persistent remote applications for X";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From f24a78f671696a893fc6164a5e8948b3678706b6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:45:57 +0200
Subject: [PATCH 0899/3253] x2vnc: add licenses

---
 pkgs/tools/X11/x2vnc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index 2703379a23b9..f3ab23d364c5 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -15,9 +15,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://fredrik.hubbe.net/x2vnc.html;
     description = "A program to control a remote VNC server";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From 72305e7eaecddfc26c781a87b7ba3c76f020a039 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:47:25 +0200
Subject: [PATCH 0900/3253] x11vnc: add license

---
 pkgs/tools/X11/x11vnc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 2d319cccf206..2dc6d8ffd78c 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
     sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A VNC server connected to a real X11 screen";
     homepage = http://www.karlrunge.com/x11vnc/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From 239a0ea2b9d3aad57c9ef5c2b9a2b711c5af8529 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:54:53 +0200
Subject: [PATCH 0901/3253] virtualgl[Lib]: fix license

---
 pkgs/tools/X11/virtualgl/default.nix | 1 +
 pkgs/tools/X11/virtualgl/lib.nix     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
index b0d017acf84b..aa839e6d684d 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    inherit (virtualglLib.meta) license;
   };
 }
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index c552011f3844..4c911e756330 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
-    license = licenses.free; # many parts under different free licenses
+    license = licenses.wxWindows;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };

From 4d933fbfdc7cef9263265f28f988b72b2b540a0d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:56:37 +0200
Subject: [PATCH 0902/3253] dex: add license

---
 pkgs/tools/X11/dex/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
index 2a3a406135b3..fd0c0503de9f 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/pkgs/tools/X11/dex/default.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ python3.pkgs.sphinx ];
   makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A program to generate and execute DesktopEntry files of the Application type";
     homepage = https://github.com/jceb/dex;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
   };
 }

From d9416449b59bb11087ea19babd0e08591406df9c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 21:58:01 +0200
Subject: [PATCH 0903/3253] flvtool2: add licenses

---
 pkgs/tools/video/flvtool2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix
index 975e13b65da7..037e07c72286 100644
--- a/pkgs/tools/video/flvtool2/default.nix
+++ b/pkgs/tools/video/flvtool2/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, ruby }:
+{ lib, buildRubyGem, ruby }:
 
 buildRubyGem rec {
   inherit ruby;
@@ -12,5 +12,6 @@ buildRubyGem rec {
     homepage = https://github.com/unnu/flvtool2;
     description = "A tool to manipulate Macromedia Flash Video files";
     platforms = ruby.meta.platforms;
+    license = lib.licenses.bsd3;
   };
 }

From 7d25ffade45e9d504ba2d5bc500bff5a2c30e99f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 22:03:47 +0200
Subject: [PATCH 0904/3253] dd_rescue: add license + update homepage

---
 pkgs/tools/system/dd_rescue/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index 1ea574dbe8ea..e0d11769fd9f 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile \
       --replace "\$(DESTDIR)/usr" "$out" \
       --replace "-o root" "" \
-      --replace "-g root" "" 
+      --replace "-g root" ""
   '';
   makeFlags = [ "LIBDIR=$out" ];
 
@@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
     tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue"
     cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin"
   '';
-      
+
   meta = with stdenv.lib; {
     description = "A tool to copy data from a damaged block device";
     maintainers = with maintainers; [ raskin domenkozar ];
     platforms = platforms.linux;
-    downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/";
+    homepage = "http://www.garloff.de/kurt/linux/ddrescue/";
+    license = licenses.gpl2Plus;
     inherit version;
     updateWalker = true;
   };

From 131bc90d08199bed568789e7524ce9e5172c7bab Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 22:05:26 +0200
Subject: [PATCH 0905/3253] localtime: add license

---
 pkgs/tools/system/localtime/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index c49054f3a67c..442b9a42f2b8 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce";
     sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8";
   };
-  
+
   buildInputs = [ go systemd polkit m4 removeReferencesTo ];
   disallowedRequisites = [ go ];
 
@@ -19,9 +19,10 @@ stdenv.mkDerivation {
     find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A daemon for keeping the system timezone up-to-date based on the current location";
     homepage = https://github.com/Stebalien/localtime;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
   };
 }

From 4503d462c779cf53d6ba3bddce2a61eb4a961a06 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 22:07:50 +0200
Subject: [PATCH 0906/3253] sg3_utils: add licenses

---
 pkgs/tools/system/sg3_utils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index ca1af7a74e4b..8be7203fb3d4 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://sg.danny.cz/sg/;
     description = "Utilities that send SCSI commands to devices";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    platforms = platforms.linux;
+    license = with licenses; [ bsd2 gpl2Plus ];
   };
 }

From 6d8be09c8adccda1ece13e2bc06eabf88d955111 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 12 Sep 2018 22:09:47 +0200
Subject: [PATCH 0907/3253] vbetool: add license

---
 pkgs/tools/system/vbetool/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index c30a7b14e891..32cf56a1d74e 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.codon.org.uk/~mjg59/vbetool/;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From aea9db9d5044b56925b968972b1c044c46b5bf71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:13:02 -0700
Subject: [PATCH 0908/3253] gdbm: 1.17 -> 1.18 (#46285)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gdbm/versions
---
 pkgs/development/libraries/gdbm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 685775e2918d..8d88dc04924b 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.17";
-  # FIXME: remove on update to > 1.17
+  name = "gdbm-1.18";
+  # FIXME: remove on update to > 1.18
   NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "0zcp2iv5dbab18859a5fvacg8lkp8k4pr9af13kfvami6lpcrn3w";
+    sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
   };
 
   doCheck = true; # not cross;

From 0dff3d5c736ba419d2b9d5c6612322f5a6fde650 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 21:50:33 +0200
Subject: [PATCH 0909/3253] litecoin: add missing framework and mark broken on
 darwin

    In file included from qt/bitcoin.cpp:9:
    ./qt/bitcoingui.h:14:10: fatal error: 'QLabel' file not found
    #include <QLabel>
             ^~~~~~~~
    1 error generated.

/cc ZHF #45961
---
 pkgs/applications/altcoins/default.nix  | 6 ++++--
 pkgs/applications/altcoins/litecoin.nix | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 4236cd7910bc..90cefed13aa5 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -62,8 +62,10 @@ rec {
     buildGoPackage = buildGo110Package;
   };
 
-  litecoin  = callPackage ./litecoin.nix { withGui = true; };
-  litecoind = callPackage ./litecoin.nix { withGui = false; };
+  litecoin  = callPackage ./litecoin.nix {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
+  litecoind = litecoin.override { withGui = false; };
 
   masari = callPackage ./masari.nix { };
 
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index b930923e8f45..ed268e34946f 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -2,9 +2,12 @@
 , pkgconfig, autoreconfHook
 , openssl, db48, boost, zlib, miniupnpc
 , glib, protobuf, utillinux, qt4, qrencode
-, withGui, libevent }:
+, AppKit
+, withGui ? true, libevent
+}:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
@@ -20,6 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
                   miniupnpc glib protobuf utillinux libevent ]
+                  ++ optionals stdenv.isDarwin [ AppKit ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
@@ -39,6 +43,7 @@ stdenv.mkDerivation rec {
     homepage = https://litecoin.org/;
     platforms = platforms.unix;
     license = licenses.mit;
-    maintainers = with maintainers; [ offline AndersonTorres ];  
+    broken = stdenv.isDarwin;
+    maintainers = with maintainers; [ offline AndersonTorres ];
   };
 }

From b8148813941f026af03b7e8a94e66a4bcfe83c64 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 21:56:52 +0200
Subject: [PATCH 0910/3253] aws-okta: mark broken on darwin

Could be caused by our older 10.10.5 CoreFoundation.

    # github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:35:33: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFDataCreate
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:61: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:98:41: cannot use nil as type _Ctype_CFAllocatorRef in argument to _Cfunc_CFStringCreateWithBytes
    go/src/github.com/segmentio/aws-okta/vendor/github.com/keybase/go-keychain/corefoundation_go110.go:133: cannot use nil as type _Ctype_CFAllocatorRef in argument to func literal

/cc ZHF #45961
---
 pkgs/tools/security/aws-okta/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix
index 7ec5b024de13..cdb35453d3d2 100644
--- a/pkgs/tools/security/aws-okta/default.nix
+++ b/pkgs/tools/security/aws-okta/default.nix
@@ -1,4 +1,5 @@
 { buildGoPackage, fetchFromGitHub, stdenv }:
+
 buildGoPackage rec {
   name = "aws-okta-${version}";
   version = "0.19.0";
@@ -19,6 +20,7 @@ buildGoPackage rec {
     description = "aws-vault like tool for Okta authentication";
     license = licenses.mit;
     maintainers = [maintainers.imalsogreg];
+    broken = stdenv.isDarwin;  # test with CoreFoundation 10.11
     platforms = platforms.all;
     homepage = https://github.com/segmentio/aws-okta;
     downloadPage = "https://github.com/segmentio/aws-okta";

From 9fc6f1123df05698644849d301e4b8c8aaf686b5 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 12 Sep 2018 22:39:38 +0200
Subject: [PATCH 0911/3253] asymptote: mark broken on darwin

It only builds with gc-7.6.0 on darwin for some reason.

/cc ZHF #45961
---
 pkgs/tools/graphics/asymptote/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 1aa4fff82241..a0bf0a434471 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl
-  , freeglut, ghostscriptX, imagemagick, fftw 
+  , freeglut, ghostscriptX, imagemagick, fftw
   , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
 , darwin
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     export HOME="$PWD"
-    patchShebangs . 
+    patchShebangs .
     sed -e 's@epswrite@eps2write@g' -i runlabel.in
     xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
     cp texinfo-*/doc/texinfo.tex doc/
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
     description =  "A tool for programming graphics intended to replace Metapost";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.raskin maintainers.peti ];
+    broken = stdenv.isDarwin;  # https://github.com/vectorgraphics/asymptote/issues/69
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 65bc378de8f2268040da3d221ec5a48c3081b86c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Sep 2018 14:20:26 -0700
Subject: [PATCH 0912/3253] mbuffer: 20180318 -> 20180625 (#46241)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
mbuffer
---
 pkgs/tools/misc/mbuffer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix
index 664c5cc8e78e..5eefc94a2cd6 100644
--- a/pkgs/tools/misc/mbuffer/default.nix
+++ b/pkgs/tools/misc/mbuffer/default.nix
@@ -3,12 +3,12 @@
  } :
 
 stdenv.mkDerivation rec {
-  version = "20180318";
+  version = "20180625";
   name = "mbuffer-${version}";
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz";
-    sha256 = "1sh0ipf77aav1k17dgl9dcjlb17zygs07x01g0nn0cg7yw5y5hfk";
+    sha256 = "174m3zbm0qb68p1qng1vldcs23s7qjhyf7d39sw3r03m7y7f5g5p";
   };
 
   buildInputs = [ openssl ];

From 61a9463498393cf41986c2c6c7d7203c05777003 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 12 Sep 2018 23:56:03 +0200
Subject: [PATCH 0913/3253] weechatScripts.weechat-matrix-bridge: don't export
 `olm.lua' as script (#46582)

Loading olm.lua as weechat script with `/script load olm.lua' causes
errors like this:

```
/nix/store/43jbh7yxh8j4gjfzbvpd9clncah5dip1-weechat-matrix-bridge-2018-05-29/lib/ffi.so: undefined symbol: lua_tointeger
```

As `olm.lua' is loaded by `matrix.lua' it doesn't need to be included
manually by the weechat configuration.
---
 .../irc/weechat/scripts/weechat-matrix-bridge/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 1018e46ec625..d2960ae93a99 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
       --replace "__NIX_LIB_PATH__" "$out/lib/?.so"
   '';
 
-  passthru.scripts = [ "olm.lua" "matrix.lua" ];
+  passthru.scripts = [ "matrix.lua" ];
 
   installPhase = ''
     mkdir -p $out/{share,lib}

From 19d1daedd0565381aa0270fba4eeca9f50f889d2 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 00:58:57 +0200
Subject: [PATCH 0914/3253] kippo: mark as broken

no successful hydra build since 2017-12-11
---
 pkgs/servers/kippo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index a9f5ba6f7b2c..3ebcaf7286b4 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -95,5 +95,6 @@ in stdenv.mkDerivation rec {
       license = licenses.bsd3;
       platforms = platforms.linux;
       maintainers = with maintainers; [ tomberek ];
+      broken = true; # 2018-09-12, failed on hydra since 2017-12-11
     };
 }

From 1ec301ded21cf12a861facc5fe029dc9bcc50593 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 12 Sep 2018 23:56:08 +0000
Subject: [PATCH 0915/3253] openssl: 1.1.0 -> 1.1.1 (#46524)

---
 pkgs/applications/altcoins/default.nix         |  4 ++--
 pkgs/development/libraries/openssl/default.nix | 10 ++++++----
 pkgs/tools/misc/powerline-rs/default.nix       |  4 ++--
 pkgs/top-level/all-packages.nix                | 11 ++++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 90cefed13aa5..f075903332b4 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, boost155, boost165, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }:
+{ callPackage, boost155, boost165, openssl_1_1, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3, buildGo110Package }:
 
 rec {
 
@@ -90,7 +90,7 @@ rec {
 
   zcash = callPackage ./zcash {
     withGui = false;
-    openssl = openssl_1_1_0;
+    openssl = openssl_1_1;
   };
 
   parity = callPackage ./parity { };
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index de13f963b674..87751188a03a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages, perl
+{ stdenv, fetchurl, buildPackages, perl, coreutils
 , withCryptodev ? false, cryptodevHeaders
 , enableSSL2 ? false
 , static ? false
@@ -31,6 +31,8 @@ let
         substituteInPlace "$a" \
           --replace /bin/rm rm
       done
+    '' + optionalString (versionAtLeast version "1.1.1") ''
+      substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env'
     '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
       substituteInPlace crypto/async/arch/async_posix.h \
         --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
@@ -125,9 +127,9 @@ in {
     sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
   };
 
-  openssl_1_1_0 = common {
-    version = "1.1.0i";
-    sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb";
+  openssl_1_1 = common {
+    version = "1.1.1";
+    sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
   };
 
 }
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index b16be0b5bdca..67f805988a3e 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
   name = "${pname}-${version}";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
 
   nativeBuildInputs = [ pkgconfig file perl cmake curl ];
-  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
+  buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
 
   postInstall = ''
     install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5b8191fb58d..671b5df3586c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3690,11 +3690,11 @@ with pkgs;
   nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
 
   nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
-    openssl = openssl_1_1_0;
+    openssl = openssl_1_1;
   };
   nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
     enableNpm = false;
-    openssl = openssl_1_1_0;
+    openssl = openssl_1_1;
   };
 
   nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
@@ -3730,7 +3730,7 @@ with pkgs;
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
   ldns = callPackage ../development/libraries/ldns {
-    openssl = openssl_1_1_0;
+    openssl = openssl_1_1;
   };
 
   leafpad = callPackage ../applications/editors/leafpad { };
@@ -5576,7 +5576,7 @@ with pkgs;
   tokei = callPackage ../development/tools/misc/tokei { };
 
   tor = callPackage ../tools/security/tor {
-    openssl = openssl_1_1_0;
+    openssl = openssl_1_1;
     # remove this, when libevent's openssl is upgraded to 1_1_0 or newer.
     libevent = libevent.override {
       sslSupport = false;
@@ -11452,7 +11452,7 @@ with pkgs;
       };
     })
     openssl_1_0_2
-    openssl_1_1_0;
+    openssl_1_1;
 
   openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
     cryptodevHeaders = linuxPackages.cryptodev.override {
@@ -15162,6 +15162,7 @@ with pkgs;
 
   powerline-rs = callPackage ../tools/misc/powerline-rs {
     inherit (darwin.apple_sdk.frameworks) Security;
+    openssl = openssl_1_1;
   };
 
   profont = callPackage ../data/fonts/profont { };

From d225a91b7c21d24d3bb162a48e55bb533641f2db Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 00:40:11 +0200
Subject: [PATCH 0916/3253] mitmproxy: 3.0.4 -> 4.0.4, fix tests

- add missing checkInputs
- apply upstream patch to fix some tests that failed due to
  expired test ssl certs
- re-enable a previously disabled test case
---
 pkgs/tools/networking/mitmproxy/default.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index d3b62d3259cc..d06399169707 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,18 +1,29 @@
-{ stdenv, fetchFromGitHub, python3Packages, glibcLocales }:
+{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, fetchpatch }:
 
 with python3Packages;
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "3.0.4";
+  version = "4.0.4";
 
   src = fetchFromGitHub {
     owner  = pname;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "10l761ds46r1p2kjxlgby9vdxbjjlgq72s6adjypghi41s3qf034";
+    sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r";
   };
 
+  patches = [
+    (fetchpatch {
+      # Tests failed due to expired test certificates,
+      # https://github.com/mitmproxy/mitmproxy/issues/3316
+      # TODO: remove on next update
+      name = "test-certificates.patch";
+      url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch";
+      sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv";
+    })
+  ];
+
   postPatch = ''
     # remove dependency constraints
     sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py
@@ -23,8 +34,7 @@ buildPythonPackage rec {
   checkPhase = ''
     export HOME=$(mktemp -d)
     export LC_CTYPE=en_US.UTF-8
-    # test_echo resolves hostnames
-    pytest -k 'not test_echo and not test_find_unclaimed_URLs '
+    pytest -k 'not test_find_unclaimed_URLs'
   '';
 
   propagatedBuildInputs = [
@@ -38,6 +48,7 @@ buildPythonPackage rec {
   checkInputs = [
     beautifulsoup4 flask pytest
     requests glibcLocales
+    asynctest parver pytest-asyncio
   ];
 
   meta = with stdenv.lib; {

From ab5a8b69b09e981ad442a95778fa8c5fb3f1e550 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 02:25:54 +0200
Subject: [PATCH 0917/3253] leksah: mark as broken

no successful build since 2017-08-19
---
 pkgs/development/tools/haskell/leksah/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
index f1c754ddff96..ec2fb334a3b3 100644
--- a/pkgs/development/tools/haskell/leksah/default.nix
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -14,4 +14,8 @@ in stdenv.mkDerivation {
       --prefix PATH : "${leksahEnv}/bin" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
+
+  meta = {
+    broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
+  };
 }

From 68b7de9e2e265fcec9255c729fcb152e7c71227c Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 13 Sep 2018 02:32:37 +0200
Subject: [PATCH 0918/3253] pythonPackages.BTrees: fix build (#46588)

a test case failed since the update to 4.5.1, disable it
---
 pkgs/development/python-modules/btrees/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index c96d305a7f61..665d5347bbaf 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -15,6 +15,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ persistent zope_interface ];
   checkInputs = [ zope_testrunner ];
 
+  # disable a failing test that looks broken
+  postPatch = ''
+    substituteInPlace BTrees/tests/common.py \
+      --replace "testShortRepr" "no_testShortRepr"
+  '';
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "dcc096c3cf92efd6b9365951f89118fd30bc209c9af83bf050a28151a9992786";

From ba757ffdc94061002e18e15d04095129c426dc56 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 02:45:53 +0200
Subject: [PATCH 0919/3253] btanks: mark as broken

no successful hydra build since 2018-03-16, last upstream release 2009.
---
 pkgs/games/btanks/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 8379e1aa7bb2..d606662323f3 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = https://sourceforge.net/projects/btanks/;
     description = "Fast 2d tank arcade game";
     license = stdenv.lib.licenses.gpl2Plus;
+    broken = true; # 2018-09-13, no successful build since 2018-03-16
   };
 }

From bdac537a8730a4f13644a1bed78a508e6f0def03 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 12 Sep 2018 21:40:23 -0400
Subject: [PATCH 0920/3253] glava: 1.4.5 -> 1.5.1

---
 pkgs/applications/misc/glava/default.nix | 25 +++++++-----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index e0535eeca387..1eb0d0048f64 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, fetchurl, writeScript, fetchFromGitHub
+{ stdenv, fetchgit, fetchurl, writeScript
 , libGL, libX11, libXext, python3, libXrandr, libXrender, libpulseaudio, libXcomposite
 , enableGlfw ? false, glfw }:
 
 let
   inherit (stdenv.lib) optional makeLibraryPath;
 
-  version = "1.4.5";
-  gladVersion = "0.1.24";
-  # glad
-  # https://github.com/wacossusca34/glava/issues/46#issuecomment-397816520
-  glad = fetchFromGitHub {
-    owner = "Dav1dde";
-    repo = "glad";
-    rev = "v${gladVersion}";
-    sha256 = "0s2c9w064kqa5i07w8zmvgpg1pa3wj86l1nhgw7w56cjhq7cf8h8";
-  };
   # gl.xml
   gl = fetchurl {
-    url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/a24f3f7a4c924fdbc666024f99c70e5b8e34c819/xml/gl.xml;
-    sha256 = "1mskxjmhb35m8qv255pibf633d8sn1w9rdsf0lj75bhlgy0zi5c7";
+    url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml;
+    sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l";
   };
   # EGL 1.5
   egl = fetchurl {
@@ -43,12 +33,12 @@ let
 in
   stdenv.mkDerivation rec {
     name = "glava-${version}";
+    version = "1.5.1";
 
-    src = fetchFromGitHub {
-      owner = "wacossusca34";
-      repo = "glava";
+    src = fetchgit {
+      url = "https://github.com/wacossusca34/glava.git";
       rev = "v${version}";
-      sha256 = "1zfw8samrzxxbny709rcdz1z77cw1cd46wlfnf7my02kipmqn0nr";
+      sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb";
     };
 
     buildInputs = [
@@ -65,7 +55,6 @@ in
     ];
 
     patchPhase = ''
-      cp -r --no-preserve=all ${glad}/* glad
       mkdir -p glad/include/KHR
 
       cp ${gl} glad/gl.xml

From 56b9f6fc8e1c3a4ad10ff7c61e461d7b7e038833 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 13 Sep 2018 12:21:08 +0800
Subject: [PATCH 0921/3253] milkytracker: 1.01 -> 1.02.00

---
 .../milkytracker/decompressor_gzip.patch      | 20 --------------
 .../audio/milkytracker/default.nix            | 27 +++++++++----------
 2 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/audio/milkytracker/decompressor_gzip.patch

diff --git a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch b/pkgs/applications/audio/milkytracker/decompressor_gzip.patch
deleted file mode 100644
index c64421116dea..000000000000
--- a/pkgs/applications/audio/milkytracker/decompressor_gzip.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.archlinux.org/task/31324
-https://410333.bugs.gentoo.org/attachment.cgi?id=322456
-
-diff -ur src.old/compression/DecompressorGZIP.cpp src/compression/DecompressorGZIP.cpp
---- src.old/compression/DecompressorGZIP.cpp	2012-08-28 17:54:46.000000000 +0200
-+++ src/compression/DecompressorGZIP.cpp	2012-08-28 17:55:21.000000000 +0200
-@@ -57,11 +57,11 @@
- 	
- bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
- {
--    gzFile *gz_input_file = NULL;
-+    gzFile gz_input_file = NULL;
- 	int len = 0;
- 	pp_uint8 *buf;
- 	
--	if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+	if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
- 		return false;
- 	
- 	if ((buf = new pp_uint8[0x10000]) == NULL)
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 6a71971c5fdf..6b3abeb1e23c 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl
-, zlib, zziplib, pkgconfig, makeWrapper
-}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
+, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
 
 stdenv.mkDerivation rec {
-  version = "1.01";
+  version = "1.02.00";
   name = "milkytracker-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz";
-    sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv";
+  src = fetchFromGitHub {
+    owner  = "milkytracker";
+    repo   = "MilkyTracker";
+    rev    = "v${version}";
+    sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca";
   };
 
-  preBuild=''
-    export CPATH=${zlib.out}/lib
-  '';
-
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 
-  buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ];
+  buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Music tracker application, similar to Fasttracker II";
     homepage = http://milkytracker.org;
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
     platforms = [ "x86_64-linux" "i686-linux" ];
-    maintainers = [ stdenv.lib.maintainers.zoomulator ];
+    maintainers = with maintainers; [ zoomulator ];
   };
 }

From 0f2b10d1ac41c2f573fddbdf110a1ae435ffdd8a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 12 Sep 2018 23:33:57 -0500
Subject: [PATCH 0922/3253] libiio: init at 0.15

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/libiio/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/libiio/default.nix

diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
new file mode 100644
index 000000000000..defb17bcd88a
--- /dev/null
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub
+, cmake, flex, bison
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+  name = "libiio-${version}";
+  version = "0.15";
+
+  src = fetchFromGitHub {
+    owner  = "analogdevicesinc";
+    repo   = "libiio";
+    rev    = "refs/tags/v${version}";
+    sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
+  };
+
+  outputs = [ "out" "lib" "dev" ];
+
+  nativeBuildInputs = [ cmake flex bison ];
+  buildInputs = [ libxml2 ];
+
+  meta = with stdenv.lib; {
+    description = "API for interfacing with the Linux Industrial I/O Subsystem";
+    homepage    = https://github.com/analogdevicesinc/libiio;
+    license     = licenses.lgpl21;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 671b5df3586c..533b04d9e0e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10395,6 +10395,8 @@ with pkgs;
 
   libgrss = callPackage ../development/libraries/libgrss { };
 
+  libiio = callPackage ../development/libraries/libiio { };
+
   libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };

From 1003e6e0dfca07963be13fdc6faebcdbdc394788 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Sep 2018 05:29:54 +0000
Subject: [PATCH 0923/3253] ocamlPackages.batteries: disable tests on Aarch64

---
 pkgs/development/ocaml-modules/batteries/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 3da72453a2a0..473c30b43459 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ ocaml findlib ocamlbuild qtest ];
   propagatedBuildInputs = [ num ];
 
-  doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07";
+  doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.07" && !stdenv.isAarch64;
   checkTarget = "test test";
 
   createFindlibDestdir = true;

From 73e468005b0ab2dba9f4b1562db941be9276bd7d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 13 Sep 2018 03:27:08 -0400
Subject: [PATCH 0924/3253] gnome-builder: add ctags

---
 pkgs/applications/editors/gnome-builder/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 6fcf9d7d3a9d..fcf279095051 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, ctags
 , desktop-file-utils
 , docbook_xsl
 , docbook_xml_dtd_43
@@ -58,6 +59,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [
+    ctags
     flatpak
     gnome3.devhelp
     gnome3.libgit2-glib

From df007e9ffea818702f21db1bccec5f726e6234aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 13 Sep 2018 09:28:22 +0200
Subject: [PATCH 0925/3253] kde-frameworks.syndication: Init

---
 .../libraries/kde-frameworks/default.nix            |  1 +
 .../libraries/kde-frameworks/syndication.nix        | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/syndication.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ea8f30f0bba2..62ae433ff710 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -145,6 +145,7 @@ let
       kpackage = callPackage ./kpackage {};
       kpty = callPackage ./kpty.nix {};
       kunitconversion = callPackage ./kunitconversion.nix {};
+      syndication = callPackage ./syndication.nix {};
 
     # TIER 3
       baloo = callPackage ./baloo.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix
new file mode 100644
index 000000000000..71ee520995c4
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/syndication.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, kcodecs
+}:
+
+mkDerivation {
+  name = "syndication";
+  meta = {
+    maintainers = [ lib.maintainers.bkchr ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcodecs ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b107fa5929a9..73d892d92bfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11717,7 +11717,7 @@ with pkgs;
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
-      threadweaver kirigami2 kholidays kpurpose;
+      syndication threadweaver kirigami2 kholidays kpurpose;
 
     ### KDE PLASMA 5
 

From 049b3a6cc2fb271b0ad9f611be02f4728f6eeeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Sep 2018 11:26:25 +0100
Subject: [PATCH 0926/3253] nixos: remove unneeded api_key from config

---
 nixos/modules/services/monitoring/datadog-agent.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index e545e06b3495..57815f211d46 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -8,7 +8,6 @@ let
   ddConf = {
     dd_url              = "https://app.datadoghq.com";
     skip_ssl_validation = "no";
-    api_key             = "";
     confd_path          = "/etc/datadog-agent/conf.d";
     additional_checksd  = "/etc/datadog-agent/checks.d";
     use_dogstatsd       = true;

From bef541c5699cb7c6323dbb8756382dc12731af6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 12 Sep 2018 17:46:31 +0100
Subject: [PATCH 0927/3253] datadog: add live process monitoring

---
 .../services/monitoring/datadog-agent.nix     |  17 +
 .../dd-agent/datadog-process-agent-deps.nix   | 669 ++++++++++++++++++
 .../dd-agent/datadog-process-agent.nix        |  26 +
 pkgs/top-level/all-packages.nix               |   1 +
 4 files changed, 713 insertions(+)
 create mode 100644 pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
 create mode 100644 pkgs/tools/networking/dd-agent/datadog-process-agent.nix

diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 57815f211d46..35c08f5e7e30 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -15,6 +15,7 @@ let
   // optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
   // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
   // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
+  // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
   // cfg.extraConfig;
 
   # Generate Datadog configuration files for each configured checks.
@@ -124,6 +125,13 @@ in {
       '';
      };
 
+    enableLiveProcessCollection = mkOption {
+      description = ''
+        Whether to enable the live process collection agent.
+      '';
+      default = false;
+      type = types.bool;
+    };
     checks = mkOption {
       description = ''
         Configuration for all Datadog checks. Keys of this attribute
@@ -228,6 +236,15 @@ in {
         path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
         serviceConfig.ExecStart = "${datadogPkg}/bin/dd-jmxfetch";
       });
+
+      datadog-process-agent = lib.mkIf cfg.enableLiveProcessCollection (makeService {
+        description = "Datadog Live Process Agent";
+        path = [ ];
+        script = ''
+          export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
+          ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
+        '';
+      });
     };
 
     environment.etc = etcfiles;
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
new file mode 100644
index 000000000000..863402854aeb
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
@@ -0,0 +1,669 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "bitbucket.org/ww/goautoneg";
+    fetch = {
+      type = "hg";
+      url = "https://bitbucket.org/ww/goautoneg";
+      rev =  "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
+      sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/agent-payload";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/agent-payload";
+      rev =  "f0521943f60221829c6bb5de1c7f788cd4411372";
+      sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/datadog-agent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/datadog-agent";
+      rev =  "f2d7ce69202c8212cae1ebf476d038b28f3a895e";
+      sha256 = "0by3qvj6468r3532x1q6ingf6hlgv4dk8g1aa0hmh9gm25dbfsg5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/datadog-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/datadog-go";
+      rev =  "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
+      sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/gopsutil";
+      rev =  "771928d86fa878b9d62f073a7a6f91ee0a358105";
+      sha256 = "0dr5a67jy2zh42dcndx981ca1wv0phc16zlimahjlr00qxam90xi";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/tcptracer-bpf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/tcptracer-bpf";
+      rev =  "636ee01a99a4bd352329de98f40fb9fdf611d1c9";
+      sha256 = "13373wg1x90jydzgbblxpq2gg9b7ppk6nkjzhw8d27mxd047i74m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/zstd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/zstd";
+      rev =  "2bf71ec4836011b92dc78df3b9ace6b40e65f7df";
+      sha256 = "0j0qmnzjxx86kavrb3qcashp2irzjbvip15df97k87pcfvl1gsig";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Microsoft/go-winio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/go-winio";
+      rev =  "97e4973ce50b2ff5f09635a57e2b88a037aae829";
+      sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/StackExchange/wmi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/StackExchange/wmi";
+      rev =  "b12b22c5341f0c26d88c4d66176330500e84db68";
+      sha256 = "0kzkb4zllhrdiq0m9m5ka9i393r1hnx75lnd3hz5rg2fs0n3ym16";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "bff41fb23b7550368282029f6478819d6a99ae0f";
+      sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev =  "3ac7bf7a47d159a033b107610db8a1b6575507a4";
+      sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cenkalti/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenkalti/backoff";
+      rev =  "b7325b0f3f1097c6546ea5e83c4a23267e58ad71";
+      sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cihub/seelog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cihub/seelog";
+      rev =  "d2c6e5aa9fbfdd1c624e140287063c7730654115";
+      sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev =  "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
+      sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev =  "092cba3727bb9b4a2f0e922cd6c0f93ea270e363";
+      sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev =  "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e";
+      sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev =  "47565b4f722fb6ceae66b95f853feed578a4a51c";
+      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
+    };
+  }
+  {
+    goPackagePath  = "github.com/emicklei/go-restful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/emicklei/go-restful";
+      rev =  "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
+      sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "ccc981bf80385c528a65fbfdd49bf2d8da22aa23";
+      sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
+      sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
+      sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-ole/go-ole";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ole/go-ole";
+      rev =  "7a0fa49edf48165190530c675167e2f319a05268";
+      sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "d76fbc1373015ced59b43ac267f28d546b955683";
+      sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "44145f04b68cf362d9c4df2182967c2275eaefed";
+      sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "44d81051d367757e1c7c6a5a86423ece9afcf63c";
+      sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "0c5108395e2debce0d731cf0287ddf7242066aba";
+      sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4";
+      sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev =  "65a6292f0157eff210d03ed1bf6c59b190b8b906";
+      sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hectane/go-acl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hectane/go-acl";
+      rev =  "7f56832555fc229dad908c67d65ed3ce6156b70c";
+      sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
+    };
+  }
+  {
+    goPackagePath  = "github.com/howeyc/gopass";
+    fetch = {
+      type = "git";
+      url = "https://github.com/howeyc/gopass";
+      rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
+      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "6633656539c1639d9d78127b7d47c622b5d7b6dc";
+      sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/iovisor/gobpf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/iovisor/gobpf";
+      rev =  "3b07770c6d5e2bd37e582ecd49460e6ef094f257";
+      sha256 = "0inv9vwjd8r365rdpf6z4kzs8b36890vrfkifw228mjlxxx8rg7f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "0b12d6b5";
+      sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "f2b4162afba35581b6d4a50d3b8f34e33c144682";
+      sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kubernetes-incubator/custom-metrics-apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
+      rev =  "e61f72fec56ab519d74ebd396cd3fcf31b084558";
+      sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev =  "60711f1a8329503b04e1c88535f419d0bb440bff";
+      sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev =  "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
+      sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev =  "fa473d140ef3c6adf42d6b391fe76707f1f243c8";
+      sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
+      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
+    };
+  }
+  {
+    goPackagePath  = "github.com/patrickmn/go-cache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/patrickmn/go-cache";
+      rev =  "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0";
+      sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pborman/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/uuid";
+      rev =  "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
+      sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev =  "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
+      sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev =  "e7e903064f5e9eb5da98208bae10b475d4db0f8c";
+      sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev =  "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev =  "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207";
+      sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev =  "65c1f6f8f0fc1e2185eb9863a3bc751496404259";
+      sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev =  "8048a2e9c5773235122027dd585cf821b2af1249";
+      sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shirou/w32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/w32";
+      rev =  "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
+      sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev =  "d40851caa0d747393da1ffb28f7f9d8b4eeffebd";
+      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev =  "8965335b8c7107321228e3e3702cab9832751bac";
+      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev =  "4a4406e478ca629068e7768fc33f3f044173c0a6";
+      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev =  "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
+      sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
+      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "c10c31b5e94b6f7a0283272dc2bb27163dcea24b";
+      sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/mobile";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mobile";
+      rev =  "0ff817254b04da935cce10d2d1270ccf047fbbd7";
+      sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "1c05540f6879653db88113bc4a2b70aec4bd491f";
+      sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "95c6576299259db960f6c5b9b69ea52422860fce";
+      sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "b19bf474d317b857955b12035d2c5acb57ce8b01";
+      sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "a4bde12657593d5e90d0533a3e4fd95e635124cb";
+      sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "d670f9405373e636a5a2765eea47fac0c9bc91a4";
+      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/zorkian/go-datadog-api.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zorkian/go-datadog-api";
+      rev =  "6c08e2322af96e867e5715aedd6ea194c42cf44f";
+      sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "9e5ffd1f1320950b238cfce291b926411f0af722";
+      sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "e386b2658ed20923da8cc9250e552f082899a1ee";
+      sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apiserver";
+      rev =  "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
+      sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "23781f4d6632d88e869066eaebb743857aa1ef9b";
+      sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/metrics";
+      rev =  "0d9ea2ac660031c8f2726a735dda29441f396f99";
+      sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
+    };
+  }
+]
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
new file mode 100644
index 000000000000..7541eee0a20e
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, buildGoPackage  }:
+
+buildGoPackage rec {
+  name = "datadog-process-agent-${version}";
+  # NOTE: this is 6.5.0 + https://github.com/DataDog/datadog-process-agent/pull/185
+  version = "6.5.0";
+  owner   = "DataDog";
+  repo    = "datadog-process-agent";
+
+  src = fetchFromGitHub {
+    inherit owner repo;
+    rev    = "bd96c99c97e8639fd3ea72e61a492c0a74686abe";
+    sha256 = "0afdf344256jivzhdv3k9n9i4aik1yr805dnrc2i3d4di9w8vg8c";
+  };
+
+  goDeps = ./datadog-process-agent-deps.nix;
+  goPackagePath = "github.com/${owner}/${repo}";
+
+  meta = with stdenv.lib; {
+    description = "Live process collector for the DataDog Agent v6";
+    homepage    = https://www.datadoghq.com;
+    license     = licenses.bsd3;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ domenkozar rvl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533b04d9e0e1..400000370ff4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15853,6 +15853,7 @@ with pkgs;
   datadog-agent = callPackage ../tools/networking/dd-agent/6.nix {
     pythonPackages = datadog-integrations-core {};
   };
+  datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
   datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
     python = python27;
     extraIntegrations = extras;

From 595ae18797d5a37ca93c84d4382bf733f4f08fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 13 Sep 2018 09:11:41 +0100
Subject: [PATCH 0928/3253] nixos: datadog-agent: fix systemd support

---
 pkgs/tools/networking/dd-agent/6.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix
index c095a77fda05..b26e915e6909 100644
--- a/pkgs/tools/networking/dd-agent/6.nix
+++ b/pkgs/tools/networking/dd-agent/6.nix
@@ -63,7 +63,8 @@ in buildGoPackage rec {
     cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent
 
     wrapProgram "$bin/bin/agent" \
-        --set PYTHONPATH "$bin/${python.sitePackages}"
+      --set PYTHONPATH "$bin/${python.sitePackages}" \
+      --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib
   '';
 
   meta = with stdenv.lib; {

From 574f4c406915ce71ec66ea2ce7c1466f72d6c0ae Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Thu, 6 Sep 2018 02:18:11 +0900
Subject: [PATCH 0929/3253] profile-sync-daemon: 5.53 -> 6.33

---
 .../services/desktops/profile-sync-daemon.nix | 136 +++++-------------
 .../misc/profile-sync-daemon/default.nix      |  17 ++-
 2 files changed, 47 insertions(+), 106 deletions(-)

diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index e3f74df3e573..4165bb64fe46 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -4,22 +4,7 @@ with lib;
 
 let
   cfg = config.services.psd;
-
-  configFile = ''
-    ${optionalString (cfg.users != [ ]) ''
-      USERS="${concatStringsSep " " cfg.users}"
-    ''}
-
-    ${optionalString (cfg.browsers != [ ]) ''
-      BROWSERS="${concatStringsSep " " cfg.browsers}"
-    ''}
-
-    ${optionalString (cfg.volatile != "") "VOLATILE=${cfg.volatile}"}
-    ${optionalString (cfg.daemonFile != "") "DAEMON_FILE=${cfg.daemonFile}"}
-  '';
-
 in {
-
   options.services.psd = with types; {
     enable = mkOption {
       type = bool;
@@ -28,32 +13,6 @@ in {
         Whether to enable the Profile Sync daemon.
       '';
     };
-
-    users = mkOption {
-      type = listOf str;
-      default = [ ];
-      example = [ "demo" ];
-      description = ''
-        A list of users whose browser profiles should be sync'd to tmpfs.
-      '';
-    };
-
-    browsers = mkOption {
-      type = listOf str;
-      default = [ ];
-      example = [ "chromium" "firefox" ];
-      description = ''
-        A list of browsers to sync. Available choices are:
-
-        chromium chromium-dev conkeror.mozdev.org epiphany firefox
-        firefox-trunk google-chrome google-chrome-beta google-chrome-unstable
-        heftig-aurora icecat luakit midori opera opera-developer opera-beta
-        qupzilla palemoon rekonq seamonkey
-
-        An empty list will enable all browsers.
-      '';
-    };
-
     resyncTimer = mkOption {
       type = str;
       default = "1h";
@@ -66,80 +25,53 @@ in {
         omitted.
       '';
     };
-
-    volatile = mkOption {
-      type = str;
-      default = "/run/psd-profiles";
-      description = ''
-        The directory where browser profiles should reside(this should be
-        mounted as a tmpfs). Do not include a trailing backslash.
-      '';
-    };
-
-    daemonFile = mkOption {
-      type = str;
-      default = "/run/psd";
-      description = ''
-        Where the pid and backup configuration files will be stored.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
-    assertions = [
-      { assertion = cfg.users != [];
-        message = "services.psd.users must contain at least one user";
-      }
-    ];
-
     systemd = {
-      services = {
-        psd = {
-          description = "Profile Sync daemon";
-          wants = [ "psd-resync.service" "local-fs.target" ];
-          wantedBy = [ "multi-user.target" ];
-          preStart = "mkdir -p ${cfg.volatile}";
-
-          path = with pkgs; [ glibc rsync gawk ];
-
-          unitConfig = {
-            RequiresMountsFor = [ "/home/" ];
+      user = {
+        services = {
+          psd = {
+            enable = true;
+            description = "Profile Sync daemon";
+            wants = [ "psd-resync.service" "local-fs.target" ];
+            wantedBy = [ "default.target" ];
+            path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
+            unitConfig = {
+              RequiresMountsFor = [ "/home/" ];
+            };
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = "yes";
+              ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync";
+              ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync";
+            };
           };
 
-          serviceConfig = {
-            Type = "oneshot";
-            RemainAfterExit = "yes";
-            ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync";
-            ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync";
+          psd-resync = {
+            enable = true;
+            description = "Timed profile resync";
+            after = [ "psd.service" ];
+            wants = [ "psd-resync.timer" ];
+            partOf = [ "psd.service" ];
+            wantedBy = [ "default.target" ];
+            path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
+            serviceConfig = {
+              Type = "oneshot";
+              ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
+            };
           };
         };
 
-        psd-resync = {
-          description = "Timed profile resync";
-          after = [ "psd.service" ];
-          wants = [ "psd-resync.timer" ];
-          partOf = [ "psd.service" ];
+        timers.psd-resync = {
+          description = "Timer for profile sync daemon - ${cfg.resyncTimer}";
+          partOf = [ "psd-resync.service" "psd.service" ];
 
-          path = with pkgs; [ glibc rsync gawk ];
-
-          serviceConfig = {
-            Type = "oneshot";
-            ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
+          timerConfig = {
+            OnUnitActiveSec = "${cfg.resyncTimer}";
           };
         };
       };
-
-      timers.psd-resync = {
-        description = "Timer for profile sync daemon - ${cfg.resyncTimer}";
-        partOf = [ "psd-resync.service" "psd.service" ];
-
-        timerConfig = {
-          OnUnitActiveSec = "${cfg.resyncTimer}";
-        };
-      };
     };
-
-    environment.etc."psd.conf".text = configFile;
-
   };
 }
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index c1b99b315677..cfc13b0e108e 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, utillinux}:
 
 stdenv.mkDerivation rec {
-  version = "5.53";
+  version = "6.33";
   name = "profile-sync-daemon-${version}";
 
   src = fetchurl {
     url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
-    sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx";
+    sha256 = "0dzs51xbszzmcg82n2dil6nljj4gn0aw9rqjmhyi4a5frc8g6xmb";
   };
 
-  installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all";
+  installPhase = ''
+    PREFIX=\"\" DESTDIR=$out make install
+    substituteInPlace $out/bin/profile-sync-daemon \
+      --replace "/usr/" "$out/" \
+      --replace "sudo " "/run/wrappers/bin/sudo "
+    # $HOME detection fails (and is unnecessary)
+    sed -i '/^HOME/d' $out/bin/profile-sync-daemon
+    substituteInPlace $out/bin/psd-overlay-helper \
+      --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin"
+  '';
 
   preferLocalBuild = true;
 

From 87462d6be4fa796e31837fd20f0d388028ea157d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 13 Sep 2018 11:08:14 +0200
Subject: [PATCH 0930/3253] vmTools: update debian repositories to stable
 Release.xz urls

Previously the Release.xz URL would show up with a new hash whenever
debian releases an update. By using archive.org we should have a stable
source for those. I wasn't able to find the equivalent in the debian
world. Maybe they don't keep all the different Release files around..
---
 pkgs/build-support/vm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 67c67c881776..03b3fb1f9f27 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -990,8 +990,8 @@ rec {
       name = "debian-9.4-stretch-i386";
       fullName = "Debian 9.4 Stretch (i386)";
       packagesList = fetchurl {
-        url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz;
-        sha256 = "05z5ccg4ysbrgallhai53sh83i0364w7a3fdq84dpv1li059jf10";
+        url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz;
+        sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
@@ -1001,8 +1001,8 @@ rec {
       name = "debian-9.4-stretch-amd64";
       fullName = "Debian 9.4 Stretch (amd64)";
       packagesList = fetchurl {
-        url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz;
-        sha256 = "19j0c54b1b9lbk9fv2c2aswdh0s2c3klf97zrlmsz4hs8wm9jylq";
+        url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz;
+        sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 6dc57134dac0037aedfeea5a7c1b7fac17588135 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 11:21:19 +0200
Subject: [PATCH 0931/3253] pythonPackages.restview: fix tests

Failed after readme_renderer was updated. Apply an upstream patch.
---
 pkgs/development/python-modules/restview/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index e8a8b9dd637d..a6b22220da35 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , docutils
 , readme_renderer
 , pygments
@@ -19,6 +20,15 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ docutils readme_renderer pygments ];
   checkInputs = [ mock ];
 
+  patches = [
+    # fix tests after readme_renderer update
+    # TODO remove on next update
+    (fetchpatch {
+      url = "https://github.com/mgedmin/restview/commit/541743ded13ae55dea4c437046984a5f13d06e8b.patch";
+      sha256 = "031b1dlqx346bz7afpc011lslnq771lnxb6iy1l2285pph534bci";
+    })
+  ];
+
   postPatch = ''
     # dict order breaking tests
     sed -i 's@<a href="http://www.example.com" rel="nofollow">@...@' src/restview/tests.py

From 66e6ee73d451d78c91448371344a08bdf661fe58 Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Thu, 13 Sep 2018 10:18:06 +0100
Subject: [PATCH 0932/3253] wolfssl: enable all features

---
 pkgs/development/libraries/wolfssl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 2b69f6283d60..30291a180226 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
   };
 
+  configureFlags = [ "--enable-all" ];
+
   outputs = [ "out" "dev" "doc" "lib" ];
 
   nativeBuildInputs = [ autoreconfHook ];

From eb88142c4b2dbf84e5afede9bb566e5cd90a58d8 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 13 Sep 2018 12:17:45 +0200
Subject: [PATCH 0933/3253] leo-editor: 5.6 -> 5.7.3, fix build (#46589)

Previous version depended on qt56.qtwebengine which was broken.
---
 .../applications/editors/leo-editor/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 2084a047a086..a2274be463ed 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,29 +1,20 @@
-{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }:
+{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:
 
-let
-  packageOverrides = self: super: {
-    pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix {
-      pythonPackages = self;
-    };
-  };
-
-  pythonPackages = (python3.override { inherit packageOverrides; }).pkgs;
-in
 stdenv.mkDerivation rec {
   name = "leo-editor-${version}";
-  version = "5.6";
+  version = "5.7.3";
 
   src = fetchFromGitHub {
     owner = "leo-editor";
     repo = "leo-editor";
     rev = version;
-    sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
+    sha256 = "0ri6l6cxwva450l05af5vs1lsgrz6ciwd02njdgphs9pm1vwxbl9";
   };
 
   dontBuild = true;
 
   nativeBuildInputs = [ makeWrapper python3 ];
-  propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
+  propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];
 
   desktopItem = makeDesktopItem rec {
     name = "leo-editor";

From 83e5bbfb580ef27fe671705dc8c8c6ec1caf29a4 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 12:28:18 +0200
Subject: [PATCH 0934/3253] qt56.qtwebengine: mark as broken

- no successful build since 2018-04-25
- not used in nixpkgs anymore
---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index aae15c62d73c..ad54a49e50b7 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -189,6 +189,7 @@ EOF
     description = "A web engine based on the Chromium web browser";
     maintainers = with maintainers; [ matthewbauer ];
     platforms = platforms.unix;
+    broken = qt56; # 2018-09-13, no successful build since 2018-04-25
   };
 
 }

From af5cea59e7e7bd62c113e79c77836e4819c7c742 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 13 Sep 2018 12:56:22 +0300
Subject: [PATCH 0935/3253] bat: 0.6.1 -> 0.7.0

---
 pkgs/tools/misc/bat/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 03895f6c8478..01e720e5b877 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }:
+{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib
+, Security, libiconv
+}:
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "19xmj3a3npx4v1mlvd31r3icml73mxjq6la5qifb2i35ciqnx9bd";
+    sha256 = "1dhn88asf08dvl4827v4mkxafcr01m1h5jmicvzda9ywmr82g1cs";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "062vvpj514h85h9gm3jipp6z256cnnbxbjy7ja6bm7i6bpglyvvi";
+  cargoSha256 = "10s8ig08prs1wcsisrllvsixqkrkwjx769y1w5fypldn9kfk2lka";
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 
-  buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-  ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
 
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 400000370ff4..b644c531f32e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -844,7 +844,9 @@ with pkgs;
 
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
-  bat = callPackage ../tools/misc/bat { };
+  bat = callPackage ../tools/misc/bat {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   bc = callPackage ../tools/misc/bc { };
 

From b54677969bbd5f8912b753e73603c99ce1b4fafd Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 13:34:28 +0200
Subject: [PATCH 0936/3253] pythonPackages.zodb: fix tests

Tests failed after `persistent` was updated to 4.4.
Apply an upstream patch to fix them.
---
 .../python-modules/zodb/default.nix           | 15 +++++++----
 .../zodb/fix-tests-with-persistent-4.4.patch  | 26 +++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch

diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix
index c23f332638d0..848da5b21717 100644
--- a/pkgs/development/python-modules/zodb/default.nix
+++ b/pkgs/development/python-modules/zodb/default.nix
@@ -4,7 +4,6 @@
 , zope_testrunner
 , transaction
 , six
-, wheel
 , zope_interface
 , zodbpickle
 , zconfig
@@ -24,15 +23,16 @@ buildPythonPackage rec {
     };
 
     patches = [
-      ./ZODB-5.3.0-fix-tests.patch
+      ./ZODB-5.3.0-fix-tests.patch # still needeed with 5.4.0
+      # Upstream patch to fix tests with persistent 4.4,
+      # cannot fetchpatch because only one hunk of the upstream commit applies.
+      # TODO remove on next release
+      ./fix-tests-with-persistent-4.4.patch
     ];
 
     propagatedBuildInputs = [
-      manuel
       transaction
-      zope_testrunner
       six
-      wheel
       zope_interface
       zodbpickle
       zconfig
@@ -41,6 +41,11 @@ buildPythonPackage rec {
       BTrees
     ];
 
+    checkInputs = [
+      manuel
+      zope_testrunner
+    ];
+
     meta = with stdenv.lib; {
       description = "Zope Object Database: object database and persistence";
       homepage = https://pypi.python.org/pypi/ZODB;
diff --git a/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch b/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch
new file mode 100644
index 000000000000..57946dd29863
--- /dev/null
+++ b/pkgs/development/python-modules/zodb/fix-tests-with-persistent-4.4.patch
@@ -0,0 +1,26 @@
+From 2d0ae7199501795617a82a32bafe19b4b5ae89c3 Mon Sep 17 00:00:00 2001
+From: Jason Madden <jamadden@gmail.com>
+Date: Wed, 22 Aug 2018 10:43:19 -0500
+Subject: [PATCH] Fix tests with, and depend on, persistent 4.4.
+
+Fixes #213.
+---
+ src/ZODB/tests/util.py | 5 +++++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/ZODB/tests/util.py b/src/ZODB/tests/util.py
+index 4ffde92c1..e9bf547fa 100644
+--- a/src/ZODB/tests/util.py
++++ b/src/ZODB/tests/util.py
+@@ -37,6 +37,11 @@
+      r"\1"),
+     (re.compile('b(".*?")'),
+      r"\1"),
++    # Persistent 4.4 changes the repr of persistent subclasses,
++    # and it is slightly different with the C extension and
++    # pure-Python module
++    (re.compile('ZODB.tests.testcrossdatabasereferences.'),
++     ''),
+     # Python 3 adds module name to exceptions.
+     (re.compile("ZODB.interfaces.BlobError"),
+      r"BlobError"),

From e2df8e7c0f73e0ff22caa8fe14851cfdcf500f6a Mon Sep 17 00:00:00 2001
From: "Markus J. Ankenbrand" <iimog@iimog.org>
Date: Thu, 13 Sep 2018 14:10:44 +0200
Subject: [PATCH 0937/3253] seaview: init at 4.7 (#46595)

---
 .../science/biology/seaview/default.nix       | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/science/biology/seaview/default.nix

diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
new file mode 100644
index 000000000000..17cf903ae49c
--- /dev/null
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, coreutils, fltk, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "4.7";
+  name = "seaview-${version}";
+
+  src = fetchurl {
+    url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
+    sha256 = "0fhyq7dcn0izhwcfin9ajsr7kmmsqm9f1np1rmhzg4digfwqb29n";
+  };
+
+  buildInputs = [ fltk libjpeg ];
+
+  patchPhase = "sed -i 's#PATH=/bin:/usr/bin rm#'${coreutils}/bin/rm'#' seaview.cxx";
+  installPhase = "mkdir -p $out/bin; cp seaview $out/bin";
+
+  meta = with stdenv.lib; {
+    description = "GUI for molecular phylogeny";
+    longDescription = ''
+      SeaView is a multiplatform, graphical user interface for multiple sequence alignment and molecular phylogeny.
+        - SeaView reads and writes various file formats (NEXUS, MSF, CLUSTAL, FASTA, PHYLIP, MASE, Newick) of DNA and protein sequences and of phylogenetic trees.
+        - SeaView drives programs muscle or Clustal Omega for multiple sequence alignment, and also allows to use any external alignment algorithm able to read and write FASTA-formatted files.
+        - Seaview drives the Gblocks program to select blocks of evolutionarily conserved sites.
+        - SeaView computes phylogenetic trees by
+          + parsimony, using PHYLIP's dnapars/protpars algorithm,
+          + distance, with NJ or BioNJ algorithms on a variety of evolutionary distances,
+          + maximum likelihood, driving program PhyML 3.1.
+        - Seaview can use the Transfer Bootstrap Expectation method to compute the bootstrap support of PhyML and distance trees.
+        - SeaView prints and draws phylogenetic trees on screen, SVG, PDF or PostScript files.
+        - SeaView allows to download sequences from EMBL/GenBank/UniProt using the Internet.
+
+      Seaview is published in:
+
+          Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224.
+    '';
+    homepage = http://doua.prabi.fr/software/seaview;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.iimog ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b644c531f32e..7deebde25b25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20729,6 +20729,8 @@ with pkgs;
 
   strelka = callPackage ../applications/science/biology/strelka { };
 
+  seaview = callPackage ../applications/science/biology/seaview { };
+
   varscan = callPackage ../applications/science/biology/varscan { };
 
   hmmer = callPackage ../applications/science/biology/hmmer { };

From 2cfc0bb7ee6200584c89ab46daf04daa9c536e81 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 13 Sep 2018 14:11:09 +0200
Subject: [PATCH 0938/3253] tamarin-prover: fix ghc 8.4 build (#46597)

See https://hydra.nixos.org/build/81125645

`tamarin-prover' upstream has a patch to fix GHC 8.4 compilation (and
uses stack lts-12.1 now), but it's not released yet:

https://github.com/tamarin-prover/tamarin-prover/commit/a08f6e400772899b9b0fc16befc50391cd70696b

The build is divided in several derivations, therefore the patch had to
be splitted and rebased for `lib/term', `lib/theory' and `lib/utils' to
ensure that the patch applies properly during the `patchPhase'.

Addresses #45960
---
 .../science/logic/tamarin-prover/default.nix  |   9 +-
 .../tamarin-prover/ghc-8.4-support-term.patch | 109 ++++++++++++++
 .../ghc-8.4-support-theory.patch              | 130 ++++++++++++++++
 .../ghc-8.4-support-utils.patch               | 140 ++++++++++++++++++
 4 files changed, 385 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
 create mode 100644 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
 create mode 100644 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4efc384ed227..9056eab71ea3 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -31,7 +31,8 @@ let
   '';
 
   tamarin-prover-utils = mkDerivation (common "tamarin-prover-utils" (src + "/lib/utils") // {
-    patchPhase = replaceSymlinks;
+    postPatch = replaceSymlinks;
+    patches = [ ./ghc-8.4-support-utils.patch ];
     libraryHaskellDepends = with haskellPackages; [
       base base64-bytestring binary blaze-builder bytestring containers
       deepseq dlist fclabels mtl pretty safe SHA syb time transformers
@@ -39,7 +40,8 @@ let
   });
 
   tamarin-prover-term = mkDerivation (common "tamarin-prover-term" (src + "/lib/term") // {
-    patchPhase = replaceSymlinks;
+    postPatch = replaceSymlinks;
+    patches = [ ./ghc-8.4-support-term.patch ];
     libraryHaskellDepends = (with haskellPackages; [
       attoparsec base binary bytestring containers deepseq dlist HUnit
       mtl process safe
@@ -47,7 +49,8 @@ let
   });
 
   tamarin-prover-theory = mkDerivation (common "tamarin-prover-theory" (src + "/lib/theory") // {
-    patchPhase = replaceSymlinks;
+    postPatch = replaceSymlinks;
+    patches = [ ./ghc-8.4-support-theory.patch ];
     doHaddock = false; # broken
     libraryHaskellDepends = (with haskellPackages; [
       aeson aeson-pretty base binary bytestring containers deepseq dlist
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
new file mode 100644
index 000000000000..f93919faf54e
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch
@@ -0,0 +1,109 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Term/Maude/Signature.hs          |  8 ++--
+ src/Term/Rewriting/Definitions.hs    | 23 ++++++----
+ src/Term/Unification.hs              |  4 +-
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+diff --git a/src/Term/Maude/Signature.hs b/src/Term/Maude/Signature.hs
+index 98c25d9f..1a4ce82f 100644
+--- a/src/Term/Maude/Signature.hs
++++ b/src/Term/Maude/Signature.hs
+@@ -104,9 +104,9 @@ maudeSig msig@(MaudeSig {enableDH,enableBP,enableMSet,enableXor,enableDiff=_,stF
+           `S.union` dhReducibleFunSig `S.union` bpReducibleFunSig `S.union` xorReducibleFunSig
+ 
+ -- | A monoid instance to combine maude signatures.
+-instance Monoid MaudeSig where
+-    (MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _) `mappend`
+-      (MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _) =
++instance Semigroup MaudeSig where
++    MaudeSig dh1 bp1 mset1 xor1 diff1 stFunSyms1 stRules1 _ _ <>
++      MaudeSig dh2 bp2 mset2 xor2 diff2 stFunSyms2 stRules2 _ _ =
+           maudeSig (mempty {enableDH=dh1||dh2
+                            ,enableBP=bp1||bp2
+                            ,enableMSet=mset1||mset2
+@@ -114,6 +114,8 @@ instance Monoid MaudeSig where
+                            ,enableDiff=diff1||diff2
+                            ,stFunSyms=S.union stFunSyms1 stFunSyms2
+                            ,stRules=S.union stRules1 stRules2})
++
++instance Monoid MaudeSig where
+     mempty = MaudeSig False False False False False S.empty S.empty S.empty S.empty
+ 
+ -- | Non-AC function symbols.
+diff --git a/src/Term/Rewriting/Definitions.hs b/src/Term/Rewriting/Definitions.hs
+index bd942b6a..18562e4e 100644
+--- a/src/Term/Rewriting/Definitions.hs
++++ b/src/Term/Rewriting/Definitions.hs
+@@ -44,10 +44,12 @@ evalEqual (Equal l r) = l == r
+ instance Functor Equal where
+     fmap f (Equal lhs rhs) = Equal (f lhs) (f rhs)
+ 
++instance Semigroup a => Semigroup (Equal a) where
++    (Equal l1 r1) <> (Equal l2 r2) =
++        Equal (l1 <> l2) (r1 <> r2)
++
+ instance Monoid a => Monoid (Equal a) where
+     mempty                                = Equal mempty mempty
+-    (Equal l1 r1) `mappend` (Equal l2 r2) =
+-        Equal (l1 `mappend` l2) (r1 `mappend` r2)
+ 
+ instance Foldable Equal where
+     foldMap f (Equal l r) = f l `mappend` f r
+@@ -104,14 +106,15 @@ instance Functor Match where
+     fmap _ NoMatch             = NoMatch
+     fmap f (DelayedMatches ms) = DelayedMatches (fmap (f *** f) ms)
+ 
++instance Semigroup (Match a) where
++    NoMatch            <> _                  = NoMatch
++    _                  <> NoMatch            = NoMatch
++    DelayedMatches ms1 <> DelayedMatches ms2 =
++        DelayedMatches (ms1 <> ms2)
++
+ instance Monoid (Match a) where
+     mempty = DelayedMatches []
+ 
+-    NoMatch            `mappend` _                  = NoMatch
+-    _                  `mappend` NoMatch            = NoMatch
+-    DelayedMatches ms1 `mappend` DelayedMatches ms2 =
+-        DelayedMatches (ms1 `mappend` ms2)
+-
+ 
+ instance Foldable Match where
+     foldMap _ NoMatch             = mempty
+@@ -136,10 +139,12 @@ data RRule a = RRule a a
+ instance Functor RRule where
+     fmap f (RRule lhs rhs) = RRule (f lhs) (f rhs)
+ 
++instance Monoid a => Semigroup (RRule a) where
++    (RRule l1 r1) <> (RRule l2 r2) =
++        RRule (l1 <> l2) (r1 <> r2)
++
+ instance Monoid a => Monoid (RRule a) where
+     mempty                                = RRule mempty mempty
+-    (RRule l1 r1) `mappend` (RRule l2 r2) =
+-        RRule (l1 `mappend` l2) (r1 `mappend` r2)
+ 
+ instance Foldable RRule where
+     foldMap f (RRule l r) = f l `mappend` f r
+diff --git a/src/Term/Unification.hs b/src/Term/Unification.hs
+index e1de0163..7ce6bb41 100644
+--- a/src/Term/Unification.hs
++++ b/src/Term/Unification.hs
+@@ -265,9 +265,11 @@ unifyRaw l0 r0 = do
+ 
+ data MatchFailure = NoMatcher | ACProblem
+ 
++instance Semigroup MatchFailure where
++  _ <> _ = NoMatcher
++
+ instance Monoid MatchFailure where
+   mempty = NoMatcher
+-  mappend _ _ = NoMatcher
+ 
+ -- | Ensure that the computed substitution @sigma@ satisfies
+ -- @t ==_AC apply sigma p@ after the delayed equations are solved.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
new file mode 100644
index 000000000000..f7393e37f1b2
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch
@@ -0,0 +1,130 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Theory/Proof.hs                | 43 +++++++++++--------
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+diff --git a/src/Theory/Constraint/Solver/Reduction.hs b/src/Theory/Constraint/Solver/Reduction.hs
+index ddbc965a..6daadd0d 100644
+--- a/src/Theory/Constraint/Solver/Reduction.hs
++++ b/src/Theory/Constraint/Solver/Reduction.hs
+@@ -139,13 +139,14 @@ execReduction m ctxt se fs =
+ data ChangeIndicator = Unchanged | Changed
+        deriving( Eq, Ord, Show )
+ 
++instance Semigroup ChangeIndicator where
++    Changed   <> _         = Changed
++    _         <> Changed   = Changed
++    Unchanged <> Unchanged = Unchanged
++
+ instance Monoid ChangeIndicator where
+     mempty = Unchanged
+ 
+-    Changed   `mappend` _         = Changed
+-    _         `mappend` Changed   = Changed
+-    Unchanged `mappend` Unchanged = Unchanged
+-
+ -- | Return 'True' iff there was a change.
+ wasChanged :: ChangeIndicator -> Bool
+ wasChanged Changed   = True
+diff --git a/src/Theory/Constraint/System/Guarded.hs b/src/Theory/Constraint/System/Guarded.hs
+index f98fc7c2..2aac8ce2 100644
+--- a/src/Theory/Constraint/System/Guarded.hs
++++ b/src/Theory/Constraint/System/Guarded.hs
+@@ -435,7 +435,7 @@ gall ss atos gf               = GGuarded All ss atos gf
+ 
+ -- | Local newtype to avoid orphan instance.
+ newtype ErrorDoc d = ErrorDoc { unErrorDoc :: d }
+-    deriving( Monoid, NFData, Document, HighlightDocument )
++    deriving( Monoid, Semigroup, NFData, Document, HighlightDocument )
+ 
+ -- | @formulaToGuarded fm@ returns a guarded formula @gf@ that is
+ -- equivalent to @fm@ under the assumption that this is possible.
+diff --git a/src/Theory/Proof.hs b/src/Theory/Proof.hs
+index 74fb77b1..7971b9fc 100644
+--- a/src/Theory/Proof.hs
++++ b/src/Theory/Proof.hs
+@@ -388,17 +388,19 @@ data ProofStatus =
+        | TraceFound         -- ^ There is an annotated solved step
+     deriving ( Show, Generic, NFData, Binary )
+ 
++instance Semigroup ProofStatus where
++    TraceFound <> _                        = TraceFound
++    _ <> TraceFound                        = TraceFound
++    IncompleteProof <> _                   = IncompleteProof
++    _ <> IncompleteProof                   = IncompleteProof
++    _ <> CompleteProof                     = CompleteProof
++    CompleteProof <> _                     = CompleteProof
++    UndeterminedProof <> UndeterminedProof = UndeterminedProof
++
++
+ instance Monoid ProofStatus where
+     mempty = CompleteProof
+ 
+-    mappend TraceFound _                        = TraceFound
+-    mappend _ TraceFound                        = TraceFound
+-    mappend IncompleteProof _                   = IncompleteProof
+-    mappend _ IncompleteProof                   = IncompleteProof
+-    mappend _ CompleteProof                     = CompleteProof
+-    mappend CompleteProof _                     = CompleteProof
+-    mappend UndeterminedProof UndeterminedProof = UndeterminedProof
+-
+ -- | The status of a 'ProofStep'.
+ proofStepStatus :: ProofStep (Maybe a) -> ProofStatus
+ proofStepStatus (ProofStep _         Nothing ) = UndeterminedProof
+@@ -560,10 +562,12 @@ newtype Prover =  Prover
+               -> Maybe IncrementalProof    -- resulting proof
+           }
+ 
++instance Semigroup Prover where
++    p1 <> p2 = Prover $ \ctxt d se ->
++        runProver p1 ctxt d se >=> runProver p2 ctxt d se
++
+ instance Monoid Prover where
+     mempty          = Prover $ \_  _ _ -> Just
+-    p1 `mappend` p2 = Prover $ \ctxt d se ->
+-        runProver p1 ctxt d se >=> runProver p2 ctxt d se
+ 
+ -- | Provers whose sequencing is handled via the 'Monoid' instance.
+ --
+@@ -579,10 +583,12 @@ newtype DiffProver =  DiffProver
+               -> Maybe IncrementalDiffProof    -- resulting proof
+           }
+ 
++instance Semigroup DiffProver where
++    p1 <> p2 = DiffProver $ \ctxt d se ->
++        runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
++
+ instance Monoid DiffProver where
+     mempty          = DiffProver $ \_  _ _ -> Just
+-    p1 `mappend` p2 = DiffProver $ \ctxt d se ->
+-        runDiffProver p1 ctxt d se >=> runDiffProver p2 ctxt d se
+ 
+ -- | Map the proof generated by the prover.
+ mapProverProof :: (IncrementalProof -> IncrementalProof) -> Prover -> Prover
+@@ -784,15 +790,16 @@ runAutoDiffProver (AutoProver heuristic bound cut) =
+ -- | The result of one pass of iterative deepening.
+ data IterDeepRes = NoSolution | MaybeNoSolution | Solution ProofPath
+ 
++instance Semigroup IterDeepRes where
++    x@(Solution _)   <> _                = x
++    _                <> y@(Solution _)   = y
++    MaybeNoSolution  <> _                = MaybeNoSolution
++    _                <> MaybeNoSolution  = MaybeNoSolution
++    NoSolution       <> NoSolution       = NoSolution
++
+ instance Monoid IterDeepRes where
+     mempty = NoSolution
+ 
+-    x@(Solution _)   `mappend` _                = x
+-    _                `mappend` y@(Solution _)   = y
+-    MaybeNoSolution  `mappend` _                = MaybeNoSolution
+-    _                `mappend` MaybeNoSolution  = MaybeNoSolution
+-    NoSolution       `mappend` NoSolution       = NoSolution
+-
+ -- | @cutOnSolvedDFS prf@ removes all other cases if an attack is found. The
+ -- attack search is performed using a parallel DFS traversal with iterative
+ -- deepening.
diff --git a/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
new file mode 100644
index 000000000000..d6cd6d73f99e
--- /dev/null
+++ b/pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch
@@ -0,0 +1,140 @@
+From a08f6e400772899b9b0fc16befc50391cd70696b Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 18 May 2018 16:24:41 +0800
+Subject: [PATCH] GHC 8.4 support
+
+---
+ src/Extension/Data/Bounded.hs       | 10 ++++-
+ src/Extension/Data/Monoid.hs        | 14 +++---
+ src/Logic/Connectives.hs            |  4 +-
+ src/Text/PrettyPrint/Class.hs       |  4 +-
+ src/Text/PrettyPrint/Html.hs        |  6 ++-
+ 11 files changed, 79 insertions(+), 48 deletions(-)
+
+
+diff --git a/src/Extension/Data/Bounded.hs b/src/Extension/Data/Bounded.hs
+index 5f166006..f416a44c 100644
+--- a/src/Extension/Data/Bounded.hs
++++ b/src/Extension/Data/Bounded.hs
+@@ -11,19 +11,25 @@ module Extension.Data.Bounded (
+   ) where
+ 
+ -- import Data.Monoid
++import Data.Semigroup
+ 
+ -- | A newtype wrapper for a monoid of the maximum of a bounded type.
+ newtype BoundedMax a = BoundedMax {getBoundedMax :: a}
+     deriving( Eq, Ord, Show )
+ 
++instance (Ord a, Bounded a) => Semigroup (BoundedMax a) where
++    BoundedMax x <> BoundedMax y = BoundedMax (max x y)
++
+ instance (Ord a, Bounded a) => Monoid (BoundedMax a) where
+     mempty                                  = BoundedMax minBound
+-    (BoundedMax x) `mappend` (BoundedMax y) = BoundedMax (max x y)
++    mappend = (<>)
+ 
+ -- | A newtype wrapper for a monoid of the minimum of a bounded type.
+ newtype BoundedMin a = BoundedMin {getBoundedMin :: a}
+     deriving( Eq, Ord, Show )
+ 
++instance (Ord a, Bounded a) => Semigroup (BoundedMin a) where
++    BoundedMin x <> BoundedMin y = BoundedMin (min x y)
++
+ instance (Ord a, Bounded a) => Monoid (BoundedMin a) where
+     mempty                                  = BoundedMin maxBound
+-    (BoundedMin x) `mappend` (BoundedMin y) = BoundedMin (min x y)
+\ No newline at end of file
+diff --git a/src/Extension/Data/Monoid.hs b/src/Extension/Data/Monoid.hs
+index 83655c34..9ce2f91b 100644
+--- a/src/Extension/Data/Monoid.hs
++++ b/src/Extension/Data/Monoid.hs
+@@ -18,6 +18,7 @@ module Extension.Data.Monoid (
+   ) where
+ 
+ import Data.Monoid
++import Data.Semigroup
+ 
+ #if __GLASGOW_HASKELL__ < 704
+ 
+@@ -38,10 +39,13 @@ newtype MinMax a = MinMax { getMinMax :: Maybe (a, a) }
+ minMaxSingleton :: a -> MinMax a
+ minMaxSingleton x = MinMax (Just (x, x))
+ 
++instance Ord a => Semigroup (MinMax a) where
++    MinMax Nothing             <> y                          = y
++    x                          <> MinMax Nothing             = x
++    MinMax (Just (xMin, xMax)) <> MinMax (Just (yMin, yMax)) =
++       MinMax (Just (min xMin yMin, max xMax yMax))
++
++
+ instance Ord a => Monoid (MinMax a) where
+     mempty = MinMax Nothing
+-
+-    MinMax Nothing             `mappend` y                          = y
+-    x                          `mappend` MinMax Nothing             = x
+-    MinMax (Just (xMin, xMax)) `mappend` MinMax (Just (yMin, yMax)) =
+-       MinMax (Just (min xMin yMin, max xMax yMax))
++    mappend = (<>)
+diff --git a/src/Logic/Connectives.hs b/src/Logic/Connectives.hs
+index 2e441172..7206cc2c 100644
+--- a/src/Logic/Connectives.hs
++++ b/src/Logic/Connectives.hs
+@@ -23,12 +23,12 @@ import Control.DeepSeq
+ 
+ -- | A conjunction of atoms of type a.
+ newtype Conj a = Conj { getConj :: [a] }
+-  deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
++  deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
+             Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
+ 
+ -- | A disjunction of atoms of type a.
+ newtype Disj a = Disj { getDisj :: [a] }
+-  deriving (Monoid, Foldable, Traversable, Eq, Ord, Show, Binary,
++  deriving (Monoid, Semigroup, Foldable, Traversable, Eq, Ord, Show, Binary,
+             Functor, Applicative, Monad, Alternative, MonadPlus, Typeable, Data, NFData)
+ 
+ instance MonadDisj Disj where
+diff --git a/src/Text/PrettyPrint/Class.hs b/src/Text/PrettyPrint/Class.hs
+index f5eb42fe..13be6515 100644
+--- a/src/Text/PrettyPrint/Class.hs
++++ b/src/Text/PrettyPrint/Class.hs
+@@ -187,9 +187,11 @@ instance Document Doc where
+   nest i (Doc d) = Doc $ P.nest i d
+   caseEmptyDoc yes no (Doc d) = if P.isEmpty d then yes else no
+ 
++instance Semigroup Doc where
++    Doc d1 <> Doc d2 = Doc $ (P.<>) d1 d2
++
+ instance Monoid Doc where
+     mempty = Doc $ P.empty
+-    mappend (Doc d1) (Doc d2) = Doc $ (P.<>) d1 d2
+   
+ ------------------------------------------------------------------------------
+ -- Additional combinators
+diff --git a/src/Text/PrettyPrint/Html.hs b/src/Text/PrettyPrint/Html.hs
+index 3de5e307..10103eb7 100644
+--- a/src/Text/PrettyPrint/Html.hs
++++ b/src/Text/PrettyPrint/Html.hs
+@@ -90,7 +90,7 @@ attribute (key,value) = " " ++ key ++ "=\"" ++ escapeHtmlEntities value ++ "\""
+ 
+ -- | A 'Document' transformer that adds proper HTML escaping.
+ newtype HtmlDoc d = HtmlDoc { getHtmlDoc :: d }
+-    deriving( Monoid )
++    deriving( Monoid, Semigroup )
+ 
+ -- | Wrap a document such that HTML markup can be added without disturbing the
+ -- layout.
+@@ -182,9 +182,11 @@ getNoHtmlDoc = runIdentity . unNoHtmlDoc
+ instance NFData d => NFData (NoHtmlDoc d) where
+     rnf = rnf . getNoHtmlDoc
+ 
++instance Semigroup d => Semigroup (NoHtmlDoc d) where
++  (<>) = liftA2 (<>)
++
+ instance Monoid d => Monoid (NoHtmlDoc d) where
+   mempty = pure mempty
+-  mappend = liftA2 mappend
+ 
+ instance Document d => Document (NoHtmlDoc d) where
+   char = pure . char

From f91a79ecc86c574134f3a13ba3d0750720964230 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 12 Sep 2018 22:22:39 -0700
Subject: [PATCH 0939/3253] treewide: fix `config.allowAliases = false`
 evaluation

---
 pkgs/applications/graphics/krita/default.nix                | 4 ++--
 pkgs/applications/graphics/qcomicbook/default.nix           | 4 ++--
 .../window-managers/xmonad/log-applet/default.nix           | 4 ++--
 pkgs/misc/drivers/sc-controller/default.nix                 | 4 ++--
 pkgs/misc/vim-plugins/default.nix                           | 6 +++---
 pkgs/tools/X11/ncview/default.nix                           | 4 ++--
 pkgs/top-level/all-packages.nix                             | 1 -
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index d4ac9720e15f..0abe90e0ba73 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -3,7 +3,7 @@
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
 , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
-, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
+, openjpeg, opencolorio, vc, poppler, curl, ilmbase
 , qtmultimedia, qtx11extras
 , python3
 }:
@@ -23,7 +23,7 @@ mkDerivation rec {
     karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
     ki18n kitemmodels kitemviews kwindowsystem kio kcrash
     boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
-    openjpeg opencolorio poppler_qt5 curl ilmbase
+    openjpeg opencolorio poppler curl ilmbase
     qtmultimedia qtx11extras
     python3
   ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index d67c8ef9b025..c37e21ec898a 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
 
 stdenv.mkDerivation rec {
   name = "qcomicbook-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase qttools qtx11extras poppler_qt5
+    qtbase qttools qtx11extras poppler
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index 96f742df3105..57f00887103f 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
-, desktopSupport, xlibs
+, desktopSupport, xorg
 , gtk2
 , gtk3, gnome3, mate
 , libxfce4util, xfce4-panel
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
   };
 
-  buildInputs = [ glib dbus-glib xlibs.xcbutilwm ]
+  buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
     ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ]
     ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
     ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index f1c4ff091573..9de0ba277789 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -2,7 +2,7 @@
 , gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg
 , evdev, pygobject3, pylibacl, pytest, bluez
 , linuxHeaders
-, libX11, libXext, libXfixes, libusb1, libudev
+, libX11, libXext, libXfixes, libusb1, udev
 }:
 
 buildPythonApplication rec {
@@ -34,7 +34,7 @@ buildPythonApplication rec {
     substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'"
   '';
 
-  LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev bluez ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 udev bluez ];
 
   preFixup = ''
     gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3287c4714be8..ce8f2cc0bd6c 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -111,7 +111,7 @@ self = generated // (with generated; {
     '';
   });
 
-  command_T = command_T.overrideAttrs(old: {
+  command-t = command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''
       rake make
@@ -166,7 +166,7 @@ self = generated // (with generated; {
 		dependencies = ["gitv"];
 	});
 
-  taglist = taglist.overrideAttrs(old: {
+  taglist-vim = taglist-vim.overrideAttrs(old: {
     setSourceRoot = ''
       export sourceRoot=taglist
       mkdir taglist
@@ -309,7 +309,7 @@ self = generated // (with generated; {
     '';
   });
 
-  yankring = yankring.overrideAttrs(old: {
+  YankRing-vim = YankRing-vim.overrideAttrs(old: {
     sourceRoot = ".";
   });
 
diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/tools/X11/ncview/default.nix
index e4ba08a6ff36..1f793aa6c4c9 100644
--- a/pkgs/tools/X11/ncview/default.nix
+++ b/pkgs/tools/X11/ncview/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, netcdf, x11, xorg, udunits, expat
+, netcdf, xlibsWrapper, xorg, udunits, expat
 }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
     sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8";
   };
 
-  buildInputs = [ netcdf x11 xorg.libXaw udunits expat ];
+  buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ];
 
   meta = with stdenv.lib; {
     description = "Visual browser for netCDF format files";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 533b04d9e0e1..2383b48298c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17241,7 +17241,6 @@ with pkgs;
 
   krita = libsForQt5.callPackage ../applications/graphics/krita {
     openjpeg = openjpeg_1;
-    poppler_qt5 = libsForQt5.poppler;
   };
 
   krusader = libsForQt5.callPackage ../applications/misc/krusader { };

From abe97e9446829a8c6da9033383df23befcb8c80c Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 16:30:35 +0200
Subject: [PATCH 0940/3253] pythonPackages.daphne: 2.1.0 -> 2.2.2

Update, re-enable all tests on linux, disable tests on darwin.
This fixes the build of pythonPackages.channels
---
 pkgs/development/python-modules/daphne/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 7ead1cacfa66..258fc746e4b5 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -4,7 +4,7 @@
 }:
 buildPythonPackage rec {
   pname = "daphne";
-  version = "2.1.0";
+  version = "2.2.2";
 
   disabled = !isPy3k;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1lbpn0l796ar77amqy8dap30zxmsn6as8y2lbmp4lk8m9awscwi8";
+    sha256 = "1pr3b7zxjp2jx31lpiy1hfyprpmyiv2kd18n8x6kh6gd5nr0dgp8";
   };
 
   nativeBuildInputs = [ pytestrunner ];
@@ -21,9 +21,10 @@ buildPythonPackage rec {
 
   checkInputs = [ hypothesis pytest pytest-asyncio ];
 
+  doCheck = !stdenv.isDarwin; # most tests fail on darwin
+
   checkPhase = ''
-    # Other tests fail, seems to be due to filesystem access
-    py.test -k "test_cli or test_utils"
+    py.test
   '';
 
   meta = with stdenv.lib; {

From 9e4b0b795cf83f33e0edc4a0e8fcf60c63f05903 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 17:03:57 +0200
Subject: [PATCH 0941/3253] pythonPackages.eve: fix build, drop incorrect
 dependencies

Build failed because of dependency Flask-PyMongo, which actually
isn't a dependency of eve as they have their own flask_pymongo code.

- Drop incorrect dependency flask-pymongo
- Drop redunant dependencies already propageted by flask:
  itsdangerous, werkzeug, jinja2
- Drop dependency markupsafe, not required any more
---
 pkgs/development/python-modules/eve/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index b8daa5304c77..b145f1b2e2b8 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, flask, jinja2, itsdangerous, events
-, markupsafe, pymongo, flask-pymongo, werkzeug, simplejson, cerberus }:
+{ stdenv, buildPythonPackage, fetchPypi, flask, events
+, pymongo, simplejson, cerberus }:
 
 buildPythonPackage rec {
   pname = "Eve";
@@ -13,14 +13,9 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cerberus
     events
-    flask-pymongo
     flask
-    itsdangerous
-    jinja2
-    markupsafe
     pymongo
     simplejson
-    werkzeug
   ];
 
   # tests call a running mongodb instance

From 781eaa13775b0c2aa457295fe08491dbd0d5a0dc Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 17:25:38 +0200
Subject: [PATCH 0942/3253] pythonPackages.flask-pymongo: fix build

add missing dependency: vcversioner
---
 pkgs/development/python-modules/Flask-PyMongo/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
index 862fd84c4921..7c37bdaddd51 100644
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -2,6 +2,7 @@
 , fetchPypi
 , flask
 , pymongo
+, vcversioner
 , lib
 , pytest
 }:
@@ -18,17 +19,17 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
 
   checkPhase = ''
-    py.test tests
+    py.test
   '';
 
   # Tests seem to hang
   doCheck = false;
 
-  propagatedBuildInputs = [ flask pymongo ];
+  propagatedBuildInputs = [ flask pymongo vcversioner ];
 
   meta = {
     homepage = "http://flask-pymongo.readthedocs.org/";
     description = "PyMongo support for Flask applications";
     license = lib.licenses.bsd2;
   };
-}
\ No newline at end of file
+}

From 5710ee3befcb9c707189d835bb23fb971f81dcf4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Sep 2018 17:37:57 +0200
Subject: [PATCH 0943/3253] tor-browser-bundle-bin: add gsettings-schemas

See https://github.com/NixOS/nixpkgs/issues/46587
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index d922de7d6a55..8cbe788f1fd9 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -44,6 +44,7 @@
 , glibcLocales
 , hicolor-icon-theme
 , shared-mime-info
+, gsettings-desktop-schemas
 
 # Whether to disable multiprocess support to work around crashing tabs
 # TODO: fix the underlying problem instead of this terrible work-around
@@ -267,6 +268,11 @@ stdenv.mkDerivation rec {
       hicolor-icon-theme
       shared-mime-info
     ]}
+    WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
+      glib
+      gsettings-desktop-schemas
+      gtk3
+    ]};
 
     # Generate wrapper
     mkdir -p $out/bin

From 546e511edc1de7ab193ac243f4a98d389aa43524 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Sep 2018 17:41:06 +0200
Subject: [PATCH 0944/3253] tor-browser-bundle-bin: parameterize icon theme

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8cbe788f1fd9..d2e4d69a19e1 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -42,7 +42,7 @@
 # Wrapper runtime
 , coreutils
 , glibcLocales
-, hicolor-icon-theme
+, defaultIconTheme
 , shared-mime-info
 , gsettings-desktop-schemas
 
@@ -265,7 +265,7 @@ stdenv.mkDerivation rec {
     EOF
 
     WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
-      hicolor-icon-theme
+      defaultIconTheme
       shared-mime-info
     ]}
     WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39644a02cbe3..b77806ddec69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5587,7 +5587,9 @@ with pkgs;
 
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
-  tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { };
+  tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin {
+    inherit (gnome3) defaultIconTheme;
+  };
 
   tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
     stdenv = stdenvNoCC;

From aacf68a6353c7b1bebd92ee2e6ef9b9e8de63ed0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 13 Sep 2018 17:41:56 +0200
Subject: [PATCH 0945/3253] tor-browser-bundle-bin: stdenv.shell ->
 runtimeShell in wrapper

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index d2e4d69a19e1..d9ff1b5c54d8 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -43,6 +43,7 @@
 , coreutils
 , glibcLocales
 , defaultIconTheme
+, runtimeShell
 , shared-mime-info
 , gsettings-desktop-schemas
 
@@ -277,7 +278,7 @@ stdenv.mkDerivation rec {
     # Generate wrapper
     mkdir -p $out/bin
     cat > "$out/bin/tor-browser" << EOF
-    #! ${stdenv.shell}
+    #! ${runtimeShell}
     set -o errexit -o nounset
 
     PATH=${makeBinPath [ coreutils ]}

From 0bda601ee5a4ff73d7b7be8a7a28338697b076a8 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 17:45:49 +0200
Subject: [PATCH 0946/3253] pythonPackages.pytest-rerunfailures: fix build

some tests fail since pytest 3.7.2 -> 3.7.4 update, disable them
---
 .../python-modules/pytest-rerunfailures/default.nix        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 5931afa37e20..d71cc420d59b 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -9,10 +9,13 @@ buildPythonPackage rec {
     sha256 = "be6bf93ed618c8899aeb6721c24f8009c769879a3b4931e05650f3c173ec17c5";
   };
 
-  checkInputs = [ pytest mock ];
+  checkInputs = [ mock ];
 
+  propagatedBuildInputs = [ pytest ];
+
+  # disable tests that fail with pytest 3.7.4
   checkPhase = ''
-    py.test
+    py.test test_pytest_rerunfailures.py -k 'not test_reruns_with_delay'
   '';
 
   meta = with stdenv.lib; {

From be12bb81aaf25c7b0cb97193b700ce347af25072 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 18:16:34 +0200
Subject: [PATCH 0947/3253] pythonPackages.wordfreq: 2.0 -> 2.2.0, fix build

Previous version didn't build (test failure).
Update to latest, tests use pytest now, disable failing tests.
---
 .../development/python-modules/wordfreq/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix
index 9de1fd5b3922..d672cb8bae90 100644
--- a/pkgs/development/python-modules/wordfreq/default.nix
+++ b/pkgs/development/python-modules/wordfreq/default.nix
@@ -6,27 +6,28 @@
 , msgpack
 , mecab-python3
 , jieba
-, nose
+, pytest
 , pythonOlder
 , fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "wordfreq";
-  version = "2.0";
+  version = "2.2.0";
 
    src = fetchFromGitHub {
     owner = "LuminosoInsight";
     repo = "wordfreq";
-    rev = "e3a1b470d9f8e0d82e9f179ffc41abba434b823b";
-    sha256 = "1wjkhhj7nxfnrghwvmvwc672s30lp4b7yr98gxdxgqcq6wdshxwv";
+    # upstream don't tag by version
+    rev = "bc12599010c8181a725ec97d0b3990758a48da36";
+    sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m";
    };
 
-  checkInputs = [ nose ];
+  checkInputs = [ pytest ];
 
   checkPhase = ''
     # These languages require additional dictionaries
-    nosetests -e test_japanese -e test_korean -e test_languages
+    pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related'
   '';
    
   propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];

From 68b25008e25bb5c1cbba1d3d89ecaa78ebf8a374 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 13 Sep 2018 18:22:37 +0200
Subject: [PATCH 0948/3253] grafana: 5.2.3 -> 5.2.4

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index fb7418551ae6..e795d74fe989 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.2.3";
+  version = "5.2.4";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "08ws8kpqxl0rihw8xa93285gal6f6c3imymdi9iif13vsn458hiw";
+    sha256 = "15w935i22ddx6ff32ynypjh3q670vnrj74qw0vdkxdmrlwk3q7wc";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "098xrzq7wkizww9552bk8cn300336y51qfzf1fkfwrn1fqf9nswl";
+    sha256 = "187dqjahz1z1gkcx9pxnf2hri6g3b5j3ppadwfahz0rwsqj4v2lf";
   };
 
   postPatch = ''

From 4d962b6dcdc0c04dfa6a4f627498602c021bc1ac Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Thu, 13 Sep 2018 19:04:15 +0200
Subject: [PATCH 0949/3253] atlassian-confluence: 6.8.0 -> 6.11.1

---
 pkgs/servers/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index c3427b8029e5..617ae3ee1d10 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.8.0";
+  version = "6.11.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "07awdbkjxkk4rbnpbb5xfjp4125c33bwxncmydlgzgk5fzy6dg2w";
+    sha256 = "0sp1ggllvxdz0pf409yyil1x9dah1jyqspknfzgivkmwhcqj7brr";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];

From f05e51abed25cca570001cccd85d075c42c761e1 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Thu, 13 Sep 2018 19:04:36 +0200
Subject: [PATCH 0950/3253] atlassian-crowd: 3.1.2 -> 3.2.5

---
 pkgs/servers/atlassian/crowd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 4989c3a417a2..4ad0388e8db4 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "3.1.2";
+  version = "3.2.5";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "0pnl0zl38827ckgxh4y1mnq3lr7bvd7v3ysdxxv3nfr5zya4xgki";
+    sha256 = "1h8kxh89d2wm0hkgrzx5dnnfy8sbhpgisgdwn3srhb4js8h4qil6";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 437bcdfed5579539dc660a0c4584a3a1eae27ca0 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Thu, 13 Sep 2018 14:11:59 +0200
Subject: [PATCH 0951/3253] sickbeard: init at 2016-03-21

---
 pkgs/servers/sickbeard/default.nix | 35 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/sickbeard/default.nix

diff --git a/pkgs/servers/sickbeard/default.nix b/pkgs/servers/sickbeard/default.nix
new file mode 100644
index 000000000000..4d6e181c61d2
--- /dev/null
+++ b/pkgs/servers/sickbeard/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, python2, makeWrapper }:
+
+let
+  pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
+in python2.pkgs.buildPythonApplication rec {
+  name = "sickbeard-${version}";
+  version = "2016-03-21";
+
+  src = fetchFromGitHub {
+    owner = "midgetspy";
+    repo = "Sick-Beard";
+    rev = "171a607e41b7347a74cc815f6ecce7968d9acccf";
+    sha256 = "16bn13pvzl8w6nxm36ii724x48z1cnf8y5fl0m5ig1vpqfypk5vq";
+  };
+
+  dontBuild = true;
+  doCheck = false;
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ pythonEnv ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R {autoProcessTV,cherrypy,data,lib,sickbeard,SickBeard.py} $out/
+
+    makeWrapper $out/SickBeard.py $out/bin/sickbeard
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PVR & episode guide that downloads and manages all your TV shows";
+    license     = licenses.gpl3;
+    homepage    = https:/github.com/midgetspy/Sick-Beard;
+    maintainers = with stdenv.lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b77806ddec69..7be6b9e7c4f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13525,6 +13525,8 @@ with pkgs;
       # see also openssl, which has/had this same trick
   };
 
+  sickbeard = callPackage ../servers/sickbeard { };
+
   sipcmd = callPackage ../applications/networking/sipcmd { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };

From 4a2b028921a095b7d431185eb198fefaeef022d3 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Thu, 13 Sep 2018 14:22:17 +0200
Subject: [PATCH 0952/3253] sickgear: init at 0.17.5

---
 pkgs/servers/sickbeard/sickgear.nix | 35 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/sickbeard/sickgear.nix

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
new file mode 100644
index 000000000000..21254f557530
--- /dev/null
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, python2, makeWrapper }:
+
+let
+  pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
+in python2.pkgs.buildPythonApplication rec {
+  name = "sickgear-${version}";
+  version = "0.17.5";
+
+  src = fetchFromGitHub {
+    owner = "SickGear";
+    repo = "SickGear";
+    rev = "release_${version}";
+    sha256 = "1lx060klgxz8gjanfjvya6p6kd8842qbpp1qhhiw49a25r8gyxpk";
+  };
+
+  dontBuild = true;
+  doCheck = false;
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ pythonEnv ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R {autoProcessTV,gui,lib,sickbeard,SickBeard.py} $out/
+
+    makeWrapper $out/SickBeard.py $out/bin/sickgear
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation";
+    license     = licenses.gpl3;
+    homepage    = https:/github.com/SickGear/SickGear;
+    maintainers = with stdenv.lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7be6b9e7c4f5..42e64fe2fb46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13527,6 +13527,8 @@ with pkgs;
 
   sickbeard = callPackage ../servers/sickbeard { };
 
+  sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
+
   sipcmd = callPackage ../applications/networking/sipcmd { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };

From 6fb62ac2857e03e5722be90e5fe076939b91261a Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Thu, 13 Sep 2018 14:37:12 +0200
Subject: [PATCH 0953/3253] sickrage: init at v2018.07.21-1

---
 pkgs/servers/sickbeard/sickrage.nix | 34 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/sickbeard/sickrage.nix

diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix
new file mode 100644
index 000000000000..6ee119520b41
--- /dev/null
+++ b/pkgs/servers/sickbeard/sickrage.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, python2, makeWrapper }:
+
+python2.pkgs.buildPythonApplication rec {
+  name = "sickrage-${version}";
+  version = "v2018.07.21-1";
+
+  src = fetchFromGitHub {
+    owner = "SickRage";
+    repo = "SickRage";
+    rev = "${version}"; 
+    sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9";
+  };
+
+  dontBuild = true;
+  doCheck = false;
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ python2 ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R {gui,lib,locale,sickbeard,sickrage,SickBeard.py} $out/
+
+    makeWrapper $out/SickBeard.py $out/bin/sickrage
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Automatic Video Library Manager for TV Shows";
+    longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic.";
+    license     = licenses.gpl3;
+    homepage    = https://sickrage.github.io;
+    maintainers = [ "sterfield@gmail.com" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42e64fe2fb46..5f1304af8471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13529,6 +13529,8 @@ with pkgs;
 
   sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
 
+  sickrage = callPackage ../servers/sickbeard/sickrage.nix { };
+
   sipcmd = callPackage ../applications/networking/sipcmd { };
 
   sipwitch = callPackage ../servers/sip/sipwitch { };

From a431f3e35d68debdb16537e4563dd290dbe15500 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Thu, 13 Sep 2018 19:05:32 +0200
Subject: [PATCH 0954/3253] atlassian-jira: 7.12.0 -> 7.12.1

---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 1bff3ad379dd..46a78e1c5bd5 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.12.0";
+  version = "7.12.1";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0kpsgq54xs43rwhg9zwh869jl64ywhb4fcyp5sq1zd19y5cqfnkn";
+    sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From d9bdd64f04213e200e050984391d935d67dea31a Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 19:40:29 +0200
Subject: [PATCH 0955/3253] pythonPackages.nilearn: fix tests

disable failing tests
---
 pkgs/development/python-modules/nilearn/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 93871d9a9a7e..bf8ae217705c 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -11,9 +11,13 @@ buildPythonPackage rec {
     sha256 = "5049363eb6da2e7c35589477dfc79bf69929ca66de2d7ed2e9dc07acf78636f4";
   };
 
-  checkPhase = "nosetests --exclude with_expand_user nilearn/tests";
+  # disable some failing tests
+  checkPhase = ''
+    nosetests nilearn/tests \
+    -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend
+  '';
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   propagatedBuildInputs = [
     matplotlib

From 0c50140da5bcc55c588ac64bfcedac4699a43711 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 6 Sep 2018 15:03:13 +0200
Subject: [PATCH 0956/3253] buildRustCrate: add heuristic to picking the right
 source files

Cargo has a few odd (old) ways of picking source files if the `bin.path`
attribute isn't given in the Cargo.toml. This commit adds support for
some of those. The previous behaviour always defaulted to `src/main.rs`
which was not always the right choice.

Since there is  look-ahead into the unpacked sources before running the
actual builder the path selection logic has to be embedded within the
build script.

`buildRustCrate` currently supports two ways of running building
binaries when processing a crate:

- Explicit definition of all the binaries (& optionally the paths to
their respective `main.rs`) and,
- if not binary was explictly configured all files matching the patterns
  `src/main.rs`, `src/bin/*.rs`.

When the explicit list is given without path information paths are now
being picked from a list of candidates. The first match wins. The order
is the same as within the cargo compatibility code.

If the crate does not provide any libraries the path `src/{bin_name}.rs`
is also considered.

All underscores within the binary names are translated into dashes (`-`)
before the lookups are made. This seems to be a common convention.
---
 pkgs/build-support/rust/build-rust-crate.nix  |  53 ++++--
 .../rust/build-rust-crate/build-crate.nix     | 159 ++++++++++++++++++
 2 files changed, 202 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/build-support/rust/build-rust-crate/build-crate.nix

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index 6605aa27b21e..cfdf38958a8d 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -282,14 +282,48 @@ let makeDeps = dependencies:
 
          tr '\n' ' ' < target/link > target/link_
          LINK=$(cat target/link_)
-       fi
+      fi
 
       mkdir -p target/bin
-      echo "${crateBin}" | sed -n 1'p' | tr ',' '\n' | while read BIN; do
-         if [[ ! -z "$BIN" ]]; then
-           build_bin $BIN
-         fi
+      printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
+        # filter empty entries / empty "lines"
+        if [[ -z "$BIN_NAME" ]]; then
+             continue
+        fi
+
+        if [[ -z "$BIN_PATH" ]]; then
+          # heuristic to "guess" the correct source file as found in cargo:
+          # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325
+
+          # the first two cases are the "new" default IIRC
+          BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
+          FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs"
+
+          if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
+            # if this is not a library the following path is also valid
+            FILES="src/$BIN_NAME_.rs $FILES"
+          fi
+
+          echo $FILES
+          for file in $FILES;
+          do
+            echo "checking file $file"
+            # first file that exists wins
+            if [[ -e "$file" ]]; then
+                    BIN_PATH="$file"
+                    break
+            fi
+          done
+
+          if [[ -z "$BIN_PATH" ]]; then
+            echo "failed to find file for binary target: $BIN_NAME" >&2
+            exit 1
+          fi
+        fi
+        build_bin $BIN_NAME $BIN_PATH
       done
+
+
       ${lib.optionalString (crateBin == "") ''
         if [[ -e src/main.rs ]]; then
           build_bin ${crateName} src/main.rs
@@ -388,11 +422,10 @@ stdenv.mkDerivation (rec {
     metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));
 
     crateBin = if crate ? crateBin then
-       builtins.foldl' (bins: bin:
-          let name =
-              lib.strings.replaceStrings ["-"] ["_"]
-                 (if bin ? name then bin.name else crateName);
-              path = if bin ? path then bin.path else "src/main.rs";
+       builtins.foldl' (bins: bin: let
+            _name = (if bin ? name then bin.name else crateName);
+            name = lib.strings.replaceStrings ["-"] ["_"] _name;
+            path = if bin ? path then bin.path else "";
           in
           bins + (if bin == "" then "" else ",") + "${name} ${path}"
 
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
new file mode 100644
index 000000000000..748d48edefc2
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -0,0 +1,159 @@
+{ lib, stdenv, echo_build_heading, noisily, makeDeps }:
+{ crateName,
+  dependencies,
+  crateFeatures, libName, release, libPath,
+  crateType, metadata, crateBin, finalBins,
+  extraRustcOpts, verbose, colors }:
+
+  let
+
+    deps = makeDeps dependencies;
+        rustcOpts =
+          lib.lists.foldl' (opts: opt: opts + " " + opt)
+            (if release then "-C opt-level=3" else "-C debuginfo=2")
+            (["-C codegen-units=1"] ++ extraRustcOpts);
+        rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
+  in ''
+    runHook preBuild
+    norm=""
+    bold=""
+    green=""
+    boldgreen=""
+    if [[ "${colors}" == "always" ]]; then
+      norm="$(printf '\033[0m')" #returns to "normal"
+      bold="$(printf '\033[0;1m')" #set bold
+      green="$(printf '\033[0;32m')" #set green
+      boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.
+    fi
+    ${echo_build_heading colors}
+    ${noisily colors verbose}
+
+    build_lib() {
+       lib_src=$1
+       echo_build_heading $lib_src ${libName}
+
+       noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
+         ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
+         --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
+         $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+
+       EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"
+       if [ -e target/deps/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary} ]; then
+          EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"
+       fi
+    }
+
+    build_bin() {
+      crate_name=$1
+      crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
+      main_file=""
+      if [[ ! -z $2 ]]; then
+        main_file=$2
+      fi
+      echo_build_heading $@
+      noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
+        ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
+        $LINK ${deps}$EXTRA_LIB --cap-lints allow \
+        $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
+      if [ "$crate_name_" != "$crate_name" ]; then
+        mv target/bin/$crate_name_ target/bin/$crate_name
+      fi
+    }
+
+
+    EXTRA_LIB=""
+    CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")
+
+    if [[ -e target/link_ ]]; then
+      EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"
+    fi
+
+    if [[ -e "${libPath}" ]]; then
+       build_lib ${libPath}
+    elif [[ -e src/lib.rs ]]; then
+       build_lib src/lib.rs
+    elif [[ -e src/${libName}.rs ]]; then
+       build_lib src/${libName}.rs
+    fi
+
+    echo "$EXTRA_LINK_SEARCH" | while read i; do
+       if [[ ! -z "$i" ]]; then
+         for lib in $i; do
+           echo "-L $lib" >> target/link
+           L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")
+           echo "-L $L" >> target/link.final
+         done
+       fi
+    done
+    echo "$EXTRA_LINK" | while read i; do
+       if [[ ! -z "$i" ]]; then
+         for lib in $i; do
+           echo "-l $lib" >> target/link
+           echo "-l $lib" >> target/link.final
+         done
+       fi
+    done
+
+    if [[ -e target/link ]]; then
+       sort -u target/link.final > target/link.final.sorted
+       mv target/link.final.sorted target/link.final
+       sort -u target/link > target/link.sorted
+       mv target/link.sorted target/link
+
+       tr '\n' ' ' < target/link > target/link_
+       LINK=$(cat target/link_)
+    fi
+
+    mkdir -p target/bin
+    printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
+      # filter empty entries / empty "lines"
+      if [[ -z "$BIN_NAME" ]]; then
+           continue
+      fi
+
+      if [[ -z "$BIN_PATH" ]]; then
+        # heuristic to "guess" the correct source file as found in cargo:
+        # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325
+
+        # the first two cases are the "new" default IIRC
+        BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
+        FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs"
+
+        if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
+          # if this is not a library the following path is also valid
+          FILES="src/$BIN_NAME_.rs $FILES"
+        fi
+
+        echo $FILES
+        for file in $FILES;
+        do
+          echo "checking file $file"
+          # first file that exists wins
+          if [[ -e "$file" ]]; then
+                  BIN_PATH="$file"
+                  break
+          fi
+        done
+
+        if [[ -z "$BIN_PATH" ]]; then
+          echo "failed to find file for binary target: $BIN_NAME" >&2
+          exit 1
+        fi
+      fi
+      build_bin $BIN_NAME $BIN_PATH
+    done
+
+
+    ${lib.optionalString (crateBin == "") ''
+      if [[ -e src/main.rs ]]; then
+        build_bin ${crateName} src/main.rs
+      fi
+      for i in src/bin/*.rs; do #*/
+        build_bin "$(basename $i .rs)" "$i"
+      done
+    ''}
+    # Remove object files to avoid "wrong ELF type"
+    find target -type f -name "*.o" -print0 | xargs -0 rm -f
+  '' + finalBins + ''
+    runHook postBuild
+  ''

From 137181506065ebb0cfd218d696b13a1ea7642b41 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 7 Sep 2018 15:08:06 +0200
Subject: [PATCH 0957/3253] buildRustCrate: extracted builder scripts into
 dedicated files

The build expression got quiet large over time and to make it a bit
easier to grasp the different scripts involved in the build are now
separated from the nix file.
---
 pkgs/build-support/rust/build-rust-crate.nix  | 494 ------------------
 .../rust/build-rust-crate/configure-crate.nix | 129 +++++
 .../rust/build-rust-crate/default.nix         | 186 +++++++
 .../rust/build-rust-crate/install-crate.nix   |  28 +
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 344 insertions(+), 495 deletions(-)
 delete mode 100644 pkgs/build-support/rust/build-rust-crate.nix
 create mode 100644 pkgs/build-support/rust/build-rust-crate/configure-crate.nix
 create mode 100644 pkgs/build-support/rust/build-rust-crate/default.nix
 create mode 100644 pkgs/build-support/rust/build-rust-crate/install-crate.nix

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
deleted file mode 100644
index cfdf38958a8d..000000000000
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ /dev/null
@@ -1,494 +0,0 @@
-# Code for buildRustCrate, a Nix function that builds Rust code, just
-# like Cargo, but using Nix instead.
-#
-# This can be useful for deploying packages with NixOps, and to share
-# binary dependencies between projects.
-
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc  }:
-
-let makeDeps = dependencies:
-      (lib.concatMapStringsSep " " (dep:
-        let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
-        (if dep.crateType == "lib" then
-           " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
-         else
-           " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
-      ) dependencies);
-
-    # This doesn't appear to be officially documented anywhere yet.
-    # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
-    target_os = if stdenv.hostPlatform.isDarwin
-      then "macos"
-      else stdenv.hostPlatform.parsed.kernel.name;
-
-    echo_build_heading = colors: ''
-      echo_build_heading() {
-       start=""
-       end=""
-       if [[ "${colors}" == "always" ]]; then
-         start="$(printf '\033[0;1;32m')" #set bold, and set green.
-         end="$(printf '\033[0m')" #returns to "normal"
-       fi
-       if (( $# == 1 )); then
-         echo "$start""Building $1""$end"
-       else
-         echo "$start""Building $1 ($2)""$end"
-       fi
-      }
-    '';
-    noisily = colors: verbose: ''
-      noisily() {
-        start=""
-        end=""
-        if [[ "${colors}" == "always" ]]; then
-          start="$(printf '\033[0;1;32m')" #set bold, and set green.
-          end="$(printf '\033[0m')" #returns to "normal"
-        fi
-	${lib.optionalString verbose ''
-            echo -n "$start"Running "$end"
-            echo $@
-	''}
-	$@
-      }
-    '';
-
-    configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, workspace_member, extraLinkFlags }:
-      let version_ = lib.splitString "-" crateVersion;
-          versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
-          version = lib.splitString "." (lib.head version_);
-          rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");
-          buildDeps = makeDeps buildDependencies;
-          authors = lib.concatStringsSep ":" crateAuthors;
-          optLevel = if release then 3 else 0;
-          completeDepsDir = lib.concatStringsSep " " completeDeps;
-          completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
-      in ''
-      cd ${workspace_member}
-      runHook preConfigure
-      ${echo_build_heading colors}
-      ${noisily colors verbose}
-      symlink_dependency() {
-        # $1 is the nix-store path of a dependency
-        # $2 is the target path
-        i=$1
-        ln -s -f $i/lib/*.rlib $2 #*/
-        ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/
-        if [ -e "$i/lib/link" ]; then
-            cat $i/lib/link >> target/link
-            cat $i/lib/link >> target/link.final
-        fi
-        if [ -e $i/env ]; then
-            source $i/env
-        fi
-      }
-
-      mkdir -p target/{deps,lib,build,buildDeps}
-      chmod uga+w target -R
-      echo ${extraLinkFlags} > target/link
-      echo ${extraLinkFlags} > target/link.final
-      for i in ${completeDepsDir}; do
-        symlink_dependency $i target/deps
-      done
-      for i in ${completeBuildDepsDir}; do
-         symlink_dependency $i target/buildDeps
-      done
-      if [[ -e target/link ]]; then
-        sort -u target/link > target/link.sorted
-        mv target/link.sorted target/link
-        sort -u target/link.final > target/link.final.sorted
-        mv target/link.final.sorted target/link.final
-        tr '\n' ' ' < target/link > target/link_
-      fi
-      EXTRA_BUILD=""
-      BUILD_OUT_DIR=""
-      export CARGO_PKG_NAME=${crateName}
-      export CARGO_PKG_VERSION=${crateVersion}
-      export CARGO_PKG_AUTHORS="${authors}"
-
-      export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}
-      export CARGO_CFG_TARGET_OS=${target_os}
-      export CARGO_CFG_TARGET_FAMILY="unix"
-      export CARGO_CFG_UNIX=1
-      export CARGO_CFG_TARGET_ENV="gnu"
-      export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}
-      export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits}
-      export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name}
-
-      export CARGO_MANIFEST_DIR="."
-      export DEBUG="${toString (!release)}"
-      export OPT_LEVEL="${toString optLevel}"
-      export TARGET="${stdenv.hostPlatform.config}"
-      export HOST="${stdenv.hostPlatform.config}"
-      export PROFILE=${if release then "release" else "debug"}
-      export OUT_DIR=$(pwd)/target/build/${crateName}.out
-      export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
-      export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
-      export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
-      if [[ -n "${versionPre}" ]]; then
-        export CARGO_PKG_VERSION_PRE="${versionPre}"
-      fi
-
-      BUILD=""
-      if [[ ! -z "${build}" ]] ; then
-         BUILD=${build}
-      elif [[ -e "build.rs" ]]; then
-         BUILD="build.rs"
-      fi
-      if [[ ! -z "$BUILD" ]] ; then
-         echo_build_heading "$BUILD" ${libName}
-         mkdir -p target/build/${crateName}
-         EXTRA_BUILD_FLAGS=""
-         if [ -e target/link_ ]; then
-           EXTRA_BUILD_FLAGS=$(cat target/link_)
-         fi
-         if [ -e target/link.build ]; then
-           EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"
-         fi
-         noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
-           ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
-           -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
-
-         mkdir -p target/build/${crateName}.out
-         export RUST_BACKTRACE=1
-         BUILD_OUT_DIR="-L $OUT_DIR"
-         mkdir -p $OUT_DIR
-         target/build/${crateName}/build_script_build > target/build/${crateName}.opt
-         set +e
-         EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
-         EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
-         EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
-         EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
-
-         for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
-           export $env
-         done
-
-         CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
-         grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
-           | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
-
-         set -e
-         if [[ -n "$(ls target/build/${crateName}.out)" ]]; then
-
-            if [[ -e "${libPath}" ]]; then
-               cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/
-            else
-               cp -r target/build/${crateName}.out/* src #*/
-            fi
-         fi
-      fi
-      runHook postConfigure
-    '';
-
-    buildCrate = { crateName,
-                   dependencies,
-                   crateFeatures, libName, release, libPath,
-                   crateType, metadata, crateBin, finalBins,
-                   extraRustcOpts, verbose, colors }:
-
-      let deps = makeDeps dependencies;
-          rustcOpts =
-            lib.lists.foldl' (opts: opt: opts + " " + opt)
-              (if release then "-C opt-level=3" else "-C debuginfo=2")
-              (["-C codegen-units=1"] ++ extraRustcOpts);
-          rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
-      in ''
-      runHook preBuild
-      norm=""
-      bold=""
-      green=""
-      boldgreen=""
-      if [[ "${colors}" == "always" ]]; then
-        norm="$(printf '\033[0m')" #returns to "normal"
-        bold="$(printf '\033[0;1m')" #set bold
-        green="$(printf '\033[0;32m')" #set green
-        boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green.
-      fi
-      ${echo_build_heading colors}
-      ${noisily colors verbose}
-
-      build_lib() {
-         lib_src=$1
-         echo_build_heading $lib_src ${libName}
-
-         noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \
-           ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \
-           --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \
-           $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
-
-         EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib"
-         if [ -e target/deps/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary} ]; then
-            EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"
-         fi
-      }
-
-      build_bin() {
-        crate_name=$1
-        crate_name_=$(echo $crate_name | sed -e "s/-/_/g")
-        main_file=""
-        if [[ ! -z $2 ]]; then
-          main_file=$2
-        fi
-        echo_build_heading $@
-        noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\
-          ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \
-          $LINK ${deps}$EXTRA_LIB --cap-lints allow \
-          $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors}
-        if [ "$crate_name_" != "$crate_name" ]; then
-          mv target/bin/$crate_name_ target/bin/$crate_name
-        fi
-      }
-
-
-      EXTRA_LIB=""
-      CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g")
-
-      if [[ -e target/link_ ]]; then
-        EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD"
-      fi
-
-      if [[ -e "${libPath}" ]]; then
-         build_lib ${libPath}
-      elif [[ -e src/lib.rs ]]; then
-         build_lib src/lib.rs
-      elif [[ -e src/${libName}.rs ]]; then
-         build_lib src/${libName}.rs
-      fi
-
-      echo "$EXTRA_LINK_SEARCH" | while read i; do
-         if [[ ! -z "$i" ]]; then
-           for lib in $i; do
-             echo "-L $lib" >> target/link
-             L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")
-             echo "-L $L" >> target/link.final
-           done
-         fi
-      done
-      echo "$EXTRA_LINK" | while read i; do
-         if [[ ! -z "$i" ]]; then
-           for lib in $i; do
-             echo "-l $lib" >> target/link
-             echo "-l $lib" >> target/link.final
-           done
-         fi
-      done
-
-      if [[ -e target/link ]]; then
-         sort -u target/link.final > target/link.final.sorted
-         mv target/link.final.sorted target/link.final
-         sort -u target/link > target/link.sorted
-         mv target/link.sorted target/link
-
-         tr '\n' ' ' < target/link > target/link_
-         LINK=$(cat target/link_)
-      fi
-
-      mkdir -p target/bin
-      printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do
-        # filter empty entries / empty "lines"
-        if [[ -z "$BIN_NAME" ]]; then
-             continue
-        fi
-
-        if [[ -z "$BIN_PATH" ]]; then
-          # heuristic to "guess" the correct source file as found in cargo:
-          # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325
-
-          # the first two cases are the "new" default IIRC
-          BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
-          FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs"
-
-          if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
-            # if this is not a library the following path is also valid
-            FILES="src/$BIN_NAME_.rs $FILES"
-          fi
-
-          echo $FILES
-          for file in $FILES;
-          do
-            echo "checking file $file"
-            # first file that exists wins
-            if [[ -e "$file" ]]; then
-                    BIN_PATH="$file"
-                    break
-            fi
-          done
-
-          if [[ -z "$BIN_PATH" ]]; then
-            echo "failed to find file for binary target: $BIN_NAME" >&2
-            exit 1
-          fi
-        fi
-        build_bin $BIN_NAME $BIN_PATH
-      done
-
-
-      ${lib.optionalString (crateBin == "") ''
-        if [[ -e src/main.rs ]]; then
-          build_bin ${crateName} src/main.rs
-        fi
-        for i in src/bin/*.rs; do #*/
-          build_bin "$(basename $i .rs)" "$i"
-        done
-      ''}
-      # Remove object files to avoid "wrong ELF type"
-      find target -type f -name "*.o" -print0 | xargs -0 rm -f
-    '' + finalBins + ''
-      runHook postBuild
-    '';
-
-    installCrate = crateName: metadata: ''
-      runHook preInstall
-      mkdir -p $out
-      if [[ -s target/env ]]; then
-        cp target/env $out/env
-      fi
-      if [[ -s target/link.final ]]; then
-        mkdir -p $out/lib
-        cp target/link.final $out/lib/link
-      fi
-      if [[ "$(ls -A target/lib)" ]]; then
-        mkdir -p $out/lib
-        cp target/lib/* $out/lib #*/
-        for lib in $out/lib/*.so $out/lib/*.dylib; do #*/
-          ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")
-        done
-      fi
-      if [[ "$(ls -A target/build)" ]]; then # */
-        mkdir -p $out/lib
-        cp -r target/build/* $out/lib # */
-      fi
-      if [[ "$(ls -A target/bin)" ]]; then
-        mkdir -p $out/bin
-        cp -P target/bin/* $out/bin # */
-      fi
-      runHook postInstall
-    '';
-in
-
-crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
-  dependencies, buildDependencies,
-  extraRustcOpts,
-  preUnpack, postUnpack, prePatch, patches, postPatch,
-  preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
-
-let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
-    dependencies_ = dependencies;
-    buildDependencies_ = buildDependencies;
-    processedAttrs = [
-      "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
-      "buildDependencies" "dependencies" "features"
-      "crateName" "version" "build" "authors" "colors"
-    ];
-    extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
-    buildInputs_ = buildInputs;
-in
-stdenv.mkDerivation (rec {
-
-    inherit (crate) crateName;
-    inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;
-
-    src = if lib.hasAttr "src" crate then
-        crate.src
-      else
-        fetchCrate { inherit (crate) crateName version sha256; };
-    name = "rust_${crate.crateName}-${crate.version}";
-    buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
-    dependencies =
-      builtins.map
-        (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
-        dependencies_;
-
-    buildDependencies =
-      builtins.map
-        (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
-        buildDependencies_;
-
-    completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);
-    completeBuildDeps = lib.lists.unique (
-      buildDependencies
-      ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies
-    );
-
-    crateFeatures = if crate ? features then
-        lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
-      else "";
-
-    libName = if crate ? libName then crate.libName else crate.crateName;
-    libPath = if crate ? libPath then crate.libPath else "";
-
-    depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies);
-    metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));
-
-    crateBin = if crate ? crateBin then
-       builtins.foldl' (bins: bin: let
-            _name = (if bin ? name then bin.name else crateName);
-            name = lib.strings.replaceStrings ["-"] ["_"] _name;
-            path = if bin ? path then bin.path else "";
-          in
-          bins + (if bin == "" then "" else ",") + "${name} ${path}"
-
-       ) "" crate.crateBin
-    else "";
-
-    finalBins = if crate ? crateBin then
-       builtins.foldl' (bins: bin:
-          let name = lib.strings.replaceStrings ["-"] ["_"]
-                      (if bin ? name then bin.name else crateName);
-              new_name = if bin ? name then bin.name else crateName;
-          in
-          if name == new_name then bins else
-          (bins + "mv target/bin/${name} target/bin/${new_name};")
-
-       ) "" crate.crateBin
-    else "";
-
-    build = crate.build or "";
-    workspace_member = crate.workspace_member or ".";
-    crateVersion = crate.version;
-    crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
-    crateType =
-      if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
-      if lib.attrByPath ["plugin"] false crate then "dylib" else
-      (crate.type or "lib");
-    colors = lib.attrByPath [ "colors" ] "always" crate;
-    extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
-    configurePhase = configureCrate {
-      inherit crateName buildDependencies completeDeps completeBuildDeps
-              crateFeatures libName build workspace_member release libPath crateVersion
-              extraLinkFlags
-              crateAuthors verbose colors;
-    };
-    extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
-    buildPhase = buildCrate {
-      inherit crateName dependencies
-              crateFeatures libName release libPath crateType
-              metadata crateBin finalBins verbose colors
-              extraRustcOpts;
-    };
-    installPhase = installCrate crateName metadata;
-
-} // extraDerivationAttrs
-)) {
-  rust = rustc;
-  release = crate_.release or true;
-  verbose = crate_.verbose or true;
-  extraRustcOpts = [];
-  features = [];
-  buildInputs = [];
-  crateOverrides = defaultCrateOverrides;
-  preUnpack = crate_.preUnpack or "";
-  postUnpack = crate_.postUnpack or "";
-  prePatch = crate_.prePatch or "";
-  patches = crate_.patches or [];
-  postPatch = crate_.postPatch or "";
-  preConfigure = crate_.preConfigure or "";
-  postConfigure = crate_.postConfigure or "";
-  preBuild = crate_.preBuild or "";
-  postBuild = crate_.postBuild or "";
-  preInstall = crate_.preInstall or "";
-  postInstall = crate_.postInstall or "";
-  dependencies = crate_.dependencies or [];
-  buildDependencies = crate_.buildDependencies or [];
-}
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
new file mode 100644
index 000000000000..37fef2abd774
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -0,0 +1,129 @@
+{ lib, stdenv, echo_build_heading, noisily, makeDeps }:
+{ build, buildDependencies, colors, completeBuildDeps, completeDeps, crateAuthors, crateFeatures, crateName, crateVersion, extraLinkFlags, libName, libPath, release, target_os, verbose, workspace_member }:
+let version_ = lib.splitString "-" crateVersion;
+    versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
+    version = lib.splitString "." (lib.head version_);
+    rustcOpts = (if release then "-C opt-level=3" else "-C debuginfo=2");
+    buildDeps = makeDeps buildDependencies;
+    authors = lib.concatStringsSep ":" crateAuthors;
+    optLevel = if release then 3 else 0;
+    completeDepsDir = lib.concatStringsSep " " completeDeps;
+    completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
+in ''
+  cd ${workspace_member}
+  runHook preConfigure
+  ${echo_build_heading colors}
+  ${noisily colors verbose}
+  symlink_dependency() {
+    # $1 is the nix-store path of a dependency
+    # $2 is the target path
+    i=$1
+    ln -s -f $i/lib/*.rlib $2 #*/
+    ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/
+    if [ -e "$i/lib/link" ]; then
+        cat $i/lib/link >> target/link
+        cat $i/lib/link >> target/link.final
+    fi
+    if [ -e $i/env ]; then
+        source $i/env
+    fi
+  }
+
+  mkdir -p target/{deps,lib,build,buildDeps}
+  chmod uga+w target -R
+  echo ${extraLinkFlags} > target/link
+  echo ${extraLinkFlags} > target/link.final
+  for i in ${completeDepsDir}; do
+    symlink_dependency $i target/deps
+  done
+  for i in ${completeBuildDepsDir}; do
+     symlink_dependency $i target/buildDeps
+  done
+  if [[ -e target/link ]]; then
+    sort -u target/link > target/link.sorted
+    mv target/link.sorted target/link
+    sort -u target/link.final > target/link.final.sorted
+    mv target/link.final.sorted target/link.final
+    tr '\n' ' ' < target/link > target/link_
+  fi
+  EXTRA_BUILD=""
+  BUILD_OUT_DIR=""
+  export CARGO_PKG_NAME=${crateName}
+  export CARGO_PKG_VERSION=${crateVersion}
+  export CARGO_PKG_AUTHORS="${authors}"
+
+  export CARGO_CFG_TARGET_ARCH=${stdenv.hostPlatform.parsed.cpu.name}
+  export CARGO_CFG_TARGET_OS=${target_os}
+  export CARGO_CFG_TARGET_FAMILY="unix"
+  export CARGO_CFG_UNIX=1
+  export CARGO_CFG_TARGET_ENV="gnu"
+  export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"}
+  export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits}
+  export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name}
+
+  export CARGO_MANIFEST_DIR="."
+  export DEBUG="${toString (!release)}"
+  export OPT_LEVEL="${toString optLevel}"
+  export TARGET="${stdenv.hostPlatform.config}"
+  export HOST="${stdenv.hostPlatform.config}"
+  export PROFILE=${if release then "release" else "debug"}
+  export OUT_DIR=$(pwd)/target/build/${crateName}.out
+  export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0}
+  export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1}
+  export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2}
+  if [[ -n "${versionPre}" ]]; then
+    export CARGO_PKG_VERSION_PRE="${versionPre}"
+  fi
+
+  BUILD=""
+  if [[ ! -z "${build}" ]] ; then
+     BUILD=${build}
+  elif [[ -e "build.rs" ]]; then
+     BUILD="build.rs"
+  fi
+  if [[ ! -z "$BUILD" ]] ; then
+     echo_build_heading "$BUILD" ${libName}
+     mkdir -p target/build/${crateName}
+     EXTRA_BUILD_FLAGS=""
+     if [ -e target/link_ ]; then
+       EXTRA_BUILD_FLAGS=$(cat target/link_)
+     fi
+     if [ -e target/link.build ]; then
+       EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"
+     fi
+     noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
+       ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
+       -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors}
+
+     mkdir -p target/build/${crateName}.out
+     export RUST_BACKTRACE=1
+     BUILD_OUT_DIR="-L $OUT_DIR"
+     mkdir -p $OUT_DIR
+     target/build/${crateName}/build_script_build > target/build/${crateName}.opt
+     set +e
+     EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+     EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
+     EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+     EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+
+     for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
+       export $env
+     done
+
+     CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/")
+     grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \
+       | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env
+
+     set -e
+     if [[ -n "$(ls target/build/${crateName}.out)" ]]; then
+
+        if [[ -e "${libPath}" ]]; then
+           cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/
+        else
+           cp -r target/build/${crateName}.out/* src #*/
+        fi
+     fi
+  fi
+  runHook postConfigure
+''
+
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
new file mode 100644
index 000000000000..db7f72acfb99
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -0,0 +1,186 @@
+# Code for buildRustCrate, a Nix function that builds Rust code, just
+# like Cargo, but using Nix instead.
+#
+# This can be useful for deploying packages with NixOps, and to share
+# binary dependencies between projects.
+
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc  }:
+
+let
+    # This doesn't appear to be officially documented anywhere yet.
+    # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
+    target_os = if stdenv.hostPlatform.isDarwin
+      then "macos"
+      else stdenv.hostPlatform.parsed.kernel.name;
+
+    makeDeps = dependencies:
+      (lib.concatMapStringsSep " " (dep:
+        let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in
+        (if dep.crateType == "lib" then
+           " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
+         else
+           " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
+      ) dependencies);
+
+    echo_build_heading = colors: ''
+      echo_build_heading() {
+       start=""
+       end=""
+       if [[ "${colors}" == "always" ]]; then
+         start="$(printf '\033[0;1;32m')" #set bold, and set green.
+         end="$(printf '\033[0m')" #returns to "normal"
+       fi
+       if (( $# == 1 )); then
+         echo "$start""Building $1""$end"
+       else
+         echo "$start""Building $1 ($2)""$end"
+       fi
+      }
+    '';
+    noisily = colors: verbose: ''
+      noisily() {
+        start=""
+        end=""
+        if [[ "${colors}" == "always" ]]; then
+          start="$(printf '\033[0;1;32m')" #set bold, and set green.
+          end="$(printf '\033[0m')" #returns to "normal"
+        fi
+	${lib.optionalString verbose ''
+            echo -n "$start"Running "$end"
+            echo $@
+	''}
+	$@
+      }
+    '';
+
+    configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
+    buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
+    installCrate = import ./install-crate.nix;
+
+    in
+
+crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides,
+  dependencies, buildDependencies,
+  extraRustcOpts,
+  preUnpack, postUnpack, prePatch, patches, postPatch,
+  preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }:
+
+let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverrides crate_);
+    dependencies_ = dependencies;
+    buildDependencies_ = buildDependencies;
+    processedAttrs = [
+      "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
+      "buildDependencies" "dependencies" "features"
+      "crateName" "version" "build" "authors" "colors"
+    ];
+    extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate;
+    buildInputs_ = buildInputs;
+in
+stdenv.mkDerivation (rec {
+
+    inherit (crate) crateName;
+    inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall;
+
+    src = if lib.hasAttr "src" crate then
+        crate.src
+      else
+        fetchCrate { inherit (crate) crateName version sha256; };
+    name = "rust_${crate.crateName}-${crate.version}";
+    buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_;
+    dependencies =
+      builtins.map
+        (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+        dependencies_;
+
+    buildDependencies =
+      builtins.map
+        (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+        buildDependencies_;
+
+    completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);
+    completeBuildDeps = lib.lists.unique (
+      buildDependencies
+      ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies
+    );
+
+    crateFeatures = if crate ? features then
+        lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #"
+      else "";
+
+    libName = if crate ? libName then crate.libName else crate.crateName;
+    libPath = if crate ? libPath then crate.libPath else "";
+
+    depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies);
+    metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata ));
+
+    crateBin = if crate ? crateBin then
+       builtins.foldl' (bins: bin: let
+            _name = (if bin ? name then bin.name else crateName);
+            name = lib.strings.replaceStrings ["-"] ["_"] _name;
+            path = if bin ? path then bin.path else "";
+          in
+          bins + (if bin == "" then "" else ",") + "${name} ${path}"
+
+       ) "" crate.crateBin
+    else "";
+
+    finalBins = if crate ? crateBin then
+       builtins.foldl' (bins: bin:
+          let name = lib.strings.replaceStrings ["-"] ["_"]
+                      (if bin ? name then bin.name else crateName);
+              new_name = if bin ? name then bin.name else crateName;
+          in
+          if name == new_name then bins else
+          (bins + "mv target/bin/${name} target/bin/${new_name};")
+
+       ) "" crate.crateBin
+    else "";
+
+    build = crate.build or "";
+    workspace_member = crate.workspace_member or ".";
+    crateVersion = crate.version;
+    crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [];
+    crateType =
+      if lib.attrByPath ["procMacro"] false crate then "proc-macro" else
+      if lib.attrByPath ["plugin"] false crate then "dylib" else
+      (crate.type or "lib");
+    colors = lib.attrByPath [ "colors" ] "always" crate;
+    extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
+    configurePhase = configureCrate {
+      inherit crateName buildDependencies completeDeps completeBuildDeps
+              crateFeatures libName build workspace_member release libPath crateVersion
+              extraLinkFlags
+              crateAuthors verbose colors target_os;
+    };
+    extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];
+    buildPhase = buildCrate {
+      inherit crateName dependencies
+              crateFeatures libName release libPath crateType
+              metadata crateBin finalBins verbose colors
+              extraRustcOpts;
+    };
+    installPhase = installCrate crateName metadata;
+
+} // extraDerivationAttrs
+)) {
+  rust = rustc;
+  release = crate_.release or true;
+  verbose = crate_.verbose or true;
+  extraRustcOpts = [];
+  features = [];
+  buildInputs = [];
+  crateOverrides = defaultCrateOverrides;
+  preUnpack = crate_.preUnpack or "";
+  postUnpack = crate_.postUnpack or "";
+  prePatch = crate_.prePatch or "";
+  patches = crate_.patches or [];
+  postPatch = crate_.postPatch or "";
+  preConfigure = crate_.preConfigure or "";
+  postConfigure = crate_.postConfigure or "";
+  preBuild = crate_.preBuild or "";
+  postBuild = crate_.postBuild or "";
+  preInstall = crate_.preInstall or "";
+  postInstall = crate_.postInstall or "";
+  dependencies = crate_.dependencies or [];
+  buildDependencies = crate_.buildDependencies or [];
+}
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
new file mode 100644
index 000000000000..c41df34ca39b
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -0,0 +1,28 @@
+crateName: metadata:
+''
+  runHook preInstall
+  mkdir -p $out
+  if [[ -s target/env ]]; then
+    cp target/env $out/env
+  fi
+  if [[ -s target/link.final ]]; then
+    mkdir -p $out/lib
+    cp target/link.final $out/lib/link
+  fi
+  if [[ "$(ls -A target/lib)" ]]; then
+    mkdir -p $out/lib
+    cp target/lib/* $out/lib #*/
+    for lib in $out/lib/*.so $out/lib/*.dylib; do #*/
+      ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")
+    done
+  fi
+  if [[ "$(ls -A target/build)" ]]; then # */
+    mkdir -p $out/lib
+    cp -r target/build/* $out/lib # */
+  fi
+  if [[ "$(ls -A target/bin)" ]]; then
+    mkdir -p $out/bin
+    cp -P target/bin/* $out/bin # */
+  fi
+  runHook postInstall
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b77806ddec69..784a271845ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7177,7 +7177,7 @@ with pkgs;
     });
   inherit (rust) cargo rustc;
 
-  buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { };
+  buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
 
   cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 

From fdc2017f1c6de20148bc5d7a204ca6021c026ee5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 8 Sep 2018 23:02:06 +0200
Subject: [PATCH 0958/3253] buildRustCrate: binary heuristic should be able to
 treat spaces

---
 pkgs/build-support/rust/build-rust-crate/build-crate.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 748d48edefc2..bd9d96d96cd6 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -117,15 +117,14 @@
 
         # the first two cases are the "new" default IIRC
         BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
-        FILES="src/bin/$BIN_NAME_.rs src/bin/$BIN_NAME_/main.rs src/bin/main.rs src/main.rs"
+        FILES=( "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" )
 
         if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
           # if this is not a library the following path is also valid
-          FILES="src/$BIN_NAME_.rs $FILES"
+          FILES=( "src/$BIN_NAME_.rs" "''${FILES[@]}" )
         fi
 
-        echo $FILES
-        for file in $FILES;
+        for file in "''${FILES[@]}";
         do
           echo "checking file $file"
           # first file that exists wins
@@ -140,7 +139,7 @@
           exit 1
         fi
       fi
-      build_bin $BIN_NAME $BIN_PATH
+      build_bin "$BIN_NAME" "$BIN_PATH"
     done
 
 

From 0f95d05548171ba14c4424c735f05633edccd1a9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 9 Sep 2018 09:21:51 +0200
Subject: [PATCH 0959/3253] buildRustCrate: add test cases

---
 .../rust/build-rust-crate/test/default.nix    | 81 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/build-support/rust/build-rust-crate/test/default.nix

diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
new file mode 100644
index 000000000000..e5e77c93555d
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -0,0 +1,81 @@
+{ lib, stdenv, buildRustCrate, runCommand, writeTextFile, symlinkJoin }:
+let
+  mkCrate = args: let
+      p = {
+        crateName = "nixtestcrate";
+        version = "0.1.0";
+        authors = [ "Test <test@example.com>" ];
+      } // args;
+    in buildRustCrate p;
+
+    mkFile = destination: text: writeTextFile {
+      name = "src";
+      destination = "/${destination}";
+      inherit text;
+  };
+
+  mkBin = name: mkFile name ''
+    use std::env;
+    fn main() {
+      let name: String = env::args().nth(0).unwrap();
+      println!("executed {}", name);
+    }
+  '';
+
+  mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }";
+
+  mkTest = crateArgs: let
+    crate = mkCrate crateArgs;
+    binaries = map (v: ''"${v.name}"'') (crateArgs.crateBin or []);
+    isLib = crateArgs ? libName || crateArgs ? libPath;
+    crateName = crateArgs.crateName or "nixtestcrate";
+    libName = crateArgs.libName or crateName;
+
+    libTestBinary = if !isLib then null else mkCrate {
+      crateName = "run-test-${crateName}";
+      dependencies = [ crate ];
+      src = mkFile "src/main.rs" ''
+        extern crate ${libName};
+        fn main() {
+          assert_eq!(${libName}::test(), 23);
+        }
+      '';
+    };
+
+    in runCommand "run-buildRustCrate-${crateName}-test" {
+      nativeBuildInputs = [ crate ];
+    } ''
+      ${lib.concatStringsSep "\n" binaries}
+      ${lib.optionalString isLib ''
+          test -e ${crate}/lib/*.rlib || exit 1
+          ${libTestBinary}/bin/run-test-${crateName}
+      ''}
+      touch $out
+  '';
+  in rec {
+
+  tests = let
+    cases = {
+      libPath =  { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; };
+      srcLib =  { src = mkLib "src/lib.rs"; };
+      customLibName =  { libName = "test_lib"; src = mkLib "src/test_lib.rs"; };
+      customLibNameAndLibPath =  { libName = "test_lib"; libPath = "src/best-lib.rs"; src = mkLib "src/best-lib.rs"; };
+      crateBinWithPath =  { crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; src = mkBin "src/foobar.rs"; };
+      crateBinNoPath1 =  { crateBin = [{ name = "my-binary2"; }]; src = mkBin "src/my_binary2.rs"; };
+      crateBinNoPath2 =  {
+        crateBin = [{ name = "my-binary3"; } { name = "my-binary4"; }];
+        src = symlinkJoin {
+          name = "buildRustCrateMultipleBinariesCase";
+          paths = [ (mkBin "src/bin/my_binary3.rs") (mkBin "src/bin/my_binary4.rs") ];
+        };
+      };
+      crateBinNoPath3 =  { crateBin = [{ name = "my-binary5"; }]; src = mkBin "src/bin/main.rs"; };
+      crateBinNoPath4 =  { crateBin = [{ name = "my-binary6"; }]; src = mkBin "src/main.rs";};
+    };
+  in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
+  test = runCommand "run-buildRustCrate-tests" {
+    nativeBuildInputs = builtins.attrValues tests;
+  } "
+    touch $out
+  ";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 784a271845ae..1823fa7a12fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7178,6 +7178,7 @@ with pkgs;
   inherit (rust) cargo rustc;
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
+  buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests;
 
   cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 

From 3c2a74719a8877b9129568335c14c4bb8b0eba27 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:02:17 -0400
Subject: [PATCH 0960/3253] parmetis: init at 4.0.3 (#46615)

---
 .../science/math/parmetis/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/parmetis/default.nix

diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
new file mode 100644
index 000000000000..6091031a115a
--- /dev/null
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchurl
+, cmake
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+  name = "parmetis-${version}";
+  version = "4.0.3";
+
+  src = fetchurl {
+    url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-${version}.tar.gz";
+    sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj";
+  };
+
+  buildInputs = [ cmake mpi ];
+
+  # metis and GKlib are packaged with distribution
+  # AUR https://aur.archlinux.org/packages/parmetis/ has reported that
+  # it easier to build with the included packages as opposed to using the metis
+  # package. Compilation time is short.
+  configurePhase = ''
+    make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
+    homepage = http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview;
+    platforms = platforms.all;
+    license = licenses.cc-by-nc-sa-20;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b77806ddec69..e29c2db3577c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20839,6 +20839,10 @@ with pkgs;
 
   petsc = callPackage ../development/libraries/science/math/petsc { };
 
+  parmetis = callPackage ../development/libraries/science/math/parmetis {
+    mpi = openmpi;
+  };
+
   scs = callPackage ../development/libraries/science/math/scs {
     liblapack = liblapackWithoutAtlas;
   };

From 21324ef0e493dc0713bc3c83ea6e9b456c01810b Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 13 Sep 2018 20:45:45 +0200
Subject: [PATCH 0961/3253] prometheus-dovecot-exporter: 0.1.1 -> 0.1.3

---
 .../prometheus/dovecot-exporter-deps.nix      | 33 ++++++++++++-------
 .../prometheus/dovecot-exporter.nix           |  4 +--
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
index c2dea18ee815..d94aad821485 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
@@ -23,8 +23,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "4aa4cc277ae58d2fab6cfe51dd17df5dceaf457d";
+      sha256 = "009z6rpivyakgsxs0zkm94c9i7l65hcw2ljvah94wq3y6v6j47gs";
     };
   }
   {
@@ -32,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175";
-      sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4";
+      rev = "0f2620f554cf5c8e281a2eb655a035f5a0f6dc90";
+      sha256 = "0lxngq1a8cnsy6dlr6gi8pjv3fir2wiw76qh075pa9g02h7ywhv3";
     };
   }
   {
@@ -50,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "c3324c1198cf3374996e9d3098edd46a6b55afc9";
-      sha256 = "19qcz5bpzj5kqyhmbq5kxr8nrqqlszazzq6w0wldis1yk1wwww00";
+      rev = "b5bfa0eb2c8d46bd91dc58271e973c5f0bbebcfa";
+      sha256 = "1msxzkdgi0ing4ddmp0s4qrf267n6ylafw9mbz5yrr7spb1dgxgk";
     };
   }
   {
@@ -59,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
-      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+      rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
+      sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
     };
   }
   {
@@ -68,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
-      sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
+      rev = "c7de2306084e37d54b8be01f3541a8464345e9a5";
+      sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "54d17b57dd7d4a3aa092476596b3f8a933bde349";
-      sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
+      rev = "05ee40e3a273f7245e8777337fc7b46e533a9a92";
+      sha256 = "0f6fnczxa42b9rys2h3l0m8fy3x5hrhaq707vq0lbx5fcylw8lis";
     };
   }
   {
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
index 86f43116f746..5a3fd23ec22e 100644
--- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "dovecot_exporter-${version}";
-  version = "0.1.1";
+  version = "0.1.3";
 
   goPackagePath = "github.com/kumina/dovecot_exporter";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "kumina";
     repo = "dovecot_exporter";
     rev = version;
-    sha256 = "0i7nfgkb5jqdbgr16i29jdsvh69dx9qgn6nazpw78k0lgy7mpidn";
+    sha256 = "1lnxnnm45fhcyv40arcvpiiibwdnxdwhkf8sbjpifx1wspvphcj9";
   };
 
   goDeps = ./dovecot-exporter-deps.nix;

From 035b2f5250fc71e77aaf8a8a15917338cbb88571 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Sep 2018 12:09:08 -0700
Subject: [PATCH 0962/3253] google-compute-engine: 20180129 -> 20180510
 (#46278)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
google-compute-engine
---
 pkgs/tools/virtualization/google-compute-engine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index e987bc7986b1..bfa8217b9a09 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonApplication rec {
   name = "google-compute-engine-${version}";
-  version = "20180129";
+  version = "20180510";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "0380fnr64109hv8l1f3sgdg8a5mf020axj7jh8y25xq6wzkjm20c";
+    sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p";
   };
 
   postPatch = ''

From 79d91454693c4f79a754e5ea1946ea549e00c8af Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 13 Sep 2018 21:10:40 +0200
Subject: [PATCH 0963/3253] parmetis: set license to unfree

generic unfree license fits best
---
 pkgs/development/libraries/science/math/parmetis/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
index 6091031a115a..ca35ce2f4134 100644
--- a/pkgs/development/libraries/science/math/parmetis/default.nix
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
     homepage = http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview;
     platforms = platforms.all;
-    license = licenses.cc-by-nc-sa-20;
+    license = licenses.unfree;
     maintainers = [ maintainers.costrouc ];
   };
 }

From e5cd420e7384fa936e9786a02201ab400b4dcca3 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:10:40 -0400
Subject: [PATCH 0964/3253] pythonPackages.distributed: refactor move to
 fetchPypi

There is a bug when using git repo in that the package does not get a
version (shows up as `0+unknown`). Using pypi fixes this issue allows
allows for auto upgrades.
---
 .../python-modules/distributed/default.nix           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 987b64439a53..694bc2ce4f94 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , pytest
 , pytest-repeat
 , pytest-faulthandler
@@ -26,14 +26,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "1.22.1";
+  version = "1.23.1";
 
   # get full repository need conftest.py to run tests
-  src = fetchFromGitHub {
-    owner = "dask";
-    repo = pname;
-    rev = version;
-    sha256 = "0xvx55rhbhlyys3kjndihwq6y6260qzy9mr3miclh5qddaiw2d5z";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9d4693442efe40e05e4304fe6d8174989c6eb4bad1afe70480c98263ef8e1cdb";
   };
 
   checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

From 5a944e422390849bd81a12065e8aa53996744568 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 12 Sep 2018 15:03:02 -0400
Subject: [PATCH 0965/3253] libxnd: refactor change linker support darwin

---
 pkgs/development/libraries/libxnd/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index c99c3f42bfc1..6b9375c73815 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libndtypes ];
 
-  configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'"
-                     "XND_LINK='-L${libndtypes}/lib'" ];
-
-  makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+  # Override linker with cc (symlink to either gcc or clang)
+  # Library expects to use cc for linking
+  configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
 
   meta = {
     description = "General container that maps a wide range of Python values directly to memory";

From 96668812f35267c34c83265053f951a777229866 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 12 Sep 2018 15:03:22 -0400
Subject: [PATCH 0966/3253] libndtypes: refactor change linker support darwin

---
 pkgs/development/libraries/libndtypes/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 685518efbd22..925154e1d459 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli";
   };
 
-  makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+  # Override linker with cc (symlink to either gcc or clang)
+  # Library expects to use cc for linking
+  configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
 
   meta = {
     description = "Dynamic types for data description and in-memory computations";
@@ -22,4 +24,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ costrouc ];
   };
-}
\ No newline at end of file
+}

From e34a9fff1f65d82a634d608bf55bda3437392327 Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:27:47 -0400
Subject: [PATCH 0967/3253] scalapack: init at 2.0.2 (#46610)

Added scalapack with flexibility to choose blas, lapack, and mpi
implementation.
---
 .../science/math/scalapack/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/scalapack/default.nix

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
new file mode 100644
index 000000000000..83e177c66c18
--- /dev/null
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchurl
+, gfortran
+, cmake
+, blas
+, liblapack
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+  name = "scalapack-${version}";
+  version = "2.0.2";
+
+  src = fetchurl {
+    url = "http://www.netlib.org/scalapack/scalapack-${version}.tgz";
+    sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
+  };
+
+  buildInputs = [ cmake mpi liblapack blas gfortran ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.netlib.org/scalapack/;
+    description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
+    license = licenses.bsdOriginal;
+    platforms = platforms.all;
+    maintainers = [ maintainers.costrouc ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e29c2db3577c..3dda86d71490 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20810,6 +20810,10 @@ with pkgs;
 
   planarity = callPackage ../development/libraries/science/math/planarity { };
 
+  scalapack = callPackage ../development/libraries/science/math/scalapack {
+    mpi = openmpi;
+  };
+
   rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
 
   fenics = callPackage ../development/libraries/science/math/fenics {

From fc5e5950031d8af57f8b5b9e55187f3e4cb4f063 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 13 Sep 2018 21:12:14 +0200
Subject: [PATCH 0968/3253] buildRustCrate: added some edge cases with binaries

This commit adds test based on real-world crates (brotli).
There were a few more edge cases that were missing beforehand. Also it
turned out that we can get rid of the `finalBins` list since that will
now be handled during runtime.
---
 .../rust/build-rust-crate/build-crate.nix     |  7 +-
 .../rust/build-rust-crate/default.nix         | 17 +---
 .../build-rust-crate/test/brotli-crates.nix   | 95 +++++++++++++++++++
 .../rust/build-rust-crate/test/default.nix    | 27 +++++-
 4 files changed, 125 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index bd9d96d96cd6..f65118ba4a64 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -2,7 +2,7 @@
 { crateName,
   dependencies,
   crateFeatures, libName, release, libPath,
-  crateType, metadata, crateBin, finalBins,
+  crateType, metadata, crateBin,
   extraRustcOpts, verbose, colors }:
 
   let
@@ -117,11 +117,11 @@
 
         # the first two cases are the "new" default IIRC
         BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g')
-        FILES=( "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" )
+        FILES=( "src/bin/$BIN_NAME.rs" "src/bin/$BIN_NAME/main.rs" "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" )
 
         if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then
           # if this is not a library the following path is also valid
-          FILES=( "src/$BIN_NAME_.rs" "''${FILES[@]}" )
+          FILES=( "src/$BIN_NAME.rs" "src/$BIN_NAME_.rs" "''${FILES[@]}" )
         fi
 
         for file in "''${FILES[@]}";
@@ -153,6 +153,5 @@
     ''}
     # Remove object files to avoid "wrong ELF type"
     find target -type f -name "*.o" -print0 | xargs -0 rm -f
-  '' + finalBins + ''
     runHook postBuild
   ''
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index db7f72acfb99..a11cef9f1f46 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -115,8 +115,7 @@ stdenv.mkDerivation (rec {
 
     crateBin = if crate ? crateBin then
        builtins.foldl' (bins: bin: let
-            _name = (if bin ? name then bin.name else crateName);
-            name = lib.strings.replaceStrings ["-"] ["_"] _name;
+            name = (if bin ? name then bin.name else crateName);
             path = if bin ? path then bin.path else "";
           in
           bins + (if bin == "" then "" else ",") + "${name} ${path}"
@@ -124,18 +123,6 @@ stdenv.mkDerivation (rec {
        ) "" crate.crateBin
     else "";
 
-    finalBins = if crate ? crateBin then
-       builtins.foldl' (bins: bin:
-          let name = lib.strings.replaceStrings ["-"] ["_"]
-                      (if bin ? name then bin.name else crateName);
-              new_name = if bin ? name then bin.name else crateName;
-          in
-          if name == new_name then bins else
-          (bins + "mv target/bin/${name} target/bin/${new_name};")
-
-       ) "" crate.crateBin
-    else "";
-
     build = crate.build or "";
     workspace_member = crate.workspace_member or ".";
     crateVersion = crate.version;
@@ -156,7 +143,7 @@ stdenv.mkDerivation (rec {
     buildPhase = buildCrate {
       inherit crateName dependencies
               crateFeatures libName release libPath crateType
-              metadata crateBin finalBins verbose colors
+              metadata crateBin verbose colors
               extraRustcOpts;
     };
     installPhase = installCrate crateName metadata;
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
new file mode 100644
index 000000000000..068cc5a98843
--- /dev/null
+++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix
@@ -0,0 +1,95 @@
+{ lib, buildPlatform, buildRustCrate, fetchgit }:
+let kernel = buildPlatform.parsed.kernel.name;
+    abi = buildPlatform.parsed.abi.name;
+    include = includedFiles: src: builtins.filterSource (path: type:
+      lib.lists.any (f:
+        let p = toString (src + ("/" + f)); in
+        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+      ) includedFiles
+    ) src;
+    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+    mapFeatures = features: map (fun: fun { features = features; });
+    mkFeatures = feat: lib.lists.foldl (features: featureName:
+      if feat.${featureName} or false then
+        [ featureName ] ++ features
+      else
+        features
+    ) [] (builtins.attrNames feat);
+in
+rec {
+    alloc_no_stdlib_1_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "alloc-no-stdlib";
+    version = "1.3.0";
+    authors = [ "Daniel Reiter Horn <danielrh@dropbox.com>" ];
+    sha256 = "1jcp27pzmqdszgp80y484g4kwbjbg7x8a589drcwbxg0i8xwkir9";
+    crateBin = [ {  name = "example"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  brotli_2_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "brotli";
+    version = "2.5.0";
+    authors = [ "Daniel Reiter Horn <danielrh@dropbox.com>" "The Brotli Authors" ];
+    sha256 = "1ynw4hkdwnp0kj30p86ls44ahv4s99258s019bqrq4mya8hlsb5b";
+    crateBin = [ {  name = "brotli"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  brotli_decompressor_1_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "brotli-decompressor";
+    version = "1.3.1";
+    authors = [ "Daniel Reiter Horn <danielrh@dropbox.com>" "The Brotli Authors" ];
+    sha256 = "022g69q1xzwdj0130qm3fa4qwpn4q1jx3lc8yz0v0v201p7bm8fb";
+    crateBin = [ {  name = "brotli-decompressor"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  alloc_no_stdlib_1_3_0 = { features?(alloc_no_stdlib_1_3_0_features {}) }: alloc_no_stdlib_1_3_0_ {
+    features = mkFeatures (features.alloc_no_stdlib_1_3_0 or {});
+  };
+  alloc_no_stdlib_1_3_0_features = f: updateFeatures f (rec {
+    alloc_no_stdlib_1_3_0.default = (f.alloc_no_stdlib_1_3_0.default or true);
+  }) [];
+  brotli_2_5_0 = { features?(brotli_2_5_0_features {}) }: brotli_2_5_0_ {
+    dependencies = mapFeatures features ([ alloc_no_stdlib_1_3_0 brotli_decompressor_1_3_1 ]);
+    features = mkFeatures (features.brotli_2_5_0 or {});
+  };
+  brotli_2_5_0_features = f: updateFeatures f (rec {
+    alloc_no_stdlib_1_3_0."no-stdlib" =
+      (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
+      (brotli_2_5_0."no-stdlib" or false) ||
+      (f.brotli_2_5_0."no-stdlib" or false);
+    alloc_no_stdlib_1_3_0.default = true;
+    brotli_2_5_0.default = (f.brotli_2_5_0.default or true);
+    brotli_decompressor_1_3_1."disable-timer" =
+      (f.brotli_decompressor_1_3_1."disable-timer" or false) ||
+      (brotli_2_5_0."disable-timer" or false) ||
+      (f.brotli_2_5_0."disable-timer" or false);
+    brotli_decompressor_1_3_1."no-stdlib" =
+      (f.brotli_decompressor_1_3_1."no-stdlib" or false) ||
+      (brotli_2_5_0."no-stdlib" or false) ||
+      (f.brotli_2_5_0."no-stdlib" or false);
+    brotli_decompressor_1_3_1.benchmark =
+      (f.brotli_decompressor_1_3_1.benchmark or false) ||
+      (brotli_2_5_0.benchmark or false) ||
+      (f.brotli_2_5_0.benchmark or false);
+    brotli_decompressor_1_3_1.default = true;
+    brotli_decompressor_1_3_1.seccomp =
+      (f.brotli_decompressor_1_3_1.seccomp or false) ||
+      (brotli_2_5_0.seccomp or false) ||
+      (f.brotli_2_5_0.seccomp or false);
+  }) [ alloc_no_stdlib_1_3_0_features brotli_decompressor_1_3_1_features ];
+  brotli_decompressor_1_3_1 = { features?(brotli_decompressor_1_3_1_features {}) }: brotli_decompressor_1_3_1_ {
+    dependencies = mapFeatures features ([ alloc_no_stdlib_1_3_0 ]);
+    features = mkFeatures (features.brotli_decompressor_1_3_1 or {});
+  };
+  brotli_decompressor_1_3_1_features = f: updateFeatures f (rec {
+    alloc_no_stdlib_1_3_0."no-stdlib" =
+      (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) ||
+      (brotli_decompressor_1_3_1."no-stdlib" or false) ||
+      (f.brotli_decompressor_1_3_1."no-stdlib" or false);
+    alloc_no_stdlib_1_3_0.default = true;
+    alloc_no_stdlib_1_3_0.unsafe =
+      (f.alloc_no_stdlib_1_3_0.unsafe or false) ||
+      (brotli_decompressor_1_3_1.unsafe or false) ||
+      (f.brotli_decompressor_1_3_1.unsafe or false);
+    brotli_decompressor_1_3_1.default = (f.brotli_decompressor_1_3_1.default or true);
+  }) [ alloc_no_stdlib_1_3_0_features ];
+}
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index e5e77c93555d..08f7238c1fda 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildRustCrate, runCommand, writeTextFile, symlinkJoin }:
+{ lib, stdenv, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage }:
 let
   mkCrate = args: let
       p = {
@@ -72,7 +72,30 @@ let
       crateBinNoPath3 =  { crateBin = [{ name = "my-binary5"; }]; src = mkBin "src/bin/main.rs"; };
       crateBinNoPath4 =  { crateBin = [{ name = "my-binary6"; }]; src = mkBin "src/main.rs";};
     };
-  in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
+    brotliCrates = (callPackage ./brotli-crates.nix {});
+  in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {
+    brotliTest = let
+      pkg = brotliCrates.brotli_2_5_0 {};
+    in runCommand "run-brotli-test-cmd" {
+      nativeBuildInputs = [ pkg ];
+    } ''
+      ${pkg}/bin/brotli -c ${pkg}/bin/brotli > /dev/null && touch $out
+    '';
+    allocNoStdLibTest = let
+      pkg = brotliCrates.alloc_no_stdlib_1_3_0 {};
+    in runCommand "run-alloc-no-stdlib-test-cmd" {
+      nativeBuildInputs = [ pkg ];
+    } ''
+      test -e ${pkg}/bin/example && touch $out
+    '';
+    brotliDecompressorTest = let
+      pkg = brotliCrates.brotli_decompressor_1_3_1 {};
+    in runCommand "run-brotli-decompressor-test-cmd" {
+      nativeBuildInputs = [ pkg ];
+    } ''
+      test -e ${pkg}/bin/brotli-decompressor && touch $out
+    '';
+  };
   test = runCommand "run-buildRustCrate-tests" {
     nativeBuildInputs = builtins.attrValues tests;
   } "

From 9624b748d1fb06ff35d21f27c61f392381244c8f Mon Sep 17 00:00:00 2001
From: haslersn <haslersn@fius.informatik.uni-stuttgart.de>
Date: Thu, 13 Sep 2018 21:23:58 +0200
Subject: [PATCH 0969/3253] maintainers: add 'haslersn'

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 837c4f46dee2..512439196170 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1610,6 +1610,11 @@
     github = "hamhut1066";
     name = "Hamish Hutchings";
   };
+  haslersn = {
+    email = "haslersn@fius.informatik.uni-stuttgart.de";
+    github = "haslersn";
+    name = "Sebastian Hasler";
+  };
   havvy = {
     email = "ryan.havvy@gmail.com";
     github = "havvy";

From 93cdaaa3d4f198420624495d64ba5b6af01c9e07 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:12:21 -0400
Subject: [PATCH 0970/3253] pythonPackages.dask-ml: init at 0.10.0

---
 .../python-modules/dask-ml/default.nix        | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/dask-ml/default.nix

diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
new file mode 100644
index 000000000000..0f53bcc225df
--- /dev/null
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dask
+, numpy, toolz # dask[array]
+, numba
+, pandas
+, scikitlearn
+, scipy
+, dask-glm
+, six
+, multipledispatch
+, packaging
+, pytest
+, xgboost
+, tensorflow
+, joblib
+, distributed
+}:
+
+buildPythonPackage rec {
+  version = "0.10.0";
+  pname = "dask-ml";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "4b6ca548c7282c1b6983e696e4bdfa0a2d7b51b168928b9322ea7a4b9a9f20f9";
+  };
+
+  checkInputs = [ pytest xgboost tensorflow joblib distributed ];
+  propagatedBuildInputs = [ dask numpy toolz numba pandas scikitlearn scipy dask-glm six multipledispatch packaging ];
+
+  # dask-ml has some heavy test requirements
+  # and requires some very new packages
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dask/dask-ml;
+    description = "Scalable Machine Learn with Dask";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4375ab550fde..bedfe6d4a78c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1984,6 +1984,8 @@ in {
 
   dask = callPackage ../development/python-modules/dask { };
 
+  dask-ml = callPackage ../development/python-modules/dask-ml { };
+
   datrie = callPackage ../development/python-modules/datrie { };
 
   heapdict = callPackage ../development/python-modules/heapdict { };

From 32cb956fea81d1bfeb0c08f53dff8a445e4b9b6b Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:12:51 -0400
Subject: [PATCH 0971/3253] pythonPackages.dask-glm: init at 0.1.0

---
 .../python-modules/dask-glm/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/dask-glm/default.nix

diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
new file mode 100644
index 000000000000..13af6d9da8a3
--- /dev/null
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cloudpickle
+, dask
+, numpy, toolz # dask[array]
+, multipledispatch
+, scipy
+, scikitlearn
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.1.0";
+  pname = "dask-glm";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5a38d17538558fe6a3457cd67eed0a90a5dff51a9eaebb496efb68fc432ed89a";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ];
+
+  checkPhase = ''
+    py.test dask_glm
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/dask/dask-glm/;
+    description = "Generalized Linear Models with Dask";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bedfe6d4a78c..4bf3114800ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1984,6 +1984,8 @@ in {
 
   dask = callPackage ../development/python-modules/dask { };
 
+  dask-glm = callPackage ../development/python-modules/dask-glm { };
+
   dask-ml = callPackage ../development/python-modules/dask-ml { };
 
   datrie = callPackage ../development/python-modules/datrie { };

From 41cd200b6400d95f94f61305493a88464c999135 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 15:14:25 -0400
Subject: [PATCH 0972/3253] pythonPackages.dask-jobqueue: init at 0.4.0

---
 .../python-modules/dask-jobqueue/default.nix  | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/dask-jobqueue/default.nix

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
new file mode 100644
index 000000000000..e6ac86660c19
--- /dev/null
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dask
+, distributed
+, docrep
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.4.0";
+  pname = "dask-jobqueue";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c73dae82b2a1d2a9f4ef17778f0de7a9237671a7fd3374aadd9d2bc07e92e848";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ dask distributed docrep ];
+
+  # do not run entire tests suite (requires slurm, sge, etc.)
+  checkPhase = ''
+    py.test dask_jobqueue/tests/test_jobqueue_core.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dask/dask-jobqueue;
+    description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bf3114800ad..4c6c82b06a61 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1986,6 +1986,8 @@ in {
 
   dask-glm = callPackage ../development/python-modules/dask-glm { };
 
+  dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { };
+
   dask-ml = callPackage ../development/python-modules/dask-ml { };
 
   datrie = callPackage ../development/python-modules/datrie { };

From 1a67a15c6ff55c97cc27daaf00f51cccc0711799 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 16:41:13 -0400
Subject: [PATCH 0973/3253] pythonPackages.pims: init at 0.4.1

---
 .../python-modules/pims/default.nix           | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pims/default.nix

diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix
new file mode 100644
index 000000000000..4e45d5203e66
--- /dev/null
+++ b/pkgs/development/python-modules/pims/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, slicerator
+, scikitimage
+, six
+, numpy
+, tifffile
+, pytest
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "0.4.1";
+  pname = "PIMS";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6a53a155e900b44e71127a1e1fccbfbaed7eec3c2b52497c40c23a05f334c9dd";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ slicerator six numpy tifffile scikitimage ];
+
+  # not everything packaged with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/soft-matter/pims;
+    description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c6c82b06a61..4a4211e7f597 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -386,6 +386,8 @@ in {
 
   phonopy = callPackage ../development/python-modules/phonopy { };
 
+  pims = callPackage ../development/python-modules/pims { };
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   pymysql = callPackage ../development/python-modules/pymysql { };

From ce4b7154ac5b91157243fe78eb4ff29a00705338 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 16:41:34 -0400
Subject: [PATCH 0974/3253] pythonPackages.slicerator: init at 0.9.8

---
 .../python-modules/slicerator/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/slicerator/default.nix

diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix
new file mode 100644
index 000000000000..6af7fafdddf8
--- /dev/null
+++ b/pkgs/development/python-modules/slicerator/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+, six
+}:
+
+buildPythonPackage rec {
+  version = "0.9.8";
+  pname = "slicerator";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b91dd76a415fd8872185cbd6fbf1922fe174359053d4694983fc719e4a0f5667";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  checkPhase = ''
+    ${python.interpreter} run_tests.py
+  '';
+
+  # run_tests.py not packaged with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/soft-matter/slicerator;
+    description = "A lazy-loading, fancy-sliceable iterable";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4211e7f597..d32b42c19508 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -568,6 +568,8 @@ in {
 
   slackclient = callPackage ../development/python-modules/slackclient { };
 
+  slicerator = callPackage ../development/python-modules/slicerator { };
+
   spglib = callPackage ../development/python-modules/spglib { };
 
   statistics = callPackage ../development/python-modules/statistics { };

From 72bd196b895ae65c543c454d52fa034dd95b43e5 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 16:41:58 -0400
Subject: [PATCH 0975/3253] pythonPackages.dask-image: init at 0.1.1

---
 .../python-modules/dask-image/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/dask-image/default.nix

diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
new file mode 100644
index 000000000000..15a13b2ff714
--- /dev/null
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, dask
+, numpy, toolz # dask[array]
+, scipy
+, pims
+, pytest
+, scikitimage
+}:
+
+buildPythonPackage rec {
+  version = "0.1.1";
+  pname = "dask-image";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e6294ac577a8fc0abec2b97a2c42d404f599feac61d6899bdf1bf2b7cfb0e015";
+  };
+
+  checkInputs = [ pytest scikitimage ];
+  propagatedBuildInputs = [ dask numpy toolz scipy pims ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dask/dask-image;
+    description = "Distributed image processing";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d32b42c19508..2f14c295c8d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1990,6 +1990,8 @@ in {
 
   dask-glm = callPackage ../development/python-modules/dask-glm { };
 
+  dask-image = callPackage ../development/python-modules/dask-image { };
+
   dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { };
 
   dask-ml = callPackage ../development/python-modules/dask-ml { };

From bd6873774e6e9976b2631edbdcef51f387800068 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 16:42:25 -0400
Subject: [PATCH 0976/3253] pythonPackages.dask-xgboost: init at 0.1.5

---
 .../python-modules/dask-xgboost/default.nix   | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/dask-xgboost/default.nix

diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix
new file mode 100644
index 000000000000..06b5e762852a
--- /dev/null
+++ b/pkgs/development/python-modules/dask-xgboost/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, xgboost
+, dask
+, distributed
+, pytest
+, scikitlearn
+, scipy
+}:
+
+buildPythonPackage rec {
+  version = "0.1.5";
+  pname = "dask-xgboost";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1860d06965fe68def1c83b9195130a92050fd4bc28bf2be689898a3a74ee1316";
+  };
+
+  checkInputs = [ pytest scikitlearn ];
+  propagatedBuildInputs = [ xgboost dask distributed ];
+
+  checkPhase = ''
+    py.test dask_xgboost/tests/test_core.py
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dask/dask-xgboost;
+    description = "Interactions between Dask and XGBoost";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f14c295c8d5..7139a0eb50e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1996,6 +1996,8 @@ in {
 
   dask-ml = callPackage ../development/python-modules/dask-ml { };
 
+  dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
+
   datrie = callPackage ../development/python-modules/datrie { };
 
   heapdict = callPackage ../development/python-modules/heapdict { };

From 04cba83e7fbbf2f483794618d34b808016d916c4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 22:47:34 +0200
Subject: [PATCH 0977/3253] brlaser: cleanup and mark linux only (#46622)

The test binaries depend use open_memstream which isn't available on
darwin.

    error: use of undeclared identifier 'open_memstream'

/cc ZHF #45961
---
 pkgs/misc/cups/drivers/brlaser/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 1786a4996a30..46c38892bf8f 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, zlib, cups }:
 
 stdenv.mkDerivation rec {
-
   name = "brlaser-${version}";
   version = "4";
 
@@ -12,11 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
   };
 
-  buildInputs = [ cmake zlib cups ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib cups ];
 
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DCUPS_SERVER_BIN=$out/lib/cups/ -DCUPS_DATA_DIR=$out/share/cups/"
-  '';
+  cmakeFlags = [ "-DCUPS_SERVER_BIN=$out/lib/cups" "-DCUPS_DATA_DIR=$out/share/cups" ];
 
   meta = with stdenv.lib; {
     description = "A CUPS driver for Brother laser printers";
@@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = https://github.com/pdewacht/brlaser;
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ StijnDW ];
   };
 }

From 68f7e7551744268438cc8bf5f721cb926e5dc883 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:00:46 +0200
Subject: [PATCH 0978/3253] cernlib: mark broken on darwin

Using gccStdenv makes the build go further, but then it fails with.

    kuipc /private/tmp/nix-build-cernlib-2006.drv-0/2006/src/packlib/kuip/code_kuip/kuipcdf.cdf kuipcdf.c
    Makefile:413: archive/kuipcdf.d: No such file or directory
    make[3]: *** [Makefile:473: kuipcdf.c] Abort trap: 6

/cc ZHF #45961
---
 pkgs/development/libraries/physics/cernlib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f837d807219f..92d2ab962323 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://cernlib.web.cern.ch;
     description = "Legacy collection of libraries and modules for data analysis in high energy physics";
+    broken = stdenv.isDarwin;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ veprbl ];
     license = stdenv.lib.licenses.gpl2;

From 54b4000d54433b9b49dab938f703994bb7707f3f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:03:09 +0200
Subject: [PATCH 0979/3253] csfml: mark linux only

While it's possible to build on darwin, we never had a successful build.

    Undefined symbols for architecture x86_64:
      "sf::microseconds(long long)", referenced from:
          _sfSleep in Sleep.cpp.o

/cc ZHF #45961
---
 pkgs/development/libraries/csfml/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 8f66b65e49ac..6ec18b9514d7 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
     '';
     license = licenses.zlib;
     maintainers = [ maintainers.jpdoyle ];
-
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux;
   };
 }

From 327edb4b1dc556b0342bde232c479cdcd0176997 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:06:17 +0200
Subject: [PATCH 0980/3253] cargo-web: mark broken on darwin

Looks CoreFoundation related.

    Undefined symbols for architecture x86_64:
      "_CFURLResourceIsReachable", referenced from:
          fsevent_sys::core_foundation::str_path_to_cfstring_ref::h0ea4bd94e2c613f2 in libfsevent_sys-ef30b6879660a6c1.rlib(fsevent_sys-ef30b6879660a6c1.fsevent_sys7-49ce33334334dd3a5c7883bf4070f954.rs.rcgu.o)
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961
---
 pkgs/development/tools/cargo-web/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index 06d6697ef965..e350e475f73c 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
+{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform
+, CoreServices, Security
+}:
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-web-${version}";
@@ -14,12 +16,14 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si";
 
   nativeBuildInputs = [ openssl pkgconfig ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   meta = with stdenv.lib; {
     description = "A Cargo subcommand for the client-side Web";
     homepage = https://github.com/koute/cargo-web;
     license = with licenses; [asl20 /* or */ mit];
     maintainers = [ maintainers.kevincox ];
+    broken = stdenv.isDarwin;  # test with CoreFoundation 10.11
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e29c2db3577c..48a7db7ebae3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7181,7 +7181,9 @@ with pkgs;
 
   cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 
-  cargo-web = callPackage ../development/tools/cargo-web { };
+  cargo-web = callPackage ../development/tools/cargo-web {
+    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
+  };
 
   carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };
 

From f96dde6fd7d241813e3b279e84b3e4b1241d3ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Thu, 13 Sep 2018 23:15:41 +0200
Subject: [PATCH 0981/3253] Increase Virtualbox disk image size

10G is not enough for a desktop installation, and resizing a Virtualbox disk image is a pain.
Let's increase the default disk size to 100G. It does not require more storage space, since the empty bits are left out.
---
 nixos/modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 60048911658c..3d4c06f1f23f 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -12,7 +12,7 @@ in {
     virtualbox = {
       baseImageSize = mkOption {
         type = types.int;
-        default = 10 * 1024;
+        default = 100 * 1024;
         description = ''
           The size of the VirtualBox base image in MiB.
         '';

From 9ef31b2f96eeae83f8689a0f3459caeb3bc51a8f Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 13 Sep 2018 17:35:06 -0400
Subject: [PATCH 0982/3253] papi: init at 5.6.0 (#46619)

papi is a high resolution performance counter.
---
 .../science/benchmark/papi/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/science/benchmark/papi/default.nix

diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
new file mode 100644
index 000000000000..f727728943bd
--- /dev/null
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  version = "5.6.0";
+  name = "papi-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
+    sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
+  };
+
+  buildInputs = [ stdenv ];
+
+  preConfigure = ''
+    cd src
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    homepage = https://icl.utk.edu/papi/;
+    description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";
+    license = licenses.bsdOriginal;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dda86d71490..517681381d12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20619,6 +20619,10 @@ with pkgs;
   tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
   tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT
 
+  ### SCIENCE/BENCHMARK
+
+  papi = callPackage ../development/libraries/science/benchmark/papi { };
+
   ### SCIENCE/BIOLOGY
 
   alliance = callPackage ../applications/science/electronics/alliance { };

From d782c4eba57141452583e9d47d3e3c77f9bd47ef Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:36:17 +0200
Subject: [PATCH 0983/3253] cargo-update: fix darwin build (#46625)

On darwin libcurl is also needed.

/cc ZHF #45961
---
 pkgs/tools/package-management/cargo-update/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 70a14ded7bf3..50dc748e07ef 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, libssh2, libgit2, openssl, zlib }:
+{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, curl, libssh2, libgit2, openssl, zlib }:
 
 ((callPackage ./cargo-update.nix {}).cargo_update {}).override {
   crateOverrides = defaultCrateOverrides // {
@@ -13,7 +13,9 @@
         sha256 = "1bvrdgcw2akzd78wgvsisvghi8pvdk3szyg9s46qxv4km9sf88s7";
       };
 
-      buildInputs = [ cmake libssh2 libgit2 openssl zlib ];
+      nativeBuildInputs = [ cmake ];
+      buildInputs = [ libssh2 libgit2 openssl zlib ]
+        ++ stdenv.lib.optional stdenv.isDarwin curl;
 
       meta = with stdenv.lib; {
         description = "A cargo subcommand for checking and applying updates to installed executables";

From 68956555c18d3d41c26f1693c343a421e233559a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:40:30 +0200
Subject: [PATCH 0984/3253] calaos_installer: fix darwin install (#46629)

On darwin this builds an application instead of a binary.

/cc ZHF #45961
---
 pkgs/misc/calaos/installer/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix
index 36c8825d27a8..618bc6d85059 100644
--- a/pkgs/misc/calaos/installer/default.nix
+++ b/pkgs/misc/calaos/installer/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
 
   qmakeFlags = [ "REVISION=${version}" ];
 
-  installPhase = ''
+  installPhase = if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    cp -a calaos_installer.app $out/Applications
+  '' else ''
     mkdir -p $out/bin
     cp -a calaos_installer $out/bin
   '';

From 807b0105b41d101e8fb774d107927ee84571f7c7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 13 Sep 2018 23:44:14 +0200
Subject: [PATCH 0985/3253] ceres-solver: fix darwin build (#46626)

The Basel BUILD file conflicts with the cmake build directory on
case-insensitive filesystems, eg. darwin.

/cc ZHF #45961
---
 pkgs/development/libraries/ceres-solver/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 432e49c4354f..043b9e263d8a 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -2,7 +2,7 @@
 , eigen
 , fetchurl
 , cmake
-, google-gflags ? null
+, google-gflags
 , glog
 , runTests ? false
 }:
@@ -21,7 +21,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ eigen glog ]
-    ++ stdenv.lib.optional (google-gflags != null) google-gflags;
+    ++ stdenv.lib.optional runTests google-gflags;
+
+  # The Basel BUILD file conflicts with the cmake build directory on
+  # case-insensitive filesystems, eg. darwin.
+  preConfigure = ''
+    rm BUILD
+  '';
 
   doCheck = runTests;
 

From 2ff2b89fdfa88fdf2880e609388f99026c1a1b5d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 23:45:29 +0200
Subject: [PATCH 0986/3253] gnome2.gconfmm: drop

---
 pkgs/desktops/gnome-2/default.nix             |  2 --
 .../gnome-2/platform/gconfmm/default.nix      | 23 -------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/gconfmm/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c41183f4b24f..59a86236dba7 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -35,8 +35,6 @@ let overridden = set // overrides; set = with overridden; {
 
   GConf = callPackage ./platform/GConf { };
 
-  gconfmm = callPackage ./platform/gconfmm { };
-
   libgnomecanvas = callPackage ./platform/libgnomecanvas { };
 
   libgnomecanvasmm = callPackage ./platform/libgnomecanvasmm { };
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
deleted file mode 100644
index 356d4df9d1d8..000000000000
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
-
-stdenv.mkDerivation rec {
-  name = "gconfmm-${minVer}.3";
-  minVer = "2.28";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
-    sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ GConf gtkmm glibmm ];
-
-  meta = {
-    description = "C++ wrappers for GConf";
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

From 99eb98403dcfc05f2b328601cbe00be453a99a8c Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 14 Sep 2018 00:46:37 +0200
Subject: [PATCH 0987/3253] pdftag: 1.0.4 -> 1.0.5

---
 pkgs/tools/graphics/pdftag/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
index 6f492a3ccc5d..8428480ca037 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -4,23 +4,17 @@
 stdenv.mkDerivation rec {
   pname = "pdftag";
   name = "${pname}-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "arrufat";
     repo = pname;
-    rev = version;
-    sha256 = "17zk42h0n33b4p8fqlq2riqwcdi8y9m5n0ccydnk6a4x8rli97b3";
+    rev = "v${version}";
+    sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql";
   };
 
-  nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook ];
-  buildInputs = [ gtk3 poppler vala ];
-
-  patchPhase = ''substituteInPlace meson.build \
-    --replace "install_dir: '/usr" "install_dir: '$out"
-  '';
-
-  preInstall = "mkdir -p $out/share/licenses/${pname}";
+  nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook vala ];
+  buildInputs = [ gtk3 poppler ];
 
   meta = with stdenv.lib; {
     description = "Edit metadata found in PDFs";

From 417cbb930797865925324a0e386a3fa2c59885a4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 11 Sep 2018 21:12:32 +0900
Subject: [PATCH 0988/3253] flashplayer: 30.0.0.154 -> 31.0.0.108

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 84c4e6202625..9faa7e5e31fd 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,11 +98,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "30.0.0.154";
+    version = "31.0.0.108";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48";
+      sha256 = "0dcwyx0fp7wbsx0cyi7xpwq0nnvcvkzfgi6zyy75487820ssc4h1";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 72e1a08f40b3..07ef1397f9fb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "30.0.0.154";
+  version = "31.0.0.108";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8"
+          "1mn29ahxjf6pdy2zp2na14cz46jrl88f54kp3bs3cz75syyizyb6"
         else
-          "073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda"
+          "0inpj6bcsn5lh8gdv1wxpgipzrmpc553nhr68a55b2wff9fkv1ci"
       else
         if arch == "x86_64" then
-          "03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84"
+          "1dfgsl5jf8ja9f7wwkzj5bfz1v5rdsyf4qhg1shqqldadmyyha7p"
         else
-          "0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x";
+          "0yiqwwqs3z9zzkfgqzjwqqdr2vaj1ia5xychs9fgxix3y4j934da";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index ba8a8de93209..03255e6eecc0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,19 +49,19 @@
 
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "30.0.0.154";
+  version = "31.0.0.108";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4"
+        "0i047fvj3x9lx7x8bf7jl1ybf9xpmr6g77q0h7n2s8qvscsw0pmm"
       else
-        "1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr";
+        "19wfs452ix57yfi4cy2din6mi5jky9hjzbdjny1bl8w32fy8xmm3";
   };
 
   nativeBuildInputs = [ unzip ];

From 8a0f255cda9c8ee026da922fd994d6cd8b49bfe3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Sep 2018 01:42:42 +0200
Subject: [PATCH 0989/3253] gnome2.gtkglextmm: drop

---
 pkgs/desktops/gnome-2/default.nix             |   2 -
 .../gnome-2/platform/gtkglextmm/default.nix   |  35 -----
 .../gtkglextmm/fix_ftbfs_gtk_2_36.patch       | 121 ------------------
 .../gnome-2/platform/gtkglextmm/gdk.patch     |  15 ---
 4 files changed, 173 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
 delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
 delete mode 100644 pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 59a86236dba7..f67dc13c8545 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -68,8 +68,6 @@ let overridden = set // overrides; set = with overridden; {
 
   gtkglext = callPackage ./platform/gtkglext { };
 
-  gtkglextmm = callPackage ./platform/gtkglextmm { };
-
 #### DESKTOP
 
   gvfs = gvfs.override { gnome = self; };
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
deleted file mode 100644
index 63e33aa578ef..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf
-, pangox_compat, libXmu
-}:
-
-stdenv.mkDerivation rec {
-  name = "gtkglextmm-${minVer}.0";
-  minVer = "1.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
-    sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
-  };
-
-  patches = [
-    ./gdk.patch
-
-    # From debian, fixes build with newer gtk "[...] by switching #includes
-    # around so that the G_DISABLE_DEPRECATED trick in glibmm still works".
-    # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707356
-    ./fix_ftbfs_gtk_2_36.patch
-  ];
-
-  buildInputs = [ pangox_compat libXmu ];
-
-  nativeBuildInputs = [pkgconfig];
-
-  propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ];
-
-  meta = {
-    description = "C++ wrappers for GtkGLExt";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
deleted file mode 100644
index 88e271e3eb7b..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/fix_ftbfs_gtk_2_36.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -1,15 +1,8 @@
--
--#include <glib.h>
--
- // Disable the 'const' function attribute of the get_type() functions.
- // GCC would optimize them out because we don't use the return value.
- #undef  G_GNUC_CONST
- #define G_GNUC_CONST /* empty */
- 
--#include <gdkmm/gl/wrap_init.h>
--#include <glibmm/error.h>
--#include <glibmm/object.h>
--
- // #include the widget headers so that we can call the get_type() static methods:
- 
- #include "tokens.h"
-@@ -19,6 +12,12 @@
- #include "pixmap.h"
- #include "window.h"
- 
-+#include <glib.h>
-+
-+#include <gdkmm/gl/wrap_init.h>
-+#include <glibmm/error.h>
-+#include <glibmm/object.h>
-+
- extern "C"
- {
- 
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,10 +17,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gdk/gdkglquery.h>
--
- #include "query.h"
- 
-+#include <gdk/gdkglquery.h>
-+
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
-+#include "pixmapext.h"
-+
- #include <gdk/gdkgldrawable.h>
- #include <gdk/gdkglpixmap.h>
- 
--#include "pixmapext.h"
--
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:40:48.363207736 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:42:40.193801834 +0200
-@@ -17,11 +17,11 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
-+#include "windowext.h"
-+
- #include <gdk/gdkgldrawable.h>
- #include <gdk/gdkglwindow.h>
- 
--#include "windowext.h"
--
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc	2004-05-18 08:01:49.000000000 +0200
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc	2013-05-16 23:43:07.637456821 +0200
-@@ -17,10 +17,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gdk/gdkglfont.h>
--
- #include "font.h"
- 
-+#include <gdk/gdkglfont.h>
-+
- namespace Gdk
- {
-   namespace GL
-Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
-===================================================================
---- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc	2003-02-27 10:49:24.000000000 +0100
-+++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc	2013-05-16 23:44:38.320316782 +0200
-@@ -19,11 +19,11 @@
- 
- #include <cstdlib>
- 
--#include <gdk/gdkglinit.h>
--
- #include "wrap_init.h"
- #include "init.h"
- 
-+#include <gdk/gdkglinit.h>
-+
- namespace Gdk
- {
-   namespace GL
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch b/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
deleted file mode 100644
index 8a39b521d63c..000000000000
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/gdk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# fixes: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621976
-# reference: http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg250570.html
---- gtkglextmm-1.2.0-orig/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
-+++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gtk/gtkglwidget.h>
--
- #include "widget.h"
-+#include <gtk/gtkglwidget.h>
- 
- namespace Gtk
- {
\ No newline at end of file

From c76312aea57509327f1242aaff4a3241154ede26 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 13 Sep 2018 20:03:31 -0400
Subject: [PATCH 0990/3253] airsonic: provide additional jvm configuration

This allows the user, among other things, to configure jukebox output
to go to non-default alsa devices.
---
 nixos/modules/services/misc/airsonic.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
index 083587b8ebb1..01d7b3cf6b9d 100644
--- a/nixos/modules/services/misc/airsonic.nix
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -73,6 +73,24 @@ in {
           ${cfg.home}/transcoders.
         '';
       };
+
+      jvmOptions = mkOption {
+        description = ''
+          Extra command line options for the JVM running AirSonic.
+          Useful for sending jukebox output to non-default alsa
+          devices.
+        '';
+        default = [
+        ];
+        type = types.listOf types.str;
+        example = [
+          "-Djavax.sound.sampled.Clip='#CODEC [plughw:1,0]'"
+          "-Djavax.sound.sampled.Port='#Port CODEC [hw:1]'"
+          "-Djavax.sound.sampled.SourceDataLine='#CODEC [plughw:1,0]'"
+          "-Djavax.sound.sampled.TargetDataLine='#CODEC [plughw:1,0]'"
+        ];
+      };
+
     };
   };
 
@@ -98,6 +116,7 @@ in {
           -Dserver.port=${toString cfg.port} \
           -Dairsonic.contextPath=${cfg.contextPath} \
           -Djava.awt.headless=true \
+          ${toString cfg.jvmOptions} \
           -verbose:gc \
           -jar ${pkgs.airsonic}/webapps/airsonic.war
         '';

From 533efd0cfd4a104ced54000f392b9bb1926d9973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 25 Nov 2017 22:41:19 +0100
Subject: [PATCH 0991/3253] initial NixOS module for LIRC

---
 nixos/modules/misc/ids.nix               |  2 +
 nixos/modules/module-list.nix            |  1 +
 nixos/modules/services/hardware/lirc.nix | 85 ++++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 nixos/modules/services/hardware/lirc.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index aafeb997c326..3d34fb973e74 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -329,6 +329,7 @@
       # kvm = 302; # unused
       # render = 303; # unused
       zeronet = 304;
+      lirc = 305;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -618,6 +619,7 @@
       kvm = 302; # default udev rules from systemd requires these
       render = 303; # default udev rules from systemd requires these
       zeronet = 304;
+      lirc = 305;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f51a30aec2e9..298136443561 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -272,6 +272,7 @@
   ./services/hardware/interception-tools.nix
   ./services/hardware/irqbalance.nix
   ./services/hardware/lcd.nix
+  ./services/hardware/lirc.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
new file mode 100644
index 000000000000..a66a7fbf495f
--- /dev/null
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -0,0 +1,85 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.lirc;
+in {
+
+  ###### interface
+
+  options = {
+    services.lirc = {
+
+      enable = mkEnableOption "LIRC daemon";
+
+      options = mkOption {
+        type = types.lines;
+        example = ''
+          [lircd]
+          nodaemon = False
+        '';
+        description = "LIRC default options descriped in man:lircd(8) (<filename>lirc_options.conf</filename>)";
+      };
+
+      configs = mkOption {
+        type = types.listOf types.lines;
+        description = "Configurations for lircd to load, see man:lircd.conf(5) for details (<filename>lircd.conf</filename>)";
+      };
+
+      extraArguments = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = "Extra arguments to lircd.";
+      };
+
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Note: LIRC executables raises a warning, if lirc_options.conf do not exists
+    environment.etc."lirc/lirc_options.conf".text = cfg.options;
+
+    environment.systemPackages = [ pkgs.lirc ];
+
+    systemd.sockets.lircd = {
+      description = "LIRC daemon socket";
+      wantedBy = [ "sockets.target" ];
+      socketConfig = {
+        ListenStream = "/run/lirc/lircd";
+        SocketUser = "lirc";
+        SocketMode = "0660";
+      };
+    };
+
+    systemd.services.lircd = let
+      configFile = pkgs.writeText "lircd.conf" (builtins.concatStringsSep "\n" cfg.configs);
+    in {
+      description = "LIRC daemon service";
+      after = [ "network.target" ];
+
+      unitConfig.Documentation = [ "man:lircd(8)" ];
+
+      serviceConfig = {
+        RuntimeDirectory = "lirc";
+        ExecStart = ''
+          ${pkgs.lirc}/bin/lircd --nodaemon \
+            ${escapeShellArgs cfg.extraArguments} \
+            ${configFile}
+        '';
+        User = "lirc";
+      };
+    };
+
+    users.users.lirc = {
+      uid = config.ids.uids.lirc;
+      group = "lirc";
+      description = "LIRC user for lircd";
+    };
+
+    users.groups.lirc.gid = config.ids.gids.lirc;
+  };
+}

From c32b0409a9f1ba42dcf355838ab751390be55674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 20 Aug 2018 17:03:55 +0200
Subject: [PATCH 0992/3253] pipewire: 0.1.9 -> 0.2.3

I also removed pipewire from mutter temporarily, since it is not compatible.
---
 pkgs/desktops/gnome-3/core/mutter/default.nix   |  2 +-
 pkgs/development/libraries/pipewire/default.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 631107fe7a80..b05644366dc0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-x"
     "--disable-static"
-    "--enable-remote-desktop"
+    # "--enable-remote-desktop"
     "--enable-shape"
     "--enable-sm"
     "--enable-startup-notification"
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index e87ed8e48a98..96b5239b7dbe 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg
 , sbc, SDL2, makeFontsConf, freefont_ttf
 }:
 
 let
-  version = "0.1.9";
+  version = "0.2.3";
 
   fontsConf = makeFontsConf {
     fontDirectories = [ freefont_ttf ];
@@ -16,22 +16,22 @@ in stdenv.mkDerivation rec {
     owner = "PipeWire";
     repo = "pipewire";
     rev = version;
-    sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm";
+    sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k";
   };
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [ "out" "lib" "dev" "doc" ];
 
   nativeBuildInputs = [
     meson ninja pkgconfig doxygen graphviz valgrind
   ];
   buildInputs = [
-    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
+    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l
     alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
   ];
 
   mesonFlags = [
-    "-Denable_docs=true"
-    "-Denable_gstreamer=true"
+    "-Ddocs=true"
+    "-Dgstreamer=true"
   ];
 
   PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";

From 0d994736a1d173ea06a4eb472fabf901a77fcd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 11:39:55 +0200
Subject: [PATCH 0993/3253] xdg-desktop-portal: 0.99 -> 1.0.2

---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 9651f642a011..171ef68cf569 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
 
 let
-  version = "0.99";
+  version = "1.0.2";
 in stdenv.mkDerivation rec {
   name = "xdg-desktop-portal-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     rev = version;
-    sha256 = "05garhdxylphrizyaqnz4sfpp28fd00v877q7cf1gyhpk1sr8i83";
+    sha256 = "1vl0150gz20x106di9yfa6l3zjw0nd2lr44rkq2147n2a254p79p";
   };
 
   patches = [

From b6c17cd46f5a0554a32a388889265a4ec7a6c0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 11:40:59 +0200
Subject: [PATCH 0994/3253] xdg-desktop-portal-gtk: 0.99 -> 1.0.2

---
 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index e6f23a8a2703..f81461b2ac8e 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
 
 let
-  version = "0.99";
+  version = "1.0.2";
 in stdenv.mkDerivation rec {
   name = "xdg-desktop-portal-gtk-${version}";
 
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = "xdg-desktop-portal-gtk";
     rev = version;
-    sha256 = "0jnmrl55gpvz06hy0832kcby4y84f0a1hiali6qy1lcmyqhm3v59";
+    sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];

From 87d11ae99c4e85944112392000c5b1b51eeb59c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 11:51:04 +0200
Subject: [PATCH 0995/3253] ostree: 2018.6 -> 2018.8

---
 pkgs/tools/misc/ostree/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 98154d9d5628..8eb9be97c224 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -4,13 +4,13 @@
 }:
 
 let
-  version = "2018.6";
+  version = "2018.8";
 
   libglnx-src = fetchFromGitHub {
     owner = "GNOME";
     repo = "libglnx";
-    rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3";
-    sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc";
+    rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd";
+    sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15";
   };
 
   bsdiff-src = fetchFromGitHub {
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
     rev = "v${version}";
     owner = "ostreedev";
     repo = "ostree";
-    sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g";
+    sha256 = "0i7b7hvlv8m44k39fr5389wskf810vda8s7ivy2whj1nan5951yx";
   };
 
   patches = [
@@ -62,6 +62,8 @@ in stdenv.mkDerivation {
     env NOCONFIGURE=1 ./autogen.sh
   '';
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
     "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators"

From 2d19ee62473403de5e7d6e26c9a520b8fe3a89e9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Sep 2018 02:50:38 +0200
Subject: [PATCH 0996/3253] xdg-dbus-proxy: init at 0.1.0

---
 .../libraries/xdg-dbus-proxy/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/xdg-dbus-proxy/default.nix

diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
new file mode 100644
index 000000000000..247b8ee45d0b
--- /dev/null
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+let
+  version = "0.1.0";
+in stdenv.mkDerivation rec {
+  name = "xdg-dbus-proxy-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${name}.tar.xz";
+    sha256 = "055wli36lvdannp6qqwbvd78353n61wn9kp8y3dchh39wq7x7vwy";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  meta = with stdenv.lib; {
+    description = "DBus proxy for Flatpak and others";
+    homepage = https://flatpak.org/;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 671b5df3586c..807082ff071e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19437,6 +19437,8 @@ with pkgs;
 
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
+  xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { };
+
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
   xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };

From 37a828ec27e94f6e08c5a617ae62cce84ef49b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 6 Sep 2018 11:38:09 +0200
Subject: [PATCH 0997/3253] flatpak: 0.99.3 -> 1.0.2

---
 .../development/libraries/flatpak/default.nix | 16 +++++---
 .../libraries/flatpak/fix-paths.patch         | 20 ++++++++++
 .../libraries/flatpak/fix-test-paths.patch    | 40 ++-----------------
 .../flatpak/use-flatpak-from-path.patch       |  4 +-
 4 files changed, 36 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/development/libraries/flatpak/fix-paths.patch

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 6591b13834e0..c8cd420f6e7b 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,27 +1,32 @@
 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
-, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
 , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
 , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
 
 let
-  version = "0.99.3";
+  version = "1.0.2";
   desktop_schemas = gnome3.gsettings-desktop-schemas;
 in stdenv.mkDerivation rec {
   name = "flatpak-${version}";
 
+  # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "man" "doc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk";
+    sha256 = "0d0nnymb4p3njc24j0p6f74x7cdfi7jac714gxzzz5y5lrd651gn";
   };
 
   patches = [
     (substituteAll {
       src = ./fix-test-paths.patch;
-      inherit coreutils python2 glibcLocales;
+      inherit coreutils glibcLocales;
       hicolorIconTheme = hicolor-icon-theme;
     })
+    (substituteAll {
+      src = ./fix-paths.patch;
+      p11 = p11-kit;
+    })
     # patch taken from gtk_doc
     ./respect-xml-catalog-files-var.patch
     ./use-flatpak-from-path.patch
@@ -30,7 +35,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
     gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
-  ] ++ stdenv.lib.optionals doCheck checkInputs;
+  ];
 
   buildInputs = [
     bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
@@ -45,6 +50,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
+    "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
     "--localstatedir=/var"
     "--enable-installed-tests"
   ];
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch
new file mode 100644
index 000000000000..49fcaa2b3f9b
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/fix-paths.patch
@@ -0,0 +1,20 @@
+--- a/session-helper/flatpak-session-helper.c
++++ b/session-helper/flatpak-session-helper.c
+@@ -624,7 +624,7 @@
+   g_auto(GStrv) stdout_lines = NULL;
+   int i;
+   char *p11_argv[] = {
+-    "p11-kit", "server",
++    "@p11@/bin/p11-kit", "server",
+     /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
+      * this flag. This is good, because those earlier versions did not properly daemonize and caused
+      * the spawn_sync to hang forever, waiting for the pipe to close.
+@@ -770,7 +770,7 @@
+       exit (1);
+     }
+ 
+-  if (g_find_program_in_path ("p11-kit"))
++  if (TRUE)
+     start_p11_kit_server (flatpak_dir);
+   else
+     g_debug ("p11-kit not found");
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index 3f4bc56721ee..d00e4fa7f895 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -1,6 +1,6 @@
 --- a/tests/libtest.sh
 +++ b/tests/libtest.sh
-@@ -315,7 +315,7 @@
+@@ -296,7 +296,7 @@
          # running installed-tests: assume we know what we're doing
          :
      elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,16 +9,7 @@
          sed -e 's/^/# /' < bwrap-result
          echo "1..0 # SKIP Cannot run bwrap"
          exit 0
-@@ -323,7 +323,7 @@
- }
- 
- skip_without_python2 () {
--    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
-+    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
-         echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
-         exit 0
-     fi
-@@ -335,12 +335,12 @@
+@@ -309,12 +309,12 @@
  export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
  DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
  
@@ -43,7 +34,7 @@
  mkdir -p ${DIR}/usr/bin
  mkdir -p ${DIR}/usr/lib
  ln -s ../lib ${DIR}/usr/lib64
-@@ -35,73 +36,27 @@
+@@ -35,48 +36,27 @@
  else
      cp `which ldconfig` ${DIR}/usr/bin
  fi
@@ -73,31 +64,6 @@
  for i in $@; do
 -    I=`which $i`
 -    add_bin $I
--    if test $i == python2; then
--        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
--        # This is a hardcoded minimal set of modules we need in the current tests.
--        # Pretty hacky stuff. Add modules as needed.
--        PYDIR=/usr/lib/python2.7
--        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
--        for py in site os stat posixpath genericpath warnings \
--                       linecache types UserDict abc _abcoll \
--                       _weakrefset copy_reg traceback sysconfig \
--                       re sre_compile sre_parse sre_constants \
--                       _sysconfigdata ; do
--            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
--        done
--        # These might not exist, depending how Python was configured; and the
--        # part after ${so} might be "module" or ".x86_64-linux-gnu" or
--        # something else
--        for so in _locale strop ; do
--            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
--        done
--        for plat in $( cd ${PYDIR} && echo plat-* ); do
--            test -e ${PYDIR}/${plat} || continue
--            mkdir -p ${DIR}/usr/lib/python2.7/${plat}
--            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
--        done
--    fi
 -done
 -for i in `cat $BINS`; do
 -    echo Adding binary $i 1>&2
diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
index e855902a9301..408198bda5cb 100644
--- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
+++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
@@ -1,6 +1,6 @@
 --- a/common/flatpak-dir.c
 +++ b/common/flatpak-dir.c
-@@ -5467,7 +5467,7 @@ export_desktop_file (const char   *app,
+@@ -5758,7 +5758,7 @@ export_desktop_file (const char   *app,
  
        new_exec = g_string_new ("");
        g_string_append_printf (new_exec,
@@ -9,7 +9,7 @@
                                escaped_branch,
                                escaped_arch);
  
-@@ -6644,8 +6644,8 @@ flatpak_dir_deploy (FlatpakDir          *self,
+@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir          *self,
                                         error))
          return FALSE;
  

From 7d2c8bbe9a1712511150d533871eb4966754d180 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Sep 2018 04:52:18 +0200
Subject: [PATCH 0998/3253] flatpak-builder: add libyaml

---
 pkgs/development/tools/flatpak-builder/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 33f9ade46811..d2052bc0e8e2 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -29,6 +29,7 @@
 , libcap
 , libdwarf
 , libsoup
+, libyaml
 , ostree
 , patch
 , rpm
@@ -72,6 +73,7 @@ in stdenv.mkDerivation rec {
     libdwarf
     libsoup
     libxml2
+    libyaml
     ostree
   ];
 

From ffd478454d4a342d12d138ffbe93e6876ad242cb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 14 Sep 2018 16:23:11 +0800
Subject: [PATCH 0999/3253] xca: 2.1.0 -> 2.1.1

---
 pkgs/applications/misc/xca/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index ee4300cde0f5..7b95cf002ca1 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,15 +1,15 @@
-{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which
+{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig
 , libtool, openssl, qtbase, qttools }:
 
 mkDerivation rec {
   name = "xca-${version}";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner  = "chris2511";
     repo   = "xca";
     rev    = "RELEASE.${version}";
-    sha256 = "039qz6hh43hx8dcw2bq71mgy95zk09jyd3xxpldmxxd5d69zcr8m";
+    sha256 = "1d09329a80axwqhxixwasd8scsmh23vsq1076amy5c8173s4ambi";
   };
 
   postPatch = ''
@@ -17,15 +17,15 @@ mkDerivation rec {
       --replace /usr/bin/perl ${perl}/bin/perl
   '';
 
-  buildInputs = [ libtool openssl qtbase qttools ];
+  buildInputs = [ libtool openssl qtbase ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig which ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig qttools ];
 
   enableParallelBuilding = true;
 
   meta = with lib; {
-    description = "Interface for managing asymetric keys like RSA or DSA";
-    homepage    = http://xca.sourceforge.net/;
+    description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs";
+    homepage    = https://hohnstaedt.de/xca/;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ offline peterhoeg ];
     platforms   = platforms.all;

From 10a6ab75a851daf08466637827f6bca50a267bc3 Mon Sep 17 00:00:00 2001
From: brocking <imbrocking@gmail.com>
Date: Thu, 13 Sep 2018 17:23:17 +0100
Subject: [PATCH 1000/3253] scaleway-cli: 1.14 -> 1.17

---
 pkgs/tools/admin/scaleway-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index 0e8aacea4ef2..b246c7712ec9 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec{
   name = "scaleway-cli-${version}";
-  version = "1.14";
+  version = "1.17";
 
   goPackagePath = "github.com/scaleway/scaleway-cli";
 
@@ -10,7 +10,7 @@ buildGoPackage rec{
     owner = "scaleway";
     repo = "scaleway-cli";
     rev = "v${version}";
-    sha256 = "09rqw82clfdiixa9m3hphxh5v7w1gks3wicz1dvpay2sx28bpddr";
+    sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd";
   };
 
   meta = with stdenv.lib; {

From ffafe959ee302fe645a77dfae9a719b5d6709fa3 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 11 Sep 2018 23:20:20 +0200
Subject: [PATCH 1001/3253] rustc: 1.27 -> 1.29

---
 .../networking/browsers/firefox/packages.nix       |  6 ++++++
 pkgs/development/compilers/rust/bootstrap.nix      | 14 +++++++-------
 pkgs/development/compilers/rust/cargo.nix          |  3 +++
 pkgs/development/compilers/rust/default.nix        |  6 +++---
 pkgs/development/compilers/rust/rustc.nix          |  5 +++++
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 984d80167c39..b8f05cc8e5d6 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -28,6 +28,12 @@ rec {
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
+      # fix build with rust >= 1.29 and firefox < 63
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
+      (fetchpatch {
+        url = "https://github.com/mozilla/gecko-dev/commit/eec0d4f8714e6671402d41632232ef57348e65c4.patch";
+        sha256 = "1cjaqx811bcnp8b6z16q25csaclaic3b11q45ck02srd99n8qp0j";
+      })
     ];
 
     extraNativeBuildInputs = [ python3 ];
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 901675ff31b4..55348c5795ad 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.26.2";
+  version = "1.28.0";
 
   # fetch hashes by running `print-hashes.sh 1.24.1`
   hashes = {
-    i686-unknown-linux-gnu = "e22286190a074bfb6d47c9fde236d712a53675af1563ba85ea33e0d40165f755";
-    x86_64-unknown-linux-gnu = "d2b4fb0c544874a73c463993bde122f031c34897bb1eeb653d2ba2b336db83e6";
-    armv7-unknown-linux-gnueabihf = "1140387a61083e3ef10e7a097269200fc7e9db6f6cc9f270e04319b3b429c655";
-    aarch64-unknown-linux-gnu = "3dfad0dc9c795f7ee54c2099c9b7edf06b942adbbf02e9ed9e5d4b5e3f1f3759";
-    i686-apple-darwin = "3a5de30f3e334a66bd320ec0e954961d348434da39a826284e00d55ea60f8370";
-    x86_64-apple-darwin = "f193705d4c0572a358670dbacbf0ffadcd04b3989728b442f4680fa1e065fa72";
+    i686-unknown-linux-gnu = "de7cdb4e665e897ea9b10bf6fd545f900683296456d6a11d8510397bb330455f";
+    x86_64-unknown-linux-gnu = "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810";
+    armv7-unknown-linux-gnueabihf = "346558d14050853b87049e5e1fbfae0bf0360a2f7c57433c6985b1a879c349a2";
+    aarch64-unknown-linux-gnu = "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1";
+    i686-apple-darwin = "752e2c9182e057c4a54152d1e0b3949482c225d02bb69d9d9a4127dc2a65fb68";
+    x86_64-apple-darwin = "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 34932c911ebc..25a71965e0b4 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -28,6 +28,9 @@ rustPlatform.buildRustPackage rec {
 
   LIBGIT2_SYS_USE_PKG_CONFIG=1;
 
+  # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
+  RUSTC_BOOTSTRAP=1;
+
   # FIXME: Use impure version of CoreFoundation because of missing symbols.
   # CFURLSetResourcePropertyForKey is defined in the headers but there's no
   # corresponding implementation in the sources from opensource.apple.com.
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index d368c977f8f8..47415ac9177b 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.27.0";
-  cargoVersion = "1.27.0";
+  version = "1.29.0";
+  cargoVersion = "1.29.0";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c";
+    sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
   };
 in rec {
   rustc = callPackage ./rustc.nix {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 9c9788ff4834..a054ed0eb557 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -105,6 +105,11 @@ stdenv.mkDerivation {
     # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
     sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
 
+    # https://github.com/rust-lang/rust/issues/39522
+    echo removing gdb-version-sensitive tests...
+    find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
+    rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
+
     # Useful debugging parameter
     # export VERBOSE=1
   '' + optionalString stdenv.isDarwin ''

From c3612b97e625ad0d70c6ba56d191bcb9a403f44c Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 14 Sep 2018 14:30:19 +0200
Subject: [PATCH 1002/3253] fetchFromGitLab: add a group optional argument

For example, paperwork is at https://gitlab.gnome.org/World/OpenPaperwork/paperwork
and you can fetch this repo with group = "World", owner =
"OpenPaperwork", and repo = "paperwork".
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3cb6069caf8..efce3051f064 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -288,13 +288,13 @@ with pkgs;
 
   # gitlab example
   fetchFromGitLab = {
-    owner, repo, rev, domain ? "gitlab.com", name ? "source",
+    owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null,
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-    url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
-    meta.homepage = "https://${domain}/${owner}/${repo}/";
-  } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; };
+    url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) group+"%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
+    meta.homepage = "https://${domain}/${lib.optionalString (group != null) group+"/"}${owner}/${repo}/";
+  } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; };
 
   # gitweb example, snapshot support is optional in gitweb
   fetchFromRepoOrCz = {

From f4039397f634679afaf3b1ae1671e58ca52d90e9 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 14 Sep 2018 14:32:02 +0200
Subject: [PATCH 1003/3253] paperwork: 1.2.2 -> 1.2.4

---
 .../applications/office/paperwork/backend.nix | 20 +++++++++++++------
 .../applications/office/paperwork/default.nix | 18 ++++++++---------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 9e17d807fb14..7f82780fbe92 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, lib, fetchFromGitHub
+{ buildPythonPackage, lib, fetchFromGitLab
 
 , isPy3k, isPyPy
 
@@ -10,18 +10,26 @@
 
 buildPythonPackage rec {
   pname = "paperwork-backend";
-  version = "1.2.2";
+  version = "1.2.4";
 
-  src = fetchFromGitHub {
-    owner = "openpaperwork";
-    repo = "paperwork-backend";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    repo = "paperwork";
+    group = "World";
+    owner = "OpenPaperwork";
     rev = version;
-    sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf";
+    sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4";
   };
 
+  sourceRoot = "source/paperwork-backend";
+
   # Python 2.x is not supported.
   disabled = !isPy3k && !isPyPy;
 
+  patchPhase = ''
+    echo 'version = "${version}"' > paperwork_backend/_version.py
+  '';
+
   preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 14cde8415fd7..a48b6e1e1168 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,20 +1,14 @@
-{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
+{ lib, python3Packages, fetchFromGitLab, gtk3, cairo
 , aspellDicts, buildEnv
 , gnome3, hicolor-icon-theme, librsvg
 , xvfb_run, dbus, libnotify
 }:
 
 python3Packages.buildPythonApplication rec {
+  inherit (python3Packages.paperwork-backend) version src;
   name = "paperwork-${version}";
-  # Don't forget to also update paperwork-backend when updating this!
-  version = "1.2.2";
 
-  src = fetchFromGitHub {
-    repo = "paperwork";
-    owner = "openpaperwork";
-    rev = version;
-    sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk";
-  };
+  sourceRoot = "source/paperwork-gtk";
 
   # Patch out a few paths that assume that we're using the FHS:
   postPatch = ''
@@ -39,6 +33,12 @@ python3Packages.buildPythonApplication rec {
 
     sed -i -e 's/"logo"/"logo-icon-name"/g' \
       src/paperwork/frontend/aboutdialog/aboutdialog.glade
+
+    cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF
+    # -*- coding: utf-8 -*-
+    version = "${version}"
+    authors_code=""
+    EOF
   '';
 
   ASPELL_CONF = "dict-dir ${buildEnv {

From 5314a74ee6d8eefcd4f9a5cc6e676643baf36180 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 10 Sep 2018 17:27:56 +0200
Subject: [PATCH 1004/3253] pythonPackages.pyocr: 0.4.7 -> 0.5.3

---
 .../python-modules/pyocr/default.nix          | 46 +++++++--------
 .../python-modules/pyocr/paths.patch          | 57 +++++++++----------
 2 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index c30d80a00155..d5676f7e5fa8 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -1,47 +1,39 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pillow, six
-, tesseract, cuneiform, isPy3k
+{ lib, fetchFromGitLab, buildPythonPackage, pillow, six
+, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox
 }:
 
 buildPythonPackage rec {
   pname = "pyocr";
-  version = "0.4.7";
+  version = "0.5.3";
   name = pname + "-" + version;
   disabled = !isPy3k;
 
   # Don't fetch from PYPI because it doesn't contain tests.
-  src = fetchFromGitHub {
-    owner = "jflesch";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "OpenPaperwork";
     repo = "pyocr";
     rev = version;
-    sha256 = "1iw73r8yrgjf8g00yzpz62ymqbf89cqhyhl9g430srmsrq7mn2yd";
+    sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15";
   };
 
-  NIX_CUNEIFORM_CMD = "${cuneiform}/bin/cuneiform";
-  NIX_CUNEIFORM_DATA = "${cuneiform}/share/cuneiform";
-  NIX_LIBTESSERACT_PATH = "${tesseract}/lib/libtesseract.so";
-  NIX_TESSDATA_PREFIX = "${tesseract}/share/tessdata";
-  NIX_TESSERACT_CMD = "${tesseract}/bin/tesseract";
-
-  patches = [ ./paths.patch ];
+  patches = [ (substituteAll {
+    src = ./paths.patch;
+    inherit cuneiform tesseract;
+  })
+  ];
 
   postPatch = ''
-    substituteInPlace src/pyocr/cuneiform.py \
-      --subst-var NIX_CUNEIFORM_CMD \
-      --subst-var NIX_CUNEIFORM_CMD
-
-    substituteInPlace src/pyocr/tesseract.py \
-      --subst-var NIX_TESSERACT_CMD
-
-    substituteInPlace src/pyocr/libtesseract/tesseract_raw.py \
-      --subst-var NIX_TESSDATA_PREFIX \
-      --subst-var NIX_LIBTESSERACT_PATH
+    echo 'version = "${version}"' > src/pyocr/_version.py
 
     # Disable specific tests that are probably failing because of this issue:
     # https://github.com/jflesch/pyocr/issues/52
     for test in $disabledTests; do
       file="''${test%%:*}"
       fun="''${test#*:}"
-      echo "$fun = unittest.skip($fun)" >> "tests/tests_$file.py"
+      echo "import pytest" >> "tests/tests_$file.py"
+      echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py"
     done
   '';
 
@@ -57,14 +49,18 @@ buildPythonPackage rec {
     "libtesseract:TestLineBox.test_japanese"
     "libtesseract:TestTxt.test_japanese"
     "libtesseract:TestWordBox.test_japanese"
+    "libtesseract:TestTxt.test_multi"
+    "tesseract:TestTxt.test_multi"
     "tesseract:TestDigitLineBox.test_digits"
     "tesseract:TestTxt.test_japanese"
   ];
 
   propagatedBuildInputs = [ pillow six ];
+  checkInputs = [ pytest tox ];
+  checkPhase = "pytest";
 
   meta = {
-    homepage = "https://github.com/jflesch/pyocr";
+    inherit (src) homepage;
     description = "A Python wrapper for Tesseract and Cuneiform";
     license = lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch
index 3fe11598b7d3..9350d4050dad 100644
--- a/pkgs/development/python-modules/pyocr/paths.patch
+++ b/pkgs/development/python-modules/pyocr/paths.patch
@@ -1,28 +1,28 @@
-diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
-index a461d92..1f2b914 100644
---- a/src/pyocr/cuneiform.py
-+++ b/src/pyocr/cuneiform.py
+Index: current/src/pyocr/cuneiform.py
+===================================================================
+--- current.orig/src/pyocr/cuneiform.py
++++ current/src/pyocr/cuneiform.py
 @@ -27,13 +27,9 @@ from . import error
  from . import util
  
  
 -# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
 -CUNEIFORM_CMD = 'cuneiform'
-+CUNEIFORM_CMD = '@NIX_CUNEIFORM_CMD@'
++CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform'
  
 -CUNEIFORM_DATA_POSSIBLE_PATHS = [
 -    "/usr/local/share/cuneiform",
 -    "/usr/share/cuneiform",
 -]
-+CUNEIFORM_DATA_POSSIBLE_PATHS = ['@NIX_CUNEIFORM_DATA@']
++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform']
  
  LANGUAGES_LINE_PREFIX = "Supported languages: "
  LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
-diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
-index b4e7bda..47505f7 100644
---- a/src/pyocr/libtesseract/tesseract_raw.py
-+++ b/src/pyocr/libtesseract/tesseract_raw.py
-@@ -1,55 +1,13 @@
+Index: current/src/pyocr/libtesseract/tesseract_raw.py
+===================================================================
+--- current.orig/src/pyocr/libtesseract/tesseract_raw.py
++++ current/src/pyocr/libtesseract/tesseract_raw.py
+@@ -1,52 +1,13 @@
  import ctypes
  import logging
  import os
@@ -56,7 +56,13 @@ index b4e7bda..47505f7 100644
 -        # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on
 -        # Windows ?
 -        "../vs2010/DLL_Release/libtesseract302.dll",
+-        # prefer the most recent first
+-        "libtesseract305.dll",
+-        "libtesseract304.dll",
+-        "libtesseract303.dll",
 -        "libtesseract302.dll",
+-        "libtesseract400.dll",  # Tesseract 4 is still in alpha stage
+-        "libtesseract.dll",
 -        "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-4.dll",
 -        "C:\\Program Files (x86)\\Tesseract-OCR\\libtesseract-3.dll",
 -    ]
@@ -66,27 +72,18 @@ index b4e7bda..47505f7 100644
 -        "libtesseract.so.3",
 -    ]
 -
--
--g_libtesseract = None
--
--for libname in libnames:
--    try:
--        g_libtesseract = ctypes.cdll.LoadLibrary(libname)
--        break
--    except OSError:
--        pass
-+g_libtesseract = ctypes.cdll.LoadLibrary('@NIX_LIBTESSERACT_PATH@')
++libnames = [ "@tesseract@/lib/libtesseract.so" ]
  
+ g_libtesseract = None
  
- class PageSegMode(object):
-@@ -326,12 +284,11 @@ def init(lang=None):
+@@ -346,12 +307,11 @@ def init(lang=None):
      try:
          if lang:
              lang = lang.encode("utf-8")
 -        prefix = None
 -        if TESSDATA_PREFIX:
 -            prefix = TESSDATA_PREFIX.encode("utf-8")
-+        prefix = os.getenv('TESSDATA_PREFIX', '@NIX_TESSDATA_PREFIX@')
++        prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata')
 +        os.environ['TESSDATA_PREFIX'] = prefix
          g_libtesseract.TessBaseAPIInit3(
              ctypes.c_void_p(handle),
@@ -95,17 +92,17 @@ index b4e7bda..47505f7 100644
              ctypes.c_char_p(lang)
          )
          g_libtesseract.TessBaseAPISetVariable(
-diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
-index c935881..7139ffe 100755
---- a/src/pyocr/tesseract.py
-+++ b/src/pyocr/tesseract.py
-@@ -31,8 +31,7 @@ from .builders import DigitBuilder  # backward compatibility
+Index: current/src/pyocr/tesseract.py
+===================================================================
+--- current.orig/src/pyocr/tesseract.py
++++ current/src/pyocr/tesseract.py
+@@ -31,8 +31,7 @@ from .builders import DigitBuilder  # ba
  from .error import TesseractError  # backward compatibility
  from .util import digits_only
  
 -# CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
 -TESSERACT_CMD = 'tesseract.exe' if os.name == 'nt' else 'tesseract'
-+TESSERACT_CMD = '@NIX_TESSERACT_CMD@'
++TESSERACT_CMD = '@tesseract@/bin/tesseract'
  
  TESSDATA_EXTENSION = ".traineddata"
  

From cd599c8fa6b636ece76eebfc49a2cd0439002ef2 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 10 Sep 2018 17:29:08 +0200
Subject: [PATCH 1005/3253] pythonPackages.pypillowfight: 0.2 -> 0.2.4

---
 .../python-modules/pypillowfight/default.nix  | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +--------------
 2 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/pypillowfight/default.nix

diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
new file mode 100644
index 000000000000..b1f0a1a8461a
--- /dev/null
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, buildPythonPackage, fetchFromGitLab, nose, pillow
+, isPy3k, isPyPy
+}:
+buildPythonPackage rec {
+  name = "pypillowfight-${version}";
+  version = "0.2.4";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    group = "World";
+    owner = "OpenPaperwork";
+    repo = "libpillowfight";
+    rev = version;
+    sha256 = "0wbzfhbzim61fmkm7p7f2rwslacla1x00a6xp50haawjh9zfwc4y";
+  };
+
+  prePatch = ''
+    echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h
+  '';
+
+  # Disable tests because they're designed to only work on Debian:
+  # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174
+  doCheck = false;
+
+  # Python 2.x is not supported, see:
+  # https://github.com/jflesch/libpillowfight/issues/1
+  disabled = !isPy3k && !isPyPy;
+
+  # This is needed by setup.py regardless of whether tests are enabled.
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [ pillow ];
+
+  meta = with stdenv.lib; {
+    description = "Library containing various image processing algorithms";
+    inherit (src) homepage;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b98a1af7891..a35b9e095b1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3918,35 +3918,7 @@ in {
     };
   };
 
-  pypillowfight = buildPythonPackage rec {
-    name = "pypillowfight-${version}";
-    version = "0.2.1";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "jflesch";
-      repo = "libpillowfight";
-      rev = version;
-      sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z";
-    };
-
-    # Disable tests because they're designed to only work on Debian:
-    # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174
-    doCheck = false;
-
-    # Python 2.x is not supported, see:
-    # https://github.com/jflesch/libpillowfight/issues/1
-    disabled = !isPy3k && !isPyPy;
-
-    # This is needed by setup.py regardless of whether tests are enabled.
-    buildInputs = [ self.nose ];
-    propagatedBuildInputs = [ self.pillow ];
-
-    meta = {
-      description = "Library containing various image processing algorithms";
-      homepage = "https://github.com/jflesch/libpillowfight";
-      license = licenses.gpl3Plus;
-    };
-  };
+  pypillowfight = callPackage ../development/python-modules/pypillowfight { };
 
   pyprind = callPackage ../development/python-modules/pyprind { };
 

From 46cd67e6a194dcfcac62cfe8191748d05497713a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 10 Sep 2018 17:57:27 +0200
Subject: [PATCH 1006/3253] pythonPackages.{pyocr,pypillowfight}: fix homepage

---
 pkgs/development/python-modules/pyocr/default.nix         | 2 +-
 pkgs/development/python-modules/pypillowfight/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index d5676f7e5fa8..47a73c9c80af 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
   checkPhase = "pytest";
 
   meta = {
-    inherit (src) homepage;
+    inherit (src.meta) homepage;
     description = "A Python wrapper for Tesseract and Cuneiform";
     license = lib.licenses.gpl3Plus;
   };
diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index b1f0a1a8461a..76503122a1b1 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Library containing various image processing algorithms";
-    inherit (src) homepage;
+    inherit (src.meta) homepage;
     license = licenses.gpl3Plus;
   };
 }

From b415a573ba50cfd17a94cef280e5618dc0b32042 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Fri, 14 Sep 2018 14:56:23 +0200
Subject: [PATCH 1007/3253] terraform-landscape: 0.1.18 -> 0.2.0

---
 .../cluster/terraform-landscape/Gemfile.lock  |  4 ++--
 .../cluster/terraform-landscape/default.nix   | 17 +++++++-------
 .../cluster/terraform-landscape/gemset.nix    | 22 +++++++++++++++----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
index ccc2294b6a09..0b5a091fbb43 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     colorize (0.8.1)
-    commander (4.4.5)
+    commander (4.4.6)
       highline (~> 1.7.2)
     diffy (3.2.1)
     highline (1.7.10)
     polyglot (0.3.5)
-    terraform_landscape (0.1.18)
+    terraform_landscape (0.2.0)
       colorize (~> 0.7)
       commander (~> 4.4)
       diffy (~> 3.0)
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
index a0dca341ff3e..aa5235068505 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix
@@ -1,19 +1,18 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp, ruby }:
+let
+  version = (import ./gemset.nix).terraform_landscape.version;
+in bundlerApp {
+  pname = "terraform_landscape";
 
-bundlerEnv rec {
-  name = "terraform-landscape-${version}";
-
-  version = (import gemset).terraform_landscape.version;
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
+  exes = [ "landscape" ];
 
   meta = with lib; {
     description = "Improve Terraform's plan output to be easier to read and understand";
     homepage    = https://github.com/coinbase/terraform-landscape;
     license     = with licenses; apsl20;
-    maintainers = with maintainers; [ mbode ];
+    maintainers = with maintainers; [ mbode manveru ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
index 8dd57af4c73b..5c3946f3212e 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@@ -1,5 +1,7 @@
 {
   colorize = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -9,14 +11,18 @@
   };
   commander = {
     dependencies = ["highline"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sry6raysvg9qsx5nqqw09n8r8hvcsqzvci7xp2qk7jq3s9mgvnn";
+      sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf";
       type = "gem";
     };
-    version = "4.4.5";
+    version = "4.4.6";
   };
   diffy = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
@@ -25,6 +31,8 @@
     version = "3.2.1";
   };
   highline = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
@@ -33,6 +41,8 @@
     version = "1.7.10";
   };
   polyglot = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -42,15 +52,19 @@
   };
   terraform_landscape = {
     dependencies = ["colorize" "commander" "diffy" "treetop"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0476q2kx88w9srj7rlzl6skrza3pdgyym7zksw78infsb2105lg9";
+      sha256 = "1mlpbsmysyhhbjx40gbwxr4mx7d3qpblbf5ms2v607b8a3saapzj";
       type = "gem";
     };
-    version = "0.1.18";
+    version = "0.2.0";
   };
   treetop = {
     dependencies = ["polyglot"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";

From 14fbea9111c54a6356d63fc5ca5c2233182f1454 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 13 Sep 2018 17:15:39 +0300
Subject: [PATCH 1008/3253] raspberrypifw: 1.20180619 -> 1.20180817

---
 pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index b29cf88f168f..11a5074cff2c 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20180619";
+  version = "1.20180817";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "1wppk6c5mbanx9h2wa3yz3rzh5am8bqvgw23gxqgwhbar8w99cfn";
+    sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm";
   };
 
   installPhase = ''

From 9f8516745575c07ab07419aa30e6bb77b41fcd66 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 13 Sep 2018 17:16:04 +0300
Subject: [PATCH 1009/3253] linux_rpi: 1.20180619 -> 1.20180817

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index e6d7b1cee9db..d061e41eb2fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.14.50";
-  tag = "1.20180619";
+  modDirVersion = "4.14.62";
+  tag = "1.20180817";
 in
 stdenv.lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "0yccz8j3vrzv6h23b7yn7dx84kkzq3dmicm3shhz18nkpyyq71ch";
+    sha256 = "17k7c9hcp834qmlpllag8jc6xhym9wkr5lck1vr0y2wlcxccwnaz";
   };
 
   defconfig = {

From 61b2e0cba8d1faacd5ea80c6a332c1840412be19 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 13 Sep 2018 22:50:41 +0300
Subject: [PATCH 1010/3253] U-Boot: 2018.07 -> 2018.09

---
 pkgs/misc/uboot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 2bf5274eeb46..be770b634a30 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -14,11 +14,11 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2018.07";
+    version = "2018.09";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z";
+      sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3";
     };
 
     patches = [

From 48c81f0d555403b0d7619b39caef647c7f3e068d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 13 Sep 2018 21:36:29 -0700
Subject: [PATCH 1011/3253] vimPlugins: warn if alias is used inside overrides

---
 pkgs/misc/vim-plugins/aliases.nix   | 139 +++++++++
 pkgs/misc/vim-plugins/default.nix   | 449 +---------------------------
 pkgs/misc/vim-plugins/overrides.nix | 337 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |   1 -
 4 files changed, 491 insertions(+), 435 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/aliases.nix
 create mode 100644 pkgs/misc/vim-plugins/overrides.nix

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
new file mode 100644
index 000000000000..cfdd629369c0
--- /dev/null
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -0,0 +1,139 @@
+# Deprecated aliases - for backward compatibility
+
+lib: overriden:
+
+with overriden;
+
+let
+  # Removing recurseForDerivation prevents derivations of aliased attribute
+  # set to appear while listing all the packages available.
+  removeRecurseForDerivations = alias: with lib;
+    if alias.recurseForDerivations or false then
+      removeAttrs alias ["recurseForDerivations"]
+    else alias;
+
+  # Disabling distribution prevents top-level aliases for non-recursed package
+  # sets from building on Hydra.
+  removeDistribute = alias: with lib;
+    if isDerivation alias then
+      dontDistribute alias
+    else alias;
+
+  # Make sure that we are not shadowing something from
+  # all-packages.nix.
+  checkInPkgs = n: alias: if builtins.hasAttr n overriden
+                          then throw "Alias ${n} is still in vim-plugins"
+                          else alias;
+
+  mapAliases = aliases:
+     lib.mapAttrs (n: alias: removeDistribute
+                             (removeRecurseForDerivations
+                              (checkInPkgs n alias)))
+                     aliases;
+in
+
+mapAliases {
+  airline             = vim-airline;
+  alternative         = a-vim; # backwards compat, added 2014-10-21
+  bats                = bats-vim;
+  calendar            = calendar-vim;
+  coffee-script       = vim-coffee-script;
+  coffeeScript        = vim-coffee-script; # backwards compat, added 2014-10-18
+  Solarized           = vim-colors-solarized;
+  solarized           = vim-colors-solarized;
+  colors-solarized    = vim-colors-solarized;
+  caw                 = caw-vim;
+  colorsamplerpack    = Colour-Sampler-Pack;
+  Colour_Sampler_Pack = Colour-Sampler-Pack;
+  command_T           = command-t; # backwards compat, added 2014-10-18
+  commentary          = vim-commentary;
+  committia           = committia-vim;
+  concealedyank       = concealedyank-vim;
+  context-filetype    = context_filetype-vim;
+  Cosco               = cosco-vim;
+  css_color_5056      = vim-css-color;
+  CSApprox            = csapprox;
+  csv                 = csv-vim;
+  ctrlp               = ctrlp-vim;
+  cute-python         = vim-cute-python;
+  denite              = denite-nvim;
+  easy-align          = vim-easy-align;
+  easygit             = vim-easygit;
+  easymotion          = vim-easymotion;
+  echodoc             = echodoc-vim;
+  eighties            = vim-eighties;
+  extradite           = vim-extradite;
+  fugitive            = vim-fugitive;
+  ghc-mod-vim         = ghcmod-vim;
+  ghcmod              = ghcmod-vim;
+  goyo                = goyo-vim;
+  Gist                = gist-vim;
+  gitgutter           = vim-gitgutter;
+  gundo               = gundo-vim;
+  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
+  haskellConceal      = vim-haskellconceal; # backwards compat, added 2014-10-18
+  haskellConcealPlus  = vim-haskellConcealPlus;
+  haskellconceal      = vim-haskellconceal;
+  hier                = vim-hier;
+  hlint-refactor      = hlint-refactor-vim;
+  hoogle              = vim-hoogle;
+  Hoogle              = vim-hoogle;
+  ipython             = vim-ipython;
+  latex-live-preview  = vim-latex-live-preview;
+  maktaba             = vim-maktaba;
+  multiple-cursors    = vim-multiple-cursors;
+  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
+  neocomplete         = neocomplete-vim;
+  neoinclude          = neoinclude-vim;
+  neomru              = neomru-vim;
+  neosnippet          = neosnippet-vim;
+  The_NERD_Commenter  = nerdcommenter;
+  The_NERD_tree       = nerdtree;
+  open-browser        = open-browser-vim;
+  pathogen            = vim-pathogen;
+  polyglot            = vim-polyglot;
+  prettyprint         = vim-prettyprint;
+  quickrun            = vim-quickrun;
+  rainbow_parentheses = rainbow_parentheses-vim;
+  repeat              = vim-repeat;
+  riv                 = riv-vim;
+  rhubarb             = vim-rhubarb;
+  sensible            = vim-sensible;
+  signature           = vim-signature;
+  snipmate            = vim-snipmate;
+  sourcemap           = sourcemap-vim;
+  "sourcemap.vim"     = sourcemap-vim;
+  surround            = vim-surround;
+  sleuth              = vim-sleuth;
+  solidity            = vim-solidity;
+  stylish-haskell     = vim-stylish-haskell;
+  stylishHaskell      = vim-stylish-haskell; # backwards compat, added 2014-10-18
+  Supertab            = supertab;
+  Syntastic           = syntastic;
+  SyntaxRange         = vim-SyntaxRange;
+  table-mode          = vim-table-mode;
+  taglist             = taglist-vim;
+  tabpagebuffer       = tabpagebuffer-vim;
+  tabpagecd           = vim-tabpagecd;
+  Tabular             = tabular;
+  Tagbar              = tagbar;
+  thumbnail           = thumbnail-vim;
+  tlib                = tlib_vim;
+  tmux-navigator      = vim-tmux-navigator;
+  tmuxNavigator       = vim-tmux-navigator; # backwards compat, added 2014-10-18
+  tslime              = tslime-vim;
+  unite               = unite-vim;
+  UltiSnips           = ultisnips;
+  vim-addon-vim2nix   = vim2nix;
+  vimproc             = vimproc-vim;
+  vimshell            = vimshell-vim;
+  vinegar             = vim-vinegar;
+  watchdogs           = vim-watchdogs;
+  WebAPI              = webapi-vim;
+  wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
+  yankring            = YankRing-vim;
+  Yankring            = YankRing-vim;
+  YouCompleteMe       = youcompleteme;
+  xterm-color-table   = xterm-color-table-vim;
+  zeavim              = zeavim-vim;
+}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e68ccacfb426..4cde30556a33 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,449 +1,30 @@
 # TODO check that no license information gets lost
-{ callPackage, config, lib, stdenv
-, python, cmake, vim, vimUtils, ruby
-, which, fetchgit, llvmPackages, rustPlatform
-, xkb_switch, fzf, skim
-, python3, boost, icu, ncurses
-, ycmd, rake
-, pythonPackages, python3Packages
-, substituteAll
-, languagetool
-, Cocoa, CoreFoundation, CoreServices
-}:
+{ callPackage, config, lib, stdenv, vimUtils, vim, darwin, llvmPackages }:
 
 let
 
-  _skim = skim;
-
   inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix;
 
   generated = callPackage ./generated.nix {
     inherit buildVimPluginFrom2Nix;
   };
 
-# TL;DR
-# * Add your plugin to ./vim-plugin-names
-# * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
-# * run ./update.py
-#
-# If additional modifications to the build process are required,
-# use add an override to this file.
-self = generated // (with generated; {
-  vim2nix = buildVimPluginFrom2Nix {
-    name = "vim2nix";
-    src = ./vim2nix;
-    dependencies = ["vim-addon-manager"];
+  # TL;DR
+  # * Add your plugin to ./vim-plugin-names
+  # * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
+  # * run ./update.py
+  #
+  # If additional modifications to the build process are required,
+  # add to ./overrides.nix.
+  overrides = callPackage ./overrides.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices;
+    inherit buildVimPluginFrom2Nix;
   };
 
-  fzfWrapper = buildVimPluginFrom2Nix {
-    name = fzf.name;
-    src = fzf.src;
-    dependencies = [];
-  };
+  overriden = generated // (overrides generated);
 
-  skim = buildVimPluginFrom2Nix {
-    name = _skim.name;
-    src = _skim.vim;
-    dependencies = [];
-  };
+  aliases = lib.optionalAttrs (config.allowAliases or true) (import ./aliases.nix lib overriden);
 
-  LanguageClient-neovim = let
-    LanguageClient-neovim-src = fetchgit {
-      url = "https://github.com/autozimu/LanguageClient-neovim";
-      rev = "59f0299e8f7d7edd0653b5fc005eec74c4bf4aba";
-      sha256 = "0x6729w7v3bxlpvm8jz1ybn23qa0zqfgxl88q2j0bbs6rvp0w1jq";
-    };
-    LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
-      name = "LanguageClient-neovim-bin";
-      src = LanguageClient-neovim-src;
+in
 
-      cargoSha256 = "1afmz14j7ma2nrsx0njcqbh2wa430dr10hds78c031286ppgwjls";
-      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
-      # FIXME: Use impure version of CoreFoundation because of missing symbols.
-      #   Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
-      preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-        export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
-      '';
-    };
-  in buildVimPluginFrom2Nix {
-    name = "LanguageClient-neovim-2018-09-07";
-    src = LanguageClient-neovim-src;
-
-    dependencies = [];
-    propogatedBuildInputs = [ LanguageClient-neovim-bin ];
-
-    preFixup = ''
-      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
-        --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
-    '';
-  };
-
-  # do not auto-update this one, as the name clashes with vim-snippets
-  vim-docbk-snippets = buildVimPluginFrom2Nix {
-    name = "vim-docbk-snippets-2017-11-02";
-    src = fetchgit {
-      url = "https://github.com/jhradilek/vim-snippets";
-      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
-      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
-    };
-    dependencies = [];
-  };
-
-  clang_complete = clang_complete.overrideAttrs(old: {
-    # In addition to the arguments you pass to your compiler, you also need to
-    # specify the path of the C++ std header (if you are using C++).
-    # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
-    # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
-    # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
-    # as an alternative you can execute the following command:
-    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
-    preFixup = ''
-      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
-        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
-    '';
-  });
-
-  clighter8 = clighter8.overrideAttrs(old: {
-    preFixup = ''
-      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
-        -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
-    '';
-  });
-
-  command-t = command-t.overrideAttrs(old: {
-    buildInputs = [ ruby rake ];
-    buildPhase = ''
-      rake make
-      rm ruby/command-t/ext/command-t/*.o
-    '';
-  });
-
-  cpsm = cpsm.overrideAttrs(old: {
-    buildInputs = [
-      python3
-      stdenv
-      cmake
-      boost
-      icu
-      ncurses
-    ];
-    buildPhase = ''
-      patchShebangs .
-      export PY3=ON
-      ./install.sh
-    '';
-	});
-
-  ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
-    buildInputs = [ python ];
-    buildPhase = ''
-      patchShebangs .
-      ./install.sh
-    '';
-  });
-
-  deoplete-go = deoplete-go.overrideAttrs(old: {
-    buildInputs = [ python3 ];
-    buildPhase = ''
-      pushd ./rplugin/python3/deoplete/ujson
-      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
-      popd
-      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
-   '';
-  });
-
-  ensime-vim = ensime-vim.overrideAttrs(old: {
-    passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
-    dependencies = ["vimproc" "vimshell" "self" "forms"];
-  });
-
-  forms = forms.overrideAttrs(old: {
-		dependencies = ["self"];
-	});
-
-  gitv = gitv.overrideAttrs(old: {
-		dependencies = ["gitv"];
-  });
-
-  ncm2 = ncm2.overrideAttrs(old: {
-    dependencies = ["nvim-yarp"];
-  });
-
-  ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
-    dependencies = ["ultisnips"];
-  });
-
-  taglist-vim = taglist-vim.overrideAttrs(old: {
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
-  });
-
-  vimshell-vim = vimshell-vim.overrideAttrs(old: {
-    dependencies = [ "vimproc-vim" ];
-  });
-
-  vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
-    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
-  });
-
-  vim-addon-actions = vim-addon-actions.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" "tlib" ];
-  });
-
-  vim-addon-async = vim-addon-async.overrideAttrs(old: {
-    dependencies = [ "vim-addon-signs" ];
-  });
-
-  vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" ];
-  });
-
-  vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
-  });
-
-  vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
-    dependencies = [ "tlib" ];
-  });
-
-  vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
-    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
-  });
-
-  vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
-    dependencies = [
-      "vim-addon-completion"
-      "vim-addon-goto-thing-at-cursor"
-      "vim-addon-errorformats"
-      "vim-addon-actions"
-      "vim-addon-mw-utils" "tlib"
-    ];
-  });
-
-  vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
-    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
-  });
-
-  vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
-    dependencies = ["vim-addon-mw-utils" "tlib"];
-  });
-
-  vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
-    dependencies = [ "vim-addon-mw-utils" "tlib" ];
-  });
-
-  vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
-    dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
-  });
-
-  vim-bazel = vim-bazel.overrideAttrs(old: {
-    dependencies = ["maktaba"];
-  });
-
-  vim-codefmt = vim-codefmt.overrideAttrs(old: {
-		dependencies = ["maktaba"];
-	});
-
-  vim-easytags = vim-easytags.overrideAttrs(old: {
-		dependencies = ["vim-misc"];
-	});
-
-  vim-grammarous = vim-grammarous.overrideAttrs(old: {
-    # use `:GrammarousCheck` to initialize checking
-    # In neovim, you also want to use set
-    #   let g:grammarous#show_first_error = 1
-    # see https://github.com/rhysd/vim-grammarous/issues/39
-    patches = [
-      (substituteAll {
-        src = ./patches/vim-grammarous/set_default_languagetool.patch;
-        inherit languagetool;
-      })
-    ];
-  });
-
-  vim-hier = vim-hier.overrideAttrs(old: {
-    buildInputs = [ vim ];
-  });
-
-  vim-isort = vim-isort.overrideAttrs(old: {
-    postPatch = ''
-      substituteInPlace ftplugin/python_vimisort.vim \
-        --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
-    '';
-  });
-
-	vim-snipmate = vim-snipmate.overrideAttrs(old: {
-		dependencies = ["vim-addon-mw-utils" "tlib"];
-	});
-
-
-  vim-wakatime = vim-wakatime.overrideAttrs(old: {
-    buildInputs = [ python ];
-  });
-
-  vim-xdebug = vim-xdebug.overrideAttrs(old: {
-    postInstall = false;
-  });
-
-  vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
-    patchPhase = ''
-      substituteInPlace plugin/xkbswitch.vim \
-        --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
-    '';
-    buildInputs = [ xkb_switch ];
-  });
-
-  vim-yapf = vim-yapf.overrideAttrs(old: {
-    buildPhase = ''
-      substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
-    '';
-  });
-
-  vimproc-vim = vimproc-vim.overrideAttrs(old: {
-    buildInputs = [ which ];
-
-    buildPhase = ''
-      substituteInPlace autoload/vimproc.vim \
-        --replace vimproc_mac.so vimproc_unix.so \
-        --replace vimproc_linux64.so vimproc_unix.so \
-        --replace vimproc_linux32.so vimproc_unix.so
-      make -f make_unix.mak
-    '';
-  });
-
-  YankRing-vim = YankRing-vim.overrideAttrs(old: {
-    sourceRoot = ".";
-  });
-
-  youcompleteme = youcompleteme.overrideAttrs(old: {
-    buildPhase = ''
-      substituteInPlace plugin/youcompleteme.vim \
-        --replace "'ycm_path_to_python_interpreter', '''" \
-        "'ycm_path_to_python_interpreter', '${python}/bin/python'"
-
-      rm -r third_party/ycmd
-      ln -s ${ycmd}/lib/ycmd third_party
-    '';
-
-    meta = {
-      description = "A code-completion engine for Vim";
-      homepage = https://github.com/Valloric/YouCompleteMe;
-      license = stdenv.lib.licenses.gpl3;
-      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
-      platforms = stdenv.lib.platforms.unix;
-    };
-  });
-}) // lib.optionalAttrs (config.allowAliases or true) (with self; {
-  # aliases
-  airline             = vim-airline;
-  alternative         = a-vim; # backwards compat, added 2014-10-21
-  bats                = bats-vim;
-  calendar            = calendar-vim;
-  coffee-script       = vim-coffee-script;
-  coffeeScript        = coffee-script; # backwards compat, added 2014-10-18
-  Solarized           = vim-colors-solarized;
-  solarized           = vim-colors-solarized;
-  colors-solarized    = vim-colors-solarized;
-  caw                 = caw-vim;
-  colorsamplerpack    = Colour_Sampler_Pack;
-  Colour_Sampler_Pack = Colour-Sampler-Pack;
-  command_T           = command-t; # backwards compat, added 2014-10-18
-  commentary          = vim-commentary;
-  committia           = committia-vim;
-  concealedyank       = concealedyank-vim;
-  context-filetype    = context_filetype-vim;
-  Cosco               = cosco-vim;
-  css_color_5056      = vim-css-color;
-  CSApprox            = csapprox;
-  csv                 = csv-vim;
-  ctrlp               = ctrlp-vim;
-  cute-python         = vim-cute-python;
-  denite              = denite-nvim;
-  easy-align          = vim-easy-align;
-  easygit             = vim-easygit;
-  easymotion          = vim-easymotion;
-  echodoc             = echodoc-vim;
-  eighties            = vim-eighties;
-  extradite           = vim-extradite;
-  fugitive            = vim-fugitive;
-  ghc-mod-vim         = ghcmod-vim;
-  ghcmod              = ghcmod-vim;
-  goyo                = goyo-vim;
-  Gist                = gist-vim;
-  gitgutter           = vim-gitgutter;
-  gundo               = gundo-vim;
-  Gundo               = gundo-vim; # backwards compat, added 2015-10-03
-  haskellConceal      = haskellconceal; # backwards compat, added 2014-10-18
-  haskellConcealPlus  = vim-haskellConcealPlus;
-  haskellconceal      = vim-haskellconceal;
-  hier                = vim-hier;
-  hlint-refactor      = hlint-refactor-vim;
-  hoogle              = vim-hoogle;
-  Hoogle              = vim-hoogle;
-  ipython             = vim-ipython;
-  latex-live-preview  = vim-latex-live-preview;
-  maktaba             = vim-maktaba;
-  multiple-cursors    = vim-multiple-cursors;
-  necoGhc             = neco-ghc; # backwards compat, added 2014-10-18
-  neocomplete         = neocomplete-vim;
-  neoinclude          = neoinclude-vim;
-  neomru              = neomru-vim;
-  neosnippet          = neosnippet-vim;
-  The_NERD_Commenter  = nerdcommenter;
-  The_NERD_tree       = nerdtree;
-  open-browser        = open-browser-vim;
-  pathogen            = vim-pathogen;
-  polyglot            = vim-polyglot;
-  prettyprint         = vim-prettyprint;
-  quickrun            = vim-quickrun;
-  rainbow_parentheses = rainbow_parentheses-vim;
-  repeat              = vim-repeat;
-  riv                 = riv-vim;
-  rhubarb             = vim-rhubarb;
-  sensible            = vim-sensible;
-  signature           = vim-signature;
-  snipmate            = vim-snipmate;
-  sourcemap           = sourcemap-vim;
-  "sourcemap.vim"     = sourcemap-vim;
-  surround            = vim-surround;
-  sleuth              = vim-sleuth;
-  solidity            = vim-solidity;
-  stylish-haskell     = vim-stylish-haskell;
-  stylishHaskell      = stylish-haskell; # backwards compat, added 2014-10-18
-  Supertab            = supertab;
-  Syntastic           = syntastic;
-  SyntaxRange         = vim-SyntaxRange;
-  table-mode          = vim-table-mode;
-  taglist             = taglist-vim;
-  tabpagebuffer       = tabpagebuffer-vim;
-  tabpagecd           = vim-tabpagecd;
-  Tabular             = tabular;
-  Tagbar              = tagbar;
-  thumbnail           = thumbnail-vim;
-  tlib                = tlib_vim;
-  tmux-navigator      = vim-tmux-navigator;
-  tmuxNavigator       = tmux-navigator; # backwards compat, added 2014-10-18
-  tslime              = tslime-vim;
-  unite               = unite-vim;
-  UltiSnips           = ultisnips;
-  vim-addon-vim2nix   = vim2nix;
-  vimproc             = vimproc-vim;
-  vimshell            = vimshell-vim;
-  vinegar             = vim-vinegar;
-  watchdogs           = vim-watchdogs;
-  WebAPI              = webapi-vim;
-  wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
-  yankring            = YankRing-vim;
-  Yankring            = YankRing-vim;
-  YouCompleteMe       = youcompleteme;
-  xterm-color-table   = xterm-color-table-vim;
-  zeavim              = zeavim-vim;
-
-});
-in self
+overriden // aliases
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
new file mode 100644
index 000000000000..b02cac2b7052
--- /dev/null
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -0,0 +1,337 @@
+{config, lib, stdenv
+, python, cmake, vim, vimUtils, ruby
+, which, fetchgit, llvmPackages, rustPlatform
+, xkb_switch, fzf, skim
+, python3, boost, icu, ncurses
+, ycmd, rake
+, pythonPackages, python3Packages
+, substituteAll
+, languagetool
+, Cocoa, CoreFoundation, CoreServices
+, buildVimPluginFrom2Nix
+}:
+
+let
+
+  _skim = skim;
+
+in
+
+generated:
+
+with generated;
+
+{
+
+  vim2nix = buildVimPluginFrom2Nix {
+    name = "vim2nix";
+    src = ./vim2nix;
+    dependencies = ["vim-addon-manager"];
+  };
+
+  fzfWrapper = buildVimPluginFrom2Nix {
+    name = fzf.name;
+    src = fzf.src;
+    dependencies = [];
+  };
+
+  skim = buildVimPluginFrom2Nix {
+    name = _skim.name;
+    src = _skim.vim;
+    dependencies = [];
+  };
+
+  LanguageClient-neovim = let
+    LanguageClient-neovim-src = fetchgit {
+      url = "https://github.com/autozimu/LanguageClient-neovim";
+      rev = "59f0299e8f7d7edd0653b5fc005eec74c4bf4aba";
+      sha256 = "0x6729w7v3bxlpvm8jz1ybn23qa0zqfgxl88q2j0bbs6rvp0w1jq";
+    };
+    LanguageClient-neovim-bin = rustPlatform.buildRustPackage {
+      name = "LanguageClient-neovim-bin";
+      src = LanguageClient-neovim-src;
+
+      cargoSha256 = "1afmz14j7ma2nrsx0njcqbh2wa430dr10hds78c031286ppgwjls";
+      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
+      # FIXME: Use impure version of CoreFoundation because of missing symbols.
+      #   Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable"
+      preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+        export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS"
+      '';
+    };
+  in buildVimPluginFrom2Nix {
+    name = "LanguageClient-neovim-2018-09-07";
+    src = LanguageClient-neovim-src;
+
+    dependencies = [];
+    propogatedBuildInputs = [ LanguageClient-neovim-bin ];
+
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
+        --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
+    '';
+  };
+
+  # do not auto-update this one, as the name clashes with vim-snippets
+  vim-docbk-snippets = buildVimPluginFrom2Nix {
+    name = "vim-docbk-snippets-2017-11-02";
+    src = fetchgit {
+      url = "https://github.com/jhradilek/vim-snippets";
+      rev = "69cce66defdf131958f152ea7a7b26c21ca9d009";
+      sha256 = "1363b2fmv69axrl2hm74dmx51cqd8k7rk116890qllnapzw1zjgc";
+    };
+    dependencies = [];
+  };
+
+  clang_complete = clang_complete.overrideAttrs(old: {
+    # In addition to the arguments you pass to your compiler, you also need to
+    # specify the path of the C++ std header (if you are using C++).
+    # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
+    # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
+    # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
+    # as an alternative you can execute the following command:
+    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
+        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
+    '';
+  });
+
+  clighter8 = clighter8.overrideAttrs(old: {
+    preFixup = ''
+      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
+        -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
+    '';
+  });
+
+  command-t = command-t.overrideAttrs(old: {
+    buildInputs = [ ruby rake ];
+    buildPhase = ''
+      rake make
+      rm ruby/command-t/ext/command-t/*.o
+    '';
+  });
+
+  cpsm = cpsm.overrideAttrs(old: {
+    buildInputs = [
+      python3
+      stdenv
+      cmake
+      boost
+      icu
+      ncurses
+    ];
+    buildPhase = ''
+      patchShebangs .
+      export PY3=ON
+      ./install.sh
+    '';
+  });
+
+  ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: {
+    buildInputs = [ python ];
+    buildPhase = ''
+      patchShebangs .
+      ./install.sh
+    '';
+  });
+
+  deoplete-go = deoplete-go.overrideAttrs(old: {
+    buildInputs = [ python3 ];
+    buildPhase = ''
+      pushd ./rplugin/python3/deoplete/ujson
+      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
+      popd
+      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
+   '';
+  });
+
+  ensime-vim = ensime-vim.overrideAttrs(old: {
+    passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
+    dependencies = ["vimproc" "vimshell" "self" "forms"];
+  });
+
+  forms = forms.overrideAttrs(old: {
+    dependencies = ["self"];
+  });
+
+  gitv = gitv.overrideAttrs(old: {
+    dependencies = ["gitv"];
+  });
+
+  ncm2 = ncm2.overrideAttrs(old: {
+    dependencies = ["nvim-yarp"];
+  });
+
+  ncm2-ultisnips = ncm2-ultisnips.overrideAttrs(old: {
+    dependencies = ["ultisnips"];
+  });
+
+  taglist-vim = taglist-vim.overrideAttrs(old: {
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
+  });
+
+  vimshell-vim = vimshell-vim.overrideAttrs(old: {
+    dependencies = [ "vimproc-vim" ];
+  });
+
+  vim-addon-manager = vim-addon-manager.overrideAttrs(old: {
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
+  });
+
+  vim-addon-actions = vim-addon-actions.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  });
+
+  vim-addon-async = vim-addon-async.overrideAttrs(old: {
+    dependencies = [ "vim-addon-signs" ];
+  });
+
+  vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" ];
+  });
+
+  vim-addon-completion = vim-addon-completion.overrideAttrs(old: {
+    dependencies = [ "tlib" ];
+  });
+
+  vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: {
+    dependencies = [ "tlib" ];
+  });
+
+  vim-addon-mru = vim-addon-mru.overrideAttrs(old: {
+    dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
+  });
+
+  vim-addon-nix = vim-addon-nix.overrideAttrs(old: {
+    dependencies = [
+      "vim-addon-completion"
+      "vim-addon-goto-thing-at-cursor"
+      "vim-addon-errorformats"
+      "vim-addon-actions"
+      "vim-addon-mw-utils" "tlib"
+    ];
+  });
+
+  vim-addon-sql = vim-addon-sql.overrideAttrs(old: {
+    dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
+  });
+
+  vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: {
+    dependencies = ["vim-addon-mw-utils" "tlib"];
+  });
+
+  vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: {
+    dependencies = [ "vim-addon-mw-utils" "tlib" ];
+  });
+
+  vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: {
+    dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ];
+  });
+
+  vim-bazel = vim-bazel.overrideAttrs(old: {
+    dependencies = ["maktaba"];
+  });
+
+  vim-codefmt = vim-codefmt.overrideAttrs(old: {
+    dependencies = ["maktaba"];
+  });
+
+  vim-easytags = vim-easytags.overrideAttrs(old: {
+    dependencies = ["vim-misc"];
+  });
+
+  vim-grammarous = vim-grammarous.overrideAttrs(old: {
+    # use `:GrammarousCheck` to initialize checking
+    # In neovim, you also want to use set
+    #   let g:grammarous#show_first_error = 1
+    # see https://github.com/rhysd/vim-grammarous/issues/39
+    patches = [
+      (substituteAll {
+        src = ./patches/vim-grammarous/set_default_languagetool.patch;
+        inherit languagetool;
+      })
+    ];
+  });
+
+  vim-hier = vim-hier.overrideAttrs(old: {
+    buildInputs = [ vim ];
+  });
+
+  vim-isort = vim-isort.overrideAttrs(old: {
+    postPatch = ''
+      substituteInPlace ftplugin/python_vimisort.vim \
+        --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
+    '';
+  });
+
+  vim-snipmate = vim-snipmate.overrideAttrs(old: {
+    dependencies = ["vim-addon-mw-utils" "tlib"];
+  });
+
+
+  vim-wakatime = vim-wakatime.overrideAttrs(old: {
+    buildInputs = [ python ];
+  });
+
+  vim-xdebug = vim-xdebug.overrideAttrs(old: {
+    postInstall = false;
+  });
+
+  vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: {
+    patchPhase = ''
+      substituteInPlace plugin/xkbswitch.vim \
+        --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+    '';
+    buildInputs = [ xkb_switch ];
+  });
+
+  vim-yapf = vim-yapf.overrideAttrs(old: {
+    buildPhase = ''
+      substituteInPlace ftplugin/python_yapf.vim \
+        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
+    '';
+  });
+
+  vimproc-vim = vimproc-vim.overrideAttrs(old: {
+    buildInputs = [ which ];
+
+    buildPhase = ''
+      substituteInPlace autoload/vimproc.vim \
+        --replace vimproc_mac.so vimproc_unix.so \
+        --replace vimproc_linux64.so vimproc_unix.so \
+        --replace vimproc_linux32.so vimproc_unix.so
+      make -f make_unix.mak
+    '';
+  });
+
+  YankRing-vim = YankRing-vim.overrideAttrs(old: {
+    sourceRoot = ".";
+  });
+
+  youcompleteme = youcompleteme.overrideAttrs(old: {
+    buildPhase = ''
+      substituteInPlace plugin/youcompleteme.vim \
+        --replace "'ycm_path_to_python_interpreter', '''" \
+        "'ycm_path_to_python_interpreter', '${python}/bin/python'"
+
+      rm -r third_party/ycmd
+      ln -s ${ycmd}/lib/ycmd third_party
+    '';
+
+    meta = {
+      description = "A code-completion engine for Vim";
+      homepage = https://github.com/Valloric/YouCompleteMe;
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
+      platforms = stdenv.lib.platforms.unix;
+    };
+  });
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 416ec54a2318..e8b8f6701f3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22097,7 +22097,6 @@ with pkgs;
   vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };
 
   vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices;
     llvmPackages = llvmPackages_39;
   });
 

From 3de8769c87bd54ff5e61a0cfbe28adeb2c904a37 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 14 Sep 2018 18:35:06 +0200
Subject: [PATCH 1012/3253] flink: 1.5.0 -> 1.6.0

---
 pkgs/applications/networking/cluster/flink/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix                        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 402a03b77f4a..b23b730a1cab 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, jre
-, version ? "1.5" }:
+, version ? "1.6" }:
 
 let
   versionMap = {
@@ -21,6 +21,12 @@ let
       sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
       hadoopBundle = "";
     };
+    "1.6" = {
+      flinkVersion = "1.6.0";
+      scalaVersion = "2.11";
+      sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
+      hadoopBundle = "";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c3295c1258f..01b97588293b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16338,6 +16338,7 @@ with pkgs;
   flink = callPackage ../applications/networking/cluster/flink { };
   flink_1_3 = flink.override { version = "1.3"; };
   flink_1_4 = flink.override { version = "1.4"; };
+  flink_1_5 = flink.override { version = "1.5"; };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {
      inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;

From c8f602528bd6d505163c35abf79a815b0b3e3afb Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 14 Sep 2018 18:35:39 +0200
Subject: [PATCH 1013/3253] flink_1_5: 1.5.0 -> 1.5.3

---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index b23b730a1cab..d9c96da70b14 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -16,9 +16,9 @@ let
       hadoopBundle = "";
     };
     "1.5" = {
-      flinkVersion = "1.5.0";
+      flinkVersion = "1.5.3";
       scalaVersion = "2.11";
-      sha256 = "0n5023dj8ivmbhqxmb3abmfh3ahb9vmcywq5i0ll5p7xxcw2c1cv";
+      sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
       hadoopBundle = "";
     };
     "1.6" = {

From 3c57887f64cfa9c8e1eca8979a587566fd4eec25 Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Fri, 14 Sep 2018 17:05:40 +0000
Subject: [PATCH 1014/3253] nbd: add which to buildInputs (#46635)

* NBD: add which to buildInputs.
* NBD: move pkgconfig and which to nativeBuildInputs.
---
 pkgs/tools/networking/nbd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 0f7f75b989e2..75e2b45110fe 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ stdenv, fetchurl, pkgconfig, glib, which }:
 
 stdenv.mkDerivation rec {
   name = "nbd-3.18";
@@ -8,10 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq";
   };
 
-  buildInputs =
-    [ pkgconfig glib ]
+  buildInputs = [ glib ]
     ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
 
+  nativeBuildInputs = [ pkgconfig which ];
+
   postInstall = ''
     mkdir -p "$out/share/doc/${name}"
     cp README.md "$out/share/doc/${name}/"

From 6b7cefdc58b58b2550c7bd6a3f78988a206f866f Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Fri, 14 Sep 2018 19:41:03 +0200
Subject: [PATCH 1015/3253] gitAndTools.grv: fix darwin build by using go 1.9

cf. https://github.com/fsnotify/fsevents/issues/40

/cc ZHF #45961
---
 .../version-management/git-and-tools/grv/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index cfb028004c70..3b4e3a452111 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
+{ stdenv, buildGo19Package, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
 let
   version = "0.2.0";
 in
-buildGoPackage {
+buildGo19Package {
   name = "grv-${version}";
 
   buildInputs = [ ncurses readline curl libgit2_0_27 ];

From 541b2413b48d9f91f98c3708de2f07441a71ef51 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 14 Sep 2018 18:51:37 +0200
Subject: [PATCH 1016/3253] afew: add manpage

Generate the manpage which was previously missing.
---
 .../networking/mailreaders/afew/default.nix          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index e2b3d073dd33..bdf39de0651c 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -9,12 +9,22 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0105glmlkpkjqbz350dxxasvlfx9dk0him9vwbl86andzi106ygz";
   };
 
-  buildInputs = with pythonPackages; [ setuptools_scm ];
+  nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
 
   propagatedBuildInputs = with pythonPackages; [
     pythonPackages.notmuch chardet dkimpy
   ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
 
+  postBuild =  ''
+    make -C docs man
+  '';
+
+  postInstall = ''
+    mandir="$out/share/man/man1"
+    mkdir -p "$mandir"
+    cp docs/build/man/* "$mandir"
+  '';
+
   makeWrapperArgs = [
     ''--prefix PATH ':' "${notmuch}/bin"''
   ];

From 4c1f27a4fc6fece6b7346f9f5e48c7a7d0148cb6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Sep 2018 13:18:14 -0500
Subject: [PATCH 1017/3253] kmsxx: 2017-10-10 -> 2018-09-10

Various improvements -- if nothing else the 'kmstest'
utility now explains properly when permissions problem :).
---
 pkgs/development/libraries/kmsxx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 8be8eb713572..d270e2f0678d 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "kmsxx";
-  version = "2017-10-10";
+  version = "2018-09-10";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "tomba";
     repo = "kmsxx";
     fetchSubmodules = true;
-    rev = "f32b82c17cd357ae1c8ed2636266113955293feb";
-    sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj";
+    rev = "524176c33ee2b79f78d454fa621e0d32e7e72488";
+    sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8";
   };
 
   enableParallelBuilding = true;

From 268d72ec5ecc190b49df213b8dea105fe9a7336b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Sep 2018 13:28:10 -0500
Subject: [PATCH 1018/3253] kmscube: 2017-03-19 -> 2018-06-17 (and fix
 homepage!)

---
 pkgs/os-specific/linux/kmscube/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index 99ef7d4a5508..442c54ac8462 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "kmscube-2017-03-19";
+  name = "kmscube-2018-06-17";
 
   src = fetchgit {
     url = git://anongit.freedesktop.org/mesa/kmscube;
-    rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
-    sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
+    rev = "9dcce71e603616ee7a54707e932f962cdf8fb20a";
+    sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Example OpenGL app using KMS/GBM";
-    homepage = https://github.com/robclark/kmscube;
+    homepage = https://gitlab.freedesktop.org/mesa/kmscube;
     license = licenses.mit;
     maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.linux;

From 884c629832c663c0c6b82d17bbe15ec48ca3f5c7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 16:50:22 +0200
Subject: [PATCH 1019/3253] accuraterip-checksum: init at 1.5

---
 .../audio/accuraterip-checksum/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/audio/accuraterip-checksum/default.nix

diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix
new file mode 100644
index 000000000000..502859cd52d3
--- /dev/null
+++ b/pkgs/tools/audio/accuraterip-checksum/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libsndfile }:
+
+stdenv.mkDerivation rec {
+  name = "accuraterip-checksum-${version}";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "leo-bogert";
+    repo = "accuraterip-checksum";
+    rev = "version${version}";
+    sha256 = "1a6biy78jb094rifazn4a2g1dlhryg5q8p8gwj0a60ipl0vfb9bj";
+  };
+
+  buildInputs = [ libsndfile ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -m755 accuraterip-checksum "$out/bin/accuraterip-checksum"
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Program for computing the AccurateRip checksum of singletrack WAV files";
+    homepage = https://github.com/leo-bogert/accuraterip-checksum;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 671b5df3586c..5205aeb07294 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -426,6 +426,8 @@ with pkgs;
 
   acct = callPackage ../tools/system/acct { };
 
+  accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
+
   acme-sh = callPackage ../tools/admin/acme.sh { };
 
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {

From a74b4cf6ace5ca9c30b3bcc3c49ff00354f63e70 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 16:42:28 +0200
Subject: [PATCH 1020/3253] whipper: replace morituri

morituri has been dead for a while now and uses gst-python which is
no longer supported wth Python 2. whipper is a maintained fork,
packaged, for example, in Arch.
---
 pkgs/applications/audio/morituri/default.nix |  55 ----------
 pkgs/applications/audio/morituri/paths.patch |  87 ---------------
 pkgs/applications/audio/whipper/default.nix  |  48 +++++++++
 pkgs/applications/audio/whipper/paths.patch  | 105 +++++++++++++++++++
 pkgs/top-level/aliases.nix                   |   1 +
 pkgs/top-level/all-packages.nix              |   4 +-
 6 files changed, 156 insertions(+), 144 deletions(-)
 delete mode 100644 pkgs/applications/audio/morituri/default.nix
 delete mode 100644 pkgs/applications/audio/morituri/paths.patch
 create mode 100644 pkgs/applications/audio/whipper/default.nix
 create mode 100644 pkgs/applications/audio/whipper/paths.patch

diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
deleted file mode 100644
index d4c67bb5622c..000000000000
--- a/pkgs/applications/audio/morituri/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
-, gst-python, gst-plugins-base, gst-plugins-good
-, utillinux, makeWrapper, substituteAll, autoreconfHook }:
-
-let
-  inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
-  name = "morituri-${version}";
-  version = "0.2.3.20151109";
-  namePrefix = "";
-
-  src = fetchgit {
-    url = "https://github.com/thomasvs/morituri.git";
-    fetchSubmodules = true;
-    rev = "135b2f7bf27721177e3aeb1d26403f1b29116599";
-    sha256 = "1sl5y5j3gdbynf2v0gf9dwd2hzawj8lm8ywadid7qm34yn8lx12k";
-  };
-
-  pythonPath = with pythonPackages; [
-    pygobject2 gst-python musicbrainzngs
-    pycdio pyxdg setuptools
-    CDDB
-  ];
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [
-    python cdparanoia cdrdao utillinux makeWrapper
-    gst-plugins-base gst-plugins-good
-  ] ++ pythonPath;
-
-  patches = [
-    (substituteAll {
-      src = ./paths.patch;
-      inherit cdrdao cdparanoia python utillinux;
-    })
-  ];
-
-  # This package contains no binaries to patch or strip.
-  dontPatchELF = true;
-  dontStrip = true;
-
-  postInstall = ''
-    wrapProgram "$out/bin/rip" \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://thomas.apestaart.org/morituri/trac/;
-    description = "A CD ripper aiming for accuracy over speed";
-    maintainers = with maintainers; [ rycee jgeerds ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch
deleted file mode 100644
index b3372dae48bf..000000000000
--- a/pkgs/applications/audio/morituri/paths.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c115c2c..78c883e 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap
- man_MANS = rip.1
- 
- rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
--	PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
-+	PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
- 
- clean-local:
- 	@rm -rf reference
-diff --git a/morituri/common/program.py b/morituri/common/program.py
-index d340fdd..15cb751 100644
---- a/morituri/common/program.py
-+++ b/morituri/common/program.py
-@@ -92,13 +92,13 @@ class Program(log.Loggable):
-         """
-         Load the given device.
-         """
--        os.system('eject -t %s' % device)
-+        os.system('@utillinux@/bin/eject -t %s' % device)
- 
-     def ejectDevice(self, device):
-         """
-         Eject the given device.
-         """
--        os.system('eject %s' % device)
-+        os.system('@utillinux@/bin/eject %s' % device)
- 
-     def unmountDevice(self, device):
-         """
-@@ -112,7 +112,7 @@ class Program(log.Loggable):
-         proc = open('/proc/mounts').read()
-         if device in proc:
-             print 'Device %s is mounted, unmounting' % device
--            os.system('umount %s' % device)
-+            os.system('@utillinux@/bin/umount %s' % device)
- 
-     def getFastToc(self, runner, toc_pickle, device):
-         """
-Submodule morituri/extern/python-command contains modified content
-diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
-index 46176d5..fce14a5 100644
---- a/morituri/program/cdparanoia.py
-+++ b/morituri/program/cdparanoia.py
-@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task):
-             stopTrack, stopOffset)
- 
-         bufsize = 1024
--        argv = ["cdparanoia", "--stderr-progress",
-+        argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
-             "--sample-offset=%d" % self._offset, ]
-         if self._device:
-             argv.extend(["--force-cdrom-device", self._device, ])
-@@ -551,7 +551,7 @@ _VERSION_RE = re.compile(
- 
- def getCdParanoiaVersion():
-     getter = common.VersionGetter('cdparanoia',
--        ["cdparanoia", "-V"],
-+        ["@cdparanoia@/bin/cdparanoia", "-V"],
-         _VERSION_RE,
-         "%(version)s %(release)s")
- 
-diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
-index c6fba64..c4d0306 100644
---- a/morituri/program/cdrdao.py
-+++ b/morituri/program/cdrdao.py
-@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask):
- 
-     def start(self, runner):
-         self.debug('Starting cdrdao with options %r', self.options)
--        self.command = ['cdrdao', ] + self.options
-+        self.command = ['@cdrdao@/bin/cdrdao', ] + self.options
- 
-         ctask.PopenTask.start(self, runner)
- 
-@@ -515,7 +515,7 @@ _VERSION_RE = re.compile(
- 
- def getCDRDAOVersion():
-     getter = common.VersionGetter('cdrdao',
--        ["cdrdao"],
-+        ["@cdrdao@/bin/cdrdao"],
-         _VERSION_RE,
-         "%(version)s")
- 
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
new file mode 100644
index 000000000000..162d5459d648
--- /dev/null
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac
+, sox, accuraterip-checksum, utillinux, substituteAll }:
+
+python2.pkgs.buildPythonApplication rec {
+  name = "whipper-${version}";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "JoeLametta";
+    repo = "whipper";
+    rev = "v${version}";
+    sha256 = "04m8s0s9dcnly9l6id8vv99n9kbjrjid79bss52ay9yvwng0frmj";
+  };
+
+  pythonPath = with python2.pkgs; [
+    pygobject2 musicbrainzngs urllib3 chardet
+    pycdio setuptools mutagen
+    requests
+  ];
+
+  checkInputs = with python2.pkgs; [
+    twisted
+  ];
+
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      inherit cdrdao cdparanoia utillinux flac sox;
+      accurateripChecksum = accuraterip-checksum;
+    })
+  ];
+
+  # some tests require internet access
+  # https://github.com/JoeLametta/whipper/issues/291
+  doCheck = false;
+
+  preCheck = ''
+    HOME=$TMPDIR
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/JoeLametta/whipper;
+    description = "A CD ripper aiming for accuracy over speed";
+    maintainers = with maintainers; [ rycee jgeerds ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/whipper/paths.patch b/pkgs/applications/audio/whipper/paths.patch
new file mode 100644
index 000000000000..9fe9f7a57c51
--- /dev/null
+++ b/pkgs/applications/audio/whipper/paths.patch
@@ -0,0 +1,105 @@
+--- a/whipper/program/arc.py
++++ b/whipper/program/arc.py
+@@ -3,8 +3,8 @@
+ import logging
+ logger = logging.getLogger(__name__)
+ 
+-ARB = 'accuraterip-checksum'
+-FLAC = 'flac'
++ARB = '@accurateripChecksum@/bin/accuraterip-checksum'
++FLAC = '@flac@/bin/flac'
+ 
+ 
+ def _execute(cmd, **redirects):
+--- a/whipper/program/cdparanoia.py
++++ b/whipper/program/cdparanoia.py
+@@ -280,10 +280,10 @@
+ 
+         bufsize = 1024
+         if self._overread:
+-            argv = ["cd-paranoia", "--stderr-progress",
++            argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
+                     "--sample-offset=%d" % self._offset, "--force-overread", ]
+         else:
+-            argv = ["cd-paranoia", "--stderr-progress",
++            argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
+                     "--sample-offset=%d" % self._offset, ]
+         if self._device:
+             argv.extend(["--force-cdrom-device", self._device, ])
+@@ -560,7 +560,7 @@
+ 
+ def getCdParanoiaVersion():
+     getter = common.VersionGetter('cd-paranoia',
+-                                  ["cd-paranoia", "-V"],
++                                  ["@cdparanoia@/bin/cdparanoia", "-V"],
+                                   _VERSION_RE,
+                                   "%(version)s %(release)s")
+ 
+@@ -585,7 +585,7 @@
+     def __init__(self, device=None):
+         # cdparanoia -A *always* writes cdparanoia.log
+         self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
+-        self.command = ['cd-paranoia', '-A']
++        self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
+         if device:
+             self.command += ['-d', device]
+ 
+--- a/whipper/program/cdrdao.py
++++ b/whipper/program/cdrdao.py
+@@ -9,7 +9,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+ 
+-CDRDAO = 'cdrdao'
++CDRDAO = '@cdrdao@/bin/cdrdao'
+ 
+ 
+ def read_toc(device, fast_toc=False):
+--- a/whipper/program/sox.py
++++ b/whipper/program/sox.py
+@@ -4,7 +4,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+ 
+-SOX = 'sox'
++SOX = '@sox@/bin/sox'
+ 
+ 
+ def peak_level(track_path):
+--- a/whipper/program/soxi.py
++++ b/whipper/program/soxi.py
+@@ -6,7 +6,7 @@
+ import logging
+ logger = logging.getLogger(__name__)
+ 
+-SOXI = 'soxi'
++SOXI = '@sox@/bin/soxi'
+ 
+ 
+ class AudioLengthTask(ctask.PopenTask):
+--- a/whipper/program/utils.py
++++ b/whipper/program/utils.py
+@@ -9,7 +9,7 @@
+     Eject the given device.
+     """
+     logger.debug("ejecting device %s", device)
+-    os.system('eject %s' % device)
++    os.system('@utillinux@/bin/eject %s' % device)
+ 
+ 
+ def load_device(device):
+@@ -17,7 +17,7 @@
+     Load the given device.
+     """
+     logger.debug("loading (eject -t) device %s", device)
+-    os.system('eject -t %s' % device)
++    os.system('@utillinux@/bin/eject -t %s' % device)
+ 
+ 
+ def unmount_device(device):
+@@ -32,4 +32,4 @@
+     proc = open('/proc/mounts').read()
+     if device in proc:
+         print 'Device %s is mounted, unmounting' % device
+-        os.system('umount %s' % device)
++        os.system('@utillinux@/bin/umount %s' % device)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fed02f40134d..441a8f8dcfb2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -297,6 +297,7 @@ mapAliases ({
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
   wireguard = wireguard-tools; # added 2018-05-19
+  morituri = whipper; # added 2018-09-13
   x11 = xlibsWrapper; # added 2015-09
   xbmc = kodi; # added 2018-04-25
   xbmcPlain = kodiPlain; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5205aeb07294..a16cbde81e30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3615,8 +3615,6 @@ with pkgs;
 
   mmv = callPackage ../tools/misc/mmv { };
 
-  morituri = callPackage ../applications/audio/morituri { };
-
   most = callPackage ../tools/misc/most { };
 
   motion = callPackage ../applications/video/motion { };
@@ -5834,6 +5832,8 @@ with pkgs;
 
   welkin = callPackage ../tools/graphics/welkin {};
 
+  whipper = callPackage ../applications/audio/whipper { };
+
   whois = callPackage ../tools/networking/whois { };
 
   wireguard-tools = callPackage ../tools/networking/wireguard-tools { };

From 2c7295ebe09d556f786b330eeadfbc2e187e6f02 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 11 Sep 2018 16:41:17 -0400
Subject: [PATCH 1021/3253] quantum-espresso: init at 6.3

---
 .../chemistry/quantum-espresso/default.nix    | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/applications/science/chemistry/quantum-espresso/default.nix

diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
new file mode 100644
index 000000000000..7a7f1b3596d3
--- /dev/null
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl
+, gfortran, fftw, openblas
+, mpi ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "6.3";
+  name = "quantum-espresso-${version}";
+
+  src = fetchurl {
+    url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
+    sha256 = "1738z3nhkzcrgnhnfg1r4lipbwvcrcprwhzjbjysnylmzbzwhrs0";
+  };
+
+  passthru = {
+    inherit mpi;
+  };
+
+  preConfigure = ''
+    patchShebangs configure
+  '';
+
+  # remove after 6.3 version:
+  # makefile needs to ignore install directory easier than applying patch
+  preInstall = ''
+    printf "\n.PHONY: install\n" >> Makefile
+  '';
+
+  buildInputs = [ fftw openblas gfortran ]
+    ++ (stdenv.lib.optionals (mpi != null) [ mpi ]);
+
+configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ];
+
+  makeFlags = [ "all" ];
+
+  meta = with stdenv.lib; {
+    description = "Electronic-structure calculations and materials modeling at the nanoscale";
+    longDescription = ''
+        Quantum ESPRESSO is an integrated suite of Open-Source computer codes for
+        electronic-structure calculations and materials modeling at the
+        nanoscale. It is based on density-functional theory, plane waves, and
+        pseudopotentials.
+      '';
+    homepage = https://www.quantum-espresso.org/;
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 416ec54a2318..af45c2ec462b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20625,6 +20625,12 @@ with pkgs;
 
   pymol = callPackage ../applications/science/chemistry/pymol { };
 
+  quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { };
+
+  quantum-espresso-mpi = callPackage ../applications/science/chemistry/quantum-espresso {
+     mpi = openmpi;
+  };
+
   ### SCIENCE/GEOMETRY
 
   drgeo = callPackage ../applications/science/geometry/drgeo {

From a2bc529f224b7d004cf05a169ff5c56bb0affb29 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 12 Sep 2018 14:45:57 -0400
Subject: [PATCH 1022/3253] siesta: init at 4.0.2

---
 .../science/chemistry/siesta/default.nix      | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/science/chemistry/siesta/default.nix

diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix
new file mode 100644
index 000000000000..eb17a68b8aae
--- /dev/null
+++ b/pkgs/applications/science/chemistry/siesta/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl
+, gfortran, openblas
+, mpi ? null, scalapack
+}:
+
+stdenv.mkDerivation rec {
+  version = "4.1-b3";
+  name = "siesta-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/siesta/4.1/4.1-b3/+download/siesta-4.1-b3.tar.gz";
+    sha256 = "1450jsxj5aifa0b5fcg7mxxq242fvqnp4zxpgzgbkdp99vrp06gm";
+  };
+
+  passthru = {
+    inherit mpi;
+  };
+
+  buildInputs = [ openblas gfortran ]
+    ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]);
+
+  enableParallelBuilding = true;
+
+  # Must do manualy becuase siesta does not do the regular
+  # ./configure; make; make install
+  configurePhase = ''
+    cd Obj
+    sh ../Src/obj_setup.sh
+    cp gfortran.make arch.make
+  '';
+
+  preBuild = if (mpi != null) then ''
+    makeFlagsArray=(
+        CC="mpicc" FC="mpifort"
+        FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="."
+        COMP_LIBS="" LIBS="-lopenblas -lscalapack"
+    );
+  '' else ''
+    makeFlagsArray=(
+      COMP_LIBS="" LIBS="-lopenblas"
+    );
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a siesta $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A first-principles materials simulation code using DFT";
+    longDescription = ''
+         SIESTA is both a method and its computer program
+         implementation, to perform efficient electronic structure
+         calculations and ab initio molecular dynamics simulations of
+         molecules and solids. SIESTA's efficiency stems from the use
+         of strictly localized basis sets and from the implementation
+         of linear-scaling algorithms which can be applied to suitable
+         systems. A very important feature of the code is that its
+         accuracy and cost can be tuned in a wide range, from quick
+         exploratory calculations to highly accurate simulations
+         matching the quality of other approaches, such as plane-wave
+         and all-electron methods.
+      '';
+    homepage = https://www.quantum-espresso.org/;
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af45c2ec462b..f0b42a17f8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20631,6 +20631,12 @@ with pkgs;
      mpi = openmpi;
   };
 
+  siesta = callPackage ../applications/science/chemistry/siesta { };
+
+  siesta-mpi = callPackage ../applications/science/chemistry/siesta {
+     mpi = openmpi;
+  };
+
   ### SCIENCE/GEOMETRY
 
   drgeo = callPackage ../applications/science/geometry/drgeo {

From ef04b4f283317d02397ce6546ef66868d59f45f3 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Sep 2018 11:13:53 -0700
Subject: [PATCH 1023/3253] findutils: disable a bogus test

---
 pkgs/tools/misc/findutils/default.nix         |  8 +++++-
 .../disable-getdtablesize-test.patch          | 25 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/findutils/disable-getdtablesize-test.patch

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index d6eca100411b..e7c507903190 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,7 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
   };
 
-  patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
+  patches = [
+    ./memory-leak.patch
+    ./no-install-statedir.patch
+
+    # prevent tests from failing on old kernels
+    ./disable-getdtablesize-test.patch
+  ];
 
   buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
 
diff --git a/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
new file mode 100644
index 000000000000..611df364b687
--- /dev/null
+++ b/pkgs/tools/misc/findutils/disable-getdtablesize-test.patch
@@ -0,0 +1,25 @@
+diff --git a/tests/test-dup2.c b/tests/test-dup2.c
+--- a/tests/test-dup2.c
++++ b/tests/test-dup2.c
+@@ -157,8 +157,6 @@ main (void)
+       ASSERT (close (255) == 0);
+       ASSERT (close (256) == 0);
+     }
+-  ASSERT (dup2 (fd, bad_fd - 1) == bad_fd - 1);
+-  ASSERT (close (bad_fd - 1) == 0);
+   errno = 0;
+   ASSERT (dup2 (fd, bad_fd) == -1);
+   ASSERT (errno == EBADF);
+diff --git a/tests/test-getdtablesize.c b/tests/test-getdtablesize.c
+index a0325af..a83f8ec 100644
+--- a/tests/test-getdtablesize.c
++++ b/tests/test-getdtablesize.c
+@@ -29,8 +29,6 @@ int
+ main (int argc, char *argv[])
+ {
+   ASSERT (getdtablesize () >= 3);
+-  ASSERT (dup2 (0, getdtablesize() - 1) == getdtablesize () - 1);
+-  ASSERT (dup2 (0, getdtablesize()) == -1);
+ 
+   return 0;
+ }

From 57ee1416965e3675857aa8c0856d36e3ba0b30c3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 14 Sep 2018 23:58:04 +0200
Subject: [PATCH 1024/3253] geis: fix build (#46663)

disable format hardening, ignore some compiler warnings
---
 pkgs/development/libraries/geis/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 56d8cd21f844..fa3aa77cd3ad 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
     sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ];
+
+  hardeningDisable = [ "format" ];
 
   pythonPath = with python3Packages;
     [ pygobject3  ];

From 81082c6c60bfcfe2ffc20fb3cab406c621a8f7fe Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sat, 15 Sep 2018 00:39:45 +0200
Subject: [PATCH 1025/3253] spl/zfs: 0.7.10 -> 0.7.11

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 6e22de4bcf62..13fc9ae37605 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -10,13 +10,13 @@ assert kernel != null;
 
 stdenv.mkDerivation rec {
   name = "spl-${version}-${kernel.version}";
-  version = "0.7.10";
+  version = "0.7.11";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26";
+    sha256 = "15h02g5k3i20y2cycc72vr6hdn8n70jmzqii8dmx9za6bl9nk2rm";
   };
 
   patches = [ ./install_prefix.patch ];
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index e7cca579d624..65f35d6d889e 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -161,9 +161,9 @@ in {
     # incompatibleKernelVersion = null;
 
     # this package should point to the latest release.
-    version = "0.7.10";
+    version = "0.7.11";
 
-    sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1";
+    sha256 = "0m9wkq6wf4cg8w38s3avd0bvybnv0avqwxk3gwz9rgb9rn0m98jg";
 
     extraPatches = [
       (fetchpatch {

From fb11065050dd70075230b919ec4963c9b928f8a4 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 01:49:57 +0200
Subject: [PATCH 1026/3253] Newtonsoft.Json: 6.0.8 -> 11.0.2 (#46679)

---
 pkgs/top-level/dotnet-packages.nix | 37 ++++--------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3782fc33d6a6..3eeb3efdc503 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -871,40 +871,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     };
   };
 
-  NewtonsoftJson = buildDotnetPackage rec {
+  NewtonsoftJson = fetchNuGet {
     baseName = "Newtonsoft.Json";
-    version = "6.0.8";
-
-    src = fetchurl {
-      name = "${baseName}-${version}.tar.gz";
-      url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz";
-      sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm";
-    };
-
-    buildInputs = [
-      fsharp
-      dotnetPackages.NUnit
-      dotnetPackages.SystemCollectionsImmutable
-      dotnetPackages.Autofac
-    ];
-
-    patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ];
-
-    postConfigure = ''
-       # Just to make sure there's no attempt to call these executables
-       rm -rvf Tools
-    '';
-
-    xBuildFiles = [ "Src/Newtonsoft.Json.sln" ];
-    outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ];
-
-    meta = {
-      description = "Popular high-performance JSON framework for .NET";
-      homepage = "https://www.newtonsoft.com/json";
-      license = stdenv.lib.licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [ obadz ];
-      platforms = with stdenv.lib.platforms; linux;
-    };
+    version = "11.0.2";
+    sha256 = "07na27n4mlw77f3hg5jpayzxll7f4gyna6x7k9cybmxpbs6l77k7";
+    outputFiles = [ "*" ];
   };
 
   Nuget = buildDotnetPackage {

From 81156549a2c522e597556ecd277496f33ae7313d Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Sat, 15 Sep 2018 02:02:34 +0200
Subject: [PATCH 1027/3253] prometheus-snmp-exporter: 0.11.0 -> 0.13.0 (#46677)

---
 pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 29454dd44d2b..be8fbd3d85cb 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
-  version = "0.11.0";
+  version = "0.13.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "prometheus";
     repo = "snmp_exporter";
     rev = "v${version}";
-    sha256 = "027p96jzhq9l7m3s5qxxg3rqp14pai7q66d3ppin19lg7al11c9x";
+    sha256 = "071v9qqhp2hcbgml94dm1l212qi18by88r9755npq9ycrsmawkll";
   };
 
   buildInputs = [ net_snmp ];

From e6cf858408952586f9f8c59a087ffa12cbeacb4d Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Sat, 15 Sep 2018 02:04:43 +0200
Subject: [PATCH 1028/3253] heptio-ark: 0.9.0 -> 0.9.4 (#46662)

---
 pkgs/applications/networking/cluster/heptio-ark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index 1860874c436c..f786bff01d62 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "heptio-ark-${version}";
-  version = "0.9.0";
+  version = "0.9.4";
 
   goPackagePath = "github.com/heptio/ark";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "heptio";
     repo = "ark";
-    sha256 = "0b3jsgs35l8kk63pjnqn3911pyb397fyvsmd3jd8vzjawisgpdp7";
+    sha256 = "01z0zkw7l6haxky9l45iqqnvs6104xx4195jm250nv9j1x8n59ai";
   };
 
   postInstall = "rm $bin/bin/generate";

From 13b5063a8d0a6100aec1d3d2844a68967c1ac7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= <andre.stylianos@gmail.com>
Date: Fri, 14 Sep 2018 21:05:52 -0300
Subject: [PATCH 1029/3253] joker: 0.9.5 -> 0.9.7 (#46673)

---
 pkgs/development/interpreters/joker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 5b8ae7e9eccf..1342d6c34d2e 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "joker-${version}";
-  version = "0.9.5";
+  version = "0.9.7";
 
   goPackagePath = "github.com/candid82/joker";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "1sgxz0z6p92k1rhs5095l952a2db5w9yb2jy6cgglxw2arihxxb7";
+    sha256 = "0fl04xdpqmr5xpd4pvj72gdy3v1fr9z6h3ja7dmkama8fw2x4diz";
   };
 
   preBuild = "go generate ./...";

From 453b869876742031294b97853aa27c95e07d467b Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Fri, 14 Sep 2018 17:08:19 -0700
Subject: [PATCH 1030/3253] charles: 4.2.6 -> 4.2.7 (#46631)

---
 pkgs/applications/networking/charles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 8a60023b4350..3f019d177023 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -14,11 +14,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "charles-${version}";
-  version = "4.2.6";
+  version = "4.2.7";
 
   src = fetchurl {
     url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
-    sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb";
+    sha256 = "1nycw3wpbfwj4ijjaq5k0f4xipj8j605fs0yjzgl66gmv7r583rd";
   };
 
   buildInputs = [ makeWrapper ];

From f17e5925f5edf14a734cc8e3bce446c59b4016cb Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 02:31:26 +0200
Subject: [PATCH 1031/3253] libx86emu: 2.0 -> 2.1 (#46624)

---
 pkgs/development/libraries/libx86emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index b0730452db89..591a3e451ab3 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libx86emu-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "12rlkwnl5zgmmpm6n6cqnkyhkji4jw1d27y8x1krvlpi1z4bjidx";
+    sha256 = "16k16xcw2w2c69sn04jfdy9fd7cxs463d2rwb948xchyvfla958j";
   };
 
   nativeBuildInputs = [ perl ];

From 218ce4de5083a4b969df3db349b08f5a2737b628 Mon Sep 17 00:00:00 2001
From: Lenz Weber <mail@lenzw.de>
Date: Sat, 15 Sep 2018 02:34:08 +0200
Subject: [PATCH 1032/3253] zfs-unstable: 2018-09-02 -> 0.8.0-rc1 (#46543)

---
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 65f35d6d889e..cae06dbd0f38 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -180,10 +180,10 @@ in {
     incompatibleKernelVersion = null;
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2018-09-02";
+    version = "0.8.0-rc1";
 
-    rev = "c197a77c3cf36531e4cf79e524e1ccf7ec00cc4c";
-    sha256 = "0rk835nnl4w5km8qxcr1wdpr9xasssnrmsxhjlqjy0ry3qcb2197";
+    rev = "b8a90418f3a9c23b89c5d2c729a4dd0fea644508";
+    sha256 = "041b7h8gbb042x9mhg8y87bgq9y793bawglc7b0fg871k6190drx";
     isUnstable = true;
 
     extraPatches = [

From 2fb5b52baba2cb8576d3c947f0ec6de907c3c423 Mon Sep 17 00:00:00 2001
From: Christopher Birkbeck <cjpbirkbeck@gmail.com>
Date: Fri, 14 Sep 2018 22:43:58 -0400
Subject: [PATCH 1033/3253] Added ranger.vim, a plugin that uses the ranger
 file manager within vim.

---
 pkgs/misc/vim-plugins/generated.nix    | 138 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   1 +
 2 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 73a6ead6b3b0..3f9c38e04bd8 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-11";
+    name = "ale-2018-09-14";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "78af99c2566ef8fed443ce253e0de9323b9e5043";
-      sha256 = "0c0bcr5x73fzfmsx65pc4f9j7d9m2z6wq81nyqnn81g3ws96axih";
+      rev = "f1f2a222281c9e489c3ca6a4f72329c08d4646a6";
+      sha256 = "0dv0icsg9cmaib9waipj3kz29hczs17kzxbrv46a4y7cb4vcb0jd";
     };
   };
 
@@ -133,12 +133,12 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-06-15";
+    name = "caw-vim-2018-09-13";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "e82ae00f3fc03289d4054b44f100025a1bc81939";
-      sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc";
+      rev = "2427ba1379b1bb3c7b737921219a346f10a21ad8";
+      sha256 = "1cwx0lpf0xvrqmbjg83y79j9f4gjdkl7iickg9ypzhdxhld0i972";
     };
   };
 
@@ -304,12 +304,12 @@
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix {
-    name = "ctrlp-vim-2018-06-28";
+    name = "ctrlp-vim-2018-09-13";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989";
-      sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk";
+      rev = "ebc568c3992d9002d1d35b85737dfa0d9ce70d9f";
+      sha256 = "0hh4wcyx0smv70axn18gdscmcmhwbbccam9klx0c613qccl5w70i";
     };
   };
 
@@ -778,16 +778,6 @@
     };
   };
 
-  neco-ghc = buildVimPluginFrom2Nix {
-    name = "neco-ghc-2018-05-13";
-    src = fetchFromGitHub {
-      owner = "eagletmt";
-      repo = "neco-ghc";
-      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
-      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
-    };
-  };
-
   ncm2 = buildVimPluginFrom2Nix {
     name = "ncm2-2018-09-03";
     src = fetchFromGitHub {
@@ -809,12 +799,12 @@
   };
 
   ncm2-path = buildVimPluginFrom2Nix {
-    name = "ncm2-path-2018-08-01";
+    name = "ncm2-path-2018-09-12";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2-path";
-      rev = "875ae47e171abc2ba6710bb835727bed46d7b329";
-      sha256 = "09vhggrb1nigr8p53gd9ibn3b84dh9yix2ndj2453wnq8ny9x2dc";
+      rev = "d17deaceb3bc4da415cff25262762c99cdd34116";
+      sha256 = "16pbln1k6jw5yc79g7g736kf4m7hn6kdlsphml7dla7xnnzd2az3";
     };
   };
 
@@ -838,6 +828,16 @@
     };
   };
 
+  neco-ghc = buildVimPluginFrom2Nix {
+    name = "neco-ghc-2018-05-13";
+    src = fetchFromGitHub {
+      owner = "eagletmt";
+      repo = "neco-ghc";
+      rev = "682869aca5dd0bde71a09ba952acb59c543adf7d";
+      sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h";
+    };
+  };
+
   neco-look = buildVimPluginFrom2Nix {
     name = "neco-look-2018-01-21";
     src = fetchFromGitHub {
@@ -899,12 +899,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-11";
+    name = "neomake-2018-09-14";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "f5d411eb9598b0e82187431a49598f3dce1f9484";
-      sha256 = "1v2ggn8bm0mp6bjyiqf9ria8jmqs4risqdwhcbj77l95ka3znx9z";
+      rev = "3b4287705d095fe0b8d81dadd10a29827ab3e4f4";
+      sha256 = "0sgdxd6swqkkk53jhil5f2qhywxnmpddr1zrkx7znyhzkk347sin";
     };
   };
 
@@ -919,12 +919,12 @@
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
-    name = "neosnippet-snippets-2018-08-30";
+    name = "neosnippet-snippets-2018-09-12";
     src = fetchFromGitHub {
       owner = "shougo";
       repo = "neosnippet-snippets";
-      rev = "a2e90c49850fff72e923f92f1672c3dc18e2f99b";
-      sha256 = "0qfmiamy3y3h2dqpg965g801bfi9c7cnqgal3ybb66xs79afgi99";
+      rev = "e61e966339bbab2abba6ba92bccd8825463b2d0d";
+      sha256 = "0yis1r2ypxym421gwlsm8zszsg490xw5q0h111k077x19qa5j4fs";
     };
   };
 
@@ -959,12 +959,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-09-10";
+    name = "nerdtree-2018-09-13";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "b3804dcd71471505048c8a75f301539fc2dce081";
-      sha256 = "0waa6hw9jqxy1jxcm0bx53n0cpindin9jdd5s6jh7310psqpwi1x";
+      rev = "e9d3f72d9c955d12630278a823614af49fbe9c5b";
+      sha256 = "0s16chyqmp3fz8070xizszgpgja71zq43scbp5iz573kxfh1139r";
     };
   };
 
@@ -1009,12 +1009,12 @@
   };
 
   nvim-yarp = buildVimPluginFrom2Nix {
-    name = "nvim-yarp-2018-07-27";
+    name = "nvim-yarp-2018-09-14";
     src = fetchFromGitHub {
       owner = "roxma";
       repo = "nvim-yarp";
-      rev = "52317ced0e16f226f0d44878917d0b5f4657b4d4";
-      sha256 = "1xj1n9x1nxjbbpp29x5kkwr0bxziwzn8n2b8z9467hj9w646zyrj";
+      rev = "5443ac06b3989baa9262adec810503e0234c316e";
+      sha256 = "0b6gmsbgzgwidl0rpkwzr2l1qxd9aw5pvj8izflf6gz36r2irszq";
     };
   };
 
@@ -1118,6 +1118,16 @@
     };
   };
 
+  ranger-vim = buildVimPluginFrom2Nix {
+    name = "ranger-vim-2018-09-13";
+    src = fetchFromGitHub {
+      owner = "rafaqz";
+      repo = "ranger.vim";
+      rev = "63e22fd424107579aaf782f3b2c83d76a691fdeb";
+      sha256 = "1337il7j45ydb432qnmaqcz8bigwny752nrl6c2vsc0qv3xd11ls";
+    };
+  };
+
   Rename = buildVimPluginFrom2Nix {
     name = "Rename-2011-08-31";
     src = fetchFromGitHub {
@@ -1259,12 +1269,12 @@
   };
 
   swift-vim = buildVimPluginFrom2Nix {
-    name = "swift-vim-2018-07-22";
+    name = "swift-vim-2018-09-12";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
-      rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab";
-      sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153";
+      rev = "5e330f026d4184c917cc156410634551dbd9a944";
+      sha256 = "1gx2vg5w6r7k9070j03wz3bzjdkw3g01nkahd5jawk9z10ifswax";
     };
   };
 
@@ -1449,12 +1459,12 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-09-09";
+    name = "vim-2018-09-13";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "fa16b1f1e04933aa9a28312e566d54040b8f4c3b";
-      sha256 = "0v73f327gn0zpgpgl4f9pim35y4qmkrqgyh1zg2z5ivdvns5yyif";
+      rev = "72a0d0d584e2b64dd7cd44047688d470e6e39f8f";
+      sha256 = "0n2cyxkwfpy95033zisb5q1jrf17vzi11mprhkm01vfxjp5xh4hy";
     };
   };
 
@@ -1819,12 +1829,12 @@
   };
 
   vim-css-color = buildVimPluginFrom2Nix {
-    name = "vim-css-color-2018-08-11";
+    name = "vim-css-color-2018-09-12";
     src = fetchFromGitHub {
       owner = "ap";
       repo = "vim-css-color";
-      rev = "22211783b5bcc052748c80fad7d2916b595da09c";
-      sha256 = "12z965xij9393m6jkwkn32ykfgnjqjdhy7571cihmvhknvhd0dsk";
+      rev = "7ecfc4810f34dbcd5d22a14013f977a9aa699312";
+      sha256 = "1hds83biz0wv12rcqcdab1zm6lck1z4bdk67jq30x8siwcjvkwfy";
     };
   };
 
@@ -1879,12 +1889,12 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-08-20";
+    name = "vim-dispatch-2018-09-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "4566b8892715361f9952fa4c29c05035fdede09d";
-      sha256 = "1v1wmvasymllvjgg8kfh8zag99mlbaf366v9byvp8fpskzaza1nz";
+      rev = "fe48d002ce5d473b2057641666d643c66ede6230";
+      sha256 = "1yxssbss89c1sp6vq0mb7cz65cw0lbqfs2ng7hfr92fag68agi2p";
     };
   };
 
@@ -2019,12 +2029,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-09";
+    name = "vim-fugitive-2018-09-13";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "d4fb2a2f5c2023f477beae6aef47cf0457351e6e";
-      sha256 = "1m2pa29rf44ykmiy9za511v1cla8kb071yly7h2yyfmw7600swwq";
+      rev = "6cd8ff77f03b08ae133e35fabd87122a50231c36";
+      sha256 = "0rkyam6ik81cmrc406jpbpvbli9nkcqk90jp0m17pwbaaiqrbp73";
     };
   };
 
@@ -2079,22 +2089,22 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-11";
+    name = "vim-go-2018-09-13";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "925447051422b471490a85bcb196a27c4625b225";
-      sha256 = "0g41i22hr0iq1mpbv0cpzc9h6mwhncn3jv6ydhvbpvjpg8yd3wxg";
+      rev = "8df48b2c2c8aa02dd5ab00b6e9f35b0b9808d798";
+      sha256 = "1ymkmnwvbm5b09d930p7k3cmk7dg1rn68qny9n7jhs7hwxdc309a";
     };
   };
 
   vim-grammarous = buildVimPluginFrom2Nix {
-    name = "vim-grammarous-2018-08-05";
+    name = "vim-grammarous-2018-09-13";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "vim-grammarous";
-      rev = "d52086d0f99e8008be9fa717bfaa0ee028f09e29";
-      sha256 = "1p48p2ml284ssylnd6dr7dwb5kpq6arkfzg0d8y94317cmzagpkx";
+      rev = "65e01dd1f19a4cbaade139754d6e8c8cdf45c33a";
+      sha256 = "14sjvspnfj5jxghh1vndaxfglr0ypnn59nzrhxnymf6q3g930vcl";
     };
   };
 
@@ -2780,12 +2790,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-11";
+    name = "vim-snippets-2018-09-14";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "225647b65522b7421a22f138b9b0a10833d39551";
-      sha256 = "1ngdv1rsaa0w742k4bb942x0pd7pmjh7nghkiiv1hl8cryrwhix5";
+      rev = "2af1ffe88d3de3fbe40a6e74fb626b18a6548cbd";
+      sha256 = "1rkmj800lyp1gqbb00qyscw6fwc1mjz0bc4drd6b6pc2x952m2fi";
     };
   };
 
@@ -3100,12 +3110,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-09";
+    name = "vimtex-2018-09-13";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "cad3b43eca41b75cedab9ac86241f006aa3202ea";
-      sha256 = "1nnn2xri8n6j34nq4l4b11m2n7aglj61ks156caqhkgdkskf0ks4";
+      rev = "9f5978c255ce500a0df39cd50245cd0ea145a820";
+      sha256 = "09hrdsh3qvdyvxqzgyylal77ldd617kxwlv083516gbfalq1cixg";
     };
   };
 
@@ -3221,12 +3231,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-08-02";
+    name = "zig-vim-2018-09-13";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "c10a46c0b960c9e0b7ea9a7286b0ff9abccd19f3";
-      sha256 = "1vk9ny3jrk175srkbcxhj5jl2lvq5y98ms9mwl90ry49cqk9ciaj";
+      rev = "057fdd7cd36e12dff0f65092d8e0861f36efdfe2";
+      sha256 = "1i5x4mnfdjqkk71v8calwbm1y85blyrrpg4hqljf58csc7vhq2v9";
     };
   };
 }
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fbd74a6625f2..35c21856bae9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -195,6 +195,7 @@ powerman/vim-plugin-AnsiEsc
 python-mode/python-mode
 Quramy/tsuquyomi
 racer-rust/vim-racer
+rafaqz/ranger.vim
 rafi/awesome-vim-colorschemes
 raghur/vim-ghost
 raichoo/purescript-vim

From ef21db9bd39a41b216d5d2a5180d69787728c73e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 15 Sep 2018 00:05:48 -0500
Subject: [PATCH 1034/3253] zsh: 5.6.1 -> 5.6.2

From upstream's NEWS:

> Changes from 5.6.1 to 5.6.2
> ---------------------------
>
> Fix another SIGTTOU case.
>
> Fix SIGWINCH being ignored when zsh is not in the foreground.
>
> The release tarballs are now compressed using xz(1), whereas previously
> both xz(1) and gzip(1) versions were available.  If this gets in your way,
> give us a shout.
>
---
 pkgs/shells/zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 656414aabfcc..a14829070b33 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:
 
 let
-  version = "5.6.1";
+  version = "5.6.2";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
-    sha256 = "15j8w1ddfparfnqymx67rycgfdl50xcrnd6p1d6q9n3n0462jjmn";
+    sha256 = "05014rg6hkwiv1p56iij8wn2rghmwjxs5qsj3d3xigbwaikk55wq";
   };
 
 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
-    sha256 = "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm";
+    sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5";
   };
 
   buildInputs = [ ncurses pcre ];

From 8125de3b407d5a394aa2527ce66f81df6ae58f2e Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 09:38:30 +0200
Subject: [PATCH 1035/3253] flink: drop older versions than current and
 previous minor release

This is consistent with the update policy as laid out in https://flink.apache.org/downloads.html#update-policy-for-old-releases.
---
 .../networking/cluster/flink/default.nix       | 18 +-----------------
 pkgs/top-level/all-packages.nix                |  2 --
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index d9c96da70b14..fe7b73a9e9bc 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -3,29 +3,13 @@
 
 let
   versionMap = {
-    "1.3" = {
-      flinkVersion = "1.3.3";
-      scalaVersion = "2.11";
-      sha256 = "0gfm48k5adr14gnhqri9cd01i9dprd0nwmnnz3yrpd20nq4ap4qy";
-      hadoopBundle = "-hadoop27";
-    };
-    "1.4" = {
-      flinkVersion = "1.4.2";
-      scalaVersion = "2.11";
-      sha256 = "0x3cikys5brin0kx9zr69xfp8k5w6g8141yrrr26ks7gpss2x636";
-      hadoopBundle = "";
-    };
     "1.5" = {
       flinkVersion = "1.5.3";
-      scalaVersion = "2.11";
       sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
-      hadoopBundle = "";
     };
     "1.6" = {
       flinkVersion = "1.6.0";
-      scalaVersion = "2.11";
       sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
-      hadoopBundle = "";
     };
   };
 in
@@ -36,7 +20,7 @@ stdenv.mkDerivation rec {
   name = "flink-${flinkVersion}";
 
   src = fetchurl {
-    url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz";
+    url = "mirror://apache/flink/${name}/${name}-bin-scala_2.11.tgz";
     inherit sha256;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01b97588293b..884b13c55e01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16336,8 +16336,6 @@ with pkgs;
   fldigi = callPackage ../applications/audio/fldigi { };
 
   flink = callPackage ../applications/networking/cluster/flink { };
-  flink_1_3 = flink.override { version = "1.3"; };
-  flink_1_4 = flink.override { version = "1.4"; };
   flink_1_5 = flink.override { version = "1.5"; };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {

From 2438ceb5b486c071a94bde7542847de33634abb3 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:09:36 +0200
Subject: [PATCH 1036/3253] salt: fix darwin build by specifying dependency on
 tornado 4

/cc ZHF #45961
---
 .../python-modules/tornado/default.nix        | 20 +++++++++++++++----
 pkgs/tools/admin/salt/default.nix             |  2 +-
 pkgs/top-level/python-packages.nix            |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix
index 6d86404e1925..d446d377e66f 100644
--- a/pkgs/development/python-modules/tornado/default.nix
+++ b/pkgs/development/python-modules/tornado/default.nix
@@ -8,12 +8,25 @@
 , singledispatch
 , pythonOlder
 , futures
+, version ? "5.1"
 }:
 
+let
+  versionMap = {
+    "4.5.3" = {
+      sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
+    };
+    "5.1" = {
+      sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
+    };
+  };
+in
+
+with versionMap.${version};
+
 buildPythonPackage rec {
   pname = "tornado";
-  version = "5.1";
-
+  inherit version;
 
   propagatedBuildInputs = [ backports_abc  certifi singledispatch ]
     ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname
@@ -26,8 +39,7 @@ buildPythonPackage rec {
   '';
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
+    inherit pname sha256 version;
   };
 
   meta = {
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 80df9148220c..6cf997cd738c 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
     pyzmq
     requests
-    tornado
+    tornado_4
   ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
     futures
   ] ++ extraInputs;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4375ab550fde..c4e46ea8889a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14901,6 +14901,7 @@ EOF
   };
 
   tornado = callPackage ../development/python-modules/tornado { };
+  tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; };
 
   tokenlib = buildPythonPackage rec {
     name = "tokenlib-${version}";

From 95c7d8300f327406d72ba68625fb54a4b99f7b84 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:38:15 +0200
Subject: [PATCH 1037/3253] click: 0.3.1 -> 0.3.2

patch necessary to fix "error: the lock file needs to be updated but --frozen was passed to prevent this"
---
 .../networking/cluster/click/default.nix            | 11 ++++++-----
 .../cluster/click/fix_cargo_lock_version.patch      | 13 +++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch

diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index 7fd4cd9fa824..2c7a026b277e 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -4,17 +4,18 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "click-${version}";
-  version = "0.3.1";
-  rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
+    rev = "v${version}";
     owner = "databricks";
     repo = "click";
-    sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi";
-    inherit rev;
+    sha256 = "0sbj41kypn637z1w115w2h5v6bxz3y6w5ikgpx3ihsh89lkc19d2";
   };
 
-  cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj";
+  cargoSha256 = "05asqp5312a1g26pvf5hgqhc4kj3iw2hdvml2ycvga33sxb7zm7r";
+
+  patches = [ ./fix_cargo_lock_version.patch ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
diff --git a/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
new file mode 100644
index 000000000000..bc4db7ef7c12
--- /dev/null
+++ b/pkgs/applications/networking/cluster/click/fix_cargo_lock_version.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index ff80350..c86c6fe 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -111,7 +111,7 @@ dependencies = [
+
+ [[package]]
+ name = "click"
+-version = "0.3.1"
++version = "0.3.2"
+ dependencies = [
+  "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",

From b7fe4f1039d145bc5cbf58dfce142dbe313c6740 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 15 Sep 2018 11:46:04 +0300
Subject: [PATCH 1038/3253] exfat: 1.2.8 -> 1.3.0

---
 pkgs/tools/filesystems/exfat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index 47ff22ae20dd..97a96651a68e 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "exfat-${version}";
-  version = "1.2.8";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "relan";
     repo = "exfat";
     rev = "v${version}";
-    sha256 = "0q02g3yvfmxj70h85a69d8s4f6y7jask268vr87j44ya51lzndd9";
+    sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7ed02d4b7002feb7215f9890a0e9484ea62cbfc1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 13 Sep 2018 16:05:31 +0000
Subject: [PATCH 1039/3253] ocamlPackages.mlgmpidl: 1.2.6 -> 1.2.7

---
 pkgs/development/ocaml-modules/mlgmpidl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
index c82df1396bd4..9c9912cfb8c0 100644
--- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-mlgmpidl-${version}";
-  version = "1.2.6";
+  version = "1.2.7";
   src = fetchFromGitHub {
     owner = "nberth";
     repo = "mlgmpidl";
     rev = version;
-    sha256 = "1lq3yy10v3rvlchbl5kl75l9f8frgj6g9f1n14kj5qlxm5xsrvks";
+    sha256 = "063hy1divbiabqm5x307iamw942sivzw9fr8vczy3kgndfp12nic";
   };
 
   buildInputs = [ perl gmp mpfr ocaml findlib camlidl ];

From 20393278797514a9bb8d15a0ea52d57545079d4a Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 15:07:27 +0200
Subject: [PATCH 1040/3253] miniupnpd: wrap iptables scripts to use correct
 PATH

---
 pkgs/tools/networking/miniupnpd/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index f794a4e27c7a..f3cd9ea6a819 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,5 +1,10 @@
-{ stdenv, fetchurl, iptables, libuuid, pkgconfig }:
+{ stdenv, lib, fetchurl, iptables, libuuid, pkgconfig
+, which, iproute, gnused, coreutils, gawk, makeWrapper
+}:
 
+let
+  scriptBinEnv = lib.makeBinPath [ which iproute iptables gnused coreutils gawk ];
+in
 stdenv.mkDerivation rec {
   name = "miniupnpd-2.1";
 
@@ -10,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ iptables libuuid ];
-  nativeBuildInputs= [ pkgconfig ];
+  nativeBuildInputs= [ pkgconfig makeWrapper ];
 
   makefile = "Makefile.linux";
 
@@ -18,6 +23,13 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
 
+  postFixup = ''
+    for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh
+    do
+      wrapProgram $script --set PATH '${scriptBinEnv}:$PATH'
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://miniupnp.free.fr/;
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";

From 16ce28ed727f8965592dd98721f8eedef4b2cb91 Mon Sep 17 00:00:00 2001
From: Ben Challenor <ben@challenor.org>
Date: Fri, 14 Sep 2018 10:23:26 +0100
Subject: [PATCH 1041/3253] jenkins: 2.121.2 -> 2.138.1

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index c6fcaa0a44a0..a6a6e9a11054 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.121.2";
+  version = "2.138.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "00ln31ahhsihnxba2hldrjxdpyxl7xw731493a24cqlkdq89s3ys";
+    sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c";
   };
 
   buildCommand = ''

From 4f3868b72d19ed3bd3627e202c79eac21d3b9da6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 15 Sep 2018 13:17:12 +0000
Subject: [PATCH 1042/3253] =?UTF-8?q?ocaml=20=E2=89=A4=204.05:=20mark=20as?=
 =?UTF-8?q?=20broken=20on=20Aarch64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 1ee6fee613c9..d2295d2d79b0 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation (args // rec {
       '';
 
     platforms = with platforms; linux ++ darwin;
+    broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06";
   };
 
 })

From d79e201851881dfd75beb93f434e4bac2548974c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 15 Sep 2018 15:20:14 +0200
Subject: [PATCH 1043/3253] matrique: init at 250

---
 .../instant-messengers/matrique/default.nix   | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/matrique/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/matrique/default.nix b/pkgs/applications/networking/instant-messengers/matrique/default.nix
new file mode 100644
index 000000000000..91ba8e7175ce
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrique/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitLab, fetchFromGitHub, qmake
+, qtquickcontrols2, qtmultimedia, qtgraphicaleffects
+, libqmatrixclient
+}:
+
+let
+
+  libqmatrixclient_git = libqmatrixclient.overrideDerivation (oldAttrs: {
+    name = "libqmatrixclient-git-for-matrique";
+    src = fetchFromGitHub {
+      owner = "QMatrixClient";
+      repo = "libqmatrixclient";
+      rev = "d9ff200f";
+      sha256 = "0qxkffg1499wnn8rbndq6z51sz6hiij2pkp40cvs530sl0zg0c69";
+    };
+  });
+
+  SortFilterProxyModel = fetchFromGitLab {
+    owner = "b0";
+    repo = "SortFilterProxyModel";
+    rev = "3c2c125c";
+    sha256 = "1494dvq7kiq0ymf5f9hr47pw80zv3m3dncnaw1pnzs7mhkf2s5fr";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "matrique-${version}";
+  version = "250";
+
+  src = fetchFromGitLab {
+    owner = "b0";
+    repo = "matrique";
+    rev = version;
+    sha256 = "0l7ag2q3l8ixczwc43igvkkl81g5s5j032gzizmgpzb1bjpdgry7";
+  };
+
+  postPatch = ''
+    rm -r include/*
+    ln -sf ${libqmatrixclient_git.src} include/libqmatrixclient
+    ln -sf ${SortFilterProxyModel} include/SortFilterProxyModel
+  '';
+
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [
+    qtquickcontrols2 qtmultimedia qtgraphicaleffects
+    libqmatrixclient_git
+  ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A glossy client for Matrix";
+    maintainers = with maintainers; [ fpletz ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99b6f50f6b4a..780b20add09f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17664,6 +17664,8 @@ with pkgs;
 
   mm = callPackage ../applications/networking/instant-messengers/mm { };
 
+  matrique = libsForQt5.callPackage ../applications/networking/instant-messengers/matrique { };
+
   mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
 
   mplayer = callPackage ../applications/video/mplayer ({

From b9ca4ac95c716eb5c59ea7c366e2f3061da79bc5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Sep 2018 09:45:38 -0400
Subject: [PATCH 1044/3253] linux: 4.4.155 -> 4.4.156

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 66df462f5960..c25da926b267 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.155";
+  version = "4.4.156";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1nbd88x3m4w2ffwgjnf8ry5p2z7al54q1lvl2kv3fz8hmr5qq28q";
+    sha256 = "1aj87ncc8afx4dr42rf2kr5ai2k5w5arcp8z336i2wlnrbcdhhh4";
   };
 } // (args.argsOverride or {}))

From c1d7826a8ade72cb12d97d3b958387973d261d71 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Sep 2018 09:45:51 -0400
Subject: [PATCH 1045/3253] linux: 4.9.126 -> 4.9.127

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 1bd29569e011..db46ea80e609 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.126";
+  version = "4.9.127";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1davk0c760if20h3f9r18lcvb7lqzlx0chxlph7ld5nlaz3ncskd";
+    sha256 = "03yxdzmlikyvbkfaha871h9n7y58lyzyxgybsx09ln4pxnnswxwl";
   };
 } // (args.argsOverride or {}))

From 1a1306727374829f554e5b368c4ab692181762ab Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Sep 2018 09:46:00 -0400
Subject: [PATCH 1046/3253] linux: 4.14.69 -> 4.14.70

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 58cc1ab25da4..bc52e3ddf875 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.69";
+  version = "4.14.70";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1";
+    sha256 = "0b733s4m9r9606xmxv5jfr5x14c4ik665awln2smd23z8wrdipy5";
   };
 } // (args.argsOverride or {}))

From 21935188017c312b6be85ab73574be49a7ca0156 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Sep 2018 09:46:22 -0400
Subject: [PATCH 1047/3253] linux: 4.18.7 -> 4.18.8

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index f6f92d65938b..91232ab0bbee 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.7";
+  version = "4.18.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cgpb8zx7ckd9lmmaas6r1vszbz9lhrn4w1njw3yaw9a4rg44fzh";
+    sha256 = "152lz1yim77kpighdcyy1csxs0xf8m2zkwwcz847fqdbd6ninmgi";
   };
 } // (args.argsOverride or {}))

From 795488491cf38c7b3182f745f781d3d9930d157c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Sep 2018 09:57:34 -0400
Subject: [PATCH 1048/3253] sbt: 1.2.1 -> 1.2.3

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index b5751a19455e..bbbbbf462ec8 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.2.1";
+  version = "1.2.3";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "1pyp98svh5x8b6yp5vfl0jhz8aysjm0dqvqf7znyb3l7knfqk726";
+    sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm";
   };
 
   patchPhase = ''

From 6a4b9dfa2f71119a717269234ee66abcfa830c12 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 16:02:55 +0200
Subject: [PATCH 1049/3253] Paket: 1.18.2 -> 5.179.1 (#46701)

---
 pkgs/top-level/dotnet-packages.nix | 63 ++----------------------------
 1 file changed, 4 insertions(+), 59 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 3eeb3efdc503..840d78d6562c 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -898,66 +898,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     exeFiles = [ "nuget.exe" ];
   };
 
-  Paket = buildDotnetPackage rec {
+  Paket = fetchNuGet {
     baseName = "Paket";
-    version = "1.18.2";
-
-    src = fetchFromGitHub {
-      owner = "fsprojects";
-      repo = "Paket";
-      rev = version;
-      sha256 = "04iwy3mggz7xn36lhzyrwqzlw451a16jblwx131qjm6fnac6rq1m";
-    };
-
-    buildInputs = [
-      fsharp
-      dotnetPackages.NewtonsoftJson
-      dotnetPackages.UnionArgParser
-      dotnetPackages.NUnit
-    ];
-
-    fileFsUnit = fetchurl {
-      name = "FsUnit.fs";
-      url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs;
-      sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp";
-    };
-
-    fileGlobbing = fetchurl {
-      name = "Globbing.fs";
-      url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs;
-      sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7";
-    };
-
-    fileErrorHandling = fetchurl {
-      name = "ErrorHandling.fs";
-      url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs;
-      sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9";
-    };
-
-    postConfigure = ''
-       # Copy said single-files-in-git-repos
-       mkdir -p "paket-files/forki/FsUnit"
-       cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs"
-
-       mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing"
-       cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs"
-
-       mkdir -p "paket-files/fsprojects/Chessie/src/Chessie"
-       cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs"
-    '';
-
-    xBuildFiles = [ "Paket.sln" ];
-
-    outputFiles = [ "bin/*" ];
-    exeFiles = [ "paket.exe" ];
-
-    meta = {
-      description = "A dependency manager for .NET and Mono projects";
-      homepage = "http://fsprojects.github.io/Paket/";
-      license = stdenv.lib.licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [ obadz ];
-      platforms = with stdenv.lib.platforms; linux;
-    };
+    version = "5.179.1";
+    sha256 = "11rzna03i145qj08hwrynya548fwk8xzxmg65swyaf19jd7gzg82";
+    outputFiles = [ "*" ];
   };
 
   Projekt = buildDotnetPackage rec {

From e5a5cd4806082b4dbc5083e6ef6e93cd6e7ae72e Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:45:59 +0200
Subject: [PATCH 1050/3253] apacheKafka: 1.1.0 -> 2.0.0

---
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 31cff39cb3e6..c0d15ab48f3f 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -28,6 +28,11 @@ let
       scalaVersion = "2.12";
       sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9";
     };
+    "2.0" = {
+      kafkaVersion = "2.0.0";
+      scalaVersion = "2.12";
+      sha256 = "0mbrp8rafv1bra9nrdicpxy6w59ixanaj50c9pkgdrih82f57wdm";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780b20add09f..9fd7d837dfd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7921,12 +7921,13 @@ with pkgs;
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_1_1;
+  apacheKafka = apacheKafka_2_0;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
   apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
   apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
+  apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; };
 
   kt = callPackage ../tools/misc/kt {};
 

From 00ed6a6b30d8a9dca57d4b230d540d52eb5656cf Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:46:58 +0200
Subject: [PATCH 1051/3253] apacheKafka_1_1: 1.1.0 -> 1.1.1

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index c0d15ab48f3f..f0d2b824b934 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -24,9 +24,9 @@ let
       sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
     };
     "1.1" = {
-      kafkaVersion = "1.1.0";
+      kafkaVersion = "1.1.1";
       scalaVersion = "2.12";
-      sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9";
+      sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2";
     };
     "2.0" = {
       kafkaVersion = "2.0.0";

From 27e8734642a3675d16da9253481eab96eb555ab5 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:48:35 +0200
Subject: [PATCH 1052/3253] apacheKafka_1_0: 1.0.1 -> 1.0.2

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index f0d2b824b934..d3fbc08cc024 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -19,9 +19,9 @@ let
       sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
     };
     "1.0" = {
-      kafkaVersion = "1.0.1";
+      kafkaVersion = "1.0.2";
       scalaVersion = "2.12";
-      sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
+      sha256 = "0cmq8ww1lbkp3ipy9d1q8c1yz4kfwj0v4ynnhsk1i48sqlmvwybj";
     };
     "1.1" = {
       kafkaVersion = "1.1.1";

From aa4fe884c8820631ff96a54ed007beb4af23d872 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:50:32 +0200
Subject: [PATCH 1053/3253] apacheKafka_0_11: 0.11.0.1 -> 0.11.0.3

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index d3fbc08cc024..59d3972c12fc 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -14,9 +14,9 @@ let
       sha256 = "0iszr6r0n9yjgq7kcp1hf00fg754m86gs4jzqc18542an94b88z5";
     };
     "0.11" = {
-      kafkaVersion = "0.11.0.1";
+      kafkaVersion = "0.11.0.3";
       scalaVersion = "2.12";
-      sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
+      sha256 = "0zkzp9a8lcfcpavks131119v10hpn90sc0pw4f90jc4zn2yw3rgd";
     };
     "1.0" = {
       kafkaVersion = "1.0.2";

From 5e21a5aa57ace24a3731474105973ab9549e7be2 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 15 Sep 2018 10:51:42 +0200
Subject: [PATCH 1054/3253] apacheKafka_0_10: 0.10.2.1 -> 0.10.2.2

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 59d3972c12fc..52bb166f401c 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -9,9 +9,9 @@ let
       sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
     };
     "0.10" = {
-      kafkaVersion = "0.10.2.1";
+      kafkaVersion = "0.10.2.2";
       scalaVersion = "2.12";
-      sha256 = "0iszr6r0n9yjgq7kcp1hf00fg754m86gs4jzqc18542an94b88z5";
+      sha256 = "13wibnz7n7znv2g13jlpkz1r0y73qy5b02pdqhsq7cl72h9s6wms";
     };
     "0.11" = {
       kafkaVersion = "0.11.0.3";

From 36ec1db42d96bd9d13b883088655627f663ff7c0 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 15 Sep 2018 16:09:49 +0200
Subject: [PATCH 1055/3253] sequeler: 0.6.1 -> 0.6.2 (#46692)

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.2
---
 pkgs/applications/misc/sequeler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index ba4984a0f155..89b4e33a927b 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -4,7 +4,7 @@
 
 
 let
-  version = "0.6.1";
+  version = "0.6.2";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "1gafd8bmwpby7gjzfr7q25rrdmyh1f175fxc1yrcr5nplfyzwfnb";
+    sha256 = "0j5z3z34jc1acclmlkjpv7fcs4f2gf0bcfnvcpn3zdzw9fzj0sw7";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ];

From 76001b8509161926905ce07da78ec7a87c88c18e Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 16:18:29 +0200
Subject: [PATCH 1056/3253] Deedle: 1.2.0 -> 1.2.5 (#46702)

---
 pkgs/top-level/dotnet-packages.nix | 47 +++---------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 840d78d6562c..ee1b94c8638d 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -402,50 +402,11 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     };
   };
 
-  Deedle = buildDotnetPackage rec {
+  Deedle = fetchNuGet rec {
     baseName = "Deedle";
-    version = "1.2.0";
-
-    src = fetchFromGitHub {
-      owner = "BlueMountainCapital";
-      repo = baseName;
-      rev = "v${version}";
-      sha256 = "115zzh3q57w8wr02cl2v8wijnj1rg01j1mk9zbzixbb4aird72n5";
-    };
-
-    # Enough files from this repo are needed that it will be quicker to just get the entire repo
-    fsharpDataSrc = fetchFromGitHub {
-      owner = "fsharp";
-      repo = "FSharp.Data";
-      rev = "2.2.3";
-      sha256 = "1h3v9rc8k0khp61cv5n01larqbxd3xcx3q52sw5zf9l0661vw7qr";
-    };
-
-    buildInputs = [
-      fsharp
-      dotnetPackages.FsCheck
-      dotnetPackages.FSharpCompilerService
-      dotnetPackages.FSharpData
-      dotnetPackages.FSharpFormatting
-      dotnetPackages.MathNetNumerics
-      dotnetPackages.NUnit
-    ];
-
-    preConfigure = ''
-      mkdir -vp paket-files/fsharp
-      ln -sv ${fsharpDataSrc} paket-files/fsharp/FSharp.Data
-    '';
-
-    xBuildFiles = [ "Deedle.Core.sln" ];  # Come back later to get RProvider as well
-    outputFiles = [ "bin/*" "LICENSE.md" ];
-
-    meta = {
-      description = "Deedle is an easy to use library for data and time series manipulation and for scientific programming";
-      homepage = "http://bluemountaincapital.github.io/Deedle/";
-      license = stdenv.lib.licenses.free;
-      maintainers = with stdenv.lib.maintainers; [ obadz ];
-      platforms = with stdenv.lib.platforms; linux;
-    };
+    version = "1.2.5";
+    sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw";
+    outputFiles = [ "*" ];
   };
 
   ExcelDna = buildDotnetPackage rec {

From 633bcbbb203edfe7e48b2ce1bd977b6e4bcfdcf4 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 15 Sep 2018 16:26:12 +0200
Subject: [PATCH 1057/3253] cni-plugins: 0.7.1 -> 0.7.3 (#46698)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 8a006edda6a8..6cecd3bd66ca 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-plugins-${version}";
-  version = "0.7.1";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
+    sha256 = "1saaszzxy4x3jkqd9ac6cphmzfim7x84h28c9i7az46px40blzm1";
   };
 
   buildInputs = [ go ];

From 54ab621fa7bf19ef752562c3f7cabc42fd5f0eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 15 Sep 2018 11:50:24 -0300
Subject: [PATCH 1058/3253] matcha: init at 2018-09-14 (#46693)

---
 pkgs/misc/themes/matcha/default.nix | 32 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/misc/themes/matcha/default.nix

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix
new file mode 100644
index 000000000000..264d171292d2
--- /dev/null
+++ b/pkgs/misc/themes/matcha/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "matcha-${version}";
+  version = "2018-09-14";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = "matcha";
+    rev = "fe35259742b5ae007ab17d46d21acad5754477b9";
+    sha256 = "1qwb8l1xfx9ca2y9gcsckxikijz1ij28dirvpqvhbbyn1m8i9hwd";
+  };
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    patchShebangs .
+    substituteInPlace Install --replace '$HOME/.themes' "$out/share/themes"
+    ./Install
+    install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A stylish Design theme for GTK based desktop environments";
+    homepage = https://vinceliuice.github.io/theme-matcha;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fd7d837dfd3..e987aa733936 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21682,6 +21682,8 @@ with pkgs;
 
   martyr = callPackage ../development/libraries/martyr { };
 
+  matcha = callPackage ../misc/themes/matcha { };
+
   # previously known as flat-plat
   materia-theme = callPackage ../misc/themes/materia-theme { };
 

From 6f27a91eb59421277777482553896f5a63b96401 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 15 Sep 2018 17:51:28 +0300
Subject: [PATCH 1059/3253] nano-wallet: 15.2 -> 16.0 (#46567)

---
 pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 7491e8306285..4667d4029878 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "15.2";
+  version = "16.0";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0ngsnaczw5y709zk52flp6m2c83q3kxfgz0bzi8rzfjxp10ncnz3";
+    sha256 = "0fk8jlas3khdh3nlv40krsjdifxp9agblvzap6k93wmm9y34h41c";
     fetchSubmodules = true;
   };
 

From 6fcbae1e9cc47abb3a0c83d1fe775527843f40cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Sep 2018 08:02:58 -0700
Subject: [PATCH 1060/3253] vim: 8.1.0146 -> 8.1.0348 (#46181)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
vim
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 2ce6563be0bd..87a525b33021 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.1.0146";
+  version = "8.1.0348";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1v33h08j15zii0ipw5py18ghsaxlbar0nyx365z1acjhk4vhn9nb";
+    sha256 = "0f18kpywnph708mvj1fpi06qb53nbhc26ngjh2kvfxwawn63k8ab";
   };
 
   enableParallelBuilding = true;

From 76051c1ef605bb20e7f33eeb4ebdc62a60629915 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Sep 2018 08:19:19 -0700
Subject: [PATCH 1061/3253] neovim-qt: 0.2.9 -> 0.2.10 (#46234)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
neovim-qt
---
 pkgs/applications/editors/neovim/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index baeb38797352..cfdcd7fe939f 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
-  version = "0.2.9";
+  version = "0.2.10";
 
   src = fetchFromGitHub {
     owner  = "equalsraf";
     repo   = "neovim-qt";
     rev    = "v${version}";
-    sha256 = "014zqfbbv7q85z64h1iw88l37vhrvhjv7xxd0a76j7d1m2769kqs";
+    sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4";
   };
 
   cmakeFlags = [

From 0bf6b440d90acc6b581c6dd18ce3eb6b335eccd7 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 18:46:18 +0200
Subject: [PATCH 1062/3253] go: skip flaky os/exec TestExtraFiles

This seems to only happen on i686 on go 1.11. It also happens on
Debian. For more information:

https://github.com/golang/go/issues/25628
---
 pkgs/development/compilers/go/1.11.nix            |  1 +
 .../go/skip-test-extra-files-on-386.patch         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/compilers/go/skip-test-extra-files-on-386.patch

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 237f74e319f7..4a84c622a73e 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
     ./remove-fhs-test-references.patch
     ./skip-external-network-tests.patch
     ./skip-nohup-tests.patch
+    ./skip-test-extra-files-on-386.patch
   ];
 
   postPatch = optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
new file mode 100644
index 000000000000..afe5aea3d916
--- /dev/null
+++ b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
+index 558345ff63..22129bf022 100644
+--- a/src/os/exec/exec_test.go
++++ b/src/os/exec/exec_test.go
+@@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) {
+ 		t.Skipf("skipping test on %q", runtime.GOOS)
+ 	}
+ 
++	if runtime.GOOS == "linux" && runtime.GOARCH  == "386" {
++		t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
++	}
++
+ 	// Ensure that file descriptors have not already been leaked into
+ 	// our environment.
+ 	if !testedAlreadyLeaked {

From 0fe0f481c7af55e047496a6eab96322b7a7f16ca Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 15 Sep 2018 19:12:04 +0200
Subject: [PATCH 1063/3253] darcs: unpin ghc (use 8.4.x) version

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e987aa733936..0c0e485357c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15858,7 +15858,7 @@ with pkgs;
 
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
-  darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: {
+  darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
   });
 

From 74047ea68683a71b909145fdfaa13c6ba0d44622 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 15 Sep 2018 14:07:52 -0300
Subject: [PATCH 1064/3253] youtube-dl: 2018.08.04 -> 2018.09.10

---
 pkgs/tools/misc/youtube-dl/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index e497f2a698c7..d688e5fe6625 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,29 +16,21 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.09.01";
+  version = "2018.09.10";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036";
+    sha256 = "12gd84i5drc2z4wzah7r2vj8fkj9yilm7q8dm7q9n95abrdb7sh8";
   };
 
-  patches = [
-    # https://github.com/rg3/youtube-dl/pull/17464
-    (fetchpatch {
-      name = "youtube-js-player-fix.patch";
-      url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch";
-      sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg";
-    })
-  ];
-
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
   propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;
 
-  # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
-  # rtmpdump is required to download files over RTMP
-  # atomicparsley for embedding thumbnails
+  # Ensure these utilities are available in $PATH:
+  # - ffmpeg: post-processing & transcoding support
+  # - rtmpdump: download files over RTMP
+  # - atomicparsley: embedding thumbnails
   makeWrapperArgs = let
       packagesToBinPath =
         [ atomicparsley ]

From 04d8e267b7069c07491e8934d7911cd2a18c8c21 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 15 Sep 2018 12:24:34 -0400
Subject: [PATCH 1065/3253] elm: pick up some recent minor updates to 0.19.0

---
 pkgs/development/compilers/elm/packages/elm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
index 1097c8a1e192..41998f4c9b3d 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -11,8 +11,8 @@ mkDerivation {
   version = "0.19.0";
   src = fetchgit {
     url = "https://github.com/elm/compiler";
-    sha256 = "0s93z9vr0vp5w894ghc5s34nsq09sg1msf59zfiba87sid5vgjqy";
-    rev = "32059a289d27e303fa1665e9ada0a52eb688f302";
+    sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4";
+    rev = "d5cbc41aac23da463236bbc250933d037da4055a";
   };
   isLibrary = false;
   isExecutable = true;

From e78f60475b27f4ec1cb7615caa84a9fe2c721cef Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 15 Sep 2018 12:16:13 -0400
Subject: [PATCH 1066/3253] elm: patch to widen dependency after hackage update
 1b1cb6305c

works around missing dependency 'language-glsl >=0.0.2 && <0.3'

patch from https://github.com/elm/compiler/pull/1784
---
 pkgs/development/compilers/elm/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 93deb4a90aff..692404a19bf6 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
+{ lib, stdenv, buildEnv
+, haskell, nodejs
+, fetchurl, fetchpatch, makeWrapper, git }:
 
 # To update:
 
@@ -90,6 +92,12 @@ let
                 export ELM_HOME=`pwd`/.elm
               '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
               buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+              patches = [
+                (fetchpatch {
+                  url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
+                  sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
+                })
+              ];
               postInstall = ''
                 wrapProgram $out/bin/elm \
                   --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}

From 72130651b55e4115c80d6ffa6033be7992c38858 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 15 Sep 2018 14:21:45 -0300
Subject: [PATCH 1067/3253] Update Anderson Torres e-mail info

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 837c4f46dee2..566414bf4439 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -227,7 +227,7 @@
     name = "Andrew Morsillo";
   };
   AndersonTorres = {
-    email = "torres.anderson.85@gmail.com";
+    email = "torres.anderson.85@protonmail.com";
     github = "AndersonTorres";
     name = "Anderson Torres";
   };

From 6dae5de4362bf7c4bf8640d683e5844144151338 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 15 Sep 2018 18:38:26 +0000
Subject: [PATCH 1068/3253] rust.section.md: remove nixcrate reference

nixcrate is deprecated
---
 doc/languages-frameworks/rust.section.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6588281878a0..4549bbd1686b 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -64,9 +64,6 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
-To install crates with nix there is also an experimental project called
-[nixcrates](https://github.com/fractalide/nixcrates).
-
 ## Compiling Rust crates using Nix instead of Cargo
 
 ### Simple operation

From 56b95ba4376057a4064e2742bfe971dfae1422db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 15 Sep 2018 19:41:46 +0100
Subject: [PATCH 1069/3253] findutils: specify on which kernel version the test
 fail

---
 pkgs/tools/misc/findutils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index e7c507903190..d19117d4dcda 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     ./memory-leak.patch
     ./no-install-statedir.patch
 
-    # prevent tests from failing on old kernels
+    # Prevent tests from failing on old kernels (2.6x)
+    # getdtablesize reports incorrect values if getrlimit() fails
     ./disable-getdtablesize-test.patch
   ];
 

From d627e096fc7076ea218479e1c9d0c6b0056797b1 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 15 Sep 2018 21:50:23 +0300
Subject: [PATCH 1070/3253] tectonic: 0.1.8 -> 0.1.9

---
 pkgs/tools/typesetting/tectonic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index 0d082eac4bba..bcc69c7b223e 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "tectonic-${version}";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "tectonic-typesetting";
     repo = "tectonic";
     rev = "v${version}";
-    sha256 = "1bm3s2zkyy44xrc804c65hrbc6ixzcr95na671b0dannjrikrx1x";
+    sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq";
   };
 
-  cargoSha256 = "1pyaw72h85ydq794mpgfjfq7dcq3a1dg4infh770swfaycyll6h6";
+  cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq";
 
   nativeBuildInputs = [ pkgconfig ];
 

From fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 5 Sep 2018 16:11:47 +0000
Subject: [PATCH 1071/3253] jbuilder: 1.0.1 -> dune: 1.1.1

---
 .../networking/google-drive-ocamlfuse/default.nix      |  6 +++---
 pkgs/development/compilers/reason/default.nix          |  6 +++---
 pkgs/development/ocaml-modules/alcotest/default.nix    |  8 ++++----
 pkgs/development/ocaml-modules/angstrom/default.nix    | 10 +++++-----
 pkgs/development/ocaml-modules/atd/default.nix         |  6 +++---
 pkgs/development/ocaml-modules/bigstringaf/default.nix |  6 +++---
 pkgs/development/ocaml-modules/biniou/default.nix      |  6 +++---
 pkgs/development/ocaml-modules/bitstring/default.nix   |  6 +++---
 pkgs/development/ocaml-modules/camlimages/default.nix  |  8 ++++----
 pkgs/development/ocaml-modules/camomile/default.nix    |  6 +++---
 pkgs/development/ocaml-modules/cohttp/default.nix      |  8 ++++----
 pkgs/development/ocaml-modules/cohttp/lwt-unix.nix     |  6 +++---
 pkgs/development/ocaml-modules/cohttp/lwt.nix          |  6 +++---
 pkgs/development/ocaml-modules/conduit/default.nix     |  8 ++++----
 pkgs/development/ocaml-modules/conduit/lwt-unix.nix    |  6 +++---
 pkgs/development/ocaml-modules/conduit/lwt.nix         |  6 +++---
 pkgs/development/ocaml-modules/cstruct/default.nix     |  8 ++++----
 pkgs/development/ocaml-modules/cstruct/ppx.nix         |  2 +-
 pkgs/development/ocaml-modules/csv/default.nix         |  8 ++++----
 pkgs/development/ocaml-modules/dtoa/default.nix        |  8 ++++----
 pkgs/development/ocaml-modules/ezjsonm/default.nix     |  8 ++++----
 pkgs/development/ocaml-modules/faraday/default.nix     |  8 ++++----
 pkgs/development/ocaml-modules/gapi-ocaml/default.nix  |  6 +++---
 pkgs/development/ocaml-modules/git-http/default.nix    | 10 +++++-----
 pkgs/development/ocaml-modules/git-unix/default.nix    |  8 ++++----
 pkgs/development/ocaml-modules/git/default.nix         | 10 +++++-----
 pkgs/development/ocaml-modules/hex/default.nix         |  8 ++++----
 pkgs/development/ocaml-modules/httpaf/default.nix      |  6 +++---
 pkgs/development/ocaml-modules/io-page/default.nix     |  6 +++---
 pkgs/development/ocaml-modules/ipaddr/default.nix      |  6 +++---
 .../ocaml-modules/janestreet/janePackage.nix           |  6 +++---
 pkgs/development/ocaml-modules/lambda-term/default.nix |  8 ++++----
 pkgs/development/ocaml-modules/linenoise/default.nix   |  6 +++---
 pkgs/development/ocaml-modules/lwt/default.nix         |  6 +++---
 pkgs/development/ocaml-modules/lwt/ppx.nix             |  8 ++++----
 pkgs/development/ocaml-modules/lwt_log/default.nix     |  8 ++++----
 pkgs/development/ocaml-modules/lwt_ssl/default.nix     |  6 +++---
 pkgs/development/ocaml-modules/mstruct/default.nix     |  6 +++---
 .../ocaml-modules/ocaml-migrate-parsetree/default.nix  |  6 +++---
 pkgs/development/ocaml-modules/ppx_blob/default.nix    |  6 +++---
 .../development/ocaml-modules/ppx_derivers/default.nix |  6 +++---
 pkgs/development/ocaml-modules/ppx_gen_rec/default.nix |  8 ++++----
 pkgs/development/ocaml-modules/ppxlib/default.nix      |  8 ++++----
 pkgs/development/ocaml-modules/re/default.nix          |  6 +++---
 pkgs/development/ocaml-modules/rope/default.nix        |  8 ++++----
 pkgs/development/ocaml-modules/sequence/default.nix    |  8 ++++----
 pkgs/development/ocaml-modules/sqlexpr/default.nix     |  6 +++---
 pkgs/development/ocaml-modules/sqlexpr/ppx.nix         |  4 ++--
 pkgs/development/ocaml-modules/uri/default.nix         |  6 +++---
 pkgs/development/ocaml-modules/wtf8/default.nix        | 10 ++++------
 pkgs/development/ocaml-modules/yojson/default.nix      |  6 +++---
 pkgs/development/ocaml-modules/zed/default.nix         |  8 ++++----
 pkgs/development/tools/ocaml/cppo/default.nix          |  6 +++---
 .../tools/ocaml/{jbuilder => dune}/default.nix         |  8 +++-----
 pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix       |  6 +++---
 pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix    |  6 +++---
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix  |  8 ++++----
 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix       |  6 +++---
 .../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix |  6 +++---
 pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix       |  6 +++---
 .../tools/ocaml/js_of_ocaml/ppx_deriving_json.nix      |  6 +++---
 pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix     |  6 +++---
 pkgs/development/tools/ocaml/ocaml-top/default.nix     |  7 ++++---
 pkgs/development/tools/ocaml/ocp-indent/default.nix    |  4 ++--
 pkgs/development/tools/ocaml/ocp-index/default.nix     |  8 ++++----
 pkgs/development/tools/ocaml/utop/default.nix          |  6 +++---
 pkgs/development/tools/pyre/default.nix                |  4 ++--
 pkgs/top-level/aliases.nix                             |  1 +
 pkgs/top-level/all-packages.nix                        |  4 ++--
 69 files changed, 228 insertions(+), 230 deletions(-)
 rename pkgs/development/tools/ocaml/{jbuilder => dune}/default.nix (78%)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 87ef5f2a41a2..ff099a909c75 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, zlib
-, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
+, ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
   name = "google-drive-ocamlfuse-${version}";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
   };
 
-  nativeBuildInputs = [ jbuilder opam ];
+  nativeBuildInputs = [ dune ];
 
   buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
 
   buildPhase = "jbuilder build @install";
-  installPhase = "mkdir $out && jbuilder install --prefix $out";
+  installPhase = "mkdir $out && dune install --prefix $out";
 
   meta = {
     homepage = http://gdfuse.forge.ocamlcore.org/;
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index f4cc1cf2b650..81c935fc421f 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
 , menhir, merlin_extend, ppx_tools_versioned, utop
 }:
 
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
 
-  buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
+  buildInputs = [ makeWrapper ocaml findlib dune utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
   installPhase = ''
     for p in reason rtop
     do
-      ${jbuilder.installPhase} $p.install
+      ${dune.installPhase} $p.install
     done
 
     wrapProgram $out/bin/rtop \
diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix
index 000ff8285c53..8723b6a1f1ff 100644
--- a/pkgs/development/ocaml-modules/alcotest/default.nix
+++ b/pkgs/development/ocaml-modules/alcotest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune
 , cmdliner, astring, fmt, result
 }:
 
@@ -6,9 +6,9 @@ let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
     version = "0.8.2";
     sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf";
-    buildInputs = [ jbuilder ];
-    buildPhase = "jbuilder build -p alcotest";
-    inherit (jbuilder) installPhase;
+    buildInputs = [ dune ];
+    buildPhase = "dune build -p alcotest";
+    inherit (dune) installPhase;
   } else {
     version = "0.7.2";
     sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";
diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 97baca62e724..0c00dc2ff24e 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest, result
 , bigstringaf
 }:
 
@@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
     sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
   };
 
-  buildInputs = [ ocaml findlib jbuilder alcotest ];
+  buildInputs = [ ocaml findlib dune alcotest ];
   propagatedBuildInputs = [ bigstringaf result ];
 
-  buildPhase = "jbuilder build -p angstrom";
+  buildPhase = "dune build -p angstrom";
 
   doCheck = true;
-  checkPhase = "jbuilder runtest -p angstrom";
+  checkPhase = "dune runtest -p angstrom";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = https://github.com/inhabitedtype/angstrom;
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
index 52a1fc36921c..d5cd38bba728 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, jbuilder, which, biniou, yojson }:
+{ stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, dune, which, biniou, yojson }:
 
 stdenv.mkDerivation rec {
   version = "2.0.0";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  buildInputs = [ which jbuilder ocaml findlib menhir ];
+  buildInputs = [ which dune ocaml findlib menhir ];
   propagatedBuildInputs = [ easy-format biniou yojson ];
 
   buildPhase = "jbuilder build";
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mjambon/atd;
diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
index 21a0e3943923..fc9a5379b178 100644
--- a/pkgs/development/ocaml-modules/bigstringaf/default.nix
+++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.03"
 then throw "bigstringaf is not available for OCaml ${ocaml.version}"
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
     sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs";
   };
 
-  buildInputs = [ ocaml findlib jbuilder alcotest ];
+  buildInputs = [ ocaml findlib dune alcotest ];
 
   doCheck = true;
   checkPhase = "dune runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Bigstring intrinsics and fast blits based on memcpy/memmove";
diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix
index 97c4750002e6..439fce3bfd5b 100644
--- a/pkgs/development/ocaml-modules/biniou/default.nix
+++ b/pkgs/development/ocaml-modules/biniou/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, easy-format }:
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
 
   propagatedBuildInputs = [ easy-format ];
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    patchShebangs .
   '';
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     inherit (src.meta) homepage;
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index 13424272bcf8..93bcb3cb1e99 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , ppx_tools_versioned
 , ounit
 }:
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ppx_tools_versioned ounit ];
+  buildInputs = [ ocaml findlib dune ppx_tools_versioned ounit ];
 
   buildPhase = "jbuilder build";
 
   doCheck = true;
   checkPhase = "jbuilder runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix
index def710f3f1b0..b5ef173c9ff8 100644
--- a/pkgs/development/ocaml-modules/camlimages/default.nix
+++ b/pkgs/development/ocaml-modules/camlimages/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }:
+{ stdenv, fetchzip, findlib, dune, ocaml, configurator, cppo, lablgtk }:
 stdenv.mkDerivation rec {
   name = "camlimages-${version}";
   version = "5.0.0";
@@ -6,9 +6,9 @@ stdenv.mkDerivation rec {
     url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz";
     sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
   };
-  buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ];
-  buildPhase = "jbuilder build -p camlimages";
-  inherit (jbuilder) installPhase;
+  buildInputs = [ findlib dune ocaml configurator cppo lablgtk ];
+  buildPhase = "dune build -p camlimages";
+  inherit (dune) installPhase;
   
   meta = with stdenv.lib; {
     branch = "5.0";
diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index fc0ecfc1502f..53c45d17854c 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo }:
 
 stdenv.mkDerivation rec {
 	version = "0.8.7";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 		sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder cppo ];
+	buildInputs = [ ocaml findlib dune cppo ];
 
 	configurePhase = "ocaml configure.ml --share $out/share/camomile";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		inherit (ocaml.meta) platforms;
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 962525b47e42..79dc919556ae 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , ppx_fields_conv, ppx_sexp_conv, ppx_deriving
 , base64, fieldslib, jsonm, re, stringext, uri
 }:
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
 		sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune jsonm ppx_fields_conv ppx_sexp_conv ];
 
 	propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ];
 
-	buildPhase = "jbuilder build -p cohttp";
+	buildPhase = "dune build -p cohttp";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "HTTP(S) library for Lwt, Async and Mirage";
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
index c526a101dd9d..6489a583198c 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, cohttp-lwt
+{ stdenv, ocaml, findlib, dune, cohttp-lwt
 , conduit-lwt-unix, ppx_sexp_conv
 , cmdliner, fmt, magic-mime
 }:
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-cohttp-lwt-unix-${version}";
 	inherit (cohttp-lwt) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder cmdliner ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune cmdliner ppx_sexp_conv ];
 
 	propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
 
-	buildPhase = "jbuilder build -p cohttp-lwt-unix";
+	buildPhase = "dune build -p cohttp-lwt-unix";
 }
diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 21bea646d721..1630bfd131e4 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, cohttp, lwt3, uri, ppx_sexp_conv }:
+{ stdenv, ocaml, findlib, dune, cohttp, lwt3, uri, ppx_sexp_conv }:
 
 if !stdenv.lib.versionAtLeast cohttp.version "0.99"
 then cohttp
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-cohttp-lwt-${version}";
 	inherit (cohttp) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder uri ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune uri ppx_sexp_conv ];
 
 	propagatedBuildInputs = [ cohttp lwt3 ];
 
-	buildPhase = "jbuilder build -p cohttp-lwt";
+	buildPhase = "dune build -p cohttp-lwt";
 }
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 98ac997383c7..fdfd2bed1f15 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , ppx_sexp_conv
 , astring, ipaddr, uri
 }:
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
 		sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
 	propagatedBuildInputs = [ astring ipaddr uri ];
 
-	buildPhase = "jbuilder build -p conduit";
+	buildPhase = "dune build -p conduit";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "Network connection library for TCP and SSL";
diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index 5f33bbc42c10..b4357979de75 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, conduit-lwt
+{ stdenv, ocaml, findlib, dune, conduit-lwt
 , logs, ppx_sexp_conv, lwt_ssl
 }:
 
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-conduit-lwt-unix-${version}";
 	inherit (conduit-lwt) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
 
 	propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ];
 
-	buildPhase = "jbuilder build -p conduit-lwt-unix";
+	buildPhase = "dune build -p conduit-lwt-unix";
 }
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 8ee3d827ecc1..5b085239cfd0 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, ppx_sexp_conv, conduit, lwt3 }:
+{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, lwt3 }:
 
 if !stdenv.lib.versionAtLeast conduit.version "1.0"
 then conduit
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-conduit-lwt-${version}";
 	inherit (conduit) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
+	buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
 
 	propagatedBuildInputs = [ conduit lwt3 ];
 
-	buildPhase = "jbuilder build -p conduit-lwt";
+	buildPhase = "dune build -p conduit-lwt";
 }
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 0f5380f9a41f..1a5a992f2be1 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib, sexplib, ocplib-endian }:
+{ stdenv, fetchurl, ocaml, dune, findlib, sexplib, ocplib-endian }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-cstruct-${version}";
@@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar -xjf $curSrc";
 
-  buildInputs = [ ocaml jbuilder findlib ];
+  buildInputs = [ ocaml dune findlib ];
 
   propagatedBuildInputs = [ sexplib ocplib-endian ];
 
-  buildPhase = "jbuilder build -p cstruct";
+  buildPhase = "dune build -p cstruct";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Access C-like structures directly from OCaml";
diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix
index 9d19e1751e23..1696e200750c 100644
--- a/pkgs/development/ocaml-modules/cstruct/ppx.nix
+++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix
@@ -9,5 +9,5 @@ stdenv.mkDerivation rec {
 	buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ];
 	propagatedBuildInputs = [ cstruct ];
 
-	buildPhase = "jbuilder build -p ppx_cstruct";
+	buildPhase = "dune build -p ppx_cstruct";
 }
diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix
index 804cbb8ea858..6c6f8a68f814 100644
--- a/pkgs/development/ocaml-modules/csv/default.nix
+++ b/pkgs/development/ocaml-modules/csv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
+{ stdenv, fetchurl, ocaml, findlib, dune }:
 
 stdenv.mkDerivation rec {
 	version = "2.1";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
 
 	unpackCmd = "tar -xjf $src";
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib dune ];
 
-	buildPhase = "jbuilder build -p csv";
+	buildPhase = "dune build -p csv";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "A pure OCaml library to read and write CSV files";
diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix
index 9b6e56266143..a76e0c61450b 100644
--- a/pkgs/development/ocaml-modules/dtoa/default.nix
+++ b/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
+{ stdenv, fetchurl, ocaml, findlib, dune }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
 
-  buildPhase = "jbuilder build -p dtoa";
+  buildPhase = "dune build -p dtoa";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
 
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 1dcafe4c6a48..d38cf51c1531 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, jsonm, hex, sexplib }:
+{ stdenv, fetchzip, ocaml, findlib, dune, jsonm, hex, sexplib }:
 
 let version = "0.6.0"; in
 
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
     sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
   propagatedBuildInputs = [ jsonm hex sexplib ];
 
-  buildPhase = "jbuilder build -p ezjsonm";
+  buildPhase = "dune build -p ezjsonm";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "An easy interface on top of the Jsonm library";
diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
index 8f30ec519777..6af808654f53 100644
--- a/pkgs/development/ocaml-modules/faraday/default.nix
+++ b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "faraday is not available for OCaml ${ocaml.version}"
@@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
   };
 
-  buildInputs = [ ocaml findlib jbuilder alcotest ];
+  buildInputs = [ ocaml findlib dune alcotest ];
 
-  buildPhase = "jbuilder build -p faraday";
+  buildPhase = "dune build -p faraday";
 
   doCheck = true;
   checkPhase = "jbuilder runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Serialization library built for speed and memory efficiency";
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 9c7be26503f5..bf7418ab27eb 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
   };
-  buildInputs = [ ocaml jbuilder findlib ];
+  buildInputs = [ ocaml dune findlib ];
   propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "OCaml client for google services";
diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 5e757b5b6727..c6abb0171b03 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt
+{ stdenv, ocaml, findlib, dune, git, cohttp-lwt
 , alcotest, mtime, nocrypto
 }:
 
@@ -6,16 +6,16 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-git-http-${version}";
 	inherit (git) version src;
 
-	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
+	buildInputs = [ ocaml findlib dune alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ git cohttp-lwt ];
 
-	buildPhase = "jbuilder build -p git-http";
+	buildPhase = "dune build -p git-http";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	doCheck = true;
-	checkPhase = "jbuilder runtest -p git-http";
+	checkPhase = "dune runtest -p git-http";
 
 	meta = {
 		description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix
index afeb3f1957b0..7a796ca089d5 100644
--- a/pkgs/development/ocaml-modules/git-unix/default.nix
+++ b/pkgs/development/ocaml-modules/git-unix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, git-http
+{ stdenv, ocaml, findlib, dune, git-http
 , cohttp-lwt-unix
 , tls, cmdliner, mtime
 }:
@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-git-unix-${version}";
 	inherit (git-http) version src;
 
-	buildInputs = [ ocaml findlib jbuilder cmdliner mtime ];
+	buildInputs = [ ocaml findlib dune cmdliner mtime ];
 
 	propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ];
 
-	buildPhase = "jbuilder build -p git-unix";
+	buildPhase = "dune build -p git-unix";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "Unix backend for the Git protocol(s)";
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 0bf43174412c..777184ed2e94 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
 , alcotest, mtime, nocrypto
 }:
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
 		sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
+	buildInputs = [ ocaml findlib dune alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
 
-	buildPhase = "jbuilder build -p git";
+	buildPhase = "dune build -p git";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	doCheck = true;
-	checkPhase = "jbuilder runtest -p git";
+	checkPhase = "dune runtest -p git";
 
 	meta = {
 		description = "Git format and protocol in pure OCaml";
diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 596f6a0fa531..71a9ebf9ad5d 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, cstruct }:
+{ stdenv, fetchurl, ocaml, findlib, dune, cstruct }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "hex is not available for OCaml ${ocaml.version}"
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar -xjf $curSrc";
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
   propagatedBuildInputs = [ cstruct ];
 
-  buildPhase = "jbuilder build -p hex";
+  buildPhase = "dune build -p hex";
   doCheck = true;
   checkPhase = "jbuilder runtest";
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Mininal OCaml library providing hexadecimal converters";
diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index bb712d40827e..e8638e4cf184 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , angstrom, faraday, alcotest
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
   };
 
-  buildInputs = [ ocaml findlib jbuilder alcotest ];
+  buildInputs = [ ocaml findlib dune alcotest ];
   propagatedBuildInputs = [ angstrom faraday ];
 
   buildPhase = "dune build -p httpaf";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "dune runtest -p httpaf";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "A high-performance, memory-efficient, and scalable web server for OCaml";
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 72b7a3a54ce7..7c3d3a20c4d7 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, configurator, cstruct }:
+{ stdenv, fetchzip, ocaml, findlib, dune, configurator, cstruct }:
 
 let version = "2.0.1"; in
 
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i";
   };
 
-  buildInputs = [ ocaml findlib jbuilder configurator ];
+  buildInputs = [ ocaml findlib dune configurator ];
   propagatedBuildInputs = [ cstruct ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = https://github.com/mirage/io-page;
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index 2f0aa3429950..9a12fb44fffb 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ocaml, ocamlbuild, findlib
-, jbuilder, sexplib, ppx_sexp_conv
+, dune, sexplib, ppx_sexp_conv
 }:
 
 stdenv.mkDerivation rec {
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
+  buildInputs = [ ocaml findlib ocamlbuild dune ];
   propagatedBuildInputs = [ ppx_sexp_conv sexplib ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-ipaddr;
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
index d17e595199e1..439c6f500bc9 100644
--- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, defaultVersion ? "0.11.0" }:
+{ stdenv, fetchFromGitHub, ocaml, dune, findlib, defaultVersion ? "0.11.0" }:
 
 { name, version ? defaultVersion, buildInputs ? [], hash, meta, ...}@args:
 
@@ -16,9 +16,9 @@ stdenv.mkDerivation (args // {
     sha256 = hash;
   };
 
-  buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs;
+  buildInputs = [ ocaml dune findlib ] ++ buildInputs;
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 62b1f7b1a8e0..ba68c0463f8f 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libev, ocaml, findlib, jbuilder
+{ stdenv, fetchurl, libev, ocaml, findlib, dune
 , zed, lwt_log, lwt_react
 }:
 
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l";
   };
 
-  buildInputs = [ libev ocaml findlib jbuilder ];
+  buildInputs = [ libev ocaml findlib dune ];
 
   propagatedBuildInputs = [ zed lwt_log lwt_react ];
 
-  buildPhase = "jbuilder build -p lambda-term";
+  buildPhase = "dune build -p lambda-term";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   hasSharedObjects = true;
 
diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix
index 53ac918c47e6..e7120ad38572 100644
--- a/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, result }:
+{ stdenv, fetchFromGitHub, ocaml, dune, findlib, result }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "linenoise is not available for OCaml ${ocaml.version}"
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
   propagatedBuildInputs = [ result ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "OCaml bindings to linenoise";
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 739e6e1e43a8..c8371feb9052 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
+{ stdenv, fetchzip, pkgconfig, ncurses, libev, dune
 , ocaml, findlib, cppo
 , ocaml-migrate-parsetree, ppx_tools_versioned, result
 , withP4 ? true
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ncurses ocaml findlib jbuilder cppo
+  buildInputs = [ ncurses ocaml findlib dune cppo
     ocaml-migrate-parsetree ppx_tools_versioned ]
   ++ stdenv.lib.optional withP4 camlp4;
   propagatedBuildInputs = [ libev result ];
 
   installPhase = ''
     ocaml src/util/install_filter.ml
-    ${jbuilder.installPhase}
+    ${dune.installPhase}
   '';
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix
index 3cf08d06f1eb..89e326557b5d 100644
--- a/pkgs/development/ocaml-modules/lwt/ppx.nix
+++ b/pkgs/development/ocaml-modules/lwt/ppx.nix
@@ -1,16 +1,16 @@
-{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }:
+{ stdenv, dune, ocaml, findlib, lwt, ppx_tools_versioned }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}";
 
   inherit (lwt) src;
 
-  buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ];
+  buildInputs = [ dune ocaml findlib ppx_tools_versioned ];
 
   propagatedBuildInputs = [ lwt ];
 
-  buildPhase = "jbuilder build -p lwt_ppx";
-  installPhase = "${jbuilder.installPhase} lwt_ppx.install";
+  buildPhase = "dune build -p lwt_ppx";
+  installPhase = "${dune.installPhase} lwt_ppx.install";
 
   meta = {
     description = "Ppx syntax extension for Lwt";
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
index bdabe677a858..42ff2f26b7d3 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, lwt }:
+{ stdenv, ocaml, findlib, dune, lwt }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
 
   inherit (lwt) src;
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
 
   propagatedBuildInputs = [ lwt ];
 
-  buildPhase = "jbuilder build -p lwt_log";
+  buildPhase = "dune build -p lwt_log";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Lwt logging library (deprecated)";
diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
index e53c835a2911..8fbec7cd4dff 100644
--- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, ssl, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, dune, ssl, lwt }:
 
 stdenv.mkDerivation rec {
   version = "1.1.2";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1q0an3djqjxv83v3iswi7m81braqx93kcrcwrxwmf6jzhdm4pn15";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
   propagatedBuildInputs = [ ssl lwt ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = "https://github.com/aantron/lwt_ssl";
diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix
index 5682b75d6a14..9184975f0698 100644
--- a/pkgs/development/ocaml-modules/mstruct/default.nix
+++ b/pkgs/development/ocaml-modules/mstruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , cstruct
 }:
 
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
 		sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib dune ];
 
 	propagatedBuildInputs = [ cstruct ];
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "A thin mutable layer on top of cstruct";
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
index 9a2af140e312..131f478d32ed 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune, result }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
      sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n";
    };
 
-   buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
+   buildInputs = [ ocaml findlib ocamlbuild dune ];
    propagatedBuildInputs = [ result ];
 
-   inherit (jbuilder) installPhase;
+   inherit (dune) installPhase;
 
    meta = {
      description = "Convert OCaml parsetrees between different major versions";
diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 45dd73d4a321..72e0e5e121ad 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest
+{ stdenv, fetchurl, ocaml, findlib, dune, alcotest
 , ocaml-migrate-parsetree
 }:
 
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $curSrc";
 
-  buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ];
+  buildInputs = [ ocaml findlib dune alcotest ocaml-migrate-parsetree ];
 
   buildPhase = "dune build -p ppx_blob";
 
   doCheck = true;
   checkPhase = "dune runtest -p ppx_blob";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/johnwhitington/ppx_blob;
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index 2dc7ef2b13e5..edd086067610 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "ppx_derivers is not available for OCaml ${ocaml.version}"
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 		sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib dune ];
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "Shared [@@deriving] plugin registry";
diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
index 39b0c53e0e94..4c458b983d33 100644
--- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml-migrate-parsetree }:
+{ stdenv, fetchurl, ocaml, findlib, dune, ocaml-migrate-parsetree }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ];
+  buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ];
 
-  buildPhase = "jbuilder build -p ppx_gen_rec";
+  buildPhase = "dune build -p ppx_gen_rec";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/flowtype/ocaml-ppx_gen_rec;
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 889e4acd2b50..656b650b13f7 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
 }:
 
@@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
     sha256 = "0csp49jh7zgjnqh46mxbf322whlbmgy7v1a12nvxh97qg6i5fvsy";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
 
   propagatedBuildInputs = [
     ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
   ];
 
-  buildPhase = "jbuilder build";
+  buildPhase = "dune build";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Comprehensive ppx tool set";
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 4994ceca7fb3..c4215b98a50f 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }:
+{ stdenv, fetchzip, ocaml, findlib, dune, ounit, seq }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "re is not available for OCaml ${ocaml.version}"
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ounit ];
+  buildInputs = [ ocaml findlib dune ounit ];
   propagatedBuildInputs = [ seq ];
 
   doCheck = true;
   checkPhase = "jbuilder runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = https://github.com/ocaml/ocaml-re;
diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix
index dfb8c56c23e8..9e9ebea6b6a7 100644
--- a/pkgs/development/ocaml-modules/rope/default.nix
+++ b/pkgs/development/ocaml-modules/rope/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder, benchmark }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.03"
@@ -6,11 +6,11 @@ let param =
     version = "0.6";
     url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6/rope-0.6.tbz";
     sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc";
-    buildInputs = [ jbuilder ];
+    buildInputs = [ dune ];
     extra = {
       unpackCmd = "tar -xjf $curSrc";
-      buildPhase = "jbuilder build -p rope";
-      inherit (jbuilder) installPhase;
+      buildPhase = "dune build -p rope";
+      inherit (dune) installPhase;
     };
   } else {
     version = "0.5";
diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix
index f06282df4fc6..59641458338f 100644
--- a/pkgs/development/ocaml-modules/sequence/default.nix
+++ b/pkgs/development/ocaml-modules/sequence/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, qtest, result }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, qtest, result }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "sequence is not available for OCaml ${ocaml.version}"
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
     sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44";
   };
 
-  buildInputs = [ ocaml findlib jbuilder qtest ];
+  buildInputs = [ ocaml findlib dune qtest ];
   propagatedBuildInputs = [ result ];
 
   doCheck = true;
-  checkPhase = "jbuilder runtest";
+  checkPhase = "dune runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = https://github.com/c-cube/sequence;
diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix
index c7ed72dc523c..cad4dcafb642 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/default.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt
+{ stdenv, fetchurl, ocaml, findlib, dune, ocaml_lwt
 , lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
 }:
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
   };
 
-  buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
+  buildInputs = [ ocaml findlib dune lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
 
   propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "dune runtest -p sqlexpr";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     description = "Type-safe, convenient SQLite database access";
diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
index c15378e8240a..b908e173257c 100644
--- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
+++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit
+{ stdenv, ocaml, findlib, dune, sqlexpr, ounit
 , ppx_core, ppx_tools_versioned, re, lwt_ppx
 }:
 
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}";
   inherit (sqlexpr) version src installPhase meta;
 
-  buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
+  buildInputs = [ ocaml findlib dune sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
 
   buildPhase = "dune build -p ppx_sqlexpr";
 
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index c846cca1282f..4959ef7b34a7 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder, ppx_sexp_conv, ounit
+{ stdenv, fetchurl, ocaml, findlib, dune, ppx_sexp_conv, ounit
 , re, sexplib, stringext
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar -xjf $curSrc";
 
-  buildInputs = [ ocaml findlib jbuilder ounit ];
+  buildInputs = [ ocaml findlib dune ounit ];
   propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ];
 
   buildPhase = "jbuilder build";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "jbuilder runtest";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = "https://github.com/mirage/ocaml-uri";
diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix
index 4cde95c0c4cc..58ce7778c417 100644
--- a/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
+{ stdenv, fetchurl, ocaml, findlib, dune }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -14,13 +14,11 @@ stdenv.mkDerivation rec {
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib jbuilder ];
+  buildInputs = [ ocaml findlib dune ];
 
-  buildPhase = "jbuilder build -p wtf8";
+  buildPhase = "dune build -p wtf8";
 
-  inherit (jbuilder) installPhase;
-
-  createFindLibDestdir = true;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/flowtype/ocaml-wtf8;
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index f494a8cf17cc..dfef72835cc1 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, cppo, easy-format, biniou }:
+{ stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }:
 let
   pname = "yojson";
   param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
     version = "1.4.1";
     sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9";
-    buildInputs = [ jbuilder ];
-    extra = { inherit (jbuilder) installPhase; };
+    buildInputs = [ dune ];
+    extra = { inherit (dune) installPhase; };
   } else {
     version = "1.2.3";
     sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";
diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix
index 1ddb6d180405..d9dcf1a53851 100644
--- a/pkgs/development/ocaml-modules/zed/default.nix
+++ b/pkgs/development/ocaml-modules/zed/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }:
 
 let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then
   {
     version = "1.6";
     sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
-    buildInputs = [ jbuilder ];
+    buildInputs = [ dune ];
     extra = {
-     buildPhase = "jbuilder build -p zed";
-     inherit (jbuilder) installPhase; };
+     buildPhase = "dune build -p zed";
+     inherit (dune) installPhase; };
   } else {
     version = "1.4";
     sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";
diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index d7d086e74f97..0611ec8d3bbd 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
 let
   pname = "cppo";
   webpage = "http://mjambon.com/${pname}.html";
@@ -9,9 +9,9 @@ let param =
   if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
     version = "1.6.4";
     sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh";
-    buildInputs = [ jbuilder ];
+    buildInputs = [ dune ];
     extra = {
-      inherit (jbuilder) installPhase;
+      inherit (dune) installPhase;
     };
   } else {
     version = "1.5.0";
diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
similarity index 78%
rename from pkgs/development/tools/ocaml/jbuilder/default.nix
rename to pkgs/development/tools/ocaml/dune/default.nix
index c30478132cf2..a9ed66a8efe1 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ocamlPackages, opaline }:
 
 stdenv.mkDerivation rec {
-  name = "jbuilder-${version}";
-  version = "1.0.1";
+  name = "dune-${version}";
+  version = "1.1.1";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "dune";
     rev = "${version}";
-    sha256 = "0k6r9qrbwlnb4rqwqys5fr7khwza7n7d8wpgl9jbb3xpag2zl3q9";
+    sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
 
   installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
-  preFixup = "rm -rf $out/jbuilder";
-
   meta = {
     inherit (src.meta) homepage;
     description = "Fast, portable and opinionated build system";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
index d8c289015b2f..1307635abb99 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , ocaml-migrate-parsetree, ppx_tools_versioned, uchar
 }:
 
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
+	buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
 
   postPatch = "patchShebangs lib/generate_stubs.sh";
 
 	propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml";
+	buildPhase = "dune build -p js_of_ocaml";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
index 3caeabaae78b..139ffef186b5 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , camlp4, ocsigen_deriving
 }:
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ];
+	buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
+	buildPhase = "dune build -p js_of_ocaml-camlp4";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 798013045955..cd242b5bd377 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
 , cmdliner, cppo, yojson
 }:
 
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
 		sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
+	buildInputs = [ ocaml findlib dune cmdliner cppo ];
 
 	propagatedBuildInputs = [ yojson ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-compiler";
+	buildPhase = "dune build -p js_of_ocaml-compiler";
 
-	inherit (jbuilder) installPhase;
+	inherit (dune) installPhase;
 
 	meta = {
 		description = "Compiler from OCaml bytecode to Javascript";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
index 5ec8cca344d4..e7a31c1ce2e5 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
 , ocaml-migrate-parsetree, ppx_tools_versioned
 , js_of_ocaml, ocaml_lwt, lwt_log
 }:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
+	buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
 
 	propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-lwt";
+	buildPhase = "dune build -p js_of_ocaml-lwt";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
index 60ad695dc0bd..bf33b4e59e52 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , ocamlbuild
 }:
 
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib dune ];
 
 	propagatedBuildInputs = [ ocamlbuild ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild";
+	buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
index 4f6b281c8b96..0649aee162a5 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , ocaml-migrate-parsetree, ppx_tools_versioned
 , js_of_ocaml
 }:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
+	buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-ppx";
+	buildPhase = "dune build -p js_of_ocaml-ppx";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 8f32887c5bf5..ddea73b3c766 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , js_of_ocaml, ppx_deriving
 }:
 
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib dune ];
 
 	propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json";
+	buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
 }
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
index 041fd71f92fa..1ba9ddd0ab7f 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
+{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
 , js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
 , js_of_ocaml, reactivedata, tyxml
 }:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
 
 	inherit (js_of_ocaml-compiler) version src installPhase meta;
 
-	buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
+	buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
 
 	propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
 
-	buildPhase = "jbuilder build -p js_of_ocaml-tyxml";
+	buildPhase = "dune build -p js_of_ocaml-tyxml";
 }
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 744a136c9ef2..ddea2aa9784b 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchzip, ncurses
 , ocamlPackages
-, jbuilder }:
+, dune
+}:
 
 stdenv.mkDerivation rec {
   version = "1.1.5";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv";
   };
 
-  buildInputs = [ ncurses jbuilder ]
+  buildInputs = [ ncurses dune ]
   ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
 
   configurePhase = ''
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = "jbuilder build";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = https://www.typerex.org/ocaml-top.html;
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index 43898d250d91..2cffccdbfcdf 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }:
+{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
 
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ ocp-build ];
   buildInputs = [ ocaml findlib cmdliner ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     homepage = http://typerex.ocamlpro.com/ocp-indent.html;
diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 0a63ae805342..b041efefac77 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, ocp-build, ocp-indent, cmdliner, re }:
 
 stdenv.mkDerivation rec {
 
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
   };
 
-  buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
+  buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
   propagatedBuildInputs = [ ocp-indent ];
 
-  buildPhase = "jbuilder build -p ocp-index";
+  buildPhase = "dune build -p ocp-index";
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   meta = {
     homepage = http://typerex.ocamlpro.com/ocp-index.html;
diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index 1341e071842b..434f8b3af2ea 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
 , lambdaTerm, cppo, makeWrapper
 }:
 
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
 
   propagatedBuildInputs = [ lambdaTerm ];
 
-  inherit (jbuilder) installPhase;
+  inherit (dune) installPhase;
 
   postFixup =
    let
diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index b51f6344c9b7..c466d39eb4e1 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
-, jbuilder, python3, rsync, fetchpatch }:
+, dune, python3, rsync, fetchpatch }:
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
@@ -39,7 +39,7 @@ let
     ppx_deriving_yojson
     ocamlbuild
     ppxlib
-    jbuilder
+    dune
     ounit
     # python36Packages.python36Full # TODO
   ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 441a8f8dcfb2..b8298b76d778 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -131,6 +131,7 @@ mapAliases ({
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
   inotifyTools = inotify-tools;
+  jbuilder = dune; # added 2018-09-09
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdiff3-qt5 = kdiff3; # added 2017-02-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c0e485357c8..9722e945594e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1243,6 +1243,8 @@ with pkgs;
 
   dtrx = callPackage ../tools/compression/dtrx { };
 
+  dune = callPackage ../development/tools/ocaml/dune { };
+
   duperemove = callPackage ../tools/filesystems/duperemove { };
 
   dylibbundler = callPackage ../tools/misc/dylibbundler { };
@@ -1403,8 +1405,6 @@ with pkgs;
 
   interlock = callPackage ../servers/interlock {};
 
-  jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
-
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
   kisslicer = callPackage ../tools/misc/kisslicer { };

From 851da08dd920aa4387d2847f58f15fed6b791561 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Sep 2018 14:39:27 -0500
Subject: [PATCH 1072/3253] melpa-packages: 2018-09-15

---
 .../editors/emacs-modes/melpa-generated.nix   | 4756 +++++++++++------
 1 file changed, 3157 insertions(+), 1599 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 554d48ecc51e..829dff1749d4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -111,12 +111,12 @@
       melpaBuild {
         pname = "a";
         ename = "a";
-        version = "20170720.553";
+        version = "20180907.253";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "a.el";
-          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
-          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+          rev = "8583685c32069a73ccae0100e990e7b39c901737";
+          sha256 = "00v9w6qg3bkwdhypq0ssf0phdh0f4bcq59c20lngd6vhk0204dqi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
@@ -435,12 +435,12 @@
       melpaBuild {
         pname = "ac-emacs-eclim";
         ename = "ac-emacs-eclim";
-        version = "20170924.1339";
+        version = "20180911.421";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0";
-          sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic";
+          rev = "edff7e0e30c87036710d88fb0b7a4644750858e8";
+          sha256 = "0ywifqdhv7cibgl42m7i15widna9i1dk5kl5rglyql7hy05nk9gj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -629,14 +629,14 @@
         ename = "ac-html";
         version = "20151005.31";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "ac-html";
           rev = "3de94a46d8cb93e8e62a1b6bdebbde4d65dc7cc2";
           sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html";
-          sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/ac-html";
+          sha256 = "1vidmvylwwvraf8k63dvxv47ism49n6pp0f38l5rl4iaznhkdr84";
           name = "recipe";
         };
         packageRequires = [ auto-complete dash f s ];
@@ -927,12 +927,12 @@
       melpaBuild {
         pname = "ac-php-core";
         ename = "ac-php-core";
-        version = "20180629.144";
+        version = "20180824.106";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "fac22638f957abf404bbee4e16d9d7b67fcd42d2";
-          sha256 = "0fsd8cfwqq2jgs2f0nk5g8ybm1mim51n4cfm5n5znvrkwp7a8z2y";
+          rev = "dcac8321b85b2ef6d43244e2b0932cb3ec7cfefb";
+          sha256 = "1a4hc06f8xqkc07a2b72baz6bb7znkf15yvdj5sccwkrnhqw8cqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1096,12 +1096,12 @@
       melpaBuild {
         pname = "academic-phrases";
         ename = "academic-phrases";
-        version = "20180318.438";
+        version = "20180723.321";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "academic-phrases";
-          rev = "0823ed8c24b26c32f909b896a469833ec4d7b656";
-          sha256 = "0qfzsq8jh05w4zkr0cvq3i1hdn97bq344vcqjg46sib26x3wpz6r";
+          rev = "25d9cf67feac6359cb213f061735e2679c84187f";
+          sha256 = "0m32jpg6n0azz2f4y57y92zfvzm54ankx5cm06gli2zw2v1218fw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe4323043fb875c0252861800e61fdd0a51ed453/recipes/academic-phrases";
@@ -1388,12 +1388,12 @@
       melpaBuild {
         pname = "ace-window";
         ename = "ace-window";
-        version = "20180607.1223";
+        version = "20180814.816";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "92d20e7e75dbb2ba0b879d3aedb8bed51fcee6a7";
-          sha256 = "0svk91yx9plr8027q57g2csqlvmxdp3rv5knpd0hl0hq0hk0j750";
+          rev = "d93e16b52ee7c1b6c9df599060e7077b4e46cbf8";
+          sha256 = "19wi7sk5kbfk6zxbr08wprkihq6wygvyq281xl5vwxxbl8n83dvs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1697,12 +1697,12 @@
       melpaBuild {
         pname = "aggressive-fill-paragraph";
         ename = "aggressive-fill-paragraph";
-        version = "20170902.705";
+        version = "20180910.116";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "aggressive-fill-paragraph-mode";
-          rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039";
-          sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4";
+          rev = "39eb7ac73976d4d4044ef3d750c3ade967d036e1";
+          sha256 = "1ly79z9aqy3b2wq11ifvvkls9qqbpkbb8hj7nsvpq59vqa9fknli";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1749,11 +1749,11 @@
       melpaBuild {
         pname = "ahg";
         ename = "ahg";
-        version = "20180125.944";
+        version = "20180808.2353";
         src = fetchhg {
           url = "https://bitbucket.com/agriggio/ahg";
-          rev = "622b519d8586";
-          sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz";
+          rev = "763e15a00b37";
+          sha256 = "1c76dzdcg2xr5fbqv33wa5vx84k0944qbqnxg3a4hax7k45c6ba6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1782,8 +1782,8 @@
           sha256 = "07qpwa990bgs9028rqqk344c3z4hnr1jkfzcx9fi4z5k756zmw3b";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode";
-          sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ahk-mode";
+          sha256 = "0jx5vhlfw5r6l4125bjjbf7dl1589ac6j419swx26k3p8p58d93r";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -1882,12 +1882,12 @@
       melpaBuild {
         pname = "alan-mode";
         ename = "alan-mode";
-        version = "20180711.2148";
+        version = "20180902.731";
         src = fetchFromGitHub {
           owner = "M-industries";
           repo = "AlanForEmacs";
-          rev = "02869448b4637516064900caf135aeb4f07bc5e4";
-          sha256 = "03y07041rwi7fab9slavh15xh7m4y6dbk44gd24dw5drb5kvfdiz";
+          rev = "998bf0a8a494783c65fd9fa2c1fd6f081002dc59";
+          sha256 = "1wcp8f9lqyys2ybmngrgca8mgsj65ncx1f1zixkn3arfd5lj69d6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e52314db81dad3517ab400099b032260c3e3e6f/recipes/alan-mode";
@@ -1992,12 +1992,12 @@
       melpaBuild {
         pname = "alert";
         ename = "alert";
-        version = "20180403.38";
+        version = "20180826.2122";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "667d9c7848c723eb392ab9bacae07966da3e3504";
-          sha256 = "04nrl7kg5pprfdxjbqjyh7vw0vs22bplhhpaf30v3hw7k7nkc0ky";
+          rev = "fe494d1e80e308f7db7273bf02281757fdf86e6f";
+          sha256 = "1v5pn7qnrqqckfhmk6zy46kqarvb9svkmgc3asi4xz8n11271cxi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -2154,12 +2154,12 @@
       melpaBuild {
         pname = "all-the-icons-ivy";
         ename = "all-the-icons-ivy";
-        version = "20180225.630";
+        version = "20180826.1316";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "all-the-icons-ivy";
-          rev = "52b3f4a8a4a038998943afaffb5ff25054f65af4";
-          sha256 = "1xkrqv6znf1savkg17w41d9rm7wrs8n3c4ad0arrmi522qgp78fr";
+          rev = "7baba16410e78ca3c7a564c3731baa75b2e8d93a";
+          sha256 = "0whd8ywsy88g5y068n1z7s3d6yh62jgylf03rg1rp1mf6x6j2m16";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9496e6bb6f03f35444fb204860bc50e5e1b36214/recipes/all-the-icons-ivy";
@@ -2328,12 +2328,12 @@
       melpaBuild {
         pname = "anaconda-mode";
         ename = "anaconda-mode";
-        version = "20180707.1010";
+        version = "20180807.2325";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "7d28ae061c226ca2e277ecb9d0928647d9a30154";
-          sha256 = "1sshdy8abqr5rihl7gjprczd4inznl28ipl812725ylmj0igrfw1";
+          rev = "706ad11477b48a2b891235869d32e4aa5536774f";
+          sha256 = "1pcsp9wva3jxxfd6aj25h1fn67xsm951m82mrd51sasdyayhdc0q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2430,14 +2430,14 @@
         ename = "angular-mode";
         version = "20151201.1327";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "angularjs-mode";
           rev = "8720cde86af0f1859ccc8580571e8d0ad1c52cff";
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode";
-          sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/angular-mode";
+          sha256 = "0pq4lyhppzi806n1k07n0gdhr8z8z71ri12my0pl81rl5j2z69l2";
           name = "recipe";
         };
         packageRequires = [];
@@ -2483,12 +2483,12 @@
       melpaBuild {
         pname = "anki-editor";
         ename = "anki-editor";
-        version = "20180715.151";
+        version = "20180905.621";
         src = fetchFromGitHub {
           owner = "louietan";
           repo = "anki-editor";
-          rev = "11dbf078957a7d291f5c767cd2936d4341c1864d";
-          sha256 = "009m854i4vvfq1772p9js1r48m9msvlmyaplfmzf7qfqkf6k79ad";
+          rev = "44624cd391b64148c0290c91b3e4f35354bb9819";
+          sha256 = "1d35s70p9nh8dwa2zxp0ycsw8bf573ixj7740jyh40ymngy61bsc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8155d649e4b129d0c72da6bb2b1aac66c8483491/recipes/anki-editor";
@@ -2613,12 +2613,12 @@
       melpaBuild {
         pname = "ansible";
         ename = "ansible";
-        version = "20170926.1951";
+        version = "20180812.1814";
         src = fetchFromGitHub {
           owner = "k1LoW";
           repo = "emacs-ansible";
-          rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc";
-          sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495";
+          rev = "8a097176d6772b6667254dbbe19c5fb64527bf5d";
+          sha256 = "1m2cb88jb1wxa9rydkbn5llx2gql453l87b4cgzsjllha6j1488k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -2866,12 +2866,12 @@
       melpaBuild {
         pname = "apache-mode";
         ename = "apache-mode";
-        version = "20170711.913";
+        version = "20180723.2051";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "apache-mode";
-          rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
-          sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
+          rev = "d2ac57942f852a727db4fc73004e1e8f046cb657";
+          sha256 = "1srlkqa2bq2p1nyh6r7f3b2754dqlgw28h0wbafmdlfk12jc8xy3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
@@ -3043,12 +3043,12 @@
       melpaBuild {
         pname = "apropospriate-theme";
         ename = "apropospriate-theme";
-        version = "20180718.1101";
+        version = "20180906.1106";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "97a26598a4d64f8339f7b12818d67425057235be";
-          sha256 = "1bi9srxc91i81v863k5fpvgxhr7hkz22jbzwajgqbs0kx5jn7417";
+          rev = "409af2b22ec03cbb81318df7982afa463deb73d2";
+          sha256 = "0m58m0dhlbxlwxm81d22ncax3ndnjjmfkzxwrzqaggch0fx0xggj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -3458,24 +3458,23 @@
                       , fetchFromGitHub
                       , fetchurl
                       , lib
-                      , melpaBuild
-                      , queue }:
+                      , melpaBuild }:
       melpaBuild {
         pname = "at";
         ename = "@";
-        version = "20140707.520";
+        version = "20180726.1231";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "at-el";
-          rev = "114dfe3761bf0c9dd89f794106c3a6a436ed06cc";
-          sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
+          rev = "3671318a811fb51c03a792342af7b42004922809";
+          sha256 = "14cpmwfw2b3yh3s0lj21myrdic9gdbs9pcshv9wj96ksijknhmiy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/@";
           sha256 = "0da0xqk8fhz8aij3zmpp4bz3plpvfq2riyy17i7ny4ralxb3g08z";
           name = "recipe";
         };
-        packageRequires = [ emacs queue ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/@";
           license = lib.licenses.free;
@@ -3571,12 +3570,12 @@
       melpaBuild {
         pname = "attrap";
         ename = "attrap";
-        version = "20180715.1205";
+        version = "20180901.207";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "attrap";
-          rev = "65f6ad55ef967ef625ca48c2d03b4ea69bf37649";
-          sha256 = "13vxa6gk4yccj5zhm927ilbpmn0dlkbdrbj3d42kphnximswpism";
+          rev = "a971acb251e343d4c6b0253f69dcce0c2cee0fac";
+          sha256 = "0p93y151730ga7v9xa5gkp306s32qw53086i829fcbxf83c2wslv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap";
@@ -3991,12 +3990,12 @@
       melpaBuild {
         pname = "auto-complete-distel";
         ename = "auto-complete-distel";
-        version = "20160815.2300";
+        version = "20180827.644";
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "340c9c11939d5f220db05e55388bf3cb606fd190";
-          sha256 = "0ji1wi3s4pgkvrg2vzycmvqfc5jwmcd9zrpxhsgszr5jxp8z0bpb";
+          rev = "acc4c0a5521904203d797fe96b08e5fae4233c7e";
+          sha256 = "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel";
@@ -4407,12 +4406,12 @@
       melpaBuild {
         pname = "auto-shell-command";
         ename = "auto-shell-command";
-        version = "20160603.1938";
+        version = "20180817.802";
         src = fetchFromGitHub {
           owner = "ongaeshi";
           repo = "auto-shell-command";
-          rev = "454b75a07b663095334381d5bf5625c7f136f743";
-          sha256 = "0ahiy5cv3a632wfiar28186l0dgibafx5jaw9nrp4h5sqkbyvmjn";
+          rev = "a8f9213e3c773b5687b81881240e6e648f2f56ba";
+          sha256 = "1b0kgqh521y16cx84rbsr244i4fs3l8h4wqjy2zdpwbpbikx1hxk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea710bfa77fee7c2688eea8258ca9d2105d1896e/recipes/auto-shell-command";
@@ -4434,12 +4433,12 @@
       melpaBuild {
         pname = "auto-sudoedit";
         ename = "auto-sudoedit";
-        version = "20180428.2343";
+        version = "20180915.6";
         src = fetchFromGitHub {
           owner = "ncaq";
           repo = "auto-sudoedit";
-          rev = "5a770615fe2989b3b7cb1435d0e65fa672d775d7";
-          sha256 = "0pbbw4lx1k8l5x4bycqymb5s2x2739diw8nbqk9ikxqhyjn4sv67";
+          rev = "16bfa23e6d9c30968a6b6364ada17c88138255f3";
+          sha256 = "1f2rqi5nqa40lgcsnbxk9r4dzn6kcachh3qjv76lm9lzyc41c8ln";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cf6bc8bb7b618d74427622b9b2812daa79a3767/recipes/auto-sudoedit";
@@ -4646,14 +4645,14 @@
         ename = "autopair";
         version = "20160304.437";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "autopair";
           rev = "2b6d72bccb0ebba6e7e711528872b898b0c65b0a";
           sha256 = "09p56vi5zgm2djglimwyhv4n4gyydjndzn46vg9qzzlxvvmw66i1";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair";
-          sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/autopair";
+          sha256 = "0l2ypsj3dkasm0lj9jmnaqjs3rv97ldfw8cmayv77mzfd6lhjmh3";
           name = "recipe";
         };
         packageRequires = [ cl-lib ];
@@ -4798,12 +4797,12 @@
       melpaBuild {
         pname = "avk-emacs-themes";
         ename = "avk-emacs-themes";
-        version = "20180406.2220";
+        version = "20180822.839";
         src = fetchFromGitHub {
           owner = "avkoval";
           repo = "avk-emacs-themes";
-          rev = "6abf91ecdaeb16a3a5529b0d5abef9756da1f68c";
-          sha256 = "0hvg8yp7prfl1n71lkyr9l43f3zm1zsh8n2mh26rmdw2chippr4d";
+          rev = "80a8e4f88ccd4a9ff29dc50afb2da6aa290611d8";
+          sha256 = "1r10ysknnbicn9hxp94n7nfgciabrfsljmbnh9pa2szb9knbw80k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes";
@@ -4825,12 +4824,12 @@
       melpaBuild {
         pname = "avy";
         ename = "avy";
-        version = "20180615.801";
+        version = "20180913.1119";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "7c40f5e3811716b05d87a06096b190f7cf7bdc45";
-          sha256 = "06bqsg9vnjyqdmn2dpy4f17b0bs57w0gg77ahyafsawlp77fz7z9";
+          rev = "cd8fb10759a5be2ded3a344d8c0e472eb9fef5e3";
+          sha256 = "1cmrjwf2zyx5l1ikdh9d3wlsg1hn8kcazrd5rs72krc94vxj50nz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -5015,11 +5014,11 @@
       melpaBuild {
         pname = "axiom-environment";
         ename = "axiom-environment";
-        version = "20180401.1257";
+        version = "20180823.255";
         src = fetchgit {
           url = "https://bitbucket.org/pdo/axiom-environment";
-          rev = "6842fb7f85df839acde395093647e2f91cf62fdd";
-          sha256 = "1ag5isg0bvarf86978zd2zq1mbs3ysy29ywvgapls6115ws5k9k8";
+          rev = "5d6b2cd12f639c11b032185c4c5fe4f5bba15b08";
+          sha256 = "1pgz24snvjii7ajha2hqqv59pjygzr60i76r4cyy0abvjxpc4xg5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf/recipes/axiom-environment";
@@ -5300,6 +5299,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    bap-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "bap-mode";
+        ename = "bap-mode";
+        version = "20180802.610";
+        src = fetchFromGitHub {
+          owner = "fkie-cad";
+          repo = "bap-mode";
+          rev = "dde47d417473d7c8e9f78e930c35edda31def2d6";
+          sha256 = "02083b66syd5lx3v5hw5ffkanqqg8jiimcnfam5pcxga2rfi1dpi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/05b1b5885a9d5e3bda38bc8a2f987bffd9353cc0/recipes/bap-mode";
+          sha256 = "1n0sv6d6vnv40iks18vws16psbv83v401pdd8w2d2cfhhsmmi4ii";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/bap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     bar-cursor = callPackage ({ fetchFromGitHub
                               , fetchurl
                               , lib
@@ -5565,11 +5589,11 @@
       melpaBuild {
         pname = "bbdb";
         ename = "bbdb";
-        version = "20180502.2038";
+        version = "20180906.2011";
         src = fetchgit {
           url = "https://git.savannah.nongnu.org/git/bbdb.git";
-          rev = "2da950300bb22fa713cede74b71041df315ecc2e";
-          sha256 = "1vz1c3f5wlhfq4d80fahqm3a8jsfl22bs3w4pfl25ivpg1l7m9bn";
+          rev = "1a6ad82b11c7059f6a19fba575146cc31c6ffa8b";
+          sha256 = "0x1f1c91py5wp0npay7xv3f3qcdaak1imr2h6xpwg611mr07848r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -5828,12 +5852,12 @@
       melpaBuild {
         pname = "beginend";
         ename = "beginend";
-        version = "20171003.548";
+        version = "20180827.226";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa";
-          sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb";
+          rev = "e4ff077de4a2c80e1f42adfc86837537899447a5";
+          sha256 = "15mcwh6189581l9abzm2japdv8fzpwf1vlr9ql8xb1mn3nih9qi5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -6140,12 +6164,12 @@
       melpaBuild {
         pname = "bibretrieve";
         ename = "bibretrieve";
-        version = "20180617.1108";
+        version = "20180901.228";
         src = fetchFromGitHub {
           owner = "pzorin";
           repo = "bibretrieve";
-          rev = "e8ccdc9b9bfec0c5c658f2e9ac3fb81a137549d7";
-          sha256 = "0l85kdnzm8lxva47sm4bbyv7xd52qxfgxippsbg2n12vqqiqf50z";
+          rev = "600fa1fcc4c5d79c628457f2316f3429c96be006";
+          sha256 = "17jy0a4j97vxnj9659q0jr32nx8kj12j9vhi5hnfw2nqxz33x7gr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
@@ -6218,12 +6242,12 @@
       melpaBuild {
         pname = "bicycle";
         ename = "bicycle";
-        version = "20180624.12";
+        version = "20180909.1426";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "bicycle";
-          rev = "ab48f01ec8a3ebcb2f6cf36ea7f3cb8aef3da263";
-          sha256 = "13rmk3004jnnbfqvi9xh22si5dw02fswlryhkafagfzbnscc6gvb";
+          rev = "42a5db3514019d539500a67f913411f5533a1eb3";
+          sha256 = "1nanf0dp7kqzs2mc8gzr9qzn9v6q86sdr35pzysdl41xqydxpsrd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec9b4138ffaf81b556e01b85ce4b112e77909260/recipes/bicycle";
@@ -6583,12 +6607,12 @@
       melpaBuild {
         pname = "blacken";
         ename = "blacken";
-        version = "20180615.803";
+        version = "20180831.2228";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "blacken";
-          rev = "d98199e8ab94550f5036aac2293cfb1f745003fa";
-          sha256 = "0fnrjgnc148cjs6b3qkyvpmlsmpdh3xi5xn4hxg7cpwqrx3s36d7";
+          rev = "48061012139d4524619dd90ce5b33775e394dabe";
+          sha256 = "0v9b4a8kgp1n0zchi4zp5sgh4i1i703hnwalb7632wv4xlzrmg31";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69d9802996a338be937d61678f2cadf3497f6b85/recipes/blacken";
@@ -6627,6 +6651,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    blimp = callPackage ({ eimp
+                         , emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "blimp";
+        ename = "blimp";
+        version = "20180903.1540";
+        src = fetchFromGitHub {
+          owner = "walseb";
+          repo = "blimp";
+          rev = "b048b037129b68674b99310bcc08fb96d44fdbb4";
+          sha256 = "0az7bjxc6awn56sv49w3d0ws6w7i0gqm99sbkbnjrfgj3ha8xz4d";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4fe28626950659c5ba4aa9cc7ba6126ce4737fb7/recipes/blimp";
+          sha256 = "1k70x0gs9ns7652ahq2b8fhmichsmajzqmm46v1imji238zr7kb1";
+          name = "recipe";
+        };
+        packageRequires = [ eimp emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/blimp";
+          license = lib.licenses.free;
+        };
+      }) {};
     bliss-theme = callPackage ({ emacs
                                , fetchFromGitHub
                                , fetchurl
@@ -6660,12 +6711,12 @@
       melpaBuild {
         pname = "bln-mode";
         ename = "bln-mode";
-        version = "20170112.527";
+        version = "20180730.523";
         src = fetchFromGitHub {
           owner = "mgrachten";
           repo = "bln-mode";
-          rev = "1de92cec97a4693b8b932713e333730118db9183";
-          sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx";
+          rev = "b5e86b1bc8b7ac25bf8ec07056824861c4c3f050";
+          sha256 = "12bf5l8x1bfg3hpnw3lg3qkxyyhsn6n6cmghdnf3gmd73arpzcbd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
@@ -6853,12 +6904,12 @@
       melpaBuild {
         pname = "bog";
         ename = "bog";
-        version = "20180113.759";
+        version = "20180815.1513";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "bog";
-          rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611";
-          sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j";
+          rev = "b5df3647f55359f8546dcfa991a351673a069a49";
+          sha256 = "1rfv036wzlrbqbki5i24871a9f2h6zk7yqd1lq6gnqrc4y7m477c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog";
@@ -7016,12 +7067,12 @@
       melpaBuild {
         pname = "boon";
         ename = "boon";
-        version = "20180319.526";
+        version = "20180914.443";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "b4cf42bbc531032404da88e8671c7495f0f7a5b0";
-          sha256 = "163j41j29nm29w567iq662k9anivqc20yxghm8w49w7i5hsbq9dh";
+          rev = "fe2f981e2e6446e0c6093d49496ec1104e4873b7";
+          sha256 = "1g0cfg2mwr30727jzy0psmwgd97hhala5n2m0dvygr0pp7y2s7mn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -7045,12 +7096,12 @@
       melpaBuild {
         pname = "borg";
         ename = "borg";
-        version = "20180702.1353";
+        version = "20180908.444";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "borg";
-          rev = "738f749a9eeb9abecad17d38ce9a3e45c040cede";
-          sha256 = "0929d5bcqv39bq37sxgcf8z2y9zj89mjcdz632xy4qykiinhnwan";
+          rev = "759dc85315d8788088dc5727a353e3777dc256fa";
+          sha256 = "08f1bhwcrs3b80z4qwv44ymsjbdf59a4d98kk0fglj6a9ybpchc8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg";
@@ -7472,14 +7523,14 @@
         ename = "bubbleberry-theme";
         version = "20141017.244";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-bubbleberry-theme";
           rev = "22e9adf4586414024e4592972022ec297321b320";
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e359b4463b10ac713c2d024c43a1682fca2959af/recipes/bubbleberry-theme";
-          sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/bubbleberry-theme";
+          sha256 = "1mjygck5ra30j44msccqas8v6gkpyv74p6y6hidm8v4f8n6m8dcz";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -7753,12 +7804,12 @@
       melpaBuild {
         pname = "bui";
         ename = "bui";
-        version = "20171215.930";
+        version = "20180812.1413";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "af1a237b4d1ed31780dd37bcbef51fc8ca9b0603";
-          sha256 = "1ccw90a68dahcrkr94xi9apnxjmvzjvd33w78bsr2jyfd82ggsw1";
+          rev = "bd3c5ee32d28d80c6eb54b0340626103c32e3093";
+          sha256 = "0ixia5s41f2nbal3wsixacbhbc0mk9yb75ir1amqakip30sq4apv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -7771,6 +7822,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    build-farm = callPackage ({ bui
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit-popup
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "build-farm";
+        ename = "build-farm";
+        version = "20180906.1158";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "build-farm.el";
+          rev = "e244dea35566a10253d61be430d3caf81b779af8";
+          sha256 = "1a4ky0hca26p7f3i2c2s5517ygkyaaz52vs0vxy6f5q95rhlgdhd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc97bf56ea50788ecbbbb1f46e188e8487370936/recipes/build-farm";
+          sha256 = "0dbq3sc1x0cj06hv3mlk0zw0cijdwjszicylv14m1wahal33xjrw";
+          name = "recipe";
+        };
+        packageRequires = [ bui emacs magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/build-farm";
+          license = lib.licenses.free;
+        };
+      }) {};
     build-helper = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -7834,14 +7913,14 @@
         ename = "bundler";
         version = "20160815.215";
         src = fetchFromGitHub {
-          owner = "tobiassvn";
+          owner = "endofunky";
           repo = "bundler.el";
           rev = "f981f67c33b42243e57a78c358dffff70022b56b";
           sha256 = "1hfcvlkwa3hh70qan3q5mvld1hqqbnmbwqycvlqi6qr8dcdfl3cx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler";
-          sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/bundler";
+          sha256 = "1jvcrxwsf9yd5vhirfdmjl52n6hffr1vikd386qbn32vgqcsba7a";
           name = "recipe";
         };
         packageRequires = [ cl-lib inf-ruby ];
@@ -7986,12 +8065,12 @@
       melpaBuild {
         pname = "buttercup";
         ename = "buttercup";
-        version = "20180629.523";
+        version = "20180903.42";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a";
-          sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a";
+          rev = "0d742b00debd59f07320638c505777f6a908f5ad";
+          sha256 = "0cy3gqw8h4p09n2n9icnyydgymmxcgyz7r1536cg07nhc0kvgccf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -8267,12 +8346,12 @@
       melpaBuild {
         pname = "calendar-norway";
         ename = "calendar-norway";
-        version = "20160827.1316";
+        version = "20180906.802";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "calendar-norway.el";
-          rev = "8501b2ee515e995f345365391b03f44c812cabdf";
-          sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a";
+          rev = "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4";
+          sha256 = "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway";
@@ -8525,12 +8604,12 @@
       melpaBuild {
         pname = "caml";
         ename = "caml";
-        version = "20171209.1232";
+        version = "20180913.557";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "ocaml";
-          rev = "ca71bda2ac7e5143f58fa9a1693f97e709a91332";
-          sha256 = "1ksx2ym5s68m87rnjjkdwhp5ci6cfw0yhmjjmq1r4a0d0r77x4lr";
+          rev = "f179a652635117f0238258a3235c5bec35efe062";
+          sha256 = "129gg21acylb7n59xdcqkbfajzdqz0nfhvcmy87yz5189ywd3p55";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
@@ -8605,12 +8684,12 @@
       melpaBuild {
         pname = "cargo";
         ename = "cargo";
-        version = "20180521.408";
+        version = "20180812.518";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "10093586bdac7252e65e11851f26da8ba4720608";
-          sha256 = "03imznfy9ry2n83hj3qgw8m0030w66z6789raxywv394274pxm4c";
+          rev = "c995b42e2c0fc609d265286ce465d508d81b8a4d";
+          sha256 = "0jcppqbm84kwph9cq2yy2a2yjpb57vb1552rm4dphfdac8kajqq5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -8692,12 +8771,12 @@
       melpaBuild {
         pname = "cask";
         ename = "cask";
-        version = "20180626.1249";
+        version = "20180831.608";
         src = fetchFromGitHub {
           owner = "cask";
           repo = "cask";
-          rev = "d731e96f40c34a0fd85db04977c9756d60bd221f";
-          sha256 = "045qixxkrvz48giwc83aykld78gmbckndy32prh8dl6ch7digh23";
+          rev = "1350f50e7955d3adf160a3fffa9b26524eb09f4c";
+          sha256 = "03fp7ja7kqgc3jl46kzdrv26wclsrawq082hqxsajr8mj3gzi5xv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -8882,12 +8961,12 @@
       melpaBuild {
         pname = "ccls";
         ename = "ccls";
-        version = "20180708.2207";
+        version = "20180914.2138";
         src = fetchFromGitHub {
           owner = "MaskRay";
           repo = "emacs-ccls";
-          rev = "4c8f377f7aa957a33a0097dc212e765246f799db";
-          sha256 = "09gll0c1jy0ljv2jb7qmpgyh0n4jdm4xhj10lcny0xx32nyfa86y";
+          rev = "791bde91845852c19ad1b4a4c9df87137d3e5625";
+          sha256 = "1601w5gmq39g2ksvil0hhfsh0hm91646qb88ppafqhm8hig91kna";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be27a4022d58860917a659fce2b7d7791fbea4e2/recipes/ccls";
@@ -9381,16 +9460,16 @@
       melpaBuild {
         pname = "challenger-deep-theme";
         ename = "challenger-deep-theme";
-        version = "20180525.918";
+        version = "20180816.1558";
         src = fetchFromGitHub {
-          owner = "MaxSt";
-          repo = "challenger-deep";
-          rev = "62d05f01c3dc4653f46527448b3b2058daba86c0";
-          sha256 = "019n14m1nfiw2xshsmkiszmj7qc5dyd949xj3bfcxrj6a2prsgqw";
+          owner = "challenger-deep-theme";
+          repo = "emacs";
+          rev = "443ca72dca966b3d27dbec9eab54a09cbd76eac0";
+          sha256 = "19gv0fczdy8hpv836ak2aa70cz0hwm0mw7dinrwz9kyw3wkfi8yv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
-          sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/challenger-deep-theme";
+          sha256 = "02k0irp27wv1b5g2a6g86zp7cdprv17c0mlhkjsq2brls274ch3y";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -9778,8 +9857,8 @@
           sha256 = "1zm0wjhqsb11szvxs2rnq63396cbi6ffynpbn07p6gk5agxzfy0j";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/chinese-number";
-          sha256 = "01ia2l5vrg8fhaxcvk8pv9qfm08xs0fbyc9j57nbdk9wxnd9i45s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/chinese-number";
+          sha256 = "0cjfxhd5izahkncs2nzpdv8brsxlwr2dx4hi07ymr62cr0hh0jgy";
           name = "recipe";
         };
         packageRequires = [];
@@ -9983,12 +10062,12 @@
       melpaBuild {
         pname = "cider";
         ename = "cider";
-        version = "20180719.542";
+        version = "20180914.2345";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "4b7aea3523fb91e8172dfdd538b01da8c0d7686f";
-          sha256 = "0lcczp066lxpq5s4f23bsvn15lkzivw6f0xi5ih7kf74c1fq1nn2";
+          rev = "baa0430625d486bc4752337716770b979d687a5d";
+          sha256 = "1g7zwyyjrzlz7wnf3jq2n797dh00gxad7m3ak2gwkwsnyhs494k1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -10129,12 +10208,12 @@
       melpaBuild {
         pname = "ciel";
         ename = "ciel";
-        version = "20170330.526";
+        version = "20180914.115";
         src = fetchFromGitHub {
           owner = "cs14095";
           repo = "ciel.el";
-          rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e";
-          sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm";
+          rev = "429773a3c551691a463ecfddd634b8bae2f48503";
+          sha256 = "0xykdwsjgx44c0l5v9swkjjv0xa673krzlc71b1sc4dw9l526s4m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -10559,8 +10638,8 @@
           sha256 = "0mfb4k0i71y49hn0xk5a1mv4zaj249qcan0y0nzvgf7mmvr32n9w";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon";
-          sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clipmon";
+          sha256 = "0qhav3scmk3zsa7v3hg3zczps0as3mzrz3cl34n3xlvf4f6ifd9k";
           name = "recipe";
         };
         packageRequires = [];
@@ -10604,14 +10683,14 @@
         ename = "clips-mode";
         version = "20170909.123";
         src = fetchFromGitHub {
-          owner = "grettke";
+          owner = "clips-mode";
           repo = "clips-mode";
           rev = "dd38e2822640a38f7d8bfec4f69d8dd24be27074";
           sha256 = "1q2jz72wi8d2pdrjic9kwqixp5sczjkkx8rf67rgaz37ysjpcbf6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
-          sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/clips-mode";
+          sha256 = "1ckk8ajr1x8y2h8jx2q233xs69nip3kjn0wp3xgfbwx7hjcbk7kr";
           name = "recipe";
         };
         packageRequires = [];
@@ -10632,22 +10711,21 @@
                                 , melpaBuild
                                 , multiple-cursors
                                 , paredit
-                                , s
                                 , seq
                                 , yasnippet }:
       melpaBuild {
         pname = "clj-refactor";
         ename = "clj-refactor";
-        version = "20180708.57";
+        version = "20180826.1449";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "443f0860d1d1c209cf4baae998f55df0616a819f";
-          sha256 = "1qykm5z0iiv7vsmkgpd4mvxs0ml42z132bxg7ap8an9mvxixrvhj";
+          rev = "ec158357c4f7a375bc47f89de71ea28028a3bfa0";
+          sha256 = "06iymh1n3kyfw4q6kwghqilas1wvpsj5ryvkmgh7lg4da97037fx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
-          sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clj-refactor";
+          sha256 = "05x0820x34pidcz03z96qs685y2700g7ha0dx4vy1xr7fg356c3z";
           name = "recipe";
         };
         packageRequires = [
@@ -10659,7 +10737,6 @@
           inflections
           multiple-cursors
           paredit
-          s
           seq
           yasnippet
         ];
@@ -10807,12 +10884,12 @@
       melpaBuild {
         pname = "clojars";
         ename = "clojars";
-        version = "20161109.1448";
+        version = "20180825.1251";
         src = fetchFromGitHub {
           owner = "joshuamiller";
           repo = "clojars.el";
-          rev = "d9a3ecb61f055e1c3497e424193d867bc3125da1";
-          sha256 = "1h1yff0b2n9rwpqwhba23jpqbdpnivx0bhs7b48gl66wpsg7307l";
+          rev = "c78e4d5ddacda064c253e2b38d1c35188aa1ad71";
+          sha256 = "1xa0c3i8mq3n8mh37i5avgfkcnjyqkg6h668d9lf3w0bnz5cw0x7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f766319c3e18a41017684ea503b0382e96ab31b/recipes/clojars";
@@ -10860,12 +10937,12 @@
       melpaBuild {
         pname = "clojure-mode";
         ename = "clojure-mode";
-        version = "20180709.648";
+        version = "20180827.1127";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "e9da8797e577651b96875228e3804ef11b3c9ff0";
-          sha256 = "0dpvmyanhbm164ma3ryhsqchi66vjwpyv97qq92zrd8arv8njnbh";
+          rev = "aecb12973d2b090f8675e8926d77a68269be55a2";
+          sha256 = "0k5rlipjij4sjvd8vizzldv3fhm48b7s9vi80gaf2jh2fzih02jb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -10968,12 +11045,12 @@
       melpaBuild {
         pname = "clomacs";
         ename = "clomacs";
-        version = "20180722.757";
+        version = "20180901.1241";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clomacs";
-          rev = "be07dc637553b86b6d5cfbbe7dcb4acaf897135e";
-          sha256 = "0h05424xfj3higzjrigzkgmp7pal8zivgjy8kfndj2sjy5kyz5g9";
+          rev = "7b63b802318e3bcae1591f868b2493246cc98310";
+          sha256 = "0lhayg3f724iik11jl394jj80kbi4dq7kdasl4f0jm1yarcp8p2n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -10995,12 +11072,12 @@
       melpaBuild {
         pname = "closql";
         ename = "closql";
-        version = "20180627.1931";
+        version = "20180807.2141";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "closql";
-          rev = "faed079570c2e70b0e4988177e35b7990afa4752";
-          sha256 = "0ni2akjb1n5w6vz3b210c3bya9mbyyxiygn8hna707qnszd0li8r";
+          rev = "edb441335b98c71516046cfe8d2c8c1c2cfd8c5a";
+          sha256 = "0rp3ny5djsrsa437cm6dna8vj7784y89738rxcsxd1w1x8h6jbn0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -11282,12 +11359,12 @@
       melpaBuild {
         pname = "cnfonts";
         ename = "cnfonts";
-        version = "20171205.111";
+        version = "20180830.1428";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "cnfonts";
-          rev = "4583e30d5058773606b830072df38a038d40203a";
-          sha256 = "04vc3p4320h3ncxm8s21ijv524w5m0j5gx1f5pyw91k3avvz9hbx";
+          rev = "6d07b14e5c04033966056dd231047f110ce925c0";
+          sha256 = "01m3aw9racrdqy6dz3nyk8x6n4sggja70mh6jj30sfm5w1y8z46s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
@@ -11403,6 +11480,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    code-stats = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , request }:
+      melpaBuild {
+        pname = "code-stats";
+        ename = "code-stats";
+        version = "20180810.542";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "code-stats-emacs";
+          rev = "8ffa1a24206565fe52abec1f1f0458fa3adb253f";
+          sha256 = "0gd6xdrx6gbxqn63rrbcca0852ww8vah41hv6azhjhrfg2h1sgnk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/20af5580926e9975605c0a245f6ac15c25f4921e/recipes/code-stats";
+          sha256 = "0mwjlhpmrbh3mbw3hjlsbv1fr4mxh068c9g0zcxq7wkksxx707if";
+          name = "recipe";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/code-stats";
+          license = lib.licenses.free;
+        };
+      }) {};
     codebug = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -11798,12 +11902,12 @@
       melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
         ename = "color-theme-sanityinc-tomorrow";
-        version = "20180713.212";
+        version = "20180804.345";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "0360984a8a170df8a1dc0870cf547c0e3c4b5b71";
-          sha256 = "0ff8jmzp02lmqp8pb0pa0wbqq3p59ypd3ljzwk1nbmzjw0xx8z6d";
+          rev = "f45776485147b92fee9e09eaf99f91c2d4970098";
+          sha256 = "1s0bqd2yp1fg2hn8ji79n0m9h6qplzd17zhy836wg3adya737cy1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -11946,6 +12050,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    comb = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "comb";
+        ename = "comb";
+        version = "20180831.21";
+        src = fetchFromGitHub {
+          owner = "cyrus-and";
+          repo = "comb";
+          rev = "8a68d313bf429763eb8aa78ece00230a668f2a1f";
+          sha256 = "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b236a1f3953475cbd7eb5c4289b092818ae08cf/recipes/comb";
+          sha256 = "0n4pkigr07hwj5nb0ngs6ay80psqv7nppp82rg5w38qf0mjs3pkp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/comb";
+          license = lib.licenses.free;
+        };
+      }) {};
     comint-intercept = callPackage ({ emacs
                                     , fetchFromGitHub
                                     , fetchurl
@@ -12103,6 +12233,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    commentary-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "commentary-theme";
+        ename = "commentary-theme";
+        version = "20180816.1415";
+        src = fetchFromGitHub {
+          owner = "pzel";
+          repo = "commentary-theme";
+          rev = "1e2a64719b9d52992c6cdb91911ab313bcd69a77";
+          sha256 = "1bs7dz10f25pi5wfszxgf6afrsbfw6fwp8sm55fa6c46l3pi9jpm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/852b5f83c9870209080d2ed39fede3215ae43e64/recipes/commentary-theme";
+          sha256 = "1s3g40f0r0v8m1qqldvw64vs43i5xza7rwkvhxqcqmj6p1a7mqqw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/commentary-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     commenter = callPackage ({ emacs
                              , fetchFromGitHub
                              , fetchurl
@@ -12190,12 +12346,12 @@
       melpaBuild {
         pname = "company";
         ename = "company";
-        version = "20180704.701";
+        version = "20180913.1611";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "1f836b6b16d313bddef2cccebf49f42d36c58e28";
-          sha256 = "1r3x8shwhc24c8vkrcach99lfhpy180713f89frzn2cbmwyklyh4";
+          rev = "4205ad678436e0e0d314792cb2ad222541458a16";
+          sha256 = "0dz6ilvw6vnm6fcnmrp2g8r4zzl72jiaf042jxvw7rjrznnrmy1y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -12315,12 +12471,12 @@
       melpaBuild {
         pname = "company-auctex";
         ename = "company-auctex";
-        version = "20180330.1118";
+        version = "20180725.1212";
         src = fetchFromGitHub {
           owner = "alexeyr";
           repo = "company-auctex";
-          rev = "f24de90a14c46fc3b924875c658b319c7f209aff";
-          sha256 = "0izi2p8whif6nlbippjw0zxkd0zilmgj2n0arx6k0zi7k4vbfsb7";
+          rev = "48c42c58ce2f0e693301b0cb2d085055410c1b25";
+          sha256 = "10qn7frn5wcmrlci3v6iliqzj7r9dls87h9zp3xkgrgn4bqprfp8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex";
@@ -12426,12 +12582,12 @@
       melpaBuild {
         pname = "company-c-headers";
         ename = "company-c-headers";
-        version = "20170531.1330";
+        version = "20180814.1030";
         src = fetchFromGitHub {
           owner = "randomphrase";
           repo = "company-c-headers";
-          rev = "e959d43bebf0a524f7378669983a39ee1379cc21";
-          sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n";
+          rev = "41331192b3961c8e3a51540678e1d11eaa346f03";
+          sha256 = "1hl14pv8splirzr9riak8m48ngxy1c6wa2q6ds6aq849zx9dafqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers";
@@ -12603,12 +12759,12 @@
       melpaBuild {
         pname = "company-distel";
         ename = "company-distel";
-        version = "20161002.2339";
+        version = "20180827.644";
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f";
-          sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd";
+          rev = "acc4c0a5521904203d797fe96b08e5fae4233c7e";
+          sha256 = "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/company-distel";
@@ -12660,12 +12816,12 @@
       melpaBuild {
         pname = "company-emacs-eclim";
         ename = "company-emacs-eclim";
-        version = "20170104.743";
+        version = "20180911.421";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "94508ebd071ff1052d68a20f7f1bf1038439fe43";
-          sha256 = "0l72zw93wv8ncn98d6ybnykhi3a60bc0kyx6z699wfhnnhhxhl0p";
+          rev = "edff7e0e30c87036710d88fb0b7a4644750858e8";
+          sha256 = "0ywifqdhv7cibgl42m7i15widna9i1dk5kl5rglyql7hy05nk9gj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -12687,12 +12843,12 @@
       melpaBuild {
         pname = "company-emoji";
         ename = "company-emoji";
-        version = "20161230.1937";
+        version = "20180909.819";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "company-emoji";
-          rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
-          sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
+          rev = "271909be44f86bcc294739ca45992cdc3caee39f";
+          sha256 = "1rihgld1wxwfdpqv7d9gcgd8xpnms5kpw61z30y18fmkxhhmid3c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -12828,14 +12984,14 @@
         ename = "company-ghci";
         version = "20160310.1800";
         src = fetchFromGitHub {
-          owner = "juiko";
+          owner = "orimh";
           repo = "company-ghci";
           rev = "c2d74a41166e76de2e78c87f582ba3a1179b2aa6";
           sha256 = "02gq083lpbszy8pf7s5j61bjlm0hacv4md4g17n0q6448rix9yny";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ghci";
-          sha256 = "0q71qil4sndg72s2g5yg17w3n102wlba37y9jbx0l7hisa5l11gi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/company-ghci";
+          sha256 = "11sygcn8jb4rcc1hfiadhsyanbhsmnalpz2qvh5iaba0l165bsgg";
           name = "recipe";
         };
         packageRequires = [ company haskell-mode ];
@@ -13057,12 +13213,12 @@
       melpaBuild {
         pname = "company-lsp";
         ename = "company-lsp";
-        version = "20180617.1033";
+        version = "20180827.2138";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "company-lsp";
-          rev = "1cb1990dcd1feabf87a726a0b2a15c6f79eb5525";
-          sha256 = "09mg2yvvl5mmwbav1d5k5flk2jcz6a684r6bv8vspfs32wpz0kwg";
+          rev = "b93abde5bbc870170d2a2f5aa309be8a9618daf9";
+          sha256 = "1jb75km5w2y7iawknyb5nhi1k4mlll4srd6vaf4zm7frmx50jwyc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
@@ -13363,12 +13519,12 @@
       melpaBuild {
         pname = "company-prescient";
         ename = "company-prescient";
-        version = "20180626.1050";
+        version = "20180823.1838";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
-          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
@@ -13539,12 +13695,12 @@
       melpaBuild {
         pname = "company-rtags";
         ename = "company-rtags";
-        version = "20170924.2244";
+        version = "20180729.2038";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "e4060b551575be378344c0cc1aedf11446b4f264";
-          sha256 = "01xc5r2am0xck7q6jal3zyrqbzpx68fzqi9af7zb1klyw2s5v807";
+          rev = "7c470ba8e15740f37c3a7a9c56331c1cc4c0b1bb";
+          sha256 = "05czbkgq48jv0f9vainflikil51xiwd0h24jmmx5886wi3v1wb4c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -13911,12 +14067,12 @@
       melpaBuild {
         pname = "composer";
         ename = "composer";
-        version = "20180415.743";
+        version = "20180819.1821";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "composer.el";
-          rev = "1d43edd8079e84df5e1b46c65e6783cb3ff9debd";
-          sha256 = "0k6345mc2ppckbbmji4wkynlfgy00kr945ah8j2b62hqgm73h575";
+          rev = "d759562626520a61cdfc358ee8081795874d2450";
+          sha256 = "15ga89zxmxfcpb6rkfsa21iv8f7k8x0rjd89f8jydwh1xp85c5x3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
@@ -14098,12 +14254,12 @@
       melpaBuild {
         pname = "conllu-mode";
         ename = "conllu-mode";
-        version = "20180722.454";
+        version = "20180730.1018";
         src = fetchFromGitHub {
           owner = "odanoburu";
           repo = "conllu-mode";
-          rev = "fa2769b010c6e600711a04f083d1573505c61c2e";
-          sha256 = "16hasrrsz566bpr4xcjmby3hxf4ad2msb9bx8cs6fndvxgy1zvyk";
+          rev = "a752e9f7a04237e70e58beba23871f8fee4fd4e3";
+          sha256 = "0nany4lqhn56xan9hjr4cwv77ydgi51aqsm150j0093qsr1a91xp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
@@ -14151,16 +14307,16 @@
       melpaBuild {
         pname = "contextual";
         ename = "contextual";
-        version = "20160131.1037";
+        version = "20180726.100";
         src = fetchFromGitHub {
-          owner = "lshift-de";
+          owner = "e-user";
           repo = "contextual";
-          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
-          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+          rev = "7ad2bb36426fd182d4d5ee7fd9be1cc0db8c7a84";
+          sha256 = "0zk85y01w23zb9x60bc5w4q3p40cnyk9bsc6pd5h85rlaazbrpby";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual";
-          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/de20db067590624bbd2ca5a7a537b7f11ada84f2/recipes/contextual";
+          sha256 = "1xwjjchmn3xqxbgvqishh8i75scc4kjgdzlp5j64d443pfgyr56a";
           name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
@@ -14445,12 +14601,12 @@
       melpaBuild {
         pname = "counsel";
         ename = "counsel";
-        version = "20180719.1303";
+        version = "20180913.221";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "89bae2f783918609c074f7c594dcc19ce19b8d45";
-          sha256 = "0a2r5x7la9hx42wiyf5fjalb29r1ykr2r3q2lhgf6lc3h2qnrhmx";
+          rev = "f969cf8fcb0f4d201e719a2abbfba466fa6187f8";
+          sha256 = "042brxz4qlyhpwz71g8pym065dbdqvvkbrascfbnlz28c9rm0rkq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -14501,12 +14657,12 @@
       melpaBuild {
         pname = "counsel-codesearch";
         ename = "counsel-codesearch";
-        version = "20180713.304";
+        version = "20180913.541";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-counsel-codesearch";
-          rev = "cb9f3df541e84b4b13905c3ad3658cad2f34b0cf";
-          sha256 = "1invag9nnbsxajli6xph9fgdihs9j3hwkw2s8w297808if5gxnr3";
+          rev = "504a6f58552294fd0853850bfe4d050ff90cf093";
+          sha256 = "02v0cjwvnkasmsqljm510kmz2xifk1x00g51yj9qsn4jh2j14mbm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3404c3cdfa6654ad80378ab258f0df68a6beeb9/recipes/counsel-codesearch";
@@ -14586,12 +14742,12 @@
       melpaBuild {
         pname = "counsel-etags";
         ename = "counsel-etags";
-        version = "20180605.613";
+        version = "20180806.2255";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b";
-          sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi";
+          rev = "0ff874cd5ad5b29ca557685d04087e3eec859fe7";
+          sha256 = "1pzi0yz320xy72z65nahrxm2dspnnzz55zxjf01ha5nr1nh01q2h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -14669,12 +14825,12 @@
       melpaBuild {
         pname = "counsel-org-capture-string";
         ename = "counsel-org-capture-string";
-        version = "20180707.217";
+        version = "20180816.24";
         src = fetchFromGitHub {
           owner = "akirak";
           repo = "counsel-org-capture-string";
-          rev = "14144773a23fd42ddee3522ffae44260c55ab9d5";
-          sha256 = "0zknmcxhf97kflxm5bv9gjl9n390jjrbdz13600afs4kvzdad4z1";
+          rev = "0fd5d72397a9268a89dd26de2a6c355f127453ac";
+          sha256 = "19ijjiidxxysvkz9vnsgiymxd7w7zcs5bazn7dmahp5yaprlsjld";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/380d58ac9487f2fb1d4a791008fa60fb7165e7e3/recipes/counsel-org-capture-string";
@@ -14751,12 +14907,12 @@
       melpaBuild {
         pname = "counsel-projectile";
         ename = "counsel-projectile";
-        version = "20180718.842";
+        version = "20180906.39";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "6ffcf45767543c72e817d9de8bca9db9156a48be";
-          sha256 = "1zdnw9n32fgrpwqkd2v153gdhyq183avr78hj57cq48hp6vfwfa1";
+          rev = "878f95c55d7647723e679ce7a179d584db0c382d";
+          sha256 = "1nmgnfgjxxbw9nbdph7ib2m81qncvayn43hb572b64k81ysvvpdi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -14832,12 +14988,12 @@
       melpaBuild {
         pname = "counsel-tramp";
         ename = "counsel-tramp";
-        version = "20180311.2327";
+        version = "20180910.1857";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-counsel-tramp";
-          rev = "3f5ae75a6bde00bffeb2877b4ed4bd45610c0dfa";
-          sha256 = "06dhhjrgpikzpdl1hck0ckjbx8yzx8jbymb3ajfxglgvrvid4l1k";
+          rev = "5e3345f3d11f965e80763a3f68dca8a05f597224";
+          sha256 = "0rjkgf5idbnkjscmg4n8wvwh2s7dpj0ic848icil2xhc4i189z7k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1822b735b6bd533f658bd64ddccda29e19e9a5e/recipes/counsel-tramp";
@@ -15072,12 +15228,12 @@
       melpaBuild {
         pname = "cquery";
         ename = "cquery";
-        version = "20180619.1953";
+        version = "20180811.1431";
         src = fetchFromGitHub {
           owner = "cquery-project";
           repo = "emacs-cquery";
-          rev = "fd881d5db6bc555b22993e8d3e517d30a56ea763";
-          sha256 = "0n8962x68jcdff1wmq30fs5rbfgx9br2d10ylv3hfrg40abd0sad";
+          rev = "a803e92e77e1ffc74c13a753c1eb4f6f47127a97";
+          sha256 = "0b5f8lk790iavs1fd7hwihqrwx0ipg67hsx7qrs3cw96icl9vjcs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery";
@@ -15231,12 +15387,12 @@
       melpaBuild {
         pname = "cricbuzz";
         ename = "cricbuzz";
-        version = "20171227.1607";
+        version = "20180804.1554";
         src = fetchFromGitHub {
           owner = "lepisma";
           repo = "cricbuzz.el";
-          rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889";
-          sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp";
+          rev = "0b95d45991bbcd2fa58d96ce921f6a57ba42c153";
+          sha256 = "1s77a2lfy7nnaxm3ai9dg8lbdxp0892z4gr0yxqrgzawc4qcbb3x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -15360,12 +15516,12 @@
       melpaBuild {
         pname = "crystal-mode";
         ename = "crystal-mode";
-        version = "20180606.755";
+        version = "20180826.2029";
         src = fetchFromGitHub {
           owner = "crystal-lang-tools";
           repo = "emacs-crystal-mode";
-          rev = "7af6afdf8b90b13b419b58bbe9e096eb20527e5c";
-          sha256 = "1v6h8i9avgqirg7mcac33vycjyslmvg760dk3mf1sv76xx78v5vz";
+          rev = "8649736fea8960a5e54c3ec934484f231a518ea5";
+          sha256 = "0ggg1zi3x7jphqa83zkcd19x2j30bqkfysn8cl8xahrikwhxmh49";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
@@ -15378,6 +15534,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    crystal-playground = callPackage ({ crystal-mode
+                                      , emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "crystal-playground";
+        ename = "crystal-playground";
+        version = "20180829.2201";
+        src = fetchFromGitHub {
+          owner = "jasonrobot";
+          repo = "crystal-playground";
+          rev = "532dc7e4239eb4bdd241bc4347d34760344c1ebb";
+          sha256 = "06vrmxikqi36wbnm66r5s5fxhkdlz76fjb3nhlighbqlym4bxpl1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e8d3a41e3307f415a144ff55e7a5fa95216cd6c/recipes/crystal-playground";
+          sha256 = "0789x443qrvxgrcha6rag11fwyr0aj1ixw6xc0l4d34fsy76ppwh";
+          name = "recipe";
+        };
+        packageRequires = [ crystal-mode emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/crystal-playground";
+          license = lib.licenses.free;
+        };
+      }) {};
     csgo-conf-mode = callPackage ({ fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -15410,12 +15593,12 @@
       melpaBuild {
         pname = "csharp-mode";
         ename = "csharp-mode";
-        version = "20180708.652";
+        version = "20180831.324";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "5e47b7764b3f4c97c260a902e8072d444dbd0f1b";
-          sha256 = "1dnhpxcinrwc7dmwgzbg4lnly05h38f00zrfsjincvii6d8rjiw0";
+          rev = "20efdc8b9fa21fe4c297cc290c4fe68ef21d896e";
+          sha256 = "0bvdqiz28sn9kimd3abvqy23d4sis504qg8g0cnp0ijyb8dzi7cs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -16235,12 +16418,12 @@
       melpaBuild {
         pname = "dante";
         ename = "dante";
-        version = "20180515.1312";
+        version = "20180908.1216";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "0fd72ef60fe01aafbd11720cf3df2e7015847ff4";
-          sha256 = "1faxalr54vzxiqbf8vr2nmxkpypyv5w67bjnlvqnyy9hzr5i3qwj";
+          rev = "5cbf6726afe56f99b44b20d655c638292c3de8f9";
+          sha256 = "0jzwqm9dwbyhp4758yn2m232k3ql9x2h1w8db5qz0gsr0v8ii677";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -16253,6 +16436,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    dap-mode = callPackage ({ bui
+                            , dash
+                            , dash-functional
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild
+                            , s
+                            , tree-mode }:
+      melpaBuild {
+        pname = "dap-mode";
+        ename = "dap-mode";
+        version = "20180912.1048";
+        src = fetchFromGitHub {
+          owner = "yyoncho";
+          repo = "dap-mode";
+          rev = "78f73fc17d4f1c324720af6170447a3bc8d3f62f";
+          sha256 = "000ln7wvzsag7dxdzdi9mhznx2c2v3w3l9iw8wn56945x1vmh481";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b5296ada8eb52689acb1f236e0e74fecbbfd5fb/recipes/dap-mode";
+          sha256 = "1hbsmgfgn742fs086m80rjlidglmran0b072f7s8js4c00jy2xdv";
+          name = "recipe";
+        };
+        packageRequires = [
+          bui
+          dash
+          dash-functional
+          emacs
+          f
+          lsp-mode
+          s
+          tree-mode
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/dap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     darcsum = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -16462,12 +16687,12 @@
       melpaBuild {
         pname = "darktooth-theme";
         ename = "darktooth-theme";
-        version = "20180721.2039";
+        version = "20180725.2002";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "6060fe63e407fbd08a3acf8af05bdc6ea0bd422e";
-          sha256 = "1y7kjfjxj560chb5rh4rs9x3k2z20vc5vbg974a1aj37ipla4qlb";
+          rev = "ae14a9be19b6fbd287e0f5ad156e7942cd6a5bc6";
+          sha256 = "1jisiz0blksjl6d8q7bnvnlfrwalqfpd93fs66i8pgllhf5z7j19";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -16492,16 +16717,16 @@
       melpaBuild {
         pname = "dart-mode";
         ename = "dart-mode";
-        version = "20180721.2225";
+        version = "20180731.2049";
         src = fetchFromGitHub {
-          owner = "nex3";
+          owner = "bradyt";
           repo = "dart-mode";
-          rev = "9c9a63ed7bbf2b9d3521ead8c302489789552f9d";
-          sha256 = "12izfp7516d201shnj0fgd4g9ca2ji2rigiifz7bp0ysmbbpy8nr";
+          rev = "c11d02ab6a912abb675b0b7e331aca883ffbae30";
+          sha256 = "1jpwv6b3kfdajndmxkrlx533b995nhj9qnfz3vh8gs6axamcp6wv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
-          sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/dart-mode";
+          sha256 = "0zpvp86067a6l63wrpqxsm9fhv3n4ggbq8pg21vgiz54hk4x1xpp";
           name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs flycheck s ];
@@ -16517,12 +16742,12 @@
       melpaBuild {
         pname = "dash";
         ename = "dash";
-        version = "20180413.30";
+        version = "20180910.1156";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "a74f4cfcdc8d0642a9f602ad494f0354f27dacc9";
-          sha256 = "1kzijmjxjxgr7p8clphzvmm47vczckbs8mza9an77c25bn627ywl";
+          rev = "6514359b8606a6a9a94068ccd601fcd6379d6584";
+          sha256 = "0s90f0j7x194k0w1iryd2clrvx992l9cy54w2iq83nw1z40fbg0i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -16596,12 +16821,12 @@
       melpaBuild {
         pname = "dashboard";
         ename = "dashboard";
-        version = "20180704.2325";
+        version = "20180902.1148";
         src = fetchFromGitHub {
           owner = "rakanalh";
           repo = "emacs-dashboard";
-          rev = "41d959b752a294a18122817fb3ec2a2a9cf22856";
-          sha256 = "0xcqaf39szm3wqga1lkr4rsh48sv7qxldznfy8vxxa57xama80l3";
+          rev = "caef4564d50cc00b748d98f6180f26d4036cc8c6";
+          sha256 = "1q1q3ns7729icyp05dq2kvjall93wc85ws0d480fjk36vf4fc9dw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -16676,12 +16901,12 @@
       melpaBuild {
         pname = "datetime";
         ename = "datetime";
-        version = "20180325.1004";
+        version = "20180912.1336";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5";
-          sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82";
+          rev = "a4191272d5ef950712d3d9668209d09db7bfef65";
+          sha256 = "0klgjlp3dpj530iq1l4i96adkpas8id27m9iwpng39mhfqhc050a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
@@ -16729,12 +16954,12 @@
       melpaBuild {
         pname = "datomic-snippets";
         ename = "datomic-snippets";
-        version = "20180116.752";
+        version = "20180817.345";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "datomic-snippets";
-          rev = "731fbd31b814ef1521bd7eb1558eeab6a4c2e01b";
-          sha256 = "0sbrvd3z32wrpnmarwf9ya0b2c99pg82mxhvjw4b7hggxx65lqsj";
+          rev = "4a14228840d5252e13d2bf6209670f26345bbb84";
+          sha256 = "1nvng479sy7ykwy9a86qq48yzv8n0903g724srhf42v9c81fc9s7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4da8ec133ec5e1204966c1b12c9bc0ca1b50d643/recipes/datomic-snippets";
@@ -16867,12 +17092,12 @@
       melpaBuild {
         pname = "deadgrep";
         ename = "deadgrep";
-        version = "20180714.1716";
+        version = "20180912.1603";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "deadgrep";
-          rev = "0b00536799b6ee6d64676a0eed670bf771d4e746";
-          sha256 = "0fdflr7spkcrgn6pssajhh7dbpwbhxqqx22lv38a45zzbpxrirp0";
+          rev = "ad27fc0009ea591c4f3423e83327fb0acc2b7b4f";
+          sha256 = "0mjdm2gxppgbh4dpb95w9g5z6ahla7dih3l8dxv61173vm7v5mm9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
@@ -17143,6 +17368,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    defrepeater = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild
+                               , s }:
+      melpaBuild {
+        pname = "defrepeater";
+        ename = "defrepeater";
+        version = "20180829.2110";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "defrepeater.el";
+          rev = "62b00ede57d2e115b9ef9f21268c021ae1186873";
+          sha256 = "106q2h4djcf1q9v31wmimj59fiqmclgxw13s8zjnhv3sc2m3z1ka";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f0d9cf994233ad098826c6933dfd57665044f598/recipes/defrepeater";
+          sha256 = "1zlp206dy5qipb7m3m77j4har258rxgwxg5ipflym4jj183maa39";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/defrepeater";
+          license = lib.licenses.free;
+        };
+      }) {};
     deft = callPackage ({ fetchFromGitHub
                         , fetchurl
                         , lib
@@ -17150,12 +17402,12 @@
       melpaBuild {
         pname = "deft";
         ename = "deft";
-        version = "20180619.857";
+        version = "20180902.602";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "deft";
-          rev = "24ac778ab8c8247f7677dd20dd301f6eba85bd8d";
-          sha256 = "1m26wplsjgvv2s4mcb47haqjni49xmpjy52rddkmh6p7frhayxi2";
+          rev = "9d31a92ed8407ee92cfd7102538dc9ec6c41559c";
+          sha256 = "0cri5rqnv49yv1rhg3d418pprabjhshsc8i3sqs26wav0j02i4yb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -17599,14 +17851,14 @@
         ename = "diffscuss-mode";
         version = "20141014.1657";
         src = fetchFromGitHub {
-          owner = "hut8labs";
+          owner = "tomheon";
           repo = "diffscuss";
           rev = "bbc6dbed4b97d1eb9ae5dae021ed1e066129bd98";
           sha256 = "0ppsgfzmdg0r418n2x0qxwhyqs7hjj8fgazc4xzgs8fsg4j3h7mr";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17f89560f98f11810205ba58841cd5566766b436/recipes/diffscuss-mode";
-          sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/diffscuss-mode";
+          sha256 = "1mycjis38gqwha7jgj05fzv0041ghk6khy5d2dlcyy2nh3bb68rb";
           name = "recipe";
         };
         packageRequires = [];
@@ -17957,6 +18209,7 @@
         };
       }) {};
     dired-collapse = callPackage ({ dash
+                                  , dired-hacks-utils
                                   , f
                                   , fetchFromGitHub
                                   , fetchurl
@@ -17965,19 +18218,19 @@
       melpaBuild {
         pname = "dired-collapse";
         ename = "dired-collapse";
-        version = "20180530.727";
+        version = "20180724.944";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "71a1cf4d791e640df1f05b5589f79e45c460da64";
-          sha256 = "18l563jp9brflmsf7s5i6yklrs2nzcs93xm6h1w2wswzdssdna2b";
+          rev = "3fd347a0823312e966872bd0d26d9a75b2898c9c";
+          sha256 = "01q93n4b9js29r2grk53206f7blwp2pjyz8lf98x184f2sdrz9k7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
           sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
           name = "recipe";
         };
-        packageRequires = [ dash f ];
+        packageRequires = [ dash dired-hacks-utils f ];
         meta = {
           homepage = "https://melpa.org/#/dired-collapse";
           license = lib.licenses.free;
@@ -18091,12 +18344,12 @@
       melpaBuild {
         pname = "dired-filetype-face";
         ename = "dired-filetype-face";
-        version = "20160822.655";
+        version = "20180907.639";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "dired-filetype-face";
-          rev = "72b3c88e8b82b3f8681d940757f7b2992bd80793";
-          sha256 = "1sp6fr3qha5zas65q06b61bgqx0nfiarcgpydqv0drkn6dpaps8b";
+          rev = "7ade7f7e8c2d7518c65f3f0343a10c272da0f47e";
+          sha256 = "0s8mqz331iw2bk4xdvj9zljklqj8dxv0yaw100lddg37qmdf7lgl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e6c8015af3d5f013272308a97e089a4e3ca847d/recipes/dired-filetype-face";
@@ -18120,12 +18373,12 @@
       melpaBuild {
         pname = "dired-filter";
         ename = "dired-filter";
-        version = "20171010.204";
+        version = "20180830.1602";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "64b3dbb0e8f631d1e11becd0458406404894550b";
-          sha256 = "1nxn1517pf2i17bi0h5m5p2x8cvv30zgg6i6h8cjm4bwl1nx1ymc";
+          rev = "b6f3b7addefa046f22a15e72a25e4368e8a33d5e";
+          sha256 = "1afb6mmgnzkl3ywz35cmf5mcra17qh0wm44rnb5nw7s7k8wxqrhz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -18462,12 +18715,12 @@
       melpaBuild {
         pname = "dired-rsync";
         ename = "dired-rsync";
-        version = "20180625.1448";
+        version = "20180906.302";
         src = fetchFromGitHub {
           owner = "stsquad";
           repo = "dired-rsync";
-          rev = "1eb7488f36528166992fe50a89dbbfa6d8a0e58b";
-          sha256 = "0dc30xx9k2l1x2mj8mzkzx7ppv5nzpsyp3wxrhbbjwhnv5micc5q";
+          rev = "e112bf22c913d1491bb2149250be866ceb1806ff";
+          sha256 = "0q9q2b5ffwld87zs26nkkbim9zrpp3m4vf63lnqnbfzpgybx3b5m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ce9f41ad832cef527dde97f829a8b8339e6ac48b/recipes/dired-rsync";
@@ -18489,12 +18742,12 @@
       melpaBuild {
         pname = "dired-sidebar";
         ename = "dired-sidebar";
-        version = "20180709.2204";
+        version = "20180902.900";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "dired-sidebar";
-          rev = "e40075bbb43c4012b49fea2b40dbef1d3be3d82e";
-          sha256 = "0jz57p47np4wn01y7ggsavgg9nnl1rnmqcl0y32w2c8xk22rhjlp";
+          rev = "4e0c89cf99d3176809275f53571d8ca89f3f40b9";
+          sha256 = "0ckzs2bazvd8297p3dgr2aphvywxsjykz8v6v876wyf0rsx9inan";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
@@ -18514,12 +18767,12 @@
       melpaBuild {
         pname = "dired-single";
         ename = "dired-single";
-        version = "20170804.544";
+        version = "20180823.2012";
         src = fetchFromGitHub {
           owner = "crocket";
           repo = "dired-single";
-          rev = "0dcc645de6397bf12c33229de67a503e4490c618";
-          sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3";
+          rev = "b0ccca83df0542c5525c047ae283c0eadf500f5c";
+          sha256 = "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single";
@@ -19060,12 +19313,12 @@
       melpaBuild {
         pname = "distel-completion-lib";
         ename = "distel-completion-lib";
-        version = "20160816.406";
+        version = "20180827.644";
         src = fetchFromGitHub {
           owner = "sebastiw";
           repo = "distel-completion";
-          rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6";
-          sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2";
+          rev = "acc4c0a5521904203d797fe96b08e5fae4233c7e";
+          sha256 = "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/distel-completion-lib";
@@ -19322,12 +19575,12 @@
       melpaBuild {
         pname = "djangonaut";
         ename = "djangonaut";
-        version = "20180710.1445";
+        version = "20180727.844";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "djangonaut";
-          rev = "61a1ace3562c7352fd1665ceccc6b39be23daa80";
-          sha256 = "02g3iij6hhhzws612l9hbvd8zlf6ggifgl8ckxaysxd80z2jc2rs";
+          rev = "487dbd19a312cf5b45183df82d5d57f5c5a403a2";
+          sha256 = "1fpbbv5w54r70b1xma36lp3kh5cn184bvq28apll5bd5bclii56y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c/recipes/djangonaut";
@@ -19565,12 +19818,12 @@
       melpaBuild {
         pname = "docker";
         ename = "docker";
-        version = "20180710.743";
+        version = "20180914.742";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "7aee62326f8304fc5e3fc9de84bd56afe3572ed9";
-          sha256 = "1lrgi7hp5a3j6c39jv3vn7x1ak66p5r1ijifwkrj95r1x0dxj3f2";
+          rev = "c66a56f4af3bdd0e3b3f457867b537494b1abd91";
+          sha256 = "0cni8qkfyjdza4jb4rs12ca650j32a8zx0ahgb62xpbrw0qp61xl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -19683,12 +19936,12 @@
       melpaBuild {
         pname = "dockerfile-mode";
         ename = "dockerfile-mode";
-        version = "20180628.959";
+        version = "20180914.416";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "64733f64ea9be1e5e534e590846869b75c62ed1f";
-          sha256 = "00fk4qq3yhqia6y7pixx3qfmfxp61hdffkx6hmz6gbd6i1ibkmw4";
+          rev = "9f4381178aa03212cd3400c60c0f48ff306a0994";
+          sha256 = "0mm87gp2iw313bdhrvhvxq5j9cklh12zvskdcvaxpn1y264rfmsi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -19718,8 +19971,8 @@
           sha256 = "0vqx8npw0i02dhw2yb7s4z7njw60r3xyncw4z8l6fj99pp6pfh15";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dokuwiki";
-          sha256 = "0wfzzxx3n75zgxk06rlq7053hla84k79mk911by4jwk6km5adk55";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/dokuwiki";
+          sha256 = "0d92il37z1m1hgcgb6c6zaifllznzk1na4yv4bfsfqg25l0mid75";
           name = "recipe";
         };
         packageRequires = [ emacs xml-rpc ];
@@ -19843,12 +20096,12 @@
       melpaBuild {
         pname = "doom-modeline";
         ename = "doom-modeline";
-        version = "20180712.2015";
+        version = "20180911.241";
         src = fetchFromGitHub {
           owner = "seagle0128";
           repo = "doom-modeline";
-          rev = "8af6cb74f6f94ec863076966fd3b2d85ce386b02";
-          sha256 = "1b9k30n63milm7xzdh6ya5z4h2gz0dqm0ndfpmy9kx3992mbljqw";
+          rev = "54c28241253b3036ce76a71ef7c9a3edc14e0847";
+          sha256 = "1hprvzm34acirvk9cdk76dqzn9wsnmxds5lad1fhv00sm3lspwcy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
@@ -19878,12 +20131,12 @@
       melpaBuild {
         pname = "doom-themes";
         ename = "doom-themes";
-        version = "20180720.438";
+        version = "20180909.1057";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "75d43068733201b8c9c45f9e637ceaab2ff565a4";
-          sha256 = "11pbk4clc3rxzibrrz8rbfx52kd3fkxdyl6wv8mi1s8p7jw4ffln";
+          rev = "89c4a62ecf46ce4bcb0bc8cb825609729d411b31";
+          sha256 = "0fxnf22c68426vy7mvd9szdwm6c88p4l6cp1fxda195l3abzmygz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -20187,14 +20440,14 @@
         ename = "drawille";
         version = "20160418.1138";
         src = fetchFromGitHub {
-          owner = "sshbio";
-          repo = "drawille";
+          owner = "josuah";
+          repo = "drawille-el";
           rev = "d582b455c01432bc80933650c52a1f586bd1b5ad";
           sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille";
-          sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/drawille";
+          sha256 = "0nkhy00jx06a7899dgyajidah29p9536mvjr7cyqm99ari70m7y9";
           name = "recipe";
         };
         packageRequires = [ cl-lib ];
@@ -20496,12 +20749,12 @@
       melpaBuild {
         pname = "dumb-jump";
         ename = "dumb-jump";
-        version = "20180615.2114";
+        version = "20180911.1231";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "cad3c4040be06703a9b40aa36ba38f1dc0927a66";
-          sha256 = "175nwn616xqhwayn78acf6ivkxdh3z1vfb0ihslidq1s3xsg5ypk";
+          rev = "9e79b748746db86e9198a933914a8a9770f57604";
+          sha256 = "1gkzzq128h3z8dxc7r4nax3f844kvrl9nx3cmbc46axh3fixs6j9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -20606,8 +20859,8 @@
           sha256 = "0vgi6cw14fp8iihzmnk7jifdlbqhhcgnh26r30mnvsbycmbnvf0r";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
-          sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/dyalog-mode";
+          sha256 = "0w61inyfvxiyihx5z9fk1ckawcd3cr6xiradbbwzmn25k99gkbgr";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
@@ -21046,12 +21299,12 @@
       melpaBuild {
         pname = "easy-hugo";
         ename = "easy-hugo";
-        version = "20180719.20";
+        version = "20180822.1826";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "8bf48b973905c4ab488633226b3dfb3317d8c745";
-          sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs";
+          rev = "31cd8060d4ebb117599b90bee0f470ed148bcfba";
+          sha256 = "1sd38chf5zlhyiz2p56bwl35j22h7bfqqrwxxsccyypk217nrvnh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -21072,12 +21325,12 @@
       melpaBuild {
         pname = "easy-jekyll";
         ename = "easy-jekyll";
-        version = "20180513.1107";
+        version = "20180821.1845";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d";
-          sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj";
+          rev = "dc8a97d3d512dccf908f63f54a2679e3450fec85";
+          sha256 = "0y6d9gmrk9cka1kl09qfjfrm8p70bxy7bisfl0c7ays9ky7pniix";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@@ -21125,12 +21378,12 @@
       melpaBuild {
         pname = "easy-kill-extras";
         ename = "easy-kill-extras";
-        version = "20161028.504";
+        version = "20180914.54";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "easy-kill-extras.el";
-          rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
-          sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
+          rev = "8ec0e03f7de50c292ddaba696d542a33dd583e8e";
+          sha256 = "131qkgszb0jq42zpnwirb6wp0g5qd4b4w8km50l3p7c0rlydwj04";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
@@ -21235,12 +21488,12 @@
       melpaBuild {
         pname = "ebib";
         ename = "ebib";
-        version = "20180428.1401";
+        version = "20180817.324";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b";
-          sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5";
+          rev = "1b675d32ebeb8b52cd20934b6e4a4914361329fa";
+          sha256 = "0g12bg4wnzki6v780zhn8gxr80lrszldq8wpcni20l78kn799rdv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -21291,12 +21544,12 @@
       melpaBuild {
         pname = "eclim";
         ename = "eclim";
-        version = "20171113.1754";
+        version = "20180911.1026";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5";
-          sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1";
+          rev = "99fda18e661c3420fe997a217024cf7186303c2b";
+          sha256 = "19ri07pqry2v2l5ax0wvsay6fwibdw5s87v3axfjcyvq47qq0k8h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -21536,12 +21789,12 @@
       melpaBuild {
         pname = "ede-php-autoload";
         ename = "ede-php-autoload";
-        version = "20170428.933";
+        version = "20180901.555";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "65e502602dbc623257a820245d41f94cf2e1f07d";
-          sha256 = "1569g3rnklxnnknrs9nmyjk9axrdhpr9pcz2ma925sb388jyrf5r";
+          rev = "8a4eeeaa93b8d87b65a107c4ebcbeb14528d9449";
+          sha256 = "109cys3d4pfaa2c6gb33p5b40cd6wmisx63w20cxpj86drx8iabf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -21825,12 +22078,12 @@
       melpaBuild {
         pname = "editorconfig";
         ename = "editorconfig";
-        version = "20180708.228";
+        version = "20180903.1912";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "cc5a99005d6f3834cbc7acf78a517044c5dcdad6";
-          sha256 = "05pkligzkvd7imn93mxcdsrmdsjarx5309hg0cyrxra76rngx2yv";
+          rev = "24d65714fe6a934266b5c19aa82ab3215bdb710a";
+          sha256 = "1v96yg4cb1fdxqn28m7a0mijyzvryc7prbxfmincjbqm96rns4zp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -21877,12 +22130,12 @@
       melpaBuild {
         pname = "editorconfig-custom-majormode";
         ename = "editorconfig-custom-majormode";
-        version = "20180507.1942";
+        version = "20180815.1944";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "ae613f0a56364afbbab19d4377c108406d5cfc7c";
-          sha256 = "0sm3xdysnqzc6nc2n7rcnr478l7qdy7bv8rhq500240aprzv63y4";
+          rev = "13ad1c83f847bedd4b3a19f9df7fd925853b19de";
+          sha256 = "1zagd6cliwm8xyhzfvpi7n7m58k78wv4ihc2snq00v7321jjh9bp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode";
@@ -22000,14 +22253,14 @@
         ename = "efire";
         version = "20151009.1331";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "efire";
           rev = "d38dd6dd7974b7cb11bff6fd84846fd01163211a";
           sha256 = "15sc4648lkxsgv2frcfb878z86a7vynixsp1x5i5rg66bd9gzhfy";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/39dc592e92f0377a354d1b17f42172409a836484/recipes/efire";
-          sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/efire";
+          sha256 = "0dhgms6s0c889xx75khn1mqfn8i32z4rjlx2w7i0chm2abxbgd3m";
           name = "recipe";
         };
         packageRequires = [ circe ];
@@ -22075,16 +22328,16 @@
       melpaBuild {
         pname = "egison-mode";
         ename = "egison-mode";
-        version = "20160603.103";
+        version = "20180910.133";
         src = fetchFromGitHub {
-          owner = "egisatoshi";
-          repo = "egison3";
-          rev = "0f8289294b1a8de029f89643438e8384e7ee789f";
-          sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs";
+          owner = "egison";
+          repo = "egison";
+          rev = "78ba8fb1e31167bc54aa96cf70e5a734eee2cd48";
+          sha256 = "0xs6g76i7hxqg83v3569ascaww3aph28ncdnwzg09fjhldcqmy89";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
-          sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/egison-mode";
+          sha256 = "0bch4863l9wxrss63fj46gy3nx3hp635709xr4c2arw0j7n82lzd";
           name = "recipe";
         };
         packageRequires = [];
@@ -22102,12 +22355,12 @@
       melpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "20180722.1107";
+        version = "20180908.1519";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "eglot";
-          rev = "8d61ecaa8c38a02322c281ac7072e2884d63012f";
-          sha256 = "0bcs97irg1qqsnjyby0ncm0kl64yrri3vgicfyakl978pixz5hr7";
+          rev = "6f1d64c21aa6b7031b28c8e84f49407d4abca5e8";
+          sha256 = "0h99bjwg3v46svgc09nlgkr2yv5z5cjmc0xh33lvs9vfqrbcx72x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c644530eca56f93d94fac2c9d7663c35c2b8c01/recipes/eglot";
@@ -22217,12 +22470,12 @@
       melpaBuild {
         pname = "ein";
         ename = "ein";
-        version = "20180626.1257";
+        version = "20180909.751";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "cfd9c641c0c517738f33b7ead6de34d755ba24b1";
-          sha256 = "03csx3pbgbch2s5kkckczcxd5gqghapgvhz71jihxqxsal1r6mzn";
+          rev = "1122c88e0d34c63b52a4cba049e93ba80919d86e";
+          sha256 = "19mjwd5075i1vviah5m7qr6jfc7k08w8fd3i8w58f0xav21rl3w2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -22309,12 +22562,12 @@
       melpaBuild {
         pname = "ejc-sql";
         ename = "ejc-sql";
-        version = "20180701.1105";
+        version = "20180827.708";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "f957bb5e1e9e1aab0c7f1770f5e8144b9c26c93f";
-          sha256 = "09556l03wvszx9dpndcp3rz72r0yfg1s79b84zmrbliwyq740xbz";
+          rev = "53ef8f3b2e809016ad3d2a1bafc5e6ac942a5557";
+          sha256 = "1njpz8dz3pmbll4lcx13mg5329anpyzl9rrn9gsg5yhvy11viqci";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -22495,12 +22748,12 @@
       melpaBuild {
         pname = "el-patch";
         ename = "el-patch";
-        version = "20180720.821";
+        version = "20180904.1636";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "aaa4c4c1afaa48da9da210010f5131affbff720a";
-          sha256 = "04hmhnx854519k53b8r04zmd21hi9bgs9j5yphv7kizn0cpbrjka";
+          rev = "15b3e84ab7001d42acd621cd6572ffdca839ea33";
+          sha256 = "0fg4zzvk7vddiqgk9hcq8h09j8xr6c3hxhh7fa9rah4ni6clxmaw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -22785,12 +23038,12 @@
       melpaBuild {
         pname = "elcord";
         ename = "elcord";
-        version = "20180411.1207";
+        version = "20180909.1402";
         src = fetchFromGitHub {
           owner = "Mstrodl";
           repo = "elcord";
-          rev = "0cef4ca13b00d79507292d5591be8ffb7df5a9ca";
-          sha256 = "1571r8iwrf4dagjr2pv7dgs1i0f20nq6jdkxm2dlwvkblcnlx3fm";
+          rev = "edc003bb2d35df54289c3a071aaa17dac156a5f6";
+          sha256 = "1h1k184qlfkf4vy3fx4gni2q09a5bxwfmxab2ww7a3vjzj2ypcdx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf2c52366a8f60b68a33a40ea92cc96e7f0933d2/recipes/elcord";
@@ -22914,24 +23167,23 @@
                                      , fetchFromGitHub
                                      , fetchurl
                                      , lib
-                                     , melpaBuild
-                                     , names }:
+                                     , melpaBuild }:
       melpaBuild {
         pname = "electric-operator";
         ename = "electric-operator";
-        version = "20180627.1012";
+        version = "20180831.1046";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "35db75d5c2dbed1eeab4e4126ccb84714136a307";
-          sha256 = "18f043wpp8y18c4q86b0r4njl5biy2jgnnvja5vvprf6karbx5z5";
+          rev = "33c7f737423d3712e5b2c29c81b4f8d52f8d3621";
+          sha256 = "1fccvqsb38hkjnh85yvjcc5lq3pghjrfc85vn3hqaxnhkrid397k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "recipe";
         };
-        packageRequires = [ dash emacs names ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/electric-operator";
           license = lib.licenses.free;
@@ -23021,12 +23273,12 @@
       melpaBuild {
         pname = "elfeed";
         ename = "elfeed";
-        version = "20180713.529";
+        version = "20180829.1016";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "a6fc231e47f1071cd4d1363926868761f7f0bcd8";
-          sha256 = "0vlyrvzwj9rxhvnl6lawck8n2slrvhb96bxaf5pv37jqidrcsvyh";
+          rev = "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e";
+          sha256 = "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -23117,12 +23369,12 @@
       melpaBuild {
         pname = "elfeed-protocol";
         ename = "elfeed-protocol";
-        version = "20180409.813";
+        version = "20180728.207";
         src = fetchFromGitHub {
           owner = "fasheng";
           repo = "elfeed-protocol";
-          rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec";
-          sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76";
+          rev = "81ae532fba657ff230568a14277d1f71940688a3";
+          sha256 = "09s5jnb5sbraszwcmwaa7fzvv8qd6l7cnyl18rzfszhkqkc17xhj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@@ -23145,12 +23397,12 @@
       melpaBuild {
         pname = "elfeed-web";
         ename = "elfeed-web";
-        version = "20180513.524";
+        version = "20180829.1016";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
-          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
+          rev = "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e";
+          sha256 = "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -23171,12 +23423,12 @@
       melpaBuild {
         pname = "elgrep";
         ename = "elgrep";
-        version = "20180302.527";
+        version = "20180904.1622";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "elgrep";
-          rev = "01aece62e7910c50cd199ebbe70511776043f499";
-          sha256 = "0hlf3i2w1jmjj66ynxf7gvvq86yy3px24ww13hz849ai0lx5nazk";
+          rev = "55efe10b2c479e6c51725be68e64310f75c249b0";
+          sha256 = "0k2vv4vymsygxxxc43sigvc2f2rwpxn6qfqgs2bb54jzm5yaw01d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0d9ab623b2d634936a79ff6f4b98b31825d44b6d/recipes/elgrep";
@@ -23226,12 +23478,12 @@
       melpaBuild {
         pname = "elisp-def";
         ename = "elisp-def";
-        version = "20180410.224";
+        version = "20180806.23";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "elisp-def";
-          rev = "ff0730b8110f776862b29bf0b66e396fab2aaafb";
-          sha256 = "1zdbb1mgmb8hkzsmp6l4mv61831bw8ybfsfcwalnvrw5fvfwpaik";
+          rev = "368b04da68783601b52e3169312183381871cf9e";
+          sha256 = "0l1kj7xd4332xk821z24c14lhkpcmca5gmivpb8shlk10cvjvxjw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1f027b844efdc5946d2ad80d7052a8f3b96aac3d/recipes/elisp-def";
@@ -23358,13 +23610,13 @@
         version = "20180715.1602";
         src = fetchFromGitHub {
           owner = "Wilfred";
-          repo = "refs.el";
+          repo = "elisp-refs";
           rev = "c3fefb803bd0a1b6de654dbd380a8487804789a5";
           sha256 = "1va1lgc6dhqif11wxsd3b5kzv01q7ys800sly2v605153ajafqw4";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
-          sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elisp-refs";
+          sha256 = "1pj3dm2z6m24179ibl7zhr8lhan2v2rjnm3abfciwp228piz1sfz";
           name = "recipe";
         };
         packageRequires = [ dash loop s ];
@@ -23435,14 +23687,14 @@
         ename = "elixir-mode";
         version = "20180711.545";
         src = fetchFromGitHub {
-          owner = "elixir-lang";
+          owner = "elixir-editors";
           repo = "emacs-elixir";
           rev = "90323cd7669eb472ee1f97b9d070056ebe225d15";
           sha256 = "06kq92r9nmw95l6isc87w0yb9jmd11bm09j3hwww4sn2bv5z2686";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
-          sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elixir-mode";
+          sha256 = "0d25p6sal1qg1xsq5yk343afnrxa0lzpx5gsh72khnx2i8pi40vz";
           name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
@@ -23490,12 +23742,12 @@
       melpaBuild {
         pname = "elm-mode";
         ename = "elm-mode";
-        version = "20180114.9";
+        version = "20180828.1527";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0";
-          sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g";
+          rev = "5167d3fd8a32d384d999655dbed6870352b65673";
+          sha256 = "1njwjlvda9n96zjg1lrhjjg4rhnj3yc210qyhc3h8zpq46fpld96";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -23508,6 +23760,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    elm-test-runner = callPackage ({ emacs
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "elm-test-runner";
+        ename = "elm-test-runner";
+        version = "20180830.612";
+        src = fetchFromGitHub {
+          owner = "juanedi";
+          repo = "elm-test-runner";
+          rev = "09a274ca8dc0e3d3a2d4ce15c4c5457ac52e95a9";
+          sha256 = "00xzvww0lm84lzgnmyxcyi3qpi12gxjlgcs80r7j3hryr5zvs5r0";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/064db8f60438927255458a7fbd8ae871f8264d67/recipes/elm-test-runner";
+          sha256 = "1axzp93a0xmbprskql4bdfnxnmcpfnq6xf7c4x7cgn5pbd1p6inz";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/elm-test-runner";
+          license = lib.licenses.free;
+        };
+      }) {};
     elm-yasnippets = callPackage ({ fetchFromGitHub
                                   , fetchurl
                                   , lib
@@ -23791,12 +24069,12 @@
       melpaBuild {
         pname = "elpy";
         ename = "elpy";
-        version = "20180720.155";
+        version = "20180915.346";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "db0ee080424ef39b4cd2782a3dbd0afccaaafd04";
-          sha256 = "0gzanxwv1g2hx80qm0m8iy1apsg51hhnh9rq1hicrwyvp1wzc24r";
+          rev = "1ef3ba3be237b2bbd9ecbbb79ca63cc7ba849c0d";
+          sha256 = "02hpy7cnd2mwm05cvajifigwg4y978b1sk3nwh0l500n4p1ac8kq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -24042,12 +24320,12 @@
       melpaBuild {
         pname = "elvish-mode";
         ename = "elvish-mode";
-        version = "20170913.1939";
+        version = "20180809.912";
         src = fetchFromGitHub {
           owner = "ALSchwalm";
           repo = "elvish-mode";
-          rev = "9cf31b453ac79b011b84e83ca11c964c4e647649";
-          sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0";
+          rev = "c3a7e31564256b9755b1ab9fb40d32ad78cd1ad2";
+          sha256 = "0dxa8g49fq4h1ab3sawnbgy1fxaxxsdac3l6im34qfw4km8brp9y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -24094,12 +24372,12 @@
       melpaBuild {
         pname = "elx";
         ename = "elx";
-        version = "20180614.1957";
+        version = "20180909.937";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "elx";
-          rev = "10a21c35915e249d5487aa3ced70fcfb749a9d0c";
-          sha256 = "1jl2lp4gas89vx1xjx5gzh56fhx16mvfqwqs84cpxdbwb2qzch21";
+          rev = "02b973c31f037806bcb676b4d98987ed7709f21e";
+          sha256 = "1ixk7j62j4z3i7n4v5wa5yhclshjh83qc1dhwfdqlc7g60xdl8p0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
@@ -24431,12 +24709,12 @@
       melpaBuild {
         pname = "ember-mode";
         ename = "ember-mode";
-        version = "20171208.559";
+        version = "20180823.306";
         src = fetchFromGitHub {
           owner = "madnificent";
           repo = "ember-mode";
-          rev = "755256782478cb724edd8f111225d7c8d342f90c";
-          sha256 = "02x12b26l9qyq9cmg56ys222qxbc8zldw40scq3mfhfqqk4b43g7";
+          rev = "0f984f9ea709dfc3b13acae3a29956147ad4e2c2";
+          sha256 = "0z0fhj2wj9m69rgc21b5rkk7a3g3css3c5gmla2x0mwnxwdc6fyb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode";
@@ -24562,11 +24840,11 @@
       melpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "20180708.1823";
+        version = "20180907.1359";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "9b702f38e3486d67cb67194e98ea72dda25be1af";
-          sha256 = "13l0didxiagcv8rr9ifdjk92qpcghyqkqshpcr76ix4dm3mbaymk";
+          rev = "fd9079a9101cc99ca62cfe9187c28b1c8fd69eb6";
+          sha256 = "11560smmyh3wixpq5q6xh5chnq71q6ydri4d4py3paxsgmn268xb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -24960,12 +25238,12 @@
       melpaBuild {
         pname = "emojify-logos";
         ename = "emojify-logos";
-        version = "20171125.214";
+        version = "20180814.217";
         src = fetchFromGitHub {
           owner = "mxgoldstein";
           repo = "emojify-logos";
-          rev = "96c74383a7c69e839ba41de3507154ca4ad564a1";
-          sha256 = "1z2rhs2kvafcfqqvq78yb5zp0pnn9s0mhng0rymfghi704cdifm6";
+          rev = "a3e78bcbdf863092d4c9b026ac08bf7d1c7c0e8b";
+          sha256 = "1fhxf3nky9wlcn54q60f9254iawcccsrxw370q7cgpsrl1gj3dgp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/114d5596a7b36f47c150c413c6ecc74de36ca239/recipes/emojify-logos";
@@ -25016,21 +25294,20 @@
                        , paredit
                        , popup
                        , projectile
-                       , redshank
                        , s }:
       melpaBuild {
         pname = "emr";
         ename = "emr";
-        version = "20180708.1011";
+        version = "20180908.817";
         src = fetchFromGitHub {
-          owner = "chrisbarrett";
+          owner = "Wilfred";
           repo = "emacs-refactor";
-          rev = "8e556aa5a932dcf21dff985c528cff41a99ba332";
-          sha256 = "18m9ypdarwisksh7pyxgvp3shv2ikvqjijdgjgm0l4jz3vrflpqw";
+          rev = "c3ff7f007ebd8241dea10a6632073bea778409a4";
+          sha256 = "0yqyn3plqs264c3zjnb6js7jmvnvlcjv6x4z9himi4vfy262wl3j";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
-          sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr";
+          sha256 = "02a7yzv6vxdazi26wk1ijadrjffd4iaf1abhpv642xib86pgpfd6";
           name = "recipe";
         };
         packageRequires = [
@@ -25043,7 +25320,6 @@
           paredit
           popup
           projectile
-          redshank
           s
         ];
         meta = {
@@ -25136,12 +25412,12 @@
       melpaBuild {
         pname = "enh-ruby-mode";
         ename = "enh-ruby-mode";
-        version = "20180403.1251";
+        version = "20180730.1609";
         src = fetchFromGitHub {
           owner = "zenspider";
           repo = "enhanced-ruby-mode";
-          rev = "fd50e71913e4dc714f71020701ab398a18b524b6";
-          sha256 = "0al8bbhfjxqh40hkpiaziz5vsfy2m5saj7wcvs6xivz1ph5ass0b";
+          rev = "5e19f321d702ff6b698047af6b3ddcd1c9f0d979";
+          sha256 = "1x9qwfhmg9f01pg30sm05sv7jpnzqgm94xvz65ncz55qimjbydsl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -26094,12 +26370,12 @@
       melpaBuild {
         pname = "erlang";
         ename = "erlang";
-        version = "20180618.557";
+        version = "20180910.600";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "9d5af99762b3795c763fb62c1516247bd3f8e12f";
-          sha256 = "0anlp0qj2blgdjzdw8rxmpz659yzbdl3r69b6slm1c1aa77ayc17";
+          rev = "2eccf112d0ed6d0736562ca5260740cc670b7ddb";
+          sha256 = "0yfycmb6vlhdgq0i7nmnxdsjx41q9h2bbig5qzxmjvn1brv8adca";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -26112,6 +26388,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    erlstack-mode = callPackage ({ dash
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "erlstack-mode";
+        ename = "erlstack-mode";
+        version = "20180817.226";
+        src = fetchFromGitHub {
+          owner = "k32";
+          repo = "erlstack-mode";
+          rev = "d480d937f02f8cc66350bc583ee54942a786ac49";
+          sha256 = "1y664369wdhd4ir8lmhgvwrzj6w8j9s67327jkr310vmfdlgxhvy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ee61c1c5f116082b37fb13d15052ed9bbbc1dac/recipes/erlstack-mode";
+          sha256 = "0b7mj0rs8k3hdv4v3v5vmdqs0y26mss7dzc0sjjxj4d095yddqqf";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/erlstack-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     eros = callPackage ({ emacs
                         , fetchFromGitHub
                         , fetchurl
@@ -26188,7 +26491,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ert-junit = callPackage ({ ert ? null
+    ert-junit = callPackage ({ emacs
+                             , ert ? null
                              , fetchgit
                              , fetchurl
                              , lib
@@ -26196,18 +26500,18 @@
       melpaBuild {
         pname = "ert-junit";
         ename = "ert-junit";
-        version = "20180511.1548";
+        version = "20180809.1411";
         src = fetchgit {
           url = "https://bitbucket.org/olanilsson/ert-junit";
-          rev = "cd1f63627d4e6635086322f34be09ba535e26b97";
-          sha256 = "0a2ddvpm8yparl3zq05mp239k5dgplcmc9s61ak9d5qn65l8mwyr";
+          rev = "69177610824f20d4c4e16af4b9850fd96bea6491";
+          sha256 = "1mkxxpnzfhd0gf4jjnvrx2x0m8nxs8viwfzhs4r2rn6h7j48ynza";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "recipe";
         };
-        packageRequires = [ ert ];
+        packageRequires = [ emacs ert ];
         meta = {
           homepage = "https://melpa.org/#/ert-junit";
           license = lib.licenses.free;
@@ -26255,12 +26559,12 @@
       melpaBuild {
         pname = "ert-runner";
         ename = "ert-runner";
-        version = "20180215.857";
+        version = "20180831.445";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "ert-runner.el";
-          rev = "0de42343a9de834320397d169c81725b2827e41f";
-          sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr";
+          rev = "90b8fdd5970ef76a4649be60003b37f82cdc1a65";
+          sha256 = "04nxmyzncacj2wmzd84vv9wkkr2dk9lcb10dvygqmg3p1gadnwzz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
@@ -26627,14 +26931,14 @@
         ename = "eshell-prompt-extras";
         version = "20180109.2234";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "eshell-prompt-extras";
           rev = "1d8825dcc005b488c6366d0b3015fc6686194eea";
           sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
-          sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/eshell-prompt-extras";
+          sha256 = "0zkdb9a8dibk832b5hzb6wjich3l0lah5p64805rgd4qskzj10gx";
           name = "recipe";
         };
         packageRequires = [];
@@ -26762,8 +27066,8 @@
           sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme";
-          sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/espresso-theme";
+          sha256 = "1njc1ppi1jvb3mdckr19kbk7g0a3dx8j4d6j101ygszzrr24ycmv";
           name = "recipe";
         };
         packageRequires = [];
@@ -26855,24 +27159,25 @@
       }) {};
     ess = callPackage ({ fetchFromGitHub
                        , fetchurl
+                       , julia-mode
                        , lib
                        , melpaBuild }:
       melpaBuild {
         pname = "ess";
         ename = "ess";
-        version = "20180720.131";
+        version = "20180911.1435";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "167b61af2c36c300a2f1f9ecea2c670af685451b";
-          sha256 = "1bcd652hq7j5azhmy470ha4279c5ld8db1gcqww65clay7gvnbkg";
+          rev = "bd6bdd45e800d36fbd6541289f0b00e15b352f98";
+          sha256 = "1h1ba55pp0prfjxc2jv14gy1j3qgd4j6qjhgz2f4nprwp6ql8s30";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
           sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ julia-mode ];
         meta = {
           homepage = "https://melpa.org/#/ess";
           license = lib.licenses.free;
@@ -26941,12 +27246,12 @@
       melpaBuild {
         pname = "ess-smart-underscore";
         ename = "ess-smart-underscore";
-        version = "20170222.1715";
+        version = "20180910.2223";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "ess-smart-underscore.el";
-          rev = "02e8a03553f34fe7184afff97f20e560d6f8d617";
-          sha256 = "0kk9n66xjm08cj6zdqxfn332fb4c2is4pdxgqamypdwsdjhcz57l";
+          rev = "863ed5c012acd702d71074c56315e668b61880ea";
+          sha256 = "1qnxsagvjar8513bsyp361iy41k0c5z6ricwaw56xyxna5h6i5ma";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore";
@@ -26996,12 +27301,12 @@
       melpaBuild {
         pname = "esup";
         ename = "esup";
-        version = "20180506.1639";
+        version = "20180726.2042";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "esup";
-          rev = "1182c490a7ddc275318c9eb25b8d5bbdf9b78d2b";
-          sha256 = "1nkglqr42r2s0vqkj092j131a0ykjrj6qiawgw6id60yn0grhpqb";
+          rev = "5acb60e8d7a8fef854178f325682765820522b10";
+          sha256 = "0bfrnzwf1imxigd7mxisywi54h0jb79488z2hba53yplmvr80p7p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -27321,12 +27626,12 @@
       melpaBuild {
         pname = "evil";
         ename = "evil";
-        version = "20180517.1300";
+        version = "20180914.516";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "230b87212c81aaa68ef5547a6b998d9c365fe139";
-          sha256 = "0c9zy3bpck10gcrv79kd3h7i4ygd5bgbgy773n0lg7a2r5kwn1gx";
+          rev = "6fde982d731e2cc4e5f6bded6f8955ab2daee3b7";
+          sha256 = "1w2fzsq15qhh3kqrjiyb236k84v61bsg22ym27rm3bd7gikd9v36";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -27374,12 +27679,12 @@
       melpaBuild {
         pname = "evil-args";
         ename = "evil-args";
-        version = "20140329.1429";
+        version = "20180908.1457";
         src = fetchFromGitHub {
           owner = "wcsmith";
           repo = "evil-args";
-          rev = "b554f83a31dd47cac9799725f379675f54ed0a6a";
-          sha256 = "08743swy936v8fhbaplrr0wpwlp7vplvy2iwkh56p7gb5gqmlfli";
+          rev = "758ad5ae54ad34202064fec192c88151c08cb387";
+          sha256 = "0k35glgsirc3cph8v5hhjrqfh4ndwh8a28qbr03y3jl8s453xcj7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0976c82a22f1a8701b9da0b8ba4753ed48191376/recipes/evil-args";
@@ -27516,16 +27821,16 @@
       melpaBuild {
         pname = "evil-collection";
         ename = "evil-collection";
-        version = "20180722.1341";
+        version = "20180915.632";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-collection";
-          rev = "6e2c59c2ddd8b2d953c6152f467f41bc213533ee";
-          sha256 = "0m6dg93shs3fl3qimiiicjwfyrk6mhghb7qgd21qgdnb3yj4fw5j";
+          rev = "efc0a73eb8f6f30c1564004a954fd08501409ad0";
+          sha256 = "0bqawzf4qsnql7h2mmxp0nzhy5jjgfzh2jay1frhkh1fxdnlz0is";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9b93a8e3750e4e7767498e418f46d553d814604/recipes/evil-collection";
-          sha256 = "1fggdlssb8sai00vbrxph8cama3r0f7w8qhmiajj4cy2il7jgmhy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fbc35279115f6fdf1ce7d1ecef3b413c7ca9c4f1/recipes/evil-collection";
+          sha256 = "1l6x782ix873n90k9g00i9065h31dnhv07bgzrp28l7y7bivqwl7";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs evil ];
@@ -27668,29 +27973,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-escape = callPackage ({ cl-lib ? null
-                               , emacs
-                               , evil
-                               , fetchFromGitHub
+    evil-escape = callPackage ({ fetchFromGitHub
                                , fetchurl
                                , lib
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-escape";
         ename = "evil-escape";
-        version = "20180623.2019";
+        version = "20180910.534";
         src = fetchFromGitHub {
           owner = "syl20bnr";
           repo = "evil-escape";
-          rev = "73b30bfd912f40657b1306ee5849d215f0f9ffbd";
-          sha256 = "0mqz7l1a4rxdj7g3fda17118f7y0vph4ica447ciad5vz3zx9i2z";
+          rev = "f4e9116bfbaac8c9d210c17ad488e0982291245f";
+          sha256 = "1whppnlzkjig1yrz0fjvp8cy86215gjahgh88166nzk95wlc3pvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
           sha256 = "0jiwsgcqw8m6z4z82gx0m0r0vbvkcxc0czhn4mqjwkhhglwzgi8l";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs evil ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/evil-escape";
           license = lib.licenses.free;
@@ -27814,12 +28116,12 @@
       melpaBuild {
         pname = "evil-fringe-mark";
         ename = "evil-fringe-mark";
-        version = "20180619.1534";
+        version = "20180727.2347";
         src = fetchFromGitHub {
           owner = "Andrew-William-Smith";
           repo = "evil-fringe-mark";
-          rev = "fdb147d5ec8fbe087c73604374b3d491f143f2b2";
-          sha256 = "1cfsh0f4mfpm6pifxgk2v0h975hldvwdbx95zgw045w9sw325q5b";
+          rev = "37521e190dc0414a2bfddd6b219527b1a8dd3f58";
+          sha256 = "1hxylidf90j7zxr1rwgjkycc5l0qf2dvngrkfrvnl7r7yls6mgmd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70dcc07c389d5454de64fb08cd666d489d6d5483/recipes/evil-fringe-mark";
@@ -27868,12 +28170,12 @@
       melpaBuild {
         pname = "evil-goggles";
         ename = "evil-goggles";
-        version = "20180702.353";
+        version = "20180725.252";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "ea5ab4012af0eb451e2c0d996455c58f1554f7c1";
-          sha256 = "18f96n8kkj1lza9za46dwjrsm4ni2s1gqbgdjjiqmkl06kj04fi8";
+          rev = "d7876e6566ac82b7c3251a59651e7db6ab756589";
+          sha256 = "0xr6svfk3p5py6q922p7nlaxqpd7iid2q1x5xwjfy4cg89h29vd2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -27996,24 +28298,25 @@
                                , evil
                                , fetchFromGitHub
                                , fetchurl
+                               , ledger-mode
                                , lib
                                , melpaBuild }:
       melpaBuild {
         pname = "evil-ledger";
         ename = "evil-ledger";
-        version = "20170905.519";
+        version = "20180802.912";
         src = fetchFromGitHub {
           owner = "atheriel";
           repo = "evil-ledger";
-          rev = "17f3c4284fc4f8d9da4e1d805fbe712e0e02b8d4";
-          sha256 = "1vjiyi1kv62w7mbvp149zncvk7p4js75m897b69gh05g68j4ckk2";
+          rev = "7a9f9f5d39c42fffdba8004f8982642351f2b233";
+          sha256 = "010r1qn9l3clqqrlia0y25bqjbrixvf8i409v10yxqb949jvw1vk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/500e99a1b92f0a0c144f843cd7645872034d9fbb/recipes/evil-ledger";
           sha256 = "13idy2kbzhckzfwrjnzjrf8h2881w3v8pmhlcj26xcyf4ch0dq9r";
           name = "recipe";
         };
-        packageRequires = [ emacs evil ];
+        packageRequires = [ emacs evil ledger-mode ];
         meta = {
           homepage = "https://melpa.org/#/evil-ledger";
           license = lib.licenses.free;
@@ -28145,8 +28448,8 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace";
-          sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/evil-mark-replace";
+          sha256 = "14j2d46288shlixb57nh5vlqdi3aiv20djvcbhiw1cm9ar2c3y4v";
           name = "recipe";
         };
         packageRequires = [ evil ];
@@ -28163,12 +28466,12 @@
       melpaBuild {
         pname = "evil-matchit";
         ename = "evil-matchit";
-        version = "20180526.557";
+        version = "20180822.12";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-matchit";
-          rev = "1c428e192b5c8698f8550d8862593bdca5ef9bfc";
-          sha256 = "1xip22vlzlki769hza3wssr41m5pl47ay7721fc4y5qv9yr9pjfa";
+          rev = "47894a6cc02c037dd782d0c0023a3193b6b49e89";
+          sha256 = "0wkgjpql7x27pgj3w20cxnl0gjcvjmphsxyvvlr79504lgmdk41a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -28427,6 +28730,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-python-movement = callPackage ({ cl-lib ? null
+                                        , dash
+                                        , emacs
+                                        , evil
+                                        , fetchgit
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild
+                                        , s }:
+      melpaBuild {
+        pname = "evil-python-movement";
+        ename = "evil-python-movement";
+        version = "20180724.720";
+        src = fetchgit {
+          url = "https://bitbucket.org/FelipeLema/evil-python-movement.el";
+          rev = "9936b3b7f8d96415d517c1f3604637889484a637";
+          sha256 = "11ivb95ilsw3svpna9n07yf8s9q3w36ia6js2qv6wf0d0dp2xb9r";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/130e6d17735ff86b962859528d7e50869f683251/recipes/evil-python-movement";
+          sha256 = "1qs0z93rpi9dz6hy64816afdr4k5gssyw2dhaxcn152ylg1yzkg3";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib dash emacs evil s ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-python-movement";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-quickscope = callPackage ({ evil
                                    , fetchFromGitHub
                                    , fetchurl
@@ -28623,12 +28955,12 @@
       melpaBuild {
         pname = "evil-snipe";
         ename = "evil-snipe";
-        version = "20180503.141";
+        version = "20180731.1031";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "8120c2398cb5ca9a81369f7201b3db19cd71e965";
-          sha256 = "0i6hjzidccxdy3dq7rrngfqlrrwb6yyc635fark3dnn90cpadwci";
+          rev = "8dd076cc56eb9b04494e4e303b86a959b048350b";
+          sha256 = "05zlmkyl1gms7pk2izh67j7xk4mb5y94jpyx63lg59yc391p5p07";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -29257,14 +29589,14 @@
         ename = "expand-line";
         version = "20151005.1907";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "expand-line";
           rev = "75a5d0241f35dd0748ab8ecb4ff16891535be372";
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3fa6b17a8c6b08b0d77bdff0f91b7af34f4279/recipes/expand-line";
-          sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/expand-line";
+          sha256 = "0bzz7zrpfdxhjxs7nzlmzjb9jfajhxkivzr5sm87mg3zx8b6gjyi";
           name = "recipe";
         };
         packageRequires = [];
@@ -29280,12 +29612,12 @@
       melpaBuild {
         pname = "expand-region";
         ename = "expand-region";
-        version = "20180625.939";
+        version = "20180817.434";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "expand-region.el";
-          rev = "54e1b94fa8b65f066f731101a744287e956ae75f";
-          sha256 = "113d804gmvxmg3f32w7m4dc14xpl47aw25255nyr0w5bxm7vmnah";
+          rev = "27a78e7c364b4e6d39f6593f5a55a12c4a7675bc";
+          sha256 = "0dslj330729sjhxg080xqw5hasmm23niliwmihm9464cl51h1mhi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -29435,12 +29767,12 @@
       melpaBuild {
         pname = "exwm-edit";
         ename = "exwm-edit";
-        version = "20180629.137";
+        version = "20180905.43";
         src = fetchFromGitHub {
           owner = "agzam";
           repo = "exwm-edit";
-          rev = "6ea0a64e47d06204d826e146c3c3082dec5c4007";
-          sha256 = "0sz2q4nj5inh42f37jfkc5z7fdw1lgsyz2fh5ljgjcvrd9xlb24l";
+          rev = "961c0f3ea45766b888c73d7353da13d329538034";
+          sha256 = "087pk5ckx753qrn6xpka9khhlp7iqlz76w7861x90av2f5cgy6fw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f247915e02e59ebd6a2a219e55870e034d41c938/recipes/exwm-edit";
@@ -30113,6 +30445,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    fd-dired = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "fd-dired";
+        ename = "fd-dired";
+        version = "20180731.349";
+        src = fetchFromGitHub {
+          owner = "yqrashawn";
+          repo = "fd-dired";
+          rev = "a92511929ce0d64d2bc05823920e12f106c4dfc7";
+          sha256 = "1l3mc39kb3w9pbc84998rz3g1n0ygr8pg9b9z5cgg638jh2cvzqm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1217e0d4f42df68cc22de9b4f27a36c0377509e3/recipes/fd-dired";
+          sha256 = "0g8zvg6b9hcxkmqn254y9khjm7jz2lz4mh7dhsxfcy64inaj0481";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fd-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
     feature-mode = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -30145,12 +30503,12 @@
       melpaBuild {
         pname = "feebleline";
         ename = "feebleline";
-        version = "20180604.515";
+        version = "20180914.1400";
         src = fetchFromGitHub {
           owner = "tautologyclub";
           repo = "feebleline";
-          rev = "9ece1c02a60ed0209cda661bcb864a7e624e8aca";
-          sha256 = "0fiq16bm28c9z62fdpr7n2fpnqbcmb278b72wi3gl386w34j6xl1";
+          rev = "89ddf31ecad885e5491e8d6b71b48c1591b3faec";
+          sha256 = "0v0m2vk7cxfrihcs1ipbw80wfj0nvyqzyfamzk3fnk42hj4qdb75";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/782295d8c530878bd0e20cde7e7f7f8f640953dd/recipes/feebleline";
@@ -30170,12 +30528,12 @@
       melpaBuild {
         pname = "fennel-mode";
         ename = "fennel-mode";
-        version = "20180509.1852";
+        version = "20180731.2050";
         src = fetchFromGitLab {
           owner = "technomancy";
           repo = "fennel-mode";
-          rev = "21e184b2a862290db9dcf839f0e4a2df480a642e";
-          sha256 = "0l3770w47skbr95775mrwpmw6apmbjk18i6c1zcz05pc46rcr15s";
+          rev = "b1f07dff0b16a0bc912528e3c1a70231488a1399";
+          sha256 = "1s07qbj6m93g4cjhmwxb1s7bh3py68knznnmhh3fqwxbqzm6bzf0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f/recipes/fennel-mode";
@@ -30455,12 +30813,12 @@
       melpaBuild {
         pname = "find-file-in-project";
         ename = "find-file-in-project";
-        version = "20180705.1832";
+        version = "20180912.518";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "1c54325cb60bde7496dad4e19f4c2a857999df58";
-          sha256 = "1pxqqpj6cdwbhca6vaj98d86f1l0vl09zp054wf0sv759l25ac0l";
+          rev = "a3d89bc16432bd44d4a4ebfd01dab57a88025327";
+          sha256 = "033pfb1xc2chnbnwbf2vbhc96dnjmj37yhgbmxjl4b5hws73wh3c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -30482,14 +30840,14 @@
         ename = "find-file-in-repository";
         version = "20151113.519";
         src = fetchFromGitHub {
-          owner = "hoffstaetter";
+          owner = "h";
           repo = "find-file-in-repository";
           rev = "898fd7ea2727772ba09383a2ece7f3f7f1e77e29";
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository";
-          sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/find-file-in-repository";
+          sha256 = "02rihpfpckppnf5a2zgd5s3dspdhq4mr6qchlrzg2fd4byjxra9s";
           name = "recipe";
         };
         packageRequires = [];
@@ -30762,12 +31120,12 @@
       melpaBuild {
         pname = "fish-completion";
         ename = "fish-completion";
-        version = "20180616.1223";
+        version = "20180827.129";
         src = fetchFromGitLab {
           owner = "Ambrevar";
           repo = "emacs-fish-completion";
-          rev = "bac15fda1392a891070574dfe5d2d50b10831e8b";
-          sha256 = "029s1ha8pc4df0xng5c0xwv2rlcl423mgh1ffgnbh0fx7ybr5n4v";
+          rev = "a73526d67c4c5f7f2e425cec79d56c7517c7f1e9";
+          sha256 = "0aip3gkkhysz74jfr4bbc31p3qwy31l436y3bvjskgk44zf7z78k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/fish-completion";
@@ -30788,12 +31146,12 @@
       melpaBuild {
         pname = "fish-mode";
         ename = "fish-mode";
-        version = "20180306.818";
+        version = "20180826.2003";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "bac709ac1235751952d6022dddc6307d9135d096";
-          sha256 = "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq";
+          rev = "35fc7c1e243a7410823088a571ecf378e9f3efa6";
+          sha256 = "0rn08dm4gn0g0nz080zxm0am1z6hfkinvzqwqszv96qkxy250ghp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode";
@@ -31135,12 +31493,12 @@
       melpaBuild {
         pname = "flex-compile";
         ename = "flex-compile";
-        version = "20180528.853";
+        version = "20180812.1156";
         src = fetchFromGitHub {
           owner = "plandes";
           repo = "flex-compile";
-          rev = "0b6259944e78f0bc6ee4407d97e3d09db8fd400e";
-          sha256 = "1qzzrxq80fl14slirmgidmpazj1gmh9b12jkz72flsbdiy7whpal";
+          rev = "4ca1a706aa1bc684a143d3430f009147df9c8e82";
+          sha256 = "0dzh3f99hf5n3fzqsxm4asl34sr451rn15miy4xk7jlg9j6y8i9s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
@@ -31264,12 +31622,12 @@
       melpaBuild {
         pname = "floobits";
         ename = "floobits";
-        version = "20170802.1500";
+        version = "20180731.2224";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
-          sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
+          rev = "489b294a7f30ecd2af2edc0823dead8102f27af6";
+          sha256 = "1pw88qn6s8ln626c8mgxgpfax39h7ww4m930dp7gg4aklxjbspkn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -31317,12 +31675,12 @@
       melpaBuild {
         pname = "flower";
         ename = "flower";
-        version = "20180618.1222";
+        version = "20180821.902";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
           repo = "flower";
-          rev = "4d05448dc0118078ec320f564d87acaa740ae47c";
-          sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2";
+          rev = "a0e6912e6e709e5cf083d48cebffdb60b809c59a";
+          sha256 = "04m6x5hiac9f4ffjw82g9gcy5r84vfrm4vj67f1vqr7llqbflkzm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
@@ -31455,12 +31813,12 @@
       melpaBuild {
         pname = "flycheck";
         ename = "flycheck";
-        version = "20180720.247";
+        version = "20180907.619";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "740d6670384e76f86d675d8ab00ff21eb7e09fcb";
-          sha256 = "0hskxg1q100j55wszlzscy90vhcaylz40b2wqkrad4bflx4dv2x5";
+          rev = "253febbdab8630814eb6b59daf536dfdb948a575";
+          sha256 = "0azc678wrxqsqg504wslzb99r5fmwbivs7z7nbp2p9v2rmr56ixy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -31644,12 +32002,12 @@
       melpaBuild {
         pname = "flycheck-clang-analyzer";
         ename = "flycheck-clang-analyzer";
-        version = "20180225.2039";
+        version = "20180903.2004";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-clang-analyzer";
-          rev = "adc9e7663bafcc9b740c09b691898413627e74ab";
-          sha256 = "10c45myq9vgsssp5v3vnip4klj9dxk8dh42zap44f9lw99ascx2r";
+          rev = "6568e082057c028c721ceda69bddd745fee5c5d5";
+          sha256 = "1ljgwyn44qcqmxxwff332d7ks6ky3rcwji6kfyrx4cadcvsyc81g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer";
@@ -31997,14 +32355,14 @@
         ename = "flycheck-demjsonlint";
         version = "20161114.2318";
         src = fetchFromGitHub {
-          owner = "z4139jq";
+          owner = "zenkiezhu";
           repo = "flycheck-demjsonlint";
           rev = "1c433150fdf628dda4c9fad938bf7c79610b4460";
           sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint";
-          sha256 = "0prwgi6v48ng89vvizb901iq4ysmrlh0g2b3797p1a6z2mps0k57";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/flycheck-demjsonlint";
+          sha256 = "034n95wknsqapi6n38v83zym5zi07q364b8icm27clpvgv5jy2fi";
           name = "recipe";
         };
         packageRequires = [ flycheck ];
@@ -32127,12 +32485,12 @@
       melpaBuild {
         pname = "flycheck-dtrace";
         ename = "flycheck-dtrace";
-        version = "20180126.1135";
+        version = "20180903.930";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "flycheck-dtrace";
-          rev = "c418a96cf1dc3bafc17b9bcd23d5097dcf334c92";
-          sha256 = "00f7p895nfy9qr1hbcz7h8h8514rcv6ikrxl1pm4nvd045jicfyb";
+          rev = "951fab3a15c11d92b9fac1ea4791a80dfe034a00";
+          sha256 = "1qkzir3lzz4lc5kn55qb52cm5y7iy8w1ljq6xxzcjxfbk9980y0y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe/recipes/flycheck-dtrace";
@@ -32153,12 +32511,12 @@
       melpaBuild {
         pname = "flycheck-elixir";
         ename = "flycheck-elixir";
-        version = "20171122.507";
+        version = "20180809.2342";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-elixir";
-          rev = "1f19a739cdb93851c6b01b1e188e215d035cd4a1";
-          sha256 = "01820hm6231z3zaq97jmmvdrpnyp38cb0m6xms5ihq2r1fqx8z2c";
+          rev = "11998d7e3e63a33453e934d25b3673f7c558e579";
+          sha256 = "1hdbg0hvb6hwzjma9mxy0h888c8j2z4g38gwixrdixzbw5727r75";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da2ab73ab1426f71ea2b2bea2b418941856b3454/recipes/flycheck-elixir";
@@ -32198,6 +32556,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-elsa = callPackage ({ cask
+                                 , emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , seq }:
+      melpaBuild {
+        pname = "flycheck-elsa";
+        ename = "flycheck-elsa";
+        version = "20180823.726";
+        src = fetchFromGitHub {
+          owner = "emacs-elsa";
+          repo = "flycheck-elsa";
+          rev = "74afd455e47b917899c81313392ce414042f252c";
+          sha256 = "1q81g96kg243y0ihz8vmvdzycyabzm3x1kd97qpj89a4vcka26id";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2a15c49d2fc800a6b69304edd6dbad90aaa5053f/recipes/flycheck-elsa";
+          sha256 = "07a07hmy7cibm7263dw4x8kkv17g5hby8isaks7n2814ifblf30r";
+          name = "recipe";
+        };
+        packageRequires = [ cask emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-elsa";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-flawfinder = callPackage ({ emacs
                                        , fetchFromGitHub
                                        , fetchurl
@@ -32234,12 +32620,12 @@
       melpaBuild {
         pname = "flycheck-flow";
         ename = "flycheck-flow";
-        version = "20180216.1156";
+        version = "20180801.542";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-flow";
-          rev = "8173accf0e389f7ba0936d399da84839a7f887af";
-          sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1";
+          rev = "5d42270c798918c05c5e983e774063930bd87838";
+          sha256 = "009nlyyb5z09d8474fhfwi0imia2igiq1adxa6ibqrz9km867b8q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -32360,6 +32746,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-grammalecte = callPackage ({ emacs
+                                        , fetchgit
+                                        , fetchurl
+                                        , flycheck
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-grammalecte";
+        ename = "flycheck-grammalecte";
+        version = "20180723.204";
+        src = fetchgit {
+          url = "https://git.deparis.io/flycheck-grammalecte/";
+          rev = "4f5937c58f895a62ccb3466af20b26a61ef9071c";
+          sha256 = "15jpck7h2bn6idfzizjw79nfza3lm9dj03v0r44pnm1ryx7l89w7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte";
+          sha256 = "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-grammalecte";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-haskell = callPackage ({ dash
                                     , emacs
                                     , fetchFromGitHub
@@ -32427,12 +32839,12 @@
       melpaBuild {
         pname = "flycheck-inline";
         ename = "flycheck-inline";
-        version = "20180529.614";
+        version = "20180821.149";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-inline";
-          rev = "816d37bd7f7034502a7569515df1898a3bcd155c";
-          sha256 = "12lsf5f6866jgj5s40gcsg377gzvwni8bla6bx4l5jjn36lf1nvi";
+          rev = "259ad47ac4ab42b7cc5c41f6d80b9888941507c6";
+          sha256 = "0cfk1ji1sn3ikhk8jvs2bhdhpd60dw7162112s2zp6yrbr9d6lkw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9ecc3a4696d2b3b0f0b8b1ca6e5285380ac046a/recipes/flycheck-inline";
@@ -32508,12 +32920,12 @@
       melpaBuild {
         pname = "flycheck-joker";
         ename = "flycheck-joker";
-        version = "20180712.2102";
+        version = "20180912.2204";
         src = fetchFromGitHub {
           owner = "candid82";
           repo = "flycheck-joker";
-          rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d";
-          sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq";
+          rev = "51e99e697761ee8dab863930910abdba7607c1bd";
+          sha256 = "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -32587,12 +32999,12 @@
       melpaBuild {
         pname = "flycheck-ledger";
         ename = "flycheck-ledger";
-        version = "20180125.31";
+        version = "20180818.2021";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-ledger";
-          rev = "044f28d126d1bce55c4b78ba6d5bc92e1f6cfd69";
-          sha256 = "1k14jwz79mjsm0cfig5lc0byfrhvm495wrkybdl36b56q4qhxf58";
+          rev = "8d7f52a4c7f80ca396ef0fc6c7d8e9f005778dfc";
+          sha256 = "0m5zhyzrh4lx7vzwdgdwcfkipdvi3y8kavhckbd7vd9zwx539ij1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
@@ -32748,12 +33160,12 @@
       melpaBuild {
         pname = "flycheck-mypy";
         ename = "flycheck-mypy";
-        version = "20180518.4";
+        version = "20180907.316";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-mypy";
-          rev = "043e8bba13a6d5e760cde8374c8f77d90946a1f5";
-          sha256 = "0rcw8nxs5n9l8gdgs1yy240qnbad60j1m15xdy35s99nq7x1ksvn";
+          rev = "6f99166f5229c7b4298cff1818b7eaece1c9c8bd";
+          sha256 = "06rdwjljhficbdf74qzlxsy02xhd8msp79fx75nwbxbd84q6dr5w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1f5ad8263ee33b8950ff68e39dca5b1f1748c1b/recipes/flycheck-mypy";
@@ -32903,6 +33315,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-pact = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , flycheck
+                                 , lib
+                                 , melpaBuild
+                                 , pact-mode }:
+      melpaBuild {
+        pname = "flycheck-pact";
+        ename = "flycheck-pact";
+        version = "20180830.846";
+        src = fetchFromGitHub {
+          owner = "kadena-io";
+          repo = "flycheck-pact";
+          rev = "45fae1ceeface5ab15fc63a9143440060f8d09c0";
+          sha256 = "1zvhffrl2xcxmmfv8qavm2ig8zvpax8g7azxbdbbjq3nc6b6fv7b";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d0cf6f4a6c7c156aa0edc903521dca82e312621c/recipes/flycheck-pact";
+          sha256 = "1nxmh6p2id4cxzs7jxdrk88g8qmvk33nbzmrqhm7962iqizlvnrw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck pact-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-pact";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-perl6 = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
@@ -32940,12 +33380,12 @@
       melpaBuild {
         pname = "flycheck-phpstan";
         ename = "flycheck-phpstan";
-        version = "20180430.358";
+        version = "20180801.1041";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpstan.el";
-          rev = "3653f2a316f4199cbd3238e984eea2325e2618d5";
-          sha256 = "1dyba8hpr16nsdv1i45pl3w97728w7p8vl9gf5gvd18xcll4848d";
+          rev = "afd63d6183f75536c01e456c9cb16b65d0f70a95";
+          sha256 = "0dak9nc334dlcq4ss21palnafaysnxnrh8qws2shwvbwnq6kzz4j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6/recipes/flycheck-phpstan";
@@ -33188,12 +33628,12 @@
       melpaBuild {
         pname = "flycheck-pycheckers";
         ename = "flycheck-pycheckers";
-        version = "20180717.2300";
+        version = "20180820.1344";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "f85eb69318729689d09f69e955d800ddc6124d6a";
-          sha256 = "0dw342g27mhnfpv83ni7gjx47issmk94hinrakjaf91vm3bjwaag";
+          rev = "427e54a783174004202b6397b1e060c4b0a6989f";
+          sha256 = "0071qvqqyaniwc7xd8wq7vg17rx8w02k9nb6ji3fjhv5ywpk9w07";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -33240,12 +33680,12 @@
       melpaBuild {
         pname = "flycheck-rebar3";
         ename = "flycheck-rebar3";
-        version = "20161030.615";
+        version = "20180806.1403";
         src = fetchFromGitHub {
           owner = "joedevivo";
           repo = "flycheck-rebar3";
-          rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6";
-          sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3";
+          rev = "3cca1268c54643204b5bae52e3f0bf5bc921018c";
+          sha256 = "19jfzswli21zqffig0946y0zv9ringhsgg6g6av1rnpq716fhp6h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3";
@@ -33298,12 +33738,12 @@
       melpaBuild {
         pname = "flycheck-rust";
         ename = "flycheck-rust";
-        version = "20180327.945";
+        version = "20180904.417";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-rust";
-          rev = "a722204cff5bffe26b8f127c7003cfc9ed00e34b";
-          sha256 = "1z0zkf4dxkma6qz83ysyhbfvr0sg2cwxvsapc9j9l1x9nskybv2g";
+          rev = "f1220ccd9acbdb2556765f49f2f3dcb00dca2970";
+          sha256 = "1m5ic4xapyansyifs8rrjdw2l9l4wnvmc51aflflmj7c13f0lvwr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
@@ -33435,12 +33875,12 @@
       melpaBuild {
         pname = "flycheck-swiftlint";
         ename = "flycheck-swiftlint";
-        version = "20180312.1656";
+        version = "20180829.2040";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "flycheck-swiftlint";
-          rev = "8496fd4499ef5c0e0cfeb65f4d76c6f9dd8991f3";
-          sha256 = "0d2s9brccv7lgw2vnglhhaq29mxb3pxiclhx4w28gb76x8r2rsf7";
+          rev = "65101873c4c9f8e7eac9471188b161eeddda1555";
+          sha256 = "007n0jv5z159pw5bcqcycv6h31rl0z16m22yrhqi94yc14jlw5ma";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e2a979726507e974a0a19dfc2ca6884157025be/recipes/flycheck-swiftlint";
@@ -33563,6 +34003,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-vdm = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild
+                                , vdm-mode }:
+      melpaBuild {
+        pname = "flycheck-vdm";
+        ename = "flycheck-vdm";
+        version = "20180830.2352";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "0c083ee4848ea5d78de7894a4a0722d6630839c9";
+          sha256 = "175zlxxjxl7zp80hm2hz5xw7gy3qh0hz3fdvqy8v3n0vz4zvqx1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/flycheck-vdm";
+          sha256 = "15ng1l8gfp8iz50yb5d39dy57763gd2x8j6z6rz0byiykgxhl9zg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck vdm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-vdm";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-xcode = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
@@ -34059,6 +34527,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake-ktlint = callPackage ({ emacs
+                                  , fetchFromGitHub
+                                  , fetchurl
+                                  , lib
+                                  , melpaBuild }:
+      melpaBuild {
+        pname = "flymake-ktlint";
+        ename = "flymake-ktlint";
+        version = "20180830.2046";
+        src = fetchFromGitHub {
+          owner = "jojojames";
+          repo = "flymake-ktlint";
+          rev = "bea8bf350802c06756efd4e6dfba65f31dc41d78";
+          sha256 = "0sycdd3har8rxg8jm55nl25g8f41y3rsnsn4sblb7pbz5x5i6ixc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7b2e630e5e16044fb8ffe251f4fa58fb8f3d6bb9/recipes/flymake-ktlint";
+          sha256 = "07v90pkhmrz59m6hf1lzxq4h3kk4qblihw4qgz5phbj4l5pahivd";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flymake-ktlint";
+          license = lib.licenses.free;
+        };
+      }) {};
     flymake-less = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , flymake-easy
@@ -34121,14 +34615,14 @@
         ename = "flymake-perlcritic";
         version = "20120328.114";
         src = fetchFromGitHub {
-          owner = "illusori";
+          owner = "flymake";
           repo = "emacs-flymake-perlcritic";
           rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8";
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic";
-          sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/flymake-perlcritic";
+          sha256 = "1i0bc81cby2nsala2mhghzv7clhbf1gpp54vdxiq2wdanqy25vmk";
           name = "recipe";
         };
         packageRequires = [ flymake ];
@@ -34345,6 +34839,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flymake-shellcheck = callPackage ({ emacs
+                                      , fetchFromGitHub
+                                      , fetchurl
+                                      , lib
+                                      , melpaBuild }:
+      melpaBuild {
+        pname = "flymake-shellcheck";
+        ename = "flymake-shellcheck";
+        version = "20180830.445";
+        src = fetchFromGitHub {
+          owner = "federicotdn";
+          repo = "flymake-shellcheck";
+          rev = "d56607235bb2b0a08920c326702fea0724f118a7";
+          sha256 = "14jb789sn9najrkvwp5v3pjfq5va192wmc5zf86ni0am2856z3pl";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8dccb106ff6c9cb4b14440be9026c3e427dddff2/recipes/flymake-shellcheck";
+          sha256 = "1gvm4sh1sga3gkkg0zi7ynvp9b09sx16cclj2qzawmgfv2c111vy";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/flymake-shellcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
     flymake-solidity = callPackage ({ fetchFromGitHub
                                     , fetchurl
                                     , flymake-easy
@@ -34481,12 +35001,12 @@
       melpaBuild {
         pname = "flyspell-correct";
         ename = "flyspell-correct";
-        version = "20180427.1135";
+        version = "20180915.654";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "e47b83e5efb524dfab5a6f92304b319fa6376ae0";
-          sha256 = "1w1idyryxq496i1plx8xjyfidakyncx3sa9j3ik7x148ywaf8kwm";
+          rev = "8aae6cf10527651b4a07b0b5f33257713d8f4211";
+          sha256 = "1xvnwd7pn5f6kyv8p6rc84414yvhg6qwfddwxbqyyb13d48haxvd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -34824,12 +35344,12 @@
       melpaBuild {
         pname = "fold-this";
         ename = "fold-this";
-        version = "20180224.40";
+        version = "20180828.636";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "fold-this.el";
-          rev = "4fb509a4176e950d083a5321ad62742f2e9bcb7b";
-          sha256 = "1csazxx6wnnriklbrdqxmf7nc67gqb7c5zppr797bk4j4calskgf";
+          rev = "49bdb7fe6a8f207afb1f05382372674a7c876ba8";
+          sha256 = "1h9afb019y1c488c2s6w7nas32b89lngrl7f90rd8i9ynm5lbvr0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9853fcb99bd8717c77fa2b3bafb6e85d0d5d491c/recipes/fold-this";
@@ -35131,6 +35651,7 @@
         };
       }) {};
     format-all = callPackage ({ cl-lib ? null
+                              , emacs
                               , fetchFromGitHub
                               , fetchurl
                               , lib
@@ -35138,19 +35659,19 @@
       melpaBuild {
         pname = "format-all";
         ename = "format-all";
-        version = "20180722.159";
+        version = "20180902.458";
         src = fetchFromGitHub {
           owner = "lassik";
           repo = "emacs-format-all-the-code";
-          rev = "6b0bd2fadb8f672e93bc58f2de94be97f5a1b6d6";
-          sha256 = "1y2y2ank4bll0h4bsd0d60aqq5hlylna9zvg18q3n68isqagn7zh";
+          rev = "d4a832c2fb6d0db76dff14342d001e69296f9316";
+          sha256 = "1713aprpxhf9wp644rhmg3y8hdk6f557icx5hb5gmwkcp5hn03yx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f53143ebd42ef5be793b86d50b23f0a57617d6cc/recipes/format-all";
           sha256 = "1kmnv8ypxvgm3p79cc1wk8032fh7bl1pripys180vw89r2748qs9";
           name = "recipe";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/format-all";
           license = lib.licenses.free;
@@ -35268,12 +35789,12 @@
       melpaBuild {
         pname = "fountain-mode";
         ename = "fountain-mode";
-        version = "20180715.145";
+        version = "20180911.534";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "3f253598f2eb6c5eec71af967978a3ecf890240d";
-          sha256 = "1m3fq5mg87v48y0v9a5mlxjs49yqxkb718r6ympbihzknjh2a0qq";
+          rev = "55e8b6ac6e95a1478cf5fe9479d92b30c5ec71fd";
+          sha256 = "06hj78hqfcfp12pkx74yiqlia6db0qaadylz75vv5yf0iklbggkf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -35455,12 +35976,12 @@
       melpaBuild {
         pname = "frameshot";
         ename = "frameshot";
-        version = "20180228.408";
+        version = "20180723.1428";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "frameshot";
-          rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
-          sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
+          rev = "917efdd678e397aa01efa657e3488d34445eca90";
+          sha256 = "1c19magazz78jd65r7c58nhp0bcyfysrlvf4jbfgrdd9bf7xlkx6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
@@ -35682,12 +36203,12 @@
       melpaBuild {
         pname = "fstar-mode";
         ename = "fstar-mode";
-        version = "20180713.1329";
+        version = "20180814.1244";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "a42763cdd81d6520651dfaad7a7e8c7388bad54c";
-          sha256 = "10nbzm22p9pgsh6zgc9fjy3v1i5vw8877g8f4x3fi8lvpv1ynwps";
+          rev = "20633d42734ff54d662d8da618dc5aa5e20c743f";
+          sha256 = "02xmz181ncfnbdbsjphdysdi1ia8i9ynk0pqfk8flhfkxx5karsv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -35897,12 +36418,12 @@
       melpaBuild {
         pname = "futhark-mode";
         ename = "futhark-mode";
-        version = "20180619.949";
+        version = "20180910.122";
         src = fetchFromGitHub {
           owner = "diku-dk";
           repo = "futhark-mode";
-          rev = "f834d03aeef2230315e541646e375e6c38a6a10c";
-          sha256 = "0ma8v56lv8bbb5159wg2nv286s5nn3jnjfy8kmrx751sw7jmzr2l";
+          rev = "ecfd751e243893445bc240d083e269a8ecf08231";
+          sha256 = "0jas5nkanvai6mjh38ljbx3xgskgi6kdi86szlf980rabi8q5lmn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97210774b450b7611d2bfdf36e04a425835d86b9/recipes/futhark-mode";
@@ -36153,11 +36674,11 @@
       melpaBuild {
         pname = "gap-mode";
         ename = "gap-mode";
-        version = "20160204.736";
+        version = "20180808.2145";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/gap-mode";
-          rev = "617eff4ff846";
-          sha256 = "08dx8ijivhsfmqkxn33121qcjd6nckpn0jdlh0lhx4z4zg8x37bl";
+          rev = "00f251070b10";
+          sha256 = "0rk5smpzpdqzpmb5cp2l40042i51z3f40fkd3hma40id0ql2gy2w";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/gap-mode";
@@ -36336,12 +36857,12 @@
       melpaBuild {
         pname = "general";
         ename = "general";
-        version = "20180628.1112";
+        version = "20180901.852";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "e690ef9e706f7eea071357520709ef5407a42159";
-          sha256 = "1kgd0v9lgwsxa1p7n3cgsd2f62wi86hcjslb0vf96b9l1n1wjwdl";
+          rev = "f1feeb8241bc724ced9952f328d6694329178cf1";
+          sha256 = "05qw2g01pv6a0i58khs8kwwc3gy40ngrpis8y4rh81ghgp1i2j71";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -36444,12 +36965,12 @@
       melpaBuild {
         pname = "gf";
         ename = "gf";
-        version = "20180606.1455";
+        version = "20180822.1325";
         src = fetchFromGitHub {
           owner = "grammaticalframework";
           repo = "gf-emacs-mode";
-          rev = "41070ecd1cd64fa52cf299dc09a5ea19aca4cf05";
-          sha256 = "090jy6p94syvf20b61l2jnm7m5pv6d2qxfjhr1wm0bg1wkvyw50c";
+          rev = "e8e55584b0a473922c58cbb4860306a84c3336e5";
+          sha256 = "09fqax9dr40rj8f6b4z7lkjrs305gnkm2f4q314f4k7yxnz3c055";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf";
@@ -36487,8 +37008,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    ggtags = callPackage ({ cl-lib ? null
-                          , emacs
+    ggtags = callPackage ({ emacs
                           , fetchFromGitHub
                           , fetchurl
                           , lib
@@ -36496,19 +37016,19 @@
       melpaBuild {
         pname = "ggtags";
         ename = "ggtags";
-        version = "20180418.657";
+        version = "20180725.1013";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "bf263afd377992f7c5d9e8f727bd381e74feb327";
-          sha256 = "182wqrkvk4asa483sb2zcym5np3z4h7l7ncpcrfgcs80jqbcaywx";
+          rev = "c737181c16a673d36e81b4c8ec4f389d630ec49d";
+          sha256 = "0analdydfnyvrv58062a6dgkp985zin4blyl0yygarj5drskn0k0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ggtags";
           license = lib.licenses.free;
@@ -36724,28 +37244,31 @@
           license = lib.licenses.free;
         };
       }) {};
-    ghub = callPackage ({ emacs
+    ghub = callPackage ({ dash
+                        , emacs
                         , fetchFromGitHub
                         , fetchurl
+                        , graphql
                         , let-alist
                         , lib
-                        , melpaBuild }:
+                        , melpaBuild
+                        , treepy }:
       melpaBuild {
         pname = "ghub";
         ename = "ghub";
-        version = "20180715.1159";
+        version = "20180914.102";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "4202c1f389a5ad0b7841be0ac8ab3cc3b6b77cb6";
-          sha256 = "1adi6wsfkhx46x28fajjf45jw60hkqqgg9y7wdzzq0a2vkp3hwya";
+          rev = "440a563d65ae1f15ac8bc5e100e40968450d16fd";
+          sha256 = "06kj524cv5z73q4xasha1z02z26d04yxgdb4il7bfai1rfrffc8z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
-          sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/ghub";
+          sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
           name = "recipe";
         };
-        packageRequires = [ emacs let-alist ];
+        packageRequires = [ dash emacs graphql let-alist treepy ];
         meta = {
           homepage = "https://melpa.org/#/ghub";
           license = lib.licenses.free;
@@ -36787,12 +37310,12 @@
       melpaBuild {
         pname = "gif-screencast";
         ename = "gif-screencast";
-        version = "20180616.1230";
+        version = "20180827.135";
         src = fetchFromGitLab {
           owner = "Ambrevar";
           repo = "emacs-gif-screencast";
-          rev = "12b25442b97b84abae74ecb5190a9d14ff7cfe5a";
-          sha256 = "0p7gfccvrv2267abldsyjdqbj4rg25wdy6vmcygiggl3lk0wrnwz";
+          rev = "62e69ea464e87f1f7791d95a4fbbe9b70a84668a";
+          sha256 = "1q02mk4pzaxdl8sf191iwxz481gaqfc9nvd4v95ggjyp3ahq1y4n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6d17ca0213ba5ef9dce92002e281e6f08c3492be/recipes/gif-screencast";
@@ -37050,12 +37573,12 @@
       melpaBuild {
         pname = "git-commit";
         ename = "git-commit";
-        version = "20180713.1444";
+        version = "20180912.312";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "d7412da3277d6ec5810e7ac20d64eb6c5cc0c30b";
-          sha256 = "02xfxp6bsp9g0sz9kaykibygqxndgqa59w0a6flma4mkkgwsid9c";
+          rev = "d913880e165b162420347cbcf10a40dc21094248";
+          sha256 = "1ad3al4qkxrwl6nc40ql6r14axfypzlcr3fnp68csfbd5zig595g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -37581,12 +38104,12 @@
       melpaBuild {
         pname = "github-elpa";
         ename = "github-elpa";
-        version = "20180704.2247";
+        version = "20180831.111";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "github-elpa";
-          rev = "abe92cc25c9d75dab4f8bcf0eccafdd8a26774d6";
-          sha256 = "0rx61fsvl99r2p3f3y7rgwf7m084lqi0xsdz0w8cml67sd5qm54g";
+          rev = "cbde5bc239687e07347cecf46ba5aa31948ebe1d";
+          sha256 = "1d7a9mp2kpcw1gvn9j3k8p0896i07m53xkbcx1vbg013w8kpwpak";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa";
@@ -37769,13 +38292,13 @@
         version = "20170630.1501";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
-          repo = "emacs-github-theme";
+          repo = "GitHub-Theme-for-Emacs";
           rev = "29f00a51d949a248a5f6355a97131e216747c797";
           sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
-          sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/github-theme";
+          sha256 = "132jahd8vvhzhhkm71dzq6x46wmaakbbxg9s7r9779bfwbrms9j9";
           name = "recipe";
         };
         packageRequires = [];
@@ -38027,28 +38550,26 @@
           license = lib.licenses.free;
         };
       }) {};
-    glab = callPackage ({ emacs
-                        , fetchFromGitHub
+    glab = callPackage ({ fetchFromGitHub
                         , fetchurl
-                        , ghub
                         , lib
                         , melpaBuild }:
       melpaBuild {
         pname = "glab";
         ename = "glab";
-        version = "20180419.308";
+        version = "20180821.851";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "4831933da059ee084a16016558b9ccd8c581a8ff";
-          sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y";
+          rev = "d75ba1bd8843f53ae3e37b206187b3b97d9f3540";
+          sha256 = "0h9v8l1v9wa5sxng16qqlpgqpdi6an7fn83frrk4lfxf555mm2aq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
-          sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/glab";
+          sha256 = "0kyr1znf82qi15r6iha6dbyhmfzghx969hd364rsvkly8ry8pk5m";
           name = "recipe";
         };
-        packageRequires = [ emacs ghub ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/glab";
           license = lib.licenses.free;
@@ -38905,12 +39426,12 @@
       melpaBuild {
         pname = "go-projectile";
         ename = "go-projectile";
-        version = "20170302.1705";
+        version = "20180808.1122";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "go-projectile";
-          rev = "4c449eae696d4e3a15078c336c98ea779da227ab";
-          sha256 = "1cyvd2va0vgbh7im5rhapyd66ql469cl2hswg946qj961kdxc7s9";
+          rev = "11989b104a4bef406bf0e7b31ef6608aa6057cf7";
+          sha256 = "1w61jxmwardmv383xms4rjfk6czdzr9j8qbpbmaw1lj0b8lbkvgs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile";
@@ -39984,6 +40505,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    graphql = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "graphql";
+        ename = "graphql";
+        version = "20180911.1731";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "graphql.el";
+          rev = "672dd9ebd7e67d8089388b0c484cd650e76565f3";
+          sha256 = "0sp0skc1rnhi39szfbq1i99pdgd3bhn4c15cff05iqhjy2d4hniw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e801ae56f11b64a5a3e52cf1a6c152940ab8c97/recipes/graphql";
+          sha256 = "139fng2psn535ymqa7c6hm1r7ja1gs5mdvb487jj6fh0bl9wq8la";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/graphql";
+          license = lib.licenses.free;
+        };
+      }) {};
     graphql-mode = callPackage ({ emacs
                                 , fetchFromGitHub
                                 , fetchurl
@@ -40168,12 +40715,12 @@
       melpaBuild {
         pname = "green-screen-theme";
         ename = "green-screen-theme";
-        version = "20171130.234";
+        version = "20180816.802";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "green-screen-emacs";
-          rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
-          sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
+          rev = "774e8f6c033786406267f71ec07319d906a30b75";
+          sha256 = "0f12lqgfi1vlhq8p5ia04vlmvmyb4f40q7dm2nbh5y8r6k89hisg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -40379,12 +40926,12 @@
       melpaBuild {
         pname = "groovy-mode";
         ename = "groovy-mode";
-        version = "20180601.738";
+        version = "20180809.2307";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "a5afa3ac0a23c1bdebea014d06e5c30dde56ee8b";
-          sha256 = "04jciwr7614cw3dl9hfiypmqc28njbrin6j3g5r27xn1f91sd5ni";
+          rev = "c32f82dd3a11be5871a71e8ffac55022bbbc5cfb";
+          sha256 = "1jh197yzkfdviiq09hihhn0ycxfn7g9hk4a376a7ybv8q7wkal0m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -40646,12 +41193,12 @@
       melpaBuild {
         pname = "guix";
         ename = "guix";
-        version = "20180705.315";
+        version = "20180914.1413";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "f220e82b2dd94fb349ae37665912a42196d53975";
-          sha256 = "12k2qib7qbxxkidsnw2a44jakw0lgbz8kksgxfbqmaryzi35wh5v";
+          rev = "0111d16547d730fda81374714267775b06897501";
+          sha256 = "0agh5nyiwc5vvwgqhshffj0vds1505q67xr2fnfpd2d21l04bki2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -40773,12 +41320,12 @@
       melpaBuild {
         pname = "habamax-theme";
         ename = "habamax-theme";
-        version = "20180702.958";
+        version = "20180820.219";
         src = fetchFromGitHub {
           owner = "habamax";
           repo = "habamax-theme";
-          rev = "b40e3e7c637e67c8f9164b0db9e75c0ec4eb6a0f";
-          sha256 = "0fgvnfqgg6gqrwlb8yibs4nybvskd6awxqdpj4yy9jfqibggppld";
+          rev = "23a87d831f35ec0a187a2bd9aa8ffbe06e671f8e";
+          sha256 = "160jbd024f6f5nfpahddinvdlpzi0xc1bbi5dymp8nmi48fppp2c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/77386484ad0b31c2818fae52cd312821c4632cb8/recipes/habamax-theme";
@@ -40818,6 +41365,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    hack-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "hack-mode";
+        ename = "hack-mode";
+        version = "20180914.615";
+        src = fetchFromGitHub {
+          owner = "hhvm";
+          repo = "hack-mode";
+          rev = "306bc45412665b74c05267a3367f3ae7b03604db";
+          sha256 = "0q2n8nfll6480xhz7wap88xgxbxrzwx1qpg1kinfw796a3l6vy2s";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/27e238e5d2aaca810fd3fb6836ca49c9fa07cc87/recipes/hack-mode";
+          sha256 = "1zs7p6fczj526wz9kvyhmxqkgrkfkkrvm9ma4cg349sfpjpxwkbl";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hack-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     hack-time-mode = callPackage ({ emacs
                                   , fetchFromGitLab
                                   , fetchurl
@@ -40854,14 +41427,14 @@
         ename = "hacker-typer";
         version = "20170206.720";
         src = fetchFromGitHub {
-          owner = "therockmandolinist";
+          owner = "dieggsy";
           repo = "emacs-hacker-typer";
           rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
           sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
-          sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/hacker-typer";
+          sha256 = "0vf18hylhszvplam6c4yynr53zc3n816p9k36gywm6awwblfpyfb";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -40878,12 +41451,12 @@
       melpaBuild {
         pname = "hackernews";
         ename = "hackernews";
-        version = "20180220.419";
+        version = "20180902.2312";
         src = fetchFromGitHub {
           owner = "clarete";
           repo = "hackernews.el";
-          rev = "89077fdb98ab1e77459c7839decdf21b87f4341b";
-          sha256 = "11id6gp6mz97sm2izz6y47n3sphlibdb6nzvbkcxl7l7av53wxg7";
+          rev = "e14dcab09dccb8128198e83d42a75fc310da5329";
+          sha256 = "0z1jf8hvfb28dmjfm2sbxf6gg7v3gq9502b62nnsn4mdl1yk2p1d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -40905,14 +41478,14 @@
         ename = "hal-mode";
         version = "20160704.1046";
         src = fetchFromGitHub {
-          owner = "strahlex";
+          owner = "machinekoder";
           repo = "hal-mode";
           rev = "cd2f66f219ee520198d4586fb6b169cef7ad3f21";
           sha256 = "0xibwmngijq0wv9hkahs5nh02qj3ma0bkczl07hx8wnl6j27f0nj";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/955a4d94110bb2048d899a3d7671937e69d5ac79/recipes/hal-mode";
-          sha256 = "1b1hvlm80awbyjjs5d51v46hw8a2jfz8dv9r61h7vvwh9a8wpgk2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/hal-mode";
+          sha256 = "0nlan5f3llhn04p86a6l47dl9g83a51wzrchs2q8rvfcy4161nn4";
           name = "recipe";
         };
         packageRequires = [];
@@ -41294,12 +41867,12 @@
       melpaBuild {
         pname = "haskell-mode";
         ename = "haskell-mode";
-        version = "20180601.143";
+        version = "20180912.2048";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "dd0ea640fa449d021399a17db65e4d50d3f0f2a9";
-          sha256 = "0cc8mhjn4qhn3zs3x7azkjnvalg156b6h0n13b8wzlvyp9ka28yj";
+          rev = "d6c2666eacab9ddf3b88f2a31d5e6f2ca7e039a8";
+          sha256 = "09k3bjdlwz2far2s7r3li4cwf0l80jgcs11aybj31xyzzpr7fglm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -41662,12 +42235,12 @@
       melpaBuild {
         pname = "helm";
         ename = "helm";
-        version = "20180719.1206";
+        version = "20180905.2217";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "345842e1a36b8dfa23eb516e8a8cb64783505f6b";
-          sha256 = "0k8i2ay8mmqfxsfyg12mp2rg27h9xqbvvsfmd38xgc2ni4c1sd1f";
+          rev = "f4e0168b281e127b8ace87e5fc28cac4116d893d";
+          sha256 = "047s677kas4vpy4q709248i6kcrfbc97i6d93pvkip9xqb9pvybg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -41881,12 +42454,12 @@
       melpaBuild {
         pname = "helm-backup";
         ename = "helm-backup";
-        version = "20171204.2357";
+        version = "20180910.2314";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "a2c0fa16113e628500d6822c6605280b94e24038";
-          sha256 = "0j4dkz9za2zng43dx8ph688gl5973isxr89v5bw160c65n4lbc6w";
+          rev = "691fe542f38fc7c8cca409997f6a0ff5d76ad6c2";
+          sha256 = "0zi1md5f1haqcrclqfk4ilvr6hbm389kl3ajnyx230rq22vmb9ca";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -41940,12 +42513,12 @@
       melpaBuild {
         pname = "helm-bibtex";
         ename = "helm-bibtex";
-        version = "20180612.619";
+        version = "20180826.848";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5";
-          sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv";
+          rev = "b1a4f7d7c0dd3a258ee9f5cdc22b9a7847a2c4c6";
+          sha256 = "1mmm10jb6gng6s7fnkm96sz5pwfiiwqsi1lydi7g939pgl1rhbp6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -42433,12 +43006,12 @@
       melpaBuild {
         pname = "helm-company";
         ename = "helm-company";
-        version = "20180213.1405";
+        version = "20180828.912";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
           repo = "helm-company";
-          rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
-          sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
+          rev = "d3fc093a0e833b4dee6561c00d6df3d62aa50f3f";
+          sha256 = "1ciirsanhajdqm5iwl8k9ywf4jha1wdv4sc4d9kslyrfr9zn4q6k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -42460,12 +43033,12 @@
       melpaBuild {
         pname = "helm-core";
         ename = "helm-core";
-        version = "20180712.137";
+        version = "20180825.2215";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8de42d08f45a7052ed858132de43a76f933f58f7";
-          sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s";
+          rev = "40a3fd4f232dc3cc0f9fc9a00276c1ee95992a2d";
+          sha256 = "05x5liway8idqj3fd6dl2j0wibfmmsn2hggxz7jfyf3hkgs1z4lc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -42544,12 +43117,12 @@
       melpaBuild {
         pname = "helm-ctest";
         ename = "helm-ctest";
-        version = "20180125.2058";
+        version = "20180821.305";
         src = fetchFromGitHub {
           owner = "danlamanna";
           repo = "helm-ctest";
-          rev = "034927a922f40d9f5978786feed9bc9fe1f7655f";
-          sha256 = "0mbsxlc0isfzqlwvwqxyjkcdvpn9a6qsa29r7mqqihy0jkqi4473";
+          rev = "0c73689692a290f56080e95325c15362e90d529b";
+          sha256 = "143vyd64w3gycc68jcsji474nz2ggda58hgwq6hyiwb7s0gm1gd3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest";
@@ -42733,14 +43306,14 @@
         ename = "helm-dired-recent-dirs";
         version = "20131228.614";
         src = fetchFromGitHub {
-          owner = "akisute3";
+          owner = "yynozk";
           repo = "helm-dired-recent-dirs";
           rev = "3bcd125b44f5a707588ae3868777d91192351523";
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e24a676ec0c5804b80c1497606b32c4f2cbe9d/recipes/helm-dired-recent-dirs";
-          sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/helm-dired-recent-dirs";
+          sha256 = "1rm47if91hk6hi4xil9vb6rs415s5kvhwc6zkrmcvay9hiw9vrpw";
           name = "recipe";
         };
         packageRequires = [ helm ];
@@ -42899,12 +43472,12 @@
       melpaBuild {
         pname = "helm-eww";
         ename = "helm-eww";
-        version = "20180511.618";
+        version = "20180827.136";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-eww";
-          rev = "1a09f11b2376dec8237df40140f056be8a256ef0";
-          sha256 = "1kqdjhz2xiqw3bxjhfl9namhqrkbc2x70gcv6ljljya5hbkm62sm";
+          rev = "2bb7b644f953c45b5dd03298b556312440618026";
+          sha256 = "0cm6ja6jhkp0yniqj4r3mdzlwwm0ab7fczgzfd745sx1xy1jfiwk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/455a32c1d4642dc6752408c4f5055f5f4d1288eb/recipes/helm-eww";
@@ -42954,12 +43527,12 @@
       melpaBuild {
         pname = "helm-exwm";
         ename = "helm-exwm";
-        version = "20180703.919";
+        version = "20180827.137";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-exwm";
-          rev = "56266f261ba3b3d2753b374b50da20eb768c06f5";
-          sha256 = "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8";
+          rev = "e21c6ffabadd2fe8d6c7805b6027cc59a6f914e9";
+          sha256 = "11fyqk3h9cqynifc2zzqn0czrcj082wkdg1qhbj97nl4gcj787rl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm";
@@ -43601,12 +44174,12 @@
       melpaBuild {
         pname = "helm-hatena-bookmark";
         ename = "helm-hatena-bookmark";
-        version = "20170821.646";
+        version = "20180803.2246";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "d64833a5bbb4ae112ed176f6473232e526138572";
-          sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
+          rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e";
+          sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -43885,6 +44458,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-jira = callPackage ({ cl-lib ? null
+                             , emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , helm
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "helm-jira";
+        ename = "helm-jira";
+        version = "20180802.115";
+        src = fetchFromGitHub {
+          owner = "DeX3";
+          repo = "helm-jira";
+          rev = "75d6ed5bd7a041fa8c1adb21cbbbe57b5a7c7cc7";
+          sha256 = "08cczc4jnkdgvzs0s3wq2dqmhnsvyhpl65dydmi7pmayl7zg6jir";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b91a22c2117403e278a8116ea1180bed736ae1e3/recipes/helm-jira";
+          sha256 = "1fb2hk97zlr30gzln8b5x7xc3v119ki8kbiyh7shxnaqx7dy1ihs";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-jira";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-js-codemod = callPackage ({ emacs
                                    , fetchFromGitHub
                                    , fetchurl
@@ -44390,12 +44991,12 @@
       melpaBuild {
         pname = "helm-notmuch";
         ename = "helm-notmuch";
-        version = "20180521.407";
+        version = "20180730.1022";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-notmuch";
-          rev = "3176305a700c571e3bd6cdb37598708ad283ea73";
-          sha256 = "097h2v5dxlcyb5myk9ijbjnf1qfi52ivaqq56hf5yll3k7i9m65d";
+          rev = "9988eb0f787c82c779f2417b5613b9142a5b1c9b";
+          sha256 = "1jwhmlqlgzxj2zfz0za33vn8m2zrsmkmnq2vx5i1nry70p9h43b4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -44722,12 +45323,12 @@
       melpaBuild {
         pname = "helm-projectile";
         ename = "helm-projectile";
-        version = "20180722.1426";
+        version = "20180815.814";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "74349fc9132502af2b2e6ca9a51185ae4c9391b4";
-          sha256 = "0b24gypvbr1k7pks4fvniwa6smi4vflr5lgd3b82y2ah0b8x758m";
+          rev = "8a2dbc973548fac89356c11d70f7f474ea1367a5";
+          sha256 = "1lyka93dw4ndpw1qr1ixrng5lfdbz84yha5zl37imvkg68v6zi1x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -44783,8 +45384,8 @@
           sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt";
-          sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/helm-pt";
+          sha256 = "1pvipzjw9h668jkbwwkmphvp806fs9q4mb2v2bjxpb0f3kn2qk3n";
           name = "recipe";
         };
         packageRequires = [ helm ];
@@ -45483,12 +46084,12 @@
       melpaBuild {
         pname = "helm-system-packages";
         ename = "helm-system-packages";
-        version = "20180628.1131";
+        version = "20180911.1432";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-system-packages";
-          rev = "d510562f4ea21245496199dffb731d00152f8a2b";
-          sha256 = "0qzv395gm1i56f7rahx44b0v816mjk7fx52nwkwspdmixyzckzn2";
+          rev = "2b4636dc861ffe2c4a2025b67ab40460f85b9563";
+          sha256 = "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@@ -45592,12 +46193,12 @@
       melpaBuild {
         pname = "helm-tramp";
         ename = "helm-tramp";
-        version = "20180610.717";
+        version = "20180829.9";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "07d2f02166038c14052009f6fb9c2a163118e2cc";
-          sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f";
+          rev = "2148e21fd1a6c8a0b61678bd187ab5a7e387ae64";
+          sha256 = "1dinm85z5dz7ql75bh9hy4kmasfb05amnch32y6xscjdg6736w8j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -45872,12 +46473,12 @@
       melpaBuild {
         pname = "helpful";
         ename = "helpful";
-        version = "20180722.1557";
+        version = "20180912.1643";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "89668dd787248c7f0d35d4ab26f4a61f2efefdcb";
-          sha256 = "0fwgvpp6bchvr0fr1s1rb56dywbgw8345v8i3c9sp2xa3ahqmvri";
+          rev = "2565d0425297567ab176ab55670c7d0d108b1cb9";
+          sha256 = "1dxilg2dhm844hmf0b1mq4f3a1mn2lwzf5hgq9b98qk40vgdc50k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -45999,12 +46600,12 @@
       melpaBuild {
         pname = "hexo";
         ename = "hexo";
-        version = "20180223.1944";
+        version = "20180814.1919";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "ff21ab2d95e13666f36a243989ffea2027842191";
-          sha256 = "1g7i4vlpac7npx8c7f7i9w3f30is7q7zsxp0sqwp7x7rsa5783nn";
+          rev = "6bca18f911f6b2cd5c055ed73ddec98c385f9f86";
+          sha256 = "1zawz3nry832rhx80hyfqfs0gfw3hyrn96060zj3n75avx13rr8j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -46320,6 +46921,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    highlight-doxygen = callPackage ({ fetchFromGitHub
+                                     , fetchurl
+                                     , lib
+                                     , melpaBuild }:
+      melpaBuild {
+        pname = "highlight-doxygen";
+        ename = "highlight-doxygen";
+        version = "20180829.1118";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "highlight-doxygen";
+          rev = "53f2250018725fa19548e1771ee79fcc23641694";
+          sha256 = "0l6zh5cmp771h30i16bv3qvcq40pz9fxn3j7a8yx708vanb4d7kc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0153353e5abfa7513e74485049eaa384aaddbd58/recipes/highlight-doxygen";
+          sha256 = "0jkzf2mqn7y465c77vglaj3mr0cpfy2z810mywd1q21d71lsqmbl";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/highlight-doxygen";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-escape-sequences = callPackage ({ fetchFromGitHub
                                               , fetchurl
                                               , lib
@@ -46379,12 +47005,12 @@
       melpaBuild {
         pname = "highlight-indent-guides";
         ename = "highlight-indent-guides";
-        version = "20180529.1039";
+        version = "20180910.1027";
         src = fetchFromGitHub {
           owner = "DarthFennec";
           repo = "highlight-indent-guides";
-          rev = "88b9bc22efc2006cc7a650c81b95c210a96828ba";
-          sha256 = "0qv9010q1ylgh3l0yxlg7js6pxc8bkdxw20r6vrihglb5qf49m08";
+          rev = "e46356487d4b19144af3025cf16f1b1bd174a450";
+          sha256 = "1fm13mx7qcwr0jnwknaja4qg92l2yq1f303hx4fjqm609s5vm1hz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -47072,12 +47698,12 @@
       melpaBuild {
         pname = "hledger-mode";
         ename = "hledger-mode";
-        version = "20171201.1156";
+        version = "20180821.733";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "594ce27f898ba027cb7f326179ff7875072b03e0";
-          sha256 = "1jla31az52qygabd99m8ibq60f4almkbjlg1z63kz7zl98hfxnw7";
+          rev = "af51c0a7a0952c244e5c6bb818ab4ce3b9806609";
+          sha256 = "1j3bi47wfwa9d34yf6c2bmibmmags8q3vd3l2raqriagjf5gzwgb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -47244,6 +47870,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    home-end = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , keypress-multi-event
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "home-end";
+        ename = "home-end";
+        version = "20180817.155";
+        src = fetchFromGitHub {
+          owner = "Boruch-Baum";
+          repo = "emacs-home-end";
+          rev = "211914c5e7b25f35f02626575a9b10536f81ba1d";
+          sha256 = "1ppjm0sb4svarnqcv6j581sqnjjsps27ghx63759v9wkylqyi995";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f67c9cf33e0f11a9bd6e1521af86d180177111c4/recipes/home-end";
+          sha256 = "0xnpb0n4kd7b0m80g2a88ylfk5gbvkcgwb78nig98dmgjg48z2ly";
+          name = "recipe";
+        };
+        packageRequires = [ emacs keypress-multi-event ];
+        meta = {
+          homepage = "https://melpa.org/#/home-end";
+          license = lib.licenses.free;
+        };
+      }) {};
     homebrew-mode = callPackage ({ dash
                                  , emacs
                                  , fetchFromGitHub
@@ -47388,14 +48041,14 @@
         ename = "how-many-lines-in-project";
         version = "20140806.2142";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "how-many-lines-in-project";
           rev = "8a37ef885d004fe2ce231bfe05ed4867c6192d9b";
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/how-many-lines-in-project";
-          sha256 = "1dfh1ydpjbrawqpsj6kydvy8sz3rlwn4ma5cizfw5spd2gcmj1zb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/how-many-lines-in-project";
+          sha256 = "0rsl8f0ww2q5w87a8ddfjadw4mx4g2ahb62yb6xw7pzadmmz89f8";
           name = "recipe";
         };
         packageRequires = [];
@@ -48307,6 +48960,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    idle-highlight-in-visible-buffers-mode = callPackage ({ fetchFromGitHub
+                                                          , fetchurl
+                                                          , lib
+                                                          , melpaBuild }:
+      melpaBuild {
+        pname = "idle-highlight-in-visible-buffers-mode";
+        ename = "idle-highlight-in-visible-buffers-mode";
+        version = "20180810.2331";
+        src = fetchFromGitHub {
+          owner = "ignacy";
+          repo = "idle-highlight-in-visible-buffers-mode";
+          rev = "09bb527ff9b8e5ad3da15aa461d595f187b91172";
+          sha256 = "0yfxd2ffib7xjk9hbx3xhm6dap01a4649x333bfva0bpz26g55np";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b5a533be3b8dea556438d93ac48853dd3a9690f1/recipes/idle-highlight-in-visible-buffers-mode";
+          sha256 = "0kv06qlv1zp5hwaya0l90z6d5lhxcg69qac6x24ky6kf97vcdq72";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/idle-highlight-in-visible-buffers-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     idle-highlight-mode = callPackage ({ fetchFromGitHub
                                        , fetchurl
                                        , lib
@@ -48526,12 +49204,12 @@
       melpaBuild {
         pname = "ido-flex-with-migemo";
         ename = "ido-flex-with-migemo";
-        version = "20180323.456";
+        version = "20180817.740";
         src = fetchFromGitHub {
           owner = "ROCKTAKEY";
           repo = "ido-flex-with-migemo";
-          rev = "02fa776e44cb5756205aa574ebfd5c3f86f4cf3c";
-          sha256 = "0cyszakyj3kb2bdy6wb5y3m3w6y1fniakjlx92g8mvb6ycwkj2p3";
+          rev = "acced7c19f3ad505cc27cd95ab05593b8194d2e5";
+          sha256 = "186idn1385n342cdrbf9glkd9bw8vihyq51mlk642fmkiadv9hwd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo";
@@ -48966,12 +49644,12 @@
       melpaBuild {
         pname = "iedit";
         ename = "iedit";
-        version = "20180207.219";
+        version = "20180829.2231";
         src = fetchFromGitHub {
           owner = "victorhge";
           repo = "iedit";
-          rev = "412490db4387ad9d040bfb5854f25de4c40c2146";
-          sha256 = "1995j0yvvls5i7zfxw8zwfk05in8b0n82k05qdrap29v6nq2v4bx";
+          rev = "2ab2e8bea4b25cf7dcdabccffc81fcb9db7bbff9";
+          sha256 = "00pkdr0wj488r7k7r1hbazjhw3z5gzb5nw3j587mwmwc5z6d5n95";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -49402,12 +50080,12 @@
       melpaBuild {
         pname = "impatient-mode";
         ename = "impatient-mode";
-        version = "20180528.916";
+        version = "20180901.1607";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "impatient-mode";
-          rev = "96c068d5add95595dc5be42115d100cf99f908ba";
-          sha256 = "18fawpnqcm1yv7f83sz05pjihwydmafmccfmizyg0hlgayhj0izf";
+          rev = "b1146e87b4ee31ca7bfc17009e779e273137b081";
+          sha256 = "1065m5gyqihmk36im7k0din7dngbmq3a4p8v2qwfl8ybxrsfajvg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aaa64c4d43139075d77f4518de94bcbe475d21fc/recipes/impatient-mode";
@@ -49612,26 +50290,26 @@
                           , fetchFromGitHub
                           , fetchurl
                           , js2-mode
+                          , js2-refactor
                           , lib
                           , melpaBuild
-                          , seq
-                          , websocket }:
+                          , seq }:
       melpaBuild {
         pname = "indium";
         ename = "indium";
-        version = "20180521.1355";
+        version = "20180914.102";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "bc9ab60ded9af501fb4424359737cbff29cecfb1";
-          sha256 = "1f6asv98vsxkizb1nf37q6wacqdbqnqzk035j6sdsmj7p3plb3iy";
+          rev = "db2d38359358e225753066913ca2e0099acc2956";
+          sha256 = "1nlgrr147z31i6kak45n050rh48vnpj6ykd39vhv7if0q6jrsqir";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
           name = "recipe";
         };
-        packageRequires = [ company emacs js2-mode seq websocket ];
+        packageRequires = [ company emacs js2-mode js2-refactor seq ];
         meta = {
           homepage = "https://melpa.org/#/indium";
           license = lib.licenses.free;
@@ -49725,14 +50403,14 @@
         ename = "inf-mongo";
         version = "20180408.638";
         src = fetchFromGitHub {
-          owner = "tobiassvn";
+          owner = "endofunky";
           repo = "inf-mongo";
           rev = "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92";
           sha256 = "1m6skisj6r3fbxadpwwgf3a3934b2qvwb7zj975qksxq56ij0wkq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo";
-          sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/inf-mongo";
+          sha256 = "0f12yb3dgkjnpr4d36jwfnncqzz7kl3bnnrmjw7hv223p2ryzwpx";
           name = "recipe";
         };
         packageRequires = [];
@@ -49775,14 +50453,14 @@
         ename = "inferior-spim";
         version = "20160826.646";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "inferior-spim";
           rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c";
           sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim";
-          sha256 = "1bl29ww55vabgly84wdg18qq1md4vxzvsb6kvxymf6bpw55k313s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/inferior-spim";
+          sha256 = "0p0g8diqijxpgr21890lnmzkyl74sv42ddgpfpv51b9fwnqky524";
           name = "recipe";
         };
         packageRequires = [];
@@ -50336,12 +51014,12 @@
       melpaBuild {
         pname = "intero";
         ename = "intero";
-        version = "20180703.18";
+        version = "20180806.1445";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "60e2e3f76f647b20d9de8418f9576ea157e21864";
-          sha256 = "0srim6q3p749xpqp28c6zfxf0aj0d87jdc1smn62wc37fxkf1wgq";
+          rev = "0eec1536a0b051d1628895205c273d498385c7a7";
+          sha256 = "0cr9z1inn8sjqs6lh5shwfdxqkvrr52fjmrs4y5fi9s96hmyx07l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -50619,12 +51297,12 @@
       melpaBuild {
         pname = "ipython-shell-send";
         ename = "ipython-shell-send";
-        version = "20171212.318";
+        version = "20180909.2146";
         src = fetchFromGitHub {
           owner = "jackkamm";
           repo = "ipython-shell-send-el";
-          rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
-          sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+          rev = "ff944b436db381e6772a26c09b0b20a097eb323e";
+          sha256 = "14s6hxnkv7r3idzj7s6vnvifpc8prykzpm6nhb6149yymal4hjkc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
@@ -50869,6 +51547,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    isolate = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "isolate";
+        ename = "isolate";
+        version = "20180902.1237";
+        src = fetchFromGitHub {
+          owner = "casouri";
+          repo = "isolate";
+          rev = "ec44bcb44d0332111d76d697deb6699c4ab2a91d";
+          sha256 = "1f6dfj974ss0wy78phkjkk8h81qf5lqdnijfrmlk1cf2i2wj5sf3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c8091f8d72c24a103f6dcaadc18bbec745c1c3d3/recipes/isolate";
+          sha256 = "1ldyvw01nq2ynxaaqmw9ihk9kwfss9rqpaydn9f41bqj15xrypjc";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/isolate";
+          license = lib.licenses.free;
+        };
+      }) {};
     isortify = callPackage ({ emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -51088,12 +51792,12 @@
       melpaBuild {
         pname = "ivy";
         ename = "ivy";
-        version = "20180719.1037";
+        version = "20180911.1001";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "31e18fd15780c5f6eedbe3d6a14f86aade673d01";
-          sha256 = "0xv9ddgq218xy68bbf7d8l243g932viwlqmlk04jmalk3qyv4hj9";
+          rev = "41bd2486b174f0feff953722d3203a086d8e537e";
+          sha256 = "0jgxi3vznfj7apzp8w74blmnfj0rhhisz3h823r6rg1zj8c31gy3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -51120,12 +51824,12 @@
       melpaBuild {
         pname = "ivy-bibtex";
         ename = "ivy-bibtex";
-        version = "20180612.619";
+        version = "20180826.848";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "21f802aaf5b78dec18b72601dd8276c5244e39f5";
-          sha256 = "13jg728v8k227p68ngiwknlygzqdvasg6n9ax1a2xgjbx3di12vv";
+          rev = "b1a4f7d7c0dd3a258ee9f5cdc22b9a7847a2c4c6";
+          sha256 = "1mmm10jb6gng6s7fnkm96sz5pwfiiwqsi1lydi7g939pgl1rhbp6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -51456,12 +52160,12 @@
       melpaBuild {
         pname = "ivy-posframe";
         ename = "ivy-posframe";
-        version = "20180707.2016";
+        version = "20180817.2124";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ivy-posframe";
-          rev = "ff2578a044dbe3ba5711ed727cc778b5aa108676";
-          sha256 = "0nphklyn3czr5zvdl5m31fc3sc80mn0izdmmxnq9cj7hz8fc61ch";
+          rev = "b92aaa1c4695e2c6012cdbc1469b89e8c0dac4c2";
+          sha256 = "0hng52hcarpxry99cppl5sysf13rv536n22fqj8myh1b1657186a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe";
@@ -51484,12 +52188,12 @@
       melpaBuild {
         pname = "ivy-prescient";
         ename = "ivy-prescient";
-        version = "20180716.907";
+        version = "20180823.1838";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "a1464272d62f4054c314d1a3196f7b7673325752";
-          sha256 = "1w6xbyrk48mdv7iyspqkjv7ppp4r8rf1dispk08p8qig2d9crvl7";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
@@ -51539,12 +52243,12 @@
       melpaBuild {
         pname = "ivy-rich";
         ename = "ivy-rich";
-        version = "20180704.1845";
+        version = "20180826.2356";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "6575eb27510e841607b9e8cea87998a50fbc7be7";
-          sha256 = "0agnpkkwvhf3g0cpl1c8p5dj4cnlg3890pg73p4rvrv2i27ni2h4";
+          rev = "b40a76d5c2c29fcc035daa04a7125ffadbedc471";
+          sha256 = "0ayf3dwfhafcbqnckm65zy8nc1rv9ji939qfn53wbhxkrgqdicgz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -51601,8 +52305,8 @@
           sha256 = "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo";
-          sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ivy-todo";
+          sha256 = "06mn430zkisnqrmad81gn88pl7lz0m8rm1yvpngpakwwnhwm0q96";
           name = "recipe";
         };
         packageRequires = [ emacs ivy ];
@@ -51647,12 +52351,12 @@
       melpaBuild {
         pname = "ivy-xref";
         ename = "ivy-xref";
-        version = "20180701.2117";
+        version = "20180821.511";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "ivy-xref";
-          rev = "f8ab1eeab05f025a97ddf2f239862db14e3430e9";
-          sha256 = "0k6v3iamdchwnlpr1vbw1wjzc8hr2745qpvmwa74rsqgbj79p9pg";
+          rev = "61864f82e554121be0a26ba0a1d8f48b669dd5f0";
+          sha256 = "0cgl8lzw0rzswqsl8wk6b39bm2781mwvz3qwm06r2n3kjy7c79b4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref";
@@ -51665,7 +52369,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ivy-yasnippet = callPackage ({ dash
+    ivy-yasnippet = callPackage ({ cl-lib ? null
+                                 , dash
                                  , emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -51676,24 +52381,53 @@
       melpaBuild {
         pname = "ivy-yasnippet";
         ename = "ivy-yasnippet";
-        version = "20180620.2336";
+        version = "20180831.915";
         src = fetchFromGitHub {
           owner = "mkcms";
           repo = "ivy-yasnippet";
-          rev = "817c52a0f74dcd156c7f8c6433dfb6b32753428a";
-          sha256 = "1qx71alaj3bzis6qd3vs9jg52lkr871830rbpgxy1s7ks6qj79yd";
+          rev = "1d4ac765f5376263fa25b595b9cd7dcfb999cc52";
+          sha256 = "1850a0x64qc0kwc2qp1pb3v8l6dvdkyyzw1v01hfp3jnx3gxkw17";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c76857d716afab46f5efe46e353935921d5f217/recipes/ivy-yasnippet";
           sha256 = "180q6hrsnkssbf9x9bj74dyy26kym4akbsjlj81x4193nnmc5w67";
           name = "recipe";
         };
-        packageRequires = [ dash emacs ivy yasnippet ];
+        packageRequires = [ cl-lib dash emacs ivy yasnippet ];
         meta = {
           homepage = "https://melpa.org/#/ivy-yasnippet";
           license = lib.licenses.free;
         };
       }) {};
+    ivy-ycmd = callPackage ({ dash
+                            , emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild
+                            , ycmd }:
+      melpaBuild {
+        pname = "ivy-ycmd";
+        ename = "ivy-ycmd";
+        version = "20180909.525";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ivy-ycmd";
+          rev = "25bfee8f676e4ecbb645e4f30b47083410a00c58";
+          sha256 = "1ywrkx8ddncy4qhv5gh4qf1cpapyvny42i51p91j9ip7xmihy6lm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/22e925d1b66f53d25eb1b3a2746dea82e8555783/recipes/ivy-ycmd";
+          sha256 = "0vlf75qv9m84gx83rxz0acnlx5lspq92d94q82ba2p4cc6yjyvj3";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ivy ycmd ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-youtube = callPackage ({ cl-lib ? null
                                , fetchFromGitHub
                                , fetchurl
@@ -52297,12 +53031,12 @@
       melpaBuild {
         pname = "jdee";
         ename = "jdee";
-        version = "20180711.1336";
+        version = "20180831.800";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "9192578df89dc92c88a7faf71d8aaf4f60bcb84c";
-          sha256 = "0ahpygiw7ik82y75khhhr8d81883cpnld10xdcarzj0mblhi3vqf";
+          rev = "8451b811b11d8cb428bafab31752e93180a3c724";
+          sha256 = "08rjr1lr1hq47bpc6iy1ib24vky9zlpj9q5gdvb6cd4zzvlm2qw7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -52807,12 +53541,12 @@
       melpaBuild {
         pname = "js-auto-format-mode";
         ename = "js-auto-format-mode";
-        version = "20180123.830";
+        version = "20180807.652";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "1558fb539e0beb7f98901280d695968a2351384d";
-          sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9";
+          rev = "59caa137c4beec4dec4a7d7ebf8bcb6af44d72f0";
+          sha256 = "10xxg8lc4g9wdl4lz7kx6la23agpbq4ls1mn5d4y364j8nfcxf9g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -52940,12 +53674,12 @@
       melpaBuild {
         pname = "js-import";
         ename = "js-import";
-        version = "20170115.853";
+        version = "20180817.356";
         src = fetchFromGitHub {
           owner = "jakoblind";
           repo = "js-import";
-          rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb";
-          sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9";
+          rev = "c98e74a0b43d6ccb8764cf572cdde95ca27f5633";
+          sha256 = "1qhigx8lgp044348wr8lwidbn0xcs4j7jrm8qjva5zryjvbxy881";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-import";
@@ -53020,12 +53754,12 @@
       melpaBuild {
         pname = "js2-mode";
         ename = "js2-mode";
-        version = "20180627.744";
+        version = "20180724.101";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "3bea9ab39b6c0b6dd442d69fe53183c1f7652284";
-          sha256 = "039ffsqc40ydg4ma4ycvw76rxa6s8g54dbvcm8fyypkb8ibn7yn6";
+          rev = "2ed3cc070c7819556c9c89826b0f5c4629b104ef";
+          sha256 = "08168z2figb7x99jwixmzrqcdi7iv7c1x1w8gf1k082c4yf5qlmg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -53285,12 +54019,12 @@
       melpaBuild {
         pname = "jsonnet-mode";
         ename = "jsonnet-mode";
-        version = "20180310.2256";
+        version = "20180822.919";
         src = fetchFromGitHub {
           owner = "mgyucht";
           repo = "jsonnet-mode";
-          rev = "4eb52cff8ce6020f5a6309a1c0465b5cdd6c698e";
-          sha256 = "0l9q6g00yxz5j1hchd2vim33n39zshv7qmmga1zf8qcn20yxz7mm";
+          rev = "0d68681d501fd57ebde5ed4fe100033a5d3aafa8";
+          sha256 = "1r54fhmrcr9nrmiwrz10y2fyx0cvvb5mcmb3g0iypwpbg86vklv4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
@@ -53345,14 +54079,14 @@
         ename = "jst";
         version = "20150604.438";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "jst-mode";
           rev = "865ff97449a4cbbcb40d38b4908cf4d7b22a5108";
           sha256 = "066ql5czrzikznlx7vww6m8h0pfkixfm8qnydfwpfndcqq6ypd90";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/85d7aec81b7b8ff3721fd577cbdc10ed2288f76d/recipes/jst";
-          sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/jst";
+          sha256 = "1kxf8ckhsh0sgc4xqkkyh7ghk17farqqz35ibvmyrkl9s19ydj1q";
           name = "recipe";
         };
         packageRequires = [ dash emacs f pcache s ];
@@ -53417,16 +54151,16 @@
       melpaBuild {
         pname = "julia-mode";
         ename = "julia-mode";
-        version = "20171116.642";
+        version = "20180816.1417";
         src = fetchFromGitHub {
-          owner = "JuliaLang";
+          owner = "JuliaEditorSupport";
           repo = "julia-emacs";
-          rev = "2ef6992125a85674532a1e37dacd5c60bee4feeb";
-          sha256 = "0vjsaws0rqrkv1mqxwf9lp8qmaq92piippybsf4ncizxwbnh8x6d";
+          rev = "ec01995f60486480cf2240bbd3b9a2ff3fa9e0f0";
+          sha256 = "18lgdr07mllxmjrqyzx9z2js9ajj4pfz407r1ph6fjliyv2c61p5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
-          sha256 = "0m49v67fs5yq0q3lwkcfmrzsjdzi1qrkfjyvjcdwnfmp29w14kq6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/julia-mode";
+          sha256 = "1f26j3nxspwrvnsk3kmam8rw4jwikwmi9a5zwsx9aa1rrasg58w3";
           name = "recipe";
         };
         packageRequires = [];
@@ -53443,12 +54177,12 @@
       melpaBuild {
         pname = "julia-repl";
         ename = "julia-repl";
-        version = "20171116.46";
+        version = "20180910.141";
         src = fetchFromGitHub {
           owner = "tpapp";
           repo = "julia-repl";
-          rev = "f808a12e7ebe403f82036899c2dace640be73154";
-          sha256 = "1lh4pbxrnld205ga58036jwnxkmgabdd8hyr6g7fahw94llq2cpa";
+          rev = "06678ed0cb07807f6cb153c6b0997edc6a18f22c";
+          sha256 = "1z03pgmfs8r9rwd8yhbb71fkl2lhr8i5ajs7n5gg1syrhnlj89ml";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -53888,12 +54622,12 @@
       melpaBuild {
         pname = "kaolin-themes";
         ename = "kaolin-themes";
-        version = "20180722.1037";
+        version = "20180915.16";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "8d0d8513541c293646aaff886d1fb81621d3cf45";
-          sha256 = "00bn5wr4wvdn4nn1minlqnbj57rdb8biv4w9bmkgipsmkr27zaxz";
+          rev = "a6b22fd71c539f6c13c7e261ead25961a1f297b4";
+          sha256 = "1x4cwakxs971pdj9s13g1nwwb16fkkc9wdm93igymk8wplfwl8m1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -53933,6 +54667,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    kapacitor = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , magit
+                             , magit-popup
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "kapacitor";
+        ename = "kapacitor";
+        version = "20180909.2142";
+        src = fetchFromGitHub {
+          owner = "Manoj321";
+          repo = "kapacitor-el";
+          rev = "b0e95f98b965f215be6ead14779949d5cf358ea5";
+          sha256 = "0ahi9ar32kwf7cinxp29c3yhjfibg509pvxv5s0gn31szdqq216p";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb/recipes/kapacitor";
+          sha256 = "108b3y71p7s3lcwbqxp7hy2l304yj4hxm2nq8iv7ljr8av1q7kn6";
+          name = "recipe";
+        };
+        packageRequires = [ emacs magit magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/kapacitor";
+          license = lib.licenses.free;
+        };
+      }) {};
     karma = callPackage ({ emacs
                          , fetchFromGitHub
                          , fetchurl
@@ -54265,6 +55027,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    keypress-multi-event = callPackage ({ emacs
+                                        , fetchFromGitHub
+                                        , fetchurl
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
+        pname = "keypress-multi-event";
+        ename = "keypress-multi-event";
+        version = "20180817.153";
+        src = fetchFromGitHub {
+          owner = "Boruch-Baum";
+          repo = "emacs-keypress-multi-event";
+          rev = "64e3037fa4520b6bca2141f1217d3fa988e01a91";
+          sha256 = "0ppkmbk9i7h038x577v2j67y37c7jlwssay80rv83hl4lwb5ayvb";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd02baaf1d49d55b066695d8fa9887c454bb1750/recipes/keypress-multi-event";
+          sha256 = "07va7w6vgjf6jqrfzpsq8732b8aka07g29h661yh1xn4x6464hyp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/keypress-multi-event";
+          license = lib.licenses.free;
+        };
+      }) {};
     keyset = callPackage ({ cl-lib ? null
                           , dash
                           , fetchFromGitHub
@@ -54666,12 +55454,12 @@
       melpaBuild {
         pname = "kodi-remote";
         ename = "kodi-remote";
-        version = "20180609.1654";
+        version = "20180820.15";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "bca7250bb69e09c1a9829e15ef4aed1f486777eb";
-          sha256 = "1d67gvhkvcdii2nj0ngh5lnvv1y3iw1ccl70lmi39srz5p2hjw59";
+          rev = "e2df2b6032255a6dc4292e95992e72f579262aaf";
+          sha256 = "10s40dbyhhw44y0163wlrb0pb4qwnh9rkbfcqkvjk7x265b786nm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -54846,14 +55634,14 @@
         ename = "kroman";
         version = "20150827.1640";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "kroman-el";
           rev = "431144a3cd629a2812a668a29ad85182368dc9b0";
           sha256 = "0miywc3vfqi3hjb7lk8baz1y2nbp9phjjxclqriyqra4gw4n0vhc";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/07ff16db526dce9d720a858aa14010f297bf31a6/recipes/kroman";
-          sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/kroman";
+          sha256 = "0rcy3343pmlqzqzhmz2c3r0b44pn8fsyp39mvn9nmdnaxsn6q3k8";
           name = "recipe";
         };
         packageRequires = [];
@@ -55072,6 +55860,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    lammps-mode = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "lammps-mode";
+        ename = "lammps-mode";
+        version = "20180801.619";
+        src = fetchFromGitHub {
+          owner = "HaoZeke";
+          repo = "lammps-mode";
+          rev = "a5b68d7a59975770b56ee8f6e66fa4f703a72ffe";
+          sha256 = "1ma33bszv7d6am47n5r74ja4ks7n46m8xfkkr3vcqymlfhbdpq73";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8f5471a8e17977c17ad84b12a77fe80f37eda25e/recipes/lammps-mode";
+          sha256 = "06i48pxp9vq4z7hffna0cndr6iblapim169659pmhidbc4pp7bm4";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lammps-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     lang-refactor-perl = callPackage ({ fetchFromGitHub
                                       , fetchurl
                                       , lib
@@ -55494,12 +56308,12 @@
       melpaBuild {
         pname = "lcr";
         ename = "lcr";
-        version = "20180414.1256";
+        version = "20180902.1219";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "lcr";
-          rev = "49a59d80a4b55cc421cb55430ff8258887382c3d";
-          sha256 = "1fds0s0if9m155v5hk5l0ihc6wr331qif5bc013w04hrlkn4v5jh";
+          rev = "c14f40692292d59156c7632dbdd2867c086aa75f";
+          sha256 = "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
@@ -55525,12 +56339,12 @@
       melpaBuild {
         pname = "lean-mode";
         ename = "lean-mode";
-        version = "20180712.57";
+        version = "20180906.945";
         src = fetchFromGitHub {
           owner = "leanprover";
           repo = "lean-mode";
-          rev = "529b8fa535cfa090a6b62566794161556ffade80";
-          sha256 = "0gqwc65m42kkal390a7qx1r5b9ixsbg6avn8s35n5r1qf2w0qx5p";
+          rev = "a9912c73387aa69183e12e4a5335128a7965c420";
+          sha256 = "1w0cmircqnbi0qyi6sl3nnshjy2fdgaav88lj30g3qmnyiac1dnz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
@@ -55583,12 +56397,12 @@
       melpaBuild {
         pname = "ledger-mode";
         ename = "ledger-mode";
-        version = "20180705.138";
+        version = "20180825.1943";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "ac93ac5c36dd66fc97417697d92688c5e2570024";
-          sha256 = "0yhr1d40wk2h514p6rjpnhvdxwjdbmr3bkh1wnc6pafpcryhydi1";
+          rev = "b0e31e8788dac15c7eed855e5c92ad3d2b45c114";
+          sha256 = "0163m5rwzvny769df5zq03cnv2ma39vxmsaf11hs24il02b11w99";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -56193,6 +57007,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    linguistic = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "linguistic";
+        ename = "linguistic";
+        version = "20180902.631";
+        src = fetchFromGitHub {
+          owner = "andcarnivorous";
+          repo = "linguistic";
+          rev = "b1c586fa71f20a8de5e6062592862641b7970c04";
+          sha256 = "17gl4yrr7fzcmgkidyn4lvs88w715z4zn8v04qw3ix7c0qvbsq50";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aedc03a846b873edf2426c422abb8c75732158f8/recipes/linguistic";
+          sha256 = "0yhyrr7yknvky6fb6js0lfxbl13i6a218kya7cpj2dpzdckcbhca";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/linguistic";
+          license = lib.licenses.free;
+        };
+      }) {};
     link = callPackage ({ fetchFromGitHub
                         , fetchurl
                         , lib
@@ -56449,12 +57288,12 @@
       melpaBuild {
         pname = "lispy";
         ename = "lispy";
-        version = "20180716.839";
+        version = "20180914.1138";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "a8b0e0afb73b7687cae370fc84384db65bd73fca";
-          sha256 = "0y9k91gabgab7fwml4grhna2vzfwbxl9l1n58f5nl9xhia6zfqzi";
+          rev = "bc025d9710beaa5bd0341cbb285e8352470db943";
+          sha256 = "1nk4pwg772lhp5z6sy5lgcd7qm4p5kp6lmff1pya7pg6xcqnwvdd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -56791,12 +57630,12 @@
       melpaBuild {
         pname = "live-code-talks";
         ename = "live-code-talks";
-        version = "20150115.1423";
+        version = "20180907.947";
         src = fetchFromGitHub {
           owner = "david-christiansen";
           repo = "live-code-talks";
-          rev = "fece58108939a53104f88d348298c9e122f25b75";
-          sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
+          rev = "97f16a9ee4e6ff3e0f9291eaead772c66e3e12ae";
+          sha256 = "1clcm1yps38wdyj415hh7bl20fcpfin92hh5njsldqbvgcpndaqi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/live-code-talks";
@@ -56817,12 +57656,12 @@
       melpaBuild {
         pname = "live-py-mode";
         ename = "live-py-mode";
-        version = "20180330.1758";
+        version = "20180811.1120";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a";
-          sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv";
+          rev = "efd9bba8a40448cccfcb745a84d479cb5275122b";
+          sha256 = "0va4cirxwv0k9q74ac313pvxvnkvqpp6zqxwscpx4v6hp1gw7wvw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -57320,6 +58159,7 @@
       }) {};
     logview = callPackage ({ datetime
                            , emacs
+                           , extmap
                            , fetchFromGitHub
                            , fetchurl
                            , lib
@@ -57327,19 +58167,19 @@
       melpaBuild {
         pname = "logview";
         ename = "logview";
-        version = "20180522.1054";
+        version = "20180913.1037";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "902c881f5e1ca802761b856b3945bd418847dd79";
-          sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg";
+          rev = "6a45a358635dccc5eb970722f14444415e40e832";
+          sha256 = "0fd79ig5fha207959qr9hib0b4l7wlg7sis03zbhx944xqr8mrv9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "recipe";
         };
-        packageRequires = [ datetime emacs ];
+        packageRequires = [ datetime emacs extmap ];
         meta = {
           homepage = "https://melpa.org/#/logview";
           license = lib.licenses.free;
@@ -57497,6 +58337,60 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-clangd = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , lsp-mode
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-clangd";
+        ename = "lsp-clangd";
+        version = "20180828.957";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-clangd";
+          rev = "37ca521483e3ce5b63b97672916368dbf4566a67";
+          sha256 = "1km0jphg3zhy8cf127jh819yc5vx88xifml9ic5xidzmy26gq6s1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71646b47e5f5702e80bf6c56f882d041074ef3c0/recipes/lsp-clangd";
+          sha256 = "05dmzyb9xw2m4kck7y3cj8dm2542p3vi48lqs21gcrvm5vbrkx3g";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-clangd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lsp-css = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , lsp-mode
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-css";
+        ename = "lsp-css";
+        version = "20180627.1251";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-css";
+          rev = "1395b48209c5744e19f688ebb5fe8201e5a006df";
+          sha256 = "1h043gmrly820gnx1ccavms1f6xkc2zbdhfm5lbaix45i61z62jm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a9d16c625893fce39d1253b101b826ba96e1f26e/recipes/lsp-css";
+          sha256 = "05mm0pshs9jk3ls7mqicq4a5w66fg3mhi73mjx7kp5asqk64fim1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-css";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-go = callPackage ({ fetchFromGitHub
                           , fetchurl
                           , lib
@@ -57505,12 +58399,12 @@
       melpaBuild {
         pname = "lsp-go";
         ename = "lsp-go";
-        version = "20180630.1101";
+        version = "20180913.2215";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-go";
-          rev = "0d354e1682fe1db074a924d7812f6ea62048d73d";
-          sha256 = "0rk1brvy9hmjwykzf3pgli7h5gp3m6ra4yspv0rknbd2drzw4r94";
+          rev = "2327556e78682770a7a434610b08115f20ea5b1a";
+          sha256 = "10n9vrf46rsacsibv9sh5s92lmr3lz7x2lbgxzf5xn1y1vlg02ap";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
@@ -57531,12 +58425,12 @@
       melpaBuild {
         pname = "lsp-hack";
         ename = "lsp-hack";
-        version = "20180703.1837";
+        version = "20180817.1900";
         src = fetchFromGitHub {
           owner = "jra3";
           repo = "lsp-hack";
-          rev = "a3b6725dc7b16246d71a7d4ddbddd0fec1a009eb";
-          sha256 = "1amkdlc0dpxv953f8v7l5i3a54gm6nxrdmrizkgc28plbvcpqdqy";
+          rev = "a7fe82cc598264be3a0a378426a1da2c41ffc140";
+          sha256 = "0kq8p4pdrlggi16hbzkzvi218fps4q955papj9w9vxm55bpfqsiq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack";
@@ -57558,12 +58452,12 @@
       melpaBuild {
         pname = "lsp-haskell";
         ename = "lsp-haskell";
-        version = "20180131.459";
+        version = "20180828.138";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-haskell";
-          rev = "bd7d0a4c3b54dbaa4c89b80f4f0268d717b4dd6f";
-          sha256 = "13dp655kdi6z6s9is0q1qf6yvmfxzv7bjjlhp2f7bjiv2jh5yzyv";
+          rev = "11871b327ddee15da8e80bd3e678d6cee0e95348";
+          sha256 = "08ac95kw7j9fyd7g972ip10g8s24hkn6zac26xd1154p6fca0hxq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -57611,12 +58505,12 @@
       melpaBuild {
         pname = "lsp-intellij";
         ename = "lsp-intellij";
-        version = "20180621.1131";
+        version = "20180831.1351";
         src = fetchFromGitHub {
           owner = "Ruin0x11";
           repo = "lsp-intellij";
-          rev = "0911f703ac50164a702b6ee213173e763eda3094";
-          sha256 = "1nc4bi6annxd4i94wznh28di3pvq73yvz3g4nhs1l95jczl13rpj";
+          rev = "cf30f0ac63bd0140e758840b8ab070e8313697b2";
+          sha256 = "0ghw2as9fbnfhrr1nbqk97jcl7yb451xpmfbksxh7mvjm3lhmyvz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d72cbb85fe4e0c6bea9a704dc1545f88efa56d2/recipes/lsp-intellij";
@@ -57634,23 +58528,24 @@
                             , fetchurl
                             , lib
                             , lsp-mode
+                            , markdown-mode
                             , melpaBuild }:
       melpaBuild {
         pname = "lsp-java";
         ename = "lsp-java";
-        version = "20180701.111";
+        version = "20180905.2337";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "b3d671ccc264b32492e30f48b4d5a52f6b88145d";
-          sha256 = "17dqz2fmsczl46vq6id9918hxy5b332lncgwzrzjbbpqi3ysa1s3";
+          rev = "17f80c9935a0004e59c2e706de4b91eba45344c8";
+          sha256 = "11ki7mb2pivvmqhn3ya67ph7vz7l3pfa0cqmv6jny12l6iq6awcb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
           sha256 = "1y5wxggkr7v4a2a3h2n01911gd1xv047dikbvyy1gappf05fdngj";
           name = "recipe";
         };
-        packageRequires = [ emacs lsp-mode ];
+        packageRequires = [ emacs lsp-mode markdown-mode ];
         meta = {
           homepage = "https://melpa.org/#/lsp-java";
           license = lib.licenses.free;
@@ -57666,12 +58561,12 @@
       melpaBuild {
         pname = "lsp-javacomp";
         ename = "lsp-javacomp";
-        version = "20180218.2334";
+        version = "20180904.2251";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "lsp-javacomp";
-          rev = "4423fc41974e25ddf4a46fb13bd64680d52b420a";
-          sha256 = "1k66h5l52al3glsz261j2lcfl8pddxh55m8slr9p1kaxzr67fl6a";
+          rev = "6a8779417466a67475f4d71a234ab6ae02e404b2";
+          sha256 = "1rq62zq89l705a7nfii86rqhh25xx058s5jzvq20ig4pv7ylip87";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
@@ -57747,12 +58642,12 @@
       melpaBuild {
         pname = "lsp-mode";
         ename = "lsp-mode";
-        version = "20180708.1914";
+        version = "20180911.1129";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "5ea5c6398a923e24c4fedf6d782004b4dc4cb254";
-          sha256 = "1pn9lnd8r4zl35hqwi00qcsb6v6aj533hbm7faj1d3nndlf2qmbh";
+          rev = "14eac3f677a52063e95bb93d46a968cd967ea010";
+          sha256 = "0inbav1zybyp15lj98fhl6fm9lf8mp49q2bhdcslykmpb2cgdcff";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -57792,6 +58687,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-p4 = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , lsp-mode
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-p4";
+        ename = "lsp-p4";
+        version = "20180728.1215";
+        src = fetchFromGitHub {
+          owner = "dmakarov";
+          repo = "p4ls";
+          rev = "be807f8bf12bc354d2649c654f853689e3113765";
+          sha256 = "0qhyd39743gb4y7hxznvvq3iikcj5yi145snhfic7l1l7yvbqz97";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/53f0da8b3d2903adeffdbc3d8df7d630bfd9ff71/recipes/lsp-p4";
+          sha256 = "0cd3n17lqwz08zfkm9g5cr1cj2asznlbhxrym2a7b7shdmn3yx5f";
+          name = "recipe";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-p4";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-php = callPackage ({ emacs
                            , fetchFromGitHub
                            , fetchurl
@@ -57827,12 +58748,12 @@
       melpaBuild {
         pname = "lsp-python";
         ename = "lsp-python";
-        version = "20180609.16";
+        version = "20180816.614";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-python";
-          rev = "28a3ad4e98af5ede860ef4c2fe47048ce676559b";
-          sha256 = "0y8cglfmjn4j1apyjr66vpqln3rzqdkada3ggxlap4iirgb5iqgf";
+          rev = "b97688aa82b41828d3ffb5345c809d1fee88839d";
+          sha256 = "1ic14lvpyga0y66fayvciwb60mrcx7nnppsxl2n9j0pvk6pd5907";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -57845,6 +58766,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-ruby = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-mode
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-ruby";
+        ename = "lsp-ruby";
+        version = "20180910.1221";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-ruby";
+          rev = "8016a714403587f95a9bf6516c2a91a0a880fa2f";
+          sha256 = "00jm2fvvgidxd4vsajhaqw8s9r61smxjfzdshhpqnq1zkfxa7yjc";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/41422dbdee6ecc71a9e4b1520c705a6fd07c9c94/recipes/lsp-ruby";
+          sha256 = "1pmmlbxqzzj8zyqyya1p8v6g5v0kisx00d1c5zqja4sqw2n82glr";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-rust = callPackage ({ dash
                             , emacs
                             , fetchFromGitHub
@@ -57885,12 +58833,12 @@
       melpaBuild {
         pname = "lsp-typescript";
         ename = "lsp-typescript";
-        version = "20180614.1311";
+        version = "20180905.2224";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-javascript";
-          rev = "7e7c5f66b02321f402712841064347cb872c41e4";
-          sha256 = "1ilhnbdvfjanv0cjwk289dq1whpf69qzw0hh9ak37gbi4pqvsbdv";
+          rev = "ab62826962887e82f0bc968817be4fc89a6953e4";
+          sha256 = "0fwmclcgl0lv3j2nqw6njxmi4sbgyp508v66d0ymjl419mhlqdrg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7903d6b51132c0d8ad209f13ffe915c1bc5a76d/recipes/lsp-typescript";
@@ -57916,12 +58864,12 @@
       melpaBuild {
         pname = "lsp-ui";
         ename = "lsp-ui";
-        version = "20180618.1951";
+        version = "20180914.2117";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-ui";
-          rev = "bd5970edae874338bd01d0bc50c4671ea4cae390";
-          sha256 = "0s5an922wfias2n0h5jqa2n4mxvrfg6sav470him4dbwqqrgx5ck";
+          rev = "35caa39d8d4776472f4f54ab54c94d2de2532d06";
+          sha256 = "14qgd6z9sharw5x27jv2avfq6mjnvb5lqasiib5ck07b8x9czav8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui";
@@ -58028,12 +58976,12 @@
       melpaBuild {
         pname = "lush-theme";
         ename = "lush-theme";
-        version = "20141107.806";
+        version = "20180816.1500";
         src = fetchFromGitHub {
           owner = "andre-richter";
           repo = "emacs-lush-theme";
-          rev = "fd69cf6e254b329d7997acd37fe04c17139f3435";
-          sha256 = "0gcyxvkpfi1vsa7gyx13rb29x86j2i2nnqldli1sna4v87jw288g";
+          rev = "7cfc993709d712f75c51b505078608c9e1c11466";
+          sha256 = "0v17srm3l8p556d4j5im2bn7brxv7v0g2crlm4gb8x1cwjrbajzf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b29b2f36852e711ce3520d71e83921a1dcb9ccf/recipes/lush-theme";
@@ -58157,12 +59105,12 @@
       melpaBuild {
         pname = "lyrics";
         ename = "lyrics";
-        version = "20180123.2004";
+        version = "20180812.1141";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "lyrics.el";
-          rev = "fb35b387796f64f48b4daa5a163f4a576210f200";
-          sha256 = "17al49f633h3fsa6aq9v5c1r8dp2gj97f46z1fhmgxbijmpfzs0w";
+          rev = "d0b920be634a5be81ad49418cfaada0f0a57d6cd";
+          sha256 = "0926avnlxi8qkr1faplk1aj4lji0ixa4lv81badi5zsmpyyrwmm7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics";
@@ -58412,6 +59360,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    magik-mode = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "magik-mode";
+        ename = "magik-mode";
+        version = "20180910.1128";
+        src = fetchFromGitHub {
+          owner = "roadrunner1776";
+          repo = "magik";
+          rev = "bd9739e9d7d5bb2e939e4e9ea7f19326bc0a9aaf";
+          sha256 = "1dvh4swnnzjxzswj1inmygaykaivmcnslacpmjvs9warhyr266jk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/291cce8e8e3475348b446ba38833eb1e37d4db65/recipes/magik-mode";
+          sha256 = "1d6n7mpwavrajcgai6j0y5khhgc4jaag1ig1xx8w04mr48xrjxqk";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/magik-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit = callPackage ({ async
                          , dash
                          , emacs
@@ -58426,12 +59399,12 @@
       melpaBuild {
         pname = "magit";
         ename = "magit";
-        version = "20180720.1712";
+        version = "20180915.659";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "c5269547ae178f4893a8ec662f71b0e032d4c0fa";
-          sha256 = "1qyyi1pyb1hr66b43ka0sshafizddxgzlbqlnlfncb2rm8fyab0h";
+          rev = "8adbe43554d5a36acf1de6a23f4395bfa82a85e2";
+          sha256 = "1fzil54zra5m12wdg5fxxfn2y8wphc4lvyzm0kmxpa2m9hfaw7p3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac8feccfa0f4eb5bda2ef561a6be66ba145c00e0/recipes/magit";
@@ -58737,12 +59710,12 @@
       melpaBuild {
         pname = "magit-popup";
         ename = "magit-popup";
-        version = "20180618.1602";
+        version = "20180726.1337";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-popup";
-          rev = "e2060ccb3105555f55992a995587221820341b24";
-          sha256 = "1z1xi6mkz1h0vxbhwp1ypn5jpa0a859b296k4ds2j1i18h1lvgad";
+          rev = "6e07f745a18af514c2885eeabe9b2b2a5216e53c";
+          sha256 = "08952nzn0cb6gxscqyiljk4fq2zxjvr3ism0lvgw0gs9hl5phiwx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
@@ -58818,12 +59791,12 @@
       melpaBuild {
         pname = "magit-tbdiff";
         ename = "magit-tbdiff";
-        version = "20180527.652";
+        version = "20180912.1946";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-tbdiff";
-          rev = "15af196860defda2554aa16ddc172a55ccf03a0d";
-          sha256 = "0d24y9sj2qzcm5an37yd7s0gxbq5q8p9xlgxyzz60ln30hwnx107";
+          rev = "bbc4d070b3e89511595dc182565004101a1e65e2";
+          sha256 = "16jhk7m3kgdh7hdij9bpli5q4qmdzpy4bcp1xvlpycv6b6k270h6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -58836,9 +59809,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-todos = callPackage ({ a
-                               , anaphora
-                               , async
+    magit-todos = callPackage ({ async
                                , dash
                                , emacs
                                , f
@@ -58853,30 +59824,19 @@
       melpaBuild {
         pname = "magit-todos";
         ename = "magit-todos";
-        version = "20180716.2339";
+        version = "20180909.2328";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63";
-          sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil";
+          rev = "ced8717d61ba66b5310a62e61fb8cf718ea2661c";
+          sha256 = "1bbsi8xavs7hbs88k8qbb98vjwl8dnsmw60pfxxca5hw69rkaij8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
           sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8";
           name = "recipe";
         };
-        packageRequires = [
-          a
-          anaphora
-          async
-          dash
-          emacs
-          f
-          hl-todo
-          magit
-          pcre2el
-          s
-        ];
+        packageRequires = [ async dash emacs f hl-todo magit pcre2el s ];
         meta = {
           homepage = "https://melpa.org/#/magit-todos";
           license = lib.licenses.free;
@@ -58893,14 +59853,14 @@
         ename = "magit-topgit";
         version = "20160313.1254";
         src = fetchFromGitHub {
-          owner = "magit";
+          owner = "greenrd";
           repo = "magit-topgit";
           rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0";
           sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit";
-          sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/magit-topgit";
+          sha256 = "1194hdcphir4cmvzg9cxrjiyg70hr9zmml2rljih94vl7zrw7335";
           name = "recipe";
         };
         packageRequires = [ emacs magit ];
@@ -58922,15 +59882,15 @@
       melpaBuild {
         pname = "magithub";
         ename = "magithub";
-        version = "20180625.2104";
+        version = "20180908.739";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "bc318ec9953b919195fbaa980b6873b6af7bed81";
-          sha256 = "1c8sfrahxk8q7jarvxmrwsgdy8xcjhky14vc268jbrrz197yp006";
+          rev = "9be91acd1ecc06cfcfab7912821a08cbf1b1fff2";
+          sha256 = "11w856cnj52zq2640sk5pk5j4n90c4ldpl62f342mjkjvisfzxrd";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e555b46f5de7591aa8e10a7cf67421e26a676db8/recipes/magithub";
           sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
           name = "recipe";
         };
@@ -59549,12 +60509,12 @@
       melpaBuild {
         pname = "markdown-mode";
         ename = "markdown-mode";
-        version = "20180707.555";
+        version = "20180904.901";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "b92f00d10e2582028d4306d3be8730add58e9fa1";
-          sha256 = "0cwfc4l7rqwa9hgxz73lzm6czjqnif39dkcmacxb2gi9gpxwlxjn";
+          rev = "30ae22215da05c4e02fcc3bfee0317cfec9c8fe5";
+          sha256 = "02p2ivh81pipjqiahw2jchla563rgksdhc7r81nb7p522ma5463v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -59852,12 +60812,12 @@
       melpaBuild {
         pname = "mastodon";
         ename = "mastodon";
-        version = "20180305.1909";
+        version = "20180810.1920";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
-          sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
+          rev = "e4482232a5bb2a3036664eba598bf12506fe0b6e";
+          sha256 = "07fq3k62j9cz1567i2x11q1j9pwybb7qxwcilnnrphf4aibgq6kn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -60056,12 +61016,12 @@
       melpaBuild {
         pname = "mb-url";
         ename = "mb-url";
-        version = "20161224.1806";
+        version = "20180906.1901";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
-          sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
+          rev = "aa13abfc6231076a53b8a9903c9804443960d589";
+          sha256 = "17qlx1n2vxc5dhvjiw6nl9n74ansbra6hzazcxx0xrz5vx0ssh1i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
@@ -60271,12 +61231,12 @@
       melpaBuild {
         pname = "meghanada";
         ename = "meghanada";
-        version = "20180717.1810";
+        version = "20180909.1931";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c";
-          sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd";
+          rev = "59568a4b32373d2ae7917673896369a922375a3e";
+          sha256 = "12sswa3fyf0pgawfz6ak9xc97da3bnv1qng2apw42gwg5yc0qlq4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -60455,14 +61415,14 @@
         ename = "merlin";
         version = "20180214.242";
         src = fetchFromGitHub {
-          owner = "the-lambda-church";
+          owner = "ocaml";
           repo = "merlin";
           rev = "0a14a7df44cd8f5cea7928f3097b5bb5257cb61d";
           sha256 = "145r8bhvkar0fwajsg4msyg40na8ii0xbrwbi9b81cx1g17k5c7k";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
-          sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/merlin";
+          sha256 = "1b6zdm68ds94mqiygifqi45k3czrmwvaki58jwxbbddn3ya7iinz";
           name = "recipe";
         };
         packageRequires = [];
@@ -60480,12 +61440,12 @@
       melpaBuild {
         pname = "merlin-eldoc";
         ename = "merlin-eldoc";
-        version = "20180630.1026";
+        version = "20180830.316";
         src = fetchFromGitHub {
           owner = "khady";
           repo = "merlin-eldoc";
-          rev = "6e1626d755a8bee0a03f89a951bdf69eaf4db5f9";
-          sha256 = "1xa8dfdi7w8ip7m6n0cqz28p9zvqsshd76zg27g4pmhgv1n3fnkc";
+          rev = "85dec436648f43c050048524fae7a3ad7ad4c019";
+          sha256 = "1kpdz540j32hpjykyagpwvzh7cf4gx2rfp3pdq2agc7b3bsg2jyz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc";
@@ -60636,14 +61596,14 @@
         ename = "metaweblog";
         version = "20171216.1840";
         src = fetchFromGitHub {
-          owner = "punchagan";
+          owner = "org2blog";
           repo = "metaweblog";
           rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
           sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
-          sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/metaweblog";
+          sha256 = "0qgmcvq1fhgljia9ncjgvgrv0mzih0l9mglwbwcszn613wmx8bkg";
           name = "recipe";
         };
         packageRequires = [ xml-rpc ];
@@ -60659,12 +61619,12 @@
       melpaBuild {
         pname = "mew";
         ename = "mew";
-        version = "20180709.1817";
+        version = "20180910.1823";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "Mew";
-          rev = "d4eac40c09ef349e09f0169bc2725d050dc8c7ad";
-          sha256 = "03k2nw8v9xzani2sk37x4abbmljm5h2ixxpczhv8njpqfmy8rm8x";
+          rev = "91a78fd6c6d74d0881d68c51dcd9be8cae065c02";
+          sha256 = "1ydiqafai6ji57p807iwlm3hzxqs19ghc5j3f19r6w17y65w06m1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -60686,14 +61646,14 @@
         ename = "mexican-holidays";
         version = "20160109.1342";
         src = fetchFromGitHub {
-          owner = "shopClerk";
+          owner = "sggutier";
           repo = "mexican-holidays";
           rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5";
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/17cf468b17eead32f38e0386e8ec60ecfe11b767/recipes/mexican-holidays";
-          sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/mexican-holidays";
+          sha256 = "0an6kkr2vwkqc9219rgn74683h7f4cmd1g74lirn0qhqcfcb5yrc";
           name = "recipe";
         };
         packageRequires = [];
@@ -60736,12 +61696,12 @@
       melpaBuild {
         pname = "mhc";
         ename = "mhc";
-        version = "20180717.2009";
+        version = "20180723.2158";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "e29e69ab2f282131039a63f56f48e39d56c175d9";
-          sha256 = "0lxn4vg3qxzdxad1fv0ssnw4rjhzvrys4k3lqx87sbg28l9ykk77";
+          rev = "2cd1e97fa2e32e7dfde5ee7878fb9a915fb6a3b8";
+          sha256 = "1rr7205q2gwi8bw4hab7p7061bc15sqrj4mam02hlplg7dcj476q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -61586,12 +62546,12 @@
       melpaBuild {
         pname = "mode-icons";
         ename = "mode-icons";
-        version = "20170216.620";
+        version = "20180910.804";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "dd0a161272823294f2b9afb8b919fd11323ef6b4";
-          sha256 = "1d1rhqi0adac8jgz977jrnbnf9kan8cwr1fghlxb2q7p33kp1d29";
+          rev = "26138d825cba7e6bd882707a909505d5536acb9b";
+          sha256 = "1z62g5dhv36x5an89za8h5vdab0ss7af13p42kjnjrs54f50pv9f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -61837,12 +62797,12 @@
       melpaBuild {
         pname = "monky";
         ename = "monky";
-        version = "20180716.720";
+        version = "20180806.39";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "f1aaea2b8334d5870c8179f2c70b4088882caff8";
-          sha256 = "1ibfigbkir4y87wl7nhz6z5fb13gqmhiby1315yqw8p7d604am56";
+          rev = "c40038710db855a5b71fa8ba0032b397a6730d2d";
+          sha256 = "0a264j6w3q0jhzqqbxfazp2c15xk2k5lm5004m958lhi53sr34fa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -61913,12 +62873,12 @@
       melpaBuild {
         pname = "monokai-theme";
         ename = "monokai-theme";
-        version = "20180402.221";
+        version = "20180730.629";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "1143c072f5153ae1a69807e5e8af163069b947d2";
-          sha256 = "0dy8c3349j7fmp8052hbgvk0b7ldlv5jqpg0paq1i0hlypivd30i";
+          rev = "f4ef092129f4a35edaee0a9b2219c17e86309730";
+          sha256 = "1dshz153y25pmff0pn2rsvgxsv0jv0pjn5cpzvr5x11b65ijwshy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -62016,12 +62976,12 @@
       melpaBuild {
         pname = "moom";
         ename = "moom";
-        version = "20180618.1245";
+        version = "20180909.2138";
         src = fetchFromGitHub {
           owner = "takaxp";
           repo = "moom";
-          rev = "54b50eac555c9195ad39060e31fd4aac5662b5fd";
-          sha256 = "1xxxwy67fcgll6m0wiypv3r85vg45g8f6fkhx5m52cs3w8iav7il";
+          rev = "a8820f19a8168ab395ba835872606280ad96916d";
+          sha256 = "1lpkmbabw9n50hf7yr6n4aim8x0km1wa15mpf7mv9w91ca2blg5d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c55081230ee02346ed02e0ab19ee2302e7b9ffa7/recipes/moom";
@@ -62729,12 +63689,12 @@
       melpaBuild {
         pname = "mu4e-conversation";
         ename = "mu4e-conversation";
-        version = "20180722.159";
+        version = "20180827.145";
         src = fetchFromGitLab {
           owner = "ambrevar";
           repo = "mu4e-conversation";
-          rev = "223cc66e99c7665326e3d991d6d383cb0d7512bb";
-          sha256 = "1ncawxcgsnk6ila5h30ka66x350xnkpxadlpnszbf3lc3w2scxjp";
+          rev = "32236a1a296a5f8e31673040fb2f0c008afd7d5f";
+          sha256 = "1pfq12kxhaxwbikf3kqqp310da0c3lnz10arh30ggfszvipimspj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa/recipes/mu4e-conversation";
@@ -63095,12 +64055,12 @@
       melpaBuild {
         pname = "multiple-cursors";
         ename = "multiple-cursors";
-        version = "20180615.518";
+        version = "20180913.537";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "9c49874fa444a4e7255ec05f62c01daed31c7b09";
-          sha256 = "176jyz5sfxn9sp94ymd8ksimmribhdrw2fr7wpwyf4wi17ksvxq4";
+          rev = "6a7c3c0853e3fe9e4b8e5985dbed8fd4075f33ff";
+          sha256 = "0g4mqjahfya5n0hjw4z7ivd2g1kjbsr5h94d052qx6bcnmp66h3r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -63363,8 +64323,8 @@
           sha256 = "0ci1kdc7qs04yny6sxhbncb3d4gzcsdhk2w51phpb8m2rilm0xgl";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/08911f0409c238d009c22051ede04a8d4cdcafa9/recipes/mxf-view";
-          sha256 = "08xyfi74pja2cyfmhigq83yxwfhf9k1797wfz7hrxx9zw6kqa840";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/mxf-view";
+          sha256 = "1a8hlp0r04p1cww3dmsqdxlm3ll522wjb0rnmj80d7mqizkbf52p";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -64238,12 +65198,12 @@
       melpaBuild {
         pname = "nerdtab";
         ename = "nerdtab";
-        version = "20180527.408";
+        version = "20180810.2039";
         src = fetchFromGitHub {
           owner = "casouri";
           repo = "nerdtab";
-          rev = "7af72c3d798ec3a44e6bc8cec18200198192ad9a";
-          sha256 = "0n8av79pdq7as45pfd81pffrpg1wrd3ppdk7zd0i85rmyknnix7r";
+          rev = "601d531fa3748db733fbdff157a0f1cdf8a66416";
+          sha256 = "0l9pbgpp90rhji42zmcn8rlp6pnhkplnpn8w6xflw51iwhdkm1rb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59bc273db1d34997ea5d51cc6adc33ec785bc7f3/recipes/nerdtab";
@@ -64265,12 +65225,12 @@
       melpaBuild {
         pname = "netease-music";
         ename = "netease-music";
-        version = "20180429.1822";
+        version = "20180911.2013";
         src = fetchFromGitHub {
           owner = "nicehiro";
           repo = "netease-music";
-          rev = "aecf451fd69f9faa9f86232550ebf8ced5a48254";
-          sha256 = "0cb5adrnprlhrpcw06wi84fiva3mwac92rxfi5pgcw9ga213qhy8";
+          rev = "a4b86ba91398657ab08a8758a22a71ca0804e880";
+          sha256 = "0gh9smjn5s2axzs9ahqn8djlbrzayp5g4n39wk68sdpljmkjadwz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c/recipes/netease-music";
@@ -64445,12 +65405,12 @@
       melpaBuild {
         pname = "ng2-mode";
         ename = "ng2-mode";
-        version = "20180520.1731";
+        version = "20180908.2119";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "ng2-mode";
-          rev = "177248bca3787fabab70f3026ccf390395171f0d";
-          sha256 = "1s6nvjby3vxh0sfmxg4c43vj9fkr8358v8plqvczpnjk3jxk4xvm";
+          rev = "b2ba86b3c38873fb34cf01f07cddfbaeac320346";
+          sha256 = "0rm7nk23zn758vrbgx6nbb9l42s5mvki8s0gq03h7v85jk3b0kvq";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode";
@@ -64630,12 +65590,12 @@
       melpaBuild {
         pname = "nimbus-theme";
         ename = "nimbus-theme";
-        version = "20180606.1936";
+        version = "20180907.257";
         src = fetchFromGitHub {
           owner = "m-cat";
           repo = "nimbus-theme";
-          rev = "d4adcf0e821648aef066f9b97808a3c691615749";
-          sha256 = "0hvyvc5pvv0n4dv4y1h09vq84gzbf2xjavpiryfxb100hcjicjss";
+          rev = "bbf3c06f4d1046920c079414b4de4b13889fab70";
+          sha256 = "03bg73xn2yhwl6h5vjwz9zsnwbixhjd4k9hzqkv024c44m1cqni0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -64658,14 +65618,14 @@
         ename = "ninja-mode";
         version = "20141203.2159";
         src = fetchFromGitHub {
-          owner = "martine";
+          owner = "ninja-build";
           repo = "ninja";
           rev = "d3238428c6ed77eb08dfc57854325634401481e2";
           sha256 = "05scnv74g9m70dfj1y71iw0dw38zbb77h2s7kciicr9pdrvdg8d4";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
-          sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/ninja-mode";
+          sha256 = "1v6wy9qllbxl37fp9h47000lwp557qss6fdjb3a1f20msg8f70av";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -64709,12 +65669,12 @@
       melpaBuild {
         pname = "nix-mode";
         ename = "nix-mode";
-        version = "20180629.1501";
+        version = "20180908.1540";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix-mode";
-          rev = "57ac40d53b4f4fe0d61fcabb41f8f3992384048e";
-          sha256 = "0l5m5p3rsrjf7ghik3z1bglf255cwliglgr3hiv6qpp121k4p0ga";
+          rev = "fde8c8e38c9f94518661b31eb24a535c93306868";
+          sha256 = "0s66a3s5mh2ngs53z3b2xd5hmwy8m9hg0hm00skz7z89pd429zqd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
@@ -64949,12 +65909,12 @@
       melpaBuild {
         pname = "no-littering";
         ename = "no-littering";
-        version = "20180620.600";
+        version = "20180825.651";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "no-littering";
-          rev = "f1ac5274ba49e3533c356c4cd6d5f8ebed0ec517";
-          sha256 = "07w2x6s29332m3q1cy1igbjqpsyfq3l9x9gk0chn4n0c93wa0174";
+          rev = "3f6d290bb43d75ba749d56fffc21c15f1d4157d2";
+          sha256 = "1lp2nbszixd2m6v8j026z02shihrf77p1lpvvpkmr8dc88ma9hzb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -65104,12 +66064,12 @@
       melpaBuild {
         pname = "nodejs-repl";
         ename = "nodejs-repl";
-        version = "20170722.443";
+        version = "20180914.2151";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0";
-          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
+          rev = "d67fdc7beda4a9021763e9f2ca1e3ed72864ad7d";
+          sha256 = "1mc39wc7q7n5vs02cwj5r264bnwkllvi7i67r6zxc33abx2zmlwa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -65148,6 +66108,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    nodenv = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "nodenv";
+        ename = "nodenv";
+        version = "20180830.517";
+        src = fetchFromGitHub {
+          owner = "twlz0ne";
+          repo = "nodenv.el";
+          rev = "7ea70f1ee6c7bee422b9d090a49af6041ed81668";
+          sha256 = "1kaky6qzr7w1v4ib79s54f882gp6biy2lzsy2022pl0mxyg1jx7f";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/272df58a1112c8c082c740d54bd37469af513d4a/recipes/nodenv";
+          sha256 = "15wqlpswp4m19widnls21rm5n0ijfhmw3vyx0ch5k2bhi4a5rip6";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nodenv";
+          license = lib.licenses.free;
+        };
+      }) {};
     noflet = callPackage ({ fetchFromGitHub
                           , fetchurl
                           , lib
@@ -65207,12 +66193,12 @@
       melpaBuild {
         pname = "nord-theme";
         ename = "nord-theme";
-        version = "20180102.1001";
+        version = "20180913.1049";
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "b5c1dc762fe3acaa88a0ce9640085d45d0109c43";
-          sha256 = "0j1cbwlh646gkjp70maqbq7izchgc23wdax50ykgkw3mxhjrlsf2";
+          rev = "c4e0b5548e2f3a149658617b33813cb115bdecfe";
+          sha256 = "0am2gpk63b4cjlpdy1z2mrhq09q1hi54jqpmh2rvdvijsvp6335q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -65307,11 +66293,11 @@
       melpaBuild {
         pname = "notmuch";
         ename = "notmuch";
-        version = "20180503.1659";
+        version = "20180829.227";
         src = fetchgit {
           url = "https://git.notmuchmail.org/git/notmuch";
-          rev = "c20a5eb80520a11cb697a45b0d9553c68e2199c8";
-          sha256 = "13gpsgx5k26x8r38q56y01mfz2r1haxw76hc52mq8vypfl1gpw3x";
+          rev = "cfd015bda413a5fee0bcc80e73008234fe88736f";
+          sha256 = "19w0kn414xz4xaiiwn4npgpy57iip5406rf65fxn0w7bgvqanjk0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d05fbde3aabfec4efdd19a33fd2b1297905acb5a/recipes/notmuch";
@@ -65386,12 +66372,12 @@
       melpaBuild {
         pname = "nova-theme";
         ename = "nova-theme";
-        version = "20180530.801";
+        version = "20180905.1211";
         src = fetchFromGitHub {
           owner = "muirmanders";
           repo = "emacs-nova-theme";
-          rev = "2f41855ac250d822d2e8cec4610c8645718bd7e3";
-          sha256 = "0gc4jw9mdv2kmhwwf1avxr0magrdhpqlxakd29dxjq9md8qybrvj";
+          rev = "932c83e6e06e795c2a380b69eee3913a3a805cea";
+          sha256 = "1mawj1dxp2s9fqg24j0v5xfn0r6wrlvplbl4a71q553rsr3q63il";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/16457166c17fb1cc074a34c61e52ebc285c0eacc/recipes/nova-theme";
@@ -65546,12 +66532,12 @@
       melpaBuild {
         pname = "nu-mode";
         ename = "nu-mode";
-        version = "20180619.1428";
+        version = "20180907.1315";
         src = fetchFromGitHub {
           owner = "pyluyten";
           repo = "emacs-nu";
-          rev = "22cf474e70c4e72045bfb1630814ef03e3b76096";
-          sha256 = "0hfrf92kf3p91d5yn3b4i8x24j20v42rph4dvspmbmkfcyh9qinh";
+          rev = "21bb07edb120fb3f888e4b38f1dc99508bb83640";
+          sha256 = "1zhy2sg41l4nak1ry5xgzw373isdhj955zg3i4ivw1yax4c2h9pf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
@@ -65888,12 +66874,12 @@
       melpaBuild {
         pname = "ob-async";
         ename = "ob-async";
-        version = "20180624.1553";
+        version = "20180816.853";
         src = fetchFromGitHub {
           owner = "astahlman";
           repo = "ob-async";
-          rev = "2333106205fd3fa244ccdfbd95fcabf29eb81116";
-          sha256 = "0lqazlzqsqhhkag7k82ar2clbhhm17mv4bdw0fh8nh4bkpph7p5a";
+          rev = "2470490e6efb3f8efde1702f7986f6e31cc1ab6c";
+          sha256 = "0p1m5bg9nv0pxlg880v6i12j1hiviw53rwn8yi0qgdi00vccszkk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -66412,12 +67398,12 @@
       melpaBuild {
         pname = "ob-kotlin";
         ename = "ob-kotlin";
-        version = "20170725.718";
+        version = "20180823.621";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-kotlin";
-          rev = "3b2f57e9944cfc36f2714dc550db42159904929a";
-          sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j";
+          rev = "b817ffb7fd03a25897eb2aba24af2035bbe3cfa8";
+          sha256 = "1w31cj1wbblm9raav4kxbykf124k6rvn0ryxfn6myvv1x900w02a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
@@ -66591,12 +67577,12 @@
       melpaBuild {
         pname = "ob-restclient";
         ename = "ob-restclient";
-        version = "20180703.902";
+        version = "20180904.9";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "3af542c0895d7b4fabe84275ac5c7a214340c8ec";
-          sha256 = "0khrvpn92kxpfndzybk9h2and5a7rzazvj598lpwllfs1y8fbsas";
+          rev = "00b2c5a6637ab6e504708612357ffb29b5416e4b";
+          sha256 = "03jsdczywys5df1ac7bmli31wkxvbsymd5k0s6iaz62kc454l3wj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28c1d3af3f8b2f598b80b03b64de5d15cbb3f13d/recipes/ob-restclient";
@@ -66616,12 +67602,12 @@
       melpaBuild {
         pname = "ob-rust";
         ename = "ob-rust";
-        version = "20180606.1646";
+        version = "20180911.835";
         src = fetchFromGitHub {
           owner = "micanzhang";
           repo = "ob-rust";
-          rev = "a0e3c62ac3d4d44ae73746b5a45c04322c908bd3";
-          sha256 = "1hjn27k9jnykipb9lbk2py83abaawvsm503pkzmggd4zzpf6f9qq";
+          rev = "f57b489d931d6a7f9ca2b688af3352fd706f5f6b";
+          sha256 = "1fsvfy2yr22mhjkdn0bv3n3i8039a5gw5rs1cq41msv8ghb2cp0i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust";
@@ -66740,6 +67726,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-tmux = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , seq }:
+      melpaBuild {
+        pname = "ob-tmux";
+        ename = "ob-tmux";
+        version = "20180831.317";
+        src = fetchFromGitHub {
+          owner = "ahendriksen";
+          repo = "ob-tmux";
+          rev = "73bed0ebad27f0ad57ea67582494543eb2fab73d";
+          sha256 = "0wgfjm3xf4wz8kfxnijfmgkifp6f6fwk5y31vdwadkjjggbhp0pk";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a3f47fbfe745972e690e8028f893bb38ba30978d/recipes/ob-tmux";
+          sha256 = "12c0m2xxd75lbc98h7cwprmdn823mh2ii59pxr6fgnq7araqkz20";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-tmux";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-translate = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , google-translate
@@ -67457,12 +68471,12 @@
       melpaBuild {
         pname = "omnisharp";
         ename = "omnisharp";
-        version = "20180606.318";
+        version = "20180805.924";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "ef369f79f5e65077b640b0d7525a1c9a3739713f";
-          sha256 = "19awri250vya7c4pjmkwwxxnsimw0rjy75gary0g1hzr492zibdb";
+          rev = "fccbc4a7f63a3a140476bd8c56320ccb6cd18df2";
+          sha256 = "17qzdvwb4qzxdl4k8ndwggmxr7pnsinh6nz2ac19ammpbs1308fn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -67967,14 +68981,14 @@
         ename = "org-alert";
         version = "20180523.1833";
         src = fetchFromGitHub {
-          owner = "groksteve";
+          owner = "spegoraro";
           repo = "org-alert";
           rev = "f87bff4acbd839acb4d2245b56b2c3d21f950911";
           sha256 = "05xhp1ggpcgd48vcrxf9l43aasxfjw1ypgzpq3gp7031x83m9rr6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
-          sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org-alert";
+          sha256 = "01bb0s22wa14lyr9wi58cvk4b03xqq268y3dvxbrhymw1ld97zk2";
           name = "recipe";
         };
         packageRequires = [ alert dash s ];
@@ -68113,6 +69127,7 @@
         };
       }) {};
     org-bookmark-heading = callPackage ({ emacs
+                                        , f
                                         , fetchFromGitHub
                                         , fetchurl
                                         , lib
@@ -68120,19 +69135,19 @@
       melpaBuild {
         pname = "org-bookmark-heading";
         ename = "org-bookmark-heading";
-        version = "20170510.1008";
+        version = "20180904.1009";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-bookmark-heading";
-          rev = "8e184f1ab1ef68417db9f12c7dce4d221fe6d496";
-          sha256 = "1bhkfn2x02vpd0rxdgwz6lyycdnak2hxplna0hizim1k804gkxwn";
+          rev = "eba5ef7a3c992c4a9da86f64d12fca0c1158208a";
+          sha256 = "1amq48yldydg9prcxvxn5yi0k8xk87h1azscr9hh9phnll2yys1d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading";
           sha256 = "1q92rg9d945ypcpb7kig2r0cr7nb7avsylaa7nxjib25advx80n9";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs f ];
         meta = {
           homepage = "https://melpa.org/#/org-bookmark-heading";
           license = lib.licenses.free;
@@ -68172,12 +69187,12 @@
       melpaBuild {
         pname = "org-bullets";
         ename = "org-bullets";
-        version = "20171127.526";
+        version = "20180208.1543";
         src = fetchFromGitHub {
           owner = "emacsorphanage";
           repo = "org-bullets";
-          rev = "5b096148bc37306f73b27da838dca751d5b1936f";
-          sha256 = "1yxikvbsbrqv9kjh1dc55w3xm44x4s7gamxq4f6jm045p8abfqrr";
+          rev = "b56f2e3812626f2c4ac1686073d102c71f4a8513";
+          sha256 = "0a0dml6y49n3469vrfpgci40k4xxlk0q4kh2b27shjb440wrmv4x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6/recipes/org-bullets";
@@ -68232,8 +69247,8 @@
           sha256 = "01ffkk79wz2qkh9h9cjl59j34wvbiqzzxbbc9a06lh2rc946wgis";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b20edd229469b33ea87c40cfd06aa0bf95d149de/recipes/org-capture-pop-frame";
-          sha256 = "0g0b3vifwg39rb0fmad7y955dcqccnm01c6m27cv2x4xfib8ik3w";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/org-capture-pop-frame";
+          sha256 = "1k0njip25527nkn8w11yl7dbk3zv9p9lhx0a9xx293havjxygvyi";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -68304,12 +69319,12 @@
       melpaBuild {
         pname = "org-cliplink";
         ename = "org-cliplink";
-        version = "20180717.408";
+        version = "20180810.1334";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "org-cliplink";
-          rev = "7d35b09ebdb160a2aee3145766454a11d27b3fb7";
-          sha256 = "0kskxy07i2yhb36ncsqxm50m2cry40qc7gg4x4z7rhbmski653ab";
+          rev = "d99f6f9618ad8ed6185714786ed0e89fc439749d";
+          sha256 = "1q2abr0r1wv16wxl7gwzv1gxbq6bd4mg6l3kzi4pf73wjbnicq8s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -68516,14 +69531,14 @@
         ename = "org-doing";
         version = "20161017.920";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "org-doing";
           rev = "4819e75c827c2115bd28f3b3148d846aa64ccd9b";
           sha256 = "0pb7ljysh8ap572f9y813js6lvvac4kjky2a5r39hv28px33hmx5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
-          sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org-doing";
+          sha256 = "10vg0wl8dsy12r51178qi4rzi94img692z5x3zv8dxa29lmn26xs";
           name = "recipe";
         };
         packageRequires = [];
@@ -68541,12 +69556,12 @@
       melpaBuild {
         pname = "org-dotemacs";
         ename = "org-dotemacs";
-        version = "20151119.1022";
+        version = "20180801.1728";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "org-dotemacs";
-          rev = "99a066508fedf8c80a3bfef08e015e612499d417";
-          sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
+          rev = "49072168158b6cd45796e92e940c9ac71e181722";
+          sha256 = "18p9qpp1pja7b8bjsdghb2bfsqz72xg01ysmlj7105vn6zrsm161";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1847184312c8c95e7e81e5b3b73e5621cc2509/recipes/org-dotemacs";
@@ -68567,12 +69582,12 @@
       melpaBuild {
         pname = "org-download";
         ename = "org-download";
-        version = "20180625.842";
+        version = "20180831.631";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "434447251343164e3aacd9db17e67dd2a10b6e65";
-          sha256 = "1ckkwdyvxiwhlxl00fd96v01vb71bdnzb3xyl04pxwjsydcbsai0";
+          rev = "cf87c16810a08c8eaed790e99c2bea5b3c9bb1ae";
+          sha256 = "1jr0n426zm85nn6y2alrzldy3dn6j8gkwr2vaihb8xxcvp0vhjb8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -68776,6 +69791,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-emms = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "org-emms";
+        ename = "org-emms";
+        version = "20180820.1427";
+        src = fetchFromGitHub {
+          owner = "jagrg";
+          repo = "org-emms";
+          rev = "69752f482dbc265aafedbf1d19e7fd8f4265ca0b";
+          sha256 = "08naas4cpidy0lhbl7waq1qp4s9ljnq431k39q0lki2klbypg2ww";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7455b0d5439e058f39d17a75ec3232c8ac3e26ec/recipes/org-emms";
+          sha256 = "0gdv38dk70ncjn6xcrr8x75mw37f6p2w91jjy87v9zzrd7s22blh";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-emms";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-evil = callPackage ({ dash
                             , evil
                             , fetchFromGitHub
@@ -68842,16 +69883,16 @@
       melpaBuild {
         pname = "org-gcal";
         ename = "org-gcal";
-        version = "20170420.1401";
+        version = "20180827.108";
         src = fetchFromGitHub {
-          owner = "myuhe";
+          owner = "kidd";
           repo = "org-gcal.el";
-          rev = "270ae5d94a5d2e22cdd1fc4063534483a0dfef87";
-          sha256 = "0j6i05qczv14k1rw5bry6ys66ykh46dx9837lyswfl0mwrgl3i04";
+          rev = "8636d25c81f8cb02d6522427753e76b853bda491";
+          sha256 = "1hgbwp32psij3h0bypw2rl7bw5dsb8swy3426rfbsw9qllx3ivqw";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
-          sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d97c701819ea8deaa8a9664db1f391200ee52c4f/recipes/org-gcal";
+          sha256 = "014h67ba0cwi4i1llngypscyvyrm74ljh067i3iapx5a18q7xw5v";
           name = "recipe";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
@@ -68947,12 +69988,12 @@
       melpaBuild {
         pname = "org-index";
         ename = "org-index";
-        version = "20180720.127";
+        version = "20180830.850";
         src = fetchFromGitHub {
           owner = "marcihm";
           repo = "org-index";
-          rev = "54b1485eea187575840e4eac79b950273d243455";
-          sha256 = "1fmq30768cqhz52frkvrcr52wzbpaqbgwvgl28gac2dxzypg9zgb";
+          rev = "953f5a78f570be4745fb267523174e5f3fddc8a1";
+          sha256 = "15q9hp3w5k4a8f9n3cbsgmpzyc9v0w74chdi1s47hkw9dgq8ajpw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
@@ -68994,6 +70035,7 @@
         };
       }) {};
     org-jira = callPackage ({ cl-lib ? null
+                            , dash
                             , emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -69004,19 +70046,19 @@
       melpaBuild {
         pname = "org-jira";
         ename = "org-jira";
-        version = "20180625.2111";
+        version = "20180910.1339";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "03d6ebcf177db7b208c6a99386695e839f314314";
-          sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v";
+          rev = "28c23a10788682cce27aa479e5eb942138e1b03e";
+          sha256 = "15yw7ppm0l8rggdbgvc1izwn6w1lrgxpr4g74q3fjh9dkzmiyx0s";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
-          sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0a2fae6eecb6b4b36fe97ad99691e2c5456586f/recipes/org-jira";
+          sha256 = "1sbypbz00ki222zpm47yplyprx7h2q076b3l07qfilk0sr8kf4ql";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs request s ];
+        packageRequires = [ cl-lib dash emacs request s ];
         meta = {
           homepage = "https://melpa.org/#/org-jira";
           license = lib.licenses.free;
@@ -69030,12 +70072,12 @@
       melpaBuild {
         pname = "org-journal";
         ename = "org-journal";
-        version = "20180603.102";
+        version = "20180903.307";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "2395db4deb255c05d0d3a75c95f53263b74939c9";
-          sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71";
+          rev = "db9c4c352bd56bebcac940adc70bfb89063ef3b9";
+          sha256 = "0wigkkdi9yww83f076ykw6akwd716s2lwrc3hfr96vsw0zg33vh8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -69058,12 +70100,12 @@
       melpaBuild {
         pname = "org-kanban";
         ename = "org-kanban";
-        version = "20180722.1158";
+        version = "20180819.1755";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "4f499e97c4583e99b042f579110a8be197337bda";
-          sha256 = "0z7k240j1jqw8dqxwqr06ljnlmx3q0grrbangfr5py9z48dc63vl";
+          rev = "2fc1ed815f7155df1169f68b19c1ad847e620fee";
+          sha256 = "141j9z5a31hpxj073vf0yyhmdw3j89ywqac1a97c2k4967ps0nw1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
@@ -69165,12 +70207,12 @@
       melpaBuild {
         pname = "org-listcruncher";
         ename = "org-listcruncher";
-        version = "20180630.1326";
+        version = "20180814.2303";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-listcruncher";
-          rev = "6fb86f740f8b9fb283049132e108863d1918a893";
-          sha256 = "04nykrcmsx5pqhyk305n0xh828fmdng2pqhhnylisnwds1v13cbp";
+          rev = "daa948f54631dda96ed83a2c63265e176b177ff3";
+          sha256 = "0r6gmadd20w3giw40973kyl83954pdmhslxagn6vafh1ygg9vi83";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bed5078a3e56a825be61d158ca8321763b92f7c/recipes/org-listcruncher";
@@ -69249,12 +70291,12 @@
       melpaBuild {
         pname = "org-mind-map";
         ename = "org-mind-map";
-        version = "20180614.1352";
+        version = "20180826.1640";
         src = fetchFromGitHub {
           owner = "theodorewiles";
           repo = "org-mind-map";
-          rev = "c0578ee519ad54451e758e401acae2914f52c47a";
-          sha256 = "1z43c3vwmd8h8nnncp6fya0l73rfqmb6ij01mp027pxpazq3skhc";
+          rev = "41df4b2e30455494f1848b4e06cc9208aa9e902b";
+          sha256 = "0y0yjb0w6s5yxklcxkmylmw031plxhl9dvachx325mb9qcwskycp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
@@ -69385,12 +70427,12 @@
       melpaBuild {
         pname = "org-noter";
         ename = "org-noter";
-        version = "20180722.853";
+        version = "20180912.1347";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "447c890e173884e9ca459b73ac3a771fc59e8512";
-          sha256 = "01akk7zdyijclb3igmm56xyz2h9ffc0j0skawb1xwwrni7aphnbm";
+          rev = "9acb7c226e3ff0f922e8670bf67de391cfdb324a";
+          sha256 = "037sfxdrx886ih98hljxl96y3zpjbcibnc5q96ax9lgif9f6qz8r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -69989,12 +71031,12 @@
       melpaBuild {
         pname = "org-ref";
         ename = "org-ref";
-        version = "20180706.614";
+        version = "20180913.1607";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "0f951f8b59adc1ad4e82f514eaf1e3487b9a036e";
-          sha256 = "1d4f89ssy6wgsyl4w1linns73k22lkmcvhq5rc8sg9vdsb8inw6k";
+          rev = "25833720609736f92b4b8c82740dfdb1985e8c1e";
+          sha256 = "009qbp4z19dmqf34hbvbhk71y5sl6g6r0vss57mnizqq7wyk2y14";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -70158,12 +71200,12 @@
       melpaBuild {
         pname = "org-send-ebook";
         ename = "org-send-ebook";
-        version = "20180401.1015";
+        version = "20180731.2223";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "org-send-ebook";
-          rev = "efa80f3c1a26347097a16eca4dda2610627fcdf0";
-          sha256 = "097cpr9v0c03117z76cy0b9faq3zjvi45anvgrw4bkbgs5mh9x2l";
+          rev = "39ee6440ec6f29f67cb24e3c62e179342d3a7b11";
+          sha256 = "04q5kh6jxny2n68im1if8d4p257lx2q7gymlnbsslppl5jrnj8b5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/646106cf43649544056285aef8c4035b6e5bbbdb/recipes/org-send-ebook";
@@ -70241,12 +71283,12 @@
       melpaBuild {
         pname = "org-super-agenda";
         ename = "org-super-agenda";
-        version = "20180714.1348";
+        version = "20180912.354";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-super-agenda";
-          rev = "3b5e8faeec1333aca3cafbbaa350dacc95412086";
-          sha256 = "1l19c1pbxgyrc19jv8zp8mv60xhwf50g8fc7jmc24p73ckvff7w4";
+          rev = "4fb15caa693b588a73f82788861a964489316b67";
+          sha256 = "0adfv63zhqlpwvhr432hklpxkd5110sv891l3rgkxlhnz69n8p49";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -70448,6 +71490,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-timeline = callPackage ({ dash
+                                , emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "org-timeline";
+        ename = "org-timeline";
+        version = "20180812.419";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "org-timeline";
+          rev = "701f13246ad1ce286be69cc16c1126536b71e7ca";
+          sha256 = "09w5qd4bsahsp8qa14z380ahg5lmwdgvf6lqh092s142kljmag27";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/298bd714f6cefd83d594b0eea731a01fb2faf1ad/recipes/org-timeline";
+          sha256 = "0zlhjzjc7jwqh6wcys17hraz76n2hnjwffis02x71maclrf2cfdd";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-timeline";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-toodledo = callPackage ({ cl-lib ? null
                                 , emacs
                                 , fetchFromGitHub
@@ -70537,12 +71606,12 @@
       melpaBuild {
         pname = "org-tree-slide";
         ename = "org-tree-slide";
-        version = "20180424.1636";
+        version = "20180906.249";
         src = fetchFromGitHub {
           owner = "takaxp";
           repo = "org-tree-slide";
-          rev = "6608f8d43bf40acbddeb4434715283e5884c8a02";
-          sha256 = "0cp1pbpvb8dyg5milrhlarsygdfyzpy44yhf7xhrbfmk96v8073w";
+          rev = "d45152fad1c0a153251073806f1b65ebd3731411";
+          sha256 = "1qqjvbcwacxfkyq2y6vxsmlnq6z8b4fmxg91a9k4ws827qxrnass";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6160c259bc4bbcf3b98c220222430f798ee6463f/recipes/org-tree-slide";
@@ -70673,12 +71742,12 @@
       melpaBuild {
         pname = "org-web-tools";
         ename = "org-web-tools";
-        version = "20180531.1808";
+        version = "20180903.34";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-web-tools";
-          rev = "58c37ab50e99775cf4ed3d6884aa9c3f45d855de";
-          sha256 = "18kwlwv85qdaahp71r43h2hv1pn078jkfqfpmb7vvsks23i4vvh2";
+          rev = "7ad832950cb17890a4da751ae6d6817a7428f342";
+          sha256 = "0kak9h5ny00d39gnwspv53nadnag01brw2fq9zk5wpfc91h9bjng";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
@@ -70763,14 +71832,14 @@
         ename = "org2blog";
         version = "20171218.1911";
         src = fetchFromGitHub {
-          owner = "punchagan";
+          owner = "org2blog";
           repo = "org2blog";
           rev = "04ea7e80497ab7f7bc0d097f1807d3a085074812";
           sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
-          sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org2blog";
+          sha256 = "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33";
           name = "recipe";
         };
         packageRequires = [ htmlize metaweblog org xml-rpc ];
@@ -70995,12 +72064,12 @@
       melpaBuild {
         pname = "orgbox";
         ename = "orgbox";
-        version = "20140528.1826";
+        version = "20180826.1918";
         src = fetchFromGitHub {
           owner = "yasuhito";
           repo = "orgbox";
-          rev = "612dd2250dbae01c85342923223f9063aae535c5";
-          sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
+          rev = "609e5e37348815ec3ba53ab6d643e38b0cc4fe17";
+          sha256 = "0kg5ns87p8v6vsb7abgqcfnzi55fbgi7b5dj98hrvnlkv4sqz7pc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1948eca5a18f35b61b9a0baf532753fd105ba3a/recipes/orgbox";
@@ -71133,12 +72202,12 @@
       melpaBuild {
         pname = "orgtbl-aggregate";
         ename = "orgtbl-aggregate";
-        version = "20180620.1043";
+        version = "20180731.1454";
         src = fetchFromGitHub {
           owner = "tbanel";
           repo = "orgaggregate";
-          rev = "10996132229aff46a46d37b4983d8afb54446b07";
-          sha256 = "19f4gwixhr9v669ggbriyd4rnq43bz8qzqllxzfdbygm39vm2ira";
+          rev = "1079dfc3ca0f86fef6ca3e251f3829e031aef8c4";
+          sha256 = "17acwy9x23xh2fb3xhy5w3lz6ssnrv5nf33zsqadra9y1cxs9fcc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf64b53c9d49718a8ffc39b14c90539b36840280/recipes/orgtbl-aggregate";
@@ -71968,12 +73037,12 @@
       melpaBuild {
         pname = "ox-hugo";
         ename = "ox-hugo";
-        version = "20180720.1121";
+        version = "20180915.2";
         src = fetchFromGitHub {
           owner = "kaushalmodi";
           repo = "ox-hugo";
-          rev = "b7e04248bfdc3188e7f1dbd3d55b8d3b9c40906c";
-          sha256 = "0nfkrw4qvmhap19q6a1i8yml80jkrlrvzni9dfvxm8qjhihd74kc";
+          rev = "bdc20fb5bc3be9830d9265d75ebeb1cf7dffc7b9";
+          sha256 = "16ifi5gnp401rqpdqp0rgrdzdq7l0vmi72rsqv4m4p4hvvrkxzgs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
@@ -72042,6 +73111,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    ox-jekyll-md = callPackage ({ fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "ox-jekyll-md";
+        ename = "ox-jekyll-md";
+        version = "20180831.1032";
+        src = fetchFromGitHub {
+          owner = "gonsie";
+          repo = "ox-jekyll-md";
+          rev = "f997f41d89afd2360973ef8118b5221f17bba757";
+          sha256 = "1padg3nq2fn7f5x96z19iqmknk5z3aa8yyipz0v3bdv0a3iqngli";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e7ddae7938158d9da24bee861a88d4875235269/recipes/ox-jekyll-md";
+          sha256 = "0lfnrikrismcd2zyfb0sf3pwwx12cyki7kzs2mjlswq3sap8w544";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ox-jekyll-md";
+          license = lib.licenses.free;
+        };
+      }) {};
     ox-jira = callPackage ({ fetchFromGitHub
                            , fetchurl
                            , lib
@@ -72500,12 +73594,12 @@
       melpaBuild {
         pname = "package-build";
         ename = "package-build";
-        version = "20180628.2221";
+        version = "20180806.1922";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "befbd7fcb9d1c7143e3ce432eaae69160112e96d";
-          sha256 = "04mfnmcxrcd4kg5wcwkcnqk4ixr2mxhpc4aj3xgm5j1b3slma7zf";
+          rev = "dfcb7f0cdd949a55ad023fb76ce2ea66e149d762";
+          sha256 = "11qw5f2gfcf1s45z1v25g0bngcxwp6l9g98xf2aydh7p1pvpwpjp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -72570,31 +73664,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-plus = callPackage ({ fetchFromGitHub
-                                , fetchurl
-                                , lib
-                                , melpaBuild }:
-      melpaBuild {
-        pname = "package-plus";
-        ename = "package+";
-        version = "20170815.1956";
-        src = fetchFromGitHub {
-          owner = "zenspider";
-          repo = "package";
-          rev = "09f37a21256223a770d3b6a6174cb7da427720c3";
-          sha256 = "149ba7nq380azi4rypvk0xqdv3bin2sqvab9q1kcwg3kidhspx8a";
-        };
-        recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
-          sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
-          name = "recipe";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/package+";
-          license = lib.licenses.free;
-        };
-      }) {};
     package-safe-delete = callPackage ({ emacs
                                        , epl
                                        , fetchFromGitHub
@@ -72704,6 +73773,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    pact-mode = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "pact-mode";
+        ename = "pact-mode";
+        version = "20180905.947";
+        src = fetchFromGitHub {
+          owner = "kadena-io";
+          repo = "pact-mode";
+          rev = "5f401b282e2f8f897fd67e882312875f967be4d6";
+          sha256 = "1nqr7jw2anyicr9pxypsmqqwzjn9qnn770gsmdz6r2xam55j81vg";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b8e11b488c937ac9290f2e6acde92a87024a9012/recipes/pact-mode";
+          sha256 = "1awmczhz4cl2vxrn0h1wqkrhy1n9p4j3ayksvgifr4cfhqlsxk6v";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pact-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     paganini-theme = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
@@ -72712,12 +73807,12 @@
       melpaBuild {
         pname = "paganini-theme";
         ename = "paganini-theme";
-        version = "20180710.821";
+        version = "20180815.1221";
         src = fetchFromGitHub {
           owner = "onurtemizkan";
           repo = "paganini";
-          rev = "c7474dd275dca81e77542987c459b4baba1fe190";
-          sha256 = "0pvrsv3a94rp7g2p9is3f3mqkqlnd7kcpspdfn7wry3ighc0gqzq";
+          rev = "255c5a2a8abee9c5935465ec42b9c3604c178c3c";
+          sha256 = "0qhmj8dyy722ds8cmwghhxknwwis1w64wix2hdmzs21c5pa5hgkw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6fbb609b411df4fe6f66a7afe27eda7d297f140/recipes/paganini-theme";
@@ -72898,12 +73993,12 @@
       melpaBuild {
         pname = "panda-theme";
         ename = "panda-theme";
-        version = "20180203.2318";
+        version = "20180807.443";
         src = fetchFromGitHub {
           owner = "jamiecollinson";
           repo = "emacs-panda-theme";
-          rev = "548b06f3e37f017fa3996015016fb0e565b84d93";
-          sha256 = "1f2kzmk03vkq5jdkad6hg2rqjll1l91g48dh2piwdqrkjjbkwsvy";
+          rev = "53b4cbb6bfdd531a8366bf1d01eede420e1f93c9";
+          sha256 = "1l7vc6m6iklcdm3hw8h54q71wfk055mmmmzyp0hbvrnlicg5yvr9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a90ca1275ceab8e1ea4fdfa9049fbd24a5fd0bf5/recipes/panda-theme";
@@ -72951,12 +74046,12 @@
       melpaBuild {
         pname = "pandoc-mode";
         ename = "pandoc-mode";
-        version = "20180710.746";
+        version = "20180727.1501";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "f1fa01d3fd079a82c0561e6227b5e984910ec458";
-          sha256 = "0yy7h87zykdc8mrvam7rqjfibzbvci2phxzipq0cfq1mcq7ypdlm";
+          rev = "a3f25fec81022a76bc6aab236548d352b2a420cf";
+          sha256 = "0dfqgan4qwk826jjzyhdlihfq9sxnxgays83fb2150v29yjyj0n6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -73240,12 +74335,12 @@
       melpaBuild {
         pname = "parinfer";
         ename = "parinfer";
-        version = "20180718.16";
+        version = "20180904.144";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "04dd27a3f39d6dbe8e4e717a6f7dac26c9798bd8";
-          sha256 = "1n1ggfzyvnw9w3acqahiv4pnzhlmvr5rzv15m3iw35w77yki87x4";
+          rev = "a7c041454e05ec2b88333a73e72debaa671ed596";
+          sha256 = "14ld7r2867aqa1rzk75bzf6qivqd1va4ilawggnxbbx5j2d82r1d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -73318,12 +74413,12 @@
       melpaBuild {
         pname = "parsec";
         ename = "parsec";
-        version = "20171202.2031";
+        version = "20180729.1716";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "212f848d95c2614a86f135c1bf3de15ef0e09805";
-          sha256 = "11qr9i55530pzmiwilfazaqxcjw8sx1iry19jvzdqsffjqvx2mnl";
+          rev = "2cbbbc2254aa7bcaa4fb5e07c8c1bf2f381dba26";
+          sha256 = "1g1s8s45g3kkbi3h7w0pmadmzdswb64mkdvdpg2lihg341kx37gm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -73560,12 +74655,12 @@
       melpaBuild {
         pname = "password-store-otp";
         ename = "password-store-otp";
-        version = "20170928.18";
+        version = "20180814.2310";
         src = fetchFromGitHub {
           owner = "volrath";
           repo = "password-store-otp.el";
-          rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
-          sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
+          rev = "1819cd88463cd98a5be9a63273b09202dc2bba63";
+          sha256 = "1p53bpwbkjfq4b7znqy0283f7rv7hj4lpcrd9vcvwby6vz4312j7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
@@ -73973,14 +75068,14 @@
         ename = "pcmpl-homebrew";
         version = "20170110.1609";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "pcmpl-homebrew";
           rev = "d001520fec4715c9a4c73f02fd948bac371cc50a";
           sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew";
-          sha256 = "11yd18s79iszp8gas97hqpa0b0whgh7dvlyci3nd4z28467p83v8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pcmpl-homebrew";
+          sha256 = "1mfkg9i2hqq8mkhnc8yzc9br9wlhjv17vdvjzwhkybcbmhqf2qkm";
           name = "recipe";
         };
         packageRequires = [];
@@ -74001,14 +75096,14 @@
         ename = "pcmpl-pip";
         version = "20171201.33";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "pcmpl-pip";
           rev = "8b001b579fc015f80ee0e4f3211058b830bf7c47";
           sha256 = "0f8s2gn82dhyrnv0j688697xy0ig2yhn5m94gwhcllxq5a3yhbdg";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-pip";
-          sha256 = "19a3np5swpqvrx133yvziqnr2pvj8zi0b725j8kxhp2bj1g1c6hr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pcmpl-pip";
+          sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
           name = "recipe";
         };
         packageRequires = [ f s seq ];
@@ -74441,12 +75536,12 @@
       melpaBuild {
         pname = "persp-fr";
         ename = "persp-fr";
-        version = "20180103.642";
+        version = "20180801.27";
         src = fetchFromGitHub {
           owner = "rocher";
           repo = "persp-fr";
-          rev = "aeb3b5de6135269091bb9aa0396973766c27fc88";
-          sha256 = "0l6hlgn54iw2f6ry0gw79rsbz1r4svxf2xwffi580vi68wrcnvf2";
+          rev = "3f536440b120499464106fd25f182d7580192870";
+          sha256 = "0bnplxv6igry7ak3wvn2b88zm4aarv35z4z5q38x52k4zac94rl8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
@@ -74601,12 +75696,12 @@
       melpaBuild {
         pname = "pfuture";
         ename = "pfuture";
-        version = "20180715.524";
+        version = "20180908.404";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "pfuture";
-          rev = "e39d0d2953a5db7d9f567596865239012e506ac4";
-          sha256 = "0nd1asv8a0iqjvgaaxy4pyyfxcyk3rlyxndia78rzskkl53dqrc6";
+          rev = "7e312204f97d4fd3d602d3cf72e8340513a9ab85";
+          sha256 = "0h9gskp7d8l1a44g9ks49akrp8ansyfpnlg6mfqb255nnrnc2vdj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -75123,16 +76218,16 @@
       melpaBuild {
         pname = "php-mode";
         ename = "php-mode";
-        version = "20180608.250";
+        version = "20180828.2220";
         src = fetchFromGitHub {
-          owner = "ejmr";
+          owner = "emacs-php";
           repo = "php-mode";
-          rev = "cf1907be2ddca079146ef258ba95d525f17787e3";
-          sha256 = "1dpyid4qp8lak6pvhjh1p5nwbgz67nq1yhwir54k4wk39r1g6i08";
+          rev = "16b3f7c1ae894c74b4f59026470b0183bf1bc188";
+          sha256 = "0mc5nk8kabk6fp0xdbwwwhahxi6j7padm09g094hjgm2v293prxs";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
-          sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode";
+          sha256 = "1gqmcynz2wx09xjnk70db1a2pbnrh1vfm5vd6mks1s10y59bh0zq";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
@@ -75231,12 +76326,12 @@
       melpaBuild {
         pname = "phpactor";
         ename = "phpactor";
-        version = "20180721.1022";
+        version = "20180823.438";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpactor.el";
-          rev = "a09b2eb76228b39a9a6823dc6782e44bafc4b974";
-          sha256 = "10x999z1rlnjdvnpq4c7gf6n19a47nj954y3vbshb15d6wzxd923";
+          rev = "3a37596c4f663419520f864d682250116252abcd";
+          sha256 = "0jwxpygs0fw8261saafifpznck9ykzs68dpq9hr7m09qsgr4gcbi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
@@ -75313,12 +76408,12 @@
       melpaBuild {
         pname = "phpunit";
         ename = "phpunit";
-        version = "20171127.301";
+        version = "20180829.738";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
-          sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
+          rev = "fe6bc91c3bd8b329c6d26ad883a025f06b5121ee";
+          sha256 = "1silbfmv85r73pbc7f5cm4znc6644ngihfnhibk1fgp9j0rf7ahc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -75416,12 +76511,12 @@
       melpaBuild {
         pname = "picpocket";
         ename = "picpocket";
-        version = "20180610.359";
+        version = "20180914.1119";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "ce4b6ed088384f2414af82e8e4eae5b92c2874bf";
-          sha256 = "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv";
+          rev = "f0f9947a097b2a02901d6d0bb427c7a6e02f2af7";
+          sha256 = "0fnafiax2xb97vkvr8fd2x3rpnw72661k0p163mkvp1zp59zy6is";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -75858,12 +76953,12 @@
       melpaBuild {
         pname = "pkgbuild-mode";
         ename = "pkgbuild-mode";
-        version = "20180609.931";
+        version = "20180723.531";
         src = fetchFromGitHub {
           owner = "juergenhoetzel";
           repo = "pkgbuild-mode";
-          rev = "b19759d8c4fcb27ac3455d277ad8b81886f0ad97";
-          sha256 = "038xgic6ngvgsbn3ss3nvhdy3bhq425sas5lgg8z1nql8f4rz2kb";
+          rev = "358911236a070c5ec4e79887d8f45e67e141c547";
+          sha256 = "1kksj7w5kyhwc5bd1ys8f41ahai6xm8sdi3i4hj5bxbkskzsix6n";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/pkgbuild-mode";
@@ -75909,12 +77004,12 @@
       melpaBuild {
         pname = "plan9-theme";
         ename = "plan9-theme";
-        version = "20180606.2035";
+        version = "20180804.741";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "plan9-theme.el";
-          rev = "4c9455033e877b7ce464bc99de32f310cf0bcda9";
-          sha256 = "0arbhpms38i75a9dpqn9krv64bx47jaiccanqdgzf4slcb8kvk6z";
+          rev = "4c1050b8ed42e0f99ef64c77ec370a786bd0003c";
+          sha256 = "1l2bgdip617zkd9470rja1qyijpc896dvmc6dgclvaz1ajgjwa9j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -75953,26 +77048,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ fetchFromGitHub
+    plantuml-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
                                  , fetchurl
                                  , lib
                                  , melpaBuild }:
       melpaBuild {
         pname = "plantuml-mode";
         ename = "plantuml-mode";
-        version = "20170819.1033";
+        version = "20180816.312";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
-          sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
+          rev = "82ab084c8631e70b089448ace72525f647af4f10";
+          sha256 = "0jcsbswpg41r27i5xb5lvw17n1kndwl8df9iwyhpm26jh2i2hpyv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -76415,12 +77511,12 @@
       melpaBuild {
         pname = "pocket-reader";
         ename = "pocket-reader";
-        version = "20180719.1453";
+        version = "20180819.1307";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "pocket-reader.el";
-          rev = "baef400c607cb192fac9157d3f6ce5e1573628bd";
-          sha256 = "12j1za5d98svll26xi8igxk0zh8vz4i0bbscx8m39gn0grh5kmnb";
+          rev = "0eb2e678b3fdc8899e420e6ecca03a2ada4b6283";
+          sha256 = "0060h0g2992iw030qp5fr81gl0cac43dj9w2apzslp7dqmk3d9df";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
@@ -76476,12 +77572,12 @@
       melpaBuild {
         pname = "poet-theme";
         ename = "poet-theme";
-        version = "20180603.1523";
+        version = "20180913.7";
         src = fetchFromGitHub {
           owner = "kunalb";
           repo = "poet";
-          rev = "fddb662bfc55c535e5b13b3368e430916d8be70c";
-          sha256 = "1dicjjh68rs1mzzgy81s1phjbdc5mirwxb3ym8y1yirpb2hj4bal";
+          rev = "a419b8faa60c07a1445da3868e88035651137cbd";
+          sha256 = "1wbwsq04ld959f7x1h591wrp7a9zpcx9fq8g7da3ihipphvqccp0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40bbe29dee56f7989d8e87c03f4842e2b191acc3/recipes/poet-theme";
@@ -76596,6 +77692,142 @@
           license = lib.licenses.free;
         };
       }) {};
+    poly-R = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild
+                          , polymode }:
+      melpaBuild {
+        pname = "poly-R";
+        ename = "poly-R";
+        version = "20180906.1329";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-R";
+          rev = "b0518a2768740f97bdc65bf6291241ef143b7abd";
+          sha256 = "1ip1awfpq20m6rqxqmsprgfyji9i5np24x2q3fqk8y2pbfigpbaf";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-R";
+          sha256 = "1v2was6pdynwm22b4n2hkwyrr0c0iir9kp1wz4hjab8haqxz68ii";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-R";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poly-erb = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , polymode }:
+      melpaBuild {
+        pname = "poly-erb";
+        ename = "poly-erb";
+        version = "20180906.1354";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-erb";
+          rev = "187f9594251b4d15dd52f6ff838439df9b217267";
+          sha256 = "0xbb8bz98mj2glhnqhb3jgkwgglmf9hzilhnvq265hza00mkg28p";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-erb";
+          sha256 = "01c1z2jll497k1y8835pp54n121y0gkyz1pdxcdjjqv7ia8jwfyy";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-erb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poly-markdown = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , markdown-mode
+                                 , melpaBuild
+                                 , polymode }:
+      melpaBuild {
+        pname = "poly-markdown";
+        ename = "poly-markdown";
+        version = "20180912.1153";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-markdown";
+          rev = "fd9e89c08538326843dee6cf45331c674ae99237";
+          sha256 = "11f7lnfppis6a8sd3h69v2xs8ra7gzdfmkcbm2wq6sna6m3sn51k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-markdown";
+          sha256 = "0pxai5x2vz6j742s3bpcy82dxja6441fsgclhz1hbv2ykazbm141";
+          name = "recipe";
+        };
+        packageRequires = [ emacs markdown-mode polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-markdown";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poly-noweb = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild
+                              , polymode }:
+      melpaBuild {
+        pname = "poly-noweb";
+        ename = "poly-noweb";
+        version = "20180906.719";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-noweb";
+          rev = "cdc7227e1ba2ea9433487e66fd618699cf22c87d";
+          sha256 = "13dhf0a4cgrx3s0l12k0ynaiyl2q3b4alpy51rgznfvd45fvjnad";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-noweb";
+          sha256 = "1692js29wdjpxvcbcaxysbsq6pxdqr38frqf88ksldlz35cmy62b";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-noweb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poly-org = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild
+                            , polymode }:
+      melpaBuild {
+        pname = "poly-org";
+        ename = "poly-org";
+        version = "20180902.1536";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-org";
+          rev = "7e958ddc40a4d713dec8ce6664b3ae44df2c536c";
+          sha256 = "05l7mdifhnirl2kyb62rpp7ij3r54qfa0z5m57yxx6sv0cdy8rx4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-org";
+          sha256 = "1xrhdjmz3p5d3sgbfpmf6wksa1cpxqhy1wg17b5x8ah4w4yhpdca";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-org";
+          license = lib.licenses.free;
+        };
+      }) {};
     poly-ruby = callPackage ({ emacs
                              , fetchFromGitHub
                              , fetchurl
@@ -76605,12 +77837,12 @@
       melpaBuild {
         pname = "poly-ruby";
         ename = "poly-ruby";
-        version = "20170802.648";
+        version = "20180905.229";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "poly-ruby.el";
-          rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11";
-          sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b";
+          rev = "794ebb926ace23e9c1398da934701951432dcea2";
+          sha256 = "1ffm81hg1gah7hb9x556hda5g4j3gk4c986q9gaacvfizqak3gyy";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
@@ -76623,6 +77855,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    poly-slim = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , polymode
+                             , slim-mode }:
+      melpaBuild {
+        pname = "poly-slim";
+        ename = "poly-slim";
+        version = "20180902.1537";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "poly-slim";
+          rev = "cbf6ad711d4e166afc288eef95025d239b8d70ad";
+          sha256 = "1x9jkia12h5yrgm7hi5hlj0ffnmc4c9027wj16j528cv1hhs19l1";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/poly-slim";
+          sha256 = "15nh0d8y79rwc24akxfpf346jypadfgjjn6vlgaj6xjnj7wsp7ax";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode slim-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-slim";
+          license = lib.licenses.free;
+        };
+      }) {};
     polymode = callPackage ({ emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -76631,16 +77891,16 @@
       melpaBuild {
         pname = "polymode";
         ename = "polymode";
-        version = "20170307.322";
+        version = "20180912.1154";
         src = fetchFromGitHub {
-          owner = "vspinu";
+          owner = "polymode";
           repo = "polymode";
-          rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6";
-          sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh";
+          rev = "056ce9ea6e55655065bbbf234a03a04f5d0ed21d";
+          sha256 = "0zd97i1n4vqzjsjgn8cmng14qf0843anxp93l88yqmn9f5qzb5l5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
-          sha256 = "0md02l7vhghvzplxa04sphimhphmksvmz079zykxajcvpm2rgwc8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode";
+          sha256 = "15i9masklpy4iwskc7dzqjhb430ggn0496z4wb1zjj0b9xx4wj66";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -76760,12 +78020,12 @@
       melpaBuild {
         pname = "ponylang-mode";
         ename = "ponylang-mode";
-        version = "20171028.1356";
+        version = "20180804.821";
         src = fetchFromGitHub {
           owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df";
-          sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9";
+          rev = "963abdcdb398b71fb13a4f7d2ffde23eb20e2a23";
+          sha256 = "1h0y6x4h7higwdq569h2lk0iddd23c3csqjk7y5phvc0lq812xs0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -77075,12 +78335,12 @@
       melpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "20180708.702";
+        version = "20180901.1905";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "posframe";
-          rev = "945761dc70c62a04747c4c892bdf5fc38670e50e";
-          sha256 = "051gr067ac0bd59nzs4jqjqc27kbb6gl8whs106jwn39z0b0ndri";
+          rev = "08ef38d27dad266fb3f666890df4994db2346427";
+          sha256 = "056vkjgm9c875ngkzbmm4s7rnzj1hf59jzzkk1ma9fahc7yfinmi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe";
@@ -77364,12 +78624,12 @@
       melpaBuild {
         pname = "prescient";
         ename = "prescient";
-        version = "20180702.1140";
+        version = "20180823.1838";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "18ddbe85e040dcf6fa9aeba8c8ce9d143921423a";
-          sha256 = "1jaw3awjs1w65nclas891gramr2ib3svy8sph989wjbmlbg377zh";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
@@ -77493,14 +78753,14 @@
         ename = "pretty-mode";
         version = "20160614.1146";
         src = fetchFromGitHub {
-          owner = "akatov";
+          owner = "pretty-mode";
           repo = "pretty-mode";
           rev = "500085206e25b98d00b9ec996f91c87ba569c4ce";
           sha256 = "0m7ii971zxlz8a9yx2ljf9fmd8k6hc9w1q8mi5xi32v9viccjabs";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode";
-          sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pretty-mode";
+          sha256 = "0zm6azbl70qmq2ybi576wfs3mx0ny54mf97b94ac501miv4fv0mq";
           name = "recipe";
         };
         packageRequires = [];
@@ -77984,12 +79244,12 @@
       melpaBuild {
         pname = "projectile";
         ename = "projectile";
-        version = "20180721.352";
+        version = "20180910.2240";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "06f7148ad5168476879c11dcacc02e76439a0226";
-          sha256 = "167libx4b0xgnrz5xafbpylig4jmmn4dmqwqqcrf9953p37pn8ga";
+          rev = "0944c25d7679621cef1473ebb81cb560e9547a34";
+          sha256 = "0vw94x9n8cq9sr3w9jwazhvv8g17fif2f5sk2fcdmzdkwg3wxbq9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -78154,12 +79414,12 @@
       melpaBuild {
         pname = "projectile-ripgrep";
         ename = "projectile-ripgrep";
-        version = "20180301.651";
+        version = "20180914.800";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "1f4338eeeb4bb3084a4b43762fa69a2c93ddff85";
-          sha256 = "0im6l8gn3msl5jks3qif0jmi358kj46a50p2lirpjh6rnilmnanq";
+          rev = "93eca9138f6d6eea1af92f476c797ce19fa573d9";
+          sha256 = "0b1pa7srl1qmxaylv6iqy7rn4ajv9l87agpjrni01al01z6jfk1x";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -78294,12 +79554,12 @@
       melpaBuild {
         pname = "projector";
         ename = "projector";
-        version = "20180712.1549";
+        version = "20180724.1122";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "projector.el";
-          rev = "aeecd317b3031834569d2cd51171e377eacd0685";
-          sha256 = "1nnggqrla6w58ll19fh01fndhssqx7l1blw21r8j9rv1vvjmvf3p";
+          rev = "d4aad9449960457932c19123c7ea2d60a67d1cca";
+          sha256 = "1zj9kg99allzb1hlz646hhhq3d0spvs26hc3y3pxykr58s611lrv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -78443,6 +79703,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    proof-general = callPackage ({ emacs
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "proof-general";
+        ename = "proof-general";
+        version = "20180901.1008";
+        src = fetchFromGitHub {
+          owner = "ProofGeneral";
+          repo = "PG";
+          rev = "65d69a7a6a4a5aa5518fd55671d58b0b4a350fe2";
+          sha256 = "0a2b4lsyqmh7vv4jr1awnqimpmi7p0c8zq71pvcii6bbaj9x5351";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/135c8f2a04739145b500b8742a697907e398d270/recipes/proof-general";
+          sha256 = "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/proof-general";
+          license = lib.licenses.free;
+        };
+      }) {};
     prop-menu = callPackage ({ cl-lib ? null
                              , emacs
                              , fetchFromGitHub
@@ -79488,12 +80774,12 @@
       melpaBuild {
         pname = "pyim";
         ename = "pyim";
-        version = "20180712.640";
+        version = "20180910.2113";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "pyim";
-          rev = "b0ad82aa86124d74f9dfbdcad24199e111e5445c";
-          sha256 = "03dq9mnz5mdbk3q9id0i4wf41r9ap3p5avihd0f4m77sspjfn9ix";
+          rev = "bdc8d921ae4d0f96716954c8734a2d0620aec809";
+          sha256 = "0iabp7x3za0w6a5yv7rcvz32d8qvwyxxw90n138v1z2a6753fc8k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -79878,12 +81164,12 @@
       melpaBuild {
         pname = "python-mode";
         ename = "python-mode";
-        version = "20180721.1147";
+        version = "20180814.21";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "acb7714fd24ce06e1800fb955d547d367c64439d";
-          sha256 = "1bmd0qc7qbzpxfg0wj4fs4qmdqdjar2zn8ljgr845j7qbxd0hcav";
+          rev = "2353ed7b039693e70b39bd829f01d235b23fbbd3";
+          sha256 = "0rc1kqz2b6r6b6wvbvlrhgcc7dxs6hml01hb4plmgsnqsi8hx4g7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -79909,12 +81195,12 @@
       melpaBuild {
         pname = "python-pytest";
         ename = "python-pytest";
-        version = "20180614.253";
+        version = "20180725.446";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-python-pytest";
-          rev = "1ddb1ec183872dbcf383a4cc60b60944aaba7727";
-          sha256 = "190ccqvdnxdsslsdn7c2b3a2377jrrpi4gj8rdbbksmjyr20gbf2";
+          rev = "09ad688df207ee9b02c990d3897a9e2841931d97";
+          sha256 = "18v7kxdhrayxg2pgbysm0y47xpdvwa15fmazpkfg0q8dfp2j3022";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest";
@@ -79996,12 +81282,12 @@
       melpaBuild {
         pname = "python-x";
         ename = "python-x";
-        version = "20180218.1447";
+        version = "20180802.1042";
         src = fetchFromGitLab {
           owner = "wavexx";
           repo = "python-x.el";
-          rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5";
-          sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr";
+          rev = "74d8c7eb824846de94705b1e74ee03ef109868d1";
+          sha256 = "00vy3qqkg3zzvjk1cmkl72nmvjdhrccybd36ggnzszq73szcl7n2";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1cf98dff029d494007fe25d29bd8bcfecc5b8e6/recipes/python-x";
@@ -80024,12 +81310,12 @@
       melpaBuild {
         pname = "pythonic";
         ename = "pythonic";
-        version = "20180624.2212";
+        version = "20180807.2120";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "838eaf47c23628c5e88a59796bbe4653c57bf5c0";
-          sha256 = "11gq0crq9ng6wy15kpv3zgahczyzv8clakwal1mvb6b5jq6ndmb5";
+          rev = "4eb5ad0d80308495c8a369c4268825d3ae2d3807";
+          sha256 = "1mm2np4vrqj60ni4d9rvhg8v9ihban5j85sl8w9l6ca1j3wf20jv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
@@ -80049,12 +81335,12 @@
       melpaBuild {
         pname = "pyvenv";
         ename = "pyvenv";
-        version = "20180720.214";
+        version = "20180831.147";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "5824c8986bc3d21b1b0ab6a00d396bedbe1506b2";
-          sha256 = "0qdaxfl6bhxg41r6fhpqwzjrxmjnp7pznrk1r3zfyris60ih91cq";
+          rev = "921ae2356b6a111ac0b7e44fd04cba8e95cbe936";
+          sha256 = "04kxx8fjqzzdl2rn56vn9jac2v3irpmr9dfckwfa3r4gslvipybm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -80204,10 +81490,10 @@
       melpaBuild {
         pname = "quelpa";
         ename = "quelpa";
-        version = "20180711.1338";
+        version = "20180907.1532";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/quelpa.git";
-          rev = "66c760b43eb6158f520df4e514f1d9c8e4ddee71";
+          rev = "571ee896e00fd0b90373b94bf2689e1b9741a60e";
           sha256 = "0qz5zfj24cmaw903xszf8zg4hmas6q8k6bx5c10vq45rwqkdcgva";
         };
         recipe = fetchurl {
@@ -80231,11 +81517,11 @@
       melpaBuild {
         pname = "quelpa-use-package";
         ename = "quelpa-use-package";
-        version = "20180617.2356";
+        version = "20180812.329";
         src = fetchgit {
           url = "https://framagit.org/steckerhalter/quelpa-use-package.git";
-          rev = "54ebc63607647fe4f26b56519d81e18f0e70a689";
-          sha256 = "1f007lkjb42rlfsnwkj61fdqyncw4587x8a9qbhq583bfh2d3p5c";
+          rev = "90fc1eadf3f7ff3a3bef07d229a807aba2f7beef";
+          sha256 = "1ij5fqnd0ypn66v8b4s2577b47ninmk085hnjjc4fav6a5gd5csr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a496196d405c152600d44ef4aa28557f489c542c/recipes/quelpa-use-package";
@@ -80523,12 +81809,12 @@
       melpaBuild {
         pname = "racket-mode";
         ename = "racket-mode";
-        version = "20180719.854";
+        version = "20180830.918";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "0f75097771a8ad9b9356c915ba877353aff1e7f6";
-          sha256 = "0ms31sjxxww93j0f731ww7yj3adl2scpr3m1zx4w5094mi69babg";
+          rev = "2b1c7d476dc71b1707fd5222f963ab6509e50805";
+          sha256 = "0qdjn4xvnkamfzn6aq1lmmfmzw9ddj6p2azxpwi8cxzz1irdlydp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -81267,12 +82553,12 @@
       melpaBuild {
         pname = "real-auto-save";
         ename = "real-auto-save";
-        version = "20180107.1850";
+        version = "20180802.2147";
         src = fetchFromGitHub {
           owner = "chillaranand";
           repo = "real-auto-save";
-          rev = "d813632c1e754539cc92953ac4c3609105f9af58";
-          sha256 = "0gz0w7zxl865shz9mf5xv8xi5mjq969600jqh4laazvhyk32skmg";
+          rev = "fb1477244fe365cc79c6946507fde2caf71af600";
+          sha256 = "0g4a3cmfngx59byn22ihq6izpjg1srpgn3gkx13jdsxdwxrwbg14";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
@@ -81299,14 +82585,14 @@
         ename = "realgud";
         version = "20180710.1953";
         src = fetchFromGitHub {
-          owner = "rocky";
-          repo = "emacs-dbgr";
+          owner = "realgud";
+          repo = "realgud";
           rev = "da2a74b50a770a2c1166656a05ba9d132a2a5c73";
           sha256 = "0w5lbwjaraw11sj36a9hsywa187g97hnvksrd6wbf8prbfwhghlx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
-          sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud";
+          sha256 = "0wbcclgd23d91c7lx8yx7qigcbc0ywr4hjh7h49pi2avy1cm2q0v";
           name = "recipe";
         };
         packageRequires = [
@@ -81333,14 +82619,14 @@
         ename = "realgud-byebug";
         version = "20180308.1923";
         src = fetchFromGitHub {
-          owner = "rocky";
+          owner = "realgud";
           repo = "realgud-byebug";
           rev = "de603d58aa9ef72a2619247a0234fccf6bc2cc9a";
           sha256 = "1hk2z7axy1v5yvx4xgkisfk00varq5rf8j88f0l63ywylyw1fwhl";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
-          sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-byebug";
+          sha256 = "1akv9raa6yb5h4lsvz7mxlnd9l7adg2rpgw7ski6036n6facn18a";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
@@ -81361,14 +82647,14 @@
         ename = "realgud-old-debuggers";
         version = "20170316.31";
         src = fetchFromGitHub {
-          owner = "rocky";
+          owner = "realgud";
           repo = "realgud-old-debuggers";
           rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94";
           sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers";
-          sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-old-debuggers";
+          sha256 = "14kig9yxss9nfc0cc54ph80pbdrmh1mdazypiwxbnj2nk1dk3qsv";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
@@ -81389,14 +82675,14 @@
         ename = "realgud-pry";
         version = "20160805.745";
         src = fetchFromGitHub {
-          owner = "rocky";
+          owner = "realgud";
           repo = "realgud-pry";
           rev = "fca36075a223f6a4a643764199babe3d1dfde2ac";
           sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry";
-          sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-pry";
+          sha256 = "1f8qap30r26gg33i76474zk6fs3r9qjf7jrxpm4xwpbjraggqy3z";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs realgud ];
@@ -81415,14 +82701,14 @@
         ename = "realgud-rdb2";
         version = "20160303.43";
         src = fetchFromGitHub {
-          owner = "rocky";
+          owner = "realgud";
           repo = "realgud-ruby-debugger2";
           rev = "e63eeed131517a9e8225f972c9f6c975c8121e41";
           sha256 = "0skaw5fzvqk56mfk3ciy9n85vznq1sxv6w575v3jd80w2dns4yay";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2";
-          sha256 = "0wqvgb3h2b0ys76sq2z462cjv0fajqc41f7wqvf53wfcs2zw4l9y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud-rdb2";
+          sha256 = "16pk034g26xnbsz0w9z8p76jiaraz8lvbf5hf0mmg1f5f4xlinz7";
           name = "recipe";
         };
         packageRequires = [ realgud ];
@@ -81439,12 +82725,12 @@
       melpaBuild {
         pname = "reason-mode";
         ename = "reason-mode";
-        version = "20180722.437";
+        version = "20180727.1158";
         src = fetchFromGitHub {
           owner = "reasonml-editor";
           repo = "reason-mode";
-          rev = "5777cce583039df82a49c6fc8b57c99f127b2565";
-          sha256 = "0baxdq02i0lwk2ll3jddfz5w1paq496vd3if2p7vfipgf79y0n8g";
+          rev = "4123ee5b3dccf8986e94d5f51220a544deee0b93";
+          sha256 = "0w5957fniyx58a4qnmabrkisz8302f3hmsip7gg2r272fbf29nzc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
@@ -81457,6 +82743,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    reazon = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "reazon";
+        ename = "reazon";
+        version = "20180908.2010";
+        src = fetchFromGitHub {
+          owner = "nickdrozd";
+          repo = "reazon";
+          rev = "3735592366666f6fccae37ce2f4ca07c0d3b5da9";
+          sha256 = "1z9s55vzc0ckap3ngsbvw5f5wy3sf053w9j46xzx8qcvz0zgr76j";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/77020b6ea36a4115bdddbc9599fe4f4193ecc29d/recipes/reazon";
+          sha256 = "1lymdc1lnwr7s8s15mnjcavxdyqncy2rkfdj571lf1a37y52jcj1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/reazon";
+          license = lib.licenses.free;
+        };
+      }) {};
     rebecca-theme = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -81777,12 +83089,12 @@
       melpaBuild {
         pname = "redshank";
         ename = "redshank";
-        version = "20180128.1348";
+        version = "20180729.2107";
         src = fetchFromGitHub {
           owner = "emacsattic";
           repo = "redshank";
-          rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8";
-          sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6";
+          rev = "d059c5841044aa163664f8bf87c1d981bf0a04fe";
+          sha256 = "1545z1dd85zg8sg2r5r5gdnmgxbxwjvl5xklx5nvpd0gbxlwbpqk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank";
@@ -82298,12 +83610,12 @@
       melpaBuild {
         pname = "replace-with-inflections";
         ename = "replace-with-inflections";
-        version = "20170911.245";
+        version = "20180830.2335";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "replace-with-inflections.el";
-          rev = "e286036a5d1dbac06a72a1e831b2a8d9cad27238";
-          sha256 = "1szbps1k3na3w9djkqxm3s1anm12505ajr7ay9j7pmd00qf75379";
+          rev = "d9201e047856492f282da65459b28aba25998dbb";
+          sha256 = "09yvn489z33hww7mi1flh344faxrpbkzqhm0i6xb2rridcj7acqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
@@ -82343,7 +83655,7 @@
         };
       }) {};
     req-package = callPackage ({ dash
-                               , fetchFromGitHub
+                               , fetchFromGitLab
                                , fetchurl
                                , ht
                                , lib
@@ -82353,16 +83665,16 @@
       melpaBuild {
         pname = "req-package";
         ename = "req-package";
-        version = "20180506.2350";
-        src = fetchFromGitHub {
+        version = "20180121.2100";
+        src = fetchFromGitLab {
           owner = "edvorg";
           repo = "req-package";
-          rev = "f97d7531a3e7526f2d7b008868eb647c80d0de5d";
-          sha256 = "1yl1ap5jlrkvhw47c1xyb9q4khqqnz38y5rvbvw4zib1ik9vwhmc";
+          rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6";
+          sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
-          sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aa5bc1909f807ec03ad441d78013ba8626cd410a/recipes/req-package";
+          sha256 = "1zjhc6f9qcb3j72k1llp6vym25lxnvq1jgqgmnrjxxwc4fhxx595";
           name = "recipe";
         };
         packageRequires = [ dash ht log4e use-package ];
@@ -82719,12 +84031,12 @@
       melpaBuild {
         pname = "reykjavik-theme";
         ename = "reykjavik-theme";
-        version = "20160109.0";
+        version = "20180823.844";
         src = fetchFromGitHub {
           owner = "mswift42";
           repo = "reykjavik-theme";
-          rev = "0d04f21a8d4c98accd278a1ba360ea3fa7cac812";
-          sha256 = "07gcz2zmz1hhrailad9jfjflkyf1lkm8cdyvnd752064dkdja7y7";
+          rev = "2cd0043ae6d046f812a95bb26398ea23141beccc";
+          sha256 = "0rk0fw5b1lz7if779h3bngc86iix8v9k8bz3zw8icwfwmjsgg1fh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10bf153e2b84050304ba2532f5eb41c7a4e7632f/recipes/reykjavik-theme";
@@ -82747,12 +84059,12 @@
       melpaBuild {
         pname = "rg";
         ename = "rg";
-        version = "20180626.1041";
+        version = "20180915.350";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "ca5afceb3dd84590ffadd525a9643befbae0959f";
-          sha256 = "03f13vcknlwdbq4997q82z6gl718mv83k88rnynh1m4v4hcpwv09";
+          rev = "d1f4ec40cabc24524306d9a58590a3ad3c49b9cf";
+          sha256 = "0fzzw7c5ydja20n3grwmv3rl6q3f5z2prcnl8xny1l5nr4iv2r4r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -82876,12 +84188,12 @@
       melpaBuild {
         pname = "rimero-theme";
         ename = "rimero-theme";
-        version = "20180630.515";
+        version = "20180901.648";
         src = fetchFromGitHub {
           owner = "yveszoundi";
           repo = "emacs-rimero-theme";
-          rev = "dc6917b7404d3f79044046c231a195c40c9d0a88";
-          sha256 = "0zjs76lp4mpds7hkxbks2lj77ifbnzgq74xdl6minfcxc3wjkbvi";
+          rev = "a2e706c2b34f749019979a133f08a2d94a1104b3";
+          sha256 = "1kcvvaizggzi7s3dlh611bkirdf6y89kzddc273drdks705s01wh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
@@ -83008,12 +84320,12 @@
       melpaBuild {
         pname = "rjsx-mode";
         ename = "rjsx-mode";
-        version = "20180624.1758";
+        version = "20180913.1524";
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "8bdb234f2b66a2ce0563b676447ebb8db37d593f";
-          sha256 = "047mfmj6rklxiqg43ji4gb5qr86z8q1717imsjffrkbjq3iqlw6j";
+          rev = "68fe4c0e0277220e04f420e1968b9d251b4b75d1";
+          sha256 = "1x187pna2dbx8wqiy1w3ffs8wggnn33s5rcakqmailin6z2vkdch";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -83289,12 +84601,12 @@
       melpaBuild {
         pname = "rtags";
         ename = "rtags";
-        version = "20180619.823";
+        version = "20180909.1049";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "015cde3b77d9971e890f25b54cccfdb2582970fa";
-          sha256 = "00fs8181nrgnx9bcsc479rhgvxx7hh8byxnzi9g6kl4ak1cmc7jx";
+          rev = "ce3bdfd90a73dd891b450e60c6a7683ce4f724f5";
+          sha256 = "0ijhz6p6xd0xbbk6b5sz1ynr7fbh81yv7r82q6ic3pb5a737sc6k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -83370,14 +84682,14 @@
         ename = "rubocop";
         version = "20170311.2211";
         src = fetchFromGitHub {
-          owner = "bbatsov";
+          owner = "rubocop-hq";
           repo = "rubocop-emacs";
           rev = "980bedb455e3551d35a212fae515c054888907c1";
           sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
-          sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/rubocop";
+          sha256 = "07ma4fv015wzpj5j4rdb0ckwwmhkxs3k5vy33qxgwghqmn6xby6x";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -83877,24 +85189,23 @@
                                    , fetchFromGitHub
                                    , fetchurl
                                    , lib
-                                   , melpaBuild
-                                   , rust-mode }:
+                                   , melpaBuild }:
       melpaBuild {
         pname = "rust-playground";
         ename = "rust-playground";
-        version = "20180507.1032";
+        version = "20180807.458";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b";
-          sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg";
+          rev = "092c8b11d62dea23953a004744833092bac85fe1";
+          sha256 = "0n2c1pjbvy46ic0k84jd3ffwwb5hibjqc1wv7knzkldi5agigfsh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
           sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
           name = "recipe";
         };
-        packageRequires = [ emacs rust-mode ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/rust-playground";
           license = lib.licenses.free;
@@ -83906,26 +85217,39 @@
                           , fetchFromGitHub
                           , fetchurl
                           , lib
+                          , magit
+                          , markdown-mode
                           , melpaBuild
                           , projectile
                           , s
+                          , spinner
                           , xterm-color }:
       melpaBuild {
         pname = "rustic";
         ename = "rustic";
-        version = "20180722.1209";
+        version = "20180913.838";
         src = fetchFromGitHub {
           owner = "brotzeit";
           repo = "rustic";
-          rev = "15e4d58ded3436b4da4b1a54e5f527ca3d5de22b";
-          sha256 = "1jra1l0bz7bxkgsc0jgi9xmf1vipvzazkg40m58hhlbq1hynxm8z";
+          rev = "78143a0dcb0a11b37d011b06c4b16eb0ab4f9bb6";
+          sha256 = "00pz9snlp4m0mga700wqnjiikfngfpmis25kndvyb21s1vlrnrb0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/716c14a2ed8f5817c09c1ff530a4980c17b44bb3/recipes/rustic";
           sha256 = "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n";
           name = "recipe";
         };
-        packageRequires = [ dash emacs f projectile s xterm-color ];
+        packageRequires = [
+          dash
+          emacs
+          f
+          magit
+          markdown-mode
+          projectile
+          s
+          spinner
+          xterm-color
+        ];
         meta = {
           homepage = "https://melpa.org/#/rustic";
           license = lib.licenses.free;
@@ -84408,12 +85732,12 @@
       melpaBuild {
         pname = "sayid";
         ename = "sayid";
-        version = "20180404.1139";
+        version = "20180901.203";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f";
-          sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77";
+          rev = "a6d319ff55dc2f06d873d43f3924339d1dffd4c5";
+          sha256 = "1a3l7l47sncmizs3d0zj1qais89yzfksvki5smry02l4q3nzk52h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -84587,14 +85911,14 @@
         ename = "scheme-here";
         version = "20141028.18";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "scheme-here";
           rev = "fccf668bb8f1d481be6e70fffa2b52ea681e32a5";
           sha256 = "1m5aqcm4pd0m0rz3r09i52q55nlx3ga7hca9xlzf0gwcyyn8xzyg";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/scheme-here";
-          sha256 = "04lmkf3zc396anlp9s9irdkqavsc0lzlpzprswd4r2kp4xp7kcks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/scheme-here";
+          sha256 = "17r77b99nh03v79r97fzr3pyvigp4w8gr41k6zzj82xka2swhr2h";
           name = "recipe";
         };
         packageRequires = [];
@@ -84743,12 +86067,12 @@
       melpaBuild {
         pname = "scpaste";
         ename = "scpaste";
-        version = "20171101.922";
+        version = "20180822.851";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "scpaste";
-          rev = "10559d6b0feb34dc60f039a237052adcca77b5d9";
-          sha256 = "10z8jpi6f3mhq8ymxcv1lc291sqr2kzvgwx8mlmck0bmlys12pqc";
+          rev = "9757bb5b38f2ec9200391864a9f6971a14b60fc9";
+          sha256 = "0sp8rkaylwpibdxvvxdb3zf4fi8klfcmkkbd7hdll36dwc3yk75v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
@@ -84924,14 +86248,14 @@
         ename = "scratches";
         version = "20151005.2116";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "scratches";
           rev = "9441afe6396ca38f08029123fab5d87429cbf315";
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/scratches";
-          sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/scratches";
+          sha256 = "116bjy1m35h83r2c354i2xk1br87nmvd99kbzax0wgkkkcjff8c4";
           name = "recipe";
         };
         packageRequires = [ dash f ];
@@ -85369,12 +86693,12 @@
       melpaBuild {
         pname = "semi";
         ename = "semi";
-        version = "20180204.1448";
+        version = "20180825.201";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "semi";
-          rev = "44aa82ecf78273d8ff4c84f2121b885fb7149f41";
-          sha256 = "1wl12gsz9pn4wzgbffv3ymr49kcxjggc2jx19kxqyjmwdnw004yf";
+          rev = "d445dbdf39bab9aaf00582506357f25f1b78d76d";
+          sha256 = "10bd95fd9sf3fn7x1vrfl7nra5sg4df8v39bl7yc3i9gh9yiiy9q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi";
@@ -85641,12 +86965,12 @@
       melpaBuild {
         pname = "sesman";
         ename = "sesman";
-        version = "20180719.213";
+        version = "20180903.1126";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "sesman";
-          rev = "43b0c9ef2a9ba7608d27c24fb0daedc1deabf179";
-          sha256 = "1w0fy74snc7gy7cmxfmlbvmdgpywi3grj5ph72liinxlpl1cw218";
+          rev = "5a9727ee82a74035fa6aee1e4b94829bd4260f0c";
+          sha256 = "0afnbgdq6cbiy2q4nqfvfg2xq7mhlyzfdcw8adbnql4x8a9z94ih";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman";
@@ -86149,12 +87473,12 @@
       melpaBuild {
         pname = "shen-elisp";
         ename = "shen-elisp";
-        version = "20170427.1502";
+        version = "20180915.958";
         src = fetchFromGitHub {
           owner = "deech";
           repo = "shen-elisp";
-          rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa";
-          sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2";
+          rev = "e719fa0fe45926d098676b5c73bae62598b90451";
+          sha256 = "1ki3jxk00gpyb6b1rfln591mm7nmndn8rdxh5gj73bhp7i4pz5ln";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp";
@@ -86514,12 +87838,12 @@
       melpaBuild {
         pname = "shx";
         ename = "shx";
-        version = "20180528.1408";
+        version = "20180909.859";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef";
-          sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5";
+          rev = "758ad3ab21daa055982ee5d165522a0de7948e93";
+          sha256 = "0p923v4iqmyr4fhr2h5ydfaqplkhqllig6dcgp0bjvj7n9v8zpng";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -86564,12 +87888,12 @@
       melpaBuild {
         pname = "sicp";
         ename = "sicp";
-        version = "20171028.1523";
+        version = "20180823.522";
         src = fetchFromGitHub {
           owner = "webframp";
           repo = "sicp-info";
-          rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb";
-          sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8";
+          rev = "33acfa10a058aa65b6b22084a5b86a82410d794e";
+          sha256 = "1l8isy8kicr4xa6iilxj0cf0f5rqmkidzr6pigql74204db56jhd";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp";
@@ -86927,12 +88251,12 @@
       melpaBuild {
         pname = "simpleclip";
         ename = "simpleclip";
-        version = "20170803.540";
+        version = "20180811.908";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "d461c462c237cd896553adb468cd77499d0d26ad";
-          sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
+          rev = "7fff9a1e574466878b5f91e9b56b16e490045aaa";
+          sha256 = "02bj8b4xg930wzrjam0569k5cj1y0gkv28sjy567skdiw5zl14nn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -87276,12 +88600,12 @@
       melpaBuild {
         pname = "slime";
         ename = "slime";
-        version = "20180719.1821";
+        version = "20180903.1409";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "289e4d7117b034dea668a6d28f9ddb7eb80f57ed";
-          sha256 = "0sanswnqyk50hgkr0p0zhxm3dfg72p4xcv7ivf2vivfqq68pyvym";
+          rev = "114bc26170523f3215b319baa35569ba6b3e6917";
+          sha256 = "1v8xxdq7djjqbvxyh2zcx5rifxfdgnyxl5bg2vbsjry7lysqs7jr";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -87453,6 +88777,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    slow-keys = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild }:
+      melpaBuild {
+        pname = "slow-keys";
+        ename = "slow-keys";
+        version = "20180830.2159";
+        src = fetchFromGitHub {
+          owner = "manuel-uberti";
+          repo = "slow-keys";
+          rev = "b93ad77f9fc1d14e080d7d64864fc9cb222248b6";
+          sha256 = "1s4yk6w9fqf6hmimjcq8r7b54v7f2hz3isihiaidj3sv5zclhflw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5d16756967dd9077399b92cde2ddd7784739b693/recipes/slow-keys";
+          sha256 = "03p0qx8a3g8mapjhdf9pjp3n0ng2pxmizpqn87wk8mbc8cmlwk2w";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/slow-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
     slstats = callPackage ({ cl-lib ? null
                            , emacs
                            , fetchFromGitHub
@@ -87488,16 +88838,16 @@
       melpaBuild {
         pname = "sly";
         ename = "sly";
-        version = "20180722.1611";
+        version = "20180906.558";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly";
-          rev = "4b260fdda880f8287327c0c0055e2f18fd91201d";
-          sha256 = "05s248657hgi4sp8g1d5zsq1x4nwxvairzx17psqkwflxc11cpv6";
+          rev = "25255c1756ac4b78d60db9a6bb979ccb2c5cdf29";
+          sha256 = "109srjg00r87fcsd9vj2iilkph9r716hria4zmixxh4z8rgiww12";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
-          sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly";
+          sha256 = "18as0g1fi1x6lgjzd9rn2s6iw3n00q3nxi99lchjnn004pwsv8kq";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -87516,14 +88866,14 @@
         ename = "sly-hello-world";
         version = "20160119.636";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly-hello-world";
           rev = "1bfcca692b6ec0670ed309ffe29eb9384397c183";
           sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d52ef4b249a42432eed6a260a758e26b50bc31d6/recipes/sly-hello-world";
-          sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly-hello-world";
+          sha256 = "0mry5r0qc2w9k31kifqfc9slmh8mp2pz44qb36f41i3znckf7xy4";
           name = "recipe";
         };
         packageRequires = [ sly ];
@@ -87543,14 +88893,14 @@
         ename = "sly-macrostep";
         version = "20160119.434";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly-macrostep";
           rev = "b0830871e2bd96ed58876aed6b49f1328d78a3cb";
           sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/74a0acfc6261d1c9e62ece0397f6b4d873ef5bb7/recipes/sly-macrostep";
-          sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly-macrostep";
+          sha256 = "0gg9r5np2008593n1igq5chda1a3x1iblj0r4mqnnxa0r1hdsw3j";
           name = "recipe";
         };
         packageRequires = [ macrostep sly ];
@@ -87569,14 +88919,14 @@
         ename = "sly-named-readtables";
         version = "20150817.816";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly-named-readtables";
           rev = "f3c28a2e636bd1776b6c7dbc563ef5080bed9f5c";
           sha256 = "1yw1fg1vc6l85v7d6bg16lknxpg7ns1gfw0bxyzyb698zmwzsv60";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7e5a29c194bb7fc1a82131b7a9bd4c465660a2bd/recipes/sly-named-readtables";
-          sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly-named-readtables";
+          sha256 = "0wy0z9m8632qlcxb4pw3csc52yaq7dj7gdf3pbg0wb67f32ihihz";
           name = "recipe";
         };
         packageRequires = [ sly ];
@@ -87595,14 +88945,14 @@
         ename = "sly-quicklisp";
         version = "20170112.135";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly-quicklisp";
           rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477";
           sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp";
-          sha256 = "1hpcz84g9c6g0x8qal02xgjj02gxqz3bysyz0l59jxiga0m634v8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly-quicklisp";
+          sha256 = "0j0qkvs2v563dz2rd70dfmd0qpdwicymx59zv3gn57z5a8m14866";
           name = "recipe";
         };
         packageRequires = [ sly ];
@@ -87848,12 +89198,12 @@
       melpaBuild {
         pname = "smart-jump";
         ename = "smart-jump";
-        version = "20180709.2205";
+        version = "20180821.1839";
         src = fetchFromGitHub {
           owner = "jojojames";
           repo = "smart-jump";
-          rev = "1b216416a977dc94a6f3b5e40adde7b502d97c2f";
-          sha256 = "1rrd4x2pcy473gbha2dysawzqywlfp8yhl6xq6z8s2ggp9c825dn";
+          rev = "7424267c88afcd113ef445272dde292ae5ff0fed";
+          sha256 = "0flfla7jyw18jqvdpvpm9b1wph39cqa3dddyi15narg014sad76q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump";
@@ -87875,14 +89225,14 @@
         ename = "smart-mark";
         version = "20150911.1910";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "smart-mark";
           rev = "d179cdc3f53001a5ce99d5095f493cdf3a792567";
           sha256 = "0kd3rh6idlaqand9i6sc44s1iahg5jdhqs9jpvivxlycj6z9p7m8";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a0a35a06aedbfe6f66d9d8498d325540367d3ea/recipes/smart-mark";
-          sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/smart-mark";
+          sha256 = "0kx34983qqxkx2afql1daj155294dkbinw861lhx537614fq7wmn";
           name = "recipe";
         };
         packageRequires = [];
@@ -87900,12 +89250,12 @@
       melpaBuild {
         pname = "smart-mode-line";
         ename = "smart-mode-line";
-        version = "20180422.1459";
+        version = "20180731.2041";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "96e7ea0caba37fec485ea8b683afb4aed46d1d24";
-          sha256 = "0rrb1mgnj1hw92hl0m9ybvilrd070n6a44lb6jj42hk8ybb0cxh2";
+          rev = "9a81b51cd37fc5b6d47abfbb2b32f98f36a0fcfc";
+          sha256 = "055w1pcr96bfgbmig6ll2sgcisw82rf9dh4n8dhnsl75p32g1rcn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -88136,12 +89486,12 @@
       melpaBuild {
         pname = "smartparens";
         ename = "smartparens";
-        version = "20180717.335";
+        version = "20180912.1050";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "34b53320f4ac41a60d641c5363cd5e02db37089e";
-          sha256 = "1yv31wzf7wzkqpvmr3rdiphg4h7224bjfv5pr17gmgzjv9hlq3k2";
+          rev = "14a4d62b18da022bb7a4db4584dd82cda6d2f779";
+          sha256 = "11phg3fp6558hvv8fk17wf9k293kknnh2jciczh1c3yla7x0593c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -88542,12 +89892,12 @@
       melpaBuild {
         pname = "snakemake-mode";
         ename = "snakemake-mode";
-        version = "20180519.1739";
+        version = "20180831.2150";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "8bc919296755ce58f52fd800ee21863c7aefb430";
-          sha256 = "1zdiy0w95f9wm27czwjzxqyb5v16q61l1q8xrahh471x9pij632s";
+          rev = "89caed9a05a9a18a21c312163b971795253678ac";
+          sha256 = "01517mqkvmw61kc2ain743nvybmjd9d3gjiicr5fha0a9qlf97f7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -88834,12 +90184,12 @@
       melpaBuild {
         pname = "solarized-theme";
         ename = "solarized-theme";
-        version = "20180621.1407";
+        version = "20180807.2239";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "f829e99dd1508a1cdaf9146511012a33b0d4f68b";
-          sha256 = "1a83qsz41v208iasqwfnblgzhgjjwg1lkc0vgxndvq1kk2sj18dg";
+          rev = "d662ab1ff554cd083e29b5626fe3f28544b0d253";
+          sha256 = "1f2klyzv9jfka5sgybgg78d8fhvvsl4al4pp8z347hy8g3xy8rxh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -88859,12 +90209,12 @@
       melpaBuild {
         pname = "solidity-mode";
         ename = "solidity-mode";
-        version = "20180721.1614";
+        version = "20180912.1454";
         src = fetchFromGitHub {
           owner = "ethereum";
           repo = "emacs-solidity";
-          rev = "d89dae03c9c6cb86f4e935081cb828c6c5c62830";
-          sha256 = "11n3z0ibgsw16r34ba8i6fl43b1hx4q7b6v6g12kmfpss86dvv1d";
+          rev = "1b71fd08998411b59c832aad0419cdfc71b19e92";
+          sha256 = "0i2fnln5na3jdd41js285jwwz7v8bjijpzdjp7i1lrv57yy90kn6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -88968,14 +90318,14 @@
         ename = "sos";
         version = "20141214.2003";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "emacs-sos";
           rev = "2469bf1d7c47a55b0ffa8a6ceef0bb21252b3c3a";
           sha256 = "0zhz1j389jmfcxmzvp3gj2bkg996nk1mcf0sxw04wbyivh38hnql";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
-          sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/sos";
+          sha256 = "0d0n2h7lbif32qgz0z2c36536mrx36d22gq86xm7kmxday6iy19k";
           name = "recipe";
         };
         packageRequires = [ org ];
@@ -89334,12 +90684,12 @@
       melpaBuild {
         pname = "spacemacs-theme";
         ename = "spacemacs-theme";
-        version = "20180618.1129";
+        version = "20180817.604";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "af8a6093cd729c158da0532a8345612956553c8b";
-          sha256 = "0890cdqacm2zri0mj9fdyyd5zplvl2p4gl499073qk076840l21f";
+          rev = "3e1768ec49f0d5e58a66d7a9238a4adb4e9e43b6";
+          sha256 = "18cv8inizksi2in232f6h237y58cf95zlly0zdjhyll179dczii5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -90093,12 +91443,12 @@
       melpaBuild {
         pname = "srcery-theme";
         ename = "srcery-theme";
-        version = "20180623.619";
+        version = "20180825.436";
         src = fetchFromGitHub {
           owner = "srcery-colors";
           repo = "srcery-emacs";
-          rev = "b81c4ff3805e3857f77008982efe30f27b78e7e7";
-          sha256 = "1v7qlgdalff7m943zcgyg4da692g7sk18xj6l9zpwpnbxix8iirr";
+          rev = "ff83762f00c2d36f002c2aad1d939d96b6d04fb4";
+          sha256 = "1xi3cvlqim6vp7iv87481g0axcv9m2mnjrsmg7mdwz220zxkn42h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme";
@@ -90137,6 +91487,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    srv = callPackage ({ emacs
+                       , fetchFromGitHub
+                       , fetchurl
+                       , lib
+                       , melpaBuild }:
+      melpaBuild {
+        pname = "srv";
+        ename = "srv";
+        version = "20180715.1259";
+        src = fetchFromGitHub {
+          owner = "legoscia";
+          repo = "srv.el";
+          rev = "b1eb7b109bc1c616dbf027429a90dc3b1a4263f1";
+          sha256 = "05kp8ajbqk7vxzkv23akyk2m7yg81pbrxpl3dsw67101sjazsybi";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6b0b7f22631e7749da484ced9192d8ae5e1be941/recipes/srv";
+          sha256 = "0xrgbi63vg0msxkcmcnvijkxa9y0s7613liqac7fs9514yvkbwin";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/srv";
+          license = lib.licenses.free;
+        };
+      }) {};
     ssass-mode = callPackage ({ emacs
                               , fetchFromGitHub
                               , fetchurl
@@ -90205,8 +91581,8 @@
           sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
-          sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ssh-agency";
+          sha256 = "1b25fl1kk4mwsd25pg9s0lazlpmaa6s9wnfgvlqk8k65d7p7idzz";
           name = "recipe";
         };
         packageRequires = [ dash emacs ];
@@ -90248,12 +91624,12 @@
       melpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "20180713.650";
+        version = "20180818.2246";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "b13ba60ea175798cfd1395ab833082789724073d";
-          sha256 = "0fgcxvs2ngv65chnkb9w5rrak187xkwxiwmpc25iqvrrnrfr43s6";
+          rev = "67313e2c1c795317bf2bfb634705499757e4b889";
+          sha256 = "1j1hcyl3vsx4w8q6zyrsl572pxl6gmrznsjsblaxsn4qqh3h0c52";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -90765,12 +92141,12 @@
       melpaBuild {
         pname = "string-inflection";
         ename = "string-inflection";
-        version = "20180518.1707";
+        version = "20180827.601";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76";
-          sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5";
+          rev = "e9a50855a4c718592c28a5a892f164ecf46e39a8";
+          sha256 = "03kvp5xrv9p46m4w25jr5nvi801yafq5vxzif42y0dav7ifmmdfp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -91094,12 +92470,12 @@
       melpaBuild {
         pname = "sudo-edit";
         ename = "sudo-edit";
-        version = "20180608.911";
+        version = "20180731.1208";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "185edd69729b2adc8dccd015266636dae2df83d3";
-          sha256 = "1rffxd2jjz40hjlsv7fh49pa24sym387d98sckkr95g3m9y1blvp";
+          rev = "cc3d478937b1accd38742bfceba92af02ee9357d";
+          sha256 = "1qv58x5j5a3v1s2ylhck1ykbfclq0mbi0gsvaql3nyv8cxazqlwl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -91176,12 +92552,12 @@
       melpaBuild {
         pname = "suggest";
         ename = "suggest";
-        version = "20180722.350";
+        version = "20180725.1612";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "06784aba76d2681456871bd79304b62b4957b411";
-          sha256 = "0qi4slfdx0x9z2rzd2ibcl2zjqcrxvnh672l5xkyhjh873f16xar";
+          rev = "ce7be778b0b32bf679e5929d013c310b061b5541";
+          sha256 = "1alb42drkc7wfn54nhaw07x6m2bpfdgkb6jcpl0z91kzgxb9kc7z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -91237,8 +92613,8 @@
           sha256 = "18qfcrr4xlwwhhaq7dwh31bbl84a53akgrw2c6lynnyyi4vk2wpq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme";
-          sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/sunburn-theme";
+          sha256 = "07nz7vr0yzf5746d8khlzl6ghaj44yfp0ar9ylbpdpfj7rdx17sa";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -91512,12 +92888,12 @@
       melpaBuild {
         pname = "swap-regions";
         ename = "swap-regions";
-        version = "20180116.253";
+        version = "20180915.646";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "swap-regions.el";
-          rev = "6e7a1bc68f11afe00809c8e27c13bca08393a91c";
-          sha256 = "02z552qsc96big3davdj3yaz6f4fg72ljpn7nvzccp2wwchzfa1c";
+          rev = "f4fd9880cf690e003fcde88dcf2b46adbbbb03cd";
+          sha256 = "1d45yanqk4w0idqwkrwig1dl22wr820k11r3gynv7an643k4wngp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions";
@@ -91570,14 +92946,14 @@
         ename = "swift-mode";
         version = "20180721.35";
         src = fetchFromGitHub {
-          owner = "chrisbarrett";
+          owner = "swift-emacs";
           repo = "swift-mode";
           rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080";
           sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
-          sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode";
+          sha256 = "103nix9k2agxgfpwyhsracixl4xvzqlgidd25r1fpj679hr42bg8";
           name = "recipe";
         };
         packageRequires = [ emacs seq ];
@@ -91621,12 +92997,12 @@
       melpaBuild {
         pname = "swiper";
         ename = "swiper";
-        version = "20180713.946";
+        version = "20180813.925";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "93d51d6188956da2592c1458b68d7cef48d967ae";
-          sha256 = "024kj37xa4s49z8klcmn3a30zy3yzk5n9j9damzqmzd4d8klawi6";
+          rev = "2f5576ae9bfa7167a697dc34df05ca621d32b344";
+          sha256 = "0wl88ry7b1h2pkmhmlmmjz656sn9607w1ji9afvfwk7z0z8b2658";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -91700,12 +93076,12 @@
       melpaBuild {
         pname = "switch-window";
         ename = "switch-window";
-        version = "20180623.1115";
+        version = "20180723.2118";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "a5dc9a9c68ba77d86d7170f183ba1e003569ad8e";
-          sha256 = "0466lk1spk6bl1fnc0v7gwr71msccc25a3j7jzd7h0zssc2l403c";
+          rev = "ceade03eba1b735aefcac70eefbab6b582750c48";
+          sha256 = "0m1rs8chfifkkqa71c2i3s4fl9nyn74a6rk00nfylishvw2r9xvl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -91810,12 +93186,12 @@
       melpaBuild {
         pname = "symbol-overlay";
         ename = "symbol-overlay";
-        version = "20180412.339";
+        version = "20180814.2040";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "b76f510037eb8e0ea018272495f356c71ff5b758";
-          sha256 = "0dlb7rm4adm2ccqga5a1w6m2jvs4ics9ihf76hqyx4px9m9ca1ll";
+          rev = "a37404a6a0e76ee2033d3ab31c2248d30c89c63a";
+          sha256 = "0iy0hf7mkpbddwszq3lpsg0ns1sc1rm4pzcb3gbljx7syrian29q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -92048,12 +93424,12 @@
       melpaBuild {
         pname = "syntactic-close";
         ename = "syntactic-close";
-        version = "20180722.935";
+        version = "20180909.141";
         src = fetchFromGitHub {
           owner = "emacs-berlin";
           repo = "syntactic-close";
-          rev = "128d5bf059512a55c77cac0e96a7775f38184139";
-          sha256 = "0l9hklj39p6rsl2dcw6pka39glkp6qvyccqdy7qcnwxmffy204m6";
+          rev = "902dd0aafe962d1577d0cba2db743ba73bdb2478";
+          sha256 = "135k2nffhh01hyapamwwqyd30mlpfxf3g470f9xbsi8rkvfq8k59";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -92123,12 +93499,12 @@
       melpaBuild {
         pname = "system-packages";
         ename = "system-packages";
-        version = "20180516.1450";
+        version = "20180911.1548";
         src = fetchFromGitLab {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "7f59e325e8607aeb3036c7fb1590b0f8e2caa063";
-          sha256 = "0k7jflghql0sa7my1qfzz0prpwk54rmb244k6jwhbgsyfsspr12l";
+          rev = "b408ce44f56b1b6a038b511691cef94e30653793";
+          sha256 = "1997da6jbpffq415dj8mglf2df5hxpifri3lrdhv9ciqy381xs1q";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages";
@@ -92280,14 +93656,14 @@
         ename = "tab-jump-out";
         version = "20151005.1830";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "tab-jump-out";
           rev = "1c3fec1826d2891177ea78e4e7cce1dc67e83e51";
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3691aaaed27d0cf67af417f75fbb693ab856bd47/recipes/tab-jump-out";
-          sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/tab-jump-out";
+          sha256 = "1p2hkj0d9hbiwbf746l3rad8a5x6hk97b0ajl6q6cwbmy2qm3cca";
           name = "recipe";
         };
         packageRequires = [ dash emacs ];
@@ -92303,12 +93679,12 @@
       melpaBuild {
         pname = "tabbar";
         ename = "tabbar";
-        version = "20160524.1401";
+        version = "20180726.1035";
         src = fetchFromGitHub {
           owner = "dholm";
           repo = "tabbar";
-          rev = "b6c285a7d59dcdb1f17716f0b60787922fa4be82";
-          sha256 = "1akvwm4dqq4ihphlsdn8d1mm08q923y2iqh15lvc0cd0hxp3ni0q";
+          rev = "82bbda31cbe8ef367dd6501c3aa14b7f2c835910";
+          sha256 = "01sw76wp8bvh21h30pkc3kjr98c8m6qid6misk1y7hkyld0bzxay";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806420d75561cbeffbc1b387345a56c21cc20179/recipes/tabbar";
@@ -92537,12 +93913,12 @@
       melpaBuild {
         pname = "tao-theme";
         ename = "tao-theme";
-        version = "20171221.1001";
+        version = "20180911.1053";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "a97df8c51d77696787aaf55c67207f19c803fabe";
-          sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2";
+          rev = "0ec17c48f428fd3139fe5fdf34f2acb020410f1e";
+          sha256 = "070w0p31cbyi26zlssbj6qpw1s069vn2h7sam4hpa8q2dafxpr7i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -92562,12 +93938,12 @@
       melpaBuild {
         pname = "taskpaper-mode";
         ename = "taskpaper-mode";
-        version = "20180710.158";
+        version = "20180820.711";
         src = fetchFromGitHub {
           owner = "saf-dmitry";
           repo = "taskpaper-mode";
-          rev = "e822c44ebc5b15750ba68af67417ea5fe67641c0";
-          sha256 = "08ilrykg9ggksxwrkns0jkbjjvpzxb5w1l2s2krxnf4nj5d9x3qb";
+          rev = "b09e5d6afb2d3cd0b5349835d2c2ce79d6f00cbd";
+          sha256 = "176vll1c4j7hcjxsarl9668l2v0hpkdpxx7in45yvn89piniyg2l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f969b1cd58dfd22041a8a2b116db0f48e321e546/recipes/taskpaper-mode";
@@ -92670,17 +94046,18 @@
                       , melpaBuild }:
       melpaBuild {
         pname = "tc";
-        version = "20150113.1926";
+        ename = "tc";
+        version = "20180715.6";
         src = fetchFromGitHub {
-          owner = "kozo2";
+          owner = "kanchoku";
           repo = "tc";
-          rev = "6aa9d27c475be8d009adf9cd417f2cdf348a91e8";
-          sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
+          rev = "91bd7e29322f7477c9adb6a816c6207dcb48f6c1";
+          sha256 = "1gb8zqnsaljm2qq2grk5y5pgrj8kg2cg0m4x6f6ngnf0bpfq4zjs";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/55fa57c74237ec7afe651d162228fae595579fe5/recipes/tc";
-          sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
-          name = "tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9fddfc79ed2c614c33e90ba80f300912fdab88a3/recipes/tc";
+          sha256 = "05lnsaizlh4wqjkp0wqcm1756r9ia46as8zf01k8qsi0mm452g6q";
+          name = "recipe";
         };
         packageRequires = [];
         meta = {
@@ -92801,12 +94178,12 @@
       melpaBuild {
         pname = "telephone-line";
         ename = "telephone-line";
-        version = "20180601.1943";
+        version = "20180907.1507";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "1cc28a7811245e6f24234b36fc1004a1357a3df3";
-          sha256 = "1qjlil6xy6jacz1lhwz76n5xqx1xw2bqlnkijrka04v9gws42jaj";
+          rev = "3cb6ab4afcefec1e08d5ca70f9bd4320a37a7fcf";
+          sha256 = "055vzi64w6wpcrpghnx6nj74ww389av2g95253bs4sm8254b2kzj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -92865,8 +94242,8 @@
           sha256 = "155yyinh342k8fz8g4xzz0glqkxkjl6p6y2wym6p12phk7v2x3ic";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0f89e65ce7b302a0330f0110564320c724acc254/recipes/temporary-persistent";
-          sha256 = "1q141cdnwchfra6gp6fs0nlkxv6fdf8rx5ry04kcpr9a1y56z362";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/temporary-persistent";
+          sha256 = "0afjcad97pzbrjs1v80l6c98vi5asgaxcn2rq95gz1ld7nn0a9zh";
           name = "recipe";
         };
         packageRequires = [ dash emacs names s ];
@@ -93145,6 +94522,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    terminal-focus-reporting = callPackage ({ emacs
+                                            , fetchFromGitHub
+                                            , fetchurl
+                                            , lib
+                                            , melpaBuild }:
+      melpaBuild {
+        pname = "terminal-focus-reporting";
+        ename = "terminal-focus-reporting";
+        version = "20180830.19";
+        src = fetchFromGitHub {
+          owner = "veelenga";
+          repo = "terminal-focus-reporting.el";
+          rev = "8b84bf18f4c5f1b59a11692eb706f13c3598d9a5";
+          sha256 = "0bbcl0mq62f22n2aipgzx93164x81bgybfd0x7gvsfva76qs8pc4";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19e7149a0a2db7df7f890a2c1ad22266e97694d7/recipes/terminal-focus-reporting";
+          sha256 = "0iwq0rabq0sdn4apa5ibfp912j76w7hzg3q5lbxp7fspfwwynvg2";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/terminal-focus-reporting";
+          license = lib.licenses.free;
+        };
+      }) {};
     terminal-here = callPackage ({ cl-lib ? null
                                  , emacs
                                  , fetchFromGitHub
@@ -93602,12 +95005,12 @@
       melpaBuild {
         pname = "tfsmacs";
         ename = "tfsmacs";
-        version = "20180629.1011";
+        version = "20180911.1414";
         src = fetchFromGitHub {
           owner = "sebasmonia";
           repo = "tfsmacs";
-          rev = "8eb5906aa7e1ec469f6347545afabca787b2b223";
-          sha256 = "0an6hz0kd5mvcx61xhdi62zw15x6yqqx8mmm7jsd008kifrk27d4";
+          rev = "13ee3f528ff616880611f563a68d921250692ef8";
+          sha256 = "035avqp9m1mbffvc1xd5qvyg93vsxjsphmf394mq15gawqs33ik4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b449d004bdb498c2a1d155671070e0745c7d7598/recipes/tfsmacs";
@@ -93915,12 +95318,12 @@
       melpaBuild {
         pname = "tide";
         ename = "tide";
-        version = "20180713.30";
+        version = "20180809.2103";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "4aaa1b3d3a978a76d773f2fbee6143eda9085f23";
-          sha256 = "1vkgjy5gfiwqjnq5mbxbfh4c1f6kn2pbibki6hmq593wd4212lnn";
+          rev = "d21568528c9bb1ba55627f548c7012f6bcc2fe58";
+          sha256 = "04vhz8f00m5i36szml9npn4hwmcm2rp131r7m3z6dd0n01x8qr9k";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -94049,12 +95452,12 @@
       melpaBuild {
         pname = "timesheet";
         ename = "timesheet";
-        version = "20160530.1445";
+        version = "20180801.1902";
         src = fetchFromGitHub {
           owner = "tmarble";
           repo = "timesheet.el";
-          rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8";
-          sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
+          rev = "67ca6a9f6733052066b438301fb2dd81b8b3f6eb";
+          sha256 = "0rmh8lik27pmq95858jbjzgvf6rsfdnpynwcagj1fgkval5kzdbs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet";
@@ -94324,12 +95727,12 @@
       melpaBuild {
         pname = "toc-org";
         ename = "toc-org";
-        version = "20180613.840";
+        version = "20180815.27";
         src = fetchFromGitHub {
           owner = "snosov1";
           repo = "toc-org";
-          rev = "e38e81af3f12633579c62f2ccf4bd0c8f18e2b88";
-          sha256 = "13jdz0b4jqpb5idfxszlsapfk7h488773m3ipj1ayfapxmly92gm";
+          rev = "ce9e49303c602c30c58ae98d3ce5202e8419a3bc";
+          sha256 = "17vnzdzjbbiyyk0pz532fj5h4x60varl4n3yaswd52mxzhvzn1fw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -94775,7 +96178,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    traad = callPackage ({ dash
+    traad = callPackage ({ bind-map
+                         , dash
                          , deferred
                          , f
                          , fetchFromGitHub
@@ -94789,12 +96193,12 @@
       melpaBuild {
         pname = "traad";
         ename = "traad";
-        version = "20180720.512";
+        version = "20180729.1748";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "1a4bb39dc36ac79fe540923096411e75a6dcfdf4";
-          sha256 = "0jj81p7v6qrqnlgyqdjygvzrid1phgrx5j4kfnsd3gy2k0i9k3vj";
+          rev = "98e23363b7e8a590a2f55976123a8c3da75c87a5";
+          sha256 = "121p80vsa3xff1anwy876gvlpm0jdbfm5vaxszds73wrv6gih8m3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -94802,6 +96206,7 @@
           name = "recipe";
         };
         packageRequires = [
+          bind-map
           dash
           deferred
           f
@@ -94927,14 +96332,14 @@
         ename = "transfer-sh";
         version = "20180603.731";
         src = fetchFromGitHub {
-          owner = "Brillow";
+          owner = "SRoskamp";
           repo = "transfer-sh.el";
           rev = "55da85f963d347255a2b46568954923679331798";
           sha256 = "0yv4i4ps379kz1q9qmjh4q3pk5ik77xw86faxmwpjx4yzp1wsz9v";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh";
-          sha256 = "1gii2avqg9mdmdj2r562s9382fcmw53w9zsvprpnkcyhxhgfy8sy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/transfer-sh";
+          sha256 = "0xc6dkmayk935grmy8883l4cyv4zrq3fb77fj16knfj4yw8w6c9j";
           name = "recipe";
         };
         packageRequires = [ async ];
@@ -94952,12 +96357,12 @@
       melpaBuild {
         pname = "transmission";
         ename = "transmission";
-        version = "20180610.1653";
+        version = "20180728.1017";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "7e8c3690bb54bd8c3ff89b89092ccaa94e116652";
-          sha256 = "0wwnd2fc4b8ir58vxb69nw4rcyri2yhdpaphsgrs8dw9ziixpmvx";
+          rev = "ba567b12a1e953880c6e7083963c52556cdc567f";
+          sha256 = "0wr9npzz34cwhsmn7ry0bfvvm4dl5cpadw4mnpdjl1f85x8zasip";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -95090,12 +96495,12 @@
       melpaBuild {
         pname = "treemacs";
         ename = "treemacs";
-        version = "20180722.503";
+        version = "20180910.832";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "98d02cb1ca4742c6b3d7148c82109d4a0b0df27e";
-          sha256 = "0kk36i7d6pddx97zxpa37mz1pa7kygbyrqzl73mmx4cbisk3c2gw";
+          rev = "7784111791e38bd9a1c60c32e9b186e029cf8e78";
+          sha256 = "021rzb6k18grj17z6l2d7qdp5j9kr9wdywl72lfkp1jlykqjgq1b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
@@ -95117,12 +96522,12 @@
       melpaBuild {
         pname = "treemacs-evil";
         ename = "treemacs-evil";
-        version = "20180622.426";
+        version = "20180803.317";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d0f874c90990400c02a8029d4efe815d3548ba5c";
-          sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7";
+          rev = "82061efe99e34ac69367726d65fa0f517947b40b";
+          sha256 = "0f2ybaf149ji54rgf7q9xbdx55jr2jgz9qbahsh2q7gl800nkg17";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
@@ -95170,12 +96575,12 @@
       melpaBuild {
         pname = "treepy";
         ename = "treepy";
-        version = "20180722.538";
+        version = "20180723.2356";
         src = fetchFromGitHub {
           owner = "volrath";
           repo = "treepy.el";
-          rev = "ae972c73dbf56452a4fe5dca635a75c502a78a15";
-          sha256 = "1r3410v4y4zc6xdpf6z0947ivbw055zy1pcplr4215nr5346m6nc";
+          rev = "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d";
+          sha256 = "04zwm6gx9pxfvgfkizx6pvb1ql8pqxjyzqp8flz0432x0gq5nlxk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
@@ -95217,6 +96622,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    trinary = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "trinary";
+        ename = "trinary";
+        version = "20180904.1613";
+        src = fetchFromGitHub {
+          owner = "emacs-elsa";
+          repo = "trinary-logic";
+          rev = "886232c6d7e92a8e9fe573eef46754ebe321f90d";
+          sha256 = "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/48fff02dde8a678e151f2765ea7c3a383912c68b/recipes/trinary";
+          sha256 = "1k2jpay1wx2m54fpja9mrhqyk15ikml8xf15irh8yrxb3hah8f8k";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/trinary";
+          license = lib.licenses.free;
+        };
+      }) {};
     trr = callPackage ({ fetchFromGitHub
                        , fetchurl
                        , lib
@@ -95405,12 +96836,12 @@
       melpaBuild {
         pname = "tuareg";
         ename = "tuareg";
-        version = "20180512.1306";
+        version = "20180914.1324";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "faa976ac930d3fba42ec59881046929c90ffa8f3";
-          sha256 = "1f29bwivmdd6k7wblmrlwf7q43kdkrdadf5r3mk372p04d7c2nrx";
+          rev = "40f974d3b0777f9666928d0b4a5126a4c7491b17";
+          sha256 = "049nw6pkkxnq3k4vv4ksl93csiybm7q29xigdkc7cr9cls6h8jf0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -95513,14 +96944,14 @@
         ename = "turing-machine";
         version = "20180221.2038";
         src = fetchFromGitHub {
-          owner = "therockmandolinist";
+          owner = "dieggsy";
           repo = "turing-machine";
           rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
           sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
-          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/turing-machine";
+          sha256 = "0q9a31m5wnz9j9l4i8czdl7z12nrcdjw72w8sqvf94ri2g5dbpkq";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -95688,12 +97119,12 @@
       melpaBuild {
         pname = "twittering-mode";
         ename = "twittering-mode";
-        version = "20180507.721";
+        version = "20180818.751";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "6d10d1765a7b4de4c723395c8a2200a1649beeb0";
-          sha256 = "0pzj1yslggha5hh98ah634s03p7185wppzxfx53xws0mid6wsf85";
+          rev = "ab26e683674a854a1e518995d60967ff417b2cff";
+          sha256 = "1z5mv2n7pbkm0mvcgkcs70ngp46n5rmz8ff1s3b7p71k8j1sklsw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
@@ -95765,12 +97196,12 @@
       melpaBuild {
         pname = "typing";
         ename = "typing";
-        version = "20171115.2331";
+        version = "20180830.1503";
         src = fetchFromGitHub {
           owner = "kensanata";
           repo = "typing";
-          rev = "1ada06484695b8959f4a7c41cacf7f78c2aad998";
-          sha256 = "0mh1y960zd7878j7nhrjijck6jxxqnbmxr579s095k7yk2ynpkkg";
+          rev = "a2ef25dde2d8eb91bd9c0c6164cb5208208647fa";
+          sha256 = "1dbh0srbf54lgd60ia79y9cfnq3kxlgw01qzdjs9mk3nfazzpgnv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6e75695594ce17b618ad8786c8a04e283f68b11/recipes/typing";
@@ -96539,12 +97970,12 @@
       melpaBuild {
         pname = "universal-emotions-emoticons";
         ename = "universal-emotions-emoticons";
-        version = "20171209.1820";
+        version = "20180729.1241";
         src = fetchFromGitHub {
           owner = "grettke";
           repo = "universal-emotions-emoticons";
-          rev = "9f249b39172bf9b8e148856ad941eee485161215";
-          sha256 = "1qn757pn1hcfik05i458bic32dm812xznsfz5vgxn2v8wxihjlf8";
+          rev = "9cedd09ee65cb9fa71f27b0ab46a8353bdc00902";
+          sha256 = "17blqfnf384l2hd2igrw5p0zblw6bxz69vvzli22nr84kpkh5jx4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57f913112c98db2248cf69e44deb69fd09cee042/recipes/universal-emotions-emoticons";
@@ -96794,7 +98225,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-el-get = callPackage ({ fetchFromGitHub
+    use-package-el-get = callPackage ({ fetchFromGitLab
                                       , fetchurl
                                       , lib
                                       , melpaBuild
@@ -96803,15 +98234,15 @@
         pname = "use-package-el-get";
         ename = "use-package-el-get";
         version = "20180130.2105";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "edvorg";
           repo = "use-package-el-get";
           rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947";
           sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get";
-          sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aca60522257353fbfd9d032f8c3cae7914d6bd36/recipes/use-package-el-get";
+          sha256 = "143vydssjxmkcgs661hz6nhg310r8qypn2a4vyxy5sb31wqcclzg";
           name = "recipe";
         };
         packageRequires = [ use-package ];
@@ -96829,12 +98260,12 @@
       melpaBuild {
         pname = "use-package-ensure-system-package";
         ename = "use-package-ensure-system-package";
-        version = "20180710.29";
+        version = "20180913.801";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "cfce01be52162d2eb4526bbb9b3bf721cca74202";
-          sha256 = "0wlyl0zya165kbf5f8swnkkbqnzxwggyc597xz0wy5wmiyr55v4l";
+          rev = "2b89ca4b9102baaf3f84f3fc8177c8a17288e291";
+          sha256 = "18xpjqvnrk72jybbd5xipnsbngkj38hqd9vfq0kb42fhiv1v5b92";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package";
@@ -97421,6 +98852,59 @@
           license = lib.licenses.free;
         };
       }) {};
+    vdm-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "vdm-mode";
+        ename = "vdm-mode";
+        version = "20180830.2352";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "0c083ee4848ea5d78de7894a4a0722d6630839c9";
+          sha256 = "175zlxxjxl7zp80hm2hz5xw7gy3qh0hz3fdvqy8v3n0vz4zvqx1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/vdm-mode";
+          sha256 = "0paafpyzncl2325ly89591jnxhl9zc8jwsphav38nw0fsm9r9ah9";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/vdm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vdm-snippets = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , yasnippet }:
+      melpaBuild {
+        pname = "vdm-snippets";
+        ename = "vdm-snippets";
+        version = "20180902.1135";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "d2d9a4074906f4a1370a251180cebf958eb9e461";
+          sha256 = "0rddkjnm4xggv7pr99p58n16ix0whxccyihamc373r0ld762qf3v";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/vdm-snippets";
+          sha256 = "1js1hjs2r9bbqm50bl389y87xn68f30xrh2z6nd5kz2hdgkm6lhj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/vdm-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     vector-utils = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -97895,12 +99379,12 @@
       melpaBuild {
         pname = "visual-fill-column";
         ename = "visual-fill-column";
-        version = "20180511.211";
+        version = "20180727.1525";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "visual-fill-column";
-          rev = "606d86e38ca99704cf745fe9cadd603d6001cb0d";
-          sha256 = "1fjzlw6i4jpd0lmdxkzgaypgr2cx5klkb6xwc5k684ly3xp8snc2";
+          rev = "ca65ed65d27bdce189bbb15f58399a682aa6f02b";
+          sha256 = "1hxsh4jmbb6mykydy8c1vam538d2grdyv2f9zimk8q5mwgpnfggm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column";
@@ -98077,13 +99561,13 @@
         version = "20150718.1309";
         src = fetchFromGitHub {
           owner = "dbrock";
-          repo = "volume-el";
+          repo = "volume.el";
           rev = "ecc1550b3c8b501d37e0f0116b54b535d15f90f6";
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bde261750a2754c5bcf01b9a9260429609b8c2bf/recipes/volume";
-          sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/volume";
+          sha256 = "1gm2zaf6qwbdhayaj153882qm21cl4qdyjkdnqrlssb2mcgf017w";
           name = "recipe";
         };
         packageRequires = [];
@@ -98128,16 +99612,16 @@
       melpaBuild {
         pname = "vue-mode";
         ename = "vue-mode";
-        version = "20180515.2012";
+        version = "20180826.1715";
         src = fetchFromGitHub {
-          owner = "CodeFalling";
+          owner = "AdamNiederer";
           repo = "vue-mode";
-          rev = "5491a4a765814c392de13617ca3ad4a32edd6399";
-          sha256 = "10m5kc0zsvfwr1km66c36qzs6bckq1x0cx4r79vs7sxwwfz8mq2b";
+          rev = "e5faa5767308dcd87139813957eabba62b7caf19";
+          sha256 = "1lw647sjrmwll5hxb027xpd8ax4pjp00ksr3ndjrpfj0zqpnad04";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
-          sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/vue-mode";
+          sha256 = "0npzn7pycqfdakv4plkigq8aw1bqhz3y03y3ypx21q5a186ds0g5";
           name = "recipe";
         };
         packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
@@ -98332,12 +99816,12 @@
       melpaBuild {
         pname = "wakib-keys";
         ename = "wakib-keys";
-        version = "20180610.1952";
+        version = "20180818.1129";
         src = fetchFromGitHub {
           owner = "darkstego";
           repo = "wakib-keys";
-          rev = "682e3241ebc9147f4e316627cbff456dd316e372";
-          sha256 = "191j9pk989jwhczwimr8smx1qiiwy5d85j195z8aqg252m656fnw";
+          rev = "a858979620bd22801e5ce214dd46d69b19ccd357";
+          sha256 = "1zvjwm4qr82zhp4nb9mjzklqxa2iasw3i623fwp9a2fzn3c2cyx5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b8ef5ae0dcb92e1cf019be3d53ab9b47d89f45bd/recipes/wakib-keys";
@@ -98413,12 +99897,12 @@
       melpaBuild {
         pname = "wanderlust";
         ename = "wanderlust";
-        version = "20180605.631";
+        version = "20180826.649";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "395826e99b84051396d503392f52462b6cb683a5";
-          sha256 = "1i182aq8fmp232flwdvf3v6367pmzxvjjn4snvsy16wk5710vg3b";
+          rev = "ebde9a49a80bba4e21ef4a95e77c634779f00aaa";
+          sha256 = "1c149bdwz0jrmdy9dpdilwma8jpmm7myhh6q86k3ss539yhnqf43";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -98582,6 +100066,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    wdl-mode = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "wdl-mode";
+        ename = "wdl-mode";
+        version = "20180831.1246";
+        src = fetchFromGitHub {
+          owner = "zhanxw";
+          repo = "wdl-mode";
+          rev = "cef86e5afc136ae5ad9324cd6e6d6f860b889bcf";
+          sha256 = "0j7sv3dcpq2fvcip9834v6k8q1d8bpnbxnvz1g691lmc58z1a86a";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8cf1f20913d765ae36ecc2c9a69470ff51124e56/recipes/wdl-mode";
+          sha256 = "1zhrs0cdsr8mxh9zn8cy6inzxcygk0lgsyw1d190253v1kk6072i";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/wdl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     weather-metno = callPackage ({ cl-lib ? null
                                  , emacs
                                  , fetchFromGitHub
@@ -98694,12 +100203,12 @@
       melpaBuild {
         pname = "web-mode";
         ename = "web-mode";
-        version = "20180628.422";
+        version = "20180813.650";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "471e1235d976e209de5262e75ecf7cc3e1fec39f";
-          sha256 = "00m3yyx83sfdsn70iqr80vpj060nfddb2j6gzzsdmsnm0nl0hg8j";
+          rev = "e31d1dd4ee436db8aaca3f35223af5a05fb47dec";
+          sha256 = "00yhrd628dgylsvixy7gy1jw8xmszs4rvv2yc1v7jd3hli9bxf7s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -98880,12 +100389,12 @@
       melpaBuild {
         pname = "webpaste";
         ename = "webpaste";
-        version = "20180127.1434";
+        version = "20180815.1155";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "14fd97bc3c8554d9394b698610dca1186ff68b03";
-          sha256 = "1q7pqkww6ggh9sdnqa4vbq6nzivw0w011w3mvwx1mi4zp0dv50zs";
+          rev = "e7fed98c30e960911426be054bad183fd1ab6a37";
+          sha256 = "1k82apiylq9bqgwq2lg1ih16ghhh9r2h6izd4ljw1nm1p9gqqzh4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -99702,8 +101211,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-purpose = callPackage ({ cl-lib ? null
-                                  , emacs
+    window-purpose = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
                                   , imenu-list
@@ -99713,19 +101221,19 @@
       melpaBuild {
         pname = "window-purpose";
         ename = "window-purpose";
-        version = "20180531.1336";
+        version = "20180809.456";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "8737c5d8cb4a0d749771a04a136a784e5d519d5e";
-          sha256 = "0w186mgs7ww52mvqrp02bnwazznhyy6j2g8r21x2d4ri3vavmwrl";
+          rev = "a302340e183d20baa4445858d321f43449298829";
+          sha256 = "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
           sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs imenu-list let-alist ];
+        packageRequires = [ emacs imenu-list let-alist ];
         meta = {
           homepage = "https://melpa.org/#/window-purpose";
           license = lib.licenses.free;
@@ -99897,8 +101405,8 @@
         version = "20180520.58";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "db4210a0af51";
-          sha256 = "0f3yn8dxg21q711533d1zgxwr2y3df1msmchvd5x4rikm8nayp8a";
+          rev = "c5e4b6448dfd";
+          sha256 = "10ix9y29v0idcmvflyrmdzm5amxi9x0223kzazhgpf7j3xs8c0nn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -99946,12 +101454,12 @@
       melpaBuild {
         pname = "with-editor";
         ename = "with-editor";
-        version = "20180618.1602";
+        version = "20180726.1344";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "fb9fdde14eddd5bd180d4baabfedc45e5492e115";
-          sha256 = "07jfqnh4mvpky3mm7wyrdwpwnk2a7r1v2k7q5rxmg8i59k99q7bn";
+          rev = "3e6424764ee06fb50c580283baea3851c6f9ea66";
+          sha256 = "0xawvwvkqdy5hhbz9mbclha18w8nd36d9nyf7b6s2f5dw7xnlyb0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -100448,12 +101956,12 @@
       melpaBuild {
         pname = "wsd-mode";
         ename = "wsd-mode";
-        version = "20170731.837";
+        version = "20180807.430";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6";
-          sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4";
+          rev = "0583df8efb742c90dc56df00f9714e13512cf6d9";
+          sha256 = "0f90qm5zx7lkyvaz519fln4hijfyammc675105f19492h1bc1bva";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
@@ -100493,6 +102001,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    wucuo = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "wucuo";
+        ename = "wucuo";
+        version = "20180907.549";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "wucuo";
+          rev = "2657e78246001848fe1140c9d90cb96d796d5887";
+          sha256 = "0s3ipmrw3gqyq6y4pxjm8cpnsar5hh27lclhjq7277zlbl3da32c";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/819cacef2c31d750829980f3f6c3bfb72f36bbdd/recipes/wucuo";
+          sha256 = "084fcv4dkflpka9vmxmxqdl0cgmjjh9wc6axr65j1ffmqd933y4a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/wucuo";
+          license = lib.licenses.free;
+        };
+      }) {};
     wwtime = callPackage ({ fetchFromGitHub
                           , fetchurl
                           , lib
@@ -100659,12 +102193,12 @@
       melpaBuild {
         pname = "xah-elisp-mode";
         ename = "xah-elisp-mode";
-        version = "20180710.124";
+        version = "20180914.1659";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "b2fe52007d90934053a6ba885b77d228d6c2bff6";
-          sha256 = "1ma095ivzxblm0daxmgf3lcs59nkxgh4bfaw8vqxysfy0svqrff7";
+          rev = "3b2d960b031952c768d705d566ead8d7119b7a91";
+          sha256 = "071vzyd0rdg3n8wmfcsawgfr02y497p0s7r0nryh1i2v5rhmg2vk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
@@ -100685,12 +102219,12 @@
       melpaBuild {
         pname = "xah-find";
         ename = "xah-find";
-        version = "20180310.450";
+        version = "20180830.1658";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "0cd985675c286bfa5f07ab9d00231f8a23505537";
-          sha256 = "01h5wdbzf7swrmddai2vsakr8rsqg447w9bnp7akxla426fsr8wg";
+          rev = "4019389a66abbb71d1a7c946c37efe184116bcc9";
+          sha256 = "0j392z31z3b1sppx6p9hhy9s5qzl4a7la6rwxs9dp5q25n23avcz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
@@ -100711,12 +102245,12 @@
       melpaBuild {
         pname = "xah-fly-keys";
         ename = "xah-fly-keys";
-        version = "20180702.1521";
+        version = "20180910.2232";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "11db1184a7f68ee6be0cafe5bd9a304cb0036488";
-          sha256 = "0j4mx27fnx95ri8sm3zsp0xwk4n8civbnn2ld1932kazbhwfwgqv";
+          rev = "694b19d5a03ec450e7c8f6e340caf47ab4eed4a1";
+          sha256 = "02y46b0nhly92rpymy1szgq2s83kfbjz7rc9sj5nc9vb0jrbkf4p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
@@ -100763,12 +102297,12 @@
       melpaBuild {
         pname = "xah-lookup";
         ename = "xah-lookup";
-        version = "20171108.241";
+        version = "20180815.550";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "3029d8ec04e841c57b7482c244a1733eb4c77cb5";
-          sha256 = "0ygkl663cqs25kicfnpy06j3sm6jjpagvv90wx3llspjy9adcxvx";
+          rev = "e3132ff21c3d0160e5bd5b7222c50dc9840727d4";
+          sha256 = "0p7y6dj4a9ifcpsvg50jb3hqr0i6spscc5iw02fpyih6j65p3zbn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup";
@@ -100789,12 +102323,12 @@
       melpaBuild {
         pname = "xah-math-input";
         ename = "xah-math-input";
-        version = "20180709.2228";
+        version = "20180906.1012";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "87e46fcaaada3e87dc828e75a52bec05c8c4c262";
-          sha256 = "1vb53wr93n2m419y81c6naixxc6791bjynbfydm234da7ixsc7mk";
+          rev = "d0120a451daea474abeab7f87cc64d8ddc903ab4";
+          sha256 = "0rsdvlfqdm69rj1gq4pkn9gw1n2sw5dr9xrk1aqin5rpgcgappaj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
@@ -101639,12 +103173,12 @@
       melpaBuild {
         pname = "yankpad";
         ename = "yankpad";
-        version = "20180624.1615";
+        version = "20180825.239";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "ad8ce33fec5d9eb2a7e1111b1097e4015f78c0ed";
-          sha256 = "03645wr6ksx6f7q3wpjcx3c7n1bm4v03j8kjkxx2790y77yns3ri";
+          rev = "6a22116057e4110f4d4b446780fe996abfeed2af";
+          sha256 = "0r2drq158x55c0psjfyqg41gn2bjqvgxm53n4sk9nkxp4pvlxd1d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -101664,12 +103198,12 @@
       melpaBuild {
         pname = "yapfify";
         ename = "yapfify";
-        version = "20180105.1447";
+        version = "20180830.33";
         src = fetchFromGitHub {
           owner = "JorisE";
           repo = "yapfify";
-          rev = "9e63a9135bd8dbfbee55819837a3aa0d119c5e6f";
-          sha256 = "1bf09hah2g8x0jbrdh4fm1v01qjymiv38yvv8a5qmfpv5k93lcrc";
+          rev = "b858225e1debe6734ee718e5c3c209152652a8b3";
+          sha256 = "16bpshqk47slcifx9v70ka202lnbspkcjdl5npxpf12abc1syh06";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -101844,12 +103378,12 @@
       melpaBuild {
         pname = "yasnippet-snippets";
         ename = "yasnippet-snippets";
-        version = "20180714.622";
+        version = "20180909.315";
         src = fetchFromGitHub {
           owner = "AndreaCrotti";
           repo = "yasnippet-snippets";
-          rev = "d153af6d1d8ab8dfbc57f4065cee72f86d5cd2c4";
-          sha256 = "0dkhac40kiyqnq42c2fcdb1jzshgakabq4rq796qfhjpc5j8x5wk";
+          rev = "ef6eae61f1c9b50efee1316e8d7925632bc9fa45";
+          sha256 = "1lrv3mwx9zrz5yy43a2c6d20hxgg3ax0pf0wv1vh59jk3lfxvpni";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42490bbdac871bce302fbc9a0488ff7de354627e/recipes/yasnippet-snippets";
@@ -101896,11 +103430,11 @@
       melpaBuild {
         pname = "yatex";
         ename = "yatex";
-        version = "20180601.2357";
+        version = "20180820.1849";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex";
-          rev = "ea6956f10ce7";
-          sha256 = "192x3qi781hf4xpx2b33clc2xsq1d7vi3fzjv82d5pq1687kjl93";
+          rev = "d97881f33e28";
+          sha256 = "1zr8li79shk1sxi43g93hrgs5vjilhfa8nndlyva2myjn05bcxg5";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9854c39fc1889891fe460d0d5ac9224de3f6c635/recipes/yatex";
@@ -101979,12 +103513,12 @@
       melpaBuild {
         pname = "ycmd";
         ename = "ycmd";
-        version = "20180520.353";
+        version = "20180724.556";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "966594701c1eef1f6d4dad0c71c6d43a029977d7";
-          sha256 = "05b8l82l3p15r072zhmmwpcnxyyyrhzka5gc3vkzz2sa7wa7sp7j";
+          rev = "fe35b7f2e3d9370941b9e537c9bc578d814acce2";
+          sha256 = "10h3whhz4bli4r6d945qdwv0627842l84vp6binqzw7lddd72y6g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -102067,12 +103601,12 @@
       melpaBuild {
         pname = "yoficator";
         ename = "yoficator";
-        version = "20180129.1252";
+        version = "20180814.1704";
         src = fetchFromGitLab {
           owner = "link2xt";
           repo = "yoficator";
-          rev = "e0dc076cb0d1999cb41585b5f36322681109fe86";
-          sha256 = "1vq07ndxrdry26dx3ci4yz1a1qdcr20yznj62y2f0wkyccrai9y9";
+          rev = "a0c5bdf9db6e495549176755cd047fcf05c71255";
+          sha256 = "1fqyd2srya78w1d3fbhzkl1ym5j8zm9ygg93yjaddzf0afc0aprm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5156f01564978718dd99ab3a54f19b6512de5c3c/recipes/yoficator";
@@ -102251,12 +103785,12 @@
       melpaBuild {
         pname = "zenburn-theme";
         ename = "zenburn-theme";
-        version = "20180531.902";
+        version = "20180911.544";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "eea429cb2cbde8674b2a17ccc2bda94b54575c01";
-          sha256 = "12nyjxvlvr1m7wrkfv7l4w16h8n66ssw2mvwcl4b7xbx4d45x1da";
+          rev = "7f467891dc8299d598208031f2e31eba286c2096";
+          sha256 = "1i7frwb52wi4rg8b97426s5cfdpj65691g6y768dbbr4x6sh4z8r";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -102319,6 +103853,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    zeno-theme = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "zeno-theme";
+        ename = "zeno-theme";
+        version = "20180831.1922";
+        src = fetchFromGitHub {
+          owner = "jbharat";
+          repo = "zeno-theme";
+          rev = "6d70168fcae333a9918c5315e6576f1e876874da";
+          sha256 = "13nxgb74f5jzn88c6dbfg12plhk3i4z5d2zq3f0ffk3dypq9qkpa";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9703a222f51dc283e9462cceb5afeb009f7401dc/recipes/zeno-theme";
+          sha256 = "0bqv1gdqlh7i48ckpgss6h9mmc9hpkqlb94aam0kkq2ga125gmwc";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/zeno-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     zephir-mode = callPackage ({ cl-lib ? null
                                , emacs
                                , fetchFromGitHub
@@ -102350,26 +103910,24 @@
     zerodark-theme = callPackage ({ all-the-icons
                                   , fetchFromGitHub
                                   , fetchurl
-                                  , flycheck
                                   , lib
-                                  , magit
                                   , melpaBuild }:
       melpaBuild {
         pname = "zerodark-theme";
         ename = "zerodark-theme";
-        version = "20180528.26";
+        version = "20180911.751";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "876cafc58a54c567456c4823f8c16edce94ba3ac";
-          sha256 = "1g03d1sd1v91f2i66v4m02jy487r9dczif4rnrrwpi5j2iq0ycqx";
+          rev = "09a6bc6d8bcc7c2bb89e497dc8f6d3a29f6fe4c2";
+          sha256 = "1i690ilvhskxqljjsnlpp124i8jl2njxmynppricxwvxrhh69pgz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "recipe";
         };
-        packageRequires = [ all-the-icons flycheck magit ];
+        packageRequires = [ all-the-icons ];
         meta = {
           homepage = "https://melpa.org/#/zerodark-theme";
           license = lib.licenses.free;
@@ -102383,16 +103941,16 @@
       melpaBuild {
         pname = "zig-mode";
         ename = "zig-mode";
-        version = "20180309.1458";
+        version = "20180818.848";
         src = fetchFromGitHub {
-          owner = "zig-lang";
+          owner = "ziglang";
           repo = "zig-mode";
-          rev = "4f281e4748a4eae64efaa98d9dfd9b7c163fbed8";
-          sha256 = "0pip0kgbxh4cf60j2kzgb9lvrm5vksg83mllk1pcs9mkbxdgjyww";
+          rev = "3778fb55ca675f1eaa5cc85f941ef952a2daa5f4";
+          sha256 = "0b3qwww71j6nm287yj55kj9wbq0a7l73r7gyc94c320c8wb3ivd8";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/5cba49d25ebbaa9240d5d87d0c7ca48d928b2e4b/recipes/zig-mode";
-          sha256 = "005lsgnsaj8rjkzbhi23g99xy9zln4ggkad11xqmn4xa6g199wly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/zig-mode";
+          sha256 = "1kg1x0l65nqqpzn5np41ya9khr1yqcg5ki7z3jw0g4wxdbz7lrbx";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -102855,13 +104413,13 @@
         version = "20170112.2205";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
-          repo = "emacs-zweilight-theme";
+          repo = "Zweilight-Theme-for-Emacs";
           rev = "890f27c939d8a358c9ef0f402fc3314f475ec874";
           sha256 = "0pl254c61405n6sgr01qj4z42vqdvbmf59nz55cl23l2q7kdbfdv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme";
-          sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/zweilight-theme";
+          sha256 = "1j8skn9hz1zkpdg7q0njv5b50cbvrixjjmkp43p58gx98q02p0kq";
           name = "recipe";
         };
         packageRequires = [];
@@ -102923,4 +104481,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file

From 4a2e7f311942a0e61369c41489391163a5063c0b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Sep 2018 14:39:38 -0500
Subject: [PATCH 1073/3253] melpa-stable-packages: 2018-09-15

---
 .../emacs-modes/melpa-stable-generated.nix    | 1818 ++++++++++++-----
 1 file changed, 1343 insertions(+), 475 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index df0ec7fcb12e..f614db8d190d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -33,12 +33,12 @@
       melpaBuild {
         pname = "a";
         ename = "a";
-        version = "0.1.0.-3.4";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "plexus";
           repo = "a.el";
-          rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
-          sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+          rev = "8583685c32069a73ccae0100e990e7b39c901737";
+          sha256 = "00v9w6qg3bkwdhypq0ssf0phdh0f4bcq59c20lngd6vhk0204dqi";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
@@ -442,14 +442,14 @@
         ename = "ac-html";
         version = "0.31";
         src = fetchFromGitHub {
-          owner = "cheunghy";
+          owner = "zhangkaiyulw";
           repo = "ac-html";
           rev = "415a78c3b84855b0c0411832d21a0fb63239b184";
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ce370d60b2f4dd0570b631f6ca92a221e1fe2de6/recipes/ac-html";
-          sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/ac-html";
+          sha256 = "1vidmvylwwvraf8k63dvxv47ism49n6pp0f38l5rl4iaznhkdr84";
           name = "recipe";
         };
         packageRequires = [ auto-complete web-completion-data ];
@@ -1302,8 +1302,8 @@
           sha256 = "02nkcin0piv7s93c9plhy361dbqr78m0gd19myc7qb7gnm36kzpn";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8674b54ad5e17d1da1e499c7d8113f8acd8fd5d/recipes/ahk-mode";
-          sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ahk-mode";
+          sha256 = "0jx5vhlfw5r6l4125bjjbf7dl1589ac6j419swx26k3p8p58d93r";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -1713,14 +1713,14 @@
         ename = "angular-mode";
         version = "1.0";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "angularjs-mode";
           rev = "026558260eb2890c72df6a59ae8762669772282b";
           sha256 = "0ljwaccb0jrp7zrnkp0383185vg3r9pf324al72d445syff5pa6y";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7b120c7f97e8d313387d2e9d9210e7fcdd10523b/recipes/angular-mode";
-          sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/angular-mode";
+          sha256 = "0pq4lyhppzi806n1k07n0gdhr8z8z71ri12my0pl81rl5j2z69l2";
           name = "recipe";
         };
         packageRequires = [];
@@ -2141,6 +2141,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    archive-rpm = callPackage ({ emacs
+                               , fetchFromGitHub
+                               , fetchurl
+                               , lib
+                               , melpaBuild }:
+      melpaBuild {
+        pname = "archive-rpm";
+        ename = "archive-rpm";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "legoscia";
+          repo = "archive-rpm";
+          rev = "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7";
+          sha256 = "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm";
+          sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/archive-rpm";
+          license = lib.licenses.free;
+        };
+      }) {};
     artbollocks-mode = callPackage ({ fetchFromGitHub
                                     , fetchurl
                                     , lib
@@ -2323,6 +2349,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    attrap = callPackage ({ dash
+                          , emacs
+                          , f
+                          , fetchFromGitHub
+                          , fetchurl
+                          , flycheck
+                          , lib
+                          , melpaBuild
+                          , s }:
+      melpaBuild {
+        pname = "attrap";
+        ename = "attrap";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "jyp";
+          repo = "attrap";
+          rev = "a971acb251e343d4c6b0253f69dcce0c2cee0fac";
+          sha256 = "0p93y151730ga7v9xa5gkp306s32qw53086i829fcbxf83c2wslv";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap";
+          sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs f flycheck s ];
+        meta = {
+          homepage = "https://melpa.org/#/attrap";
+          license = lib.licenses.free;
+        };
+      }) {};
     auctex-latexmk = callPackage ({ auctex
                                   , fetchFromGitHub
                                   , fetchurl
@@ -2830,14 +2886,14 @@
         ename = "autopair";
         version = "0.6.1";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "autopair";
           rev = "2d1eb81d12f71248ad305e70cceddf08d4fe2b39";
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/autopair";
-          sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/autopair";
+          sha256 = "0l2ypsj3dkasm0lj9jmnaqjs3rv97ldfw8cmayv77mzfd6lhjmh3";
           name = "recipe";
         };
         packageRequires = [ cl-lib ];
@@ -3196,6 +3252,30 @@
           license = lib.licenses.free;
         };
       }) {};
+    bbdb = callPackage ({ fetchgit
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "bbdb";
+        ename = "bbdb";
+        version = "3.2";
+        src = fetchgit {
+          url = "https://git.savannah.nongnu.org/git/bbdb.git";
+          rev = "307bad59bc3debf250a8617ab699b50a9402c0ae";
+          sha256 = "1i01yyr6cya2dmdpydam72mnvxj4p3mj7pbnw19lrjlfzahmajir";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
+          sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/bbdb";
+          license = lib.licenses.free;
+        };
+      }) {};
     bbdb- = callPackage ({ bbdb
                          , fetchFromGitHub
                          , fetchurl
@@ -3696,12 +3776,12 @@
       melpaBuild {
         pname = "bm";
         ename = "bm";
-        version = "201807";
+        version = "201808";
         src = fetchFromGitHub {
           owner = "joodland";
           repo = "bm";
-          rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c";
-          sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh";
+          rev = "d224b6cd8341db4c2e11263c346dd44fb37fcd88";
+          sha256 = "18xwm1xj436bwa2l3dkfx6hlj19y6f0xqd3jbd06j4g3idpryqma";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -4191,12 +4271,12 @@
       melpaBuild {
         pname = "bui";
         ename = "bui";
-        version = "1.1.0";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "bui.el";
-          rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d";
-          sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82";
+          rev = "bd3c5ee32d28d80c6eb54b0340626103c32e3093";
+          sha256 = "0ixia5s41f2nbal3wsixacbhbc0mk9yb75ir1amqakip30sq4apv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui";
@@ -4209,6 +4289,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    build-farm = callPackage ({ bui
+                              , emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , magit-popup
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "build-farm";
+        ename = "build-farm";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "build-farm.el";
+          rev = "e244dea35566a10253d61be430d3caf81b779af8";
+          sha256 = "1a4ky0hca26p7f3i2c2s5517ygkyaaz52vs0vxy6f5q95rhlgdhd";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bc97bf56ea50788ecbbbb1f46e188e8487370936/recipes/build-farm";
+          sha256 = "0dbq3sc1x0cj06hv3mlk0zw0cijdwjszicylv14m1wahal33xjrw";
+          name = "recipe";
+        };
+        packageRequires = [ bui emacs magit-popup ];
+        meta = {
+          homepage = "https://melpa.org/#/build-farm";
+          license = lib.licenses.free;
+        };
+      }) {};
     build-status = callPackage ({ cl-lib ? null
                                 , fetchFromGitHub
                                 , fetchurl
@@ -4245,14 +4353,14 @@
         ename = "bundler";
         version = "1.1.0";
         src = fetchFromGitHub {
-          owner = "tobiassvn";
+          owner = "endofunky";
           repo = "bundler.el";
           rev = "4cb4fafe092d587cc9e58ff61cf900fb7f409adf";
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler";
-          sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/bundler";
+          sha256 = "1jvcrxwsf9yd5vhirfdmjl52n6hffr1vikd386qbn32vgqcsba7a";
           name = "recipe";
         };
         packageRequires = [ inf-ruby ];
@@ -4321,12 +4429,12 @@
       melpaBuild {
         pname = "buttercup";
         ename = "buttercup";
-        version = "1.12";
+        version = "1.13";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "39d625ce53bb1e1b9b03d9c9c70aa81e94fcc66a";
-          sha256 = "1y97af0kl0yiirnajn44jcz865acndjwkr3zhpf65lm0bbaxfp2a";
+          rev = "079ef3e4620075932fecdda01e55eb4d78ba13a4";
+          sha256 = "0n87526mhsyswpnk5lmvlh00bnzm1sqfsl04kwab75kig8shs3bm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -4423,12 +4531,12 @@
       melpaBuild {
         pname = "calendar-norway";
         ename = "calendar-norway";
-        version = "0.9.3";
+        version = "0.9.4";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "calendar-norway.el";
-          rev = "8501b2ee515e995f345365391b03f44c812cabdf";
-          sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a";
+          rev = "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4";
+          sha256 = "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway";
@@ -5309,23 +5417,32 @@
                          , pkg-info
                          , queue
                          , seq
+                         , sesman
                          , spinner }:
       melpaBuild {
         pname = "cider";
         ename = "cider";
-        version = "0.17.0";
+        version = "0.18.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "5b1c148078b3c6083f7777f2c3349d5c6403fdba";
-          sha256 = "0yl1s84kq3438rbndzaxsxghjps82pgjpv76n5dwbkzcwpb84wn9";
+          rev = "97b95f5b5bb4f9c8f439375b4238d41fd5be9926";
+          sha256 = "1m9kc88vga3q5d731qnpngnsa0n57pf21k3hll20rw8rggrx4vdn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "recipe";
         };
-        packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
+        packageRequires = [
+          clojure-mode
+          emacs
+          pkg-info
+          queue
+          seq
+          sesman
+          spinner
+        ];
         meta = {
           homepage = "https://melpa.org/#/cider";
           license = lib.licenses.free;
@@ -5608,14 +5725,14 @@
         ename = "clips-mode";
         version = "0.7";
         src = fetchFromGitHub {
-          owner = "grettke";
+          owner = "clips-mode";
           repo = "clips-mode";
           rev = "f7869b67c2a8f061ce05f1e48abbcb41a6c455ce";
           sha256 = "07r01g5xcr3w0kq09m4rb8ws0ss77szczycybvas4379sf3g8dv9";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
-          sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/clips-mode";
+          sha256 = "1ckk8ajr1x8y2h8jx2q233xs69nip3kjn0wp3xgfbwx7hjcbk7kr";
           name = "recipe";
         };
         packageRequires = [];
@@ -5642,16 +5759,16 @@
       melpaBuild {
         pname = "clj-refactor";
         ename = "clj-refactor";
-        version = "2.3.1";
+        version = "2.4.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "9005de31ed05122d3db9f503fbc69722abf3634b";
-          sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk";
+          rev = "3d5d1fbf28bfcc00f917cd96d6784968dcbbc962";
+          sha256 = "1z9278syijnzxfwlghz7bps3jp4cdl0fxg6igwpjfl8ln56hxazk";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
-          sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/clj-refactor";
+          sha256 = "05x0820x34pidcz03z96qs685y2700g7ha0dx4vy1xr7fg356c3z";
           name = "recipe";
         };
         packageRequires = [
@@ -5762,12 +5879,12 @@
       melpaBuild {
         pname = "clojure-mode";
         ename = "clojure-mode";
-        version = "5.8.1";
+        version = "5.9.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "09831e36efaaa3aa284c241cca1f53ac55cbe410";
-          sha256 = "1fw5lbyyhjcfl23i1day8shs3diihvlqx59372c7k7gw8wb8phnq";
+          rev = "e8d6414043dc063d16598dc951c1ba8168738265";
+          sha256 = "0mz7zbm9z99k01jgni990x7jpghfnngxnrw1cz65y5lxwyxibnaz";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -5788,7 +5905,7 @@
       melpaBuild {
         pname = "clojure-mode-extra-font-locking";
         ename = "clojure-mode-extra-font-locking";
-        version = "5.8.1";
+        version = "5.9.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
@@ -5974,7 +6091,7 @@
       melpaBuild {
         pname = "cmake-mode";
         ename = "cmake-mode";
-        version = "3.12.0";
+        version = "3.12.2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
@@ -6226,6 +6343,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    comb = callPackage ({ emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "comb";
+        ename = "comb";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "cyrus-and";
+          repo = "comb";
+          rev = "8a68d313bf429763eb8aa78ece00230a668f2a1f";
+          sha256 = "1hh1lkan1ch5xyzrpfgzibf8dxmvaa1jfwlxyyhpnfs5h69h3245";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1b236a1f3953475cbd7eb5c4289b092818ae08cf/recipes/comb";
+          sha256 = "0n4pkigr07hwj5nb0ngs6ay80psqv7nppp82rg5w38qf0mjs3pkp";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/comb";
+          license = lib.licenses.free;
+        };
+      }) {};
     commander = callPackage ({ cl-lib ? null
                              , dash
                              , f
@@ -6307,6 +6450,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    commentary-theme = callPackage ({ emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , lib
+                                    , melpaBuild }:
+      melpaBuild {
+        pname = "commentary-theme";
+        ename = "commentary-theme";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "pzel";
+          repo = "commentary-theme";
+          rev = "1e2a64719b9d52992c6cdb91911ab313bcd69a77";
+          sha256 = "1bs7dz10f25pi5wfszxgf6afrsbfw6fwp8sm55fa6c46l3pi9jpm";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/852b5f83c9870209080d2ed39fede3215ae43e64/recipes/commentary-theme";
+          sha256 = "1s3g40f0r0v8m1qqldvw64vs43i5xza7rwkvhxqcqmj6p1a7mqqw";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/commentary-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     commenter = callPackage ({ emacs
                              , fetchFromGitHub
                              , fetchurl
@@ -6595,12 +6764,12 @@
       melpaBuild {
         pname = "company-emoji";
         ename = "company-emoji";
-        version = "2.5.0";
+        version = "2.5.1";
         src = fetchFromGitHub {
           owner = "dunn";
           repo = "company-emoji";
-          rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
-          sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
+          rev = "271909be44f86bcc294739ca45992cdc3caee39f";
+          sha256 = "1rihgld1wxwfdpqv7d9gcgd8xpnms5kpw61z30y18fmkxhhmid3c";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@@ -6795,12 +6964,12 @@
       melpaBuild {
         pname = "company-lsp";
         ename = "company-lsp";
-        version = "2.0.1";
+        version = "2.0.2";
         src = fetchFromGitHub {
           owner = "tigersoldier";
           repo = "company-lsp";
-          rev = "4512d062c38922d8b8cf402ca6043c246e915694";
-          sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk";
+          rev = "b93abde5bbc870170d2a2f5aa309be8a9618daf9";
+          sha256 = "1jb75km5w2y7iawknyb5nhi1k4mlll4srd6vaf4zm7frmx50jwyc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
@@ -6933,12 +7102,12 @@
       melpaBuild {
         pname = "company-prescient";
         ename = "company-prescient";
-        version = "2.0";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
-          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b92c34e493bbefab1d7747b0855d1ab2f984cb7c/recipes/company-prescient";
@@ -7397,12 +7566,12 @@
       melpaBuild {
         pname = "conllu-mode";
         ename = "conllu-mode";
-        version = "0.1.0";
+        version = "0.1.1.1";
         src = fetchFromGitHub {
           owner = "odanoburu";
           repo = "conllu-mode";
-          rev = "993fd6bc2b5c7b70815a3ecede1642f607513615";
-          sha256 = "0x6ga4h084qcf9h6nak7c66qq1slq907n64sqx41gnd3zbscmwxa";
+          rev = "a752e9f7a04237e70e58beba23871f8fee4fd4e3";
+          sha256 = "0nany4lqhn56xan9hjr4cwv77ydgi51aqsm150j0093qsr1a91xp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/444f943baddfeafe29708d6d68aeeeedbb7aa7bd/recipes/conllu-mode";
@@ -7452,14 +7621,14 @@
         ename = "contextual";
         version = "1.0.1";
         src = fetchFromGitHub {
-          owner = "lshift-de";
+          owner = "e-user";
           repo = "contextual";
           rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
           sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/44e5b799e411b8e2d89c8e9aeb4720126ac908b7/recipes/contextual";
-          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/de20db067590624bbd2ca5a7a537b7f11ada84f2/recipes/contextual";
+          sha256 = "1xwjjchmn3xqxbgvqishh8i75scc4kjgdzlp5j64d443pfgyr56a";
           name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs ];
@@ -7721,12 +7890,12 @@
       melpaBuild {
         pname = "counsel-etags";
         ename = "counsel-etags";
-        version = "1.6.2";
+        version = "1.6.3";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "counsel-etags";
-          rev = "9437ce4e4adb7140df6af0a4528069b9e54de44b";
-          sha256 = "14q7w6pz3pslwr4s1f2b8wiq6k1jvp09mwml9x2j5ljw7j3145pi";
+          rev = "0ff874cd5ad5b29ca557685d04087e3eec859fe7";
+          sha256 = "1pzi0yz320xy72z65nahrxm2dspnnzz55zxjf01ha5nr1nh01q2h";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@@ -8402,7 +8571,7 @@
       melpaBuild {
         pname = "cython-mode";
         ename = "cython-mode";
-        version = "0.28.4";
+        version = "0.28.5";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
@@ -8528,6 +8697,50 @@
           license = lib.licenses.free;
         };
       }) {};
+    dap-mode = callPackage ({ bui
+                            , dash
+                            , dash-functional
+                            , emacs
+                            , f
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , lsp-java
+                            , lsp-mode
+                            , melpaBuild
+                            , s
+                            , tree-mode }:
+      melpaBuild {
+        pname = "dap-mode";
+        ename = "dap-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "yyoncho";
+          repo = "dap-mode";
+          rev = "d1a27fd8e27f03d1a2bf2113f2f9f26ce648178c";
+          sha256 = "0bp4giv3gjm3r9ws8qw260j29q7y5c5yj94afdhiqdj093yjv994";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9b5296ada8eb52689acb1f236e0e74fecbbfd5fb/recipes/dap-mode";
+          sha256 = "1hbsmgfgn742fs086m80rjlidglmran0b072f7s8js4c00jy2xdv";
+          name = "recipe";
+        };
+        packageRequires = [
+          bui
+          dash
+          dash-functional
+          emacs
+          f
+          lsp-java
+          lsp-mode
+          s
+          tree-mode
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/dap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     darcula-theme = callPackage ({ fetchFromGitLab
                                  , fetchurl
                                  , lib
@@ -8561,12 +8774,12 @@
       melpaBuild {
         pname = "darktooth-theme";
         ename = "darktooth-theme";
-        version = "0.3.7";
+        version = "0.3.10";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
-          sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
+          rev = "ae14a9be19b6fbd287e0f5ad156e7942cd6a5bc6";
+          sha256 = "1jisiz0blksjl6d8q7bnvnlfrwalqfpd93fs66i8pgllhf5z7j19";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -8593,14 +8806,14 @@
         ename = "dart-mode";
         version = "1.0.3";
         src = fetchFromGitHub {
-          owner = "nex3";
+          owner = "bradyt";
           repo = "dart-mode";
           rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01";
           sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
-          sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/dart-mode";
+          sha256 = "0zpvp86067a6l63wrpqxsm9fhv3n4ggbq8pg21vgiz54hk4x1xpp";
           name = "recipe";
         };
         packageRequires = [ cl-lib dash emacs flycheck s ];
@@ -8750,12 +8963,12 @@
       melpaBuild {
         pname = "datetime";
         ename = "datetime";
-        version = "0.4.1";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "d8674ac11f9ebb702e5bbac10a4a6e5542958ef5";
-          sha256 = "19d4wximzwdcs0i2r48k6m60wwxcx5f89jw75k4hr0wvx0352a82";
+          rev = "a4191272d5ef950712d3d9668209d09db7bfef65";
+          sha256 = "0klgjlp3dpj530iq1l4i96adkpas8id27m9iwpng39mhfqhc050a";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91ef4352603cc69930ab3d63f0a90eee63f5f328/recipes/datetime";
@@ -8780,12 +8993,12 @@
       melpaBuild {
         pname = "deadgrep";
         ename = "deadgrep";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "deadgrep";
-          rev = "160fa79bc76fa79ab727e369c5053bd61ca62a49";
-          sha256 = "0csval9g9w606dvj24rv2x5f6rbaj1lczavvcldq0wgj8fivkyh1";
+          rev = "4904896b4d8ed5bdae29e1bc5e2c0c4af050cf67";
+          sha256 = "0kyqc5s109yhj73by429nsg19xwv2is803b04qigdfwrzm5cvk4y";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93389fae7233b83ea904e17bdaf83f8247cda3d8/recipes/deadgrep";
@@ -10027,12 +10240,12 @@
       melpaBuild {
         pname = "docker";
         ename = "docker";
-        version = "0.7.0";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "0bcc50fa0c94c1647511d37efcb46fa8b5d23db3";
-          sha256 = "12qggbxjmj939zzv774cqydfa3ykw7v77qphkjvlx2j2vq7r1d90";
+          rev = "03ab45c44a7db072dea4ea379930684c18c7d873";
+          sha256 = "0q2mhh0al82hgr8kbb8pvhw2hf5ryf0gmch4fhpb4q5nq9gb6gnw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -10197,12 +10410,12 @@
       melpaBuild {
         pname = "doom-modeline";
         ename = "doom-modeline";
-        version = "0.2.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "seagle0128";
           repo = "doom-modeline";
-          rev = "845e0319d3cce53424e2c804290c16014df53709";
-          sha256 = "135152m1a96549blh658lvk4q76dy3bhnl2f0vf78q1pxnrv9mx1";
+          rev = "ad7c7ae7e4639a9b93d66d85bdd47b66d8f65365";
+          sha256 = "1zadmslgcw1r8wga06jpb6a3d5ylsbn0x3yad8hrzgn9rcyrpfgl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4f610757f85fb01bd9b1dd212ddbea8f34f3ecd/recipes/doom-modeline";
@@ -10232,12 +10445,12 @@
       melpaBuild {
         pname = "doom-themes";
         ename = "doom-themes";
-        version = "2.1.1";
+        version = "2.1.6";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "98120f9b362b53983e932f126cf92848297b745a";
-          sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0";
+          rev = "39e6971e81181b86a57f65cd0ea31376203a9756";
+          sha256 = "042pzcdhxi2z07jcscgjbaki9nrrm0cbgbbrnymd1r4q8ckkn8l9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -10809,12 +11022,12 @@
       melpaBuild {
         pname = "easy-hugo";
         ename = "easy-hugo";
-        version = "3.3.30";
+        version = "3.3.32";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "8bf48b973905c4ab488633226b3dfb3317d8c745";
-          sha256 = "0yjxg1mql7ha6wa5wdkngs6y3lqz5y5y0hbsmpvqdw61paqm2ggs";
+          rev = "31cd8060d4ebb117599b90bee0f470ed148bcfba";
+          sha256 = "1sd38chf5zlhyiz2p56bwl35j22h7bfqqrwxxsccyypk217nrvnh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -10835,12 +11048,12 @@
       melpaBuild {
         pname = "easy-jekyll";
         ename = "easy-jekyll";
-        version = "1.6.15";
+        version = "1.6.17";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-jekyll";
-          rev = "84c19d0380617ce2e40a2b42ce9bedf65e52779d";
-          sha256 = "1vbb60vb98nqbwrxl6p3gcvjpnjlscp0hp4k53rcgjd75w9vbnsj";
+          rev = "dc8a97d3d512dccf908f63f54a2679e3450fec85";
+          sha256 = "0y6d9gmrk9cka1kl09qfjfrm8p70bxy7bisfl0c7ays9ky7pniix";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@@ -10888,12 +11101,12 @@
       melpaBuild {
         pname = "easy-kill-extras";
         ename = "easy-kill-extras";
-        version = "0.9.4.1";
+        version = "0.9.5";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "easy-kill-extras.el";
-          rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd";
-          sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48";
+          rev = "1dafa46271dfe08de77d0273451b1e91ed332692";
+          sha256 = "12xm63kvqzxrw3c5ni2l93mjs5mfbh3k69j4157b54629rfkad9v";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras";
@@ -10998,12 +11211,12 @@
       melpaBuild {
         pname = "ebib";
         ename = "ebib";
-        version = "2.11.11";
+        version = "2.12.1";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "212dea4a52f04eaa1d13a895fffea04f5884f12b";
-          sha256 = "150dggfk79pk11qlzfl2sk1xaibdy0sbh6n94r7i2w235p2yg8p5";
+          rev = "1b675d32ebeb8b52cd20934b6e4a4914361329fa";
+          sha256 = "0g12bg4wnzki6v780zhn8gxr80lrszldq8wpcni20l78kn799rdv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -11297,12 +11510,12 @@
       melpaBuild {
         pname = "editorconfig";
         ename = "editorconfig";
-        version = "0.7.12";
+        version = "0.7.13";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "ae856b02a6513521bdf6a77a7ef51805fb0abf57";
-          sha256 = "0y13276ajz12rw1xcfqnr7q6kkk6zi0f55p10nblfkhxclhr0f7z";
+          rev = "e2a5cfe9709e75f4abf0b4856831a1699d2d7479";
+          sha256 = "1jx1zxk2nib3vfzvwbkd22503h7n9faa409gl55gw5kysw9lk3pn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -11457,14 +11670,14 @@
         ename = "egison-mode";
         version = "3.7.10";
         src = fetchFromGitHub {
-          owner = "egisatoshi";
-          repo = "egison3";
+          owner = "egison";
+          repo = "egison";
           rev = "0f8289294b1a8de029f89643438e8384e7ee789f";
           sha256 = "1rkxz4gj11z1jpd3g71m6sbzb5j4ggm6sixk3r18wb8wv91v4fgs";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
-          sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/egison-mode";
+          sha256 = "0bch4863l9wxrss63fj46gy3nx3hp635709xr4c2arw0j7n82lzd";
           name = "recipe";
         };
         packageRequires = [];
@@ -11735,12 +11948,12 @@
       melpaBuild {
         pname = "el-patch";
         ename = "el-patch";
-        version = "2.1";
+        version = "2.2.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "c10108162bc72b8d09ccf9c914e892e1209f9c20";
-          sha256 = "0fibq04fncv8pia8xjaxc6gc4x046cg26ag6dw6gg0wj79gpyrv9";
+          rev = "15b3e84ab7001d42acd621cd6572ffdca839ea33";
+          sha256 = "0fg4zzvk7vddiqgk9hcq8h09j8xr6c3hxhh7fa9rah4ni6clxmaw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -11919,12 +12132,12 @@
       melpaBuild {
         pname = "electric-operator";
         ename = "electric-operator";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "16df9e16da8efe25d410ba17165d7f5c1ad4e043";
-          sha256 = "010zr6dgix6bf8xshs8kascpzcrg83vqd1w71qin9anw6rf3z4d4";
+          rev = "21e6b84754118912768263a393442a7aefb4742b";
+          sha256 = "1bgz5vn4piax8jm0ixqlds0qj5my26zczaxs21fah11pwbdc0xyk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -11971,12 +12184,12 @@
       melpaBuild {
         pname = "elfeed";
         ename = "elfeed";
-        version = "3.0.0";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
-          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
+          rev = "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e";
+          sha256 = "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -11999,12 +12212,12 @@
       melpaBuild {
         pname = "elfeed-protocol";
         ename = "elfeed-protocol";
-        version = "0.5.3";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "fasheng";
           repo = "elfeed-protocol";
-          rev = "611a1f57373e3692abf5122652ea7f6f96d3f6ec";
-          sha256 = "0z9xij39p6m2855ksk40qaf830d04smhl3ag9gjb4fhzvw671k76";
+          rev = "81ae532fba657ff230568a14277d1f71940688a3";
+          sha256 = "09s5jnb5sbraszwcmwaa7fzvv8qd6l7cnyl18rzfszhkqkc17xhj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@@ -12027,12 +12240,12 @@
       melpaBuild {
         pname = "elfeed-web";
         ename = "elfeed-web";
-        version = "3.0.0";
+        version = "3.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "7e0abfee1470ae6323b559a7a9f843dd0076d622";
-          sha256 = "01x4ww63lvn04c7f3ab5vx2s20xqisvv8213qwswz7vr9nxja5yi";
+          rev = "3d1c6ecbe585f9fe6ca5a97a3fc352d68f303f9e";
+          sha256 = "1bzpl6lc7kq9bph4bfz1fn19207blrnhjr2g7yinhn0nnnjmxi8i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -12113,13 +12326,13 @@
         version = "1.3";
         src = fetchFromGitHub {
           owner = "Wilfred";
-          repo = "refs.el";
+          repo = "elisp-refs";
           rev = "788f6f65d5171b1887b3ff9e4cad900e8046b2b1";
           sha256 = "0c7hcbjqynw6k5idpmfxn6xbr192ahhk8a2g72npap97flpw6cdq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
-          sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elisp-refs";
+          sha256 = "1pj3dm2z6m24179ibl7zhr8lhan2v2rjnm3abfciwp228piz1sfz";
           name = "recipe";
         };
         packageRequires = [ dash loop s ];
@@ -12165,14 +12378,14 @@
         ename = "elixir-mode";
         version = "2.3.1";
         src = fetchFromGitHub {
-          owner = "elixir-lang";
+          owner = "elixir-editors";
           repo = "emacs-elixir";
           rev = "a1f4d60ec555574c945201359d2e32b183c69f4b";
           sha256 = "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
-          sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/elixir-mode";
+          sha256 = "0d25p6sal1qg1xsq5yk343afnrxa0lzpx5gsh72khnx2i8pi40vz";
           name = "recipe";
         };
         packageRequires = [ emacs pkg-info ];
@@ -12380,12 +12593,12 @@
       melpaBuild {
         pname = "elpy";
         ename = "elpy";
-        version = "1.22.0";
+        version = "1.24.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "47eac168f38e40fc07f56ea37fb1bee7f645e42a";
-          sha256 = "09inijph1r0l94balf0z01g2dgx22y53c346cxf4fkm2hcjd2fd7";
+          rev = "5249e086b76ac7b22e9d5d094d92294d00067ba8";
+          sha256 = "0rsg8a9nwqfkv0xcs11jzfp10ij7jm0v2ikx19zv2v7awqy0q5wf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -13083,21 +13296,20 @@
                        , paredit
                        , popup
                        , projectile
-                       , redshank
                        , s }:
       melpaBuild {
         pname = "emr";
         ename = "emr";
-        version = "0.3.7";
+        version = "0.3.8";
         src = fetchFromGitHub {
-          owner = "chrisbarrett";
+          owner = "Wilfred";
           repo = "emacs-refactor";
-          rev = "ff330b50526fa6da34bd410b506cb89408ef8c1e";
-          sha256 = "1jbyg3b1y8rs2s7xq79gzllfnxcr1whg6zja2kl7zk23kkn65s7r";
+          rev = "f25e3354e5e97deef359aef5386c69dea20b07b0";
+          sha256 = "107br10jwza4pwsx8gskh9kp2g28yzxclmwd2l9z137nmf24gm3a";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
-          sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/emr";
+          sha256 = "02a7yzv6vxdazi26wk1ijadrjffd4iaf1abhpv642xib86pgpfd6";
           name = "recipe";
         };
         packageRequires = [
@@ -13110,7 +13322,6 @@
           paredit
           popup
           projectile
-          redshank
           s
         ];
         meta = {
@@ -13640,7 +13851,7 @@
       melpaBuild {
         pname = "erlang";
         ename = "erlang";
-        version = "21.0.3";
+        version = "21.0.9";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
@@ -13658,6 +13869,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    erlstack-mode = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "erlstack-mode";
+        ename = "erlstack-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "k32";
+          repo = "erlstack-mode";
+          rev = "07398e929978b0eaf2bf119e97cba7b9f9e90d2a";
+          sha256 = "1gf9k3z9v1s7d01s551ys87j05xh3lpnvv86dq86rz8xinc09kac";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6ee61c1c5f116082b37fb13d15052ed9bbbc1dac/recipes/erlstack-mode";
+          sha256 = "0b7mj0rs8k3hdv4v3v5vmdqs0y26mss7dzc0sjjxj4d095yddqqf";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/erlstack-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     ert-async = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , lib
@@ -14014,14 +14250,14 @@
         ename = "eshell-prompt-extras";
         version = "0.96";
         src = fetchFromGitHub {
-          owner = "hiddenlotus";
+          owner = "kaihaosw";
           repo = "eshell-prompt-extras";
           rev = "7581c109673c40aceff278cd524273f50ffe170d";
           sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
-          sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/eshell-prompt-extras";
+          sha256 = "0zkdb9a8dibk832b5hzb6wjich3l0lah5p64805rgd4qskzj10gx";
           name = "recipe";
         };
         packageRequires = [];
@@ -14164,25 +14400,24 @@
       }) {};
     ess = callPackage ({ fetchFromGitHub
                        , fetchurl
-                       , julia-mode
                        , lib
                        , melpaBuild }:
       melpaBuild {
         pname = "ess";
         ename = "ess";
-        version = "17.11";
+        version = "17.11.999";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "f59a95e72ba2803229cc9aeb7559186c528dbcea";
-          sha256 = "0lwajgf39r75g239plbhlbppgj7vyc5via72qq906jqy89b5iic7";
+          rev = "43a0cc8fba8f544362b79a8934ed4ec30c5fcd2c";
+          sha256 = "0ssck7png966xs31hwgd6drrhrkcgxay6r7i59npviyl16jp6j3z";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/156a6fa9e6ee16174d215c1dcd524aff847b3bf0/recipes/ess";
           sha256 = "1psqrw9k7d2ha8zid2mkc6bgcyalrm3n53c00g3cgckkbahl7r6n";
           name = "recipe";
         };
-        packageRequires = [ julia-mode ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/ess";
           license = lib.licenses.free;
@@ -14537,6 +14772,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-collection = callPackage ({ cl-lib ? null
+                                   , emacs
+                                   , evil
+                                   , fetchFromGitHub
+                                   , fetchurl
+                                   , lib
+                                   , melpaBuild }:
+      melpaBuild {
+        pname = "evil-collection";
+        ename = "evil-collection";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "emacs-evil";
+          repo = "evil-collection";
+          rev = "733f8d0d289fcbb58705acd1049b618826a3c011";
+          sha256 = "01hr5wf693s2djs6l83nfpq6wyyws99c5nwil6hpqhvrwp4f5h95";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fbc35279115f6fdf1ce7d1ecef3b413c7ca9c4f1/recipes/evil-collection";
+          sha256 = "1l6x782ix873n90k9g00i9065h31dnhv07bgzrp28l7y7bivqwl7";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs evil ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-collection";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-commentary = callPackage ({ evil
                                    , fetchFromGitHub
                                    , fetchurl
@@ -14743,8 +15006,8 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/089accfa2646fc4f265cb8e9b9a05dcf5aa4c4f6/recipes/evil-mark-replace";
-          sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/evil-mark-replace";
+          sha256 = "14j2d46288shlixb57nh5vlqdi3aiv20djvcbhiw1cm9ar2c3y4v";
           name = "recipe";
         };
         packageRequires = [ evil ];
@@ -16051,6 +16314,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    fd-dired = callPackage ({ fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "fd-dired";
+        ename = "fd-dired";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "yqrashawn";
+          repo = "fd-dired";
+          rev = "b30ebe827a244b4f27f5387be4b50d074ca67e1b";
+          sha256 = "09856pzkybs85msz0awqjw2r3b1hc9wybwq1j30qx14zzbcr3gvf";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1217e0d4f42df68cc22de9b4f27a36c0377509e3/recipes/fd-dired";
+          sha256 = "0g8zvg6b9hcxkmqn254y9khjm7jz2lz4mh7dhsxfcy64inaj0481";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/fd-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
     feature-mode = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -16218,14 +16506,14 @@
         ename = "find-file-in-repository";
         version = "1.2";
         src = fetchFromGitHub {
-          owner = "hoffstaetter";
+          owner = "h";
           repo = "find-file-in-repository";
           rev = "8b888f85029a2ff9159a724b42aeacdb051c3420";
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/58705ac6201b73851ce4ce9ebeb0e65463765961/recipes/find-file-in-repository";
-          sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/find-file-in-repository";
+          sha256 = "02rihpfpckppnf5a2zgd5s3dspdhq4mr6qchlrzg2fd4byjxra9s";
           name = "recipe";
         };
         packageRequires = [];
@@ -16543,12 +16831,12 @@
       melpaBuild {
         pname = "floobits";
         ename = "floobits";
-        version = "1.9.2";
+        version = "1.9.3";
         src = fetchFromGitHub {
           owner = "Floobits";
           repo = "floobits-emacs";
-          rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
-          sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
+          rev = "489b294a7f30ecd2af2edc0823dead8102f27af6";
+          sha256 = "1pw88qn6s8ln626c8mgxgpfax39h7ww4m930dp7gg4aklxjbspkn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -16596,12 +16884,12 @@
       melpaBuild {
         pname = "flower";
         ename = "flower";
-        version = "0.4.2";
+        version = "0.4.3";
         src = fetchFromGitHub {
           owner = "PositiveTechnologies";
           repo = "flower";
-          rev = "4d05448dc0118078ec320f564d87acaa740ae47c";
-          sha256 = "02p74f5hfhrhv5l7b9cwfbczsgkpqajlmr66qmkdljgc8ksr86n2";
+          rev = "a0e6912e6e709e5cf083d48cebffdb60b809c59a";
+          sha256 = "04m6x5hiac9f4ffjw82g9gcy5r84vfrm4vj67f1vqr7llqbflkzm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower";
@@ -16942,6 +17230,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-grammalecte = callPackage ({ emacs
+                                        , fetchgit
+                                        , fetchurl
+                                        , flycheck
+                                        , lib
+                                        , melpaBuild }:
+      melpaBuild {
+        pname = "flycheck-grammalecte";
+        ename = "flycheck-grammalecte";
+        version = "0.5";
+        src = fetchgit {
+          url = "https://git.deparis.io/flycheck-grammalecte/";
+          rev = "4f5937c58f895a62ccb3466af20b26a61ef9071c";
+          sha256 = "15jpck7h2bn6idfzizjw79nfza3lm9dj03v0r44pnm1ryx7l89w7";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd82aa0568d998a3d176b5ee47b8a227438ea09/recipes/flycheck-grammalecte";
+          sha256 = "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-grammalecte";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-haskell = callPackage ({ dash
                                     , emacs
                                     , fetchFromGitHub
@@ -17035,12 +17349,12 @@
       melpaBuild {
         pname = "flycheck-joker";
         ename = "flycheck-joker";
-        version = "1.2.0";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "candid82";
           repo = "flycheck-joker";
-          rev = "0d8d5683a273093ca12841bf93d10dae97ccbc5d";
-          sha256 = "0r9w0ky1522yz1jdi8fd36lpdjm30vxq41x77vswikqxvscri3dq";
+          rev = "51e99e697761ee8dab863930910abdba7607c1bd";
+          sha256 = "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -17415,12 +17729,12 @@
       melpaBuild {
         pname = "flycheck-pycheckers";
         ename = "flycheck-pycheckers";
-        version = "0.9";
+        version = "0.11";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "flycheck-pycheckers";
-          rev = "526488b4d8a2067ca666ed8f4de631db79651fb3";
-          sha256 = "17arb41j884gg8xdbc7nf0raahzinkslkpr161497dvs2xfpb9zi";
+          rev = "4f65e93931c5be4b183d2a3cf5a52a394f9a09b7";
+          sha256 = "034sfjd01w4djrhmcdywv5g771wi7ny5b3pad3pici4129jkk62s";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -17625,6 +17939,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-vdm = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , flycheck
+                                , lib
+                                , melpaBuild
+                                , vdm-mode }:
+      melpaBuild {
+        pname = "flycheck-vdm";
+        ename = "flycheck-vdm";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "0c083ee4848ea5d78de7894a4a0722d6630839c9";
+          sha256 = "175zlxxjxl7zp80hm2hz5xw7gy3qh0hz3fdvqy8v3n0vz4zvqx1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/flycheck-vdm";
+          sha256 = "15ng1l8gfp8iz50yb5d39dy57763gd2x8j6z6rz0byiykgxhl9zg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs flycheck vdm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-vdm";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-yamllint = callPackage ({ fetchFromGitHub
                                      , fetchurl
                                      , flycheck
@@ -17974,14 +18316,14 @@
         ename = "flymake-perlcritic";
         version = "1.0.3";
         src = fetchFromGitHub {
-          owner = "illusori";
+          owner = "flymake";
           repo = "emacs-flymake-perlcritic";
           rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8";
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/flymake-perlcritic";
-          sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/flymake-perlcritic";
+          sha256 = "1i0bc81cby2nsala2mhghzv7clhbf1gpp54vdxiq2wdanqy25vmk";
           name = "recipe";
         };
         packageRequires = [ flymake ];
@@ -18463,26 +18805,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontify-face = callPackage ({ fetchFromGitHub
+    fontify-face = callPackage ({ emacs
+                                , fetchFromGitHub
                                 , fetchurl
                                 , lib
                                 , melpaBuild }:
       melpaBuild {
         pname = "fontify-face";
         ename = "fontify-face";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "fontify-face";
-          rev = "5bbd4bbbb69f3fe156af53d32000a4b769ed4cbd";
-          sha256 = "0s2vwzjd08xj4vpmx7knyrld44k6dd9mhync50r580wpgrgfxm04";
+          rev = "fc3325c98427523d86f0b411e0515cec51ac3d8a";
+          sha256 = "1zfld9a17xhisfwhmfxvx1x63ksl6jg5g99kbivj4nq70sf26dpw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72bd6750dd5a7d9ed6e408e690f76c260ffd7d9e/recipes/fontify-face";
           sha256 = "1w7xlkladqkbh7gpnkbi53a7k9p5wzma4y9jgwbc58hng9ggm1k0";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/fontify-face";
           license = lib.licenses.free;
@@ -18601,12 +18944,12 @@
       melpaBuild {
         pname = "fountain-mode";
         ename = "fountain-mode";
-        version = "2.5.3";
+        version = "2.6.1";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "8269066a9035fcf50eb835de3745a62c1cb96660";
-          sha256 = "1s1wyhjdyp12iz3zk333z5wlbxl5x3hki9q16164fk9ifhkrppxd";
+          rev = "7d84ed48df76ee05f629781741ad7c5783c3cc66";
+          sha256 = "0f6vav08583gahr863sa5v7mabwjlm1dgfybv3843cscqmxb70zw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -18654,12 +18997,12 @@
       melpaBuild {
         pname = "frameshot";
         ename = "frameshot";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "frameshot";
-          rev = "65994602fdf3d8881f0cabffebbce6c0e493e3c8";
-          sha256 = "0crvvacpajlhdida54gvv4y11xx78qscr6nznx0bhdb12sj3n45q";
+          rev = "917efdd678e397aa01efa657e3488d34445eca90";
+          sha256 = "1c19magazz78jd65r7c58nhp0bcyfysrlvf4jbfgrdd9bf7xlkx6";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e5cfaa4b5fda97054d45691fad9d79b559f2df14/recipes/frameshot";
@@ -18815,6 +19158,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    fuel = callPackage ({ cl-lib ? null
+                        , emacs
+                        , fetchFromGitHub
+                        , fetchurl
+                        , lib
+                        , melpaBuild }:
+      melpaBuild {
+        pname = "fuel";
+        ename = "fuel";
+        version = "0.98";
+        src = fetchFromGitHub {
+          owner = "factor";
+          repo = "factor";
+          rev = "780bbd49cf82c9746ca5a3f42f4a4a27266ccee9";
+          sha256 = "1fs6200rsbnk2lagz8qj17iynaf4c1fvb6sm03i53shsbarak2c3";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
+          sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z";
+          name = "recipe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
     full-ack = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -19238,12 +19608,12 @@
       melpaBuild {
         pname = "gf";
         ename = "gf";
-        version = "1.0.1";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "grammaticalframework";
           repo = "gf-emacs-mode";
-          rev = "4ab35bb727bd0717e0691d3c490f72551e13d683";
-          sha256 = "0al1ad92ga84wm0kx66wplnn1p05mxf7ik4r5gknr8jp6aa1lcqd";
+          rev = "e8e55584b0a473922c58cbb4860306a84c3336e5";
+          sha256 = "09fqax9dr40rj8f6b4z7lkjrs305gnkm2f4q314f4k7yxnz3c055";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2cc74eb19c54219cd5c5c11d886074859f0948/recipes/gf";
@@ -19290,12 +19660,12 @@
       melpaBuild {
         pname = "ggtags";
         ename = "ggtags";
-        version = "0.8.12";
+        version = "0.8.13";
         src = fetchFromGitHub {
           owner = "leoliu";
           repo = "ggtags";
-          rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2";
-          sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97";
+          rev = "17a121af1b375a6a5c5acec52f2ffd2b9715d244";
+          sha256 = "10hryphjjyi13gvk8sy8r5y7nvs0hbw8ycjqj9snai0c1f9xrdsa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -19426,12 +19796,12 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "ghub";
-          rev = "9496d29d645823b52db347d5571cfd3c4ddcff06";
-          sha256 = "1xa5pdzp18ykm59kc10bx3rqh0c1vq203yrikvqdj1gx088ksmj7";
+          rev = "4831933da059ee084a16016558b9ccd8c581a8ff";
+          sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub";
-          sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/ghub";
+          sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
           name = "recipe";
         };
         packageRequires = [ emacs let-alist ];
@@ -19958,7 +20328,7 @@
       melpaBuild {
         pname = "gitattributes-mode";
         ename = "gitattributes-mode";
-        version = "1.2.7";
+        version = "1.2.8";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
@@ -20008,7 +20378,7 @@
       melpaBuild {
         pname = "gitconfig-mode";
         ename = "gitconfig-mode";
-        version = "1.2.7";
+        version = "1.2.8";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
@@ -20168,7 +20538,7 @@
       melpaBuild {
         pname = "gitignore-mode";
         ename = "gitignore-mode";
-        version = "1.2.7";
+        version = "1.2.8";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
@@ -20365,8 +20735,8 @@
           sha256 = "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab";
-          sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f403587f77380d1db214aa34933a9b5cce1ef2bd/recipes/glab";
+          sha256 = "0kyr1znf82qi15r6iha6dbyhmfzghx969hd364rsvkly8ry8pk5m";
           name = "recipe";
         };
         packageRequires = [ emacs ghub ];
@@ -21518,6 +21888,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    graphql = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "graphql";
+        ename = "graphql";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "graphql.el";
+          rev = "672dd9ebd7e67d8089388b0c484cd650e76565f3";
+          sha256 = "0sp0skc1rnhi39szfbq1i99pdgd3bhn4c15cff05iqhjy2d4hniw";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3e801ae56f11b64a5a3e52cf1a6c152940ab8c97/recipes/graphql";
+          sha256 = "139fng2psn535ymqa7c6hm1r7ja1gs5mdvb487jj6fh0bl9wq8la";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/graphql";
+          license = lib.licenses.free;
+        };
+      }) {};
     graphviz-dot-mode = callPackage ({ fetchFromGitHub
                                      , fetchurl
                                      , lib
@@ -21625,12 +22021,12 @@
       melpaBuild {
         pname = "green-screen-theme";
         ename = "green-screen-theme";
-        version = "1.0.24";
+        version = "1.0.26";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "green-screen-emacs";
-          rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
-          sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
+          rev = "774e8f6c033786406267f71ec07319d906a30b75";
+          sha256 = "0f12lqgfi1vlhq8p5ia04vlmvmyb4f40q7dm2nbh5y8r6k89hisg";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -21943,12 +22339,12 @@
       melpaBuild {
         pname = "guix";
         ename = "guix";
-        version = "0.4.1.1";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "60a922a0d48747f1c1d945a725f40a9d1f1fa3a9";
-          sha256 = "0jp0bjy9l2m3kii0p1fnqmvsbz9hafv5s5840czsda3mc9x9c7b0";
+          rev = "6ac7b47fa1ce4dbb8b897de7c73ff6802b15e52e";
+          sha256 = "1wha6dnl17m683sjgwgh9apxvxzgg1f4k80sv6fl78w8q441f4bn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -22022,14 +22418,14 @@
         ename = "hacker-typer";
         version = "1.0.6";
         src = fetchFromGitHub {
-          owner = "therockmandolinist";
+          owner = "dieggsy";
           repo = "emacs-hacker-typer";
           rev = "d5a23714a4ccc5071580622f278597d5973f40bd";
           sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer";
-          sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3416586d4d782cdd61a56159c5f80a0ca9b3ddf4/recipes/hacker-typer";
+          sha256 = "0vf18hylhszvplam6c4yynr53zc3n816p9k36gywm6awwblfpyfb";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -22519,12 +22915,12 @@
       melpaBuild {
         pname = "helm";
         ename = "helm";
-        version = "2.9.8";
+        version = "3.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8de42d08f45a7052ed858132de43a76f933f58f7";
-          sha256 = "1g36knyppz8lfbcn84hx6ivf8b34s26wx5dh4xw85sq6pwi5yn7s";
+          rev = "757263f9332d2d338ac3619f50547ef2f9d2bd9e";
+          sha256 = "0qahykw30vwhkd579s3gs2hya0zw1jpmcw3n39vjg7za573xpgzb";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -22627,12 +23023,12 @@
       melpaBuild {
         pname = "helm-backup";
         ename = "helm-backup";
-        version = "1.0.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
-          sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
+          rev = "45a86a41ac44f90d4db2c0e9339233ee7f0be0b8";
+          sha256 = "0pr4qd6mi9g91lndqnk4w26lq3w8pxcgxragxj3209dgwqsxps95";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -22937,12 +23333,12 @@
       melpaBuild {
         pname = "helm-company";
         ename = "helm-company";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
           repo = "helm-company";
-          rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d";
-          sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs";
+          rev = "5b5c15745d92aff7280698c7619994e2481098b4";
+          sha256 = "1r5b24hamq8d5n418xpf80jn37s357hbc9rd5siw6gwkjn2jykx7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -23457,12 +23853,12 @@
       melpaBuild {
         pname = "helm-hatena-bookmark";
         ename = "helm-hatena-bookmark";
-        version = "2.2.3";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-hatena-bookmark";
-          rev = "d64833a5bbb4ae112ed176f6473232e526138572";
-          sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
+          rev = "274e18182fe20c11e96009387a8e38e8cd2a1d7e";
+          sha256 = "13s36gyb37asgrc9qca9d196i5bnxqy4acmda5cas08b48wp4lxk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -24034,8 +24430,8 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/550eb9f42c90fd9e80714579c12ee6bfcacb5bb7/recipes/helm-pt";
-          sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/helm-pt";
+          sha256 = "1pvipzjw9h668jkbwwkmphvp806fs9q4mb2v2bjxpb0f3kn2qk3n";
           name = "recipe";
         };
         packageRequires = [ helm ];
@@ -24408,12 +24804,12 @@
       melpaBuild {
         pname = "helm-system-packages";
         ename = "helm-system-packages";
-        version = "1.10.0";
+        version = "1.10.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-system-packages";
-          rev = "a82a25a94a670b36e34c5ae192f41b4a104955e5";
-          sha256 = "0y5wzvfycb1bvgdk782xyl744fih43vz14wmq6gcqjarw6xfniz5";
+          rev = "2b4636dc861ffe2c4a2025b67ab40460f85b9563";
+          sha256 = "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c46cfb0fcda0500e15d04106150a072a1a75ccc/recipes/helm-system-packages";
@@ -24461,12 +24857,12 @@
       melpaBuild {
         pname = "helm-tramp";
         ename = "helm-tramp";
-        version = "1.0.5";
+        version = "1.1.6";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "07d2f02166038c14052009f6fb9c2a163118e2cc";
-          sha256 = "1yi4wq484nrjb1yphp6dbaqjgfq7hr78gh9v9cys7dqg910ngy4f";
+          rev = "2148e21fd1a6c8a0b61678bd187ab5a7e387ae64";
+          sha256 = "1dinm85z5dz7ql75bh9hy4kmasfb05amnch32y6xscjdg6736w8j";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -24605,12 +25001,12 @@
       melpaBuild {
         pname = "helpful";
         ename = "helpful";
-        version = "0.12";
+        version = "0.13";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "5f3fb4752de3868e688ff2046790bda569bb6e23";
-          sha256 = "0z56icc8pmm537n34gy8a50a0i42glr58i860xmzlpxdn9f66dxp";
+          rev = "5568c780e1b609a18728c592c0f85d798b6a1a47";
+          sha256 = "168zgmn1rwskj7v8m1vmryglf6kaky2f34nbgjibhhy6s3xbq63p";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -26989,12 +27385,12 @@
       melpaBuild {
         pname = "ipython-shell-send";
         ename = "ipython-shell-send";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchFromGitHub {
           owner = "jackkamm";
           repo = "ipython-shell-send-el";
-          rev = "36523a387c15ee1652a5b0e291d4d4838da5e912";
-          sha256 = "1iba7jpagc0n436pbylpcbwbdxk6bw7y0i7pjgxxwfm8akaj9i68";
+          rev = "ff944b436db381e6772a26c09b0b20a097eb323e";
+          sha256 = "14s6hxnkv7r3idzj7s6vnvifpc8prykzpm6nhb6149yymal4hjkc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d3513d38f94de4d86124b5d5a33be8d5f0bfa43/recipes/ipython-shell-send";
@@ -27374,12 +27770,12 @@
       melpaBuild {
         pname = "ivy-prescient";
         ename = "ivy-prescient";
-        version = "2.0";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
-          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a92495d09689932ab9f0b716078ceeeb9cc154e0/recipes/ivy-prescient";
@@ -27420,6 +27816,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-rich = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , ivy
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "ivy-rich";
+        ename = "ivy-rich";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "yevgnen";
+          repo = "ivy-rich";
+          rev = "b40a76d5c2c29fcc035daa04a7125ffadbedc471";
+          sha256 = "0ayf3dwfhafcbqnckm65zy8nc1rv9ji939qfn53wbhxkrgqdicgz";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
+          sha256 = "0knkqc403gch4dp1q114h64cwwisxwnsxjqbl3cnidlwkn7lzk7m";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-rich";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-rtags = callPackage ({ fetchFromGitHub
                              , fetchurl
                              , ivy
@@ -27900,12 +28323,12 @@
       melpaBuild {
         pname = "js-auto-format-mode";
         ename = "js-auto-format-mode";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "ybiquitous";
           repo = "js-auto-format-mode";
-          rev = "1558fb539e0beb7f98901280d695968a2351384d";
-          sha256 = "16l2mjklazmfpdin3vz3ddf083phhyrhi18n0rfhv5rwh9m23wr9";
+          rev = "59caa137c4beec4dec4a7d7ebf8bcb6af44d72f0";
+          sha256 = "10xxg8lc4g9wdl4lz7kx6la23agpbq4ls1mn5d4y364j8nfcxf9g";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
@@ -28259,6 +28682,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    julia-repl = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "julia-repl";
+        ename = "julia-repl";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "tpapp";
+          repo = "julia-repl";
+          rev = "06678ed0cb07807f6cb153c6b0997edc6a18f22c";
+          sha256 = "1z03pgmfs8r9rwd8yhbb71fkl2lhr8i5ajs7n5gg1syrhnlj89ml";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
+          sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/julia-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
     jump = callPackage ({ cl-lib ? null
                         , fetchFromGitHub
                         , fetchurl
@@ -28454,12 +28903,12 @@
       melpaBuild {
         pname = "kaolin-themes";
         ename = "kaolin-themes";
-        version = "1.3.5";
+        version = "1.4.1";
         src = fetchFromGitHub {
           owner = "ogdenwebb";
           repo = "emacs-kaolin-themes";
-          rev = "e183b7adb06338046f1a17a94e18ec67e62d4e42";
-          sha256 = "1mvspqll53p8rz66588lvdflwfx4av6cnzigid6n10d1cy35p5vg";
+          rev = "b0d8d0eb3e7d762a53587736894be0d0901c067a";
+          sha256 = "0bh7cgr10in3vcc1l41qsxakajb0kp7gia959hryqjcf2aqipzvp";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@@ -29179,12 +29628,12 @@
       melpaBuild {
         pname = "lcr";
         ename = "lcr";
-        version = "0.9";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "lcr";
-          rev = "3bc341205bba437c8fec4fefefaf39793c0405ae";
-          sha256 = "0jvdnb3fn33wq7ixb7ayrallq1j5gc9nh3i3nmy03yg11h60h1am";
+          rev = "c14f40692292d59156c7632dbdd2867c086aa75f";
+          sha256 = "0mc55icihxqpf8b05990q1lc2nj2792wcgyr73xsiqx0963sjaj8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/29374d3da932675b7b3e28ab8906690dad9c9cbe/recipes/lcr";
@@ -29487,6 +29936,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    linguistic = callPackage ({ fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "linguistic";
+        ename = "linguistic";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "andcarnivorous";
+          repo = "linguistic";
+          rev = "18e28a7e54efb140c17e16836bc5dac766c9522e";
+          sha256 = "12b9i3rdh16pq9q88bsg771y11rrbj9w74v2qr2bfymbp358qk17";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aedc03a846b873edf2426c422abb8c75732158f8/recipes/linguistic";
+          sha256 = "0yhyrr7yknvky6fb6js0lfxbl13i6a218kya7cpj2dpzdckcbhca";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/linguistic";
+          license = lib.licenses.free;
+        };
+      }) {};
     link = callPackage ({ fetchFromGitHub
                         , fetchurl
                         , lib
@@ -29817,12 +30291,12 @@
       melpaBuild {
         pname = "live-py-mode";
         ename = "live-py-mode";
-        version = "2.22.0";
+        version = "2.23.1";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "ab2f9bea32dbad11a6464a4880e5487645a0f65a";
-          sha256 = "0w3kpszsrh0gj0a62iqhnhm3flmmgq0pl0d6w5r61mvlq9wck5dv";
+          rev = "efd9bba8a40448cccfcb745a84d479cb5275122b";
+          sha256 = "0va4cirxwv0k9q74ac313pvxvnkvqpp6zqxwscpx4v6hp1gw7wvw";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -30012,6 +30486,7 @@
       }) {};
     logview = callPackage ({ datetime
                            , emacs
+                           , extmap
                            , fetchFromGitHub
                            , fetchurl
                            , lib
@@ -30019,19 +30494,19 @@
       melpaBuild {
         pname = "logview";
         ename = "logview";
-        version = "0.11.1";
+        version = "0.11.2";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "902c881f5e1ca802761b856b3945bd418847dd79";
-          sha256 = "1df41wabldg1ahcbqi5szwml5hqdjm6p3hj5b8ajkkagykrnh8xg";
+          rev = "6a45a358635dccc5eb970722f14444415e40e832";
+          sha256 = "0fd79ig5fha207959qr9hib0b4l7wlg7sis03zbhx944xqr8mrv9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "recipe";
         };
-        packageRequires = [ datetime emacs ];
+        packageRequires = [ datetime emacs extmap ];
         meta = {
           homepage = "https://melpa.org/#/logview";
           license = lib.licenses.free;
@@ -30088,6 +30563,33 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-clangd = callPackage ({ emacs
+                              , fetchFromGitHub
+                              , fetchurl
+                              , lib
+                              , lsp-mode
+                              , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-clangd";
+        ename = "lsp-clangd";
+        version = "3.1.3";
+        src = fetchFromGitHub {
+          owner = "emacs-lsp";
+          repo = "lsp-clangd";
+          rev = "bf7641f6c512a133a038556c17e8b454b0602ea0";
+          sha256 = "00zxhzgily9rxnrrwywid4v5kqpls5490hkb4sqixl8xzms0j339";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/71646b47e5f5702e80bf6c56f882d041074ef3c0/recipes/lsp-clangd";
+          sha256 = "05dmzyb9xw2m4kck7y3cj8dm2542p3vi48lqs21gcrvm5vbrkx3g";
+          name = "recipe";
+        };
+        packageRequires = [ emacs lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-clangd";
+          license = lib.licenses.free;
+        };
+      }) {};
     lsp-mode = callPackage ({ emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -30141,6 +30643,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    lsp-p4 = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , lsp-mode
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "lsp-p4";
+        ename = "lsp-p4";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "dmakarov";
+          repo = "p4ls";
+          rev = "49eb7c25b95b02da34eb02e5858eb06d34e628e1";
+          sha256 = "07z4k60b32k2mzxnl5lxnz5zd4y1p9jc6gqn57d3hwpz3mn8mjzx";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/53f0da8b3d2903adeffdbc3d8df7d630bfd9ff71/recipes/lsp-p4";
+          sha256 = "0cd3n17lqwz08zfkm9g5cr1cj2asznlbhxrym2a7b7shdmn3yx5f";
+          name = "recipe";
+        };
+        packageRequires = [ lsp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/lsp-p4";
+          license = lib.licenses.free;
+        };
+      }) {};
     lua-mode = callPackage ({ fetchFromGitHub
                             , fetchurl
                             , lib
@@ -30643,12 +31171,12 @@
       melpaBuild {
         pname = "magit-popup";
         ename = "magit-popup";
-        version = "2.12.3";
+        version = "2.12.4";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-popup";
-          rev = "32e6da899abd6657c098534c5775fc7177047f49";
-          sha256 = "0nrvs7gwd9kn4n808akrydn7zggvy9zyk38yrcmm561kw0h0h903";
+          rev = "6e07f745a18af514c2885eeabe9b2b2a5216e53c";
+          sha256 = "08952nzn0cb6gxscqyiljk4fq2zxjvr3ism0lvgw0gs9hl5phiwx";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup";
@@ -30742,9 +31270,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-todos = callPackage ({ a
-                               , anaphora
-                               , async
+    magit-todos = callPackage ({ async
                                , dash
                                , emacs
                                , f
@@ -30759,30 +31285,19 @@
       melpaBuild {
         pname = "magit-todos";
         ename = "magit-todos";
-        version = "1.0.3";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "magit-todos";
-          rev = "d12e2e3ccad4b87d5df5285ade0c56ec5f46ad63";
-          sha256 = "006yy13hjzalwz7pz0br32zifxlxrrf8cvnz0j3km55sxpdvqmil";
+          rev = "30622d12c6a085cfa727d0f5f889408e31653957";
+          sha256 = "0sfsb4916wxpjfv7f4dqna4bmlyqmsc1ba0vsf16nzi9i2bk7wg3";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4544ab55d2c8b8c3b7eb739b9fb90ebb246d68b/recipes/magit-todos";
           sha256 = "0vqmbw0qj8a5wf4ig9hgc0v3l1agdkvgprzjv178hs00297br2s8";
           name = "recipe";
         };
-        packageRequires = [
-          a
-          anaphora
-          async
-          dash
-          emacs
-          f
-          hl-todo
-          magit
-          pcre2el
-          s
-        ];
+        packageRequires = [ async dash emacs f hl-todo magit pcre2el s ];
         meta = {
           homepage = "https://melpa.org/#/magit-todos";
           license = lib.licenses.free;
@@ -30799,14 +31314,14 @@
         ename = "magit-topgit";
         version = "2.1.2";
         src = fetchFromGitHub {
-          owner = "magit";
+          owner = "greenrd";
           repo = "magit-topgit";
           rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0";
           sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit";
-          sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/magit-topgit";
+          sha256 = "1194hdcphir4cmvzg9cxrjiyg70hr9zmml2rljih94vl7zrw7335";
           name = "recipe";
         };
         packageRequires = [ emacs magit ];
@@ -30836,7 +31351,7 @@
           sha256 = "1iq8c939c0a6v8gq31vcjw6nxwnz4fpavcd6xf4h2rb6rkmxmhvl";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e555b46f5de7591aa8e10a7cf67421e26a676db8/recipes/magithub";
           sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
           name = "recipe";
         };
@@ -31264,12 +31779,12 @@
       melpaBuild {
         pname = "mastodon";
         ename = "mastodon";
-        version = "0.7.2";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "ae8dabda04e377a6ac22cb854e4844f68073f533";
-          sha256 = "1avf2wkzd14dj27i9skm3mn3ipkr1zp93yrwxrk2q5kphj1qji2j";
+          rev = "e4482232a5bb2a3036664eba598bf12506fe0b6e";
+          sha256 = "07fq3k62j9cz1567i2x11q1j9pwybb7qxwcilnnrphf4aibgq6kn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -31393,12 +31908,12 @@
       melpaBuild {
         pname = "mb-url";
         ename = "mb-url";
-        version = "0.1.0";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "mb-url";
-          rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa";
-          sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc";
+          rev = "aa13abfc6231076a53b8a9903c9804443960d589";
+          sha256 = "17qlx1n2vxc5dhvjiw6nl9n74ansbra6hzazcxx0xrz5vx0ssh1i";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url";
@@ -31500,12 +32015,12 @@
       melpaBuild {
         pname = "meghanada";
         ename = "meghanada";
-        version = "1.0.8";
+        version = "1.0.9";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "1fe888ad929f0ebed9a8cde7bb0a605881e1386c";
-          sha256 = "1b7cri71fikvyxcc6q9rci1zc4q45a1bvz00ks7gvx6w2sd7h5gd";
+          rev = "59568a4b32373d2ae7917673896369a922375a3e";
+          sha256 = "12sswa3fyf0pgawfz6ak9xc97da3bnv1qng2apw42gwg5yc0qlq4";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -31606,14 +32121,14 @@
         ename = "merlin";
         version = "3.1.0";
         src = fetchFromGitHub {
-          owner = "the-lambda-church";
+          owner = "ocaml";
           repo = "merlin";
           rev = "a9149b6ec88b455e0e040da6a6c0ca325d052904";
           sha256 = "1f9aqlic7i9ib5lfsix731bkzh857djcgfsqggxy95xvxswm8xpr";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
-          sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/merlin";
+          sha256 = "1b6zdm68ds94mqiygifqi45k3czrmwvaki58jwxbbddn3ya7iinz";
           name = "recipe";
         };
         packageRequires = [];
@@ -31626,23 +32141,24 @@
                                 , fetchFromGitHub
                                 , fetchurl
                                 , lib
-                                , melpaBuild }:
+                                , melpaBuild
+                                , merlin }:
       melpaBuild {
         pname = "merlin-eldoc";
         ename = "merlin-eldoc";
-        version = "1.2";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "khady";
           repo = "merlin-eldoc";
-          rev = "33544dcc389003ed6e3eabdade90c81db62ab0af";
-          sha256 = "0p24l4jnsiaq3a36dq99pb74djnzjx7qjddns3w5l9s1hkrh79g5";
+          rev = "bbb1a10f2131c09a7f7f844d4da98efd77f927ae";
+          sha256 = "11gggay8srycpckclqvcmad6ym3lx2sxgj670z89br91jdwmkr2f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7130ec893175323775e887babbcec7a1e324c01/recipes/merlin-eldoc";
           sha256 = "0r4997813yz81zvmdgvr0xcp9c321h55z39lajpj1plmrs3c7bry";
           name = "recipe";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs merlin ];
         meta = {
           homepage = "https://melpa.org/#/merlin-eldoc";
           license = lib.licenses.free;
@@ -31709,14 +32225,14 @@
         ename = "metaweblog";
         version = "1.0.1";
         src = fetchFromGitHub {
-          owner = "punchagan";
+          owner = "org2blog";
           repo = "metaweblog";
           rev = "aa14380eb7e7b879a0c16c96866b20a987cd3f2a";
           sha256 = "146w9laysdqbikpzr2gc9vnjrdsa87d8i13f2swlh1kvq2dn3rz5";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
-          sha256 = "10kwqnfafby4ap0572mfkkdssr13y9p2gl9z3nmxqjjy04fkfi8b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/metaweblog";
+          sha256 = "0qgmcvq1fhgljia9ncjgvgrv0mzih0l9mglwbwcszn613wmx8bkg";
           name = "recipe";
         };
         packageRequires = [ xml-rpc ];
@@ -31961,12 +32477,12 @@
       melpaBuild {
         pname = "minions";
         ename = "minions";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "minions";
-          rev = "536653d2dcae8362f2d02fee3ca8b65d4c875db7";
-          sha256 = "1wa35cbffvzg0ciif93nv6jv7b0m72ixic0w8iwc5wbbvk9k5wip";
+          rev = "2f5e73e15d0021e7ba26cf09f1cd2734b018fb69";
+          sha256 = "12acfjmk6n40k5mb2hy1izbk483y83bc3d54r76l750sbm3kpdar";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/769a2167d7f6dfdbbfda058ddea036f80b97d230/recipes/minions";
@@ -33690,14 +34206,14 @@
         ename = "ninja-mode";
         version = "1.8.2";
         src = fetchFromGitHub {
-          owner = "martine";
+          owner = "ninja-build";
           repo = "ninja";
           rev = "484c16336f19bd8970bb6e75322d61b92a229899";
           sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
-          sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/ninja-mode";
+          sha256 = "1v6wy9qllbxl37fp9h47000lwp557qss6fdjb3a1f20msg8f70av";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -33844,12 +34360,12 @@
       melpaBuild {
         pname = "nodejs-repl";
         ename = "nodejs-repl";
-        version = "0.1.6";
+        version = "0.1.7";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
-          sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
+          rev = "d0b4e56488d16a695286a563a4ac27df7ea13100";
+          sha256 = "1mc39wc7q7n5vs02cwj5r264bnwkllvi7i67r6zxc33abx2zmlwa";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -34484,6 +35000,34 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-tmux = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild
+                           , s
+                           , seq }:
+      melpaBuild {
+        pname = "ob-tmux";
+        ename = "ob-tmux";
+        version = "0.1.5";
+        src = fetchFromGitHub {
+          owner = "ahendriksen";
+          repo = "ob-tmux";
+          rev = "8886f31291e979b41215f3eb97670732efffea34";
+          sha256 = "0j77n1lawkx94hyv89xsvmrbqhd8x19ycrvxrwhc0mzlxh7rxjcy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a3f47fbfe745972e690e8028f893bb38ba30978d/recipes/ob-tmux";
+          sha256 = "12c0m2xxd75lbc98h7cwprmdn823mh2ii59pxr6fgnq7araqkz20";
+          name = "recipe";
+        };
+        packageRequires = [ emacs s seq ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-tmux";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-translate = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , google-translate
@@ -35071,14 +35615,14 @@
         ename = "org-alert";
         version = "0.1.0";
         src = fetchFromGitHub {
-          owner = "groksteve";
+          owner = "spegoraro";
           repo = "org-alert";
           rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac";
           sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
-          sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org-alert";
+          sha256 = "01bb0s22wa14lyr9wi58cvk4b03xqq268y3dvxbrhymw1ld97zk2";
           name = "recipe";
         };
         packageRequires = [ alert dash s ];
@@ -35333,14 +35877,14 @@
         ename = "org-doing";
         version = "0.1";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "org-doing";
           rev = "e099514cfc162f8fe3d383456a7964743b0455d5";
           sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
-          sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org-doing";
+          sha256 = "10vg0wl8dsy12r51178qi4rzi94img692z5x3zv8dxa29lmn26xs";
           name = "recipe";
         };
         packageRequires = [];
@@ -35498,14 +36042,14 @@
         ename = "org-gcal";
         version = "0.2";
         src = fetchFromGitHub {
-          owner = "myuhe";
+          owner = "kidd";
           repo = "org-gcal.el";
           rev = "badd3629e6243563c30ff1dd0452b7601f6cc036";
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal";
-          sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d97c701819ea8deaa8a9664db1f391200ee52c4f/recipes/org-gcal";
+          sha256 = "014h67ba0cwi4i1llngypscyvyrm74ljh067i3iapx5a18q7xw5v";
           name = "recipe";
         };
         packageRequires = [ alert cl-lib emacs org request-deferred ];
@@ -35575,12 +36119,12 @@
       melpaBuild {
         pname = "org-index";
         ename = "org-index";
-        version = "5.8.9";
+        version = "5.9.3";
         src = fetchFromGitHub {
           owner = "marcihm";
           repo = "org-index";
-          rev = "c26f48ec26f5d345e354845c7686fed4751d2136";
-          sha256 = "0n571b2r0c6l9jklqgr0nxz5ca2jw7yfqpngl21lq06zz95lw9lw";
+          rev = "d073e071ab5e96af6691ccf9b20c975e7a0c8e16";
+          sha256 = "15r9qxbkz2s82qj7fbdzcln4w3qipq6lgdfyrgmzi9f73v5l0c8f";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/54946e733901986304f7a7a5139b2818ebf97eb3/recipes/org-index";
@@ -35594,6 +36138,7 @@
         };
       }) {};
     org-jira = callPackage ({ cl-lib ? null
+                            , dash
                             , emacs
                             , fetchFromGitHub
                             , fetchurl
@@ -35604,19 +36149,19 @@
       melpaBuild {
         pname = "org-jira";
         ename = "org-jira";
-        version = "3.1.1";
+        version = "4.0.2";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "03d6ebcf177db7b208c6a99386695e839f314314";
-          sha256 = "07hy37by9ics7rc1sgkpg8qk2xzp67ny4i4rkd7q7j4abqdr131v";
+          rev = "152ba45cded217e9f9f24a195cf9e078630cea89";
+          sha256 = "0ivksfm6bwf9dxm0k56bfnz4v82cz0gd13f9cljvrpkxjxqvn95z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
-          sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0a2fae6eecb6b4b36fe97ad99691e2c5456586f/recipes/org-jira";
+          sha256 = "1sbypbz00ki222zpm47yplyprx7h2q076b3l07qfilk0sr8kf4ql";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs request s ];
+        packageRequires = [ cl-lib dash emacs request s ];
         meta = {
           homepage = "https://melpa.org/#/org-jira";
           license = lib.licenses.free;
@@ -35630,12 +36175,12 @@
       melpaBuild {
         pname = "org-journal";
         ename = "org-journal";
-        version = "1.14.2";
+        version = "1.14.3";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "2395db4deb255c05d0d3a75c95f53263b74939c9";
-          sha256 = "018wjn7v8a1z4z1sycz7b01rdck73ap13cr3lvfqvp9mms94qq71";
+          rev = "9fc8eaf9279563f79d9ba7ff1d381534cfa57ec3";
+          sha256 = "0xprwdzxf2y61nxfz3wf5zl4zfk3p0vbm646kkx3fmch9klkxlzl";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -35658,12 +36203,12 @@
       melpaBuild {
         pname = "org-kanban";
         ename = "org-kanban";
-        version = "0.4.6";
+        version = "0.4.8";
         src = fetchFromGitHub {
           owner = "gizmomogwai";
           repo = "org-kanban";
-          rev = "84c9e429ec9fcbe8d6091f15545ee7ebfc1cb589";
-          sha256 = "1jpl56mpw0l2camknzcpng6ji4yb6gz2g29i019iprz9cik5g0xm";
+          rev = "2fc1ed815f7155df1169f68b19c1ad847e620fee";
+          sha256 = "141j9z5a31hpxj073vf0yyhmdw3j89ywqac1a97c2k4967ps0nw1";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1/recipes/org-kanban";
@@ -35849,12 +36394,12 @@
       melpaBuild {
         pname = "org-noter";
         ename = "org-noter";
-        version = "1.1.0";
+        version = "1.2.0";
         src = fetchFromGitHub {
           owner = "weirdNox";
           repo = "org-noter";
-          rev = "8f86583bd573cb0f146aae5d2394e615efb0cafe";
-          sha256 = "0fgmn7gqh146zrmvc1p7dik93sjajay0n8i8qdd4sbdzw64shzl1";
+          rev = "eec8f3a845fc08e7d3eda2d894db3f7d41b6649c";
+          sha256 = "10kx3jlzvzig201zvklw0ndwxzhdcbshlkz4nrfl8fgz32ka0x8b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter";
@@ -36263,6 +36808,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-super-agenda = callPackage ({ dash
+                                    , emacs
+                                    , fetchFromGitHub
+                                    , fetchurl
+                                    , ht
+                                    , lib
+                                    , melpaBuild
+                                    , org
+                                    , s }:
+      melpaBuild {
+        pname = "org-super-agenda";
+        ename = "org-super-agenda";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-super-agenda";
+          rev = "9dca3d88daf4ad58c5913846c968bbb9a37f95aa";
+          sha256 = "0infnwhssnaksmha4731cn30vm83im0lyq71r5ns5sdgwx32sxhh";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
+          sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs ht org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-super-agenda";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sync = callPackage ({ cl-lib ? null
                             , emacs
                             , fetchFromGitHub
@@ -36423,6 +36998,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-timeline = callPackage ({ dash
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild }:
+      melpaBuild {
+        pname = "org-timeline";
+        ename = "org-timeline";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "org-timeline";
+          rev = "5063120b688c60320aa19fa67787613929ca7b1d";
+          sha256 = "0ih55nq2vhzk6n07ds1fgil72jq5fc9rjkqh2n32ch8cafzv2ma2";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/298bd714f6cefd83d594b0eea731a01fb2faf1ad/recipes/org-timeline";
+          sha256 = "0zlhjzjc7jwqh6wcys17hraz76n2hnjwffis02x71maclrf2cfdd";
+          name = "recipe";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "https://melpa.org/#/org-timeline";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-toodledo = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -36582,6 +37183,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-web-tools = callPackage ({ dash
+                                 , emacs
+                                 , esxml
+                                 , fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild
+                                 , org
+                                 , s }:
+      melpaBuild {
+        pname = "org-web-tools";
+        ename = "org-web-tools";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "alphapapa";
+          repo = "org-web-tools";
+          rev = "7ad832950cb17890a4da751ae6d6817a7428f342";
+          sha256 = "0kak9h5ny00d39gnwspv53nadnag01brw2fq9zk5wpfc91h9bjng";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
+          sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7";
+          name = "recipe";
+        };
+        packageRequires = [ dash emacs esxml org s ];
+        meta = {
+          homepage = "https://melpa.org/#/org-web-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-wild-notifier = callPackage ({ alert
                                      , dash
                                      , emacs
@@ -36623,14 +37254,14 @@
         ename = "org2blog";
         version = "1.0.2";
         src = fetchFromGitHub {
-          owner = "punchagan";
+          owner = "org2blog";
           repo = "org2blog";
           rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0";
           sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
-          sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/org2blog";
+          sha256 = "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33";
           name = "recipe";
         };
         packageRequires = [ htmlize metaweblog org xml-rpc ];
@@ -37351,12 +37982,12 @@
       melpaBuild {
         pname = "package-build";
         ename = "package-build";
-        version = "2.2";
+        version = "2.3";
         src = fetchFromGitHub {
           owner = "melpa";
           repo = "package-build";
-          rev = "9aac3517bde14346eadbe2c7d354672a456b9db3";
-          sha256 = "0wa7d5vzxql499knlpbs07l5mw7kmxgwzv63i42arm1sqfplq5df";
+          rev = "385cd427ce15ca1715f3dd758b6aa408bf0186b1";
+          sha256 = "1412pjghyvzkdlsrrs0ql30vw591bhyk1wlbf49f15dzjbspx3w0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -37987,7 +38618,7 @@
       melpaBuild {
         pname = "password-store";
         ename = "password-store";
-        version = "1.7.2";
+        version = "1.7.3";
         src = fetchFromGitHub {
           owner = "zx2c4";
           repo = "password-store";
@@ -38423,7 +39054,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    persp-fr = callPackage ({ emacs
+    persp-fr = callPackage ({ dash
+                            , emacs
                             , fetchFromGitHub
                             , fetchurl
                             , lib
@@ -38432,19 +39064,19 @@
       melpaBuild {
         pname = "persp-fr";
         ename = "persp-fr";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "rocher";
           repo = "persp-fr";
-          rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
-          sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
+          rev = "3f536440b120499464106fd25f182d7580192870";
+          sha256 = "0bnplxv6igry7ak3wvn2b88zm4aarv35z4z5q38x52k4zac94rl8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
           sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
           name = "recipe";
         };
-        packageRequires = [ emacs persp-mode ];
+        packageRequires = [ dash emacs persp-mode ];
         meta = {
           homepage = "https://melpa.org/#/persp-fr";
           license = lib.licenses.free;
@@ -38750,14 +39382,14 @@
         ename = "php-mode";
         version = "1.19.1";
         src = fetchFromGitHub {
-          owner = "ejmr";
+          owner = "emacs-php";
           repo = "php-mode";
           rev = "aacb133b3d89ed0da8d936a162f49afc2aa5dfd4";
           sha256 = "1al6l37377psiykk6syyyc3sfifr7x3mqyb2rms5kqqkff53x1yx";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
-          sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e41dc09413eaa93704e7d9f55bd2bd01f658806/recipes/php-mode";
+          sha256 = "1gqmcynz2wx09xjnk70db1a2pbnrh1vfm5vd6mks1s10y59bh0zq";
           name = "recipe";
         };
         packageRequires = [ cl-lib emacs ];
@@ -38795,6 +39427,7 @@
       }) {};
     phpactor = callPackage ({ cl-lib ? null
                             , emacs
+                            , f
                             , fetchFromGitHub
                             , fetchurl
                             , lib
@@ -38802,19 +39435,19 @@
       melpaBuild {
         pname = "phpactor";
         ename = "phpactor";
-        version = "0.0.2";
+        version = "0.1.0";
         src = fetchFromGitHub {
           owner = "emacs-php";
           repo = "phpactor.el";
-          rev = "fc301e6388332bb23162adaff2c59bb9214d66a4";
-          sha256 = "1iy7pqs2p2h98kr4blnif577qbbyp7ldyrl20g6515k9g888fxab";
+          rev = "61e4eab638168b7034eef0f11e35a89223fa7687";
+          sha256 = "0dsa1mygb96nlz5gppf0sny3lxaacvmvnkg84c0cs6x223s6zfx8";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d67b98ecd541c227c011615f67d7a0890f5e1af3/recipes/phpactor";
           sha256 = "0w2iszi74y3s6rcn6p2ic545cg319y4jpy83npbh5m98y8jma84m";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs ];
+        packageRequires = [ cl-lib emacs f ];
         meta = {
           homepage = "https://melpa.org/#/phpactor";
           license = lib.licenses.free;
@@ -38884,12 +39517,12 @@
       melpaBuild {
         pname = "phpunit";
         ename = "phpunit";
-        version = "0.16.0";
+        version = "0.17.1";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "a13706733f98be3639c47311fc820b3b50f4bc33";
-          sha256 = "0vfvybjinj0knim4ax0xspz7zr3n2y9ap1lvwqx1gwydr06w4jrl";
+          rev = "4212307bbcfd8accd2abfa7e4ab55a6751a0b11b";
+          sha256 = "1silbfmv85r73pbc7f5cm4znc6644ngihfnhibk1fgp9j0rf7ahc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -39132,26 +39765,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    plantuml-mode = callPackage ({ fetchFromGitHub
+    plantuml-mode = callPackage ({ emacs
+                                 , fetchFromGitHub
                                  , fetchurl
                                  , lib
                                  , melpaBuild }:
       melpaBuild {
         pname = "plantuml-mode";
         ename = "plantuml-mode";
-        version = "1.2.5";
+        version = "1.2.7";
         src = fetchFromGitHub {
           owner = "skuro";
           repo = "plantuml-mode";
-          rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
-          sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
+          rev = "82ab084c8631e70b089448ace72525f647af4f10";
+          sha256 = "0jcsbswpg41r27i5xb5lvw17n1kndwl8df9iwyhpm26jh2i2hpyv";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
           sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/plantuml-mode";
           license = lib.licenses.free;
@@ -39465,6 +40099,59 @@
           license = lib.licenses.free;
         };
       }) {};
+    poly-ruby = callPackage ({ emacs
+                             , fetchFromGitHub
+                             , fetchurl
+                             , lib
+                             , melpaBuild
+                             , polymode }:
+      melpaBuild {
+        pname = "poly-ruby";
+        ename = "poly-ruby";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "poly-ruby.el";
+          rev = "794ebb926ace23e9c1398da934701951432dcea2";
+          sha256 = "1ffm81hg1gah7hb9x556hda5g4j3gk4c986q9gaacvfizqak3gyy";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
+          sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg";
+          name = "recipe";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "https://melpa.org/#/poly-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    polymode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "polymode";
+        ename = "polymode";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "polymode";
+          repo = "polymode";
+          rev = "a99a0e494c52ccdf83a58c394c701a114ba44bf3";
+          sha256 = "075vap5i6g9zim4jpls1c34mzjwx6f8g410hnz4llmghf972xj68";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d/recipes/polymode";
+          sha256 = "15i9masklpy4iwskc7dzqjhb430ggn0496z4wb1zjj0b9xx4wj66";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/polymode";
+          license = lib.licenses.free;
+        };
+      }) {};
     pomidor = callPackage ({ alert
                            , emacs
                            , fetchFromGitHub
@@ -39813,12 +40500,12 @@
       melpaBuild {
         pname = "prescient";
         ename = "prescient";
-        version = "2.0";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "prescient.el";
-          rev = "515959a2523b43608c9d06dcf8adde8911ce42b9";
-          sha256 = "1k8xk154sql3b2b7hpyxslcgl88aaxq5ak2sr760jsq2qk7878bw";
+          rev = "1e0db9451e75f0db29668bebe98dfa747c6b4bcf";
+          sha256 = "0zm9phc4cv7ldgyngcj84fxc1j0nh12c05lxiwv0n1xb8wc6awvf";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ec02349e31531c347e4a43fbde56ae4386898cc6/recipes/prescient";
@@ -39867,14 +40554,14 @@
         ename = "pretty-mode";
         version = "2.0.3";
         src = fetchFromGitHub {
-          owner = "akatov";
+          owner = "pretty-mode";
           repo = "pretty-mode";
           rev = "4ba8fceb7dd733361ed975d80ac2caa3612fa78b";
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2fe9feae4c1f007e51272a97917a63dcf6bbe5/recipes/pretty-mode";
-          sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/pretty-mode";
+          sha256 = "0zm6azbl70qmq2ybi576wfs3mx0ny54mf97b94ac501miv4fv0mq";
           name = "recipe";
         };
         packageRequires = [];
@@ -40025,12 +40712,12 @@
       melpaBuild {
         pname = "project-persist";
         ename = "project-persist";
-        version = "0.3.2";
+        version = "1.0.1";
         src = fetchFromGitHub {
           owner = "rdallasgray";
           repo = "project-persist";
-          rev = "a4e5de1833edb60656d8a04357c527d34e81d27c";
-          sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
+          rev = "26d9435bef44da2a1b0892eba822f9f487b98eec";
+          sha256 = "0ja2pnbw11a2gwywfyfbdpk8rkm8imy04wkshpnlh0nwn7lf0clm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist";
@@ -40340,6 +41027,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    proof-general = callPackage ({ fetchFromGitHub
+                                 , fetchurl
+                                 , lib
+                                 , melpaBuild }:
+      melpaBuild {
+        pname = "proof-general";
+        ename = "proof-general";
+        version = "4.4";
+        src = fetchFromGitHub {
+          owner = "ProofGeneral";
+          repo = "PG";
+          rev = "771cab48b2f9ea2ae3fa8f944d0e36a805bf9f3b";
+          sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/135c8f2a04739145b500b8742a697907e398d270/recipes/proof-general";
+          sha256 = "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/proof-general";
+          license = lib.licenses.free;
+        };
+      }) {};
     prop-menu = callPackage ({ cl-lib ? null
                              , emacs
                              , fetchFromGitHub
@@ -40374,7 +41086,7 @@
       melpaBuild {
         pname = "protobuf-mode";
         ename = "protobuf-mode";
-        version = "3.6.0.1";
+        version = "3.6.1";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
@@ -41132,12 +41844,12 @@
       melpaBuild {
         pname = "pyvenv";
         ename = "pyvenv";
-        version = "1.16";
+        version = "1.18";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "c1123def7e0d9da57d034d3a6bd3044a738aa8db";
-          sha256 = "0mi86m5z3hig65yd0k224wx6x9i0nz9fcv91njy0ypifxh5hcd8v";
+          rev = "921ae2356b6a111ac0b7e44fd04cba8e95cbe936";
+          sha256 = "04kxx8fjqzzdl2rn56vn9jac2v3irpmr9dfckwfa3r4gslvipybm";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -41759,14 +42471,14 @@
         ename = "realgud";
         version = "1.4.5";
         src = fetchFromGitHub {
-          owner = "rocky";
-          repo = "emacs-dbgr";
+          owner = "realgud";
+          repo = "realgud";
           rev = "09431a4561921bece36a6083b6e27ac4dc82432d";
           sha256 = "00dgdiiwnwynlyyh6pfhljrl363s8zd5ynbx9mhd2y8c3gmvfab0";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
-          sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/realgud";
+          sha256 = "0wbcclgd23d91c7lx8yx7qigcbc0ywr4hjh7h49pi2avy1cm2q0v";
           name = "recipe";
         };
         packageRequires = [
@@ -41807,6 +42519,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    reazon = callPackage ({ emacs
+                          , fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "reazon";
+        ename = "reazon";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "nickdrozd";
+          repo = "reazon";
+          rev = "7e27f37c22f2fbad5315d71c9603309717680b6e";
+          sha256 = "0nk7a73knc9ir1vkpyimjag1nqhrx9x4v2f975n790bgs24v4hhs";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/77020b6ea36a4115bdddbc9599fe4f4193ecc29d/recipes/reazon";
+          sha256 = "1lymdc1lnwr7s8s15mnjcavxdyqncy2rkfdj571lf1a37y52jcj1";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/reazon";
+          license = lib.licenses.free;
+        };
+      }) {};
     rebecca-theme = callPackage ({ emacs
                                  , fetchFromGitHub
                                  , fetchurl
@@ -42148,7 +42886,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    replace-with-inflections = callPackage ({ fetchFromGitHub
+    replace-with-inflections = callPackage ({ cl-lib ? null
+                                            , fetchFromGitHub
                                             , fetchurl
                                             , inflections
                                             , lib
@@ -42157,19 +42896,19 @@
       melpaBuild {
         pname = "replace-with-inflections";
         ename = "replace-with-inflections";
-        version = "0.3.0";
+        version = "0.3.1";
         src = fetchFromGitHub {
           owner = "knu";
           repo = "replace-with-inflections.el";
-          rev = "e0486653abf7c248024800132df23993cd617892";
-          sha256 = "1fygsr3vjpy0crxlyawwk6k21h1w3svgk79rm7fqg5xzilg6kf25";
+          rev = "d9201e047856492f282da65459b28aba25998dbb";
+          sha256 = "09yvn489z33hww7mi1flh344faxrpbkzqhm0i6xb2rridcj7acqh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
           sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0";
           name = "recipe";
         };
-        packageRequires = [ inflections string-inflection ];
+        packageRequires = [ cl-lib inflections string-inflection ];
         meta = {
           homepage = "https://melpa.org/#/replace-with-inflections";
           license = lib.licenses.free;
@@ -42202,7 +42941,7 @@
         };
       }) {};
     req-package = callPackage ({ dash
-                               , fetchFromGitHub
+                               , fetchFromGitLab
                                , fetchurl
                                , ht
                                , lib
@@ -42213,15 +42952,15 @@
         pname = "req-package";
         ename = "req-package";
         version = "1.2";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "edvorg";
           repo = "req-package";
           rev = "0c0ac7451149dac6bfda2adfe959d1df1c273de6";
           sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
-          sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aa5bc1909f807ec03ad441d78013ba8626cd410a/recipes/req-package";
+          sha256 = "1zjhc6f9qcb3j72k1llp6vym25lxnvq1jgqgmnrjxxwc4fhxx595";
           name = "recipe";
         };
         packageRequires = [ dash ht log4e use-package ];
@@ -42451,12 +43190,12 @@
       melpaBuild {
         pname = "rg";
         ename = "rg";
-        version = "1.5.0";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "943226043dc9055b282d0c035fd1e1cbdd562b22";
-          sha256 = "0hm25x1zym4xdc4w1ayn1an4nrg1qwyh12vb9sxas3fplapm500k";
+          rev = "28b2f7d0025a803250806c7d274c6df43b4ccc4b";
+          sha256 = "0i9022j7pd8ywrkkljhnhwdg28bv34lgvigg8anqfav9ahcqswf7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -42846,14 +43585,14 @@
         ename = "rubocop";
         version = "0.5.0";
         src = fetchFromGitHub {
-          owner = "bbatsov";
+          owner = "rubocop-hq";
           repo = "rubocop-emacs";
           rev = "980bedb455e3551d35a212fae515c054888907c1";
           sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
-          sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/rubocop";
+          sha256 = "07ma4fv015wzpj5j4rdb0ckwwmhkxs3k5vy33qxgwghqmn6xby6x";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -43145,24 +43884,23 @@
                                    , fetchFromGitHub
                                    , fetchurl
                                    , lib
-                                   , melpaBuild
-                                   , rust-mode }:
+                                   , melpaBuild }:
       melpaBuild {
         pname = "rust-playground";
         ename = "rust-playground";
-        version = "0.2.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "2f22ec74e4158984e0e70cf0bf728bbd42eb661b";
-          sha256 = "1p80zghdk3hsfj36z30sfkllqr3b4yi279zkg0la9kfg6785x2cg";
+          rev = "092c8b11d62dea23953a004744833092bac85fe1";
+          sha256 = "0n2c1pjbvy46ic0k84jd3ffwwb5hibjqc1wv7knzkldi5agigfsh";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rust-playground";
           sha256 = "0ml0zr9vz2vjd9wr0v706w4v4qqfzpa56rdzfak2kb5llx53j89v";
           name = "recipe";
         };
-        packageRequires = [ emacs rust-mode ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/rust-playground";
           license = lib.licenses.free;
@@ -43384,12 +44122,12 @@
       melpaBuild {
         pname = "sayid";
         ename = "sayid";
-        version = "0.0.16";
+        version = "0.0.17";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "8ea70573e6eb1a0d1a450fd501f38c2cf26ce27f";
-          sha256 = "02yp3h16yzys27lxcxn7qzb23z95vjdaxhinz0swdixgr5qwwc77";
+          rev = "a2625e3975c2bc8449259f0ecd51b28068cbdfac";
+          sha256 = "1vw0dc8cx8npy79r53cw129h5s8n12629ah0ypkq15v2rh2hs1gk";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -43757,12 +44495,12 @@
       melpaBuild {
         pname = "sesman";
         ename = "sesman";
-        version = "0.1.1";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "sesman";
-          rev = "0d8d1bef455b58439df333f2a0a0693543b8f098";
-          sha256 = "1hgl1djfxiajcc5rnwq7rlli6fhim57mbmabxdsc78p18c1azxhz";
+          rev = "c81565a88b038f752de90998e651b94fa78a687f";
+          sha256 = "029agil0ic8v4wxv39a5x2vw2p5a2hx8r1lbf8kwlddpgh8lb030";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31110e9bd82ad9c817e6cb597fa9c26c4cdc93ed/recipes/sesman";
@@ -44321,12 +45059,12 @@
       melpaBuild {
         pname = "shx";
         ename = "shx";
-        version = "0.0.16";
+        version = "0.0.17";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "207e6cd292a26fb1162072e2e20df9aa5efd61ef";
-          sha256 = "1hnjmnnmg6axgw4z57rmc8h8wpnbi2rwyr4bv2sdrkk12d3i2kp5";
+          rev = "758ad3ab21daa055982ee5d165522a0de7948e93";
+          sha256 = "0p923v4iqmyr4fhr2h5ydfaqplkhqllig6dcgp0bjvj7n9v8zpng";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -44475,12 +45213,12 @@
       melpaBuild {
         pname = "simpleclip";
         ename = "simpleclip";
-        version = "1.0.4";
+        version = "1.0.6";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "d461c462c237cd896553adb468cd77499d0d26ad";
-          sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
+          rev = "7fff9a1e574466878b5f91e9b56b16e490045aaa";
+          sha256 = "02bj8b4xg930wzrjam0569k5cj1y0gkv28sjy567skdiw5zl14nn";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -44849,14 +45587,14 @@
         ename = "sly";
         version = "2.14";
         src = fetchFromGitHub {
-          owner = "capitaomorte";
+          owner = "joaotavora";
           repo = "sly";
           rev = "9dfa53bbaa33c4e91fc58f816d0a766ae94f47c9";
           sha256 = "0bw6rvpkfpv5shih0ywjw6pa5h2a8v1xpvkxbijqd4dpdj3dlyj9";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
-          sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4150455d424326667390f72f6edd22b274d9fa01/recipes/sly";
+          sha256 = "18as0g1fi1x6lgjzd9rn2s6iw3n00q3nxi99lchjnn004pwsv8kq";
           name = "recipe";
         };
         packageRequires = [];
@@ -45209,12 +45947,12 @@
       melpaBuild {
         pname = "snakemake-mode";
         ename = "snakemake-mode";
-        version = "1.3.0";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7";
-          sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk";
+          rev = "3c2e5556c603d3f35135d531e4ff5e618b984de9";
+          sha256 = "0j6aam0w3mwxl76zpxzvw92pk6w7h47pw6gpnd7hchjs8cav1q41";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -45425,14 +46163,14 @@
         ename = "sos";
         version = "0.1";
         src = fetchFromGitHub {
-          owner = "omouse";
+          owner = "rudolfolah";
           repo = "emacs-sos";
           rev = "c3906ca6872f460c0bdd276410519308626313f1";
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos";
-          sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/sos";
+          sha256 = "0d0n2h7lbif32qgz0z2c36536mrx36d22gq86xm7kmxday6iy19k";
           name = "recipe";
         };
         packageRequires = [ org ];
@@ -45973,26 +46711,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    srcery-theme = callPackage ({ fetchFromGitHub
+    srcery-theme = callPackage ({ emacs
+                                , fetchFromGitHub
                                 , fetchurl
                                 , lib
                                 , melpaBuild }:
       melpaBuild {
         pname = "srcery-theme";
         ename = "srcery-theme";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "srcery-colors";
           repo = "srcery-emacs";
-          rev = "8e4627430abcedc0ed320f620c4411985c9913e1";
-          sha256 = "0lh9hp4aypfwhc6bgywlqxcwyms27yjw71yfcq48iwnqzafpdnkr";
+          rev = "0114420262f5e76cdc63f333d00522229aa77732";
+          sha256 = "1am3nxa9n0irzw0mrb93lmppmw9d5c2yjfgpipvcvwsij3g6k2aj";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2654fc05f55c7fab7d550b7db1d187edc9ff0f42/recipes/srcery-theme";
           sha256 = "1bnvf9v7g2mpx8519lh73fphhr4cqd33qlw22qyxnqiz5cz93lsp";
           name = "recipe";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/srcery-theme";
           license = lib.licenses.free;
@@ -46067,8 +46806,8 @@
           sha256 = "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
-          sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e608f40d00a3b2a80a6997da00e7d04f76d8ef0d/recipes/ssh-agency";
+          sha256 = "1b25fl1kk4mwsd25pg9s0lazlpmaa6s9wnfgvlqk8k65d7p7idzz";
           name = "recipe";
         };
         packageRequires = [ dash emacs ];
@@ -46263,12 +47002,12 @@
       melpaBuild {
         pname = "string-inflection";
         ename = "string-inflection";
-        version = "1.0.7";
+        version = "1.0.10";
         src = fetchFromGitHub {
           owner = "akicho8";
           repo = "string-inflection";
-          rev = "a9de404b2ece932da9b1c9aa1c29dbf7cf506e76";
-          sha256 = "1km8xxb0zc3yll1yzlsrrz14ch3inblpq2nhglwp1wskqwdhwly5";
+          rev = "9b08372301e3c5f91cb278ee0e00a48845a42cb6";
+          sha256 = "0j3ms2cxbv24kr27r2jhzxpdih6w43gjdkm3sqd28c28ycab8d4b";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection";
@@ -46686,14 +47425,14 @@
         ename = "swift-mode";
         version = "6.0.0";
         src = fetchFromGitHub {
-          owner = "chrisbarrett";
+          owner = "swift-emacs";
           repo = "swift-mode";
           rev = "d2f2f1da6085c6fad2709b951d6891dd139a6080";
           sha256 = "1ldf593qzbscwlngbabxb52kcpriwhglk95l82qs8y3q1x6aj0cw";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
-          sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/swift-mode";
+          sha256 = "103nix9k2agxgfpwyhsracixl4xvzqlgidd25r1fpj679hr42bg8";
           name = "recipe";
         };
         packageRequires = [ emacs seq ];
@@ -47047,12 +47786,12 @@
       melpaBuild {
         pname = "system-packages";
         ename = "system-packages";
-        version = "1.0.5";
+        version = "1.0.7";
         src = fetchFromGitLab {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "7b87f7dbd53d7bd365157d831893f7a70ae67910";
-          sha256 = "02h3qf455y3dpmf4f312x9dvxrndp9dkyyvs1vw6g9aqahrr4vys";
+          rev = "604d16b8746c290327200e568d37914ad24daf1a";
+          sha256 = "1idn6agxwdliyzpvqiqc48yhrggj2p858wms0gvalj39jdfjzir9";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3c7af03e0bca3f834c32827cbcca29e29ef4db/recipes/system-packages";
@@ -47143,6 +47882,31 @@
           license = lib.licenses.free;
         };
       }) {};
+    tabbar = callPackage ({ fetchFromGitHub
+                          , fetchurl
+                          , lib
+                          , melpaBuild }:
+      melpaBuild {
+        pname = "tabbar";
+        ename = "tabbar";
+        version = "2.2";
+        src = fetchFromGitHub {
+          owner = "dholm";
+          repo = "tabbar";
+          rev = "82bbda31cbe8ef367dd6501c3aa14b7f2c835910";
+          sha256 = "01sw76wp8bvh21h30pkc3kjr98c8m6qid6misk1y7hkyld0bzxay";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/806420d75561cbeffbc1b387345a56c21cc20179/recipes/tabbar";
+          sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
+          name = "recipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/tabbar";
+          license = lib.licenses.free;
+        };
+      }) {};
     tabbar-ruler = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -47553,12 +48317,12 @@
       melpaBuild {
         pname = "tern";
         ename = "tern";
-        version = "0.21.0";
+        version = "0.22.2";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "f9bde5792b7a19ac63c344219e0b0c6bd5a41d35";
-          sha256 = "0pdpchnpsy7iwafr2gawy4sm8kfhh101k8yijkckpnk8ir1lw1jw";
+          rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+          sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -47582,12 +48346,12 @@
       melpaBuild {
         pname = "tern-auto-complete";
         ename = "tern-auto-complete";
-        version = "0.21.0";
+        version = "0.22.2";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "dcd808f985e7b0f562467e2145dcd1e901347999";
-          sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg";
+          rev = "d545bbdd8482c231211f9521c688fc06632e745e";
+          sha256 = "0ribzvl5gs281chp2kqaqmjj9xji7k9l71hsblfw1vj2w9l7nw2m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -47972,7 +48736,7 @@
       melpaBuild {
         pname = "tidal";
         ename = "tidal";
-        version = "0.9.8";
+        version = "0.9.10";
         src = fetchFromGitHub {
           owner = "tidalcycles";
           repo = "Tidal";
@@ -48055,12 +48819,12 @@
       melpaBuild {
         pname = "timesheet";
         ename = "timesheet";
-        version = "0.4.0";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "tmarble";
           repo = "timesheet.el";
-          rev = "2ed6fea9b508eb7eaff659d9a34a09ba064d4df8";
-          sha256 = "028d1sn29idznzsc95w2c1sdz3rpmf3vgk2365li0vvs99s51hi2";
+          rev = "67ca6a9f6733052066b438301fb2dd81b8b3f6eb";
+          sha256 = "0rmh8lik27pmq95858jbjzgvf6rsfdnpynwcagj1fgkval5kzdbs";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/40009ef2f6845c83242ca5d0a8c9c2c1e4ef8a9d/recipes/timesheet";
@@ -48339,12 +49103,12 @@
       melpaBuild {
         pname = "treemacs";
         ename = "treemacs";
-        version = "2.2";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "9b1129ee3152994b033a877fc49777bfe02e315a";
-          sha256 = "08ias1nixz7ma8g6v3v4dqdnd87sqdhplsp5v5wvr3w58szlia5b";
+          rev = "4976d15c5f29bb8200b5502b742a9ba4a743706f";
+          sha256 = "04sv030az079hgj4mvyigwckl6vnw2gc9zy71zksl5vn7ii25m4m";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs";
@@ -48366,12 +49130,12 @@
       melpaBuild {
         pname = "treemacs-evil";
         ename = "treemacs-evil";
-        version = "2.2";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d0f874c90990400c02a8029d4efe815d3548ba5c";
-          sha256 = "0hclgsv96gr50z9cqj97rp45c5r50q2zb6hq5jcx3xmlw12k9pk7";
+          rev = "82061efe99e34ac69367726d65fa0f517947b40b";
+          sha256 = "0f2ybaf149ji54rgf7q9xbdx55jr2jgz9qbahsh2q7gl800nkg17";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/91038c1ab2f463102263dcc3701c0fdaad55de4c/recipes/treemacs-evil";
@@ -48393,7 +49157,7 @@
       melpaBuild {
         pname = "treemacs-projectile";
         ename = "treemacs-projectile";
-        version = "2.2";
+        version = "2.2.2";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
@@ -48437,6 +49201,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    trinary = callPackage ({ emacs
+                           , fetchFromGitHub
+                           , fetchurl
+                           , lib
+                           , melpaBuild }:
+      melpaBuild {
+        pname = "trinary";
+        ename = "trinary";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "emacs-elsa";
+          repo = "trinary-logic";
+          rev = "c043034e1e476ae103cc52b6922e15f6dd2fc8a3";
+          sha256 = "0hi6ybsz6v6ls8ajkyqpy9cq87pk684l9a7js863f7ycgwb37nzn";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/48fff02dde8a678e151f2765ea7c3a383912c68b/recipes/trinary";
+          sha256 = "1k2jpay1wx2m54fpja9mrhqyk15ikml8xf15irh8yrxb3hah8f8k";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/trinary";
+          license = lib.licenses.free;
+        };
+      }) {};
     trr = callPackage ({ fetchFromGitHub
                        , fetchurl
                        , lib
@@ -48551,12 +49341,12 @@
       melpaBuild {
         pname = "tuareg";
         ename = "tuareg";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "927a309b1ad8559be33e6a1d7951214a66f7c130";
-          sha256 = "05rsid1g3vrg10qiws7dd1rpd6wva9mqldwfyrrhg088k4v2a0q5";
+          rev = "40f974d3b0777f9666928d0b4a5126a4c7491b17";
+          sha256 = "049nw6pkkxnq3k4vv4ksl93csiybm7q29xigdkc7cr9cls6h8jf0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -48629,14 +49419,14 @@
         ename = "turing-machine";
         version = "0.2.0";
         src = fetchFromGitHub {
-          owner = "therockmandolinist";
+          owner = "dieggsy";
           repo = "turing-machine";
           rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047";
           sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
-          sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/turing-machine";
+          sha256 = "0q9a31m5wnz9j9l4i8czdl7z12nrcdjw72w8sqvf94ri2g5dbpkq";
           name = "recipe";
         };
         packageRequires = [ emacs ];
@@ -49212,7 +50002,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    use-package-el-get = callPackage ({ fetchFromGitHub
+    use-package-el-get = callPackage ({ fetchFromGitLab
                                       , fetchurl
                                       , lib
                                       , melpaBuild
@@ -49221,15 +50011,15 @@
         pname = "use-package-el-get";
         ename = "use-package-el-get";
         version = "0.1";
-        src = fetchFromGitHub {
+        src = fetchFromGitLab {
           owner = "edvorg";
           repo = "use-package-el-get";
           rev = "f33c448ed43ecb003b60ff601ee7ef9b08cff947";
           sha256 = "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee4a96cf467bcab171a0adfd4ef754abec1a9971/recipes/use-package-el-get";
-          sha256 = "0sg9ijkjax6w25p0q7rw5rjn8r2i83z5jfzjkvy8pxil5cg8zyh0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/aca60522257353fbfd9d032f8c3cae7914d6bd36/recipes/use-package-el-get";
+          sha256 = "143vydssjxmkcgs661hz6nhg310r8qypn2a4vyxy5sb31wqcclzg";
           name = "recipe";
         };
         packageRequires = [ use-package ];
@@ -49507,6 +50297,59 @@
           license = lib.licenses.free;
         };
       }) {};
+    vdm-mode = callPackage ({ emacs
+                            , fetchFromGitHub
+                            , fetchurl
+                            , lib
+                            , melpaBuild }:
+      melpaBuild {
+        pname = "vdm-mode";
+        ename = "vdm-mode";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "0c083ee4848ea5d78de7894a4a0722d6630839c9";
+          sha256 = "175zlxxjxl7zp80hm2hz5xw7gy3qh0hz3fdvqy8v3n0vz4zvqx1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/vdm-mode";
+          sha256 = "0paafpyzncl2325ly89591jnxhl9zc8jwsphav38nw0fsm9r9ah9";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/vdm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vdm-snippets = callPackage ({ emacs
+                                , fetchFromGitHub
+                                , fetchurl
+                                , lib
+                                , melpaBuild
+                                , yasnippet }:
+      melpaBuild {
+        pname = "vdm-snippets";
+        ename = "vdm-snippets";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "peterwvj";
+          repo = "vdm-mode";
+          rev = "0c083ee4848ea5d78de7894a4a0722d6630839c9";
+          sha256 = "175zlxxjxl7zp80hm2hz5xw7gy3qh0hz3fdvqy8v3n0vz4zvqx1k";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f246b9dcf7915a845b9e2cd44cc1a0833b412c8f/recipes/vdm-snippets";
+          sha256 = "1js1hjs2r9bbqm50bl389y87xn68f30xrh2z6nd5kz2hdgkm6lhj";
+          name = "recipe";
+        };
+        packageRequires = [ emacs yasnippet ];
+        meta = {
+          homepage = "https://melpa.org/#/vdm-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     vector-utils = callPackage ({ fetchFromGitHub
                                 , fetchurl
                                 , lib
@@ -49884,14 +50727,14 @@
         ename = "vue-mode";
         version = "0.4";
         src = fetchFromGitHub {
-          owner = "CodeFalling";
+          owner = "AdamNiederer";
           repo = "vue-mode";
           rev = "48ff04657613f39848d0e66e9dd367aa2dc19e89";
           sha256 = "014vx8jkscj1c614v78dqlqlg7n0zc3c2db3dqvxvaz417i5mxq0";
         };
         recipe = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
-          sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6440f81aed1fcddcaf7afeedb74520e605211986/recipes/vue-mode";
+          sha256 = "0npzn7pycqfdakv4plkigq8aw1bqhz3y03y3ypx21q5a186ds0g5";
           name = "recipe";
         };
         packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
@@ -50276,12 +51119,12 @@
       melpaBuild {
         pname = "weechat";
         ename = "weechat";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "the-kenny";
           repo = "weechat.el";
-          rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
-          sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
+          rev = "bcf714e32b012c6a89d5c0a82ab3a74d454908ff";
+          sha256 = "1gm2yhz3qy55qqwf0ccrqw4nifxaig4jpdqmcl0ydx1n3myxx64l";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -50728,8 +51571,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    window-purpose = callPackage ({ cl-lib ? null
-                                  , emacs
+    window-purpose = callPackage ({ emacs
                                   , fetchFromGitHub
                                   , fetchurl
                                   , imenu-list
@@ -50739,19 +51581,19 @@
       melpaBuild {
         pname = "window-purpose";
         ename = "window-purpose";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "00c253778d8e845bdc17a350c22ea157c5871b41";
-          sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv";
+          rev = "a302340e183d20baa4445858d321f43449298829";
+          sha256 = "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
           sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84";
           name = "recipe";
         };
-        packageRequires = [ cl-lib emacs imenu-list let-alist ];
+        packageRequires = [ emacs imenu-list let-alist ];
         meta = {
           homepage = "https://melpa.org/#/window-purpose";
           license = lib.licenses.free;
@@ -50892,12 +51734,12 @@
       melpaBuild {
         pname = "with-editor";
         ename = "with-editor";
-        version = "2.7.3";
+        version = "2.7.4";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "ad5bb005ed3afec2d8b9b2bc1df19fb9b5e2dd84";
-          sha256 = "0hq2dy8djxf45ajk9di1grhgzly0qrijcjfdah8xj5zkwvn9cvlh";
+          rev = "3e6424764ee06fb50c580283baea3851c6f9ea66";
+          sha256 = "0xawvwvkqdy5hhbz9mbclha18w8nd36d9nyf7b6s2f5dw7xnlyb0";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -51253,6 +52095,32 @@
           license = lib.licenses.free;
         };
       }) {};
+    wucuo = callPackage ({ emacs
+                         , fetchFromGitHub
+                         , fetchurl
+                         , lib
+                         , melpaBuild }:
+      melpaBuild {
+        pname = "wucuo";
+        ename = "wucuo";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "wucuo";
+          rev = "2657e78246001848fe1140c9d90cb96d796d5887";
+          sha256 = "0s3ipmrw3gqyq6y4pxjm8cpnsar5hh27lclhjq7277zlbl3da32c";
+        };
+        recipe = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/819cacef2c31d750829980f3f6c3bfb72f36bbdd/recipes/wucuo";
+          sha256 = "084fcv4dkflpka9vmxmxqdl0cgmjjh9wc6axr65j1ffmqd933y4a";
+          name = "recipe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/wucuo";
+          license = lib.licenses.free;
+        };
+      }) {};
     x86-lookup = callPackage ({ cl-lib ? null
                               , emacs
                               , fetchFromGitHub
@@ -51338,12 +52206,12 @@
       melpaBuild {
         pname = "xcscope";
         ename = "xcscope";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "dkogan";
           repo = "xcscope.el";
-          rev = "1e4c8e60eb841a3ecb56ff4115b6a8ae5c0bf779";
-          sha256 = "1cc3bmi4fxlgqha7sxswn9lcc126xnr2j8xz6wszjnqh5w274fpp";
+          rev = "57bff67460c587acf60f513de622b4c7ab312081";
+          sha256 = "1l1k85wlmjb2mgzx1la9f0p7j3q0mzj4hlrs98pf4bbfkdbqg7a7";
         };
         recipe = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/068c7846e70b91ce7e88330937fc64a60281802a/recipes/xcscope";
@@ -52384,4 +53252,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file

From e68f1b3abab3d3d6fd22bb7aab9a1e905d8e4473 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Sep 2018 14:40:41 -0500
Subject: [PATCH 1074/3253] org-packages: 2018-09-15

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 32b6b703729f..1cca56ce8f8f 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "20180723";
+        version = "20180910";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20180723.tar";
-          sha256 = "1mcgnba16lpyh55zjx4rcbmpygcmdnjjzvgv1rx0c3kz1h5fgzf8";
+          url = "http://orgmode.org/elpa/org-20180910.tar";
+          sha256 = "1j4n0a07bxjbdzx3dipxgi0h5r0yimwylp9cnzfm6m7nc7kas2sq";
         };
         packageRequires = [];
         meta = {
@@ -19,10 +19,10 @@
       elpaBuild {
         pname = "org-plus-contrib";
         ename = "org-plus-contrib";
-        version = "20180723";
+        version = "20180910";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20180723.tar";
-          sha256 = "1l34bagkm8mcyv5diprpbd4yjijkdvx1l54qpvi8bmvxjnzsm7mk";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20180910.tar";
+          sha256 = "17inl07kjdjamlqbyxbp42kx1nkbhbhz7lzqfvkhk6s7z16qvksq";
         };
         packageRequires = [];
         meta = {

From bd3e3d8a1860092076fe5740d4300fc089f99d34 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 15 Sep 2018 14:43:56 -0500
Subject: [PATCH 1075/3253] elpa-packages: 2018-09-15

---
 .../editors/emacs-modes/elpa-generated.nix    | 99 ++++++++++++-------
 1 file changed, 66 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 146e4128f7d0..f793366a70ac 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -309,6 +309,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    brief = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "brief";
+        ename = "brief";
+        version = "5.85";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/brief-5.85.el";
+          sha256 = "10a41qidns28cka0y25rapla58fzjy9c8cw9v9bmrm4gkjqapsv4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/brief.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
       elpaBuild {
         pname = "bug-hunter";
@@ -820,10 +835,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.5.4";
+        version = "0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.5.4.tar";
-          sha256 = "1dripbiwplyjalzmkr8awaimhkp9f6c2bhnm3c77027k2b87w4lf";
+          url = "https://elpa.gnu.org/packages/ebdb-0.6.tar";
+          sha256 = "1zj8jvq5l4wlk4734i3isxi4barpivarq2f9kqzkfia7mcspxav8";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -900,10 +915,10 @@
       elpaBuild {
         pname = "el-search";
         ename = "el-search";
-        version = "1.7.3";
+        version = "1.7.9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.7.3.tar";
-          sha256 = "0nxjgi027mjjn53nm9ara4nyr7kyqjawsmfaygsxqjv0mbykjmd1";
+          url = "https://elpa.gnu.org/packages/el-search-1.7.9.tar";
+          sha256 = "06da4v03zis1mf09v61c1jzkp5x6drm61iakcbpy5hkdq8nvm3xc";
         };
         packageRequires = [ cl-print emacs stream ];
         meta = {
@@ -971,7 +986,8 @@
           license = lib.licenses.free;
         };
       }) {};
-    ergoemacs-mode = callPackage ({ elpaBuild
+    ergoemacs-mode = callPackage ({ cl-lib ? null
+                                  , elpaBuild
                                   , emacs
                                   , fetchurl
                                   , lib
@@ -979,12 +995,12 @@
       elpaBuild {
         pname = "ergoemacs-mode";
         ename = "ergoemacs-mode";
-        version = "5.14.7.3";
+        version = "5.16.10.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar";
-          sha256 = "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90";
+          url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar";
+          sha256 = "1zfzjmi30lllrbyzicmp11c9lpa82g57wi134q9bajvzn9ryx4jr";
         };
-        packageRequires = [ emacs undo-tree ];
+        packageRequires = [ cl-lib emacs undo-tree ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html";
           license = lib.licenses.free;
@@ -995,17 +1011,18 @@
                                , fetchurl
                                , fsm
                                , lib
+                               , nadvice
                                , soap-client
                                , url-http-ntlm }:
       elpaBuild {
         pname = "excorporate";
         ename = "excorporate";
-        version = "0.7.6";
+        version = "0.8.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/excorporate-0.7.6.tar";
-          sha256 = "02bp0z6vpssc12vxxs1g4whmfxf88wsk0bcq4422vvz256l6vpf9";
+          url = "https://elpa.gnu.org/packages/excorporate-0.8.0.tar";
+          sha256 = "0sx04w7yp2byda0maifsmapqmq6w43r114a6gzqar0j82rsc0mfg";
         };
-        packageRequires = [ emacs fsm soap-client url-http-ntlm ];
+        packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/excorporate.html";
           license = lib.licenses.free;
@@ -1105,10 +1122,10 @@
       elpaBuild {
         pname = "ggtags";
         ename = "ggtags";
-        version = "0.8.12";
+        version = "0.8.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el";
-          sha256 = "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp";
+          url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el";
+          sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1412,10 +1429,10 @@
       elpaBuild {
         pname = "jsonrpc";
         ename = "jsonrpc";
-        version = "1.0.0";
+        version = "1.0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.0.el";
-          sha256 = "06lmmn7j2ilkvwibbpgnd8p6d63fjjnxd2ma8f4jw6vrz1f7lwvs";
+          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.6.el";
+          sha256 = "13a19smz8cksv6fgcyxb111csvagkp07z5nl4imyp5b23asgl70p";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1753,6 +1770,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    nadvice = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "nadvice";
+        ename = "nadvice";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/nadvice-0.2.el";
+          sha256 = "094slkgw4f7cd88r76d0rgpbqr7zzwy19ssndg8v3sm4p5ld6vwg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nadvice.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "nameless";
@@ -1911,10 +1943,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.1.13";
+        version = "9.1.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.1.13.tar";
-          sha256 = "1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr";
+          url = "https://elpa.gnu.org/packages/org-9.1.14.tar";
+          sha256 = "17vd9hig26rqv90l6y92hc2i0x29g44lsdsp0xd4m53s8r3zdikz";
         };
         packageRequires = [];
         meta = {
@@ -1956,10 +1988,10 @@
       elpaBuild {
         pname = "other-frame-window";
         ename = "other-frame-window";
-        version = "1.0.4";
+        version = "1.0.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el";
-          sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i";
+          url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.el";
+          sha256 = "04h0jr73xv8inm52h8b8zbc9lsnlzkn40qy99x4x0lkkdqqxw1ny";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2147,16 +2179,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }:
+    rcirc-color = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "rcirc-color";
         ename = "rcirc-color";
-        version = "0.3";
+        version = "0.4.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el";
-          sha256 = "1ya4agh63x60lv8qzrjrng02dnrc70ci0s05b800iq71k71ss3dl";
+          url = "https://elpa.gnu.org/packages/rcirc-color-0.4.1.el";
+          sha256 = "1zs3i3xr8zbjr8hzr1r1qx7mqb2wckpn25qh9444c9as2dnh9sn9";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
           license = lib.licenses.free;
@@ -2252,6 +2284,7 @@
       }) {};
     rudel = callPackage ({ cl-generic
                          , cl-lib ? null
+                         , cl-print
                          , elpaBuild
                          , emacs
                          , fetchurl
@@ -2264,7 +2297,7 @@
           url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar";
           sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz";
         };
-        packageRequires = [ cl-generic cl-lib emacs ];
+        packageRequires = [ cl-generic cl-lib cl-print emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/rudel.html";
           license = lib.licenses.free;

From 5a868df96712e900201dd9cdaa29dfeddd71a973 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 15 Sep 2018 14:10:41 +0200
Subject: [PATCH 1076/3253] php: 7.2.8 -> 7.2.10

Changelog 7.2.9: http://php.net/ChangeLog-7.php#7.2.9
Changelog 7.2.10: http://php.net/ChangeLog-7.php#7.2.10
---
 pkgs/development/interpreters/php/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 37a51ffded31..37cf30bab1aa 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -37,7 +37,10 @@ let
   , opensslSupport ? config.php.openssl or true
   , mbstringSupport ? config.php.mbstring or true
   , gdSupport ? config.php.gd or true
-  , intlSupport ? config.php.intl or true
+  # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
+  # We need to disable the intl support on darwin. Whenever the upstream bug is
+  # fixed we should revert this to just just "config.php.intl or true".
+  , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin)
   , exifSupport ? config.php.exif or true
   , xslSupport ? config.php.xsl or false
   , mcryptSupport ? config.php.mcrypt or true
@@ -225,7 +228,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.8";
-    sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+    version = "7.2.10";
+    sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
   };
 }

From 89b7ad263e9c3df23bac10cab3044883e7ebd766 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 15 Sep 2018 14:37:10 +0200
Subject: [PATCH 1077/3253] php71: 7.1.21 -> 7.1.22

Changelog: https://secure.php.net/ChangeLog-7.php#7.1.22
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 37cf30bab1aa..8310f381fcf0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -223,8 +223,8 @@ let
 
 in {
   php71 = generic {
-    version = "7.1.21";
-    sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
+    version = "7.1.22";
+    sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
   };
 
   php72 = generic {

From 8dfd97a8b6ff70fa9529f617e63dd22d7c53bf22 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 15 Sep 2018 14:50:37 -0500
Subject: [PATCH 1078/3253] sops: 3.0.2 -> 3.1.0

---
 pkgs/tools/security/sops/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index bbcfc4c78907..a0c183b3a2ee 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "sops-${version}";
-  version = "3.0.2";
+  version = "3.1.0";
 
   goPackagePath = "go.mozilla.org/sops";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     rev = version;
     owner = "mozilla";
     repo = "sops";
-    sha256 = "0zszlb35cmw9j9dg1bpcbwxwh094wcfxhas4ns58jp5n79rqwv9i";
+    sha256 = "02s85affgs2991p4akff68myx4h7m3jcly6xihv9g2knml7ixrkj";
   };
 
   meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
     description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
-    homepage = https://github.com/mozilla/sops;
     license = licenses.mpl20;
   };
 }

From 4efd4053ed183d63f09615cf30ea822e708a4fbe Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 9 Sep 2018 13:36:05 -0400
Subject: [PATCH 1079/3253] stdenv/darwin: integrate a new CoreFoundation

This also updates the bootstrap tool builder to LLVM 5, but not the ones
we actually use for bootstrap. I'll make that change in a subsequent commit
so as to provide traceable provenance of the bootstrap tools.
---
 .../interpreters/python/cpython/2.7/boot.nix  |  9 +++
 .../libraries/libunistring/default.nix        | 14 +++-
 pkgs/development/libraries/libuv/default.nix  |  2 +-
 .../tools/build-managers/ninja/default.nix    | 12 ++-
 .../CF/add-cfmachport.patch                   | 22 ------
 .../CF/cf-bridging.patch                      | 39 ----------
 .../apple-source-releases/CF/default.nix      | 51 -------------
 .../apple-source-releases/CF/remove-xpc.patch | 17 -----
 .../darwin/apple-source-releases/default.nix  |  1 -
 .../libsecurity_generic/default.nix           |  1 -
 .../libsecurity_keychain/default.nix          |  4 -
 .../os-specific/darwin/cf-private/default.nix | 74 ++++++++++++++-----
 .../darwin/swift-corelibs/corefoundation.nix  | 23 ++++--
 .../darwin/swift-corelibs/default.nix         |  8 --
 pkgs/stdenv/darwin/default.nix                | 47 +++++++++---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   |  3 +-
 pkgs/top-level/darwin-packages.nix            | 10 +--
 17 files changed, 148 insertions(+), 189 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
 delete mode 100644 pkgs/os-specific/darwin/swift-corelibs/default.nix

diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 7d6f2541d3d1..976d30819dbe 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
       ./deterministic-build.patch
     ];
 
+  # Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since
+  # we only use this python for bootstrappy things, it doesn't really matter if it
+  # doesn't have perfect proxy support in urllib :) this just makes it fall back on env
+  # vars instead of attempting to read the proxy configuration automatically, so not a
+  # huge loss even if for whatever reason we did want proxy support.
+  postPatch = ''
+    substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False"
+  '';
+
   DETERMINISTIC_BUILD = 1;
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 24da3a8e2c7d..312a5c118103 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -19,7 +19,19 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  enableParallelBuilding = true;
+  /* This seems to cause several random failures like these, which I assume
+     is because of bad or missing target dependencies in their build system:
+
+        ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+        FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
+
+        FAIL: unistdio/test-u16-vasnprintf3.sh
+        ======================================
+
+        ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+        FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
+  */
+  enableParallelBuilding = false;
 
   meta = {
     homepage = http://www.gnu.org/software/libunistring/;
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 9ee934cd78bb..f75ce4396a6d 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
         "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot"
         "multiple_listen" "delayed_accept"
         "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
-        "tty_pty"
+        "tty_pty" "condvar_5"
       ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index b1df54f9bd5c..e1637e2f2cab 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, python, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+{ stdenv, fetchFromGitHub, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
@@ -11,25 +13,27 @@ stdenv.mkDerivation rec {
     sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
   };
 
-  nativeBuildInputs = [ python asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
+  nativeBuildInputs = [ python ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin re2c ];
 
   buildPhase = ''
     python configure.py --bootstrap
     # "./ninja -vn manual" output copied here to support cross compilation.
+  '' + optionalString buildDocs ''
     asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
     xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
   '';
 
   installPhase = ''
     install -Dm555 -t $out/bin ninja
-    install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
     install -Dm444 misc/bash-completion $out/share/bash-completion/completions/ninja
     install -Dm444 misc/zsh-completion $out/share/zsh/site-functions/_ninja
+  '' + optionalString buildDocs ''
+    install -Dm444 -t $out/share/doc/ninja doc/manual.asciidoc doc/manual.html
   '';
 
   setupHook = ./setup-hook.sh;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Small build system with a focus on speed";
     longDescription = ''
       Ninja is a small build system with a focus on speed. It differs from
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
deleted file mode 100644
index a1018d389c14..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cfmachport.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CF-855.17/CoreFoundation.h  2015-01-03 00:17:41.000000000 -0500
-+++ CF-855.17/CoreFoundation.h.new  2015-01-03 00:18:35.000000000 -0500
-@@ -72,6 +72,7 @@
- #include <CoreFoundation/CFDictionary.h>
- #include <CoreFoundation/CFError.h>
- #include <CoreFoundation/CFLocale.h>
-+#include <CoreFoundation/CFMachPort.h>
- #include <CoreFoundation/CFNumber.h>
- #include <CoreFoundation/CFNumberFormatter.h>
- #include <CoreFoundation/CFPreferences.h>
-
---- CF-855.17/Makefile  2015-01-03 00:32:52.000000000 -0500
-+++ CF-855.17/Makefile.new  2015-01-03 00:33:07.000000000 -0500
-@@ -9,7 +9,7 @@
- HFILES = $(wildcard *.h)
- INTERMEDIATE_HFILES = $(addprefix $(OBJBASE)/CoreFoundation/,$(HFILES))
- 
--PUBLIC_HEADERS=CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CFAvailability.h CFUtilities.h CoreFoundation.h
-+PUBLIC_HEADERS=CFArray.h CFBag.h CFBase.h CFBinaryHeap.h CFBitVector.h CFBundle.h CFByteOrder.h CFCalendar.h CFCharacterSet.h CFData.h CFDate.h CFDateFormatter.h CFDictionary.h CFError.h CFLocale.h CFMachPort.h CFMessagePort.h CFNumber.h CFNumberFormatter.h CFPlugIn.h CFPlugInCOM.h CFPreferences.h CFPropertyList.h CFRunLoop.h CFSet.h CFSocket.h CFStream.h CFString.h CFStringEncodingExt.h CFTimeZone.h CFTree.h CFURL.h CFURLAccess.h CFUUID.h CFUserNotification.h CFXMLNode.h CFXMLParser.h CFAvailability.h CFUtilities.h CoreFoundation.h
- 
- PRIVATE_HEADERS=CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtilities.h CFPriv.h CFRuntime.h CFStorage.h CFStreamAbstract.h CFStreamPriv.h CFStreamInternal.h CFStringDefaultEncoding.h CFStringEncodingConverter.h CFStringEncodingConverterExt.h CFUniChar.h CFUnicodeDecomposition.h CFUnicodePrecomposition.h ForFoundationOnly.h CFBurstTrie.h CFICULogging.h
- 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
deleted file mode 100644
index 068a6311a9cb..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CFBase.h b/CFBase.h
-index ffddd2b..e5a926b 100644
---- a/CFBase.h
-+++ b/CFBase.h
-@@ -249,6 +249,33 @@ CF_EXTERN_C_BEGIN
- #endif
- #endif
- 
-+#if __has_attribute(objc_bridge) && __has_feature(objc_bridge_id) && __has_feature(objc_bridge_id_on_typedefs)
-+
-+#ifdef __OBJC__
-+@class NSArray;
-+@class NSAttributedString;
-+@class NSString;
-+@class NSNull;
-+@class NSCharacterSet;
-+@class NSData;
-+@class NSDate;
-+@class NSTimeZone;
-+@class NSDictionary;
-+@class NSError;
-+@class NSLocale;
-+@class NSNumber;
-+@class NSSet;
-+@class NSURL;
-+#endif
-+
-+#define CF_BRIDGED_TYPE(T)		__attribute__((objc_bridge(T)))
-+#define CF_BRIDGED_MUTABLE_TYPE(T)	__attribute__((objc_bridge_mutable(T)))
-+#define CF_RELATED_TYPE(T,C,I)		__attribute__((objc_bridge_related(T,C,I)))
-+#else
-+#define CF_BRIDGED_TYPE(T)
-+#define CF_BRIDGED_MUTABLE_TYPE(T)
-+#define CF_RELATED_TYPE(T,C,I)
-+#endif
- 
- CF_EXPORT double kCFCoreFoundationVersionNumber;
- 
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
deleted file mode 100644
index 5589d1592f46..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }:
-
-# this project uses blocks, a clang-only extension
-assert stdenv.cc.isClang;
-
-appleDerivation {
-  buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ];
-
-  patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ];
-
-  __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ];
-
-  preBuild = ''
-    substituteInPlace Makefile \
-      --replace "/usr/bin/clang" "clang" \
-      --replace "-arch i386 " "" \
-      --replace "/usr/bin/" "" \
-      --replace "/usr/sbin/" "" \
-      --replace "/bin/" "" \
-      --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
-      --replace "install_name_tool -id /System/Library/Frameworks" "install_name_tool -id @rpath" \
-      --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
-      --replace 'chmod -RH' 'chmod -R'
-
-    # with this file present, CoreFoundation gets a _main symbol defined, which can
-    # interfere with linking other programs
-    rm plconvert.c
-
-    replacement=''$'#define __PTK_FRAMEWORK_COREFOUNDATION_KEY5 55\n#define _pthread_getspecific_direct(key) pthread_getspecific((key))\n#define _pthread_setspecific_direct(key, val) pthread_setspecific((key), (val))'
-
-    substituteInPlace CFPlatform.c --replace "#include <pthread/tsd_private.h>" "$replacement"
-
-    substituteInPlace CFRunLoop.c --replace "#include <pthread/private.h>" ""
-
-    substituteInPlace CFURLPriv.h \
-      --replace "#include <CoreFoundation/CFFileSecurity.h>" "" \
-      --replace "#include <CoreFoundation/CFURLEnumerator.h>" "" \
-      --replace "CFFileSecurityRef" "void *" \
-      --replace "CFURLEnumeratorResult" "void *" \
-      --replace "CFURLEnumeratorRef" "void *"
-
-    export DSTROOT=$out
-  '';
-
-  postInstall = ''
-    mv $out/System/* $out
-    rmdir $out/System
-    mv $out/Library/Frameworks/CoreFoundation.framework/Versions/A/PrivateHeaders/* \
-       $out/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
deleted file mode 100644
index a7b9fe486434..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CFBundlePriv.h b/CFBundlePriv.h
-index d4feb5f..e7b52e8 100644
---- a/CFBundlePriv.h
-+++ b/CFBundlePriv.h
-@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle);
- CF_EXPORT
- CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath);
- 
--#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
--#include <xpc/xpc.h>
--CF_EXPORT
--void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0);
--#endif
--
- /* Functions deprecated as SPI */
- 
- CF_EXPORT
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index e2d62cef1ba4..d490048c4df3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -204,7 +204,6 @@ let
     bootstrap_cmds  = applePackage "bootstrap_cmds"    "dev-tools-7.0"   "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
     bsdmake         = applePackage "bsdmake"           "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
     CarbonHeaders   = applePackage "CarbonHeaders"     "osx-10.6.2"      "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
-    CF              = applePackage "CF"                "osx-10.10.5"     "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {};
     CommonCrypto    = applePackage "CommonCrypto"      "osx-10.11.6"     "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
     configd         = applePackage "configd"           "osx-10.8.5"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
     copyfile        = applePackage "copyfile"          "osx-10.11.6"     "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
index fe68ee78d1f0..714524e8da58 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
@@ -33,7 +33,6 @@ name: version: sha256: args: let
         pkgs.gnustep.make
         pkgs.darwin.apple_sdk.frameworks.AppKit
         pkgs.darwin.apple_sdk.frameworks.Foundation
-        pkgs.darwin.cf-private
       ];
       makeFlags = [
         "-f${makeFile}"
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
index 609d07fda100..724c4788b6cc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
@@ -39,9 +39,5 @@ appleDerivation {
       --replace 'return mLoginDLDbIdentifier;' 'return mLoginDLDbIdentifier; }' \
       --replace '_xpc_runtime_is_app_sandboxed()' 'false'
       # hope that doesn't hurt anything
-
-    substituteInPlace lib/KCEventNotifier.h --replace \
-      'CoreFoundation/CFNotificationCenter.h' \
-      '${apple_sdk.sdk.out}/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFNotificationCenter.h'
   '';
 }
diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix
index 603c0f652b01..3fac20d23c78 100644
--- a/pkgs/os-specific/darwin/cf-private/default.nix
+++ b/pkgs/os-specific/darwin/cf-private/default.nix
@@ -1,21 +1,59 @@
-{ stdenv, osx_private_sdk, CF }:
+{ CF, apple_sdk }:
 
-stdenv.mkDerivation {
-  name = "${CF.name}-private";
-  phases = [ "installPhase" "fixupPhase" ];
-  installPhase = ''
-    dest=$out/Library/Frameworks/CoreFoundation.framework/Headers
-    mkdir -p $dest
-    pushd $dest
-      for file in ${CF}/Library/Frameworks/CoreFoundation.framework/Headers/*; do
-        ln -sf $file
-      done
-
-      # Copy or overwrite private headers, some of these might already
-      # exist in CF but the private versions have more information.
-      cp -Lfv ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* $dest
-    popd
-  '';
+# cf-private is a bit weird, but boils down to CF with a weird setup-hook that
+# makes a build link against the system CoreFoundation rather than our pure one.
+# The reason it exists is that although our CF headers and build are pretty legit
+# now, the underlying runtime is quite different. Apple's in a bit of flux around CF
+# right now, and support three different backends for it: swift, "C", and an ObjC
+# one. The former two can be built from public sources, but the ObjC one isn't really
+# public. Unfortunately, it's also one of the core underpinnings of a lot of Mac-
+# specific behavior, and defines a lot of symbols that some Objective C apps depend
+# on, even though one might expect those symbols to derive from Foundation. So if
+# your app relies on NSArray and several other basic ObjC types, it turns out that
+# because of their magic "toll-free bridging" support, the symbols for those types
+# live in CoreFoundation with an ObjC runtime. And because that isn't public, we have
+# this hack in place to let people link properly anyway. Phew!
+# 
+# This can be revisited if Apple ever decide to release the ObjC backend in a publicly
+# buildable form.
+# 
+# This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to
+# an existing package was annoying. We need a buildEnv that knows how to add those
+CF.overrideAttrs (orig: {
+  # PLEASE if you add things to this derivation, explain in reasonable detail why
+  # you're adding them and when the workaround can go away. This whole derivation is
+  # a workaround and if you don't explain what you're working around, it makes it
+  # very hard for people to clean it up later.
 
+  name = "${orig.name}-private";
   setupHook = ./setup-hook.sh;
-}
+
+  # TODO: consider re-adding https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-source-releases/CF/cf-bridging.patch
+  # once the missing headers are in and see if that fixes all need for this.
+
+  # This can go away once https://bugs.swift.org/browse/SR-8741 happens, which is
+  # looking more likely these days with the friendly people at Apple! We only need
+  # the header because the setup hook takes care of linking us against a version
+  # of the framework with the functionality built into it. The main user I know of
+  # this is watchman, who can almost certainly switch to the pure CF once the header
+  # and functionality is merged in.
+  installPhase = orig.installPhase + ''
+    basepath="Library/Frameworks/CoreFoundation.framework/Headers"
+    path="$basepath/CFFileDescriptor.h"
+
+    # Append the include at top level or nobody will notice the header we're about to add
+    sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
+      "$out/$basepath/CoreFoundation.h"
+
+    cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
+  '' +
+  # This one is less likely to go away, but I'll mention it anyway. The issue is at
+  # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase
+  ''
+    path="$basepath/CFURLEnumerator.h"    
+    sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFURLEnumerator.h>' \
+      "$out/$basepath/CoreFoundation.h"
+
+    cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path
+  '';
+})
\ No newline at end of file
diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 1dea55cccc9e..f819429f4deb 100644
--- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -14,11 +14,12 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner  = "apple";
     repo   = "swift-corelibs-foundation";
-    rev    = "85c640e7ce50e6ca61a134c72270e214bc63fdba"; # https://github.com/apple/swift-corelibs-foundation/pull/1686
-    sha256 = "0z2v278wy7jh0c92g1dszd8hj8naxari660sqx6yab5dwapd46qc";
+    rev    = "71aaba20e1450a82c516af1342fe23268e15de0a";
+    sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z";
   };
 
-  buildInputs = [ ninja python libxml2 objc4 ICU curl ];
+  nativeBuildInputs = [ ninja python ];
+  buildInputs = [ libxml2 objc4 ICU curl ];
 
   sourceRoot = "source/CoreFoundation";
 
@@ -31,8 +32,7 @@ in stdenv.mkDerivation {
     # 3. Use the legit CoreFoundation.h, not the one telling you not to use it because of Swift
     substituteInPlace build.py \
       --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \
-      --replace "cf.LDFLAGS += '-ldispatch" '#' \
-      --replace "Base.subproj/SwiftRuntime/CoreFoundation.h" 'Base.subproj/CoreFoundation.h'
+      --replace "cf.LDFLAGS += '-ldispatch" '#'
 
     # Includes xpc for some initialization routine that they don't define anyway, so no harm here
     substituteInPlace PlugIn.subproj/CFBundlePriv.h \
@@ -53,8 +53,11 @@ in stdenv.mkDerivation {
 
   BUILD_DIR = "./Build";
   CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs
-  LDFLAGS = "-install_name ${placeholder "out"}/Frameworks/CoreFoundation.framework/CoreFoundation -current_version 1234.56.7 -compatibility_version 150.0.0 -init ___CFInitialize";
-  configurePhase = "../configure --sysroot unused";
+  
+  # I'm guessing at the version here. https://github.com/apple/swift-corelibs-foundation/commit/df3ec55fe6c162d590a7653d89ad669c2b9716b1 imported "high sierra"
+  # and this version is a version from there. No idea how accurate it is.
+  LDFLAGS = "-current_version 1454.90.0 -compatibility_version 150.0.0 -init ___CFInitialize";
+  configurePhase = "../configure release --sysroot UNUSED";
 
   enableParallelBuilding = true;
   buildPhase = "ninja -j $NIX_BUILD_CORES";
@@ -66,6 +69,12 @@ in stdenv.mkDerivation {
     mkdir -p $base/Versions/A/{Headers,PrivateHeaders,Modules}
 
     cp ./Build/CoreFoundation/libCoreFoundation.dylib $base/Versions/A/CoreFoundation
+
+    # Note that this could easily live in the ldflags above as `-install_name @rpath/...` but
+    # https://github.com/NixOS/nixpkgs/issues/46434 thwarts that, so for now I'm hacking it up
+    # after the fact.
+    install_name_tool -id '@rpath/CoreFoundation.framework/Versions/A/CoreFoundation' $base/Versions/A/CoreFoundation
+
     cp ./Build/CoreFoundation/usr/include/CoreFoundation/*.h $base/Versions/A/Headers
     cp ./Build/CoreFoundation/usr/include/CoreFoundation/module.modulemap $base/Versions/A/Modules
 
diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix
deleted file mode 100644
index 0d96b8fd008e..000000000000
--- a/pkgs/os-specific/darwin/swift-corelibs/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, darwin }:
-
-rec {
-  corefoundation = callPackage ./corefoundation.nix { inherit (darwin) objc4 ICU; };
-  libdispatch = callPackage ./libdispatch.nix {
-   inherit (darwin) apple_sdk_sierra xnu;
-  };
-}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6d224e4cc44f..d287517e8868 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -198,6 +198,9 @@ in rec {
         CF = null;  # use CoreFoundation from bootstrap-tools
         configd = null;
       };
+      python2 = self.python;
+
+      ninja = super.ninja.override { buildDocs = false; };
     };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -217,11 +220,12 @@ in rec {
         zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
         libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
         openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
-        findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
+        findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils
+        libssh2 nghttp2 libkrb5 python2 ninja;
 
       darwin = super.darwin // {
         inherit (darwin)
-          dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
+          dyld Libsystem xnu configd ICU libdispatch libclosure launchd CF;
       };
     };
   in with prevStage; stageFun 2 prevStage {
@@ -235,7 +239,10 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
+      (with pkgs; [
+        xz.bin xz.out libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
+        nghttp2.lib libkrb5
+      ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
     overrides = persistent;
@@ -247,9 +254,10 @@ in rec {
         patchutils m4 scons flex perl bison unifdef unzip openssl python
         gettext sharutils libarchive pkg-config groff bash subversion
         openssh sqlite sed serf openldap db cyrus-sasl expat apr-util
-        findfreetype libssh curl cmake autoconf automake libtool cpio;
+        findfreetype libssh curl cmake autoconf automake libtool cpio
+        libssh2 nghttp2 libkrb5 python2 ninja;
 
-      # Avoid pulling in a full python and it's extra dependencies for the llvm/clang builds.
+      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
       libxml2 = super.libxml2.override { pythonSupport = false; };
 
       llvmPackages_5 = super.llvmPackages_5 // (let
@@ -281,7 +289,10 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
+      (with pkgs; [
+        xz.bin xz.out bash libcxx libcxxabi zlib libxml2.out curl.out openssl.out libssh2.out
+        nghttp2.lib libkrb5
+      ]) ++
       (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 
     overrides = persistent;
@@ -292,7 +303,7 @@ in rec {
       inherit
         gnumake gzip gnused bzip2 gawk ed xz patch bash
         ncurses libffi zlib gmp pcre gnugrep
-        coreutils findutils diffutils patchutils;
+        coreutils findutils diffutils patchutils ninja;
 
       # Hack to make sure we don't link ncurses in bootstrap tools. The proper
       # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
@@ -312,8 +323,14 @@ in rec {
         });
       in { inherit tools libraries; } // tools // libraries);
 
-      darwin = super.darwin // {
+      darwin = super.darwin // rec {
         inherit (darwin) dyld Libsystem libiconv locale;
+
+        libxml2-nopython = super.libxml2.override { pythonSupport = false; };
+        CF = super.darwin.CF.override {
+          libxml2 = libxml2-nopython;
+          python = prevStage.python;
+        };
       };
     };
   in with prevStage; stageFun 4 prevStage {
@@ -345,6 +362,17 @@ in rec {
         });
       in { inherit tools libraries; } // tools // libraries);
 
+      # N.B: the important thing here is to ensure that python == python2
+      # == python27 or you get weird issues with inconsistent package sets.
+      # In a particularly subtle bug, I overrode python2 instead of python27
+      # here, and it caused gnome-doc-utils to complain about:
+      # "PyThreadState_Get: no current thread". This is because Python gets
+      # really unhappy if you have Python A which loads a native python lib
+      # which was linked against Python B, which in our case was happening
+      # because we didn't override python "deeply enough". Anyway, this works
+      # and I'm just leaving this blurb here so people realize why it matters
+      python27 = super.python27.override { CF = prevStage.darwin.CF; };
+
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;
       } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
@@ -398,9 +426,10 @@ in rec {
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext
       binutils.bintools darwin.binutils darwin.binutils.bintools
+      curl.out openssl.out libssh2.out nghttp2.lib libkrb5
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
-      dyld Libsystem CF cctools ICU libiconv locale
+      dyld Libsystem CF cctools ICU libiconv locale libxml2-nopython.out
     ]);
 
     overrides = lib.composeExtensions persistent (self: super: {
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 66c5f419f2f6..d128be7019bd 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -3,7 +3,7 @@
 with import pkgspath { inherit system; };
 
 let
-  llvmPackages = llvmPackages_4;
+  llvmPackages = llvmPackages_5;
 in rec {
   coreutils_ = coreutils.override (args: {
     # We want coreutils without ACL support.
@@ -73,6 +73,7 @@ in rec {
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
       cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
+      cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib
 
       # Copy what we need of clang
       cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index b0c82508c114..3bf7c31b7008 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -31,10 +31,7 @@ in
     libcxxabi = pkgs.libcxxabi;
   };
 
-  cf-private = callPackage ../os-specific/darwin/cf-private {
-    inherit (apple-source-releases) CF;
-    inherit (darwin) osx_private_sdk;
-  };
+  cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; };
 
   DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
 
@@ -76,7 +73,10 @@ in
 
   CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
 
-  swift-corelibs = callPackages ../os-specific/darwin/swift-corelibs { };
+  CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; };
+  
+  # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
+  # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; };
 
   darling = callPackage ../os-specific/darwin/darling/default.nix { };
 

From 9dc249fcebfcb0085b6a47540a2d6f2dff3aeaa6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 15 Sep 2018 20:29:48 +0000
Subject: [PATCH 1080/3253] gn: fix hash

---
 pkgs/development/tools/build-managers/gn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 06af89dac7ae..75719036c107 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
     leaveDotGit = true;  # gen.py uses "git describe" to generate last_commit_position.h
     deepClone = true;
-    sha256 = "1276jwk3424i78zp21f6hp7idvg6r8qxp8sdfaw8ilkmp7ss19c8";
+    sha256 = "00xl7rfcwyig23q6qnqzv13lvzm3n30di242zcz2m9rdlfspiayb";
   };
 
   postPatch = ''

From d3eff01076dad707e5cda1be2e3bd6dfab596005 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 15:08:18 +0200
Subject: [PATCH 1081/3253] nixos: miniupnpd: use iptables scripts

---
 .../modules/services/networking/miniupnpd.nix | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix
index 19400edb68f9..ab714a6ac75e 100644
--- a/nixos/modules/services/networking/miniupnpd.nix
+++ b/nixos/modules/services/networking/miniupnpd.nix
@@ -57,32 +57,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    # from miniupnpd/netfilter/iptables_init.sh
     networking.firewall.extraCommands = ''
-      iptables -t nat -N MINIUPNPD
-      iptables -t nat -A PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t mangle -N MINIUPNPD
-      iptables -t mangle -A PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t filter -N MINIUPNPD
-      iptables -t filter -A FORWARD -i ${cfg.externalInterface} ! -o ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t nat -N MINIUPNPD-PCP-PEER
-      iptables -t nat -A POSTROUTING -o ${cfg.externalInterface} -j MINIUPNPD-PCP-PEER
+      ${pkgs.bash}/bin/bash -x ${pkgs.miniupnpd}/etc/miniupnpd/iptables_init.sh -i ${cfg.externalInterface}
     '';
 
-    # from miniupnpd/netfilter/iptables_removeall.sh
     networking.firewall.extraStopCommands = ''
-      iptables -t nat -F MINIUPNPD
-      iptables -t nat -D PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t nat -X MINIUPNPD
-      iptables -t mangle -F MINIUPNPD
-      iptables -t mangle -D PREROUTING -i ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t mangle -X MINIUPNPD
-      iptables -t filter -F MINIUPNPD
-      iptables -t filter -D FORWARD -i ${cfg.externalInterface} ! -o ${cfg.externalInterface} -j MINIUPNPD
-      iptables -t filter -X MINIUPNPD
-      iptables -t nat -F MINIUPNPD-PCP-PEER
-      iptables -t nat -D POSTROUTING -o ${cfg.externalInterface} -j MINIUPNPD-PCP-PEER
-      iptables -t nat -X MINIUPNPD-PCP-PEER
+      ${pkgs.bash}/bin/bash -x ${pkgs.miniupnpd}/etc/miniupnpd/iptables_removeall.sh -i ${cfg.externalInterface}
     '';
 
     systemd.services.miniupnpd = {

From 32c63c69054c3128678b68d5c65edd17dac151e4 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 15:09:05 +0200
Subject: [PATCH 1082/3253] tests: upnp: init test for upnp using miniupnpd /
 miniupnpc

---
 nixos/release.nix    |  1 +
 nixos/tests/upnp.nix | 94 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 nixos/tests/upnp.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 0fd8d694641f..79112df5a256 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -247,6 +247,7 @@ in rec {
   tests.acme = callTest tests/acme.nix {};
   tests.avahi = callTest tests/avahi.nix {};
   tests.beegfs = callTest tests/beegfs.nix {};
+  tests.upnp = callTest tests/upnp.nix {};
   tests.bittorrent = callTest tests/bittorrent.nix {};
   tests.bind = callTest tests/bind.nix {};
   #tests.blivet = callTest tests/blivet.nix {};   # broken since 2017-07024
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix
new file mode 100644
index 000000000000..3f2dd13fb560
--- /dev/null
+++ b/nixos/tests/upnp.nix
@@ -0,0 +1,94 @@
+# This tests whether UPnP port mappings can be created using Miniupnpd
+# and Miniupnpc.
+# It runs a Miniupnpd service on one machine, and verifies
+# a client can indeed create a port mapping using Miniupnpc. If
+# this succeeds an external client will try to connect to the port
+# mapping.
+
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+  internalRouterAddress = "192.168.3.1";
+  internalClient1Address = "192.168.3.2";
+  externalRouterAddress = "80.100.100.1";
+  externalClient2Address = "80.100.100.2";
+in
+{
+  name = "upnp";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ bobvanderlinden ];
+  };
+
+  nodes =
+    {
+      router =
+        { pkgs, nodes, ... }:
+        { virtualisation.vlans = [ 1 2 ];
+          networking.nat.enable = true;
+          networking.nat.internalInterfaces = [ "eth2" ];
+          networking.nat.externalInterface = "eth1";
+          networking.firewall.enable = true;
+          networking.firewall.trustedInterfaces = [ "eth2" ];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = externalRouterAddress; prefixLength = 24; }
+          ];
+          networking.interfaces.eth2.ipv4.addresses = [
+            { address = internalRouterAddress; prefixLength = 24; }
+          ];
+          services.miniupnpd = {
+            enable = true;
+            externalInterface = "eth1";
+            internalIPs = [ "eth2" ];
+            appendConfig = ''
+              ext_ip=${externalRouterAddress}
+            '';
+          };
+        };
+
+      client1 =
+        { pkgs, nodes, ... }:
+        { environment.systemPackages = [ pkgs.miniupnpc pkgs.netcat ];
+          virtualisation.vlans = [ 2 ];
+          networking.defaultGateway = internalRouterAddress;
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = internalClient1Address; prefixLength = 24; }
+          ];
+          networking.firewall.enable = false;
+
+          services.httpd.enable = true;
+          services.httpd.listen = [{ ip = "*"; port = 9000; }];
+          services.httpd.adminAddr = "foo@example.org";
+          services.httpd.documentRoot = "/tmp";
+        };
+
+      client2 =
+        { pkgs, ... }:
+        { environment.systemPackages = [ pkgs.miniupnpc ];
+          virtualisation.vlans = [ 1 ];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = externalClient2Address; prefixLength = 24; }
+          ];
+          networking.firewall.enable = false;
+        };
+    };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      startAll;
+
+      # Wait for network and miniupnpd.
+      $router->waitForUnit("network-online.target");
+      # $router->waitForUnit("nat");
+      $router->waitForUnit("firewall.service");
+      $router->waitForUnit("miniupnpd");
+
+      $client1->waitForUnit("network-online.target");
+
+      $client1->succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP");
+
+      $client1->waitForUnit("httpd");
+      $client2->waitUntilSucceeds("curl http://${externalRouterAddress}:9000/");
+    '';
+
+})

From 276ffc5656175c1a08eb5ee34e13afb76a130912 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 15:15:32 +0200
Subject: [PATCH 1083/3253] tests: bittorrent: improve stability

This attempts to improve stability of the test by using existing
services for miniupnpd and transmission.

It also uses explicit addresses for the network interfaces so that the
external IP addresses are valid internet addresses (thus fixing
validation problems from upnpc).

Also disable eth0 from being used to transfer torrents over without that
being the intention.
---
 nixos/tests/bittorrent.nix | 99 +++++++++++++++++++++++++-------------
 1 file changed, 66 insertions(+), 33 deletions(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 609b1ff7a83a..bb276a8ee06b 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -13,13 +13,11 @@ let
   # Some random file to serve.
   file = pkgs.hello.src;
 
-  miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf"
-    ''
-      ext_ifname=eth1
-      listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address}/24
-      allow 1024-65535 192.168.2.0/24 1024-65535
-    '';
-
+  internalRouterAddress = "192.168.3.1";
+  internalClient1Address = "192.168.3.2";
+  externalRouterAddress = "80.100.100.1";
+  externalClient2Address = "80.100.100.2";
+  externalTrackerAddress = "80.100.100.3";
 in
 
 {
@@ -31,39 +29,79 @@ in
   nodes =
     { tracker =
         { pkgs, ... }:
-        { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ];
+        { environment.systemPackages = [ pkgs.transmission ];
+
+          virtualisation.vlans = [ 1 ];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = externalTrackerAddress; prefixLength = 24; }
+          ];
 
           # We need Apache on the tracker to serve the torrents.
           services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
           services.httpd.documentRoot = "/tmp";
 
-          networking.firewall.enable = false; # FIXME: figure out what ports we actually need
+          networking.firewall.enable = false;
+
+          services.opentracker.enable = true;
+
+          services.transmission.enable = true;
+          services.transmission.settings.dht-enabled = false;
+          services.transmission.settings.port-forwaring-enabled = false;
         };
 
       router =
-        { pkgs, ... }:
-        { environment.systemPackages = [ pkgs.miniupnpd ];
-          virtualisation.vlans = [ 1 2 ];
+        { pkgs, nodes, ... }:
+        { virtualisation.vlans = [ 1 2 ];
           networking.nat.enable = true;
           networking.nat.internalInterfaces = [ "eth2" ];
           networking.nat.externalInterface = "eth1";
-          networking.firewall.enable = false;
+          networking.firewall.enable = true;
+          networking.firewall.trustedInterfaces = [ "eth2" ];
+          networking.interfaces.eth0.ipv4.addresses = [];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = externalRouterAddress; prefixLength = 24; }
+          ];
+          networking.interfaces.eth2.ipv4.addresses = [
+            { address = internalRouterAddress; prefixLength = 24; }
+          ];
+          services.miniupnpd = {
+            enable = true;
+            externalInterface = "eth1";
+            internalIPs = [ "eth2" ];
+            appendConfig = ''
+              ext_ip=${externalRouterAddress}
+            '';
+          };
         };
 
       client1 =
         { pkgs, nodes, ... }:
-        { environment.systemPackages = [ pkgs.transmission ];
+        { environment.systemPackages = [ pkgs.transmission pkgs.miniupnpc ];
           virtualisation.vlans = [ 2 ];
-          networking.defaultGateway =
-            (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;
+          networking.interfaces.eth0.ipv4.addresses = [];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = internalClient1Address; prefixLength = 24; }
+          ];
+          networking.defaultGateway = internalRouterAddress;
           networking.firewall.enable = false;
+          services.transmission.enable = true;
+          services.transmission.settings.dht-enabled = false;
+          services.transmission.settings.message-level = 3;
         };
 
       client2 =
         { pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
+          virtualisation.vlans = [ 1 ];
+          networking.interfaces.eth0.ipv4.addresses = [];
+          networking.interfaces.eth1.ipv4.addresses = [
+            { address = externalClient2Address; prefixLength = 24; }
+          ];
           networking.firewall.enable = false;
+          services.transmission.enable = true;
+          services.transmission.settings.dht-enabled = false;
+          services.transmission.settings.port-forwaring-enabled = false;
         };
     };
 
@@ -72,43 +110,38 @@ in
     ''
       startAll;
 
-      # Enable NAT on the router and start miniupnpd.
-      $router->waitForUnit("nat");
-      $router->succeed(
-          "iptables -w -t nat -N MINIUPNPD",
-          "iptables -w -t nat -A PREROUTING -i eth1 -j MINIUPNPD",
-          "echo 1 > /proc/sys/net/ipv4/ip_forward",
-          "miniupnpd -f ${miniupnpdConf nodes}"
-      );
+      # Wait for network and miniupnpd.
+      $router->waitForUnit("network-online.target");
+      $router->waitForUnit("miniupnpd");
 
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ipv4.addresses).address}:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker
-      $tracker->waitForUnit("network.target");
-      $tracker->succeed("opentracker -p 6969 >&2 &");
+      $tracker->waitForUnit("network-online.target");
+      $tracker->waitForUnit("opentracker.service");
       $tracker->waitForOpenPort(6969);
 
       # Start the initial seeder.
-      my $pid = $tracker->succeed("transmission-cli /tmp/test.torrent -M -w /tmp/data >&2 & echo \$!");
+      $tracker->succeed("transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir /tmp/data");
 
       # Now we should be able to download from the client behind the NAT.
       $tracker->waitForUnit("httpd");
-      $client1->waitForUnit("network.target");
-      $client1->succeed("transmission-cli http://tracker/test.torrent -w /tmp >&2 &");
+      $client1->waitForUnit("network-online.target");
+      $client1->succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent --download-dir /tmp >&2 &");
       $client1->waitForFile("/tmp/test.tar.bz2");
       $client1->succeed("cmp /tmp/test.tar.bz2 ${file}");
 
       # Bring down the initial seeder.
-      $tracker->succeed("kill -9 $pid");
+      # $tracker->stopJob("transmission");
 
       # Now download from the second client.  This can only succeed if
       # the first client created a NAT hole in the router.
-      $client2->waitForUnit("network.target");
-      $client2->succeed("transmission-cli http://tracker/test.torrent -M -w /tmp >&2 &");
+      $client2->waitForUnit("network-online.target");
+      $client2->succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht --download-dir /tmp >&2 &");
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
     '';

From 5fbc521bf9e5415f63ec6ae4e490cd9f0644466d Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Sat, 15 Sep 2018 15:15:50 +0200
Subject: [PATCH 1084/3253] tests: bittorrent: add bobvanderlinden as
 maintainer

---
 nixos/tests/bittorrent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index bb276a8ee06b..8977be9b859f 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -23,7 +23,7 @@ in
 {
   name = "bittorrent";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ domenkozar eelco chaoflow rob wkennington ];
+    maintainers = [ domenkozar eelco chaoflow rob wkennington bobvanderlinden ];
   };
 
   nodes =

From 13c500ae165b3e3f3237667895099d498aef64bd Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 15 Sep 2018 23:13:51 +0200
Subject: [PATCH 1085/3253] pythonPackages.pyodbc: fix build (#46703)

Build with unixODBC instead of libiodbc, see discussion in
https://github.com/mkleehammer/pyodbc/issues/444
---
 pkgs/development/python-modules/pyodbc/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index b28c1a876479..45ba2a2e307e 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, unixODBC }:
 
 buildPythonPackage rec {
   pname = "pyodbc";
@@ -10,7 +10,9 @@ buildPythonPackage rec {
     sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
   };
 
-  buildInputs = [ libiodbc ];
+  buildInputs = [ unixODBC ];
+
+  doCheck = false; # tests require a database server
 
   meta = with stdenv.lib; {
     description = "Python ODBC module to connect to almost any database";

From 906e69d6380996cd97db3789f64ec5577eb1ea9c Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sat, 15 Sep 2018 23:28:41 +0200
Subject: [PATCH 1086/3253] android-platform-tools: 26.0.2 -> 28.0.1

---
 pkgs/development/mobile/androidenv/platform-tools.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 22b5cd81f870..0dd13f759ff6 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -6,16 +6,16 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "26.0.2";
+  version = "28.0.1";
   name = "android-platform-tools-r${version}";
   src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
     then fetchurl {
       url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip";
-      sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3";
+      sha256 = "14kkr9xib5drjjd0bclm0jn3f5xlmlg652mbv4xd83cv7a53a49y";
     }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl {
       url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip";
-      sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56";
+      sha256 = "117syrddq1haicwyjzd1p4pfphj0wldjs7w10fpk3n2b7yp37j1v";
     }
     else throw "System ${stdenv.hostPlatform.system} not supported!";
 

From 1d44491fac4adb0b6920f51c06ac867067f61bb9 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sat, 15 Sep 2018 23:29:14 +0200
Subject: [PATCH 1087/3253] scrcpy: 1.2 -> 1.3

---
 pkgs/misc/scrcpy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 49c1178c83a2..b446363d7f3b 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -9,10 +9,10 @@
 }:
 
 let
-  version = "1.2";
+  version = "1.3";
   prebuilt_server = fetchurl {
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
-    sha256 = "0q0zyqw7y33r9ybjp8ay6yac7ifca1lq14pjvw6x78zxs976affb";
+    sha256 = "1ha04wfmghblwr9ajfl96cswacfgrk0b7klq2ixfvw1kgwhmm6hg";
   };
 in
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "v${version}";
-    sha256 = "01zw6h6mz2cwqfh9lwypm8pbfx9m9df91l1fq1i0f1d8v49x8wqc";
+    sha256 = "02szi8w3w0lacyz42hlayxififi863qpm63yg9qir3jcl2vs7vdk";
   };
 
   nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];

From b53e495a3891163eb888544e8f7b35ee6128511e Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sun, 16 Sep 2018 01:58:11 +0400
Subject: [PATCH 1088/3253] gn: generate last_commit_position.h without git

For Git to work properly, I used fetchgit with leaveDotGit. This seems
to be causing hash to change on different systems in different times.
I've replaced generation of last_commit_position.h in tools/gen.py with
just plain nix template. "gn --version" will loose a bit (just commit
hash, without commit height in front of it), but I hope noone relies on
it.
---
 .../tools/build-managers/gn/default.nix       | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 75719036c107..a273afd71580 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,16 +1,28 @@
-{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin
+{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText
 , git, ninja, python }:
 
+let
+  rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
+  sha256 = "1a5s6i07s8l4f1bakh3fyaym00xz7zgd49sp6awm10xb7yjh95ba";
+
+  shortRev = builtins.substring 0 7 rev;
+  lastCommitPosition = writeText "last_commit_position.h" ''
+    #ifndef OUT_LAST_COMMIT_POSITION_H_
+    #define OUT_LAST_COMMIT_POSITION_H_
+
+    #define LAST_COMMIT_POSITION "(${shortRev})"
+
+    #endif  // OUT_LAST_COMMIT_POSITION_H_
+  '';
+
+in
 stdenv.mkDerivation rec {
   name = "gn-${version}";
   version = "20180830";
 
   src = fetchgit {
     url = "https://gn.googlesource.com/gn";
-    rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
-    leaveDotGit = true;  # gen.py uses "git describe" to generate last_commit_position.h
-    deepClone = true;
-    sha256 = "00xl7rfcwyig23q6qnqzv13lvzm3n30di242zcz2m9rdlfspiayb";
+    inherit rev sha256;
   };
 
   postPatch = ''
@@ -31,7 +43,8 @@ stdenv.mkDerivation rec {
   ]);
 
   buildPhase = ''
-    python build/gen.py --no-sysroot
+    python build/gen.py --no-sysroot --no-last-commit-position
+    ln -s ${lastCommitPosition} out/last_commit_position.h
     ninja -j $NIX_BUILD_CORES -C out gn
   '';
 

From 1de1bc8038fc6418e285809cbcc387c84bc15da9 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sun, 16 Sep 2018 00:12:36 +0200
Subject: [PATCH 1089/3253] android-platform-tools: patchelf also binaries new
 in 28.0.1.

---
 pkgs/development/mobile/androidenv/platform-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 0dd13f759ff6..2cfb11bffbca 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
     ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux")
       ''
-        for i in adb dmtracedump fastboot hprof-conv sqlite3
+        for i in adb dmtracedump e2fsdroid fastboot hprof-conv make_f2fs mke2fs sload_f2fs sqlite3
         do
             patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
             patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i

From 06c63123ccfbe3fa21b74819050281c6394ae6eb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 15 Sep 2018 22:36:21 +0000
Subject: [PATCH 1090/3253] Fix comment location after #46704

---
 pkgs/development/tools/build-managers/ninja/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index e1637e2f2cab..bb08ae2f3af5 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     python configure.py --bootstrap
-    # "./ninja -vn manual" output copied here to support cross compilation.
   '' + optionalString buildDocs ''
+    # "./ninja -vn manual" output copied here to support cross compilation.
     asciidoc -b docbook -d book -o build/manual.xml doc/manual.asciidoc
     xsltproc --nonet doc/docbook.xsl build/manual.xml > doc/manual.html
   '';

From 9fa2e208f789a172db930533e1c4a2083a5ff0cb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 16 Sep 2018 10:18:11 +0800
Subject: [PATCH 1091/3253] pavucontrol: Set GDK_PIXBUF_MODULE_FILE in wrapper

This fixes GTK pixbuf loader errors happening in certain environments
---
 pkgs/applications/audio/pavucontrol/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 4f64be02fd52..06398324491b 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/pavucontrol" \
+     --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
   '';
 

From 8e19799469719d3eb485f4d2c84bdaec98d0314f Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 16 Sep 2018 11:09:39 +0800
Subject: [PATCH 1092/3253] firefox-devedition-bin: 62.0b20 -> 63.0b6

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index c0ba8e5e822b..07ad3cb610db 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b20";
+  version = "63.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ach/firefox-63.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "47f6ffba22960f16caa981e72d58c28f5308581c0740c15a6e2107431761e90f6751fbffbf79f2a03efbe7edc3e9f7078835d60a79de603aac1f06b09b0eee5e";
+      sha512 = "4603e03f097e91bb205658cda8a4093f80a808748b9e935a19fa4ce5dffa1e88c4045ff661dda4fcdd21cc04c3ed15b8bfd2540ca98cf0331dae5854a262f347";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/af/firefox-63.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a7b1e73f5f6de78b73654a153a34648fc6c65559f7489b6fcb88f763f8aaa6ea0238dcf71a19f3f97c72c4cf16a919fd1b47bf4dfeab0cbc96db8b22ee4cb932";
+      sha512 = "393bba693aab5de8996e085bce9aca41474d0f5f3a5d2963467c3c994826f20949286a5a10f4563279ef5e340836d30fb8ad8e667b2b211b5af6160eb749fe6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/an/firefox-63.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "626b63a3a550c92e6b8c8df8db925c3b0790cc835e7f76274bd8b2a12179d300fb2659fc47d394c8868c89f2291fdd7c865b034464a84fa454825d84e53f1fd5";
+      sha512 = "bf814725809aeadfff9260c2e1b90989532d90fa96cee0f7c36d525122bd234ba3e41deb1e5473476e240d2473e558b2be07319cede32046c24858556a51c103";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ar/firefox-63.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "14385896811e1b6e53d204caa9a3b8e56758c494376cf87309a25c4af795b34a906b959963fb96926143bc5bcd8c658e3558c5083642150fdfa3501feed67392";
+      sha512 = "7ae25e4ce8dd67c700c0998a052b547dc6dcf15e47df1def53a519d68c25ca153d0d9086d1cf14e1587df232e6061e28dab3557af270af851280dd3ddf88cb56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/as/firefox-63.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "859413e14cdc432fb92e02d94212dea896c28a26d86972501aed1fee38610917ae70a0d2f749f4ef1432d543819f1b403d85ac3ba6563639bb1a6e6bbfb75978";
+      sha512 = "6935b28a5049663ec6b677cba03d3a58a39d4f15fc22445b227b5443492f15982959c55e4546d0b61c3a6a660ca532c83511af86395d36423de5b4f2dee18504";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ast/firefox-63.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "139a2995639bc2fc6331f47cf1fc5d5e1df2c4f7c1d582c125c5320a54fa20f58bc0d8fcf94ef07eccb32cce6839b6e8ddc8044c2166242dddc40e861954df37";
+      sha512 = "9674c4b37eddbde604748250dacef46309f7784bc28497e85baa79906297e50a8dbb7d96e7526efd999f0a10a2812cd6aa8b08bcc5fa8dc88442fb397203a13f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/az/firefox-63.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "b7785f29b4b6dd0dfbd325e6c51c9ea66f6fc34a6151a991506863f9169d4051af6847dbeabe4db04a7db70049b0b964ce9038c363749c3c728144037d7ae821";
+      sha512 = "3f6507f10fc5787f596c40e2220fcaca4c85736ef87567ee049768f2d1d687784b6f8841515829b83d70da9526410b1850286cb562b98da02de14059f0d76c8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/be/firefox-63.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f246128a4473237afd5881eb088d334b086d2c49c79eeb051f9365f0f0bb5eefec7d0e06a67ad1d3771d81a3bffa7a665d270242155cad5b099b9d5890b7d71e";
+      sha512 = "1f1b2f678251b22670e5618b28f3bb1afe6e1cc8b2ef5b80c98a37e47f376fdd529b3acfade88d8e22ba00210488326ce5d2df75fed824023794688e9eb9a5f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bg/firefox-63.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "262eae9674709dba572674214ba2626c6e36b372c99ef8f278b1edd900c0a75854fce26f3cff80b669e56cb70b592d92b070582cb82ff47526c956d45f2f1936";
+      sha512 = "640fe4d6d29bc9b2e8b04e327bd0046c3a650061f66cad26979ed517fcf07a315a4f9424c4899ae5c64635426d7badd0e3b132251d20610efb29673a4d663a00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bn-BD/firefox-63.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "69f03e13c99f621bd83061bf1cc8ddf9e761e05eb5a11c35e8a1e4a7d82cf258fa32292dde088ef5c383320ee59a05da8e46ddce6e6283aad3463a7ebfe68394";
+      sha512 = "96e8f65b3d1a3b97f0ba874afd8b7e29779ea580abf94534b88a6c303be57cc173cdf3a7b73d75a0517f532ebb881637f0afd64896e0f4c1a5b2fe10dfe6f73a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bn-IN/firefox-63.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "1fc385ea3e38dee112329e72b7397c031b4bff02bd1e3e863d673f96c98366115d2112ee5364da93a34ce3de631e81b156e0f51895f64c1fe84bcf3724b744c8";
+      sha512 = "96f35f652892fd2e2dc0ee160867f77862f9e706917a4cbaecf19953ddddd048177eb1dca5f004808cd55bf63a9b87a588d6986fd72b2c7c4d150334ded65365";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/br/firefox-63.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "45ee27e4889203ac4b6267388e5dc9a557713e044c5ede07dfe039358ddd9c91c4b79f5205f3b9c0f5c770232ac4ad16aa87c26d4a436a5f4e58f44c861649c4";
+      sha512 = "20c0137102bac235e6ba7817ed6c55546e1299af50f54d1b5a9ebd9d556165466242b0cd586ef7e03208de130eba7e2cd2582d8fef4d4593fb823c009b913900";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bs/firefox-63.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "a190925733374f1abd35c974b2bf4ff091d208c274ae59f04f6efe2cd904e607829212d23efec2f6ed1c297b1ee8eedb797b460b815800f18b4a3969589b33c8";
+      sha512 = "7e6e5d09824ca7f05d03df2a26e97d6a52a48a4a604b28200b2b2ec81b844cfc90cdabe394e28e2b9bfa2a15d456091b72239b96f59c475ed0fd6f9fd83de310";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ca/firefox-63.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "35fd9322687c3a7bd4163f5b6493bf4385b4a08c8060ae4be47b9d1aef18b7847977d32bc67579f7543549cb803a1a3a06d655c9e02e9203860316c9364bb26b";
+      sha512 = "d22440b08e636da6406ad0e047faa3a5c5fb43fd7dd1164df88bb27a950d9b00eca16b1f8cc6d17efc432c9063ada8cb9b82d14c02702d08ff364afce3ba3626";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cak/firefox-63.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "ec3e12bc71fa7976dc4ed73eca01b4e38c3e4c69d257ed2a51c913ab1c7f24e14b1ab0cd6da90c76d432f2efda02c350f752293c41d62ca4fdac74ed7f94b179";
+      sha512 = "167d1e9f3015c53aea5a73ecfafb73524e0f61caa31ceaf98043dc173c14000f61b9ec47394473d7b1c5ef346b5d1fab29a2471e9b67f97819b99be5cf79acfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cs/firefox-63.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "73af384a8a5f0efd33954e6dcd4cf1043dd7fd4accca1aaa93f58bd3742488e01ed4c4911694c21f45cfd4d2b4e1b213d7d18b233360a1eafbdc14e63cf8d515";
+      sha512 = "9083a7511cda652a3225ea60355d533fbc9b3fb48c0b4f21bca6e4563a49725ffdb7a9cb3a2e139dc71cbbb6bfe39ca887cc093a89529986dd84973a943008e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cy/firefox-63.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "07c8c875b8c3b8b613d4405de0cbbbaa5b1a3808e754e6135bd2ed368f674bec3033e5cc069dee811cb4b57ba884437a1607c9d1c0277b2d8aae6904b0dca007";
+      sha512 = "1462403ac468504d8f1c83263b8b1ad83dd1cab51a8ee10eeee34e15beb5da6339588189a24c430c96b857fa9eace2c6295343074af4c32f5da7a6f25d72d66b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/da/firefox-63.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "7c65fa62a1f0fd65da54f8ddbd33b4df1f375a567c7c5daed49d28be1ce738c9fa7689fc7302ed3ac865db53aee7a287702936a9db623815febb20b7c04a627d";
+      sha512 = "41d3a59a0e4720cb83b08c657e79ae77f0bb4cf2c0282730fa92455e1bea2a95bd99942d00e3e0a13b7d9513e3b7ec323a07b181bd7168128c8b45acc605593f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/de/firefox-63.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "0fa1128a70b4658a7a32cdb0002ecd069486192b2fec14664da94333627028e08d9d942d1d04a14c672210da3612170d7122dd91744c18e41cc0a67f5e333071";
+      sha512 = "ca22c469e9f4a8603280b59623b5f2ab973e93a5a64725f0487432866b454274755435062128548de93c529919defdc256e4a50ba768cfeec6c0a93d2257c917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/dsb/firefox-63.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "4b79c34b4a56033a885837a74c9a7bd10a6117f7f184a0b9b0801300ccda5cebe94b7f19eebbf17cd12c86406df2485340cfc30fbd1dbcd7e1ba7ec6c62b567f";
+      sha512 = "dfb83b2b59c9bf99a6cbcf9698e7a253da54808407fc78deb3f7891003d4424a3b780102f483569188fcfa8a97781efb44f29e93e4292717a35d8f07a1609bad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/el/firefox-63.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "16695437f4a137f57c2ddd5b88cc0148737a419dedf09e16e0395a4595490bf4021f7c37726beda11b8144cc9b8ea194e82bfac379198f59b2f0e4097093fbd6";
+      sha512 = "c464fed5e7af2156228d1047594df46caac6d3762542ab6b2a159b9eeccd8159161b682066a462724060d4fa81bb1f1af84fc5b7b8d1313af470b1ec026bd75e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-CA/firefox-63.0b6.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "6ce532e57b68579117c41299fd0dfc08ddd5dc4ed963d4a70260d801e4a07553199d87cdbe5f2742d09153b18fdd5c1b06948a990e1793a32ec718e46a62f281";
+      sha512 = "b8f8ee783efe498e2697e91b42ccbe6fbe835af20eaf847c317d8f24adfadfba1c6c3aecbc3c1911dc3bee90722a90d1908e9ad6a7eff050635ea2c79f9ac417";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-GB/firefox-63.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f830812530c75a6d916196c445f494c77bea33419abda526abdeb534c533553387e156a43c749bfa3425f1233235f96b174abb7fc2bfca75956325816a7714a0";
+      sha512 = "bf84aa9e3ec47623f5317f9b0ddf54341984236ad90e26ce0b76196806d240b54a3f833b5e06bb96b1678ca03e7ba63beb7b6a9fad9177f8034bdee124d60c56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-US/firefox-63.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ba546c700ca987f07d05eb363e81c1a30ff31873643898f54a6dbe76647071dae4e0a189069066ad854383b39460f273358b2aac1d9c6b627eb89de089ca7bbe";
+      sha512 = "357b352ba14c04b4f5fab1d5c165217270d213fe31629624d6ffdc7511fc7af9d6de1a9b4fc4bbd6513c0e735fc21bdd7d49f7a323680533be491c530431e1ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-ZA/firefox-63.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ef5e08dc45f8f111a22753e52baa0c91991fe363ea774df0617afabf6805aae2d508d3d9c29afb0d30e8e81661ca283115b71155b5fac725fe85134813b06a2f";
+      sha512 = "547554a1db5833aaf4a0a76ae59e3a81832f7860275456b435fe4db5fbd4ad40b79d333aa44359beda89a81d415b5bd9bfad01842388fb33a6db59dc5177a863";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/eo/firefox-63.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "7bc3e96d300ea64f6e871b04e980aee436451df9995c562fde3592c829b9f3824e534793d506bded7b7f82e7c6367ed4e09010d3b1bb845d5d3e0801230a7e6b";
+      sha512 = "e8dd5060538a9cb1db67bb6bb519ea271d927566f3470f32bb0e7b9a3d8a53054f9d9615d7b82b958556448d041f5fc84ba9017522568a6afb13b74799f1eb9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-AR/firefox-63.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "39a25d45317f7783b9f960c59435ac2c846142a272020dea9ad5c46a91dac8c4621b2d8b400b23d15bcc58673a1df9ec1129fc68fb06c39368a670705ce125fa";
+      sha512 = "56ca35eb5d694b7593047d2fdd8d35851f997ccb372a030b7b0a953f93491209045f0f31a76de5ae56ad891c64df415075aa4f6880ad884aabac02cc8f77724e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-CL/firefox-63.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "fd2229ef1d2f64f2f602b15894322163cc4067a72d580c13eb8ac6113dbce4a2eb5e4a17a833ee13ac68e30bfefa24fe83739d7c820b48232af841b24e9c0c97";
+      sha512 = "bd7f4004ba4247f3e22efea4fea58eadc4bb4fb5c613b51445eaaf835f5d9fdbe837a997691ef5a9d60c3a7b86a6ac8607137edb239a11a63850983d1d4aed6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-ES/firefox-63.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c65a840ff3e3b5be0a3c74ba82f17d2a65f3071d91e71cfaa634bfdc92531fdbc7f6865aa8e3621d94eea626c4483736705ef7363907dccc3d7ee2ea643ff629";
+      sha512 = "d58aba547347a48c2d64b1603f95cb4e29c42db9b1a97f97f812989e3241d77a1293e3fe8101401a42e84d20e2a28328b2a531577883f6b5abe52c41ac976d69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-MX/firefox-63.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "8a964e8832a9fecb6124cb1453ebccb0b8064a6d9306a92a6646fccf8ca23a058e3e2d99d3e3e10bce4de9f2f75bd32ad94f3486d1cf9597c2bc93ed70ef4c9a";
+      sha512 = "26b06e540e55ae4ebee0216ec1ca760e096261d7b53993a7b53637ace8dff879bcb4e24de2aa128fd3a87df4ab0a7c167786d32b5bff5be63d8e4cb45cc9192f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/et/firefox-63.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "13c7521af9e6ff3b6c1058c93ae84c3fa7e46482938a90f5aa489b3db99a87a6d25143d244c8c0e493a22e84cfbe831f5438f1537f78699a90aea476bba221a4";
+      sha512 = "60f3fe4db3e939c0d876dd339be8c66d150bba594b7d9f008885658dd947ad772a71226ca36af6b3113b38a76214e0f5b5006a1568f750927240c4f063456a9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/eu/firefox-63.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "b28e45e45a91c732db3fbef5ac249ecf6b6880d3f25d3151e9e0981556eefd4e98bb27b2312b9d4b0ec50e63ee8176401ceb6dbe36046b7ffb3ac80c3e09aa32";
+      sha512 = "7fa7900eb5c0bdc96106a25ad8aef512939ec367323218059b3f2168fd6ebd9edb7a831129c4b328bddfcf724d9cc98e3c26aa752c526eb1d9f5c3d5226d4852";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fa/firefox-63.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "abde704eee0fdafa637ed4ac52f605c81cb6f4a4563ed4cd2cbbb7af31b40148ebb3614ffb6b3312f19eb05b026833f32485006e79ad577f4f1de3fa6ea83398";
+      sha512 = "5e664c060c95e0af391da9f7ac3f301428c89fd7fbd11df4726e65d61727ef7722d853faeddc696932b216e4aabb7e47f4025e6e283877fc83652bb3a44444b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ff/firefox-63.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "2a16ba87e145740d055df33201510cb33ff2dbd6faaa30b894f71b960ab5daf7a24f1c3ecfcb984a5e20d525a70c2e72f4ccbf32ceb66c7879c8a238f5618a82";
+      sha512 = "1db89fe0eb24de211a346b0697c71c12fc154eebfb9554f9887c5201636e5e2e163f17a4faa4147a05ca4c80d08b4ec9029c08da1e2e9468af3b98b8dfc498d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fi/firefox-63.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "06aafd066c312ec6d8163cb5cc773c0622432424516e70b84716c662e36ab68a2e4923b0a5ebd184a3ec50bc2db27a3eb98dce2a3d6046a929e1c499303b55e4";
+      sha512 = "66655c37dafec3d94ae3abea07fbbd98af2b6ece74c7e965ca1e57792d9a9232e3567850f96df2db359ecbb7a5957b5f7c6bdb1c20637fb6679ba3cc75c77dc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fr/firefox-63.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "044c2ec838104a7abdce0a9f4dbf3cdc0238505fb15ed7de36f197863afb606e4f1749df31bc1d2777acb7df874a8a1d4900b29a51877c53c5174608c330ed1b";
+      sha512 = "b9f1396950332cd518f3523ae999a7ccc49d4e72eb8aa64a62762c0c2dce4794caaedbf80adf78bda35b23eb9a3d925530302ae7f4fd231519e8ca06bc986552";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fy-NL/firefox-63.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3023d86731d6a2174a638e3f20c4922447eb904e7b6350664eb6402724841197d19e1755c514710a46bf60b27ce107fd9f41bcff894a86918ab6bc3451f88e98";
+      sha512 = "fd9c857552b6271f33dd294b9059c840352e438e190e89e2d2c8ad2f2cefbebd66f13d6af9a87ebfc8b7f4c4d1ed354be8168e3d222aa668204e15ba83a29afe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ga-IE/firefox-63.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a901fd3e728500244de17055d7c9c543ce0899d3c8d0e6b0b16436d45c3a66db43c2b59368d23a1ad3681b365e07cb47e9414124cfcefa98251533e75789b7e5";
+      sha512 = "f5b0297e260a68128e40883dd64cb466910f6f020e3475d12250e53401ddd564d8729af0c5e7b4e3bca82c030c73d2669418d566bd9825de610163167489d348";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gd/firefox-63.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d96c4f74fc2c76e1012b98a75bfd70c17fd22966c6d4e2ca0174fdfbeaeb5500f55637df7851d23b34b4e1330fd010bff0da0ede28029a3fc92714bb14eeb30e";
+      sha512 = "cdebaa167e057d73e23db04762ec71d1ff5d7c12779ef0ed58a8cb72f5f5682cbd4d1a15f14098ce3d375c1ac3109c682324241f0e9aa14df54ebd35c701fe78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gl/firefox-63.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6f20c7966d71bda681412b3c9e3a782e3a6fe71e096759b8fcaf443f7671a94565de0fa8222fa8b2c430a1fbc28146567f47523e96e23a94c6ded0022d8b04e6";
+      sha512 = "debc5022c4f6672346c68d7ee240f0b2a9d2fd1ff536e2f95ce2a636c18eb5d9301af8b546291f00dfd1469ec5416e3a81492317b30da81edfc276af2cdd9e62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gn/firefox-63.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "bb5e2c63b2a48c3ec8746997a57d88b9a7f001e2b9b9f3c3e4d2913935cbe34931d9426d528d6336dc60ede140afb24487ecd3c93547113455e28928336169f5";
+      sha512 = "c7343c3cd338acbb572927790f143753a051bd30cf7922648470fad8f4184927ce74e98d28b7058a1bc6d1e908bc4569eaeceb7919143a33776ec43a8d69ccc0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gu-IN/firefox-63.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8139f6f236b5ac5d082c2c01f3e7950d312e6e241f2a1bc29e22a71238056546dba1ae7d5dab494662d82ac53b7617ab1dfb50375cf77eb565cadb3f4b074280";
+      sha512 = "2cf0b051a4b0d90f1806852344bf8c7c3bbc70f764594ac58e4d74cf4132591ad4260c38d2387ea2e96274581f83d94d9477ece7ac7473f633aaa2b4bd594376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/he/firefox-63.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "a311fb555c096a5c69c174da176881d390dc187147c46722bb3ef073e4bac236e36e307c22d856036bf52bf87bddfd02ebf3f90dc3cb9b7c707ecf13fa27e251";
+      sha512 = "96da735c98945db3e8385c59295dd1ac5a321fb9a56f4d65172423a8d8ea6f1994fbfaed3d06b6569919e9f448a80120e92f4a18c2826ae130419b04a08ecc44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hi-IN/firefox-63.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "56758751511dbf42d04a772a6567fe436030d4a272123fa8da8aaa7e8ed26f06bea6a32b35cc195674eb93be9f7b46b280e140dbe906292dd346912b433a2867";
+      sha512 = "ff306c88e6ad58977cd05d1c197c5ed3c42ee72efb996fd041fddd84160fb67f4c57d9853f5955ee3dcc2013fa35dbd46468abb4e4f925dee814db69060c286c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hr/firefox-63.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "da29589e3f62f2e2d4441059393e84f79cf973179db7bda8ca9e632d6c0e2d83e30a32f93f02fde21fa74a4899d89afd4871cd1d3341b2b8ddbde8a10743f755";
+      sha512 = "eac436ddda3f0e3575d013b1acf8faa726ca26b9c5c56577323a0fb16664f9b1467ca8cc5415522e44f5836010a66eac41aa0825075deeca202379dc02d9e4cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hsb/firefox-63.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "9846523a1d026b04ecebcee3534bc17093ae8ab891e7090b45c397355506d41da1261e69073d7b1a9e228be0909bacd8f6aaeb877f23aba0d2c84ed8303c9aa0";
+      sha512 = "bad8c026c9d4fb968cf45dd86dfb2516ed6c6f553601cc2b5f382ca59f18da1bc2c5fa0a8c8b4e597126971f6f362559935128effb902bda1c569c136cace1e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hu/firefox-63.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1966565f1cb52a30aa941a28db6da2dd6232e8eda91d1f54d996da884dfe46b172a85606c3c33b8c5160667719d30fe710e9620b5332421742072debdd56e410";
+      sha512 = "28fe4720fbb614ea50a9869e40bbeb2e9b704e7cb02d2274b99cbffeb7c51ec6ee0046bfaca4bce8e91535b08fde1b3e616f428eb3b6b46452f1c0dfa0662881";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hy-AM/firefox-63.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "367d11c62740213ad5161e708dd7a2cb3396a1f09e9e8b9426cc25ae3b32d70dc3ccf70b50542503818d50e62fbbe1f373f1328779f2be0d2ddfb143288187f4";
+      sha512 = "640836659ea3e13791e486b3660d39e47495c003170b567948256cd1b6037afd4dabf630c1a110f0f02d1338798b4de4e653d56f40b171d7357b3fe524589581";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ia/firefox-63.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "6a0eaca21a2d110a12ac3e5ad8a453d8b07b122335da4ed7f33e5e20ccab69f01eb1b7365136de20aca83b670ecbd6b44dc3a750809cebdc2c9d9c76c9c55613";
+      sha512 = "15a71c02f0503e0ea469deb70f95bbbaf90b455d21d73f6d9949b26117ade477d7c5266a558ffe232da36a027cae7d82231cedd36cfdf0677eb4f0d7fe2a9e7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/id/firefox-63.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "d821c322c2f40fa726692d54d393a29569f38f66cdc0c9991d4800f7d2fc9366e9cff0123a47259274681b0a67b01501ae0dbaf9c7f96207170b92cdb91fe77d";
+      sha512 = "8d5d29690cf96c12478f20c3de2448296349db8a5cf34f6b6a418baef61c028eaaddbb7297a9449eaf1749aff4530d4679d2f11fbba73b3726960a57a38364c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/is/firefox-63.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d5b2ab8bddac3fb0dc3351cd130c77249e4f5ca79815c96b41cce075298a181be79b27a1ea09bac48b79d8d35ddc710f3d7382ec036effafd974f17c7e44bd10";
+      sha512 = "c48b4e8b5673e424c95f43c83c2a183b8b51b7939dd440b4b3b668280b5ccd774f4f9a9af8468b67f271e47ef8a779f7a269c5e3d99d0445bb93f7009f8fd661";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/it/firefox-63.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "aba0b87b3605077cbb7362c2dd23514f8a31a61a69d7a054753e2e89b5388541fa7d356a13e7fb3d21540381d5b244645d305c88932854ff91e45acc75bbfaca";
+      sha512 = "42909bdcba545ced29ed5adbcdeaa1de6ddd16f578ed680f1de88b273fbef6962ab03513451da82a8ade79b2b02b79864261dd3cb2f7261fb063b6c272bc6eb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ja/firefox-63.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "ec5377009d64d2e2d625ba9f364e456c4a6d576cec8633164a3ea21a73cc643c31f74a27a64aa8cc9b2ec6313b6a5e25a78612566a11ad5833308eb69e5c4a2f";
+      sha512 = "74bbbe80a0fb2a1bbdc96a97554f148cbf5e6751d59c8481dff7d5109bcd9a2294f69365df94bce93870ce795b87ffc9b22ce56c3f9203f3640ef8c2e4c8620b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ka/firefox-63.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7362eadc3fc6cb0ab78948474570641a8f78a6d311a8035211e08dcdef9d035177eb25f679d4ffa9b6411ae4e2a3fd389814b0ea724e05320762539761cf1cae";
+      sha512 = "46685c741572fb18c60811349c8f4cde73e753cf9e29998741cbe98700cf854796066bfb12ccbcf6cb1c244f8eb6a197a4751905ca5a58463895e52202834fe0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kab/firefox-63.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "b45027c2fe7eeefe582868ff307330e9691c9796a3fc792967399edce5d5cfc9387ca6e50c1d623743eff3350476eb2db7588eecaa00407a69fd5c5ec2aa3e81";
+      sha512 = "13825b5c4d275499922423b594949f9af017347c40f90ef5720f0eb05f3463051b95e4cb7c2fa722c83dea2ce14803556e54a5a847808c27364422cfa8aed214";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kk/firefox-63.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "f2f79ea3415f8f9db46d7a4c86be44e5d055133f0eeb2231c8f15171aa27133aeb7d7aca5e475af839e68cb09218ca96e0176b19111589ae643353fa7bb08b38";
+      sha512 = "ee6bbf940bcf35471f8cb2169d369b5c89a6238e99929ea7a6fb8cd595332ee484b66d9a07dd906954a433aacdd4637a33d2f32db419336b076abb6a3da97c47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/km/firefox-63.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "fc573a0131b6e0ceb6e7d49347178aebcd902b61f870c8855e08eb7f4da29bacc9a22edaf612e4c00287415bcc18a8a8d5577e08ec324a68440f8f224819ae93";
+      sha512 = "32ee6331f9d6cdea3885dbcaa838436a371b566aa5cae352274a4f8473635a07e9ac81e6792cdb90950bfc35dbeb4400fdd37d651be314b9566244ff3bcdb5de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kn/firefox-63.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "1fdb48b0e5a270182e337efb03819fec21f55f9542fbf6f9607d6b4f205742017d63531555244ab89b8171e141e600b6209508eb1b619062ea43c01719c28aa8";
+      sha512 = "e5d29cfa9d25a612ebf8536fa9e0c9b5b9c8e4dc59fc18227c4e4855df2444d2cb942319c430e9cd13a1a45110e5c47282e56eccc841bf571b6339aced783f94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ko/firefox-63.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6d101bb20570c5ec2229079982070da0338fb4b77694f3a6e75e0336cd645ec95eb085b9d0223e43ea14561c269b1c58d382a0128e4149bb6a04ad640d159845";
+      sha512 = "2bc1aff09a287c841f62063310466f7e29835c3e6765fc7c8b8718453d7e694e1bd135721b4c65046289676b2a9c444a74465b718d20f00fc1245baea29517ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lij/firefox-63.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "970a52aef535b3ae87f295c3326d0217edef7c5e19fd8f155fac71d86b9eaa0c18c9f8f393ea4dae5811a6801caa38ba03cb432e690fc19d5ee559f576098540";
+      sha512 = "3c5478929e81359c4d0a144cb3e635c32d1887c5df32d7de5375b28483fe990a9788016e5a533fb2e6bfafa6591c7b8d2572f1f058fe64ad191ad32cb4300267";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lt/firefox-63.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a9acdc7f4a94118f115d9cafcda0960adb82fef5fdbfb7916ae785cea3b541057052a027b0831bcedef43014a088b6ad3d3570bbcb467cb62411513f877a91f0";
+      sha512 = "4899788aca01de4a3fe8b661c8b88f7cf03910e26013e50442dfe18e7df217ff2a58fb13462100dbbdd78ed41309be630d2bf301557137497e69e792eb6aeff3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lv/firefox-63.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "47d690d3e12c718d67877d4f37951a31114f6a3fe7bf49b0813ca0acc5d3c5c8f60b6c0b572e0e7e7e77c3d9e68f8d2f28d407ea62bf1976350ec4e05f05aeae";
+      sha512 = "450df380b34c68115cd84ec320dccd16288ffdc2f85da9aa5816977f1deaa55f8f411b080ad5af6d81c4318ad648995c170c89321d68557083fb549be558afb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mai/firefox-63.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "1fbbf72a08f98df105b47c21c07ad98270e9b4bca21bc5d9a940780db040c3d51b7531dd00aedfc8f7c946359749a5718f40744695086c25f9ba0d6641ca26b6";
+      sha512 = "92c8d221f5513790ed012668858067a5b0921f0a8f0e16a8348411e0fdb3314695c27afae9691828f3e6b88ab4ca69e8ec9555ebca608b4ecb19522d3c032cb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mk/firefox-63.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "64047802b567ad586cd3dac1a444f5fd510f9bf06a883cdd60d3bac9dee4fac12cced932d927b39fd579d60a256dd4a7c2cc52561edf477eb2d48f29a111f159";
+      sha512 = "98bc349a8724c912160e0fa45466da5369bd47ccdaad726d5a9bfbfa00d8ef5fb532ba52b9b2c3cd3b7060fc1fc2feec822f74fb46da852807ff34e9bc535cfa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ml/firefox-63.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "f98cf7854193dba3ea520eaf0e2c0c0f60f4965b3aa5d1ad442dae5aeb518d334ccf0edbefe9c4c1dfe2f7372188d64d17ba7cfdf41d7a1d715318a4aacf51d4";
+      sha512 = "4bc7dc9e9c0e1163a8519972269e30e850beb9492799be70a519e3b21d1138ac0828d50294e27b9fe777fa3372b7af295d63d015fbc867dffc70bc3550aaa390";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mr/firefox-63.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "abb1425003da6faea70157e01c733a757c8a46b1a22304f86ea93a84ad3fd5777754e44873b70668ff2baaaf0402631e5b9272bb0a0711c6c03fb46a3ac2b607";
+      sha512 = "164d58072c851af9bb5fe107ecc6a9409f6db68e41eb92277a62297dca233b6c830b1dddd5d3dfa4783f360f1a2b58cf9f6978e302d5b09b0e48beb66c5c0e47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ms/firefox-63.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a96e18eef12d7067d4808e0b680773b192017dad2c95798c541ab2b97cb94990e010b227982b6bd83ea595ea5ee33fcb644fcce995131a5d7a46c880e27aa9ee";
+      sha512 = "fa6148018366d6e0807848d2badd16b33dc8a9901defb7276c37c255a137431960e4fbb8d87b0b277d9718e2fb3a98c07ba92e49328fd6b4c44786431f43263d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/my/firefox-63.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "53e6e08640443f40285f372b53cfb9dbd3c44757693a2a575479f71333951c5dcf9ef5f8b948fe493c40ad789233a17e89efe2d91a132b414e7809635a78311a";
+      sha512 = "927cef5ae6a947fc410681d43027b6a098bb17d20b0d806aae7b18e5399ea3cd532a9d0eb68c01e99742986041134cad21d78bf105c78fe47be6ad9bb5dc4e46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nb-NO/firefox-63.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "fb3883a509ce36e8d24a0f0fc7aa9774c2ecad35d66d37f093cc20af8efa8516a8ff75c5f8fc410cc4c3e616757ff7136869b218735ecc7ea9ea20265331f491";
+      sha512 = "38bb2b2e2bd86f10f48eda1dab0eba955e8631c53189d012399595c84d99b3ea4ba70df0e48381cf0c03dc716b5c9d843ff4dfc5ced218235d5d0ae9f74af114";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ne-NP/firefox-63.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f12033fa6a5c2b18c2ceb96ca22cee6dd7842223c7baac09d235c8bbb75e638d38c6160750ae9a0cb9e5ecf04301c9da873dcea1891b436fea9ba0d9466faba3";
+      sha512 = "79bf3687bfe6e23915021b5a54338dd2712742c58bf2a74af8c4c1dec631f79bbba36073a90fc151cc637e013a05d55117e0f06dd526cf8f565aab42e9bd9bde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nl/firefox-63.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "37126248ec02b357837f22909b6dbcfa7979ca3b3907e339558d8f213f92c5a7c8b89a4e9d7d069a99dd494fbc41c52bf66a4b8c2910f48eced058098927c6c0";
+      sha512 = "bc92321ef5ec422eb75869e87a2383ffde238eb577b71b5a7f9cb12ee6d74b63f219d405f58da943b081f3820339a7828342324cd5a4de91b64496bbefacaf13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nn-NO/firefox-63.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "746da9da5138c7c9d0c0252aa4a679a3d8ae2e3ae53695cdf59355c7e943a4d0598bd691cd55e580b01536ef6779dc86ef17b1a5481e0a8d8d551695fb5fea19";
+      sha512 = "13c6b904e566e5137e3fbe4306cf757c3ed3054a3a86669ffc99fb2a8e9ea01e6524ad6f7cfcfe0384a3dc4a0edc6c2db001e18298440959501c2dfe27fda928";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/oc/firefox-63.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "ac454a4fd62dcc0c8436e691e103859bc5767e679d876c445ad3e553f5afb4741460dc80e647ef82f006b34aa44436469fe66978917a6cd852fb0a47ced85fff";
+      sha512 = "1efe59dedb5ad0db5bf7a9af77baac5d8d869fb29b872e1470e948c2da19c1b3b25240acc235e5b8464df0851a2b36a0c4364fda30a3ba29270895851ce49780";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/or/firefox-63.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "ac11a4b4927eccbb5a3b0c823cba907dc32ad228e8f147d1d84f5670b1fb12638a1ce858ce628b486f41eb0e98ef8b7d8757facfa9d592c3edde03123a79a703";
+      sha512 = "68286c106a1968fb39f8026710303a2e85473a967f4b94484294242e40f4316c4a3f34a39c2d2501a0681bbac6172653996cc075374c09b263dd9a76141d873a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pa-IN/firefox-63.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "396a14508013d7b6b8dd396d7d48fc26c68da3c1ad57952213a0e01a859445201dcef08d824ffeba6958f8a79b5c1af59b4f6c30e539f80ffe5568d6a09406e7";
+      sha512 = "528696769c497a1920bebe4c5dd4076e53eea357f15f24ad213110d0d2c0744536ddabb4ceea630bea5820075cb606d631e129ff235618da855cc14ed0d08f80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pl/firefox-63.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "67a17f065011d6a84cd455c614804351e1d9de4be361aab3bec5f34db43db378f1f594b4f76c35967181aa62f484aa84b49a05e129e6dc00b67caf68ececed60";
+      sha512 = "bfa2d73f62c2713b42ae5c8a28c32d7506ad1e39049132fd9b95d8366756ab6be053a8e6009ce7d538265b4ed078b4f1df7b43d1d6900ed7c935cca3e603e459";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pt-BR/firefox-63.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "caf1805b852a6f8b19251450d72701cacfd1f0c20ffe23cd65378fc2f99109246ff9f237c120f273902d6b9cb67d7db54a0bd5ebf4cbe0217ee13ee28a390136";
+      sha512 = "c0ddca68029afd6f886955425165f53a848c4fbc77c760be925f42b4e9ed7acd3c647303e74ddf85a68596045eb1c6f407c916773f369e33985b08f26917ed75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pt-PT/firefox-63.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6119fd1ce5695c4c3aa8d61cbc6748d656a591ca7ba6e3aa8bf52fd7da68633155897fbb739568c816c78b1c7d291544d747dbfa70a346d93acac951f21c33da";
+      sha512 = "3e47d046af4cebe96ba7a8c8bc7717f729ad9cbcc19b216a2c965d6edd362608c28742cfca4a3db36dd727e9cc489182105ac744c45d45dbeaea148c94b8b8e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/rm/firefox-63.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "04ce2405adb0be7f8a1c2fd9f5df38f648f704abf342ad7b7854cddda69b2ceb1d0f4925390f2a96d349c62af3f486cd587fabc5f42e555e83874d1b76b52922";
+      sha512 = "067977a13236f74057a4605fac66abb37434fd4c964298c383c952ec72e2b2395887988fb18eef9e235699b70854e2a1c656a4bb3fe9b214663042361f341353";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ro/firefox-63.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d4add282f611ca37aab7a43c9d5bc284b77384b87f941df77123a869ad1a9ac8a4de3db540167e1b67b61531441fe1ebe3bb01bab95abb60c483dc666365cdc1";
+      sha512 = "b641edf0afe14420ad3c0ea502a7b46cda19e062e803c20177ee66a58b6338c0d2319e16c3d2d341377890f4651379d44ea037def461a1b1cf9e86a78cec3b4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ru/firefox-63.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0ddac21be61e70542bc94e3c2541b5ff91991bce26596d4c7330557353db6d9d0670ec394a88c49ddbe08f862e5c53d74ee3ba23a1ba0d6cce2500873fde4756";
+      sha512 = "2b824c42976f7a9fdf7504e60b3cf057d31121dce86223d352bbbecb842d0b7c41197d1c045d1e27a6d1f2b2a863c89e5f4956b8c125bb678930e8e1a1078384";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/si/firefox-63.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f74c8063bac884db58ee847f2f9d2ee366d72e4335c07e268b3aa22d33bee4dfb1c8ead9a02592178924bbf056d75ba05b12b8e79f2b10b5cf91e55d1b08d15a";
+      sha512 = "3639b0fc46244cc42f5bc31e55790097a11941844e9a7185d363a124574928ca8814d6553c46ad8828e82f7876c8814bab664b6c55d78680635136bd9f5ecd2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sk/firefox-63.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "2020c4c9115ff890757620a2f3fd2da39ba989feeb2baf83af50627e9d22cc9f68a44f3f442d846910458f14523a59df78cccb238095feaea76bcee93fb066d9";
+      sha512 = "8dbcd590f5baacf53f0ff13d25f40c08637b358a98a680f7c07584249ab3ec69678389638ddf2ec11ba0543a4d54deca0fab3f65ef4297f6a403f0c6897ee92a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sl/firefox-63.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "338b4ea7cb5c4ed7773eb7ed45c464da01e63768a9eba76b7c50ff2ca9a78c9580ad067f94e01b6e2d55f9b3dd76d7db9e8f0b5d3cdf023ba8e76a0a5060ab5d";
+      sha512 = "2ae24291ad7c8ec8f85301fe73e7bfc2e1da272f5fb6920f6248cde32b897ebb6640e27dda62289badb2a363842f5d6425d4372a5691bb7e140852ae8792c103";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/son/firefox-63.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "e2bc04b99f98b1c22e92bc326de8278dfa57d9b54be24d8b3f0efd27ad4cace395565816f7ba265409f66f06c0ca60fadf37acf4abe21729b68113206d389f9b";
+      sha512 = "62cad5b16c58b9cebe78aaedd30f5c74fc065c6e8c3e916d7753b8143081e23cb4322140faaab6e84847f870ba588f99b0a32f275fb488d72cbd780b58be8028";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sq/firefox-63.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "e430eb8296d46986ea536ada48db5bc3444eb381d3caaa44b22e17be1a8b6f05c06df85a8c90827d0bb87cf4864d1ab3c20ba43de8ea0622d8c6753fdecd187e";
+      sha512 = "4a65b5fc302c937afd545c2ca2e0d38aac5c66d6fab4b450380e942c1f5a568f37701746753d805971e03c258e3f352f64e12c14f5fffe1dbdde634f2f4aa237";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sr/firefox-63.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "9a6558c6c21cf211b5d52c713a2136d55a39146954a580b6e9f304b63d28cd8c8fb9f88beab95998edf12cea87578ab6941a9e7b793d50eccb4678b57e283b21";
+      sha512 = "94398267503bff1aeaf753c3077c0d1437f6d8d4f5b0691af4efbf7a50fec1f6056c7405ef3a23930b8baeb274a4cfaf0c963fafe8298bff26e79294f12fd078";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sv-SE/firefox-63.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "55aa7f899a770bcfe0690df0bf61a209a5f55a90524f6bbe7ead517947a3884a48ea19f887bc4ac227e0396f6704b15eae9ae992b3314899372f4e41d8ab8f43";
+      sha512 = "d2811762cb743bce3fb9acd50c912ebae495111f02ad92b37069a81362c84e7dcffa5735b7d34fed47d0330a02abd86aae9d088f4908db9634d1716c584e9d95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ta/firefox-63.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "61b6d93e433575fe3b5d2982cf558f165e11f02ea2009375b8da468efc641455ea028afb0c0c5e6e26048832fb9274344a607713350b6afdccc5b95cac3d318c";
+      sha512 = "3a07818b877ea4bc409708f9771cfd190670c2aa947c4005515880f456cf435dbb645c99be09934c9c8eeb21890ced8d6bf5004e31c0fc70c8c02fed91de1898";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/te/firefox-63.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "fd67b31ef7d18af1786c966cc011a909367b9700eb22130246f0bb66b3f3e2ee266612f1993e65b79bd8f9e7aa6e7daf7c50e678e0e7f0c67aa63adde0c155d9";
+      sha512 = "e2acd0f2bd90a31cfac5ea348548a435192205949fa870c0b964421ffaa99941c21e4cc78aae04f761fee49c9bb423c8b959e212fd3c655815653508e21f8b75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/th/firefox-63.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "35d657b0e14853def56ca6c15331cc8aeba7ba1f230f8b8669b6466ae257c362a4a97a1853d9b32bdc62902f3de71001e17d2859cda77642283c6f8a41e7702b";
+      sha512 = "562fe7877ef17bd200810a48db5efd2085d7dd8c004e137f35fac66f89903f4108bb45cfd2c19c001b30a137c9ff27ee75ff33d42baf997ec27175a8c3e43cb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/tr/firefox-63.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1b562046ac23fd3a34b450042773afcaa255025972ae251855403865b4d2ce96e958f6a2de9d96267d17ecabea9a9e02d48314ffcd9986f1cc3f58f24fed310e";
+      sha512 = "cb5c3f134fa81334508307c3a8a57df4d79309ffd92449c1147e8a3667a0ef12db5ded5cf25df9d14a10a645dd994ef58da30af051cfb9c61506671292aa0dee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/uk/firefox-63.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7adca8260cfa16067d0df3270602d01b19df2bb9a7e5a373fc39a0ad846239ebf1ab868e13f3240381465ab7e950898f4664cefc7907af4d66698ea8eebcc4d9";
+      sha512 = "b29cf419083fbc9140091eec02a199337b814a7da04e21a118b586f813bb0bfc888a3ab62872348bc706e315c5566f8b15a3db19dcecd7571a113d888a3160bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ur/firefox-63.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b492ef2bc8447460f02db4646e8a489e9e0e880660fee94077306ed9de0642498c46a1a81681692a5cda8ceafbb1a5788dbfe7c46ae949d4a0b1d1e4be695576";
+      sha512 = "39e9a404353b9a554d61c1a5bab869222b0ce127dae6d9b6e018771de759a614938564ba906a747bfdb2a4d552dbae447083937b68c98aa5b3e679f7101c9ca3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/uz/firefox-63.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b45916a341b82f95e983bb796d2316b77480982e3158d07c05b87dd8096385a9e8100995fa4aaa9b8fe1feb140c672e87b01cadc7861c8a057ad5b01f23fd295";
+      sha512 = "f1576289f479891be687559b0c9a2ec216733e3414b40ef381b25642b6b36116878711436a27cc6710ff3bbe25971432ce1c85cc5a4f64e5f4d8482bb11529cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/vi/firefox-63.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c04fdd2751851bfaa7d61a6dfa405820f422f456a6768feac95061e7fa24f05380c0808a7637b54a344fcc237cd135bf0a32e7d697d9252abea8bfe31e2659e9";
+      sha512 = "4b7d515fe6eec6a121efe76123cb027bfa6af2c508c917efc824535da292941b109f3f1a8697ef208819dd20f02f561d5512f82345d414fadb1d3cd29cd146db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/xh/firefox-63.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "aa754dbf9f04586c60e6406b26649955a273395c130c5955e6b83c2a5d7714de1f0afcc0c6904f01bfa5acf50cb03e848244a62214d4db241eed18f049320f6d";
+      sha512 = "3b7fbcfd7f9cfecacff3cf7a98a9b228d118733271dedb9d5cfc8a413e09e2e4fe4b3584d855be0a268303598d48a3802637e2496b2a0593e5b1b64d7fedd6a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/zh-CN/firefox-63.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2b58c6806c8ae4e476add919f5f4d5e380252cd2a822dc0ebcc5caaf20f1797430fc8ea4747f998953f41e612491e41c6c00a9eafa98299f4a10571a89d6128a";
+      sha512 = "dbf1222759b24ddaddd149844560351f2486ea91ae934e8e5c45af86420b37dea180267ca2e326c5340e7a3aeac1d62507c37e877b65533e00e482ec135655c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/zh-TW/firefox-63.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "8d744785056b3c423f42e337befec9983c1e914475eccef8ed43e8db87aa80514003fc20976a60fdeabae3ac95b8c1a4d8701e31158f2f811ecec1e003cb03c6";
+      sha512 = "6b3eef73b01ac14b261cf7c2aae47e9406cf0cfee36f42920bdd2176f19eb6f922ed651b56ad9f9da5567a33232eb11853e961165f118abeadda5450cbd24d1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ach/firefox-63.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b89b8af1e22c88e1e6140e46953e15f25673bf0f3645a8af40a9c1be3f44e621ab469fc171538cc2d009d50c3bb9fee9d1653ea9a3291f3c535e3918fe25ccc8";
+      sha512 = "510180f21ec182ec20d95a84187390014c1b4fe325271730ab35cb4e6f271851e6f7838c2a38327634904d1385f9e04d8bdbff0edf3ea1cf6fb6df1e86a6d257";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/af/firefox-63.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "cb217f4fc3d817f25f76691abf459fde2b9d55e41318600ed822ead6ee1492396441bcecb898386fc5e6e6ed8a95736562d241b05b186dd0497bc0100cfec6ab";
+      sha512 = "4a46e95180ecdfd87c8d8637913e7937ce530d8d1e49245a1ca4f3a0aab0a400cabdd69d53fc1ee2a86a5ca414979c96c09d59394c689b068204d74a6398c3be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/an/firefox-63.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "298f2737835faf98e688d2cca5c12f6c121e83ecad52f0fa6af06a1a0a823a5b1c9713742524b1495452bf099e82b3e1fc8faa30c9c8fc5221f11b514b165ab3";
+      sha512 = "2e7cf12169e6ef76e7429a754909ffa3a05aaf8bb208d3a23b202c18aacb3a364628e550a5a2ef66ea4be145b4dfacc9b91d22b7f3fb752d20c8ab0172c79aa2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ar/firefox-63.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "659908189fcefe7cb5c3a0dba1938d8dcd23336be2a728b0d96641a410fd9bf723e4ca4978649b5e01e13c3545ca3d8348a5a1451496c690efb663640961f6dc";
+      sha512 = "9cf8386fe93f6f577e7eb9982eb7af9d60a1ad7aa95eb62c49e7d5a9f312b8d557610d6b5adb5b562b4e18bd16ed352df055009fe35ff6309945ddee789702ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/as/firefox-63.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e655389c4dea4d9db66549256ec05443a7bfedf508db46ab8943ad644229cabe2ec1edf8ab40b55bb2b53cdbc83832c3a39aa5c42950fe15fbce1152eb9ce8bd";
+      sha512 = "b83b25440d971c1f19ea191ec2cce1813f89eb52e921f9a7ba4f8a7a04c59035a03492b40d5ba2e4f772c43af0a47370476c18e2fc3996b0c20b3e781ce42030";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ast/firefox-63.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "7be4c535d4d63ae1c5f98e49b58c57af0adafc95553a505fb60d5a83523422e6b71054f1bbf02a060510d59a8f85f905830a02c2837fa3c3e5008494e3bbe74a";
+      sha512 = "03baf39793c730723af20a8cebc9e657bc94fcf46e4e9c6fad4d82990fec3c662bda90dd9b8160883e5110c2cfe43f857dd8bbde6f06b8a9b7ba2caffb373f86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/az/firefox-63.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "2b13f55b90997e245c69b16f6c0fdc1df6f1f7cbeaf4af72cade86866aa7c4b1afdca46a705e5203b74b0db645a514995f6554c59094c2f21c13aef1f126b27e";
+      sha512 = "19c389593da9813dbbb7f994d2990955e78dc9828dba697883ab2939b538f2336b7e3d60594372ddb3c55768ddb2fb4977cc933c1444cfc2a1832bcd3d334599";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/be/firefox-63.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "d7bf4a8aad2adb1dc5c9c0fe474aca23b8f3b3e66374ef36f28cb3818c74932aa4c5c92b8c06c384dd4f200fc1215a8a5fc7a2c22693224d5955965b239754a3";
+      sha512 = "15154744d2977ee3cd95b589fc4030231183370b3e295f195a9458d409cac226c19e2703f6ab6aed6821c97d15bba61c602bf3d79c1559df485b90c94dedfa8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bg/firefox-63.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "f1d9bdff18573cc004b8172c96f2766b42b0f0759a756e7dbea0aa46fc8957675a556e6b952b3a7562421a6ebb33d825a886c1cc96ad627e806ad7f0a097799a";
+      sha512 = "94618a6f0eecc2784d8d89f6ee4da40ffdf2bddced4e18b4b573898c189b81245de5df75190232307cbde6117c1a1063bffc343a85b6dfb09068d4bfd3c3a942";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bn-BD/firefox-63.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "aa1509462dcf6c8f2718a85bc6fa00c572fa3f41856b50a7bc0e2fe1f50a7c6717c05ee674e7594c4d07ef0ff23395bf9cfb23caebf707e0d8b4112687caadfd";
+      sha512 = "452b1c937ddaf8434e797955d015e3296fa20eb8fffad82467301d8e762fa4492cec15d9a237aa4412d1ead6bf34c925457472ad5be702fe755e9c72bfd733a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bn-IN/firefox-63.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "e71b318b693a256dceecea4ea1ee494f5ffb9af08d72fb14a76c21a51b8f8796659a7f9a087e2b732f72cc8787217f14d17776c658c0affbcebd5e2208160a7e";
+      sha512 = "15a7f0663bb90d9581e14951b2a12259fe19c59ef0f8200464823c0693a73c59513234ac3f1af944ff8533d8c77b4a8f072b94679c23acf454826f48a5d47d6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/br/firefox-63.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1c33e290074d0dae9654d30b21592360f3f7199069b070a791974f665388ce290d36bc7cd9518d8bf855bdfac97acaa90430f4cc4627e9033c169dc75bd79700";
+      sha512 = "6dd94018e628439b533080ddf5d7fc2edf386989480a7c45727c0d32dc0cb4b4946c4d88994934e5e567a09df9caacbb282967cafb5028e5b870fd096d1c2101";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bs/firefox-63.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "a92dcbdc514f3b593f5c222f093f88953558388e03e71f851cb2c242b67f3d51ce7c891a8f183fa554752d13ad93152171233b81aa727c9c20a341e558b39229";
+      sha512 = "fae7ad771bcfd77eb6cfa0c4144ea3ea3efdfbf65b4064dddba1b555c2084c5bc9911b2ac3a6cff7f43478c3e85357615594773a4b7dabd45e6ba6a8e01b3f17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ca/firefox-63.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ecd961e322ba0b9b8477a52bcd1e31084a18109937ac50cac68d73333c3d62efeced2fb11ba63fa97e144c0b711f5e9e15ba346d957bdd4506dd9a7a85400e1e";
+      sha512 = "2f206b1c0e2653cbc096793619fa48f96423201d3907fbc823e550b58ef8b7dc6b30bd489e8c113463ae1ef78bca38827619930bf75f600af6af058a586f50ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cak/firefox-63.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d49f167dfac2e4ce2a3f5cdfe7b5651347e90f7a04d52cea92c05ec0325f67993ec3ed97ecab501d973f16da856e474321307719842da958496e07d07dea2b64";
+      sha512 = "fa15a78d3d06c9155d46c6a37472f74edd89d8a459a292f1e3a004b080db7ad1c5cd51d3e400ea4816e6d403cd8a44661e65d39d5138f28733a6196a84c6a371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cs/firefox-63.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "04829e46c4d84745abac063114ea1abeaea8ec7f596e7e3850ecb8702134aa2164ccd11c98da7a22adcccc9bc21fee5886bc7c80652f4ef3682ce907f7e5ccdc";
+      sha512 = "d56c79150e1e0747a5f562e9e3a413152700cdfcc4ab091c9b3a4ac07753c1147601ff5189788336dfbbe22c3d1180283d5a3ab2733182a98954d9d0c5215e39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cy/firefox-63.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b211eaee0ca7f2faf073762e9b0e47a6fb1249d20f0ec96345104b75367066c5b671d3fd16cd1387fc773152c1f22f26784df14146e5b3ef41db61810d6ce317";
+      sha512 = "91e0d1f95645b6f368902594044e647487584a0cababaf78456583ad8b4e87ab3399693c681c403f7e4ac7885633421c3d52b1258c1017325a4f4077d6556555";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/da/firefox-63.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "46c7f949b5d306f1511ee68d624a276b4635edd21cbbc9f3b19dcb8f6fe7842acfbeb55307dbfb6bbe19461f093752d1d27abe908b394a013cdbbc68b36caa09";
+      sha512 = "9dd67e40305dc77a8be1fdcf811f25a80636de47910cc42e1563902e1cf8a57ca58f3ec26366dbe85eb3c36bdc1a849b0c7f301534e469be573d8ed82047ce6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/de/firefox-63.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d53f3ed49d59945ac711cca09a49460f82a74afeea3848605b0375778f3d94e2b0f8e473ca567a9a3326d847de97a83374b37c012b94d96bdff7482cadd45139";
+      sha512 = "e1c28ac98b003f0e3bc34cf375fcf23f01625e913d027ba248f3bf4b86babf70be15987ef04c8f33feed1f2aeb26b6aea3a93bf0d7f0803f4a03a9b55d91b4b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/dsb/firefox-63.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e9274015c9a150ca2518358ed9847f060dce50f5aae902ba107eb07071b7be1255e3f034a8c3f8d9c29a4825d17d124da76b4072da20082364fca5ff874a9a19";
+      sha512 = "1651468f59eebdc1a763719c3c7f8974417188e1626c8498f1b7c6ae026eb40fd442346642a3c45bb1fd36ccf6017539c852ad3a7ac6424ce3069993080ed37f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/el/firefox-63.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8631f28be76ad3e16c521cbbc263f3c58df6e73cbcc9b4a5528934f9411faca0ed28f821004c901c97d925abb95fd597a34b901f97f33fdc508e99a3d8c4f689";
+      sha512 = "834aefe52a94aec8d176641cb138b09dff511d7307c6f10327db07a5e96d1b93714eaffc98be6cea18d5fb4f21e6ab69c50e3452c29e9c11fa597ef36f5e8acc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-CA/firefox-63.0b6.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "1f70a550b4f7a6dd2578fd0a385a68b153954002d1a4d7e66ef58f86a1b5c9f33e153ce04a32737113f974e7caea5c2c6d338b69da94ced49a56dfbe61a99d68";
+      sha512 = "b3be84c80f9a04ef5095ee1498ef549b865c9d1d53a9e2f7a1e9012b09c6b562b2a3b2904a6537faa7f6bcb2d89e176d67e2981e26749a74fc3bcbbb704f404e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-GB/firefox-63.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "473dc2bfc05fa24f4a5c88321d087604b81245b08e3813dc45a2a7bd62e2c7012f0d2ca1dcbedeaceab7549ef5f53d47208c04b0bbc9f9267f4319b2720a14b9";
+      sha512 = "5bf3e7e43aa60dffd109a8671ec1d919ba4d70932ca9bd3648e2bb43721b59c00c9030cf3c3f8c416989f799b8bf4c21303c855e3fd8eb021e94eb3a0cda1faa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-US/firefox-63.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "317db45661d149e6ad123241b9b335f34a2852921a97ac0caddc7c49dbb1d105091990e99d538255359c42c5f12057fa728dd546019e710168f696b88ca202c2";
+      sha512 = "d855733b5751efeeff97b761ad3bacc877609fc77e26def25a390115e9083f857c1babbff5523484cd3645a3470f2c9e287d0ef3fe1cd212285ab021c571426b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-ZA/firefox-63.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "dda42571be54e4955cad1db913579ae7e5b002dea09eef65c47da53adeff0631667d34339bf102d2c779d5601066b7d403da03349dffb60efb9205cbf92678b3";
+      sha512 = "ae6a764d9f46029338d2802488985180fe63c935bd1e2b0f33ed6267349deccb7019ae12acb37773a806f8f945f1ccd3b210eedfe1b44563423622157cdb272f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/eo/firefox-63.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "c52807336eb6a7acefd83053b13b9e5e6a8ce746466fc8a117e29b3293317d8d8aad86fa5f893b57713ae6e2d1a86e63ac3a8e00079542bb9d171d0297b46a39";
+      sha512 = "3d25ad40f8b6457bdb77dc85a16e9a2cb839891816ce683bb3a371e95045876f4e70620290464d6c10d148fb386e711b0a9b4394510a167e9bda0f70da9673a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-AR/firefox-63.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "822524e73b1f49037b0e94b297fca1239dd8db130661bd791c1e5e213c9d3cc8f433af205b9cb3a2b3b983bc1470471f558d5e49e908ca582921b0f04d429472";
+      sha512 = "8c314a8bea657951c955dc1328e5277d5eb649d6d8e4fe261aa2fabd5400fe16017c1880a20f9b0f8485a2eba34546b695d84faced0cf0743713525e9bf022dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-CL/firefox-63.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "24e6938f719b0f369db6d2277017e976e3db83ad342ebfe3caee1c266e4832c0fe306018746e3b45bcf6a7a430c9083fd56cd22e57945966ff4f2943b828299d";
+      sha512 = "fe13ce6f7338ddde928fc1b1ec917515c2ac85783da89202adafb307439c54c66be87a8ae3f15faa6006fecb28f21206e0994401aad9ddd50099cf48852c20d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-ES/firefox-63.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7d97797796becc35a27bdcc461aed9f0165e49ff8010234ac9d2fa0274ce9270b2b69657d841545fd2b6b4cf7727ebea76ba3d5c2bab8c2f1a4612fa678828d0";
+      sha512 = "872420f6294fa3ab715b6cbcc2b4e538e53902fd434eb2dde5a1df60adff885cf494168538eb94a3448b50707db15e1d30fdfc89351b4f7ddf9570a7b57ca898";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-MX/firefox-63.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "bcba9c47bf13b77679374f077024b62e6f4e6048980b71901f576492629ee4e6074f9e5f33b9260eb67476823a604803194f668c4ce1ad09bfe78aa5017ad9e3";
+      sha512 = "6a1f277fb6bda8b8f807d2d87d03138687bb9dc83265475c3aca7b68bedf3c01bc0fc6120a131dc9895cd648b0aea4756cc4883ad9ff81b4f6ad73283a1c1385";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/et/firefox-63.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "ef00d5c331d377d544c3f8acf87ed78c658a5e076db36a025a9c004366b27d95f2c82971ce45f2d48eda4cf34f57adb95c646ad21d2000e5d631aa2a8c2355ce";
+      sha512 = "820ee6763c2bd74a747d6ec3cc3d4e9cf35c9ca8251892379a30b8fdd986bc9b25bd7f61a4e6679db7d764ddc757d2cb627ef3582cf1f4f980b6acb6359f6dd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/eu/firefox-63.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7d83cca4b0f6de980d5e66b152bcbc72286cc7a241ac1869cc5999a7007f7b632d35b9319425fe1391cf0b16188709fc62c05e81fbf9d1bad0a338509cc7c529";
+      sha512 = "cb29b448be7d9c000b019759da81bd4883cccdfbc6c3c57adbee92a069c84d1f94bcc9656bf771f61720618cfe9626df133f9be529e2c5dbbace7ce929e4b799";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fa/firefox-63.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "aaf6b7583a9c9219c4967b34c2d89d58766261178efa2d89f4cb7c9bf8018d908887ec04bafaa0ec464c243d301cf09734cfe6150d40952df532579c35abd517";
+      sha512 = "75de042b2aed3f161428d979834c8a7f4bcd8f3843509aeffa7a20c548a8b9d54531cf68dbad278cbaff70251672471744df3df5bd71bf35d6d49435ddff8c83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ff/firefox-63.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "3cfb4321724a30c49e735b001dcc3b3b1fe2ea2872793b5287adaaf89b6821f8b81669761d8296111b574be14eb6bce7d0467a945dd22ed652f82d2ddc29a46a";
+      sha512 = "460332c01db63286026260c192ccff50ab75a64d65514ba02fcb6986ab7267b358ff8c51d76c8884cde24893f202392b788f326dd60dd60840be64c527379f81";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fi/firefox-63.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2acdfd29ad1213c8fa5ffde258737ba2232ec1d2fbdd5285c913b7c383f4e30a2cda65a16e1f597c81f9ae0ea1b7fe492625eac48a92fc2f428d5fb0ecd5ef83";
+      sha512 = "294d616e6634d257f83a480752492577a8397228520c67ba92d039cd21f925efa053cab2fd3e23e59d4fd02d0711a38a251074deee671878236c380cae3bc605";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fr/firefox-63.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4f18a80f38d2f8b2e828e58171a10bf0509275dcb5321867c52a818ce82b56ee564973f13fb222b049e0df3aad1d7b0f68a6ca24e88181553bd3ae125577eb04";
+      sha512 = "d9634c8cb3be18dde4063521d4ba732e488c322174a6a254b19c77d6282c33fd1e758be72916639df8cf4498886f8734b4b82f1f8115bd808c41b767f9215045";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fy-NL/firefox-63.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c7b18de94816353897423bcb35b5f5d88e998c5dac3d37b417e2887f5fcc7ea2c4233a5e603596e742e2710e345edad14a48f45b74a91810e126a14be803b7f2";
+      sha512 = "5659a13a6016c057a478893624c8de70145dbbe7ba72dcbbb05e1c53fac644528cb124ee02d1a643b19b04d1fffa70141b42f950ff1a197f5d2e5550be2e362c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ga-IE/firefox-63.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "e1b070d63012e494a0fb380d7e97f8ca32e93dc3e8df5e2f5347cf829b6a94fa886dabd46285110b4e83c807f49fbdc7f792061ca36246b1f7c1c4260dc3d927";
+      sha512 = "353c272783bf99ef7683b57bd0e7cbe94b761afb0841244d09b5e13c64fa44cf6397569d55e6db5d3257a21cbaaf5ce00ddb58bf6adebb402af1fa6e4816c39f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gd/firefox-63.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "218450b49eafb3e13dee8d96cef0374423c0fd9ed9f3700428fdf0234a7f921138b4188dbdef60013062c6aa62fe2e13a6bbc219c756b8085e4b87f1a7400ab2";
+      sha512 = "214d09b7849fe0b5bfd552875001cac21842c880557adbd7120e79e7194ce2cd8d17f9aba5c684b30458272b38c464274ccfb5c12d30efc4bcfbe58665945d6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gl/firefox-63.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "e841e13d8f9aff9c00e3d78f01c6a6145d87f9c6fa5fd6390080b1f0002cd6ae2e1d45a14624151f7d2a075a479281c534b06bea6f03d022dcdcf330858fb212";
+      sha512 = "5aaf2f5d740651a4040a4661feee6c5d1b5955f5dfb811a6c3adfb65ce6ada1d05c5055700426325ccdfe504b35e2bd610c8ee027a130df6df07912c0b620d7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gn/firefox-63.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "00b1242cd074fa385757a2059719fe680d52bed9ff74ba913f50fd3c7a6e2bdb16a2c0b63343bef47dd0fe2a7b55b5bb089e801feb3d4e537048840b453b9464";
+      sha512 = "ff77a8fd53f6096054ff4541709c70d9e3f2b7ab3331b80fb5461099e12d055de2f0cb3a941285079eda02900101d20e93a80fa22a1cf960219c49b760d26de1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gu-IN/firefox-63.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "a1ba413e9f9f9167d15f37854d91620cee806edc1d3aef95fcc8b067384632d07789ed7fbb90255e572de0de73096fe08147082e24fbad9373717d1388f275dc";
+      sha512 = "d77420d5155696c45bff77c55518922e497f40dfc639019a9ce13f98adc31b7e64437631fbe74c8d64b619d558c1de2c136e593206f52d0474378c8d6f5053d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/he/firefox-63.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "6ee67f5d621666c3d1fe3bea325499f21be3c5b51b76dac0ce04986e4a780b2da6abfdd2ca2b0e135abbd5c085b6a58da3bdebd9aac2daac3921e36b5c823027";
+      sha512 = "1a8c37f655c8d1792196e2974808ada0d3fc00506f4c500f5920504e9fd30f3e442de063e0c5b04a9c2c71465247b0fde8bf0a149e5b0b046354601dbd19722d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hi-IN/firefox-63.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "a6c674a0303589372f0f065509977a7233a0a64ec3eae0d6c33321a3f8ef39e8bb0c06fab28114c620560a5dd7748801aa01c59feb785250455ea5d3683aa324";
+      sha512 = "137a1930c18ac470648a7065f6f6bccd609b40c82eb69a8672df4b9628acd82cfdf6d9c24f02d3f443a277b9e4dbba09f414b45e0053f7b87d2fc7a945dfcb79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hr/firefox-63.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "49491d5cfbdb63a0ce5dfeab0041f3ac188eea65d9804ad204eee826a745e7274b59119545278a76e1a69f239b2350835ce69aade82195f2c9e3d926849b0732";
+      sha512 = "9e926c8ea71641699791eb5ea593e703d527eaa798f47c6bc890786825f452e25b1d9e0a10f10be84de50d2709c3ce30e5b3f27c8c2715b1816863d280671faa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hsb/firefox-63.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "94a1b14a0307be3946abf0291be752d90ffb004742e27ecabeaf340c8a291a203a71152dfefb0ac8614f029763d0f7748c20a9e254763745e74bba7e00dbb752";
+      sha512 = "d98d195333ab6e91a3322fab6f867b1cb667c11184a0463a4a727d901f258c11161d5eb4d2bb39c3f0420eb58a9f6f03792cb59f8906c7f44276b317f23f7dfb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hu/firefox-63.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "ad13f2c9b2e233b63685e5d259e189c42e03c20fa4635b1e3549bc993aa84b6b6f60db765d3d754d4077df71482db8a410b78255525a98484af90963d7bd46b8";
+      sha512 = "28698619a67b8bb93300c1407a25ff14d66874ddeae70bf807c91e88583c880a73e058e404f65d6b8831264faa5da8f488641e319735b2ddee6c3b17907430a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hy-AM/firefox-63.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "af60b06dccac40856fd7553853ea27f084db076ab544e02bb85608f54b7fa91b05eafc878ff453f5392a2dc642e1f8bf7792ea2393233814e23e65f4eecd39e8";
+      sha512 = "e70fb05087078c86576b0959f9fe5f5e2041c50e48e1badc7de8f3a7e9759f1904980c2a8093cfbf3c78c98b901a82f44d21785cc2a140b28d9a57b42c50aae2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ia/firefox-63.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "f1a8b6d609ffebb5152f0156ee2dda7452f56321852988ccc5f0f644c96477a0bdb8bf1645f5049bc404b0ebe17627b53db7467c208b7f2c8406f7742e90a9ca";
+      sha512 = "c6b7193a25dc6b93a853166509d9dc84236862405156e70314b7e396942b1c0c500e068cc95b2336c03b29f6dfefb0600f78a4fcb0869fd56e68647540914c4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/id/firefox-63.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "8b90571b48108e99021594d517e07cbbc897c96a84dbb8547c29a674f875fa7cdf01432af3a8133a524fe43640b7d6e6b6603627789b01b6cdcda0e3dc6be431";
+      sha512 = "7e16fce94693c50a7a64328124c8e0c5ca2e78176d6a1a54a7d8b8b3fb72ac1d7cf3876b81060b2bd52b94a39d591967667d6c8569bcab49db6b63312d7f0116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/is/firefox-63.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "85f59ccc1812b98df3a7ade05998e997180ff5e1fff189dcc08a6ce65d5f020d3fa1a364e36d363d92bdd9cbd8c30af38a159b304c100f65fae619371ea817c9";
+      sha512 = "3cc4edd3189c7abeb0d0aed8a12e38b412952ab5938ac7ceb3f970a46bc53a26f9713a8c77515f3c1985e66a064dfc1ccd9079c09c62d311c9d229272235f089";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/it/firefox-63.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "c6ad61d891ea8d26a18da6d53d60216ad51fb236a4e011d99dccb06fbc79cbe983310c406dc9aedd1cb6b9c15212bafdc3db23f4b63a05343509cef1f5e309a4";
+      sha512 = "31ef0998c6ccfe9b71670aa729a1f6717420a25932544d040a87c34872e4e4d1752837c8671add9472c9ca0a49413395df954605a7a1ee27216781998783f0a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ja/firefox-63.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0b802cbeba1f5ea66818f3eb4738e43f0c448bf7a33d02a656a1c5116b218c5e7ee915f788d8de19e9599a544ac335b2a2dd3734ceb1bf927517f55a331a9ff0";
+      sha512 = "be6c98019416b61280850c8bfb91ae346c4981aad4ea96d029ae39816b9889fd732e00b3cef78597884d1ac28ad92c6e9c06687b113bc3091ddb1fce28a39c27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ka/firefox-63.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "2b71658317f90bbb6beda188cb347e2ff413476e429709da08b094eb60363b658f3eb84dc58d96ccb2f16c9d7a692bbc0f282d28020dfe6de3ffdf554636f437";
+      sha512 = "40348f8077db44bc70a6f7b349d37558023951d8e37e622ae2ee08de74725d15615cbc875c9a44119f2ff8acac91d5d19c61b450fb342d2b29216aa00e0f6ad0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kab/firefox-63.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "129ff0155fea5269dc0d655633d6b807aef97a626e338b4d6a0accac675b0c7cda99a95a5989990ccc69cfd9137f4c2f907b833f650f4b789c7beb707a634f18";
+      sha512 = "d432bda358eff82b6121869565ee67d054091980ee3d63e4528b9fad44964e420e004310679c008af31fea0fb0a4e6098a0ea9048eed20a35634d5ccc9ac51c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kk/firefox-63.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8cf6ec86d8c60fac299eaacc9f046beb497205f1414334980e0d6ef2576a043f731df5610c3ad918b5fce0993410ea5125efdb769300387ec0ee6fc5c5beab9a";
+      sha512 = "676935d56cc2256e76584a8d1a07a7fc8b741c9b0276bf114a10b8c9b42138b7038026a1e70abb086e45c1fca0daa36e7358cc45dfe42b1baf6f312c68dabd40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/km/firefox-63.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "2b5a8415796d16a386de7c82201449c2929b7f75e96ca84b5adc25bb52ed27e76fd5f510d6cba14b04be26866d17b0cad026bf9dfbe49094cae2fbed984873a6";
+      sha512 = "f45fcba2dc07f1d6b7763f63e778ddd5925c3b3095acb8c223768579d96a7b97cbabe562f650d683f53256e27c180a1bc27e64411c97edcd85403a1fb6cf0f42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kn/firefox-63.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2d6f3384708ac2275c5b372d33daa0e80b6b253d69e80e0f2ff755bac99dd8eb2dea9585e3aaf20c2efd6528f020089b0a29a1eb8fc9719958edec806557232b";
+      sha512 = "5b564c901032cd6c1cf20adb8ad24aa76d8bf6f7aa50e2cf5d1d502beb274368814e039eaba920b2124912ee643e8bccce0c7f9d29732d14bdee8bb4e5043288";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ko/firefox-63.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "dcbfc97a8f6f5292e519995becb41065c561395b7cd24f76b6717e8c920c910a5456ba382e079641988de82871b7c4545cc1d9b044157222db780cdfeefd9949";
+      sha512 = "34e68a78a3d990e875f1dfbd48b5089ec70f37e1e4993e9aca10c10d221fa80fa625ef8e54e8c6319bcb97b55d9c503e54b2337672df89fce32061f01e4fa811";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lij/firefox-63.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fddd4b5a341405ce2d7598768d53a51c37c54c6486286569d4ad06965f27b4c7249d769507b586f5c880ea994e67b0e51a2bca9746c54501939c4717dbbdcd80";
+      sha512 = "97b06fd1f703c11487de6948691802e234e5261afea85b104e41232805b0e737cd38f3d540090a78e3f5609306d938b66d5ec1fc0a96750e60e37066325475cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lt/firefox-63.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e6a11b4709c0578aea57330e43f9e7f15d7c1c9401a2fa04d909e373be7a6c80123f05ede39a9e72a33c8824b211e42483a96a9620de419b7748080cc9a7e998";
+      sha512 = "8b1d8eabcf0c2cd23e16e2fd70487e47421bac59b3e77605ab914483085db06862d62608c9361d499d3d2a271a8a07ebd7afd070eba025dfc31d2c0c2cf8b0ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lv/firefox-63.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f1c6e3422d6cbba13d9ad137523f06be5efbaefc60490f67456d5a604c4e9083a172c3299ab1d41efdd76884ebc1fafaed6a083493c00abe81888a23b2dc0c87";
+      sha512 = "06aeb27ddfd4aaf8a8cdb9747ac8b741c764e2198649a96fb64e195679ab727731cd7b08901308883dfc4c37d1f5c3fc047469c3ae31101f68d802ccc171c349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mai/firefox-63.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "5e7368d6a098f90c6b550e0700342c1e036f69c7d2a28edef7511ac88601b5befae37f2fd279c22e383050ec5fe0f5109f22309af34914c98e120144f94a0345";
+      sha512 = "3c7da7c05e55361aebe4b4e960cbf55e337f6e9c4f78401b6320f7fd009deba552ed9b2e849893c29f3cb592d81eb3fbdc6ee671d37c1a8ee7297c13e538804b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mk/firefox-63.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4294fbcd18dc778ac641cb29c64d242570c018eeac33bf21445dbea4f9abcdbb31a384ab2a73817be265f6cbb6e509b86b9fd132b7cdf09258cee191821d1796";
+      sha512 = "4e9c2799d3b83c316c1a53bcc233ccd10b34b8d042a394d651d5c23a3bb574c8bec6b34833e5f19e3ea8c11f2067ba1f6546ceafe8ed225c24b0c8ba0a308f15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ml/firefox-63.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "050f90fdb97edde5a75b798af02a10f7fc5bda28a07bf5f0b883c5039d855cabff160b0fb7411726c5852584f96ca4135878ba7ea8c3298de2fb3af85b7e99a4";
+      sha512 = "8e55fd98653fc601a90304b8bd5a7c4f74f67517a8e23cb369c77db7969d004dc3d44295f14da124427237665a7e09dd497b031275188ac48c2d031b656a0946";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mr/firefox-63.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "a005fa90f6d301d1dad2175d58bd9de698f061226a6776dd5da82195eba19b004252b02fb464f004b6aaeb13232e8d80d511bec3cf955911f087ee40cfcc0015";
+      sha512 = "8f171a5c29c5389521ac9402d4b81f81fcbf7e890d73aee5d861af78e786cdf1e2178805fa4c83fb1d7ab7b280cab235059034e53c26dc6ef58dbf792b878bf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ms/firefox-63.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "4ddf2b483f24b16a08b293a3c76049e62fb7326d3da7287bf0493eb838220cac3ba5a81473a0278c72a5c5e5391edb17304c0140e81c43c1b943b9135ada3b9f";
+      sha512 = "9bb879a050c279c1db871cfb9a72126dc12c1c7d00d713cff078961a501fa219420d0997958d333af98e2b815ac623b58c39cf7137c54f5c141751839ef27b9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/my/firefox-63.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "23f2c208eca6472879e47a5bf3c4fbe04a2feaac0d220cdcd1985001665f65e8992a97998630e65cde02c6c87dee34fa10bb78b99beb5c8968c99b410b226a68";
+      sha512 = "04bf73bfbf801eaee7e9619d63c9c1ecbfff78f4c987d27b4271fb8517ed6147345a02d0a6cfb24edb9ccf2af75230d1c929dd8cff5683969be048983fb91320";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nb-NO/firefox-63.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "22461cd2fae62819fe9a44a1b947d63ccea61d5b5ccfbc949644518d3c65c242e91770a10405fbcde24b2f6eef794b3014e9b6396eb6a945c904e762792e2634";
+      sha512 = "0e4e8c6b93ae01c8625a805a4e179b36283fb52a69f48dd2a8bf46e692d8d9a335e7992f27b5842026c0770ebe2a6c9382a529cfce45ba839b9c2b4a53db592f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ne-NP/firefox-63.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "b499cb8cc7d5486d368b381ac6c0416861846568fe6b8cf83dd2105427d87fe12a648da5b36c42a4a22b64db48c9016828c14f61d4c6ccfce347095ac275deb5";
+      sha512 = "80c01828c94b96fb9703ed60c9e2031a161b078e3ed857e199997dbd757af351159472b901f22b726602fa52a716b608d07c72f1abd1ff94639991d649d6e4fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nl/firefox-63.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "3107acdb8fcbba9629c0e3ba940de4df42d7b2d57328ae3b2b67cfba280ae2f97499d248c1c909630e795fe1f8b8c096a60e273dee3ba1bacecac8244612ecaa";
+      sha512 = "a36f86e0a33b83478b8d47e0fb8d29c88178068f9d0658ee95a3ef9fbb139266e702576fbb4eea90471850628a12d88c6aa088424ea7d3cf8ad47d429c610448";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nn-NO/firefox-63.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "bb5f4ee13acbed4dabf349fe8373a6dd36df5980c6ce4c4d8a2f59cc2a7e53c0da33370ecdb394c80e3e0738d9330690664e4702776a3d5faccd6fb041fcebc2";
+      sha512 = "6adc52d6c3c4516ced33003841dd1b3dc223e3baa3164af5b874cdabd0456281b0d5510313f380298c51e820b0f9dea6684a3119c1447600f3a0a44fb5121cfa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/oc/firefox-63.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "fb0ae7f6c96a5c3dab3c8b205532cf0963f58bdb6b5be335af6e04c583101d7e0769ebbe7af5a25eb8c8e0e52d29762660d1325bfb36f52ff118c3443b9c503a";
+      sha512 = "f1daa77cae526e536b03c038491c86343eca0b4d67858ca039879990e11ec05354aa888704c131784e47bc488ed79990fd7ef8c4cf1d1396e26d7875e377f44d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/or/firefox-63.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "3a096af1920f5882a3c14623855a62bb21812a342ce8202dab99937c95bf2bb25ee95d6e8d8f83efb3a4a6576cbedc08fb1990f32aa2ff95e9db109b3e246a70";
+      sha512 = "8998bd0d075fb7a611aecfadceefdfb90f4da4f56bb090baeb4962b53e809ecb18a16fabc2397d9983e6f5091e86808155efb736efd64d183f4da392da57d2e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pa-IN/firefox-63.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c078b293d2ed28fc1780ef5a245650e88f64f806b6beaf593da3f34e554e77e239626699e959c681f652a14143b46b13146a7d4fa04d3e71bbb9a55c0d487e0e";
+      sha512 = "705b5cee264ca9bd766abd9c668d14531431449441977ab3d083b89082ca36c330b361bf66b3028c774e1c45abf0c16a5e63b4384697bcf39aee0029f22f1587";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pl/firefox-63.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "6c528057f326285a7b41a12f5b60f6dc0c659d8475d1766b577bf3967bb0111bdbdc43a4c5dfdee20a215d12b9768cd080d33b7fde31633f41edb9019ff87a50";
+      sha512 = "ca933047157354690d2577473e5748da44c955fa356878acc93ed58c4546d248a3ddbeeaf003fbd1eb0a706149dc775ce5175dbb3a7019ee50b12624ce462d41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pt-BR/firefox-63.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e8fc71862f83004c660168b0e955a1043384dbab038f3e959087c799088bb3307c102097f627925249a5ce3f316c102a0ccc871e313cf7efbd4d10c91b2eaea7";
+      sha512 = "3b02c299e124c0d149ec37659bd1992ec564556c416046d5a604a0dc88426b9a94a1608acdd169fd484904db9b1bec1d5743c4dd66325354d1fb99891ce7e276";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pt-PT/firefox-63.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "6c7881edfe14ad6cce5241e4de562e137f44abf23bec6c49e801c1fce5f1c417f88939a97f4484c37061063f7b13d64eab55777c6852634d3bcfb69954ca3837";
+      sha512 = "e15b3a44c5068a6447f239de67505d913942721ab088c2e66c15f4a6cea587a71f66dc09414dbce656775cf0b0ddd61c706ce8c5fddd3e51c889878fb3d8bf93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/rm/firefox-63.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "1516fe15becfeccdc63f3014fa1e776662777f303e66f1d7aa48a39905eeab20dd646832bbdbd1e3b61275f02dd338255e0e6db6b0fddb159d480be4c89dc1e8";
+      sha512 = "5e0ea213d65acc7ccc2e98a462848479dbf07585c45fa04bb3472d233feff4cf4d09cc00a938d17446e9bdb06ff3198c3d06feac8a50ea590243ba2bc090bc9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ro/firefox-63.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ac6e751c4d2be30c6e918ccc1562a8aefd0e02ac672e2bd3a3f6b9bd2c153ecb172674aeb6ac9607210250e6b9058e007626bd541c4c164316c77d98e7e77c8f";
+      sha512 = "686a0d4386e87eb3616e08107b12488d88e75381ebc15add947dc11010c7d114810322c4c6127446562d611b88d2af5d022fba9882fe1ac75b12c152fe4df7f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ru/firefox-63.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "92a7cec3b0e4783cf2bd66a2afc0db069b9e26b0359bf376abc36db8c461b68690a789c06275d7cf3407802e961bbe6d6779497a158872f3676419cbcb1fa864";
+      sha512 = "fc1df633debdaecd9fc15eae1f8378d211465c6a966f28c2debca1d8a885d80bfbb86cf4aca63b64b1f1e1f18796cccb28ccb181029566d7b5058e1f8482bd76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/si/firefox-63.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d0cbce1d70714e8c4b5d61caf7f6e02b1caf43530b3a8d5db775bf164b74c273ab458262502cfcd6f0aa4a77a69b0fa3c6ec7bf9d3485c7ab447b07d8e534a28";
+      sha512 = "4356c6b3029139e3cddc558da4dc33572bb631afec9fbd4f1efcf7b396c3e97311dee480eeef3943f6e8bb34d385522dcc0c245358b795ba76bf0a780fa24647";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sk/firefox-63.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "89033347ffc61f42d9dd9a2b50a24623f7e8b96e58b8f6baffb9f751e3b6b64041ebf4080fa7fe872f72e65982e860b04004b42b5c51aeeffef4129a3a593c8f";
+      sha512 = "26a1475f7c88a466d7a766fc0abd34ecefa4697cf76e020d2a6e539edbbe871e6a6d8cfdd7b2af9b27d4687a88b1398141be86932222ba5af33a615abc7d2d3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sl/firefox-63.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ee4ddbedb3c5b0b7c11d277f84028c867b17bf7a1559b276340312415105c80aaac8ce468cfaf99368d55ab4b9171e0555b5ff6949bce306ef72dd029464d479";
+      sha512 = "1f9bb83fcee2498792bdedfba32bfe98486712c835de0bf8f54a6359b494806d6cd5a620b76641125cb874d5c21a961b95bdd5c8157af45792c52b43e820b653";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/son/firefox-63.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "19a7e802542421b3147c2c0acf379d5bb8fe444b1dbf3ea41eac08065e11bbaf4467fd2bf0eec2fbcbcdeb8a24677b665035bc6c7e892bc762b5f8e01f9b9cf3";
+      sha512 = "c3ec8a80faed707884916321d8759363d2cd875dce4ce695470ba9774a68e88fbfd4d4684046cea82e1a82c2a7713664b76366d7c60f191a6250f2c92f7a2089";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sq/firefox-63.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32baacb624f9060d34b76d8aece1c52bb4dcef3d99f01d5160878666bb0b7a79501fbbcac8db57a2be1f8bcb243f323b52510934dfed36a96efcf0a23664619d";
+      sha512 = "86c4c25da77cb911e1e0f32d6ae8ffafb560286b85ae83d17ba7c68e166a3588df81cfb72fdef72d6652f06d41f0504bee0b8be7a4754628b315390141069928";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sr/firefox-63.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "307d847f3a8fa5dbf8ef3bf8fd4750b508fd0e01694d1b7312919335247274323806f70e7863a1cc66fd368192c8b7d3df53f5c0993fb7defa2723f50eb59ee2";
+      sha512 = "efc696c6f835a5d442b344edf4fa5ec248e4fc4e6ede9ce62c56a0dfd0b43e7d582f3c34be5b5350e121e63e86997025ef10b11815fddf2f9ed195ae0ff21c19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sv-SE/firefox-63.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e7c257a6bfdf9d946174a274ff41fbb2043978f4263e78a7c4af67f030b70ac9fe3ff0944d71b002478c9fdf033ea4a252400819e425dcd707adb40d249a2df1";
+      sha512 = "34e33ae363753573b3b7acc2fd40742b0dba1e2420106c090cc6e30ebde955de2dd225580b1f459476a0a48037167cbd5de38573324f5d823047fe5e54efe605";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ta/firefox-63.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a47b5ba62065cfe25fb0bb650c46fe1b7f92b1c87ef99e9cec15cc9d46b7cd7eb33c74065a9becbc0555604020f7a3e61588e29f920c8a926fe90991260c4cc0";
+      sha512 = "eb65d00bb195f438f30c94849fff3fcfe29e4f2e76875df54fab641226777f101c988074e62a69d0587ddfd541e5825c190939116b6c7e7df2e00eae6154fa6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/te/firefox-63.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0e54ec5597f42d4e6b04841bb0bced5e6129c966ae917912d3b91dc0314fef006a1929af6a04b126564713ee2a810a4bb9c1957803519ff7a64a9a05512b737a";
+      sha512 = "16ffcce555b6ca78a658cc58edf0889cd08461734e0eca829585145d370103724eeb6b8d0cc5459b6bf93717eb96b9133e366d14a1b31aa88858f079230c79ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/th/firefox-63.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "c8ab7bdb4b1a95f08620a2788ce00c3c4c054826026966a2fb6407035e26fcdb685337dbd5187235683e7ea08234d685540f541b6a1c52f3e9f2a1fb5d2a7db5";
+      sha512 = "7009b5cee1c307e4065d6b92665fdf02172df641eb44305fde1f9c7e28fd8c914ce723748e9ee17f2168e09196f64800eac84111b2d1c7f874137c38077492bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/tr/firefox-63.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "35a4b18c459898b470a35ecbdcfe863ea66755de4f51842f2a368300e542eedcf92914d9630b9bb32c2c0381406b3656ec1860d9eaafb2d2ca1f7e315593b17a";
+      sha512 = "eedd061d2205f0d0ee07f42cc6009397dbb06e9efe488af1b4848473665ae51a05339f978386dbe8edc06d8cddd3c7e3ff04441c3ae28c4d7466ed6ee89dcb0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/uk/firefox-63.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "854153f02ac9500858aa9da1f153b231ff71e372e2c9d2ad87282ac0fe981d959103847a5688be87b01b2c3032e486ecc39fc76d3e495c395c2cb88240b5d32f";
+      sha512 = "3f2e3ad63802fbf679bcb34295203d891fe3dd1eced062b02b02e5b144c8e00d13bf85e024bcd590658591c75c95dc95d02f6cfd210e246ff47cf09282278c87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ur/firefox-63.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "0434852668d46ae5a85e9a1ec6a4db9ccb801b4d870b28e500690be33171b1596c7004f23ba643d88183edd524a6d558f0f105b65d1356147648003a0b6b9355";
+      sha512 = "c8d40978c1658e7b8178708a932a5b4c98d13e355c5dd7b21057e4167f96ffb4ba3588b3ba4091fc53699545240eca4b4e383f2a7369cee2b310c3bce380b50e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/uz/firefox-63.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "51e106c354bf253319107ee772619139413b4ef569ef3c97abc0fd26a5cc1c0eeada6a2924c3838f320fab51225e05e7ec170d61151baf018f9ad39f3de83f5a";
+      sha512 = "5c604d63c1dd6379e2d195d4208171b4dbcaa7fd168e5bb8a8233e802a6374371ada27f5f49d64109f53e28af01fd2895b64a93e8efc6077321b30c6630d0d0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/vi/firefox-63.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "bd3d7a34c737e2b165de9bd893932e117d993c1ac396f7161221aa84c25e8f7bc5e528c0de710da46324bc05c18762994107b08291dec49e5d8fba58b4c10dd9";
+      sha512 = "01f8c5f4adcb64201009b36664be0cdd101155d5cdebffa7f4a160c824e8b19d7463164515d962638e308a511e18cd8fe88b16a4972f15216db429de55484d32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/xh/firefox-63.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "3c339ca6230783dfec8df3b14709af1a849986fdcc05546447d698f84e3e8d1b006e0885ef90321cab8d44dfb0222e6ebf936d1f3934bd8b487ad941699392e3";
+      sha512 = "ba0930610cf94b516800fcfe7112abf261e922824060c4493935fae1f8af184c74368c5c47172f08b08bf201cb74ce4b29ec419a7776bcdc64e4bae8774f87b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/zh-CN/firefox-63.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "8c699af29bdcf3955c4570dbff4f3449b033360892cf8c1b86bb00fe6bbb778f6a80293627ddd0fdda8198e2f8cc89649e66f3f37bb0d2cc9a2730210ac0506b";
+      sha512 = "eed5edb2b728110456dd142f19ff3cd4e3426916aa638071e0654f0fb4b6011129aacf4d667ad82bc7252d5a0fef426e0052eb31e2fab2575dbeb8a3fb5f589b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/zh-TW/firefox-63.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "93ab2022e6fd50266e201352e37a158d2eb65c00ed76cbba5940d852af182e401a6ed85aff4b7e50ac62a461afe21654526b158787fef15f9ba4c71cae91a8a1";
+      sha512 = "03ee54fb3258d796f6ee28be53af092e7ab2caf924a2d4cccd9b1419edb7e9e59a2c15e6bdebe255b30c2237b9d8cb2576de32504a588550a05e55cc3ff45c3a";
     }
     ];
 }

From c7a789100feca90877cf0e2c971d852e7fe5ef58 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 16 Sep 2018 11:09:42 +0800
Subject: [PATCH 1093/3253] firefox-beta-bin: 62.0b20 -> 63.0b6

---
 .../browsers/firefox-bin/beta_sources.nix     | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index f3a8ca6f289c..813217b3031d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0b20";
+  version = "63.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ach/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ach/firefox-63.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "bcc42abc76f41f5fe32a1bf1e824be451d15686c05adfb58b85df6eeff39e29aac3aa18878023469e85bcd8e9d4f55cea9cd96d7b40a5b6918ec2fa572e32b7c";
+      sha512 = "3f968c3b3256b13b73046c6efc9db7cc8faeafb449a3c0e5d49516f6dbb3023165e2f8133651240ba1a008de80496a83fd02dd1add24a99720e767b73cff7cc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/af/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/af/firefox-63.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "f371acf6a9435d6c673768270be5a950ac369cb04e91b77f8422feb77cb09e65731c6842e933aa5012402a69bfa4c01373419caf029e133408105b71d218a3f9";
+      sha512 = "aa2044214846e0b8f808bc2a0f5e45999eb7f2c766fa91dd8dc8d035efcc1974fb6160a2cf6b29401908f01fb785cb4b2c25b326e54924df8c70c31f39e26d57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/an/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/an/firefox-63.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "79fa43b710bb99cb94ed463b845d7eaa993a2d35b27eecafac0e387f5781b77415375fb3d19256d3097f314d0891020ac929877635d3f26ab3fd808bd105cf1e";
+      sha512 = "f4232c87630882cdf7d6e26a983099ecd250b7dcb1d7e1c0bf5ec037aff4f839a056150453e3116bab464c802e39337351fe5827b5e1518e867a95f2645ca5db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ar/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ar/firefox-63.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "66b40adacfa9e36e61d9f4f77fb85db08cbce2eb162201fd65db48bee54c38f4749c7375d893727796c8954a71004e4f163fde8a3f701dec712d271f808c40fc";
+      sha512 = "cc2ca97918be68556ece0f6676355307a14a994b951b40030c55a4ad3663e3f6f2fd37afcd8796dd16e0b63ad0382c0853c10ac9adf42de631d4983cdd4573b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/as/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/as/firefox-63.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "090f4b517d242f67b43bdce75e586cfd0eb58abb076cccae9c5cffc74d14b04ba06018764bb7696f2b43049ff8311f3a6b6d7207d3ac0f3432904f4ecf39e96a";
+      sha512 = "be3ea0d52a469cda394241c9e030af634f7356053d0cef40da63d527a9a72921ec503897d9b91d15f010fbe10a9be54e4f7efe7e5f77f607c6614d045ff68bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ast/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ast/firefox-63.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "309b5feeffbe980b06bd04b4a6db6f4677d131c7ccdd138cb8d43eebfec61b423e30d5f7d5776827f973f6c7fd995f091263839e811e1496b7d4def2f97ea922";
+      sha512 = "57825a7e5213159d845673474f64980e89887e24d368a104653b835dcd296bd72593902d6a4589b5e0ed543663600c4021480ad0d13368bd185ff9cf6304af6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/az/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/az/firefox-63.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "6b64a0346ce7a5854c878317a34dd91c044456f823fc5e55e8dcfea55663600a2bd1c9471f01732426397674303919125f69ef0d61d77fddcaca0d462cd8e084";
+      sha512 = "e22a7aed19b698f4fb84a2bdbc4fd8500c6b828cb329c473e1fa1e60396af5cf70c53fd80e62cd2d406a19260cfc3d48ba64e81be98f559335b2a08fef61729f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/be/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/be/firefox-63.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9553685556a1def24354972fafe785ca9ad180b0cda48a928b39a47011fae41660a4d046f6a38c11c148ac2b6a883c1f8a56d6aa4b6ada75365df2b985cbe473";
+      sha512 = "995836ead5595e7a70b1bab9a25ab05e6f12955a25effe751018892936ae2deb27b34a630aa68d7352189c76fc6c9b6a52f48df9e01ca2a26dec71beba5de07d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bg/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bg/firefox-63.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "531e0f09ba97828a039f796b6166753a9e35ee902258b9318fb91838b956d92de6d0f86168f2945eb2ed6352307f60bcfb81740dbe3e3ebd0988c9a8fa59ff18";
+      sha512 = "840770bf166118616309aaf4742efb1d1cbd3159ea8e9589c64293a3918285d55088c65999e6b3e50aa190c69b46009d35497cba8d17da1c41f88d7b8c0795dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-BD/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bn-BD/firefox-63.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "545525b698e0bd93f6036b92e3723a452e8083cfb0cf7462c8c077ddcbc0210d25ab53d3b41b67dcc1dbaa14d1923fd0b56b3097b98bf84164ca367f1c07413a";
+      sha512 = "6b5ece3dd9af3b9c4d6e47bd271669656648fec4d4c2ebd546dd19566819ea19890516517dd2b9ab897f2c678eb6c2c968d2f5ba3849a7aacb9ca0607f927caa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bn-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bn-IN/firefox-63.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "95ceade2812bd3ffc084167280d4154331fe5239f167f79b9c29a43646c2c9f5c7a4e22cf6d814985dd01e8d60661007c66ebec27bae9e19a85895ae9610f9dc";
+      sha512 = "70cf764e62ab0bb069f0715da4275972353462afcf0cf87f0af42aebcdd4a8ff573852fbc466f4b78bed4fe3222491377cac36050502d59dca4be5e4857895f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/br/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/br/firefox-63.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "15153f5e0222d3d0bd716e7595e2d5ad7b84595bd14971153ca809fd62955c55ef99b01b8687e32e3e3ba65b030f4e93beae90938efeda3b5bdedc9a2a012c1c";
+      sha512 = "fec6876647936a2d21c96fd668f0100cec88f56ead11c6e2f261b226b162d9f8992cd130d95b4b1c2b38a51f13b3fe0a9b0f72f9acb8408936548f756754c6c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/bs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bs/firefox-63.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "6f7b1f882ae6b9d95fccee972962e98c9c722194bb08c466071333cbcf5ff56b149c07daf1d6abf808fe0e07e22af78a915c94268fa356412c88a9f35fe5364b";
+      sha512 = "7c79c0fcc079718bd0a39ce88b5989e47c925602709f698aab47951eedea4d74b63966f2f1d436407ffd7e71fc14e37c6629dba90b69b6e9b33fc1a4a3a7dd67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ca/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ca/firefox-63.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "dfc0cfb8f95421e8b60b91716a68c6a5db1c0630c298c2b76c80b3a24308d852e056e552530b034f9889b87c72e581590ad018ef0b0657baf14895f383a594ef";
+      sha512 = "2134ddeda70d0319da8d61c8c79ece5deb179e2f3b34e4c28b2f99ac3181f03cc0c66bd46cf7965d98e2cbfae29a4247ea51256c7966e7b887d0f0fe99866b23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cak/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cak/firefox-63.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "7561a94f9bf8edd5693c9e961aabc316056a76f19c8b3d0490f94d74ee1bd8cd0b49aecf71b48c7e90435a2ea2efd716cde53303c73a68a1a6230e51445f719a";
+      sha512 = "532a6d9e03da80202b5e667b756c6eb9a1e14f2d73577ad69edfdceaaacd9fe7f65b4eea9c78ab48e8a8182c9e4a3adae30328839c6b9480239c5b018827a801";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cs/firefox-63.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "cf2f2b8cff2951cb71454f3d0351e157606af1bb306b65f0fb8930a9257e16ed5f7704be09114bbeb37c5c92d12feec1371339b2fb126c8766aa8bc8034d07c8";
+      sha512 = "247f6a20bf116d9d6fac7d9e15517018377b47223230a5a20f887a9cc449e2831e2b09d47e9b0414c373f094097adf1b6a82a3a521a428c52d2d3ec2ee4308cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/cy/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cy/firefox-63.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "05e3f84109a47790bd88cdf248c32eddece4c95ef9c5cc46cf67b013063441106eb0b4022cfaf8501593c6c4e13f84684ae1b8f48ddd3704ea52d520d1f9a185";
+      sha512 = "6603623425d443285c883ed0939f0810c33086da37fa4df6738b4e50d72ca85c5f518b924e50f265994b615f8891c44ce4cc198da11a115956f36677ba06771b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/da/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/da/firefox-63.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "cc8dbabf299e1009b180ed8201699ebc773351e4969587df146b977da3a7a1bedadd0366e765488d2e16aa81e768c3fb0892972346d6611c29a1d6eda921e672";
+      sha512 = "56650af07f629b570a3ac2e1063afc2a3e210b76f2a46b97d7e9374f9db26129ee1bf424ec0afcab380b3dc7ed3bbc330909dee86f14f65f7e3ccfae4083553f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/de/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/de/firefox-63.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a69c1786b2b5455fece6d49ae0a8408cbb448c4b6c3f394401c2eee20a5f7d80db09d982ac50e4893877d876123586b1e1cf844e72495d5b1a5ed2349300adbd";
+      sha512 = "7477ea68091928b2f96f6980363046e2a7843b9fbbc79072dda9019acd76325a41d9dfcaa4febe60178316ac0551ce7a2c787799b49a4081d5947a128f675b62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/dsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/dsb/firefox-63.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b464c71a4dddb8fd864f1a4c7ab2ed6e870e0cbbf3213255965f3534b2b776d7da03e997d78c9f4e794da7201c92f0e9f85bf5b5631131a2355224452112ab0a";
+      sha512 = "c996ff2925c3ce57b25603f90ed67e4fefd2942546eb399c6ff40209fc62315379da827966f4a6a7489b8930e31fe437bd12fb18f4a178ae959ef4edba015a9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/el/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/el/firefox-63.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "9578203045825c12c8efba6f3488771efb52452f3a1f57b8a3084fd0c83998f0733520f1d646b1b847ffb76cbcd4d3e184cc0fee0ca01684429396dadd09757f";
+      sha512 = "ef041be85d2613a5e831b1d1dcc6ea62cbb530275f23406f5661377a861ad2bb9d0502d785071c94e56910ec28bcfb4447e56d1083eb8ad6205d0997c32252ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-CA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-CA/firefox-63.0b6.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "d316262b3c08730782a741177224e3aa269843e1d65ba7f1487e947be73ebbd4fb88f0734bc98e840951d89ecca8ef0a62cb5b8c456e4203da1d11a8a4a1451c";
+      sha512 = "291451acfdeca62bbc29c46b446e6d21712813c0b30ad8fc1141467b6987fb29b1163fb9ccb9915bd61984c0d8d1d3afbd1f2f97f07669c132a693d78d6d6496";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-GB/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-GB/firefox-63.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "fd43c18250362b0f18140d123eec2d87578e29acb864ea1513498ec47b7696f0138424e8be33f8af2b77cefa11d7a5ba368b3fbfc85205272d9ed848ce2a9f1f";
+      sha512 = "2f961b1fd18a310c050275b5848016736f53607f6838d79cb0fbd1f5ac83fda78385293116c21036adf7a4742277fde38d3cdc5aac338779bf72ea990fdb8b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-US/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-US/firefox-63.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f5c6b847ea22bed95aec68a6e4316e0217fab7a4d7426d4b6b57ec0f7f4a6fb3b07e9aa330ce41f0a2c24d500425696bd475583c849556a6011b2b9169581f29";
+      sha512 = "54e169bd171baa0345300691b993052a0d03e2701d7da2ac1df8f6c21c7f30be613d36cc1c4ff07449aebb01152048ec8b55d5fcdb9655efdac53721a1d70b3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/en-ZA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-ZA/firefox-63.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5bed0853937d3777307f2a432e8b05f7fd919ee0f781fd88381e6cb81c43711c2c12b9fe05d85c22eeb70b217710ea3d44e1f599e447c2212209135f796eccdf";
+      sha512 = "6530dc0f3e38a95ce13b31d9426c501a8f807bee75587b25b58448dee3793065eaeba745a4abfa7b4c23a0c92f482f5bf99e39f5d4fca3fde105d90040464d0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eo/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/eo/firefox-63.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "3881270a0874ca0094b27361cdf228e50c01c326f931062a54b5ff774e0c88e36b3df7087f11faa3f7f6add2d4156d385fbf30be4ce30f73102b47e280b3f006";
+      sha512 = "e900cc039eedab4159bdd645d71cb2279db5e667edbb2e614347aff8a484a54800a8476f0461fee4699286195d3271e6cedd6f42bcd2ee1d59106f6fbe15f68f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-AR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-AR/firefox-63.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "44191518ade9f6c7c5f72296886d90b2c649d59a0f64ce7e7b23896f858b95ca12f3d1c91e4dfabe94bfe1dfb91dbeaac536cb121d7e497efc77f1316c323385";
+      sha512 = "fca6d57b7fab0ffdab609ae5950f632192f5de314e3406dd8608194f105b95df5c2fc7f32c014eb0b1adeceeb6a53b46473e5d8d82a3e5c6e4b56efe06a40a5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-CL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-CL/firefox-63.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "628e49819bb7e98f685412ed024e980a7934c1dcd3968709b8a1f23f449c493a0c8a0edd646f80e131d49d0b22e87a93c6671f892684e677e77207085cc84b79";
+      sha512 = "eb27a2ec8d18b00541343b7034f99235cd51b3fbabfbb298147e6a1eab22df337debe03504a567d68f62c99e39dc70277a12c48f0df6a26bc7fae9f37cdd8908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-ES/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-ES/firefox-63.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ca0edb153550ffa62cb56686bca81970a6e15ed0f982db35f82e69068e1c28452f69ea09df674aa26171e05832dfe39b47d48d0b25205b689455b282b679c6bc";
+      sha512 = "a7ad1f6e8c5c97eb628354f9b436547c4f817857f6d1f89867642fb1d256bf517f871043f4554ca98a780f37cf111502f59b4a290a3e1e5f202e4d5fcfcccdc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/es-MX/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-MX/firefox-63.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "28c26551beb43276c8bcab443e88d52921a6861796bf2c0fe5519bc2e26cb6fdd28e3be54575e300a53186e96238749c61394aeb7a71f6c196ea6e4f51cb73de";
+      sha512 = "1373fbf3c9c9a442e2253de8d800bfcb019c39e9832f5a551376784c33756eb63c3431419995861b67bc056355dd42c51e2df116b8ffff885019baa44f9facbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/et/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/et/firefox-63.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "f26a59f6b75d1b85da6e13d02a206a41754e7e8214b41240839f0852b3fb4d38aa75a22556239262ec5551f551582ee7a374121dc57ef32fbb466a089e8bf98c";
+      sha512 = "0a12e0e00a89203e83cd03a6b72e2fd013a54fc2da678d1fc6cd9e78a0c1a66fd0ec6cbad60ed0d6eed3beda4d29ed19d9fc3c111c01810a7a06cbd595f2bc2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/eu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/eu/firefox-63.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "60ea439cb2d5ec6dad00e6ea597d5ca78e0f56001703e4f4e8099f695b5e557ff945cd83e48356fd7e78c7a054030d0f23fd85ebc15fd72030e32db1d78b7b5c";
+      sha512 = "c2075cce028a676ad078f6b1f0d050abad6e90c23724126a93033e6f3991b787e11f6604308674c89426d1e914506ade2f58eed541bbe066de662cf59aa97aa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fa/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fa/firefox-63.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "7d0454ecb645438b79137acfba79d8d03cc9d44a3a70edcbf72b628f430b83d5eaaf7bf6d5a5f04f2f592cf6750dfd7667a39907a29de398a926e40b2a36b31b";
+      sha512 = "725b78dff3bb95d1c9c598c3da97febc92e639c193a48901991024def3faa21de6edccafe16428971aed904793d03e6e0cfdbae5b610d46ab34bc536c074d8d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ff/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ff/firefox-63.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c1f5e4d7df8590fc18844e5bc67e28bb2d5e88c3eca8b1dc8d3103d49f333ce9dfca7bdee432e190d01688ce7b8c58fb1a2a3fea0cc71e5a007d11e411611d53";
+      sha512 = "69fbacd0723315f008999e698cf2209eff9d49a3be29c4e7589c90a4143f6359c37bd5586f2b79d96fcb780600c8df82562ad7e680f33538eab7c808b59069e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fi/firefox-63.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "a848315e5f0b259e6770fff8e275f29946a0daa8f432135ae2d7d94ebaaf0f7bbbae7566c87f20cca78ae0fb512c7c4434dffb322df78e568095ef3b166f7f37";
+      sha512 = "6c5df02349a9ecd18e79e63b8e84fcd2fd3854a13ff310600317841d7e50f70289c735f1421bff1b47badfe413443c0e1fe27308c46e27958ad7769ddf3e355b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fr/firefox-63.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1a65ba7d442436ef0a8de3c7ea18b765eb933c59a211652a4a472f10e73db987aa2888a9e0b33f69586c6152da5213f1ea1d9a0bf6919a3a5a4b0a352f35e421";
+      sha512 = "277606330ac880656490698b8baa34cfa3f1a1b69ab8f57e65cdbfc5ef545233ac5301d1c396cdd4211058d0ed33157110a14ab745a0295e0bf154167a26b4b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/fy-NL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fy-NL/firefox-63.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "0871b3adc369c1125e3b4532122610de49a9a4a8a309eed73e4b76a86e4c0f25510c6ab5b37e87090e68d6d72c07519f1044403fea7144c84b6e003294f86e64";
+      sha512 = "a3433a63fbde753129168a667c17e35364fd599f627bfead913431ee37a04d3576f8ac37171807fea13acd724a5c2f8206426f310c27ce85ae74d98ec5dcb631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ga-IE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ga-IE/firefox-63.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c99aa21fe8e3f835047c3d9caa167401f7b692ba4be1b7c43a4b22d61eeac1a2e2e5a8ad2567730f310ebff73dbd5cbcf1032a13ff454477a80b30421e1b4abc";
+      sha512 = "c83ed532b1fba3c839a63c8e61d51273930dcfded6d531cff645b57a520415cbfb3b088d4e6659ba330bd3911d77a10b6110d44887c53ec64ad47d93d2e2ded8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gd/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gd/firefox-63.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "8906f71ad07f89647eb43940da7ffcaf97d10845d7ff0a9a89e60601004aba148a5f49d8343190f9b559741213cfbfd840d17e68c3b67a61183647b8caa7d6ab";
+      sha512 = "c88d8b536510936e80e175b634f4b9d95da104e905dbebff2283b30dce89724882bbca6e3d7edbbeb5280f6e3ada52860a810b587d35da1f4b1aab05dddf5f24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gl/firefox-63.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "8865ea0724ea9359e07f59ce65c0a9953710ef963a440ca86e0fb2bd612b0129c86436f1c53b803ae0eb87ea4a710cd49f8fce9ba128dfa36b2af703c274bf33";
+      sha512 = "f2fec677989c93e49318e590c935a39fa958cd153f89b3308b1970cff62b97cf59a85e462f4a753bd913bc3e2c79d9d4c2095858b3941532200fb1846a4b3ebe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gn/firefox-63.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "dd9e201889a78f8c779aab5da5112c11bb57fcc2e1294bfb078c90ce7f4b81010fe014d5af3ad4a3ae9ae3af7260c1d33a19f5c9282577e5ac562e4493102fd4";
+      sha512 = "4b3b6bccb78a0ed37ecfcdea8e9fda81a13d1af65c2880981b999c87360b627c05508e1b694c54a70c87c779b41c61e45378a6c5ddc7eb989106589c59cc37b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/gu-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gu-IN/firefox-63.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "53a97afb17c1a64248c7c0fda8f2a412fac892b075d9b956fc92974dcb6fb2f5fc25377d215cc565d10e353b2e34554a0d4cebe73ce45780e2d5bc93a0af4451";
+      sha512 = "8704547fc74b2814c85e9cf4a4dbb5c2e52a86995b19d03625cf7a62944894557e6bbc1acb0f762b72b70792169462b8fd1dfca312f1201d78509a44ee2a5153";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/he/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/he/firefox-63.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "084ac6281fc2bae1efca509e3f1c2306640c54ae976cb747b6a8bbf6c9f5a962e9a37a3e1219df29acb8f25436782f72e2b388b4d1eac69dccbd628bd4304956";
+      sha512 = "f8d6be434dda8dc38d727792772d51d1ac6b2bb6ddf56cd73e186b917da62d2e42ae6988acfab2bc08e8d371eb5ab2dfedc4a73df10c4f1f6718a8390b217cf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hi-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hi-IN/firefox-63.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "05d91b4e6b8411e9a979222d42c82b7772a39653e621339c30698fc5a41d58696614c5677cb41c20b9224d3fcb77501ac436b1681b38c104ff505b1d1ed95945";
+      sha512 = "89de36898f1c03af052f9fded0e85ddb2987a26c7e85e770f80d4b88b5545539e809af8a79e3e890c94462acbfaf25513c9395f374d3446ca9c510ff7ce2ff48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hr/firefox-63.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "6b497998cd3d038cddf0b1bb3e940da7993b95c711bcc369a0aef7f4e8b757a3c606fd5c0f109adf4f0648acd770327a5c4550338afe065ba6f85f18aecdc62c";
+      sha512 = "bde719d4f6a79e48732a4dc5ba8871020de21b28c7dd482be59a4387a3a781f7ed583124eb38e7c09afc5c902fb8393684a0cf67aff9b0ddd37d0dd9a002a768";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hsb/firefox-63.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6a06093a377b8ec417edb4183bd19707971d35bd1792ba83cbf7ed801f4ab050f7859f4e47278d39340c25b15ca2506594ab70210d62905f45a764e28adf81d2";
+      sha512 = "90d585288c5c1e3678eb6b074d5bd52abe2b97cc90d6f70a4023655a94e86e287e0109fdd57fc6ae4c3d6a650380e8934a6421fa9f0eb9ecd764cba1d4bac061";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hu/firefox-63.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "2fb808e6938b525e5c5af4fdbc4da7a4191ad8bb5f488d50245662427e4295898a7495b4e94066ea04e4f68a4fca8b09b621b5503d4e51949dcfd682f7bce1b6";
+      sha512 = "427bca6aae653f53d9ea52b8f2cf93d060c005afb48f3311e139e6361786f40b1a29ee2c4f0d3b7942f40d9c356d4a8cf3bcebbd4c83c1ad4e1d07ecfc5bf101";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/hy-AM/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hy-AM/firefox-63.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b17e2ae6e42676ee01016f2e90d73d4e43968224669b1a9c63aef86ebab479bf7d10ba29d6102e38db7317ad4befa3d66eff472905a9372aaa7b1519e2c71189";
+      sha512 = "8f5bdb8a2bfc4ada26520cb30969403b20a653cefdf1c0163e2616aab77342e51bbc2dc0c5cded0298c906c38cde3fd27cd95e3b36c7ae489db90464310a6d7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ia/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ia/firefox-63.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "8cbf136b34e180efc01d2dd21bbec2a5802ed0fe3cfe742a3f4760668cb165bfbba009eef26944a186b1ca8b3bd7b2a4d467eb0665be8a5ea0bf7e57bf9c97c0";
+      sha512 = "009d4366ac357911c50b445cf4f99888592631976d0f8b323504105934309bbddb37dba70bfb2068c579ac05cdda329d23580d26a630cc1c6f7bc9335e2f9efb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/id/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/id/firefox-63.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ef9a54d8895242d75b6f0346df227ae3b819a85de4a4c6fd658533fb2e5f32a465374a80e70ab0614c9e833cefebefe44413767ce0295982c062633dda81b466";
+      sha512 = "4b85a054ba11a68ce137d96881f86d983357e170e9011f5017f39a7c2dee20850c039f90aa6460728c01e5e04e966e4be6c3a1e048091bfbc0cffd9e50b7a0df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/is/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/is/firefox-63.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ec2e9056cecc69516637d8a8d5da90a199dd4f287f85af19dd6fd8cb4d29cd85802b5c578c44a9fb1aae8f7f3e742ca071a2f09354b41e113f64dcbdf78cd82f";
+      sha512 = "1bb92b42b6da82e59243ebeed7a0b219ce370ff3f6e52aa50748cb24dd6213b8ad1893e7320e2f6b591a19beb8fbac3d89cdc0eea84c18c55eb971385dffd272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/it/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/it/firefox-63.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "1e70e9bfdd3b9346fb8815b1457ae89466c97b22150afd32d60a92c2c51e72ec7e151780398399d4d3a410a3e7d0871b6107018e8ed629476bb6fa23e2cb0c61";
+      sha512 = "6738e3d55ada6f4ce88081f1c4ff20feb4643165d92619e169d0777fabee4adb2fe0b3b69cde8bff542c0cf3c64ed81d8ec7a4bed2e68c6f3810678569b38e06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ja/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ja/firefox-63.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "83e5d827c447081e073daf51a1c842c42a86ed984dc0961548b04b4353e1384b6bf6dd75f60b0058a31281b51401441bc79c0d0acbac9407af6fd6fb62b08752";
+      sha512 = "be234bf275fe385b52c07d2a900d510161272fa8adb8f6da53e66afcd104310a5216b741205b376c07f1cba630d79d1019b7e7937533f9dc6db7785dad88055e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ka/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ka/firefox-63.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "036c2a3ce2342ec50c3c2227f49c4708785ca4b7afaa9324d2708b1653ff09cf97b08be9c7e8ec5cf9713badb0db9ac3b2b1f36fd5e941cc5cff8c8ec9a72f4c";
+      sha512 = "2b5e93931150cf683f5b895117a76f7c1a456f19b256bb94e2816adcde6980c22938849e9224260d7a4365b9eb7caa4f0b4093d93509cc783d19fabbfee197f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kab/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kab/firefox-63.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "fced42ab596fa0eed255e895a115fc117acaeed0c32204c9625ad37fba62b64f9199a97bd0794d5d91c432776abbf533cac651ab6156c5e7d1d34998ed97d760";
+      sha512 = "09ad7eb4ba151af744e38f36dd8533b0d616ac3d085bf88cd379809007e9d36fb0769d2970b889d066839fbdc79a25f476fcc30fbdb4a7ce14c1030300ac2b78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kk/firefox-63.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "89c23113f22f4a16977c91bd5728514b31bdc5ef8c75c7946caba06c7db64a7c1dcbbaea194addccc203365b91d284066f5a68be585873a1d05aad176cd9f3db";
+      sha512 = "dde0e6f296aa4687825db6a507619be2154962c881d0d9d115e3c286f936d94cbce115eec4192f97d1700910c9d8db11bf1a3d11f222c20b3db16ad66c696275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/km/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/km/firefox-63.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "2b97795dd8ca4ce7d934df392c6863ae7a1824b63e8c8a97ea923d0b7324a1feb42c39cf259b83302240e7ab2f0fc84ec65aa5b72ef36ff98e9316a85eeb348c";
+      sha512 = "36f78430639c4b8ec80dcf305d59dfd35892f9fbf0a8ed0d2672a48060118784a076277c6dcff76081496bd70228d4688586e4e65a42f421008954d02b703648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/kn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kn/firefox-63.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "b53454c825088debd764988e3217052039ebb516b1e9df4a06d411d4b69270303a8617fc83eddfd48064dd35f9712369f5cef2e12e4c01e35da20aaa9f53ab5e";
+      sha512 = "34e993088835a9af6074a74b36ac3d078a44846177e7f46b544afb177af099baee422a4a0c222abe5199756e24294baa501891994243b9366d4312f43344b268";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ko/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ko/firefox-63.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5f40c6f0cab40af75c473e4579510847ffc69b1364af264ab90c9cab97872d685dd62d57839ded440dd34fc6b431c668fdb927d9a58c76f2540239c490bbf465";
+      sha512 = "3eb5c66e38eacc85ddd3eeba8f4fa74effa732960d940982622f6b9b45321a642867267d9ab09ecf4c13ca2dff8a0e3de5ca722f3240b89ab54590c144f0e1cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lij/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lij/firefox-63.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "772d20d98fe64cae50ac856e2a0d085cc823cd90e8d4824ba51106d473ee3eb530cc49e8e77960ab5585439b9d82bb809ff1c899b3984274525d0cf0f07c6769";
+      sha512 = "27f758c0fbc6ed07e4aab87c3b6ae30faf2b8f0d818f430d3d3ef75369f4488172af8b29c38eaac3b8169814252fcd08917da03c60ea6ec71bb752905760f5b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lt/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lt/firefox-63.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "62c55ce5dfbfb14124b24e7462b18e61a7a4e6b5afb2d5da3c79ea9069b3875cbf71c2d9d28f499630ab4c1603bdb0d71a90d30c39beee17c70f4de5931324df";
+      sha512 = "4697addfb6069fbaa63c8e94ccf83adcb06c43e3a066e32de37fb64c946f199612c415b0a97d7dba2d4a6c570100d40b7834725b98ca8e388a23ddc78598b74b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/lv/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lv/firefox-63.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d01e28e410b7325b2710c04127666fd69e047ff78046b518d3000271a89d9536ece6ec365248bd3a925e13078ba0b750b469a082b7273bbb02356c3318c46c6d";
+      sha512 = "4c6ef5eaa81ed5d656daf545ee25753f7c9f12c562b9325cff73b07e0bd4dcc9b467a7c0930812f825a2aa409ab10d629fb139591766564c8bd59548dc671181";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mai/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mai/firefox-63.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "501a76a99b28dd3d33c1023c95dd1203f321e9ea82a789f56c27fb63ac2b0dc1c4a758535b81cd38fa2a6f9234f5a854899c5c9af70b6afe0db0011d1ed144f6";
+      sha512 = "0de6f387a3a3779caf526f6b7c8b1b9a284b333f93314a54e737d908633e78e3456e53013558325fadc981665092d356aec379e9366f9b64c5dd3888cebc089d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mk/firefox-63.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "734804d2b15cdb34bfb1e3e51d3b4475d0b23ddcb0bc7e5de536c6098e9f5c2debcc53bcaf9ac76bfe49522ceb345c44d45721d4440b3763054c2e0e195ce68b";
+      sha512 = "be5ccd3fdaf9c530bdc2b6ee0348ac52a3a73093479e3e18a78b4bb2f784dc2ff050d8e7216c64561d835d0f7a6d930419ebe06cd841a5f8ead6289d99533247";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ml/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ml/firefox-63.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "97eaeb4382199859ee8c8d5f92322bc30eac9aecbea4a00fdebb63ec93172be9225d7269b99d7284edb93bd2b98ed6542cda6e5d65b45f97044c1a117cba53ab";
+      sha512 = "fd06844bad011b8cff7bfaf6ebd4042c95ace65a24fc693e53f1cee432e5a76e1234016be242c811aa0f0ec211faf0d8e36b0833ebf738dbf78419edb6b67af0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/mr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mr/firefox-63.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "1d1677c48b3d829673fb5140891d1b52ac9b9f075b2348c527c5e364d0a3fcb6eb5cae2c0fb255a834e7d94bcb7af03b928151ad397a1fec13d629a2cf37d44a";
+      sha512 = "f934e0346d75a9a3d0fdb15254748afec3060e576f965fb89e67481eca3c6a1380543a107b6d16659e8dab654dbb6b2549883dfb8150d600bdf315de199d17cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ms/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ms/firefox-63.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "70524b569d00964c9773560996972a6f96079e749389849ae6615a90f55ebe458d0d857a1ea7df89b51d39b5cd8e0bfd65bec6b98ba5500419c8e17e269713fa";
+      sha512 = "59975b62484b3cd539832beb1ff243bce8e1148549ecbb3d1b75b9d3dbc7cd18ded9499065770702246fe0ef08612b4cebd1017e3a8fd4ccb849c7174d97bbb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/my/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/my/firefox-63.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "19fb98e2f9622ee33d828df12b2f2ed035abc7c66b8d8c4cc5bcb5d985ebc0a7a42d5d793b102e247da395d8257f9070f3896531e507d50c21575b3287792f80";
+      sha512 = "36bf346bbdf5f984fcac96dadb4de9ff62bddddad48df21a6aacc9fea50244775a8cfe7d1fc90a79ad12b37d2c18c486b6971b82e80256ef297f32d7dede8944";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nb-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nb-NO/firefox-63.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "a5073203319b7e778975c86dda8930fc5f7676b1cd124d461ae0d01d9fd7290a8a87f2303bdb2ceac78eb562955b06eaa86a4111098a241513023cd005cc450c";
+      sha512 = "fc09ea41cd2941f55686de2ce2b0b53d84c59f7f62652899ebdf673d6b87f3b678bc5155c0feb17832e0a32de1fe20574f6e9d32eaf03d468adfdb11ae1051e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ne-NP/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ne-NP/firefox-63.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "432b527c41424d34b61bc9ea3c691349397efbf26fd5b9ff85b1e1701d768be7f5f61f621d1f920a696579f5e4d0dacc0e3f91642e2c24b725cb0be16e0f4283";
+      sha512 = "b48a729b9619bb8294430d45c217fce674c5f179b238cae9a08745ff101630929bdfba71815b31109d2cadfa9f727d39a9318b80b07afcaae50ab607b8d5ad85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nl/firefox-63.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "27bf6e9aa084cf7ff041c0d4d9e380f9becf909309317bfc2fb8f99af81a849975575f8e12c83b4abcf0b1706987f29ad313b352f5bee7a73d76b3c8ce5eb95c";
+      sha512 = "c32c199d135c5de225be18bc336414534a973602b477dd0424ee3fb780035c240a3bebea937612c5a746dd240cbf03e1597ee98401ed0bf0a4f60c15c781d842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/nn-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nn-NO/firefox-63.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "62a187309f01f6d0d7c2b89ae77fac381d14d91ebc864990f897ffdc45d068a7d51a5af3371e4319c0719dbf126f25ee4445a8cf30badf02c89a8a756c44f83f";
+      sha512 = "6fc57dc47794e3c086fca47352bfd7030f7a9678c2e0f1999fda58b0b5a29a8a7feefaee480ab1c1ce1eb21d4fc1ac5f77f221ff0de56bc436b2db96816d67d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/oc/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/oc/firefox-63.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "a5d2fa30167f19b9a7d6f05ddc2e374cbf9918da0eb2d12a121c442f48106ac369133d42bf9ad4de83379c315d0e4ee4820365d43191563da07e3908937bee01";
+      sha512 = "ea37736ffdfd9d774aa32a9cf15082e6c4f14cbb241aadd7d79303642eab35f50ef5dcd8a1701992789da9dd32a6c5f87f655c6ad0c045d7f96f2cb1c431c8fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/or/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/or/firefox-63.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "9aa6f12da9a63cd135b7196fcd579b2115a6a3d0fd7dbcd3896d5c76caa021f64e5622ccc298bada1bbf1eeb78dd5905efc79e779c4e46ce96acda18b0f54576";
+      sha512 = "c1c294e73a891ab0401f8c8d5c18279f62084f80969440bba27907919d2e3357c931571ecbba40570653da382edb5038e0418a8a400189b6d880e7ca03d02f26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pa-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pa-IN/firefox-63.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c90b483004ea2ebd3da65f4b8832990894cd20230aba256ce01b38148378831a7950ad9366ce420d961a72c4bca682bbb5f9ceb027021cb7527530d7260a7e75";
+      sha512 = "0aef8c71dea8366860afa57cb5176fc5f9f6ef4be55c1c84402b518588fde181fa6b3be99862180ac52264582360563247afaa2fb107344c9c4848c4714b6252";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pl/firefox-63.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "35b67fe4b6a526256e0c7b0669a99409064dc7e2f8a1e7d46cf71751b6c2074207a592e8fe263ec3634601a793f56d76b09de8233b94fa410ea391d72db5174f";
+      sha512 = "14ba80c2f2d7cce10784475895930e4fe0d22c0dd8029b931ecf22bcc84435172ab0184346a73fb7b1c8079fb1c0b6dff782d49396a3fb3e933eeb3cb7c3c5fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-BR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pt-BR/firefox-63.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ef30ece766447105ac86da1e324c7a9818ebf7c0a5ea93a31f20ee0e22e3663593824be9db040f02f424cdb6e9ff4e4bb121a57505b0019a0d7579a12ef7fc0b";
+      sha512 = "9f148aa1983aa68cc820b0982cbb23ab9d15023a5abdff346b6d279255ed9b9ed5a5aa1893df223a75d2cb405066d81020e9539b7f51a84f6e4b24ea50b712eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/pt-PT/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pt-PT/firefox-63.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "b6a571f6c019522d49824554881684f38fdd5df7c518daa35950fdfb7f481ab8ac03d90ce89909e4c6a9112c8b965ce321ece7e317d176394f700c4e0d24adc2";
+      sha512 = "0d4414e33d482990c34e96ddd04469c529d5141748995a3e8ab977733f11c79b91b94f0da5e648e00e269ee3fea173619589a63c62b4121fba407474be98fd33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/rm/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/rm/firefox-63.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d72c24d58c415f02b85b9312709050cdbd975f0febae57e39db118d88741c5691f82412e6607cf8c440295ef2c55805512d60a05013ba3020afb4c6723c9419b";
+      sha512 = "2550d2444e497ee35daded5c4f5d5ed552754356cb612fc6f6d062b1a078f634fdf56f181b2aa27fa1899af23aaacad37aa82d87a089f3773cb89d7696306bf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ro/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ro/firefox-63.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e881440fceaabe3bac8b038e3bd4569019c1f85a27586f4b4e16a7b2d2f55f47f520b317ab5e1df238ad41529f00b004b65b104ffdd4ca6055cb07e2de439801";
+      sha512 = "83196bb1f7549925b4ee97403c295db75006a240016d9965dd68439a3bf2cbc81d6e3e7c9fdbbfef0b314f3f6856b04769472712ed6a1d77e03caabd493c685e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ru/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ru/firefox-63.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "777d3c168580d3686f9b58fa6ce83b3941c3fcfd17eaa84ec31193192019c76345ffa2b416d081e974f050c14d485eaa5862245bb4464c239290c27bf9cf8299";
+      sha512 = "c0040be66b906b57b91144f369e56c819f7a58f1440e1dce4ffa1108aeca76c83f40adde4db57d7ffea84025086912494a7d6075de7d82045879143e39d08fef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/si/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/si/firefox-63.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "aee6dc0e73a06f3aa2cc7ede2890cee4a72d3711510eef89420cc6cdc09380e30706ca3706b14823fa7c7b53d57f7257aa5f5692bf49834178322015b828a969";
+      sha512 = "689ecdc02747f9ef09209b9ef2a46d3e68114fdbb26bf8c5ce7e0ec1647b8bc726b0a1cbd8089dd18109f0fe7454ac4f5dc0e0fa952ba47a25c475387ed89c9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sk/firefox-63.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6063a5ef564f2cc7b54f89002a67a2e8488a6b62051a61e545c43ea123c95d3a51fde6eef2165a983266423af421d1c915bcb5a80c63aa4bd16a27eb59c27245";
+      sha512 = "9fd5c81b2d5c5f2a3f3ecec159c36b51a0a16735c8fa53e957a49c361fe5c88cffd72616bbb6e3a5b31f99f0e038fc8f8f43261d657aed43734e3ca7d2bfeede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sl/firefox-63.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "76fe24bb152e4d89e9d4a4409bee5c2555e42ef2dc49beae13cf9f26b4ab5c3ac2d7d8bea9d1d257f2a7ac4e68e520f9e7c00529aef46dfc7436cc9de0b6eedf";
+      sha512 = "195c5214f66ddccc8ae943680664ec75d403c6c0fa4c5f8dbb019423723fd75df17804033d566c7072b4903ee5ab8ff04a1b10486d9b00f17511482dd73f67ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/son/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/son/firefox-63.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "f641b6ac0915678b88e18d8a4d4ba49f9a303252024ffbc21641ca5c337c8d3d4317aefc889e9ee9c647fe51a10c3755146d1b859955efcce2ea2d2f5e9e4a11";
+      sha512 = "9fa5ef38aef6812945eaccde0ca19d73aa4f5b06fda6229813f1b3f4718ce90461fba0f67c888bcad93a531223aa335d6f61e28f9887af2c2cf85d45e7c7ba9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sq/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sq/firefox-63.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "773904cae848afc33b0b88fa835db0e0ccb62476ae71628cf5edc1190b70edfb2e91fa6583ea473c6632b8809f485e34bc55a5a86f61380cdba5ea4e99880ce0";
+      sha512 = "82e136a3e4dccb9b604d5bbe853d4c4a4f78c2a5477d765e9df8aa7135648f925bddc79805bb72833df4d563139748baf45bd2ba72e11acc9cbc660d59714e38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sr/firefox-63.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "dbc995e9a6c690d66e6cecea3012ba6c0825124bcd1f49073ad0c70e740c7bcf7b07a565360a881fa31d13988dc88a7e2038e13f229894d532ba44d0f7f36f82";
+      sha512 = "4d915a9a2a81cb9e9936eb75424a546de1a2375c0d36530fae192f02038cb4afcba3ad4ac017eb4c4637def51bf8f2ea3b49f6d4739bc6a4b2599975310e9360";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/sv-SE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sv-SE/firefox-63.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "94664f3b8a5090c71d7bf5d66534567af5e88aaefb1b96bfe68398c1726dfd3d139f1b106f1fe743d480c857828bba7877c0d77d3b1a582e9f39762e2f2600e3";
+      sha512 = "b03ad21046c2b5bef78bcced78166147fa93ec5f10cc0e48cee403c9e42f2e61c5276d734dc9175ecd7eebc1be1cf6254638c0eeac00f463cf36f849bbff455b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ta/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ta/firefox-63.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "05f938e3f3d380e991ea61b774c0afa60681cd90e193dcf3ba99c2d8f783c265f6094b0a3f088639ab2b060b07a9d1f90396b65cd9bfa2480dcd366f3f05a2b0";
+      sha512 = "85858ba5ef0b5c3e89c855740f6147a71307dc891570e4c99d6db49e9a25d37598b2975863a308d0ded578626dc0752a947db933f50afc550786fe66d9858fad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/te/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/te/firefox-63.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "48aab49101dceacc974792ba8b355bacd40569a6571c9e7fedb72574b09b019ae3e78fb8ffaf1f7809f121e7cad7ff581b5555847bfa8067cd7441f131d9b973";
+      sha512 = "271f53dc27eae9af525a2bada8496e2d3a7237856062e125e9ef3e188c79cb04171a2bbb6648a58a545cecbf220e14b7464b78c7f378f74a26448bf4e76a3c55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/th/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/th/firefox-63.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "1d6dac041ffabef622b1e71b1473a8acade169f567e98906795c14146f8ec800ae4ec5e5a4ef06a800dbc18a41400dbea6892a9a0cfc902d9d7348a201ae3548";
+      sha512 = "cd63b180020238cb720f5dc8d439a97b879fb7a4ce3d3e0569ba2216109c8244de6c2d31ac1d4b631ba44ba36b7b0ea63e484a344447ab11bb4f1cb09c95a289";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/tr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/tr/firefox-63.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "0f6e4854a5f6a9540d78e14090b4204bca5de037fa15077bc6417bc422f6f7cac6f0655b61f9062be6545515a1eb38a54ef5e7d0fe347426424b48686d6928bc";
+      sha512 = "58e2a575f1564965eb69409548ae66356995ac7e6f4fa1c30368b86bdd9b16e9c24d581f287ddb7987d9b12418a6bbb06630d3c886b4807407085be57285b150";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/uk/firefox-63.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2288d8d209a6392646f10f0fdd2229b281eca6ed9e830ef4102127b74f9f314b9f3d67f03d68aea57c8c99814e46c87a2c27c6d1ce5b31e43e427ade1ea7535c";
+      sha512 = "34a666d4932a5812f2142e7cae3b88e5b7f247d46aba0f719def7f71efc287f495f2bbe2a769b1b8d5894e84a1ae3ea5571ff6d893cd94d57d72bb29b731ca2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/ur/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ur/firefox-63.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "a1cdd10df63e2306a0907686de28066c7c5c6241dc594350eea456a9684a288be20bb1625aa7017e320d3f5bdc961d8f0945220126448c54ee57699e67f5aac0";
+      sha512 = "2aff092fd5fd768c8d85186e4ea5a8717eab40aea9b02f662e495c73a71b26a5cf3636408d64f8ed6cf92a9ac60467b5b8a0361ca359a4e5a5961b1e2df77528";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/uz/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/uz/firefox-63.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "70905785d613426e585ef75989f90d4ead06f267e49a668c986df0bca93ca5bc409cd1f62d1b4b23de0659c18155075e05aca5122fd2ca7d22c748f94b34dfc7";
+      sha512 = "7265652e77785516a81e60f13b0c8629382815fe3cad0c3f506ae237f1725756b4d3b5b4c645a50fbbc4f31bc4601f338ee01d9ad53b4663fe94734c595bf218";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/vi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/vi/firefox-63.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "9ff2e67f2be33356054615abe599acb7d192f6fa7525ff20307818c7cef25cef649ef7f26c231d75afcb7e0babdbf4df9ed4f56d5b749a884a0eb17335bc1919";
+      sha512 = "7af8e33d2539f1ef7139def4939a73d041169ed9f96beafa999fd464ab736562f399151bdf0f144ac5cc564d627d1af7d7cf74e242c1afa36a174e993c83e2b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/xh/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/xh/firefox-63.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "39b0d603092198f6b06fb0fceb9de7f5787bcb24d3f8129888b00ad5b22e171c396c679a945dae43e8088a662ef2abb2aa94c2cba0bd1037a7f4f5dd3ca2df1b";
+      sha512 = "c27af26c046c2bda79af486e3e9adf5d2bb26a88092c3853bb798ef057298b10e29867ca15246c4b6f492bd255ccbd87a8a039934fa74a0e59b09186e70b8dd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-CN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/zh-CN/firefox-63.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f0ae1486ea7155521095dbb2ed764365cd01bca16e7a9520810950699e3a6d0b191488c929a2b9980783976b90e0df7c5999f1df8b67b8f851e133fb93dc600d";
+      sha512 = "6344d2270fad58127b10139f0557f03215e3a0e91acdfbc0a40bf5ce642b88519008787629bc398968f2778b2d58ce23cfdfd22735ec419358bc04395a4d28cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-x86_64/zh-TW/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/zh-TW/firefox-63.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "7d970407678c320e731de0a4f00438ad7faad0dbc375e0eb12c3956a543279ef379b8f1e009b3f866680ee2122f6383da232f2bd1bf06ababed3ba04e453d065";
+      sha512 = "e589bb6b8878bcc4470403e3d2df103405a7980b6bf3dd19e13ae28a231755f91eed8cecb09a1946a645804f026bd3b04ea1b3acc1416231cdcc2148abbb9531";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ach/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ach/firefox-63.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "04da51cb7580a716ce70f46ed48b6332342a7c54548280d2c2a82bcac01534bf6ec638bf6090f61794b78fc3a1445dec98fbb420103f2b942314d9aa3db85263";
+      sha512 = "eab5ee28b0c03725c403556567f9f4d7d280b8e46355af6efcd58358d5623d0edb69bac5d230be34b0abd5c23815ac686539e8bac53682838de5ccef46d1215f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/af/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/af/firefox-63.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "1acf9dfca2cb878c4fc3ee1ca56a87daac9248a42295d0d0ae11e829768dc4dec8655fcaf4c0843fc916e58927a417b9ccca4ee8886ac5238c37cfdebf8d4608";
+      sha512 = "b728cd2536a9c319bcbe995c782890a810687de604babceccde6c54f4c5989c249e7565a732ca07e51d09aabcc89280793b3624d438aaf888d0117bf0954fb92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/an/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/an/firefox-63.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "81897f7babf614ce6951f402104bd829e770fe88f6f64335181fc4283e73c6c01c45d4078b70a933525a20d8ab1f4c3b3b23eb9fad5304f0b35513e43b79d15a";
+      sha512 = "a4c4501dea36758eea77183bcb18e6f070f776abf120052d1b85fe01a5f7ba46bf901e7064c97dd1d7ede451946c4b26005fa5302f01cb804511512c6a41dff4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ar/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ar/firefox-63.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "67beeb695048bb70f2e613a4d08e00d2d5ea5d7748e6c8606ac7ead43a9d2f870e72c3ca1dbbc3c7244068ec29a916354ead91391d3cc77b1bee5184c25bd75b";
+      sha512 = "9bce6e99cffba96eeed14f3add5bfd27a1665ea396a94e16cd21bf253b711f2c5d4bdadbb08416bb361c3fc69f065d10267d91e23916c110066b6380a9b4a873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/as/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/as/firefox-63.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "6d39b86898ea8169d47f801058874a07a32c2da59d59c0f101fa020b4c118be720fc221cfb59fbe124aa278edd49c828142616b714be0053b1d74beb8dd88b33";
+      sha512 = "3708b422b68680a661a0d919478bed981b8eb7e3f9173e2b14cab5b2a15cccb4421d7ff4f2b14ebcd2e8d695898a1add8bd9616d6db80fcb6a4021d06425780c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ast/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ast/firefox-63.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "552d79448ad366770d1f759793f1f792265d1630ecadd87a011eae75f2a17243a1636ddf483afc10e1a59874f1466e8a9bcce5b2b8e31f2ec72be831c9e2d7b5";
+      sha512 = "bf2091ee05da54d03eee37ee21ded86cdef173582310a6508d9277928a95878aaf7bcf1aa5bd68e2d2ca9ad1e65d47724f0fd78d5d919e31e4378b676204c6f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/az/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/az/firefox-63.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "16eaf530b848b2291fe2ee03489b9414d538693024ee12be223dfca2980ef3536d560b698ff8f99744bf6101138fd1303ffd42002d2272b2dc5fbc5f97dd4138";
+      sha512 = "d45f1667a8cff1b8714a95f79b012467adb6bcc7c095ef4aff0fd54a2025b0a1fbd834ad2e262faff609cab0c300b41d8cbbd11307751f5373f3460e7c4e70fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/be/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/be/firefox-63.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "47565829a3f5859fe1e640263d4c46e2584666fd5e388c4e831b6411c5af0fadbf4e69c14c730ff2adeb14d732ad71031a2f903e86a1c0ebc26eee3126739ae5";
+      sha512 = "f663fa9a6a3f4d23e792a0bf36bc6fae8abef7c7f0b3d13907ca319fe1d64a22fad391e61b77a1abf35e19f8a5171330419f51d5313ae8b698c1693c3bff7b57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bg/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bg/firefox-63.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "5ba29e660effe660301e9c9f009e3c88c12aca3b79553f8480dc01f99f5858cd838fa9a7fbd0105070f5186a10476719c753514f0005957fe774d845e182801a";
+      sha512 = "4da474498d551006f141471730e5bc2df1eefc53b5272c5857a6f2d020593aa3ed76a1fcd3c2d18765bda3dd3d0937377684da83174b5fc703816cef14abb05d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-BD/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bn-BD/firefox-63.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "ad81b92e79e754b1d88a2292643699d6b66c34259ba66f460017cdfd4739326ef97610ab2be3168d0db88cbd1885a2161f708e2c1b889e5b5f1680ab2ff4a1b8";
+      sha512 = "d9c59c5d6da1e2ff3d487726e469483eacad2ee6b25e1185b4033cc485e86a5092e6085f7d5343e996b6ddd77cc97d3a4a503361d472ef138897d2125eea17a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bn-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bn-IN/firefox-63.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "960b40181a3f4a31844a7b1d63b2211c296b1337d4c072f259e80a368fc5b6554808683eac530068e0b0a155f72292d6a4ebb717d3693e367142841fe325a827";
+      sha512 = "1b39194c16f6717e212f8c51b8ea97bc4f250cda22976218a03ef1447e38df56c2095593de0914d8d2f67bb980a2a407c74809a6600dd5c079b6c4943c19f346";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/br/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/br/firefox-63.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "4e1fb7c0155bf06af57abf0dcd10989199063030378ef6864ff5f4cb7410fa1af780c038dabdf3ff6fee5a26aa27592dfb01911e353dd300faae04a8782e4408";
+      sha512 = "840837c47fad73aa7391262f00a1c50479d3fb43d047dea8d02e198dab863cc49e9a512e632197e0330c293d30b345de764f266e67aea0cbf675e8256bda626d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/bs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bs/firefox-63.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "7af74277d78647ff61ad05aaafd1d9cec295f63198bebab083c5bd8817f3c00de6f5ff49d7548fe8b6d2d7e06663255864e6bd6852ee769c465577217366d074";
+      sha512 = "e551e302b24f053efe05ce2b5eb22dd5c3c67b39a5270d3cf802eeb6412e2b8fdb71813817b3761a4d6f028bfac5a17252e7d64752b94e7aae3389744d21c3a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ca/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ca/firefox-63.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "fa050db4fea78126bab3c2ec2db4514f826a22a98e2986c8a779c933641bbb722b223e76b6d7b533cc43f5186a8c978af34603ae4ba1987ee1fe383004079232";
+      sha512 = "1aee350896ce766299a75719fd7c1eaf14b62d2ebd7260efef09a6c2a0dbfaf41884577fb5b387a4001599d64d48b6b2cd9405a47d6627b02ab2f801cee5c3d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cak/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cak/firefox-63.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c69d394ef30975c4e546978dc9e64266236727bc1703c5224e721b12476d73e1455197380dca29e4d71b741116a29ecd441423422d398004cade9b009deecb7d";
+      sha512 = "e46d2e799ce00f4c6c24f5a90a0b723b3dc51b00965667c1cf036976be8ee55680a67a8a63e964ec721582d12ac84ca72aa19cf8b8f8c7f2942529830ff9b5e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cs/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cs/firefox-63.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "b5d4a689fe6b475fc87083ef7be7a31bac3569063baa160b0c6ab8847a12807f8a1e9c3e6d0c2c3b49ba74f3b93514211c084a99b9406bee369d0bbb78678b71";
+      sha512 = "f78e1cd0f24f756e9374929c6ca2df9ab8c455c6ec5e3c1696b2ba17b187c56a6e6a16fc123b599c2deb0cbda1c8fa963a66f8217795f891cd01f8450af3cdd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/cy/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cy/firefox-63.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "baffd6932c5fef0b4e9a652ff4c892be693abecdaa0757d8ed1ebf5aaccfab34d0856a8a156db252892b8721093302a03dda65ec510837cb31713c3a803a11cc";
+      sha512 = "7d69f5ac3e2d2808d6cab53201ba554efb20e700a6d95945f96680f84fa61d9349f6bd51e8ddb5081e39044de3301ac7c0ab4fee3ec2abefafe96444e0e00d98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/da/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/da/firefox-63.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "bc4a2a7eec60f6d4ef8436538ff4067a34fa6ead9d75b4f88b24ebb6d3e7712facad4386423b3c2dcef6ae183891bc71d0e9062421fe5ce7725ff564ac042b70";
+      sha512 = "1357e1f114f800a1a0b4f6c333b3b9ef1be6ea7353cced97dab3b253d39709b330b76453cfad83952fbdddc92d4b590455a5166b1006dca8296582ebb5d8ef84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/de/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/de/firefox-63.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "470d8758e2407781308814bb581b68ef6d46bd918c2a7e2eb2cade73012c79ae01796fc2df8848ce92ffc3953d180a0d742d1da315025190d1795e450004cef5";
+      sha512 = "147e6e8e5399608f18bc5bf7f2eccf9cf44af143aff5e2d876d6f1b7880a7fc6a05b38954548e05289a586f3b8ae2272bfa802bcc3960cb24e9132039d120f8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/dsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/dsb/firefox-63.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "14f9beced9df9de025550b06a9a418e4d37b8978025068570b955ab80dc1a5a87e43f93b92e145287668082024eaef91916232ec1736070af6e415bfad9f6c56";
+      sha512 = "3a3ddf43dd388ec96494b529275b27fae940831b3180c3750dcdad3037be770c4405d586dd7aa49db709eca376272d77943261e96171ec2c413ed20cbc43f1f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/el/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/el/firefox-63.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a52072b717f8d557fee3e4536cbfa436ccc87fa9568837b58494ffa6f2b3d153ee43378ac871f99b7afe62ec6adb831805ac7e1348b2b395360b79d94042b35e";
+      sha512 = "be9e7dbf2d8b750ec002d1dd818163cfe2cca78e65dba20f055dfb0c967455768aa64e5b9d5159d6dfb4ce80fe6eaf61db8fcde4b1d1aebce250dee108bc8067";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-CA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-CA/firefox-63.0b6.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "71cadf96c97c236d0c9d4bc8886368ea5a9220f5fcd63a4e54ccea90de606391037bf87e4fb8deab4ff3043c2a0c8d641ade107f60ac5e7793ef1e85c031c525";
+      sha512 = "6606e63b836e57e2b02737070e59438a63ccdd1b633d1658fcde8d4b794a32083ccd640668abf0853cece990892197e9f2a8d2d451b082283cc87a036a3522ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-GB/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-GB/firefox-63.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0b7a55f1172239857ddc9d75a14061e7b5feb5855fe8d5e07088300f64a1e4c0c1521d1db5a8b7b05837223d1ab43ec5730d8e706953a14c9fd13ec3c73020a8";
+      sha512 = "4dd2493e7242f790a87a9dab7afb097d038e7a3bedf44ac7c63d84322b60a84118d24073e3be479792ca451c2cf3dc201ad56648e215c30e001318299ed9aee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-US/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-US/firefox-63.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "1622748e3b656c8703ebb276f7a8bef4b2f6a593590eef50bf0e9722466d49a33ea31be107e3879073dd7b2c4e7ee3e2eedfa89b3e723108ced6a34ec3007868";
+      sha512 = "505d3bcedfe2483ff46ece4bc208b120f2da0893d90d11384fe294dd360d2b49c9def89c2435484d3248b59afb4da5a25e4403a9d82c4faab68b2905740f0731";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/en-ZA/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-ZA/firefox-63.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "d5186d4172f636ecc4c39c60d32c80592deffbbcbdbe518e88eb67d3c56d8095ba440ee82af3efe138e78d3ae40b8367f5281fcf2900b913557734978f741354";
+      sha512 = "cbd5fb2b5f14f88038a15b602741e51dbf1e9b3b824871f98cfeff331a4cf5529f55f0c7401683a453b39e98aed016df404090dd3bbc7a634620985895f85401";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eo/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/eo/firefox-63.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e0686beaaeb880be30604a8a5ab0acc541df1020dc2de3757d5fe5e43a1ad6a7de603d5c137569cb42f5dd1f2845c75392cd276815512231116991a5e54f1af7";
+      sha512 = "54b045a91db22cf4f079c9ce80ed3e98987978f6cda8acdb218bf71e4d9de510b3122a773e51bd8378183623ec28609641428251410df41c3c42f49468a2d024";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-AR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-AR/firefox-63.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "5816049b91462845cbc4eed891aed168836e86ac2935bfb8d27485de30a7dacf83bd765016b528465b7aa559dda30034ef2195a98756aa5b17a25b96906b4573";
+      sha512 = "2de07b3e57fbd845b506862588381bc41b4d36afb734370fa7b9b9717d9f65bd2e42d3c85d4fc6f244e68c13583627f618b7b49ba5fb5e2d62b9d3f68479f1ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-CL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-CL/firefox-63.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "cf1b7bdb35d5bc8d30c805c98e3a0843f714cdc2f79ef8478277356032bf8eaa4c013901f46662712b4b628d62e2f6b1e9520e868f39badcb0dfa56581862699";
+      sha512 = "36de5dabfd2c212e4942a859058a34afd9678dfae19dee82437d1df8c3a794648c0b71e5262b6f2ead8ee2ab43b7d4ffe011ed3ca82c100f66a116aab81b3ac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-ES/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-ES/firefox-63.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ff873d670ce9b20b8ff63bb8727a338b3bc0818f0568675f1a3fc6bda13e8f4097d1bdcf6cbaf651ca89163c8676f9492103bab682a8f9956b43c2686a51df13";
+      sha512 = "44421cc401469730b0797dd54175677d6a663efb393ec172c98f89b18de6a64ed3ba74b960d9c13d35c0b86dbdbc4ac8721bf7e7abd6943cddb7685f4dd8cc02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/es-MX/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-MX/firefox-63.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "253c140c390c3107ce16a9c2f73c41a71e4b080eabd049a5c1f65c8fe895bd3ec669eb653c8bad55b00bd65e97108d85be18e1edd1ba7457374fdc0b9d82d616";
+      sha512 = "bb2fb4de76ed136ba9264770ee5f5c7a63e195aff2122294b55d1dad5fcfa53ad2e47ff34ef944cfbbd8b84a57df72da0b9611bf6e8ebb07b6e29803160f5adc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/et/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/et/firefox-63.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "cec92b0815fd530f3dbbf195104c6699e4d078a4a35353cfce2425050bf62811b093e4276052622eefb60d4f670fdef28919f8d83e273a27c7c9cd6b9725f064";
+      sha512 = "019d81bc4fbdfa5b86d9f92ff9594668b62228307a8f449a64be7ec696e151711cea0860bd8a7112d9aa994626fe1a96b8a70f2809c611f476e73686a4fc0f40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/eu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/eu/firefox-63.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "6cf19489fccc70da26bb2b28f8d036a402214ee785e082e2be7b065f8420fd1057e3caeacb42436955a84467228fbcf2cbc62f871fbec959a4461d9555ee4fc2";
+      sha512 = "02709783ac751e78266bf7301e9e155001256947cb5ce3cc1c8bf7debda220cb70d3a14454a73dd4bce22082999fcf8c2944ed1c1c40533366afd6a40b78b44a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fa/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fa/firefox-63.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "5d540a7f403ec92a884656279cd4e7bcf7bcca72f25246894295f2f0d7271b756b6851d68d925f1853e16be14c4f9607b2284a642f4438725384a2ed18e8def0";
+      sha512 = "8e80f8a0853450de97623cd274a6e376c342782dd9b1a2754b0b1d176084c479547b3b78241776588cb4fbfa40d2f60c8a4ed26468f075b557a343e467ca31b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ff/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ff/firefox-63.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "65b32a30ab5bbe626cbd1276eb0fe4bffb60ac5651ca6437b0887a0bcbbf5201aebc74c3a80c92baa1a56e60a6852b32fe7ec7228de99e9296deea976c6c238b";
+      sha512 = "13a46600b238bda2b7f601bebde0e41ffd8d71e47ec434e2d4cdbdb437e8cbaaf59bb36af63e83a6f99cf13e3dbc43df942e9cd29834e52425b325d399ae479c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fi/firefox-63.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "00515a094f79ef0817bc3bc392ab9d4effabd68748d0de0f6c0cb14e7996b97fa48df200e1444ccfc2810c80252ceb22b6e87037efc476dc58330f9af712bb05";
+      sha512 = "f14de9d2cb994f23f6fac5557ef5c0f64fd8833e469cc80e4c7fc4566ff0b4c4797a0f78c4e05ba7ba0a1d93e22647f50372129fdc48e33d7c25452627022035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fr/firefox-63.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2a1f2b26f3f8031e2da3778e375b889793bcd87cc2e21b3f26f16a3aa2f4043225472e9be3c8e914578a59277f7bf42c929a2f0d5475041eeebbd8d722a67c3e";
+      sha512 = "8b8f5320d1be4dc55185f013ced37103f4017c8b855d04c99982b8a3f8e3f9161696c28c798098f697bda961726e61647f16c1e71c479fdf00fca318370d89c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/fy-NL/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fy-NL/firefox-63.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "669f1c45e9382b81aac5c612fc111c9be716e662f0a87c7b0c9f536277d010203438c09ecaeba58c87cb91f979427ce389c5de9d55adab8366d36273a4926ce1";
+      sha512 = "bf6265205d7e3ebf7e3a639e1f2189eac267afa906748505d02a464657264e4c4604bbd543e9fe32831c11ebe4ae23b7767155bdb065725a258cfe34f82e5196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ga-IE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ga-IE/firefox-63.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c6977760950f0121cfc61e7d130f89965df9cb6d319389811bfc08b6acbce34eb6d644b3926f4b2fe4fcc735aad1a1be447dad8a160a85bc543d95d2db3d2b36";
+      sha512 = "f2c924148d58aabe6105562762cb9fab4fbeb8eebab89a736792fdef830fcee2dd19b41d04b58f6cd5a850883b7726deeabbcbbee45c3bce80e64fe4b05cb40f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gd/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gd/firefox-63.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "cd1d2369a9609969f52d08012bab63ff82a795438ddaeca2c17f0df69a713df209b455eba32112cd571769f0a7a8cf8f8eab718a597b5f795f05b6867e88a382";
+      sha512 = "ace52bd9f1dbe2dc52dbdd77872e523f066e032305ad1ac26e680ecebbdf78d5792dc8b30abc218a7e483feb01cc1be6dc715e8e93d19e220194438de7ca01ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gl/firefox-63.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "a0a3bce700746a50651a982ac7dfbdbaf192f10f0e443974ae088c9bcf0e2fe6eb96d3c406138bb236512bd6b1460b0e9005ed370f38520d4f618d090e58201e";
+      sha512 = "7decc69243d2c0ce0555ffdb9ed2cffc98c7716150e55d11f891e26a039b5d69c78e19151ffe9c2b61770e215c6194e44495c6360a5c5ab8bc6d045fe87e281e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gn/firefox-63.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "d609256292a297f959793c39da5d91ceab2a409abe9a560b47fa51e8856fdef2d1af2bfc6a4b2fe870f4fb8ca175c369e9ad9029df6070b7ca12205b712a6e21";
+      sha512 = "802d4a653a9ad5993a165b5bbfe181dffbc713f139c6d47c1f808633b5511c535357da14722c2e95f02cf4ca3d713537e64a3ba72e7c1e460caa83cbca6ccd62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/gu-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gu-IN/firefox-63.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c014f45aa1a46558a67d80b177f8f22a01f250b5658149c64056ffcc2f1f7953f43a0e6eb21b7c8ec5d4e7ce677f6620fd87454a7d65d145a3609e29c7b2dfc1";
+      sha512 = "8aea57f8059a9645f609e11de02fbc83b563e0edc3e84d0072571d924686429de9b1c6817c9050bef05fac4c4535a31bf108502c54bea86ce50952b6bdf11c2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/he/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/he/firefox-63.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "e65683aa8ffd57fe3563c8b7d13087fc473eaf240d1acad36a23be418cbf41a543ad4a2226df16ba65dd3bd6d309fd7cee162b60485c58ff5c4b61a1b2e25b5c";
+      sha512 = "a2eea01e4b6ebce0d9950ed550c1317a5b4a89f43ae74bc30d36d584cbcef1df8fd783f2a9465d818b32eba548d40aa6b258a9c4ac61d6d7d2b68775cda6a8f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hi-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hi-IN/firefox-63.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "2125df51d6209b702c1445935ed44de5fc13b218e44f199300bbfd1efe51fcfa5123c47063f5e465a542f34f5a8f7643ace65aac433f76a2db9ce17a4a727c70";
+      sha512 = "1798cf81a92c4fa0449c9c14e4f41e879b79cea4030f10412d95005be7c53474674c914f5b1a62f7734f60f159b92065679c90c650a6d32193e701f723308fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hr/firefox-63.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "85067ec21e29bf7a055c5a089c829412a703985e0fa699579edad4f4e01a2212d5068212b93455965f469d71b99e374aeb512cbb8f83228b5bf66e392a5c26e5";
+      sha512 = "17a64f915c2d49eb3a835d250d28d0a535c74514231eef5861de9627b4a52dcb86ef7620afea56d929c200b39885a772ded4f19c78519762c7da3e59358cd878";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hsb/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hsb/firefox-63.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5eacc1b187016d1d9202fc0755dc5eafded40552ceb34ba6391a15785a720bd13b01b5e451b5fa013d3047e572e460195236c6acd98c041c31e50b5f7ae1c0c0";
+      sha512 = "deaf0ecf6f4a871b82e6ac091e2273f5fbf9e9e7433374d2094b5a5b97e19725b12c64e57fec8113ff97501027a5b9758419daaad8cbc8685e91b0227722cb88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hu/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hu/firefox-63.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "b820778f6ede465d2047c2a8ef6e509983647fc0ce8d829ac38a269fd0c7ce9eba0c9ea6f1ff53debfe934531794e78a71c3c212a716a85c6f3cd866f832a841";
+      sha512 = "8bdbd1387f891f8dfacd6ce2ee61a34ab5938832aff4b2b21738e1e672dc8d524f4abbbe0805506bd914b0991139f603b5cf431cc4b50361e2d0dd8f371355b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/hy-AM/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hy-AM/firefox-63.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6859c52b6a7265a14feee8c41d969d79c9e347a297dae320e6fd7ed17e8d306dbb4775df49d907003ba2c506c00ce774239cf3afddaeec78bf8d4738af555fd7";
+      sha512 = "d0e252c057c8395d49c02f218ed84bf409189ce970a279eea816face6d876f7646db33ace6ae6cb1dfc7c4b5e143c89a483cbf363bfcf95f3f431f9586c1a1ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ia/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ia/firefox-63.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "20fcbce5d73e2cdc53f715876d5863725cd2645025ecc468f9b5a9c73aed58676965279834c2ac3daf9fd439fff6952ed398afb356ed210221e6c4cba0803601";
+      sha512 = "00af6fbd66080b69777f1e04c11a70f2cf6c34206e8f8b78a40342e787840575c5b15b066e2db5f1a25ad79102440e1faf2b899990751f45c3876c5663101267";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/id/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/id/firefox-63.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "b7308aec549714ddd570fc0347db65ed8692df6c9ba8a98b01f51671976232c6ab6b3deadfe952a6371b05525a49e480fa34cefae6b11a11a81e0bd8c80e8563";
+      sha512 = "289df92b4e23123976b2cacb586302d09dc8df466dc85ef835df260e1938902f3e797da052980cb3cb7e29d9a2a0c7fe602f9cec45541f0e789d3628a830cd30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/is/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/is/firefox-63.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1a4b499fa6a14f2556456a2aca27a636a5396d01f5be9ffd324228c2f7c1a63e200320e33852436187cb3a301a0992b4d4ce52d40dd3b62360bf1aaa572007b3";
+      sha512 = "444fbfa5ec27b0623f00d48ee2ef7ab0f172806f4a74322294ca165cdb72646dc6ebe96085136f94c009a82cbb98aeb1d50b2aa6df8df267f80a6317a04b8ed2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/it/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/it/firefox-63.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "86bcde5aa926466b1c49c3b0e1fe54b011816a08772582b35b7d35c091809c4db9b8d63630029949172709302e65b4a7ef50a8ef60dcc31fa97696b08d3e7b37";
+      sha512 = "bbdfb37dab9e9ece7b4f17b1e1e06b1ca24b88fc43ca9760e9ceebdf7b4778f919210d64e95ef9bdb96b8ff79236aa1d8e5c8720bbd2568f4b8fab188b0b26c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ja/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ja/firefox-63.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "af6b46c0c452f38a66333b022191a37f25d24792bef794a34a1f3f5aeb9ec88aca4f7764e4221b4f05a7148b37214e1f8121058f30ce85ec639d56132e6f85c2";
+      sha512 = "82b50fd71be229632c6bead6af45d3c90bab32206650000aa8492135f3ce56e6895ced667a3cb7a32810758680ba4cc82fa72cf57a266f5bda0c7aa3f60e98b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ka/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ka/firefox-63.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "3d7e18abd78e4525803ea45e7d47fd9157c1577179a449aa9224704a467afe4cea4b9c2c25117c05e91c8d4cdf096e5a3d9e478fe0b391695b535df74ad5dfa4";
+      sha512 = "02e25e99ed57424dd1423d234155949f460fd560e76e3063be7b1d2948878d5f68f57d965f1289f1a5e49981f6201e8ecf9777bad68c5822a818d9bf7c26f29b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kab/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kab/firefox-63.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "a8221b5079837075511af6e94a99a0bf3b30930683956ffc862966f4f3637afe11ad67ded04e98f609b885dee65c2f885daab91d4150585d0199ffc8cc5c9958";
+      sha512 = "2c1345224436e8107bbaa6dacec6ec7a6ba74f3f7e2d24ccf45e24a852202ebfb6fb3b803ffca539dc4fa1d58f7fc0aa6ed8e56647e46ff794287ac691aa93e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kk/firefox-63.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "720813df718cb5a6a6fa464950857ca262ff6784d53c85debe1e172a992efc9d46092b55bda7a13df46ac453a4c65024c9fcb78d544ac19976afcd4169600e93";
+      sha512 = "925210f2c2ad93f29472ee7588db499a4212e7141475bc96b3f7c76f893a0610a9903ddf9abc8707b7b8580ab26da896fcc869ea505fe1cc2cc6509b058f1c48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/km/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/km/firefox-63.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "1da32f65cb39f0289f3b68ed645dc6dba1604d0cdafcfbc41ee05af0d9468b49af8f0479d1391150284b0175bcdb5c0386137850afb7f026883597662f2c69d2";
+      sha512 = "94b49896be62788e8634ad41c64bcc1ada6dc4ebb9ccb98883f196f6afbcfe5b44654d7295495e6d647f55da0d5b43340d5e728fb3b8ed567b6e3f9d5c5549de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/kn/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kn/firefox-63.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "997e6a75633829c6a981f647a550a716232f72e385bb02da03e52533a719bf702db2f4d5972237611ce0c6ea320dff071094e8b10f6bcfbf4bf17613257853d3";
+      sha512 = "6284470b93ca5b934a51eff752d1abead88baa2168c985cab94023d7bf6e6b8487d682a08f4a6016273248acd664b91bde7e9f32c0108f18eb2bc800c7f766e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ko/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ko/firefox-63.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "28bac11d194b40f94ac2e951a5a96fe05d21624d72b1210669c8cf2ca094b3c017388205072b90a8bb94207f9fd9d8beee93b61ca557837ae96a4c567704083e";
+      sha512 = "3f970d147a88322d8dc2b3e0a636e8312dbdab26ef888cb0266d9f99c29ddc1310c9cf7a22308bcde967ff1b2f243a17ea1611092d58824ba7f15980ee20912d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lij/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lij/firefox-63.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c3c3a6ae74919acad82a9c796c36bcda9c25627a173897f67f9270adfe2a6b44ce2f1c3dfe7dd76e05b9bd772df2f88b40c0d6794e4b355bea1e40b83b48688a";
+      sha512 = "a774e0f3558626edc6ff244f36e5aa2c8d0743eb17734fadd577d0edf7b81875e17d1115e901f5680a798401e1da7ef10cdad093dd8dd1c5a63c9a84ec8a5dcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lt/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lt/firefox-63.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "30d70a30c0140e89696e457ea799b5575e3be75ca02954c46158aac96f8b30e94180715608535c8e8c43f09506d218e253a5713463bceb03267004c5b82a6aa8";
+      sha512 = "d3c4fce5b8b833a53dd494d3dc926d7fe2d5fc6d4a451e7597a63ce954b5e676297661baf4f5a1012003aac2909abd552efa51705ff3eee2184c7b6a4d833d7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/lv/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lv/firefox-63.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "4c089810bef9c3ef475a178d9e64c379ebb2f120f336240e8d004586ddac300050dd46671ee4f3872e0e6ce84cea09438f7035685362f8f66b3c2748194fa61a";
+      sha512 = "0ff4dc581b784ba46575a4b6a5efc90ef7fcca29eec9b077adf7556b0b500d89a5558bef211cdbb76884136bc85fdfdd4321c6cfeb93e1ff3930fd7efed88c06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mai/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mai/firefox-63.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "cfe6c4676bbf009256c3cf9e7b4533236ef48404664a27f8767a37b40046eb3f418921f9c5c4789c8db5930dfd940628e026ce1dd8ba4ca245dfdd97fd5f564b";
+      sha512 = "58d2dd9aecf1515e81262cf3319aad363f4f3c25dac1e8ba73f086feef119bb548a40b286e272ba948706a06241c6f64b3f03a677c879a3442710690bef564cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mk/firefox-63.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "bcfef6667c8e7a7fa8695483d8da79c2cee101c6001f24a10ae1d1558422d4f250ab1c1c55370daf5c913742e2655ab826e0302cc91117d134fd124c51b18a00";
+      sha512 = "179f34359c0418307e7fed73a8d34f4af6637d066398340531a896d7b804c4f78b71b192daffe50aa2b6713148fe7103e35607f4c1070def21cde891586b5fcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ml/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ml/firefox-63.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a199e177f361dacc07aebfcfa6ed5e28a07cbcafc766c7f7e86f83d42e33680d219ee79d3df3c55f0025aa3ee4ac2ef0ace1af1f83ee6ee536876aa9fa904015";
+      sha512 = "e4dc114ca2d8b7ac8d24b85464ab07ae5964122eb8be6d97303a2ff97ba503e8d29a53052e475ebd8248e5b5cc0fcd8215466ddc29274cff9d0eadf4b5cbd559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/mr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mr/firefox-63.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "795079bc0cb4ed0d6ff7e4dbffd9ffc5cda8f5045402a22e10689f88a63e0684d99d74d896317dbaa7cf2f1b3c2a4701bbfef3fec1b5bb8f1e132b7848064a00";
+      sha512 = "397833dde5956d8c6e5d010e6597366b237923345534ead8fe4dbee4d427e81122bd67ed81980a80a429d1234290fc7633e52a4a74d73766a838de90b1d7aaf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ms/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ms/firefox-63.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "919828730ee86c893563673c27cc81ff99a9831bcf20f5d12b630b89306f7bcec3395c289b39d9bc41804e45c66addf8307dc6de5777f0138f397d9cf4d01048";
+      sha512 = "840a4c4fcdcc2c250fe265e5e7e52c8963a2c9973f5d429ff0d7d4a9d6d2a94cdafb19c32848be2e894438452d34e6e2b1601a4dbd993bdf884d06fe7c102a46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/my/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/my/firefox-63.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "9d0a31384a9cf43999b4edfe0904449e5c86c5f7a55f83403f5b612a3df260a24f78d8a077f27560d9c95a83680aa58fd1f0dc43b57de1f9f9eaf5d7125f1f0b";
+      sha512 = "abcd596fbde8705b50414f64933fbecac68335227b4641341a975092646444e8f5bd32828e05083ea1e6c8499e1329051b6de954f9b80acdf2d9c60a5b946228";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nb-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nb-NO/firefox-63.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0bf6caf24367e8a86692b3bab88a740f3aeeaaaddab7c9f475daae259c6348a6b61f20b01c2d8c611aa26ed61e87fb158bae8baeddf335849ec4168531306877";
+      sha512 = "d61b9fbc5b07d66db2658c95cbffb722645a78c75737c2de1f62cd73dc757a083fdcee3b0f2d649a27ae5d1e26344c194b3e064eef668a734d694a63807e0c0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ne-NP/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ne-NP/firefox-63.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9a871db32e0ffc5126536b1de4647aac0e081126ca0c7a042188eac8ae3dc80d3912377714e42f2d5d851ccca3afa995249dbf58e9a4e2203dc228aab50f84de";
+      sha512 = "323b19eb99b09b7f302513eb8103ecf4e465b8249501a872ed811adffcfd4f8ce280c8362b1b9cd34e9d94bed22ba10d4c6735812899b482444fde984ddce1cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nl/firefox-63.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "4a5e884f833ad8d7d66050f95fbf7f856513ed6d2fa3481df3b1ad71ba78c0711412890414dd8581a080156d05ef08118fde9ef2c13717cf4af4bfb67c7312d0";
+      sha512 = "6b6ba812e19a6fa17baf0a45fe5bc5d6f21705ff78beda3a12f461b43a0e2bc26889881c0d52b66c8fb0265c762c9b763f01161eceff12cf0eef4e61b393a450";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/nn-NO/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nn-NO/firefox-63.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3f2b4e57ad161cdcf31512b0207c0c3d7ca810bf897be5d6b9fbf41f4f84898b960e61cf881f19e5ebd886bcaec95612e11aebf78d4894b6c6cb6c6c1c7651bb";
+      sha512 = "c122f8ee627d712946ef302fb9671086ab2da22056ad93d15061b47f66101c61bdf3001f0406f701787ae04f34ca713e591dbae3af830931e0f463e26708d706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/oc/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/oc/firefox-63.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "a4747101315a61f7b2f04b58ef36540adb1ec941eeee86ccdaa515f408b15b0f300f8edd3c7e81ac6845a80aeed596b0577c35d64e626f90c981002886747604";
+      sha512 = "71423e13e859fb691a874927bb522d54c3b6c196e1f107067e599df594ce99af6d9a745502190142424558407f65cce9493617f7d4c716527104e8abb6c2f13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/or/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/or/firefox-63.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "93e76f3f570bf6a053551bf24fc1dd04e13e3032271122ee159d1bc72828a932c0ba45d8dd7f80d5f0638f39d5966a836276b2655e3e33d1c141dd038fbb196f";
+      sha512 = "7c5e784430f7e43df723676ce23e49f774dbada41f957ed1b5c2f0b18897aa3c4f340eb940dde94ee79193e5c3c65bbf9071e1b7ee5cb00b248ef10da6cf5dbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pa-IN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pa-IN/firefox-63.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7fcbbd0526596f106f062cdc48ad61989074ca3357aa725df9e32254a74208f8b3604569c0ee66e1c9556fba19bc7c38958d1b779c1a2444527b92bafae0e021";
+      sha512 = "7bb3447da606501e9494d1e523da7203c7bd7cacbadfef44f3417b7a7e99fb9e6471518e9dc43f15be36c5c3e120dce1a04cec1a083c676ba212d740ca48ae43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pl/firefox-63.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d8e86a809ad774eb43a20f2aaeafd35f0dfc0710716a41338bbb0e75cc9a2bef5dc92e671d1912a902d484a77a5d0f578633d180718653ac421d0b744c3db567";
+      sha512 = "74954ec0a53b5f113604e5b778b713e189f0fc889345aef8d516261383ebc1ef9ad3086576bdc29e3052f0eb1b95f02bf66558bba6f18c5b4694cd02936a6764";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-BR/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pt-BR/firefox-63.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0b02882448b1c2c1b164ee5a8b79582e84e989aa42e03d127cde10087097db57887a31d7ffdf6960bbd29e8ab7316fad38dab61f7bca58893adac25e898f703d";
+      sha512 = "9f733d7440761f222097ee389f0b7d986ddf35c14046bf17e53dd9af1ee3dd2040c7058419032edf7beceef2735eb6d753456990d2909888a80a5adfe1cc2a88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/pt-PT/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pt-PT/firefox-63.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "82b714e304f0f358b66c2b8ec76d93aab65225c16afdeb2041e1eb6e2617e969dd7fb123158f186194a36c57a41eb9e7b25642cb60cd1ab6faa7c56f031736ee";
+      sha512 = "9929ef96a510b321515fcc1e959d832041a85c8ba2af43fa54eb676a01f0240a412bbfc49f7746e4e976791156e11bd94045eead843a9f8430d04d4c5de3d614";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/rm/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/rm/firefox-63.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "997e8d1311efce4fbe0b4ee9d76e7a9f6fb52eed6f64aa89928d62f251b38e4e7deee42312d6b06e417db7932b3990e9936f8ee2306e66d4bcc0200c747af2b7";
+      sha512 = "7aab5000205de4e266d2708fd20bb75a58ab3cda940538d2bbf6ea5a38a64cb1e3790ea8a298e5d6d2dbabb78db1e73bd7664764e10262e83f73795ebd8f7840";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ro/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ro/firefox-63.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9a658f5d770fa0192374e29b82a209895b7f684e61133d6c7f83347087d85de291f8566fa4597cede1a8f8a5bd90b491c7a87392578ade07da911ee9dc4bfc8f";
+      sha512 = "0db825ea45a80d4b50bf62ca1e0a1c04f04d325214e809763967d233b444e451ef6a3bbfe772bc3c8b5b85ad36d084ad3c932d7a644e0fcfbe114910ceca9999";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ru/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ru/firefox-63.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "fae3452c17b0b7b4b309e1fc57c027b1c1ea24f3722c6e15bc3907d239891cef6f3696fbb901b76811cfafe566dd94b0f16c9f9335edeaf547caaa940f57c2b4";
+      sha512 = "431e1b93c68b3b6c7922d2d3619ce60587906caa048810c419153541465436fb831077a28559ee696276caaab43fd63faf20cecc1ce5dba6269d5780c7f00e3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/si/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/si/firefox-63.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a2b5133a8f8efcbc5ab1a6c36b95afcd21a89e048c3f3782760ab9608ebdcb0afa72d8eaf451579c0bca196346d4642ae96b885d084921388240eafab580a80f";
+      sha512 = "754a03316364012fece2330937775b44f1939ae27749b57ababc752270133b9d432dce76d314464f6b650b4706dd1b2b771c987d97cfebe50edfa2ed44db8820";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sk/firefox-63.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ceec1a45af1c9e05f327acb520ba6df722e0fa416a98821350cbf71f73e2fc9ff3172edc472772441236bd66d9ba08918dbf76e864dd87c9a028eb3d274350d8";
+      sha512 = "c2b8d786b611ed3ba4a266092d61a4a019a087c39443d3f5af0e9b7a26840c41e8f8bd6823aee10427a93ec0c642059fa506b79eae738ebfef12c818ac37dc72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sl/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sl/firefox-63.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ba63d313cd3b75e341322ba40b38bf7da4b447f5e05c26a1ef6503ce8603ffc8a5c4b486d86a9061fd153f2997fc339241118344e54e75f6436dd8575bf4c191";
+      sha512 = "2d545ed7f9b1571a34db7e0074aeed0219e8fe08a4ec879e5be1e3845f77482a38df8fa41b2d58e6bade7d0184f77cc41226d72ae9501c57152a1695fcf87e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/son/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/son/firefox-63.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "b938397f1825f9200c7dc490b59c6c649765c94a99670ca4604a0a1040bf307f259dd52235ae045ddc85fec1558dae1382858fd59a5b82c63b5a0e87a12233fb";
+      sha512 = "9049a0d8bdafe9075c8468fa976bd33a33b77c1e3f8edb52844bcebb5f56039a7cb64db60074176138c98d634b9f3bacba28a9ed11c06da27796a3880b182de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sq/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sq/firefox-63.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "66d7582888e7b8c6d5322955558009d15d243c5feb14cbd36a6d76e2308ed229255bf19104381e284859a85272e901a6a3185988c97a28d3b9c2ece77c36fcda";
+      sha512 = "59facd99a6917dfea8f2a65505b1eac14c07f5ea349e321794cac77ac8dad7a53a47eb4f72a011e4c137b9dfe27a9511384944a59c00d6d0ad1009eddffd2c04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sr/firefox-63.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ad28930d33084df204283f7ea1312510f02dfe4915018e7101873cd773291275de8e8307df6f099b9f6bbb946a49fe930a65bf6ed2791a4bae3477bd44da7809";
+      sha512 = "3e91df8e40903fc277a53b1eb3b1ffcbef8ad480d5c752eaee1e5d2eccd820fde3e2c029b2b83dbcd213fb0e36ad7cfea8619cd521334b3cc707290ca86ade42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/sv-SE/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sv-SE/firefox-63.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "42a9f3612c5e2fcef7c67c04faf6279bd8d9de0144e03ea2325f2bb2b59d72dba78c69d3c3ea9768d2b7e8483c6a9676e53b6458e29ff05d215aa698d6df901b";
+      sha512 = "f73666d1672323a0db9b7ce3e93b2c0e9289b7220d075452c8ec72000c0e89be92b514acfd30687463590c17605b7952b58cd85b1e653a13329249c71dfe7008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ta/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ta/firefox-63.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8e9c36dda61507c313396a70ac2959f500b761a51d2423956ec4343a79b688d8a845358f880443d123260134627ed08f280c422129c4c87196ce4111d64f7c3c";
+      sha512 = "128e05bc5df3994bf50c0a2fb63366f9de6923d509f4951b2c0fbf7f579b0c47814816221145aec705a820de3d5f1440ae8c79ef5260e028a797362f0f597fb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/te/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/te/firefox-63.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "1d97795b7b4e0a26f742db20de34a2551cfe9c0077560e4886e710d12fa9ed932e7bc532f66b9be9df438fdfb3d67b1a7dac481f66b778d32cb9772688048c12";
+      sha512 = "007feba73d0add3a23307c0eb55a0b9f38c022828f3d320a19a98f61229fe820c7ab59fc5a84dc5d874c6c5bafed0b7fd0771b7ccf798a4b8e96efa519b9850f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/th/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/th/firefox-63.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "d9769f7a21189104cf53f6a837b3e30b8954b963c4d5b6751012ee1e0800de27321248a5c2d1b44bfc3fc28a2d7204659bf006b6681f8067799e94688e7777e9";
+      sha512 = "c7eab31cf9789fbfb3d4f9cb13193c6197b5f73e5b1839f0cda9b01eb291a898f418d5ef8a7e82f0d28f8cc23861766c2d2bd407eabf11e9f5df0d3d653ccded";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/tr/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/tr/firefox-63.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c12bd30cb85a2140c4e342e4996c8dc32c34cb14d64441901774313c3384aa1765fc9277f67bb2966f6509ed67fe5cab938eac18881f4ae003b354c381e146a4";
+      sha512 = "33e7bc1dfe7577bf71585fd7226dddfca784b32ebd7a922e07245deb3858f4bccc8417e56bc988acc7a8cd1babd871d2dc6ffab65caf2ac93da8bfbf814051ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uk/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/uk/firefox-63.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "5ae83fe9bc6e92d19048c6f3f4e9832d21be4ed4b648036a792f08af813e9dabfa48cb2450a3e49fd227bbf379784dd225b03a654fd54214a71ab9cfaff200b0";
+      sha512 = "b90c2e68a05d754aeccf07a567d4bf53dc8582b78bac3f09f1c5439d04582fc68b948676a87cd6592bb338baf924f49b7b9f16450c289ddc9ed4f2d1bb1a38ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/ur/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ur/firefox-63.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "bbd4e1ee235bb61dd7380e22818f692710d2354abc7d3b895ffd750bb5ead6d3e5127088c2dd11ee38f7f8ab4f89ef710eb1c84385b4e9fb4f7342ab333dd93e";
+      sha512 = "e78ee959b2c8c7c54fa2a62a0a2d353517ab9eee328d6d4319dfcc90d8a5fe5bd879da860bd0d49d8caccf37d13e92c20cee99ace26cf3c0ecc286fa79c62466";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/uz/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/uz/firefox-63.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "116a7914da2659bb40fcd8e06d12fc715d78bfe17fe8409756aae1d72010780f25d6b2234ab1e13a3fe69037b682b68e2cb9ccd5c156405426a959d9d3d954e1";
+      sha512 = "a1cdee5806ce52f35bc40eb224292e1aedef8fb5ba09cf411597d1bdb0ff9375ea3b98353fbe367f9428aa74c48b7d17970cf452fd48f83a131b09a351a2d1b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/vi/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/vi/firefox-63.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "e661ae440c5e01e77110a0f5969df213d33236589c9d6a7e5be2da2e5b0efb6d67dddf9d6f209e0fb5d0ba99badadc3460f4ff61e58de1f0a2fb0fbca5c7c85a";
+      sha512 = "14d4810dac2ba95feffecb26ef6ebd247eed1d6263863af67b282c14afd1aa2979775e7f32fa7f5ce0d90371fca87c80ee7d28a4cf376c4da7fce2cfe5f7218f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/xh/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/xh/firefox-63.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "4c4841775946ddaebefeb930cb1277a800b814a6896d46b329c6550f5e1e9d1d1ec2041e7ec192f9053775bcda81f663e196968c6b916f1e5ffa962ba2935f10";
+      sha512 = "f830087569ea719fff523ef595ad6ccb881da046e6d9930a809d644ce6666436e51f10e179d5ab9052f1f3928e45e8da6fef97afcd1b16bb1907e39a2c41d56b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-CN/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/zh-CN/firefox-63.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d14b19d5566b7b2ff85c692091576d0e343fbb8aa2be3141693e8185ccf3e492cfde0e9eefe4aec1fc8773063438f1e65f6cb00486f7f95090df726563375ca4";
+      sha512 = "ea1f85cf85d791dc343af564b817ec6f85394b56aa40e4425d26875c16f03004d78b275c930c581c4c0018de173118f0a4d23da9856eae6e970e3d0db2f101a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b20/linux-i686/zh-TW/firefox-62.0b20.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/zh-TW/firefox-63.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "71c96ebbb527ad8a83be94bc718d2eb928b78420335170e9f2dbdd3ed9de50b6229f27ce1d11131f4f35d931a95836c65b3a74c200f4c8f247df93027b6c6126";
+      sha512 = "674ef2f083cb79783c25fb9741fc1c80a43e64023813e2cf45fe95faa3bb58e9a89f8d5d5bf54dc713effec2fe64504fb99f2d955b1c9ca91b01a00aceff0747";
     }
     ];
 }

From 110c2528709ee10466a6b4bee5a2adefe11a0c3f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 15 Sep 2018 16:49:44 -0400
Subject: [PATCH 1094/3253] cctools: support LTO on Darwin

LTO is disabled during bootstrap to keep the bootstrap tools small and
avoid unnecessary LLVM rebuilds, but is enabled in the final stdenv
stage and should be usable by normal packages.
---
 pkgs/development/compilers/llvm/5/llvm.nix             |  4 +++-
 .../darwin/apple-source-releases/ICU/default.nix       |  4 +---
 .../darwin/apple-source-releases/default.nix           |  2 +-
 pkgs/os-specific/darwin/cctools/port.nix               |  4 ++--
 pkgs/stdenv/darwin/default.nix                         |  1 +
 pkgs/stdenv/darwin/make-bootstrap-tools.nix            | 10 +++++++---
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 3abba0ed340f..6dae8be97c88 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -119,12 +119,14 @@ in stdenv.mkDerivation (rec {
   + stdenv.lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+    moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
       --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
   ''
   + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
-      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index 89ff68266a29..761ff3ea9252 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,8 +1,6 @@
-{ cctools, appleDerivation }:
+{ appleDerivation }:
 
 appleDerivation {
-  nativeBuildInputs = [ cctools ];
-
   patches = [ ./clang-5.patch ];
 
   postPatch = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index d490048c4df3..4fa0c0e3e47f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -215,7 +215,7 @@ let
 
     # Splicing is currently broken in Nixpkgs
     # cctools need to be specified manually here to handle this
-    ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; };
+    ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
 
     IOKit           = applePackage "IOKit"             "osx-10.11.6"     "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
     launchd         = applePackage "launchd"           "osx-10.9.5"      "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index fff6eaaa5c1d..bad17cf6de46 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
-, libcxxabi, libuuid
+, libcxxabi, libuuid, llvm
 , libobjc ? null, maloader ? null
 , enableDumpNormalizedLibArgs ? false
 }:
@@ -56,7 +56,7 @@ let
       autoreconfHook
     ];
     buildInputs = [ libuuid ] ++
-      stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
+      stdenv.lib.optionals stdenv.isDarwin [ llvm libcxxabi libobjc ];
 
     patches = [
       ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d287517e8868..c361ae6e4021 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -201,6 +201,7 @@ in rec {
       python2 = self.python;
 
       ninja = super.ninja.override { buildDocs = false; };
+      darwin = super.darwin // { cctools = super.darwin.cctools.override { llvm = null; }; };
     };
   in with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index d128be7019bd..eee3b1ce0759 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -12,6 +12,10 @@ in rec {
     singleBinary = false;
   });
 
+  # We want a version of cctools without LLVM, because the LTO support ends up making
+  # the bootstrap tools huge and isn't really necessary for bootstrap
+  cctools_ = darwin.cctools.override { llvm = null; };
+
   # Avoid debugging larger changes for now.
   bzip2_ = bzip2.override (args: { linkStatic = true; });
 
@@ -95,7 +99,7 @@ in rec {
 
       # Copy binutils.
       for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do
-        cp ${darwin.cctools}/bin/$i $out/bin
+        cp ${cctools_}/bin/$i $out/bin
       done
 
       cp -rd ${pkgs.darwin.CF}/Library $out
@@ -105,9 +109,9 @@ in rec {
       nuke-refs $out/bin/*
 
       rpathify() {
-        local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
+        local libs=$(${cctools_}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
         for lib in $libs; do
-          ${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
+          ${cctools_}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
         done
       }
 

From ceb0d1a5658c1c27b48ef52504809f78cef70e79 Mon Sep 17 00:00:00 2001
From: haslersn <haslersn@fius.informatik.uni-stuttgart.de>
Date: Thu, 13 Sep 2018 23:15:54 +0200
Subject: [PATCH 1095/3253] any-nix-shell: init at 1.1.0

---
 pkgs/shells/any-nix-shell/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/shells/any-nix-shell/default.nix

diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix
new file mode 100644
index 000000000000..21f40858ea28
--- /dev/null
+++ b/pkgs/shells/any-nix-shell/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "any-nix-shell-${version}";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "haslersn";
+    repo = "any-nix-shell";
+    rev = "v${version}";
+    sha256 = "02cv86csk1m8nlh2idvh7bjw43lpssmdawya2jhr4bam2606yzdv";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r bin $out
+    wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "fish and zsh support for nix-shell";
+    license = licenses.mit;
+    homepage = https://github.com/haslersn/any-nix-shell;
+    maintainers = with maintainers; [ haslersn ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e29c2db3577c..7c066fedcd8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6243,6 +6243,8 @@ with pkgs;
   runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
   runtimeShellPackage = bash;
 
+  any-nix-shell = callPackage ../shells/any-nix-shell { };
+
   bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
 
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed

From 5b8b9a08e7e39ecec9dab658cd0fd28fa586c8cb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Sep 2018 06:24:49 +0000
Subject: [PATCH 1096/3253] pythonPackages.libnacl: fix build on darwin

---
 pkgs/development/python-modules/libnacl/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index a8acb4dc9696..c575e5594be3 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -14,8 +14,9 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
   propagatedBuildInputs = [ libsodium ];
 
-  postPatch = ''
-    substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium.so')"
+  postPatch =
+    let soext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+    substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium${soext}')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')"
   '';
 
   checkPhase = ''
@@ -27,6 +28,6 @@ buildPythonPackage rec {
     description = "Python bindings for libsodium based on ctypes";
     homepage = https://pypi.python.org/pypi/libnacl;
     license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 710b3d678b17507c7482e3c30a74b980362a4fb1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 16 Sep 2018 04:48:14 -0400
Subject: [PATCH 1097/3253] python.pkgs.asyncssh: 1.13.3 -> 1.14.0

---
 .../python-modules/asyncssh/default.nix           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 1ac393ff2d71..82723163a5e8 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,18 +1,19 @@
 { stdenv, buildPythonPackage, fetchPypi, pythonOlder
 , cryptography
-, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl }:
+, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
+, openssl }:
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "1.13.3";
+  version = "1.14.0";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eb5b190badc5cd2a506a1b6ced3e92f948166974eef7d1abab61acc67aa379e6";
+    sha256 = "0f1i5a760a3jylkj00bxkshnylzyhyqz50v8mb8s9ygllpzja058";
   };
 
-  propagatedBuildInputs = [ 
+  propagatedBuildInputs = [
     bcrypt
     cryptography
     gssapi
@@ -22,6 +23,8 @@ buildPythonPackage rec {
     pyopenssl
   ];
 
+  checkInputs = [ openssl ];
+
   # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
   postPatch = ''
     rm ./tests/sspi_stub.py
@@ -29,8 +32,8 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
-    homepage = https://pypi.python.org/pypi/asyncssh;
-    license = licenses.epl10;
+    homepage    = https://pypi.python.org/pypi/asyncssh;
+    license     = licenses.epl20;
     maintainers = with maintainers; [ worldofpeace ];
   };
 }

From 4d3c3e258b116dbc4d4ff4ec601e004597576c46 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 16 Sep 2018 04:56:35 -0400
Subject: [PATCH 1098/3253] solargraph: 0.25.1 -> 0.27.1

---
 pkgs/development/ruby-modules/solargraph/Gemfile.lock | 4 ++--
 pkgs/development/ruby-modules/solargraph/gemset.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index ed670c11c92d..436d31830ff4 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.58.2)
+    rubocop (0.59.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -26,7 +26,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    solargraph (0.25.1)
+    solargraph (0.27.1)
       coderay (~> 1.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 00395518af46..840cf922419b 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -110,10 +110,10 @@
     dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fc1fw9z98qd91ipsh9hdvpcb401qvkhw518s35l8a67sv4vdnj3";
+      sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b";
       type = "gem";
     };
-    version = "0.58.2";
+    version = "0.59.1";
   };
   ruby-progressbar = {
     source = {
@@ -127,10 +127,10 @@
     dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b5dljgskjpkpv2l0jpb6i8j73hidskcbp2v7fhjp7kpx94x6php";
+      sha256 = "1wp4k6ayv9gv1rzxqccz6zb1fss7klszqwha9wvs6mj3c1vhghac";
       type = "gem";
     };
-    version = "0.25.1";
+    version = "0.27.1";
   };
   thor = {
     source = {

From 51a6c883944e613ebdf876fa80a0bcb4b71eaf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Sep 2018 11:08:53 +0100
Subject: [PATCH 1099/3253] go_1_11: add url to flaky test

---
 pkgs/development/compilers/go/1.11.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 4a84c622a73e..e4872597e79c 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
     ./remove-fhs-test-references.patch
     ./skip-external-network-tests.patch
     ./skip-nohup-tests.patch
+    # breaks under load: https://github.com/golang/go/issues/25628
     ./skip-test-extra-files-on-386.patch
   ];
 

From 69b6230cee631c7f609549267ee4b81f201b2a7b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sun, 16 Sep 2018 10:59:42 +0000
Subject: [PATCH 1100/3253] libertinus: 6.4 -> 6.6 (#46725)

---
 pkgs/data/fonts/libertinus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix
index b4ce653da637..2ee1e83691cc 100644
--- a/pkgs/data/fonts/libertinus/default.nix
+++ b/pkgs/data/fonts/libertinus/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libertinus-${version}";
-  version = "6.4";
+  version = "6.6";
 
   src = fetchFromGitHub {
     rev    = "v${version}";
     owner  = "khaledhosny";
     repo   = "libertinus";
-    sha256 = "0acnq4vpplp2s7kdnhncz61diji3wmhca04g27yqpk03ahb40x9g";
+    sha256 = "0syagjmwy6q1ysncchl9bgyfrm7f6fghj1aipbr6md7l6gafz7ji";
   };
 
   installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0yn526kwb4xjyf6gvf0wflqi45z5dlzicycz2q003a6if5fgqcz3";
+  outputHash = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m";
 
   meta = with stdenv.lib; {
     description = "A fork of the Linux Libertine and Linux Biolinum fonts";

From 18e1eee667e849e6330011373a6873a2466f0e56 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Thu, 9 Aug 2018 22:04:08 +0200
Subject: [PATCH 1101/3253] richgo: init at 0.2.8

---
 pkgs/development/tools/richgo/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/richgo/default.nix

diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix
new file mode 100644
index 000000000000..aa537df15084
--- /dev/null
+++ b/pkgs/development/tools/richgo/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "richgo-${version}";
+  version = "0.2.8";
+  goPackagePath = "github.com/kyoh86/richgo";
+
+  src = fetchFromGitHub {
+    owner = "kyoh86";
+    repo = "richgo";
+    rev = "v${version}";
+    sha256 = "0kbwl3a2gima23zmahk0jxp7wga91bs927a1rp5xl889ikng1n4j";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Enrich `go test` outputs with text decorations.";
+    homepage = https://github.com/kyoh86/richgo;
+    license = licenses.unlicense; # NOTE: The project switched to MIT in https://git.io/fA1ik
+    maintainers = with maintainers; [ rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9722e945594e..493f0d8ae6e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4917,6 +4917,8 @@ with pkgs;
 
   redsocks = callPackage ../tools/networking/redsocks { };
 
+  richgo = callPackage ../development/tools/richgo {  };
+
   rst2html5 = callPackage ../tools/text/rst2html5 { };
 
   rt = callPackage ../servers/rt { };

From d73ed4264f48da098e782c0e204ae4ce613801e5 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sun, 16 Sep 2018 15:19:29 +0200
Subject: [PATCH 1102/3253] exim: parametrise package

This allows the definition of a custom derivation of Exim,
which can be used to enable custom features such as LDAP and PAM support.

The default behaviour remains unchanged (defaulting to pkgs.exim).
---
 nixos/modules/services/mail/exim.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index 06c4b2811b3f..c05811291359 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkIf mkOption singleton types;
-  inherit (pkgs) coreutils exim;
+  inherit (pkgs) coreutils;
   cfg = config.services.exim;
 in
 
@@ -57,6 +57,16 @@ in
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.exim;
+        defaultText = "pkgs.exim";
+        description = ''
+          The Exim derivation to use.
+          This can be used to enable features such as LDAP or PAM support.
+        '';
+      };
+
     };
 
   };
@@ -74,7 +84,7 @@ in
         spool_directory = ${cfg.spoolDir}
         ${cfg.config}
       '';
-      systemPackages = [ exim ];
+      systemPackages = [ cfg.package ];
     };
 
     users.users = singleton {
@@ -89,14 +99,14 @@ in
       gid = config.ids.gids.exim;
     };
 
-    security.wrappers.exim.source = "${exim}/bin/exim";
+    security.wrappers.exim.source = "${cfg.package}/bin/exim";
 
     systemd.services.exim = {
       description = "Exim Mail Daemon";
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ config.environment.etc."exim.conf".source ];
       serviceConfig = {
-        ExecStart   = "${exim}/bin/exim -bdf -q30m";
+        ExecStart   = "${cfg.package}/bin/exim -bdf -q30m";
         ExecReload  = "${coreutils}/bin/kill -HUP $MAINPID";
       };
       preStart = ''

From a66c00d780ef40a42c031fcdb1c33ff28a93e2a5 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 16 Sep 2018 17:37:28 +0200
Subject: [PATCH 1103/3253] pythonPackages.dendropy: fix build

Build failed after update to 4.4.0 because the tests are incorrectly
packages in the pypi version.
Switch to upstream github repo, fix tests, disable failing test cases
---
 .../python-modules/dendropy/default.nix       | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix
index 6220a1e15f0c..6409a5d12e59 100644
--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -1,29 +1,33 @@
 { lib
 , pkgs
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytest
 }:
 
 buildPythonPackage rec {
   pname   = "DendroPy";
   version = "4.4.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f0a0e2ce78b3ed213d6c1791332d57778b7f63d602430c1548a5d822acf2799c";
+  # tests are incorrectly packaged in pypi version
+  src = fetchFromGitHub {
+    owner = "jeetsukumaran";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9";
   };
 
-  prePatch = ''
-    # Test removed/disabled and reported upstream: https://github.com/jeetsukumaran/DendroPy/issues/74
-    rm -f dendropy/test/test_dataio_nexml_reader_tree_list.py
-  '';
-
   preCheck = ''
     # Needed for unicode python tests
     export LC_ALL="en_US.UTF-8"
+    cd tests  # to find the 'support' module
   '';
 
-  checkInputs = [ pkgs.glibcLocales ];
+  checkInputs = [ pytest pkgs.glibcLocales ];
+
+  checkPhase = ''
+    pytest -k 'not test_dataio_nexml_reader_tree_list and not test_pscores_with'
+  '';
 
   meta = {
     homepage = http://dendropy.org/;

From dec78a23d1004cc89d5c95e42904544367afa91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 16 Sep 2018 16:58:48 +0100
Subject: [PATCH 1104/3253] vimPlugins: only update generated.nix if all
 plugins were downloaded

https://github.com/NixOS/nixpkgs/pull/46728#discussion_r217915996
---
 pkgs/misc/vim-plugins/update.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 8128c12bce68..c9ccd2364725 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -193,12 +193,14 @@ def check_results(
     print(f"{len(results) - len(failures)} plugins were checked", end="")
     if len(failures) == 0:
         print()
+        return plugins
     else:
         print(f", {len(failures)} plugin(s) could not be downloaded:\n")
 
         for (plugin, exception) in failures:
             print_download_error(plugin, exception)
-    return plugins
+
+        sys.exit(1)
 
 
 def load_plugin_spec() -> List[Tuple[str, str]]:

From a3ca7dcf355c8598661e0a3b4464aabdbdd87ca9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 16 Sep 2018 18:10:34 +0200
Subject: [PATCH 1105/3253] gns3Packages.{server,gui}{Stable,Preview}: 2.1.9 ->
 2.1.10

---
 pkgs/applications/networking/gns3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 5c66c5a5298b..4260c3608522 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.9";
+  stableVersion = "2.1.10";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7";
-  serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx";
+  guiSrcHash = "0vn33dcd3sfj5gna79vwm35l8aznga91a8r7i6q06dr4c2svml15";
+  serverSrcHash = "062dai1rb04dyrlrjgk0gr5hx0la8n1nalx0il1i7k1inwy52gj5";
 in {
   guiStable = mkGui {
     stable = true;

From c4819dafe5949a81706abdb98dbde7729f829d1f Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 17 Sep 2018 01:26:15 +0900
Subject: [PATCH 1106/3253] vimPlugins: adding vim-sayonara/nvimdev/obsession

---
 pkgs/misc/vim-plugins/generated.nix    | 102 ++++++++++++++++---------
 pkgs/misc/vim-plugins/vim-plugin-names |   3 +
 2 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3f9c38e04bd8..e1a8d0ae1f93 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -204,12 +204,12 @@
   };
 
   committia-vim = buildVimPluginFrom2Nix {
-    name = "committia-vim-2018-08-16";
+    name = "committia-vim-2018-09-16";
     src = fetchFromGitHub {
       owner = "rhysd";
       repo = "committia.vim";
-      rev = "293a0078ec8fc6e302fa49f48db5fd609d27ab20";
-      sha256 = "12s0976agvxkayvxm86ppk97x1sbdrgg8gkc97fpac83vah7lc1r";
+      rev = "7d762c61b3907249cc1f13ec19c72ccd02ed1ade";
+      sha256 = "0sq40m748xmjqqwhvkgly9205h1q5c7d70wzahjbnnzqi5mlk4pb";
     };
   };
 
@@ -334,12 +334,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-09-11";
+    name = "denite-nvim-2018-09-15";
     src = fetchFromGitHub {
       owner = "shougo";
       repo = "denite.nvim";
-      rev = "0fdbdfb154a84bd76deb51ad5159c52779bbe110";
-      sha256 = "0qc6b731g66rbpcss6dss9ak5npdg52pb7v11mc07f534fksqrpj";
+      rev = "8685cfbb7f0a4bea173a6b08a72a33ef70780334";
+      sha256 = "0zc15802hda59x42k0962fmawjq021y7ys10h4ypnwy50cn1vjzj";
     };
   };
 
@@ -376,12 +376,12 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-08-10";
+    name = "deoplete-jedi-2018-09-15";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "12e6d8f745efd64e08d474fa3b3d35c8c1fa0305";
-      sha256 = "1ni1sfnh2bnl42m4fvwcc003b7ng501j21njk3wx5d395g5p4w81";
+      rev = "e397e76e88e8f3c4342ac5284b7dd12561426041";
+      sha256 = "1zslxqs0zcs9vj47g3jr6h6f1lqyswpjc15a1z06zak166ppsxkw";
       fetchSubmodules = true;
     };
   };
@@ -417,12 +417,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-09-02";
+    name = "deoplete-nvim-2018-09-12";
     src = fetchFromGitHub {
       owner = "shougo";
       repo = "deoplete.nvim";
-      rev = "8c2117b966a7f05091cd49609f8ee3641f260997";
-      sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg";
+      rev = "93f6e3bce8229557b952dcad792786b1cc228991";
+      sha256 = "033iskhyz91158ifmpzpv1gi4rfx368c6knakj65spcrlfci58y9";
     };
   };
 
@@ -719,12 +719,12 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-09-01";
+    name = "lightline-vim-2018-09-16";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "166f179cf89320b1b6f95def3a49fda448f4f711";
-      sha256 = "04vcv5ig854n5yaibhwjbqwjiw0rbk7laiysn8s5lj1abycg92qq";
+      rev = "0b026a2b894844b58f8a632290ea1cdab201ed50";
+      sha256 = "0hpw22sv41drn376y4vv5krbjdahga6vxiqrrgky5x1d8bj1fz4m";
     };
   };
 
@@ -899,12 +899,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-14";
+    name = "neomake-2018-09-16";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "3b4287705d095fe0b8d81dadd10a29827ab3e4f4";
-      sha256 = "0sgdxd6swqkkk53jhil5f2qhywxnmpddr1zrkx7znyhzkk347sin";
+      rev = "1b5c098e152124267034ce175676594995e4af72";
+      sha256 = "19860x030hscv75sqsjjdkpkndcssn20f9iqy955ssh6v3qmjg2m";
     };
   };
 
@@ -959,12 +959,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-09-13";
+    name = "nerdtree-2018-09-15";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "e9d3f72d9c955d12630278a823614af49fbe9c5b";
-      sha256 = "0s16chyqmp3fz8070xizszgpgja71zq43scbp5iz573kxfh1139r";
+      rev = "cd1f2c803ec485074af070a2fe942a029775e5bd";
+      sha256 = "07rna5sqjq934xx8nqsv0b0z6rmzprdxfa76kq5gm3bhc807c7pv";
     };
   };
 
@@ -1018,6 +1018,16 @@
     };
   };
 
+  nvimdev-nvim = buildVimPluginFrom2Nix {
+    name = "nvimdev-nvim-2018-09-08";
+    src = fetchFromGitHub {
+      owner = "neovim";
+      repo = "nvimdev.nvim";
+      rev = "cf5acd7712524886881efdba8f2e4cee0f133ed9";
+      sha256 = "02jqgbkzn47xljv6kk1lk6gzq3c900lfs2s4dpg1vapd5n0yi4am";
+    };
+  };
+
   open-browser-vim = buildVimPluginFrom2Nix {
     name = "open-browser-vim-2018-04-26";
     src = fetchFromGitHub {
@@ -1179,12 +1189,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-09-09";
+    name = "rust-vim-2018-09-15";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "1eb6598a72ff2746118451147817c718e40b5769";
-      sha256 = "114xhwn1bdykh6vzic4k3xfpmkm7myfhixxw98qbxsnb2i068wl5";
+      rev = "83620e6c674e1ceb801f1b322fb30d028ee59685";
+      sha256 = "0bvyay7r76r3zg00ziinlycw29316r8n81dxsd5qcgxmxfd3ssd1";
     };
   };
 
@@ -1669,12 +1679,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-10";
+    name = "vim-airline-2018-09-16";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "da8035d8a83c85197d27a258465d8373ec6d5cd4";
-      sha256 = "1c2lh1w6qjgkian7ml5krwfc2m3g79bpz8rvpk1c93bn9zfz82h7";
+      rev = "bcd37fc1152912fd456606152cebc8d5fc8db865";
+      sha256 = "0cmfj4pvwqyq2nzsy4zhkwhyrifg2sx0z5plw0dvyi2jnfns7afi";
     };
   };
 
@@ -2029,12 +2039,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-13";
+    name = "vim-fugitive-2018-09-15";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "6cd8ff77f03b08ae133e35fabd87122a50231c36";
-      sha256 = "0rkyam6ik81cmrc406jpbpvbli9nkcqk90jp0m17pwbaaiqrbp73";
+      rev = "fb5531997342be62efbbb98bda4b90ee88b2ac00";
+      sha256 = "092fpxmvl7mq1bh8g87ld1mn19qh9dc9r16ngilhg8zx3fvpvi67";
     };
   };
 
@@ -2350,12 +2360,12 @@
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
-    name = "vim-latex-live-preview-2017-11-09";
+    name = "vim-latex-live-preview-2018-09-15";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
-      rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624";
-      sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy";
+      rev = "c573115642e1a991e0dd763f25dc02b3d99acea5";
+      sha256 = "1s1p8mi9n6qxfd9847fbzc12sy9ala5jnkjicrcdcbn7irlvvwcg";
     };
   };
 
@@ -2479,6 +2489,16 @@
     };
   };
 
+  vim-obsession = buildVimPluginFrom2Nix {
+    name = "vim-obsession-2018-08-27";
+    src = fetchFromGitHub {
+      owner = "tpope";
+      repo = "vim-obsession";
+      rev = "523b2c60eb956aba6014e18be75aa7bde5280c33";
+      sha256 = "18hgsrlk4319mpr36sj78a43fvr85lzisxblkik36gvyby9qr3h3";
+    };
+  };
+
   vim-operator-replace = buildVimPluginFrom2Nix {
     name = "vim-operator-replace-2015-02-24";
     src = fetchFromGitHub {
@@ -2699,6 +2719,16 @@
     };
   };
 
+  vim-sayonara = buildVimPluginFrom2Nix {
+    name = "vim-sayonara-2017-03-13";
+    src = fetchFromGitHub {
+      owner = "mhinz";
+      repo = "vim-sayonara";
+      rev = "357135ce127581fab2c0caf45d4b3fec4603aa77";
+      sha256 = "0m4pbpqq7m4rbqj1sxzx3r25znm9m5df6z6kndc6x5c1p27a63pi";
+    };
+  };
+
   vim-scala = buildVimPluginFrom2Nix {
     name = "vim-scala-2017-11-10";
     src = fetchFromGitHub {
@@ -3110,12 +3140,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-13";
+    name = "vimtex-2018-09-15";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "9f5978c255ce500a0df39cd50245cd0ea145a820";
-      sha256 = "09hrdsh3qvdyvxqzgyylal77ldd617kxwlv083516gbfalq1cixg";
+      rev = "46e2e4f73f89e4116b85a8d6726af44776e3a4f8";
+      sha256 = "05cgw7b3l63lb3dbb07kzb2h9akf5gxa6kl7hzvrsf8khva20nic";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 35c21856bae9..595d0f9ae6a0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -164,6 +164,7 @@ megaannum/forms
 megaannum/self
 mfukar/robotframework-vim
 mhinz/vim-grepper
+mhinz/vim-sayonara
 mhinz/vim-signify
 mhinz/vim-startify
 michaeljsmith/vim-indent-object
@@ -181,6 +182,7 @@ ncm2/ncm2-tmux
 ncm2/ncm2-ultisnips
 neoclide/vim-easygit
 neovimhaskell/haskell-vim
+neovim/nvimdev.nvim
 nixprime/cpsm
 noc7c9/vim-iced-coffee-script
 osyo-manga/shabadou.vim
@@ -263,6 +265,7 @@ tpope/vim-eunuch
 tpope/vim-fireplace
 tpope/vim-flagship
 tpope/vim-fugitive
+tpope/vim-obsession
 tpope/vim-pathogen
 tpope/vim-projectionist
 tpope/vim-repeat

From a78f6dda0faf42897303b0b9fb8f3449a49a4d01 Mon Sep 17 00:00:00 2001
From: Elias Probst <mail@eliasprobst.eu>
Date: Sun, 16 Sep 2018 19:00:21 +0200
Subject: [PATCH 1107/3253] arcanist: 20170323 -> 20180916

---
 pkgs/development/tools/misc/arcanist/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 15b8f82d0ab2..f6ff4ad3650d 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -4,19 +4,19 @@ let
   libphutil = fetchFromGitHub {
     owner = "phacility";
     repo = "libphutil";
-    rev = "01b33af6f4d570b34ad791cd5ccaa3ea7f77dcb9";
-    sha256 = "0glrxlj4cr2821pdc2yy2m5bss4yr1zx3sdgw3r5d8hbfz361nx7";
+    rev = "3215e4e291ed4468faeed4542d47a571b5bc559a";
+    sha256 = "0bbinaxny0j4iniz2grf0s9cysbl3x24yc32f3jra9mwsgh2v2zj";
   };
   arcanist = fetchFromGitHub {
     owner = "phacility";
     repo = "arcanist";
-    rev = "3b6b523c2b236e3724a1e115f126cb6fd05fa128";
-    sha256 = "1pr2izwj446rf2v6x6v2wsj7iwnaxq3xg3qqipybyf1xpqfmh5q8";
+    rev = "2650e8627a20e1bfe334a4a2b787f44ef5d6ebc5";
+    sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20170323";
+  version = "20180916";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];

From 9501915218215eb49a293cbe93707d426fec8597 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 16 Sep 2018 14:08:42 +0300
Subject: [PATCH 1108/3253] gnirehtet: 2.2.1 -> 2.3

---
 pkgs/tools/networking/gnirehtet/default.nix |  8 +++----
 pkgs/tools/networking/gnirehtet/paths.patch | 25 ++++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index 8a2d32e543b0..d40b85591b59 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
 let
-version = "2.2.1";
+version = "2.3";
 apk = stdenv.mkDerivation {
   name = "gnirehtet.apk-${version}";
   src = fetchzip {
     url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
-    sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan";
+    sha256 = "08pgmpbz82cd8ndr2syiv25l5xk1gvh9gzji4pgva5gw269bjmpz";
   };
   installPhase = ''
     mkdir $out
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec {
       owner = "Genymobile";
       repo = "gnirehtet";
       rev = "v${version}";
-      sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9";
+      sha256 = "118ig42qzr2xyra7r8zfxq38xidaxfc98ja9836jwnn9fgbigczr";
   };
   sourceRoot = "source/relay-rust";
-  cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5";
+  cargoSha256 = "0370jbllahcdhs132szbxb2yr675s5smm74sx58qi8jhykbb5qs7";
 
   patchFlags = [ "-p2" ];
   patches = [
diff --git a/pkgs/tools/networking/gnirehtet/paths.patch b/pkgs/tools/networking/gnirehtet/paths.patch
index 72a8445d83b9..e5df4b8e4fe7 100644
--- a/pkgs/tools/networking/gnirehtet/paths.patch
+++ b/pkgs/tools/networking/gnirehtet/paths.patch
@@ -1,7 +1,7 @@
-diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs
-index 4f1be53..96d2e78 100644
---- a/relay-rust/src/main.rs
-+++ b/relay-rust/src/main.rs
+Index: gnirehtet/relay-rust/src/main.rs
+===================================================================
+--- gnirehtet.orig/relay-rust/src/main.rs
++++ gnirehtet/relay-rust/src/main.rs
 @@ -299,7 +299,7 @@ impl Command for RelayCommand {
  
  fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
@@ -11,7 +11,7 @@ index 4f1be53..96d2e78 100644
  }
  
  fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
-@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>(
+@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>(
      args: Vec<S>,
  ) -> Result<(), CommandExecutionError> {
      let adb_args = create_adb_args(serial, args);
@@ -22,7 +22,7 @@ index 4f1be53..96d2e78 100644
          Ok(exit_status) => {
              if exit_status.success() {
                  Ok(())
-@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution
+@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S
          serial,
          vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
      );
@@ -33,3 +33,16 @@ index 4f1be53..96d2e78 100644
          Ok(output) => {
              if output.status.success() {
                  // the "regex" crate makes the binary far bigger, so just parse the versionCode
+Index: gnirehtet/relay-rust/src/adb_monitor.rs
+===================================================================
+--- gnirehtet.orig/relay-rust/src/adb_monitor.rs
++++ gnirehtet/relay-rust/src/adb_monitor.rs
+@@ -206,7 +206,7 @@ impl AdbMonitor {
+
+     fn start_adb_daemon() -> bool {
+         info!(target: TAG, "Restarting adb daemon");
+-        match process::Command::new("adb")
++        match process::Command::new("@adb@")
+             .args(&["start-server"])
+             .status() {
+             Ok(exit_status) => {

From c314092164c0f192bbad73433e44eab338a8f9d8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 16 Sep 2018 19:20:32 +0200
Subject: [PATCH 1109/3253] tmsu: 0.7.0 -> 0.7.1

---
 pkgs/tools/filesystems/tmsu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix
index 359653465059..3c6dd2648ef6 100644
--- a/pkgs/tools/filesystems/tmsu/default.nix
+++ b/pkgs/tools/filesystems/tmsu/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "tmsu-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   go-sqlite3 = fetchgit {
     url = "git://github.com/mattn/go-sqlite3";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "oniony";
     repo = "tmsu";
     rev = "v${version}";
-    sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64";
+    sha256 = "0d1sryq80chb9vrf9z0lfx4xb3sdkg01f9hqf3bb9c89vm6v2lwg";
   };
 
   buildInputs = [ go fuse ];

From 536b49f46c08d2556d5778923b131f1c8eaf8984 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 16 Sep 2018 19:26:12 +0200
Subject: [PATCH 1110/3253] calibre: 3.30.0 -> 3.31.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d66a778c1cd9..1ad236f0d13f 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.30.0";
+  version = "3.31.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0j7w63kniqnpr8v1aldzbim2dyrk79n23mzw9y56jqd0k47m8zfz";
+    sha256 = "1xg1bx0klvrywqry5rhci37fr7shpvb2wbx4bva20vhqkal169rw";
   };
 
   patches = [

From 6823fe9fb0e7c5d53693f0d986d29c273b8919ce Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 16 Sep 2018 17:55:29 +0200
Subject: [PATCH 1111/3253] ipfs-migrator: 6 -> 7

New version is required to migrate existing ipfs repos to repo v7.
---
 pkgs/applications/networking/ipfs-migrator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 6a4afdb1c17d..f070c5109376 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "ipfs-migrator-${version}";
-  version = "6";
+  version = "7";
 
   goPackagePath = "github.com/ipfs/fs-repo-migrations";
 
@@ -11,8 +11,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "fs-repo-migrations";
-    rev = "a89e9769b9cac25ad9ca31c7e9a4445c7966d35b";
-    sha256 = "0x4mbkx7wlqjmkg6852hljq947v9y9k3hjd5yfj7kka1hpvxd7bn";
+    rev = "4e8e0b41d7348646c719d572c678c3d0677e541a";
+    sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37";
   };
 
   patches = [ ./lru-repo-path-fix.patch ];

From f896867ae5319bfb49b31476e8352475666c748f Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 16 Sep 2018 20:18:41 +0200
Subject: [PATCH 1112/3253] ipfs-migrator: update dependencies in deps.nix

Most dependencies are vendored in the upstream source anyway,
deps.nix just contains the few that are not.
Dependencies were updated manually because go2nix doesn't
work correctly for this package - it produces an empty deps.nix.
---
 .../networking/ipfs-migrator/deps.nix           | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix
index 2d52ca0ef70a..1ad1c383c8c6 100644
--- a/pkgs/applications/networking/ipfs-migrator/deps.nix
+++ b/pkgs/applications/networking/ipfs-migrator/deps.nix
@@ -1,13 +1,4 @@
 [
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = https://github.com/dustin/go-humanize;
-      rev = "79e699ccd02f240a1f1fbbdcee7e64c1c12e41aa";
-      sha256 = "0awfqszgjw8qrdw31v74jnvj1jbp7czhd8aq59j57yyj4hy50fzj";
-    };
-  }
   {
     goPackagePath = "github.com/jbenet/goprocess";
     fetch = {
@@ -40,8 +31,8 @@
     fetch = {
       type = "git";
       url = https://github.com/hashicorp/golang-lru;
-      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
-      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+      rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768";
+      sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
     };
   }
   {
@@ -49,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
-      sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
+      rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2";
+      sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4";
     };
   }
 ]

From 88a969d1b764968de26ad93f140cd6f35c9e90db Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 16 Sep 2018 13:53:45 -0400
Subject: [PATCH 1113/3253] top-level/release.nix: add patchShebangs test

This is currently failing but nobody noticed!
---
 pkgs/test/default.nix                |  2 ++
 pkgs/test/patch-shebangs/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/release.nix           |  3 +++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/test/patch-shebangs/default.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 774077949b25..eb7fd82b945c 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -27,4 +27,6 @@ with pkgs;
   macOSSierraShared = callPackage ./macos-sierra-shared {};
 
   cross = callPackage ./cross {};
+
+  patch-shebangs = callPackage ./patch-shebangs {};
 }
diff --git a/pkgs/test/patch-shebangs/default.nix b/pkgs/test/patch-shebangs/default.nix
new file mode 100644
index 000000000000..a82e5e1e1982
--- /dev/null
+++ b/pkgs/test/patch-shebangs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, runCommand }:
+
+let
+  bad-shebang = stdenv.mkDerivation {
+    name         = "bad-shebang";
+    unpackPhase  = ":";
+    installPhase = ''
+      mkdir -p $out/bin
+      echo "#!/bin/sh" > $out/bin/test
+      echo "echo -n hello" >> $out/bin/test
+      chmod +x $out/bin/test
+    '';
+  };
+in runCommand "patch-shebangs-test" {
+  passthru = { inherit bad-shebang; };
+  meta.platforms = stdenv.lib.platforms.all;
+} ''
+  printf "checking whether patchShebangs works properly... ">&2
+  if ! grep -q '^#!/bin/sh' ${bad-shebang}/bin/test; then
+    echo "yes" >&2
+    touch $out
+  else
+    echo "no" >&2
+    exit 1
+  fi
+''
\ No newline at end of file
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 6ebc640ea219..93400bf0ee65 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -77,6 +77,7 @@ let
               jobs.tests.cc-wrapper-libcxx-39.x86_64-darwin
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
+              jobs.tests.patch-shebangs.x86_64-darwin
             ];
         } else null;
 
@@ -119,6 +120,7 @@ let
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux
+              jobs.tests.patch-shebangs.x86_64-linux
             ]
             ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools
             ++ lib.optionals supportDarwin [
@@ -148,6 +150,7 @@ let
               jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
+              jobs.tests.patch-shebangs.x86_64-darwin
             ];
         };
 

From eb275c96f275f31d728729f01901d89ba05b42f9 Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 16 Sep 2018 20:53:04 +0200
Subject: [PATCH 1114/3253] vivaldi: 1.15.1147.42-1 -> 1.15.1147.64-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index e6902aadd906..1c45efaddf81 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.15.1147.42-1";
+  version = "1.15.1147.64-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh";
+    sha256 = "01xbfrrq2kj75cb6grpq9a4y88j1s87h2nnvy1fmyb4a2db6y0ag";
   };
 
   unpackPhase = ''

From 478e1fe36943a90fd08507b1cf6417d347e63b1b Mon Sep 17 00:00:00 2001
From: Lukas Werling <lukas.werling@gmail.com>
Date: Sun, 16 Sep 2018 20:53:50 +0200
Subject: [PATCH 1115/3253] vivaldi-ffmpeg-codecs: 61.0.3163.91 -> 69.0.3497.73

---
 .../browsers/vivaldi/chromium-gcc-r1.patch    | 14 ----
 .../browsers/vivaldi/chromium-gcc5-r1.patch   | 66 -------------------
 .../vivaldi/chromium-gn-bootstrap-r14.patch   | 27 --------
 .../browsers/vivaldi/ffmpeg-codecs.nix        | 21 +++---
 .../networking/browsers/vivaldi/update.sh     |  3 +-
 5 files changed, 10 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
 delete mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
 delete mode 100644 pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch

diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
deleted file mode 100644
index 036d57b601da..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
-index 99f230ce7e9a..de2415d402f5 100644
---- a/base/numerics/safe_math_shared_impl.h
-+++ b/base/numerics/safe_math_shared_impl.h
-@@ -21,8 +21,7 @@
- #if !defined(__native_client__) &&                         \
-     ((defined(__clang__) &&                                \
-       ((__clang_major__ > 3) ||                            \
--       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
--     (defined(__GNUC__) && __GNUC__ >= 5))
-+       (__clang_major__ == 3 && __clang_minor__ >= 4))))
- #include "base/numerics/safe_math_clang_gcc_impl.h"
- #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
- #else
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
deleted file mode 100644
index 8d2886fbfa94..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/chrome/browser/devtools/devtools_file_system_indexer.cc
-+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
-@@ -34,7 +34,6 @@ using base::TimeDelta;
- using base::TimeTicks;
- using content::BrowserThread;
- using std::map;
--using std::set;
- using std::string;
- using std::vector;
- 
-@@ -191,7 +190,7 @@ vector<FilePath> Index::Search(const string& query) {
-     if (trigram != kUndefinedTrigram)
-       trigrams.push_back(trigram);
-   }
--  set<FileId> file_ids;
-+  std::set<FileId> file_ids;
-   bool first = true;
-   vector<Trigram>::const_iterator it = trigrams.begin();
-   for (; it != trigrams.end(); ++it) {
-@@ -203,7 +202,7 @@ vector<FilePath> Index::Search(const string& query) {
-       first = false;
-       continue;
-     }
--    set<FileId> intersection = base::STLSetIntersection<set<FileId> >(
-+    std::set<FileId> intersection = base::STLSetIntersection<std::set<FileId> >(
-         file_ids, index_[trigram]);
-     file_ids.swap(intersection);
-   }
-diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-index 94bb9161ec85..e40c6387f72e 100644
---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
-@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
-           allocation_length_(0),
-           data_(data),
-           data_length_(0),
--          kind_(AllocationKind::kNormal),
-+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
-           deleter_(deleter) {}
-     DataHandle(void* allocation_base,
-                size_t allocation_length,
-@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
-              reinterpret_cast<uintptr_t>(allocation_base_) +
-                  allocation_length_);
-       switch (kind_) {
--        case AllocationKind::kNormal:
-+        case WTF::ArrayBufferContents::AllocationKind::kNormal:
-           DCHECK(deleter_);
-           deleter_(data_);
-           return;
--        case AllocationKind::kReservation:
-+        case WTF::ArrayBufferContents::AllocationKind::kReservation:
-           ReleaseReservedMemory(allocation_base_, allocation_length_);
-           return;
-       }
---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig	2017-08-15 12:45:59.433532111 +0000
-+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-08-15 17:52:59.691328825 +0000
-@@ -10,7 +10,7 @@
- 
- #include "webrtc/modules/audio_processing/aec3/aec_state.h"
- 
--#include <math.h>
-+#include <cmath>
- #include <numeric>
- #include <vector>
- 
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
deleted file mode 100644
index 624267153669..000000000000
--- a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
-Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>
-Date:   Wed Jul 26 21:51:54 2017 +0000
-
-    wip
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 1390560f8e37..ff2ae57c46b0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/metrics/histogram_base.cc',
-       'base/metrics/histogram_functions.cc',
-       'base/metrics/histogram_samples.cc',
-+      'base/metrics/histogram_snapshot_manager.cc',
-       'base/metrics/metrics_hashes.cc',
-       'base/metrics/persistent_histogram_allocator.cc',
-       'base/metrics/persistent_memory_allocator.cc',
-@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/trace_event/heap_profiler_allocation_context_tracker.cc',
-       'base/trace_event/heap_profiler_allocation_register.cc',
-       'base/trace_event/heap_profiler_event_filter.cc',
--      'base/trace_event/heap_profiler_event_writer.cc',
-+      'base/trace_event/heap_profiler_heap_dump_writer.cc',
-       'base/trace_event/heap_profiler_serialization_state.cc',
-       'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
-       'base/trace_event/heap_profiler_type_name_deduplicator.cc',
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index ab2c24727d7c..87ca350731db 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,37 +1,33 @@
 { stdenv, fetchurl
-, dbus-glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
-, pciutils, pkgconfig, python2, xdg_utils
+, dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
+, pciutils, pkgconfig, python2, xdg_utils, gn
 }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi-ffmpeg-codecs";
-  version = "61.0.3163.91";
+  version = "69.0.3497.73";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "3f07vwbxllrwy3agqxa6ndcix23vai18i178zscmk0y68flhzffyjdvrwlg7dzlwgiqypj2cyl21qb4qmcay2ilgw9vnr9fql2x0w7p";
+    sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9";
   };
 
   buildInputs = [ ];
 
   nativeBuildInputs = [
-    dbus-glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig
-    python2 xdg_utils
+    gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
+    pkgconfig dbus-glib
   ];
 
   patches = [
-    ./chromium-gn-bootstrap-r14.patch
-    ./chromium-gcc-r1.patch
-    ./chromium-gcc5-r1.patch
   ];
 
   configurePhase = ''
     runHook preConfigure
 
-    local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0"
-    python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args"
-    out/Release/gn gen out/Release -v --args="$args"
+    local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gnome_keyring=false use_sysroot=false use_gold=false use_allocator=\"none\" linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false enable_nacl=false enable_nacl_nonsfi=false is_clang=false clang_use_chrome_plugins=false is_component_build=true is_debug=false symbol_level=0 use_custom_libcxx=false use_lld=false use_jumbo_build=false"
+    gn gen out/Release -v --args="$args"
 
     runHook postConfigure
   '';
@@ -53,6 +49,5 @@ stdenv.mkDerivation rec {
     license     = licenses.lgpl21;
     maintainers = with maintainers; [ lluchs ];
     platforms   = [ "x86_64-linux" ];
-    broken = true;
   };
 }
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
index 6ef6206c4f4a..0b1787176399 100755
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@@ -26,11 +26,12 @@ hash=${prefetch[0]}
 path=${prefetch[1]}
 
 echo "vivaldi: $vivaldi_version_old -> $vivaldi_version"
+echo "$path"
 (cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")
 
 # Check vivaldi-ffmpeg-codecs version.
 chromium_version_old=$(version vivaldi-ffmpeg-codecs)
-chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+')
+chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep '^[0-9]\{2,\}\.[0-9]\+\.[0-9]\{4,\}\+\.[0-9]\+$')
 
 if [[ "$chromium_version" != "$chromium_version_old" ]]; then
 	echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"

From f1c9d5cf23a40f362338b7aef0af5f5b9829cd0e Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Sun, 16 Sep 2018 21:54:16 +0200
Subject: [PATCH 1116/3253] Add sickbeard module (with SickGear & SickRage)

---
 nixos/modules/misc/ids.nix                |  4 +-
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/misc/sickbeard.nix | 92 +++++++++++++++++++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/misc/sickbeard.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index aafeb997c326..c7bfb7bf4747 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -289,7 +289,7 @@
       stanchion = 262;
       riak-cs = 263;
       infinoted = 264;
-      # keystone = 265; # unused, removed 2017-12-13
+      sickbeard = 265;
       # glance = 266; # unused, removed 2017-12-13
       couchpotato = 267;
       gogs = 268;
@@ -579,7 +579,7 @@
       stanchion = 262;
       riak-cs = 263;
       infinoted = 264;
-      # keystone = 265; # unused, removed 2017-12-13
+      sickbeard = 265;
       # glance = 266; # unused, removed 2017-12-13
       couchpotato = 267;
       gogs = 268;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f51a30aec2e9..58bec536c2ae 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -393,6 +393,7 @@
   ./services/misc/rogue.nix
   ./services/misc/serviio.nix
   ./services/misc/safeeyes.nix
+  ./services/misc/sickbeard.nix
   ./services/misc/siproxd.nix
   ./services/misc/snapper.nix
   ./services/misc/sonarr.nix
diff --git a/nixos/modules/services/misc/sickbeard.nix b/nixos/modules/services/misc/sickbeard.nix
new file mode 100644
index 000000000000..5cfbbe516ae1
--- /dev/null
+++ b/nixos/modules/services/misc/sickbeard.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  name = "sickbeard";
+
+  cfg = config.services.sickbeard;
+  sickbeard = cfg.package;
+
+in
+{
+
+  ###### interface
+
+  options = {
+    services.sickbeard = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the sickbeard server.";
+      };
+      package = mkOption {
+        type = types.package;
+        default = pkgs.sickbeard;
+        example = literalExample "pkgs.sickrage";
+        description =''
+          Enable <literal>pkgs.sickrage</literal> or <literal>pkgs.sickgear</literal>
+          as an alternative to SickBeard
+        '';
+      };
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/${name}";
+        description = "Path where to store data files.";
+      };
+      configFile = mkOption {
+        type = types.path;
+        default = "${cfg.dataDir}/config.ini";
+        description = "Path to config file.";
+      };
+      port = mkOption {
+        type = types.ints.u16;
+        default = 8081;
+        description = "Port to bind to.";
+      };
+      user = mkOption {
+        type = types.str;
+        default = name;
+        description = "User to run the service as";
+      };
+      group = mkOption {
+        type = types.str;
+        default = name;
+        description = "Group to run the service as";
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.users = optionalAttrs (cfg.user == name) (singleton {
+      name = name;
+      uid = config.ids.uids.sickbeard;
+      group = cfg.group;
+      description = "sickbeard user";
+      home = cfg.dataDir;
+      createHome = true;
+    });
+
+    users.groups = optionalAttrs (cfg.group == name) (singleton {
+      name = name;
+      gid = config.ids.gids.sickbeard;
+    });
+
+    systemd.services.sickbeard = {
+      description = "Sickbeard Server";
+      wantedBy    = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = "${sickbeard}/SickBeard.py --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port}";
+      };
+    };
+  };
+}

From a4630c65caf8a239b9ba5c013466d485c4fd7fde Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 16 Sep 2018 15:58:21 -0500
Subject: [PATCH 1117/3253] stdenv: add shell to HOST_PATH for backwards
 compatibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To avoid breaking things, we need to make sure SHELL goes into
HOST_PATH. This reflects my changes to patch-shebangs to make it cross
compilation ready. When a script is patched from the Nix store it now
looks to HOST_PATH to get the targeted machine’s executables.
Unfortunately, this only works in native builds.
---
 pkgs/stdenv/generic/setup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index e51dc1f1a0a6..9a620abfbade 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -257,6 +257,7 @@ shopt -s nullglob
 
 # Set up the initial path.
 PATH=
+HOST_PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     addToSearchPath PATH "$i/bin"
@@ -272,6 +273,12 @@ if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
 BASH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 
+# For backward compatibility, we add SHELL to HOST_PATH so it can be
+# used in auto patch-shebangs. Unfortunately this will not work with
+# cross compilation because it will be for the builder’s platform.
+if [ -z "${strictDeps-}" ]; then
+    addToSearchPath HOST_PATH "$SHELL/bin"
+fi
 
 # Dummy implementation of the paxmark function. On Linux, this is
 # overwritten by paxctl's setup hook.

From 72cfa07dd3cb7120d07cbd751a201b116b0efcb2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 16 Sep 2018 17:25:42 -0500
Subject: [PATCH 1118/3253] parallel: fix patch-shebangs

For patch-shebangs to work we need perl to be listed as a build input because it will run on the target system, not the build one.

Fixes #46476

/cc @dtzWill
---
 pkgs/tools/misc/parallel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7af5e12081b6..11a9cd4ff87a 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -8,12 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm";
   };
 
-  nativeBuildInputs = [ makeWrapper perl ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl procps ];
 
   postInstall = ''
     wrapProgram $out/bin/parallel \
-      --prefix PATH : "${procps}/bin" \
-      --prefix PATH : "${perl}/bin" \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ procps perl ]}"
   '';
 
   doCheck = true;

From d6ecbe1410c847f76af21d4821dde1f751890dd0 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 17 Sep 2018 01:33:20 +0200
Subject: [PATCH 1119/3253] gtk-doc: don't build with dblatex by default

make it optional: withDblatex ? false
This removes the dependency of gtk-doc on texlive.
---
 pkgs/development/tools/documentation/gtk-doc/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 8ec6aec9918e..0213eca30d22 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
+, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool
+, withDblatex ? false, dblatex
 }:
 
 stdenv.mkDerivation rec {
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
     [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-      gnome-doc-utils dblatex gettext which itstool
-    ];
+      gnome-doc-utils gettext which itstool
+    ] ++ stdenv.lib.optional withDblatex dblatex;
 
   configureFlags = [ "--disable-scrollkeeper" ];
 

From d734328f5debc29c11b49ec4e9421be7e5d77d29 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 17 Sep 2018 01:16:37 +0200
Subject: [PATCH 1120/3253] ostree: fix tests

- Workarounds for https://github.com/ostreedev/ostree/issues/1592
- Disable failing test-gpg-verify-result.test, see
  https://github.com/ostreedev/ostree/issues/1634
---
 pkgs/tools/misc/ostree/default.nix            |  7 ++
 .../disable-test-gpg-verify-result.patch      | 12 +++
 pkgs/tools/misc/ostree/fix-1592.patch         | 97 +++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
 create mode 100644 pkgs/tools/misc/ostree/fix-1592.patch

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 8eb9be97c224..3cbdd498aa73 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -32,6 +32,11 @@ in stdenv.mkDerivation {
   };
 
   patches = [
+    # Workarounds for https://github.com/ostreedev/ostree/issues/1592
+    ./fix-1592.patch
+    # Disable test-gpg-verify-result.test,
+    # https://github.com/ostreedev/ostree/issues/1634
+    ./disable-test-gpg-verify-result.patch
     # Tests access the helper using relative path
     # https://github.com/ostreedev/ostree/issues/1593
     (fetchpatch {
@@ -58,6 +63,7 @@ in stdenv.mkDerivation {
     cp --no-preserve=mode -r ${bsdiff-src} bsdiff
   '';
 
+
   preConfigure = ''
     env NOCONFIGURE=1 ./autogen.sh
   '';
@@ -75,6 +81,7 @@ in stdenv.mkDerivation {
     "installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
   ];
 
+
   meta = with stdenv.lib; {
     description = "Git for operating system binaries";
     homepage = https://ostree.readthedocs.io/en/latest/;
diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
new file mode 100644
index 000000000000..d3ef7e08357a
--- /dev/null
+++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch
@@ -0,0 +1,12 @@
+diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am
+--- a/Makefile-tests.am	1970-01-01 01:00:01.000000000 +0100
++++ b/Makefile-tests.am	2018-09-17 00:24:11.977841113 +0200
+@@ -243,7 +243,7 @@
+ 
+ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \
+ 	tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \
+-	tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \
++	tests/test-checksum tests/test-lzma tests/test-rollsum \
+ 	tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h
+ 
+ if USE_AVAHI
diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch
new file mode 100644
index 000000000000..f26a924c0d83
--- /dev/null
+++ b/pkgs/tools/misc/ostree/fix-1592.patch
@@ -0,0 +1,97 @@
+diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh
+--- a/tests/pull-test.sh	1970-01-01 01:00:01.000000000 +0100
++++ b/tests/pull-test.sh	2018-09-16 23:55:44.214593856 +0200
+@@ -275,7 +275,7 @@
+ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then
+     fatal "pull with mixed refs succeeded?"
+ fi
+-assert_file_has_content err.txt "error: Invalid ref name origin:main"
++assert_file_has_content err.txt "Invalid ref name origin:main"
+ ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo localbranch
+ ${CMD_PREFIX} ostree --repo=mirrorrepo-local rev-parse localbranch
+ ${CMD_PREFIX} ostree --repo=mirrorrepo-local fsck
+@@ -286,7 +286,7 @@
+     fatal "pulled nonexistent branch"
+ fi
+ # So true
+-assert_file_has_content_literal err.txt "error: Refspec 'nosuchbranch' not found"
++assert_file_has_content_literal err.txt "Refspec 'nosuchbranch' not found"
+ echo "ok pull-local nonexistent branch"
+ 
+ cd ${test_tmpdir}
+@@ -587,5 +587,5 @@
+ if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then
+     fatal "pull of invalid ref succeeded"
+ fi
+-assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here  lots of html here  lots of html here  lots of'
++assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here  lots of html here  lots of html here  lots of'
+ echo "ok pull got HTML for a ref"
+diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh
+--- a/tests/test-fsck-collections.sh	1970-01-01 01:00:01.000000000 +0100
++++ b/tests/test-fsck-collections.sh	2018-09-17 02:22:48.922502037 +0200
+@@ -100,7 +100,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
+ assert_file_has_content fsck "^Validating refs...$"
+ 
+ echo "ok 3 fsck detects missing ref bindings"
+@@ -113,7 +113,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)"
++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)"
+ assert_file_has_content fsck "^Validating refs...$"
+ assert_file_has_content fsck "^Validating refs in collections...$"
+ 
+@@ -127,7 +127,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’"
++assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2."
+ assert_file_has_content fsck "^Validating refs...$"
+ assert_file_has_content fsck "^Validating refs in collections...$"
+ 
+@@ -147,7 +147,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist"
++assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist'
+ assert_file_has_content fsck "^Validating refs...$"
+ assert_file_has_content fsck "^Validating refs in collections...$"
+ 
+@@ -186,7 +186,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)"
++assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)"
+ assert_file_has_content fsck "^Validating refs...$"
+ 
+ echo "ok 9 fsck detects missing ref bindings"
+@@ -205,7 +205,7 @@
+ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then
+     assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!"
+ fi
+-assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist"
++assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist'
+ assert_file_has_content fsck "^Validating refs...$"
+ 
+ echo "ok 11 fsck ignores unreferenced ref bindings"
+diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh
+--- a/tests/test-remote-add.sh	1970-01-01 01:00:01.000000000 +0100
++++ b/tests/test-remote-add.sh	2018-09-17 00:14:16.486788225 +0200
+@@ -83,7 +83,7 @@
+ if $OSTREE remote delete nosuchremote 2>err.txt; then
+     assert_not_reached "Deleting remote unexpectedly succeeded"
+ fi
+-assert_file_has_content err.txt "error: "
++assert_file_has_content err.txt "not found"
+ 
+ $OSTREE remote delete --if-exists nosuchremote
+ echo "ok"

From 2c51846728e4877b04a79f6eee037ecb61a2548f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 16 Sep 2018 21:04:04 -0400
Subject: [PATCH 1121/3253] qt48: fix on darwin

because it's ancient, it relies on ancient APIs that Apple has deprecated
for literally years. Our new CoreFoundation cleanup means those APIs are no longer here, so let's kill the functionality. Eventually support for it
got removed from upstream too, so it's not as if we're doing anything too
awful here.
---
 .../libraries/qt-4.x/4.8/default.nix          |   1 +
 .../qt-4.x/4.8/kill-legacy-darwin-apis.patch  | 330 ++++++++++++++++++
 2 files changed, 331 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index f7ddf8ff780c..8715aaaa44d0 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
       ./parallel-configure.patch
       ./clang-5-darwin.patch
       ./qt-4.8.7-unixmake-darwin.patch
+      ./kill-legacy-darwin-apis.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
         cups = if cups != null then lib.getLib cups else null;
diff --git a/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
new file mode 100644
index 000000000000..c1338e98d851
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
@@ -0,0 +1,330 @@
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 4a9049b..c0ac9db 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -242,9 +242,8 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+ #else
+     char *ret = 0;
+ # if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
+-    // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation,
+-    // which does not work properly with the realpath(X,0) form. See QTBUG-28282.
+-    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
++    // In Nix-on-Darwin, we don't support ancient macOS anyway, and the deleted branch relies on
++    // a symbol that's been deprecated for years and that our CF doesn't have
+         ret = (char*)malloc(PATH_MAX + 1);
+         if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
+             const int savedErrno = errno; // errno is checked below, and free() might change it
+@@ -252,19 +251,6 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+             errno = savedErrno;
+             ret = 0;
+         }
+-    } else {
+-        // on 10.5 we can use FSRef to resolve the file path.
+-        QString path = QDir::cleanPath(entry.filePath());
+-        FSRef fsref;
+-        if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) {
+-            CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref);
+-            CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
+-            QString ret = QCFString::toQString(canonicalPath);
+-            CFRelease(canonicalPath);
+-            CFRelease(urlref);
+-            return QFileSystemEntry(ret);
+-        }
+-    }
+ # else
+ #  if _POSIX_VERSION >= 200801L
+     ret = realpath(entry.nativeFilePath().constData(), (char*)0);
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+index 3bf7342..b6bcfc0 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+@@ -43,7 +43,6 @@ BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second);
+ BOOL hasCaseInsensitiveSuffix(NSString *string, NSString *suffix);
+ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring);
+ NSString *filenameByFixingIllegalCharacters(NSString *string);
+-CFStringEncoding stringEncodingForResource(Handle resource);
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+index d6c3f0c..c88ca76 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+@@ -68,45 +68,4 @@ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring)
+     return filename;
+ }
+ 
+-CFStringEncoding stringEncodingForResource(Handle resource)
+-{
+-    short resRef = HomeResFile(resource);
+-    if (ResError() != noErr)
+-        return NSMacOSRomanStringEncoding;
+-    
+-    // Get the FSRef for the current resource file
+-    FSRef fref;
+-    OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL);
+-    if (error != noErr)
+-        return NSMacOSRomanStringEncoding;
+-    
+-    RetainPtr<CFURLRef> url(AdoptCF, CFURLCreateFromFSRef(NULL, &fref));
+-    if (!url)
+-        return NSMacOSRomanStringEncoding;
+-
+-    NSString *path = [(NSURL *)url.get() path];
+-
+-    // Get the lproj directory name
+-    path = [path stringByDeletingLastPathComponent];
+-    if (!stringIsCaseInsensitiveEqualToString([path pathExtension], @"lproj"))
+-        return NSMacOSRomanStringEncoding;
+-    
+-    NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent];
+-    RetainPtr<CFStringRef> locale(AdoptCF, CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName));
+-    if (!locale)
+-        return NSMacOSRomanStringEncoding;
+-
+-    LangCode lang;
+-    RegionCode region;
+-    error = LocaleStringToLangAndRegionCodes([(NSString *)locale.get() UTF8String], &lang, &region);
+-    if (error != noErr)
+-        return NSMacOSRomanStringEncoding;
+-
+-    TextEncoding encoding;
+-    error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding);
+-    if (error != noErr)
+-        return NSMacOSRomanStringEncoding;
+-    
+-    return encoding;
+-}
+ 
+diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+index 865ea32..20bda8d 100644
+--- a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+@@ -101,33 +101,6 @@ static WTF::RetainPtr<CFDictionaryRef> readPListFile(CFStringRef fileName, bool
+     return map;
+ }
+ 
+-static Vector<String> stringListFromResourceId(SInt16 id)
+-{
+-    Vector<String> list;
+-
+-    Handle handle = Get1Resource('STR#', id);
+-    if (!handle)
+-        return list;
+-
+-    CFStringEncoding encoding = stringEncodingForResource(handle);
+-
+-    unsigned char* p = (unsigned char*)*handle;
+-    if (!p)
+-        return list;
+-
+-    SInt16 count = *(SInt16*)p;
+-    p += sizeof(SInt16);
+-
+-    for (SInt16 i = 0; i < count; ++i) {
+-        unsigned char length = *p;
+-        WTF::RetainPtr<CFStringRef> str = CFStringCreateWithPascalString(0, p, encoding);
+-        list.append(str.get());
+-        p += 1 + length;
+-    }
+-
+-    return list;
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+     if (!load())
+@@ -202,36 +175,8 @@ bool PluginPackage::fetchInfo()
+         m_description = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginDescription"));
+ 
+     } else {
+-        int resFile = CFBundleOpenBundleResourceMap(m_module);
+-
+-        UseResFile(resFile);
+-
+-        Vector<String> mimes = stringListFromResourceId(MIMEListStringStringNumber);
+-
+-        if (mimes.size() % 2 != 0)
+-            return false;
+-
+-        Vector<String> descriptions = stringListFromResourceId(MIMEDescriptionStringNumber);
+-        if (descriptions.size() != mimes.size() / 2)
+-            return false;
+-
+-        for (size_t i = 0;  i < mimes.size(); i += 2) {
+-            String mime = mimes[i].lower();
+-            Vector<String> extensions;
+-            mimes[i + 1].lower().split(UChar(','), extensions);
+-
+-            m_mimeToExtensions.set(mime, extensions);
+-
+-            m_mimeToDescriptions.set(mime, descriptions[i / 2]);
+-        }
+-
+-        Vector<String> names = stringListFromResourceId(PluginNameOrDescriptionStringNumber);
+-        if (names.size() == 2) {
+-            m_description = names[0];
+-            m_name = names[1];
+-        }
+-
+-        CFBundleCloseBundleResourceMap(m_module, resFile);
++        LOG(Plugins, "Nix removed ancient code that relies on long-deprecated functionality that we don't want to support!");
++        return false;
+     }
+ 
+     LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
+diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+index b206e48..669d442 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+@@ -26,7 +26,6 @@
+ #import "config.h"
+ #import "NetscapePluginModule.h"
+ 
+-#import <WebCore/WebCoreNSStringExtras.h>
+ #import <wtf/HashSet.h>
+ 
+ using namespace WebCore;
+@@ -196,132 +195,6 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& plugi
+     return true;    
+ }
+ 
+-class ResourceMap {
+-public:
+-    explicit ResourceMap(CFBundleRef bundle)
+-        : m_bundle(bundle)
+-        , m_currentResourceFile(CurResFile())
+-        , m_bundleResourceMap(CFBundleOpenBundleResourceMap(m_bundle))
+-    {
+-        UseResFile(m_bundleResourceMap);
+-    }
+-
+-    ~ResourceMap()
+-    {
+-        // Close the resource map.
+-        CFBundleCloseBundleResourceMap(m_bundle, m_bundleResourceMap);
+-        
+-        // And restore the old resource.
+-        UseResFile(m_currentResourceFile);
+-    }
+-
+-    bool isValid() const { return m_bundleResourceMap != -1; }
+-
+-private:
+-    CFBundleRef m_bundle;
+-    ResFileRefNum m_currentResourceFile;
+-    ResFileRefNum m_bundleResourceMap;
+-};
+-
+-static bool getStringListResource(ResID resourceID, Vector<String>& stringList) {
+-    Handle stringListHandle = Get1Resource('STR#', resourceID);
+-    if (!stringListHandle || !*stringListHandle)
+-        return false;
+-
+-    // Get the string list size.
+-    Size stringListSize = GetHandleSize(stringListHandle);
+-    if (stringListSize < static_cast<Size>(sizeof(UInt16)))
+-        return false;
+-
+-    CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
+-
+-    unsigned char* ptr = reinterpret_cast<unsigned char*>(*stringListHandle);
+-    unsigned char* end = ptr + stringListSize;
+-    
+-    // Get the number of strings in the string list.
+-    UInt16 numStrings = *reinterpret_cast<UInt16*>(ptr);
+-    ptr += sizeof(UInt16);
+-
+-    for (UInt16 i = 0; i < numStrings; ++i) {
+-        // We're past the end of the string, bail.
+-        if (ptr >= end)
+-            return false;
+-
+-        // Get the string length.
+-        unsigned char stringLength = *ptr++;
+-
+-        RetainPtr<CFStringRef> cfString(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, ptr, stringLength, stringEncoding, false, kCFAllocatorNull));
+-        if (!cfString.get())
+-            return false;
+-
+-        stringList.append(cfString.get());
+-        ptr += stringLength;
+-    }
+-
+-    if (ptr != end)
+-        return false;
+-
+-    return true;
+-}
+-
+-static const ResID PluginNameOrDescriptionStringNumber = 126;
+-static const ResID MIMEDescriptionStringNumber = 127;
+-static const ResID MIMEListStringStringNumber = 128;
+-
+-static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo)
+-{
+-    ResourceMap resourceMap(bundle);
+-    if (!resourceMap.isValid())
+-        return false;
+-
+-    // Get the description and name string list.
+-    Vector<String> descriptionAndName;
+-    if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName))
+-        return false;
+-
+-    // Get the MIME types and extensions string list. This list needs to be a multiple of two.
+-    Vector<String> mimeTypesAndExtensions;
+-    if (!getStringListResource(MIMEListStringStringNumber, mimeTypesAndExtensions))
+-        return false;
+-
+-    if (mimeTypesAndExtensions.size() % 2)
+-        return false;
+-
+-    // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types.
+-    Vector<String> mimeTypeDescriptions;
+-    if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions))
+-        return false;
+-
+-    // Add all MIME types.
+-    for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) {
+-        MimeClassInfo mimeClassInfo;
+-        
+-        const String& mimeType = mimeTypesAndExtensions[i * 2];
+-        String description;
+-        if (i < mimeTypeDescriptions.size())
+-            description = mimeTypeDescriptions[i];
+-        
+-        mimeClassInfo.type = mimeType.lower();
+-        mimeClassInfo.desc = description;
+-        
+-        Vector<String> extensions;
+-        mimeTypesAndExtensions[i * 2 + 1].split(',', extensions);
+-        
+-        for (size_t i = 0; i < extensions.size(); ++i)
+-            mimeClassInfo.extensions.append(extensions[i].lower());
+-
+-        pluginInfo.mimes.append(mimeClassInfo);
+-    }
+-
+-    // Set the description and name if they exist.
+-    if (descriptionAndName.size() > 0)
+-        pluginInfo.desc = descriptionAndName[0];
+-    if (descriptionAndName.size() > 1)
+-        pluginInfo.name = descriptionAndName[1];
+-
+-    return true;
+-}
+-
+ bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
+ {
+     RetainPtr<CFStringRef> bundlePath(AdoptCF, pluginPath.createCFString());
+@@ -344,8 +217,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
+         return false;
+     
+     // Check that there's valid info for this plug-in.
+-    if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) &&
+-        !getPluginInfoFromCarbonResources(bundle.get(), plugin.info))
++    if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info))
+         return false;
+     
+     plugin.path = pluginPath;

From 7e5917a03169ea68aca0b57b48da8ef5fb56fb92 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 03:50:53 +0200
Subject: [PATCH 1122/3253] haskellPackages: Fix ListLike for 8.02 and 8.22

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 4 ++++
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index eca2d111b542..a28682004239 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -81,4 +81,8 @@ self: super: {
   haddock-library = self.haddock-library_1_4_3;
   haddock-api = self.haddock-api_2_17_4;
   haddock = self.haddock_2_17_5;
+
+  # GHC 8.0 doesn't have semigroups included by default
+  ListLike = addBuildDepend super.ListLike self.semigroups;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 5d499c803dae..af96a7425d1c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -96,4 +96,7 @@ self: super: {
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
   }));
 
+  # GHC 8.2 doesn't have semigroups included by default
+  ListLike = addBuildDepend super.ListLike self.semigroups;
+
 }

From a257d64f333caa50facc57c0e3fc6a64620ed348 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 17 Sep 2018 01:01:29 -0400
Subject: [PATCH 1123/3253] valgrind: don't force LLVM 3.9

This was added when 3.9 was the only one with llvm-dsymutil, but now
almost all of them have it, so the default works fine.
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c6ddbbe60d..5920927ae2f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8784,7 +8784,6 @@ with pkgs;
 
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (darwin) xnu bootstrap_cmds cctools;
-    llvm = llvm_39;
   };
   valgrind-light = self.valgrind.override { gdb = null; };
 

From d3f49bf5d852d406a8b7f5c543ee0cb58fef96a3 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 18:20:18 +0200
Subject: [PATCH 1124/3253] goimports: Remove in favor of gotools

---
 pkgs/development/tools/goimports/default.nix | 16 ----------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  2 --
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 pkgs/development/tools/goimports/default.nix

diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
deleted file mode 100644
index 14c319320d0c..000000000000
--- a/pkgs/development/tools/goimports/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, buildGoPackage, fetchgit }:
-
-buildGoPackage rec {
-  name = "goimports-${version}";
-  version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
-
-  goPackagePath = "golang.org/x/tools";
-  subPackages = [ "cmd/goimports" ];
-
-  src = fetchgit {
-    inherit rev;
-    url = "https://go.googlesource.com/tools";
-    sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b8298b76d778..26bc7ebc6f1a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -106,6 +106,7 @@ mapAliases ({
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   gnustep-make = gnustep.make; # added 2016-7-6
   go-pup = pup; # added 2017-12-19
+  goimports = gotools; # added 2018-09-16
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 493f0d8ae6e7..571c900e27dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14488,8 +14488,6 @@ with pkgs;
 
   godef = callPackage ../development/tools/godef { };
 
-  goimports = callPackage ../development/tools/goimports { };
-
   gopkgs = callPackage ../development/tools/gopkgs { };
 
   govers = callPackage ../development/tools/govers { };

From 09a5d8710a2186461d8b51accae850207e2ca42e Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 18:21:05 +0200
Subject: [PATCH 1125/3253] gotools: 2018-07-20 -> 2018-09-11

---
 pkgs/development/tools/gotools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 05e87d084606..76023faf3209 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "gotools-unstable-${version}";
-  version = "2018-07-20";
-  rev = "be728107ea8275e6f58ba07e246b94181acaab24";
+  version = "2018-09-11";
+  rev = "677d2ff680c188ddb7dcd2bfa6bc7d3f2f2f75b2";
 
   goPackagePath = "golang.org/x/tools";
   goPackageAliases = [ "code.google.com/p/go.tools" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://go.googlesource.com/tools";
-    sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw";
+    sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5";
   };
 
   goDeps = ./deps.nix;

From 4a8a3de99f0b6cbbe20577a0ae3938b1d050bf62 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 18:21:50 +0200
Subject: [PATCH 1126/3253] go2nix: goimports -> gotools

---
 pkgs/development/tools/go2nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 5ef12d88c06c..585f10336567 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
+{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper,
   fetchFromGitHub }:
 
 buildGoPackage rec {
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
-  buildInputs = [ go-bindata goimports makeWrapper ];
+  buildInputs = [ go-bindata gotools makeWrapper ];
   preBuild = ''go generate ./...'';
 
   postInstall = ''

From be506296d233d2f9112853fc8880a07240f335a9 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 18:22:44 +0200
Subject: [PATCH 1127/3253] godef: 20170920 -> 1.0.0

---
 pkgs/development/tools/godef/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix
index 3227ed8eec2e..497c765b5b1c 100644
--- a/pkgs/development/tools/godef/default.nix
+++ b/pkgs/development/tools/godef/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "godef-${version}";
-  version = "20170920-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "b692db1de5229d4248e23c41736b431eb665615d";
+  version = "1.0.0";
+  rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5";
 
   goPackagePath = "github.com/rogpeppe/godef";
   excludedPackages = "go/printer/testdata";
@@ -11,13 +11,13 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/rogpeppe/godef";
-    sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15";
+    sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg";
   };
 
   meta = {
     description = "Print where symbols are defined in Go source code";
     homepage = https://github.com/rogpeppe/godef/;
-    maintainers = with stdenv.lib.maintainers; [ vdemeester ];
+    maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ];
     license = stdenv.lib.licenses.bsd3;
   };
 }

From 395019b38d841428eb003375d6a30fb2f23d8a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 17 Sep 2018 05:09:34 -0300
Subject: [PATCH 1128/3253] sierra-gtk-theme: init at 2018-09-14 (#46737)

---
 pkgs/misc/themes/sierra/default.nix | 33 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/misc/themes/sierra/default.nix

diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix
new file mode 100644
index 000000000000..057b96febf3a
--- /dev/null
+++ b/pkgs/misc/themes/sierra/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "sierra-gtk-theme-${version}";
+  version = "2018-09-14";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = "sierra-gtk-theme";
+    rev = "4c07f9e4978ab2d87ce0f8d4a5d60da21784172c";
+    sha256 = "0mp5v462wbjq157hfnqzd8sw374mc611kpk92is2c3qhvj5qb6qd";
+  };
+
+  nativeBuildInputs = [ libxml2 ];
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    patchShebangs .
+    mkdir -p $out/share/themes
+    name= ./install.sh --dest $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Mac OSX like theme for GTK based desktop environments";
+    homepage = https://github.com/vinceliuice/Sierra-gtk-theme;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 493f0d8ae6e7..34dc49d8c0b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22009,6 +22009,8 @@ with pkgs;
     libsemanage = libsemanage.override { python = python3; };
   };
 
+  sierra-gtk-theme = callPackage ../misc/themes/sierra { };
+
   slock = callPackage ../misc/screensavers/slock {
     conf = config.slock.conf or null;
   };

From 00c7f76c849ff1a6e23fdcc1c599ae2a1edce0e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Sep 2018 01:14:53 -0700
Subject: [PATCH 1129/3253] libngspice: 26 -> 28 (#46225)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libngspice
---
 pkgs/development/libraries/libngspice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index b6d5912581ba..5a34910924ce 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -3,11 +3,11 @@
 # Note that this does not provide the ngspice command-line utility. For that see
 # the ngspice derivation.
 stdenv.mkDerivation {
-  name = "libngspice-26";
+  name = "libngspice-28";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
-    sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+    url = "mirror://sourceforge/ngspice/ngspice-28.tar.gz";
+    sha256 = "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l";
   };
 
   nativeBuildInputs = [ flex bison ];

From c45dd0494610ee567062a0d961d2ad756dbfe930 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Sep 2018 01:18:39 -0700
Subject: [PATCH 1130/3253] matomo: 3.5.1 -> 3.6.0 (#46242)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
matomo
---
 pkgs/servers/web-apps/matomo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index a4a26fd506bc..1fb8f4b1221b 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "0ifrgaw30h4d6hwwzrz8i9k036dxzkxgh71y9s0ds10lhr8vidym";
+    sha256 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 78372daca9ffe0341a2d37353219b79f977f9695 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Sep 2018 01:25:05 -0700
Subject: [PATCH 1131/3253] libcouchbase: 2.9.2 -> 2.9.4 (#46254)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libcouchbase
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 347e3218c1dc..4da0738fde5e 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.9.2";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z";
+    sha256 = "0d6lmnr5yfpkzr1yr6f2ilxprl6v9r4r7917k4iz0wc3jlcndwl3";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 37c3d6c3f61b038059569d0ddb758f8826a08bd6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 17 Sep 2018 01:25:34 -0700
Subject: [PATCH 1132/3253] arangodb: 3.3.14 -> 3.3.15 (#46305)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/arangodb/versions
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 9281bdd0af75..72485d388a15 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.14";
+  version = "3.3.15";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "00l0mvnyv8y0p13pyxx3hzsnwna9qfq7yjdpisvayipbl7zpvadc";
+    sha256 = "177n2l8k8fswxvz102n6lm0qsn0fvq0s2zx6skrfg4g7gil3wkyb";
   };
 
   buildInputs = [

From e4f196810098ba7fce635705a9e6a1298665a27b Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Mon, 17 Sep 2018 09:22:29 +0100
Subject: [PATCH 1133/3253] brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw
 cross builds

CMAKE passes the flag -rdynamic otherwise (which is not recognized by mingw).
Setting the appropriate flag avoids this problem and allows the build
to succeed.
---
 pkgs/tools/compression/brotli/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a63721466dbc..971a90a84f4c 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = stdenv.lib.optional
+    (stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
+
   outputs = [ "out" "dev" "lib" ];
 
   doCheck = true;

From f607f45f33e78cd9512019af331ef13bfe25dc07 Mon Sep 17 00:00:00 2001
From: Notkea <pacien@users.noreply.github.com>
Date: Mon, 17 Sep 2018 10:50:14 +0200
Subject: [PATCH 1134/3253] exim: add optional support for PAM (#46744)

---
 pkgs/servers/mail/exim/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 3acf777999f7..cf68b1bef40d 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -2,6 +2,7 @@
 , enableLDAP ? false, openldap
 , enableMySQL ? false, mysql, zlib
 , enableAuthDovecot ? false, dovecot
+, enablePAM ? false, pam
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ coreutils db openssl perl pcre ]
     ++ stdenv.lib.optional enableLDAP openldap
     ++ stdenv.lib.optionals enableMySQL [ mysql zlib ]
-    ++ stdenv.lib.optional enableAuthDovecot dovecot;
+    ++ stdenv.lib.optional enableAuthDovecot dovecot
+    ++ stdenv.lib.optional enablePAM pam;
 
   preBuild = ''
     ${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"}
@@ -57,6 +59,11 @@ stdenv.mkDerivation rec {
       ${stdenv.lib.optionalString enableAuthDovecot ''
         s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
       ''}
+      ${stdenv.lib.optionalString enablePAM ''
+        s:^# \(SUPPORT_PAM\)=.*:\1=yes:
+        s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam:
+        s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam:
+      ''}
       #/^\s*#.*/d
       #/^\s*$/d
     ' < src/EDITME > Local/Makefile

From 67e9571ba4bd7b27c26363f719531ed0b4ce17df Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 17 Sep 2018 05:02:21 -0400
Subject: [PATCH 1135/3253] nixos/lightdm: use systemd.tmpfiles (#46734)

This also makes logs appear at /var/log/lightdm
---
 .../services/x11/display-managers/lightdm.nix       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index cd9c3d81a0fb..ae2b05797fd0 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -197,7 +197,7 @@ in
       # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
       execCmd = ''
         export PATH=${lightdm}/sbin:$PATH
-        exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run
+        exec ${lightdm}/sbin/lightdm
       '';
     };
 
@@ -246,12 +246,19 @@ in
     '';
 
     users.users.lightdm = {
-      createHome = true;
-      home = "/var/lib/lightdm-data";
+      home = "/var/lib/lightdm";
       group = "lightdm";
       uid = config.ids.uids.lightdm;
     };
 
+    systemd.tmpfiles.rules = [
+      "d /var/run/lightdm 0711 lightdm lightdm 0"
+      "d /var/cache/lightdm 0711 root lightdm -"
+      "d /var/lib/lightdm 1770 lightdm lightdm -"
+      "d /var/lib/lightdm-data 1775 lightdm lightdm -"
+      "d /var/log/lightdm 0711 root lightdm -"
+    ];
+
     users.groups.lightdm.gid = config.ids.gids.lightdm;
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there

From 7c98b3d0d1f3c803993df2b9e962388452eacd14 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Mon, 17 Sep 2018 11:23:12 +0200
Subject: [PATCH 1136/3253] prometheus_2: 2.2.1 -> 2.3.2 (#46333)

---
 pkgs/servers/monitoring/prometheus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 37d82326cc29..b254b8470c42 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -50,7 +50,7 @@ in rec {
   };
 
   prometheus_2 = generic {
-    version = "2.2.1";
-    sha256 = "1zwxjmj8jh02i4y3i3zrkz7ml66zyhg3ad1npjzf3319mglsp7ch";
+    version = "2.3.2";
+    sha256 = "09q3p3kvgrvgyfkkvpy2mmlr6jxzxad6nzjni3iycs4bahsxl27a";
   };
 }

From 794c4ec7fb778c06c22e05291d0f7566897d2d93 Mon Sep 17 00:00:00 2001
From: rembo10 <801525+rembo10@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:45:27 +0300
Subject: [PATCH 1137/3253] postman: 6.2.5 -> 6.3.0 (#46771)

---
 pkgs/development/web/postman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 0c8daaee6ef1..bf18ce5d75cf 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "postman-${version}";
-  version = "6.2.5";
+  version = "6.3.0";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "9fd52b4c4ac744d3c70f28e39dbfeda3d03a8640c562e82e3744c2f9d0f8ade1";
+    sha256 = "09m511y977478567lc28mhy68b99ssajzhirc1c4anxnvvs7s6fa";
     name = "${name}.tar.gz";
   };
 

From eb9de57dd7b99d05d21aff5200333399557018c9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 17 Sep 2018 12:41:24 +0200
Subject: [PATCH 1138/3253] =?UTF-8?q?gcolor3:=202.3=20=E2=86=92=202.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/graphics/gcolor3/default.nix | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index cd43cd2fe723..ed350b2b0eee 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,29 +1,18 @@
-{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchFromGitLab, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
 
 let
-  version = "2.3";
+  version = "2.3.1";
 in stdenv.mkDerivation {
   name = "gcolor3-${version}";
 
-  src = fetchFromGitHub {
-    owner = "hjdskes";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "World";
     repo = "gcolor3";
     rev = "v${version}";
-    sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb";
+    sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
   };
 
-  patches = [
-    # Fix darwin build
-    (fetchpatch {
-      url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch;
-      sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r";
-    })
-    (fetchpatch {
-      url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch;
-      sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3";
-    })
-  ];
-
   nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
 
   buildInputs = [ gtk3 hicolor-icon-theme ];
@@ -35,8 +24,8 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A simple color chooser written in GTK3";
-    homepage = https://hjdskes.github.io/projects/gcolor3/;
-    license = licenses.gpl2;
+    homepage = https://www.hjdskes.nl/projects/gcolor3/;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
   };

From 8f5223376afdea2b5b4ccf7c8183e883aa66bb96 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 17 Sep 2018 06:59:18 -0400
Subject: [PATCH 1139/3253] linux: 4.19-rc3 -> 4.19-rc4

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 3be377205824..4bfea7a10988 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc3";
-  modDirVersion = "4.19.0-rc3";
+  version = "4.19-rc4";
+  modDirVersion = "4.19.0-rc4";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0n372r1j3m2q47hwl8b1r57jq1b4fdhmadgvcvik6fpsvcw74w27";
+    sha256 = "083nlh25zddrbg1hzyxfpg9i7h91ij9f299i52r5zwzi85yi8whn";
   };
 
   # Should the testing kernels ever be built on Hydra?

From b0956b0ae3e89549a13b9a47dc3cbc5eba5f10af Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 17 Sep 2018 12:58:12 +0200
Subject: [PATCH 1140/3253] nixos tests doc: fix example statement

False statements don't cause NixOS tests to fail, we need to throw an
exception or terminate.
---
 nixos/doc/manual/development/writing-nixos-tests.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 5935fbc049bd..983f8f9cbe3e 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis
 <programlisting>
 $machine->start;
 $machine->waitForUnit("default.target");
-$machine->succeed("uname") =~ /Linux/;
+die unless $machine->succeed("uname") =~ /Linux/;
 </programlisting>
   The first line is actually unnecessary; machines are implicitly started when
   you first execute an action on them (such as <literal>waitForUnit</literal>

From 6e203af3998171548c5febb0cd52a061bae82cf8 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 17 Sep 2018 12:58:13 +0200
Subject: [PATCH 1141/3253] nixos tests doc: add example statement

---
 .../doc/manual/development/running-nixos-tests-interactively.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 862b364a6d79..4680433bc997 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -19,6 +19,7 @@ starting VDE switch for network 1
 &gt; startAll
 &gt; testScript
 &gt; $machine->succeed("touch /tmp/foo")
+&gt; print($machine->succeed("pwd"), "\n") # Show stdout of command
 </screen>
   The function <command>testScript</command> executes the entire test script
   and drops you back into the test driver command line upon its completion.

From a91330a41b5440796150b61903e767e648b8ec97 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 17 Sep 2018 12:58:14 +0200
Subject: [PATCH 1142/3253] nixos tests doc: update VM state path

---
 .../development/running-nixos-tests-interactively.xml    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 4680433bc997..b25d3dcb9116 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -34,8 +34,11 @@ $ nix-build nixos/tests/login.nix -A driver
 $ ./result/bin/nixos-run-vms
 </screen>
   The script <command>nixos-run-vms</command> starts the virtual machines
-  defined by test. The root file system of the VMs is created on the fly and
-  kept across VM restarts in
-  <filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.
+  defined by test.
+ </para>
+
+ <para>
+  The machine state is kept across VM restarts in
+  <filename>/tmp/vm-state-</filename><varname>machinename</varname>.
  </para>
 </section>

From 4c755e1218bb11aba5f49ff7f5a8a2c31fdf1b41 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 17 Sep 2018 12:58:15 +0200
Subject: [PATCH 1143/3253] nixos display-managers: fix typo in description

---
 nixos/modules/services/x11/display-managers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index f561c5f8b7a9..357fa8ce8f36 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -266,7 +266,7 @@ in
           session.  Each session script can set the
           <varname>waitPID</varname> shell variable to make this script
           wait until the end of the user session.  Each script is used
-          to define either a windows manager or a desktop manager.  These
+          to define either a window manager or a desktop manager.  These
           can be differentiated by setting the attribute
           <varname>manage</varname> either to <literal>"window"</literal>
           or <literal>"desktop"</literal>.

From c907aa741c1baaff027b3b47613adc6d41461c14 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 17 Sep 2018 08:11:30 -0500
Subject: [PATCH 1144/3253] ibm-plex: 1.0.2 -> 1.1.6

---
 pkgs/data/fonts/ibm-plex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index fec45bf7bf26..ba214dd35fd0 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "1.0.2";
+  version = "1.1.6";
 in fetchzip rec {
   name = "ibm-plex-${version}";
   url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip rec {
     mkdir -p $out/share/fonts
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
-  sha256 = "1ixxm47lwsrc136z6cxkk5dm3svmvcvq0ya8q8ayvn68q5ijbh5m";
+  sha256 = "0n9qmh6v7gvrl1mfb0knygxlbkb78hvkdrppssx64m3pk4pxw85a";
 
   meta = with lib; {
     description = "IBM Plex Typeface";

From a31a917eb9412c891e326a8db6611f410f6a793a Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 19 Aug 2018 17:54:46 +0200
Subject: [PATCH 1145/3253] codimd: init at 1.2.0

---
 .../web-apps/codimd/CodeMirror/default.nix    |    46 +
 .../web-apps/codimd/CodeMirror/deps.json      |     8 +
 .../web-apps/codimd/CodeMirror/generate.sh    |     7 +
 .../codimd/CodeMirror/node-packages.nix       |  1459 ++
 .../web-apps/codimd/CodeMirror/node.nix       |    17 +
 pkgs/servers/web-apps/codimd/default.nix      |   156 +
 pkgs/servers/web-apps/codimd/deps.json        |   150 +
 pkgs/servers/web-apps/codimd/generate.sh      |     7 +
 .../servers/web-apps/codimd/node-packages.nix | 17911 ++++++++++++++++
 pkgs/servers/web-apps/codimd/node.nix         |    17 +
 pkgs/top-level/all-packages.nix               |     2 +
 11 files changed, 19780 insertions(+)
 create mode 100644 pkgs/servers/web-apps/codimd/CodeMirror/default.nix
 create mode 100644 pkgs/servers/web-apps/codimd/CodeMirror/deps.json
 create mode 100755 pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
 create mode 100644 pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
 create mode 100644 pkgs/servers/web-apps/codimd/CodeMirror/node.nix
 create mode 100644 pkgs/servers/web-apps/codimd/default.nix
 create mode 100644 pkgs/servers/web-apps/codimd/deps.json
 create mode 100755 pkgs/servers/web-apps/codimd/generate.sh
 create mode 100644 pkgs/servers/web-apps/codimd/node-packages.nix
 create mode 100644 pkgs/servers/web-apps/codimd/node.nix

diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/default.nix b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix
new file mode 100644
index 000000000000..e4899597de4f
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/CodeMirror/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }:
+
+let
+  nodePackages = import ./node.nix {
+    inherit pkgs;
+    system = stdenv.system;
+  };
+
+  phantomjs-prebuilt = nodePackages."phantomjs-prebuilt-^2.1.12".override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ phantomjs2 ];
+  });
+in
+
+stdenv.mkDerivation {
+  name = "codemirror-hackmdio-05-07-2018";
+
+  src = fetchFromGitHub {
+    owner = "hackmdio";
+    repo = "CodeMirror";
+    rev = "df412731ed3923124f9a43f60e84bdf855eb843a";
+    sha256 = "02v2wccv9sjdda9x45ib8d08i1pc4b8kwg3p6qc314wqq89nhniw";
+  };
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
+    "blint-^1"
+    "node-static-0.6.0"
+    "rollup-^0.41.0"
+    "rollup-plugin-buble-^0.15.0"
+    "rollup-watch-^3.2.0"
+    "uglify-js-^2.8.15"
+  ] nodePackages);
+
+  buildPhase = ''
+    patchShebangs .
+    npm run build
+    node release
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/node_modules/codemirror
+    cp -R {codemirror.min.js,addon,bin,keymap,lib,mode,theme} $out/lib/node_modules/codemirror/
+    ln -s ${nodePackages."url-loader-^0.5.7"}/lib/node_modules/url-loader \
+      $out/lib/node_modules
+  '';
+}
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/deps.json b/pkgs/servers/web-apps/codimd/CodeMirror/deps.json
new file mode 100644
index 000000000000..672e413a4a9e
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/CodeMirror/deps.json
@@ -0,0 +1,8 @@
+[ { "blint": "^1" }
+, { "node-static": "0.6.0" }
+, { "phantomjs-prebuilt": "^2.1.12" }
+, { "rollup": "^0.41.0" }
+, { "rollup-plugin-buble": "^0.15.0" }
+, { "rollup-watch": "^3.2.0" }
+, { "uglify-js": "^2.8.15" }
+, { "url-loader": "^0.5.7" } ]
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
new file mode 100755
index 000000000000..c42da7340c31
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/CodeMirror/generate.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+node2nix -6 -i deps.json \
+  -e ../../../../development/node-packages/node-env.nix \
+  --no-copy-node-env \
+  -c node.nix
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
new file mode 100644
index 000000000000..a2d475d5831a
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/CodeMirror/node-packages.nix
@@ -0,0 +1,1459 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
+    "acorn-5.7.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
+      };
+    };
+    "acorn-jsx-3.0.1" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
+      };
+    };
+    "acorn-object-spread-1.0.0" = {
+      name = "acorn-object-spread";
+      packageName = "acorn-object-spread";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz";
+        sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68";
+      };
+    };
+    "ajv-5.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
+        sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-styles-1.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
+        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "asn1-0.2.4" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "aws-sign2-0.7.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    };
+    "aws4-1.8.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
+        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "big.js-3.2.0" = {
+      name = "big.js";
+      packageName = "big.js";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz";
+        sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "buble-0.15.2" = {
+      name = "buble";
+      packageName = "buble";
+      version = "0.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buble/-/buble-0.15.2.tgz";
+        sha1 = "547fc47483f8e5e8176d82aa5ebccb183b02d613";
+      };
+    };
+    "buffer-from-1.1.1" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+      };
+    };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "chalk-0.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "combined-stream-1.0.6" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "concat-stream-1.6.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "debug-2.6.9" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "emojis-list-2.1.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+      };
+    };
+    "es6-promise-4.2.4" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
+        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "estree-walker-0.2.1" = {
+      name = "estree-walker";
+      packageName = "estree-walker";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz";
+        sha1 = "bdafe8095383d8414d5dc2ecf4c9173b6db9412e";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "extract-zip-1.6.7" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
+        sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "fast-deep-equal-1.1.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
+        sha1 = "c053477817c86b51daa853c81e059b733d023614";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-2.3.2" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
+        sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
+      };
+    };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    };
+    "har-validator-5.1.0" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz";
+        sha512 = "+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==";
+      };
+    };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
+    "has-color-0.1.7" = {
+      name = "has-color";
+      packageName = "has-color";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+      };
+    };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "is-buffer-1.1.6" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
+      };
+    };
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "kind-of-3.2.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    };
+    "klaw-1.3.1" = {
+      name = "klaw";
+      packageName = "klaw";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "loader-utils-1.1.0" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz";
+        sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "magic-string-0.14.0" = {
+      name = "magic-string";
+      packageName = "magic-string";
+      version = "0.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz";
+        sha1 = "57224aef1701caeed273b17a39a956e72b172462";
+      };
+    };
+    "mime-1.3.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz";
+        sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0";
+      };
+    };
+    "mime-db-1.35.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.35.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
+        sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
+      };
+    };
+    "mime-types-2.1.19" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
+        sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "nomnom-1.8.1" = {
+      name = "nomnom";
+      packageName = "nomnom";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
+        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
+      };
+    };
+    "oauth-sign-0.9.0" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
+        sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+      };
+    };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+      };
+    };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      };
+    };
+    "psl-1.1.29" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.1.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz";
+        sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+      };
+    };
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "request-2.88.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
+        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
+    "require-relative-0.8.7" = {
+      name = "require-relative";
+      packageName = "require-relative";
+      version = "0.8.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz";
+        sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "rollup-pluginutils-1.5.2" = {
+      name = "rollup-pluginutils";
+      packageName = "rollup-pluginutils";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz";
+        sha1 = "1e156e778f94b7255bfa1b3d0178be8f5c552408";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-support-0.4.18" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.4.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
+        sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
+      };
+    };
+    "sshpk-1.14.2" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "strip-ansi-0.1.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    };
+    "underscore-1.6.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "vlq-0.2.3" = {
+      name = "vlq";
+      packageName = "vlq";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz";
+        sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    };
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
+      };
+    };
+  };
+in
+{
+  "blint-^1" = nodeEnv.buildNodePackage {
+    name = "blint";
+    packageName = "blint";
+    version = "1.0.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/blint/-/blint-1.0.3.tgz";
+      sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A==";
+    };
+    dependencies = [
+      sources."acorn-5.7.1"
+      sources."ansi-styles-1.0.0"
+      sources."chalk-0.4.0"
+      sources."has-color-0.1.7"
+      sources."nomnom-1.8.1"
+      sources."strip-ansi-0.1.1"
+      sources."underscore-1.6.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "No-ceremony linter";
+      homepage = http://github.com/marijnh/blint;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "node-static-0.6.0" = nodeEnv.buildNodePackage {
+    name = "node-static";
+    packageName = "node-static";
+    version = "0.6.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-static/-/node-static-0.6.0.tgz";
+      sha1 = "e8543a897f3c82048220b39569284d44796eb1e2";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple, compliant file streaming module for node";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "phantomjs-prebuilt-^2.1.12" = nodeEnv.buildNodePackage {
+    name = "phantomjs-prebuilt";
+    packageName = "phantomjs-prebuilt";
+    version = "2.1.16";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
+      sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.8.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."buffer-from-1.1.1"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."concat-stream-1.6.2"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."es6-promise-4.2.4"
+      sources."extend-3.0.2"
+      sources."extract-zip-1.6.7"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fd-slicer-1.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-extra-1.0.0"
+      sources."getpass-0.1.7"
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.0"
+      sources."hasha-2.2.0"
+      sources."http-signature-1.2.0"
+      sources."inherits-2.0.3"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kew-0.7.0"
+      sources."klaw-1.3.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."oauth-sign-0.9.0"
+      sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."psl-1.1.29"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."request-2.88.0"
+      sources."request-progress-2.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
+      sources."string_decoder-1.1.1"
+      sources."throttleit-1.0.0"
+      sources."tough-cookie-2.4.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."yauzl-2.4.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Headless WebKit with JS API";
+      homepage = https://github.com/Medium/phantomjs;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "rollup-^0.41.0" = nodeEnv.buildNodePackage {
+    name = "rollup";
+    packageName = "rollup";
+    version = "0.41.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz";
+      sha1 = "e0d05497877a398c104d816d2733a718a7a94e2a";
+    };
+    dependencies = [
+      sources."source-map-0.5.7"
+      sources."source-map-support-0.4.18"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Next-generation ES6 module bundler";
+      homepage = https://github.com/rollup/rollup;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "rollup-plugin-buble-^0.15.0" = nodeEnv.buildNodePackage {
+    name = "rollup-plugin-buble";
+    packageName = "rollup-plugin-buble";
+    version = "0.15.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz";
+      sha1 = "83c3e89c7fd2266c7918f41ba3980313519c7fd0";
+    };
+    dependencies = [
+      sources."acorn-3.3.0"
+      sources."acorn-jsx-3.0.1"
+      sources."acorn-object-spread-1.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buble-0.15.2"
+      sources."chalk-1.1.3"
+      sources."concat-map-0.0.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."estree-walker-0.2.1"
+      sources."has-ansi-2.0.0"
+      sources."magic-string-0.14.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."os-homedir-1.0.2"
+      sources."rollup-pluginutils-1.5.2"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."vlq-0.2.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Compile ES2015 with buble";
+      homepage = "https://gitlab.com/rich-harris/rollup-plugin-buble#README";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "rollup-watch-^3.2.0" = nodeEnv.buildNodePackage {
+    name = "rollup-watch";
+    packageName = "rollup-watch";
+    version = "3.2.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rollup-watch/-/rollup-watch-3.2.2.tgz";
+      sha1 = "5e574232e9ef36da9177f46946d8080cb267354b";
+    };
+    dependencies = [
+      sources."require-relative-0.8.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Watch files for changes and perform incremental rebuilds with Rollup";
+      homepage = "https://github.com/rollup/rollup-watch#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "uglify-js-^2.8.15" = nodeEnv.buildNodePackage {
+    name = "uglify-js";
+    packageName = "uglify-js";
+    version = "2.8.29";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+      sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+    };
+    dependencies = [
+      sources."align-text-0.1.4"
+      sources."camelcase-1.2.1"
+      sources."center-align-0.1.3"
+      sources."cliui-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."is-buffer-1.1.6"
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-1.0.4"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."right-align-0.1.3"
+      sources."source-map-0.5.7"
+      sources."uglify-to-browserify-1.0.2"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.2"
+      sources."yargs-3.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript parser, mangler/compressor and beautifier toolkit";
+      homepage = http://lisperator.net/uglifyjs;
+      license = "BSD-2-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "url-loader-^0.5.7" = nodeEnv.buildNodePackage {
+    name = "url-loader";
+    packageName = "url-loader";
+    version = "0.5.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz";
+      sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."mime-1.3.6"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "url loader module for webpack";
+      homepage = "https://github.com/webpack/url-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/codimd/CodeMirror/node.nix b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix
new file mode 100644
index 000000000000..85aedb8a5a4c
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/CodeMirror/node.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+
+let
+  nodeEnv = import ../../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix
new file mode 100644
index 000000000000..d99542d3ea27
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/default.nix
@@ -0,0 +1,156 @@
+{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
+, fetchpatch, nodejs-6_x, phantomjs2 }:
+let
+  nodePackages = import ./node.nix {
+    inherit pkgs;
+    system = stdenv.system;
+  };
+
+  addPhantomjs = (pkgs:
+    map (pkg: pkg.override ( oldAttrs: {
+      buildInputs = oldAttrs.buildInputs or [] ++ [ phantomjs2 ];
+    })) pkgs);
+
+  drvName = drv: (builtins.parseDrvName drv).name;
+
+  linkNodeDeps = ({ pkg, deps, name ? "" }:
+    nodePackages.${pkg}.override (oldAttrs: {
+      postInstall = stdenv.lib.concatStringsSep "\n" (map (dep: ''
+        ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \
+          $out/lib/node_modules/${if name != "" then name else drvName pkg}/node_modules
+      '') deps
+      );
+    })
+  );
+
+  filterNodePackagesToList = (filterPkgs: allPkgs:
+    stdenv.lib.mapAttrsToList (_: v: v) (
+      stdenv.lib.filterAttrs (n: _:
+        ! builtins.elem (drvName n) filterPkgs
+      ) allPkgs)
+  );
+
+  # add phantomjs to buildInputs
+  pkgsWithPhantomjs = (addPhantomjs (map (
+    p: nodePackages.${p}
+  ) [
+    "js-url-^2.3.0"
+    "markdown-pdf-^8.0.0"
+  ]));
+
+  # link extra dependencies to lib/node_modules
+  pkgsWithExtraDeps = map (args:
+    linkNodeDeps args ) [
+    { pkg = "select2-^3.5.2-browserify";
+      deps = [ "url-loader-^0.5.7" ]; }
+    { pkg = "js-sequence-diagrams-^1000000.0.6";
+      deps = [ "lodash-^4.17.4" ]; }
+    { pkg = "ionicons-~2.0.1";
+      deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
+    { pkg = "font-awesome-^4.7.0";
+      deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
+    { pkg = "bootstrap-^3.3.7";
+      deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
+    { pkg = "markdown-it-^8.2.2";
+      deps = [ "json-loader-^0.5.4" ]; }
+    { pkg = "markdown-it-emoji-^1.3.0";
+      deps = [ "json-loader-^0.5.4" ]; }
+    { pkg = "raphael-git+https://github.com/dmitrybaranovskiy/raphael";
+      deps = [ "eve-^0.5.4" ];
+      name = "raphael"; }
+  ];
+
+  codemirror = pkgs.callPackage ./CodeMirror { };
+
+  nodeEnv = buildEnv {
+    name = "codimd-env";
+    paths = pkgsWithPhantomjs ++ pkgsWithExtraDeps ++ [
+      codemirror
+   ] ++ filterNodePackagesToList [
+     "bootstrap"
+     "codemirror-git+https://github.com/hackmdio/CodeMirror.git"
+     "font-awesome"
+     "ionicons"
+     "js-sequence-diagrams"
+     "js-url"
+     "markdown-it"
+     "markdown-pdf"
+"node-uuid"
+     "raphael-git+https://github.com/dmitrybaranovskiy/raphael"
+     "select2-browserify"
+   ] nodePackages;
+  };
+
+  name = "codimd-${version}";
+  version = "1.2.0";
+
+  src = stdenv.mkDerivation {
+    name = "${name}-src";
+    inherit version;
+
+    src = fetchFromGitHub {
+      owner = "hackmdio";
+      repo = "codimd";
+      rev = version;
+      sha256 = "003v90g5sxxjv5smxvz6y6bq2ny0xpxhsx2cdgkvj7jla243v48s";
+    };
+
+    dontBuild = true;
+
+    installPhase = ''
+      mkdir $out
+      cp -R . $out
+    '';
+  };
+in
+stdenv.mkDerivation rec {
+  inherit name version src;
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ nodejs-6_x ];
+
+  NODE_PATH = "${nodeEnv}/lib/node_modules";
+
+  patches = [
+    (fetchpatch { # fixes for configurable paths
+      url = "https://patch-diff.githubusercontent.com/raw/hackmdio/codimd/pull/940.patch";
+      sha256 = "0n9lfaxirngywx8m5f0nqzykqdjzc8f3cl10ir1g7s5kq4zc7hhn";
+    })
+  ];
+
+  buildPhase = ''
+    ln -s ${nodeEnv}/lib/node_modules node_modules
+    npm run build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cat > $out/bin/codimd <<EOF
+      #!${stdenv.shell}/bin/sh
+      ${nodejs-6_x}/bin/node $out/app.js
+    EOF
+    cp -R {app.js,bin,lib,locales,package.json,public} $out/
+  '';
+
+  postFixup = ''
+    chmod +x $out/bin/codimd
+    wrapProgram $out/bin/codimd \
+      --set NODE_PATH "${nodeEnv}/lib/node_modules"
+  '';
+
+  passthru = {
+    sequelize = pkgs.writeScript "codimd-sequelize" ''
+      #!${pkgs.bash}/bin/bash -e
+      export NODE_PATH="${nodeEnv}/lib/node_modules"
+      exec -a "$0" "${nodeEnv}/lib/node_modules/sequelize-cli/bin/sequelize" "$@"
+    '';
+  };
+
+  meta = with stdenv.lib; {
+    description = "Realtime collaborative markdown notes on all platforms";
+    license = licenses.agpl3;
+    homepage = https://github.com/hackmdio/codimd;
+    maintainers = with maintainers; [ willibutz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/servers/web-apps/codimd/deps.json b/pkgs/servers/web-apps/codimd/deps.json
new file mode 100644
index 000000000000..c7cf790fe58e
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/deps.json
@@ -0,0 +1,150 @@
+[ { "eve": "^0.5.4" }
+
+, { "babel-cli": "^6.18.0" }
+, { "babel-core": "^6.21.0" }
+, { "babel-loader": "^6.2.10" }
+, { "babel-plugin-transform-runtime": "^6.15.0" }
+, { "babel-polyfill": "^6.22.0" }
+, { "babel-preset-es2015": "^6.18.0" }
+, { "babel-runtime": "^6.20.0" }
+, { "copy-webpack-plugin": "^4.0.1" }
+, { "css-loader": "^0.26.1" }
+, { "doctoc": "^1.3.0" }
+, { "ejs-loader": "^0.3.0" }
+, { "exports-loader": "^0.6.3" }
+, { "expose": "^0.1.4" }
+, { "expose-loader": "^0.7.1" }
+, { "extract-text-webpack-plugin": "^1.0.1" }
+, { "file-loader": "^0.9.0" }
+, { "html-webpack-plugin": "^2.25.0" }
+, { "imports-loader": "^0.7.0" }
+, { "json-loader": "^0.5.4" }
+, { "jsonlint": "^1.6.2" }
+, { "less": "^2.7.1" }
+, { "less-loader": "^2.2.3" }
+, { "optimize-css-assets-webpack-plugin": "^1.3.0" }
+, { "script-loader": "^0.7.0" }
+, { "standard": "^9.0.1" }
+, { "string-loader": "^0.0.1" }
+, { "style-loader": "^0.13.1" }
+, { "url-loader": "^0.5.7" }
+, { "webpack": "^1.14.0" }
+, { "webpack-parallel-uglify-plugin": "^0.2.0" }
+
+, { "Idle.Js": "git+https://github.com/shawnmclean/Idle.js" }
+, { "archiver": "^2.1.1" }
+, { "async": "^2.1.4" }
+, { "aws-sdk": "^2.7.20" }
+, { "base64url": "^3.0.0" }
+, { "azure-storage": "^2.7.0" }
+, { "blueimp-md5": "^2.6.0" }
+, { "body-parser": "^1.15.2" }
+, { "bootstrap": "^3.3.7" }
+, { "bootstrap-validator": "^0.11.8" }
+, { "chance": "^1.0.4" }
+, { "cheerio": "^0.22.0" }
+, { "codemirror": "git+https://github.com/hackmdio/CodeMirror.git" }
+, { "compression": "^1.6.2" }
+, { "connect-flash": "^0.1.1" }
+, { "connect-session-sequelize": "^4.1.0" }
+, { "cookie": "0.3.1" }
+, { "cookie-parser": "1.4.3" }
+, { "deep-freeze": "^0.0.1" }
+, { "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git" }
+, { "ejs": "^2.5.5" }
+, { "emojify.js": "~1.1.0" }
+, { "express": ">=4.14" }
+, { "express-session": "^1.14.2" }
+, { "file-saver": "^1.3.3" }
+, { "flowchart.js": "^1.6.4" }
+, { "font-awesome": "^4.7.0" }
+, { "formidable": "^1.0.17" }
+, { "gist-embed": "~2.6.0" }
+, { "graceful-fs": "^4.1.11" }
+, { "handlebars": "^4.0.6" }
+, { "helmet": "^3.3.0" }
+, { "highlight.js": "~9.12.0" }
+, { "i18n": "^0.8.3" }
+, { "imgur": "git+https://github.com/hackmdio/node-imgur.git" }
+, { "ionicons": "~2.0.1" }
+, { "jquery": "^3.1.1" }
+, { "jquery-mousewheel": "^3.1.13" }
+, { "jquery-ui": "^1.12.1" }
+, { "js-cookie": "^2.1.3" }
+, { "js-sequence-diagrams": "^1000000.0.6" }
+, { "js-url": "^2.3.0" }
+, { "js-yaml": "^3.7.0" }
+, { "jsdom-nogyp": "^0.8.3" }
+, { "keymaster": "^1.6.2" }
+, { "list.js": "^1.5.0" }
+, { "lodash": "^4.17.4" }
+, { "lz-string": "1.4.4" }
+, { "markdown-it": "^8.2.2" }
+, { "markdown-it-abbr": "^1.0.4" }
+, { "markdown-it-container": "^2.0.0" }
+, { "markdown-it-deflist": "^2.0.1" }
+, { "markdown-it-emoji": "^1.3.0" }
+, { "markdown-it-footnote": "^3.0.1" }
+, { "markdown-it-imsize": "^2.0.1" }
+, { "markdown-it-ins": "^2.0.0" }
+, { "markdown-it-mark": "^2.0.0" }
+, { "markdown-it-mathjax": "^2.0.0" }
+, { "markdown-it-regexp": "^0.4.0" }
+, { "markdown-it-sub": "^1.0.0" }
+, { "markdown-it-sup": "^1.0.0" }
+, { "markdown-pdf": "^8.0.0" }
+, { "mathjax": "~2.7.0" }
+, { "mermaid": "~7.1.0" }
+, { "mattermost": "^3.4.0" }
+, { "meta-marked": "^0.4.2" }
+, { "method-override": "^2.3.7" }
+, { "minimist": "^1.2.0" }
+, { "minio": "^6.0.0" }
+, { "moment": "^2.17.1" }
+, { "morgan": "^1.7.0" }
+, { "mysql": "^2.12.0" }
+, { "node-uuid": "^1.4.7" }
+, { "octicons": "~4.4.0" }
+, { "passport": "^0.4.0" }
+, { "passport-dropbox-oauth2": "^1.1.0" }
+, { "passport-facebook": "^2.1.1" }
+, { "passport-github": "^1.1.0" }
+, { "passport-gitlab2": "^4.0.0" }
+, { "passport-google-oauth20": "^1.0.0" }
+, { "passport-ldapauth": "^2.0.0" }
+, { "passport-local": "^1.0.0" }
+, { "passport-oauth2": "^1.4.0" }
+, { "passport-twitter": "^1.0.4" }
+, { "passport-saml": "^0.31.0" }
+, { "passport.socketio": "^3.7.0" }
+, { "pdfobject": "^2.0.201604172" }
+, { "pg": "^6.1.2" }
+, { "pg-hstore": "^2.3.2" }
+, { "prismjs": "^1.6.0" }
+, { "randomcolor": "^0.5.3" }
+, { "raphael": "git+https://github.com/dmitrybaranovskiy/raphael" }
+, { "readline-sync": "^1.4.7" }
+, { "request": "^2.79.0" }
+, { "reveal.js": "~3.6.0" }
+, { "scrypt": "^6.0.3" }
+, { "select2": "^3.5.2-browserify" }
+, { "sequelize": "^3.28.0" }
+, { "sequelize-cli": "^2.5.1" }
+, { "shortid": "2.2.8" }
+, { "socket.io": "~2.0.4" }
+, { "socket.io-client": "~2.0.4" }
+, { "spin.js": "^2.3.2" }
+, { "sqlite3": "^4.0.1" }
+, { "store": "^2.0.12" }
+, { "string": "^3.3.3" }
+, { "tedious": "^1.14.0" }
+, { "to-markdown": "^3.0.3" }
+, { "toobusy-js": "^0.5.1" }
+, { "uuid": "^3.1.0" }
+, { "uws": "~0.14.1" }
+, { "validator": "^10.4.0" }
+, { "velocity-animate": "^1.4.0" }
+, { "visibilityjs": "^1.2.4" }
+, { "viz.js": "^1.7.0" }
+, { "winston": "^2.3.0" }
+, { "xss": "^1.0.3" } ]
diff --git a/pkgs/servers/web-apps/codimd/generate.sh b/pkgs/servers/web-apps/codimd/generate.sh
new file mode 100755
index 000000000000..6d2bf29532e9
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/generate.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+node2nix -6 -i deps.json \
+  -e ../../../development/node-packages/node-env.nix \
+  --no-copy-node-env \
+  -c node.nix
diff --git a/pkgs/servers/web-apps/codimd/node-packages.nix b/pkgs/servers/web-apps/codimd/node-packages.nix
new file mode 100644
index 000000000000..414cf6c31589
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/node-packages.nix
@@ -0,0 +1,17911 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "@types/body-parser-1.17.0" = {
+      name = "_at_types_slash_body-parser";
+      packageName = "@types/body-parser";
+      version = "1.17.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz";
+        sha512 = "a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==";
+      };
+    };
+    "@types/connect-3.4.32" = {
+      name = "_at_types_slash_connect";
+      packageName = "@types/connect";
+      version = "3.4.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
+        sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
+      };
+    };
+    "@types/events-1.2.0" = {
+      name = "_at_types_slash_events";
+      packageName = "@types/events";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz";
+        sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==";
+      };
+    };
+    "@types/express-4.16.0" = {
+      name = "_at_types_slash_express";
+      packageName = "@types/express";
+      version = "4.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express/-/express-4.16.0.tgz";
+        sha512 = "TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==";
+      };
+    };
+    "@types/express-serve-static-core-4.16.0" = {
+      name = "_at_types_slash_express-serve-static-core";
+      packageName = "@types/express-serve-static-core";
+      version = "4.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz";
+        sha512 = "lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==";
+      };
+    };
+    "@types/geojson-1.0.6" = {
+      name = "_at_types_slash_geojson";
+      packageName = "@types/geojson";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz";
+        sha512 = "Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==";
+      };
+    };
+    "@types/ldapjs-1.0.3" = {
+      name = "_at_types_slash_ldapjs";
+      packageName = "@types/ldapjs";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/ldapjs/-/ldapjs-1.0.3.tgz";
+        sha512 = "FSj24s1WsFEfOy8taIKp2DokSZfFkjWYZb88AS5eDj3WTocZ+4DnHjhzrXEs048WQ5mfOLJXMOAnc0kSnHh5Lw==";
+      };
+    };
+    "@types/mime-2.0.0" = {
+      name = "_at_types_slash_mime";
+      packageName = "@types/mime";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz";
+        sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
+      };
+    };
+    "@types/node-7.0.68" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "7.0.68";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.68.tgz";
+        sha512 = "ym3LNHwJQU0XDyPrTK6NHJTH5YmGKKe0k56in6pg+Wx4HD8fiKrt8xute6/unHvHujCfzmOQTGz1NoEKgFF5Mw==";
+      };
+    };
+    "@types/passport-0.3.5" = {
+      name = "_at_types_slash_passport";
+      packageName = "@types/passport";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/passport/-/passport-0.3.5.tgz";
+        sha512 = "J7mdY1nnhjdbkXT84S3WsyrTtDf2KqUJ9JW3Y9vxA5GuXlejIuvwHw9A2TdNklAqPG2Q0TWqlsA2a2GIeV1jYA==";
+      };
+    };
+    "@types/range-parser-1.2.2" = {
+      name = "_at_types_slash_range-parser";
+      packageName = "@types/range-parser";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.2.tgz";
+        sha512 = "HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==";
+      };
+    };
+    "@types/serve-static-1.13.2" = {
+      name = "_at_types_slash_serve-static";
+      packageName = "@types/serve-static";
+      version = "1.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz";
+        sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==";
+      };
+    };
+    "JSV-4.0.2" = {
+      name = "JSV";
+      packageName = "JSV";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";
+        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
+      };
+    };
+    "abab-1.0.4" = {
+      name = "abab";
+      packageName = "abab";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz";
+        sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e";
+      };
+    };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "accepts-1.3.5" = {
+      name = "accepts";
+      packageName = "accepts";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz";
+        sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
+      };
+    };
+    "acorn-3.3.0" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+      };
+    };
+    "acorn-4.0.13" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";
+        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+      };
+    };
+    "acorn-5.7.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz";
+        sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==";
+      };
+    };
+    "acorn-globals-3.1.0" = {
+      name = "acorn-globals";
+      packageName = "acorn-globals";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz";
+        sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
+      };
+    };
+    "acorn-jsx-3.0.1" = {
+      name = "acorn-jsx";
+      packageName = "acorn-jsx";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+        sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
+      };
+    };
+    "acorn-object-spread-1.0.0" = {
+      name = "acorn-object-spread";
+      packageName = "acorn-object-spread";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz";
+        sha1 = "48ead0f4a8eb16995a17a0db9ffc6acaada4ba68";
+      };
+    };
+    "after-0.8.2" = {
+      name = "after";
+      packageName = "after";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+      };
+    };
+    "ajv-4.11.8" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
+        sha1 = "82ffb02b29e662ae53bdc20af15947706739c536";
+      };
+    };
+    "ajv-5.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "5.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
+        sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
+      };
+    };
+    "ajv-6.5.2" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz";
+        sha512 = "hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==";
+      };
+    };
+    "ajv-keywords-1.5.1" = {
+      name = "ajv-keywords";
+      packageName = "ajv-keywords";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
+        sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c";
+      };
+    };
+    "ajv-keywords-3.2.0" = {
+      name = "ajv-keywords";
+      packageName = "ajv-keywords";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
+        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "alphanum-sort-1.0.2" = {
+      name = "alphanum-sort";
+      packageName = "alphanum-sort";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz";
+        sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3";
+      };
+    };
+    "ambi-2.5.0" = {
+      name = "ambi";
+      packageName = "ambi";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ambi/-/ambi-2.5.0.tgz";
+        sha1 = "7c8e372be48891157e7cea01cb6f9143d1f74220";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
+    "anchor-markdown-header-0.5.7" = {
+      name = "anchor-markdown-header";
+      packageName = "anchor-markdown-header";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz";
+        sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7";
+      };
+    };
+    "ansi-escapes-1.4.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
+        sha1 = "d3a8a83b319aa67793662b13e761c7911422306e";
+      };
+    };
+    "ansi-gray-0.1.1" = {
+      name = "ansi-gray";
+      packageName = "ansi-gray";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz";
+        sha1 = "2962cf54ec9792c48510a3deb524436861ef7251";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+      };
+    };
+    "ansi-styles-1.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
+        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+      };
+    };
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+      };
+    };
+    "ansi-styles-3.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+        sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+      };
+    };
+    "ansi-wrap-0.1.0" = {
+      name = "ansi-wrap";
+      packageName = "ansi-wrap";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz";
+        sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf";
+      };
+    };
+    "anymatch-1.3.2" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz";
+        sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "archiver-utils-1.3.0" = {
+      name = "archiver-utils";
+      packageName = "archiver-utils";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz";
+        sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174";
+      };
+    };
+    "archy-1.0.0" = {
+      name = "archy";
+      packageName = "archy";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
+        sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "argparse-0.1.16" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "0.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+      };
+    };
+    "argparse-1.0.10" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+        sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+      };
+    };
+    "arr-diff-2.0.0" = {
+      name = "arr-diff";
+      packageName = "arr-diff";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz";
+        sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf";
+      };
+    };
+    "arr-diff-4.0.0" = {
+      name = "arr-diff";
+      packageName = "arr-diff";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz";
+        sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+      };
+    };
+    "arr-flatten-1.1.0" = {
+      name = "arr-flatten";
+      packageName = "arr-flatten";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
+        sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
+      };
+    };
+    "arr-union-3.1.0" = {
+      name = "arr-union";
+      packageName = "arr-union";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz";
+        sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+      };
+    };
+    "array-differ-1.0.0" = {
+      name = "array-differ";
+      packageName = "array-differ";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
+        sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
+      };
+    };
+    "array-each-1.0.1" = {
+      name = "array-each";
+      packageName = "array-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz";
+        sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f";
+      };
+    };
+    "array-equal-1.0.0" = {
+      name = "array-equal";
+      packageName = "array-equal";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz";
+        sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93";
+      };
+    };
+    "array-flatten-1.1.1" = {
+      name = "array-flatten";
+      packageName = "array-flatten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+        sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+      };
+    };
+    "array-slice-1.1.0" = {
+      name = "array-slice";
+      packageName = "array-slice";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz";
+        sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==";
+      };
+    };
+    "array-union-1.0.2" = {
+      name = "array-union";
+      packageName = "array-union";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz";
+        sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
+      };
+    };
+    "array-uniq-1.0.3" = {
+      name = "array-uniq";
+      packageName = "array-uniq";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz";
+        sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+      };
+    };
+    "array-unique-0.2.1" = {
+      name = "array-unique";
+      packageName = "array-unique";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz";
+        sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
+      };
+    };
+    "array-unique-0.3.2" = {
+      name = "array-unique";
+      packageName = "array-unique";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz";
+        sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+      };
+    };
+    "array.prototype.find-2.0.4" = {
+      name = "array.prototype.find";
+      packageName = "array.prototype.find";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz";
+        sha1 = "556a5c5362c08648323ddaeb9de9d14bc1864c90";
+      };
+    };
+    "arraybuffer.slice-0.0.7" = {
+      name = "arraybuffer.slice";
+      packageName = "arraybuffer.slice";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz";
+        sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==";
+      };
+    };
+    "arrify-1.0.1" = {
+      name = "arrify";
+      packageName = "arrify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
+        sha1 = "898508da2226f380df904728456849c1501a4b0d";
+      };
+    };
+    "asap-2.0.6" = {
+      name = "asap";
+      packageName = "asap";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+        sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+      };
+    };
+    "asn1-0.2.3" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+        sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      };
+    };
+    "asn1-0.2.4" = {
+      name = "asn1";
+      packageName = "asn1";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+        sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+      };
+    };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      };
+    };
+    "assert-plus-0.1.5" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+        sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      };
+    };
+    "assign-symbols-1.0.0" = {
+      name = "assign-symbols";
+      packageName = "assign-symbols";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz";
+        sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+      };
+    };
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+    };
+    "async-0.9.2" = {
+      name = "async";
+      packageName = "async";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+        sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+      };
+    };
+    "async-1.0.0" = {
+      name = "async";
+      packageName = "async";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
+      };
+    };
+    "async-1.5.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      };
+    };
+    "async-2.6.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+        sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
+      };
+    };
+    "async-each-1.0.1" = {
+      name = "async-each";
+      packageName = "async-each";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz";
+        sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d";
+      };
+    };
+    "async-limiter-1.0.0" = {
+      name = "async-limiter";
+      packageName = "async-limiter";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
+        sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
+      };
+    };
+    "asynckit-0.4.0" = {
+      name = "asynckit";
+      packageName = "asynckit";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+        sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+      };
+    };
+    "atob-2.1.1" = {
+      name = "atob";
+      packageName = "atob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz";
+        sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a";
+      };
+    };
+    "autolinker-0.15.3" = {
+      name = "autolinker";
+      packageName = "autolinker";
+      version = "0.15.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/autolinker/-/autolinker-0.15.3.tgz";
+        sha1 = "342417d8f2f3461b14cf09088d5edf8791dc9832";
+      };
+    };
+    "autoprefixer-6.7.7" = {
+      name = "autoprefixer";
+      packageName = "autoprefixer";
+      version = "6.7.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz";
+        sha1 = "1dbd1c835658e35ce3f9984099db00585c782014";
+      };
+    };
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      };
+    };
+    "aws-sign2-0.7.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+        sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+      };
+    };
+    "aws4-1.7.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
+        sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
+      };
+    };
+    "babel-code-frame-6.26.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
+        sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
+      };
+    };
+    "babel-core-6.26.3" = {
+      name = "babel-core";
+      packageName = "babel-core";
+      version = "6.26.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
+        sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
+      };
+    };
+    "babel-generator-6.26.1" = {
+      name = "babel-generator";
+      packageName = "babel-generator";
+      version = "6.26.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
+        sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
+      };
+    };
+    "babel-helper-call-delegate-6.24.1" = {
+      name = "babel-helper-call-delegate";
+      packageName = "babel-helper-call-delegate";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz";
+        sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d";
+      };
+    };
+    "babel-helper-define-map-6.26.0" = {
+      name = "babel-helper-define-map";
+      packageName = "babel-helper-define-map";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz";
+        sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f";
+      };
+    };
+    "babel-helper-function-name-6.24.1" = {
+      name = "babel-helper-function-name";
+      packageName = "babel-helper-function-name";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz";
+        sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9";
+      };
+    };
+    "babel-helper-get-function-arity-6.24.1" = {
+      name = "babel-helper-get-function-arity";
+      packageName = "babel-helper-get-function-arity";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz";
+        sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d";
+      };
+    };
+    "babel-helper-hoist-variables-6.24.1" = {
+      name = "babel-helper-hoist-variables";
+      packageName = "babel-helper-hoist-variables";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz";
+        sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76";
+      };
+    };
+    "babel-helper-optimise-call-expression-6.24.1" = {
+      name = "babel-helper-optimise-call-expression";
+      packageName = "babel-helper-optimise-call-expression";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz";
+        sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257";
+      };
+    };
+    "babel-helper-regex-6.26.0" = {
+      name = "babel-helper-regex";
+      packageName = "babel-helper-regex";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz";
+        sha1 = "325c59f902f82f24b74faceed0363954f6495e72";
+      };
+    };
+    "babel-helper-replace-supers-6.24.1" = {
+      name = "babel-helper-replace-supers";
+      packageName = "babel-helper-replace-supers";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz";
+        sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a";
+      };
+    };
+    "babel-helpers-6.24.1" = {
+      name = "babel-helpers";
+      packageName = "babel-helpers";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
+        sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
+      };
+    };
+    "babel-messages-6.23.0" = {
+      name = "babel-messages";
+      packageName = "babel-messages";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
+        sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
+      };
+    };
+    "babel-plugin-check-es2015-constants-6.22.0" = {
+      name = "babel-plugin-check-es2015-constants";
+      packageName = "babel-plugin-check-es2015-constants";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz";
+        sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a";
+      };
+    };
+    "babel-plugin-transform-es2015-arrow-functions-6.22.0" = {
+      name = "babel-plugin-transform-es2015-arrow-functions";
+      packageName = "babel-plugin-transform-es2015-arrow-functions";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz";
+        sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221";
+      };
+    };
+    "babel-plugin-transform-es2015-block-scoped-functions-6.22.0" = {
+      name = "babel-plugin-transform-es2015-block-scoped-functions";
+      packageName = "babel-plugin-transform-es2015-block-scoped-functions";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz";
+        sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141";
+      };
+    };
+    "babel-plugin-transform-es2015-block-scoping-6.26.0" = {
+      name = "babel-plugin-transform-es2015-block-scoping";
+      packageName = "babel-plugin-transform-es2015-block-scoping";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz";
+        sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f";
+      };
+    };
+    "babel-plugin-transform-es2015-classes-6.24.1" = {
+      name = "babel-plugin-transform-es2015-classes";
+      packageName = "babel-plugin-transform-es2015-classes";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz";
+        sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db";
+      };
+    };
+    "babel-plugin-transform-es2015-computed-properties-6.24.1" = {
+      name = "babel-plugin-transform-es2015-computed-properties";
+      packageName = "babel-plugin-transform-es2015-computed-properties";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz";
+        sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3";
+      };
+    };
+    "babel-plugin-transform-es2015-destructuring-6.23.0" = {
+      name = "babel-plugin-transform-es2015-destructuring";
+      packageName = "babel-plugin-transform-es2015-destructuring";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz";
+        sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
+      };
+    };
+    "babel-plugin-transform-es2015-duplicate-keys-6.24.1" = {
+      name = "babel-plugin-transform-es2015-duplicate-keys";
+      packageName = "babel-plugin-transform-es2015-duplicate-keys";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz";
+        sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e";
+      };
+    };
+    "babel-plugin-transform-es2015-for-of-6.23.0" = {
+      name = "babel-plugin-transform-es2015-for-of";
+      packageName = "babel-plugin-transform-es2015-for-of";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz";
+        sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691";
+      };
+    };
+    "babel-plugin-transform-es2015-function-name-6.24.1" = {
+      name = "babel-plugin-transform-es2015-function-name";
+      packageName = "babel-plugin-transform-es2015-function-name";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz";
+        sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b";
+      };
+    };
+    "babel-plugin-transform-es2015-literals-6.22.0" = {
+      name = "babel-plugin-transform-es2015-literals";
+      packageName = "babel-plugin-transform-es2015-literals";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz";
+        sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-amd-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-amd";
+      packageName = "babel-plugin-transform-es2015-modules-amd";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz";
+        sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-commonjs-6.26.2" = {
+      name = "babel-plugin-transform-es2015-modules-commonjs";
+      packageName = "babel-plugin-transform-es2015-modules-commonjs";
+      version = "6.26.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
+        sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-systemjs";
+      packageName = "babel-plugin-transform-es2015-modules-systemjs";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz";
+        sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-umd-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-umd";
+      packageName = "babel-plugin-transform-es2015-modules-umd";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz";
+        sha1 = "ac997e6285cd18ed6176adb607d602344ad38468";
+      };
+    };
+    "babel-plugin-transform-es2015-object-super-6.24.1" = {
+      name = "babel-plugin-transform-es2015-object-super";
+      packageName = "babel-plugin-transform-es2015-object-super";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz";
+        sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d";
+      };
+    };
+    "babel-plugin-transform-es2015-parameters-6.24.1" = {
+      name = "babel-plugin-transform-es2015-parameters";
+      packageName = "babel-plugin-transform-es2015-parameters";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz";
+        sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b";
+      };
+    };
+    "babel-plugin-transform-es2015-shorthand-properties-6.24.1" = {
+      name = "babel-plugin-transform-es2015-shorthand-properties";
+      packageName = "babel-plugin-transform-es2015-shorthand-properties";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz";
+        sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0";
+      };
+    };
+    "babel-plugin-transform-es2015-spread-6.22.0" = {
+      name = "babel-plugin-transform-es2015-spread";
+      packageName = "babel-plugin-transform-es2015-spread";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz";
+        sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1";
+      };
+    };
+    "babel-plugin-transform-es2015-sticky-regex-6.24.1" = {
+      name = "babel-plugin-transform-es2015-sticky-regex";
+      packageName = "babel-plugin-transform-es2015-sticky-regex";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz";
+        sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc";
+      };
+    };
+    "babel-plugin-transform-es2015-template-literals-6.22.0" = {
+      name = "babel-plugin-transform-es2015-template-literals";
+      packageName = "babel-plugin-transform-es2015-template-literals";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz";
+        sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d";
+      };
+    };
+    "babel-plugin-transform-es2015-typeof-symbol-6.23.0" = {
+      name = "babel-plugin-transform-es2015-typeof-symbol";
+      packageName = "babel-plugin-transform-es2015-typeof-symbol";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz";
+        sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372";
+      };
+    };
+    "babel-plugin-transform-es2015-unicode-regex-6.24.1" = {
+      name = "babel-plugin-transform-es2015-unicode-regex";
+      packageName = "babel-plugin-transform-es2015-unicode-regex";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz";
+        sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9";
+      };
+    };
+    "babel-plugin-transform-regenerator-6.26.0" = {
+      name = "babel-plugin-transform-regenerator";
+      packageName = "babel-plugin-transform-regenerator";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz";
+        sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f";
+      };
+    };
+    "babel-plugin-transform-strict-mode-6.24.1" = {
+      name = "babel-plugin-transform-strict-mode";
+      packageName = "babel-plugin-transform-strict-mode";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz";
+        sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758";
+      };
+    };
+    "babel-polyfill-6.26.0" = {
+      name = "babel-polyfill";
+      packageName = "babel-polyfill";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
+        sha1 = "379937abc67d7895970adc621f284cd966cf2153";
+      };
+    };
+    "babel-register-6.26.0" = {
+      name = "babel-register";
+      packageName = "babel-register";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz";
+        sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071";
+      };
+    };
+    "babel-runtime-6.26.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+        sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+      };
+    };
+    "babel-template-6.26.0" = {
+      name = "babel-template";
+      packageName = "babel-template";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz";
+        sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02";
+      };
+    };
+    "babel-traverse-6.26.0" = {
+      name = "babel-traverse";
+      packageName = "babel-traverse";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz";
+        sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee";
+      };
+    };
+    "babel-types-6.26.0" = {
+      name = "babel-types";
+      packageName = "babel-types";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz";
+        sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
+      };
+    };
+    "babylon-6.18.0" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "6.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
+        sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==";
+      };
+    };
+    "backo2-1.0.2" = {
+      name = "backo2";
+      packageName = "backo2";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+      };
+    };
+    "backoff-2.5.0" = {
+      name = "backoff";
+      packageName = "backoff";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz";
+        sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
+      };
+    };
+    "bail-1.0.3" = {
+      name = "bail";
+      packageName = "bail";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
+        sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==";
+      };
+    };
+    "balanced-match-0.4.2" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
+        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "base-0.11.2" = {
+      name = "base";
+      packageName = "base";
+      version = "0.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
+        sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
+      };
+    };
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+      };
+    };
+    "base64-js-1.3.0" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
+        sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
+      };
+    };
+    "base64id-1.0.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+      };
+    };
+    "basic-auth-2.0.0" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz";
+        sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
+      };
+    };
+    "bcrypt-pbkdf-1.0.2" = {
+      name = "bcrypt-pbkdf";
+      packageName = "bcrypt-pbkdf";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+        sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+      };
+    };
+    "bcryptjs-2.4.3" = {
+      name = "bcryptjs";
+      packageName = "bcryptjs";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz";
+        sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
+      };
+    };
+    "beeper-1.1.1" = {
+      name = "beeper";
+      packageName = "beeper";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
+        sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809";
+      };
+    };
+    "better-assert-1.0.2" = {
+      name = "better-assert";
+      packageName = "better-assert";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+        sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+      };
+    };
+    "big-number-0.3.1" = {
+      name = "big-number";
+      packageName = "big-number";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big-number/-/big-number-0.3.1.tgz";
+        sha1 = "ac73020c0a59bb79eb17c2ce2db77f77d974e013";
+      };
+    };
+    "big.js-3.2.0" = {
+      name = "big.js";
+      packageName = "big.js";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz";
+        sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==";
+      };
+    };
+    "bignumber.js-4.1.0" = {
+      name = "bignumber.js";
+      packageName = "bignumber.js";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz";
+        sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==";
+      };
+    };
+    "binary-extensions-1.11.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz";
+        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
+      };
+    };
+    "bl-1.2.2" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz";
+        sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
+      };
+    };
+    "blint-1.0.3" = {
+      name = "blint";
+      packageName = "blint";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blint/-/blint-1.0.3.tgz";
+        sha512 = "6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A==";
+      };
+    };
+    "blob-0.0.4" = {
+      name = "blob";
+      packageName = "blob";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
+        sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+      };
+    };
+    "block-elements-1.2.0" = {
+      name = "block-elements";
+      packageName = "block-elements";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-elements/-/block-elements-1.2.0.tgz";
+        sha1 = "8e04ccab638c7e2596f5065fb6c1c7518c905a5d";
+      };
+    };
+    "block-stream2-1.1.0" = {
+      name = "block-stream2";
+      packageName = "block-stream2";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz";
+        sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2";
+      };
+    };
+    "bluebird-3.5.1" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz";
+        sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==";
+      };
+    };
+    "body-parser-1.18.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.18.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz";
+        sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
+      };
+    };
+    "boolbase-1.0.0" = {
+      name = "boolbase";
+      packageName = "boolbase";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+      };
+    };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
+    "boundary-1.0.1" = {
+      name = "boundary";
+      packageName = "boundary";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz";
+        sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "braces-1.8.5" = {
+      name = "braces";
+      packageName = "braces";
+      version = "1.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz";
+        sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
+      };
+    };
+    "braces-2.3.2" = {
+      name = "braces";
+      packageName = "braces";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
+        sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
+      };
+    };
+    "browserify-aes-0.4.0" = {
+      name = "browserify-aes";
+      packageName = "browserify-aes";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
+        sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
+      };
+    };
+    "browserify-mime-1.2.9" = {
+      name = "browserify-mime";
+      packageName = "browserify-mime";
+      version = "1.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz";
+        sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
+      };
+    };
+    "browserify-zlib-0.1.4" = {
+      name = "browserify-zlib";
+      packageName = "browserify-zlib";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+      };
+    };
+    "browserslist-1.7.7" = {
+      name = "browserslist";
+      packageName = "browserslist";
+      version = "1.7.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz";
+        sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9";
+      };
+    };
+    "buble-0.15.2" = {
+      name = "buble";
+      packageName = "buble";
+      version = "0.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buble/-/buble-0.15.2.tgz";
+        sha1 = "547fc47483f8e5e8176d82aa5ebccb183b02d613";
+      };
+    };
+    "buffer-4.9.1" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+      };
+    };
+    "buffer-5.2.0" = {
+      name = "buffer";
+      packageName = "buffer";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz";
+        sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw==";
+      };
+    };
+    "buffer-alloc-1.2.0" = {
+      name = "buffer-alloc";
+      packageName = "buffer-alloc";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz";
+        sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==";
+      };
+    };
+    "buffer-alloc-unsafe-1.1.0" = {
+      name = "buffer-alloc-unsafe";
+      packageName = "buffer-alloc-unsafe";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz";
+        sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==";
+      };
+    };
+    "buffer-crc32-0.2.13" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
+      };
+    };
+    "buffer-fill-1.0.0" = {
+      name = "buffer-fill";
+      packageName = "buffer-fill";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz";
+        sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c";
+      };
+    };
+    "buffer-from-1.1.1" = {
+      name = "buffer-from";
+      packageName = "buffer-from";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+        sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+      };
+    };
+    "buffer-writer-1.0.1" = {
+      name = "buffer-writer";
+      packageName = "buffer-writer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz";
+        sha1 = "22a936901e3029afcd7547eb4487ceb697a3bf08";
+      };
+    };
+    "builtin-modules-1.1.1" = {
+      name = "builtin-modules";
+      packageName = "builtin-modules";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+        sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
+      };
+    };
+    "builtin-status-codes-3.0.0" = {
+      name = "builtin-status-codes";
+      packageName = "builtin-status-codes";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+        sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+      };
+    };
+    "bunyan-1.8.12" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.8.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz";
+        sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
+      };
+    };
+    "bytes-3.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
+        sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+      };
+    };
+    "cacache-10.0.4" = {
+      name = "cacache";
+      packageName = "cacache";
+      version = "10.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
+        sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
+      };
+    };
+    "cache-base-1.0.1" = {
+      name = "cache-base";
+      packageName = "cache-base";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
+        sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
+      };
+    };
+    "caller-path-0.1.0" = {
+      name = "caller-path";
+      packageName = "caller-path";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz";
+        sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f";
+      };
+    };
+    "callsite-1.0.0" = {
+      name = "callsite";
+      packageName = "callsite";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+        sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+      };
+    };
+    "callsites-0.2.0" = {
+      name = "callsites";
+      packageName = "callsites";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
+        sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
+      };
+    };
+    "camel-case-3.0.0" = {
+      name = "camel-case";
+      packageName = "camel-case";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz";
+        sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73";
+      };
+    };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "camelize-1.0.0" = {
+      name = "camelize";
+      packageName = "camelize";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz";
+        sha1 = "164a5483e630fa4321e5af07020e531831b2609b";
+      };
+    };
+    "caniuse-api-1.6.1" = {
+      name = "caniuse-api";
+      packageName = "caniuse-api";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz";
+        sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c";
+      };
+    };
+    "caniuse-db-1.0.30000874" = {
+      name = "caniuse-db";
+      packageName = "caniuse-db";
+      version = "1.0.30000874";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000874.tgz";
+        sha1 = "49edc0262efdc6c49d4d962bb16d1f0c790fa44e";
+      };
+    };
+    "caseless-0.12.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+        sha1 = "1b681c21ff84033c826543090689420d187151dc";
+      };
+    };
+    "ccount-1.0.3" = {
+      name = "ccount";
+      packageName = "ccount";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
+        sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "chalk-0.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+      };
+    };
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    };
+    "chalk-2.4.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
+        sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==";
+      };
+    };
+    "character-entities-1.2.2" = {
+      name = "character-entities";
+      packageName = "character-entities";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
+        sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==";
+      };
+    };
+    "character-entities-html4-1.1.2" = {
+      name = "character-entities-html4";
+      packageName = "character-entities-html4";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+        sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==";
+      };
+    };
+    "character-entities-legacy-1.1.2" = {
+      name = "character-entities-legacy";
+      packageName = "character-entities-legacy";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==";
+      };
+    };
+    "character-reference-invalid-1.1.2" = {
+      name = "character-reference-invalid";
+      packageName = "character-reference-invalid";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==";
+      };
+    };
+    "chokidar-1.7.0" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz";
+        sha1 = "798e689778151c8076b4b360e5edd28cda2bb468";
+      };
+    };
+    "chownr-1.0.1" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
+        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
+      };
+    };
+    "circular-json-0.3.3" = {
+      name = "circular-json";
+      packageName = "circular-json";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
+        sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
+      };
+    };
+    "clap-1.2.3" = {
+      name = "clap";
+      packageName = "clap";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz";
+        sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==";
+      };
+    };
+    "class-utils-0.3.6" = {
+      name = "class-utils";
+      packageName = "class-utils";
+      version = "0.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
+        sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
+      };
+    };
+    "clean-css-4.1.11" = {
+      name = "clean-css";
+      packageName = "clean-css";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz";
+        sha1 = "2ecdf145aba38f54740f26cefd0ff3e03e125d6a";
+      };
+    };
+    "cli-1.0.1" = {
+      name = "cli";
+      packageName = "cli";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
+        sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
+      };
+    };
+    "cli-color-1.2.0" = {
+      name = "cli-color";
+      packageName = "cli-color";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-color/-/cli-color-1.2.0.tgz";
+        sha1 = "3a5ae74fd76b6267af666e69e2afbbd01def34d1";
+      };
+    };
+    "cli-cursor-1.0.2" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
+        sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
+      };
+    };
+    "cli-width-2.2.0" = {
+      name = "cli-width";
+      packageName = "cli-width";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
+      };
+    };
+    "clipboard-2.0.1" = {
+      name = "clipboard";
+      packageName = "clipboard";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz";
+        sha512 = "7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "cliui-3.2.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
+        sha1 = "120601537a916d29940f934da3b48d585a39213d";
+      };
+    };
+    "clone-0.2.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
+        sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f";
+      };
+    };
+    "clone-1.0.4" = {
+      name = "clone";
+      packageName = "clone";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
+        sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
+      };
+    };
+    "clone-stats-0.0.1" = {
+      name = "clone-stats";
+      packageName = "clone-stats";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
+        sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
+      };
+    };
+    "co-4.6.0" = {
+      name = "co";
+      packageName = "co";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+        sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+      };
+    };
+    "coa-1.0.4" = {
+      name = "coa";
+      packageName = "coa";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz";
+        sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "collapse-white-space-1.0.4" = {
+      name = "collapse-white-space";
+      packageName = "collapse-white-space";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+        sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==";
+      };
+    };
+    "collapse-whitespace-1.1.2" = {
+      name = "collapse-whitespace";
+      packageName = "collapse-whitespace";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collapse-whitespace/-/collapse-whitespace-1.1.2.tgz";
+        sha1 = "b9b31d79d5594ee3c22c15819c54828e565b3085";
+      };
+    };
+    "collection-visit-1.0.0" = {
+      name = "collection-visit";
+      packageName = "collection-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz";
+        sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+      };
+    };
+    "color-0.11.4" = {
+      name = "color";
+      packageName = "color";
+      version = "0.11.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz";
+        sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764";
+      };
+    };
+    "color-convert-1.9.2" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz";
+        sha512 = "3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==";
+      };
+    };
+    "color-name-1.1.1" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
+        sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
+      };
+    };
+    "color-string-0.3.0" = {
+      name = "color-string";
+      packageName = "color-string";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+        sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
+      };
+    };
+    "color-support-1.1.3" = {
+      name = "color-support";
+      packageName = "color-support";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz";
+        sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
+      };
+    };
+    "colormin-1.1.2" = {
+      name = "colormin";
+      packageName = "colormin";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz";
+        sha1 = "ea2f7420a72b96881a38aae59ec124a6f7298133";
+      };
+    };
+    "colors-1.0.3" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      };
+    };
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+      };
+    };
+    "combined-stream-1.0.6" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
+      };
+    };
+    "commander-2.14.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
+        sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==";
+      };
+    };
+    "commander-2.16.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz";
+        sha512 = "sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==";
+      };
+    };
+    "commondir-1.0.1" = {
+      name = "commondir";
+      packageName = "commondir";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
+        sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+      };
+    };
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+      };
+    };
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+      };
+    };
+    "component-inherit-0.0.3" = {
+      name = "component-inherit";
+      packageName = "component-inherit";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+      };
+    };
+    "compress-commons-1.2.2" = {
+      name = "compress-commons";
+      packageName = "compress-commons";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz";
+        sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
+      };
+    };
+    "compressible-2.0.14" = {
+      name = "compressible";
+      packageName = "compressible";
+      version = "2.0.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz";
+        sha1 = "326c5f507fbb055f54116782b969a81b67a29da7";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "concat-stream-1.6.2" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+        sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+      };
+    };
+    "config-chain-1.1.11" = {
+      name = "config-chain";
+      packageName = "config-chain";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
+        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+      };
+    };
+    "console-browserify-1.1.0" = {
+      name = "console-browserify";
+      packageName = "console-browserify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "constants-browserify-1.0.0" = {
+      name = "constants-browserify";
+      packageName = "constants-browserify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";
+        sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+      };
+    };
+    "content-disposition-0.5.2" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz";
+        sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4";
+      };
+    };
+    "content-security-policy-builder-2.0.0" = {
+      name = "content-security-policy-builder";
+      packageName = "content-security-policy-builder";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz";
+        sha512 = "j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==";
+      };
+    };
+    "content-type-1.0.4" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
+        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+      };
+    };
+    "content-type-parser-1.0.2" = {
+      name = "content-type-parser";
+      packageName = "content-type-parser";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz";
+        sha512 = "lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==";
+      };
+    };
+    "convert-source-map-1.5.1" = {
+      name = "convert-source-map";
+      packageName = "convert-source-map";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz";
+        sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5";
+      };
+    };
+    "cookie-0.3.1" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+        sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+      };
+    };
+    "cookie-signature-1.0.6" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+        sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+      };
+    };
+    "cookiejar-2.0.6" = {
+      name = "cookiejar";
+      packageName = "cookiejar";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz";
+        sha1 = "0abf356ad00d1c5a219d88d44518046dd026acfe";
+      };
+    };
+    "copy-concurrently-1.0.5" = {
+      name = "copy-concurrently";
+      packageName = "copy-concurrently";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+        sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==";
+      };
+    };
+    "copy-descriptor-0.1.1" = {
+      name = "copy-descriptor";
+      packageName = "copy-descriptor";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+        sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+      };
+    };
+    "core-js-2.5.7" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz";
+        sha512 = "RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "crc-3.4.4" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
+      };
+    };
+    "crc-3.8.0" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz";
+        sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==";
+      };
+    };
+    "crc32-stream-2.0.0" = {
+      name = "crc32-stream";
+      packageName = "crc32-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz";
+        sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
+      };
+    };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "crypto-browserify-3.3.0" = {
+      name = "crypto-browserify";
+      packageName = "crypto-browserify";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
+        sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
+      };
+    };
+    "csextends-1.2.0" = {
+      name = "csextends";
+      packageName = "csextends";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/csextends/-/csextends-1.2.0.tgz";
+        sha512 = "S/8k1bDTJIwuGgQYmsRoE+8P+ohV32WhQ0l4zqrc0XDdxOhjQQD7/wTZwCzoZX53jSX3V/qwjT+OkPTxWQcmjg==";
+      };
+    };
+    "css-color-names-0.0.4" = {
+      name = "css-color-names";
+      packageName = "css-color-names";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz";
+        sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0";
+      };
+    };
+    "css-select-1.2.0" = {
+      name = "css-select";
+      packageName = "css-select";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+      };
+    };
+    "css-selector-tokenizer-0.7.0" = {
+      name = "css-selector-tokenizer";
+      packageName = "css-selector-tokenizer";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz";
+        sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86";
+      };
+    };
+    "css-what-2.1.0" = {
+      name = "css-what";
+      packageName = "css-what";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz";
+        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
+      };
+    };
+    "cssesc-0.1.0" = {
+      name = "cssesc";
+      packageName = "cssesc";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz";
+        sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
+      };
+    };
+    "cssfilter-0.0.10" = {
+      name = "cssfilter";
+      packageName = "cssfilter";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz";
+        sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae";
+      };
+    };
+    "cssnano-3.10.0" = {
+      name = "cssnano";
+      packageName = "cssnano";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz";
+        sha1 = "4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38";
+      };
+    };
+    "csso-2.3.2" = {
+      name = "csso";
+      packageName = "csso";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
+        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
+      };
+    };
+    "cssom-0.2.5" = {
+      name = "cssom";
+      packageName = "cssom";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz";
+        sha1 = "2682709b5902e7212df529116ff788cd5b254894";
+      };
+    };
+    "cssom-0.3.4" = {
+      name = "cssom";
+      packageName = "cssom";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz";
+        sha512 = "+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==";
+      };
+    };
+    "cssstyle-0.2.37" = {
+      name = "cssstyle";
+      packageName = "cssstyle";
+      version = "0.2.37";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz";
+        sha1 = "541097234cb2513c83ceed3acddc27ff27987d54";
+      };
+    };
+    "cycle-1.0.3" = {
+      name = "cycle";
+      packageName = "cycle";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+      };
+    };
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    };
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
+      };
+    };
+    "d3-3.5.17" = {
+      name = "d3";
+      packageName = "d3";
+      version = "3.5.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz";
+        sha1 = "bc46748004378b21a360c9fc7cf5231790762fb8";
+      };
+    };
+    "dagre-d3-renderer-0.4.26" = {
+      name = "dagre-d3-renderer";
+      packageName = "dagre-d3-renderer";
+      version = "0.4.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dagre-d3-renderer/-/dagre-d3-renderer-0.4.26.tgz";
+        sha512 = "vOWj1uA4/APTrfDyfHaH/xpfXhPh9rszW+HOaEwPCeA6Afl06Lobfh7OpESuVMQW2QGuY4UQ7pte/p0WhdDs7w==";
+      };
+    };
+    "dagre-layout-0.8.8" = {
+      name = "dagre-layout";
+      packageName = "dagre-layout";
+      version = "0.8.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dagre-layout/-/dagre-layout-0.8.8.tgz";
+        sha512 = "ZNV15T9za7X+fV8Z07IZquUKugCxm5owoiPPxfEx6OJRD331nkiIaF3vSt0JEY5FkrY0KfRQxcpQ3SpXB7pLPQ==";
+      };
+    };
+    "dashdash-1.14.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+        sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+      };
+    };
+    "dasherize-2.0.0" = {
+      name = "dasherize";
+      packageName = "dasherize";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz";
+        sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308";
+      };
+    };
+    "date-now-0.1.4" = {
+      name = "date-now";
+      packageName = "date-now";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+      };
+    };
+    "dateformat-2.2.0" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz";
+        sha1 = "4065e2013cf9fb916ddfd82efb506ad4c6769062";
+      };
+    };
+    "debug-2.6.9" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+      };
+    };
+    "debug-3.1.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+        sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
+      };
+    };
+    "debug-log-1.0.1" = {
+      name = "debug-log";
+      packageName = "debug-log";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz";
+        sha1 = "2307632d4c04382b8df8a32f70b895046d52745f";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "decode-uri-component-0.2.0" = {
+      name = "decode-uri-component";
+      packageName = "decode-uri-component";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+        sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+      };
+    };
+    "deep-equal-1.0.1" = {
+      name = "deep-equal";
+      packageName = "deep-equal";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+      };
+    };
+    "deep-extend-0.6.0" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+      };
+    };
+    "deep-is-0.1.3" = {
+      name = "deep-is";
+      packageName = "deep-is";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+        sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+      };
+    };
+    "defaults-1.0.3" = {
+      name = "defaults";
+      packageName = "defaults";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
+        sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
+      };
+    };
+    "define-properties-1.1.2" = {
+      name = "define-properties";
+      packageName = "define-properties";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz";
+        sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94";
+      };
+    };
+    "define-property-0.2.5" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz";
+        sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+      };
+    };
+    "define-property-1.0.0" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz";
+        sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+      };
+    };
+    "define-property-2.0.2" = {
+      name = "define-property";
+      packageName = "define-property";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
+        sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
+      };
+    };
+    "defined-1.0.0" = {
+      name = "defined";
+      packageName = "defined";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz";
+        sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+      };
+    };
+    "deglob-2.1.1" = {
+      name = "deglob";
+      packageName = "deglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deglob/-/deglob-2.1.1.tgz";
+        sha512 = "2kjwuGGonL7gWE1XU4Fv79+vVzpoQCl0V+boMwWtOQJV2AGDabCwez++nB1Nli/8BabAfZQ/UuHPlp6AymKdWw==";
+      };
+    };
+    "del-2.2.2" = {
+      name = "del";
+      packageName = "del";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz";
+        sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "delegate-3.2.0" = {
+      name = "delegate";
+      packageName = "delegate";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz";
+        sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "depd-1.1.1" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz";
+        sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359";
+      };
+    };
+    "depd-1.1.2" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    };
+    "deprecated-0.0.1" = {
+      name = "deprecated";
+      packageName = "deprecated";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
+        sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
+      };
+    };
+    "destroy-1.0.4" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    };
+    "detect-file-0.1.0" = {
+      name = "detect-file";
+      packageName = "detect-file";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz";
+        sha1 = "4935dedfd9488648e006b0129566e9386711ea63";
+      };
+    };
+    "detect-file-1.0.0" = {
+      name = "detect-file";
+      packageName = "detect-file";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz";
+        sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
+      };
+    };
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+      };
+    };
+    "detect-libc-1.0.3" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";
+        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
+      };
+    };
+    "dir-glob-2.0.0" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
+        sha512 = "37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==";
+      };
+    };
+    "dns-lookup-all-1.0.2" = {
+      name = "dns-lookup-all";
+      packageName = "dns-lookup-all";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-lookup-all/-/dns-lookup-all-1.0.2.tgz";
+        sha1 = "4d8b2b1af69c83a7b262eb5de92485b7b3a215eb";
+      };
+    };
+    "dns-prefetch-control-0.1.0" = {
+      name = "dns-prefetch-control";
+      packageName = "dns-prefetch-control";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz";
+        sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2";
+      };
+    };
+    "doctrine-1.5.0" = {
+      name = "doctrine";
+      packageName = "doctrine";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
+        sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+      };
+    };
+    "doctrine-2.1.0" = {
+      name = "doctrine";
+      packageName = "doctrine";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz";
+        sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
+      };
+    };
+    "dom-converter-0.1.4" = {
+      name = "dom-converter";
+      packageName = "dom-converter";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz";
+        sha1 = "a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b";
+      };
+    };
+    "dom-serializer-0.1.0" = {
+      name = "dom-serializer";
+      packageName = "dom-serializer";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+        sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
+      };
+    };
+    "domain-browser-1.2.0" = {
+      name = "domain-browser";
+      packageName = "domain-browser";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
+        sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
+      };
+    };
+    "domelementtype-1.1.3" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+        sha1 = "bd28773e2642881aec51544924299c5cd822185b";
+      };
+    };
+    "domelementtype-1.3.0" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+        sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+      };
+    };
+    "domhandler-2.1.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz";
+        sha1 = "d2646f5e57f6c3bab11cf6cb05d3c0acf7412594";
+      };
+    };
+    "domhandler-2.3.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+        sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
+      };
+    };
+    "domhandler-2.4.2" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
+        sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
+      };
+    };
+    "domutils-1.1.6" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz";
+        sha1 = "bddc3de099b9a2efacc51c623f28f416ecc57485";
+      };
+    };
+    "domutils-1.5.1" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+        sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+      };
+    };
+    "domutils-1.7.0" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
+        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
+      };
+    };
+    "dont-sniff-mimetype-1.0.0" = {
+      name = "dont-sniff-mimetype";
+      packageName = "dont-sniff-mimetype";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz";
+        sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58";
+      };
+    };
+    "dottie-1.1.1" = {
+      name = "dottie";
+      packageName = "dottie";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dottie/-/dottie-1.1.1.tgz";
+        sha1 = "45c2a3f48bd6528eeed267a69a848eaaca6faa6a";
+      };
+    };
+    "dtrace-provider-0.8.7" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.8.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz";
+        sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04";
+      };
+    };
+    "duplexer-0.1.1" = {
+      name = "duplexer";
+      packageName = "duplexer";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+      };
+    };
+    "duplexer2-0.0.2" = {
+      name = "duplexer2";
+      packageName = "duplexer2";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+        sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
+      };
+    };
+    "duplexify-3.6.0" = {
+      name = "duplexify";
+      packageName = "duplexify";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
+        sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==";
+      };
+    };
+    "eachr-2.0.4" = {
+      name = "eachr";
+      packageName = "eachr";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eachr/-/eachr-2.0.4.tgz";
+        sha1 = "466f7caa10708f610509e32c807aafe57fc122bf";
+      };
+    };
+    "ecc-jsbn-0.1.2" = {
+      name = "ecc-jsbn";
+      packageName = "ecc-jsbn";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+        sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+      };
+    };
+    "editions-1.3.4" = {
+      name = "editions";
+      packageName = "editions";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz";
+        sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==";
+      };
+    };
+    "editorconfig-0.13.3" = {
+      name = "editorconfig";
+      packageName = "editorconfig";
+      version = "0.13.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz";
+        sha512 = "WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==";
+      };
+    };
+    "ee-first-1.1.1" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    };
+    "ejs-2.6.1" = {
+      name = "ejs";
+      packageName = "ejs";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz";
+        sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==";
+      };
+    };
+    "electron-to-chromium-1.3.55" = {
+      name = "electron-to-chromium";
+      packageName = "electron-to-chromium";
+      version = "1.3.55";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz";
+        sha1 = "f150e10b20b77d9d41afcca312efe0c3b1a7fdce";
+      };
+    };
+    "emoji-regex-6.1.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "6.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz";
+        sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932";
+      };
+    };
+    "emojis-list-2.1.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+      };
+    };
+    "encodeurl-1.0.2" = {
+      name = "encodeurl";
+      packageName = "encodeurl";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    };
+    "end-of-stream-0.1.5" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
+        sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
+      };
+    };
+    "end-of-stream-1.4.1" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
+        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
+      };
+    };
+    "engine.io-3.1.5" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "3.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz";
+        sha512 = "D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==";
+      };
+    };
+    "engine.io-client-3.1.6" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "3.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz";
+        sha512 = "hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==";
+      };
+    };
+    "engine.io-parser-2.1.2" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz";
+        sha512 = "dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==";
+      };
+    };
+    "enhanced-resolve-0.9.1" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "0.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
+        sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+      };
+    };
+    "entities-1.0.0" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+        sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
+      };
+    };
+    "entities-1.1.1" = {
+      name = "entities";
+      packageName = "entities";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+        sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
+      };
+    };
+    "errno-0.1.7" = {
+      name = "errno";
+      packageName = "errno";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+        sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+      };
+    };
+    "error-ex-1.3.2" = {
+      name = "error-ex";
+      packageName = "error-ex";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+        sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+      };
+    };
+    "es-abstract-1.12.0" = {
+      name = "es-abstract";
+      packageName = "es-abstract";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz";
+        sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==";
+      };
+    };
+    "es-to-primitive-1.1.1" = {
+      name = "es-to-primitive";
+      packageName = "es-to-primitive";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz";
+        sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
+      };
+    };
+    "es5-ext-0.10.45" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.45";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz";
+        sha512 = "FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==";
+      };
+    };
+    "es6-error-2.1.1" = {
+      name = "es6-error";
+      packageName = "es6-error";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-error/-/es6-error-2.1.1.tgz";
+        sha1 = "91384301ec5ed1c9a7247d1128247216f03547cd";
+      };
+    };
+    "es6-iterator-2.0.3" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+        sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+      };
+    };
+    "es6-map-0.1.5" = {
+      name = "es6-map";
+      packageName = "es6-map";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
+      };
+    };
+    "es6-promise-4.2.4" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
+        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "es6-weak-map-2.0.2" = {
+      name = "es6-weak-map";
+      packageName = "es6-weak-map";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
+        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
+      };
+    };
+    "escape-html-1.0.3" = {
+      name = "escape-html";
+      packageName = "escape-html";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    };
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+      };
+    };
+    "escodegen-1.11.0" = {
+      name = "escodegen";
+      packageName = "escodegen";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz";
+        sha512 = "IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==";
+      };
+    };
+    "escope-3.6.0" = {
+      name = "escope";
+      packageName = "escope";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
+        sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
+      };
+    };
+    "eslint-3.18.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "3.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz";
+        sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b";
+      };
+    };
+    "eslint-config-standard-7.1.0" = {
+      name = "eslint-config-standard";
+      packageName = "eslint-config-standard";
+      version = "7.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-7.1.0.tgz";
+        sha1 = "47e769ea0739f5b2d5693b1a501c21c9650fafcf";
+      };
+    };
+    "eslint-config-standard-jsx-3.3.0" = {
+      name = "eslint-config-standard-jsx";
+      packageName = "eslint-config-standard-jsx";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz";
+        sha1 = "cab0801a15a360bf63facb97ab22fbdd88d8a5e0";
+      };
+    };
+    "eslint-plugin-promise-3.4.2" = {
+      name = "eslint-plugin-promise";
+      packageName = "eslint-plugin-promise";
+      version = "3.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz";
+        sha1 = "1be2793eafe2d18b5b123b8136c269f804fe7122";
+      };
+    };
+    "eslint-plugin-react-6.9.0" = {
+      name = "eslint-plugin-react";
+      packageName = "eslint-plugin-react";
+      version = "6.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.9.0.tgz";
+        sha1 = "54c2e9906b76f9d10142030bdc34e9d6840a0bb2";
+      };
+    };
+    "eslint-plugin-standard-2.0.1" = {
+      name = "eslint-plugin-standard";
+      packageName = "eslint-plugin-standard";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz";
+        sha1 = "3589699ff9c917f2c25f76a916687f641c369ff3";
+      };
+    };
+    "espree-3.5.4" = {
+      name = "espree";
+      packageName = "espree";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
+        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
+      };
+    };
+    "esprima-2.7.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
+        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+      };
+    };
+    "esprima-3.1.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+      };
+    };
+    "esprima-4.0.1" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
+        sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+      };
+    };
+    "esquery-1.0.1" = {
+      name = "esquery";
+      packageName = "esquery";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
+        sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==";
+      };
+    };
+    "esrecurse-4.2.1" = {
+      name = "esrecurse";
+      packageName = "esrecurse";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
+        sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
+      };
+    };
+    "estraverse-4.2.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
+        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+      };
+    };
+    "estree-walker-0.2.1" = {
+      name = "estree-walker";
+      packageName = "estree-walker";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz";
+        sha1 = "bdafe8095383d8414d5dc2ecf4c9173b6db9412e";
+      };
+    };
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
+      };
+    };
+    "etag-1.8.1" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    };
+    "eve-git://github.com/adobe-webplatform/eve.git#eef80ed" = {
+      name = "eve";
+      packageName = "eve";
+      version = "0.4.1";
+      src = fetchgit {
+        url = "git://github.com/adobe-webplatform/eve.git";
+        rev = "eef80ed8d188423c2272746fb8ae5cc8dad84cb1";
+        sha256 = "2b86ece1177813f6ee1eb6b0cc0e85cfdaca208eb46aa911dd802263e2d9b003";
+      };
+    };
+    "eve-raphael-0.5.0" = {
+      name = "eve-raphael";
+      packageName = "eve-raphael";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eve-raphael/-/eve-raphael-0.5.0.tgz";
+        sha1 = "17c754b792beef3fa6684d79cf5a47c63c4cda30";
+      };
+    };
+    "event-emitter-0.3.5" = {
+      name = "event-emitter";
+      packageName = "event-emitter";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+      };
+    };
+    "eventemitter2-0.4.14" = {
+      name = "eventemitter2";
+      packageName = "eventemitter2";
+      version = "0.4.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+        sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
+      };
+    };
+    "events-1.1.1" = {
+      name = "events";
+      packageName = "events";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
+        sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
+      };
+    };
+    "execa-0.7.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz";
+        sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777";
+      };
+    };
+    "exit-0.1.2" = {
+      name = "exit";
+      packageName = "exit";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+        sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+      };
+    };
+    "exit-hook-1.1.1" = {
+      name = "exit-hook";
+      packageName = "exit-hook";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
+        sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
+      };
+    };
+    "expand-brackets-0.1.5" = {
+      name = "expand-brackets";
+      packageName = "expand-brackets";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz";
+        sha1 = "df07284e342a807cd733ac5af72411e581d1177b";
+      };
+    };
+    "expand-brackets-2.1.4" = {
+      name = "expand-brackets";
+      packageName = "expand-brackets";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz";
+        sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+      };
+    };
+    "expand-range-1.8.2" = {
+      name = "expand-range";
+      packageName = "expand-range";
+      version = "1.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz";
+        sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
+      };
+    };
+    "expand-tilde-1.2.2" = {
+      name = "expand-tilde";
+      packageName = "expand-tilde";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz";
+        sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449";
+      };
+    };
+    "expand-tilde-2.0.2" = {
+      name = "expand-tilde";
+      packageName = "expand-tilde";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz";
+        sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
+      };
+    };
+    "expect-ct-0.1.1" = {
+      name = "expect-ct";
+      packageName = "expect-ct";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.1.tgz";
+        sha512 = "ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg==";
+      };
+    };
+    "extend-1.2.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+      };
+    };
+    "extend-3.0.0" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+      };
+    };
+    "extend-3.0.2" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+        sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+      };
+    };
+    "extend-shallow-2.0.1" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+      };
+    };
+    "extend-shallow-3.0.2" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz";
+        sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+      };
+    };
+    "extendr-2.1.0" = {
+      name = "extendr";
+      packageName = "extendr";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extendr/-/extendr-2.1.0.tgz";
+        sha1 = "301aa0bbea565f4d2dc8f570f2a22611a8527b56";
+      };
+    };
+    "extglob-0.3.2" = {
+      name = "extglob";
+      packageName = "extglob";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz";
+        sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1";
+      };
+    };
+    "extglob-2.0.4" = {
+      name = "extglob";
+      packageName = "extglob";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
+        sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
+      };
+    };
+    "extract-opts-2.2.0" = {
+      name = "extract-opts";
+      packageName = "extract-opts";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
+        sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
+      };
+    };
+    "extract-zip-1.6.7" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.6.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz";
+        sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9";
+      };
+    };
+    "extsprintf-1.2.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
+        sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
+      };
+    };
+    "extsprintf-1.3.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+        sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+      };
+    };
+    "eyes-0.1.8" = {
+      name = "eyes";
+      packageName = "eyes";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      };
+    };
+    "fancy-log-1.3.2" = {
+      name = "fancy-log";
+      packageName = "fancy-log";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz";
+        sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1";
+      };
+    };
+    "fast-deep-equal-1.1.0" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
+        sha1 = "c053477817c86b51daa853c81e059b733d023614";
+      };
+    };
+    "fast-deep-equal-2.0.1" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    };
+    "fast-json-stable-stringify-2.0.0" = {
+      name = "fast-json-stable-stringify";
+      packageName = "fast-json-stable-stringify";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+      };
+    };
+    "fast-levenshtein-2.0.6" = {
+      name = "fast-levenshtein";
+      packageName = "fast-levenshtein";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+        sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+      };
+    };
+    "fastparse-1.1.1" = {
+      name = "fastparse";
+      packageName = "fastparse";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz";
+        sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8";
+      };
+    };
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+      };
+    };
+    "figures-1.7.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz";
+        sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e";
+      };
+    };
+    "file-entry-cache-2.0.0" = {
+      name = "file-entry-cache";
+      packageName = "file-entry-cache";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
+        sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
+      };
+    };
+    "filename-regex-2.0.1" = {
+      name = "filename-regex";
+      packageName = "filename-regex";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz";
+        sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26";
+      };
+    };
+    "fill-range-2.2.4" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz";
+        sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==";
+      };
+    };
+    "fill-range-4.0.0" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz";
+        sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+      };
+    };
+    "finalhandler-1.1.1" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
+        sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
+      };
+    };
+    "find-cache-dir-0.1.1" = {
+      name = "find-cache-dir";
+      packageName = "find-cache-dir";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz";
+        sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9";
+      };
+    };
+    "find-cache-dir-1.0.0" = {
+      name = "find-cache-dir";
+      packageName = "find-cache-dir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz";
+        sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f";
+      };
+    };
+    "find-index-0.1.1" = {
+      name = "find-index";
+      packageName = "find-index";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
+        sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
+      };
+    };
+    "find-root-1.1.0" = {
+      name = "find-root";
+      packageName = "find-root";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz";
+        sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==";
+      };
+    };
+    "find-up-1.1.2" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
+        sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
+      };
+    };
+    "find-up-2.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    };
+    "findup-sync-1.0.0" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-1.0.0.tgz";
+        sha1 = "6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec";
+      };
+    };
+    "findup-sync-2.0.0" = {
+      name = "findup-sync";
+      packageName = "findup-sync";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz";
+        sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
+      };
+    };
+    "fined-1.1.0" = {
+      name = "fined";
+      packageName = "fined";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz";
+        sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476";
+      };
+    };
+    "first-chunk-stream-1.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
+        sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e";
+      };
+    };
+    "flagged-respawn-1.0.0" = {
+      name = "flagged-respawn";
+      packageName = "flagged-respawn";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz";
+        sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7";
+      };
+    };
+    "flat-cache-1.3.0" = {
+      name = "flat-cache";
+      packageName = "flat-cache";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz";
+        sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481";
+      };
+    };
+    "flatten-1.0.2" = {
+      name = "flatten";
+      packageName = "flatten";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz";
+        sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782";
+      };
+    };
+    "flush-write-stream-1.0.3" = {
+      name = "flush-write-stream";
+      packageName = "flush-write-stream";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz";
+        sha512 = "calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==";
+      };
+    };
+    "for-in-1.0.2" = {
+      name = "for-in";
+      packageName = "for-in";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz";
+        sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
+      };
+    };
+    "for-own-0.1.5" = {
+      name = "for-own";
+      packageName = "for-own";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz";
+        sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce";
+      };
+    };
+    "for-own-1.0.0" = {
+      name = "for-own";
+      packageName = "for-own";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz";
+        sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b";
+      };
+    };
+    "foreach-2.0.5" = {
+      name = "foreach";
+      packageName = "foreach";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
+        sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
+      };
+    };
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+    };
+    "form-data-1.0.0-rc3" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "1.0.0-rc3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+        sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+      };
+    };
+    "form-data-2.1.4" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz";
+        sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1";
+      };
+    };
+    "form-data-2.3.2" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
+        sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
+      };
+    };
+    "formidable-1.0.17" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+      };
+    };
+    "forwarded-0.1.2" = {
+      name = "forwarded";
+      packageName = "forwarded";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
+        sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+      };
+    };
+    "fragment-cache-0.2.1" = {
+      name = "fragment-cache";
+      packageName = "fragment-cache";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz";
+        sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+      };
+    };
+    "frameguard-3.0.0" = {
+      name = "frameguard";
+      packageName = "frameguard";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz";
+        sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9";
+      };
+    };
+    "fresh-0.5.2" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    };
+    "from2-2.3.0" = {
+      name = "from2";
+      packageName = "from2";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+      };
+    };
+    "fs-constants-1.0.0" = {
+      name = "fs-constants";
+      packageName = "fs-constants";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
+        sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==";
+      };
+    };
+    "fs-exists-sync-0.1.0" = {
+      name = "fs-exists-sync";
+      packageName = "fs-exists-sync";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz";
+        sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add";
+      };
+    };
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+      };
+    };
+    "fs-extra-4.0.3" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
+      };
+    };
+    "fs-minipass-1.2.5" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz";
+        sha512 = "JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==";
+      };
+    };
+    "fs-readdir-recursive-1.1.0" = {
+      name = "fs-readdir-recursive";
+      packageName = "fs-readdir-recursive";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz";
+        sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==";
+      };
+    };
+    "fs-write-stream-atomic-1.0.10" = {
+      name = "fs-write-stream-atomic";
+      packageName = "fs-write-stream-atomic";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+        sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "fsevents-1.2.4" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
+        sha512 = "z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==";
+      };
+    };
+    "function-bind-1.1.1" = {
+      name = "function-bind";
+      packageName = "function-bind";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+        sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "gaze-0.5.2" = {
+      name = "gaze";
+      packageName = "gaze";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
+        sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
+      };
+    };
+    "generate-function-2.0.0" = {
+      name = "generate-function";
+      packageName = "generate-function";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+      };
+    };
+    "generate-object-property-1.2.0" = {
+      name = "generate-object-property";
+      packageName = "generate-object-property";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+      };
+    };
+    "generic-pool-2.4.2" = {
+      name = "generic-pool";
+      packageName = "generic-pool";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.2.tgz";
+        sha1 = "886bc5bf0beb7db96e81bcbba078818de5a62683";
+      };
+    };
+    "generic-pool-2.4.3" = {
+      name = "generic-pool";
+      packageName = "generic-pool";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.4.3.tgz";
+        sha1 = "780c36f69dfad05a5a045dd37be7adca11a4f6ff";
+      };
+    };
+    "get-caller-file-1.0.3" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
+        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+      };
+    };
+    "get-stdin-5.0.1" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz";
+        sha1 = "122e161591e21ff4c52530305693f20e6393a398";
+      };
+    };
+    "get-stream-3.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+      };
+    };
+    "get-value-2.0.6" = {
+      name = "get-value";
+      packageName = "get-value";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz";
+        sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+      };
+    };
+    "getpass-0.1.7" = {
+      name = "getpass";
+      packageName = "getpass";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+        sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+      };
+    };
+    "glob-3.1.21" = {
+      name = "glob";
+      packageName = "glob";
+      version = "3.1.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+        sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
+      };
+    };
+    "glob-4.5.3" = {
+      name = "glob";
+      packageName = "glob";
+      version = "4.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+        sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
+      };
+    };
+    "glob-6.0.4" = {
+      name = "glob";
+      packageName = "glob";
+      version = "6.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
+        sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
+      };
+    };
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
+      };
+    };
+    "glob-base-0.3.0" = {
+      name = "glob-base";
+      packageName = "glob-base";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz";
+        sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4";
+      };
+    };
+    "glob-parent-2.0.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz";
+        sha1 = "81383d72db054fcccf5336daa902f182f6edbb28";
+      };
+    };
+    "glob-stream-3.1.18" = {
+      name = "glob-stream";
+      packageName = "glob-stream";
+      version = "3.1.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
+        sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
+      };
+    };
+    "glob-watcher-0.0.6" = {
+      name = "glob-watcher";
+      packageName = "glob-watcher";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
+        sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
+      };
+    };
+    "glob2base-0.0.12" = {
+      name = "glob2base";
+      packageName = "glob2base";
+      version = "0.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
+        sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56";
+      };
+    };
+    "global-modules-0.2.3" = {
+      name = "global-modules";
+      packageName = "global-modules";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz";
+        sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d";
+      };
+    };
+    "global-modules-1.0.0" = {
+      name = "global-modules";
+      packageName = "global-modules";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz";
+        sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
+      };
+    };
+    "global-prefix-0.1.5" = {
+      name = "global-prefix";
+      packageName = "global-prefix";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
+      };
+    };
+    "global-prefix-1.0.2" = {
+      name = "global-prefix";
+      packageName = "global-prefix";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz";
+        sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
+      };
+    };
+    "globals-9.18.0" = {
+      name = "globals";
+      packageName = "globals";
+      version = "9.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
+        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
+      };
+    };
+    "globby-5.0.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz";
+        sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d";
+      };
+    };
+    "globby-7.1.1" = {
+      name = "globby";
+      packageName = "globby";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz";
+        sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
+      };
+    };
+    "globule-0.1.0" = {
+      name = "globule";
+      packageName = "globule";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+        sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
+      };
+    };
+    "glogg-1.0.1" = {
+      name = "glogg";
+      packageName = "glogg";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz";
+        sha512 = "ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==";
+      };
+    };
+    "good-listener-1.2.2" = {
+      name = "good-listener";
+      packageName = "good-listener";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz";
+        sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50";
+      };
+    };
+    "graceful-fs-1.2.3" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+        sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      };
+    };
+    "graceful-fs-3.0.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "3.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
+        sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+      };
+    };
+    "graceful-fs-4.1.11" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "4.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+      };
+    };
+    "graphlib-2.1.5" = {
+      name = "graphlib";
+      packageName = "graphlib";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz";
+        sha512 = "XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==";
+      };
+    };
+    "graphlibrary-2.2.0" = {
+      name = "graphlibrary";
+      packageName = "graphlibrary";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphlibrary/-/graphlibrary-2.2.0.tgz";
+        sha512 = "XTcvT55L8u4MBZrM37zXoUxsgxs/7sow7YSygd9CIwfWTVO8RVu7AYXhhCiTuFEf+APKgx6Jk4SuQbYR0vYKmQ==";
+      };
+    };
+    "grunt-contrib-jshint-1.1.0" = {
+      name = "grunt-contrib-jshint";
+      packageName = "grunt-contrib-jshint";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz";
+        sha1 = "369d909b2593c40e8be79940b21340850c7939ac";
+      };
+    };
+    "grunt-contrib-qunit-2.0.0" = {
+      name = "grunt-contrib-qunit";
+      packageName = "grunt-contrib-qunit";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-2.0.0.tgz";
+        sha1 = "54a51b4b2c84fee62c3b7e00145c928d1ec2b7ec";
+      };
+    };
+    "grunt-contrib-uglify-3.4.0" = {
+      name = "grunt-contrib-uglify";
+      packageName = "grunt-contrib-uglify";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-3.4.0.tgz";
+        sha512 = "UXsTpeP0pytpTYlmll3RDndsRXfdwmrf1tI/AtD/PrArQAzGmKMvj83aVt3D8egWlE6KqPjsJBLCCvfC52LI/A==";
+      };
+    };
+    "grunt-lib-phantomjs-1.1.0" = {
+      name = "grunt-lib-phantomjs";
+      packageName = "grunt-lib-phantomjs";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.1.0.tgz";
+        sha1 = "9e9edcdd9fd2dd40e0c181c94371d572aa5eead2";
+      };
+    };
+    "gulp-3.9.1" = {
+      name = "gulp";
+      packageName = "gulp";
+      version = "3.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+        sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
+      };
+    };
+    "gulp-help-1.6.1" = {
+      name = "gulp-help";
+      packageName = "gulp-help";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-help/-/gulp-help-1.6.1.tgz";
+        sha1 = "261db186e18397fef3f6a2c22e9c315bfa88ae0c";
+      };
+    };
+    "gulp-util-3.0.8" = {
+      name = "gulp-util";
+      packageName = "gulp-util";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
+        sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f";
+      };
+    };
+    "gulplog-1.0.0" = {
+      name = "gulplog";
+      packageName = "gulplog";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz";
+        sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
+      };
+    };
+    "gzip-size-3.0.0" = {
+      name = "gzip-size";
+      packageName = "gzip-size";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz";
+        sha1 = "546188e9bdc337f673772f81660464b389dce520";
+      };
+    };
+    "har-schema-1.0.5" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz";
+        sha1 = "d263135f43307c02c602afc8fe95970c0151369e";
+      };
+    };
+    "har-schema-2.0.0" = {
+      name = "har-schema";
+      packageName = "har-schema";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+        sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+      };
+    };
+    "har-validator-4.2.1" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz";
+        sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a";
+      };
+    };
+    "har-validator-5.0.3" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
+        sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
+      };
+    };
+    "has-1.0.3" = {
+      name = "has";
+      packageName = "has";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+        sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+      };
+    };
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+    };
+    "has-binary2-1.0.3" = {
+      name = "has-binary2";
+      packageName = "has-binary2";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz";
+        sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==";
+      };
+    };
+    "has-color-0.1.7" = {
+      name = "has-color";
+      packageName = "has-color";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+      };
+    };
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+      };
+    };
+    "has-flag-1.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz";
+        sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
+      };
+    };
+    "has-flag-3.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+        sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+      };
+    };
+    "has-gulplog-0.1.0" = {
+      name = "has-gulplog";
+      packageName = "has-gulplog";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz";
+        sha1 = "6414c82913697da51590397dafb12f22967811ce";
+      };
+    };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "has-value-0.3.1" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz";
+        sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+      };
+    };
+    "has-value-1.0.0" = {
+      name = "has-value";
+      packageName = "has-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz";
+        sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+      };
+    };
+    "has-values-0.1.4" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz";
+        sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+      };
+    };
+    "has-values-1.0.0" = {
+      name = "has-values";
+      packageName = "has-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz";
+        sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+      };
+    };
+    "hash-base-3.0.4" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+      };
+    };
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+      };
+    };
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+      };
+    };
+    "he-1.1.1" = {
+      name = "he";
+      packageName = "he";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz";
+        sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
+      };
+    };
+    "helmet-crossdomain-0.3.0" = {
+      name = "helmet-crossdomain";
+      packageName = "helmet-crossdomain";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz";
+        sha512 = "YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==";
+      };
+    };
+    "helmet-csp-2.7.1" = {
+      name = "helmet-csp";
+      packageName = "helmet-csp";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz";
+        sha512 = "sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==";
+      };
+    };
+    "hide-powered-by-1.0.0" = {
+      name = "hide-powered-by";
+      packageName = "hide-powered-by";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz";
+        sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b";
+      };
+    };
+    "highlight.js-9.12.0" = {
+      name = "highlight.js";
+      packageName = "highlight.js";
+      version = "9.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
+        sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "home-or-tmp-2.0.0" = {
+      name = "home-or-tmp";
+      packageName = "home-or-tmp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
+        sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
+      };
+    };
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+      };
+    };
+    "hooker-0.2.3" = {
+      name = "hooker";
+      packageName = "hooker";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+        sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
+      };
+    };
+    "hosted-git-info-2.7.1" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
+        sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+      };
+    };
+    "hpkp-2.0.0" = {
+      name = "hpkp";
+      packageName = "hpkp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz";
+        sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672";
+      };
+    };
+    "hsts-2.1.0" = {
+      name = "hsts";
+      packageName = "hsts";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hsts/-/hsts-2.1.0.tgz";
+        sha512 = "zXhh/DqgrTXJ7erTN6Fh5k/xjMhDGXCqdYN3wvxUvGUQvnxcFfUd8E+6vLg/nk3ss1TYMb+DhRl25fYABioTvA==";
+      };
+    };
+    "html-comment-regex-1.1.1" = {
+      name = "html-comment-regex";
+      packageName = "html-comment-regex";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz";
+        sha1 = "668b93776eaae55ebde8f3ad464b307a4963625e";
+      };
+    };
+    "html-encoding-sniffer-1.0.2" = {
+      name = "html-encoding-sniffer";
+      packageName = "html-encoding-sniffer";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
+        sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==";
+      };
+    };
+    "html-minifier-3.5.19" = {
+      name = "html-minifier";
+      packageName = "html-minifier";
+      version = "3.5.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz";
+        sha512 = "Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==";
+      };
+    };
+    "htmlparser2-3.3.0" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz";
+        sha1 = "cc70d05a59f6542e43f0e685c982e14c924a9efe";
+      };
+    };
+    "htmlparser2-3.8.3" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+        sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
+      };
+    };
+    "htmlparser2-3.9.2" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
+      };
+    };
+    "http-errors-1.6.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz";
+        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
+      };
+    };
+    "http-errors-1.6.3" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
+        sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
+      };
+    };
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+      };
+    };
+    "http-signature-1.2.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+        sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+      };
+    };
+    "https-browserify-0.0.1" = {
+      name = "https-browserify";
+      packageName = "https-browserify";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
+        sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+      };
+    };
+    "iconv-lite-0.4.19" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz";
+        sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==";
+      };
+    };
+    "iconv-lite-0.4.23" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
+        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
+      };
+    };
+    "icss-replace-symbols-1.1.0" = {
+      name = "icss-replace-symbols";
+      packageName = "icss-replace-symbols";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz";
+        sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded";
+      };
+    };
+    "ieee754-1.1.12" = {
+      name = "ieee754";
+      packageName = "ieee754";
+      version = "1.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz";
+        sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==";
+      };
+    };
+    "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";
+      };
+    };
+    "ienoopen-1.0.0" = {
+      name = "ienoopen";
+      packageName = "ienoopen";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz";
+        sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b";
+      };
+    };
+    "iferr-0.1.5" = {
+      name = "iferr";
+      packageName = "iferr";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz";
+        sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+      };
+    };
+    "ignore-3.3.10" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "3.3.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
+        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
+      };
+    };
+    "ignore-walk-3.0.1" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz";
+        sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==";
+      };
+    };
+    "ignorefs-1.2.0" = {
+      name = "ignorefs";
+      packageName = "ignorefs";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignorefs/-/ignorefs-1.2.0.tgz";
+        sha1 = "da59fb858976e4a5e43702ccd1f282fdbc9e5756";
+      };
+    };
+    "ignorepatterns-1.1.0" = {
+      name = "ignorepatterns";
+      packageName = "ignorepatterns";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignorepatterns/-/ignorepatterns-1.1.0.tgz";
+        sha1 = "ac8f436f2239b5dfb66d5f0d3a904a87ac67cc5e";
+      };
+    };
+    "image-size-0.5.5" = {
+      name = "image-size";
+      packageName = "image-size";
+      version = "0.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz";
+        sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c";
+      };
+    };
+    "imurmurhash-0.1.4" = {
+      name = "imurmurhash";
+      packageName = "imurmurhash";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+        sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+      };
+    };
+    "indexes-of-1.0.1" = {
+      name = "indexes-of";
+      packageName = "indexes-of";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz";
+        sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
+      };
+    };
+    "indexof-0.0.1" = {
+      name = "indexof";
+      packageName = "indexof";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+        sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+      };
+    };
+    "inflection-1.12.0" = {
+      name = "inflection";
+      packageName = "inflection";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz";
+        sha1 = "a200935656d6f5f6bc4dc7502e1aecb703228416";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-1.0.2" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
+        sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
+      };
+    };
+    "inherits-2.0.1" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+      };
+    };
+    "inquirer-0.12.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
+        sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
+      };
+    };
+    "interpret-0.6.6" = {
+      name = "interpret";
+      packageName = "interpret";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz";
+        sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
+      };
+    };
+    "interpret-1.1.0" = {
+      name = "interpret";
+      packageName = "interpret";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz";
+        sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614";
+      };
+    };
+    "invariant-2.2.4" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
+        sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
+      };
+    };
+    "invert-kv-1.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
+        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+      };
+    };
+    "ipaddr.js-1.8.0" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz";
+        sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e";
+      };
+    };
+    "is-absolute-1.0.0" = {
+      name = "is-absolute";
+      packageName = "is-absolute";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz";
+        sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==";
+      };
+    };
+    "is-absolute-url-2.1.0" = {
+      name = "is-absolute-url";
+      packageName = "is-absolute-url";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz";
+        sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6";
+      };
+    };
+    "is-accessor-descriptor-0.1.6" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+        sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+      };
+    };
+    "is-accessor-descriptor-1.0.0" = {
+      name = "is-accessor-descriptor";
+      packageName = "is-accessor-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+        sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
+      };
+    };
+    "is-alphabetical-1.0.2" = {
+      name = "is-alphabetical";
+      packageName = "is-alphabetical";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==";
+      };
+    };
+    "is-alphanumerical-1.0.2" = {
+      name = "is-alphanumerical";
+      packageName = "is-alphanumerical";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==";
+      };
+    };
+    "is-arrayish-0.2.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+        sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+      };
+    };
+    "is-binary-path-1.0.1" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz";
+        sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+      };
+    };
+    "is-buffer-1.1.6" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+        sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+      };
+    };
+    "is-builtin-module-1.0.0" = {
+      name = "is-builtin-module";
+      packageName = "is-builtin-module";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
+        sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
+      };
+    };
+    "is-callable-1.1.4" = {
+      name = "is-callable";
+      packageName = "is-callable";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
+        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+      };
+    };
+    "is-data-descriptor-0.1.4" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+        sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+      };
+    };
+    "is-data-descriptor-1.0.0" = {
+      name = "is-data-descriptor";
+      packageName = "is-data-descriptor";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+        sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
+      };
+    };
+    "is-date-object-1.0.1" = {
+      name = "is-date-object";
+      packageName = "is-date-object";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
+        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+      };
+    };
+    "is-decimal-1.0.2" = {
+      name = "is-decimal";
+      packageName = "is-decimal";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==";
+      };
+    };
+    "is-descriptor-0.1.6" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
+        sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
+      };
+    };
+    "is-descriptor-1.0.2" = {
+      name = "is-descriptor";
+      packageName = "is-descriptor";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
+        sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
+      };
+    };
+    "is-dotfile-1.0.3" = {
+      name = "is-dotfile";
+      packageName = "is-dotfile";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz";
+        sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
+      };
+    };
+    "is-equal-shallow-0.1.3" = {
+      name = "is-equal-shallow";
+      packageName = "is-equal-shallow";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz";
+        sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534";
+      };
+    };
+    "is-extendable-0.1.1" = {
+      name = "is-extendable";
+      packageName = "is-extendable";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz";
+        sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
+      };
+    };
+    "is-extendable-1.0.1" = {
+      name = "is-extendable";
+      packageName = "is-extendable";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
+        sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
+      };
+    };
+    "is-extglob-1.0.0" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz";
+        sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
+      };
+    };
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+      };
+    };
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+      };
+    };
+    "is-glob-2.0.1" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz";
+        sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863";
+      };
+    };
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+      };
+    };
+    "is-glob-4.0.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz";
+        sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
+      };
+    };
+    "is-hexadecimal-1.0.2" = {
+      name = "is-hexadecimal";
+      packageName = "is-hexadecimal";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==";
+      };
+    };
+    "is-my-ip-valid-1.0.0" = {
+      name = "is-my-ip-valid";
+      packageName = "is-my-ip-valid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz";
+        sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==";
+      };
+    };
+    "is-my-json-valid-2.17.2" = {
+      name = "is-my-json-valid";
+      packageName = "is-my-json-valid";
+      version = "2.17.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz";
+        sha512 = "IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==";
+      };
+    };
+    "is-number-2.1.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz";
+        sha1 = "01fcbbb393463a548f2f466cce16dece49db908f";
+      };
+    };
+    "is-number-3.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz";
+        sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+      };
+    };
+    "is-number-4.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz";
+        sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==";
+      };
+    };
+    "is-path-cwd-1.0.0" = {
+      name = "is-path-cwd";
+      packageName = "is-path-cwd";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
+        sha1 = "d225ec23132e89edd38fda767472e62e65f1106d";
+      };
+    };
+    "is-path-in-cwd-1.0.1" = {
+      name = "is-path-in-cwd";
+      packageName = "is-path-in-cwd";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz";
+        sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==";
+      };
+    };
+    "is-path-inside-1.0.1" = {
+      name = "is-path-inside";
+      packageName = "is-path-inside";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz";
+        sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
+      };
+    };
+    "is-plain-obj-1.1.0" = {
+      name = "is-plain-obj";
+      packageName = "is-plain-obj";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+        sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+      };
+    };
+    "is-plain-object-2.0.4" = {
+      name = "is-plain-object";
+      packageName = "is-plain-object";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+        sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
+      };
+    };
+    "is-posix-bracket-0.1.1" = {
+      name = "is-posix-bracket";
+      packageName = "is-posix-bracket";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz";
+        sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
+      };
+    };
+    "is-primitive-2.0.0" = {
+      name = "is-primitive";
+      packageName = "is-primitive";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz";
+        sha1 = "207bab91638499c07b2adf240a41a87210034575";
+      };
+    };
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
+    "is-property-1.0.2" = {
+      name = "is-property";
+      packageName = "is-property";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+      };
+    };
+    "is-regex-1.0.4" = {
+      name = "is-regex";
+      packageName = "is-regex";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
+        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+      };
+    };
+    "is-relative-1.0.0" = {
+      name = "is-relative";
+      packageName = "is-relative";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz";
+        sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
+      };
+    };
+    "is-resolvable-1.1.0" = {
+      name = "is-resolvable";
+      packageName = "is-resolvable";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz";
+        sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "is-svg-2.1.0" = {
+      name = "is-svg";
+      packageName = "is-svg";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz";
+        sha1 = "cf61090da0d9efbcab8722deba6f032208dbb0e9";
+      };
+    };
+    "is-symbol-1.0.1" = {
+      name = "is-symbol";
+      packageName = "is-symbol";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz";
+        sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572";
+      };
+    };
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+      };
+    };
+    "is-unc-path-1.0.0" = {
+      name = "is-unc-path";
+      packageName = "is-unc-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz";
+        sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==";
+      };
+    };
+    "is-utf8-0.2.1" = {
+      name = "is-utf8";
+      packageName = "is-utf8";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
+        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
+      };
+    };
+    "is-windows-0.2.0" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz";
+        sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
+      };
+    };
+    "is-windows-1.0.2" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
+        sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
+      };
+    };
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "isarray-2.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz";
+        sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e";
+      };
+    };
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+      };
+    };
+    "isobject-2.1.0" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz";
+        sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
+      };
+    };
+    "isobject-3.0.1" = {
+      name = "isobject";
+      packageName = "isobject";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+        sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+      };
+    };
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+    };
+    "jmespath-0.15.0" = {
+      name = "jmespath";
+      packageName = "jmespath";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz";
+        sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
+      };
+    };
+    "js-base64-2.4.8" = {
+      name = "js-base64";
+      packageName = "js-base64";
+      version = "2.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz";
+        sha512 = "hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==";
+      };
+    };
+    "js-beautify-1.7.5" = {
+      name = "js-beautify";
+      packageName = "js-beautify";
+      version = "1.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz";
+        sha512 = "9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==";
+      };
+    };
+    "js-string-escape-1.0.1" = {
+      name = "js-string-escape";
+      packageName = "js-string-escape";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz";
+        sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef";
+      };
+    };
+    "js-tokens-3.0.2" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz";
+        sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+      };
+    };
+    "js-yaml-3.12.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+        sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
+      };
+    };
+    "js-yaml-3.5.5" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz";
+        sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe";
+      };
+    };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      };
+    };
+    "jsbn-0.1.1" = {
+      name = "jsbn";
+      packageName = "jsbn";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+      };
+    };
+    "jsdom-9.12.0" = {
+      name = "jsdom";
+      packageName = "jsdom";
+      version = "9.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz";
+        sha1 = "e8c546fffcb06c00d4833ca84410fed7f8a097d4";
+      };
+    };
+    "jsesc-0.5.0" = {
+      name = "jsesc";
+      packageName = "jsesc";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
+        sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+      };
+    };
+    "jsesc-1.3.0" = {
+      name = "jsesc";
+      packageName = "jsesc";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
+        sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
+      };
+    };
+    "jshint-2.9.6" = {
+      name = "jshint";
+      packageName = "jshint";
+      version = "2.9.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz";
+        sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==";
+      };
+    };
+    "json-edm-parser-0.1.2" = {
+      name = "json-edm-parser";
+      packageName = "json-edm-parser";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz";
+        sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4";
+      };
+    };
+    "json-parse-better-errors-1.0.2" = {
+      name = "json-parse-better-errors";
+      packageName = "json-parse-better-errors";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+        sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
+      };
+    };
+    "json-schema-0.2.3" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+        sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+      };
+    };
+    "json-schema-traverse-0.3.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
+        sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
+      };
+    };
+    "json-schema-traverse-0.4.1" = {
+      name = "json-schema-traverse";
+      packageName = "json-schema-traverse";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+        sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+      };
+    };
+    "json-stable-stringify-1.0.1" = {
+      name = "json-stable-stringify";
+      packageName = "json-stable-stringify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+      };
+    };
+    "json-stream-1.0.0" = {
+      name = "json-stream";
+      packageName = "json-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stream/-/json-stream-1.0.0.tgz";
+        sha1 = "1a3854e28d2bbeeab31cc7ddf683d2ddc5652708";
+      };
+    };
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+    };
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+      };
+    };
+    "jsonfile-2.4.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
+      };
+    };
+    "jsonfile-4.0.0" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz";
+        sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
+      };
+    };
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
+      };
+    };
+    "jsonparse-1.2.0" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz";
+        sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
+      };
+    };
+    "jsonpointer-4.0.1" = {
+      name = "jsonpointer";
+      packageName = "jsonpointer";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+      };
+    };
+    "jsprim-1.4.1" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+        sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+      };
+    };
+    "jsx-ast-utils-1.4.1" = {
+      name = "jsx-ast-utils";
+      packageName = "jsx-ast-utils";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz";
+        sha1 = "3867213e8dd79bf1e8f2300c0cfc1efb182c0df1";
+      };
+    };
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+      };
+    };
+    "kind-of-3.2.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    };
+    "kind-of-4.0.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz";
+        sha1 = "20813df3d712928b207378691a45066fae72dd57";
+      };
+    };
+    "kind-of-5.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
+        sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
+      };
+    };
+    "kind-of-6.0.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
+        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+      };
+    };
+    "klaw-1.3.1" = {
+      name = "klaw";
+      packageName = "klaw";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
+        sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "lazystream-1.0.0" = {
+      name = "lazystream";
+      packageName = "lazystream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz";
+        sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
+      };
+    };
+    "lcid-1.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
+        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+      };
+    };
+    "ldap-filter-0.2.2" = {
+      name = "ldap-filter";
+      packageName = "ldap-filter";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ldap-filter/-/ldap-filter-0.2.2.tgz";
+        sha1 = "f2b842be0b86da3352798505b31ebcae590d77d0";
+      };
+    };
+    "ldapauth-fork-4.0.2" = {
+      name = "ldapauth-fork";
+      packageName = "ldapauth-fork";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ldapauth-fork/-/ldapauth-fork-4.0.2.tgz";
+        sha512 = "YoPHsyfV6L/4SO5EMi/Jk1xUMaY+ANlR4Yp+WIsqGkWOLPKkuzRYB4s/IsdKBeb3sdwVCw+q/YN9eoa1dXmQdA==";
+      };
+    };
+    "ldapjs-1.0.2" = {
+      name = "ldapjs";
+      packageName = "ldapjs";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ldapjs/-/ldapjs-1.0.2.tgz";
+        sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9";
+      };
+    };
+    "levn-0.3.0" = {
+      name = "levn";
+      packageName = "levn";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+        sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+      };
+    };
+    "liftoff-2.5.0" = {
+      name = "liftoff";
+      packageName = "liftoff";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz";
+        sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec";
+      };
+    };
+    "linkify-it-2.0.3" = {
+      name = "linkify-it";
+      packageName = "linkify-it";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz";
+        sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f";
+      };
+    };
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+      };
+    };
+    "load-json-file-4.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz";
+        sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
+      };
+    };
+    "loader-utils-0.2.17" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "0.2.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
+        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
+      };
+    };
+    "loader-utils-1.1.0" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz";
+        sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd";
+      };
+    };
+    "locate-path-2.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    };
+    "lodash-1.0.2" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+        sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
+      };
+    };
+    "lodash-3.10.1" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "3.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+        sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
+      };
+    };
+    "lodash-4.17.10" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
+      };
+    };
+    "lodash._basecopy-3.0.1" = {
+      name = "lodash._basecopy";
+      packageName = "lodash._basecopy";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
+        sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36";
+      };
+    };
+    "lodash._basetostring-3.0.1" = {
+      name = "lodash._basetostring";
+      packageName = "lodash._basetostring";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz";
+        sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5";
+      };
+    };
+    "lodash._basevalues-3.0.0" = {
+      name = "lodash._basevalues";
+      packageName = "lodash._basevalues";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
+        sha1 = "5b775762802bde3d3297503e26300820fdf661b7";
+      };
+    };
+    "lodash._getnative-3.9.1" = {
+      name = "lodash._getnative";
+      packageName = "lodash._getnative";
+      version = "3.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz";
+        sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5";
+      };
+    };
+    "lodash._isiterateecall-3.0.9" = {
+      name = "lodash._isiterateecall";
+      packageName = "lodash._isiterateecall";
+      version = "3.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz";
+        sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c";
+      };
+    };
+    "lodash._reescape-3.0.0" = {
+      name = "lodash._reescape";
+      packageName = "lodash._reescape";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
+        sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a";
+      };
+    };
+    "lodash._reevaluate-3.0.0" = {
+      name = "lodash._reevaluate";
+      packageName = "lodash._reevaluate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
+        sha1 = "58bc74c40664953ae0b124d806996daca431e2ed";
+      };
+    };
+    "lodash._reinterpolate-3.0.0" = {
+      name = "lodash._reinterpolate";
+      packageName = "lodash._reinterpolate";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz";
+        sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d";
+      };
+    };
+    "lodash._root-3.0.1" = {
+      name = "lodash._root";
+      packageName = "lodash._root";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz";
+        sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692";
+      };
+    };
+    "lodash.assignin-4.2.0" = {
+      name = "lodash.assignin";
+      packageName = "lodash.assignin";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz";
+        sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
+      };
+    };
+    "lodash.bind-4.2.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
+        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
+      };
+    };
+    "lodash.camelcase-4.3.0" = {
+      name = "lodash.camelcase";
+      packageName = "lodash.camelcase";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+        sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+      };
+    };
+    "lodash.defaults-4.2.0" = {
+      name = "lodash.defaults";
+      packageName = "lodash.defaults";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+      };
+    };
+    "lodash.escape-3.2.0" = {
+      name = "lodash.escape";
+      packageName = "lodash.escape";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz";
+        sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698";
+      };
+    };
+    "lodash.filter-4.6.0" = {
+      name = "lodash.filter";
+      packageName = "lodash.filter";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz";
+        sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace";
+      };
+    };
+    "lodash.flatten-4.4.0" = {
+      name = "lodash.flatten";
+      packageName = "lodash.flatten";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+      };
+    };
+    "lodash.foreach-4.5.0" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz";
+        sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
+      };
+    };
+    "lodash.isarguments-3.1.0" = {
+      name = "lodash.isarguments";
+      packageName = "lodash.isarguments";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz";
+        sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a";
+      };
+    };
+    "lodash.isarray-3.0.4" = {
+      name = "lodash.isarray";
+      packageName = "lodash.isarray";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz";
+        sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
+      };
+    };
+    "lodash.keys-3.1.2" = {
+      name = "lodash.keys";
+      packageName = "lodash.keys";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz";
+        sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a";
+      };
+    };
+    "lodash.map-4.6.0" = {
+      name = "lodash.map";
+      packageName = "lodash.map";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz";
+        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+      };
+    };
+    "lodash.memoize-4.1.2" = {
+      name = "lodash.memoize";
+      packageName = "lodash.memoize";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
+        sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
+      };
+    };
+    "lodash.merge-4.6.1" = {
+      name = "lodash.merge";
+      packageName = "lodash.merge";
+      version = "4.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz";
+        sha512 = "AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==";
+      };
+    };
+    "lodash.pick-4.4.0" = {
+      name = "lodash.pick";
+      packageName = "lodash.pick";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
+        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
+      };
+    };
+    "lodash.reduce-4.6.0" = {
+      name = "lodash.reduce";
+      packageName = "lodash.reduce";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
+        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
+      };
+    };
+    "lodash.reject-4.6.0" = {
+      name = "lodash.reject";
+      packageName = "lodash.reject";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
+        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
+      };
+    };
+    "lodash.restparam-3.6.1" = {
+      name = "lodash.restparam";
+      packageName = "lodash.restparam";
+      version = "3.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
+        sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
+      };
+    };
+    "lodash.some-4.6.0" = {
+      name = "lodash.some";
+      packageName = "lodash.some";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
+        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+      };
+    };
+    "lodash.template-3.6.2" = {
+      name = "lodash.template";
+      packageName = "lodash.template";
+      version = "3.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz";
+        sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f";
+      };
+    };
+    "lodash.templatesettings-3.1.1" = {
+      name = "lodash.templatesettings";
+      packageName = "lodash.templatesettings";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz";
+        sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5";
+      };
+    };
+    "lodash.uniq-4.5.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "longest-streak-1.0.0" = {
+      name = "longest-streak";
+      packageName = "longest-streak";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz";
+        sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965";
+      };
+    };
+    "loose-envify-1.4.0" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz";
+        sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
+      };
+    };
+    "lower-case-1.1.4" = {
+      name = "lower-case";
+      packageName = "lower-case";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz";
+        sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac";
+      };
+    };
+    "lru-cache-2.7.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+        sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+      };
+    };
+    "lru-cache-3.2.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz";
+        sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
+      };
+    };
+    "lru-cache-4.1.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
+        sha512 = "fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==";
+      };
+    };
+    "lru-queue-0.1.0" = {
+      name = "lru-queue";
+      packageName = "lru-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
+        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+      };
+    };
+    "magic-string-0.14.0" = {
+      name = "magic-string";
+      packageName = "magic-string";
+      version = "0.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz";
+        sha1 = "57224aef1701caeed273b17a39a956e72b172462";
+      };
+    };
+    "make-dir-1.3.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
+        sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
+      };
+    };
+    "make-iterator-1.0.1" = {
+      name = "make-iterator";
+      packageName = "make-iterator";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz";
+        sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
+      };
+    };
+    "make-plural-3.0.6" = {
+      name = "make-plural";
+      packageName = "make-plural";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-plural/-/make-plural-3.0.6.tgz";
+        sha1 = "2033a03bac290b8f3bb91258f65b9df7e8b01ca7";
+      };
+    };
+    "map-cache-0.2.2" = {
+      name = "map-cache";
+      packageName = "map-cache";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz";
+        sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+      };
+    };
+    "map-visit-1.0.0" = {
+      name = "map-visit";
+      packageName = "map-visit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz";
+        sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+      };
+    };
+    "markdown-table-0.4.0" = {
+      name = "markdown-table";
+      packageName = "markdown-table";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz";
+        sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1";
+      };
+    };
+    "markdown-to-ast-3.4.0" = {
+      name = "markdown-to-ast";
+      packageName = "markdown-to-ast";
+      version = "3.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz";
+        sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7";
+      };
+    };
+    "marked-0.3.19" = {
+      name = "marked";
+      packageName = "marked";
+      version = "0.3.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz";
+        sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==";
+      };
+    };
+    "math-expression-evaluator-1.2.17" = {
+      name = "math-expression-evaluator";
+      packageName = "math-expression-evaluator";
+      version = "1.2.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz";
+        sha1 = "de819fdbcd84dccd8fae59c6aeb79615b9d266ac";
+      };
+    };
+    "math-interval-parser-1.1.0" = {
+      name = "math-interval-parser";
+      packageName = "math-interval-parser";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-1.1.0.tgz";
+        sha1 = "dbeda5b06b3249973c6df6170fde2386f0afd893";
+      };
+    };
+    "math-random-1.0.1" = {
+      name = "math-random";
+      packageName = "math-random";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz";
+        sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac";
+      };
+    };
+    "maxmin-2.1.0" = {
+      name = "maxmin";
+      packageName = "maxmin";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz";
+        sha1 = "4d3b220903d95eee7eb7ac7fa864e72dc09a3166";
+      };
+    };
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    };
+    "mdurl-1.0.1" = {
+      name = "mdurl";
+      packageName = "mdurl";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
+        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
+      };
+    };
+    "media-typer-0.3.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    };
+    "mem-1.1.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz";
+        sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
+      };
+    };
+    "memoizee-0.4.12" = {
+      name = "memoizee";
+      packageName = "memoizee";
+      version = "0.4.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz";
+        sha512 = "sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==";
+      };
+    };
+    "memory-fs-0.2.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
+        sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+      };
+    };
+    "memory-fs-0.3.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
+        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+      };
+    };
+    "merge-descriptors-1.0.1" = {
+      name = "merge-descriptors";
+      packageName = "merge-descriptors";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+        sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+      };
+    };
+    "messageformat-0.3.1" = {
+      name = "messageformat";
+      packageName = "messageformat";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/messageformat/-/messageformat-0.3.1.tgz";
+        sha1 = "e58fff8245e9b3971799e5b43db58b3e9417f5a2";
+      };
+    };
+    "methods-1.1.2" = {
+      name = "methods";
+      packageName = "methods";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    };
+    "micromatch-2.3.11" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "2.3.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz";
+        sha1 = "86677c97d1720b363431d04d0d15293bd38c1565";
+      };
+    };
+    "micromatch-3.1.10" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "3.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
+        sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
+      };
+    };
+    "mime-1.3.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+      };
+    };
+    "mime-1.3.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz";
+        sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0";
+      };
+    };
+    "mime-1.4.1" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
+        sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
+      };
+    };
+    "mime-1.6.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+      };
+    };
+    "mime-db-1.35.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.35.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
+        sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
+      };
+    };
+    "mime-types-2.1.19" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
+        sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
+      };
+    };
+    "mimic-fn-1.2.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+      };
+    };
+    "minimatch-0.2.14" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.2.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+        sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+      };
+    };
+    "minimatch-2.0.10" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+        sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.10" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minimist-1.2.0" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+      };
+    };
+    "minipass-2.3.3" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.3.tgz";
+        sha512 = "/jAn9/tEX4gnpyRATxgHEOV6xbcyxgT7iUnxo9Y3+OB0zX00TgKIv/2FZCf5brBbICcwbLqVv2ImjvWWrQMSYw==";
+      };
+    };
+    "minizlib-1.1.0" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
+        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+      };
+    };
+    "mississippi-2.0.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz";
+        sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==";
+      };
+    };
+    "mixin-deep-1.3.1" = {
+      name = "mixin-deep";
+      packageName = "mixin-deep";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz";
+        sha512 = "8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "moment-2.22.2" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.22.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
+        sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+      };
+    };
+    "moment-timezone-0.5.21" = {
+      name = "moment-timezone";
+      packageName = "moment-timezone";
+      version = "0.5.21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz";
+        sha512 = "j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A==";
+      };
+    };
+    "move-concurrently-1.0.1" = {
+      name = "move-concurrently";
+      packageName = "move-concurrently";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "multipipe-0.1.2" = {
+      name = "multipipe";
+      packageName = "multipipe";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
+        sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
+      };
+    };
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+      };
+    };
+    "mute-stream-0.0.5" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+        sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
+      };
+    };
+    "mv-2.1.1" = {
+      name = "mv";
+      packageName = "mv";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
+        sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
+      };
+    };
+    "nan-2.10.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
+        sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
+      };
+    };
+    "nanomatch-1.2.13" = {
+      name = "nanomatch";
+      packageName = "nanomatch";
+      version = "1.2.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
+        sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
+      };
+    };
+    "natives-1.1.4" = {
+      name = "natives";
+      packageName = "natives";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz";
+        sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==";
+      };
+    };
+    "natural-compare-1.4.0" = {
+      name = "natural-compare";
+      packageName = "natural-compare";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
+        sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+      };
+    };
+    "ncp-2.0.0" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+        sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
+      };
+    };
+    "needle-2.2.1" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
+        sha512 = "t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==";
+      };
+    };
+    "negotiator-0.6.1" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz";
+        sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
+      };
+    };
+    "next-tick-1.0.0" = {
+      name = "next-tick";
+      packageName = "next-tick";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
+        sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
+      };
+    };
+    "no-case-2.3.2" = {
+      name = "no-case";
+      packageName = "no-case";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz";
+        sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
+      };
+    };
+    "nocache-2.0.0" = {
+      name = "nocache";
+      packageName = "nocache";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz";
+        sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980";
+      };
+    };
+    "node-forge-0.7.5" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz";
+        sha512 = "MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==";
+      };
+    };
+    "node-libs-browser-0.7.0" = {
+      name = "node-libs-browser";
+      packageName = "node-libs-browser";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz";
+        sha1 = "3e272c0819e308935e26674408d7af0e1491b83b";
+      };
+    };
+    "node-pre-gyp-0.10.3" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz";
+        sha512 = "d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==";
+      };
+    };
+    "node-static-0.6.0" = {
+      name = "node-static";
+      packageName = "node-static";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-static/-/node-static-0.6.0.tgz";
+        sha1 = "e8543a897f3c82048220b39569284d44796eb1e2";
+      };
+    };
+    "nomnom-1.8.1" = {
+      name = "nomnom";
+      packageName = "nomnom";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
+        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
+      };
+    };
+    "nopt-3.0.6" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "3.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
+      };
+    };
+    "nopt-4.0.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+      };
+    };
+    "normalize-package-data-2.4.0" = {
+      name = "normalize-package-data";
+      packageName = "normalize-package-data";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
+        sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
+      };
+    };
+    "normalize-path-2.1.1" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
+        sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+      };
+    };
+    "normalize-range-0.1.2" = {
+      name = "normalize-range";
+      packageName = "normalize-range";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
+        sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+      };
+    };
+    "normalize-url-1.9.1" = {
+      name = "normalize-url";
+      packageName = "normalize-url";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz";
+        sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c";
+      };
+    };
+    "npm-bundled-1.0.3" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz";
+        sha512 = "ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==";
+      };
+    };
+    "npm-packlist-1.1.11" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz";
+        sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==";
+      };
+    };
+    "npm-run-path-2.0.2" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "nth-check-1.0.1" = {
+      name = "nth-check";
+      packageName = "nth-check";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz";
+        sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
+      };
+    };
+    "num2fraction-1.2.2" = {
+      name = "num2fraction";
+      packageName = "num2fraction";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
+        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "nwmatcher-1.3.9" = {
+      name = "nwmatcher";
+      packageName = "nwmatcher";
+      version = "1.3.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz";
+        sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a";
+      };
+    };
+    "nwmatcher-1.4.4" = {
+      name = "nwmatcher";
+      packageName = "nwmatcher";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz";
+        sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==";
+      };
+    };
+    "oauth-0.9.15" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
+      };
+    };
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "object-assign-3.0.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+        sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+      };
+    };
+    "object-assign-4.1.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
+        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+      };
+    };
+    "object-copy-0.1.0" = {
+      name = "object-copy";
+      packageName = "object-copy";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz";
+        sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+      };
+    };
+    "object-keys-1.0.12" = {
+      name = "object-keys";
+      packageName = "object-keys";
+      version = "1.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz";
+        sha512 = "FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==";
+      };
+    };
+    "object-visit-1.0.1" = {
+      name = "object-visit";
+      packageName = "object-visit";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz";
+        sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+      };
+    };
+    "object.defaults-1.1.0" = {
+      name = "object.defaults";
+      packageName = "object.defaults";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz";
+        sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf";
+      };
+    };
+    "object.map-1.0.1" = {
+      name = "object.map";
+      packageName = "object.map";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz";
+        sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37";
+      };
+    };
+    "object.omit-2.0.1" = {
+      name = "object.omit";
+      packageName = "object.omit";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz";
+        sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa";
+      };
+    };
+    "object.pick-1.3.0" = {
+      name = "object.pick";
+      packageName = "object.pick";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+        sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+      };
+    };
+    "on-finished-2.3.0" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    };
+    "on-headers-1.0.1" = {
+      name = "on-headers";
+      packageName = "on-headers";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz";
+        sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
+      };
+    };
+    "once-1.3.3" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
+        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "onetime-1.1.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
+        sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
+      };
+    };
+    "optimist-0.6.1" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+    };
+    "optionator-0.8.2" = {
+      name = "optionator";
+      packageName = "optionator";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+      };
+    };
+    "orchestrator-0.3.8" = {
+      name = "orchestrator";
+      packageName = "orchestrator";
+      version = "0.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz";
+        sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e";
+      };
+    };
+    "ordered-read-streams-0.1.0" = {
+      name = "ordered-read-streams";
+      packageName = "ordered-read-streams";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
+        sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126";
+      };
+    };
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
+      };
+    };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-locale-2.1.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz";
+        sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "output-file-sync-1.1.2" = {
+      name = "output-file-sync";
+      packageName = "output-file-sync";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz";
+        sha1 = "d0a33eefe61a205facb90092e826598d5245ce76";
+      };
+    };
+    "p-finally-1.0.0" = {
+      name = "p-finally";
+      packageName = "p-finally";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+      };
+    };
+    "p-limit-1.3.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+      };
+    };
+    "p-locate-2.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    };
+    "p-try-1.0.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+      };
+    };
+    "package-1.0.1" = {
+      name = "package";
+      packageName = "package";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package/-/package-1.0.1.tgz";
+        sha1 = "d25a1f99e2506dcb27d6704b83dca8a312e4edcc";
+      };
+    };
+    "packet-reader-0.3.1" = {
+      name = "packet-reader";
+      packageName = "packet-reader";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/packet-reader/-/packet-reader-0.3.1.tgz";
+        sha1 = "cd62e60af8d7fea8a705ec4ff990871c46871f27";
+      };
+    };
+    "pako-0.2.9" = {
+      name = "pako";
+      packageName = "pako";
+      version = "0.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz";
+        sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75";
+      };
+    };
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    };
+    "param-case-2.1.1" = {
+      name = "param-case";
+      packageName = "param-case";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz";
+        sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
+      };
+    };
+    "parse-entities-1.1.2" = {
+      name = "parse-entities";
+      packageName = "parse-entities";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
+        sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==";
+      };
+    };
+    "parse-filepath-1.0.2" = {
+      name = "parse-filepath";
+      packageName = "parse-filepath";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz";
+        sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891";
+      };
+    };
+    "parse-glob-3.0.4" = {
+      name = "parse-glob";
+      packageName = "parse-glob";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz";
+        sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c";
+      };
+    };
+    "parse-json-2.2.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+        sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+      };
+    };
+    "parse-json-4.0.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz";
+        sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
+      };
+    };
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+      };
+    };
+    "parse5-1.5.1" = {
+      name = "parse5";
+      packageName = "parse5";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
+        sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
+      };
+    };
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+      };
+    };
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+      };
+    };
+    "parseurl-1.3.2" = {
+      name = "parseurl";
+      packageName = "parseurl";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
+        sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+      };
+    };
+    "pascalcase-0.1.1" = {
+      name = "pascalcase";
+      packageName = "pascalcase";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz";
+        sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+      };
+    };
+    "passport-oauth-1.0.0" = {
+      name = "passport-oauth";
+      packageName = "passport-oauth";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz";
+        sha1 = "90aff63387540f02089af28cdad39ea7f80d77df";
+      };
+    };
+    "passport-oauth1-1.1.0" = {
+      name = "passport-oauth1";
+      packageName = "passport-oauth1";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz";
+        sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
+      };
+    };
+    "passport-oauth2-1.4.0" = {
+      name = "passport-oauth2";
+      packageName = "passport-oauth2";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
+      };
+    };
+    "passport-strategy-1.0.0" = {
+      name = "passport-strategy";
+      packageName = "passport-strategy";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
+        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
+      };
+    };
+    "path-browserify-0.0.0" = {
+      name = "path-browserify";
+      packageName = "path-browserify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+      };
+    };
+    "path-exists-2.1.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
+        sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+      };
+    };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "path-is-inside-1.0.2" = {
+      name = "path-is-inside";
+      packageName = "path-is-inside";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+      };
+    };
+    "path-key-2.0.1" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+      };
+    };
+    "path-parse-1.0.5" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
+        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
+      };
+    };
+    "path-root-0.1.1" = {
+      name = "path-root";
+      packageName = "path-root";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz";
+        sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7";
+      };
+    };
+    "path-root-regex-0.1.2" = {
+      name = "path-root-regex";
+      packageName = "path-root-regex";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz";
+        sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
+      };
+    };
+    "path-to-regexp-0.1.7" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+        sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+      };
+    };
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+      };
+    };
+    "path-type-3.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
+        sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
+      };
+    };
+    "pause-0.0.1" = {
+      name = "pause";
+      packageName = "pause";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+      };
+    };
+    "pbkdf2-compat-2.0.1" = {
+      name = "pbkdf2-compat";
+      packageName = "pbkdf2-compat";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
+        sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
+      };
+    };
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+      };
+    };
+    "performance-now-0.2.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz";
+        sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5";
+      };
+    };
+    "performance-now-2.1.0" = {
+      name = "performance-now";
+      packageName = "performance-now";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+        sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+      };
+    };
+    "pg-connection-string-0.1.3" = {
+      name = "pg-connection-string";
+      packageName = "pg-connection-string";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz";
+        sha1 = "da1847b20940e42ee1492beaf65d49d91b245df7";
+      };
+    };
+    "pg-int8-1.0.1" = {
+      name = "pg-int8";
+      packageName = "pg-int8";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz";
+        sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==";
+      };
+    };
+    "pg-pool-1.8.0" = {
+      name = "pg-pool";
+      packageName = "pg-pool";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-1.8.0.tgz";
+        sha1 = "f7ec73824c37a03f076f51bfdf70e340147c4f37";
+      };
+    };
+    "pg-types-1.13.0" = {
+      name = "pg-types";
+      packageName = "pg-types";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pg-types/-/pg-types-1.13.0.tgz";
+        sha512 = "lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==";
+      };
+    };
+    "pgpass-1.0.2" = {
+      name = "pgpass";
+      packageName = "pgpass";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz";
+        sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306";
+      };
+    };
+    "phantom-4.0.12" = {
+      name = "phantom";
+      packageName = "phantom";
+      version = "4.0.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz";
+        sha512 = "Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA==";
+      };
+    };
+    "phantomjs-prebuilt-2.1.16" = {
+      name = "phantomjs-prebuilt";
+      packageName = "phantomjs-prebuilt";
+      version = "2.1.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz";
+        sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef";
+      };
+    };
+    "pify-2.3.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+        sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+      };
+    };
+    "pify-3.0.0" = {
+      name = "pify";
+      packageName = "pify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+        sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "pkg-conf-2.1.0" = {
+      name = "pkg-conf";
+      packageName = "pkg-conf";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz";
+        sha1 = "2126514ca6f2abfebd168596df18ba57867f0058";
+      };
+    };
+    "pkg-config-1.1.1" = {
+      name = "pkg-config";
+      packageName = "pkg-config";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-config/-/pkg-config-1.1.1.tgz";
+        sha1 = "557ef22d73da3c8837107766c52eadabde298fe4";
+      };
+    };
+    "pkg-dir-1.0.0" = {
+      name = "pkg-dir";
+      packageName = "pkg-dir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz";
+        sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4";
+      };
+    };
+    "pkg-dir-2.0.0" = {
+      name = "pkg-dir";
+      packageName = "pkg-dir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz";
+        sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+      };
+    };
+    "pkginfo-0.2.3" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+        sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+      };
+    };
+    "platform-1.3.5" = {
+      name = "platform";
+      packageName = "platform";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz";
+        sha512 = "TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==";
+      };
+    };
+    "pluralize-1.2.1" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
+        sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
+      };
+    };
+    "posix-character-classes-0.1.1" = {
+      name = "posix-character-classes";
+      packageName = "posix-character-classes";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+        sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+      };
+    };
+    "postcss-5.2.18" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "5.2.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz";
+        sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==";
+      };
+    };
+    "postcss-6.0.23" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "6.0.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz";
+        sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==";
+      };
+    };
+    "postcss-calc-5.3.1" = {
+      name = "postcss-calc";
+      packageName = "postcss-calc";
+      version = "5.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz";
+        sha1 = "77bae7ca928ad85716e2fda42f261bf7c1d65b5e";
+      };
+    };
+    "postcss-colormin-2.2.2" = {
+      name = "postcss-colormin";
+      packageName = "postcss-colormin";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz";
+        sha1 = "6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b";
+      };
+    };
+    "postcss-convert-values-2.6.1" = {
+      name = "postcss-convert-values";
+      packageName = "postcss-convert-values";
+      version = "2.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz";
+        sha1 = "bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d";
+      };
+    };
+    "postcss-discard-comments-2.0.4" = {
+      name = "postcss-discard-comments";
+      packageName = "postcss-discard-comments";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz";
+        sha1 = "befe89fafd5b3dace5ccce51b76b81514be00e3d";
+      };
+    };
+    "postcss-discard-duplicates-2.1.0" = {
+      name = "postcss-discard-duplicates";
+      packageName = "postcss-discard-duplicates";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz";
+        sha1 = "b9abf27b88ac188158a5eb12abcae20263b91932";
+      };
+    };
+    "postcss-discard-empty-2.1.0" = {
+      name = "postcss-discard-empty";
+      packageName = "postcss-discard-empty";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz";
+        sha1 = "d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5";
+      };
+    };
+    "postcss-discard-overridden-0.1.1" = {
+      name = "postcss-discard-overridden";
+      packageName = "postcss-discard-overridden";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz";
+        sha1 = "8b1eaf554f686fb288cd874c55667b0aa3668d58";
+      };
+    };
+    "postcss-discard-unused-2.2.3" = {
+      name = "postcss-discard-unused";
+      packageName = "postcss-discard-unused";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz";
+        sha1 = "bce30b2cc591ffc634322b5fb3464b6d934f4433";
+      };
+    };
+    "postcss-filter-plugins-2.0.3" = {
+      name = "postcss-filter-plugins";
+      packageName = "postcss-filter-plugins";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz";
+        sha512 = "T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==";
+      };
+    };
+    "postcss-merge-idents-2.1.7" = {
+      name = "postcss-merge-idents";
+      packageName = "postcss-merge-idents";
+      version = "2.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz";
+        sha1 = "4c5530313c08e1d5b3bbf3d2bbc747e278eea270";
+      };
+    };
+    "postcss-merge-longhand-2.0.2" = {
+      name = "postcss-merge-longhand";
+      packageName = "postcss-merge-longhand";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz";
+        sha1 = "23d90cd127b0a77994915332739034a1a4f3d658";
+      };
+    };
+    "postcss-merge-rules-2.1.2" = {
+      name = "postcss-merge-rules";
+      packageName = "postcss-merge-rules";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz";
+        sha1 = "d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721";
+      };
+    };
+    "postcss-message-helpers-2.0.0" = {
+      name = "postcss-message-helpers";
+      packageName = "postcss-message-helpers";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz";
+        sha1 = "a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e";
+      };
+    };
+    "postcss-minify-font-values-1.0.5" = {
+      name = "postcss-minify-font-values";
+      packageName = "postcss-minify-font-values";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz";
+        sha1 = "4b58edb56641eba7c8474ab3526cafd7bbdecb69";
+      };
+    };
+    "postcss-minify-gradients-1.0.5" = {
+      name = "postcss-minify-gradients";
+      packageName = "postcss-minify-gradients";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz";
+        sha1 = "5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1";
+      };
+    };
+    "postcss-minify-params-1.2.2" = {
+      name = "postcss-minify-params";
+      packageName = "postcss-minify-params";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz";
+        sha1 = "ad2ce071373b943b3d930a3fa59a358c28d6f1f3";
+      };
+    };
+    "postcss-minify-selectors-2.1.1" = {
+      name = "postcss-minify-selectors";
+      packageName = "postcss-minify-selectors";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz";
+        sha1 = "b2c6a98c0072cf91b932d1a496508114311735bf";
+      };
+    };
+    "postcss-modules-extract-imports-1.2.0" = {
+      name = "postcss-modules-extract-imports";
+      packageName = "postcss-modules-extract-imports";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz";
+        sha1 = "66140ecece38ef06bf0d3e355d69bf59d141ea85";
+      };
+    };
+    "postcss-modules-local-by-default-1.2.0" = {
+      name = "postcss-modules-local-by-default";
+      packageName = "postcss-modules-local-by-default";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz";
+        sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069";
+      };
+    };
+    "postcss-modules-scope-1.1.0" = {
+      name = "postcss-modules-scope";
+      packageName = "postcss-modules-scope";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz";
+        sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90";
+      };
+    };
+    "postcss-modules-values-1.3.0" = {
+      name = "postcss-modules-values";
+      packageName = "postcss-modules-values";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz";
+        sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20";
+      };
+    };
+    "postcss-normalize-charset-1.1.1" = {
+      name = "postcss-normalize-charset";
+      packageName = "postcss-normalize-charset";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz";
+        sha1 = "ef9ee71212d7fe759c78ed162f61ed62b5cb93f1";
+      };
+    };
+    "postcss-normalize-url-3.0.8" = {
+      name = "postcss-normalize-url";
+      packageName = "postcss-normalize-url";
+      version = "3.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz";
+        sha1 = "108f74b3f2fcdaf891a2ffa3ea4592279fc78222";
+      };
+    };
+    "postcss-ordered-values-2.2.3" = {
+      name = "postcss-ordered-values";
+      packageName = "postcss-ordered-values";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz";
+        sha1 = "eec6c2a67b6c412a8db2042e77fe8da43f95c11d";
+      };
+    };
+    "postcss-reduce-idents-2.4.0" = {
+      name = "postcss-reduce-idents";
+      packageName = "postcss-reduce-idents";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz";
+        sha1 = "c2c6d20cc958284f6abfbe63f7609bf409059ad3";
+      };
+    };
+    "postcss-reduce-initial-1.0.1" = {
+      name = "postcss-reduce-initial";
+      packageName = "postcss-reduce-initial";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz";
+        sha1 = "68f80695f045d08263a879ad240df8dd64f644ea";
+      };
+    };
+    "postcss-reduce-transforms-1.0.4" = {
+      name = "postcss-reduce-transforms";
+      packageName = "postcss-reduce-transforms";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz";
+        sha1 = "ff76f4d8212437b31c298a42d2e1444025771ae1";
+      };
+    };
+    "postcss-selector-parser-2.2.3" = {
+      name = "postcss-selector-parser";
+      packageName = "postcss-selector-parser";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz";
+        sha1 = "f9437788606c3c9acee16ffe8d8b16297f27bb90";
+      };
+    };
+    "postcss-svgo-2.1.6" = {
+      name = "postcss-svgo";
+      packageName = "postcss-svgo";
+      version = "2.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz";
+        sha1 = "b6df18aa613b666e133f08adb5219c2684ac108d";
+      };
+    };
+    "postcss-unique-selectors-2.0.2" = {
+      name = "postcss-unique-selectors";
+      packageName = "postcss-unique-selectors";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz";
+        sha1 = "981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d";
+      };
+    };
+    "postcss-value-parser-3.3.0" = {
+      name = "postcss-value-parser";
+      packageName = "postcss-value-parser";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz";
+        sha1 = "87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15";
+      };
+    };
+    "postcss-zindex-2.2.0" = {
+      name = "postcss-zindex";
+      packageName = "postcss-zindex";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz";
+        sha1 = "d2109ddc055b91af67fc4cb3b025946639d2af22";
+      };
+    };
+    "postgres-array-1.0.2" = {
+      name = "postgres-array";
+      packageName = "postgres-array";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.2.tgz";
+        sha1 = "8e0b32eb03bf77a5c0a7851e0441c169a256a238";
+      };
+    };
+    "postgres-bytea-1.0.0" = {
+      name = "postgres-bytea";
+      packageName = "postgres-bytea";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz";
+        sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35";
+      };
+    };
+    "postgres-date-1.0.3" = {
+      name = "postgres-date";
+      packageName = "postgres-date";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz";
+        sha1 = "e2d89702efdb258ff9d9cee0fe91bd06975257a8";
+      };
+    };
+    "postgres-interval-1.1.2" = {
+      name = "postgres-interval";
+      packageName = "postgres-interval";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.2.tgz";
+        sha512 = "fC3xNHeTskCxL1dC8KOtxXt7YeFmlbTYtn7ul8MkVERuTmf7pI4DrkAxcw3kh1fQ9uz4wQmd03a1mRiXUZChfQ==";
+      };
+    };
+    "precond-0.2.3" = {
+      name = "precond";
+      packageName = "precond";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
+        sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac";
+      };
+    };
+    "prelude-ls-1.1.2" = {
+      name = "prelude-ls";
+      packageName = "prelude-ls";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+        sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+      };
+    };
+    "prepend-http-1.0.4" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    };
+    "preserve-0.2.0" = {
+      name = "preserve";
+      packageName = "preserve";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz";
+        sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b";
+      };
+    };
+    "pretty-bytes-3.0.1" = {
+      name = "pretty-bytes";
+      packageName = "pretty-bytes";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz";
+        sha1 = "27d0008d778063a0b4811bb35c79f1bd5d5fbccf";
+      };
+    };
+    "pretty-error-2.1.1" = {
+      name = "pretty-error";
+      packageName = "pretty-error";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz";
+        sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3";
+      };
+    };
+    "pretty-hrtime-1.0.3" = {
+      name = "pretty-hrtime";
+      packageName = "pretty-hrtime";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+        sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
+      };
+    };
+    "private-0.1.8" = {
+      name = "private";
+      packageName = "private";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
+        sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
+      };
+    };
+    "process-0.11.10" = {
+      name = "process";
+      packageName = "process";
+      version = "0.11.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz";
+        sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+      };
+    };
+    "process-nextick-args-1.0.7" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
+      };
+    };
+    "process-nextick-args-2.0.0" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
+        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+      };
+    };
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+      };
+    };
+    "promise-7.3.1" = {
+      name = "promise";
+      packageName = "promise";
+      version = "7.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+        sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
+      };
+    };
+    "promise-inflight-1.0.1" = {
+      name = "promise-inflight";
+      packageName = "promise-inflight";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
+        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+      };
+    };
+    "proto-list-1.2.4" = {
+      name = "proto-list";
+      packageName = "proto-list";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
+        sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+      };
+    };
+    "proxy-addr-2.0.4" = {
+      name = "proxy-addr";
+      packageName = "proxy-addr";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz";
+        sha512 = "5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==";
+      };
+    };
+    "prr-1.0.1" = {
+      name = "prr";
+      packageName = "prr";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
+        sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+      };
+    };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "psl-1.1.29" = {
+      name = "psl";
+      packageName = "psl";
+      version = "1.1.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz";
+        sha512 = "AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==";
+      };
+    };
+    "pump-2.0.1" = {
+      name = "pump";
+      packageName = "pump";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
+        sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
+      };
+    };
+    "pumpify-1.5.1" = {
+      name = "pumpify";
+      packageName = "pumpify";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
+        sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==";
+      };
+    };
+    "punycode-1.3.2" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+        sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      };
+    };
+    "punycode-1.4.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+      };
+    };
+    "punycode-2.1.1" = {
+      name = "punycode";
+      packageName = "punycode";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+      };
+    };
+    "q-1.5.1" = {
+      name = "q";
+      packageName = "q";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz";
+        sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7";
+      };
+    };
+    "qs-2.3.3" = {
+      name = "qs";
+      packageName = "qs";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+        sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      };
+    };
+    "qs-6.4.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz";
+        sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
+      };
+    };
+    "qs-6.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
+        sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==";
+      };
+    };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+      };
+    };
+    "query-string-4.3.4" = {
+      name = "query-string";
+      packageName = "query-string";
+      version = "4.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz";
+        sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb";
+      };
+    };
+    "querystring-0.2.0" = {
+      name = "querystring";
+      packageName = "querystring";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
+        sha1 = "b209849203bb25df820da756e747005878521620";
+      };
+    };
+    "querystring-es3-0.2.1" = {
+      name = "querystring-es3";
+      packageName = "querystring-es3";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
+        sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+      };
+    };
+    "random-bytes-1.0.0" = {
+      name = "random-bytes";
+      packageName = "random-bytes";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
+        sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
+      };
+    };
+    "randomatic-3.0.0" = {
+      name = "randomatic";
+      packageName = "randomatic";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz";
+        sha512 = "VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==";
+      };
+    };
+    "range-parser-1.2.0" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz";
+        sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
+      };
+    };
+    "raphael-2.1.4" = {
+      name = "raphael";
+      packageName = "raphael";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raphael/-/raphael-2.1.4.tgz";
+        sha1 = "b09ca664ad048b814bb2ff5d4d1e75838cab9c97";
+      };
+    };
+    "raphael-2.2.7" = {
+      name = "raphael";
+      packageName = "raphael";
+      version = "2.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raphael/-/raphael-2.2.7.tgz";
+        sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
+      };
+    };
+    "raw-body-2.3.2" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz";
+        sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
+      };
+    };
+    "raw-body-2.3.3" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
+        sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
+      };
+    };
+    "raw-loader-0.5.1" = {
+      name = "raw-loader";
+      packageName = "raw-loader";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz";
+        sha1 = "0c3d0beaed8a01c966d9787bf778281252a979aa";
+      };
+    };
+    "rc-1.2.8" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
+      };
+    };
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+      };
+    };
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+      };
+    };
+    "readable-stream-1.0.27-1" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.0.27-1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
+      };
+    };
+    "readable-stream-1.0.34" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.0.34";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
+        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
+      };
+    };
+    "readable-stream-1.1.14" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "1.1.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
+      };
+    };
+    "readable-stream-2.0.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+      };
+    };
+    "readable-stream-2.3.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+      };
+    };
+    "readdirp-2.1.0" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz";
+        sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
+      };
+    };
+    "readline2-1.0.1" = {
+      name = "readline2";
+      packageName = "readline2";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
+        sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
+      };
+    };
+    "rechoir-0.6.2" = {
+      name = "rechoir";
+      packageName = "rechoir";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz";
+        sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
+      };
+    };
+    "redefine-0.2.1" = {
+      name = "redefine";
+      packageName = "redefine";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redefine/-/redefine-0.2.1.tgz";
+        sha1 = "e89ee7a6f24d19fff62590569332dc60380a89a3";
+      };
+    };
+    "reduce-component-1.0.1" = {
+      name = "reduce-component";
+      packageName = "reduce-component";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+        sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
+      };
+    };
+    "reduce-css-calc-1.3.0" = {
+      name = "reduce-css-calc";
+      packageName = "reduce-css-calc";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz";
+        sha1 = "747c914e049614a4c9cfbba629871ad1d2927716";
+      };
+    };
+    "reduce-function-call-1.0.2" = {
+      name = "reduce-function-call";
+      packageName = "reduce-function-call";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz";
+        sha1 = "5a200bf92e0e37751752fe45b0ab330fd4b6be99";
+      };
+    };
+    "referrer-policy-1.1.0" = {
+      name = "referrer-policy";
+      packageName = "referrer-policy";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz";
+        sha1 = "35774eb735bf50fb6c078e83334b472350207d79";
+      };
+    };
+    "regenerate-1.4.0" = {
+      name = "regenerate";
+      packageName = "regenerate";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
+        sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
+      };
+    };
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+      };
+    };
+    "regenerator-runtime-0.11.1" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+        sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+      };
+    };
+    "regenerator-transform-0.10.1" = {
+      name = "regenerator-transform";
+      packageName = "regenerator-transform";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
+        sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==";
+      };
+    };
+    "regex-cache-0.4.4" = {
+      name = "regex-cache";
+      packageName = "regex-cache";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz";
+        sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==";
+      };
+    };
+    "regex-not-1.0.2" = {
+      name = "regex-not";
+      packageName = "regex-not";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
+        sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
+      };
+    };
+    "regexpu-core-1.0.0" = {
+      name = "regexpu-core";
+      packageName = "regexpu-core";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz";
+        sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
+      };
+    };
+    "regexpu-core-2.0.0" = {
+      name = "regexpu-core";
+      packageName = "regexpu-core";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz";
+        sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
+      };
+    };
+    "regjsgen-0.2.0" = {
+      name = "regjsgen";
+      packageName = "regjsgen";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz";
+        sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
+      };
+    };
+    "regjsparser-0.1.5" = {
+      name = "regjsparser";
+      packageName = "regjsparser";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz";
+        sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
+      };
+    };
+    "relateurl-0.2.7" = {
+      name = "relateurl";
+      packageName = "relateurl";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
+        sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+      };
+    };
+    "remark-5.1.0" = {
+      name = "remark";
+      packageName = "remark";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark/-/remark-5.1.0.tgz";
+        sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c";
+      };
+    };
+    "remark-parse-1.1.0" = {
+      name = "remark-parse";
+      packageName = "remark-parse";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-1.1.0.tgz";
+        sha1 = "c3ca10f9a8da04615c28f09aa4e304510526ec21";
+      };
+    };
+    "remark-stringify-1.1.0" = {
+      name = "remark-stringify";
+      packageName = "remark-stringify";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-1.1.0.tgz";
+        sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092";
+      };
+    };
+    "remarkable-1.7.1" = {
+      name = "remarkable";
+      packageName = "remarkable";
+      version = "1.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remarkable/-/remarkable-1.7.1.tgz";
+        sha1 = "aaca4972100b66a642a63a1021ca4bac1be3bff6";
+      };
+    };
+    "remove-trailing-separator-1.1.0" = {
+      name = "remove-trailing-separator";
+      packageName = "remove-trailing-separator";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+        sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+      };
+    };
+    "renderkid-2.0.1" = {
+      name = "renderkid";
+      packageName = "renderkid";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz";
+        sha1 = "898cabfc8bede4b7b91135a3ffd323e58c0db319";
+      };
+    };
+    "repeat-element-1.1.2" = {
+      name = "repeat-element";
+      packageName = "repeat-element";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz";
+        sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "repeating-2.0.1" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+      };
+    };
+    "replace-ext-0.0.1" = {
+      name = "replace-ext";
+      packageName = "replace-ext";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
+        sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924";
+      };
+    };
+    "request-2.81.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.81.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz";
+        sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
+      };
+    };
+    "request-2.87.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.87.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+        sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
+      };
+    };
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
+      };
+    };
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+      };
+    };
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+      };
+    };
+    "require-relative-0.8.7" = {
+      name = "require-relative";
+      packageName = "require-relative";
+      version = "0.8.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz";
+        sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de";
+      };
+    };
+    "require-uncached-1.0.3" = {
+      name = "require-uncached";
+      packageName = "require-uncached";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
+        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
+      };
+    };
+    "resolve-1.8.1" = {
+      name = "resolve";
+      packageName = "resolve";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz";
+        sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==";
+      };
+    };
+    "resolve-dir-0.1.1" = {
+      name = "resolve-dir";
+      packageName = "resolve-dir";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz";
+        sha1 = "b219259a5602fac5c5c496ad894a6e8cc430261e";
+      };
+    };
+    "resolve-dir-1.0.1" = {
+      name = "resolve-dir";
+      packageName = "resolve-dir";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz";
+        sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
+      };
+    };
+    "resolve-from-1.0.1" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz";
+        sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226";
+      };
+    };
+    "resolve-url-0.2.1" = {
+      name = "resolve-url";
+      packageName = "resolve-url";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
+        sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+      };
+    };
+    "restore-cursor-1.0.1" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
+        sha1 = "34661f46886327fed2991479152252df92daa541";
+      };
+    };
+    "ret-0.1.15" = {
+      name = "ret";
+      packageName = "ret";
+      version = "0.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
+        sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
+      };
+    };
+    "retry-as-promised-2.3.2" = {
+      name = "retry-as-promised";
+      packageName = "retry-as-promised";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz";
+        sha1 = "cd974ee4fd9b5fe03cbf31871ee48221c07737b7";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "rimraf-2.4.5" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+        sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+      };
+    };
+    "rimraf-2.6.2" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
+        sha512 = "lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==";
+      };
+    };
+    "ripemd160-0.2.0" = {
+      name = "ripemd160";
+      packageName = "ripemd160";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
+        sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
+      };
+    };
+    "rollup-0.41.6" = {
+      name = "rollup";
+      packageName = "rollup";
+      version = "0.41.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz";
+        sha1 = "e0d05497877a398c104d816d2733a718a7a94e2a";
+      };
+    };
+    "rollup-plugin-buble-0.15.0" = {
+      name = "rollup-plugin-buble";
+      packageName = "rollup-plugin-buble";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz";
+        sha1 = "83c3e89c7fd2266c7918f41ba3980313519c7fd0";
+      };
+    };
+    "rollup-pluginutils-1.5.2" = {
+      name = "rollup-pluginutils";
+      packageName = "rollup-pluginutils";
+      version = "1.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz";
+        sha1 = "1e156e778f94b7255bfa1b3d0178be8f5c552408";
+      };
+    };
+    "rollup-watch-3.2.2" = {
+      name = "rollup-watch";
+      packageName = "rollup-watch";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rollup-watch/-/rollup-watch-3.2.2.tgz";
+        sha1 = "5e574232e9ef36da9177f46946d8080cb267354b";
+      };
+    };
+    "run-async-0.1.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
+        sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
+      };
+    };
+    "run-parallel-1.1.9" = {
+      name = "run-parallel";
+      packageName = "run-parallel";
+      version = "1.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
+      };
+    };
+    "run-queue-1.0.3" = {
+      name = "run-queue";
+      packageName = "run-queue";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
+      };
+    };
+    "rx-lite-3.1.2" = {
+      name = "rx-lite";
+      packageName = "rx-lite";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
+        sha1 = "19ce502ca572665f3b647b10939f97fd1615f102";
+      };
+    };
+    "safe-buffer-5.1.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
+        sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safe-json-stringify-1.2.0" = {
+      name = "safe-json-stringify";
+      packageName = "safe-json-stringify";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz";
+        sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==";
+      };
+    };
+    "safe-regex-1.1.0" = {
+      name = "safe-regex";
+      packageName = "safe-regex";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
+        sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+      };
+    };
+    "safefs-3.2.2" = {
+      name = "safefs";
+      packageName = "safefs";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safefs/-/safefs-3.2.2.tgz";
+        sha1 = "8170c1444d7038e08caea05a374fae2fa349e15c";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "sax-0.5.8" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.5.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
+      };
+    };
+    "sax-1.2.1" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
+        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+      };
+    };
+    "scandirectory-2.5.0" = {
+      name = "scandirectory";
+      packageName = "scandirectory";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/scandirectory/-/scandirectory-2.5.0.tgz";
+        sha1 = "6ce03f54a090b668e3cbedbf20edf9e310593e72";
+      };
+    };
+    "schema-utils-0.4.5" = {
+      name = "schema-utils";
+      packageName = "schema-utils";
+      version = "0.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz";
+        sha512 = "yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==";
+      };
+    };
+    "select-1.1.2" = {
+      name = "select";
+      packageName = "select";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/select/-/select-1.1.2.tgz";
+        sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
+      };
+    };
+    "semver-4.3.2" = {
+      name = "semver";
+      packageName = "semver";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz";
+        sha1 = "c7a07158a80bedd052355b770d82d6640f803be7";
+      };
+    };
+    "semver-4.3.6" = {
+      name = "semver";
+      packageName = "semver";
+      version = "4.3.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+        sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+      };
+    };
+    "semver-5.5.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
+        sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
+      };
+    };
+    "send-0.16.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.16.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
+        sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
+      };
+    };
+    "sequencify-0.0.7" = {
+      name = "sequencify";
+      packageName = "sequencify";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
+        sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
+      };
+    };
+    "serialize-javascript-1.5.0" = {
+      name = "serialize-javascript";
+      packageName = "serialize-javascript";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz";
+        sha512 = "Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==";
+      };
+    };
+    "series-stream-1.0.1" = {
+      name = "series-stream";
+      packageName = "series-stream";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/series-stream/-/series-stream-1.0.1.tgz";
+        sha1 = "311a09c5c1d5a091440832e1a480a47400f1005d";
+      };
+    };
+    "serve-static-1.13.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.13.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
+        sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "set-immediate-shim-1.0.1" = {
+      name = "set-immediate-shim";
+      packageName = "set-immediate-shim";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz";
+        sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
+      };
+    };
+    "set-value-0.4.3" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz";
+        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
+      };
+    };
+    "set-value-2.0.0" = {
+      name = "set-value";
+      packageName = "set-value";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz";
+        sha512 = "hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==";
+      };
+    };
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+      };
+    };
+    "setprototypeof-1.0.3" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz";
+        sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
+      };
+    };
+    "setprototypeof-1.1.0" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
+        sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
+      };
+    };
+    "sha.js-2.2.6" = {
+      name = "sha.js";
+      packageName = "sha.js";
+      version = "2.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
+        sha1 = "17ddeddc5f722fb66501658895461977867315ba";
+      };
+    };
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "shelljs-0.3.0" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+        sha1 = "3596e6307a781544f591f37da618360f31db57b1";
+      };
+    };
+    "shelljs-0.7.8" = {
+      name = "shelljs";
+      packageName = "shelljs";
+      version = "0.7.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz";
+        sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3";
+      };
+    };
+    "shimmer-1.1.0" = {
+      name = "shimmer";
+      packageName = "shimmer";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shimmer/-/shimmer-1.1.0.tgz";
+        sha1 = "97d7377137ffbbab425522e429fe0aa89a488b35";
+      };
+    };
+    "sigmund-1.0.1" = {
+      name = "sigmund";
+      packageName = "sigmund";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+        sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+      };
+    };
+    "slice-ansi-0.0.4" = {
+      name = "slice-ansi";
+      packageName = "slice-ansi";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz";
+        sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
+      };
+    };
+    "snapdragon-0.8.2" = {
+      name = "snapdragon";
+      packageName = "snapdragon";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
+        sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
+      };
+    };
+    "snapdragon-node-2.1.1" = {
+      name = "snapdragon-node";
+      packageName = "snapdragon-node";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+        sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
+      };
+    };
+    "snapdragon-util-3.0.1" = {
+      name = "snapdragon-util";
+      packageName = "snapdragon-util";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+        sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "socket.io-adapter-1.1.1" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
+        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
+      };
+    };
+    "socket.io-client-2.0.4" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz";
+        sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e";
+      };
+    };
+    "socket.io-parser-3.1.3" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz";
+        sha512 = "g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==";
+      };
+    };
+    "sort-keys-1.1.2" = {
+      name = "sort-keys";
+      packageName = "sort-keys";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz";
+        sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
+      };
+    };
+    "source-list-map-0.1.8" = {
+      name = "source-list-map";
+      packageName = "source-list-map";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz";
+        sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
+      };
+    };
+    "source-list-map-2.0.0" = {
+      name = "source-list-map";
+      packageName = "source-list-map";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
+        sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==";
+      };
+    };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
+    "source-map-0.5.7" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+        sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+      };
+    };
+    "source-map-0.6.1" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+        sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+      };
+    };
+    "source-map-resolve-0.5.2" = {
+      name = "source-map-resolve";
+      packageName = "source-map-resolve";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+      };
+    };
+    "source-map-support-0.4.18" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.4.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
+        sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
+      };
+    };
+    "source-map-url-0.4.0" = {
+      name = "source-map-url";
+      packageName = "source-map-url";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
+        sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+      };
+    };
+    "sparkles-1.0.1" = {
+      name = "sparkles";
+      packageName = "sparkles";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz";
+        sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==";
+      };
+    };
+    "spdx-correct-3.0.0" = {
+      name = "spdx-correct";
+      packageName = "spdx-correct";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
+        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
+      };
+    };
+    "spdx-exceptions-2.1.0" = {
+      name = "spdx-exceptions";
+      packageName = "spdx-exceptions";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
+        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
+      };
+    };
+    "spdx-expression-parse-3.0.0" = {
+      name = "spdx-expression-parse";
+      packageName = "spdx-expression-parse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+        sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+      };
+    };
+    "spdx-license-ids-3.0.0" = {
+      name = "spdx-license-ids";
+      packageName = "spdx-license-ids";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
+        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
+      };
+    };
+    "split-1.0.1" = {
+      name = "split";
+      packageName = "split";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz";
+        sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==";
+      };
+    };
+    "split-string-3.1.0" = {
+      name = "split-string";
+      packageName = "split-string";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
+        sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
+      };
+    };
+    "sprintf-0.1.5" = {
+      name = "sprintf";
+      packageName = "sprintf";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
+        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
+      };
+    };
+    "sprintf-js-1.0.3" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+        sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+      };
+    };
+    "sprintf-js-1.1.1" = {
+      name = "sprintf-js";
+      packageName = "sprintf-js";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz";
+        sha1 = "36be78320afe5801f6cea3ee78b6e5aab940ea0c";
+      };
+    };
+    "sqlstring-2.3.1" = {
+      name = "sqlstring";
+      packageName = "sqlstring";
+      version = "2.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz";
+        sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40";
+      };
+    };
+    "sshpk-1.14.2" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.14.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
+        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+      };
+    };
+    "ssri-5.3.0" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
+        sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
+      };
+    };
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
+      };
+    };
+    "standard-engine-5.4.0" = {
+      name = "standard-engine";
+      packageName = "standard-engine";
+      version = "5.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/standard-engine/-/standard-engine-5.4.0.tgz";
+        sha1 = "e0e86959ea0786425d3383e40c1bf70d2f985579";
+      };
+    };
+    "static-extend-0.1.2" = {
+      name = "static-extend";
+      packageName = "static-extend";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz";
+        sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+      };
+    };
+    "statuses-1.4.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
+        sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
+      };
+    };
+    "statuses-1.5.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
+        sha1 = "161c7dac177659fd9811f43771fa99381478628c";
+      };
+    };
+    "stream-browserify-2.0.1" = {
+      name = "stream-browserify";
+      packageName = "stream-browserify";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
+        sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
+      };
+    };
+    "stream-consume-0.1.1" = {
+      name = "stream-consume";
+      packageName = "stream-consume";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz";
+        sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==";
+      };
+    };
+    "stream-each-1.2.3" = {
+      name = "stream-each";
+      packageName = "stream-each";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz";
+        sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==";
+      };
+    };
+    "stream-from-to-1.4.3" = {
+      name = "stream-from-to";
+      packageName = "stream-from-to";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-from-to/-/stream-from-to-1.4.3.tgz";
+        sha1 = "b270473ebc514e73615727c5d2f76b229941df94";
+      };
+    };
+    "stream-http-2.8.3" = {
+      name = "stream-http";
+      packageName = "stream-http";
+      version = "2.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
+        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
+      };
+    };
+    "stream-shift-1.0.0" = {
+      name = "stream-shift";
+      packageName = "stream-shift";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
+        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+      };
+    };
+    "strict-uri-encode-1.1.0" = {
+      name = "strict-uri-encode";
+      packageName = "strict-uri-encode";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+        sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+      };
+    };
+    "string-natural-compare-2.0.2" = {
+      name = "string-natural-compare";
+      packageName = "string-natural-compare";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-2.0.2.tgz";
+        sha1 = "c5ce4e278ab5d1265ae6fc55435aeb7b76fcb001";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string-width-2.1.1" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+      };
+    };
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "stringify-entities-1.3.2" = {
+      name = "stringify-entities";
+      packageName = "stringify-entities";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
+        sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==";
+      };
+    };
+    "stringstream-0.0.6" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
+        sha512 = "87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==";
+      };
+    };
+    "strip-ansi-0.1.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+      };
+    };
+    "strip-bom-1.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
+        sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "strip-eof-1.0.0" = {
+      name = "strip-eof";
+      packageName = "strip-eof";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+      };
+    };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
+    "structured-source-3.0.2" = {
+      name = "structured-source";
+      packageName = "structured-source";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/structured-source/-/structured-source-3.0.2.tgz";
+        sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5";
+      };
+    };
+    "superagent-1.8.3" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-1.8.3.tgz";
+        sha1 = "2b7d70fcc870eda4f2a61e619dd54009b86547c3";
+      };
+    };
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+    };
+    "supports-color-3.2.3" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
+      };
+    };
+    "supports-color-5.4.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "5.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==";
+      };
+    };
+    "svgo-0.7.2" = {
+      name = "svgo";
+      packageName = "svgo";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz";
+        sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
+      };
+    };
+    "symbol-tree-3.2.2" = {
+      name = "symbol-tree";
+      packageName = "symbol-tree";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz";
+        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
+      };
+    };
+    "table-3.8.3" = {
+      name = "table";
+      packageName = "table";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+      };
+    };
+    "tapable-0.1.10" = {
+      name = "tapable";
+      packageName = "tapable";
+      version = "0.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz";
+        sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
+      };
+    };
+    "tar-4.4.6" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz";
+        sha512 = "tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==";
+      };
+    };
+    "tar-stream-1.6.1" = {
+      name = "tar-stream";
+      packageName = "tar-stream";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
+        sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==";
+      };
+    };
+    "taskgroup-4.3.1" = {
+      name = "taskgroup";
+      packageName = "taskgroup";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/taskgroup/-/taskgroup-4.3.1.tgz";
+        sha1 = "7de193febd768273c457730497024d512c27915a";
+      };
+    };
+    "temporary-0.0.8" = {
+      name = "temporary";
+      packageName = "temporary";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/temporary/-/temporary-0.0.8.tgz";
+        sha1 = "a18a981d28ba8ca36027fb3c30538c3ecb740ac0";
+      };
+    };
+    "terraformer-1.0.9" = {
+      name = "terraformer";
+      packageName = "terraformer";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/terraformer/-/terraformer-1.0.9.tgz";
+        sha512 = "YlmQ1fsMWTkKGDGibCRWgmLzrpDRUr63Q025LJ/taYQ6j1Yb8q9McKF7NBi6ACAyUXO6F/bl9w6v4MY307y5Ag==";
+      };
+    };
+    "terraformer-wkt-parser-1.2.0" = {
+      name = "terraformer-wkt-parser";
+      packageName = "terraformer-wkt-parser";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz";
+        sha512 = "QU3iA54St5lF8Za1jg1oj4NYc8sn5tCZ08aNSWDeGzrsaV48eZk1iAVWasxhNspYBoCqdHuoot1pUTUrE1AJ4w==";
+      };
+    };
+    "text-table-0.2.0" = {
+      name = "text-table";
+      packageName = "text-table";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+        sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+      };
+    };
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+      };
+    };
+    "through-2.3.8" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+      };
+    };
+    "through2-0.6.5" = {
+      name = "through2";
+      packageName = "through2";
+      version = "0.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz";
+        sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48";
+      };
+    };
+    "through2-2.0.3" = {
+      name = "through2";
+      packageName = "through2";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz";
+        sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be";
+      };
+    };
+    "tildify-1.2.0" = {
+      name = "tildify";
+      packageName = "tildify";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz";
+        sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a";
+      };
+    };
+    "time-stamp-1.1.0" = {
+      name = "time-stamp";
+      packageName = "time-stamp";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz";
+        sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3";
+      };
+    };
+    "timers-browserify-2.0.10" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz";
+        sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
+      };
+    };
+    "timers-ext-0.1.5" = {
+      name = "timers-ext";
+      packageName = "timers-ext";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz";
+        sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==";
+      };
+    };
+    "tiny-emitter-2.0.2" = {
+      name = "tiny-emitter";
+      packageName = "tiny-emitter";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz";
+        sha512 = "2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==";
+      };
+    };
+    "tmp-0.0.29" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz";
+        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
+      };
+    };
+    "tmp-0.0.33" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
+      };
+    };
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+      };
+    };
+    "to-arraybuffer-1.0.1" = {
+      name = "to-arraybuffer";
+      packageName = "to-arraybuffer";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+      };
+    };
+    "to-buffer-1.1.1" = {
+      name = "to-buffer";
+      packageName = "to-buffer";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
+        sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==";
+      };
+    };
+    "to-fast-properties-1.0.3" = {
+      name = "to-fast-properties";
+      packageName = "to-fast-properties";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
+        sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
+      };
+    };
+    "to-object-path-0.3.0" = {
+      name = "to-object-path";
+      packageName = "to-object-path";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz";
+        sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+      };
+    };
+    "to-regex-3.0.2" = {
+      name = "to-regex";
+      packageName = "to-regex";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
+        sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
+      };
+    };
+    "to-regex-range-2.1.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz";
+        sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+      };
+    };
+    "toposort-1.0.7" = {
+      name = "toposort";
+      packageName = "toposort";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz";
+        sha1 = "2e68442d9f64ec720b8cc89e6443ac6caa950029";
+      };
+    };
+    "toposort-class-1.0.1" = {
+      name = "toposort-class";
+      packageName = "toposort-class";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz";
+        sha1 = "7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988";
+      };
+    };
+    "tough-cookie-2.3.4" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
+        sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
+      };
+    };
+    "tough-cookie-2.4.3" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+      };
+    };
+    "tr46-0.0.3" = {
+      name = "tr46";
+      packageName = "tr46";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz";
+        sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a";
+      };
+    };
+    "traverse-0.6.6" = {
+      name = "traverse";
+      packageName = "traverse";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+        sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
+      };
+    };
+    "trim-0.0.1" = {
+      name = "trim";
+      packageName = "trim";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz";
+        sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
+      };
+    };
+    "trim-right-1.0.1" = {
+      name = "trim-right";
+      packageName = "trim-right";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz";
+        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
+      };
+    };
+    "trim-trailing-lines-1.1.1" = {
+      name = "trim-trailing-lines";
+      packageName = "trim-trailing-lines";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==";
+      };
+    };
+    "trough-1.0.2" = {
+      name = "trough";
+      packageName = "trough";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz";
+        sha512 = "FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==";
+      };
+    };
+    "tty-browserify-0.0.0" = {
+      name = "tty-browserify";
+      packageName = "tty-browserify";
+      version = "0.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+        sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+      };
+    };
+    "tunnel-agent-0.6.0" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+        sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+      };
+    };
+    "tweetnacl-0.14.5" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.14.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+        sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+      };
+    };
+    "type-check-0.3.2" = {
+      name = "type-check";
+      packageName = "type-check";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+        sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+      };
+    };
+    "type-is-1.6.16" = {
+      name = "type-is";
+      packageName = "type-is";
+      version = "1.6.16";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz";
+        sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==";
+      };
+    };
+    "typechecker-2.0.8" = {
+      name = "typechecker";
+      packageName = "typechecker";
+      version = "2.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
+        sha1 = "e83da84bb64c584ccb345838576c40b0337db82e";
+      };
+    };
+    "typechecker-2.1.0" = {
+      name = "typechecker";
+      packageName = "typechecker";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-2.1.0.tgz";
+        sha1 = "d1c2093a54ff8a19f58cff877eeaa54f2242d383";
+      };
+    };
+    "typechecker-4.5.0" = {
+      name = "typechecker";
+      packageName = "typechecker";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz";
+        sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w==";
+      };
+    };
+    "typedarray-0.0.6" = {
+      name = "typedarray";
+      packageName = "typedarray";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+        sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+      };
+    };
+    "uc.micro-1.0.5" = {
+      name = "uc.micro";
+      packageName = "uc.micro";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz";
+        sha512 = "JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==";
+      };
+    };
+    "uglify-es-3.3.10" = {
+      name = "uglify-es";
+      packageName = "uglify-es";
+      version = "3.3.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz";
+        sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww==";
+      };
+    };
+    "uglify-js-2.7.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+      };
+    };
+    "uglify-js-2.8.29" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.8.29";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+        sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+      };
+    };
+    "uglify-js-3.4.6" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "3.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz";
+        sha512 = "O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==";
+      };
+    };
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    };
+    "uid-safe-2.1.5" = {
+      name = "uid-safe";
+      packageName = "uid-safe";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz";
+        sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==";
+      };
+    };
+    "uid2-0.0.3" = {
+      name = "uid2";
+      packageName = "uid2";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
+        sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
+      };
+    };
+    "ultron-1.1.1" = {
+      name = "ultron";
+      packageName = "ultron";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz";
+        sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==";
+      };
+    };
+    "umzug-1.12.0" = {
+      name = "umzug";
+      packageName = "umzug";
+      version = "1.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/umzug/-/umzug-1.12.0.tgz";
+        sha1 = "a79c91f2862eee3130c6c347f2b90ad68a66e8b8";
+      };
+    };
+    "unc-path-regex-0.1.2" = {
+      name = "unc-path-regex";
+      packageName = "unc-path-regex";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz";
+        sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
+      };
+    };
+    "underscore-1.4.4" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+      };
+    };
+    "underscore-1.6.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+      };
+    };
+    "underscore-1.7.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+      };
+    };
+    "underscore-1.8.3" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+        sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+      };
+    };
+    "underscore-1.9.1" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+      };
+    };
+    "underscore.string-2.4.0" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+      };
+    };
+    "unherit-1.1.1" = {
+      name = "unherit";
+      packageName = "unherit";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
+        sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g==";
+      };
+    };
+    "unicode-5.2.0-0.7.5" = {
+      name = "unicode-5.2.0";
+      packageName = "unicode-5.2.0";
+      version = "0.7.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz";
+        sha512 = "KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA==";
+      };
+    };
+    "unified-4.2.1" = {
+      name = "unified";
+      packageName = "unified";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unified/-/unified-4.2.1.tgz";
+        sha1 = "76ff43aa8da430f6e7e4a55c84ebac2ad2cfcd2e";
+      };
+    };
+    "union-value-1.0.0" = {
+      name = "union-value";
+      packageName = "union-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz";
+        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+      };
+    };
+    "uniq-1.0.1" = {
+      name = "uniq";
+      packageName = "uniq";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz";
+        sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+      };
+    };
+    "uniqs-2.0.0" = {
+      name = "uniqs";
+      packageName = "uniqs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz";
+        sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02";
+      };
+    };
+    "unique-filename-1.1.0" = {
+      name = "unique-filename";
+      packageName = "unique-filename";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
+        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
+      };
+    };
+    "unique-slug-2.0.0" = {
+      name = "unique-slug";
+      packageName = "unique-slug";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
+        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+      };
+    };
+    "unique-stream-1.0.0" = {
+      name = "unique-stream";
+      packageName = "unique-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
+        sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
+      };
+    };
+    "unist-util-is-2.1.2" = {
+      name = "unist-util-is";
+      packageName = "unist-util-is";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw==";
+      };
+    };
+    "unist-util-remove-position-1.1.2" = {
+      name = "unist-util-remove-position";
+      packageName = "unist-util-remove-position";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
+        sha512 = "XxoNOBvq1WXRKXxgnSYbtCF76TJrRoe5++pD4cCBsssSiWSnPEktyFrFLE8LTk3JW5mt9hB0Sk5zn4x/JeWY7Q==";
+      };
+    };
+    "unist-util-visit-1.4.0" = {
+      name = "unist-util-visit";
+      packageName = "unist-util-visit";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz";
+        sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw==";
+      };
+    };
+    "unist-util-visit-parents-2.0.1" = {
+      name = "unist-util-visit-parents";
+      packageName = "unist-util-visit-parents";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz";
+        sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA==";
+      };
+    };
+    "universalify-0.1.2" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz";
+        sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
+      };
+    };
+    "unpipe-1.0.0" = {
+      name = "unpipe";
+      packageName = "unpipe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    };
+    "unset-value-1.0.0" = {
+      name = "unset-value";
+      packageName = "unset-value";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz";
+        sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+      };
+    };
+    "update-section-0.3.3" = {
+      name = "update-section";
+      packageName = "update-section";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz";
+        sha1 = "458f17820d37820dc60e20b86d94391b00123158";
+      };
+    };
+    "upper-case-1.1.3" = {
+      name = "upper-case";
+      packageName = "upper-case";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz";
+        sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598";
+      };
+    };
+    "uri-js-4.2.2" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "4.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+        sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+      };
+    };
+    "uri-path-1.0.0" = {
+      name = "uri-path";
+      packageName = "uri-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz";
+        sha1 = "9747f018358933c31de0fccfd82d138e67262e32";
+      };
+    };
+    "urix-0.1.0" = {
+      name = "urix";
+      packageName = "urix";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
+        sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+      };
+    };
+    "url-0.10.3" = {
+      name = "url";
+      packageName = "url";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
+        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
+      };
+    };
+    "url-0.11.0" = {
+      name = "url";
+      packageName = "url";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz";
+        sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+      };
+    };
+    "use-3.1.1" = {
+      name = "use";
+      packageName = "use";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz";
+        sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
+      };
+    };
+    "user-home-1.1.1" = {
+      name = "user-home";
+      packageName = "user-home";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
+        sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190";
+      };
+    };
+    "user-home-2.0.0" = {
+      name = "user-home";
+      packageName = "user-home";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
+        sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
+      };
+    };
+    "util-0.10.3" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    };
+    "util-0.10.4" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz";
+        sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "utila-0.3.3" = {
+      name = "utila";
+      packageName = "utila";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz";
+        sha1 = "d7e8e7d7e309107092b05f8d9688824d633a4226";
+      };
+    };
+    "utila-0.4.0" = {
+      name = "utila";
+      packageName = "utila";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz";
+        sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c";
+      };
+    };
+    "utils-merge-1.0.1" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    };
+    "uuid-3.1.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
+        sha512 = "DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==";
+      };
+    };
+    "uuid-3.3.2" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+      };
+    };
+    "uws-9.14.0" = {
+      name = "uws";
+      packageName = "uws";
+      version = "9.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz";
+        sha512 = "HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==";
+      };
+    };
+    "v8flags-2.1.1" = {
+      name = "v8flags";
+      packageName = "v8flags";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz";
+        sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4";
+      };
+    };
+    "validate-npm-package-license-3.0.3" = {
+      name = "validate-npm-package-license";
+      packageName = "validate-npm-package-license";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
+        sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
+      };
+    };
+    "validator-5.7.0" = {
+      name = "validator";
+      packageName = "validator";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validator/-/validator-5.7.0.tgz";
+        sha1 = "7a87a58146b695ac486071141c0c49d67da05e5c";
+      };
+    };
+    "validator-9.4.1" = {
+      name = "validator";
+      packageName = "validator";
+      version = "9.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
+        sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==";
+      };
+    };
+    "vary-1.1.2" = {
+      name = "vary";
+      packageName = "vary";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+      };
+    };
+    "vasync-1.6.4" = {
+      name = "vasync";
+      packageName = "vasync";
+      version = "1.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vasync/-/vasync-1.6.4.tgz";
+        sha1 = "dfe93616ad0e7ae801b332a9d88bfc5cdc8e1d1f";
+      };
+    };
+    "vendors-1.0.2" = {
+      name = "vendors";
+      packageName = "vendors";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz";
+        sha512 = "w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==";
+      };
+    };
+    "verror-1.10.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+        sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+      };
+    };
+    "verror-1.6.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
+        sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
+      };
+    };
+    "vfile-1.4.0" = {
+      name = "vfile";
+      packageName = "vfile";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz";
+        sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
+      };
+    };
+    "vfile-location-2.0.3" = {
+      name = "vfile-location";
+      packageName = "vfile-location";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz";
+        sha512 = "zM5/l4lfw1CBoPx3Jimxoc5RNDAHHpk6AM6LM0pTIkm5SUSsx8ZekZ0PVdf0WEZ7kjlhSt7ZlqbRL6Cd6dBs6A==";
+      };
+    };
+    "vinyl-0.4.6" = {
+      name = "vinyl";
+      packageName = "vinyl";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
+        sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
+      };
+    };
+    "vinyl-0.5.3" = {
+      name = "vinyl";
+      packageName = "vinyl";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz";
+        sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde";
+      };
+    };
+    "vinyl-fs-0.3.14" = {
+      name = "vinyl-fs";
+      packageName = "vinyl-fs";
+      version = "0.3.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz";
+        sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6";
+      };
+    };
+    "vlq-0.2.3" = {
+      name = "vlq";
+      packageName = "vlq";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz";
+        sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==";
+      };
+    };
+    "vm-browserify-0.0.4" = {
+      name = "vm-browserify";
+      packageName = "vm-browserify";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
+      };
+    };
+    "void-elements-2.0.1" = {
+      name = "void-elements";
+      packageName = "void-elements";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+        sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+      };
+    };
+    "watchpack-0.2.9" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "0.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz";
+        sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
+      };
+    };
+    "watchr-2.4.13" = {
+      name = "watchr";
+      packageName = "watchr";
+      version = "2.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchr/-/watchr-2.4.13.tgz";
+        sha1 = "d74847bb4d6f90f61fe2c74f9f68662aa0e07601";
+      };
+    };
+    "webidl-conversions-3.0.1" = {
+      name = "webidl-conversions";
+      packageName = "webidl-conversions";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz";
+        sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871";
+      };
+    };
+    "webidl-conversions-4.0.2" = {
+      name = "webidl-conversions";
+      packageName = "webidl-conversions";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
+        sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
+      };
+    };
+    "webpack-core-0.6.9" = {
+      name = "webpack-core";
+      packageName = "webpack-core";
+      version = "0.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz";
+        sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
+      };
+    };
+    "webpack-sources-0.1.5" = {
+      name = "webpack-sources";
+      packageName = "webpack-sources";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz";
+        sha1 = "aa1f3abf0f0d74db7111c40e500b84f966640750";
+      };
+    };
+    "webpack-sources-1.1.0" = {
+      name = "webpack-sources";
+      packageName = "webpack-sources";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz";
+        sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==";
+      };
+    };
+    "whatwg-encoding-1.0.3" = {
+      name = "whatwg-encoding";
+      packageName = "whatwg-encoding";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz";
+        sha512 = "jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==";
+      };
+    };
+    "whatwg-url-4.8.0" = {
+      name = "whatwg-url";
+      packageName = "whatwg-url";
+      version = "4.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz";
+        sha1 = "d2981aa9148c1e00a41c5a6131166ab4683bbcc0";
+      };
+    };
+    "whet.extend-0.9.9" = {
+      name = "whet.extend";
+      packageName = "whet.extend";
+      version = "0.9.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz";
+        sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
+      };
+    };
+    "which-1.3.1" = {
+      name = "which";
+      packageName = "which";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+        sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+      };
+    };
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "winston-2.4.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
+        sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
+      };
+    };
+    "wkx-0.2.0" = {
+      name = "wkx";
+      packageName = "wkx";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wkx/-/wkx-0.2.0.tgz";
+        sha1 = "76c24f16acd0cd8f93cd34aa331e0f7961256e84";
+      };
+    };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
+    "wordwrap-1.0.0" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+      };
+    };
+    "worker-farm-1.6.0" = {
+      name = "worker-farm";
+      packageName = "worker-farm";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz";
+        sha512 = "6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==";
+      };
+    };
+    "wrap-ansi-2.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "write-0.2.1" = {
+      name = "write";
+      packageName = "write";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz";
+        sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757";
+      };
+    };
+    "ws-3.3.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz";
+        sha512 = "nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==";
+      };
+    };
+    "x-xss-protection-1.1.0" = {
+      name = "x-xss-protection";
+      packageName = "x-xss-protection";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.1.0.tgz";
+        sha512 = "rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==";
+      };
+    };
+    "xml-1.0.1" = {
+      name = "xml";
+      packageName = "xml";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz";
+        sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
+      };
+    };
+    "xml-crypto-0.10.1" = {
+      name = "xml-crypto";
+      packageName = "xml-crypto";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-crypto/-/xml-crypto-0.10.1.tgz";
+        sha1 = "f832f74ccf56f24afcae1163a1fcab44d96774a8";
+      };
+    };
+    "xml-encryption-0.11.2" = {
+      name = "xml-encryption";
+      packageName = "xml-encryption";
+      version = "0.11.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-encryption/-/xml-encryption-0.11.2.tgz";
+        sha512 = "jVvES7i5ovdO7N+NjgncA326xYKjhqeAnnvIgRnY7ROLCfFqEDLwP0Sxp/30SHG0AXQV1048T5yinOFyvwGFzg==";
+      };
+    };
+    "xml-name-validator-2.0.1" = {
+      name = "xml-name-validator";
+      packageName = "xml-name-validator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz";
+        sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635";
+      };
+    };
+    "xml2js-0.2.8" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+      };
+    };
+    "xml2js-0.4.19" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.4.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
+        sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
+      };
+    };
+    "xmlbuilder-0.4.3" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
+        sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
+      };
+    };
+    "xmlbuilder-9.0.7" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "9.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
+        sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
+      };
+    };
+    "xmldom-0.1.19" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
+      };
+    };
+    "xmldom-0.1.27" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
+      };
+    };
+    "xmlhttprequest-1.8.0" = {
+      name = "xmlhttprequest";
+      packageName = "xmlhttprequest";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
+        sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
+      };
+    };
+    "xmlhttprequest-ssl-1.5.5" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz";
+        sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e";
+      };
+    };
+    "xpath-0.0.27" = {
+      name = "xpath";
+      packageName = "xpath";
+      version = "0.0.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz";
+        sha512 = "fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==";
+      };
+    };
+    "xpath.js-1.1.0" = {
+      name = "xpath.js";
+      packageName = "xpath.js";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz";
+        sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==";
+      };
+    };
+    "xregexp-2.0.0" = {
+      name = "xregexp";
+      packageName = "xregexp";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz";
+        sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
+      };
+    };
+    "xtend-4.0.1" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    };
+    "xtraverse-0.1.0" = {
+      name = "xtraverse";
+      packageName = "xtraverse";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz";
+        sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732";
+      };
+    };
+    "y18n-3.2.1" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+      };
+    };
+    "y18n-4.0.0" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+        sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+      };
+    };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
+    "yallist-3.0.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz";
+        sha1 = "8452b4bb7e83c7c188d8041c1a837c773d6d8bb9";
+      };
+    };
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    };
+    "yargs-8.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
+      };
+    };
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+      };
+    };
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
+      };
+    };
+    "yeast-0.1.2" = {
+      name = "yeast";
+      packageName = "yeast";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
+        sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
+      };
+    };
+    "zip-stream-1.2.0" = {
+      name = "zip-stream";
+      packageName = "zip-stream";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz";
+        sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04";
+      };
+    };
+  };
+in
+{
+  "uglifyjs-webpack-plugin-^1.2.7" = nodeEnv.buildNodePackage {
+    name = "uglifyjs-webpack-plugin";
+    packageName = "uglifyjs-webpack-plugin";
+    version = "1.2.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz";
+      sha512 = "1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==";
+    };
+    dependencies = [
+      sources."ajv-6.5.2"
+      sources."ajv-keywords-3.2.0"
+      sources."aproba-1.2.0"
+      sources."balanced-match-1.0.0"
+      sources."bluebird-3.5.1"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."cacache-10.0.4"
+      sources."chownr-1.0.1"
+      sources."commander-2.14.1"
+      sources."commondir-1.0.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."copy-concurrently-1.0.5"
+      sources."core-util-is-1.0.2"
+      sources."cyclist-0.2.2"
+      sources."duplexify-3.6.0"
+      sources."end-of-stream-1.4.1"
+      sources."errno-0.1.7"
+      sources."fast-deep-equal-2.0.1"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."find-cache-dir-1.0.0"
+      sources."find-up-2.1.0"
+      sources."flush-write-stream-1.0.3"
+      sources."from2-2.3.0"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."graceful-fs-4.1.11"
+      sources."iferr-0.1.5"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."json-schema-traverse-0.4.1"
+      sources."locate-path-2.0.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mississippi-2.0.0"
+      sources."mkdirp-0.5.1"
+      sources."move-concurrently-1.0.1"
+      sources."once-1.4.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parallel-transform-1.1.0"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."pify-3.0.0"
+      sources."pkg-dir-2.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."promise-inflight-1.0.1"
+      sources."prr-1.0.1"
+      sources."pseudomap-1.0.2"
+      sources."pump-2.0.1"
+      sources."pumpify-1.5.1"
+      sources."punycode-2.1.1"
+      sources."readable-stream-2.3.6"
+      sources."rimraf-2.6.2"
+      sources."run-queue-1.0.3"
+      sources."safe-buffer-5.1.2"
+      sources."schema-utils-0.4.5"
+      sources."serialize-javascript-1.5.0"
+      sources."source-list-map-2.0.0"
+      sources."source-map-0.6.1"
+      sources."ssri-5.3.0"
+      sources."stream-each-1.2.3"
+      sources."stream-shift-1.0.0"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."uglify-es-3.3.10"
+      sources."unique-filename-1.1.0"
+      sources."unique-slug-2.0.0"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."webpack-sources-1.1.0"
+      sources."worker-farm-1.6.0"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+      sources."y18n-4.0.0"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "UglifyJS plugin for webpack";
+      homepage = https://github.com/webpack-contrib/uglifyjs-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-cli-^6.18.0" = nodeEnv.buildNodePackage {
+    name = "babel-cli";
+    packageName = "babel-cli";
+    version = "6.26.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz";
+      sha1 = "502ab54874d7db88ad00b887a06383ce03d002f1";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."anymatch-1.3.2"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."array-unique-0.2.1"
+      sources."async-each-1.0.1"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-core-6.26.3"
+      sources."babel-generator-6.26.1"
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-polyfill-6.26.0"
+      sources."babel-register-6.26.0"
+      (sources."babel-runtime-6.26.0" // {
+        dependencies = [
+          sources."regenerator-runtime-0.11.1"
+        ];
+      })
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
+      sources."balanced-match-1.0.0"
+      sources."binary-extensions-1.11.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."chalk-1.1.3"
+      sources."chokidar-1.7.0"
+      sources."commander-2.16.0"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.5.1"
+      sources."core-js-2.5.7"
+      sources."core-util-is-1.0.2"
+      sources."debug-2.6.9"
+      sources."detect-indent-4.0.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.2"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."fs-readdir-recursive-1.1.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.2.4"
+      sources."glob-7.1.2"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      sources."globals-9.18.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-ansi-2.0.0"
+      sources."home-or-tmp-2.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."invariant-2.2.4"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-finite-1.0.2"
+      sources."is-glob-2.0.1"
+      sources."is-number-2.1.0"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."isarray-1.0.0"
+      sources."isobject-2.1.0"
+      sources."js-tokens-3.0.2"
+      sources."jsesc-1.3.0"
+      sources."json5-0.5.1"
+      sources."kind-of-3.2.2"
+      sources."lodash-4.17.10"
+      sources."loose-envify-1.4.0"
+      sources."math-random-1.0.1"
+      sources."micromatch-2.3.11"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."nan-2.10.0"
+      sources."normalize-path-2.1.1"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."object.omit-2.0.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."output-file-sync-1.1.2"
+      sources."parse-glob-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."preserve-0.2.0"
+      sources."private-0.1.8"
+      sources."process-nextick-args-2.0.0"
+      (sources."randomatic-3.0.0" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.1.0"
+      sources."regenerator-runtime-0.10.5"
+      sources."regex-cache-0.4.4"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."repeating-2.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."set-immediate-shim-1.0.1"
+      sources."slash-1.0.0"
+      sources."source-map-0.5.7"
+      sources."source-map-support-0.4.18"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."to-fast-properties-1.0.3"
+      sources."trim-right-1.0.1"
+      sources."user-home-1.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."v8flags-2.1.1"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Babel command line.";
+      homepage = https://babeljs.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-core-^6.21.0" = nodeEnv.buildNodePackage {
+    name = "babel-core";
+    packageName = "babel-core";
+    version = "6.26.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
+      sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-core-6.26.3"
+      sources."babel-generator-6.26.1"
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-register-6.26.0"
+      sources."babel-runtime-6.26.0"
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."chalk-1.1.3"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.5.1"
+      sources."core-js-2.5.7"
+      sources."debug-2.6.9"
+      sources."detect-indent-4.0.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.2"
+      sources."globals-9.18.0"
+      sources."has-ansi-2.0.0"
+      sources."home-or-tmp-2.0.0"
+      sources."invariant-2.2.4"
+      sources."is-finite-1.0.2"
+      sources."js-tokens-3.0.2"
+      sources."jsesc-1.3.0"
+      sources."json5-0.5.1"
+      sources."lodash-4.17.10"
+      sources."loose-envify-1.4.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."private-0.1.8"
+      sources."regenerator-runtime-0.11.1"
+      sources."repeating-2.0.1"
+      sources."slash-1.0.0"
+      sources."source-map-0.5.7"
+      sources."source-map-support-0.4.18"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."to-fast-properties-1.0.3"
+      sources."trim-right-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Babel compiler core.";
+      homepage = https://babeljs.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-loader-^6.2.10" = nodeEnv.buildNodePackage {
+    name = "babel-loader";
+    packageName = "babel-loader";
+    version = "6.4.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-loader/-/babel-loader-6.4.1.tgz";
+      sha1 = "0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."commondir-1.0.1"
+      sources."emojis-list-2.1.0"
+      sources."find-cache-dir-0.1.1"
+      sources."find-up-1.1.2"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."object-assign-4.1.1"
+      sources."path-exists-2.1.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pkg-dir-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "babel module loader for webpack";
+      homepage = https://github.com/babel/babel-loader;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-plugin-transform-runtime-^6.15.0" = nodeEnv.buildNodePackage {
+    name = "babel-plugin-transform-runtime";
+    packageName = "babel-plugin-transform-runtime";
+    version = "6.23.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz";
+      sha1 = "88490d446502ea9b8e7efb0fe09ec4d99479b1ee";
+    };
+    dependencies = [
+      sources."babel-runtime-6.26.0"
+      sources."core-js-2.5.7"
+      sources."regenerator-runtime-0.11.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Externalise references to helpers and builtins, automatically polyfilling your code without polluting globals";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-polyfill-^6.22.0" = nodeEnv.buildNodePackage {
+    name = "babel-polyfill";
+    packageName = "babel-polyfill";
+    version = "6.26.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz";
+      sha1 = "379937abc67d7895970adc621f284cd966cf2153";
+    };
+    dependencies = [
+      (sources."babel-runtime-6.26.0" // {
+        dependencies = [
+          sources."regenerator-runtime-0.11.1"
+        ];
+      })
+      sources."core-js-2.5.7"
+      sources."regenerator-runtime-0.10.5"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Provides polyfills necessary for a full ES2015+ environment";
+      homepage = https://babeljs.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-preset-es2015-^6.18.0" = nodeEnv.buildNodePackage {
+    name = "babel-preset-es2015";
+    packageName = "babel-preset-es2015";
+    version = "6.24.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz";
+      sha1 = "d44050d6bc2c9feea702aaf38d727a0210538939";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-helper-call-delegate-6.24.1"
+      sources."babel-helper-define-map-6.26.0"
+      sources."babel-helper-function-name-6.24.1"
+      sources."babel-helper-get-function-arity-6.24.1"
+      sources."babel-helper-hoist-variables-6.24.1"
+      sources."babel-helper-optimise-call-expression-6.24.1"
+      sources."babel-helper-regex-6.26.0"
+      sources."babel-helper-replace-supers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-plugin-check-es2015-constants-6.22.0"
+      sources."babel-plugin-transform-es2015-arrow-functions-6.22.0"
+      sources."babel-plugin-transform-es2015-block-scoped-functions-6.22.0"
+      sources."babel-plugin-transform-es2015-block-scoping-6.26.0"
+      sources."babel-plugin-transform-es2015-classes-6.24.1"
+      sources."babel-plugin-transform-es2015-computed-properties-6.24.1"
+      sources."babel-plugin-transform-es2015-destructuring-6.23.0"
+      sources."babel-plugin-transform-es2015-duplicate-keys-6.24.1"
+      sources."babel-plugin-transform-es2015-for-of-6.23.0"
+      sources."babel-plugin-transform-es2015-function-name-6.24.1"
+      sources."babel-plugin-transform-es2015-literals-6.22.0"
+      sources."babel-plugin-transform-es2015-modules-amd-6.24.1"
+      sources."babel-plugin-transform-es2015-modules-commonjs-6.26.2"
+      sources."babel-plugin-transform-es2015-modules-systemjs-6.24.1"
+      sources."babel-plugin-transform-es2015-modules-umd-6.24.1"
+      sources."babel-plugin-transform-es2015-object-super-6.24.1"
+      sources."babel-plugin-transform-es2015-parameters-6.24.1"
+      sources."babel-plugin-transform-es2015-shorthand-properties-6.24.1"
+      sources."babel-plugin-transform-es2015-spread-6.22.0"
+      sources."babel-plugin-transform-es2015-sticky-regex-6.24.1"
+      sources."babel-plugin-transform-es2015-template-literals-6.22.0"
+      sources."babel-plugin-transform-es2015-typeof-symbol-6.23.0"
+      sources."babel-plugin-transform-es2015-unicode-regex-6.24.1"
+      sources."babel-plugin-transform-regenerator-6.26.0"
+      sources."babel-plugin-transform-strict-mode-6.24.1"
+      sources."babel-runtime-6.26.0"
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
+      sources."chalk-1.1.3"
+      sources."core-js-2.5.7"
+      sources."debug-2.6.9"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.2"
+      sources."globals-9.18.0"
+      sources."has-ansi-2.0.0"
+      sources."invariant-2.2.4"
+      sources."js-tokens-3.0.2"
+      sources."jsesc-0.5.0"
+      sources."lodash-4.17.10"
+      sources."loose-envify-1.4.0"
+      sources."ms-2.0.0"
+      sources."private-0.1.8"
+      sources."regenerate-1.4.0"
+      sources."regenerator-runtime-0.11.1"
+      sources."regenerator-transform-0.10.1"
+      sources."regexpu-core-2.0.0"
+      sources."regjsgen-0.2.0"
+      sources."regjsparser-0.1.5"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."to-fast-properties-1.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Babel preset for all es2015 plugins.";
+      homepage = https://babeljs.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "babel-runtime-^6.20.0" = nodeEnv.buildNodePackage {
+    name = "babel-runtime";
+    packageName = "babel-runtime";
+    version = "6.26.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+      sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+    };
+    dependencies = [
+      sources."core-js-2.5.7"
+      sources."regenerator-runtime-0.11.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "babel selfContained runtime";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "copy-webpack-plugin-^4.0.1" = nodeEnv.buildNodePackage {
+    name = "copy-webpack-plugin";
+    packageName = "copy-webpack-plugin";
+    version = "4.5.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz";
+      sha512 = "zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==";
+    };
+    dependencies = [
+      sources."aproba-1.2.0"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."arrify-1.0.1"
+      sources."balanced-match-1.0.0"
+      sources."big.js-3.2.0"
+      sources."bluebird-3.5.1"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."cacache-10.0.4"
+      sources."chownr-1.0.1"
+      sources."commondir-1.0.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."copy-concurrently-1.0.5"
+      sources."core-util-is-1.0.2"
+      sources."cyclist-0.2.2"
+      sources."dir-glob-2.0.0"
+      sources."duplexify-3.6.0"
+      sources."emojis-list-2.1.0"
+      sources."end-of-stream-1.4.1"
+      sources."find-cache-dir-1.0.0"
+      sources."find-up-2.1.0"
+      sources."flush-write-stream-1.0.3"
+      sources."from2-2.3.0"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."globby-7.1.1"
+      sources."graceful-fs-4.1.11"
+      sources."iferr-0.1.5"
+      sources."ignore-3.3.10"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.0"
+      sources."isarray-1.0.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."locate-path-2.0.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mississippi-2.0.0"
+      sources."mkdirp-0.5.1"
+      sources."move-concurrently-1.0.1"
+      sources."once-1.4.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parallel-transform-1.1.0"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-type-3.0.0"
+      sources."pify-3.0.0"
+      sources."pkg-dir-2.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."promise-inflight-1.0.1"
+      sources."pseudomap-1.0.2"
+      sources."pump-2.0.1"
+      sources."pumpify-1.5.1"
+      sources."readable-stream-2.3.6"
+      sources."rimraf-2.6.2"
+      sources."run-queue-1.0.3"
+      sources."safe-buffer-5.1.2"
+      sources."serialize-javascript-1.5.0"
+      sources."slash-1.0.0"
+      sources."ssri-5.3.0"
+      sources."stream-each-1.2.3"
+      sources."stream-shift-1.0.0"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."unique-filename-1.1.0"
+      sources."unique-slug-2.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+      sources."y18n-4.0.0"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Copy files && directories with webpack";
+      homepage = https://github.com/webpack-contrib/copy-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "css-loader-^0.26.1" = nodeEnv.buildNodePackage {
+    name = "css-loader";
+    packageName = "css-loader";
+    version = "0.26.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz";
+      sha1 = "b61e9e30db94303e6ffc892f10ecd09ad025a1fd";
+    };
+    dependencies = [
+      sources."alphanum-sort-1.0.2"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."argparse-1.0.10"
+      sources."autoprefixer-6.7.7"
+      sources."babel-code-frame-6.26.0"
+      sources."balanced-match-0.4.2"
+      sources."big.js-3.2.0"
+      sources."browserslist-1.7.7"
+      sources."caniuse-api-1.6.1"
+      sources."caniuse-db-1.0.30000874"
+      sources."chalk-1.1.3"
+      sources."clap-1.2.3"
+      sources."clone-1.0.4"
+      sources."coa-1.0.4"
+      sources."color-0.11.4"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."color-string-0.3.0"
+      sources."colormin-1.1.2"
+      sources."colors-1.1.2"
+      sources."css-color-names-0.0.4"
+      sources."css-selector-tokenizer-0.7.0"
+      sources."cssesc-0.1.0"
+      sources."cssnano-3.10.0"
+      sources."csso-2.3.2"
+      sources."decamelize-1.2.0"
+      sources."defined-1.0.0"
+      sources."electron-to-chromium-1.3.55"
+      sources."emojis-list-2.1.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-2.7.3"
+      sources."esutils-2.0.2"
+      sources."fastparse-1.1.1"
+      sources."flatten-1.0.2"
+      sources."function-bind-1.1.1"
+      sources."has-1.0.3"
+      sources."has-ansi-2.0.0"
+      sources."has-flag-1.0.0"
+      sources."html-comment-regex-1.1.1"
+      sources."icss-replace-symbols-1.1.0"
+      sources."indexes-of-1.0.1"
+      sources."is-absolute-url-2.1.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-svg-2.1.0"
+      sources."js-base64-2.4.8"
+      sources."js-tokens-3.0.2"
+      sources."js-yaml-3.7.0"
+      sources."jsesc-0.5.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."lodash.camelcase-4.3.0"
+      sources."lodash.memoize-4.1.2"
+      sources."lodash.uniq-4.5.0"
+      sources."math-expression-evaluator-1.2.17"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."normalize-range-0.1.2"
+      sources."normalize-url-1.9.1"
+      sources."num2fraction-1.2.2"
+      sources."object-assign-4.1.1"
+      (sources."postcss-5.2.18" // {
+        dependencies = [
+          sources."supports-color-3.2.3"
+        ];
+      })
+      sources."postcss-calc-5.3.1"
+      sources."postcss-colormin-2.2.2"
+      sources."postcss-convert-values-2.6.1"
+      sources."postcss-discard-comments-2.0.4"
+      sources."postcss-discard-duplicates-2.1.0"
+      sources."postcss-discard-empty-2.1.0"
+      sources."postcss-discard-overridden-0.1.1"
+      sources."postcss-discard-unused-2.2.3"
+      sources."postcss-filter-plugins-2.0.3"
+      sources."postcss-merge-idents-2.1.7"
+      sources."postcss-merge-longhand-2.0.2"
+      sources."postcss-merge-rules-2.1.2"
+      sources."postcss-message-helpers-2.0.0"
+      sources."postcss-minify-font-values-1.0.5"
+      sources."postcss-minify-gradients-1.0.5"
+      sources."postcss-minify-params-1.2.2"
+      sources."postcss-minify-selectors-2.1.1"
+      (sources."postcss-modules-extract-imports-1.2.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."has-flag-3.0.0"
+          sources."postcss-6.0.23"
+          sources."source-map-0.6.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      (sources."postcss-modules-local-by-default-1.2.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."has-flag-3.0.0"
+          sources."postcss-6.0.23"
+          sources."source-map-0.6.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      (sources."postcss-modules-scope-1.1.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."has-flag-3.0.0"
+          sources."postcss-6.0.23"
+          sources."source-map-0.6.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      (sources."postcss-modules-values-1.3.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."has-flag-3.0.0"
+          sources."postcss-6.0.23"
+          sources."source-map-0.6.1"
+          sources."supports-color-5.4.0"
+        ];
+      })
+      sources."postcss-normalize-charset-1.1.1"
+      sources."postcss-normalize-url-3.0.8"
+      sources."postcss-ordered-values-2.2.3"
+      sources."postcss-reduce-idents-2.4.0"
+      sources."postcss-reduce-initial-1.0.1"
+      sources."postcss-reduce-transforms-1.0.4"
+      sources."postcss-selector-parser-2.2.3"
+      sources."postcss-svgo-2.1.6"
+      sources."postcss-unique-selectors-2.0.2"
+      sources."postcss-value-parser-3.3.0"
+      sources."postcss-zindex-2.2.0"
+      sources."prepend-http-1.0.4"
+      sources."q-1.5.1"
+      sources."query-string-4.3.4"
+      sources."reduce-css-calc-1.3.0"
+      sources."reduce-function-call-1.0.2"
+      sources."regenerate-1.4.0"
+      sources."regexpu-core-1.0.0"
+      sources."regjsgen-0.2.0"
+      sources."regjsparser-0.1.5"
+      sources."sax-1.2.4"
+      sources."sort-keys-1.1.2"
+      sources."source-list-map-0.1.8"
+      sources."source-map-0.5.7"
+      sources."sprintf-js-1.0.3"
+      sources."strict-uri-encode-1.1.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."svgo-0.7.2"
+      sources."uniq-1.0.1"
+      sources."uniqs-2.0.0"
+      sources."vendors-1.0.2"
+      sources."whet.extend-0.9.9"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "css loader module for webpack";
+      homepage = "https://github.com/webpack/css-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "doctoc-^1.3.0" = nodeEnv.buildNodePackage {
+    name = "doctoc";
+    packageName = "doctoc";
+    version = "1.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.1.tgz";
+      sha1 = "f012e3603e3156254c2ef22ac88c7190f55426ba";
+    };
+    dependencies = [
+      sources."anchor-markdown-header-0.5.7"
+      sources."bail-1.0.3"
+      sources."boundary-1.0.1"
+      sources."ccount-1.0.3"
+      sources."character-entities-1.2.2"
+      sources."character-entities-html4-1.1.2"
+      sources."character-entities-legacy-1.1.2"
+      sources."character-reference-invalid-1.1.2"
+      sources."collapse-white-space-1.0.4"
+      sources."core-util-is-1.0.2"
+      sources."debug-2.6.9"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.7.0"
+      sources."emoji-regex-6.1.3"
+      sources."entities-1.1.1"
+      sources."extend-3.0.2"
+      sources."function-bind-1.1.1"
+      sources."has-1.0.3"
+      sources."htmlparser2-3.9.2"
+      sources."inherits-2.0.3"
+      sources."is-alphabetical-1.0.2"
+      sources."is-alphanumerical-1.0.2"
+      sources."is-decimal-1.0.2"
+      sources."is-hexadecimal-1.0.2"
+      sources."isarray-1.0.0"
+      sources."longest-streak-1.0.0"
+      sources."markdown-table-0.4.0"
+      sources."markdown-to-ast-3.4.0"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."once-1.4.0"
+      sources."parse-entities-1.1.2"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."remark-5.1.0"
+      sources."remark-parse-1.1.0"
+      sources."remark-stringify-1.1.0"
+      sources."repeat-string-1.6.1"
+      sources."safe-buffer-5.1.2"
+      sources."string_decoder-1.1.1"
+      sources."stringify-entities-1.3.2"
+      sources."structured-source-3.0.2"
+      sources."traverse-0.6.6"
+      sources."trim-0.0.1"
+      sources."trim-trailing-lines-1.1.1"
+      sources."trough-1.0.2"
+      sources."underscore-1.8.3"
+      sources."unherit-1.1.1"
+      sources."unified-4.2.1"
+      sources."unist-util-is-2.1.2"
+      sources."unist-util-remove-position-1.1.2"
+      sources."unist-util-visit-1.4.0"
+      sources."unist-util-visit-parents-2.0.1"
+      sources."update-section-0.3.3"
+      sources."util-deprecate-1.0.2"
+      sources."vfile-1.4.0"
+      sources."vfile-location-2.0.3"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Generates TOC for markdown files of local git repo.";
+      homepage = "https://github.com/thlorenz/doctoc#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "ejs-loader-^0.3.0" = nodeEnv.buildNodePackage {
+    name = "ejs-loader";
+    packageName = "ejs-loader";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.1.tgz";
+      sha512 = "bdJHTxBY3uqZ6L5V1WRohf1gr7ousgESpArPVseEQCWCATs+M8BRqxyJWqnFo+h815gTA++g5LyAyqS5OTIfdQ==";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."lodash-3.10.1"
+      sources."object-assign-4.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "EJS (Underscore/LoDash Templates) loader for webpack";
+      homepage = https://github.com/okonet/ejs-loader;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "exports-loader-^0.6.3" = nodeEnv.buildNodePackage {
+    name = "exports-loader";
+    packageName = "exports-loader";
+    version = "0.6.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/exports-loader/-/exports-loader-0.6.4.tgz";
+      sha1 = "d70fc6121975b35fc12830cf52754be2740fc886";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."source-map-0.5.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "exports loader module for webpack";
+      homepage = "https://github.com/webpack/exports-loader#readme";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "expose-^0.1.4" = nodeEnv.buildNodePackage {
+    name = "expose";
+    packageName = "expose";
+    version = "0.1.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/expose/-/expose-0.1.4.tgz";
+      sha1 = "197aa807200f5114d01520a8ce6a4f42b7f9ba29";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Search modules and expose exports onto a given namespace.";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "expose-loader-^0.7.1" = nodeEnv.buildNodePackage {
+    name = "expose-loader";
+    packageName = "expose-loader";
+    version = "0.7.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/expose-loader/-/expose-loader-0.7.5.tgz";
+      sha512 = "iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "expose loader module for webpack";
+      homepage = https://github.com/webpack-contrib/expose-loader;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "extract-text-webpack-plugin-^1.0.1" = nodeEnv.buildNodePackage {
+    name = "extract-text-webpack-plugin";
+    packageName = "extract-text-webpack-plugin";
+    version = "1.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-1.0.1.tgz";
+      sha1 = "c95bf3cbaac49dc96f1dc6e072549fbb654ccd2c";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."object-assign-4.1.1"
+      sources."source-list-map-0.1.8"
+      sources."source-map-0.5.7"
+      sources."webpack-sources-0.1.5"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Extract text from bundle into a file.";
+      homepage = http://github.com/webpack/extract-text-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "file-loader-^0.9.0" = nodeEnv.buildNodePackage {
+    name = "file-loader";
+    packageName = "file-loader";
+    version = "0.9.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz";
+      sha1 = "1d2daddd424ce6d1b07cfe3f79731bed3617ab42";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."object-assign-4.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "file loader module for webpack";
+      homepage = https://github.com/webpack/file-loader;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "html-webpack-plugin-^2.25.0" = nodeEnv.buildNodePackage {
+    name = "html-webpack-plugin";
+    packageName = "html-webpack-plugin";
+    version = "2.30.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz";
+      sha1 = "7f9c421b7ea91ec460f56527d78df484ee7537d5";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."big.js-3.2.0"
+      sources."bluebird-3.5.1"
+      sources."boolbase-1.0.0"
+      sources."camel-case-3.0.0"
+      sources."clean-css-4.1.11"
+      sources."commander-2.16.0"
+      sources."core-util-is-1.0.2"
+      sources."css-select-1.2.0"
+      sources."css-what-2.1.0"
+      (sources."dom-converter-0.1.4" // {
+        dependencies = [
+          sources."utila-0.3.3"
+        ];
+      })
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.1.0"
+      sources."domutils-1.5.1"
+      sources."emojis-list-2.1.0"
+      sources."entities-1.1.1"
+      sources."he-1.1.1"
+      sources."html-minifier-3.5.19"
+      (sources."htmlparser2-3.3.0" // {
+        dependencies = [
+          sources."domutils-1.1.6"
+        ];
+      })
+      sources."inherits-2.0.3"
+      sources."isarray-0.0.1"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."lodash-4.17.10"
+      sources."lower-case-1.1.4"
+      sources."no-case-2.3.2"
+      sources."nth-check-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."param-case-2.1.1"
+      sources."pretty-error-2.1.1"
+      sources."readable-stream-1.0.34"
+      sources."relateurl-0.2.7"
+      (sources."renderkid-2.0.1" // {
+        dependencies = [
+          sources."utila-0.3.3"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."string_decoder-0.10.31"
+      sources."strip-ansi-3.0.1"
+      sources."toposort-1.0.7"
+      (sources."uglify-js-3.4.6" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      sources."upper-case-1.1.3"
+      sources."utila-0.4.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Simplifies creation of HTML files to serve your webpack bundles";
+      homepage = https://github.com/jantimon/html-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "imports-loader-^0.7.0" = nodeEnv.buildNodePackage {
+    name = "imports-loader";
+    packageName = "imports-loader";
+    version = "0.7.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/imports-loader/-/imports-loader-0.7.1.tgz";
+      sha1 = "f204b5f34702a32c1db7d48d89d5e867a0441253";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."source-map-0.5.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "imports loader module for webpack";
+      homepage = "https://github.com/webpack/imports-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "json-loader-^0.5.4" = nodeEnv.buildNodePackage {
+    name = "json-loader";
+    packageName = "json-loader";
+    version = "0.5.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz";
+      sha512 = "QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "json loader module for webpack";
+      homepage = "https://github.com/webpack/json-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "jsonlint-^1.6.2" = nodeEnv.buildNodePackage {
+    name = "jsonlint";
+    packageName = "jsonlint";
+    version = "1.6.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz";
+      sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==";
+    };
+    dependencies = [
+      sources."JSV-4.0.2"
+      sources."ansi-styles-1.0.0"
+      sources."chalk-0.4.0"
+      sources."has-color-0.1.7"
+      sources."nomnom-1.8.1"
+      sources."strip-ansi-0.1.1"
+      sources."underscore-1.6.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Validate JSON";
+      homepage = http://zaach.github.com/jsonlint/;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "less-^2.7.1" = nodeEnv.buildNodePackage {
+    name = "less";
+    packageName = "less";
+    version = "2.7.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz";
+      sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
+    };
+    dependencies = [
+      sources."ajv-4.11.8"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-0.2.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."boom-2.10.1"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."cryptiles-2.0.5"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."errno-0.1.7"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      (sources."getpass-0.1.7" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."http-signature-1.1.1"
+      sources."image-size-0.5.5"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."mime-1.6.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."promise-7.3.1"
+      sources."prr-1.0.1"
+      sources."punycode-1.4.1"
+      sources."qs-6.4.0"
+      sources."request-2.81.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sntp-1.0.9"
+      sources."source-map-0.5.7"
+      (sources."sshpk-1.14.2" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."stringstream-0.0.6"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uuid-3.3.2"
+      (sources."verror-1.10.0" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Leaner CSS";
+      homepage = http://lesscss.org/;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "less-loader-^2.2.3" = nodeEnv.buildNodePackage {
+    name = "less-loader";
+    packageName = "less-loader";
+    version = "2.2.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/less-loader/-/less-loader-2.2.3.tgz";
+      sha1 = "b6d8f8139c8493df09d992a93a00734b08f84528";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-0.2.17"
+      sources."object-assign-4.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "less loader module for webpack";
+      homepage = "https://github.com/webpack/less-loader#readme";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "optimize-css-assets-webpack-plugin-^1.3.0" = nodeEnv.buildNodePackage {
+    name = "optimize-css-assets-webpack-plugin";
+    packageName = "optimize-css-assets-webpack-plugin";
+    version = "1.3.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.2.tgz";
+      sha1 = "eb27456e21eefbd8080f31e8368c59684e585a2c";
+    };
+    dependencies = [
+      sources."alphanum-sort-1.0.2"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."argparse-1.0.10"
+      sources."autoprefixer-6.7.7"
+      sources."balanced-match-0.4.2"
+      sources."browserslist-1.7.7"
+      sources."caniuse-api-1.6.1"
+      sources."caniuse-db-1.0.30000874"
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."clap-1.2.3"
+      sources."clone-1.0.4"
+      sources."coa-1.0.4"
+      sources."color-0.11.4"
+      sources."color-convert-1.9.2"
+      sources."color-name-1.1.1"
+      sources."color-string-0.3.0"
+      sources."colormin-1.1.2"
+      sources."colors-1.1.2"
+      sources."css-color-names-0.0.4"
+      sources."cssnano-3.10.0"
+      sources."csso-2.3.2"
+      sources."decamelize-1.2.0"
+      sources."defined-1.0.0"
+      sources."electron-to-chromium-1.3.55"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-2.7.3"
+      sources."flatten-1.0.2"
+      sources."function-bind-1.1.1"
+      sources."has-1.0.3"
+      sources."has-ansi-2.0.0"
+      sources."has-flag-1.0.0"
+      sources."html-comment-regex-1.1.1"
+      sources."indexes-of-1.0.1"
+      sources."is-absolute-url-2.1.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-svg-2.1.0"
+      sources."js-base64-2.4.8"
+      sources."js-yaml-3.7.0"
+      sources."lodash.memoize-4.1.2"
+      sources."lodash.uniq-4.5.0"
+      sources."math-expression-evaluator-1.2.17"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."normalize-range-0.1.2"
+      sources."normalize-url-1.9.1"
+      sources."num2fraction-1.2.2"
+      sources."object-assign-4.1.1"
+      sources."postcss-5.2.18"
+      sources."postcss-calc-5.3.1"
+      sources."postcss-colormin-2.2.2"
+      sources."postcss-convert-values-2.6.1"
+      sources."postcss-discard-comments-2.0.4"
+      sources."postcss-discard-duplicates-2.1.0"
+      sources."postcss-discard-empty-2.1.0"
+      sources."postcss-discard-overridden-0.1.1"
+      sources."postcss-discard-unused-2.2.3"
+      sources."postcss-filter-plugins-2.0.3"
+      sources."postcss-merge-idents-2.1.7"
+      sources."postcss-merge-longhand-2.0.2"
+      sources."postcss-merge-rules-2.1.2"
+      sources."postcss-message-helpers-2.0.0"
+      sources."postcss-minify-font-values-1.0.5"
+      sources."postcss-minify-gradients-1.0.5"
+      sources."postcss-minify-params-1.2.2"
+      sources."postcss-minify-selectors-2.1.1"
+      sources."postcss-normalize-charset-1.1.1"
+      sources."postcss-normalize-url-3.0.8"
+      sources."postcss-ordered-values-2.2.3"
+      sources."postcss-reduce-idents-2.4.0"
+      sources."postcss-reduce-initial-1.0.1"
+      sources."postcss-reduce-transforms-1.0.4"
+      sources."postcss-selector-parser-2.2.3"
+      sources."postcss-svgo-2.1.6"
+      sources."postcss-unique-selectors-2.0.2"
+      sources."postcss-value-parser-3.3.0"
+      sources."postcss-zindex-2.2.0"
+      sources."prepend-http-1.0.4"
+      sources."q-1.5.1"
+      sources."query-string-4.3.4"
+      sources."reduce-css-calc-1.3.0"
+      sources."reduce-function-call-1.0.2"
+      sources."sax-1.2.4"
+      sources."sort-keys-1.1.2"
+      sources."source-list-map-0.1.8"
+      sources."source-map-0.5.7"
+      sources."sprintf-js-1.0.3"
+      sources."strict-uri-encode-1.1.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-3.2.3"
+      sources."svgo-0.7.2"
+      sources."underscore-1.9.1"
+      sources."uniq-1.0.1"
+      sources."uniqs-2.0.0"
+      sources."vendors-1.0.2"
+      sources."webpack-sources-0.1.5"
+      sources."whet.extend-0.9.9"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A Webpack plugin to optimize \\ minimize CSS assets.";
+      homepage = http://github.com/NMFR/optimize-css-assets-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "script-loader-^0.7.0" = nodeEnv.buildNodePackage {
+    name = "script-loader";
+    packageName = "script-loader";
+    version = "0.7.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz";
+      sha512 = "UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==";
+    };
+    dependencies = [
+      sources."raw-loader-0.5.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "script loader module for webpack";
+      homepage = https://github.com/webpack/script-loader;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "standard-^9.0.1" = nodeEnv.buildNodePackage {
+    name = "standard";
+    packageName = "standard";
+    version = "9.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/standard/-/standard-9.0.2.tgz";
+      sha1 = "9bd3b9467492e212b1914d78553943ff9b48fd99";
+    };
+    dependencies = [
+      sources."acorn-5.7.1"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      sources."ajv-4.11.8"
+      sources."ajv-keywords-1.5.1"
+      sources."ansi-escapes-1.4.0"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."argparse-1.0.10"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array.prototype.find-2.0.4"
+      sources."arrify-1.0.1"
+      sources."babel-code-frame-6.26.0"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."caller-path-0.1.0"
+      sources."callsites-0.2.0"
+      sources."chalk-1.1.3"
+      sources."circular-json-0.3.3"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.2.0"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."core-util-is-1.0.2"
+      sources."d-1.0.0"
+      sources."debug-2.6.9"
+      sources."debug-log-1.0.1"
+      sources."deep-is-0.1.3"
+      sources."define-properties-1.1.2"
+      sources."deglob-2.1.1"
+      sources."del-2.2.2"
+      sources."doctrine-2.1.0"
+      sources."error-ex-1.3.2"
+      sources."es-abstract-1.12.0"
+      sources."es-to-primitive-1.1.1"
+      sources."es5-ext-0.10.45"
+      sources."es6-iterator-2.0.3"
+      sources."es6-map-0.1.5"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."es6-weak-map-2.0.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."escope-3.6.0"
+      sources."eslint-3.18.0"
+      sources."eslint-config-standard-7.1.0"
+      sources."eslint-config-standard-jsx-3.3.0"
+      sources."eslint-plugin-promise-3.4.2"
+      (sources."eslint-plugin-react-6.9.0" // {
+        dependencies = [
+          sources."doctrine-1.5.0"
+        ];
+      })
+      sources."eslint-plugin-standard-2.0.1"
+      sources."espree-3.5.4"
+      sources."esprima-4.0.1"
+      sources."esquery-1.0.1"
+      sources."esrecurse-4.2.1"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."event-emitter-0.3.5"
+      sources."exit-hook-1.1.1"
+      sources."fast-levenshtein-2.0.6"
+      sources."figures-1.7.0"
+      sources."file-entry-cache-2.0.0"
+      sources."find-root-1.1.0"
+      sources."find-up-2.1.0"
+      sources."flat-cache-1.3.0"
+      sources."foreach-2.0.5"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."get-stdin-5.0.1"
+      sources."glob-7.1.2"
+      sources."globals-9.18.0"
+      sources."globby-5.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-1.0.3"
+      sources."has-ansi-2.0.0"
+      sources."home-or-tmp-2.0.0"
+      sources."ignore-3.3.10"
+      sources."imurmurhash-0.1.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."inquirer-0.12.0"
+      sources."interpret-1.1.0"
+      sources."is-arrayish-0.2.1"
+      sources."is-callable-1.1.4"
+      sources."is-date-object-1.0.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-my-ip-valid-1.0.0"
+      sources."is-my-json-valid-2.17.2"
+      sources."is-path-cwd-1.0.0"
+      sources."is-path-in-cwd-1.0.1"
+      sources."is-path-inside-1.0.1"
+      sources."is-property-1.0.2"
+      sources."is-regex-1.0.4"
+      sources."is-resolvable-1.1.0"
+      sources."is-symbol-1.0.1"
+      sources."isarray-1.0.0"
+      sources."js-tokens-3.0.2"
+      sources."js-yaml-3.12.0"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."jsonpointer-4.0.1"
+      sources."jsx-ast-utils-1.4.1"
+      sources."levn-0.3.0"
+      (sources."load-json-file-4.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.10"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."mute-stream-0.0.5"
+      sources."natural-compare-1.4.0"
+      sources."next-tick-1.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."object-keys-1.0.12"
+      sources."once-1.4.0"
+      sources."onetime-1.1.0"
+      sources."optionator-0.8.2"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-json-4.0.0"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-parse-1.0.5"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pkg-conf-2.1.0"
+      sources."pkg-config-1.1.1"
+      sources."pluralize-1.2.1"
+      sources."prelude-ls-1.1.2"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."readable-stream-2.3.6"
+      sources."readline2-1.0.1"
+      sources."rechoir-0.6.2"
+      sources."require-uncached-1.0.3"
+      sources."resolve-1.8.1"
+      sources."resolve-from-1.0.1"
+      sources."restore-cursor-1.0.1"
+      sources."rimraf-2.6.2"
+      sources."run-async-0.1.0"
+      sources."run-parallel-1.1.9"
+      sources."rx-lite-3.1.2"
+      sources."safe-buffer-5.1.2"
+      sources."shelljs-0.7.8"
+      sources."slice-ansi-0.0.4"
+      sources."sprintf-js-1.0.3"
+      (sources."standard-engine-5.4.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-2.0.0"
+      (sources."table-3.8.3" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-2.1.1"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."text-table-0.2.0"
+      sources."through-2.3.8"
+      sources."type-check-0.3.2"
+      sources."typedarray-0.0.6"
+      sources."uniq-1.0.1"
+      sources."user-home-2.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."wordwrap-1.0.0"
+      sources."wrappy-1.0.2"
+      sources."write-0.2.1"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript Standard Style";
+      homepage = http://standardjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "string-loader-^0.0.1" = nodeEnv.buildNodePackage {
+    name = "string-loader";
+    packageName = "string-loader";
+    version = "0.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/string-loader/-/string-loader-0.0.1.tgz";
+      sha1 = "496f3cccc990213e0dd5411499f9ac6a6a6f2ff8";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "string loader for webpack";
+      homepage = "https://github.com/enmoon/string-loader#readme";
+      license = "ISC";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "style-loader-^0.13.1" = nodeEnv.buildNodePackage {
+    name = "style-loader";
+    packageName = "style-loader";
+    version = "0.13.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/style-loader/-/style-loader-0.13.2.tgz";
+      sha1 = "74533384cf698c7104c7951150b49717adc2f3bb";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "style loader module for webpack";
+      homepage = "https://github.com/webpack/style-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "url-loader-^0.5.7" = nodeEnv.buildNodePackage {
+    name = "url-loader";
+    packageName = "url-loader";
+    version = "0.5.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz";
+      sha512 = "B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==";
+    };
+    dependencies = [
+      sources."big.js-3.2.0"
+      sources."emojis-list-2.1.0"
+      sources."json5-0.5.1"
+      sources."loader-utils-1.1.0"
+      sources."mime-1.3.6"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "url loader module for webpack";
+      homepage = "https://github.com/webpack/url-loader#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "webpack-^1.14.0" = nodeEnv.buildNodePackage {
+    name = "webpack";
+    packageName = "webpack";
+    version = "1.15.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz";
+      sha1 = "4ff31f53db03339e55164a9d468ee0324968fe98";
+    };
+    dependencies = [
+      sources."acorn-3.3.0"
+      sources."align-text-0.1.4"
+      sources."amdefine-1.0.1"
+      sources."anymatch-1.3.2"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."array-unique-0.2.1"
+      (sources."assert-1.4.1" // {
+        dependencies = [
+          sources."inherits-2.0.1"
+          sources."util-0.10.3"
+        ];
+      })
+      sources."async-1.5.2"
+      sources."async-each-1.0.1"
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.3.0"
+      sources."big.js-3.2.0"
+      sources."binary-extensions-1.11.0"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."browserify-aes-0.4.0"
+      sources."browserify-zlib-0.1.4"
+      sources."buffer-4.9.1"
+      sources."builtin-status-codes-3.0.0"
+      sources."camelcase-1.2.1"
+      sources."center-align-0.1.3"
+      sources."chokidar-1.7.0"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."clone-1.0.4"
+      sources."concat-map-0.0.1"
+      sources."console-browserify-1.1.0"
+      sources."constants-browserify-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."crypto-browserify-3.3.0"
+      sources."date-now-0.1.4"
+      sources."decamelize-1.2.0"
+      sources."domain-browser-1.2.0"
+      sources."emojis-list-2.1.0"
+      (sources."enhanced-resolve-0.9.1" // {
+        dependencies = [
+          sources."memory-fs-0.2.0"
+        ];
+      })
+      sources."errno-0.1.7"
+      sources."events-1.1.1"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      sources."extglob-0.3.2"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."fsevents-1.2.4"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      sources."graceful-fs-4.1.11"
+      sources."has-flag-1.0.0"
+      sources."https-browserify-0.0.1"
+      sources."ieee754-1.1.12"
+      sources."indexof-0.0.1"
+      sources."inherits-2.0.3"
+      sources."interpret-0.6.6"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-glob-2.0.1"
+      sources."is-number-2.1.0"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."isarray-1.0.0"
+      sources."isobject-2.1.0"
+      sources."json5-0.5.1"
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-1.0.4"
+      sources."loader-utils-0.2.17"
+      sources."longest-1.0.1"
+      sources."math-random-1.0.1"
+      sources."memory-fs-0.3.0"
+      sources."micromatch-2.3.11"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."nan-2.10.0"
+      (sources."node-libs-browser-0.7.0" // {
+        dependencies = [
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."normalize-path-2.1.1"
+      sources."object-assign-4.1.1"
+      sources."object.omit-2.0.1"
+      sources."optimist-0.6.1"
+      sources."os-browserify-0.2.1"
+      sources."pako-0.2.9"
+      sources."parse-glob-3.0.4"
+      sources."path-browserify-0.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."pbkdf2-compat-2.0.1"
+      sources."preserve-0.2.0"
+      sources."process-0.11.10"
+      sources."process-nextick-args-2.0.0"
+      sources."prr-1.0.1"
+      sources."punycode-1.4.1"
+      sources."querystring-0.2.0"
+      sources."querystring-es3-0.2.1"
+      (sources."randomatic-3.0.0" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.1.0"
+      sources."regex-cache-0.4.4"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."right-align-0.1.3"
+      sources."ripemd160-0.2.0"
+      sources."safe-buffer-5.1.2"
+      sources."set-immediate-shim-1.0.1"
+      sources."setimmediate-1.0.5"
+      sources."sha.js-2.2.6"
+      sources."source-list-map-0.1.8"
+      sources."source-map-0.5.7"
+      sources."stream-browserify-2.0.1"
+      sources."stream-http-2.8.3"
+      sources."string_decoder-1.1.1"
+      sources."supports-color-3.2.3"
+      sources."tapable-0.1.10"
+      sources."timers-browserify-2.0.10"
+      sources."to-arraybuffer-1.0.1"
+      sources."tty-browserify-0.0.0"
+      (sources."uglify-js-2.7.5" // {
+        dependencies = [
+          sources."async-0.2.10"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      (sources."url-0.11.0" // {
+        dependencies = [
+          sources."punycode-1.3.2"
+        ];
+      })
+      sources."util-0.10.4"
+      sources."util-deprecate-1.0.2"
+      sources."vm-browserify-0.0.4"
+      (sources."watchpack-0.2.9" // {
+        dependencies = [
+          sources."async-0.9.2"
+        ];
+      })
+      (sources."webpack-core-0.6.9" // {
+        dependencies = [
+          sources."source-map-0.4.4"
+        ];
+      })
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.3"
+      sources."xtend-4.0.1"
+      sources."yargs-3.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.";
+      homepage = https://github.com/webpack/webpack;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "webpack-parallel-uglify-plugin-^0.2.0" = nodeEnv.buildNodePackage {
+    name = "webpack-parallel-uglify-plugin";
+    packageName = "webpack-parallel-uglify-plugin";
+    version = "0.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-0.2.0.tgz";
+      sha1 = "6daa575cdf7262a1b994ce037b216590b16d2f3d";
+    };
+    dependencies = [
+      sources."align-text-0.1.4"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."camelcase-1.2.1"
+      sources."center-align-0.1.3"
+      sources."cliui-2.1.0"
+      sources."concat-map-0.0.1"
+      sources."decamelize-1.2.0"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-buffer-1.1.6"
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-1.0.4"
+      sources."longest-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."once-1.4.0"
+      sources."os-tmpdir-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."right-align-0.1.3"
+      sources."source-list-map-0.1.8"
+      sources."source-map-0.5.7"
+      sources."tmp-0.0.29"
+      sources."uglify-js-2.8.29"
+      sources."uglify-to-browserify-1.0.2"
+      sources."webpack-sources-0.1.5"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.2"
+      sources."wrappy-1.0.2"
+      sources."yargs-3.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A webpack plugin to run uglifyjs in parallel.";
+      homepage = "https://github.com/gdborton/webpack-parallel-uglify-plugin#readme";
+      license = "ISC";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "eve-^0.5.4" = nodeEnv.buildNodePackage {
+    name = "eve";
+    packageName = "eve";
+    version = "0.5.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz";
+      sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Simple custom events";
+      homepage = "https://github.com/adobe-webplatform/eve#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "Idle.Js-git+https://github.com/shawnmclean/Idle.js" = nodeEnv.buildNodePackage {
+    name = "Idle.Js";
+    packageName = "Idle.Js";
+    version = "0.0.1";
+    src = fetchgit {
+      url = "https://github.com/shawnmclean/Idle.js";
+      rev = "db9beb3483a460ad638ec947867720f0ed066a62";
+      sha256 = "05f1b2d5b7013b48d80729fe0edf3a6b7c96ee5c55572f70e81b9593176648dd";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      license = "Apache 2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "archiver-^2.1.1" = nodeEnv.buildNodePackage {
+    name = "archiver";
+    packageName = "archiver";
+    version = "2.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/archiver/-/archiver-2.1.1.tgz";
+      sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc";
+    };
+    dependencies = [
+      sources."archiver-utils-1.3.0"
+      sources."async-2.6.1"
+      sources."balanced-match-1.0.0"
+      sources."base64-js-1.3.0"
+      sources."bl-1.2.2"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-5.2.0"
+      sources."buffer-alloc-1.2.0"
+      sources."buffer-alloc-unsafe-1.1.0"
+      sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-1.0.0"
+      sources."compress-commons-1.2.2"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."crc-3.8.0"
+      sources."crc32-stream-2.0.0"
+      sources."end-of-stream-1.4.1"
+      sources."fs-constants-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
+      sources."graceful-fs-4.1.11"
+      sources."ieee754-1.1.12"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."lazystream-1.0.0"
+      sources."lodash-4.17.10"
+      sources."minimatch-3.0.4"
+      sources."normalize-path-2.1.1"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."remove-trailing-separator-1.1.0"
+      sources."safe-buffer-5.1.2"
+      sources."string_decoder-1.1.1"
+      sources."tar-stream-1.6.1"
+      sources."to-buffer-1.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+      sources."zip-stream-1.2.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "a streaming interface for archive generation";
+      homepage = https://github.com/archiverjs/node-archiver;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "async-^2.1.4" = nodeEnv.buildNodePackage {
+    name = "async";
+    packageName = "async";
+    version = "2.6.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
+      sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
+    };
+    dependencies = [
+      sources."lodash-4.17.10"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Higher-order functions and common patterns for asynchronous code";
+      homepage = https://caolan.github.io/async/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "aws-sdk-^2.7.20" = nodeEnv.buildNodePackage {
+    name = "aws-sdk";
+    packageName = "aws-sdk";
+    version = "2.286.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.286.2.tgz";
+      sha512 = "46a/2+rGEgIlmUz08vZOkYFmZIgj+An/cc+Ngz9XBLkAZbx+3sBzOrxexrlVV69MPkMbckbeZjIq8NEJWV5gPw==";
+    };
+    dependencies = [
+      sources."base64-js-1.3.0"
+      sources."buffer-4.9.1"
+      sources."events-1.1.1"
+      sources."ieee754-1.1.8"
+      sources."isarray-1.0.0"
+      sources."jmespath-0.15.0"
+      sources."punycode-1.3.2"
+      sources."querystring-0.2.0"
+      sources."sax-1.2.1"
+      sources."url-0.10.3"
+      sources."uuid-3.1.0"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "AWS SDK for JavaScript";
+      homepage = https://github.com/aws/aws-sdk-js;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "base64url-^3.0.0" = nodeEnv.buildNodePackage {
+    name = "base64url";
+    packageName = "base64url";
+    version = "3.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/base64url/-/base64url-3.0.0.tgz";
+      sha512 = "LIVmqIrIWuiqTvn4RzcrwCOuHo2DD6tKmKBPXXlr4p4n4l6BZBkwFTIa3zu1XkX5MbZgro4a6BvPi+n2Mns5Gg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "For encoding to/from base64urls";
+      homepage = "https://github.com/brianloveswords/base64url#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "azure-storage-^2.7.0" = nodeEnv.buildNodePackage {
+    name = "azure-storage";
+    packageName = "azure-storage";
+    version = "2.10.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.10.1.tgz";
+      sha512 = "rnFo1uMIPtilusRCpK91tfY3P4Q7qRsDNwriXdp+OeTIGkGt0cTxL4mhqYfNPYPK+WBQmBdGWhOk+iROM05dcw==";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."browserify-mime-1.2.9"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."extend-1.2.1"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."hash-base-3.0.4"
+      sources."http-signature-1.2.0"
+      sources."inherits-2.0.3"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-edm-parser-0.1.2"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonparse-1.2.0"
+      sources."jsprim-1.4.1"
+      sources."md5.js-1.3.4"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."process-nextick-args-1.0.7"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.0.6"
+      (sources."request-2.87.0" // {
+        dependencies = [
+          sources."extend-3.0.2"
+        ];
+      })
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-0.5.8"
+      sources."sshpk-1.14.2"
+      sources."string_decoder-0.10.31"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."underscore-1.8.3"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."validator-9.4.1"
+      sources."verror-1.10.0"
+      sources."xml2js-0.2.8"
+      sources."xmlbuilder-0.4.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Microsoft Azure Storage Client Library for Node.js";
+      homepage = http://github.com/Azure/azure-storage-node;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "blueimp-md5-^2.6.0" = nodeEnv.buildNodePackage {
+    name = "blueimp-md5";
+    packageName = "blueimp-md5";
+    version = "2.10.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz";
+      sha512 = "EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript MD5 implementation. Compatible with server-side environments like Node.js, module loaders like RequireJS, Browserify or webpack and all web browsers.";
+      homepage = https://github.com/blueimp/JavaScript-MD5;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "body-parser-^1.15.2" = nodeEnv.buildNodePackage {
+    name = "body-parser";
+    packageName = "body-parser";
+    version = "1.18.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz";
+      sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
+    };
+    dependencies = [
+      sources."bytes-3.0.0"
+      sources."content-type-1.0.4"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."ee-first-1.1.1"
+      sources."http-errors-1.6.3"
+      sources."iconv-lite-0.4.23"
+      sources."inherits-2.0.3"
+      sources."media-typer-0.3.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."ms-2.0.0"
+      sources."on-finished-2.3.0"
+      sources."qs-6.5.2"
+      sources."raw-body-2.3.3"
+      sources."safer-buffer-2.1.2"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.5.0"
+      sources."type-is-1.6.16"
+      sources."unpipe-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js body parsing middleware";
+      homepage = "https://github.com/expressjs/body-parser#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "bootstrap-^3.3.7" = nodeEnv.buildNodePackage {
+    name = "bootstrap";
+    packageName = "bootstrap";
+    version = "3.3.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz";
+      sha1 = "5a389394549f23330875a3b150656574f8a9eb71";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The most popular front-end framework for developing responsive, mobile first projects on the web.";
+      homepage = http://getbootstrap.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "bootstrap-validator-^0.11.8" = nodeEnv.buildNodePackage {
+    name = "bootstrap-validator";
+    packageName = "bootstrap-validator";
+    version = "0.11.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz";
+      sha1 = "fb7058eef53623e78f5aa7967026f98f875a9404";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A user-friendly HTML5 Form validator for Bootstrap 3";
+      homepage = "https://github.com/1000hz/bootstrap-validator#readme";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "chance-^1.0.4" = nodeEnv.buildNodePackage {
+    name = "chance";
+    packageName = "chance";
+    version = "1.0.16";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/chance/-/chance-1.0.16.tgz";
+      sha512 = "2bgDHH5bVfAXH05SPtjqrsASzZ7h90yCuYT2z4mkYpxxYvJXiIydBFzVieVHZx7wLH1Ag2Azaaej2/zA1XUrNQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Chance - Utility library to generate anything random";
+      homepage = http://chancejs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "cheerio-^0.22.0" = nodeEnv.buildNodePackage {
+    name = "cheerio";
+    packageName = "cheerio";
+    version = "0.22.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
+      sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
+    };
+    dependencies = [
+      sources."boolbase-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."css-select-1.2.0"
+      sources."css-what-2.1.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.5.1"
+      sources."entities-1.1.1"
+      sources."htmlparser2-3.9.2"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."lodash.assignin-4.2.0"
+      sources."lodash.bind-4.2.1"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.filter-4.6.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.foreach-4.5.0"
+      sources."lodash.map-4.6.0"
+      sources."lodash.merge-4.6.1"
+      sources."lodash.pick-4.4.0"
+      sources."lodash.reduce-4.6.0"
+      sources."lodash.reject-4.6.0"
+      sources."lodash.some-4.6.0"
+      sources."nth-check-1.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."safe-buffer-5.1.2"
+      sources."string_decoder-1.1.1"
+      sources."util-deprecate-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Tiny, fast, and elegant implementation of core jQuery designed specifically for the server";
+      homepage = "https://github.com/cheeriojs/cheerio#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "codemirror-git+https://github.com/hackmdio/CodeMirror.git" = nodeEnv.buildNodePackage {
+    name = "codemirror";
+    packageName = "codemirror";
+    version = "5.39.1";
+    src = fetchgit {
+      url = "https://github.com/hackmdio/CodeMirror.git";
+      rev = "df412731ed3923124f9a43f60e84bdf855eb843a";
+      sha256 = "3c5a6813c29893301836773c3ed122ec868840432b16d2936a4deab419e3620b";
+    };
+    dependencies = [
+      sources."acorn-5.7.1"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      (sources."acorn-object-spread-1.0.0" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      sources."ajv-5.5.2"
+      sources."align-text-0.1.4"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-1.0.0"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."blint-1.0.3"
+      sources."brace-expansion-1.1.11"
+      (sources."buble-0.15.2" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."minimist-1.2.0"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."buffer-from-1.1.1"
+      sources."camelcase-1.2.1"
+      sources."caseless-0.12.0"
+      sources."center-align-0.1.3"
+      sources."chalk-0.4.0"
+      sources."cliui-2.1.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."es6-promise-4.2.4"
+      sources."escape-string-regexp-1.0.5"
+      sources."estree-walker-0.2.1"
+      sources."extend-3.0.2"
+      sources."extract-zip-1.6.7"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fd-slicer-1.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-extra-1.0.0"
+      sources."getpass-0.1.7"
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."has-ansi-2.0.0"
+      sources."has-color-0.1.7"
+      sources."hasha-2.2.0"
+      sources."http-signature-1.2.0"
+      sources."inherits-2.0.3"
+      sources."is-buffer-1.1.6"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kew-0.7.0"
+      sources."kind-of-3.2.2"
+      sources."klaw-1.3.1"
+      sources."lazy-cache-1.0.4"
+      sources."longest-1.0.1"
+      sources."magic-string-0.14.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."node-static-0.6.0"
+      sources."nomnom-1.8.1"
+      sources."oauth-sign-0.8.2"
+      sources."os-homedir-1.0.2"
+      sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
+      sources."phantomjs-prebuilt-2.1.16"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."repeat-string-1.6.1"
+      sources."request-2.87.0"
+      sources."request-progress-2.0.1"
+      sources."require-relative-0.8.7"
+      sources."right-align-0.1.3"
+      sources."rollup-0.41.6"
+      sources."rollup-plugin-buble-0.15.0"
+      sources."rollup-pluginutils-1.5.2"
+      sources."rollup-watch-3.2.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."source-map-0.5.7"
+      sources."source-map-support-0.4.18"
+      sources."sshpk-1.14.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-0.1.1"
+      sources."supports-color-2.0.0"
+      sources."throttleit-1.0.0"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."uglify-js-2.8.29"
+      sources."uglify-to-browserify-1.0.2"
+      sources."underscore-1.6.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."vlq-0.2.3"
+      sources."which-1.3.1"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.2"
+      sources."yargs-3.10.0"
+      sources."yauzl-2.4.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Full-featured in-browser code editor";
+      homepage = http://codemirror.net/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "compression-^1.6.2" = nodeEnv.buildNodePackage {
+    name = "compression";
+    packageName = "compression";
+    version = "1.7.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz";
+      sha512 = "HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==";
+    };
+    dependencies = [
+      sources."accepts-1.3.5"
+      sources."bytes-3.0.0"
+      sources."compressible-2.0.14"
+      sources."debug-2.6.9"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.1"
+      sources."on-headers-1.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."vary-1.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js compression middleware";
+      homepage = "https://github.com/expressjs/compression#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "connect-flash-^0.1.1" = nodeEnv.buildNodePackage {
+    name = "connect-flash";
+    packageName = "connect-flash";
+    version = "0.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
+      sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Flash message middleware for Connect.";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "connect-session-sequelize-^4.1.0" = nodeEnv.buildNodePackage {
+    name = "connect-session-sequelize";
+    packageName = "connect-session-sequelize";
+    version = "4.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/connect-session-sequelize/-/connect-session-sequelize-4.1.0.tgz";
+      sha1 = "d402749c3bebd79209192c164c090742b3fe2011";
+    };
+    dependencies = [
+      sources."debug-2.6.9"
+      sources."deep-equal-1.0.1"
+      sources."ms-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Session store for connect-session using sequelize";
+      homepage = https://github.com/mweibel/connect-session-sequelize;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "cookie-0.3.1" = nodeEnv.buildNodePackage {
+    name = "cookie";
+    packageName = "cookie";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz";
+      sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "HTTP server cookie parsing and serialization";
+      homepage = https://github.com/jshttp/cookie;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "cookie-parser-1.4.3" = nodeEnv.buildNodePackage {
+    name = "cookie-parser";
+    packageName = "cookie-parser";
+    version = "1.4.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
+      sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
+    };
+    dependencies = [
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "cookie parsing with signatures";
+      homepage = https://github.com/expressjs/cookie-parser;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "deep-freeze-^0.0.1" = nodeEnv.buildNodePackage {
+    name = "deep-freeze";
+    packageName = "deep-freeze";
+    version = "0.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz";
+      sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "recursively Object.freeze() objects and functions";
+      homepage = https://github.com/substack/deep-freeze;
+      license = "public domain";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "diff-match-patch-git+https://github.com/hackmdio/diff-match-patch.git" = nodeEnv.buildNodePackage {
+    name = "diff-match-patch";
+    packageName = "diff-match-patch";
+    version = "1.1.0";
+    src = fetchgit {
+      url = "https://github.com/hackmdio/diff-match-patch.git";
+      rev = "73e56e779a2a8503b05458e607077d0fd1d80419";
+      sha256 = "2ea9013d983e96621b447f40ca983f697ad355a9ed9dc48f5ab42fa1f183937f";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "npm package for https://code.google.com/p/google-diff-match-patch/";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "ejs-^2.5.5" = nodeEnv.buildNodePackage {
+    name = "ejs";
+    packageName = "ejs";
+    version = "2.6.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz";
+      sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Embedded JavaScript templates";
+      homepage = https://github.com/mde/ejs;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "emojify.js-~1.1.0" = nodeEnv.buildNodePackage {
+    name = "emojify.js";
+    packageName = "emojify.js";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/emojify.js/-/emojify.js-1.1.0.tgz";
+      sha1 = "079fff223307c9007f570785e8e4935d5c398beb";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A Javascript module to convert emoji keywords to images.";
+      homepage = "https://github.com/hassankhan/emojify.js#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "express->=4.14" = nodeEnv.buildNodePackage {
+    name = "express";
+    packageName = "express";
+    version = "4.16.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz";
+      sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
+    };
+    dependencies = [
+      sources."accepts-1.3.5"
+      sources."array-flatten-1.1.1"
+      sources."body-parser-1.18.2"
+      sources."bytes-3.0.0"
+      sources."content-disposition-0.5.2"
+      sources."content-type-1.0.4"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."finalhandler-1.1.1"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."http-errors-1.6.3"
+      sources."iconv-lite-0.4.19"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.8.0"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.4.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.1"
+      sources."on-finished-2.3.0"
+      sources."parseurl-1.3.2"
+      sources."path-to-regexp-0.1.7"
+      sources."proxy-addr-2.0.4"
+      sources."qs-6.5.1"
+      sources."range-parser-1.2.0"
+      (sources."raw-body-2.3.2" // {
+        dependencies = [
+          sources."depd-1.1.1"
+          sources."http-errors-1.6.2"
+          sources."setprototypeof-1.0.3"
+        ];
+      })
+      sources."safe-buffer-5.1.1"
+      sources."send-0.16.2"
+      sources."serve-static-1.13.2"
+      sources."setprototypeof-1.1.0"
+      sources."statuses-1.4.0"
+      sources."type-is-1.6.16"
+      sources."unpipe-1.0.0"
+      sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Fast, unopinionated, minimalist web framework";
+      homepage = http://expressjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "express-session-^1.14.2" = nodeEnv.buildNodePackage {
+    name = "express-session";
+    packageName = "express-session";
+    version = "1.15.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz";
+      sha512 = "r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==";
+    };
+    dependencies = [
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."crc-3.4.4"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."ms-2.0.0"
+      sources."on-headers-1.0.1"
+      sources."parseurl-1.3.2"
+      sources."random-bytes-1.0.0"
+      sources."uid-safe-2.1.5"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Simple session middleware for Express";
+      homepage = "https://github.com/expressjs/session#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "file-saver-^1.3.3" = nodeEnv.buildNodePackage {
+    name = "file-saver";
+    packageName = "file-saver";
+    version = "1.3.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/file-saver/-/file-saver-1.3.8.tgz";
+      sha512 = "spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An HTML5 saveAs() FileSaver implementation";
+      homepage = "https://github.com/eligrey/FileSaver.js#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "flowchart.js-^1.6.4" = nodeEnv.buildNodePackage {
+    name = "flowchart.js";
+    packageName = "flowchart.js";
+    version = "1.11.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/flowchart.js/-/flowchart.js-1.11.3.tgz";
+      sha512 = "Hk5vKKsEjYp/Vt4gSRBx39z+6OLwkg3top/EQ4antpZXCVrHLajVGWEqhCPeEBixhzDxAtHdRn4aFEtRhlTzHA==";
+    };
+    dependencies = [
+      sources."eve-raphael-0.5.0"
+      sources."raphael-2.2.7"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "[![JS.ORG](https://img.shields.io/badge/js.org-flowchart-ffb400.svg?style=flat-square)](http://js.org)";
+      homepage = http://flowchart.js.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "font-awesome-^4.7.0" = nodeEnv.buildNodePackage {
+    name = "font-awesome";
+    packageName = "font-awesome";
+    version = "4.7.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz";
+      sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The iconic font and CSS framework";
+      homepage = http://fontawesome.io/;
+      license = "(OFL-1.1 AND MIT)";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "formidable-^1.0.17" = nodeEnv.buildNodePackage {
+    name = "formidable";
+    packageName = "formidable";
+    version = "1.2.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
+      sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A node.js module for parsing form data, especially file uploads.";
+      homepage = https://github.com/felixge/node-formidable;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "gist-embed-~2.6.0" = nodeEnv.buildNodePackage {
+    name = "gist-embed";
+    packageName = "gist-embed";
+    version = "2.6.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gist-embed/-/gist-embed-2.6.0.tgz";
+      sha1 = "1ea95703fa1fc2a1255419f6f06c67e9920649ab";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Ultra powered gist embedding for your website";
+      homepage = "https://github.com/blairvanderhoof/gist-embed#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "graceful-fs-^4.1.11" = nodeEnv.buildNodePackage {
+    name = "graceful-fs";
+    packageName = "graceful-fs";
+    version = "4.1.11";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
+      sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A drop-in replacement for fs, making various improvements.";
+      homepage = "https://github.com/isaacs/node-graceful-fs#readme";
+      license = "ISC";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "handlebars-^4.0.6" = nodeEnv.buildNodePackage {
+    name = "handlebars";
+    packageName = "handlebars";
+    version = "4.0.11";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz";
+      sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
+    };
+    dependencies = [
+      sources."align-text-0.1.4"
+      sources."amdefine-1.0.1"
+      sources."async-1.5.2"
+      sources."camelcase-1.2.1"
+      sources."center-align-0.1.3"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."is-buffer-1.1.6"
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-1.0.4"
+      sources."longest-1.0.1"
+      sources."minimist-0.0.10"
+      sources."optimist-0.6.1"
+      sources."repeat-string-1.6.1"
+      sources."right-align-0.1.3"
+      sources."source-map-0.4.4"
+      (sources."uglify-js-2.8.29" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."uglify-to-browserify-1.0.2"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.3"
+      sources."yargs-3.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration";
+      homepage = http://www.handlebarsjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "helmet-^3.3.0" = nodeEnv.buildNodePackage {
+    name = "helmet";
+    packageName = "helmet";
+    version = "3.13.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/helmet/-/helmet-3.13.0.tgz";
+      sha512 = "rCYnlbOBkeP6fCo4sXZNu91vIAWlbVgolwnUANtnzPANRf2kJZ2a6yjRnCqG23Tyl2/ExvJ8bDg4xUdNCIWnrw==";
+    };
+    dependencies = [
+      sources."camelize-1.0.0"
+      sources."content-security-policy-builder-2.0.0"
+      sources."dasherize-2.0.0"
+      sources."dns-prefetch-control-0.1.0"
+      sources."dont-sniff-mimetype-1.0.0"
+      sources."expect-ct-0.1.1"
+      sources."frameguard-3.0.0"
+      sources."helmet-crossdomain-0.3.0"
+      sources."helmet-csp-2.7.1"
+      sources."hide-powered-by-1.0.0"
+      sources."hpkp-2.0.0"
+      sources."hsts-2.1.0"
+      sources."ienoopen-1.0.0"
+      sources."nocache-2.0.0"
+      sources."platform-1.3.5"
+      sources."referrer-policy-1.1.0"
+      sources."x-xss-protection-1.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "help secure Express/Connect apps with various HTTP headers";
+      homepage = https://helmetjs.github.io/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "highlight.js-~9.12.0" = nodeEnv.buildNodePackage {
+    name = "highlight.js";
+    packageName = "highlight.js";
+    version = "9.12.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
+      sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Syntax highlighting with language autodetection.";
+      homepage = https://highlightjs.org/;
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "i18n-^0.8.3" = nodeEnv.buildNodePackage {
+    name = "i18n";
+    packageName = "i18n";
+    version = "0.8.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/i18n/-/i18n-0.8.3.tgz";
+      sha1 = "2d8cf1c24722602c2041d01ba6ae5eaa51388f0e";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      (sources."ambi-2.5.0" // {
+        dependencies = [
+          sources."typechecker-4.5.0"
+        ];
+      })
+      sources."async-1.5.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."csextends-1.2.0"
+      sources."debug-3.1.0"
+      sources."eachr-2.0.4"
+      sources."editions-1.3.4"
+      (sources."extendr-2.1.0" // {
+        dependencies = [
+          sources."typechecker-2.0.8"
+        ];
+      })
+      (sources."extract-opts-2.2.0" // {
+        dependencies = [
+          sources."typechecker-2.0.8"
+        ];
+      })
+      sources."glob-6.0.4"
+      sources."graceful-fs-4.1.11"
+      sources."ignorefs-1.2.0"
+      sources."ignorepatterns-1.1.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."make-plural-3.0.6"
+      sources."math-interval-parser-1.1.0"
+      sources."messageformat-0.3.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."mustache-2.3.0"
+      sources."nopt-3.0.6"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."safefs-3.2.2"
+      sources."scandirectory-2.5.0"
+      sources."sprintf-js-1.1.1"
+      sources."taskgroup-4.3.1"
+      sources."typechecker-2.1.0"
+      sources."watchr-2.4.13"
+      sources."wrappy-1.0.2"
+      sources."xregexp-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "lightweight translation module with dynamic json storage";
+      homepage = http://github.com/mashpie/i18n-node;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "imgur-git+https://github.com/hackmdio/node-imgur.git" = nodeEnv.buildNodePackage {
+    name = "imgur";
+    packageName = "imgur";
+    version = "0.2.0";
+    src = fetchgit {
+      url = "https://github.com/hackmdio/node-imgur.git";
+      rev = "0fba6d163428c946942cd2c3022634cbb8754e38";
+      sha256 = "b7dc96b2ccefdca42dca10138d3121b405b2b7e70ffa055ce225ad63bc3f3c7a";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."brace-expansion-1.1.11"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.16.0"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."glob-4.5.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-2.0.10"
+      sources."oauth-sign-0.8.2"
+      sources."once-1.4.0"
+      sources."performance-now-2.1.0"
+      sources."punycode-1.4.1"
+      sources."q-1.5.1"
+      sources."qs-6.5.2"
+      sources."request-2.87.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Upload images to imgur.com";
+      homepage = https://github.com/kaimallea/node-imgur;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "ionicons-~2.0.1" = nodeEnv.buildNodePackage {
+    name = "ionicons";
+    packageName = "ionicons";
+    version = "2.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ionicons/-/ionicons-2.0.1.tgz";
+      sha1 = "ca398113293ea870244f538f0aabbd4b5b209a3e";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Ionicons - free and beautiful icons from the creators of Ionic Framework";
+      homepage = "https://github.com/driftyco/ionicons#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "jquery-^3.1.1" = nodeEnv.buildNodePackage {
+    name = "jquery";
+    packageName = "jquery";
+    version = "3.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz";
+      sha512 = "Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript library for DOM operations";
+      homepage = https://jquery.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "jquery-mousewheel-^3.1.13" = nodeEnv.buildNodePackage {
+    name = "jquery-mousewheel";
+    packageName = "jquery-mousewheel";
+    version = "3.1.13";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz";
+      sha1 = "06f0335f16e353a695e7206bf50503cb523a6ee5";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A jQuery plugin that adds cross-browser mouse wheel support.";
+      homepage = https://github.com/jquery/jquery-mousewheel;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "jquery-ui-^1.12.1" = nodeEnv.buildNodePackage {
+    name = "jquery-ui";
+    packageName = "jquery-ui";
+    version = "1.12.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz";
+      sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.";
+      homepage = http://jqueryui.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "js-cookie-^2.1.3" = nodeEnv.buildNodePackage {
+    name = "js-cookie";
+    packageName = "js-cookie";
+    version = "2.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz";
+      sha1 = "1b2c279a6eece380a12168b92485265b35b1effb";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A simple, lightweight JavaScript API for handling cookies";
+      homepage = "https://github.com/js-cookie/js-cookie#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "js-sequence-diagrams-^1000000.0.6" = nodeEnv.buildNodePackage {
+    name = "js-sequence-diagrams";
+    packageName = "js-sequence-diagrams";
+    version = "1000000.0.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-sequence-diagrams/-/js-sequence-diagrams-1000000.0.6.tgz";
+      sha1 = "e95db01420479c5ccbc12046af1da42fde649e5c";
+    };
+    dependencies = [
+      sources."eve-git://github.com/adobe-webplatform/eve.git#eef80ed"
+      sources."raphael-2.1.4"
+      sources."underscore-1.4.4"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Fucks NPM and draws simple SVG sequence diagrams from textual representation of the diagram";
+      homepage = "https://github.com/Moeditor/js-sequence-diagrams#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "js-url-^2.3.0" = nodeEnv.buildNodePackage {
+    name = "js-url";
+    packageName = "js-url";
+    version = "2.3.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-url/-/js-url-2.3.0.tgz";
+      sha1 = "e0c02b622e89710749399f440d49056e72f70078";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."caseless-0.12.0"
+      sources."chalk-1.1.3"
+      sources."cli-1.0.1"
+      sources."co-4.6.0"
+      sources."colors-1.0.3"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.16.0"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."console-browserify-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."cycle-1.0.3"
+      sources."dashdash-1.14.1"
+      sources."date-now-0.1.4"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.3.0"
+      sources."domutils-1.5.1"
+      sources."duplexer-0.1.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."entities-1.0.0"
+      sources."es6-promise-4.2.4"
+      sources."escape-string-regexp-1.0.5"
+      sources."eventemitter2-0.4.14"
+      sources."exit-0.1.2"
+      sources."extend-3.0.2"
+      sources."extract-zip-1.6.7"
+      sources."extsprintf-1.3.0"
+      sources."eyes-0.1.8"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fd-slicer-1.0.1"
+      sources."figures-1.7.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-extra-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.2"
+      sources."graceful-fs-4.1.11"
+      sources."grunt-contrib-jshint-1.1.0"
+      sources."grunt-contrib-qunit-2.0.0"
+      sources."grunt-contrib-uglify-3.4.0"
+      sources."grunt-lib-phantomjs-1.1.0"
+      sources."gzip-size-3.0.0"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."has-ansi-2.0.0"
+      sources."hasha-2.2.0"
+      sources."hooker-0.2.3"
+      (sources."htmlparser2-3.8.3" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."jshint-2.9.6"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kew-0.7.0"
+      sources."klaw-1.3.1"
+      sources."lodash-4.17.10"
+      sources."maxmin-2.1.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."package-1.0.1"
+      sources."path-is-absolute-1.0.1"
+      sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
+      sources."phantom-4.0.12"
+      sources."phantomjs-prebuilt-2.1.16"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pretty-bytes-3.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."request-2.87.0"
+      sources."request-progress-2.0.1"
+      sources."rimraf-2.6.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.5.0"
+      sources."shelljs-0.3.0"
+      sources."source-map-0.6.1"
+      sources."split-1.0.1"
+      sources."sshpk-1.14.2"
+      sources."stack-trace-0.0.10"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-1.0.4"
+      sources."supports-color-2.0.0"
+      sources."temporary-0.0.8"
+      sources."throttleit-1.0.0"
+      sources."through-2.3.8"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."uglify-js-3.4.6"
+      sources."unicode-5.2.0-0.7.5"
+      sources."uri-path-1.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."winston-2.4.3"
+      sources."wrappy-1.0.2"
+      sources."yauzl-2.4.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A simple, lightweight url parser for JavaScript (~1.7 Kb minified, ~0.7Kb gzipped).";
+      homepage = https://github.com/WillZWL/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "js-yaml-^3.7.0" = nodeEnv.buildNodePackage {
+    name = "js-yaml";
+    packageName = "js-yaml";
+    version = "3.12.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
+      sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
+    };
+    dependencies = [
+      sources."argparse-1.0.10"
+      sources."esprima-4.0.1"
+      sources."sprintf-js-1.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "YAML 1.2 parser and serializer";
+      homepage = https://github.com/nodeca/js-yaml;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "jsdom-nogyp-^0.8.3" = nodeEnv.buildNodePackage {
+    name = "jsdom-nogyp";
+    packageName = "jsdom-nogyp";
+    version = "0.8.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsdom-nogyp/-/jsdom-nogyp-0.8.3.tgz";
+      sha1 = "924b3f03cfe487dfcdf6375e6324252ceb80d0cc";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."cssom-0.2.5"
+      (sources."cssstyle-0.2.37" // {
+        dependencies = [
+          sources."cssom-0.3.4"
+        ];
+      })
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+        ];
+      })
+      sources."domelementtype-1.3.0"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.7.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."entities-1.1.1"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."htmlparser2-3.9.2"
+      sources."http-signature-1.2.0"
+      sources."inherits-2.0.3"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."nwmatcher-1.3.9"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."process-nextick-args-2.0.0"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."request-2.87.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
+      sources."string_decoder-1.1.1"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."xmlhttprequest-1.8.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A JavaScript implementation of the W3C DOM, forked from jsdom, remove dependencies to contextify and node-gyp";
+      license = {
+        type = "MIT";
+        url = "http://github.com/tmpvar/jsdom/blob/master/LICENSE.txt";
+      };
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "keymaster-^1.6.2" = nodeEnv.buildNodePackage {
+    name = "keymaster";
+    packageName = "keymaster";
+    version = "1.6.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/keymaster/-/keymaster-1.6.2.tgz";
+      sha1 = "e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "library for defining and dispatching keyboard shortcuts";
+      homepage = https://github.com/madrobby/keymaster;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "list.js-^1.5.0" = nodeEnv.buildNodePackage {
+    name = "list.js";
+    packageName = "list.js";
+    version = "1.5.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/list.js/-/list.js-1.5.0.tgz";
+      sha1 = "a4cbfc8281ddefc02fdb2d30c8748bfae25fbcda";
+    };
+    dependencies = [
+      sources."string-natural-compare-2.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The perfect library for lists. Supports search, sort, filters and flexibility. Built to be invisible and work on existing HTML";
+      homepage = http://listjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "lodash-^4.17.4" = nodeEnv.buildNodePackage {
+    name = "lodash";
+    packageName = "lodash";
+    version = "4.17.10";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+      sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Lodash modular utilities.";
+      homepage = https://lodash.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "lz-string-1.4.4" = nodeEnv.buildNodePackage {
+    name = "lz-string";
+    packageName = "lz-string";
+    version = "1.4.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz";
+      sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "LZ-based compression algorithm";
+      homepage = http://pieroxy.net/blog/pages/lz-string/index.html;
+      license = "WTFPL";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-^8.2.2" = nodeEnv.buildNodePackage {
+    name = "markdown-it";
+    packageName = "markdown-it";
+    version = "8.4.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz";
+      sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==";
+    };
+    dependencies = [
+      sources."argparse-1.0.10"
+      sources."entities-1.1.1"
+      sources."linkify-it-2.0.3"
+      sources."mdurl-1.0.1"
+      sources."sprintf-js-1.0.3"
+      sources."uc.micro-1.0.5"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Markdown-it - modern pluggable markdown parser.";
+      homepage = "https://github.com/markdown-it/markdown-it#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-abbr-^1.0.4" = nodeEnv.buildNodePackage {
+    name = "markdown-it-abbr";
+    packageName = "markdown-it-abbr";
+    version = "1.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz";
+      sha1 = "d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<abbr> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-abbr;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-container-^2.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-container";
+    packageName = "markdown-it-container";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-2.0.0.tgz";
+      sha1 = "0019b43fd02eefece2f1960a2895fba81a404695";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Plugin to create block-level custom containers for markdown-it markdown parser";
+      homepage = "https://github.com/markdown-it/markdown-it-container#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-deflist-^2.0.1" = nodeEnv.buildNodePackage {
+    name = "markdown-it-deflist";
+    packageName = "markdown-it-deflist";
+    version = "2.0.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz";
+      sha512 = "/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<dl> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-deflist;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-emoji-^1.3.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-emoji";
+    packageName = "markdown-it-emoji";
+    version = "1.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz";
+      sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Emoji plugin for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-emoji;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-footnote-^3.0.1" = nodeEnv.buildNodePackage {
+    name = "markdown-it-footnote";
+    packageName = "markdown-it-footnote";
+    version = "3.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.1.tgz";
+      sha1 = "7f3730747cacc86e2fe0bf8a17a710f34791517a";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Footnotes for markdown-it markdown parser.";
+      homepage = "https://github.com/markdown-it/markdown-it-footnote#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-imsize-^2.0.1" = nodeEnv.buildNodePackage {
+    name = "markdown-it-imsize";
+    packageName = "markdown-it-imsize";
+    version = "2.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-imsize/-/markdown-it-imsize-2.0.1.tgz";
+      sha1 = "cca0427905d05338a247cb9ca9d968c5cddd5170";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Markdown-it plugin to specify image size";
+      homepage = https://github.com/tatsy/markdown-it-imsize;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-ins-^2.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-ins";
+    packageName = "markdown-it-ins";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-2.0.0.tgz";
+      sha1 = "a5aa6a30f1e2f71e9497567cfdff40f1fde67483";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<ins> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-ins;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-mark-^2.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-mark";
+    packageName = "markdown-it-mark";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-2.0.0.tgz";
+      sha1 = "46a1aa947105aed8188978e0a016179e404f42c7";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<mark> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-mark;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-mathjax-^2.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-mathjax";
+    packageName = "markdown-it-mathjax";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-mathjax/-/markdown-it-mathjax-2.0.0.tgz";
+      sha1 = "ae2b4f4c5c719a03f9e475c664f7b2685231d9e9";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "[![Build Status](https://img.shields.io/travis/classeur/markdown-it-mathjax/master.svg?style=flat)](https://travis-ci.org/classeur/markdown-it-mathjax) [![NPM version](https://img.shields.io/npm/v/markdown-it-mathjax.svg?style=flat)](https://www.npmjs.org";
+      homepage = "https://github.com/classeur/markdown-it-mathjax#readme";
+      license = "ISC";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-regexp-^0.4.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-regexp";
+    packageName = "markdown-it-regexp";
+    version = "0.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz";
+      sha1 = "d64d713eecec55ce4cfdeb321750ecc099e2c2dc";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "plugin that makes regexp replacement simple";
+      homepage = https://github.com/rlidwka/markdown-it-regexp;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-sub-^1.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-sub";
+    packageName = "markdown-it-sub";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz";
+      sha1 = "375fd6026eae7ddcb012497f6411195ea1e3afe8";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<sub> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-sub;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-it-sup-^1.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-it-sup";
+    packageName = "markdown-it-sup";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz";
+      sha1 = "cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "<sup> tag for markdown-it markdown parser.";
+      homepage = https://github.com/markdown-it/markdown-it-sup;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "markdown-pdf-^8.0.0" = nodeEnv.buildNodePackage {
+    name = "markdown-pdf";
+    packageName = "markdown-pdf";
+    version = "8.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/markdown-pdf/-/markdown-pdf-8.1.1.tgz";
+      sha512 = "lpRyiNptdwArH6bG6Y8X13G5Qr/usTTDXxTp7zjhwxJ+cQO7Z6A1T265ZiN6PVDLzRNxxtcquQCIOpTC0U1NFg==";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."argparse-0.1.16"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-1.5.2"
+      sources."asynckit-0.4.0"
+      sources."autolinker-0.15.3"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."buffer-from-1.1.1"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.16.0"
+      sources."concat-stream-1.6.2"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."duplexer-0.1.1"
+      sources."ecc-jsbn-0.1.2"
+      sources."es6-promise-4.2.4"
+      sources."extend-3.0.2"
+      sources."extract-zip-1.6.7"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fd-slicer-1.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-extra-1.0.0"
+      sources."getpass-0.1.7"
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."hasha-2.2.0"
+      sources."highlight.js-9.12.0"
+      sources."http-signature-1.2.0"
+      sources."inherits-2.0.3"
+      sources."is-stream-1.1.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kew-0.7.0"
+      sources."klaw-1.3.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."oauth-sign-0.8.2"
+      sources."os-tmpdir-1.0.2"
+      sources."pend-1.2.0"
+      sources."performance-now-2.1.0"
+      sources."phantomjs-prebuilt-2.1.16"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."process-nextick-args-2.0.0"
+      sources."progress-1.1.8"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."remarkable-1.7.1"
+      sources."request-2.87.0"
+      sources."request-progress-2.0.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."series-stream-1.0.1"
+      sources."sshpk-1.14.2"
+      sources."stream-from-to-1.4.3"
+      sources."string_decoder-1.1.1"
+      sources."throttleit-1.0.0"
+      sources."through2-2.0.3"
+      sources."tmp-0.0.33"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typedarray-0.0.6"
+      sources."underscore-1.7.0"
+      sources."underscore.string-2.4.0"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."which-1.3.1"
+      sources."xtend-4.0.1"
+      sources."yauzl-2.4.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Markdown to PDF converter";
+      homepage = https://github.com/alanshaw/markdown-pdf;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "mathjax-~2.7.0" = nodeEnv.buildNodePackage {
+    name = "mathjax";
+    packageName = "mathjax";
+    version = "2.7.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz";
+      sha512 = "OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers.";
+      homepage = "https://github.com/mathjax/MathJax#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "mermaid-~7.1.0" = nodeEnv.buildNodePackage {
+    name = "mermaid";
+    packageName = "mermaid";
+    version = "7.1.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mermaid/-/mermaid-7.1.2.tgz";
+      sha512 = "bDLu3fQuf3/R0fNkNzB0GTaF7+6SxnZpfTs9DVQF1ougsuP23MBzvEIGfL0ML8zeyg7+J2D+0AaoLVhskW5ulw==";
+    };
+    dependencies = [
+      sources."d3-3.5.17"
+      sources."dagre-d3-renderer-0.4.26"
+      sources."dagre-layout-0.8.8"
+      sources."graphlib-2.1.5"
+      sources."graphlibrary-2.2.0"
+      sources."he-1.1.1"
+      sources."lodash-4.17.10"
+      sources."moment-2.22.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.";
+      homepage = "https://github.com/knsv/mermaid#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "mattermost-^3.4.0" = nodeEnv.buildNodePackage {
+    name = "mattermost";
+    packageName = "mattermost";
+    version = "3.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mattermost/-/mattermost-3.4.0.tgz";
+      sha1 = "7e4958e1bc96c7da7bc5f179dd2c6ae5035a8857";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."combined-stream-1.0.6"
+      sources."component-emitter-1.2.1"
+      sources."cookiejar-2.0.6"
+      sources."core-util-is-1.0.2"
+      sources."debug-2.6.9"
+      sources."delayed-stream-1.0.0"
+      sources."extend-3.0.0"
+      sources."form-data-1.0.0-rc3"
+      sources."formidable-1.0.17"
+      sources."inherits-2.0.3"
+      sources."isarray-0.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.3.4"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."ms-2.0.0"
+      sources."qs-2.3.3"
+      sources."readable-stream-1.0.27-1"
+      sources."reduce-component-1.0.1"
+      sources."string_decoder-0.10.31"
+      sources."superagent-1.8.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Javascript library for interacting with the Mattermost API";
+      homepage = https://www.mattermost.org/;
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "meta-marked-^0.4.2" = nodeEnv.buildNodePackage {
+    name = "meta-marked";
+    packageName = "meta-marked";
+    version = "0.4.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/meta-marked/-/meta-marked-0.4.2.tgz";
+      sha1 = "4a1fae344f53d7040aacabb723e2f432a37455f8";
+    };
+    dependencies = [
+      sources."argparse-1.0.10"
+      sources."esprima-2.7.3"
+      sources."js-yaml-3.5.5"
+      sources."marked-0.3.19"
+      sources."sprintf-js-1.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The 'marked' markdown processor with a simple metadata system.";
+      homepage = "https://github.com/j201/meta-marked#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "method-override-^2.3.7" = nodeEnv.buildNodePackage {
+    name = "method-override";
+    packageName = "method-override";
+    version = "2.3.10";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz";
+      sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4";
+    };
+    dependencies = [
+      sources."debug-2.6.9"
+      sources."methods-1.1.2"
+      sources."ms-2.0.0"
+      sources."parseurl-1.3.2"
+      sources."vary-1.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Override HTTP verbs";
+      homepage = "https://github.com/expressjs/method-override#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "minimist-^1.2.0" = nodeEnv.buildNodePackage {
+    name = "minimist";
+    packageName = "minimist";
+    version = "1.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "parse argument options";
+      homepage = https://github.com/substack/minimist;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "minio-^6.0.0" = nodeEnv.buildNodePackage {
+    name = "minio";
+    packageName = "minio";
+    version = "6.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/minio/-/minio-6.0.0.tgz";
+      sha1 = "7e514d38eaacf2264556b232f1c2c063cc6ca7ba";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."block-stream2-1.1.0"
+      sources."buffer-from-1.1.1"
+      sources."concat-stream-1.6.2"
+      sources."core-util-is-1.0.2"
+      sources."defined-1.0.0"
+      sources."es6-error-2.1.1"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."json-stream-1.0.0"
+      sources."lodash-4.17.10"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."process-nextick-args-2.0.0"
+      sources."querystring-0.2.0"
+      sources."readable-stream-2.3.6"
+      sources."safe-buffer-5.1.2"
+      sources."sax-1.2.4"
+      sources."source-map-0.5.7"
+      sources."source-map-support-0.4.18"
+      sources."string_decoder-1.1.1"
+      (sources."through2-0.6.5" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.0.34"
+          sources."string_decoder-0.10.31"
+        ];
+      })
+      sources."typedarray-0.0.6"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."xml-1.0.1"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "S3 Compatible Cloud Storage client";
+      homepage = "https://github.com/minio/minio-js#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "moment-^2.17.1" = nodeEnv.buildNodePackage {
+    name = "moment";
+    packageName = "moment";
+    version = "2.22.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
+      sha1 = "3c257f9839fc0e93ff53149632239eb90783ff66";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Parse, validate, manipulate, and display dates";
+      homepage = http://momentjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "morgan-^1.7.0" = nodeEnv.buildNodePackage {
+    name = "morgan";
+    packageName = "morgan";
+    version = "1.9.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz";
+      sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051";
+    };
+    dependencies = [
+      sources."basic-auth-2.0.0"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."ee-first-1.1.1"
+      sources."ms-2.0.0"
+      sources."on-finished-2.3.0"
+      sources."on-headers-1.0.1"
+      sources."safe-buffer-5.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "HTTP request logger middleware for node.js";
+      homepage = "https://github.com/expressjs/morgan#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "mysql-^2.12.0" = nodeEnv.buildNodePackage {
+    name = "mysql";
+    packageName = "mysql";
+    version = "2.16.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mysql/-/mysql-2.16.0.tgz";
+      sha512 = "dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw==";
+    };
+    dependencies = [
+      sources."bignumber.js-4.1.0"
+      sources."core-util-is-1.0.2"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."safe-buffer-5.1.2"
+      sources."sqlstring-2.3.1"
+      sources."string_decoder-1.1.1"
+      sources."util-deprecate-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed.";
+      homepage = "https://github.com/mysqljs/mysql#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "node-uuid-^1.4.7" = nodeEnv.buildNodePackage {
+    name = "node-uuid";
+    packageName = "node-uuid";
+    version = "1.4.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+      sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.";
+      homepage = https://github.com/broofa/node-uuid;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "octicons-~4.4.0" = nodeEnv.buildNodePackage {
+    name = "octicons";
+    packageName = "octicons";
+    version = "4.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/octicons/-/octicons-4.4.0.tgz";
+      sha1 = "aca3bd32f5dc1d907a8d0de744f78e0c54e19446";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A scalable set of icons handcrafted with <3 by GitHub.";
+      homepage = https://octicons.github.com/;
+      license = "(OFL-1.1 OR MIT)";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-^0.4.0" = nodeEnv.buildNodePackage {
+    name = "passport";
+    packageName = "passport";
+    version = "0.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz";
+      sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811";
+    };
+    dependencies = [
+      sources."passport-strategy-1.0.0"
+      sources."pause-0.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Simple, unobtrusive authentication for Node.js.";
+      homepage = http://passportjs.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-dropbox-oauth2-^1.1.0" = nodeEnv.buildNodePackage {
+    name = "passport-dropbox-oauth2";
+    packageName = "passport-dropbox-oauth2";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-dropbox-oauth2/-/passport-dropbox-oauth2-1.1.0.tgz";
+      sha1 = "77c737636e4841944dfb82dfc42c3d8ab782c10e";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth-1.0.0"
+      sources."passport-oauth1-1.1.0"
+      sources."passport-oauth2-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."pkginfo-0.2.3"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Dropbox OAuth 2.0 authentication strategy for Passport.";
+      homepage = "https://github.com/florianheinemann/passport-dropbox-oauth2#readme";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-facebook-^2.1.1" = nodeEnv.buildNodePackage {
+    name = "passport-facebook";
+    packageName = "passport-facebook";
+    version = "2.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-facebook/-/passport-facebook-2.1.1.tgz";
+      sha1 = "c39d0b52ae4d59163245a4e21a7b9b6321303311";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Facebook authentication strategy for Passport.";
+      homepage = "https://github.com/jaredhanson/passport-facebook#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-github-^1.1.0" = nodeEnv.buildNodePackage {
+    name = "passport-github";
+    packageName = "passport-github";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-github/-/passport-github-1.1.0.tgz";
+      sha1 = "8ce1e3fcd61ad7578eb1df595839e4aea12355d4";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "GitHub authentication strategy for Passport.";
+      homepage = "https://github.com/jaredhanson/passport-github#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-gitlab2-^4.0.0" = nodeEnv.buildNodePackage {
+    name = "passport-gitlab2";
+    packageName = "passport-gitlab2";
+    version = "4.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-gitlab2/-/passport-gitlab2-4.0.0.tgz";
+      sha512 = "C/8/L8piHwv57J6fY/MzsEJc8yCkgsyBSzMWxfTfEHRvCaTkD08vJ5b/txydKrWrRPl4MHuZfisFnKlZHmq4yw==";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "GitLab authentication strategy for Passport.";
+      homepage = "https://github.com/fh1ch/passport-gitlab2#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-google-oauth20-^1.0.0" = nodeEnv.buildNodePackage {
+    name = "passport-google-oauth20";
+    packageName = "passport-google-oauth20";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz";
+      sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth2-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Google (OAuth 2.0) authentication strategy for Passport.";
+      homepage = "https://github.com/jaredhanson/passport-google-oauth2#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-ldapauth-^2.0.0" = nodeEnv.buildNodePackage {
+    name = "passport-ldapauth";
+    packageName = "passport-ldapauth";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-ldapauth/-/passport-ldapauth-2.0.0.tgz";
+      sha1 = "42dff004417185d0a4d9f776a3eed8d4731fd689";
+    };
+    dependencies = [
+      sources."@types/body-parser-1.17.0"
+      sources."@types/connect-3.4.32"
+      sources."@types/events-1.2.0"
+      sources."@types/express-4.16.0"
+      sources."@types/express-serve-static-core-4.16.0"
+      sources."@types/ldapjs-1.0.3"
+      sources."@types/mime-2.0.0"
+      sources."@types/node-7.0.68"
+      sources."@types/passport-0.3.5"
+      sources."@types/range-parser-1.2.2"
+      sources."@types/serve-static-1.13.2"
+      sources."asn1-0.2.3"
+      sources."assert-plus-1.0.0"
+      sources."backoff-2.5.0"
+      sources."balanced-match-1.0.0"
+      sources."bcryptjs-2.4.3"
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.12"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."dtrace-provider-0.8.7"
+      sources."extsprintf-1.2.0"
+      sources."glob-6.0.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      (sources."ldap-filter-0.2.2" // {
+        dependencies = [
+          sources."assert-plus-0.1.5"
+        ];
+      })
+      sources."ldapauth-fork-4.0.2"
+      sources."ldapjs-1.0.2"
+      sources."lru-cache-4.1.3"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."moment-2.22.2"
+      sources."mv-2.1.1"
+      sources."nan-2.10.0"
+      sources."ncp-2.0.0"
+      sources."once-1.4.0"
+      sources."passport-strategy-1.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."precond-0.2.3"
+      sources."pseudomap-1.0.2"
+      sources."rimraf-2.4.5"
+      sources."safe-json-stringify-1.2.0"
+      (sources."vasync-1.6.4" // {
+        dependencies = [
+          sources."verror-1.6.0"
+        ];
+      })
+      sources."verror-1.10.0"
+      sources."wrappy-1.0.2"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "LDAP authentication strategy for Passport";
+      homepage = "https://github.com/vesse/passport-ldapauth#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-local-^1.0.0" = nodeEnv.buildNodePackage {
+    name = "passport-local";
+    packageName = "passport-local";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
+      sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
+    };
+    dependencies = [
+      sources."passport-strategy-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Local username and password authentication strategy for Passport.";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-oauth2-^1.4.0" = nodeEnv.buildNodePackage {
+    name = "passport-oauth2";
+    packageName = "passport-oauth2";
+    version = "1.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+      sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-strategy-1.0.0"
+      sources."uid2-0.0.3"
+      sources."utils-merge-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "OAuth 2.0 authentication strategy for Passport.";
+      homepage = "https://github.com/jaredhanson/passport-oauth2#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-twitter-^1.0.4" = nodeEnv.buildNodePackage {
+    name = "passport-twitter";
+    packageName = "passport-twitter";
+    version = "1.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.4.tgz";
+      sha1 = "01a799e1f760bf2de49f2ba5fba32282f18932d7";
+    };
+    dependencies = [
+      sources."oauth-0.9.15"
+      sources."passport-oauth1-1.1.0"
+      sources."passport-strategy-1.0.0"
+      sources."utils-merge-1.0.1"
+      sources."xmldom-0.1.27"
+      sources."xtraverse-0.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Twitter authentication strategy for Passport.";
+      homepage = "https://github.com/jaredhanson/passport-twitter#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport-saml-^0.31.0" = nodeEnv.buildNodePackage {
+    name = "passport-saml";
+    packageName = "passport-saml";
+    version = "0.31.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-saml/-/passport-saml-0.31.0.tgz";
+      sha1 = "e4d654cab30f018bfd39056efe7bcfa770aab463";
+    };
+    dependencies = [
+      sources."async-2.6.1"
+      sources."ejs-2.6.1"
+      sources."lodash-4.17.10"
+      sources."node-forge-0.7.5"
+      sources."passport-strategy-1.0.0"
+      sources."q-1.5.1"
+      sources."sax-1.2.4"
+      (sources."xml-crypto-0.10.1" // {
+        dependencies = [
+          sources."xmldom-0.1.19"
+        ];
+      })
+      sources."xml-encryption-0.11.2"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+      sources."xmldom-0.1.27"
+      sources."xpath-0.0.27"
+      sources."xpath.js-1.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "SAML 2.0 authentication strategy for Passport";
+      homepage = "https://github.com/bergie/passport-saml#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "passport.socketio-^3.7.0" = nodeEnv.buildNodePackage {
+    name = "passport.socketio";
+    packageName = "passport.socketio";
+    version = "3.7.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport.socketio/-/passport.socketio-3.7.0.tgz";
+      sha1 = "2ee5fafe9695d4281c8cddd3fe975ecd18e6726e";
+    };
+    dependencies = [
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "access passport.js authenticated user information from socket.io";
+      homepage = "https://github.com/jfromaniello/passport.socketio#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "pdfobject-^2.0.201604172" = nodeEnv.buildNodePackage {
+    name = "pdfobject";
+    packageName = "pdfobject";
+    version = "2.0.201604172";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pdfobject/-/pdfobject-2.0.201604172.tgz";
+      sha1 = "112edf93b98be121a5e780b06e7f5f78ad31ab3f";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An open-source standards-friendly JavaScript utility for embedding PDF files into HTML documents";
+      homepage = "https://github.com/pipwerks/PDFObject#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "pg-^6.1.2" = nodeEnv.buildNodePackage {
+    name = "pg";
+    packageName = "pg";
+    version = "6.4.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pg/-/pg-6.4.2.tgz";
+      sha1 = "c364011060eac7a507a2ae063eb857ece910e27f";
+    };
+    dependencies = [
+      sources."buffer-writer-1.0.1"
+      sources."generic-pool-2.4.3"
+      sources."js-string-escape-1.0.1"
+      sources."object-assign-4.1.0"
+      sources."packet-reader-0.3.1"
+      sources."pg-connection-string-0.1.3"
+      sources."pg-int8-1.0.1"
+      sources."pg-pool-1.8.0"
+      sources."pg-types-1.13.0"
+      sources."pgpass-1.0.2"
+      sources."postgres-array-1.0.2"
+      sources."postgres-bytea-1.0.0"
+      sources."postgres-date-1.0.3"
+      sources."postgres-interval-1.1.2"
+      sources."semver-4.3.2"
+      sources."split-1.0.1"
+      sources."through-2.3.8"
+      sources."xtend-4.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "PostgreSQL client - pure javascript & libpq with the same API";
+      homepage = http://github.com/brianc/node-postgres;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "pg-hstore-^2.3.2" = nodeEnv.buildNodePackage {
+    name = "pg-hstore";
+    packageName = "pg-hstore";
+    version = "2.3.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pg-hstore/-/pg-hstore-2.3.2.tgz";
+      sha1 = "f7ef053e7b9b892ae986af2f7cbe86432dfcf24f";
+    };
+    dependencies = [
+      sources."underscore-1.9.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An module for serializing and deserializing JSON data in to hstore format";
+      homepage = https://github.com/scarney81/pg-hstore;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "prismjs-^1.6.0" = nodeEnv.buildNodePackage {
+    name = "prismjs";
+    packageName = "prismjs";
+    version = "1.15.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/prismjs/-/prismjs-1.15.0.tgz";
+      sha512 = "Lf2JrFYx8FanHrjoV5oL8YHCclLQgbJcVZR+gikGGMqz6ub5QVWDTM6YIwm3BuPxM/LOV+rKns3LssXNLIf+DA==";
+    };
+    dependencies = [
+      sources."clipboard-2.0.1"
+      sources."delegate-3.2.0"
+      sources."good-listener-1.2.2"
+      sources."select-1.1.2"
+      sources."tiny-emitter-2.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Lightweight, robust, elegant syntax highlighting. A spin-off project from Dabblet.";
+      homepage = "https://github.com/LeaVerou/prism#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "randomcolor-^0.5.3" = nodeEnv.buildNodePackage {
+    name = "randomcolor";
+    packageName = "randomcolor";
+    version = "0.5.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/randomcolor/-/randomcolor-0.5.3.tgz";
+      sha1 = "7f90f2f2a7f6d5a52232161eeaeeaea9ac3b5815";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A tiny script for generating attractive random colors";
+      homepage = https://randomcolor.llllll.li/;
+      license = "CC0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "raphael-git+https://github.com/dmitrybaranovskiy/raphael" = nodeEnv.buildNodePackage {
+    name = "raphael";
+    packageName = "raphael";
+    version = "2.2.7";
+    src = fetchgit {
+      url = "https://github.com/dmitrybaranovskiy/raphael";
+      rev = "527c51b7b12f846f9ab0d5ddf14767912b569c7d";
+      sha256 = "a9c2dece0218d3c82ad624fd55d7f81b7696fd0415bc0f52429f2d09497b25d8";
+    };
+    dependencies = [
+      sources."eve-raphael-0.5.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript Vector Library";
+      homepage = http://dmitrybaranovskiy.github.io/raphael/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "readline-sync-^1.4.7" = nodeEnv.buildNodePackage {
+    name = "readline-sync";
+    packageName = "readline-sync";
+    version = "1.4.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.9.tgz";
+      sha1 = "3eda8e65f23cd2a17e61301b1f0003396af5ecda";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Synchronous Readline for interactively running to have a conversation with the user via a console(TTY).";
+      homepage = https://github.com/anseki/readline-sync;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "request-^2.79.0" = nodeEnv.buildNodePackage {
+    name = "request";
+    packageName = "request";
+    version = "2.87.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
+      sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
+    };
+    dependencies = [
+      sources."ajv-5.5.2"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."combined-stream-1.0.6"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."http-signature-1.2.0"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-2.1.0"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sshpk-1.14.2"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Simplified HTTP request client.";
+      homepage = "https://github.com/request/request#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "reveal.js-~3.6.0" = nodeEnv.buildNodePackage {
+    name = "reveal.js";
+    packageName = "reveal.js";
+    version = "3.6.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/reveal.js/-/reveal.js-3.6.0.tgz";
+      sha512 = "ZhXBWoDiaNySAJgs3XqmkHTmjR3Dkkhyy89VY8PLzXBDwNhP7ZEGtBT1H3xJRCEGOD4ScLJBbU75PRiPLQgWgw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The HTML Presentation Framework";
+      homepage = http://revealjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "scrypt-^6.0.3" = nodeEnv.buildNodePackage {
+    name = "scrypt";
+    packageName = "scrypt";
+    version = "6.0.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/scrypt/-/scrypt-6.0.3.tgz";
+      sha1 = "04e014a5682b53fa50c2d5cce167d719c06d870d";
+    };
+    dependencies = [
+      sources."nan-2.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The scrypt crypto library for NodeJS";
+      homepage = https://github.com/barrysteyn/node-scrypt;
+      license = "zlib";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "select2-^3.5.2-browserify" = nodeEnv.buildNodePackage {
+    name = "select2";
+    packageName = "select2";
+    version = "3.5.2-browserify";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/select2/-/select2-3.5.2-browserify.tgz";
+      sha1 = "dc4dafda38d67a734e8a97a46f0d3529ae05391d";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Browserify-ed version of Select2.";
+      homepage = http://ivaynberg.github.io/select2;
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "sequelize-^3.28.0" = nodeEnv.buildNodePackage {
+    name = "sequelize";
+    packageName = "sequelize";
+    version = "3.33.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sequelize/-/sequelize-3.33.0.tgz";
+      sha1 = "b0eb12b87223aded10e50a9d78506e0dd42f9208";
+    };
+    dependencies = [
+      sources."@types/geojson-1.0.6"
+      sources."bluebird-3.5.1"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."dottie-1.1.1"
+      sources."generic-pool-2.4.2"
+      sources."inflection-1.12.0"
+      sources."lodash-4.17.10"
+      sources."moment-2.22.2"
+      sources."moment-timezone-0.5.21"
+      sources."ms-2.0.0"
+      sources."retry-as-promised-2.3.2"
+      sources."semver-5.5.0"
+      sources."shimmer-1.1.0"
+      sources."terraformer-1.0.9"
+      sources."terraformer-wkt-parser-1.2.0"
+      sources."toposort-class-1.0.1"
+      sources."uuid-3.3.2"
+      sources."validator-5.7.0"
+      sources."wkx-0.2.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Multi dialect ORM for Node.JS/io.js";
+      homepage = "https://github.com/sequelize/sequelize#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "sequelize-cli-^2.5.1" = nodeEnv.buildNodePackage {
+    name = "sequelize-cli";
+    packageName = "sequelize-cli";
+    version = "2.8.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-2.8.0.tgz";
+      sha1 = "4304cce60e499169603f838dedbab421c9849e74";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ansi-gray-0.1.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."ansi-wrap-0.1.0"
+      sources."archy-1.0.0"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-differ-1.0.0"
+      sources."array-each-1.0.1"
+      sources."array-slice-1.1.0"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.2.1"
+      sources."assign-symbols-1.0.0"
+      sources."atob-2.1.1"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."beeper-1.1.1"
+      sources."bluebird-3.5.1"
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."builtin-modules-1.1.1"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."camelcase-4.1.0"
+      sources."chalk-1.1.3"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."cli-color-1.2.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."clone-1.0.4"
+      sources."clone-stats-0.0.1"
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."color-support-1.1.3"
+      sources."commander-2.16.0"
+      sources."component-emitter-1.2.1"
+      sources."concat-map-0.0.1"
+      sources."config-chain-1.1.11"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      (sources."cross-spawn-5.1.0" // {
+        dependencies = [
+          sources."lru-cache-4.1.3"
+        ];
+      })
+      sources."d-1.0.0"
+      sources."dateformat-2.2.0"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."defaults-1.0.3"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."deprecated-0.0.1"
+      sources."detect-file-0.1.0"
+      sources."duplexer2-0.0.2"
+      (sources."editorconfig-0.13.3" // {
+        dependencies = [
+          sources."lru-cache-3.2.0"
+          sources."semver-5.5.0"
+        ];
+      })
+      sources."end-of-stream-0.1.5"
+      sources."error-ex-1.3.2"
+      sources."es5-ext-0.10.45"
+      sources."es6-iterator-2.0.3"
+      sources."es6-symbol-3.1.1"
+      sources."es6-weak-map-2.0.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."event-emitter-0.3.5"
+      sources."execa-0.7.0"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      sources."expand-tilde-1.2.2"
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."extglob-0.3.2"
+      sources."fancy-log-1.3.2"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."find-index-0.1.1"
+      sources."find-up-2.1.0"
+      sources."findup-sync-1.0.0"
+      (sources."fined-1.1.0" // {
+        dependencies = [
+          sources."expand-tilde-2.0.2"
+        ];
+      })
+      sources."first-chunk-stream-1.0.0"
+      sources."flagged-respawn-1.0.0"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."fragment-cache-0.2.1"
+      sources."fs-exists-sync-0.1.0"
+      sources."fs-extra-4.0.3"
+      sources."gaze-0.5.2"
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-4.5.3"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      (sources."glob-stream-3.1.18" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.0.34"
+          sources."through2-0.6.5"
+        ];
+      })
+      sources."glob-watcher-0.0.6"
+      sources."glob2base-0.0.12"
+      sources."global-modules-0.2.3"
+      sources."global-prefix-0.1.5"
+      (sources."globule-0.1.0" // {
+        dependencies = [
+          sources."glob-3.1.21"
+          sources."graceful-fs-1.2.3"
+          sources."inherits-1.0.2"
+          sources."lodash-1.0.2"
+          sources."minimatch-0.2.14"
+        ];
+      })
+      sources."glogg-1.0.1"
+      sources."graceful-fs-4.1.11"
+      sources."gulp-3.9.1"
+      sources."gulp-help-1.6.1"
+      sources."gulp-util-3.0.8"
+      sources."gulplog-1.0.0"
+      sources."has-ansi-2.0.0"
+      sources."has-gulplog-0.1.0"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."homedir-polyfill-1.0.1"
+      sources."hosted-git-info-2.7.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."interpret-1.1.0"
+      sources."invert-kv-1.0.0"
+      (sources."is-absolute-1.0.0" // {
+        dependencies = [
+          sources."is-windows-1.0.2"
+        ];
+      })
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
+      sources."is-builtin-module-1.0.0"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-2.0.1"
+      sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."is-promise-2.1.0"
+      sources."is-relative-1.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-unc-path-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-windows-0.2.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-2.1.0"
+      sources."js-beautify-1.7.5"
+      sources."jsonfile-4.0.0"
+      sources."kind-of-3.2.2"
+      sources."lcid-1.0.0"
+      (sources."liftoff-2.5.0" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."detect-file-1.0.0"
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."expand-tilde-2.0.2"
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."findup-sync-2.0.0"
+          sources."global-modules-1.0.0"
+          sources."global-prefix-1.0.2"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."is-extglob-2.1.1"
+          sources."is-glob-3.1.0"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-windows-1.0.2"
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+          sources."resolve-dir-1.0.1"
+        ];
+      })
+      (sources."load-json-file-2.0.0" // {
+        dependencies = [
+          sources."strip-bom-3.0.0"
+        ];
+      })
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.10"
+      sources."lodash._basecopy-3.0.1"
+      sources."lodash._basetostring-3.0.1"
+      sources."lodash._basevalues-3.0.0"
+      sources."lodash._getnative-3.9.1"
+      sources."lodash._isiterateecall-3.0.9"
+      sources."lodash._reescape-3.0.0"
+      sources."lodash._reevaluate-3.0.0"
+      sources."lodash._reinterpolate-3.0.0"
+      sources."lodash._root-3.0.1"
+      sources."lodash.escape-3.2.0"
+      sources."lodash.isarguments-3.1.0"
+      sources."lodash.isarray-3.0.4"
+      sources."lodash.keys-3.1.2"
+      sources."lodash.restparam-3.6.1"
+      sources."lodash.template-3.6.2"
+      sources."lodash.templatesettings-3.1.1"
+      sources."lru-cache-2.7.3"
+      sources."lru-queue-0.1.0"
+      (sources."make-iterator-1.0.1" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."math-random-1.0.1"
+      sources."mem-1.1.0"
+      sources."memoizee-0.4.12"
+      sources."micromatch-2.3.11"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-2.0.10"
+      sources."minimist-1.2.0"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.2"
+      sources."ms-2.0.0"
+      sources."multipipe-0.1.2"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."is-windows-1.0.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."natives-1.1.4"
+      sources."next-tick-1.0.0"
+      sources."nopt-3.0.6"
+      sources."normalize-package-data-2.4.0"
+      sources."normalize-path-2.1.1"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-3.0.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."object.defaults-1.1.0" // {
+        dependencies = [
+          sources."for-own-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."object.map-1.0.1" // {
+        dependencies = [
+          sources."for-own-1.0.0"
+        ];
+      })
+      sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."once-1.3.3"
+      sources."orchestrator-0.3.8"
+      sources."ordered-read-streams-0.1.0"
+      sources."os-homedir-1.0.2"
+      sources."os-locale-2.1.0"
+      sources."p-finally-1.0.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-filepath-1.0.2"
+      sources."parse-glob-3.0.4"
+      sources."parse-json-2.2.0"
+      sources."parse-passwd-1.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-exists-3.0.0"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.5"
+      sources."path-root-0.1.1"
+      sources."path-root-regex-0.1.2"
+      sources."path-type-2.0.0"
+      sources."pify-2.3.0"
+      sources."posix-character-classes-0.1.1"
+      sources."preserve-0.2.0"
+      sources."pretty-hrtime-1.0.3"
+      sources."process-nextick-args-2.0.0"
+      sources."proto-list-1.2.4"
+      sources."pseudomap-1.0.2"
+      (sources."randomatic-3.0.0" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."read-pkg-2.0.0"
+      sources."read-pkg-up-2.0.0"
+      (sources."readable-stream-1.1.14" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+        ];
+      })
+      sources."rechoir-0.6.2"
+      sources."redefine-0.2.1"
+      sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."replace-ext-0.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.8.1"
+      sources."resolve-dir-0.1.1"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
+      sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
+      sources."semver-4.3.6"
+      sources."sequencify-0.0.7"
+      sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."sigmund-1.0.1"
+      sources."signal-exit-3.0.2"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."sparkles-1.0.1"
+      sources."spdx-correct-3.0.0"
+      sources."spdx-exceptions-2.1.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.0"
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."stream-consume-0.1.1"
+      (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-0.10.31"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-1.0.0"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-2.0.0"
+      (sources."through2-2.0.3" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."tildify-1.2.0"
+      sources."time-stamp-1.1.0"
+      sources."timers-ext-0.1.5"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
+      sources."umzug-1.12.0"
+      sources."unc-path-regex-0.1.2"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
+      sources."unique-stream-1.0.0"
+      sources."universalify-0.1.2"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
+      sources."user-home-1.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."v8flags-2.1.1"
+      sources."validate-npm-package-license-3.0.3"
+      sources."vinyl-0.5.3"
+      (sources."vinyl-fs-0.3.14" // {
+        dependencies = [
+          sources."clone-0.2.0"
+          sources."graceful-fs-3.0.11"
+          sources."isarray-0.0.1"
+          sources."readable-stream-1.0.34"
+          sources."through2-0.6.5"
+          sources."vinyl-0.4.6"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      sources."yargs-8.0.2"
+      sources."yargs-parser-7.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "The Sequelize CLI";
+      homepage = https://github.com/sequelize/cli;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "shortid-2.2.8" = nodeEnv.buildNodePackage {
+    name = "shortid";
+    packageName = "shortid";
+    version = "2.2.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz";
+      sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Amazingly short non-sequential url-friendly unique id generator.";
+      homepage = https://github.com/dylang/shortid;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "socket.io-~2.0.4" = nodeEnv.buildNodePackage {
+    name = "socket.io";
+    packageName = "socket.io";
+    version = "2.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz";
+      sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014";
+    };
+    dependencies = [
+      sources."accepts-1.3.5"
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.7"
+      sources."async-limiter-1.0.0"
+      sources."backo2-1.0.2"
+      sources."base64-arraybuffer-0.1.5"
+      sources."base64id-1.0.0"
+      sources."better-assert-1.0.2"
+      sources."blob-0.0.4"
+      sources."callsite-1.0.0"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      sources."component-inherit-0.0.3"
+      sources."cookie-0.3.1"
+      sources."debug-2.6.9"
+      (sources."engine.io-3.1.5" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      (sources."engine.io-client-3.1.6" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."engine.io-parser-2.1.2"
+      sources."has-binary2-1.0.3"
+      sources."has-cors-1.1.0"
+      sources."indexof-0.0.1"
+      sources."isarray-2.0.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.1"
+      sources."object-component-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."parseuri-0.0.5"
+      sources."safe-buffer-5.1.2"
+      sources."socket.io-adapter-1.1.1"
+      sources."socket.io-client-2.0.4"
+      (sources."socket.io-parser-3.1.3" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."to-array-0.1.4"
+      sources."ultron-1.1.1"
+      sources."uws-9.14.0"
+      sources."ws-3.3.3"
+      sources."xmlhttprequest-ssl-1.5.5"
+      sources."yeast-0.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "node.js realtime framework server";
+      homepage = "https://github.com/socketio/socket.io#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "socket.io-client-~2.0.4" = nodeEnv.buildNodePackage {
+    name = "socket.io-client";
+    packageName = "socket.io-client";
+    version = "2.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz";
+      sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e";
+    };
+    dependencies = [
+      sources."after-0.8.2"
+      sources."arraybuffer.slice-0.0.7"
+      sources."async-limiter-1.0.0"
+      sources."backo2-1.0.2"
+      sources."base64-arraybuffer-0.1.5"
+      sources."better-assert-1.0.2"
+      sources."blob-0.0.4"
+      sources."callsite-1.0.0"
+      sources."component-bind-1.0.0"
+      sources."component-emitter-1.2.1"
+      sources."component-inherit-0.0.3"
+      sources."debug-2.6.9"
+      (sources."engine.io-client-3.1.6" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."engine.io-parser-2.1.2"
+      sources."has-binary2-1.0.3"
+      sources."has-cors-1.1.0"
+      sources."indexof-0.0.1"
+      sources."isarray-2.0.1"
+      sources."ms-2.0.0"
+      sources."object-component-0.0.3"
+      sources."parseqs-0.0.5"
+      sources."parseuri-0.0.5"
+      sources."safe-buffer-5.1.2"
+      (sources."socket.io-parser-3.1.3" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
+      sources."to-array-0.1.4"
+      sources."ultron-1.1.1"
+      sources."ws-3.3.3"
+      sources."xmlhttprequest-ssl-1.5.5"
+      sources."yeast-0.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "[![Build Status](https://secure.travis-ci.org/socketio/socket.io-client.svg?branch=master)](http://travis-ci.org/socketio/socket.io-client) [![Dependency Status](https://david-dm.org/socketio/socket.io-client.svg)](https://david-dm.org/socketio/socket.io-";
+      homepage = "https://github.com/Automattic/socket.io-client#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "spin.js-^2.3.2" = nodeEnv.buildNodePackage {
+    name = "spin.js";
+    packageName = "spin.js";
+    version = "2.3.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz";
+      sha1 = "6caa56d520673450fd5cfbc6971e6d0772c37a1a";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "An animated CSS3 loading spinner with VML fallback for IE.";
+      homepage = "https://github.com/fgnass/spin.js#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "sqlite3-^4.0.1" = nodeEnv.buildNodePackage {
+    name = "sqlite3";
+    packageName = "sqlite3";
+    version = "4.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.2.tgz";
+      sha512 = "51ferIRwYOhzUEtogqOa/y9supADlAht98bF/gbIi6WkzRJX6Yioldxbzj1MV4yV+LgdKD/kkHwFTeFXOG4htA==";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ajv-5.5.2"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."brace-expansion-1.1.11"
+      sources."caseless-0.12.0"
+      sources."chownr-1.0.1"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."combined-stream-1.0.6"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."deep-extend-0.6.0"
+      sources."delayed-stream-1.0.0"
+      sources."delegates-1.0.0"
+      sources."detect-libc-1.0.3"
+      sources."ecc-jsbn-0.1.2"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."fs-minipass-1.2.5"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.2"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."has-unicode-2.0.1"
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.23"
+      sources."ignore-walk-3.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.3.3"
+      sources."minizlib-1.1.0"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."nan-2.10.0"
+      sources."needle-2.2.1"
+      sources."node-pre-gyp-0.10.3"
+      sources."nopt-4.0.1"
+      sources."npm-bundled-1.0.3"
+      sources."npm-packlist-1.1.11"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."path-is-absolute-1.0.1"
+      sources."performance-now-2.1.0"
+      sources."process-nextick-args-2.0.0"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."readable-stream-2.3.6"
+      sources."request-2.87.0"
+      sources."rimraf-2.6.2"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.5.0"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."sshpk-1.14.2"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."tar-4.4.6"
+      sources."tough-cookie-2.3.4"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Asynchronous, non-blocking SQLite3 bindings";
+      homepage = http://github.com/mapbox/node-sqlite3;
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "store-^2.0.12" = nodeEnv.buildNodePackage {
+    name = "store";
+    packageName = "store";
+    version = "2.0.12";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/store/-/store-2.0.12.tgz";
+      sha1 = "8c534e2a0b831f72b75fc5f1119857c44ef5d593";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A localStorage wrapper for all browsers without using cookies or flash. Uses localStorage, globalStorage, and userData behavior under the hood";
+      homepage = "https://github.com/marcuswestin/store.js#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "string-^3.3.3" = nodeEnv.buildNodePackage {
+    name = "string";
+    packageName = "string";
+    version = "3.3.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/string/-/string-3.3.3.tgz";
+      sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "string contains methods that aren't included in the vanilla JavaScript string such as escaping html, decoding html entities, stripping tags, etc.";
+      homepage = http://stringjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "tedious-^1.14.0" = nodeEnv.buildNodePackage {
+    name = "tedious";
+    packageName = "tedious";
+    version = "1.15.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tedious/-/tedious-1.15.0.tgz";
+      sha1 = "9bda9e9798212c8fcd9438a70cb2a806abcae70a";
+    };
+    dependencies = [
+      sources."babel-runtime-6.26.0"
+      sources."big-number-0.3.1"
+      sources."bl-1.2.2"
+      sources."core-js-2.5.7"
+      sources."core-util-is-1.0.2"
+      sources."dns-lookup-all-1.0.2"
+      sources."iconv-lite-0.4.23"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
+      sources."regenerator-runtime-0.11.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.5.0"
+      sources."sprintf-0.1.5"
+      sources."string_decoder-1.1.1"
+      sources."util-deprecate-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A TDS driver, for connecting to MS SQLServer databases.";
+      homepage = https://github.com/tediousjs/tedious;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "to-markdown-^3.0.3" = nodeEnv.buildNodePackage {
+    name = "to-markdown";
+    packageName = "to-markdown";
+    version = "3.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/to-markdown/-/to-markdown-3.1.1.tgz";
+      sha1 = "251e241b8c74c7ad177292e6c52cc195c9268c11";
+    };
+    dependencies = [
+      sources."abab-1.0.4"
+      sources."acorn-4.0.13"
+      sources."acorn-globals-3.1.0"
+      sources."ajv-5.5.2"
+      sources."array-equal-1.0.0"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.7.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."block-elements-1.2.0"
+      sources."caseless-0.12.0"
+      sources."co-4.6.0"
+      sources."collapse-whitespace-1.1.2"
+      sources."combined-stream-1.0.6"
+      sources."content-type-parser-1.0.2"
+      sources."core-util-is-1.0.2"
+      sources."cssom-0.3.4"
+      sources."cssstyle-0.2.37"
+      sources."dashdash-1.14.1"
+      sources."deep-is-0.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."escodegen-1.11.0"
+      sources."esprima-3.1.3"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.2"
+      sources."getpass-0.1.7"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."html-encoding-sniffer-1.0.2"
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.19"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."jsdom-9.12.0"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      sources."levn-0.3.0"
+      sources."mime-db-1.35.0"
+      sources."mime-types-2.1.19"
+      sources."nwmatcher-1.4.4"
+      sources."oauth-sign-0.8.2"
+      sources."optionator-0.8.2"
+      sources."parse5-1.5.1"
+      sources."performance-now-2.1.0"
+      sources."prelude-ls-1.1.2"
+      sources."psl-1.1.29"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      (sources."request-2.87.0" // {
+        dependencies = [
+          sources."tough-cookie-2.3.4"
+        ];
+      })
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."source-map-0.6.1"
+      sources."sshpk-1.14.2"
+      sources."symbol-tree-3.2.2"
+      sources."tough-cookie-2.4.3"
+      sources."tr46-0.0.3"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
+      sources."uuid-3.3.2"
+      sources."verror-1.10.0"
+      sources."void-elements-2.0.1"
+      sources."webidl-conversions-4.0.2"
+      sources."whatwg-encoding-1.0.3"
+      (sources."whatwg-url-4.8.0" // {
+        dependencies = [
+          sources."webidl-conversions-3.0.1"
+        ];
+      })
+      sources."wordwrap-1.0.0"
+      sources."xml-name-validator-2.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "HTML-to-Markdown converter";
+      homepage = "https://github.com/domchristie/to-markdown#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "toobusy-js-^0.5.1" = nodeEnv.buildNodePackage {
+    name = "toobusy-js";
+    packageName = "toobusy-js";
+    version = "0.5.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/toobusy-js/-/toobusy-js-0.5.1.tgz";
+      sha1 = "5511f78f6a87a6a512d44fdb0efa13672217f659";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Don't fall over when your Node.JS server is too busy. Now without native dependencies!";
+      homepage = https://github.com/STRML/node-toobusy;
+      license = "WTFPL";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "uuid-^3.1.0" = nodeEnv.buildNodePackage {
+    name = "uuid";
+    packageName = "uuid";
+    version = "3.3.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
+      sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "RFC4122 (v1, v4, and v5) UUIDs";
+      homepage = "https://github.com/kelektiv/node-uuid#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "uws-~0.14.1" = nodeEnv.buildNodePackage {
+    name = "uws";
+    packageName = "uws";
+    version = "0.14.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz";
+      sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Tiny WebSockets";
+      homepage = https://github.com/uWebSockets/uWebSockets;
+      license = "Zlib";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "validator-^10.4.0" = nodeEnv.buildNodePackage {
+    name = "validator";
+    packageName = "validator";
+    version = "10.5.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/validator/-/validator-10.5.0.tgz";
+      sha512 = "6OOi+eV2mOxCFLq0f2cJDrdB6lrtLXEUxabhNRGjgOLT/l3SSll9J49Cl+LIloUqkWWTPraK/mucEQ3dc2jStQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "String validation and sanitization";
+      homepage = http://github.com/chriso/validator.js;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "velocity-animate-^1.4.0" = nodeEnv.buildNodePackage {
+    name = "velocity-animate";
+    packageName = "velocity-animate";
+    version = "1.5.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/velocity-animate/-/velocity-animate-1.5.2.tgz";
+      sha512 = "m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Accelerated JavaScript animation.";
+      homepage = http://velocityjs.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "visibilityjs-^1.2.4" = nodeEnv.buildNodePackage {
+    name = "visibilityjs";
+    packageName = "visibilityjs";
+    version = "1.2.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/visibilityjs/-/visibilityjs-1.2.8.tgz";
+      sha512 = "Y+aL3OUX88b+/VSmkmC2ApuLbf0grzbNLpCfIDSw3BzTU6PqcPsdgIOaw8b+eZoy+DdQqnVN3y/Evow9vQq9Ig==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Wrapper for the Page Visibility API";
+      homepage = "https://github.com/ai/visibilityjs#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "viz.js-^1.7.0" = nodeEnv.buildNodePackage {
+    name = "viz.js";
+    packageName = "viz.js";
+    version = "1.8.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz";
+      sha512 = "W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A hack to put Graphviz on the web.";
+      homepage = https://github.com/mdaines/viz.js;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "winston-^2.3.0" = nodeEnv.buildNodePackage {
+    name = "winston";
+    packageName = "winston";
+    version = "2.4.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz";
+      sha512 = "GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==";
+    };
+    dependencies = [
+      sources."async-1.0.0"
+      sources."colors-1.0.3"
+      sources."cycle-1.0.3"
+      sources."eyes-0.1.8"
+      sources."isstream-0.1.2"
+      sources."stack-trace-0.0.10"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A multi-transport async logging library for Node.js";
+      homepage = "https://github.com/winstonjs/winston#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+  "xss-^1.0.3" = nodeEnv.buildNodePackage {
+    name = "xss";
+    packageName = "xss";
+    version = "1.0.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xss/-/xss-1.0.3.tgz";
+      sha512 = "LTpz3jXPLUphMMmyufoZRSKnqMj41OVypZ8uYGzvjkMV9C1EdACrhQl/EM8Qfh5htSAuMIQFOejmKAZGkJfaCg==";
+    };
+    dependencies = [
+      sources."commander-2.16.0"
+      sources."cssfilter-0.0.10"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Sanitize untrusted HTML (to prevent XSS) with a configuration specified by a Whitelist";
+      homepage = https://github.com/leizongmin/js-xss;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/web-apps/codimd/node.nix b/pkgs/servers/web-apps/codimd/node.nix
new file mode 100644
index 000000000000..8f3be4cc8c7f
--- /dev/null
+++ b/pkgs/servers/web-apps/codimd/node.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.6.0. Do not edit!
+
+{pkgs ? import <nixpkgs> {
+    inherit system;
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+
+let
+  nodeEnv = import ../../../development/node-packages/node-env.nix {
+    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+    inherit nodejs;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+  };
+in
+import ./node-packages.nix {
+  inherit (pkgs) fetchurl fetchgit;
+  inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34dc49d8c0b7..2d3b94ed818e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1797,6 +1797,8 @@ with pkgs;
 
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
+  codimd = callPackage ../servers/web-apps/codimd { };
+
   colord = callPackage ../tools/misc/colord { };
 
   colord-gtk = callPackage ../tools/misc/colord-gtk { };

From db846a88a888039cf237e3e30d2bd2e97e32393f Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 19 Aug 2018 18:08:07 +0200
Subject: [PATCH 1146/3253] nixos/codimd: add module

---
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/web-apps/codimd.nix | 958 +++++++++++++++++++++
 2 files changed, 959 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/codimd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17c21be22f1f..b128568bdf51 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -683,6 +683,7 @@
   ./services/web-apps/atlassian/confluence.nix
   ./services/web-apps/atlassian/crowd.nix
   ./services/web-apps/atlassian/jira.nix
+  ./services/web-apps/codimd.nix
   ./services/web-apps/frab.nix
   ./services/web-apps/mattermost.nix
   ./services/web-apps/nexus.nix
diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
new file mode 100644
index 000000000000..5368e8b0e664
--- /dev/null
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -0,0 +1,958 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.codimd;
+
+  prettyJSON = conf:
+    pkgs.runCommand "codimd-config.json" { } ''
+      echo '${builtins.toJSON conf}' | ${pkgs.jq}/bin/jq \
+        '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out
+    '';
+in
+{
+  options.services.codimd = {
+    enable = mkEnableOption "the CodiMD Markdown Editor";
+
+    groups = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Groups to which the codimd user should be added.
+      '';
+    };
+
+    workDir = mkOption {
+      type = types.path;
+      default = "/var/lib/codimd";
+      description = ''
+        Working directory for the CodiMD service.
+      '';
+    };
+
+    configuration = {
+      debug = mkEnableOption "debug mode";
+      domain = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "codimd.org";
+        description = ''
+          Domain name for the CodiMD instance.
+        '';
+      };
+      urlPath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/url/path/to/codimd";
+        description = ''
+          Path under which CodiMD is accessible.
+        '';
+      };
+      host = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = ''
+          Address to listen on.
+        '';
+      };
+      port = mkOption {
+        type = types.int;
+        default = 3000;
+        example = "80";
+        description = ''
+          Port to listen on.
+        '';
+      };
+      path = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/run/codimd.sock";
+        description = ''
+          Specify where a UNIX domain socket should be placed.
+        '';
+      };
+      allowOrigin = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "localhost" "codimd.org" ];
+        description = ''
+          List of domains to whitelist.
+        '';
+      };
+      useSSL = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable to use SSL server. This will also enable
+          <option>protocolUseSSL</option>.
+        '';
+      };
+      hsts = {
+        enable = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Wheter to enable HSTS if HTTPS is also enabled.
+          '';
+        };
+        maxAgeSeconds = mkOption {
+          type = types.int;
+          default = 31536000;
+          description = ''
+            Max duration for clients to keep the HSTS status.
+          '';
+        };
+        includeSubdomains = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to include subdomains in HSTS.
+          '';
+        };
+        preload = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Whether to allow preloading of the site's HSTS status.
+          '';
+        };
+      };
+      csp = mkOption {
+        type = types.nullOr types.attrs;
+        default = null;
+        example = literalExample ''
+          {
+            enable = true;
+            directives = {
+              scriptSrc = "trustworthy.scripts.example.com";
+            };
+            upgradeInsecureRequest = "auto";
+            addDefaults = true;
+          }
+        '';
+        description = ''
+          Specify the Content Security Policy which is passed to Helmet.
+          For configuration details see <link xlink:href="https://helmetjs.github.io/docs/csp/"
+          >https://helmetjs.github.io/docs/csp/</link>.
+        '';
+      };
+      protocolUseSSL = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable to use TLS for resource paths.
+          This only applies when <option>domain</option> is set.
+        '';
+      };
+      urlAddPort = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable to add the port to callback URLs.
+          This only applies when <option>domain</option> is set
+          and only for ports other than 80 and 443.
+        '';
+      };
+      useCDN = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to use CDN resources or not.
+        '';
+      };
+      allowAnonymous = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to allow anonymous usage.
+        '';
+      };
+      allowAnonymousEdits = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to allow guests to edit existing notes with the `freely' permission,
+          when <option>allowAnonymous</option> is enabled.
+        '';
+      };
+      allowFreeURL = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to allow note creation by accessing a nonexistent note URL.
+        '';
+      };
+      defaultPermission = mkOption {
+        type = types.enum [ "freely" "editable" "limited" "locked" "private" ];
+        default = "editable";
+        description = ''
+          Default permissions for notes.
+          This only applies for signed-in users.
+        '';
+      };
+      dbURL = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = ''
+          postgres://user:pass@host:5432/dbname
+        '';
+        description = ''
+          Specify which database to use.
+          CodiMD supports mysql, postgres, sqlite and mssql.
+          See <link xlink:href="https://sequelize.readthedocs.io/en/v3/">
+          https://sequelize.readthedocs.io/en/v3/</link> for more information.
+          Note: This option overrides <option>db</option>.
+        '';
+      };
+      db = mkOption {
+        type = types.attrs;
+        default = {};
+        example = literalExample ''
+          {
+            dialect = "sqlite";
+            storage = "/var/lib/codimd/db.codimd.sqlite";
+          }
+        '';
+        description = ''
+          Specify the configuration for sequelize.
+          CodiMD supports mysql, postgres, sqlite and mssql.
+          See <link xlink:href="https://sequelize.readthedocs.io/en/v3/">
+          https://sequelize.readthedocs.io/en/v3/</link> for more information.
+          Note: This option overrides <option>db</option>.
+        '';
+      };
+      sslKeyPath= mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/codimd/codimd.key";
+        description = ''
+          Path to the SSL key. Needed when <option>useSSL</option> is enabled.
+        '';
+      };
+      sslCertPath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/codimd/codimd.crt";
+        description = ''
+          Path to the SSL cert. Needed when <option>useSSL</option> is enabled.
+        '';
+      };
+      sslCAPath = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "/var/lib/codimd/ca.crt" ];
+        description = ''
+          SSL ca chain. Needed when <option>useSSL</option> is enabled.
+        '';
+      };
+      dhParamPath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/var/lib/codimd/dhparam.pem";
+        description = ''
+          Path to the SSL dh params. Needed when <option>useSSL</option> is enabled.
+        '';
+      };
+      tmpPath = mkOption {
+        type = types.str;
+        default = "/tmp";
+        description = ''
+          Path to the temp directory CodiMD should use.
+          Note that <option>serviceConfig.PrivateTmp</option> is enabled for
+          the CodiMD systemd service by default.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      defaultNotePath = mkOption {
+        type = types.nullOr types.str;
+        default = "./public/default.md";
+        description = ''
+          Path to the default Note file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      docsPath = mkOption {
+        type = types.nullOr types.str;
+        default = "./public/docs";
+        description = ''
+          Path to the docs directory.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      indexPath = mkOption {
+        type = types.nullOr types.str;
+        default = "./public/views/index.ejs";
+        description = ''
+          Path to the index template file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      hackmdPath = mkOption {
+        type = types.nullOr types.str;
+        default = "./public/views/hackmd.ejs";
+        description = ''
+          Path to the hackmd template file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      errorPath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        defaultText = "./public/views/error.ejs";
+        description = ''
+          Path to the error template file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      prettyPath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        defaultText = "./public/views/pretty.ejs";
+        description = ''
+          Path to the pretty template file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      slidePath = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        defaultText = "./public/views/slide.hbs";
+        description = ''
+          Path to the slide template file.
+          (Non-canonical paths are relative to CodiMD's base directory)
+        '';
+      };
+      uploadsPath = mkOption {
+        type = types.str;
+        default = "${cfg.workDir}/uploads";
+        defaultText = "/var/lib/codimd/uploads";
+        description = ''
+          Path under which uploaded files are saved.
+        '';
+      };
+      sessionName = mkOption {
+        type = types.str;
+        default = "connect.sid";
+        description = ''
+          Specify the name of the session cookie.
+        '';
+      };
+      sessionSecret = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Specify the secret used to sign the session cookie.
+          If unset, one will be generated on startup.
+        '';
+      };
+      sessionLife = mkOption {
+        type = types.int;
+        default = 1209600000;
+        description = ''
+          Session life time in milliseconds.
+        '';
+      };
+      heartbeatInterval = mkOption {
+        type = types.int;
+        default = 5000;
+        description = ''
+          Specify the socket.io heartbeat interval.
+        '';
+      };
+      heartbeatTimeout = mkOption {
+        type = types.int;
+        default = 10000;
+        description = ''
+          Specify the socket.io heartbeat timeout.
+        '';
+      };
+      documentMaxLength = mkOption {
+        type = types.int;
+        default = 100000;
+        description = ''
+          Specify the maximum document length.
+        '';
+      };
+      email = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable email sign-in.
+        '';
+      };
+      allowEmailRegister = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Wether to enable email registration.
+        '';
+      };
+      allowGravatar = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to use gravatar as profile picture source.
+        '';
+      };
+      imageUploadType = mkOption {
+        type = types.enum [ "imgur" "s3" "minio" "filesystem" ];
+        default = "filesystem";
+        description = ''
+          Specify where to upload images.
+        '';
+      };
+      minio = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            accessKey = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Minio access key.
+              '';
+            };
+            secretKey = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Minio secret key.
+              '';
+            };
+            endpoint = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Minio endpoint.
+              '';
+            };
+            port = mkOption {
+              type = types.int;
+              default = 9000;
+              description = ''
+                Minio listen port.
+              '';
+            };
+            secure = mkOption {
+              type = types.bool;
+              default = true;
+              description = ''
+                Whether to use HTTPS for Minio.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the minio third-party integration.";
+      };
+      s3 = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            accessKeyId = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                AWS access key id.
+              '';
+            };
+            secretAccessKey = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                AWS access key.
+              '';
+            };
+            region = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                AWS S3 region.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the s3 third-party integration.";
+      };
+      s3bucket = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Specify the bucket name for upload types <literal>s3</literal> and <literal>minio</literal>.
+        '';
+      };
+      allowPDFExport = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable PDF exports.
+        '';
+      };
+      imgur.clientId = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Imgur API client ID.
+        '';
+      };
+      azure = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            connectionString = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Azure Blob Storage connection string.
+              '';
+            };
+            container = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Azure Blob Storage container name.
+                It will be created if non-existent.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the azure third-party integration.";
+      };
+      oauth2 = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            authorizationURL = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Specify the OAuth authorization URL.
+              '';
+            };
+            tokenURL = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Specify the OAuth token URL.
+              '';
+            };
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Specify the OAuth client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Specify the OAuth client secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the OAuth integration.";
+      };
+      facebook = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Facebook API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Facebook API client secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the facebook third-party integration";
+      };
+      twitter = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            consumerKey = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Twitter API consumer key.
+              '';
+            };
+            consumerSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Twitter API consumer secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the Twitter third-party integration.";
+      };
+      github = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                GitHub API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Github API client secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the GitHub third-party integration.";
+      };
+      gitlab = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            baseURL = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                GitLab API authentication endpoint.
+                Only needed for other endpoints than gitlab.com.
+              '';
+            };
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                GitLab API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                GitLab API client secret.
+              '';
+            };
+            scope = mkOption {
+              type = types.enum [ "api" "read_user" ];
+              default = "api";
+              description = ''
+                GitLab API requested scope.
+                GitLab snippet import/export requires api scope.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the GitLab third-party integration.";
+      };
+      mattermost = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            baseURL = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Mattermost authentication endpoint.
+              '';
+            };
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Mattermost API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Mattermost API client secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the Mattermost third-party integration.";
+      };
+      dropbox = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Dropbox API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Dropbox API client secret.
+              '';
+            };
+            appKey = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Dropbox app key.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the Dropbox third-party integration.";
+      };
+      google = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            clientID = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Google API client ID.
+              '';
+            };
+            clientSecret = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Google API client secret.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the Google third-party integration.";
+      };
+      ldap = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            providerName = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Optional name to be displayed at login form, indicating the LDAP provider.
+              '';
+            };
+            url = mkOption {
+              type = types.str;
+              default = "";
+              example = "ldap://localhost";
+              description = ''
+                URL of LDAP server.
+              '';
+            };
+            bindDn = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Bind DN for LDAP access.
+              '';
+            };
+            bindCredentials = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Bind credentials for LDAP access.
+              '';
+            };
+            searchBase = mkOption {
+              type = types.str;
+              default = "";
+              example = "o=users,dc=example,dc=com";
+              description = ''
+                LDAP directory to begin search from.
+              '';
+            };
+            searchFilter = mkOption {
+              type = types.str;
+              default = "";
+              example = "(uid={{username}})";
+              description = ''
+                LDAP filter to search with.
+              '';
+            };
+            searchAttributes = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = [ "displayName" "mail" ];
+              description = ''
+                LDAP attributes to search with.
+              '';
+            };
+            userNameField = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                LDAP field which is used as the username on CodiMD.
+                By default <option>useridField</option> is used.
+              '';
+            };
+            useridField = mkOption {
+              type = types.str;
+              default = "";
+              example = "uid";
+              description = ''
+                LDAP field which is a unique identifier for users on CodiMD.
+              '';
+            };
+            tlsca = mkOption {
+              type = types.str;
+              default = "";
+              example = "server-cert.pem,root.pem";
+              description = ''
+                Root CA for LDAP TLS in PEM format.
+              '';
+            };
+          };
+        });
+        default = null;
+        description = "Configure the LDAP integration.";
+      };
+      saml = mkOption {
+        type = types.nullOr (types.submodule {
+          options = {
+            idpSsoUrl = mkOption {
+              type = types.str;
+              default = "";
+              example = "https://idp.example.com/sso";
+              description = ''
+                IdP authentication endpoint.
+              '';
+            };
+            idPCert = mkOption {
+              type = types.str;
+              default = "";
+              example = "/path/to/cert.pem";
+              description = ''
+                Path to IdP certificate file in PEM format.
+              '';
+            };
+            issuer = mkOption {
+              type = types.str;
+              default = "";
+              description = ''
+                Optional identity of the service provider.
+                This defaults to the server URL.
+              '';
+            };
+            identifierFormat = mkOption {
+              type = types.str;
+              default = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
+              description = ''
+                Optional name identifier format.
+              '';
+            };
+            groupAttribute = mkOption {
+              type = types.str;
+              default = "";
+              example = "memberOf";
+              description = ''
+                Optional attribute name for group list.
+              '';
+            };
+            externalGroups = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = [ "Temporary-staff" "External-users" ];
+              description = ''
+                Excluded group names.
+              '';
+            };
+            requiredGroups = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              example = [ "Hackmd-users" "Codimd-users" ];
+              description = ''
+                Required group names.
+              '';
+            };
+            attribute = {
+              id = mkOption {
+                type = types.str;
+                default = "";
+                description = ''
+                  Attribute map for `id'.
+                  Defaults to `NameID' of SAML response.
+                '';
+              };
+              username = mkOption {
+                type = types.str;
+                default = "";
+                description = ''
+                  Attribute map for `username'.
+                  Defaults to `NameID' of SAML response.
+                '';
+              };
+              email = mkOption {
+                type = types.str;
+                default = "";
+                description = ''
+                  Attribute map for `email'.
+                  Defaults to `NameID' of SAML response if
+                  <option>identifierFormat</option> has
+                  the default value.
+                '';
+              };
+            };
+          };
+        });
+        default = null;
+        description = "Configure the SAML integration.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      { assertion = cfg.configuration.db == {} -> (
+          cfg.configuration.dbURL != "" && cfg.configuration.dbURL != null
+        );
+        message = "Database configuration for CodiMD missing."; }
+    ];
+    users.groups.codimd = {};
+    users.users.codimd = {
+      description = "CodiMD service user";
+      group = "codimd";
+      extraGroups = cfg.groups;
+      home = cfg.workDir;
+      createHome = true;
+    };
+
+    systemd.services.codimd = {
+      description = "CodiMD Service";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "networking.target" ];
+      preStart = ''
+        mkdir -p ${cfg.workDir}
+        chown -R codimd: ${cfg.workDir}
+      '';
+      serviceConfig = {
+        WorkingDirectory = cfg.workDir;
+        ExecStart = "${pkgs.codimd}/bin/codimd";
+        Environment = [
+          "CMD_CONFIG_FILE=${prettyJSON cfg.configuration}"
+          "NODE_ENV=production"
+        ];
+        Restart = "always";
+        User = "codimd";
+        PermissionsStartOnly = true;
+        PrivateTmp = true;
+      };
+    };
+  };
+}

From dd5dcc65ac3b71bc65f884b8be175aa535ef6074 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 19 Aug 2018 18:09:17 +0200
Subject: [PATCH 1147/3253] nixos/tests: add test for codimd

---
 nixos/release.nix      |  1 +
 nixos/tests/codimd.nix | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 nixos/tests/codimd.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 0fd8d694641f..ee31564bcf74 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -261,6 +261,7 @@ in rec {
   tests.chromium = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/chromium.nix {}).stable or {};
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.cloud-init = callTest tests/cloud-init.nix {};
+  tests.codimd = callTest tests/codimd.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
   tests.containers-bridge = callTest tests/containers-bridge.nix {};
diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix
new file mode 100644
index 000000000000..8f98d9f3fa72
--- /dev/null
+++ b/nixos/tests/codimd.nix
@@ -0,0 +1,56 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+{
+  name = "codimd";
+
+  meta = with lib.maintainers; {
+    maintainers = [ willibutz ];
+  };
+
+  nodes = {
+    codimdSqlite = { ... }: {
+      services = {
+        codimd = {
+          enable = true;
+          configuration.dbURL = "sqlite:///var/lib/codimd/codimd.db";
+        };
+      };
+    };
+
+    codimdPostgres = { ... }: {
+      systemd.services.codimd.after = [ "postgresql.service" ];
+      services = {
+        codimd = {
+          enable = true;
+          configuration.dbURL = "postgres://codimd:snakeoilpassword@localhost:5432/codimddb";
+        };
+        postgresql = {
+          enable = true;
+          initialScript = pkgs.writeText "pg-init-script.sql" ''
+            CREATE ROLE codimd LOGIN PASSWORD 'snakeoilpassword';
+            CREATE DATABASE codimddb OWNER codimd;
+          '';
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    startAll();
+
+    subtest "CodiMD sqlite", sub {
+      $codimdSqlite->waitForUnit("codimd.service");
+      $codimdSqlite->waitForOpenPort(3000);
+      $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
+      $codimdSqlite->succeed("curl -sSf http://localhost:3000/new");
+    };
+
+    subtest "CodiMD postgres", sub {
+      $codimdPostgres->waitForUnit("postgresql.service");
+      $codimdPostgres->waitForUnit("codimd.service");
+      $codimdPostgres->waitForOpenPort(5432);
+      $codimdPostgres->waitForOpenPort(3000);
+      $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
+      $codimdPostgres->succeed("curl -sSf http://localhost:3000/new");
+    };
+  '';
+})

From fa58491b9e432dd551e505105235947122750474 Mon Sep 17 00:00:00 2001
From: Henry <111202+cryptix@users.noreply.github.com>
Date: Mon, 17 Sep 2018 15:24:25 +0200
Subject: [PATCH 1148/3253] nvramtool: init at 4.8.1 (#46774)

https://www.coreboot.org/Nvramtool
---
 pkgs/tools/misc/nvramtool/default.nix | 34 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/nvramtool/default.nix

diff --git a/pkgs/tools/misc/nvramtool/default.nix b/pkgs/tools/misc/nvramtool/default.nix
new file mode 100644
index 000000000000..fdce7076661a
--- /dev/null
+++ b/pkgs/tools/misc/nvramtool/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchgit, iasl, flex, bison }:
+
+stdenv.mkDerivation rec {
+  name = "nvramtool-${version}";
+  version = "4.8.1";
+
+  src = fetchgit {
+    url = "http://review.coreboot.org/p/coreboot";
+    rev = "refs/tags/${version}";
+    sha256 = "0nrf840jg4fn38zcnz1r10w2yfpvrk1nvsrnbbgdbgkmpjxz0zw9";
+  };
+
+  nativeBuildInputs = [ flex bison ];
+  buildInputs = [ iasl ];
+
+  buildPhase = ''
+    export LEX=${flex}/bin/flex
+    make -C util/nvramtool
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp util/nvramtool/nvramtool $out/bin
+    '';
+
+  meta = with stdenv.lib; {
+    description = "utility for reading/writing coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM";
+    homepage = https://www.coreboot.org/Nvramtool;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.cryptix ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d3b94ed818e..849bafd26889 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13370,6 +13370,8 @@ with pkgs;
 
   cbfstool = callPackage ../applications/virtualization/cbfstool { };
 
+  nvramtool = callPackage ../tools/misc/nvramtool { };
+
   vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
 
   pgbouncer = callPackage ../servers/sql/pgbouncer { };

From fd345053b3b1a637263f6fe9a4bfb598c07c41a0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 17 Sep 2018 08:28:21 -0500
Subject: [PATCH 1149/3253] vale: 0.11.2 -> 1.0.3 (#46780)

---
 pkgs/tools/text/vale/default.nix |  6 +--
 pkgs/tools/text/vale/deps.nix    | 84 ++++++++++++++++----------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 84ef164ce248..5fe4ab5d7239 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "vale-${version}";
-  version = "0.11.2";
+  version = "1.0.3";
   rev    = "v${version}";
 
   goPackagePath = "github.com/errata-ai/vale";
@@ -11,13 +11,13 @@ buildGoPackage rec {
     inherit rev;
     owner  = "errata-ai";
     repo   = "vale";
-    sha256 = "0zs6bdwnc5fpa0skw1xhdwg6jzsc7wcb8lsfj235jc8jd2w13mvm";
+    sha256 = "132zzgry19alcdn3m3q62sp2lm3yxc4kil12lm309jl7b3n0850h";
   };
 
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
+    homepage = https://errata.ai/vale/getting-started/;
     description = "Vale is an open source linter for prose";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];
diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix
index e63becb5b4b3..c19af2cd4f0f 100644
--- a/pkgs/tools/text/vale/deps.nix
+++ b/pkgs/tools/text/vale/deps.nix
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/davecgh/go-spew";
-      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/fatih/color";
-      rev =  "507f6050b8568533fb3f5504de8e5205fa62a114";
-      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+      rev =  "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
+      sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobwas/glob";
-      rev =  "f00a7392b43971b2fdb562418faab1f18da2067a";
-      sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
+      rev =  "bea32b9cd2d6f55753d94a28e959b13f0244797a";
+      sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
     };
   }
   {
@@ -50,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jdkato/prose";
-      rev =  "e27abfd3f31b84c37bbce37179b0428fcb1384be";
-      sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7";
+      rev =  "4d68d1b77f66e36b6897a79f59f434d558e5e0c2";
+      sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj";
     };
   }
   {
@@ -68,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-colorable";
-      rev =  "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
-      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
+      rev =  "941b50ebc6efddf4c41c8e4537a5f68a4e686b24";
+      sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-isatty";
-      rev =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
-      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+      rev =  "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
+      sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
-      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+      rev =  "9e777a8366cce605130a531d2cd6363d07ad7317";
+      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
     };
   }
   {
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev =  "00c29f56e2386353d58c599509e8dc3801b0d716";
-      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+      rev =  "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
     };
   }
   {
@@ -113,8 +113,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/montanaflynn/stats";
-      rev =  "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab";
-      sha256 = "0qnx3hvd3lhwnmxg7nr4nwl5kbsc7ffnjk9ifyk0f05h61l3v9pz";
+      rev =  "eeaced052adbcfeea372c749c281099ed7fdaa38";
+      sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/olekukonko/tablewriter";
-      rev =  "d5dd8a50526aadb3d5f2c9b5233277bc2db90e88";
-      sha256 = "0l7y3mmwkzpa7p56drw6d6416j9zfapznfyr1dab44d6kk48rvjx";
+      rev =  "be5337e7b39e64e5f91445ce7e721888dbab7387";
+      sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w";
     };
   }
   {
@@ -140,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/remeh/sizedwaitgroup";
-      rev =  "5582a674300c427060d06980c142aeb52ed20040";
-      sha256 = "152a1xnaswh9fx6f71llggm513c6ch171gc61jk3b6b0il6npb57";
+      rev =  "4b44541c93591ee0e73747d6081e61bd8c58b5c7";
+      sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92";
     };
   }
   {
@@ -149,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev =  "16ac584625fae401e2778e7af317dc415844c44b";
-      sha256 = "0g0dbqm76aqsc2a43j95i0h5138cmlgnldhkv3blgn0ga6s8ypfg";
+      rev =  "0b647d0506a698cca42caca173e55559b12a69f2";
+      sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln";
     };
   }
   {
@@ -158,8 +158,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shogo82148/go-shuffle";
-      rev =  "27e6095f230d6c769aafa7232db643a628bd87ad";
-      sha256 = "0nig0q0f0v6ay2w0k3r0pqlvjp1yg9s06f00qpizp679vc46gqs1";
+      rev =  "4789c7c401f229b3ae1673acbccca451480660cd";
+      sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp";
     };
   }
   {
@@ -167,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev =  "86672fcb3f950f35f2e675df2240550f2a50762f";
-      sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
+      rev =  "541ff5ee47f1dddf6a5281af78307d921524bcb5";
+      sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
     };
   }
   {
@@ -176,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev =  "c679ae2cc0cb27ec3293fea7e254e47386f05d69";
-      sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691";
+      rev =  "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
+      sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
     };
   }
   {
@@ -185,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev =  "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
-      sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
+      rev =  "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
+      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
     };
   }
   {
@@ -203,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev =  "5f9ae10d9af5b1c89ae6904293b14b064d4ada23";
-      sha256 = "10vzmdg8z73krbp2qhsqygvqd0f0s98376mrxm614xdcdljn73dn";
+      rev =  "ab5485076ff3407ad2d02db054635913f017b0ed";
+      sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7";
     };
   }
   {
@@ -212,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "bb9c189858d91f42db229b04d45a4c3d23a7662a";
-      sha256 = "0z20pql3hzlplcc8ywfq7a1s8mfixmcp84k656fdkmkdjfyvsl0v";
+      rev =  "14ac33bf8474b62c65cae263af2e4d3b543cc699";
+      sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3";
     };
   }
   {
@@ -221,8 +221,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-ini/ini";
-      rev =  "bda519ae5f4cbc60d391ff8610711627a08b86ae";
-      sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs";
+      rev =  "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
+      sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
     };
   }
   {
@@ -230,8 +230,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/neurosnap/sentences";
-      rev =  "b0f23a5b35b961fe821f49e51235242d2a8193f3";
-      sha256 = "0f5lmww1g4frd5avmqw120zzklcxk5z4l20r4d8zix7406ry7zrg";
+      rev =  "a7f18ead1433a139742a8b42ce7a059cfb484d60";
+      sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7";
     };
   }
   {
@@ -239,8 +239,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-yaml/yaml";
-      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      rev =  "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+      sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
     };
   }
 ]
\ No newline at end of file

From ba09b0570298dbbf583303d30491117375e04375 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 16 Sep 2018 22:47:28 -0400
Subject: [PATCH 1150/3253] grub: Use gcc6

GCC 7 wasn't kind to grub.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b743127ca885..1b9a890acbd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2943,6 +2943,7 @@ with pkgs;
 
   grub = pkgsi686Linux.callPackage ../tools/misc/grub {
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
+    stdenv = overrideCC stdenv pkgsi686Linux.gcc6;
   };
 
   trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { };

From 932c8f4c13d06ee7787e7099948eb5f926ce38dc Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 16 Sep 2018 22:47:56 -0400
Subject: [PATCH 1151/3253] grub: grub-0.97-patch-1.15 -> grub-0.97-73

Instead of using Gentoo's patchset, uses Debian's.

Gentoo's doesn't work anymore.
---
 pkgs/tools/misc/grub/default.nix       | 38 +++-----------
 pkgs/tools/misc/grub/grub1.patches.nix | 34 +++++++++++++
 pkgs/tools/misc/grub/grub1.patches.sh  | 70 ++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/tools/misc/grub/grub1.patches.nix
 create mode 100755 pkgs/tools/misc/grub/grub1.patches.sh

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 6ba931ad80d6..f5ba8b7fe100 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,52 +1,30 @@
 {stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}:
 
+let
+in
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.12";
+  name = "grub-0.97-73";
 
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
   };
 
-  # Lots of patches from Gentoo, in particular splash screen support
-  # (not the fancy SUSE gfxmenu stuff though).  Also a fix for boot
-  # failures on systems with more than 2 GiB RAM, and for booting from
-  # ext3 filesystems with 256-byte inodes as well as ext4 filesystems.
-  gentooPatches = fetchurl {
-    url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2;
-    sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0";
-  };
-
   patches = [
     # Properly handle the case of symlinks such as
     # /dev/disk/by-label/bla.  The symlink resolution code in
     # grub-install isn't smart enough.
     ./symlink.patch
-
-    # Provide support for the "savedefault --once" command in the Grub
-    # shell.  KDE uses this to allow rebooting into a non-default
-    # entry.
-    (fetchurl {
-      url = "https://raw.github.com/andatche/centos-grub/master/SOURCES/grub-0.97-once.patch";
-      sha256 = "1g5qfn8lvl32h4pggdf7dmjqjpi42jblknzakb5h909fi5i1qyw8";
-    })
-
-  ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch);
+  ]
+  ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch)
+  ++ map fetchurl (import ./grub1.patches.nix)
+  ;
 
   # autoreconfHook required for the splashimage patch.
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ texinfo ];
 
-  hardeningDisable = [ "stackprotector" ];
-
-  prePatch = ''
-    unpackFile $gentooPatches
-    rm patch/400_all_grub-0.97-reiser4-20050808-gentoo.patch
-    for i in patch/*.patch; do
-      echo "applying patch $i"
-      patch -p1 < $i || patch -p0 < $i
-    done
-  '';
+  hardeningDisable = [ "format" "stackprotector" ];
 
   passthru.grubTarget = "";
 
diff --git a/pkgs/tools/misc/grub/grub1.patches.nix b/pkgs/tools/misc/grub/grub1.patches.nix
new file mode 100644
index 000000000000..5ee8722b5eca
--- /dev/null
+++ b/pkgs/tools/misc/grub/grub1.patches.nix
@@ -0,0 +1,34 @@
+# Generated by grub1-patches.sh
+let
+  prefix = "https://salsa.debian.org/grub-team/grub-legacy/raw/1dad5507d74ef97fdd3c6cf2a028084f6f2850c3/debian/patches";
+in
+[
+{ url = "${prefix}/snapshot.patch"; sha256 = "0ixymrn5w1dq0kkxnzdjwwvhjchgyrlivfvnrfncxcv30v84xzna"; }
+{ url = "${prefix}/menu.lst_gnu-hurd.patch"; sha256 = "0mz8dvgmxlyrl28dza1ncfq1xipihxgymw4aw688bgg7xxmw7jbs"; }
+{ url = "${prefix}/graphics.patch"; sha256 = "1v9kp832f3rhncfdrd28djhw0zfrznfmiadch33mclnkcxprcqcs"; }
+{ url = "${prefix}/raid.patch"; sha256 = "0cq6dz5s7m48g76frvbf296bv4pvqkxqcbydsvs43ymqdsary7hj"; }
+{ url = "${prefix}/raid_cciss.patch"; sha256 = "0sy5xvzjsllgbn26nykkq4b69lp1fcwjkjs2kmxq38sk3dzadjfl"; }
+{ url = "${prefix}/xfs_freeze.patch"; sha256 = "1wqgj8ar4x4zwa37bj4a7kldiz5v92msigy3cv879nnk6sz4rmhg"; }
+{ url = "${prefix}/2gb_limit.patch"; sha256 = "06f9lfl4va3alz87wzli0df5ay0xxlqj2akr2dcay6jr27z6ks29"; }
+{ url = "${prefix}/grub-special_device_names.patch"; sha256 = "098608xh20sqdjqf42fm2z23r8xd9ify1v0vmy1j9qhrhk3g9qyz"; }
+{ url = "${prefix}/grub-xvd_drives.patch"; sha256 = "13k0m1c1w5d1d4qd1bshjc8kp7qba4agk2j64gb7mg8vfzjd35bj"; }
+{ url = "${prefix}/initrd_max_address.patch"; sha256 = "05q90rxdnyncpanhbkrknshkk7g8ff4v8fpk7wj4sg8666d9llg3"; }
+{ url = "${prefix}/splashimage_help.patch"; sha256 = "1lj3xh56wf1pdcf0fg585vmggrz7qqfzbhg91qv0rf4snf3ybfvr"; }
+{ url = "${prefix}/grub-install_addsyncs.patch"; sha256 = "1dzcpxi806kw3j8mx4amyy4ibc0ir3qhqyyyxz3w43741p351r65"; }
+{ url = "${prefix}/grub-install_regexp.patch"; sha256 = "0ph9lb63x858019c25aa3fpsm8rzn00ad8fp88yqqvq0xq2jxq69"; }
+{ url = "${prefix}/grub-install_aoe_support.patch"; sha256 = "19szmvg13h2hhijrwbgdszldg26iz7vjnagvajxb7nav7vca6k3n"; }
+{ url = "${prefix}/grub-install_xvd.patch"; sha256 = "1cgh731nhs0chj2r2dzh5dcfj5xmap34i3fk0i0aq59j83cwflgz"; }
+{ url = "${prefix}/geometry-26kernel.patch"; sha256 = "01vka7jrxrwlj9m1d6schygyh964a3k1rdrm3j9x910xkz74i13n"; }
+{ url = "${prefix}/print_func.patch"; sha256 = "0dvrcy1i58fgrv2x1qniqfr5az9b834hm5l94k0cy8ii2nfvk27g"; }
+{ url = "${prefix}/mprotect.patch"; sha256 = "0ahgnhgw2b86j024ajs6m3h2fy2shqdssjzz0ahk8ny9f4mnvns6"; }
+{ url = "${prefix}/savedefault.patch"; sha256 = "1l6x1s9mxkrf3k4j9dpg7qhvrk816vs70sw073iiisvqspnrz2j3"; }
+{ url = "${prefix}/find-grub-dir.patch"; sha256 = "1vkgig4dylji03jflwikhap87lz8l470ck1bhmcy8jh0slg6ndbf"; }
+{ url = "${prefix}/intelmac.patch"; sha256 = "04l9mk9xm9ml8vdlpbv3qbj7gbaa0g5k4dl7xp8wm7kmqwxd9l3m"; }
+{ url = "${prefix}/crossreference_manpages.patch"; sha256 = "0kd12ck4s4bg414fmllgvq8n4b58i3kgdhmcx6riaz43gg2g2b9p"; }
+{ url = "${prefix}/ext3_256byte_inode.patch"; sha256 = "0ay9svbdj7mw8p1ld0iiryg6nhd9hc1xpmr9rqg9990xzmg2h4pi"; }
+{ url = "${prefix}/objcopy-absolute.patch"; sha256 = "0hkmicjli7bsmc56kr40ls21v6x3yd188xpwc08dvqxnb0763077"; }
+{ url = "${prefix}/no-reorder-functions.patch"; sha256 = "0gmv0nzkqim2901hd0an90kwnr83155qp2zjp52biznad2p415gw"; }
+{ url = "${prefix}/modern-automake.patch"; sha256 = "08l3y6cbk6gfj63kpqlpzrlain7nmvki7jjjxq86n7himj078znj"; }
+{ url = "${prefix}/no-combine-stack-adjustments.patch"; sha256 = "0h4di8zja0rg45rs02x9qm8q1vxly1bcl6ms08wgdl5ywn6849nr"; }
+{ url = "${prefix}/no-pie.patch"; sha256 = "0kshdsclza7lsd31apd28qq04arv42nd6wsj2v6q6jx7f8bgdaqw"; }
+]
diff --git a/pkgs/tools/misc/grub/grub1.patches.sh b/pkgs/tools/misc/grub/grub1.patches.sh
new file mode 100755
index 000000000000..d3b138ad3577
--- /dev/null
+++ b/pkgs/tools/misc/grub/grub1.patches.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p nix -i bash --pure
+
+# Does like `maintainers/scripts/debian-patches.sh`, but specialized for
+# grub1 patches, and using the new salsa service.
+
+# Most common usage: `pkgs/tools/misc/grub/grub1.patches.sh pkgs/tools/misc/grub/grub1.patches.nix`
+# That is, after updating the script with the new list from the series file,
+# removing (by commenting) patches as required.
+
+set -e
+set -u
+
+# https://salsa.debian.org/grub-team/grub-legacy/tree/master/debian/patches
+SERIES=(
+	snapshot.patch
+	menu.lst_gnu-hurd.patch
+	graphics.patch
+	raid.patch
+	raid_cciss.patch
+	xfs_freeze.patch
+	2gb_limit.patch
+	grub-special_device_names.patch
+	grub-xvd_drives.patch
+	initrd_max_address.patch
+	splashimage_help.patch
+	grub-install_addsyncs.patch
+	grub-install_regexp.patch
+	grub-install_aoe_support.patch
+	grub-install_xvd.patch
+	geometry-26kernel.patch
+	print_func.patch
+	mprotect.patch
+	savedefault.patch
+	find-grub-dir.patch
+	intelmac.patch
+	crossreference_manpages.patch
+	ext3_256byte_inode.patch
+    # Breaks on NixOS.
+	#use_grub-probe_in_grub-install.patch
+	objcopy-absolute.patch
+	no-reorder-functions.patch
+
+	# We aren't building amd64 binaries, see #244498
+	#fix_amd64_compile.patch
+	modern-automake.patch
+	no-combine-stack-adjustments.patch
+	no-pie.patch
+)
+
+# Revision mapping to current tip of the 0.97-73 branch.
+rev="1dad5507d74ef97fdd3c6cf2a028084f6f2850c3"
+prefix="https://salsa.debian.org/grub-team/grub-legacy/raw/${rev}/debian/patches"
+FILE="$1"
+shift
+
+cat <<EOF > "$FILE"
+# Generated by grub1-patches.sh
+let
+  prefix = "${prefix}";
+in
+[
+EOF
+
+for PATCH in "${SERIES[@]}"; do
+	URL="$prefix/$PATCH"
+	HASH="$(nix-prefetch-url "$URL")"
+	echo "{ url = \"\${prefix}/$PATCH\"; sha256 = \"$HASH\"; }" >> "$FILE"
+done
+echo "]" >> "$FILE"

From b63c539bdc965710bc666eebd8f1f2dd2c208841 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 17 Sep 2018 00:24:01 -0400
Subject: [PATCH 1152/3253] nixos/tests/installer: grub1 needs /tmp to exist.

---
 nixos/tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 3d31c8dc4457..610444f90e47 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -563,6 +563,7 @@ in {
               "swapon -L swap",
               "mkfs.ext3 -L nixos /dev/sda2",
               "mount LABEL=nixos /mnt",
+              "mkdir -p /mnt/tmp",
           );
         '';
       grubVersion = 1;

From bd02b3352ae45cf0890d63409e7796894b75c44c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 17 Sep 2018 09:41:16 -0400
Subject: [PATCH 1153/3253] emby: 3.4.1.0 -> 3.5.2.0

---
 pkgs/servers/emby/default.nix | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index baeefc7ff9c8..11cb914bfd80 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -1,23 +1,32 @@
-{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono54, ffmpeg, ... }:
+{ stdenv, fetchurl, unzip, sqlite, makeWrapper, mono54, ffmpeg }:
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.4.1.0";
+  version = "3.5.2.0";
 
+  # We are fetching a binary here, however, a source build is possible.
+  # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43
+  # Though in my attempt it failed with this error repeatedly
+  # The type 'Attribute' is defined in an assembly that is not referenced. You must add a reference to assembly 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'.
+  # This may also need msbuild (instead of xbuild) which isn't in nixpkgs
+  # See -> https://github.com/NixOS/nixpkgs/issues/29817
   src = fetchurl {
-    url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "08jr6v8xhmiwbby0lfvpjrlma280inwh5qp6v4p93lzd07fjynh5";
+    url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-mono_${version}.zip";
+    sha256 = "12f9skvnr9qxnrvr3q014yggfwvkpjk0ynbgf0fwk56h4kal7fx8";
   };
 
-  buildInputs = with pkgs; [
+  buildInputs = [
     unzip
     makeWrapper
   ];
-  propagatedBuildInputs = with pkgs; [
+
+  propagatedBuildInputs = [
     mono54
     sqlite
   ];
 
+  preferLocalBuild = true;
+
   # Need to set sourceRoot as unpacker will complain about multiple directory output
   sourceRoot = ".";
 
@@ -27,18 +36,18 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -r * $out/bin
+    mkdir -p "$out/bin"
+    cp -r * "$out/bin"
 
     makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
       --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 
-  meta = {
+  meta =  with stdenv.lib; {
     description = "MediaBrowser - Bring together your videos, music, photos, and live television";
     homepage = https://emby.media/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.fadenb ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fadenb ];
+    platforms = platforms.all;
   };
 }

From f11f709c6de87e24196db82da61d4a189c1aa6a2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 17 Sep 2018 15:04:51 +0100
Subject: [PATCH 1154/3253] win-virtio: 0.1.105-1 -> 0.1.141-1 (#46783)

---
 .../virtualization/driver/win-virtio/default.nix      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index f7a2f6e6f308..946014e5cc9a 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, p7zip }:
-
-stdenv.mkDerivation  {
-  name = "win-virtio-0.1.105-1";
-  version = "0.1.105-1";
+stdenv.mkDerivation rec {
+  name = "win-virtio-${version}";
+  version = "0.1.141-1";
 
   phases = [ "buildPhase" "installPhase" ];
 
   src = fetchurl {
-    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso";
-    sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc";
+    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
+    sha256 = "0mn5gcgb9dk59nrw9scdza628yiji4vdkxmixikn9v02kgwnkja3";
   };
 
   buildPhase = ''

From 969a39bd09003d8fbc5d15d18472c60ee2058aec Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Mon, 17 Sep 2018 17:06:44 +0300
Subject: [PATCH 1155/3253] zoom-us: 2.3.128305.0716 -> 2.4.129780.0915, QT
 downgrade (#46778)

Qt 5.11 was downgraded to 5.9 because of two issues:
- spawns errors like
```
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:20:9: QML BusyIndicator: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
qrc:/qml/SignInWaiting.qml:26:9: QML Text: Detected anchors on an item that is managed by a layout. This is undefined behavior; use Layout.alignment instead.
```
- Google login doesn't work. It just doesn't start embedded webbrowser
---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 882215c50c5c..d271d5d48491 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "2.3.128305.0716";
+  version = "2.4.129780.0915";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh";
+      sha256 = "0s4014ymc92rwpagcwjhmwwfz0vq35wiq2nhh6nlxcrr6jl4wd78";
     };
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849bafd26889..afa486eeb0ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19696,7 +19696,7 @@ with pkgs;
 
   zim = callPackage ../applications/office/zim { };
 
-  zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { };
+  zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { };
 
   zotero = callPackage ../applications/office/zotero { };
 

From 57834da7fcc45087f9076ef9a922f1ae4a1e8b1d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@users.noreply.github.com>
Date: Mon, 17 Sep 2018 09:55:18 -0400
Subject: [PATCH 1156/3253] nixos/tor: Correct "transparent" typo

---
 nixos/modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index def77ba69e58..9b6d4be9bda8 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -208,7 +208,7 @@ in
           enable = mkOption {
             type = types.bool;
             default = false;
-            description = "Whether to enable tor transaprent proxy";
+            description = "Whether to enable tor transparent proxy";
           };
 
           listenAddress = mkOption {

From 9f461416311719c16981d5915d50e38ad50a3ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 17 Sep 2018 11:36:53 -0300
Subject: [PATCH 1157/3253] greybird: 3.22.7 -> 3.22.9

---
 pkgs/misc/themes/greybird/default.nix | 33 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 1221c6606872..bb782059ff6b 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -1,26 +1,39 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, sass, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "3.22.7";
+  version = "3.22.9";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "118k0bb780h54i2vn5my5r6vbkk134899xwp4aigw5a289xzryvb";
+    sha256 = "0mixs47v0jvqpmfsv0k0d0l24y4w35krah8mgnwamr0b8spmazz3";
   };
 
-  nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];
+  nativeBuildInputs = [
+    autoreconfHook
+    which
+    sassc
+    glib
+    libxml2
+  ];
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+  buildInputs = [
+    gdk_pixbuf
+    librsvg
+  ];
 
-  meta = {
-    description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)";
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
     homepage = https://github.com/shimmerproject/Greybird;
-    license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = with licenses; [ gpl2Plus cc-by-nc-sa-30 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 61dbb0c74e35e101f11ff66612a572c206a8e72f Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Sat, 15 Sep 2018 23:43:57 +1000
Subject: [PATCH 1158/3253] bazel: 0.16.1 -> 0.17.1

---
 .../tools/build-managers/bazel/default.nix            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index ff9cc3eb45aa..e9f005f79917 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  version = "0.16.1";
+  version = "0.17.1";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9";
+    sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13";
   };
 
   sourceRoot = ".";
@@ -89,6 +89,9 @@ stdenv.mkDerivation rec {
       # and linkers from Xcode instead of from PATH
       export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
 
+      # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
+      export GCOV=${coreutils}/bin/false
+
       # Framework search paths aren't added by bintools hook
       # https://github.com/NixOS/nixpkgs/pull/41914
       export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
@@ -97,6 +100,10 @@ stdenv.mkDerivation rec {
       # https://github.com/NixOS/nixpkgs/pull/41589
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
 
+      # 10.10 apple_sdk Foundation doesn't have type arguments on classes
+      # Remove this when we update apple_sdk
+      sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
+
       # don't use system installed Xcode to run clang, use Nix clang instead
       sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
         scripts/bootstrap/compile.sh \

From 676ceb81b783589e38d76615f4617ca838fe772b Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 18 Sep 2018 00:30:25 +0900
Subject: [PATCH 1159/3253] python3Packages.mypy: 0.620 -> 0.630

Now requires mypy_extensions so added it as well.
---
 .../python-modules/mypy/default.nix           |  9 ++++---
 .../python-modules/mypy/extensions.nix        | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/mypy/extensions.nix

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 021f3461e535..2cd2e2484e67 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k
+,mypy_extensions }:
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.620";
+  version = "0.630";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c770605a579fdd4a014e9f0a34b6c7a36ce69b08100ff728e96e27445cef3b3c";
+    sha256 = "1p8rnap4ngczfm2q4035mcmn5nsprbljnhksx2jxzxrb9immh137";
   };
 
   disabled = !isPy3k;
 
-  propagatedBuildInputs = [ lxml typed-ast psutil ];
+  propagatedBuildInputs = [ lxml typed-ast psutil mypy_extensions ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
new file mode 100644
index 000000000000..8ed3f5ce86cf
--- /dev/null
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchPypi, buildPythonPackage, typing, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "mypy_extensions";
+  version = "0.4.1";
+
+  # Tests not included in pip package.
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p";
+  };
+
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [ typing ];
+
+  meta = with stdenv.lib; {
+    description = "Experimental type system extensions for programs checked with the mypy typechecker";
+    homepage    = "http://www.mypy-lang.org";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ martingms lnl7 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4e46ea8889a..5936345bf0a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7786,6 +7786,8 @@ in {
 
   mypy = callPackage ../development/python-modules/mypy { };
 
+  mypy_extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
+
   mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
 
   mwclient = buildPythonPackage rec {

From e48811f83d1d2d2a81535f5d8151af5245fd4220 Mon Sep 17 00:00:00 2001
From: aanderse <aaron@fosslib.net>
Date: Mon, 17 Sep 2018 13:02:16 -0400
Subject: [PATCH 1160/3253] php: add option to enable argon2

---
 pkgs/development/interpreters/php/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 8310f381fcf0..adffe647c365 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -3,7 +3,7 @@
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
 }:
 
 with lib;
@@ -54,6 +54,7 @@ let
   , calendarSupport ? config.php.calendar or true
   , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
   , tidySupport ? (config.php.tidy or false)
+  , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2")
   }:
 
     let
@@ -95,7 +96,8 @@ let
         ++ optional bz2Support bzip2
         ++ optional (mssqlSupport && !stdenv.isDarwin) freetds
         ++ optional sodiumSupport libsodium
-        ++ optional tidySupport html-tidy;
+        ++ optional tidySupport html-tidy
+        ++ optional argon2Support libargon2;
 
       CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
 
@@ -160,7 +162,8 @@ let
       ++ optional ztsSupport "--enable-maintainer-zts"
       ++ optional calendarSupport "--enable-calendar"
       ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
-      ++ optional tidySupport "--with-tidy=${html-tidy}";
+      ++ optional tidySupport "--with-tidy=${html-tidy}"
+      ++ optional argon2Support "--with-password-argon2=${libargon2}";
 
 
       hardeningDisable = [ "bindnow" ];

From 78936513a6e0f19b56a6aef4bbcc5414a801a538 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 18 Sep 2018 01:13:10 +0900
Subject: [PATCH 1161/3253] gtkspellmm: 3.0.4 -> 3.0.5

Archive extension changed from tar.gz to tar.xz so be careful !
---
 pkgs/development/libraries/gtkspellmm/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index 04456b440193..cb141f8c5569 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -3,18 +3,14 @@
 , gtk3, glib, glibmm, gtkmm3, gtkspell3
 }:
 
-let
-  version = "3.0.4";
-
-in
-
 stdenv.mkDerivation rec {
   name = "gtkspellmm-${version}";
+  version = "3.0.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
-          "${name}.tar.gz";
-    sha256 = "0x6zx928dl62f0c0x6b2s32i06lvn18wx7crrgs1j9yjgkim4k4k";
+          "${name}.tar.xz";
+    sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv";
   };
 
   propagatedBuildInputs = [

From 50578abfc5e42b47247c486bf845c310c2299d8d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 20:21:21 +0200
Subject: [PATCH 1162/3253] fetchcargo: Fix cargo-vendor-normalise for darwin

---
 pkgs/build-support/rust/fetchcargo.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index eb51e5c4ff9a..9e77f8817b24 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -2,8 +2,11 @@
 let cargo-vendor-normalise = stdenv.mkDerivation {
   name = "cargo-vendor-normalise";
   src = ./cargo-vendor-normalise.py;
+  nativeBuildInputs = [ python3.pkgs.wrapPython ];
   unpackPhase = ":";
   installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
+  pythonPath = [ python3.pkgs.toml ];
+  postFixup = "wrapPythonPrograms";
   doInstallCheck = true;
   installCheckPhase = ''
     # check that ./fetchcargo-default-config.toml is a fix point
@@ -11,7 +14,6 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
     < $reference $out/bin/cargo-vendor-normalise > test;
     cmp test $reference
   '';
-  buildInputs = [ (python3.withPackages(ps: [ ps.toml ])) ];
   preferLocalBuild = true;
 };
 in

From 7f2f989d6a001ee5877110f21a31387b2d0e860a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Sep 2018 17:50:38 +0000
Subject: [PATCH 1163/3253] compcert: 3.3 -> 3.4

---
 pkgs/development/compilers/compcert/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 631179c483bc..a0058242bad8 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchpatch
-, coq, ocamlPackages
+, coq, ocamlPackages, coq2html
 , tools ? stdenv.cc
 }:
 
@@ -7,23 +7,18 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "3.3";
+  version = "3.4";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "16xrqcwak1v1fk5ndx6jf1yvxv3adsr7p7z34gfm2mpggxnq0xwn";
+    sha256 = "12gchwvkzhd2bhrnwzfb4a06wc4hgv98z987k06vj7ga31ii763h";
   };
 
-  buildInputs = [ coq ]
+  buildInputs = [ coq coq2html ]
   ++ (with ocamlPackages; [ ocaml findlib menhir ]);
 
   enableParallelBuilding = true;
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/AbsInt/CompCert/commit/679ecfeaa24c0615fa1999e9582bf2af6a9f35e7.patch";
-   sha256 = "04yrn6dp57aw6lmlr4yssjlx9cxix0mlmaw7gfhwyz5bzqc2za1a";
-  })];
-
   configurePhase = ''
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +

From ba5717a6f5d2e474a4caf65a1be5750469b447bd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 17 Sep 2018 14:13:43 -0500
Subject: [PATCH 1164/3253] stdenv: fix HOST_PATH change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

a4630c65caf was incorrect in assuming $SHELL would be a path to the
bash derivation. In fact $SHELL will be a path to the bash executable.

Unfortunately this did not fix the original issue. So instead, we just
have to reuse initialPath can be added like PATH is.

Sorry for the inconvenience! I hadn’t thought through the effects of
the last commit.

/cc @copumpkin @ericson2314
---
 pkgs/stdenv/generic/setup.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 9a620abfbade..11d0f1fbce43 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -261,6 +261,13 @@ HOST_PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi
     addToSearchPath PATH "$i/bin"
+
+    # For backward compatibility, we add initial path to HOST_PATH so
+    # it can be used in auto patch-shebangs. Unfortunately this will
+    # not work with cross compilation.
+    if [ -z "${strictDeps-}" ]; then
+        addToSearchPath HOST_PATH "$i/bin"
+    fi
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
@@ -273,13 +280,6 @@ if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
 BASH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 
-# For backward compatibility, we add SHELL to HOST_PATH so it can be
-# used in auto patch-shebangs. Unfortunately this will not work with
-# cross compilation because it will be for the builder’s platform.
-if [ -z "${strictDeps-}" ]; then
-    addToSearchPath HOST_PATH "$SHELL/bin"
-fi
-
 # Dummy implementation of the paxmark function. On Linux, this is
 # overwritten by paxctl's setup hook.
 paxmark() { true; }

From 883b86e065dd02942ad912834498712160387807 Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Mon, 17 Sep 2018 19:31:32 +0000
Subject: [PATCH 1165/3253] linux-hardkernel: 4.14.66-147 -> 4.14.69-148
 (#46791)

---
 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index d1d7d240cce5..0afb92d705c6 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,10 +1,10 @@
 { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.14.66-147";
+  version = "4.14.69-148";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.66";
+  modDirVersion = "4.14.69";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "06v38jl4i7l8gl8zcpyp9vmjjhaqhbp7by15f82rxa724zppxi9x";
+    sha256 = "1grsmb7lnxnkva03nh8ny4zizvrxjim5kf5ssqkcbfz5mx1fqni0";
   };
 
   defconfig = "odroidxu4_defconfig";

From 5f2eacccf61c5535453a8160be3da643f319875e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Sep 2018 21:33:47 +0200
Subject: [PATCH 1166/3253] pythonPackages.mahotas: skip
 `test_moments.test_normalize` and `test_texture.test_haralick3d` testcase
 (#46793)

As stated in #46368, this package seems to have issues with impure tests
(reported in https://github.com/luispedro/mahotas/issues/97).

Unfortunately the `release-18.09` job on Hydra fails at the attempt to
build this package since `test_moments.test_normalize1` and
`test_texture.test_haralick3d` breaks. Until
the root cause is identified, we skip the disabled tests to ensure that
the resulting package is not entirely broken (which can't be confirmed
with `doCheck = false`).

See https://hydra.nixos.org/job/nixos/release-18.09/nixpkgs.python27Packages.mahotas.x86_64-linux
See https://hydra.nixos.org/job/nixos/release-18.09/nixpkgs.python36Packages.mahotas.x86_64-linux
See https://logs.nix.ci/?key=nixos/nixpkgs.46793&attempt_id=b85a638d-dcb0-41d3-ab2a-9616a3bb0175

/cc @xeji @luispedro
---
 .../mahotas/disable-impure-tests.patch        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
index a61503f9522e..f19bd329e662 100644
--- a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
+++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch
@@ -32,3 +32,45 @@ index 462f467..2381793 100644
  def test_ellipse_axes():
      Y,X = np.mgrid[:1024,:1024]
      Y = Y/1024.
+diff --git a/mahotas/tests/test_moments.py b/mahotas/tests/test_moments.py
+index 686c7c3..ba3487b 100644
+--- a/mahotas/tests/test_moments.py
++++ b/mahotas/tests/test_moments.py
+@@ -1,6 +1,7 @@
+ import numpy as np
+ import mahotas as mh
+ from mahotas.features.moments import moments
++from nose.tools import nottest
+ 
+ def _slow(A, p0, p1, cm):
+     c0,c1 = cm
+@@ -28,7 +29,7 @@ def test_against_slow():
+     yield perform, 1, 2, (0, 0), A
+     yield perform, 1, 0, (0, 0), A
+ 
+-
++@nottest
+ def test_normalize():
+     A,B = np.meshgrid(np.arange(128),np.arange(128))
+     for p0,p1 in [(1,1), (1,2), (2,1), (2,2)]:
+diff --git a/mahotas/tests/test_texture.py b/mahotas/tests/test_texture.py
+index 7e101ba..af1305d 100644
+--- a/mahotas/tests/test_texture.py
++++ b/mahotas/tests/test_texture.py
+@@ -2,7 +2,7 @@ import numpy as np
+ from mahotas.features import texture
+ import mahotas as mh
+ import mahotas.features._texture
+-from nose.tools import raises
++from nose.tools import raises, nottest
+ 
+ def test__cooccurence():
+     cooccurence = mahotas.features._texture.cooccurence
+@@ -149,6 +149,7 @@ def test_float_haralick():
+     A[2,2]=12
+     texture.haralick(A)
+ 
++@nottest
+ def test_haralick3d():
+     np.random.seed(22)
+     img = mahotas.stretch(255*np.random.rand(20,20,4))

From c3dd421a2ef5f8a4c5f1d0564fa02d5cd8a36d30 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 17 Sep 2018 22:01:11 +0200
Subject: [PATCH 1167/3253] exim: enable LMTP support

This makes the LMTP transport available by default.
No additional dependency is required.
---
 pkgs/servers/mail/exim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index cf68b1bef40d..07623a80f243 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
       s:^\(CONFIGURE_FILE\)=.*:\1=/etc/exim.conf:
       s:^\(EXIM_USER\)=.*:\1=ref\:nobody:
       s:^\(SPOOL_DIRECTORY\)=.*:\1=/exim-homeless-shelter:
+      s:^# \(TRANSPORT_LMTP\)=.*:\1=yes:
       s:^# \(SUPPORT_MAILDIR\)=.*:\1=yes:
       s:^EXIM_MONITOR=.*$:# &:
       s:^\(FIXED_NEVER_USERS\)=root$:\1=0:

From 06eeeed171e53119ca6843fabfa2f490125e61c2 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jeff@pololu.com>
Date: Mon, 17 Sep 2018 11:44:04 -0700
Subject: [PATCH 1168/3253] mattermost: 5.1.0 -> 5.3.0

---
 pkgs/servers/mattermost/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 0654da927769..91ca3219a826 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "5.1.0";
+  version = "5.3.0";
 
   mattermost-server = buildGoPackage rec {
     name = "mattermost-server-${version}";
@@ -10,7 +10,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc";
+      sha256 = "0hll62ad12drlqarr7y7zvjj0b12snqm8j5k923lj0064nlpc47z";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z";
+      sha256 = "1yzhy37frbhik6iq5z8bglpfcjlwnbgcf5iy1davkh7iqpcbxb0s";
     };
 
     installPhase = ''

From dbc3d5039619fe83d3683e413a7cf6f971abd9ac Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Mon, 17 Sep 2018 23:04:22 +0300
Subject: [PATCH 1169/3253] git-lfs: 2.4.2 -> 2.5.2

---
 pkgs/applications/version-management/git-lfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 6ca563f7d1a6..67c07072d41f 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  version = "2.4.2";
+  version = "2.5.2";
 
   goPackagePath = "github.com/git-lfs/git-lfs";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0ww1jh45nlm74vbi4n6cdxi35bzgjlqmz3q8h9igdwfhkf79kd5c";
+    sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck";
   };
 
   preBuild = ''
@@ -20,7 +20,7 @@ buildGoPackage rec {
   '';
 
   postInstall = ''
-    rm -v $bin/bin/{man,script,genmakefile}
+    rm -v $bin/bin/{man,script,cmd}
   '';
 
   meta = with stdenv.lib; {

From 6ab1ee495150d73b95bdcde3034d5145285f5174 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 17 Sep 2018 22:23:44 +0200
Subject: [PATCH 1170/3253] heroku: 5.6.32 -> 7.16.0

---
 pkgs/development/tools/heroku/default.nix | 79 ++++++-----------------
 pkgs/top-level/all-packages.nix           |  4 +-
 2 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 9c5cbb1aa285..ab4864829050 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -1,70 +1,29 @@
-{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
-, nodejs-6_x, postgresql, ruby }:
+{ stdenv, lib, fetchurl, makeWrapper, nodejs }:
 
-with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "heroku-${version}";
+  version = "7.16.0";
 
-let
-  cli = buildGoPackage rec {
-    name = "cli-${version}";
-    version = "5.6.32";
-
-    goPackagePath = "github.com/heroku/cli";
-
-    src = fetchFromGitHub {
-      owner  = "heroku";
-      repo   = "cli";
-      rev    = "v${version}";
-      sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz";
-    };
-
-    buildFlagsArray = ''
-      -ldflags=
-        -X=main.Version=${version}
-        -X=main.Channel=stable
-        -X=main.Autoupdate=no
-    '';
-
-    preCheck = ''
-      export HOME=/tmp
-    '';
-
-    doCheck = true;
+  src = fetchurl {
+    url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
+    sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe";
   };
 
-in stdenv.mkDerivation rec {
-  name = "heroku-${version}";
-  version = "3.43.16";
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/share/heroku $out/bin
+    cp -pr * $out/share/heroku
+    substituteInPlace $out/share/heroku/bin/run \
+      --replace "/usr/bin/env node" "${nodejs}/bin/node"
+    makeWrapper $out/share/heroku/bin/run $out/bin/heroku
+  '';
 
   meta = {
     homepage = https://toolbelt.heroku.com;
     description = "Everything you need to get started using Heroku";
-    maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
-    license = licenses.mit;
-    platforms = with platforms; unix;
-    broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
+    maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; unix;
   };
-
-  binPath = lib.makeBinPath [ postgresql ruby ];
-
-  buildInputs = [ makeWrapper ];
-
-  doUnpack = false;
-
-  src = fetchurl {
-    url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
-    sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
-  };
-
-  installPhase = ''
-    mkdir -p $out
-
-    tar xzf $src -C $out --strip-components=1
-    install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
-
-    wrapProgram $out/bin/heroku \
-      --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
-      --set XDG_DATA_HOME    $out/share \
-      --set XDG_DATA_DIRS    $out/share \
-      --prefix PATH : ${binPath}
-  '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7acf0e4df12f..af6e8538e8b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8386,7 +8386,9 @@ with pkgs;
     inherit (perlPackages) LocaleGettext;
   };
 
-  heroku = callPackage ../development/tools/heroku { };
+  heroku = callPackage ../development/tools/heroku {
+    nodejs = nodejs-10_x;
+  };
 
   htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
 

From 1f8dc21c940eef4b0154dbf764892d62852b9204 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 17 Sep 2018 22:33:52 +0200
Subject: [PATCH 1171/3253] heroku: skip build phase

---
 pkgs/development/tools/heroku/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index ab4864829050..d8804020f737 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/share/heroku $out/bin
     cp -pr * $out/share/heroku

From db571e9b78811f848c20185e8b3ed9b52b187e89 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 17 Sep 2018 22:34:45 +0200
Subject: [PATCH 1172/3253] heroku: set HEROKU_DISABLE_AUTOUPDATE=1

---
 pkgs/development/tools/heroku/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index d8804020f737..69370e89c343 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     cp -pr * $out/share/heroku
     substituteInPlace $out/share/heroku/bin/run \
       --replace "/usr/bin/env node" "${nodejs}/bin/node"
-    makeWrapper $out/share/heroku/bin/run $out/bin/heroku
+    makeWrapper $out/share/heroku/bin/run $out/bin/heroku \
+      --set HEROKU_DISABLE_AUTOUPDATE 1
   '';
 
   meta = {

From afd86206210e468173ec0d2a0e135843d5ab2ee7 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 22:40:08 +0200
Subject: [PATCH 1173/3253] lib/tests: Add overrideExisting tests

---
 lib/tests/misc.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index d3bd7746d89c..d89bcfde4819 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -236,6 +236,20 @@ runTests {
     };
   };
 
+  testOverrideExistingEmpty = {
+    expr = overrideExisting {} { a = 1; };
+    expected = {};
+  };
+
+  testOverrideExistingDisjoint = {
+    expr = overrideExisting { b = 2; } { a = 1; };
+    expected = { b = 2; };
+  };
+
+  testOverrideExistingOverride = {
+    expr = overrideExisting { a = 3; b = 2; } { a = 1; };
+    expected = { a = 1; b = 2; };
+  };
 
 # GENERATORS
 # these tests assume attributes are converted to lists

From c7104d97c87316a6062c88696d80a45918fab7a6 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 23:28:47 +0200
Subject: [PATCH 1174/3253] lib.overrideExisting: Better example

---
 lib/attrsets.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 9bac69af34f3..2a1b866dbc5e 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -435,9 +435,12 @@ rec {
     useful for deep-overriding.
 
     Example:
-      x = { a = { b = 4; c = 3; }; }
-      overrideExisting x { a = { b = 6; d = 2; }; }
-      => { a = { b = 6; d = 2; }; }
+      overrideExisting {} { a = 1; }
+      => {}
+      overrideExisting { b = 2; } { a = 1; }
+      => { b = 2; }
+      overrideExisting { a = 3; b = 2; } { a = 1; }
+      => { a = 1; b = 2; }
   */
   overrideExisting = old: new:
     mapAttrs (name: value: new.${name} or value) old;

From 11dcb770b9cf78ab8676cc8127e84762f353cdcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Sep 2018 22:38:22 +0100
Subject: [PATCH 1175/3253] heroku: fix homepage

---
 pkgs/development/tools/heroku/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 69370e89c343..ba9ac923d11c 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://toolbelt.heroku.com;
+    homepage = https://cli.heroku.com;
     description = "Everything you need to get started using Heroku";
     maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
     license = lib.licenses.mit;

From 891dbfe6d474b3fcee8297eb9aac583f37e98dd1 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 18 Sep 2018 00:17:46 +0200
Subject: [PATCH 1176/3253] krakenx: 0.0.1 -> 0.0.3

---
 pkgs/tools/system/krakenx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix
index db0987d70739..c6866264a9b0 100644
--- a/pkgs/tools/system/krakenx/default.nix
+++ b/pkgs/tools/system/krakenx/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "krakenx";
-  version = "0.0.1";
+  version = "0.0.3";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1vxyindph81srya0pfmb3n64n8h7ghp38ak86vc2zc5nyirf5zq8";
+    sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000";
   };
 
   propagatedBuildInputs = lib.singleton python3Packages.pyusb;
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false; # there are no tests
 
   meta = with lib; {
-    description = "Python script to control NZXT cooler Kraken X52/X62";
+    description = "Python script to control NZXT cooler Kraken X52/X62/X72";
     homepage = https://github.com/KsenijaS/krakenx;
     license = licenses.gpl2;
     maintainers = [ maintainers.willibutz ];

From b80d254e734d4ee1cc8bf3de203ea5dc5a265a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 17 Sep 2018 19:31:29 -0300
Subject: [PATCH 1177/3253] elementary-xfce-icon-theme: 0.12 -> 0.13

---
 .../elementary-xfce-icon-theme/default.nix    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 4b3f7f54ad1a..9aa61e856ff8 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,27 +1,24 @@
-{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "elementary-xfce-icon-theme-${version}";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
-    rev = "elementary-xfce-${version}";
-    sha256 = "036676443sj4lxm7z211b0br87zdnbrb9z41czfq65r1wwwdf3rq";
+    rev = "v${version}";
+    sha256 = "01hlpw4vh4kgyghki01jp0snbn0g79mys28fb1m993mivnlzmn75";
   };
 
-  nativeBuildInputs = [ gtk3 hicolor-icon-theme ];
+  nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
 
-  installPhase = ''
-    mkdir -p $out/share/icons
-    mv elementary-xfce* $out/share/icons
+  postPatch = ''
+    substituteInPlace svgtopng/Makefile --replace "-O0" "-O"
   '';
 
-  postFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
+  postInstall = ''
+    make icon-caches
   '';
 
   meta = with stdenv.lib; {

From 91b67af0f6657049ec59d226c0dda0dbacf6b291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 17 Sep 2018 23:19:11 +0100
Subject: [PATCH 1178/3253] alacritty: 2018-08-05 -> 0.2.0

---
 pkgs/applications/misc/alacritty/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 98e93321265e..8be3db97c2b0 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -50,14 +50,14 @@ let
     OpenGL
   ];
 in buildRustPackage rec {
-  name = "alacritty-unstable-${version}";
-  version = "2018-08-05";
+  name = "alacritty-${version}";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "alacritty";
-    rev = "1adb5cb7fc05054197aa08e0d1fa957df94888ab";
-    sha256 = "06rc7dy1vn59lc5hjh953h9lh0f39c0n0jmrz472mrya722fl2ab";
+    rev = "v${version}";
+    sha256 = "11z7diji64x6n3m5m2d0a9215aajg7mpklflvpwrglmghnvi74y6";
   };
 
   cargoSha256 = "0ms0248bb2lgbzcqks6i0qhn1gaiim3jf1kl17qw52c8an3rc652";

From dc5c68a7bb03e8807f8ab8ad30e5eb11d1f29302 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 17 Sep 2018 18:46:26 -0400
Subject: [PATCH 1179/3253] stdenv/darwin: bump bootstrap tools

You can verify the provenance of these yourself by checking Hydra here:
https://hydra.nixos.org/build/81511173
---
 pkgs/stdenv/darwin/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index c361ae6e4021..a08ea3b34bac 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,15 +4,15 @@
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/d5bdfcbfe6346761a332918a267e82799ec954d2/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/a257d64f333caa50facc57c0e3fc6a64620ed348/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "07wm33f1yzfpcd3rh42f8g096k4cvv7g65p968j28agzmm2s7s8m"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "0y9ri2aprkrp2dkzm6229l0mw4rxr2jy7vvh3d8mxv2698v2kdbm"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "0sb07xpy66ws6f2jfnpjibyimzb71al8n8c6y4nr8h50al3g90nr"; };
-    cpio    = fetch { file = "cpio";  sha256 = "0r5c54hg678w7zydx27bzl9p3v9fs25y5ix6vdfi1ilqim7xh65n"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "18hp5w6klr8g307ap4368r255qpzg9r0vwg9vqvj8f2zy1xilcjf"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "0a8q8sdqwvs5kn9ia6rkmr36xa5y6g44a9nww5kxbyvsvwmw22y6"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "0j256wrz1a5d21800h6k8cr20bka6fhpb47qig01n2mc0bc3db2m"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "1rqzhcc0rccnck31a728j8va4xw54r17k4d58c5bi5z8hjz4458f"; };
+    cpio    = fetch { file = "cpio";  sha256 = "1680lxhqfldsvg9as19xv34kjpka6vn3nm9d91w0rh90sbqpa610"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0cvwj6q16f6b2q6lx43lly1a8dwkxpvck2946qln2fmcmgin3rpq"; executable = false; };
   }
 }:
 

From f1737fa64663b5ab203c0974675298288eda84a3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 17 Sep 2018 17:48:59 -0500
Subject: [PATCH 1180/3253] foundationdb60: 6.0.4pre2497_73d64cb2 ->
 6.0.11pre2716_9e8c1941e

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 265255c2f78a..b16287f40d79 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -165,9 +165,9 @@ in with builtins; {
   };
 
   foundationdb60 = makeFdb rec {
-    version = "6.0.4pre2497_${substring 0 8 rev}";
+    version = "6.0.11pre2716_${substring 0 8 rev}";
     branch  = "release-6.0";
-    rev     = "73d64cb244714c19bcc651122f6e7a9236aa11b5";
-    sha256  = "1jzmrf9kj0brqddlmxvzhj27r6843790jnqwkv1s3ri21fqb3hs7";
+    rev     = "9e8c1941ec2cdbba0c584e1acf00906cffd7a67a";
+    sha256  = "11n5yq68w32hsq5r0g34hg5wvyv9n2lkhw60b9a1vvlw1x41wxld";
   };
 }

From 04974889394f8c0163d558a940a1c8b29498056f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 17 Sep 2018 20:21:09 -0300
Subject: [PATCH 1181/3253] elementary-xfce-icon-theme: restrict platforms to
 linux

---
 pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 9aa61e856ff8..c457a8c69ec8 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
     description = "Elementary icons for Xfce and other GTK+ desktops like GNOME";
     homepage = https://github.com/shimmerproject/elementary-xfce;
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = with maintainers; [ davidak ];
   };
 }

From ca46876774119f87707f6868d7dc2c1b01ff9ecb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 16 Sep 2018 23:24:06 -0500
Subject: [PATCH 1182/3253] libreoffice-fresh: 6.1.0.3 -> 6.1.1.2

---
 .../libreoffice/default-primary-src.nix       |  6 ++---
 .../office/libreoffice/default.nix            |  4 ++--
 .../office/libreoffice/libreoffice-srcs.nix   | 24 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 446efe78d256..711411cd0124 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "6";
   minor = "1";
-  patch = "0";
-  tweak = "3";
+  patch = "1";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8";
+    sha256 = "228166908a3404cbb8e6e662f44b1af8644c0589b2309fadce89dcef112fd09d";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 2de1ed92dea8..aa0cdc703455 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -48,14 +48,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "140i0q6nyi2l6nv2b3n7s7mggm2rb1ws3h9awa9y6m2iads54qm7";
+      sha256 = "2933d0898fbc8ea32cb39b773cf49c5f7da165f75a33522ff91c88d7bd0c7440";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0ayssl5ivhyzxi3gz3h4yhp8hq7ihig6n6iijbks5f1sm7dwridv";
+      sha256 = "41e1af094f2ca5a9ab88894c2dceca2d91e6c28568d7f002f56c647e973cc595";
     };
 
   };
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 57495404eb97..aac3ed155202 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -105,11 +105,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.60.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz";
-    sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5";
+    name = "curl-7.61.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz";
+    sha256 = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae";
     md5 = "";
-    md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz";
+    md5name = "eaa812e9a871ea10dbe8e1d3f8f12a64a8e3e62aeab18cb23742e2f1727458ae-curl-7.61.1.tar.gz";
   }
   {
     name = "libe-book-0.1.3.tar.xz";
@@ -329,11 +329,11 @@
     md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
   }
   {
-    name = "harfbuzz-1.7.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2";
-    sha256 = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b";
+    name = "harfbuzz-1.8.4.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2";
+    sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd";
     md5 = "";
-    md5name = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b-harfbuzz-1.7.4.tar.bz2";
+    md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -623,11 +623,11 @@
     md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
   }
   {
-    name = "nss-3.33-with-nspr-4.17.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz";
-    sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4";
+    name = "nss-3.38-with-nspr-4.19.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz";
+    sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9";
     md5 = "";
-    md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz";
+    md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";

From 5f1c33efce90e21531eea9d7a389f6d148f1c409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 17 Sep 2018 22:12:42 -0300
Subject: [PATCH 1183/3253] efl: 1.21.0 -> 1.21.1

---
 pkgs/desktops/enlightenment/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index dd8162382023..bc58302cb20f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby";
+    sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 66842c9a720184f67d51a45c6acb47234a888788 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 10 Sep 2018 05:45:15 +0000
Subject: [PATCH 1184/3253] ocamlPackages.ppx_import: 1.4 -> 1.5

---
 .../ocaml-modules/ppx_import/default.nix      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 1f53b8712828..ffac74de4edf 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,21 +1,24 @@
-{stdenv, fetchFromGitHub, buildOcaml, opaline,
- cppo, ounit, ppx_deriving}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline
+, cppo, ounit, ppx_deriving
+}:
 
-buildOcaml rec {
-  name = "ppx_import";
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "ppx_import is not available for OCaml ${ocaml.version}"
+else
 
-  version = "1.4";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_import-${version}";
 
-  minimumSupportedOcamlVersion = "4.02";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_import";
     rev = "v${version}";
-    sha256 = "14c2lp7r9080c4hsb1y1drbxxx3v44b7ib5wfh3kkh3f1jfsjwbk";
+    sha256 = "1lf5lfp6bl5g4gdszaa6k6pkyh3qyhbarg5m1j0ai3i8zh5qg09d";
   };
 
-  buildInputs = [ cppo ounit ppx_deriving opaline ];
+  buildInputs = [ ocaml findlib ocamlbuild cppo ounit ppx_deriving opaline ];
 
   doCheck = true;
   checkTarget = "test";
@@ -25,5 +28,7 @@ buildOcaml rec {
   meta = with stdenv.lib; {
     description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
     license = licenses.mit;
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
   };
 }

From 080b3ef0b59622a7b805b85ea565b6ab27a062bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 18 Sep 2018 08:05:02 +0100
Subject: [PATCH 1185/3253] python2.pkgs.mypy_extensions: also enable python2

---
 pkgs/development/python-modules/mypy/extensions.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
index 8ed3f5ce86cf..f57ac12c0da8 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -12,8 +12,6 @@ buildPythonPackage rec {
     sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p";
   };
 
-  disabled = !isPy3k;
-
   propagatedBuildInputs = [ typing ];
 
   meta = with stdenv.lib; {

From 69f028ea017f4d962a366e836ba73d8eeb9748b2 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 18 Sep 2018 09:48:33 +0200
Subject: [PATCH 1186/3253] git-appraise: init unstable at 2018-02-26

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-appraise/default.nix    | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-appraise/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2093c86b050c..37745be5dc35 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -31,6 +31,8 @@ let
 
   git = appendToName "minimal" gitBase;
 
+  git-appraise = callPackage ./git-appraise {};
+
   git-fame = callPackage ./git-fame {};
 
   # The full-featured Git.
diff --git a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
new file mode 100644
index 000000000000..185ed38b5db0
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "git-appraise-unstable-${version}";
+  version = "2018-02-26";
+  rev = "2414523905939525559e4b2498c5597f86193b61";
+
+  goPackagePath = "github.com/google/git-appraise";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "google";
+    repo = "git-appraise";
+    sha256 = "04xkp1jpas1dfms6i9j09bgkydih0q10nhwn75w9ds8hi2qaa3sa";
+  };
+
+  meta = {
+    description = "Distributed code review system for Git repos";
+    homepage = https://github.com/google/git-appraise;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.vdemeester ];
+  };
+}

From 9f3c27a10451bf69b15f411b46f1ac3638f443f2 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Tue, 18 Sep 2018 18:03:14 +1000
Subject: [PATCH 1187/3253] makefile2graph: init at 2018-01-03 (#46136)

---
 .../tools/analysis/makefile2graph/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/makefile2graph/default.nix

diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix
new file mode 100644
index 000000000000..7afa71429a75
--- /dev/null
+++ b/pkgs/development/tools/analysis/makefile2graph/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
+
+stdenv.mkDerivation rec {
+  name = "makefile2graph-2018-01-03";
+
+  src = fetchFromGitHub {
+    owner = "lindenb";
+    repo = "makefile2graph";
+    rev = "61fb95a5ba91c20236f5e4deb11127c34b47091f";
+    sha256 = "07hq40bl48i8ka35fcciqcafpd8k9rby1wf4vl2p53v0665xaghr";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  fixupPhase = ''
+    substituteInPlace $out/bin/makefile2graph \
+      --replace '/bin/sh' ${bash}/bin/bash \
+      --replace 'make2graph' "$out/bin/make2graph"
+    wrapProgram $out/bin/makefile2graph \
+      --set PATH ${stdenv.lib.makeBinPath [ gnumake ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/lindenb/makefile2graph";
+    description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
+    maintainers = with maintainers; [ cmcdragonkai ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 247dc7558f5f..0b995e561f2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3927,6 +3927,8 @@ with pkgs;
 
   makerpm = callPackage ../development/tools/makerpm { };
 
+  makefile2graph = callPackage ../development/tools/analysis/makefile2graph { };
+
   # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because
   # it looks like gnulib is broken on non-linux, so it seems likely that this would cause
   # trouble on bsd and/or cygwin as well.

From 7e0f7a0b54d8c485cca0fed83357dceb1bbbabf9 Mon Sep 17 00:00:00 2001
From: TG x <*@tg-x.net>
Date: Tue, 18 Sep 2018 10:38:59 +0200
Subject: [PATCH 1188/3253] build-idris-package: ipkgName

---
 pkgs/development/idris-modules/bi.nix         |  1 +
 pkgs/development/idris-modules/bifunctors.nix |  4 ---
 .../idris-modules/build-idris-package.nix     | 25 +++++++++++++------
 pkgs/development/idris-modules/canvas.nix     |  2 ++
 pkgs/development/idris-modules/coda.nix       |  2 ++
 pkgs/development/idris-modules/containers.nix |  4 ---
 pkgs/development/idris-modules/electron.nix   |  5 ----
 pkgs/development/idris-modules/free.nix       |  2 ++
 pkgs/development/idris-modules/hamt.nix       |  2 +-
 pkgs/development/idris-modules/hrtime.nix     |  1 +
 .../idris-modules/idrishighlighter.nix        |  1 +
 .../development/idris-modules/jheiling-js.nix |  1 +
 pkgs/development/idris-modules/mhd.nix        |  1 +
 pkgs/development/idris-modules/patricia.nix   |  4 ---
 .../idris-modules/permutations.nix            |  4 ---
 .../idris-modules/recursion_schemes.nix       |  4 ---
 pkgs/development/idris-modules/refined.nix    |  6 ++---
 pkgs/development/idris-modules/snippets.nix   |  1 +
 pkgs/development/idris-modules/tap.nix        |  5 +---
 pkgs/development/idris-modules/tparsec.nix    |  2 ++
 pkgs/development/idris-modules/vdom.nix       |  2 ++
 pkgs/development/idris-modules/yaml.nix       |  1 +
 pkgs/development/idris-modules/yampa.nix      |  1 +
 23 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
index d16d9b2245d6..844ce98cd4c3 100644
--- a/pkgs/development/idris-modules/bi.nix
+++ b/pkgs/development/idris-modules/bi.nix
@@ -8,6 +8,7 @@ build-idris-package  {
   name = "bi";
   version = "2018-06-25";
 
+  ipkgName = "Bi";
   idrisDeps = [ contrib pruviloj ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
index 53b4fb0a004f..3a915cd67f41 100644
--- a/pkgs/development/idris-modules/bifunctors.nix
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -13,10 +13,6 @@ build-idris-package  {
     sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq";
   };
 
-  postUnpack = ''
-    rm source/test.ipkg
-  '';
-
   meta = {
     description = "A small bifunctor library for idris";
     homepage = https://github.com/japesinator/Idris-Bifunctors;
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 3ed1404fef7c..5e1288685a7e 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -5,6 +5,7 @@
   , noBase ? false
   , name
   , version
+  , ipkgName ? name
   , extraBuildInputs ? []
   , ...
   }@attrs:
@@ -13,7 +14,10 @@ let
     ++ lib.optional (!noPrelude) idrisPackages.prelude
     ++ lib.optional (!noBase) idrisPackages.base;
   idris-with-packages = idrisPackages.with-packages allIdrisDeps;
-  newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // {
+  newAttrs = builtins.removeAttrs attrs [
+    "idrisDeps" "noPrelude" "noBase"
+    "name" "version" "ipkgName" "extraBuildInputs"
+  ] // {
     meta = attrs.meta // {
       platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
     };
@@ -29,22 +33,29 @@ stdenv.mkDerivation ({
   # opts = -i ../../path/to/package
   # rather than the declarative pkgs attribute so we have to rewrite the path.
   postPatch = ''
-    sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
+    runHook prePatch
+    sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
   '';
 
   buildPhase = ''
-    idris --build *.ipkg
+    runHook preBuild
+    idris --build ${ipkgName}.ipkg
+    runHook postBuild
   '';
 
   checkPhase = ''
-    if grep -q test *.ipkg; then
-      idris --testpkg *.ipkg
+    runHook preCheck
+    if grep -q tests ${ipkgName}.ipkg; then
+      idris --testpkg ${ipkgName}.ipkg
     fi
+    runHook postCheck
   '';
 
   installPhase = ''
-    idris --install *.ipkg --ibcsubdir $out/libs
-    IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true
+    runHook preInstall
+    idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs
+    IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true
+    runHook postInstall
   '';
 
 } // newAttrs)
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
index 72e5e3f5be7e..0f6e258ee202 100644
--- a/pkgs/development/idris-modules/canvas.nix
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "canvas";
   version = "2017-11-09";
 
+  ipkgName = "idriscanvas";
+
   src = fetchFromGitHub {
     owner = "JinWuZhao";
     repo = "idriscanvas";
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
index 7dbd12110888..c5e33f4594f2 100644
--- a/pkgs/development/idris-modules/coda.nix
+++ b/pkgs/development/idris-modules/coda.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "coda";
   version = "2018-01-25";
 
+  ipkgName = "Coda";
+
   src = fetchFromGitHub {
     owner = "ostera";
     repo = "idris-coda";
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
index c12ea54f5f9f..2fe783da4486 100644
--- a/pkgs/development/idris-modules/containers.nix
+++ b/pkgs/development/idris-modules/containers.nix
@@ -17,10 +17,6 @@ build-idris-package  {
     sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d";
   };
 
-  postUnpack = ''
-    rm source/containers-travis.ipkg
-  '';
-
   meta = {
     description = "Various data structures for use in the Idris Language.";
     homepage = https://github.com/jfdm/idris-containers;
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
index 3989b8f41135..8b968c9732ab 100644
--- a/pkgs/development/idris-modules/electron.nix
+++ b/pkgs/development/idris-modules/electron.nix
@@ -18,11 +18,6 @@ build-idris-package  {
     sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn";
   };
 
-  postUnpack = ''
-    rm source/example_main.ipkg
-    rm source/example_view.ipkg
-  '';
-
   meta = {
     description = "Electron bindings for Idris";
     homepage = https://github.com/jheiling/idris-electron;
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
index 8e979ea796ec..06b8ec5e82d2 100644
--- a/pkgs/development/idris-modules/free.nix
+++ b/pkgs/development/idris-modules/free.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "free";
   version = "2017-07-03";
 
+  ipkgName = "idris-free";
+
   src = fetchFromGitHub {
     owner = "idris-hackers";
     repo = "idris-free";
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
index 17706d1b0969..79df925323ed 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -5,7 +5,7 @@
 , lib
 }:
 build-idris-package  {
-  name = "idris-hamt";
+  name = "hamt";
   version = "2016-11-15";
 
   idrisDeps = [ contrib effects ];
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
index 09fabb6715db..9e9736d25661 100644
--- a/pkgs/development/idris-modules/hrtime.nix
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -7,6 +7,7 @@ build-idris-package  {
   name = "hrtime";
   version = "2017-04-16";
 
+  ipkgName = "hrTime";
   idrisDeps = [ idrisscript ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
index d8b469ca7689..5629221d601b 100644
--- a/pkgs/development/idris-modules/idrishighlighter.nix
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -8,6 +8,7 @@ build-idris-package  {
   name = "idrishighlighter";
   version = "2018-02-22";
 
+  ipkgName = "idris-code-highlighter";
   idrisDeps = [ effects lightyear ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
index 2281e4821f7a..dae310cda053 100644
--- a/pkgs/development/idris-modules/jheiling-js.nix
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -8,6 +8,7 @@ build-idris-package  {
   name = "jheiling-js";
   version = "2016-03-09";
 
+  ipkgName = "js";
   idrisDeps = [ contrib jheiling-extras ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
index 9f4af7cc3b85..197cb1552cbd 100644
--- a/pkgs/development/idris-modules/mhd.nix
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -9,6 +9,7 @@ build-idris-package  {
   name = "mhd";
   version = "2016-04-22";
 
+  ipkgName = "MHD";
   idrisDeps = [ contrib effects ];
 
   extraBuildInputs = [ libmicrohttpd ];
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
index 9ba8c6bb2d4d..5ce9ad7e915d 100644
--- a/pkgs/development/idris-modules/patricia.nix
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -16,10 +16,6 @@ build-idris-package  {
     sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz";
   };
 
-  postUnpack = ''
-    rm source/patricia-nix.ipkg
-  '';
-
   meta = {
     description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array.";
     homepage = https://github.com/ChShersh/idris-patricia;
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
index 8bcb67fa759a..21b81f4a95c5 100644
--- a/pkgs/development/idris-modules/permutations.nix
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -13,10 +13,6 @@ build-idris-package  {
     sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s";
   };
 
-  postUnpack = ''
-    rm source/test.ipkg
-  '';
-
   meta = {
     description = "Type-safe way of working with permutations in Idris";
     homepage = https://github.com/vmchale/permutations;
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
index 78f3674aeabd..dab6913ee8bc 100644
--- a/pkgs/development/idris-modules/recursion_schemes.nix
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -20,10 +20,6 @@ build-idris-package  {
     sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf";
   };
 
-  postUnpack = ''
-    rm source/test.ipkg
-  '';
-
   meta = {
     description = "Recursion schemes for Idris";
     homepage = https://github.com/vmchale/recursion_schemes;
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
index 00252b6a7cd6..433fdf647697 100644
--- a/pkgs/development/idris-modules/refined.nix
+++ b/pkgs/development/idris-modules/refined.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "refined";
   version = "2017-12-28";
 
+  ipkgName = "idris-refined";
+
   src = fetchFromGitHub {
     owner = "janschultecom";
     repo = "idris-refined";
@@ -13,10 +15,6 @@ build-idris-package  {
     sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh";
   };
 
-  postUnpack = ''
-    rm source/idris-refined-test.ipkg
-  '';
-
   meta = {
     description = "Port of Scala/Haskell Refined library to Idris";
     homepage = https://github.com/janschultecom/idris-refined;
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
index c8d993ccb8a2..6d752fed0f98 100644
--- a/pkgs/development/idris-modules/snippets.nix
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -7,6 +7,7 @@ build-idris-package  {
   name = "snippets";
   version = "2018-03-17";
 
+  ipkgName = "idris-snippets";
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
index 7f80a1ce3c50..98f4b4ea4d63 100644
--- a/pkgs/development/idris-modules/tap.nix
+++ b/pkgs/development/idris-modules/tap.nix
@@ -7,6 +7,7 @@ build-idris-package  {
   name = "tap";
   version = "2017-04-08";
 
+  ipkgName = "TAP";
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {
@@ -16,10 +17,6 @@ build-idris-package  {
     sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs";
   };
 
-  postUnpack = ''
-    rm source/Draft.ipkg
-  '';
-
   meta = {
     description = "A simple TAP producer and consumer/reporter for Idris";
     homepage = https://github.com/ostera/tap-idris;
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index bd895a33bae3..00d4adba5dc8 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "tparsec";
   version = "2018-06-26";
 
+  ipkgName = "TParsec";
+
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "idris-tparsec";
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
index 7f1ecb61c8ec..f6fdaf7a75e2 100644
--- a/pkgs/development/idris-modules/vdom.nix
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -6,6 +6,8 @@ build-idris-package  {
   name = "vdom";
   version = "0.6.0";
 
+  ipkgName = "idris-vdom";
+
   src = fetchFromGitHub {
     owner = "brandondyck";
     repo = "idris-vdom";
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
index ec689ce4805a..61efb8cd575e 100644
--- a/pkgs/development/idris-modules/yaml.nix
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -8,6 +8,7 @@ build-idris-package  {
   name = "yaml";
   version = "2018-01-25";
 
+  ipkgName = "Yaml";
   idrisDeps = [ contrib lightyear ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
index 0231555b4ad6..ebe92f468982 100644
--- a/pkgs/development/idris-modules/yampa.nix
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -7,6 +7,7 @@ build-idris-package  {
   name = "yampa";
   version = "2016-07-05";
 
+  ipkgName = "idris-yampa";
   idrisDeps = [ bifunctors ];
 
   src = fetchFromGitHub {

From 6d97096d8bf999edf8f1eff36a5577c2ae536e45 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Sun, 16 Sep 2018 13:10:56 +0200
Subject: [PATCH 1189/3253] mpack: Invoke /run/wrappers/bin/sendmail via execvp

Calling /run/current-sw/bin/sendmail fails under postfix because
setgid bits are not set. Switching the hardcoded path to an invocation
via execvp should cover both cases, when the sendmail binary is
setgid-wrapped and when it is not.
---
 pkgs/tools/networking/mpack/default.nix              |  7 +------
 pkgs/tools/networking/mpack/sendmail-via-execvp.diff | 12 ++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/networking/mpack/sendmail-via-execvp.diff

diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 62cec7c41eef..5a8af7de36a0 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -8,18 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
   };
 
-  patches = [ ./build-fix.patch ];
+  patches = [ ./build-fix.patch ./sendmail-via-execvp.diff ];
 
   postPatch = ''
     for f in *.{c,man,pl,unix} ; do
       substituteInPlace $f --replace /usr/tmp /tmp
     done
 
-    for f in unixpk.c ; do
-      substituteInPlace $f \
-        --replace /usr/sbin /run/current-system/sw/bin
-    done
-
     # this just shuts up some warnings
     for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
       sed -i 'i#include <stdlib.h>' $f
diff --git a/pkgs/tools/networking/mpack/sendmail-via-execvp.diff b/pkgs/tools/networking/mpack/sendmail-via-execvp.diff
new file mode 100644
index 000000000000..8f10901038d6
--- /dev/null
+++ b/pkgs/tools/networking/mpack/sendmail-via-execvp.diff
@@ -0,0 +1,12 @@
+--- mpack-1.6/unixpk.c	2003-07-21 22:50:41.000000000 +0200
++++ mpack-1.6/unixpk.c	2018-09-16 12:57:14.104026964 +0200
+@@ -254,8 +254,9 @@
+ #ifdef SCO
+     execv("/usr/lib/mail/execmail", addr+start);
+ #else
++    execvp("sendmail", addr+start);
+     execv("/usr/lib/sendmail", addr+start);
+     execv("/usr/sbin/sendmail", addr+start);
+ #endif
+     perror("execv");
+     _exit(1);

From b3bb82c186aca500c4a44e339a273cbdf99e15e3 Mon Sep 17 00:00:00 2001
From: Adam Finn Tulinius <mail@adamtulinius.dk>
Date: Tue, 18 Sep 2018 12:47:37 +0200
Subject: [PATCH 1190/3253] coreclr: update homepage

Repology reports the current homepage down for more than a month. Link to the GitHub repo instead.
---
 pkgs/development/compilers/coreclr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 3861501d3996..05958d523363 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://dotnet.github.io/core/;
+    homepage = https://github.com/dotnet/core/;
     description = ".NET is a general purpose development platform";
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kuznero ];

From 4200e68e040c689ff0d4bb17a5eca6d7b63f0809 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Tue, 18 Sep 2018 20:48:21 +1000
Subject: [PATCH 1191/3253] nix-pin: 0.3.4 -> 0.4.0

---
 pkgs/tools/package-management/nix-pin/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 10afb1d90976..f5d62b250e22 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,12 +1,12 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.3.4";
+  version = "0.4.0";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.3.4";
-    sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8";
+    rev = "version-${version}";
+    sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy";
   };
   buildInputs = [ python3 mypy makeWrapper ];
   checkPhase = ''
@@ -36,6 +36,7 @@ let self = stdenv.mkDerivation rec {
           --set repo nix-pin \
           --set type fetchFromGitHub \
           --set rev 'version-{version}' \
+          --substitute rev 'version-''${{version}}' \
           --modify-nix default.nix
       '';
     };

From 336a913f4260c7ec2ac9170e37056d40fef44de3 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 18 Sep 2018 14:00:59 +0300
Subject: [PATCH 1192/3253] pythonPackages.pgspecial: 1.8.0 -> 1.11.2

---
 .../python-modules/pgspecial/default.nix      | 25 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +------------------
 2 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/pgspecial/default.nix

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
new file mode 100644
index 000000000000..84ccea15e98f
--- /dev/null
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, psycopg2, click, sqlparse }:
+
+buildPythonPackage rec {
+  pname = "pgspecial";
+  version = "1.11.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yq3cmpdcvwsz3nifc0db125433vxbgbpmbhxfj46b9s5k81xs30";
+  };
+
+  buildInputs = [ pytest psycopg2 ];
+  propagatedBuildInputs = [ click sqlparse ];
+
+  checkPhase = ''
+    find tests -name \*.pyc -delete
+    py.test tests
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Meta-commands handler for Postgres Database";
+    homepage = https://pypi.python.org/pypi/pgspecial;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7990034af7e8..611e97e69780 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9458,31 +9458,7 @@ in {
     };
   };
 
-  pgspecial = buildPythonPackage rec {
-    pname = "pgspecial";
-    version = "1.8.0";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9";
-    };
-
-    buildInputs = with self; [ pytest psycopg2 ];
-
-    checkPhase = ''
-      find tests -name \*.pyc -delete
-      py.test tests
-    '';
-
-    propagatedBuildInputs = with self; [ click sqlparse ];
-
-    meta = {
-      description = "Meta-commands handler for Postgres Database";
-      homepage = https://pypi.python.org/pypi/pgspecial;
-      license = licenses.bsd3;
-    };
-  };
+  pgspecial = callPackage ../development/python-modules/pgspecial { };
 
   pickleshare = buildPythonPackage rec {
     version = "0.7.4";

From 9f25c99cb1f83f8490de14c44d1977090cf8cb58 Mon Sep 17 00:00:00 2001
From: Boris Babic <boris.ivan.babic@gmail.com>
Date: Tue, 18 Sep 2018 13:06:50 +0200
Subject: [PATCH 1193/3253] gitAndTools.pre-commit: 1.10.4 -> 1.11.0

---
 .../version-management/git-and-tools/pre-commit/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index d125672f8ca0..bc36a8879f4d 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
   pname = "pre_commit";
-  version = "1.10.4";
+  version = "1.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kn8h9k9ca330m5n7r4cvxp679y3sc95m1x23a3qhzgam09n7jwr";
+    sha256 = "03nxkma8qp5j2bg6ailclnyqfhakp8r8d1mn6zcnjw0ac5r9imc8";
   };
 
   propagatedBuildInputs = [

From 56b59b250fce548c415a0557d7da7c2d089dc22d Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 18 Sep 2018 14:01:44 +0300
Subject: [PATCH 1194/3253] pgcli: 1.6.0 -> 1.10.3

---
 .../tools/database/pgcli/default.nix           | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 4ea3589476bd..2926946cd45a 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "pgcli-${version}";
-  version = "1.6.0";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
-    sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz";
-    rev = "v${version}";
-    repo = "pgcli";
     owner = "dbcli";
+    repo = "pgcli";
+    rev = "v${version}";
+    sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
   };
 
   buildInputs = with pythonPackages; [ pytest mock ];
@@ -18,15 +18,10 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with pythonPackages; [
-    click configobj humanize prompt_toolkit psycopg2
-    pygments sqlparse pgspecial setproctitle
+    cli-helpers click configobj humanize prompt_toolkit psycopg2
+    pygments sqlparse pgspecial setproctitle keyring
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "==" ">="
-    rm tests/test_rowlimit.py
-  '';
-
   meta = with lib; {
     description = "Command-line interface for PostgreSQL";
     longDescription = ''
@@ -35,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     homepage = https://pgcli.com;
     license = licenses.bsd3;
+    maintainers = with maintainers; [ dywedir ];
   };
 }

From 8b8474b1b55fa8d40c18f483e087ca18061c2203 Mon Sep 17 00:00:00 2001
From: Adam Finn Tulinius <mail@adamtulinius.dk>
Date: Tue, 18 Sep 2018 13:18:41 +0200
Subject: [PATCH 1195/3253] OVMF: update homepage

Tianocore was apparently moved from SourceForge to GitHub.
---
 pkgs/applications/virtualization/OVMF/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index ee4ea4346e4a..c858f4c4d6d3 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation (edk2.setup projectDscPath {
 
   meta = {
     description = "Sample UEFI firmware for QEMU and KVM";
-    homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+    homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF;
     license = stdenv.lib.licenses.bsd2;
     platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
   };

From 1944defa4c481344178ec2a20c53502e7e938f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 18 Sep 2018 08:29:28 -0300
Subject: [PATCH 1196/3253] greybird: remove license cc-by-nc-sa-30 (#46802)

Greybird is dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later.
The first is free, and the second is unfree in nixpkgs. Currently both
licenses are listed in the package derivation. And nix takes that it is
unfree. If one of the licenses in the list is unfree. nix consider
that the software is unfree. Remove the unfree one.
---
 pkgs/misc/themes/greybird/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index bb782059ff6b..8cc1a6415fbe 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Grey and blue theme from the Shimmer Project for GTK+-based environments";
     homepage = https://github.com/shimmerproject/Greybird;
-    license = with licenses; [ gpl2Plus cc-by-nc-sa-30 ];
+    license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };

From 74d1f4c20b8aec44da2e57d5ce85393314876bf5 Mon Sep 17 00:00:00 2001
From: Adam Finn Tulinius <mail@adamtulinius.dk>
Date: Tue, 18 Sep 2018 14:25:28 +0200
Subject: [PATCH 1197/3253] pythonPackages.gmpy: update homepage

---
 pkgs/development/python-modules/gmpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix
index 81af4b5e5501..73f1175e0bd6 100644
--- a/pkgs/development/python-modules/gmpy/default.nix
+++ b/pkgs/development/python-modules/gmpy/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage {
 
   meta = {
     description = "GMP or MPIR interface to Python 2.4+ and 3.x";
-    homepage = http://code.google.com/p/gmpy/;
+    homepage = https://github.com/aleaxit/gmpy/;
   };
 }

From c7e35b256c773e4df700e61385a832428211859b Mon Sep 17 00:00:00 2001
From: Adam Finn Tulinius <mail@adamtulinius.dk>
Date: Tue, 18 Sep 2018 14:29:48 +0200
Subject: [PATCH 1198/3253] pythonPackages.gmpy2: update homepage

---
 pkgs/development/python-modules/gmpy2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index 5d1f82356a01..a03188bb8f2c 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage {
 
   meta = with stdenv.lib; {
     description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x";
-    homepage = http://code.google.com/p/gmpy/;
+    homepage = https://github.com/aleaxit/gmpy/;
     license = licenses.gpl3Plus;
   };
 }

From d6dc56180b5d64cf6e12da10255b03358c661002 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nvd1234@gmail.com>
Date: Tue, 18 Sep 2018 15:29:58 +0100
Subject: [PATCH 1199/3253] haskellPackages.JuicyPixels: re-enable Haddock

This was made to avoid an issue which was fixed in `3.2.9.3`. The version currently in `nixpkgs 18.03` is `3.2.9.4`, which includes this fix.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2f89623ecdeb..399bb21f6e62 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -933,9 +933,6 @@ self: super: {
   # Jailbreak "graphviz >=2999.18.1 && <2999.20".
   darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; });
 
-  # https://github.com/Twinside/Juicy.Pixels/issues/149
-  JuicyPixels = dontHaddock super.JuicyPixels;
-
   # aarch64 and armv7l fixes.
   happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
   hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95

From b80c9ce4a962661f5589092f618ca8ae70f56a1e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 18 Sep 2018 09:30:59 -0400
Subject: [PATCH 1200/3253] stdenv: Validate meta.outputsToInstall
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If meta.outputsToInstall is set to include absent outputs, various
tools break including channel updates and nix-env.

    grahamc@Morbo> nix-env -i -f . -A elf-header-real
    installing 'elf-header'
    error: this derivation has bad 'meta.outputsToInstall'

This patch verifies each value in meta.outputsToInstall is a valid
output. It validates this condition only if checkMeta is true.

    grahamc@Morbo> nix-build . -A elf-header-real
    error: Package ‘elf-header’ in /home/grahamc/projects/nixpkgs/pkgs/development/libraries/elf-header/default.nix:36 has invalid meta.outputsToInstall, refusing to evaluate.

    The package elf-header has set meta.outputsToInstall to: bin

    however elf-header only has the outputs: out

    and is missing the following ouputs:

      - bin

    (use '--show-trace' to show detailed location information)

Note, now the nix-env experience is decidedly worse for users who have
checkMeta set to true:

    grahamc@Morbo> nix-env -i -f . -A elf-header-real; echo $?
    0

though since this is already an issue for unfree, broken, unsupported,
and insecure validity problems I'm not sure we should do something
different here.
---
 pkgs/stdenv/generic/check-meta.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index a5c8ca705231..28b69f5c2dc9 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -81,6 +81,7 @@ let
     unsupported = remediate_whitelist "UnsupportedSystem";
     blacklisted = x: "";
     insecure = remediate_insecure;
+    broken-outputs = remediateOutputsToInstall;
     unknown-meta = x: "";
   };
   remediate_whitelist = allow_attr: attrs:
@@ -125,6 +126,20 @@ let
 
       '';
 
+  remediateOutputsToInstall = attrs: let
+      expectedOutputs = attrs.meta.outputsToInstall or [];
+      actualOutputs = attrs.outputs or [ "out" ];
+      missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs;
+    in ''
+      The package ${attrs.name} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs}
+
+      however ${attrs.name} only has the outputs: ${builtins.concatStringsSep ", " actualOutputs}
+
+      and is missing the following ouputs:
+
+      ${lib.concatStrings (builtins.map (output: "  - ${output}\n") missingOutputs)}
+    '';
+
   handleEvalIssue = attrs: { reason , errormsg ? "" }:
     let
       msg = ''
@@ -185,6 +200,14 @@ let
     in  anyMatch (attrs.meta.platforms or lib.platforms.all) &&
       ! anyMatch (attrs.meta.badPlatforms or []);
 
+  checkOutputsToInstall = attrs: let
+      expectedOutputs = attrs.meta.outputsToInstall or [];
+      actualOutputs = attrs.outputs or [ "out" ];
+      missingOutputs = builtins.filter (output: ! builtins.elem output actualOutputs) expectedOutputs;
+    in if shouldCheckMeta
+       then builtins.length missingOutputs > 0
+       else false;
+
   # Check if a derivation is valid, that is whether it passes checks for
   # e.g brokenness or license.
   #
@@ -202,6 +225,8 @@ let
       { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.config}’"; }
     else if !(hasAllowedInsecure attrs) then
       { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }
+    else if checkOutputsToInstall attrs then
+      { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }
     else let res = checkMeta (attrs.meta or {}); in if res != [] then
       { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }
     else { valid = true; };

From 301109a2dd1099d673cf805f50f303b180e5d58d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 18 Sep 2018 09:47:54 -0400
Subject: [PATCH 1201/3253] elf-header-real: fixup outputsToInstall

---
 pkgs/development/libraries/elf-header/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index 48e5b73d9e72..ab8c217dce43 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -32,6 +32,7 @@ stdenvNoCC.mkDerivation {
   '';
 
   meta = libc.meta // {
+    outputsToInstall = [ "out" ];
     description = "The datastructures of ELF according to the target platform's libc";
     longDescription = ''
 	  The Executable and Linkable Format (ELF, formerly named Extensible Linking

From 50454ec5f17a2a1095de51907d0406eb6f8614dc Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 19 Sep 2018 00:54:22 +0900
Subject: [PATCH 1202/3253] git: 2.18.0 -> 2.19.0 (#46723)

---
 .../version-management/git-and-tools/git/default.nix     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 6cc109c48c75..8bd6457a9e50 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.18.0";
+  version = "2.19.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
+    sha256 = "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@@ -283,7 +283,7 @@ EOF
 
     # XXX: I failed to understand why this one fails.
     # Could someone try to re-enable it on the next release ?
-    # Tested to fail: 2.18.0
+    # Tested to fail: 2.18.0 and 2.19.0
     disable_test t1700-split-index "null sha1"
 
     # Tested to fail: 2.18.0
@@ -292,6 +292,9 @@ EOF
 
     # Tested to fail: 2.18.0
     disable_test t9902-completion "sourcing the completion script clears cached --options"
+
+    # As of 2.19.0, t5562 refers to #!/usr/bin/perl
+    patchShebangs t/t5562/invoke-with-content-length.pl
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit

From b6a21f6288ecaca53f3925bfb2be2e4a2b41e8ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 08:57:10 -0700
Subject: [PATCH 1203/3253] varnish6: 6.0.0 -> 6.0.1 (#46170)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
varnish
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index ff1acad90944..4d8841fad318 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -47,7 +47,7 @@ in
     sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
   };
   varnish6 = common {
-    version = "6.0.0";
-    sha256 = "1vhbdch33m6ig4ijy57zvrramhs9n7cba85wd8rizgxjjnf87cn7";
+    version = "6.0.1";
+    sha256 = "1f7k751r31sgfvr1ns6s3h48c5x06kkps1p6zd40wvylm56qxwj7";
   };
 }

From 57062f9072aa0f9f07a3bd3b1864c718ba588299 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 08:58:57 -0700
Subject: [PATCH 1204/3253] riot-web: 0.16.0 -> 0.16.2 (#46190)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
riot-web
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 322ad020c9ad..14cfb37197e1 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1nl0ih5flhp57k96hv6nl5pzrm3r9piqmwzirz9nz8k9803mqp5m";
+    sha256 = "14k8hsz2i1nd126jprvi45spdxawk4c8nb3flkrg7rmjdp5sski2";
   };
 
   installPhase = ''

From 10aac9d61552bff335ded32adae150436ba33ee3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:01:39 -0700
Subject: [PATCH 1205/3253] japa: 0.8.4 -> 0.9.2 (#46266)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
japa
---
 pkgs/applications/audio/japa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index cdf25c08378a..18b7bcd1d568 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl,   alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11,  libXft, zita-alsa-pcmi, }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.4";
+  version = "0.9.2";
   name = "japa-${version}";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0";
+    sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
   };
 
   buildInputs = [ alsaLib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ];

From 11883b1afb45234aa8061e33cfe49d844ac449bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:03:39 -0700
Subject: [PATCH 1206/3253] drumgizmo: 0.9.15 -> 0.9.16 (#46296)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/drumgizmo/versions
---
 pkgs/applications/audio/drumgizmo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 18673a2186cc..53949da43e0d 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.15";
+  version = "0.9.16";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "13bgqyw74pq3ss63zd9bjmgr4dah792pcphyqmr7bnvrgfjr6bx6";
+    sha256 = "0ivr61n9gpigsfgn20rh3n09li8sxh1q095r6wiw0shqhn3vaxlg";
   };
 
   configureFlags = [ "--enable-lv2" ];

From 6557bcde9f0f1f1d8f4fa589e5d0c8e8033c49f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:05:19 -0700
Subject: [PATCH 1207/3253] checkSSLCert: 1.64.0 -> 1.72.0 (#46290)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index deac45eadb62..ce9e2f8c40b2 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "check_ssl_cert-${version}";
-  version = "1.64.0";
+  version = "1.72.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    sha256 = "0pq297sbz9hzcaccnnsfmra0bac81cki9xfrnb22a1hgfhqjxy5r";
+    sha256 = "1125yffw0asxa3blcgg6gr8nvwc5jhxbqi0wak5w06svw8ka9wpr";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7ffa71c23e8f2c122d2cf7c92f2a89155aa8bb5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:06:34 -0700
Subject: [PATCH 1208/3253] neo4j: 3.4.5 -> 3.4.6 (#46244)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
neo4j
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index c1fe1a84d15f..cc16838d082f 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "1fzzj227r5xjls6j5mkjam8pnhbyiqv1799n8k812pk4fqvq4lxg";
+    sha256 = "0bby42sp7gpyglp03c5nq9hzzlcckzfsc84i07jlx8gglidw80l3";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 4af4018710523c31c0a44f32bc8f158a07b4cd47 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:07:30 -0700
Subject: [PATCH 1209/3253] jaaa: 0.8.4 -> 0.9.2 (#46261)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
jaaa
---
 pkgs/applications/audio/jaaa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 2410106cff03..33c74f2b0443 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jaaa-${version}";
-  version = "0.8.4";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01";
+    sha256 = "1czksxx2g8na07k7g57qlz0vvkkgi5bzajcx7vc7jhb94hwmmxbc";
   };
 
   buildInputs = [

From e070dae0a45126b85571eaaba065fae07a099c9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:08:04 -0700
Subject: [PATCH 1210/3253] pcapfix: 1.1.1 -> 1.1.2 (#46223)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
pcapfix
---
 pkgs/tools/networking/pcapfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix
index 98113551c0cc..970844ea6d6d 100644
--- a/pkgs/tools/networking/pcapfix/default.nix
+++ b/pkgs/tools/networking/pcapfix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcapfix-1.1.1";
+  name = "pcapfix-1.1.2";
 
   src = fetchurl {
     url = "https://f00l.de/pcapfix/${name}.tar.gz";
-    sha256 = "07dfgl99iv88mgpnpfcb9y7h0zjq9fcf4sp5s7d0d3d5a5sshjay";
+    sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay";
   };
 
   postPatch = ''sed -i "s|/usr|$out|" Makefile'';

From dcd6977b11af3fcae238a9f14b7f8eb62bd348b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:08:47 -0700
Subject: [PATCH 1211/3253] groonga: 8.0.5 -> 8.0.6 (#46277)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
groonga
---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 439acd927e31..c346d6bd37b7 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "8.0.5";
+  version = "8.0.6";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1w7yygqp089kmiznxrwhvyny8cfdb4lr2pazh4873r8xxb9dyfvn";
+    sha256 = "1q00p02jprbsx2c6l3dnv2m04pzxlfag4j1pan0jlb4g3fvb20wf";
   };
 
   buildInputs = with stdenv.lib;

From c9a863120183772ecb0eb2da7f7b76d09b196669 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:10:42 -0700
Subject: [PATCH 1212/3253] ocamlPackages.js_of_ocaml: 3.2.0 -> 3.2.1 (#46263)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
js_of_ocaml
---
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index cd242b5bd377..94be7132b796 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -8,13 +8,13 @@ else
 
 stdenv.mkDerivation rec {
 	name = "js_of_ocaml-compiler-${version}";
-	version = "3.2.0";
+	version = "3.2.1";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
+		sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
 	};
 
 	buildInputs = [ ocaml findlib dune cmdliner cppo ];

From 9d288e7da346ddb3aee8d68fc9348ee868fd21c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:12:37 -0700
Subject: [PATCH 1213/3253] qtox: 1.16.1 -> 1.16.3 (#46204)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
qtox
---
 .../networking/instant-messengers/qtox/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index fa481b7fe663..6cb51478b731 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -7,7 +7,7 @@
 , AVFoundation ? null }:
 
 let
-  version = "1.16.1";
+  version = "1.16.3";
   rev = "v${version}";
 
 in mkDerivation rec {
@@ -16,7 +16,7 @@ in mkDerivation rec {
   src = fetchFromGitHub {
     owner  = "qTox";
     repo   = "qTox";
-    sha256 = "05cz67yvdqjv1dmqycnc5rd0275zh94wyaa7sqdkr1iw8k5h955n";
+    sha256 = "0qd4nvbrjnnfnk8ghsxq3cd1n1qf1ck5zg6ib11ij2pg03s146pa";
     inherit rev;
   };
 

From b712736283a465aec9420534727c71459d6d1839 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 21 Aug 2018 01:41:15 +0200
Subject: [PATCH 1214/3253] prometheus-json-exporter: 2016-09-13 -> 2017-10-06

---
 pkgs/servers/monitoring/prometheus/json-exporter.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index ffba472bdc33..ef022fc308ce 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -3,23 +3,23 @@
 
 buildGoPackage rec {
   name = "prometheus-json-exporter-${version}";
-  version = "unstable-2016-09-13";
-  rev = "d45e5ebdb08cb734ad7a8683966032af1d91a76c";
+  version = "unstable-2017-10-06";
 
   goPackagePath = "github.com/kawamuray/prometheus-json-exporter";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "kawamuray";
     repo = "prometheus-json-exporter";
-    sha256 = "0v3as7gakdqpsir97byknsrqxxxkq66hp23j4cscs45hsdb24pi9";
+    rev = "51e3dc02a30ab818bb73e5c98c3853231c2dbb5f";
+    sha256 = "1v1p4zcqnb3d3rm55r695ydn61h6gz95f55cpa22hzw18dasahdh";
   };
 
   goDeps = ./json-exporter_deps.nix;
 
-  meta = {
+  meta = with lib; {
     description = "A prometheus exporter which scrapes remote JSON by JSONPath";
     homepage = https://github.com/kawamuray/prometheus-json-exporter;
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ willibutz ];
   };
 }

From b59cd2bc175015bd770c6ed3665acbd8dac9e82d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 21 Aug 2018 01:42:18 +0200
Subject: [PATCH 1215/3253] prometheus-json-exporter: add patch to support bool
 parsing

---
 pkgs/servers/monitoring/prometheus/json-exporter.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix
index ef022fc308ce..aeb7b7445a5d 100644
--- a/pkgs/servers/monitoring/prometheus/json-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix
@@ -1,5 +1,5 @@
 # This file was generated by go2nix.
-{ buildGoPackage, fetchFromGitHub, lib }:
+{ buildGoPackage, fetchFromGitHub, fetchpatch, lib }:
 
 buildGoPackage rec {
   name = "prometheus-json-exporter-${version}";
@@ -16,6 +16,11 @@ buildGoPackage rec {
 
   goDeps = ./json-exporter_deps.nix;
 
+  patches = [(fetchpatch { # adds bool support
+    url = "https://patch-diff.githubusercontent.com/raw/kawamuray/prometheus-json-exporter/pull/17.patch";
+    sha256 = "0mc5axhd2bykci41dgswl4r1552d70jsmb17lbih7czhsy6rgmrm";
+  })];
+
   meta = with lib; {
     description = "A prometheus exporter which scrapes remote JSON by JSONPath";
     homepage = https://github.com/kawamuray/prometheus-json-exporter;

From 9cfbcc28d037a3e334dad9e3056cb63b03377256 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:24:08 -0700
Subject: [PATCH 1216/3253] gmock: 1.8.0 -> 1.8.1 (#46273)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gtest
---
 pkgs/development/libraries/gtest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index f5fc635a5a43..769cc1c768c9 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,13 +1,13 @@
 { stdenv, cmake, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "gtest-${version}";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
     rev = "release-${version}";
-    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+    sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
   };
 
   buildInputs = [ cmake ];

From 9064d9db001472e544536daf5ef7381ff4913d82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 09:26:08 -0700
Subject: [PATCH 1217/3253] cstore_fdw: 1.6.1 -> 1.6.2 (#46291)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cstore_fdw/versions
---
 pkgs/servers/sql/postgresql/cstore_fdw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
index b6b9f3a5650f..a6e2c590f385 100644
--- a/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
+++ b/pkgs/servers/sql/postgresql/cstore_fdw/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "cstore_fdw-${version}";
-  version = "1.6.1";
+  version = "1.6.2";
 
   nativeBuildInputs = [ protobufc ];
   buildInputs = [ postgresql ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "cstore_fdw";
     rev    = "refs/tags/v${version}";
-    sha256 = "1cpkpbv4c82l961anzwp74r1jc8f0n5z5cvwy4lyrqg5jr501nd4";
+    sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74";
   };
 
   installPhase = ''

From ce6e72a11cc2f52d6e92224791fe5db7f9e2ecdd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 17 Sep 2018 18:09:34 +0200
Subject: [PATCH 1218/3253] texlive: fix missing synctex header

The automake file was patched but `automake` not run.
Also since the texk/web2c folder is not in autoconfig's
SUBDIRS the autoreconfHook has to be run in there.

Completely fixes #46376
---
 pkgs/tools/typesetting/tex/texlive/bin.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index e3528ce699d1..73d8b6d0edb6 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -2,7 +2,7 @@
 , texlive
 , zlib, libiconv, libpng, libX11
 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
-, perl, pkgconfig
+, perl, pkgconfig, autoreconfHook
 , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
 , cairo, pixman, xorg, clisp, biber
 , makeWrapper
@@ -38,6 +38,9 @@ let
         sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
       })
     ];
+    # remove when removing synctex-missing-header.patch
+    preAutoreconf = "pushd texk/web2c";
+    postAutoreconf = "popd";
 
     configureFlags = [
       "--with-banner-add=/NixOS.org"
@@ -69,11 +72,11 @@ texliveYear = year;
 core = stdenv.mkDerivation rec {
   name = "texlive-bin-${version}";
 
-  inherit (common) src patches;
+  inherit (common) src patches preAutoreconf postAutoreconf;
 
   outputs = [ "out" "doc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     /*teckit*/ zziplib poppler mpfr gmp
     pixman potrace gd freetype libpng libpaper zlib
@@ -106,7 +109,6 @@ core = stdenv.mkDerivation rec {
       "xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
     ] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
     ++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure
-    
     ;
 
   enableParallelBuilding = true;
@@ -170,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex;
 core-big = stdenv.mkDerivation { #TODO: upmendex
   name = "texlive-core-big.bin-${version}";
 
-  inherit (common) src patches;
+  inherit (common) src patches preAutoreconf postAutoreconf;
 
   hardeningDisable = [ "format" ];
 

From 31554915a4b98143dba9c306d3c7cb5f817843aa Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Fri, 24 Aug 2018 18:02:10 +1000
Subject: [PATCH 1219/3253] pythonPackages.bjoern: init at 2.2.2

---
 .../python-modules/bjoern/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/bjoern/default.nix

diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix
new file mode 100644
index 000000000000..22243edea9e3
--- /dev/null
+++ b/pkgs/development/python-modules/bjoern/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, libev, python }:
+
+buildPythonPackage rec {
+  pname = "bjoern";
+  version = "2.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w5z9agacci4shmkg9gh46ifj2a724rrgbykdv14830f7jq3dcmi";
+  };
+
+  buildInputs = [ libev ];
+
+  checkPhase = ''
+    ${python.interpreter} tests/keep-alive-behaviour.py 2>/dev/null
+    ${python.interpreter} tests/test_wsgi_compliance.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jonashaag/bjoern;
+    description = "A screamingly fast Python 2/3 WSGI server written in C";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ cmcdragonkai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 611e97e69780..03e2dffe7274 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16935,6 +16935,8 @@ EOF
 
   black = callPackage ../development/python-modules/black { };
 
+  bjoern = callPackage ../development/python-modules/bjoern { };
+
   autobahn = callPackage ../development/python-modules/autobahn { };
 
   jsonref = callPackage ../development/python-modules/jsonref { };

From de9fb389f402db29c7595997a331acc546795c8e Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 14 Sep 2018 18:47:18 +0100
Subject: [PATCH 1220/3253] pythonPackages.fuse: 0.2.1 -> 0.3.1 | refactor |
 python3 support

---
 .../python-modules/fuse-python/default.nix    | 25 +++++++++++++++++
 .../python-modules/python-fuse/default.nix    | 27 -------------------
 pkgs/top-level/python-packages.nix            |  4 +--
 3 files changed, 27 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/fuse-python/default.nix
 delete mode 100644 pkgs/development/python-modules/python-fuse/default.nix

diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix
new file mode 100644
index 000000000000..cf965dd244fc
--- /dev/null
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }:
+
+buildPythonPackage rec {
+  pname = "fuse-python";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0p1f01gah1y8skirrwsbxapz3g6drqihnkjh27b45ifg43h45g7x";
+  };
+
+  buildInputs = [ fuse ];
+  nativeBuildInputs = [ pkgconfig ];
+  
+  # no tests in the Pypi archive
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for FUSE";
+    homepage = https://github.com/libfuse/python-fuse;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/python-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix
deleted file mode 100644
index 02b86b3b33a3..000000000000
--- a/pkgs/development/python-modules/python-fuse/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib
-, pkgconfig
-, fetchurl
-, fuse
-, buildPythonPackage
-, isPy3k
-}:
-
-buildPythonPackage rec {
-  pname = "fuse";
-  version = "0.2.1";
-
-  disabled = isPy3k;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz";
-    sha256 = "06rmp1ap6flh64m81j0n3a357ij2vj9zwcvvw0p31y6hz1id9shi";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse ];
-
-  meta = {
-    description = "Python bindings for FUSE";
-    license = lib.licenses.lgpl21;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 03e2dffe7274..59324f7ab2f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -302,6 +302,8 @@ in {
 
   fire = callPackage ../development/python-modules/fire { };
 
+  fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; };
+
   genanki = callPackage ../development/python-modules/genanki { };
 
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
@@ -5609,8 +5611,6 @@ in {
     };
   };
 
-  fuse = callPackage ../development/python-modules/python-fuse { fuse = pkgs.fuse; };
-
   fusepy = buildPythonPackage rec {
     name = "fusepy-2.0.4";
 

From 11d0ae36326ebe127ae9d5637d3cfbf4aa741714 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Sep 2018 10:16:37 -0700
Subject: [PATCH 1221/3253] iasl: 20180313 -> 20180629 (#46272)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
iasl
---
 pkgs/development/compilers/iasl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 22f80ae559f7..84265151dc41 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180313";
+  version = "20180629";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
+    sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From a83d61b70864e7b539e129faa8842113b5a55716 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:27:36 +0200
Subject: [PATCH 1222/3253] nixos/release.nix: disable tests.ec2-config
 (#46830)

This test doesn't work in a sandbox and never succeeded on Hydra.
It simulates an EC2 instance reconfiguring itself at runtime,
which needs network access.
---
 nixos/release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index ee31564bcf74..d26aacb669aa 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -285,7 +285,8 @@ in rec {
   tests.ecryptfs = callTest tests/ecryptfs.nix {};
   tests.etcd = callTestOnMatchingSystems ["x86_64-linux"] tests/etcd.nix {};
   tests.ec2-nixops = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops or {};
-  tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
+  # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access
+  #tests.ec2-config = (callSubTestsOnMatchingSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config or {};
   tests.elk = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/elk.nix {};
   tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};

From 91fe7f544777473059f6fdf318a28d78b52e017a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Sep 2018 13:51:14 -0400
Subject: [PATCH 1223/3253] aesop: fix build with vala_42

---
 pkgs/applications/office/aesop/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index cf816a281221..64e2c0b94679 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite, gtk3, gnome3
-, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3
+, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "aesop";
@@ -34,6 +34,14 @@ stdenv.mkDerivation rec {
     poppler
   ];
 
+  # Fix build with vala 0.42
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch";
+      sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169";
+    })
+  ];
+
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py

From eeb9e9473f28b58a4c19caf36497478eba329450 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 18 Sep 2018 14:42:25 -0400
Subject: [PATCH 1224/3253] lollypop-portal: add python3

---
 pkgs/misc/lollypop-portal/default.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/lollypop-portal/default.nix b/pkgs/misc/lollypop-portal/default.nix
index 914888876d23..dfcdebace3b0 100644
--- a/pkgs/misc/lollypop-portal/default.nix
+++ b/pkgs/misc/lollypop-portal/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchFromGitLab, meson, ninja, pkgconfig
-, python36Packages, gnome3, gst_all_1, gtk3, libnotify
+, python3, gnome3, gst_all_1, gtk3, libnotify
 , kid3, easytag, gobjectIntrospection, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+python3.pkgs.buildPythonApplication rec {
   name = "lollypop-portal-${version}";
   version = "0.9.7";
 
+  format = "other";
+  doCheck = false;
+
   src = fetchFromGitLab {
      domain = "gitlab.gnome.org";
      owner = "gnumdk";
@@ -19,33 +22,31 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
-    python36Packages.wrapPython
     wrapGAppsHook
   ];
 
   buildInputs = [
-    gnome3.totem-pl-parser
-    gnome3.libsecret
     gnome3.gnome-settings-daemon
-
-    gst_all_1.gstreamer
+    gnome3.libsecret
+    gnome3.totem-pl-parser
     gst_all_1.gst-plugins-base
-
+    gst_all_1.gstreamer
     gtk3
     libnotify
+    python3
   ];
 
-  pythonPath = with python36Packages; [
-    pygobject3
-    pydbus
+  pythonPath = with python3.pkgs; [
     pycairo
+    pydbus
+    pygobject3
   ];
 
   preFixup = ''
     buildPythonPath "$out/libexec/lollypop-portal $pythonPath"
+    patchPythonScript "$out/libexec/lollypop-portal"
 
     gappsWrapperArgs+=(
-      --prefix PYTHONPATH : "$program_PYTHONPATH"
       --prefix PATH : "${stdenv.lib.makeBinPath [ easytag kid3 ]}"
     )
   '';

From 943871a8666afb00136964945b411a317e2542ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 18 Sep 2018 20:22:14 +0100
Subject: [PATCH 1225/3253] datadog-integrtaions-core: 2018-05-27 -> 2018-09-18

---
 pkgs/tools/networking/dd-agent/integrations-core.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 9212209e775b..e466be816e43 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -41,10 +41,10 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "DataDog";
     repo = "integrations-core";
-    rev = "7be76e73969a8b9c993903681b300e1dd32f4b4d";
-    sha256 = "1qsqzm5iswgv9jrflh5mvbz9a7js7jf42cb28lzdzsp45iwfs2aa";
+    rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4";
+    sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb";
   };
-  version = "git-2018-05-27";
+  version = "git-2018-09-18";
 
   # Build helper to build a single datadog integration package.
   buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {

From be6e99508539a2c5e66df0220b2d19f687983423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <jannehess@gmail.com>
Date: Tue, 18 Sep 2018 21:42:50 +0200
Subject: [PATCH 1226/3253] nixos/tt_rss: Give a proper UID

---
 nixos/modules/services/web-apps/tt-rss.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 2b171aa1b2b2..90b35d19ea11 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -624,7 +624,11 @@ let
     };
 
     users = optionalAttrs (cfg.user == "tt_rss") {
-      users.tt_rss.group = "tt_rss";
+      users.tt_rss = {
+        description = "tt-rss service user";
+        isSystemUser = true;
+        group = "tt_rss";
+      };
       groups.tt_rss = {};
     };
   };

From 5664e64a015354e8b5e3c0cc4e9e7fac0db5f3dc Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 18 Sep 2018 21:47:14 +0200
Subject: [PATCH 1227/3253] nixos/activation: Switch from bash to sh to avoid
 reading users bash config (#46851)

This fixes #46750. This should also work with non-POSIX shells like in #46042.
---
 nixos/modules/system/activation/top-level.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 9797ef641e4f..254e9266e89e 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -115,7 +115,7 @@ let
 
       inherit (pkgs) utillinux coreutils;
       systemd = config.systemd.package;
-      inherit (pkgs.stdenv) shell;
+      shell = "${pkgs.bash}/bin/sh";
 
       inherit children;
       kernelParams = config.boot.kernelParams;

From fc93264f5985660c4f50c6cd762f45c06a3eb450 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 18 Sep 2018 17:07:46 +0200
Subject: [PATCH 1228/3253] codimd: fix option `configuration.saml.idpCert`

---
 nixos/modules/services/web-apps/codimd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
index 5368e8b0e664..5b4a53f00ede 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -834,7 +834,7 @@ in
                 IdP authentication endpoint.
               '';
             };
-            idPCert = mkOption {
+            idpCert = mkOption {
               type = types.str;
               default = "";
               example = "/path/to/cert.pem";

From 3961cab52f45bd2b0ffb54d20ea1caf14bbcd483 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 18 Sep 2018 18:23:03 +0200
Subject: [PATCH 1229/3253] codimd: remove unneeded defaults

---
 nixos/modules/services/web-apps/codimd.nix | 40 +---------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
index 5b4a53f00ede..a0af28eac7cc 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -407,21 +407,18 @@ in
           options = {
             accessKey = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Minio access key.
               '';
             };
             secretKey = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Minio secret key.
               '';
             };
             endpoint = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Minio endpoint.
               '';
@@ -450,21 +447,18 @@ in
           options = {
             accessKeyId = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 AWS access key id.
               '';
             };
             secretAccessKey = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 AWS access key.
               '';
             };
             region = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 AWS S3 region.
               '';
@@ -500,14 +494,12 @@ in
           options = {
             connectionString = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Azure Blob Storage connection string.
               '';
             };
             container = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Azure Blob Storage container name.
                 It will be created if non-existent.
@@ -523,28 +515,24 @@ in
           options = {
             authorizationURL = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Specify the OAuth authorization URL.
               '';
             };
             tokenURL = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Specify the OAuth token URL.
               '';
             };
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Specify the OAuth client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Specify the OAuth client secret.
               '';
@@ -559,14 +547,12 @@ in
           options = {
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Facebook API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Facebook API client secret.
               '';
@@ -581,14 +567,12 @@ in
           options = {
             consumerKey = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Twitter API consumer key.
               '';
             };
             consumerSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Twitter API consumer secret.
               '';
@@ -603,14 +587,12 @@ in
           options = {
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 GitHub API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Github API client secret.
               '';
@@ -633,14 +615,12 @@ in
             };
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 GitLab API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 GitLab API client secret.
               '';
@@ -663,21 +643,18 @@ in
           options = {
             baseURL = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Mattermost authentication endpoint.
               '';
             };
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Mattermost API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Mattermost API client secret.
               '';
@@ -692,21 +669,18 @@ in
           options = {
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Dropbox API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Dropbox API client secret.
               '';
             };
             appKey = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Dropbox app key.
               '';
@@ -721,14 +695,12 @@ in
           options = {
             clientID = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Google API client ID.
               '';
             };
             clientSecret = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Google API client secret.
               '';
@@ -750,7 +722,6 @@ in
             };
             url = mkOption {
               type = types.str;
-              default = "";
               example = "ldap://localhost";
               description = ''
                 URL of LDAP server.
@@ -758,21 +729,18 @@ in
             };
             bindDn = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Bind DN for LDAP access.
               '';
             };
             bindCredentials = mkOption {
               type = types.str;
-              default = "";
               description = ''
                 Bind credentials for LDAP access.
               '';
             };
             searchBase = mkOption {
               type = types.str;
-              default = "";
               example = "o=users,dc=example,dc=com";
               description = ''
                 LDAP directory to begin search from.
@@ -780,7 +748,6 @@ in
             };
             searchFilter = mkOption {
               type = types.str;
-              default = "";
               example = "(uid={{username}})";
               description = ''
                 LDAP filter to search with.
@@ -788,7 +755,6 @@ in
             };
             searchAttributes = mkOption {
               type = types.listOf types.str;
-              default = [];
               example = [ "displayName" "mail" ];
               description = ''
                 LDAP attributes to search with.
@@ -804,7 +770,6 @@ in
             };
             useridField = mkOption {
               type = types.str;
-              default = "";
               example = "uid";
               description = ''
                 LDAP field which is a unique identifier for users on CodiMD.
@@ -812,7 +777,6 @@ in
             };
             tlsca = mkOption {
               type = types.str;
-              default = "";
               example = "server-cert.pem,root.pem";
               description = ''
                 Root CA for LDAP TLS in PEM format.
@@ -828,15 +792,13 @@ in
           options = {
             idpSsoUrl = mkOption {
               type = types.str;
-              default = "";
               example = "https://idp.example.com/sso";
               description = ''
                 IdP authentication endpoint.
               '';
             };
             idpCert = mkOption {
-              type = types.str;
-              default = "";
+              type = types.path;
               example = "/path/to/cert.pem";
               description = ''
                 Path to IdP certificate file in PEM format.

From 8b778c77982d20969c97e761f39e1345455b90f3 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 18 Sep 2018 17:49:11 -0400
Subject: [PATCH 1230/3253] ddccontrol: 0.4.2 -> 0.4.4

---
 pkgs/tools/misc/ddccontrol/automake.patch | 14 ---------
 pkgs/tools/misc/ddccontrol/default.nix    | 36 ++++++++++++-----------
 2 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/misc/ddccontrol/automake.patch

diff --git a/pkgs/tools/misc/ddccontrol/automake.patch b/pkgs/tools/misc/ddccontrol/automake.patch
deleted file mode 100644
index a890654ca7c7..000000000000
--- a/pkgs/tools/misc/ddccontrol/automake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
-index d85ff56..b13e74c 100644
---- a/src/gnome-ddcc-applet/Makefile.am
-+++ b/src/gnome-ddcc-applet/Makefile.am
-@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la
- 
- EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
- 
--pkglib_PROGRAMS = ddcc-applet
-+programfilesdir = $(pkglibdir)
-+programfiles_PROGRAMS = ddcc-applet
- ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
- 
- ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index b03a286d2022..8453aa677477 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -1,36 +1,39 @@
-{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2
+{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2
 , pciutils, pkgconfig, gtk2, ddccontrol-db
 , makeDesktopItem
 }:
 
-let version = "0.4.2"; in
+let version = "0.4.4"; in
 stdenv.mkDerivation rec {
   name = "ddccontrol-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
-    sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
+  src = fetchFromGitHub {
+    owner = "ddccontrol";
+    repo = "ddccontrol";
+    rev = "0.4.4";
+    sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2";
   };
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
 
   buildInputs = [
-    perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db
+    libxml2
+    pciutils
+    gtk2
+    ddccontrol-db
   ];
 
-  patches = [ ./automake.patch ];
-
   hardeningDisable = [ "format" "bindnow" ];
 
   prePatch = ''
-      newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
-      mv configure.ac configure.ac.old
-      oldPath="\$"
-      oldPath+="{datadir}\/ddccontrol-db"
-      sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
-      rm configure.ac.old
+    oldPath="\$""{datadir}/ddccontrol-db"
+    newPath="${ddccontrol-db}/share/ddccontrol-db"
+    sed -i -e "s|$oldPath|$newPath|" configure.ac
+    sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile*
+  '';
 
-      sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile*
+  preConfigure = ''
+    intltoolize --force
   '';
 
   postInstall = ''
@@ -53,10 +56,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A program used to control monitor parameters by software";
-    homepage = http://ddccontrol.sourceforge.net/;
+    homepage = https://github.com/ddccontrol/ddccontrol;
     license = licenses.gpl2;
     platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
   };
 }
-

From 134929d9acb8f004c8166266ccaa04dece0e75b7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 16:51:41 -0500
Subject: [PATCH 1231/3253] rhash: 2018-02-05 -> 1.3.6

Move to official release now that one exists
beyond the pinned git revision.
---
 pkgs/tools/security/rhash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 22d7e93fe476..27f2ca04d710 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, which }:
 
 stdenv.mkDerivation rec {
-  version = "2018-02-05";
+  version = "1.3.6";
   name = "rhash-${version}";
 
   src = fetchFromGitHub {
     owner = "rhash";
     repo = "RHash";
-    rev = "cc26d54ff5df0f692907a5e3132a5eeca559ed61";
-    sha256 = "1ldagp931lmxxpyvsb9rrar4iqwmv94m6lfjzkbkshpmk3p5ng7h";
+    rev = "v${version}";
+    sha256 = "1c8gngjj34ylx1f56hjbvml22bif0bx1b88dx2cyxbix8praxqh7";
   };
 
   nativeBuildInputs = [ which ];

From ea326dd4b52a57f812c72cba3d3d21dd9a343a85 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 17:03:57 -0500
Subject: [PATCH 1232/3253] musl: convert CFLAGS to array

---
 pkgs/os-specific/linux/musl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index a24900ce337a..f88e1850bad5 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--syslibdir=$out/lib")
   '';
 
-  CFLAGS="-fstack-protector-strong" + lib.optionalString stdenv.hostPlatform.isPower " -mlong-double-64";
+  CFLAGS = [ "-fstack-protector-strong" ]
+    ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
 
   configureFlags = [
     "--enable-shared"

From 4305e7d5ecee69b82101c0cb273fddf23aa5c6e2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 17:11:12 -0500
Subject: [PATCH 1233/3253] musl: apply upstream fix for file locking race

---
 pkgs/os-specific/linux/musl/default.nix       |  3 ++
 .../linux/musl/fix-file-locking-race.patch    | 54 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/fix-file-locking-race.patch

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index f88e1850bad5..ccabe97969a6 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
       url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch;
       sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
     })
+    # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d
+    # Explicitly flagged for inclusion by distributions using musl
+    ./fix-file-locking-race.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
diff --git a/pkgs/os-specific/linux/musl/fix-file-locking-race.patch b/pkgs/os-specific/linux/musl/fix-file-locking-race.patch
new file mode 100644
index 000000000000..2ef91390a691
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/fix-file-locking-race.patch
@@ -0,0 +1,54 @@
+From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001
+From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+Date: Tue, 18 Sep 2018 10:03:27 +0300
+Subject: fix race condition in file locking
+
+The condition occurs when
+- thread #1 is holding the lock
+- thread #2 is waiting for it on __futexwait
+- thread #1 is about to release the lock and performs a_swap
+- thread #3 enters the __lockfile function and manages to grab the lock
+  before thread #1 calls __wake, resetting the MAYBE_WAITERS flag
+- thread #1 calls __wake
+- thread #2 wakes up but goes again to __futexwait as the lock is
+  held by thread #3
+- thread #3 releases the lock but does not call __wake as the
+  MAYBE_WAITERS flag is not set
+
+This condition results in thread #2 not being woken up. This patch fixes
+the problem by making the woken up thread ensure that the flag is
+properly set before going to sleep again.
+
+Mainainer's note: This fixes a regression introduced in commit
+c21f750727515602a9e84f2a190ee8a0a2aeb2a1.
+---
+ src/stdio/__lockfile.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
+index 2ff75d8a..0dcb2a42 100644
+--- a/src/stdio/__lockfile.c
++++ b/src/stdio/__lockfile.c
+@@ -8,13 +8,13 @@ int __lockfile(FILE *f)
+ 	int owner = f->lock, tid = __pthread_self()->tid;
+ 	if ((owner & ~MAYBE_WAITERS) == tid)
+ 		return 0;
+-	for (;;) {
+-		owner = a_cas(&f->lock, 0, tid);
+-		if (!owner) return 1;
+-		if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break;
++	owner = a_cas(&f->lock, 0, tid);
++	if (!owner) return 1;
++	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) {
++		if ((owner & MAYBE_WAITERS) ||
++		    a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner)
++			__futexwait(&f->lock, owner|MAYBE_WAITERS, 1);
+ 	}
+-	while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS)))
+-		__futexwait(&f->lock, owner, 1);
+ 	return 1;
+ }
+ 
+-- 
+cgit v1.2.1
+

From 697859fdc562082eae339ccb8cb8c560ab97278d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 17:41:58 -0500
Subject: [PATCH 1234/3253] musl: apply other upstream fixes, selected for
 relevance to NixOS usage

---
 ..._trylock-EBUSY-out-more-directly-whe.patch | 37 ++++++++++++++
 ..._timedlock-avoid-repeatedly-reading-.patch | 41 +++++++++++++++
 ...ce-violation-for-c11-mutex-functions.patch | 35 +++++++++++++
 pkgs/os-specific/linux/musl/default.nix       |  8 +++
 .../linux/musl/fexecve-execveat.patch         | 33 ++++++++++++
 .../linux/musl/tty-more-precise-errors.patch  | 51 +++++++++++++++++++
 6 files changed, 205 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
 create mode 100644 pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
 create mode 100644 pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch
 create mode 100644 pkgs/os-specific/linux/musl/fexecve-execveat.patch
 create mode 100644 pkgs/os-specific/linux/musl/tty-more-precise-errors.patch

diff --git a/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch b/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
new file mode 100644
index 000000000000..5e691ae99e6e
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
@@ -0,0 +1,37 @@
+From 4e4a162d9af283cf71f7310c497672e0c2b8ca3b Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 4 Sep 2018 21:28:38 -0400
+Subject: [PATCH 1/3] in pthread_mutex_trylock, EBUSY out more directly when
+ possible
+
+avoid gratuitously setting up and tearing down the robust list pending
+slot.
+---
+ src/thread/pthread_mutex_trylock.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
+index 54876a61..783ca0c4 100644
+--- a/src/thread/pthread_mutex_trylock.c
++++ b/src/thread/pthread_mutex_trylock.c
+@@ -15,6 +15,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
+ 		return 0;
+ 	}
+ 	if (own == 0x7fffffff) return ENOTRECOVERABLE;
++	if (own && (!(own & 0x40000000) || !(type & 4))) return EBUSY;
+ 
+ 	if (m->_m_type & 128) {
+ 		if (!self->robust_list.off) {
+@@ -25,8 +26,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m)
+ 		self->robust_list.pending = &m->_m_next;
+ 	}
+ 
+-	if ((own && (!(own & 0x40000000) || !(type & 4)))
+-	    || a_cas(&m->_m_lock, old, tid) != old) {
++	if (a_cas(&m->_m_lock, old, tid) != old) {
+ 		self->robust_list.pending = 0;
+ 		return EBUSY;
+ 	}
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch b/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
new file mode 100644
index 000000000000..2f611fc467e7
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
@@ -0,0 +1,41 @@
+From d1fa28860634af4f0efd70d533a756b51a45f83e Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 4 Sep 2018 21:31:47 -0400
+Subject: [PATCH 2/3] in pthread_mutex_timedlock, avoid repeatedly reading
+ mutex type field
+
+compiler cannot cache immutable fields of the mutex object across
+external calls it can't see, much less across atomics.
+---
+ src/thread/pthread_mutex_timedlock.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
+index 0a240e79..f91f4a61 100644
+--- a/src/thread/pthread_mutex_timedlock.c
++++ b/src/thread/pthread_mutex_timedlock.c
+@@ -6,7 +6,8 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
+ 	    && !a_cas(&m->_m_lock, 0, EBUSY))
+ 		return 0;
+ 
+-	int r, t, priv = (m->_m_type & 128) ^ 128;
++	int type = m->_m_type;
++	int r, t, priv = (type & 128) ^ 128;
+ 
+ 	r = pthread_mutex_trylock(m);
+ 	if (r != EBUSY) return r;
+@@ -15,9 +16,9 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
+ 	while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
+ 
+ 	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+-		if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4)))
++		if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4)))
+ 			continue;
+-		if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
++		if ((type&3) == PTHREAD_MUTEX_ERRORCHECK
+ 		 && (r&0x7fffffff) == __pthread_self()->tid)
+ 			return EDEADLK;
+ 
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch b/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch
new file mode 100644
index 000000000000..783873732afd
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch
@@ -0,0 +1,35 @@
+From 2de29bc994029b903a366b8a4a9f8c3c3ee2be90 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 4 Sep 2018 22:56:57 -0400
+Subject: [PATCH 3/3] fix namespace violation for c11 mutex functions
+
+__pthread_mutex_timedlock is used to implement c11 mutex functions,
+and therefore cannot call pthread_mutex_trylock by name.
+---
+ src/thread/pthread_mutex_timedlock.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
+index f91f4a61..d2bd1960 100644
+--- a/src/thread/pthread_mutex_timedlock.c
++++ b/src/thread/pthread_mutex_timedlock.c
+@@ -1,5 +1,7 @@
+ #include "pthread_impl.h"
+ 
++int __pthread_mutex_trylock(pthread_mutex_t *);
++
+ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
+ {
+ 	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+@@ -15,7 +17,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec
+ 	int spins = 100;
+ 	while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
+ 
+-	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
++	while ((r=__pthread_mutex_trylock(m)) == EBUSY) {
+ 		if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4)))
+ 			continue;
+ 		if ((type&3) == PTHREAD_MUTEX_ERRORCHECK
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index ccabe97969a6..376d824a0438 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -59,6 +59,14 @@ stdenv.mkDerivation rec {
     # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d
     # Explicitly flagged for inclusion by distributions using musl
     ./fix-file-locking-race.patch
+    # More specific error reporting
+    ./tty-more-precise-errors.patch
+    # Use execveat to impl fexecve when avail (useful for containers)
+    ./fexecve-execveat.patch
+    # improve behavior in few cases
+		./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
+		./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
+		./0003-fix-namespace-violation-for-c11-mutex-functions.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
diff --git a/pkgs/os-specific/linux/musl/fexecve-execveat.patch b/pkgs/os-specific/linux/musl/fexecve-execveat.patch
new file mode 100644
index 000000000000..6b3894a916c8
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/fexecve-execveat.patch
@@ -0,0 +1,33 @@
+From e36f80cba6d5eefcc1ee664f16c2c72054b83134 Mon Sep 17 00:00:00 2001
+From: "Joseph C. Sible" <josephcsible@gmail.com>
+Date: Sun, 2 Sep 2018 13:42:26 -0400
+Subject: implement fexecve in terms of execveat when it exists
+
+This lets fexecve work even when /proc isn't mounted.
+---
+ src/process/fexecve.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/process/fexecve.c b/src/process/fexecve.c
+index 6507b429..8be3f760 100644
+--- a/src/process/fexecve.c
++++ b/src/process/fexecve.c
+@@ -1,10 +1,15 @@
++#define _GNU_SOURCE
+ #include <unistd.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include "syscall.h"
+ 
+ void __procfdname(char *, unsigned);
+ 
+ int fexecve(int fd, char *const argv[], char *const envp[])
+ {
++	int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH);
++	if (r != -ENOSYS) return __syscall_ret(r);
+ 	char buf[15 + 3*sizeof(int)];
+ 	__procfdname(buf, fd);
+ 	execve(buf, argv, envp);
+-- 
+cgit v1.2.1
+
diff --git a/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch b/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch
new file mode 100644
index 000000000000..06b108559e46
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch
@@ -0,0 +1,51 @@
+From c84971995b3a6d5118f9357c040572f4c78bcd55 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin@python.org>
+Date: Thu, 13 Sep 2018 14:23:42 -0700
+Subject: improve error handling of ttyname_r and isatty
+
+POSIX allows ttyname(_r) and isatty to return EBADF if passed file
+descriptor is invalid.
+
+maintainer's note: these are optional ("may fail") errors, but it's
+non-conforming for ttyname_r to return ENOTTY when it failed for a
+different reason.
+---
+ src/unistd/isatty.c    | 6 +++++-
+ src/unistd/ttyname_r.c | 2 +-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c
+index c8badaf5..75a9c186 100644
+--- a/src/unistd/isatty.c
++++ b/src/unistd/isatty.c
+@@ -1,9 +1,13 @@
+ #include <unistd.h>
++#include <errno.h>
+ #include <sys/ioctl.h>
+ #include "syscall.h"
+ 
+ int isatty(int fd)
+ {
+ 	struct winsize wsz;
+-	return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
++	unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz);
++	if (r == 0) return 1;
++	if (errno != EBADF) errno = ENOTTY;
++	return 0;
+ }
+diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c
+index cb364c29..82acb75e 100644
+--- a/src/unistd/ttyname_r.c
++++ b/src/unistd/ttyname_r.c
+@@ -9,7 +9,7 @@ int ttyname_r(int fd, char *name, size_t size)
+ 	char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2];
+ 	ssize_t l;
+ 
+-	if (!isatty(fd)) return ENOTTY;
++	if (!isatty(fd)) return errno;
+ 
+ 	__procfdname(procname, fd);
+ 	l = readlink(procname, name, size);
+-- 
+cgit v1.2.1
+

From 4c56eb81e9522c74b85f2aadf14f619288191dad Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Sep 2018 20:13:46 -0500
Subject: [PATCH 1235/3253] noti: fix darwin build

---
 pkgs/tools/misc/noti/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix  | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix
index ac5b4199c216..23646abe7875 100644
--- a/pkgs/tools/misc/noti/default.nix
+++ b/pkgs/tools/misc/noti/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }:
 
 buildGoPackage rec {
   name = "noti-${version}";
@@ -11,6 +11,10 @@ buildGoPackage rec {
     sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
+  # TODO: Remove this when we update apple_sdk
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ];
+
   goPackagePath = "github.com/variadico/noti";
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07133473b808..f0ba3a1552e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1467,7 +1467,9 @@ with pkgs;
 
   noteshrink = callPackage ../tools/misc/noteshrink { };
 
-  noti = callPackage ../tools/misc/noti { };
+  noti = callPackage ../tools/misc/noti {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   nrsc5 = callPackage ../applications/misc/nrsc5 { };
 

From 426c2856d77872fa9429397d0020dfcf8f73919a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 18 Sep 2018 21:44:27 -0400
Subject: [PATCH 1236/3253] pythonPackages.python-binance: init at 0.7.0

Library for communicating with the Binance REST API.
---
 .../python-modules/python-binance/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-binance/default.nix

diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix
new file mode 100644
index 000000000000..74d04cfd9277
--- /dev/null
+++ b/pkgs/development/python-modules/python-binance/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi
+, pytest, requests-mock, tox
+, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }:
+
+buildPythonPackage rec {
+  version = "0.7.0";
+  pname = "python-binance";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps";
+  };
+
+  doCheck = false;  # Tries to test multiple interpreters with tox
+  checkInputs = [ pytest requests-mock tox ];
+
+  propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ];
+
+  meta = {
+    description = "Binance Exchange API python implementation for automated trading";
+    homepage = https://github.com/sammchardy/python-binance;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bhipple ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2efbdf88a579..0043cf0a1d51 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -511,6 +511,8 @@ in {
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
+  python-binance = callPackage ../development/python-modules/python-binance { };
+
   python-hosts = callPackage ../development/python-modules/python-hosts { };
 
   python-lz4 = callPackage ../development/python-modules/python-lz4 { };

From af5eab6ea6be8a5a263114e77ac5cad111647516 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack.kelly@data61.csiro.au>
Date: Wed, 19 Sep 2018 16:13:15 +1000
Subject: [PATCH 1237/3253] dockerTools.pullImage: correct default arch

---
 pkgs/build-support/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index bc79f9ff12fd..93b715659eb0 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -40,7 +40,7 @@ rec {
     , imageDigest
     , sha256
     , os ? "linux"
-    , arch ? "x86_64"
+    , arch ? "amd64"
       # This used to set a tag to the pulled image
     , finalImageTag ? "latest"
     , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"

From b026786e77ac4752aee44da47f0597917049dee6 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Tue, 4 Sep 2018 16:25:51 -0500
Subject: [PATCH 1238/3253] sudo: 1.8.24 -> 1.8.25 (#46057)

https://www.sudo.ws/stable.html

(may need to scroll to the 1.8.25 notes
afternewer versions are released)

(cherry picked from commit d93aa1c50fc8a83be1c709f905d8c94e1677845f)
---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 71cf239d72cb..03c400751451 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.24";
+  name = "sudo-1.8.25";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l";
+    sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx";
   };
 
   prePatch = ''

From 2608649de70a77f13306d155a1d96a0763a09d9d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Sep 2018 23:41:29 -0500
Subject: [PATCH 1239/3253] sudo: 1.8.25 -> 1.8.25p1 (bugfix for systems w/o
 ppoll)

(cherry picked from commit b4308beb164c1e7e93bbed95697c734ef66e2da5)
---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 03c400751451..975e533d4771 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.25";
+  name = "sudo-1.8.25p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx";
+    sha256 = "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx";
   };
 
   prePatch = ''

From 5a9c9162228bc0e3d13b316ecf1578bee2cd32e1 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 19 Sep 2018 08:50:25 +0200
Subject: [PATCH 1240/3253] Revert "sudo: 1.8.24 -> 1.8.25 (#46057)"

This reverts commit d93aa1c50fc8a83be1c709f905d8c94e1677845f.

Moved to master, no mass rebuild.
---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 03c400751451..71cf239d72cb 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.25";
+  name = "sudo-1.8.24";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx";
+    sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l";
   };
 
   prePatch = ''

From 71c43f8c4a8b26026a3e837c77026926c53a9a92 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 19 Sep 2018 03:33:07 -0400
Subject: [PATCH 1241/3253] ddccontrol-db: 20061014 -> 20180908 (#46865)

The project has moved to Github and has a totally different build
process since 2006
---
 pkgs/data/misc/ddccontrol-db/default.nix | 41 ++++++++++++------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index 1cbf5e2adafa..2dbd062d4fb2 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -1,34 +1,35 @@
 { stdenv
-, fetchurl
-, perl
-, perlPackages
-, libxml2
-, pciutils
-, pkgconfig
-, gtk2
+, autoconf
+, automake
+, libtool
+, intltool
+, fetchFromGitHub
 }:
 
-let version = "20061014"; in
-let verName = "${version}"; in
 stdenv.mkDerivation {
-  name = "ddccontrol-db-${verName}";
-  src = fetchurl {
-    url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
-    sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
+  name = "ddccontrol-db-20180908";
+  src = fetchFromGitHub {
+    owner = "ddccontrol";
+    repo = "ddccontrol-db";
+    rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84";
+    sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w";
   };
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   buildInputs =
     [
-      perl
-      perlPackages.libxml_perl
-      libxml2
-      pciutils
-      pkgconfig
-      gtk2
+      autoconf
+      automake
+      libtool
+      intltool
     ];
 
   meta = with stdenv.lib; {
     description = "Monitor database for DDCcontrol";
-    homepage = http://ddccontrol.sourceforge.net/;
+    homepage = http://github.com/ddccontrol/ddccontrol-db;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pakhfn ];

From 6c4480b498f185c5bf76f5b30ef9a3a755c9885a Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nix@autogeree.net>
Date: Wed, 19 Sep 2018 11:34:08 +0200
Subject: [PATCH 1242/3253] postfix: add -DUSE_LDAP_SASL in CCARGS to support
 bind=sasl.

---
 pkgs/servers/mail/postfix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 41dfebab7907..d88b9f8b0dbc 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -13,7 +13,7 @@ let
    ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
      ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]
      ++ lib.optional withSQLite "-DHAS_SQLITE"
-     ++ lib.optional withLDAP "-DHAS_LDAP");
+     ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]);
    auxlibs = lib.concatStringsSep " " ([
      "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl"
    ] ++ lib.optional withPgSQL "-lpq"

From 08b94e3c4580a843b82d662d94afcff6af441f81 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 19 Sep 2018 12:03:44 +0200
Subject: [PATCH 1243/3253] Revert "iasl: 20180313 -> 20180629 (#46272)"

This reverts commit 11d0ae36326ebe127ae9d5637d3cfbf4aa741714.

It broke xen.
---
 pkgs/development/compilers/iasl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 84265151dc41..22f80ae559f7 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180629";
+  version = "20180313";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh";
+    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 48d1c50f7ab8da79b24e567e546e876dd602c106 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 19 Sep 2018 14:26:13 +0200
Subject: [PATCH 1244/3253] python/hetzner: 0.8.0 -> 0.8.1

This is only a minor bugfix release and updates the fallback CA root
certificates. For NixOS this is usually not required as the probe paths
will match there, but for non-NixOS users it might be helpful.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0043cf0a1d51..20ba493da153 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6116,13 +6116,13 @@ in {
 
   hetzner = buildPythonPackage rec {
     name = "hetzner-${version}";
-    version = "0.8.0";
+    version = "0.8.1";
 
     src = pkgs.fetchFromGitHub {
       repo = "hetzner";
       owner = "aszlig";
       rev = "v${version}";
-      sha256 = "04q2q2w2qkhfly8rfjg2h5pnh42gs18l6cmipqc37yf7qvkw3nd0";
+      sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq";
     };
 
     meta = {

From 5843e43d231abc6eb6509cfca4b3aa10f232ebc1 Mon Sep 17 00:00:00 2001
From: Maciej Mazur <mamciek@gmail.com>
Date: Wed, 19 Sep 2018 14:35:47 +0200
Subject: [PATCH 1245/3253] mr: 1.20170129 -> 1.20180726

---
 pkgs/applications/version-management/mr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 16948003a7a1..94979056b933 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20170129";
+  version = "1.20180726";
   name = "mr-${version}";
 
   src = fetchgit {

From 047c23782c1a0b77734e2334118156cbcea4bcae Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 19 Sep 2018 15:05:17 +0200
Subject: [PATCH 1246/3253] homebank: 5.1.8 -> 5.2.1

---
 pkgs/applications/office/homebank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 94e0e46767a0..039e2fc1fde9 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.1.8";
+  name = "homebank-5.2.1";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh";
+    sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From af1c268b551270cae649bb6be3274455cde335bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Sep 2018 10:57:59 -0300
Subject: [PATCH 1247/3253] zuki-themes: 3.28-1 -> 3.28-3

---
 pkgs/misc/themes/zuki/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 35c8e58b0ae9..2c293ecbc4ac 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
-  version = "3.28-1";
+  version = "3.28-3";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = "v${version}";
-    sha256 = "1if39k8vgk4cpshl625vdf8lz6jgicgybd5nilycj66sf1k5jgb9";
+    sha256 = "0sgp41fpd8lyyb0v82y41v3hmb0ayv3zqqrv0m3ln0dzkr7ym9g7";
   };
 
-  buildInputs = [ gdk_pixbuf gtk_engines ];
+  buildInputs = [ gdk_pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  dontBuild = true;
-
   installPhase = ''
     install -dm 755 $out/share/themes
     cp -a Zuki* $out/share/themes/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Themes for GTK3, gnome-shell and more";
     homepage = https://github.com/lassekongo83/zuki-themes;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 32cd582645856dfa19e2471dfa3810276b3d629b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Sep 2018 11:02:33 -0300
Subject: [PATCH 1248/3253] plano-theme: 3.28-2 -> 3.28-3 (#46892)

---
 pkgs/misc/themes/plano/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix
index 090cdd04f5b0..e1d319ba8c14 100644
--- a/pkgs/misc/themes/plano/default.nix
+++ b/pkgs/misc/themes/plano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "plano-theme-${version}";
-  version = "3.28-2";
+  version = "3.28-3";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
     rev = "v${version}";
-    sha256 = "1xd8xpd8pxxsx6nqrxv2scm9fy6vig8qyxdydgkzhpscrjg9iq9f";
+    sha256 = "0k9jgnifc2s8vsw9fanknx1mg8vlh6qa1cbb910nm4vgrxsbrc74";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];
@@ -23,11 +23,11 @@ stdenv.mkDerivation rec {
     rm $out/share/themes/Plano/LICENSE
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Flat theme for GNOME & Xfce4";
     homepage = https://github.com/lassekongo83/plano-theme;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }

From b224eef1081cd8ca9f4b5564dd33b09a1e274529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 19 Sep 2018 15:08:20 +0100
Subject: [PATCH 1249/3253] python3.pkgs.typeguard: fix builds by applying
 utf-8 locales

ZHF #45960
---
 pkgs/development/python-modules/typeguard/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix
index 6ccde34f48a0..7fb6f8fef435 100644
--- a/pkgs/development/python-modules/typeguard/default.nix
+++ b/pkgs/development/python-modules/typeguard/default.nix
@@ -4,6 +4,7 @@
 , stdenv
 , setuptools_scm
 , pytest
+, glibcLocales
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,9 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ setuptools_scm ];
+  nativeBuildInputs = [ glibcLocales ];
+
+  LC_ALL="en_US.utf-8";
 
   postPatch = ''
     substituteInPlace setup.cfg --replace " --cov" ""

From 970393c34a14e32d10d747eb08e4ebbecba9b390 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:15:02 +0200
Subject: [PATCH 1250/3253] pythonPackages.nilearn: fix test_signal tests
 (#46850)

These tests failed on some machines, probably due to lower arithmetic
presicion. Reduce required precision from 13 to 8 decimal digits.
---
 pkgs/development/python-modules/nilearn/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index bf8ae217705c..14bb15184b59 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -19,6 +19,13 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
+  # These tests fail on some builder machines, probably due to lower
+  # arithmetic precision. Reduce required precision from 13 to 8 decimals.
+  postPatch = ''
+    substituteInPlace nilearn/tests/test_signal.py \
+      --replace 'decimal=13' 'decimal=8'
+  '';
+
   propagatedBuildInputs = [
     matplotlib
     nibabel

From c9969162ab4c3a902febc7c91a27ee9d4b618a48 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:15:51 +0200
Subject: [PATCH 1251/3253] czmq: 4.0.2 -> 4.1.1 (#46855)

---
 pkgs/development/libraries/czmq/4.x.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 840fa34d6ae1..67e005943fa5 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -1,21 +1,14 @@
 { stdenv, fetchurl, fetchpatch, zeromq }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.2";
+  version = "4.1.1";
   name = "czmq-${version}";
 
   src = fetchurl {
     url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340";
+    sha256 = "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh";
   };
 
-  patches = [
-    (fetchpatch {
-      url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch;
-      sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp";
-    })
-  ];
-
   # Needs to be propagated for the .pc file to work
   propagatedBuildInputs = [ zeromq ];
 

From 012682222fc733ad52a28d58eb69b255779e4810 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:16:19 +0200
Subject: [PATCH 1252/3253] openxpki: fix build, use current python3Packages
 (#46860)

Build used python34Packages and failed because python34Packages.pytest
didn't build anymore. Use python3Packages instead.
---
 pkgs/servers/openxpki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix
index f68e1f5e9816..ccfbbd60903b 100644
--- a/pkgs/servers/openxpki/default.nix
+++ b/pkgs/servers/openxpki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python34Packages
+{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python3Packages
 # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere.
 , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }:
 
@@ -11,7 +11,7 @@ buildPerlPackage {
     sha256 = "05bmhani2c7ays488xv3hx5xbxb612bnwq5rdjwmsj51xpaz454p";
   };
 
-  buildInputs = [ perl openssl gettext python34Packages.sphinx ];
+  buildInputs = [ perl openssl gettext python3Packages.sphinx ];
   propagatedBuildInputs = with perlPackages;
     [ # dependencies from Makefile.PL
       libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd

From daf40ab165089f2b5f30ebf3dc047f5dfd309d97 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:19:31 +0200
Subject: [PATCH 1253/3253] nixos/tests/containers-imperative: fix on i686
 (#46874)

Test failed on i686 in a sandbox because some packages required
to build the nixos manual for the container were missing. Add them.
---
 nixos/tests/containers-imperative.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 913d8bed19d0..6f86819f4e88 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -13,6 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # XXX: Sandbox setup fails while trying to hardlink files from the host's
       #      store file system into the prepared chroot directory.
       nix.useSandbox = false;
+      nix.binaryCaches = []; # don't try to access cache.nixos.org
 
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
@@ -27,9 +28,10 @@ import ./make-test.nix ({ pkgs, ...} : {
             };
           };
         };
-      in [
-        pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path
-        pkgs.libxslt
+      in with pkgs; [
+        stdenv stdenvNoCC emptyContainer.config.containers.foo.path
+        libxslt desktop-file-utils texinfo docbook5 libxml2
+        docbook_xsl_ns xorg.lndir documentation-highlighter
       ];
     };
 

From beb8ca288717a7b4059e27018e708de9c0e1dbde Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:19:45 +0200
Subject: [PATCH 1254/3253] nixos/tests/hibernate: prevent non-deterministic
 failure (#46882)

... that occurred mostly on i686. Improve timing.
With this, the failures are no longer reproducible on my machine.
---
 nixos/tests/hibernate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 1f98bb739f21..274aa7becc82 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -35,8 +35,8 @@ import ./make-test.nix (pkgs: {
       $machine->waitForOpenPort(4444);
       $machine->succeed("systemctl hibernate &");
       $machine->waitForShutdown;
+      $probe->waitForUnit("multi-user.target");
       $machine->start;
-      $probe->waitForUnit("network.target");
       $probe->waitUntilSucceeds("echo test | nc machine 4444 -N");
     '';
 

From d57c9ec40757e1c9a9cdf81a51c1a6a94ce052df Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 16:20:00 +0200
Subject: [PATCH 1255/3253] exempi: fix i686 build (#46884)

failed with `unknown symbol __divmoddi4`.
Standard fix is to use gcc6.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0ba3a1552e3..b33088174734 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2396,7 +2396,9 @@ with pkgs;
 
   exa = callPackage ../tools/misc/exa { };
 
-  exempi = callPackage ../development/libraries/exempi { };
+  exempi = callPackage ../development/libraries/exempi {
+    stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv;
+  };
 
   execline = skawarePackages.execline;
 

From 20b09542f2193a18cbf3a8595e472616d5e1757a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 19 Sep 2018 10:45:05 -0400
Subject: [PATCH 1256/3253] perlPackages.NetSCP & perlPackages.NetSSH: init at
 0.08 & 0.09

---
 pkgs/top-level/perl-packages.nix | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 714dba45aa2f..3b5d867208c1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11325,6 +11325,21 @@ let
     };
   };
 
+  NetSCP = buildPerlPackage rec {
+    name = "Net-SCP-0.08.reprise";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz";
+      sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1";
+    };
+    propagatedBuildInputs = [ pkgs.openssl Carp Exporter IO NetSSH StringShellQuote ];
+    patchPhase = ''
+      sed -i 's|$scp = "scp";|$scp = "${pkgs.openssh}/bin/scp";|' SCP.pm
+    '';
+    meta = {
+      description = "Simple wrappers around ssh and scp commands.";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
 
   NetServer = buildPerlPackage {
     name = "Net-Server-2.009";
@@ -11403,6 +11418,22 @@ let
     doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799
   };
 
+  NetSSH = buildPerlPackage rec {
+    name = "Net-SSH-0.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/I/IV/IVAN/${name}.tar.gz";
+      sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817";
+    };
+    propagatedBuildInputs = [ pkgs.openssl Exporter IO ];
+    patchPhase = ''
+      sed -i 's|$ssh = "ssh";|$ssh = "${pkgs.openssh}/bin/ssh";|' SSH.pm
+    '';
+    meta = {
+      description = "Simple wrappers around ssh commands.";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   NetSSLeay = buildPerlPackage rec {
     name = "Net-SSLeay-1.85";
     src = fetchurl {

From 1a15b10ae3b6d4f82e02810b8aab58346f9791ad Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Wed, 19 Sep 2018 10:54:13 -0400
Subject: [PATCH 1257/3253] lightdm: fix tmpfiles path (#46886)

---
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index ae2b05797fd0..8078b93a7574 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -252,7 +252,7 @@ in
     };
 
     systemd.tmpfiles.rules = [
-      "d /var/run/lightdm 0711 lightdm lightdm 0"
+      "d /run/lightdm 0711 lightdm lightdm 0"
       "d /var/cache/lightdm 0711 root lightdm -"
       "d /var/lib/lightdm 1770 lightdm lightdm -"
       "d /var/lib/lightdm-data 1775 lightdm lightdm -"

From aaa3e3f0b430afd8d0fb1f2ab4e17cdd12135fd2 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Wed, 19 Sep 2018 16:14:37 +0100
Subject: [PATCH 1258/3253] pythonPackages.osmnx: init at 0.8.2

---
 .../python-modules/osmnx/default.nix          | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100755 pkgs/development/python-modules/osmnx/default.nix

diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix
new file mode 100755
index 000000000000..c34b75bd0415
--- /dev/null
+++ b/pkgs/development/python-modules/osmnx/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy
+, pandas, requests, Rtree, shapely, pytest, coverage, coveralls, folium, scikitlearn, scipy}:
+
+buildPythonPackage rec {
+  pname = "osmnx";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner  = "gboeing";
+    repo   = pname;
+    rev    = "v${version}";
+    sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k";
+  };
+
+  propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ];
+
+  checkInputs = [ coverage pytest coveralls ];
+  #Fails when using sandboxing as it requires internet connection, works fine without it
+  doCheck = false;
+
+  #Check phase for the record
+  #checkPhase = ''
+  #  coverage run --source osmnx -m pytest --verbose
+  #'';
+
+  meta = with stdenv.lib; {
+    description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX.";
+    homepage = https://github.com/gboeing/osmnx;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 157f45f3f2a9..66625c85a70d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -368,6 +368,8 @@ in {
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };
 
+  osmnx = callPackage ../development/python-modules/osmnx { };
+
   outcome = callPackage ../development/python-modules/outcome {};
 
   palettable = callPackage ../development/python-modules/palettable { };

From 27f95f3f9c0e6f435d100bba7b57e90a129fa907 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nix@autogeree.net>
Date: Tue, 18 Sep 2018 21:46:43 +0200
Subject: [PATCH 1259/3253] dovecot: allow sasl_bind=yes in the LDAP driver.

Dovecot has its own SASL implementation,
but needs Cyrus SASL's headers to bind to an LDAP server using SASL.

This is useful to avoid the need to manage a dnpass= in dovecot-ldap.conf
by using the Unix socket to authenticate.

This is done with sasl_mech=EXTERNAL in dovecot-ldap.conf, and some olcAccess: with
 by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" read
in the slapd's cn=config for the LDAP database queried by dovecot/auth (which runs as root).
---
 pkgs/servers/mail/dovecot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index acd08f658e66..5b7f433feb63 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
 , bzip2, zlib, lz4, inotify-tools, pam, libcap
-, clucene_core_2, icu, openldap, libsodium, libstemmer
+, clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl
 # Auth modules
 , withMySQL ? false, mysql
 , withPgSQL ? false, postgresql
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
-    [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer ]
+    [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer cyrus_sasl.dev ]
     ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
     ++ lib.optional withMySQL mysql.connector-c
     ++ lib.optional withPgSQL postgresql

From 3410dcd90e0d1ddcf3e3ec483bab7c0cbfc152c9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 19 Sep 2018 18:23:18 +0200
Subject: [PATCH 1260/3253] signal-desktop: 1.16.0 -> 1.16.1

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 99cd8371aa94..040f5912db4b 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -55,11 +55,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a";
+    sha256 = "1qlibn6k5zbjw9bni2l20qx58jcpwrl99awdmgha1fzmpjkn6bl5";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 5fb0ed64d0dfcb68d1e60e8a220f68ecc22c3967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20H=C3=B6ppner?= <tilpner@users.noreply.github.com>
Date: Wed, 19 Sep 2018 18:42:13 +0200
Subject: [PATCH 1261/3253] appimage-run: Support type-1 Appimages (#45973)

This attempts to detect older appimages and extract them
in the same manner as new ones, without changing filesystem paths
---
 .../tools/package-management/appimage-run/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index a7fb8da99669..8e236aa426fd 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeScript, buildFHSUserEnv, coreutils
+{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive
 , extraPkgs ? pkgs: [] }:
 
 buildFHSUserEnv {
@@ -131,7 +131,14 @@ buildFHSUserEnv {
     export APPDIR="$SQUASHFS_ROOT/squashfs-root"
     if [ ! -x "$APPDIR" ]; then
       cd "$SQUASHFS_ROOT"
-      "$APPIMAGE" --appimage-extract 2>/dev/null
+
+      if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
+        # is type-1 appimage
+        ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE"
+      else
+        # is type-2 appimage
+        "$APPIMAGE" --appimage-extract 2>/dev/null
+      fi
     fi
 
     cd "$APPDIR"

From a3c820d79c60e64e19ffc2807ae5475f1107419e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 19 Sep 2018 16:50:21 +0000
Subject: [PATCH 1262/3253] ocamlPackages.cohttp: 1.0.2 -> 1.1.1

---
 pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 79dc919556ae..0508f2b74f75 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-	version = "1.0.2";
+	version = "1.1.1";
 	name = "ocaml${ocaml.version}-cohttp-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-cohttp";
 		rev = "v${version}";
-		sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka";
+		sha256 = "1dzd6vy43b7p9xplzg2whylz5br59zxaqywa14b4l377f31gnwq1";
 	};
 
 	buildInputs = [ ocaml findlib dune jsonm ppx_fields_conv ppx_sexp_conv ];

From 265c5fc485267a2be8ca5d555bc247766bc72dbc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 19 Sep 2018 18:47:59 +0200
Subject: [PATCH 1263/3253] gollum: 4.1.2 -> 4.1.3

---
 pkgs/applications/misc/gollum/Gemfile.lock | 42 +++++-----
 pkgs/applications/misc/gollum/default.nix  |  1 +
 pkgs/applications/misc/gollum/gemset.nix   | 89 +++++++++++++++-------
 3 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 7315c0a8d724..f63ffa091a07 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -1,26 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    charlock_holmes (0.7.3)
+    charlock_holmes (0.7.6)
     diff-lcs (1.3)
     gemojione (3.3.0)
       json
-    github-markup (1.6.1)
-    gitlab-grit (2.8.1)
+    github-markup (1.7.0)
+    gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (>= 1.16, < 3)
+      mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gollum (4.1.2)
+    gollum (4.1.3)
       gemojione (~> 3.2)
-      gollum-lib (>= 4.2.7)
+      gollum-lib (>= 4.2.9)
       kramdown (~> 1.9.0)
       mustache (>= 0.99.5, < 1.0.0)
       sinatra (~> 1.4, >= 1.4.4)
       useragent (~> 0.16.2)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.7)
+    gollum-lib (4.2.9)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
@@ -28,27 +28,35 @@ GEM
       rouge (~> 2.1)
       sanitize (~> 2.1)
       stringex (~> 2.6)
+      twitter-text (= 1.14.7)
     json (2.1.0)
     kramdown (1.9.0)
-    mime-types (2.99.3)
-    mini_portile2 (2.2.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.3.0)
     mustache (0.99.8)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
     posix-spawn (0.3.13)
-    rack (1.6.8)
-    rack-protection (1.5.3)
+    rack (1.6.10)
+    rack-protection (1.5.5)
       rack
-    rouge (2.1.1)
+    rouge (2.2.1)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    stringex (2.7.1)
+    stringex (2.8.4)
     tilt (2.0.8)
-    useragent (0.16.8)
+    twitter-text (1.14.7)
+      unf (~> 0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    useragent (0.16.10)
 
 PLATFORMS
   ruby
@@ -57,4 +65,4 @@ DEPENDENCIES
   gollum
 
 BUNDLED WITH
-   1.15.3
+   1.16.3
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 4ad32c5fd7f5..4a0a4e38a61b 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -4,6 +4,7 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gollum";
+  # nix-shell -p bundix icu zlib
   version = (import ./gemset.nix).gollum.version;
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index cff774d7daa0..1b3cda168ac2 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -2,10 +2,10 @@
   charlock_holmes = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.6";
   };
   diff-lcs = {
     source = {
@@ -27,28 +27,28 @@
   github-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
+      sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.0";
   };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
+      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.8.2";
   };
   gollum = {
     dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
+      sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6";
       type = "gem";
     };
-    version = "4.1.2";
+    version = "4.1.3";
   };
   gollum-grit_adapter = {
     dependencies = ["gitlab-grit"];
@@ -60,13 +60,13 @@
     version = "1.0.1";
   };
   gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
+      sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj";
       type = "gem";
     };
-    version = "4.2.7";
+    version = "4.2.9";
   };
   json = {
     source = {
@@ -85,20 +85,29 @@
     version = "1.9.0";
   };
   mime-types = {
+    dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
       type = "gem";
     };
-    version = "2.99.3";
+    version = "3.2.2";
+  };
+  mime-types-data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
+      type = "gem";
+    };
+    version = "3.2018.0812";
   };
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   mustache = {
     source = {
@@ -112,10 +121,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.8.4";
   };
   posix-spawn = {
     source = {
@@ -128,27 +137,27 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
+      sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
       type = "gem";
     };
-    version = "1.6.8";
+    version = "1.6.10";
   };
   rack-protection = {
     dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.5.5";
   };
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
+      sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.2.1";
   };
   sanitize = {
     dependencies = ["nokogiri"];
@@ -171,10 +180,10 @@
   stringex = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.4";
   };
   tilt = {
     source = {
@@ -184,12 +193,38 @@
     };
     version = "2.0.8";
   };
+  twitter-text = {
+    dependencies = ["unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg";
+      type = "gem";
+    };
+    version = "1.14.7";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
+      type = "gem";
+    };
+    version = "0.0.7.5";
+  };
   useragent = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq";
+      sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p";
       type = "gem";
     };
-    version = "0.16.8";
+    version = "0.16.10";
   };
 }
\ No newline at end of file

From e8a35913e138c169e0a2bbcc06efadd9363b24e6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 19 Sep 2018 19:13:14 +0200
Subject: [PATCH 1264/3253] jekyll: 3.8.3 -> 3.8.4 (security)

---
 .../misc/jekyll/basic/Gemfile.lock            | 18 +++---
 .../applications/misc/jekyll/basic/gemset.nix | 32 +++++-----
 .../misc/jekyll/full/Gemfile.lock             | 32 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 60 +++++++++----------
 4 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 15beb8a88fb1..a714cdbb0d06 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -17,13 +17,13 @@ GEM
     ffi (1.9.25)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.8.0)
+    html-pipeline (2.8.4)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.3)
+    jekyll (3.8.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -38,7 +38,7 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-avatar (0.6.0)
       jekyll (~> 3.0)
-    jekyll-mentions (1.4.0)
+    jekyll-mentions (1.4.1)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-sass-converter (1.5.2)
@@ -49,7 +49,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.10.0)
+    jemoji (0.10.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
@@ -62,18 +62,18 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.1.1)
+    rouge (3.2.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.6)
+    sass (3.5.7)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -96,4 +96,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   1.14.6
+   1.16.3
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index a75f74119ca7..7ab1c70a98b4 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -78,10 +78,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
+      sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
       type = "gem";
     };
-    version = "2.8.0";
+    version = "2.8.4";
   };
   "http_parser.rb" = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
+      sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
       type = "gem";
     };
-    version = "3.8.3";
+    version = "3.8.4";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -122,10 +122,10 @@
     dependencies = ["html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
+      sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   jekyll-sass-converter = {
     dependencies = ["sass"];
@@ -167,10 +167,10 @@
     dependencies = ["gemoji" "html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
+      sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.10.1";
   };
   kramdown = {
     source = {
@@ -225,10 +225,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.4";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -242,10 +242,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
       type = "gem";
     };
-    version = "3.0.2";
+    version = "3.0.3";
   };
   rb-fsevent = {
     source = {
@@ -267,10 +267,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
+      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.2.1";
   };
   ruby_dep = {
     source = {
@@ -292,10 +292,10 @@
     dependencies = ["sass-listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
       type = "gem";
     };
-    version = "3.5.6";
+    version = "3.5.7";
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 0689bad59806..01e4f368223c 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -22,19 +22,19 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
     ffi (1.9.25)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.8.0)
+    html-pipeline (2.8.4)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.3)
+    jekyll (3.8.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -52,15 +52,15 @@ GEM
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-feed (0.10.0)
+    jekyll-feed (0.11.0)
       jekyll (~> 3.3)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-mentions (1.4.0)
+    jekyll-mentions (1.4.1)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.13.0)
+    jekyll-redirect-from (0.14.0)
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
@@ -70,7 +70,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.10.0)
+    jemoji (0.10.1)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
@@ -83,20 +83,20 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    octokit (4.9.0)
+    octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     pygments.rb (1.2.1)
       multi_json (>= 1.0.0)
     rb-fsevent (0.10.3)
@@ -105,10 +105,10 @@ GEM
     rdiscount (2.2.0.1)
     rdoc (6.0.4)
     redcarpet (3.4.0)
-    rouge (3.1.1)
+    rouge (3.2.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.6)
+    sass (3.5.7)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -117,7 +117,7 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     thread_safe (0.3.6)
-    tomlrb (1.2.6)
+    tomlrb (1.2.7)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     yajl-ruby (1.3.1)
@@ -152,4 +152,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.3.1)
 
 BUNDLED WITH
-   1.14.6
+   1.16.3
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index e5eb6d62a706..3e92d3f28a01 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -96,10 +96,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
+      sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
       type = "gem";
     };
-    version = "0.15.2";
+    version = "0.15.3";
   };
   fast-stemmer = {
     source = {
@@ -137,10 +137,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
+      sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
       type = "gem";
     };
-    version = "2.8.0";
+    version = "2.8.4";
   };
   "http_parser.rb" = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
+      sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw";
       type = "gem";
     };
-    version = "3.8.3";
+    version = "3.8.4";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -190,10 +190,10 @@
     dependencies = ["jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j";
+      sha256 = "11mlqqbkmddnyh8xfjv5k6v7c73bbi92w7vw4x1c9xvggxrjzicp";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.0";
   };
   jekyll-gist = {
     dependencies = ["octokit"];
@@ -208,10 +208,10 @@
     dependencies = ["html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
+      sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.4.1";
   };
   jekyll-paginate = {
     source = {
@@ -225,10 +225,10 @@
     dependencies = ["jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj";
+      sha256 = "08xfd7fvqcq6skybxsn4d60rqn4ws2y9hkhl71wz9zrc55xhgxa4";
       type = "gem";
     };
-    version = "0.13.0";
+    version = "0.14.0";
   };
   jekyll-sass-converter = {
     dependencies = ["sass"];
@@ -270,10 +270,10 @@
     dependencies = ["gemoji" "html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
+      sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.10.1";
   };
   kramdown = {
     source = {
@@ -321,18 +321,18 @@
     dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
       type = "gem";
     };
-    version = "3.1";
+    version = "3.2.2";
   };
   mime-types-data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
       type = "gem";
     };
-    version = "3.2016.0521";
+    version = "3.2018.0812";
   };
   mini_portile2 = {
     source = {
@@ -370,19 +370,19 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.4";
   };
   octokit = {
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
+      sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh";
       type = "gem";
     };
-    version = "4.9.0";
+    version = "4.12.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -396,10 +396,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
       type = "gem";
     };
-    version = "3.0.2";
+    version = "3.0.3";
   };
   "pygments.rb" = {
     dependencies = ["multi_json"];
@@ -454,10 +454,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
+      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.2.1";
   };
   ruby_dep = {
     source = {
@@ -479,10 +479,10 @@
     dependencies = ["sass-listen"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61";
       type = "gem";
     };
-    version = "3.5.6";
+    version = "3.5.7";
   };
   sass-listen = {
     dependencies = ["rb-fsevent" "rb-inotify"];
@@ -513,10 +513,10 @@
   tomlrb = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz";
+      sha256 = "1x3bg9mmma1gsl5j5kc9m8m77w6qwcq6ix2d0kwi5rcwpr7siyx6";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   tzinfo = {
     dependencies = ["thread_safe"];

From 5715aa1951b7b59d5332e5fdbbadb0e5b469887f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 19 Sep 2018 18:53:11 +0100
Subject: [PATCH 1265/3253] datadog-agent: remove privateTmp=true

This allows postgres integration to connect to socket in /tmp
---
 nixos/modules/services/monitoring/datadog-agent.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 35c08f5e7e30..8fd3455a238f 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -213,7 +213,6 @@ in {
           Group = "datadog";
           Restart = "always";
           RestartSec = 2;
-          PrivateTmp = true;
         };
         restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles;
       } attrs;

From 6bb07ecbbc969d9afd9dccdd23c8ff4eaeba560c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 13:16:17 -0500
Subject: [PATCH 1266/3253] i7z: move to maintained fork (FreeBSD folks),
 0.27.2 -> 0.27.3

---
 pkgs/os-specific/linux/i7z/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 48d28036aa4f..3bf9fbd74d38 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, lib, fetchurl, ncurses
+{ stdenv, lib, fetchFromGitHub, ncurses
 , withGui ? false, qt4 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "i7z-0.27.2";
+  name = "i7z-${version}";
+  version = "0.27.3";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz";
-    sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
+  src = fetchFromGitHub {
+    owner = "DimitryAndric";
+    repo = "i7z";
+    rev = "v${version}";
+    sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
   };
 
   buildInputs = [ ncurses ] ++ lib.optional withGui qt4;

From 6af4a8e6d72660344485e0300d8ef4b360fcea1b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 19 Sep 2018 19:30:09 +0200
Subject: [PATCH 1267/3253] nethack: remove build-time dependency on qt

Unless qtMode is enabled :)
---
 pkgs/games/nethack/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 2a39e3499ed9..be522b2bacf4 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -64,12 +64,14 @@ in stdenv.mkDerivation rec {
       -e 's,^CFLAGS=-g,CFLAGS=,' \
       -i sys/unix/hints/macosx10.10
     sed -e '/define CHDIR/d' -i include/config.h
+    ${lib.optionalString qtMode ''
     sed \
       -e 's,^QTDIR *=.*,QTDIR=${qt5.qtbase.dev},' \
       -e 's,CFLAGS.*QtGui.*,CFLAGS += `pkg-config Qt5Gui --cflags`,' \
       -e 's,CFLAGS+=-DCOMPRESS.*,CFLAGS+=-DCOMPRESS=\\"${gzip}/bin/gzip\\" \\\
         -DCOMPRESS_EXTENSION=\\".gz\\",' \
       -i sys/unix/hints/linux-qt4
+    ''}
   '';
 
   configurePhase = ''

From e1ed5b26c9bfb1880134ae1ee68a9f2c8026b1ed Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 19 Sep 2018 09:45:15 -0400
Subject: [PATCH 1268/3253] haskellPackages.pandoc-crossref: refactor disable
 tests for 0.3.2.1

Author acknowleges test failing (change when no longer 0.3.2.1).
https://github.com/lierdakil/pandoc-crossref/issues/199
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 399bb21f6e62..0fc9a1b168e5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -360,6 +360,7 @@ self: super: {
   optional = dontCheck super.optional;
   orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
+  pandoc-crossref = dontCheck super.pandoc-crossref;  # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199
   persistent-redis = dontCheck super.persistent-redis;
   pipes-extra = dontCheck super.pipes-extra;
   pipes-websockets = dontCheck super.pipes-websockets;

From 234a24cbeb66f70afaab9f13a5a9973c2fb956e0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Sep 2018 13:35:51 +0200
Subject: [PATCH 1269/3253] LTS Haskell 12.10

---
 .../configuration-hackage2nix.yaml            | 81 ++++++++++---------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 467234b8a25d..2eefe636ca97 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.9
+  # LTS Haskell 12.10
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -177,7 +177,7 @@ default-package-overrides:
   - amazonka-xray ==1.6.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
-  - ansi-terminal ==0.8.0.4
+  - ansi-terminal ==0.8.1
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - api-field-json-th ==0.1.0.2
@@ -217,9 +217,9 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.10
+  - autoexporter ==1.1.11
   - auto-update ==0.1.4
-  - avro ==0.3.4.2
+  - avro ==0.3.5.1
   - avwx ==0.3.0.2
   - backprop ==0.2.5.0
   - bank-holidays-england ==0.1.0.7
@@ -350,6 +350,7 @@ default-package-overrides:
   - cassava-records ==0.1.0.4
   - cast ==0.1.0.2
   - category ==0.2.0.1
+  - cayley-client ==0.4.7
   - cborg ==0.2.0.0
   - cereal ==0.5.7.0
   - cereal-conduit ==0.8.0
@@ -654,7 +655,7 @@ default-package-overrides:
   - eliminators ==0.4.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
-  - email-validate ==2.3.2.6
+  - email-validate ==2.3.2.7
   - enclosed-exceptions ==1.0.3
   - entropy ==0.4.1.1
   - enummapset ==0.5.2.2
@@ -679,7 +680,7 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.1.5
+  - eventstore ==1.1.6
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.4
@@ -726,8 +727,8 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - Fin ==0.2.5.0
   - fin ==0.0.1
+  - Fin ==0.2.5.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
@@ -743,14 +744,14 @@ default-package-overrides:
   - flay ==0.4
   - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.14
+  - flow ==1.0.15
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.7
   - fold-debounce-conduit ==0.2.0.1
-  - foldl ==1.4.3
+  - foldl ==1.4.4
   - folds ==0.7.4
   - FontyFruity ==0.5.3.3
   - force-layout ==0.4.0.6
@@ -817,7 +818,7 @@ default-package-overrides:
   - getopt-generics ==0.13.0.2
   - ghc-core ==0.5.6
   - ghc-exactprint ==0.5.6.1
-  - ghcid ==0.7
+  - ghcid ==0.7.1
   - ghcjs-base-stub ==0.2.0.0
   - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
@@ -872,7 +873,7 @@ default-package-overrides:
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
   - greskell ==0.2.1.0
-  - greskell-core ==0.1.2.2
+  - greskell-core ==0.1.2.3
   - greskell-websocket ==0.1.1.0
   - groom ==0.1.2.1
   - groups ==0.4.1.0
@@ -950,7 +951,7 @@ default-package-overrides:
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.2
   - hex ==0.1.2
-  - hexml ==0.3.3
+  - hexml ==0.3.4
   - hexml-lens ==0.2.1
   - hexpat ==0.20.13
   - hexstring ==0.11.1
@@ -1011,7 +1012,7 @@ default-package-overrides:
   - hslua ==0.9.5.2
   - hslua-aeson ==0.3.0.2
   - hslua-module-text ==0.1.2.1
-  - HsOpenSSL ==0.11.4.14
+  - HsOpenSSL ==0.11.4.15
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.5.5
@@ -1080,7 +1081,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.6.2.14
+  - hw-prim ==0.6.2.15
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1119,7 +1120,7 @@ default-package-overrides:
   - indents ==0.5.0.0
   - indexed-list-literals ==0.2.1.1
   - inflections ==0.4.0.3
-  - influxdb ==1.6.0.7
+  - influxdb ==1.6.0.9
   - ini ==0.3.6
   - inline-c ==0.6.1.0
   - inline-java ==0.8.4
@@ -1127,7 +1128,7 @@ default-package-overrides:
   - insert-ordered-containers ==0.2.1.0
   - inspection-testing ==0.2.0.1
   - instance-control ==0.1.2.0
-  - integer-logarithms ==1.0.2.1
+  - integer-logarithms ==1.0.2.2
   - integration ==0.2.1
   - intern ==0.9.2
   - interpolate ==0.2.0
@@ -1151,6 +1152,7 @@ default-package-overrides:
   - ip6addr ==1.0.0
   - iproute ==1.7.5
   - IPv6Addr ==1.1.0
+  - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
   - irc-client ==1.1.0.4
@@ -1222,9 +1224,9 @@ default-package-overrides:
   - lawful ==0.1.0.0
   - lazyio ==0.1.0.4
   - lca ==0.3.1
-  - leancheck ==0.7.3
+  - leancheck ==0.7.4
   - leapseconds-announced ==2017.1.0.1
-  - learn-physics ==0.6.2
+  - learn-physics ==0.6.3
   - lens ==4.16.1
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
@@ -1232,7 +1234,7 @@ default-package-overrides:
   - lens-family ==1.2.2
   - lens-family-core ==1.2.2
   - lens-family-th ==0.5.0.2
-  - lens-labels ==0.2.0.1
+  - lens-labels ==0.2.0.2
   - lens-misc ==0.0.2.0
   - lens-properties ==4.11.1
   - lens-regex ==0.1.0
@@ -1343,7 +1345,7 @@ default-package-overrides:
   - minisat-solver ==0.1
   - miniutter ==0.4.7.0
   - mintty ==0.1.2
-  - miso ==0.21.1.0
+  - miso ==0.21.2.0
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mixed-types-num ==0.3.1.4
@@ -1461,6 +1463,7 @@ default-package-overrides:
   - non-empty ==0.3.0.1
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.2
+  - not-gloss ==0.7.7.0
   - nsis ==0.3.2
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
@@ -1641,7 +1644,7 @@ default-package-overrides:
   - promises ==0.3
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.2
-  - protobuf-simple ==0.1.0.5
+  - protobuf-simple ==0.1.1.0
   - protocol-buffers ==2.4.11
   - protocol-buffers-descriptor ==2.4.11
   - protocol-radius ==0.0.1.1
@@ -1649,7 +1652,7 @@ default-package-overrides:
   - proto-lens ==0.3.1.0
   - proto-lens-arbitrary ==0.1.2.2
   - proto-lens-combinators ==0.1.0.11
-  - proto-lens-optparse ==0.1.1.2
+  - proto-lens-optparse ==0.1.1.3
   - proto-lens-protobuf-types ==0.3.0.1
   - proto-lens-protoc ==0.3.1.2
   - protolude ==0.2.2
@@ -1668,7 +1671,7 @@ default-package-overrides:
   - QuickCheck ==2.11.3
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-instances ==0.3.18
+  - quickcheck-instances ==0.3.19
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.0.4
   - quickcheck-special ==0.1.0.6
@@ -1705,7 +1708,7 @@ default-package-overrides:
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
   - rebase ==1.2.4
-  - record-dot-preprocessor ==0.1.3
+  - record-dot-preprocessor ==0.1.4
   - recursion-schemes ==5.0.3
   - reducers ==3.12.3
   - refact ==0.3.0.2
@@ -1777,8 +1780,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.3.17
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1894,10 +1897,11 @@ default-package-overrides:
   - sort ==1.0.0.0
   - sorted-list ==0.2.1.0
   - sourcemap ==0.1.6
-  - sox ==0.2.3
-  - soxlib ==0.0.3
+  - sox ==0.2.3.1
+  - soxlib ==0.0.3.1
   - sparkle ==0.7.4
   - sparse-linear-algebra ==0.3.1
+  - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
   - speculate ==0.3.5
   - speculation ==1.5.0.3
@@ -1908,7 +1912,7 @@ default-package-overrides:
   - split ==0.2.3.3
   - splitmix ==0.0.1
   - spoon ==0.3.1
-  - spreadsheet ==0.1.3.7
+  - spreadsheet ==0.1.3.8
   - sqlite-simple ==0.4.16.0
   - sqlite-simple-errors ==0.6.1.0
   - sql-words ==0.1.6.2
@@ -1925,7 +1929,7 @@ default-package-overrides:
   - statistics ==0.14.0.2
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
-  - stm ==2.4.5.0
+  - stm ==2.4.5.1
   - stm-chans ==3.0.0.4
   - stm-conduit ==4.0.0
   - stm-containers ==0.2.16
@@ -1981,10 +1985,10 @@ default-package-overrides:
   - symengine ==0.1.2.0
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
-  - system-fileio ==0.3.16.3
+  - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - tabular ==0.2.2.7
-  - tagchup ==0.4.1
+  - tagchup ==0.4.1.1
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.1
   - tagged-identity ==0.1.2
@@ -2026,12 +2030,12 @@ default-package-overrides:
   - terminal-size ==0.3.2.1
   - test-framework ==0.8.2.0
   - test-framework-hunit ==0.3.0.2
-  - test-framework-quickcheck2 ==0.3.0.4
+  - test-framework-quickcheck2 ==0.3.0.5
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
   - testing-feat ==1.1.0.0
   - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.11.0.1
+  - texmath ==0.11.1
   - text ==1.2.3.0
   - text-binary ==0.2.1.1
   - text-builder ==0.5.4.3
@@ -2114,6 +2118,7 @@ default-package-overrides:
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
   - turtle ==1.5.10
+  - TypeCompose ==0.9.13
   - typed-process ==0.2.3.0
   - type-fun ==0.1.1
   - type-hint ==0.1
@@ -2137,7 +2142,7 @@ default-package-overrides:
   - unconstrained ==0.1.0.2
   - unfoldable ==0.9.6
   - unfoldable-restricted ==0.0.3
-  - unicode ==0.0.1
+  - unicode ==0.0.1.1
   - unicode-show ==0.1.0.3
   - unicode-transforms ==0.3.4
   - unification-fd ==0.10.0.1
@@ -2158,7 +2163,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.7.1
+  - unliftio ==0.2.8.0
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2208,7 +2213,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.22
+  - viewprof ==0.0.0.23
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2237,7 +2242,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.23
+  - warp ==3.2.25
   - warp-tls ==3.2.4.3
   - warp-tls-uid ==0.2.0.5
   - wave ==0.1.5
@@ -2301,7 +2306,7 @@ default-package-overrides:
   - xls ==0.1.1
   - xlsx ==0.7.2
   - xml ==1.3.14
-  - xml-basic ==0.1.3
+  - xml-basic ==0.1.3.1
   - xmlbf ==0.4.1
   - xmlbf-xeno ==0.1.1
   - xml-conduit ==1.8.0

From 4b129a73db2e267b4c98b652f9a1313e052f431d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 13 Sep 2018 02:30:45 +0200
Subject: [PATCH 1270/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d5215acecc540c5969196ce0dbc2b51ff577dcc8.
---
 .../haskell-modules/hackage-packages.nix      | 2218 +++++++++--------
 1 file changed, 1225 insertions(+), 993 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 003d9d259ace..dc245e85bc5d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2469,7 +2469,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_2_4_0_0" = callPackage
+  "Cabal_2_4_0_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, binary
      , bytestring, containers, deepseq, Diff, directory, filepath
      , integer-logarithms, mtl, optparse-applicative, parsec, pretty
@@ -2479,8 +2479,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "2.4.0.0";
-       sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl";
+       version = "2.4.0.1";
+       sha256 = "161l9lgayzpb3wrp9bcp8k0a3rq5dpyiyrxjb87dhximi2mc16rv";
        setupHaskellDepends = [ mtl parsec ];
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
@@ -9859,20 +9859,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.14";
-       sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring network time ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
@@ -9884,7 +9870,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -13908,6 +13893,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Oslo-Vectize" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Oslo-Vectize";
+       version = "0.2";
+       sha256 = "05lgpaw6glwflczsa3400fhih717ry4sikhs9ypyd7xlqvraad57";
+       revision = "1";
+       editedCabalFile = "03fchm31c0yl36l8nn3bykgncidrhp3ql44j0r3853s3vknai9gp";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Tests";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "PArrows" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, mtl }:
      mkDerivation {
@@ -14385,8 +14385,8 @@ self: {
      }:
      mkDerivation {
        pname = "Persistence";
-       version = "1.1.3";
-       sha256 = "1v3agyf5dw7dckn3c8lww135dqyyrgb6mws4sy51lqm8zbqdnqb3";
+       version = "1.1.4.2";
+       sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp";
        libraryHaskellDepends = [
          base containers maximal-cliques parallel vector
        ];
@@ -14973,14 +14973,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_12_2" = callPackage
+  "QuickCheck_2_12_4" = callPackage
     ({ mkDerivation, base, containers, deepseq, erf, process, random
      , template-haskell, tf-random, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.12.2";
-       sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r";
+       version = "2.12.4";
+       sha256 = "0pagxjsj2anyy1af0qc7b5mydblhnk3976bda3qxv47qp4kb5xn9";
        libraryHaskellDepends = [
          base containers deepseq erf random template-haskell tf-random
          transformers
@@ -21125,6 +21125,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "activitypub" = callPackage
+    ({ mkDerivation, aeson, base, network-uri, text, time }:
+     mkDerivation {
+       pname = "activitypub";
+       version = "0.1.0.0";
+       sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9";
+       libraryHaskellDepends = [ aeson base network-uri text time ];
+       description = "ActivityPub Haskell Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "activitystreams-aeson" = callPackage
     ({ mkDerivation, aeson, base, text, time, unordered-containers }:
      mkDerivation {
@@ -22450,28 +22461,29 @@ self: {
      }) {};
 
   "aip" = callPackage
-    ({ mkDerivation, base, bytestring, digit, directory, doctest
-     , filepath, HTTP, lens, network-uri, papa, parsec, parsers
-     , QuickCheck, quickcheck-text, tagsoup, tagsoup-selection
-     , template-haskell, transformers
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, checkers
+     , Crypto, directory, exceptions, filepath, HTTP, lens, network-uri
+     , optparse-applicative, parsec, parsers, QuickCheck, tagsoup
+     , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck, time
+     , transformers, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "aip";
-       version = "0.0.1";
-       sha256 = "162mmwniiwlyi3h7d4xxmk2a8pr3ldnl1mx9m9yjpl5vy0926lyd";
+       version = "0.1.0";
+       sha256 = "0b2jr4z0mdkpqzay2c8m2zbbsrs5ia1l5m7zy02nh63ifl5avw2k";
+       revision = "1";
+       editedCabalFile = "13n79gq17kj5q81512j51gz0ld772anyxixfdx1q8inay4araplx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring digit directory filepath HTTP lens network-uri papa
-         parsec parsers tagsoup tagsoup-selection transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring digit directory filepath HTTP lens network-uri papa
-         parsec parsers tagsoup tagsoup-selection transformers
+         aeson aeson-pretty base bytestring Crypto directory exceptions
+         filepath HTTP lens network-uri optparse-applicative parsec parsers
+         tagsoup tagsoup-selection time transformers unordered-containers
+         utf8-string
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base directory doctest filepath parsec QuickCheck quickcheck-text
-         template-haskell
+         base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
@@ -22973,6 +22985,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alg_0_2_7_0" = callPackage
+    ({ mkDerivation, base, util }:
+     mkDerivation {
+       pname = "alg";
+       version = "0.2.7.0";
+       sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6";
+       libraryHaskellDepends = [ base util ];
+       description = "Algebraic structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alga" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, exceptions
      , file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -26738,19 +26762,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.8.0.4";
-       sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_1" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -26761,7 +26772,6 @@ self: {
        libraryHaskellDepends = [ base colour ];
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-terminal-game" = callPackage
@@ -26919,8 +26929,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "6.0.1";
-       sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v";
+       version = "6.0.3";
+       sha256 = "0w50dw9fig4fhk40fjgj1hggs1jbw0yhdrzinmwr2a8lg3nxx5z6";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -26932,6 +26942,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-contract" = callPackage
+    ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
+     mkDerivation {
+       pname = "antiope-contract";
+       version = "6.0.3";
+       sha256 = "001qywhyk013148g4cjw5xkr6b006zvn9f18m98mj5wg6wm1yxzc";
+       libraryHaskellDepends = [
+         aeson antiope-s3 avro base bytestring text
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "antiope-core" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, base, bytestring
      , generic-lens, http-client, lens, monad-logger, mtl, resourcet
@@ -26939,8 +26961,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "6.0.1";
-       sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa";
+       version = "6.0.3";
+       sha256 = "1zrp7dp86vgcj215ykwagjwpqnz137qbi1czhasxq3bby6rmkvca";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring generic-lens http-client
          lens monad-logger mtl resourcet transformers unliftio-core
@@ -26960,8 +26982,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "6.0.1";
-       sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm";
+       version = "6.0.3";
+       sha256 = "1s4x1y88zzac8i5p2yg28q91lknh4cxm72fsxqbpdwq43p1iynb0";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -26981,8 +27003,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "6.0.1";
-       sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn";
+       version = "6.0.3";
+       sha256 = "1mvg36wbj5knqrzmrvh9pn7aw1a22pcv1j8dafvg9qzm6wkr2liw";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
          base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27005,8 +27027,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "6.0.1";
-       sha256 = "1cjvzd47vprn916d1fks6lf08plns326xircfhc69qblkzvqzljs";
+       version = "6.0.3";
+       sha256 = "17ffjl3myk0575cds8z49rv9nkc72yvx37ka5l4r43p8faj82q2m";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base bytestring conduit
          conduit-extra exceptions generic-lens http-types lens monad-logger
@@ -27027,8 +27049,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "6.0.1";
-       sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01";
+       version = "6.0.3";
+       sha256 = "1zxwhlaypk0pykrg39zi1zlz7zs0dha4ri3b6cb0qdbprcwbfvvx";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base generic-lens lens
          text unliftio-core
@@ -27048,8 +27070,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "6.0.1";
-       sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0";
+       version = "6.0.3";
+       sha256 = "0clljlvbz6irxpfjrzhc541991r9spsw8aj5mblb666llc34nbax";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
          antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27141,6 +27163,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aos-signature" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, memory, mtl
+     , protolude, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "aos-signature";
+       version = "0.1.0";
+       sha256 = "1nyizswc7jc6hylb57nsmpqndvqm8mk1wi2fi1l1cqgbkisrxmy5";
+       libraryHaskellDepends = [
+         base bytestring cryptonite memory mtl protolude random
+       ];
+       testHaskellDepends = [
+         base bytestring cryptonite memory mtl protolude QuickCheck random
+         tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "An implementation of the AOS signatures";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aosd" = callPackage
     ({ mkDerivation, base, bindings-DSL, cairo, colour
      , language-haskell-extract, libaosd, monad-control, pango
@@ -30170,6 +30212,8 @@ self: {
        pname = "attoparsec";
        version = "0.13.2.2";
        sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
+       revision = "2";
+       editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va";
        libraryHaskellDepends = [
          array base bytestring containers deepseq scientific text
          transformers
@@ -30803,20 +30847,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "1.1.10";
-       sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base Cabal directory filepath ];
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_1_11" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -30828,7 +30858,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -30945,12 +30974,15 @@ self: {
      }) {};
 
   "avahi" = callPackage
-    ({ mkDerivation, base, dbus-core, text }:
+    ({ mkDerivation, base, bytestring, dbus, text }:
      mkDerivation {
        pname = "avahi";
-       version = "0.1.1";
-       sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0";
-       libraryHaskellDepends = [ base dbus-core text ];
+       version = "0.2.0";
+       sha256 = "1l1z1yvldhdw36ar40ca9y5zpjfahspv40cbq8kgn2246gcgc8am";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring dbus text ];
+       executableHaskellDepends = [ base bytestring dbus text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31133,32 +31165,6 @@ self: {
      }) {};
 
   "avro" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, binary
-     , bytestring, containers, data-binary-ieee754, directory, entropy
-     , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
-     , QuickCheck, scientific, semigroups, tagged, template-haskell
-     , text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "avro";
-       version = "0.3.4.2";
-       sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
-         semigroups tagged template-haskell text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         directory entropy extra fail hashable hspec lens lens-aeson mtl
-         pure-zlib QuickCheck scientific semigroups tagged template-haskell
-         text transformers unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_3_5_1" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, binary
      , bytestring, containers, data-binary-ieee754, directory, entropy
      , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
@@ -31182,7 +31188,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -33849,8 +33854,8 @@ self: {
     ({ mkDerivation, base, bytestring, mtl, time }:
      mkDerivation {
        pname = "benchpress";
-       version = "0.2.2.10";
-       sha256 = "1irrdx2l6pj96cc983jvpkfnkg43zrz1rk1qnin8c2l8kvpwbc76";
+       version = "0.2.2.11";
+       sha256 = "07blpjp84f3xycnrg0dwz3rvlm665dxri2ch54145qd4rxy9hlln";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl time ];
@@ -37802,6 +37807,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blunk-hask-tests" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "blunk-hask-tests";
+       version = "0.2";
+       sha256 = "10x4xjlp1mj9gmsibvd21k76gj97prdsgwxxpg39425xgrzph6ll";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Tests for the Blunk sequencer library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blunt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, clay, flow, http-types
      , jmacro, lucid, pointfree, pointful, text, wai, wai-extra
@@ -38206,8 +38224,8 @@ self: {
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.5";
-       sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5";
+       version = "0.0.0.7";
+       sha256 = "1mb897br307c84p0aj8r20qjwryinhy0bxgm62hphz7mvxlak1pb";
        libraryHaskellDepends = [
          base containers directory mtl temporary
        ];
@@ -38824,6 +38842,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "brick-dropdownmenu" = callPackage
+    ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
+     , microlens-th, pointedlist, vector, vty
+     }:
+     mkDerivation {
+       pname = "brick-dropdownmenu";
+       version = "0.1.0";
+       sha256 = "1801l15xrl5a822v0cdrf8d41iklfqlp6gzkyj14a7fqf3ycc7rw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base brick containers microlens microlens-ghc microlens-th
+         pointedlist vector vty
+       ];
+       description = "A drop-down menu widget for brick";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "brick-skylighting" = callPackage
     ({ mkDerivation, base, brick, containers, skylighting-core, text
      , vty
@@ -39614,21 +39650,21 @@ self: {
 
   "bulletproofs" = callPackage
     ({ mkDerivation, arithmoi, base, containers, cryptonite, memory
-     , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit
-     , tasty-quickcheck, text
+     , MonadRandom, protolude, QuickCheck, random-shuffle, tasty
+     , tasty-discover, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "bulletproofs";
-       version = "0.2.0";
-       sha256 = "0njc7wd1vn6i9zw35vjzm73gzv20b6qn3zci61lpnp3zclbclnmb";
-       revision = "1";
-       editedCabalFile = "0im8y3699rvl0ak3smwry3rafyvrypxan9jb5d39xanwmny2qnky";
+       version = "0.3.0";
+       sha256 = "10ga057zp6sgc177difnb1jjvrsq2d083jchgry7xha2yn0cq0r7";
        libraryHaskellDepends = [
-         arithmoi base containers cryptonite memory protolude text
+         arithmoi base containers cryptonite memory MonadRandom protolude
+         random-shuffle text
        ];
        testHaskellDepends = [
-         arithmoi base containers cryptonite memory protolude QuickCheck
-         tasty tasty-discover tasty-hunit tasty-quickcheck text
+         arithmoi base containers cryptonite memory MonadRandom protolude
+         QuickCheck random-shuffle tasty tasty-discover tasty-hunit
+         tasty-quickcheck text
        ];
        testToolDepends = [ tasty-discover ];
        license = stdenv.lib.licenses.asl20;
@@ -41090,23 +41126,25 @@ self: {
     ({ mkDerivation, array, async, base, base16-bytestring, binary
      , bytestring, Cabal, containers, cryptohash-sha256, deepseq
      , directory, echo, edit-distance, filepath, hackage-security
-     , hashable, HTTP, mtl, network, network-uri, pretty, process
-     , random, resolv, stm, tar, time, unix, zlib
+     , hashable, HTTP, mtl, network, network-uri, parsec, pretty
+     , process, random, resolv, stm, tar, text, time, unix, zip-archive
+     , zlib
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "2.2.0.0";
-       sha256 = "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8";
+       version = "2.4.0.0";
+       sha256 = "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k";
        revision = "1";
-       editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim";
-       isLibrary = true;
+       editedCabalFile = "0cni9i6f6kbfl6f5gypb9ky94ib1w6d0nkd05j4lmrjadnxss49a";
+       isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath process ];
        executableHaskellDepends = [
          array async base base16-bytestring binary bytestring Cabal
          containers cryptohash-sha256 deepseq directory echo edit-distance
          filepath hackage-security hashable HTTP mtl network network-uri
-         pretty process random resolv stm tar time unix zlib
+         parsec pretty process random resolv stm tar text time unix
+         zip-archive zlib
        ];
        doCheck = false;
        postInstall = ''
@@ -41620,8 +41658,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.11";
-       sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41";
+       version = "2.11.1";
+       sha256 = "16ghy26lzf756197xdm8i3lg5qd8bgzjv80llbkpayibh55rkq72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43911,8 +43949,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.7";
-       sha256 = "15acmkp512bzpq9d0yz4dclpvb71fr2wv292ygv371nhyzs8vilp";
+       version = "0.1.1.8";
+       sha256 = "15a3sk4xsr9qz30chf4bzpkhp1s24vw30nhi0vibgshlminfbxv4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47333,8 +47371,8 @@ self: {
      }:
      mkDerivation {
        pname = "cloudi";
-       version = "1.7.3";
-       sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179";
+       version = "1.7.4";
+       sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a";
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
@@ -49450,6 +49488,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compdata-fixplate" = callPackage
+    ({ mkDerivation, base, composition, containers, deriving-compat
+     , fixplate, tree-view
+     }:
+     mkDerivation {
+       pname = "compdata-fixplate";
+       version = "0.1.2";
+       sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz";
+       libraryHaskellDepends = [
+         base composition containers deriving-compat fixplate tree-view
+       ];
+       description = "Compdata basics implemented on top of Fixplate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compdata-param" = callPackage
     ({ mkDerivation, base, compdata, containers, HUnit, mtl
      , template-haskell, test-framework, test-framework-hunit
@@ -50259,8 +50312,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrency-benchmarks";
-       version = "0.1.0";
-       sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi";
+       version = "0.1.1";
+       sha256 = "1zbkyyryh24k67kh3amzscfh7mljj1l6yqd926bkl4ps4d1mdn5d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -51616,12 +51669,12 @@ self: {
      }) {};
 
   "constrained-categories" = callPackage
-    ({ mkDerivation, base, tagged, void }:
+    ({ mkDerivation, base, semigroups, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.3.1.0";
-       sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668";
-       libraryHaskellDepends = [ base tagged void ];
+       version = "0.3.1.1";
+       sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk";
+       libraryHaskellDepends = [ base semigroups tagged void ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52908,6 +52961,8 @@ self: {
        pname = "corecursive-main";
        version = "0.1.0.0";
        sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk";
+       revision = "1";
+       editedCabalFile = "0ffdav9hqn3vn3a2fpxcjlflir0f2lay800rsdi1qg67jycdfk73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
@@ -54535,6 +54590,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-enigma_0_0_2_13" = callPackage
+    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
+     , split
+     }:
+     mkDerivation {
+       pname = "crypto-enigma";
+       version = "0.0.2.13";
+       sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl";
+       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       description = "An Enigma machine simulator with display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "crypto-multihash" = callPackage
     ({ mkDerivation, base, base58-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -54845,8 +54915,8 @@ self: {
        pname = "cryptohash-md5";
        version = "0.11.100.1";
        sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
-       revision = "2";
-       editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a";
+       revision = "3";
+       editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -54865,8 +54935,8 @@ self: {
        pname = "cryptohash-sha1";
        version = "0.11.100.1";
        sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
-       revision = "2";
-       editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m";
+       revision = "3";
+       editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -54885,8 +54955,8 @@ self: {
        pname = "cryptohash-sha256";
        version = "0.11.101.0";
        sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
-       revision = "1";
-       editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3";
+       revision = "2";
+       editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -54907,8 +54977,8 @@ self: {
        pname = "cryptohash-sha512";
        version = "0.11.100.1";
        sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
-       revision = "2";
-       editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil";
+       revision = "3";
+       editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -59925,8 +59995,8 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.7";
-       sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0";
+       version = "0.9.7.1";
+       sha256 = "1mnibf7k40p8y8iqfd28q51nmdz5l3lpmillma2lzbysw24xr6qk";
        libraryHaskellDepends = [
          base bytestring containers foldl hashable primitive transformers
          unordered-containers vector
@@ -60305,6 +60375,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dense-int-set" = callPackage
+    ({ mkDerivation, base, cereal, cereal-vector, deferred-folds
+     , hashable, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "dense-int-set";
+       version = "0.1.5";
+       sha256 = "0xhr7iyhh38nipqb0dkxflh4xr5a10i8zsf8vv11pfqy62irhj6g";
+       libraryHaskellDepends = [
+         base cereal cereal-vector deferred-folds hashable vector
+         vector-algorithms
+       ];
+       description = "Dense int-set";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, microlens
@@ -60445,6 +60531,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "deptrack-core" = callPackage
+    ({ mkDerivation, base, containers, dlist, mtl, parsec }:
+     mkDerivation {
+       pname = "deptrack-core";
+       version = "0.1.0.0";
+       sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj";
+       libraryHaskellDepends = [ base containers dlist mtl parsec ];
+       description = "DepTrack Core types and model";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "deptrack-devops" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring, binary
+     , bytestring, containers, deptrack-core, distributed-closure
+     , dotgen, hashable, lens, mtl, safe, stm, text
+     }:
+     mkDerivation {
+       pname = "deptrack-devops";
+       version = "0.1.0.0";
+       sha256 = "13m6y88icsy6068h6n8klv480hnrjsmqy0szmssrcgsqjnjzpdzh";
+       libraryHaskellDepends = [
+         array async base base64-bytestring binary bytestring containers
+         deptrack-core distributed-closure dotgen hashable lens mtl safe stm
+         text
+       ];
+       description = "DepTrack applied to DevOps";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "deptrack-dot" = callPackage
+    ({ mkDerivation, base, containers, deptrack-core, dotgen }:
+     mkDerivation {
+       pname = "deptrack-dot";
+       version = "0.1.0.0";
+       sha256 = "1lxkab4c3qwgsv0wldvii8qspzq57j82y4bdc28kpp023g38gvb6";
+       libraryHaskellDepends = [ base containers deptrack-core dotgen ];
+       testHaskellDepends = [ base containers deptrack-core dotgen ];
+       description = "Facilitate Graphviz representations of DepTrack dependencies";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "deque" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -60683,6 +60810,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_5_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
+     , template-haskell, th-abstraction, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.5.2";
+       sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell
+         th-abstraction transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -62535,6 +62686,8 @@ self: {
        pname = "digit";
        version = "0.7";
        sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
+       revision = "1";
+       editedCabalFile = "1zdy8jmsn3a065vapl8lf4kzxafbqdwhp99b9s3ff8dj8q5nx4qj";
        libraryHaskellDepends = [
          base lens parsers scientific semigroupoids semigroups
          template-haskell
@@ -63140,6 +63293,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {markdown = null;};
 
+  "discrete" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "discrete";
+       version = "0.1.0.0";
+       sha256 = "1888rv1lqmzip0g2c6f12b01kpwcd5vwk2ixby0g2291xnl7zs2w";
+       revision = "1";
+       editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh";
+       libraryHaskellDepends = [ base ];
+       description = "replacement for enum";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "discrete-intervals" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -64192,6 +64358,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dlist_0_8_0_5" = callPackage
+    ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "dlist";
+       version = "0.8.0.5";
+       sha256 = "0hqvjld86vna9m0za4g37nv2gml2s8q01208igp4l3dl76l8ma4q";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base Cabal QuickCheck ];
+       description = "Difference lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dlist-instances" = callPackage
     ({ mkDerivation, base, dlist, semigroups }:
      mkDerivation {
@@ -64531,19 +64710,24 @@ self: {
      }) {};
 
   "docker-build-cacher" = callPackage
-    ({ mkDerivation, base, containers, foldl, language-docker
+    ({ mkDerivation, aeson, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "2.0.0";
-       sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n";
-       isLibrary = false;
+       version = "2.1.1";
+       sha256 = "0n8x0mcb0rznazbwf9yrnl4mha6zxvpn9kqwna7xd9rxqasqzv0n";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         base containers foldl language-docker system-filepath text turtle
+       libraryHaskellDepends = [
+         aeson base containers foldl language-docker system-filepath text
+         turtle
        ];
-       description = "Builds a services with docker and caches all of its intermediate stages";
+       executableHaskellDepends = [
+         aeson base containers foldl language-docker system-filepath text
+         turtle
+       ];
+       description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64592,6 +64776,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dockerfile_0_2_0" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "dockerfile";
+       version = "0.2.0";
+       sha256 = "1amm7xrfry3fnd53wj50b684lp1vkv98yrz52xxhlldzb4jrk8cp";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "A Haskell DSL for generating Dockerfiles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , HUnit, parsec, split, template-haskell, text, th-lift
@@ -65527,6 +65724,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "drifter-sqlite" = callPackage
+    ({ mkDerivation, base, containers, directory, drifter, mtl
+     , sqlite-simple, tasty, tasty-hunit, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "drifter-sqlite";
+       version = "0.1.0.0";
+       sha256 = "07267h287bpn2smr50m7cf179kfmv8vhv4cwa4qdi1wpifiz8pic";
+       libraryHaskellDepends = [
+         base containers drifter mtl sqlite-simple time transformers
+       ];
+       testHaskellDepends = [
+         base containers directory drifter mtl sqlite-simple tasty
+         tasty-hunit text time transformers
+       ];
+       description = "SQLite support for the drifter schema migraiton tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "drinkery" = callPackage
     ({ mkDerivation, base, exceptions, mtl, transformers }:
      mkDerivation {
@@ -67943,8 +68159,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-bridge";
-       version = "0.4.3";
-       sha256 = "154i3vwqw5qyam14x8dvpgffcgh2ljdl1hc9zw6xhiwb82vazy3z";
+       version = "0.5.0";
+       sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3";
        libraryHaskellDepends = [ aeson base template-haskell ];
        testHaskellDepends = [
          aeson base containers hspec QuickCheck text
@@ -68429,22 +68645,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3.2.6";
-       sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_7" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -68458,7 +68658,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -70776,41 +70975,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, time, transformers-base, unordered-containers
-     , uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "1.1.5";
-       sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_6" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -71729,8 +71893,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.9";
-       sha256 = "1620ljwnprqsrbp2dp0c2f7kpjg7j1xz12x794kpq3csbdp52afk";
+       version = "0.2";
+       sha256 = "1mqkz354w29fyc1sihr8bv10j6igcjhdn807ga9608r1lccgqf2d";
        libraryHaskellDepends = [
          attoparsec base containers free lattices singletons text
          transformers
@@ -71746,8 +71910,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.6";
-       sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a";
+       version = "0.2";
+       sha256 = "17q4mjlh8dxs1al3mw6xm9maxhbmmqprckqnyq9mwqc5j6c26b84";
        libraryHaskellDepends = [
          base containers expressions list-t singletons transformers z3
        ];
@@ -72107,6 +72271,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "f-ree-hack-cheats-free-v-bucks-generator";
+       version = "0.2";
+       sha256 = "0dk9bfcwalwlq52hnl4g4ypz2bip0d8yy45k9dib7cv6v09xfwhi";
+       revision = "3";
+       editedCabalFile = "0dsj8dbdkljcrk0qkmym2pciwcni602yrc90f47v1nm37hs46c6m";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Spam";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "faceted" = callPackage
     ({ mkDerivation, base, free }:
      mkDerivation {
@@ -72561,11 +72740,10 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.4.2";
-       sha256 = "19z36f76w2cp763ija5di0zn1p9c9i1albx6q429f0afrpxymzp5";
+       version = "1.5.0";
+       sha256 = "0cchakbbs7sfjrsg6p45kv9bv1dsxp5mj6q3900v0hf8n7is3qqb";
        isLibrary = true;
        isExecutable = true;
-       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base bytestring containers cpphs deepseq directory
          filepath mtl text utf8-string
@@ -74697,8 +74875,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "first-class-families";
-       version = "0.1.0.0";
-       sha256 = "19lm7p45rn3rlz51pi08ka2sc6nd01ba56pdp6nxakynmc44mw25";
+       version = "0.2.0.0";
+       sha256 = "0lwxz2dv0mcls0ww00h1x92gn4gdrz49arrl21lwqs1lf3q748f5";
        libraryHaskellDepends = [ base ];
        description = "First class type families";
        license = stdenv.lib.licenses.mit;
@@ -75680,18 +75858,6 @@ self: {
      }) {};
 
   "flow" = callPackage
-    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
-     mkDerivation {
-       pname = "flow";
-       version = "1.0.14";
-       sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Write more understandable Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flow_1_0_15" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -75701,7 +75867,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow-er" = callPackage
@@ -76267,28 +76432,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, criterion, hashable, mwc-random, primitive
-     , profunctors, semigroupoids, semigroups, text, transformers
-     , unordered-containers, vector, vector-builder
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.4.3";
-       sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk";
-       revision = "1";
-       editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c";
-       libraryHaskellDepends = [
-         base bytestring comonad containers contravariant hashable
-         mwc-random primitive profunctors semigroupoids semigroups text
-         transformers unordered-containers vector vector-builder
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_4_4" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
      , profunctors, semigroupoids, semigroups, text, transformers
@@ -76306,7 +76449,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -76462,6 +76604,34 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "follow" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, feed
+     , HandsomeSoup, hspec, hxt, req, text, time, transformers
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "follow";
+       version = "0.1.0.0";
+       sha256 = "18j7m8dsmnrq7cnmin48zl1g8yidsh8sgqnlr42qldi49ciam4j0";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions feed HandsomeSoup hxt req text
+         time transformers unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring exceptions feed HandsomeSoup hxt req text
+         time transformers unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions feed HandsomeSoup hspec hxt req
+         text time transformers unordered-containers yaml
+       ];
+       description = "Haskell library to follow content published on any subject";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "follow-file" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-path, base, bytestring
      , conduit, conduit-combinators, directory, exceptions, hinotify
@@ -77661,6 +77831,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "free-v-bucks-generator-no-survey" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "free-v-bucks-generator-no-survey";
+       version = "0.3";
+       sha256 = "1bqba8hx0za9i6kpjv9dapqcaiflcs3wrqz00m2icffjkacf954q";
+       revision = "1";
+       editedCabalFile = "11v9iam3jy1av85bjq4zzl93r2sv6ph72pvkbvhnfzjjhw0kbr42";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Spam";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "free-v-bucks-generator-ps4-no-survey" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "free-v-bucks-generator-ps4-no-survey";
+       version = "0.2";
+       sha256 = "1blsfj6zppi2fi4kkq0b9704qrdkzindx9p3430frxzjz1zrrbaf";
+       revision = "1";
+       editedCabalFile = "0qxnhd5i6b1i4pq6xkisa74cgqgj749pbipw07khzqs8xvgj83wh";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Spam";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "free-vector-spaces" = callPackage
     ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show
      , vector, vector-space
@@ -80186,14 +80386,16 @@ self: {
      }) {};
 
   "generic-data" = callPackage
-    ({ mkDerivation, base, contravariant, show-combinators, tasty
-     , tasty-hunit
+    ({ mkDerivation, base, base-orphans, contravariant
+     , show-combinators, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.1.1.0";
-       sha256 = "1a7pjpr5xmwdmy9l2243a0259n9ndmh868x99ckhm4r7gnra9gg6";
-       libraryHaskellDepends = [ base contravariant show-combinators ];
+       version = "0.2.0.0";
+       sha256 = "0md52nnc8zhi26hywmqyfcxjzh4kvc0jl5ia005mi8c3dvr5l819";
+       libraryHaskellDepends = [
+         base base-orphans contravariant show-combinators
+       ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Utilities for GHC.Generics";
        license = stdenv.lib.licenses.mit;
@@ -81773,15 +81975,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_7_1" = callPackage
+  "ghc-exactprint_0_5_8_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.7.1";
-       sha256 = "0w33vp4k2479xhq0b87ngznxwdklh43k19mzcb63dwh6cvh35kn4";
+       version = "0.5.8.0";
+       sha256 = "1hmyk5d0sbf4kqp4bzcl6q3vf6dpbx2imqky7r206g39xkx3y3fh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82373,6 +82575,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_3" = callPackage
+    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.3";
+       sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7";
+       libraryHaskellDepends = [
+         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit template-haskell
+       ];
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -82393,6 +82617,27 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_6" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.6";
+       sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
@@ -82570,32 +82815,6 @@ self: {
      }) {};
 
   "ghcid" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
-     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
-     , terminal-size, time, unix
-     }:
-     mkDerivation {
-       pname = "ghcid";
-       version = "0.7";
-       sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs directory extra filepath process time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process terminal-size time unix
-       ];
-       testHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process tasty tasty-hunit terminal-size time unix
-       ];
-       description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcid_0_7_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
      , terminal-size, time, unix
@@ -82619,7 +82838,6 @@ self: {
        ];
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -83936,10 +84154,10 @@ self: {
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, base, bloomfilter, bup, byteable
-     , bytestring, Cabal, case-insensitive, concurrent-output, conduit
-     , connection, containers, crypto-api, cryptonite, curl
-     , data-default, DAV, dbus, directory, disk-free-space, dlist, dns
+    ({ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup
+     , byteable, bytestring, Cabal, case-insensitive, concurrent-output
+     , conduit, connection, containers, crypto-api, cryptonite, curl
+     , data-default, DAV, dbus, directory, disk-free-space, dlist
      , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
      , free, git, gnupg, hinotify, hslogger, http-client
      , http-client-tls, http-conduit, http-types, IfElse, lsof, magic
@@ -83954,8 +84172,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180807";
-       sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s";
+       version = "6.20180913";
+       sha256 = "0rsmzbfd4i275c6baa1l9rnyd9a510yyb7g9g8dk8d89f5v6dddb";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -83969,19 +84187,19 @@ self: {
          hslogger IfElse process split transformers unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson async base bloomfilter byteable bytestring case-insensitive
-         concurrent-output conduit connection containers crypto-api
-         cryptonite data-default DAV dbus directory disk-free-space dlist
-         dns edit-distance esqueleto exceptions fdo-notify feed filepath
-         free hinotify hslogger http-client http-client-tls http-conduit
-         http-types IfElse magic memory monad-control monad-logger
-         mountpoints mtl network network-info network-multicast network-uri
-         old-locale optparse-applicative persistent persistent-sqlite
-         persistent-template process QuickCheck random regex-tdfa resourcet
-         SafeSemaphore sandi securemem socks split stm stm-chans tagsoup
-         tasty tasty-hunit tasty-quickcheck tasty-rerun text time torrent
-         transformers unix unix-compat unordered-containers utf8-string uuid
-         vector
+         aeson async attoparsec base bloomfilter byteable bytestring
+         case-insensitive concurrent-output conduit connection containers
+         crypto-api cryptonite data-default DAV dbus directory
+         disk-free-space dlist edit-distance esqueleto exceptions fdo-notify
+         feed filepath free hinotify hslogger http-client http-client-tls
+         http-conduit http-types IfElse magic memory monad-control
+         monad-logger mountpoints mtl network network-info network-multicast
+         network-uri old-locale optparse-applicative persistent
+         persistent-sqlite persistent-template process QuickCheck random
+         regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm
+         stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
+         text time torrent transformers unix unix-compat
+         unordered-containers utf8-string uuid vector
        ];
        executableSystemDepends = [
          bup curl git gnupg lsof openssh perl rsync wget which
@@ -85335,8 +85553,8 @@ self: {
        pname = "glirc";
        version = "2.28";
        sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
-       revision = "1";
-       editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d";
+       revision = "2";
+       editedCabalFile = "082abvc99w4pkv41dzbqbmz3kcyi3zl7i201vr2rdfpwjv8r40pa";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -89291,27 +89509,6 @@ self: {
      }) {};
 
   "greskell-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, doctest
-     , doctest-discover, hashable, hspec, QuickCheck, scientific
-     , semigroups, text, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "greskell-core";
-       version = "0.1.2.2";
-       sha256 = "1h9sx4sdfh2flbvnrmhwy7g5lrzg018w9qrqrrkd4szi499dxc0d";
-       libraryHaskellDepends = [
-         aeson base containers hashable scientific semigroups text
-         unordered-containers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring doctest doctest-discover hspec QuickCheck
-         text unordered-containers vector
-       ];
-       description = "Haskell binding for Gremlin graph query language - core data types and tools";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "greskell-core_0_1_2_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, doctest
      , doctest-discover, hashable, hspec, QuickCheck, scientific
      , semigroups, text, unordered-containers, uuid, vector
@@ -89330,7 +89527,6 @@ self: {
        ];
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greskell-websocket" = callPackage
@@ -89582,8 +89778,10 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-inspector";
-       version = "0.8.0.2";
-       sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz";
+       version = "0.9.0";
+       sha256 = "1vb9zsg2r5d9ad6ppbzzm18hq4d4ygc7g2z1w5nb866774zwlywb";
+       revision = "1";
+       editedCabalFile = "1fzkm7rxg3la10j65drhvqnzcv6c5rscq3cqz7f0395rbw0pakmy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89661,8 +89859,8 @@ self: {
      }:
      mkDerivation {
        pname = "groundhog-th";
-       version = "0.9.0";
-       sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay";
+       version = "0.9.0.1";
+       sha256 = "0hrk86s5mfj33sx5im6pcym1br160vnp17yhi82b2x1imm26cmlk";
        libraryHaskellDepends = [
          aeson base bytestring containers groundhog template-haskell text
          time unordered-containers yaml
@@ -89797,28 +89995,27 @@ self: {
      }) {};
 
   "grpc-api-etcd" = callPackage
-    ({ mkDerivation, base, proto-lens, proto-lens-protoc }:
+    ({ mkDerivation, base, proto-lens, proto-lens-runtime }:
      mkDerivation {
        pname = "grpc-api-etcd";
-       version = "0.1.0.1";
-       sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf";
-       libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
+       version = "0.2.0.0";
+       sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1";
+       libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "grpc-etcd-client" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class
-     , grpc-api-etcd, http2-client, http2-client-grpc, lens, network
-     , proto-lens, proto-lens-protoc
+    ({ mkDerivation, base, bytestring, grpc-api-etcd, http2-client
+     , http2-client-grpc, lens, network, proto-lens, proto-lens-runtime
      }:
      mkDerivation {
        pname = "grpc-etcd-client";
-       version = "0.1.1.2";
-       sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr";
+       version = "0.1.2.0";
+       sha256 = "0ly24551b54cpzh05rmn9j6xl3qb3wi456yv45c69sv7i8jq63zf";
        libraryHaskellDepends = [
-         base bytestring data-default-class grpc-api-etcd http2-client
-         http2-client-grpc lens network proto-lens proto-lens-protoc
+         base bytestring grpc-api-etcd http2-client http2-client-grpc lens
+         network proto-lens proto-lens-runtime
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
@@ -92895,6 +93092,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_12_4_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , file-embed, filepath, fsnotify, http-conduit, http-types
+     , lrucache, mtl, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
+     , resourcet, scientific, tagsoup, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, utillinux, vector, wai, wai-app-static
+     , warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.12.4.0";
+       sha256 = "0kflvb86maqn15h0dh2r2p415q9k351gl9mpb3vnbmfn0nhvg1x1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory file-embed filepath
+         fsnotify http-conduit http-types lrucache mtl network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-tdfa resourcet scientific tagsoup text time
+         time-locale-compat unordered-containers vector wai wai-app-static
+         warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base bytestring containers filepath QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers yaml
+       ];
+       testToolDepends = [ utillinux ];
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -98174,18 +98409,18 @@ self: {
 
   "haskoin-node" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
-     , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe
-     , random, resourcet, rocksdb-haskell, rocksdb-query
-     , string-conversions, time, unique, unliftio
+     , haskoin-core, hspec, monad-logger, mtl, network, nqe, random
+     , resourcet, rocksdb-haskell, rocksdb-query, string-conversions
+     , time, unliftio
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.5.2";
-       sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih";
+       version = "0.6.1";
+       sha256 = "06f1jmdgy5afkxcr06y1cp4jz21nby4snhnbpylj25d2y0dak8wy";
        libraryHaskellDepends = [
-         base bytestring cereal conduit conduit-extra hashable haskoin-core
+         base bytestring cereal conduit conduit-extra haskoin-core
          monad-logger mtl network nqe random resourcet rocksdb-haskell
-         rocksdb-query string-conversions time unique unliftio
+         rocksdb-query string-conversions time unliftio
        ];
        testHaskellDepends = [
          base bytestring cereal haskoin-core hspec monad-logger mtl network
@@ -98249,8 +98484,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.1.3";
-       sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr";
+       version = "0.2.3";
+       sha256 = "0ywfmqdwvw07gx4a413i0ffsgrq2gfjgpw8a6f78h6idiw69shkw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98264,7 +98499,7 @@ self: {
          rocksdb-haskell scotty string-conversions text unliftio
        ];
        testHaskellDepends = [
-         base haskoin-core haskoin-node hspec monad-logger nqe
+         base haskoin-core haskoin-node hspec monad-logger mtl nqe
          rocksdb-haskell unliftio
        ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -102043,18 +102278,6 @@ self: {
      }) {};
 
   "hexml" = callPackage
-    ({ mkDerivation, base, bytestring, extra }:
-     mkDerivation {
-       pname = "hexml";
-       version = "0.3.3";
-       sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4";
-       libraryHaskellDepends = [ base bytestring extra ];
-       testHaskellDepends = [ base bytestring ];
-       description = "XML subset DOM parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hexml_0_3_4" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
@@ -102064,7 +102287,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "XML subset DOM parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexml-lens" = callPackage
@@ -105220,8 +105442,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-svdlibc";
-       version = "0.5.0";
-       sha256 = "1spzpns2r7i82rqkq7s1ikz74m6d0z7fi3nbii7hjz6amskyzpz8";
+       version = "0.5.0.1";
+       sha256 = "0n89899f4n84d284aq2lx88zz1327a030dlzh17bh0ns2yjbm63g";
        libraryHaskellDepends = [ base hmatrix vector ];
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
@@ -108137,18 +108359,18 @@ self: {
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , criterion, hostname, hspec, hspec-core, HUnit, kazura-queue, mtl
      , network, protocol-buffers, protocol-buffers-descriptor
-     , QuickCheck, scientific, text, time, unagi-chan
+     , QuickCheck, scientific, stm, text, time, unagi-chan
      }:
      mkDerivation {
        pname = "hriemann";
-       version = "0.3.3.1";
-       sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f";
+       version = "0.3.3.3";
+       sha256 = "0xxdzbx5wqmz62k8jka2k896sdz49j2aqivmcic9fsrar5inalyp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring containers criterion hostname
          kazura-queue mtl network protocol-buffers
-         protocol-buffers-descriptor scientific text time unagi-chan
+         protocol-buffers-descriptor scientific stm text time unagi-chan
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -108882,10 +109104,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.3";
-       sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk";
-       revision = "1";
-       editedCabalFile = "0lx2z4zfphypmjx9m5v23lywfj2d16l6hs6ipd796g46jczc4piq";
+       version = "0.3.0.4";
+       sha256 = "1mqm4yblv22368v01xq59ppi4ifjpqlswfirm6n42ckb47xhmy09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113923,16 +114143,15 @@ self: {
   "http2-client-grpc" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, case-insensitive
      , data-default-class, http2, http2-client, http2-grpc-types, lens
-     , proto-lens, proto-lens-protoc, text, tls
+     , proto-lens, text, tls
      }:
      mkDerivation {
        pname = "http2-client-grpc";
-       version = "0.5.0.3";
-       sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x";
+       version = "0.5.0.4";
+       sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive data-default-class
-         http2 http2-client http2-grpc-types lens proto-lens
-         proto-lens-protoc text tls
+         http2 http2-client http2-grpc-types lens proto-lens text tls
        ];
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
@@ -113948,8 +114167,8 @@ self: {
        pname = "http2-grpc-types";
        version = "0.3.0.0";
        sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5";
-       revision = "1";
-       editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b";
+       revision = "2";
+       editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive proto-lens zlib
        ];
@@ -114902,14 +115121,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-ip_0_2_0_2" = callPackage
+  "hw-ip_0_2_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
      , hw-bits, hw-hspec-hedgehog, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "0.2.0.2";
-       sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7";
+       version = "0.2.1.0";
+       sha256 = "09qfimmf8dsp1pf0vxjpf5v9ih8rk414jkh50inc83zygzp9if29";
        libraryHaskellDepends = [
          attoparsec base generic-lens hw-bits text
        ];
@@ -115152,29 +115371,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.6.2.14";
-       sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala";
-       libraryHaskellDepends = [
-         base bytestring mmap semigroups transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap semigroups transformers vector
-       ];
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_6_2_15" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
      , transformers, vector
@@ -115195,7 +115391,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -118567,17 +118762,20 @@ self: {
      }) {};
 
   "indexation" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
-     , hashable, hashtables, mmorph, potoki, potoki-cereal, profunctors
-     , text, transformers, unordered-containers, vector
+    ({ mkDerivation, base, bytestring, cereal, cereal-vector
+     , contravariant, deepseq, deferred-folds, dense-int-set, focus
+     , foldl, hashable, list-t, mmorph, potoki, potoki-cereal
+     , profunctors, stm-containers, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.5.0.1";
-       sha256 = "036azy4bnz5xaf0m6dg18yfhi6sljiz9pmap2i8xs8gfbrrl3xsr";
+       version = "0.6.2.1";
+       sha256 = "016srnm3mqvfz1ki0bzxr88frav8zkj8l2nkknfrhx194cxwiahn";
        libraryHaskellDepends = [
-         base bytestring cereal deferred-folds focus hashable hashtables
-         mmorph potoki potoki-cereal profunctors text transformers
+         base bytestring cereal cereal-vector contravariant deepseq
+         deferred-folds dense-int-set focus foldl hashable list-t mmorph
+         potoki potoki-cereal profunctors stm-containers text transformers
          unordered-containers vector
        ];
        description = "Tools for entity indexation";
@@ -118853,30 +119051,6 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, clock, containers, doctest, foldl, http-client
-     , http-types, lens, network, optional-args, QuickCheck, scientific
-     , tagged, template-haskell, text, time, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "influxdb";
-       version = "1.6.0.7";
-       sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock containers foldl http-client
-         http-types lens network optional-args scientific tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       description = "Haskell client library for InfluxDB";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "influxdb_1_6_0_9" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, lens, network, optional-args, QuickCheck, scientific
@@ -118898,7 +119072,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -119527,24 +119700,6 @@ self: {
      }) {};
 
   "integer-logarithms" = callPackage
-    ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
-     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "integer-logarithms";
-       version = "1.0.2.1";
-       sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
-       libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
-       testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       description = "Integer logarithms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "integer-logarithms_1_0_2_2" = callPackage
     ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-hunit, tasty-quickcheck
      , tasty-smallcheck
@@ -119560,7 +119715,6 @@ self: {
        ];
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-pure" = callPackage
@@ -121378,6 +121532,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "itcli" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, mtl
+     , optparse-applicative, text, time, uuid, yaml
+     }:
+     mkDerivation {
+       pname = "itcli";
+       version = "0.1.8.3";
+       sha256 = "1ml6k0imkb6wy3fky2fd5q1gkbywm360jmlb6gw8mp8z7ci6ijbg";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory filepath mtl optparse-applicative text
+         time uuid yaml
+       ];
+       description = "Issue Tracker for the CLI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "itemfield" = callPackage
     ({ mkDerivation, base, brick, data-default, HUnit, microlens
      , microlens-th, QuickCheck, random, test-framework
@@ -122126,8 +122298,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "japanese-calendar";
-       version = "0.1.0.0";
-       sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y";
+       version = "0.1.0.2";
+       sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Data type of Japanese Calendar (Wareki)";
@@ -122515,6 +122687,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jinquantities" = callPackage
+    ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl
+     , parsec, process, quantities, regex-compat
+     }:
+     mkDerivation {
+       pname = "jinquantities";
+       version = "0.1.1";
+       sha256 = "1zrdbd2dkc4n1jycv20a1j8px6lkxdjvnv9l3w7b3z2rajj7rfh2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers mtl parsec ];
+       executableHaskellDepends = [
+         base containers mtl parsec quantities
+       ];
+       testHaskellDepends = [
+         base containers doctest Glob hlint hspec mtl parsec process
+         quantities regex-compat
+       ];
+       description = "Unit conversion and manipulation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jmacro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec
@@ -123518,8 +123712,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
-       revision = "6";
-       editedCabalFile = "1x5vivxcnmf8igc5m3sh301nlag2kj6n7dgpiw58k0f0cdbh86i3";
+       revision = "8";
+       editedCabalFile = "04dqdn9gdw5xgkm4cnzsph57xcjc01rm1fdfwcfdzg71mbyf8f7y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129137,18 +129331,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.7.3";
-       sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_7_4" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -129158,7 +129340,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -129212,22 +129393,6 @@ self: {
      }) {};
 
   "learn-physics" = callPackage
-    ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }:
-     mkDerivation {
-       pname = "learn-physics";
-       version = "0.6.2";
-       sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base gloss gnuplot hmatrix vector-space
-       ];
-       executableHaskellDepends = [ base gloss gnuplot ];
-       description = "Haskell code for learning physics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "learn-physics_0_6_3" = callPackage
     ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss
      , spatial-math, vector-space
      }:
@@ -129245,7 +129410,6 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -129693,10 +129857,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
-       version = "0.2.0.1";
-       sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
-       revision = "1";
-       editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv";
+       version = "0.2.0.2";
+       sha256 = "1s23klkxckly91yfn194bbd3g8lq2x5ykp2mx6730wh2izzwiblw";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
@@ -136260,14 +136422,14 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mameya";
-       version = "0.1.0";
-       sha256 = "15yxnr2b678gb358xy78zws4wgjcr3rqd8ia1d04924yfcm670pb";
+       version = "0.2.1";
+       sha256 = "05di6x3ahjfzs7lz69l4z54ikwz5vw94qdi4bc8mmr6jh67b1z3s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       description = "static site generator made to learn Haskell";
+       description = "Static Website Generator in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -138611,7 +138773,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_7_0_0" = callPackage
+  "megaparsec_7_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, hspec, hspec-expectations, mtl
      , parser-combinators, QuickCheck, scientific, text, transformers
@@ -138619,8 +138781,8 @@ self: {
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "7.0.0";
-       sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz";
+       version = "7.0.1";
+       sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -139084,8 +139246,8 @@ self: {
      }:
      mkDerivation {
        pname = "merge-bash-history";
-       version = "0.1.0.0";
-       sha256 = "0v682qss97ffwm0v1kscqy02a8j7jfn66xr1p277jnfg3m6ng4rf";
+       version = "0.1.0.1";
+       sha256 = "1fi8qg5slkgksx24vz91bhi1ddnmavyjcm1i50la60l3c2y0m8rk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139093,7 +139255,7 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base ];
-       description = "Initial project template from stack";
+       description = "command line utility to merge bash_history";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -139465,6 +139627,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "miconix-test" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "miconix-test";
+       version = "0.2";
+       sha256 = "02p2m11chfva4i6293if0yf8rvdbxjf8wz38ckmksiicmzhss10y";
+       revision = "2";
+       editedCabalFile = "061f5whj0f9bmqwgnp14zi96ja5c5m28hr56qlcf07pv6rsk5fz6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "a";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "micro-recursion-schemes" = callPackage
     ({ mkDerivation, base, cpphs, HUnit, template-haskell
      , th-abstraction
@@ -140644,25 +140821,6 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "0.21.1.0";
-       sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_0_21_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
@@ -140679,7 +140837,6 @@ self: {
        ];
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -140903,6 +141060,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark_0_0_6_0" = callPackage
+    ({ mkDerivation, aeson, base, case-insensitive, containers
+     , criterion, data-default-class, deepseq, dlist, email-validate
+     , foldl, hashable, hspec, hspec-discover, hspec-megaparsec
+     , html-entity-map, lucid, megaparsec, microlens, microlens-th
+     , modern-uri, mtl, parser-combinators, QuickCheck, text
+     , text-metrics, unordered-containers, weigh, yaml
+     }:
+     mkDerivation {
+       pname = "mmark";
+       version = "0.0.6.0";
+       sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base case-insensitive containers data-default-class deepseq
+         dlist email-validate foldl hashable html-entity-map lucid
+         megaparsec microlens microlens-th modern-uri mtl parser-combinators
+         text text-metrics unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+         QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion text weigh ];
+       description = "Strict markdown processor for writers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmark-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid
      , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text
@@ -140924,6 +141111,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark-cli_0_0_4_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid
+     , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mmark-cli";
+       version = "0.0.4.0";
+       sha256 = "0vw1pq3iz4bbz5fgbzi8lvpscc58izh6y210jfi12h2jyzajyf5k";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring directory gitrev lucid megaparsec mmark
+         mmark-ext optparse-applicative stache text unordered-containers
+       ];
+       description = "Command line interface to the MMark markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmark-ext" = callPackage
     ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec
      , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting
@@ -140933,6 +141140,8 @@ self: {
        pname = "mmark-ext";
        version = "0.2.1.0";
        sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+       revision = "2";
+       editedCabalFile = "0xcjkzaah0npyw87mdsymq4bjwdf988fqmylzgr4kihks1a8d4xs";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -143328,8 +143537,8 @@ self: {
      }:
      mkDerivation {
        pname = "morfette";
-       version = "0.4.4";
-       sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy";
+       version = "0.4.7";
+       sha256 = "1vxqg55zsj36pi1bsydm0v4fls4blya9jjfdv56jgdfjsjzzljyh";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -146824,6 +147033,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_2_4" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, megaparsec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.2.4";
+       sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy";
+       libraryHaskellDepends = [
+         base base-prelude megaparsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -150066,15 +150292,15 @@ self: {
 
   "nqe" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , containers, exceptions, hspec, mtl, stm, stm-conduit, text
-     , unliftio
+     , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit
+     , text, unique, unliftio
      }:
      mkDerivation {
        pname = "nqe";
-       version = "0.4.1";
-       sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj";
+       version = "0.5.0";
+       sha256 = "0i5rp2nh4gr6isqvzkxmq31b7ycp2dhs885hn5ng6bc9q3nsjxly";
        libraryHaskellDepends = [
-         base conduit containers mtl stm unliftio
+         base conduit containers hashable mtl stm unique unliftio
        ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra exceptions hspec stm
@@ -151266,6 +151492,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) unixODBC;};
 
+  "odbc_0_2_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , formatting, hspec, optparse-applicative, parsec, QuickCheck
+     , semigroups, template-haskell, text, time, transformers, unixODBC
+     , unliftio-core, weigh
+     }:
+     mkDerivation {
+       pname = "odbc";
+       version = "0.2.1";
+       sha256 = "1s8l3i83jm022v0xqljfbf0qb28p5ps0cg6d9lzplywlqgwjh5nz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq formatting parsec
+         semigroups template-haskell text time transformers unliftio-core
+       ];
+       librarySystemDepends = [ unixODBC ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec parsec QuickCheck text time
+       ];
+       benchmarkHaskellDepends = [ async base text weigh ];
+       description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unixODBC;};
+
   "oden-go-packages" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers
@@ -151845,19 +152100,20 @@ self: {
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, scientific
-     , semigroups, text, time, time-locale-compat, transformers, uuid
-     , void
+     , product-profunctors, profunctors, QuickCheck, semigroups, text
+     , time, time-locale-compat, transformers, uuid, void
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.6.7001.0";
-       sha256 = "0r1hy1p8lcvhqh7p0199dipl7791sbppihl8v1k1vazbr2nkj0l9";
+       version = "0.6.1.0";
+       sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
+       revision = "1";
+       editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
-         profunctors scientific semigroups text time time-locale-compat
-         transformers uuid void
+         profunctors semigroups text time time-locale-compat transformers
+         uuid void
        ];
        testHaskellDepends = [
          aeson base containers contravariant dotenv hspec hspec-discover
@@ -154260,7 +154516,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2_3_2" = callPackage
+  "pandoc_2_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -154275,8 +154531,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2.3.2";
-       sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2";
+       version = "2.3";
+       sha256 = "0wyf0rc8macczrql8v1802hdifzk5nbwxzv42kxfx55qnwdil1av";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -154345,6 +154601,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_14_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.14.4";
+       sha256 = "00m81bwb0s0m7qm3b8xslwdyifdar2fzsnhjrxkqjlj8axdlb796";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -155512,8 +155803,8 @@ self: {
      }:
      mkDerivation {
        pname = "paripari";
-       version = "0.2.1.0";
-       sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2";
+       version = "0.4.0.0";
+       sha256 = "10pg179pcrrwl321xw7q9wyfpfkaczavhlgrmv2nqd2yxwmkgqdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159295,33 +159586,45 @@ self: {
      }) {};
 
   "pier" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary
-     , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256
-     , directory, hashable, http-client, http-client-tls, http-types
-     , optparse-applicative, process, shake, split, temporary, text
-     , transformers, unix, unordered-containers, yaml
+    ({ mkDerivation, aeson, base, binary, binary-orphans, Cabal
+     , containers, directory, hashable, optparse-applicative, pier-core
+     , shake, split, text, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "pier";
-       version = "0.1.0.0";
-       sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6";
-       isLibrary = true;
+       version = "0.2.0.1";
+       sha256 = "0j26bwm58lh0dddn0595hr6pq9f8plkvg670k3g0va1aqbd2i48k";
+       isLibrary = false;
        isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring binary binary-orphans bytestring Cabal
-         containers cryptohash-sha256 directory hashable http-client
-         http-client-tls http-types process shake temporary text
-         transformers unix unordered-containers yaml
-       ];
        executableHaskellDepends = [
-         base Cabal directory optparse-applicative shake split
-         unordered-containers
+         aeson base binary binary-orphans Cabal containers directory
+         hashable optparse-applicative pier-core shake split text
+         transformers unordered-containers yaml
        ];
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pier-core" = callPackage
+    ({ mkDerivation, base, base64-bytestring, binary, bytestring, Cabal
+     , containers, cryptohash-sha256, directory, hashable, http-client
+     , http-client-tls, http-types, process, shake, temporary, text
+     , unix
+     }:
+     mkDerivation {
+       pname = "pier-core";
+       version = "0.2.0.1";
+       sha256 = "1kd6z5vw2v61kpgpf95a8hs4m97lnydsl2k0xqxq5bg59q281b64";
+       libraryHaskellDepends = [
+         base base64-bytestring binary bytestring Cabal containers
+         cryptohash-sha256 directory hashable http-client http-client-tls
+         http-types process shake temporary text unix
+       ];
+       description = "A library for writing forwards-declared build systems in haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "piet" = callPackage
     ({ mkDerivation, array, base, containers, Imlib, mtl }:
      mkDerivation {
@@ -163314,8 +163617,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.0.15";
-       sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz";
+       version = "2.1.1";
+       sha256 = "1qdja72zmrv5w7dpa2bzsf0phw6gaqvwzs8s3ilyw7v0h6hy3kgx";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -163332,6 +163635,8 @@ self: {
        pname = "potoki-cereal";
        version = "0.3.0.1";
        sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi";
+       revision = "1";
+       editedCabalFile = "1jp7vbxipvsg6shc03j0ms6apzmvb38nxpvwkbsk34vll4mzarj4";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
          text
@@ -163347,17 +163652,18 @@ self: {
 
   "potoki-core" = callPackage
     ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion
-     , directory, foldl, hashable, ilist, primitive, profunctors, ptr
-     , QuickCheck, quickcheck-instances, random, rerebase, scanner
-     , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, vector
+     , deepseq, directory, foldl, hashable, ilist, primitive
+     , profunctors, ptr, QuickCheck, quickcheck-instances, random
+     , rerebase, scanner, split, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.2.16";
-       sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d";
+       version = "2.3.1";
+       sha256 = "083qp1fgn1xflmivzrd615lyy0blxn1lmb8lqkjaziqijys2n83i";
        libraryHaskellDepends = [
-         acquire attoparsec base bytestring directory foldl hashable
+         acquire attoparsec base bytestring deepseq directory foldl hashable
          primitive profunctors ptr scanner stm text time transformers
          unordered-containers vector
        ];
@@ -164285,14 +164591,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pretty-show_1_8_1" = callPackage
+  "pretty-show_1_8_2" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.8.1";
-       sha256 = "0s8bj7ymbc9pz91kls2blrpip7pphcc683wd5ig8kywjmix1ibsg";
+       version = "1.8.2";
+       sha256 = "1fc431kr87hpk3rmdpbdiwsq0iyvh61hjwi4w0cp6zyasx8cg91a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -164735,8 +165041,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive-extras";
-       version = "0.7.0.2";
-       sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d";
+       version = "0.7.1";
+       sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n";
        libraryHaskellDepends = [
          base bytestring cereal deferred-folds focus foldl list-t primitive
          profunctors vector
@@ -166336,19 +166642,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.1.2";
-       sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_1_3" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -166359,7 +166652,6 @@ self: {
        ];
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types_0_2_2_0" = callPackage
@@ -166569,31 +166861,6 @@ self: {
      }) {};
 
   "protobuf-simple" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
-     , QuickCheck, quickcheck-instances, split, text
-     }:
-     mkDerivation {
-       pname = "protobuf-simple";
-       version = "0.1.0.5";
-       sha256 = "1w8nx700pyq0r909akyihcajsx5pgj76f2nfvwabib2fy4kv8ikb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 mtl text
-       ];
-       executableHaskellDepends = [
-         base containers directory filepath mtl parsec split text
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 filepath
-         hspec parsec QuickCheck quickcheck-instances split text
-       ];
-       description = "Simple Protocol Buffers library (proto2)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "protobuf-simple_0_1_1_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-binary-ieee754, directory, filepath, hspec, mtl, parsec
      , QuickCheck, quickcheck-instances, split, text
@@ -166616,7 +166883,6 @@ self: {
        ];
        description = "Simple Protocol Buffers library (proto2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers" = callPackage
@@ -168903,10 +169169,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.14.1";
-       sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim";
-       revision = "1";
-       editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l";
+       version = "0.4.14.2";
+       sha256 = "11f9f7s6bag77a2kbhjwhhrcf1afbz18gnn3a4p0h2hav8b5lhcj";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -168932,31 +169196,6 @@ self: {
      }) {};
 
   "quickcheck-instances" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring
-     , case-insensitive, containers, hashable, old-time, QuickCheck
-     , scientific, tagged, text, time, transformers, transformers-compat
-     , unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "quickcheck-instances";
-       version = "0.3.18";
-       sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
-       revision = "2";
-       editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7";
-       libraryHaskellDepends = [
-         array base base-compat bytestring case-insensitive containers
-         hashable old-time QuickCheck scientific tagged text time
-         transformers transformers-compat unordered-containers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         base containers QuickCheck tagged uuid-types
-       ];
-       description = "Common quickcheck instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-instances_0_3_19" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
      , scientific, tagged, text, time, transformers, transformers-compat
@@ -168977,7 +169216,6 @@ self: {
        ];
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-io" = callPackage
@@ -170549,12 +170787,19 @@ self: {
      }) {};
 
   "rank-product" = callPackage
-    ({ mkDerivation, base, random-fu }:
+    ({ mkDerivation, base, bytestring, cassava, containers, lens
+     , optparse-generic, random-fu, text, vector
+     }:
      mkDerivation {
        pname = "rank-product";
-       version = "0.2.0.1";
-       sha256 = "1dn03zlh7n8qk7dir2qdijyk207g9p4nbsc0zw4p3cvfpl4xzzvr";
-       libraryHaskellDepends = [ base random-fu ];
+       version = "0.2.2.0";
+       sha256 = "1nrvcgf61fg243zfp7cab5hxyhjhh2mlk4ysd6igf64w8di25lir";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers random-fu text vector ];
+       executableHaskellDepends = [
+         base bytestring cassava containers lens optparse-generic vector
+       ];
        description = "Find the rank product of a data set";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -172064,19 +172309,6 @@ self: {
      }) {};
 
   "record-dot-preprocessor" = callPackage
-    ({ mkDerivation, base, extra, filepath }:
-     mkDerivation {
-       pname = "record-dot-preprocessor";
-       version = "0.1.3";
-       sha256 = "0sb9gfwq6kvldywmwxni8kgd9vhkpk8xxhidldrj5cwf8a2ipwbx";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base extra filepath ];
-       description = "Preprocessor to allow record.field syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "record-dot-preprocessor_0_1_4" = callPackage
     ({ mkDerivation, base, extra, filepath }:
      mkDerivation {
        pname = "record-dot-preprocessor";
@@ -172087,7 +172319,6 @@ self: {
        executableHaskellDepends = [ base extra filepath ];
        description = "Preprocessor to allow record.field syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-encode" = callPackage
@@ -173798,6 +174029,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "registry" = callPackage
+    ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
+     , io-memoize, protolude, resourcet, tasty, tasty-discover
+     , tasty-hedgehog, tasty-th, text, transformers-base
+     }:
+     mkDerivation {
+       pname = "registry";
+       version = "0.1.0.4";
+       sha256 = "048ymaxiayd948wwyrds5x2nz2spzizc6pwiaw3n62ynp6izkv94";
+       libraryHaskellDepends = [
+         base exceptions protolude resourcet text transformers-base
+       ];
+       testHaskellDepends = [
+         async base exceptions hedgehog hedgehog-corpus io-memoize protolude
+         resourcet tasty tasty-discover tasty-hedgehog tasty-th text
+         transformers-base
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "data structure for assembling \"components\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "regress" = callPackage
     ({ mkDerivation, ad, base, vector }:
      mkDerivation {
@@ -175306,8 +175559,8 @@ self: {
        pname = "resolv";
        version = "0.1.1.1";
        sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
-       revision = "1";
-       editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma";
+       revision = "2";
+       editedCabalFile = "0fyi9wvwvvcasvxdq8fmbjjymap2sx4jyslplx85lv0n83wdrkcf";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers
        ];
@@ -176232,6 +176485,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rfc1751" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "rfc1751";
+       version = "0.1.2";
+       sha256 = "1jls5g6lch4mdspbyzx1kgysa21i2cid68qpvk9z7ggz4lbfhid3";
+       libraryHaskellDepends = [ base bytestring cereal vector ];
+       testHaskellDepends = [
+         base bytestring cereal hspec QuickCheck vector
+       ];
+       description = "RFC-1751 library for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "rfc3339" = callPackage
     ({ mkDerivation, base, timerep }:
      mkDerivation {
@@ -177067,8 +177336,8 @@ self: {
      }:
      mkDerivation {
        pname = "rocksdb-query";
-       version = "0.1.1";
-       sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw";
+       version = "0.1.4";
+       sha256 = "1qk3l9plpid6i9xb1im3xkvsjvj3mk74wgxv9bpd3c3d8x83gwhb";
        libraryHaskellDepends = [
          base bytestring cereal conduit resourcet rocksdb-haskell unliftio
        ];
@@ -181727,8 +181996,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.4";
-       sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm";
+       version = "0.4.0";
+       sha256 = "1zv84rdf5nzszy4qhp74jdzam613z9p86sjh8ag6kb5fxaxk91dh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182889,17 +183158,18 @@ self: {
      }) {};
 
   "servant-auth-token" = callPackage
-    ({ mkDerivation, aeson-injector, base, bytestring, containers
-     , http-api-data, mtl, pwstore-fast, servant, servant-auth-token-api
-     , servant-server, text, time, transformers, uuid, wai
+    ({ mkDerivation, aeson-injector, base, byteable, bytestring
+     , containers, http-api-data, mtl, pwstore-fast, servant
+     , servant-auth-token-api, servant-server, text, time, transformers
+     , uuid, wai
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.5.3.0";
-       sha256 = "04zg9a2brpca39gx0hk1s2mnccw8d5n3gxd082w31f3axji6rm3a";
+       version = "0.5.6.0";
+       sha256 = "1nbyzg13s3082mwmcd5q85a4i94ay7fac74x28ska01y2587p631";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers http-api-data mtl
-         pwstore-fast servant servant-auth-token-api servant-server text
+         aeson-injector base byteable bytestring containers http-api-data
+         mtl pwstore-fast servant servant-auth-token-api servant-server text
          time transformers uuid wai
        ];
        description = "Servant based API and server for token based authorisation";
@@ -182916,8 +183186,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.5.3.1";
-       sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4";
+       version = "0.5.4.0";
+       sha256 = "1792zsnrm7s875bp72yi44kziaky7474z63pivmfba1jdhi33mj5";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -182935,8 +183205,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.5.2.0";
-       sha256 = "1cb04lcqlb0iw729l97dm3xxxhwzinlsf4ipgda2dix8j29v7h5b";
+       version = "0.5.3.0";
+       sha256 = "0i9i89a9h9xq6r23p6xxyf7ywgr90p2dyw8862qz0pdj0qdbbi5v";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -182947,22 +183217,21 @@ self: {
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
-    ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra
-     , containers, exceptions, lens, leveldb-haskell, monad-control, mtl
-     , resourcet, safe, safecopy-store, servant-auth-token
-     , servant-auth-token-api, servant-server, store, text, time
-     , transformers, transformers-base, uuid, vector
+    ({ mkDerivation, aeson-injector, base, bytestring, cereal
+     , concurrent-extra, containers, exceptions, lens, leveldb-haskell
+     , mtl, resourcet, safe, safecopy, servant-auth-token
+     , servant-auth-token-api, servant-server, text, time, transformers
+     , unliftio-core, uuid, vector
      }:
      mkDerivation {
        pname = "servant-auth-token-leveldb";
-       version = "0.5.3.0";
-       sha256 = "0jj7px9w67d2kmcvap02ccmw6y4x9fz1mmwndhb4rjxyr1kkwkja";
+       version = "0.6.0.0";
+       sha256 = "0kqhcvs5ih4lj9i3jdpw8vyzpsim3j03lqfrdc0kqf06a0jyfbkp";
        libraryHaskellDepends = [
-         aeson-injector base bytestring concurrent-extra containers
-         exceptions lens leveldb-haskell monad-control mtl resourcet safe
-         safecopy-store servant-auth-token servant-auth-token-api
-         servant-server store text time transformers transformers-base uuid
-         vector
+         aeson-injector base bytestring cereal concurrent-extra containers
+         exceptions lens leveldb-haskell mtl resourcet safe safecopy
+         servant-auth-token servant-auth-token-api servant-server text time
+         transformers unliftio-core uuid vector
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
@@ -182971,19 +183240,18 @@ self: {
 
   "servant-auth-token-persistent" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers
-     , monad-control, mtl, persistent, persistent-template
+     , exceptions, mtl, persistent, persistent-template
      , servant-auth-token, servant-auth-token-api, servant-server, text
-     , time, transformers, transformers-base, uuid
+     , time, transformers, unliftio-core, uuid
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.6.3.0";
-       sha256 = "1rxcmccfj0rirjngqm3p5azrwlrcf8bfr3fm7m046b6w031cfh9y";
+       version = "0.7.0.0";
+       sha256 = "1mxpq33dbam0zyc7fnrn6zdqirbri8nih1xcyzczpgs946j97zff";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers monad-control mtl
-         persistent persistent-template servant-auth-token
-         servant-auth-token-api servant-server text time transformers
-         transformers-base uuid
+         aeson-injector base bytestring containers exceptions mtl persistent
+         persistent-template servant-auth-token servant-auth-token-api
+         servant-server text time transformers unliftio-core uuid
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
@@ -184984,6 +185252,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "set-of" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "set-of";
+       version = "0.1.0.1";
+       sha256 = "13liv3nh6c8hbkjr119x6zvibkrkah0zslk283d2zl6qw7w7sngm";
+       libraryHaskellDepends = [ base containers ];
+       description = "Sets of fixed size, with typelits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "set-with" = callPackage
     ({ mkDerivation, base, containers, invariant, QuickCheck
      , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
@@ -186380,8 +186659,8 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.3.8";
-       sha256 = "0sji1lw1ma8js9kylixn694108nv74g8qpbfd198fwqvcqx5jhwh";
+       version = "0.3.11";
+       sha256 = "041hqvlfi28ynfcln80dwm1i5g4pjl7ydx0bys35lw92fl39zxb9";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath flow Glob text
          unordered-containers
@@ -187086,6 +187365,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "simple-cmd" = callPackage
+    ({ mkDerivation, base, directory, filepath, process }:
+     mkDerivation {
+       pname = "simple-cmd";
+       version = "0.1.0.0";
+       sha256 = "1d9jaar1in01rwg6if6x9p2hacsdd6k6ygkrza9sbklnr4872msl";
+       libraryHaskellDepends = [ base directory filepath process ];
+       description = "Simple String-based process commands";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "simple-conduit" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
      , chunked-data, conduit, conduit-combinators, conduit-extra
@@ -188933,6 +189223,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "slotmap" = callPackage
+    ({ mkDerivation, base, hspec, primitive, vector }:
+     mkDerivation {
+       pname = "slotmap";
+       version = "0.1.0.0";
+       sha256 = "00zc8n1divwak4r0q4ffnij2qxa3902ly7zbipn0zzjmvx5n1rh0";
+       libraryHaskellDepends = [ base primitive vector ];
+       testHaskellDepends = [ base hspec primitive vector ];
+       description = "Pure Haskell slotmap implementation over ST or IO";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "slug" = callPackage
     ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
      , path-pieces, persistent, QuickCheck, text
@@ -191650,23 +191952,6 @@ self: {
      }) {};
 
   "sox" = callPackage
-    ({ mkDerivation, base, containers, explicit-exception
-     , extensible-exceptions, process, sample-frame, semigroups
-     , transformers, unix, utility-ht
-     }:
-     mkDerivation {
-       pname = "sox";
-       version = "0.2.3";
-       sha256 = "145dmcj9vj58wrndidarnr7bbkybvzyda88awrxw4p3iqy8s2xb0";
-       libraryHaskellDepends = [
-         base containers explicit-exception extensible-exceptions process
-         sample-frame semigroups transformers unix utility-ht
-       ];
-       description = "Play, write, read, convert audio signals using Sox";
-       license = "GPL";
-     }) {};
-
-  "sox_0_2_3_1" = callPackage
     ({ mkDerivation, base, containers, explicit-exception
      , extensible-exceptions, process, sample-frame, semigroups
      , transformers, unix, utility-ht
@@ -191681,30 +191966,9 @@ self: {
        ];
        description = "Play, write, read, convert audio signals using Sox";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soxlib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, explicit-exception
-     , extensible-exceptions, sample-frame, sox, storablevector
-     , transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "soxlib";
-       version = "0.0.3";
-       sha256 = "12ydbn7l8zfnmbxx4jv551vlfs7cflss5vhgaljwxbzan2z5bd8q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers explicit-exception extensible-exceptions
-         sample-frame storablevector transformers utility-ht
-       ];
-       libraryPkgconfigDepends = [ sox ];
-       description = "Write, read, convert audio signals using libsox";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) sox;};
-
-  "soxlib_0_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, explicit-exception
      , extensible-exceptions, sample-frame, sox, storablevector
      , transformers, utility-ht
@@ -191722,7 +191986,6 @@ self: {
        libraryPkgconfigDepends = [ sox ];
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
@@ -192742,22 +193005,6 @@ self: {
      }) {};
 
   "spreadsheet" = callPackage
-    ({ mkDerivation, base, explicit-exception, transformers, utility-ht
-     }:
-     mkDerivation {
-       pname = "spreadsheet";
-       version = "0.1.3.7";
-       sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base explicit-exception transformers utility-ht
-       ];
-       description = "Read and write spreadsheets from and to CSV files in a lazy way";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "spreadsheet_0_1_3_8" = callPackage
     ({ mkDerivation, base, explicit-exception, transformers, utility-ht
      }:
      mkDerivation {
@@ -192771,7 +193018,6 @@ self: {
        ];
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sprinkles" = callPackage
@@ -193672,7 +193918,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stache_2_0_0" = callPackage
+  "stache_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -193680,8 +193926,8 @@ self: {
      }:
      mkDerivation {
        pname = "stache";
-       version = "2.0.0";
-       sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll";
+       version = "2.0.1";
+       sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -193966,6 +194212,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stack-tag" = callPackage
+    ({ mkDerivation, async, base, containers, directory, hasktags, mtl
+     , optparse-applicative, process, text
+     }:
+     mkDerivation {
+       pname = "stack-tag";
+       version = "0.2.0";
+       sha256 = "08610hacra5sq22addh4fsqz4pwg98576lvwvvi4q8bly4ai23zb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base containers directory hasktags mtl process text
+       ];
+       executableHaskellDepends = [
+         async base containers directory hasktags mtl optparse-applicative
+         process text
+       ];
+       description = "Create etags for Haskell projects based on Stack snapshots";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stack-type" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -196624,7 +196891,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_5_0" = callPackage
+  "streamly_0_5_1" = callPackage
     ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
      , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
      , monad-control, mtl, QuickCheck, random, transformers
@@ -196632,8 +196899,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.5.0";
-       sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s";
+       version = "0.5.1";
+       sha256 = "04hc87jwcfpbwydm75ic3rz87m76s39aysi14m514nib87xprbji";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -199860,25 +200127,6 @@ self: {
      }) {};
 
   "system-fileio" = callPackage
-    ({ mkDerivation, base, bytestring, chell, system-filepath
-     , temporary, text, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "system-fileio";
-       version = "0.3.16.3";
-       sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
-       libraryHaskellDepends = [
-         base bytestring system-filepath text time unix
-       ];
-       testHaskellDepends = [
-         base bytestring chell system-filepath temporary text time
-         transformers unix
-       ];
-       description = "Consistent filesystem interaction across GHC versions (deprecated)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "system-fileio_0_3_16_4" = callPackage
     ({ mkDerivation, base, bytestring, chell, system-filepath
      , temporary, text, time, transformers, unix
      }:
@@ -199895,7 +200143,6 @@ self: {
        ];
        description = "Consistent filesystem interaction across GHC versions (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-filepath" = callPackage
@@ -200499,31 +200746,6 @@ self: {
      }) {};
 
   "tagchup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-accessor
-     , explicit-exception, non-empty, old-time, transformers, utility-ht
-     , xml-basic
-     }:
-     mkDerivation {
-       pname = "tagchup";
-       version = "0.4.1";
-       sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers data-accessor explicit-exception
-         non-empty transformers utility-ht xml-basic
-       ];
-       testHaskellDepends = [ base xml-basic ];
-       benchmarkHaskellDepends = [
-         base bytestring containers data-accessor explicit-exception
-         old-time transformers utility-ht xml-basic
-       ];
-       description = "alternative package for processing of tag soups";
-       license = "GPL";
-     }) {};
-
-  "tagchup_0_4_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , explicit-exception, non-empty, old-time, transformers, utility-ht
      , xml-basic
@@ -200546,7 +200768,6 @@ self: {
        ];
        description = "alternative package for processing of tag soups";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged" = callPackage
@@ -203000,6 +203221,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tensors" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, singletons, vector }:
+     mkDerivation {
+       pname = "tensors";
+       version = "0.1.0";
+       sha256 = "1kwj1ii70cazw64yhhhkcby4kqjm21zzncdr4av0majr07kcbaz5";
+       libraryHaskellDepends = [ base singletons vector ];
+       testHaskellDepends = [ base hspec QuickCheck singletons vector ];
+       description = "Tensor in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "term-rewriting" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit
      , mtl, multiset, parsec, QuickCheck, union-find-array
@@ -203397,23 +203630,6 @@ self: {
      }) {};
 
   "test-framework-quickcheck2" = callPackage
-    ({ mkDerivation, base, extensible-exceptions, QuickCheck, random
-     , test-framework
-     }:
-     mkDerivation {
-       pname = "test-framework-quickcheck2";
-       version = "0.3.0.4";
-       sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
-       revision = "1";
-       editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
-       libraryHaskellDepends = [
-         base extensible-exceptions QuickCheck random test-framework
-       ];
-       description = "QuickCheck-2 support for the test-framework package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-framework-quickcheck2_0_3_0_5" = callPackage
     ({ mkDerivation, base, extensible-exceptions, QuickCheck, random
      , test-framework
      }:
@@ -203426,7 +203642,6 @@ self: {
        ];
        description = "QuickCheck-2 support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-sandbox" = callPackage
@@ -203894,28 +204109,6 @@ self: {
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.11.0.1";
-       sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       description = "Conversion between formats used to represent mathematics";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "texmath_0_11_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
@@ -203935,7 +204128,6 @@ self: {
        ];
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -211426,6 +211618,8 @@ self: {
        pname = "type-level-sets";
        version = "0.8.7.0";
        sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
+       revision = "1";
+       editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr";
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
@@ -212154,6 +212348,28 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_1_20180501_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , test-framework, test-framework-hunit, test-framework-th, unix
+     , vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.1.20180501.0";
+       sha256 = "0nnzvkm6r7cq4g14zjxzgxx63sy8pxkg2whfgq6knpzhgran9n45";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       description = "Time zone database (as files and as a module)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -212644,6 +212860,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unbound-generics_0_4_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant
+     , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "unbound-generics";
+       version = "0.4.0";
+       sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base containers contravariant deepseq exceptions mtl
+         profunctors template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Support for programming with names and binders using GHC Generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unbounded-delays" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -212916,20 +213155,6 @@ self: {
      }) {};
 
   "unicode" = callPackage
-    ({ mkDerivation, base, containers, semigroups, utility-ht }:
-     mkDerivation {
-       pname = "unicode";
-       version = "0.0.1";
-       sha256 = "10cv8kk3c028bylkjz8jx0xhmkzrjbmhm1hhbdsyvszl9mfykga9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base containers semigroups ];
-       testHaskellDepends = [ base containers utility-ht ];
-       description = "Construct and transform unicode characters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unicode_0_0_1_1" = callPackage
     ({ mkDerivation, base, containers, semigroups, utility-ht }:
      mkDerivation {
        pname = "unicode";
@@ -212941,7 +213166,6 @@ self: {
        testHaskellDepends = [ base containers utility-ht ];
        description = "Construct and transform unicode characters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-names" = callPackage
@@ -213843,26 +214067,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , process, stm, time, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.7.1";
-       sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath process stm time transformers
-         unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec process stm time
-         transformers unix unliftio-core
-       ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_8_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
      }:
@@ -213880,7 +214084,6 @@ self: {
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -216511,6 +216714,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-algorithms_0_8_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, mwc-random
+     , primitive, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "vector-algorithms";
+       version = "0.8.0.0";
+       sha256 = "1czili52fsjfz2d19c4v6p1qw8jya4gcqsfan1njiydrzplw18np";
+       libraryHaskellDepends = [ base bytestring primitive vector ];
+       testHaskellDepends = [
+         base bytestring containers QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [ base mwc-random vector ];
+       description = "Efficient algorithms for vector arrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-binary" = callPackage
     ({ mkDerivation, base, binary, vector }:
      mkDerivation {
@@ -217213,24 +217434,6 @@ self: {
      }) {};
 
   "viewprof" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
-       version = "0.0.0.22";
-       sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_23" = callPackage
     ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
@@ -217246,7 +217449,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -217745,22 +217947,24 @@ self: {
      }) {};
 
   "voicebase" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
-     , http-client-openssl, json-autotype, lens, mime-types, options
-     , text, wreq
+    ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL
+     , http-client, http-client-openssl, json-autotype, lens, mime-types
+     , optparse-applicative, text, wreq
      }:
      mkDerivation {
        pname = "voicebase";
-       version = "0.1.1.2";
-       sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6";
+       version = "0.1.1.4";
+       sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
          json-autotype lens mime-types text wreq
        ];
-       executableHaskellDepends = [ base bytestring mime-types options ];
-       testHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         aeson base bytestring filepath mime-types optparse-applicative text
+       ];
+       testHaskellDepends = [ aeson base ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219838,40 +220042,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.23";
-       sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_25" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -219903,7 +220073,6 @@ self: {
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -219931,6 +220100,8 @@ self: {
        pname = "warp-grpc";
        version = "0.1.0.3";
        sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf";
+       revision = "1";
+       editedCabalFile = "18mnn9wdhx8kv3y8nagkn7z7qmcyxnrcvigjyy378sfipcgjmdwc";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive http-types
          http2-grpc-types proto-lens wai warp warp-tls
@@ -221692,8 +221863,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
        pname = "wilton-ffi";
-       version = "0.3.0.2";
-       sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk";
+       version = "0.3.0.3";
+       sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
        description = "Haskell modules support for Wilton JavaScript runtime";
        license = stdenv.lib.licenses.mit;
@@ -221888,6 +222059,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "with" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "with";
+       version = "0.1.0";
+       sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701";
+       description = "Simple open product type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "with-index" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -223471,6 +223652,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "x509_1_7_4" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
+     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "x509";
+       version = "1.7.4";
+       sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-parse asn1-types base bytestring containers
+         cryptonite hourglass memory mtl pem
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass mtl tasty
+         tasty-quickcheck
+       ];
+       description = "X509 reader and writer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "x509-store" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
      , containers, cryptonite, directory, filepath, mtl, pem, tasty
@@ -224169,22 +224372,6 @@ self: {
      }) {};
 
   "xml-basic" = callPackage
-    ({ mkDerivation, base, containers, data-accessor
-     , explicit-exception, semigroups, utility-ht
-     }:
-     mkDerivation {
-       pname = "xml-basic";
-       version = "0.1.3";
-       sha256 = "0ma3bjjsvijknmdnywfk5ch9v5pymxbmkwgzzq58iiv26hkd3n4q";
-       libraryHaskellDepends = [
-         base containers data-accessor explicit-exception semigroups
-         utility-ht
-       ];
-       description = "Basics for XML/HTML representation and processing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xml-basic_0_1_3_1" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , explicit-exception, semigroups, utility-ht
      }:
@@ -224198,7 +224385,6 @@ self: {
        ];
        description = "Basics for XML/HTML representation and processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-catalog" = callPackage
@@ -224265,6 +224451,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_8_0_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , bytestring, conduit, conduit-extra, containers
+     , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.8.0.1";
+       sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup bytestring conduit
+         conduit-extra containers data-default-class deepseq resourcet text
+         transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers doctest hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-decode" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
      , tasty, tasty-hunit, text, time, xml-conduit, xml-types
@@ -225922,7 +226132,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yaml_0_10_1_1" = callPackage
+  "yaml_0_10_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -225931,8 +226141,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.10.1.1";
-       sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192";
+       version = "0.10.2.0";
+       sha256 = "0yklc3fz18h9gawp00ff2qhmymh2g25dsf08si935rjd1wadhf23";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
@@ -227876,6 +228086,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-paginator_1_1_0_1" = callPackage
+    ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
+     , persistent, safe, text, transformers, uri-encode, yesod-core
+     , yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-paginator";
+       version = "1.1.0.1";
+       sha256 = "140b4cikshl5f229awnp5jcbnyln0bmzlqjfcwxzxssxwnviy93f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-markup path-pieces persistent safe text transformers
+         uri-encode yesod-core
+       ];
+       testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
+       description = "A pagination approach for yesod";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-paypal-rest" = callPackage
     ({ mkDerivation, base, paypal-rest-client, time, yesod-core }:
      mkDerivation {
@@ -229695,13 +229926,14 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , base-compat, boxes, bytestring, containers, directory, filepath
      , formatting, Glob, hspec, hspec-core, HUnit, language-javascript
-     , mtl, optparse-applicative, process, purescript, safe, text
-     , transformers, transformers-base, transformers-compat, utf8-string
+     , mtl, optparse-applicative, process, purescript, QuickCheck, safe
+     , text, transformers, transformers-base, transformers-compat
+     , utf8-string
      }:
      mkDerivation {
        pname = "zephyr";
-       version = "0.1.4";
-       sha256 = "0zsqn8rbrzdh1l2m44nqhcdx3y3lbxdvik4scs5lb0sz5a0rdx5q";
+       version = "0.2.0";
+       sha256 = "0n0z7s71gjlpra4ghfd51rcz5yqddzzwfdpjnhlxciakrabc5m3f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -229719,8 +229951,8 @@ self: {
        testHaskellDepends = [
          aeson ansi-terminal base base-compat bytestring containers
          directory filepath hspec hspec-core HUnit language-javascript mtl
-         optparse-applicative process purescript text transformers
-         transformers-base transformers-compat utf8-string
+         optparse-applicative process purescript QuickCheck text
+         transformers transformers-base transformers-compat utf8-string
        ];
        description = "Zephyr tree shaking for PureScript Language";
        license = stdenv.lib.licenses.mpl20;
@@ -230692,20 +230924,20 @@ self: {
 
   "ztar" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq
-     , directory, extra, filepath, path, path-io, process, QuickCheck
-     , tasty, tasty-quickcheck, text, unix-compat, zip, zlib
+     , directory, filepath, path, path-io, process, QuickCheck, tasty
+     , tasty-quickcheck, text, unix-compat, zip, zlib
      }:
      mkDerivation {
        pname = "ztar";
-       version = "0.2.0";
-       sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i";
+       version = "1.0.0";
+       sha256 = "03a1amca24xpcjsx795pr1dqd78i8ickjqclbr5xcv74zzkhixp2";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath path process text
          unix-compat zip zlib
        ];
        testHaskellDepends = [
-         base bytestring bytestring-arbitrary extra path path-io QuickCheck
-         tasty tasty-quickcheck
+         base bytestring bytestring-arbitrary filepath path path-io
+         QuickCheck tasty tasty-quickcheck
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;

From c5467e8f731a2db9d28c81de23758407ef58c303 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 18 Sep 2018 06:52:28 -0400
Subject: [PATCH 1271/3253] cabal-install: use newer version of Cabal library

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0fc9a1b168e5..f78fbd9fc709 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -33,7 +33,7 @@ self: super: {
   unbuildable = throw "package depends on meta package 'unbuildable'";
 
   # Use the latest version of the Cabal library.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_0_1; });
 
   # The test suite depends on old versions of tasty and QuickCheck.
   hackage-security = dontCheck super.hackage-security;

From 72e2ab2c7241f0d26c8a547e1c5ca4f7a61e885e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Sep 2018 16:03:05 +0200
Subject: [PATCH 1272/3253] cabal2nix: update yaml override to the latest
 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f78fbd9fc709..1f551a87b75a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1075,7 +1075,7 @@ self: super: {
   # The tool needs a newer hpack version than the one mandated by LTS-12.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
     hpack = self.hpack_0_31_0;
-    yaml = self.yaml_0_10_1_1;
+    yaml = self.yaml_0_10_2_0;
   });
 
   # Break out of "aeson <1.3, temporary <1.3".

From c18a0becf20afa61fcf49d3126e200a9eb826384 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Sep 2018 02:30:53 +0200
Subject: [PATCH 1273/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/439b9af37fd8bde15e6e18a19fc6d27eb174d27a.
---
 .../haskell-modules/hackage-packages.nix      | 242 +++++++++++++++---
 1 file changed, 209 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index dc245e85bc5d..1f6cb3e22200 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -31896,24 +31896,31 @@ self: {
      }) {};
 
   "axel" = callPackage
-    ({ mkDerivation, base, directory, filepath, lens, lens-aeson
-     , monad-control, mtl, parsec, process, regex-pcre, split, strict
-     , text, typed-process, vector, yaml
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , haskell-src-exts, hedgehog, lens, lens-aeson, mtl
+     , optparse-applicative, parsec, process, regex-pcre, split, strict
+     , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec
+     , template-haskell, text, transformers, typed-process, vector, yaml
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.4";
-       sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3";
-       revision = "1";
-       editedCabalFile = "0ff8pi6x26wv6bp2hx92h3cs9iln1yj6230am1c2ygjhr16wfwna";
+       version = "0.0.5";
+       sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base directory filepath lens lens-aeson monad-control mtl parsec
-         process regex-pcre split strict text typed-process vector yaml
+         base bytestring directory filepath haskell-src-exts lens lens-aeson
+         mtl optparse-applicative parsec process regex-pcre strict text
+         transformers typed-process vector yaml
        ];
-       executableHaskellDepends = [ base directory ];
+       executableHaskellDepends = [ base mtl optparse-applicative ];
+       testHaskellDepends = [
+         base bytestring filepath hedgehog lens mtl split tasty
+         tasty-discover tasty-golden tasty-hedgehog tasty-hspec
+         template-haskell transformers
+       ];
+       testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33625,8 +33632,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-sqlite";
-       version = "0.3.2.2";
-       sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp";
+       version = "0.3.2.3";
+       sha256 = "01pz1i4k9pqya569kp7xic0g1lilwrjf0yvijq7bwgpara20y7ji";
        libraryHaskellDepends = [
          aeson attoparsec base beam-core beam-migrate bytestring dlist free
          hashable mtl network-uri scientific sqlite-simple text time unix
@@ -63536,6 +63543,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributed-closure_0_4_1" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, constraints
+     , hspec, QuickCheck, syb, template-haskell
+     }:
+     mkDerivation {
+       pname = "distributed-closure";
+       version = "0.4.1";
+       sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring constraints syb template-haskell
+       ];
+       executableHaskellDepends = [ async base binary bytestring ];
+       testHaskellDepends = [ base binary hspec QuickCheck ];
+       description = "Serializable closures for distributed programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "distributed-fork" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, constraints
      , distributed-closure, exceptions, stm, tasty, tasty-hunit
@@ -68138,6 +68165,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eliminators_0_5" = callPackage
+    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
+     , singletons, template-haskell, th-abstraction, th-desugar
+     }:
+     mkDerivation {
+       pname = "eliminators";
+       version = "0.5";
+       sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr";
+       libraryHaskellDepends = [
+         base extra singleton-nats singletons template-haskell
+         th-abstraction th-desugar
+       ];
+       testHaskellDepends = [ base hspec singleton-nats singletons ];
+       testToolDepends = [ hspec-discover ];
+       description = "Dependently typed elimination functions using singletons";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "elision" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -72154,6 +72200,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_11" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.11";
+       sha256 = "0qqjhlvf9m9wph5c6xwvv2fb8l7cvwkc98f1r27nl4bjrxqag8sh";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -107707,7 +107770,7 @@ self: {
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {papi = null;};
+     }) {inherit (pkgs) papi;};
 
   "hpaste" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
@@ -142383,17 +142446,15 @@ self: {
      }:
      mkDerivation {
        pname = "monad-persist";
-       version = "0.0.2.0";
-       sha256 = "17jq41r7bmycnzz028pii14cm0qjvclj01z78aj6aj1h4mlwlbc1";
-       revision = "1";
-       editedCabalFile = "0sghbyfd7jpwi80hivzbh2z77zl9kpzlvablkfx2w0q70hnbbrvd";
+       version = "0.0.3.0";
+       sha256 = "1d97lx9frzwydc82b7srw4r6dr3865wrnvyz27xmcvzxfzbyymi8";
        libraryHaskellDepends = [
          base exceptions monad-control monad-logger mtl persistent text
          transformers transformers-base
        ];
        testHaskellDepends = [
          base hspec monad-control monad-logger persistent persistent-sqlite
-         persistent-template text
+         persistent-template text transformers
        ];
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
@@ -151492,7 +151553,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) unixODBC;};
 
-  "odbc_0_2_1" = callPackage
+  "odbc_0_2_2" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , formatting, hspec, optparse-applicative, parsec, QuickCheck
      , semigroups, template-haskell, text, time, transformers, unixODBC
@@ -151500,8 +151561,8 @@ self: {
      }:
      mkDerivation {
        pname = "odbc";
-       version = "0.2.1";
-       sha256 = "1s8l3i83jm022v0xqljfbf0qb28p5ps0cg6d9lzplywlqgwjh5nz";
+       version = "0.2.2";
+       sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163617,8 +163678,10 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.1.1";
-       sha256 = "1qdja72zmrv5w7dpa2bzsf0phw6gaqvwzs8s3ilyw7v0h6hy3kgx";
+       version = "2.1.2";
+       sha256 = "1f4yf50zawxm6z2lidwrgcvc71f71aichqjihycibkrhp0s34ppj";
+       revision = "1";
+       editedCabalFile = "1qg6s7ppmz505r63k13qvm2ig6lknypji4jlkzpacricmkr3lymm";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -163655,17 +163718,17 @@ self: {
      , deepseq, directory, foldl, hashable, ilist, primitive
      , profunctors, ptr, QuickCheck, quickcheck-instances, random
      , rerebase, scanner, split, stm, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, unordered-containers
-     , vector
+     , tasty-quickcheck, text, text-builder, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.3.1";
-       sha256 = "083qp1fgn1xflmivzrd615lyy0blxn1lmb8lqkjaziqijys2n83i";
+       version = "2.3.2";
+       sha256 = "1438wvf81zx208l1sqxcly4rvvgw14vwhlmrh4zbkkn7pgxqlnky";
        libraryHaskellDepends = [
          acquire attoparsec base bytestring deepseq directory foldl hashable
-         primitive profunctors ptr scanner stm text time transformers
-         unordered-containers vector
+         primitive profunctors ptr scanner stm text text-builder time
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
          acquire attoparsec foldl ilist QuickCheck quickcheck-instances
@@ -175559,8 +175622,8 @@ self: {
        pname = "resolv";
        version = "0.1.1.1";
        sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
-       revision = "2";
-       editedCabalFile = "0fyi9wvwvvcasvxdq8fmbjjymap2sx4jyslplx85lv0n83wdrkcf";
+       revision = "3";
+       editedCabalFile = "0r1i7zrnynqxd3nzq4cz9648s3dmj29w63mcip57620d0fimyghm";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers
        ];
@@ -181180,6 +181243,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scythe" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, mtl, text }:
+     mkDerivation {
+       pname = "scythe";
+       version = "0.1.0.0";
+       sha256 = "00g6i3vihfrbrj98hpkrv4gqna7a4vyl6kwbzsj9ymx8jvv0jdaq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base bytestring mtl text ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base bytestring ];
+       description = "Fast CSV lexing on ByteString";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scyther-proof" = callPackage
     ({ mkDerivation, alex, array, base, cmdargs, containers, directory
      , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time
@@ -188306,6 +188384,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-nats_0_4_2" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-nats";
+       version = "0.4.2";
+       sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Unary natural numbers relying on the singletons infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singleton-typelits" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -188337,6 +188427,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons_2_5" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
+     , template-haskell, text, th-desugar, transformers
+     }:
+     mkDerivation {
+       pname = "singletons";
+       version = "2.5";
+       sha256 = "0bk1ad4lk4vc5hw2j4r4nzs655k43v21d2s66hjvp679zxkvzz44";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base containers ghc-boot-th mtl pretty syb template-haskell text
+         th-desugar transformers
+       ];
+       testHaskellDepends = [ base filepath process tasty tasty-golden ];
+       description = "A framework for generating singleton types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singnal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -201033,6 +201143,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagsoup_0_14_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , process, QuickCheck, text, time
+     }:
+     mkDerivation {
+       pname = "tagsoup";
+       version = "0.14.7";
+       sha256 = "09gcy5fd5nsk1b7zdrf7yb329fyr8hq5apd6w3cyh3nxd60z504r";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       testHaskellDepends = [
+         base bytestring deepseq directory process QuickCheck time
+       ];
+       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagsoup-ht" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , explicit-exception, old-time, tagsoup, transformers, utility-ht
@@ -201405,6 +201532,8 @@ self: {
        pname = "tar";
        version = "0.5.1.0";
        sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
+       revision = "1";
+       editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath time
        ];
@@ -205295,6 +205424,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_9" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
+     , template-haskell, th-expand-syns, th-lift, th-orphans
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.9";
+       sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi";
+       libraryHaskellDepends = [
+         base containers mtl syb template-haskell th-expand-syns th-lift
+         th-orphans
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-expand-syns
+         th-lift th-orphans
+       ];
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-dict-discovery" = callPackage
     ({ mkDerivation, base, constraints, template-haskell }:
      mkDerivation {
@@ -205850,6 +206000,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "these_0_7_5" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, containers
+     , data-default-class, deepseq, hashable, keys, mtl, profunctors
+     , QuickCheck, quickcheck-instances, semigroupoids, tasty
+     , tasty-quickcheck, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.7.5";
+       sha256 = "1yrmxkpka0b6hzb7h2j603rjvyzhldrsq8h7336jr7b0ml929b6v";
+       libraryHaskellDepends = [
+         aeson base bifunctors binary containers data-default-class deepseq
+         hashable keys mtl profunctors QuickCheck semigroupoids transformers
+         transformers-compat unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors binary containers hashable QuickCheck
+         quickcheck-instances tasty tasty-quickcheck transformers
+         unordered-containers vector
+       ];
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "these-skinny" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -219337,8 +219513,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-rollbar";
-       version = "0.10.0";
-       sha256 = "1905cgmcgmsy0v2c84q33aharlklffqxhr6bwr1zvi138c9bivd6";
+       version = "0.11.0";
+       sha256 = "1nsnkf9wk61lj092z56knwfrdjyazql16y2kj5h0iamnf4gmxa7w";
        libraryHaskellDepends = [
          aeson base bytestring hostname http-client http-conduit http-types
          rollbar-hs text time uuid wai

From 6e4c666a671a5df1d9a385280fcc133700e2b841 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 19 Sep 2018 10:49:23 +0200
Subject: [PATCH 1274/3253] git-annex: update sha256 hash for new version
 6.20180913

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f551a87b75a..5d751992fa71 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl";
+      sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From 9219580c823e8aa724b7426cddd7222d78856bf9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 14:04:48 -0500
Subject: [PATCH 1275/3253] i7z: simplify a bit

---
 pkgs/os-specific/linux/i7z/default.nix | 27 ++++++--------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 3bf9fbd74d38..c6e06bf85272 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -16,39 +16,24 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildPhase = ''
-    runHook preBuild
-
-    make
-    ${lib.optionalString withGui ''
+  postBuild = lib.optionalString withGui ''
       cd GUI
       qmake
       make clean
       make
       cd ..
-    ''}
-
-    runHook postBuild
   '';
 
-  installPhase = ''
-    runHook preInstall
+  makeFlags = [ "prefix=${placeholder "out"}" ];
 
-    mkdir -p $out/{bin,sbin}
-    make install prefix=$out
-    ${lib.optionalString withGui ''
-      install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
-    ''}
-    mv $out/sbin/* $out/bin/
-    rmdir $out/sbin
-
-    runHook postInstall
+  postInstall = lib.optionalString withGui ''
+    install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
   '';
 
   meta = with lib; {
     description = "A better i7 (and now i3, i5) reporting tool for Linux";
-    homepage = https://github.com/ajaiantilal/i7z;
-    repositories.git = https://github.com/ajaiantilal/i7z.git;
+    homepage = https://github.com/DimitryAndric/i7z;
+    repositories.git = https://github.com/DimitryAndric/i7z.git;
     license = licenses.gpl2;
     maintainers = with maintainers; [ bluescreen303 ];
     # broken on ARM

From 6108d6ada849d29b9129148943dd1c1feedd4d02 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 14:18:34 -0500
Subject: [PATCH 1276/3253] i7z: use qt5 for gui (when enabled), various fixes
 from debian

---
 pkgs/os-specific/linux/i7z/default.nix | 22 +++++++++++++++++++---
 pkgs/os-specific/linux/i7z/qt5.patch   | 13 +++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/i7z/qt5.patch

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index c6e06bf85272..ac5f9fc5ba30 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, ncurses
-, withGui ? false, qt4 ? null }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses
+, withGui ? false, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "i7z-${version}";
@@ -12,7 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds";
   };
 
-  buildInputs = [ ncurses ] ++ lib.optional withGui qt4;
+  buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
+
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/fix-insecure-tempfile.patch";
+      sha256 = "0ifg06xjw14y4fnzzgkhqm4sv9mcdzgi8m2wffq9z8b1r0znya3s";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/nehalem.patch";
+      sha256 = "1ys6sgm01jkqb6d4y7qc3h89dzph8jjjcfya5c5jcm7dkxlzjq8a";
+    })
+    (fetchpatch {
+      url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/hyphen-used-as-minus-sign.patch";
+      sha256 = "1ji2qvdyq0594cpqz0dlsfggvw3rm63sygh0jxvwjgxpnhykhg1p";
+    })
+    ./qt5.patch
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/pkgs/os-specific/linux/i7z/qt5.patch
new file mode 100644
index 000000000000..9e9b162d9e85
--- /dev/null
+++ b/pkgs/os-specific/linux/i7z/qt5.patch
@@ -0,0 +1,13 @@
+diff -Naur a/GUI/i7z_GUI.pro b/GUI/i7z_GUI.pro
+--- a/GUI/i7z_GUI.pro	2013-10-12 21:59:19.000000000 +0100
++++ b/GUI/i7z_GUI.pro	2016-11-05 13:54:30.118655672 +0000
+@@ -3,7 +3,8 @@
+ ######################################################################
+ 
+ TEMPLATE = app
+-TARGET = 
++TARGET = i7z_GUI
++QT += widgets
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ CONFIG += debug
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b33088174734..57633b0ae6d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13900,7 +13900,7 @@ with pkgs;
 
   hwdata = callPackage ../os-specific/linux/hwdata { };
 
-  i7z = callPackage ../os-specific/linux/i7z { };
+  i7z = qt5.callPackage ../os-specific/linux/i7z { };
 
   pcm = callPackage ../os-specific/linux/pcm { };
 

From 34a94e3b75ed59ee83c22394d5976933bd3c48ab Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 19 Sep 2018 15:23:56 -0400
Subject: [PATCH 1277/3253] lightdm: ensure run-directory is /run/lightdm
 (#46907)

---
 .../display-managers/lightdm/default.nix            |  1 +
 .../display-managers/lightdm/run-dir.patch          | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/display-managers/lightdm/run-dir.patch

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index bec07ac2d506..da7189f9196f 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
   ] ++ optional withQt4 qt4
     ++ optional withQt5 qtbase;
 
+  patches = [ ./run-dir.patch ];
 
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";
 
diff --git a/pkgs/applications/display-managers/lightdm/run-dir.patch b/pkgs/applications/display-managers/lightdm/run-dir.patch
new file mode 100644
index 000000000000..eb8e5a0f4d7e
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm/run-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/data/lightdm.conf b/data/lightdm.conf
+index 16b80f7..b3af435 100644
+--- a/data/lightdm.conf
++++ b/data/lightdm.conf
+@@ -28,7 +28,7 @@
+ #guest-account-script=guest-account
+ #logind-check-graphical=false
+ #log-directory=/var/log/lightdm
+-#run-directory=/var/run/lightdm
++run-directory=/run/lightdm
+ #cache-directory=/var/cache/lightdm
+ #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
+ #remote-sessions-directory=/usr/share/lightdm/remote-sessions

From 76e22c76b0327808765fc4f4191af35e52d68cc7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 14:24:06 -0500
Subject: [PATCH 1278/3253] undervolt: 2.8 -> 2.9

---
 pkgs/os-specific/linux/undervolt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix
index e9c033acd990..a97cca4dfa76 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/pkgs/os-specific/linux/undervolt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.2.8";
+  version = "0.2.9";
   pname = "undervolt";
 
   src = fetchFromGitHub {
     owner = "georgewhewell";
     repo = "undervolt";
     rev = "${version}";
-    sha256 = "0crkqc5zq0gpyg031hfwdxymfc2gc1h8b6m0axzlh7gvnxlf5hra";
+    sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c";
   };
 
   meta = with stdenv.lib; {

From dee2dab7c6a84c7615e81d20aec5e12ed3b0ae1b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 16 Sep 2018 18:36:21 +0200
Subject: [PATCH 1279/3253] ibus-engines.typing-booster: init at 2.1.1

This package providesa completion input method for faster typing.
See https://mike-fabian.github.io/ibus-typing-booster

Detailed instructions how to activate this IBus engine on your desktop
can be found in the upstream docs: https://mike-fabian.github.io/ibus-typing-booster/documentation.html

A simple VM with the Gnome3 desktop and activated `ibus' looks like
this:

```nix
{
  emojipicker = { pkgs, ... }: {
    services.xserver = {
      enable = true;
      desktopManager.gnome3.enable = true;
      desktopManager.xterm.enable = false;
    };
    users.extraUsers.vm = {
      password = "vm";
      isNormalUser = true;
    };
    i18n.inputMethod.ibus.engines = [
      pkgs.ibus-engines.typing-booster
    ];
    i18n.inputMethod.enabled = "ibus";
    virtualisation.memorySize = 2048;
  };
}
```

Fixes #38721
---
 doc/package-notes.xml                         | 60 +++++++++++++++++++
 .../ibus-typing-booster/default.nix           | 41 +++++++++++++
 .../ibus-typing-booster/hunspell-dirs.patch   | 31 ++++++++++
 .../ibus-typing-booster/wrapper.nix           | 30 ++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++
 5 files changed, 168 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 1f088e8aaa0e..05e820bcabe5 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -814,4 +814,64 @@ citrix_receiver.override {
    </para>
   </section>
  </section>
+ <section xml:id="sec-ibus-typing-booster">
+  <title>ibus-engines.typing-booster</title>
+
+  <para>This package is an ibus-based completion method to speed up typing.</para>
+
+  <section xml:id="sec-ibus-typing-booster-activate">
+   <title>Activating the engine</title>
+
+   <para>
+    IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration
+    depends on the desktop manager in use. For detailed instructions, please refer to the
+    <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>.
+   </para>
+   <para>
+    On NixOS you need to explicitly enable <literal>ibus</literal> with given engines
+    before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved
+    using the <literal>ibus</literal> module:
+<programlisting>{ pkgs, ... }: {
+  i18n.inputMethod = {
+    enabled = "ibus";
+    ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
+  };
+}</programlisting>
+   </para>
+  </section>
+
+  <section xml:id="sec-ibus-typing-booster-customize-hunspell">
+   <title>Using custom hunspell dictionaries</title>
+
+   <para>
+    The IBus engine is based on <literal>hunspell</literal> to support completion in many languages.
+    By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>es-es</literal>,
+    <literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal>
+    are in use. To add another dictionary, the package can be overridden like this:
+<programlisting>ibus-engines.typing-booster.override {
+  langs = [ "de-at" "en-gb" ];
+}</programlisting>
+   </para>
+   <para>
+     <emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in
+     <literal>pkgs.hunspellDicts</literal>.</emphasis>
+   </para>
+  </section>
+
+  <section xml:id="sec-ibus-typing-booster-emoji-picker">
+   <title>Built-in emoji picker</title>
+
+   <para>
+    The <literal>ibus-engines.typing-booster</literal> package contains a program
+    named <literal>emoji-picker</literal>. To display all emojis correctly,
+    a special font such as <literal>noto-fonts-emoji</literal> is needed:
+   </para>
+   <para>
+    On NixOS it can be installed using the following expression:
+<programlisting>{ pkgs, ... }: {
+  fonts.fonts = with pkgs; [ noto-fonts-emoji ];
+}</programlisting>
+   </para>
+  </section>
+ </section>
 </chapter>
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
new file mode 100644
index 000000000000..c5aaa032b40e
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
+, wrapGAppsHook, gobjectIntrospection
+}:
+
+let
+
+  python = python3.withPackages (ps: with ps; [
+    pygobject3
+    dbus-python
+  ]);
+
+in
+
+stdenv.mkDerivation rec {
+  name = "ibus-typing-booster-${version}";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "mike-fabian";
+    repo = "ibus-typing-booster";
+    rev = version;
+    sha256 = "01kpxplk9nh56f32fkq3nnsqykbzpi7pcxbfp38dq0prgrhw9a6b";
+  };
+
+  patches = [ ./hunspell-dirs.patch ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobjectIntrospection ];
+  buildInputs = [ python ibus gtk3 m17n_lib ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib")
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://mike-fabian.github.io/ibus-typing-booster/;
+    license = licenses.gpl3Plus;
+    description = "A typing booster engine for the IBus platform";
+    maintainers = with maintainers; [ ma27 ];
+    isIbusEngine = true;
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
new file mode 100644
index 000000000000..7b624b379a26
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch
@@ -0,0 +1,31 @@
+diff --git a/engine/itb_util.py b/engine/itb_util.py
+index ded236a..633525a 100755
+--- a/engine/itb_util.py
++++ b/engine/itb_util.py
+@@ -1876,14 +1876,18 @@ def find_hunspell_dictionary(language):
+             If no dictionary can be found for the requested language,
+             the return value is ('', '').
+     '''
+-    dirnames = [
+-        '/usr/share/hunspell',
+-        '/usr/share/myspell',
+-        '/usr/share/myspell/dicts',
+-        '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here
+-        '/usr/local/share/myspell',
+-        '/usr/local/share/myspell/dicts',
+-    ]
++
++    if "NIX_HUNSPELL_DIRS" in os.environ:
++        dirnames = os.environ["NIX_HUNSPELL_DIRS"].split(":")
++    else:       # fallback to the original behavior
++        dirnames = [
++            '/usr/share/hunspell',
++            '/usr/share/myspell',
++            '/usr/share/myspell/dicts',
++            '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here
++            '/usr/local/share/myspell',
++            '/usr/local/share/myspell/dicts',
++        ]
+     dic_path = ''
+     aff_path = ''
+     for language in expand_languages([language]):
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
new file mode 100644
index 000000000000..e6505f3cc468
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix
@@ -0,0 +1,30 @@
+{ typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper
+, langs ? [ "de-de" "en-us" "es-es" "it-it" "sv-se" "sv-fi" ]
+}:
+
+let
+
+  hunspellDirs = with lib; makeSearchPath ":" (flatten (flip map langs (lang: [
+    "${hunspellDicts.${lang}}/share/hunspell"
+    "${hunspellDicts.${lang}}/share/myspell"
+    "${hunspellDicts.${lang}}/share/myspell/dicts"
+  ])));
+
+in
+
+symlinkJoin {
+  name = "${typing-booster.name}-with-hunspell";
+  paths = [ typing-booster ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    for i in bin/emoji-picker libexec/ibus-{setup,engine}-typing-booster; do
+      wrapProgram "$out/$i" \
+        --prefix NIX_HUNSPELL_DIRS : ${hunspellDirs}
+    done
+
+    sed -i -e "s,${typing-booster},$out," $out/share/ibus/component/typing-booster.xml
+  '';
+
+  inherit (typing-booster) meta;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9722e945594e..708eef1e49ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1906,6 +1906,12 @@ with pkgs;
     };
 
     uniemoji = callPackage ../tools/inputmethods/ibus-engines/ibus-uniemoji { };
+
+    typing-booster-unwrapped = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster { };
+
+    typing-booster = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix {
+      typing-booster = ibus-engines.typing-booster-unwrapped;
+    };
   };
 
   ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {

From a0c5dd8a09215e47a67122005a0525febdee8d72 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 22:18:29 +0200
Subject: [PATCH 1280/3253] arelle: fix build, use current python3 (#46862)

It was pinned to python34, build failed in dependency
python34Packages.pytest. Use python3(6) instead.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b33088174734..525b2eeb951a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15468,7 +15468,7 @@ with pkgs;
     inherit (vamp) vampSDK;
   };
 
-  inherit (python34Packages) arelle;
+  inherit (python3Packages) arelle;
 
   ario = callPackage ../applications/audio/ario { };
 

From f3a0c8a3aafb30d6a57e92b4b0b0245510d5a844 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 19 Sep 2018 23:50:22 +0200
Subject: [PATCH 1281/3253] pythonPackages.nilearn: disable still failing tests
 (#46918)

A previous attempt to fix tests failing on some machines (#46850)
was unsuccessful, they still failed on Hydra sometimes while
succeeding locally. Revert #46850 and disable these tests instead.
---
 pkgs/development/python-modules/nilearn/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index 14bb15184b59..32ec4b74509d 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -14,18 +14,12 @@ buildPythonPackage rec {
   # disable some failing tests
   checkPhase = ''
     nosetests nilearn/tests \
-    -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend
+    -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend \
+    -e test_clean_detrending -e test_high_variance_confounds
   '';
 
   checkInputs = [ nose ];
 
-  # These tests fail on some builder machines, probably due to lower
-  # arithmetic precision. Reduce required precision from 13 to 8 decimals.
-  postPatch = ''
-    substituteInPlace nilearn/tests/test_signal.py \
-      --replace 'decimal=13' 'decimal=8'
-  '';
-
   propagatedBuildInputs = [
     matplotlib
     nibabel

From d6b9252d67b9989ec1a81b62288e504ff9fc0b76 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 19 Sep 2018 16:55:50 -0500
Subject: [PATCH 1282/3253] editline: 1.15.3 -> 1.16.0 (#46897)

https://github.com/troglobit/editline/releases/tag/1.16.0
---
 pkgs/development/libraries/editline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index d9b5a2b64d63..dc44c7d8705f 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "editline-${version}";
-  version = "1.15.3";
+  version = "1.16.0";
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "editline";
     rev = version;
-    sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma";
+    sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 6e9cc8871f2c4e7a88d4c81d2d0e75fb03811d65 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 19 Sep 2018 17:10:47 -0500
Subject: [PATCH 1283/3253] brotli: 1.0.5 -> 1.0.6 (#46903)

---
 pkgs/tools/compression/brotli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index a63721466dbc..db5d1f216054 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja";
+    sha256 = "1hng7v7n6asli9v8gnshrqjnia5cvrwzgnx7irmk7r98nnjzlqda";
   };
 
   nativeBuildInputs = [ cmake ];

From d7f9a337edcf26480bb94a80114080a664bdcb26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 15:14:44 -0700
Subject: [PATCH 1284/3253] libatomic_ops: 7.6.4 -> 7.6.6 (#46253)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libatomic_ops
---
 pkgs/development/libraries/libatomic_ops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0c0fc3861c9e..a887384f94da 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "libatomic_ops-${version}";
-  version = "7.6.4";
+  version = "7.6.6";
 
   src = fetchurl {
     urls = [
       "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
       "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
     ];
-    sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv";
+    sha256 = "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 869f615ff4fa83eea51934065cf6e8613e76a37c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Sep 2018 00:17:45 +0200
Subject: [PATCH 1285/3253] nix: 2.1.1 -> 2.1.2

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index cb182a08a830..adde237c07c9 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1";
-  i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1";
-  aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1";
-  x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1";
+  x86_64-linux = "/nix/store/mxg4bbblxfns96yrz0nalxyiyjl7gj98-nix-2.1.2";
+  i686-linux = "/nix/store/bgjgmbwirx63mwwychpikd7yc4k4lbjv-nix-2.1.2";
+  aarch64-linux = "/nix/store/yi18azn4nwrcwvaiag04jnxc1qs38fy5-nix-2.1.2";
+  x86_64-darwin = "/nix/store/fpivmcck2qpw5plrp599iraw2x9jp18k-nix-2.1.2";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7d78fef39742..ea0cdf9bd0f1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
   }) // { perl-bindings = nix1; };
 
   nixStable = (common rec {
-    name = "nix-2.1.1";
+    name = "nix-2.1.2";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b";
+      sha256 = "68e55382dac9e66f84ead69b3c786a4ea85d4a6611a7a740aa0b78fcc85db3ec";
     };
   }) // { perl-bindings = perl-bindings {
     nix = nixStable;

From 4a77150d8b27e99e8890b97d4b8935ba394596a5 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Thu, 20 Sep 2018 01:25:38 +0300
Subject: [PATCH 1286/3253] qbittorrent: 4.1.2 -> 4.1.3 (#46917)

---
 .../networking/p2p/qbittorrent/default.nix         | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index b69906f8eb79..673ece2cb72c 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
+{ stdenv, fetchFromGitHub, pkgconfig
 , boost, libtorrentRasterbar, qtbase, qttools, qtsvg
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus ? null # GUI (disable to run headless)
@@ -10,23 +10,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05";
+    sha256 = "1hpcn1x4z3vdjscw035d18vqhfs7c6yv002akgmbgdf9jl3vfrsl";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-desktop-file-regression.patch";
-      url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch";
-      sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96";
-    })
-  ];
-
   # NOTE: 2018-05-31: CMake is working but it is not officially supported
   nativeBuildInputs = [ pkgconfig ];
 

From 254218bffb0acb6f7d19de4b3b9199a890c971a8 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 19 Sep 2018 17:28:05 -0500
Subject: [PATCH 1287/3253] pahole: (??) -> v1.12, cleanup (#46913)

(roughly 2015-09-15 -> 2018-08-16)
---
 .../development/tools/misc/pahole/default.nix | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix
index 38de21872b9f..3864ad945835 100644
--- a/pkgs/development/tools/misc/pahole/default.nix
+++ b/pkgs/development/tools/misc/pahole/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchgit, cmake, elfutils, zlib }:
 
-stdenv.mkDerivation {
-  name = "pahole-head";
+stdenv.mkDerivation rec {
+  name = "pahole-${version}";
+  version = "1.12";
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git;
-    sha256 = "05f8a14ea6c200c20e9c6738593b38e4ced73a9cef86499ccd7af910eb9b74b3";
-    rev = "1decb1bc4a412a0902b7b25190d755a875022d03";
+    sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw";
+    rev = "v${version}";
   };
-  buildInputs = [ cmake elfutils zlib ];
 
-  postInstall = ''
-    for p in $out/bin/*; do
-      rpath=`patchelf --print-rpath $p || true`:$out
-      patchelf --set-rpath "$rpath" $p || true
-    done
-  '';
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ elfutils zlib ];
+
+  # Put libraries in "lib" subdirectory, not top level of $out
+  cmakeFlags = [ "-D__LIB=lib" ];
 
   meta = with stdenv.lib; {
     homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/;

From cec0ff764db1383d36c2b35d5e5496325faf5ec8 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 19 Sep 2018 17:28:41 -0500
Subject: [PATCH 1288/3253] boehmgc: 7.6.6 -> 7.6.8 (#45708)

---
 pkgs/development/libraries/boehm-gc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index da71e40187f4..012c1d123b62 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "boehm-gc-${version}";
-  version = "7.6.6";
+  version = "7.6.8";
 
   src = fetchurl {
     urls = [
       "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
       "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
     ];
-    sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
+    sha256 = "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4";
   };
 
   buildInputs = [ libatomic_ops ];

From bbb30c320e119cd2660066105e5c2d7219a590fd Mon Sep 17 00:00:00 2001
From: "Leo R. Lundgren" <leo@finalresort.org>
Date: Thu, 20 Sep 2018 02:08:45 +0200
Subject: [PATCH 1289/3253] open-vm-tools: 10.1.10 -> 10.3.0

---
 pkgs/applications/virtualization/open-vm-tools/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index e42c1d5dd1e4..49df39040db3 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "open-vm-tools-${version}";
-  version = "10.1.10";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner  = "vmware";
     repo   = "open-vm-tools";
     rev    = "stable-${version}";
-    sha256 = "13ifpi53rc2463ka8xw9zx407d1fz119x8sb9k48g5mwxm6c85fm";
+    sha256 = "0arx4yd8c5qszfgw8rqyi65j37r46dxibmzqqxb096isxhxjymw6";
   };
 
   sourceRoot = "${src.name}/open-vm-tools";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 814c5e9d6073..3671c53f2eeb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14471,7 +14471,7 @@ with pkgs;
   nvme-cli = callPackage ../os-specific/linux/nvme-cli { };
 
   open-vm-tools = callPackage ../applications/virtualization/open-vm-tools {
-    inherit (gnome2) gtk gtkmm;
+    inherit (gnome3) gtk gtkmm;
   };
   open-vm-tools-headless = open-vm-tools.override { withX = false; };
 

From 42f486703d09168dc907442eafb3ac8c2c818e65 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 20 Sep 2018 10:08:52 +0800
Subject: [PATCH 1290/3253] overmind: 2.0.0.beta1 -> 1.2.1

Newer version has some weird failure cases related to PATH
---
 pkgs/applications/misc/overmind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix
index ac985a5e4d2d..d7f601b50cd8 100644
--- a/pkgs/applications/misc/overmind/default.nix
+++ b/pkgs/applications/misc/overmind/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "overmind-${version}";
-  version = "2.0.0.beta1";
+  version = "1.2.1";
   goPackagePath = "github.com/DarthSim/overmind";
 
   nativeBuildInputs = [ makeWrapper ];
@@ -15,7 +15,7 @@ buildGoPackage rec {
     owner = "DarthSim";
     repo = "overmind";
     rev = "v${version}";
-    sha256 = "15fch3qszdm8bj1m9hxky9zgk6f5gpbswwfslg84qdjf4iwr5drq";
+    sha256 = "11ws9rsy8ladjp1y3b6vva9sjmw4s24xc1w18lyhfz63xc908nfw";
   };
 
   meta = with stdenv.lib; {

From ae5a7f4d073e6ef67f4f26fbd47ac468233ca8d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 22:00:02 -0700
Subject: [PATCH 1291/3253] xorriso: 1.4.8 -> 1.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xorriso/versions
---
 pkgs/tools/cd-dvd/xorriso/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 8f2577c43442..f396cbad955d 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.4.8";
+  name = "xorriso-1.5.0";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc";
+    sha256 = "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9";
   };
 
   doCheck = true;

From b8e2d28fa7b97d30e649290f16bdf8665f39c286 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 22:05:53 -0700
Subject: [PATCH 1292/3253] yubico-piv-tool: 1.6.1 -> 1.6.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yubico-piv-tool/versions
---
 pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index d0b7ebf3fc83..ab9eb5d001b2 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }:
 
 stdenv.mkDerivation rec {
-  name = "yubico-piv-tool-1.6.1";
+  name = "yubico-piv-tool-1.6.2";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz";
-    sha256 = "10xgdc51xvszkxmsvqnbjs8ixxz7rfnfahh3wn8glllynmszbhwi";
+    sha256 = "06r3vxgj7qrk8si7khjy696sm45h3w9d0rrrj0hyswalqzavqqga";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6100592fd5b219780a3d8fe0762570290a955b56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 22:37:16 -0700
Subject: [PATCH 1293/3253] tortoisehg: 4.7 -> 4.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tortoisehg/versions
---
 pkgs/applications/version-management/tortoisehg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 71369709b5da..c7a51508a8ce 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
     name = "tortoisehg-${version}";
-    version = "4.7";
+    version = "4.7.1";
 
     src = fetchurl {
       url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz";
-      sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm";
+      sha256 = "0x7hz4v882xy2r3k43fbndkq1kqwl3rl1zjmi8pxgpf05qcn950d";
     };
 
     pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];

From 03d8620098e392e0753ceb8f36146882e1c51af5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 22:41:10 -0700
Subject: [PATCH 1294/3253] wireguard-tools: 0.0.20180904 -> 0.0.20180918

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions
---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index f93596b8e8fb..4f71d6bc2e4f 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180904";
+  version = "0.0.20180918";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0slf6lchzhb2san1hsqnny1sdmxq8rzqwz355f33zsgaj6qh1gmk";
+    sha256 = "0ax6wvapzmn52l7js6n416852npgapa9875yl2ixs271y8m9kv40";
   };
 
   sourceRoot = "source/src/tools";

From be4db7a6a9baba3a90e1a8b0014ea1c9968c6124 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 23:24:42 -0700
Subject: [PATCH 1295/3253] wesnoth: 1.14.4 -> 1.14.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wesnoth/versions
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 4df457b68f5a..9d86afa97ec3 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.4";
+  version = "1.14.5";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i";
+    sha256 = "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 3772826f24d6da45e339507eea5d85dc2b4b2827 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 23:27:18 -0700
Subject: [PATCH 1296/3253] xercesc: 3.2.1 -> 3.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xerces-c/versions
---
 pkgs/development/libraries/xercesc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 9fa1768f4dce..7ed20ed7432b 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xerces-c-${version}";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchurl {
     url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
-    sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d";
+    sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
   };
 
   meta = {

From 6c6cd16ae89139948a0b12b618a21927bd58fe66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Sep 2018 23:31:45 -0700
Subject: [PATCH 1297/3253] woeusb: 3.2.2 -> 3.2.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/woeusb/versions
---
 pkgs/tools/misc/woeusb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index e75baac669a3..0f0455fe0fe3 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.2";
+  version = "3.2.9";
   name = "woeusb-${version}";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3";
+    sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35";
   };
 
   buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];

From d82d6a7daef2301de0eb43538e869af7314c3e28 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 14 Sep 2018 10:19:55 +0200
Subject: [PATCH 1298/3253] vimPlugins: shougo -> Shougo

---
 pkgs/misc/vim-plugins/generated.nix    | 32 +++++++++++++-------------
 pkgs/misc/vim-plugins/vim-plugin-names | 32 +++++++++++++-------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e1a8d0ae1f93..4fb293c6f992 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -226,7 +226,7 @@
   context_filetype-vim = buildVimPluginFrom2Nix {
     name = "context_filetype-vim-2018-08-30";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "context_filetype.vim";
       rev = "5392e3f0f3ff82b7149818a5700680f4bbcfea45";
       sha256 = "0xnqn96qnlvpvqc4sx8vmnryfqgcxrgczlmadgkms18gd3ib6i0z";
@@ -336,7 +336,7 @@
   denite-nvim = buildVimPluginFrom2Nix {
     name = "denite-nvim-2018-09-15";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "denite.nvim";
       rev = "8685cfbb7f0a4bea173a6b08a72a33ef70780334";
       sha256 = "0zc15802hda59x42k0962fmawjq021y7ys10h4ypnwy50cn1vjzj";
@@ -419,7 +419,7 @@
   deoplete-nvim = buildVimPluginFrom2Nix {
     name = "deoplete-nvim-2018-09-12";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "deoplete.nvim";
       rev = "93f6e3bce8229557b952dcad792786b1cc228991";
       sha256 = "033iskhyz91158ifmpzpv1gi4rfx368c6knakj65spcrlfci58y9";
@@ -439,7 +439,7 @@
   echodoc-vim = buildVimPluginFrom2Nix {
     name = "echodoc-vim-2018-09-09";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "echodoc.vim";
       rev = "781b1622029cd89350e6383da8ead834fb0cedd2";
       sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a";
@@ -851,7 +851,7 @@
   neco-syntax = buildVimPluginFrom2Nix {
     name = "neco-syntax-2017-10-01";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neco-syntax";
       rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3";
       sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip";
@@ -861,7 +861,7 @@
   neco-vim = buildVimPluginFrom2Nix {
     name = "neco-vim-2017-10-01";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neco-vim";
       rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9";
       sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73";
@@ -871,7 +871,7 @@
   neocomplete-vim = buildVimPluginFrom2Nix {
     name = "neocomplete-vim-2018-03-28";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neocomplete.vim";
       rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3";
       sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8";
@@ -891,7 +891,7 @@
   neoinclude-vim = buildVimPluginFrom2Nix {
     name = "neoinclude-vim-2018-05-21";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neoinclude.vim";
       rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a";
       sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg";
@@ -911,7 +911,7 @@
   neomru-vim = buildVimPluginFrom2Nix {
     name = "neomru-vim-2017-10-01";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neomru.vim";
       rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d";
       sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7";
@@ -921,7 +921,7 @@
   neosnippet-snippets = buildVimPluginFrom2Nix {
     name = "neosnippet-snippets-2018-09-12";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neosnippet-snippets";
       rev = "e61e966339bbab2abba6ba92bccd8825463b2d0d";
       sha256 = "0yis1r2ypxym421gwlsm8zszsg490xw5q0h111k077x19qa5j4fs";
@@ -931,7 +931,7 @@
   neosnippet-vim = buildVimPluginFrom2Nix {
     name = "neosnippet-vim-2018-07-30";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neosnippet.vim";
       rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830";
       sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza";
@@ -941,7 +941,7 @@
   neoyank-vim = buildVimPluginFrom2Nix {
     name = "neoyank-vim-2018-03-26";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "neoyank.vim";
       rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef";
       sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928";
@@ -1311,7 +1311,7 @@
   tabpagebuffer-vim = buildVimPluginFrom2Nix {
     name = "tabpagebuffer-vim-2014-09-30";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "tabpagebuffer.vim";
       rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc";
       sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f";
@@ -1451,7 +1451,7 @@
   unite-vim = buildVimPluginFrom2Nix {
     name = "unite-vim-2018-08-06";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "unite.vim";
       rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586";
       sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v";
@@ -3122,7 +3122,7 @@
   vimproc-vim = buildVimPluginFrom2Nix {
     name = "vimproc-vim-2018-01-07";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "vimproc.vim";
       rev = "2300224d366642f4f8d6f88861535d4ccbe20143";
       sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia";
@@ -3132,7 +3132,7 @@
   vimshell-vim = buildVimPluginFrom2Nix {
     name = "vimshell-vim-2018-06-02";
     src = fetchFromGitHub {
-      owner = "shougo";
+      owner = "Shougo";
       repo = "vimshell.vim";
       rev = "03bf7673a5098918a533000d67dca97546695237";
       sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 595d0f9ae6a0..fbce248724c2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -220,23 +220,23 @@ scrooloose/nerdtree
 scrooloose/syntastic
 sebastianmarkow/deoplete-rust
 sheerun/vim-polyglot
-shougo/context_filetype.vim
-shougo/denite.nvim
+Shougo/context_filetype.vim
+Shougo/denite.nvim
 Shougo/deol.nvim
-shougo/deoplete.nvim
-shougo/echodoc.vim
-shougo/neco-syntax
-shougo/neco-vim
-shougo/neocomplete.vim
-shougo/neoinclude.vim
-shougo/neomru.vim
-shougo/neosnippet-snippets
-shougo/neosnippet.vim
-shougo/neoyank.vim
-shougo/tabpagebuffer.vim
-shougo/unite.vim
-shougo/vimproc.vim
-shougo/vimshell.vim
+Shougo/deoplete.nvim
+Shougo/echodoc.vim
+Shougo/neco-syntax
+Shougo/neco-vim
+Shougo/neocomplete.vim
+Shougo/neoinclude.vim
+Shougo/neomru.vim
+Shougo/neosnippet-snippets
+Shougo/neosnippet.vim
+Shougo/neoyank.vim
+Shougo/tabpagebuffer.vim
+Shougo/unite.vim
+Shougo/vimproc.vim
+Shougo/vimshell.vim
 shumphrey/fugitive-gitlab.vim
 SirVer/ultisnips
 sjl/gundo.vim

From 3f47dfff3bd88735d502990b6ad196bd0ea354cd Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 13:06:58 +0200
Subject: [PATCH 1299/3253] vimPlugins: Add vim-plug, update plugins

---
 pkgs/misc/vim-plugins/generated.nix    | 148 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   1 +
 2 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4fb293c6f992..18ca6f1de30a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-14";
+    name = "ale-2018-09-19";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "f1f2a222281c9e489c3ca6a4f72329c08d4646a6";
-      sha256 = "0dv0icsg9cmaib9waipj3kz29hczs17kzxbrv46a4y7cb4vcb0jd";
+      rev = "169a6e26b2ca63ab0f2f5bb3d2176ff0a2f68bc3";
+      sha256 = "09pc3a9wkql7j9rc3yfgwns94s7rrldichxwhq37ily139596wkm";
     };
   };
 
@@ -163,12 +163,12 @@
   };
 
   clang_complete = buildVimPluginFrom2Nix {
-    name = "clang_complete-2018-01-18";
+    name = "clang_complete-2018-09-19";
     src = fetchFromGitHub {
       owner = "Rip-Rip";
       repo = "clang_complete";
-      rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275";
-      sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p";
+      rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f";
+      sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc";
     };
   };
 
@@ -193,12 +193,12 @@
   };
 
   command-t = buildVimPluginFrom2Nix {
-    name = "command-t-2017-11-17";
+    name = "command-t-2018-09-19";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6";
-      sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r";
+      rev = "7364a410bc4f0d7febc183678cd565066dfd1e73";
+      sha256 = "1a14ddq6jkfklicdgkpbizzlrx2r4isxarbav5q86w86rwkx3jfi";
       fetchSubmodules = true;
     };
   };
@@ -376,12 +376,12 @@
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix {
-    name = "deoplete-jedi-2018-09-15";
+    name = "deoplete-jedi-2018-09-18";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-jedi";
-      rev = "e397e76e88e8f3c4342ac5284b7dd12561426041";
-      sha256 = "1zslxqs0zcs9vj47g3jr6h6f1lqyswpjc15a1z06zak166ppsxkw";
+      rev = "d49b166458784585dc0cbfb0d7643bc02eba3dd8";
+      sha256 = "1dza6bzij0f8bfs7k9j954f8xccjjcrc7wrcgrm1qw0d2jbm4bgq";
       fetchSubmodules = true;
     };
   };
@@ -719,12 +719,12 @@
   };
 
   lightline-vim = buildVimPluginFrom2Nix {
-    name = "lightline-vim-2018-09-16";
+    name = "lightline-vim-2018-09-17";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "0b026a2b894844b58f8a632290ea1cdab201ed50";
-      sha256 = "0hpw22sv41drn376y4vv5krbjdahga6vxiqrrgky5x1d8bj1fz4m";
+      rev = "47765c787ddc981c2eab6105ade84067d164893c";
+      sha256 = "1r5xpss99jfkvc5dngg877dhmirwnrwppql7ysbab50wfx4hv5c6";
     };
   };
 
@@ -899,12 +899,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-16";
+    name = "neomake-2018-09-17";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "1b5c098e152124267034ce175676594995e4af72";
-      sha256 = "19860x030hscv75sqsjjdkpkndcssn20f9iqy955ssh6v3qmjg2m";
+      rev = "5c0e5c5de14a03c438a370a5ef79a3165a2e705f";
+      sha256 = "0ffkpidgc9lki5h4x8w3yvf5vj6rdip6n0wd89dax81bk7579pcb";
     };
   };
 
@@ -959,12 +959,12 @@
   };
 
   nerdtree = buildVimPluginFrom2Nix {
-    name = "nerdtree-2018-09-15";
+    name = "nerdtree-2018-09-17";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "cd1f2c803ec485074af070a2fe942a029775e5bd";
-      sha256 = "07rna5sqjq934xx8nqsv0b0z6rmzprdxfa76kq5gm3bhc807c7pv";
+      rev = "599238ad99642e8767c4be6adda75bd84afdfd42";
+      sha256 = "1yjx254lmwil42hild0nprxpb26rw84872cnxrzaqfljwsyq7wwv";
     };
   };
 
@@ -979,12 +979,12 @@
   };
 
   nim-vim = buildVimPluginFrom2Nix {
-    name = "nim-vim-2018-08-16";
+    name = "nim-vim-2018-09-19";
     src = fetchFromGitHub {
       owner = "zah";
       repo = "nim.vim";
-      rev = "7d1211cc1588d8970e44435c612405f41ab5a36b";
-      sha256 = "1s28sk7d73vckh37xhld99i8kkx2dxcvsiv8ixlkhgg1pdcchd6d";
+      rev = "b0c4c6c7318866e5d74715885cb379aab70d2763";
+      sha256 = "18wdyw8kchfi0zglzvcnakzm9w8h22a1qjcqnk9j64siwcj6bzcy";
     };
   };
 
@@ -1189,12 +1189,12 @@
   };
 
   rust-vim = buildVimPluginFrom2Nix {
-    name = "rust-vim-2018-09-15";
+    name = "rust-vim-2018-09-16";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "83620e6c674e1ceb801f1b322fb30d028ee59685";
-      sha256 = "0bvyay7r76r3zg00ziinlycw29316r8n81dxsd5qcgxmxfd3ssd1";
+      rev = "5e4672c8ba490d2663c34d89616729b36b294594";
+      sha256 = "189vjd2v271h4634i1fxi9g1sfxkgsb087454na67jrz1pwd8xvw";
     };
   };
 
@@ -1439,12 +1439,12 @@
   };
 
   undotree = buildVimPluginFrom2Nix {
-    name = "undotree-2018-09-07";
+    name = "undotree-2018-09-17";
     src = fetchFromGitHub {
       owner = "mbbill";
       repo = "undotree";
-      rev = "364c73dae83bbaa552fa901dbcb082be22f846f4";
-      sha256 = "1swjgdgbr63a5xp9nlmcpa5f31r1jc9n4wqz4sgmhrcdc4xxq8ah";
+      rev = "c15a0409d9d5a7eacf18d3061a8a37d114532765";
+      sha256 = "0iaj69cc7ysylql43ybprsls9liprmg46ak9mmbh1vjgny2c1nf0";
     };
   };
 
@@ -1679,12 +1679,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-16";
+    name = "vim-airline-2018-09-18";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "bcd37fc1152912fd456606152cebc8d5fc8db865";
-      sha256 = "0cmfj4pvwqyq2nzsy4zhkwhyrifg2sx0z5plw0dvyi2jnfns7afi";
+      rev = "251ed064e84dc684a944edbe37d3c559af3e02bf";
+      sha256 = "1nmcir24f9mlnnfnkbcn3ww5dhn96k6nh0kdpjz1hdh4wd659vhm";
     };
   };
 
@@ -1899,12 +1899,12 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-09-13";
+    name = "vim-dispatch-2018-09-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "fe48d002ce5d473b2057641666d643c66ede6230";
-      sha256 = "1yxssbss89c1sp6vq0mb7cz65cw0lbqfs2ng7hfr92fag68agi2p";
+      rev = "72a08f297e71f25e569f66a825ce2878b038e045";
+      sha256 = "1d0swdrgp3xls4ac854xsqpjipbml9a8yqxcg888xnm8jsqfhqn1";
     };
   };
 
@@ -2039,12 +2039,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-15";
+    name = "vim-fugitive-2018-09-19";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "fb5531997342be62efbbb98bda4b90ee88b2ac00";
-      sha256 = "092fpxmvl7mq1bh8g87ld1mn19qh9dc9r16ngilhg8zx3fvpvi67";
+      rev = "9fec8aadc54372cbea6ac3c9cf6909054140b573";
+      sha256 = "0pkfhbaka6gsabmz74v5dpwd72rwjrrq9wchcda86rmb6nxqsgmg";
     };
   };
 
@@ -2099,12 +2099,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-13";
+    name = "vim-go-2018-09-19";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "8df48b2c2c8aa02dd5ab00b6e9f35b0b9808d798";
-      sha256 = "1ymkmnwvbm5b09d930p7k3cmk7dg1rn68qny9n7jhs7hwxdc309a";
+      rev = "1656f2ff1bb8c4865b2e9870c2be3468974c6ea9";
+      sha256 = "1k6gyzh3sm5ndmh6r8k07q8gmr6190qfvk8cxcj1i37hr6ari0zd";
     };
   };
 
@@ -2279,12 +2279,12 @@
   };
 
   vim-javacomplete2 = buildVimPluginFrom2Nix {
-    name = "vim-javacomplete2-2018-08-20";
+    name = "vim-javacomplete2-2018-09-18";
     src = fetchFromGitHub {
       owner = "artur-shaik";
       repo = "vim-javacomplete2";
-      rev = "2567a4f3ba2b1b902fd85ca24726aba3bf61aaa5";
-      sha256 = "17mlip2mxv9sj2pxmj3clb7ax6m545pa5ynbr80vxww99537gxpr";
+      rev = "3436162781c215f638af5ad8e83df9000edfa203";
+      sha256 = "1ak1czp7dnz376bvalpnr0n8y1s0x4cpwrhb596phfa2567c4f41";
     };
   };
 
@@ -2490,12 +2490,12 @@
   };
 
   vim-obsession = buildVimPluginFrom2Nix {
-    name = "vim-obsession-2018-08-27";
+    name = "vim-obsession-2018-09-17";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-obsession";
-      rev = "523b2c60eb956aba6014e18be75aa7bde5280c33";
-      sha256 = "18hgsrlk4319mpr36sj78a43fvr85lzisxblkik36gvyby9qr3h3";
+      rev = "95a576210dc4408a4804a0a62a9eae90d701026b";
+      sha256 = "04wrwlvdlakn9vrg48y80pcz2jy6kb1zigmjych15s51ay56cswd";
     };
   };
 
@@ -2609,6 +2609,16 @@
     };
   };
 
+  vim-plug = buildVimPluginFrom2Nix {
+    name = "vim-plug-2018-09-12";
+    src = fetchFromGitHub {
+      owner = "junegunn";
+      repo = "vim-plug";
+      rev = "b6050d6f03f3e2792589535249e3c997d3e94461";
+      sha256 = "11x10l75q6k4z67yyk5ll25fqpgb2ma88vplrakw3k41g79xn9d9";
+    };
+  };
+
   vim-plugin-AnsiEsc = buildVimPluginFrom2Nix {
     name = "vim-plugin-AnsiEsc-2018-05-10";
     src = fetchFromGitHub {
@@ -2640,12 +2650,12 @@
   };
 
   vim-projectionist = buildVimPluginFrom2Nix {
-    name = "vim-projectionist-2018-09-09";
+    name = "vim-projectionist-2018-09-18";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "ee68be42d26a8879b871c051e85ce0dfae7364f0";
-      sha256 = "1x1v6q6gqw1f5h0rshj8q7x5cip78x2p6xdj05dglqdq1wz4w28i";
+      rev = "2f7ccf211326e06b89b5a677b2eee3ddb4b644a2";
+      sha256 = "13v9j32p16ak237gwvhk69s6q6maxpg41xd66dqvkj0d7hb21i0v";
     };
   };
 
@@ -2760,12 +2770,12 @@
   };
 
   vim-sensible = buildVimPluginFrom2Nix {
-    name = "vim-sensible-2018-07-16";
+    name = "vim-sensible-2018-09-17";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-sensible";
-      rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525";
-      sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q";
+      rev = "679e53d61558466933fbffc87fab8735eeb8fea8";
+      sha256 = "1sq836sy6kn9z092mnwjxs9p3ijka82gm0nhfvlym348yv1s03wn";
     };
   };
 
@@ -2820,12 +2830,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-14";
+    name = "vim-snippets-2018-09-18";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "2af1ffe88d3de3fbe40a6e74fb626b18a6548cbd";
-      sha256 = "1rkmj800lyp1gqbb00qyscw6fwc1mjz0bc4drd6b6pc2x952m2fi";
+      rev = "39219ca29234a7e28e56379308f59e7190358092";
+      sha256 = "1hnvpkqipa82qqhn68fr1qi71dj4khjgjqzhj85w6chdii1bf6qp";
     };
   };
 
@@ -3140,22 +3150,22 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-15";
+    name = "vimtex-2018-09-19";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "46e2e4f73f89e4116b85a8d6726af44776e3a4f8";
-      sha256 = "05cgw7b3l63lb3dbb07kzb2h9akf5gxa6kl7hzvrsf8khva20nic";
+      rev = "fb09eed5336b6540f8350f2792fded0956362d7b";
+      sha256 = "0g3pw5qw6y9vpdmdnw4x478m5c34g2wll01gdy76yf8r5vysyv41";
     };
   };
 
   vimwiki = buildVimPluginFrom2Nix {
-    name = "vimwiki-2018-09-03";
+    name = "vimwiki-2018-09-17";
     src = fetchFromGitHub {
       owner = "vimwiki";
       repo = "vimwiki";
-      rev = "f55ec31675e372e2f59d51322b445ea91191ec2b";
-      sha256 = "1qjczzj35nwhv1lrl9cf1bdpisr5vlwhf444apzj9c9pcjymc00z";
+      rev = "f882cf01528e471d78d10df28ce407bc1cc23bc9";
+      sha256 = "1c6vkz3y168akh0c6a8api4g0nwsh90gkd6l0pyqpr03glwyqg61";
     };
   };
 
@@ -3220,12 +3230,12 @@
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
-    name = "youcompleteme-2018-09-09";
+    name = "youcompleteme-2018-09-20";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "487b8ab2b4d5bcaece29a17a26818a62616e21b5";
-      sha256 = "1r0sdcllnqgi376hbj1f31irppqw1qqx7rna1jvj5qvi5d81s2nr";
+      rev = "a020cbc0fc4b535f81d9f8db33150b92df68694a";
+      sha256 = "1i9hqmns7hyc15cz565g8xzlf6ryk03xwg714sfbcmkai9vl61w3";
       fetchSubmodules = true;
     };
   };
@@ -3261,12 +3271,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-09-13";
+    name = "zig-vim-2018-09-17";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "057fdd7cd36e12dff0f65092d8e0861f36efdfe2";
-      sha256 = "1i5x4mnfdjqkk71v8calwbm1y85blyrrpg4hqljf58csc7vhq2v9";
+      rev = "9986edc96f220bb9208473a5ad61339c1567df23";
+      sha256 = "03grs1ha5r4cfh8hczfawj7x7xwb6j716rl52gbkhbxhlk72w5kq";
     };
   };
 }
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fbce248724c2..bbb05143c3c2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -109,6 +109,7 @@ junegunn/limelight.vim
 junegunn/vim-easy-align
 junegunn/vim-github-dashboard
 junegunn/vim-peekaboo
+junegunn/vim-plug
 justincampbell/vim-eighties
 justinmk/vim-dirvish
 KabbAmine/zeavim.vim

From 516a83c0e825843b5984adcabf710ef240343f31 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 16 Sep 2018 18:26:45 +0200
Subject: [PATCH 1300/3253] vimPlugins: Add vim-plug addon implementation

---
 pkgs/misc/vim-plugins/vim-utils.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index bae1645563f0..9255bbe12635 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -172,6 +172,7 @@ let
     packages ? null,
     vam ? null,
     pathogen ? null,
+    plug ? null,
     customRC ? ""
   }:
 
@@ -194,6 +195,18 @@ let
         execute pathogen#infect('${pluginsEnv}/{}')
       '');
 
+      /* vim-plug is an extremely popular vim plugin manager.
+      */
+      plugImpl = lib.optionalString (plug != null)
+      ''
+        source ${vimPlugins.vim-plug.rtp}/plug.vim
+        call plug#begin('/dev/null')
+
+        '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
+
+        call plug#end()
+      '';
+
       /*
        vim-addon-manager = VAM
 
@@ -302,6 +315,7 @@ let
 
   ${vamImpl}
   ${pathogenImpl}
+  ${plugImpl}
   ${vundleImpl}
   ${neobundleImpl}
   ${nativeImpl}
@@ -427,7 +441,8 @@ rec {
     packages ? {},
     givenKnownPlugins ? null,
     vam ? null,
-    pathogen ? null, ...
+    pathogen ? null,
+    plug ? null, ...
   }:
     let
       # This is probably overcomplicated, but I don't understand this well enough to know what's necessary.
@@ -439,7 +454,7 @@ rec {
       vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
       names = (lib.optionals (pathogen != null) pathogenNames) ++
               (lib.optionals (vam != null) vamNames);
-      nonNativePlugins = map (name: knownPlugins.${name}) names;
+      nonNativePlugins = map (name: knownPlugins.${name}) names ++ (lib.optionals (plug != null) plug.plugins);
       nativePluginsConfigs = lib.attrsets.attrValues packages;
       nativePlugins = lib.concatMap ({start?[], opt?[]}: start++opt) nativePluginsConfigs;
     in
@@ -457,6 +472,11 @@ rec {
     vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ];
   };
 
+  test_vim_with_vim_addon_nix_using_plug = vim_configurable.customize {
+    name = "vim-with-vim-addon-nix-using-plug";
+    vimrcConfig.plug.plugins = with vimPlugins; [ vim-addon-nix ];
+  };
+
   test_vim_with_vim_addon_nix = vim_configurable.customize {
     name = "vim-with-vim-addon-nix";
     vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ];

From c1d8b1e26610819a3ab4b98190b52c7c8ff9ced6 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Thu, 20 Sep 2018 09:05:33 +0200
Subject: [PATCH 1301/3253] doc: Add section about vim-plug

---
 doc/languages-frameworks/vim.section.md | 50 ++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index f0a6559c3d51..9c7d21a5a02e 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -59,7 +59,7 @@ vim_configurable.customize {
 }
 ```
 
-For Neovim the syntax is
+For Neovim the syntax is:
 
 ```
 neovim.override {
@@ -96,6 +96,54 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
 
 After that you can install your special grafted `myVim` or `myNeovim` packages.
 
+## Managing plugins with vim-plug
+
+To use vim-plug to manage your Vim plugins the following example can be used:
+
+```
+vim_configurable.customize {
+  vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+    # loaded on launch
+    plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ];
+  };
+}
+```
+
+For Neovim the syntax is:
+
+```
+neovim.override {
+  configure = {
+    customRC = ''
+      # here your custom configuration goes!
+    '';
+    plug.plugins = with pkgs.vimPlugins; [
+      vim-go
+    ];
+  };
+}
+```
+
+The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable:
+
+```
+{
+  packageOverrides = pkgs: with pkgs; {
+    myVim = vim_configurable.customize {
+      name = "vim-with-plugins";
+      # add here code from the example section
+    };
+    myNeovim = neovim.override {
+      configure = {
+      # add here code from the example section
+      };
+    };
+  };
+}
+```
+
+After that you can install your special grafted `myVim` or `myNeovim` packages.
+
 ## Managing plugins with VAM
 
 ### Handling dependencies of Vim plugins

From 1552f2ef68c1ad86525aa26e676ccf6e77fea017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Sep 2018 08:20:11 +0100
Subject: [PATCH 1302/3253] doc/vim: remove some vim-plug redundancy

---
 doc/languages-frameworks/vim.section.md | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 9c7d21a5a02e..1b235dbb52f6 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -15,6 +15,7 @@ At the moment we support three different methods for managing plugins:
 - Vim packages (*recommend*)
 - VAM (=vim-addon-manager)
 - Pathogen
+- vim-plug
 
 ## Custom configuration
 
@@ -98,7 +99,8 @@ After that you can install your special grafted `myVim` or `myNeovim` packages.
 
 ## Managing plugins with vim-plug
 
-To use vim-plug to manage your Vim plugins the following example can be used:
+To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim
+plugins the following example can be used:
 
 ```
 vim_configurable.customize {
@@ -124,26 +126,6 @@ neovim.override {
 }
 ```
 
-The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable:
-
-```
-{
-  packageOverrides = pkgs: with pkgs; {
-    myVim = vim_configurable.customize {
-      name = "vim-with-plugins";
-      # add here code from the example section
-    };
-    myNeovim = neovim.override {
-      configure = {
-      # add here code from the example section
-      };
-    };
-  };
-}
-```
-
-After that you can install your special grafted `myVim` or `myNeovim` packages.
-
 ## Managing plugins with VAM
 
 ### Handling dependencies of Vim plugins

From bd46155a8d9bd1f93e9151ec56d85ccb43d1d811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Sep 2018 08:26:03 +0100
Subject: [PATCH 1303/3253] vimUtils: replace vim-addon-nix with vim-nix

vim-addon-nix throws weird errors on startup
---
 pkgs/misc/vim-plugins/vim-utils.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 9255bbe12635..7595ae02164d 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -462,23 +462,23 @@ rec {
 
 
   # test cases:
-  test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize {
+  test_vim_with_vim_nix_using_vam = vim_configurable.customize {
    name = "vim-with-vim-addon-nix-using-vam";
-    vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
+    vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }];
   };
 
-  test_vim_with_vim_addon_nix_using_pathogen = vim_configurable.customize {
+  test_vim_with_vim_nix_using_pathogen = vim_configurable.customize {
     name = "vim-with-vim-addon-nix-using-pathogen";
-    vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ];
+    vimrcConfig.pathogen.pluginNames = [ "vim-nix" ];
   };
 
-  test_vim_with_vim_addon_nix_using_plug = vim_configurable.customize {
+  test_vim_with_vim_nix_using_plug = vim_configurable.customize {
     name = "vim-with-vim-addon-nix-using-plug";
-    vimrcConfig.plug.plugins = with vimPlugins; [ vim-addon-nix ];
+    vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ];
   };
 
-  test_vim_with_vim_addon_nix = vim_configurable.customize {
+  test_vim_with_vim_nix = vim_configurable.customize {
     name = "vim-with-vim-addon-nix";
-    vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ];
+    vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
   };
 }

From 6fdec2b3a4c643169005ebcd2e905239b5bc27fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Sep 2018 08:42:00 +0100
Subject: [PATCH 1304/3253] vimPlugins: update.py also needs nix-prefetch-git

---
 pkgs/misc/vim-plugins/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index c9ccd2364725..3f5e255ae21c 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -p python3 nix -i python3
+#!nix-shell -p nix-prefetch-git -p python3 nix -i python3
 
 # format:
 # $ nix run nixpkgs.python3Packages.black -c black update.py

From 0e1f3ef01afcbb4cf66ebb766bd096033eacc633 Mon Sep 17 00:00:00 2001
From: Sam Parkinson <sam@sam.today>
Date: Thu, 20 Sep 2018 13:51:04 +1000
Subject: [PATCH 1305/3253] vim-tsx: init at 2017-03-16

fixes #46728
---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 18ca6f1de30a..ad181c7bf953 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3009,6 +3009,16 @@
     };
   };
 
+  vim-tsx = buildVimPluginFrom2Nix {
+    name = "vim-tsx-2017-03-16";
+    src = fetchFromGitHub {
+      owner = "ianks";
+      repo = "vim-tsx";
+      rev = "77c89c42e189fefd3c9a632b37b7e3b3b9edf918";
+      sha256 = "0wmd6gql57bxp868sq2dchp9sc3jbisr4vaz4y0lczhmk0prds6n";
+    };
+  };
+
   vim-unimpaired = buildVimPluginFrom2Nix {
     name = "vim-unimpaired-2018-07-26";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index bbb05143c3c2..5f664c39e3c5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -79,6 +79,7 @@ heavenshell/vim-jsdoc
 hecal3/vim-leader-guide
 honza/vim-snippets
 hsanson/vim-android
+ianks/vim-tsx
 idris-hackers/idris-vim
 inkarkat/vim-SyntaxRange
 int3/vim-extradite

From 2eed7b735055c7b2d6fabd81dbb5871e2438c1b3 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 20 Sep 2018 03:00:18 -0500
Subject: [PATCH 1306/3253] compton{,-git}: bump to v2, set COMPTON_VERSION so
 '--version' has sane output (#46685)

Previously they both would claim to be 'git--' :).
---
 .../window-managers/compton/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index e5faf084a42d..138451656667 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -42,10 +42,12 @@ let
     };
   });
 
-  stableSource = {
+  stableSource = rec {
     pname = "compton";
     version = "0.1_beta2.5";
 
+    COMPTON_VERSION = version;
+
     src = fetchFromGitHub {
       owner = "chjj";
       repo = "compton";
@@ -58,15 +60,17 @@ let
     };
   };
 
-  gitSource = {
+  gitSource = rec {
     pname = "compton-git";
-    version = "2018-08-14";
+    version = "2";
+
+    COMPTON_VERSION = "v${version}";
 
     src = fetchFromGitHub {
       owner  = "yshui";
       repo   = "compton";
-      rev    = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f";
-      sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5";
+      rev    = COMPTON_VERSION;
+      sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq";
     };
 
     meta = {

From 286915d54ed17d43522df83805689091490fd0a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 01:38:36 -0700
Subject: [PATCH 1307/3253] wireless-regdb: 2018.05.31 -> 2018.09.07

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireless-regdb/versions
---
 pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index b386b18e69e2..f0ad2c43a9c8 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2018.05.31";
+  version = "2018.09.07";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
-    sha256 = "0yxydxkmcb6iryrbazdk8lqqibig102kq323gw3p64vpjwxvrpz1";
+    sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3";
   };
 
   dontBuild = true;

From 2e9e44300586c6b16c99d512b61b50e96e04b6f0 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 09:43:56 +0100
Subject: [PATCH 1308/3253] glxinfo: 8.3.0 -> 8.4.0

---
 pkgs/tools/graphics/glxinfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index a3a9a4d8eda4..7e4d95045a79 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "glxinfo-${version}";
-  version = "8.3.0";
+  version = "8.4.0";
 
   src = fetchurl {
-    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
-    sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
+    url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2";
+    sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81";
   };
 
   buildInputs = [ libX11 libGL ];

From f2b3b13876e5c1e4f3c57b7b10c172baf1ae2be9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 02:21:40 -0700
Subject: [PATCH 1309/3253] vips: 8.6.5 -> 8.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vips/versions
---
 pkgs/tools/graphics/vips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index e2688e930cf6..735d2565b045 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "vips-${version}";
-  version = "8.6.5";
+  version = "8.7.0";
 
   src = fetchurl {
     url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1nymm4vzscb68aifin9q742ff64b4k4ddppq1060w8hf6h7ay0l7";
+    sha256 = "16086hdg6m44llz69fkp1n0ckjb7zhl6i2bg0wwllrchznikwiy4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ff22306255bfe0d309485e59ce336cd28f84c884 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 11 Sep 2018 17:49:42 -0700
Subject: [PATCH 1310/3253] factorio: download using token, not password

Downloads were broken by upstream devs' addition of CAPTCHA to the login
form. We now need only a slightly modified fetchurl to retrieve the
binary distribution.
---
 pkgs/games/factorio/default.nix | 104 ++++++++++++++++++++++----------
 pkgs/games/factorio/fetch.nix   |  33 ----------
 pkgs/games/factorio/fetch.sh    |  55 -----------------
 3 files changed, 73 insertions(+), 119 deletions(-)
 delete mode 100644 pkgs/games/factorio/fetch.nix
 delete mode 100644 pkgs/games/factorio/fetch.sh

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index bb019e570260..4b568a2aaf58 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -3,7 +3,7 @@
 , factorio-utils
 , releaseType
 , mods ? []
-, username ? "" , password ? ""
+, username ? "", token ? "" # get/reset token at https://factorio.com/profile
 , experimental ? false
 }:
 
@@ -13,59 +13,101 @@ assert releaseType == "alpha"
 
 let
 
-  # NB If you nix-prefetch-url any of these, be sure to add a --name arg,
-  #    where the ultimate "_" (before the version) is changed to a "-".
+  helpMsg = ''
+
+    ===FETCH FAILED===
+    Please ensure you have set the username and token with config.nix, or
+    /etc/nix/nixpkgs-config.nix if on NixOS.
+
+    Your token can be seen at https://factorio.com/profile (after logging in). It is
+    not as sensitive as your password, but should still be safeguarded. There is a
+    link on that page to revoke/invalidate the token, if you believe it has been
+    leaked or wish to take precautions.
+
+    Example:
+    {
+      packageOverrides = pkgs: {
+        factorio = pkgs.factorio.override {
+          username = "FactorioPlayer1654";
+          token = "d5ad5a8971267c895c0da598688761";
+        };
+      };
+    }
+
+    Alternatively, instead of providing the username+token, you may manually
+    download the release through https://factorio.com/download , then add it to
+    the store using e.g.:
+
+      releaseType=alpha
+      version=0.16.51
+      nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz
+
+    Note the ultimate "_" is replaced with "-" in the --name arg!
+  '';
+
   branch = if experimental then "experimental" else "stable";
+
   binDists = {
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
-        stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; };
-        experimental  = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; };
+        stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
+        experimental  = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; withAuth = true; };
       };
       headless = {
-        stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; };
+        stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
         experimental  = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; };
       };
       demo = {
         stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };
-        experimental  = bdist { };
       };
     };
     i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in {
       alpha = {
-        stable        = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; };
-        experimental  = bdist { };
-      };
-      headless = {
-        stable        = bdist { };
-        experimental  = bdist { };
-      };
-      demo = {
-        stable        = bdist { };
-        experimental  = bdist { };
+        stable        = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; withAuth = true; nameMut = asGz; };
       };
     };
   };
-  actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform");
 
-  bdistForArch = arch: { sha256 ? null
-                       , version ? "0.16.51"
-                       , fetcher ? fetchurl
+  actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download.");
+
+  bdistForArch = arch: { version
+                       , sha256
+                       , withAuth ? false
                        , nameMut ? x: x
                        }:
-    if sha256 == null then
-      throw "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download"
-    else {
+    let
+      url = "https://factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
+      name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
+    in {
       inherit version arch;
-      src = fetcher {
-        inherit sha256;
-        url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
-        name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
-      };
+      src =
+        if withAuth then
+          (stdenv.lib.overrideDerivation
+            (fetchurl {
+              inherit name url sha256;
+              curlOpts = [
+                "--get"
+                "--data-urlencode" "username@username"
+                "--data-urlencode" "token@token"
+              ];
+            })
+            (_: { # This preHook hides the credentials from /proc
+                  preHook = ''
+                    echo -n "${username}" >username
+                    echo -n "${token}"    >token
+                  '';
+                  failureHook = ''
+                    cat <<EOF
+                    ${helpMsg}
+                    EOF
+                  '';
+            })
+          )
+        else
+          fetchurl { inherit name url sha256; };
     };
-  authenticatedFetch = callPackage ./fetch.nix { inherit username password; };
-  asGz = builtins.replaceStrings [".xz"] [".gz"];
 
+  asGz = builtins.replaceStrings [".xz"] [".gz"];
 
   configBaseCfg = ''
     use-system-read-write-data-directories=false
diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix
deleted file mode 100644
index 7dbe2064a5c4..000000000000
--- a/pkgs/games/factorio/fetch.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, curl, xidel, cacert
-# Begin download parameters
-, username ? ""
-, password ? ""
-}:
-
-{
-  # URL to fetch.
-  url ? ""
-
-, name ? "factorio.tar.gz"
-
-  # Login URL.
-, loginUrl ? "https://www.factorio.com/login"
-
-  # SHA256 of the fetched URL.
-, sha256 ? ""
-}:
-
-stdenv.mkDerivation {
-  nativeBuildInputs = [ curl xidel ];
-
-  inherit name url loginUrl username password cacert;
-
-  builder = ./fetch.sh;
-
-  outputHashAlgo = "sha256";
-  outputHash = sha256;
-  outputHashMode = "flat";
-
-  # There's no point in downloading remotely, we'd just slow things down.
-  preferLocalBuild = true;
-}
diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh
deleted file mode 100644
index 312dc9b6d61e..000000000000
--- a/pkgs/games/factorio/fetch.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-source $stdenv/setup
-
-# Curl flags to increase reliability a bit.
-#
-# Can't use fetchurl, for several reasons. One is that we definitely
-# don't want --insecure for the login, though we need it for the
-# download as their download cert isn't in the standard linux bundle.
-curl="curl \
- --max-redirs 20 \
- --retry 3 \
- --cacert $cacert/etc/ssl/certs/ca-bundle.crt \
- -b cookies \
- -c cookies \
- $curlOpts \
- $NIX_CURL_FLAGS"
-
-# We don't want the password to be on any program's argv, as it may be
-# visible in /proc. Writing it to file with echo should be safe, since
-# it's a shell builtin.
-echo -n "$password" > password
-# Might as well hide the username as well.
-echo -n "$username" > username
-
-# Get a CSRF token.
-csrf=$($curl $loginUrl | xidel - -e '//input[@id="csrf_token"]/@value')
-
-# Log in. We don't especially care about the result, but let's check if login failed.
-$curl --data-urlencode csrf_token="$csrf" \
-      --data-urlencode username_or_email@username \
-      --data-urlencode password@password \
-      -d action=Login \
-      $loginUrl -D headers > /dev/null
-
-if grep -q 'Location: https://' headers; then
-    # Now download. We need --insecure for this, but the sha256 should cover us.
-    $curl --insecure --location --fail $url > $out || { echo "Login succeeded, but subsequent fetch failed."; exit 1; }
-    set +x
-else
-    set +x
-    echo 'Login failed'
-    echo 'Please set username and password with config.nix,'
-    echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'
-    echo
-    echo 'Example:'
-    echo '{'
-    echo '  packageOverrides = pkgs: rec {'
-    echo '    factorio = pkgs.factorio.override {'
-    echo '      username = "<username or email address>";'
-    echo '      password = "<password>";'
-    echo '    };'
-    echo '  };'
-    echo '}'
-
-    exit 1
-fi

From 8ed49d7ec872c5f1f64a03c7b7a809fa4af295c6 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 20 Sep 2018 02:23:53 -0700
Subject: [PATCH 1311/3253] factorio: experimental=true includes stable builds,
 when newer

---
 pkgs/games/factorio/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 4b568a2aaf58..bd05c3728100 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -4,7 +4,7 @@
 , releaseType
 , mods ? []
 , username ? "", token ? "" # get/reset token at https://factorio.com/profile
-, experimental ? false
+, experimental ? false # true means to always use the latest branch
 }:
 
 assert releaseType == "alpha"
@@ -47,15 +47,17 @@ let
 
   branch = if experimental then "experimental" else "stable";
 
+  # NB `experimental` directs us to take the latest build, regardless of its branch;
+  # hence the (stable, experimental) pairs may sometimes refer to the same distributable.
   binDists = {
     x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in {
       alpha = {
         stable        = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
-        experimental  = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; withAuth = true; };
+        experimental  = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; };
       };
       headless = {
         stable        = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
-        experimental  = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; };
+        experimental  = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; };
       };
       demo = {
         stable        = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; };

From e03b99c309565afe2fb090a1f5986e2c5fc95a5e Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 10:46:42 +0100
Subject: [PATCH 1312/3253] glxinfo: add es2gears, es2_info

---
 pkgs/tools/graphics/glxinfo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 7e4d95045a79..6a2a3a5a46e8 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
   configurePhase = "true";
 
   buildPhase = "
-    cd src/xdemos
-    $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
-    $CC glxgears.c -o glxgears -lGL -lX11 -lm
+    $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
+    $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm
+    $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11
+    $CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm
   ";
 
   installPhase = "
-    mkdir -p $out/bin
-    cp glxinfo glxgears $out/bin/
+    install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears}
   ";
 
   meta = with stdenv.lib; {

From 898915db944ecd960785bfedc4036eaaca24666a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 03:15:16 -0700
Subject: [PATCH 1313/3253] smplayer: 18.6.0 -> 18.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/smplayer/versions
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 107939086325..58ed3ec59b24 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.6.0";
+  name = "smplayer-18.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0pb862l175ycm6fm90nryzgbqy8kbwpv3i6cbn13h7jh1yrz8nqx";
+    sha256 = "0gff22yh2h76cyqsbjpa7rax51sfzygjl3isd8dk47zar9cyvw8d";
   };
 
   buildInputs = [ qtscript ];

From 8cd90e40be87dca6b85e409efabd5557c51b4ebf Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 20 Sep 2018 12:27:24 +0200
Subject: [PATCH 1314/3253] gitlab: add missing meta.platforms

---
 pkgs/applications/version-management/gitlab/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 90d16d846608..64e0ef2b59d0 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -109,5 +109,6 @@ stdenv.mkDerivation rec {
     description = "Web-based Git-repository manager";
     homepage = https://gitlab.com;
     license = licenses.mit;
+    platforms = platforms.linux;
   };
 }

From a16c6d85a1291beede624cdc14833247610eb706 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 20 Sep 2018 06:35:51 -0400
Subject: [PATCH 1315/3253] nixos/emby: ensure plugins are writeable

---
 nixos/modules/services/misc/emby.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index 64cc9c610ac3..ff68b850cd91 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -36,11 +36,18 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        test -d ${cfg.dataDir} || {
-          echo "Creating initial Emby data directory in ${cfg.dataDir}"
-          mkdir -p ${cfg.dataDir}
-          chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
-          }
+        if [ -d ${cfg.dataDir} ]
+        then
+            for plugin in ${cfg.dataDir}/plugins/*
+            do
+                echo "Correcting permissions of plugin: $plugin"
+                chmod u+w $plugin
+            done
+        else
+            echo "Creating initial Emby data directory in ${cfg.dataDir}"
+            mkdir -p ${cfg.dataDir}
+            chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
+        fi
       '';
 
       serviceConfig = {

From c8598daad4dee3d15e312608b56ce50532830c90 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Thu, 20 Sep 2018 11:45:16 +0100
Subject: [PATCH 1316/3253] haskellPackages.sbv: fix location of z3 executable

A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d016bd6ce8d6..a516b7645104 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -511,4 +511,10 @@ self: super: builtins.intersectAttrs super {
   # Doctests hang only when compiling with nix.
   # https://github.com/cdepillabout/termonad/issues/15
   termonad = dontCheck super.termonad;
+
+  # Expects z3 to be on path so we replace it with a hard
+  sbv = overrideCabal super.sbv (drv: {
+    postPatch = ''
+      sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
+  });
 }

From 8b58a7187c9f3c8f1997f328c27c536effccdac3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 20 Sep 2018 12:47:46 +0200
Subject: [PATCH 1317/3253] nixos/yabar: fix module & test (#46954)

The `pkgs.yabar` package is relatively old (2016-04) and contains
several issues fixed on master. `yabar-unstable` containsa recent master
build with several fixes and a lot of new features (I use
`yabar-unstable` for some time now and had no issues with it).

In the upstream bugtracker some bugs could be fixed on ArchLinux by
simply installing `yabar-git` (an AUR package which builds a recent
master).

To stabilize the module, the option `programs.yabar.package` now
defaults to `pkgs.yabar-unstable` and yields a warning with several
linked issues that are known on `pkgs.yabar`.

The test has been refactored as well to ensure that `yabar` actually
starts (and avoid non-deterministic random success) and takes a
screenshot of a very minimalistic configuration on IceWM.

Fixes #46899
---
 nixos/modules/programs/yabar.nix | 17 +++++++++++++++--
 nixos/tests/yabar.nix            | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index a01083c3ace9..db085211366e 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -44,10 +44,23 @@ in
       enable = mkEnableOption "yabar";
 
       package = mkOption {
-        default = pkgs.yabar;
-        example = literalExample "pkgs.yabar-unstable";
+        default = pkgs.yabar-unstable;
+        example = literalExample "pkgs.yabar";
         type = types.package;
 
+        # `yabar-stable` segfaults under certain conditions.
+        apply = x: if x == pkgs.yabar-unstable then x else flip warn x ''
+          It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
+          tends to segfault under certain circumstances:
+
+          * https://github.com/geommer/yabar/issues/86
+          * https://github.com/geommer/yabar/issues/68
+          * https://github.com/geommer/yabar/issues/143
+
+          Most of them don't occur on master anymore, until a new release is published, it's recommended
+          to use `yabar-unstable'.
+        '';
+
         description = ''
           The package which contains the `yabar` binary.
 
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
index 06fe5bc2b278..bbc0cf4c7dd7 100644
--- a/nixos/tests/yabar.nix
+++ b/nixos/tests/yabar.nix
@@ -8,18 +8,26 @@ with lib;
     maintainers = [ ma27 ];
   };
 
-  nodes.yabar = {
+  machine = {
     imports = [ ./common/x11.nix ./common/user-account.nix ];
 
     services.xserver.displayManager.auto.user = "bob";
 
     programs.yabar.enable = true;
+    programs.yabar.bars = {
+      top.indicators.date.exec = "YABAR_DATE";
+    };
   };
 
   testScript = ''
-    $yabar->start;
-    $yabar->waitForX;
+    $machine->start;
+    $machine->waitForX;
 
-    $yabar->waitForUnit("yabar.service", "bob");
+    # confirm proper startup
+    $machine->waitForUnit("yabar.service", "bob");
+    $machine->sleep(10);
+    $machine->waitForUnit("yabar.service", "bob");
+
+    $machine->screenshot("top_bar");
   '';
 })

From 05659962cd8c04a9e8bf05b298b735f5747bf12c Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 20 Sep 2018 13:20:12 +0200
Subject: [PATCH 1318/3253] nixos/tests/networking.virtual: prevent
 non-deterministic failure (#46949)

The test failed non-deterministically on Hydra because interfaces
sometimes weren't yet fully cleaned up when the result was checked.
---
 nixos/tests/networking.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 02bd4bd98079..87a8c4c0e196 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -467,7 +467,7 @@ let
 
         # Wait for networking to come up
         $machine->start;
-        $machine->waitForUnit("network.target");
+        $machine->waitForUnit("network-online.target");
 
         # Test interfaces set up
         my $list = $machine->succeed("ip tuntap list | sort");
@@ -479,7 +479,9 @@ let
 
         # Test interfaces clean up
         $machine->succeed("systemctl stop network-addresses-tap0");
+        $machine->sleep(10);
         $machine->succeed("systemctl stop network-addresses-tun0");
+        $machine->sleep(10);
         my $residue = $machine->succeed("ip tuntap list");
         $residue eq "" or die(
           "Some virtual interface has not been properly cleaned:\n",

From 39a5ac17e2259774a285ef4119647af791d680a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 04:23:45 -0700
Subject: [PATCH 1319/3253] sg3_utils: 1.42 -> 1.44

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sg3_utils/versions
---
 pkgs/tools/system/sg3_utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index 8be7203fb3d4..67145bc3cc54 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sg3_utils-1.42";
+  name = "sg3_utils-1.44";
 
   src = fetchurl {
     url = "http://sg.danny.cz/sg/p/${name}.tgz";
-    sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx";
+    sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld";
   };
 
   meta = with stdenv.lib; {

From 4392ec653c9e9b87bbd02db9c25c2d8c43742e8d Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Thu, 20 Sep 2018 13:40:50 +0200
Subject: [PATCH 1320/3253] nixos/systemd-lib: fix assertValueOneOf when value
 is not a string

---
 nixos/modules/system/boot/systemd-lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 9c8d4a026b4a..68a40377ee13 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -63,7 +63,7 @@ in rec {
 
   assertValueOneOf = name: values: group: attr:
     optional (attr ? ${name} && !elem attr.${name} values)
-      "Systemd ${group} field `${name}' cannot have value `${attr.${name}}'.";
+      "Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'.";
 
   assertHasField = name: group: attr:
     optional (!(attr ? ${name}))

From 069cfb58991e81e72ae32de384bb456861dd46b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 05:23:48 -0700
Subject: [PATCH 1321/3253] rdma-core: 19 -> 20

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rdma-core/versions
---
 pkgs/os-specific/linux/rdma-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index de7164b2af03..b66cb78a702b 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "19";
+  version = "20";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "0c01f9yn9sk7wslyrclsi2jvrn4d36bdw4qjbl0vmcv4858wf4bb";
+    sha256 = "1zz9r1zq9ql806sbyi7nrslx1d96hgd9zvdlzbv4j31m6kfmsyri";
   };
 
   nativeBuildInputs = [ cmake pkgconfig pandoc ];

From 4d404fb98b7ecb4ecaca14af5fd6d97c2eb23e9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 06:00:14 -0700
Subject: [PATCH 1322/3253] proj: 4.9.3 -> 5.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/proj/versions
---
 pkgs/development/libraries/proj/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 0ebf299a8bfb..55af1d8573a1 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.9.3";
+  name = "proj-5.2.0";
 
   src = fetchurl {
-    url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz;
-    sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
+    url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz;
+    sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
   };
 
   doCheck = stdenv.is64bit;

From 8eba6994e22c58adfeaac48041558d71c1fd4155 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 06:18:52 -0700
Subject: [PATCH 1323/3253] pulseeffects: 4.3.4 -> 4.3.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
---
 pkgs/applications/audio/pulseeffects/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 46d4f971420a..b055a520be04 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "pulseeffects-${version}";
-  version = "4.3.4";
+  version = "4.3.5";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "0gyyqxfmmp6hbwc10i48sxrgdxansm3vsbwgc6rh89clxwcnfiml";
+    sha256 = "01jxkz4s3m8cqsn6wcbrw7bzr7sr7hqsp9950018riilpni7k4bd";
   };
 
   nativeBuildInputs = [

From f45629107a16badf96c881184dbe83d68bbd9913 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 06:22:08 -0700
Subject: [PATCH 1324/3253] psmisc: 23.1 -> 23.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/psmisc/versions
---
 pkgs/os-specific/linux/psmisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 1eec10860f72..c7b71d4e5018 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "psmisc-23.1";
+  name = "psmisc-23.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/psmisc/${name}.tar.xz";
-    sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f";
+    sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49";
   };
 
   buildInputs = [ncurses];

From 3afe74864c80363db262d74a7461c00acc57fa54 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <t.kerber@ed.ac.uk>
Date: Thu, 20 Sep 2018 14:41:12 +0100
Subject: [PATCH 1325/3253] vim-utils: fix broken vim-plug implementation.

---
 pkgs/misc/vim-plugins/vim-utils.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 7595ae02164d..7122e2a42306 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -198,14 +198,14 @@ let
       /* vim-plug is an extremely popular vim plugin manager.
       */
       plugImpl = lib.optionalString (plug != null)
-      ''
+      (''
         source ${vimPlugins.vim-plug.rtp}/plug.vim
         call plug#begin('/dev/null')
 
         '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
 
         call plug#end()
-      '';
+      '');
 
       /*
        vim-addon-manager = VAM

From 8485e647307a31cf50fbaf053cff053ce674ab5d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 06:44:29 -0700
Subject: [PATCH 1326/3253] opusfile: 0.10 -> 0.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/opusfile/versions
---
 pkgs/applications/audio/opusfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index d864d5972bce..993e3c4fe8c5 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "opusfile-0.10";
+  name = "opusfile-0.11";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28";
+    sha256 = "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7ead7a4a67f4c2d8b42720f0e9f090470989634c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Sep 2018 09:47:21 -0400
Subject: [PATCH 1327/3253] linux: 4.4.156 -> 4.4.157

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index c25da926b267..3106dc981055 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.156";
+  version = "4.4.157";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1aj87ncc8afx4dr42rf2kr5ai2k5w5arcp8z336i2wlnrbcdhhh4";
+    sha256 = "0kb23pq0q7nkrri4bir5x6285wbi17fn5mpbm9awzjablq5bq400";
   };
 } // (args.argsOverride or {}))

From 5509a39e9ad489aeea37945e399aba8f6cb721e2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Sep 2018 09:47:58 -0400
Subject: [PATCH 1328/3253] linux: 4.9.127 -> 4.9.128

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index db46ea80e609..6e5d310075e2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.127";
+  version = "4.9.128";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "03yxdzmlikyvbkfaha871h9n7y58lyzyxgybsx09ln4pxnnswxwl";
+    sha256 = "04kgdci8xndml2fwbam59pjwwxqd4kf7y3qgkk4asshs9546zdxx";
   };
 } // (args.argsOverride or {}))

From 28fee11e1c42b93cd5e4aac303bddc9da1bb0fe6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Sep 2018 09:51:08 -0400
Subject: [PATCH 1329/3253] linux: 4.14.70 -> 4.14.71

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index bc52e3ddf875..fcec5fd0df41 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.70";
+  version = "4.14.71";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0b733s4m9r9606xmxv5jfr5x14c4ik665awln2smd23z8wrdipy5";
+    sha256 = "12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n";
   };
 } // (args.argsOverride or {}))

From 7d30b3d10c8dbc9d024525a84742fca6d44f24bf Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Sep 2018 09:51:32 -0400
Subject: [PATCH 1330/3253] linux: 4.18.8 -> 4.18.9

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix |  4 ++--
 pkgs/top-level/all-packages.nix              | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 91232ab0bbee..48fc823ee084 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.8";
+  version = "4.18.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "152lz1yim77kpighdcyy1csxs0xf8m2zkwwcz847fqdbd6ninmgi";
+    sha256 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac";
   };
 } // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23537a11e54f..4b02c8d9cb21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14085,18 +14085,6 @@ with pkgs;
         # when adding a new linux version
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-
-        # https://github.com/NixOS/nixpkgs/issues/45165
-        # TODO: remove this patch once it is merged upstream and released.
-        (rec {
-          name = "hid-core-fix-grouping-by-application";
-          patch = fetchpatch {
-            name = name + ".patch";
-            # https://patchwork.kernel.org/patch/10587369/
-            url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a;
-            sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m";
-          };
-        })
       ];
   };
 

From b914cf8083ac65eecef41a59e93367fd41ea8cb3 Mon Sep 17 00:00:00 2001
From: AesaKamar <aesa.kamar@gmail.com>
Date: Thu, 20 Sep 2018 10:18:38 -0400
Subject: [PATCH 1331/3253] scalafmt 1.4.0 -> 1.5.1

---
 pkgs/development/tools/scalafmt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index d50b1435b733..40ed7f44d8c3 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "scalafmt";
-  version = "1.4.0";
+  version = "1.5.1";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -13,7 +13,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp";
+    outputHash     = "15xfys9wdlx3rrqb2ab6qcfngkf6sa8v8q8shh10kk8jrc30g6dk";
   };
 in
 stdenv.mkDerivation rec {

From 8908bc4e194e3d3d6d4e320b3777dbfe86337de2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 09:27:30 -0500
Subject: [PATCH 1332/3253] range-v3: 0.3.6 -> 0.3.7

---
 pkgs/development/libraries/range-v3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index cd981f8947aa..cdb5297a6d87 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "range-v3-${version}";
-  version = "0.3.6";
+  version = "0.3.7";
 
   src = fetchFromGitHub {
     owner = "ericniebler";
     repo = "range-v3";
     rev = version;
-    sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp";
+    sha256 = "1zhsz1i4jy97idydg7ay3wazp7v2353vckkli5w9g51jka43h5x2";
   };
 
   nativeBuildInputs = [ cmake ];

From da78d3e829de37545b8ddb6da81eb638a0828637 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:34:23 -0700
Subject: [PATCH 1333/3253] links2: 2.16 -> 2.17

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/links2/versions
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index ff165f99ae9b..bccc3fa2f4c0 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.16";
+  version = "2.17";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42";
+    sha256 = "0dh2gbzcw8kxy81z4ggsynibnqs56b83vy8qgz7illsag1irff6q";
   };
 
   buildInputs = with stdenv.lib;

From 43f32d2fb83763cf9ac89ee053340dafa2131158 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 09:19:16 -0700
Subject: [PATCH 1334/3253] altcoins.litecoin: 0.16.0 -> 0.16.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/litecoin/versions
---
 pkgs/applications/altcoins/litecoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index ed268e34946f..447ccca93792 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "litecoin-project";
     repo = "litecoin";
     rev = "v${version}";
-    sha256 = "1g79sbplkn2bnb17i2kyh1d64bjl3ihbx83n0xssvjaajn56hbzw";
+    sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From a32d7e0c74465e685c997624b12d1582fda05fd9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham.christensen@target.com>
Date: Thu, 20 Sep 2018 11:40:36 -0400
Subject: [PATCH 1335/3253] dockerTools.buildImage: support impure dates

Because dates are an impurity, by default buildImage will use a static
date of one second past the UNIX Epoch. This can be a bit frustrating
when listing docker images in the CLI:

    $ docker image list
    REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
    hello        latest   08c791c7846e   48 years ago   25.2MB

If you want to trade the purity for a better user experience, you can
set created to now.

    pkgs.dockerTools.buildImage {
      name = "hello";
      tag = "latest";
      created = "now";
      contents = pkgs.hello;

      config.Cmd = [ "/bin/hello" ];
    }

and now the Docker CLI will display a reasonable date and sort the
images as expected:

    $ docker image list
    REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
    hello        latest   de2bf4786de6   About a minute ago   25.2MB
---
 doc/functions.xml                     | 39 +++++++++++++++++++++++++++
 pkgs/build-support/docker/default.nix | 19 ++++++++-----
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 3cfc6884bd26..31b40fb084a3 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -638,6 +638,45 @@ buildImage {
      <literal>pkgs.cacert</literal> to <varname>contents</varname>.
     </para>
    </note>
+
+   <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
+     <title>Impurely Defining a Docker Layer's Creation Date</title>
+     <para>
+       Because dates are an impurity, by default
+       <function>buildImage</function> will use a static date of one
+       second past the UNIX Epoch. This can be a bit frustrating when
+       listing docker images in the CLI:
+     </para>
+     <screen><![CDATA[
+$ docker image list
+REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
+hello        latest   08c791c7846e   48 years ago   25.2MB
+]]></screen>
+     <para>
+       If you want to trade the purity for a better user experience,
+       you can set <literal>created</literal> to
+       <literal>now</literal>.
+     </para>
+     <programlisting><![CDATA[
+pkgs.dockerTools.buildImage {
+  name = "hello";
+  tag = "latest";
+  created = "now";
+  contents = pkgs.hello;
+
+  config.Cmd = [ "/bin/hello" ];
+}
+]]></programlisting>
+     <para>
+       and now the Docker CLI will display a reasonable date and
+       sort the images as expected:
+     </para>
+     <screen><![CDATA[
+$ docker image list
+REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
+hello        latest   de2bf4786de6   About a minute ago   25.2MB
+]]></screen>
+   </example>
   </section>
 
   <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 93b715659eb0..0cee1dd2916f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -450,11 +450,18 @@ rec {
       baseName = baseNameOf name;
 
       # Create a JSON blob of the configuration. Set the date to unix zero.
-      baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
-        inherit created config;
-        architecture = "amd64";
-        os = "linux";
-      });
+      baseJson = let
+          pure = writeText "${baseName}-config.json" (builtins.toJSON {
+            inherit created config;
+            architecture = "amd64";
+            os = "linux";
+          });
+          impure = runCommand "${baseName}-config.json"
+            { buildInputs = [ jq ]; }
+            ''
+               jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
+            '';
+        in if created == "now" then impure else pure;
 
       layer =
         if runAsRoot == null
@@ -577,7 +584,7 @@ rec {
         currentID=$layerID
         while [[ -n "$currentID" ]]; do
           layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1)
-          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .")
+          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .")
           imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
           manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .")
 

From 7d20233dc3320360c47a811e7f7e6c3b5acc9da1 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Thu, 20 Sep 2018 18:22:20 +0200
Subject: [PATCH 1336/3253] mopidy-iris: 3.25.1 -> 3.26.0

---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 482e3652ec09..ab9bfa26d0ab 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.25.1";
+  version = "3.26.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk";
+    sha256 = "0yd52dlm0qh3ycqxhxhiw52111wa87b7wlxbwdj5p9an5yqnkkvy";
   };
 
   propagatedBuildInputs = [

From 0c631248c198ee020cc98f659b0eedfb36a6f010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 20 Sep 2018 13:37:33 -0300
Subject: [PATCH 1337/3253] tint2: 16.4 -> 16.6.1 (#46994)

---
 pkgs/applications/misc/tint2/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 31ccdb3c7f53..c70503cbff2f 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "16.4";
+  version = "16.6.1";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm";
+    sha256 = "1h5bn4vi7gffwi4mpwpn0s6vxvl44rn3m9b23w8q9zyz9v24flz7";
   };
 
   enableParallelBuilding = true;
@@ -24,20 +24,18 @@ stdenv.mkDerivation rec {
     libXdmcp libstartup_notification hicolor-icon-theme ];
 
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace /etc $out/etc
     for f in ./src/launcher/apps-common.c \
-             ./src/launcher/icon-theme-common.c \
-             ./themes/*tint2rc
+             ./src/launcher/icon-theme-common.c
     do
       substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://gitlab.com/o9000/tint2;
     description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
   };
 }

From a454984adb8e6b709f4881774999ebe53d9ed7c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:54:00 -0700
Subject: [PATCH 1338/3253] mediainfo: 18.08 -> 18.08.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mediainfo/versions
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index d222ad1e53e0..69e33fbfc184 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.08";
+  version = "18.08.1";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
+    sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From afa5e20b050822068673480c6f98e783632d10c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:06:10 -0700
Subject: [PATCH 1339/3253] ncmpc: 0.30 -> 0.31

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ncmpc/versions
---
 pkgs/applications/audio/ncmpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index ffd5b9a58582..08d300598232 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ncmpc-${version}";
-  version = "0.30";
+  version = "0.31";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "ncmpc";
     rev    = "v${version}";
-    sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624";
+    sha256 = "09h1m9rkk89729i2d5zsfdc6rxajvikgsi3h99rwz2192gm457rj";
   };
 
   buildInputs = [ glib ncurses mpd_clientlib ];

From 3222fe17569eac373cb9f3ed62a2befb91d29bbc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 04:50:12 -0700
Subject: [PATCH 1340/3253] smcroute: 2.4.1 -> 2.4.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/smcroute/versions
---
 pkgs/servers/smcroute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 241ed17d2a11..75fff3715edc 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z";
+    sha256 = "197bi3il0c1vldw35ijx3zqyfj738nvfvr7yr4cwrbv40p3ascaq";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 31ea743d1387b4af820c593007ab3fb51cc6ca71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:42:53 -0700
Subject: [PATCH 1341/3253] metabase: 0.30.1 -> 0.30.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/metabase/versions
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index ac6dd44a8441..2e1cba52ee54 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.30.1";
+  version = "0.30.3";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "13035yhbhsr4xg48hanbf8qchwyk6j59c90qkbjr914xcyvj6scc";
+    sha256 = "1w8886xkg88r8dla4l9kpxw2rwwjx23y1dk5rgfgh1vcw8da8cn4";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ae093d7d9b2d6030af8624fdc57177796dfb02a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:37:00 -0700
Subject: [PATCH 1342/3253] libre: 0.5.8 -> 0.5.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libre/versions
---
 pkgs/development/libraries/libre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index c996c5c25f94..50b485c4822c 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.5.8";
+  version = "0.5.9";
   name = "libre-${version}";
   src = fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0w0f8j43j0nzgvkmv3ayzrssppgjmsh6z8mpa5iqsz8nv99dc3qr";
+    sha256 = "04lnnlhifzyhv231abgnzvfzq21xhsal3lnimncp1q3pmrfa0aw8";
   };
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]

From aedc651903e3b20514c2fda056ff0bc9124b4d5d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 20 Sep 2018 13:02:22 -0400
Subject: [PATCH 1343/3253] dockerTools.buildImage: test that created=now makes
 an unstable date

---
 nixos/tests/docker-tools.nix           | 7 +++++++
 pkgs/build-support/docker/examples.nix | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index db4eacc37287..5a7590cbf364 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -20,7 +20,10 @@ import ./make-test.nix ({ pkgs, ... }: {
     ''
       $docker->waitForUnit("sockets.target");
 
+      # Ensure Docker images use a stable date by default
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
+      $docker->succeed("[ '1970-01-01T00:00:01Z' = \"\$(docker inspect ${pkgs.dockerTools.examples.bash.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
+
       $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version");
       $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
 
@@ -51,5 +54,9 @@ import ./make-test.nix ({ pkgs, ... }: {
       $docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
       $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
       $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
+
+      # Ensure Docker images can use an unstable date
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
+      $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
     '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index ec2667310cdd..822e0dbb31f2 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -141,4 +141,13 @@ rec {
     runAsRoot = ''echo "(runAsRoot)" > runAsRoot'';
     extraCommands = ''echo "(extraCommand)" > extraCommands'';
   };
+
+  # 9. Ensure that setting created to now results in a date which
+  # isn't the epoch + 1
+  unstableDate = pkgs.dockerTools.buildImage {
+    name = "unstable-date";
+    tag = "latest";
+    contents = [ pkgs.coreutils ];
+    created = "now";
+  };
 }

From 273501303cb1844f512c9b4ac428f14a2c69a040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 20 Sep 2018 14:11:26 -0300
Subject: [PATCH 1344/3253] numix-icon-theme-circle: 18-08-17 -> 18.09.19

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 68b967e715d4..ebda6d4428c1 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
 
 stdenv.mkDerivation rec {
-  version = "18.08.17";
+  version = "18.09.19";
 
   package-name = "numix-icon-theme-circle";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "1nxgm5vf2rzbg8qh48iy0vdj12ffahlp9qhj8h0k1li03s3nf15h";
+    sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];

From 06daa1bb7a87c4540693dbe2b0cf4754292c42bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 20 Sep 2018 14:16:53 -0300
Subject: [PATCH 1345/3253] numix-icon-theme-square: 18-08-17 -> 18.09.19

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index ec6972c4cac7..03c1ba0f827a 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "numix-icon-theme-square";
-  version = "18.08.17";
+  version = "18.09.19";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8";
+    sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];

From 86b1f5c71098cf37fbdefafc5cb174e6cae899ea Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 19:32:36 +0200
Subject: [PATCH 1346/3253] nethack: enable cross-compilation

also parallel building
---
 pkgs/games/nethack/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index be522b2bacf4..56342728b40f 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
 , less, makeWrapper
+, buildPackages
 , x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
 }:
 
@@ -72,6 +73,12 @@ in stdenv.mkDerivation rec {
         -DCOMPRESS_EXTENSION=\\".gz\\",' \
       -i sys/unix/hints/linux-qt4
     ''}
+    ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    ${buildPackages.perl}/bin/perl -p \
+      -e 's,[a-z./]+/(makedefs|dgn_comp|lev_comp|dlb)(?!\.),${buildPackages.nethack}/libexec/nethack/\1,g' \
+      -i sys/unix/Makefile.*
+    ''}
+    sed -i -e '/rm -f $(MAKEDEFS)/d' sys/unix/Makefile.src
   '';
 
   configurePhase = ''
@@ -82,6 +89,8 @@ in stdenv.mkDerivation rec {
     popd
   '';
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     mkdir -p $out/games/lib/nethackuserdir
     for i in xlogfile logfile perm record save; do
@@ -118,6 +127,7 @@ in stdenv.mkDerivation rec {
     chmod +x $out/bin/nethack
     ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"}
     ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"}
+    install -Dm 555 util/{makedefs,dgn_comp,lev_comp,dlb} -t $out/libexec/nethack/
   '';
 
   postFixup = lib.optionalString qtMode ''

From 8e3ec2b18bea1c3c26732ca9af5340d35b98ade3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 10:35:30 -0700
Subject: [PATCH 1347/3253] lnav: 0.8.3 -> 0.8.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lnav/versions
---
 pkgs/tools/misc/lnav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix
index 4d7c27a39445..85e4ecd3229b 100644
--- a/pkgs/tools/misc/lnav/default.nix
+++ b/pkgs/tools/misc/lnav/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "tstack";
     repo = "lnav";
     rev = "v${meta.version}";
-    sha256 = "0hq9ri6a18z682gihxlbh1rndka0v6brkdqsyfsgh4c2fgib4fb7";
+    sha256 = "0wzzny0sgrq1ga9qw9nr8ly4j3vy4agszma73902dsw2rwf17j6y";
     inherit name;
   };
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/tstack/lnav/releases";
     license = licenses.bsd2;
-    version = "0.8.3";
+    version = "0.8.4";
     maintainers = [ maintainers.dochang ];
     platforms = platforms.unix;
   };

From aec67d299c24d0bfff6f5ae04b5c462f3d3138d9 Mon Sep 17 00:00:00 2001
From: John Children <32305209+johnchildren@users.noreply.github.com>
Date: Thu, 20 Sep 2018 18:45:54 +0100
Subject: [PATCH 1348/3253] doc/stdenv: libaries -> libraries (#47011)

This commit corrects a minor typo in the stdenv portion of the
documentation for the nix language.
---
 doc/stdenv.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7a0f8f270bad..cc0c13c54471 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -2129,7 +2129,7 @@ someVar=$(stripHash $name)
    The most typical use of the setup hook is actually to add other hooks which
    are then run (i.e. after all the setup hooks) on each dependency. For
    example, the C compiler wrapper's setup hook feeds itself flags for each
-   dependency that contains relevant libaries and headers. This is done by
+   dependency that contains relevant libraries and headers. This is done by
    defining a bash function, and appending its name to one of
    <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`,
    <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`,

From c9728a4dcfdcb48be27709cfd64b702525b5bab1 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 18:47:13 +0100
Subject: [PATCH 1349/3253] nethack: document cross-compilation fix

---
 pkgs/games/nethack/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 56342728b40f..6f60f8d0c1cb 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -73,7 +73,11 @@ in stdenv.mkDerivation rec {
         -DCOMPRESS_EXTENSION=\\".gz\\",' \
       -i sys/unix/hints/linux-qt4
     ''}
-    ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    ${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
+    # If we're cross-compiling, replace the paths to the data generation tools
+    # with the ones from the build platform's nethack package, since we can't
+    # run the ones we've built here.
+    ''
     ${buildPackages.perl}/bin/perl -p \
       -e 's,[a-z./]+/(makedefs|dgn_comp|lev_comp|dlb)(?!\.),${buildPackages.nethack}/libexec/nethack/\1,g' \
       -i sys/unix/Makefile.*

From ec42304022d1df0e2091c1c63225f12fd25380a2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 20:01:36 +0200
Subject: [PATCH 1350/3253] nethack: add bdftopcf for GUIs

---
 pkgs/games/nethack/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 6f60f8d0c1cb..c1911a84c81a 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, coreutils, ncurses, gzip, flex, bison
 , less, makeWrapper
 , buildPackages
-, x11Mode ? false, qtMode ? false, libXaw, libXext, mkfontdir, pkgconfig, qt5
+, x11Mode ? false, qtMode ? false, libXaw, libXext, bdftopcf, mkfontdir, pkgconfig, qt5
 }:
 
 let
@@ -34,10 +34,11 @@ in stdenv.mkDerivation rec {
                 ++ lib.optionals qtMode [ gzip qt5.qtbase.bin qt5.qtmultimedia.bin ];
 
   nativeBuildInputs = [ flex bison ]
-                      ++ lib.optionals x11Mode [ mkfontdir ]
+                      ++ lib.optionals x11Mode [ mkfontdir bdftopcf ]
                       ++ lib.optionals qtMode [
                            pkgconfig mkfontdir qt5.qtbase.dev
                            qt5.qtmultimedia.dev makeWrapper
+                           bdftopcf
                          ];
 
   makeFlags = [ "PREFIX=$(out)" ];

From 6776bc76783cda0d83c345ef4b9423543886d79c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 20:01:53 +0200
Subject: [PATCH 1351/3253] nethack: only install dlb for text-mode

---
 pkgs/games/nethack/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index c1911a84c81a..56904ae2dfe1 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -132,7 +132,8 @@ in stdenv.mkDerivation rec {
     chmod +x $out/bin/nethack
     ${lib.optionalString x11Mode "mv $out/bin/nethack $out/bin/nethack-x11"}
     ${lib.optionalString qtMode "mv $out/bin/nethack $out/bin/nethack-qt"}
-    install -Dm 555 util/{makedefs,dgn_comp,lev_comp,dlb} -t $out/libexec/nethack/
+    install -Dm 555 util/{makedefs,dgn_comp,lev_comp} -t $out/libexec/nethack/
+    ${lib.optionalString (!(x11Mode || qtMode)) "install -Dm 555 util/dlb -t $out/libexec/nethack/"}
   '';
 
   postFixup = lib.optionalString qtMode ''

From 3d3b66606cdd5360a436b3aad1692f7f6b4fd968 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 11:44:41 -0700
Subject: [PATCH 1352/3253] ioping: 1.0 -> 1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ioping/versions
---
 pkgs/tools/system/ioping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 92235fde8f35..22dd9289bfd4 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ioping-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "koct9i";
     repo = "ioping";
     rev = "v${version}";
-    sha256 = "0yn7wgd6sd39zmr5l97zd6sq1ah7l49k1h7dhgx0nv96fa4r2y9h";
+    sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq";
   };
 
   makeFlags = "PREFIX=$(out)";

From fbf8d45b5c632b46389d605623af603d48ce66d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 12:08:22 -0700
Subject: [PATCH 1353/3253] jdupes: 1.10.2 -> 1.10.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jdupes/versions
---
 pkgs/tools/misc/jdupes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index bf5e04a511f7..700977d6d6d8 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jdupes-${version}";
-  version = "1.10.2";
+  version = "1.10.4";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "0msp68h1gaipwpvdylpwd6w9al5gcmawj9cmvi7nw8ihh184g3m7";
+    sha256 = "06fhkw4gkv702k72k71yii3gv1mgdymy4irq30a58iyyakbbcfy8";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.

From ce03af969e584a199d7305c737ea1f6df5bf9d67 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Thu, 20 Sep 2018 19:18:28 +0000
Subject: [PATCH 1354/3253] =?UTF-8?q?ocaml=20=E2=89=A4=204.05:=20mark=20as?=
 =?UTF-8?q?=20broken=20on=20Aarch64=20(#47010)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index d2295d2d79b0..1ed6d2c6db22 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation (args // rec {
       '';
 
     platforms = with platforms; linux ++ darwin;
-    broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06";
+    broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06";
   };
 
 })

From e40d850fd13cdb8daab7745bc15631e737c1b1a0 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 20 Sep 2018 21:29:37 +0200
Subject: [PATCH 1355/3253] nixos/tests/gdk-pixbuf: fix test on i686 (#46916)

Test didn't run because it tried to create a VM with 4096M RAM
but qemu-system-i386 has a hard 2047M memory limit.
- reduce memory to 2047M on i686.
- increase timeout 300s -> 1800s because the tests are much slower
  on i686 and timed out.
---
 nixos/tests/gdk-pixbuf.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
index b20f61b5ffe2..005c5111da2b 100644
--- a/nixos/tests/gdk-pixbuf.nix
+++ b/nixos/tests/gdk-pixbuf.nix
@@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: {
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
     environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
 
-    virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
+    # Tests allocate a lot of memory trying to exploit a CVE
+    # but qemu-system-i386 has a 2047M memory limit
+    virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
   };
 
   testScript = ''
-    $machine->succeed("gnome-desktop-testing-runner");
+    $machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s
   '';
 })

From 730eb9f5f2b7886efb09f86225a942925baa038c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 12:30:18 -0700
Subject: [PATCH 1356/3253] jmol: 14.29.19 -> 14.29.22

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jmol/versions
---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 80415189d457..b89b28ed0479 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,7 +17,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.29.19";
+  version = "14.29.22";
   pname = "jmol";
   name = "${pname}-${version}";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5";
+    sha256 = "1wnrrn2wza9z6bp5axg191qf32sx4q8fj4xz404zp278rc4i2fpv";
   };
 
   patchPhase = ''

From 08815b9af892fcd8dd28a3fdf8eaa921f0797063 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Sep 2018 04:19:56 -0500
Subject: [PATCH 1357/3253] perlPackages.Mojolicious: 7.88 -> 8.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 714dba45aa2f..1497146c7322 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9989,16 +9989,20 @@ let
       license = stdenv.lib.licenses.asl20;
     };
   };
+
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-7.88";
+    name = "Mojolicious-8.0";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785";
+      sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
     };
+    buildInputs = [ ExtUtilsMakeMaker ];
+    propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];
     meta = {
-      homepage = https://mojolicious.org/;
+      homepage = https://mojolicious.org;
       description = "Real-time web framework";
-      license = with stdenv.lib.licenses; [ artistic2 ];
+      license = stdenv.lib.licenses.artistic2;
+      maintainers = [ maintainers.thoughtpolice ];
     };
   };
 

From 0214f9e25e832b4d9d6bbcbf74d75b087b9ee7bc Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 20 Sep 2018 04:20:16 -0500
Subject: [PATCH 1358/3253] perlPackages.MojoIOLoopForkCall: 0.19 -> 0.20

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1497146c7322..f2d2da0cc6ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10007,10 +10007,10 @@ let
   };
 
   MojoIOLoopForkCall = buildPerlModule rec {
-    name = "Mojo-IOLoop-ForkCall-0.19";
+    name = "Mojo-IOLoop-ForkCall-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
-      sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62";
+      sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b";
     };
     propagatedBuildInputs = [ IOPipely Mojolicious ];
     meta = {

From f6bc086b212b5aa11c47d5bb57082aa89baeb15e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 20 Sep 2018 22:14:30 +0200
Subject: [PATCH 1359/3253] dolphinEmuMaster: mark broken on darwin

The default version isn't enabled on darwin either, however it did work
at some point.

    /tmp/nix-build-dolphin-emu-2018-08-17.drv-0/source/Source/Core/Core/NetPlayServer.cpp:1180:26: error: unknown type name 'lzo_uint32_t'; did you mean 'lzo_uint32'?
      std::vector<u8> wrkmem(LZO1X_1_MEM_COMPRESS);

/cc ZHF #45961
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 140e199908ce..05b75312646d 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -78,6 +78,7 @@ in stdenv.mkDerivation rec {
     branch = "master";
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
+    broken = stdenv.isDarwin;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 709a828e713b028a3dc5e9de9ed1711a405d010b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 20 Sep 2018 22:19:56 +0200
Subject: [PATCH 1360/3253] dico: mark linux only.

Never built successfully.

    Undefined symbols for architecture x86_64:
      "_rpl_strerror", referenced from:
          _default_print_diag in libgrecs.a(diag.o)
          _grecs_symtab_strerror in libgrecs.a(symtab.o)
          _parse_inet in libgrecs.a(sockaddr.o)
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961
---
 pkgs/servers/dico/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index 4fa28a61829f..76a3f51caa2e 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage    = http://www.gnu.org/software/dico/;
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.unix;
+    platforms   = platforms.linux;
 
     longDescription = ''
       GNU Dico is a flexible modular implementation of DICT server

From 33f818198b5f22afe22e95672e3aff5d03280e5a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 20 Sep 2018 22:22:53 +0200
Subject: [PATCH 1361/3253] docker-proxy: mark linux only

Unlike docker (cli only) this probably won't work on darwin.

    github.com/docker/libnetwork/networkdb
    can't load package: package github.com/docker/libnetwork/ns: build constraints exclude all Go files in /private/tmp/nix-build-docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.drv-0/go/src/github.com/docker/libnetwork/ns

/cc ZHF #45961
---
 pkgs/applications/virtualization/docker/proxy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix
index 651631b478fc..8b7021f7dbb8 100644
--- a/pkgs/applications/virtualization/docker/proxy.nix
+++ b/pkgs/applications/virtualization/docker/proxy.nix
@@ -24,6 +24,6 @@ buildGoPackage rec {
     license = licenses.asl20;
     homepage = https://github.com/docker/libnetwork;
     maintainers = with maintainers; [vdemeester];
-    platforms = docker.meta.platforms;
+    platforms = platforms.linux;
   };
 }

From c2056d25ddd9d9526d4bcf69a8f248a95f0c37ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 13:24:59 -0700
Subject: [PATCH 1362/3253] gpodder: 3.10.3 -> 3.10.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gpodder/versions
---
 pkgs/applications/audio/gpodder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 1ada45e62925..ccd20a6b7b2b 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -5,14 +5,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gpodder";
-  version = "3.10.3";
+  version = "3.10.5";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "gpodder";
     rev = version;
-    sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l";
+    sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw";
   };
 
   postPatch = with stdenv.lib; ''

From fd7bf0460d12dc06a144e2d0e200a31fe15eccff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 13:54:53 -0700
Subject: [PATCH 1363/3253] fwupd: 1.1.1 -> 1.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fwupd/versions
---
 pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index e29dd2e6ee53..eabb27f6ae2f 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -7,7 +7,7 @@
 }:
 let
   # Updating? Keep $out/etc synchronized with passthru.filesInstalledToEtc
-  version = "1.1.1";
+  version = "1.1.2";
   python = python3.withPackages (p: with p; [ pygobject3 pycairo pillow ]);
   installedTestsPython = python3.withPackages (p: with p; [ pygobject3 requests ]);
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
   name = "fwupd-${version}";
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "0szakfnp6pl8vv3ivb40p5j8pxapfp724a55s2dr1qzzdlbjd08s";
+    sha256 = "1qhg8h1dv9k3i0429j0wl37rpxfbahggfd1j8s7a4cw83k42cgfs";
   };
 
   outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ];

From 98a4afc505647658f41f3d1c2c0a1b35b0ddf3bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 14:29:34 -0700
Subject: [PATCH 1364/3253] geos: 3.6.3 -> 3.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/geos/versions
---
 pkgs/development/libraries/geos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index c1b4c88aa479..2417af3dbfd8 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "geos-3.6.3";
+  name = "geos-3.7.0";
 
   src = fetchurl {
     url = "https://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb";
+    sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg";
   };
 
   enableParallelBuilding = true;

From dd33a9dc0b993b6ac8875a74cfe48b9133cb9fe9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 14:31:57 -0700
Subject: [PATCH 1365/3253] firejail: 0.9.54 -> 0.9.56

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/firejail/versions
---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 9f2374e75a88..568e474f444a 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.54";
+    version="0.9.56";
     name="${baseName}-${version}";
-    hash="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
-    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.54.tar.xz";
-    sha256="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
+    hash="0b9ig0a91i19sfm94a6yl510pm4dlidmani3fsnb7vh0qy3l9121";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.56.tar.xz";
+    sha256="0b9ig0a91i19sfm94a6yl510pm4dlidmani3fsnb7vh0qy3l9121";
   };
   buildInputs = [
     which

From 6587910e4f02e754ecbabcd8d9778a824b0f2c86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 14:46:26 -0700
Subject: [PATCH 1366/3253] eudev: 3.2.5 -> 3.2.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eudev/versions
---
 pkgs/os-specific/linux/eudev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix
index 0ca85c7e50bc..771f012c2c21 100644
--- a/pkgs/os-specific/linux/eudev/default.nix
+++ b/pkgs/os-specific/linux/eudev/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="eudev";
-    version = "3.2.5";
+    version = "3.2.6";
     name="${baseName}-${version}";
     url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz";
-    sha256 = "1bwh72brp4dvr2dm6ng0lflic6abl87h8zk209im5lna0m0x1hj9";
+    sha256 = "1qdpnvsv3qqwy6jl4i4b1dn212y6nvawpaladb7plfping9p2n46";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1c40a3eb05e434ddcafb40c48c5d7c2bc5645648 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 20 Sep 2018 23:54:11 +0200
Subject: [PATCH 1367/3253] circleci-cli: 0.1.0 -> 0.1.2307 (#46983)

* circleci-cli: 0.1.0 -> 0.1.2307

We are also building from source now, instead of using a pre-packaged
version. This means we need Go. Also did minor refactors.

* circleci-cli: removed unneeded dependencies
---
 .../tools/misc/circleci-cli/default.nix       | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 62c7cf3d8774..cc062eca932e 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,28 +1,22 @@
-{ stdenv, fetchFromGitHub, docker, makeWrapper }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+let
+  owner = "CircleCI-Public";
   pname = "circleci-cli";
-  version = "0.1.0";
+  version = "0.1.2307";
+in
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  inherit version;
 
-  src = fetchFromGitHub {
-    owner = "circleci";
-    repo = "local-cli";
+  src =  fetchFromGitHub {
+    inherit owner;
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2";
+    sha256 = "0z71jnq42idvhgpgn3mdpbajmgn4b41rpifv5qxn3h1pgi08f75s";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p "$out/bin/"
-    cp "$src/circleci.sh" "$out/bin/circleci"
-  '';
-
-  postFixup = ''
-    wrapProgram $out/bin/circleci \
-      --prefix "PATH" : "${docker}/bin"
-  '';
+  goPackagePath = "github.com/${owner}/${pname}";
 
   meta = with stdenv.lib; {
     # Box blurb edited from the AUR package circleci-cli

From 74cd060c86982edf574fbac54a51c5305d2aeda1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 14:55:54 -0700
Subject: [PATCH 1368/3253] praat: 6.0.42 -> 6.0.43 (#46974)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/praat/versions
---
 pkgs/applications/audio/praat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index d322553fdaad..5db5035c8352 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "praat-${version}";
-  version = "6.0.42";
+  version = "6.0.43";
 
   src = fetchurl {
     url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
-    sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv";
+    sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf";
   };
 
   configurePhase = ''

From 9c02914b426d4770ddbe24c5551f5a42659bc50f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 21 Sep 2018 00:18:13 +0200
Subject: [PATCH 1369/3253] pythonPackages.circus: fix build, add meta (#47066)

---
 .../python-modules/circus/default.nix         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix
index 0a82238b703e..a4f96ccaf68e 100644
--- a/pkgs/development/python-modules/circus/default.nix
+++ b/pkgs/development/python-modules/circus/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi
 , iowait, psutil, pyzmq, tornado, mock }:
 
 buildPythonPackage rec {
@@ -10,7 +10,22 @@ buildPythonPackage rec {
     sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b";
   };
 
+  postPatch = ''
+    # relax version restrictions to fix build
+    substituteInPlace setup.py \
+      --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" \
+      --replace "tornado>=3.0,<5.0" "tornado>=3.0"
+  '';
+
+  checkInputs = [ mock ];
+
   doCheck = false; # weird error
 
-  propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ];
+  propagatedBuildInputs = [ iowait psutil pyzmq tornado ];
+
+  meta = with stdenv.lib; {
+    description = "A process and socket manager";
+    homepage = "https://github.circus.com/circus-tent/circus";
+    license = licenses.asl20;
+  };
 }

From 2c5ae2ae61170db868279998a88876b2abb28f72 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 21 Sep 2018 00:19:01 +0200
Subject: [PATCH 1370/3253] liquidwar: fix build (#47064)

- add missing dependencies readline and libtool that used to be
  propagated by guile but aren't anymore
- build with guile 2.0 instead of 1.8
---
 pkgs/games/liquidwar/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 53556b8cd914..1ff1f96b5a23 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -2,7 +2,7 @@
 , gmp, libGLU_combined, libjpeg, libpng
 , expat, gettext, perl, guile
 , SDL, SDL_image, SDL_mixer, SDL_ttf
-, curl, sqlite
+, curl, sqlite, libtool, readline
 , libogg, libvorbis, libcaca, csound, cunit } :
 
 stdenv.mkDerivation rec {
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     curl sqlite
     libogg libvorbis csound
     libXrender libcaca cunit
+    libtool readline
   ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef4ccb202aa1..5a0b0956d759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20030,7 +20030,7 @@ with pkgs;
   };
 
   liquidwar = callPackage ../games/liquidwar {
-    guile = guile_1_8;
+    guile = guile_2_0;
   };
 
   liquidwar5 = callPackage ../games/liquidwar/5.nix {

From fab901ddd3d034c53901c640d9787c0794d1bcad Mon Sep 17 00:00:00 2001
From: roconnor <roconnor@theorem.ca>
Date: Thu, 20 Sep 2018 18:35:39 -0400
Subject: [PATCH 1371/3253] bitcoin: 0.16.2 -> 0.16.3 (#46891)

---
 pkgs/applications/altcoins/bitcoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 24bc3875dd5e..878cb6064e8c 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchurl {
     urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
              "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r";
+    sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 4d3575973553ee1997ad1d7690af446cfba79dc6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 15:49:51 -0700
Subject: [PATCH 1372/3253] feh: 2.27.1 -> 2.28 (#47055)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/feh/versions
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index f10916bcd631..bbc533d37e84 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.27.1";
+  version = "2.28";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf";
+    sha256 = "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk";
   };
 
   outputs = [ "out" "man" "doc" ];

From 46f6a69e49550c405e9ab7914d5ac235cfcfe663 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 15:57:18 -0700
Subject: [PATCH 1373/3253] you-get: 0.4.1128 -> 0.4.1148 (#46928)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/you-get/versions
---
 pkgs/tools/misc/you-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 5254d1091680..6a56d23f7490 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1128";
+  version = "0.4.1148";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i0wspmgblxwvvbm3q8zz4l450fs3bccqxxfm0ysfgprgcy8fp3l";
+    sha256 = "1ypgqaxf5qn5b3c2n4hcsiixyvvpvmpx5gny523cd5igb7h0yja5";
   };
 
   meta = with stdenv.lib; {

From 85f60cbeb0a6ff14248f291a21047459cd6f6890 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 16:03:24 -0700
Subject: [PATCH 1374/3253] libwebsockets: 3.0.0 -> 3.0.1 (#47020)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libwebsockets/versions
---
 pkgs/development/libraries/libwebsockets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 9cd0aabcf097..8c0db4a7396f 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libwebsockets-${version}";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
     rev = "v${version}";
-    sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv";
+    sha256 = "1x3qrz2hqsrv2lg0y9irdx37c8r9j9vf9mwzgw61znzvk6hc9ymq";
   };
 
   buildInputs = [ cmake openssl zlib libuv ];

From 5e7b7b805aed412fad6939ad6829f3ff77f64a38 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 01:17:41 +0200
Subject: [PATCH 1375/3253] nixos/tests/ferm: disable dhcpcd

The test failed in one run on Hydra, logs look like
dhcpcd changed ipv6 routing at just the wrong time.
Disable dhcpcd. It's not needed, the test uses static IPs anyway.
---
 nixos/tests/ferm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 24b74df85ad1..b8e8663e3ad2 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         with pkgs.lib;
         {
           networking = {
+            dhcpcd.enable = false;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
           };
@@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         with pkgs.lib;
         {
           networking = {
+            dhcpcd.enable = false;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
           };
@@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     ''
       startAll;
 
-      $client->waitForUnit("network.target");
+      $client->waitForUnit("network-online.target");
       $server->waitForUnit("ferm.service");
       $server->waitForUnit("nginx.service");
       $server->waitUntilSucceeds("ss -ntl | grep -q 80");

From 73dbb11a0da27ece505639a5b2d11aba18ec8b27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 16:41:18 -0700
Subject: [PATCH 1376/3253] debootstrap: 1.0.108 -> 1.0.109

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 4e8eb0411d1a..bb4302d8aaec 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.108";
+  version = "1.0.109";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1zfp6i6mskgx3b186sbd1443031h9z01yfqgynhl848faknv4h9f";
+    sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw";
   };
 
   buildInputs = [ dpkg gettext gawk perl wget ];

From 39d85a2e0fc46005d82f561b2f84ea44f0a74375 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 16:43:32 -0700
Subject: [PATCH 1377/3253] double-conversion: 3.0.0 -> 3.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/double-conversion/versions
---
 pkgs/development/libraries/double-conversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 7a33559cbc79..96375fcd5beb 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
-  version = "3.0.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz";
+    sha256 = "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx";
   };
 
   nativeBuildInputs = [ cmake ];

From ce6debe9006544ab39ee25e7106d9726c37b928e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:11:15 -0700
Subject: [PATCH 1378/3253] elisa: 0.2.1 -> 0.2.80

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/elisa/versions
---
 pkgs/applications/audio/elisa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
index 90ea4c58ea4a..2d35ebb41aee 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   name = "elisa-${version}";
-  version = "0.2.1";
+  version = "0.2.80";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "elisa";
     rev    = "v${version}";
-    sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w";
+    sha256 = "0wc2kkp28gp1rfgg14a769lalwd44yz7jxkrzanh91v5j2kkln07";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

From 7736337916538aab67a00739c53b8434da773a3b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 20 Sep 2018 20:23:04 -0400
Subject: [PATCH 1379/3253] Clarfy the binary reproducibility problems of
 created=now with dockerTools.buildImage.

---
 doc/functions.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 31b40fb084a3..0c0d82b0342c 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -642,10 +642,12 @@ buildImage {
    <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
      <title>Impurely Defining a Docker Layer's Creation Date</title>
      <para>
-       Because dates are an impurity, by default
-       <function>buildImage</function> will use a static date of one
-       second past the UNIX Epoch. This can be a bit frustrating when
-       listing docker images in the CLI:
+       By default <function>buildImage</function> will use a static
+       date of one second past the UNIX Epoch. This allows
+       <function>buildImage</function> to produce binary reproducible
+       images. When listing images with <command>docker list
+       images</command>, the newly created images will be listed like
+       this:
      </para>
      <screen><![CDATA[
 $ docker image list
@@ -653,9 +655,9 @@ REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
 hello        latest   08c791c7846e   48 years ago   25.2MB
 ]]></screen>
      <para>
-       If you want to trade the purity for a better user experience,
-       you can set <literal>created</literal> to
-       <literal>now</literal>.
+       You can break binary reproducibility but have a sorted,
+       meaningful <literal>CREATED</literal> column by setting
+       <literal>created</literal> to <literal>now</literal>.
      </para>
      <programlisting><![CDATA[
 pkgs.dockerTools.buildImage {
@@ -670,12 +672,13 @@ pkgs.dockerTools.buildImage {
      <para>
        and now the Docker CLI will display a reasonable date and
        sort the images as expected:
-     </para>
-     <screen><![CDATA[
+       <screen><![CDATA[
 $ docker image list
 REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
 hello        latest   de2bf4786de6   About a minute ago   25.2MB
 ]]></screen>
+       however, the produced images will not be binary reproducible.
+     </para>
    </example>
   </section>
 

From dc47fdabc691a8a240d60fdc4a450587984b49fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:28:49 -0700
Subject: [PATCH 1380/3253] dmidecode: 3.1 -> 3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dmidecode/versions
---
 pkgs/os-specific/linux/dmidecode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 0216e48d58f5..49163cc8b790 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dmidecode-3.1";
+  name = "dmidecode-3.2";
 
   src = fetchurl {
     url = "mirror://savannah/dmidecode/${name}.tar.xz";
-    sha256 = "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp";
+    sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07";
   };
 
   makeFlags = "prefix=$(out)";

From ffb7ad6caa85eb1a8b1fd58bb3f5067be8ef2af5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:35:26 -0700
Subject: [PATCH 1381/3253] cgal: 4.12 -> 4.12.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cgal/versions
---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 23a539491d0e..0de1e35440b9 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.12";
+  version = "4.12.1";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn";
+    sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;

From f5fb4283d4c690cfe7938368773f7db729b65398 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:39:37 -0700
Subject: [PATCH 1382/3253] afflib: 3.7.16 -> 3.7.17

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/afflib/versions
---
 pkgs/development/libraries/afflib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index a1c466605228..5ccb7f95ee19 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.16";
+  version = "3.7.17";
   name = "afflib-${version}";
 
   src = fetchFromGitHub {
     owner = "sshock";
     repo = "AFFLIBv3";
     rev = "v${version}";
-    sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6";
+    sha256 = "11q20n6p5nvwmd9wwk0addlfxpxagf47ly89scn3jvc7k484ksan";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From dcf5c4910e1e82973eed4801f09949920999e019 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:48:47 -0700
Subject: [PATCH 1383/3253] apr: 1.6.3 -> 1.6.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apr/versions
---
 pkgs/development/libraries/apr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 705f61445b59..8c31c89947cd 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.6.3";
+  name = "apr-1.6.5";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk";
+    sha256 = "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];

From 8cf1f60fa3c15fd249ffaa9c55dce626e114f636 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:53:28 -0700
Subject: [PATCH 1384/3253] ammonite: 1.2.0 -> 1.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ammonite/versions
---
 pkgs/development/tools/ammonite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 0e98d63fdd3e..7544958cb314 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -5,12 +5,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "08kh4j9jsg3c3ks9q5f01i13d1ak701vjviy5wb3y6xsajg62nfj";
+    sha256 = "096xychdq1pmyjfv4cv4pvm29dk539rxpq3iaz9rpznp01af4mjf";
   };
 
   propagatedBuildInputs = [ jre ] ;

From fa693e95f4f9c890d4aa56b5133466b648066f95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:55:55 -0700
Subject: [PATCH 1385/3253] burp: 2.1.32 -> 2.2.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/burp/versions
---
 pkgs/tools/backup/burp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 4133478dbf98..3ef6be79531b 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "burp-${version}";
-  version = "2.1.32";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "grke";
     repo = "burp";
     rev = version;
-    sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5";
+    sha256 = "0y63z1vcm5h7s0q5lv94gpdqnfgi2qb0g0h81idai5p0yqw09v8h";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From eeeeacc9a61d44ada034e5eec72487fbbe10744f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 20 Sep 2018 23:43:53 -0400
Subject: [PATCH 1386/3253] Revert "stdenv/darwin: bump bootstrap tools"

This accidentally added some unwanted dependencies on the bootstrap
tools, and I don't have time to fix before I go on vacation, so I'm
backing it out until I have time to address it properly.

This reverts commit dc5c68a7bb03e8807f8ab8ad30e5eb11d1f29302.
---
 pkgs/stdenv/darwin/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index a08ea3b34bac..c361ae6e4021 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -4,15 +4,15 @@
 # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
 , bootstrapFiles ? let
   fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/a257d64f333caa50facc57c0e3fc6a64620ed348/${file}";
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/d5bdfcbfe6346761a332918a267e82799ec954d2/${file}";
     inherit (localSystem) system;
     inherit sha256 executable;
   }; in {
-    sh      = fetch { file = "sh";    sha256 = "0a8q8sdqwvs5kn9ia6rkmr36xa5y6g44a9nww5kxbyvsvwmw22y6"; };
-    bzip2   = fetch { file = "bzip2"; sha256 = "0j256wrz1a5d21800h6k8cr20bka6fhpb47qig01n2mc0bc3db2m"; };
-    mkdir   = fetch { file = "mkdir"; sha256 = "1rqzhcc0rccnck31a728j8va4xw54r17k4d58c5bi5z8hjz4458f"; };
-    cpio    = fetch { file = "cpio";  sha256 = "1680lxhqfldsvg9as19xv34kjpka6vn3nm9d91w0rh90sbqpa610"; };
-    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "0cvwj6q16f6b2q6lx43lly1a8dwkxpvck2946qln2fmcmgin3rpq"; executable = false; };
+    sh      = fetch { file = "sh";    sha256 = "07wm33f1yzfpcd3rh42f8g096k4cvv7g65p968j28agzmm2s7s8m"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "0y9ri2aprkrp2dkzm6229l0mw4rxr2jy7vvh3d8mxv2698v2kdbm"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "0sb07xpy66ws6f2jfnpjibyimzb71al8n8c6y4nr8h50al3g90nr"; };
+    cpio    = fetch { file = "cpio";  sha256 = "0r5c54hg678w7zydx27bzl9p3v9fs25y5ix6vdfi1ilqim7xh65n"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "18hp5w6klr8g307ap4368r255qpzg9r0vwg9vqvj8f2zy1xilcjf"; executable = false; };
   }
 }:
 

From 6974f982451752b269e814ed5ff114ad4a096020 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 20:58:14 -0500
Subject: [PATCH 1387/3253] netbsd 7.1.2 -> 8.0

---
 pkgs/os-specific/bsd/netbsd/default.nix | 76 ++++++++++++-------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 2d1909547b61..e4d9fbea1e3b 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -133,7 +133,7 @@ let
   makeMinimal = netBSDDerivation rec {
     path = "tools/make";
     sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb";
-    version = "7.1.2";
+    version = "8.0";
 
     buildInputs = [];
     nativeBuildInputs = [];
@@ -165,7 +165,7 @@ let
   compat = netBSDDerivation rec {
     path = "tools/compat";
     sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
-    version = "7.1.2";
+    version = "8.0";
 
     setupHooks = [
       ../../../build-support/setup-hooks/role.bash
@@ -222,9 +222,9 @@ let
       find $out -type d -empty -delete
     '';
     extraPaths = [ libc.src libutil.src
-      (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")
-      (fetchNetBSD "external/bsd/flex" "7.1.2" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq")
-      (fetchNetBSD "sys/sys" "7.1.2" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93")
+      (fetchNetBSD "include" "8.0" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")
+      (fetchNetBSD "external/bsd/flex" "8.0" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq")
+      (fetchNetBSD "sys/sys" "8.0" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93")
     ] ++ libutil.extraPaths ++ libc.extraPaths;
   };
 
@@ -237,7 +237,7 @@ let
     xinstall "$@"
   ''; in netBSDDerivation {
     path = "usr.bin/xinstall";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8";
     extraPaths = [ mtree.src make.src ];
     nativeBuildInputs = [ makeMinimal mandoc groff ];
@@ -258,13 +258,13 @@ let
     pname = "fts";
     path = "include/fts.h";
     sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
-    version = "7.1.2";
+    version = "8.0";
     nativeBuildInputs = [ ];
     propagatedBuildInputs = [ compat ];
     extraPaths = [
-      (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
-      (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
-      (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
+      (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
+      (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
+      (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
     ];
     buildPhase = ''
       cc  -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
@@ -289,21 +289,21 @@ let
 
   stat = netBSDDerivation {
     path = "usr.bin/stat";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh";
     nativeBuildInputs = [ makeMinimal mandoc groff install ];
   };
 
   tsort = netBSDDerivation {
     path = "usr.bin/tsort";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq";
     nativeBuildInputs = [ makeMinimal mandoc groff install ];
   };
 
   lorder = netBSDDerivation {
     path = "usr.bin/lorder";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2";
     nativeBuildInputs = [ makeMinimal mandoc groff install ];
   };
@@ -313,26 +313,26 @@ let
 
   libutil = netBSDDerivation {
     path = "lib/libutil";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8";
     extraPaths = [
-      (fetchNetBSD "common/lib/libutil" "7.1.2" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
+      (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
     ];
   };
 
   libc = netBSDDerivation {
     path = "lib/libc";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg";
     extraPaths = [
-      (fetchNetBSD "common/lib/libc" "7.1.2" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha")
+      (fetchNetBSD "common/lib/libc" "8.0" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha")
     ];
   };
 
   make = netBSDDerivation {
     path = "usr.bin/make";
     sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar";
-    version = "7.1.2";
+    version = "8.0";
     postPatch = ''
       # make needs this to pick up our sys make files
       export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
@@ -358,19 +358,19 @@ let
       (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install)
     '';
     extraPaths = [
-      (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa")
+      (fetchNetBSD "share/mk" "8.0" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa")
     ];
   };
 
   mtree = netBSDDerivation {
     path = "usr.sbin/mtree";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m";
   };
 
   who = netBSDDerivation {
     path = "usr.bin/who";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
     postPatch = lib.optionalString stdenv.isLinux ''
       substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
@@ -393,19 +393,19 @@ in rec {
   getent = netBSDDerivation {
     path = "usr.bin/getent";
     sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz";
-    version = "7.1.2";
+    version = "8.0";
     patches = [ ./getent.patch ];
   };
 
   getconf = netBSDDerivation {
     path = "usr.bin/getconf";
     sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q";
-    version = "7.1.2";
+    version = "8.0";
   };
 
   dict = netBSDDerivation {
     path = "share/dict";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4";
     makeFlags = [ "BINDIR=/share" ];
   };
@@ -413,7 +413,7 @@ in rec {
   games = netBSDDerivation {
     path = "games";
     sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
-    version = "7.1.2";
+    version = "8.0";
     makeFlags = [ "BINDIR=/bin"
                   "SCRIPTSDIR=/bin" ];
     postPatch = ''
@@ -491,7 +491,7 @@ in rec {
   finger = netBSDDerivation {
     path = "usr.bin/finger";
     sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
-    version = "7.1.2";
+    version = "8.0";
     NIX_CFLAGS_COMPILE = [
       (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP")
       (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX")
@@ -505,13 +505,13 @@ in rec {
       ${who.postPatch}
     '';
     extraPaths = [ who.src ]
-              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px");
+              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px");
   };
 
   fingerd = netBSDDerivation {
     path = "libexec/fingerd";
     sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp";
-    version = "7.1.2";
+    version = "8.0";
   };
 
   libedit = netBSDDerivation {
@@ -529,13 +529,13 @@ in rec {
       "-D__scanflike(a,b)="
       "-D__va_list=va_list"
     ];
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca";
   };
 
   libterminfo = netBSDDerivation {
     path = "lib/libterminfo";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
     buildInputs = [ compat tic nbperf ];
     MKPIC = if stdenv.isDarwin then "no" else "yes";
@@ -547,13 +547,13 @@ in rec {
       (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)
     '';
     extraPaths = [
-      (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
+      (fetchNetBSD "share/terminfo" "8.0" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
     ];
   };
 
   libcurses = netBSDDerivation {
     path = "lib/libcurses";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
     buildInputs = [ libterminfo ];
     makeFlags = [ "INCSDIR=/include" ];
@@ -576,33 +576,33 @@ in rec {
 
   nbperf = netBSDDerivation {
     path = "usr.bin/nbperf";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb";
   };
 
   tic = netBSDDerivation {
     path = "tools/tic";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz";
     HOSTPROG = "tic";
     buildInputs = [ compat nbperf ];
     extraPaths = [
       libterminfo.src
-      (fetchNetBSD "usr.bin/tic" "7.1.2" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa")
-      (fetchNetBSD "tools/Makefile.host" "7.1.2" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8")
+      (fetchNetBSD "usr.bin/tic" "8.0" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa")
+      (fetchNetBSD "tools/Makefile.host" "8.0" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8")
     ];
   };
 
   misc = netBSDDerivation {
     path = "share/misc";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665";
     makeFlags = [ "BINDIR=/share" ];
   };
 
   locale = netBSDDerivation {
     path = "usr.bin/locale";
-    version = "7.1.2";
+    version = "8.0";
     sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p";
     patches = [ ./locale.patch ];
   };

From 8517039fb96ae2debbe37e8d85c80e4c55cdf288 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 21:11:12 -0500
Subject: [PATCH 1388/3253] netbsd: hashes

---
 pkgs/os-specific/bsd/netbsd/default.nix | 54 ++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index e4d9fbea1e3b..50f4416ade89 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -132,7 +132,7 @@ let
   ##
   makeMinimal = netBSDDerivation rec {
     path = "tools/make";
-    sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb";
+    sha256 = "1xbzfd4i7allrkk1if74a8ymgpizyj0gkvdigzzj37qar7la7nc1";
     version = "8.0";
 
     buildInputs = [];
@@ -164,7 +164,7 @@ let
 
   compat = netBSDDerivation rec {
     path = "tools/compat";
-    sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
+    sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3";
     version = "8.0";
 
     setupHooks = [
@@ -222,9 +222,9 @@ let
       find $out -type d -empty -delete
     '';
     extraPaths = [ libc.src libutil.src
-      (fetchNetBSD "include" "8.0" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")
-      (fetchNetBSD "external/bsd/flex" "8.0" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq")
-      (fetchNetBSD "sys/sys" "8.0" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93")
+      (fetchNetBSD "include" "8.0" "128m77k16i7frvk8kifhmxzk7a37m7z1s0bbmja3ywga6sx6v6sq")
+      (fetchNetBSD "external/bsd/flex" "8.0" "0yxcjshz9nj827qhmjwwjmzvmmqgaf0d25b42k7lj84vliwrgyr6")
+      (fetchNetBSD "sys/sys" "8.0" "0b0yjjy0c0cvk5nyffppqwxlwh2s1qr2xzl97a9ldck00dibar94")
     ] ++ libutil.extraPaths ++ libc.extraPaths;
   };
 
@@ -238,7 +238,7 @@ let
   ''; in netBSDDerivation {
     path = "usr.bin/xinstall";
     version = "8.0";
-    sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8";
+    sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj";
     extraPaths = [ mtree.src make.src ];
     nativeBuildInputs = [ makeMinimal mandoc groff ];
     buildInputs = [ compat fts ];
@@ -262,8 +262,8 @@ let
     nativeBuildInputs = [ ];
     propagatedBuildInputs = [ compat ];
     extraPaths = [
-      (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
-      (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
+      (fetchNetBSD "lib/libc/gen/fts.c" "8.0" "1a8hmf26242nmv05ipn3ircxb0jqmmi66rh78kkyi9vjwkfl3qn7")
+      (fetchNetBSD "lib/libc/include/namespace.h" "8.0" "1sjvh9nw3prnk4rmdwrfsxh6gdb9lmilkn46jcfh3q5c8glqzrd7")
       (fetchNetBSD "lib/libc/gen/fts.3" "8.0" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
     ];
     buildPhase = ''
@@ -314,7 +314,7 @@ let
   libutil = netBSDDerivation {
     path = "lib/libutil";
     version = "8.0";
-    sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8";
+    sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i";
     extraPaths = [
       (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
     ];
@@ -323,15 +323,15 @@ let
   libc = netBSDDerivation {
     path = "lib/libc";
     version = "8.0";
-    sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg";
+    sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3";
     extraPaths = [
-      (fetchNetBSD "common/lib/libc" "8.0" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha")
+      (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8")
     ];
   };
 
   make = netBSDDerivation {
     path = "usr.bin/make";
-    sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar";
+    sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c";
     version = "8.0";
     postPatch = ''
       # make needs this to pick up our sys make files
@@ -358,20 +358,20 @@ let
       (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install)
     '';
     extraPaths = [
-      (fetchNetBSD "share/mk" "8.0" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa")
+      (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs")
     ];
   };
 
   mtree = netBSDDerivation {
     path = "usr.sbin/mtree";
     version = "8.0";
-    sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m";
+    sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid";
   };
 
   who = netBSDDerivation {
     path = "usr.bin/who";
     version = "8.0";
-    sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
+    sha256 = "0ll76rbblps9hqmncxvw5qx0hhwfz678g70vgfyng8ahxz27rhd9";
     postPatch = lib.optionalString stdenv.isLinux ''
       substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
         --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \
@@ -406,13 +406,13 @@ in rec {
   dict = netBSDDerivation {
     path = "share/dict";
     version = "8.0";
-    sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4";
+    sha256 = "1pk0y3xc5ihc2k89wjkh33qqx3w9q34k03k2qcffvbqh1l6wm36l";
     makeFlags = [ "BINDIR=/share" ];
   };
 
   games = netBSDDerivation {
     path = "games";
-    sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
+    sha256 = "1vb4ahmiywgd3q3lzwb34mdd7agdlhsmw077alddkqinvyyxq1jz";
     version = "8.0";
     makeFlags = [ "BINDIR=/bin"
                   "SCRIPTSDIR=/bin" ];
@@ -490,7 +490,7 @@ in rec {
 
   finger = netBSDDerivation {
     path = "usr.bin/finger";
-    sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
+    sha256 = "1mbxjdzcbx7xsbn3x1qm1cd0kna07yh61wqxmrrphjhl5gv13ra3";
     version = "8.0";
     NIX_CFLAGS_COMPILE = [
       (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP")
@@ -505,12 +505,12 @@ in rec {
       ${who.postPatch}
     '';
     extraPaths = [ who.src ]
-              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px");
+              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb01mxwd0wa06qryqgqkwpqk9y2xzc7px");
   };
 
   fingerd = netBSDDerivation {
     path = "libexec/fingerd";
-    sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp";
+    sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190";
     version = "8.0";
   };
 
@@ -530,13 +530,13 @@ in rec {
       "-D__va_list=va_list"
     ];
     version = "8.0";
-    sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca";
+    sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd";
   };
 
   libterminfo = netBSDDerivation {
     path = "lib/libterminfo";
     version = "8.0";
-    sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
+    sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r";
     buildInputs = [ compat tic nbperf ];
     MKPIC = if stdenv.isDarwin then "no" else "yes";
     makeFlags = [ "INCSDIR=/include" ];
@@ -547,14 +547,14 @@ in rec {
       (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)
     '';
     extraPaths = [
-      (fetchNetBSD "share/terminfo" "8.0" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
+      (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm")
     ];
   };
 
   libcurses = netBSDDerivation {
     path = "lib/libcurses";
     version = "8.0";
-    sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
+    sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs";
     buildInputs = [ libterminfo ];
     makeFlags = [ "INCSDIR=/include" ];
     NIX_CFLAGS_COMPILE = [
@@ -588,15 +588,15 @@ in rec {
     buildInputs = [ compat nbperf ];
     extraPaths = [
       libterminfo.src
-      (fetchNetBSD "usr.bin/tic" "8.0" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa")
-      (fetchNetBSD "tools/Makefile.host" "8.0" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8")
+      (fetchNetBSD "usr.bin/tic" "8.0" "0diirnzmdnpc5bixyb34c9rid9paw2a4zfczqrpqrfvjsf1nnljf")
+      (fetchNetBSD "tools/Makefile.host" "8.0" "1p23dsc4qrv93vc6gzid9w2479jwswry9qfn88505s0pdd7h6nvp")
     ];
   };
 
   misc = netBSDDerivation {
     path = "share/misc";
     version = "8.0";
-    sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665";
+    sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch8";
     makeFlags = [ "BINDIR=/share" ];
   };
 

From d08ff06d0a207a64c8a7f34c275239bc6d495ffa Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 22:56:45 -0500
Subject: [PATCH 1389/3253] netbsd.terminfo: break libcurses dep cycle with
 simple decl of use_env

---
 pkgs/os-specific/bsd/netbsd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 50f4416ade89..3ef458c1ca9d 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -542,6 +542,8 @@ in rec {
     makeFlags = [ "INCSDIR=/include" ];
     postPatch = ''
       substituteInPlace term.c --replace /usr/share $out/share
+      substituteInPlace setupterm.c --replace '#include <curses.h>' 'void use_env(bool);'
+
     '';
     postInstall = ''
       (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)

From 9e2bd0ddc2046e91c684c2b499614d553c893bf4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 23:00:45 -0500
Subject: [PATCH 1390/3253] netbsd: there is no /usr/bin/env in the nix
 sandbox, use /bin/sh

---
 pkgs/os-specific/bsd/netbsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 3ef458c1ca9d..9c55aa418390 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -231,7 +231,7 @@ let
   # HACK to ensure parent directories exist. This emulates GNU
   # install’s -D option. No alternative seems to exist in BSD install.
   install = let binstall = writeText "binstall" ''
-    #!/usr/bin/env sh
+    #!/bin/sh
     for last in $@; do true; done
     mkdir -p $(dirname $last)
     xinstall "$@"

From 353d994254ee3da604465e53a89e5718e88b4ecc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 23:20:31 -0500
Subject: [PATCH 1391/3253] netbsd.libcurses: patch around funopen2 now instead
 of funopen

---
 pkgs/os-specific/bsd/netbsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 9c55aa418390..d93e9fb75147 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -569,7 +569,7 @@ in rec {
     MKPIC = if stdenv.isDarwin then "no" else "yes";
     postPatch = lib.optionalString (!stdenv.isDarwin) ''
       substituteInPlace printw.c \
-        --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \
+        --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \
         --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'
       substituteInPlace scanw.c \
         --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));'

From e8693206ee703c4df26540bce84844113e443e99 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 23:46:31 -0500
Subject: [PATCH 1392/3253] utmps: init at 0.0.1.3

Haven't tried using it, but packging it is first step! :)
---
 pkgs/development/libraries/utmps/default.nix | 32 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/utmps/default.nix

diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
new file mode 100644
index 000000000000..859d152072fb
--- /dev/null
+++ b/pkgs/development/libraries/utmps/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+  pname = "utmps";
+  version = "0.0.1.3";
+  sha256 = "0dwskdclac4afmh7f7zn6jdiydgaf59a65q43r6b813mghczjvvd";
+
+  description = "A secure utmpx and wtmp implementation";
+
+  configureFlags = [
+    "--libdir=\${lib}/lib"
+    "--dynlibdir=\${lib}/lib"
+    "--bindir=\${bin}/bin"
+    "--includedir=\${dev}/include"
+    "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs.dev}/include"
+    "--with-lib=${skalibs.lib}/lib"
+    "--with-dynlib=${skalibs.lib}/lib"
+  ];
+
+  postInstall = ''
+    # remove all execline executables from build directory
+    rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+    rm libutmps.*
+
+    mv doc $doc/share/doc/utmps/html
+    mv examples $doc/share/doc/utmps/examples
+  '';
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a0b0956d759..7a9a456d33d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12075,6 +12075,7 @@ with pkgs;
     s6-rc = callPackage ../tools/system/s6-rc { };
 
     nsss = callPackage ../development/libraries/nsss { };
+    utmps = callPackage ../development/libraries/utmps { };
 
   };
 

From 8ffd65b12e7eeb74ddec11efd9fc3b49bbd568ea Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 09:22:03 +0200
Subject: [PATCH 1393/3253] nixos/tests/atd: wait for atd to start

The test failed non-deterministically when an at command was
issued before the atd daemon was running.
---
 nixos/tests/atd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index 9f367d4c1d2a..25db72799241 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, ... }:
   testScript = ''
     startAll;
 
+    $machine->waitForUnit('atd.service'); # wait for atd to start
     $machine->fail("test -f ~root/at-1");
     $machine->fail("test -f ~alice/at-1");
 

From 97f3a2e7b87e405ab7dec94b00240f90b155c572 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 18 Sep 2018 23:14:33 -0700
Subject: [PATCH 1394/3253] azcopy: init at 10.0.1

---
 pkgs/development/tools/azcopy/default.nix |  23 ++++
 pkgs/development/tools/azcopy/deps.nix    | 129 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 3 files changed, 154 insertions(+)
 create mode 100644 pkgs/development/tools/azcopy/default.nix
 create mode 100644 pkgs/development/tools/azcopy/deps.nix

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
new file mode 100644
index 000000000000..2089142a1deb
--- /dev/null
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "azure-storage-azcopy-${version}";
+  version = "10.0.1-pre";
+  revision = "10.0.1";
+  goPackagePath = "github.com/Azure/azure-storage-azcopy";
+
+  goDeps= ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "Azure";
+    repo = "azure-storage-azcopy";
+    rev = revision;
+    sha256 = "0v1qli01nnx81186q1d2556w457qkbwypq6yy89ns52pqg941arp";
+  };
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ colemickens ];
+    license = licenses.mit;
+    description = "The new Azure Storage data transfer utility - AzCopy v10";
+  };
+}
diff --git a/pkgs/development/tools/azcopy/deps.nix b/pkgs/development/tools/azcopy/deps.nix
new file mode 100644
index 000000000000..cef400200d06
--- /dev/null
+++ b/pkgs/development/tools/azcopy/deps.nix
@@ -0,0 +1,129 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/Azure/azure-pipeline-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-pipeline-go";
+      rev =  "7571e8eb0876932ab505918ff7ed5107773e5ee2";
+      sha256 = "0i8n7jna9prq3zdbj0bsr1ha271lgg9233n71dw8li5qsiyg8bs2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-storage-blob-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-blob-go";
+      rev =  "197d1c0aea1b9eedbbaee0a1a32bf81e879bde80";
+      sha256 = "0wslfah8x1i5l98ss4wxv47ddxfp8mbc90cnfi81v7qnf0bpjp2g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-storage-file-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-file-go";
+      rev =  "9227fd295d972e4395fd601e6f48cee2f5cda02b";
+      sha256 = "0sr5iqiddjs2lnma5ixrrdik9zciqqd74priivvpycgi3cyxyxyn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev =  "39013ecb48eaf6ced3f4e3e1d95515140ce6b3cf";
+      sha256 = "1cbf1ay68lghr4swy2a0asfcjpzkamvz1cqxpdm6691b76j2x6cm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/JeffreyRichter/enum";
+    fetch = {
+      type = "git";
+      url = "https://github.com/JeffreyRichter/enum";
+      rev =  "2567042f9cda26772f0afe08bab6e5105745f298";
+      sha256 = "1d2sjjlp0r2ynk1fb3sb7dgbqzbq4czipb7ffm9zdmjbz0gp6crr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jiacfan/keychain";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jiacfan/keychain";
+      rev =  "55285221316b0547171a4258015906e3a4da4721";
+      sha256 = "0nfpmqmj33953awysp1948y6k28cmh4770q0i60jv88k35p10s56";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jiacfan/keyctl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jiacfan/keyctl";
+      rev =  "988d05162bc59cf7789c35af405be8f1599a87a3";
+      sha256 = "1q4svv9z3s3n2x4ff8cyr53g5ln1yfrcmc3bvznhhwq190dhm94c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev =  "73f6ac0b30a98e433b289500d779f50c1a6f0712";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev =  "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "9a97c102cda95a86cec2345a6f09f55a939babf5";
+      sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-check/check";
+      rev =  "788fd78401277ebd861206a03c884797c6ec5541";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 814c5e9d6073..43a264c19080 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -598,6 +598,8 @@ with pkgs;
 
   azure-cli = nodePackages.azure-cli;
 
+  azure-storage-azcopy = callPackage ../development/tools/azcopy { };
+
   azure-vhd-utils  = callPackage ../tools/misc/azure-vhd-utils { };
 
   awless = callPackage ../tools/virtualization/awless { };

From ba33eac477850892610148394ef38b8ea0d07da0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 21 Sep 2018 03:23:26 -0500
Subject: [PATCH 1395/3253] bat: install man page (#47099)

---
 pkgs/tools/misc/bat/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 01e720e5b877..ec2062805ab1 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -20,6 +20,10 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
 
+  postInstall = ''
+    install -m 444 -Dt $out/share/man/man1 doc/bat.1
+  '';
+
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
     homepage    = https://github.com/sharkdp/bat;

From a709d11dd14c74faebe42c1d08215d8ecfe60922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Fri, 21 Sep 2018 09:41:17 +0100
Subject: [PATCH 1396/3253] gogs: 0.11.53 -> 0.11.66 (#47073)

---
 pkgs/applications/version-management/gogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 25f7be37e1ee..56e411368961 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.11.53";
+  version = "0.11.66";
 
   src = fetchFromGitHub {
     owner = "gogs";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "1icm4bawyic4ivzyspqc6qjv882gil8j923zrbylw3i4ifhlcdhd";
+    sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28";
   };
 
   patches = [ ./static-root-path.patch ];

From 7a6091d5c9b10ded05dfee01d3ff828b74712f14 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Fri, 21 Sep 2018 17:43:24 +0900
Subject: [PATCH 1397/3253] rubocop: 0.58.1 -> 0.59.1

---
 pkgs/development/tools/rubocop/Gemfile.lock | 6 +++---
 pkgs/development/tools/rubocop/gemset.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index 6215bed77cf0..9c6f2fc32d21 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.1)
-    rubocop (0.58.1)
+    rubocop (0.59.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -17,7 +17,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+    ruby-progressbar (1.10.0)
     unicode-display_width (1.4.0)
 
 PLATFORMS
@@ -28,4 +28,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.16.1
+   1.16.4
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index 7478cd568bd6..862f655b49da 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -60,18 +60,18 @@
     dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s2qlrdx2f7653kmzwm58c8izyvgyjrzjrz76l2b005f2816kji6";
+      sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b";
       type = "gem";
     };
-    version = "0.58.1";
+    version = "0.59.1";
   };
   ruby-progressbar = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+      sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
   unicode-display_width = {
     source = {

From 9a859fb7f9fc7c81b78122e1c47765aa61e7aa28 Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Fri, 21 Sep 2018 02:13:49 -0700
Subject: [PATCH 1398/3253] libratbag: init at v0.9.903 Add package libratbag
 and service module ratbagd Libratbag contains ratbagd daemon and ratbagctl
 cli to configure buttons, dpi, leds, etc. of gaming mice. Add mvnetbiz to
 maintainers.

---
 maintainers/maintainer-list.nix              |  5 +++
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/hardware/ratbagd.nix  | 32 +++++++++++++++++
 pkgs/os-specific/linux/libratbag/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 5 files changed, 76 insertions(+)
 create mode 100644 nixos/modules/services/hardware/ratbagd.nix
 create mode 100644 pkgs/os-specific/linux/libratbag/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ecec7bbaf7e3..5b6ada894a70 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2808,6 +2808,11 @@
     github = "muflax";
     name = "Stefan Dorn";
   };
+  mvnetbiz = {
+    email = "mvnetbiz@gmail.com";
+    github = "mvnetbiz";
+    name = "Matt Votava";
+  };
   myrl = {
     email = "myrl.0xf@gmail.com";
     github = "myrl";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3f3123798f59..84ce52909c02 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -275,6 +275,7 @@
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
+  ./services/hardware/ratbagd.nix
   ./services/hardware/sane.nix
   ./services/hardware/sane_extra_backends/brscan4.nix
   ./services/hardware/tcsd.nix
diff --git a/nixos/modules/services/hardware/ratbagd.nix b/nixos/modules/services/hardware/ratbagd.nix
new file mode 100644
index 000000000000..103e1d2315ae
--- /dev/null
+++ b/nixos/modules/services/hardware/ratbagd.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ratbagd;
+in
+{
+  ###### interface
+
+  options = {
+    services.ratbagd = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable ratbagd for configuring gaming mice.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    # Give users access to the "ratbagctl" tool
+    environment.systemPackages = [ pkgs.libratbag ];
+
+    services.dbus.packages = [ pkgs.libratbag ];
+
+    systemd.packages = [ pkgs.libratbag ];
+  };
+}
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
new file mode 100644
index 000000000000..271dc156695a
--- /dev/null
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
+
+stdenv.mkDerivation rec {
+  name = "libratbag-${version}";
+  version = "0.9.903";
+
+  src = fetchFromGitHub {
+    owner  = "libratbag";
+    repo   = "libratbag";
+    rev    = "v${version}";
+    sha256 = "0cr5skrb7a5mgj7dkm647ib8336hb88bf11blaf6xldafi8b0jlj";
+  };
+
+
+  # todo: python should be in buildInputs, but right now meson propagates
+  # its own python. see: https://github.com/NixOS/nixpkgs/pull/46020
+  nativeBuildInputs = [
+    (python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
+    meson ninja pkgconfig gitMinimal swig check valgrind
+  ];
+
+  buildInputs = [ glib systemd udev libevdev ];
+
+  mesonFlags = [
+    "-Dsystemd-unit-dir=./lib/systemd/system/"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Configuration library for gaming mice";
+    homepage    = https://github.com/libratbag/libratbag;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ mvnetbiz ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd7dca53c84c..5540098efb93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15022,6 +15022,8 @@ with pkgs;
 
   libertinus = callPackage ../data/fonts/libertinus { };
 
+  libratbag = callPackage ../os-specific/linux/libratbag { };
+
   libre-baskerville = callPackage ../data/fonts/libre-baskerville { };
 
   libre-bodoni = callPackage ../data/fonts/libre-bodoni { };

From 78f1715149940165c8b48d372903617c175b5bd1 Mon Sep 17 00:00:00 2001
From: Matt Votava <mvnetbiz@gmail.com>
Date: Fri, 21 Sep 2018 02:15:38 -0700
Subject: [PATCH 1399/3253] piper: init at 0.2.902 Add package piper. Piper is
 a gtk frontend application for ratbagctl to configure gaming mice.

---
 pkgs/os-specific/linux/piper/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/os-specific/linux/piper/default.nix

diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
new file mode 100644
index 000000000000..3e774faaffe2
--- /dev/null
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3
+, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 }:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "piper-${version}";
+  version = "0.2.902";
+
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner  = "libratbag";
+    repo   = "piper";
+    rev    =  version;
+    sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb";
+  };
+
+  nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib ];
+  buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ];
+  propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
+
+  postPatch = ''
+    chmod +x meson_install.sh # patchShebangs requires executable file
+    patchShebangs meson_install.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GTK frontend for ratbagd mouse config daemon";
+    homepage    = https://github.com/libratbag/piper;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ mvnetbiz ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5540098efb93..b40b804015ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17746,6 +17746,8 @@ with pkgs;
 
   pijul = callPackage ../applications/version-management/pijul {};
 
+  piper = callPackage ../os-specific/linux/piper { };
+
   plank = callPackage ../applications/misc/plank { };
 
   planner = callPackage ../applications/office/planner { };

From f0e0c6d72e4e6460b45924ca2c0262f5be82492d Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Fri, 21 Sep 2018 11:57:04 +0200
Subject: [PATCH 1400/3253] mopidy-iris: 3.26.0 -> 3.26.1

---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index ab9bfa26d0ab..88aa47169985 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.26.0";
+  version = "3.26.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0yd52dlm0qh3ycqxhxhiw52111wa87b7wlxbwdj5p9an5yqnkkvy";
+    sha256 = "0qa55mmkrig5jymhm0mrr9jvxzfb2j70b971big3ady038cqd6f5";
   };
 
   propagatedBuildInputs = [

From de764e65f0d655c6cdd9fca23abd101290a2a6b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Sep 2018 13:07:07 +0300
Subject: [PATCH 1401/3253] acl2: 8.0 -> 8.0.post.2018.09.20; fixes build with
 fresher SBCL

---
 pkgs/development/interpreters/acl2/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 14b9a78af46e..a0da6e0ee7f8 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,20 @@
 
 let hashes = {
   "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
+  "8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6";
+};
+revs = {
+  "8.0" = "8.0";
+  "8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770";
 };
 in stdenv.mkDerivation rec {
   name = "acl2-${version}";
-  version = "8.0";
+  version = "8.0.post.2018.09.20";
 
   src = fetchFromGitHub {
     owner = "acl2-devel";
     repo = "acl2-devel";
-    rev = "${version}";
+    rev = revs."${version}";
     sha256 = hashes."${version}";
   };
 

From 41457058da7a51f44d0c4ce89740bb7bef40c40c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 17:36:53 -0700
Subject: [PATCH 1402/3253] chrony: 3.3 -> 3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/chrony/versions
---
 pkgs/tools/networking/chrony/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index bf1ef0600bcc..9cca93040dd7 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "3.3";
+  version = "3.4";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd";
+    sha256 = "17vb1sy79lsjif23v66mgn39lbgmxy59mf7mi9ffb9qh4ryf8xxg";
   };
 
   postPatch = ''

From 69b2c0dcf1c7895817f613171de7a71a02e31adc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 05:42:53 -0500
Subject: [PATCH 1403/3253] utmps: add top-level attribute, as was the style at
 the time

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a9a456d33d0..ad0625a66091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12365,6 +12365,8 @@ with pkgs;
 
   uthash = callPackage ../development/libraries/uthash { };
 
+  utmps = skawarePackages.utmps;
+
   ucommon = ucommon_openssl;
 
   ucommon_openssl = callPackage ../development/libraries/ucommon {

From 96c66faa49862560125d1d4fbefe3144c69d4c62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 15:04:42 -0700
Subject: [PATCH 1404/3253] earlyoom: 0.11 -> 1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/earlyoom/versions
---
 pkgs/os-specific/linux/earlyoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
index 52333c109ee0..0c2f1a872fd9 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "earlyoom-${VERSION}";
   # This environment variable is read by make to set the build version.
-  VERSION = "0.11";
+  VERSION = "1.1";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "earlyoom";
     rev = "v${VERSION}";
-    sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl";
+    sha256 = "1hczn59mmx287hnlhcmpxrf3jy3arllif165dq7b2ha6w3ywngww";
   };
 
   installPhase = ''

From 6d8647fd36137dc269557af3545ab2a54b569aa0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 06:42:46 -0500
Subject: [PATCH 1405/3253] netbsd: set HOST_CC/HOST_CXX -- maybe help aarch64
 defaulting to clang

---
 pkgs/os-specific/bsd/netbsd/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index d93e9fb75147..3e1d1f01aa0d 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -40,6 +40,9 @@ let
     INSTALL_LINK = "install -U -l h";
     INSTALL_SYMLINK = "install -U -l s";
 
+    HOST_CC = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
+    HOST_CXX  = "${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
+
     # libs will be provided by cc-wrapper
     LIBCRT0 = "";
     LIBCRTI = "";

From 4eb077bed72e3ad0fe5ba5150931d45fa1296429 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 12:01:26 -0700
Subject: [PATCH 1406/3253] kotlin: 1.2.61 -> 1.2.70

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 757773eed52d..718628d8ad41 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.61";
+  version = "1.2.70";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
+    sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 0b221b24b9794e5b01c4b9cb7695173ed721419f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:00 +0000
Subject: [PATCH 1407/3253] [cpan2nix] perlPackages.ArchiveTar: 2.30 -> 2.32

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 714dba45aa2f..135645340d6b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -501,10 +501,10 @@ let
   };
 
   ArchiveTar = buildPerlPackage rec {
-    name = "Archive-Tar-2.30";
+    name = "Archive-Tar-2.32";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "4a5a172cfefe08cb2d32f99ed388a3b55967588bbf254e950bc8a48a8bf1d2e5";
+      sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2";
     };
     meta = {
       description = "Manipulates TAR archives";

From 64e0077681be50eed0b48ca06ebd9ed85c627411 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:01 +0000
Subject: [PATCH 1408/3253] [cpan2nix] perlPackages.BKeywords: 1.18 -> 1.19

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 135645340d6b..31bb39617104 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -811,10 +811,10 @@ let
   };
 
   BKeywords = buildPerlPackage rec {
-    name = "B-Keywords-1.18";
+    name = "B-Keywords-1.19";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
-      sha256 = "0f5bb2fpbq5jzdb2jfs73hrggrq2gnpacd2kkxgifjl7q7xd9ck5";
+      sha256 = "1kdzhdksnqrmij98bnifv2p2125zvpf0rmzxjiav65ipydi4rsw9";
     };
     meta = {
       description = "Lists of reserved barewords and symbol names";

From 65bff53eaa8ad6b4edd9a9cc8822bfe0483fc208 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:06 +0000
Subject: [PATCH 1409/3253] [cpan2nix] perlPackages.Carp: 1.38 -> 1.50

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 31bb39617104..47d967d71ba8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1082,10 +1082,10 @@ let
   };
 
   Carp = buildPerlPackage rec {
-    name = "Carp-1.38";
+    name = "Carp-1.50";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "00bijwwc0ix27h2ma3lvsf3b56biar96bl9dikxgx7cmpcycxad5";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Carp-1.50.tar.gz;
+      sha256 = "1ngbpjyd9qi7n4h5r3q3qibd8by7rfiv7364jqlv4lbd3973n9zm";
     };
     meta = with stdenv.lib; {
       description = "Alternative warn and die for modules";

From fdfa89153098d520b26b5d09e0cd7567547c5a9a Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:16 +0000
Subject: [PATCH 1410/3253] [cpan2nix] perlPackages.CpanelJSONXS: 4.05 -> 4.06

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 47d967d71ba8..21aef7a1eac6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2771,10 +2771,10 @@ let
   };
 
   CpanelJSONXS = buildPerlPackage rec {
-    name = "Cpanel-JSON-XS-4.05";
+    name = "Cpanel-JSON-XS-4.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
-      sha256 = "dd2b69265604ac6f18b47131565f712d55ed8df3b85f8f58f0c98cad17383663";
+      sha256 = "63481d9d2d6251cf520bb6a62147faf6e8f35b9fe6b3ddd81c5bfd71e31ec9ba";
     };
     meta = {
       description = "CPanel fork of JSON::XS, fast and correct serializing";

From 601cd99aea7fa19eab57a265f87eea57ee6c6cc1 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:22 +0000
Subject: [PATCH 1411/3253] [cpan2nix] perlPackages.DataDumper: 2.161 -> 2.172

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 21aef7a1eac6..8fcd1559c158 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3249,10 +3249,10 @@ let
   };
 
   DataDumper = buildPerlPackage rec {
-    name = "Data-Dumper-2.161";
+    name = "Data-Dumper-2.172";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz";
-      sha256 = "3aa4ac1b042b3880438165fb2b2139d377564a8e9928ffe689ede5304ee90558";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.172.tar.gz;
+      sha256 = "a95a3037163817221021ac145500968be44dc155c261f4097136392c0a9fecd9";
     };
     outputs = [ "out" ];
     meta = {

From 7fba75f4f16852ddbccee069cd91b33ce93f5c96 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:27 +0000
Subject: [PATCH 1412/3253] [cpan2nix] perlPackages.DevelPPPort: 3.42 -> 3.43

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8fcd1559c158..8046f80bf2bc 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4009,10 +4009,10 @@ let
   };
 
   DevelPPPort = buildPerlPackage rec {
-    name = "Devel-PPPort-3.42";
+    name = "Devel-PPPort-3.43";
     src = fetchurl {
-      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.42.tar.gz;
-      sha256 = "bac5d98b92fe2673a84ea45f1c9b615e3a46c3cc6db59c61a2fc95dd3cf9e14a";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/Devel-PPPort-3.43.tar.gz;
+      sha256 = "90fd98fb24e1d7252011ff181244e04c8c8135933e67eab93c57ed6a61ed86f4";
     };
     meta = {
       description = "Perl/Pollution/Portability";

From d83512a3f21fa04ff02345535a6609bf352d612c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:12:44 +0000
Subject: [PATCH 1413/3253] [cpan2nix] perlPackages.FilePath: 2.15 -> 2.16

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8046f80bf2bc..c42e017d3088 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5976,10 +5976,10 @@ let
   };
 
   FilePath = buildPerlPackage rec {
-    name = "File-Path-2.15";
+    name = "File-Path-2.16";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.15.tar.gz;
-      sha256 = "1570f3c1cdf93c50f65c2072e8f20ee121550771dfb7f6e563f503a2a7050744";
+      url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz;
+      sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05";
     };
     meta = {
       description = "Create or remove directory trees";

From 168969b8722e5c6dba88ce5716e3760f29c277bd Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:08 +0000
Subject: [PATCH 1414/3253] [cpan2nix] perlPackages.LocaleCodes: 3.57 -> 3.58

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c42e017d3088..0975b94f9e2c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8552,10 +8552,10 @@ let
   };
 
   LocaleCodes = buildPerlPackage {
-    name = "Locale-Codes-3.57";
+    name = "Locale-Codes-3.58";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.57.tar.gz;
-      sha256 = "3547cffeb6098a706a5647f6079e06cbdb68a6b7f9c8d5b0032659df7bfd8812";
+      url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.58.tar.gz;
+      sha256 = "345c0b0170288d74a147fbe218b7c78147aa2baf4e839fe8680a2b0a2d8e505b";
     };
     meta = {
       description = "A distribution of modules to handle locale codes";

From 7aa71f18c422675309841b774e180d6c4586540d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:12 +0000
Subject: [PATCH 1415/3253] [cpan2nix] perlPackages.MCE: 1.836 -> 1.837

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0975b94f9e2c..3a68713c01e7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8830,10 +8830,10 @@ let
   };
 
   MCE = buildPerlPackage rec {
-     name = "MCE-1.836";
+     name = "MCE-1.837";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.836.tar.gz;
-       sha256 = "04nkcbs27plwq31w541phfci3391s10p2xv5lmry5wq7fbdw5iwy";
+       url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.837.tar.gz;
+       sha256 = "0si12wv02i8cn2xw6lk0m2apqrd88awcli1yadmvikq5rnfhcypa";
      };
      meta = {
        description = "Many-Core Engine for Perl providing parallel processing capabilities";

From 7ffb4efc07280a04caa8fa6cfdc422216b16b47e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:17 +0000
Subject: [PATCH 1416/3253] [cpan2nix] perlPackages.ModernPerl: 1.20180701 ->
 1.20180901

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3a68713c01e7..8e2861e94b02 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9553,11 +9553,11 @@ let
   };
 
   ModernPerl = buildPerlModule {
-    name = "Modern-Perl-1.20180701";
+    name = "Modern-Perl-1.20180901";
 
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180701.tar.gz;
-      sha256 = "cfdf390bc565599ef90ef086a81233dc1dfc7867676dc28e1deedcd7e5543da6";
+      url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180901.tar.gz;
+      sha256 = "5c289bbe59cfc90abb9b8c6b9903b7625ca9ea26239d397d87f7b57517cd61a1";
     };
     meta = {
       homepage = https://github.com/chromatic/Modern-Perl;

From 0a220d88ed31505151ee5cbb4bf8973b56873c89 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:21 +0000
Subject: [PATCH 1417/3253] [cpan2nix] perlPackages.Mojolicious: 7.88 -> 8.0

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8e2861e94b02..17021dc01f70 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9990,10 +9990,10 @@ let
     };
   };
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-7.88";
+    name = "Mojolicious-8.0";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785";
+      sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
     };
     meta = {
       homepage = https://mojolicious.org/;

From fc2de9d99ab253cf96f470211924b269f5bfd69c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:34 +0000
Subject: [PATCH 1418/3253] [cpan2nix] perlPackages.PathTools: 3.74 -> 3.75

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 17021dc01f70..9b998d6e8d1f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11977,13 +11977,13 @@ let
   };
 
   PathTools = buildPerlPackage {
-    name = "PathTools-3.74";
+    name = "PathTools-3.75";
     preConfigure = ''
       substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd'
     '';
     src = fetchurl {
-      url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.74.tar.gz;
-      sha256 = "25724cc54c59a3bfabadec95e72db292c98676bf3632497384e8dc6277936e11";
+      url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz;
+      sha256 = "a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2";
     };
   };
 

From 58299eb1f3e87c28e3712b7f7e5acda85058e55e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:37 +0000
Subject: [PATCH 1419/3253] [cpan2nix] perlPackages.PkgConfig: 0.21026 ->
 0.22026

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9b998d6e8d1f..06955c55e3ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12210,10 +12210,10 @@ let
   };
 
   PkgConfig = buildPerlPackage rec {
-    name = "PkgConfig-0.21026";
+    name = "PkgConfig-0.22026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz";
-      sha256 = "018f8d3c74e661df66046b26e57f4c5991adafe202af7ea2d1c6f6bcafde584b";
+      sha256 = "d01849bf88f3d56f4efe304cfe56f806867a45b716e3963dcacce17b829433ce";
     };
     meta = {
       description = "Pure-Perl Core-Only replacement for pkg-config";

From cec11727a0df8e8013242eb092574a0891a2e9dc Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:13:47 +0000
Subject: [PATCH 1420/3253] [cpan2nix] perlPackages.ScopeUpper: 0.30 -> 0.31

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 06955c55e3ff..fd837e9c442e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13351,10 +13351,10 @@ let
   };
 
   ScopeUpper = buildPerlPackage rec {
-    name = "Scope-Upper-0.30";
+    name = "Scope-Upper-0.31";
     src = fetchurl {
       url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
-      sha256 = "7f151582423850d814034404b1e23b5efb281b9dd656b9afe81c761ebb88bbb4";
+      sha256 = "cc4d2ce0f185b4867d73b4083991117052a523fd409debf15bdd7e374cc16d8c";
     };
     meta = {
       description = "Act on upper scopes";

From 4d00009c9e9aaab38af1414ff030c4e906b5502b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:14:32 +0000
Subject: [PATCH 1421/3253] [cpan2nix] perlPackages.YAMLLibYAML: 0.72 -> 0.74

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fd837e9c442e..b79f8f4ecb45 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17892,10 +17892,10 @@ let
   };
 
   YAMLLibYAML = buildPerlPackage rec {
-    name = "YAML-LibYAML-0.72";
+    name = "YAML-LibYAML-0.74";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
-      sha256 = "0dn50pranjyai4gclb501m29y0ks03y87g132wqpb469rb3sjd0g";
+      url = mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.74.tar.gz;
+      sha256 = "021l0gf6z93xd6vd604vpvb9d4b714zph17g6hg47fpawdq0xpd0";
     };
   };
 

From 5e627d70ed0508c43c5fd69db037ae69a6cfd4f8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:14:46 +0000
Subject: [PATCH 1422/3253] [cpan2nix] perlPackages.ConfigIniFiles: 2.98 ->
 3.000000

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b79f8f4ecb45..c7ffabf57f0b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2519,10 +2519,10 @@ let
   };
 
   ConfigIniFiles = buildPerlModule rec {
-    name = "Config-IniFiles-2.98";
+    name = "Config-IniFiles-3.000000";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
-      sha256 = "9d5fc5c2192058e58ad35150ddae3043a2679f2aa4e1fb7e18e36794622b1797";
+      sha256 = "cd92f6b7f1aa3e03abf6251f1e6129dab8a2b835e8b17c7c4cc3e8305c1c9b29";
     };
     propagatedBuildInputs = [ IOStringy ];
     meta = {

From 91fb471557a4894c6cf5cd1a136d125ba157fc02 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:14:53 +0000
Subject: [PATCH 1423/3253] [cpan2nix] perlPackages.DateManip: 6.72 -> 6.73

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c7ffabf57f0b..a8a7ff64cb55 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3614,10 +3614,10 @@ let
   };
 
   DateManip = buildPerlPackage rec {
-    name = "Date-Manip-6.72";
+    name = "Date-Manip-6.73";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz";
-      sha256 = "19jdm73kqbv1biw4v8bdzy5qr2xvqdrfz8lxgg59445ljjfxvx1q";
+      sha256 = "0md25ik7pwbwgidiprcq20db8jdniknxs0qj1m3l76ziqg3rb4nk";
     };
     # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work
     patchPhase = ''

From 1d1bb309d55ca5ac8f76d431345fa9cfba5e5ead Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:25 +0000
Subject: [PATCH 1424/3253] [cpan2nix] perlPackages.CryptJWT: 0.022 -> 0.023

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a8a7ff64cb55..14ae041cbc86 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2954,10 +2954,10 @@ let
   };
 
   CryptJWT = buildPerlPackage rec {
-    name = "Crypt-JWT-0.022";
+    name = "Crypt-JWT-0.023";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "eb0a591f91c431929d8788dc26cc8cd98d1dc37af2a45b5754ca5039c8282476";
+      sha256 = "540594d0051028e00e586eb7827df09b01c091c648bb6b210de3124fe118524b";
     };
     propagatedBuildInputs = [ CryptX JSONMaybeXS ];
     meta = {

From d0f30e728a20e71281672d00bb1c4af8324fa854 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:30 +0000
Subject: [PATCH 1425/3253] [cpan2nix] perlPackages.ForksSuper: 0.94 -> 0.96

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14ae041cbc86..93def623bf3b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6297,10 +6297,10 @@ let
   };
 
   ForksSuper = buildPerlPackage {
-    name = "Forks-Super-0.94";
+    name = "Forks-Super-0.96";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.94.tar.gz;
-      sha256 = "145nj2wsymr5vr93ikrakjx3dd07q63fxb1bq7lkiranm9974v8s";
+      url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.96.tar.gz;
+      sha256 = "0vzxfxdgxjk83cwg9p5dzvfydrah53xcxkickznrrd5rhp1rasqx";
     };
     doCheck = false;
     meta = {

From 3f136c153d5bd2f5d94bd02fcbafc468420549ea Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:31 +0000
Subject: [PATCH 1426/3253] [cpan2nix] perlPackages.GD: 2.68 -> 2.69

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 93def623bf3b..3121b64bcab3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6349,10 +6349,10 @@ let
   };
 
   GD = buildPerlPackage rec {
-    name = "GD-2.68";
+    name = "GD-2.69";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.68.tar.gz;
-      sha256 = "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.69.tar.gz;
+      sha256 = "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x";
     };
 
     buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ];

From 2744f5a3ada448b7d82a954ec71ab18e71583894 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:33 +0000
Subject: [PATCH 1427/3253] [cpan2nix] perlPackages.IOSocketSSL: 2.059 -> 2.060

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3121b64bcab3..8cd00a642ea6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7760,12 +7760,12 @@ let
   };
 
   IOSocketSSL = buildPerlPackage rec {
-    name = "IO-Socket-SSL-2.059";
+    name = "IO-Socket-SSL-2.060";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
-      sha256 = "217debbe0a79f0b7c5669978b4d733271998df4497f4718f78456e5f54d64849";
+      sha256 = "fb5b2877ac5b686a5d7b8dd71cf5464ffe75d10c32047b5570674870e46b1b8c";
     };
-    propagatedBuildInputs = [ NetSSLeay ];
+    propagatedBuildInputs = [ MozillaCA NetSSLeay ];
     # Fix path to default certificate store.
     postPatch = ''
       substituteInPlace lib/IO/Socket/SSL.pm \

From 5f461ea9279d0f389b263fed8a89a3110e95ad77 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:33 +0000
Subject: [PATCH 1428/3253] [cpan2nix] perlPackages.MojoIOLoopForkCall: 0.19 ->
 0.20

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8cd00a642ea6..887bc24fb47f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10003,10 +10003,10 @@ let
   };
 
   MojoIOLoopForkCall = buildPerlModule rec {
-    name = "Mojo-IOLoop-ForkCall-0.19";
+    name = "Mojo-IOLoop-ForkCall-0.20";
     src = fetchurl {
       url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
-      sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62";
+      sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6";
     };
     propagatedBuildInputs = [ IOPipely Mojolicious ];
     meta = {

From 878f3626495a05e804b004b9dcd8d1071bf45292 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:37 +0000
Subject: [PATCH 1429/3253] [cpan2nix] perlPackages.Pegex: 0.64 -> 0.67

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 887bc24fb47f..1ba995e93ebd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12022,10 +12022,10 @@ let
   };
 
   Pegex = buildPerlPackage rec {
-    name = "Pegex-0.64";
+    name = "Pegex-0.67";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "27e00264bdafb9c2109212b9654542032617fecf7b7814915d2bdac198f067cd";
+      sha256 = "3cb9df73aece2a5fa769a89bd74daaac302cc077e2489b3b552f3aa172092091";
     };
     buildInputs = [ FileShareDirInstall YAMLLibYAML ];
     meta = {

From ca10e7903bd3da3aa16b250e53eba3e4cd84842f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:15:46 +0000
Subject: [PATCH 1430/3253] [cpan2nix] perlPackages.AnyEventHTTP: 2.23 -> 2.24

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1ba995e93ebd..9ac1e69c0393 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -165,10 +165,10 @@ let
   };
 
   AnyEventHTTP = buildPerlPackage rec {
-    name = "AnyEvent-HTTP-2.23";
+    name = "AnyEvent-HTTP-2.24";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb";
+      sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd";
     };
     propagatedBuildInputs = [ AnyEvent commonsense ];
   };

From 9f9379d2e4f243599a8a9e3bf0c164411fc43e82 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:16:19 +0000
Subject: [PATCH 1431/3253] [cpan2nix] perlPackages.TestMockModule: 0.15 ->
 v0.170.0

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9ac1e69c0393..4e628631b2f1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15336,10 +15336,10 @@ let
   };
 
   TestMockModule = buildPerlModule {
-    name = "Test-MockModule-0.15";
+    name = "Test-MockModule-0.170.0";
     src = fetchurl {
-      url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-0.15.tar.gz;
-      sha256 = "0nx3nz7yvgcw9vw646520hh1jb3kz6sspsfqa69v3vczdkfgx5qn";
+      url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.170.0.tar.gz;
+      sha256 = "0pggwrlqj6k44qayhbpjqkzry1r626iy2vf30zlf2jdhbjbvlycz";
     };
     propagatedBuildInputs = [ SUPER ];
     meta = {

From da9abd11a58448646e0653383edee308c60b8d92 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:16:20 +0000
Subject: [PATCH 1432/3253] [cpan2nix] perlPackages.ArchiveZip: 1.62 -> 1.64

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4e628631b2f1..c5d7c900db74 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -526,10 +526,10 @@ let
   };
 
   ArchiveZip = buildPerlPackage {
-    name = "Archive-Zip-1.62";
+    name = "Archive-Zip-1.64";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.62.tar.gz;
-      sha256 = "1jax173w7nm5r6k7ymfcskvs1rw590lyscbqrnfbkjj4cxc65wrb";
+      url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.64.tar.gz;
+      sha256 = "0zfinh8nx3rxzscp57vq3w8hihpdb0zs67vvalykcf402kr88pyy";
     };
     buildInputs = [ TestMockModule ];
     meta = {

From 8136df90da20680f78245ac7afdd606adbc39678 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:16:35 +0000
Subject: [PATCH 1433/3253] [cpan2nix] perlPackages.MailMessage: 3.006 -> 3.007

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c5d7c900db74..e615e4cf32e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9078,10 +9078,10 @@ let
   };
 
   MailMessage = buildPerlPackage rec {
-     name = "Mail-Message-3.006";
+     name = "Mail-Message-3.007";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.006.tar.gz;
-       sha256 = "08bdf06bmxdqbslk3k9av542pjhyw9wx10j79fxz0dwpalimc6zi";
+       url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.007.tar.gz;
+       sha256 = "1hpf68i5w20dxcibqj5w5h8mx9qa6vjhr34bicrvdh7d3dfxq0bn";
      };
      propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ];
      meta = {

From b2de2135fe34298f00e50a72a7df24e7abef3aaa Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:16:46 +0000
Subject: [PATCH 1434/3253] [cpan2nix] perlPackages.MailTransport: 3.002 ->
 3.003

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e615e4cf32e5..64d2e72c89e3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9186,10 +9186,10 @@ let
   };
 
   MailTransport = buildPerlPackage rec {
-     name = "Mail-Transport-3.002";
+     name = "Mail-Transport-3.003";
      src = fetchurl {
-       url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.002.tar.gz;
-       sha256 = "0wm4j9w15nsvjxi9x22fn2rnljbffd88v27p0z0305bfg35gh4kg";
+       url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.003.tar.gz;
+       sha256 = "0lb1awpk2wcnn5wg663982jl45x9fdn8ikxscayscxa16rim116p";
      };
      propagatedBuildInputs = [ MailMessage ];
      meta = {

From b866cad68bc1177c324ca2851214b80fd9950624 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:16:57 +0000
Subject: [PATCH 1435/3253] [cpan2nix] perlPackages.ModuleSignature: 0.81 ->
 0.83

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 64d2e72c89e3..d1ce7740b392 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9926,10 +9926,10 @@ let
   };
 
   ModuleSignature = buildPerlPackage {
-    name = "Module-Signature-0.81";
+    name = "Module-Signature-0.83";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.81.tar.gz;
-      sha256 = "7df547ceb8e45d40f75e481a868f389aaed5641c2cf4e133146ccea4b8facec6";
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz;
+      sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb";
     };
     buildInputs = [ IPCRun ];
     meta = {

From 4996fb9b9f953aaeca818b36122f16e4b72c8992 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:17:07 +0000
Subject: [PATCH 1436/3253] [cpan2nix] perlPackages.LinguaENTagger: 0.29 ->
 0.30

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d1ce7740b392..4b2bb92e778a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8320,10 +8320,10 @@ let
   };
 
   LinguaENTagger = buildPerlPackage {
-    name = "Lingua-EN-Tagger-0.29";
+    name = "Lingua-EN-Tagger-0.30";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.29.tar.gz;
-      sha256 = "0dssn101kmpkh2ik1430mj2ikk04849vbpgi60382kvh9xn795na";
+      url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.30.tar.gz;
+      sha256 = "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b";
     };
     propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ];
     meta = {

From c52ba3b52ac98f8423d51cffd86b4b306a93b988 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:17:44 +0000
Subject: [PATCH 1437/3253] [cpan2nix] perlPackages.LWPProtocolHttps: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4b2bb92e778a..2ca6b0929a78 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8959,7 +8959,7 @@ let
       sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j";
     };
     patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
-    propagatedBuildInputs = [ IOSocketSSL LWP MozillaCA ];
+    propagatedBuildInputs = [ IOSocketSSL LWP ];
     doCheck = false; # tries to connect to https://www.apache.org/.
     meta = {
       description = "Provide https support for LWP::UserAgent";

From 7cf45d7a3cccb25d0c8b760fdfd3ff8284133f06 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:18:06 +0000
Subject: [PATCH 1438/3253] [cpan2nix] perlPackages.LogDispatch: 2.67 -> 2.68

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2ca6b0929a78..d4e35cc117a7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8768,10 +8768,10 @@ let
   };
 
   LogDispatch = buildPerlPackage {
-    name = "Log-Dispatch-2.67";
+    name = "Log-Dispatch-2.68";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.67.tar.gz;
-      sha256 = "017ks3i0k005dqz7fz53w7x35csqqlr4vfb95c0ijdablajs4kd9";
+      url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.68.tar.gz;
+      sha256 = "1bxd3bhrn1h2q9f8r65z3101a32nl2kdb7l40bxg4vbsk4wk0ynh";
     };
     propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ];
     meta = {

From 0f1875bd65fb6c92cc79547efe97cc3a5f324403 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:18:18 +0000
Subject: [PATCH 1439/3253] [cpan2nix] perlPackages.CodeTidyAll: 0.70 -> 0.71

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d4e35cc117a7..93855e100ba7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2347,10 +2347,10 @@ let
   };
 
   CodeTidyAll = buildPerlPackage rec {
-     name = "Code-TidyAll-0.70";
+     name = "Code-TidyAll-0.71";
      src = fetchurl {
-       url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.70.tar.gz;
-       sha256 = "16s847y7jhx07yn15p84lpr1jn8srqb8ma12g4ngwr46hhkrbz06";
+       url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.71.tar.gz;
+       sha256 = "043s0fkg8y9g38m9p87jh9p1kkznz7yq96x2rnjj221hpl3zysdr";
      };
      propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ];
      buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ];

From 1c289d8ce3cb00365c52a411989e7c83276b7883 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:18:32 +0000
Subject: [PATCH 1440/3253] [cpan2nix] perlPackages.TestRoutine: 0.025 -> 0.027

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 93855e100ba7..64c9c8ca63e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15625,10 +15625,10 @@ let
   };
 
   TestRoutine = buildPerlPackage {
-    name = "Test-Routine-0.025";
+    name = "Test-Routine-0.027";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.025.tar.gz;
-      sha256 = "13gxczy0mx3rqnp55vc0j2d936qldrimmad87nmf4wrj0kd2lw92";
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz;
+      sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s";
     };
     buildInputs = [ TestAbortable TestFatal ];
     propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ];

From 0a35d732352bef698e2bb6daaad5eccdedc52177 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:18:45 +0000
Subject: [PATCH 1441/3253] [cpan2nix] perlPackages.DateTimeFormatFlexible:
 0.30 -> 0.31

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 64c9c8ca63e0..5adbf7631b8f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3717,10 +3717,10 @@ let
   };
 
   DateTimeFormatFlexible = buildPerlPackage {
-    name = "DateTime-Format-Flexible-0.30";
+    name = "DateTime-Format-Flexible-0.31";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.30.tar.gz;
-      sha256 = "e7974e0492d7801682b400dd8e9a6fbfd8a56602942883cd7867a2008734cca4";
+      url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.31.tar.gz;
+      sha256 = "0daf62fe4af0b336d45e367143a580b5a34912a679eef788d54c4d5ad685c2d1";
     };
     propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ];
     meta = {

From f32975e3fdf8d682f32d7027551961c51dec6567 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 21 Sep 2018 12:19:11 +0000
Subject: [PATCH 1442/3253] [cpan2nix] perlPackages.NetAmazonS3: 0.84 -> 0.85

dependencies:
perlPackages.TestLoadAllModules: init at 0.022
---
 pkgs/top-level/perl-packages.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5adbf7631b8f..69dd7e572b2e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11068,13 +11068,13 @@ let
   };
 
   NetAmazonS3 = buildPerlPackage rec {
-    name = "Net-Amazon-S3-0.84";
+    name = "Net-Amazon-S3-0.85";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.84.tar.gz;
-      sha256 = "9e995f7d7982d4ab3510bf30e842426b341be20e4b7e6fe48edafeb067f49626";
+      url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.85.tar.gz;
+      sha256 = "49b91233b9e994ce3536dd69c5106c968a03d199ff3968c8fc2f2b5be3d55430";
     };
-    buildInputs = [ TestDeep TestException ];
-    propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon TermEncoding TermProgressBarSimple XMLLibXML ];
+    buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ];
+    propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SubOverride TermEncoding TermProgressBarSimple XMLLibXML ];
     meta = {
       description = "Use the Amazon S3 - Simple Storage Service";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -15283,6 +15283,19 @@ let
     };
   };
 
+  TestLoadAllModules = buildPerlPackage {
+    name = "Test-LoadAllModules-0.022";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz;
+      sha256 = "1zjwbqk1ns9m8srrhyj3i5zih976i4d2ibflh5s8lr10a1aiz1hv";
+    };
+    propagatedBuildInputs = [ ListMoreUtils ModulePluggable ];
+    meta = {
+      description = "do use_ok for modules in search path";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TestLongString = buildPerlPackage rec {
     name = "Test-LongString-0.17";
     src = fetchurl {

From acbe6b2374502d3a032ff197a3d2e5f4d5d3a520 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 21 Sep 2018 14:34:09 +0200
Subject: [PATCH 1443/3253] Revert "burp: 2.1.32 -> 2.2.4"

2.2.4 is not considered a stable version and is actually old.

This reverts commit fa693e95f4f9c890d4aa56b5133466b648066f95.
---
 pkgs/tools/backup/burp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index 3ef6be79531b..4133478dbf98 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "burp-${version}";
-  version = "2.2.4";
+  version = "2.1.32";
 
   src = fetchFromGitHub {
     owner = "grke";
     repo = "burp";
     rev = version;
-    sha256 = "0y63z1vcm5h7s0q5lv94gpdqnfgi2qb0g0h81idai5p0yqw09v8h";
+    sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7ff90cd103c2fca386ed085afb0559380996d239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 21 Sep 2018 14:37:39 +0200
Subject: [PATCH 1444/3253] pyre: 0.0.11 -> 0.0.14

---
 pkgs/development/tools/pyre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix
index c466d39eb4e1..99e53610c01c 100644
--- a/pkgs/development/tools/pyre/default.nix
+++ b/pkgs/development/tools/pyre/default.nix
@@ -3,7 +3,7 @@
 let
   # Manually set version - the setup script requires
   # hg and git + keeping the .git directory around.
-  pyre-version = "0.0.11";
+  pyre-version = "0.0.14";
   versionFile = writeScript "version.ml" ''
     cat > "./version.ml" <<EOF
     open Core
@@ -24,7 +24,7 @@ let
     owner = "facebook";
     repo = "pyre-check";
     rev = "v${pyre-version}";
-    sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l";
+    sha256 = "0c8xzaa3ljqb6llr041sydw0l4xqn7x21nw9vaymdxh35nx9bp2v";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 55a523663032aaacb7d171723af8beeebbba1001 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 07:46:19 -0500
Subject: [PATCH 1445/3253] xf86-input-libinput: 0.26.0 -> 0.28.0

https://cgit.freedesktop.org/xorg/driver/xf86-input-libinput/log/
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/overrides.nix     | 4 ++--
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c9e8dd04c470..5bd35b509ad8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1760,11 +1760,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.26.0";
+    name = "xf86-input-libinput-0.28.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2;
-      sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2;
+      sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ inputproto xorgserver xproto ];
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b1a749c7ec4a..32a4e67642ad 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -335,10 +335,10 @@ in
   };
 
   xf86inputlibinput = attrs: attrs // rec {
-    name = "xf86-input-libinput-0.26.0";
+    name = "xf86-input-libinput-0.28.0";
     src = args.fetchurl {
       url = "mirror://xorg/individual/driver/${name}.tar.bz2";
-      sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb";
+      sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691";
     };
     outputs = [ "out" "dev" ];
     buildInputs = attrs.buildInputs ++ [ args.libinput ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 6e67e8eb6e14..ca77e6408149 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -123,7 +123,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

From 544eaaa52b59a81195b3ef40a2dd091f81eb0fb4 Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Fri, 21 Sep 2018 15:54:48 +0200
Subject: [PATCH 1446/3253] lua: remove lua4 and lua5_0

Both versions are not maintained anymore upstream and have open security
issues, e.g. https://nvd.nist.gov/vuln/detail/CVE-2014-5461.

The same holds for lua5_1 but that seems to be in use in some places.

Re #47122
Re #47123
---
 .../interpreters/lua-4/default.nix            | 32 -------------------
 pkgs/development/interpreters/lua-5/5.0.3.nix | 32 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 66 deletions(-)
 delete mode 100644 pkgs/development/interpreters/lua-4/default.nix
 delete mode 100644 pkgs/development/interpreters/lua-5/5.0.3.nix

diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
deleted file mode 100644
index be49d2dd9215..000000000000
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "lua-4.0.1";
-
-  src = fetchurl {
-    url = https://www.lua.org/ftp/lua-4.0.1.tar.gz;
-    sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
-  };
-
-  configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";
-  buildFlags = "all so sobin";
-  installFlags = "INSTALL_ROOT=$$out";
-
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  meta = {
-    homepage = http://www.lua.org;
-    description = "Powerful, fast, lightweight, embeddable scripting language";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      for configuration, scripting, and rapid prototyping.
-    '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    branch = "4";
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
deleted file mode 100644
index d343ec6c63b1..000000000000
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "lua-5.0.3";
-
-  src = fetchurl {
-    url = https://www.lua.org/ftp/lua-5.0.3.tar.gz;
-    sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
-  };
-
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config";
-  buildFlags = "all so sobin";
-  installFlags = "INSTALL_ROOT=$$out";
-  installTargets = "install soinstall";
-
-  meta = {
-    homepage = http://www.lua.org;
-    description = "Powerful, fast, lightweight, embeddable scripting language";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      for configuration, scripting, and rapid prototyping.
-    '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad0625a66091..c6448a0b4bd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7501,8 +7501,6 @@ with pkgs;
 
   ### LUA MODULES
 
-  lua4 = callPackage ../development/interpreters/lua-4 { };
-  lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { };
   lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { };
   lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { };
   lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix {

From 45dc194f723622f987f2f1ad6e9eb7f4e677b91e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 07:32:48 -0500
Subject: [PATCH 1447/3253] libinput: 1.11.3 -> 1.12.0

---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index d42bd315d22f..925b278f5b71 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.11.3";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk";
+    sha256 = "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m";
   };
 
   outputs = [ "bin" "out" "dev" ];

From a2bf8dbb398e13f26f59e3f4cdb05dd4656f6a8e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 07:37:38 -0500
Subject: [PATCH 1448/3253] libinput: fix build w/1.12.0

---
 pkgs/development/libraries/libinput/default.nix             | 6 ------
 .../development/libraries/libinput/udev-absolute-path.patch | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 925b278f5b71..4c85971cc3ce 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -46,12 +46,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./udev-absolute-path.patch ];
 
-   preBuild = ''
-    # meson setup-hook changes the directory so the files are located one level up
-    patchShebangs ../udev/parse_hwdb.py
-    patchShebangs ../test/symbols-leak-test.in
-  '';
-
   doCheck = testsSupport;
 
   meta = {
diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch
index fb22fea40e80..5c85b8639486 100644
--- a/pkgs/development/libraries/libinput/udev-absolute-path.patch
+++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch
@@ -5,7 +5,7 @@
  
  udev_rules_config = configuration_data()
 -udev_rules_config.set('UDEV_TEST_PATH', '')
-+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
++udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/')
  configure_file(input : 'udev/80-libinput-device-groups.rules.in',
  	       output : '80-libinput-device-groups.rules',
  	       install : true,

From 90268efa3873e5f0de59e13c07ef0c995c60623a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 08:33:57 -0500
Subject: [PATCH 1449/3253] cryus-sasl: cleanup, fix w/musl (although not at
 all musl-specific)

musl is fixed by disabling update of config.{guess,sub}.
---
 .../development/libraries/cyrus-sasl/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 7a9e3991aadb..619c0801e960 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -36,15 +36,15 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-openssl=${openssl.dev}"
+    "--with-plugindir=${placeholder "out"}/lib/sasl2"
+    "--with-saslauthd=/run/saslauthd"
+    "--enable-login"
+    "--enable-shared"
   ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
 
-  # Set this variable at build-time to make sure $out can be evaluated.
-  preConfigure = ''
-    configureFlagsArray=( --with-plugindir=$out/lib/sasl2
-                          --with-saslauthd=/run/saslauthd
-                          --enable-login
-                        )
-  '';
+  # Avoid triggering regenerating using broken autoconf/libtool bits.
+  # (many distributions carry patches to remove/replace, but this works for now)
+  dontUpdateAutotoolsGnuConfigScripts = true;
 
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://cyrusimap.web.cmu.edu/;
+    homepage = https://www.cyrusimap.org/sasl;
     description = "Library for adding authentication support to connection-based protocols";
     platforms = platforms.unix;
   };

From 7ac0ecc12be54adf4d0ee146ae5c5a74957e7ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Sep 2018 12:41:21 -0300
Subject: [PATCH 1450/3253] rage: add dependency on mesa_noglu.dev (#47132)

---
 pkgs/desktops/enlightenment/rage.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
index 5de225220733..e7dfb5ca3989 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rage-${version}";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     (pkgconfig.override { vanilla = true; })
+    mesa_noglu.dev
     wrapGAppsHook
   ];
 

From cb212f78e08ca74334ad7c5e93839d844281870b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Sep 2018 08:56:11 -0700
Subject: [PATCH 1451/3253] nwipe: 0.24 -> 0.25 (#46996)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nwipe/versions
---
 pkgs/tools/security/nwipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index 214ffccc7aea..a27ed7bad1a5 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.24";
+  version = "0.25";
   name = "nwipe-${version}";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${version}";
-    sha256 = "0zminjngz98b4jl1ii6ssa7pkmf4xw6mmk8apxz3xr68cps12ls0";
+    sha256 = "1hx041arw82k814g9r8dqsfi736mj5nlzp2zpi8n2qfqfc1q8nir";
   };
   nativeBuildInputs = [ automake autoconf pkgconfig ];
   buildInputs = [ ncurses parted ];

From 2ed26f583805fd62d3b2a6188a39a6833142d3a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Sep 2018 08:56:47 -0700
Subject: [PATCH 1452/3253] shotcut: 18.08.14 -> 18.09.16 (#46963)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
---
 pkgs/applications/video/shotcut/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index dea7e7f86a94..a92cb5eb1e14 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.08.14";
+  version = "18.09.16";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "074df9vc0rdb4byalaarq522vkfq5mrhxs4dgbyqls3ryd3hj1ds";
+    sha256 = "0mv28v9c45gvf1jizb7zwmhcckpy7mznpai1zncc5gb5p7kqf56y";
   };
 
   enableParallelBuilding = true;

From 907a9fa83db9948d79541ba39bf1b24ff35bc16e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Sep 2018 08:57:55 -0700
Subject: [PATCH 1453/3253] smarty3: 3.1.32 -> 3.1.33 (#46947)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/smarty3/versions
---
 pkgs/development/libraries/smarty3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 2fce5b3368f7..66bfd601a62d 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
   name = "smarty3-${version}";
-  version = "3.1.32";
+  version = "3.1.33";
 
   src = fetchFromGitHub {
     owner = "smarty-php";
     repo = "smarty";
     rev = "v${version}";
-    sha256 = "1rfa5pzr23db1bivpivljgmgpn99m6ksgli64kmii5cmpvxi00y2";
+    sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix";
   };
 
   installPhase = ''

From 60b6d5f8a8c5c2f2e50e446dbe0e07575b535e82 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 21 Sep 2018 19:09:29 +0300
Subject: [PATCH 1454/3253] acl2: 8.1.post.2018.09.20 -> 8.1; turns out there
 is a release

---
 pkgs/development/interpreters/acl2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index a0da6e0ee7f8..cc88b32119e7 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,15 @@
 
 let hashes = {
   "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
-  "8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6";
+  "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
 };
 revs = {
   "8.0" = "8.0";
-  "8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770";
+  "8.1" = "8.1";
 };
 in stdenv.mkDerivation rec {
   name = "acl2-${version}";
-  version = "8.0.post.2018.09.20";
+  version = "8.1";
 
   src = fetchFromGitHub {
     owner = "acl2-devel";

From e372ab46265a3dd083e5abee646741b6b5e35caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Sep 2018 13:25:51 -0300
Subject: [PATCH 1455/3253] ephoto: add dependency on mesa_noglu.dev (#47136)

---
 pkgs/desktops/enlightenment/ephoto.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 6a49852909e6..ad4620d4f450 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "ephoto-${version}";
@@ -9,9 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
   };
 
-  nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ];
+  nativeBuildInputs = [
+    (pkgconfig.override { vanilla = true; })
+    mesa_noglu.dev # otherwise pkg-config does not find gbm
+    makeWrapper
+  ];
 
-  buildInputs = [ efl pcre ];
+  buildInputs = [
+    efl
+    pcre
+  ];
 
   meta = {
     description = "Image viewer and editor written using the Enlightenment Foundation Libraries";

From e2ed4f3d2267b0268cff1b27611140448486ae39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Sep 2018 13:30:12 -0300
Subject: [PATCH 1456/3253] numix-cursor-theme: 20160110 -> 1.1 (#47016)

---
 .../data/icons/numix-cursor-theme/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix
index edeb61c6d3e1..8e5a317082ea 100644
--- a/pkgs/data/icons/numix-cursor-theme/default.nix
+++ b/pkgs/data/icons/numix-cursor-theme/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, inkscape, xcursorgen }:
 
 stdenv.mkDerivation rec {
-  version = "20160110";
-
+  version = "1.1";
   package-name = "numix-cursor-theme";
-
   name = "${package-name}-${version}";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "e92186d9df47c04d4e0a778eb6941ef58590b179";
-    sha256 = "1sr4pisgrn3632phsiny2fyr2ib6l51fnjdsanmh9ampagl4ly7g";
+    rev = "v${version}";
+    sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi";
   };
 
-  dontBuild = true;
+  nativeBuildInputs = [ inkscape xcursorgen ];
+
+  buildPhase = ''
+    patchShebangs .
+    HOME=$TMP ./build.sh
+  '';
 
   installPhase = ''
     install -dm 755 $out/share/icons
-    cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/
+    cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/
   '';
 
   meta = with stdenv.lib; {

From 45de1594d74a4b7bf1191b985aec44f38b57e288 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Sep 2018 09:33:16 -0700
Subject: [PATCH 1457/3253] clipgrab: 3.6.9 -> 3.7.0 (#47082)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/clipgrab/versions
---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 96e0bb04031b..c54a9358b609 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
-  version = "3.6.9";
+  version = "3.7.0";
 
   src = fetchurl {
-    sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v";
+    sha256 = "0rx12218yy6h27z3xsmmxfsw8ldlsf4y862adkz6ybrygppsaib4";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${name}.tar.gz";
   };

From da84efcd12dd3029e42b3bd0a384fe8634913cda Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 21 Sep 2018 17:56:35 +0200
Subject: [PATCH 1458/3253] libretro.mame: 2017-03-02 -> 2018-09-13

Fixes build of the MAME libretro core.

Closes #47137.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
---
 pkgs/misc/emulators/retroarch/cores.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 371ace848fb7..2eef6009ac26 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -234,8 +234,8 @@ in with stdenv.lib.licenses;
     core = "mame";
     src = fetchRetro {
       repo = "mame";
-      rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
-      sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
+      rev = "9f9e6b6c9bde4d50c72e9a5c80496a1fec6b8aa9";
+      sha256 = "0lfj8bjchkcvyb5x0x29cg10fkfklxndk80947k4qfysclijxpkv";
     };
     description = "Port of MAME to libretro";
     license = gpl2Plus;

From ab2f86aec3c5d9bc97041a47b76bfe757a33e19a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Sep 2018 17:02:48 +0000
Subject: [PATCH 1459/3253] ocamlPackages.erm_xml: 0.3 -> 0.3+20180112

---
 pkgs/development/ocaml-modules/erm_xml/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix
index c944752ff6b6..35b5c73b578b 100644
--- a/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
 
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "erm_xml is not available for OCaml ${ocaml.version}"
 else
 
-let version = "0.3"; in
+let version = "0.3+20180112"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-erm_xml-${version}";
+  name = "ocaml${ocaml.version}-erm_xml-${version}";
 
   src = fetchzip {
-    url = "https://github.com/ermine/xml/archive/v${version}.tar.gz";
-    sha256 = "19znk5w0qiw3wij4n6w3h5bcr221yy57jf815fr8k9m8kin710g3";
+    url = "https://github.com/hannesm/xml/archive/bbabdade807d8281fc48806da054b70dfe482479.tar.gz";
+    sha256 = "1gawpmg8plip0wia0xq60m024dn7l3ykwbjpbqx9f9bdmx74n1rr";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
 
   meta = {
-    homepage = https://github.com/ermine/xml;
+    homepage = https://github.com/hannesm/xml;
     description = "XML Parser for discrete data";
     platforms = ocaml.meta.platforms or [];
     license = stdenv.lib.licenses.bsd3;

From 26aa4c36baa119cb108b9949190eb170a16c9ff6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Sep 2018 17:01:52 +0000
Subject: [PATCH 1460/3253] ocamlPackages.erm_xmpp: 0.3 -> 0.3+20180112

---
 .../instant-messengers/jackline/default.nix   |  2 +-
 .../ocaml-modules/erm_xmpp/0.3.nix            | 29 -------------
 .../ocaml-modules/erm_xmpp/default.nix        | 43 +++++++++----------
 pkgs/top-level/ocaml-packages.nix             |  2 -
 4 files changed, 22 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/erm_xmpp/0.3.nix

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 9f85c940c1bc..e8cbd27de614 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with ocamlPackages; [
                   ocaml ocamlbuild findlib topkg ppx_sexp_conv
-                  erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
+                  erm_xmpp tls nocrypto x509 ocaml_lwt otr astring
                   ptime notty sexplib hex uutf
                 ];
 
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix b/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
deleted file mode 100644
index 1a8f854185a2..000000000000
--- a/pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }:
-
-buildOcaml rec {
-  version = "0.3";
-  name = "erm_xmpp";
-
-  src = fetchFromGitHub {
-    owner  = "hannesm";
-    repo   = "xmpp";
-    rev    = "eee18bd3dd343550169969c0b45548eafd51cfe1";
-    sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5";
-  };
-
-  buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ erm_xml nocrypto ];
-
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
-  buildPhase = "ocaml setup.ml -build";
-  installPhase = "ocaml setup.ml -install";
-
-  createFindlibDestdir = true;
-
-  meta = {
-    homepage = https://github.com/hannesm/xmpp;
-    description = "OCaml based XMPP implementation (fork)";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
index c6027ce11ce5..a6bb75e61c24 100644
--- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
@@ -1,33 +1,32 @@
-{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocamlbuild, erm_xml, cryptokit, camlp4 }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild
+, erm_xml, nocrypto
+}:
 
-let
-  version = "0.2";
-  disable-tests = fetchurl {
-    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch;
-    sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1";
+stdenv.mkDerivation rec {
+  version = "0.3+20180112";
+  name = "ocaml${ocaml.version}-erm_xmpp-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "hannesm";
+    repo   = "xmpp";
+    rev    = "184dc70fab7d46d09b9148ca4448f07f1e0a2df2";
+    sha256 = "1dsqsfacvd9xqsqjzh6xwbnf2mv1dvhy210riyvjd260q085ch6n";
   };
-in
-
-stdenv.mkDerivation {
-  name = "ocaml-erm_xmpp-${version}";
-
-  src = fetchzip {
-    url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
-    sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2";
-  };
-
-  patches = [ disable-tests ];
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
-  propagatedBuildInputs = [ erm_xml cryptokit ];
+  propagatedBuildInputs = [ erm_xml nocrypto ];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
 
   createFindlibDestdir = true;
 
   meta = {
-    homepage = https://github.com/ermine/xmpp;
-    description = "OCaml based XMPP implementation";
-    platforms = ocaml.meta.platforms or [];
+    homepage = https://github.com/hannesm/xmpp;
+    description = "OCaml based XMPP implementation (fork)";
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f5e5cfb3972b..6039ef7dcf14 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -240,8 +240,6 @@ let
 
     erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
 
-    erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { };
-
     estring = callPackage ../development/ocaml-modules/estring { };
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };

From dbd57837913b6322a314c52a071a8b343318b543 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 24 Jun 2018 08:27:33 +0000
Subject: [PATCH 1461/3253] jackline: 2017-12-24 -> 2018-05-11

---
 .../instant-messengers/jackline/default.nix   |  8 ++---
 .../jackline/tls-0.9.0.patch                  | 29 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch

diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index e8cbd27de614..689445d7dcb8 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,18 +3,16 @@
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
 stdenv.mkDerivation rec {
-  version = "2017-12-24";
+  version = "2018-05-11";
   name = "jackline-${version}";
 
   src = fetchFromGitHub {
     owner  = "hannesm";
     repo   = "jackline";
-    rev    = "8678e8a1a06e641218a31ae25150040202f89289";
-    sha256 = "05z9kvd7gwr59ic7hnmbayhwyyqd41xxz01cvdlcgplk3z7zlwg5";
+    rev    = "bc36b1c8b80fee6baba4f91011cd01b82a06e8eb";
+    sha256 = "1xx2yx8a95m84sa1bkxi3rlx7pd39zkqwk3znj0zzz3cni6apfrz";
   };
 
-  patches = [ ./tls-0.9.0.patch ];
-
   buildInputs = with ocamlPackages; [
                   ocaml ocamlbuild findlib topkg ppx_sexp_conv
                   erm_xmpp tls nocrypto x509 ocaml_lwt otr astring
diff --git a/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch b/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch
deleted file mode 100644
index 38f38a03a802..000000000000
--- a/pkgs/applications/networking/instant-messengers/jackline/tls-0.9.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/cli/cli_config.ml b/cli/cli_config.ml
-index 991ee77..59a0edb 100644
---- a/cli/cli_config.ml
-+++ b/cli/cli_config.ml
-@@ -207,7 +207,9 @@ let configure term () =
-     ask above "CA file: " (fun x -> x) (fun x -> if Sys.file_exists x then `Ok x else `Invalid) term >>= fun trust_anchor ->
-     Lwt_unix.access trust_anchor [ Unix.F_OK ; Unix.R_OK ] >>= fun () ->
-     X509_lwt.certs_of_pem trust_anchor >>= fun tas ->
--    (match X509.Validation.valid_cas ~time:(Unix.time ()) tas with
-+    let time = match Ptime.of_float_s (Unix.time ())
-+      with Some time -> time | None -> assert false in
-+    (match X509.Validation.valid_cas ~time tas with
-      | [] -> Lwt.fail (Invalid_argument "trust anchor file is empty!")
-      | _ -> Lwt.return (`Trust_anchor trust_anchor))
-   | Some fp -> Lwt.return (`Fingerprint fp) ) >>= fun authenticator ->
-diff --git a/cli/cli_state.ml b/cli/cli_state.ml
-index d5db502..91540c9 100644
---- a/cli/cli_state.ml
-+++ b/cli/cli_state.ml
-@@ -262,7 +262,8 @@ module Connect = struct
-           (match config.Xconfig.authenticator with
-            | `Trust_anchor x -> X509_lwt.authenticator (`Ca_file x)
-            | `Fingerprint fp ->
--             let time = Unix.gettimeofday () in
-+             let time = match Ptime.of_float_s (Unix.gettimeofday ())
-+               with Some time -> time | None -> assert false in
-              let fp =
-                Nocrypto.Uncommon.Cs.of_hex
-                  (String.map (function ':' -> ' ' | x -> x) fp)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6448a0b4bd6..6aa6f2df1923 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16954,9 +16954,7 @@ with pkgs;
     extra-packages = [ csound ];
   };
 
-  jackline = callPackage ../applications/networking/instant-messengers/jackline {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
-  };
+  jackline = callPackage ../applications/networking/instant-messengers/jackline { };
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
 

From 73862bf8121ddc7aa41bbec3e26bcb6244f18713 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 21 Sep 2018 19:08:25 +0200
Subject: [PATCH 1462/3253] haskellPackages.mandrill: fix build for ghc843

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5d751992fa71..64a82ed42a87 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1130,4 +1130,10 @@ self: super: {
   safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
   safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };
 
+  # https://github.com/adinapoli/mandrill/pull/52
+  mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
+    url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
+    sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 203b0ac9824ff1863adee4ec90450f9c8ffc62d3 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 21 Sep 2018 12:42:36 -0500
Subject: [PATCH 1463/3253] s-tui: 0.7.5 -> 0.8.2 (#47133)

---
 pkgs/tools/system/s-tui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 935b49f95db3..35a26eb7daee 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "s-tui";
-  version = "0.7.5";
+  version = "0.8.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "01w5jh0p66jk4h3cmif4glq42zv44zhziczxjwazkd034rp8dnv9";
+    sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From d7b8f68c05da04f6b3931d590b2d97e537963b76 Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Fri, 21 Sep 2018 20:08:02 +0200
Subject: [PATCH 1464/3253] pythonPackages.dependency-injector: 3.13.1 ->
 3.13.2 (#47139)

---
 .../python-modules/dependency-injector/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 6eec8ab91cd2..05f1c965f401 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage, fetchPypi, six, unittest2 }:
 
 buildPythonPackage rec {
   pname = "dependency-injector";
-  version = "3.13.1";
+  version = "3.13.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bmcgdfjavgxdzkb904q968ig1x44arvpj2m4rpm5nc9vhhgq43q";
+    sha256 = "0kgb40qspibr1x8ksv0whrr7v0jy20dnqzmc591hm2y4kwzl5hdw";
   };
 
-  # TODO: Enable tests after upstream merges https://github.com/ets-labs/python-dependency-injector/pull/204
-  doCheck = false;
-
   propagatedBuildInputs = [ six ];
+  checkInputs = [ unittest2 ];
+
+  checkPhase = ''
+    unit2 discover tests/unit
+  '';
 
   meta = with stdenv.lib; {
     description = "Dependency injection microframework for Python";

From 5b79f81a39130d26785ed16ca82a5c9c910c2638 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 22 Sep 2018 03:12:20 +0900
Subject: [PATCH 1465/3253] firefox-bin: 61.0.2 -> 62.0.2

---
 .../browsers/firefox-bin/release_sources.nix  | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 594cf175e9eb..1500597318f3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0";
+  version = "62.0.2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ach/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ach/firefox-62.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "68a0802cccd72ffd36bc9188fb96b819b6357b889630173294f92af4dcf719389d678232b986ff6aeb258d2cd149d670d70c2bc90309dc61fb359b1d3011cc6a";
+      sha512 = "30660e1377c125ec195006d84ba5ae356c8b53b21865675ac7649ffadd169e578ab91d0107f18f26530788ae66aacb7edeec1c507bccb456e1aa89bac95351dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/af/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/af/firefox-62.0.2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "afdb463bc4bb5f0f3ba95a0af9430d5407a707b7cdd181c44ba0d343230d75e16a3078bc1f412dce8248991b8e752480be885355e394c1e4a4465c7c1929075e";
+      sha512 = "81e3d9b33af731c9a79bdac678c84d2f30de0b77b6d90d4adaa7da11383e360444f85bf7465add562048d13692cce88b3fb1bd63beac30a6d490f6b75eb9be26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/an/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/an/firefox-62.0.2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "c54b5365a97c44559aeac1c50a5d22250eabb94180987e3745bc875e7f2d7a843fd1282946cf5f27e53f4e0e6958a00376e6f761333e9bd5fd9ae7f6c081e1a0";
+      sha512 = "42d3118c2bba77aed919a1675538f52230841ec6c8398e2b9964631100c22c70335fc80f8757a916aef7c0ebabccc5356ca323901061d1bd0e5ad4eb0a10b483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ar/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ar/firefox-62.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "08d5c5aefa22408c15a44646ef1b82ec3100a8bd69beb68a1d34029d2b0b554e110092ea5ee905bd866393cf506cd658591bba2e6f670943b21187015d99a836";
+      sha512 = "c6a5a647e17b8b4fb4e20a32c2e492c6102cb899acf5af2d3af3af3cd122d989bfa452638d038b9b7c8c0bbade604f6caa11f42cbde5a3260fb13e44080cd720";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/as/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/as/firefox-62.0.2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "c403ca739506adc934e3453bff0e282ed514580895dcab70d41ac92499feabaa0d811a821b4441b988a3c12320735794d891620e06c8f081f13882f3bb6a56e8";
+      sha512 = "c1664a83e3dbd7b3041449ab4f7b9b41b038425c126572d380bf9c5d1d7318264a8ba798d670156ba91625de0865ed0b6e4e38bbd2ea700a118b64bbeea95b25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ast/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ast/firefox-62.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8d0e1c648c9eb8ddf8987360be83238eb6daf578f090687071ad5a63ff76028ebb4a988115a8ff9f7c40dc3522f06b4f79626f2ec8371040c76501457b93bcc6";
+      sha512 = "31c15cde2d9a0f93fa742c41032e8b6e06ad24a5e6126c953e70c0addc5d1a74c5b5d06088002b4c1516a1f75b2e3e82d9d04c0a624db781bde2d3e8182062f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/az/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/az/firefox-62.0.2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "2cc58aa3833572ae3a97e0d2b70caf19f5429d360da8d3587399a3ef71b48bd1565b0a6eb560c032c45984930e74ad072ca6806686a18cbd7a0ee24805524a64";
+      sha512 = "8d3f949c325bd5efb9619e96f8d8688324d113ac7add21b1d3290c160bba1e2193f923a54d3ce295e75b2ea0a59ab9c718e117374a46963ef69c53f3ceaa1957";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/be/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/be/firefox-62.0.2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fa196010cf483c3f8a4bf63934cb54f543fd00bf8cee45d76aac29675a2b95757f687f8584e7f9122fa1e82b007aa13ef06f0c8fed7dcdea059223f3607db0ed";
+      sha512 = "7cb5fd02ba28c54acb1c73320f794165c0debf35a35c5e15602ccb7677b879ef41c910deb4668c0f160663b7a6afa43f30492fc23691406848e6adde7fcd0b02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bg/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bg/firefox-62.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e0f107ab8248ee3e1bdb30ed081e415f03dba9068599f9596706dc4fb907be7737a9f2378e347aeedd667f2526a5b5753c4f35b004da6db6dfc9ca1593e9c91e";
+      sha512 = "c6484b8b19941e135d2dd983085325d9f5bef118105879b0f830762ec1899096146a454397510286a902d175f9ad4eb3e849fdce38844535bc8a92bcaa478862";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-BD/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-BD/firefox-62.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "794d93fa5bc61186b3cc1d7866a13d155420d6f829e9b20377c8bd8ed66418b92eac08e843170893a23249fefd7fb4c5a93df89fc9249b8de00ad803b9aad0ab";
+      sha512 = "4526b294ea939f88c92a3275ea17fe16932b410b0114af03d9f3db892cf6ed1a9d0ae0a6e0a651a0599aaee9bf53c69273b8d0286b94656635b3357ee2ab021a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-IN/firefox-62.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "1ba17cf852e267f1adf9192d0081e03b7d96f4a23cb83ff1a67f31d7340b234037a6def0c821fb4a872fd011999b14b464a3041d308cf5135382c2164f9832c8";
+      sha512 = "3a17f78a48c7657d7ed834f4c05b523d661c5a692e27751e48ed8ea6f580cee21295b025a2474bca10fdc803ade0acef0ff0f0ce40de992a1fd072ca70a1062e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/br/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/br/firefox-62.0.2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7ff933244cabb95fbdad1a64ae900f6fd694dacf1d76621865b4a2066624c31f0686c4dff53add7523749d6f5befe6ec7bbf0160e426e1a02457f8d3d5e15016";
+      sha512 = "7932c59f390580c3a9f333fe40ddb9aace2c7d35703ec022468c503b4e58604fff777fb86e44cfcb84186845e8da26f55a7d0584d09982e88ee08e2b205f289e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bs/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bs/firefox-62.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "dfd9a7b8f2f355f274dca7941349512339aeaa9da4412681a4e933cf0e1e9396d57d60887fca59c341e70496dd7073647794fbb4c8bcd1abd7b5062ee6809b53";
+      sha512 = "509b1d013a5ef5bf5f5a8167685a7232ee400202c1bfda37eab1ad8965cf0d7a6ae2988163be050b5d37741bb405df5b28aa937c82e086708cd6d943b5215ede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ca/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ca/firefox-62.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3785649ca22ab7882f751d0c2223589b7c8b5fa04bb0786ba5f64be405ba89a665244e7f4882d77a85569c46da9f6bc1d3fc95f0ff77e57f02cb8a7dc22f5b67";
+      sha512 = "75b918bb00c9039228b8881ac8fef4dbd36521b80651dc2d6b1ad1f6701ca39f3527b244c88d9e97ba1ac0a6e12ea7b6a3c40f9b95c0c2167e7c175b5d9ce37e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cak/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cak/firefox-62.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e367d02bf8c743f7a5c42b6ca19521813ba31f6a6525f4fbd4ecf418c9927a083d218ded1ae8b11084d4cc5707f97312b327a40735d638e1d3ea07056dce7070";
+      sha512 = "8803b41c4651174e4999804071b27d7cbf47497a8a5b83488654d0586fd6245d5d517c03e64e8e75ccc0991b2be47cb0ee95143d08828027e627409fe6c55cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cs/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cs/firefox-62.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "cfa21baf935d6e325b6ea13d19796ae7adb51bfa6923f7f13e5138628f8064154bbfc5a4a0131a147383b2bf723e1abc46a79b698b2682602faa9a8f80b5e6cc";
+      sha512 = "182cd25579ad04713852e0343e0d9604f42772a4c6ad06da512a8286314451f7b90c667c2f199afd1a1162c8ff6d1320abfc87207602182a3cb32196916189d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cy/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cy/firefox-62.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "0a9ad3a8ba02b863194fe4ba347be568fdb92bd72352251220f673349b77ebdb2b2c6e828e98c1c757fe3d4484783528e5f0129ae994a2f0226a17040a2f8c7a";
+      sha512 = "c65fff984a351cc67dba5574e7d2b3291de4e6c78f7659a6020d70f09cdb3bc951696ba88b778df4057633e9e06013799af58f5f2d0a052bdc22e7c98aaec278";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/da/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/da/firefox-62.0.2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "21ce01d959f36084dacdcd52cd26440a67e724c79361ed1897371fe4b33a853c72fc4feec6fee446ef47c1ce29c4a88392266bfca08189f1d99127ca637b8be1";
+      sha512 = "e9fa596fb6c825fd3c2b1d5f42ad1c192db42ee046ad2f348733a979135d41bf2b0efbcd8ac2fb68e0337890ac3131a3454425425ef727225786ab0cb51f4d9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/de/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/de/firefox-62.0.2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cae69bd2193db9888ed3a415ed7147dc3002c05029a6cf3e7a010259919dfb0f209055b20e259459f008b99317a215cf6962ab173fac0f1e57c86341571d0eae";
+      sha512 = "7a4c786b18299378c4d8b797e99385e35ad501912f05c02bad311665be6d52a6435a3fa04c7a8ae8a562af654aa3cf17eb497fc9691fbd0b2cf46a67f5967353";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/dsb/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/dsb/firefox-62.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "4583f05b675973a2818b06baf771474b7bff9ec741c2e606cce13f6e4b153f92fadfb0c15d91c4a25d492a38fc3c48180cb6c7ea5e433aa774a9fffe26f4e593";
+      sha512 = "52ae2b79d9106fb304b4b3b945ac9960614efdc7780406e87bbe1dc15effc049e8cbb91c8f4f2dcd1966ed0085e3574e3e1a4234d933fa587e05901875234344";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/el/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/el/firefox-62.0.2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4419885f9b6510edbf2797a047a08c97008731ce4fad19cda1fde4ab70b8912c9aa96df533f9b138d843303e549baa30ff9338bd9531b3044bdcc521cff14678";
+      sha512 = "956d5d36ec255ec122c09edda12a2242bbbb03793385fa9c417fbb8037fb19506298a31bed94eb39e825e4fcb66184901b3580ced8812cbc44f8a4d8ba339d19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-CA/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-CA/firefox-62.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "86cf4dda9c21faea5d5031f423c7badb1876b225ad618fa8c1dd49803d65aec1032bedfded3278dc19d84c1f88688cd4ba31a27ad6f706ad55e9b407e3151f9a";
+      sha512 = "6a93cedce6724a19ea663e70ef9d57d27c144c1250c438ff15cd8d36c3d92b8a95c9e3f81fb53862b550d0765a8f0b7bdc14d6d9929a41f18357e0d0cfae732e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-GB/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-GB/firefox-62.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "278d00ec48c2d88d3aa5bedbc9443e82f367a2c9f8261f624eef42fcbfb83d74a3f35d6ad450ef3974ca8a19f7e654c93c40c1941264a2372fafdbb803c08f40";
+      sha512 = "c3f825196d8f1d1284644ebf07f08a7626086c869408603d50ded5b0eeaa98bb9f874c7df38bbbf3083dbb4a1ae8afa8e4c90ed35a83fd99bec78cf3813dd92e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-US/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-US/firefox-62.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f4dfc51d6c8f9ccac869691ea4efb0f5fd8257d661698dba4eb7cc9fb7d28314e00a09ec595d424186cc928c8a6f9f93af0efcb3651eaa4fa40f81cfda73770d";
+      sha512 = "f19a938af6bfe6499bb4e4337ece1cc0918fe56b361ced0f131f010652b2849d98e48a7cd06277580cc87843454c7bdfe816b65c99189e1ba749aaa64059a6ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-ZA/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-ZA/firefox-62.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "f6036fe984da3057e76d324c76a2cfb17903d73f3e6bc7884338bb0ef0f9f68ef69e94ee93331f81e17a8eacc40827263c74e5aeb9a70420c7cf0670a205c61c";
+      sha512 = "0214fbf75843617b0623eea8c8ea2ef46d23d739f63a74ff47fc87ff16817d9110862696f92ba614167386bc51c5e94a9627d0dcdd22c19c20bac4a24543c126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eo/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eo/firefox-62.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "011a742e57cdc2134115ea294782716bdc49ac4d2d7b06bfed048f75d18a5780cb93a16cd0ec6b8017e6b8299a5b260015adfcb3f093883703ed9403768555f0";
+      sha512 = "7da531166d26dfa3cd1edc327eecd583e10c8a2c41d007daba41e6f28e42159e1c43be5759061891c74ab0157ca3d4ce58b8a6a7d879ad4ce4c50586341b460e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-AR/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-AR/firefox-62.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f86be240d21d47eda8bb04ff6b502ccee3c94afd6763239c5a79e094532facb8e8beefdf024c089d35ecffbd687febde5a4f10f362fd3c4d71bdabdc3ef1ce04";
+      sha512 = "e5bc4003ec881a41a28b6847dc9d90c81dec5ba9d103111922fdcc718713c67027f5b04a9d608d4e8b20a656abd94e0c5c8d5819135e8884d84eeb952b855590";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-CL/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-CL/firefox-62.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e6be4bff771e5c64d35fdce320fcd80283c964e16fa938824adfa6dff9c69c721ee9184a1f37de86ac42f730ebc7b4c8355d151306e761bc96308868d6d349a9";
+      sha512 = "c5360481d7a86bddb87805672dedab22735e484e3a048e5e57e9265034ac40d0e5586bedab617da1cb54a4b7c1d3b4e18bd5f0cc0c8b8d3563df54b7ad506b23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-ES/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-ES/firefox-62.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "32473438f9d39f53249faef39e467546db58b3dce905cc1f4c0250b5fcf5ff2eb671baef0ab179b27ea47bd85bc5684f9bd4846c785f2454076035711642a7d7";
+      sha512 = "8977a46f5946da99c4e3f30e3451110adf7993ad5a64f5dee09016932ee55a63ebca9126f7c3196191e658aa39465701db347068bdc6e6acc85d061873ccf226";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-MX/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-MX/firefox-62.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e81563bd3cc51241b129f084d4d9f5e8b7f34c1f5517f041bbf6992b50e0ad4fdf33fb36f0d1cc22d2bf9eb0bcbd0515a1b21b5cbb8d084cadd0f5d9d80c7b3d";
+      sha512 = "2bb3eeb2bef0f7c72c9bd95093e4c80b69e6f56ec41d0d4b3c54d2f8d7496884394583fb77e9f5e985ff6dedeb94711d4732baaaf5947e26e1f7b13f3024470b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/et/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/et/firefox-62.0.2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "5827c7dac8e12610e731e92128ed66f8f107c19de99937a730e7439b26dc404cf518145467cb702fb395d9cb3a0f4ad45c92484ffb053d88dc7ac858781f4ed0";
+      sha512 = "cad31e57d54d5e533f5c999b2009d29c22c9469b7b620499df7f433d0e86f14ba336665a9d9917a48f55d9a57e30be70dd461e8e2159092d5c2c1435e842603f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eu/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eu/firefox-62.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c59ad7413f47ac19e9cd3a267150066099f561a455913714a18afd1b0e284202364f009cbe0361f5941b96d57b43c3d7d778235c9b9123133f864e75479556da";
+      sha512 = "6cfd46bc362a9dca327651ad9219979e321c8ec8ebef21fed64617e7c5540804ce0a16514848faff8e3a3018a454e8b90fac627054b92cb96f5fe8046326db50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fa/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fa/firefox-62.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "fc3a1caac599a418ab0ce2208fa921dd40912e80ff075bf7d90ef64379057e83332483c1a7a44dece95a38be523d0ea2f92a57b45c300f032b174dde4812e5f8";
+      sha512 = "cfcd0562561478bf2d14ea6b2d87c081d86c5c6d30bd7c2c1eea673e2a82f875a2f954955fdac959ba96ce5fe8461c82137bd3c6313eefb3fb24bd4993692c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ff/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ff/firefox-62.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "629c2b79571980bfdbf9bece6760d1553cc002f91f26fe46d58d4fa5040f437b6a8b9b6ff41cdcb3d615c479c66a17d87d878fca65025070a31073165098ed26";
+      sha512 = "ffda297f92bfa0a76d613e7c54a71d376c2264570ee8d9f2bbed9faacded01cc8ea9fb171ae14f4d349702d91896899299bfd6b2cb66e9ded933bc6e34e63033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fi/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fi/firefox-62.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4393019f9dec44bc62985d84f95585de0a26736a923f873b92d87f7d46d11f8f3e8af53812696ed4d312fad51c3bdd34026cd7ef933fd047f771441245b30213";
+      sha512 = "be791b05d114f2d49c23714898f240aeaf9593aae6b7d06a85fb3e6dbe9116ee19d5089aff137e1c0fc56873c172a73937e15b19eb76db15122019649dd83a58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fr/firefox-62.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "9d9afd43288fe6719b8d4f76c4542a26dd4b36376abcc8a0d8111c701bf397345451ccec5bc5ed1f2c2927549c62a429d4d97470d850d0c83ef8362c40531f0b";
+      sha512 = "1f167a7df26ee83671a7c3dea3bcccaa7797da0253110eafa3de5a17b7e19d1710966ac3a82bb0e7bee3d7287a6b39f59b9152672618dbad5d782e297ea6587e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fy-NL/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fy-NL/firefox-62.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "12050decaa38a27ead08d67130d43ba36666728d3920cf40ad2dc0eb18de6a204e81dfff72cc0a33022b0d96097ec83fb36c88b463707f04669e5c907b8cac15";
+      sha512 = "ed9ee111ba5b451b5fa730bc0f8e14046ad7613d542a7695f68e28d9fddb279770e3663d8b9964617d803f073c7f02dc036e4cc6ce3a17b69ba5fba782831da0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ga-IE/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ga-IE/firefox-62.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "fb028d4b55cb5758eddb89a506b68d322c758d2e8ce01151a30678dd01c4ce625c9a051650a2e115705dbe02967f0db5894a4476d6460ff08313d4767dad9b7a";
+      sha512 = "073b104cebd63452fecff3949195ebeb794dde2d4c2defb44f62f4493165f5dcac20320da8229bd7c3e5410b840bb51b4699d77fdc886974848745e066ccec16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gd/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gd/firefox-62.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a1173104e4be1fdb6cf3a0c8c997075d40e5eb950dc2482107b5795adb2590575c1c79f50daca87227de6426f4ad9d756233f95a0ddd3aa6e949ab773d319db2";
+      sha512 = "307262bb8874fc6115051608bf4a79e51fb08910de7d3df44a6bb3bbde64d3a76aa88361f10b811a2af9a05518d7ba42b6f2e078d5db32f0118cd08f8a3ec7fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gl/firefox-62.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b6b46ec64e4386c9196d1f5362674667e46b5006b756cdc164e6c1c42ebff417c57cacceee949d2e9a5f55c76b82471ed9cfa01cbddd8ab74d6669c6870864d9";
+      sha512 = "dbecb09308a701aaf13d278b208fb3b9e7631c8fc07b9b3fc99c27a4035ea7fd75da810063913449c2746933c63cf7a5175d4d5a17aa808f6bd8d19bf0692f0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gn/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gn/firefox-62.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "3c35f52d34d57dfbfe43d8df6be4f04bc10c79b3b9e08949525a503952ebecb90e59d99565c44adf25addff6f713088bce3034513eea3108a37c02b0921e2f01";
+      sha512 = "f62e0a0cb6794f6fc36c85f98952ccd313676d4389b12a054461789e30effd3effb6fc729bbdfd83674c2691d03aa219ddccfcb6eb74426ff49bd4a458ff7ca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gu-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gu-IN/firefox-62.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "0bdaed369d5318c59b929193686960ea2ed2173027c2cdb0384936d724585a9f8db058cd00d5a9d4b5ff8182a59c65066a9daf70e1e0b0d6013b3753e6f36adf";
+      sha512 = "b0624b04a3a20a48358027aeac449c52198139a3e9dbf0bc035a06c22fae3bcb44f34a07ad88a14a44e87dc16a3393688ce8d45d5070264d1ce63b2c183aceb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/he/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/he/firefox-62.0.2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "07074488f2b83055b66300b357e8fd4cd94dea52c359227cf33908a0abdfcf1bb969dbc8d00454c42e5b83f35651aadfd8492507deb5a229d3e70b329753a86d";
+      sha512 = "7b3f4478100b6122c22fc50a944dc86e46b3d2d73893209be748c001461968a21500562b2eb18a40669d13068618ca3093ada082470833085b78f4083064767f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hi-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hi-IN/firefox-62.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "8e6b126bbd13b6ca9ecdf088a049e28328942c5153937198b851ddfdf1705211a03c6dbe71e95b3afd8f7d3889705d2c6a1bb0b135e34ba389830cff519dfbf3";
+      sha512 = "13d42b552bca18e0020b891f6b3a563b66dd86b3e5fb9b5badae88ecf5a37b5febd5b9c927807f7996b81ddfcd4ef076553fc82655eb05c8a04a920f2a64ca71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hr/firefox-62.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d1c36d8cff63d070a827d24d3e95a823a1e302cd42a48ec50edd34ca3f76678f65897f060ff5365a677525e938baca6df512f27b0fa039eac6b78fcfd347b440";
+      sha512 = "5bf92b1abd156019935c8728435101fcee9973ea413cca05760322dce94b62fed9f7271699610e00e812f0c7d320cbc966bf03fd5250b9dbf9bb2ac2a5f96466";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hsb/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hsb/firefox-62.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "384393359093655a50c6052cf25ba413fcc02000685fc6e97f15e3668cd93421dfd3fe95d266bd4ae5e687105ce7a4c364aef92faec9a5c01f6f5336c134fa21";
+      sha512 = "777ef75daae66a138f4013ff19fccaf7236700a8c2a46e6f0f811065326c7f4fb7dcb284ee9bac2dc3461b45cb8239015ff24731a691a85a199519398c03e53b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hu/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hu/firefox-62.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05c76472230f7ca011fd5f936568b50cfb646ce7efdde65d1640f0d4ccb31196873a8e5aa32ca6bc796e80400d52ea4c191e334270c04ed92354b6744ff4cb50";
+      sha512 = "800f1cecd46b4adfaf1ed20878d422191709801e148aef5e827c4cc3b9fbd46ecb475dd3c4b412a39ae2b05d4af2be8ec7d75515e2b98b1e07aef74fe49c4d70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hy-AM/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hy-AM/firefox-62.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "cd3f20095f0c31e20fb383089141f1aa22ba8f8e7734370fd377ba900cb71ba1f2e76e196bf30cf3e3a8139bd667575d139b03969ca3ceb3f2e1c231e70431bb";
+      sha512 = "910fe027a761480a4673207733fb5a78c0106249806f5c5347bb602de6853ba4299f2b13c896a088368eef036bef38962a487b4b3d6957f765f39eb06bedfebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ia/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ia/firefox-62.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "834d2f397c3eefa2da5b184dcb4537ff28d26ade5ba985f916c4921473774d79a63cc97f3c72e49e19f37b4285a6efbc0bfd8ca78159b4a9e643027fbc4fc830";
+      sha512 = "4138b14e0cdb6f6760e5892bbdfea3c244460cf2c922e737a1af568b1df5aa0076cdebc836688cfd74d97ac859cb8fd71ba52752f5db1b28e8827ca59123756f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/id/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/id/firefox-62.0.2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "25b18c83fa9899f54a6fea9c617582c06b6ace769deb95e2ee6d1f3f4d32ce1654041605072096fb434c483b2f47913a35b4cdf392989db108f48ac9376d62ae";
+      sha512 = "463f2d340b7c439ee64ee6429021062cf05b2fd4f32226723bff37a67c5f25566ba5d6815a5e604d82df97b426b677b3158b2f8a565762a340cfa7425ea097ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/is/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/is/firefox-62.0.2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "596a5ae84a71ee3a5f1ba4896b794cd103d2bce08a505faa38ea6df9cdc5380d7b97b2c4b3c80cb525007bc2f08dfa2bccc2634a135e653c79b913c1624f56ea";
+      sha512 = "ec264aad9cfe095119f7f52f3391d376dc1864c24eb133bd51bde3349afc92c3cd1bcd0673b1fe95fa03ad36f869e0a6ee9835e97e922bd949228954779c075c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/it/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/it/firefox-62.0.2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "46bb6c5d0e575acdd510b72375677fefc3feba3c7ca2d1ad4a84f82ebfb3e7d14a9b419964850f6b640adad0970b105b3ae45bdee4a8a47200c5ac7f290c204e";
+      sha512 = "c81ee4ff685fae9108b07235931b9d0347ca46e3063211764fd1762e2ef9b5e4e337001304a14309c97593543859800d7dab9fbeb21a18af1b84a2b2b6c6d5cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ja/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ja/firefox-62.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "031a4aebd4d676f724c95812dab0fa4ca289fe4144417ffb28c6c4579580666bfa690737f544a3b09f5e07c7661200c334c4a336ea45700b6e8fbf5bbe5cd81c";
+      sha512 = "2f0ac4bbf507d3c306dc30dbfb94cb3bf8d907431f9a5c6b863505012cc4b077e22144af3658dca60e056d287273129f4742c72cf78f800162347e64d2b887f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ka/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ka/firefox-62.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "14979e42ecff3c9005fd229a5516d36a72958ef810766a64963c2a6028c31e0717ca9079abe6103ece951c5ade140adbd35227dcb73c6101a145f1bc9e241721";
+      sha512 = "4a85a9f34e69abb29d63ef8cae372f225d246a5065a26d03d99a22d137085609e6ef5adc03df70fd7fe1057731472808f510fde2a40926418fb98cdf8dd452ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kab/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kab/firefox-62.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "16189c288a8807afc94b1d781a3afad833a52c16ad8a805787b7ba5603ed6988bffe34d9c9a98ea3db0eda25341ff24430ab68b59a1cf9724bd16246a52c1847";
+      sha512 = "7b03433b9c79203feb40705469c6788b8df08505ec2e92c704570e0cc5b8066d2b305a68a4c7a61f81e07cb6ea7ea12c059b00e8c11870bc44be54406e8a224b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kk/firefox-62.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "c4a35a83e41df1149c1ab38d8f243753865a50d6d896b89499bee42db45c8237b9b8d6599fb3c932717977c5e460ce7adc6c93d561fa69a4704e1931fc11d21f";
+      sha512 = "51c141c62e3251101a5b110573c26547533fb2a8bb2019cee63734ffe4ef2c4d1b4b6e5e540d88e0237721ec7d0d88c26bf5c179630f685c037e3f9eaa0a6f02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/km/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/km/firefox-62.0.2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "dadea116c3bce18f18f2bfb3652ee1d26b3cd11442b8e941565772d202d2a8a2e7d6277a1737f39c63947b2972ed8a84680b4c7dc351563c5ff11abeebd6205f";
+      sha512 = "113303e05d1ea54c38ddcb0476873214696f38b17aeae64381a7bc00bd59d3ec551540125190c0a48e9e85abc4de9ab232bda0a6dacd1bf7584b7d09c9be67ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kn/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kn/firefox-62.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "dd6109e92bdc9a7b3c8e08d9e104691a1ee449f9f915b5a4090ca471089ea000da34dda44883f10f72f4a5ca21078263663444a413ab1f1e7599f85f01f3700a";
+      sha512 = "3dc579341533e0d9b82919aea3dddae1ad247f9a994d52d26699bd371c8910ae5b417e76be04002af53eb3caf5a6c2323261e48dccb8b4ffa63b27fe80272681";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ko/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ko/firefox-62.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1dc4383f48dc1aedb80c373398a5539649397f1660664181c97ecfaa17eac2c503a976ae15b1e7607a83ed90e3b4f6c3b15d1bd60e13e22b8f071d91d373fab6";
+      sha512 = "4269f0f945c360e8385dd83d3a62450825a9e74c349dd74a9f8f18e683a83526113ed315e5e363dfe00706b59bad92739e6b08c004e27608addcbf599b7da21e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lij/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lij/firefox-62.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "a26d5e50807efe3d4e3e01d10b0131ecbde0ef141f13310db4b01adcbac63d003db073ee24620745ab551ecba92965a5055e553b31fcfbd2df9af0a8913c7823";
+      sha512 = "ee26793ff03184b9221f7cfc88bb351f27ce01a04fbf74681f355e2a0c6b4330eded098a4ecabc3215e3c6b78fd2d09090275a4793c845b3c6debab962e2999c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lt/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lt/firefox-62.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "dd99282b5eea3a1e4518644acdd9bebdcb1532cde148f8c60fc83177fd39757e98e7fe3cc54c681305c699a085788a14cd44e93e5f10e11a6812afae10b2db8c";
+      sha512 = "2f7b98d182b4aea92f8e370107d56f647e16a11a1966c2e2e47b8b4ce2b45d9b9742d09c19478c200cd7fe42889ec4c2498304626fefa7531e987ad134e3c05b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lv/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lv/firefox-62.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "4be6a61d0ccf424ced36aad978f6419d00afb3db93751c1cd9f6d1ec0c2db8530e77099efbdd8883b333fc2dcb315143088423c359debdc7da5808853aa99268";
+      sha512 = "7c31be85ff6b3295636f50b9c7491fa467b2cba1e5ffe9c7ef997c3674d8cd801e14ab8fc9bc2d1ab75d2a379aa590109530c1ac81599f26b747a43cb557cfa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mai/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mai/firefox-62.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "71aa1872d28a5f741df79e4f1490b110fd9bc13e9f6c4f2aea8d5028b434d02f0bff859613dcac258e0af7e8840b5a5b37fe80eb6d94d4712e83b96d971a46bf";
+      sha512 = "e365c3e4a9d2ccb80871c1530ae1e372d4ac1a809cb2c72f82c682161dab6d7707591194a72481a312760a7819fba0e5dc9ae3f80308b7a9c45af66d97e47230";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mk/firefox-62.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "5b9e7e8f865675c0488fb9f7e965dc37b35ff53f0ab84c3cc0d37f9baab0084bf5981e4a1dc65557a02f83de7a92302c5cc72c7c25c20baa484fc6abc552c279";
+      sha512 = "e28b9564ce368a8e68c27436e967cd5ad5adbff1b78b50bad64f7646cee32a28f2dfbeaf0bd049d7057ffef59ce709765cedc85ea139b84cb6b02d95c743cb81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ml/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ml/firefox-62.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "d3ea17e668e021f9f002d775df1117c51e7b5bd92780b014bbdd869f93e50400e290a35e4f056c4ce8a235fc2851b630d24ddb3b8e6ccce7c21b65a94fe9816b";
+      sha512 = "50ce7dc0445a37d125fddfb51951d455b91bec19f807df262bcba0734a7cf855d455e965144e1d8da4692c4013861f62cb683e364e33e85f4962c99097b74838";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mr/firefox-62.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9022898d857eae94054ed357cc5d06bae72ea38fe2f1efb6d09baa6b18d55cb8a75a5c0f2b312458366e2146b36d12407373e8862278ef348e588a893c068a17";
+      sha512 = "defcaaf5c589d0a11104f06890f986ea3cb627db499c2bcd1fc39162402b09f8c1be3fd05ca33571dadae9e8d127d1d67dc5f08804f670e8f8db45b33ead6234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ms/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ms/firefox-62.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c81f40e528ec7f141de902432f1f367023a39889794a46de8b271e9c4bebcfbb4b6124dc8e0b86c560214c493d650389829a04c3f4a4d121b3243ae66092a100";
+      sha512 = "2f36fd10942b2a700b6901efafe2fc14e8a7cd97d41241a070f87edf4d1ebed63bcb1d202b1c557426bdd8fd96639ac263ffcf0c96ecad9196916cc69c9e3e90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/my/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/my/firefox-62.0.2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "ba942bcab35045de32a2d7914bf7f953dd1f683ff0d142246035df830d4528b47f195b8a6b96c95b62e2d03e89215c938072ae23b19af41bbbbc40bed3d0212e";
+      sha512 = "71001dd61027cd3acbb12f555a19ac3534c547b2d9b2c964a6bdb656524429ccb25b6c601422ec7f8af9e7d6319319e4bdf0db15df3f3833611d72d3d9eba410";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nb-NO/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nb-NO/firefox-62.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "dc86c87a0e51105bd89ee579711aea9e61904f17afae27236ad12bf754831dd592f9ef938ab35d037b2da884aa301044eb71462a6c4ad26af97e9911e6356bd7";
+      sha512 = "2bbb7a4cd756757c0559294a487c972ab0c6bc6df005c948a24978a35f51c369b66269dcf6fa96795525758ae66e24670fe8ef7fa0f5b05b7d81bff79f2cb762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ne-NP/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ne-NP/firefox-62.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "9bb1e18c015696ee9b17853a942537bf462101e687107771d34c4f62d3cb3f7d9debbbba9efdcf7acafd8a9f8c4f8c197b2df15c80b9c5a562ca1ee765867b3a";
+      sha512 = "4bd51046dd55004e6a08dd0fc646344f91d7d830249fa8a33284f4c66bd5f11b1913920119593e45d9488db1b9d7aad1a74b296226633d94a02c0c705f527a60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nl/firefox-62.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2fa2082a1a9cd71f0ae7019507055e6109292bdacc9ad4c860aa5ca9ea6896c37609a083981df309d2c53811674261147053ee6247908ec1ce7a2e030d320443";
+      sha512 = "408bf232f3c1e592a929ff2364b52af899aba1a7542e6199366a7bb0369ec14bf3c44964851a6dfb37ece8e9ffb342ce7448c11013c3013bb0d4e1d67a43e2ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nn-NO/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nn-NO/firefox-62.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4665302f9850b93c4cf178c3e2397e299716ccf92e4fbec9762892b17960f275c1167396de4073b899d4bdbd73bf06f87f10c36be7eda22934faaaa78925e8dc";
+      sha512 = "450239e4d62d03151b0ff093e04e4cd5cffafeaa91da7374390d31c5944366bdfd0361e6e59b162352418436f7bdb1ebdfbe959107efd14f0015de0e873cd5e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/oc/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/oc/firefox-62.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "d0b9a462b7157a1452a54e2fd3d9d0c38ab478eb6c6391350c8c7c9c581e425262f42d33fdd0ac9e50eb8cf77f0d8b71372cf15b079254c2294f5bb613337bd2";
+      sha512 = "a7c00d91430494659a4a2285ae9505329e18a10985757a50f9543d46b6ddcb740cbc440e31a1718ba4b830661bed56a0054c5309b04bbd8029abc691b59f0c08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/or/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/or/firefox-62.0.2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "555135a96975771bc9bef17601f1e2a2e308e07ba3681164512f2939da1892ac592a8f69264a365dfad36a473306d6d33712fc6868bc809ad5d5a3ef16eaf5e2";
+      sha512 = "e0ed4fc73fcffd0c59f87b6ed8d1ba4ebf8526acc79ab5a2fdbd689c1329d185bf9717cd34f0921d9ae2028a18bb12d485a0cfdd20dffb3e2a9b33969df943b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pa-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pa-IN/firefox-62.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a1d01ebf734b6357ecdddb3601b9062216c040966d633e282d61a28ecb830b5edb5152dff4c46a3cc273034fdc7110cc56858cbf31c6e90ada6efeb4130c510a";
+      sha512 = "8106baacbc84b053eed0527ef78f9ba4bdc94f0679c0d887d72bf19ef5c6a7950b6d8e9a35d493b51de031ef2e4720d03abb9677355a65b2a539c9e73a4ab633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pl/firefox-62.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "701b496e7d20e8eff7484db6bf5e15f1bac769fc97f69de028a0dcbfe0f681d0a9031242b30367833f8cf1f8fbb1acd6d469a225152bf5b220a38b369c740381";
+      sha512 = "9295362613e98387d10160af9f779a03c8318797e98daf39a514d70618eeffa53066113198257c6cbf1373fbcde33cef525c917c85fc3e838df5f918868e10b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-BR/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-BR/firefox-62.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c4b3be3a9483ed76f7b8334998d75b293db031329852ec59ce8ae13e1184a541f2f35b5d1bce413ecf525d482277d27d7470444e477f297e361751d07cf64920";
+      sha512 = "d5bb188822c7b8e5ecba035585621685cd1b334950b8480d73b1841f871325236f9a13a3a4f0098d11588c0085c20fac7525a57cf83687a29d15f05cf9d9cbd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-PT/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-PT/firefox-62.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "389ffbbd4dfeb1c7149a02cdbcb70479be32ac8e91683570093f99e38b4c541f145ec27fc3cbe54f70ec3ebc21e5c0ded3b18124307976befd8f2ae1839c5dc2";
+      sha512 = "ee2f8aa32c2e20bb69ee291f3bd4ea931d5b2ab863f6f650bce92d35b331234491b93296803f5ede49ce49027b805241db44989bf48ee6d68722d262625b1fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/rm/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/rm/firefox-62.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "cf9b89f1828bec694147528a0db8a8ec4530fb60e8a1957b77c8202e95459217c95bea2f104ec303922074c3528321f775fd955080b5e012b8941bb7f6575bdb";
+      sha512 = "60605882860f1e1b805f8cb74539c421e45438aff07e79d6b3b1db3546d38950059665ca443d84617ddc9a4a3c104940d885f294932390170b3bc6c2eedd0529";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ro/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ro/firefox-62.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "44e3ac3e35af41616c1dfab41edb172b4dd92bc622aa53b8626375d782235ce3e9540e72e14b1d25dc19f4e44db5717fede7429b1fb245b644c20f2e13c0d7e3";
+      sha512 = "850063575dd69270903a031748e665cb8363105057f1e170e43f264b3a9b228976fc901f7e3749cee22e3d9489b3357240198dc3f22e20de5b9581729e8c601c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ru/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ru/firefox-62.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7b38581a552ae9df2222ef9bd8f2c272cd98458d4a11c55a8f942870411d08c72da0c1dc5c4354b8e2e17d0a97794e4f2d59446a394e3c95376f5e7ee296d57b";
+      sha512 = "8491c625171c0bf7c88c3f3a053e5f49a7c56b9dfc7c0ea7c381bfcb7505ffdce6a1079d15c73ce6a4edc5f89125e849e8b5fe8d464a4440d4413dcf6666a0e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/si/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/si/firefox-62.0.2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "dbb7cc9c9efd5c1305cb7c770db67ace1b10c2afa55d2dc9b8de896629e4e69e79bdc5d06cf3d7900635d03420c32e0dcb1b0b8ead25ab8fb3cd12a154eaf0c7";
+      sha512 = "bde4eaf6879cb40967ebc872738f5ac6b931f6a1a633886e35985fda76de4ea4c0a4ebc7e68585dab34f7f453cd54977bc84fbcca636d53d6c5eddfad6d13bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sk/firefox-62.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "04f9b7c1977aff8144ad53a2bb7bc5aaaa11054cb8bd00b1747ab7ec34e3664d1fb3adf65b49b5d5acbbde2e1ab45ee642033e3ab57e99d5973ec853a1a6194c";
+      sha512 = "776ea025a2e087a7d8717c3b63e8a203f13ae7e44812e0bcbef8075aad1166f80cb6977970d88f68720772668cca982662c2172f1bfca02732a79daf45974112";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sl/firefox-62.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3202a009f73fab2326611c65ee97a8249f5ccf047365874db92da588c5cb8693ad1a7b7852511bbab10a9146d0beb7cefdc79d3269c3b7404205d616a7394dfa";
+      sha512 = "1bc1a53815d287acef056c981bf306b1ae7cc36d4c8acd3bf556f3a2f44e6af2c05bede49f04bf7fd591cc5f0be40dba10b38c5b64379c673705b57ac0853d79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/son/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/son/firefox-62.0.2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a4f718670b73af088e87910197a78dace22d9e04bf268e4653709eebfa499ffa4a97b4048e4ac80c6a847afa598b0e19bdff07c6a7d6e164dfbf3d09f1070593";
+      sha512 = "ba3f5377ad15c8586c7e826ffe8c614ba71f49c9867caeb1fbddf9ffa86d513f299fcf39d750c7e91db88ba17533097d38def63c8614aca743946d2a3b0b0484";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sq/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sq/firefox-62.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "8b67dfcd41328b677bb33a640c1045b3643368b8c0004cb55027d36ac2f3fb9cc99c272d132c355567ab0505a50d34fab80f6fdb8598cef09ea9806e19d6107e";
+      sha512 = "c3f35991e3ff9410c4829491acc4a7f7cdd61f9104778c168adf3e1d359d5d0c8cb57ef552aeed669f80098c546a72f7adaa09cac4f486dacf78bd381f5fad76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sr/firefox-62.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "51834193c037ca0e23f2c73800a351debd8327908f7c6b378a89424ea86b01a272bed893df59b1102760303592604812794c7ac70effcd50c20fbd676f4b5640";
+      sha512 = "df6bdface285322457f676d74703084cb677c6c429992a87dfb933bb3da25eff374dd2894f13c37616268266e3934a55cd61f3f6239a487595282ada58bf69ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sv-SE/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sv-SE/firefox-62.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8763a55b6a3f7ffb75afe854aaa54bd7bd5a5ee8dbd741f4348fd29ce015603f81cd98bed3547c628dafe98dfa800a97b64e281606223fbb400c03a0af332018";
+      sha512 = "a48a11e4b1e1bea955ddd73c77e7f5e1a7d03435b29659f7b610a089b604cdfed57893420d0c1827198efea6365a52ed236a8296646a980fabb6007b865a78e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ta/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ta/firefox-62.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "82d687d98f2e75b637e76416ed1b749d1af18c7ac140eab32f8fdf99238fec76f3f926caaf212fb42f054d51d8c807536da8cb0ac5354ad123a3030fdf46690d";
+      sha512 = "e01845b225c5516ecfc25afde98e9691b9afedf27405207cb91e655a9b48edb416786a2cb99ad73df37da41cb22c58958165836e5e6b1018c6c9f788f2b9337f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/te/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/te/firefox-62.0.2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "2a690bbaf6f8ba90f98c2761d6ac6030fe17d384478a3bf7c07875bc6e3e6285f154e3e21db4b639602f205cc03360fb36bcfe26473ec48cb1749a65b781875d";
+      sha512 = "95b795fd6f995527d85fa83b122bfd9a2c091c792c879f7f4611dde63b4ddaf0502d3ae0ee33002363da359d1931d008c01e40611eea61f1ff66aafac2844f52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/th/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/th/firefox-62.0.2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ebc344d1439fc4fdb71d772b047466e5bc19a04a83de09e64e9c820d19bc057f3deeff5d0ec9bd9cb11ed2079f4bff459f3727b0ba92fb7426e2e186bd0cb4f6";
+      sha512 = "9ad3d99c9479155e20559ee1c8ef276a69b591be2cb96700075ca19352f033d9063d9f9b57ea9fbcab5db9bf46e1cb03c9b001e6254b6b0bee5547f8c91fb59c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/tr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/tr/firefox-62.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "9096da5a647463a3643e3e5f21dc51ee9be87d857004285de7dab164255103bca4ceb9d8474fce587ae497397c753803b8157c40d05dd8d3310d59e97965ca0c";
+      sha512 = "90fca950893500868edc6ae1c0aee417cbbee7b7a0f48e0f10421b3d7ba495a56e090543ffd097949c9bebe69784cb8fb03b559156863f9dee940aa867421135";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uk/firefox-62.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "f9f609eb7f3050e95bff33de4b88d8e17949c4c167d3bbd7a9901cb0d19926a37f72e40a6bdde1f6c7610a3ffc67d7fbcfaf298659e519aca16592714c70bb4d";
+      sha512 = "18942b931cf09b03973a10e390ac15c6e5bfd1f730953b782b7929943838be19bf4a61f157b33979f1a8e13042f1f4facb08ab205b7825d285b9e96c0ac897b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ur/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ur/firefox-62.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "35a755f1c1d93d9d8e4bd813c83a332a1cee74989d993921f987e023da90a851863f83b56a41c58878f5aed07b4e08e0ca9d3f4d4ccc8610544516bf903855c0";
+      sha512 = "7f16c4810467469385a88346f5ee3fac4d3d95342c6a6d37e0df7880f0b08896d0e39e77091eb0262a66ed7fa15c3151f244eb47ce4ea774ad21797b5da502ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uz/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uz/firefox-62.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "d957def873388aa5f5051ed3ab5cf51196f8b5fc83e2fc4b56476f63357ff26ef38e6f3d469cf4f117b094c3e31a0f561b1f5c0a90c85e827436ecfe0d61e98d";
+      sha512 = "8266d638c74a78fa26c939c1ba7a6abd05ede85a9e349135f1934a6e3df27e3f6172026486738cea28e50689b84c29c0dbc63cc8779faa11a6ae55b4f367c23d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/vi/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/vi/firefox-62.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e7f10deacc80f55928f3f6ea4dff80142e790cf9dc814c38f173cd03ea59de45438fda5cce1073b0c9e1b528870c7d979d16254b038bd351834def51944193f8";
+      sha512 = "787e570afae27cb668d6f4b9b6e8b3097f02148c2e2974efd1c58e406354724def031f04fc69c0ed10a04ce5833cbf7bb2ae8fd77ef068f8f17bf2118d1305c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/xh/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/xh/firefox-62.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "0e64c9a9c1ebada345f02d6dd40d2ab1ae157ee238b8716b011aeddfb18775c1594ae0f7706c4ddda97ca01c44304391570f526524f4f19d3eb5580a1839c19a";
+      sha512 = "805df0dcc24a7d77afca47335b31cbdfd0d0df51145c9cedfdaba4d865aae71697eee14e446351e6fd8db950e3264ed788f66d683356d4fbbab17ea9d7c2c452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-CN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-CN/firefox-62.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "cf1381aeb00f19fa6f8665ffbda8a9c6c19939a29e16fb49a2cf9097dbb2674eaf4e32b658dfb126645540582c52ad86e87a9679c1dabe03757d57032e0d3d4a";
+      sha512 = "cb251f942c31cc0c30c46bab04f658567b16f379068e7bc946970ed512e2de08c6e3511990b722541756e95261dcdf96b03cb247072f0b230f66ba7afdb038f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-TW/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-TW/firefox-62.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "9d28b0b773227d7efc611e300250d518b303b9e03396092420e8195872c6e8c78aed6f9985e491bb01f75c541299bb7f0cf78abdf25d3a8587b085e3f6489e0e";
+      sha512 = "afa5847337657cee3ec28896a089bfc0fc2b25750d6dc271bb83740ea5170e2f926fdf3158b0b136eabe0d2d6b4b81db1ecfabcd8c2049164af54cd796e9a7c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ach/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ach/firefox-62.0.2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "6de54e5cde101eff5c1edd43b7f3286f10cd631398f646608e0d6f22c9dc6d8dc2a3346c8d5fa9caf6ab1a82af8708ba3ee17fcf605d0404e2beb5d10b623ca9";
+      sha512 = "99781074276e530b9ceaf2cdb8f902673ceeba3df515a6c2c2ece3fb3dfa84e6f3d494a3a69346a3f9fef20d11f7bac0361eb80968ec7b9e76b603f8b001749b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/af/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/af/firefox-62.0.2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "29c5898b88cda4a1f365b8792789c854b954b4d6533ed7a556f7d0e3dde3f7705adf5a6c3bf14444268648ad3b3002eef49dac200d5eb89cbda5ee33e1cb4d4d";
+      sha512 = "bd9c6fe306a8802b22860cad8cb452b6591c0227e12ffc4a33db1a88b811d06725348e5f128d624240b9666393cef35b30f5bc7d12e41a046bb318dd346f63f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/an/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/an/firefox-62.0.2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "484a8277cca9e437d8372f750403c71c5e4923b28b776b5809f58debb8d0d3ceb5d523df05691f326d06efba5970e27bb06abffcefc500748b04e99ee41664bf";
+      sha512 = "289c00b7bf464fb6d86cdbf24274514dca98dc47e78389125287792e8f77708090c120aeb5ebaf4688e16857c5fc6b78fc1eb6f0a7efd7afb62c22fee325e78d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ar/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ar/firefox-62.0.2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7e3deb89acab69012c5f1aa99219ec0ff0cb380ae5f1dd71eea078bee4434855c612c808a574bcf46512d2eb77b3e8f9c26ea524ece97b02699b2434d8cacf45";
+      sha512 = "412cdcb82e2d60e2f37658001638bbe50cdd3a7db1e9bb4cb0e2fab49b878fe64b62ef019e499c3a960bca3510266a0afb3fb4c57cc5a8b6bff22aca772e643f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/as/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/as/firefox-62.0.2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "0836d6d22d13096db35f5ee3da13cd4a8504a55de73ce24897a8e4903eca5b7d56f244321d2b6b623a357b1741d419957f67ee65e71d1c71606db24bbbd95631";
+      sha512 = "8068c78be22e42f9174cd6f9e1e7dedff527a00865f722c6dd9062c6f5cce2b83693d0938ae5f56197f72f5af71bbb485b0970b632ca5dfec9190214558fea2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ast/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ast/firefox-62.0.2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "247817ddfd24b97b991ac916311e01871a831197c92025d3a2ea97937fe993869c7a12e118b32baa3aaca49ae469dfaa8e892150731b6dfdca1c4e0929c2ba08";
+      sha512 = "37ab6ad2899b3b115bd2b59f6be121e2d340c27eb745f698fd2942ab6424c0840273ddb4afeaf1083d9f458408b939270d971676e9b08e1f0fa409bca69f3e84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/az/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/az/firefox-62.0.2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "4f0977cc5ce9e01c311d256d239a3e89dcc1db5b78b4c08f08999d7c52731fd58fce08c9f77a80fde1176a0a5289b5c59f06eb790cedd3625d96928dbdec46da";
+      sha512 = "5724ae7680d7e88061a4cc45706590d519a5bd769b204d06ee0e8e6e86f706b312b665354d22314853af0a73b073acf68be8b7c3ae9dadb87984e1222722b4a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/be/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/be/firefox-62.0.2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "294adf3029076f9dceb32a54330d63b10ba9219d9f688e3c7246e04fdff2ff10bdc24b577f48b18935c35b8d9acb2437a7d6cc3533fd6441b9027ca67e7cacc8";
+      sha512 = "6249b41382a1d2cdac2d9c9d235697a70bac76d0dfb341d3db41c0f329cce868ef66df6d2f249b4e22a1daf737d5ea3b7f2cad36a2d30b1dcd649fc1476218a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bg/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bg/firefox-62.0.2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "41b78104367cd25e67a38b71d3db6054995caa28fd0c4dfa0ebb494d2293c92c20a347fd763f88b65d31a514987c607102206390b2dc41335d00aabd9d5d589d";
+      sha512 = "a769ead4a10d4168d64ac9c2391c0cfcc5e0dc33f4521d6df73c5b53087e3aa073096af09adc49c901489e60af9839ac888483d63f7e9bcb1de2588236cba75a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-BD/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-BD/firefox-62.0.2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "79241d9dc44b5ad35ed76f7b33bc8be8bf7f5da09855df9e34354994554aff2ddd2dfe8a2a3410916887568fc92a70927b8cae4747f20d0dacb067206eec3d7a";
+      sha512 = "0761e32fd88fdea9c87686411ed87affa8875f2047ff9b1b1ec11376583001c9c9b421b2b27cedfe883cc5cd233d4d3a932aba74e50cbd74aea63a6aaeb64c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-IN/firefox-62.0.2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "5194de3d21783d335a11c824cd46b0e01ea512f900a7e3fb45ed2567501acd27d5f5bf8dd68f146ff550f6ae4c70089d539f56823cf7280f02b67d5111715760";
+      sha512 = "1868b2d7d6f32936c6072998afd1ebfc232158940e5270bf483c6c29a8a30682f0ba729161e9b0aeef7d839c9e9209739380a20b8b118c49112bd71caba03ec9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/br/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/br/firefox-62.0.2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "59dfe19ea10c4698067a8ca70143b160ed5a73c38e0f6ed3a14d9a60209378acfaa1f8b09647a1a96d519e6fd6a34cb7e2a8bc3cc276653842c2bb3a6ee3cbe3";
+      sha512 = "43d1691d6b1d9aafaee55be50bf8c4934b75c0501c811314d12e1156c2b68cd58914362e167ed50fdf5267a0d7a2db9730c68bf318d492bacb8c33eee7bdd12e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bs/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bs/firefox-62.0.2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "7e6069ecc137c1b0b479159fc8eb323a8c417c81edd8c7d54498c47cea4f1a2fd4a1cc52bed17b899ca72df8b0fbaf88e1794b17f86086d249011ccb592ce5d1";
+      sha512 = "aeac8dc018ed59e2aeb68b63c1a1d6281e543975844e3ce5b7f22991968bf0e05f40cdf1ad3bf434cf9de774363b0ffa6f96d1c0b457f0372d4d1d943c0a40bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ca/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ca/firefox-62.0.2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "932ce6517bd55ddbd927eb28935bc99ff5576ee924d239dc490fa79b3d90dd77f579a7b16c0b4fe4ddf8fedb4e825664aee7fe246145ebbe19c8f8841d098464";
+      sha512 = "10b6c40701b7cb8f2543e97a61335f426b210273d46d542034bcefd7d23c95124cada1d1df85c3b5e33d25e8680678b18815ed0c8ed58936061f670b0abf1d87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cak/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cak/firefox-62.0.2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "38c4ed4be2e79145056bfbc5a476e3a03c4f1f6aed1ccb834a7ddb2576f99fc52305b93939145ee1e7ae9144b656e857bfcc6b084ea4b501c3a574e10d7438a8";
+      sha512 = "029cfee850c3ba5ac408b6db45d66dd9849db392097dcedc64d637756ffba893770a93915eaded6302f6e667f072949fe6decfdd918be292abb9ab8d1300c2fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cs/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cs/firefox-62.0.2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "1d569ba50f84ada02f0962e0418ee7f26e79fe19cc09f50dee4350a59262ddc87440dabbf10129d73172e512eff5904062f60561f4bd2d4eda395bc67af90dd1";
+      sha512 = "ce919ca42a629f171df4faacabc18fc3db0faf2d38f04912720ba697612215e0c26f650781a535b5e956dca912fd47d1d9b9528910b8e9b7a18841c411e25623";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cy/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cy/firefox-62.0.2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9294f39bf32de7eb2a1bc2480cf7f7e51dcdd124d3281f9e45c4729b6926002f8ac99c30403ea53a5c6857077633ec08e0c35f5160ea8e08a7f5f881e8a90748";
+      sha512 = "727827fa6b47cdec5048f40005872f021cc506d7c72a7f1a6bef9f736612341fe3cc6127b3bf005f63620f17b180a00c3fa0f799f63e685111119f9661d9ca7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/da/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/da/firefox-62.0.2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "77bde4fc9cacdec311b513045f3f026c44d7c199cfe0520cde20ed711c1cdb40d6b64483944f4da47b8fb280764899ff5931a8e5639bd0a8a4e03425835d8f2e";
+      sha512 = "e795a7aaa38c28733a8864928229d91d752d6f0fe108bc5a3350b34e783155c3be14a5c0261eea26642097db2a583a34553d746d6040704f34de82953952f21a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/de/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/de/firefox-62.0.2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "b2bf1a5fc4536c3c0822d84c7f0138f04f6bf4597804eff101502d3d782f2b22fc54dff966c2f32821471622cb1602050de1c51aaf9f64c63314f8ba002ea201";
+      sha512 = "56185cb92f9a246140b58119cbbb6a128905c8e244a7ed8917613a65fe8f87a542b103afe69f1fa542e47efca18c8666e669c266e9c107661b800c5e3b4ebb75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/dsb/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/dsb/firefox-62.0.2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "812842664c8b0088f33acc42ae1581a33cb2527d3aaea0ed102fdc27a088c06008b96a3a052f95a900694d869591311dd986bea2e828a02238aaff854a77aaf6";
+      sha512 = "ff30865cf3135f466d67143487ad34a50b73c11000419b2caec1c232d4efc805cee5cbd282bd1e0b9ccaf03ccc95e08ac4d1baed93abde27b45b0f2af5d71fbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/el/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/el/firefox-62.0.2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f1116c938bed2333309d32c13ef69f806418c14fb8a2fc10f63c932d8d8ae169aa76a8e3835eb6bb2d61cde7c8d8dfec56240b8280695f1c2273899bb7c8aa4e";
+      sha512 = "e22d89c822843db26e05834c088e5d687c6d315a870ef2457f13126bd740135016ebacf83b9fae131128b4fcf62b474a68fcb1fa12098aec22f199a5871e63b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-CA/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-CA/firefox-62.0.2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "ba07c206a4b4ee0bf27ff82e8ea14e3ddff262fec11e088a114253ef4a4a81951cd5c85cf6eb9f6e1ba06f97be0bf5787f5e26c65b7f2aadfedf27f968146efe";
+      sha512 = "0f462a6900bf92513c40f28a9fd2ecb0fb3a69678b2b0091e6495b89b9a2fbe6c805e48b2e55fe274996ff7a15c32294d02a3e025b97505f920069cd71b23341";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-GB/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-GB/firefox-62.0.2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "558c10ec35144d696e1458a4b70de954ed3c8d3f05d5d1ae492374ee3b90752a93d55e6e41de30a64a3ee3b9e68bab88aa479066b849971d78121961ce2aaab9";
+      sha512 = "dd7a7fc0b05877f1e1f297b123075695c97247e2641311ff646b953e002278e2e16187682226eb46034cf3959880b2d17d74314ff7dcc654b1963beca6785410";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-US/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-US/firefox-62.0.2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "51d606c5d9fdc2d6b611b1fea06c54ee4a6ac7666b4dce0a26dbaec99d110a2e304f88108d307b011f27312f8b935fcbf473f87b52056a465b667f8ecff9a48f";
+      sha512 = "bdb45cca1c207502ae5f76fe10e4b73d3f7e6079913bc9a6216e9325b8c70fac37d14e32b4e5ef6acadd73c301c3ca1aa2d72a5d44acc0b6cb0c22b481de2e46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-ZA/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-ZA/firefox-62.0.2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "b88ea68f4eabf086ff2f3fa6752cc42bd19391029d4c0565342bf24d90817717e5f07f774e164df234eeb735e426491adf35784dd9096475635365912e57ba62";
+      sha512 = "351ab5114b25daf11ff2ce1aa377e6c16a7adf9807a7609c97e04f30911f8680da727c6dd1d3067e028978d3f6f793351d99f500374372dc22b11ca760e4d36a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eo/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eo/firefox-62.0.2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b97c269786efad57ff954d27ec69a4983e18a7ee4e0ffdc6925268830104103a99a31247359eba915be0710455f0626379b801d5fbcf501f30e3cc0b9736eb32";
+      sha512 = "1ec40261c42db667f1680361e4e7f12db271f5fbe6d213d44d0722e692a93421bb92d73193f87f42e43df40700cfddc7913454d6a64f5e15fb78f08d7a5a3c0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-AR/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-AR/firefox-62.0.2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a5fd087a8852f39e1208b388a2507981af3d989a8b86b1b0e2e83adcc9f6a494116050ff811e8b2225fd113ef1e689bace73a617c0e569df627df7e9c655a14e";
+      sha512 = "00cc8c232fb4b7b2c56aeed098719d60deb26abacb38f8a7ffd9117c8d8875c838fc702413a6d8584f862b35843262e2bd31074bfbbc7cefa6f62247d8a16abe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-CL/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-CL/firefox-62.0.2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "bdf7aeb5fbb80711d7b8dd7ac30e544847e00f015f7bb8835315f5ee3023458bf781a368f0dcf11c57737fb1d0f077352c0eab28d32e801861bba36bce5e52cc";
+      sha512 = "70da97fd43b84b5475e707780c215f73b05a423577f6ccb67a31e01370842319d40c6d691c99da138db881d6c5de8f73c1bea8287fb9ba1cd3647bc74ff8125b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-ES/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-ES/firefox-62.0.2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "47bf0dbb55435016312a6f6650033f28710471e7aaf14e0dc83488f1ff87e559de552fd95d5a58864420032392f84de06d8a1916efb8128423826c7e4577ab44";
+      sha512 = "76b717e852c1aa2f3801a5460a8f0d51256486d5bb688b30cb85abaa30eb8a441cb28391988ef8ac4fdd1a430e0c09a2c298c8738f7a76e6a18742bc2a4f3998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-MX/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-MX/firefox-62.0.2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "79e42f01744b05df6c1c7928743914ac28f3dd696a6918a08000a531b050fda95ca621ce0484c216f2eadf728db867707c1ec45188c70bb91ee611eaff7ac565";
+      sha512 = "e4e7f734ba533a0daf56d9c99881c0c1c758ba6e492e8e62b67944fc3a6c42c82df7e4d01a27fe797077708d49c810a51bb05d3fa4f2cf91fb63548f82e25322";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/et/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/et/firefox-62.0.2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "8489f6dcc733debebe1acbaa86cd093e5dcbdb4c8d60480414ec1e27710bf57590fef3a29fb208e9eeaa5d8858e5807d7cf0be5130d57bfe308b7653de431db4";
+      sha512 = "6b832c2b71b0e42db5a2292d90f1545ab545845f30b09baf277bd48597975e426cb98442fc16b7053d5c573d50d42e37e89cc49d7f325835aa5582262333fc4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eu/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eu/firefox-62.0.2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "92f49ebaf7777962eb2d1b13043a10e82cebcad1a0f43a3527d7e7a5a31e720b812febda86051125e64d5f0355225dcb6cb496df5ace1ed10c2c6a4cfbe16cf8";
+      sha512 = "5bc67a8afec07f48c99ad331257236cb2fdde7fa23afadeb3de8c270d78e93bf855702bf82781c9c90eb5a4a0b9966d83bcc6d8f357ff5ef2bc265378200d674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fa/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fa/firefox-62.0.2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "1bf258264b77fc9cece834363a12c34be719121afd55378e23fb2af9cf20da2a7ef4ffdb2d39c34c9970ea5d259a47c894b6f9d703ecf75834a2239844d783e1";
+      sha512 = "43d16efdabc3eb39e3aa924387040f6e92c80333087369b754065c34403d202f0881c993bf667322f8ddf303a8e066c4203b2a4daebaf68ce5b95a8c1cf80844";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ff/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ff/firefox-62.0.2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "0b60ade68d6f4b9f1fda4a3ce36fe54e69583efa5ecb41443f0f92d394257449c2d5ca7124d1e194fc7394ba0daeb67f828de4aaf13f78c89aff8dc273213ea5";
+      sha512 = "86837496c81d9f1209719d46aa396d17eca17a13f111ad0ac3b94f1d3f9bc60ddf8d8b10018e41100e091996d820975db897abb470fc85e0d87a0ff742a67b34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fi/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fi/firefox-62.0.2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "f5cd4ed69914705a01765cce884e3f3fd66cea53e85d33da378087ac7ccbc9afcb1b2ebaa78bb4ffbdca2fc34b2ce4aebad6d55fdff44b8740a815265026d2dd";
+      sha512 = "baae77ef1bfc59c87eb72c3ad6f8524dbdf5fda9502abccf297c3b3f6e1033002d9b4e5b341c9fe101bbdbc93dbac768bd962ac9378088c9c567ec5d71ff00d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fr/firefox-62.0.2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "3dc1eda7eba9e0112b246a370a296c6f5e11f318e514d08fc800d198afa5fc692f13ba66fa7b2ec891929c53572ade6caed21f967b880262cb36718fd76e18c1";
+      sha512 = "60fc885a6b5703a88dbbb60bed41296e2a1bf73405eba33a82e5f916ac0b22972377aec321c2b13d7007dbd94fdfcd24d43fc8f0acee37fcc9e23543c5a65f67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fy-NL/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fy-NL/firefox-62.0.2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "576b0645bb3c2367138e3f385282f77c72040b0a4c75ac5f39163a7f1e23a34e7702305857ae2250c96adcebd587c1cb83b1e7d129667307089b38842bc4e175";
+      sha512 = "945c2b7241e0faa83e1dfa1f36a3dc86cefb03d3c48191f2ae6b3dfe8384ae848440731d69363197f724da3c32988e20c0bbfa3adbc52e7eb99018b7ef8c4510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ga-IE/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ga-IE/firefox-62.0.2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "416cad5b5859bf1565f7e68fd3a53ca8b180609a488e2201f70d42eda3186fb1e22c647016c67fd3068d67b50af678bc6dcd96194001511844afff43e31611bb";
+      sha512 = "6b3ffd73216ce3879b26211a3dd26db393eba8f0ec3f35b6626bea3847a614d6624f1fd6fcedd5ac00e5bb08c9465b8ae63fd4105a79acf86bc357dd331d44c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gd/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gd/firefox-62.0.2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "167ac1a9411d1cc3ab052d3b206de6a119e8b56854b7e9588ed68815e7c9b9e1722210951a8b731e944aeb8b2890095cdfa7d73b03b473a5ac99a90095de6917";
+      sha512 = "cdea3ed1ffd14d02d6489983832cf11f87b1f17bc73539e4b27f7a76f267b491ddd3163a80ef9a953e3c79fe184631a32be842474427d9792b2d525df8006ffd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gl/firefox-62.0.2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "efefb9e9d53be16fda773e8f40073c357c4b46cedecedcfd311e890a45810b7fbfb368ea3e93b07efd0f9111b9fa7a67808298c0ce98be2c8bc7eff354f7efb8";
+      sha512 = "b098ab10e0fda3fe67a04bf3040112e08ae1e94e30d65a076fa0e1f4d4e30e1be99e9578e06650f2fcddc6cc6b57309afbbda71008af67ad97caf9eacc7dd550";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gn/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gn/firefox-62.0.2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "044c8e610d639ac8830b00ba2e4e2ff8e1bf827c3f91101edd45a6d478b5b8b99c1100c9fb2273a6fd378826f0bcbaf8817cdf1e3303bdb1b9b0e0c01cf095ec";
+      sha512 = "a83c0134556894a375ba91137d9513322a876299edd0347eead0869aebb4b04003dca12594cb276e3a521452d4b6ebbabc6be8f79040514f26f6827f55c15d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gu-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gu-IN/firefox-62.0.2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "433bc4b580bb3d164ad78a21ef8894e053b4c6d972d5e4aa46a9b8ac27cdf38e395164eb46e24815cc645d8048c237371a3abbd1bb639e69b65efbeff00a30b5";
+      sha512 = "d313657b11f3fecbb0ef26a0c5a2d4b9ead411f2a3c55bbb4bca3ea3a6d861ee54ed1950e9bd5b14b24b9fa569c7c67b73807353331af60e3cd942b570430a76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/he/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/he/firefox-62.0.2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "d6acd3b06216d4b0f0856cb6576c36381dd9f48bfbd3543e410eb0e0e5aa11977cf3d68b38b0be7b6700831c1561e2a8dc75eb5193637bbd2484673d83bd3a1b";
+      sha512 = "a05a94f0634f1a857eab463825c97ebf2fa1b5315c44082095d6fb674884b77375968ebd39df05fe6f0f3892b87d9f1313532ea022012cb411eb32a43e1d01f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hi-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hi-IN/firefox-62.0.2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "49856be15be3ab0ca687f8d6616c481d61bc0380133b043d394cdcd21d1f7cd8816b2bca5538f2e601a32ffa8c51745e89f537f62bfa853da42759db70186ee1";
+      sha512 = "e4cc460637c6aefab1b323ac5a13674f9f95eaf5cf0bfc2020869a196fd13f1708814b33c938981017fc27cdaaf57e75591ce2917cc66e5f97b3c8f22d3d44ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hr/firefox-62.0.2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "0040ba7333a13820e4c0a85fb24c30131d4b477da3da9e4e04296088d1c0e938fd495777aedbe3bec22533a6c4766be902adbd8b470a81380fe4dd23f831d0f2";
+      sha512 = "74c11421c3815b5772cd9a5f74e1c48d914d335babcffbca984187b72dc7a5db0609e7b31915f58d358a12c52a0db204ff191c78af28609c1e68d002a32f313a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hsb/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hsb/firefox-62.0.2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "715d14b52fb82f255300dbc828ab05fd578f61325cdf4d4cf86f1a47e22fc1856b57bb459941a4bfa8d325b7168fb0e39c075122b56de3455933fa89927f025f";
+      sha512 = "8b399983719f73f65d2db17af40065faaab4793ab32ab1596e79b6f844d43fe4bf3386343b50a244480bb9f724defc795a6479703cfdce305dba0321e4b5fc09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hu/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hu/firefox-62.0.2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "deac0b43865960d665f13a2f0a77cd9413ba9b3172fd2660695464b5f72944f4013f6d9a47801e528db63c3e05496aa7df890624a39ddc6651ff5e8d0d02883e";
+      sha512 = "a5443cc52bcc5881a7297f2f200418e2a9791835f705d472bb657caceb0bb59f8dc1a7c424b196c2a66bf1f0c042d092a55c5b0d04a085dea702e11e433ed98e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hy-AM/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hy-AM/firefox-62.0.2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "22e134785777ea4e4fd72cdc7f17765d5bf8e943be33a0991baada71fb254f60f9ce9b68b4ba5640dc807a6db0e4ac3c81784a7a33e5096cda1833b22336f9de";
+      sha512 = "ea3e471c41d3e17c99c5b819ab8c3de8759a275d1ee1af66f133f835ebb6be9c7aeb52ae8b6f79d849e489e0c8f79f69d557d101efe681b27ff38b4e8b306b54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ia/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ia/firefox-62.0.2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "91112a783ed4402cec7ce357e68806609b202bd1553c649271ccf4cb90a724ec612951b3acfe0eb64646957870726cb40f66b4a233cc0b73fdeed51083d6894a";
+      sha512 = "8bd09d0a8bfefc1a73b3a256a2e5be976b88998055299485c6270afc7ee7805a90e6ea9de144bd5ee8d3e40c079adac1dc29e9beb6d7ca376514fbac902f8de2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/id/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/id/firefox-62.0.2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "8b87e2f13550334a96bde04fb7d61ac963548e35de2717b8738fd14fafb015944403a1bf175e2c13ceb7d4f482f5a6d56b57b44cf015b6dabfac3fed77d86f81";
+      sha512 = "c19859ab8b24aa239b0fc91930d8fb581850e631a9aa9033a98aea0287055d2a02ca6ae154ea23e37fd407a00999af1b5f7ce0854865b4b19a8462ccc3838cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/is/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/is/firefox-62.0.2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "8ea8972b5dc06bd12844fbafff92f6f493f604ebe03139043435fb5f761098cee81c0ccd42b67bcf3c7d1b370f3382858c08d4c14eb24a75fb851e78c51c296c";
+      sha512 = "68fc21b8b3aefe39bc6e87e8d90fb2652f2125af45520e7f91eef12615aff81d0c6237f3fbacce99259761f0f45c7b49aecb59894f161faa8760184271b2fbbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/it/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/it/firefox-62.0.2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b50a422dcd94d6ea69ab22426d6f79b3997313bf4e0e17f2af31d8b64ee85d603cde1768a730b279a10ff87639ba2af26185bdb81ea4bcb7b61947b1836ab700";
+      sha512 = "8c8866bff0ea8c2e70a82798253334feca4d96d2e79d37d479f8bf2b5580912565ce08bc47777ff9340ceb4e5677d01eda6cb1d28f25274bab400086493e4610";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ja/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ja/firefox-62.0.2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f52d31f997b291e2a0c9cedaafbcb5bc3ffd2148b52700eb5c140846f2809613c9061f339728b1810bc5f899fd208a3eedad06ace984dad41fac0a057c101ec1";
+      sha512 = "56e1bd61de818e9271d483bdbeac7c8a95e00a1a2acee2ad7d7e5779b0bba452170d8e0fa6463b0f978ee3c3df720bf338367b8b1f041e5000054268cf267af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ka/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ka/firefox-62.0.2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "e155d5c70de47d6f96f3f0e34ee317e90ac1aaeee4be68ed265d4bec46d52e6d67d7a140f3fb135dd086d9d6cfb5e8f80063a85f07e8b2197b23233a122efbb6";
+      sha512 = "de329fbe61b7563aaa2e62b1dad827445809df6f675518d7d19d9483acd6e23fc502f6abeabc13ed7c5eb2cc5b26a6ad0f0dd431c733f25a68a0ae7e2ee9923b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kab/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kab/firefox-62.0.2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "153ed4ce1692e6691222779860a066b27dc9a5e747d79f4e1bd3273541d849d4b093062b3ff8d702786542fe99caefcde13f63cada7d0f67f461531aa32603a1";
+      sha512 = "f739aa9432ce0bd8bea4917f590b076c0d88643aa595be951dfec27872d534fa3926a7ed8d82527e95a70689d365c1219d164cda79e06b7418b90652bd2b7cc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kk/firefox-62.0.2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "dd88ca465251b9489e766c268755a66babdcaa5962d40ddb4ebdc3f100a31f34b9b962bcf5fb5a0e46b2871e7ebb8d4169982a3a7174bbdaf5e6716274321ae3";
+      sha512 = "131b3ab83b953130cda7c9c388bf096edf90c424f86d1b6f4221b3601829a2ae0b7cc073a9336d7e4af588e497fb5df7731cca80a8413edf40a2f605927ba410";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/km/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/km/firefox-62.0.2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "ccb473d36522f34c889ae3d211a1cd4ebf4e60da341c51c34cf05d9d8d75615b91eb4b00e327409c6fe406aaeaa07f8eec53c364bec50ae87c48c37ac1602e69";
+      sha512 = "6b0f4a83a746630b87b5a6c933f9aa65d6dbdb2e686af870562800aaa683371a23fbe79f31dcb0ef6ed397f556df83e1e30f83cb493921631e6ac1c8cbcd37f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kn/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kn/firefox-62.0.2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e1c718690141b6e89f4df017d5804efe07a1dfa838f1c23ca14b90438458278bfe90e178abb5ad6c52d43a993b6a65664c0e801a9f58ac57f9300a9bb6f9679a";
+      sha512 = "e4042bb8884ecf46396e9e45a70b57c22b0ef76dd6d452ee0609382e87669e6163c1d86845aa904e13894e750eb2f35d1c9a2b7987aa6e7d3fcd5eaad38d8199";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ko/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ko/firefox-62.0.2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e916fddce4044fd924f7aded0b0c082f82bb50fe0f7587d7aed4782d545be8b0dad67ed4d2c41bc75360f6ed7c236bd7c40cb3503b472792f1b27c8f0742f597";
+      sha512 = "02d30f4b2cc7285506239adfea681c780d0e16c1719c6cb68c908c54388e565bf98f1a3a3d98449b0e55b2cdda00627ad6c6f3e63fc9ad10f8c96b2df6138620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lij/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lij/firefox-62.0.2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "ab86bf8a92b05bc5defee073afa19ab00be704ce49a2d26f032edcbb60d9e5ef4e7a6196d31bec8d6e090c586a88d6e9b69f576ed5e587ca09dcfb60a0661b3d";
+      sha512 = "3cf57550bc091d756c5a2bb707aabf78cfab1660e1486c9276de5ad37cbae91be24f2170f5b20560ecf7f53d21217bd738b4e4277504d6f8934d3fe1ca5fcb1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lt/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lt/firefox-62.0.2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d716f7fc2c4015f97962d07ba7ffd6903675a6c36416765f2e81da43f9e4aba759b3ff31bd82bb7cf64c7d8b99f9d7454716f4ce6daa022f9fa31f4a49d9efee";
+      sha512 = "606f27cc78c5ee0ea3a61f6110611ecc10c35af63cb9e7c5fa1d3d0ca7a74ac8cd81fec30c1ffe5573c27e0a7f5f04ed82105b8cf26b7c22d648ea217cb57e83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lv/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lv/firefox-62.0.2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "453e0bbf9eb2e9678ed029ecb797b701b4b39e030f9555bcca7eb6d56676bb44366e2d1ccc613b12a09f95d99ed08f9d3f34cfc9dd16cf38c9ab8e162dbae3e0";
+      sha512 = "ab028d6f31a966ffee99cbcd5263b18cae94c6e0a6e3e055d2c86354849b68120d870a142678184a32f816c7e5803d221f3230b895c6ec71dda20a6540101c50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mai/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mai/firefox-62.0.2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "75e863c56d68cf2304f0c6c2f1861ce025d934d033341c23d3b95a70e73bfe66334c3beb77d9fd597f7b4091baf70729419ce452131009ccf03d2d33d16621c0";
+      sha512 = "faebf74c8a194f3dfe33addea35965b11f3f9e0c2b4bac4f9e4056c2248df24c26bc9e5a5696fe3f8c2e30e2172dae03fddcffef09bf7837fb6dd9fb6a1b3075";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mk/firefox-62.0.2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "bb87f94a4de4984544477837cde4186a55309eec70b85f0cffaf0cfe747b7c761d9a6553adfa1ab1fba72d732be855e2bb46e4c7f22a0f25529207b42b6da396";
+      sha512 = "dddef2e42aef03d11327ae2bc186c0dfd25e81b11845b319848e7c7253c101d32b2801548f6444f4ca01a91c365cb2bc6067e765490f3b876d149899a9edbf3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ml/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ml/firefox-62.0.2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5754b4a0a3c6c67191f4ef3dda7bc208766ed8171de772d4250033039b2b39dddc3bee800a28fffe41c68cfca82a5c9c6005625fc6bb5bf232b256d7bd58de71";
+      sha512 = "0157abf3d8dbd54f50f6a17d796fba6c66e0270649b8dea1674a696a036d2a59f5841bda55d8b326d90266a198ec0dea3a65753b09fffa583b104c976ab75cd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mr/firefox-62.0.2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "04e40c1d060b848cf957af34079f6d1cdd12589b0f31932f15b5ebf837e37d84d332fe3ee4a54c501ac47050233f891ec6617802d03472ae9d7e45baca809adc";
+      sha512 = "9c6aa7a0a943b8f62f6888effeb65c6c3f36aac3353ff54011eeba06ff2bb0b66ead6b75d1107ffc358184df927cb2dc7cd3bca183fc54879427baf74cb8e570";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ms/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ms/firefox-62.0.2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "1b84fd0960c4952ff42bc50595683da47545fec9ab10d7b3fee3e3541b2a47aee084526766fb2bbf17dad413f4dd2dc458cb0c3e8153b7ef897a9573292abe2a";
+      sha512 = "b7a723f79a18db5b3d886c39e76a65975c2f6229022c62cab7d7e38c840206d9004c81da1783f4bf0cc373438518f1367f4a34e3764ea9919568ed4c8725c94a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/my/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/my/firefox-62.0.2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "95fd60b8c2e9b0add3163c67a5b46e794f0105621293017838fdce48cf90a0b0bd62bcefec2693fa16b0616260b39587bf3c619b506d56b072f0c715398307ae";
+      sha512 = "5538fa15d3ff02409bf9145d384e1c8e28a182239a682aa5beba671c09a0b813b56af6482476d57084af6a5895ad21af1f6ead71ecf23ea817780aedbd33661b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nb-NO/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nb-NO/firefox-62.0.2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "05c83c17e5470f009ab369d0c8a1c64cb8ecc008161fe1ced3ca85e9065f36f7ee4e220f8ed7a0320305ac31b35a035b5c8f7525b3b04c6b96e95e4044418f33";
+      sha512 = "8349c51a6b01301de6b0e0e37b665f44bd83abe9f771bc086c3f369534b6d4efc692441a46576b2335afda93cd8dbeff60ce17936e205e3c7212a2ef1b2844ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ne-NP/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ne-NP/firefox-62.0.2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "2ad4756b8800554c54aa1f47effe512de332a61fcd7571e27ae83bd5e0100cd8b60fd5d8381764f9bc2b1d925ec4b53fc3c6c6a88840cb12f57e9acba892dc5d";
+      sha512 = "f16911685a7d233a8957780c5526be9e94c07f73b259dad09855b8c21bdba1756ca70ee71dd7b732ac56555135d749584986bf4501adb056373ded74f96e265d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nl/firefox-62.0.2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a3ba32bb48a6bc386d49e4ec703f51cda3bf917673e23965d7f5e7977dc8ae0696b375535aa04d1a416b6b5655cb3302cb9738a238d9cc8a6bcb78dda52afae6";
+      sha512 = "07e271170d05cb87cee9361efe8fee2007ca032b462ce68c562406fde581f4baab96c2ccea66cf92b8e72aba4647e7bb8271ec50e3adcfff6b787699b687a23c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nn-NO/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nn-NO/firefox-62.0.2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "35bac6119415eaca5c8d9fd2d57e0a550abcd7d069454202a02ce6418f9e47ae59563224763008f23d49604cde09ad251dc8785d2205d4e9623c138a97b69533";
+      sha512 = "eaace3b808dbc919d05a9701e7af2bdb241d57cb0356e4eb60b4706def37372a16b7767540947efaa91d5a3f338785187f83caf8bfa5bffe5f4f92aa3bec13d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/oc/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/oc/firefox-62.0.2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "40d3e74b204da461cdd79163cc838e538a5dbb8c4e693a59d801202363cfba4bf48e01bcc87d247dce6b1fdad0a24f2bdd15272399e407b26293156698f7bf7c";
+      sha512 = "aeaab0fc9ba77aae2c0ddd92d7096c167a99335b3d795f232a24e685d49b53678bed59b6e873ce1c7667f76d1527bf685b910bb51b8defc539999500eac14d5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/or/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/or/firefox-62.0.2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "2220ecdcb26b459ebb0fb3380bb8b9430c1a09aa899418b18a765a4ba76c8d35480f59b71edaf6047e0eae04146ec6dd6bf25ccb619f559a260ff6f2828a0db0";
+      sha512 = "92b82c7bca322a9bfb6e6df61c9f2b6d82cf39c67848f2905dd372a627eb0379d235982e5634577825ad72794fd1d49b2e591ad5347977dac9a745d1167f7467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pa-IN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pa-IN/firefox-62.0.2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "91425dba14c27a3bbb744cf5added1545c071f466c6cfb77d7b2ff0b0b5ab289ffcb56821023e50d12deb4ff29cc5ae490c028420384da84811c661d277017f3";
+      sha512 = "2aec320ba120dd3632fa95599a9934ce133544e7b0d15a74236fb20435ab0a9ad44d6515f82897e7badeeeae19eb80d6b68fec4d000d63772d4e5ccd1f11d1eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pl/firefox-62.0.2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a5581c2e2d7de1187967af10802c4a6577a5bbf9a0ab56448b0695ca3fdee845117fa364ea53149b81a5aeb3ddab22c58ff65863fc981445bd34858766fb438c";
+      sha512 = "b62565b94eaae3ee225f2bbc8981f493594f48d40e8e8d83564a6d4ac6a4194c952663f9db52d7694993f08f714463b7607d659790236a727cbf803b084eb73e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-BR/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-BR/firefox-62.0.2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "70a9cc592980afbaa3efa37b57e190f6bd6c76fe975ee16b3a3b2e3498c65e792a83870f569836fe79fabc289c201b7f6764d4d512f9d561058eb496d1bc1cf8";
+      sha512 = "2b218b66feb456a86919b395d1cdc40aa73de6ebbca3bc4135c54d5dc1ac993bfaf169bc7b0d2d770aa6f4565e71ead1fa2aaab02dc7362a9f4e5a896dae2c2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-PT/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-PT/firefox-62.0.2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "8e1d94b4b3e01e684387b4e3c9439ee1df9712cef607f370d63ff0072876c2ad9e22a978fcaba14c03802c8fd5b559c6dc412fdadaa6a01425bb491852c4ce02";
+      sha512 = "d89122b993083bee798279c72a2d6296a5b966f7ac30269edcfe17a2036db648cd3e1e77eaf5f2479afc3c6831657267b22f2507176d62ee08dfaf4c100e074c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/rm/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/rm/firefox-62.0.2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "77500b96558c055ea90750d99aeb096d789a920fac4fd368b95a032cfa565ea0ee1259503ef0d198c4802bbeeb847a3ca22f06ae79b6e554c54d336a99f61687";
+      sha512 = "4ecba1d3bc6b3bbbc3ca974afa86e9b6e7664a0dd23605ea34349bbf822fc2098e7dd394f132b43e2e4127eeec36ec820710391671405b14c414d966540b63e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ro/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ro/firefox-62.0.2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e3cfec0059f0372d2b3764a4c3809b7a8c9ee6e795bb1d8eccf663feb1d054be58c15569b8dcad55b5ad37a1332d950f5286ad88ca5db55441c1cb3dd879bb8d";
+      sha512 = "97e8ebd7bc491bd320106765408bdd88542bd932c3c1b43a373aa5679f20e2a0aa12b48182454ec36812dbf4044364850cfe3e6878bec670ee46e8971e9293cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ru/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ru/firefox-62.0.2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "91077e66da0403828807fe1a3ee274ac162898efafd651b3c243c315c9f0f1cfb88925e738b9bf25fa7fc0c7b747f2a9f2a5a1c77b87cb83d3aa620475239822";
+      sha512 = "f8f433e0d2970d028a01f1039951f1e725cae8e263bed9f0dff64387913ae269558f037d672a65d32614408cdd3267ddd65677dbcf212188c531d04960266535";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/si/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/si/firefox-62.0.2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f770321771e965776b55d7681783e3782b7ce4df3c3d7cce581a3de1db0f8fc8c3ded3d606fc7f7f61e62b33986e8e05ff64e49427a8cb85b68b7b6fe43f6c3b";
+      sha512 = "11620e27c01dd91114d5e2080b430876282316ce6d527100305806314b4e7fccc38f2e93165f3e544cd3ef63b03aeaf738d6079201a0f7ae3f867b2e0b28239f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sk/firefox-62.0.2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "150792fbeebcd0969fdbef0827b617f83383bcaaf3eed9dac0790aa0ffb893d4498dae29eb480fda05a2feaca0428cf600bfb3398dfbcc921e92cf2ca01c7a1c";
+      sha512 = "0a43e8fdc1c3f2bc63b6bacc15f9e3f3527302d0d7f0f0e0cc9498bab7728cca944fddf886c33ab67c60bcd9bafa051db97c8e8a77e781d6869a4bdb8096f4b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sl/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sl/firefox-62.0.2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "d423c10683ba690a8d8eec50e4e966b7233d565e2c35b5fdd70aa917908daab5d01f847c32f7e24c604aa19ab941ca70c6e6613b39271d01f1370dbd974800fa";
+      sha512 = "343a22feab53142ff585985fbaa8a037dbe9c3d3c2c073361f8d4af3b74272a47e5df2053ea91b333bf0da15334b9512c0513726ae80176838774020a7c7c639";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/son/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/son/firefox-62.0.2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7f1d638cbd729b51d959b0b1ee0e4ec5473f5478bf315c890fd9df20e3065861a5c8447399e973cac78bd078d2a1f0e1bad829f6b462ec6ffc55e7748760677a";
+      sha512 = "bb9c9c4bc82550b6d83c3b9995a1ca3afadc9fb5b27a5de4503682d29428ed7751895d1225a3b5ba8472d539c9efca957522187e4119e4e134f46b37da2f43e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sq/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sq/firefox-62.0.2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "823b4b5043e3fd8fcf0bcb345d00dbfa38e6e03fdf172a30c272f51eee7f9057ec99423c7117ab8d21e9037bcc1e19a7082401a0b25514e2258542aef4c4af80";
+      sha512 = "97b2c394f71e9bda6fa679353c579a01f40a4fb5b588bc177329d6fbfcff0d126e2db072c868eafd6078c26f9190f1a2d4c65f887754af4d25eb9c128d807030";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sr/firefox-62.0.2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a08ef0de87e4f01c11b20301e45e98d3bf10bbd4d2699de56f66470d7f4298aec3744f44888ba46ec1293fb713487f6df20bb9f5682a57827993f0ddd28cdde3";
+      sha512 = "84024816cfd48076ef5ddbe0af392ab5ae0bcb8a02cc0ee1f6d0dafdf5673d9dfee377e83f0a9508c11593d8f4db682ad400c336a1c37591c25864c9299939f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sv-SE/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sv-SE/firefox-62.0.2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e3e65e32e5e11547e220bb34d0009257f3c4f18aec0fe961f310ef4b76311d8d885a01d6bc4420c2b97687b886c3d00c09d43af0c6c7eaca8e6a804d78d4bfe7";
+      sha512 = "b630b627b038b16ae1b97f669e79afccba95e66a93dc3b7358e26960ae836f1f3663a49394b7a9be9906871a2301824c6b1f78f1f38943b54e4631f9beb90407";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ta/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ta/firefox-62.0.2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "47753ccbe4471ab3d3de3ea11992cd332251868ae3a7772e860531d013c657f5ff559d34592fedf7b52ecf3a54476dc2e0fc68119170afb9c482fccd04a36776";
+      sha512 = "1306d444c620f558894ea81512944e1d07dfe706306206d1638c2e86ae5a2dba4e02b5927e4c9250df3cbc607d15da15bf2cb1c9e1ff74332354ae883c6bcc42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/te/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/te/firefox-62.0.2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "90327dd95f3a597692cf5ea54258c31ed813261f102a7f668f5bc5062499a6bfe64d2d241dc33ffdc5cd152802e7d462c7ffdbe4498825ad88be48d21031919b";
+      sha512 = "3b0e1d6fea01ac99e315419365afdee54c107dd33ad577b19fcd9a59de1a176f34497e607fc7466217ddef5a6c442a62f1dd41cdb137651c0274274cb9357171";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/th/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/th/firefox-62.0.2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "652a7bf7f2a7c6fa27edbd5e78cfecd2df661e1a7a01cc532b1caaed53bd40025aaee2126dd1116e77ef9e050777e78e96537ed2decfe493caa1d03c7bbb0646";
+      sha512 = "7bcb0d7e17d397a7b114172234f3306f9faa28e7d9f8bb2db1399b58c28bd36ce4e478686c3ec98c76793cc75bbb974a316599b3a7c38fb034e852100ffa13e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/tr/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/tr/firefox-62.0.2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f98d45b831f51a0caa47fcaaaf1ed37f267035e1f1ab95ae0cfbafa06f03b89f99b7a7accb9812644f862b819c2bb294f5a3454ece80f775359ac77734a99d44";
+      sha512 = "5c543b8bf79fdcb605b6d763688ca5bcd1e61b0e2088441e1d6d6dd4f0823f9f3d2075f39776d582bb468dc41ef39f7d562c7ebb6d5e4f084c3c1aaf1e61de8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uk/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uk/firefox-62.0.2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6c67554c87c7941fec8193bfcdd9d5d0af906d13ab237e0ddd97733816d2df27fee5e11eb450e85f9143f71049219e8ef9c6cd4d327faf3e335247130cdd26f6";
+      sha512 = "2fe636a02d0adc75d00f67620fcfaba902d16b5d828c2c9770560300c33cd0a8a8bd7208f146943cd62ac0aa8e3be784ff8549de78eb4f247783e1cfc823dd1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ur/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ur/firefox-62.0.2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "0c90e5575d057d9f32c18a102d2db7848f8821d71edb3cb9ae4f2565a1cc2851da7fb1bd493e81dca003a50a9f26454af8cf0ef7f947ea42aa22baf20abc06d8";
+      sha512 = "c84e1bf737b3a4b93f77098a087bd7ae598364d6a15110d3032bab4ee8aab6d1a64ce3ec4ef17b197b920e334f1e57a7a093581b8ac3b1ecab85d9cbb2da2c50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uz/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uz/firefox-62.0.2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "fc35bb30011063bda8c256b6c405bffae55ae7d67ce5809367aaadaddb1094acfe0186f2cd84b2dceb55a76358ee46e29ec013058e035123a7797b5ac49b6e4d";
+      sha512 = "cee9849825181c517a82c6f6cb07920767ff2c02d54b87c8e509e60bef3adff260f282882b9495b6034fa61b11e2cf831e3adc3ed3928ff32792a62084cf115b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/vi/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/vi/firefox-62.0.2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "0c6a94f811ba509dc468b31f9448eba7f1004e6652a418db8ef84d03d79ff850237bd7555b8f73d515f8a0c546df371a18bc51ccd3dad069bc481f58f9a4c989";
+      sha512 = "a0eddaf392addf41017108ded0d32418175ab5ff7cddf74e3224929da93bc84cf07312671f16aa5652ecdc315707a4301c69b856be709f4298861298541a065f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xh/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xh/firefox-62.0.2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "b113f1f4a81a7cac63a8604a8152bf651ebee3ad48eaabef84d09d3576b37b529f56c04fc9fd1b3326364aeaefad77cc123a97b662c85665c7f239384f5c6d7c";
+      sha512 = "50741d2ff1b7f1d9cf503af66ec61a2d19600ad7240db837392440b2943c6d96a7b8d5538ca24f0d528cbe9fbaede7964c9f8404474f95a1c022e193fa91f81e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-CN/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-CN/firefox-62.0.2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7c3da83ebdfbcaf8a67ac8cf953d648dd3eb54d1c9f6e74680b00ef94e01a0384a53d27c4a78312e25e284209f3e4c53661958347e3250eb820a20873e66c3fd";
+      sha512 = "103be3f37fa7a92c00d6465f93bedffc31527939bd85df0c742c04ac75f9ddec4018a368a2ff29730f5a055459b018c64afa344df255638ec3c26bb295e1a31a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-TW/firefox-62.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-TW/firefox-62.0.2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "659ea2bbd51d99a0c3573043a55ee580839e5f0323c57bb7b086ebc41a19f493baadecf67b64443b5abcf5db69e7e82e0c965a40b151d141557cda04b3ce6d52";
+      sha512 = "0ac22e595f2d87f75b586eabab07470f9eec16026a45902fb40c19fd2cbf93f2f88241900a13703edb89290953127c689bacbc0eccd560822e43bc07a97e3ddf";
     }
     ];
 }

From da9823672fb0474c82dcf7417535e2fd20219586 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 22 Sep 2018 03:13:50 +0900
Subject: [PATCH 1466/3253] firefox: 61.0.2 -> 62.0.2

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 11222cc65ba3..73d3000846e1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "62.0";
+    version = "62.0.2";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "0byxslbgr37sm1ra3wywl5c2a39qbkjwc227yp4j2l930m5j86m5g7rmv8zm944vv5vnyzmwhym972si229fm2lwq74p4xam5rfv948";
+      sha512 = "0j5q1aa7jhq4pydaywp8ymibc319wv3gw2q15qp14i069qk3fpn33zb5z86lhb6z864f88ikx3zxv6phqs96qvzj25yqbh7nxmzwhvv";
     };
 
     patches = nixpkgsPatches ++ [

From 6248955e6a2c5ad1b97a9db7ba2ab282ddce5e22 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 11:06:09 -0500
Subject: [PATCH 1467/3253] mesa: 18.1.8 -> 18.2.1

(cherry picked from commit eb2b89a0a1901d4c89dcc6c0a36e1cabd1fcd002)
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c8eee42a2527..152dcc8de854 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "18.1.8";
+  version = "18.2.1";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "bd1be67fe9c73b517765264ac28911c84144682d28dbff140e1c2deb2f44c21b";
+    sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
   };
 
   prePatch = "patchShebangs .";

From c1743dd12dcf1b992946c3c051c5700f41c9770a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 12:45:06 -0500
Subject: [PATCH 1468/3253] mesa: drop non-applying hunk, hopefully include no
 longer needed

(cherry picked from commit b673b8987872adfd97fdb8821198450ff229118d)
---
 pkgs/development/libraries/mesa/missing-includes.patch | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index feb6ffe428c0..18e7d5437b15 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -32,16 +32,6 @@
  #include <unistd.h>
  #include <fcntl.h>
  #else
---- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-@@ -37,6 +37,7 @@
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
-+#include <time.h>
- #include "util/u_atomic.h"
- #include "util/list.h"
-
 --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
 @@ -28,6 +28,8 @@

From a94ac965c82fe8a1554a4ef85f4ead4a31c06c7e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 12:58:06 -0500
Subject: [PATCH 1469/3253] libxcb: 1.12 -> 1.13 (proto too)

(cherry picked from commit 5853e62637eb2aaa1f2ccbcbf62c2a4f232a4257)
---
 pkgs/servers/x11/xorg/default.nix | 12 ++++++------
 pkgs/servers/x11/xorg/extra.list  |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c9e8dd04c470..561f8ba94d9f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1136,11 +1136,11 @@ let
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
-    name = "libxcb-1.12";
+    name = "libxcb-1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2;
-      sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2;
+      sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
@@ -1448,11 +1448,11 @@ let
   }) // {inherit ;};
 
   xcbproto = (mkDerivation "xcbproto" {
-    name = "xcb-proto-1.12";
+    name = "xcb-proto-1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2;
-      sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2;
+      sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ python ];
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 28b698bdc816..222a9f654266 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,6 @@
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2

From 0d91e3b5509bada40a1c83f5a503d294cad81749 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 21 Sep 2018 13:25:12 -0500
Subject: [PATCH 1470/3253] mesa: add new required dep on libXrandr

---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 152dcc8de854..aca9a237b0c7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -144,7 +144,7 @@ let self = stdenv.mkDerivation {
   buildInputs = with xorg; [
     expat llvmPackages.llvm libglvnd
     glproto dri2proto dri3proto presentproto
-    libX11 libXext libxcb libXt libXfixes libxshmfence
+    libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
     libffi libvdpau libelf libXvMC
     libpthreadstubs openssl/*or another sha1 provider*/
     valgrind-light python2 python2.pkgs.Mako

From 3ac97c054f9fc35d0872a6e05dbfe839a07ec73d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Sep 2018 11:45:07 -0700
Subject: [PATCH 1471/3253] lgogdownloader: 3.3 -> 3.4 (#47039)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lgogdownloader/versions
---
 pkgs/games/lgogdownloader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index ba273cfb6b97..4d4b46054c28 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "lgogdownloader-${version}";
-  version = "3.3";
+  version = "3.4";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     rev = "v${version}";
-    sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc";
+    sha256 = "155vnz4w2v5d3yihwzq8yi406g19kc7banzlarhlcp3j11riwd24";
   };
 
   nativeBuildInputs = [ cmake pkgconfig help2man ];

From 819c47f1c461224a72718fdcfbcc966a225f907b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 20:48:24 +0200
Subject: [PATCH 1472/3253] jdupes: fix source hash

---
 pkgs/tools/misc/jdupes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index 700977d6d6d8..991066690ee4 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "06fhkw4gkv702k72k71yii3gv1mgdymy4irq30a58iyyakbbcfy8";
+    sha256 = "03a2jxv634xy5qwjrk784k3y3pd8f94pndf5m84yg2y7i8dvppnk";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.

From 52ad963b507c3f459d1c5894b3e015178f37fb7a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 21 Sep 2018 20:49:37 +0200
Subject: [PATCH 1473/3253] eiskaltdcpp: mark linux only

The darwin build fails and other platforms will probably run into
similar issues.

    Determining if the Q_WS_QWS exist failed with the following output:
    Change Dir: /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp

    Run Build Command:"/nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make" "cmTC_14e67/fast"
    /nix/store/qfag24z6xsr6jkyi8gb4cv62rp945rbk-gnumake-4.2.1/bin/make -f CMakeFiles/cmTC_14e67.dir/build.make CMakeFiles/cmTC_14e67.dir/build
    make[1]: Entering directory '/private/tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp'
    Building CXX object CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o
    /nix/store/2gdwhdzhy4iwkp7fh8v6gy6nxj1zi9pv-clang-wrapper-5.0.2/bin/clang++   -I/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/include -F/nix/store/8dzqilmdr0p3qmmrxh51xk7wli6grm0i-qt-4.8.7/lib  -std=c++0x -pipe -Wformat -Werror=format-security  -arch x86_64   -o CMakeFiles/cmTC_14e67.dir/CheckSymbolExists.cxx.o -c /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx
    /tmp/nix-build-eiskaltdcpp-2.2.10.drv-0/source/build/CMakeFiles/CMakeTmp/CheckSymbolExists.cxx:8:19: error: use of undeclared identifier 'Q_WS_QWS'
      return ((int*)(&Q_WS_QWS))[argc];
                  ^

/cc ZHF #45961
---
 pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 48b2d883849b..db30da82bdb2 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, qt4, boost, bzip2, libX11
-, fetchpatch, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
+, fetchpatch, libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext }:
 
 stdenv.mkDerivation rec {
   name = "eiskaltdcpp-${version}";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1mqz0g69njmlghcra3izarjxbxi1jrhiwn4ww94b8jv8xb9cv682";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ qt4 boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   patches = [
     (fetchpatch {
@@ -59,6 +60,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform program that uses the Direct Connect and ADC protocols";
     homepage = https://github.com/eiskaltdcpp/eiskaltdcpp;
     license = licenses.gpl3Plus;
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From a526719184e6dbfff9992bdac52ce3d65ec09fa7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 21 Sep 2018 21:43:23 +0200
Subject: [PATCH 1474/3253] signal-desktop: 1.16.1 -> 1.16.2

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 040f5912db4b..8bacf73a80f1 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -55,11 +55,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.16.1";
+  version = "1.16.2";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1qlibn6k5zbjw9bni2l20qx58jcpwrl99awdmgha1fzmpjkn6bl5";
+    sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From eb3bb7c7f631af80acd81aaf9fc78dcb9a0c9a92 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 21 Sep 2018 12:46:57 -0700
Subject: [PATCH 1475/3253] Revert "burp: 2.1.32 -> 2.2.4"


From 4a68689bb4956364b95f49a94dfd64284e8abc16 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <31535155+va1entin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 23:29:29 +0200
Subject: [PATCH 1476/3253] youtube-dl: 2018.09.10 -> 2018.09.18 (#47151)

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d688e5fe6625..7e79614c04ca 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.09.10";
+  version = "2018.09.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "12gd84i5drc2z4wzah7r2vj8fkj9yilm7q8dm7q9n95abrdb7sh8";
+    sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1ce496bfab37bca1619c053db7a535e0ff96eed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Fri, 21 Sep 2018 23:46:30 +0200
Subject: [PATCH 1477/3253] nixos lircd: fix deletion of lircd socket

---
 nixos/modules/services/hardware/lirc.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index a66a7fbf495f..5635d6f09715 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -65,6 +65,10 @@ in {
 
       serviceConfig = {
         RuntimeDirectory = "lirc";
+
+        # socket lives in runtime directory; we have to keep is available
+        RuntimeDirectoryPreserve = true;
+
         ExecStart = ''
           ${pkgs.lirc}/bin/lircd --nodaemon \
             ${escapeShellArgs cfg.extraArguments} \

From f0c0e2acc6082503dcb866206cac6843da8d4da8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 21 Sep 2018 22:41:06 +0000
Subject: [PATCH 1478/3253] htslib: 1.7 -> 1.9

---
 pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 48548bd72652..2ee9144b316d 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "htslib";
-  version = "1.7";
+  version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6";
+    sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
   };
 
   # perl is only used during the check phase.

From cefd38b721e7dda1a841a12cd2eaec4825276202 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 21 Sep 2018 22:41:24 +0000
Subject: [PATCH 1479/3253] samtools: 1.8 -> 1.9

---
 pkgs/applications/science/biology/samtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix
index 87e708526ef7..c4b4bb522c40 100644
--- a/pkgs/applications/science/biology/samtools/default.nix
+++ b/pkgs/applications/science/biology/samtools/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "samtools";
-  version = "1.8";
+  version = "1.9";
 
   src = fetchurl {
     url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9";
+    sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8";
   };
 
   nativeBuildInputs = [ perl ];

From 7545b7dcf3d5857d40bf3e9171074d46514d0f0e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 21 Sep 2018 22:41:51 +0000
Subject: [PATCH 1480/3253] platypus: 2017-03-07 -> 2018-07-22

---
 pkgs/applications/science/biology/platypus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
index 2947515652e2..323ca90f0a2a 100644
--- a/pkgs/applications/science/biology/platypus/default.nix
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -4,13 +4,13 @@ let python = python27.withPackages (ps: with ps; [ cython ]);
 
 in stdenv.mkDerivation rec {
   name = "platypus-unstable-${version}";
-  version = "2017-03-07";
+  version = "2018-07-22";
 
   src = fetchFromGitHub {
     owner = "andyrimmer";
     repo = "Platypus";
-    rev = "cbbd914";
-    sha256 = "0xgj3pl7n4c12j5pp5qyjfk4rsvb5inwzrpcbhdf3br5f3mmdsb9";
+    rev = "3e72641c69800da0cd4906b090298e654d316ee1";
+    sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw";
   };
 
   buildInputs = [ htslib python zlib makeWrapper ];

From e78cf6ecbacd4035243d1d75de4a62e407dcf324 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 21 Sep 2018 22:48:56 +0000
Subject: [PATCH 1481/3253] python.pkgs.pysam: 0.13.0 -> 0.15.1

---
 pkgs/development/python-modules/pysam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 9d6cbacc9589..3138c114e697 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname   = "pysam";
-  version = "0.13.0";
+  version = "0.15.1";
 
   # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
   # missing some files which cause test failures.
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pysam-developers";
     repo = "pysam";
     rev = "v${version}";
-    sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i";
+    sha256 = "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x";
   };
 
   buildInputs = [ bzip2 curl cython lzma zlib ];

From a5183762c5288361f7fb6b1f15c474ffa1a090dd Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 22 Sep 2018 01:32:06 +0200
Subject: [PATCH 1482/3253] nixos/tests/installer: prevent race between parted
 and udev

by combining all parted commands into a single parted call.
This eliminates one cause of non-deterministic failure.
---
 nixos/tests/installer.nix | 82 +++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 610444f90e47..96845b79ad97 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -282,9 +282,9 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel msdos",
-              "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
-              "parted --script /dev/vda -- mkpart primary ext2 1024M -1s",
+              "parted --script /dev/vda -- mklabel msdos"
+              . " mkpart primary linux-swap 1M 1024M"
+              . " mkpart primary ext2 1024M -1s",
               "udevadm settle",
               "mkswap /dev/vda1 -L swap",
               "swapon -L swap",
@@ -299,11 +299,11 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel gpt",
-              "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
-              "parted --script /dev/vda -- set 1 boot on",
-              "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
-              "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+              "parted --script /dev/vda -- mklabel gpt"
+              . " mkpart ESP fat32 1M 50MiB" # /boot
+              . " set 1 boot on"
+              . " mkpart primary linux-swap 50MiB 1024MiB"
+              . " mkpart primary ext2 1024MiB -1MiB", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
               "swapon -L swap",
@@ -321,11 +321,11 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel gpt",
-              "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
-              "parted --script /dev/vda -- set 1 boot on",
-              "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
-              "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+              "parted --script /dev/vda -- mklabel gpt"
+              . " mkpart ESP fat32 1M 50MiB" # /boot
+              . " set 1 boot on"
+              . " mkpart primary linux-swap 50MiB 1024MiB"
+              . " mkpart primary ext2 1024MiB -1MiB", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
               "swapon -L swap",
@@ -345,10 +345,10 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel msdos",
-              "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-              "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
-              "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
+              "parted --script /dev/vda -- mklabel msdos"
+              . " mkpart primary ext2 1M 50MB" # /boot
+              . " mkpart primary linux-swap 50MB 1024M"
+              . " mkpart primary ext2 1024M -1s", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
               "swapon -L swap",
@@ -366,10 +366,10 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel msdos",
-              "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-              "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
-              "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
+              "parted --script /dev/vda -- mklabel msdos"
+              . " mkpart primary ext2 1M 50MB" # /boot
+              . " mkpart primary linux-swap 50MB 1024M"
+              . " mkpart primary ext2 1024M -1s", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
               "swapon -L swap",
@@ -402,9 +402,9 @@ in {
       createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel msdos",
-              "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
-              "parted --script /dev/vda -- mkpart primary 1024M -1s",
+              "parted --script /dev/vda -- mklabel msdos"
+              . " mkpart primary linux-swap 1M 1024M"
+              . " mkpart primary 1024M -1s",
               "udevadm settle",
 
               "mkswap /dev/vda1 -L swap",
@@ -425,11 +425,11 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda mklabel msdos",
-              "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1
-              "parted --script /dev/vda -- set 1 lvm on",
-              "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2
-              "parted --script /dev/vda -- set 2 lvm on",
+              "parted --script /dev/vda -- mklabel msdos"
+              . " mkpart primary 1M 2048M" # PV1
+              . " set 1 lvm on"
+              . " mkpart primary 2048M -1s" # PV2
+              . " set 2 lvm on",
               "udevadm settle",
               "pvcreate /dev/vda1 /dev/vda2",
               "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@@ -447,10 +447,10 @@ in {
   luksroot = makeInstallerTest "luksroot"
     { createPartitions = ''
         $machine->succeed(
-          "parted --script /dev/vda mklabel msdos",
-          "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-          "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
-          "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS
+          "parted --script /dev/vda -- mklabel msdos"
+          . " mkpart primary ext2 1M 50MB" # /boot
+          . " mkpart primary linux-swap 50M 1024M"
+          . " mkpart primary 1024M -1s", # LUKS
           "udevadm settle",
           "mkswap /dev/vda2 -L swap",
           "swapon -L swap",
@@ -481,11 +481,11 @@ in {
   filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile"
     { createPartitions = ''
        $machine->succeed(
-          "parted --script /dev/vda mklabel msdos",
-          "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
-          "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
-          "parted --script /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile
-          "parted --script /dev/vda -- mkpart primary 1280M -1s",
+          "parted --script /dev/vda -- mklabel msdos"
+          . " mkpart primary ext2 1M 50MB" # /boot
+          . " mkpart primary linux-swap 50M 1024M"
+          . " mkpart primary 1024M 1280M" # LUKS with keyfile
+          . " mkpart primary 1280M -1s",
           "udevadm settle",
           "mkswap /dev/vda2 -L swap",
           "swapon -L swap",
@@ -555,9 +555,9 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/sda mklabel msdos",
-              "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M",
-              "parted --script /dev/sda -- mkpart primary ext2 1024M -1s",
+              "parted --script /dev/sda -- mklabel msdos"
+              . " mkpart primary linux-swap 1M 1024M"
+              . " mkpart primary ext2 1024M -1s",
               "udevadm settle",
               "mkswap /dev/sda1 -L swap",
               "swapon -L swap",

From be1f39244fd9e7dd2e2cbbce3630d4da3473d602 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 22 Sep 2018 09:41:14 +0200
Subject: [PATCH 1483/3253] pythonPackages.click-didyoumean: init at 0.0.3

---
 .../click-didyoumean/default.nix              | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/click-didyoumean/default.nix

diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix
new file mode 100644
index 000000000000..4cd2ea15029b
--- /dev/null
+++ b/pkgs/development/python-modules/click-didyoumean/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi,
+  click
+}:
+
+buildPythonPackage rec {
+  pname = "click-didyoumean";
+  version = "0.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1svaza5lpvdbmyrx5xi0riqzq4hb9wnlpqrg6r8zy14pbi42j8hi";
+  };
+
+  propagatedBuildInputs = [ click ];
+
+  meta = with stdenv.lib; {
+    description = "Enable git-like did-you-mean feature in click";
+    homepage = https://github.com/click-contrib/click-didyoumean;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20ba493da153..22d6e57a228b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1540,6 +1540,8 @@ in {
 
   click = callPackage ../development/python-modules/click {};
 
+  click-didyoumean = callPackage ../development/python-modules/click-didyoumean {};
+
   click-log = callPackage ../development/python-modules/click-log {};
 
   click-plugins = callPackage ../development/python-modules/click-plugins {};

From af7adc206daf8c15da9a5e3a7167185eb316edff Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 22 Sep 2018 09:41:55 +0200
Subject: [PATCH 1484/3253] pythonPackages.shellingham: init at 1.2.6

---
 .../python-modules/shellingham/default.nix    | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/shellingham/default.nix

diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix
new file mode 100644
index 000000000000..57cafe2624c5
--- /dev/null
+++ b/pkgs/development/python-modules/shellingham/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "shellingham";
+  version = "1.2.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0x1hja3jzvh7xmd0sxnfw9hi3k419s95vb7jjzh76yydzvss1r2q";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Tool to Detect Surrounding Shell";
+    homepage = https://github.com/sarugaku/shellingham;
+    license = licenses.isc;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22d6e57a228b..ba6a49f0064b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -560,6 +560,8 @@ in {
 
   serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
 
+  shellingham = callPackage ../development/python-modules/shellingham {};
+
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
   singledispatch = callPackage ../development/python-modules/singledispatch { };

From ff2dddac7d9e3f7dc2abc802b81ec73b56dd46b2 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 22 Sep 2018 09:42:20 +0200
Subject: [PATCH 1485/3253] pythonPackages.click-completion: init at 0.4.1

---
 .../click-completion/default.nix              | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/click-completion/default.nix

diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix
new file mode 100644
index 000000000000..a6b36232531b
--- /dev/null
+++ b/pkgs/development/python-modules/click-completion/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k,
+  click, jinja2, shellingham, six
+}:
+
+buildPythonPackage rec {
+  pname = "click-completion";
+  version = "0.4.1";
+  disabled = (!isPy3k);
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fjm22dyma26jrx4ki2z4dwbhcah4r848fz381x64sz5xxq3xdrk";
+  };
+
+  propagatedBuildInputs = [ click jinja2 shellingham six ];
+
+  meta = with stdenv.lib; {
+    description = "Add or enhance bash, fish, zsh and powershell completion in Click";
+    homepage = https://github.com/click-contrib/click-completion;
+    license = licenses.mit;
+    maintainers = with maintainers; [ mbode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba6a49f0064b..264806293ec6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1542,6 +1542,8 @@ in {
 
   click = callPackage ../development/python-modules/click {};
 
+  click-completion = callPackage ../development/python-modules/click-completion {};
+
   click-didyoumean = callPackage ../development/python-modules/click-didyoumean {};
 
   click-log = callPackage ../development/python-modules/click-log {};

From 2791f43eeb8a477fdf3d00236196342c7dd4c66f Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Sat, 22 Sep 2018 09:42:36 +0200
Subject: [PATCH 1486/3253] doitlive: 3.0.3 -> 4.0.1

---
 pkgs/tools/misc/doitlive/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix
index 3520d67abd21..a8ff34af9757 100644
--- a/pkgs/tools/misc/doitlive/default.nix
+++ b/pkgs/tools/misc/doitlive/default.nix
@@ -2,14 +2,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "doitlive";
-  version = "3.0.3";
+  version = "4.0.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "19i16ca835rb3gal1sxyvpyilj9a80n6nikf0smlzmxck38x86fj";
+    sha256 = "1icnjkczy52i3cp1fmsijqny571fz1h4b3wpdzz79cn90fr326pc";
   };
 
-  propagatedBuildInputs = with python3Packages; [ click ];
+  propagatedBuildInputs = with python3Packages; [ click click-completion click-didyoumean ];
 
   # disable tests (too many failures)
   doCheck = false;

From 4c9898108d74ab52cbe0d64166a4a16f25afa15f Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Fri, 21 Sep 2018 18:22:47 +0200
Subject: [PATCH 1487/3253] pev: init at unstable-2018-07-22

---
 maintainers/maintainer-list.nix               |  5 ++++
 .../tools/analysis/pev/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/pev/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 566414bf4439..c180ffffd859 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1847,6 +1847,11 @@
     github = "jerith666";
     name = "Matt McHenry";
   };
+  jeschli = {
+    email = "jeschli@gmail.com";
+    github = "jeschli";
+    name = "Markus Hihn";
+  };
   jethro = {
     email = "jethrokuan95@gmail.com";
     github = "jethrokuan";
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix
new file mode 100644
index 000000000000..8e8f438b5e1a
--- /dev/null
+++ b/pkgs/development/tools/analysis/pev/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, openssl, fetchFromGitHub }:
+stdenv.mkDerivation {
+  name = "pev-unstable-2018-07-22";
+  buildInputs = [ openssl ];
+  src = fetchFromGitHub {
+    owner = "merces";
+    repo = "pev";
+    rev = "aa4ef7f"; 
+    sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; 
+    fetchSubmodules = true;
+  };
+
+  makeFlags = [ "prefix=$(out)" ];
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries.";
+    homepage = "http://pev.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.jeschli ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6448a0b4bd6..4502d61b5760 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1487,6 +1487,8 @@ with pkgs;
 
   pbzx = callPackage ../tools/compression/pbzx { };
 
+  pev = callPackage ../development/tools/analysis/pev { };
+
   photon = callPackage ../tools/networking/photon { };
 
   playerctl = callPackage ../tools/audio/playerctl { };

From 5ebbd44e6d531937e063c01fe43079e0d2535f47 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Mon, 3 Sep 2018 14:33:21 +0200
Subject: [PATCH 1488/3253] systrayhelper: init at 0.0.3

offers a stdio json interface to create menu-items.
and send click events back over stdout.
---
 pkgs/tools/misc/systrayhelper/default.nix |  41 +++++++++
 pkgs/tools/misc/systrayhelper/deps.nix    | 102 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 3 files changed, 145 insertions(+)
 create mode 100644 pkgs/tools/misc/systrayhelper/default.nix
 create mode 100644 pkgs/tools/misc/systrayhelper/deps.nix

diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix
new file mode 100644
index 000000000000..e812d6799fea
--- /dev/null
+++ b/pkgs/tools/misc/systrayhelper/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "systrayhelper-${version}";
+  version = "0.0.3";
+  rev = "0953942245566bf358ba937af840947100380e15";
+
+  goPackagePath = "github.com/ssbc/systrayhelper";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "ssbc";
+    repo = "systrayhelper";
+    sha256 = "12xmzcw94in4m1hl4hbfdsbvkkaqrljgb67b95m1qwkkjak3q9g6";
+  };
+
+  goDeps = ./deps.nix;
+
+  # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178
+  # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time.
+  buildFlagsArray = [ ''-ldflags=
+    -X main.version=v${version}
+    -X main.commit=${rev}
+    -X main.date="nix-byrev"
+    -s
+    -w
+  '' ];
+
+  nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ];
+  buildInputs = [ libappindicator-gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "A systray utility written in go, using json over stdio for control and events";
+    homepage    = "https://github.com/ssbc/systrayhelper";
+    maintainers = with maintainers; [ cryptix ];
+    license     = licenses.mit;
+    # It depends on the inputs, i guess? not sure about solaris, for instance. go supports it though
+    # I hope nix can figure this out?! ¯\\_(ツ)_/¯
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/systrayhelper/deps.nix b/pkgs/tools/misc/systrayhelper/deps.nix
new file mode 100644
index 000000000000..67ec6662d984
--- /dev/null
+++ b/pkgs/tools/misc/systrayhelper/deps.nix
@@ -0,0 +1,102 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/getlantern/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/context";
+      rev =  "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775";
+      sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/errors";
+      rev =  "e24b7f4ff7c70be59bbefca6b7695d68cda8b399";
+      sha256 = "1wshagslgl3r07gniq0g55cqgi1j1gk0yrri5ywjz7wm8da42qcr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/golog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/golog";
+      rev =  "cca714f7feb5df8e455f409b549d384441ac4578";
+      sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/hex";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/hex";
+      rev =  "083fba3033ad473db3dd31c9bb368473d37581a7";
+      sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/hidden";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/hidden";
+      rev =  "d52a649ab33af200943bb599898dbdcfdbc94cb7";
+      sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/ops";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/ops";
+      rev =  "37353306c90844c8e0591956f56611f46299d202";
+      sha256 = "0q8j2963jqf3p7fcnsfinkvz71mfylrkk2xjar775zjx5a23sa5i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/getlantern/systray";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getlantern/systray";
+      rev =  "3fd1443dac5c8297999189fe28d5836b2b075b66";
+      sha256 = "1sb11n27zy8xmq0lvrpqikb53425jvwl5617cp201va6iwk1hgnh";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-stack/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-stack/stack";
+      rev =  "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a";
+      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+    };
+  }
+  {
+    goPackagePath  = "github.com/oxtoacart/bpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oxtoacart/bpool";
+      rev =  "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6";
+      sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "c059e472caf75dbe73903f6521a20abac245b17f";
+      sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "d0be0721c37eeb5299f245a996a483160fc36940";
+      sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32af34bf70b0..653c34cea9e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5462,6 +5462,8 @@ with pkgs;
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; };
 
+  systrayhelper = callPackage ../tools/misc/systrayhelper {};
+
   otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
 
   privoxy = callPackage ../tools/networking/privoxy {

From c46677fec2d3264f6a8f8b1929288806ea4f91aa Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 22 Sep 2018 12:22:17 +0200
Subject: [PATCH 1489/3253] nixos/tests/installer: use flock for all parted
 calls

to further reduce risk of race with udev, like util-linux
recommends for sfdisk:
https://github.com/karelzak/util-linux/blob/v2.32/disk-utils/sfdisk.8#L71
---
 nixos/tests/installer.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 96845b79ad97..dc8edeab4e6c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -282,7 +282,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel msdos"
+              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
               . " mkpart primary linux-swap 1M 1024M"
               . " mkpart primary ext2 1024M -1s",
               "udevadm settle",
@@ -299,7 +299,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel gpt"
+              "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
               . " mkpart ESP fat32 1M 50MiB" # /boot
               . " set 1 boot on"
               . " mkpart primary linux-swap 50MiB 1024MiB"
@@ -321,7 +321,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel gpt"
+              "flock /dev/vda parted --script /dev/vda -- mklabel gpt"
               . " mkpart ESP fat32 1M 50MiB" # /boot
               . " set 1 boot on"
               . " mkpart primary linux-swap 50MiB 1024MiB"
@@ -345,7 +345,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel msdos"
+              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
               . " mkpart primary ext2 1M 50MB" # /boot
               . " mkpart primary linux-swap 50MB 1024M"
               . " mkpart primary ext2 1024M -1s", # /
@@ -366,7 +366,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel msdos"
+              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
               . " mkpart primary ext2 1M 50MB" # /boot
               . " mkpart primary linux-swap 50MB 1024M"
               . " mkpart primary ext2 1024M -1s", # /
@@ -402,7 +402,7 @@ in {
       createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel msdos"
+              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
               . " mkpart primary linux-swap 1M 1024M"
               . " mkpart primary 1024M -1s",
               "udevadm settle",
@@ -425,7 +425,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda -- mklabel msdos"
+              "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
               . " mkpart primary 1M 2048M" # PV1
               . " set 1 lvm on"
               . " mkpart primary 2048M -1s" # PV2
@@ -447,7 +447,7 @@ in {
   luksroot = makeInstallerTest "luksroot"
     { createPartitions = ''
         $machine->succeed(
-          "parted --script /dev/vda -- mklabel msdos"
+          "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
           . " mkpart primary ext2 1M 50MB" # /boot
           . " mkpart primary linux-swap 50M 1024M"
           . " mkpart primary 1024M -1s", # LUKS
@@ -481,7 +481,7 @@ in {
   filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile"
     { createPartitions = ''
        $machine->succeed(
-          "parted --script /dev/vda -- mklabel msdos"
+          "flock /dev/vda parted --script /dev/vda -- mklabel msdos"
           . " mkpart primary ext2 1M 50MB" # /boot
           . " mkpart primary linux-swap 50M 1024M"
           . " mkpart primary 1024M 1280M" # LUKS with keyfile
@@ -520,7 +520,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/vda --"
+              "flock /dev/vda parted --script /dev/vda --"
               . " mklabel msdos"
               . " mkpart primary ext2 1M 100MB" # /boot
               . " mkpart extended 100M -1s"
@@ -555,7 +555,7 @@ in {
     { createPartitions =
         ''
           $machine->succeed(
-              "parted --script /dev/sda -- mklabel msdos"
+              "flock /dev/sda parted --script /dev/sda -- mklabel msdos"
               . " mkpart primary linux-swap 1M 1024M"
               . " mkpart primary ext2 1024M -1s",
               "udevadm settle",

From 7dd6a5192d5dec03acb2490188f021f46460ec2d Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 22 Sep 2018 12:29:10 +0200
Subject: [PATCH 1490/3253] nixos/tests/installer: stop udev queue before
 calling mdadm

In the swraid test, temporarily stop udev queue execution while
creating mdraid devices to prevent a race with udev, see
https://groups.google.com/forum/#!topic/scylladb-dev/u87yHgo3ylU
---
 nixos/tests/installer.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index dc8edeab4e6c..3f9fa0e6016c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -531,8 +531,10 @@ in {
               "udevadm settle",
               "ls -l /dev/vda* >&2",
               "cat /proc/partitions >&2",
+              "udevadm control --stop-exec-queue",
               "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6",
               "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
+              "udevadm control --start-exec-queue",
               "udevadm settle",
               "mkswap -f /dev/md1 -L swap",
               "swapon -L swap",

From 7a036a5cbe4b9948ed72b7d16e44ee79172fecc4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Sep 2018 02:31:17 +0200
Subject: [PATCH 1491/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c75652c02be6a65822e661fda072ea610bd7ad13.
---
 .../haskell-modules/hackage-packages.nix      | 625 +++++++++++++++---
 1 file changed, 525 insertions(+), 100 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1f6cb3e22200..6db88796b64c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -11333,8 +11333,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lattices";
-       version = "0.0.2";
-       sha256 = "0c04nhcsqqja84bnha065k914rplffy7pawxijdnf9zvan3xpswf";
+       version = "0.0.3";
+       sha256 = "08v41np4v4v7dcv5959vvrg0l60xqk5wzi6y1gnm9q1i641r129k";
        libraryHaskellDepends = [ array base HaskellForMaths ];
        testHaskellDepends = [
          array base HaskellForMaths HUnit test-framework
@@ -28119,6 +28119,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {arbb_dev = null;};
 
+  "arbor-postgres" = callPackage
+    ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
+     , optparse-applicative, postgresql-simple, text
+     }:
+     mkDerivation {
+       pname = "arbor-postgres";
+       version = "0.0.2";
+       sha256 = "04fly3bwzkv30j79rzm5mk5af3j28z6grnixl2ll3nnqmbwkwr2n";
+       libraryHaskellDepends = [
+         base bytestring generic-lens lens network-uri optparse-applicative
+         postgresql-simple text
+       ];
+       description = "Convenience types and functions for postgresql-simple";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arbtt" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
      , bytestring-progress, conduit, containers, deepseq, directory
@@ -31906,6 +31922,8 @@ self: {
        pname = "axel";
        version = "0.0.5";
        sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq";
+       revision = "1";
+       editedCabalFile = "0cyygds6277zbm01b8x7sx700c83z20hdimlnk4wzhm1v2zya3a4";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -39079,6 +39097,77 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "broadcast-chan_0_2_0" = callPackage
+    ({ mkDerivation, async, base, criterion, deepseq, stm
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "broadcast-chan";
+       version = "0.2.0";
+       sha256 = "1hpc7hi7xbzc03391byxgyinknsdgsd0dgsvs7m7g3jdpdckw5g7";
+       libraryHaskellDepends = [ base unliftio-core ];
+       benchmarkHaskellDepends = [ async base criterion deepseq stm ];
+       description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "broadcast-chan-conduit" = callPackage
+    ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests
+     , conduit, containers, resourcet, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "broadcast-chan-conduit";
+       version = "0.2.0";
+       sha256 = "020g2lrhp27dp5hyq23dhypxlmlymf6alw9jc5nwp4xv3992kfzx";
+       libraryHaskellDepends = [
+         base broadcast-chan conduit resourcet transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         base broadcast-chan-tests conduit containers
+       ];
+       description = "Conduit-based parallel streaming code for broadcast-chan";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "broadcast-chan-pipes" = callPackage
+    ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests
+     , containers, foldl, pipes, pipes-safe
+     }:
+     mkDerivation {
+       pname = "broadcast-chan-pipes";
+       version = "0.2.0";
+       sha256 = "04p9h3wzx4qv00yl1hfrxyhl5rylhxn1psfvkppdz5in2h88a7f7";
+       libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];
+       testHaskellDepends = [
+         base broadcast-chan-tests containers foldl pipes pipes-safe
+       ];
+       description = "Pipes-based parallel streaming code for broadcast-chan";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "broadcast-chan-tests" = callPackage
+    ({ mkDerivation, async, base, broadcast-chan, clock, containers
+     , foldl, monad-loops, optparse-applicative, paramtree, random, stm
+     , tagged, tasty, tasty-golden, tasty-hunit, tasty-travis, temporary
+     , text
+     }:
+     mkDerivation {
+       pname = "broadcast-chan-tests";
+       version = "0.2.0";
+       sha256 = "1np0w4pv36hnifrklgybazhnwh4pfm73d7mx51p1flp9czaj0zz6";
+       libraryHaskellDepends = [
+         async base broadcast-chan clock containers optparse-applicative
+         paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
+         temporary text
+       ];
+       testHaskellDepends = [
+         base broadcast-chan containers foldl monad-loops random
+       ];
+       description = "Helpers for generating tests for broadcast-chan";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "broccoli" = callPackage
     ({ mkDerivation, base, containers, stm, time }:
      mkDerivation {
@@ -39295,8 +39384,8 @@ self: {
      }:
      mkDerivation {
        pname = "btree";
-       version = "0.3";
-       sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
+       version = "0.3.1";
+       sha256 = "071ghhjzg7c6m87nh2q53kqbff9hx782h6c1z5s9pwl2b7r8cc7g";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [
          base containers hashable MonadRandom primitive smallcheck tasty
@@ -50116,21 +50205,22 @@ self: {
   "concraft" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring, cmdargs
      , comonad, containers, crf-chain1-constrained, crf-chain2-tiers
-     , data-lens, lazy-io, monad-codec, monad-ox, sgd, tagset-positional
-     , temporary, text, text-binary, transformers, vector, vector-binary
-     , zlib
+     , data-lens, data-memocombinators, lazy-io, monad-codec, monad-ox
+     , parallel, pedestrian-dag, sgd, tagset-positional, temporary, text
+     , text-binary, transformers, vector, vector-binary, zlib
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.9.4";
-       sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3";
+       version = "0.11.0";
+       sha256 = "07da6r8rw4vphr7q5i0lfap80vlbq1jm9lsbjp6khc7n59l5b2j7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
-         crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
-         monad-codec monad-ox sgd tagset-positional temporary text
-         text-binary transformers vector vector-binary zlib
+         crf-chain1-constrained crf-chain2-tiers data-lens
+         data-memocombinators lazy-io monad-codec monad-ox parallel
+         pedestrian-dag sgd tagset-positional temporary text text-binary
+         transformers vector vector-binary zlib
        ];
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
@@ -50161,21 +50251,28 @@ self: {
 
   "concraft-pl" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, concraft
-     , containers, lazy-io, mtl, network, process, sgd, split
-     , tagset-positional, text, transformers
+     , containers, crf-chain1-constrained, crf-chain2-tiers, dhall
+     , filepath, http-types, lazy-io, lens, mtl, network, pedestrian-dag
+     , process, scotty, sgd, split, tagset-positional, text
+     , transformers, vector, wreq
      }:
      mkDerivation {
        pname = "concraft-pl";
-       version = "0.7.4";
-       sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
+       version = "2.0.2";
+       sha256 = "0vl49khchpsyxlwxa55xpah8gnjqgfx0vb9jrjzdbfaj293g77sm";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring concraft containers lazy-io mtl
-         network process sgd split tagset-positional text transformers
+         aeson base binary bytestring concraft containers
+         crf-chain1-constrained crf-chain2-tiers dhall http-types lazy-io
+         lens mtl network pedestrian-dag process scotty sgd split
+         tagset-positional text transformers vector wreq
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs concraft containers crf-chain1-constrained
+         dhall filepath pedestrian-dag sgd tagset-positional text
        ];
-       executableHaskellDepends = [ cmdargs ];
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54065,16 +54162,18 @@ self: {
 
   "crf-chain1-constrained" = callPackage
     ({ mkDerivation, array, base, binary, containers, data-lens
-     , logfloat, monad-codec, parallel, random, sgd, vector
-     , vector-binary, vector-th-unbox
+     , data-memocombinators, logfloat, monad-codec, parallel
+     , pedestrian-dag, random, sgd, vector, vector-binary
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "crf-chain1-constrained";
-       version = "0.3.2";
-       sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
+       version = "0.4.0";
+       sha256 = "1mqprywxh51hvbchw1pvg66bsdf24rx6ywk06z98sx88rlvc4a2q";
        libraryHaskellDepends = [
-         array base binary containers data-lens logfloat monad-codec
-         parallel random sgd vector vector-binary vector-th-unbox
+         array base binary containers data-lens data-memocombinators
+         logfloat monad-codec parallel pedestrian-dag random sgd vector
+         vector-binary vector-th-unbox
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
@@ -54101,16 +54200,17 @@ self: {
 
   "crf-chain2-tiers" = callPackage
     ({ mkDerivation, array, base, binary, comonad, containers
-     , data-lens, logfloat, monad-codec, parallel, sgd, vector
-     , vector-binary, vector-th-unbox
+     , data-lens, data-memocombinators, logfloat, monad-codec, parallel
+     , pedestrian-dag, sgd, vector, vector-binary, vector-th-unbox
      }:
      mkDerivation {
        pname = "crf-chain2-tiers";
-       version = "0.2.4";
-       sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
+       version = "0.3.0";
+       sha256 = "1iv86nscnrvy2yskpx4xilzqbz7y2gv9kzvlgz2h44svhshnypar";
        libraryHaskellDepends = [
-         array base binary comonad containers data-lens logfloat monad-codec
-         parallel sgd vector vector-binary vector-th-unbox
+         array base binary comonad containers data-lens data-memocombinators
+         logfloat monad-codec parallel pedestrian-dag sgd vector
+         vector-binary vector-th-unbox
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
@@ -55401,6 +55501,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "css-syntax_0_1_0_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, directory, hspec
+     , QuickCheck, scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.1.0.0";
+       sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh";
+       libraryHaskellDepends = [ base scientific text ];
+       testHaskellDepends = [
+         base directory hspec QuickCheck scientific text
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory scientific text
+       ];
+       description = "High-performance CSS tokenizer and serializer";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "css-text" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
@@ -81510,21 +81630,21 @@ self: {
      }) {};
 
   "geojson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific
-     , semigroups, tasty, tasty-hspec, tasty-quickcheck, text
-     , transformers, validation, vector
+    ({ mkDerivation, aeson, base, bytestring, deepseq, hlint, lens
+     , scientific, semigroups, tasty, tasty-hspec, tasty-quickcheck
+     , text, transformers, validation, vector
      }:
      mkDerivation {
        pname = "geojson";
-       version = "1.3.3";
-       sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz";
+       version = "2.0.0";
+       sha256 = "0pbdd34z09l7z4alqs92x6aw0s74rcv6hs5nr7gqrhc0wzrsmi5q";
        libraryHaskellDepends = [
-         aeson base lens scientific semigroups text transformers validation
-         vector
+         aeson base deepseq lens scientific semigroups text transformers
+         validation vector
        ];
        testHaskellDepends = [
          aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text
-         validation
+         validation vector
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -83599,6 +83719,29 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk_3_0_25" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.25";
+       sha256 = "0l6xnh85agjagdmjy72akvxviwkzyngh7rii5idrsd62bb27abx1";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gtk-declarative" = callPackage
     ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, mtl, text
@@ -83651,6 +83794,24 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {};
 
+  "gi-gtk-hs_0_3_6_2" = callPackage
+    ({ mkDerivation, base, base-compat, containers, gi-gdk
+     , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk-hs";
+       version = "0.3.6.2";
+       sha256 = "04gksr27nqzx77c8kv2c94ysf1pz3nwhvnxvbz8h7cn4hzvzhb8z";
+       libraryHaskellDepends = [
+         base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
+         gi-gtk haskell-gi-base mtl text transformers
+       ];
+       description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gi-gtkosxapplication" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
      , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi
@@ -86462,8 +86623,8 @@ self: {
      }:
      mkDerivation {
        pname = "goatee";
-       version = "0.3.1.2";
-       sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9";
+       version = "0.3.1.3";
+       sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers mtl parsec template-haskell
@@ -86480,8 +86641,8 @@ self: {
      }:
      mkDerivation {
        pname = "goatee-gtk";
-       version = "0.3.1.2";
-       sha256 = "19qgkrv22jffvy27ykqyhgqw2qak4888r1d3x1lfs48r3bisli2h";
+       version = "0.3.1.3";
+       sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -92102,8 +92263,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.3.0";
        sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
-       revision = "2";
-       editedCabalFile = "0hwv588hwzlhzck7lhlhmnz4vv05mmfxmx1vmk0b9gwvlv7wfjc3";
+       revision = "3";
+       editedCabalFile = "07h13j203wafvimfhswpjl2a43iaavy9579hm16z5m565m7f8hwy";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -95189,8 +95350,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.0";
        sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx";
-       revision = "2";
-       editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37";
+       revision = "3";
+       editedCabalFile = "0j9njdb6x5ibx113bprsq2i0jmrigdli23pjabxam9q07979c9ac";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default hex network text transformers
@@ -96397,6 +96558,19 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "haskell-gi-base_0_21_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, glib, text }:
+     mkDerivation {
+       pname = "haskell-gi-base";
+       version = "0.21.2";
+       sha256 = "075x1jxm1r038ajy0raxrm2m3d1j7lc91cq9ik26fvp1vd6p13xg";
+       libraryHaskellDepends = [ base bytestring containers text ];
+       libraryPkgconfigDepends = [ glib ];
+       description = "Foundation for libraries generated by haskell-gi";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "haskell-gi-overloading_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -97123,6 +97297,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-exts_1_20_3" = callPackage
+    ({ mkDerivation, array, base, containers, directory, filepath
+     , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty
+     , tasty-golden, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "haskell-src-exts";
+       version = "1.20.3";
+       sha256 = "1a74s4zarxdvhnflkxy13pawbfcdhyrb6gkdx0si8spv66knhgj3";
+       libraryHaskellDepends = [ array base ghc-prim pretty ];
+       libraryToolDepends = [ happy ];
+       testHaskellDepends = [
+         base containers directory filepath mtl pretty-show smallcheck tasty
+         tasty-golden tasty-smallcheck
+       ];
+       doCheck = false;
+       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-exts-observe" = callPackage
     ({ mkDerivation, base, haskell-src-exts, Hoed }:
      mkDerivation {
@@ -98782,20 +98977,23 @@ self: {
      }) {};
 
   "hasktags" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , microlens-platform, utf8-string
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , HUnit, json, microlens-platform, optparse-applicative
+     , utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.70.1";
-       sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v";
+       version = "0.71.2";
+       sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory filepath json microlens-platform
          utf8-string
        ];
-       executableHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [
+         base containers directory filepath optparse-applicative
+       ];
        testHaskellDepends = [
          base bytestring directory filepath HUnit json microlens-platform
          utf8-string
@@ -104691,6 +104889,8 @@ self: {
        pname = "hledger";
        version = "1.10";
        sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
+       revision = "1";
+       editedCabalFile = "1kj1by80j7f6rzwfccwl2cp53bb3lyivh8a8xnawdyxab1pkyz34";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104864,6 +105064,8 @@ self: {
        pname = "hledger-lib";
        version = "1.10";
        sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1";
+       revision = "1";
+       editedCabalFile = "1b6hj4w1qfh1q8c3ikx5sn8z70cfdmqi4iy3a3l64q4x1j4jgyic";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring cmdargs containers csv data-default Decimal deepseq
@@ -104894,6 +105096,8 @@ self: {
        pname = "hledger-ui";
        version = "1.10.1";
        sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67";
+       revision = "1";
+       editedCabalFile = "1xvppxdkrk64mpqb64r016xshxqq25zzflbysmldgiqm1ibngy1g";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104939,6 +105143,8 @@ self: {
        pname = "hledger-web";
        version = "1.10";
        sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9";
+       revision = "1";
+       editedCabalFile = "0zzgc6mjia06fwvjwpzzczh0p9k0a6bi2lib6zq5k1briq4gqblm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115456,6 +115662,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_2_17" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.2.17";
+       sha256 = "184ymryvfj3s6bc3igahfyd8k9cqf59vmpb9g3afh8xpicpmmiv6";
+       libraryHaskellDepends = [
+         base bytestring mmap semigroups transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -125049,8 +125279,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.4.2.0";
-       sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x";
+       version = "0.5.0.0";
+       sha256 = "1wvsk4lnkjpi38z7f9w8dafsw0cc1cgi8q2fsrqc0f7xv1qgzjb3";
        libraryHaskellDepends = [
          aeson async base bloodhound bytestring enclosed-exceptions
          exceptions http-client http-types katip retry scientific semigroups
@@ -127601,6 +127831,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_8_2" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.8.2";
+       sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp";
+       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 {
@@ -128246,6 +128495,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-ocaml" = callPackage
+    ({ mkDerivation, alex, array, base, containers, data-default
+     , extensible-effects, happy, interpolate, lens, megaparsec, mtl
+     , prettyprinter, string-qq, tasty, tasty-hunit, zlib
+     }:
+     mkDerivation {
+       pname = "language-ocaml";
+       version = "0.1.31";
+       sha256 = "1vkqy5hdyqq5c22cccyvj1ci5srimpd5w8qwrwrrq9d5yai061w6";
+       libraryHaskellDepends = [
+         array base containers data-default extensible-effects interpolate
+         lens megaparsec mtl prettyprinter string-qq tasty tasty-hunit
+       ];
+       libraryPkgconfigDepends = [ zlib ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         base interpolate megaparsec prettyprinter string-qq tasty
+         tasty-hunit
+       ];
+       description = "Language tools for manipulating OCaml programs in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) zlib;};
+
   "language-openscad" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -136139,6 +136411,37 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "magicbane_0_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
+     , conduit, conduit-combinators, data-has, ekg-core, ekg-wai, envy
+     , errors, exceptions, fast-logger, http-api-data, http-client
+     , http-client-tls, http-conduit, http-link-header, http-types
+     , lifted-base, monad-control, monad-logger, monad-metrics
+     , mono-traversable, mtl, network-uri, raw-strings-qq, refined, rio
+     , rio-orphans, servant-server, split, string-conversions, text
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers, wai, wai-cli, wai-middleware-metrics
+     }:
+     mkDerivation {
+       pname = "magicbane";
+       version = "0.4.0";
+       sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl";
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base bytestring conduit
+         conduit-combinators data-has ekg-core ekg-wai envy errors
+         exceptions fast-logger http-api-data http-client http-client-tls
+         http-conduit http-link-header http-types lifted-base monad-control
+         monad-logger monad-metrics mono-traversable mtl network-uri
+         raw-strings-qq refined rio rio-orphans servant-server split
+         string-conversions text transformers transformers-base unliftio
+         unliftio-core unordered-containers wai wai-cli
+         wai-middleware-metrics
+       ];
+       description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
@@ -137195,6 +137498,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "markdown_0_1_17_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , bytestring, call-stack, conduit, conduit-extra, containers
+     , data-default, directory, filepath, hspec, text, transformers
+     , xml-conduit, xml-types, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "markdown";
+       version = "0.1.17.4";
+       sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup conduit conduit-extra
+         containers data-default text transformers xml-conduit xml-types
+         xss-sanitize
+       ];
+       testHaskellDepends = [
+         base blaze-html bytestring call-stack conduit conduit-extra
+         containers directory filepath hspec text transformers
+       ];
+       description = "Convert Markdown to HTML, with XSS protection";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "markdown-kate" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html
      , conduit, containers, data-default, highlighting-kate, hspec
@@ -143683,7 +144010,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "morte_1_7_0" = callPackage
+  "morte_1_7_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -143693,8 +144020,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.7.0";
-       sha256 = "1q2na2xw70jr71v1ysscqf3v3f2hvn4f0lxkh4dgsdy8986b41cl";
+       version = "1.7.1";
+       sha256 = "1ff9h3zzcz59q07v0yx93v537z6swy65j88z9cn6mgfjrxjmqx2b";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -148300,8 +148627,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-messagepack-rpc";
-       version = "0.1.0.0";
-       sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3";
+       version = "0.1.1.0";
+       sha256 = "13q3dr0l5a5yd693hb2h5nw86kxcw7vbm41dw3lbky7jr8hh2r0h";
        libraryHaskellDepends = [
          base bytestring data-msgpack safe-exceptions text
          unordered-containers
@@ -148317,8 +148644,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-messagepack-rpc-websocket";
-       version = "0.1.0.0";
-       sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6";
+       version = "0.1.1.0";
+       sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d";
        libraryHaskellDepends = [
          base network-messagepack-rpc text websockets wss-client
        ];
@@ -154716,14 +155043,14 @@ self: {
   "pandoc-crossref" = callPackage
     ({ mkDerivation, base, containers, data-accessor
      , data-accessor-template, data-accessor-transformers, data-default
-     , deepseq, directory, filepath, hspec, mtl, open-browser
+     , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser
      , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb
      , template-haskell, temporary, text, utility-ht
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.2.1";
-       sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6";
+       version = "0.3.3.0";
+       sha256 = "0gnchg8z07g95wrsj9ywd308gy3h6ihrg7p50rw1dsszrdbfldiw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -154736,7 +155063,7 @@ self: {
        executableHaskellDepends = [
          base containers data-accessor data-accessor-template
          data-accessor-transformers data-default deepseq directory filepath
-         mtl open-browser optparse-applicative pandoc pandoc-types
+         gitrev mtl open-browser optparse-applicative pandoc pandoc-types
          roman-numerals syb template-haskell temporary text utility-ht
        ];
        testHaskellDepends = [
@@ -155731,8 +156058,8 @@ self: {
      }:
      mkDerivation {
        pname = "paramtree";
-       version = "0.1.1";
-       sha256 = "1k6bcx0h4prg7a85knhaw4z7vh9gilc9m1y66r9qrhj2fqi0ilj3";
+       version = "0.1.1.1";
+       sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-hunit temporary
@@ -157640,6 +157967,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pedestrian-dag" = callPackage
+    ({ mkDerivation, array, base, binary, containers }:
+     mkDerivation {
+       pname = "pedestrian-dag";
+       version = "0.2.0";
+       sha256 = "075m58nmls893vis3l55dix8mrciwl2r8kz1s18mgwhxvadm4gdp";
+       libraryHaskellDepends = [ array base binary containers ];
+       description = "A pedestrian implementation of directed acyclic graphs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "peg" = callPackage
     ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl
      , parsec
@@ -161244,6 +161582,55 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "planet-mitchell" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal
+     , approximate, array, async, atomic-primops, base, base-orphans
+     , base16-bytestring, bits, bytestring, bytestring-lexing
+     , case-insensitive, cborg, comonad, compact, constraints
+     , containers, contravariant, contravariant-extras, deepseq
+     , distributive, dlist, double-conversion, Earley, envparse, erf
+     , exceptions, extra, fgl, filepath, foldl, free, gauge
+     , generic-aeson, half, hashable, heaps, hedgehog
+     , integer-logarithms, lens, lens-aeson, list-transformer, logict
+     , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random
+     , network, network-info, network-uri, nf, optparse-applicative
+     , parallel, parser-combinators, pointed, prettyprinter
+     , prettyprinter-ansi-terminal, primitive, profunctors, psqueues
+     , reactive-banana, reflection, regex-applicative, scientific
+     , semigroupoids, semigroups, semilattices, serialise, split, stm
+     , stm-chans, stm-containers, tagged, text, text-short, time
+     , transformers, transformers-base, transformers-compat
+     , typed-process, unagi-chan, unix, unliftio, unordered-containers
+     , utf8-string, uuid, uuid-types, vault, vector, vector-builder
+     , weigh, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "planet-mitchell";
+       version = "0.0.0";
+       sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp";
+       libraryHaskellDepends = [
+         aeson aeson-pretty aeson-qq ansi-terminal approximate array async
+         atomic-primops base base-orphans base16-bytestring bits bytestring
+         bytestring-lexing case-insensitive cborg comonad compact
+         constraints containers contravariant contravariant-extras deepseq
+         distributive dlist double-conversion Earley envparse erf exceptions
+         extra fgl filepath foldl free gauge generic-aeson half hashable
+         heaps hedgehog integer-logarithms lens lens-aeson list-transformer
+         logict managed megaparsec mmorph monad-ste mtl multiset mwc-random
+         network network-info network-uri nf optparse-applicative parallel
+         parser-combinators pointed prettyprinter
+         prettyprinter-ansi-terminal primitive profunctors psqueues
+         reactive-banana reflection regex-applicative scientific
+         semigroupoids semigroups semilattices serialise split stm stm-chans
+         stm-containers tagged text text-short time transformers
+         transformers-base transformers-compat typed-process unagi-chan unix
+         unliftio unordered-containers utf8-string uuid uuid-types vault
+         vector vector-builder weigh writer-cps-mtl
+       ];
+       description = "Planet Mitchell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plankton" = callPackage
     ({ mkDerivation, adjunctions, base, protolude }:
      mkDerivation {
@@ -163690,19 +164077,17 @@ self: {
 
   "potoki-cereal" = callPackage
     ({ mkDerivation, acquire, attoparsec, base, base-prelude
-     , bytestring, cereal, directory, potoki, potoki-core, QuickCheck
-     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , bytestring, cereal, directory, potoki, potoki-core, profunctors
+     , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
      , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.3.0.1";
-       sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi";
-       revision = "1";
-       editedCabalFile = "1jp7vbxipvsg6shc03j0ms6apzmvb38nxpvwkbsk34vll4mzarj4";
+       version = "0.3.1";
+       sha256 = "1y6sgfafhnbgaifspli90ww4aj4r69vhkgl9v1jvspgrk67nzssj";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
-         text
+         profunctors text
        ];
        testHaskellDepends = [
          directory potoki QuickCheck quickcheck-instances rerebase tasty
@@ -169232,8 +169617,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.14.2";
-       sha256 = "11f9f7s6bag77a2kbhjwhhrcf1afbz18gnn3a4p0h2hav8b5lhcj";
+       version = "0.4.14.3";
+       sha256 = "1vzn20bci14hlkbdrgjqzb16yyqg332rb1aspsdh19grj0cvr4l8";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -174099,8 +174484,8 @@ self: {
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.0.4";
-       sha256 = "048ymaxiayd948wwyrds5x2nz2spzizc6pwiaw3n62ynp6izkv94";
+       version = "0.1.0.5";
+       sha256 = "0yqv58ra2h7cmnwvbpbdxma69qr1n44gw8mckrr0sq38rah9dxg3";
        libraryHaskellDepends = [
          base exceptions protolude resourcet text transformers-base
        ];
@@ -180026,24 +180411,24 @@ self: {
 
   "sbv" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, data-binary-ieee754, deepseq, directory, doctest
-     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
-     , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, time, z3
+     , crackNum, deepseq, directory, doctest, filepath, generic-deriving
+     , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
+     , reinterpret-cast, syb, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, time, z3
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.10";
-       sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p";
+       version = "7.11";
+       sha256 = "16kbhpfpzqxhc1zbxpjyvq89bnmhgm20v48np53dhqbpwjnphvva";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array async base containers crackNum data-binary-ieee754 deepseq
-         directory filepath generic-deriving ghc mtl pretty process
-         QuickCheck random syb template-haskell time
+         array async base containers crackNum deepseq directory filepath
+         generic-deriving ghc mtl pretty process QuickCheck random
+         reinterpret-cast syb template-haskell time
        ];
        testHaskellDepends = [
-         base bytestring containers data-binary-ieee754 directory doctest
-         filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden
+         base bytestring containers directory doctest filepath Glob hlint
+         mtl QuickCheck random reinterpret-cast syb tasty tasty-golden
          tasty-hunit tasty-quickcheck template-haskell
        ];
        testSystemDepends = [ z3 ];
@@ -181247,8 +181632,8 @@ self: {
     ({ mkDerivation, alex, array, base, bytestring, mtl, text }:
      mkDerivation {
        pname = "scythe";
-       version = "0.1.0.0";
-       sha256 = "00g6i3vihfrbrj98hpkrv4gqna7a4vyl6kwbzsj9ymx8jvv0jdaq";
+       version = "0.2.0.0";
+       sha256 = "0lh3f5xj6jc1jlg049vf63gvkw93nv8xd6b4b6jpk4nyv9fw2sqn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring mtl text ];
@@ -185680,8 +186065,8 @@ self: {
      }:
      mkDerivation {
        pname = "sgd";
-       version = "0.3.7";
-       sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04";
+       version = "0.4.0.1";
+       sha256 = "05ngij0zigjxplw76qaczpd4dmdmqj23h8bfls5cd5s5sbxv5irb";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq filepath lazy-io logfloat
          monad-par mtl primitive random temporary vector
@@ -201106,8 +201491,8 @@ self: {
      }:
      mkDerivation {
        pname = "tagset-positional";
-       version = "0.3.0";
-       sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
+       version = "0.3.1";
+       sha256 = "1fhc0qzfqs2jw8lr8j7vsx72dv15vsvnvqvbim5jqjmq43f8h1zv";
        libraryHaskellDepends = [
          base binary containers parsec text text-binary
        ];
@@ -214037,7 +214422,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "universum_1_3_0" = callPackage
+  "universum_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -214045,8 +214430,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "1.3.0";
-       sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp";
+       version = "1.4.0";
+       sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text transformers
@@ -217503,6 +217888,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "versions_3_5_0" = callPackage
+    ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
+     , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "versions";
+       version = "3.5.0";
+       sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w";
+       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
+       testHaskellDepends = [
+         base base-prelude checkers megaparsec microlens QuickCheck tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "Types and parsers for software version numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vfr-waypoints" = callPackage
     ({ mkDerivation, base, containers, dimensional, fuzzy
      , geodetic-types, lens, monoid-subclasses, optparse-applicative
@@ -222373,6 +222777,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wkt-geom" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, geojson
+     , hspec, lens, QuickCheck, scientific, trifecta, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "wkt-geom";
+       version = "0.0.1";
+       sha256 = "069jwfycqjg5dz4w80ywwjn3pky5kzg7wlwd7qk9y8lwca0bv4ij";
+       libraryHaskellDepends = [
+         base binary bytestring geojson scientific trifecta utf8-string
+         vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base binary bytestring geojson hspec lens QuickCheck
+         scientific trifecta vector
+       ];
+       description = "A parser of WKT, WKB and eWKB";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "wl-pprint" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -227382,8 +227807,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.5.1.0";
-       sha256 = "18mm1394rs93cchzglwdhzh5sc025bglgrqi4c0hi5hhw893k38z";
+       version = "0.5.2.0";
+       sha256 = "0pf1bplly18rjhagzkqacbpi5wq78kisg0vz217yml5z0xwy1rkj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 2ffcbeda133775bc19b80623be29746ce75d7411 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 13:20:45 +0200
Subject: [PATCH 1492/3253] ghc: add release version for 8.6.1

---
 pkgs/development/compilers/ghc/8.6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 36ef9d0cc73d..d4f2f931c31c 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -78,12 +78,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.6.0.20180810";
+  version = "8.6.1";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz";
-    sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw";
+    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
   };
 
   enableParallelBuilding = true;

From 230fd497383bee3d46d2a68da2481e3ece7620e8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 22 Sep 2018 19:46:21 +0800
Subject: [PATCH 1493/3253] weechat: Add version and meta to `buildEnv` package

Currently the output from `nix search` and similar tools are lacking
important meta data
---
 pkgs/applications/networking/irc/weechat/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a9de275559db..bf5d06423142 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -145,9 +145,10 @@ in if configure == null then weechat else
       unwrapped = weechat;
     };
   in buildEnv {
-    name = "weechat-bin-env";
+    name = "weechat-bin-env-${weechat.version}";
     paths = [
       (mkWeechat "weechat")
       (mkWeechat "weechat-headless")
     ];
+    meta = weechat.meta;
   }

From 9e87b56dd1e20b1d0f5fce34694f4e1362afd3fb Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 22 Sep 2018 14:17:34 +0200
Subject: [PATCH 1494/3253] zathura: 0.4.0 -> 0.4.1 (#47140)

This fixes the synctex-related build failure with texlive 2018
(currently on 18.09).
---
 pkgs/applications/misc/zathura/core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 001d70775d6d..56701cffb8cf 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -11,11 +11,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "zathura-core-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
-    sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma";
+    sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn";
   };
 
   nativeBuildInputs = [

From 1357f6492cdafcd0077f4357da6a33df287ef7fd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 22 Sep 2018 15:24:54 +0200
Subject: [PATCH 1495/3253] androidStudioPackages.{dev,canary}: 3.3.0.9 ->
 3.3.0.10

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 2385cd31cfaa..7b99e06446b3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
   };
   latestVersion = { # canary & dev
-    version = "3.3.0.9"; # "Android Studio 3.3 Canary 10"
-    build = "182.4996246";
-    sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g";
+    version = "3.3.0.10"; # "Android Studio 3.3 Canary 11"
+    build = "182.5012296";
+    sha256Hash = "0gqwf904y2pvp10l96gr055gjl1zf9pkb7840abqhl26liliwdm4";
   };
 in rec {
   # Old alias

From 8f5a37829d181d9dd3611c44178b8b41aede9161 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 22 Sep 2018 21:40:52 +0800
Subject: [PATCH 1496/3253] subsurface: 4.8.1 -> 4.8.2

---
 pkgs/applications/misc/subsurface/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 1b998c48580e..50bb1df2eef2 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "4.8.1";
+  version = "4.8.2";
 
   libdc = stdenv.mkDerivation rec {
     name = "libdivecomputer-ssrf-${version}";
 
     src = fetchurl {
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
-      sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy";
+      sha256 = "167qan59raibmilkc574gdqxfjg2f5ww2frn86xzk2kn4qg8190w";
     };
 
     nativeBuildInputs = [ autoreconfHook ];
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
-    sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2";
+    sha256 = "1fzrq6rqb6pzs36wxar2453cl509dqpcy9w7nq4gw7b1v2331wfy";
   };
 
   buildInputs = [

From 3d8f6b61885bce149e2b2482ae3710f0ca48adca Mon Sep 17 00:00:00 2001
From: Luke Clifton <luke-clifton@users.noreply.github.com>
Date: Sat, 22 Sep 2018 22:07:34 +0800
Subject: [PATCH 1497/3253] abduco: refactor (compile on darwin) (#47124)

---
 pkgs/tools/misc/abduco/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index cdfb57fc5f0e..4fc254b76b40 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
         license = licenses.isc;
         description = "Allows programs to be run independently from its controlling terminal";
         maintainers = with maintainers; [ pSub ];
-        platforms = platforms.linux;
+        platforms = platforms.unix;
     };
 
+    CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
+
     src = fetchurl {
         url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz";
         sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9";

From 4eebe205fe8287e0d2385ad15798d8b0146394dc Mon Sep 17 00:00:00 2001
From: Luke Clifton <luke-clifton@users.noreply.github.com>
Date: Sat, 22 Sep 2018 22:18:47 +0800
Subject: [PATCH 1498/3253] dvtm: refactor (fix on darwin) (#47103)

---
 pkgs/tools/misc/dvtm/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index f25d134ca790..58c602113ddb 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -9,6 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
   };
 
+  patches = [
+    # https://github.com/martanne/dvtm/pull/69
+    # Use self-pipe instead of signal blocking fixes issues on darwin.
+    (fetchurl {
+      url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch";
+      sha256 = "1cby8x3ckvhzqa8yxlfrwzgm8wk7yz84kr9psdjr7xwpnca1cqrd";
+    })
+  ];
+
+  CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
+
   postPatch = stdenv.lib.optionalString (customConfig != null) ''
     cp ${builtins.toFile "config.h" customConfig} ./config.h
   '';
@@ -28,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Dynamic virtual terminal manager";
     homepage = http://www.brain-dump.org/projects/dvtm;
     license = licenses.mit;
-    platforms = platforms.linux;
     maintainers = [ maintainers.vrthra ];
+    platforms = platforms.unix;
   };
 }

From c7706995244390ef76b5fdee72619b5f10fbd64f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 22 Sep 2018 18:07:00 +0200
Subject: [PATCH 1499/3253] devpi-client: 3.1.0 -> 4.1.0, fix tests (#47142)

---
 pkgs/development/tools/devpi-client/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 26d96a641263..e70971b670c2 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -9,28 +9,28 @@
 pythonPackages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "devpi-client";
-  version = "3.1.0";
+  version = "4.1.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr";
+    sha256 = "0f5jkvxx9fl8v5vwbwmplqhjsdfgiib7j3zvn0zxd8krvi2s38fq";
   };
 
   checkInputs = with pythonPackages; [
-                    pytest webtest mock
+                    pytest pytestflakes webtest mock
                     devpi-server tox
                     sphinx wheel git mercurial detox
                     setuptools
                     ];
   checkPhase = ''
     export PATH=$PATH:$out/bin
+    export HOME=$TMPDIR # fix tests failing in sandbox due to "/homeless-shelter"
 
     # setuptools do not get propagated into the tox call (cannot import setuptools)
     rm testing/test_test.py
 
     # test_pypi_index_attributes tries to connect to upstream pypi
-    # test_download_release_error is fixed in the next release
-    py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing
+    py.test -k 'not test_pypi_index_attributes' testing
   '';
 
   LC_ALL = "en_US.UTF-8";

From 1a5788010e65fc7a337ea2cc15be44ae32a4828f Mon Sep 17 00:00:00 2001
From: rbasso <rbasso@sharpgeeks.net>
Date: Sat, 22 Sep 2018 13:09:41 -0300
Subject: [PATCH 1500/3253] exercism: 3.0.6 -> 3.0.9 (#47170)

---
 pkgs/applications/misc/exercism/default.nix |  4 +-
 pkgs/applications/misc/exercism/deps.nix    | 76 ++++++++++-----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 4c5e9e5230a6..946f3695f166 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name    = "exercism-${version}";
-  version = "3.0.6";
+  version = "3.0.9";
 
   goPackagePath = "github.com/exercism/cli";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "exercism";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "0xr5bqzm0md1vllnr384k92k7w1nxzw9lhqgm23zkxx5a4vqzy56";
+    sha256 = "0nr3dzipylicrbplh25dw0w84qklr0xcyq442i9aswzibqrb2vc6";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/exercism/deps.nix b/pkgs/applications/misc/exercism/deps.nix
index ad93aa4e4373..10a6baa2241b 100644
--- a/pkgs/applications/misc/exercism/deps.nix
+++ b/pkgs/applications/misc/exercism/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/blang/semver";
-      rev =  "3c1074078d32d767e08ab2c8564867292da86926";
-      sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx";
+      rev =  "2ee87856327ba09384cabd113bc6b5d174e9ec0f";
+      sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
     };
   }
   {
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/davecgh/go-spew";
-      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/fsnotify/fsnotify";
-      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+      rev =  "629574ca2a5df945712d3079857300b5e4da0236";
+      sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev =  "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
-      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+      rev =  "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
+      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
     };
   }
   {
@@ -59,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/magiconair/properties";
-      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
-      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+      rev =  "be5ece7dd465ab0765a9682137865547526d1dfb";
+      sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
     };
   }
   {
@@ -68,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev =  "f15292f7a699fcc1a38a80977f80a046874ba8ac";
-      sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
+      rev =  "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-buffruneio";
-      rev =  "e2f66f8164ca709d4c21e815860afd2024e9b894";
-      sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv";
+      rev =  "c37440a7cf42ac63b919c752ca73a85067e05992";
+      sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
     };
   }
   {
@@ -86,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev =  "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
-      sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
+      rev =  "5ccdfb18c776b740aecaf085c4d9a2779199c279";
+      sha256 = "1jl44j58y62rhnwkzw3mvcj725gdyzs45pq4ga81qqxwqxs3czsq";
     };
   }
   {
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev =  "787d034dfe70e44075ccc060d346146ef53270ad";
-      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+      rev =  "9be650865eab0c12963d8753212f4f9c66cdcf12";
+      sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
     };
   }
   {
@@ -113,8 +113,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cast";
-      rev =  "8965335b8c7107321228e3e3702cab9832751bac";
-      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+      rev =  "acbeb36b902d72a7a4c18e8f3241075e7ab763e4";
+      sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050";
     };
   }
   {
@@ -122,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev =  "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1";
-      sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7";
+      rev =  "b26b538f693051ac6518e65672de3144ce3fbedc";
+      sha256 = "0pm3qlw35xygz9zz7hizlmin76wrfac8vsxvsd9i0zpnijbkmjv6";
     };
   }
   {
@@ -131,8 +131,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev =  "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
-      sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+      rev =  "0efa5202c04663c757d84f90f5219c1250baf94f";
+      sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs";
     };
   }
   {
@@ -140,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev =  "3ebe029320b2676d667ae88da602a5f854788a8a";
-      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+      rev =  "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
+      sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
     };
   }
   {
@@ -149,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev =  "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
-      sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
+      rev =  "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
     };
   }
   {
@@ -158,8 +158,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
-      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+      rev =  "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
+      sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
     };
   }
   {
@@ -167,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev =  "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd";
-      sha256 = "0vx7mz18p480p7fh0w5jv6mfdbsswrlac1sz4i705q7q7ygz59lm";
+      rev =  "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
+      sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
     };
   }
   {
@@ -176,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
-      sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
+      rev =  "d8f5ea21b9295e315e612b4bcf4bedea93454d4d";
+      sha256 = "1gy2y20glqqqcmmrcx2wrvk4h74h8im1nxvzi91i1mxjk7p185mv";
     };
   }
   {
@@ -185,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev =  "0605a8320aceb4207a5fb3521281e17ec2075476";
-      sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
+      rev =  "3bd178b88a8180be2df394a1fbb81313916f0e7b";
+      sha256 = "137pp3gz8ll08q0q434dn6472bbkv81h72qqqm9idhf7cc6f51w9";
     };
   }
   {
@@ -194,8 +194,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/go-yaml/yaml";
-      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+      rev =  "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+      sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
     };
   }
 ]
\ No newline at end of file

From d1b97bcbe8dffdf53e1a81e0839cf42d397e9c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Fri, 21 Sep 2018 00:51:03 +0200
Subject: [PATCH 1501/3253] dune: 1.1.1 -> 1.2.1

---
 pkgs/development/tools/ocaml/dune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index a9ed66a8efe1..857d6ff1b7c2 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "dune-${version}";
-  version = "1.1.1";
+  version = "1.2.1";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "dune";
     rev = "${version}";
-    sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw";
+    sha256 = "14m5zg1b6d0y03c5qsmqmwiwz2h0iys02rlgn6kzm519ck679bkq";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];

From aefb40b671d76964623005cf11a4b251c1267c14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Sep 2018 09:25:44 -0700
Subject: [PATCH 1502/3253] hylafaxplus: 5.6.0 -> 5.6.1 (#47045)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hylafaxplus/versions
---
 pkgs/servers/hylafaxplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix
index 410d24974268..dc53ee36f702 100644
--- a/pkgs/servers/hylafaxplus/default.nix
+++ b/pkgs/servers/hylafaxplus/default.nix
@@ -30,8 +30,8 @@
 let
 
   name = "hylafaxplus-${version}";
-  version = "5.6.0";
-  sha256 = "128514kw9kb5cvznm87z7gis1mpyx4bcqrxx4xa7cbfj1v3v81fr";
+  version = "5.6.1";
+  sha256 = "100jcnkf44g659fh732a3ic2ik6l619cv0zhhp37n2kaydv876s1";
 
   configSite = substituteAll {
     name = "hylafaxplus-config.site";

From 3b0d3036044f9d6e46e0b9b13eecd11d5728b34d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 22 Sep 2018 18:35:51 +0200
Subject: [PATCH 1503/3253] gnuradio-rds: 2016-08-27 -> 1.0.0

---
 pkgs/applications/misc/gnuradio/rds.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix
index 44ed89d9002d..b617791dc2e1 100644
--- a/pkgs/applications/misc/gnuradio/rds.nix
+++ b/pkgs/applications/misc/gnuradio/rds.nix
@@ -6,12 +6,12 @@ assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
   name = "gnuradio-rds-${version}";
-  version = "2016-08-27";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "bastibl";
     repo = "gr-rds";
-    rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc";
+    rev = "$v{version}";
     sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs";
   };
 

From a8087e3bd70ddc13bcd491f117d5b5473c2f4c14 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sat, 22 Sep 2018 18:49:35 +0200
Subject: [PATCH 1504/3253] gitlab-runner: 11.2.0 -> 11.3.0 (#47167)

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 0b6d0cd28efd..203e140b369e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "11.2.0";
+  version = "11.3.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "1dphrws6118l0ryvgny0z5h9fsdbwckm4x21bh8hwb6bxdbqr0yn";
+    sha256 = "1xl48lrycwy4d7h83ydp9gj27d9mhbpa4xrd1bn7i3ad9lrn7xjz";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "162lzbi7z9afp470w0qkcja728jyb48s7krzinmvg45fb3fb0lfn";
+    sha256 = "0afjg4hv9iy80anl5h7cnjdxzk4zrkj2zn3f4qsl9rf7354ik1zj";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "1y4fb5jbks6xab7zim10s112h11bq04hh3lddmhm4f2nyqcmlrqh";
+    sha256 = "0p992mm8zz30nx0q076g0waqvfknn05wyyr1n1sxglbh9nmym157";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 1491d4f268421d64667dd136e4064a0550fc1bff Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 22 Sep 2018 15:02:54 +0000
Subject: [PATCH 1505/3253] yed: 3.18.1 -> 3.18.1.1

---
 pkgs/applications/graphics/yed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index a7cc7229d5b1..9100efc86394 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.18.1";
+  version = "3.18.1.1";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8";
+    sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 6adb944cb66c36a89dd9bffff21d4e81e96d85f3 Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Sat, 22 Sep 2018 19:09:33 +0200
Subject: [PATCH 1506/3253] lua: 5.2.3 -> 5.2.4 (#47126)

Lua 5.2.4 is the EOL point release of the 5.2 series.
---
 pkgs/development/interpreters/lua-5/5.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6d8de7bae27e..a8badf647c0c 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -10,11 +10,11 @@ in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.2";
-  version = "${luaversion}.3";
+  version = "${luaversion}.4";
 
   src = fetchurl {
     url = "https://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
+    sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
   };
 
   buildInputs = [ readline ];

From 7a5483e8b469a43eec06f2d864139f093d1ac4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Rauscher?= <kevin.rauscher@tomahna.fr>
Date: Sat, 22 Sep 2018 17:21:26 +0000
Subject: [PATCH 1507/3253] mopidy-iris: 3.26.1 -> 3.26.2 (#47161)

---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 88aa47169985..be44112d82a8 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.26.1";
+  version = "3.26.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0qa55mmkrig5jymhm0mrr9jvxzfb2j70b971big3ady038cqd6f5";
+    sha256 = "04jg5k8znkn0iirfnsndm74f8mypj8zwj76j489l0m263k1kn715";
   };
 
   propagatedBuildInputs = [

From 5b3c8485d60475ce8b316eab6b56afa47e11dea6 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Sat, 22 Sep 2018 18:23:31 +0100
Subject: [PATCH 1508/3253] sddm: link whole sddm directory, not just themes
 (#47174)

---
 nixos/modules/services/x11/display-managers/sddm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 1635c0f9acc5..2a9826177737 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -263,7 +263,9 @@ in
     };
 
     environment.etc."sddm.conf".source = cfgFile;
-    environment.pathsToLink = [ "/share/sddm/themes" ];
+    environment.pathsToLink = [ 
+      "/share/sddm" 
+    ];
 
     users.groups.sddm.gid = config.ids.gids.sddm;
 

From fcde178ed5f76626d57b3b02848f2fedf5fd9928 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Fri, 21 Sep 2018 23:06:58 -0700
Subject: [PATCH 1509/3253] libsndfile: Add patch for CVE-2018-13139 (#47160)

---
 pkgs/development/libraries/libsndfile/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index a68b5b2b6d5e..b150dd0f59c3 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch";
       sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df";
     })
+    (fetchurl {
+      name = "CVE-2018-13139.patch";
+      url = "https://github.com/erikd/libsndfile/commit/aaea680337267bfb6d2544da878890ee7f1c5077.patch";
+      sha256 = "01q3m7pa3xqkh05ijmfgv064v8flkg4p24bgy9wxnc6wfcdifggx";
+    })
   ];
 
   nativeBuildInputs = [ pkgconfig ];

From ef04436f7bfd3a1173730540a244cd60bac99274 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Sep 2018 10:44:33 -0700
Subject: [PATCH 1510/3253] latte-dock: 0.8.0 -> 0.8.1 (#47027)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/latte-dock/versions
---
 pkgs/applications/misc/latte-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index c22c014bf5f5..6d22be32afaf 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.8.0";
+  version = "0.8.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
-    sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs";
+    sha256 = "1f480ahrsxrksiiyspg7kb1hnz4vcjbs3w039cjkq2vp4wvjd74q";
     name = "${name}.tar.xz";
   };
 

From 3063794c881391233b34a64dfc9f4c3317db1e9c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 22 Sep 2018 19:56:48 +0200
Subject: [PATCH 1511/3253] gnuradio-nacl: 2015-11-05 -> 2017-04-10

---
 pkgs/applications/misc/gnuradio/nacl.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/nacl.nix b/pkgs/applications/misc/gnuradio/nacl.nix
index 28836958e98c..2f4b0e4e3eb6 100644
--- a/pkgs/applications/misc/gnuradio/nacl.nix
+++ b/pkgs/applications/misc/gnuradio/nacl.nix
@@ -7,13 +7,13 @@ assert pythonSupport -> python != null && swig != null;
 
 stdenv.mkDerivation rec {
   name = "gnuradio-nacl-${version}";
-  version = "2015-11-05";
+  version = "2017-04-10";
 
   src = fetchFromGitHub {
     owner = "stwunsch";
     repo = "gr-nacl";
-    rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95";
-    sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
+    rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765";
+    sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 08f266490b7bb0c3b5492c0e3883828b5f4fd565 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 10 Sep 2018 19:43:17 +0300
Subject: [PATCH 1512/3253] rmilter: move rmilter.sock out of /run/rmilter

/run/rmilter is set by systemd, and have root:root ownership, which
prevent pid file to write.

This fix suggested to be promoted to 18.09 branch.
(Although rmilter itself is deprecated, and I plan to remove it, after
18.09 would be released)
---
 nixos/modules/services/mail/rmilter.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 7f38d7570132..c3e3d8232429 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -89,7 +89,7 @@ in
 
       bindSocket.path = mkOption {
        type = types.str;
-       default = "/run/rmilter/rmilter.sock";
+       default = "/run/rmilter.sock";
        description = ''
           Path to Unix domain socket to listen on.
         '';

From f2ba1a4284c30af9071c7f5efbaa709beb8c18a0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 22 Sep 2018 20:12:23 +0200
Subject: [PATCH 1513/3253] tor-browser-bundle-bin: 8.0 -> 8.0.1

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index d9ff1b5c54d8..90287c05b5e4 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -103,7 +103,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "8.0";
+  version = "8.0.1";
 
   lang = "en-US";
 
@@ -113,7 +113,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79";
+      sha256 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c";
     };
 
     "i686-linux" = fetchurl {
@@ -121,7 +121,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx";
+      sha256 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7";
     };
   };
 in

From 0b82fbc3af2149f4db6da4150b35393569f6366f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 22 Sep 2018 20:22:57 +0200
Subject: [PATCH 1514/3253] php: Refactor so we can upgrade PHP per platform
 (#47162)

This way we don't need to disable flags etc by platform and can still
backport new versions to stable for linux even if there's a bug or
something in the darwin build.
---
 pkgs/development/interpreters/php/default.nix | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index adffe647c365..5af569a5e7c8 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -37,10 +37,7 @@ let
   , opensslSupport ? config.php.openssl or true
   , mbstringSupport ? config.php.mbstring or true
   , gdSupport ? config.php.gd or true
-  # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
-  # We need to disable the intl support on darwin. Whenever the upstream bug is
-  # fixed we should revert this to just just "config.php.intl or true".
-  , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin)
+  , intlSupport ? config.php.intl or true
   , exifSupport ? config.php.exif or true
   , xslSupport ? config.php.xsl or false
   , mcryptSupport ? config.php.mcrypt or true
@@ -225,13 +222,35 @@ let
     };
 
 in {
-  php71 = generic {
-    version = "7.1.22";
-    sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
-  };
+  # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
+  # We can't update the darwin versions because they simply don't compile at
+  # all due to a bug in the intl extensions.
+  #
+  # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
 
-  php72 = generic {
-    version = "7.2.10";
-    sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
-  };
+  php71 = generic (
+    if stdenv.isDarwin then
+      {
+        version = "7.1.20";
+        sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
+      }
+    else
+      {
+        version = "7.1.22";
+        sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
+      }
+  );
+
+  php72 = generic (
+    if stdenv.isDarwin then
+      {
+        version = "7.2.8";
+        sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+      }
+    else
+      {
+        version = "7.2.10";
+        sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
+      }
+  );
 }

From 13e738f1e89869f158035ac6c0b0c118ae5eaf04 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Sat, 22 Sep 2018 20:49:23 +0200
Subject: [PATCH 1515/3253] nixos/release.nix: run test for pgjwt (#47181)

---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index d26aacb669aa..14983edb0ce7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -381,7 +381,7 @@ in rec {
   tests.pgmanage = callTest tests/pgmanage.nix {};
   tests.postgis = callTest tests/postgis.nix {};
   tests.powerdns = callTest tests/powerdns.nix {};
-  #tests.pgjwt = callTest tests/pgjwt.nix {};
+  tests.pgjwt = callTest tests/pgjwt.nix {};
   tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.prometheus = callTest tests/prometheus.nix {};

From d7c1d04af4085e0ae6fecbffdb0a19299de598e8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 17 Aug 2018 20:48:40 -0400
Subject: [PATCH 1516/3253] mkl: init at 2019.0.117

This packags the Intel Math Kernel library on x86-64 platforms, which is a
dependency for many data science and machine learning packages.

Upstream, Intel provides proprietary binary RPMs with a permissive
redistribution license. These have been repackaged in both Debian and Anaconda,
so we are not the first distribution to redistribute.
---
 lib/licenses.nix                              |  8 +++
 .../libraries/science/math/mkl/default.nix    | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/mkl/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c4db280645a4..64d538df3c90 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -387,6 +387,14 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "ISC License";
   };
 
+  # Proprietary binaries; free to redistribute without modification.
+  issl = {
+    fullName = "Intel Simplified Software License";
+    url = https://software.intel.com/en-us/license/intel-simplified-software-license;
+    free = false;
+  };
+
+
   lgpl2 = spdx {
     spdxId = "LGPL-2.0";
     fullName = "GNU Library General Public License v2 only";
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
new file mode 100644
index 000000000000..7412ecdba21d
--- /dev/null
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -0,0 +1,55 @@
+{ stdenvNoCC, writeText, fetchurl, rpm, cpio, openmp }:
+
+stdenvNoCC.mkDerivation rec {
+  name = "mkl-${version}";
+  version = "${date}.${rel}";
+  date = "2019.0";
+  rel = "117";
+
+  src = fetchurl {
+    url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz";
+    sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf";
+  };
+
+  buildInputs = [ rpm cpio ];
+  propagatedBuildInputs = [ openmp ];
+
+  buildPhase = ''
+    rpm2cpio rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm | cpio -idmv
+    rpm2cpio rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm | cpio -idmv
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
+    cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
+    cp license.txt $out/lib/
+  '';
+
+  # Per license agreement, do not modify the binary
+  dontStrip = true;
+  dontPatchELF = true;
+
+  # Some mkl calls require openmp, but Intel does not add these to SO_NEEDED and
+  # instructs users to put openmp on their LD_LIBRARY_PATH.
+  setupHook = writeText "setup-hook.sh" ''
+    addOpenmp() {
+        addToSearchPath LD_LIBRARY_PATH ${openmp}/lib
+    }
+    addEnvHooks "$targetOffset" addOpenmp
+  '';
+
+  meta = with stdenvNoCC.lib; {
+    description = "Intel Math Kernel Library";
+    longDescription = ''
+      Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
+      for future generations of Intel processors. It is compatible with your
+      choice of compilers, languages, operating systems, and linking and
+      threading models.
+    '';
+    homepage = https://software.intel.com/en-us/mkl;
+    license = licenses.issl;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ maintainers.bhipple ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18ad8892e55f..f9eb92364af2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20858,6 +20858,10 @@ with pkgs;
 
   m4rie = callPackage ../development/libraries/science/math/m4rie { };
 
+  mkl = callPackage ../development/libraries/science/math/mkl {
+    inherit (llvmPackages) openmp;
+  };
+
   nasc = callPackage ../applications/science/math/nasc { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };

From 6e6e0a987bde5bdc0c7aa653b7446937135a53fc Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 22 Sep 2018 21:31:46 +0200
Subject: [PATCH 1517/3253] nixos/tests/codimd: fix non-deterministic failure
 (#47179)

Test failed non-deterministically due to an obvious copy/paste error.
Fix it and increase wait time to 10s (2s may not be enough on Hydra).
---
 nixos/tests/codimd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix
index 8f98d9f3fa72..9dedac96844a 100644
--- a/nixos/tests/codimd.nix
+++ b/nixos/tests/codimd.nix
@@ -40,7 +40,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
     subtest "CodiMD sqlite", sub {
       $codimdSqlite->waitForUnit("codimd.service");
       $codimdSqlite->waitForOpenPort(3000);
-      $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
+      $codimdSqlite->sleep(10); # avoid 503 during startup
       $codimdSqlite->succeed("curl -sSf http://localhost:3000/new");
     };
 
@@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
       $codimdPostgres->waitForUnit("codimd.service");
       $codimdPostgres->waitForOpenPort(5432);
       $codimdPostgres->waitForOpenPort(3000);
-      $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup
+      $codimdPostgres->sleep(10); # avoid 503 during startup
       $codimdPostgres->succeed("curl -sSf http://localhost:3000/new");
     };
   '';

From a8413d816aadfa7b376dabc84777a21eca3dd210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 22 Sep 2018 21:27:35 +0100
Subject: [PATCH 1518/3253] luaPackages.luadbi: 0.5 -> 0.6 (#47156)

Switch to maintained fork that is compatible with lua5.2/lua5.3.
This package was tested with prosody.
---
 pkgs/top-level/lua-packages.nix | 37 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 7933ca46b98a..8d141d7e7c64 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -380,35 +380,36 @@ let
 
   luadbi = buildLuaPackage rec {
     name = "luadbi-${version}";
-    version = "0.5";
-    src = fetchurl {
-      url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.${version}.tar.gz";
-      sha256 = "07ikxgxgfpimnwf7zrqwcwma83ss3wm2nzjxpwv2a1c0vmc684a9";
+    version = "0.6";
+
+    src = fetchFromGitHub {
+      owner = "mwild1";
+      repo = "luadbi";
+      rev = "v${version}";
+      sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah";
     };
-    sourceRoot = ".";
 
-    buildInputs = [ mysql.connector-c postgresql sqlite ];
+    MYSQL_INC="-I${mysql.connector-c}/include/mysql";
 
-    preConfigure = ''
-      substituteInPlace Makefile --replace CC=gcc CC=cc
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    buildInputs = [ mysql postgresql sqlite ];
+
+    preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace Makefile \
         --replace '-shared' '-bundle -undefined dynamic_lookup -all_load'
     '';
 
-    NIX_CFLAGS_COMPILE = [
-      "-I${mysql.connector-c}/include/mysql"
-      "-L${mysql.connector-c}/lib/mysql"
-      "-I${postgresql}/include/server"
+    installFlags = [
+      "LUA_CDIR=$(out)/lib/lua/${lua.luaversion}"
+      "LUA_LDIR=$(out)/share/lua/${lua.luaversion}"
     ];
 
-    installPhase = ''
-      mkdir -p $out/lib/lua/${lua.luaversion}
-      install -p DBI.lua *.so $out/lib/lua/${lua.luaversion}
-    '';
+    installTargets = [
+      "install_lua" "install_mysql" "install_psql" "install_sqlite3"
+    ];
 
     meta = with stdenv.lib; {
-      homepage = "https://code.google.com/archive/p/luadbi/";
+      homepage = https://github.com/mwild1/luadbi;
+      license = licenses.mit;
       platforms = stdenv.lib.platforms.unix;
     };
   };

From da18ffac6bf62e592a91babb50e7ad960984ba5f Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sat, 22 Sep 2018 13:38:44 -0700
Subject: [PATCH 1519/3253] xsecurelock: 1.0 -> 1.1

---
 pkgs/tools/X11/xsecurelock/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index c252894dbfec..4ee51100b339 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -1,21 +1,21 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
-, libX11, libXcomposite, libXft, pam, apacheHttpd, imagemagick
+, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick
 , pamtester, xscreensaver }:
 
 stdenv.mkDerivation rec {
   name = "xsecurelock-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "xsecurelock";
     rev = "v${version}";
-    sha256 = "0k135hnfnn1j82wvc03b8jkq06wws1xk325x5m25ps6xwsn725sw";
+    sha256 = "0yqp5xhkl9jpjyrmrxbyp7azwxmqc3lxv5lxrjqjaapl3q3096g5";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    libX11 libXcomposite libXft pam
+    libX11 libXcomposite libXft libXmu pam
     apacheHttpd imagemagick pamtester
   ];
 

From 52a1179b6c20e923beddde1dd1e0034aa19176d2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 22 Sep 2018 23:13:10 +0200
Subject: [PATCH 1520/3253] ffmpeg: don't use gcc on darwin (#47189)

This isn't necessary and causes build failures for certain versions.

    CC      libavfilter/libmpcodecs/vf_eq2.o
    CC      libavfilter/libmpcodecs/vf_fil.o
    CC      libavfilter/libmpcodecs/vf_fspp.o
    libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression
            movq %mm2, 0*8+(%rsp)

/cc ZHF #45961
---
 pkgs/top-level/all-packages.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18ad8892e55f..fd91049b52f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9333,23 +9333,18 @@ with pkgs;
 
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
-    stdenv = gccStdenv;
   };
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
-    stdenv = gccStdenv;
   };
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
-    stdenv = gccStdenv;
   };
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
-    stdenv = gccStdenv;
   };
   ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
-    stdenv = gccStdenv;
   };
 
   # Aliases

From f777d2b719be0db4cb7819d5b6dbdd121db29a37 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 22 Sep 2018 23:28:02 +0200
Subject: [PATCH 1521/3253] virtualization/qemu-vm: fix and improve virtio/scsi
 switching

---
 nixos/modules/virtualisation/qemu-vm.nix | 44 ++++++++++++++----------
 pkgs/build-support/vm/default.nix        | 16 +++++++--
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 4e9c87222d0a..eec1a85162b5 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -32,15 +32,21 @@ let
   # expressions and shell script stuff.
   mkDiskIfaceDriveFlag = idx: driveArgs: let
     inherit (cfg.qemu) diskInterface;
+    isSCSI = diskInterface == "scsi";
     # The drive identifier created by incrementing the index by one using the
     # shell.
     drvId = "drive$((${idx} + 1))";
+    dvcId = "${diskInterface}$((${idx} + 1))";
     # NOTE: DO NOT shell escape, because this may contain shell variables.
-    commonArgs = "index=${idx},id=${drvId},${driveArgs}";
-    isSCSI = diskInterface == "scsi";
-    devArgs = "${diskInterface}-hd,drive=${drvId}";
-    args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}";
-  in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}";
+    commonDriveArgs = "media=disk,id=${drvId},${driveArgs}";
+    commonInterfaceArgs = "drive=${drvId},id=${dvcId},bootindex=${idx}";
+  in lib.concatStrings [
+    "-drive ${commonDriveArgs},if=none "
+    ''${if isSCSI then
+        "-device lsi53c895a -device ${diskInterface}-hd,${commonInterfaceArgs}"
+      else
+        "-device virtio-blk-pci,scsi=off,${commonInterfaceArgs}"} ''
+  ];
 
   # Shell script to start the VM.
   startVM =
@@ -97,15 +103,15 @@ let
           -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
           -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
+          ${mkDiskIfaceDriveFlag "1" "file=$NIX_DISK_IMAGE,media=disk,cache=writeback,werror=report"} \
           ${if cfg.useBootLoader then ''
-            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
-            ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \
+            -boot menu=on \
+            ${mkDiskIfaceDriveFlag "0" "file=$TMPDIR/disk.img,media=disk"} \
             ${if cfg.useEFIBoot then ''
               -pflash $TMPDIR/bios.bin \
             '' else ''
-            ''}
-          '' else ''
-            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
+            \''}
+          '' else '' \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \
@@ -141,8 +147,9 @@ let
             '';
           buildInputs = [ pkgs.utillinux ];
           QEMU_OPTS = if cfg.useEFIBoot
-                      then "-pflash $out/bios.bin -nographic -serial pty"
-                      else "-nographic -serial pty";
+                      then "-pflash $out/bios.bin -nographic"
+                      else "-nographic";
+          diskInterface = cfg.qemu.diskInterface;
         }
         ''
           # Create a /boot EFI partition with 40M and arbitrary but fixed GUIDs for reproducibility
@@ -155,10 +162,10 @@ let
             --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \
             --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \
             --hybrid 2 \
-            --recompute-chs /dev/vda
-          ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2
+            --recompute-chs ${config.virtualisation.bootDevice}
+          ${pkgs.dosfstools}/bin/mkfs.fat -F16 ${config.virtualisation.bootDevice}2
           export MTOOLS_SKIP_CHECK=1
-          ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
+          ${pkgs.mtools}/bin/mlabel -i ${config.virtualisation.bootDevice}2 ::boot
 
           # Mount /boot; load necessary modules first.
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true
@@ -167,11 +174,11 @@ let
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true
           mkdir /boot
-          mount /dev/vda2 /boot
+          mount ${config.virtualisation.bootDevice}2 /boot
 
           # This is needed for GRUB 0.97, which doesn't know about virtio devices.
           mkdir /boot/grub
-          echo '(hd0) /dev/vda' > /boot/grub/device.map
+          echo '(hd0) ${config.virtualisation.bootDevice}' > /boot/grub/device.map
 
           # Install GRUB and generate the GRUB boot menu.
           touch /etc/NIXOS
@@ -464,7 +471,8 @@ in
 
     boot.initrd.availableKernelModules =
       optional cfg.writableStore "overlay"
-      ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
+      ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
+      ++ optional (cfg.qemu.diskInterface == "scsi") "virtio_scsi";
 
     virtualisation.bootDevice =
       mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda");
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 03b3fb1f9f27..6e98099460f8 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -3,8 +3,9 @@
 , img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
 , storeDir ? builtins.storeDir
 , rootModules ?
-    [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
+    [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" "sym53c8xx" "virtio_scsi" "ahci "]
       ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
+, config
 }:
 
 with pkgs;
@@ -196,9 +197,17 @@ rec {
     ${qemuBinary qemu} \
       -nographic -no-reboot \
       -device virtio-rng-pci \
+      ${if "$diskInterface" == "scsi" then '' \
+        \ # FIXME: /dev/sda is not created within the VM
+        -device lsi53c895a \
+        -device scsi-hd,drive=hd,id=scsi1,bootindex=1 \
+        ''${diskImage:+-drive file=$diskImage,media=disk,if=none,id=hd,cache=unsafe,werror=report} \
+      '' else '' \
+        -drive file=$diskImage,media=disk,if=none,id=hd \
+        -device virtio-blk-pci,scsi=off,drive=hd,id=virtio0,bootindex=1 \
+      \''}
       -virtfs local,path=${storeDir},security_model=none,mount_tag=store \
       -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
-      ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
       -kernel ${kernel}/${img} \
       -initrd ${initrd}/initrd \
       -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
@@ -298,12 +307,13 @@ rec {
      `run-vm' will be left behind in the temporary build directory
      that allows you to boot into the VM and debug it interactively. */
 
-  runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: {
+  runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ...  } @ moreArgs : {
     requiredSystemFeatures = [ "kvm" ];
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = args;
     origBuilder = builder;
+    diskInterface = "${moreArgs.diskInterface}";
     QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
     passAsFile = []; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742
   });

From 845ae983f6033338d89927d65fbfd7f28d91b16e Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 23 Sep 2018 00:15:28 +0200
Subject: [PATCH 1522/3253] nixos/iso-image: fix 32bit UEFI boot

UEFI iso image for i686 didn't boot because the
default boot file was incorrectly named bootx32.efi.
The correct name is bootia32.efi.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 98712f0759a9..96fdb997b2c0 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -233,7 +233,7 @@ let
             "
     # Make our own efi program, we can't rely on "grub-install" since it seems to
     # probe for devices, even with --skip-fs-probe.
-    ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
+    ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
       $MODULES
     cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
 

From c20caa6a6f63f8805cac04fb0ec1db7e645780a4 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 22 Sep 2018 17:31:07 -0500
Subject: [PATCH 1523/3253] gnomecast: 1.4.0 -> 1.4.1 (#47191)

---
 pkgs/applications/video/gnomecast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix
index a2faaf39f082..74ae6faec902 100644
--- a/pkgs/applications/video/gnomecast/default.nix
+++ b/pkgs/applications/video/gnomecast/default.nix
@@ -3,11 +3,11 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "gnomecast";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk";
+    sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From bd13ef5944a01f02006bcd4caafaaeba6a52d323 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sat, 22 Sep 2018 18:22:07 -0500
Subject: [PATCH 1524/3253] Introduce desync, an alternate implementation of
 casync (#47195)

desync isn't as feature-rich as casync, but has a focus on production usability
and implementation quality which may make it a more appropriate tool.
---
 maintainers/maintainer-list.nix               |   5 +
 .../networking/sync/desync/default.nix        |  27 ++++
 .../networking/sync/desync/deps.nix           | 129 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 163 insertions(+)
 create mode 100644 pkgs/applications/networking/sync/desync/default.nix
 create mode 100644 pkgs/applications/networking/sync/desync/deps.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 216d6dac74ea..c3b327893826 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -678,6 +678,11 @@
     github = "Chaddai";
     name = "Chaddaï Fouché";
   };
+  chaduffy = {
+    email = "charles@dyfis.net";
+    github = "charles-dyfis-net";
+    name = "Charles Duffy";
+  };
   changlinli = {
     email = "mail@changlinli.com";
     github = "changlinli";
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix
new file mode 100644
index 000000000000..e8cca04203b1
--- /dev/null
+++ b/pkgs/applications/networking/sync/desync/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "desync-${version}";
+  version = "0.3.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/folbricht/desync";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "folbricht";
+    repo = "desync";
+    sha256 = "1h2i6ai7q1mg2ysd3cnas96rb8g0bpp1v3hh7ip9nrfxhlplyyda";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Content-addressed binary distribution system";
+    longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness";
+    homepage = https://github.com/folbricht/desync;
+    license = licenses.bsd3;
+    platforms = platforms.unix; # windows temporarily broken in 0.3.0 release
+    maintainers = [ maintainers.chaduffy ];
+  };
+}
diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/pkgs/applications/networking/sync/desync/deps.nix
new file mode 100644
index 000000000000..2342fb76f0c9
--- /dev/null
+++ b/pkgs/applications/networking/sync/desync/deps.nix
@@ -0,0 +1,129 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/datadog/zstd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/datadog/zstd";
+      rev = "940731c8fc259059120b0e617a69d54dcd7c3eee";
+      sha256 = "04nmljnk54xm2k4ydhdiidazk3765jk8h4hvcsymkrsggrfyrjfx";
+    };
+  }
+  {
+    goPackagePath = "github.com/dchest/siphash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dchest/siphash";
+      rev = "34f201214d993633bb24f418ba11736ab8b55aa7";
+      sha256 = "08s076y7vmjqnq7jz0762hkm896r6r31v8b31a3gy0n8rfa01k8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/folbricht/tempfile";
+    fetch = {
+      type = "git";
+      url = "https://github.com/folbricht/tempfile";
+      rev = "ee190cb5934293f187a9d43ee34de7d5cf9ceb83";
+      sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ini/ini";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev = "fa25069db393aecc09b71267d0489b357781c860";
+      sha256 = "0fs1c48hni5gc1fyz65d138jpmqm1sqpb7vw5vhx0j6lmj1nf45z";
+    };
+  }
+  {
+    goPackagePath = "github.com/hanwen/go-fuse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hanwen/go-fuse";
+      rev = "1d35017e97018335f348413b3aeed67468d80f7b";
+      sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/fs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/fs";
+      rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba";
+      sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q";
+    };
+  }
+  {
+    goPackagePath = "github.com/minio/minio-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/minio/minio-go";
+      rev = "f01ef22c977052d716c74724874f932a16f047bb";
+      sha256 = "0pn1likcwnzb2j4hi4r1ib3xlp31h2vgwyc7xnm1iv7f8l4gk2hc";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
+      sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "c059e472caf75dbe73903f6521a20abac245b17f";
+      sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/sftp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/sftp";
+      rev = "08de04f133f27844173471167014e1a753655ac8";
+      sha256 = "090q4xmjbllwl3rpj1hzp0iw3qw1yvp6r3kf5cgw44ai57z96271";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "0e37d006457bf46f9e6692014ba72ef82c33022c";
+      sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908";
+      sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "d47a0f3392421c5624713c9a19fe781f651f8a50";
+      sha256 = "01dqcv7vnynwhlmb28fn50svjb9kfj04nk7frvf7mh4jd3qnrsnv";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "905a57155faa8230500121607930ebb9dd8e139c";
+      sha256 = "1qlvvb44j9ss3mkb5035i20xsd6sm0n05sqpqbi8gjw64g086zcb";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd91049b52f8..6478ccb7741d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1184,6 +1184,8 @@ with pkgs;
 
   deja-dup = callPackage ../applications/backup/deja-dup { };
 
+  desync = callPackage ../applications/networking/sync/desync { };
+
   devmem2 = callPackage ../os-specific/linux/devmem2 { };
 
   dbus-broker = callPackage ../os-specific/linux/dbus-broker { };

From 94bec239d56a0184629ce0cb95e4f6efcc835772 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 22 Sep 2018 23:33:16 -0500
Subject: [PATCH 1525/3253] nixos: make firefox default browser

Without this the graphical installer has no way to open the manual.
You can fix it yourself by installing any HTML browser but this might
be unfamiliar to users new to NixOS and without any other way to open
the manual. The downside is it will also increase download sizes.

Fixes #46537
---
 nixos/modules/profiles/graphical.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 332cf58aa538..1a8372ddc43c 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -11,5 +11,5 @@
     libinput.enable = true; # for touchpad support on many laptops
   };
 
-  environment.systemPackages = [ pkgs.glxinfo ];
+  environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
 }

From 67c8c4917799496dcf2ad6a500441fbbaeb918c9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Sep 2018 00:14:27 -0500
Subject: [PATCH 1526/3253] nixos: set nixos in nixPath

This makes using the nixos channel work out of the box with the new
Nix commands. For example:

$ nix run nixos.firefox -c firefox

Fixes #46536
---
 nixos/modules/services/misc/nix-daemon.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index c0eb882c58f3..2d14e27ffc3d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -347,6 +347,7 @@ in
           [
             "$HOME/.nix-defexpr/channels"
             "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
+            "nixos=/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];

From 6910a9d1e23887bb4600ddaf645770e8b93a7e2f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Sep 2018 00:28:23 -0500
Subject: [PATCH 1527/3253] perl: disallow reference to cc

Fixes #46077
---
 pkgs/development/interpreters/perl/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index ec4f971eeeff..e4eca36b266b 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -37,6 +37,8 @@ let
       stdenv.lib.optional crossCompiling "dev";
     setOutputFlags = false;
 
+    disallowedReferences = [ stdenv.cc ];
+
     patches =
       [ ]
       # Do not look in /usr etc. for dependencies.
@@ -118,6 +120,7 @@ let
           --replace "${
               if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
             }" /no-such-path \
+          --replace "${stdenv.cc}" /no-such-path \
           --replace "$man" /no-such-path
       '' + stdenv.lib.optionalString crossCompiling
       ''

From 81caec3568d96edc0a52762705dc0e2dae7e7c8b Mon Sep 17 00:00:00 2001
From: Dmitry Vyal <dmitryvyal@gmail.com>
Date: Sun, 2 Sep 2018 11:18:35 +0300
Subject: [PATCH 1528/3253] openblas-0.3.1 -> 0.3.3

---
 .../science/math/openblas/default.nix         | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 2efabcdd05e0..453ad884b423 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -79,12 +79,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "openblas-${version}";
-  version = "0.3.1";
+  version = "0.3.3";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
+    sha256 = "0cpkvfvc14xm9mifrm919rp8vrq70gpl7r2sww4f0izrl39wklwx";
   };
 
   inherit blas64;
@@ -118,20 +118,7 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
     ++ mapAttrsToList (var: val: var + "=" + val) config;
 
-    patches = [
-      # Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
-      # is causing problems and was already accepted upstream.
-      (fetchpatch {
-        url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
-        sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
-      })
-      # Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
-      # https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
-      (fetchpatch {
-        url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
-        sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
-      })
-    ];
+    patches = [];
 
   doCheck = true;
   checkTarget = "tests";

From f7f8b60acec7f384de97e0d447bb13c546bfce97 Mon Sep 17 00:00:00 2001
From: Dmitry Vyal <dmitryvyal@gmail.com>
Date: Wed, 12 Sep 2018 10:22:52 +0300
Subject: [PATCH 1529/3253] pytorch-0.4 rpath fix, some tests reenabled

---
 .../python-modules/pytorch/default.nix         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index d31719efa172..7d56f1990a52 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -42,6 +42,22 @@ in buildPythonPackage rec {
     export CUDNN_INCLUDE_DIR=${cudnn}/include
   '';
 
+  preFixup = ''
+    function join_by { local IFS="$1"; shift; echo "$*"; }
+    function strip2 {
+      IFS=':'
+      read -ra RP <<< $(patchelf --print-rpath $1)
+      IFS=' '
+      RP_NEW=$(join_by : ''${RP[@]:2})
+      patchelf --set-rpath \$ORIGIN:''${RP_NEW} "$1"
+    }
+
+    for f in $(find ''${out} -name 'libcaffe2*.so')
+    do
+      strip2 $f
+    done
+  '';
+
   buildInputs = [
      cmake
      numpy.blas
@@ -56,7 +72,7 @@ in buildPythonPackage rec {
   ] ++ lib.optional (pythonOlder "3.5") typing;
 
   checkPhase = ''
-    ${cudaStubEnv}python test/run_test.py --exclude distributed autograd distributions jit sparse torch utils nn
+    ${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils
   '';
 
   meta = {

From e141f7cd2fdd4d81dd4fd6717c9a0172f20c2c2b Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 23 Sep 2018 01:02:51 -0700
Subject: [PATCH 1530/3253] pythonPackages.flask_assets: fix tests (#47203)

---
 pkgs/development/python-modules/flask-assets/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix
index 7f3b6367b6ee..a8e454f4a2cc 100644
--- a/pkgs/development/python-modules/flask-assets/default.nix
+++ b/pkgs/development/python-modules/flask-assets/default.nix
@@ -9,6 +9,10 @@ buildPythonPackage rec {
     sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0";
   };
 
+  patchPhase = ''
+    substituteInPlace tests/test_integration.py --replace 'static_path=' 'static_url_path='
+  '';
+
   propagatedBuildInputs = [ flask webassets flask_script nose ];
 
   meta = with lib; {

From 3f883b443cfcbaede0cc8b8171c14178496ea003 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Sun, 23 Sep 2018 10:08:50 +0200
Subject: [PATCH 1531/3253] gnuradio-limesdr: init at 1.0.0-RC (#47176)

---
 pkgs/applications/misc/gnuradio/limesdr.nix | 38 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/gnuradio/limesdr.nix

diff --git a/pkgs/applications/misc/gnuradio/limesdr.nix b/pkgs/applications/misc/gnuradio/limesdr.nix
new file mode 100644
index 000000000000..535dbfa3c53d
--- /dev/null
+++ b/pkgs/applications/misc/gnuradio/limesdr.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, boost, gnuradio
+, pythonSupport ? true, python, swig, limesuite
+} :
+
+assert pythonSupport -> python != null && swig != null;
+
+let
+  version = "1.0.0-RC";
+
+in stdenv.mkDerivation rec {
+  name = "gnuradio-limesdr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "myriadrf";
+    repo = "gr-limesdr";
+    rev = "v${version}";
+    sha256 = "0b34mg9nfar2gcir98004ixrxmxi8p3p2hrvvi1razd869x2a0lf";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ] ++ stdenv.lib.optionals pythonSupport [ swig ];
+
+  buildInputs = [
+    boost gnuradio limesuite
+  ] ++ stdenv.lib.optionals pythonSupport [ python ];
+
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Gnuradio source and sink blocks for LimeSDR";
+    homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio;
+    license = licenses.mit;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.markuskowa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e9b5aa8b49c..ae19c6d650de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16405,7 +16405,7 @@ with pkgs;
 
   gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
     inherit (python2Packages) python;
-    extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ];
+    extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds gnuradio-limesdr ];
   };
 
   gnuradio-nacl = callPackage ../applications/misc/gnuradio/nacl.nix { };
@@ -16414,6 +16414,8 @@ with pkgs;
 
   gnuradio-ais = callPackage ../applications/misc/gnuradio/ais.nix { };
 
+  gnuradio-limesdr = callPackage ../applications/misc/gnuradio/limesdr.nix { };
+
   gnuradio-rds = callPackage ../applications/misc/gnuradio/rds.nix { };
 
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio/osmosdr.nix { };

From ef2b217812c4df77619a6f0fcb635dfcc5e2b64a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 23 Sep 2018 04:14:48 -0400
Subject: [PATCH 1532/3253] qesteidutil: Fixes build from Qt upgrade. (#46083)

---
 pkgs/tools/security/qesteidutil/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/qesteidutil/default.nix b/pkgs/tools/security/qesteidutil/default.nix
index 016017205ab4..20135895d766 100644
--- a/pkgs/tools/security/qesteidutil/default.nix
+++ b/pkgs/tools/security/qesteidutil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
 , cmake, ccid, qttools, qttranslations
 , pkgconfig, pcsclite, hicolor-icon-theme 
 }:
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/open-eid/qesteidutil/commit/868e8245f2481e29e1154e168ac92d32e93a5425.patch;
+      sha256 = "0pwrkd8inf0qaf7lcchmj558k6z34ah672zcb722aa5ybbif0lkn";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake ccid qttools pcsclite qttranslations
                   hicolor-icon-theme

From 589b290b433a22d097a6dd9fae6cd03c2f15fdc2 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 23 Sep 2018 10:46:22 +0200
Subject: [PATCH 1533/3253] nixos/tests/prosody: use sqlite database (#47185)

The test didn't catch an issue with luadbi because it used
internal storage only. Switch to sqlite to test sql access.
---
 nixos/tests/prosody.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix
index 5d33aaf8d65d..61ae5bb38ed9 100644
--- a/nixos/tests/prosody.nix
+++ b/nixos/tests/prosody.nix
@@ -6,6 +6,9 @@ import ./make-test.nix {
       enable = true;
       # TODO: use a self-signed certificate
       c2sRequireEncryption = false;
+      extraConfig = ''
+        storage = "sql"
+      '';
     };
     environment.systemPackages = let
       sendMessage = pkgs.writeScriptBin "send-message" ''

From c987ed0896fb240d380dfa0143f513349aa31a3e Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 23 Sep 2018 02:01:57 -0700
Subject: [PATCH 1534/3253] erlangR18: apply upstream patches to fix
 nondeterministic build failures (#47202)

As per the following bug report, sometimes erts/start_scripts will fail
to compile because of a Makefile ordering issue. Apply the upstream
patches to fix this.
  https://bugs.erlang.org/browse/ERL-241
---
 pkgs/development/interpreters/erlang/R18.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index ee524feb4c6c..58b7fd71f0be 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -11,6 +11,16 @@ let
      sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
   };
 
+  makeOrderingPatch = fetchpatch {
+     url = "https://github.com/erlang/otp/commit/2f1a37f1011ff9d129bc35a6efa0ab937a2aa0e9.patch";
+     sha256 = "0xfa6hzxh9d7qllkyidcgh57xrrx11w65y7s1hyg52alm06l6b9n";
+  };
+
+  makeParallelInstallPatch = fetchpatch {
+     url ="https://github.com/erlang/otp/commit/de8fe86f67591dd992bae33f7451523dab36e5bd.patch";
+     sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c";
+  };
+
 in mkDerivation rec {
   version = "18.3.4.8";
   sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
@@ -18,5 +28,7 @@ in mkDerivation rec {
   patches = [
     rmAndPwdPatch
     envAndCpPatch
+    makeOrderingPatch
+    makeParallelInstallPatch
   ];
 }

From 91d9e1eb22c7ab6cb8649400e785b10445995efc Mon Sep 17 00:00:00 2001
From: Jos van Bakel <josvanbakel@protonmail.com>
Date: Sun, 23 Sep 2018 12:00:52 +0200
Subject: [PATCH 1535/3253] influxdb: 1.4.1 -> 1.6.3 (#47186)

---
 pkgs/servers/nosql/influxdb/default.nix    |   6 +-
 pkgs/servers/nosql/influxdb/deps-1.6.3.nix | 444 +++++++++++++++++++++
 2 files changed, 447 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/servers/nosql/influxdb/deps-1.6.3.nix

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index e73233bd1447..a47553b975e3 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "influxdb-${version}";
-  version = "1.4.1";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "influxdb";
     rev = "v${version}";
-    sha256 = "048ap70hdfkxhy0y8q1jsb0lql1i99jnf3cqaqar6qs2ynzsw9hd";
+    sha256 = "0xf16liapllk8qnw0vsy1ja4if1xlazwwaa4p0r5j7bny5lxm7zy";
   };
 
   buildFlagsArray = [ ''-ldflags=
@@ -19,7 +19,7 @@ buildGoPackage rec {
 
   excludedPackages = "test";
 
-  # Generated with the nix2go
+  # Generated with dep2nix (for 1.6.3) / nix2go (for 1.4.1).
   goDeps = ./. + "/deps-${version}.nix";
 
   meta = with lib; {
diff --git a/pkgs/servers/nosql/influxdb/deps-1.6.3.nix b/pkgs/servers/nosql/influxdb/deps-1.6.3.nix
new file mode 100644
index 000000000000..a2f4dfaeb8d6
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/deps-1.6.3.nix
@@ -0,0 +1,444 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "collectd.org";
+    fetch = {
+      type = "git";
+      url = "https://github.com/collectd/go-collectd";
+      rev =  "2ce144541b8903101fb8f1483cc0497a68798122";
+      sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev =  "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+      sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/RoaringBitmap/roaring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/RoaringBitmap/roaring";
+      rev =  "d6540aab65a17321470b1661bfc52da1823871e9";
+      sha256 = "1lsrz7j55blalpp95vgz214b35sjf8nfmrw3fxybdl4xipk2ssdj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev =  "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/bmizerany/pat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bmizerany/pat";
+      rev =  "6226ea591a40176dd3ff9cd8eff81ed6ca721a00";
+      sha256 = "0qjkm7169y6pybwh0s02fjjk251isa2b367xqfzrwvl6cy4yzfxp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/boltdb/bolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boltdb/bolt";
+      rev =  "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
+      sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cespare/xxhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cespare/xxhash";
+      rev =  "5c37fe3735342a2e0d01c87a907579987c8936cc";
+      sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgryski/go-bitstream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-bitstream";
+      rev =  "9f22ccc24718d9643ac427c8c897ae1a01575783";
+      sha256 = "0x3hbsrn7qafhhjz6lgyc1pd1p5kgkrkbccvsr6yygkl785h5lhn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/glycerine/go-unsnap-stream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/go-unsnap-stream";
+      rev =  "62a9a9eb44fd8932157b1a8ace2149eff5971af6";
+      sha256 = "1ray7p4q3vv5zn9w5xs7m9kjh68b2ck98nh25mxhfiwl9jxkabrc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "1adfc126b41513cc696b209667c8656ea7aac67c";
+      sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "925541529c1fa6821df4e44ce2723319eb2be768";
+      sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/snappy";
+      rev =  "d9eb7a3d35ec988b8585d4a0068e462c27d28380";
+      sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev =  "3af367b6b30c263d47e8895973edcca9a49cf029";
+      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+    };
+  }
+  {
+    goPackagePath  = "github.com/influxdata/influxql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/influxql";
+      rev =  "a7267bff5327e316e54c54342b0bc9598753e3d5";
+      sha256 = "0mqc9xki5l9yfbb0dqjb417cmv3pca1bj71m90dkshladr2wlcg3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/influxdata/usage-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/usage-client";
+      rev =  "6d3895376368aa52a3a81d2a16e90f0f52371967";
+      sha256 = "0a5adnid42f9vpckgcpkj7v60fh147j7zlg1rhxcpq5vkw698ifl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/influxdata/yamux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/yamux";
+      rev =  "1f58ded512de5feabbe30b60c7d33a7a896c5f16";
+      sha256 = "08y1lgcyyaa8zrg24ck64b5dfassgb2pp1fb9x5lw9q16fb170bx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/influxdata/yarpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/yarpc";
+      rev =  "f0da2db138cad2fb425541938fc28dd5a5bc6918";
+      sha256 = "1g71flc8s8xas7vmaiwv0425paii1akc7jsdqsgxkhyfxx2gvib0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jsternberg/zap-logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jsternberg/zap-logfmt";
+      rev =  "ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6";
+      sha256 = "0pqp2nsqvsq8kqc7l14340lrvl03715s12bag63kdbi25s8fcdkx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jwilder/encoding";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jwilder/encoding";
+      rev =  "b4e1701a28efcc637d9afcca7d38e495fe909a09";
+      sha256 = "195js5njz86k096p3ggglgpc7rw3801mpqzdfwfr3miflhnp7nwg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/klauspost/compress";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/compress";
+      rev =  "6c8db69c4b49dd4df1fff66996cf556176d0b9bf";
+      sha256 = "00h2lpqcyc3pg2xk3q4a9cgyv0vkn15bx0hb725j5zbkr9vah23x";
+    };
+  }
+  {
+    goPackagePath  = "github.com/klauspost/cpuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/cpuid";
+      rev =  "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da";
+      sha256 = "178apw89g8nsd7w6mbdylxn956h3iig6rbw3bkivp6lplhb5dvq4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/klauspost/crc32";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/crc32";
+      rev =  "cb6bfca970f6908083f26f39a79009d608efd5cd";
+      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/klauspost/pgzip";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/pgzip";
+      rev =  "0bf5dcad4ada2814c3c00f996a982270bb81a506";
+      sha256 = "0dgp2iljvhibzxia1g3lsfg4bjmfh4kf0bfrmfi7sd49hwhrvk7s";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev =  "3247c84500bff8d9fb6d579d800f20b3e091582c";
+      sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mschoch/smat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mschoch/smat";
+      rev =  "90eadee771aeab36e8bf796039b8c261bebebe4f";
+      sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opentracing/opentracing-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev =  "328fceb7548c744337cd010914152b74eaf4c4ab";
+      sha256 = "1w6s42n9glqwif6awyiapr7sh1wjvkxan41qhc1yi555byyw200k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/paulbellamy/ratecounter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/paulbellamy/ratecounter";
+      rev =  "524851a93235ac051e3540563ed7909357fe24ab";
+      sha256 = "0z4c61ac6v8mpnr9z37d91h1cf8v9psja5jfdxmsf69r1b7qr4f9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterh/liner";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterh/liner";
+      rev =  "6106ee4fe3e8435f18cd10e34557e5e50f0e792a";
+      sha256 = "178s1amw5r60lywgmh24pd2ljim0b05fdfsm4c8px22fkycmn1qr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev =  "661e31bf844dfca9aeba15f27ea8aa0d485ad212";
+      sha256 = "0r9sr3m57ks7rc5bbghl0gy9wxlznzmz331xdp42zlgk6g774xcn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev =  "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev =  "e4aa40a9169a88835b849a6efb71e05dc04b88f0";
+      sha256 = "0m1n616d694jca0qjwjn5ci7scfgm2jpi94dhi356arm9lhda4jc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev =  "54d17b57dd7d4a3aa092476596b3f8a933bde349";
+      sha256 = "1b5218hi6k9i637k6xc7ynpll577zbnrhjm9jr2iczy3j0rr4rvr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/retailnext/hllpp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/retailnext/hllpp";
+      rev =  "101a6d2f8b52abfc409ac188958e7e7be0116331";
+      sha256 = "1dyyjyrscd3d22jhh2pbn67c6nzva0v069215sjjmj313k1xzmj3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev =  "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
+      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/willf/bitset";
+    fetch = {
+      type = "git";
+      url = "https://github.com/willf/bitset";
+      rev =  "d860f346b89450988a379d7d705e83c58d1ea227";
+      sha256 = "18419ip5mnblnyx2rjixad90dhjb1x2kaiidr7zk9b3qci799rh0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/xlab/treeprint";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xlab/treeprint";
+      rev =  "f3a15cfd24bf976c724324cb6846a8b54b88b639";
+      sha256 = "0fgbdyk2mfj5vh8902sga33w5gw7q0f1if4nqx631ca33fd6pfbn";
+    };
+  }
+  {
+    goPackagePath  = "go.uber.org/atomic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/atomic";
+      rev =  "8474b86a5a6f79c443ce4b2992817ff32cf208b8";
+      sha256 = "166shnjw8rvjvksymi2gqw1ygsbxlq15xb10j2dx5rwy4y4asq8x";
+    };
+  }
+  {
+    goPackagePath  = "go.uber.org/multierr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/multierr";
+      rev =  "3c4937480c32f4c13a875a1829af76c98ca3d40a";
+      sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w";
+    };
+  }
+  {
+    goPackagePath  = "go.uber.org/zap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/uber-go/zap";
+      rev =  "35aad584952c3e7020db7b839f6b102de6271f89";
+      sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "c3a3ad6d03f7a915c0f7e194b7152974bb73d287";
+      sha256 = "0x18275g5xlaw55bpx8hdna66d2hpbcw6hs0pxf1kmvfds6gzn6n";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "92b859f39abd2d91a854c9f9c4621b2f5054a92d";
+      sha256 = "1nzbay48k53pxa1sh102v571k6pa57540p0bzcil4qgan47yxba6";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev =  "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "d8e400bc7db4870d786864138af681469693d18c";
+      sha256 = "08d23f9gjarp63dw0wj54nlqh3x2lqnchzkw8n5d7ik3wy7qy4yf";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "26559e0f760e39c24d730d3224364aef164ee23f";
+      sha256 = "00fx6m59cjbi7y0ri4a57q1zs6r310xbg5yqns5kfm2cax0dkmnf";
+    };
+  }
+]
\ No newline at end of file

From f799dff21bd70738a0724419752dbb8d9ed3ce6b Mon Sep 17 00:00:00 2001
From: Boris <boris.ivan.babic@gmail.com>
Date: Sun, 23 Sep 2018 14:01:56 +0200
Subject: [PATCH 1536/3253] gitAndTools.pre-commit: 1.11.0 -> 1.11.1 (#47211)

---
 .../version-management/git-and-tools/pre-commit/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
index bc36a8879f4d..331b020d8ca7 100644
--- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, python3Packages }:
 with python3Packages; buildPythonApplication rec {
   pname = "pre_commit";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03nxkma8qp5j2bg6ailclnyqfhakp8r8d1mn6zcnjw0ac5r9imc8";
+    sha256 = "1kjrq8z78b6aqhyyw07dlwf6cqls88kik6f5l07hs71fj5ddvs9w";
   };
 
   propagatedBuildInputs = [

From 979089c1bc1571c5b2290b75533c4e4ef90d9cf8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Sep 2018 14:25:43 +0200
Subject: [PATCH 1537/3253] packagekit: Enable introspection

---
 pkgs/tools/package-management/packagekit/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 456469f150f7..2acb39c0b732 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   name = "packagekit-${version}";
   version = "1.1.10";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit";
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     (if enableSystemd then "--enable-systemd" else "--disable-systemd")
     "--disable-dummy"
     "--disable-cron"
-    "--disable-introspection"
+    "--enable-introspection"
     "--disable-offline-update"
     "--localstatedir=/var"
     "--sysconfdir=/etc"

From 3b7ecaa79865620db63284e7e5a1c02afb4066b5 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 23 Sep 2018 15:26:55 +0300
Subject: [PATCH 1538/3253] iwd: 0.7 -> 0.8

---
 nixos/modules/services/networking/iwd.nix | 2 ++
 pkgs/os-specific/linux/iwd/default.nix    | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index eb03d2e1d632..18ed20e28886 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -22,6 +22,8 @@ in {
 
     systemd.packages = [ pkgs.iwd ];
 
+    systemd.services.iwd.wantedBy = [ "multi-user.target" ];
+
     systemd.tmpfiles.rules = [
       "d /var/lib/iwd 0700 root root -"
     ];
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 79179f3fcbb8..1e3286f64d68 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.9";
-     sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p";
+     rev = "0.10";
+     sha256 = "1yzbx4l3a6hbdmirgbvnrjfiwflyzd38mbxnp23gn9hg3ni3br34";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab";
+    sha256 = "0bx31f77mz3rbl3xja48lb5zgwgialg7hvax889kpkz92wg26mgv";
   };
 
   nativeBuildInputs = [

From 155e017390b0d75991cf1697adff7a9b86adae00 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Sep 2018 08:03:06 +0100
Subject: [PATCH 1539/3253] xorg.libxcb: 1.12 -> 1.13

---
 pkgs/servers/x11/xorg/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c9e8dd04c470..561f8ba94d9f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1136,11 +1136,11 @@ let
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
-    name = "libxcb-1.12";
+    name = "libxcb-1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2;
-      sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2;
+      sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
@@ -1448,11 +1448,11 @@ let
   }) // {inherit ;};
 
   xcbproto = (mkDerivation "xcbproto" {
-    name = "xcb-proto-1.12";
+    name = "xcb-proto-1.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2;
-      sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2;
+      sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ python ];

From e5916b8b7f51d7a85601aaa73a69cf62b69903c1 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sun, 23 Sep 2018 16:06:51 +0300
Subject: [PATCH 1540/3253] bat: 0.7.0 -> 0.7.1 (#47216)

---
 pkgs/tools/misc/bat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index ec2062805ab1..0cacfa6e54e4 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "1dhn88asf08dvl4827v4mkxafcr01m1h5jmicvzda9ywmr82g1cs";
+    sha256 = "1fzk0z7r70rjvv2c6531zaa1jzbcb7j9wbi0xqb9y4dls538bmz0";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "10s8ig08prs1wcsisrllvsixqkrkwjx769y1w5fypldn9kfk2lka";
+  cargoSha256 = "19syz0sxcpk3i4675bfq5gpb9i6hp81in36w820kkvamaimq10nd";
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 

From baa04e4204b80225c5086611f305a0c412dc9967 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 23 Sep 2018 14:55:34 +0200
Subject: [PATCH 1541/3253] php: set mysql socket path if mysql[i] or pdo_mysql
 support is enabled

PHP tries to discover the mysql default socket path during configure
phase by probing the file system:
https://github.com/php/php-src/blob/cf3b852109a88a11370d0207cd3b72a53b6a64c3/ext/mysqli/config.m4#L4

This obviously fails to discover /run/mysqld/mysqld.sock, which is being
used (hardcoded) across all MySQL flavours.

This leads to PHP having no mysql socket path set for the mysql[i]
extensions, and `/tmp/mysql.sock` set for pdo_mysql,
meaning one currently has to manually configure and set it in php.ini.

Luckily, PHP supports setting that path via
`--with-mysql-sock=/run/mysqld/mysqld.sock` during configure phase,
so let's do this as soon as one of the three modules is enabled.
---
 pkgs/development/interpreters/php/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index adffe647c365..9fa3b96fd340 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -136,6 +136,7 @@ let
       ++ optionals mysqliSupport [
         "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
       ]
+      ++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
       # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
       ++ optionals gdSupport [

From d57b9eb6d6177fa1bbcc243c38e2cd5a2d072da5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Sep 2018 06:09:37 -0700
Subject: [PATCH 1542/3253] pgtap: 0.98.0 -> 0.99.0 (#46980)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgtap/versions
---
 pkgs/servers/sql/postgresql/pgtap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix
index c6eb4013c5ce..2f37d3a85d3e 100644
--- a/pkgs/servers/sql/postgresql/pgtap/default.nix
+++ b/pkgs/servers/sql/postgresql/pgtap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgtap-${version}";
-  version = "0.98.0";
+  version = "0.99.0";
 
   src = fetchFromGitHub {
     owner = "theory";
     repo = "pgtap";
     rev = "v${version}";
-    sha256 = "17r3b409k05pbypmwdwgm1fl669jc6a1391szyxizx784k44a369";
+    sha256 = "0xakjlbb99mgd8za6m0xa6n3s5fhif217iip6b3aywqw7nh1j6nv";
   };
 
   nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ];

From 0602e6ddfe361c82f7c8f1ed017a7af4c35a582d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 13 Aug 2018 14:47:54 +0900
Subject: [PATCH 1543/3253] wasm-gc: init at 0.1.6

---
 .../interpreters/wasm-gc/default.nix          | 25 ++++++++++++++
 .../interpreters/wasm-gc/fix-build.patch      | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/interpreters/wasm-gc/default.nix
 create mode 100644 pkgs/development/interpreters/wasm-gc/fix-build.patch

diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
new file mode 100644
index 000000000000..cf0fad18d1ca
--- /dev/null
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "wasm-gc-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "alexcrichton";
+    repo = "wasm-gc";
+    rev = version;
+    sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7";
+  };
+
+  cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
+
+  cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7";
+
+  meta = with stdenv.lib; {
+    description = "gc-sections for wasm";
+    homepage = "https://github.com/alexcrichton/wasm-gc";
+    maintainers = with maintainers; [ ekleog ];
+    platforms = platforms.all;
+    license = with licenses; [ mit asl20 ];
+  };
+}
diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch
new file mode 100644
index 000000000000..3144dd898374
--- /dev/null
+++ b/pkgs/development/interpreters/wasm-gc/fix-build.patch
@@ -0,0 +1,34 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 923ed91..71f17c8 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -212,16 +212,16 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-gc"
+-version = "0.1.1"
++version = "0.1.6"
+ dependencies = [
+  "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "wasm-gc-api 0.1.5",
++ "wasm-gc-api 0.1.6",
+ ]
+ 
+ [[package]]
+ name = "wasm-gc-api"
+-version = "0.1.5"
++version = "0.1.6"
+ dependencies = [
+  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -234,7 +234,7 @@ version = "0.1.0"
+ dependencies = [
+  "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "wasm-gc-api 0.1.5",
++ "wasm-gc-api 0.1.6",
+ ]
+ 
+ [[package]]
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32af34bf70b0..9a547cfa7f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7808,6 +7808,8 @@ with pkgs;
 
   wasm = callPackage ../development/interpreters/wasm { };
 
+  wasm-gc = callPackage ../development/interpreters/wasm-gc { };
+
 
   ### DEVELOPMENT / MISC
 

From aa39d5a614f6e19b94e5b784e78b67744221fe64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Sep 2018 14:53:18 +0100
Subject: [PATCH 1544/3253] vim: remove legacy additional-nix-code

This is a left-over from https://github.com/NixOS/nixpkgs/pull/46394
We no longer use this.
---
 .../vim2nix/additional-nix-code/YankRing         |  1 -
 .../vim2nix/additional-nix-code/clang_complete   | 11 -----------
 .../vim2nix/additional-nix-code/clighter8        |  4 ----
 .../vim2nix/additional-nix-code/command-t        |  5 -----
 .../vim-plugins/vim2nix/additional-nix-code/cpsm | 13 -------------
 .../vim2nix/additional-nix-code/ctrlp-cmatcher   |  5 -----
 .../vim2nix/additional-nix-code/deoplete-go      |  7 -------
 .../vim2nix/additional-nix-code/ensime-vim       |  1 -
 .../vim2nix/additional-nix-code/taglist          |  6 ------
 .../additional-nix-code/vim-addon-manager        |  1 -
 .../vim2nix/additional-nix-code/vim-grammarous   | 10 ----------
 .../vim2nix/additional-nix-code/vim-hier         |  1 -
 .../vim2nix/additional-nix-code/vim-isort        |  4 ----
 .../vim2nix/additional-nix-code/vim-wakatime     |  1 -
 .../vim2nix/additional-nix-code/vim-xdebug       |  1 -
 .../vim2nix/additional-nix-code/vim-xkbswitch    |  5 -----
 .../vim2nix/additional-nix-code/vim-yapf         |  4 ----
 .../vim2nix/additional-nix-code/vimproc.vim      |  9 ---------
 .../vim2nix/additional-nix-code/youcompleteme    | 16 ----------------
 19 files changed, 105 deletions(-)
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme

diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing
deleted file mode 100644
index 1776c1b91ea5..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/YankRing
+++ /dev/null
@@ -1 +0,0 @@
-    sourceRoot = ".";
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
deleted file mode 100644
index ed88e08742ed..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
+++ /dev/null
@@ -1,11 +0,0 @@
-    # In addition to the arguments you pass to your compiler, you also need to
-    # specify the path of the C++ std header (if you are using C++).
-    # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
-    # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
-    # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
-    # as an alternative you can execute the following command:
-    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
-    preFixup = ''
-      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
-        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8 b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8
deleted file mode 100644
index 8965ebe29810..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clighter8
+++ /dev/null
@@ -1,4 +0,0 @@
-    preFixup = ''
-      sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \
-        -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
deleted file mode 100644
index f850425cba77..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ /dev/null
@@ -1,5 +0,0 @@
-    buildInputs = [ ruby rake ];
-    buildPhase = ''
-      rake make
-      rm ruby/command-t/ext/command-t/*.o
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
deleted file mode 100644
index c3a210a642d2..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm
+++ /dev/null
@@ -1,13 +0,0 @@
-    buildInputs = [
-      python3
-      stdenv
-      cmake
-      boost
-      icu
-      ncurses
-    ];
-    buildPhase = ''
-      patchShebangs .
-      export PY3=ON
-      ./install.sh
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher
deleted file mode 100644
index bd4a4fa989ba..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ctrlp-cmatcher
+++ /dev/null
@@ -1,5 +0,0 @@
-    buildInputs = [ python ];
-    buildPhase = ''
-      patchShebangs .
-      ./install.sh
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go
deleted file mode 100644
index 80cfd9af6538..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/deoplete-go
+++ /dev/null
@@ -1,7 +0,0 @@
-    buildInputs = [ python3 ]; 
-    buildPhase = ''
-      pushd ./rplugin/python3/deoplete/ujson
-      python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
-      popd
-      find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \;
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim
deleted file mode 100644
index e065e0db4f47..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim
+++ /dev/null
@@ -1 +0,0 @@
-    passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
deleted file mode 100644
index 90f6e3367a3b..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
+++ /dev/null
@@ -1,6 +0,0 @@
-    setSourceRoot = ''
-      export sourceRoot=taglist
-      mkdir taglist
-      mv doc taglist
-      mv plugin taglist
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
deleted file mode 100644
index e3d8dfb69210..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
+++ /dev/null
@@ -1 +0,0 @@
-    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous
deleted file mode 100644
index 66a91b619d16..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-grammarous
+++ /dev/null
@@ -1,10 +0,0 @@
-    # use `:GrammarousCheck` to initialize checking
-    # In neovim, you also want to use set
-    #   let g:grammarous#show_first_error = 1
-    # see https://github.com/rhysd/vim-grammarous/issues/39
-    patches = [
-      (substituteAll {
-        src = ./patches/vim-grammarous/set_default_languagetool.patch;
-        inherit languagetool;
-      })
-    ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
deleted file mode 100644
index d1f756a99d3b..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
+++ /dev/null
@@ -1 +0,0 @@
-    buildInputs = [ vim ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
deleted file mode 100644
index febd2185bac3..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort
+++ /dev/null
@@ -1,4 +0,0 @@
-    postPatch = ''
-      substituteInPlace ftplugin/python_vimisort.vim \
-          --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")'
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
deleted file mode 100644
index 31ffa7f8ff97..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
+++ /dev/null
@@ -1 +0,0 @@
-    buildInputs = [ python ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
deleted file mode 100644
index 62a3c22c0369..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
+++ /dev/null
@@ -1 +0,0 @@
-    postInstall = false;
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
deleted file mode 100644
index 4e73ac9a73b3..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
+++ /dev/null
@@ -1,5 +0,0 @@
-    patchPhase = ''
-      substituteInPlace plugin/xkbswitch.vim \
-              --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
-    '';
-    buildInputs = [ xkb_switch ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
deleted file mode 100644
index c1eb9efefc36..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-yapf
+++ /dev/null
@@ -1,4 +0,0 @@
-    buildPhase = ''
-      substituteInPlace ftplugin/python_yapf.vim \
-        --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"'
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
deleted file mode 100644
index e720559fa3d6..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-    buildInputs = [ which ];
-
-    buildPhase = ''
-      substituteInPlace autoload/vimproc.vim \
-        --replace vimproc_mac.so vimproc_unix.so \
-        --replace vimproc_linux64.so vimproc_unix.so \
-        --replace vimproc_linux32.so vimproc_unix.so
-      make -f make_unix.mak
-    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
deleted file mode 100644
index 278343dab6e0..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ /dev/null
@@ -1,16 +0,0 @@
-    buildPhase = ''
-      substituteInPlace plugin/youcompleteme.vim \
-        --replace "'ycm_path_to_python_interpreter', '''" \
-                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
-
-      rm -r third_party/ycmd
-      ln -s ${ycmd}/lib/ycmd third_party
-    '';
-
-    meta = {
-      description = "Fastest non utf-8 aware word and C completion engine for Vim";
-      homepage = https://github.com/Valloric/YouCompleteMe;
-      license = stdenv.lib.licenses.gpl3;
-      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
-      platforms = stdenv.lib.platforms.unix;
-    };

From 29854e24265457991448afb93363bdcc9e5d2eca Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 8 Sep 2018 16:57:46 -0500
Subject: [PATCH 1545/3253] Revert "nixos docs: add release notes for nix 2.0
 requiremnt bump"

This reverts commit 18f953965598ab585cc4b3f9018463905401bdd9.

(cherry picked from commit 02bb97e5bb30cdbd9097c5efcf0560b8188b2940)
---
 nixos/doc/manual/release-notes/rl-1809.xml | 44 ----------------------
 1 file changed, 44 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 21ea98d012b8..5a565f08b2cb 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -139,50 +139,6 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      seen a complete rewrite. (See above.)
     </para>
    </listitem>
-   <listitem>
-    <para>
-     The minimum version of Nix required to evaluate Nixpkgs is now 2.0.
-    </para>
-    <itemizedlist>
-     <listitem>
-      <para>
-       For users of NixOS 18.03, NixOS 18.03 defaulted to Nix 2.0, but
-       supported using Nix 1.11 by setting <literal>nix.package =
-       pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you
-       will need to either unset the option or upgrade it to Nix 2.0.
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       For users of NixOS 17.09, you will first need to upgrade Nix by setting
-       <literal>nix.package = pkgs.nixStable2;</literal> and run
-       <command>nixos-rebuild switch</command> as the <literal>root</literal>
-       user.
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       For users of a daemon-less Nix installation on Linux or macOS, you can
-       upgrade Nix by running <command>curl https://nixos.org/nix/install |
-       sh</command>, or prior to doing a channel update, running
-       <command>nix-env -iA nix</command>.
-      </para>
-      <para>
-       If you have already run a channel update and Nix is no longer able to
-       evaluate Nixpkgs, the error message printed should provide adequate
-       directions for upgrading Nix.
-      </para>
-     </listitem>
-     <listitem>
-      <para>
-       For users of the Nix daemon on macOS, you can upgrade Nix by running
-       <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA
-       nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
-       start org.nixos.nix-daemon</command>.
-      </para>
-     </listitem>
-    </itemizedlist>
-   </listitem>
    <listitem>
     <para>
      <literal>lib.strict</literal> is removed. Use

From 868040ee22fe7e79a39b6423095ab4185d584b6b Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 11 Sep 2018 06:20:55 +0300
Subject: [PATCH 1546/3253] rmilter: deprecation notice

---
 nixos/modules/services/mail/rmilter.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index c3e3d8232429..0d91b247cd34 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -193,6 +193,9 @@ in
   config = mkMerge [
 
     (mkIf cfg.enable {
+      warnings = [
+        ''`config.services.rmilter' is deprecated, `rmilter' deprecated and unsupported by upstream, and will be removed from next releases. Use built-in rspamd milter instead.''
+      ];
 
       users.users = singleton {
         name = cfg.user;

From fe20b58d6676858802cd627721c782f65d48a43b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 23 Sep 2018 11:40:47 -0400
Subject: [PATCH 1547/3253] release-notes: Add missing "Backward
 Incompatibilities" section

This has been part of every release since 17.03. I think the template
for new releases should be updated to contain this.
---
 nixos/doc/manual/release-notes/rl-1903.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 9ae34dd58ab0..2e971996b864 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -42,6 +42,25 @@
   </itemizedlist>
  </section>
 
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-18.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
+
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+
  <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"

From 1146ae1a7194bb231269bdb9587a85703e38a2a6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 23 Sep 2018 11:50:23 -0400
Subject: [PATCH 1548/3253] release-notes/19.03: add release notes for nix 2.0
 requirement bump

This is taken from the 18.09 change, which was reverted on release-18.09
but not master. The now-false 18.09 release notes were just removed from
master in 29854e24265457991448afb93363bdcc9e5d2eca, but since the
underlying change is still there, release notes for 19.03 are warranted.
This commit takes the now-reverted release notes and reuses them for
that.
---
 nixos/doc/manual/release-notes/rl-1903.xml | 43 +++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 2e971996b864..bfae2d0f5974 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -56,7 +56,48 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+    <para>
+     The minimum version of Nix required to evaluate Nixpkgs is now 2.0.
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but
+       supports using Nix 1.11 by setting <literal>nix.package =
+       pkgs.nix1;</literal>. If this option is set to a Nix 1.11 package, you
+       will need to either unset the option or upgrade it to Nix 2.0.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For users of NixOS 17.09, you will first need to upgrade Nix by setting
+       <literal>nix.package = pkgs.nixStable2;</literal> and run
+       <command>nixos-rebuild switch</command> as the <literal>root</literal>
+       user.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For users of a daemon-less Nix installation on Linux or macOS, you can
+       upgrade Nix by running <command>curl https://nixos.org/nix/install |
+       sh</command>, or prior to doing a channel update, running
+       <command>nix-env -iA nix</command>.
+      </para>
+      <para>
+       If you have already run a channel update and Nix is no longer able to
+       evaluate Nixpkgs, the error message printed should provide adequate
+       directions for upgrading Nix.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For users of the Nix daemon on macOS, you can upgrade Nix by running
+       <command>sudo -i sh -c 'nix-channel --update &amp;&amp; nix-env -iA
+       nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
+       start org.nixos.nix-daemon</command>.
+      </para>
+     </listitem>
+    </itemizedlist>
    </listitem>
   </itemizedlist>
  </section>

From c5af608dd2bcc3a7c8e13785c3a0968993099dee Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 3 Jul 2018 14:16:02 +0200
Subject: [PATCH 1549/3253] electron-cash: 3.1.6 -> 3.3

---
 pkgs/applications/misc/electron-cash/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 891222a0f10e..64a284cd0ed2 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -7,14 +7,14 @@ let
 in
 
 python3Packages.buildPythonApplication rec {
-  version = "3.1.6";
+  version = "3.3";
   name = "electron-cash-${version}";
 
   src = fetchurl {
     url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
     # Verified using official SHA-1 and signature from
     # https://github.com/fyookball/keys-n-hashes
-    sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm";
+    sha256 = "1x487hyacdm1qhik1mhfimr4jwcwz7sgsbkh11awrb6j19sxdxym";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec {
   '';
 
   preBuild = ''
-    sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
     pyrcc5 icons.qrc -o gui/qt/icons_rc.py
     # Recording the creation timestamps introduces indeterminism to the build
     sed -i '/Created: .*/d' gui/qt/icons_rc.py
@@ -51,10 +50,9 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   postInstall = ''
-    # Despite setting usr_share above, these files are installed under
-    # $out/nix ...
-    mv $out/${python.sitePackages}/nix/store"/"*/share $out
-    rm -rf $out/${python.sitePackages}/nix
+    # These files are installed under $out/homeless-shelter ...
+    mv $out/${python.sitePackages}/homeless-shelter/.local/share $out
+    rm -rf $out/${python.sitePackages}/homeless-shelter
 
     substituteInPlace $out/share/applications/electron-cash.desktop \
       --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"

From e33a7dfd54485938a5e309ab35cb43be1c9669b3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 12 Sep 2018 17:37:38 +0200
Subject: [PATCH 1550/3253] electron-cash: 3.3 -> 3.3.1

---
 pkgs/applications/misc/electron-cash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 64a284cd0ed2..3583d0258ff8 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -7,14 +7,14 @@ let
 in
 
 python3Packages.buildPythonApplication rec {
-  version = "3.3";
+  version = "3.3.1";
   name = "electron-cash-${version}";
 
   src = fetchurl {
     url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz";
     # Verified using official SHA-1 and signature from
     # https://github.com/fyookball/keys-n-hashes
-    sha256 = "1x487hyacdm1qhik1mhfimr4jwcwz7sgsbkh11awrb6j19sxdxym";
+    sha256 = "1jdy89rfdwc2jadx3rqj5yvynpcn90cx6482ax9f1cj9gfxp9j2b";
   };
 
   propagatedBuildInputs = with python3Packages; [

From f5a5752630690bb35b15e144d9171bff5217bab5 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 12 Sep 2018 18:03:36 +0200
Subject: [PATCH 1551/3253] electron-cash: fix #24256

---
 pkgs/applications/misc/electron-cash/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 3583d0258ff8..d3e93d357f04 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages }:
+{ stdenv, fetchurl, python3Packages, qtbase, makeWrapper, lib }:
 
 let
 
@@ -36,6 +36,8 @@ python3Packages.buildPythonApplication rec {
     trezor
   ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
   postPatch = ''
     # Remove pyqt5 check
     sed -i '/pyqt5/d' setup.py
@@ -56,11 +58,14 @@ python3Packages.buildPythonApplication rec {
 
     substituteInPlace $out/share/applications/electron-cash.desktop \
       --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
+
+    wrapProgram $out/bin/electron-cash \
+      --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
   '';
 
   doInstallCheck = true;
   installCheckPhase = ''
-    $out/bin/electrum help >/dev/null
+    $out/bin/electron-cash help >/dev/null
   '';
 
   meta = with stdenv.lib; {

From 0b9d9ab256012a9007695a174895e9d32eca809d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 23 Sep 2018 12:45:03 -0400
Subject: [PATCH 1552/3253] Remove dead code from stdenv check-meta license
 logic

The `unfree` and `unfreeRedistributable` licenses both have `free = false`,
which will trigger the first portion of logic. This removes dead code to
simplify the logic.

As a follow-up, I plan to add an attribute `redistributable = [true|false]`,
which can be used by Hydra to determine whether a given package with a given
license can be included in the channel.
---
 pkgs/stdenv/generic/check-meta.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 28b69f5c2dc9..26cd9f8beb96 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -42,8 +42,7 @@ let
   allowUnsupportedSystem = config.allowUnsupportedSystem or false
     || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1";
 
-  isUnfree = licenses: lib.lists.any (l:
-    !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses;
+  isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses;
 
   # Alow granular checks to allow only some unfree packages
   # Example:
@@ -56,7 +55,7 @@ let
 
   # Check whether unfree packages are allowed and if not, whether the
   # package has an unfree license and is not explicitely allowed by the
-  # `allowUNfreePredicate` function.
+  # `allowUnfreePredicate` function.
   hasDeniedUnfreeLicense = attrs:
     !allowUnfree &&
     hasLicense attrs &&

From 1004dae356854507a3001570fddbc0ca87e52d9e Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 23 Sep 2018 18:50:38 +0200
Subject: [PATCH 1553/3253] electron-cash: Reminder to remove the QT wrapper

---
 pkgs/applications/misc/electron-cash/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index d3e93d357f04..66a423238b34 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -59,6 +59,7 @@ python3Packages.buildPythonApplication rec {
     substituteInPlace $out/share/applications/electron-cash.desktop \
       --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
 
+    # Please remove this when #44047 is fixed
     wrapProgram $out/bin/electron-cash \
       --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
   '';

From 359d00f8b0990fdad0bf308e355490058f264ca2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 23 Sep 2018 13:18:38 -0400
Subject: [PATCH 1554/3253] top-level: `system` should still come from the host
 platform

2a6e4ae49a891adc7c0562fda08b17d60beb1b4f and
e51f736076548459f36a1250de4bf6867f880b66 reverted a bit too much, and I
initially missed this when reviewing. The release notes already still
mention this change, too.
---
 pkgs/top-level/stage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 06978d1067bf..7637371a40f1 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -83,7 +83,7 @@ let
     inherit (super.stdenv) buildPlatform hostPlatform targetPlatform;
   in {
     inherit buildPlatform hostPlatform targetPlatform;
-    inherit (buildPlatform) system;
+    inherit (hostPlatform) system;
   };
 
   splice = self: super: import ./splice.nix lib self (buildPackages != null);

From e39a73cc55bf6fb9559d9d51e1959a5340c2510b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 23 Sep 2018 13:18:38 -0400
Subject: [PATCH 1555/3253] doc: Don't mention top-level `{build, host,
 target}Platform`

For technical reasons, we cannot easily add a warning to top-level
definitions, so 2a6e4ae49a891adc7c0562fda08b17d60beb1b4f and
e51f736076548459f36a1250de4bf6867f880b66 reverted the deprecation. But
we can still remove mention of the would-be deprecated definitions to
steer people towards using the preferred alternatives.
---
 doc/cross-compilation.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 3b90596bcc2c..c7187d86d1b3 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,13 +47,9 @@
 
    <para>
     In Nixpkgs, these three platforms are defined as attribute sets under the
-    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
-    and <literal>targetPlatform</literal>. All three are always defined as
-    attributes in the standard environment, and at the top level. That means
-    one can get at them just like a dependency in a function that is imported
-    with <literal>callPackage</literal>:
-<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>
-    , or just off <varname>stdenv</varname>:
+    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and
+    <literal>targetPlatform</literal>. They are always defined as attributes in
+    the standard environment. That means one can access them like:
 <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
     .
    </para>

From b2c7a5a271269175bbcb2907ca821139a7ee465f Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 18:33:56 +0000
Subject: [PATCH 1556/3253] bintools-wrapper, cc-wrapper, stdenv: infer
 propagateDoc automatically

02c09e01712ce0b61e5c8f7159047699a434f7fc (NixOS/nixpkgs#44558) was reverted in
c981787db951afb11c1328461df82d4277ebec07 but, as it turns out, it fixed an issue
I didn't know about at the time: the values of `propagateDoc` options were
(and now again are) inconsistent with the underlying things those wrappers wrap
(see NixOS/nixpkgs#46119), which was (and now is) likely to produce more instances
of NixOS/nixpkgs#43547, if not now, then eventually as stdenv changes.

This patch (which is a simplified version of the original reverted patch) is the
simplest solution to this whole thing: it forces wrappers to directly inspect the
outputs of the things they are wrapping instead of making stdenv guess the correct
values.
---
 pkgs/build-support/bintools-wrapper/default.nix | 7 ++++---
 pkgs/build-support/cc-wrapper/default.nix       | 4 +++-
 pkgs/stdenv/darwin/default.nix                  | 1 -
 pkgs/stdenv/linux/default.nix                   | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 7948f726c629..f9ca245beea6 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -6,9 +6,10 @@
 # compiler and the linker just "work".
 
 { name ? ""
-, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
-, bintools ? null, libc ? null
-, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
+, stdenvNoCC
+, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null
+, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, propagateDoc ? bintools != null && bintools ? man
 , extraPackages ? [], extraBuildCommands ? ""
 , buildPackages ? {}
 , useMacosReexportHack ? false
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 301bc2694c4f..e59758371a38 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -6,8 +6,10 @@
 # compiler and the linker just "work".
 
 { name ? ""
-, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, stdenvNoCC
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
+, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
+, propagateDoc ? cc != null && cc ? man
 , extraPackages ? [], extraBuildCommands ? ""
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 6d224e4cc44f..bfeac09ea650 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -88,7 +88,6 @@ in rec {
         extraPackages = lib.optional (libcxx != null) libcxx;
 
         nativeTools  = false;
-        propagateDoc = false;
         nativeLibc   = false;
         inherit buildPackages coreutils gnugrep bintools;
         libc         = last.pkgs.darwin.Libsystem;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 08703b6934e5..978beea692c6 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -92,7 +92,6 @@ let
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           name = "${name}-gcc-wrapper";
           nativeTools = false;
-          propagateDoc = false;
           nativeLibc = false;
           buildPackages = lib.optionalAttrs (prevStage ? stdenv) {
             inherit (prevStage) stdenv;

From b14db1b0baea19934313ee90b56b157315ab328b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Sep 2018 14:28:04 -0400
Subject: [PATCH 1557/3253] gcc-*: Clean up crossStageStatic logic

54282b9610e80b1ed93136319e24cb79c5bbcc33 tread carefuly to avoid a mass
rebuild. This embraces the mass rebuild to clean things up.
---
 pkgs/development/compilers/gcc/4.8/default.nix      | 4 +---
 pkgs/development/compilers/gcc/4.9/default.nix      | 4 +---
 pkgs/development/compilers/gcc/5/default.nix        | 4 +---
 pkgs/development/compilers/gcc/6/default.nix        | 4 +---
 pkgs/development/compilers/gcc/7/default.nix        | 4 +---
 pkgs/development/compilers/gcc/8/default.nix        | 4 +---
 pkgs/development/compilers/gcc/builder.sh           | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 4 +---
 8 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 60db368c403a..d9376f597a70 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -201,9 +201,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 361db92cb767..c60f54f1560c 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -210,9 +210,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 2e51e9c05066..efd6ec072573 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -215,9 +215,7 @@ stdenv.mkDerivation ({
         )
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e6825afcfa84..4760d18a7d81 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -216,9 +216,7 @@ stdenv.mkDerivation ({
         )
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 4dfbcf0f5458..bb8a3638b2db 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -189,9 +189,7 @@ stdenv.mkDerivation ({
         )
     else "");
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 04054df8bf82..59d7653c52cd 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -184,9 +184,7 @@ stdenv.mkDerivation ({
         )
     else "");
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index a3250f4021a5..75e70006d749 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
         )
     fi
 
-    if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then
+    if test "$crossStageStatic" == 1; then
         # We don't want the gcc build to assume there will be a libc providing
         # limits.h in this stagae
         makeFlagsArray+=(
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 230409e97538..0de6be36c351 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -154,9 +154,7 @@ stdenv.mkDerivation ({
         ''
     else null;
 
-  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
-  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler
+  inherit noSysDirs staticCompiler crossStageStatic
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 1abf1971cde752357fd9537dd963886c83fd8c03 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:28:32 +0000
Subject: [PATCH 1558/3253] gcc7: cleanup with a mass rebuild

---
 pkgs/development/compilers/gcc/7/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index bb8a3638b2db..e2c686b7e7e8 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -217,9 +217,7 @@ stdenv.mkDerivation ({
     ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
     ;
 
-  # TODO: Use optionalString with next rebuild.
-  ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument";
-
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
   NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
   preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''

From d2674c5e154881261ab17d6b0b2c2e77bb4be8ab Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:30:39 +0000
Subject: [PATCH 1559/3253] llvm_5: cleanup with a mass rebuild

---
 pkgs/development/compilers/llvm/5/libc++/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index c7b4615e374a..b182f1250e72 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
-  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-  patches = if stdenv.hostPlatform.isMusl then [
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
-  ] else null;
+  ];
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

From ed10043f75ab92b1be561b46f2c6f10fc84a7b9b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:34:46 +0000
Subject: [PATCH 1560/3253] llvmPackages_6.libcxx: cleanup with a mass rebuild

---
 pkgs/development/compilers/llvm/6/libc++/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 1f87cb83ab01..3a165e9da7b1 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
-  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-  patches = if stdenv.hostPlatform.isMusl then [
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
     ../../libcxx-0001-musl-hacks.patch
-  ] else null;
+  ];
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

From 4bf1a7d97545f957e18d2fb9f00ddcb7e545f792 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Sep 2018 19:36:22 +0200
Subject: [PATCH 1561/3253] tig: fix zsh completion

The ZSH completion script of `tig` basically imports the bash completion
script and uses it as completion approach. Unfortunately the script
takes several assumptions about the directory structure using
`$funcsourcetrace`[1] that don't apply on NixOS.

The easiest workaround is t opatch the completion script and import the
bash completion script from `$out`.

[1] http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#index-funcsourcetrace
---
 .../version-management/git-and-tools/tig/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 6d2753e45437..a407f6e7ab12 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     make install-doc
+
+    substituteInPlace contrib/tig-completion.zsh \
+      --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/etc/bash_completion.d/tig-completion.bash"
+
     install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash
     install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig
     cp contrib/vim.tigrc $out/etc/

From e51b70c7148d22663e18077ed818dd8d76924904 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 9 Sep 2018 11:13:46 +0000
Subject: [PATCH 1562/3253] libcardiacarrest: 12.1-6 -> 12.1-7

---
 pkgs/misc/libcardiacarrest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/misc/libcardiacarrest/default.nix
index 28e9b81df86a..1a07878b3302 100644
--- a/pkgs/misc/libcardiacarrest/default.nix
+++ b/pkgs/misc/libcardiacarrest/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libcardiacarrest-${version}";
-  version = "12.1-6"; # <PA API version>-<version>
+  version = "12.1-7"; # <PA API version>-<version>
 
   src = fetchFromGitHub {
     owner = "oxij";
     repo = "libcardiacarrest";
-    rev = "4df92b6cc66c7f9fe947dd9bbf4802cf20fe63a2";
-    sha256 = "0zfjn4nvcx8r4f6czcix5b9nsszhhhlbypcwqzi4ddhazl1gyfm6";
+    rev = "d44288d9a24d6b7793fb36a4c9a548b6b55375ec";
+    sha256 = "0j3l5s6r9hgpy5y7q7kx0rkh05rk0bgfdvzbmadqps720lqjs4xm";
   };
 
   outputs = [ "out" "dev" ];

From 2067b2a5246edd36d015ef30a4c957f2dfe4d48c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 5 Sep 2018 00:28:02 +0000
Subject: [PATCH 1563/3253] texinfo: cleanup with a mass rebuild

---
 pkgs/development/tools/misc/texinfo/common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
index c6877ed4d1a1..391179e2eb3f 100644
--- a/pkgs/development/tools/misc/texinfo/common.nix
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  # TODO: fix on mass rebuild
-  ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch;
+  patches = optional (version == "6.5") ./perl.patch;
 
   # We need a native compiler to build perl XS extensions
   # when cross-compiling.

From c77ba8b8f680ef29fe19b2fa4babe6d615c89f9c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:35:20 +0000
Subject: [PATCH 1564/3253] newt: cleanup with a mass rebuild

---
 pkgs/development/libraries/newt/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index a10f52462a8e..1a5656b7ca16 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -22,10 +22,9 @@ stdenv.mkDerivation rec {
     unset CPP
   '';
 
-  # Use `lib.optionalString` next mass rebuild.
-  makeFlags = if stdenv.buildPlatform == stdenv.hostPlatform
-              then null
-              else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
+  makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://fedorahosted.org/newt/;

From d5ddae51bd9b438aa6697ec8104ef9b8e13f30f8 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:35:32 +0000
Subject: [PATCH 1565/3253] pkgconfig: cleanup with a mass rebuild

---
 pkgs/development/tools/misc/pkgconfig/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 7235af49c2e6..1ae8a32b6405 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   patches = optional (!vanilla) ./requires-private.patch
     ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
 
-  preConfigure = ""; # TODO(@Ericson2314): Remove next mass rebuild
   buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
 
   configureFlags = [ "--with-internal-glib" ]

From d0c6bf0a738b854c57bd87c1a1b4ce63c096d542 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:54:47 +0000
Subject: [PATCH 1566/3253] libdaemon: cleanup with a mass rebuild

---
 pkgs/development/libraries/libdaemon/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 59e576fd3923..5dc153dd5ccc 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libdaemon-0.14";
 
   src = fetchurl {
@@ -8,6 +8,8 @@ stdenv.mkDerivation (rec {
     sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
   };
 
+  patches = [ ./fix-includes.patch ];
+
   configureFlags = [ "--disable-lynx" ]
     ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
     [ # Can't run this test while cross-compiling
@@ -16,16 +18,8 @@ stdenv.mkDerivation (rec {
 
   meta = {
     description = "Lightweight C library that eases the writing of UNIX daemons";
-
     homepage = http://0pointer.de/lennart/projects/libdaemon/;
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ ];
   };
-} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
-  # This patch should be applied unconditionally, but doing so will cause mass rebuild.
-  patches = ./fix-includes.patch;
-})
-
+}

From 87c02060383a689e81749643a39dbcc3c4fc6ad1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 4 Sep 2018 17:55:10 +0000
Subject: [PATCH 1567/3253] linuxHeaders: cleanup with a mass rebuild

---
 pkgs/os-specific/linux/kernel-headers/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 09fa4fbfd3a7..f7c3650f8187 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  common = { version, sha256, patches ? null }: stdenvNoCC.mkDerivation {
+  common = { version, sha256, patches ? [] }: stdenvNoCC.mkDerivation {
     name = "linux-headers-${version}";
 
     src = fetchurl {
@@ -20,8 +20,6 @@ let
 
     extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
 
-    # "patches" array defaults to 'null' to avoid changing hash
-    # and causing mass rebuild
     inherit patches;
 
     buildPhase = ''

From 5bfe8bfceac79e8b9de09a898afd23b10944c9fb Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 23 Sep 2018 12:53:46 +0200
Subject: [PATCH 1568/3253] openvpn plugins: use absolute paths to
 configuration gui

---
 pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 1 +
 pkgs/tools/networking/network-manager/iodine/default.nix      | 1 +
 pkgs/tools/networking/network-manager/l2tp/default.nix        | 1 +
 pkgs/tools/networking/network-manager/openconnect/default.nix | 1 +
 pkgs/tools/networking/network-manager/openvpn/default.nix     | 1 +
 pkgs/tools/networking/network-manager/vpnc/default.nix        | 1 +
 6 files changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index 16964e4db945..facf1b6a6670 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
     "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/tmp"
+    "--enable-absolute-paths"
   ];
 
   passthru = {
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index a6fd3e7303df..ad58dc97b0a6 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -31,6 +31,7 @@ in stdenv.mkDerivation rec {
     "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
+    "--enable-absolute-paths"
   ];
 
   passthru = {
diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index 3cac1b5e63cf..b44933f7f5f8 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/var"
     "--sysconfdir=$(out)/etc"
+    "--enable-absolute-paths"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 23d4c816a20d..0c02569aa27a 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -26,6 +26,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gnome=${if withGnome then "yes" else "no"}"
+    "--enable-absolute-paths"
   ];
 
   passthru = {
diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 0d3a4174744f..66a306ffb66c 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
     "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
+    "--enable-absolute-paths"
   ];
 
   passthru = {
diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index ef45defb7d5a..5d77be86dffe 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -26,6 +26,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"
+    "--enable-absolute-paths"
   ];
 
   passthru = {

From bb110d80fc7bbc06fd71bfa1122c016f14f43394 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 14:19:58 -0500
Subject: [PATCH 1569/3253] llvm7: init at 7.0.0rc3

Copy of 6 + updated hashes
---
 .../compilers/llvm/7/clang/default.nix        | 106 +++++
 .../compilers/llvm/7/clang/purity.patch       |  30 ++
 .../llvm/7/compiler-rt-codesign.patch         | 155 +++++++
 .../compilers/llvm/7/compiler-rt.nix          |  37 ++
 pkgs/development/compilers/llvm/7/default.nix |  93 ++++
 .../compilers/llvm/7/libc++/default.nix       |  54 +++
 .../compilers/llvm/7/libc++/setup-hook.sh     |   6 +
 .../compilers/llvm/7/libc++abi.nix            |  49 +++
 pkgs/development/compilers/llvm/7/lld.nix     |  32 ++
 pkgs/development/compilers/llvm/7/lldb.nix    |  56 +++
 .../compilers/llvm/7/llvm-outputs.patch       |  26 ++
 pkgs/development/compilers/llvm/7/llvm.nix    | 166 +++++++
 pkgs/development/compilers/llvm/7/openmp.nix  |  25 ++
 .../compilers/llvm/7/sanitizers-nongnu.patch  | 413 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  12 +
 15 files changed, 1260 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/7/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
 create mode 100644 pkgs/development/compilers/llvm/7/compiler-rt.nix
 create mode 100644 pkgs/development/compilers/llvm/7/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/7/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/7/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/7/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/7/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/7/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/7/openmp.nix
 create mode 100644 pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
new file mode 100644
index 000000000000..2dbf5bd8a8e1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -0,0 +1,106 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+, enableManpages ? false
+}:
+
+let
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+  self = stdenv.mkDerivation ({
+    name = "clang-${version}";
+
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "18aapi26lp25g38j1kwmzviagy9l59ach5kzvf80x5dvs2rmhcpc"}
+      mv cfe-${version}* clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
+
+    nativeBuildInputs = [ cmake python ]
+      ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+    buildInputs = [ libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+    cmakeFlags = [
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++ stdenv.lib.optionals enableManpages [
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DLLVM_ENABLE_SPHINX=ON"
+      "-DSPHINX_OUTPUT_MAN=ON"
+      "-DSPHINX_OUTPUT_HTML=OFF"
+      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+    ];
+
+    patches = [ ./purity.patch ];
+
+    postPatch = ''
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+             lib/Driver/ToolChains/*.cpp
+
+      # Patch for standalone doc building
+      sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+    '';
+
+    outputs = [ "out" "lib" "python" ];
+
+    # Clang expects to find LLVMgold in its own prefix
+    postInstall = ''
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
+      ln -sv $out/bin/clang $out/bin/cpp
+
+      # Move libclang to 'lib' output
+      moveToOutput "lib/libclang.*" "$lib"
+      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
+
+      mkdir -p $python/bin $python/share/clang/
+      mv $out/bin/{git-clang-format,scan-view} $python/bin
+      if [ -e $out/bin/set-xcode-analyzer ]; then
+        mv $out/bin/set-xcode-analyzer $python/bin
+      fi
+      mv $out/share/clang/*.py $python/share/clang
+      rm $out/bin/c-index-test
+    '';
+
+    enableParallelBuilding = true;
+
+    passthru = {
+      isClang = true;
+      inherit llvm;
+    } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.ncsa;
+      platforms   = stdenv.lib.platforms.all;
+    };
+  } // stdenv.lib.optionalAttrs enableManpages {
+    name = "clang-manpages-${version}";
+
+    buildPhase = ''
+      make docs-clang-man
+    '';
+
+    installPhase = ''
+      mkdir -p $out/share/man/man1
+      # Manually install clang manpage
+      cp docs/man/*.1 $out/share/man/man1/
+    '';
+
+    outputs = [ "out" ];
+
+    doCheck = false;
+
+    meta.description = "man page for Clang ${version}";
+  });
+in self
diff --git a/pkgs/development/compilers/llvm/7/clang/purity.patch b/pkgs/development/compilers/llvm/7/clang/purity.patch
new file mode 100644
index 000000000000..b30d0d0b5d5b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (!Args.hasArg(options::OPT_static)) {
+     if (Args.hasArg(options::OPT_rdynamic))
+       CmdArgs.push_back("-export-dynamic");
+-
+-    if (!Args.hasArg(options::OPT_shared)) {
+-      const std::string Loader =
+-          D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+-      CmdArgs.push_back("-dynamic-linker");
+-      CmdArgs.push_back(Args.MakeArgString(Loader));
+-    }
+   }
+ 
+   CmdArgs.push_back("-o");
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
new file mode 100644
index 000000000000..8f4c76bca1eb
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
@@ -0,0 +1,155 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake |  8 ------
+ test/asan/CMakeLists.txt          | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt          | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+       endif()
+-      if(APPLE)
+-        # Ad-hoc sign the dylibs
+-        add_custom_command(TARGET ${libname}
+-          POST_BUILD  
+-          COMMAND codesign --sign - $<TARGET_FILE:${libname}>
+-          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+-        )
+-      endif()
+     endif()
+     install(TARGETS ${libname}
+       ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
+index 8bfc15b5c..f23d0f71a 100644
+--- a/test/asan/CMakeLists.txt
++++ b/test/asan/CMakeLists.txt
+@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH})
+   endif()
+ endforeach()
+ 
+-# iOS and iOS simulator test suites
+-# These are not added into "check-all", in order to run these tests, use
+-# "check-asan-iossim-x86_64" and similar. They also require that an extra env
+-# variable to select which iOS device or simulator to use, e.g.:
+-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
+-if(APPLE)
+-  set(EXCLUDE_FROM_ALL ON)
+-
+-  set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
+-  set(ASAN_TEST_IOS "1")
+-  pythonize_bool(ASAN_TEST_IOS)
+-  set(ASAN_TEST_DYNAMIC True)
+-
+-  foreach(arch ${DARWIN_iossim_ARCHS})
+-    set(ASAN_TEST_IOSSIM "1")
+-    pythonize_bool(ASAN_TEST_IOSSIM)
+-    set(ASAN_TEST_TARGET_ARCH ${arch})
+-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
+-    get_bits_for_arch(${arch} ASAN_TEST_BITS)
+-    string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-    set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
+-    configure_lit_site_cfg(
+-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-      )
+-    add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests"
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-      DEPENDS ${ASAN_TEST_DEPS})
+-  endforeach()
+-
+-  foreach (arch ${DARWIN_ios_ARCHS})
+-    set(ASAN_TEST_IOSSIM "0")
+-    pythonize_bool(ASAN_TEST_IOSSIM)
+-    set(ASAN_TEST_TARGET_ARCH ${arch})
+-    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
+-    get_bits_for_arch(${arch} ASAN_TEST_BITS)
+-    string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-    set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
+-    configure_lit_site_cfg(
+-      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-      )
+-    add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests"
+-      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-      DEPENDS ${ASAN_TEST_DEPS})
+-  endforeach()
+-
+-  set(EXCLUDE_FROM_ALL OFF)
+-endif()
+-
+ # Add unit tests.
+ if(COMPILER_RT_INCLUDE_TESTS)
+   set(ASAN_TEST_DYNAMIC False)
+diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
+index a68908612..cde0accb5 100644
+--- a/test/tsan/CMakeLists.txt
++++ b/test/tsan/CMakeLists.txt
+@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH})
+   list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
+ endforeach()
+ 
+-# iOS and iOS simulator test suites
+-# These are not added into "check-all", in order to run these tests, use
+-# "check-tsan-iossim-x86_64" and similar. They also require an extra environment
+-# variable to select which iOS device or simulator to use, e.g.:
+-# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
+-if(APPLE)
+-  set(EXCLUDE_FROM_ALL ON)
+-
+-  set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
+-  set(TSAN_TEST_IOS "1")
+-  pythonize_bool(TSAN_TEST_IOS)
+-
+-  set(arch "x86_64")
+-  set(TSAN_TEST_IOSSIM "1")
+-  pythonize_bool(TSAN_TEST_IOSSIM)
+-  set(TSAN_TEST_TARGET_ARCH ${arch})
+-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
+-  string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-  set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
+-  configure_lit_site_cfg(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-    )
+-  add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-    DEPENDS ${TSAN_TEST_DEPS})
+-
+-  set(arch "arm64")
+-  set(TSAN_TEST_IOSSIM "0")
+-  pythonize_bool(TSAN_TEST_IOSSIM)
+-  set(TSAN_TEST_TARGET_ARCH ${arch})
+-  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+-  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
+-  string(TOUPPER ${arch} ARCH_UPPER_CASE)
+-  set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
+-  configure_lit_site_cfg(
+-    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
+-    )
+-  add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
+-    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
+-    DEPENDS ${TSAN_TEST_DEPS})
+-
+-  set(EXCLUDE_FROM_ALL OFF)
+-endif()
+-
+ if(COMPILER_RT_INCLUDE_TESTS)
+   configure_lit_site_cfg(
+     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
+-- 
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
new file mode 100644
index 000000000000..fe83d8675854
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -0,0 +1,37 @@
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "compiler-rt-${version}";
+  inherit version;
+  src = fetch "compiler-rt" "0r4hg8hi60kdjl4arp3s51dbwbwz11s8qvccdkx9v52vc27p2241";
+
+  nativeBuildInputs = [ cmake python llvm ];
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+  configureFlags = [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '';
+
+  # Hack around weird upsream RPATH bug
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
new file mode 100644
index 000000000000..2526f1ab17e7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -0,0 +1,93 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+  release_version = "7.0.0";
+  version = release_version + "rc3"; # differentiating these is important for rc's
+
+  fetch = name: sha256: fetchurl {
+    name = "${name}-${release_version}.src.tar.xz";
+    url = "http://prereleases.llvm.org/${release_version}/rc3/${name}-${version}.src.tar.xz";
+    inherit sha256;
+  };
+
+  clang-tools-extra_src = fetch "clang-tools-extra" "0rhvlz4g2nd10zrwx37yi5if8wqirh8845pwbgg62r9l2pb6j7n7";
+
+  tools = stdenv.lib.makeExtensible (tools: let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+    mkExtraBuildCommands = cc: ''
+      rsrc="$out/resource-root"
+      mkdir "$rsrc"
+      ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+      echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+    '';
+  in {
+
+    llvm = callPackage ./llvm.nix { };
+
+    clang-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python = pkgs.python;  # don't use python-boot
+    });
+
+    libclang = tools.clang-unwrapped.lib;
+
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+    libstdcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      extraPackages = [
+        libstdcxxHook
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    libcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+  });
+
+  libraries = stdenv.lib.makeExtensible (libraries: let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+  in {
+
+    compiler-rt = callPackage ./compiler-rt.nix {};
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+    libcxx = callPackage ./libc++ {};
+
+    libcxxabi = callPackage ./libc++abi.nix {};
+
+    openmp = callPackage ./openmp.nix {};
+  });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
new file mode 100644
index 000000000000..01ee8b4c60c2
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -0,0 +1,54 @@
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+  name = "libc++-${version}";
+
+  src = fetch "libcxx" "1ylw8sdiy7b9siajm88frw95y8ii1kng3xbsqhn8nmhy0yxwd1p5";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+    export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+  '';
+
+  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
+  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+  patches = if stdenv.hostPlatform.isMusl then [
+    ../../libcxx-0001-musl-hacks.patch
+  ] else null;
+
+  prePatch = ''
+    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+  '';
+
+  preConfigure = ''
+    # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+    cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+    patchShebangs utils/cat_files.py
+  '';
+  nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python;
+
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags = [
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
new file mode 100644
index 000000000000..6611259165ae
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
new file mode 100644
index 000000000000..eb7237598bd5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -0,0 +1,49 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "libc++abi-${version}";
+
+  src = fetch "libcxxabi" "1ry0v4sd91gg06kqkhqcnbwbd5v1yknbpm0gj39lq8y3d7lwn7np";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    unpackFile ${llvm.src}
+    export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/*.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
new file mode 100644
index 000000000000..db778d2d2a72
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lld-${version}";
+
+  src = fetch "lld" "10p8yqikpsx1hvs524dj6fk7hg267bhs6860xngk33130s9s05id";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ llvm libxml2 ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$dev"
+  '';
+
+  meta = {
+    description = "The LLVM Linker";
+    homepage    = http://lld.llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
new file mode 100644
index 000000000000..b8206ca3feff
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python
+, version
+, darwin
+}:
+
+stdenv.mkDerivation {
+  name = "lldb-${version}";
+
+  src = fetch "lldb" "1s2jiaq85nzbab3nj4msfw3zxkdwinq71p1d7h70z26q3caddngp";
+
+  postPatch = ''
+    # Fix up various paths that assume llvm and clang are installed in the same place
+    sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
+      cmake/modules/LLDBStandalone.cmake
+  '';
+
+  nativeBuildInputs = [ cmake python which swig ];
+  buildInputs = [ ncurses zlib libedit libxml2 llvm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+
+  CXXFLAGS = "-fno-rtti";
+  hardeningDisable = [ "format" ];
+
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp ../docs/lldb.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = licenses.ncsa;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/7/llvm-outputs.patch b/pkgs/development/compilers/llvm/7/llvm-outputs.patch
new file mode 100644
index 000000000000..40096fa3497f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
++  /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++  if (!IsInDevelopmentTree) {
++    bool WantShared = true;
++    for (int i = 1; i < argc; ++i) {
++      StringRef Arg = argv[i];
++      if (Arg == "--link-shared")
++        WantShared = true;
++      else if (Arg == "--link-static")
++        WantShared = false; // the last one wins
++    }
++
++    if (WantShared)
++      ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++  }
++
+   /// We only use `shared library` mode in cases where the static library form
+   /// of the components provided are not available; note however that this is
+   /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
new file mode 100644
index 000000000000..327647a7e72a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -0,0 +1,166 @@
+{ stdenv
+, fetch
+, cmake
+, python
+, libffi
+, libbfd
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enableWasm ? true
+}:
+
+let
+  src = fetch "llvm" "0r28srr8i0qcx8csblzg1g59wv4q8qc9c9msdm2xfsfggj2sknqa";
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 2 (splitString "." release_version));
+in stdenv.mkDerivation (rec {
+  name = "llvm-${version}";
+
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-${version}* llvm
+    sourceRoot=$PWD/llvm
+  '';
+
+  outputs = [ "out" "python" ]
+    ++ stdenv.lib.optional enableSharedLibraries "lib";
+
+  nativeBuildInputs = [ cmake python ]
+    ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+  buildInputs = [ libxml2 libffi ];
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/modules/AddLLVM.cmake \
+      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
+      --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
+  ''
+  # Patch llvm-config to return correct library path based on --link-{shared,static}.
+  + stdenv.lib.optionalString (enableSharedLibraries) ''
+    substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+    patch -p1 < ./llvm-outputs.patch
+  '' + ''
+    # FileSystem permissions tests fail with various special bits
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "Path.cpp" ""
+    rm unittests/Support/Path.cpp
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -i ${../TLI-musl.patch}
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "add_subdirectory(DynamicLibrary)" ""
+    rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+  '';
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+    "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
+
+    "-DLLVM_ENABLE_DUMP=ON"
+  ]
+  ++ stdenv.lib.optional enableSharedLibraries
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ++ stdenv.lib.optionals enableManpages [
+    "-DLLVM_BUILD_DOCS=ON"
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  ]
+  ++ stdenv.lib.optional (!isDarwin)
+    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+  ++ stdenv.lib.optionals (isDarwin) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DCAN_TARGET_i386=false"
+  ]
+  ++ stdenv.lib.optional enableWasm
+   "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
+  ;
+
+  postBuild = ''
+    rm -fR $out
+
+    paxmark m bin/{lli,llvm-rtdyld}
+    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+    paxmark m unittests/ExecutionEngine/Orc/OrcJITTests
+    paxmark m unittests/Support/SupportTests
+    paxmark m bin/lli-child-target
+  '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+  '';
+
+  postInstall = ''
+    mkdir -p $python/share
+    mv $out/share/opt-viewer $python/share/opt-viewer
+  ''
+  + stdenv.lib.optionalString enableSharedLibraries ''
+    moveToOutput "lib/libLLVM-*" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+  ''
+  + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+  '';
+
+  doCheck = stdenv.isLinux && (!stdenv.isi686);
+
+  checkTarget = "check-all";
+
+  enableParallelBuilding = true;
+
+  passthru.src = src;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+} // stdenv.lib.optionalAttrs enableManpages {
+  name = "llvm-manpages-${version}";
+
+  buildPhase = ''
+    make docs-llvm-man
+  '';
+
+  propagatedBuildInputs = [];
+
+  installPhase = ''
+    make -C docs install
+  '';
+
+  outputs = [ "out" ];
+
+  doCheck = false;
+
+  meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
new file mode 100644
index 000000000000..a1d4a72e2687
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "openmp-${version}";
+
+  src = fetch "openmp" "198iljq5hhm5rxfzslzbi73sq80jlwfr24a3khdk32lghdj2skdw";
+
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [ llvm ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Components required to build an executable OpenMP program";
+    homepage    = http://openmp.llvm.org/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
new file mode 100644
index 000000000000..6266eb1958d1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
@@ -0,0 +1,413 @@
+From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 29 Jun 2018 09:48:59 -0500
+Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                        |  4 +-
+ lib/interception/interception_linux.cc        |  2 +-
+ lib/interception/interception_linux.h         |  3 +-
+ lib/msan/msan_linux.cc                        |  2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc   |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc   |  4 +-
+ .../sanitizer_common_syscalls.inc             |  2 +-
+ lib/sanitizer_common/sanitizer_linux.cc       |  8 +++-
+ .../sanitizer_linux_libcdep.cc                | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h     |  6 +++
+ .../sanitizer_platform_interceptors.h         |  4 +-
+ .../sanitizer_platform_limits_posix.cc        | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc           |  2 +-
+ 13 files changed, 51 insertions(+), 35 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include <link.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index c991550a4..2b706418b 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+ 
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 98fe51b85..c13302b98 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & (func),                                   \
+       (::__interception::uptr) & WRAP(func))
+ 
+-// Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 4e6321fcb..4d50feb82 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+ 
+ #include "msan.h"
+ #include "msan_thread.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index fc4f7a75a..76cf4f769 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -23,7 +23,7 @@ namespace __sanitizer {
+ 
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ #  if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 24e7548a5..20259b1d6 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 6c83e8db4..542c4fe64 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU
+ extern "C" {
+   SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+ 
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+                                    int arr_size) {
+   char *buff;
+@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+   *argv = __ps_strings->ps_argvstr;
+   *argv = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++    static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++    ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++    ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else
+ #if !SANITIZER_GO
+   if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 56fdfc870..a932d5db1 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+ }
+ 
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+-    !SANITIZER_NETBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -207,7 +207,7 @@ void InitTlsSize() { }
+ 
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
+     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
+-    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
++    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t kThreadDescriptorSize;
+ 
+@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
+       *addr = (uptr)tcb->tcb_dtv[1];
+     }
+   }
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+-    SANITIZER_SOLARIS
++    SANITIZER_SOLARIS || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index 334903c26..fc2afac2c 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -195,6 +195,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ // By default we allow to use SizeClassAllocator64 on 64-bit platform.
+ // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
+ // does not work well and we need to fallback to SizeClassAllocator32.
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index b99ac4480..628d226a1 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -38,7 +38,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -291,7 +291,7 @@
+   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL                       \
+-  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+                  SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index feb7bad6f..4e89ab2a6 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+   // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
+ CHECK_SIZE_AND_OFFSET(dirent, d_ino);
+@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index e14d5f575..389a3bc88 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -285,7 +285,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.18.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ecd69cc0aa7..dacfc95d82ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6381,6 +6381,7 @@ with pkgs;
     };
   };
 
+  clang_7  = llvmPackages_7.clang;
   clang_6  = llvmPackages_6.clang;
   clang_5  = llvmPackages_5.clang;
   clang_4  = llvmPackages_4.clang;
@@ -6978,15 +6979,18 @@ with pkgs;
   lld_4 = llvmPackages_4.lld;
   lld_5 = llvmPackages_5.lld;
   lld_6 = llvmPackages_6.lld;
+  lld_7 = llvmPackages_7.lld;
 
   lldb = llvmPackages.lldb;
   lldb_4 = llvmPackages_4.lldb;
   lldb_5 = llvmPackages_5.lldb;
   lldb_6 = llvmPackages_6.lldb;
+  lldb_7 = llvmPackages_7.lldb;
 
   llvm = llvmPackages.llvm;
   llvm-manpages = llvmPackages.llvm-manpages;
 
+  llvm_7  = llvmPackages_7.llvm;
   llvm_6  = llvmPackages_6.llvm;
   llvm_5  = llvmPackages_5.llvm;
   llvm_4  = llvmPackages_4.llvm;
@@ -7051,6 +7055,14 @@ with pkgs;
     stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
+  llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({
+    inherit (stdenvAdapters) overrideCC;
+    buildLlvmTools = buildPackages.llvmPackages_7.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
+  } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  });
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (

From b7692f5be5ac9d08dbf6575b8e8678037678ca14 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 14:35:21 -0500
Subject: [PATCH 1570/3253] llvm7: patch test shebang (otherwise test fails)

---
 pkgs/development/compilers/llvm/7/llvm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 327647a7e72a..ea0a520dbd67 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -59,6 +59,8 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+  '' + ''
+    patchShebangs test/BugPoint/compile-custom.ll.py
   '';
 
   # hacky fix: created binaries need to be run before installation

From 38699890d6622debd4a18ab1d557cb162f0edbf7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 14:45:39 -0500
Subject: [PATCH 1571/3253] llvm-manpages: fix build by removing references to
 $lib output

---
 pkgs/development/compilers/llvm/7/llvm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index ea0a520dbd67..053d0372507d 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -160,6 +160,9 @@ in stdenv.mkDerivation (rec {
     make -C docs install
   '';
 
+  postPatch = null;
+  postInstall = null;
+
   outputs = [ "out" ];
 
   doCheck = false;

From ba701ef3297b5af3673df2d4d6a1b187a1e08930 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 14:52:17 -0500
Subject: [PATCH 1572/3253] comment

---
 pkgs/development/compilers/llvm/7/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 2526f1ab17e7..ba0ad884bbd0 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -9,7 +9,7 @@ let
   version = release_version + "rc3"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    name = "${name}-${release_version}.src.tar.xz";
+    name = "${name}-${release_version}.src.tar.xz"; # Hopefully yields same hash with final release
     url = "http://prereleases.llvm.org/${release_version}/rc3/${name}-${version}.src.tar.xz";
     inherit sha256;
   };

From 621fd23cb5961ffe2c6b7f2f23ae0f35187c50c5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 15:00:39 -0500
Subject: [PATCH 1573/3253] compiler-rt: quickfix codesign patch by dropping
 hunks 'already applied'

Quite possibly this is not right.
---
 .../llvm/7/compiler-rt-codesign.patch         | 122 ------------------
 1 file changed, 122 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
index 8f4c76bca1eb..3cc12b94b200 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
+++ b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
@@ -29,127 +29,5 @@ index bc5fb9ff7..b64eb4246 100644
      endif()
      install(TARGETS ${libname}
        ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
-diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt
-index 8bfc15b5c..f23d0f71a 100644
---- a/test/asan/CMakeLists.txt
-+++ b/test/asan/CMakeLists.txt
-@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH})
-   endif()
- endforeach()
- 
--# iOS and iOS simulator test suites
--# These are not added into "check-all", in order to run these tests, use
--# "check-asan-iossim-x86_64" and similar. They also require that an extra env
--# variable to select which iOS device or simulator to use, e.g.:
--# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
--if(APPLE)
--  set(EXCLUDE_FROM_ALL ON)
--
--  set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
--  set(ASAN_TEST_IOS "1")
--  pythonize_bool(ASAN_TEST_IOS)
--  set(ASAN_TEST_DYNAMIC True)
--
--  foreach(arch ${DARWIN_iossim_ARCHS})
--    set(ASAN_TEST_IOSSIM "1")
--    pythonize_bool(ASAN_TEST_IOSSIM)
--    set(ASAN_TEST_TARGET_ARCH ${arch})
--    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
--    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
--    get_bits_for_arch(${arch} ASAN_TEST_BITS)
--    string(TOUPPER ${arch} ARCH_UPPER_CASE)
--    set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
--    configure_lit_site_cfg(
--      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
--      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
--      )
--    add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests"
--      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
--      DEPENDS ${ASAN_TEST_DEPS})
--  endforeach()
--
--  foreach (arch ${DARWIN_ios_ARCHS})
--    set(ASAN_TEST_IOSSIM "0")
--    pythonize_bool(ASAN_TEST_IOSSIM)
--    set(ASAN_TEST_TARGET_ARCH ${arch})
--    set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
--    set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
--    get_bits_for_arch(${arch} ASAN_TEST_BITS)
--    string(TOUPPER ${arch} ARCH_UPPER_CASE)
--    set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
--    configure_lit_site_cfg(
--      ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
--      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
--      )
--    add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests"
--      ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
--      DEPENDS ${ASAN_TEST_DEPS})
--  endforeach()
--
--  set(EXCLUDE_FROM_ALL OFF)
--endif()
--
- # Add unit tests.
- if(COMPILER_RT_INCLUDE_TESTS)
-   set(ASAN_TEST_DYNAMIC False)
-diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt
-index a68908612..cde0accb5 100644
---- a/test/tsan/CMakeLists.txt
-+++ b/test/tsan/CMakeLists.txt
-@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH})
-   list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
- endforeach()
- 
--# iOS and iOS simulator test suites
--# These are not added into "check-all", in order to run these tests, use
--# "check-tsan-iossim-x86_64" and similar. They also require an extra environment
--# variable to select which iOS device or simulator to use, e.g.:
--# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6"
--if(APPLE)
--  set(EXCLUDE_FROM_ALL ON)
--
--  set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER})
--  set(TSAN_TEST_IOS "1")
--  pythonize_bool(TSAN_TEST_IOS)
--
--  set(arch "x86_64")
--  set(TSAN_TEST_IOSSIM "1")
--  pythonize_bool(TSAN_TEST_IOSSIM)
--  set(TSAN_TEST_TARGET_ARCH ${arch})
--  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
--  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim")
--  string(TOUPPER ${arch} ARCH_UPPER_CASE)
--  set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config")
--  configure_lit_site_cfg(
--    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
--    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
--    )
--  add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
--    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
--    DEPENDS ${TSAN_TEST_DEPS})
--
--  set(arch "arm64")
--  set(TSAN_TEST_IOSSIM "0")
--  pythonize_bool(TSAN_TEST_IOSSIM)
--  set(TSAN_TEST_TARGET_ARCH ${arch})
--  set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}")
--  set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios")
--  string(TOUPPER ${arch} ARCH_UPPER_CASE)
--  set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config")
--  configure_lit_site_cfg(
--    ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
--    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg
--    )
--  add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests"
--    ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/
--    DEPENDS ${TSAN_TEST_DEPS})
--
--  set(EXCLUDE_FROM_ALL OFF)
--endif()
--
- if(COMPILER_RT_INCLUDE_TESTS)
-   configure_lit_site_cfg(
-     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
--- 
 2.14.1
 

From 0c459474f97575e9ecb0523903e4838244b424f5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 18 Sep 2018 15:33:32 -0500
Subject: [PATCH 1574/3253] tests: add variants for llvm7

---
 pkgs/test/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 774077949b25..24255f3f6555 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -17,6 +17,8 @@ with pkgs;
   cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
   cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; };
   cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
+  cc-wrapper-clang-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.stdenv; };
+  cc-wrapper-libcxx-7 = callPackage ./cc-wrapper { stdenv = llvmPackages_7.libcxxStdenv; };
   stdenv-inputs = callPackage ./stdenv-inputs { };
 
   cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };

From fca31e1a68486089e325175f9177a3d00b3e3974 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 07:43:33 -0500
Subject: [PATCH 1575/3253] llvm7: use final release tarballs now that they're
 available

---
 pkgs/development/compilers/llvm/7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index ba0ad884bbd0..7f98ab701425 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -6,11 +6,11 @@
 
 let
   release_version = "7.0.0";
-  version = release_version + "rc3"; # differentiating these is important for rc's
+  version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
     name = "${name}-${release_version}.src.tar.xz"; # Hopefully yields same hash with final release
-    url = "http://prereleases.llvm.org/${release_version}/rc3/${name}-${version}.src.tar.xz";
+    url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 

From 0920652c5c97e1646388d501af2a9a1c16ce9a65 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 08:00:23 -0500
Subject: [PATCH 1576/3253] llvm7: update hashes, they did change after all.

Pretty sure they did last time too :).
---
 pkgs/development/compilers/llvm/7/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/7/compiler-rt.nix    | 2 +-
 pkgs/development/compilers/llvm/7/default.nix        | 3 +--
 pkgs/development/compilers/llvm/7/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/7/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/7/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/7/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/7/llvm.nix           | 2 +-
 pkgs/development/compilers/llvm/7/openmp.nix         | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index 2dbf5bd8a8e1..e1f4eb303603 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "18aapi26lp25g38j1kwmzviagy9l59ach5kzvf80x5dvs2rmhcpc"}
+      unpackFile ${fetch "cfe" "0mdsbgj3p7mayhzm8hclzl3i46r2lwa8fr1cz399f9km3iqi40jm"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index fe83d8675854..ec739d22dd7a 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -3,7 +3,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "compiler-rt-${version}";
   inherit version;
-  src = fetch "compiler-rt" "0r4hg8hi60kdjl4arp3s51dbwbwz11s8qvccdkx9v52vc27p2241";
+  src = fetch "compiler-rt" "1mkhqvs8cxbfmprkzwyq7lmnzr1sv45znzf0arbgb19crzipzv5x";
 
   nativeBuildInputs = [ cmake python llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 7f98ab701425..9328d830edf4 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -9,12 +9,11 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    name = "${name}-${release_version}.src.tar.xz"; # Hopefully yields same hash with final release
     url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "0rhvlz4g2nd10zrwx37yi5if8wqirh8845pwbgg62r9l2pb6j7n7";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1glxl7bnr4k3j16s8xy8r9cl0llyg524f50591g1ig23ij65lz4k";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 01ee8b4c60c2..992794f38e54 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "1ylw8sdiy7b9siajm88frw95y8ii1kng3xbsqhn8nmhy0yxwd1p5";
+  src = fetch "libcxx" "1w1l472p03csgz76p70pn9yk7h0nw5hj1av44ysnakigp8jjcd4v";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index eb7237598bd5..7dbda6c365e0 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1ry0v4sd91gg06kqkhqcnbwbd5v1yknbpm0gj39lq8y3d7lwn7np";
+  src = fetch "libcxxabi" "0pr4xfx61r5mwmvhg4j9pb6df6vvha1gyf6rwkm14x9rzxcwficv";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
index db778d2d2a72..f6ce768d6484 100644
--- a/pkgs/development/compilers/llvm/7/lld.nix
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "10p8yqikpsx1hvs524dj6fk7hg267bhs6860xngk33130s9s05id";
+  src = fetch "lld" "173z50vx5mlsaiqmbz7asxy2297z4xivrfxrdfncvx23wp2lgkzv";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
index b8206ca3feff..6c3f0699978f 100644
--- a/pkgs/development/compilers/llvm/7/lldb.nix
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1s2jiaq85nzbab3nj4msfw3zxkdwinq71p1d7h70z26q3caddngp";
+  src = fetch "lldb" "0cmah36ybyfws0z2ikq9fqn5k4kvjci7vgk97ddx4xwrwkzdixkz";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 053d0372507d..ef39dd9e918a 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -16,7 +16,7 @@
 }:
 
 let
-  src = fetch "llvm" "0r28srr8i0qcx8csblzg1g59wv4q8qc9c9msdm2xfsfggj2sknqa";
+  src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
index a1d4a72e2687..31059b7c4c04 100644
--- a/pkgs/development/compilers/llvm/7/openmp.nix
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "198iljq5hhm5rxfzslzbi73sq80jlwfr24a3khdk32lghdj2skdw";
+  src = fetch "openmp" "1zrqlaxr954sp8lcr7g8m0z0pr8xyq4i6p11x6gcamjm5xijnrih";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From 167e799d81de43b51bf05d8b8e0a7ddac8e06202 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 08:02:21 -0500
Subject: [PATCH 1577/3253] llvm*: http -> https, prefer releases.llvm.org

---
 pkgs/development/compilers/llvm/3.5/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.7/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.8/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.9/default.nix | 2 +-
 pkgs/development/compilers/llvm/5/default.nix   | 2 +-
 pkgs/development/compilers/llvm/6/default.nix   | 2 +-
 pkgs/development/compilers/llvm/7/default.nix   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix
index f588eb4407b5..b87fa747f145 100644
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/default.nix
@@ -6,7 +6,7 @@ let
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+    url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index f176894dedb9..3c557711449f 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -9,7 +9,7 @@ let
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+    url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 99869e6e80a7..a848c8b9252b 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -8,7 +8,7 @@ let
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+    url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 01c08f4bd209..752790cdd853 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -8,7 +8,7 @@ let
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz";
+    url = "https://releases.llvm.org/${version}/${name}-${ver}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 38d2b0d461d4..68ee80fa7a62 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -9,7 +9,7 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 831e4b65344c..5ee551f6b6b1 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -9,7 +9,7 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 9328d830edf4..5446f1b362a9 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -9,7 +9,7 @@ let
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+    url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 

From e3030a2908ca212dd9e6307695effb8bbcaf23af Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Sep 2018 08:36:40 -0500
Subject: [PATCH 1578/3253] libc++7: prefer 'optional' as suggested by comment

---
 pkgs/development/compilers/llvm/7/libc++/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 992794f38e54..76bfb34975e6 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -10,11 +10,7 @@ stdenv.mkDerivation rec {
     export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
   '';
 
-  # on next rebuild, this can be replaced with optionals; for now set to null to avoid
-  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-  patches = if stdenv.hostPlatform.isMusl then [
-    ../../libcxx-0001-musl-hacks.patch
-  ] else null;
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
 
   prePatch = ''
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"

From b3645d74d1ec4bd88c521376aca59e9cab0093ef Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 19:42:44 -0500
Subject: [PATCH 1579/3253] llvm7: only use 1 number in version suffix,
 upstream changed

See llvm 2a6cf85828509e89e18739e5f4b9a958820d66d4
---
 pkgs/development/compilers/llvm/7/llvm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index ef39dd9e918a..4f540d23c9e4 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -20,7 +20,7 @@ let
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
-    concatStringsSep "." (take 2 (splitString "." release_version));
+    concatStringsSep "." (take 1 (splitString "." release_version));
 in stdenv.mkDerivation (rec {
   name = "llvm-${version}";
 

From 9fe245d7e05f44d42156d3f557d257e17d3ac4f0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 20 Sep 2018 19:53:59 -0500
Subject: [PATCH 1580/3253] llvm7: optionally use libpfm (exegesis), default
 off w/darwin

---
 pkgs/development/compilers/llvm/7/llvm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 4f540d23c9e4..67bde813feed 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -4,6 +4,7 @@
 , python
 , libffi
 , libbfd
+, libpfm
 , libxml2
 , ncurses
 , version
@@ -13,6 +14,7 @@
 , enableManpages ? false
 , enableSharedLibraries ? true
 , enableWasm ? true
+, enablePFM ? !stdenv.isDarwin
 }:
 
 let
@@ -36,7 +38,8 @@ in stdenv.mkDerivation (rec {
   nativeBuildInputs = [ cmake python ]
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-  buildInputs = [ libxml2 libffi ];
+  buildInputs = [ libxml2 libffi ]
+    ++ stdenv.lib.optional enablePFM libpfm; # exegesis
 
   propagatedBuildInputs = [ ncurses zlib ];
 

From 6371a6e10b884e9b02b466667a2728aebc41d715 Mon Sep 17 00:00:00 2001
From: Joakim Pettersvold <joakim@joakim-nixos.mshome.net>
Date: Sun, 23 Sep 2018 20:26:30 +0200
Subject: [PATCH 1581/3253] quodlibet: add glib-networking dep Added
 glib-networking as dependency so that quodlibet can securely connect to audio
 streams

---
 pkgs/applications/audio/quodlibet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index f1a22bd839a0..baf49ff78e59 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
-  tag ? "", xvfb_run, dbus, glibcLocales, glib, gobjectIntrospection,
+  tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobjectIntrospection,
   gst_all_1, withGstPlugins ? true,
   xineBackend ? false, xineLib,
   withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
 
   checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
 
-  buildInputs = [ gnome3.defaultIconTheme libsoup glib gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ]
+  buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobjectIntrospection ]
     ++ (if xineBackend then [ xineLib ] else with gst_all_1;
     [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
 

From 611cc31aa4b7aa4ab40c59a442fc7fe5c173db9d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 23 Sep 2018 00:06:34 -0500
Subject: [PATCH 1582/3253] kde: add kdoctools to default environment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

khelpcenter needs meinproc5 to work properly. Hopefully doesn’t effect
closure sizes too much - kdoctools is rather small.

Fixes #46539

/cc @ttuegel
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d1cb962f6ff8..e759f69db897 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -81,6 +81,7 @@ in
           kconfig
           kconfigwidgets
           kcoreaddons
+          kdoctools
           kdbusaddons
           kdeclarative
           kded

From 095ef623d917f3bbd3e560e8ff9f2a6e953fa7ca Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Sep 2018 14:32:25 -0500
Subject: [PATCH 1583/3253] Revert "Revert "Merge #42880: coreutils: 8.29 ->
 8.30""

This reverts commit e3ee9c098a64deb30e8d9edb180e613b93046f45.
---
 pkgs/tools/misc/coreutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 3d1c7145698c..582f8d8f05f9 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -16,11 +16,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "coreutils-8.29";
+  name = "coreutils-8.30";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j";
+    sha256 = "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8";
   };
 
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
     sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
     sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
+    sed '2i print "Skipping env -S test";  exit 0;' -i ./tests/misc/env-S.pl
     substituteInPlace ./tests/install/install-C.sh \
       --replace 'mode3=2755' 'mode3=1755'
   '';

From 4d9f9f171b776ede7765aabb4cd4ae588f9fbf68 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Sep 2018 14:54:09 -0500
Subject: [PATCH 1584/3253] make-bootstrap-tools: fix with latest coreutils

Since gcc.lib/lib64 is a symlink to 'lib', the use of
"lib*/libgcc_s.so*" triggered a warning (error) with
the latest coreutils.  Essentially we were doing:

$ cp a/x b/x y/

And latest coreutils rejects such invocations.

Just copy from 'lib', lib64 is a link to it anyway.

* Nothing else in this file bothers looking at lib*
* AFAICT lib* only ever possibly matched lib64 anyway
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 4fc9999b538c..59ded9d81108 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,8 +112,8 @@ in with pkgs; rec {
         cp -d ${gcc.cc.out}/bin/gcc $out/bin
         cp -d ${gcc.cc.out}/bin/cpp $out/bin
         cp -d ${gcc.cc.out}/bin/g++ $out/bin
-        cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib
-        cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib
+        cp -d ${gcc.cc.lib}/lib/libgcc_s.so* $out/lib
+        cp -d ${gcc.cc.lib}/lib/libstdc++.so* $out/lib
         cp -rd ${gcc.cc.out}/lib/gcc $out/lib
         chmod -R u+w $out/lib
         rm -f $out/lib/gcc/*/*/include*/linux

From ff6122c9934712c6c7f2c7e21dba85517967dae7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 23 Sep 2018 21:54:25 +0200
Subject: [PATCH 1585/3253] haskellPackages.Frames: fix build by using
 vinyl-0.10.0

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 64a82ed42a87..ec0a3cf34e56 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1136,4 +1136,7 @@ self: super: {
     sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
   });
 
+  # Can be removed once vinyl >= 0.10 is in the LTS.
+  Frames = super.Frames.override { vinyl = super.vinyl_0_10_0; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 73cf1c26d836f8c453ab3a4c9d33046be8c1a189 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 23 Sep 2018 21:57:17 +0200
Subject: [PATCH 1586/3253] haskellPackages.Frames-beam: disable tests because
 it requires a running PostgreSQL server

---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c3df7d38bfd0..43ba2d000eb5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -517,4 +517,7 @@ self: super: builtins.intersectAttrs super {
     postPatch = ''
       sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
   });
+
+  # The test-suite requires a running PostgreSQL server.
+  Frames-beam = dontCheck super.Frames-beam;
 }

From 44fba6df79bde4974694e6189698cff8c590afb5 Mon Sep 17 00:00:00 2001
From: danme <danme@users.noreply.github.com>
Date: Wed, 12 Sep 2018 02:13:14 +0200
Subject: [PATCH 1587/3253] nvidia-x11: Fix vulkan VK_KHR_xcb_surface

Fixes the issue: https://github.com/NixOS/nixpkgs/issues/39149

Problem was that the Nvidia driver did not find the libxcb-glx at runtime.

(cherry picked from commit bda072cafcef4cf5ff99828852ddc8e06ce1fdbf)
---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 06125787a588..090fce3a485c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -62,7 +62,7 @@ let
     dontStrip = true;
     dontPatchELF = true;
 
-    libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ];
+    libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ];
 
     nativeBuildInputs = [ perl nukeReferences ]
       ++ optionals (!libsOnly) kernel.moduleBuildDependencies;

From 7c74bc002f05898a55662763e4c187eb8974cf8b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Sep 2018 15:18:59 -0500
Subject: [PATCH 1588/3253] 19.03: fix section id

---
 nixos/doc/manual/release-notes/rl-1903.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index bfae2d0f5974..8c8237e6371e 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -46,7 +46,7 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-18.09-incompatibilities">
+         xml:id="sec-release-19.03-incompatibilities">
   <title>Backward Incompatibilities</title>
 
   <para>

From 843d056bc5df44761e75dfdd7024737749994e5b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 23 Sep 2018 16:31:54 -0400
Subject: [PATCH 1589/3253] solargraph: 0.27.1 -> 0.28.1 (#47242)

---
 pkgs/development/ruby-modules/solargraph/Gemfile.lock | 2 +-
 pkgs/development/ruby-modules/solargraph/gemset.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index 436d31830ff4..04d274d05621 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    solargraph (0.27.1)
+    solargraph (0.28.1)
       coderay (~> 1.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 840cf922419b..3319f2a68de5 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -127,10 +127,10 @@
     dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wp4k6ayv9gv1rzxqccz6zb1fss7klszqwha9wvs6mj3c1vhghac";
+      sha256 = "11l759mrzjla2iqy5wdd20r01196pfxkw0b0gzgskdbfi8y8mvg5";
       type = "gem";
     };
-    version = "0.27.1";
+    version = "0.28.1";
   };
   thor = {
     source = {

From 58a97dfb491be6ae92499c3f819440f281d826a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 23 Sep 2018 14:45:32 +0100
Subject: [PATCH 1590/3253] autoPatchelfHook: do not patch statically linked
 files

Also speed up quite significantly due less forking.
---
 .../setup-hooks/auto-patchelf.sh              | 25 ++++++-------------
 pkgs/top-level/all-packages.nix               |  3 +--
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 32fdb1000e27..94ea3e4e98e3 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -7,21 +7,7 @@ gatherLibraries() {
 addEnvHooks "$targetOffset" gatherLibraries
 
 isExecutable() {
-    [ "$(file -b -N --mime-type "$1")" = application/x-executable ]
-}
-
-findElfs() {
-    find "$1" -type f -exec "$SHELL" -c '
-        while [ -n "$1" ]; do
-            mimeType="$(file -b -N --mime-type "$1")"
-            if [ "$mimeType" = application/x-executable \
-              -o "$mimeType" = application/x-pie-executable \
-              -o "$mimeType" = application/x-sharedlib ]; then
-                echo "$1"
-            fi
-            shift
-        done
-    ' -- {} +
+    readelf -h "$1" | grep -q '^ *Type: *EXEC\>'
 }
 
 # We cache dependencies so that we don't need to search through all of them on
@@ -167,9 +153,12 @@ autoPatchelf() {
     # findDependency outside of this, the dependency cache needs to be rebuilt
     # from scratch, so keep this in mind if you want to run findDependency
     # outside of this function.
-    findElfs "$prefix" | while read -r elffile; do
-        autoPatchelfFile "$elffile"
-    done
+    while IFS= read -r -d $'\0' file; do
+      isELF "$file" || continue
+      # dynamically linked?
+      readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
+      autoPatchelfFile "$file"
+    done < <(find "$prefix" -type f -print0)
 }
 
 # XXX: This should ultimately use fixupOutputHooks but we currently don't have
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae19c6d650de..76564b38c01d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -81,8 +81,7 @@ with pkgs;
     { deps = [ autoconf264 automake111x gettext libtool ]; }
     ../build-support/setup-hooks/autoreconf.sh;
 
-  autoPatchelfHook = makeSetupHook
-    { name = "auto-patchelf-hook"; deps = [ file ]; }
+  autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; }
     ../build-support/setup-hooks/auto-patchelf.sh;
 
   ensureNewerSourcesHook = { year }: makeSetupHook {}

From 965836aada6ed0ad2ece172ee7e8a094653484cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Sep 2018 13:36:37 -0700
Subject: [PATCH 1591/3253] mwic: 0.7.5 -> 0.7.6 (#46995)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mwic/versions
---
 pkgs/applications/misc/mwic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 67e6ed3fa9ce..15904ab7c0ab 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.5";
+  version = "0.7.6";
   name = "mwic-${version}";
 
   src = fetchurl {
     url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc";
+    sha256 = "0dl56979i54hrmz5l27c4q1f7jd1bpkmi7sm86946dagi4l1ns3i";
   };
 
   makeFlags=["PREFIX=\${out}"];

From 90a587622bad8ac1c699f2c2fb44881a42eb7bb5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Sep 2018 13:38:33 -0700
Subject: [PATCH 1592/3253] libmediainfo: 18.08 -> 18.08.1 (#47030)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libmediainfo/versions
---
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index c4f41663c848..1ef2c6914ae4 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.08";
+  version = "18.08.1";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8";
+    sha256 = "1h6brg98i39xprcl54gvs1scmv8d6f3iw5h2diwz5bbz4lspy8vs";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 540e9726b3fad06f73433224d6010cf7734beb80 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 23 Sep 2018 20:38:56 +0000
Subject: [PATCH 1593/3253] agedu: 20180522.5b12791 -> 20180918.80c7beb
 (#47231)

---
 pkgs/tools/misc/agedu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix
index 2f9615a1fdbb..d0254e9ce9f5 100644
--- a/pkgs/tools/misc/agedu/default.nix
+++ b/pkgs/tools/misc/agedu/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, autoreconfHook, halibut}:
 let
-  date = "20180522";
-  rev = "5b12791";
+  date = "20180918";
+  rev = "80c7beb";
 in
 stdenv.mkDerivation {
   name = "agedu-${date}.${rev}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = https://git.tartarus.org/simon/agedu.git;
     inherit rev;
-    sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q";
+    sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd";
   };
 
   nativeBuildInputs = [autoreconfHook halibut];

From 5ad7aedf63fd7111699b92c2ea5546027e22d35a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Sep 2018 22:39:21 +0200
Subject: [PATCH 1594/3253] pythonPackages.pyftgl: fix build (#47232)

See https://hydra.nixos.org/build/80705583

Recent `boost` versions with `python` enabled have changed their naming
scheme for `boost_python` shared objects which causes issues with the
proper linking when building `pyftgl`.

Previously the library was named `boost_python3`, no it's named
`boost_python36` for current python (3.6.x).

The same issue applies for the `python2`.

Addresses #45960
---
 .../python-modules/pyftgl/default.nix          | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix
index a85837472255..1163f007b092 100644
--- a/pkgs/development/python-modules/pyftgl/default.nix
+++ b/pkgs/development/python-modules/pyftgl/default.nix
@@ -1,5 +1,13 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k
-, boost, freetype, ftgl, libGLU_combined }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, boost, freetype, ftgl, libGLU_combined
+, python
+}:
+
+let
+
+  pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
+
+in
 
 buildPythonPackage rec {
   pname = "pyftgl";
@@ -13,13 +21,13 @@ buildPythonPackage rec {
     sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r";
   };
 
-  postPatch = stdenv.lib.optional isPy3k ''
-    sed -i "s,'boost_python','boost_python3',g" setup.py
+  postPatch = ''
+    sed -i "s,'boost_python','boost_python${pythonVersion}',g" setup.py
   '';
 
   buildInputs = [ boost freetype ftgl libGLU_combined ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Python bindings for FTGL (FreeType for OpenGL)";
     license = licenses.gpl2Plus;
   };

From cd1b9d93e6466d7238d37ee9feb571224cb37fef Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 23 Sep 2018 16:40:29 -0400
Subject: [PATCH 1595/3253] pyjet: init at 1.3.0 (#47243)

---
 .../python-modules/pyjet/default.nix          | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyjet/default.nix

diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix
new file mode 100644
index 000000000000..69d20863a772
--- /dev/null
+++ b/pkgs/development/python-modules/pyjet/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, nose, numpy }:
+
+buildPythonPackage rec {
+  pname = "pyjet";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1glcwv9ni8i40smfw6m456xjadlkackim5nk33xmas1fa96lpagg";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+  checkInputs = [ nose ];
+
+  meta = with lib; {
+    homepage = "https://github.com/scikit-hep/pyjet";
+    description = "The interface between FastJet and NumPy";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df28860accff..0354bdda6ef6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1841,6 +1841,8 @@ in {
 
   pyjade = callPackage ../development/python-modules/pyjade {};
 
+  pyjet = callPackage ../development/python-modules/pyjet {};
+
   PyLD = callPackage ../development/python-modules/PyLD { };
 
   python-jose = callPackage ../development/python-modules/python-jose {};

From 8346ddd9b63cb4c5a864f8dd272ba4a8dd24ed7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Sep 2018 13:42:47 -0700
Subject: [PATCH 1596/3253] mono-addins: 1.2 -> 1.3.3 (#46999)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mono-addins/versions
---
 pkgs/development/libraries/mono-addins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index 780f68e7d485..345c6e51f0b7 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "mono-addins-${version}";
-  version = "1.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "mono";
     repo = "mono-addins";
 
     rev = "mono-addins-${version}";
-    sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y";
+    sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From fe744d3fb1d61e6f7f7c2f40217364f9577390ca Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:17:44 +0000
Subject: [PATCH 1597/3253] nixos: doc: rename `manual` to `manualHTML`,
 cleanup references

Because when I see "config.system.build.manual.manual" after I forgot
what it means I ask "Why do I need that second `.manual` there again?".
Doesn't happen with `config.system.build.manual.manualHTML`.
---
 nixos/doc/manual/default.nix                              | 7 ++++++-
 nixos/doc/manual/development/building-parts.xml           | 2 +-
 .../installer/cd-dvd/installation-cd-graphical-kde.nix    | 2 +-
 nixos/modules/services/misc/nixos-manual.nix              | 8 +++-----
 nixos/release.nix                                         | 3 ++-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index aaa6e0da545f..faae4f205443 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -252,7 +252,7 @@ in rec {
     ''; # */
 
   # Generate the NixOS manual.
-  manual = runCommand "nixos-manual"
+  manualHTML = runCommand "nixos-manual-html"
     { inherit sources;
       nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       meta.description = "The NixOS manual in HTML format";
@@ -281,6 +281,11 @@ in rec {
       echo "doc manual $dst" >> $out/nix-support/hydra-build-products
     ''; # */
 
+  # Alias for backward compatibility. TODO(@oxij): remove eventually.
+  manual = manualHTML;
+
+  # Index page of the NixOS manual.
+  manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html";
 
   manualEpub = runCommand "nixos-manual-epub"
     { inherit sources;
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index eaffc0ef47c2..b4791b72970f 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -34,7 +34,7 @@ $ nix-build -A system</screen>
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>system.build.manual.manual</varname>
+     <varname>system.build.manual.manualHTML</varname>
     </term>
     <listitem>
      <para>
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index f71ed46c7e9e..1c3c9cb30b41 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -30,7 +30,7 @@ with lib;
       Version=1.0
       Type=Application
       Name=NixOS Manual
-      Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
+      Exec=firefox ${config.system.build.manual.manualHTMLIndex}
       Icon=text-html
     '';
 
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 993b59590bb0..37705e2a889c 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -39,8 +39,6 @@ let
       in scrubbedEval.options;
   };
 
-  entry = "${manual.manual}/share/doc/nixos/index.html";
-
   helpScript = pkgs.writeScriptBin "nixos-help"
     ''
       #! ${pkgs.runtimeShell} -e
@@ -61,7 +59,7 @@ let
           fi
         fi
       fi
-      exec "$browser" ${entry}
+      exec "$browser" ${manual.manualHTMLIndex}
     '';
 
   desktopItem = pkgs.makeDesktopItem {
@@ -121,7 +119,7 @@ in
     environment.systemPackages = []
       ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]
       ++ optional  config.documentation.man.enable manual.manpages
-      ++ optionals config.documentation.doc.enable [ manual.manual helpScript ];
+      ++ optionals config.documentation.doc.enable [ manual.manualHTML helpScript ];
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];
 
@@ -130,7 +128,7 @@ in
         { description = "NixOS Manual";
           wantedBy = [ "multi-user.target" ];
           serviceConfig =
-            { ExecStart = "${cfg.browser} ${entry}";
+            { ExecStart = "${cfg.browser} ${manual.manualHTMLIndex}";
               StandardInput = "tty";
               StandardOutput = "tty";
               TTYPath = "/dev/tty${toString cfg.ttyNumber}";
diff --git a/nixos/release.nix b/nixos/release.nix
index 14983edb0ce7..cce2c54f02bf 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -128,7 +128,8 @@ in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual);
+  manualHTML = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualHTML);
+  manual = manualHTML; # TODO(@oxij): remove eventually
   manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub));
   manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages);
   manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources);

From 9b67908e6799aeb1665f6424f2c3df5352d22aa0 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 23 Sep 2018 22:48:27 +0200
Subject: [PATCH 1598/3253] haskellPackages.Euterpea: fix build by using
 PortMidi == 0.2

---
 .../haskell-modules/configuration-common.nix           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ec0a3cf34e56..ef4e6c8b4254 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1139,4 +1139,14 @@ self: super: {
   # Can be removed once vinyl >= 0.10 is in the LTS.
   Frames = super.Frames.override { vinyl = super.vinyl_0_10_0; };
 
+  # https://github.com/Euterpea/Euterpea2/pull/22
+  Euterpea = overrideSrc super.Euterpea {
+    src = pkgs.fetchFromGitHub {
+      owner = "Euterpea";
+      repo = "Euterpea2";
+      rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
+      sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
+    };
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 0f3b89bbedc1a33cc1fc3c142e235da2c64614c3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 6 Sep 2018 19:17:48 +0000
Subject: [PATCH 1599/3253] nixos: doc: move non-service parts of
 `service.nixosManual` to `documentation.nixos`

---
 nixos/lib/build-vms.nix                       |   2 +-
 .../cd-dvd/system-tarball-sheevaplug.nix      |   2 +-
 nixos/modules/misc/documentation.nix          |  99 +++++++++++++-
 .../modules/profiles/installation-device.nix  |   2 +-
 nixos/modules/profiles/minimal.nix            |   2 +-
 nixos/modules/rename.nix                      |   1 +
 nixos/modules/services/misc/nixos-manual.nix  | 125 ++++--------------
 nixos/tests/misc.nix                          |   2 +-
 8 files changed, 126 insertions(+), 109 deletions(-)

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 48288cf5962c..4f65501f89c6 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -28,7 +28,7 @@ rec {
       modules = configurations ++
         [ ../modules/virtualisation/qemu-vm.nix
           ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
-          { key = "no-manual"; services.nixosManual.enable = false; }
+          { key = "no-manual"; documentation.nixos.enable = false; }
           { key = "qemu"; system.build.qemu = qemu; }
         ] ++ optional minimal ../modules/testing/minimal-kernel.nix;
       extraArgs = { inherit nodes; };
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 7ec09acd5919..90a5128c02a5 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -137,7 +137,7 @@ in
   # Setting vesa, we don't get the nvidia driver, which can't work in arm.
   services.xserver.videoDrivers = [ "vesa" ];
 
-  services.nixosManual.enable = false;
+  documentation.nixos.enable = false;
 
   # Include the firmware for various wireless cards.
   networking.enableRalinkFirmware = true;
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index e6ccda5d7f40..6a7105e9cdaa 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -1,8 +1,72 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, baseModules, ... }:
 
 with lib;
 
-let cfg = config.documentation; in
+let
+
+  cfg = config.documentation;
+
+  /* For the purpose of generating docs, evaluate options with each derivation
+    in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
+    It isn't perfect, but it seems to cover a vast majority of use cases.
+    Caveat: even if the package is reached by a different means,
+    the path above will be shown and not e.g. `${config.services.foo.package}`. */
+  manual = import ../../doc/manual rec {
+    inherit pkgs config;
+    version = config.system.nixos.release;
+    revision = "release-${version}";
+    options =
+      let
+        scrubbedEval = evalModules {
+          modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules;
+          args = (config._module.args) // { modules = [ ]; };
+          specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
+        };
+        scrubDerivations = namePrefix: pkgSet: mapAttrs
+          (name: value:
+            let wholeName = "${namePrefix}.${name}"; in
+            if isAttrs value then
+              scrubDerivations wholeName value
+              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
+            else value
+          )
+          pkgSet;
+      in scrubbedEval.options;
+  };
+
+  helpScript = pkgs.writeScriptBin "nixos-help"
+    ''
+      #! ${pkgs.runtimeShell} -e
+      # Finds first executable browser in a colon-separated list.
+      # (see how xdg-open defines BROWSER)
+      browser="$(
+        IFS=: ; for b in $BROWSER; do
+          [ -n "$(type -P "$b" || true)" ] && echo "$b" && break
+        done
+      )"
+      if [ -z "$browser" ]; then
+        browser="$(type -P xdg-open || true)"
+        if [ -z "$browser" ]; then
+          browser="$(type -P w3m || true)"
+          if [ -z "$browser" ]; then
+            echo "$0: unable to start a web browser; please set \$BROWSER"
+            exit 1
+          fi
+        fi
+      fi
+      exec "$browser" ${manual.manualHTMLIndex}
+    '';
+
+  desktopItem = pkgs.makeDesktopItem {
+    name = "nixos-manual";
+    desktopName = "NixOS Manual";
+    genericName = "View NixOS documentation in a web browser";
+    icon = "nix-snowflake";
+    exec = "${helpScript}/bin/nixos-help";
+    categories = "System";
+  };
+
+in
 
 {
 
@@ -66,6 +130,22 @@ let cfg = config.documentation; in
         '';
       };
 
+      nixos.enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to install NixOS's own documentation.
+          <itemizedlist>
+          <listitem><para>This includes man pages like
+                    <citerefentry><refentrytitle>configuration.nix</refentrytitle>
+                    <manvolnum>5</manvolnum></citerefentry> if <option>man.enable</option> is
+                    set.</para></listitem>
+          <listitem><para>This includes the HTML manual and the <command>nixos-help</command> command if
+                    <option>doc.enable</option> is set.</para></listitem>
+          </itemizedlist>
+        '';
+      };
+
     };
 
   };
@@ -99,6 +179,21 @@ let cfg = config.documentation; in
       environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
     })
 
+    (mkIf cfg.nixos.enable {
+      system.build.manual = manual;
+
+      environment.systemPackages = []
+        ++ optional cfg.man.enable manual.manpages
+        ++ optionals cfg.doc.enable ([ manual.manualHTML helpScript ]
+           ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]);
+
+      services.mingetty.helpLine = mkIf cfg.doc.enable (
+          "\nRun `nixos-help` "
+        + optionalString config.services.nixosManual.showManual "or press <Alt-F${toString config.services.nixosManual.ttyNumber}> "
+        + "for the NixOS manual."
+      );
+    })
+
   ]);
 
 }
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index ff4a23a18d06..22d1af426948 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -22,7 +22,7 @@ with lib;
   config = {
 
     # Enable in installer, even if the minimal profile disables it.
-    services.nixosManual.enable = mkForce true;
+    documentation.nixos.enable = mkForce true;
 
     # Show the manual.
     services.nixosManual.showManual = true;
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index ed04e46c77d1..dd81e61460cf 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -12,7 +12,7 @@ with lib;
   i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
 
   documentation.enable = mkDefault false;
-  services.nixosManual.enable = mkDefault false;
+  documentation.nixos.enable = mkDefault false;
 
   sound.enable = mkDefault false;
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4a6bdfe83dd2..bc9ff9f63dd7 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -276,6 +276,7 @@ with lib;
 
     (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
     (mkRenamedOptionModule [ "programs" "man"  "enable" ] [ "documentation" "man"  "enable" ])
+    (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
 
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 37705e2a889c..023a933fd893 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -1,89 +1,18 @@
-# This module includes the NixOS man-pages in the system environment,
-# and optionally starts a browser that shows the NixOS manual on one
-# of the virtual consoles.  The latter is useful for the installation
+# This module optionally starts a browser that shows the NixOS manual
+# on one of the virtual consoles which is useful for the installation
 # CD.
 
-{ config, lib, pkgs, baseModules, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
-let
-
-  cfg = config.services.nixosManual;
-
-  /* For the purpose of generating docs, evaluate options with each derivation
-    in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
-    It isn't perfect, but it seems to cover a vast majority of use cases.
-    Caveat: even if the package is reached by a different means,
-    the path above will be shown and not e.g. `${config.services.foo.package}`. */
-  manual = import ../../../doc/manual rec {
-    inherit pkgs config;
-    version = config.system.nixos.release;
-    revision = "release-${version}";
-    options =
-      let
-        scrubbedEval = evalModules {
-          modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules;
-          args = (config._module.args) // { modules = [ ]; };
-          specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
-        };
-        scrubDerivations = namePrefix: pkgSet: mapAttrs
-          (name: value:
-            let wholeName = "${namePrefix}.${name}"; in
-            if isAttrs value then
-              scrubDerivations wholeName value
-              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
-            else value
-          )
-          pkgSet;
-      in scrubbedEval.options;
-  };
-
-  helpScript = pkgs.writeScriptBin "nixos-help"
-    ''
-      #! ${pkgs.runtimeShell} -e
-      # Finds first executable browser in a colon-separated list.
-      # (see how xdg-open defines BROWSER)
-      browser="$(
-        IFS=: ; for b in $BROWSER; do
-          [ -n "$(type -P "$b" || true)" ] && echo "$b" && break
-        done
-      )"
-      if [ -z "$browser" ]; then
-        browser="$(type -P xdg-open || true)"
-        if [ -z "$browser" ]; then
-          browser="$(type -P w3m || true)"
-          if [ -z "$browser" ]; then
-            echo "$0: unable to start a web browser; please set \$BROWSER"
-            exit 1
-          fi
-        fi
-      fi
-      exec "$browser" ${manual.manualHTMLIndex}
-    '';
-
-  desktopItem = pkgs.makeDesktopItem {
-    name = "nixos-manual";
-    desktopName = "NixOS Manual";
-    genericName = "View NixOS documentation in a web browser";
-    icon = "nix-snowflake";
-    exec = "${helpScript}/bin/nixos-help";
-    categories = "System";
-  };
-in
+let cfg = config.services.nixosManual; in
 
 {
 
   options = {
 
-    services.nixosManual.enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to build the NixOS manual pages.
-      '';
-    };
-
+    # TODO(@oxij): rename this to `.enable` eventually.
     services.nixosManual.showManual = mkOption {
       type = types.bool;
       default = false;
@@ -112,36 +41,28 @@ in
   };
 
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.showManual {
 
-    system.build.manual = manual;
+    assertions = [{
+      assertion = config.documentation.nixos.enable;
+      message   = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
+    }];
 
-    environment.systemPackages = []
-      ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]
-      ++ optional  config.documentation.man.enable manual.manpages
-      ++ optionals config.documentation.doc.enable [ manual.manualHTML helpScript ];
+    boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
 
-    boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];
-
-    systemd.services = optionalAttrs cfg.showManual
-      { "nixos-manual" =
-        { description = "NixOS Manual";
-          wantedBy = [ "multi-user.target" ];
-          serviceConfig =
-            { ExecStart = "${cfg.browser} ${manual.manualHTMLIndex}";
-              StandardInput = "tty";
-              StandardOutput = "tty";
-              TTYPath = "/dev/tty${toString cfg.ttyNumber}";
-              TTYReset = true;
-              TTYVTDisallocate = true;
-              Restart = "always";
-            };
-        };
+    systemd.services."nixos-manual" = {
+      description = "NixOS Manual";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}";
+        StandardInput = "tty";
+        StandardOutput = "tty";
+        TTYPath = "/dev/tty${toString cfg.ttyNumber}";
+        TTYReset = true;
+        TTYVTDisallocate = true;
+        Restart = "always";
       };
-
-      services.mingetty.helpLine = "\nRun `nixos-help` "
-        + lib.optionalString cfg.showManual "or press <Alt-F${toString cfg.ttyNumber}> "
-        + "for the NixOS manual.";
+    };
 
   };
 
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index b0bc1d083b16..6d72ac997f8d 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
     { swapDevices = mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
       environment.variables.EDITOR = mkOverride 0 "emacs";
-      services.nixosManual.enable = mkOverride 0 true;
+      documentation.nixos.enable = mkOverride 0 true;
       systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
       fileSystems = mkVMOverride { "/tmp2" =
         { fsType = "tmpfs";

From 27420636772da3301d8eed2af417869f7eceac4f Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 23 Sep 2018 22:55:59 +0200
Subject: [PATCH 1600/3253] nixos/network-interfaces-scripted: fix container
 networking bug

When a bridge interface was reconfigured, running containers using
this bridge lost connectivity: restarting network-addresses-brN.service
triggered a restart of network-setup.service via a "partOf" relationship
introduced in 07e0c0e0a2f237639600f2a0d62f6eac748b1e6e.
This in turn restarted brN-netdev.service.
The bridge was thus destroyed and recreated with the same name but a new
interface id, causing attached veth interfaces to lose their connection.

This change removes the "partOf" relationship between
network-setup.service and network-addresses-brN.service for all bridges.
---
 nixos/modules/tasks/network-interfaces-scripted.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index af61c95da0af..93dfefdce902 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -85,7 +85,8 @@ let
             after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
             before = [ "network.target" "shutdown.target" ];
             wants = [ "network.target" ];
-            partOf = map (i: "network-addresses-${i.name}.service") interfaces;
+            # exclude bridges from the partOf relationship to fix container networking bug #47210
+            partOf = map (i: "network-addresses-${i.name}.service") (filter (i: !(hasAttr i.name cfg.bridges)) interfaces);
             conflicts = [ "shutdown.target" ];
             wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
 

From 104014c6bad2ea682ec8e9fdbe8ab460a64a6274 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 23 Sep 2018 14:56:58 -0700
Subject: [PATCH 1601/3253] hdf4: fix build on aarch64-linux (#47209)

Pull in the Debian patches for AArch64 support, and a bonus patch for
reproducible builds while we're at it.
---
 pkgs/tools/misc/hdf4/default.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix
index d0bbd10d1e51..ef3839f67de9 100644
--- a/pkgs/tools/misc/hdf4/default.nix
+++ b/pkgs/tools/misc/hdf4/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, fetchpatch
 , fetchurl
 , cmake
 , libjpeg
@@ -14,6 +15,22 @@ stdenv.mkDerivation rec {
     sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l";
   };
 
+  patches = let
+    # The Debian patch revision to fetch from; this may differ from our package
+    # version, but older patches should still apply.
+    patchRev = "4.2.13-4";
+    getPatch = name: sha256: fetchpatch {
+      inherit sha256;
+      url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}";
+    };
+
+  in [
+    (getPatch "64bit"                     "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y")
+    (getPatch "hdfi.h"                    "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4")
+    (getPatch "hdf-4.2.10-aarch64.patch"  "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn")
+    (getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc")
+  ];
+
   buildInputs = [
     cmake
     libjpeg

From 7086e1fec3249397ae28c7b53d28c97c031ab6d9 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Sun, 23 Sep 2018 15:04:07 -0700
Subject: [PATCH 1602/3253] xloadimage: init at 4.1 (#47198)

---
 pkgs/tools/X11/xloadimage/default.nix | 88 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 90 insertions(+)
 create mode 100644 pkgs/tools/X11/xloadimage/default.nix

diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/tools/X11/xloadimage/default.nix
new file mode 100644
index 000000000000..a58d16ab82e8
--- /dev/null
+++ b/pkgs/tools/X11/xloadimage/default.nix
@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, libX11
+, libXt
+
+, libjpeg ? null
+, libpng ? null
+, libtiff ? null
+
+, withJpegSupport ? true
+, withPngSupport ? true
+, withTiffSupport ? true
+}:
+
+assert withJpegSupport -> libjpeg != null;
+assert withPngSupport -> libpng != null;
+assert withTiffSupport -> libtiff != null;
+
+let
+  deb_patch = "25";
+in
+stdenv.mkDerivation rec {
+  version = "4.1";
+  name = "xloadimage-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}.orig.tar.gz";
+    sha256 = "1i7miyvk5ydhi6yi8593vapavhwxcwciir8wg9d2dcyg9pccf2s0";
+  };
+
+  patches = fetchurl {
+    url = "mirror://debian/pool/main/x/xloadimage/xloadimage_${version}-${deb_patch}.debian.tar.xz";
+    sha256 = "17k518vrdrya5c9dqhpmm4g0h2vlkq1iy87sg2ngzygypbli1xvn";
+  };
+
+  buildInputs = [
+    libX11 libXt
+  ] ++ stdenv.lib.optionals withJpegSupport [
+    libjpeg
+  ] ++ stdenv.lib.optionals withPngSupport [
+    libpng
+  ] ++ stdenv.lib.optionals withTiffSupport [
+    libtiff
+  ];
+
+  # NOTE: we patch the build-info script so that it never detects the utilities
+  # it's trying to find; one of the Debian patches adds support for
+  # $SOURCE_DATE_EPOCH, but we want to make sure we don't even call these.
+  preConfigure = ''
+    substituteInPlace build-info \
+      --replace '[ -x /bin/date ]' 'false' \
+      --replace '[ -x /bin/id ]' 'false' \
+      --replace '[ -x /bin/uname ]' 'false' \
+      --replace '[ -x /usr/bin/id ]' 'false'
+
+    chmod +x build-info configure
+  '';
+
+  enableParallelBuilding = true;
+
+  # NOTE: we're not installing the `uufilter` binary; if needed, the standard
+  # `uudecode` tool should work just fine.
+  installPhase = ''
+    install -Dm755 xloadimage $out/bin/xloadimage
+    ln -sv $out/bin/{xloadimage,xsetbg}
+
+    install -D -m644 xloadimagerc $out/etc/xloadimagerc.example
+    install -D -m644 xloadimage.man $out/share/man/man1/xloadimage.1x
+    ln -sv $out/share/man/man1/{xloadimage,xsetbg}.1x
+  '';
+
+  meta = {
+    description = "Graphics file viewer under X11";
+
+    longDescription = ''
+      Can view png, jpeg, gif, tiff, niff, sunraster, fbm, cmuraster, pbm,
+      faces, rle, xwd, vff, mcidas, vicar, pcx, gem, macpaint, xpm and xbm
+      files. Can view images, put them on the root window, or dump them. Does a
+      variety of processing, including: clipping, dithering, depth reduction,
+      zoom, brightening/darkening and merging.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ andrew-d ];
+    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 275b46fb5739..84ad48079580 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19616,6 +19616,8 @@ with pkgs;
 
   xss-lock = callPackage ../misc/screensavers/xss-lock { };
 
+  xloadimage = callPackage ../tools/X11/xloadimage { };
+
   xssproxy = callPackage ../misc/screensavers/xssproxy { };
 
   xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };

From dc401331b33f9a5e305bc23b7bb3fdd7fa85b881 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 23 Sep 2018 19:56:43 -0400
Subject: [PATCH 1603/3253] linux: 4.19-rc4 -> 4.19-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4bfea7a10988..4b6be2556637 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc4";
-  modDirVersion = "4.19.0-rc4";
+  version = "4.19-rc5";
+  modDirVersion = "4.19.0-rc5";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "083nlh25zddrbg1hzyxfpg9i7h91ij9f299i52r5zwzi85yi8whn";
+    sha256 = "0fpv2g6x1hgdrxvh1acjcxmyk2fzqcx1ypi0mqw72swbm587irck";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 38467261c31a6c35410e376ec7b7f28bb5e107d8 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Sep 2018 01:50:47 +0200
Subject: [PATCH 1604/3253] haskellPackages.Frames: use overrideScope instead
 of override

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ef4e6c8b4254..8cdf89081918 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1137,7 +1137,7 @@ self: super: {
   });
 
   # Can be removed once vinyl >= 0.10 is in the LTS.
-  Frames = super.Frames.override { vinyl = super.vinyl_0_10_0; };
+  Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; });
 
   # https://github.com/Euterpea/Euterpea2/pull/22
   Euterpea = overrideSrc super.Euterpea {

From 1d7b92223844f4dedc53ef842a46cc66e9739186 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Sep 2018 01:52:17 +0200
Subject: [PATCH 1605/3253] haskellPackages.safe-money-*: use overrideScope
 instead of override

---
 .../haskell-modules/configuration-common.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8cdf89081918..cdf7063c3f99 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1124,11 +1124,11 @@ self: super: {
   xmlhtml = doJailbreak super.xmlhtml;
 
   # https://github.com/NixOS/nixpkgs/issues/46467
-  safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; };
-  safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; };
-  safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; };
-  safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; };
-  safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; };
+  safe-money-aeson = super.safe-money-aeson.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+  safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+  safe-money-cereal = super.safe-money-cereal.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+  safe-money-serialise = super.safe-money-serialise.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+  safe-money-xmlbf = super.safe-money-xmlbf.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
 
   # https://github.com/adinapoli/mandrill/pull/52
   mandrill = appendPatch super.mandrill (pkgs.fetchpatch {

From e1d51fa9e6db87af72d34544bba707000861c000 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Sep 2018 01:53:02 +0200
Subject: [PATCH 1606/3253] haskellPackages.yi-core: use overrideScope instead
 of override

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cdf7063c3f99..69ab8139668e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1112,7 +1112,7 @@ self: super: {
     })) ./patches/sexpr-0.2.1.patch;
 
   # Can be removed once yi-language >= 0.18 is in the LTS
-  yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; };
+  yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
 
   # https://github.com/MarcWeber/hasktags/issues/52
   hasktags = dontCheck super.hasktags;

From 36e8d638d48cb60052febe191407e7ba011d4c68 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 24 Sep 2018 01:55:50 +0200
Subject: [PATCH 1607/3253] haskellPackages.haddock-api: fix build

Also remove haddock-library == 1.4.4 since it's not needed anymore
---
 pkgs/development/haskell-modules/configuration-common.nix    | 5 +++--
 .../haskell-modules/configuration-hackage2nix.yaml           | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 69ab8139668e..8beca9572e7e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -927,8 +927,9 @@ self: super: {
   text-icu = dontCheck super.text-icu;
 
   # https://github.com/haskell/cabal/issues/4969
-  haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
-  haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
+  haddock-api = (super.haddock-api.overrideScope (self: super: {
+    haddock-library = self.haddock-library_1_6_0;
+  })).override { hspec = self.hspec_2_4_8; };
 
   # Jailbreak "unix-compat >=0.1.2 && <0.5".
   # Jailbreak "graphviz >=2999.18.1 && <2999.20".
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2eefe636ca97..7f9e31432892 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2400,7 +2400,6 @@ extra-packages:
   - haddock-api == 2.17.*               # required on GHC 8.0.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - haddock-library == 1.4.3            # required for haddock-api-2.17.x
-  - haddock-library == 1.4.4            # required for haddock-api-2.18.x
   - haddock-library == 1.5.*            # required for stylish-cabal-0.4.0.1
   - happy <1.19.6                       # newer versions break Agda
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support

From e5778a9991194f19c78968ea0f71cb27313595ed Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 24 Sep 2018 09:13:03 +0900
Subject: [PATCH 1608/3253] firefox-esr: 60.2.0esr -> 60.2.1esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 73d3000846e1..935be6230cd3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -70,10 +70,10 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.2.0esr";
+    version = "60.2.1esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "1nf7nsycvzafvy4jjli5xh59d2mac17gfx91a1jh86f41w6qcsi3lvkfa8xhxsq8wfdsmqk1f4hmqzyx63h4m691qji7838g2nk49k7";
+      sha512 = "2mklws09haki91w3js2i5pv8g3z5ck4blnzxvdbk5qllqlv465hn7rvns78hbcbids55mqx50fsn0161la73v25zs04bf8xdhbkcpsm";
     };
 
     patches = nixpkgsPatches ++ [

From 8b184ec2e14574ed97fbf0911431bd43538542be Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Sep 2018 22:00:13 -0500
Subject: [PATCH 1609/3253] bitcoin: don't build tests that aren't used, don't
 build benchmarks

(cherry picked from commit d51c0a87b2ebf756015784839ec9c13950c45323)
---
 pkgs/applications/altcoins/bitcoin.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 878cb6064e8c..fbc22935d8c0 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -20,7 +20,11 @@ stdenv.mkDerivation rec{
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
+                     "--disable-bench"
+                     "--disable-tests"
+                     "--disable-gui-tests"
+                   ]
                      ++ optionals withGui [ "--with-gui=qt5"
                                             "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
                                           ];

From b322a8bd3b58b5644aae6fe0a9ab0fb1c66e996a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 23 Sep 2018 22:01:45 -0500
Subject: [PATCH 1610/3253] bitcoin: parallel build, please! :)

(cherry picked from commit dba5534b06c7dffe97ce644b0a5790aca8527a2e)
---
 pkgs/applications/altcoins/bitcoin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index fbc22935d8c0..38ce46163be6 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec{
   # find or load the Qt platform plugin "minimal""
   doCheck = false;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Peer-to-peer electronic cash system";
     longDescription= ''

From 14058e3cbc67cd9492dd8ec380984137240de701 Mon Sep 17 00:00:00 2001
From: Avery Lychee <averyl@protonmail.com>
Date: Mon, 24 Sep 2018 13:06:43 +1000
Subject: [PATCH 1611/3253] treesheets: 2017-03-27 -> 2018-08-18

---
 maintainers/maintainer-list.nix                 | 5 +++++
 pkgs/applications/office/treesheets/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                 | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c3b327893826..726cbd74313a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -376,6 +376,11 @@
     github = "auntie";
     name = "Jonathan Glines";
   };
+  avery = {
+    email = "averyl+nixos@protonmail.com";
+    github = "AveryLychee";
+    name = "Avery Lychee";
+  };
   avnik = {
     email = "avn@avnik.info";
     github = "avnik";
diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index d8e6cdd86ea9..d0a4953c426b 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "treesheets-${version}";
-  version = "2017-03-27";
+  version = "2018-08-18";
 
   src = fetchFromGitHub {
     owner  = "aardappel";
     repo   = "treesheets";
-    rev    = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32";
-    sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb";
+    rev    = "3af41d99c8f9f32603a36ab64af3560b6d61dd73";
+    sha256 = "147y8ggh3clwjgsi15z8i4jnzlkh8p17mmlg532jym53zzbcva65";
   };
 
   buildInputs = [ wxGTK makeWrapper ];
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage    = http://strlen.com/treesheets/;
-    maintainers = with maintainers; [ obadz ];
+    maintainers = with maintainers; [ obadz avery ];
     platforms   = platforms.linux;
     license     = licenses.zlib;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84ad48079580..803640864c1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19008,7 +19008,7 @@ with pkgs;
 
   tree = callPackage ../tools/system/tree {};
 
-  treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; };
+  treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; };
 
   trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
 

From cdeb26ee769b04e6495eccc5b7e22906d08206f6 Mon Sep 17 00:00:00 2001
From: Colin Rice <colin@daedrum.net>
Date: Mon, 24 Sep 2018 03:22:39 +0000
Subject: [PATCH 1612/3253] go: Remove pkg/obj directory from the build
 outputs.

This appears to be causing the go package to be roughly 900MB in size.
---
 pkgs/development/compilers/go/1.11.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index e4872597e79c..56d363f1015f 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -178,6 +178,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     rm -r $out/share/go/pkg/bootstrap
+    rm -r $out/share/go/pkg/obj
     ln -s $out/share/go/bin $out/bin
   '';
 

From 55ef56b26012222db06bbdf123b29d11d10d6b34 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Sep 2018 04:24:06 +0000
Subject: [PATCH 1613/3253] ocamlPackages.doc-ock: init at 1.2.1

---
 .../ocaml-modules/doc-ock/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/doc-ock/default.nix

diff --git a/pkgs/development/ocaml-modules/doc-ock/default.nix b/pkgs/development/ocaml-modules/doc-ock/default.nix
new file mode 100644
index 000000000000..c158f08b0687
--- /dev/null
+++ b/pkgs/development/ocaml-modules/doc-ock/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, octavius, cppo }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-doc-ock-${version}";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-doc";
+    repo = "doc-ock";
+    rev = "v${version}";
+    sha256 = "090vprm12jrl55yllk1hdzbsqyr107yjs2qnc49yahdhvnr4h5b7";
+  };
+
+  buildInputs = [ ocaml findlib dune cppo ];
+
+  propagatedBuildInputs = [ octavius ];
+
+  inherit (dune) installPhase;
+
+  meta = {
+    description = "Extract documentation from OCaml files";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6039ef7dcf14..418332c7212e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -220,6 +220,8 @@ let
 
     digestif =  callPackage ../development/ocaml-modules/digestif { };
 
+    doc-ock =  callPackage ../development/ocaml-modules/doc-ock { };
+
     dolmen =  callPackage ../development/ocaml-modules/dolmen { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From 41f06396ccb6fe0c200c888b7558853b39c98a4d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Sep 2018 04:33:31 +0000
Subject: [PATCH 1614/3253] ocamlPackages.doc-ock-html: init at 1.2.1

---
 .../ocaml-modules/doc-ock-html/default.nix    | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/doc-ock-html/default.nix

diff --git a/pkgs/development/ocaml-modules/doc-ock-html/default.nix b/pkgs/development/ocaml-modules/doc-ock-html/default.nix
new file mode 100644
index 000000000000..cb2756b0977c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/doc-ock-html/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, doc-ock, tyxml, xmlm }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-doc-ock-html-${version}";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-doc";
+    repo = "doc-ock-html";
+    rev = "v${version}";
+    sha256 = "1y620h48qrplmcm78g7c78zibpkai4j3icwmnx95zb3r8xq8554y";
+  };
+
+  buildInputs = [ ocaml findlib dune ];
+
+  propagatedBuildInputs = [ doc-ock tyxml xmlm ];
+
+  inherit (dune) installPhase;
+
+  meta = {
+    description = "From doc-ock to HTML";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 418332c7212e..a079673f075c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -222,6 +222,8 @@ let
 
     doc-ock =  callPackage ../development/ocaml-modules/doc-ock { };
 
+    doc-ock-html =  callPackage ../development/ocaml-modules/doc-ock-html { };
+
     dolmen =  callPackage ../development/ocaml-modules/dolmen { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From 886acaff116ab3678d267b904ffbdd763c57efb5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Sep 2018 04:37:08 +0000
Subject: [PATCH 1615/3253] ocamlPackages.doc-ock-xml: init at 1.2.1

---
 .../ocaml-modules/doc-ock-xml/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/doc-ock-xml/default.nix

diff --git a/pkgs/development/ocaml-modules/doc-ock-xml/default.nix b/pkgs/development/ocaml-modules/doc-ock-xml/default.nix
new file mode 100644
index 000000000000..72e562cb5f36
--- /dev/null
+++ b/pkgs/development/ocaml-modules/doc-ock-xml/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, doc-ock, menhir, xmlm }:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-doc-ock-xml-${version}";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-doc";
+    repo = "doc-ock-xml";
+    rev = "v${version}";
+    sha256 = "1s27ri7vj9ixi5p5ixg6g6invk96807bvxbqjrr1dm8sxgl1nd20";
+  };
+
+  buildInputs = [ ocaml findlib dune ];
+
+  propagatedBuildInputs = [ doc-ock menhir xmlm ];
+
+  inherit (dune) installPhase;
+
+  meta = {
+    description = "XML printer and parser for Doc-Ock";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a079673f075c..684ab8a1762a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -224,6 +224,8 @@ let
 
     doc-ock-html =  callPackage ../development/ocaml-modules/doc-ock-html { };
 
+    doc-ock-xml =  callPackage ../development/ocaml-modules/doc-ock-xml { };
+
     dolmen =  callPackage ../development/ocaml-modules/dolmen { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };

From cbc609ca8c1de13ecf300c52e778f2abc74b8d24 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Sep 2018 04:43:10 +0000
Subject: [PATCH 1616/3253] ocamlPackages.odoc: init at 1.2.0

---
 .../ocaml-modules/odoc/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/odoc/default.nix

diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
new file mode 100644
index 000000000000..4c5da695eb6c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune
+, bos, cmdliner, doc-ock-html, doc-ock-xml
+}:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-odoc-${version}";
+  version = "1.2.0";
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = "odoc";
+    rev = "v${version}";
+    sha256 = "0ixnhfpm1nw4bvjj8qhcyy283pdr5acqpg5wxwq3n1l4mad79cgh";
+  };
+
+  buildInputs = [ ocaml findlib dune cmdliner ];
+
+  propagatedBuildInputs = [ bos doc-ock-html doc-ock-xml ];
+
+  inherit (dune) installPhase;
+
+  meta = {
+    description = "A documentation generator for OCaml";
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 684ab8a1762a..779a24352bf8 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -539,6 +539,8 @@ let
 
     octavius = callPackage ../development/ocaml-modules/octavius { };
 
+    odoc = callPackage ../development/ocaml-modules/odoc { };
+
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
 
     omd = callPackage ../development/ocaml-modules/omd { };

From 7bcb3305a5ba8721a271a60abbdd081065305fe8 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Sun, 23 Sep 2018 17:58:30 -0400
Subject: [PATCH 1617/3253] ycmd: 2018-07-24 -> 2018-09-20

---
 pkgs/development/tools/misc/ycmd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index c0e12aa22c44..062f90e3389d 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "ycmd-${version}";
-  version = "2018-07-24";
+  version = "2018-09-20";
 
   src = fetchgit {
     url = "https://github.com/Valloric/ycmd.git";
-    rev = "f8a8b04892b925efeee24298a957cc6d6a69ad06";
-    sha256 = "1br2sh6bs0fg1axq2hq9f48fz8klkzydi1mf0j0jdsh3zjzkmxbn";
+    rev = "bf658fd78722c517674c0aaf2381e199bca8f163";
+    sha256 = "1lwa8xr76vapfpncvp81cn3m9219yw14fl7fzk5gnly60zkphbbl";
   };
 
   nativeBuildInputs = [ cmake ];

From 1def63c923fbaa842729bfb012009bcc563a41fc Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack.kelly@data61.csiro.au>
Date: Mon, 3 Sep 2018 16:47:12 +1000
Subject: [PATCH 1618/3253] ultimate-oldschool-pc-font-pack: init at 1.0

---
 .../default.nix                               | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix

diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
new file mode 100644
index 000000000000..cb68c30a4a2c
--- /dev/null
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "ultimate-oldschool-pc-font-pack-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
+    sha256 = "7666cf23176e34ea03a218b5c1500f4ad729d97150ab7bdb7cf2adf4c99a9a7a";
+  };
+
+  buildInputs = [ unzip ];
+
+  dontBuild = true;
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp 'Px437 (TrueType - DOS charset)'/*.ttf $out/share/fonts/truetype
+    cp 'PxPlus (TrueType - extended charset)'/*.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)";
+    homepage = "http://int10h.org/oldschool-pc-fonts/";
+    platforms = platforms.unix;
+    license = licenses.cc-by-sa-40;
+    maintainers = [ maintainers.endgame ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 803640864c1d..da1a81bdb085 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15336,6 +15336,8 @@ with pkgs;
 
   ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
 
+  ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
+
   uni-vga = callPackage ../data/fonts/uni-vga { };
 
   unifont = callPackage ../data/fonts/unifont { };

From e9faf00a904259640edb225ab6558acd564ff673 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 23 Sep 2018 03:04:04 +0200
Subject: [PATCH 1619/3253] obs-studio: 21.1.2 -> 22.0.2

---
 .../applications/video/obs-studio/default.nix |  8 ++---
 .../video/obs-studio/find-xcb.patch           | 31 -------------------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/video/obs-studio/find-xcb.patch

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index a07a15177d04..cacad5a3e629 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -18,6 +18,7 @@
 , makeWrapper
 , pkgconfig
 , vlc
+, mbedtls
 
 , alsaSupport ? false
 , alsaLib
@@ -29,17 +30,15 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.1.2";
+  version = "22.0.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
+    sha256 = "1bgp2lirpsbp54vvl3p345njlpgv0d78vac2aqwbl34wqx5sqdk0";
   };
 
-  patches = [ ./find-xcb.patch ];
-
   nativeBuildInputs = [ cmake
                         pkgconfig
                       ];
@@ -59,6 +58,7 @@ in stdenv.mkDerivation rec {
                   x264
                   vlc
                   makeWrapper
+                  mbedtls
                 ]
                 ++ optional alsaSupport alsaLib
                 ++ optional pulseaudioSupport libpulseaudio;
diff --git a/pkgs/applications/video/obs-studio/find-xcb.patch b/pkgs/applications/video/obs-studio/find-xcb.patch
deleted file mode 100644
index c45aba4ce2f0..000000000000
--- a/pkgs/applications/video/obs-studio/find-xcb.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
-index cd2b80e1..7d829cdb 100644
---- a/libobs/CMakeLists.txt
-+++ b/libobs/CMakeLists.txt
-@@ -15,6 +15,7 @@ if(UNIX)
- 	find_package(DBus QUIET)
- 	if (NOT APPLE)
- 		find_package(X11_XCB REQUIRED)
-+		find_package(XCB REQUIRED)
- 	endif()
- else()
- 	set(HAVE_DBUS "0")
-@@ -161,12 +162,15 @@ elseif(UNIX)
- 	endif()
- 
- 	include_directories(
--		${X11_XCB_INCLUDE_DIRS})
-+		${X11_XCB_INCLUDE_DIRS}
-+		${XCB_INCLUDE_DIRS})
- 	add_definitions(
--		${X11_XCB_DEFINITIONS})
-+		${X11_XCB_DEFINITIONS}
-+		${XCB_DEFINITIONS})
- 	set(libobs_PLATFORM_DEPS
- 		${libobs_PLATFORM_DEPS}
--		${X11_XCB_LIBRARIES})
-+		${X11_XCB_LIBRARIES}
-+		${XCB_LIBRARIES})
- 
- 	if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
- 		# use the sysinfo compatibility library on bsd

From 9c53116d499f930f3b79a11ba1fa696623ebfcab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Sep 2018 10:42:01 +0200
Subject: [PATCH 1620/3253] Revert "nixos: set nixos in nixPath"

This reverts commit 67c8c4917799496dcf2ad6a500441fbbaeb918c9.

'nix run nixos.firefox' is *not* supposed to work - the Nix 2.x
interface attempts to standardize on nixpkgs.*, to get rid of the
nixos/nixpkgs confusion that existed with the channels interface. So
let's not bring that confusion back.
---
 nixos/modules/services/misc/nix-daemon.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 2d14e27ffc3d..c0eb882c58f3 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -347,7 +347,6 @@ in
           [
             "$HOME/.nix-defexpr/channels"
             "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
-            "nixos=/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];

From c3cc34f20a6c4b9a5a018ff27289f4c99101abdf Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 24 Sep 2018 11:00:50 +0200
Subject: [PATCH 1621/3253] systemd: update to fix nspawn containers (#47264)

This fixes nspawn containers with older systemd inside currently failing
to start.

See:
https://github.com/NixOS/systemd/pull/23
https://github.com/systemd/systemd/pull/10104
https://github.com/NixOS/nixpkgs/issues/47253
---
 pkgs/os-specific/linux/systemd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 482e3e0bc796..dd8105c8c058 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -26,8 +26,8 @@ in stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "21efe60844fda21039c052442076dabcf8643a90";
-    sha256 = "0aqifjsb0kaxnqy5nlmzvyzgfd99lm60k1494lbnnk8ahdh8ab07";
+    rev = "31859ddd35fc3fa82a583744caa836d356c31d7f";
+    sha256 = "1xci0491j95vdjgs397n618zii3sgwnvanirkblqqw6bcvcjvir1";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From c841c3e2c6117549c320faba8ac45e1ca1df4602 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 10 Sep 2018 00:15:51 -0400
Subject: [PATCH 1622/3253] linux_rpi: add support for Raspberry Pi 3

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d061e41eb2fe..26fb595ad596 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -18,6 +18,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
   defconfig = {
     "armv6l-linux" = "bcmrpi_defconfig";
     "armv7l-linux" = "bcm2709_defconfig";
+    "aarch64-linux" = "bcmrpi3_defconfig";
   }.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'");
 
   features = {
@@ -31,9 +32,17 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
   '';
 
-  postFixup = ''
-    # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
-    # This is ugly as heck, but I don't know a better solution so far.
+  # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
+  # This is ugly as heck, but I don't know a better solution so far.
+  postFixup = if stdenv.hostPlatform.system == "aarch64-linux" then ''
+    rm $out/dtbs/broadcom/bcm283*.dtb
+    copyDTB() {
+      cp -v "$out/dtbs/broadcom/$1" "$out/dtbs/broadcom/$2"
+    }
+
+    copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+    copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
+  '' else ''
     rm $out/dtbs/bcm283*.dtb
     copyDTB() {
       cp -v "$out/dtbs/$1" "$out/dtbs/$2"

From f9197b9f63da8b6d9244c5a8e99507fdd294dcc5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Sep 2018 16:41:04 +0300
Subject: [PATCH 1623/3253] linux_rpi: Extend the logic for not installing
 unnecessary DTBs

Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the
resulting kernel won't run just like the aarch64 builds already do.
Also deduplicates the logic a bit.
---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 23 ++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 26fb595ad596..d95c2caa2cf0 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
   modDirVersion = "4.14.62";
   tag = "1.20180817";
 in
-stdenv.lib.overrideDerivation (buildLinux (args // rec {
+lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
   inherit modDirVersion;
 
@@ -34,20 +34,13 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
 
   # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
   # This is ugly as heck, but I don't know a better solution so far.
-  postFixup = if stdenv.hostPlatform.system == "aarch64-linux" then ''
-    rm $out/dtbs/broadcom/bcm283*.dtb
+  postFixup = ''
+    dtbDir=${if stdenv.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
+    rm $dtbDir/bcm283*.dtb
     copyDTB() {
-      cp -v "$out/dtbs/broadcom/$1" "$out/dtbs/broadcom/$2"
+      cp -v "$dtbDir/$1" "$dtbDir/$2"
     }
-
-    copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
-    copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
-  '' else ''
-    rm $out/dtbs/bcm283*.dtb
-    copyDTB() {
-      cp -v "$out/dtbs/$1" "$out/dtbs/$2"
-    }
-
+  '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv6l-linux"]) ''
     copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
     copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
@@ -57,7 +50,9 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
     copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
     copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
+  '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux"]) ''
     copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
+  '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
     copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
     copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb

From 6539722622f883aef7650136b5ff7d54b5535a14 Mon Sep 17 00:00:00 2001
From: Aldwin Vlasblom <aldwin.vlasblom@gmail.com>
Date: Fri, 21 Sep 2018 13:16:36 +0200
Subject: [PATCH 1624/3253] twa: init at 1.3.1

---
 maintainers/maintainer-list.nix       |  5 ++++
 pkgs/tools/networking/twa/default.nix | 34 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/networking/twa/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 726cbd74313a..4748597ca5f0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -376,6 +376,11 @@
     github = "auntie";
     name = "Jonathan Glines";
   };
+  avaq = {
+    email = "avaq+nixos@xs4all.nl";
+    github = "avaq";
+    name = "Aldwin Vlasblom";
+  };
   avery = {
     email = "averyl+nixos@protonmail.com";
     github = "AveryLychee";
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
new file mode 100644
index 000000000000..f8004ad0068d
--- /dev/null
+++ b/pkgs/tools/networking/twa/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, makeWrapper, bash, gawk, curl, netcat, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "twa-${version}";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = "twa";
+    rev = version;
+    sha256 = "16x9nzsrf10waqmjm423vx44820c6mls7gxc8azrdqnz18vdy1h4";
+  };
+
+  dontBuild = true;
+
+  buildInputs = [ makeWrapper bash gawk curl netcat ];
+
+  installPhase = ''
+    install -Dm 0755 twa "$out/bin/twa"
+    install -Dm 0755 tscore "$out/bin/tscore"
+    install -Dm 0644 twa.1 "$out/share/man/man1/twa.1"
+    install -Dm 0644 README.md "$out/share/doc/twa/README.md"
+
+    wrapProgram "$out/bin/twa" \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses ]}
+  '';
+
+  meta = {
+    description = "A tiny web auditor with strong opinions";
+    homepage = https://github.com/trailofbits/twa;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ avaq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb085..5da0a970e525 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14733,6 +14733,8 @@ with pkgs;
 
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
+  twa = callPackage ../tools/networking/twa { };
+
   # Upstream U-Boots:
   inherit (callPackage ../misc/uboot {})
     buildUBoot

From fbeb94dd468678505de3ff89f7804edf1364bd08 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Sep 2018 13:35:05 +0200
Subject: [PATCH 1625/3253] Revert "python: ldappool: 2.2.0 -> 2.3.0"

This reverts commit 29acc8339fd5eb1f84ed99d9b71381269ec67a04.
---
 pkgs/development/python-modules/ldappool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix
index a09fa75ce349..02d10b832ff2 100644
--- a/pkgs/development/python-modules/ldappool/default.nix
+++ b/pkgs/development/python-modules/ldappool/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "ldappool-${version}";
-  version = "2.3.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     pname = "ldappool";
     inherit version;
-    sha256 = "899d38e891372981166350c813ff5ce2ad8ac383311edccda8102362c1d60952";
+    sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
   };
 
   nativeBuildInputs = [ pbr ];

From 50f23da8e6249ab1be7a49922f5b38f9131d0b84 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Sep 2018 14:32:50 +0200
Subject: [PATCH 1626/3253] python3Packages.py3exiv2: fix build

Recent boost versions name their `python3` shared objects
`boost_python3x` rather than `boost_python3`.

See https://hydra.nixos.org/build/80712295
Addresses #45960
---
 pkgs/development/python-modules/py3exiv2/default.nix | 9 +++++++--
 pkgs/development/python-modules/py3exiv2/setup.patch | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index d8633488102b..4c6ca0bad338 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+{ buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx, substituteAll, python }:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
@@ -16,7 +16,12 @@ buildPythonPackage rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   # fix broken libboost_python3 detection
-  patches = [ ./setup.patch ];
+  patches = [
+    (substituteAll {
+      src = ./setup.patch;
+      version = "3${stdenv.lib.versions.minor python.version}";
+    })
+  ];
 
   meta = {
     homepage = "https://launchpad.net/py3exiv2";
diff --git a/pkgs/development/python-modules/py3exiv2/setup.patch b/pkgs/development/python-modules/py3exiv2/setup.patch
index bb4b11523479..8b0619c5bc5f 100644
--- a/pkgs/development/python-modules/py3exiv2/setup.patch
+++ b/pkgs/development/python-modules/py3exiv2/setup.patch
@@ -5,7 +5,7 @@
                      return l.replace('libboost', 'boost')
  
 -libboost = get_libboost_name()
-+libboost = 'boost_python3'
++libboost = 'boost_python@version@'
  
  setup(
      name='py3exiv2',

From 5e5e3d8864d928adc19ddb6ee6df8b1183648778 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 17 Sep 2018 08:30:05 +0300
Subject: [PATCH 1627/3253] carp: init at unstable-2018-09-15

---
 pkgs/development/compilers/carp/default.nix | 47 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/compilers/carp/default.nix

diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
new file mode 100644
index 000000000000..65f0481a8010
--- /dev/null
+++ b/pkgs/development/compilers/carp/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+
+haskellPackages.mkDerivation rec {
+
+  pname = "carp";
+  version = "unstable-2018-09-15";
+
+  src = fetchFromGitHub {
+    owner = "carp-lang";
+    repo = "Carp";
+    rev = "cf9286c35cab1c170aa819f7b30b5871b9e812e6";
+    sha256 = "1k6kdxbbaclhi40b9p3fgbkc1x6pc4v0029xjm6gny6pcdci2cli";
+  };
+
+  buildDepends = [ makeWrapper ];
+
+  executableHaskellDepends = with haskellPackages; [
+    HUnit blaze-markup blaze-html split cmdargs
+  ];
+
+  isExecutable = true;
+
+  # The carp executable must know where to find its core libraries and other
+  # files. Set the environment variable CARP_DIR so that it points to the root
+  # of the Carp repo. See:
+  # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir
+  #
+  # Also, clang must be available run-time because carp is compiled to C which
+  # is then compiled with clang.
+  postInstall = ''
+    wrapProgram $out/bin/carp                                  \
+      --set CARP_DIR $src                                      \
+      --prefix PATH : ${clang}/bin
+    wrapProgram $out/bin/carp-header-parse                     \
+      --set CARP_DIR $src                                      \
+      --prefix PATH : ${clang}/bin
+  '';
+
+  description = "A statically typed lisp, without a GC, for real-time applications";
+  homepage    = https://github.com/carp-lang/Carp;
+  license     = stdenv.lib.licenses.asl20;
+  maintainers = with stdenv.lib.maintainers; [ jluttine ];
+
+  # Windows not (yet) supported.
+  platforms   = with stdenv.lib.platforms; unix ++ darwin;
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32af34bf70b0..760a7451d45c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2320,6 +2320,8 @@ with pkgs;
 
   buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
 
+  carp = callPackage ../development/compilers/carp { };
+
   emscriptenVersion = "1.37.36";
 
   emscripten = callPackage ../development/compilers/emscripten { };

From baa7e52fe035c94ffa17c44493a0aecec9e29f34 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Sep 2018 15:50:52 +0200
Subject: [PATCH 1628/3253] python3Packages.google-compute-engine: fix build
 (#47267)

The dependency `distro` was missing.
See https://hydra.nixos.org/build/81330387

Addresses #45960
---
 pkgs/tools/virtualization/google-compute-engine/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index bfa8217b9a09..51fcbb572053 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -6,6 +6,7 @@
 , utillinux
 , boto
 , setuptools
+, distro
 }:
 
 buildPythonApplication rec {
@@ -42,7 +43,7 @@ buildPythonApplication rec {
     cp -r google_config/udev/*.rules $out/lib/udev/rules.d
   '';
 
-  propagatedBuildInputs = [ boto setuptools ];
+  propagatedBuildInputs = [ boto setuptools distro ];
 
   doCheck = false;
 

From 98fe28e5abbc826a5444aa73072f8049474ee76d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:54:17 -0400
Subject: [PATCH 1629/3253] jetbrains.clion: 2018.2.2 -> 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b46dddfc73e9..bd6b11a0178e 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -249,12 +249,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "1wjrki0awjyjmv7hh5rkhbpx40yqjssgh4nv61fvg189aric4rzj"; /* updated by script */
+      sha256 = "0ljzdjvlkm37gclny652nm7kw2hlyl1iiix6h44zq7fhszp5kmyr"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From 0174f259aca14ddf9f979797c020fa6df0f295cc Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:54:49 -0400
Subject: [PATCH 1630/3253] jetbrains.datagrip: 2018.2.2 -> 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index bd6b11a0178e..366a1c28e85c 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -262,12 +262,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0sfcl6bcq5hzwx1fdn8zfyl4qqjcmjmzwspa7v7niyqhbj5zdba9"; /* updated by script */
+      sha256 = "1m3b8pfmzz9x2b9izf19ax8h67p1myqqalvm214g1b8qqskqz60i"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip 2018.2";

From 397215b8b6a4bec6a811f7a86f158740d6acb67b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:55:05 -0400
Subject: [PATCH 1631/3253] jetbrains.goland: 2018.2.1 -> 2018.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 366a1c28e85c..8b16a5cf30f5 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -275,12 +275,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.2.1"; /* updated by script */
+    version = "2018.2.2"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */
+      sha256 = "10ymk9fw01a6c6harqv4pa0ywj130sjsbqhyqmw35v1b1srmxcrj"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand Release";

From e2ff1bceb3ddf45fdeb26b20b72aec08200167a5 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:55:21 -0400
Subject: [PATCH 1632/3253] jetbrains.idea-community: 2018.2.2 -> 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8b16a5cf30f5..ab62f2dd3018 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -288,12 +288,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "1495zkccss1bkh803p6065nypqj72zra9dbnlx3iz4kkbawr7j15"; /* updated by script */
+      sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA Release";

From 7ce6836e9576d601eee10796541211fe761729d2 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:55:38 -0400
Subject: [PATCH 1633/3253] jetbrains.idea-ultimate: 2018.2.2 -> 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ab62f2dd3018..b2e93e09de99 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -301,12 +301,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "04jzsmnfmxxf264dla6scshk576z8w8sv78mpzb2mc1ndwviwflx"; /* updated by script */
+      sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA Release";

From 6f78c882daddd927f0843809199e48db4e51fa58 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:55:56 -0400
Subject: [PATCH 1634/3253] jetbrains.phpstorm: 2018.2.2 -> 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index b2e93e09de99..f793a5909c9c 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -314,12 +314,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1sjxavkfjg4g9rgjqjjb9d6wg53dwfs8n65w3qbp87c7x3pl006r"; /* updated by script */
+      sha256 = "1kdv3h749ly2sadixz3khaxrias3k72fi2ixrzniynwhgiqixz70"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm 2018.2";

From b30e64bb8aa90eb96d545b608e02a8a58d6643d5 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:56:11 -0400
Subject: [PATCH 1635/3253] jetbrains.pycharm-community: 2018.2.2 -> 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f793a5909c9c..ca37edbeb88a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -327,12 +327,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0nq4xwqczppdrswi826yzjdzqpiwl4iyi70d7g6ncqd9wyiay4z4"; /* updated by script */
+      sha256 = "0avfz2mdzwx3lz06pf79x74xs38lvk0c6l2d9bb8h9986n0qc2gw"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm Release";

From 3bc77e597729605cb4536957aa8af2b10b253db2 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:56:35 -0400
Subject: [PATCH 1636/3253] jetbrains.pycharm-professional: 2018.2.2 ->
 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ca37edbeb88a..5d57d4691ccc 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -340,12 +340,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1cf8z1wb532qhxlf0z4d791x084drfxzlaxq28hzy4f450bqbkp7"; /* updated by script */
+      sha256 = "0j65knddbrr3j3hsxp4fwqp398brzd4sfjla6bxa0g87x2k6j5hl"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm Release";

From 88692dd376fd53649e620b2a8958c407966fe351 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:56:54 -0400
Subject: [PATCH 1637/3253] jetbrains.rider: 2018.2 -> 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 5d57d4691ccc..7338b70595a7 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -353,12 +353,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2018.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0yigw9g53i6xamwva8vcd38f0aysxqkf77avms4l7l63dkap99nq"; /* updated by script */
+      sha256 = "1g2b7wszviknzd4srgcvwmci0pxyjbcmjzb4fg5clh62wwdpa16n"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider 2018.2";

From 9b69a2520a030924a9d4cdb19e31d2ca3322862b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:57:08 -0400
Subject: [PATCH 1638/3253] jetbrains.ruby-mine: 2018.2.1 -> 2018.2.2

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7338b70595a7..366b525e4b05 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -366,12 +366,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.2.1"; /* updated by script */
+    version = "2018.2.2"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */
+      sha256 = "0585dnbvmzxnj2am6b04lfw75rdhk0fby2cbj58pzzcjz5xlrhvq"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine 2018.2";

From 4b1e3376d11fbf5d16dcaf9f9d8351972d81393b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 18 Sep 2018 16:57:24 -0400
Subject: [PATCH 1639/3253] jetbrains.webstorm: 2018.2.2 -> 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 366b525e4b05..9b5008e9d61f 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -379,12 +379,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "1a31q7wrg4ihap8j6n2cg98ml1zic78drkrp0p554rgsnh7v4hwr"; /* updated by script */
+      sha256 = "0y3a1p047knc598aamxxdmcf5nr86wk60w6nk2bhcasxjyqaw6r4"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm Release";

From 8ab4cbdac337525c76d00fb14ffc30b1f9fbb79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 3 Sep 2018 19:45:54 +0200
Subject: [PATCH 1640/3253] nixos: initrd/luks: make uuid specified devices
 discoverable

---
 nixos/modules/system/boot/luksroot.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index ed8b9f01e275..1079089bc5a8 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -11,19 +11,30 @@ let
       exit 1
     }
 
+    dev_exist() {
+      local target="$1"
+      if [ -e $target ]; then
+        return 0
+      else
+        local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g')
+        local dev=$(blkid --uuid $uuid)
+        return $?
+      fi
+    }
+
     wait_target() {
         local name="$1"
         local target="$2"
         local secs="''${3:-10}"
         local desc="''${4:-$name $target to appear}"
 
-        if [ ! -e $target ]; then
+        if ! dev_exist $target; then
             echo -n "Waiting $secs seconds for $desc..."
             local success=false;
             for try in $(seq $secs); do
                 echo -n "."
                 sleep 1
-                if [ -e $target ]; then
+                if dev_exist $target; then
                     success=true
                     break
                 fi

From 546dfb51a6a373af38ee54a3ea52afc50a7f65b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 24 Sep 2018 16:38:35 +0200
Subject: [PATCH 1641/3253] jetbrains.goland: 2018.2.2 -> 2018.2.3

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9b5008e9d61f..0ea69e280024 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -275,12 +275,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.2.2"; /* updated by script */
+    version = "2018.2.3"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "10ymk9fw01a6c6harqv4pa0ywj130sjsbqhyqmw35v1b1srmxcrj"; /* updated by script */
+      sha256 = "0pd01aw1mv6w47ksgc8zbc7ppgbb64qsdgyqghiyibdjf07h53hd"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand Release";

From feb57bc9b9e8b27a96a802ac4891d98e93da6062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 24 Sep 2018 16:39:11 +0200
Subject: [PATCH 1642/3253] jetbrains.pycharm-community: 2018.2.3 -> 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 0ea69e280024..7e8a77db826d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -327,12 +327,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.2.3"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0avfz2mdzwx3lz06pf79x74xs38lvk0c6l2d9bb8h9986n0qc2gw"; /* updated by script */
+      sha256 = "1vjvbaqa1qq173m0xy16v9avav8az43s1dzks55x0gvh5yj3cyqz"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm Release";

From f9c4a74b73bedd619077cc40f63bf6b33e0406c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 24 Sep 2018 16:39:40 +0200
Subject: [PATCH 1643/3253] jetbrains.pycharm-professional: 2018.2.3 ->
 2018.2.4

---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7e8a77db826d..9bf80b050a86 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -340,12 +340,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.2.3"; /* updated by script */
+    version = "2018.2.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0j65knddbrr3j3hsxp4fwqp398brzd4sfjla6bxa0g87x2k6j5hl"; /* updated by script */
+      sha256 = "14q4n62ppp1cxrv8mq2lxv9mjm95adag9856jpl9734s0gyjj3a5"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm Release";

From 1e7997bdd2a5dba6a579912cb27ef9461e75e695 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 24 Sep 2018 14:32:54 +0200
Subject: [PATCH 1644/3253] roundcube: init at 1.3.7

---
 maintainers/maintainer-list.nix    |  5 +++++
 pkgs/servers/roundcube/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/roundcube/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 726cbd74313a..975aee445e22 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4421,6 +4421,11 @@
     github = "vrthra";
     name = "Rahul Gopinath";
   };
+  vskilet = {
+    email = "victor@sene.ovh";
+    github = "vskilet";
+    name = "Victor SENE";
+  };
   vyp = {
     email = "elisp.vim@gmail.com";
     github = "vyp";
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
new file mode 100644
index 000000000000..961bdd3c00eb
--- /dev/null
+++ b/pkgs/servers/roundcube/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name= "roundcube-${version}";
+  version = "1.3.7";
+
+  src = fetchurl {
+    url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; 
+    sha256 = "31bd37d0f89dc634064f170c6ed8981c258754b6f81eccb59a2634b29d0bb01c";
+  };
+
+  installPhase = ''
+    mkdir -p $out/
+    cp -R . $out/
+    ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
+    rm -rf $out/installer
+  '';
+
+  meta = {
+    description = "Open Source Webmail Software";
+    maintainers = with stdenv.lib.maintainers; [ vskilet ];
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb085..1fb0215ac945 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1532,6 +1532,8 @@ with pkgs;
   riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
     conf = config.riot-web.conf or null;
   };
+  
+  roundcube = callPackage ../servers/roundcube { };
 
   rsbep = callPackage ../tools/backup/rsbep { };
 

From c0660c4c00e03a57a0817ec27a542621bfbab018 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 09:44:30 -0500
Subject: [PATCH 1645/3253] cyrus-sasl: set to null on non-musl per reviewer
 suggestion

Unclear what the problem is exactly regarding regenerating files,
so this makes the change only impact build configs known to need it.
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 619c0801e960..bc5e23581ffa 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   # Avoid triggering regenerating using broken autoconf/libtool bits.
   # (many distributions carry patches to remove/replace, but this works for now)
-  dontUpdateAutotoolsGnuConfigScripts = true;
+  dontUpdateAutotoolsGnuConfigScripts = if stdenv.hostPlatform.isMusl then true else null;
 
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 

From 4cd6502925bbe78e62226dc2aced5ed47d5ebdc3 Mon Sep 17 00:00:00 2001
From: Notkea <pacien@users.noreply.github.com>
Date: Mon, 24 Sep 2018 16:57:37 +0200
Subject: [PATCH 1646/3253] matrix-synapse: 0.33.3.1 -> 0.33.5

Upgrade matrix-synapse to the latest version,
adding a new required dependency (treq)
---
 pkgs/servers/matrix-synapse/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 2aea521611c4..8cb93c209de1 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in python2Packages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.33.3.1";
+  version = "0.33.5";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0q7rjh2qwj1ym5alnv9dvgw07bm7kk7igfai9ix72c6n7qb4z4i3";
+    sha256 = "0m8pyh27cxz761wiwspj6w5dqxpm683nlrjn40fsrgf1sgiprgl6";
   };
 
   patches = [
@@ -45,7 +45,7 @@ in python2Packages.buildPythonApplication rec {
     signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack-python lxml matrix-synapse-ldap3
-    phonenumbers jsonschema affinity bcrypt sortedcontainers
+    phonenumbers jsonschema affinity bcrypt sortedcontainers treq
   ];
 
   # Checks fail because of Tox.

From 491a580716dbebe2728b19090e3625e19e899251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 24 Sep 2018 16:59:23 +0200
Subject: [PATCH 1647/3253] pythonPackages.sharedmem: init at 0.3.5

---
 .../python-modules/sharedmem/default.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/sharedmem/default.nix

diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix
new file mode 100644
index 000000000000..60c91b641098
--- /dev/null
+++ b/pkgs/development/python-modules/sharedmem/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, fetchPypi, lib, numpy }:
+
+buildPythonPackage rec {
+
+  pname = "sharedmem";
+  version = "0.3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wr438m1jmcj6ccskzm6pchv6ldx7031h040adadjmkivz5rry41";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  meta = {
+    homepage = http://rainwoodman.github.io/sharedmem/;
+    description = "Easier parallel programming on shared memory computers";
+    maintainers = with lib.maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e88a99042ec2..2f7cedb1ef11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12393,6 +12393,8 @@ in {
 
   shapely = callPackage ../development/python-modules/shapely { };
 
+  sharedmem = callPackage ../development/python-modules/sharedmem { };
+
   soco = callPackage ../development/python-modules/soco { };
 
   sopel = buildPythonPackage rec {

From d84c6bec29827d614709ce1c0222e3ae297848ae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 09:56:59 -0500
Subject: [PATCH 1648/3253] iputils: upstream fixes for musl

---
 pkgs/os-specific/linux/iputils/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index e66dbe41d013..2248f0329c60 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -30,6 +30,16 @@ in stdenv.mkDerivation {
       url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch";
       sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx";
     })
+    (fetchpatch {
+      name = "add-missing-idn-declarations.patch";
+      url = "https://github.com/iputils/iputils/commit/5007d7067918fb3d950d34c01d059e5222db679a.patch";
+      sha256 = "0dhgxdhjcbb2q6snm3mjp38l066knykmrx4k8rn167cizn7akpdx";
+    })
+    (fetchpatch {
+      name = "fix-ping-idn.patch";
+      url = "https://github.com/iputils/iputils/commit/25899e849aa3abc1ad29ebf0b830262a859eaed5.patch";
+      sha256 = "1bqjcdjjnc2j6indcli7s7gbbhkcaligvh94asixfrmjzkbn533n";
+    })
   ];
 
   prePatch = ''

From cb4eb106e440529c92b04adb2fc1ac13c0b89597 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Sep 2018 08:20:55 -0700
Subject: [PATCH 1649/3253] eid-mw: 4.4.3 -> 4.4.7 (#47076)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eid-mw/versions
---
 pkgs/tools/security/eid-mw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 9f334b4a9602..143b95d92c40 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.4.3";
+  version = "4.4.7";
 
   src = fetchFromGitHub {
-    sha256 = "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm"; 
+    sha256 = "0b1i4slxw1l2p1gpfhd5v6n1fzwi8qwf4gsbxmrbhj9qxi4c73ci"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From fe287e755ff9dcef5e09415f4935dc0b1f638b96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Sep 2018 08:23:58 -0700
Subject: [PATCH 1650/3253] mixxx: 2.1.3 -> 2.1.4 (#47012)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mixxx/versions
---
 pkgs/applications/audio/mixxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index f3318a7866b4..28e29850606a 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
     rev = "release-${version}";
-    sha256 = "1fm8lkbnxka4haidf6yr8mb3r6vaxmc97hhrp8pcx0fvq2mnzvy2";
+    sha256 = "1q1px4033marraprvgr5yq9jlz943kcc10fdkn7py2ma8cfgnipq";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c5251111335f83f56754aefff2defe6459766b03 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Mon, 24 Sep 2018 17:31:46 +0200
Subject: [PATCH 1651/3253] nixos/tests/hound: fix non-deterministic failure
 (#47152)

The test failed on Hydra in one instance because a request to the
server was sent before indexing was finished.
Retry the request until it succeeds (or times out).
---
 nixos/tests/hound.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index f21c0ad58a85..cb8e25332c07 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... } : {
        $machine->waitForUnit("network.target");
        $machine->waitForUnit("hound.service");
        $machine->waitForOpenPort(6080);
-       $machine->succeed('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
+       $machine->waitUntilSucceeds('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
 
     '';
 })

From 4406745ab46976ed5b924b46e7b4a9944c5e5409 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 24 Sep 2018 17:40:24 +0200
Subject: [PATCH 1652/3253] testssl: 2.9.5-6 -> 2.9.5-7 (#47274)

Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-7
---
 pkgs/applications/networking/testssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index cc0cffb6e3b3..4a1f71f4b4f7 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -2,7 +2,7 @@
 , dnsutils, coreutils, openssl, nettools, utillinux, procps }:
 
 let
-  version = "2.9.5-6";
+  version = "2.9.5-7";
 
 in stdenv.mkDerivation rec {
   name = "testssl.sh-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "drwetter";
     repo = "testssl.sh";
     rev = "v${version}";
-    sha256 = "0wn7lxz0ibv59v0acbsk5z3rsmr65zr1q7n4kxva1cw5xzq9ya6k";
+    sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From df1dcbf07fb91b9b9ecf676d57682e310625f2fe Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 10:39:35 -0500
Subject: [PATCH 1653/3253] e2fsprogs: patch out glibc instead of local fix so
 headers are usable

---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index e2b87007b09f..168bf7d076ce 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo, perl }:
+{ stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo, perl }:
 
 stdenv.mkDerivation rec {
   name = "e2fsprogs-1.44.4";
@@ -15,8 +15,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ libuuid gettext ];
 
   # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc")
-    "-D__GNUC_PREREQ(maj,min)=0";
+  patches = if stdenv.hostPlatform.libc == "glibc" then null
+    else [
+      (fetchpatch {
+      url = "https://raw.githubusercontent.com/void-linux/void-packages/1f3b51493031cc0309009804475e3db572fc89ad/srcpkgs/e2fsprogs/patches/fix-glibcism.patch";
+      sha256 = "1q7y8nhsfwl9r1q7nhrlikazxxj97p93kgz5wh7723cshlji2vaa";
+      extraPrefix = "";
+      })
+    ];
 
   configureFlags =
     if stdenv.isLinux then [

From 3bd0e50a28cd256deb26bcc3e0884ff6761e7472 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 10:42:57 -0500
Subject: [PATCH 1654/3253] libpfm: don't use -Werror

---
 pkgs/development/libraries/libpfm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index 25e55e45d1e2..ffd195b6462d 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
   meta = with stdenv.lib; {
     description = "Helper library to program the performance monitoring events";
     longDescription = ''

From 5b2de5126d846082c45b1dd36835fe185ba8fad4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 10:43:07 -0500
Subject: [PATCH 1655/3253] llvm7: update musl patch for sanitizers

---
 .../compilers/llvm/7/sanitizers-nongnu.patch  | 151 +++++++++---------
 1 file changed, 75 insertions(+), 76 deletions(-)

diff --git a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
index 6266eb1958d1..1f2ac97818eb 100644
--- a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
+++ b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
@@ -1,7 +1,7 @@
-From 7b4b3333a2718628b1d510ec1d8438ad67308299 Mon Sep 17 00:00:00 2001
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
 From: Will Dietz <w@wdtz.org>
-Date: Fri, 29 Jun 2018 09:48:59 -0500
-Subject: [PATCH] Ported to 6.0, taken from gentoo-musl project.
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
 
 ------
 Ported to compiler-rt-sanitizers-5.0.0. Taken from
@@ -13,7 +13,7 @@ Taken from gentoo-musl project, with a few additional minor fixes.
 ---
  lib/asan/asan_linux.cc                        |  4 +-
  lib/interception/interception_linux.cc        |  2 +-
- lib/interception/interception_linux.h         |  3 +-
+ lib/interception/interception_linux.h         |  2 +-
  lib/msan/msan_linux.cc                        |  2 +-
  lib/sanitizer_common/sanitizer_allocator.cc   |  2 +-
  .../sanitizer_common_interceptors_ioctl.inc   |  4 +-
@@ -24,7 +24,7 @@ Taken from gentoo-musl project, with a few additional minor fixes.
  .../sanitizer_platform_interceptors.h         |  4 +-
  .../sanitizer_platform_limits_posix.cc        | 37 +++++++++++--------
  lib/tsan/rtl/tsan_platform_linux.cc           |  2 +-
- 13 files changed, 51 insertions(+), 35 deletions(-)
+ 13 files changed, 51 insertions(+), 34 deletions(-)
 
 diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
 index 625f32d40..73cf77aca 100644
@@ -49,34 +49,33 @@ index 625f32d40..73cf77aca 100644
  void AsanCheckDynamicRTPrereqs() {}
  void AsanCheckIncompatibleRT() {}
 diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
-index c991550a4..2b706418b 100644
+index 26bfcd8f6..529b234f7 100644
 --- a/lib/interception/interception_linux.cc
 +++ b/lib/interception/interception_linux.cc
 @@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
  }
  
  // Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  void *GetFuncAddrVer(const char *func_name, const char *ver) {
    return dlvsym(RTLD_NEXT, func_name, ver);
  }
 diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
-index 98fe51b85..c13302b98 100644
+index 942c25609..24a4d5080 100644
 --- a/lib/interception/interception_linux.h
 +++ b/lib/interception/interception_linux.h
-@@ -35,8 +35,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
-       (::__interception::uptr) & (func),                                   \
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
        (::__interception::uptr) & WRAP(func))
  
--// Android and Solaris do not have dlvsym
--#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS
-+#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ // Android,  Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
    (::__interception::real_##func = (func##_f)(                \
         unsigned long)::__interception::GetFuncAddrVer(#func, symver))
 diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
-index 4e6321fcb..4d50feb82 100644
+index 385a650c4..6e30a8ce9 100644
 --- a/lib/msan/msan_linux.cc
 +++ b/lib/msan/msan_linux.cc
 @@ -13,7 +13,7 @@
@@ -87,12 +86,12 @@ index 4e6321fcb..4d50feb82 100644
 +#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
  
  #include "msan.h"
- #include "msan_thread.h"
+ #include "msan_report.h"
 diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
-index fc4f7a75a..76cf4f769 100644
+index 6bfd5e5ee..048f6154f 100644
 --- a/lib/sanitizer_common/sanitizer_allocator.cc
 +++ b/lib/sanitizer_common/sanitizer_allocator.cc
-@@ -23,7 +23,7 @@ namespace __sanitizer {
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
  
  // ThreadSanitizer for Go uses libc malloc/free.
  #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
@@ -102,10 +101,10 @@ index fc4f7a75a..76cf4f769 100644
  #  if !SANITIZER_GO
  extern "C" void *__libc_memalign(uptr alignment, uptr size);
 diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-index 24e7548a5..20259b1d6 100644
+index 2d633c173..b6eb23116 100644
 --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
 +++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
-@@ -102,7 +102,7 @@ static void ioctl_table_fill() {
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
    _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
  #endif
  
@@ -114,7 +113,7 @@ index 24e7548a5..20259b1d6 100644
    // Conflicting request ids.
    // _(CDROMAUDIOBUFSIZ, NONE, 0);
    // _(SNDCTL_TMR_CONTINUE, NONE, 0);
-@@ -363,7 +363,7 @@ static void ioctl_table_fill() {
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
    _(VT_WAITACTIVE, NONE, 0);
  #endif
  
@@ -137,59 +136,59 @@ index 469c8eb7e..24f87867d 100644
                         void *old_rlim) {
    if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
 diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
-index 6c83e8db4..542c4fe64 100644
+index 96d6c1eff..9e2b7fb9d 100644
 --- a/lib/sanitizer_common/sanitizer_linux.cc
 +++ b/lib/sanitizer_common/sanitizer_linux.cc
-@@ -522,13 +522,13 @@ const char *GetEnv(const char *name) {
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
  #endif
  }
  
--#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_NONGNU
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
  extern "C" {
-   SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
  }
  #endif
  
--#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
-+#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
+     !SANITIZER_OPENBSD
  static void ReadNullSepFileToArray(const char *path, char ***arr,
                                     int arr_size) {
-   char *buff;
-@@ -569,6 +569,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
  #elif SANITIZER_NETBSD
    *argv = __ps_strings->ps_argvstr;
-   *argv = __ps_strings->ps_envstr;
+   *envp = __ps_strings->ps_envstr;
 +#elif SANITIZER_NONGNU
 +    static const int kMaxArgv = 2000, kMaxEnvp = 2000;
 +    ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
 +    ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
- #else
+ #else // SANITIZER_FREEBSD
  #if !SANITIZER_GO
    if (&__libc_stack_end) {
 diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-index 56fdfc870..a932d5db1 100644
+index 4962ff832..438f94dbe 100644
 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
 +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
-@@ -174,7 +174,7 @@ bool SanitizerGetThreadName(char *name, int max_len) {
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
  }
  
- #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
--    !SANITIZER_NETBSD && !SANITIZER_SOLARIS
-+    !SANITIZER_NETBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO &&               \
+-    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
  static uptr g_tls_size;
  
  #ifdef __i386__
-@@ -207,7 +207,7 @@ void InitTlsSize() { }
- 
- #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) \
-     || defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) \
--    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID
-+    || defined(__arm__)) && SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) ||          \
+      defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) ||    \
+      defined(__arm__)) &&                                                      \
+-    SANITIZER_LINUX && !SANITIZER_ANDROID
++    SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
  // sizeof(struct pthread) from glibc.
- static atomic_uintptr_t kThreadDescriptorSize;
+ static atomic_uintptr_t thread_descriptor_size;
  
-@@ -391,7 +391,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
  
  #if !SANITIZER_GO
  static void GetTls(uptr *addr, uptr *size) {
@@ -198,29 +197,29 @@ index 56fdfc870..a932d5db1 100644
  # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
    *addr = ThreadSelf();
    *size = GetTlsSize();
-@@ -432,7 +432,7 @@ static void GetTls(uptr *addr, uptr *size) {
-       *addr = (uptr)tcb->tcb_dtv[1];
-     }
-   }
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+   *addr = 0;
+   *size = 0;
 -#elif SANITIZER_ANDROID
 +#elif SANITIZER_ANDROID || SANITIZER_NONGNU
    *addr = 0;
    *size = 0;
  #elif SANITIZER_SOLARIS
-@@ -448,7 +448,7 @@ static void GetTls(uptr *addr, uptr *size) {
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
  #if !SANITIZER_GO
  uptr GetTlsSize() {
- #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
--    SANITIZER_SOLARIS
-+    SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD ||              \
+-    SANITIZER_OPENBSD || SANITIZER_SOLARIS
++    SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
    uptr addr, size;
    GetTls(&addr, &size);
    return size;
 diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
-index 334903c26..fc2afac2c 100644
+index d81e25580..e10680ac8 100644
 --- a/lib/sanitizer_common/sanitizer_platform.h
 +++ b/lib/sanitizer_common/sanitizer_platform.h
-@@ -195,6 +195,12 @@
+@@ -208,6 +208,12 @@
  # define SANITIZER_SOLARIS32 0
  #endif
  
@@ -230,14 +229,14 @@ index 334903c26..fc2afac2c 100644
 +# define SANITIZER_NONGNU 0
 +#endif
 +
- // By default we allow to use SizeClassAllocator64 on 64-bit platform.
- // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
- // does not work well and we need to fallback to SizeClassAllocator32.
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
 diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-index b99ac4480..628d226a1 100644
+index f95539a73..6c53b3415 100644
 --- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
 +++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  # include "sanitizer_platform_limits_solaris.h"
  #endif
  
@@ -246,17 +245,17 @@ index b99ac4480..628d226a1 100644
  # define SI_LINUX_NOT_ANDROID 1
  #else
  # define SI_LINUX_NOT_ANDROID 0
-@@ -291,7 +291,7 @@
-   (SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID)
+@@ -322,7 +322,7 @@
  #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
- #define SANITIZER_INTERCEPT_SHMCTL                       \
--  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
-+  (SI_NETBSD || SI_SOLARIS || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
-                  SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_SHMCTL          \
+   (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+-  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+     SANITIZER_WORDSIZE == 64))  // NOLINT
  #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
  #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
 diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index feb7bad6f..4e89ab2a6 100644
+index 54da635d7..2f6ff69c3 100644
 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 @@ -14,6 +14,9 @@
@@ -357,9 +356,9 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
 +#endif
  
- COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
- CHECK_SIZE_AND_OFFSET(dirent, d_ino);
-@@ -1138,7 +1145,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
  
  CHECK_TYPE_SIZE(ether_addr);
  
@@ -368,7 +367,7 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_TYPE_SIZE(ipc_perm);
  # if SANITIZER_FREEBSD
  CHECK_SIZE_AND_OFFSET(ipc_perm, key);
-@@ -1199,7 +1206,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
  CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
  #endif
  
@@ -377,7 +376,7 @@ index feb7bad6f..4e89ab2a6 100644
  COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
  #endif
  
-@@ -1249,7 +1256,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
  COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
  #endif
  
@@ -386,7 +385,7 @@ index feb7bad6f..4e89ab2a6 100644
  COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
  CHECK_SIZE_AND_OFFSET(FILE, _flags);
  CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
-@@ -1268,7 +1275,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
  CHECK_SIZE_AND_OFFSET(FILE, _fileno);
  #endif
  
@@ -396,10 +395,10 @@ index feb7bad6f..4e89ab2a6 100644
  CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
  CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
 diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index e14d5f575..389a3bc88 100644
+index de989b780..51a97b554 100644
 --- a/lib/tsan/rtl/tsan_platform_linux.cc
 +++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -285,7 +285,7 @@ void InitializePlatform() {
+@@ -294,7 +294,7 @@ void InitializePlatform() {
  // This is required to properly "close" the fds, because we do not see internal
  // closes within glibc. The code is a pure hack.
  int ExtractResolvFDs(void *state, int *fds, int nfd) {
@@ -409,5 +408,5 @@ index e14d5f575..389a3bc88 100644
    struct __res_state *statp = (struct __res_state*)state;
    for (int i = 0; i < MAXNS && cnt < nfd; i++) {
 -- 
-2.18.0
+2.19.0
 

From ba278c3b87d9bd1941c51f8566c4972f30deefa7 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Mon, 24 Sep 2018 09:21:16 -0700
Subject: [PATCH 1656/3253] boost: limit concurrent jobs to the maximum
 supported number (#47255)

---
 pkgs/development/libraries/boost/generic.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 32899b748113..4131e5f7a27c 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -47,10 +47,24 @@ let
   # To avoid library name collisions
   layout = if taggedLayout then "tagged" else "system";
 
+  # Versions of b2 before 1.65 have job limits; specifically:
+  #   - Versions before 1.58 support up to 64 jobs[0]
+  #   - Versions before 1.65 support up to 256 jobs[1]
+  #
+  # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
+  # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
+  jobs =
+    if versionOlder version "1.58" then
+      "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
+    else if versionOlder version "1.65" then
+      "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
+    else
+      "$NIX_BUILD_CORES";
+
   b2Args = concatStringsSep " " ([
     "--includedir=$dev/include"
     "--libdir=$out/lib"
-    "-j$NIX_BUILD_CORES"
+    "-j${jobs}"
     "--layout=${layout}"
     "variant=${variant}"
     "threading=${threading}"

From 7cd824116a11bdfc90931433b35620cc675feb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Sep 2018 14:22:56 -0300
Subject: [PATCH 1657/3253] shades-of-gray-theme: init at 1.1.1 (#47280)

---
 pkgs/misc/themes/shades-of-gray/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/misc/themes/shades-of-gray/default.nix

diff --git a/pkgs/misc/themes/shades-of-gray/default.nix b/pkgs/misc/themes/shades-of-gray/default.nix
new file mode 100644
index 000000000000..009a45b39dd9
--- /dev/null
+++ b/pkgs/misc/themes/shades-of-gray/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "shades-of-gray-theme-${version}";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "WernerFP";
+    repo = "Shades-of-gray-theme";
+    rev = version;
+    sha256 = "1m75m6aq4hh39m8qrmbkaw31j4gzkh63ial4xnhw2habf31av682";
+  };
+
+  buildInputs = [ gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Shades-of-gray* README.md preview_01.png $out/share/themes/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A flat dark GTK-theme with ergonomic contrasts";
+    homepage = https://github.com/WernerFP/Shades-of-gray-theme;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb085..3dd653b9d340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22030,6 +22030,8 @@ with pkgs;
     libsemanage = libsemanage.override { python = python3; };
   };
 
+  shades-of-gray-theme = callPackage ../misc/themes/shades-of-gray { };
+
   sierra-gtk-theme = callPackage ../misc/themes/sierra { };
 
   slock = callPackage ../misc/screensavers/slock {

From 3b9d20ab8c01b4ad40af17c2e74180f2787ade29 Mon Sep 17 00:00:00 2001
From: 1000101 <jan.hrnko@satoshilabs.com>
Date: Mon, 24 Sep 2018 19:23:30 +0200
Subject: [PATCH 1658/3253] add myself 1000101 as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 726cbd74313a..060f770f8f9f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18,6 +18,11 @@
   for an example on how to work with this data.
   */
 {
+  "1000101" = {
+    email = "jan.hrnko@satoshilabs.com";
+    github = "1000101";
+    name = "Jan Hrnko";
+  };
   a1russell = {
     email = "adamlr6+pub@gmail.com";
     github = "a1russell";

From 6017c6fa5b801f13173de7485856a07cd32a35c9 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 24 Sep 2018 17:46:33 +0200
Subject: [PATCH 1659/3253] *: remove DappHub projects

DappHub maintains a separate overlay at
https://github.com/dapphub/dapptools/blob/master/overlay.nix
---
 pkgs/applications/altcoins/dapp.nix           | 33 ----------
 pkgs/applications/altcoins/default.nix        |  6 --
 pkgs/applications/altcoins/ethrun.nix         | 26 --------
 .../applications/altcoins/ethsign/default.nix | 60 ------------------
 pkgs/applications/altcoins/hevm.nix           | 62 -------------------
 pkgs/applications/altcoins/seth.nix           | 33 ----------
 pkgs/top-level/all-packages.nix               |  5 --
 7 files changed, 225 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/dapp.nix
 delete mode 100644 pkgs/applications/altcoins/ethrun.nix
 delete mode 100644 pkgs/applications/altcoins/ethsign/default.nix
 delete mode 100644 pkgs/applications/altcoins/hevm.nix
 delete mode 100644 pkgs/applications/altcoins/seth.nix

diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
deleted file mode 100644
index a89725f6e30f..000000000000
--- a/pkgs/applications/altcoins/dapp.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hevm }:
-
-stdenv.mkDerivation rec {
-  name = "dapp-${version}";
-  version = "0.5.7";
-
-  src = fetchFromGitHub {
-    owner = "dapphub";
-    repo = "dapp";
-    rev = "v${version}";
-    sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
-  };
-
-  nativeBuildInputs = [makeWrapper shellcheck];
-  buildPhase = "true";
-  doCheck = true;
-  checkPhase = "make test";
-  makeFlags = ["prefix=$(out)"];
-  postInstall = let path = lib.makeBinPath [
-    nodejs solc git seth hevm
-  ]; in ''
-    wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
-  '';
-
-  meta = {
-    description = "Simple tool for creating Ethereum-based dapps";
-    homepage = https://github.com/dapphub/dapp/;
-    maintainers = [stdenv.lib.maintainers.dbrock];
-    license = lib.licenses.gpl3;
-    inherit version;
-  };
-}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index f075903332b4..e0a0dbef632c 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -50,7 +50,6 @@ rec {
   dogecoin  = callPackage ./dogecoin.nix { boost = boost165; withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { boost = boost165; withGui = false; };
 
-  ethsign = callPackage ./ethsign { };
 
   freicoin = callPackage ./freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ./go-ethereum.nix {
@@ -78,11 +77,6 @@ rec {
   namecoind = callPackage ./namecoin.nix { withGui = false; };
 
   ethabi = callPackage ./ethabi.nix { };
-  ethrun = callPackage ./ethrun.nix { };
-  seth = callPackage ./seth.nix { };
-  dapp = callPackage ./dapp.nix { };
-
-  hevm = (haskellPackages.callPackage ./hevm.nix {});
 
   stellar-core = callPackage ./stellar-core.nix { };
 
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
deleted file mode 100644
index c58d9d8faf48..000000000000
--- a/pkgs/applications/altcoins/ethrun.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  name = "ethrun-${version}";
-  version = "0.1.0";
-
-  src = fetchFromGitHub {
-    owner = "dapphub";
-    repo = "ethrun";
-    rev = "v${version}";
-    sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
-  };
-
-  cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
-
-  meta = with stdenv.lib; {
-    description = "Directly run Ethereum bytecode";
-    homepage = https://github.com/dapphub/ethrun/;
-    maintainers = [ maintainers.dbrock ];
-    license = licenses.gpl3;
-    broken = true; # mark temporary as broken
-    inherit version;
-  };
-}
diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix
deleted file mode 100644
index 8e89de4d6906..000000000000
--- a/pkgs/applications/altcoins/ethsign/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }:
-
-buildGoPackage rec {
-  name = "ethsign-${version}";
-  version = "0.8.2";
-
-  goPackagePath = "github.com/dapphub/ethsign";
-  hardeningDisable = ["fortify"];
-
-  src = fetchFromGitHub {
-    owner = "dapphub";
-    repo = "ethsign";
-    rev = "v${version}";
-    sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh";
-  };
-
-  extraSrcs = [
-    {
-      goPackagePath = "github.com/ethereum/go-ethereum";
-      src = fetchFromGitHub {
-        owner = "ethereum";
-        repo = "go-ethereum";
-        rev = "v1.7.3";
-        sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11";
-      };
-    }
-    {
-      goPackagePath = "gopkg.in/urfave/cli.v1";
-      src = fetchFromGitHub {
-        owner = "urfave";
-        repo = "cli";
-        rev = "v1.19.1";
-        sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122";
-        sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/sys";
-      src = fetchgit {
-        url = "https://go.googlesource.com/sys";
-        rev = "53aa286056ef226755cd898109dbcdaba8ac0b81";
-        sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1";
-      };
-    }
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/dapphub/ethsign;
-    description = "Make raw signed Ethereum transactions";
-    broken = stdenv.isDarwin;  # test with CoreFoundation 10.11
-    license = [licenses.gpl3];
-  };
-}
diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix
deleted file mode 100644
index e7f47d0f2200..000000000000
--- a/pkgs/applications/altcoins/hevm.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
-, base16-bytestring, base64-bytestring, binary, brick, bytestring
-, cereal, containers, cryptonite, data-dword, deepseq, directory
-, filepath, ghci-pretty, here, HUnit, lens
-, lens-aeson, memory, monad-par, mtl, optparse-generic, process
-, QuickCheck, quickcheck-text, readline, rosezipper, scientific
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, unordered-containers, vector, vty
-
-, restless-git
-
-, fetchFromGitHub, lib, makeWrapper
-, zlib, bzip2, solc, coreutils
-, bash
-}:
-
-lib.overrideDerivation (mkDerivation rec {
-  pname = "hevm";
-  version = "0.8.5";
-
-  src = fetchFromGitHub {
-    owner = "dapphub";
-    repo = "hevm";
-    rev = "v${version}";
-    sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
-  };
-
-  isLibrary = false;
-  isExecutable = true;
-  enableSharedExecutables = false;
-
-  postInstall = ''
-    wrapProgram $out/bin/hevm \
-       --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
-       --suffix PATH : "${lib.makeBinPath [bash coreutils]}"
-  '';
-
-  extraLibraries = [
-    abstract-par aeson ansi-wl-pprint base base16-bytestring
-    base64-bytestring binary brick bytestring cereal containers
-    cryptonite data-dword deepseq directory filepath ghci-pretty lens
-    lens-aeson memory monad-par mtl optparse-generic process QuickCheck
-    quickcheck-text readline rosezipper scientific temporary text text-format
-    unordered-containers vector vty restless-git
-  ];
-  executableHaskellDepends = [
-    async readline zlib bzip2
-  ];
-  testHaskellDepends = [
-    base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
-    tasty tasty-hunit tasty-quickcheck text vector
-  ];
-
-  homepage = https://github.com/dapphub/hevm;
-  description = "Ethereum virtual machine evaluator";
-  license = stdenv.lib.licenses.agpl3;
-  maintainers = [stdenv.lib.maintainers.dbrock];
-  broken = true; # 2018-04-10
-}) (attrs: {
-  buildInputs = attrs.buildInputs ++ [solc];
-  nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper];
-})
diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
deleted file mode 100644
index 334ec9277e1b..000000000000
--- a/pkgs/applications/altcoins/seth.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, makeWrapper, lib, fetchFromGitHub
-, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which
-, nodejs, ethsign
-}:
-
-stdenv.mkDerivation rec {
-  name = "seth-${version}";
-  version = "0.6.3";
-
-  src = fetchFromGitHub {
-    owner = "dapphub";
-    repo = "seth";
-    rev = "v${version}";
-    sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk";
-  };
-
-  nativeBuildInputs = [makeWrapper];
-  buildPhase = "true";
-  makeFlags = ["prefix=$(out)"];
-  postInstall = let path = lib.makeBinPath [
-    bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign
-  ]; in ''
-    wrapProgram "$out/bin/seth" --prefix PATH : "${path}"
-  '';
-
-  meta = {
-    description = "Command-line client for talking to Ethereum nodes";
-    homepage = https://github.com/dapphub/seth/;
-    maintainers = [stdenv.lib.maintainers.dbrock];
-    license = lib.licenses.gpl3;
-    inherit version;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb085..dcfe65cda078 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15536,12 +15536,7 @@ with pkgs;
 
 
   go-ethereum = self.altcoins.go-ethereum;
-  ethsign = self.altcoins.ethsign;
   ethabi = self.altcoins.ethabi;
-  ethrun = self.altcoins.ethrun;
-  seth = self.altcoins.seth;
-  dapp = self.altcoins.dapp;
-  hevm = self.altcoins.hevm;
 
   parity = self.altcoins.parity;
   parity-beta = self.altcoins.parity-beta;

From 180d68ab39801759853b3d85922446f5733eb02f Mon Sep 17 00:00:00 2001
From: 1000101 <jan.hrnko@satoshilabs.com>
Date: Mon, 24 Sep 2018 19:25:21 +0200
Subject: [PATCH 1660/3253] trezord: 2.0.14 -> 2.0.19

---
 pkgs/servers/trezord/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 2db004d9000f..9869da95a048 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "trezord-go-${version}";
-  version = "2.0.14";
+  version = "2.0.19";
 
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
   hardeningDisable = [ "fortify" ];
@@ -13,14 +13,14 @@ buildGoPackage rec {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv";
+    sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs";
   };
 
   meta = with stdenv.lib; {
     description = "TREZOR Communication Daemon aka TREZOR Bridge";
-    homepage = https://mytrezor.com;
-    license = licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ canndrew jb55 ];
+    homepage = https://trezor.io;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ canndrew jb55 maintainers."1000101"];
     platforms = platforms.linux;
   };
 }

From 2babfb5a88bbafc22b7d231eebb4db095a3cf0e9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Sep 2018 19:34:35 +0200
Subject: [PATCH 1661/3253] eztrace: 1.0.6 -> 1.1-7 (#47282)

See https://hydra.nixos.org/build/80721509
Addresses #45960
---
 pkgs/development/tools/profiling/EZTrace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 2ff337ef2083..8155f3016c3f 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.6";
+  version = "1.1-7";
   name = "EZTrace-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz";
-    sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr";
+    url = "https://gforge.inria.fr/frs/download.php/file/37155/eztrace-${version}.tar.gz";
+    sha256 = "0cr2d4fdv4ljvag55dsz3rpha1jan2gc3jhr06ycyk43450pl58p";
   };
 
   # Goes past the rpl_malloc linking failure; fixes silent file breakage

From 082bf52e31cc0c29aa882cec79f265c7ccda3636 Mon Sep 17 00:00:00 2001
From: 1000101 <jan.hrnko@satoshilabs.com>
Date: Mon, 24 Sep 2018 19:26:56 +0200
Subject: [PATCH 1662/3253] nixos/trezord: revised and updated udev rules

nixos/trezord: revised and updated udev rules
---
 nixos/modules/services/hardware/trezord.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix
index f2ec00a7d3e1..dfefc1171e62 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixos/modules/services/hardware/trezord.nix
@@ -26,15 +26,14 @@ in {
       name = "trezord-udev-rules";
       destination = "/etc/udev/rules.d/51-trezor.rules";
       text = ''
-        # Trezor 1
-        SUBSYSTEM=="usb",  ATTR{idVendor}=="534c",  ATTR{idProduct}=="0001",  MODE="0666", GROUP="dialout", SYMLINK+="trezor%n"
-        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout"
+        # TREZOR v1 (One)
+        SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001",  MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
 
-        # Trezor 2 (Model-T)
-        SUBSYSTEM=="usb",  ATTR{idVendor}=="1209",  ATTR{idProduct}=="53c0",  MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-        SUBSYSTEM=="usb",  ATTR{idVendor}=="1209",  ATTR{idProduct}=="53c1",  MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-        KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
-  ];
+        # TREZOR v2 (T)
+        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
+        SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
       '';
     });
 

From 2aa0b85653fad1dac0f1d22670d414d833eaf2e7 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 24 Sep 2018 10:57:28 -0700
Subject: [PATCH 1663/3253] clightning: 0.6.0 -> 0.6.1

Update to the latest release.

Highlights for c-lightning users
--------------------------------

  - Less stuck payments: Liveness ping test before locking up funds with peers.
  - Better routing: now considers size of channels.
  - Fewer spurious closes: fee estimate improvements, and new feerates command
  - Several annoying bugs fixed.

Highlights for the network
--------------------------

  - Gossipd now less spammy with channel_update.
  - option_data_loss_protect to protect peers against being out-of-date.
  - Payment errors now refer to the correct channel.

Internal Improvements
---------------------

  - Simplified client flow; after init message exchange by connectd, each is
    isolated in its own daemon.
  - JSON parameter handling vastly simplfied.
  - Python testing framework now uses proper fixtures, and split into separate
    files.
  - Many other cleanups and clarifications.
  - We keepachangelog.com!

Signed-off-by: William Casarin <jb55@jb55.com>
---
 pkgs/applications/altcoins/clightning.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix
index d7e4ee233a86..5ef1c06688de 100644
--- a/pkgs/applications/altcoins/clightning.nix
+++ b/pkgs/applications/altcoins/clightning.nix
@@ -4,14 +4,14 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "clightning-${version}";
-  version = "0.6";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "ElementsProject";
     repo = "lightning";
     rev = "v${version}";
-    sha256 = "1xbi8c7kn21wj255fxnb9s0sqnzbn3wsz4p96z084k8mw1nc71vn";
+    sha256 = "0qx30i1c97ic4ii8bm0sk9dh76nfg4ihl9381gxjj14i4jr1q8y4";
   };
 
   enableParallelBuilding = true;

From c160745a7bcf975dd8756695df5013575e6866ba Mon Sep 17 00:00:00 2001
From: rokk4 <github@makroell.de>
Date: Mon, 24 Sep 2018 20:10:51 +0200
Subject: [PATCH 1664/3253] ssocr: init at 2018-08-11

---
 maintainers/maintainer-list.nix          |  5 +++++
 pkgs/applications/misc/ssocr/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/misc/ssocr/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 726cbd74313a..b2496eb62a6d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2174,6 +2174,11 @@
     github = "krav";
     name = "Kristoffer Thømt Ravneberg";
   };
+  kroell = {
+    email = "nixosmainter@makroell.de";
+    github = "rokk4";
+    name = "Matthias Axel Kröll";
+  };
   kristoff3r = {
     email = "k.soeholm@gmail.com";
     github = "kristoff3r";
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
new file mode 100644
index 000000000000..aee486ddf0c2
--- /dev/null
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, imlib2, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "ssocr-${version}";
+  version = "unstable-2018-08-11";
+
+  src = fetchFromGitHub {
+    owner = "auerswal";
+    repo = "ssocr";
+    rev = "5e47e26b125a1a13bc79de93a5e87dd0b51354ca";
+    sha256 = "0yzprwflky9a7zxa3zic7gvdwqg0zy49zvrqkdxng2k1ng78k3s7";
+  };
+
+  nativeBuildInputs = [ imlib2 libX11 ]; 
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Seven Segment Optical Character Recognition";
+    homepage = https://github.com/auerswal/ssocr;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.kroell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb085..d877e675fbb1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5404,6 +5404,8 @@ with pkgs;
     tlsSupport = true;
   };
 
+  ssocr = callPackage ../applications/misc/ssocr { };
+
   ssss = callPackage ../tools/security/ssss { };
 
   stabber = callPackage ../misc/stabber { };

From af476db8cb1f896d496c0247de49c488cf449f35 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:23:41 -0400
Subject: [PATCH 1665/3253] hoppet: init at 1.2.0

---
 .../libraries/physics/hoppet/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/hoppet/default.nix

diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
new file mode 100644
index 000000000000..55714afbdce9
--- /dev/null
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gfortran }:
+
+stdenv.mkDerivation rec {
+  name = "hoppet-${version}";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "https://hoppet.hepforge.org/downloads/${name}.tgz";
+    sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz";
+  };
+
+  buildInputs = [ gfortran ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Higher Order Perturbative Parton Evolution Toolkit";
+    license     = licenses.gpl2;
+    homepage    = https://hoppet.hepforge.org;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 500a713f22ba..34cb72b97282 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21401,6 +21401,8 @@ with pkgs;
 
   ### SCIENCE / PHYSICS
 
+  hoppet = callPackage ../development/libraries/physics/hoppet { };
+
   fastjet = callPackage ../development/libraries/physics/fastjet { };
 
   fastnlo = callPackage ../development/libraries/physics/fastnlo { };

From f793b9fd06a9fb8581b3110fc9c817322258f49a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:24:36 -0400
Subject: [PATCH 1666/3253] mela: init at 2.0.1

---
 .../libraries/physics/mela/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/mela/default.nix

diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
new file mode 100644
index 000000000000..a608a7f6b0f7
--- /dev/null
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, gfortran }:
+
+stdenv.mkDerivation rec {
+  name = "mela-${version}";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "vbertone";
+    repo = "MELA";
+    rev = version;
+    sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y";
+  };
+
+  buildInputs = [ gfortran ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "a Mellin Evolution LibrAry";
+    license     = licenses.gpl3;
+    homepage    = https://github.com/vbertone/MELA;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34cb72b97282..fa350083a8e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21421,6 +21421,8 @@ with pkgs;
 
   mcgrid = callPackage ../development/libraries/physics/mcgrid { };
 
+  mela = callPackage ../development/libraries/physics/mela { };
+
   nlojet = callPackage ../development/libraries/physics/nlojet { };
 
   pythia = callPackage ../development/libraries/physics/pythia { };

From 5c2a7f104eb06415831ffe11e00d636959dcdb73 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:25:38 -0400
Subject: [PATCH 1667/3253] qcdnum: init at 17-01-14

---
 .../libraries/physics/qcdnum/default.nix      | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/qcdnum/default.nix

diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
new file mode 100644
index 000000000000..1a3334562641
--- /dev/null
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gfortran }:
+
+stdenv.mkDerivation rec {
+  name = "QCDNUM-${version}";
+  version = "17-01-14";
+
+  src = fetchurl {
+    url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz";
+    sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31";
+  };
+
+  nativeBuildInputs = [ gfortran ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77";
+    license     = stdenv.lib.licenses.gpl3;
+    homepage    = https://www.nikhef.nl/~h24/qcdnum/index.html;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa350083a8e1..fa39ba9ef8b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21438,6 +21438,8 @@ with pkgs;
     withRootSupport = true;
   });
 
+  qcdnum = callPackage ../development/libraries/physics/qcdnum { };
+
   ### SCIENCE/ROBOTICS
 
   apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };

From 3187db6e8d529a80d112204a9873a0c02fe1f68e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:27:20 -0400
Subject: [PATCH 1668/3253] root5: init at 5.34.36

---
 pkgs/applications/science/misc/root/5.nix     |  77 +++++++++++++
 .../science/misc/root/sw_vers_root5.patch     | 104 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 185 insertions(+)
 create mode 100644 pkgs/applications/science/misc/root/5.nix
 create mode 100644 pkgs/applications/science/misc/root/sw_vers_root5.patch

diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
new file mode 100644
index 000000000000..7f43dfb328a8
--- /dev/null
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
+, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1
+, Cocoa, OpenGL, noSplash ? false }:
+
+stdenv.mkDerivation rec {
+  name = "root-${version}";
+  version = "5.34.36";
+
+  src = fetchurl {
+    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
+    sha256 = "1kbx1jxc0i5xfghpybk8927a0wamxyayij9c74zlqm0595gqx1pw";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
+    ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
+    ;
+
+  patches = [
+    ./sw_vers_root5.patch
+  ];
+
+  preConfigure = ''
+    patchShebangs build/unix/
+    ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/
+  '' + stdenv.lib.optionalString noSplash ''
+    substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
+  '';
+
+  cmakeFlags = [
+    "-Drpath=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-Dalien=OFF"
+    "-Dbonjour=OFF"
+    "-Dcastor=OFF"
+    "-Dchirp=OFF"
+    "-Ddavix=OFF"
+    "-Ddcache=OFF"
+    "-Dfftw3=OFF"
+    "-Dfitsio=OFF"
+    "-Dfortran=OFF"
+    "-Dgfal=OFF"
+    "-Dgsl_shared=ON"
+    "-Dgviz=OFF"
+    "-Dhdfs=OFF"
+    "-Dkrb5=OFF"
+    "-Dldap=OFF"
+    "-Dmathmore=ON"
+    "-Dmonalisa=OFF"
+    "-Dmysql=OFF"
+    "-Dodbc=OFF"
+    "-Dopengl=ON"
+    "-Doracle=OFF"
+    "-Dpgsql=OFF"
+    "-Dpythia6=OFF"
+    "-Dpythia8=OFF"
+    "-Drfio=OFF"
+    "-Dsqlite=OFF"
+    "-Dssl=OFF"
+    "-Dxml=ON"
+    "-Dxrootd=OFF"
+  ]
+  ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
+
+  enableParallelBuilding = true;
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with stdenv.lib; {
+    homepage = https://root.cern.ch/;
+    description = "A data analysis framework";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/applications/science/misc/root/sw_vers_root5.patch b/pkgs/applications/science/misc/root/sw_vers_root5.patch
new file mode 100644
index 000000000000..f044bed91f3d
--- /dev/null
+++ b/pkgs/applications/science/misc/root/sw_vers_root5.patch
@@ -0,0 +1,104 @@
+diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
+--- a/build/unix/compiledata.sh
++++ b/build/unix/compiledata.sh
+@@ -49,7 +49,7 @@ fi
+ 
+ if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
+    [ "$ARCH" = "macosxicc" ]; then
+-   macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
++   macosx_minor=7
+    SOEXT="so"
+    if [ $macosx_minor -ge 5 ]; then
+       if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
+diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
+--- a/cmake/modules/SetUpMacOS.cmake
++++ b/cmake/modules/SetUpMacOS.cmake
+@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
+ #---------------------------------------------------------------------------------------------------------
+ 
+ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
+-  EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
+-                  COMMAND cut -d . -f 1-2
+-                  OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
+-  EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
+-                  COMMAND cut -d . -f 2
+-                  OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-  if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+     set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
+-  endif()
+ 
+-  if(${MACOSX_MINOR} GREATER 4)
+     #TODO: check haveconfig and rpath -> set rpath true
+     #TODO: check Thread, define link command
+     #TODO: more stuff check configure script
+-    execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
+-    if(${SYSCTL_OUTPUT} MATCHES 64)
+-       MESSAGE(STATUS "Found a 64bit system")
+        set(ROOT_ARCHITECTURE macosx64)
+        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
+        SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
+@@ -38,28 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
+        SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
+-    else(${SYSCTL_OUTPUT} MATCHES 64)
+-       MESSAGE(STATUS "Found a 32bit system")
+-       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+-       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+-       SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
+-    endif(${SYSCTL_OUTPUT} MATCHES 64)
+-  endif()
+-
+-  if(MACOSX_VERSION VERSION_GREATER 10.6)
+-    set(MACOSX_SSL_DEPRECATED ON)
+-  endif()
+-  if(MACOSX_VERSION VERSION_GREATER 10.7)
+-    set(MACOSX_ODBC_DEPRECATED ON)
+-  endif()
+-  if(MACOSX_VERSION VERSION_GREATER 10.8)
+-    set(MACOSX_GLU_DEPRECATED ON)
+-    set(MACOSX_KRB5_DEPRECATED ON)
+-    set(MACOSX_TMPNAM_DEPRECATED ON)
+-  endif()
+-  if(MACOSX_VERSION VERSION_GREATER 10.9)
+-    set(MACOSX_LDAP_DEPRECATED ON)
+-  endif()
+ 
+   if (CMAKE_COMPILER_IS_GNUCXX)
+      message(STATUS "Found GNU compiler collection")
+@@ -132,7 +96,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
+   endif()
+ 
+   #---Set Linker flags----------------------------------------------------------------------
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}  -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
+ 
+ 
+ else (CMAKE_SYSTEM_NAME MATCHES Darwin)
+diff --git a/config/root-config.in b/config/root-config.in
+--- a/config/root-config.in
++++ b/config/root-config.in
+@@ -391,7 +391,7 @@ macosxicc)
+    ;;
+ macosx64)
+    # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
+-   macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
++   macosx_minor=7
+    # cannot find the one linked to libGraf if relocated after built
+    if [ $macosx_minor -le 4 ]; then
+       rootlibs="$rootlibs -lfreetype"
+diff --git a/cint/ROOT/CMakeLists.txt b/cint/ROOT/CMakeLists.txt
+--- a/cint/ROOT/CMakeLists.txt
++++ b/cint/ROOT/CMakeLists.txt
+@@ -232,9 +232,7 @@ foreach(_name ${CINTINCDLLNAMES})
+                        DEPENDS ${HEADER_OUTPUT_PATH}/systypes.h
+                       )
+
+-    if(MACOSX_MINOR GREATER 4)
+       set(_ExtraFlag "-D__DARWIN_UNIX03")
+-    endif()
+
+     add_custom_command(OUTPUT ${OutFileName}
+                        COMMAND cint_tmp -K -w1 -z${_name} -n${OutFileName} -D__MAKECINT__ -DG__MAKECINT ${_ExtraFlag} -c-2 -Z0 ${InFileName} ${AdditionalHeaderFiles} ${CMAKE_BINARY_DIR}/cint/cint/include/sys/types.h ${CMAKE_SOURCE_DIR}/cint/cint/lib/posix/posix.h
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa39ba9ef8b9..ebaf793295cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21380,6 +21380,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };
 
+  root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
+  });
+
   simgrid = callPackage ../applications/science/misc/simgrid { };
 
   spyder = callPackage ../applications/science/spyder { };

From 4f80119bc7c8da84b507cf1cea85317f0b4e5fa6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:29:29 -0400
Subject: [PATCH 1669/3253] applgrid: init at 1.4.70

---
 .../libraries/physics/applgrid/bad_code.patch | 39 +++++++++++++++++
 .../libraries/physics/applgrid/default.nix    | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/applgrid/bad_code.patch
 create mode 100644 pkgs/development/libraries/physics/applgrid/default.nix

diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/development/libraries/physics/applgrid/bad_code.patch
new file mode 100644
index 000000000000..c1c8f618fbb3
--- /dev/null
+++ b/pkgs/development/libraries/physics/applgrid/bad_code.patch
@@ -0,0 +1,39 @@
+diff --git a/appl_grid/appl_grid.h b/appl_grid/appl_grid.h
+index 5059622..a0651c9 100644
+--- a/appl_grid/appl_grid.h
++++ b/appl_grid/appl_grid.h
+@@ -56,7 +56,7 @@ public:
+   class exception : public std::exception { 
+   public:
+     exception(const std::string& s) { std::cerr << what() << " " << s << std::endl; }; 
+-    exception(std::ostream& s)      { std::cerr << what() << " " << s << std::endl; }; 
++    exception(std::ostream& s)      { s << what() << " " << std::endl; }; 
+     virtual const char* what() const throw() { return "appl::grid::exception"; }
+   };
+ 
+diff --git a/appl_grid/appl_pdf.h b/appl_grid/appl_pdf.h
+index c71fd84..2525527 100644
+--- a/appl_grid/appl_pdf.h
++++ b/appl_grid/appl_pdf.h
+@@ -51,7 +51,7 @@ public:
+   class exception : public std::exception { 
+   public: 
+     exception(const std::string& s="") { std::cerr << what() << " " << s << std::endl; }; 
+-    exception(std::ostream& s)         { std::cerr << what() << " " << s << std::endl; }; 
++    exception(std::ostream& s)         { s << " " << std::endl; }; 
+     const char* what() const throw() { return "appl::appl_pdf::exception "; }
+   };
+   
+diff --git a/src/appl_igrid.h b/src/appl_igrid.h
+index d25288e..be354df 100644
+--- a/src/appl_igrid.h
++++ b/src/appl_igrid.h
+@@ -52,7 +52,7 @@ private:
+   class exception { 
+   public:
+     exception(const std::string& s) { std::cerr << s << std::endl; }; 
+-    exception(std::ostream& s)      { std::cerr << s << std::endl; }; 
++    exception(std::ostream& s)      { s << std::endl; }; 
+   };
+ 
+   typedef double (igrid::*transform_t)(double) const;
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
new file mode 100644
index 000000000000..1ad5dcb8b25b
--- /dev/null
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
+
+stdenv.mkDerivation rec {
+  name = "applgrid-${version}";
+  version = "1.4.70";
+
+  src = fetchurl {
+    url = "https://www.hepforge.org/archive/applgrid/${name}.tgz";
+    sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
+  };
+
+  buildInputs = [ gfortran hoppet lhapdf root5 ];
+
+  patches = [
+    ./bad_code.patch
+  ];
+
+  preConfigure = ''
+    substituteInPlace src/Makefile.in \
+      --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
+  '' + (if stdenv.isDarwin then ''
+    substituteInPlace src/Makefile.in \
+      --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
+  '' else "");
+
+  enableParallelBuilding = false; # broken
+
+  # Install private headers required by APFELgrid
+  postInstall = ''
+    for header in src/*.h; do
+      install -Dm644 "$header" "$out"/include/appl_grid/"`basename $header`"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics";
+    license     = licenses.gpl3;
+    homepage    = http://applgrid.hepforge.org;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebaf793295cd..2ceb8527874e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21405,6 +21405,8 @@ with pkgs;
 
   ### SCIENCE / PHYSICS
 
+  applgrid = callPackage ../development/libraries/physics/applgrid { };
+
   hoppet = callPackage ../development/libraries/physics/hoppet { };
 
   fastjet = callPackage ../development/libraries/physics/fastjet { };

From 530de1cd8258a9d34b6653dde4617cb353521956 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:30:24 -0400
Subject: [PATCH 1670/3253] apfel: init at 3.0.3

---
 .../libraries/physics/apfel/default.nix       | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/apfel/default.nix

diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
new file mode 100644
index 000000000000..3eb4ddaab693
--- /dev/null
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "apfel-${version}";
+  version = "3.0.3";
+
+  src = fetchFromGitHub {
+    owner = "scarrazza";
+    repo = "apfel";
+    rev = version;
+    sha256 = "13dvcc5ba6djflrcy5zf5ikaw8s78zd8ac6ickc0hxhbmx1gjb4j";
+  };
+
+  buildInputs = [ gfortran lhapdf python2 ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A PDF Evolution Library";
+    license     = licenses.gpl3;
+    homepage    = http://apfel.mi.infn.it/;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ceb8527874e..e2f7c80efc64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21405,6 +21405,8 @@ with pkgs;
 
   ### SCIENCE / PHYSICS
 
+  apfel = callPackage ../development/libraries/physics/apfel { };
+
   applgrid = callPackage ../development/libraries/physics/applgrid { };
 
   hoppet = callPackage ../development/libraries/physics/hoppet { };

From 23e5af9e95e3f1720087e37f6af600806d063b62 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:31:04 -0400
Subject: [PATCH 1671/3253] apfelgrid: init at 1.0.1

---
 .../libraries/physics/apfelgrid/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/apfelgrid/default.nix

diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
new file mode 100644
index 000000000000..6509b04f0113
--- /dev/null
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }:
+
+stdenv.mkDerivation rec {
+  name = "apfelgrid-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "nhartland";
+    repo = "APFELgrid";
+    rev = "v${version}";
+    sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ apfel applgrid lhapdf root ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Ultra-fast theory predictions for collider observables";
+    license     = licenses.mit;
+    homepage    = http://nhartland.github.io/APFELgrid/;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2f7c80efc64..43d71a3fa4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21405,6 +21405,8 @@ with pkgs;
 
   ### SCIENCE / PHYSICS
 
+  apfelgrid = callPackage ../development/libraries/physics/apfelgrid { };
+
   apfel = callPackage ../development/libraries/physics/apfel { };
 
   applgrid = callPackage ../development/libraries/physics/applgrid { };

From 39c85c3bf9a8ed82a46230bb2474da60ae31c778 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 14:32:37 -0400
Subject: [PATCH 1672/3253] xfitter: init at 2.0.0

---
 .../physics/xfitter/calling_convention.patch  | 355 ++++++++++++++++++
 .../science/physics/xfitter/default.nix       |  54 +++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 411 insertions(+)
 create mode 100644 pkgs/applications/science/physics/xfitter/calling_convention.patch
 create mode 100644 pkgs/applications/science/physics/xfitter/default.nix

diff --git a/pkgs/applications/science/physics/xfitter/calling_convention.patch b/pkgs/applications/science/physics/xfitter/calling_convention.patch
new file mode 100644
index 000000000000..5b216b6e0928
--- /dev/null
+++ b/pkgs/applications/science/physics/xfitter/calling_convention.patch
@@ -0,0 +1,355 @@
+diff --git a/DY/src/finterface.cc b/DY/src/finterface.cc
+index 0405786..eb171d0 100644
+--- a/DY/src/finterface.cc
++++ b/DY/src/finterface.cc
+@@ -14,17 +14,17 @@
+ using namespace std;
+ 
+ extern "C" {
+-  int dy_create_calc_(const int *ds_id, const int *chg_prod, 
++  void dy_create_calc_(const int *ds_id, const int *chg_prod, 
+       const double *beam_en, const char *boz,
+       const double *ranges, const char *var_name, 
+       const int *n_bins, const double *bin_edges);
+ 
+-  int dy_do_calc_();
++  void dy_do_calc_();
+ 
+-  int dy_get_res_(const int *ds_id, double *calc_res);
++  void dy_get_res_(const int *ds_id, double *calc_res);
+ 
+   int dy_release_();
+-  int dy_set_ewpars_();
++  void dy_set_ewpars_();
+ }
+ 
+ typedef map <int, DYcalc* > DCmap;
+@@ -34,7 +34,7 @@ vector<BinMatrix*> gBinMatrices;
+ 
+ // initializes Drell-Yan LO calculations with info on
+ // beam, process, kinematic cuts, and bins.
+-int dy_create_calc_(const int *ds_id, const int *chg_prod, 
++void dy_create_calc_(const int *ds_id, const int *chg_prod, 
+     const double *beam_en, const char *boz,
+     const double *ranges, const char *var_name, 
+     const int *n_bins, const double *bin_edges)
+@@ -99,13 +99,11 @@ int dy_create_calc_(const int *ds_id, const int *chg_prod,
+   // create calculator and put to map
+   DYcalc * dc = new DYcalc(bm, pc, int_steps);
+   gCalcs.insert( pair<int,DYcalc*>( *ds_id,dc ) );
+-
+-  return 1;
+ }
+ 
+ 
+ // calculate Drell-Yan LO cross sections for all data sets
+-int dy_do_calc_()
++void dy_do_calc_()
+ {
+   // evolve convolutions
+   vector<PDFconv*>::iterator ipc = gPDFconvs.begin();
+@@ -118,24 +116,20 @@ int dy_do_calc_()
+     if ( true != idc->second->Integrate() ) {
+       cout << "Something is wrong with DY integration for " 
+            << idc->first << " data set." << endl;
+-      return 0;
++      return;
+     }
+   }
+-
+-  return 1;
+ }
+ 
+ 
+ // return DY calculations for data set ds_name
+-int dy_get_res_(const int *ds_id, double *calc_res)
++void dy_get_res_(const int *ds_id, double *calc_res)
+ {
+   DYcalc * dc = gCalcs.find(*ds_id)->second;
+   dc->getCalcRes(calc_res);
+-
+-  return 1;
+ }
+ 
+-int dy_set_ewpars_(){
++void dy_set_ewpars_(){
+   PhysPar::setPhysPar();
+ }
+ 
+@@ -155,6 +149,4 @@ int dy_release_()
+   for (; idc != gCalcs.end() ; idc++){
+     delete (idc->second);
+   }
+-
+-  return 1;
+ }
+diff --git a/FastNLO/src/FastNLOInterface.cc b/FastNLO/src/FastNLOInterface.cc
+index 20f8a75..a6dac79 100644
+--- a/FastNLO/src/FastNLOInterface.cc
++++ b/FastNLO/src/FastNLOInterface.cc
+@@ -39,14 +39,14 @@ void gauleg(double x1,double x2,double *x,double *w, int n);
+ 
+ 
+ extern "C" {
+-  int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale);
+-  int fastnlocalc_(const int *idataset, double *xsec);
+-  int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt);
+-  int fastnlopointskip_(const int *idataset, int *point, int *npoints);
+-  int hf_errlog_(const int* ID, const char* TEXT, long length);
+-  int hf_stop_();
++  void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale);
++  void fastnlocalc_(const int *idataset, double *xsec);
++  void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt);
++  void fastnlopointskip_(const int *idataset, int *point, int *npoints);
++  void hf_errlog_(const int* ID, const char* TEXT, long length);
++  void hf_stop_();
+   double interp_(double *A, double *xx1, double *x, int *NGrid1, double *res);
+-  int setfastnlotoppar_(const int *idataset);
++  void setfastnlotoppar_(const int *idataset);
+ }
+ 
+ 
+@@ -58,7 +58,7 @@ map<int, FastNLOxFitter*> gFastNLO_array;
+ map<int, BoolArray*>     gUsedPoints_array;
+ int CreateUsedPointsArray(int idataset, int npoints);
+ 
+-int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) {
++void fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_FIT_ORDER, bool *PublicationUnits , double* murdef, double* murscale, double *mufdef, double* mufscale) {
+ 
+   
+    map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset);
+@@ -67,7 +67,7 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_
+      const char* text = "I: Double initialization of the same fastnlo data set!";
+      hf_errlog_(&id, text, (long)strlen(text));
+      //hf_stop_();
+-     return 1;
++     return;
+    }
+    
+    FastNLOxFitter* fnloreader = new FastNLOxFitter( thfile );  
+@@ -112,10 +112,9 @@ int fastnloinit_(const char *s, const int *idataset, const char *thfile, int *I_
+    }
+    
+    gFastNLO_array.insert(pair<int, FastNLOxFitter*>(*idataset, fnloreader) );
+-   return 0;
+ }
+ 
+-int setfastnlotoppar_(const int *idataset) {
++void setfastnlotoppar_(const int *idataset) {
+    //!< Dedicated settings for difftop
+    map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset);
+    map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset);
+@@ -130,11 +129,9 @@ int setfastnlotoppar_(const int *idataset) {
+    fnloreader->SetExternalFuncForMuF( &Function_Mu );
+    fnloreader->SetExternalFuncForMuR( &Function_Mu);
+    //fnloreader->SetScaleFactorsMuRMuF(1.0,1.0); //Be reminded that muR and muF scales are hard coded (that's not true!)
+-
+-   return 0;
+ }
+ 
+-int fastnlocalc_(const int *idataset, double *xsec) {
++void fastnlocalc_(const int *idataset, double *xsec) {
+   
+    map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset);
+    map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset);
+@@ -176,13 +173,10 @@ int fastnlocalc_(const int *idataset, double *xsec) {
+        outputidx++;
+      }
+    }
+- 
+-
+-   return 0;
+ }
+ 
+ //MK14 New function for Difftop calculation: it is called in trunk/src/difftop_fastnlo.f
+-int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){
++void fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *tot, int *Npt){
+   
+    map<int, FastNLOxFitter*>::const_iterator FastNLOIterator = gFastNLO_array.find(*idataset);
+    map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset);
+@@ -262,10 +256,6 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to
+      Total += interpC(xsec,xg[k],thbin,Nthpoints)*wg[k];
+ 
+    *tot = Total;
+-
+-
+-
+-   return 0;
+ }
+ 
+ 
+@@ -277,7 +267,7 @@ int fastnlocalctop_(const int *idataset, double *xsec, double *thbin, double *to
+ 
+ 
+ 
+-int fastnlopointskip_(const int *idataset, int *point, int *npoints) {
++void fastnlopointskip_(const int *idataset, int *point, int *npoints) {
+   map<int, BoolArray*>::const_iterator UsedPointsIterator = gUsedPoints_array.find(*idataset);
+   if(UsedPointsIterator == gUsedPoints_array.end( )) 
+     CreateUsedPointsArray(*idataset, *npoints);
+@@ -292,8 +282,6 @@ int fastnlopointskip_(const int *idataset, int *point, int *npoints) {
+   
+   BoolArray*     usedpoints = UsedPointsIterator->second;
+   usedpoints->at(*point-1) = false;
+-
+-  return 0;
+ }
+ 
+ int CreateUsedPointsArray(int idataset, int npoints) {
+diff --git a/Hathor/src/HathorInterface.cc b/Hathor/src/HathorInterface.cc
+index 7da88b1..96576a3 100644
+--- a/Hathor/src/HathorInterface.cc
++++ b/Hathor/src/HathorInterface.cc
+@@ -6,9 +6,9 @@
+ #include "../interface/xFitterPdf.h"
+ 
+ extern "C" {
+-  int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt,
++  void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt,
+ 		  const unsigned int& pertubOrder, const unsigned int& precisionLevel);
+-  int hathorcalc_(const int *idataset, double *xsec);
++  void hathorcalc_(const int *idataset, double *xsec);
+ }
+ 
+ extern "C" {
+@@ -19,7 +19,7 @@ extern "C" {
+ }
+ 
+ extern "C" {
+-  int hf_errlog_(const int* ID, const char* TEXT, long length);
++  void hf_errlog_(const int* ID, const char* TEXT, long length);
+ }
+ 
+ // FIXME: delete pointers at the end! (in some hathordestroy_ or so)
+@@ -28,7 +28,7 @@ xFitterPdf* pdf;
+ int* rndStore;
+ double mtop;
+ 
+-int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt,
++void hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, const double& mt,
+ 		const unsigned int& pertubOrder, const unsigned int& precisionLevel) {
+ 
+   if(hathor_array.size()==0) {
+@@ -69,7 +69,7 @@ int hathorinit_(const int* idataset, const double& sqrtS, const bool& ppbar, con
+   return 0;
+ }
+ 
+-int hathorcalc_(const int *idataset, double *xsec) {
++void hathorcalc_(const int *idataset, double *xsec) {
+   rlxd_reset(rndStore);
+ 
+   std::map<int, Hathor*>::const_iterator hathorIter = hathor_array.find(*idataset);
+diff --git a/src/ftheor_eval.cc b/src/ftheor_eval.cc
+index 1dd4e8b..8bc7991 100644
+--- a/src/ftheor_eval.cc
++++ b/src/ftheor_eval.cc
+@@ -19,15 +19,15 @@
+ using namespace std;
+ 
+ extern "C" {
+-  int set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, 
++  void set_theor_eval_(int *dsId);//, int *nTerms, char **TermName, char **TermType, 
+ //    char **TermSource, char *TermExpr);
+-  int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, 
++  void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, 
+     double *allBins);
+ //  int set_theor_units_(int *dsId, double *units);
+-  int init_theor_eval_(int *dsId);
+-  int update_theor_ckm_();
+-  int get_theor_eval_(int *dsId, int* np, int* idx);
+-  int close_theor_eval_();
++  void init_theor_eval_(int *dsId);
++  void update_theor_ckm_();
++  void get_theor_eval_(int *dsId, int* np, int* idx);
++  void close_theor_eval_();
+ }
+ 
+ /// global dataset to theory evaluation pointer map
+@@ -59,7 +59,7 @@ extern struct ord_scales {
+  dataset ID.
+  write details on argumets
+  */
+-int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, 
++void set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType, 
+ //  char **TermSource, char *TermExpr)
+ {
+   // convert fortran strings to c++
+@@ -90,15 +90,13 @@ int set_theor_eval_(int *dsId)//, int *nTerms, char **TermName, char **TermType,
+     << " already exists." << endl;
+     exit(1); // make proper exit later
+   }
+-
+-  return 1;
+ }
+ 
+ /*!
+  Sets datasets bins in theory evaluations.
+  write details on argumets
+  */
+-int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, 
++void set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags, 
+   double *allBins)
+ {
+   tTEmap::iterator it = gTEmap.find(*dsId);
+@@ -110,7 +108,6 @@ int set_theor_bins_(int *dsId, int *nBinDimension, int *nPoints, int *binFlags,
+   
+   TheorEval *te = gTEmap.at(*dsId);
+   te->setBins(*nBinDimension, *nPoints, binFlags, allBins);
+-  return 1;
+ }
+ 
+ /*
+@@ -132,7 +129,7 @@ int set_theor_units_(int *dsId, double *units)
+ /*!
+  Initializes theory for requested dataset.
+  */
+-int init_theor_eval_(int *dsId)
++void init_theor_eval_(int *dsId)
+ {
+   tTEmap::iterator it = gTEmap.find(*dsId);
+   if (it == gTEmap.end() ) { 
+@@ -148,7 +145,7 @@ int init_theor_eval_(int *dsId)
+ /*!
+  Updates the CKM matrix to all the initialized appl grids
+  */
+-int update_theor_ckm_()
++void update_theor_ckm_()
+ {
+   double a_ckm[] = { ckm_matrix_.Vud, ckm_matrix_.Vus, ckm_matrix_.Vub,
+                                   ckm_matrix_.Vcd, ckm_matrix_.Vcs, ckm_matrix_.Vcb,
+@@ -164,7 +161,7 @@ int update_theor_ckm_()
+ /*!
+  Evaluates theory for requested dataset and writes it to the global THEO array.
+  */
+-int get_theor_eval_(int *dsId, int *np, int*idx)
++void get_theor_eval_(int *dsId, int *np, int*idx)
+ {
+ 
+   tTEmap::iterator it = gTEmap.find(*dsId);
+@@ -194,11 +191,11 @@ int get_theor_eval_(int *dsId, int *np, int*idx)
+   // write the predictions to THEO array
+   if( ip != *np ){
+     cout << "ERROR in get_theor_eval_: number of points mismatch" << endl;
+-    return -1;
++    return;
+   }
+ }
+ 
+-int close_theor_eval_()
++void close_theor_eval_()
+ {
+   tTEmap::iterator it = gTEmap.begin();
+   for (; it!= gTEmap.end(); it++){
+diff --git a/src/lhapdf6_output.c b/src/lhapdf6_output.c
+index 4b20b68..549c521 100644
+--- a/src/lhapdf6_output.c
++++ b/src/lhapdf6_output.c
+@@ -64,7 +64,7 @@ extern double bvalij_(int *,int *,int *,int *,int *);
+ extern double bvalxq_(int *,int *,double *,double *,int *);
+ extern double hf_get_alphas_(double *);
+ extern int getord_(int *);
+-extern int grpars_(int *, double *, double *, int *, double *, double *, int *);
++extern void grpars_(int *, double *, double *, int *, double *, double *, int *);
+ extern int getcbt_(int *, double *, double *, double *);
+ extern void getpdfunctype_heraf_(int *mc, int *asymh, int *symh, char *name, size_t size);
+ extern void hf_errlog_(int *, char *, size_t);
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix
new file mode 100644
index 000000000000..a6ec9960045d
--- /dev/null
+++ b/pkgs/applications/science/physics/xfitter/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapackWithoutAtlas, libyaml, lynx, mela, root5, qcdnum, which }:
+
+stdenv.mkDerivation rec {
+  name = "xfitter-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    name = "${name}.tgz";
+    url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${name}.tgz";
+    sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515";
+  };
+
+  patches = [
+    ./calling_convention.patch
+  ];
+
+  preConfigure =
+  # Fix F77LD to workaround for a following build error:
+  #
+  #   gfortran: error: unrecognized command line option '-stdlib=libc++'
+  #
+    stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace src/Makefile.in \
+        --replace "F77LD = \$(F77)" "F77LD = \$(CXXLD)" \
+    '';
+
+  configureFlags = [
+    "--enable-apfel"
+    "--enable-apfelgrid"
+    "--enable-applgrid"
+    "--enable-mela"
+    "--enable-lhapdf"
+  ];
+
+  nativeBuildInputs = [ gfortran which ];
+  buildInputs =
+    [ apfel apfelgrid applgrid blas lhapdf liblapackWithoutAtlas mela root5 qcdnum ]
+    # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml
+    ;
+  propagatedBuildInputs = [ lynx ];
+
+  enableParallelBuilding = true;
+
+  hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
+    description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data";
+    license     = licenses.gpl3;
+    homepage    = https://www.xfitter.org/xFitter;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43d71a3fa4d0..9776fbf3d1e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20988,6 +20988,8 @@ with pkgs;
 
   sherpa = callPackage ../applications/science/physics/sherpa {};
 
+  xfitter = callPackage ../applications/science/physics/xfitter {};
+
   ### SCIENCE/PROGRAMMING
 
   dafny = dotnetPackages.Dafny;

From f37b39d279d111bfefbae1ba56cc97b535b93a06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 11:00:40 -0700
Subject: [PATCH 1673/3253] jackett: 0.10.160 -> 0.10.198

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 49f7b59ddc6f..fe416876546c 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.10.160";
+  version = "0.10.198";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1msy11s89r63vcan6d8mjn2jic1zwvl2j852mjj06bfb3yldx6vq";
+    sha256 = "1svlb38iy47bv88rbk1nimb7pixxh142xr4xf761l3nm69w9qyfq";
   };
 
   buildInputs = [ makeWrapper ];

From 6eacc17157fe28bb89f9d9d5d1595de4232b7ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 24 Sep 2018 20:06:31 +0100
Subject: [PATCH 1674/3253] nixos tests: move common configuration into
 separate file

This allows tests outside nixos to use acme setup.
---
 nixos/tests/acme.nix                      | 29 +----------------------
 nixos/tests/common/letsencrypt/common.nix | 27 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 nixos/tests/common/letsencrypt/common.nix

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index c7fd4910e072..4669a092433e 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -1,32 +1,5 @@
 let
-  commonConfig = { lib, nodes, ... }: {
-    networking.nameservers = [
-      nodes.letsencrypt.config.networking.primaryIPAddress
-    ];
-
-    nixpkgs.overlays = lib.singleton (self: super: {
-      cacert = super.cacert.overrideDerivation (drv: {
-        installPhase = (drv.installPhase or "") + ''
-          cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
-            >> "$out/etc/ssl/certs/ca-bundle.crt"
-        '';
-      });
-
-      # Override certifi so that it accepts fake certificate for Let's Encrypt
-      # Need to override the attribute used by simp_le, which is python3Packages
-      python3Packages = (super.python3.override {
-        packageOverrides = lib.const (pysuper: {
-          certifi = pysuper.certifi.overridePythonAttrs (attrs: {
-            postPatch = (attrs.postPatch or "") + ''
-              cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
-                > certifi/cacert.pem
-            '';
-          });
-        });
-      }).pkgs;
-    });
-  };
-
+  commonConfig = ./common/letsencrypt/common.nix;
 in import ./make-test.nix {
   name = "acme";
 
diff --git a/nixos/tests/common/letsencrypt/common.nix b/nixos/tests/common/letsencrypt/common.nix
new file mode 100644
index 000000000000..798a749f7f9b
--- /dev/null
+++ b/nixos/tests/common/letsencrypt/common.nix
@@ -0,0 +1,27 @@
+{ lib, nodes, ... }: {
+  networking.nameservers = [
+    nodes.letsencrypt.config.networking.primaryIPAddress
+  ];
+
+  nixpkgs.overlays = lib.singleton (self: super: {
+    cacert = super.cacert.overrideDerivation (drv: {
+      installPhase = (drv.installPhase or "") + ''
+        cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
+          >> "$out/etc/ssl/certs/ca-bundle.crt"
+      '';
+    });
+
+    # Override certifi so that it accepts fake certificate for Let's Encrypt
+    # Need to override the attribute used by simp_le, which is python3Packages
+    python3Packages = (super.python3.override {
+      packageOverrides = lib.const (pysuper: {
+        certifi = pysuper.certifi.overridePythonAttrs (attrs: {
+          postPatch = (attrs.postPatch or "") + ''
+            cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
+              > certifi/cacert.pem
+          '';
+        });
+      });
+    }).pkgs;
+  });
+}

From 18c7fbd78d9fe2f01b7c1d1ca03bb053b7ff4604 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 24 Sep 2018 19:07:30 +0200
Subject: [PATCH 1675/3253] pythonPackages.elasticsearch-dsl: 0.0.9 -> 6.2.1

---
 .../elasticsearch-dsl/default.nix             | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 ++----------
 2 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/elasticsearch-dsl/default.nix

diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
new file mode 100644
index 000000000000..94d47073764e
--- /dev/null
+++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, elasticsearch
+, ipaddress
+, python-dateutil
+, pytz
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "elasticsearch-dsl";
+  version = "6.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f0w23kzyym0fkzisdkcl4xpnm8fsi97v1kskyvfrhj3mxy179fh";
+  };
+
+  propagatedBuildInputs = [ elasticsearch python-dateutil six ]
+                          ++ stdenv.lib.optional (!isPy3k) ipaddress;
+
+  # ImportError: No module named test_elasticsearch_dsl
+  # Tests require a local instance of elasticsearch
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "High level Python client for Elasticsearch";
+    longDescription = ''
+      Elasticsearch DSL is a high-level library whose aim is to help with
+      writing and running queries against Elasticsearch. It is built on top of
+      the official low-level client (elasticsearch-py).
+    '';
+    homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ desiderius ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20ba493da153..883212084ebf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2197,27 +2197,9 @@ in {
 
   elasticsearch = callPackage ../development/python-modules/elasticsearch { };
 
-  elasticsearchdsl = buildPythonPackage (rec {
-    name = "elasticsearch-dsl-0.0.9";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/elasticsearch-dsl/${name}.tar.gz";
-      sha256 = "1gdcdshk881vy18p0czcmbb3i4s5hl8llnfg6961b6x7jkvhihbj";
-    };
-
-    buildInputs = with self; [ covCore dateutil elasticsearch mock pytest pytestcov unittest2 urllib3 pytz ];
-
-    # ImportError: No module named test_elasticsearch_dsl
-    # Tests require a local instance of elasticsearch
-    doCheck = false;
-
-    meta = {
-      description = "Python client for Elasticsearch";
-      homepage = https://github.com/elasticsearch/elasticsearch-dsl-py;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ desiderius ];
-    };
-  });
+  elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { };
+  # alias
+  elasticsearchdsl = self.elasticsearch-dsl;
 
   elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { };
 

From 2fc9fee6b2a6673a7ffb4c0c320f8a6b8c1d97aa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 13:34:15 +0200
Subject: [PATCH 1676/3253] hackage2nix: disable broken Hydra builds

---
 .../configuration-hackage2nix.yaml            | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7f9e31432892..5d7173bf44a4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2806,6 +2806,7 @@ dont-distribute-packages:
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antiope-contract:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-dynamodb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-messages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2850,6 +2851,7 @@ dont-distribute-packages:
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2878,6 +2880,7 @@ dont-distribute-packages:
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-string:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-table:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2896,6 +2899,7 @@ dont-distribute-packages:
   ast-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-combinators:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-dejafu:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2935,6 +2939,7 @@ dont-distribute-packages:
   augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aura:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   authenticate-ldap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2976,6 +2981,7 @@ dont-distribute-packages:
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  axel:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3184,6 +3190,7 @@ dont-distribute-packages:
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blunk-hask-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3208,10 +3215,12 @@ dont-distribute-packages:
   bowntz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brain-bleep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brainheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brick-skylighting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-parsec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3219,6 +3228,10 @@ dont-distribute-packages:
   bricks-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brittany:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-pipes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-tests:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bronyradiogermany-streaming:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3231,6 +3244,7 @@ dont-distribute-packages:
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bugsnag-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   build:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3335,6 +3349,7 @@ dont-distribute-packages:
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capnp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capped-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3619,6 +3634,7 @@ dont-distribute-packages:
   concrete-haskell-autogen:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrency-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-buffer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrent-Cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-dns-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3962,6 +3978,7 @@ dont-distribute-packages:
   delude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dense-int-set:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-monoidal-map:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-sum-aeson-orphans:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4040,6 +4057,7 @@ dont-distribute-packages:
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-gateway:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4087,6 +4105,7 @@ dont-distribute-packages:
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker-build-cacher:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-driver-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4219,6 +4238,7 @@ dont-distribute-packages:
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emailaddress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4347,6 +4367,7 @@ dont-distribute-packages:
   extract-dependencies:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  f-ree-hack-cheats-free-v-bucks-generator:       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   factory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4509,6 +4530,7 @@ dont-distribute-packages:
   foldl-transduce:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   follow-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  follow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   font-opengl-basic4x6:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4548,6 +4570,7 @@ dont-distribute-packages:
   Fractaler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fractals:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Frames-beam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4562,6 +4585,8 @@ dont-distribute-packages:
   free-theorems-seq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems-webui:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-theorems:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-v-bucks-generator-no-survey:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-v-bucks-generator-ps4-no-survey:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-vector-spaces:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   freelude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4664,6 +4689,7 @@ dont-distribute-packages:
   generic-accessors:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-church:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-enum:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens-labels:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4806,8 +4832,12 @@ dont-distribute-packages:
   glome-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeView:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-algorithms:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-game:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-juicy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   glpk-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-common:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5052,6 +5082,8 @@ dont-distribute-packages:
   Grow:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrowlNotify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grpc-api-etcd:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grpc-etcd-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5296,11 +5328,13 @@ dont-distribute-packages:
   haskell-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-overridez:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-packages:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-player:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-plot:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-postal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-read-editor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5355,11 +5389,13 @@ dont-distribute-packages:
   haskheap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskmon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-bitcoind:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-crypto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-node:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-protocol:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-script:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin-store:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-wallet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5469,6 +5505,8 @@ dont-distribute-packages:
   hdr-histogram:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDRUtils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heatitup-complete:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heatitup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger-amazon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger-instances:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heavy-logger:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5671,6 +5709,7 @@ dont-distribute-packages:
   hmatrix-static:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-sundials:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5977,6 +6016,7 @@ dont-distribute-packages:
   html-kure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-rules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-tokenizer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htoml-megaparsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hts:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn-import:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6243,6 +6283,7 @@ dont-distribute-packages:
   isobmff-builder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  itcli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   itemfield:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iter-stats:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-compress:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6288,6 +6329,7 @@ dont-distribute-packages:
   jenga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jenkinsPlugins2nix:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jinquantities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jml-web-service:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   join-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6425,6 +6467,7 @@ dont-distribute-packages:
   krpc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KSP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ktx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Kulitta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6500,6 +6543,7 @@ dont-distribute-packages:
   language-ninja:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-oberon:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-ocaml:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-openscad:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-pig:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-puppet:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6584,6 +6628,7 @@ dont-distribute-packages:
   liblinear-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   libltdl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libmolude:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboath-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboleg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpafe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6596,6 +6641,7 @@ dont-distribute-packages:
   libxml-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   licensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lifted-base-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6739,6 +6785,7 @@ dont-distribute-packages:
   ls-usb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lsp-test:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltext:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6908,6 +6955,7 @@ dont-distribute-packages:
   MHask:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miconix-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   microaeson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   microgroove:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6942,11 +6990,15 @@ dont-distribute-packages:
   missing-py2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MissingPy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mixpanel-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkcabal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ml-w:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mltool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark-cli:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark-ext:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mmark:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7351,6 +7403,7 @@ dont-distribute-packages:
   opaleye-classy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-trans:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opaleye:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-signals:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7378,6 +7431,7 @@ dont-distribute-packages:
   opensoundcontrol-ht:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssh-github-keys:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentheory-char:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opentok:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentype:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7385,6 +7439,7 @@ dont-distribute-packages:
   Operads:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   operational-extra:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opml-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  optima:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7410,6 +7465,7 @@ dont-distribute-packages:
   OrPatterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   oscpacking:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Oslo-Vectize:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7542,6 +7598,7 @@ dont-distribute-packages:
   perhaps:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  permutations:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7630,6 +7687,7 @@ dont-distribute-packages:
   pitchtrack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pixelated-avatar-generator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  piyo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs10:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs7:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7638,6 +7696,7 @@ dont-distribute-packages:
   plan-b:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   planb-token-introspection:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  planet-mitchell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   plankton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7751,6 +7810,7 @@ dont-distribute-packages:
   pretty-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   preview:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prim-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   primes-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-checked:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7810,6 +7870,8 @@ dont-distribute-packages:
   prosper:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-descriptors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-runtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7841,6 +7903,7 @@ dont-distribute-packages:
   pure-io:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  purescript-iso:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-tsd-gen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   push-notify-ccs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7904,6 +7967,7 @@ dont-distribute-packages:
   quickcheck-state-machine-distributed:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-state-machine:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-with-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickCheckVariant:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7928,6 +7992,7 @@ dont-distribute-packages:
   rad:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  radix-tree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rados-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   raft:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8335,6 +8400,7 @@ dont-distribute-packages:
   scrobble:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scythe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sde-solver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-cairo-image:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8411,6 +8477,7 @@ dont-distribute-packages:
   servant-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-hmac-auth:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-iCalendar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-js:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8572,6 +8639,7 @@ dont-distribute-packages:
   skeletons:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skews:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skulk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylark-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8692,6 +8760,7 @@ dont-distribute-packages:
   socketson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  softfloat-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   solga-swagger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   solga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   solr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8785,6 +8854,7 @@ dont-distribute-packages:
   stack-network:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack2nix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9098,6 +9168,7 @@ dont-distribute-packages:
   text-format-heavy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-icu-translit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-locale-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9207,12 +9278,14 @@ dont-distribute-packages:
   toilet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenizer-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tokstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   toktok:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyocabinet-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyotyrant-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tomato-rubato-openal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml-parser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tomlcheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9232,6 +9305,7 @@ dont-distribute-packages:
   traced:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trackit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  traction:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   traildb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trajectory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9299,6 +9373,7 @@ dont-distribute-packages:
   turtle-options:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TV:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twee:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-trees:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9456,6 +9531,9 @@ dont-distribute-packages:
   utf8-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-validator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-exception:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-primitive-control:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util-primitive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-hut-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-cco-uu-parsinglib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9490,6 +9568,7 @@ dont-distribute-packages:
   varying:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vault-trans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9585,6 +9664,7 @@ dont-distribute-packages:
   wai-middleware-headers:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-prometheus:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-rollbar:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9669,6 +9749,7 @@ dont-distribute-packages:
   winio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wire-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wkt-geom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9700,6 +9781,7 @@ dont-distribute-packages:
   wsdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsjtx-udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wss-client:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-basic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9947,6 +10029,7 @@ dont-distribute-packages:
   zeromq4-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq4-patterns:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq4-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-cabal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From c50365ec921e44fb5a46a292a1d4fa41b85bc26b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 13:37:06 +0200
Subject: [PATCH 1677/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/be1e8a29d299be9e024a031a685db5b7fa702c38.
---
 .../haskell-modules/hackage-packages.nix      | 899 +++++++++++++++---
 1 file changed, 748 insertions(+), 151 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6db88796b64c..1007be349fc9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5837,6 +5837,7 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frank" = callPackage
@@ -6581,6 +6582,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_9_3" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, filepath
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.9.3";
+       sha256 = "1s69lk3ic6zlkikhvb78ly9wl3g70a1h1m6ndhsca01pp8z8axrs";
+       libraryHaskellDepends = [
+         base containers directory dlist filepath transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers directory dlist filepath HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers transformers-compat
+       ];
+       description = "Globbing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -8572,6 +8596,8 @@ self: {
        pname = "HTTP";
        version = "4000.3.12";
        sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
+       revision = "1";
+       editedCabalFile = "108i60vy6r7k1yaraw9g6xc7r82nwb9h84vsk9q5s01z980c7kk4";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -10997,6 +11023,7 @@ self: {
        ];
        description = "Library for automated composition and musical learning";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KyotoCabinet" = callPackage
@@ -13417,6 +13444,8 @@ self: {
        pname = "OTP";
        version = "0.1.0.0";
        sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+       revision = "1";
+       editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin";
        libraryHaskellDepends = [
          base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
          time
@@ -13899,13 +13928,14 @@ self: {
        pname = "Oslo-Vectize";
        version = "0.2";
        sha256 = "05lgpaw6glwflczsa3400fhih717ry4sikhs9ypyd7xlqvraad57";
-       revision = "1";
-       editedCabalFile = "03fchm31c0yl36l8nn3bykgncidrhp3ql44j0r3853s3vknai9gp";
+       revision = "2";
+       editedCabalFile = "0axdqcpl3rl9lh9rvd5cn4llvglca8y82p1l3rvka97b33lfj8ky";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "Tests";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PArrows" = callPackage
@@ -15350,8 +15380,8 @@ self: {
      }:
      mkDerivation {
        pname = "Raincat";
-       version = "1.2";
-       sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
+       version = "1.2.1";
+       sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -17250,6 +17280,8 @@ self: {
        pname = "Strafunski-StrategyLib";
        version = "5.0.1.0";
        sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650";
+       revision = "1";
+       editedCabalFile = "1hngxq1f7fybg6ixkdhmvgsw608mhnxkwbw04ql5zspcfl78v6l2";
        libraryHaskellDepends = [ base directory mtl syb transformers ];
        description = "Library for strategic programming";
        license = stdenv.lib.licenses.bsd3;
@@ -23102,8 +23134,8 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.9.1";
-       sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6";
+       version = "0.9.2";
+       sha256 = "131rd3liqkdp146fyc8b0mcbkn08mib9iljyjj3mp40fs64sy1c9";
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
@@ -26952,6 +26984,7 @@ self: {
          aeson antiope-s3 avro base bytestring text
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiope-core" = callPackage
@@ -28133,6 +28166,7 @@ self: {
        ];
        description = "Convenience types and functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbtt" = callPackage
@@ -28567,6 +28601,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "arithmoi_0_8_0_0" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
+     , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
+     , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "arithmoi";
+       version = "0.8.0.0";
+       sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
+       revision = "1";
+       editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
+       configureFlags = [ "-f-llvm" ];
+       libraryHaskellDepends = [
+         array base containers deepseq exact-pi ghc-prim integer-gmp
+         integer-logarithms random transformers vector
+       ];
+       testHaskellDepends = [
+         base containers exact-pi integer-gmp QuickCheck smallcheck tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge integer-logarithms random vector
+       ];
+       description = "Efficient basic number-theoretic functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "armada" = callPackage
     ({ mkDerivation, base, GLUT, mtl, OpenGL, stm }:
      mkDerivation {
@@ -28645,8 +28708,8 @@ self: {
        pname = "array";
        version = "0.5.2.0";
        sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
-       revision = "1";
-       editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx";
+       revision = "2";
+       editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg";
        libraryHaskellDepends = [ base ];
        description = "Mutable and immutable arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -28972,6 +29035,7 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ascii-table" = callPackage
@@ -29524,6 +29588,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-dejafu" = callPackage
@@ -30739,6 +30804,7 @@ self: {
        ];
        description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authenticate" = callPackage
@@ -31941,6 +32007,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "axiom" = callPackage
@@ -32665,12 +32732,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_11_1_0" = callPackage
+  "base_4_12_0_0" = callPackage
     ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.11.1.0";
-       sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g";
+       version = "4.12.0.0";
+       sha256 = "0ka18cvw1cjvjdd20n03rjmxfm10083mh19wxwz1f1kqiyc92g3w";
        libraryHaskellDepends = [
          ghc-prim invalid-cabal-flag-settings rts
        ];
@@ -32744,6 +32811,8 @@ self: {
        pname = "base-encoding";
        version = "0.1.0.0";
        sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si";
+       revision = "1";
+       editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring text
        ];
@@ -32792,8 +32861,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.11.1.0";
-       sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8";
+       version = "4.12.0.0";
+       sha256 = "1hb25nj49k4lcxi4w33qvcy8izkgsvls5kasmva6hjlvg8b35ymb";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
@@ -33853,8 +33922,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench-graph";
-       version = "0.1.3";
-       sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
+       version = "0.1.4";
+       sha256 = "144al44v3m00lh1rrhjyah0gacbi2n6hjlqvml3yqwf8j9c37wnw";
        libraryHaskellDepends = [
          base Chart Chart-diagrams csv directory filepath transformers
        ];
@@ -35983,6 +36052,8 @@ self: {
        pname = "biohazard";
        version = "1.0.4";
        sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c";
+       revision = "2";
+       editedCabalFile = "0r1fz9h92zyb7ryk8lngqlyl75djr8ngbcfrr9bbmz8img2ipb2a";
        libraryHaskellDepends = [
          async attoparsec base base-prelude bytestring containers exceptions
          hashable primitive stm text transformers unix unordered-containers
@@ -37838,11 +37909,14 @@ self: {
        pname = "blunk-hask-tests";
        version = "0.2";
        sha256 = "10x4xjlp1mj9gmsibvd21k76gj97prdsgwxxpg39425xgrzph6ll";
+       revision = "1";
+       editedCabalFile = "0wnp6rzq3iisi9vfk0nci4cb8kdwijdyv60f6kg0bhz1xzn7i6ww";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "Tests for the Blunk sequencer library";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blunt" = callPackage
@@ -38757,6 +38831,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "break" = callPackage
@@ -38900,6 +38975,7 @@ self: {
        ];
        description = "Show syntax-highlighted text in your Brick UI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks" = callPackage
@@ -39084,6 +39160,7 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -39128,6 +39205,7 @@ self: {
        ];
        description = "Conduit-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan-pipes" = callPackage
@@ -39144,6 +39222,7 @@ self: {
        ];
        description = "Pipes-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan-tests" = callPackage
@@ -39166,6 +39245,7 @@ self: {
        ];
        description = "Helpers for generating tests for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broccoli" = callPackage
@@ -39609,6 +39689,7 @@ self: {
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -40955,12 +41036,12 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "1.0.0";
-       sha256 = "025cdf78kg572b8bk5xxz4qxibjn4c72x2d3rxn6crz722139rf0";
+       version = "1.1.0";
+       sha256 = "0lrhgbzkswjm4abffacyw6zp4s3na3vp0vkprpxcygm6yjs7db2q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal cabal-lenses cmdargs directory lens
+         base bytestring Cabal cabal-lenses cmdargs directory filepath lens
          system-fileio system-filepath text transformers
          unordered-containers
        ];
@@ -41423,6 +41504,8 @@ self: {
        pname = "cabal-plan";
        version = "0.4.0.0";
        sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
+       revision = "1";
+       editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
        configureFlags = [ "-fexe" ];
        isLibrary = true;
        isExecutable = true;
@@ -41802,14 +41885,14 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "cabal2spec_2_2_1" = callPackage
+  "cabal2spec_2_2_2" = callPackage
     ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
      , tasty-golden, time
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.2.1";
-       sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6";
+       version = "2.2.2";
+       sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -42785,6 +42868,7 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capped-list" = callPackage
@@ -43470,6 +43554,8 @@ self: {
        pname = "cassava";
        version = "0.5.1.0";
        sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
+       revision = "1";
+       editedCabalFile = "1brz20js95synh0yw942ihy4y9y6nk4xnsqcjqi9580y24zcigkl";
        configureFlags = [ "-f-bytestring--lt-0_10_4" ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq hashable Only
@@ -50211,8 +50297,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.11.0";
-       sha256 = "07da6r8rw4vphr7q5i0lfap80vlbq1jm9lsbjp6khc7n59l5b2j7";
+       version = "0.12.1";
+       sha256 = "1zjrv58fl4lkknmmih0dwi9ds241mxi42q3fxlpd8z5hlgq9pxpj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50258,8 +50344,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft-pl";
-       version = "2.0.2";
-       sha256 = "0vl49khchpsyxlwxa55xpah8gnjqgfx0vb9jrjzdbfaj293g77sm";
+       version = "2.1.1";
+       sha256 = "1fznivcsgyjhb62jzk9a3wsv8rmynr7y7473ldbqypkjgy2rmvf2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -50409,6 +50495,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_6_1_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.6.1.0";
+       sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrency-benchmarks" = callPackage
     ({ mkDerivation, async, base, bench-graph, bytestring, Chart
      , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -50429,6 +50532,7 @@ self: {
        ];
        description = "Benchmarks to compare concurrency APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -50552,6 +50656,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_10_7" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.10.7";
+       sha256 = "0w5x81n9ljs8l2b8ypy2naazvrv16qqlm1lfzvsksnii2nm1al30";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -51322,8 +51443,8 @@ self: {
        pname = "config-schema";
        version = "0.5.0.1";
        sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
-       revision = "2";
-       editedCabalFile = "0wibr3739xwkvdl48cahppaxn8v20gcmhrjxjj8hkhvgnbpfi2gn";
+       revision = "3";
+       editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -51355,6 +51476,8 @@ self: {
        pname = "config-value";
        version = "0.6.3.1";
        sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
+       revision = "1";
+       editedCabalFile = "16h47yc8z3fkxs6gdyzfkahi9ibm7narkc72xcx67bmk309xb46c";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        description = "Simple, layout-based value language similar to YAML or JSON";
@@ -54168,8 +54291,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain1-constrained";
-       version = "0.4.0";
-       sha256 = "1mqprywxh51hvbchw1pvg66bsdf24rx6ywk06z98sx88rlvc4a2q";
+       version = "0.5.0";
+       sha256 = "194mcafkf23lifmx2n2hnvsaxl0mfdl9zgl9awigddwxvpxsrmjq";
        libraryHaskellDepends = [
          array base binary containers data-lens data-memocombinators
          logfloat monad-codec parallel pedestrian-dag random sgd vector
@@ -54259,6 +54382,8 @@ self: {
        pname = "criterion";
        version = "1.4.1.0";
        sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
+       revision = "1";
+       editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -55240,6 +55365,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "cryptostore" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, base, basement
+     , bytestring, cryptonite, hourglass, memory, pem, tasty
+     , tasty-hunit, tasty-quickcheck, x509
+     }:
+     mkDerivation {
+       pname = "cryptostore";
+       version = "0.1.0.0";
+       sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types base basement bytestring cryptonite
+         hourglass memory pem x509
+       ];
+       testHaskellDepends = [
+         asn1-types base bytestring cryptonite hourglass memory pem tasty
+         tasty-hunit tasty-quickcheck x509
+       ];
+       description = "Serialization of cryptographic data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cryptsy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, either
      , http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -58198,6 +58344,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-ref_0_0_1_2" = callPackage
+    ({ mkDerivation, base, stm, transformers }:
+     mkDerivation {
+       pname = "data-ref";
+       version = "0.0.1.2";
+       sha256 = "0896wjkpk52cndlzkdr51s1rasi0n9b100058f1sb4qzl1dgcp30";
+       libraryHaskellDepends = [ base stm transformers ];
+       description = "Unify STRef and IORef in plain Haskell 98";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-reify" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -60007,16 +60165,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "deepseq_1_4_3_0" = callPackage
+  "deepseq_1_4_4_0" = callPackage
     ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.3.0";
-       sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd";
-       revision = "1";
-       editedCabalFile = "0djisxi7z2xyx3wps550avgz5x56rl4xzks17j996crdsrdrcqh9";
+       version = "1.4.4.0";
+       sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base ghc-prim HUnit test-framework test-framework-hunit
@@ -60058,8 +60214,8 @@ self: {
        pname = "deepseq-generics";
        version = "0.2.0.0";
        sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
-       revision = "2";
-       editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb";
+       revision = "3";
+       editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -60516,6 +60672,7 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependency" = callPackage
@@ -63342,6 +63499,7 @@ self: {
        ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discord-hs" = callPackage
@@ -64876,6 +65034,7 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -65017,6 +65176,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_16_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.16.0.1";
+       sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -68879,6 +69068,7 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -69285,6 +69475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entropy_0_4_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , process, unix
+     }:
+     mkDerivation {
+       pname = "entropy";
+       version = "0.4.1.3";
+       sha256 = "07596n4ligi1a6jddkh5kf94mrcg03kybs5wa198672d2gdfn2ji";
+       setupHaskellDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "A platform independent entropy source";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enum-subset-generate" = callPackage
     ({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck
      , template-haskell
@@ -69776,6 +69981,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equivalence_0_3_3" = callPackage
+    ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "equivalence";
+       version = "0.3.3";
+       sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf";
+       libraryHaskellDepends = [
+         base containers mtl STMonadTrans transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers mtl QuickCheck STMonadTrans template-haskell
+         test-framework test-framework-quickcheck2 transformers
+         transformers-compat
+       ];
+       description = "Maintaining an equivalence relation implemented as union-find using STT";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "erd" = callPackage
     ({ mkDerivation, base, bytestring, containers, graphviz, parsec
      , text
@@ -72467,6 +72694,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "faceted" = callPackage
@@ -74613,8 +74841,8 @@ self: {
        pname = "filepath-crypto";
        version = "0.1.0.0";
        sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
-       revision = "5";
-       editedCabalFile = "1xyrac6m3szzj7x68fnrf7nh43gq03g9rwyynfxdx290bgc38gch";
+       revision = "6";
+       editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc";
        libraryHaskellDepends = [
          base binary bytestring case-insensitive cryptoids cryptoids-class
          cryptoids-types exceptions filepath sandi template-haskell
@@ -76584,6 +76812,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce_0_2_0_8" = callPackage
+    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
+     , time
+     }:
+     mkDerivation {
+       pname = "fold-debounce";
+       version = "0.2.0.8";
+       sha256 = "1j7v11nq2q7p50z27lbmprwqrhvcf9qa5zy2hql68zsi53q3wszw";
+       libraryHaskellDepends = [
+         base data-default-class stm stm-delay time
+       ];
+       testHaskellDepends = [ base hspec stm time ];
+       description = "Fold multiple events that happen in a given period of time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fold-debounce-conduit" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
@@ -76603,6 +76848,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fold-debounce-conduit_0_2_0_2" = callPackage
+    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
+     , stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "fold-debounce-conduit";
+       version = "0.2.0.2";
+       sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
+       libraryHaskellDepends = [
+         base conduit fold-debounce resourcet stm transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base conduit hspec resourcet stm transformers
+       ];
+       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldable1" = callPackage
     ({ mkDerivation, base, transformers, util }:
      mkDerivation {
@@ -76813,6 +77078,7 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follow-file" = callPackage
@@ -77849,18 +78115,15 @@ self: {
 
   "free-functors" = callPackage
     ({ mkDerivation, algebraic-classes, base, bifunctors, comonad
-     , constraints, contravariant, profunctors, template-haskell
-     , transformers
+     , contravariant, profunctors, template-haskell, transformers
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.8.4";
-       sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703";
-       revision = "1";
-       editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j";
+       version = "1.0";
+       sha256 = "061xly5fl7a28dsjw9m8dzyh59fkjrs6ijhcqfn2n4y8azch9f6c";
        libraryHaskellDepends = [
-         algebraic-classes base bifunctors comonad constraints contravariant
-         profunctors template-haskell transformers
+         algebraic-classes base bifunctors comonad contravariant profunctors
+         template-haskell transformers
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -78027,6 +78290,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -78042,6 +78306,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -80582,6 +80847,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Utilities for GHC.Generics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -81619,8 +81885,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.3.1.0";
-       sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m";
+       version = "0.3.1.1";
+       sha256 = "0nq4kijjd0dmii5949xr7wf4w7fi2ffpbqr9bg7qklxhsrmwywb8";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -81881,14 +82147,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot_8_4_3" = callPackage
+  "ghc-boot_8_6_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.4.3";
-       sha256 = "028x85pmvacndkv6mm9vrg9j6p6zw0a6v2mdwibhf3ck3wwm9v8m";
+       version = "8.6.1";
+       sha256 = "0dy9p2vz7ccwrhk9l4vs4fhfg6w9p7pk88iy44i46089svzx0wja";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -81897,12 +82163,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_4_3" = callPackage
+  "ghc-boot-th_8_6_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.4.3";
-       sha256 = "19q4j9n0ir0b5cc54sazzf4m51fd6mz6705wzplva4qh5602dafi";
+       version = "8.6.1";
+       sha256 = "0z3d9niqzsv1zihazs1ghdwag53fcmdigj77z37licc5q0g0lc49";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
@@ -81926,8 +82192,8 @@ self: {
        pname = "ghc-compact";
        version = "0.1.0.0";
        sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
-       revision = "1";
-       editedCabalFile = "1fwcfk515lv3pjzxz87bddk3kdbkaxswxrr37spdlkvyyfrbxyak";
+       revision = "2";
+       editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        description = "In memory storage of deeply evaluated data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -82158,15 +82424,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_8_0" = callPackage
+  "ghc-exactprint_0_5_8_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.8.0";
-       sha256 = "1hmyk5d0sbf4kqp4bzcl6q3vf6dpbx2imqky7r206g39xkx3y3fh";
+       version = "0.5.8.1";
+       sha256 = "1qjl137f4lpadkgdyfjnkkga8vqyw0x27plpyw57aqhc8qmcylhh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -82455,8 +82721,8 @@ self: {
        pname = "ghc-paths";
        version = "0.1.0.9";
        sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
-       revision = "3";
-       editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
+       revision = "4";
+       editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d";
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
        description = "Knowledge of GHC's installation directories";
@@ -82689,6 +82955,8 @@ self: {
        pname = "ghc-tcplugins-extra";
        version = "0.3";
        sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
+       revision = "1";
+       editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb";
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
@@ -82890,23 +83158,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_4_3" = callPackage
+  "ghci_8_6_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
-     , transformers, unix
+     , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap
+     , template-haskell, transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.4.3";
-       sha256 = "1jzzig7ikyy14xsanga0zaaqk3xj57pkwx301db89cns8yyq7vxj";
+       version = "8.6.1";
+       sha256 = "0ffv5xmq63y53fhfldx37g6881l07nvlgdsp9kfqz70flh0c1wm8";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
-         ghc-boot-th template-haskell transformers unix
+         ghc-boot-th ghc-heap template-haskell transformers unix
        ];
        description = "The library supporting GHC's interactive interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {ghc-heap = null;};
 
   "ghci-diagrams" = callPackage
     ({ mkDerivation, base, cairo, colour, diagrams, gtk }:
@@ -85985,6 +86254,7 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-banana" = callPackage
@@ -86030,6 +86300,7 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-export" = callPackage
@@ -86060,6 +86331,7 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -86081,6 +86353,7 @@ self: {
        ];
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster" = callPackage
@@ -89775,6 +90048,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-websocket_0_1_1_1" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.1.1";
+       sha256 = "133jwmqm5swm214sav8kigg8lqvk64g1nly5zk1xcij6rajxryci";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -90227,6 +90523,7 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -90243,6 +90540,7 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gruff" = callPackage
@@ -94998,8 +95296,8 @@ self: {
        pname = "happy";
        version = "1.19.9";
        sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
-       revision = "2";
-       editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
+       revision = "3";
+       editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -97007,6 +97305,7 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-packages" = callPackage
@@ -97129,6 +97428,7 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libpostal = null;};
 
   "haskell-proxy-list" = callPackage
@@ -98611,6 +98911,7 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-core" = callPackage
@@ -98762,6 +99063,7 @@ self: {
        ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-util" = callPackage
@@ -101125,6 +101427,7 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -101148,6 +101451,7 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatshrink" = callPackage
@@ -101303,6 +101607,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "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";
+       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-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -105751,6 +106082,7 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -109663,17 +109995,20 @@ self: {
      }) {};
 
   "hsc2hs" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, process }:
+    ({ mkDerivation, base, containers, directory, filepath, process
+     , tasty, tasty-hspec
+     }:
      mkDerivation {
        pname = "hsc2hs";
-       version = "0.68.3";
-       sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h";
+       version = "0.68.4";
+       sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base containers directory filepath process
        ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111228,14 +111563,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_6" = callPackage
+  "hspec_2_5_7" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.6";
-       sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly";
+       version = "2.5.7";
+       sha256 = "1bbxj0bxxhwkzvxg31a8gjyan1px3kx9md4j0ba177g3mk2fnxxy";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -111343,7 +111678,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_6" = callPackage
+  "hspec-core_2_5_7" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -111351,8 +111686,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.6";
-       sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g";
+       version = "2.5.7";
+       sha256 = "0rlrc8q92jq3r6qf3bmyy8llz0dv9sdp0n169ni803wzlshaixsn";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -111426,13 +111761,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_6" = callPackage
+  "hspec-discover_2_5_7" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.6";
-       sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc";
+       version = "2.5.7";
+       sha256 = "042v6wmxw7dwak6wgr02af1majq6qr5migrp360cm3frjfkw22cx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -113343,6 +113678,7 @@ self: {
        doHaddock = false;
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htrace" = callPackage
@@ -119952,6 +120288,8 @@ self: {
        pname = "int-cast";
        version = "0.2.0.0";
        sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
+       revision = "1";
+       editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -120802,8 +121140,8 @@ self: {
        pname = "io-streams";
        version = "1.5.0.1";
        sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
-       revision = "1";
-       editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c";
+       revision = "2";
+       editedCabalFile = "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14";
        configureFlags = [ "-fNoInteractiveTests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -121269,6 +121607,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-client_1_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, connection, containers
+     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
+     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
+     , text, time, tls, transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-client";
+       version = "1.1.0.5";
+       sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7";
+       libraryHaskellDepends = [
+         base bytestring conduit connection containers contravariant
+         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
+         profunctors stm stm-chans text time tls transformers x509
+         x509-store x509-validation
+       ];
+       description = "An IRC client library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-colors" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -121841,6 +122200,7 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "itemfield" = callPackage
@@ -122035,10 +122395,12 @@ self: {
     ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }:
      mkDerivation {
        pname = "ival";
-       version = "0.1.0.0";
-       sha256 = "16iffzyhqm160sy6qskfxr0wrbjic9bxrm8y9f1ych7gmzp3cdwk";
+       version = "0.2.0.0";
+       sha256 = "1djgkxz6npymkzf5802hdcvr40jlc16pmyxd3qpi98f1c1h4rg5x";
        libraryHaskellDepends = [ alg base ];
-       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       testHaskellDepends = [
+         alg base smallcheck tasty tasty-smallcheck
+       ];
        description = "Intervals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123000,6 +123362,7 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro" = callPackage
@@ -124130,8 +124493,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.2.3";
-       sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7";
+       version = "0.4.2.4";
+       sha256 = "1ryv2738ajagb0wdkac5lka1kzprrf85gqxabafmm3g5szllxjl1";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
@@ -124553,8 +124916,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.4.1";
-       sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
+       version = "0.4.2";
+       sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126051,8 +126414,8 @@ self: {
        pname = "keycode";
        version = "0.2.2";
        sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
-       revision = "2";
-       editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8";
+       revision = "3";
+       editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -127748,20 +128111,20 @@ self: {
 
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
-     , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, microlens, recursion, system-filepath
+     , composition-prelude, containers, criterion, deepseq, happy, hspec
+     , hspec-dirstream, microlens, recursion, system-filepath
      , transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.0.3";
-       sha256 = "0lmqic0pwn1f5l5zm3830ipyfjv6cj799kzgx0ia0mdy9wh8pfg9";
+       version = "1.7.0.4";
+       sha256 = "1dqmb2wp47smjg55klwb2si8v14yahkrqzgzw9sssla9kyqna46n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
          microlens recursion transformers
        ];
-       libraryToolDepends = [ alex cpphs happy ];
+       libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
        ];
@@ -128516,6 +128879,7 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -130717,8 +131081,8 @@ self: {
      }:
      mkDerivation {
        pname = "lhs2tex";
-       version = "1.21";
-       sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7";
+       version = "1.22";
+       sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -131107,6 +131471,7 @@ self: {
        ];
        description = "Bindings to the nix package manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -131638,6 +132003,7 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -135273,6 +135639,7 @@ self: {
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lss" = callPackage
@@ -135897,8 +136264,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.3";
        sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
-       revision = "2";
-       editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618";
+       revision = "3";
+       editedCabalFile = "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -135971,8 +136338,8 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn";
-       revision = "2";
-       editedCabalFile = "068k1y57r8vsvm36c682jylv27nsdw646fsx1bkjxccgq7h6mbbb";
+       revision = "3";
+       editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
@@ -140023,13 +140390,14 @@ self: {
        pname = "miconix-test";
        version = "0.2";
        sha256 = "02p2m11chfva4i6293if0yf8rvdbxjf8wz38ckmksiicmzhss10y";
-       revision = "2";
-       editedCabalFile = "061f5whj0f9bmqwgnp14zi96ja5c5m28hr56qlcf07pv6rsk5fz6";
+       revision = "3";
+       editedCabalFile = "1rkx448wrvq08qi84g5vqxk3fc27xb4jgwf9vi6hqj5a9gwnjfcg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       description = "a";
+       description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -140056,6 +140424,8 @@ self: {
        pname = "microaeson";
        version = "0.1.0.0";
        sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
+       revision = "1";
+       editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
        libraryHaskellDepends = [
          array base bytestring containers deepseq text
        ];
@@ -141320,6 +141690,7 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mkbndl" = callPackage
@@ -141448,6 +141819,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark_0_0_6_0" = callPackage
@@ -141499,6 +141871,7 @@ self: {
        ];
        description = "Command line interface to MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli_0_0_4_0" = callPackage
@@ -141541,6 +141914,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -147962,8 +148336,8 @@ self: {
        pname = "netrc";
        version = "0.2.0.0";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
-       revision = "4";
-       editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr";
+       revision = "5";
+       editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka";
        libraryHaskellDepends = [ base bytestring deepseq parsec ];
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -152511,6 +152885,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -153351,6 +153726,7 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentype" = callPackage
@@ -153536,6 +153912,7 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -154455,6 +154832,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "packcheck_0_4_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "packcheck";
+       version = "0.4.0";
+       sha256 = "1dlvrad746ns76ah07wr9jgw454srag1wjrfp39pld26i70isif6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base ];
+       description = "Universal build and CI testing for Haskell packages";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "packdeps" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, optparse-applicative, process, semigroups, split, tar
@@ -155219,8 +155610,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.5";
-       sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah";
+       version = "0.5.1";
+       sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -155381,15 +155772,16 @@ self: {
      }) {inherit (pkgs.gnome2) pango;};
 
   "pangraph" = callPackage
-    ({ mkDerivation, algebraic-graphs, base, bytestring, containers
-     , hexml, HUnit
+    ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
+     , containers, fgl, hexml, html-entities, HUnit, text
      }:
      mkDerivation {
        pname = "pangraph";
-       version = "0.1.2";
-       sha256 = "03iqf77j7a382m7zwkgh872frbii98l04agh6sr4ic96554b0gzl";
+       version = "0.2.0";
+       sha256 = "1zm19gbidi6a27vi7x66dlw3q0syy5vwdykck716kdfka88vr9k5";
        libraryHaskellDepends = [
-         algebraic-graphs base bytestring containers hexml
+         algebraic-graphs attoparsec base bytestring containers fgl hexml
+         html-entities text
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
@@ -157174,6 +157566,8 @@ self: {
        pname = "paths";
        version = "0.2.0.0";
        sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v";
+       revision = "1";
+       editedCabalFile = "1k477vwhahdgkf3sm2yjl1638qwq6ddm2x10vdf3cq48js2pkrw5";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath template-haskell text
          time
@@ -158456,6 +158850,7 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permute" = callPackage
@@ -159991,8 +160386,8 @@ self: {
      }:
      mkDerivation {
        pname = "pier";
-       version = "0.2.0.1";
-       sha256 = "0j26bwm58lh0dddn0595hr6pq9f8plkvg670k3g0va1aqbd2i48k";
+       version = "0.3.0.0";
+       sha256 = "1rv5k8apxshh8kbbbjzcw23bfx819634ryz83jp2iqhixlgcqz69";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160013,8 +160408,8 @@ self: {
      }:
      mkDerivation {
        pname = "pier-core";
-       version = "0.2.0.1";
-       sha256 = "1kd6z5vw2v61kpgpf95a8hs4m97lnydsl2k0xqxq5bg59q281b64";
+       version = "0.3.0.0";
+       sha256 = "0sxdswnkxhdcfcg4xq11lvgsip05nr4qd361qdrw2nxafq9q3dnj";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring Cabal containers
          cryptohash-sha256 directory hashable http-client http-client-tls
@@ -161405,6 +161800,7 @@ self: {
        ];
        description = "Haskell game engine like fantasy console";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs1" = callPackage
@@ -161629,6 +162025,7 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plankton" = callPackage
@@ -163732,8 +164129,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.3.0.0";
-       sha256 = "1lr9jj2dv01njjv2iqvirim1gv8bgb5pzaipni04f1dr5bhgkfhd";
+       version = "0.3.0.1";
+       sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly";
        libraryHaskellDepends = [
          base bytestring data-default either generic-deriving
          optparse-applicative optparse-generic postgresql-simple split
@@ -165323,6 +165720,7 @@ self: {
        ];
        description = "prim typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-ref" = callPackage
@@ -167245,6 +167643,7 @@ self: {
        ];
        doHaddock = false;
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-setup" = callPackage
@@ -167261,6 +167660,7 @@ self: {
        ];
        description = "Cabal support for codegen with proto-lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -168324,6 +168724,7 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -169942,6 +170343,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -170492,6 +170894,7 @@ self: {
        ];
        description = "Radix tree data structive over short byte-strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radixtree" = callPackage
@@ -181641,6 +182044,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scyther-proof" = callPackage
@@ -183600,6 +184004,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-server_0_4_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-conversion, case-insensitive, cookie
+     , crypto-api, data-default-class, entropy, hspec, hspec-discover
+     , http-api-data, http-client, http-types, jose, lens, lens-aeson
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
+     , unordered-containers, wai, warp, wreq
+     }:
+     mkDerivation {
+       pname = "servant-auth-server";
+       version = "0.4.0.1";
+       sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data http-types jose lens
+         monad-time mtl servant servant-auth servant-server tagged text time
+         unordered-containers wai
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive hspec http-client http-types
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "servant-server/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-swagger" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
      , servant, servant-auth, servant-swagger, swagger2, text
@@ -184263,6 +184698,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -188330,8 +188766,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-sql-parser";
-       version = "0.4.3";
-       sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8";
+       version = "0.4.4";
+       sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -189266,6 +189702,7 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skip-list" = callPackage
@@ -192131,6 +192568,7 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {softfloat = null;};
 
   "solga" = callPackage
@@ -194779,6 +195217,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage" = callPackage
@@ -196004,12 +196443,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm_2_4_5_1" = callPackage
+  "stm_2_5_0_0" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "stm";
-       version = "2.4.5.1";
-       sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c";
+       version = "2.5.0.0";
+       sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
        libraryHaskellDepends = [ array base ];
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
@@ -196290,6 +196729,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-split_0_0_2_1" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "stm-split";
+       version = "0.0.2.1";
+       sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8";
+       libraryHaskellDepends = [ base stm ];
+       description = "TMVars, TVars and TChans with distinguished input and output side";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-stats" = callPackage
     ({ mkDerivation, base, containers, stm, template-haskell, time }:
      mkDerivation {
@@ -203173,12 +203624,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "template-haskell_2_13_0_0" = callPackage
+  "template-haskell_2_14_0_0" = callPackage
     ({ mkDerivation, base, ghc-boot-th, pretty }:
      mkDerivation {
        pname = "template-haskell";
-       version = "2.13.0.0";
-       sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3";
+       version = "2.14.0.0";
+       sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9";
        libraryHaskellDepends = [ base ghc-boot-th pretty ];
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -204664,7 +205115,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text_1_2_3_0" = callPackage
+  "text_1_2_3_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
      , quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -204672,8 +205123,8 @@ self: {
      }:
      mkDerivation {
        pname = "text";
-       version = "1.2.3.0";
-       sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
+       version = "1.2.3.1";
+       sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -204961,6 +205412,7 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -205106,8 +205558,8 @@ self: {
        pname = "text-metrics";
        version = "0.3.0";
        sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
-       revision = "3";
-       editedCabalFile = "0wgkpc8zsfgc8rwbzylpf7r2nnrwhw6rani2chzc9r7lfygpqmn1";
+       revision = "4";
+       editedCabalFile = "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1";
        libraryHaskellDepends = [ base containers text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
@@ -205848,6 +206300,8 @@ self: {
        pname = "th-expand-syns";
        version = "0.4.4.0";
        sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
+       revision = "1";
+       editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
@@ -208314,12 +208768,13 @@ self: {
 
   "tldr" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
-     , filepath, optparse-applicative, semigroups, text, typed-process
+     , filepath, optparse-applicative, semigroups, tasty, tasty-golden
+     , text, typed-process
      }:
      mkDerivation {
        pname = "tldr";
-       version = "0.3.0";
-       sha256 = "1wnc1l1c9d56y64d5hlkj2z1m4vl87shfya7ix49h22l77df0jq7";
+       version = "0.4.0";
+       sha256 = "017x3lqphbyayl9gx9ykn62i73xzb180df0a8r6ic6chk6yhivfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208329,7 +208784,7 @@ self: {
          base directory filepath optparse-applicative semigroups
          typed-process
        ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208716,6 +209171,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toktok" = callPackage
@@ -208870,6 +209326,7 @@ self: {
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -209377,6 +209834,7 @@ self: {
          base hedgehog mmorph postgresql-simple resource-pool text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracy" = callPackage
@@ -211127,6 +211585,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_11" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , semigroups, stm, system-fileio, system-filepath, temporary, text
+     , time, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.11";
+       sha256 = "19jn9k70qwhdlzkm8kq1jq37i8ck3q4fnkzn1x75prwhs60rgr0f";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm system-fileio
+         system-filepath temporary text time transformers unix unix-compat
+       ];
+       testHaskellDepends = [ base doctest 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
      }:
@@ -211185,6 +211667,7 @@ self: {
        ];
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twee-lib" = callPackage
@@ -211211,8 +211694,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.42";
-       sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37";
+       version = "1.0.1.43";
+       sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213222,8 +213705,8 @@ self: {
        pname = "uhttpc";
        version = "0.1.1.0";
        sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
-       revision = "3";
-       editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry";
+       revision = "4";
+       editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213538,6 +214021,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unescaping-print" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unescaping-print";
+       version = "0.1";
+       sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
+       libraryHaskellDepends = [ base ];
+       description = "Tiny package providing unescaping versions of show and print";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unexceptionalio" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -213569,8 +214063,8 @@ self: {
        pname = "unfoldable";
        version = "0.9.6";
        sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d";
-       revision = "1";
-       editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c";
+       revision = "2";
+       editedCabalFile = "08rx8ci2jpa77q1dl4lghlyhd27if990ic9kaz30hczsazlzi44b";
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
@@ -214455,8 +214949,8 @@ self: {
        pname = "unix";
        version = "2.7.2.2";
        sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
-       revision = "1";
-       editedCabalFile = "0cag1vm2pmzgy0v1j27lhp37iipck06n6gjlphpl26p5xw3gwd31";
+       revision = "2";
+       editedCabalFile = "0d6dv944rp8g69p336b1ik9xl1f182jd8lz82ykhfjhasw8d1waf";
        libraryHaskellDepends = [ base bytestring time ];
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -214635,6 +215129,8 @@ self: {
        pname = "unliftio";
        version = "0.2.8.0";
        sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
+       revision = "1";
+       editedCabalFile = "1l9hncv1pavdqyy1zmjfypqd23m243x5fiid7vh1rki71fdlh9z0";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
@@ -214647,12 +215143,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_8_1" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.8.1";
+       sha256 = "18v8rzm2nxpck5xvg8qixkarhliy16yswgvj6vbjzq8bn4n6nydz";
+       revision = "1";
+       editedCabalFile = "1zx2h1mnjcjszjdchg17gqrnj3d56x46947jm92snmdjw8x231wg";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "unliftio-core";
        version = "0.1.2.0";
        sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
+       revision = "1";
+       editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29";
        libraryHaskellDepends = [ base transformers ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
        license = stdenv.lib.licenses.mit;
@@ -215899,6 +216420,7 @@ self: {
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-plus" = callPackage
@@ -215926,6 +216448,7 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -215941,6 +216464,7 @@ self: {
        doHaddock = false;
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-universe" = callPackage
@@ -216971,6 +217495,7 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -219909,6 +220434,7 @@ self: {
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-rollbar" = callPackage
@@ -222388,6 +222914,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_2_2" = callPackage
+    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
+     , semigroups, stm, text, transformers
+     }:
+     mkDerivation {
+       pname = "wild-bind";
+       version = "0.1.2.2";
+       sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
+       libraryHaskellDepends = [
+         base containers semigroups text transformers
+       ];
+       testHaskellDepends = [
+         base hspec microlens QuickCheck stm transformers
+       ];
+       description = "Dynamic key binding framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
@@ -222439,6 +222984,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_5" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.5";
+       sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -222470,8 +223035,8 @@ self: {
        pname = "windns";
        version = "0.1.0.0";
        sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
-       revision = "2";
-       editedCabalFile = "19n1nb65mgz9rdp37z7sdmjxwcl2wnlrflqcwbhr99ly2anx0sy7";
+       revision = "3";
+       editedCabalFile = "0j6gqyvhv7hxm5n249nrv0d9r41qb0yc4qdrzkjgs6lchndi6mrp";
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
@@ -222796,6 +223361,7 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint" = callPackage
@@ -223875,6 +224441,7 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wtk" = callPackage
@@ -230756,6 +231323,7 @@ self: {
        ];
        description = "More constrained extensions to zeromq4-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeroth" = callPackage
@@ -230962,6 +231530,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, directory
+     , dlist, exceptions, filepath, hspec, monad-control, mtl
+     , QuickCheck, resourcet, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "1.2.0";
+       sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest directory dlist exceptions filepath
+         monad-control mtl resourcet text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [ base filepath ];
+       testHaskellDepends = [
+         base bytestring conduit containers directory dlist exceptions
+         filepath hspec QuickCheck temporary text time transformers
+       ];
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, pretty, process

From 89972ff45f140453bc9a5c220f5d480ae63ab3fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 13:35:16 +0200
Subject: [PATCH 1678/3253] all-cabal-hashes: update snapshot to Hackage at
 2018-09-18T11:13:20Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index a72c94759fa8..3c837feb6be5 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e44c7d34b0e57883da9cc0e09b0b5de3b065fe98.tar.gz";
-  sha256 = "1manarsja8lsvs75zd3jnjhy5yb1576yv8ba0jqa4a1rszrkil1d";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b16aa9c85633ea49e19aee5e1678d082ce953a17.tar.gz";
+  sha256 = "185p6112b35s2vgbswrmy5lwf09q27gzkpcfla6dbddmbk948d38";
 }

From dbffdee9d27b8f672682de958aa6b8e97a5f064c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 15:48:30 +0200
Subject: [PATCH 1679/3253] Add a couple of overrides to fix build with GHC
 8.6.1.

---
 .../haskell-modules/configuration-ghc-8.6.x.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 42712df3295b..e4c4c0b19064 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -57,4 +57,11 @@ self: super: {
   tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 
+  # Older versions don't work with ghc 8.6.1:
+  hspec-core = self.hspec-core_2_5_6;
+  hspec-core_2_5_6 = super.hspec-core_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-meta = self.hspec-meta_2_5_6;
+  optparse-applicative = doJailbreak super.optparse-applicative;
+  unordered-containers = dontCheck super.unordered-containers;
+
 }

From 9e963c020e22e84b841ab40f406ede6144afbdd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 22 Sep 2018 15:49:12 +0200
Subject: [PATCH 1680/3253] haskell-stm: update overrides for the new 2.5.x
 version

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 5684d14caddf..d5c3e3c205bd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -40,7 +40,7 @@ self: super: {
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
   parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
-  stm = self.stm_2_4_5_1;
+  stm = self.stm_2_5_0_0;
   text = self.text_1_2_3_0;
 
   # Build jailbreak-cabal with the latest version of Cabal.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index a28682004239..168b569cf8c9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -39,7 +39,7 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_1;
+  stm = self.stm_2_5_0_0;
   text = self.text_1_2_3_0;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6

From 21dc7a6aa5e4ffca010a4ac26797d1207c617f13 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2018 12:46:57 +0200
Subject: [PATCH 1681/3253] haskell-text: update overrides for the new version

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index d5c3e3c205bd..85efecc8ed3b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -41,7 +41,7 @@ self: super: {
   parsec = self.parsec_3_1_13_0;
   parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
   stm = self.stm_2_5_0_0;
-  text = self.text_1_2_3_0;
+  text = self.text_1_2_3_1;
 
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 168b569cf8c9..e0d2753a5849 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -40,7 +40,7 @@ self: super: {
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
   stm = self.stm_2_5_0_0;
-  text = self.text_1_2_3_0;
+  text = self.text_1_2_3_1;
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index af96a7425d1c..ad1f78c7c3fb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -40,7 +40,7 @@ self: super: {
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
   stm = self.stm_2_4_5_1;
-  text = self.text_1_2_3_0;
+  text = self.text_1_2_3_1;
 
   # Make sure we can still build Cabal 1.x.
   Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {

From 9de1461f45af72e4e5e68033d8486b6f0e9d7d52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2018 12:49:46 +0200
Subject: [PATCH 1682/3253] haskell-stm: update overrides for the new 2.5.x
 version

---
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghcjs.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index ad1f78c7c3fb..7a5b78ba74c6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,7 +39,7 @@ self: super: {
   # These are now core libraries in GHC 8.4.x.
   mtl = self.mtl_2_2_2;
   parsec = self.parsec_3_1_13_0;
-  stm = self.stm_2_4_5_1;
+  stm = self.stm_2_5_0_0;
   text = self.text_1_2_3_1;
 
   # Make sure we can still build Cabal 1.x.
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 7e8bc1a1e8e3..489f363db6a0 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -25,7 +25,7 @@ self: super:
 
   # GHCJS does not ship with the same core packages as GHC.
   # https://github.com/ghcjs/ghcjs/issues/676
-  stm = self.stm_2_4_5_1;
+  stm = self.stm_2_5_0_0;
   ghc-compact = self.ghc-compact_0_1_0_0;
 
   network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);

From 873476c55a1907e6198d699f781815fd699838bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 23 Sep 2018 12:50:30 +0200
Subject: [PATCH 1683/3253] haskell-hspec-core: use latest version when
 building with ghc 8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index e4c4c0b19064..9ab8e7b9557b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -58,8 +58,8 @@ self: super: {
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 
   # Older versions don't work with ghc 8.6.1:
-  hspec-core = self.hspec-core_2_5_6;
-  hspec-core_2_5_6 = super.hspec-core_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-core = self.hspec-core_2_5_7;
+  hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
   hspec-meta = self.hspec-meta_2_5_6;
   optparse-applicative = doJailbreak super.optparse-applicative;
   unordered-containers = dontCheck super.unordered-containers;

From f705ee21f6a18c10cff4679142d3d0dc95415daa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Sep 2018 21:13:11 +0200
Subject: [PATCH 1684/3253] Update overrides for ghc-8.6.x.

---
 .../configuration-ghc-8.6.x.nix                | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 9ab8e7b9557b..b49b9cea60bb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -44,9 +44,16 @@ self: super: {
   # Use to be a core-library, but no longer is since GHC 8.4.x.
   hoopl = self.hoopl_3_10_2_2;
 
-  # lts-12.x versions do not compile.
+  # LTS-12.x versions do not compile.
+  contravariant = self.contravariant_1_5;
+  doctest = self.doctest_0_16_0_1;
+  hspec-core = self.hspec-core_2_5_7;
+  hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-meta = self.hspec-meta_2_5_6;
+  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
   primitive = self.primitive_0_6_4_0;
   tagged = self.tagged_0_8_6;
+  unordered-containers = dontCheck super.unordered-containers;
 
   # Over-specified constraints.
   async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5
@@ -54,14 +61,9 @@ self: super: {
   hashable = doJailbreak super.hashable;                     # base >=4.4 && <4.1
   hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
   integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
+  optparse-applicative = doJailbreak super.optparse-applicative;   # https://github.com/pcapriotti/optparse-applicative/issues/319
+  polyparse = markBrokenVersion "1.12" super.polyparse;      # version 1.12 fails to compile
   tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 
-  # Older versions don't work with ghc 8.6.1:
-  hspec-core = self.hspec-core_2_5_7;
-  hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
-  hspec-meta = self.hspec-meta_2_5_6;
-  optparse-applicative = doJailbreak super.optparse-applicative;
-  unordered-containers = dontCheck super.unordered-containers;
-
 }

From fece91537bc31c070a80015a54149d45644b1ced Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 24 Sep 2018 19:40:59 +0000
Subject: [PATCH 1685/3253] nixos: top-level: evaluate assertions before
 warnings

or else at least the following config will fail with an evaluation error
instead of an assert

```
{
  services.nixosManual.enable = false;
  services.nixosManual.showManual = true;
}
```
---
 nixos/modules/system/activation/top-level.nix | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 254e9266e89e..848587bde294 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -93,19 +93,12 @@ let
       ${config.system.extraSystemBuilderCmds}
     '';
 
-  # Handle assertions
-
-  failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
-
-  showWarnings = res: fold (w: x: builtins.trace "warning: ${w}" x) res config.warnings;
-
   # Putting it all together.  This builds a store path containing
   # symlinks to the various parts of the built configuration (the
   # kernel, systemd units, init scripts, etc.) as well as a script
   # `switch-to-configuration' that activates the configuration and
   # makes it bootable.
-  baseSystem = showWarnings (
-    if [] == failed then pkgs.stdenvNoCC.mkDerivation {
+  baseSystem = pkgs.stdenvNoCC.mkDerivation {
       name = let hn = config.networking.hostName;
                  nn = if (hn != "") then hn else "unnamed";
           in "nixos-system-${nn}-${config.system.nixos.label}";
@@ -130,12 +123,22 @@ let
       # Needed by switch-to-configuration.
 
       perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
-  } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
+  };
+
+  # Handle assertions and warnings
+
+  failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions);
+
+  showWarnings = res: fold (w: x: builtins.trace "warning: ${w}" x) res config.warnings;
+
+  baseSystemAssertWarn = if failedAssertions != []
+    then throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}"
+    else showWarnings baseSystem;
 
   # Replace runtime dependencies
   system = fold ({ oldDependency, newDependency }: drv:
       pkgs.replaceDependency { inherit oldDependency newDependency drv; }
-    ) baseSystem config.system.replaceRuntimeDependencies;
+    ) baseSystemAssertWarn config.system.replaceRuntimeDependencies;
 
 in
 

From 563d5b1c87d7e4ca996c00a4df5b734ccd985095 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 24 Sep 2018 19:43:55 +0000
Subject: [PATCH 1686/3253] nixos: top-level: indent

---
 nixos/modules/system/activation/top-level.nix | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 848587bde294..413543df88c6 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -99,30 +99,30 @@ let
   # `switch-to-configuration' that activates the configuration and
   # makes it bootable.
   baseSystem = pkgs.stdenvNoCC.mkDerivation {
-      name = let hn = config.networking.hostName;
-                 nn = if (hn != "") then hn else "unnamed";
-          in "nixos-system-${nn}-${config.system.nixos.label}";
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-      buildCommand = systemBuilder;
+    name = let hn = config.networking.hostName;
+               nn = if (hn != "") then hn else "unnamed";
+        in "nixos-system-${nn}-${config.system.nixos.label}";
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+    buildCommand = systemBuilder;
 
-      inherit (pkgs) utillinux coreutils;
-      systemd = config.systemd.package;
-      shell = "${pkgs.bash}/bin/sh";
+    inherit (pkgs) utillinux coreutils;
+    systemd = config.systemd.package;
+    shell = "${pkgs.bash}/bin/sh";
 
-      inherit children;
-      kernelParams = config.boot.kernelParams;
-      installBootLoader =
-        config.system.build.installBootLoader
-        or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
-      activationScript = config.system.activationScripts.script;
-      nixosLabel = config.system.nixos.label;
+    inherit children;
+    kernelParams = config.boot.kernelParams;
+    installBootLoader =
+      config.system.build.installBootLoader
+      or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
+    activationScript = config.system.activationScripts.script;
+    nixosLabel = config.system.nixos.label;
 
-      configurationName = config.boot.loader.grub.configurationName;
+    configurationName = config.boot.loader.grub.configurationName;
 
-      # Needed by switch-to-configuration.
+    # Needed by switch-to-configuration.
 
-      perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
+    perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
   };
 
   # Handle assertions and warnings

From 2b7d6e463e0d278b4811c2a270814342fd1abf94 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 24 Sep 2018 14:39:57 -0500
Subject: [PATCH 1687/3253] =?UTF-8?q?nixos:=20don=E2=80=99t=20enableQt4Sup?=
 =?UTF-8?q?port=20for=20installer=20profile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is already done in
installer/cd-dvd/installation-cd-graphical-kde.nix but not in
profiles/graphical.nix. Related to #47256.
---
 nixos/modules/profiles/graphical.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 332cf58aa538..8d9fcba82067 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -7,7 +7,10 @@
   services.xserver = {
     enable = true;
     displayManager.sddm.enable = true;
-    desktopManager.plasma5.enable = true;
+    desktopManager.plasma5 = {
+      enable = true;
+      enableQt4Support = false;
+    };
     libinput.enable = true; # for touchpad support on many laptops
   };
 

From 1427c50cea8685daf8eb571301651cf347b27e23 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 24 Sep 2018 15:05:39 -0500
Subject: [PATCH 1688/3253] nfs-utils: properly strip system-generators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nfs-utils had a dependency on gcc through
etc/systemd/system-generators/*-server-generator. It was not stripped
correctly because it’s not in an expected path. This adds it to the
strip list.
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index f67663b31061..657f17c16849 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -83,6 +83,8 @@ in stdenv.mkDerivation rec {
     "statdpath=$(TMPDIR)"
   ];
 
+  stripDebugList = [ "lib" "libexec" "bin" "etc/systemd/system-generators" ];
+
   postInstall =
     ''
       # Not used on NixOS

From 1b0500e3f1be8ae74ecd5d5a81a1c5212b02ff33 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 24 Sep 2018 16:53:57 +0200
Subject: [PATCH 1689/3253] phpPackages.phpcs: 3.3.1 -> 3.3.2

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.2
---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index f235cb639df4..f54b32baea23 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -450,11 +450,11 @@ let
 
   phpcs = pkgs.stdenv.mkDerivation rec {
     name = "phpcs-${version}";
-    version = "3.3.1";
+    version = "3.3.2";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-      sha256 = "0kw1ffr688wbcip2hmr7yi7bpdf4kzwh22yvxw17lyddzq6vrqaw";
+      sha256 = "0np3bsj32mwyrcccw5pgypz7wchd5l89bq951w9a7bxh80gjhak9";
     };
 
     phases = [ "installPhase" ];

From a12787e61ade10f73c5595797e76588babbdca1b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 24 Sep 2018 16:55:21 +0200
Subject: [PATCH 1690/3253] phpPackages.phpcbf: 3.3.1 -> 3.3.2

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.2
---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index f54b32baea23..0f8f8b5dd30c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -477,11 +477,11 @@ let
 
   phpcbf = pkgs.stdenv.mkDerivation rec {
     name = "phpcbf-${version}";
-    version = "3.3.1";
+    version = "3.3.2";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-      sha256 = "0q75h8y4rbysyzh3i5nzqqln2d8592p0sz6y11rr2hz0g9qw4gim";
+      sha256 = "1qxcd7lkqrfjibkrqq1f5szrcjmd6682mwaxha7v93pj9f92wgn4";
     };
 
     phases = [ "installPhase" ];

From 256af6d0396c9e50f2d17d593d9dba41d435a2b9 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 16:22:10 -0400
Subject: [PATCH 1691/3253] texlive/combine.nix: drop nix1 support (#47294)

Since 7d1968c0e38 ('Nix minimal version: 1.11 -> 2.0') nixpkgs now require nix 2.0+
---
 pkgs/tools/typesetting/tex/texlive/combine.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 41ec8ad52694..8a01ac744145 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -12,11 +12,9 @@ let
       (bin.core.doc // { pname = "core"; tlType = "doc"; })
     ];
   };
-  partition = builtins.partition or (pred: l:
-    { right = builtins.filter pred l; wrong = builtins.filter (e: !(pred e)) l; });
   pkgList = rec {
     all = lib.filter pkgFilter (combinePkgs pkgSet);
-    splitBin = partition (p: p.tlType == "bin") all;
+    splitBin = builtins.partition (p: p.tlType == "bin") all;
     bin = mkUniquePkgs splitBin.right
       ++ lib.optional
           (lib.any (p: p.tlType == "run" && p.pname == "pdfcrop") splitBin.wrong)

From 634c37cb83d5fd0e38689c0a62fd1c053e3eb249 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Mon, 24 Sep 2018 23:28:12 +0300
Subject: [PATCH 1692/3253] fzy: 0.9 -> 1.0 (#47295)

---
 pkgs/tools/misc/fzy/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix
index f1b049ba2cee..6a04213e21ae 100644
--- a/pkgs/tools/misc/fzy/default.nix
+++ b/pkgs/tools/misc/fzy/default.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "fzy-${version}";
-  version = "0.9";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "jhawthorn";
     repo = "fzy";
     rev = version;
-    sha256 = "1f1sh88ivdgnqaqha5ircfd9vb0xmss976qns022n0ddb91k5ka6";
+    sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k";
   };
 
   makeFlags = "PREFIX=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A better fuzzy finder";
     homepage = https://github.com/jhawthorn/fzy;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.all;
   };
 }

From 8229fbb48668a6dc95c747b8e412a71770e823d4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Sep 2018 16:37:44 -0400
Subject: [PATCH 1693/3253] lhapdf: fix "lhapdf list" interactive tool (#44905)

In version 6.2.1 the "list" command now uses python bindings, which need
to be imported, so we need to set the PYTHONPATH.
---
 pkgs/development/libraries/physics/lhapdf/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 7f89c92772c3..11a2640e97c8 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lhapdf-${version}";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ python2 ];
 
   enableParallelBuilding = true;
@@ -17,6 +18,10 @@ stdenv.mkDerivation rec {
     pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
   };
 
+  postInstall = ''
+    wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
+  '';
+
   meta = {
     description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
     license     = stdenv.lib.licenses.gpl2;

From 7f0865bac876c981827ad121326bff8e88e269f2 Mon Sep 17 00:00:00 2001
From: baracoder <baracoder@googlemail.com>
Date: Mon, 24 Sep 2018 22:38:26 +0200
Subject: [PATCH 1694/3253] dotnet-sdk: Reduce closure: Unpack to a
 subdirectory to prevent copying build files (#47269)

---
 pkgs/development/compilers/dotnet/sdk/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 0e28e041cc5d..d1db965bc814 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -21,7 +21,11 @@ in
       sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654";
     };
 
-    unpackPhase = "tar xvzf $src";
+    unpackPhase = ''
+      mkdir src
+      cd src
+      tar xvzf $src
+    '';
 
     buildPhase = ''
       runHook preBuild

From 6ebad0821f207136f741a68790c6030592c9a131 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 24 Sep 2018 20:42:20 +0000
Subject: [PATCH 1695/3253] bluez-alsa: init at 1.3.1 (#47236)

---
 pkgs/tools/bluetooth/bluez-alsa/default.nix | 69 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/tools/bluetooth/bluez-alsa/default.nix

diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
new file mode 100644
index 000000000000..70bf187a2283
--- /dev/null
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
+, alsaLib, bluez, glib, sbc
+
+# optional, but useful utils
+, readline, libbsd, ncurses
+
+# optional codecs
+, aacSupport ? true, fdk_aac
+# TODO: aptxSupport
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "bluez-alsa-${version}";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "Arkq";
+    repo = "bluez-alsa";
+    rev = "v${version}";
+    sha256 = "1rzcl65gipszsmlcg24gh1xkjkyk4929xhakn6y2smrgwv1zjqdh";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  buildInputs = [
+    alsaLib bluez glib sbc
+    readline libbsd ncurses
+  ]
+  ++ optional aacSupport fdk_aac;
+
+  configureFlags = [
+    "--with-alsaplugindir=\$out/lib/alsa-lib"
+    "--enable-rfcomm"
+    "--enable-hcitop"
+  ]
+  ++ optional aacSupport "--enable-aac";
+
+  doCheck = false; # fails 1 of 3 tests, needs access to ALSA
+
+  meta = {
+    description = "Bluez 5 Bluetooth Audio ALSA Backend";
+    longDescription = ''
+      Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface.
+      Bluez-ALSA registers all Bluetooth devices with audio profiles in Bluez
+      under a virtual ALSA PCM device called `bluealsa` that supports both
+      playback and capture.
+
+      Some backstory: Bluez 5 removed built-in support for ALSA in favor of a
+      generic interface for 3rd party appliations. Thereafter, PulseAudio
+      implemented a backend for that interface and became the only way to get
+      Bluetooth audio with Bluez 5. Users prefering ALSA stayed on Bluez 4.
+      However, Bluez 4 eventually became deprecated.
+
+      This package is a rebirth of a direct interface between ALSA and Bluez 5,
+      that, unlike PulseAudio, provides KISS near-metal-like experience. It is
+      not possible to run BluezALSA and PulseAudio Bluetooth at the same time
+      due to limitations in Bluez, but it is possible to run PulseAudio over
+      BluezALSA if you disable `bluetooth-discover` and `bluez5-discover`
+      modules in PA and configure it to play/capture sound over `bluealsa` PCM.
+    '';
+    homepage = src.meta.homepage;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.oxij ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b8597b0a93d..c76073d1ad62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -930,6 +930,8 @@ with pkgs;
     libgit2 = libgit2_0_27;
   };
 
+  bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { };
+
   bluez-tools = callPackage ../tools/bluetooth/bluez-tools { };
 
   bmon = callPackage ../tools/misc/bmon { };

From 0ce90d58cca7a1318a50268e957f3faa3b80079c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 24 Sep 2018 00:21:52 -0500
Subject: [PATCH 1696/3253] nixos/chrony: clean up, rework to be a little
 closer to upstream

Most importantly, this sets PrivateTmp, ProtectHome, and ProtectSystem
so that Chrony flaws are mitigated, should they occur.

Moving to ProtectSystem=full however, requires moving the chrony key
files under /var/lib/chrony -- which should be fine, anyway.

This also ensures ConditionCapability=CAP_SYS_TIME is set, ensuring
that chronyd will only be launched in an environment where such a
capability can be granted.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/chrony.nix | 52 ++++++++------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index cef30661cc33..a363b545d649 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -3,12 +3,10 @@
 with lib;
 
 let
+  cfg = config.services.chrony;
 
   stateDir = "/var/lib/chrony";
-
-  keyFile = "/etc/chrony.keys";
-
-  cfg = config.services.chrony;
+  keyFile = "${stateDir}/chrony.keys";
 
   configFile = pkgs.writeText "chrony.conf" ''
     ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
@@ -19,7 +17,6 @@ let
     }
 
     driftfile ${stateDir}/chrony.drift
-
     keyfile ${keyFile}
 
     ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"}
@@ -27,18 +24,11 @@ let
     ${cfg.extraConfig}
   '';
 
-  chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
-
+  chronyFlags = "-m -u chrony -f ${configFile} ${toString cfg.extraFlags}";
 in
-
 {
-
-  ###### interface
-
   options = {
-
     services.chrony = {
-
       enable = mkOption {
         default = false;
         description = ''
@@ -83,15 +73,9 @@ in
         description = "Extra flags passed to the chronyd command.";
       };
     };
-
   };
 
-
-  ###### implementation
-
   config = mkIf cfg.enable {
-
-    # Make chronyc available in the system path
     environment.systemPackages = [ pkgs.chrony ];
 
     users.groups = singleton
@@ -113,26 +97,30 @@ in
       { description = "chrony NTP daemon";
 
         wantedBy = [ "multi-user.target" ];
-        wants = [ "time-sync.target" ];
-        before = [ "time-sync.target" ];
-        after = [ "network.target" ];
+        wants    = [ "time-sync.target" ];
+        before   = [ "time-sync.target" ];
+        after    = [ "network.target" ];
         conflicts = [ "ntpd.service" "systemd-timesyncd.service" ];
 
         path = [ pkgs.chrony ];
 
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            touch ${keyFile}
-            chmod 0640 ${keyFile}
-            chown chrony:chrony ${stateDir} ${keyFile}
-          '';
+        preStart = ''
+          mkdir -m 0755 -p ${stateDir}
+          touch ${keyFile}
+          chmod 0640 ${keyFile}
+          chown chrony:chrony ${stateDir} ${keyFile}
+        '';
 
         serviceConfig =
-          { ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
+          { Type = "forking";
+            ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
+
+            ProtectHome = "yes";
+            ProtectSystem = "full";
+            PrivateTmp = "yes";
+
+            ConditionCapability = "CAP_SYS_TIME";
           };
       };
-
   };
-
 }

From da18634eff4d8a49e9105c84b15dd139c47c1fc1 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <lopsided98@users.noreply.github.com>
Date: Mon, 24 Sep 2018 16:57:38 -0400
Subject: [PATCH 1697/3253] valgrind: enable debug info (#47251)

At least on ARM, valgrind produces no stack trace unless debug info is
available for its own libraries.
---
 pkgs/development/tools/analysis/valgrind/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 5734a0f27953..ccc2cf9b4ab5 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl gdb ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
 
   enableParallelBuilding = true;
+  separateDebugInfo = stdenv.isLinux;
 
   preConfigure = stdenv.lib.optionalString stdenv.isDarwin (
     let OSRELEASE = ''

From 3c0cced27208b2d80dc0a4b1e2637bf85d912388 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 24 Sep 2018 21:00:49 +0000
Subject: [PATCH 1698/3253] nixos: doc: nixos-manual: fix assert

---
 nixos/modules/services/misc/nixos-manual.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 023a933fd893..7202269d3421 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -6,7 +6,10 @@
 
 with lib;
 
-let cfg = config.services.nixosManual; in
+let
+  cfg = config.services.nixosManual;
+  cfgd = config.documentation;
+in
 
 {
 
@@ -44,7 +47,7 @@ let cfg = config.services.nixosManual; in
   config = mkIf cfg.showManual {
 
     assertions = [{
-      assertion = config.documentation.nixos.enable;
+      assertion = cfgd.enable && cfgd.nixos.enable;
       message   = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
     }];
 

From 1a6ce11518af319e6029863a7f220c071ce5b467 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 24 Sep 2018 21:01:24 +0000
Subject: [PATCH 1699/3253] nixos: doc: fix minimal profile and installer
 configs

---
 nixos/modules/profiles/installation-device.nix | 2 +-
 nixos/modules/profiles/minimal.nix             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 22d1af426948..9c84d267a334 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -22,7 +22,7 @@ with lib;
   config = {
 
     # Enable in installer, even if the minimal profile disables it.
-    documentation.nixos.enable = mkForce true;
+    documentation.enable = mkForce true;
 
     # Show the manual.
     services.nixosManual.showManual = true;
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index dd81e61460cf..138eda117c74 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -12,7 +12,6 @@ with lib;
   i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
 
   documentation.enable = mkDefault false;
-  documentation.nixos.enable = mkDefault false;
 
   sound.enable = mkDefault false;
 }

From 60909fddf8e9d68ceb36daf8ce8c0db45d3ece39 Mon Sep 17 00:00:00 2001
From: Felipe Espinoza <fdns@users.noreply.github.com>
Date: Mon, 24 Sep 2018 18:24:22 -0300
Subject: [PATCH 1700/3253] compactor: 0.11.0 -> 0.11.1 (#47271)

---
 pkgs/applications/networking/compactor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index d2b1a8eba367..48f85c80e0eb 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "compactor-${version}";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "dns-stats";
     repo = "compactor";
     rev = "${version}";
-    sha256 = "1zn6w99xqq5igaz0n89429i78a5pj4nnfn1mm5yv1yfbn1lm0y3l";
+    sha256 = "0bd82956nkpdmfj8f05z37hy7f33cd2nfdxr7s9fgz1xi5flnzjc";
   };
 
   # cbor-diag, cddl and wireshark-cli are only used for tests.

From 39443c6bb7f9ea3df4488b9e01eddd48317d1137 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Sep 2018 14:58:13 -0700
Subject: [PATCH 1701/3253] libtins: 3.5 -> 4.0 (#38208)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libtins/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0 with grep in /nix/store/izz1bkj35g5bb6kvqa5kqgb376xhardg-libtins-4.0
- found 4.0 in filename of file in /nix/store/izz1bkj35g5bb6kvqa5kqgb376xhardg-libtins-4.0
- directory tree listing: https://gist.github.com/26990576c9472ca38b4d21613157856b
---
 pkgs/development/libraries/libtins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index efd63148fb10..1af7548ac962 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libtins-${version}";
-  version = "3.5";
+  version = "4.0";
   
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "libtins";
     rev = "v${version}";
-    sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x";
+    sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs";
   };
 
   postPatch = ''

From 77088b5d12b415ff356ffa76e7e9548270592f78 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Mon, 13 Aug 2018 09:13:09 +1000
Subject: [PATCH 1702/3253] blastem: init at 0.5.1

---
 pkgs/misc/emulators/blastem/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/misc/emulators/blastem/default.nix

diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix
new file mode 100644
index 000000000000..afc555cb51ea
--- /dev/null
+++ b/pkgs/misc/emulators/blastem/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }:
+
+let
+  vasm =
+    stdenv.mkDerivation rec {
+      name = "vasm-${version}";
+      version = "1.8c";
+      src = fetchFromGitHub {
+        owner = "mbitsnbites";
+        repo = "vasm";
+        rev = "244f8bbbdf64ae603f9f6c09a3067943837459ec";
+        sha256 = "0x4y5q7ygxfjfy2wxijkps9khsjjfb169sbda410vaw0m88wqj5p";
+      };
+      makeFlags = "CPU=m68k SYNTAX=mot";
+      installPhase = ''
+        mkdir -p $out/bin
+        cp vasmm68k_mot $out/bin
+      '';
+    };
+in
+stdenv.mkDerivation rec {
+  name = "blastem-${version}";
+  version = "0.5.1";
+  src = fetchurl {
+    url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz";
+    sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";
+  };
+  buildInputs = [ pkgconfig SDL2 glew xcftools python pillow vasm makeWrapper ];
+  preBuild = ''
+    patchShebangs img2tiles.py
+  '';
+  postBuild = ''
+    make menu.bin
+  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/blastem
+    cp -r {blastem,menu.bin,default.cfg,rom.db,shaders} $out/share/blastem/
+    makeWrapper $out/share/blastem/blastem $out/bin/blastem
+  '';
+
+  meta = {
+    homepage = https://www.retrodev.com/blastem/;
+    description = "The fast and accurate Genesis emulator";
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84ad48079580..6afcd4988061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1659,6 +1659,10 @@ with pkgs;
 
   biber = callPackage ../tools/typesetting/biber { };
 
+  blastem = callPackage ../misc/emulators/blastem {
+    inherit (python27Packages) pillow;
+  };
+
   blueman = callPackage ../tools/bluetooth/blueman {
     withPulseAudio = config.pulseaudio or true;
   };

From 12a1c2e6c58aa54446adefa63b9006545fe3617e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 01:43:15 +0000
Subject: [PATCH 1703/3253] protobuf: rename github owner to protocolbuffers

https://github.com/google/protobuf redirects to
https://github.com/protocolbuffers/protobuf
---
 pkgs/development/libraries/protobuf/generic-v3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 5f0006c05894..79e4c387cdf5 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
-    owner = "google";
+    owner = "protocolbuffers";
     repo = "protobuf";
     rev = "v${version}";
     inherit sha256;

From 1c3ecab0f71d13744cd18690e573ff4ac6aa8979 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 01:44:46 +0000
Subject: [PATCH 1704/3253] protobuf3_6: init at 3.6.1

---
 pkgs/development/libraries/protobuf/3.6.nix | 6 ++++++
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/protobuf/3.6.nix

diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
new file mode 100644
index 000000000000..0009209d9cef
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+  version = "3.6.1";
+  sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c76073d1ad62..7a164b6cfd57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11644,6 +11644,7 @@ with pkgs;
 
   protobuf = protobuf3_4;
 
+  protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
   protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };

From 45aa373fa94bfd934d7c084e9ce17fbb3660ddb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:31:30 +0200
Subject: [PATCH 1705/3253] gitlab-workhorse: 4.2.0 -> 6.0.0

---
 .../version-management/gitlab-workhorse/default.nix      | 8 ++++----
 .../gitlab-workhorse/deterministic-build.patch           | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 723d2faeb267..8bfd1d07411f 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitLab, git, go }:
-
 stdenv.mkDerivation rec {
-  version = "4.2.0";
   name = "gitlab-workhorse-${version}";
 
+  version = "6.0.0";
+
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "11n43mfp7a59iq8k7sh9bnww3bq56ml2p6752csclg77xii6dzyy";
+    sha256 = "0bg6rci69953h6zpdlv7pmjg751i31ykk6vggxb0ir0a6m8i3vn6";
   };
 
   buildInputs = [ git go ];
 
-  patches = [ ./remove-hardcoded-paths.patch ];
+  patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ];
 
   buildPhase = ''
     make PREFIX=$out
diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
new file mode 100644
index 000000000000..e9c42089bed4
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
@@ -0,0 +1,9 @@
+--- a/Makefile	2018-08-31 09:41:32.784419122 +0200
++++ b/Makefile	2018-08-31 09:31:22.384313577 +0200
+@@ -1,5 +1,5 @@
+ PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++VERSION=6.0.0
+ BUILD_DIR = $(shell pwd)
+ export GOPATH=${BUILD_DIR}/_build
+ export PATH:=${GOPATH}/bin:${PATH}

From 949172f2890e9b4ed0ef1f60a895f3c4941986f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:33:18 +0200
Subject: [PATCH 1706/3253] gitaly: 0.100.0 -> 0.117.2

---
 .../version-management/gitaly/Gemfile         | 11 +--
 .../version-management/gitaly/Gemfile.lock    | 72 ++++++++-------
 .../version-management/gitaly/default.nix     |  8 +-
 .../version-management/gitaly/gemset.nix      | 87 +++++++++++--------
 4 files changed, 101 insertions(+), 77 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index fd8e6b40225b..ad3a4c171376 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,15 +1,16 @@
 source 'https://rubygems.org'
 
-gem 'rugged', '~> 0.27.0'
-gem 'github-linguist', '~> 5.3.3', require: 'linguist'
-gem 'gitlab-markup', '~> 1.6.2'
-gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
+gem 'rugged', '~> 0.27.4'
+gem 'github-linguist', '~> 6.1', require: 'linguist'
+gem 'gitlab-markup', '~> 1.6.4'
+gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.10.0'
+gem 'grpc', '~> 1.11.0'
 gem 'sentry-raven', '~> 2.7.2', require: false
+gem 'faraday', '~> 0.12'
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index fb63553221dc..0a521ab22dc2 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -11,30 +11,31 @@ GEM
     ast (2.3.0)
     charlock_holmes (0.7.6)
     concurrent-ruby (1.0.5)
+    crass (1.0.4)
     diff-lcs (1.3)
-    escape_utils (1.1.1)
-    faraday (0.14.0)
+    escape_utils (1.2.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.99.0)
+    gitaly-proto (0.107.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
-    github-linguist (5.3.3)
-      charlock_holmes (~> 0.7.5)
-      escape_utils (~> 1.1.0)
+    github-linguist (6.2.0)
+      charlock_holmes (~> 0.7.6)
+      escape_utils (~> 1.2.0)
       mime-types (>= 1.19)
       rugged (>= 0.25.1)
     github-markup (1.7.0)
-    gitlab-gollum-lib (4.2.7.1)
+    gitlab-gollum-lib (4.2.7.5)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (>= 1.6.1, < 2.0)
-      rouge (~> 2.1)
-      sanitize (~> 2.1)
+      rouge (~> 3.1)
+      sanitize (~> 4.6.4)
       stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4)
+    gitlab-gollum-rugged_adapter (0.4.4.1)
       mime-types (>= 1.15)
       rugged (~> 0.25)
     gitlab-grit (2.8.2)
@@ -42,7 +43,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-markup (1.6.3)
+    gitlab-markup (1.6.4)
     gitlab-styles (2.0.0)
       rubocop (~> 0.49)
       rubocop-gitlab-security (~> 0.1.0)
@@ -60,7 +61,7 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.10.0)
+    grpc (1.11.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
@@ -81,8 +82,10 @@ GEM
     minitest (5.9.1)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    nokogumbo (1.5.0)
+      nokogiri
     os (0.9.6)
     parallel (1.12.0)
     parser (2.4.0.0)
@@ -94,20 +97,20 @@ GEM
       rake
     rake (12.1.0)
     rdoc (4.3.0)
-    rouge (2.2.1)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rouge (3.2.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rubocop (0.50.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -120,9 +123,11 @@ GEM
     rubocop-rspec (1.17.0)
       rubocop (>= 0.50.0)
     ruby-progressbar (1.8.3)
-    rugged (0.27.0)
-    sanitize (2.1.0)
+    rugged (0.27.4)
+    sanitize (4.6.6)
+      crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4)
     sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     signet (0.8.1)
@@ -141,19 +146,20 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.0.2)
-  gitaly-proto (~> 0.99.0)
-  github-linguist (~> 5.3.3)
+  faraday (~> 0.12)
+  gitaly-proto (~> 0.107.0)
+  github-linguist (~> 6.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
-  gitlab-markup (~> 1.6.2)
+  gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.0.0)
   google-protobuf (= 3.5.1)
-  grpc (~> 1.10.0)
+  grpc (~> 1.11.0)
   licensee (~> 8.9.0)
   rdoc (~> 4.2)
   rspec
-  rugged (~> 0.27.0)
+  rugged (~> 0.27.4)
   sentry-raven (~> 2.7.2)
 
 BUNDLED WITH
-   1.16.1
+   1.16.3
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 52d46a991187..499f07472cf4 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.100.0";
+  version = "0.117.2";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0lnyk3abk1jxhii4cx009w11fm082c3va0nnnnycghrmfkv2r1rs";
+    sha256 = "1hwgixymfqr6fkywwbkvdcwg1q62pypx9ffvzbcl46n4x32spm9i";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -22,8 +22,8 @@ in buildGoPackage rec {
   passthru = {
     inherit rubyEnv;
   };
-
-  buildInputs = [rubyEnv.wrappedRuby];
+  
+  buildInputs = [ rubyEnv.wrappedRuby ];
 
   postInstall = ''
     mkdir -p $ruby
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index bd192d0b2e43..6245b7925025 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -41,6 +41,14 @@
     };
     version = "1.0.5";
   };
+  crass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
   diff-lcs = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -52,19 +60,19 @@
   escape_utils = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "088r5c2mz2vy2jbbx1xjbi8msnzg631ggli29nhik2spbcp1z6vh";
+      sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.2.1";
   };
   faraday = {
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
+      sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
       type = "gem";
     };
-    version = "0.14.0";
+    version = "0.12.2";
   };
   gemojione = {
     dependencies = ["json"];
@@ -79,19 +87,19 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y5sn60h71ssxmc8br32fqhgmfqxgrmdlg4vya8dyy37ai20f85z";
+      sha256 = "01g40gcv7a7w7z27pa65f229k04k1dgxf8rki4g38y6azaj88yib";
       type = "gem";
     };
-    version = "0.99.0";
+    version = "0.107.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
+      sha256 = "1fs0i5xxsl91hnfa17ipk8cwxrg84kjg9mzxvxkd4ykldfdp353y";
       type = "gem";
     };
-    version = "5.3.3";
+    version = "6.2.0";
   };
   github-markup = {
     source = {
@@ -105,19 +113,19 @@
     dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lk5ly17a40xjz8b7l05b4hkrlnq8vawjy4szxl5w0hkaa24m97s";
+      sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
       type = "gem";
     };
-    version = "4.2.7.1";
+    version = "4.2.7.5";
   };
   gitlab-gollum-rugged_adapter = {
     dependencies = ["mime-types" "rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zk89c2ljv9skcxzwnr84rqxv3iam30n5liv5r8hgl0l67qbg1mg";
+      sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
       type = "gem";
     };
-    version = "0.4.4";
+    version = "0.4.4.1";
   };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -131,10 +139,10 @@
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
+      sha256 = "1v6w3z7smmkqnhphb4ghgpqg61vimflqzpszybji0li99f2k1jb6";
       type = "gem";
     };
-    version = "1.6.3";
+    version = "1.6.4";
   };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
@@ -184,10 +192,10 @@
     dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82";
+      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
   i18n = {
     source = {
@@ -300,10 +308,19 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.4";
+  };
+  nokogumbo = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
+      type = "gem";
+    };
+    version = "1.5.0";
   };
   os = {
     source = {
@@ -382,54 +399,54 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
+      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "3.2.1";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+      sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-core = {
     dependencies = ["rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+      sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.1";
   };
   rspec-expectations = {
     dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+      sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-mocks = {
     dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+      sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-support = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+      sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.1";
   };
   rubocop = {
     dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
@@ -469,19 +486,19 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
+      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
       type = "gem";
     };
-    version = "0.27.0";
+    version = "0.27.4";
   };
   sanitize = {
-    dependencies = ["nokogiri"];
+    dependencies = ["crass" "nokogiri" "nokogumbo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "4.6.6";
   };
   sentry-raven = {
     dependencies = ["faraday"];

From bfc8d80c6ec842b21b4a19306a871db7010048d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:34:26 +0200
Subject: [PATCH 1707/3253] gitlab-shell: 7.1.2 -> 8.1.1

---
 .../version-management/gitlab-shell/default.nix  |  9 +++++----
 .../version-management/gitlab-shell/fixes.patch  | 16 ----------------
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab-shell/fixes.patch

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 09c1cd13d440..b8546dce952b 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,19 +1,19 @@
 { stdenv, ruby, bundler, fetchFromGitLab, go }:
 
 stdenv.mkDerivation rec {
-  version = "7.1.2";
+  version = "8.1.1";
   name = "gitlab-shell-${version}";
 
-  srcs = fetchFromGitLab {
+  src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni";
+    sha256 = "12lhxlkdbxqiwb2jm66lwykb3mba1kndd3miwb6ac9l6ngvqgyzz";
   };
 
   buildInputs = [ ruby bundler go ];
 
-  patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ];
+  patches = [ ./remove-hardcoded-locations.patch ];
 
   installPhase = ''
     ruby bin/compile
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    description = "SSH access and repository management app for GitLab";
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz globin ];
diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch
deleted file mode 100644
index 29e4dccb26c7..000000000000
--- a/pkgs/applications/version-management/gitlab-shell/fixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/support/go_build.rb b/support/go_build.rb
-index 30a6b71..46b4dfa 100644
---- a/support/go_build.rb
-+++ b/support/go_build.rb
-@@ -26,8 +26,8 @@ module GoBuild
-     raise "env must be a hash" unless env.is_a?(Hash)
-     raise "cmd must be an array" unless cmd.is_a?(Array)
- 
--    unless system(env, *cmd)
--      abort "command failed: #{env.inspect} #{cmd.join(' ')}"
--    end
-+    puts "Starting #{env.inspect} #{cmd.join(' ')}"
-+    Process::wait(Process::spawn(env, *cmd))
-+    abort "command failed: #{env.inspect} #{cmd.join(' ')}" unless $?.exitstatus == 0
-   end
- end

From 51c18301478ba4e6c5e87bd5e103fe8bcd08a866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:37:51 +0200
Subject: [PATCH 1708/3253] gitlab: 10.8.0 -> 11.2.3

---
 .../version-management/gitlab/Gemfile         |  92 +--
 .../version-management/gitlab/Gemfile.lock    | 305 +++++-----
 .../version-management/gitlab/default.nix     |  47 +-
 .../version-management/gitlab/fix-36783.patch |  29 -
 .../version-management/gitlab/gemset.nix      | 529 ++++++++++--------
 5 files changed, 555 insertions(+), 447 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab/fix-36783.patch

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 89febc9bc0c2..3aa4cad037f9 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -6,7 +6,7 @@ end
 gem_versions = {}
 gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0'      : '0.2'
 gem_versions['default_value_for']               = rails5? ? '~> 3.0.5' : '~> 3.0.0'
-gem_versions['rails']                           = rails5? ? '5.0.6'    : '4.2.10'
+gem_versions['rails']                           = rails5? ? '5.0.7'    : '4.2.10'
 gem_versions['rails-i18n']                      = rails5? ? '~> 5.1'   : '~> 4.0.9'
 # --- The end of special code for migrating to Rails 5.0 ---
 
@@ -28,14 +28,14 @@ gem 'mysql2', '~> 0.4.10', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
 
 gem 'rugged', '~> 0.27'
-gem 'grape-route-helpers', '~> 2.1.0'
+gem 'grape-path-helpers', '~> 1.0'
 
 gem 'faraday', '~> 0.12'
 
 # Authentication libraries
 gem 'devise', '~> 4.4'
 gem 'doorkeeper', '~> 4.3'
-gem 'doorkeeper-openid_connect', '~> 1.3'
+gem 'doorkeeper-openid_connect', '~> 1.5'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
@@ -47,13 +47,16 @@ gem 'omniauth-google-oauth2', '~> 0.5.3'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
-gem 'omniauth-shibboleth', '~> 1.2.0'
+gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
-gem 'omniauth-authentiq', '~> 0.3.1'
+gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
 
+# Kerberos authentication. EE-only
+gem 'gssapi', group: :kerberos
+
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
@@ -93,6 +96,10 @@ gem 'grape', '~> 1.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
+# GraphQL API
+gem 'graphql', '~> 1.8.0'
+gem 'graphiql-rails', '~> 1.4.10'
+
 # Disable strong_params so that Mash does not respond to :permitted?
 gem 'hashie-forbidden_attributes'
 
@@ -100,10 +107,11 @@ gem 'hashie-forbidden_attributes'
 gem 'kaminari', '~> 1.0'
 
 # HAML
-gem 'hamlit', '~> 2.6.1'
+gem 'hamlit', '~> 2.8.8'
 
 # Files attachments
 gem 'carrierwave', '~> 1.2'
+gem 'mini_magick'
 
 # Drag and Drop UI
 gem 'dropzonejs-rails', '~> 0.7.1'
@@ -126,14 +134,21 @@ gem 'unf', '~> 0.1.4'
 # Seed data
 gem 'seed-fu', '~> 2.3.7'
 
+# Search
+gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-rails', '~> 0.1.9'
+gem 'elasticsearch-api',   '5.0.3'
+gem 'aws-sdk'
+gem 'faraday_middleware-aws-signers-v4'
+
 # Markdown and HTML processing
-gem 'html-pipeline', '~> 2.7.1'
+gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.2'
+gem 'gitlab-markup', '~> 1.6.4'
 gem 'redcarpet', '~> 3.4'
 gem 'commonmarker', '~> 0.17'
 gem 'RedCloth', '~> 4.3.2'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '~> 6.0'
 gem 'org-ruby', '~> 0.9.12'
 gem 'creole', '~> 0.5.0'
 gem 'wikicloth', '0.8.1'
@@ -144,6 +159,9 @@ gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
 
+# Calendar rendering
+gem 'icalendar'
+
 # Diffs
 gem 'diffy', '~> 3.1.0'
 
@@ -160,9 +178,9 @@ gem 'state_machines-activerecord', '~> 0.5.1'
 gem 'acts-as-taggable-on', '~> 5.0'
 
 # Background jobs
-gem 'sidekiq', '~> 5.0'
+gem 'sidekiq', '~> 5.1'
 gem 'sidekiq-cron', '~> 0.6.0'
-gem 'redis-namespace', '~> 1.5.2'
+gem 'redis-namespace', '~> 1.6.0'
 gem 'sidekiq-limit_fetch', '~> 3.4', require: false
 
 # Cron Parser
@@ -174,6 +192,9 @@ gem 'httparty', '~> 0.13.3'
 # Colored output to console
 gem 'rainbow', '~> 2.2'
 
+# Progress bar
+gem 'ruby-progressbar'
+
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
 
@@ -209,6 +230,9 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
 
+# Hangouts Chat integration
+gem 'hangouts-chat', '~> 0.0.5'
+
 # Asana integration
 gem 'asana', '~> 0.6.0'
 
@@ -216,13 +240,10 @@ gem 'asana', '~> 0.6.0'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 3.0'
-
-# d3
-gem 'd3_rails', '~> 3.5.0'
+gem 'kubeclient', '~> 3.1.0'
 
 # Sanitize user input
-gem 'sanitize', '~> 2.0'
+gem 'sanitize', '~> 4.6'
 gem 'babosa', '~> 1.0.2'
 
 # Sanitizes SVG input
@@ -257,16 +278,17 @@ gem 'sass-rails', '~> 5.0.6'
 gem 'uglifier', '~> 2.7.2'
 
 gem 'addressable', '~> 2.5.2'
-gem 'bootstrap-sass', '~> 3.3.0'
 gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.1.0'
+gem 'gon', '~> 6.2'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'request_store', '~> 1.3'
 gem 'select2-rails', '~> 3.5.9'
 gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
 
+gem "gitlab-license", "~> 1.0"
+
 # Sentry integration
 gem 'sentry-raven', '~> 2.7'
 
@@ -292,12 +314,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
 
 # Metrics
 group :metrics do
-  gem 'allocations', '~> 1.0', require: false, platform: :mri
   gem 'method_source', '~> 0.8', require: false
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.9.1'
+  gem 'prometheus-client-mmap', '~> 0.9.4'
   gem 'raindrops', '~> 0.18'
 end
 
@@ -317,19 +338,18 @@ group :development do
 end
 
 group :development, :test do
+  gem 'bootsnap', '~> 1.3'
   gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
   gem 'pry-byebug', '~> 3.4.1', platform: :mri
   gem 'pry-rails', '~> 0.3.4'
 
-  gem 'awesome_print', '~> 1.2.0', require: false
+  gem 'awesome_print', require: false
   gem 'fuubar', '~> 2.2.0'
 
   gem 'database_cleaner', '~> 1.5.0'
   gem 'factory_bot_rails', '~> 4.8.2'
-  gem 'rspec-rails', '~> 3.6.0'
+  gem 'rspec-rails', '~> 3.7.0'
   gem 'rspec-retry', '~> 0.4.5'
-  gem 'spinach-rails', '~> 0.2.1'
-  gem 'spinach-rerun-reporter', '~> 0.0.2'
   gem 'rspec_profiling', '~> 0.0.5'
   gem 'rspec-set', '~> 0.1.3'
   gem 'rspec-parameterized', require: false
@@ -342,15 +362,14 @@ group :development, :test do
 
   gem 'capybara', '~> 2.15'
   gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'selenium-webdriver', '~> 3.5'
+  gem 'selenium-webdriver', '~> 3.12'
 
   gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
-  gem 'spring-commands-spinach', '~> 1.1.0'
 
-  gem 'gitlab-styles', '~> 2.3', require: false
+  gem 'gitlab-styles', '~> 2.4', require: false
   # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 0.54.0'
   gem 'rubocop-rspec', '~> 1.22.1'
 
   gem 'scss_lint', '~> 0.56.0', require: false
@@ -375,7 +394,7 @@ end
 
 group :test do
   gem 'shoulda-matchers', '~> 3.1.2', require: false
-  gem 'email_spec', '~> 1.6.0'
+  gem 'email_spec', '~> 2.2.0'
   gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 2.3.2'
   gem 'rails-controller-testing' if rails5? # Rails5 only gem.
@@ -385,7 +404,7 @@ group :test do
   gem 'test-prof', '~> 0.2.5'
 end
 
-gem 'octokit', '~> 4.8'
+gem 'octokit', '~> 4.9'
 
 gem 'mail_room', '~> 0.9.1'
 
@@ -393,6 +412,7 @@ gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
 gem 'ruby-prof', '~> 0.17.0'
+gem 'rbtrace', '~> 0.4', require: false
 
 # OAuth
 gem 'oauth2', '~> 1.4'
@@ -404,19 +424,21 @@ gem 'health_check', '~> 2.6.0'
 gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
+# NTP client
+gem 'net-ntp'
+
 # SSH host key support
-gem 'net-ssh', '~> 4.2.0'
+gem 'net-ssh', '~> 5.0'
 gem 'sshkey', '~> 1.9.0'
 
 # Required for ED25519 SSH host key support
 group :ed25519 do
-  gem 'rbnacl-libsodium'
-  gem 'rbnacl', '~> 4.0'
+  gem 'ed25519', '~> 1.2'
   gem 'bcrypt_pbkdf', '~> 1.0'
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly'
 gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
@@ -434,4 +456,4 @@ gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
 
 # Asset synchronization
-gem 'asset_sync', '~> 2.2.0'
+gem 'asset_sync', '~> 2.4'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 2a63ee6a5328..16f1d63761fa 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -49,7 +49,6 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     aes_key_wrap (1.0.1)
     akismet (2.0.0)
-    allocations (1.0.5)
     arel (6.0.4)
     asana (0.6.0)
       faraday (~> 0.9)
@@ -59,7 +58,7 @@ GEM
     asciidoctor (1.5.6.2)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
-    asset_sync (2.2.0)
+    asset_sync (2.4.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -69,10 +68,15 @@ GEM
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
-    autoprefixer-rails (6.2.3)
-      execjs
-      json
-    awesome_print (1.2.0)
+    awesome_print (1.8.0)
+    aws-sdk (2.9.32)
+      aws-sdk-resources (= 2.9.32)
+    aws-sdk-core (2.9.32)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.9.32)
+      aws-sdk-core (= 2.9.32)
+    aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -80,7 +84,7 @@ GEM
     babosa (1.0.2)
     base32 (0.3.2)
     batch-loader (1.2.1)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
     better_errors (2.1.1)
@@ -91,9 +95,8 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     blankslate (2.1.2.4)
-    bootstrap-sass (3.3.6)
-      autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
+    bootsnap (1.3.1)
+      msgpack (~> 1.0)
     bootstrap_form (2.7.0)
     brakeman (4.2.1)
     browser (2.2.0)
@@ -115,13 +118,13 @@ GEM
     capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
-    carrierwave (1.2.1)
+    carrierwave (1.2.3)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     cause (0.1)
     charlock_holmes (0.7.6)
-    childprocess (0.7.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
     chronic_duration (0.10.6)
@@ -131,7 +134,6 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    colorize (0.7.7)
     commonmarker (0.17.8)
       ruby-enum (~> 0.5)
     concord (0.1.5)
@@ -147,8 +149,6 @@ GEM
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
-    d3_rails (3.5.11)
-      railties (>= 3.1.0)
     daemons (1.2.3)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
@@ -177,19 +177,34 @@ GEM
     diff-lcs (1.3)
     diffy (3.1.0)
     docile (1.1.5)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     doorkeeper (4.3.2)
       railties (>= 4.2)
-    doorkeeper-openid_connect (1.3.0)
+    doorkeeper-openid_connect (1.5.0)
       doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
+    ed25519 (1.2.4)
+    elasticsearch (5.0.3)
+      elasticsearch-api (= 5.0.3)
+      elasticsearch-transport (= 5.0.3)
+    elasticsearch-api (5.0.3)
+      multi_json
+    elasticsearch-model (0.1.9)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.9)
+    elasticsearch-transport (5.0.3)
+      faraday
+      multi_json
     email_reply_trimmer (0.1.6)
-    email_spec (1.6.0)
+    email_spec (2.2.0)
+      htmlentities (~> 4.3.3)
       launchy (~> 2.1)
-      mail (~> 2.2)
+      mail (~> 2.7)
     encryptor (3.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -197,7 +212,7 @@ GEM
     et-orbi (1.0.3)
       tzinfo
     eventmachine (1.0.8)
-    excon (0.60.0)
+    excon (0.62.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_bot (4.8.2)
@@ -209,6 +224,9 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
+    faraday_middleware-aws-signers-v4 (0.1.7)
+      aws-sdk-resources (~> 2)
+      faraday (~> 0.9)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
@@ -290,8 +308,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gherkin-ruby (0.3.2)
-    gitaly-proto (0.99.0)
+    gitaly-proto (0.113.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -304,15 +321,15 @@ GEM
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
-    gitlab-gollum-lib (4.2.7.2)
+    gitlab-gollum-lib (4.2.7.5)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (>= 1.6.1, < 2.0)
       rouge (~> 3.1)
-      sanitize (~> 2.1)
+      sanitize (~> 4.6.4)
       stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4)
+    gitlab-gollum-rugged_adapter (0.4.4.1)
       mime-types (>= 1.15)
       rugged (~> 0.25)
     gitlab-grit (2.8.2)
@@ -320,9 +337,10 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-markup (1.6.3)
-    gitlab-styles (2.3.2)
-      rubocop (~> 0.51)
+    gitlab-license (1.0.0)
+    gitlab-markup (1.6.4)
+    gitlab-styles (2.4.1)
+      rubocop (~> 0.54.0)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-rspec (~> 1.19)
     gitlab_omniauth-ldap (2.0.4)
@@ -334,9 +352,8 @@ GEM
       activesupport (>= 4.2.0)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gon (6.1.0)
+    gon (6.2.0)
       actionpack (>= 3.0)
-      json
       multi_json
       request_store (>= 1.0)
     google-api-client (0.19.8)
@@ -359,7 +376,7 @@ GEM
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
-    grape (1.0.2)
+    grape (1.0.3)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -369,17 +386,24 @@ GEM
     grape-entity (0.7.1)
       activesupport (>= 4.0)
       multi_json (>= 1.3.2)
-    grape-route-helpers (2.1.0)
-      activesupport
-      grape (>= 0.16.0)
-      rake
+    grape-path-helpers (1.0.6)
+      activesupport (>= 4, < 5.1)
+      grape (~> 1.0)
+      rake (~> 12)
     grape_logging (1.7.0)
       grape
+    graphiql-rails (1.4.10)
+      railties
+      sprockets-rails
+    graphql (1.8.1)
     grpc (1.11.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
-    haml (4.0.7)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
     haml_lint (0.26.0)
       haml (>= 4.0, < 5.1)
@@ -387,10 +411,11 @@ GEM
       rake (>= 10, < 13)
       rubocop (>= 0.49.0)
       sysexits (~> 1.1)
-    hamlit (2.6.1)
-      temple (~> 0.7.6)
+    hamlit (2.8.8)
+      temple (>= 0.8.0)
       thor
       tilt
+    hangouts-chat (0.0.5)
     hashdiff (0.3.4)
     hashie (3.5.7)
     hashie-forbidden_attributes (0.1.1)
@@ -400,7 +425,7 @@ GEM
     hipchat (1.5.2)
       httparty
       mimemagic
-    html-pipeline (2.7.1)
+    html-pipeline (2.8.4)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     html2text (0.2.0)
@@ -421,6 +446,7 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    icalendar (2.4.1)
     ice_nine (0.11.2)
     influxdb (0.2.3)
       cause
@@ -430,14 +456,13 @@ GEM
       activesupport
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
+    jmespath (1.3.1)
     jquery-atwho-rails (1.3.2)
     json (1.8.6)
-    json-jwt (1.9.2)
+    json-jwt (1.9.4)
       activesupport
       aes_key_wrap
       bindata
-      securecompare
-      url_safe_base64
     json-schema (2.8.0)
       addressable (>= 2.4)
     jwt (1.5.6)
@@ -456,10 +481,9 @@ GEM
     kgio (2.10.0)
     knapsack (1.16.0)
       rake
-      timecop (>= 0.1.0)
-    kubeclient (3.0.0)
+    kubeclient (3.1.0)
       http (~> 2.2.2)
-      recursive-open-struct (~> 1.0.4)
+      recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -503,10 +527,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
+    mini_magick (4.8.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
+    msgpack (1.2.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -515,10 +541,13 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-    net-ssh (4.2.0)
+    net-ntp (2.1.3)
+    net-ssh (5.0.1)
     netrc (0.11.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    nokogumbo (1.5.0)
+      nokogiri
     numerizer (0.1.1)
     oauth (0.5.4)
     oauth2 (1.4.0)
@@ -527,15 +556,16 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
     omniauth-auth0 (2.0.0)
       omniauth-oauth2 (~> 1.4)
-    omniauth-authentiq (0.3.1)
-      omniauth-oauth2 (~> 1.3, >= 1.3.1)
+    omniauth-authentiq (0.3.3)
+      jwt (>= 1.5)
+      omniauth-oauth2 (>= 1.5)
     omniauth-azure-oauth2 (0.0.9)
       jwt (~> 1.0)
       omniauth (~> 1.0)
@@ -549,7 +579,7 @@ GEM
     omniauth-github (1.3.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-gitlab (1.0.2)
+    omniauth-gitlab (1.0.3)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
     omniauth-google-oauth2 (0.5.3)
@@ -572,7 +602,7 @@ GEM
     omniauth-saml (1.10.0)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.7)
-    omniauth-shibboleth (1.2.1)
+    omniauth-shibboleth (1.3.0)
       omniauth (>= 1.0.0)
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
@@ -634,7 +664,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.9.1)
+    prometheus-client-mmap (0.9.4)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -700,16 +730,15 @@ GEM
       ffi (>= 0.5.0, < 2)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
-    rbnacl (4.0.2)
-      ffi
-    rbnacl-libsodium (1.0.11)
-      rbnacl (>= 3.0.1)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rbtrace (0.4.10)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
+    rdoc (6.0.4)
     re2 (1.1.1)
     recaptcha (3.0.0)
       json
-    recursive-open-struct (1.0.5)
+    recursive-open-struct (1.1.0)
     redcarpet (3.4.0)
     redis (3.3.5)
     redis-actionpack (5.0.2)
@@ -719,8 +748,8 @@ GEM
     redis-activesupport (5.0.4)
       activesupport (>= 3, < 6)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
     redis-rack (2.0.4)
       rack (>= 1.5, < 3)
       redis-store (>= 1.2, < 2)
@@ -745,56 +774,56 @@ GEM
     retriable (3.1.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.1.1)
+    rouge (3.2.1)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
       rqrcode (>= 0.4.2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-parameterized (0.4.0)
       binding_of_caller
       parser
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (3.6.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
     rspec-retry (0.4.5)
       rspec-core
     rspec-set (0.1.3)
-    rspec-support (3.6.0)
+    rspec-support (3.7.1)
     rspec_profiling (0.0.5)
       activerecord
       pg
       rails
       sqlite3
-    rubocop (0.52.1)
+    rubocop (0.54.0)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-gitlab-security (0.1.1)
       rubocop (>= 0.51)
-    rubocop-rspec (1.22.1)
+    rubocop-rspec (1.22.2)
       rubocop (>= 0.52.1)
     ruby-enum (0.7.2)
       i18n
@@ -811,10 +840,12 @@ GEM
     rubyzip (1.2.1)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.27.0)
+    rugged (0.27.4)
     safe_yaml (1.0.4)
-    sanitize (2.1.0)
+    sanitize (4.6.6)
+      crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4)
     sass (3.5.5)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -832,15 +863,14 @@ GEM
     scss_lint (0.56.0)
       rake (>= 0.9, < 13)
       sass (~> 3.5.3)
-    securecompare (1.0.0)
     seed-fu (2.3.7)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    selenium-webdriver (3.5.0)
+    selenium-webdriver (3.12.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.0)
+      rubyzip (~> 1.2)
     sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
@@ -849,11 +879,11 @@ GEM
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.0.5)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
+      redis (>= 3.3.5, < 5)
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
@@ -872,23 +902,11 @@ GEM
     simplecov-html (0.10.0)
     slack-notifier (1.5.1)
     slop (3.6.0)
-    spinach (0.8.10)
-      colorize
-      gherkin-ruby (>= 0.3.2)
-      json
-    spinach-rails (0.2.1)
-      capybara (>= 2.0.0)
-      railties (>= 3)
-      spinach (>= 0.4)
-    spinach-rerun-reporter (0.0.2)
-      spinach (~> 0.8)
     spring (2.0.1)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-spinach (1.1.0)
-      spring (>= 0.9.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -909,7 +927,7 @@ GEM
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
-    temple (0.7.7)
+    temple (0.8.0)
     test-prof (0.2.5)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
@@ -920,13 +938,14 @@ GEM
       rack (>= 1, < 3)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.6)
+    tilt (2.0.8)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     toml (0.1.2)
       parslet (~> 1.5.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
+    trollop (2.1.3)
     truncato (0.7.10)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.8.0, >= 1.7.0)
@@ -940,7 +959,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.3.2)
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -956,7 +975,6 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
-    url_safe_base64 (0.2.2)
     validates_hostname (1.0.6)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
@@ -994,13 +1012,13 @@ DEPENDENCIES
   acts-as-taggable-on (~> 5.0)
   addressable (~> 2.5.2)
   akismet (~> 2.0)
-  allocations (~> 1.0)
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.2.0)
+  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
-  awesome_print (~> 1.2.0)
+  awesome_print
+  aws-sdk
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 1.2.1)
@@ -1008,7 +1026,7 @@ DEPENDENCIES
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
   binding_of_caller (~> 0.7.2)
-  bootstrap-sass (~> 3.3.0)
+  bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)
   brakeman (~> 4.2)
   browser (~> 2.2)
@@ -1024,7 +1042,6 @@ DEPENDENCIES
   concurrent-ruby (~> 1.0.5)
   connection_pool (~> 2.0)
   creole (~> 0.5.0)
-  d3_rails (~> 3.5.0)
   database_cleaner (~> 1.5.0)
   deckar01-task_list (= 2.0.0)
   default_value_for (~> 3.0.0)
@@ -1033,12 +1050,17 @@ DEPENDENCIES
   devise-two-factor (~> 3.0.0)
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
-  doorkeeper-openid_connect (~> 1.3)
+  doorkeeper-openid_connect (~> 1.5)
   dropzonejs-rails (~> 0.7.1)
+  ed25519 (~> 1.2)
+  elasticsearch-api (= 5.0.3)
+  elasticsearch-model (~> 0.1.9)
+  elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
-  email_spec (~> 1.6.0)
+  email_spec (~> 2.2.0)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
+  faraday_middleware-aws-signers-v4
   fast_blank
   ffaker (~> 2.4)
   flay (~> 2.10.0)
@@ -1060,31 +1082,37 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.99.0)
+  gitaly-proto (~> 0.113.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
-  gitlab-markup (~> 1.6.2)
-  gitlab-styles (~> 2.3)
+  gitlab-license (~> 1.0)
+  gitlab-markup (~> 1.6.4)
+  gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
-  gon (~> 6.1.0)
+  gon (~> 6.2)
   google-api-client (~> 0.19.8)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
   grape-entity (~> 0.7.1)
-  grape-route-helpers (~> 2.1.0)
+  grape-path-helpers (~> 1.0)
   grape_logging (~> 1.7)
+  graphiql-rails (~> 1.4.10)
+  graphql (~> 1.8.0)
   grpc (~> 1.11.0)
+  gssapi
   haml_lint (~> 0.26.0)
-  hamlit (~> 2.6.1)
+  hamlit (~> 2.8.8)
+  hangouts-chat (~> 0.0.5)
   hashie-forbidden_attributes
   health_check (~> 2.6.0)
   hipchat (~> 1.5.0)
-  html-pipeline (~> 2.7.1)
+  html-pipeline (~> 2.8)
   html2text
   httparty (~> 0.13.3)
+  icalendar
   influxdb (~> 0.2)
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
@@ -1092,7 +1120,7 @@ DEPENDENCIES
   jwt (~> 1.5.6)
   kaminari (~> 1.0)
   knapsack (~> 1.16)
-  kubeclient (~> 3.0)
+  kubeclient (~> 3.1.0)
   letter_opener_web (~> 1.3.0)
   license_finder (~> 3.1)
   licensee (~> 8.9)
@@ -1100,17 +1128,19 @@ DEPENDENCIES
   loofah (~> 2.2)
   mail_room (~> 0.9.1)
   method_source (~> 0.8)
+  mini_magick
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-  net-ssh (~> 4.2.0)
+  net-ntp
+  net-ssh (~> 5.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
-  octokit (~> 4.8)
+  octokit (~> 4.9)
   omniauth (~> 1.8)
   omniauth-auth0 (~> 2.0.0)
-  omniauth-authentiq (~> 0.3.1)
+  omniauth-authentiq (~> 0.3.3)
   omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
@@ -1120,7 +1150,7 @@ DEPENDENCIES
   omniauth-kerberos (~> 0.3.0)
   omniauth-oauth2-generic (~> 0.2.2)
   omniauth-saml (~> 1.10)
-  omniauth-shibboleth (~> 1.2.0)
+  omniauth-shibboleth (~> 1.3.0)
   omniauth-twitter (~> 1.4)
   omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
@@ -1133,7 +1163,7 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.1)
+  prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)
@@ -1146,52 +1176,49 @@ DEPENDENCIES
   rainbow (~> 2.2)
   raindrops (~> 0.18)
   rblineprof (~> 0.3.6)
-  rbnacl (~> 4.0)
-  rbnacl-libsodium
-  rdoc (~> 4.2)
+  rbtrace (~> 0.4)
+  rdoc (~> 6.0)
   re2 (~> 1.1.1)
   recaptcha (~> 3.0)
   redcarpet (~> 3.4)
   redis (~> 3.2)
-  redis-namespace (~> 1.5.2)
+  redis-namespace (~> 1.6.0)
   redis-rails (~> 5.0.2)
   request_store (~> 1.3)
   responders (~> 2.0)
   rouge (~> 3.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
-  rspec-rails (~> 3.6.0)
+  rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
   rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.52.1)
+  rubocop (~> 0.54.0)
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
   ruby-prof (~> 0.17.0)
+  ruby-progressbar
   ruby_parser (~> 3.8)
   rufus-scheduler (~> 3.4)
   rugged (~> 0.27)
-  sanitize (~> 2.0)
+  sanitize (~> 4.6)
   sass-rails (~> 5.0.6)
   scss_lint (~> 0.56.0)
   seed-fu (~> 2.3.7)
   select2-rails (~> 3.5.9)
-  selenium-webdriver (~> 3.5)
+  selenium-webdriver (~> 3.12)
   sentry-raven (~> 2.7)
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 3.1.2)
-  sidekiq (~> 5.0)
+  sidekiq (~> 5.1)
   sidekiq-cron (~> 0.6.0)
   sidekiq-limit_fetch (~> 3.4)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.14.0)
   slack-notifier (~> 1.5.1)
-  spinach-rails (~> 0.2.1)
-  spinach-rerun-reporter (~> 0.0.2)
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-spinach (~> 1.1.0)
   sprockets (~> 3.7.0)
   sshkey (~> 1.9.0)
   stackprof (~> 0.2.10)
@@ -1217,4 +1244,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 64e0ef2b59d0..ebfcfc5bbe73 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, bundlerEnv
-, ruby, tzdata, git, procps, nettools
+{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
+, ruby, tzdata, git, procps, nettools,
 }:
 
 let
@@ -8,19 +8,19 @@ let
     inherit ruby;
     gemdir = ./.;
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
-    meta = with lib; {
-      homepage = http://www.gitlab.com/;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ fpletz globin ];
-      license = licenses.mit;
-    };
   };
 
-  version = "10.8.0";
+  version = "11.2.3";
 
   gitlabDeb = fetchurl {
-    url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "0j5jrlwfpgwfirjnqb9w4snl9w213kdxb1ajyrla211q603d4j34";
+    url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
+    sha256 = "1z7mj412zj88ia24caq41bi5p1jbcfwnrvak3bqf1113f0snkb0x";
+  };
+  gitlab = fetchFromGitLab {
+    owner = "gitlab-org";
+    repo = "gitlab-ce";
+    rev = "v${version}";
+    sha256 = "1j8y2phwdj6dv55racypm8r2v8bnzcxh2g1z33v9212hrgyjzrrh";
   };
 
 in
@@ -28,20 +28,13 @@ in
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
 
-  src = fetchFromGitHub {
-    owner = "gitlabhq";
-    repo = "gitlabhq";
-    rev = "v${version}";
-    sha256 = "1idvi27xpghvvb3sv62afhcnnswvjlrbg5lld79a761kd4187cym";
-  };
+  src = gitlab;
 
   buildInputs = [
     rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools
   ];
 
-  patches = [
-    ./remove-hardcoded-locations.patch
-  ];
+  patches = [ ./remove-hardcoded-locations.patch ];
 
   postPatch = ''
     # For reasons I don't understand "bundle exec" ignores the
@@ -72,13 +65,14 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mv config/gitlab.yml.example config/gitlab.yml
 
-    # work around unpacking deb containing binary with suid bit
+    # Building this requires yarn, node &c, so we just get it from the deb
     ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar
+    # Work around unpacking deb containing binary with suid bit
     tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
     tar -xf gitlab-deb-data.tar
 
     mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
-    rm -rf opt
+    rm -rf opt # only directory in data.tar.gz
 
     mv config/gitlab.yml config/gitlab.yml.example
     rm -f config/secrets.yml
@@ -105,10 +99,13 @@ stdenv.mkDerivation rec {
     ruby = rubyEnv.wrappedRuby;
   };
 
-  meta = with stdenv.lib; {
-    description = "Web-based Git-repository manager";
-    homepage = https://gitlab.com;
+  meta = with lib; {
+    homepage = http://www.gitlab.com/;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz globin krav ];
     license = licenses.mit;
     platforms = platforms.linux;
+    description = "GitLab Community Edition";
+    longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider.";
   };
 }
diff --git a/pkgs/applications/version-management/gitlab/fix-36783.patch b/pkgs/applications/version-management/gitlab/fix-36783.patch
deleted file mode 100644
index 64301fa2c526..000000000000
--- a/pkgs/applications/version-management/gitlab/fix-36783.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/app/workers/post_receive.rb
-+++ b/app/workers/post_receive.rb
-@@ -3,7 +3,9 @@ class PostReceive
-   include DedicatedSidekiqQueue
-
-   def perform(gl_repository, identifier, changes)
--    project, is_wiki = Gitlab::GlRepository.parse(gl_repository)
-+    # XXX: https://gitlab.com/gitlab-org/gitlab-ce/issues/36783
-+    # project, is_wiki = Gitlab::GlRepository.parse(gl_repository)
-+    project, is_wiki = parse_project_identifier(gl_repository)
-
-     if project.nil?
-       log("Triggered hook for non-existing project with gl_repository \"#{gl_repository}\"")
-@@ -59,6 +61,15 @@ class PostReceive
-     # Nothing defined here yet.
-   end
-
-+  # XXX: https://gitlab.com/gitlab-org/gitlab-ce/issues/36783
-+  def parse_project_identifier(project_identifier)
-+    if project_identifier.start_with?('/')
-+      Gitlab::RepoPath.parse(project_identifier)
-+    else
-+      Gitlab::GlRepository.parse(project_identifier)
-+    end
-+  end
-+
-   def log(message)
-     Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
-   end
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 57c274566166..a9ad5504ed30 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -130,14 +130,6 @@
     };
     version = "2.0.0";
   };
-  allocations = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y7z66lpzabyvviphk1fnzvrj5vhv7v9vppcnkrf0n5wh8qwx2zi";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
   arel = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -176,10 +168,10 @@
     dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "044nqqnbib1bpld33j5jxcql06d6fr6zmhq8hlm69zqd0xd509p0";
+      sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.4.0";
   };
   ast = {
     source = {
@@ -214,22 +206,48 @@
     };
     version = "1.0.0";
   };
-  autoprefixer-rails = {
-    dependencies = ["execjs" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx";
-      type = "gem";
-    };
-    version = "6.2.3";
-  };
   awesome_print = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
+      sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.8.0";
+  };
+  aws-sdk = {
+    dependencies = ["aws-sdk-resources"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-sigv4" "jmespath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-resources = {
+    dependencies = ["aws-sdk-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sigv4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   axiom-types = {
     dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
@@ -267,10 +285,10 @@
   bcrypt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d254sdhdj6mzak3fb5x3jam8b94pvl1srladvs53j05a89j5z50";
+      sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
       type = "gem";
     };
-    version = "3.1.11";
+    version = "3.1.12";
   };
   bcrypt_pbkdf = {
     source = {
@@ -322,14 +340,14 @@
     };
     version = "2.1.2.4";
   };
-  bootstrap-sass = {
-    dependencies = ["autoprefixer-rails" "sass"];
+  bootsnap = {
+    dependencies = ["msgpack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld";
+      sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
       type = "gem";
     };
-    version = "3.3.6";
+    version = "1.3.1";
   };
   bootstrap_form = {
     source = {
@@ -411,10 +429,10 @@
     dependencies = ["activemodel" "activesupport" "mime-types"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "012b5jks7hxis1agiy7rbra5h4zhmwhy95gck3kr22nwdxfk71ii";
+      sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.3";
   };
   cause = {
     source = {
@@ -436,10 +454,10 @@
     dependencies = ["ffi"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rqf595gv0bb48awck2cvipk78jy5pj08p1r4xbrfpd0i60jb9hd";
+      sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
       type = "gem";
     };
-    version = "0.7.0";
+    version = "0.9.0";
   };
   chronic = {
     source = {
@@ -491,14 +509,6 @@
     };
     version = "1.0.0";
   };
-  colorize = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16bsjcqb6pg3k94dh1l5g3hhx5g2g4g8rlr76dnc78yyzjjrbayn";
-      type = "gem";
-    };
-    version = "0.7.7";
-  };
   commonmarker = {
     dependencies = ["ruby-enum"];
     source = {
@@ -576,15 +586,6 @@
     };
     version = "1.5.0";
   };
-  d3_rails = {
-    dependencies = ["railties"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x";
-      type = "gem";
-    };
-    version = "3.5.11";
-  };
   daemons = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -714,10 +715,10 @@
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
       type = "gem";
     };
-    version = "0.5.20170404";
+    version = "0.5.20180417";
   };
   doorkeeper = {
     dependencies = ["railties"];
@@ -732,10 +733,10 @@
     dependencies = ["doorkeeper" "json-jwt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck";
+      sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.5.0";
   };
   dropzonejs-rails = {
     dependencies = ["rails"];
@@ -746,6 +747,58 @@
     };
     version = "0.7.2";
   };
+  ed25519 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  elasticsearch = {
+    dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-api = {
+    dependencies = ["multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-model = {
+    dependencies = ["activesupport" "elasticsearch" "hashie"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-transport = {
+    dependencies = ["faraday" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
   email_reply_trimmer = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -755,13 +808,13 @@
     version = "0.1.6";
   };
   email_spec = {
-    dependencies = ["launchy" "mail"];
+    dependencies = ["htmlentities" "launchy" "mail"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
+      sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "2.2.0";
   };
   encryptor = {
     source = {
@@ -815,10 +868,10 @@
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc";
+      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
       type = "gem";
     };
-    version = "0.60.0";
+    version = "0.62.0";
   };
   execjs = {
     source = {
@@ -872,6 +925,15 @@
     };
     version = "0.12.2";
   };
+  faraday_middleware-aws-signers-v4 = {
+    dependencies = ["aws-sdk-resources" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
     source = {
@@ -1126,22 +1188,14 @@
     };
     version = "1.3.0";
   };
-  gherkin-ruby = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1";
-      type = "gem";
-    };
-    version = "0.3.2";
-  };
   gitaly-proto = {
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y5sn60h71ssxmc8br32fqhgmfqxgrmdlg4vya8dyy37ai20f85z";
+      sha256 = "0m80pxyxqliqxjkymh6wm3rzaphszm1zrcnj08197dp5mhlkla01";
       type = "gem";
     };
-    version = "0.99.0";
+    version = "0.113.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1173,19 +1227,19 @@
     dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1a1dv8n33pj2il07c8z7gz5542iby0z2qwymv8yj1kcn4avs4dxv";
+      sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
       type = "gem";
     };
-    version = "4.2.7.2";
+    version = "4.2.7.5";
   };
   gitlab-gollum-rugged_adapter = {
     dependencies = ["mime-types" "rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zk89c2ljv9skcxzwnr84rqxv3iam30n5liv5r8hgl0l67qbg1mg";
+      sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
       type = "gem";
     };
-    version = "0.4.4";
+    version = "0.4.4.1";
   };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -1196,22 +1250,30 @@
     };
     version = "2.8.2";
   };
+  gitlab-license = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki";
+      sha256 = "1v6w3z7smmkqnhphb4ghgpqg61vimflqzpszybji0li99f2k1jb6";
       type = "gem";
     };
-    version = "1.6.3";
+    version = "1.6.4";
   };
   gitlab-styles = {
     dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m0ihbp7kjis03pcdx5310j7nzsxh22hfailnz0j467zab9jiap0";
+      sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.4.1";
   };
   gitlab_omniauth-ldap = {
     dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -1241,13 +1303,13 @@
     version = "1.0.1";
   };
   gon = {
-    dependencies = ["actionpack" "json" "multi_json" "request_store"];
+    dependencies = ["actionpack" "multi_json" "request_store"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jmf6ly9wfrg52xkk9qb4hlfn3zdmz62ivclhp4f424m39rd9ngz";
+      sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "6.2.0";
   };
   google-api-client = {
     dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
@@ -1297,10 +1359,10 @@
     dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v";
+      sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
@@ -1311,14 +1373,14 @@
     };
     version = "0.7.1";
   };
-  grape-route-helpers = {
+  grape-path-helpers = {
     dependencies = ["activesupport" "grape" "rake"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ja4dlakk6r8p2cx113kymz9sbhdybjsiynnqpfs71lv0r6mmghj";
+      sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "1.0.6";
   };
   grape_logging = {
     dependencies = ["grape"];
@@ -1329,6 +1391,23 @@
     };
     version = "1.7.0";
   };
+  graphiql-rails = {
+    dependencies = ["railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8";
+      type = "gem";
+    };
+    version = "1.4.10";
+  };
+  graphql = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
   grpc = {
     dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
@@ -1338,14 +1417,23 @@
     };
     version = "1.11.0";
   };
-  haml = {
-    dependencies = ["tilt"];
+  gssapi = {
+    dependencies = ["ffi"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
       type = "gem";
     };
-    version = "4.0.7";
+    version = "1.2.0";
+  };
+  haml = {
+    dependencies = ["temple" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
+      type = "gem";
+    };
+    version = "5.0.4";
   };
   haml_lint = {
     dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
@@ -1360,10 +1448,18 @@
     dependencies = ["temple" "thor" "tilt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ph4kv2ddr538f9ni2fmk7aq38djv5am29r3m6y64adg52n6jma9";
+      sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
       type = "gem";
     };
-    version = "2.6.1";
+    version = "2.8.8";
+  };
+  hangouts-chat = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx";
+      type = "gem";
+    };
+    version = "0.0.5";
   };
   hashdiff = {
     source = {
@@ -1412,10 +1508,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
+      sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.4";
   };
   html2text = {
     dependencies = ["nokogiri"];
@@ -1494,6 +1590,14 @@
     };
     version = "0.9.5";
   };
+  icalendar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
   ice_nine = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1528,6 +1632,14 @@
     };
     version = "1.4.1";
   };
+  jmespath = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
   jquery-atwho-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1545,13 +1657,13 @@
     version = "1.8.6";
   };
   json-jwt = {
-    dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"];
+    dependencies = ["activesupport" "aes_key_wrap" "bindata"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78";
+      sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r";
       type = "gem";
     };
-    version = "1.9.2";
+    version = "1.9.4";
   };
   json-schema = {
     dependencies = ["addressable"];
@@ -1614,7 +1726,7 @@
     version = "2.10.0";
   };
   knapsack = {
-    dependencies = ["rake" "timecop"];
+    dependencies = ["rake"];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di";
@@ -1626,10 +1738,10 @@
     dependencies = ["http" "recursive-open-struct" "rest-client"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw";
+      sha256 = "1czzdp9lfsrah2jkaddkqzmphyvnk096zm1ra6jddh626d8d53r4";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.1.0";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -1786,6 +1898,14 @@
     };
     version = "0.3.0";
   };
+  mini_magick = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n";
+      type = "gem";
+    };
+    version = "4.8.0";
+  };
   mini_mime = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1818,6 +1938,14 @@
     };
     version = "1.4.6";
   };
+  msgpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1875,13 +2003,21 @@
     };
     version = "0.16.0";
   };
+  net-ntp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
   net-ssh = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx";
+      sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w";
       type = "gem";
     };
-    version = "4.2.0";
+    version = "5.0.1";
   };
   netrc = {
     source = {
@@ -1895,10 +2031,19 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.4";
+  };
+  nokogumbo = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
+      type = "gem";
+    };
+    version = "1.5.0";
   };
   numerizer = {
     source = {
@@ -1929,10 +2074,10 @@
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
+      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.0";
   };
   omniauth = {
     dependencies = ["hashie" "rack"];
@@ -1953,13 +2098,13 @@
     version = "2.0.0";
   };
   omniauth-authentiq = {
-    dependencies = ["omniauth-oauth2"];
+    dependencies = ["jwt" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06hfga3ar8cl4glc3i2plwzhzvssfsz63sqjrvhzsjp4mz81k38c";
+      sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi";
       type = "gem";
     };
-    version = "0.3.1";
+    version = "0.3.3";
   };
   omniauth-azure-oauth2 = {
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
@@ -2001,10 +2146,10 @@
     dependencies = ["omniauth" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hv672p372jq7p9p6dw8i7qyisbny3lq0si077yys1fy4bjw127x";
+      sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   omniauth-google-oauth2 = {
     dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
@@ -2073,10 +2218,10 @@
     dependencies = ["omniauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl";
+      sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   omniauth-twitter = {
     dependencies = ["omniauth-oauth" "rack"];
@@ -2289,10 +2434,10 @@
   prometheus-client-mmap = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1p3xkk9zal95di5v999mk7sq02fk0fimg633ixvhvv70ph6c8dhn";
+      sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "0.9.4";
   };
   pry = {
     dependencies = ["coderay" "method_source" "slop"];
@@ -2512,32 +2657,22 @@
     };
     version = "0.3.6";
   };
-  rbnacl = {
-    dependencies = ["ffi"];
+  rbtrace = {
+    dependencies = ["ffi" "msgpack" "trollop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08dkigw8wdx53hviw1zqrs7rcrzqcwh9jd3dvwr72013z9fmyp48";
+      sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
       type = "gem";
     };
-    version = "4.0.2";
-  };
-  rbnacl-libsodium = {
-    dependencies = ["rbnacl"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qxrlig0i711zln0qzs9z37bs3wys1i6139bn7p7qxmdpnb9qgda";
-      type = "gem";
-    };
-    version = "1.0.11";
+    version = "0.4.10";
   };
   rdoc = {
-    dependencies = ["json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "027dvwz1g1h4bm40v3kxqbim4p7ww4fcmxa2l1mvwiqm5cjiqd7k";
+      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
       type = "gem";
     };
-    version = "4.2.2";
+    version = "6.0.4";
   };
   re2 = {
     source = {
@@ -2559,10 +2694,10 @@
   recursive-open-struct = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z";
+      sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.0";
   };
   redcarpet = {
     source = {
@@ -2610,10 +2745,10 @@
     dependencies = ["redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
+      sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.6.0";
   };
   redis-rack = {
     dependencies = ["rack" "redis-store"];
@@ -2704,10 +2839,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
+      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.2.1";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -2731,37 +2866,37 @@
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nd50hycab2a2vdah9lxi585g8f63jxjvmzmxqyln51grxwx9hzb";
+      sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-core = {
     dependencies = ["rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18np8wyw2g79waclpaacba6nd7x60ixg07ncya0j0qj1z9b37grd";
+      sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.1";
   };
   rspec-expectations = {
     dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "028ifzf9mqp3kxx40q1nbwj40g72g9zk0wr78l146phblkv96w0a";
+      sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-mocks = {
     dependencies = ["diff-lcs" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nv6jkxy24sag1i9w9wi3850k6skk2fm6yhcrgnmlz6vmwxvizp8";
+      sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rspec-parameterized = {
     dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"];
@@ -2776,10 +2911,10 @@
     dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvlmbn90k4rymlfb20ksayns5h199r9ggs67shnnanmrnh9zvyj";
+      sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.2";
   };
   rspec-retry = {
     dependencies = ["rspec-core"];
@@ -2801,10 +2936,10 @@
   rspec-support = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "050paqqpsml8w88nf4a15zbbj3vvm471zpv73sjfdnz7w21wnypb";
+      sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.1";
   };
   rspec_profiling = {
     dependencies = ["activerecord" "pg" "rails" "sqlite3"];
@@ -2819,10 +2954,10 @@
     dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d22rr1jnjfkw10rbnqb8plyd7kzf553nm3sbv14xil65s4mkijf";
+      sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is";
       type = "gem";
     };
-    version = "0.52.1";
+    version = "0.54.0";
   };
   rubocop-gitlab-security = {
     dependencies = ["rubocop"];
@@ -2837,10 +2972,10 @@
     dependencies = ["rubocop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18rd3w2q07vkfdk9nl8apkpyjfw1478qg82zgfnd4hn3r40jkbcx";
+      sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla";
       type = "gem";
     };
-    version = "1.22.1";
+    version = "1.22.2";
   };
   ruby-enum = {
     dependencies = ["i18n"];
@@ -2930,10 +3065,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
+      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
       type = "gem";
     };
-    version = "0.27.0";
+    version = "0.27.4";
   };
   safe_yaml = {
     source = {
@@ -2944,13 +3079,13 @@
     version = "1.0.4";
   };
   sanitize = {
-    dependencies = ["nokogiri"];
+    dependencies = ["crass" "nokogiri" "nokogumbo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "4.6.6";
   };
   sass = {
     dependencies = ["sass-listen"];
@@ -2997,14 +3132,6 @@
     };
     version = "0.56.0";
   };
-  securecompare = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   seed-fu = {
     dependencies = ["activerecord" "activesupport"];
     source = {
@@ -3027,10 +3154,10 @@
     dependencies = ["childprocess" "rubyzip"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w6r0k1w7hpk853qfw18lipyzxs0r0d6xr70zqsjfdn2dwr0rb30";
+      sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz";
       type = "gem";
     };
-    version = "3.5.0";
+    version = "3.12.0";
   };
   sentry-raven = {
     dependencies = ["faraday"];
@@ -3079,10 +3206,10 @@
     dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mmmv6k4l5rd74zw4xmwsadi0pbbcyzk1cm73zd8fzwra6nfz7sh";
+      sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
       type = "gem";
     };
-    version = "5.0.5";
+    version = "5.1.3";
   };
   sidekiq-cron = {
     dependencies = ["rufus-scheduler" "sidekiq"];
@@ -3152,33 +3279,6 @@
     };
     version = "3.6.0";
   };
-  spinach = {
-    dependencies = ["colorize" "gherkin-ruby" "json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
-      type = "gem";
-    };
-    version = "0.8.10";
-  };
-  spinach-rails = {
-    dependencies = ["capybara" "railties" "spinach"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
-      type = "gem";
-    };
-    version = "0.2.1";
-  };
-  spinach-rerun-reporter = {
-    dependencies = ["spinach"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fkmp99cpxrdzkjrxw9y9qp8qxk5d1arpmmlg5njx40rlcvx002k";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   spring = {
     dependencies = ["activesupport"];
     source = {
@@ -3197,23 +3297,14 @@
     };
     version = "1.0.4";
   };
-  spring-commands-spinach = {
-    dependencies = ["spring"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "12qa60sclhnclwi6lskhdgr1l007bca831vhp35f06hq1zmimi2x";
-      type = "gem";
-    };
-    version = "1.1.0";
-  };
   sprockets = {
     dependencies = ["concurrent-ruby" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar";
+      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
       type = "gem";
     };
-    version = "3.7.1";
+    version = "3.7.2";
   };
   sprockets-rails = {
     dependencies = ["actionpack" "activesupport" "sprockets"];
@@ -3302,10 +3393,10 @@
   temple = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xlf1if32xj14mkfwh8nxy3zzjzd9lipni0v2bghknp2kfc1hcz6";
+      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
       type = "gem";
     };
-    version = "0.7.7";
+    version = "0.8.0";
   };
   test-prof = {
     source = {
@@ -3360,10 +3451,10 @@
   tilt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm";
+      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
       type = "gem";
     };
-    version = "2.0.6";
+    version = "2.0.8";
   };
   timecop = {
     source = {
@@ -3399,6 +3490,14 @@
     };
     version = "1.0.0";
   };
+  trollop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
     source = {
@@ -3462,10 +3561,10 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.3.2";
   };
   unicorn = {
     dependencies = ["kgio" "raindrops"];
@@ -3502,14 +3601,6 @@
     };
     version = "0.2.7";
   };
-  url_safe_base64 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1wgslyapmw4m6l5f6xvcvrvdz3hbkqczkhmjp96s6pzwcgxvcazz";
-      type = "gem";
-    };
-    version = "0.2.2";
-  };
   validates_hostname = {
     dependencies = ["activerecord" "activesupport"];
     source = {

From 6946d97ce4060f0e4067d332eca1a57672bf7448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:40:08 +0200
Subject: [PATCH 1709/3253] gitlab-ee: init at 11.2.3

---
 .../version-management/gitlab/default.nix     | 55 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index ebfcfc5bbe73..66297d491099 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
 , ruby, tzdata, git, procps, nettools,
+gitlabEnterprise ? false
 }:
 
 let
@@ -12,23 +13,37 @@ let
 
   version = "11.2.3";
 
-  gitlabDeb = fetchurl {
-    url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-    sha256 = "1z7mj412zj88ia24caq41bi5p1jbcfwnrvak3bqf1113f0snkb0x";
-  };
-  gitlab = fetchFromGitLab {
-    owner = "gitlab-org";
-    repo = "gitlab-ce";
-    rev = "v${version}";
-    sha256 = "1j8y2phwdj6dv55racypm8r2v8bnzcxh2g1z33v9212hrgyjzrrh";
+  sources = if gitlabEnterprise then {
+    gitlabDeb = fetchurl {
+      url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
+      sha256 = "0gv8gqmbyzcbsqv1f7sixzsx7p2pk822gxi7hy7sddkcms12m4vr";
+    };
+    gitlab = fetchFromGitLab {
+      owner = "gitlab-org";
+      repo = "gitlab-ee";
+      rev = "v${version}-ee";
+      sha256 = "1ynr177d6y24h74sr3119ywgml0n39s8nfxssnixhmd69pz6rpm5";
+    };
+  } else {
+    gitlabDeb = fetchurl {
+      url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
+      sha256 = "1z7mj412zj88ia24caq41bi5p1jbcfwnrvak3bqf1113f0snkb0x";
+    };
+    gitlab = fetchFromGitLab {
+      owner = "gitlab-org";
+      repo = "gitlab-ce";
+      rev = "v${version}";
+      sha256 = "1j8y2phwdj6dv55racypm8r2v8bnzcxh2g1z33v9212hrgyjzrrh";
+    };
   };
 
+
 in
 
 stdenv.mkDerivation rec {
-  name = "gitlab-${version}";
+  name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}";
 
-  src = gitlab;
+  src = sources.gitlab;
 
   buildInputs = [
     rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools
@@ -66,7 +81,7 @@ stdenv.mkDerivation rec {
     mv config/gitlab.yml.example config/gitlab.yml
 
     # Building this requires yarn, node &c, so we just get it from the deb
-    ar p ${gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar
+    ar p ${sources.gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar
     # Work around unpacking deb containing binary with suid bit
     tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu
     tar -xf gitlab-deb-data.tar
@@ -103,9 +118,15 @@ stdenv.mkDerivation rec {
     homepage = http://www.gitlab.com/;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz globin krav ];
-    license = licenses.mit;
-    platforms = platforms.linux;
-    description = "GitLab Community Edition";
-    longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider.";
-  };
+  } // (if gitlabEnterprise then
+    {
+      license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE
+      description = "GitLab Enterprise Edition";
+    }
+  else
+    {
+      license = licenses.mit;
+      description = "GitLab Community Edition";
+      longDescription = "GitLab Community Edition (CE) is an open source end-to-end software development platform with built-in version control, issue tracking, code review, CI/CD, and more. Self-host GitLab CE on your own servers, in a container, or on a cloud provider.";
+    });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c76073d1ad62..aa3e0e3f148f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2770,6 +2770,7 @@ with pkgs;
   gitkraken = callPackage ../applications/version-management/gitkraken { };
 
   gitlab = callPackage ../applications/version-management/gitlab { };
+  gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
 
   gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
   gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { };

From f17f59ca8e5cecdeea51381f9249bf979bf4ea66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Fri, 21 Sep 2018 09:41:38 +0200
Subject: [PATCH 1710/3253] nixos/gitlab: avoid creating recursive symlinks,
 add gitlab-rake deps

---
 nixos/modules/services/misc/gitlab.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 5bf66354f487..6031a2316094 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -162,7 +162,7 @@ let
       makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
           --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
-          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \
+          --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
           --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
           --run 'cd ${cfg.packages.gitlab}/share/gitlab'
      '';
@@ -203,6 +203,7 @@ in {
         default = pkgs.gitlab;
         defaultText = "pkgs.gitlab";
         description = "Reference to the gitlab package";
+        example = "pkgs.gitlab-ee";
       };
 
       packages.gitlab-shell = mkOption {
@@ -569,9 +570,9 @@ in {
 
         mkdir -p /run/gitlab
         mkdir -p ${cfg.statePath}/log
-        ln -sf ${cfg.statePath}/log /run/gitlab/log
-        ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
-        ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+        [ -d /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
+        [ -d /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
+        [ -d /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
         ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
         chown -R ${cfg.user}:${cfg.group} /run/gitlab
 

From 96c1765baca98724a768835bfe35ccbaf9668ecb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 25 Sep 2018 02:06:08 +0200
Subject: [PATCH 1711/3253] gitlab-workhorse: 6.0.0 -> 6.1.0

---
 .../gitlab-workhorse/default.nix                  | 15 ++++-----------
 .../gitlab-workhorse/deterministic-build.patch    |  9 ---------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 8bfd1d07411f..1fe8c844ebf0 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -2,27 +2,20 @@
 stdenv.mkDerivation rec {
   name = "gitlab-workhorse-${version}";
 
-  version = "6.0.0";
+  version = "6.1.0";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0bg6rci69953h6zpdlv7pmjg751i31ykk6vggxb0ir0a6m8i3vn6";
+    sha256 = "0h0mqalia4ldb2icr2h6x75pnr5jb5y23pi4kv4ri3w3ddnl74bq";
   };
 
   buildInputs = [ git go ];
 
-  patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ];
+  patches = [ ./remove-hardcoded-paths.patch ];
 
-  buildPhase = ''
-    make PREFIX=$out
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-  '';
+  makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
 
   meta = with stdenv.lib; {
     homepage = http://www.gitlab.com/;
diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
deleted file mode 100644
index e9c42089bed4..000000000000
--- a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile	2018-08-31 09:41:32.784419122 +0200
-+++ b/Makefile	2018-08-31 09:31:22.384313577 +0200
-@@ -1,5 +1,5 @@
- PREFIX=/usr/local
--VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
-+VERSION=6.0.0
- BUILD_DIR = $(shell pwd)
- export GOPATH=${BUILD_DIR}/_build
- export PATH:=${GOPATH}/bin:${PATH}

From 545c07108f7e580c2789f7ac2591014396cd3159 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 25 Sep 2018 02:07:41 +0200
Subject: [PATCH 1712/3253] gitlab-shell: 8.1.1 -> 8.3.3

---
 pkgs/applications/version-management/gitlab-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index b8546dce952b..69c4b9a255e3 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab, go }:
 
 stdenv.mkDerivation rec {
-  version = "8.1.1";
+  version = "8.3.3";
   name = "gitlab-shell-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "12lhxlkdbxqiwb2jm66lwykb3mba1kndd3miwb6ac9l6ngvqgyzz";
+    sha256 = "1qapw0yvlw1nxjik7jpbbbl3yx299sfvdx67zsd5ai7bhk1gd8xl";
   };
 
   buildInputs = [ ruby bundler go ];

From cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 25 Sep 2018 02:11:36 +0200
Subject: [PATCH 1713/3253] gitaly: 0.117.2 -> 0.120.0

---
 pkgs/applications/version-management/gitaly/Gemfile  |  2 +-
 .../version-management/gitaly/Gemfile.lock           | 10 +++++-----
 .../version-management/gitaly/default.nix            |  6 +++---
 .../version-management/gitaly/gemset.nix             | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index ad3a4c171376..2b752992fecd 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'rugged', '~> 0.27.4'
 gem 'github-linguist', '~> 6.1', require: 'linguist'
 gem 'gitlab-markup', '~> 1.6.4'
-gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.116.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gitlab-gollum-lib', '~> 4.2', require: false
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 0a521ab22dc2..d76ba86c398a 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.107.0)
+    gitaly-proto (0.116.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (6.2.0)
@@ -75,9 +75,9 @@ GEM
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     memoist (0.16.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     minitest (5.9.1)
     multi_json (1.13.1)
@@ -147,7 +147,7 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 5.0.2)
   faraday (~> 0.12)
-  gitaly-proto (~> 0.107.0)
+  gitaly-proto (~> 0.116.0)
   github-linguist (~> 6.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
@@ -162,4 +162,4 @@ DEPENDENCIES
   sentry-raven (~> 2.7.2)
 
 BUNDLED WITH
-   1.16.3
+   1.16.4
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 499f07472cf4..b7eee8926aa5 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.117.2";
+  version = "0.120.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1hwgixymfqr6fkywwbkvdcwg1q62pypx9ffvzbcl46n4x32spm9i";
+    sha256 = "0jsk6n1vmddpnnccr8mjvcsfjzaagqy1600q5yss6lbz896w2bx4";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -22,7 +22,7 @@ in buildGoPackage rec {
   passthru = {
     inherit rubyEnv;
   };
-  
+
   buildInputs = [ rubyEnv.wrappedRuby ];
 
   postInstall = ''
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 6245b7925025..0717555b3829 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -87,10 +87,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01g40gcv7a7w7z27pa65f229k04k1dgxf8rki4g38y6azaj88yib";
+      sha256 = "15946776v5v8c2jisknjm82s4q3b3q9x2xygjf4bkk4m45n766w1";
       type = "gem";
     };
-    version = "0.107.0";
+    version = "0.116.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -259,18 +259,18 @@
     dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
       type = "gem";
     };
-    version = "3.1";
+    version = "3.2.2";
   };
   mime-types-data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
       type = "gem";
     };
-    version = "3.2016.0521";
+    version = "3.2018.0812";
   };
   mini_portile2 = {
     source = {

From ed85eb5433199646fe196c77a9be23ef392bba4e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 25 Sep 2018 02:32:02 +0200
Subject: [PATCH 1714/3253] gitlab: 11.2.3 -> 11.3.0

---
 .../version-management/gitlab/Gemfile         |  39 +--
 .../version-management/gitlab/Gemfile.lock    | 121 +++-----
 .../version-management/gitlab/default.nix     |  15 +-
 .../version-management/gitlab/gemset.nix      | 259 ++++--------------
 4 files changed, 118 insertions(+), 316 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 3aa4cad037f9..f14e05d43e06 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -54,9 +54,6 @@ gem 'omniauth-authentiq', '~> 0.3.3'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
 
-# Kerberos authentication. EE-only
-gem 'gssapi', group: :kerberos
-
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
 gem 'akismet', '~> 2.0'
@@ -71,7 +68,7 @@ gem 'u2f', '~> 0.2.1'
 gem 'validates_hostname', '~> 1.0.6'
 
 # Browser detection
-gem 'browser', '~> 2.2'
+gem 'browser', '~> 2.5'
 
 # GPG
 gem 'gpgme'
@@ -110,7 +107,9 @@ gem 'kaminari', '~> 1.0'
 gem 'hamlit', '~> 2.8.8'
 
 # Files attachments
-gem 'carrierwave', '~> 1.2'
+# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
+# config/initializers/carrierwave_patch.rb can be removed once that change is released.
+gem 'carrierwave', '= 1.2.3'
 gem 'mini_magick'
 
 # Drag and Drop UI
@@ -119,14 +118,14 @@ gem 'dropzonejs-rails', '~> 0.7.1'
 # for backups
 gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.3.3'
+gem 'fog-google', '~> 1.7.1'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.2.0'
 
 # for Google storage
-gem 'google-api-client', '~> 0.19.8'
+gem 'google-api-client', '~> 0.23'
 
 # for aws storage
 gem 'unf', '~> 0.1.4'
@@ -134,13 +133,6 @@ gem 'unf', '~> 0.1.4'
 # Seed data
 gem 'seed-fu', '~> 2.3.7'
 
-# Search
-gem 'elasticsearch-model', '~> 0.1.9'
-gem 'elasticsearch-rails', '~> 0.1.9'
-gem 'elasticsearch-api',   '5.0.3'
-gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4'
-
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.8'
 gem 'deckar01-task_list', '2.0.0'
@@ -190,7 +182,7 @@ gem 'rufus-scheduler', '~> 3.4'
 gem 'httparty', '~> 0.13.3'
 
 # Colored output to console
-gem 'rainbow', '~> 2.2'
+gem 'rainbow', '~> 3.0'
 
 # Progress bar
 gem 'ruby-progressbar'
@@ -205,6 +197,9 @@ gem 're2', '~> 1.1.1'
 
 gem 'version_sorter', '~> 2.1.0'
 
+# Export Ruby Regex to Javascript
+gem 'js_regex', '~> 2.2.1'
+
 # User agent parsing
 gem 'device_detector'
 
@@ -224,9 +219,6 @@ gem 'jira-ruby', '~> 1.4'
 # Flowdock integration
 gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
 
-# Gemnasium integration
-gem 'gemnasium-gitlab-service', '~> 0.2'
-
 # Slack integration
 gem 'slack-notifier', '~> 1.5.1'
 
@@ -287,8 +279,6 @@ gem 'select2-rails', '~> 3.5.9'
 gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
 
-gem "gitlab-license", "~> 1.0"
-
 # Sentry integration
 gem 'sentry-raven', '~> 2.7'
 
@@ -375,12 +365,11 @@ group :development, :test do
   gem 'scss_lint', '~> 0.56.0', require: false
   gem 'haml_lint', '~> 0.26.0', require: false
   gem 'simplecov', '~> 0.14.0', require: false
-  gem 'flay', '~> 2.10.0', require: false
   gem 'bundler-audit', '~> 0.5.0', require: false
 
   gem 'benchmark-ips', '~> 2.3.0', require: false
 
-  gem 'license_finder', '~> 3.1', require: false
+  gem 'license_finder', '~> 5.4', require: false
   gem 'knapsack', '~> 1.16'
 
   gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
@@ -402,6 +391,7 @@ group :test do
   gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.0.5'
   gem 'test-prof', '~> 0.2.5'
+  gem 'rspec_junit_formatter'
 end
 
 gem 'octokit', '~> 4.9'
@@ -424,9 +414,6 @@ gem 'health_check', '~> 2.6.0'
 gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
-# NTP client
-gem 'net-ntp'
-
 # SSH host key support
 gem 'net-ssh', '~> 5.0'
 gem 'sshkey', '~> 1.9.0'
@@ -438,7 +425,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
 gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 16f1d63761fa..e41719ec79d3 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -69,14 +69,6 @@ GEM
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
     awesome_print (1.8.0)
-    aws-sdk (2.9.32)
-      aws-sdk-resources (= 2.9.32)
-    aws-sdk-core (2.9.32)
-      aws-sigv4 (~> 1.0)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.9.32)
-      aws-sdk-core (= 2.9.32)
-    aws-sigv4 (1.0.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -94,12 +86,11 @@ GEM
     bindata (2.4.3)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    blankslate (2.1.2.4)
     bootsnap (1.3.1)
       msgpack (~> 1.0)
     bootstrap_form (2.7.0)
     brakeman (4.2.1)
-    browser (2.2.0)
+    browser (2.5.3)
     builder (3.2.3)
     bullet (5.5.1)
       activesupport (>= 3.0.0)
@@ -131,10 +122,10 @@ GEM
       numerizer (~> 0.1.1)
     chunky_png (1.3.5)
     citrus (3.0.2)
-    coderay (1.1.1)
+    coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    commonmarker (0.17.8)
+    commonmarker (0.17.13)
       ruby-enum (~> 0.5)
     concord (0.1.5)
       adamantium (~> 0.2.0)
@@ -187,19 +178,6 @@ GEM
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
     ed25519 (1.2.4)
-    elasticsearch (5.0.3)
-      elasticsearch-api (= 5.0.3)
-      elasticsearch-transport (= 5.0.3)
-    elasticsearch-api (5.0.3)
-      multi_json
-    elasticsearch-model (0.1.9)
-      activesupport (> 3)
-      elasticsearch (> 0.4)
-      hashie
-    elasticsearch-rails (0.1.9)
-    elasticsearch-transport (5.0.3)
-      faraday
-      multi_json
     email_reply_trimmer (0.1.6)
     email_spec (2.2.0)
       htmlentities (~> 4.3.3)
@@ -224,21 +202,13 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    faraday_middleware-aws-signers-v4 (0.1.7)
-      aws-sdk-resources (~> 2)
-      faraday (~> 0.9)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
       multi_json
     fast_blank (1.0.0)
     fast_gettext (1.6.0)
     ffaker (2.4.0)
-    ffi (1.9.18)
-    flay (2.10.0)
-      erubis (~> 2.7.0)
-      path_expander (~> 1.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
+    ffi (1.9.25)
     flipper (0.13.0)
     flipper-active_record (0.13.0)
       activerecord (>= 3.2, < 6)
@@ -263,11 +233,11 @@ GEM
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-google (1.3.3)
+    fog-google (1.7.1)
       fog-core
       fog-json
       fog-xml
-      google-api-client (~> 0.19.1)
+      google-api-client (~> 0.23.0)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -293,8 +263,6 @@ GEM
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gemnasium-gitlab-service (0.2.6)
-      rugged (~> 0.21)
     gemojione (3.3.0)
       json
     get_process_mem (0.2.0)
@@ -308,7 +276,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gitaly-proto (0.113.0)
+    gitaly-proto (0.117.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -337,7 +305,6 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-license (1.0.0)
     gitlab-markup (1.6.4)
     gitlab-styles (2.4.1)
       rubocop (~> 0.54.0)
@@ -356,7 +323,7 @@ GEM
       actionpack (>= 3.0)
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.19.8)
+    google-api-client (0.23.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -400,8 +367,6 @@ GEM
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
@@ -456,8 +421,9 @@ GEM
       activesupport
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
-    jmespath (1.3.1)
     jquery-atwho-rails (1.3.2)
+    js_regex (2.2.1)
+      regexp_parser (>= 0.4.11, <= 0.5.0)
     json (1.8.6)
     json-jwt (1.9.4)
       activesupport
@@ -493,13 +459,12 @@ GEM
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    license_finder (3.1.1)
+    license_finder (5.4.0)
       bundler
-      httparty
       rubyzip
       thor
-      toml (= 0.1.2)
-      with_env (> 1.0)
+      toml (= 0.2.0)
+      with_env (= 1.1.0)
       xml-simple
     licensee (8.9.2)
       rugged (~> 0.24)
@@ -522,7 +487,7 @@ GEM
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -541,7 +506,6 @@ GEM
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-    net-ntp (2.1.3)
     net-ssh (5.0.1)
     netrc (0.11.0)
     nokogiri (1.8.4)
@@ -618,9 +582,7 @@ GEM
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    path_expander (1.0.2)
+    parslet (1.8.2)
     peek (1.0.1)
       concurrent-ruby (>= 0.9.0)
       concurrent-ruby-ext (>= 0.9.0)
@@ -665,12 +627,11 @@ GEM
       unparser
     procto (0.0.3)
     prometheus-client-mmap (0.9.4)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.4.3)
+      byebug (>= 9.0, < 9.1)
       pry (~> 0.10)
     pry-rails (0.3.5)
       pry (>= 0.9.10)
@@ -721,8 +682,7 @@ GEM
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     raindrops (0.18.0)
     rake (12.3.1)
     rb-fsevent (0.10.2)
@@ -759,6 +719,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.4.1)
       redis (>= 2.2, < 5)
+    regexp_parser (0.5.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -771,7 +732,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
     rouge (3.2.1)
@@ -809,6 +770,9 @@ GEM
       rspec-core
     rspec-set (0.1.3)
     rspec-support (3.7.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rspec_profiling (0.0.5)
       activerecord
       pg
@@ -837,7 +801,7 @@ GEM
       sexp_processor (~> 4.1)
     rubyntlm (0.6.2)
     rubypants (0.2.0)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
     rugged (0.27.4)
@@ -901,7 +865,6 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slack-notifier (1.5.1)
-    slop (3.6.0)
     spring (2.0.1)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
@@ -941,8 +904,8 @@ GEM
     tilt (2.0.8)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
+    toml (0.2.0)
+      parslet (~> 1.8.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
     trollop (2.1.3)
@@ -1018,7 +981,6 @@ DEPENDENCIES
   asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print
-  aws-sdk
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
   batch-loader (~> 1.2.1)
@@ -1029,12 +991,12 @@ DEPENDENCIES
   bootsnap (~> 1.3)
   bootstrap_form (~> 2.7.0)
   brakeman (~> 4.2)
-  browser (~> 2.2)
+  browser (~> 2.5)
   bullet (~> 5.5.0)
   bundler-audit (~> 0.5.0)
   capybara (~> 2.15)
   capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 1.2)
+  carrierwave (= 1.2.3)
   charlock_holmes (~> 0.7.5)
   chronic (~> 0.10.2)
   chronic_duration (~> 0.10.6)
@@ -1053,46 +1015,39 @@ DEPENDENCIES
   doorkeeper-openid_connect (~> 1.5)
   dropzonejs-rails (~> 0.7.1)
   ed25519 (~> 1.2)
-  elasticsearch-api (= 5.0.3)
-  elasticsearch-model (~> 0.1.9)
-  elasticsearch-rails (~> 0.1.9)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
   factory_bot_rails (~> 4.8.2)
   faraday (~> 0.12)
-  faraday_middleware-aws-signers-v4
   fast_blank
   ffaker (~> 2.4)
-  flay (~> 2.10.0)
   flipper (~> 0.13.0)
   flipper-active_record (~> 0.13.0)
   flipper-active_support_cache_store (~> 0.13.0)
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
-  fog-google (~> 1.3.3)
+  fog-google (~> 1.7.1)
   fog-local (~> 0.3)
   fog-openstack (~> 0.1)
   fog-rackspace (~> 0.1.1)
   font-awesome-rails (~> 4.7)
   foreman (~> 0.84.0)
   fuubar (~> 2.2.0)
-  gemnasium-gitlab-service (~> 0.2)
   gemojione (~> 3.3)
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.113.0)
+  gitaly-proto (~> 0.117.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
-  gitlab-license (~> 1.0)
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
-  google-api-client (~> 0.19.8)
+  google-api-client (~> 0.23)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
@@ -1102,7 +1057,6 @@ DEPENDENCIES
   graphiql-rails (~> 1.4.10)
   graphql (~> 1.8.0)
   grpc (~> 1.11.0)
-  gssapi
   haml_lint (~> 0.26.0)
   hamlit (~> 2.8.8)
   hangouts-chat (~> 0.0.5)
@@ -1116,13 +1070,14 @@ DEPENDENCIES
   influxdb (~> 0.2)
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
+  js_regex (~> 2.2.1)
   json-schema (~> 2.8.0)
   jwt (~> 1.5.6)
   kaminari (~> 1.0)
   knapsack (~> 1.16)
   kubeclient (~> 3.1.0)
   letter_opener_web (~> 1.3.0)
-  license_finder (~> 3.1)
+  license_finder (~> 5.4)
   licensee (~> 8.9)
   lograge (~> 0.5)
   loofah (~> 2.2)
@@ -1133,7 +1088,6 @@ DEPENDENCIES
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-  net-ntp
   net-ssh (~> 5.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
@@ -1173,7 +1127,7 @@ DEPENDENCIES
   rails (= 4.2.10)
   rails-deprecated_sanitizer (~> 1.0.3)
   rails-i18n (~> 4.0.9)
-  rainbow (~> 2.2)
+  rainbow (~> 3.0)
   raindrops (~> 0.18)
   rblineprof (~> 0.3.6)
   rbtrace (~> 0.4)
@@ -1192,6 +1146,7 @@ DEPENDENCIES
   rspec-rails (~> 3.7.0)
   rspec-retry (~> 0.4.5)
   rspec-set (~> 0.1.3)
+  rspec_junit_formatter
   rspec_profiling (~> 0.0.5)
   rubocop (~> 0.54.0)
   rubocop-rspec (~> 1.22.1)
@@ -1244,4 +1199,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.16.2
+   1.16.4
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 66297d491099..98e2e739e0d7 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, procps, nettools,
-gitlabEnterprise ? false
+, ruby, tzdata, git, procps, nettools
+, gitlabEnterprise ? false
 }:
 
 let
@@ -11,33 +11,32 @@ let
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
-  version = "11.2.3";
+  version = "11.3.0";
 
   sources = if gitlabEnterprise then {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
-      sha256 = "0gv8gqmbyzcbsqv1f7sixzsx7p2pk822gxi7hy7sddkcms12m4vr";
+      sha256 = "1l5cfbc45xa3gq90wyly3szn93szh162g9szc6dnkqx0db70j9l3";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ee";
       rev = "v${version}-ee";
-      sha256 = "1ynr177d6y24h74sr3119ywgml0n39s8nfxssnixhmd69pz6rpm5";
+      sha256 = "0gmainjhs21hipbvshga5dzkjrpmlkk9vxxnxgwjaqbg9wrhw47m";
     };
   } else {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-      sha256 = "1z7mj412zj88ia24caq41bi5p1jbcfwnrvak3bqf1113f0snkb0x";
+      sha256 = "162xy8xpa2qhz10nh2dw0vbd0665pz9984vnim9i30xcafr5picq";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ce";
       rev = "v${version}";
-      sha256 = "1j8y2phwdj6dv55racypm8r2v8bnzcxh2g1z33v9212hrgyjzrrh";
+      sha256 = "158n2qnp1zsj5kk2w3v9xyakgdb739n955hlq3i9sl80q8f4xda3";
     };
   };
 
-
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index a9ad5504ed30..65aac9891037 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -214,41 +214,6 @@
     };
     version = "1.8.0";
   };
-  aws-sdk = {
-    dependencies = ["aws-sdk-resources"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sdk-core = {
-    dependencies = ["aws-sigv4" "jmespath"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sdk-resources = {
-    dependencies = ["aws-sdk-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
-      type = "gem";
-    };
-    version = "2.9.32";
-  };
-  aws-sigv4 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   axiom-types = {
     dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
     source = {
@@ -332,14 +297,6 @@
     };
     version = "0.7.2";
   };
-  blankslate = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
-      type = "gem";
-    };
-    version = "2.1.2.4";
-  };
   bootsnap = {
     dependencies = ["msgpack"];
     source = {
@@ -368,10 +325,10 @@
   browser = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "055r4wyc3z61r7mg2bgqpzabpkg8db2q5rciwfx9lwfyhjx19pbv";
+      sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.5.3";
   };
   builder = {
     source = {
@@ -495,10 +452,10 @@
   coderay = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r";
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.1.2";
   };
   coercible = {
     dependencies = ["descendants_tracker"];
@@ -513,10 +470,10 @@
     dependencies = ["ruby-enum"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i";
+      sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
       type = "gem";
     };
-    version = "0.17.8";
+    version = "0.17.13";
   };
   concord = {
     dependencies = ["adamantium" "equalizer"];
@@ -755,50 +712,6 @@
     };
     version = "1.2.4";
   };
-  elasticsearch = {
-    dependencies = ["elasticsearch-api" "elasticsearch-transport"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
-  elasticsearch-api = {
-    dependencies = ["multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
-  elasticsearch-model = {
-    dependencies = ["activesupport" "elasticsearch" "hashie"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf";
-      type = "gem";
-    };
-    version = "0.1.9";
-  };
-  elasticsearch-rails = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z";
-      type = "gem";
-    };
-    version = "0.1.9";
-  };
-  elasticsearch-transport = {
-    dependencies = ["faraday" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26";
-      type = "gem";
-    };
-    version = "5.0.3";
-  };
   email_reply_trimmer = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -925,15 +838,6 @@
     };
     version = "0.12.2";
   };
-  faraday_middleware-aws-signers-v4 = {
-    dependencies = ["aws-sdk-resources" "faraday"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
-      type = "gem";
-    };
-    version = "0.1.7";
-  };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
     source = {
@@ -970,19 +874,10 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
       type = "gem";
     };
-    version = "1.9.18";
-  };
-  flay = {
-    dependencies = ["erubis" "path_expander" "ruby_parser" "sexp_processor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rzggr9w6z2jvs3mv0bp7d64yjivpp93ww9g4j9azzcfjqnh9hn3";
-      type = "gem";
-    };
-    version = "2.10.0";
+    version = "1.9.25";
   };
   flipper = {
     source = {
@@ -1050,10 +945,10 @@
     dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i";
+      sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
       type = "gem";
     };
-    version = "1.3.3";
+    version = "1.7.1";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1135,15 +1030,6 @@
     };
     version = "2.2.0";
   };
-  gemnasium-gitlab-service = {
-    dependencies = ["rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
-      type = "gem";
-    };
-    version = "0.2.6";
-  };
   gemojione = {
     dependencies = ["json"];
     source = {
@@ -1192,10 +1078,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m80pxyxqliqxjkymh6wm3rzaphszm1zrcnj08197dp5mhlkla01";
+      sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
       type = "gem";
     };
-    version = "0.113.0";
+    version = "0.117.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1250,14 +1136,6 @@
     };
     version = "2.8.2";
   };
-  gitlab-license = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   gitlab-markup = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1315,10 +1193,10 @@
     dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q";
+      sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k";
       type = "gem";
     };
-    version = "0.19.8";
+    version = "0.23.4";
   };
   google-protobuf = {
     source = {
@@ -1417,15 +1295,6 @@
     };
     version = "1.11.0";
   };
-  gssapi = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
   haml = {
     dependencies = ["temple" "tilt"];
     source = {
@@ -1632,14 +1501,6 @@
     };
     version = "1.4.1";
   };
-  jmespath = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
   jquery-atwho-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1648,6 +1509,15 @@
     };
     version = "1.3.2";
   };
+  js_regex = {
+    dependencies = ["regexp_parser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
   json = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1771,13 +1641,13 @@
     version = "1.3.0";
   };
   license_finder = {
-    dependencies = ["httparty" "rubyzip" "thor" "toml" "with_env" "xml-simple"];
+    dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12p18a34q8dgzjwi2plgv889kxnxqnnmrqhvjs3ng2z26hv2zfag";
+      sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "5.4.0";
   };
   licensee = {
     dependencies = ["rugged"];
@@ -1868,10 +1738,10 @@
   method_source = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
+      sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.9.0";
   };
   mime-types = {
     dependencies = ["mime-types-data"];
@@ -2003,14 +1873,6 @@
     };
     version = "0.16.0";
   };
-  net-ntp = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv";
-      type = "gem";
-    };
-    version = "2.1.3";
-  };
   net-ssh = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2284,21 +2146,12 @@
     version = "2.5.1.0";
   };
   parslet = {
-    dependencies = ["blankslate"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
+      sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88";
       type = "gem";
     };
-    version = "1.5.0";
-  };
-  path_expander = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0wsymhprfjazdkmfv02kski3iwjjkciwxqjg9brh56sbymcgk34a";
-      type = "gem";
-    };
-    version = "1.0.2";
+    version = "1.8.2";
   };
   peek = {
     dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
@@ -2440,22 +2293,22 @@
     version = "0.9.4";
   };
   pry = {
-    dependencies = ["coderay" "method_source" "slop"];
+    dependencies = ["coderay" "method_source"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05xbzyin63aj2prrv8fbq2d5df2mid93m81hz5bvf2v4hnzs42ar";
+      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
       type = "gem";
     };
-    version = "0.10.4";
+    version = "0.11.3";
   };
   pry-byebug = {
     dependencies = ["byebug" "pry"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lwqc8vjq7b177xfknmigxvahp6dc8i1fy09d3n8ld1ndd909xjq";
+      sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.4.3";
   };
   pry-rails = {
     dependencies = ["pry"];
@@ -2607,13 +2460,12 @@
     version = "4.2.10";
   };
   rainbow = {
-    dependencies = ["rake"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
       type = "gem";
     };
-    version = "2.2.2";
+    version = "3.0.0";
   };
   raindrops = {
     source = {
@@ -2777,6 +2629,14 @@
     };
     version = "1.4.1";
   };
+  regexp_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
   representable = {
     dependencies = ["declarative" "declarative-option" "uber"];
     source = {
@@ -2815,10 +2675,10 @@
   retriable = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar";
+      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.2";
   };
   rinku = {
     source = {
@@ -2941,6 +2801,15 @@
     };
     version = "3.7.1";
   };
+  rspec_junit_formatter = {
+    dependencies = ["builder" "rspec-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
   rspec_profiling = {
     dependencies = ["activerecord" "pg" "rails" "sqlite3"];
     source = {
@@ -3048,10 +2917,10 @@
   rubyzip = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.2";
   };
   rufus-scheduler = {
     dependencies = ["et-orbi"];
@@ -3271,14 +3140,6 @@
     };
     version = "1.5.1";
   };
-  slop = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-      type = "gem";
-    };
-    version = "3.6.0";
-  };
   spring = {
     dependencies = ["activesupport"];
     source = {
@@ -3476,10 +3337,10 @@
     dependencies = ["parslet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
+      sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "0.2.0";
   };
   toml-rb = {
     dependencies = ["citrus"];

From dc915565bafbce4ecd0f2ad3011257e676068a45 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 30 Jul 2018 21:49:18 +0200
Subject: [PATCH 1715/3253] gitlab module: workhorse may start before gitlab

---
 nixos/modules/services/misc/gitlab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 6031a2316094..fe2dd2798bff 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -502,7 +502,7 @@ in {
     };
 
     systemd.services.gitlab-workhorse = {
-      after = [ "network.target" "gitlab.service" ];
+      after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       environment.HOME = gitlabEnv.HOME;
       environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;

From 78ad8d4a6242c9baab4b08ee9d0b2ab94b8ed565 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 13 Jun 2018 19:34:48 +0200
Subject: [PATCH 1716/3253] nixos/gitlab: rebuild authorized_keys during
 preStart

This updates the path to the 'gitlab-shell' to the
correct store path when gitlab is restarted.
---
 nixos/modules/services/misc/gitlab.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index fe2dd2798bff..d81aa5643e53 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -630,6 +630,10 @@ in {
           touch "${cfg.statePath}/db-seeded"
         fi
 
+        # The gitlab:shell:setup regenerates the authorized_keys file so that
+        # the store path to the gitlab-shell in it gets updated
+        ${pkgs.sudo}/bin/sudo -u ${cfg.user} force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup RAILS_ENV=production
+
         # The gitlab:shell:create_hooks task seems broken for fixing links
         # so we instead delete all the hooks and create them anew
         rm -f ${cfg.statePath}/repositories/**/*.git/hooks

From 6793313708a5eae29c2cda532bd3d1598d73c7be Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 24 Sep 2018 19:07:51 -0400
Subject: [PATCH 1717/3253] qgnomeplatform: init at 0.4

---
 .../libraries/qgnomeplatform/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/qgnomeplatform/default.nix

diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
new file mode 100644
index 000000000000..3a3d3e0277c9
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
+
+stdenv.mkDerivation rec {
+  name = "qgnomeplatform-${version}";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner = "FedoraQt";
+    repo = "QGnomePlatform";
+    rev = version;
+    sha256 = "1403300d435g7ngcxsgnllhryk63nrhl1ahx16b28wkxnh2vi9ly";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    qmake
+  ];
+
+  buildInputs = [
+    gtk3
+    qtbase
+  ];
+
+  postPatch = ''
+    # Fix plugin dir
+    substituteInPlace qgnomeplatform.pro \
+      --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "QPlatformTheme for a better Qt application inclusion in GNOME";
+    homepage = https://github.com/FedoraQt/QGnomePlatform;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 500a713f22ba..699d37095ae8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11953,6 +11953,8 @@ with pkgs;
 
   qrupdate = callPackage ../development/libraries/qrupdate { };
 
+  qgnomeplatform =  libsForQt5.callPackage ../development/libraries/qgnomeplatform { };
+
   resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
 
   rhino = callPackage ../development/libraries/java/rhino {

From 94d079b6bcf86a2f630e70d25899dcf8efb8f94c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 24 Sep 2018 22:14:37 -0400
Subject: [PATCH 1718/3253] adwaita-qt: init at 1.0

---
 pkgs/misc/themes/adwaita-qt/default.nix | 38 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/misc/themes/adwaita-qt/default.nix

diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix
new file mode 100644
index 000000000000..aade22927f01
--- /dev/null
+++ b/pkgs/misc/themes/adwaita-qt/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, qtbase }:
+
+stdenv.mkDerivation rec {
+  pname = "adwaita-qt";
+  version = "1.0";
+
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "FedoraQt";
+    repo = pname;
+    rev = version;
+    sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  buildInputs = [
+    qtbase
+  ];
+
+  postPatch = ''
+    # Fix plugin dir
+    substituteInPlace style/CMakeLists.txt \
+       --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A style to bend Qt applications to look like they belong into GNOME Shell";
+    homepage = https://github.com/FedoraQt/adwaita-qt;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 699d37095ae8..748239b6489f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20578,6 +20578,8 @@ with pkgs;
 
   latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
 
+  adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { };
+
   orion = callPackage ../misc/themes/orion {};
 
   elementary-gtk-theme = callPackage ../misc/themes/elementary { };

From 2240445067dad0031129f47bb6dd16acf4d56337 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 24 Sep 2018 21:34:43 -0500
Subject: [PATCH 1719/3253] =?UTF-8?q?emacsMacport:=207.1=20=E2=86=92=207.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a critical issue with macOS

[NEWS](https://bitbucket.org/mituharu/emacs-mac/raw/master/NEWS-mac)

* emacs-26.1-mac-7.2 (2018-09-09)

** Fixed bugs

*** Buffer contents are not displayed on macOS 10.14.
This is mainly because now NSViews are backed by Core Animation Layer
(layer-backed) by default and non-deferred drawing into views no
longer works.  Instead of switching to deferred drawing (i.e., draw
only inside -[NSView drawRect:]), we draw into our own backing bitmap
in a non-deferred way as before, and update the view contents with the
resulting image via -[NSView updateLayer].  This "application-side
double buffering" is also available on OS X 10.8 - macOS 10.13 if you
set the frame parameter `inhibit-double-buffering' to nil when
creating a frame.  Just like on macOS 10.14, such a frame does not do
LCD smoothing.

*** Screenshot grabbed via Services is displayed in wrong size when we
have display mirroring between Retina and non-Retina displays.

*** Cursor movement just after frame resize sometimes leaves garbage.

*** Crash by the Fall_threads call from the GUI thread at the select
emulation when there are multiple Lisp threads.

*** Info title has ASCII underline unlike other window systems.

*** Vertical scroll bar is created as horizontal if frame font height
is short.

** Improvements

*** macOS 10.14 adds property :appearance to (mac-application-state).
The value may be "NSAppearanceNameAqua" or "NSAppearanceNameDarkAqua".

*** Add new color format "mac:COLOR-LIST-NAME:COLOR-NAME" and
"mac:COLOR-NAME" (shorthand for "mac:System:COLOR-NAME").  The actual
color may be different depending on the global appearance setting on
macOS 10.14.  For example, "mac:textColor" is black on the Light Mode
but is white on the Dark Mode.

*** Default frame colors respect appearance setting on macOS 10.14.
Now the default frame foreground/background color is
"mac:textColor"/"mac:textBackgroundColor", respectively.  Changes of
the system setting of the global appearance are dynamically reflected.

*** New function `mac-color-list-alist' to get the available
combinations of COLOR-LIST-NAMEs and COLOR-NAMEs.  Note that this
value is dependent on user environment and OS version.  Also, some
combinations may represent image patterns rather than colors.  For the
former cases, `(color-values "mac:COLOR-LIST-NAME:COLOR-NAME")'
returns nil.
---
 pkgs/applications/editors/emacs/macport.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 8f74aca44885..71a41da57474 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -6,7 +6,7 @@
 stdenv.mkDerivation rec {
   emacsVersion = "26.1";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "7.1";
+  macportVersion = "7.2";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   builder = ./builder.sh;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "0d2ny54f68v3hjc2g3pkj83xv3yzv0hrwvn2cmpyb0jxjbsb2frc";
+    sha256 = "0j4dcjv7kh84d6lzzxdzambk6ybbdr2j7r63nkbivssjv29z7zag";
   };
 
   hiresSrc = fetchurl {

From 9920215d005db148564e826478474faa236a4e75 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 25 Sep 2018 04:11:33 +0200
Subject: [PATCH 1720/3253] autoPatchelfHook: Only check PT_INTERP on execs

If the ELF file is not an executable, we do not get a PT_INTERP section,
because after all, it's a *shared* library.

So instead of checking for PT_INTERP (to avoid statically linked
executables) for all ELF files, we add another check to see if it's an
executable and *only* skip it when it is and there's no PT_INTERP.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/build-support/setup-hooks/auto-patchelf.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 94ea3e4e98e3..f808cd9f78d7 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -155,8 +155,10 @@ autoPatchelf() {
     # outside of this function.
     while IFS= read -r -d $'\0' file; do
       isELF "$file" || continue
-      # dynamically linked?
-      readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
+      if isExecutable "$file"; then
+          # Skip if the executable is statically linked.
+          readelf -l "$file" | grep -q "^ *INTERP\\>" || continue
+      fi
       autoPatchelfFile "$file"
     done < <(find "$prefix" -type f -print0)
 }

From b4526040a21303a1822fcad348e9b9e39a3876b9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 25 Sep 2018 04:48:12 +0200
Subject: [PATCH 1721/3253] autoPatchelfHook: Silence errors in isExecutable

The "maxx" package recursively runs isExecutable on a bunch of files and
since the change to use "readelf" instead of "file" a lot of errors like
this one are printed during build:

  readelf: Error: Not an ELF file - it has the wrong magic bytes at the
  start

While the isExecutable was never meant to be used outside of the
autoPatchelfHook, it's still a good idea to silence the errors because
whenever readelf fails, it clearly indicates that the file in question
is not a valid ELF file.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/build-support/setup-hooks/auto-patchelf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index f808cd9f78d7..7c165627f72e 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -7,7 +7,7 @@ gatherLibraries() {
 addEnvHooks "$targetOffset" gatherLibraries
 
 isExecutable() {
-    readelf -h "$1" | grep -q '^ *Type: *EXEC\>'
+    readelf -h "$1" 2> /dev/null | grep -q '^ *Type: *EXEC\>'
 }
 
 # We cache dependencies so that we don't need to search through all of them on

From 8df68a93e636ce5c67a79713c35eb55a9dfd1bba Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 25 Sep 2018 05:00:44 +0200
Subject: [PATCH 1722/3253] elasticsearch: Add zlib to buildInputs for unfree

The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97dfb491be6ae92499c3f819440f281d826a1 we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
---
 pkgs/servers/search/elasticsearch/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix
index 84872649c492..5a43a30257ed 100644
--- a/pkgs/servers/search/elasticsearch/default.nix
+++ b/pkgs/servers/search/elasticsearch/default.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation (rec {
     sed -i "s|ES_CLASSPATH=\"\$ES_HOME/lib/\*\"|ES_CLASSPATH=\"$out/lib/*\"|" ./bin/elasticsearch-env
   '';
 
-  buildInputs = [ makeWrapper jre_headless utillinux ];
+  buildInputs = [ makeWrapper jre_headless utillinux ]
+             ++ optional enableUnfree zlib;
 
   installPhase = ''
     mkdir -p $out

From f5aed4dd5e3d9ad322c6e23dbc6c2a4bcc713f0a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 03:12:39 +0000
Subject: [PATCH 1723/3253] protobufc: 1.3.0 -> 1.3.1

---
 pkgs/development/libraries/protobufc/1.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
index 803f5a9ba79c..4d53c42a3478 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchFromGitHub {
     owner = "protobuf-c";
     repo = "protobuf-c";
     rev = "v${version}";
-    sha256 = "0shk18rjhzn2lqrwk97ks3x8gj77isc8szyb3xsgjrbrvkzjgvaa";
+    sha256 = "1dmvs0bhyx94ipaq3c7jmwcz4hwjmznn7310kqkqx7ly0w5vxxxr";
   };
 })

From b25b6e0c75867cd0ae9866b7a8f0d6e3a4be54d5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 23 Sep 2018 20:32:19 +0200
Subject: [PATCH 1724/3253] stdenv: Improve ELF detection for isELF

The isELF function only checks whether ELF is contained within the first
4 bytes of the file, which is a bit fuzzy and will also return
successful if it's a text file starting with ELF, for example:

  ELF headers
  -----------

  Some text here about ELF headers...

So instead, we're now doing a precise match on \x7fELF.

Signed-off-by: aszlig <aszlig@nix.build>
Acked-by: @Ericson2314
Closes: https://github.com/NixOS/nixpkgs/pull/47244
---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 11d0f1fbce43..8af369b1d17d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -211,7 +211,7 @@ isELF() {
     exec {fd}< "$fn"
     read -r -n 4 -u "$fd" magic
     exec {fd}<&-
-    if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
+    if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi
 }
 
 # Return success if the specified file is a script (i.e. starts with

From ed5347278f396110e0e1c4131a07dfd8d02c5a98 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 23:27:03 -0500
Subject: [PATCH 1725/3253] musl: whitespace, NFC

---
 pkgs/os-specific/linux/musl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 376d824a0438..b0758437da9d 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
     # Use execveat to impl fexecve when avail (useful for containers)
     ./fexecve-execveat.patch
     # improve behavior in few cases
-		./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
-		./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
-		./0003-fix-namespace-violation-for-c11-mutex-functions.patch
+    ./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
+    ./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
+    ./0003-fix-namespace-violation-for-c11-mutex-functions.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")

From 5c217591fda32180f688207f78caf73daf65b4df Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 23:35:01 -0500
Subject: [PATCH 1726/3253] musl: pick upstream patches for name_to_handle_at
 support

---
 pkgs/os-specific/linux/musl/default.nix       |  3 +
 .../max-handle-sz-for-name-to-handle-at.patch | 26 +++++++
 .../linux/musl/name-to-handle-at.patch        | 71 +++++++++++++++++++
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch
 create mode 100644 pkgs/os-specific/linux/musl/name-to-handle-at.patch

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index b0758437da9d..d2dbfea63ab6 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -67,6 +67,9 @@ stdenv.mkDerivation rec {
     ./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
     ./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
     ./0003-fix-namespace-violation-for-c11-mutex-functions.patch
+    # name_to_handle_at
+    ./name-to-handle-at.patch
+    ./max-handle-sz-for-name-to-handle-at.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
diff --git a/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch b/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch
new file mode 100644
index 000000000000..aa00b4619f86
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/max-handle-sz-for-name-to-handle-at.patch
@@ -0,0 +1,26 @@
+From 7d7f44253f2d8cfd0a7adf9f918d88aa24d4e012 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 13 Sep 2018 07:00:05 -0700
+Subject: [PATCH] define MAX_HANDLE_SZ for use with name_to_handle_at
+
+MAX_HANDLE_SZ is described in name_to_handle_at() to contain maximum
+expected size for a file handle
+---
+ include/fcntl.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/fcntl.h b/include/fcntl.h
+index 99b21759..4d91338b 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -166,6 +166,7 @@ struct f_owner_ex {
+ };
+ #define FALLOC_FL_KEEP_SIZE 1
+ #define FALLOC_FL_PUNCH_HOLE 2
++#define MAX_HANDLE_SZ 128
+ #define SYNC_FILE_RANGE_WAIT_BEFORE 1
+ #define SYNC_FILE_RANGE_WRITE 2
+ #define SYNC_FILE_RANGE_WAIT_AFTER 4
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/name-to-handle-at.patch b/pkgs/os-specific/linux/musl/name-to-handle-at.patch
new file mode 100644
index 000000000000..10cd8a9947c8
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/name-to-handle-at.patch
@@ -0,0 +1,71 @@
+From 3e14bbcd1979376b188bfabb816ff828608fb5d7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 12 Sep 2018 18:02:11 -0700
+Subject: [PATCH] wireup linux/name_to_handle_at and name_to_handle_at syscalls
+
+---
+ include/fcntl.h               |  7 +++++++
+ src/linux/name_to_handle_at.c | 10 ++++++++++
+ src/linux/open_by_handle_at.c |  8 ++++++++
+ 3 files changed, 25 insertions(+)
+ create mode 100644 src/linux/name_to_handle_at.c
+ create mode 100644 src/linux/open_by_handle_at.c
+
+diff --git a/include/fcntl.h b/include/fcntl.h
+index 6d8edcd1..99b21759 100644
+--- a/include/fcntl.h
++++ b/include/fcntl.h
+@@ -155,6 +155,11 @@ int lockf(int, int, off_t);
+ #define F_OWNER_PID 1
+ #define F_OWNER_PGRP 2
+ #define F_OWNER_GID 2
++struct file_handle {
++	unsigned handle_bytes;
++	int handle_type;
++	unsigned char f_handle[];
++};
+ struct f_owner_ex {
+ 	int type;
+ 	pid_t pid;
+@@ -170,6 +175,8 @@ struct f_owner_ex {
+ #define SPLICE_F_GIFT 8
+ int fallocate(int, int, off_t, off_t);
+ #define fallocate64 fallocate
++int name_to_handle_at(int, const char *, struct file_handle *, int *, int);
++int open_by_handle_at(int, struct file_handle *, int);
+ ssize_t readahead(int, off_t, size_t);
+ int sync_file_range(int, off_t, off_t, unsigned);
+ ssize_t vmsplice(int, const struct iovec *, size_t, unsigned);
+diff --git a/src/linux/name_to_handle_at.c b/src/linux/name_to_handle_at.c
+new file mode 100644
+index 00000000..cd4075bd
+--- /dev/null
++++ b/src/linux/name_to_handle_at.c
+@@ -0,0 +1,10 @@
++#define _GNU_SOURCE
++#include <fcntl.h>
++#include "syscall.h"
++
++int name_to_handle_at(int dirfd, const char *pathname,
++	struct file_handle *handle, int *mount_id, int flags)
++{
++	return syscall(SYS_name_to_handle_at, dirfd,
++		pathname, handle, mount_id, flags);
++}
+diff --git a/src/linux/open_by_handle_at.c b/src/linux/open_by_handle_at.c
+new file mode 100644
+index 00000000..1c9b6a2b
+--- /dev/null
++++ b/src/linux/open_by_handle_at.c
+@@ -0,0 +1,8 @@
++#define _GNU_SOURCE
++#include <fcntl.h>
++#include "syscall.h"
++
++int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags)
++{
++	return syscall(SYS_open_by_handle_at, mount_fd, handle, flags);
++}
+-- 
+2.19.0
+

From dcd5e4558fb38c202c69f588e3a5fa99c73ea09b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 23:37:44 -0500
Subject: [PATCH 1727/3253] musl: pick getaddrinfo fix (containers)

---
 pkgs/os-specific/linux/musl/default.nix       |  2 +
 ...drinfo-regression-with-AI_ADDRCONFIG.patch | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index d2dbfea63ab6..e28b63164862 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
     ./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch
     ./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch
     ./0003-fix-namespace-violation-for-c11-mutex-functions.patch
+    # Fix getaddrinfo usage encountered sometimes in containers
+    ./fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
     # name_to_handle_at
     ./name-to-handle-at.patch
     ./max-handle-sz-for-name-to-handle-at.patch
diff --git a/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch b/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
new file mode 100644
index 000000000000..d603c16f8062
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/fix-getaddrinfo-regression-with-AI_ADDRCONFIG.patch
@@ -0,0 +1,52 @@
+From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Wed, 19 Sep 2018 18:03:22 -0400
+Subject: [PATCH] fix getaddrinfo regression with AI_ADDRCONFIG on some
+ configurations
+
+despite not being documented to do so in the standard or Linux
+documentation, attempts to udp connect to 127.0.0.1 or ::1 generate
+EADDRNOTAVAIL when the loopback device is not configured and there is
+no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG
+to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6
+configurations, rather than the intended behavior of detecting IPv6 as
+unsuppported and producing IPv4-only results.
+
+previously, only EAFNOSUPPORT was treated as unavailability of the
+address family being probed. instead, treat all errors related to
+inability to get an address or route as conclusive that the family
+being probed is unsupported, and only fail with EAI_SYSTEM on other
+errors.
+
+further improvements may be desirable, such as reporting EAI_AGAIN
+instead of EAI_SYSTEM for errors which are expected to be transient,
+but this patch should suffice to fix the serious regression.
+---
+ src/network/getaddrinfo.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
+index ba26847a..e33bfa28 100644
+--- a/src/network/getaddrinfo.c
++++ b/src/network/getaddrinfo.c
+@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
+ 				close(s);
+ 				if (!r) continue;
+ 			}
+-			if (errno != EAFNOSUPPORT) return EAI_SYSTEM;
++			switch (errno) {
++			case EADDRNOTAVAIL:
++			case EAFNOSUPPORT:
++			case EHOSTUNREACH:
++			case ENETDOWN:
++			case ENETUNREACH:
++				break;
++			default:
++				return EAI_SYSTEM;
++			}
+ 			if (family == tf[i]) return EAI_NONAME;
+ 			family = tf[1-i];
+ 		}
+-- 
+2.19.0
+

From f38218a7568296eb19eed65b745d310a33f43297 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 23:40:08 -0500
Subject: [PATCH 1728/3253] musl: pick stacksize-related improvements, increase
 default size

Also supports setting default thread stack size via linker,
making it possible to fix programs without modifying source.
---
 pkgs/os-specific/linux/musl/default.nix       |  5 ++
 .../linux/musl/stacksize-0001.patch           | 56 ++++++++++++
 .../linux/musl/stacksize-0002.patch           | 86 +++++++++++++++++++
 .../linux/musl/stacksize-0003.patch           | 36 ++++++++
 .../linux/musl/stacksize-0004.patch           | 81 +++++++++++++++++
 5 files changed, 264 insertions(+)
 create mode 100644 pkgs/os-specific/linux/musl/stacksize-0001.patch
 create mode 100644 pkgs/os-specific/linux/musl/stacksize-0002.patch
 create mode 100644 pkgs/os-specific/linux/musl/stacksize-0003.patch
 create mode 100644 pkgs/os-specific/linux/musl/stacksize-0004.patch

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index e28b63164862..ba634c5d1611 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -72,6 +72,11 @@ stdenv.mkDerivation rec {
     # name_to_handle_at
     ./name-to-handle-at.patch
     ./max-handle-sz-for-name-to-handle-at.patch
+    # Upstream improvements regarding stack size, incl size increase
+    ./stacksize-0001.patch
+    ./stacksize-0002.patch
+    ./stacksize-0003.patch
+    ./stacksize-0004.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
diff --git a/pkgs/os-specific/linux/musl/stacksize-0001.patch b/pkgs/os-specific/linux/musl/stacksize-0001.patch
new file mode 100644
index 000000000000..5c4a6b3e9bde
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/stacksize-0001.patch
@@ -0,0 +1,56 @@
+From c7ed3e909a69d34a7821f7db644c2fa590a1a690 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 18 Sep 2018 19:43:52 -0400
+Subject: [PATCH 1/4] remove redundant declarations of __default_stacksize,
+ __default_guardsize
+
+these are now declared in pthread_impl.h.
+---
+ src/thread/pthread_attr_init.c          | 3 ---
+ src/thread/pthread_create.c             | 2 --
+ src/thread/pthread_setattr_default_np.c | 3 ---
+ 3 files changed, 8 deletions(-)
+
+diff --git a/src/thread/pthread_attr_init.c b/src/thread/pthread_attr_init.c
+index 398990d1..463a8d20 100644
+--- a/src/thread/pthread_attr_init.c
++++ b/src/thread/pthread_attr_init.c
+@@ -1,8 +1,5 @@
+ #include "pthread_impl.h"
+ 
+-extern size_t __default_stacksize;
+-extern size_t __default_guardsize;
+-
+ int pthread_attr_init(pthread_attr_t *a)
+ {
+ 	*a = (pthread_attr_t){0};
+diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
+index 3293dcd5..3da7db14 100644
+--- a/src/thread/pthread_create.c
++++ b/src/thread/pthread_create.c
+@@ -162,8 +162,6 @@ static void *dummy_tsd[1] = { 0 };
+ weak_alias(dummy_tsd, __pthread_tsd_main);
+ 
+ volatile int __block_new_threads = 0;
+-extern size_t __default_stacksize;
+-extern size_t __default_guardsize;
+ 
+ static FILE *volatile dummy_file = 0;
+ weak_alias(dummy_file, __stdin_used);
+diff --git a/src/thread/pthread_setattr_default_np.c b/src/thread/pthread_setattr_default_np.c
+index 88503e34..256f0685 100644
+--- a/src/thread/pthread_setattr_default_np.c
++++ b/src/thread/pthread_setattr_default_np.c
+@@ -2,9 +2,6 @@
+ #include "pthread_impl.h"
+ #include <string.h>
+ 
+-extern size_t __default_stacksize;
+-extern size_t __default_guardsize;
+-
+ int pthread_setattr_default_np(const pthread_attr_t *attrp)
+ {
+ 	/* Reject anything in the attr object other than stack/guard size. */
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/stacksize-0002.patch b/pkgs/os-specific/linux/musl/stacksize-0002.patch
new file mode 100644
index 000000000000..1191452d6692
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/stacksize-0002.patch
@@ -0,0 +1,86 @@
+From 792f32772e64a32527cd455ebfa087ef434a6f4f Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 18 Sep 2018 23:06:50 -0400
+Subject: [PATCH 2/4] limit the configurable default stack/guard size for
+ threads
+
+limit to 8MB/1MB, repectively. since the defaults cannot be reduced
+once increased, excessively large settings would lead to an
+unrecoverably broken state. this change is in preparation to allow
+defaults to be increased via program headers at the linker level.
+
+creation of threads that really need larger sizes needs to be done
+with an explicit attribute.
+---
+ src/internal/pthread_impl.h             |  7 +++++--
+ src/thread/default_attr.c               |  4 ++--
+ src/thread/pthread_setattr_default_np.c | 12 ++++++++----
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
+index 26e6e1df..e73a251f 100644
+--- a/src/internal/pthread_impl.h
++++ b/src/internal/pthread_impl.h
+@@ -182,12 +182,15 @@ hidden void __acquire_ptc(void);
+ hidden void __release_ptc(void);
+ hidden void __inhibit_ptc(void);
+ 
+-extern hidden size_t __default_stacksize;
+-extern hidden size_t __default_guardsize;
++extern hidden unsigned __default_stacksize;
++extern hidden unsigned __default_guardsize;
+ 
+ #define DEFAULT_STACK_SIZE 81920
+ #define DEFAULT_GUARD_SIZE 4096
+ 
++#define DEFAULT_STACK_MAX (8<<20)
++#define DEFAULT_GUARD_MAX (1<<20)
++
+ #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)
+ 
+ #endif
+diff --git a/src/thread/default_attr.c b/src/thread/default_attr.c
+index 46fe98ee..dce96409 100644
+--- a/src/thread/default_attr.c
++++ b/src/thread/default_attr.c
+@@ -1,4 +1,4 @@
+ #include "pthread_impl.h"
+ 
+-size_t __default_stacksize = DEFAULT_STACK_SIZE;
+-size_t __default_guardsize = DEFAULT_GUARD_SIZE;
++unsigned __default_stacksize = DEFAULT_STACK_SIZE;
++unsigned __default_guardsize = DEFAULT_GUARD_SIZE;
+diff --git a/src/thread/pthread_setattr_default_np.c b/src/thread/pthread_setattr_default_np.c
+index 256f0685..58486220 100644
+--- a/src/thread/pthread_setattr_default_np.c
++++ b/src/thread/pthread_setattr_default_np.c
+@@ -2,6 +2,9 @@
+ #include "pthread_impl.h"
+ #include <string.h>
+ 
++#define MIN(a,b) ((a)<(b) ? (a) : (b))
++#define MAX(a,b) ((a)>(b) ? (a) : (b))
++
+ int pthread_setattr_default_np(const pthread_attr_t *attrp)
+ {
+ 	/* Reject anything in the attr object other than stack/guard size. */
+@@ -11,11 +14,12 @@ int pthread_setattr_default_np(const pthread_attr_t *attrp)
+ 	if (memcmp(&tmp, &zero, sizeof tmp))
+ 		return EINVAL;
+ 
++	unsigned stack = MIN(attrp->_a_stacksize, DEFAULT_STACK_MAX);
++	unsigned guard = MIN(attrp->_a_guardsize, DEFAULT_GUARD_MAX);
++
+ 	__inhibit_ptc();
+-	if (attrp->_a_stacksize >= __default_stacksize)
+-		__default_stacksize = attrp->_a_stacksize;
+-	if (attrp->_a_guardsize >= __default_guardsize)
+-		__default_guardsize = attrp->_a_guardsize;
++	__default_stacksize = MAX(__default_stacksize, stack);
++	__default_guardsize = MAX(__default_guardsize, guard);
+ 	__release_ptc();
+ 
+ 	return 0;
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/stacksize-0003.patch b/pkgs/os-specific/linux/musl/stacksize-0003.patch
new file mode 100644
index 000000000000..fb5373005cbf
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/stacksize-0003.patch
@@ -0,0 +1,36 @@
+From c0058ab465e950c2c3302d2b62e21cc0b494224b Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 18 Sep 2018 23:11:49 -0400
+Subject: [PATCH 3/4] increase default thread stack/guard size
+
+stack size default is increased from 80k to 128k. this coincides with
+Linux's hard-coded default stack for the main thread (128k is
+initially committed; growth beyond that up to ulimit is contingent on
+additional allocation succeeding) and GNU ld's default PT_GNU_STACK
+size for FDPIC, at least on sh.
+
+guard size default is increased from 4k to 8k to reduce the risk of
+guard page jumping on overflow, since use of just over 4k of stack is
+common (PATH_MAX buffers, etc.).
+---
+ src/internal/pthread_impl.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
+index e73a251f..d491f975 100644
+--- a/src/internal/pthread_impl.h
++++ b/src/internal/pthread_impl.h
+@@ -185,8 +185,8 @@ hidden void __inhibit_ptc(void);
+ extern hidden unsigned __default_stacksize;
+ extern hidden unsigned __default_guardsize;
+ 
+-#define DEFAULT_STACK_SIZE 81920
+-#define DEFAULT_GUARD_SIZE 4096
++#define DEFAULT_STACK_SIZE 131072
++#define DEFAULT_GUARD_SIZE 8192
+ 
+ #define DEFAULT_STACK_MAX (8<<20)
+ #define DEFAULT_GUARD_MAX (1<<20)
+-- 
+2.19.0
+
diff --git a/pkgs/os-specific/linux/musl/stacksize-0004.patch b/pkgs/os-specific/linux/musl/stacksize-0004.patch
new file mode 100644
index 000000000000..7a6f9792de53
--- /dev/null
+++ b/pkgs/os-specific/linux/musl/stacksize-0004.patch
@@ -0,0 +1,81 @@
+From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 18 Sep 2018 23:54:18 -0400
+Subject: [PATCH 4/4] support setting of default thread stack size via
+ PT_GNU_STACK header
+
+this facilitates building software that assumes a large default stack
+size without any patching to call pthread_setattr_default_np or
+pthread_attr_setstacksize at each thread creation site, using just
+LDFLAGS.
+
+normally the PT_GNU_STACK header is used only to reflect whether
+executable stack is desired, but with GNU ld at least, passing
+-Wl,-z,stack-size=N will set a size on the program header. with this
+patch, that size will be incorporated into the default stack size
+(subject to increase-only rule and DEFAULT_STACK_MAX limit).
+
+both static and dynamic linking honor the program header. for dynamic
+linking, all libraries loaded at program start, including preloaded
+ones, are considered. dlopened libraries are not considered, for
+several reasons. extra logic would be needed to defer processing until
+the load of the new library is commited, synchronization woud be
+needed since other threads may be running concurrently, and the
+effectiveness woud be limited since the larger size would not apply to
+threads that already existed at the time of dlopen. programs that will
+dlopen code expecting a large stack need to declare the requirement
+themselves, or pthread_setattr_default_np can be used.
+---
+ ldso/dynlink.c       | 12 ++++++++++++
+ src/env/__init_tls.c |  5 +++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/ldso/dynlink.c b/ldso/dynlink.c
+index e4829c3a..3ecbddfa 100644
+--- a/ldso/dynlink.c
++++ b/ldso/dynlink.c
+@@ -609,6 +609,12 @@ static void *map_library(int fd, struct dso *dso)
+ 		} else if (ph->p_type == PT_GNU_RELRO) {
+ 			dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
+ 			dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
++		} else if (ph->p_type == PT_GNU_STACK) {
++			if (!runtime && ph->p_memsz > __default_stacksize) {
++				__default_stacksize =
++					ph->p_memsz < DEFAULT_STACK_MAX ?
++					ph->p_memsz : DEFAULT_STACK_MAX;
++			}
+ 		}
+ 		if (ph->p_type != PT_LOAD) continue;
+ 		nsegs++;
+@@ -1238,6 +1244,12 @@ static void kernel_mapped_dso(struct dso *p)
+ 		} else if (ph->p_type == PT_GNU_RELRO) {
+ 			p->relro_start = ph->p_vaddr & -PAGE_SIZE;
+ 			p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
++		} else if (ph->p_type == PT_GNU_STACK) {
++			if (!runtime && ph->p_memsz > __default_stacksize) {
++				__default_stacksize =
++					ph->p_memsz < DEFAULT_STACK_MAX ?
++					ph->p_memsz : DEFAULT_STACK_MAX;
++			}
+ 		}
+ 		if (ph->p_type != PT_LOAD) continue;
+ 		if (ph->p_vaddr < min_addr)
+diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
+index e0224243..96d0e284 100644
+--- a/src/env/__init_tls.c
++++ b/src/env/__init_tls.c
+@@ -90,6 +90,11 @@ static void static_init_tls(size_t *aux)
+ 			base = (size_t)_DYNAMIC - phdr->p_vaddr;
+ 		if (phdr->p_type == PT_TLS)
+ 			tls_phdr = phdr;
++		if (phdr->p_type == PT_GNU_STACK &&
++		    phdr->p_memsz > __default_stacksize)
++			__default_stacksize =
++				phdr->p_memsz < DEFAULT_STACK_MAX ?
++				phdr->p_memsz : DEFAULT_STACK_MAX;
+ 	}
+ 
+ 	if (tls_phdr) {
+-- 
+2.19.0
+

From d3a0aa22da1f3583c80338e21a7b42a78032e7ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 23:54:59 -0500
Subject: [PATCH 1729/3253] musl: reduce stacksize patch series to just the
 bump

The others rely on some of the recent restructuring+cleanup in musl,
which hopefully reaches us soon :).

For now just bump the default sizes.
---
 pkgs/os-specific/linux/musl/default.nix       |  7 +-
 .../linux/musl/stacksize-0001.patch           | 56 ------------
 .../linux/musl/stacksize-0002.patch           | 86 -------------------
 .../linux/musl/stacksize-0004.patch           | 81 -----------------
 ...cksize-0003.patch => stacksize-bump.patch} |  0
 5 files changed, 2 insertions(+), 228 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/musl/stacksize-0001.patch
 delete mode 100644 pkgs/os-specific/linux/musl/stacksize-0002.patch
 delete mode 100644 pkgs/os-specific/linux/musl/stacksize-0004.patch
 rename pkgs/os-specific/linux/musl/{stacksize-0003.patch => stacksize-bump.patch} (100%)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index ba634c5d1611..6137a5942c26 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -72,11 +72,8 @@ stdenv.mkDerivation rec {
     # name_to_handle_at
     ./name-to-handle-at.patch
     ./max-handle-sz-for-name-to-handle-at.patch
-    # Upstream improvements regarding stack size, incl size increase
-    ./stacksize-0001.patch
-    ./stacksize-0002.patch
-    ./stacksize-0003.patch
-    ./stacksize-0004.patch
+    # stacksize bump (upstream)
+    ./stacksize-bump.patch
   ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
diff --git a/pkgs/os-specific/linux/musl/stacksize-0001.patch b/pkgs/os-specific/linux/musl/stacksize-0001.patch
deleted file mode 100644
index 5c4a6b3e9bde..000000000000
--- a/pkgs/os-specific/linux/musl/stacksize-0001.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c7ed3e909a69d34a7821f7db644c2fa590a1a690 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 18 Sep 2018 19:43:52 -0400
-Subject: [PATCH 1/4] remove redundant declarations of __default_stacksize,
- __default_guardsize
-
-these are now declared in pthread_impl.h.
----
- src/thread/pthread_attr_init.c          | 3 ---
- src/thread/pthread_create.c             | 2 --
- src/thread/pthread_setattr_default_np.c | 3 ---
- 3 files changed, 8 deletions(-)
-
-diff --git a/src/thread/pthread_attr_init.c b/src/thread/pthread_attr_init.c
-index 398990d1..463a8d20 100644
---- a/src/thread/pthread_attr_init.c
-+++ b/src/thread/pthread_attr_init.c
-@@ -1,8 +1,5 @@
- #include "pthread_impl.h"
- 
--extern size_t __default_stacksize;
--extern size_t __default_guardsize;
--
- int pthread_attr_init(pthread_attr_t *a)
- {
- 	*a = (pthread_attr_t){0};
-diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
-index 3293dcd5..3da7db14 100644
---- a/src/thread/pthread_create.c
-+++ b/src/thread/pthread_create.c
-@@ -162,8 +162,6 @@ static void *dummy_tsd[1] = { 0 };
- weak_alias(dummy_tsd, __pthread_tsd_main);
- 
- volatile int __block_new_threads = 0;
--extern size_t __default_stacksize;
--extern size_t __default_guardsize;
- 
- static FILE *volatile dummy_file = 0;
- weak_alias(dummy_file, __stdin_used);
-diff --git a/src/thread/pthread_setattr_default_np.c b/src/thread/pthread_setattr_default_np.c
-index 88503e34..256f0685 100644
---- a/src/thread/pthread_setattr_default_np.c
-+++ b/src/thread/pthread_setattr_default_np.c
-@@ -2,9 +2,6 @@
- #include "pthread_impl.h"
- #include <string.h>
- 
--extern size_t __default_stacksize;
--extern size_t __default_guardsize;
--
- int pthread_setattr_default_np(const pthread_attr_t *attrp)
- {
- 	/* Reject anything in the attr object other than stack/guard size. */
--- 
-2.19.0
-
diff --git a/pkgs/os-specific/linux/musl/stacksize-0002.patch b/pkgs/os-specific/linux/musl/stacksize-0002.patch
deleted file mode 100644
index 1191452d6692..000000000000
--- a/pkgs/os-specific/linux/musl/stacksize-0002.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 792f32772e64a32527cd455ebfa087ef434a6f4f Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 18 Sep 2018 23:06:50 -0400
-Subject: [PATCH 2/4] limit the configurable default stack/guard size for
- threads
-
-limit to 8MB/1MB, repectively. since the defaults cannot be reduced
-once increased, excessively large settings would lead to an
-unrecoverably broken state. this change is in preparation to allow
-defaults to be increased via program headers at the linker level.
-
-creation of threads that really need larger sizes needs to be done
-with an explicit attribute.
----
- src/internal/pthread_impl.h             |  7 +++++--
- src/thread/default_attr.c               |  4 ++--
- src/thread/pthread_setattr_default_np.c | 12 ++++++++----
- 3 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
-index 26e6e1df..e73a251f 100644
---- a/src/internal/pthread_impl.h
-+++ b/src/internal/pthread_impl.h
-@@ -182,12 +182,15 @@ hidden void __acquire_ptc(void);
- hidden void __release_ptc(void);
- hidden void __inhibit_ptc(void);
- 
--extern hidden size_t __default_stacksize;
--extern hidden size_t __default_guardsize;
-+extern hidden unsigned __default_stacksize;
-+extern hidden unsigned __default_guardsize;
- 
- #define DEFAULT_STACK_SIZE 81920
- #define DEFAULT_GUARD_SIZE 4096
- 
-+#define DEFAULT_STACK_MAX (8<<20)
-+#define DEFAULT_GUARD_MAX (1<<20)
-+
- #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1)
- 
- #endif
-diff --git a/src/thread/default_attr.c b/src/thread/default_attr.c
-index 46fe98ee..dce96409 100644
---- a/src/thread/default_attr.c
-+++ b/src/thread/default_attr.c
-@@ -1,4 +1,4 @@
- #include "pthread_impl.h"
- 
--size_t __default_stacksize = DEFAULT_STACK_SIZE;
--size_t __default_guardsize = DEFAULT_GUARD_SIZE;
-+unsigned __default_stacksize = DEFAULT_STACK_SIZE;
-+unsigned __default_guardsize = DEFAULT_GUARD_SIZE;
-diff --git a/src/thread/pthread_setattr_default_np.c b/src/thread/pthread_setattr_default_np.c
-index 256f0685..58486220 100644
---- a/src/thread/pthread_setattr_default_np.c
-+++ b/src/thread/pthread_setattr_default_np.c
-@@ -2,6 +2,9 @@
- #include "pthread_impl.h"
- #include <string.h>
- 
-+#define MIN(a,b) ((a)<(b) ? (a) : (b))
-+#define MAX(a,b) ((a)>(b) ? (a) : (b))
-+
- int pthread_setattr_default_np(const pthread_attr_t *attrp)
- {
- 	/* Reject anything in the attr object other than stack/guard size. */
-@@ -11,11 +14,12 @@ int pthread_setattr_default_np(const pthread_attr_t *attrp)
- 	if (memcmp(&tmp, &zero, sizeof tmp))
- 		return EINVAL;
- 
-+	unsigned stack = MIN(attrp->_a_stacksize, DEFAULT_STACK_MAX);
-+	unsigned guard = MIN(attrp->_a_guardsize, DEFAULT_GUARD_MAX);
-+
- 	__inhibit_ptc();
--	if (attrp->_a_stacksize >= __default_stacksize)
--		__default_stacksize = attrp->_a_stacksize;
--	if (attrp->_a_guardsize >= __default_guardsize)
--		__default_guardsize = attrp->_a_guardsize;
-+	__default_stacksize = MAX(__default_stacksize, stack);
-+	__default_guardsize = MAX(__default_guardsize, guard);
- 	__release_ptc();
- 
- 	return 0;
--- 
-2.19.0
-
diff --git a/pkgs/os-specific/linux/musl/stacksize-0004.patch b/pkgs/os-specific/linux/musl/stacksize-0004.patch
deleted file mode 100644
index 7a6f9792de53..000000000000
--- a/pkgs/os-specific/linux/musl/stacksize-0004.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 18 Sep 2018 23:54:18 -0400
-Subject: [PATCH 4/4] support setting of default thread stack size via
- PT_GNU_STACK header
-
-this facilitates building software that assumes a large default stack
-size without any patching to call pthread_setattr_default_np or
-pthread_attr_setstacksize at each thread creation site, using just
-LDFLAGS.
-
-normally the PT_GNU_STACK header is used only to reflect whether
-executable stack is desired, but with GNU ld at least, passing
--Wl,-z,stack-size=N will set a size on the program header. with this
-patch, that size will be incorporated into the default stack size
-(subject to increase-only rule and DEFAULT_STACK_MAX limit).
-
-both static and dynamic linking honor the program header. for dynamic
-linking, all libraries loaded at program start, including preloaded
-ones, are considered. dlopened libraries are not considered, for
-several reasons. extra logic would be needed to defer processing until
-the load of the new library is commited, synchronization woud be
-needed since other threads may be running concurrently, and the
-effectiveness woud be limited since the larger size would not apply to
-threads that already existed at the time of dlopen. programs that will
-dlopen code expecting a large stack need to declare the requirement
-themselves, or pthread_setattr_default_np can be used.
----
- ldso/dynlink.c       | 12 ++++++++++++
- src/env/__init_tls.c |  5 +++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index e4829c3a..3ecbddfa 100644
---- a/ldso/dynlink.c
-+++ b/ldso/dynlink.c
-@@ -609,6 +609,12 @@ static void *map_library(int fd, struct dso *dso)
- 		} else if (ph->p_type == PT_GNU_RELRO) {
- 			dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
- 			dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-+		} else if (ph->p_type == PT_GNU_STACK) {
-+			if (!runtime && ph->p_memsz > __default_stacksize) {
-+				__default_stacksize =
-+					ph->p_memsz < DEFAULT_STACK_MAX ?
-+					ph->p_memsz : DEFAULT_STACK_MAX;
-+			}
- 		}
- 		if (ph->p_type != PT_LOAD) continue;
- 		nsegs++;
-@@ -1238,6 +1244,12 @@ static void kernel_mapped_dso(struct dso *p)
- 		} else if (ph->p_type == PT_GNU_RELRO) {
- 			p->relro_start = ph->p_vaddr & -PAGE_SIZE;
- 			p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
-+		} else if (ph->p_type == PT_GNU_STACK) {
-+			if (!runtime && ph->p_memsz > __default_stacksize) {
-+				__default_stacksize =
-+					ph->p_memsz < DEFAULT_STACK_MAX ?
-+					ph->p_memsz : DEFAULT_STACK_MAX;
-+			}
- 		}
- 		if (ph->p_type != PT_LOAD) continue;
- 		if (ph->p_vaddr < min_addr)
-diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
-index e0224243..96d0e284 100644
---- a/src/env/__init_tls.c
-+++ b/src/env/__init_tls.c
-@@ -90,6 +90,11 @@ static void static_init_tls(size_t *aux)
- 			base = (size_t)_DYNAMIC - phdr->p_vaddr;
- 		if (phdr->p_type == PT_TLS)
- 			tls_phdr = phdr;
-+		if (phdr->p_type == PT_GNU_STACK &&
-+		    phdr->p_memsz > __default_stacksize)
-+			__default_stacksize =
-+				phdr->p_memsz < DEFAULT_STACK_MAX ?
-+				phdr->p_memsz : DEFAULT_STACK_MAX;
- 	}
- 
- 	if (tls_phdr) {
--- 
-2.19.0
-
diff --git a/pkgs/os-specific/linux/musl/stacksize-0003.patch b/pkgs/os-specific/linux/musl/stacksize-bump.patch
similarity index 100%
rename from pkgs/os-specific/linux/musl/stacksize-0003.patch
rename to pkgs/os-specific/linux/musl/stacksize-bump.patch

From 3ec0d14140dc086ce40a5f5b67338a8c9a9ab08f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 18:33:34 -0500
Subject: [PATCH 1730/3253] gcc7: more options for musl

---
 pkgs/development/compilers/gcc/7/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 4dfbcf0f5458..2dd919d978fa 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -292,7 +292,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
     ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
   ;
 

From e845be175602f9784a457beb2a0e2d30e97facc1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 19:51:29 -0500
Subject: [PATCH 1731/3253] gcc: fix libgomp to not use initial-exec

Only apply w/musl since while it's wrong everywhere it apparently
hasn't broken things entirely w/glibc so keep things as they were.

Patch regenerated from original so that it applies
which isn't saying much since it's simple :).

Source:

https://patchwork.ozlabs.org/patch/154298/

IRC chat on #musl with Rich and others endorses this,
at least at the conceptual level of no shared library
should be using initial-exec TLS.

Fixes various uses of libgomp that previously crashed (before 1.1.20)
or encounter errors (post-1.1.20), such as pythonPackages.cython .
---
 pkgs/development/compilers/gcc/7/default.nix  |  3 +-
 .../7/libgomp-dont-force-initial-exec.patch   | 40 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 2dd919d978fa..6643d41ff77c 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -56,7 +56,8 @@ let version = "7.3.0";
         sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
       })
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+      ++ optional (targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
diff --git a/pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch b/pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch
new file mode 100644
index 000000000000..afd1f7456d32
--- /dev/null
+++ b/pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch
@@ -0,0 +1,40 @@
+From 01c433f4788441c0963005b9d3fad5b2865e6651 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Mon, 24 Sep 2018 19:57:50 -0500
+Subject: [PATCH] libgomp/configure.tgt: don't force initial-exec tls-model
+
+---
+ libgomp/configure.tgt | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
+index 74d95a570c7..b608c55f0c1 100644
+--- a/libgomp/configure.tgt
++++ b/libgomp/configure.tgt
+@@ -10,23 +10,6 @@
+ #  XCFLAGS		Add extra compile flags to use.
+ #  XLDFLAGS		Add extra link flags to use.
+ 
+-# Optimize TLS usage by avoiding the overhead of dynamic allocation.
+-if test $gcc_cv_have_tls = yes ; then
+-  case "${target}" in
+-
+-    *-*-k*bsd*-gnu*)
+-	;;
+-
+-    *-*-linux* | *-*-gnu*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
+-	;;
+-
+-    *-*-rtems*)
+-	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
+-	;;
+-  esac
+-fi
+-
+ # Since we require POSIX threads, assume a POSIX system by default.
+ config_path="posix"
+ 
+-- 
+2.19.0
+

From fecd326399d72ecf0e5356f60aec7d79a0b7b7ef Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 20:03:50 -0500
Subject: [PATCH 1732/3253] gcc{5,6,7,8}: share libgomp patch, propagate musl
 config flags

---
 pkgs/development/compilers/gcc/5/default.nix           |  8 +++++++-
 pkgs/development/compilers/gcc/6/default.nix           |  8 +++++++-
 pkgs/development/compilers/gcc/7/default.nix           |  2 +-
 pkgs/development/compilers/gcc/8/default.nix           | 10 ++++++++--
 .../gcc/{7 => }/libgomp-dont-force-initial-exec.patch  |  0
 5 files changed, 23 insertions(+), 5 deletions(-)
 rename pkgs/development/compilers/gcc/{7 => }/libgomp-dont-force-initial-exec.patch (100%)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 2e51e9c05066..14da38b34fb4 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -60,6 +60,7 @@ let version = "5.5.0";
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
       ++ optional stdenv.hostPlatform.isMusl (fetchpatch {
         url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
         sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";
@@ -331,7 +332,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e6825afcfa84..2a7af827f2dd 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -61,6 +61,7 @@ let version = "6.4.0";
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
       ++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
       ;
 
     javaEcj = fetchurl {
@@ -336,7 +337,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 6643d41ff77c..fd3ce8df497d 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -57,7 +57,7 @@ let version = "7.3.0";
       })
       ++ optional langFortran ../gfortran-driving.patch
       ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
-      ++ optional (targetPlatform.libc == "musl") ./libgomp-dont-force-initial-exec.patch;
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 04054df8bf82..427fe3fdddf7 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -51,7 +51,8 @@ let version = "8.2.0";
         sha256 = ""; # TODO: uncomment and check hash when available.
       }) */
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+      ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+      ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
 
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -284,7 +285,12 @@ stdenv.mkDerivation ({
       # On Illumos/Solaris GNU as is preferred
       "--with-gnu-as" "--without-gnu-ld"
     ]
-    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+      "--disable-libsanitizer"
+      "--disable-symvers"
+      "libat_cv_have_ifunc=no"
+      "--disable-gnu-indirect-function"
+    ]
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
diff --git a/pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch b/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
similarity index 100%
rename from pkgs/development/compilers/gcc/7/libgomp-dont-force-initial-exec.patch
rename to pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch

From 8a0a34f76645a090e1f2f0e2c17912f54bfe84e4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Sep 2018 20:43:27 -0500
Subject: [PATCH 1733/3253] openblas: try leaving openmp enabled w/musl

---
 pkgs/development/libraries/science/math/openblas/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3f271d015027..a84cb7623d8f 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -60,7 +60,7 @@ let
       TARGET = "ATHLON";
       DYNAMIC_ARCH = "1";
       CC = "gcc";
-      USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1";
+      USE_OPENMP = "1";
     };
   };
 in

From 8d83441a4c37199548c00ae8abd73092c6e46bd6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 01:31:45 -0500
Subject: [PATCH 1734/3253] bitcoin: disable tests based on doCheck, per
 reviewer feedback

Thanks!
---
 pkgs/applications/altcoins/bitcoin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 38ce46163be6..dc463f386582 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec{
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
                      "--disable-bench"
+                   ] ++ optionals (!doCheck) [
                      "--disable-tests"
                      "--disable-gui-tests"
                    ]

From 12051db622425456844ec7414cbd44ace052e813 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 22 Sep 2018 16:25:22 -0400
Subject: [PATCH 1735/3253] U-Boot: Add Orange Pi Zero Plus2 (H5) build

---
 pkgs/misc/uboot/default.nix     | 7 +++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index be770b634a30..ac77df8d7cd2 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -158,6 +158,13 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootOrangePiZeroPlus2H5 = buildUBoot rec {
+    defconfig = "orangepi_zero_plus2_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce86b1d3d7fe..152b5250cba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14755,6 +14755,7 @@ with pkgs;
     ubootNovena
     ubootOdroidXU3
     ubootOrangePiPc
+    ubootOrangePiZeroPlus2H5
     ubootPcduino3Nano
     ubootPine64
     ubootQemuAarch64

From fae4aa9f361894b97cffc87bb54f0c4174d89ade Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 25 Sep 2018 00:15:58 -0700
Subject: [PATCH 1736/3253] vagrant: Clean up Gemfile

---
 pkgs/development/tools/vagrant/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile
index f25a77c9398c..d32951f1c054 100644
--- a/pkgs/development/tools/vagrant/Gemfile
+++ b/pkgs/development/tools/vagrant/Gemfile
@@ -1,2 +1,2 @@
 source "https://rubygems.org"
-gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4"
+gem 'vagrant'

From ded8f28c3a3bd0204738275362dc9450755f9e6b Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 25 Sep 2018 10:41:39 +0200
Subject: [PATCH 1737/3253] Revert "virtualization/qemu-vm: fix and improve
 virtio/scsi switching"

This reverts commit f777d2b719be0db4cb7819d5b6dbdd121db29a37.
cc #34409
This breaks evaluation of the tested job:
attribute 'diskInterface' missing, at /nix/store/5k9kk52bv6zsvsyyvpxhm8xmwyn2yjvx-source/pkgs/build-support/vm/default.nix:316:24
---
 nixos/modules/virtualisation/qemu-vm.nix | 44 ++++++++++--------------
 pkgs/build-support/vm/default.nix        | 16 ++-------
 2 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index eec1a85162b5..4e9c87222d0a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -32,21 +32,15 @@ let
   # expressions and shell script stuff.
   mkDiskIfaceDriveFlag = idx: driveArgs: let
     inherit (cfg.qemu) diskInterface;
-    isSCSI = diskInterface == "scsi";
     # The drive identifier created by incrementing the index by one using the
     # shell.
     drvId = "drive$((${idx} + 1))";
-    dvcId = "${diskInterface}$((${idx} + 1))";
     # NOTE: DO NOT shell escape, because this may contain shell variables.
-    commonDriveArgs = "media=disk,id=${drvId},${driveArgs}";
-    commonInterfaceArgs = "drive=${drvId},id=${dvcId},bootindex=${idx}";
-  in lib.concatStrings [
-    "-drive ${commonDriveArgs},if=none "
-    ''${if isSCSI then
-        "-device lsi53c895a -device ${diskInterface}-hd,${commonInterfaceArgs}"
-      else
-        "-device virtio-blk-pci,scsi=off,${commonInterfaceArgs}"} ''
-  ];
+    commonArgs = "index=${idx},id=${drvId},${driveArgs}";
+    isSCSI = diskInterface == "scsi";
+    devArgs = "${diskInterface}-hd,drive=${drvId}";
+    args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}";
+  in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}";
 
   # Shell script to start the VM.
   startVM =
@@ -103,15 +97,15 @@ let
           -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
           -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
-          ${mkDiskIfaceDriveFlag "1" "file=$NIX_DISK_IMAGE,media=disk,cache=writeback,werror=report"} \
           ${if cfg.useBootLoader then ''
-            -boot menu=on \
-            ${mkDiskIfaceDriveFlag "0" "file=$TMPDIR/disk.img,media=disk"} \
+            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
+            ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \
             ${if cfg.useEFIBoot then ''
               -pflash $TMPDIR/bios.bin \
             '' else ''
-            \''}
-          '' else '' \
+            ''}
+          '' else ''
+            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \
@@ -147,9 +141,8 @@ let
             '';
           buildInputs = [ pkgs.utillinux ];
           QEMU_OPTS = if cfg.useEFIBoot
-                      then "-pflash $out/bios.bin -nographic"
-                      else "-nographic";
-          diskInterface = cfg.qemu.diskInterface;
+                      then "-pflash $out/bios.bin -nographic -serial pty"
+                      else "-nographic -serial pty";
         }
         ''
           # Create a /boot EFI partition with 40M and arbitrary but fixed GUIDs for reproducibility
@@ -162,10 +155,10 @@ let
             --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \
             --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \
             --hybrid 2 \
-            --recompute-chs ${config.virtualisation.bootDevice}
-          ${pkgs.dosfstools}/bin/mkfs.fat -F16 ${config.virtualisation.bootDevice}2
+            --recompute-chs /dev/vda
+          ${pkgs.dosfstools}/bin/mkfs.fat -F16 /dev/vda2
           export MTOOLS_SKIP_CHECK=1
-          ${pkgs.mtools}/bin/mlabel -i ${config.virtualisation.bootDevice}2 ::boot
+          ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot
 
           # Mount /boot; load necessary modules first.
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko.xz || true
@@ -174,11 +167,11 @@ let
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko.xz || true
           ${pkgs.kmod}/bin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko.xz || true
           mkdir /boot
-          mount ${config.virtualisation.bootDevice}2 /boot
+          mount /dev/vda2 /boot
 
           # This is needed for GRUB 0.97, which doesn't know about virtio devices.
           mkdir /boot/grub
-          echo '(hd0) ${config.virtualisation.bootDevice}' > /boot/grub/device.map
+          echo '(hd0) /dev/vda' > /boot/grub/device.map
 
           # Install GRUB and generate the GRUB boot menu.
           touch /etc/NIXOS
@@ -471,8 +464,7 @@ in
 
     boot.initrd.availableKernelModules =
       optional cfg.writableStore "overlay"
-      ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
-      ++ optional (cfg.qemu.diskInterface == "scsi") "virtio_scsi";
+      ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx";
 
     virtualisation.bootDevice =
       mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda");
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 6e98099460f8..03b3fb1f9f27 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -3,9 +3,8 @@
 , img ? pkgs.stdenv.hostPlatform.platform.kernelTarget
 , storeDir ? builtins.storeDir
 , rootModules ?
-    [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" "sym53c8xx" "virtio_scsi" "ahci "]
+    [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
       ++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
-, config
 }:
 
 with pkgs;
@@ -197,17 +196,9 @@ rec {
     ${qemuBinary qemu} \
       -nographic -no-reboot \
       -device virtio-rng-pci \
-      ${if "$diskInterface" == "scsi" then '' \
-        \ # FIXME: /dev/sda is not created within the VM
-        -device lsi53c895a \
-        -device scsi-hd,drive=hd,id=scsi1,bootindex=1 \
-        ''${diskImage:+-drive file=$diskImage,media=disk,if=none,id=hd,cache=unsafe,werror=report} \
-      '' else '' \
-        -drive file=$diskImage,media=disk,if=none,id=hd \
-        -device virtio-blk-pci,scsi=off,drive=hd,id=virtio0,bootindex=1 \
-      \''}
       -virtfs local,path=${storeDir},security_model=none,mount_tag=store \
       -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
+      ''${diskImage:+-drive file=$diskImage,if=virtio,cache=unsafe,werror=report} \
       -kernel ${kernel}/${img} \
       -initrd ${initrd}/initrd \
       -append "console=${qemuSerialDevice} panic=1 command=${stage2Init} out=$out mountDisk=$mountDisk loglevel=4" \
@@ -307,13 +298,12 @@ rec {
      `run-vm' will be left behind in the temporary build directory
      that allows you to boot into the VM and debug it interactively. */
 
-  runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ...  } @ moreArgs : {
+  runInLinuxVM = drv: lib.overrideDerivation drv ({ memSize ? 512, QEMU_OPTS ? "", args, builder, ... }: {
     requiredSystemFeatures = [ "kvm" ];
     builder = "${bash}/bin/sh";
     args = ["-e" (vmRunCommand qemuCommandLinux)];
     origArgs = args;
     origBuilder = builder;
-    diskInterface = "${moreArgs.diskInterface}";
     QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize}";
     passAsFile = []; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742
   });

From a6ff5865d1342cdc6d04c1de005a5648432dbe33 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Mon, 24 Sep 2018 15:30:32 +0200
Subject: [PATCH 1738/3253] rabbitmq-server: 3.6.10 -> 3.7.8

- New dependency on 'getconf' binary for
  https://github.com/rabbitmq/rabbitmq-common/blob/3aa619e9ef81cfe6db0c776e6cd829ce234a7881/src/vm_memory_monitor.erl#L448
- New dependency on 'socat' for systemd notifications
  https://github.com/rabbitmq/rabbitmq-server/blob/4a3ee3a336bc82f2e56ec5d2292c80458ccc2974/src/rabbit.erl#L361
- elixir_1_6 for a new 'rabbitmqctl' tool
- Replace patching with providing custom PATH, as we already have some
  other things here
- Renamed package in all-packages.nix from a legacy spelling
---
 nixos/doc/manual/release-notes/rl-1903.xml    |  5 +++
 pkgs/servers/amqp/rabbitmq-server/default.nix | 37 +++++--------------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 8c8237e6371e..3e7f8d0681d2 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -99,6 +99,11 @@
      </listitem>
     </itemizedlist>
    </listitem>
+   <listitem>
+     <para>
+       Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 22a9aef8edab..514771f7e580 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,41 +1,30 @@
-{ stdenv, fetchurl
-, erlang, python, libxml2, libxslt, xmlto
-, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
+{ stdenv, fetchurl, erlang, elixir, python, libxml2, libxslt, xmlto
+, docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
 , AppKit, Carbon, Cocoa
-, getconf
 }:
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
-  version = "3.6.15";
+
+  version = "3.7.8";
 
   src = fetchurl {
-    url = "https://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.xz";
-    sha256 = "1zdmil657mhjmd20jv47s5dfpj2liqwvyg0zv2ky3akanfpgj98y";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${name}.tar.xz";
+    sha256 = "00jsix333g44y20psrp12c96b7d161yvrysnygjjz4wc5gbrzlxy";
   };
 
   buildInputs =
-    [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
+    [ erlang elixir python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
 
   outputs = [ "out" "man" "doc" ];
 
-  postPatch = with stdenv.lib; ''
-    # patch the path to getconf
-    substituteInPlace deps/rabbit_common/src/vm_memory_monitor.erl \
-      --replace "getconf PAGESIZE" "${getconf}/bin/getconf PAGESIZE"
-  '';
-
-  preBuild = ''
-    # Fix the "/usr/bin/env" in "calculate-relative".
-    patchShebangs .
-  '';
-
   installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)";
   installTargets = "install install-man";
 
+  runtimePath = stdenv.lib.makeBinPath [getconf erlang socat];
   postInstall = ''
-    echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
+    echo 'PATH=${runtimePath}:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env
 
     # we know exactly where rabbitmq is gonna be,
     # so we patch that into the env-script
@@ -49,13 +38,7 @@ stdenv.mkDerivation rec {
 
     # and an unecessarily copied INSTALL file
     rm $out/INSTALL
-
-    # patched into a source file above;
-    # needs to be explicitely passed to not be stripped by fixup
-    mkdir -p $out/nix-support
-    echo "${getconf}" > $out/nix-support/dont-strip-getconf
-
-    '';
+  '';
 
   meta = {
     homepage = http://www.rabbitmq.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0510c11b19a..ae61bafd3601 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13483,8 +13483,10 @@ with pkgs;
 
   quagga = callPackage ../servers/quagga { };
 
-  rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server {
+  rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
+    elixir = elixir_1_6;
+    erlang = erlang_nox;
   };
 
   radicale1 = callPackage ../servers/radicale/1.x.nix { };

From afa2be4464f3dd17577523487cc09f5f411863bc Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Mon, 24 Sep 2018 15:31:16 +0200
Subject: [PATCH 1739/3253] rabbitmq module: modernize after package upgrade

- Use socket-activated epmd - that way there won't be any trouble when
  more than one erlang system is used within a single host.
- Use new automation-friendly configuration file format
- Use systemd notifications instead of buggy 'rabbitmqctl wait' for
  confirming successful server startup.
  'wait' bug: https://github.com/rabbitmq/rabbitmq-server/issues/463
- Use 'rabbitmqctl shutdown' instead of 'stop', because it's not
  pid-file based
- Use sane systemd unit defaults from RabbitMQ repo:
  https://github.com/rabbitmq/rabbitmq-server/blob/master/docs/rabbitmq-server.service.example
- Support for external plugins
---
 nixos/modules/services/amqp/rabbitmq.nix | 90 +++++++++++++++++++-----
 1 file changed, 72 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index bb6fc0a104df..c6878dd67dbf 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -4,14 +4,18 @@ with lib;
 
 let
   cfg = config.services.rabbitmq;
-  config_file = pkgs.writeText "rabbitmq.config" cfg.config;
-  config_file_wo_suffix = builtins.substring 0 ((builtins.stringLength config_file) - 7) config_file;
+
+  inherit (builtins) concatStringsSep;
+
+  config_file_content = lib.generators.toKeyValue {} cfg.configItems;
+  config_file = pkgs.writeText "rabbitmq.conf" config_file_content;
+
+  advanced_config_file = pkgs.writeText "advanced.config" cfg.config;
 
 in {
   ###### interface
   options = {
     services.rabbitmq = {
-
       enable = mkOption {
         default = false;
         description = ''
@@ -20,6 +24,15 @@ in {
         '';
       };
 
+      package = mkOption {
+        default = pkgs.rabbitmq-server;
+        type = types.package;
+        defaultText = "pkgs.rabbitmq-server";
+        description = ''
+          Which rabbitmq package to use.
+        '';
+      };
+
       listenAddress = mkOption {
         default = "127.0.0.1";
         example = "";
@@ -30,6 +43,10 @@ in {
           <literal>guest</literal> with password
           <literal>guest</literal> by default, so you should delete
           this user if you intend to allow external access.
+
+          Together with 'port' setting it's mostly an alias for
+          configItems."listeners.tcp.1" and it's left for backwards
+          compatibility with previous version of this module.
         '';
         type = types.str;
       };
@@ -60,11 +77,29 @@ in {
         '';
       };
 
+      configItems = mkOption {
+        default = {};
+        type = types.attrsOf types.str;
+        example = ''
+          {
+            "auth_backends.1.authn" = "rabbit_auth_backend_ldap";
+            "auth_backends.1.authz" = "rabbit_auth_backend_internal";
+          }
+        '';
+        description = ''
+          New style config options.
+
+          See http://www.rabbitmq.com/configure.html
+        '';
+      };
+
       config = mkOption {
         default = "";
         type = types.str;
         description = ''
-          Verbatim configuration file contents.
+          Verbatim advanced configuration file contents.
+          Prefered way is to use configItems.
+
           See http://www.rabbitmq.com/configure.html
         '';
       };
@@ -74,6 +109,12 @@ in {
         type = types.listOf types.str;
         description = "The names of plugins to enable";
       };
+
+      pluginDirs = mkOption {
+        default = [];
+        type = types.listOf types.path;
+        description = "The list of directories containing external plugins";
+      };
     };
   };
 
@@ -81,7 +122,10 @@ in {
   ###### implementation
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.rabbitmq_server ];
+    # This is needed so we will have 'rabbitmqctl' in our PATH
+    environment.systemPackages = [ cfg.package ];
+
+    services.epmd.enable = true;
 
     users.users.rabbitmq = {
       description = "RabbitMQ server user";
@@ -93,44 +137,54 @@ in {
 
     users.groups.rabbitmq.gid = config.ids.gids.rabbitmq;
 
+    services.rabbitmq.configItems = {
+      "listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}";
+    };
+
     systemd.services.rabbitmq = {
       description = "RabbitMQ Server";
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" "epmd.socket" ];
+      wants = [ "network.target" "epmd.socket" ];
 
-      path = [ pkgs.rabbitmq_server pkgs.procps ];
+      path = [ cfg.package pkgs.procps ];
 
       environment = {
         RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
-        RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
-        RABBITMQ_NODE_PORT = toString cfg.port;
         RABBITMQ_LOGS = "-";
-        RABBITMQ_SASL_LOGS = "-";
-        RABBITMQ_PID_FILE = "${cfg.dataDir}/pid";
         SYS_PREFIX = "";
+        RABBITMQ_CONFIG_FILE = config_file;
+        RABBITMQ_PLUGINS_DIR = concatStringsSep ":" cfg.pluginDirs;
         RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
           [ ${concatStringsSep "," cfg.plugins} ].
         '';
-      } //  optionalAttrs (cfg.config != "") { RABBITMQ_CONFIG_FILE = config_file_wo_suffix; };
+      } //  optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
 
       serviceConfig = {
-        ExecStart = "${pkgs.rabbitmq_server}/sbin/rabbitmq-server";
-        ExecStop = "${pkgs.rabbitmq_server}/sbin/rabbitmqctl stop";
+        PermissionsStartOnly = true; # preStart must be run as root
+        ExecStart = "${cfg.package}/sbin/rabbitmq-server";
+        ExecStop = "${cfg.package}/sbin/rabbitmqctl shutdown";
         User = "rabbitmq";
         Group = "rabbitmq";
         WorkingDirectory = cfg.dataDir;
+        Type = "notify";
+        NotifyAccess = "all";
+        UMask = "0027";
+        LimitNOFILE = "100000";
+        Restart = "on-failure";
+        RestartSec = "10";
+        TimeoutStartSec = "3600";
       };
 
-      postStart = ''
-        rabbitmqctl wait ${cfg.dataDir}/pid
-      '';
-
       preStart = ''
         ${optionalString (cfg.cookie != "") ''
             echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie
+            chown rabbitmq:rabbitmq ${cfg.dataDir}/.erlang.cookie
             chmod 600 ${cfg.dataDir}/.erlang.cookie
         ''}
+        mkdir -p /var/log/rabbitmq
+        chown rabbitmq:rabbitmq /var/log/rabbitmq
       '';
     };
 

From 1b7397c61daa9df7b2dbd9a76802ecba8f657b08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 02:36:28 -0700
Subject: [PATCH 1740/3253] nspr: 4.19 -> 4.20 (#46227)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
nspr
---
 pkgs/development/libraries/nspr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ce18498ee858..9cb7d701b9da 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.19"; in
+let version = "4.20"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
+    sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
   };
 
   outputs = [ "out" "dev" ];

From 588b524933a7af27808e1e749e258c3795c9b842 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 02:40:32 -0700
Subject: [PATCH 1741/3253] curl: 7.61.0 -> 7.61.1 (#46295)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/curl/versions

From 867d387a1c92dee533f380e5aeca874b3507de4f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Tue, 25 Sep 2018 12:50:51 +0300
Subject: [PATCH 1742/3253] epoxy: 1.5.1 -> 1.5.2 (#47178)

libgl-path.patch was updated (it applied with little fuzz, because I am
a bit lazy, and rebase it on master of epoxy, not 1.5.2)
---
 pkgs/development/libraries/epoxy/default.nix  |  4 +--
 .../libraries/epoxy/libgl-path.patch          | 25 ++++++-------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index cc62b2776ede..7c3dd19a4795 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "anholt";
     repo = "libepoxy";
     rev = "${version}";
-    sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci";
+    sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch
index 6f50b9d262b5..8f38ee27174b 100644
--- a/pkgs/development/libraries/epoxy/libgl-path.patch
+++ b/pkgs/development/libraries/epoxy/libgl-path.patch
@@ -1,20 +1,11 @@
-From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001
-From: Will Dietz <w@wdtz.org>
-Date: Thu, 29 Mar 2018 07:21:02 -0500
-Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined.
-
----
- src/dispatch_common.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
 diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index bc2fb94..776237b 100644
+index b3e4f5f..303e8f5 100644
 --- a/src/dispatch_common.c
 +++ b/src/dispatch_common.c
-@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
-     pthread_mutex_lock(&api.mutex);
-     if (!*handle) {
-         *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
+             flags |= RTLD_NOLOAD;
+ 
+         *handle = dlopen(lib_name, flags);
 +#ifdef LIBGL_PATH
 +        if (!*handle) {
 +          char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1];
@@ -24,12 +15,10 @@ index bc2fb94..776237b 100644
 +            fprintf(stderr, "Error prefixing library pathname\n");
 +            exit(1);
 +          }
-+          *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL);
++          *handle = dlopen(pathbuf, flags);
 +        }
 +#endif
++
          if (!*handle) {
              if (exit_on_fail) {
                  fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
--- 
-2.16.3
-

From 395a1528f0ff7d7a3797aa5d91662007b8e7d6c7 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 11:38:29 +0200
Subject: [PATCH 1743/3253] gtk-sharp-3_0: mark broken

build has failed since 2018-04-28
no maintainer
---
 pkgs/development/libraries/gtk-sharp/3.0.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix
index 3a473d6303ad..f8f1f20cc2fd 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation {
 
   meta = {
     platforms = stdenv.lib.platforms.linux;
+    broken = true; # 2018-09-21, build has failed since 2018-04-28
   };
 }

From 6b4abb9fa74368fb0760f59ab9c70c9e1657f0ed Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 11:42:59 +0200
Subject: [PATCH 1744/3253] monodevelop: mark broken

build has failed since 2018-03-08
cc maintainer @obadz
---
 pkgs/applications/editors/monodevelop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 69e102f20775..cccfddfe7937 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -76,5 +76,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     maintainers = with maintainers; [ obadz ];
+    broken = true; # 2018-09-21, build has failed since 2018-03-08
   };
 }

From 9beaa6dcadf69949e646f0def3fc2410d8b50597 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 21 Sep 2018 18:54:38 +0200
Subject: [PATCH 1745/3253] herqq: mark broken

- build fails with qt511 and qt59
  (it used to build with qt510 which is not available anymore)
- no nixpkgs maintainer
- upstream repo looks inactive, last commit a year ago
---
 pkgs/development/libraries/herqq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 75dd8693d2cf..a5f8f00a6bfd 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     description = "A software library for building UPnP devices and control points";
     platforms = platforms.linux;
     maintainers = [ ];
+    broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
   };
 }

From a729229d19445750a313e82a74f79845041786b4 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 10:43:44 +0000
Subject: [PATCH 1746/3253] mumble: build with -std=c++11

It fails to build with its default -std=c++98 with protobuf 3.6.
---
 pkgs/applications/networking/mumble/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 8f1960b58cd8..cda02fedfb69 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -27,6 +27,7 @@ let
       ++ (overrides.buildInputs or [ ]);
 
     qmakeFlags = [
+      "CONFIG+=c++11"
       "CONFIG+=shared"
       "CONFIG+=no-g15"
       "CONFIG+=packaged"

From b0d2aa447773c2c5e40e4dde2d11c611287b091c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 11:33:20 +0000
Subject: [PATCH 1747/3253] bitcoin-classic: enable parallel building

---
 pkgs/applications/altcoins/bitcoin-classic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 34faf77e980d..ad48ea2a6257 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt5" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Peer-to-peer electronic cash system (Classic client)";
     longDescription= ''

From 66b6bf5e0bf459800ca33427a59d132f7da08605 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 25 Sep 2018 13:39:38 +0200
Subject: [PATCH 1748/3253] virglrenderer: 0.6.0 -> 0.7.0 (#47150)

---
 pkgs/development/libraries/virglrenderer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 2cd3b5a20c0c..4473100a9f20 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "virglrenderer-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
-    sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a";
+    sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
   };
 
   buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ];

From 3083cf6326ec01fff23cae0cd6e84ce6ac3cc2be Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 11:39:59 +0000
Subject: [PATCH 1749/3253] qradiolink: enable parallel building

---
 pkgs/applications/misc/qradiolink/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix
index 4029bd80b88b..63906d996ba6 100644
--- a/pkgs/applications/misc/qradiolink/default.nix
+++ b/pkgs/applications/misc/qradiolink/default.nix
@@ -47,6 +47,8 @@ in stdenv.mkDerivation {
     qwt
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "SDR transceiver application for analog and digital modes";
     homepage = http://qradiolink.org/;

From a46a45a0651cfc59652caa96cd5d289a32433508 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 11:53:18 +0000
Subject: [PATCH 1750/3253] syslogng: enable parallel building

---
 pkgs/tools/system/syslog-ng/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 4164adcb25bf..5b8a9cd0aee5 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://www.balabit.com/network-security/syslog-ng/;
     description = "Next-generation syslogd with advanced networking and filtering capabilities";

From c200b49c7183e8b9da0c5fd590bac31e215625e8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 12:00:11 +0000
Subject: [PATCH 1751/3253] altcoins.bitcoin-xt: enable parallel building

---
 pkgs/applications/altcoins/bitcoin-xt.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index cab1b388a126..499bc4be4c83 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec{
     "--with-libcurl-headers=${curl.dev}/include"
   ] ++ optionals withGui [ "--with-gui=qt4" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Peer-to-peer electronic cash system (XT client)";
     longDescription= ''

From 3aa413e08cfb9548bf05555a4dd84c0a667d3f85 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 12:08:35 +0000
Subject: [PATCH 1752/3253] altcoins.bitcoin-abc: enable parallel building

---
 pkgs/applications/altcoins/bitcoin-abc.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 1e11f0eefc4b..6d2cbcdf9f9b 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt5" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Peer-to-peer electronic cash system (Cash client)";
     longDescription= ''

From 820e1caf8610e6e9a22935ea8e198e0111c3cd00 Mon Sep 17 00:00:00 2001
From: tobiasBora <tobias.bora@gmail.com>
Date: Tue, 25 Sep 2018 14:28:14 +0200
Subject: [PATCH 1753/3253] signal-desktop: enable notifications

---
 .../networking/instant-messengers/signal-desktop/default.nix   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 8bacf73a80f1..02166e237724 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -2,7 +2,7 @@
 , gnome2, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
 , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
-, cups, expat, udev
+, cups, expat, udev, libnotify
 # Unfortunately this also overwrites the UI language (not just the spell
 # checking language!):
 , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -35,6 +35,7 @@ let
     gnome2.GConf
     gtk3
     pango
+    libnotify
     libX11
     libXScrnSaver
     libXcomposite

From b97ebadd02df4932cbbffd06c443ee569ce01798 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 13:10:18 +0000
Subject: [PATCH 1754/3253] altcoins.litecoin: enable parallel building

---
 pkgs/applications/altcoins/litecoin.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index ed268e34946f..cf84be6d7aa6 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm";
     longDescription= ''

From 114a0a8391e317cad8b0f9bd1ca07a97725d895b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 06:33:07 -0700
Subject: [PATCH 1755/3253] apt-cacher-ng: 3.1 -> 3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apt-cacher-ng/versions
---
 pkgs/servers/http/apt-cacher-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 415b1fb48a2a..aa826a9c528b 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "0p8cdig70vz1dgw2v8brjin5wqrk8amncphyf11f53bza5grlc91";
+    sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0";
   };
 
   nativeBuildInputs = [ cmake doxygen pkgconfig ];

From 67c5133f603ac9f1864d3cea5f6402b402d51eea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 06:48:02 -0700
Subject: [PATCH 1756/3253] cadvisor: 0.30.2 -> 0.31.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cadvisor/versions
---
 pkgs/servers/monitoring/cadvisor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index bab3faa79695..dd56bc89c0d0 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cadvisor-${version}";
-  version = "0.30.2";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "143jsm0pbfhsa2iwkg5zanl9qxbpmsdvay5djyac4rvgl53m0wy9";
+    sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m";
   };
 
   nativeBuildInputs = [ go ];

From d98b0805ccbfec487665ef6f8e504e31b1f17c09 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 25 Sep 2018 08:56:50 -0500
Subject: [PATCH 1757/3253] linux_testing_bcachefs: 4.18.2018.08.31 ->
 4.18.2018.09.21

---
 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index 6e3a7614a56b..f58ab5c95cc4 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18.2018.08.31";
+  version = "4.18.2018.09.21";
   modDirVersion = "4.18.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "9c08efd02b827e6ee2a6e5a751045c6c6bd484d4";
-    sha256 = "0xnkg0fpilmwckyb1drspggv3ibx8vkqic9ai53d5vx2rrnvvafw";
+    rev = "2fe17e38d355271a8212a8123a9281e2f9df811f";
+    sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6";
   };
 
   extraConfig = "BCACHEFS_FS m";

From dbbddb9f081df2a30e794d2e0577e6f98a957f60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:06:15 -0700
Subject: [PATCH 1758/3253] ace: 6.5.1 -> 6.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ace/versions
---
 pkgs/development/libraries/ace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index a1741513642f..560ccb768b1e 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.5.1";
+  version = "6.5.2";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y";
+    sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh";
   };
 
   enableParallelBuilding = true;

From 83d69dc43b43fac98f72e97d060bf2ac9a294ce0 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 25 Sep 2018 09:07:17 -0500
Subject: [PATCH 1759/3253] easyjson: 2018-07-30 -> 2018-08-23

---
 pkgs/development/tools/easyjson/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
index 3ae172213639..ed650f37698a 100644
--- a/pkgs/development/tools/easyjson/default.nix
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "easyjson-unstable-${version}";
-  version = "2018-07-30";
+  version = "2018-08-23";
   goPackagePath = "github.com/mailru/easyjson";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "mailru";
     repo = "easyjson";
-    rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
-    sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
+    rev = "60711f1a8329503b04e1c88535f419d0bb440bff";
+    sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
   };
 
   enableParallelBuilding = true;

From a8df654709b929483c1b96ae170b11de80e490c0 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 25 Sep 2018 09:09:40 -0500
Subject: [PATCH 1760/3253] quicktemplate: 2018-04-30 -> 2018-09-06

---
 pkgs/development/tools/quicktemplate/default.nix | 6 +++---
 pkgs/development/tools/quicktemplate/deps.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
index e66500ac8339..147883afd428 100644
--- a/pkgs/development/tools/quicktemplate/default.nix
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "quicktemplate-unstable-${version}";
-  version = "2018-04-30";
+  version = "2018-09-06";
   goPackagePath = "github.com/valyala/quicktemplate";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "valyala";
     repo = "quicktemplate";
-    rev = "a91e0946457b6583004fbfc159339b8171423aed";
-    sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+    rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be";
+    sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix
index 11a65c415c69..6064f7646818 100644
--- a/pkgs/development/tools/quicktemplate/deps.nix
+++ b/pkgs/development/tools/quicktemplate/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/bytebufferpool";
-      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
-      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+      rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf";
+      sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag";
     };
   }
 ]

From d1c1fbb61ba49d4ba590287743fc92a66276ad54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:16:15 -0700
Subject: [PATCH 1761/3253] bind: 9.12.2 -> 9.12.2-P2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bind/versions
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 53c8411a22c3..10236ee55e8c 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -8,14 +8,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.2"; in
+let version = "9.12.2-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0ll46igs9xfq2qclc5wzqsnj3zv7ssga0544gm24s1m7765lqslz";
+    sha256 = "0gk9vwqlbdmn10m21f2awvmiccfbadvcwi8zsgm91awbx4k7h0l7";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From d13b64cff86d499c6705678a1847939984247fb3 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 25 Sep 2018 09:18:38 -0500
Subject: [PATCH 1762/3253] hydron: 2018-08-18 -> 2018-09-25

---
 pkgs/servers/hydron/default.nix |  6 ++---
 pkgs/servers/hydron/deps.nix    | 41 +++++++++++++--------------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 03fdf7908cc4..012b66e19809 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -3,15 +3,15 @@
 
 buildGoPackage rec {
   name = "hydron-unstable-${version}";
-  version = "2018-08-18";
+  version = "2018-09-25";
   goPackagePath = "github.com/bakape/hydron";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "bakape";
     repo = "hydron";
-    rev = "78257f1c1f34cdad1931531601163071f7f29aa9";
-    sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0";
+    rev = "ad88ec03e5c7a527fddebb6b54909f50ecaae00c";
+    sha256 = "074bzl38f4y4xs4vavbn7mgi4srv1fbzkcx4p17mrqipzk6ffbca";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
index c5d584f1bcd3..b2c367cf42d6 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/pkgs/servers/hydron/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Masterminds/squirrel";
-      rev = "8a7e65843414bc07f3d85bebaa10d7cc96253c29";
-      sha256 = "0n7msdji0h7iysyqsi0iiq9i1hdgyyz9cwzxpc6qppz7cllnfpnn";
+      rev = "3b6e9e96624526bce05b577b76ca726a20bb3c83";
+      sha256 = "16jw3af3lyb5x9yn7anx0rb3mz70bivnixkvh8dzrq16wkkn760h";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dimfeld/httptreemux";
-      rev = "7f532489e7739b3d49df5c602bf63549881fe753";
-      sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
+      rev = "a53c8f73d4b7d82c30b7e5ab6aa155b981c42fb5";
+      sha256 = "08s90ggydcwz2683bbsrc33h2b7x2q5ws104gva838b573xzrhqj";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/handlers";
-      rev = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce";
-      sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm";
+      rev = "7e0369fae54b097612a946bc6709f3a3fbccb3de";
+      sha256 = "00i2is2z7101igf7sr8prmd8m59x7k7xdkhm5h4bjs37k157zm38";
     };
   }
   {
@@ -59,17 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
-      sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
-    };
-  }
-  {
-    goPackagePath = "github.com/mailru/easyjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev = "03f2033d19d5860aef995fe360ac7d395cd8ce65";
-      sha256 = "0r62ym6m1ijby7nwplq0gdnhak8in63njyisrwhr3xpx9vkira97";
+      rev = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79";
+      sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
     };
   }
   {
@@ -77,8 +68,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-sqlite3";
-      rev = "b3511bfdd742af558b54eb6160aca9446d762a19";
-      sha256 = "1v41is0h05p4jgv8nal3l8lcdcggylsyblq0ihycnprkdzwls808";
+      rev = "e85a2792f3166972d6619b7051f01a2df254192a";
+      sha256 = "088bckqifg61xdda0f0hrcyzm3dslr3jzcsgdyk8ccjmjv2112sd";
     };
   }
   {
@@ -86,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/bytebufferpool";
-      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
-      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+      rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf";
+      sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag";
     };
   }
   {
@@ -95,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/valyala/quicktemplate";
-      rev = "a91e0946457b6583004fbfc159339b8171423aed";
-      sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+      rev = "dc50ff9977a68a543145ce34e0e0030bebcc89be";
+      sha256 = "1980q2c5w4jhrlhf1pimc8yrkz005x3jbsi7hk4hnx6d5iy5lmb6";
     };
   }
   {
@@ -104,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "aaf60122140d3fcf75376d319f0554393160eb50";
-      sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv";
+      rev = "f04abc6bdfa7a0171a8a0c9fd2ada9391044d056";
+      sha256 = "0mygvmprcssixj3bm2djl3xzdnyh4zqhkwhynzml5rha8mvrxknd";
     };
   }
 ]

From 1e67ff3f05547655291a79e3262309a7b38e1543 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@icloud.com>
Date: Tue, 25 Sep 2018 16:18:53 +0200
Subject: [PATCH 1763/3253] gildas: 20180801_a -> 20180901_a (#46159)

* gildas: 20180801_a -> 20180801_b

  - Update gildas
  - Remove a patch that has been applied upstream

* gildas: 20180801_b -> 20180901_a
---
 .../science/astronomy/gildas/default.nix            |  8 ++++----
 .../astronomy/gildas/return-error-code.patch        | 13 -------------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/science/astronomy/gildas/return-error-code.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 82575d9c6ff0..4de4752aefc1 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "aug18a";
-  version = "20180801_a";
+  srcVersion = "sep18a";
+  version = "20180901_a";
   name = "gildas-${version}";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     # source code of the previous release to a different directory
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
-    sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
+    sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956";
   };
 
   enableParallelBuilding = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
 
-  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
+  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
diff --git a/pkgs/applications/science/astronomy/gildas/return-error-code.patch b/pkgs/applications/science/astronomy/gildas/return-error-code.patch
deleted file mode 100644
index f0bd7da9354e..000000000000
--- a/pkgs/applications/science/astronomy/gildas/return-error-code.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --new-file -r -u gildas-src-dec17a.orig/admin/gildas-env.sh gildas-src-dec17a/admin/gildas-env.sh
---- gildas-src-dec17a.orig/admin/gildas-env.sh	2017-10-24 11:39:18.000000000 +0200
-+++ gildas-src-dec17a/admin/gildas-env.sh	2017-12-01 11:17:32.051953670 +0100
-@@ -1010,6 +1010,9 @@
-     gagenv_message "$gagenv_errors error(s) and $gagenv_warnings warning(s) detected"
-     if [ $gagenv_errors -ne 0 ]; then
-         gagenv_message "GILDAS will not compile"
-+	gagenv_clean
-+        echo
-+        \return 1
-     elif [ $gagenv_warnings -ne 0 ]; then
-         gagenv_message "GILDAS will compile with some optional features disabled"
-     else

From b4323269f57ba5b92d478b72bf7776115ba1437f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 07:40:30 -0500
Subject: [PATCH 1764/3253] cairo: 1.15.12 -> 1.15.14

---
 pkgs/development/libraries/cairo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index db46412ceb55..7c0664533b8f 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -10,14 +10,14 @@
 assert glSupport -> libGL != null;
 
 let
-  version = "1.15.12";
+  version = "1.15.14";
   inherit (stdenv.lib) optional optionals;
 in stdenv.mkDerivation rec {
   name = "cairo-${version}";
 
   src = fetchurl {
     url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
-    sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn";
+    sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From ad3af8a7064a752b830f3f0241e02d1c70512731 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:22:19 -0700
Subject: [PATCH 1765/3253] bibutils: 6.6 -> 6.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bibutils/versions
---
 pkgs/tools/misc/bibutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index d0434ebe28b4..d7cca2a77bdc 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
-  version = "6.6";
+  version = "6.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
-    sha256 = "1zqwhjsngnflzdp2nd3762bvmkjq5mal417fly1n2xfgdqpg37ps";
+    sha256 = "072cmhv692nk1lfcwmaqid5gpg8q4jc4vai5ss8lj72zms32p882";
   };
 
   configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];

From 524c2120f92581791fea8bc98e1ea6e745b4db52 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:25:14 -0700
Subject: [PATCH 1766/3253] apacheHttpd: 2.4.34 -> 2.4.35

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apache-httpd/versions
---
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index d7f7660bf61f..c7bb6cfb6cdc 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.34";
+  version = "2.4.35";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "1w1q2smdgf6ln0x741lk5pv5r0gzrxj2iza1vslhifzy65bcjlzs";
+    sha256 = "0mlvwsm7hmpc7db6lfc2nx3v4cll3qljjxhjhgsw6aniskywc1r6";
   };
 
   # FIXME: -dev depends on -doc

From 55d43d4e02da36017de741c1e6ecf70bb7caff24 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Tue, 25 Sep 2018 09:26:57 -0500
Subject: [PATCH 1767/3253] dolphinEmuMaster: 2018-08-17 -> 2018-09-24

---
 pkgs/misc/emulators/dolphin-emu/master.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 05b75312646d..8717d9355d2b 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "dolphin-emu-${version}";
-  version = "2018-08-17";
+  version = "2018-09-24";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "12a5fd80bde3c1f5557ea647ebb127d37e74040d";
-    sha256 = "0sk3jn5sm9fabs5bvwy75zw2szrb19qqwns2ypzqpgd4d5zjrs4x";
+    rev = "97b1a9bb2a0c29f0f68963483156d5285e1fb1d5";
+    sha256 = "0dwc4l7a7r1f65gh1rhxa854xsknrgp62rr3a0y67lk3xf5y38d7";
   };
 
   enableParallelBuilding = true;

From 6060940c24da057225b214164078b0b70e205ff7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 25 Sep 2018 15:36:21 +0100
Subject: [PATCH 1768/3253] firefox-bin: fix channel patching

The patchPhase wasn't being applied at all.

This patch re-enables that and also re-thinks the setting that we want
to have. Turning off the auto-update is more accurate and doesn't lose
information like it did before.
---
 .../networking/browsers/firefox-bin/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 7e92df163afc..91aee7b1e8a5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
 
   src = fetchurl { inherit (source) url sha512; };
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
 
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
@@ -142,8 +142,8 @@ stdenv.mkDerivation {
   dontPatchELF = true;
 
   patchPhase = ''
-    sed -i -e '/^pref("app.update.channel",/d' defaults/pref/channel-prefs.js
-    echo 'pref("app.update.channel", "non-existing-channel")' >> defaults/pref/channel-prefs.js
+    # Don't download updates from Mozilla directly
+    echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
   '';
 
   installPhase =

From f417ae00077c33a52dba97612457c207f3f7357e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:51:52 -0700
Subject: [PATCH 1769/3253] alembic: 1.7.8 -> 1.7.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/alembic/versions
---
 pkgs/development/libraries/alembic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 015c48d01411..7dd0fcb55905 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   name = "alembic-${version}";
-  version = "1.7.8";
+  version = "1.7.9";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = "${version}";
-    sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c";
+    sha256 = "0xyclln1m4079akr31vib242912004lln678prda0qwmwvsdrf7z";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From 0aa034480433a4f49e1b14fb2ca94d5a5e042c10 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 25 Sep 2018 20:38:08 +0800
Subject: [PATCH 1770/3253] firefox-devedition-bin: 63.0b6 -> 63.0b9

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 07ad3cb610db..d175c02ff800 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b6";
+  version = "63.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ach/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "4603e03f097e91bb205658cda8a4093f80a808748b9e935a19fa4ce5dffa1e88c4045ff661dda4fcdd21cc04c3ed15b8bfd2540ca98cf0331dae5854a262f347";
+      sha512 = "8b5a6d1e9abea221f134804ddc9bea5e8500e51338487cd004bd1d39b67102491e5d5b18c9737847461dfb8f711e5fc7345c013c057eee478ec1d7f1be71fd4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/af/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "393bba693aab5de8996e085bce9aca41474d0f5f3a5d2963467c3c994826f20949286a5a10f4563279ef5e340836d30fb8ad8e667b2b211b5af6160eb749fe6d";
+      sha512 = "64d5927caf64b39bfc9bef4b5d9cccff4a19abbee6447580eff5d66c0af331bd6076f9cd4d6c8cb8aa6e25dea7623e2ed0ef18501b044240dab5c1c9ffc71b6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/an/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "bf814725809aeadfff9260c2e1b90989532d90fa96cee0f7c36d525122bd234ba3e41deb1e5473476e240d2473e558b2be07319cede32046c24858556a51c103";
+      sha512 = "fe4042a34cc3704dabf4de8cc373949cbda705a9aeee28a908fb406972d3746cdf8b10f92b8a8f61bf491f7d662afc64aab207a826d672dc06d57f04592a8e08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ar/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7ae25e4ce8dd67c700c0998a052b547dc6dcf15e47df1def53a519d68c25ca153d0d9086d1cf14e1587df232e6061e28dab3557af270af851280dd3ddf88cb56";
+      sha512 = "585224e0ca25a21ea0a6f20936594da9c914d1d5c6993cfdcaec3a43792fb32f16c6dc6ffc86b02c02101ca39da3d81be0e6abd1c9188d76cfa0f05419573de3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/as/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "6935b28a5049663ec6b677cba03d3a58a39d4f15fc22445b227b5443492f15982959c55e4546d0b61c3a6a660ca532c83511af86395d36423de5b4f2dee18504";
+      sha512 = "cc794031e63fc76438b6e995fe1b093ce0e010683bba68ac0f73c0eaea7d61e67cfc400621b57389e10330d750e244e6ab4b9b88006821b2fd513d1baaf72304";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ast/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9674c4b37eddbde604748250dacef46309f7784bc28497e85baa79906297e50a8dbb7d96e7526efd999f0a10a2812cd6aa8b08bcc5fa8dc88442fb397203a13f";
+      sha512 = "189a5f4fa12838d33adf29fbfe7d96e87de7a54fe3ea7078b2af124158d99457d2c83c1b490adb9608a0e3d42f2f721a1597c80dedf3d342c4f3ce176c93865e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/az/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "3f6507f10fc5787f596c40e2220fcaca4c85736ef87567ee049768f2d1d687784b6f8841515829b83d70da9526410b1850286cb562b98da02de14059f0d76c8b";
+      sha512 = "a7dfa9984917ea02eb61cd800033e8c090d630bf49eae1c1ce9419e2c424717f4203bf9bdae59f88144fb098d20673178528a5fa7f9d343ab4b95f9fc6490d19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/be/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "1f1b2f678251b22670e5618b28f3bb1afe6e1cc8b2ef5b80c98a37e47f376fdd529b3acfade88d8e22ba00210488326ce5d2df75fed824023794688e9eb9a5f6";
+      sha512 = "79af6add5a203cc4815fd615ede035ba5b15c1cef22d69b5dc81d7874c6ebee5560e6b442a3e626aa72dcee5ce2b5bee90e31a3b2c0223b1d4cf43848d35d822";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bg/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "640fe4d6d29bc9b2e8b04e327bd0046c3a650061f66cad26979ed517fcf07a315a4f9424c4899ae5c64635426d7badd0e3b132251d20610efb29673a4d663a00";
+      sha512 = "7f2b152d342a3d864f18088a6ff6e09f54887c50251c47acea2a98e019cf7cc6308085ce3a2f9fe3f6533ed1593ec8a13d8d07e0e94ef870c60ea726bd0a411c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bn-BD/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "96e8f65b3d1a3b97f0ba874afd8b7e29779ea580abf94534b88a6c303be57cc173cdf3a7b73d75a0517f532ebb881637f0afd64896e0f4c1a5b2fe10dfe6f73a";
+      sha512 = "a5b2f54c57122f81ab5477f6e74140fbf4eecd58837cb14550a6dd48c586f37ae584bdc3ebd3c508986bf966f5a0c1b3e5510040f24a9a6caa43f28b1357f649";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bn-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "96f35f652892fd2e2dc0ee160867f77862f9e706917a4cbaecf19953ddddd048177eb1dca5f004808cd55bf63a9b87a588d6986fd72b2c7c4d150334ded65365";
+      sha512 = "361fd5ff3e5c8572537cf5bfb875e80c12f2ce6de46ff5fd20863d00f550341f58532e1f7e918958ea6754cc1bf8f174e61d1a0bb819603cebefa44185e010cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/br/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "20c0137102bac235e6ba7817ed6c55546e1299af50f54d1b5a9ebd9d556165466242b0cd586ef7e03208de130eba7e2cd2582d8fef4d4593fb823c009b913900";
+      sha512 = "a70cd83ac27d2bb1cb01f5fe2a897f7f626954725d04974adad6fed90ca9aab70484a0920af465293c859b48fa6ed1fcc8723c166fee9e2faede4b8b6b5ce006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/bs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7e6e5d09824ca7f05d03df2a26e97d6a52a48a4a604b28200b2b2ec81b844cfc90cdabe394e28e2b9bfa2a15d456091b72239b96f59c475ed0fd6f9fd83de310";
+      sha512 = "c394fd9da07c12e060bcc91ac79f2cb5fd43fab74ffed738f9c5afc3d2c22069d54c38331ea97c944c0d20d884295560016cd094b413e8f3156c6cc548b18d19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ca/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d22440b08e636da6406ad0e047faa3a5c5fb43fd7dd1164df88bb27a950d9b00eca16b1f8cc6d17efc432c9063ada8cb9b82d14c02702d08ff364afce3ba3626";
+      sha512 = "5c93688a59b84c324d2ce846d9d235bbf4ae56a2dcdcf6437207bded60311e7b7d0ba6a207cd6089a7f6afb6bf1dadc58ac72454e6831b50bcc0a1fc0f9713b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cak/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "167d1e9f3015c53aea5a73ecfafb73524e0f61caa31ceaf98043dc173c14000f61b9ec47394473d7b1c5ef346b5d1fab29a2471e9b67f97819b99be5cf79acfc";
+      sha512 = "67ce43c2a19448d08eccad1c0788c73a7de6cbd81fe41a171177d8110886e4cc3e43418b1f4a07cc4c9073fc04c24c9215fa6216ebe91d620e313d23aa9f67b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9083a7511cda652a3225ea60355d533fbc9b3fb48c0b4f21bca6e4563a49725ffdb7a9cb3a2e139dc71cbbb6bfe39ca887cc093a89529986dd84973a943008e0";
+      sha512 = "50c02eb32459c8cd394a12c23f81295c75d5ffa2e62ce501bcb75b06b60b3d23c16a392d3c965222ff9eb7e50d41ce03cc32cf3d54c42086b092e25cc4a11648";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/cy/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "1462403ac468504d8f1c83263b8b1ad83dd1cab51a8ee10eeee34e15beb5da6339588189a24c430c96b857fa9eace2c6295343074af4c32f5da7a6f25d72d66b";
+      sha512 = "c2e65a560da8011a50f7694adef788dddeaa68a5d7262c1da0456b22e2fa7229991c1f06ae737f7b9d85e0dfb954c7330796398bf0103f162beedec9b2383f04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/da/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "41d3a59a0e4720cb83b08c657e79ae77f0bb4cf2c0282730fa92455e1bea2a95bd99942d00e3e0a13b7d9513e3b7ec323a07b181bd7168128c8b45acc605593f";
+      sha512 = "262a796bdb63a4fdad4bbc79395781d660dec3f24606f8ea715a1d97d8e62d01536538529c79e6a70316319e967c4537b81a1b4b597e5981ecdf7895cfe06b1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/de/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "ca22c469e9f4a8603280b59623b5f2ab973e93a5a64725f0487432866b454274755435062128548de93c529919defdc256e4a50ba768cfeec6c0a93d2257c917";
+      sha512 = "d26a474d464338b472899726fe41ba53c1e00dd3879ea8afca9814b4ee8268a518be3820c54ad8c358c8e2ff62b164f7665087bc9776237858f1edd5c22a4d16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/dsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "dfb83b2b59c9bf99a6cbcf9698e7a253da54808407fc78deb3f7891003d4424a3b780102f483569188fcfa8a97781efb44f29e93e4292717a35d8f07a1609bad";
+      sha512 = "3d228820f0bc1e61f4de3d99cae0b0b52174e88effbf8ea36250c30e9baec63cc716478ce775f5e4ce3adc35913dbb2942c0a67da2d1082adcaaf514815ab49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/el/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c464fed5e7af2156228d1047594df46caac6d3762542ab6b2a159b9eeccd8159161b682066a462724060d4fa81bb1f1af84fc5b7b8d1313af470b1ec026bd75e";
+      sha512 = "77eac6e37f285250efe9e5ea53b0666eb52886b4a877c4fc40be0aeba6492a5b54e8311ebf305237c57dc5c838ba5181de5cb593c338eff8132e73dcd4459927";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-CA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "b8f8ee783efe498e2697e91b42ccbe6fbe835af20eaf847c317d8f24adfadfba1c6c3aecbc3c1911dc3bee90722a90d1908e9ad6a7eff050635ea2c79f9ac417";
+      sha512 = "7a0bc375c742ac0c45f95f3f25d7fc84b3ee9fe6895fb5b3d4462fbbcf421191f50e096637e73e71d25718cf5772e9c1966ce15639c3b2bc1adc9227506723ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-GB/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "bf84aa9e3ec47623f5317f9b0ddf54341984236ad90e26ce0b76196806d240b54a3f833b5e06bb96b1678ca03e7ba63beb7b6a9fad9177f8034bdee124d60c56";
+      sha512 = "7d37c2a3b66c5bae98ee09b81f262bc8aedbde5d6d700abf6dbae232785774daae661fa7c1933e2c6408d0ea95c09153e0cc45efa02468794f03e81079b504b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-US/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "357b352ba14c04b4f5fab1d5c165217270d213fe31629624d6ffdc7511fc7af9d6de1a9b4fc4bbd6513c0e735fc21bdd7d49f7a323680533be491c530431e1ce";
+      sha512 = "88a144836494b18ee1f46024771e15cbe778b5630ab884aeafbaf7e59d5df6ff915c71f13f449faa3e56aab46a61bf5d56b354d36f5d378ee51bf34f4565c04c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/en-ZA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "547554a1db5833aaf4a0a76ae59e3a81832f7860275456b435fe4db5fbd4ad40b79d333aa44359beda89a81d415b5bd9bfad01842388fb33a6db59dc5177a863";
+      sha512 = "4f7f4d020559323e9ac1db113418c418a35c5fa8739b75cbb510d55122bc96b0c7492a79ea2862149f34019d95839733883d5516bb399a3d3e623b96d606db69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/eo/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e8dd5060538a9cb1db67bb6bb519ea271d927566f3470f32bb0e7b9a3d8a53054f9d9615d7b82b958556448d041f5fc84ba9017522568a6afb13b74799f1eb9f";
+      sha512 = "ded60b65f9ee8d21ac8d88723a6114c9ffae6b5e632c27f6d03c50deb054b178a576dde5379b5406366a938fa8285c7e34a71d48e3357e2439a22cc8476bb6f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-AR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "56ca35eb5d694b7593047d2fdd8d35851f997ccb372a030b7b0a953f93491209045f0f31a76de5ae56ad891c64df415075aa4f6880ad884aabac02cc8f77724e";
+      sha512 = "c0963472026a9467c057f772835727d8f8b7aba52c09a73d4017943332455a98642c1732bb0f762ccb771fed9d956525fe761f85861d007950921ba8df73f2ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-CL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "bd7f4004ba4247f3e22efea4fea58eadc4bb4fb5c613b51445eaaf835f5d9fdbe837a997691ef5a9d60c3a7b86a6ac8607137edb239a11a63850983d1d4aed6f";
+      sha512 = "4a5acfa9427e86835b1a1faac10dbdb19f1e80dc797dad3235513addd58a6a0a348a20310fddf20791a2a2758543c4aed18fa1802423b506f5cffc72d65d534d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-ES/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "d58aba547347a48c2d64b1603f95cb4e29c42db9b1a97f97f812989e3241d77a1293e3fe8101401a42e84d20e2a28328b2a531577883f6b5abe52c41ac976d69";
+      sha512 = "484c2e083135215b2266f5731f308c5f3adf57d1b065654eef2f36a83e37367c8190ce906cd0fb96f3e34a0f712953d4c0d3531056cd5f213aa92b20fcc8182a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/es-MX/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "26b06e540e55ae4ebee0216ec1ca760e096261d7b53993a7b53637ace8dff879bcb4e24de2aa128fd3a87df4ab0a7c167786d32b5bff5be63d8e4cb45cc9192f";
+      sha512 = "300d9d5419fcd2aadf7122180408d85130e1289456a81e623bea3160a1c98205d750c7dec639ca8c731a548042852c9411b9c1e344477dd7297678c34f6f7981";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/et/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "60f3fe4db3e939c0d876dd339be8c66d150bba594b7d9f008885658dd947ad772a71226ca36af6b3113b38a76214e0f5b5006a1568f750927240c4f063456a9b";
+      sha512 = "9b9e58975178d0a8770d29ab9e205cfc6200a70e423afc4ed6b3c5bf93e25ae39a1ffcec62f468a2ca99e6ffe75434963c0ec39f52c385f746bcaa4e7fe5f98c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/eu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "7fa7900eb5c0bdc96106a25ad8aef512939ec367323218059b3f2168fd6ebd9edb7a831129c4b328bddfcf724d9cc98e3c26aa752c526eb1d9f5c3d5226d4852";
+      sha512 = "5114575659341ee38dc5ee5685338d8b1f1f09d97b3fe7ef9cf79574ea61078b399756d289e444eb03d00f1df6e053fc9f927d3eb249f24985facf863bc8901c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fa/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "5e664c060c95e0af391da9f7ac3f301428c89fd7fbd11df4726e65d61727ef7722d853faeddc696932b216e4aabb7e47f4025e6e283877fc83652bb3a44444b3";
+      sha512 = "30c901a0a9b4093af3f143641a15ddfdb79bfe41c1c85a2c797426a6c0de4af359aabf7ec1a5a9498dd6228b60dd0dafb18f8237e87623b978e724fb60c1976a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ff/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "1db89fe0eb24de211a346b0697c71c12fc154eebfb9554f9887c5201636e5e2e163f17a4faa4147a05ca4c80d08b4ec9029c08da1e2e9468af3b98b8dfc498d2";
+      sha512 = "c29ae3741e16f88e23c113167b6e32ced9256b3ff219e9125a251d810d1355049931b94e28e12ff7377837899720443cf1f26eb887d17d12418b755c850d7ffb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "66655c37dafec3d94ae3abea07fbbd98af2b6ece74c7e965ca1e57792d9a9232e3567850f96df2db359ecbb7a5957b5f7c6bdb1c20637fb6679ba3cc75c77dc8";
+      sha512 = "37231275a2ff967da020f2f2549437be552e9d12f3919bb7999c97641d723daba4744a5ecd6240f246028fa4e9d708169152e96578bd76882656f9d8d3aa133b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b9f1396950332cd518f3523ae999a7ccc49d4e72eb8aa64a62762c0c2dce4794caaedbf80adf78bda35b23eb9a3d925530302ae7f4fd231519e8ca06bc986552";
+      sha512 = "16c41300ef3c70b872c7fbce71c8dda35e6b7a0783be96fe77fa33514f8678cb9cd08e57075513e39ec0ededf64c4502fa3391c55b55f3187ff451fc970ee8dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/fy-NL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "fd9c857552b6271f33dd294b9059c840352e438e190e89e2d2c8ad2f2cefbebd66f13d6af9a87ebfc8b7f4c4d1ed354be8168e3d222aa668204e15ba83a29afe";
+      sha512 = "a3e1453b0f6e4d3a9ea5989489c963bb45c7ae3f476353f77ef572cc98643cb517fcbde08d2b3051fd1bf9265ee34c52aac262d179ec28ee7819b71e3c8b0fa4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ga-IE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "f5b0297e260a68128e40883dd64cb466910f6f020e3475d12250e53401ddd564d8729af0c5e7b4e3bca82c030c73d2669418d566bd9825de610163167489d348";
+      sha512 = "313547aa3d90a90acde80c8a9c093b0c0cf5e12141562075c006432a5fb65839a7a1facf4b150ef9c91d6de787e5b1958db9e3239d392da5bbe467acfc5913a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gd/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "cdebaa167e057d73e23db04762ec71d1ff5d7c12779ef0ed58a8cb72f5f5682cbd4d1a15f14098ce3d375c1ac3109c682324241f0e9aa14df54ebd35c701fe78";
+      sha512 = "c058b18deeec9949667e15e715fe0f71fe37db598f187fb6c5f9e112e06aa1fdc8cd1a16635d719ec107fd399848f5ff90dd2b39dcba15ca98daf3ebc4cc28ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "debc5022c4f6672346c68d7ee240f0b2a9d2fd1ff536e2f95ce2a636c18eb5d9301af8b546291f00dfd1469ec5416e3a81492317b30da81edfc276af2cdd9e62";
+      sha512 = "ba4780796f50b0ebfebb2249d372801837348a59d805ba1f918cdbb941eb0754ebf2f1ee6b04dc95e0fbb765fc70b1c06c65fe5e4f0f03c7c252b0b706d15794";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "c7343c3cd338acbb572927790f143753a051bd30cf7922648470fad8f4184927ce74e98d28b7058a1bc6d1e908bc4569eaeceb7919143a33776ec43a8d69ccc0";
+      sha512 = "56a7ef1f12e2dd65d6b474323ecea3e7e1a2828ea31cdfe91ab2e4457db84d55d207217d9aae927c3d0cc28791511c35bc6f9881825fce6bbae16a91f203559c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/gu-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "2cf0b051a4b0d90f1806852344bf8c7c3bbc70f764594ac58e4d74cf4132591ad4260c38d2387ea2e96274581f83d94d9477ece7ac7473f633aaa2b4bd594376";
+      sha512 = "e0e671642e03dd877763bd27e1a9f4e88df922676558bfb079d992d84752ac017edb6d641c7952120338625510923d684e8eb43e45ca80619ee77d08d974f655";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/he/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "96da735c98945db3e8385c59295dd1ac5a321fb9a56f4d65172423a8d8ea6f1994fbfaed3d06b6569919e9f448a80120e92f4a18c2826ae130419b04a08ecc44";
+      sha512 = "4915c3f2848bb4967a23f8d6fcf4c21527187785c0e4e419770a4949f37901372635503c97a23a8876c76491977ba83cd4d090da09f6cd994b841073f571a84d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hi-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ff306c88e6ad58977cd05d1c197c5ed3c42ee72efb996fd041fddd84160fb67f4c57d9853f5955ee3dcc2013fa35dbd46468abb4e4f925dee814db69060c286c";
+      sha512 = "269d92393fa1d11f55664439f320834dc61134a55be5470130726bb4a58e00c17ed187ec9ae1bb27001c9a5ffd9b17ec7fbedbc4383d9e03b6d9aac77babcfc2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "eac436ddda3f0e3575d013b1acf8faa726ca26b9c5c56577323a0fb16664f9b1467ca8cc5415522e44f5836010a66eac41aa0825075deeca202379dc02d9e4cc";
+      sha512 = "f2b5082db9b8dae90a186bc6fc4f998e047e8b2925bafbc3fc4832f267116e482bdf25f022271d5a849989fdc37915d84d25b71af85427d29d5400c4fed0306f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "bad8c026c9d4fb968cf45dd86dfb2516ed6c6f553601cc2b5f382ca59f18da1bc2c5fa0a8c8b4e597126971f6f362559935128effb902bda1c569c136cace1e3";
+      sha512 = "dc43c58836f25f3df85c0afe6ed4040a18364081d933615823704b0ba2dfff87626cdcdea412eba8d1f09a3897306a52a3b76afc8414c16f66ec1ad3e01c268b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "28fe4720fbb614ea50a9869e40bbeb2e9b704e7cb02d2274b99cbffeb7c51ec6ee0046bfaca4bce8e91535b08fde1b3e616f428eb3b6b46452f1c0dfa0662881";
+      sha512 = "5911ee66aa79fe78d01dca3da65dccffef2eeeeee8c52e1853cd29b097d65c0e552e0b90f6f1691d50ed5a9863857c70ead858f5695c0c76f19262d84e9a2668";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/hy-AM/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "640836659ea3e13791e486b3660d39e47495c003170b567948256cd1b6037afd4dabf630c1a110f0f02d1338798b4de4e653d56f40b171d7357b3fe524589581";
+      sha512 = "b39d418a1fdaaab483d75cfca73a8224a769c266366d48d14e306fc2dda8de1a582cb8a51deb6427dc2c4acf5d411f22247f6bd128b87bc23fa1a43d24eda3a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ia/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "15a71c02f0503e0ea469deb70f95bbbaf90b455d21d73f6d9949b26117ade477d7c5266a558ffe232da36a027cae7d82231cedd36cfdf0677eb4f0d7fe2a9e7e";
+      sha512 = "b1d186c332841942c33265e93c185ba51ceafdb5b22314f06d9ccdf21fc47efdd8d26124f53caa70b4c3f35035259150d39ea426eb5ba38bc2cc51f386ca15f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/id/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8d5d29690cf96c12478f20c3de2448296349db8a5cf34f6b6a418baef61c028eaaddbb7297a9449eaf1749aff4530d4679d2f11fbba73b3726960a57a38364c5";
+      sha512 = "a23bec75f62edd71c9a7c5d329d00763c4f2ef12008e724f7e2b59b0c02a1c913bd0c079c0868190a920619e7b715ce6b91499ccdb02c0f45fd5bbc9d845c10c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/is/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "c48b4e8b5673e424c95f43c83c2a183b8b51b7939dd440b4b3b668280b5ccd774f4f9a9af8468b67f271e47ef8a779f7a269c5e3d99d0445bb93f7009f8fd661";
+      sha512 = "c16c9148f78f9e99c78a82500acea75cfe9ebba0a7e916f4840c9f734fef18184b03805e55556f20201f75d25ce59e8f78b780ccdf922936a26b46f556af5ec6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/it/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "42909bdcba545ced29ed5adbcdeaa1de6ddd16f578ed680f1de88b273fbef6962ab03513451da82a8ade79b2b02b79864261dd3cb2f7261fb063b6c272bc6eb9";
+      sha512 = "731112a159a8fab05733ba9945f06c2d278164ab73a83c09986146993e68caa591ed00e59dfbc6479f284f0aaa6171dfc4c4fde8656b11842483a7501062799a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ja/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "74bbbe80a0fb2a1bbdc96a97554f148cbf5e6751d59c8481dff7d5109bcd9a2294f69365df94bce93870ce795b87ffc9b22ce56c3f9203f3640ef8c2e4c8620b";
+      sha512 = "3a1fa485a9fa134bb8892b410555a4dafe230fa818a14d9befe29c792ce43c1a92e4e1e4ecf33e7acd7861ede11469f5b4b74e465fbfc97943eaed904bf64396";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ka/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "46685c741572fb18c60811349c8f4cde73e753cf9e29998741cbe98700cf854796066bfb12ccbcf6cb1c244f8eb6a197a4751905ca5a58463895e52202834fe0";
+      sha512 = "ae6ddd192ea353b6b1b961976e8591db920b3355ab3c09988fa72d99415855254ba3e687261782d5eb35407a951f625efece356e1648a785963414f38460bf4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kab/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "13825b5c4d275499922423b594949f9af017347c40f90ef5720f0eb05f3463051b95e4cb7c2fa722c83dea2ce14803556e54a5a847808c27364422cfa8aed214";
+      sha512 = "51d989032b7c5fa3f4103f6835dc13560b0bac0b3cc7085edb655f2fff45c45154816ef126fe16599e7ccc20bef1bb198a3f3466fe9b2ac05c178bc3867ef729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ee6bbf940bcf35471f8cb2169d369b5c89a6238e99929ea7a6fb8cd595332ee484b66d9a07dd906954a433aacdd4637a33d2f32db419336b076abb6a3da97c47";
+      sha512 = "38d5bfe52516213f4fd9952e9c458a27223d7d07456e451cee353fd22f5a6cd2f83b48a1911417dc62ed73b9e686d686bc292c3b78a365702498aa81fb6b65d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/km/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "32ee6331f9d6cdea3885dbcaa838436a371b566aa5cae352274a4f8473635a07e9ac81e6792cdb90950bfc35dbeb4400fdd37d651be314b9566244ff3bcdb5de";
+      sha512 = "7abeca23f35464e9fcb88902bbda0eee9ab2b05e3a6e887b92a3383f21f82a45681e0fc5df365096eb340a43f79dcfdab91e2dec3c567cad7d5ee8cf1ab9f82a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/kn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "e5d29cfa9d25a612ebf8536fa9e0c9b5b9c8e4dc59fc18227c4e4855df2444d2cb942319c430e9cd13a1a45110e5c47282e56eccc841bf571b6339aced783f94";
+      sha512 = "10ea3bd4aba05b67916c43c6d28972b31b947843d23c37885869f8df2153ff426b3ecd9df652ba78b8e29f087ab9ecdd65e41e9d21088492e0ca193986508af9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ko/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "2bc1aff09a287c841f62063310466f7e29835c3e6765fc7c8b8718453d7e694e1bd135721b4c65046289676b2a9c444a74465b718d20f00fc1245baea29517ac";
+      sha512 = "7b43a7760e4cd6c8c40af2783dd9428cfaa1e10f05b1db03e843a06dff05043ef36ba4214b758477ea2a2834457ef73538ded0025749e4fec895afd1417437a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lij/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "3c5478929e81359c4d0a144cb3e635c32d1887c5df32d7de5375b28483fe990a9788016e5a533fb2e6bfafa6591c7b8d2572f1f058fe64ad191ad32cb4300267";
+      sha512 = "0718601664e8f656fe052e76b84d69e79d7939adf27dfad98b748b1d9ada0f8de75f8303da756812cf8bd66435f3ec6fe459581fc76b70719ba5ab40538e3454";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lt/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4899788aca01de4a3fe8b661c8b88f7cf03910e26013e50442dfe18e7df217ff2a58fb13462100dbbdd78ed41309be630d2bf301557137497e69e792eb6aeff3";
+      sha512 = "ed823d71d94bfd796c0641a9c1f304e306f40ab3ae8748bd3953565f0017378dad18c27ae5390075aa20227fc69bbc6fdb25853381a97c1552fd8c2097fe561e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/lv/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "450df380b34c68115cd84ec320dccd16288ffdc2f85da9aa5816977f1deaa55f8f411b080ad5af6d81c4318ad648995c170c89321d68557083fb549be558afb1";
+      sha512 = "6fd6e4abdc7d3af659907f427e3c1e05f5e0108a6bfebc64e1ba56fab83dd280a9a94a5f719d96129b72ab569d217ee3e5983822512264a11ea99e409e0b07ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mai/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "92c8d221f5513790ed012668858067a5b0921f0a8f0e16a8348411e0fdb3314695c27afae9691828f3e6b88ab4ca69e8ec9555ebca608b4ecb19522d3c032cb0";
+      sha512 = "8fbe293fc29acc1633f47667e2ec2aa4c9d17cbbdac8d7a5fe727c586a65818f7a9fe091c8ebe17515aa008a2848b82152ca49abdc5de6a5ecff2d0415e9b74c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "98bc349a8724c912160e0fa45466da5369bd47ccdaad726d5a9bfbfa00d8ef5fb532ba52b9b2c3cd3b7060fc1fc2feec822f74fb46da852807ff34e9bc535cfa";
+      sha512 = "b0bd1aa305c38c493bf41daa6f385f87d2b8bea73fbdc2f20a6c84c5f1a90bc7cab464bad659a06eca87806acbae9fc702ae91c61e91519c8b7dd0b584ab792d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ml/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "4bc7dc9e9c0e1163a8519972269e30e850beb9492799be70a519e3b21d1138ac0828d50294e27b9fe777fa3372b7af295d63d015fbc867dffc70bc3550aaa390";
+      sha512 = "cc43c32c3af0e6db3d4dfb2919b6de8bb1aecbab1566ad8cd9b5bf5df1b31e3307fd8cc2994f2496cea56f2c6f1089615ce963d1c81436d4a8b1392a9fed5026";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/mr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "164d58072c851af9bb5fe107ecc6a9409f6db68e41eb92277a62297dca233b6c830b1dddd5d3dfa4783f360f1a2b58cf9f6978e302d5b09b0e48beb66c5c0e47";
+      sha512 = "dac2e8593b629b9821b3003e5005df1a4b1dfd5b5b806fbeec9b1293b8371d2adb4df0c87c1d895f084d679d7492f64d11e80f44cc22e436a10ffbc2cc4cac22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ms/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "fa6148018366d6e0807848d2badd16b33dc8a9901defb7276c37c255a137431960e4fbb8d87b0b277d9718e2fb3a98c07ba92e49328fd6b4c44786431f43263d";
+      sha512 = "ef3005c1c7cfd935899d9051e57e1808b2f3af7902994979862c74e9ae1d2e84d97babb33d924a58507c7574756c76db8ed78b57fad9814a796d081a2c38981a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/my/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "927cef5ae6a947fc410681d43027b6a098bb17d20b0d806aae7b18e5399ea3cd532a9d0eb68c01e99742986041134cad21d78bf105c78fe47be6ad9bb5dc4e46";
+      sha512 = "ac397b34649079e06ca6180722943d9fda3ea4a34ecf051e94bc9264b919b9b535957a87fc0030f53d7c23b571473b232f62ff6bdb507612dc2206ce0445f0e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nb-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "38bb2b2e2bd86f10f48eda1dab0eba955e8631c53189d012399595c84d99b3ea4ba70df0e48381cf0c03dc716b5c9d843ff4dfc5ced218235d5d0ae9f74af114";
+      sha512 = "614b537e3d80b0f73f3e64f28be6b7d05f4733da559c051ee953de51ef6f00e86714ec5285c1ea0cab2c40abb438f60ebcd007bc37d3ad0b60c7b3a255cbea7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ne-NP/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "79bf3687bfe6e23915021b5a54338dd2712742c58bf2a74af8c4c1dec631f79bbba36073a90fc151cc637e013a05d55117e0f06dd526cf8f565aab42e9bd9bde";
+      sha512 = "c0d97e45e54d468cd8ee4deef0465886efbd9fb43a6995b3fc09e2fadc06587a425dc4b0a625997429ac154077d27ad27f91fb77669f8413ce2247d6df4579fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bc92321ef5ec422eb75869e87a2383ffde238eb577b71b5a7f9cb12ee6d74b63f219d405f58da943b081f3820339a7828342324cd5a4de91b64496bbefacaf13";
+      sha512 = "c21a9d73378ca0c5994780505a7bfa3221a714db25bb3a44fe981892457231382823cc032e3ce0f1f63819ddfd301ee3d0ac35c7bf8bc44af90ed6e73024491e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/nn-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "13c6b904e566e5137e3fbe4306cf757c3ed3054a3a86669ffc99fb2a8e9ea01e6524ad6f7cfcfe0384a3dc4a0edc6c2db001e18298440959501c2dfe27fda928";
+      sha512 = "1c6765886b7f9808cc342bda04f624a676ac097b175be297238a70610404171b485472be3bb974b6d9fce8ff1113aaa9c9c631b338e98e1292e6573c4d8dece1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/oc/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "1efe59dedb5ad0db5bf7a9af77baac5d8d869fb29b872e1470e948c2da19c1b3b25240acc235e5b8464df0851a2b36a0c4364fda30a3ba29270895851ce49780";
+      sha512 = "0b212f54478321be6185724d9c72b8fdc15d46f52e80051e8fd9f6e853934ce425ab7ed07aef4d74bb73ad9165562a0204c79ffa2db277b9bac927fd1894007a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/or/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "68286c106a1968fb39f8026710303a2e85473a967f4b94484294242e40f4316c4a3f34a39c2d2501a0681bbac6172653996cc075374c09b263dd9a76141d873a";
+      sha512 = "ddd916e8b5073263670c4474860f447c0eeea15ccf43474a2dbdcdbacac1d30db56e2ee8f95f0907bfd41fca3d3db55dd230e53b17f531138444b9e91d711afe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pa-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "528696769c497a1920bebe4c5dd4076e53eea357f15f24ad213110d0d2c0744536ddabb4ceea630bea5820075cb606d631e129ff235618da855cc14ed0d08f80";
+      sha512 = "d0db3905c6d3db720e108c36de4f442bdbb195ca35d9876c1658282630c1256359677183c22027fb2484435e232cc362c986a2b46edfb128c265f98f6cc899f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "bfa2d73f62c2713b42ae5c8a28c32d7506ad1e39049132fd9b95d8366756ab6be053a8e6009ce7d538265b4ed078b4f1df7b43d1d6900ed7c935cca3e603e459";
+      sha512 = "fb20a5d61a31b8f119479912751b17e741258b651b682b7e47db131316d3ef8bb823d4d8b8df0ff24885093e28609bfb055d051f96caa4fea11934ac996907de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pt-BR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c0ddca68029afd6f886955425165f53a848c4fbc77c760be925f42b4e9ed7acd3c647303e74ddf85a68596045eb1c6f407c916773f369e33985b08f26917ed75";
+      sha512 = "570153b3f9ef1213ef5f38d56da9e62e43607d5385eb63d35bce6884186b2e48d48cc0c4c1a1a66cf8270e4c4aac78e3d4caf88b338791f7ef7295465ad180fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/pt-PT/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "3e47d046af4cebe96ba7a8c8bc7717f729ad9cbcc19b216a2c965d6edd362608c28742cfca4a3db36dd727e9cc489182105ac744c45d45dbeaea148c94b8b8e7";
+      sha512 = "68ef51079373eb05f743ddcf5c1a574de69dca1d2f927b5479d72ba232f5c44544e7aa7a3b945dd592c60cca0768387080053bf121ca3c873f802e8b466960f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/rm/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "067977a13236f74057a4605fac66abb37434fd4c964298c383c952ec72e2b2395887988fb18eef9e235699b70854e2a1c656a4bb3fe9b214663042361f341353";
+      sha512 = "73251e69ad99ecac500f57b9b7edee0c892e633f01d2594cc972e95b525a9516551de124fcb906d72998c10b49861219830bed3bd5bc6b479a28672e0bbe4406";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ro/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b641edf0afe14420ad3c0ea502a7b46cda19e062e803c20177ee66a58b6338c0d2319e16c3d2d341377890f4651379d44ea037def461a1b1cf9e86a78cec3b4d";
+      sha512 = "e68797f62737578f9a01ad51cbb462b89c056d1ea3fa426f96ce7bb248ecb15592fe3641b502f12ccf95c21b6ef38473bbbe0406e36990cd5af234b3c3879041";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ru/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2b824c42976f7a9fdf7504e60b3cf057d31121dce86223d352bbbecb842d0b7c41197d1c045d1e27a6d1f2b2a863c89e5f4956b8c125bb678930e8e1a1078384";
+      sha512 = "9261a4bf36400b1a4d4dc20abfe984e79ff10ade602cdf529d9995959a9dedf1ec78a00562b310b3e1cbd91869d89aee382f5760d07e1f32a4b3d9cd7328ef4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/si/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "3639b0fc46244cc42f5bc31e55790097a11941844e9a7185d363a124574928ca8814d6553c46ad8828e82f7876c8814bab664b6c55d78680635136bd9f5ecd2f";
+      sha512 = "d72b75c96695e8df4bad4dde1e91c3d3fa666ef0c40ed69b39c8b95c093f6127399203ed29bd36c02c99180a786a117af496201738c3a489b4bf2ba5f5fdde7c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "8dbcd590f5baacf53f0ff13d25f40c08637b358a98a680f7c07584249ab3ec69678389638ddf2ec11ba0543a4d54deca0fab3f65ef4297f6a403f0c6897ee92a";
+      sha512 = "3361539812c51898fa7890c90215a2b23544f27b13da5ce160f8a4ba28e4e1be097a7e4e94cb4c1311d9c4d307cea3007694f913f227d5669f1a5070d2962513";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2ae24291ad7c8ec8f85301fe73e7bfc2e1da272f5fb6920f6248cde32b897ebb6640e27dda62289badb2a363842f5d6425d4372a5691bb7e140852ae8792c103";
+      sha512 = "e2b2032653d45af1b201bb51c053b1eaad089316f4ac31da1df3b1effe925cb22c015e0928502377fb24e5c5d97fbd1db0f0cdba52dcf332e26f7ad7b4a4f79b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/son/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "62cad5b16c58b9cebe78aaedd30f5c74fc065c6e8c3e916d7753b8143081e23cb4322140faaab6e84847f870ba588f99b0a32f275fb488d72cbd780b58be8028";
+      sha512 = "fbe4f5d07d74179d018edd877fe4811bf78a25bb9a0b8e374f8bd0166557502aabad43586de363729f923ae6deb3f66b6b4e1de4547e137a059a8f2a08f390c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sq/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4a65b5fc302c937afd545c2ca2e0d38aac5c66d6fab4b450380e942c1f5a568f37701746753d805971e03c258e3f352f64e12c14f5fffe1dbdde634f2f4aa237";
+      sha512 = "b7a30f7f943ace41ab1c099de12b2098f07d4bd88cb871bbe4550e2f7e4479e2e0c484b286f939a839af75054f10426515ec2686fec5830bc318c0d35083ea4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "94398267503bff1aeaf753c3077c0d1437f6d8d4f5b0691af4efbf7a50fec1f6056c7405ef3a23930b8baeb274a4cfaf0c963fafe8298bff26e79294f12fd078";
+      sha512 = "562b516c767116da4f01cbdc1e463b9bc63838f7a3a03bdaf57f6c188805b5a1b0f1b82495fae43cd3989ec9b80bad4c0621e0fc78da0853449e99cb2e11e23b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/sv-SE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d2811762cb743bce3fb9acd50c912ebae495111f02ad92b37069a81362c84e7dcffa5735b7d34fed47d0330a02abd86aae9d088f4908db9634d1716c584e9d95";
+      sha512 = "10be9908b228df38c7ae420cf9c0c6b46371cf942f59a00cc77c1198c8870a85c28857dd09757015f8efb13df492b3d600bad720200e79b9c28e677d300f8bd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ta/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "3a07818b877ea4bc409708f9771cfd190670c2aa947c4005515880f456cf435dbb645c99be09934c9c8eeb21890ced8d6bf5004e31c0fc70c8c02fed91de1898";
+      sha512 = "1a1cc424588cfc3556dbadd136ce28bd5e6b8879d623b6d7f6825bc154b3dce9b40267cf0536d35144c152a6726692a00240e9639dcce67981b65b2bc8c648e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/te/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "e2acd0f2bd90a31cfac5ea348548a435192205949fa870c0b964421ffaa99941c21e4cc78aae04f761fee49c9bb423c8b959e212fd3c655815653508e21f8b75";
+      sha512 = "c53fd59378b8da7fa6256e1af62cefb214402d9c9ac022015ae8c628dce2e384a965a80d206ceb6f9e4ac113a2e491c9ff66c02e68a866b4606ebf1afd301e38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/th/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "562fe7877ef17bd200810a48db5efd2085d7dd8c004e137f35fac66f89903f4108bb45cfd2c19c001b30a137c9ff27ee75ff33d42baf997ec27175a8c3e43cb9";
+      sha512 = "848c544742993d0b075489f324d2e8ac11d51fcf3001253e7a242098f02c0721c4ba7fc9d622d38495ae46fc7bcf98119d3dfc7d2ca0b7589a6f956f2e69c295";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/tr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "cb5c3f134fa81334508307c3a8a57df4d79309ffd92449c1147e8a3667a0ef12db5ded5cf25df9d14a10a645dd994ef58da30af051cfb9c61506671292aa0dee";
+      sha512 = "336ea26ef61234d1adaca4c4d4d0ac8c37b891bf8770072bc16828ba05de572b6e5b72e901360f24fceae1e1f933a13fae80e5957eac0b0145ac347227062de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/uk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b29cf419083fbc9140091eec02a199337b814a7da04e21a118b586f813bb0bfc888a3ab62872348bc706e315c5566f8b15a3db19dcecd7571a113d888a3160bd";
+      sha512 = "cfa0ed64bf0d6054fe8e6eb2d9edc7c6b6eb84ecac36f7e166c8fac6d26a78d70b21174f24df61c942d8bfca6a838db9206f00026eee5f6c8cfc6a4f36c8ce63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/ur/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "39e9a404353b9a554d61c1a5bab869222b0ce127dae6d9b6e018771de759a614938564ba906a747bfdb2a4d552dbae447083937b68c98aa5b3e679f7101c9ca3";
+      sha512 = "0b2520ea0a3feb87efd3b387ea22fc8bba9a62dc3d212d897d263b25954accb1869858f4d655ab82dba00d58deee38d984d547f7bb1d2715f723c8998626733d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/uz/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "f1576289f479891be687559b0c9a2ec216733e3414b40ef381b25642b6b36116878711436a27cc6710ff3bbe25971432ce1c85cc5a4f64e5f4d8482bb11529cd";
+      sha512 = "ac628adb5a2362cf721a25af62e94ee98995d2d74b66d75463eab92e229d2614af5652dd5af8bf04f966d787bc91ce34d1d9654a2609da073ee69e0202694eae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/vi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "4b7d515fe6eec6a121efe76123cb027bfa6af2c508c917efc824535da292941b109f3f1a8697ef208819dd20f02f561d5512f82345d414fadb1d3cd29cd146db";
+      sha512 = "fc0e815629c30b3d03e4700980d2c1894e8be6d6fe98e1d8d38d36c61c39e3030dd4f3ef7baef14ee68d8625da025f89367eb201be2f6feee2c6b7a09cb2caae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/xh/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3b7fbcfd7f9cfecacff3cf7a98a9b228d118733271dedb9d5cfc8a413e09e2e4fe4b3584d855be0a268303598d48a3802637e2496b2a0593e5b1b64d7fedd6a4";
+      sha512 = "1652c92d67ef49d4b5e14e348647c21b9a7485d1f23d6e4b3251edd2505af95c60e7b9bc7d3d37f87a99f12bbb332a70ccc250f43ea7af8b03c76abfaea8a46d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/zh-CN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "dbf1222759b24ddaddd149844560351f2486ea91ae934e8e5c45af86420b37dea180267ca2e326c5340e7a3aeac1d62507c37e877b65533e00e482ec135655c8";
+      sha512 = "3dc448c450274255f327cf7130273b9c220699c98c4af5cccd85f7e153674e9db6dfdcea4bc3ab2bdc3c1e5fe3eb848ffbf16ecc1673584b992380a0bf18f4a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-x86_64/zh-TW/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "6b3eef73b01ac14b261cf7c2aae47e9406cf0cfee36f42920bdd2176f19eb6f922ed651b56ad9f9da5567a33232eb11853e961165f118abeadda5450cbd24d1c";
+      sha512 = "683b8dc78a420c11ad657bedb86959900be81ddc21e3fc45c22a2b0a17af62d7615761ed545d58ce0843d97191ac2ab0f5f080107a07f7c3ed765ff38a3f1d50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ach/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "510180f21ec182ec20d95a84187390014c1b4fe325271730ab35cb4e6f271851e6f7838c2a38327634904d1385f9e04d8bdbff0edf3ea1cf6fb6df1e86a6d257";
+      sha512 = "1978ab44856b91b1d9691e492c86d0f3e6c676312c156c852e0c69764e4500da7c8ec6f77fc417df850e73e5577fbd260c4023712d6b5cf17df885a02460a7c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/af/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "4a46e95180ecdfd87c8d8637913e7937ce530d8d1e49245a1ca4f3a0aab0a400cabdd69d53fc1ee2a86a5ca414979c96c09d59394c689b068204d74a6398c3be";
+      sha512 = "284183486d1715bfb89a41a92f195b73ab36a34ff01373c4559ff97473e9813aa8adccfeb1629142f947a817f750bf63222f19d77318fcd56a599cc2292ac7f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/an/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "2e7cf12169e6ef76e7429a754909ffa3a05aaf8bb208d3a23b202c18aacb3a364628e550a5a2ef66ea4be145b4dfacc9b91d22b7f3fb752d20c8ab0172c79aa2";
+      sha512 = "e61a418db6e78d260a28b4baefdb6ad58f7c8ec8ba85d0f9da0ca1630ad7cb3d9e8dd6676b05f4791d029c57aef6fca9cddfa28fd55a1b762740591ceab187f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ar/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9cf8386fe93f6f577e7eb9982eb7af9d60a1ad7aa95eb62c49e7d5a9f312b8d557610d6b5adb5b562b4e18bd16ed352df055009fe35ff6309945ddee789702ea";
+      sha512 = "7a61d7f58e4a776b1b63dd576af91ed71887cc0ca191f2799eeb160de55a7c2439bcf44335f4e343a7b7d66336c35ef07c27c49548cf7b18bc2643018c1d576f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/as/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b83b25440d971c1f19ea191ec2cce1813f89eb52e921f9a7ba4f8a7a04c59035a03492b40d5ba2e4f772c43af0a47370476c18e2fc3996b0c20b3e781ce42030";
+      sha512 = "0248abd063856e71cf1318b183f3cf9d34d4d59843411ce3119583d80dcc63628def6893a9610858b055a6ab93633f2c2b813a3f824c7bf5ac82e0d833ec83be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ast/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "03baf39793c730723af20a8cebc9e657bc94fcf46e4e9c6fad4d82990fec3c662bda90dd9b8160883e5110c2cfe43f857dd8bbde6f06b8a9b7ba2caffb373f86";
+      sha512 = "cc0bf69fdabc6f72c72b11b04f6bc1e72eb17e0b54f4e8890f343dd0de59d730132d53087b89f707803d5fcd6dc70f83c1f01a0462595068851ea5bdcf96f572";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/az/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "19c389593da9813dbbb7f994d2990955e78dc9828dba697883ab2939b538f2336b7e3d60594372ddb3c55768ddb2fb4977cc933c1444cfc2a1832bcd3d334599";
+      sha512 = "6836c22daf3b0e3140cdaf595fcfffb364002c42c2b3b2374aec6a1f50a469bd20a0e27293402571f48dcf3703c944d8d0704f4b4229c7dbaea0c40a8b89ab6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/be/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "15154744d2977ee3cd95b589fc4030231183370b3e295f195a9458d409cac226c19e2703f6ab6aed6821c97d15bba61c602bf3d79c1559df485b90c94dedfa8d";
+      sha512 = "dafd1bc57b1ea6f817a4705373d0dae4fdb5669887e96eba735e43c1aba1b6277ed08eedfb01372aba0dd0cd2b1bf10d5f75984e4dabc5dd8c1c26f07932b6f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bg/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "94618a6f0eecc2784d8d89f6ee4da40ffdf2bddced4e18b4b573898c189b81245de5df75190232307cbde6117c1a1063bffc343a85b6dfb09068d4bfd3c3a942";
+      sha512 = "b6f23b0c4e2baf837881f9fc183f19ecd83daba1190cb828ba1442ac5db3bbb2d1555a52bcc8fa48564614943ab7e6f0b81e9a5d6784874b45b08727fc4be04e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bn-BD/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "452b1c937ddaf8434e797955d015e3296fa20eb8fffad82467301d8e762fa4492cec15d9a237aa4412d1ead6bf34c925457472ad5be702fe755e9c72bfd733a8";
+      sha512 = "5f1cbe0e96422c73e5dd9552886324a256a9fc33e8f8bf8111a4533bd45ac799e4b25d63ab9d8a0e93a302aa39fcc1300fbc33453e7efde8e24798ab1ed92853";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bn-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "15a7f0663bb90d9581e14951b2a12259fe19c59ef0f8200464823c0693a73c59513234ac3f1af944ff8533d8c77b4a8f072b94679c23acf454826f48a5d47d6b";
+      sha512 = "1e01547c8454e376d78bf9ed3c5ded5d85e38bf6e7bf05bdcb984a0c978a4790d61dc6357156ab5d3999cc3d8ebf8d418fe18c03de1b2bb1772b914a37bb55fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/br/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6dd94018e628439b533080ddf5d7fc2edf386989480a7c45727c0d32dc0cb4b4946c4d88994934e5e567a09df9caacbb282967cafb5028e5b870fd096d1c2101";
+      sha512 = "49f78074d8078b81adf03a371841777f72842727365cb05b0e6f04fe478778972592540071599f14c2e760342831bd9fa0b1d1d6e18f1a5fcb766fd83e20a871";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/bs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fae7ad771bcfd77eb6cfa0c4144ea3ea3efdfbf65b4064dddba1b555c2084c5bc9911b2ac3a6cff7f43478c3e85357615594773a4b7dabd45e6ba6a8e01b3f17";
+      sha512 = "03540ca42b87073455d7a16645d4af9843d25de86a00ede526531de920c7112191aef16097551b497c6f086baa7d92000acf6e396a544f5933f879a87e23fd57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ca/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2f206b1c0e2653cbc096793619fa48f96423201d3907fbc823e550b58ef8b7dc6b30bd489e8c113463ae1ef78bca38827619930bf75f600af6af058a586f50ce";
+      sha512 = "db81d8ef8d676271e1a9c756bd9e55957aa65759649c211a69b7ffb5648cf641da30cf5068cd0b16ea197f7454738bd17ae7d73a419503b4e0f6f7dccbbfc71b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cak/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "fa15a78d3d06c9155d46c6a37472f74edd89d8a459a292f1e3a004b080db7ad1c5cd51d3e400ea4816e6d403cd8a44661e65d39d5138f28733a6196a84c6a371";
+      sha512 = "974f9894e248c89d4f772a090250f0d5697224746860990d692eb2b75d86b6c98bf64f1fadb7208ce6a1f57f5cdd8e2ff91c9301fb77bf2a21ca3bc9bf24776f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d56c79150e1e0747a5f562e9e3a413152700cdfcc4ab091c9b3a4ac07753c1147601ff5189788336dfbbe22c3d1180283d5a3ab2733182a98954d9d0c5215e39";
+      sha512 = "ae5d3e44196348cf1690dc0723565214f9f72ef7e045185ef0fa65f9a58bff9340dbe989306287b1462291e01d5dfc64e71296d7340517a455d7081619739368";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/cy/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "91e0d1f95645b6f368902594044e647487584a0cababaf78456583ad8b4e87ab3399693c681c403f7e4ac7885633421c3d52b1258c1017325a4f4077d6556555";
+      sha512 = "2ed50ea85102a7e201ec7618289af29b079a4dd568178310aab3c41738183c22b90d34cac4763d28bbfdbdc92078078a99a18893b3edf7a513d7ffdde5dfdd28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/da/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9dd67e40305dc77a8be1fdcf811f25a80636de47910cc42e1563902e1cf8a57ca58f3ec26366dbe85eb3c36bdc1a849b0c7f301534e469be573d8ed82047ce6d";
+      sha512 = "cd9ea4ec76ca7b8e391d8565536b3da9ac5c9406788f60307a6c4179da6947f01bffb593b9cb2ff988128c0926fdf92f0a4a6a747e593a436b8afdb984a85421";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/de/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e1c28ac98b003f0e3bc34cf375fcf23f01625e913d027ba248f3bf4b86babf70be15987ef04c8f33feed1f2aeb26b6aea3a93bf0d7f0803f4a03a9b55d91b4b4";
+      sha512 = "4ab7b30c9c74c111fc229ea109b892335c1c453ba5d119c3e1a481a1168990702c277acc9ffd22350b2f4a657a2786dcc77275a86e2c6372b0931dfe92d6c06a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/dsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "1651468f59eebdc1a763719c3c7f8974417188e1626c8498f1b7c6ae026eb40fd442346642a3c45bb1fd36ccf6017539c852ad3a7ac6424ce3069993080ed37f";
+      sha512 = "34a8104bf029558dccdbee73b40f357afec438768a45aad870e455305a07b6eaf25aa57a67b3e8cef72362e1c17239097c9cedd0093f3ad58e120860c9cbf6fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/el/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "834aefe52a94aec8d176641cb138b09dff511d7307c6f10327db07a5e96d1b93714eaffc98be6cea18d5fb4f21e6ab69c50e3452c29e9c11fa597ef36f5e8acc";
+      sha512 = "f13cb383aa609cf5c8b997c52324f4c8f345697f12c489e6a8eae076a3c56327e00315c30942c2454623804b6889ab529ce988d83dcb940905d98dd38f0d056e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-CA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "b3be84c80f9a04ef5095ee1498ef549b865c9d1d53a9e2f7a1e9012b09c6b562b2a3b2904a6537faa7f6bcb2d89e176d67e2981e26749a74fc3bcbbb704f404e";
+      sha512 = "72c97423432457f299428f43657d257008585fd31eb4006bb8ed20077563d0e708f16c3331f88224f5780bd039cbef2a7c894bb1fa965cce98047698bf2abc90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-GB/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5bf3e7e43aa60dffd109a8671ec1d919ba4d70932ca9bd3648e2bb43721b59c00c9030cf3c3f8c416989f799b8bf4c21303c855e3fd8eb021e94eb3a0cda1faa";
+      sha512 = "199ce1699b93774f7e206167f694415cbce6e7321607cd7f680798c391ac4eb58159962b36cdbf4e6e5928b6b9d1dfe926880651c764742aa2b10c7ad6981d8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-US/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d855733b5751efeeff97b761ad3bacc877609fc77e26def25a390115e9083f857c1babbff5523484cd3645a3470f2c9e287d0ef3fe1cd212285ab021c571426b";
+      sha512 = "01ee82125f77c4a3dc25dc86dec4cb2e37a07a4d24afe811b5a8efa8c6ade58eb9e7a75ea34e58673b11f367dcf15838af775c39f4aad6bc39d8c86385bb7c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/en-ZA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "ae6a764d9f46029338d2802488985180fe63c935bd1e2b0f33ed6267349deccb7019ae12acb37773a806f8f945f1ccd3b210eedfe1b44563423622157cdb272f";
+      sha512 = "5023173aa1c6ef8bb3c8872fba37edac66330543a688c17b43e4bfd45f08379b6309994a5dc9be98dc1766905d91865f026f9027644c906d170130b3a920f07f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/eo/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3d25ad40f8b6457bdb77dc85a16e9a2cb839891816ce683bb3a371e95045876f4e70620290464d6c10d148fb386e711b0a9b4394510a167e9bda0f70da9673a4";
+      sha512 = "c570a2b74dc4185d2175db8047ddc7e979593b094893fe92254861ac9f714c76a872e18926d6c73a5be26b6f6593e56e647c7561e432349c0ab7175fff41d7a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-AR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "8c314a8bea657951c955dc1328e5277d5eb649d6d8e4fe261aa2fabd5400fe16017c1880a20f9b0f8485a2eba34546b695d84faced0cf0743713525e9bf022dc";
+      sha512 = "bc6adc9c6ab971d3af9eaad370792feb18c162a43e9361de437fe90a55ef304b1c7ac0275267e722d6d7f9a4ede37a2539bab60a551ce7bf2ebc0040e9a5ec8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-CL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "fe13ce6f7338ddde928fc1b1ec917515c2ac85783da89202adafb307439c54c66be87a8ae3f15faa6006fecb28f21206e0994401aad9ddd50099cf48852c20d3";
+      sha512 = "99044eb8bb8d799ae6045c37cb6a12016e885ee5c9d2a893d4d653d34579fb1403078d484389623b22f1532ea33ae1b29e3532366f9fdc6ec1228b68cbb9dd12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-ES/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "872420f6294fa3ab715b6cbcc2b4e538e53902fd434eb2dde5a1df60adff885cf494168538eb94a3448b50707db15e1d30fdfc89351b4f7ddf9570a7b57ca898";
+      sha512 = "c5638fac25f3715a4f7389f32b2d9e8f22e5a356e02e2ee94116080951c451c85245834c8b55fa9df95f0848a0b54eb8f68f57936e69bcf5210932c782fd621f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/es-MX/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "6a1f277fb6bda8b8f807d2d87d03138687bb9dc83265475c3aca7b68bedf3c01bc0fc6120a131dc9895cd648b0aea4756cc4883ad9ff81b4f6ad73283a1c1385";
+      sha512 = "9a329cc370a2e7dbf1b76bf185f1b118e33b20b349bda8e8419797aef87db8881b4161d790f03c51b06020929a8b85bd6539fed4f8aa9838e98f4f6710321aaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/et/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "820ee6763c2bd74a747d6ec3cc3d4e9cf35c9ca8251892379a30b8fdd986bc9b25bd7f61a4e6679db7d764ddc757d2cb627ef3582cf1f4f980b6acb6359f6dd1";
+      sha512 = "f09f4e49dac39d91ea7b146122f3d99b034de486ae6339b8fadaabf1bf87eedf297503475cdf559d69a14c205841ddc2f75c0f961b9a8913f16bc14dd7593274";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/eu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "cb29b448be7d9c000b019759da81bd4883cccdfbc6c3c57adbee92a069c84d1f94bcc9656bf771f61720618cfe9626df133f9be529e2c5dbbace7ce929e4b799";
+      sha512 = "871e683e51d619e19189b8f0341ffe6e14d14c058e0b4ab973f804ddecad9c1e3c8dd7730a3da884392aaaeae99022196af27641facc1a8fd25052f516c56c22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fa/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "75de042b2aed3f161428d979834c8a7f4bcd8f3843509aeffa7a20c548a8b9d54531cf68dbad278cbaff70251672471744df3df5bd71bf35d6d49435ddff8c83";
+      sha512 = "7e0d7651ebcf03f40cd9cf5faec8a404fd028a213575c644f2b2640cb00fee06a029ada21aa17ca9f24f22b7aa73767390e635f169fbdfca8d162dd914bb19cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ff/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "460332c01db63286026260c192ccff50ab75a64d65514ba02fcb6986ab7267b358ff8c51d76c8884cde24893f202392b788f326dd60dd60840be64c527379f81";
+      sha512 = "fbb8c2fc1d6e589fbc42a1efe33af0aa129b2a435e33c8cc7dcabf2dfae917403c2f0d9cf62e2045ed2350ba72d07ccb92ef46842a6d34a5def928386222560f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "294d616e6634d257f83a480752492577a8397228520c67ba92d039cd21f925efa053cab2fd3e23e59d4fd02d0711a38a251074deee671878236c380cae3bc605";
+      sha512 = "e2639d8060552ff688bc0961b19da279ea8563143f8dade844f906218a3816427562b895d30e4732c96c39fec81cecee6d39f572823e3f4890a680f0b8acc61f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d9634c8cb3be18dde4063521d4ba732e488c322174a6a254b19c77d6282c33fd1e758be72916639df8cf4498886f8734b4b82f1f8115bd808c41b767f9215045";
+      sha512 = "1da0564312f8a180d5d793e1a782519331ad78bdd7a44dd361b15c8230520127c69b52667f0bf670038d9b5b25426522e7fbab20bc2fabf0fb9fccfcefeea442";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/fy-NL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "5659a13a6016c057a478893624c8de70145dbbe7ba72dcbbb05e1c53fac644528cb124ee02d1a643b19b04d1fffa70141b42f950ff1a197f5d2e5550be2e362c";
+      sha512 = "cd9e14f1469f2c0530d36b5d29e26efb93b38fdf45b29775fea481a305c3a4a12c8cd6b016ec5796e2fcf3a9901348214ede9aecb62cd101022287c415c7d370";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ga-IE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "353c272783bf99ef7683b57bd0e7cbe94b761afb0841244d09b5e13c64fa44cf6397569d55e6db5d3257a21cbaaf5ce00ddb58bf6adebb402af1fa6e4816c39f";
+      sha512 = "dfcdaad90a50cd80337e3015b060e554de815b31b4075bb0738bdcd88a373a88ec9a308497c4f7b6ac031101abd700f9a796f52e10b071c7bf4cd2832f2b0d2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gd/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "214d09b7849fe0b5bfd552875001cac21842c880557adbd7120e79e7194ce2cd8d17f9aba5c684b30458272b38c464274ccfb5c12d30efc4bcfbe58665945d6e";
+      sha512 = "8fcf87ad0c1d85d5be1fd81ef4d3f17c93060d29c6ce889a2c96a53f3ca78a55777ff2c709c4500c643dde6b7c468fa27a5e0b71e677b5ccfc90291eca6d6744";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "5aaf2f5d740651a4040a4661feee6c5d1b5955f5dfb811a6c3adfb65ce6ada1d05c5055700426325ccdfe504b35e2bd610c8ee027a130df6df07912c0b620d7b";
+      sha512 = "76aa9c700f00b86575cc81e3a7c0bf485e819c3cff7765ad7ae28b3089afa7adf2ea7c4afdbdfa36e29c57257c74a467d9225cbe524217c525c91e4f43c28892";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "ff77a8fd53f6096054ff4541709c70d9e3f2b7ab3331b80fb5461099e12d055de2f0cb3a941285079eda02900101d20e93a80fa22a1cf960219c49b760d26de1";
+      sha512 = "01775737dafdbf6d0da9da6c20aae3ea631e59db156aed56bf2423cfd344e7cf7dd4c4ab409e0d98c2f2e3188b6b27f2228d18bac02d4a3570fb0095aff460dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/gu-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d77420d5155696c45bff77c55518922e497f40dfc639019a9ce13f98adc31b7e64437631fbe74c8d64b619d558c1de2c136e593206f52d0474378c8d6f5053d7";
+      sha512 = "4d57c9cf63031533db0f731c6087802ebc33aaff64f6520244b82c6b2e5b26c84c5721483405fb36e85c87b00780f5c849ca9b8627f44e57e2e0de82890928ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/he/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "1a8c37f655c8d1792196e2974808ada0d3fc00506f4c500f5920504e9fd30f3e442de063e0c5b04a9c2c71465247b0fde8bf0a149e5b0b046354601dbd19722d";
+      sha512 = "f99e1e067fab39e8c7a63a55535fa1a8157b501ccdfd8a45274d5c5e34e9c2817c6ef6a77692619bf7d744af99c484a62dcdcee066103711fd430f41a9b0c1d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hi-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "137a1930c18ac470648a7065f6f6bccd609b40c82eb69a8672df4b9628acd82cfdf6d9c24f02d3f443a277b9e4dbba09f414b45e0053f7b87d2fc7a945dfcb79";
+      sha512 = "b9e6f5d952178667662225f6ea47e392eeb2fad54d3acd96f7d51074cf30565e8cf9fa549a77c83ef6812bd540ae41a1c4bd51ac9bf70abc40c310b6f7e6348b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "9e926c8ea71641699791eb5ea593e703d527eaa798f47c6bc890786825f452e25b1d9e0a10f10be84de50d2709c3ce30e5b3f27c8c2715b1816863d280671faa";
+      sha512 = "c7b4ffcdbab0ee56d77f9ce59c8525cc91f99aef6aa0fd5015468ff69cf3817ee9ef98c79b8fc868275ed1dfb24e0cb8f6594eeb0e7231d0594c5169b39d60ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "d98d195333ab6e91a3322fab6f867b1cb667c11184a0463a4a727d901f258c11161d5eb4d2bb39c3f0420eb58a9f6f03792cb59f8906c7f44276b317f23f7dfb";
+      sha512 = "002bad3e119386e3c62850e8b6e145e8242538da2367ee83d383a7c47ddc002101c2f4a1d3a775819059f83fb0f94ec041348d0440849ff6677672b01be5fff3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "28698619a67b8bb93300c1407a25ff14d66874ddeae70bf807c91e88583c880a73e058e404f65d6b8831264faa5da8f488641e319735b2ddee6c3b17907430a4";
+      sha512 = "4ee79e8f4eefbbe29762537f117e7aae5d67a7ae2052eeb73ac19fa4119d2e4a344777aa6a4f2c449e9cc9bf247041b4085d39b76c568d7aa87bcfea6654e26c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/hy-AM/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "e70fb05087078c86576b0959f9fe5f5e2041c50e48e1badc7de8f3a7e9759f1904980c2a8093cfbf3c78c98b901a82f44d21785cc2a140b28d9a57b42c50aae2";
+      sha512 = "4818076c75e28bfee746cdfc9ade97c3dbf05b987f7c1053e7c1e5f40d9b90345cce4e5cd3497520d7c87a827de6e61bd32f2b3cbad61da040e98e7433aa5044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ia/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c6b7193a25dc6b93a853166509d9dc84236862405156e70314b7e396942b1c0c500e068cc95b2336c03b29f6dfefb0600f78a4fcb0869fd56e68647540914c4c";
+      sha512 = "96f7768946a349d3ece7dbc71ef1abe53bab26ed34bc63b5371e9dfd667ef168d778edb6fae873e0a378c96677455d547267ed38bd186daa0ca9d6008f7abb19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/id/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "7e16fce94693c50a7a64328124c8e0c5ca2e78176d6a1a54a7d8b8b3fb72ac1d7cf3876b81060b2bd52b94a39d591967667d6c8569bcab49db6b63312d7f0116";
+      sha512 = "eeeccee3c1a8c8a21d320d23c6fcdcb95d0cfea3ae6c6501e33caacd18a161725e72f848fffbb7c192600e0e4f3ad047dcdefebee22574f34c59386df87971a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/is/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "3cc4edd3189c7abeb0d0aed8a12e38b412952ab5938ac7ceb3f970a46bc53a26f9713a8c77515f3c1985e66a064dfc1ccd9079c09c62d311c9d229272235f089";
+      sha512 = "ed625feb72929469734be42ad6eff565e2f4fba5a73d0e7c0b6616ee642630d090ed48bc622367b6ad9bd2c13a8e1ae940e87bd546ac63d266863123d8363dba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/it/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "31ef0998c6ccfe9b71670aa729a1f6717420a25932544d040a87c34872e4e4d1752837c8671add9472c9ca0a49413395df954605a7a1ee27216781998783f0a8";
+      sha512 = "7af81f8bfa22f021e6e820d51b007da961de995dca36faada43414578ed205a274b2120b7821aebc4e70533a3af53b74322b4183df86e447b317aaf53c08a7ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ja/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "be6c98019416b61280850c8bfb91ae346c4981aad4ea96d029ae39816b9889fd732e00b3cef78597884d1ac28ad92c6e9c06687b113bc3091ddb1fce28a39c27";
+      sha512 = "a25ec6be34de7f80bedb83b0311c3df564fb46d8521e367ca85135ff66dc8f67fe38f8a0a2dc50fdb74db3c0c93fcf5355e80cb8fef83be1ec88d4bbe3a63155";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ka/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "40348f8077db44bc70a6f7b349d37558023951d8e37e622ae2ee08de74725d15615cbc875c9a44119f2ff8acac91d5d19c61b450fb342d2b29216aa00e0f6ad0";
+      sha512 = "94dea7384f702ee9f4991bbd1732f93d610e83d451124bb598891f1f1a36c72e2a3da5681584e3b27e71e7c4fda4980a09be23bcfdfa0fb83389300bb231bc16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kab/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d432bda358eff82b6121869565ee67d054091980ee3d63e4528b9fad44964e420e004310679c008af31fea0fb0a4e6098a0ea9048eed20a35634d5ccc9ac51c2";
+      sha512 = "3b20e653a7f70939402486ab7daefbacb91fc074acd28b718e914dfd1596e33431119f28c1caa318f911a4006dc6f7c51259fb962ef9113cf8df83fc4cbe6377";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "676935d56cc2256e76584a8d1a07a7fc8b741c9b0276bf114a10b8c9b42138b7038026a1e70abb086e45c1fca0daa36e7358cc45dfe42b1baf6f312c68dabd40";
+      sha512 = "6db1a0d8dd25f6199e50035830314e3a9bea1168b441ea2708b62c6b8fe673b146926d92e55a9c7d4d0c07da74d1c8aaf3a4216a117d18d4b217f67bc082da4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/km/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "f45fcba2dc07f1d6b7763f63e778ddd5925c3b3095acb8c223768579d96a7b97cbabe562f650d683f53256e27c180a1bc27e64411c97edcd85403a1fb6cf0f42";
+      sha512 = "3595148a4b24d85ccb4e8e7ea4d0591a278d4e0b43fdd91504757e01fe51cc163e7866760ccf00be621dcb07321290de22a85710ff8cc5afeb11a21b67704ac3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/kn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "5b564c901032cd6c1cf20adb8ad24aa76d8bf6f7aa50e2cf5d1d502beb274368814e039eaba920b2124912ee643e8bccce0c7f9d29732d14bdee8bb4e5043288";
+      sha512 = "5bf194dfc1ad7d7a48d1a29735f88c2aa86fc79aace1159bc6fb2c6b11d088402dc9477d80075b8913699f9e02e651882a1d24d2996770ca9ec1835fb0bb73a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ko/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "34e68a78a3d990e875f1dfbd48b5089ec70f37e1e4993e9aca10c10d221fa80fa625ef8e54e8c6319bcb97b55d9c503e54b2337672df89fce32061f01e4fa811";
+      sha512 = "3b9bf762ed356fbca85a9e9742258484ab6edae9cae6667c64cf8572b07ed3cf83e090b30932d3beb542ffdd9906e609ed51c79906115ce7be0fd2e8cd7dbcda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lij/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "97b06fd1f703c11487de6948691802e234e5261afea85b104e41232805b0e737cd38f3d540090a78e3f5609306d938b66d5ec1fc0a96750e60e37066325475cc";
+      sha512 = "7a3552c80157ca05eec6cb018af0ced148b2cca2f8f713ef71c37ebf64c778eb881eb7dee7daa86a788ea542fe62f45080dac05259aec30070dfa79994422974";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lt/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8b1d8eabcf0c2cd23e16e2fd70487e47421bac59b3e77605ab914483085db06862d62608c9361d499d3d2a271a8a07ebd7afd070eba025dfc31d2c0c2cf8b0ac";
+      sha512 = "030f0d0756b3f259079539cb4ef0f1268526970e636f27540bd72647a5acb25d73d0a35f9efb4d3ef8120990ad2fa5ea1a0c5faabfab4b8a50eb670ab1f04d1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/lv/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "06aeb27ddfd4aaf8a8cdb9747ac8b741c764e2198649a96fb64e195679ab727731cd7b08901308883dfc4c37d1f5c3fc047469c3ae31101f68d802ccc171c349";
+      sha512 = "508b40d3251cdf63f36f46e632a798ebe796c8288ba91549ff94dad8a8105946df1379881c4d4a66f82d54e027356889a9b7e684fe924ee956a777d00ca8124f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mai/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "3c7da7c05e55361aebe4b4e960cbf55e337f6e9c4f78401b6320f7fd009deba552ed9b2e849893c29f3cb592d81eb3fbdc6ee671d37c1a8ee7297c13e538804b";
+      sha512 = "1d1747277d8e8bd4643abdd261c77bf799997470ef0d6af8c55733e59f3ae7324a05bb8bb831846a6d7da3644c6cce39d83fe39935f459b1b01c3ddb8aa3af91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4e9c2799d3b83c316c1a53bcc233ccd10b34b8d042a394d651d5c23a3bb574c8bec6b34833e5f19e3ea8c11f2067ba1f6546ceafe8ed225c24b0c8ba0a308f15";
+      sha512 = "0270f0b638fd7371b6dd302ab02bb8bbbe55a445c50ad6c62676d6ad61564b40e72ca1ee2e4b84427b8b50fa5874eba657da7bc8c316aee997164a86eb36e65e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ml/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "8e55fd98653fc601a90304b8bd5a7c4f74f67517a8e23cb369c77db7969d004dc3d44295f14da124427237665a7e09dd497b031275188ac48c2d031b656a0946";
+      sha512 = "99f7eba79ccb6fa69113fc30689c599a1d2b66795eed8fdc7c3b49733b42948eda051b5d178d3d07bcb8d7d37f065ca5115a2c0807c39209adcf294890f64c13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/mr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "8f171a5c29c5389521ac9402d4b81f81fcbf7e890d73aee5d861af78e786cdf1e2178805fa4c83fb1d7ab7b280cab235059034e53c26dc6ef58dbf792b878bf7";
+      sha512 = "c377e0c9f1390a31ee7390bc0272b669115a796c5fcce2effb34e0e5b2cd342b59e20465b56da30de2e35265930684dcdc122bbe16a0b28f54d23665f3ca463c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ms/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "9bb879a050c279c1db871cfb9a72126dc12c1c7d00d713cff078961a501fa219420d0997958d333af98e2b815ac623b58c39cf7137c54f5c141751839ef27b9d";
+      sha512 = "d1102ecfb52eb0dcc1036774c7f2d3cbdce75fc893521ac2283772a956ccbf97bf84e5a70de5ec2610dd97ead87af76a217d27b3bc01ab111be989b377c22143";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/my/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "04bf73bfbf801eaee7e9619d63c9c1ecbfff78f4c987d27b4271fb8517ed6147345a02d0a6cfb24edb9ccf2af75230d1c929dd8cff5683969be048983fb91320";
+      sha512 = "60c35a0475fc8ea7f377fb9ed958f85ad0d844b8b68234b52bb75ecf4165ee8fec6adc715bdb3862012307e8497c15a594a83cb9812f11f00b81dfe1f5f1e67a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nb-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0e4e8c6b93ae01c8625a805a4e179b36283fb52a69f48dd2a8bf46e692d8d9a335e7992f27b5842026c0770ebe2a6c9382a529cfce45ba839b9c2b4a53db592f";
+      sha512 = "c177111dbe0696f772801fbc0cb015ba6ad4cf3e2fea1e060d14e69ea08a68714e8dabbfd67ceb7a2d228aadd6dbebdfaa97db0aff3816fd60672be909e7e1cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ne-NP/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "80c01828c94b96fb9703ed60c9e2031a161b078e3ed857e199997dbd757af351159472b901f22b726602fa52a716b608d07c72f1abd1ff94639991d649d6e4fc";
+      sha512 = "9fd64628bca69b9571a66d0dff0d86111be76a9b1f33221883081864f44f4f8d33d470012cba7dde3c215384e4b6813ea23d7389360ff14843d28d884ab23389";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a36f86e0a33b83478b8d47e0fb8d29c88178068f9d0658ee95a3ef9fbb139266e702576fbb4eea90471850628a12d88c6aa088424ea7d3cf8ad47d429c610448";
+      sha512 = "302e61504fbe381ab40fdd5a8ffdc62a8051dc331106109392bd1872ea46ab736f19ac075f9f6f3eac93fe09b512f5fb84ca18a2013d54a672f1caf43ad8e095";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/nn-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "6adc52d6c3c4516ced33003841dd1b3dc223e3baa3164af5b874cdabd0456281b0d5510313f380298c51e820b0f9dea6684a3119c1447600f3a0a44fb5121cfa";
+      sha512 = "b0bb001ca13024cad21cd97502a48381fa92dcd6f5a83dbdce1efbc28b23abeb3e84812b650187d22f775d8729c492b7a8a17987c1905e8ee827643e06a3d0d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/oc/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "f1daa77cae526e536b03c038491c86343eca0b4d67858ca039879990e11ec05354aa888704c131784e47bc488ed79990fd7ef8c4cf1d1396e26d7875e377f44d";
+      sha512 = "e5f1eabce231b3ebba8102e6f13665ea34b38e1aeb8ac02e249d4c62a1ef65a8182bea28d51ea606ceb2493b9a8e8ae3e510dc92cecfd37713cb5dee8dc52c90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/or/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "8998bd0d075fb7a611aecfadceefdfb90f4da4f56bb090baeb4962b53e809ecb18a16fabc2397d9983e6f5091e86808155efb736efd64d183f4da392da57d2e7";
+      sha512 = "f55315d533e28e998cdda05bc91a9d26895f7d69be151732a50715928e63d14017e191628b564ddf005708c459354ea999aaca34771ea27598cbe5a9b238f21e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pa-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "705b5cee264ca9bd766abd9c668d14531431449441977ab3d083b89082ca36c330b361bf66b3028c774e1c45abf0c16a5e63b4384697bcf39aee0029f22f1587";
+      sha512 = "fa07e94f5b7550bf25e2cb21059d1b0a6ede77dead1fb6403fce47b23da91722ee1a022ba564c7e11dbe2ea2ff30c782c77b461b3bb4e5ad348a55582e7d4349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ca933047157354690d2577473e5748da44c955fa356878acc93ed58c4546d248a3ddbeeaf003fbd1eb0a706149dc775ce5175dbb3a7019ee50b12624ce462d41";
+      sha512 = "55834f3b4f5ec07b91fdddd7397a9214f96a85a24172fdcfb18e01eea3e3c5108505af8bd172a53eccd9f00ec218e8b46fd0e178d3ece960ed7448e9a5eb79c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pt-BR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "3b02c299e124c0d149ec37659bd1992ec564556c416046d5a604a0dc88426b9a94a1608acdd169fd484904db9b1bec1d5743c4dd66325354d1fb99891ce7e276";
+      sha512 = "d4d3278f06d991fd63e400e3cbea799e721edf62de6241cc712ecdd61997e23b15dfd23197c8ea3602149af6a9ef6aa9245511ea0d4bb00591797f7d68e568e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/pt-PT/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "e15b3a44c5068a6447f239de67505d913942721ab088c2e66c15f4a6cea587a71f66dc09414dbce656775cf0b0ddd61c706ce8c5fddd3e51c889878fb3d8bf93";
+      sha512 = "317f290c2eb4a7c0aed978f927cbd1292843c38a9bf4a9ea16cfbc3a4bc1f452079a6439d4578712ce2d04ee5cb46e8e17a50ae5950b2d036bc91d746bf47a7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/rm/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "5e0ea213d65acc7ccc2e98a462848479dbf07585c45fa04bb3472d233feff4cf4d09cc00a938d17446e9bdb06ff3198c3d06feac8a50ea590243ba2bc090bc9f";
+      sha512 = "b0826babdc742bf6365c33aa7f7be7b15c15ead4fe5aa2acecabe35e53edaabd1d31d02b57a3be83104a4fb14cab6f344c7b67a12c5ea234e75d2075358036e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ro/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "686a0d4386e87eb3616e08107b12488d88e75381ebc15add947dc11010c7d114810322c4c6127446562d611b88d2af5d022fba9882fe1ac75b12c152fe4df7f7";
+      sha512 = "36915aba5be63ee3f5b6a46bf835cef732bfb41c105b3b0e7bc2c72c7abc359c014398948365be75a133d3dcb1fc69288dc44da01426395bab0b8616c51078b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ru/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "fc1df633debdaecd9fc15eae1f8378d211465c6a966f28c2debca1d8a885d80bfbb86cf4aca63b64b1f1e1f18796cccb28ccb181029566d7b5058e1f8482bd76";
+      sha512 = "c43c79f415ae5ec5ffac83db60e0c7f4f4b9f39dff51d78e79a4ef3df60ccee8328aff22a8543aa58067e6418124ccc39152de6a024c58df45e01e3cd75c7ac6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/si/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "4356c6b3029139e3cddc558da4dc33572bb631afec9fbd4f1efcf7b396c3e97311dee480eeef3943f6e8bb34d385522dcc0c245358b795ba76bf0a780fa24647";
+      sha512 = "55dc14dcbbb9ac2369d1cefdac04e0433c371ddc660978793ba44f2bf8b982c13644da7c6ddc0d2bffc6068f51233caae8b28afaa0d979eaf318be81d80d4e9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "26a1475f7c88a466d7a766fc0abd34ecefa4697cf76e020d2a6e539edbbe871e6a6d8cfdd7b2af9b27d4687a88b1398141be86932222ba5af33a615abc7d2d3d";
+      sha512 = "884fe79157630df26eddf10193d09bc929c14af774599beff9fb34a965c713da961cc45e0acd6f9a66df5b2763a6a4db7e7e361fcec8d486fd18b607e3e5c145";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "1f9bb83fcee2498792bdedfba32bfe98486712c835de0bf8f54a6359b494806d6cd5a620b76641125cb874d5c21a961b95bdd5c8157af45792c52b43e820b653";
+      sha512 = "606145426e3ca2c361de129290d8968c77fc099d8afecf6e22ea771533912d8f60fb0da9ac60302f19bac7979f840be6365c8a7459d067ec6f68a9dd29ae611b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/son/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "c3ec8a80faed707884916321d8759363d2cd875dce4ce695470ba9774a68e88fbfd4d4684046cea82e1a82c2a7713664b76366d7c60f191a6250f2c92f7a2089";
+      sha512 = "13c2b730ba38adb35d69bea2315179517892663e9aa7d31d41812496e691f37b3fb52dbd0a99cbe56af705fac0b9b51c6a9d96c1769f4aa6d6f6cbc174b223ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sq/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "86c4c25da77cb911e1e0f32d6ae8ffafb560286b85ae83d17ba7c68e166a3588df81cfb72fdef72d6652f06d41f0504bee0b8be7a4754628b315390141069928";
+      sha512 = "9ffb352754822966685dbe85a42e5f083ead0f3d38b8bc6181f624b561a60390ac968064987a593e96f5a74c01f9b7815cd58c5759f295b85d99dfd54312821d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "efc696c6f835a5d442b344edf4fa5ec248e4fc4e6ede9ce62c56a0dfd0b43e7d582f3c34be5b5350e121e63e86997025ef10b11815fddf2f9ed195ae0ff21c19";
+      sha512 = "333d38a1a0fca834e7c68dffbe78173a1751461f30f0eeb642aba6936cd09bcf0f5b6fefa5eff23e34126fcdd40b7acf28d68eb3da3400a70c245332c8175f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/sv-SE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "34e33ae363753573b3b7acc2fd40742b0dba1e2420106c090cc6e30ebde955de2dd225580b1f459476a0a48037167cbd5de38573324f5d823047fe5e54efe605";
+      sha512 = "888eb9dd0d673815f7cf87be600341d0fb42b92f92b4c39cccefd8bf48b666b542b679bf9d7c87957e39c9c235b8bd80b510fe56e0b449e2bfec301e9f10ae8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ta/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "eb65d00bb195f438f30c94849fff3fcfe29e4f2e76875df54fab641226777f101c988074e62a69d0587ddfd541e5825c190939116b6c7e7df2e00eae6154fa6b";
+      sha512 = "7d237b92a23ba67d016f94aa1f2a5b65425adb9d9a7ecdbb8090fad4edf200cf8ccbd512998914c4d36ca53edb144b138f838685f0c6f757fb8f3b3abdcde969";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/te/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "16ffcce555b6ca78a658cc58edf0889cd08461734e0eca829585145d370103724eeb6b8d0cc5459b6bf93717eb96b9133e366d14a1b31aa88858f079230c79ff";
+      sha512 = "4aea0a2f2d0563f054fa59ad024efb4fb01f23bcfae74a3984222a584125aa7fe8d88729049f9c748e679fa9dab9cea10e3f6072e7bb8d65d3d9313234206985";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/th/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "7009b5cee1c307e4065d6b92665fdf02172df641eb44305fde1f9c7e28fd8c914ce723748e9ee17f2168e09196f64800eac84111b2d1c7f874137c38077492bd";
+      sha512 = "172b2d4d91d145d05fb45a9ef4415d5c31335f464a35adf7a29325e8eb97e6720908ec6cf962935945bc8f01dc18b052ede28c779f276bffe4fe497e73026ab6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/tr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "eedd061d2205f0d0ee07f42cc6009397dbb06e9efe488af1b4848473665ae51a05339f978386dbe8edc06d8cddd3c7e3ff04441c3ae28c4d7466ed6ee89dcb0e";
+      sha512 = "d69bb024bad2d27498fda94cd878014e8dbfcfa436c89b1a8fcbed5968ddc33f2680887547abfb5867c8e47acd926a907e4b7fd3a4fbe91d583de3cae200a90c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/uk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "3f2e3ad63802fbf679bcb34295203d891fe3dd1eced062b02b02e5b144c8e00d13bf85e024bcd590658591c75c95dc95d02f6cfd210e246ff47cf09282278c87";
+      sha512 = "db35d4c9fdf59644b39b16604dbe61def9142b4799ea22e0ce9ad1855a8c4fdfaf06d0db83aca92de8b57e368b6f4933da61d5b9a1b992fadbc1db3a59eeed08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/ur/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c8d40978c1658e7b8178708a932a5b4c98d13e355c5dd7b21057e4167f96ffb4ba3588b3ba4091fc53699545240eca4b4e383f2a7369cee2b310c3bce380b50e";
+      sha512 = "adc59c274967e05de777b591e6e85a65bb8c8fc62d03abb0a5f0f59be33d128bc45ffc731f4ef68cdec743e1def5bb1a49932ff68095716c866c1a039f9c6c8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/uz/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "5c604d63c1dd6379e2d195d4208171b4dbcaa7fd168e5bb8a8233e802a6374371ada27f5f49d64109f53e28af01fd2895b64a93e8efc6077321b30c6630d0d0f";
+      sha512 = "9bcfe72ded0b8ac3e153a41c3440306c6696035af5a288e912b8a946c13431881f53e8a59a242df4f73bf83b5fa6cc9de75fbd0f1ea469eb51b959c54be22a8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/vi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "01f8c5f4adcb64201009b36664be0cdd101155d5cdebffa7f4a160c824e8b19d7463164515d962638e308a511e18cd8fe88b16a4972f15216db429de55484d32";
+      sha512 = "eb580260af95438e0d6e3eec37846f684ce61c12c09a0c563e66ae43d30a9f9cbc4c2c36b9830691d94f2d86ddce0a70b2996b82a9a9b14bbe00f87cac145b00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/xh/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "ba0930610cf94b516800fcfe7112abf261e922824060c4493935fae1f8af184c74368c5c47172f08b08bf201cb74ce4b29ec419a7776bcdc64e4bae8774f87b4";
+      sha512 = "8f794848b9d1da7b4dc90fe91b53d16b572153a6f8cecbbb92fc0ebce468982cdac339938a4c74d629e85f65edc6c2697ab9a671b6fe9f3396c81a6503aaf967";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/zh-CN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "eed5edb2b728110456dd142f19ff3cd4e3426916aa638071e0654f0fb4b6011129aacf4d667ad82bc7252d5a0fef426e0052eb31e2fab2575dbeb8a3fb5f589b";
+      sha512 = "7cc3f84221270f495f1eab5a6bdb6e3d968edde0586bf6260b7a474ad2e6b9c0de737a0cebaa6c7a312fb5a26490336194915b4715d1e9939381e39e1f73476c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b6/linux-i686/zh-TW/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "03ee54fb3258d796f6ee28be53af092e7ab2caf924a2d4cccd9b1419edb7e9e59a2c15e6bdebe255b30c2237b9d8cb2576de32504a588550a05e55cc3ff45c3a";
+      sha512 = "93961413dcd0cb6343e5b65793a7528e4001af511d04cf28d5f869b1fa838113a2904ad27d3e7bda0589d87ae0cf69eaea69e4d126df8c103a3a981f36a9d9eb";
     }
     ];
 }

From fccabaf397942317bd5253a761429edd0a8a3e77 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:55:21 -0700
Subject: [PATCH 1771/3253] brightnessctl: 0.3.2 -> 0.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/brightnessctl/versions
---
 pkgs/misc/brightnessctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index b8821d335b26..f90baee91fcf 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "brightnessctl-${version}";
-  version = "0.3.2";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "Hummer12007";
     repo = "brightnessctl";
     rev = "${version}";
-    sha256 = "0amxhcikcgj04z81272kz35m5h5q4jx9x7v71h8yl1rv4b2lzh7z";
+    sha256 = "1n1gb8ldgqv3vs565yhk1w4jfvrviczp94r8wqlkv5q6ab43c8w9";
   };
 
   makeFlags = [ "MODE=0755" "PREFIX=" "DESTDIR=$(out)" ];

From 3aaa9db32fb0759d1e20297ed11d38745abdbe05 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 25 Sep 2018 20:38:16 +0800
Subject: [PATCH 1772/3253] firefox-beta-bin: 63.0b6 -> 63.0b9

---
 .../browsers/firefox-bin/beta_sources.nix     | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 813217b3031d..fa382a2bf246 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b6";
+  version = "63.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ach/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3f968c3b3256b13b73046c6efc9db7cc8faeafb449a3c0e5d49516f6dbb3023165e2f8133651240ba1a008de80496a83fd02dd1add24a99720e767b73cff7cc6";
+      sha512 = "34bbbd919c8b756392fb085afa6dc23b4a2101f2b089f1a4ea558eeefdbe5fa01334e8a2c45abb3ea2d5409f38693699921938b913da8195efe25353f4af9b5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/af/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "aa2044214846e0b8f808bc2a0f5e45999eb7f2c766fa91dd8dc8d035efcc1974fb6160a2cf6b29401908f01fb785cb4b2c25b326e54924df8c70c31f39e26d57";
+      sha512 = "62e754f4e1a1972cd737feb5d2960d2a9271695ab38fc58a53c62ebf66a889d724fead843b72ee7f48d416a1af66eb2387d49f8cb665fcae1be1ecf40f939f70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/an/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "f4232c87630882cdf7d6e26a983099ecd250b7dcb1d7e1c0bf5ec037aff4f839a056150453e3116bab464c802e39337351fe5827b5e1518e867a95f2645ca5db";
+      sha512 = "8068aad55ca3d6fe47c19ff43b814fa84d93dc051e4f22197ab4b512ba525b30bfcb0a39d490effaea383d4841482c1415f5e0737957cdc83ad8188b3136aac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ar/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "cc2ca97918be68556ece0f6676355307a14a994b951b40030c55a4ad3663e3f6f2fd37afcd8796dd16e0b63ad0382c0853c10ac9adf42de631d4983cdd4573b9";
+      sha512 = "58dce7a3530872be9e1961c4a14a84e77d43d874f4ae0ec0bc1a9bf05e4f8264f832add17c4b05f6586ed7b456667ef85764786dff386feabd23269da7abd725";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/as/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "be3ea0d52a469cda394241c9e030af634f7356053d0cef40da63d527a9a72921ec503897d9b91d15f010fbe10a9be54e4f7efe7e5f77f607c6614d045ff68bbb";
+      sha512 = "7599160ec4dfbdf774ea12231fa1a06e6448304898c031d973448a04aafc2966ab6421a1952a39ab0faf6bbc41151c8f4da97af3400afc0ca8c2f2da74aadc93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ast/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "57825a7e5213159d845673474f64980e89887e24d368a104653b835dcd296bd72593902d6a4589b5e0ed543663600c4021480ad0d13368bd185ff9cf6304af6d";
+      sha512 = "93aa64c23a9d52c67b3da7df22de140ca82e285cbfd55f2803cb55c3c369ce61c32c43383cf140b8ef884d137f072e258f13c3e657b10ceedd7853a84896b690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/az/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "e22a7aed19b698f4fb84a2bdbc4fd8500c6b828cb329c473e1fa1e60396af5cf70c53fd80e62cd2d406a19260cfc3d48ba64e81be98f559335b2a08fef61729f";
+      sha512 = "7ddd48532987004cd48faee65ab93d6d6155df674d37ce744e06a32086e3e739355066b0411e673636d192a7d2610012ead4d417a1801fd11bef58d7b9a64dff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/be/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "995836ead5595e7a70b1bab9a25ab05e6f12955a25effe751018892936ae2deb27b34a630aa68d7352189c76fc6c9b6a52f48df9e01ca2a26dec71beba5de07d";
+      sha512 = "9b94f1741354bd018b539fabc167b842d42ede08a7f91ecca731d90c8677478b239150c06b1fc29888334358b724424fe011630f2b8ebe8ab80557ef6e6a2965";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bg/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "840770bf166118616309aaf4742efb1d1cbd3159ea8e9589c64293a3918285d55088c65999e6b3e50aa190c69b46009d35497cba8d17da1c41f88d7b8c0795dc";
+      sha512 = "8f5f3c7ee95a7b2542de91262d2e67b5ad86a6f1b95eadd5852c04814bfe19600f6a4dba1cc872a09afc124c60e7a9e5ffe630d197f4bc41e15f9e5d4bbf3766";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bn-BD/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "6b5ece3dd9af3b9c4d6e47bd271669656648fec4d4c2ebd546dd19566819ea19890516517dd2b9ab897f2c678eb6c2c968d2f5ba3849a7aacb9ca0607f927caa";
+      sha512 = "54c6be22eeeadc70c390a0cc0da72097468349bdd710698f7e1111c3f1157162f37cdcfa42532a80f2631d26ecd023bab8c247b2e1e4a73632e0f203aebb60ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bn-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "70cf764e62ab0bb069f0715da4275972353462afcf0cf87f0af42aebcdd4a8ff573852fbc466f4b78bed4fe3222491377cac36050502d59dca4be5e4857895f8";
+      sha512 = "bae82b157d08ccb6f7e070d0a187c65dcf2e0d04ca2017658b523298aeb27e87ec1429bb5f8351baf5936599d70a20dc9da673bb7d46217babf2f5d0cc9f16bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/br/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "fec6876647936a2d21c96fd668f0100cec88f56ead11c6e2f261b226b162d9f8992cd130d95b4b1c2b38a51f13b3fe0a9b0f72f9acb8408936548f756754c6c8";
+      sha512 = "b3324be13c515feb2a91399fc490a736947856ebdacb0ce672b854841296e4a8912e0f26ec3d4b8dcec57a59eb178f01284098a3ab575c5f22984eceb1107b63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/bs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "7c79c0fcc079718bd0a39ce88b5989e47c925602709f698aab47951eedea4d74b63966f2f1d436407ffd7e71fc14e37c6629dba90b69b6e9b33fc1a4a3a7dd67";
+      sha512 = "90df8d7791f187e27d698552be49d29467113628a743034eb972ed79c6e054b64aa76a199bfb71f2396284250da8a599e57c85595a0dfd8e184a983cc2e00853";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ca/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2134ddeda70d0319da8d61c8c79ece5deb179e2f3b34e4c28b2f99ac3181f03cc0c66bd46cf7965d98e2cbfae29a4247ea51256c7966e7b887d0f0fe99866b23";
+      sha512 = "ae4326cf2eebfe722f12ffa6d75f1406115401edfe5503b49b116bacda0da94476d7a2e6efca9a3986f530d8ffa386c889ae3a2f559afc5fe7cc76681cfa8928";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cak/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "532a6d9e03da80202b5e667b756c6eb9a1e14f2d73577ad69edfdceaaacd9fe7f65b4eea9c78ab48e8a8182c9e4a3adae30328839c6b9480239c5b018827a801";
+      sha512 = "a9218854b8795e0558ad35f210d29b57ddd285822ac7177f9393fedb9572b99567c580fea7c107caf3453323576e048ce1527343432303e3c4c0881d03732c45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "247f6a20bf116d9d6fac7d9e15517018377b47223230a5a20f887a9cc449e2831e2b09d47e9b0414c373f094097adf1b6a82a3a521a428c52d2d3ec2ee4308cc";
+      sha512 = "543a3cb1688f7f917e06a23d10e5f5c21355fa1ffc01bb26db41b8867bbf42c185f86ac9d6ba5411ee5278bfcb7b32d2659d7a808da680e0dc264e492da2b983";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/cy/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6603623425d443285c883ed0939f0810c33086da37fa4df6738b4e50d72ca85c5f518b924e50f265994b615f8891c44ce4cc198da11a115956f36677ba06771b";
+      sha512 = "e06850664dabc4c90f9a9ecb6a11bcc5b8b7410a3402cc13c1ca75a92d5d69213f01cd5a94adcb45214d9fe334d537c7cf85fd2df0222977d1bd1a2c7f312a41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/da/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "56650af07f629b570a3ac2e1063afc2a3e210b76f2a46b97d7e9374f9db26129ee1bf424ec0afcab380b3dc7ed3bbc330909dee86f14f65f7e3ccfae4083553f";
+      sha512 = "185617b4af7374b7cead277667dea7d9ea13c6edf0e5fecad156e1fcc940c26c8022dc9c4443b06859a65cd979c82529032a6ffbaaaaf710f2b56c3efc3658f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/de/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "7477ea68091928b2f96f6980363046e2a7843b9fbbc79072dda9019acd76325a41d9dfcaa4febe60178316ac0551ce7a2c787799b49a4081d5947a128f675b62";
+      sha512 = "17ee2eac1b1f978c8b2a30cedb19361a37c6eb77974a037d13983b774639fa82807ecbb9226d3916a9177a21d3e3d322db0ed2cb06ca3c48d32e9d264c6b933b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/dsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c996ff2925c3ce57b25603f90ed67e4fefd2942546eb399c6ff40209fc62315379da827966f4a6a7489b8930e31fe437bd12fb18f4a178ae959ef4edba015a9b";
+      sha512 = "af6ef7176e9b93e04302675b5b13cf8087821e1e708721141dede14db494e997783f279a8b5cceee8283581efd5d04ff18a5602703ad87f1ac86a1338be77638";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/el/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ef041be85d2613a5e831b1d1dcc6ea62cbb530275f23406f5661377a861ad2bb9d0502d785071c94e56910ec28bcfb4447e56d1083eb8ad6205d0997c32252ec";
+      sha512 = "1d225254cef8025eee2811d3ee8dae017c1a91e56e1bf749b2f88d0cfb784a384f773b64d394e56097182de5e74c9807fd44efa35fb1d27dc68b3afe511d5745";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-CA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "291451acfdeca62bbc29c46b446e6d21712813c0b30ad8fc1141467b6987fb29b1163fb9ccb9915bd61984c0d8d1d3afbd1f2f97f07669c132a693d78d6d6496";
+      sha512 = "6dfb80b4f9b2b70651959bf5675b615eb096de271fd63bf1542e5d6b04a6c6bb850c520bd20240d757a5a9d84a524269495e933875fd5cd389da30cecab44620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-GB/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "2f961b1fd18a310c050275b5848016736f53607f6838d79cb0fbd1f5ac83fda78385293116c21036adf7a4742277fde38d3cdc5aac338779bf72ea990fdb8b97";
+      sha512 = "ea6a81fd71445400b500bcd3a41d3af15b6125d0607b54742120119430c3993f65e534ec9183e9290b674df271706b0b9c20b9c3fd482e79e99dda67f222e03b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-US/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "54e169bd171baa0345300691b993052a0d03e2701d7da2ac1df8f6c21c7f30be613d36cc1c4ff07449aebb01152048ec8b55d5fcdb9655efdac53721a1d70b3f";
+      sha512 = "c438b8c0a0c14575eeab5e41ffa5760378567ffae890a2cb5b8bb61b17013f815341425c489158c3bc6fa62e23a7316b79aed20fa971f476a873c163ca79bde8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/en-ZA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "6530dc0f3e38a95ce13b31d9426c501a8f807bee75587b25b58448dee3793065eaeba745a4abfa7b4c23a0c92f482f5bf99e39f5d4fca3fde105d90040464d0d";
+      sha512 = "44a5b04d64cb7f6528838165197d8be83ea45c0b84a0b4e444caf7f3b33d4ac8ca0e95fc8f1abf9e54b1b4102dda7d57709549649f9b7af35b4fdf112a266e85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/eo/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "e900cc039eedab4159bdd645d71cb2279db5e667edbb2e614347aff8a484a54800a8476f0461fee4699286195d3271e6cedd6f42bcd2ee1d59106f6fbe15f68f";
+      sha512 = "d5586193387bcb9edefdcc2d66e0e718b10f0790c29a7b45b0a7ef2382537a18d151eefb2a5e28af05078fcb798e6a6ca2b6dc2348dabfbe9b77b79fdcf6d9f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-AR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "fca6d57b7fab0ffdab609ae5950f632192f5de314e3406dd8608194f105b95df5c2fc7f32c014eb0b1adeceeb6a53b46473e5d8d82a3e5c6e4b56efe06a40a5f";
+      sha512 = "b2dbeaef33d58cb69ab4ae3474af984211eb180f31b9207a0a8de9801899b25aca63fa0164d8f631650a8a117b29078b780e90891e22fade85d1910d352dddd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-CL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "eb27a2ec8d18b00541343b7034f99235cd51b3fbabfbb298147e6a1eab22df337debe03504a567d68f62c99e39dc70277a12c48f0df6a26bc7fae9f37cdd8908";
+      sha512 = "e28890ea9fdf6ff771198f5dcdbdd0dd0bb2bc85fc3c1d2e0085536c9651fe0c853be528edeef1b37f96c9623ea0f71defb51839239f04b4c79f9fc9f462def9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-ES/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a7ad1f6e8c5c97eb628354f9b436547c4f817857f6d1f89867642fb1d256bf517f871043f4554ca98a780f37cf111502f59b4a290a3e1e5f202e4d5fcfcccdc2";
+      sha512 = "fcb9cd80dc5d55394b47239431614093f40963a208fe0269631906b19628514a93e0777e6e05b703adf3c474e92613d6239ad889d1602dbb36dcaa196af74af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/es-MX/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "1373fbf3c9c9a442e2253de8d800bfcb019c39e9832f5a551376784c33756eb63c3431419995861b67bc056355dd42c51e2df116b8ffff885019baa44f9facbd";
+      sha512 = "2cf4f172fbac8ab6c91f33e177c7919560556733f5cb18f6ddea8f8bada941d44161b6d0485e04538d334854f629e54f159e66b061d65aa9d7ad27f30c58907a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/et/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "0a12e0e00a89203e83cd03a6b72e2fd013a54fc2da678d1fc6cd9e78a0c1a66fd0ec6cbad60ed0d6eed3beda4d29ed19d9fc3c111c01810a7a06cbd595f2bc2a";
+      sha512 = "e70b40ac7a951da75f03e04640d8497c8628aa1b3633df180c6239025538c9dc66008aa717022bd2ddabeb01b924b05e1c076775ea5188bd70f60c921477e169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/eu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c2075cce028a676ad078f6b1f0d050abad6e90c23724126a93033e6f3991b787e11f6604308674c89426d1e914506ade2f58eed541bbe066de662cf59aa97aa0";
+      sha512 = "b4301494e41c0078fd34779a7da0d49efc7cdca25f83a9afc609b1deb1ab217cc5ede37e9c13d447e10cf2dd34b0b1b55a696b36beee96d40fc53f32e5d6f0a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fa/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "725b78dff3bb95d1c9c598c3da97febc92e639c193a48901991024def3faa21de6edccafe16428971aed904793d03e6e0cfdbae5b610d46ab34bc536c074d8d3";
+      sha512 = "9412d03c831ceed000d277de746efbe85347617fd15fda1e0649f546c3cf9a8f845230342af4fa629bc0cfbb6dea1fd8994d3dc392b0ea893e4aa9da0f076222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ff/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "69fbacd0723315f008999e698cf2209eff9d49a3be29c4e7589c90a4143f6359c37bd5586f2b79d96fcb780600c8df82562ad7e680f33538eab7c808b59069e1";
+      sha512 = "867ffaf66c28e111da286b3bd00605f8b5a373e73dfc660e0d5c3762cd08486491f25662867b964f24f5485bc41ce6783c391d7619781ce03d1576f9edea2001";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "6c5df02349a9ecd18e79e63b8e84fcd2fd3854a13ff310600317841d7e50f70289c735f1421bff1b47badfe413443c0e1fe27308c46e27958ad7769ddf3e355b";
+      sha512 = "b9005b63b6216f24a8d6be5acf2b086b682557dafbeaca593fa4aa9d9bcb13150443e97309a9bd585abb9245af37d041982088c0541b95391654eceb8c0e54e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "277606330ac880656490698b8baa34cfa3f1a1b69ab8f57e65cdbfc5ef545233ac5301d1c396cdd4211058d0ed33157110a14ab745a0295e0bf154167a26b4b1";
+      sha512 = "a8bdb7f2a27eff5973ff6c15fb68842c0470337c5fb765d7a0874501f9bfbcbf1864a3a258c9cb56df5e29ad8c69d77bc8b8c5572b51a02ac077e572893c9788";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/fy-NL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a3433a63fbde753129168a667c17e35364fd599f627bfead913431ee37a04d3576f8ac37171807fea13acd724a5c2f8206426f310c27ce85ae74d98ec5dcb631";
+      sha512 = "e5d9bb130212db0c1e729c03a7a16ba584a00ceb26cbfbc254b8bd2851b9d57b8d81b746359452d66a0dd6617e62734a68e88db6cc74fa8ed5baae063bfd6acc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ga-IE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c83ed532b1fba3c839a63c8e61d51273930dcfded6d531cff645b57a520415cbfb3b088d4e6659ba330bd3911d77a10b6110d44887c53ec64ad47d93d2e2ded8";
+      sha512 = "b582d7bf274c6a43cca7a441a36704a22e5dab8903c323525ce6b29949104a057d692b9d1e3190bcf254c4cf76006e8e312d3e835e160413e7b659f0328a34f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gd/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c88d8b536510936e80e175b634f4b9d95da104e905dbebff2283b30dce89724882bbca6e3d7edbbeb5280f6e3ada52860a810b587d35da1f4b1aab05dddf5f24";
+      sha512 = "028454bc9220da6ae7c45a08c897401fca9bb44b6fd5b358373c7c6d19673301ec1643578b386bc3d1b6faaa51e9df40ef31f27a829ddbde302b34a7473c0a0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f2fec677989c93e49318e590c935a39fa958cd153f89b3308b1970cff62b97cf59a85e462f4a753bd913bc3e2c79d9d4c2095858b3941532200fb1846a4b3ebe";
+      sha512 = "f9957dd96b0b67d6f842c0908caacc747203cd143814c50c04d51387d869fdd6e958b1f0d262fdcf331f02b6672db738f4b55075de9d9036d3890f99e63f872e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "4b3b6bccb78a0ed37ecfcdea8e9fda81a13d1af65c2880981b999c87360b627c05508e1b694c54a70c87c779b41c61e45378a6c5ddc7eb989106589c59cc37b4";
+      sha512 = "c2346118765b436ea32eb56b3c8cdf3d4eb89729f5bebf708e7c7cd4778e5068d39d8295e045b1503c65c2a3388c98ab45532597e802ba0740e3081779204511";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/gu-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8704547fc74b2814c85e9cf4a4dbb5c2e52a86995b19d03625cf7a62944894557e6bbc1acb0f762b72b70792169462b8fd1dfca312f1201d78509a44ee2a5153";
+      sha512 = "8cf5a1b00f038c0d06048ff88f1e49ef6db82d86b58341bd7b4758430ed2a990c49deb274ad9faba87f2531acd6bf4506886a518d02648cb0d8b33299ab8fb2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/he/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "f8d6be434dda8dc38d727792772d51d1ac6b2bb6ddf56cd73e186b917da62d2e42ae6988acfab2bc08e8d371eb5ab2dfedc4a73df10c4f1f6718a8390b217cf7";
+      sha512 = "a7423bb84d6e299ae39d6fbfe0c7fc0650e46e6509c1bfa9fee7cadc50ebbd161a8fdc44289a910b4199d2fe97028b7f62a821b321ae1884e9359a7b3283ed2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hi-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "89de36898f1c03af052f9fded0e85ddb2987a26c7e85e770f80d4b88b5545539e809af8a79e3e890c94462acbfaf25513c9395f374d3446ca9c510ff7ce2ff48";
+      sha512 = "ae7404c79f130fd75943e9f1687b15baa7d29ae6dec176a5faba0d55c5d2795367b1fc8d665ef2c8f3767d70a34e4ca0efeef449f39f44ee0250100d6f3deb7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "bde719d4f6a79e48732a4dc5ba8871020de21b28c7dd482be59a4387a3a781f7ed583124eb38e7c09afc5c902fb8393684a0cf67aff9b0ddd37d0dd9a002a768";
+      sha512 = "c3f77366765494c689707ba0159c496c2bcd55b8a76e9abb49e3f849a99d34d7ff2a57f37b6468df91f91abfda87d142dd72a5ccdb4e5f4aeac6f6360b30767d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "90d585288c5c1e3678eb6b074d5bd52abe2b97cc90d6f70a4023655a94e86e287e0109fdd57fc6ae4c3d6a650380e8934a6421fa9f0eb9ecd764cba1d4bac061";
+      sha512 = "591da976361db115ccca4d859ac1e105e8fad61f4e0b945643e1fccb77989604517421900889c2007248c672261c5e7bdd37c195610f9b47db7013fe5518c6bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "427bca6aae653f53d9ea52b8f2cf93d060c005afb48f3311e139e6361786f40b1a29ee2c4f0d3b7942f40d9c356d4a8cf3bcebbd4c83c1ad4e1d07ecfc5bf101";
+      sha512 = "9310a55c992c545cb296319329e275363e944dbdf9109fe75fddf6d4b87e33d5bfa5ce582235933218777ccc76ad51743e50bb2045563d8d00f20fb8d3359159";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/hy-AM/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8f5bdb8a2bfc4ada26520cb30969403b20a653cefdf1c0163e2616aab77342e51bbc2dc0c5cded0298c906c38cde3fd27cd95e3b36c7ae489db90464310a6d7b";
+      sha512 = "b89921e45b08b9c8d93498b76a265cecdc5d15a6ff12948f7ae0f4de414403e096ab238e115923cc51541a4d220f4efd7a2840199adb852527ed0f53b97076b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ia/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "009d4366ac357911c50b445cf4f99888592631976d0f8b323504105934309bbddb37dba70bfb2068c579ac05cdda329d23580d26a630cc1c6f7bc9335e2f9efb";
+      sha512 = "5c857e348ca910dcc200ebfb3d3d3afc9ee30f00cca22f8201587c8f9464317690e330c89c244877a9a5ad12d090a47ef0ca8de725e4ef9676f55c9a9a612108";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/id/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "4b85a054ba11a68ce137d96881f86d983357e170e9011f5017f39a7c2dee20850c039f90aa6460728c01e5e04e966e4be6c3a1e048091bfbc0cffd9e50b7a0df";
+      sha512 = "ea5cb9b840cc20d7f1298097b2aaa35966021186c5b59d39b47e58c7a6701a4c7029e1e891273ec73f937b237068073e91cc416dea58864c907cdb0979c7b9d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/is/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "1bb92b42b6da82e59243ebeed7a0b219ce370ff3f6e52aa50748cb24dd6213b8ad1893e7320e2f6b591a19beb8fbac3d89cdc0eea84c18c55eb971385dffd272";
+      sha512 = "ceccb4d0d3388866488adf59a12de217cbae5d26d679db63b132cd4ecebb8dd1fee754f9fe4e3419718a33cd8582bce983b5166639fe375a1a3c7493749b2b73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/it/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "6738e3d55ada6f4ce88081f1c4ff20feb4643165d92619e169d0777fabee4adb2fe0b3b69cde8bff542c0cf3c64ed81d8ec7a4bed2e68c6f3810678569b38e06";
+      sha512 = "e1834195e237972c48d5b7f237281cc6e1622091efb8aeda4be6f4ecabe04b8f51d3cc86be4a1aebb50cfeeae039deeaa758a23bf4c36ea57d927c5a57c01fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ja/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "be234bf275fe385b52c07d2a900d510161272fa8adb8f6da53e66afcd104310a5216b741205b376c07f1cba630d79d1019b7e7937533f9dc6db7785dad88055e";
+      sha512 = "65f07c789cb22d0993065e592be705ba80b03a9453770f0681bc355ac6aa32d7aee6afd2a4d106e39cc763dda9b9578213647dfeeb2db0108f354d64c5c9121f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ka/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "2b5e93931150cf683f5b895117a76f7c1a456f19b256bb94e2816adcde6980c22938849e9224260d7a4365b9eb7caa4f0b4093d93509cc783d19fabbfee197f8";
+      sha512 = "7da0dcb993d25e4642d86fd1ed40d88328cd380dc1d9e037c7d771785c128e085516ff302e168d6ba08ef27de47c0cff14c5a2f6cfb0d7430d9b2d37caffb5c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kab/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "09ad7eb4ba151af744e38f36dd8533b0d616ac3d085bf88cd379809007e9d36fb0769d2970b889d066839fbdc79a25f476fcc30fbdb4a7ce14c1030300ac2b78";
+      sha512 = "2c79187951b8225dc88130e1e37baa40d3b9aa8a954b8b4d51bd23c713e96f80e9205f902346ecee1229623be64c59b34ade01a1aaaff10f7786cb80f3af4a7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "dde0e6f296aa4687825db6a507619be2154962c881d0d9d115e3c286f936d94cbce115eec4192f97d1700910c9d8db11bf1a3d11f222c20b3db16ad66c696275";
+      sha512 = "28ce4f55d95f8db27fd246ba812fb9d1ab2eefb955e544601429caeb5e1767820abf8f5cdba693033b91813371ff1cc0bb106ed88de869866960aaf92aa57d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/km/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "36f78430639c4b8ec80dcf305d59dfd35892f9fbf0a8ed0d2672a48060118784a076277c6dcff76081496bd70228d4688586e4e65a42f421008954d02b703648";
+      sha512 = "e61a3a5cbb9c5c094d2441511db8b6883e2a5a15180d60f03d05bc597eb260955341a0247c4191acade5fe26806e11e660e5d9360d9da4f2e6a88ca8b205fca8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/kn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "34e993088835a9af6074a74b36ac3d078a44846177e7f46b544afb177af099baee422a4a0c222abe5199756e24294baa501891994243b9366d4312f43344b268";
+      sha512 = "e6fa91115190efe19e210ff1f77c03dc3b5529903664ed6ab8e205843df49523b9b4b8d24ecce8c46670d2a9512872e1f406c28ff7127c574cf7402d869888b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ko/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3eb5c66e38eacc85ddd3eeba8f4fa74effa732960d940982622f6b9b45321a642867267d9ab09ecf4c13ca2dff8a0e3de5ca722f3240b89ab54590c144f0e1cb";
+      sha512 = "373738364d15ecd81112a64e8f32822ad00994a1e4014c33631f05c4ad3656e7398d8ecf2ee9988bb3a885282190599c2b19941457ac405438f6f5304a92e6c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lij/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "27f758c0fbc6ed07e4aab87c3b6ae30faf2b8f0d818f430d3d3ef75369f4488172af8b29c38eaac3b8169814252fcd08917da03c60ea6ec71bb752905760f5b9";
+      sha512 = "11530c0504400332469a654363825e08b5c338c6b8e27be5721a23ab49ed69d8a69e97286ba5e930ecd9a67cf17e453dc130ae8f8c100450f6fdc8507972d8f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lt/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4697addfb6069fbaa63c8e94ccf83adcb06c43e3a066e32de37fb64c946f199612c415b0a97d7dba2d4a6c570100d40b7834725b98ca8e388a23ddc78598b74b";
+      sha512 = "63970fb0d3005a4da865789623d302f45e4dfe5e140e6a7158ccabdcafd53a48eaca43a5d016c7bff3b522888c8def078eaf95bd8b7cd8710df492d89a7c8ca5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/lv/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "4c6ef5eaa81ed5d656daf545ee25753f7c9f12c562b9325cff73b07e0bd4dcc9b467a7c0930812f825a2aa409ab10d629fb139591766564c8bd59548dc671181";
+      sha512 = "3b5d286ea467cbf1e3435ab13a1a7ca90694af534a11b34e2efa1b3eb1dd4d9bb18402959c247628b97b698f0a62447b23027995125387e1be84dc39e42584a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mai/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0de6f387a3a3779caf526f6b7c8b1b9a284b333f93314a54e737d908633e78e3456e53013558325fadc981665092d356aec379e9366f9b64c5dd3888cebc089d";
+      sha512 = "da8d85e7160207670043fc03f2a7bb1053fe6480e0a0e5f5ba583dbaf922ebd5a77b5faa6c3ade512c4ba53378df083b8c9a59485e5330a63fb9c876f6b7f4a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "be5ccd3fdaf9c530bdc2b6ee0348ac52a3a73093479e3e18a78b4bb2f784dc2ff050d8e7216c64561d835d0f7a6d930419ebe06cd841a5f8ead6289d99533247";
+      sha512 = "fc375837230aa468dcf1e5a89a162f46c386f95d07e007698470e5bfb48900750709dc57a723bd54aa89dcb466fed768cdc4ac5edb2acc51b3cf56fec2c22e79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ml/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "fd06844bad011b8cff7bfaf6ebd4042c95ace65a24fc693e53f1cee432e5a76e1234016be242c811aa0f0ec211faf0d8e36b0833ebf738dbf78419edb6b67af0";
+      sha512 = "f4d8615fb76480b4af8ba497632c45b06c0e464109ece1bc425dadf376581b01d7a34540178334081b485ec280de46d83616b0570f50eeced483cc4eb6bf344e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/mr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "f934e0346d75a9a3d0fdb15254748afec3060e576f965fb89e67481eca3c6a1380543a107b6d16659e8dab654dbb6b2549883dfb8150d600bdf315de199d17cb";
+      sha512 = "30b7e1c97aab33077d1c322f3e25391fb3a47378e8365d7437e0cdb814a45ccbd5e7f03129aedfb83f51ec06785427dcf180f41ac247f562cda7f32d9d6ec060";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ms/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "59975b62484b3cd539832beb1ff243bce8e1148549ecbb3d1b75b9d3dbc7cd18ded9499065770702246fe0ef08612b4cebd1017e3a8fd4ccb849c7174d97bbb9";
+      sha512 = "8aa1546bddd95c28cd155e614532090d01a6343c46f67eb55ad9b82c48f6f0b83aa27852b67756e58869496b4c3ba3b27cf130a69c24ace248c092cb877b87c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/my/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "36bf346bbdf5f984fcac96dadb4de9ff62bddddad48df21a6aacc9fea50244775a8cfe7d1fc90a79ad12b37d2c18c486b6971b82e80256ef297f32d7dede8944";
+      sha512 = "1e38cf10b3ae242610d81a964e0816cbd947e7cc0ca5445aa3cc4af14e27b4e4ee2f7325d9011e01f3b45a3ef1ef8c8880c80bbefd9c88f1e4fddefdf871c74f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nb-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "fc09ea41cd2941f55686de2ce2b0b53d84c59f7f62652899ebdf673d6b87f3b678bc5155c0feb17832e0a32de1fe20574f6e9d32eaf03d468adfdb11ae1051e6";
+      sha512 = "d5ecc468ee26cd61f65984ebb02e21898a4eabbe3f81f3dd98b127e4b98b14237b6c72b94bd96e890e44a3a92f70d9a4c3734d80bf52b58e2160f3d3febc831f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ne-NP/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "b48a729b9619bb8294430d45c217fce674c5f179b238cae9a08745ff101630929bdfba71815b31109d2cadfa9f727d39a9318b80b07afcaae50ab607b8d5ad85";
+      sha512 = "f0ed61857efb6527ae2d1be0e141e61c3b43d7e1a4b6415b2d7717924332603910d2df02f9124c77f67736b776eb99f035498f104fe863b7dc071a7f5431caa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c32c199d135c5de225be18bc336414534a973602b477dd0424ee3fb780035c240a3bebea937612c5a746dd240cbf03e1597ee98401ed0bf0a4f60c15c781d842";
+      sha512 = "0b4aad92078da9071a17c0abdcdcaaf800b2028c4154d35974daebe6253427cc22cbf322f974acc84b4f6ac6b669088813fd3bb6f6cde35155f281db0656f7b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/nn-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6fc57dc47794e3c086fca47352bfd7030f7a9678c2e0f1999fda58b0b5a29a8a7feefaee480ab1c1ce1eb21d4fc1ac5f77f221ff0de56bc436b2db96816d67d7";
+      sha512 = "cbb3cb267763dbce0ab77aee54b2211eff26f7307ff6a7dfdebd8f6f1321ea3ffd396bdffec17ebbbf7a274a4d37503dc9f0b70cae0854c740df158de5360e36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/oc/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "ea37736ffdfd9d774aa32a9cf15082e6c4f14cbb241aadd7d79303642eab35f50ef5dcd8a1701992789da9dd32a6c5f87f655c6ad0c045d7f96f2cb1c431c8fe";
+      sha512 = "26656804968ec7287441bc28a0e5d6a43d8c47c922e33784e2186fe3552c68c054602483b99cf97f093fa7457bfe07f94d0f6838253354283d3a705b29cf5313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/or/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "c1c294e73a891ab0401f8c8d5c18279f62084f80969440bba27907919d2e3357c931571ecbba40570653da382edb5038e0418a8a400189b6d880e7ca03d02f26";
+      sha512 = "fa55e0b1c927d698bc0c640dedf0b134996b56e12a73ea493f30c3321ad4df3587dba0829f1cd116f95d6e9bc5a35732dd32a4b4a1b9de611a70e93977780f47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pa-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "0aef8c71dea8366860afa57cb5176fc5f9f6ef4be55c1c84402b518588fde181fa6b3be99862180ac52264582360563247afaa2fb107344c9c4848c4714b6252";
+      sha512 = "2a394a2d29ff2c63f8db24c09b85c4d7a488a4e0a4b17121ca54b95a0c7a3f40a12c59105c959eb4baded027de8301ea7161475d3f4130d353e7bd95e2d36cef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "14ba80c2f2d7cce10784475895930e4fe0d22c0dd8029b931ecf22bcc84435172ab0184346a73fb7b1c8079fb1c0b6dff782d49396a3fb3e933eeb3cb7c3c5fa";
+      sha512 = "1f4fadb6767b7c58cf242c9714925aabfabd9a080a3b29d39f1002b9f01e73b6f19f39427d57c7604eb3f3518922ca4f2127322565080817e674bce64aa6f3d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pt-BR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "9f148aa1983aa68cc820b0982cbb23ab9d15023a5abdff346b6d279255ed9b9ed5a5aa1893df223a75d2cb405066d81020e9539b7f51a84f6e4b24ea50b712eb";
+      sha512 = "e15090e6a2b79ba0829b3727e6ef7349443b51263e596a39fef83951142b6ed0ab2a10bdad9afc1b78941f1c38c996b4556548bbb92553b48335e183c210f92d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/pt-PT/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "0d4414e33d482990c34e96ddd04469c529d5141748995a3e8ab977733f11c79b91b94f0da5e648e00e269ee3fea173619589a63c62b4121fba407474be98fd33";
+      sha512 = "eee661bca9d04cd7c479e1f371b0d426061ed691c85067ac3c36e9fa7c11aa03e1bb137459fc3f638aecc17e94254d4f4290caeffcdde9225075bdbc3b68f5eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/rm/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "2550d2444e497ee35daded5c4f5d5ed552754356cb612fc6f6d062b1a078f634fdf56f181b2aa27fa1899af23aaacad37aa82d87a089f3773cb89d7696306bf1";
+      sha512 = "8152b4f2811eb156c45850851a801e4d9c3f235357a0a42b25f4257ddbf1e4494df612f5a94c99e7c3f3927f94f697f34dc233d4c88c042c17648b538ea63968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ro/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "83196bb1f7549925b4ee97403c295db75006a240016d9965dd68439a3bf2cbc81d6e3e7c9fdbbfef0b314f3f6856b04769472712ed6a1d77e03caabd493c685e";
+      sha512 = "0930ebfd13a5ac96322458fbe4ff98f0ad2faa69de467275e345f55ccf836d4393d5a78f3d47f363b73602374a331496461f68c1a76eeeb7586ae6dc1171ef7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ru/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "c0040be66b906b57b91144f369e56c819f7a58f1440e1dce4ffa1108aeca76c83f40adde4db57d7ffea84025086912494a7d6075de7d82045879143e39d08fef";
+      sha512 = "618814427d173a0219a223bf3052bba7c8c7d22e244d66ed1fbddb061bcdb786d78176842e34ee0cfa7c739f958043a52a6f55904512e766a9315fbcbdaef351";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/si/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "689ecdc02747f9ef09209b9ef2a46d3e68114fdbb26bf8c5ce7e0ec1647b8bc726b0a1cbd8089dd18109f0fe7454ac4f5dc0e0fa952ba47a25c475387ed89c9d";
+      sha512 = "e5407e2469f78e73a78eeed46d0e5cb310313c5bfadd0dcdc12670bb63f8e399b7bcbaada3ecd17e77596be4fb15f28d1706a193743cb7d519f8cc0350b8ed30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "9fd5c81b2d5c5f2a3f3ecec159c36b51a0a16735c8fa53e957a49c361fe5c88cffd72616bbb6e3a5b31f99f0e038fc8f8f43261d657aed43734e3ca7d2bfeede";
+      sha512 = "7eb1c68eea484df32aae65dc87961f58c59c97b31a12c5e9de7d7805cfd4ed9fddbd1da7fb8e7b9857a835979b2a6635111e211f72bc1bfc78aa0534b40e03fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "195c5214f66ddccc8ae943680664ec75d403c6c0fa4c5f8dbb019423723fd75df17804033d566c7072b4903ee5ab8ff04a1b10486d9b00f17511482dd73f67ea";
+      sha512 = "3574599de52fe2c887cf81992f9cd7302524082a00b26324d3ca701f2eb2c59eae870c70abe7dd424bf9c0a2ee869a34107265c0d8ea6bb7a7df149f12345af1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/son/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "9fa5ef38aef6812945eaccde0ca19d73aa4f5b06fda6229813f1b3f4718ce90461fba0f67c888bcad93a531223aa335d6f61e28f9887af2c2cf85d45e7c7ba9a";
+      sha512 = "6487b05d6b6657b2565d506ce7bdba7cb7281fe6d0acd5a20052012e22488acadce65f238c0195e089c2da4b9bb13781e5b31b2bb85208da9622853c12a8f648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sq/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "82e136a3e4dccb9b604d5bbe853d4c4a4f78c2a5477d765e9df8aa7135648f925bddc79805bb72833df4d563139748baf45bd2ba72e11acc9cbc660d59714e38";
+      sha512 = "e69a3757a5c752f3e417787c4cb02c2330a467ff76c4930eb4c32faf64e63943162ec0681af1899b8e96782de6f50c5c31ab25e7ac1f777b52e4da223df5ee49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "4d915a9a2a81cb9e9936eb75424a546de1a2375c0d36530fae192f02038cb4afcba3ad4ac017eb4c4637def51bf8f2ea3b49f6d4739bc6a4b2599975310e9360";
+      sha512 = "38c57fb51a76c912d07a9a56f81f4428aa2fe47be395009af1e2b6221e0baaa4f3ed8d31693a737d615b5e97d8fcec33ef22a3151210877e625c20759b355034";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/sv-SE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "b03ad21046c2b5bef78bcced78166147fa93ec5f10cc0e48cee403c9e42f2e61c5276d734dc9175ecd7eebc1be1cf6254638c0eeac00f463cf36f849bbff455b";
+      sha512 = "6b2319ce5e131e05419b946435c901f654d9d3b35374396220b89290600ac05a6df41cb344f0b3d6366cde1693b925870221f2d8f98d69e0f6bb41f0ab6e4dbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ta/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "85858ba5ef0b5c3e89c855740f6147a71307dc891570e4c99d6db49e9a25d37598b2975863a308d0ded578626dc0752a947db933f50afc550786fe66d9858fad";
+      sha512 = "39641d56d492786df53a39dc9a12c26aaea0035895b225a4b0c82484e32ef1a907a07d158e20962d3243cfa7bbd4205c7e3bf7b5ed5fbc5ac92e0e28d1cd6f35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/te/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "271f53dc27eae9af525a2bada8496e2d3a7237856062e125e9ef3e188c79cb04171a2bbb6648a58a545cecbf220e14b7464b78c7f378f74a26448bf4e76a3c55";
+      sha512 = "3beea5023cabd7c5c30e9d95eb162987cf44dbf34885d5b72e931adb0ffa8385be8a72190109558a6af7050cd479757dd5426553c22a321b4c21073956e5d1ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/th/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "cd63b180020238cb720f5dc8d439a97b879fb7a4ce3d3e0569ba2216109c8244de6c2d31ac1d4b631ba44ba36b7b0ea63e484a344447ab11bb4f1cb09c95a289";
+      sha512 = "40eb8a38fd4a66d5a1b81563b05dfc5d8e22767ac7e7a69f47c02ee34d132868e9b2b2be3591c6183e5e9c659e8e27c99c7e002c8846b069233b91bb65c1552a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/tr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "58e2a575f1564965eb69409548ae66356995ac7e6f4fa1c30368b86bdd9b16e9c24d581f287ddb7987d9b12418a6bbb06630d3c886b4807407085be57285b150";
+      sha512 = "69214b1e322743ae364f86efe15a4589b283ef2bb19cca99dfaede9b9672f79ccfcab5b2929f910ffa203a74de9fb6ac2945bf79af55a701394ee499a0f7278c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/uk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "34a666d4932a5812f2142e7cae3b88e5b7f247d46aba0f719def7f71efc287f495f2bbe2a769b1b8d5894e84a1ae3ea5571ff6d893cd94d57d72bb29b731ca2d";
+      sha512 = "3f8e68f2e665909bd531a24d6d66d1f8e23bbe3c6bb40def5c28e71a8cd8418ab604adb19750d1ac509e583264bae41804a228b854a0df479a2a32aaaf452145";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/ur/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "2aff092fd5fd768c8d85186e4ea5a8717eab40aea9b02f662e495c73a71b26a5cf3636408d64f8ed6cf92a9ac60467b5b8a0361ca359a4e5a5961b1e2df77528";
+      sha512 = "3020c7e26afbe079c87c4a64631ccf57003135fa2e06516503bb40cd0e499e935a95a94bd729890090a4037bd2bd400a68d68e26bf8b6af91465dd5235310abe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/uz/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "7265652e77785516a81e60f13b0c8629382815fe3cad0c3f506ae237f1725756b4d3b5b4c645a50fbbc4f31bc4601f338ee01d9ad53b4663fe94734c595bf218";
+      sha512 = "6b7895cb2425071f77705fce09b7de49e01eae4c00af1d35fe31783bfb83d62e310988c73612689aec9f05b3825f1fef663ee7d42b52ecc84a04a3c1aaa45bbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/vi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "7af8e33d2539f1ef7139def4939a73d041169ed9f96beafa999fd464ab736562f399151bdf0f144ac5cc564d627d1af7d7cf74e242c1afa36a174e993c83e2b8";
+      sha512 = "e34f384f75faac4bc45c9cbc0d92fadf238b8d9d0d877312b3bec2bd9e47ae0bbfd7097dc647e5b4fe68a28fe351a659600bc860f2caf6fb6a9cd9d22ad7273f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/xh/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c27af26c046c2bda79af486e3e9adf5d2bb26a88092c3853bb798ef057298b10e29867ca15246c4b6f492bd255ccbd87a8a039934fa74a0e59b09186e70b8dd6";
+      sha512 = "e11dec71ea6c8cc54cc785f264f280c4983fcb0e3f5a6c21e73f660d455a1f96e3266fa5d714072fd868b09ce381cdef0f6497948fb4dea44adb3a89da901db2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/zh-CN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "6344d2270fad58127b10139f0557f03215e3a0e91acdfbc0a40bf5ce642b88519008787629bc398968f2778b2d58ce23cfdfd22735ec419358bc04395a4d28cd";
+      sha512 = "2a1af884c86303c07162b3750394d3ab9faad5f5dd8d1867ae88385b70b66b757c53afdb51ae12f1c8ab7f57c347259f561d176dd9104068d5f3f1271fab2d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-x86_64/zh-TW/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e589bb6b8878bcc4470403e3d2df103405a7980b6bf3dd19e13ae28a231755f91eed8cecb09a1946a645804f026bd3b04ea1b3acc1416231cdcc2148abbb9531";
+      sha512 = "b9568016dadd0fee3c01e37206b515762edd21a558b523723f6764f469af99054f5e17712327ecb883f1a84ed799bd263e11fd867073ea2f68a238b78e0b189f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ach/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "eab5ee28b0c03725c403556567f9f4d7d280b8e46355af6efcd58358d5623d0edb69bac5d230be34b0abd5c23815ac686539e8bac53682838de5ccef46d1215f";
+      sha512 = "099ee11bce1f4cae44427463b45713821f2e0363119446c3ea04425504cb2b812f9f9c28102b38fd65bb4115d38ffdc0249079cfdc3f850c3a59755f6429eec6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/af/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "b728cd2536a9c319bcbe995c782890a810687de604babceccde6c54f4c5989c249e7565a732ca07e51d09aabcc89280793b3624d438aaf888d0117bf0954fb92";
+      sha512 = "77930408b3feb29e49582ebabed8859fdfd488feecc250aa6c8315975d6cbff09a551ab5e3c4330eb3d4ed8ef43a3c4776fdda2bd2baa876591f634a4ce0bfbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/an/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "a4c4501dea36758eea77183bcb18e6f070f776abf120052d1b85fe01a5f7ba46bf901e7064c97dd1d7ede451946c4b26005fa5302f01cb804511512c6a41dff4";
+      sha512 = "0c3b334a51ed74cde2296745177df5ce57eedb43644af43ee16cd4fb0d070dc1bd117012bf5759975a708098791b6d0ff637a0501b064874c9d8decc2778111e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ar/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9bce6e99cffba96eeed14f3add5bfd27a1665ea396a94e16cd21bf253b711f2c5d4bdadbb08416bb361c3fc69f065d10267d91e23916c110066b6380a9b4a873";
+      sha512 = "9591eb30ce5bd4779629faa60316651c90e6c97754c8580dbbafe7ac85d345488b4af613068ed5778390dbdf9e1e06cdd28f9b758bc5940dd87ee39b77bc31d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/as/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "3708b422b68680a661a0d919478bed981b8eb7e3f9173e2b14cab5b2a15cccb4421d7ff4f2b14ebcd2e8d695898a1add8bd9616d6db80fcb6a4021d06425780c";
+      sha512 = "cc3eb28017b91a77cc72984669cf5f62e7ac4d9fc0b415597cb4216bbbc62028e3864ea897d3b3ae616da7c603fa3109456b1bb331e712fcdd10e48151fa87dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ast/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "bf2091ee05da54d03eee37ee21ded86cdef173582310a6508d9277928a95878aaf7bcf1aa5bd68e2d2ca9ad1e65d47724f0fd78d5d919e31e4378b676204c6f9";
+      sha512 = "23c04d3674afffdea2f9abcbd0fcffd45f9e6e1c7288fc22cb457f80c664ba25f89b154fa1ef80a12594b93417da943eb12e803a74c3467ff523e27feb3eff6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/az/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "d45f1667a8cff1b8714a95f79b012467adb6bcc7c095ef4aff0fd54a2025b0a1fbd834ad2e262faff609cab0c300b41d8cbbd11307751f5373f3460e7c4e70fc";
+      sha512 = "2c99eed922b254e6b1f64ae62f958a6156de1fef5a26185b1d70f5569f4452f52ed3b58dfeb3dd0ccd121fdcb365c68a613d25c2d0b55b4ad15b5a91145e1a46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/be/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f663fa9a6a3f4d23e792a0bf36bc6fae8abef7c7f0b3d13907ca319fe1d64a22fad391e61b77a1abf35e19f8a5171330419f51d5313ae8b698c1693c3bff7b57";
+      sha512 = "1d0299bdb7f4bdf8967888e1e749c0f84a96bc2f9b7ac6cf857e0f368ffd66df08dd65da20d6a8c93ce5831f9328870c5d50078e29a3698e521a5dabc19f49b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bg/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "4da474498d551006f141471730e5bc2df1eefc53b5272c5857a6f2d020593aa3ed76a1fcd3c2d18765bda3dd3d0937377684da83174b5fc703816cef14abb05d";
+      sha512 = "4659e8ff47719639f6fa0c16c974e02ac73d4bb51635352647bf006238c916280217c9ee2691723ca40ef10451ec5940b2317730a322c00c609f01ff68634d06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bn-BD/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "d9c59c5d6da1e2ff3d487726e469483eacad2ee6b25e1185b4033cc485e86a5092e6085f7d5343e996b6ddd77cc97d3a4a503361d472ef138897d2125eea17a8";
+      sha512 = "54b366a1b07867d6d24d051eb367183489a0bc87b5ad72607aa1c6f7393f0420d7cd38d1ce7c2ed5cbfd910fd1c9d0ab65fee4aaa1a18792e09798ef85d44098";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bn-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1b39194c16f6717e212f8c51b8ea97bc4f250cda22976218a03ef1447e38df56c2095593de0914d8d2f67bb980a2a407c74809a6600dd5c079b6c4943c19f346";
+      sha512 = "6224053e229ba628ca78e54bee868113709bf4e6e559681e74d8c6a656958842f1d9f0e157dff7fe003215f3880c237e060ff5b5c6b5ac9882237edd8bbb90a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/br/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "840837c47fad73aa7391262f00a1c50479d3fb43d047dea8d02e198dab863cc49e9a512e632197e0330c293d30b345de764f266e67aea0cbf675e8256bda626d";
+      sha512 = "0e96eb748c5cbf4d21ddb9ae6d98d4c87c54db7c6f59205b77365522137598a29f97dcce47f6d91ff479fbd5830b316e29a9a36f69045d5fb078e340309208bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/bs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "e551e302b24f053efe05ce2b5eb22dd5c3c67b39a5270d3cf802eeb6412e2b8fdb71813817b3761a4d6f028bfac5a17252e7d64752b94e7aae3389744d21c3a9";
+      sha512 = "5eef8480eb7166c78ae9552e783ada29b1a2ed0774414c1807089263ad3b6b4726ace0f68af4454f03fbd379cd9e69d7963ed4a9b23ea383d71f33f2e77af5d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ca/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "1aee350896ce766299a75719fd7c1eaf14b62d2ebd7260efef09a6c2a0dbfaf41884577fb5b387a4001599d64d48b6b2cd9405a47d6627b02ab2f801cee5c3d6";
+      sha512 = "3480209479c215604c4f7b34d41b5d766d4c5a0c3d6e5d71f249a5c27d22c2049fdcbedf49b766f4aad950d1601af061e98c1be22c8d919ef3e78d125a8a6ada";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cak/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e46d2e799ce00f4c6c24f5a90a0b723b3dc51b00965667c1cf036976be8ee55680a67a8a63e964ec721582d12ac84ca72aa19cf8b8f8c7f2942529830ff9b5e0";
+      sha512 = "6a8e24323139654e8e484699df06cd6109f343a9a7e524f50a8f5366c2de2869b92bb56b742f9ad3191830f0dd62a4bf11b0b60c40214ea1b32dc56235ce04d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cs/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f78e1cd0f24f756e9374929c6ca2df9ab8c455c6ec5e3c1696b2ba17b187c56a6e6a16fc123b599c2deb0cbda1c8fa963a66f8217795f891cd01f8450af3cdd3";
+      sha512 = "3cd2d6c739348e939bf84ab793d3ea105e37f16aec9cb353c31f772219be2cb1ed4fdc3fc99b71754e0450545086694a94e86c53354c7dfbec7436c655c0aa04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/cy/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "7d69f5ac3e2d2808d6cab53201ba554efb20e700a6d95945f96680f84fa61d9349f6bd51e8ddb5081e39044de3301ac7c0ab4fee3ec2abefafe96444e0e00d98";
+      sha512 = "db650f6c6201c8d6885a364e3477c8f0341c526aaa0e708039c545814bf95c66b516275ef464a1c1ab2f1bc4d5e7c58d03b4d6deae8cb6a4de477f64108f128b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/da/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1357e1f114f800a1a0b4f6c333b3b9ef1be6ea7353cced97dab3b253d39709b330b76453cfad83952fbdddc92d4b590455a5166b1006dca8296582ebb5d8ef84";
+      sha512 = "ed189013ee62440e2f6a326e2ca1ff3a0764ff589e514a2eda489e519695144cd9378bc78d10fd18bfef65e39a27500fbe4f09c64ec9904693db153d83b884b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/de/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "147e6e8e5399608f18bc5bf7f2eccf9cf44af143aff5e2d876d6f1b7880a7fc6a05b38954548e05289a586f3b8ae2272bfa802bcc3960cb24e9132039d120f8b";
+      sha512 = "f77538811ea28c701db8a4d38d9286aeb6782f4b56153c98d2133caff823aaffb23a3b3c014adb09d2a5c295a68a8e0e1a071f41d86ecec21c6f284c52a9338e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/dsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "3a3ddf43dd388ec96494b529275b27fae940831b3180c3750dcdad3037be770c4405d586dd7aa49db709eca376272d77943261e96171ec2c413ed20cbc43f1f0";
+      sha512 = "366fff164bc3dbdbbc143ba37aa3a66befd5c2bd89bace5c9bb669fa5d812e7505140405c08919994cd65e937e91035b9c62bfbb2a5668f4273f295fc6dad485";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/el/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "be9e7dbf2d8b750ec002d1dd818163cfe2cca78e65dba20f055dfb0c967455768aa64e5b9d5159d6dfb4ce80fe6eaf61db8fcde4b1d1aebce250dee108bc8067";
+      sha512 = "8898b25d271037fe02772270f358ab2e44d286bf1d5be45b67d57907ead81be2990aec0104e724d8d105793e45454d571e7eb45ba67dc75dbd25ab0a467f698e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-CA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "6606e63b836e57e2b02737070e59438a63ccdd1b633d1658fcde8d4b794a32083ccd640668abf0853cece990892197e9f2a8d2d451b082283cc87a036a3522ec";
+      sha512 = "5ee77fd93d9b557fb729031f96880b9ba72990d47ddfdfb3e4eba38a6eabcbf63587b0892551b1d9c023472fc8681deb529c6d4f8b283d11b4832f9e2992cb4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-GB/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4dd2493e7242f790a87a9dab7afb097d038e7a3bedf44ac7c63d84322b60a84118d24073e3be479792ca451c2cf3dc201ad56648e215c30e001318299ed9aee3";
+      sha512 = "74e415c2545b0fb760be6c459c7262e309c72b3e41a580e36250f381a74dd1d48a2b62db4ca93274dcb71b0951cbc42f897275a8664242d0424281f227699a37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-US/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "505d3bcedfe2483ff46ece4bc208b120f2da0893d90d11384fe294dd360d2b49c9def89c2435484d3248b59afb4da5a25e4403a9d82c4faab68b2905740f0731";
+      sha512 = "c37ae4711dc74c4beb8bdac272e0e6353c4c88b170c84de86003c11d0d7a6d615f28d567d2e3a36b7dd9a06eaa68f21a5e2e64d12ecfa8c4e6f8cd2eb8eb9925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/en-ZA/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "cbd5fb2b5f14f88038a15b602741e51dbf1e9b3b824871f98cfeff331a4cf5529f55f0c7401683a453b39e98aed016df404090dd3bbc7a634620985895f85401";
+      sha512 = "bbfc1d6bd97fdf2302c399ac1c0e76f949b73cb3af99af04ec0e502f2b9b0e353cc3ada738dad6699cd658170098b6f87f87aa231e563d62527f75106e1d101f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/eo/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "54b045a91db22cf4f079c9ce80ed3e98987978f6cda8acdb218bf71e4d9de510b3122a773e51bd8378183623ec28609641428251410df41c3c42f49468a2d024";
+      sha512 = "2c7cc1b01a4348ea18b6fc39e773c79a0dfe60a72b9637cda0ac4cc05de65eeaaaf6bbc05b5b15f92c1cebbde0b385d58b173f347af4538f2545709800877070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-AR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2de07b3e57fbd845b506862588381bc41b4d36afb734370fa7b9b9717d9f65bd2e42d3c85d4fc6f244e68c13583627f618b7b49ba5fb5e2d62b9d3f68479f1ff";
+      sha512 = "4e9a3fb356d0e88c8b620a0ff00eb56bd25e341e951f3e4139d631ee276dabf78575ee9b2b30e159708388a25ebf088b7c5c88dc7004ad4e0fa8b1bd8daa5667";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-CL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "36de5dabfd2c212e4942a859058a34afd9678dfae19dee82437d1df8c3a794648c0b71e5262b6f2ead8ee2ab43b7d4ffe011ed3ca82c100f66a116aab81b3ac8";
+      sha512 = "5b85539c1d8c30e817c4b82996f9a5cc8d078224b97c32c910931965db45a09a186472722de84e7de7349e8f9f086b9d76d2fc87c8775f67ac829e9137305e32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-ES/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "44421cc401469730b0797dd54175677d6a663efb393ec172c98f89b18de6a64ed3ba74b960d9c13d35c0b86dbdbc4ac8721bf7e7abd6943cddb7685f4dd8cc02";
+      sha512 = "5a39cf930255d271e8e318bc285446a5346cff9443db8dc5270ae0232d2b4b61345dce191136da2531bc3213f4e0abf6902231abdaaf5bdf6baff2b7b689e84c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/es-MX/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "bb2fb4de76ed136ba9264770ee5f5c7a63e195aff2122294b55d1dad5fcfa53ad2e47ff34ef944cfbbd8b84a57df72da0b9611bf6e8ebb07b6e29803160f5adc";
+      sha512 = "2a57741f8a2f2325ab6ebfa46d3e26f92b07daef81dc01997d8ea981e9713240a08830741f37542ddf948f022a2ff56378915b5bdffa4215f64a84136850c648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/et/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "019d81bc4fbdfa5b86d9f92ff9594668b62228307a8f449a64be7ec696e151711cea0860bd8a7112d9aa994626fe1a96b8a70f2809c611f476e73686a4fc0f40";
+      sha512 = "1b8bcf9dc03af2ee215a24eaf82ad75efe8c8ce6dc9c2fbd4b7d8f751f7854604b0fcf3ae941f7b19ed2b36daa03fd603b1ec2f8bfca87b16fc8741b939ba8e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/eu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "02709783ac751e78266bf7301e9e155001256947cb5ce3cc1c8bf7debda220cb70d3a14454a73dd4bce22082999fcf8c2944ed1c1c40533366afd6a40b78b44a";
+      sha512 = "04ed8f610132573951d32e2532543e8a056a89f6f2ae252c72c3dfe1450bfa1d969ceb6ead5c707ec0a5b9e44d16b25238db1d4e52035d2555339bcef20c1947";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fa/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8e80f8a0853450de97623cd274a6e376c342782dd9b1a2754b0b1d176084c479547b3b78241776588cb4fbfa40d2f60c8a4ed26468f075b557a343e467ca31b9";
+      sha512 = "71204442585640cec6f2ca6f554b403f4a44a5aad4d899d264b1c224280a03fe5053e21d030d2c21be41571f26f6d97468d26add6fd4c8b3e82a97ab1be528a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ff/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "13a46600b238bda2b7f601bebde0e41ffd8d71e47ec434e2d4cdbdb437e8cbaaf59bb36af63e83a6f99cf13e3dbc43df942e9cd29834e52425b325d399ae479c";
+      sha512 = "cc9d2d4de8a29cab8ced52ee92e810f43ab15052baddec3275f5a5245246be4f5fa1c19d9eae8d6dce4337421a88cc81ccd3e87538e85740531ae1140512a396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "f14de9d2cb994f23f6fac5557ef5c0f64fd8833e469cc80e4c7fc4566ff0b4c4797a0f78c4e05ba7ba0a1d93e22647f50372129fdc48e33d7c25452627022035";
+      sha512 = "28b1be8512bea62cd40c83d52a1e5a0d3e1ef1e12cb7e40df2205f0a973558ab70a88a7df5d9bf0c3aaad2d73c55b0dd6cd0130f89e844d555369e844552f092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "8b8f5320d1be4dc55185f013ced37103f4017c8b855d04c99982b8a3f8e3f9161696c28c798098f697bda961726e61647f16c1e71c479fdf00fca318370d89c7";
+      sha512 = "f946653b1ca82eb83fffdc2ccf4df81dbd3952acdf77f6f7c3f2bdeca4b4b09af9f7ed282743494fb790a14bab9863c99e18ec3077c6d03e979621ca2ead6387";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/fy-NL/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "bf6265205d7e3ebf7e3a639e1f2189eac267afa906748505d02a464657264e4c4604bbd543e9fe32831c11ebe4ae23b7767155bdb065725a258cfe34f82e5196";
+      sha512 = "5d4bc41b40f8bb680f3e4d81c011994d73f84f8040d05b5427f0932013789935e064272621c25b19bd51c2cf3c8316f62aaac60b75c2f950de77d2e306dfd52d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ga-IE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f2c924148d58aabe6105562762cb9fab4fbeb8eebab89a736792fdef830fcee2dd19b41d04b58f6cd5a850883b7726deeabbcbbee45c3bce80e64fe4b05cb40f";
+      sha512 = "09a34eb4a3866998b7a26aedbc6d4e7ae5bc5b091c5edaf0675c473730f42fc8446727e7fb3936f5768269de43786ac823911038272ba615d745df43e23e6928";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gd/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "ace52bd9f1dbe2dc52dbdd77872e523f066e032305ad1ac26e680ecebbdf78d5792dc8b30abc218a7e483feb01cc1be6dc715e8e93d19e220194438de7ca01ba";
+      sha512 = "77c8f4d6a3fdd2a8525d173fffd36254419f87f46b42d91b050faf5779c0fae4944df3bc646f1d893477f3aca943e09438b467b5ba6d8862a9f3ffb2848e69de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "7decc69243d2c0ce0555ffdb9ed2cffc98c7716150e55d11f891e26a039b5d69c78e19151ffe9c2b61770e215c6194e44495c6360a5c5ab8bc6d045fe87e281e";
+      sha512 = "9634ff8df8c375013d020415d6b4fa944b539511291a6c0e2e4994ff618b4cdb36420bcd78285427f9aa146fe774207f39ad2c0ccb6e23040e15e3cb0ce39cc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "802d4a653a9ad5993a165b5bbfe181dffbc713f139c6d47c1f808633b5511c535357da14722c2e95f02cf4ca3d713537e64a3ba72e7c1e460caa83cbca6ccd62";
+      sha512 = "226e115d8e26e9c06dc07a3611db551632fc383f3347ca421df3fd82d21001c51ab2e16c937be2c98bf07d00529d19de090bf9427d548a2f6c2280d03ad81006";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/gu-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "8aea57f8059a9645f609e11de02fbc83b563e0edc3e84d0072571d924686429de9b1c6817c9050bef05fac4c4535a31bf108502c54bea86ce50952b6bdf11c2d";
+      sha512 = "6522b70c7122a18e9d975ef2dbc51c6fe3d23cf8e5fa287210bc29a7e63821ca3fe3d24b6a6fddb0fb800116ae55010eea95f7d555c94468beb90bc9f3e5ec1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/he/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a2eea01e4b6ebce0d9950ed550c1317a5b4a89f43ae74bc30d36d584cbcef1df8fd783f2a9465d818b32eba548d40aa6b258a9c4ac61d6d7d2b68775cda6a8f1";
+      sha512 = "3a2481485d2c641f9d2205bf2679a733be224fc463476bb7f3ca8ea275d27a1490410fd9fd54f09b3d91bf165d46d26f4fbf8d173f01740280b50119ad25d80b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hi-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "1798cf81a92c4fa0449c9c14e4f41e879b79cea4030f10412d95005be7c53474674c914f5b1a62f7734f60f159b92065679c90c650a6d32193e701f723308fe1";
+      sha512 = "b5a6241c748654d858337b81febe8a2219ba2d3ed3e03725ca1432fcb5dccb1d715920b2a009a00ba330ff51d202b4da27ac6bddc329011e830a4e715a089db7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "17a64f915c2d49eb3a835d250d28d0a535c74514231eef5861de9627b4a52dcb86ef7620afea56d929c200b39885a772ded4f19c78519762c7da3e59358cd878";
+      sha512 = "f704b353e92532c8ab0598263a5ad92323f46289a9a4369f05487f22dfbbefc59893938916689b0bdf1c07a079ecd8f6d8754b16c9cfb99333673f94ab1699c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hsb/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "deaf0ecf6f4a871b82e6ac091e2273f5fbf9e9e7433374d2094b5a5b97e19725b12c64e57fec8113ff97501027a5b9758419daaad8cbc8685e91b0227722cb88";
+      sha512 = "44517eb11cd22ee1bb201b14c7cd18dbb1663f0e2a52c8cd1d0e215985f2f9e67d80ba4e10ee599f693e9b12436a9757eed94e3dd4b82a8ae37d1892296b1428";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hu/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "8bdbd1387f891f8dfacd6ce2ee61a34ab5938832aff4b2b21738e1e672dc8d524f4abbbe0805506bd914b0991139f603b5cf431cc4b50361e2d0dd8f371355b4";
+      sha512 = "24d7a30076378d584f8f524353dee730d9ebd5be16a5e6ba0a44af1e7f0b51fc96670f8fb1f6a661b662d649bfdc1b6be6ff19410a913031a108f610f0f63e2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/hy-AM/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d0e252c057c8395d49c02f218ed84bf409189ce970a279eea816face6d876f7646db33ace6ae6cb1dfc7c4b5e143c89a483cbf363bfcf95f3f431f9586c1a1ff";
+      sha512 = "4bd50fcb8405a59b4624277ccfb2a528667dc386b87f815551ef264655d6c9cef4cf0d2452b1c7babde138aa81fbdc6a6484cdc6890e0f6a4e926786ac0fbeb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ia/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "00af6fbd66080b69777f1e04c11a70f2cf6c34206e8f8b78a40342e787840575c5b15b066e2db5f1a25ad79102440e1faf2b899990751f45c3876c5663101267";
+      sha512 = "d62d825507c92878bc022d85947d59d93c9913cfb02a8dce0e2937a4527a80444e59bb324f175d18322726f1ba9686faf349236ebb12fb268a3e13eab32fe317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/id/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "289df92b4e23123976b2cacb586302d09dc8df466dc85ef835df260e1938902f3e797da052980cb3cb7e29d9a2a0c7fe602f9cec45541f0e789d3628a830cd30";
+      sha512 = "955ac0a9b30e9209a0fbcec5e88b94d75bec3b8455a78e08770e5ce54b10f73b8642a8a2a1b534ab9b3671611fc6a9278c597c3a3e84b073008c42745fdb6892";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/is/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "444fbfa5ec27b0623f00d48ee2ef7ab0f172806f4a74322294ca165cdb72646dc6ebe96085136f94c009a82cbb98aeb1d50b2aa6df8df267f80a6317a04b8ed2";
+      sha512 = "984a706f8ae3bfd09ef720e5586c69da7bee182281b8231132431080b6504a265e891114bd7937381c64dbd9dd09904b9e531849998409c29c235783ad8c22cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/it/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "bbdfb37dab9e9ece7b4f17b1e1e06b1ca24b88fc43ca9760e9ceebdf7b4778f919210d64e95ef9bdb96b8ff79236aa1d8e5c8720bbd2568f4b8fab188b0b26c7";
+      sha512 = "5d917c06052408d11c22945aaf0f26b1c312c8aadb631c935fb341893d3d2c762feaf1fac8aedd944fea13518a73fddc5fd4850863036e05964e4ae72cca6542";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ja/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "82b50fd71be229632c6bead6af45d3c90bab32206650000aa8492135f3ce56e6895ced667a3cb7a32810758680ba4cc82fa72cf57a266f5bda0c7aa3f60e98b2";
+      sha512 = "3fa9888377d958d879cc04f2763593a7e88871d09e304e597f27997b4c4291d5db7d9345cc3c19d09de8cde34d5c4c1e9488eb205d075cc9b6f368db6c77cf29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ka/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "02e25e99ed57424dd1423d234155949f460fd560e76e3063be7b1d2948878d5f68f57d965f1289f1a5e49981f6201e8ecf9777bad68c5822a818d9bf7c26f29b";
+      sha512 = "b0e49faf822c1145e185069e001d63480132619b39b76ec2baa36456f2402f88e6d500cfb86b3edd7387e11f145283e1256218e0fae8d95bf716f00c5d682a44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kab/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "2c1345224436e8107bbaa6dacec6ec7a6ba74f3f7e2d24ccf45e24a852202ebfb6fb3b803ffca539dc4fa1d58f7fc0aa6ed8e56647e46ff794287ac691aa93e6";
+      sha512 = "1b4f60da621fd4d7e2690b84541edb16f58a4065f87bb6062efa8efc650b1e12de51ad583c5f11941dfb9849572edd27e5bea83d766a9b629337a3f13b3d0502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "925210f2c2ad93f29472ee7588db499a4212e7141475bc96b3f7c76f893a0610a9903ddf9abc8707b7b8580ab26da896fcc869ea505fe1cc2cc6509b058f1c48";
+      sha512 = "97aebb3ff8b39d2bd5fc7bac22db0169eb30fd16523b8e92fa25d840b289331cfd3aabe8686f85e76396fe8d57e5c4c7b32d5f28bb949166b48eb88858285f65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/km/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "94b49896be62788e8634ad41c64bcc1ada6dc4ebb9ccb98883f196f6afbcfe5b44654d7295495e6d647f55da0d5b43340d5e728fb3b8ed567b6e3f9d5c5549de";
+      sha512 = "2dea52a11615a8fdac422cc495a5a344ada2540778c0300eea3e85ef5cd906bb6fd009631fd62565bbeb01a65470f9833cb66345fab63493fbc0e8fd8c4d85d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/kn/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "6284470b93ca5b934a51eff752d1abead88baa2168c985cab94023d7bf6e6b8487d682a08f4a6016273248acd664b91bde7e9f32c0108f18eb2bc800c7f766e7";
+      sha512 = "72ccf22a789a7aae6132c9522138e5482024e61550fd81122969a641227448d4e781fa40e0472e95b36e66abd0c74be3a96f4479781894be1323cde248c00e8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ko/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3f970d147a88322d8dc2b3e0a636e8312dbdab26ef888cb0266d9f99c29ddc1310c9cf7a22308bcde967ff1b2f243a17ea1611092d58824ba7f15980ee20912d";
+      sha512 = "b9d627ecd91bc9510b777d355cc821f6eb4830748eec14ef44ff1022fc3daf42caf9212e9bb4ad541584cef9eb41f5ff56b216c2c6e68dd067e91e75202f4eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lij/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a774e0f3558626edc6ff244f36e5aa2c8d0743eb17734fadd577d0edf7b81875e17d1115e901f5680a798401e1da7ef10cdad093dd8dd1c5a63c9a84ec8a5dcf";
+      sha512 = "fab085b0db9c01852def72428421440731a17656f9d77da2e5f5743703aa7ae3e51e1a2172efe47610a4f02b5655520776ce2b48a7e6ecf9cefced78cf533ec6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lt/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "d3c4fce5b8b833a53dd494d3dc926d7fe2d5fc6d4a451e7597a63ce954b5e676297661baf4f5a1012003aac2909abd552efa51705ff3eee2184c7b6a4d833d7e";
+      sha512 = "28ec2617cf310b2a007112b308bb47f668f89511515375b2e822947a7ca9218c3209975845fdb91989a70285601c2b5f7b04e1ea98055d1c0804f73956e3b5df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/lv/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "0ff4dc581b784ba46575a4b6a5efc90ef7fcca29eec9b077adf7556b0b500d89a5558bef211cdbb76884136bc85fdfdd4321c6cfeb93e1ff3930fd7efed88c06";
+      sha512 = "08dc0583e0c7642aab90c9d4536b567026cb245fb44cbaeea8e91bfde9ba1bbfe90667ddffe8c1224ac59867d4626c4e3641b044d7b25fc85d4832c2fe0e3522";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mai/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "58d2dd9aecf1515e81262cf3319aad363f4f3c25dac1e8ba73f086feef119bb548a40b286e272ba948706a06241c6f64b3f03a677c879a3442710690bef564cb";
+      sha512 = "dcc85c2b60851cafd12bad1c018cde11150b946147fcc2e213eaeffa5e89f4eae9b346ce90552b0ccff6efea64fe126eaf51d5a442173e0954bcc4d33e616b8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "179f34359c0418307e7fed73a8d34f4af6637d066398340531a896d7b804c4f78b71b192daffe50aa2b6713148fe7103e35607f4c1070def21cde891586b5fcc";
+      sha512 = "56a8dd0b99aaaf975e932d18a89dd5364c0277e11ffb6077bfd38b63e38a9960b16f638e304e836599add79db4d35c05db13110a5a0081c24855caaf0ad25f88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ml/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "e4dc114ca2d8b7ac8d24b85464ab07ae5964122eb8be6d97303a2ff97ba503e8d29a53052e475ebd8248e5b5cc0fcd8215466ddc29274cff9d0eadf4b5cbd559";
+      sha512 = "d89b9385905130130373612a6f0e79da26e0ab2bd7b0a28101b429b3d226d833ad2b415f6ce02746bc6b9c5fe5eec80e7ffa733a547835c636408559281766ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/mr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "397833dde5956d8c6e5d010e6597366b237923345534ead8fe4dbee4d427e81122bd67ed81980a80a429d1234290fc7633e52a4a74d73766a838de90b1d7aaf3";
+      sha512 = "a1c76c260d4347e7e3feea2eb5070dab80301a305195befc2d988f2cd982e8a7d6dddd16dd4b0016fa71709426ef3e9bc533aaaa3d3e07fcb8c1817994baf3d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ms/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "840a4c4fcdcc2c250fe265e5e7e52c8963a2c9973f5d429ff0d7d4a9d6d2a94cdafb19c32848be2e894438452d34e6e2b1601a4dbd993bdf884d06fe7c102a46";
+      sha512 = "a68f7794f28ad0f083d6200b5bce8849b370afb6e5cc0b5013659f7818afd3dae38fd2216c80a2b555a0dad897365e6cef2c2152d969cdc5d4e4e59ef73d23b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/my/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "abcd596fbde8705b50414f64933fbecac68335227b4641341a975092646444e8f5bd32828e05083ea1e6c8499e1329051b6de954f9b80acdf2d9c60a5b946228";
+      sha512 = "936b3fcd3bb4b3119768bb49f382cda0e5d6601a83432939801248b0fd3e1f734438a0f5d69bee96469be25333a77dc12d57f2ab65462feb13d6f50f8671d85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nb-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "d61b9fbc5b07d66db2658c95cbffb722645a78c75737c2de1f62cd73dc757a083fdcee3b0f2d649a27ae5d1e26344c194b3e064eef668a734d694a63807e0c0d";
+      sha512 = "4bd3ee6c762423d3e10b96f583b0b785778ca7a72074122941e3cbacb8e8680fc6d6fb4daf2a8d13615947297a27dde03cb415579762c015a6fdd3dbd23bfd31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ne-NP/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "323b19eb99b09b7f302513eb8103ecf4e465b8249501a872ed811adffcfd4f8ce280c8362b1b9cd34e9d94bed22ba10d4c6735812899b482444fde984ddce1cf";
+      sha512 = "de6f295ea831a91249857e896d888d3866db4aa39fa9a2bc57d46d4f8e0c0db2858733fd6db7326803dd75d6d5a9eb9f34d85b285851ac2066a6dbf7242e1a5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "6b6ba812e19a6fa17baf0a45fe5bc5d6f21705ff78beda3a12f461b43a0e2bc26889881c0d52b66c8fb0265c762c9b763f01161eceff12cf0eef4e61b393a450";
+      sha512 = "603e7b90798d500dd9c6dc10b29735f8a0e1dbdf8ae8c776f1433ea92291550b67581a0a58b60314fe32a1e3b9856d3c2cc22b42d23f5c339201240e91047d8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/nn-NO/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c122f8ee627d712946ef302fb9671086ab2da22056ad93d15061b47f66101c61bdf3001f0406f701787ae04f34ca713e591dbae3af830931e0f463e26708d706";
+      sha512 = "e4a4513296533a965f470464b1530a14225f71cda1edf17605d49a565b91ccad25ec226878c315d1ed1cb80d491c9e3b2577e41ce252f0b8b5c7fd99b136b6c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/oc/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "71423e13e859fb691a874927bb522d54c3b6c196e1f107067e599df594ce99af6d9a745502190142424558407f65cce9493617f7d4c716527104e8abb6c2f13b";
+      sha512 = "d95abb474023bed4471f366c1109f28f7be2a938d333cf30d3e0b76429a6625078f78cfa7deea42a541bdb815611e46ba6c4c77f3e890143cb001aa26a1b6ef8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/or/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "7c5e784430f7e43df723676ce23e49f774dbada41f957ed1b5c2f0b18897aa3c4f340eb940dde94ee79193e5c3c65bbf9071e1b7ee5cb00b248ef10da6cf5dbe";
+      sha512 = "16eaab71e1896ba201a44cabb84083d3aecd75a8f1e4736d9046976e2ddd983de63b287512c41ec2fb0b942af7d2f36b2b7f8923d77ecbfdfb751f64416d0b19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pa-IN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "7bb3447da606501e9494d1e523da7203c7bd7cacbadfef44f3417b7a7e99fb9e6471518e9dc43f15be36c5c3e120dce1a04cec1a083c676ba212d740ca48ae43";
+      sha512 = "0b274e05f65cb11be8c0b6b70cbdefe5c910b8a9e8c7200b6778e40e755e656c4849bb1bfb128b36150a7fcfe1cf5b641c7a1872cf14549c9d039aebed7ccc07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "74954ec0a53b5f113604e5b778b713e189f0fc889345aef8d516261383ebc1ef9ad3086576bdc29e3052f0eb1b95f02bf66558bba6f18c5b4694cd02936a6764";
+      sha512 = "2b03845b3795bdabe1b38ec890164cd4d83e2ecc2ac36fb2a96aa37c9db97f79ce3e8b7d8d113c2a88decda342b445b2caf0f137aed25def4177197fe4ea9d2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pt-BR/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9f733d7440761f222097ee389f0b7d986ddf35c14046bf17e53dd9af1ee3dd2040c7058419032edf7beceef2735eb6d753456990d2909888a80a5adfe1cc2a88";
+      sha512 = "80f1105afefbff17774f5389a95453d9f2c89684329506ac9c6bd9ad8c7c40b29a65c0f6773bd9ad6988ecb89a29e21dcb1eaf1d53b91f6186632f4cc1de8858";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/pt-PT/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "9929ef96a510b321515fcc1e959d832041a85c8ba2af43fa54eb676a01f0240a412bbfc49f7746e4e976791156e11bd94045eead843a9f8430d04d4c5de3d614";
+      sha512 = "ee0b41a61efce3b9c439b08de1e518e8c886655d0952b1c7c575c413c042dad19da3f4da6505615706046c522ffe918c7bfb26c5ad97525d60ccf36a0e17adb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/rm/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "7aab5000205de4e266d2708fd20bb75a58ab3cda940538d2bbf6ea5a38a64cb1e3790ea8a298e5d6d2dbabb78db1e73bd7664764e10262e83f73795ebd8f7840";
+      sha512 = "6c761c8b83da4361398efdc196e2390677d485c12fa5a696ed5a9b9bd8974d693cf199048369d1804df739a6f1cc45de406afb08cce2354bcae35c66230f66ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ro/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0db825ea45a80d4b50bf62ca1e0a1c04f04d325214e809763967d233b444e451ef6a3bbfe772bc3c8b5b85ad36d084ad3c932d7a644e0fcfbe114910ceca9999";
+      sha512 = "59f679d4113a12d14f99bc3faf765c7ef0a811ee1b638ea1b6e04f67cf3a97da81f9388833e94a38bb47bd88eb8c16b0134508289128771ec7135001b79b199b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ru/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "431e1b93c68b3b6c7922d2d3619ce60587906caa048810c419153541465436fb831077a28559ee696276caaab43fd63faf20cecc1ce5dba6269d5780c7f00e3b";
+      sha512 = "2296a95fd6417eaccf832f33811c6a65cbce5e6520ad4cc79ce3adbc1b773ff51169654ac348c6ae3040abada2b3d1b1d3981fb3ade7998df033e5fa52fce391";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/si/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "754a03316364012fece2330937775b44f1939ae27749b57ababc752270133b9d432dce76d314464f6b650b4706dd1b2b771c987d97cfebe50edfa2ed44db8820";
+      sha512 = "4b67e4731bc9d5e0570a5d03864d1857cb4864768006740c8f5880aef4bddb499976d4f69223def08a7db104eb459bbe06c2e9023e2e2c84af85166b17457451";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c2b8d786b611ed3ba4a266092d61a4a019a087c39443d3f5af0e9b7a26840c41e8f8bd6823aee10427a93ec0c642059fa506b79eae738ebfef12c818ac37dc72";
+      sha512 = "0fbe91caef978c857f765d3bfa4d6c116f0a4d80d1fdd4d9d1f65baa8358a53ab0f18d8527e301e36229230d28a68e1b840ed5bc4fdd5751be39b1e9c3095609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sl/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2d545ed7f9b1571a34db7e0074aeed0219e8fe08a4ec879e5be1e3845f77482a38df8fa41b2d58e6bade7d0184f77cc41226d72ae9501c57152a1695fcf87e17";
+      sha512 = "75345e5b882142b16ffd1a978fe91f3185cf7dc906494ec1a886130d9a51189bb2cd3a2d3b340b63b8c7ccaddfc60d46e2e7c9314a9337dd1db21e0a1dda03d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/son/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "9049a0d8bdafe9075c8468fa976bd33a33b77c1e3f8edb52844bcebb5f56039a7cb64db60074176138c98d634b9f3bacba28a9ed11c06da27796a3880b182de9";
+      sha512 = "25f9791dd9fa9ec38d52291de240130c998fc6186ced18a41128b6c68d3375702794260a77b7ab8c28dbfac2afe0bce0f80bbb8ebfa3f3529346e264690c934d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sq/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "59facd99a6917dfea8f2a65505b1eac14c07f5ea349e321794cac77ac8dad7a53a47eb4f72a011e4c137b9dfe27a9511384944a59c00d6d0ad1009eddffd2c04";
+      sha512 = "6e199b772d1e89ee6b74add0ebe53a1ad590abc7c436851445ef5eb060011d27d371d06f8dfb08316e84f4971637450c76272bc77e57b76d3f8945a4f1e36169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3e91df8e40903fc277a53b1eb3b1ffcbef8ad480d5c752eaee1e5d2eccd820fde3e2c029b2b83dbcd213fb0e36ad7cfea8619cd521334b3cc707290ca86ade42";
+      sha512 = "331fcf1f0ffe68d3925518a044c40562d37480392534e161df9546c4da2e648b0c1a765714bc2fc3457ddf80bb7ff4b65c0092d3e2a6f2a11af1b66a099086c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/sv-SE/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f73666d1672323a0db9b7ce3e93b2c0e9289b7220d075452c8ec72000c0e89be92b514acfd30687463590c17605b7952b58cd85b1e653a13329249c71dfe7008";
+      sha512 = "ce9b87e63e9fbc975d48432996d12c31e13548f328befc9c52a5da9b2998f3bf286e7d4cbd1fe36b77e0f99dee32cf186ab81e90ab4760771bbe7fd98e70adf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ta/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "128e05bc5df3994bf50c0a2fb63366f9de6923d509f4951b2c0fbf7f579b0c47814816221145aec705a820de3d5f1440ae8c79ef5260e028a797362f0f597fb7";
+      sha512 = "d40ec15bd52e4a71c73366a3a5fa58458401300375723eb76fdf68d5bcfd101cbc18d15f773d58005cc80f78b3f8d52e6d2c7e969a351e8ceb9e0226bf2cabc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/te/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "007feba73d0add3a23307c0eb55a0b9f38c022828f3d320a19a98f61229fe820c7ab59fc5a84dc5d874c6c5bafed0b7fd0771b7ccf798a4b8e96efa519b9850f";
+      sha512 = "3a1f6a31f6f6ae2c50a9a082314489e23a294ae8df8bff191b18606621e1eafafbb4b1d8172a61cf62e2572864d3973b8edd82cdd352e2227883cd020ff05285";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/th/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "c7eab31cf9789fbfb3d4f9cb13193c6197b5f73e5b1839f0cda9b01eb291a898f418d5ef8a7e82f0d28f8cc23861766c2d2bd407eabf11e9f5df0d3d653ccded";
+      sha512 = "9f8b425f1acb31e1cb147daf0139d6d74235b0c73cb7fc9b371eaabcb543e75409f9fac5027d0475acba7d811e3fd69e406788a7eec5f958329b1b159511aea0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/tr/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "33e7bc1dfe7577bf71585fd7226dddfca784b32ebd7a922e07245deb3858f4bccc8417e56bc988acc7a8cd1babd871d2dc6ffab65caf2ac93da8bfbf814051ed";
+      sha512 = "6b9e1de61d667f47d6f77d92872a24c360e8cc0833c14338d16db9af6eac511c2b92a371b5afb64af08c50e5367ae8c7567a3473080227cefc8ed9e04e1dba86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/uk/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "b90c2e68a05d754aeccf07a567d4bf53dc8582b78bac3f09f1c5439d04582fc68b948676a87cd6592bb338baf924f49b7b9f16450c289ddc9ed4f2d1bb1a38ed";
+      sha512 = "e9dd5bb21770ca8fac633c22cdce120d2e1eefd10eab66345afa76c0c7e4533dc325ef954878e13c223f545eebcfb15875a4735f990c5ee121eddf976ece1cff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/ur/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "e78ee959b2c8c7c54fa2a62a0a2d353517ab9eee328d6d4319dfcc90d8a5fe5bd879da860bd0d49d8caccf37d13e92c20cee99ace26cf3c0ecc286fa79c62466";
+      sha512 = "54ab27f01b7885f9c99c2df40bc660d642a5671c348ecc587f7989816d6ee0ad8003c7c6ca92c6ff644edf04fb72444d87bc041d75d13ab70c713e0f52ae17ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/uz/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "a1cdee5806ce52f35bc40eb224292e1aedef8fb5ba09cf411597d1bdb0ff9375ea3b98353fbe367f9428aa74c48b7d17970cf452fd48f83a131b09a351a2d1b0";
+      sha512 = "da7c03cad4b58447d41d74f6ba36544290cd1a68b9b822473685c8d467cd3570d0ec172f5d510f9fe9b0554c138e4484e64c5fc7858ebe68912d4cf7cbe4f7d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/vi/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "14d4810dac2ba95feffecb26ef6ebd247eed1d6263863af67b282c14afd1aa2979775e7f32fa7f5ce0d90371fca87c80ee7d28a4cf376c4da7fce2cfe5f7218f";
+      sha512 = "246880d50325895b6cdf549b48f3abda0ce0983284623907f8a08cdfc32f9e748e0918e07c606b398fe48d1e23e713b53cdaeca218c54282c68221420cd94b8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/xh/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "f830087569ea719fff523ef595ad6ccb881da046e6d9930a809d644ce6666436e51f10e179d5ab9052f1f3928e45e8da6fef97afcd1b16bb1907e39a2c41d56b";
+      sha512 = "dc59e7c637964ffee861ec41a7012ce96980301548882d4c115b8963217487e82eca939f73fab76fdb67d1c676a580eeebdee1b332d22f45435c5d58dadf9499";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/zh-CN/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ea1f85cf85d791dc343af564b817ec6f85394b56aa40e4425d26875c16f03004d78b275c930c581c4c0018de173118f0a4d23da9856eae6e970e3d0db2f101a2";
+      sha512 = "fc6518d0dd4c24b2c4c3bb72fec23690e8647210f97e2154817bf0793049943becd6d25061c3a57e36f693082af93084faf2357a35d9e19ca1eb8722a7587ba1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b6/linux-i686/zh-TW/firefox-63.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "674ef2f083cb79783c25fb9741fc1c80a43e64023813e2cf45fe95faa3bb58e9a89f8d5d5bf54dc713effec2fe64504fb99f2d955b1c9ca91b01a00aceff0747";
+      sha512 = "c85ca42f38731e27ebff681af104330d486744215f8db829dbf0f4abd9460a655a5b6d93bbfc4ee83aa6b1bccdd90d3b8743d340a818d84f6fe4a715f775f7f4";
     }
     ];
 }

From 5df3b9237ed88959af43dd62370559f15065aa6c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 25 Sep 2018 22:53:41 +0800
Subject: [PATCH 1773/3253] libcef: 3.3325.1750.gaabe4c4 ->
 3.3497.1833.g13f506f

---
 pkgs/development/libraries/libcef/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 22debc6d68aa..9e7d608b5124 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -14,12 +14,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "cef-binary-${version}";
-  # Not very recent but more recent versions have problems:
-  # https://github.com/bazukas/obs-linuxbrowser/issues/63
-  version = "3.3325.1750.gaabe4c4";
+  version = "3.3497.1833.g13f506f";
   src = fetchurl {
     url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
-    sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr";
+    sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p";
   };
   nativeBuildInputs = [ cmake ];
   makeFlags = "libcef_dll_wrapper";

From 7e3d35afc5dd459e2586a22f89c23303c5f2b13b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 25 Sep 2018 22:54:07 +0800
Subject: [PATCH 1774/3253] obs-linuxbrowser: 0.5.0 -> 0.5.2

---
 pkgs/applications/video/obs-studio/linuxbrowser.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 7a06e25f8a73..b8bd6ce07eb9 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation rec {
   name = "obs-linuxbrowser-${version}";
-  version = "0.5.0";
+  version = "0.5.2";
   src = fetchFromGitHub {
     owner = "bazukas";
     repo = "obs-linuxbrowser";
     rev = version;
-    sha256 = "0jgh377yv69wbcqg7m7axi22x2p9jmcirws1pgrz22vaw7zbbdzl";
+    sha256 = "1vwgdgcmab5442wh2rjww6lzij9g2c5ccnv79rs7vx3rdl8wqg4f";
   };
   nativeBuildInputs = [ cmake ];
   buildInputs = [ obs-studio ];
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
     ln -s ${libcef}/include cef/
   '';
   cmakeFlags = [
-    "-DCEF_DIR=../../cef"
-    "-DOBS_INCLUDE=${obs-studio}/include/obs"
+    "-DCEF_ROOT_DIR=../../cef"
+    "-DOBS_INCLUDE_SEARCH_DIR=${obs-studio}/include/obs"
   ];
   installPhase = ''
     mkdir -p $out/share/obs/obs-plugins

From fd4df30cd5d788d6cbf4fd659282a20a64b0d8d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 08:02:35 -0700
Subject: [PATCH 1775/3253] apktool: 2.3.3 -> 2.3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/apktool/versions
---
 pkgs/development/tools/apktool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 91caf0348a4e..42deae45a25d 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     urls = [
       "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
     ];
-    sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f";
+    sha256 = "07fwp5sczyivdz37ag9fa258gr9jbz3k3395hp5db7cwizaip2vm";
   };
 
   phases = [ "installPhase" ];

From 26629e0847eed3b70789eb70e5e89c85e2679a74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 08:09:37 -0700
Subject: [PATCH 1776/3253] cb2bib: 1.9.8 -> 1.9.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cb2bib/versions
---
 pkgs/applications/office/cb2bib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index e4dc86ebd8db..1faf47d680aa 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
   pname = "cb2bib";
-  version = "1.9.8";
+  version = "1.9.9";
   src = fetchurl {
     url = "https://www.molspaces.com/dl/progs/${name}.tar.gz";
-    sha256 = "0fpa0znlabk0nrzgj4c0l6qbg8l16lp9d7lvb9ijv1y0ih9igf0f";
+    sha256 = "12x7zv964r26cfmf3yx5pa8ihc5bd9p199w2g4vc0sb44izryg47";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
   nativeBuildInputs = [ qmake ];

From 7c5bc4fb92648f9acc0b4f3dd80f9d95f08abd6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 08:14:48 -0700
Subject: [PATCH 1777/3253] AgdaStdlib: 0.16 -> 0.16.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/agda-stdlib/versions
---
 pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index bd4270e8b935..12d35e270209 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, agda, fetchFromGitHub, ghcWithPackages }:
 
 agda.mkDerivation (self: rec {
-  version = "0.16";
+  version = "0.16.1";
   name = "agda-stdlib-${version}";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r";
+    sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];

From 6d8f22a58b3d56918d0f2258b8450aa811d5f95f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 08:18:39 -0700
Subject: [PATCH 1778/3253] batctl: 2018.2 -> 2018.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/batctl/versions
---
 pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 9ccda9178f10..fdb6ea3695e8 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2018.2";
+  ver = "2018.3";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z";
+    sha256 = "1rljx2jlh3wlk6l9p068mhbqpdr5p5qnwm0336ay1316x0zjvqr4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 33eceb98f9752dd0af845522c1160e8c29368c5e Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 25 Sep 2018 18:24:09 +0300
Subject: [PATCH 1779/3253] cargo-edit: 0.3.0 -> 0.3.1

---
 pkgs/tools/package-management/cargo-edit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index e2cc49a3e99a..afb9fc70a739 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -4,16 +4,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "cargo-edit-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "killercup";
     repo = "cargo-edit";
     rev = "v${version}";
-    sha256 = "0ngxyzqy5pfc0fqbvqw7kd40jhqzp67qvpzvh3yggk9yxa1jzsp0";
+    sha256 = "0g3dikwk6n48dmhx9qchmzyrhcr40242lhvlcyk1nqbpvs3b51fm";
   };
 
-  cargoSha256 = "1j7fqswdx6f2i5wr0pdavdvcv18j1l27a8ighr75p7f54apa27l8";
+  cargoSha256 = "1bq0mjn44f0sn94nb9wqal4swhkzn7f3vbk5jyay4v3wqfz1gb7r";
 
   nativeBuildInputs = lib.optional (!stdenv.isDarwin) pkgconfig;
   buildInputs = lib.optional (!stdenv.isDarwin) openssl;

From a51c855d5bfc9269fec9de91ac0e0b75a9a12d9b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 25 Sep 2018 12:33:20 -0400
Subject: [PATCH 1780/3253] lollypop: 0.9.522 -> 0.9.601 (#47344)

---
 pkgs/applications/audio/lollypop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 6571a45b2a55..2ba35a9a0444 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,7 +4,7 @@
 , gobjectIntrospection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
-  version = "0.9.522";
+  version = "0.9.601";
   name = "lollypop-${version}";
 
   format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0f2brwv884cvmxj644jcj9sg5hix3wvnjy2ndg0fh5cxyqz0kwn5";
+    sha256 = "029hyylwjsbwkw1v75nbkkmrncgz30y2qwdysmpz0xyb5q7x6zbj";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 5a12a5bd5735b52e98f583d35ecb690902fa7c09 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 25 Sep 2018 18:36:55 +0200
Subject: [PATCH 1781/3253] circleci-cli: 0.1.2307 -> 0.1.2569 (#47347)

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index cc062eca932e..97cf820f9a94 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -3,7 +3,7 @@
 let
   owner = "CircleCI-Public";
   pname = "circleci-cli";
-  version = "0.1.2307";
+  version = "0.1.2569";
 in
 buildGoPackage rec {
   name = "${pname}-${version}";
@@ -13,7 +13,7 @@ buildGoPackage rec {
     inherit owner;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0z71jnq42idvhgpgn3mdpbajmgn4b41rpifv5qxn3h1pgi08f75s";
+    sha256 = "0ixiqx8rmia02r44zbhw149p5x9r9cv1fsnlhl8p2x5zd2bdr18x";
   };
 
   goPackagePath = "github.com/${owner}/${pname}";

From 5b30ab770e30743b63841d7a5f747e1539eca414 Mon Sep 17 00:00:00 2001
From: Charles Duffy <chaduffy@cisco.com>
Date: Tue, 25 Sep 2018 10:51:43 -0500
Subject: [PATCH 1782/3253] sbsigntool: 0.5 -> 0.9.1

---
 pkgs/tools/security/sbsigntool/autoconf.patch | 26 +++++++++++++------
 pkgs/tools/security/sbsigntool/default.nix    | 12 ++++-----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/pkgs/tools/security/sbsigntool/autoconf.patch
index 27f5b77c8848..f436a73bca72 100644
--- a/pkgs/tools/security/sbsigntool/autoconf.patch
+++ b/pkgs/tools/security/sbsigntool/autoconf.patch
@@ -1,17 +1,27 @@
-diff -uNr sbsigntool/configure.ac sbsigntool-new/configure.ac
---- sbsigntool/configure.ac	2015-07-05 12:18:18.932717136 +0200
-+++ sbsigntool-new/configure.ac	2015-07-05 14:51:39.659284938 +0200
-@@ -65,7 +65,7 @@
+--- sbsigntools/configure.ac	2018-09-25 10:30:00.878766256 -0500
++++ configure.ac.new	2018-09-25 10:34:56.231277375 -0500
+@@ -71,15 +71,16 @@
+ # no consistent view of where gnu-efi should dump the efi stuff, so find it
+ ##
+ for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do
+-    if test -e $path/crt0-efi-$EFI_ARCH.o; then
+-       CRTPATH=$path
++    if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
++       CRTPATH=@@NIX_GNUEFI@@/$path
++       break
+     fi
+ done
+ if test -z "$CRTPATH"; then
+    AC_MSG_ERROR([cannot find the gnu-efi crt path])
+ fi
  
- dnl gnu-efi headers require extra include dirs
- EFI_ARCH=$(uname -m)
 -EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
 +EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \
   -DEFI_FUNCTION_WRAPPER"
  CPPFLAGS_save="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
-@@ -74,5 +74,5 @@
- AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS)
+@@ -90,5 +91,5 @@
+ AC_SUBST(CRTPATH, $CRTPATH)
  
  AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
 -		[docs/Makefile tests/Makefile])
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix
index cfe54967cce3..4f4cbf4fb6f5 100644
--- a/pkgs/tools/security/sbsigntool/default.nix
+++ b/pkgs/tools/security/sbsigntool/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "sbsigntool-${version}";
-  version = "0.5";
+  version = "0.9.1";
 
   src = fetchgit {
-    url = "git://kernel.ubuntu.com/jk/sbsigntool";
-    rev = "951ee95a301674c046f55330cd7460e1314deff2";
-    sha256 = "1skqrfhvsaay01l94m57sxxqp909rvn07xwmzc6vzzfcnsh6f2yk";
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git";
+    rev = "v0.9.1";
+    sha256 = "098gxmhjn8acxjw5bq59wq4xhgkpx1xn8kjvxwdzpqkwq9ivrsbp";
   };
 
   patches = [ ./autoconf.patch ];
@@ -18,12 +18,12 @@ stdenv.mkDerivation rec {
   prePatch = "patchShebangs .";
 
   nativeBuildInputs = [ autoconf automake pkgconfig help2man ];
-  buildInputs = [ utillinux openssl libuuid gnu-efi libbfd ];
+  buildInputs = [ openssl libuuid libbfd gnu-efi ];
 
   configurePhase = ''
     substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}"
 
-    lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size"
+    lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size endian"
     touch AUTHORS
     touch ChangeLog
 

From e79ccc1100df7c6300593e93a9099aa39c193153 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 25 Sep 2018 20:26:46 +0300
Subject: [PATCH 1783/3253] tdesktop: support opening urls under wayland

---
 .../instant-messengers/telegram/tdesktop/generic.nix           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 2d9a9d10aed9..e8f2c135fa8a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -2,7 +2,7 @@
 
 { mkDerivation, lib, fetchgit, fetchsvn
 , pkgconfig, pythonPackages, cmake, wrapGAppsHook
-, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify
+, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
 }:
 
@@ -131,6 +131,7 @@ mkDerivation rec {
     wrapProgram $out/bin/telegram-desktop \
       "''${gappsWrapperArgs[@]}" \
       --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" \
+      --prefix PATH : ${xdg_utils}/bin \
       --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","

From 616c30af9f880c3c4e20eee2ba9d6ee773751392 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 04:00:44 +0000
Subject: [PATCH 1784/3253] protobuf: default to protobuf3_6

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd3601..956ab1a6f498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11648,7 +11648,7 @@ with pkgs;
 
   postgis = callPackage ../development/libraries/postgis { };
 
-  protobuf = protobuf3_4;
+  protobuf = protobuf3_6;
 
   protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };

From 9eb751496ca8bf1cb6b859cf5be5f8a67310af3d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 04:01:08 +0000
Subject: [PATCH 1785/3253] python.pkgs.protobuf: build with the default
 protobuf

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8fc8c64de39..db4c20b84807 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1123,7 +1123,7 @@ in {
   };
 
   blessed = callPackage ../development/python-modules/blessed {};
-  
+
   block-io = callPackage ../development/python-modules/block-io {};
 
   # Build boost for this specific Python version
@@ -9725,7 +9725,7 @@ in {
   protobuf = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
     doCheck = !isPy3k;
-    protobuf = pkgs.protobuf3_5;
+    protobuf = pkgs.protobuf;
   };
 
   protobuf3_1 = callPackage ../development/python-modules/protobuf {

From 42df4e6686b6a854a08cabc3a7b3a49ea4d96d77 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 25 Sep 2018 04:01:30 +0000
Subject: [PATCH 1786/3253] pokerth: build with protobuf 3.4

It fails to compile with 3.5 and 3.6.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 956ab1a6f498..46cc486788d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20164,7 +20164,9 @@ with pkgs;
 
   pong3d = callPackage ../games/pong3d { };
 
-  pokerth = callPackage ../games/pokerth { };
+  pokerth = callPackage ../games/pokerth {
+    protobuf = protobuf3_4;
+  };
 
   pokerth-server = pokerth.server;
 

From cfbfb9440c17ee280fe38e51bd51dced4e3ebc70 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Sep 2018 14:03:30 -0400
Subject: [PATCH 1787/3253] numpy: gfortran and pytest should be
 nativeBuildInputs

---
 pkgs/development/python-modules/numpy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index af8815dbfb1b..c66650c0abf2 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -11,7 +11,8 @@ buildPythonPackage rec {
   };
 
   disabled = isPyPy;
-  buildInputs = [ gfortran pytest blas ];
+  nativeBuildInputs = [ gfortran pytest ];
+  buildInputs = [ blas ];
 
   patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
     # We patch cpython/distutils to fix https://bugs.python.org/issue1222585

From 84fc814982a3e35d74e292610d389d1a6aab549f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 25 Sep 2018 14:08:21 -0400
Subject: [PATCH 1788/3253] scipy: gfortran should be in nativeBuildInputs

---
 pkgs/development/python-modules/scipy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 140e8cc80b4d..5fdffedc6f27 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -10,7 +10,8 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose pytest ];
-  buildInputs = [ gfortran numpy.blas ];
+  nativeBuildInputs = [ gfortran ];
+  buildInputs = [ numpy.blas ];
   propagatedBuildInputs = [ numpy ];
 
   # Remove tests because of broken wrapper

From 6cd28a468aec0005052ee01eaf8510735948a2dd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:16:03 -0400
Subject: [PATCH 1789/3253] eolie: 0.9.36 -> 0.9.37 (#47345)

---
 pkgs/applications/networking/browsers/eolie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 91c5f697132c..c94135f73509 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   name = "eolie-${version}";
-  version = "0.9.36";
+  version = "0.9.37";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     url = "https://gitlab.gnome.org/World/eolie";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "1pqs6lddkj7nvxdwf0yncwdcr7683mpvx3912vn7b1f2q2zkp1fv";
+    sha256 = "0la458zgh943wmgbzr9fpq78c0n11a2wm7rmks7ispk0719f6lxz";
   };
 
   nativeBuildInputs = [

From c77e8096eead6fc36bf88aa926e65db19aeb8456 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Tue, 25 Sep 2018 14:20:57 -0400
Subject: [PATCH 1790/3253] python.pkgs.cheroot: fix setup patch URL (#47320)
 (#47354)

Fix to specific patch revision rather than latest
---
 pkgs/development/python-modules/cheroot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 6edad2d01619..08a455eb40c3 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   patches = fetchpatch {
     name = "cheroot-fix-setup-python3.patch";
-    url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot";
+    url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/cheroot-fix-setup-python3.patch?h=packages/python-cheroot&id=9b33cb0885b3c0d91adeacae23761a4321eb0e64";
     sha256 = "1rlgz0qln536y00mfqlf0i9hz3f53id73wh47cg5q2vcsw1w2bpc";
   };
 

From f34649e7f53ea7c220946a6aa345b74f8fa0f9e0 Mon Sep 17 00:00:00 2001
From: Igor Tarasov <i.s.tarasov@gmail.com>
Date: Tue, 25 Sep 2018 18:54:32 +0300
Subject: [PATCH 1791/3253] grpc: 1.10.1 -> 1.15.0

---
 pkgs/development/libraries/grpc/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 7f680b6b59bf..a21e2aacde2a 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
+{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.10.1";
+  version = "1.15.0";
   name = "grpc-${version}";
-  src = fetchurl {
-    url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
-    sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg";
+  src = fetchFromGitHub {
+    owner = "grpc";
+    repo = "grpc";
+    rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730";
+    sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From 292bb74552c0760b4f67bb8434de198e46dee488 Mon Sep 17 00:00:00 2001
From: Igor Tarasov <i.s.tarasov@gmail.com>
Date: Tue, 25 Sep 2018 21:20:21 +0300
Subject: [PATCH 1792/3253] python.pkgs.grpcio: 1.14.1 -> 1.15.0

---
 pkgs/development/python-modules/grpcio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 3d3824cdabe4..6141e4a389c2 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05";
+    sha256 = "1lhh76kgyibgsk6c54nbzzhkskknkbvn71xvixsk0prfp8izr98m";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;

From 9c4b11e9a060de2175aef4d36881f97812ab17fe Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 25 Sep 2018 21:11:54 +0200
Subject: [PATCH 1793/3253] Revert "patch-shebangs: respect cross compilation"

This causes problems for packages built using a bootstrap stdenv,
resulting in references to /bin/sh or even bootstrap-tools. The darwin
stdenv is much stricter about what requisites/references are allowed but
using /bin/sh on linux is also undesirable.

eg. https://hydra.nixos.org/build/81754896

    $ nix-build -A xz
    $ head -n1 result-bin/bin/xzdiff
    #!/nix/store/yvc7kmw98kq547bnqn1afgyxm8mxdwhp-bootstrap-tools/bin/sh

This reverts commit f06942327ab60c0a546c7236cb718fd909430066.
---
 .../setup-hooks/patch-shebangs.sh             | 53 ++-----------------
 1 file changed, 3 insertions(+), 50 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 8fecf519e1aa..d5586fccae67 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -5,32 +5,10 @@
 # rewritten to /nix/store/<hash>/bin/python.  Interpreters that are
 # already in the store are left untouched.
 
-fixupOutputHooks+=(patchShebangsAuto)
-
-# Run patch shebangs on a directory.
-# patchShebangs [--build | --host] directory
-
-# Flags:
-# --build : Lookup commands available at build-time
-# --host  : Lookup commands available at runtime
-
-# Example use cases,
-# $ patchShebangs --host /nix/store/...-hello-1.0/bin
-# $ patchShebangs --build configure
+fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
 
 patchShebangs() {
-    local pathName
-
-    if [ "$1" = "--host" ]; then
-        pathName=HOST_PATH
-        shift
-    elif [ "$1" = "--build" ]; then
-        pathName=PATH
-        shift
-    fi
-
     local dir="$1"
-
     header "patching script interpreter paths in $dir"
     local f
     local oldPath
@@ -49,14 +27,6 @@ patchShebangs() {
         oldInterpreterLine=$(head -1 "$f" | tail -c+3)
         read -r oldPath arg0 args <<< "$oldInterpreterLine"
 
-        if [ -z "$pathName" ]; then
-            if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then
-                pathName=HOST_PATH
-            else
-                pathName=PATH
-            fi
-        fi
-
         if $(echo "$oldPath" | grep -q "/bin/env$"); then
             # Check for unsupported 'env' functionality:
             # - options: something starting with a '-'
@@ -65,17 +35,14 @@ patchShebangs() {
                 echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
                 exit 1
             fi
-
-            newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"
+            newPath="$(command -v "$arg0" || true)"
         else
             if [ "$oldPath" = "" ]; then
                 # If no interpreter is specified linux will use /bin/sh. Set
                 # oldpath="/bin/sh" so that we get /nix/store/.../sh.
                 oldPath="/bin/sh"
             fi
-
-            newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"
-
+            newPath="$(command -v "$(basename "$oldPath")" || true)"
             args="$arg0 $args"
         fi
 
@@ -98,17 +65,3 @@ patchShebangs() {
 
     stopNest
 }
-
-patchShebangsAuto () {
-    if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
-
-        # Dev output will end up being run on the build platform. An
-        # example case of this is sdl2-config. Otherwise, we can just
-        # use the runtime path (--host).
-        if [ "$output" != out ] && [ "$output" = "${!outputDev}" ]; then
-            patchShebangs --build "$prefix"
-        else
-            patchShebangs --host "$prefix"
-        fi
-    fi
-}

From 06faf5cc5c9f512141ace045bbadb86160d6a819 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 25 Sep 2018 18:58:01 +0000
Subject: [PATCH 1794/3253] perl: add devel version at 5.29.3

---
 pkgs/development/interpreters/perl/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix                | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index ec4f971eeeff..d6197a422969 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -77,6 +77,7 @@ let
         "-Dlocincpth=${libcInc}/include"
         "-Dloclibpth=${libcLib}/lib"
       ]
+      ++ optionals ((builtins.match "5\.[0-9]*[13579]\..+" version) != null) [ "-Dusedevel" "-Uversiononly" ]
       ++ optional stdenv.isSunOS "-Dcc=gcc"
       ++ optional enableThreading "-Dusethreads";
 
@@ -186,8 +187,15 @@ in rec {
     sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp";
   };
 
+  # the latest Maint version
   perl528 = common {
     version = "5.28.0";
     sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky";
   };
+
+  # the latest Devel version
+  perldevel = common {
+    version = "5.29.3";
+    sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd3601..75cb490dc555 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7605,7 +7605,7 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528;
+  inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528 perldevel;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
@@ -12841,6 +12841,7 @@ with pkgs;
 
   ### DEVELOPMENT / PERL MODULES
 
+  # old versions
   perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     perl = perl522;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
@@ -12853,10 +12854,16 @@ with pkgs;
     perl = perl526;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
+  # the latest Maint version
   perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     perl = perl528;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;
   });
+  # the latest Devel version
+  perldevelPackages = recurseIntoAttrs (callPackage ./perl-packages.nix {
+    perl = perldevel;
+    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
+  });
 
   perlPackages = perl528Packages;
   inherit (perlPackages) perl buildPerlPackage;

From ab2061bff31cd32b8a65e40480c7a079ac4e02ba Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 14:00:03 -0500
Subject: [PATCH 1795/3253] nheko: 0.5.5 -> 0.6.0

---
 .../networking/instant-messengers/nheko/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 6716305df8b5..452ed70e824e 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, fetchurl
-, cmake, lmdb, qt5, qtmacextras, mtxclient
+, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient
 , boost, spdlog, olm, pkgconfig
 }:
 
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.5.5";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i";
+    sha256 = "1qd2c5684722jlpgqyxq6pbb1rdk1zc3sk88mkjyqypj1k0pj3dc";
   };
 
   # If, on Darwin, you encounter the error
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    mtxclient olm boost lmdb spdlog
+    mtxclient olm boost lmdb spdlog cmark
     qt5.qtbase qt5.qtmultimedia qt5.qttools
   ] ++ lib.optional stdenv.isDarwin qtmacextras;
 

From 332a7ec57f15876c73b8ddd7a5fc6d101f9f0105 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 14:41:13 -0500
Subject: [PATCH 1796/3253] mtxclient: 0.1.0 -> 0.2.0

---
 pkgs/development/libraries/mtxclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
index 465a70576356..15c82cb12825 100644
--- a/pkgs/development/libraries/mtxclient/default.nix
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "mtxclient-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "mtxclient";
     rev = "v${version}";
-    sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp";
+    sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs";
   };
 
   postPatch = ''

From 4b1ffa0b00ec1d45df523b720786e2ae78de210c Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <reactorcontrol@icloud.com>
Date: Tue, 25 Sep 2018 22:11:17 +0200
Subject: [PATCH 1797/3253] podofo: fix library linkage on Darwin (#47214)

* podofo: fix library linkage on Darwin

Because the library is not yet installed when the tools are build, it does not contain its final store path as its install name. Linking the tools picks up this incorrect install name and needs to be fixed after installing.
---
 pkgs/development/libraries/podofo/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index bcc57f09af45..acf531390226 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.6";
+  version = "0.9.6";
+  name = "podofo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
@@ -30,6 +31,12 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
+  postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    for i in $out/bin/* ; do
+      install_name_tool -change libpodofo.${version}.dylib $out/lib/libpodofo.${version}.dylib "$i"
+    done
+  '';
+
   meta = {
     homepage = http://podofo.sourceforge.net;
     description = "A library to work with the PDF file format";

From 3ede6674a675fb05ad3b29bde28cd179c422a8e7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 14:24:24 -0500
Subject: [PATCH 1798/3253] spectral: init at 2018-09-24

* needs at least qtgraphicaleffects not mentioned in docs
* doesn't want to use our libqmatrixclient, so let it use bundled
* took a few runs (or perhaps just patience with one) to populate,
  when my profile icon appeared it seemed ready-- then click it
  to see list of rooms and such.
---
 .../instant-messengers/spectral/default.nix   | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/spectral/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
new file mode 100644
index 000000000000..5dd8bf5f69ab
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit
+, pkgconfig
+, qmake, qtbase, qtquickcontrols2, qtmultimedia
+, libpulseaudio
+# Not mentioned but seems needed
+, qtgraphicaleffects
+# Unsure but needed by similar
+, qtdeclarative, qtsvg
+}:
+
+stdenv.mkDerivation rec {
+  name = "spectral-${version}";
+  version = "2018-09-24";
+
+  src = fetchgit {
+    url = "https://gitlab.com/b0/spectral.git";
+    rev = "c9d1d6887722860a52b597a0f74d0ce39c8622e1";
+    sha256 = "1ym8jlqls4lcq5rd81vxw1dni79fc6ph00ip8nsydl6i16fngl4c";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative qtsvg ]
+    ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio;
+
+  meta = with stdenv.lib; {
+    description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
+    homepage = https://gitlab.com/b0/spectral;
+    license = licenses.gpl3;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd3601..5cdcae648937 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16989,6 +16989,8 @@ with pkgs;
 
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
+  spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { };
+
   super-productivity = callPackage ../applications/networking/super-productivity { };
 
   wlc = callPackage ../development/libraries/wlc { };

From 6390b8b63e623d83558ff97102cd8a21ed99dd75 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 22 Sep 2018 22:55:58 +0200
Subject: [PATCH 1799/3253] fox: mark broken on darwin

    Undefined symbols for architecture x86_64:
      "_MPCreateSemaphore", referenced from:
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
          FX::FXSemaphore::FXSemaphore(int) in FXThread.o
      "_MPDeleteSemaphore", referenced from:
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
          FX::FXSemaphore::~FXSemaphore() in FXThread.o
      "_MPSignalSemaphore", referenced from:
          FX::FXSemaphore::post() in FXThread.o
      "_MPWaitOnSemaphore", referenced from:
          FX::FXSemaphore::wait() in FXThread.o
          FX::FXSemaphore::trywait() in FXThread.o
    ld: symbol(s) not found for architecture x86_64

/cc ZHF #45961
---
 pkgs/development/libraries/fox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 8dd78c41b14a..40430f34334c 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
     homepage = http://fox-toolkit.org;
     license = licenses.lgpl3;
     maintainers = [];
+    broken = stdenv.isDarwin;
     platforms = platforms.all;
   };
 }

From cd78d0cc3ff97924bbc810b025fc0833e2b71916 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 22 Sep 2018 23:13:43 +0200
Subject: [PATCH 1800/3253] flpsed: mark linux only

Doesn't build on darwin and probably other platforms.

    GsWidget.H:26:3: error: 'Atom' does not name a type; did you mean 'tm'?
       Atom atoms[5];
       ^~~~
       tm
    GsWidget.cxx: In member function 'void GsWidget::setProps()':
    GsWidget.cxx:47:2: error: 'atoms' was not declared in this scope
      atoms[0] = XInternAtom(fl_display,"GHOSTVIEW" , false);
      ^~~~~

/cc ZHF #45961
---
 pkgs/applications/editors/flpsed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 67f789eee782..1c40b509bfe4 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fltk13, ghostscript}:
+{ stdenv, fetchurl, fltk13, ghostscript, xlibs }:
 
 stdenv.mkDerivation rec {
   name = "flpsed-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "WYSIWYG PostScript annotator";
     homepage = http://flpsed.org/flpsed.html;
     license = licenses.gpl3;
-    platforms = platforms.mesaPlatforms;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ fuuzetsu ];
   };
 }

From 4ad424fbd6355c88917c65e307bce810d581e3f1 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 25 Sep 2018 22:32:46 +0200
Subject: [PATCH 1801/3253] qboot: 20150603 -> 20170330, fix build (#47364)

Switch back to original upstream project which is more recent
than the fork we used.
---
 pkgs/applications/virtualization/qboot/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix                    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix
index 0c6e3991b1c0..0678591fc2a3 100644
--- a/pkgs/applications/virtualization/qboot/default.nix
+++ b/pkgs/applications/virtualization/qboot/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "qboot-pre-release";
+  name = "qboot-20170330";
 
-  src = fetchgit {
-    url = "https://github.com/yangchengwork/qboot";
-    rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75";
-    sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d";
+  src = fetchFromGitHub {
+    owner = "bonzini";
+    repo = "qboot";
+    rev = "ac9488f26528394856b94bda0797f5bd9c69a26a";
+    sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy";
   };
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46cc486788d7..8ae70687d963 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13394,7 +13394,7 @@ with pkgs;
   softether_4_25 = callPackage ../servers/softether/4.25.nix { };
   softether = softether_4_25;
 
-  qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
+  qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
 
   OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
   OVMF-CSM = OVMF.override { openssl = null; };

From 9b9981928325f1c19b9b65291aa0c29d35ae7e11 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 25 Sep 2018 22:33:03 +0200
Subject: [PATCH 1802/3253] freedroidrpg: don't build on hydra

Similar to some other builds, sdl-config gets stuck and times out.

    checking for sdl-config... /nix/store/q2hm1ka0qxs2gv5bmrxj7j80lygk4b5z-SDL-1.2.15-dev/bin/sdl-config
    building of '/nix/store/m2d7v0n5hd2498vfxp18i37p7r1lf76p-freedroidrpg-0.16.1' timed out after 7200 seconds of silence

/cc ZHF #45961
---
 pkgs/games/freedroidrpg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 875af8e06642..2ebb60f3d5db 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {
 
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;
+    hydraPlatforms = platforms.linux; # sdl-config times out on darwin
   };
 }

From bf227129935912caead713fc2706a91767af8ce5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Tue, 25 Sep 2018 22:39:54 +0200
Subject: [PATCH 1803/3253] erlangR19: 19.3.6.6 -> 19.3.6.11

---
 pkgs/development/interpreters/erlang/R19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index d94d4a5a14d0..e0d4ecbc95ac 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,8 +1,8 @@
 { mkDerivation, fetchpatch }:
 
 mkDerivation rec {
-  version = "19.3.6.6";
-  sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg";
+  version = "19.3.6.11";
+  sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm";
 
   patches = [
     # macOS 10.13 crypto fix from OTP-20.1.2

From b7ac8824afcda4d252e528004a15b8b0ce8ea910 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 25 Sep 2018 20:52:31 +0000
Subject: [PATCH 1804/3253] perldevel: use double quote to preserve ''\.''

---
 pkgs/development/interpreters/perl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index d6197a422969..df0b549e1ff9 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -77,7 +77,7 @@ let
         "-Dlocincpth=${libcInc}/include"
         "-Dloclibpth=${libcLib}/lib"
       ]
-      ++ optionals ((builtins.match "5\.[0-9]*[13579]\..+" version) != null) [ "-Dusedevel" "-Uversiononly" ]
+      ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
       ++ optional stdenv.isSunOS "-Dcc=gcc"
       ++ optional enableThreading "-Dusethreads";
 

From 3b4a8a6902256ce3b3d33f8fe04915fdf16cf8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Sep 2018 09:21:21 +0100
Subject: [PATCH 1805/3253] vimPlugins: update

(cherry picked from commit f1477a3c87020ce5262ffa3cf78fa38e22dca6c2)
---
 pkgs/misc/vim-plugins/generated.nix | 136 ++++++++++++++--------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index ad181c7bf953..a8a0c9ca3a96 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-19";
+    name = "ale-2018-09-20";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "169a6e26b2ca63ab0f2f5bb3d2176ff0a2f68bc3";
-      sha256 = "09pc3a9wkql7j9rc3yfgwns94s7rrldichxwhq37ily139596wkm";
+      rev = "aa5c82b1718f44d04f6dd11bc63f6eeed2089d9d";
+      sha256 = "03m19d6zcsjr5ydbnkpa93k82sq70lj44l2shw7szjzxxyzb2h14";
     };
   };
 
@@ -83,12 +83,12 @@
   };
 
   auto-pairs = buildVimPluginFrom2Nix {
-    name = "auto-pairs-2017-07-03";
+    name = "auto-pairs-2018-09-23";
     src = fetchFromGitHub {
       owner = "jiangmiao";
       repo = "auto-pairs";
-      rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda";
-      sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6";
+      rev = "9086ce897a616d78baf69ddb07ad557c5ceb1d7c";
+      sha256 = "02ds4i7aiq1a68qwz2gnmiigp25hi8qa9d4zcfazc3bgh855bx0l";
     };
   };
 
@@ -133,12 +133,12 @@
   };
 
   caw-vim = buildVimPluginFrom2Nix {
-    name = "caw-vim-2018-09-13";
+    name = "caw-vim-2018-09-22";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "caw.vim";
-      rev = "2427ba1379b1bb3c7b737921219a346f10a21ad8";
-      sha256 = "1cwx0lpf0xvrqmbjg83y79j9f4gjdkl7iickg9ypzhdxhld0i972";
+      rev = "2b88f9978b25892d918d8c7b564d3e05fc24656f";
+      sha256 = "1njbyg5l4k6f0fnpfwg058rwyffxj43jf4lsfai5gjl3dckk9yw4";
     };
   };
 
@@ -314,12 +314,12 @@
   };
 
   denite-extra = buildVimPluginFrom2Nix {
-    name = "denite-extra-2018-08-13";
+    name = "denite-extra-2018-09-20";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-extra";
-      rev = "8e46f87ceb619d0db93bac58120fe01584e565fd";
-      sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz";
+      rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f";
+      sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz";
     };
   };
 
@@ -478,12 +478,12 @@
   };
 
   fastfold = buildVimPluginFrom2Nix {
-    name = "fastfold-2018-06-03";
+    name = "fastfold-2018-09-24";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30";
-      sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r";
+      rev = "cdd44dcf54dd6900e9699e957ba4b203d3021d1d";
+      sha256 = "1a7x026cjd6nc9l0gx3cvfvhwalxj8d4361yvy6krpjaha4yk43j";
     };
   };
 
@@ -779,12 +779,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-09-03";
+    name = "ncm2-2018-09-20";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "08f026d84b50e8db3d3a4124da63c8c3e0e5e558";
-      sha256 = "07d411p3shm27qmir8hsw88mx3wdmz3am4qi0fqzkhkpkgli70jw";
+      rev = "5b5984b5528a90c40bf1d98c48bda1eda6b5e0f0";
+      sha256 = "1fwg5y3kbxdv64kglkd028kyvp8k9i5wppvw56iwf4qncpd66sdg";
     };
   };
 
@@ -879,12 +879,12 @@
   };
 
   neoformat = buildVimPluginFrom2Nix {
-    name = "neoformat-2018-09-05";
+    name = "neoformat-2018-09-22";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6";
-      sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks";
+      rev = "5ea3abc08f3f0db3600e9f6f36f096c64bffdc07";
+      sha256 = "0yb2mias9pc4f2hgb5lrc7k5xs3pq96c6zsahd74jb1hcjb5j5sw";
     };
   };
 
@@ -899,12 +899,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-17";
+    name = "neomake-2018-09-21";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "5c0e5c5de14a03c438a370a5ef79a3165a2e705f";
-      sha256 = "0ffkpidgc9lki5h4x8w3yvf5vj6rdip6n0wd89dax81bk7579pcb";
+      rev = "1686a91cc4ea4b48152e314decb827946221b1ad";
+      sha256 = "1radvd8nvbgjf158jdymvwi050fncqsf7vw3kw7hcz4adk97a1pr";
     };
   };
 
@@ -1469,12 +1469,12 @@
   };
 
   vim = buildVimPluginFrom2Nix {
-    name = "vim-2018-09-13";
+    name = "vim-2018-09-20";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "72a0d0d584e2b64dd7cd44047688d470e6e39f8f";
-      sha256 = "0n2cyxkwfpy95033zisb5q1jrf17vzi11mprhkm01vfxjp5xh4hy";
+      rev = "15d0ff9f1a1a5455201dbf62221e8b119cfa9161";
+      sha256 = "1cmmx99hs10mnr5x5kmac39kxjf9n3riphirhmijsnym8yijrcz1";
     };
   };
 
@@ -1679,12 +1679,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-18";
+    name = "vim-airline-2018-09-23";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "251ed064e84dc684a944edbe37d3c559af3e02bf";
-      sha256 = "1nmcir24f9mlnnfnkbcn3ww5dhn96k6nh0kdpjz1hdh4wd659vhm";
+      rev = "2390022e33dc5eac6872a09ec39ee769298e1ef3";
+      sha256 = "1b2y6zz0478ih1zbjqk2mirgbj1vnsi93ggjgfdvmxm8j9lh22h3";
     };
   };
 
@@ -2039,12 +2039,12 @@
   };
 
   vim-fugitive = buildVimPluginFrom2Nix {
-    name = "vim-fugitive-2018-09-19";
+    name = "vim-fugitive-2018-09-24";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "9fec8aadc54372cbea6ac3c9cf6909054140b573";
-      sha256 = "0pkfhbaka6gsabmz74v5dpwd72rwjrrq9wchcda86rmb6nxqsgmg";
+      rev = "a9100fafb8c6deb187ee1cfaa37a4a02018d6c9a";
+      sha256 = "0p37gywcwbdd2sl09s2c3dhr0cvf2s53jpwyz93jls2dgnlbdri8";
     };
   };
 
@@ -2099,12 +2099,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-19";
+    name = "vim-go-2018-09-24";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "1656f2ff1bb8c4865b2e9870c2be3468974c6ea9";
-      sha256 = "1k6gyzh3sm5ndmh6r8k07q8gmr6190qfvk8cxcj1i37hr6ari0zd";
+      rev = "5ec87ee2dd3443bb5d0c7f7331bec1d1ed60df9f";
+      sha256 = "066sja0f78a11943fwilz40csnm13gqzff23hj6hwrlxjq31ysy4";
     };
   };
 
@@ -2360,12 +2360,12 @@
   };
 
   vim-latex-live-preview = buildVimPluginFrom2Nix {
-    name = "vim-latex-live-preview-2018-09-15";
+    name = "vim-latex-live-preview-2018-09-25";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
-      rev = "c573115642e1a991e0dd763f25dc02b3d99acea5";
-      sha256 = "1s1p8mi9n6qxfd9847fbzc12sy9ala5jnkjicrcdcbn7irlvvwcg";
+      rev = "855c30915547c7e9c19b7e6efb528730c071d2e8";
+      sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp";
     };
   };
 
@@ -2400,12 +2400,12 @@
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix {
-    name = "vim-localvimrc-2018-08-21";
+    name = "vim-localvimrc-2018-09-24";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623";
-      sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar";
+      rev = "e0ce126a2a8baf3816ae722b604121951a73e092";
+      sha256 = "0wi5gyafzdfwin6bxk369fz59gbw5w4xm4pgq2jpz5hxk7krwkll";
     };
   };
 
@@ -2660,12 +2660,12 @@
   };
 
   vim-puppet = buildVimPluginFrom2Nix {
-    name = "vim-puppet-2018-04-12";
+    name = "vim-puppet-2018-09-24";
     src = fetchFromGitHub {
       owner = "rodjek";
       repo = "vim-puppet";
-      rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097";
-      sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv";
+      rev = "5680f0dca2d6b5e98687e091a544e4e0ae41d74b";
+      sha256 = "134x4z88qrzfxyqa1kxmwwmhlcqa3n8qj7f71bn9w9h4ac2v650v";
     };
   };
 
@@ -2710,12 +2710,12 @@
   };
 
   vim-rhubarb = buildVimPluginFrom2Nix {
-    name = "vim-rhubarb-2018-08-22";
+    name = "vim-rhubarb-2018-09-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-rhubarb";
-      rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b";
-      sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n";
+      rev = "3a9ddb8ffa46b9fa49f3d9372bbb5d64bdc5fd23";
+      sha256 = "1swybc30vyf309w1a34jf94xja1kikvrr3xpixfban50s6aiyips";
     };
   };
 
@@ -2830,12 +2830,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-18";
+    name = "vim-snippets-2018-09-24";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "39219ca29234a7e28e56379308f59e7190358092";
-      sha256 = "1hnvpkqipa82qqhn68fr1qi71dj4khjgjqzhj85w6chdii1bf6qp";
+      rev = "cd463f36f3d449fcb6f21b1385b79c9cbcb16f36";
+      sha256 = "18k63ixxk10rws5z6gplyjgakxc6zhblh2c7jkcbrqv0dv0xhywv";
     };
   };
 
@@ -2950,12 +2950,12 @@
   };
 
   vim-test = buildVimPluginFrom2Nix {
-    name = "vim-test-2018-08-30";
+    name = "vim-test-2018-09-23";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c";
-      sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb";
+      rev = "5aa77d57d22d453bd53f28a18f80e7bfecccf811";
+      sha256 = "1w0x4xfj3fl5zwnk14sh9sp1hkj25grrw1wan0g3y7ar8ygjyl7f";
     };
   };
 
@@ -2990,12 +2990,12 @@
   };
 
   vim-toml = buildVimPluginFrom2Nix {
-    name = "vim-toml-2018-06-15";
+    name = "vim-toml-2018-09-25";
     src = fetchFromGitHub {
       owner = "cespare";
       repo = "vim-toml";
-      rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80";
-      sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n";
+      rev = "2069e7413d8eaab567fa320723c4af24bb437f3a";
+      sha256 = "0ffngrry8ambv27wwzp0czgccdag1qcmbcvazjklm2i5b3ads39i";
     };
   };
 
@@ -3050,12 +3050,12 @@
   };
 
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-07-14";
+    name = "vim-wakatime-2018-09-24";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf";
-      sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2";
+      rev = "17e5d1b21128b955dba244d5d0d5ad9f359a5c68";
+      sha256 = "0v2hb6hzcdn4ks691m511las5mli6igfg3srxnr3a09krgxi512f";
     };
   };
 
@@ -3160,12 +3160,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-19";
+    name = "vimtex-2018-09-23";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "fb09eed5336b6540f8350f2792fded0956362d7b";
-      sha256 = "0g3pw5qw6y9vpdmdnw4x478m5c34g2wll01gdy76yf8r5vysyv41";
+      rev = "d16ae14c15bb597c5421cff6c3abf6f9aae22bca";
+      sha256 = "083h9xq25sv6zxcp000gbs7npwfb367m4xdmcz1b80hgv7gnwwr9";
     };
   };
 
@@ -3244,8 +3244,8 @@
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "a020cbc0fc4b535f81d9f8db33150b92df68694a";
-      sha256 = "1i9hqmns7hyc15cz565g8xzlf6ryk03xwg714sfbcmkai9vl61w3";
+      rev = "e37923a752c7eee184cd6d96ac34e303fb7cfae9";
+      sha256 = "1dhh88f1mz7rajxyjbarqf3qiia6n34salknri3a0dffbih5y8rc";
       fetchSubmodules = true;
     };
   };
@@ -3281,12 +3281,12 @@
   };
 
   zig-vim = buildVimPluginFrom2Nix {
-    name = "zig-vim-2018-09-17";
+    name = "zig-vim-2018-09-21";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "9986edc96f220bb9208473a5ad61339c1567df23";
-      sha256 = "03grs1ha5r4cfh8hczfawj7x7xwb6j716rl52gbkhbxhlk72w5kq";
+      rev = "febf2fc8d7aa27809758fd90be29d3a9b501efc2";
+      sha256 = "1zp1bz3fzcwvdw3qgiyvmd5imrzjh7rnpnjpxm8mma0kxi2bnl3g";
     };
   };
 }
\ No newline at end of file

From b7d34a3d1362340e9aa34f3c0719a597d5d7c150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 25 Sep 2018 09:22:11 +0100
Subject: [PATCH 1806/3253] vimPlugins.vim-husk: init at 2015-11-29

(cherry picked from commit ef32704f1d537512842ea711881f333413f08b79)
---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a8a0c9ca3a96..a9a997546351 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2218,6 +2218,16 @@
     };
   };
 
+  vim-husk = buildVimPluginFrom2Nix {
+    name = "vim-husk-2015-11-29";
+    src = fetchFromGitHub {
+      owner = "vim-utils";
+      repo = "vim-husk";
+      rev = "ad89559ff8a6c4b1e94a18b2d494a69a1f701d08";
+      sha256 = "09kqzaqa4jdh31q0a3nxbx9li7zg890qxh68rfzblzyx22xv4mka";
+    };
+  };
+
   vim-iced-coffee-script = buildVimPluginFrom2Nix {
     name = "vim-iced-coffee-script-2013-12-26";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 5f664c39e3c5..df6b33a53c06 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -311,6 +311,7 @@ vim-scripts/tabmerge
 vim-scripts/taglist.vim
 vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
+vim-utils/vim-husk
 vimwiki/vimwiki
 vmchale/dhall-vim
 w0rp/ale

From 6e5682ab41030afc2f04591cb431eeb7808e2f79 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Tue, 25 Sep 2018 23:21:06 +0200
Subject: [PATCH 1807/3253] erlangR20: 20.3.8 -> 20.3.8.9

---
 pkgs/development/interpreters/erlang/R20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 19ac6d355926..c408d21d9b31 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "20.3.8";
-  sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj";
+  version = "20.3.8.9";
+  sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From c5bb43188d66c579e337e107f04b7c6e7d57dc41 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 25 Sep 2018 23:31:43 +0200
Subject: [PATCH 1808/3253] nixos: Fix eval error for documentation.nixos

Introduced by 0f3b89bbedc1a33cc1fc3c142e235da2c64614c3.

If services.nixosManual.showManual is enabled and
documentation.nixos.enable is not, there is no
config.system.build.manual available, so evaluation fails. For example
this is the case for the installer tests.

There is however an assertion which should catch exactly this, but it
isn't thrown because the usage of config.system.build.manual is
evaluated earlier than the assertions.

So I split the assertion off into a separate mkIf to make sure it is
shown appropriately and also fixed the installation-device profile to
enable documentation.nixos.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @oxij
---
 .../modules/profiles/installation-device.nix  |  1 +
 nixos/modules/services/misc/nixos-manual.nix  | 45 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 9c84d267a334..d51ed195580d 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -25,6 +25,7 @@ with lib;
     documentation.enable = mkForce true;
 
     # Show the manual.
+    documentation.nixos.enable = mkForce true;
     services.nixosManual.showManual = true;
 
     # Let the user play Rogue on TTY 8 during the installation.
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 7202269d3421..df3e71c80dea 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -44,29 +44,30 @@ in
   };
 
 
-  config = mkIf cfg.showManual {
-
-    assertions = [{
-      assertion = cfgd.enable && cfgd.nixos.enable;
-      message   = "Can't enable `service.nixosManual.showManual` without `documentation.nixos.enable`";
-    }];
-
-    boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
-
-    systemd.services."nixos-manual" = {
-      description = "NixOS Manual";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}";
-        StandardInput = "tty";
-        StandardOutput = "tty";
-        TTYPath = "/dev/tty${toString cfg.ttyNumber}";
-        TTYReset = true;
-        TTYVTDisallocate = true;
-        Restart = "always";
+  config = mkMerge [
+    (mkIf cfg.showManual {
+      assertions = singleton {
+        assertion = cfgd.enable && cfgd.nixos.enable;
+        message   = "Can't enable `services.nixosManual.showManual` without `documentation.nixos.enable`";
       };
-    };
+    })
+    (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) {
+      boot.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
 
-  };
+      systemd.services."nixos-manual" = {
+        description = "NixOS Manual";
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}";
+          StandardInput = "tty";
+          StandardOutput = "tty";
+          TTYPath = "/dev/tty${toString cfg.ttyNumber}";
+          TTYReset = true;
+          TTYVTDisallocate = true;
+          Restart = "always";
+        };
+      };
+    })
+  ];
 
 }

From 7047d60ef4a8aa0484ab6f59c594bfacfc054368 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 25 Sep 2018 20:03:46 -0500
Subject: [PATCH 1809/3253] libXinerama: 1.1.3 -> 1.1.4

https://lists.x.org/archives/xorg-announce/2018-July/002905.html
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 06dd540a4818..c33997b72c84 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -908,11 +908,11 @@ let
   }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
   libXinerama = (mkDerivation "libXinerama" {
-    name = "libXinerama-1.1.3";
+    name = "libXinerama-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2;
-      sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
+      url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2;
+      sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 libXext xextproto xineramaproto ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ca77e6408149..846fa56de30c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -73,7 +73,7 @@ mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
-mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
+mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2

From 32f3e4588fe3836316ace027aea589da8043e1db Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 26 Sep 2018 04:05:56 +0200
Subject: [PATCH 1810/3253] zita-njbridge: init at 0.4.4

---
 .../audio/zita-njbridge/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/zita-njbridge/default.nix

diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix
new file mode 100644
index 000000000000..faa90e684aea
--- /dev/null
+++ b/pkgs/applications/audio/zita-njbridge/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, libjack2, zita-resampler }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.4";
+  name = "zita-njbridge-${version}";
+
+  src = fetchurl {
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1l8rszdjhp0gq7mr54sdgfs6y6cmw11ssmqb1v9yrkrz5rmwzg8j";
+  };
+
+  buildInputs = [ libjack2 zita-resampler ];
+
+  preConfigure = ''
+    cd ./source/
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "MANDIR=$(out)"
+    "SUFFIX=''"
+  ];
+
+
+  meta = with stdenv.lib; {
+    description = "command line Jack clients to transmit full quality multichannel audio over a local IP network";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94a09120d7f7..1bc286b1c263 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19731,6 +19731,8 @@ with pkgs;
 
   zim = callPackage ../applications/office/zim { };
 
+  zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
+
   zoom-us = libsForQt59.callPackage ../applications/networking/instant-messengers/zoom-us { };
 
   zotero = callPackage ../applications/office/zotero { };

From 92a9c5ac7d38d4536fa0a9337259b7f133ee9639 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 26 Sep 2018 06:51:22 +0000
Subject: [PATCH 1811/3253] net_snmp: build with default perl (#47373)

---
 pkgs/top-level/all-packages.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ef6ffad750..45d4fe59b57b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13377,11 +13377,7 @@ with pkgs;
 
   check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {};
 
-  net_snmp = callPackage ../servers/monitoring/net-snmp {
-    # https://sourceforge.net/p/net-snmp/bugs/2712/
-    # remove after net-snmp > 5.7.3
-    perl = perl522;
-  };
+  net_snmp = callPackage ../servers/monitoring/net-snmp { };
 
   newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
 

From 6eef893f5ca112101ce82a026c5239a36200d922 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 26 Sep 2018 02:09:22 -0500
Subject: [PATCH 1812/3253] stdenv: partial revert of f2bb59
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/cc @Ericson2314

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).
---
 pkgs/stdenv/cross/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index daa9f66615c9..d1efa3602374 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -53,9 +53,6 @@ in lib.init bootStages ++ [
            else buildPackages.gcc;
 
       extraNativeBuildInputs = old.extraNativeBuildInputs
-        ++ lib.optionals
-             (hostPlatform.isLinux && !buildPlatform.isLinux)
-             [ buildPackages.patchelf buildPackages.paxctl ]
         ++ lib.optional
              (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
              buildPackages.updateAutotoolsGnuConfigScriptsHook

From 0e5e4aed067bd715e103dd974831deebd200404b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Sep 2018 07:20:43 -0700
Subject: [PATCH 1813/3253] arpack: 3.5.0 -> 3.6.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/arpack/versions
---
 pkgs/development/libraries/science/math/arpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 55c1a641fc3d..2a6c4af43fc3 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -4,14 +4,14 @@
 with stdenv.lib;
 
 let
-  version = "3.5.0";
+  version = "3.6.3";
 in
 stdenv.mkDerivation {
   name = "arpack-${version}";
 
   src = fetchurl {
     url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz";
-    sha256 = "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh";
+    sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4";
   };
 
   nativeBuildInputs = [ autoconf automake gettext libtool ];

From eb7b21718275f128355fe28695a53fb9ce0cd8fe Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Wed, 26 Sep 2018 08:33:51 +0200
Subject: [PATCH 1814/3253] go-2fa: Init at 1.1.0

---
 pkgs/tools/security/2fa/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/2fa/default.nix

diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix
new file mode 100644
index 000000000000..68b9194015b1
--- /dev/null
+++ b/pkgs/tools/security/2fa/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  version = "1.1.0";
+  name = "2fa-${version}";
+
+  goPackagePath = "rsc.io/2fa";
+
+  src = fetchFromGitHub {
+    owner = "rsc";
+    repo = "2fa";
+    rev = "v${version}";
+    sha256 = "0827vl2bxd6m2rbj00x7857cs7cic3mlg5nlhqzd0n73dm5vk2za";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://rsc.io/2fa;
+    description = "Two-factor authentication on the command line";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ rvolosatovs ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45d4fe59b57b..39e70e5e1761 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1338,6 +1338,8 @@ with pkgs;
 
   gdrive = callPackage ../applications/networking/gdrive { };
 
+  go-2fa = callPackage ../tools/security/2fa {};
+
   go-dependency-manager = callPackage ../development/tools/gdm { };
 
   geckodriver = callPackage ../development/tools/geckodriver { };

From 0441faea05c3ffaf378e3f3249f09b0e35528c97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 08:35:43 -0700
Subject: [PATCH 1815/3253] libsigrokdecode: 0.5.1 -> 0.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libsigrokdecode/versions
---
 pkgs/development/tools/libsigrokdecode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
index 9fd70cb60c96..097f0f105447 100644
--- a/pkgs/development/tools/libsigrokdecode/default.nix
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
 
 stdenv.mkDerivation rec {
-  name = "libsigrokdecode-0.5.1";
+  name = "libsigrokdecode-0.5.2";
 
   src = fetchurl {
     url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
-    sha256 = "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9";
+    sha256 = "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9fb79868ab478340bd057aa55feefb1be1373122 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 24 Sep 2018 19:02:19 +0100
Subject: [PATCH 1816/3253] google-compute-engine: 20180510 -> 20180905

The list of corresponding NixOS services are also updated
---
 .../virtualisation/google-compute-image.nix   | 44 +++++++------------
 .../google-compute-engine/default.nix         |  4 +-
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 4c7cffcf4557..caaf6c0aa59d 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -97,8 +97,8 @@ in
       "google-instance-setup.service"
       "google-network-setup.service"
     ];
-    wantedBy = [ "multi-user.target" ];
     requires = ["network.target"];
+    wantedBy = ["multi-user.target"];
     path = with pkgs; [ shadow ];
     serviceConfig = {
       Type = "simple";
@@ -113,8 +113,8 @@ in
       "google-instance-setup.service"
       "google-network-setup.service"
     ];
-    requires = [ "network.target" ];
-    wantedBy = [ "multi-user.target" ];
+    requires = ["network.target"];
+    wantedBy = ["multi-user.target"];
     serviceConfig = {
       Type = "simple";
       ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
@@ -123,7 +123,7 @@ in
 
   systemd.services.google-instance-setup = {
     description = "Google Compute Engine Instance Setup";
-    after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"];
+    after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"];
     before = ["sshd.service"];
     wants = ["local-fs.target" "network-online.target" "network.target"];
     wantedBy = [ "sshd.service" "multi-user.target" ];
@@ -134,15 +134,17 @@ in
     };
   };
 
-  systemd.services.google-ip-forwarding-daemon = {
-    description = "Google Compute Engine IP Forwarding Daemon";
-    after = ["network.target" "google-instance-setup.service" "google-network-setup.service"];
+  systemd.services.google-network-daemon = {
+    description = "Google Compute Engine Network Daemon";
+    after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"];
+    wants = ["local-fs.target" "network-online.target" "network.target"];
     requires = ["network.target"];
+    partOf = ["network.target"];
     wantedBy = [ "multi-user.target" ];
     path = with pkgs; [ iproute ];
     serviceConfig = {
-      Type = "simple";
-      ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug";
+      ExecStart = "${gce}/bin/google_network_daemon --debug";
+      Type = "oneshot";
     };
   };
 
@@ -153,8 +155,9 @@ in
       "network-online.target"
       "network.target"
       "rsyslog.service"
+      "systemd-resolved.service"
       "google-instance-setup.service"
-      "google-network-setup.service"
+      "google-network-daemon.service"
     ];
     wants = [ "local-fs.target" "network-online.target" "network.target"];
     wantedBy = [ "multi-user.target" ];
@@ -167,23 +170,6 @@ in
     };
   };
 
-  systemd.services.google-network-setup = {
-    description = "Google Compute Engine Network Setup";
-    after = [
-      "local-fs.target"
-      "network-online.target"
-      "network.target"
-      "rsyslog.service"
-    ];
-    wants = [ "local-fs.target" "network-online.target" "network.target"];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      ExecStart = "${gce}/bin/google_network_setup --debug";
-      KillMode = "process";
-      Type = "oneshot";
-    };
-  };
-
   systemd.services.google-startup-scripts = {
     description = "Google Compute Engine Startup Scripts";
     after = [
@@ -192,9 +178,9 @@ in
       "network.target"
       "rsyslog.service"
       "google-instance-setup.service"
-      "google-network-setup.service"
+      "google-network-daemon.service"
     ];
-    wants = [ "local-fs.target" "network-online.target" "network.target"];
+    wants = ["local-fs.target" "network-online.target" "network.target"];
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 51fcbb572053..c0b9954206ad 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonApplication rec {
   name = "google-compute-engine-${version}";
-  version = "20180510";
+  version = "20180905";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p";
+    sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n";
   };
 
   postPatch = ''

From e0f46105aa30c4814899f16449859ed89578ecc0 Mon Sep 17 00:00:00 2001
From: Jasper Woudenberg <mail@jasperwoudenberg.com>
Date: Fri, 21 Sep 2018 10:03:25 +0100
Subject: [PATCH 1817/3253] nodejs-10_x: 10.9.0 -> 10.11.0

---
 pkgs/development/web/nodejs/v10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index ee88b2313662..784c59c7c1e1 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.9.0";
-    sha256 = "00hdachbmcf9pyd1iksprsi5mddwp6z59mb3lr81z8ynfbmzhzni";
+    version = "10.11.0";
+    sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr";
   }

From 82feb4b66ebd841389d00ca7b3d5e9b4c3ea61c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 26 Sep 2018 12:11:28 +0100
Subject: [PATCH 1818/3253] postgresql: give postgres user a shell

---
 nixos/modules/services/databases/postgresql.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f59fb1c81772..de2a757196a5 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -188,6 +188,8 @@ in
         uid = config.ids.uids.postgres;
         group = "postgres";
         description = "PostgreSQL server user";
+        home = "${cfg.dataDir}";
+        useDefaultShell = true;
       };
 
     users.groups.postgres.gid = config.ids.gids.postgres;

From 3a275ac1eb4ea538222e8b282d9804bab6e6e543 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Wed, 26 Sep 2018 13:35:23 +0200
Subject: [PATCH 1819/3253] ejson: init at 1.2.0

---
 pkgs/development/tools/ejson/Gemfile      |   4 +
 pkgs/development/tools/ejson/Gemfile.lock |  54 +++++++
 pkgs/development/tools/ejson/default.nix  |  46 ++++++
 pkgs/development/tools/ejson/deps.nix     |  48 ++++++
 pkgs/development/tools/ejson/gemset.nix   | 188 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 6 files changed, 342 insertions(+)
 create mode 100644 pkgs/development/tools/ejson/Gemfile
 create mode 100644 pkgs/development/tools/ejson/Gemfile.lock
 create mode 100644 pkgs/development/tools/ejson/default.nix
 create mode 100644 pkgs/development/tools/ejson/deps.nix
 create mode 100644 pkgs/development/tools/ejson/gemset.nix

diff --git a/pkgs/development/tools/ejson/Gemfile b/pkgs/development/tools/ejson/Gemfile
new file mode 100644
index 000000000000..f860fe5075d4
--- /dev/null
+++ b/pkgs/development/tools/ejson/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'fpm'
+gem 'ronn'
diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock
new file mode 100644
index 000000000000..bc72352c7ab1
--- /dev/null
+++ b/pkgs/development/tools/ejson/Gemfile.lock
@@ -0,0 +1,54 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arr-pm (0.0.10)
+      cabin (> 0)
+    backports (3.8.0)
+    cabin (0.9.0)
+    childprocess (0.7.1)
+      ffi (~> 1.0, >= 1.0.11)
+    clamp (1.0.1)
+    dotenv (2.2.1)
+    ffi (1.9.18)
+    fpm (1.9.2)
+      arr-pm (~> 0.0.10)
+      backports (>= 2.6.2)
+      cabin (>= 0.6.0)
+      childprocess
+      clamp (~> 1.0.0)
+      ffi
+      json (>= 1.7.7, < 2.0)
+      pleaserun (~> 0.0.29)
+      ruby-xz
+      stud
+    hpricot (0.8.6)
+    insist (1.0.0)
+    io-like (0.3.0)
+    json (1.8.6)
+    mustache (0.99.8)
+    pleaserun (0.0.30)
+      cabin (> 0)
+      clamp
+      dotenv
+      insist
+      mustache (= 0.99.8)
+      stud
+    rdiscount (2.2.0.1)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    ruby-xz (0.2.3)
+      ffi (~> 1.9)
+      io-like (~> 0.3)
+    stud (0.0.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fpm
+  ronn
+
+BUNDLED WITH
+   1.16.0
diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix
new file mode 100644
index 000000000000..80129f318e39
--- /dev/null
+++ b/pkgs/development/tools/ejson/default.nix
@@ -0,0 +1,46 @@
+{ lib, bundlerEnv, ruby, buildGoPackage, fetchFromGitHub }:
+let
+  # needed for manpage generation
+  gems = bundlerEnv {
+    name = "ejson-gems";
+    gemdir = ./.;
+    inherit ruby;
+  };
+in buildGoPackage rec {
+  name = "ejson-${version}";
+  version = "1.2.0";
+  rev = "v${version}";
+
+  nativeBuildInputs = [ gems ];
+
+  goPackagePath = "github.com/Shopify/ejson";
+  subPackages = [ "cmd/ejson" ];
+
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "Shopify";
+    repo = "ejson";
+    inherit rev;
+    sha256 = "07ig24fryb9n0mfyqb0sgpj7di9y7wbvh2ppwfs2jqfpvpncd7yh";
+  };
+
+  # set HOME, otherwise bundler will insert stuff in the manpages
+  postBuild = ''
+    cd go/src/$goPackagePath
+    HOME=$PWD make man
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share
+    cp -r build/man $out/share
+  '';
+
+  meta = with lib; {
+    description = "A small library to manage encrypted secrets using asymmetric encryption.";
+    license = licenses.mit;
+    homepage = https://github.com/Shopify/ejson;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/development/tools/ejson/deps.nix b/pkgs/development/tools/ejson/deps.nix
new file mode 100644
index 000000000000..b0c7defc5d78
--- /dev/null
+++ b/pkgs/development/tools/ejson/deps.nix
@@ -0,0 +1,48 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/codegangsta/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codegangsta/cli";
+      rev =  "9908e96513e5a94de37004098a3974a567f18111";
+      sha256 = "0g6sihdb53nlf770dp3jc0qqxnlir5n2yjbp5p5vf7kcj3p54p34";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dustin/gojson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dustin/gojson";
+      rev =  "057ac0edc14e44d03df3bb03449e666ff50884c1";
+      sha256 = "1kzzbi5yshcg1v99gab5ymd3psild3p0rbq9jf7mssjvh11yza6f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev =  "90f2eae17a8bdcbe3f6f654fc76af7f39e97d7b9";
+      sha256 = "0s984ksmc8npf642nwwd1a81c2sfi613v7yia9jff710i5472fah";
+    };
+  }
+  {
+    goPackagePath  = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "ca7e7f10cb9fd9c1a6ff7f60436c086d73714180";
+      sha256 = "02wmfdq40fjszrd9l2w4c1g34zxnxyydwr4sqvp2blmw2s6ww4bx";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/development/tools/ejson/gemset.nix b/pkgs/development/tools/ejson/gemset.nix
new file mode 100644
index 000000000000..b6fb1473d222
--- /dev/null
+++ b/pkgs/development/tools/ejson/gemset.nix
@@ -0,0 +1,188 @@
+{
+  arr-pm = {
+    dependencies = ["cabin"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";
+      type = "gem";
+    };
+    version = "0.0.10";
+  };
+  backports = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  cabin = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b3b8j3iqnagjfn1261b9ncaac9g44zrx1kcg81yg4z9i513kici";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  childprocess = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04cypmwyy4aj5p9b5dmpwiz5p1gzdpz6jaxb42fpckdbmkpvn6j1";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  clamp = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jb6l4scp69xifhicb5sffdixqkw8wgkk9k2q57kh2y36x1px9az";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pgzlvs0sswnqlgfm9gkz2hlhkc0zd3vnlp2vglb1wbgnx37pjjv";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  ffi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      type = "gem";
+    };
+    version = "1.9.18";
+  };
+  fpm = {
+    dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09vzjsiwa2dlhph6fc519x5l0bfn2qfhayfld48cdl2561x5c7fb";
+      type = "gem";
+    };
+    version = "1.9.2";
+  };
+  hpricot = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jn8x9ch79gqmnzgyz78kppavjh5lqx0y0r6frykga2b86rz9s6z";
+      type = "gem";
+    };
+    version = "0.8.6";
+  };
+  insist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bw3bdwns14mapbgb8cbjmr0amvwz8y72gyclq04xp43wpp5jrvg";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  io-like = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
+      type = "gem";
+    };
+    version = "1.8.6";
+  };
+  mustache = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
+      type = "gem";
+    };
+    version = "0.99.8";
+  };
+  pleaserun = {
+    dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";
+      type = "gem";
+    };
+    version = "0.0.30";
+  };
+  rdiscount = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1arvk3k06prxasq1djbj065ixar4zl171340g7wr1ww4gj9makx3";
+      type = "gem";
+    };
+    version = "2.2.0.1";
+  };
+  ronn = {
+    dependencies = ["hpricot" "mustache" "rdiscount"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07plsxxfx5bxdk72ii9za6km0ziqlq8jh3bicr4774dalga6zpw2";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+  ruby-xz = {
+    dependencies = ["ffi" "io-like"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  stud = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qpb57cbpm9rwgsygqxifca0zma87drnlacv49cqs2n5iyi6z8kb";
+      type = "gem";
+    };
+    version = "0.0.23";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39e70e5e1761..ea0d9fc8e123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1292,6 +1292,8 @@ with pkgs;
 
   et = callPackage ../applications/misc/et {};
 
+  ejson = callPackage ../development/tools/ejson {};
+
   eternal-terminal = callPackage ../tools/networking/eternal-terminal {};
 
   f3 = callPackage ../tools/filesystems/f3 { };

From 656ca2296c803dbb8dda2bbf67b18282380a5daa Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Sep 2018 08:00:56 -0400
Subject: [PATCH 1820/3253] linux: 4.4.157 -> 4.4.158

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 3106dc981055..d906700f437e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.157";
+  version = "4.4.158";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0kb23pq0q7nkrri4bir5x6285wbi17fn5mpbm9awzjablq5bq400";
+    sha256 = "1a921xq475y961izkzn8n4ky9s7n4xsvhs9qh664xk5biip8y72p";
   };
 } // (args.argsOverride or {}))

From 8e4d980904ca333d116a157a30069b9f8f6085c6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Sep 2018 08:01:05 -0400
Subject: [PATCH 1821/3253] linux: 4.9.128 -> 4.9.129

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 6e5d310075e2..d34db0989963 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.128";
+  version = "4.9.129";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04kgdci8xndml2fwbam59pjwwxqd4kf7y3qgkk4asshs9546zdxx";
+    sha256 = "064kwdsxzk65mn991cmxqs31i332szf2z3lw5lgbzhgyzk9i0mbg";
   };
 } // (args.argsOverride or {}))

From 61452c82aed78741a20c93f6c7ae1a86d06a86f0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Sep 2018 08:01:13 -0400
Subject: [PATCH 1822/3253] linux: 4.14.71 -> 4.14.72

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index fcec5fd0df41..5decdc14e110 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.71";
+  version = "4.14.72";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n";
+    sha256 = "0zsmch2m9drk297n6ck8ja6m5p4fzg87lz8ky3y41g0b4l35k4nz";
   };
 } // (args.argsOverride or {}))

From 24c31d43bbd5935f736db8bb91ec5662cfaf6ba2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Sep 2018 08:01:20 -0400
Subject: [PATCH 1823/3253] linux: 4.18.9 -> 4.18.10

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 48fc823ee084..48ae108c48a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.9";
+  version = "4.18.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac";
+    sha256 = "1pli16s1vprmrq4cdii93k8rqrxy20a7vs7jf77fgdfaiizlyq0h";
   };
 } // (args.argsOverride or {}))

From 82f2ae02608549c3d72906787dd104b80a35a8e7 Mon Sep 17 00:00:00 2001
From: vanzef <vanzef@gmail.com>
Date: Wed, 26 Sep 2018 12:46:05 +0000
Subject: [PATCH 1824/3253] gitAndTools.pass-git-helper: init at 0.4 (#47056)

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/pass-git-helper/default.nix | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 37745be5dc35..88746f5eba84 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -115,6 +115,8 @@ let
 
   pre-commit = callPackage ./pre-commit { };
 
+  pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
+
   qgit = qt5.callPackage ./qgit { };
 
   stgit = callPackage ./stgit {
diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
new file mode 100644
index 000000000000..d0d60b193437
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }:
+
+buildPythonApplication rec {
+  pname   = "pass-git-helper";
+  version = "0.4";
+
+  src = fetchFromGitHub {
+    owner  = "languitar";
+    repo   = "pass-git-helper";
+    rev    = "${version}";
+    sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap";
+  };
+
+  propagatedBuildInputs = [ pyxdg ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/languitar/pass-git-helper";
+    description = "A git credential helper interfacing with pass, the standard unix password manager";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ vanzef ];
+  };
+}

From e387f2506ba402b6c03150485a85b144b03af638 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Wed, 26 Sep 2018 15:34:46 +0200
Subject: [PATCH 1825/3253] roundcube: simplify using fetchzip

---
 pkgs/servers/roundcube/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 961bdd3c00eb..40afd7043e41 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -1,17 +1,14 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name= "roundcube-${version}";
+{ lib, stdenv, fetchzip }:
+let
   version = "1.3.7";
+in
+fetchzip rec {
+  name= "roundcube-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; 
-    sha256 = "31bd37d0f89dc634064f170c6ed8981c258754b6f81eccb59a2634b29d0bb01c";
-  };
-
-  installPhase = ''
-    mkdir -p $out/
-    cp -R . $out/
+  url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; 
+  sha256 = "0xwqy0adynx7066a0cvz9vyg85waax1i4p70kcdkz7q5jnw4jzhf";
+ 
+  extraPostFetch = ''
     ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
     rm -rf $out/installer
   '';

From 9390a261dd28197d499b5b3c46fcb42a464c5a03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Sep 2018 06:36:31 -0700
Subject: [PATCH 1826/3253] nfs-utils: 2.3.2 -> 2.3.3 (#46989)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nfs-utils/versions
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 657f17c16849..86e9e0d3d4d0 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -14,11 +14,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nfs-utils-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     url = "https://kernel.org/pub/linux/utils/nfs-utils/${version}/${name}.tar.xz";
-    sha256 = "06av6cjf8h18dpaxh8cd1awsra75zf6s5sj5r2z5g7scbj051ziw";
+    sha256 = "08k36d7l8yqylscnln3p85lcfwi7r7g6n3bnslgmzc1i71wk92zn";
   };
 
   # libnfsidmap is built together with nfs-utils from the same source,

From ca3231a9f33e7596eb7d6422e4239d8a3a505db0 Mon Sep 17 00:00:00 2001
From: rembo10 <801525+rembo10@users.noreply.github.com>
Date: Wed, 26 Sep 2018 14:56:47 +0100
Subject: [PATCH 1827/3253] arc-theme: 2017-05-12 -> 20180715 (#43490)

---
 pkgs/misc/themes/arc/default.nix | 44 ++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index b9c0d0d4436f..d9846415484b 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,43 +1,53 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3
+, gnome-themes-standard, gtk-engine-murrine, optipng, inkscape}:
 
 let
-  # treat versions newer than 3.22 as 3.22
-  gnomeVersion = if stdenv.lib.versionOlder "3.22" gnome3.version then "3.22" else gnome3.version;
   pname = "arc-theme";
 in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "2017-05-12";
+  version = "20180715";
 
   src = fetchFromGitHub {
-    owner  = "horst3180";
+    owner  = "NicoHood";
     repo   = pname;
-    rev    = "8290cb813f157a22e64ae58ac3dfb5983b0416e6";
-    sha256 = "1lxiw5iq9n62xzs0fks572c5vkz202jigndxaankxb44wcgn9zyf";
+    rev    = version;
+    sha256 = "1kkfnkiih0i3pds5mgd1v9lrdrp4nh4hk42mw7sa4fpbjff4jh6j";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gnome3.gtk ];
+  preBuild = ''
+    # Shut up inkscape's warnings
+    export HOME="$NIX_BUILD_ROOT"
+  '';
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ];
+  buildInputs = [ gtk3 ];
 
-  preferLocalBuild = true;
+  propagatedUserEnvPkgs = [ gnome-themes-standard gtk-engine-murrine ];
 
-  configureFlags = [ "--disable-unity" "--with-gnome=${gnomeVersion}" ];
+  postPatch = ''
+    find . -name render-assets.sh |
+    while read filename
+    do
+      substituteInPlace "$filename" \
+        --replace "/usr/bin/inkscape" "${inkscape.out}/bin/inkscape" \
+        --replace "/usr/bin/optipng" "${optipng.out}/bin/optipng"
+    done
+    patchShebangs .
+  '';
+
+  configureFlags = [ "--disable-unity" ];
 
   postInstall = ''
-    mkdir -p $out/share/plank/themes
-    cp -r extra/*-Plank $out/share/plank/themes
-    install -Dm644 -t $out/share/doc/${pname}/Chrome extra/Chrome/*.crx
     install -Dm644 -t $out/share/doc/${pname}        AUTHORS *.md
   '';
 
   meta = with stdenv.lib; {
     description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell";
-    homepage    = https://github.com/horst3180/arc-theme;
+    homepage    = https://github.com/NicoHood/arc-theme;
     license     = licenses.gpl3;
     maintainers = with maintainers; [ simonvandel romildo ];
-    platforms   = platforms.unix;
+    platforms   = platforms.linux;
   };
 }

From 593062ddc2104cf91b1cf9cc0e4f4b1437f59f6b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 26 Sep 2018 16:15:50 +0200
Subject: [PATCH 1828/3253] fetchFromGitLab: Fix grouping issue for group arg

Issue introduced by c3612b97e625ad0d70c6ba56d191bcb9a403f44c.

Example output before that commit (witch a random package using
fetchFromGitLab):

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

After the commit:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/%2Fhsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

And with this very commit, which fixes the issue:

$ nix-instantiate --eval -A hiawatha.src.urls
[ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]

The problem was that it has used optionalString in conjunction with "+",
so the optionalString only applied to the left-hand side of the +
operator.

Thanks to @ryantm for reporting the issue at:

https://github.com/NixOS/nixpkgs/pull/46487/commits/c3612b97e625ad0d70c6ba56d191bcb9a403f44c#r220576764

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: Ryan Mulligan <ryan@ryantm.com>
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39e70e5e1761..56c3606368d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,8 +292,8 @@ with pkgs;
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-    url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) group+"%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
-    meta.homepage = "https://${domain}/${lib.optionalString (group != null) group+"/"}${owner}/${repo}/";
+    url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${group}%2F"}${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
+    meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/";
   } // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; };
 
   # gitweb example, snapshot support is optional in gitweb

From 115bc86e6c48f83d718ad03c2ad1380c6da4ed00 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 6 Aug 2018 19:18:02 -0400
Subject: [PATCH 1829/3253] paxctl: Fix cross and Darwin builds

---
 pkgs/os-specific/linux/paxctl/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 270be695f03a..8fdd2356c30d 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, elf-header }:
 
 stdenv.mkDerivation rec {
   name = "paxctl-${version}";
@@ -9,8 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53";
   };
 
+  buildInputs = [ elf-header ];
+
   preBuild = ''
-    sed "s|--owner 0 --group 0||g" -i Makefile
+    sed -i Makefile \
+      -e 's|--owner 0 --group 0||g' \
+      -e '/CC:=gcc/d'
   '';
 
   makeFlags = [
@@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A tool for controlling PaX flags on a per binary basis";
     homepage    = "https://pax.grsecurity.net";
     license     = licenses.gpl2;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
     maintainers = with maintainers; [ thoughtpolice ];
   };
 }

From 361521f5b0062d396dabe72b3f0ca0cdd31b8bf9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 26 Sep 2018 11:26:27 -0400
Subject: [PATCH 1830/3253] Revert "stdenv: partial revert of f2bb59e"

This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a.
---
 pkgs/stdenv/cross/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index d1efa3602374..daa9f66615c9 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -53,6 +53,9 @@ in lib.init bootStages ++ [
            else buildPackages.gcc;
 
       extraNativeBuildInputs = old.extraNativeBuildInputs
+        ++ lib.optionals
+             (hostPlatform.isLinux && !buildPlatform.isLinux)
+             [ buildPackages.patchelf buildPackages.paxctl ]
         ++ lib.optional
              (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
              buildPackages.updateAutotoolsGnuConfigScriptsHook

From e7ca9af4cc7ad9c1c980ba4694cc9edaedcfda19 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 26 Sep 2018 18:07:06 +0200
Subject: [PATCH 1831/3253] shairport-sync: fix pulseaudio support & default
 arguments

---
 nixos/modules/services/networking/shairport-sync.nix | 3 ++-
 pkgs/servers/shairport-sync/default.nix              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix
index 0b87140b0d8d..36ecb74ffc95 100644
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@@ -27,7 +27,7 @@ in
       };
 
       arguments = mkOption {
-        default = "-v -o pulse";
+        default = "-v -d pulse";
         description = ''
           Arguments to pass to the daemon. Defaults to a local pulseaudio
           server.
@@ -72,6 +72,7 @@ in
         serviceConfig = {
           User = cfg.user;
           ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}";
+          RuntimeDirectory = "shairport-sync";
         };
       };
 
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index fbce457aedc2..eef975881117 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
-    "--with-alsa" "--with-pipe" "--with-pulseaudio" "--with-stdout"
+    "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout"
     "--with-avahi" "--with-ssl=openssl" "--with-soxr"
-    "--without-configfiles" "--without-initscript"
+    "--without-configfiles"
   ];
 
   meta = with stdenv.lib; {

From 4586ff73955a761db6f05a66ff40d40dfa317e73 Mon Sep 17 00:00:00 2001
From: Amin Bandali <aminb@gnu.org>
Date: Wed, 26 Sep 2018 12:46:58 -0400
Subject: [PATCH 1832/3253] alloy: add alloy5 and take maintainership (#47262)

Add alloy5 (currently, 5.0.0.1), update homepage and downloadPage, and
take maintainership of the package.
---
 maintainers/maintainer-list.nix          |   5 ++
 pkgs/development/tools/alloy/default.nix | 110 +++++++++++++----------
 pkgs/top-level/all-packages.nix          |   5 +-
 3 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f3b0772faa86..e6bf0bace1d7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -221,6 +221,11 @@
     github = "amiloradovsky";
     name = "Andrew Miloradovsky";
   };
+  aminb = {
+    email = "amin@aminb.org";
+    github = "aminb";
+    name = "Amin Bandali";
+  };
   aminechikhaoui = {
     email = "amine.chikhaoui91@gmail.com";
     github = "AmineChikhaoui";
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index c965e5a937a4..7ff5633072e1 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -1,58 +1,72 @@
-{ stdenv, fetchurl, jre, makeDesktopItem }:
+{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
 
-stdenv.mkDerivation rec {
-  name = "alloy-${version}";
-  version = "4.2_2015-02-22";
+let generic = { major, version, src }:
 
-  src = fetchurl {
-    sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
-    url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar";
-  };
+  stdenv.mkDerivation rec {
+    name = "${nameMajor}-${version}";
+    nameMajor = "alloy${major}";
 
-  desktopItem = makeDesktopItem rec {
-    name = "alloy";
-    exec = name;
-    icon = name;
-    desktopName = "Alloy";
-    genericName = "Relational modelling tool";
-    comment = meta.description;
-    categories = "Development;IDE;Education;";
-  };
+    desktopItem = makeDesktopItem rec {
+      name = "${nameMajor}";
+      exec = name;
+      icon = name;
+      desktopName = "Alloy ${major}";
+      genericName = "Relational modelling tool";
+      comment = meta.description;
+      categories = "Development;IDE;Education;";
+    };
 
-  buildInputs = [ jre ];
+    nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
+    buildCommand = ''
+      jar=$out/share/alloy/${nameMajor}.jar
+      install -Dm644 ${src} $jar
 
-  installPhase = ''
-    jar=$out/share/alloy/alloy${version}.jar
+      mkdir -p $out/bin
+      makeWrapper ${jre}/bin/java $out/bin/${nameMajor} --add-flags \
+       "-jar $jar"
 
-    install -Dm644 ${src} $jar
-
-    cat << EOF > alloy
-    #!${stdenv.shell}
-    exec ${jre}/bin/java -jar $jar "\''${@}"
-    EOF
-
-    install -Dm755 alloy $out/bin/alloy
-
-    install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
-    cp -r ${desktopItem}/share/applications $out/share
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Language & tool for relational models";
-    longDescription = ''
-      Alloy is a language for describing structures and a tool for exploring
-      them. An Alloy model is a collection of constraints that describes a set
-      of structures, e.g. all the possible security configurations of a web
-      application, or all the possible topologies of a switching network. The
-      Alloy Analyzer is a solver that takes the constraints of a model and
-      finds structures that satisfy them. Structures are displayed graphically,
-      and their appearance can be customized for the domain at hand.
+      install -Dm644 ${./icon.png} $out/share/pixmaps/${nameMajor}.png
+      cp -r ${desktopItem}/share/applications $out/share
     '';
-    homepage = http://alloy.mit.edu/;
-    downloadPage = http://alloy.mit.edu/alloy/download.html;
-    license = licenses.mit;
-    platforms = platforms.linux;
+
+    meta = with stdenv.lib; {
+      description = "Language & tool for relational models";
+      longDescription = ''
+        Alloy is a language for describing structures and a tool for exploring
+        them. An Alloy model is a collection of constraints that describes a set
+        of structures, e.g. all the possible security configurations of a web
+        application, or all the possible topologies of a switching network. The
+        Alloy Analyzer is a solver that takes the constraints of a model and
+        finds structures that satisfy them. Structures are displayed graphically,
+        and their appearance can be customized for the domain at hand.
+      '';
+      homepage = http://alloytools.org/;
+      downloadPage = http://alloytools.org/download.html;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ aminb ];
+    };
   };
+
+in rec {
+  alloy4 = let version = "4.2_2015-02-22"; in generic {
+    major = "4";
+    inherit version;
+    src = fetchurl {
+      sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
+      url = "http://alloytools.org/download/alloy${version}.jar";
+    };
+  };
+
+  alloy5 = let version = "5.0.0.1"; in generic {
+    major = "5";
+    inherit version;
+    src = fetchurl {
+      sha256 = "0kz6i9av9ksjk62lx0dxx8xr542iqvbqd14m1f9h8xpf72c25xw4";
+      url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/Alloy-${version}.jar";
+    };
+  };
+
+  alloy = alloy4;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56c3606368d7..87983bcf3433 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7932,7 +7932,10 @@ with pkgs;
     for more information.
   '';
 
-  alloy = callPackage ../development/tools/alloy { };
+  inherit (callPackage ../development/tools/alloy { })
+    alloy4
+    alloy5
+    alloy;
 
   adtool = callPackage ../tools/admin/adtool { };
 

From 98cb225d9f13ef8c63623467b7318e43a9203672 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 26 Sep 2018 13:42:36 -0500
Subject: [PATCH 1833/3253] nheko: 0.6.0 -> 0.6.1

---
 .../networking/instant-messengers/nheko/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 452ed70e824e..810720baa7ca 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1qd2c5684722jlpgqyxq6pbb1rdk1zc3sk88mkjyqypj1k0pj3dc";
+    sha256 = "00jigca7kcqwm57qalz7ifz9p6v7p3pnamjvpkxjjix2rm9wmg2q";
   };
 
   # If, on Darwin, you encounter the error

From 2bf0ee3b2b47562a31e8d9f9c8fe903f67dbfe5c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham.christensen@target.com>
Date: Tue, 25 Sep 2018 13:54:45 -0400
Subject: [PATCH 1834/3253] dockertools: tarsum: turn in to a buildInput

---
 pkgs/build-support/docker/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0cee1dd2916f..6b5a06486e79 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -77,7 +77,9 @@ rec {
     ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
     go build
 
-    cp tarsum $out
+    mkdir -p $out/bin
+
+    cp tarsum $out/bin/
   '';
 
   # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
@@ -287,7 +289,7 @@ rec {
   }:
     runCommand "docker-layer-${name}" {
       inherit baseJson contents extraCommands;
-      buildInputs = [ jshon rsync ];
+      buildInputs = [ jshon rsync tarsum ];
     }
     ''
       mkdir layer
@@ -314,11 +316,11 @@ rec {
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
-      tarsum=$(${tarsum} < $out/layer.tar)
+      tarhash=$(tarsum < $out/layer.tar)
 
       # Add a 'checksum' field to the JSON, with the value set to the
       # checksum of the tarball.
-      cat ${baseJson} | jshon -s "$tarsum" -i checksum > $out/json
+      cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
 
       # Indicate to docker that we're using schema version 1.0.
       echo -n "1.0" > $out/VERSION
@@ -402,8 +404,8 @@ rec {
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
-        ts=$(${tarsum} < $out/layer.tar)
-        cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json
+        tarhash=$(${tarsum}/bin/tarsum < $out/layer.tar)
+        cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
         # Indicate to docker that we're using schema version 1.0.
         echo -n "1.0" > $out/VERSION
 

From fd045173cef84e65a8cb133ded28c99167cb0901 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham.christensen@target.com>
Date: Mon, 24 Sep 2018 16:00:33 -0400
Subject: [PATCH 1835/3253] referencesByPopularity: init to sort packages by a
 cachability heuristic

Using a simple algorithm, convert the references to a path in to a
sorted list of dependent paths based on how often they're referenced
and how deep in the tree they live. Equally-"popular" paths are then
sorted by name.

The existing writeReferencesToFile prints the paths in a simple
ascii-based sorting of the paths.

Sorting the paths by graph improves the chances that the difference
between two builds appear near the end of the list, instead of near
the beginning. This makes a difference for Nix builds which export a
closure for another program to consume, if that program implements its
own level of binary diffing.

For an example, Docker Images. If each store path is a separate layer
then Docker Images can be very efficiently transfered between systems,
and we get very good cache reuse between images built with the same
version of Nixpkgs. However, since Docker only reliably supports a
small number of layers (42) it is important to pick the individual
layers carefully. By storing very popular store paths in the first 40
layers, we improve the chances that the next Docker image will share
many of those layers.*

Given the dependency tree:

    A - B - C - D -\
     \   \   \      \
      \   \   \      \
       \   \ - E ---- F
        \- G

Nodes which have multiple references are duplicated:

    A - B - C - D - F
     \   \   \
      \   \   \- E - F
       \   \
        \   \- E - F
         \
          \- G

Each leaf node is now replaced by a counter defaulted to 1:

    A - B - C - D - (F:1)
     \   \   \
      \   \   \- E - (F:1)
       \   \
        \   \- E - (F:1)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node, replacing the
parent node with a counter of 1, and each existing counter being
incremented by 1. That is to say `- D - (F:1)` becomes `- (D:1, F:2)`:

    A - B - C - (D:1, F:2)
     \   \   \
      \   \   \- (E:1, F:2)
       \   \
        \   \- (E:1, F:2)
         \
          \- (G:1)

Then each leaf counter is merged with its parent node again, merging
any counters, then incrementing each:

    A - B - (C:1, D:2, E:2, F:5)
     \   \
      \   \- (E:1, F:2)
       \
        \- (G:1)

And again:

    A - (B:1, C:2, D:3, E:4, F:8)
     \
      \- (G:1)

And again:

    (A:1, B:2, C:3, D:4, E:5, F:9, G:2)

and then paths have the following "popularity":

    A     1
    B     2
    C     3
    D     4
    E     5
    F     9
    G     2

and the popularity contest would result in the paths being printed as:

    F
    E
    D
    C
    B
    G
    A

* Note: People who have used a Dockerfile before assume Docker's
Layers are inherently ordered. However, this is not true -- Docker
layers are content-addressable and are not explicitly layered until
they are composed in to an Image.
---
 .../references-by-popularity/closure-graph.py | 520 ++++++++++++++++++
 .../references-by-popularity/default.nix      |  15 +
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 537 insertions(+)
 create mode 100644 pkgs/build-support/references-by-popularity/closure-graph.py
 create mode 100644 pkgs/build-support/references-by-popularity/default.nix

diff --git a/pkgs/build-support/references-by-popularity/closure-graph.py b/pkgs/build-support/references-by-popularity/closure-graph.py
new file mode 100644
index 000000000000..d67a5dfcf140
--- /dev/null
+++ b/pkgs/build-support/references-by-popularity/closure-graph.py
@@ -0,0 +1,520 @@
+# IMPORTANT: Making changes?
+#
+# Validate your changes with python3 ./closure-graph.py --test
+
+
+# Using a simple algorithm, convert the references to a path in to a
+# sorted list of dependent paths based on how often they're referenced
+# and how deep in the tree they live. Equally-"popular" paths are then
+# sorted by name.
+#
+# The existing writeReferencesToFile prints the paths in a simple
+# ascii-based sorting of the paths.
+#
+# Sorting the paths by graph improves the chances that the difference
+# between two builds appear near the end of the list, instead of near
+# the beginning. This makes a difference for Nix builds which export a
+# closure for another program to consume, if that program implements its
+# own level of binary diffing.
+#
+# For an example, Docker Images. If each store path is a separate layer
+# then Docker Images can be very efficiently transfered between systems,
+# and we get very good cache reuse between images built with the same
+# version of Nixpkgs. However, since Docker only reliably supports a
+# small number of layers (42) it is important to pick the individual
+# layers carefully. By storing very popular store paths in the first 40
+# layers, we improve the chances that the next Docker image will share
+# many of those layers.*
+#
+# Given the dependency tree:
+#
+#     A - B - C - D -\
+#      \   \   \      \
+#       \   \   \      \
+#        \   \ - E ---- F
+#         \- G
+#
+# Nodes which have multiple references are duplicated:
+#
+#     A - B - C - D - F
+#      \   \   \
+#       \   \   \- E - F
+#        \   \
+#         \   \- E - F
+#          \
+#           \- G
+#
+# Each leaf node is now replaced by a counter defaulted to 1:
+#
+#     A - B - C - D - (F:1)
+#      \   \   \
+#       \   \   \- E - (F:1)
+#        \   \
+#         \   \- E - (F:1)
+#          \
+#           \- (G:1)
+#
+# Then each leaf counter is merged with its parent node, replacing the
+# parent node with a counter of 1, and each existing counter being
+# incremented by 1. That is to say `- D - (F:1)` becomes `- (D:1, F:2)`:
+#
+#     A - B - C - (D:1, F:2)
+#      \   \   \
+#       \   \   \- (E:1, F:2)
+#        \   \
+#         \   \- (E:1, F:2)
+#          \
+#           \- (G:1)
+#
+# Then each leaf counter is merged with its parent node again, merging
+# any counters, then incrementing each:
+#
+#     A - B - (C:1, D:2, E:2, F:5)
+#      \   \
+#       \   \- (E:1, F:2)
+#        \
+#         \- (G:1)
+#
+# And again:
+#
+#     A - (B:1, C:2, D:3, E:4, F:8)
+#      \
+#       \- (G:1)
+#
+# And again:
+#
+#     (A:1, B:2, C:3, D:4, E:5, F:9, G:2)
+#
+# and then paths have the following "popularity":
+#
+#     A     1
+#     B     2
+#     C     3
+#     D     4
+#     E     5
+#     F     9
+#     G     2
+#
+# and the popularity contest would result in the paths being printed as:
+#
+#     F
+#     E
+#     D
+#     C
+#     B
+#     G
+#     A
+#
+# * Note: People who have used a Dockerfile before assume Docker's
+# Layers are inherently ordered. However, this is not true -- Docker
+# layers are content-addressable and are not explicitly layered until
+# they are composed in to an Image.
+
+import sys
+import json
+import unittest
+
+from pprint import pprint
+from collections import defaultdict
+
+# Find paths in the original dataset which are never referenced by
+# any other paths
+def find_roots(closures):
+    roots = [];
+
+    for closure in closures:
+        path = closure['path']
+        if not any_refer_to(path, closures):
+            roots.append(path)
+
+    return roots
+
+class TestFindRoots(unittest.TestCase):
+    def test_find_roots(self):
+        self.assertCountEqual(
+            find_roots([
+                {
+                    "path": "/nix/store/foo",
+                    "references": [
+                        "/nix/store/foo",
+                        "/nix/store/bar"
+                    ]
+                },
+                {
+                    "path": "/nix/store/bar",
+                    "references": [
+                        "/nix/store/bar",
+                        "/nix/store/tux"
+                    ]
+                },
+                {
+                    "path": "/nix/store/hello",
+                    "references": [
+                    ]
+                }
+            ]),
+            ["/nix/store/foo", "/nix/store/hello"]
+        )
+
+
+def any_refer_to(path, closures):
+    for closure in closures:
+        if path != closure['path']:
+            if path in closure['references']:
+                return True
+    return False
+
+class TestAnyReferTo(unittest.TestCase):
+    def test_has_references(self):
+        self.assertTrue(
+            any_refer_to(
+                "/nix/store/bar",
+                [
+                    {
+                        "path": "/nix/store/foo",
+                        "references": [
+                            "/nix/store/bar"
+                        ]
+                    },
+                ]
+            ),
+        )
+    def test_no_references(self):
+        self.assertFalse(
+            any_refer_to(
+                "/nix/store/foo",
+                [
+                    {
+                        "path": "/nix/store/foo",
+                        "references": [
+                            "/nix/store/foo",
+                            "/nix/store/bar"
+                        ]
+                    },
+                ]
+            ),
+        )
+
+def all_paths(closures):
+    paths = []
+    for closure in closures:
+        paths.append(closure['path'])
+        paths.extend(closure['references'])
+    paths.sort()
+    return list(set(paths))
+
+
+class TestAllPaths(unittest.TestCase):
+    def test_returns_all_paths(self):
+        self.assertCountEqual(
+            all_paths([
+                {
+                    "path": "/nix/store/foo",
+                    "references": [
+                        "/nix/store/foo",
+                        "/nix/store/bar"
+                    ]
+                },
+                {
+                    "path": "/nix/store/bar",
+                    "references": [
+                        "/nix/store/bar",
+                        "/nix/store/tux"
+                    ]
+                },
+                {
+                    "path": "/nix/store/hello",
+                    "references": [
+                    ]
+                }
+            ]),
+            ["/nix/store/foo", "/nix/store/bar", "/nix/store/hello", "/nix/store/tux",]
+        )
+    def test_no_references(self):
+        self.assertFalse(
+            any_refer_to(
+                "/nix/store/foo",
+                [
+                    {
+                        "path": "/nix/store/foo",
+                        "references": [
+                            "/nix/store/foo",
+                            "/nix/store/bar"
+                        ]
+                    },
+                ]
+            ),
+        )
+
+# Convert:
+#
+# [
+#    { path: /nix/store/foo, references: [ /nix/store/foo, /nix/store/bar, /nix/store/baz ] },
+#    { path: /nix/store/bar, references: [ /nix/store/bar, /nix/store/baz ] },
+#    { path: /nix/store/baz, references: [ /nix/store/baz, /nix/store/tux ] },
+#    { path: /nix/store/tux, references: [ /nix/store/tux ] }
+#  ]
+#
+# To:
+#    {
+#      /nix/store/foo: [ /nix/store/bar, /nix/store/baz ],
+#      /nix/store/bar: [ /nix/store/baz ],
+#      /nix/store/baz: [ /nix/store/tux ] },
+#      /nix/store/tux: [ ]
+#    }
+#
+# Note that it drops self-references to avoid loops.
+def make_lookup(closures):
+    lookup = {}
+
+    for closure in closures:
+        # paths often self-refer
+        nonreferential_paths = [ref for ref in closure['references'] if ref != closure['path']]
+        lookup[closure['path']] = nonreferential_paths
+
+    return lookup
+
+class TestMakeLookup(unittest.TestCase):
+    def test_returns_lookp(self):
+        self.assertDictEqual(
+            make_lookup([
+                {
+                    "path": "/nix/store/foo",
+                    "references": [
+                        "/nix/store/foo",
+                        "/nix/store/bar"
+                    ]
+                },
+                {
+                    "path": "/nix/store/bar",
+                    "references": [
+                        "/nix/store/bar",
+                        "/nix/store/tux"
+                    ]
+                },
+                {
+                    "path": "/nix/store/hello",
+                    "references": [
+                    ]
+                }
+            ]),
+            {
+                "/nix/store/foo": [ "/nix/store/bar" ],
+                "/nix/store/bar": [ "/nix/store/tux" ],
+                "/nix/store/hello": [ ],
+            }
+        )
+
+# Convert:
+#
+# /nix/store/foo with
+#  {
+#    /nix/store/foo: [ /nix/store/bar, /nix/store/baz ],
+#    /nix/store/bar: [ /nix/store/baz ],
+#    /nix/store/baz: [ /nix/store/tux ] },
+#    /nix/store/tux: [ ]
+#  }
+#
+# To:
+#
+# {
+#   /nix/store/bar: {
+#                    /nix/store/baz: {
+#                                     /nix/store/tux: {}
+#                    }
+#   },
+#   /nix/store/baz: {
+#                   /nix/store/tux: {}
+#   }
+# }
+def make_graph_segment_from_root(root, lookup):
+    children = {}
+    for ref in lookup[root]:
+        children[ref] = make_graph_segment_from_root(ref, lookup)
+    return children
+
+class TestMakeGraphSegmentFromRoot(unittest.TestCase):
+    def test_returns_graph(self):
+        self.assertDictEqual(
+            make_graph_segment_from_root("/nix/store/foo", {
+                "/nix/store/foo": [ "/nix/store/bar" ],
+                "/nix/store/bar": [ "/nix/store/tux" ],
+                "/nix/store/tux": [ ],
+                "/nix/store/hello": [ ],
+            }),
+            {
+                "/nix/store/bar": {
+                    "/nix/store/tux": {}
+                }
+            }
+        )
+    def test_returns_graph_tiny(self):
+        self.assertDictEqual(
+            make_graph_segment_from_root("/nix/store/tux", {
+                "/nix/store/foo": [ "/nix/store/bar" ],
+                "/nix/store/bar": [ "/nix/store/tux" ],
+                "/nix/store/tux": [ ],
+            }),
+            {}
+        )
+
+# Convert a graph segment in to a popularity-counted dictionary:
+#
+# From:
+# {
+#    /nix/store/foo: {
+#                      /nix/store/bar: {
+#                                        /nix/store/baz: {
+#                                                           /nix/store/tux: {}
+#                                        }
+#                      }
+#                      /nix/store/baz: {
+#                                         /nix/store/tux: {}
+#                      }
+#    }
+# }
+#
+# to:
+# [
+#   /nix/store/foo: 1
+#   /nix/store/bar: 2
+#   /nix/store/baz: 4
+#   /nix/store/tux: 6
+# ]
+def graph_popularity_contest(full_graph):
+    popularity = defaultdict(int)
+    for path, subgraph in full_graph.items():
+        popularity[path] += 1
+        subcontest = graph_popularity_contest(subgraph)
+        for subpath, subpopularity in subcontest.items():
+            popularity[subpath] += subpopularity + 1
+
+    return popularity
+
+class TestGraphPopularityContest(unittest.TestCase):
+    def test_counts_popularity(self):
+        self.assertDictEqual(
+            graph_popularity_contest({
+                "/nix/store/foo": {
+                    "/nix/store/bar": {
+                        "/nix/store/baz": {
+                            "/nix/store/tux": {}
+                        }
+                    },
+                    "/nix/store/baz": {
+                        "/nix/store/tux": {}
+                    }
+                }
+            }),
+            {
+                   "/nix/store/foo": 1,
+                   "/nix/store/bar": 2,
+                   "/nix/store/baz": 4,
+                   "/nix/store/tux": 6,
+            }
+        )
+
+# Emit a list of packages by popularity, most first:
+#
+# From:
+# [
+#   /nix/store/foo: 1
+#   /nix/store/bar: 1
+#   /nix/store/baz: 2
+#   /nix/store/tux: 2
+# ]
+#
+# To:
+# [ /nix/store/baz /nix/store/tux /nix/store/bar /nix/store/foo ]
+def order_by_popularity(paths):
+    paths_by_popularity = defaultdict(list)
+    popularities = []
+    for path, popularity in paths.items():
+        popularities.append(popularity)
+        paths_by_popularity[popularity].append(path)
+
+    popularities = list(set(popularities))
+    popularities.sort()
+
+    flat_ordered = []
+    for popularity in popularities:
+        paths = paths_by_popularity[popularity]
+        paths.sort(key=package_name)
+
+        flat_ordered.extend(reversed(paths))
+    return list(reversed(flat_ordered))
+
+
+class TestOrderByPopularity(unittest.TestCase):
+    def test_returns_in_order(self):
+        self.assertEqual(
+            order_by_popularity({
+                   "/nix/store/foo": 1,
+                   "/nix/store/bar": 1,
+                   "/nix/store/baz": 2,
+                   "/nix/store/tux": 2,
+            }),
+            [
+                "/nix/store/baz",
+                "/nix/store/tux",
+                "/nix/store/bar",
+                "/nix/store/foo"
+            ]
+        )
+
+def package_name(path):
+    parts = path.split('-')
+    start = parts.pop(0)
+    # don't throw away any data, so the order is always the same.
+    # even in cases where only the hash at the start has changed.
+    parts.append(start)
+    return '-'.join(parts)
+
+def main():
+    filename = sys.argv[1]
+    key = sys.argv[2]
+
+    with open(filename) as f:
+        data = json.load(f)
+
+    # Data comes in as:
+    # [
+    #    { path: /nix/store/foo, references: [ /nix/store/foo, /nix/store/bar, /nix/store/baz ] },
+    #    { path: /nix/store/bar, references: [ /nix/store/bar, /nix/store/baz ] },
+    #    { path: /nix/store/baz, references: [ /nix/store/baz, /nix/store/tux ] },
+    #    { path: /nix/store/tux, references: [ /nix/store/tux ] }
+    #  ]
+    #
+    # and we want to get out a list of paths ordered by how universally,
+    # important they are, ie: tux is referenced by every path, transitively
+    # so it should be #1
+    #
+    # [
+    #   /nix/store/tux,
+    #   /nix/store/baz,
+    #   /nix/store/bar,
+    #   /nix/store/foo,
+    # ]
+    graph = data[key]
+
+    roots = find_roots(graph);
+    lookup = make_lookup(graph)
+
+    full_graph = {}
+    for root in roots:
+        full_graph[root] = make_graph_segment_from_root(root, lookup)
+
+    ordered = order_by_popularity(graph_popularity_contest(full_graph))
+    missing = []
+    for path in all_paths(graph):
+        if path not in ordered:
+            missing.append(path)
+
+    ordered.extend(missing)
+    print("\n".join(ordered))
+
+if "--test" in sys.argv:
+    # Don't pass --test otherwise unittest gets mad
+    unittest.main(argv = [f for f in sys.argv if f != "--test" ])
+else:
+    main()
diff --git a/pkgs/build-support/references-by-popularity/default.nix b/pkgs/build-support/references-by-popularity/default.nix
new file mode 100644
index 000000000000..4cae2dcf3ca9
--- /dev/null
+++ b/pkgs/build-support/references-by-popularity/default.nix
@@ -0,0 +1,15 @@
+{ runCommand, python3, coreutils }:
+# Write the references of `path' to a file, in order of how "popular" each
+# reference is. Nix 2 only.
+path: runCommand "closure-paths"
+{
+  exportReferencesGraph.graph = path;
+  __structuredAttrs = true;
+  PATH = "${coreutils}/bin:${python3}/bin";
+  builder = builtins.toFile "builder"
+    ''
+      . .attrs.sh
+      python3 ${./closure-graph.py} .attrs.json graph > ''${outputs[out]}
+    '';
+  }
+  ""
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 500a713f22ba..f90c9c254459 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -366,6 +366,8 @@ with pkgs;
 
   nukeReferences = callPackage ../build-support/nuke-references { };
 
+  referencesByPopularity = callPackage ../build-support/references-by-popularity { };
+
   removeReferencesTo = callPackage ../build-support/remove-references-to { };
 
   vmTools = callPackage ../build-support/vm { };

From 77b5440640c217b170c89ffe862add8d2869badb Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 18 Sep 2018 13:25:43 -0700
Subject: [PATCH 1836/3253] terraform: update all the providers

---
 .../cluster/terraform/providers/data.nix      | 136 +++++++++++-------
 .../cluster/terraform/providers/update-all    |  25 +++-
 2 files changed, 104 insertions(+), 57 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 4ae44cafbf44..9267ea9b6df9 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -1,11 +1,18 @@
 # Generated with ./update-all
 {
+  acme =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-acme";
+      version = "1.0.1";
+      sha256  = "1yh0dqmrwa1gqpnzj4mdv9p9081azpcskqjrbmy2lzmn3di2ag3r";
+    };
   alicloud =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.10.0";
-      sha256  = "19lplakpl8dz4a8xw9va86gd774yq4gayq4kzv3pvr62b03a999x";
+      version = "1.16.0";
+      sha256  = "10v6g25wna63nay0ac3l31qbwdb8bs4vj6d1dr2kqzfqqmw9wnna";
     };
   archive =
     {
@@ -18,8 +25,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-arukas";
-      version = "0.1.0";
-      sha256  = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl";
+      version = "1.0.0";
+      sha256  = "1v8jzns8czy8navdrabsvc9zk1s9vs1718ngjlx9vs13r3bkm2fc";
     };
   atlas =
     {
@@ -32,22 +39,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.30.0";
-      sha256  = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95";
+      version = "1.36.0";
+      sha256  = "10lcdi609fa4q5xmqxp0vjb4ajqxvkhn61h7bfcc6syhpm20hdj1";
     };
   azurerm =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.12.0";
-      sha256  = "1avp2vhlj60iw17pw39003p30byms7xvq5lkippm60ak4ky9p51b";
+      version = "1.15.0";
+      sha256  = "1pdmj0ww5y2nwxivlf5l886nwd76hpqhwdayab2fp16zyl1qbpfd";
     };
   azurestack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurestack";
-      version = "0.2.0";
-      sha256  = "0s1ga0ga0rbpp552hbq1dfnkpdjvk1c40i7qqnqmm20xlz6k55mb";
+      version = "0.4.0";
+      sha256  = "1c9am0v4aq95k1jblc767vykk76dp0d6z2fvy148ag77cy2jgryc";
     };
   bitbucket =
     {
@@ -88,8 +95,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudflare";
-      version = "1.1.0";
-      sha256  = "1rmg7gndhmb1wp0zszhwx9vrax8411iy24yrpkmayjify3vsvdpx";
+      version = "1.4.0";
+      sha256  = "17ajzm0m73lrp14ikabg26s9gj1dbh23a34231dwv9zqqky93dn7";
     };
   cloudscale =
     {
@@ -123,8 +130,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      version = "1.1.0";
-      sha256  = "0ckmjpw9dkj5490kwxamdvnnidnjdgxnb1biqpvwj4139hlcl628";
+      version = "1.2.0";
+      sha256  = "1hr3zsisyv04b0skl3v7ghycz3ac2dqkn47qjszmkdg5vvy8dh0g";
     };
   digitalocean =
     {
@@ -158,8 +165,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-docker";
-      version = "1.0.0";
-      sha256  = "09ribvyv02r907pdvyrwaklr14xyvyn14rijslnm16xp8d4waz9h";
+      version = "1.0.1";
+      sha256  = "1q5bsdvp47gvpiyqlzgrpxczlh6m9g870pn84ks49xfkwk5izpz6";
     };
   dyn =
     {
@@ -193,8 +200,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-github";
-      version = "1.1.0";
-      sha256  = "1f0yg2qpr9ffimscy17csh20cq9czkcs96ac79s3kl56f8c95ijm";
+      version = "1.3.0";
+      sha256  = "1k7816dbpsjjbm3pa6l0qlrxw5hh8z5iwdr8mp1mp5liidhl6bqs";
     };
   gitlab =
     {
@@ -207,8 +214,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.16.2";
-      sha256  = "1d8by6rb4s2dggapcbb4b2g5hf280bjayz9p5q9njgsn83579pnm";
+      version = "1.18.0";
+      sha256  = "0zwy1imby0xqvb86a82rdvglipf2sfpi3rmsj72iikp7vi3mqk64";
     };
   grafana =
     {
@@ -221,15 +228,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-hcloud";
-      version = "1.2.0";
-      sha256  = "17zrdzvb9hp02710khvh9pwkavp79zy3y2qzaydgmnrbkks4s8cg";
+      version = "1.3.0";
+      sha256  = "0sb9pajsy0if18vgw5pllgv8qvb4v7pv65m2f3hfkck2za82ndwb";
     };
   heroku =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-heroku";
-      version = "1.2.0";
-      sha256  = "1w2r0wnfcr9aqij5ckq0apd8az8yzdg704hi1zjb1ggb54v97n31";
+      version = "1.4.0";
+      sha256  = "159a9add5v4dj2bry1b85i74q2lb4pjjypkm5hzrbqys6gn2imhn";
     };
   http =
     {
@@ -263,15 +270,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-influxdb";
-      version = "1.0.1";
-      sha256  = "0713h50675njnpdy4w1azfq8h6yai40gx6w2fbvw4n59h6jlfny4";
+      version = "1.0.2";
+      sha256  = "05l2i0z35x6462mm1inn6jhp1pfi7df6hv52lhcyypk0lv2rgqf9";
     };
   kubernetes =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-kubernetes";
-      version = "1.1.0";
-      sha256  = "1lhdmglc6nd24ss7z41qqbpsiy71ajvixhq4pfiq0b19hwj6awgn";
+      version = "1.2.0";
+      sha256  = "0slvhj8f7p27r9v4vb5vjyqpmzlpaji1djzwsxsf247df68mka61";
     };
   librato =
     {
@@ -315,6 +322,13 @@
       version = "1.1.0";
       sha256  = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw";
     };
+  netlify =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-netlify";
+      version = "0.1.0";
+      sha256  = "1lf66nzqcgzjwvh1lv2jp8gcj6apdanlinci5pri8mgv5r1pv40l";
+    };
   newrelic =
     {
       owner   = "terraform-providers";
@@ -350,26 +364,33 @@
       version = "1.0.0";
       sha256  = "12vpa09xrq8z1pjq0bwzq3889c4fl6c5kvynwqy0z1pdx21m60ha";
     };
+  oci =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-oci";
+      version = "3.0.0";
+      sha256  = "08p13yzc3h8xng77ia3x4lmar8k6860gkx6w16ccw311ndzl586h";
+    };
   oneandone =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oneandone";
-      version = "1.2.0";
-      sha256  = "1lrcy05zklv7vc8653f8cn3jjc9zjjwi488dpaphsmsl1md3m88b";
+      version = "1.3.0";
+      sha256  = "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn";
     };
   opc =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-opc";
-      version = "1.2.0";
-      sha256  = "19rfm12w97ccyrzpdw0qlwfn7gh64lqh17kj3cv11y1f731z8rlw";
+      version = "1.2.1";
+      sha256  = "0mnvi47kbdwwpfzdlcd1mhd15w5b0ivwxi1a5lvs0zyqf0g0cas8";
     };
   openstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-openstack";
-      version = "1.7.0";
-      sha256  = "0sw2kmcsi9sjzi549fj6knida01q0lnpqvc3cpyjyv92f6w4bznn";
+      version = "1.9.0";
+      sha256  = "0prmdj78jsyrns876cglfp8a3dbpfl33bwb0dj072flh4yknfrdr";
     };
   opentelekomcloud =
     {
@@ -389,8 +410,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oraclepaas";
-      version = "1.3.0";
-      sha256  = "09vsb52cbf2h1rdwfg4xb54gklwgmaxdgjcdq1yx5gxj7lfbdl9v";
+      version = "1.3.1";
+      sha256  = "1vyqkxq3c98gfpshr1zz4y91jfblnyzrbzwr40dsc6r9b6jlbwqa";
     };
   ovh =
     {
@@ -410,15 +431,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "1.1.1";
-      sha256  = "1dpl6cnii9kzx9lr1f9vndh7w6mfg5kv6az7dq49lhi16sxwwb6a";
+      version = "1.2.0";
+      sha256  = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf";
     };
   panos =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-panos";
-      version = "1.3.0";
-      sha256  = "1isnhaszld96zpkcbwkf70nhhwmsl2z3s9868cjsac44b27gsvrq";
+      version = "1.4.0";
+      sha256  = "033xpglbn0q805b129kf1ywl13m4pgrkwlvgl347nldysryiasxq";
     };
   postgresql =
     {
@@ -438,8 +459,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-profitbricks";
-      version = "1.3.2";
-      sha256  = "0mk77n833np6ahm6bzvpg31a0m1qazaipd0vqzccqfkbz78sm3jb";
+      version = "1.4.0";
+      sha256  = "1yrmlpqc1bzgs3c8pxhfbscf4anjri6gv6sd8i8rn764z8xhwaff";
     };
   rabbitmq =
     {
@@ -459,8 +480,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-random";
-      version = "1.3.1";
-      sha256  = "0zcvw0vz7mxx46m2jamhmkl7l0k8v0q5fha5z6cra3y2ikhqrnfl";
+      version = "2.0.0";
+      sha256  = "0plg139pbvqwbs5hcl7d5kjn7vwknjr4n0ysc2j5s25iyhikkv9s";
     };
   rundeck =
     {
@@ -480,8 +501,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.5.1";
-      sha256  = "1b42fh7mwj2cx3g16lgp4sw6ca5qqj0mhm6i7qid8agwsga34v0y";
+      version = "1.6.0";
+      sha256  = "1ykcakfw0gp239jp4brpjynxzzvlhldfpv12hkgymj22s37n5jnn";
     };
   softlayer =
     {
@@ -494,8 +515,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-spotinst";
-      version = "1.2.0";
-      sha256  = "09k79xg5cbs4qhxr0b4f42qpxj6j2795z5vmwbxfkirb5bkpqdq1";
+      version = "1.4.0";
+      sha256  = "0kb09v18ksh2r4b5k9iv4rzq403zk1shpakk54pmq8s6i5jd085g";
     };
   statuscake =
     {
@@ -525,12 +546,19 @@
       version = "1.0.2";
       sha256  = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v";
     };
+  tfe =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-tfe";
+      version = "0.1.0";
+      sha256  = "1mzrp2yk2w8clqkydkz761vj5spgb2n79yi3ng85rkqvchzamsh5";
+    };
   tls =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tls";
-      version = "1.1.0";
-      sha256  = "1kzq6al9rzpmk98bmxcf5gjx5s28gfjp1xvdsnd4a113pljn0ddb";
+      version = "1.2.0";
+      sha256  = "0hvj00j8a820j18yi90xzhd635pkffivp1116d84wyqxya5acd4p";
     };
   triton =
     {
@@ -550,8 +578,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      version = "1.1.1";
-      sha256  = "0kiqpnb4669xw9b8nf6a8ky0jhnp14bipaizml3gdh1hnda6hflw";
+      version = "1.1.3";
+      sha256  = "1aq82w4g3hdvb3ba86fisjc2lqbzsymn2q2kni8cyqvwhcxk1r4c";
     };
   vcd =
     {
@@ -564,7 +592,7 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.6.0";
-      sha256  = "1xav341bal7lyb206zw2nzgzjvwkda54cgksza44q3jhqznxma47";
+      version = "1.8.1";
+      sha256  = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
     };
 }
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index 31a5a4a750dc..83cc989cf9a8 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -7,10 +7,21 @@
 # all the providers.
 set -euo pipefail
 
+# the maximum number of attempts before giving up inside of GET and prefetch_github
+readonly maxAttempts=30
+
 GET() {
   local url=$1
+  local retry=1
   echo "fetching $url" >&2
-  curl -#fL -u "$GITHUB_AUTH" "$url"
+  while ! curl -#fL -u "$GITHUB_AUTH" "$url"; do
+    echo "The curl command has failed. Attempt $retry/${maxAttempts}" >&2
+    if [[ "${retry}" -eq "${maxAttempts}" ]]; then
+      exit 1
+    fi
+    retry=$(( retry + 1 ))
+    sleep 5
+  done
 }
 
 get_org_repos() {
@@ -24,6 +35,7 @@ get_repo_tags() {
   local repo=$2
   GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \
     jq -r '.[].ref' | \
+    grep -v 'v\.' | \
     cut -d '/' -f 3- | \
     sort --version-sort
 }
@@ -32,7 +44,15 @@ prefetch_github() {
   local owner=$1
   local repo=$2
   local rev=$3
-  nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"
+  local retry=1
+  while ! nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"; do
+    echo "The nix-prefetch-url command has failed. Attempt $retry/${maxAttempts}" >&2
+    if [[ "${retry}" -eq "${maxAttempts}" ]]; then
+      exit 1
+    fi
+    retry=$(( retry + 1 ))
+    sleep 5
+  done
 }
 
 echo_entry() {
@@ -73,7 +93,6 @@ org=terraform-providers
 
 repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort)
 
-
 # Get all the providers with index
 
 cat <<HEADER > data.nix

From f95c18f3d151eca3876abf8b30dc808658b2c9a8 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 18 Sep 2018 13:27:04 -0700
Subject: [PATCH 1837/3253] terraform-provider-nixos: move the provider to the
 inside of terraform.withPlugins

---
 .../terraform-provider-nixos/default.nix      | 23 ------------
 .../cluster/terraform/providers/data.nix      |  7 ++++
 .../cluster/terraform/providers/update-all    | 37 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
deleted file mode 100644
index f4ad171c267e..000000000000
--- a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-buildGoPackage rec {
-  name = "terraform-provider-nixos-${version}";
-  version = "0.0.1";
-  goPackagePath = "github.com/tweag/terraform-provider-nixos";
-  src = fetchFromGitHub {
-    owner = "tweag";
-    repo = "terraform-provider-nixos";
-    sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
-    rev = "v${version}";
-  };
-
-  # Terraform allow checking the provider versions, but this breaks
-  # if the versions are not provided via file paths.
-  postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}";
-
-  meta = with stdenv.lib; {
-    description = "Terraform plugin for outputting NixOS configuration files from Terraform resources.";
-    homepage = "https://github.com/tweag/terraform-provider-nixos";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ grahamc ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 9267ea9b6df9..508f0658354e 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -595,4 +595,11 @@
       version = "1.8.1";
       sha256  = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
     };
+  nixos =
+    {
+      owner   = "tweag";
+      repo    = "terraform-provider-nixos";
+      version = "0.0.1";
+      sha256  = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
+    };
 }
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index 83cc989cf9a8..ac005c5f59e9 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -72,6 +72,21 @@ EOF
 
 indent() { sed 's/^/    /'; }
 
+add_repo() {
+  org="${1}"
+  repo="${2}"
+
+  echo "*** $repo ***"
+  name=$(echo "$repo" | cut -d - -f 3-)
+  last_tag=$(get_repo_tags "$org" "$repo" | tail -1)
+  last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag")
+
+  {
+    echo "  $name ="
+    echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
+  } >> data.nix
+}
+
 ## Main ##
 
 cd "$(dirname "$0")"
@@ -89,29 +104,21 @@ HELP
   exit 1
 fi
 
-org=terraform-providers
-
-repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort)
-
-# Get all the providers with index
-
 cat <<HEADER > data.nix
 # Generated with ./update-all
 {
 HEADER
 
+# add all the repos under the terraform-providers organisation
+org=terraform-providers
+repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort)
 for repo in $repos; do
-  echo "*** $repo ***"
-  name=$(echo "$repo" | cut -d - -f 3-)
-  last_tag=$(get_repo_tags "$org" "$repo" | tail -1)
-  last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag")
-
-  {
-    echo "  $name ="
-    echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
-  } >> data.nix
+  add_repo "$org" "$repo"
 done
 
+# add the repos that live outside of terraform-providers
+add_repo tweag terraform-provider-nixos
+
 cat <<FOOTER >> data.nix
 }
 FOOTER
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f46bc03f7673..57229f7f547c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22109,8 +22109,6 @@ with pkgs;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
-  terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {};
-
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
 
   terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};

From bb51ba9bb883816b0f15b169c2f03510ad55c60d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 26 Sep 2018 22:18:30 +0200
Subject: [PATCH 1838/3253] golden-cheetah: add desktop item and icon

---
 .../misc/golden-cheetah/default.nix             | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index eecc34b3d94f..01447281fe76 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,8 +1,19 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, qmake, makeWrapper
+, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
 }:
-stdenv.mkDerivation rec {
+
+let
+  desktopItem = makeDesktopItem {
+    name = "goldencheetah";
+    exec = "GoldenCheetah";
+    icon = "goldencheetah";
+    desktopName = "GoldenCheetah";
+    genericName = "GoldenCheetah";
+    comment = "Performance software for cyclists, runners and triathletes";
+    categories = "Application;Utility;";
+  };
+in stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
   version = "3.4";
   src = fetchurl {
@@ -27,6 +38,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
     wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
+    install -Dm644 "${desktopItem}/share/applications/"* -t $out/share/applications/
+    install -Dm644 src/Resources/images/gc.png $out/share/pixmaps/goldencheetah.png
 
     runHook postInstall
   '';

From 23900febe79a3a6aaab1276cde8689e0fa3f3d5c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Wed, 26 Sep 2018 20:26:39 +0000
Subject: [PATCH 1839/3253] coq: 8.8.1 -> 8.8.2 (#47388)

---
 pkgs/applications/science/logic/coq/default.nix | 1 +
 pkgs/top-level/coq-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index dbfec66789a3..0ede4230aa6d 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -24,6 +24,7 @@ let
    "8.7.2"     = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
    "8.8.0" = "13a4fka22hdxsjk11mgjb9ffzplfxyxp1sg5v1c8nk1grxlscgw8";
    "8.8.1" = "1hlf58gwazywbmfa48219amid38vqdl94yz21i11b4map6jfwhbk";
+   "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
   camlp5 = ocamlPackages.camlp5_strict;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 818f896048ba..9c4c9aa9bdab 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -77,7 +77,7 @@ in rec {
     version = "8.7.2";
   };
   coq_8_8 = callPackage ../applications/science/logic/coq {
-    version = "8.8.1";
+    version = "8.8.2";
   };
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;

From 26ce2652584b46adac8704d67e04984069fdc799 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Wed, 26 Sep 2018 14:22:40 -0700
Subject: [PATCH 1840/3253] vlc: 3.0.3 -> 3.0.4 (#47406)

---
 pkgs/applications/video/vlc/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6fedc227e447..b08ff812ace4 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,11 +20,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v";
+    sha256 = "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1";
   };
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
@@ -52,18 +52,6 @@ stdenv.mkDerivation rec {
   # set the path to the compiler
   BUILDCC = "${stdenv.cc}/bin/gcc";
 
-  patches = [
-    (fetchpatch {
-      name = "vlc-qt5.11.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc";
-      sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p";
-    })
-    (fetchpatch {
-      url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch";
-      sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace configure \
       --replace /bin/echo echo

From be02ab2f30d55874f477e140ba812d51e0674a7a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Mon, 20 Aug 2018 15:49:46 +0200
Subject: [PATCH 1841/3253] openmpi: 3.1.0 -> 3.1.2

---
 pkgs/development/libraries/openmpi/default.nix     | 4 ++--
 pkgs/development/python-modules/mpi4py/default.nix | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index a279fe79940f..b5651e8f02ad 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -10,14 +10,14 @@
 
 let
   majorVersion = "3.1";
-  minorVersion = "0";
+  minorVersion = "2";
 
 in stdenv.mkDerivation rec {
   name = "openmpi-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
+    sha256 = "1ibniapqki763agpfh65y284las083fqmj8m5b2pi8ilgy2fsm66";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 1b4ad50c781f..6b69df614137 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
     # Needed to run the tests reliably. See:
     # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
     export OMPI_MCA_rmaps_base_oversubscribe=yes
+    export OMPI_MCA_osc=sm
+    export OMPI_MCA_btl=self,vader
   '';
 
   setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];

From 676825f6fe45dfddf17ff7659b98771802ba1519 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 20 Sep 2018 23:31:47 +0200
Subject: [PATCH 1842/3253] mpi4py: Add patch to skip broken tests.

Fixes compilation with openmpi-3.1.2
---
 pkgs/development/python-modules/mpi4py/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 6b69df614137..6d3897475ad4 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
+{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
 
 buildPythonPackage rec {
   pname = "mpi4py";
@@ -13,6 +13,13 @@ buildPythonPackage rec {
     inherit mpi;
   };
 
+  patches = [ (fetchpatch {
+    # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE
+    url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw";
+    sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace test/test_spawn.py --replace \
                       "unittest.skipMPI('openmpi(<3.0.0)')" \
@@ -37,8 +44,6 @@ buildPythonPackage rec {
     # Needed to run the tests reliably. See:
     # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
     export OMPI_MCA_rmaps_base_oversubscribe=yes
-    export OMPI_MCA_osc=sm
-    export OMPI_MCA_btl=self,vader
   '';
 
   setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];

From 4fe900619080f0b1a804abbccaab500d819ead10 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham.christensen@target.com>
Date: Tue, 25 Sep 2018 10:53:42 -0400
Subject: [PATCH 1843/3253] dockerTools.buildLayeredImage: init

Create a many-layered Docker Image.

Implements much less than buildImage:

 - Doesn't support specific uids/gids
 - Doesn't support runninng commands after building
 - Doesn't require qemu
 - Doesn't create mutable copies of the files in the path
 - Doesn't support parent images

If you want those feature, I recommend using buildLayeredImage as an
input to buildImage.

Notably, it does support:

 - Caching low level, common paths based on a graph traversial
   algorithm, see referencesByPopularity in
   0a80233487993256e811f566b1c80a40394c03d6
 - Configurable number of layers. If you're not using AUFS or not
   extending the image, you can specify a larger number of layers at
   build time:

       pkgs.dockerTools.buildLayeredImage {
         name = "hello";
         maxLayers = 128;
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

 - Parallelized creation of the layers, improving build speed.
 - The contents of the image includes the closure of the configuration,
   so you don't have to specify paths in contents and config.

   With buildImage, paths referred to by the config were not included
   automatically in the image. Thus, if you wanted to call Git, you
   had to specify it twice:

       pkgs.dockerTools.buildImage {
         name = "hello";
         contents = [ pkgs.gitFull ];
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

   buildLayeredImage on the other hand includes the runtime closure of
   the config when calculating the contents of the image:

       pkgs.dockerTools.buildImage {
         name = "hello";
         config.Cmd = [ "${pkgs.gitFull}/bin/git" ];
       };

Minor Problems

 - If any of the store paths change, every layer will be rebuilt in
   the nix-build. However, beacuse the layers are bit-for-bit
   reproducable, when these images are loaded in to Docker they will
   match existing layers and not be imported or uploaded twice.

Common Questions

 - Aren't Docker layers ordered?

   No. People who have used a Dockerfile before assume Docker's
   Layers are inherently ordered. However, this is not true -- Docker
   layers are content-addressable and are not explicitly layered until
   they are composed in to an Image.

 - What happens if I have more than maxLayers of store paths?

   The first (maxLayers-2) most "popular" paths will have their own
   individual layers, then layer #(maxLayers-1) will contain all the
   remaining "unpopular" paths, and finally layer #(maxLayers) will
   contain the Image configuration.
---
 doc/functions.xml                             | 177 ++++++++++++++++++
 pkgs/build-support/docker/default.nix         | 175 +++++++++++++++++
 .../docker/store-path-to-layer.sh             |  24 +++
 3 files changed, 376 insertions(+)
 create mode 100755 pkgs/build-support/docker/store-path-to-layer.sh

diff --git a/doc/functions.xml b/doc/functions.xml
index 0c0d82b0342c..c4cbf0adb203 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -682,6 +682,183 @@ hello        latest   de2bf4786de6   About a minute ago   25.2MB
    </example>
   </section>
 
+  <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage">
+   <title>buildLayeredImage</title>
+
+   <para>
+    Create a Docker image with many of the store paths being on their own layer
+    to improve sharing between images.
+   </para>
+
+   <variablelist>
+    <varlistentry>
+     <term>
+      <varname>name</varname>
+     </term>
+     <listitem>
+      <para>
+       The name of the resulting image.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>tag</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Tag of the generated image.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> the output path's hash
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>contents</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Top level paths in the container. Either a single derivation, or a list
+       of derivations.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>[]</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>config</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Run-time configuration of the container. A full list of the options are
+       available at in the
+       <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+       Docker Image Specification v1.2.0 </link>.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>{}</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>created</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Date and time the layers were created. Follows the same
+       <literal>now</literal> exception supported by
+       <literal>buildImage</literal>.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>maxLayers</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Maximum number of layers to create.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>24</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-contents">
+    <title>Behavior of <varname>contents</varname> in the final image</title>
+
+    <para>
+     Each path directly listed in <varname>contents</varname> will have a
+     symlink in the root of the image.
+    </para>
+
+    <para>
+     For example:
+<programlisting><![CDATA[
+pkgs.dockerTools.buildLayeredImage {
+  name = "hello";
+  contents = [ pkgs.hello ];
+}
+]]></programlisting>
+     will create symlinks for all the paths in the <literal>hello</literal>
+     package:
+<screen><![CDATA[
+/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
+/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
+/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
+]]></screen>
+    </para>
+   </section>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-config">
+    <title>Automatic inclusion of <varname>config</varname> references</title>
+
+    <para>
+     The closure of <varname>config</varname> is automatically included in the
+     closure of the final image.
+    </para>
+
+    <para>
+     This is different from <function>pkgs.dockerTools.buildImage</function>
+     which does <emphasis>not</emphasis> automatically include the
+     configuration's closure.
+    </para>
+
+    <para>
+     This allows you to make very simple Docker images with very little code.
+     This container will start up and run <command>hello</command>:
+<programlisting><![CDATA[
+pkgs.dockerTools.buildLayeredImage {
+  name = "hello";
+  config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+}
+]]></programlisting>
+    </para>
+   </section>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers">
+    <title>Adjusting <varname>maxLayers</varname></title>
+
+    <para>
+     Increasing the <varname>maxLayers</varname> increases the number of layers
+     which have a chance to be shared between different images.
+    </para>
+
+    <para>
+     Modern Docker installations support up to 128 layers, however older
+     versions support as few as 42.
+    </para>
+
+    <para>
+     If the produced image will not be extended by other Docker builds, it is
+     safe to set <varname>maxLayers</varname> to <literal>128</literal>.
+     However it will be impossible to extend the image further.
+    </para>
+
+    <para>
+     The first (<literal>maxLayers-2</literal>) most "popular" paths will have
+     their own individual layers, then layer #<literal>maxLayers-1</literal>
+     will contain all the remaining "unpopular" paths, and finally layer
+     #<literal>maxLayers</literal> will contain the Image configuration.
+    </para>
+
+    <para>
+     Docker's Layers are not inherently ordered, they are content-addressable
+     and are not explicitly layered until they are composed in to an Image.
+    </para>
+   </section>
+  </section>
+
   <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
    <title>pullImage</title>
 
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 6b5a06486e79..73639a521b6a 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -1,4 +1,5 @@
 {
+  symlinkJoin,
   coreutils,
   docker,
   e2fsprogs,
@@ -19,6 +20,7 @@
   utillinux,
   vmTools,
   writeReferencesToFile,
+  referencesByPopularity,
   writeScript,
   writeText,
 }:
@@ -272,6 +274,81 @@ rec {
       perl ${pkgs.pathsFromGraph} closure-* > $out/storePaths
     '';
 
+  # Create $maxLayers worth of Docker Layers, one layer per store path
+  # unless there are more paths than $maxLayers. In that case, create
+  # $maxLayers-1 for the most popular layers, and smush the remainaing
+  # store paths in to one final layer.
+  mkManyPureLayers = {
+    name,
+    # Files to add to the layer.
+    closure,
+    configJson,
+    # Docker has a 42-layer maximum, we pick 24 to ensure there is plenty
+    # of room for extension
+    maxLayers ? 24
+  }:
+    runCommand "${name}-granular-docker-layers" {
+      inherit maxLayers;
+      paths = referencesByPopularity closure;
+      buildInputs = [ jshon rsync tarsum ];
+      enableParallelBuilding = true;
+    }
+    ''
+      # Delete impurities for store path layers, so they don't get
+      # shared and taint other projects.
+      cat ${configJson} \
+        | jshon -d config \
+        | jshon -s "1970-01-01T00:00:01Z" -i created > generic.json
+
+      # WARNING!
+      # The following code is fiddly w.r.t. ensuring every layer is
+      # created, and that no paths are missed. If you change the
+      # following head and tail call lines, double-check that your
+      # code behaves properly when the number of layers equals:
+      #      maxLayers-1, maxLayers, and maxLayers+1
+      head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${./store-path-to-layer.sh}
+      if [ $(cat $paths | wc -l) -ge $maxLayers ]; then
+        tail -n+$maxLayers $paths | xargs ${./store-path-to-layer.sh} $maxLayers
+      fi
+
+      echo "Finished building layer '$name'"
+
+      mv ./layers $out
+    '';
+
+  # Create a "Customisation" layer which adds symlinks at the root of
+  # the image to the root paths of the closure. Also add the config
+  # data like what command to run and the environment to run it in.
+  mkCustomisationLayer = {
+    name,
+    # Files to add to the layer.
+    contents,
+    baseJson,
+    uid ? 0, gid ? 0,
+  }:
+    runCommand "${name}-customisation-layer" {
+      buildInputs = [ jshon rsync tarsum ];
+    }
+    ''
+      cp -r ${contents}/ ./layer
+
+      # Tar up the layer and throw it into 'layer.tar'.
+      echo "Packing layer..."
+      mkdir $out
+      tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+
+      # Compute a checksum of the tarball.
+      echo "Computing layer checksum..."
+      tarhash=$(tarsum < $out/layer.tar)
+
+      # Add a 'checksum' field to the JSON, with the value set to the
+      # checksum of the tarball.
+      cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json
+
+      # Indicate to docker that we're using schema version 1.0.
+      echo -n "1.0" > $out/VERSION
+    '';
+
   # Create a "layer" (set of files).
   mkPureLayer = {
     # Name of the layer
@@ -413,6 +490,104 @@ rec {
       '';
     };
 
+  buildLayeredImage = {
+    # Image Name
+    name,
+    # Image tag, the Nix's output hash will be used if null
+    tag ? null,
+    # Files to put on the image (a nix store path or list of paths).
+    contents ? [],
+    # Docker config; e.g. what command to run on the container.
+    config ? {},
+    # Time of creation of the image. Passing "now" will make the
+    # created date be the time of building.
+    created ? "1970-01-01T00:00:01Z",
+    # Docker's lowest maximum layer limit is 42-layers for an old
+    # version of the AUFS graph driver. We pick 24 to ensure there is
+    # plenty of room for extension. I believe the actual maximum is
+    # 128.
+    maxLayers ? 24
+  }:
+    let
+      uid = 0;
+      gid = 0;
+      baseName = baseNameOf name;
+      contentsEnv = symlinkJoin { name = "bulk-layers"; paths = (if builtins.isList contents then contents else [ contents ]); };
+
+      configJson = let
+          pure = writeText "${baseName}-config.json" (builtins.toJSON {
+            inherit created config;
+            architecture = "amd64";
+            os = "linux";
+          });
+          impure = runCommand "${baseName}-standard-dynamic-date.json"
+            { buildInputs = [ jq ]; }
+            ''
+               jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out
+            '';
+        in if created == "now" then impure else pure;
+
+      bulkLayers = mkManyPureLayers {
+          name = baseName;
+          closure = writeText "closure" "${contentsEnv} ${configJson}";
+          # One layer will be taken up by the customisationLayer, so
+          # take up one less.
+          maxLayers = maxLayers - 1;
+          inherit configJson;
+        };
+      customisationLayer = mkCustomisationLayer {
+          name = baseName;
+          contents = contentsEnv;
+          baseJson = configJson;
+          inherit uid gid;
+        };
+      result = runCommand "docker-image-${baseName}.tar.gz" {
+        buildInputs = [ jshon pigz coreutils findutils jq ];
+        # Image name and tag must be lowercase
+        imageName = lib.toLower name;
+        imageTag = if tag == null then "" else lib.toLower tag;
+        baseJson = configJson;
+      } ''
+        ${lib.optionalString (tag == null) ''
+          outName="$(basename "$out")"
+          outHash=$(echo "$outName" | cut -d - -f 1)
+
+          imageTag=$outHash
+        ''}
+
+        find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list
+        echo ${customisationLayer} >> layer-list
+
+        mkdir image
+        imageJson=$(cat ${configJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}")
+        manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]")
+        for layer in $(cat layer-list); do
+          layerChecksum=$(sha256sum $layer/layer.tar | cut -d ' ' -f1)
+          layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1)
+          ln -s "$layer" "./image/$layerID"
+
+          manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerID/layer.tar\"] + .")
+          imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${configJson})\"}] + .")
+          imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .")
+        done
+        imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1)
+        echo "$imageJson" > "image/$imageJsonChecksum.json"
+        manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"")
+        echo "$manifestJson" > image/manifest.json
+
+        jshon -n object \
+          -n object -s "$layerID" -i "$imageTag" \
+          -i "$imageName" > image/repositories
+
+        echo "Cooking the image..."
+        tar -C image --dereference --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0  --mode=a-w --xform s:'^./':: -c . | pigz -nT > $out
+
+        echo "Finished."
+      '';
+
+    in
+    result;
+
   # 1. extract the base image
   # 2. create the layer
   # 3. add layer deps to the layer itself, diffing with the base image
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
new file mode 100755
index 000000000000..ff814c1f6130
--- /dev/null
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -eu
+
+layerNumber=$1
+shift
+
+layerPath="./layers/$layerNumber"
+echo "Creating layer #$layerNumber for $@"
+
+mkdir -p "$layerPath"
+tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \
+    --mtime="@$SOURCE_DATE_EPOCH" \
+    --owner=0 --group=0 "$@"
+
+# Compute a checksum of the tarball.
+tarhash=$(tarsum < $layerPath/layer.tar)
+
+# Add a 'checksum' field to the JSON, with the value set to the
+# checksum of the tarball.
+cat ./generic.json | jshon -s "$tarhash" -i checksum > $layerPath/json
+
+# Indicate to docker that we're using schema version 1.0.
+echo -n "1.0" > $layerPath/VERSION

From 71eb7adfb2c13fc0cad29da70cc2f04fe19fe6c4 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 27 Sep 2018 00:50:57 +0200
Subject: [PATCH 1844/3253] vivaldi: 1.15.1147.64-1 -> 2.0.1309.29-2

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 1c45efaddf81..8a21f2f0cc2a 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.15.1147.64-1";
+  version = "2.0.1309.29-2";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "01xbfrrq2kj75cb6grpq9a4y88j1s87h2nnvy1fmyb4a2db6y0ag";
+    sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck";
   };
 
   unpackPhase = ''

From af48e5783a11091e73c43be7722aa7a3ca51ff8c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 26 Sep 2018 19:37:32 -0500
Subject: [PATCH 1845/3253] libiio: install python bindings

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/libiio/default.nix | 13 +++++++++++--
 pkgs/top-level/python-packages.nix            |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index defb17bcd88a..51cdc289d626 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , cmake, flex, bison
-, libxml2
+, libxml2, python
 }:
 
 stdenv.mkDerivation rec {
@@ -14,11 +14,20 @@ stdenv.mkDerivation rec {
     sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
   };
 
-  outputs = [ "out" "lib" "dev" ];
+  outputs = [ "out" "lib" "dev" "python" ];
 
   nativeBuildInputs = [ cmake flex bison ];
   buildInputs = [ libxml2 ];
 
+  postInstall = ''
+    mkdir -p $python/lib/${python.libPrefix}/site-packages/
+    touch $python/lib/${python.libPrefix}/site-packages/
+    cp ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/
+
+    substitute ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/iio.py \
+      --replace 'libiio.so.0' $lib/lib/libiio.so.0
+  '';
+
   meta = with stdenv.lib; {
     description = "API for interfacing with the Linux Industrial I/O Subsystem";
     homepage    = https://github.com/analogdevicesinc/libiio;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b27db158767..8196d894fc84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17125,6 +17125,11 @@ EOF
   libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override {
     inherit python;
   })).python;
+
+  libiio = (toPythonModule (pkgs.libiio.override {
+    inherit python;
+  })).python;
+
 });
 
 in fix' (extends overrides packages)

From e1a851811b2ac0d6273b285059d1481bcb4168ec Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 26 Sep 2018 06:47:45 -0700
Subject: [PATCH 1846/3253] psmisc: get src from GitLab

---
 pkgs/os-specific/linux/psmisc/default.nix | 31 +++++++++++++++--------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index c7b71d4e5018..8b3906dedb1f 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -1,19 +1,30 @@
-{stdenv, fetchurl, ncurses}:
+{stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "psmisc-23.2";
+  pname = "psmisc";
+  version = "23.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/psmisc/${name}.tar.xz";
-    sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49";
+  src = fetchFromGitLab {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0d90wmibxpkl0d7sdibvvkwpyxyg6m6ksh5gwrjh15vf1swvd5i1";
   };
 
-  buildInputs = [ncurses];
+  nativeBuildInputs = [ autoconf automake gettext ];
+  buildInputs = [ ncurses ];
 
-  meta = {
-    homepage = http://psmisc.sourceforge.net/;
+  preConfigure = ''
+    echo $version > .tarball-version
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://gitlab.com/psmisc/psmisc;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ryantm ];
   };
 }

From f37f34e3dc945d0f6b3f6cf0eabf0ea4b12a7071 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 27 Sep 2018 04:13:59 +0200
Subject: [PATCH 1847/3253] pcsc-cyberjack: 3.99.5_SP09 -> 3.99.5_SP12

3.99.5_SP12:

  * Add support for cyberJack one MF

3.99.5_SP11:

  * Add support for cyberJack one

3.99.5_SP10:

  * Add support for SHUReader and SISReader
  * Update to the Reiner-SCT repository rev cyberJack@1305

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/security/pcsc-cyberjack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index b74905b6e7e2..7d7c8ef49713 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "pcsc-cyberjack-${version}";
-  version = "3.99.5_SP09";
+  version = "3.99.5_SP12";
 
   src = with stdenv.lib; let
     splittedVer = splitString "_" version;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   in fetchurl {
     url = "http://support.reiner-sct.de/downloads/LINUX/V${version}"
         + "/pcsc-cyberjack-${tarballVersion}.tar.bz2";
-    sha256 = "1m1r26q0k2hrxfi73j4v25qfh20x4b1hcbcpgjgv7qxa33dbi30z";
+    sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a70d3bab72ddcc80d45d1150cdaf4e857ff2af0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 27 Sep 2018 04:17:24 +0200
Subject: [PATCH 1848/3253] pcsc-cyberjack: Also install cjflash tool

This tool is necessary in order to update the firmware of the secoder.

The reason I've added this to a separate output "tools" is because it
clearly is not relevant for the PCSC driver itself and it's also very
rarely needed.

I've also verified wether the closure of the PCSC plugin env still only
contains the main output and that's the case.

There are also other tools - cjBingoTest and cjgeldkarte, where the
former doesn't compile due to cjeca32.h not being found and cjgeldkarte,
which does compile but tries to dlopen() the library and subsequently
fails.

Both of these tools however look like they're just performing tests and
are not very useful outside of development, so I opted to not include
them.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/security/pcsc-cyberjack/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix
index 7d7c8ef49713..23a744f8e23d 100644
--- a/pkgs/tools/security/pcsc-cyberjack/default.nix
+++ b/pkgs/tools/security/pcsc-cyberjack/default.nix
@@ -15,10 +15,17 @@ stdenv.mkDerivation rec {
     sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j";
   };
 
+  outputs = [ "out" "tools" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb pcsclite ];
 
-  configureFlags = [ "--with-usbdropdir=\${prefix}/pcsc/drivers" ];
+  configureFlags = [
+    "--with-usbdropdir=${placeholder "out"}/pcsc/drivers"
+    "--bindir=${placeholder "tools"}/bin"
+  ];
+
+  postInstall = "make -C tools/cjflash install";
 
   meta = with stdenv.lib; {
     description = "REINER SCT cyberJack USB chipcard reader user space driver";

From d4ba6c0bc424e632307a421cb77f484dee04450f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 25 Sep 2018 13:40:02 +0000
Subject: [PATCH 1849/3253] dune: 1.2.1 -> 1.3.0

---
 pkgs/development/tools/ocaml/dune/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix
index 857d6ff1b7c2..41e0084b28ff 100644
--- a/pkgs/development/tools/ocaml/dune/default.nix
+++ b/pkgs/development/tools/ocaml/dune/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
+{ stdenv, fetchurl, ocamlPackages, opaline }:
 
 stdenv.mkDerivation rec {
   name = "dune-${version}";
-  version = "1.2.1";
-  src = fetchFromGitHub {
-    owner = "ocaml";
-    repo = "dune";
-    rev = "${version}";
-    sha256 = "14m5zg1b6d0y03c5qsmqmwiwz2h0iys02rlgn6kzm519ck679bkq";
+  version = "1.3.0";
+  src = fetchurl {
+    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
+    sha256 = "15bzakiclipsyjgcfrj83xdpwwww3aaijyw01bn5cx96cmcqyjad";
   };
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
 
+  buildFlags = "release";
+
   dontAddPrefix = true;
 
   installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   meta = {
-    inherit (src.meta) homepage;
-    description = "Fast, portable and opinionated build system";
+    homepage = "https://github.com/ocaml/dune";
+    description = "A composable build system";
     maintainers = [ stdenv.lib.maintainers.vbgl ];
-    license = stdenv.lib.licenses.asl20;
+    license = stdenv.lib.licenses.mit;
     inherit (ocamlPackages.ocaml.meta) platforms;
   };
 }

From 6f6222c40f14c83e0f64037fad05c3b06208534c Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Thu, 27 Sep 2018 10:47:02 +0200
Subject: [PATCH 1850/3253] openmolcas: 20180529 -> 18.09 (#47410)

---
 pkgs/applications/science/chemistry/openmolcas/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index 5e1628a4fba7..70e79023c0ff 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -5,8 +5,8 @@
 } :
 
 let
-  version = "20180529";
-  gitLabRev = "b6b9ceffccae0dd7f14c099468334fee0b1071fc";
+  version = "18.09";
+  gitLabRev = "v${version}";
 
   python = python3.withPackages (ps : with ps; [ six pyparsing ]);
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
     owner = "Molcas";
     repo = "OpenMolcas";
     rev = gitLabRev;
-    sha256 = "1wbjjdv07lg1x4kdnf28anyrjgy33gdgrd5d7zi1c97nz7vhdjaz";
+    sha256 = "1di1ygifx7ycfpwh25mv76xlv15wqfdmqzjsg5nani2d5z0arri2";
   };
 
   nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ];

From ea817ad88d67d603af8ae8fdd18c626f73b2cada Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Thu, 27 Sep 2018 12:03:52 +0300
Subject: [PATCH 1851/3253] newsboat: 2.12 -> 2.13 (#47359)

---
 pkgs/applications/networking/feedreaders/newsboat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index bee4c3bea20b..e7ea7eea7ba1 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "newsboat-${version}";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchurl {
     url = "https://newsboat.org/releases/${version}/${name}.tar.xz";
-    sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv";
+    sha256 = "0pik1d98ydzqi6055vdbkjg5krwifbk2hy2f5jp5p1wcy2s16dn7";
   };
 
   prePatch = ''

From 507b2fdde3b28d29d3cdb467c28e5571160f7ae6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Thu, 27 Sep 2018 09:58:50 +0000
Subject: [PATCH 1852/3253] remove Perl 5.22 and 5.24 (end-of-life upstream few
 months ago)

---
 pkgs/development/interpreters/perl/default.nix | 10 ----------
 pkgs/top-level/all-packages.nix                | 11 +----------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index df0b549e1ff9..57b44c0035ad 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -172,16 +172,6 @@ let
     setupHook = ./setup-hook-cross.sh;
   });
 in rec {
-  perl522 = common {
-    version = "5.22.4";
-    sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
-  };
-
-  perl524 = common {
-    version = "5.24.4";
-    sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz";
-  };
-
   perl526 = common {
     version = "5.26.2";
     sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f46bc03f7673..c216831e166f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7607,7 +7607,7 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  inherit (callPackages ../development/interpreters/perl {}) perl522 perl524 perl526 perl528 perldevel;
+  inherit (callPackages ../development/interpreters/perl {}) perl526 perl528 perldevel;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
@@ -12846,15 +12846,6 @@ with pkgs;
 
   ### DEVELOPMENT / PERL MODULES
 
-  # old versions
-  perl522Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
-    perl = perl522;
-    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
-  });
-  perl524Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
-    perl = perl524;
-    overrides = (config.perlPackageOverrides or (p: {})) pkgs;
-  });
   perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix {
     perl = perl526;
     overrides = (config.perlPackageOverrides or (p: {})) pkgs;

From d0199179bacc89571bbb79962e24b19aeb1b1e6f Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Thu, 27 Sep 2018 13:25:04 +0200
Subject: [PATCH 1853/3253] pythonPackages.pynacl: 1.2.1 -> 1.3.0

---
 .../python-modules/pynacl/default.nix         |  9 ++--
 .../pynacl-no-timeout-and-deadline.patch      | 49 -------------------
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch

diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 463cd8044e1d..3fe1952213e0 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -2,18 +2,15 @@
 
 buildPythonPackage rec {
   pname = "pynacl";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "pyca";
     repo = pname;
     rev = version;
-    sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f";
+    sha256 = "0ac00d5bfdmz1x428h2scq5b34llp61yhxradl94qjwz7ikqv052";
   };
 
-  # set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370
-  patches = [ ./pynacl-no-timeout-and-deadline.patch ];
-
   checkInputs = [ pytest hypothesis ];
   propagatedBuildInputs = [ libsodium cffi six ];
 
@@ -22,7 +19,7 @@ buildPythonPackage rec {
   checkPhase = ''
     py.test
   '';
-  
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ va1entin ];
     description = "Python binding to the Networking and Cryptography (NaCl) library";
diff --git a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch b/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch
deleted file mode 100644
index 5f831df3c48d..000000000000
--- a/pkgs/development/python-modules/pynacl/pynacl-no-timeout-and-deadline.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/tests/test_pwhash.py b/tests/test_pwhash.py
-index 9634c85..7f20316 100644
---- a/tests/test_pwhash.py
-+++ b/tests/test_pwhash.py
-@@ -20,7 +20,7 @@ import os
- import sys
- import unicodedata as ud
- 
--from hypothesis import given, settings
-+from hypothesis import given, settings, unlimited
- from hypothesis.strategies import integers, text
- 
- import pytest
-@@ -411,7 +411,7 @@ def test_str_verify_argon2_ref_fail(password_hash, password):
-        integers(min_value=1024 * 1024,
-                 max_value=16 * 1024 * 1024)
-        )
--@settings(deadline=1500, max_examples=20)
-+@settings(timeout=unlimited, deadline=None, max_examples=20)
- def test_argon2i_str_and_verify(password, ops, mem):
-     _psw = password.encode('utf-8')
-     pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem)
-@@ -425,7 +425,7 @@ def test_argon2i_str_and_verify(password, ops, mem):
-        integers(min_value=1024 * 1024,
-                 max_value=16 * 1024 * 1024)
-        )
--@settings(deadline=1500, max_examples=20)
-+@settings(timeout=unlimited, deadline=None, max_examples=20)
- def test_argon2id_str_and_verify(password, ops, mem):
-     _psw = password.encode('utf-8')
-     pw_hash = nacl.pwhash.argon2id.str(_psw, opslimit=ops, memlimit=mem)
-@@ -439,7 +439,7 @@ def test_argon2id_str_and_verify(password, ops, mem):
-        integers(min_value=1024 * 1024,
-                 max_value=16 * 1024 * 1024)
-        )
--@settings(deadline=1500, max_examples=20)
-+@settings(timeout=unlimited, deadline=None, max_examples=20)
- def test_argon2i_str_and_verify_fail(password, ops, mem):
-     _psw = password.encode('utf-8')
-     pw_hash = nacl.pwhash.argon2i.str(_psw, opslimit=ops, memlimit=mem)
-@@ -448,7 +448,7 @@ def test_argon2i_str_and_verify_fail(password, ops, mem):
- 
- 
- @given(text(alphabet=PASSWD_CHARS, min_size=5, max_size=20))
--@settings(deadline=1500, max_examples=5)
-+@settings(timeout=unlimited, deadline=None, max_examples=5)
- def test_pwhash_str_and_verify(password):
-     _psw = password.encode('utf-8')
- 

From d1e46df24bae37d69e6eda09bee933f22acbe0ce Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham.christensen@target.com>
Date: Thu, 27 Sep 2018 08:14:04 -0400
Subject: [PATCH 1854/3253] fixup: drop comment about config behaving
 differently from buildImage

---
 doc/functions.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index c4cbf0adb203..8223a8b0531c 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -808,12 +808,6 @@ pkgs.dockerTools.buildLayeredImage {
      closure of the final image.
     </para>
 
-    <para>
-     This is different from <function>pkgs.dockerTools.buildImage</function>
-     which does <emphasis>not</emphasis> automatically include the
-     configuration's closure.
-    </para>
-
     <para>
      This allows you to make very simple Docker images with very little code.
      This container will start up and run <command>hello</command>:

From a2cbfd961b7b3815336623b38dbec07b1bd9e404 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Sep 2018 21:22:57 +0200
Subject: [PATCH 1855/3253] haskell-hspec: fix build with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index b49b9cea60bb..bbfee4b426a5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -47,8 +47,10 @@ self: super: {
   # LTS-12.x versions do not compile.
   contravariant = self.contravariant_1_5;
   doctest = self.doctest_0_16_0_1;
+  hspec = self.hspec_2_5_7;
   hspec-core = self.hspec-core_2_5_7;
   hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-discover = self.hspec-discover_2_5_7;
   hspec-meta = self.hspec-meta_2_5_6;
   hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
   primitive = self.primitive_0_6_4_0;

From 44f68ab3efc319d774830a9d4680370bc3697633 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 24 Sep 2018 21:28:30 +0200
Subject: [PATCH 1856/3253] haskell-doctest: fix build with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index bbfee4b426a5..a60de8f95f8d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -47,6 +47,7 @@ self: super: {
   # LTS-12.x versions do not compile.
   contravariant = self.contravariant_1_5;
   doctest = self.doctest_0_16_0_1;
+  doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
   hspec = self.hspec_2_5_7;
   hspec-core = self.hspec-core_2_5_7;
   hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });

From 424f6b934184bb4bf480a22ae69c7c7c41b3bc9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Sep 2018 02:30:42 +0200
Subject: [PATCH 1857/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a4158051bb3a19c770ed1fa78230ff5829d7277a.
---
 .../haskell-modules/hackage-packages.nix      | 645 ++++++++++++++----
 1 file changed, 515 insertions(+), 130 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1007be349fc9..76c6bed76502 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2770,6 +2770,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ChasingBottoms_1_3_1_5" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
+     , syb
+     }:
+     mkDerivation {
+       pname = "ChasingBottoms";
+       version = "1.3.1.5";
+       sha256 = "0hfk2cb9da5fvr96x8lzij93yl3rvax2id9a8gihd5j5aq4kxx30";
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
+       description = "For testing partial and infinite values";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "CheatSheet" = callPackage
     ({ mkDerivation, base, containers, directory }:
      mkDerivation {
@@ -13601,6 +13620,8 @@ self: {
        pname = "OneTuple";
        version = "0.2.2";
        sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
+       revision = "1";
+       editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq";
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
@@ -21529,22 +21550,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_4_0_0" = callPackage
+  "aeson_1_4_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, integer-logarithms, QuickCheck
+     , hashable-time, integer-logarithms, primitive, QuickCheck
      , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, th-abstraction, time
      , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.4.0.0";
-       sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli";
+       version = "1.4.1.0";
+       sha256 = "1mf29mxdqkpgbvqx1acbbv75wpzhwpnnf4iapmm5v3zg2k7g3hyi";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable scientific tagged template-haskell text
+         ghc-prim hashable primitive scientific tagged template-haskell text
          th-abstraction time time-locale-compat unordered-containers
          uuid-types vector
        ];
@@ -21674,6 +21695,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-compat_0_3_9" = callPackage
+    ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
+     , base-compat, base-orphans, bytestring, containers, exceptions
+     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.9";
+       sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0";
+       libraryHaskellDepends = [
+         aeson attoparsec attoparsec-iso8601 base base-compat bytestring
+         containers exceptions hashable scientific tagged text time
+         time-locale-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat base-orphans bytestring
+         containers exceptions hashable QuickCheck quickcheck-instances
+         scientific tagged tasty tasty-hunit tasty-quickcheck text time
+         time-locale-compat unordered-containers vector
+       ];
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-decode" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, data-default
      , hedgehog, text, time, unordered-containers, vector
@@ -29426,6 +29474,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) assimp;};
 
+  "assoc-list" = callPackage
+    ({ mkDerivation, base, contravariant, doctest, hedgehog }:
+     mkDerivation {
+       pname = "assoc-list";
+       version = "0.1.0.0";
+       sha256 = "13n847aypm39djgpyrkr428y11xj7glpwavp5qxfd49n93ii8zy3";
+       libraryHaskellDepends = [ base contravariant ];
+       testHaskellDepends = [ base contravariant doctest hedgehog ];
+       description = "Association lists (lists of tuples)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "assoc-listlike" = callPackage
+    ({ mkDerivation, base, contravariant, doctest, hedgehog, ListLike
+     }:
+     mkDerivation {
+       pname = "assoc-listlike";
+       version = "0.1.0.0";
+       sha256 = "0nph5yvawxk1afnlqm0vizg8dv53wl1cziqqnnlqgv45yimp4fbz";
+       libraryHaskellDepends = [ base contravariant ListLike ];
+       testHaskellDepends = [ base contravariant doctest hedgehog ];
+       description = "Association lists (list-like collections of tuples)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ast-monad" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -30245,8 +30318,8 @@ self: {
      }:
      mkDerivation {
        pname = "atto-lisp";
-       version = "0.2.2.2";
-       sha256 = "0rh01bxqsny73b4dgssv87flq9asjd5z6cyba3gqmvp3hvlcvfi4";
+       version = "0.2.2.3";
+       sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          deepseq text
@@ -30453,6 +30526,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-iso8601_1_0_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, text, time }:
+     mkDerivation {
+       pname = "attoparsec-iso8601";
+       version = "1.0.1.0";
+       sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9";
+       libraryHaskellDepends = [ attoparsec base base-compat text time ];
+       description = "Parsing of ISO 8601 dates, originally from aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-iteratee" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, iteratee
      , transformers
@@ -33035,8 +33120,8 @@ self: {
        pname = "base64-bytestring-type";
        version = "1";
        sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl";
-       revision = "3";
-       editedCabalFile = "18p6iz3b73qyf76azhfpcpgsc1fb2qhv889l0cj1niqlyp7kw69s";
+       revision = "4";
+       editedCabalFile = "0yfhy4a9n67l9w3amqrzzy79q47yyj6qbv5i5lqym5z7ygwmlzn6";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring binary bytestring cereal
          deepseq hashable QuickCheck text
@@ -34773,8 +34858,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.8.0";
        sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi";
-       revision = "4";
-       editedCabalFile = "1hsp8y26g51rjskmgfkgmggzpdg5y30sv8g7rb3id9r43w37zj1q";
+       revision = "5";
+       editedCabalFile = "1dny1jvwwcyrbzhqvymmn6n7ib48bpy0nasbrcrdrpzjypkmg500";
        libraryHaskellDepends = [
          aeson base binary case-insensitive hashable scientific tagged text
          text-binary time unordered-containers vector
@@ -35006,6 +35091,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-tagged_0_1_5_1" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, binary-orphans, bytestring, containers, criterion
+     , deepseq, generics-sop, hashable, nats, quickcheck-instances
+     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "binary-tagged";
+       version = "0.1.5.1";
+       sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         generics-sop hashable scientific SHA tagged text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary binary-orphans
+         bytestring containers generics-sop hashable quickcheck-instances
+         scientific SHA tagged tasty tasty-quickcheck text time
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson array base base16-bytestring binary binary-orphans bytestring
+         containers criterion deepseq generics-sop hashable nats scientific
+         semigroups SHA tagged text time unordered-containers vector
+       ];
+       description = "Tagged binary serialisation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-tree" = callPackage
     ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq
      , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework
@@ -38624,6 +38741,8 @@ self: {
        pname = "bound-extras";
        version = "0";
        sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq";
+       revision = "1";
+       editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw";
        libraryHaskellDepends = [
          base bound deepseq hashable transformers
        ];
@@ -39169,19 +39288,21 @@ self: {
        pname = "broadcast-chan";
        version = "0.1.1";
        sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd";
+       revision = "1";
+       editedCabalFile = "03bmddz9bryh3viskh2nldj4hbzl5b9xkkx2pml73vq9bn2aq5s4";
        libraryHaskellDepends = [ base ];
        description = "Broadcast channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "broadcast-chan_0_2_0" = callPackage
+  "broadcast-chan_0_2_0_1" = callPackage
     ({ mkDerivation, async, base, criterion, deepseq, stm
      , unliftio-core
      }:
      mkDerivation {
        pname = "broadcast-chan";
-       version = "0.2.0";
-       sha256 = "1hpc7hi7xbzc03391byxgyinknsdgsd0dgsvs7m7g3jdpdckw5g7";
+       version = "0.2.0.1";
+       sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf";
        libraryHaskellDepends = [ base unliftio-core ];
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
@@ -39195,8 +39316,8 @@ self: {
      }:
      mkDerivation {
        pname = "broadcast-chan-conduit";
-       version = "0.2.0";
-       sha256 = "020g2lrhp27dp5hyq23dhypxlmlymf6alw9jc5nwp4xv3992kfzx";
+       version = "0.2.0.1";
+       sha256 = "0q3kikryj38macxnwmlk6xijcmvxys0acryj419n7749n7bpc59s";
        libraryHaskellDepends = [
          base broadcast-chan conduit resourcet transformers unliftio-core
        ];
@@ -39214,8 +39335,8 @@ self: {
      }:
      mkDerivation {
        pname = "broadcast-chan-pipes";
-       version = "0.2.0";
-       sha256 = "04p9h3wzx4qv00yl1hfrxyhl5rylhxn1psfvkppdz5in2h88a7f7";
+       version = "0.2.0.1";
+       sha256 = "0m2g14rlqladhwfvphmnpsddlbc5bhsjdsb4a9r475vkib30gdp2";
        libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];
        testHaskellDepends = [
          base broadcast-chan-tests containers foldl pipes pipes-safe
@@ -39233,8 +39354,8 @@ self: {
      }:
      mkDerivation {
        pname = "broadcast-chan-tests";
-       version = "0.2.0";
-       sha256 = "1np0w4pv36hnifrklgybazhnwh4pfm73d7mx51p1flp9czaj0zz6";
+       version = "0.2.0.1";
+       sha256 = "1l3zqc693jmvxmb5lln6fmwn01rjpwhvlllkrn3v6hs2bwibrp5n";
        libraryHaskellDepends = [
          async base broadcast-chan clock containers optparse-applicative
          paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -40884,6 +41005,8 @@ self: {
        pname = "c2hs";
        version = "0.28.5";
        sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
+       revision = "1";
+       editedCabalFile = "1d6i1wr1kbn61yi7nk1scjfm2800vm2ynnx7555fjkdx4d8va711";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -44896,6 +45019,8 @@ self: {
        pname = "charset";
        version = "0.3.7.1";
        sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
+       revision = "1";
+       editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy";
        libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
@@ -49605,26 +49730,26 @@ self: {
      }) {};
 
   "compdata" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, derive
-     , HUnit, mtl, QuickCheck, random, template-haskell, test-framework
+    ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl
+     , QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, th-expand-syns
      , transformers, tree-view, uniplate
      }:
      mkDerivation {
        pname = "compdata";
-       version = "0.11";
-       sha256 = "1h8ri808zaggfi4n4anq8sdz76f8pij9p5g9wpf4w6zvcghg5jn4";
+       version = "0.12";
+       sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v";
        libraryHaskellDepends = [
-         base containers deepseq derive mtl QuickCheck template-haskell
+         base containers deepseq mtl QuickCheck template-haskell
          th-expand-syns transformers tree-view
        ];
        testHaskellDepends = [
-         base containers deepseq derive HUnit mtl QuickCheck
-         template-haskell test-framework test-framework-hunit
-         test-framework-quickcheck2 th-expand-syns transformers
+         base containers deepseq HUnit mtl QuickCheck template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2
+         th-expand-syns transformers
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq derive mtl QuickCheck random
+         base containers criterion deepseq mtl QuickCheck random
          template-haskell th-expand-syns transformers uniplate
        ];
        description = "Compositional Data Types";
@@ -51305,8 +51430,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-zstd";
-       version = "0.0.1.0";
-       sha256 = "0psy03s9w9gw5s4a2grvfk9xwjd3g63qch7w4i2kvl3cf9yddsa0";
+       version = "0.0.1.1";
+       sha256 = "04h7w2903hgw4gjcx2pg29yinnmfapawvc19hd3r57rr12fzb0c6";
        libraryHaskellDepends = [ base bytestring conduit zstd ];
        testHaskellDepends = [
          base bytestring conduit conduit-combinators conduit-extra directory
@@ -52457,6 +52582,8 @@ self: {
        pname = "contravariant-extras";
        version = "0.3.4";
        sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n";
+       revision = "1";
+       editedCabalFile = "1h2955ahga6i4fn7k8v66l03v77p6fhsac6ck8gpabkc08ij60wp";
        libraryHaskellDepends = [
          base base-prelude contravariant semigroups template-haskell
          tuple-th
@@ -54667,8 +54794,8 @@ self: {
        pname = "crypt-sha512";
        version = "0";
        sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
-       revision = "1";
-       editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
+       revision = "2";
+       editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh";
        libraryHaskellDepends = [
          attoparsec base bytestring cryptohash-sha512
        ];
@@ -64696,8 +64823,8 @@ self: {
        pname = "dlist-nonempty";
        version = "0.1.1";
        sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
-       revision = "3";
-       editedCabalFile = "0gy0xkfy3811xz7jjz451a3rldlzg8crmrl5gn0a8fgyjdgqxc46";
+       revision = "4";
+       editedCabalFile = "10kkj4sf1bn87z6744p9gn6mkciqri2d3l9vmg9ylpi8g7priil2";
        libraryHaskellDepends = [
          base base-compat deepseq dlist semigroupoids
        ];
@@ -67937,8 +68064,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison-tutorial";
-       version = "3.7.9";
-       sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0";
+       version = "3.7.12";
+       sha256 = "16dpqwp96ngc15igzxhkn7waxynnxy87lx5j1flp5dj2v71fx17m";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -69490,6 +69617,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "entwine" = callPackage
+    ({ mkDerivation, async, base, containers, criterion, directory
+     , exceptions, monad-loops, process, QuickCheck
+     , quickcheck-instances, quickcheck-properties, quickcheck-text
+     , random, SafeSemaphore, stm, text, time, transformers
+     , transformers-either
+     }:
+     mkDerivation {
+       pname = "entwine";
+       version = "0.0.1";
+       sha256 = "08yy72lgc8cg12hbz51q06zx7fslhhnk0rjjszba8aj0qbrj8yr4";
+       libraryHaskellDepends = [
+         async base containers exceptions monad-loops SafeSemaphore stm text
+         time transformers transformers-either
+       ];
+       testHaskellDepends = [
+         async base directory exceptions process QuickCheck
+         quickcheck-instances text time transformers transformers-either
+       ];
+       benchmarkHaskellDepends = [
+         base criterion directory process QuickCheck quickcheck-instances
+         quickcheck-properties quickcheck-text random text transformers
+         transformers-either
+       ];
+       description = "entwine - Concurrency tools";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "enum-subset-generate" = callPackage
     ({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck
      , template-haskell
@@ -72547,14 +72702,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extra_1_6_11" = callPackage
+  "extra_1_6_12" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.6.11";
-       sha256 = "0qqjhlvf9m9wph5c6xwvv2fb8l7cvwkc98f1r27nl4bjrxqag8sh";
+       version = "1.6.12";
+       sha256 = "177m9f3hdc8sy6m791q6bmns01avzb0j9wj113rm4748k0bnqngz";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
@@ -74652,8 +74807,8 @@ self: {
        pname = "file-embed-lzma";
        version = "0";
        sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78";
-       revision = "1";
-       editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s";
+       revision = "2";
+       editedCabalFile = "0dmg69gsj2k9lf112bvqw6z2w8hl0p1lx5zxdvlvk85bb3qz6304";
        libraryHaskellDepends = [
          base base-compat bytestring directory filepath lzma
          template-haskell text th-lift-instances transformers
@@ -78119,8 +78274,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "1.0";
-       sha256 = "061xly5fl7a28dsjw9m8dzyh59fkjrs6ijhcqfn2n4y8azch9f6c";
+       version = "1.0.1";
+       sha256 = "1y1cmm4z5s5a1ivs30vwb2rbgc9q24y6z2a9in3azwpgfb1x4fw0";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad contravariant profunctors
          template-haskell transformers
@@ -79483,8 +79638,8 @@ self: {
        pname = "functor-classes-compat";
        version = "1";
        sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
-       revision = "2";
-       editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg";
+       revision = "3";
+       editedCabalFile = "1jx552ysdnxvd8wdvsf4bgxlsgldpb7a8zi54abyjmxv6mkp98ys";
        libraryHaskellDepends = [
          base containers hashable unordered-containers vector
        ];
@@ -81121,10 +81276,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "generics-mrsop";
-       version = "1.0.0.1";
-       sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3";
-       revision = "1";
-       editedCabalFile = "1f3wg5sq8cm1bz210j4haxs511x786yq8wchfmdllw7cimhvw452";
+       version = "1.2.2";
+       sha256 = "0xlvvcnmv24f0j3j4jaaymhdgz7klfdx15lxi9214d4ak4fnxjyv";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
@@ -81137,8 +81290,8 @@ self: {
        pname = "generics-sop";
        version = "0.3.2.0";
        sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h";
-       revision = "2";
-       editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf";
+       revision = "3";
+       editedCabalFile = "0lw5n8npdrdd1h7j000flaig4z30b8pig4q52sj34zhwccjkdzq2";
        libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
@@ -81151,8 +81304,8 @@ self: {
        pname = "generics-sop-lens";
        version = "0.1.2.1";
        sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
-       revision = "4";
-       editedCabalFile = "1ms3y1cqpzlzl9yr2v53971vvnaapa3bni9yv19l1ilxhr8xzqfr";
+       revision = "5";
+       editedCabalFile = "1q6953xi46qvbknaq2j8x2zqmk2q1mmf8xczjyib3abxz0rp3608";
        libraryHaskellDepends = [ base generics-sop lens ];
        description = "Lenses for types in generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -82492,6 +82645,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-hotswap" = callPackage
+    ({ mkDerivation, base, concurrent-extra, deepseq, ghci }:
+     mkDerivation {
+       pname = "ghc-hotswap";
+       version = "0.1.0.0";
+       sha256 = "1j88ddasmcffby14d1105cawsv713qc4hjz2g23h1swlnvy375i1";
+       libraryHaskellDepends = [ base concurrent-extra deepseq ghci ];
+       description = "Library for hot-swapping shared objects in GHC";
+       license = "unknown";
+     }) {};
+
   "ghc-imported-from" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
@@ -85689,8 +85853,8 @@ self: {
        pname = "gl";
        version = "0.8.0";
        sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
-       revision = "1";
-       editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14";
+       revision = "2";
+       editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9";
        setupHaskellDepends = [
          base Cabal containers directory filepath hxt transformers
        ];
@@ -93031,25 +93195,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haddock-library_1_4_4" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
-     , hspec-discover, QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.4.4";
-       sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
-       libraryHaskellDepends = [ base bytestring deepseq transformers ];
-       testHaskellDepends = [
-         base base-compat bytestring deepseq hspec QuickCheck transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doHaddock = false;
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "haddock-library" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
@@ -94579,6 +94724,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_6_0" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.6.0";
+       sha256 = "094jv3plkh515mn49hp5bylpxfn7c74n9bdk4843bm88q5hxlnk2";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -96631,8 +96803,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.7.0";
-       sha256 = "1xrjrdrn8an1w5dig134jcy9whwjfm2vnb8s4vvd1aa8iq37p87p";
+       version = "0.0.8.0";
+       sha256 = "1zj1lkvxhn7l9pgivl7bgzs5mzg8kbzriixwpf8si2nrfx20avkf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -100266,6 +100438,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haxl_2_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , stm, test-framework, test-framework-hunit, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "2.0.1.1";
+       sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable pretty stm text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -105078,17 +105277,20 @@ self: {
      }) {};
 
   "hjugement" = callPackage
-    ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers
+    ({ mkDerivation, base, containers, hashable, QuickCheck, random
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hjugement";
-       version = "1.0.0.20170808";
-       sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w";
-       libraryHaskellDepends = [ base containers ];
+       version = "2.0.0.20180903";
+       sha256 = "0zvgabj0myn5ssfpj8l50z0jwcrqkfsixdhg1wq916y8ay7yi71n";
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
        testHaskellDepends = [
-         base containers QuickCheck tasty tasty-hunit tasty-quickcheck text
-         transformers
+         base containers hashable QuickCheck random tasty tasty-hunit
+         tasty-quickcheck text transformers unordered-containers
        ];
        description = "Majority Judgment";
        license = stdenv.lib.licenses.gpl3;
@@ -108385,8 +108587,8 @@ self: {
        pname = "hpc";
        version = "0.6.0.3";
        sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
-       revision = "1";
-       editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i";
+       revision = "2";
+       editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3";
        libraryHaskellDepends = [
          base containers directory filepath time
        ];
@@ -111049,6 +111251,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hslogger_1_2_12" = callPackage
+    ({ mkDerivation, base, containers, directory, mtl, network
+     , old-locale, process, time, unix
+     }:
+     mkDerivation {
+       pname = "hslogger";
+       version = "1.2.12";
+       sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr";
+       libraryHaskellDepends = [
+         base containers directory mtl network old-locale process time unix
+       ];
+       description = "Versatile logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hslogger-reader" = callPackage
     ({ mkDerivation, attoparsec, base, hslogger, optparse-applicative
      , text, text-icu, time
@@ -111140,6 +111358,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
+  "hslua_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
+     , tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "1.0.0";
+       sha256 = "0xd47h1f2y3k6qrhbadiczx58ykcsm66hbkwd022r6hd2hfqk34c";
+       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
+       libraryHaskellDepends = [
+         base bytestring containers exceptions fail mtl text
+       ];
+       librarySystemDepends = [ lua5_3 ];
+       testHaskellDepends = [
+         base bytestring containers exceptions fail mtl QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+       description = "Bindings to Lua, an embeddable scripting language";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) lua5_3;};
+
   "hslua-aeson" = callPackage
     ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
      , ieee754, QuickCheck, quickcheck-instances, scientific, text
@@ -111161,6 +111403,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hslua-aeson_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec
+     , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hslua-aeson";
+       version = "1.0.0";
+       sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz";
+       libraryHaskellDepends = [
+         aeson base hashable hslua scientific text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hashable hslua hspec HUnit ieee754 QuickCheck
+         quickcheck-instances scientific text unordered-containers vector
+       ];
+       description = "Allow aeson data types to be used with lua";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hslua-module-text" = callPackage
     ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }:
      mkDerivation {
@@ -111175,6 +111439,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hslua-module-text_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "hslua-module-text";
+       version = "0.2.0";
+       sha256 = "0zlgin87cck5ccw82jf0bfjcrpdnqlylh4sfqifbdjgspswha5vi";
+       libraryHaskellDepends = [ base bytestring hslua text ];
+       testHaskellDepends = [ base hslua tasty tasty-hunit text ];
+       description = "Lua module for text";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsluv-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, containers }:
      mkDerivation {
@@ -114356,8 +114634,8 @@ self: {
        pname = "http-media";
        version = "0.7.1.2";
        sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
-       revision = "1";
-       editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc";
+       revision = "2";
+       editedCabalFile = "0in3xw1hqdz0s8pqvkfqw5qr186cd1yr4zxc5rnr0q95asi8s0rh";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -119391,21 +119669,21 @@ self: {
      }) {};
 
   "indexation" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, cereal-vector
+    ({ mkDerivation, base, bitvec, bytestring, cereal, cereal-vector
      , contravariant, deepseq, deferred-folds, dense-int-set, focus
      , foldl, hashable, list-t, mmorph, potoki, potoki-cereal
      , profunctors, stm-containers, text, transformers
-     , unordered-containers, vector
+     , unordered-containers, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.6.2.1";
-       sha256 = "016srnm3mqvfz1ki0bzxr88frav8zkj8l2nkknfrhx194cxwiahn";
+       version = "0.6.3";
+       sha256 = "17d375lzpg8vf1yr58llnr8l0diakpz1lns34vg6hwpayyjd5yk2";
        libraryHaskellDepends = [
-         base bytestring cereal cereal-vector contravariant deepseq
+         base bitvec bytestring cereal cereal-vector contravariant deepseq
          deferred-folds dense-int-set focus foldl hashable list-t mmorph
          potoki potoki-cereal profunctors stm-containers text transformers
-         unordered-containers vector
+         unordered-containers vector vector-th-unbox
        ];
        description = "Tools for entity indexation";
        license = stdenv.lib.licenses.mit;
@@ -120024,8 +120302,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
-       revision = "8";
-       editedCabalFile = "0ry5jsyimf1dx6013k1bhvsy3vjpg94q7z0sy9yxhmfdf16zb1fa";
+       revision = "9";
+       editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -122697,8 +122975,8 @@ self: {
      }:
      mkDerivation {
        pname = "ixset";
-       version = "1.1";
-       sha256 = "147fr6hqvbnlrhy7zpxzg1iiciz4gzk2g281fkp4ylklq1lz9c4v";
+       version = "1.1.1";
+       sha256 = "1wjv6jfkv5z5j3af6dg7zlbir780mshq01x2wzlyav5dwr40di3m";
        libraryHaskellDepends = [
          base containers safecopy syb syb-with-class template-haskell
        ];
@@ -128184,6 +128462,8 @@ self: {
        pname = "language-c";
        version = "0.8.1";
        sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
+       revision = "1";
+       editedCabalFile = "087h653v6074ax47hr3pqnp78jrs7as9hqfrjyf97m5i5c49fi9l";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process syb
@@ -129524,6 +129804,8 @@ self: {
        pname = "lattices";
        version = "1.7.1.1";
        sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r";
+       revision = "1";
+       editedCabalFile = "18182vlzaz5kzcn2j0k1jmdl8kgqmnpjc3ynsi7v6jdl3vig89dr";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable semigroupoids tagged
          universe-base universe-reverse-instances unordered-containers
@@ -136982,6 +137264,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "main-tester_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, hspec-core
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "main-tester";
+       version = "0.2.0.0";
+       sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc";
+       libraryHaskellDepends = [ base bytestring directory ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-core QuickCheck text
+       ];
+       description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mainland-pretty_0_6_2" = callPackage
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
@@ -140723,8 +141022,8 @@ self: {
        pname = "microstache";
        version = "1.0.1.1";
        sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
-       revision = "2";
-       editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b";
+       revision = "3";
+       editedCabalFile = "1pq0h64vxc7zlncn2ld6k02wi6rfa5ccqc4z0hfkvaldj41y2sb1";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -142098,7 +142397,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "modern-uri_0_3_0_0" = callPackage
+  "modern-uri_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant
      , criterion, deepseq, exceptions, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
@@ -142106,8 +142405,8 @@ self: {
      }:
      mkDerivation {
        pname = "modern-uri";
-       version = "0.3.0.0";
-       sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4";
+       version = "0.3.0.1";
+       sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -148151,6 +148450,24 @@ self: {
        broken = true;
      }) {ghc-binary = null;};
 
+  "net-spider" = callPackage
+    ({ mkDerivation, aeson, base, containers, greskell
+     , greskell-websocket, hashable, hspec, safe-exceptions, text, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "net-spider";
+       version = "0.1.0.0";
+       sha256 = "0vhvq29dr8s3w5acjpaha3k4g14li970rpx405dpj66l96pk2a7x";
+       libraryHaskellDepends = [
+         aeson base containers greskell greskell-websocket hashable
+         safe-exceptions text time unordered-containers vector
+       ];
+       testHaskellDepends = [ base hspec vector ];
+       description = "A graph database middleware to maintain a time-varying graph";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "netclock" = callPackage
     ({ mkDerivation, base, bytestring, hosc, network }:
      mkDerivation {
@@ -149877,8 +150194,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export";
-       version = "1.4.1";
-       sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh";
+       version = "1.4.2";
+       sha256 = "10rfhx29b5l43i4fw7inp38i9a296gb0dsjs6jsm6g4d09pfjljs";
        libraryHaskellDepends = [
          async base binary bytestring deepseq monad-loops template-haskell
          unix
@@ -160948,6 +161265,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-concurrency_2_0_12" = callPackage
+    ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
+     , void
+     }:
+     mkDerivation {
+       pname = "pipes-concurrency";
+       version = "2.0.12";
+       sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
+       libraryHaskellDepends = [
+         async base contravariant pipes semigroups stm void
+       ];
+       testHaskellDepends = [ async base pipes stm ];
+       description = "Concurrency for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-conduit" = callPackage
     ({ mkDerivation, base, conduit, mtl, pipes-core }:
      mkDerivation {
@@ -163141,8 +163475,8 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.3";
        sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
-       revision = "2";
-       editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn";
+       revision = "3";
+       editedCabalFile = "10lqcrp16v1h0lzr931haramkxkxz2bkfsyadxnc7ki73k39g11p";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "Creation and application of polyvariadic functions";
@@ -163956,6 +164290,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-libpq_0_9_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
+     mkDerivation {
+       pname = "postgresql-libpq";
+       version = "0.9.4.2";
+       sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [ base bytestring ];
+       description = "low-level binding to libpq";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "postgresql-named" = callPackage
     ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl
      , postgresql-libpq, postgresql-simple, utf8-string
@@ -173319,8 +173668,8 @@ self: {
        pname = "recursion-schemes";
        version = "5.0.3";
        sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
-       revision = "1";
-       editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8";
+       revision = "2";
+       editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7";
        libraryHaskellDepends = [
          base base-orphans comonad free template-haskell th-abstraction
          transformers
@@ -174270,8 +174619,8 @@ self: {
        pname = "regex-applicative-text";
        version = "0.1.0.1";
        sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh";
-       revision = "2";
-       editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi";
+       revision = "3";
+       editedCabalFile = "1h911harqgfgkhdr22cndj2fdsl48sqhn8q0akgjngpf3p8z0bvv";
        libraryHaskellDepends = [ base regex-applicative text ];
        description = "regex-applicative on text";
        license = stdenv.lib.licenses.bsd3;
@@ -179623,8 +179972,8 @@ self: {
        pname = "safe-exceptions";
        version = "0.1.7.0";
        sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
-       revision = "3";
-       editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5";
+       revision = "4";
+       editedCabalFile = "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        description = "Safe, consistent, and easy exception handling";
@@ -180821,8 +181170,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.11";
-       sha256 = "16kbhpfpzqxhc1zbxpjyvq89bnmhgm20v48np53dhqbpwjnphvva";
+       version = "7.12";
+       sha256 = "1lbihjy2nbr77xm1jnvqdjqkabpxjlbdddsdvsr7n9a60bjcr2yx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum deepseq directory filepath
@@ -189177,6 +189526,8 @@ self: {
        pname = "singleton-bool";
        version = "0.1.4";
        sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581";
+       revision = "1";
+       editedCabalFile = "0ccd49z9xwa8gr8sclmmn0zc4xq39yyjws4zr6lrw3xjql130nsx";
        libraryHaskellDepends = [ base ];
        description = "Type level booleans";
        license = stdenv.lib.licenses.bsd3;
@@ -190669,8 +191020,8 @@ self: {
      }:
      mkDerivation {
        pname = "smuggler";
-       version = "0.0.1";
-       sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89";
+       version = "0.1.0";
+       sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190679,7 +191030,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory filepath ];
-       description = "Smuggling";
+       description = "GHC Source Plugin that helps to manage imports";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194861,6 +195212,8 @@ self: {
        pname = "stache";
        version = "2.0.1";
        sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
+       revision = "1";
+       editedCabalFile = "1mpx4wddn17vki1yz8kq4ra5yzxnrndx8rg8w21lg6cjgvlp81f0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath
@@ -196368,6 +196721,8 @@ self: {
        pname = "step-function";
        version = "0.2";
        sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
+       revision = "1";
+       editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4";
        libraryHaskellDepends = [
          base base-compat-batteries containers deepseq QuickCheck
        ];
@@ -198647,6 +199002,8 @@ self: {
        pname = "structured-haskell-mode";
        version = "1.1.0";
        sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5";
+       revision = "1";
+       editedCabalFile = "0z3rd0wpnw9xrz2jrda6n8lg0mnzmgkjrjc48vzdjsf76ysjnfka";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -200209,8 +200566,8 @@ self: {
      }:
      mkDerivation {
        pname = "syb-with-class";
-       version = "0.6.1.9";
-       sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86";
+       version = "0.6.1.10";
+       sha256 = "0fhkxzcvalaqv554cmjmc56b3h7vxai3k2dd1fsp7ca124ikyzm7";
        libraryHaskellDepends = [
          array base bytestring containers template-haskell
        ];
@@ -203025,6 +203382,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-silver_3_1_12" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
+     , tasty-hunit, temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.12";
+       sha256 = "0s6cz0z8xmhc3gqyb68lkx0j94kagbdgc5gagknmfj6an2i33fly";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         semigroups stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-smallcheck" = callPackage
     ({ mkDerivation, async, base, smallcheck, tagged, tasty }:
      mkDerivation {
@@ -207880,8 +208261,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.2.0";
        sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
-       revision = "2";
-       editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql";
+       revision = "3";
+       editedCabalFile = "0im963wjcmwf6ii9a00mbi8lhmx5cy7cs6rmp0qi2j2jddba78j2";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -210525,8 +210906,8 @@ self: {
        pname = "tree-diff";
        version = "0.0.1";
        sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
-       revision = "4";
-       editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp";
+       revision = "5";
+       editedCabalFile = "1rj2n9d6mmk6zijnlc0q72s2qs8hhwhf25gpqqswaiqhbbh7gxi2";
        libraryHaskellDepends = [
          aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
          containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -214810,8 +215191,8 @@ self: {
        pname = "universe-instances-base";
        version = "1.0";
        sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2";
-       revision = "1";
-       editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a";
+       revision = "2";
+       editedCabalFile = "0c9zxmifhy2qjvsikgm168n8k8ka8ia88ldy8qjqkz5pqknlr9sj";
        libraryHaskellDepends = [ base containers universe-base ];
        description = "Universe instances for types from the base package";
        license = stdenv.lib.licenses.bsd3;
@@ -214857,8 +215238,8 @@ self: {
        pname = "universe-reverse-instances";
        version = "1.0";
        sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79";
-       revision = "1";
-       editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj";
+       revision = "2";
+       editedCabalFile = "0cpnsip1iakwkgnwnd21gwrc8qbifzpff6agjwm34jgkq9j646k8";
        libraryHaskellDepends = [
          base containers universe-instances-base
        ];
@@ -218090,8 +218471,8 @@ self: {
        pname = "vector-space";
        version = "0.13";
        sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482";
-       revision = "1";
-       editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn";
+       revision = "2";
+       editedCabalFile = "1p9vibym0ggr1rjyak0wphswdl4vik2b2w85afgvyj9zn32w28bw";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
@@ -218103,6 +218484,8 @@ self: {
        pname = "vector-space";
        version = "0.14";
        sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3";
+       revision = "2";
+       editedCabalFile = "0rz23fkpx6fgn3pjmmnz0mj5iyq70wv4j9z0c4c9ar7g72dalch7";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
@@ -231541,6 +231924,8 @@ self: {
        pname = "zip";
        version = "1.2.0";
        sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
+       revision = "1";
+       editedCabalFile = "084dfylc1h45r4v2zyld1vvrxs6x1ljq8hzinqrkv2ii748cmzdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From b70f4ff218992643b95b5cda8659662eba5cb77f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Sep 2018 02:30:48 +0200
Subject: [PATCH 1858/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/35d90c5e25a2be2e67d0ea162da360936d7f33a2.
---
 .../haskell-modules/hackage-packages.nix      | 411 +++++++++++++-----
 1 file changed, 310 insertions(+), 101 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 76c6bed76502..269a87d8208d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -21563,6 +21563,8 @@ self: {
        pname = "aeson";
        version = "1.4.1.0";
        sha256 = "1mf29mxdqkpgbvqx1acbbv75wpzhwpnnf4iapmm5v3zg2k7g3hyi";
+       revision = "1";
+       editedCabalFile = "12zvcm121dc0fpyzm1wr0b9k5lwyca298vgvf192sp2dykxkj9m7";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable primitive scientific tagged template-haskell text
@@ -21799,8 +21801,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.1.1";
        sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
-       revision = "1";
-       editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1";
+       revision = "2";
+       editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec attoparsec-iso8601 base
          base-compat-batteries bytestring containers deepseq exceptions
@@ -22322,16 +22324,17 @@ self: {
   "affection" = callPackage
     ({ mkDerivation, base, bytestring, clock, containers, glib, linear
      , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
+     , vector
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.7";
-       sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177";
+       version = "0.0.0.9";
+       sha256 = "0knb8j96nn2gh1dbyavcqi6wnn8rfvw0lmmw3vk2mbalxlzfvznr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring clock containers glib linear monad-loops
-         monad-parallel mtl OpenGL sdl2 stm text uuid
+         monad-parallel mtl OpenGL sdl2 stm text uuid vector
        ];
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
@@ -30195,8 +30198,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.2.0.29";
-       sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va";
+       version = "0.2.0.30";
+       sha256 = "19i3g3njmmhkhyx02q37r7n373n6h0yha6g5hrx0ix5nn8bp4k4w";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup filepath ];
@@ -31193,8 +31196,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "22";
-       editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30";
+       revision = "24";
+       editedCabalFile = "02n8p020d3p52ddsh38w5ih9kmx7qlp7axvxanli945fybjb2m5b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -37547,6 +37550,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-markup_0_8_2_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "blaze-markup";
+       version = "0.8.2.2";
+       sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66";
+       libraryHaskellDepends = [ base blaze-builder bytestring text ];
+       testHaskellDepends = [
+         base blaze-builder bytestring containers HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck text
+       ];
+       description = "A blazingly fast markup combinator library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-shields" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }:
      mkDerivation {
@@ -40413,6 +40434,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-builder_0_10_8_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq }:
+     mkDerivation {
+       pname = "bytestring-builder";
+       version = "0.10.8.2.0";
+       sha256 = "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7";
+       libraryHaskellDepends = [ base bytestring deepseq ];
+       doHaddock = false;
+       description = "The new bytestring builder, packaged outside of GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bytestring-builder-varword" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring
      , hspec, QuickCheck
@@ -42968,8 +43002,8 @@ self: {
      }:
      mkDerivation {
        pname = "capnp";
-       version = "0.2.0.0";
-       sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d";
+       version = "0.3.0.0";
+       sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48278,6 +48312,40 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "co-log" = callPackage
+    ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
+     , co-log-core, containers, contravariant, markdown-unlit, mtl
+     , relude, text, time, transformers, typerep-map
+     }:
+     mkDerivation {
+       pname = "co-log";
+       version = "0.0.0";
+       sha256 = "0bx45ffb1d7sdxcc7srx8sxb6qwjjs8gf90mnr3q1b76b2iczklp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base-noprelude bytestring co-log-core containers
+         contravariant mtl relude text time transformers typerep-map
+       ];
+       executableHaskellDepends = [
+         base-noprelude relude text typerep-map
+       ];
+       executableToolDepends = [ markdown-unlit ];
+       description = "Logging library";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "co-log-core" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "co-log-core";
+       version = "0.0.0";
+       sha256 = "1xml4qbvjlgcqvh0kmgqm2wr50bzd252a40zpc84sk6kg8a3x734";
+       libraryHaskellDepends = [ base ];
+       description = "Logging library";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "coalpit" = callPackage
     ({ mkDerivation, base, generic-random, megaparsec, network-uri
      , scientific, tasty, tasty-quickcheck, tasty-travis, time
@@ -49762,8 +49830,8 @@ self: {
      }:
      mkDerivation {
        pname = "compdata-automata";
-       version = "0.9.1";
-       sha256 = "1d4q6ssck7jknkxarkz3zcgc5mk60f16wp58kzf1dgv2ar42w4cy";
+       version = "0.9.2";
+       sha256 = "0yb0mlkvk25fmypad4pmg31vk6v5xqi2sqz1jpnjkgn9jhcn8p19";
        libraryHaskellDepends = [ base compdata containers projection ];
        benchmarkHaskellDepends = [
          base compdata containers criterion projection
@@ -49780,8 +49848,8 @@ self: {
      }:
      mkDerivation {
        pname = "compdata-dags";
-       version = "0.2";
-       sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
+       version = "0.2.1";
+       sha256 = "0h2ijhwpxv4bzfz81zhvhi7f42slzqsxawgqd9swk4kmqqzlfr58";
        libraryHaskellDepends = [
          base compdata containers mtl unordered-containers vector
        ];
@@ -49817,8 +49885,8 @@ self: {
      }:
      mkDerivation {
        pname = "compdata-param";
-       version = "0.9.1";
-       sha256 = "079pnr11y2ra1p236h7hlwgm7az7094h2s3g5x43r4q9kzdym5zc";
+       version = "0.9.2";
+       sha256 = "1cfs7q6pw642dg1xjibrsvpkw1bg15g9lmj70y25xka192d9c2w2";
        libraryHaskellDepends = [
          base compdata mtl template-haskell transformers
        ];
@@ -61541,28 +61609,33 @@ self: {
      }) {};
 
   "dfinity-radix-tree" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
-     , BoundedChan, bytestring, cmdargs, concurrent-extra, conduit
-     , containers, cryptohash-sha256, data-default-class, deepseq
-     , ghc-prim, lens-simple, leveldb-haskell, lrucaching, mtl
-     , resourcet, semigroups, serialise, text, unordered-containers
+    ({ mkDerivation, aeson, base, base16-bytestring, blake2
+     , bloomfilter, BoundedChan, bytestring, cmdargs, concurrent-extra
+     , conduit, containers, criterion, data-default-class, deepseq
+     , ghc-prim, lens-simple, leveldb-haskell, lmdb-simple, lrucaching
+     , mtl, QuickCheck, resourcet, semigroups, serialise, tasty
+     , tasty-hunit, tasty-quickcheck, temporary, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "dfinity-radix-tree";
-       version = "0.3.1";
-       sha256 = "0fzkhibixdzf4wm7kia224r6bqz8mks9m2c25b5qw31sf7m70zx1";
+       version = "0.4.0";
+       sha256 = "1bx82andqa7jd682ky0ga14jzfidkcsbgcb6md0wjyy8qgh18sg8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base base16-bytestring bloomfilter BoundedChan bytestring
-         concurrent-extra conduit containers cryptohash-sha256
-         data-default-class deepseq ghc-prim lens-simple leveldb-haskell
-         lrucaching mtl resourcet semigroups serialise
+         base base16-bytestring blake2 bloomfilter BoundedChan bytestring
+         concurrent-extra conduit containers data-default-class deepseq
+         ghc-prim lens-simple leveldb-haskell lmdb-simple lrucaching mtl
+         resourcet semigroups serialise
        ];
        executableHaskellDepends = [
-         aeson base base16-bytestring bytestring cmdargs containers
-         cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet
-         text unordered-containers
+         base blake2 bytestring cmdargs criterion data-default-class
+         leveldb-haskell lmdb-simple resourcet temporary
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring containers mtl QuickCheck
+         tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.gpl3;
@@ -72896,6 +72969,8 @@ self: {
        pname = "facts";
        version = "0.0.1.0";
        sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx";
+       revision = "1";
+       editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp";
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
        license = stdenv.lib.licenses.bsd3;
@@ -73864,8 +73939,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.3";
        sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
-       revision = "2";
-       editedCabalFile = "0mn82r0h9zhdsaf7qz45fcps6y1kdkqi8xf8dsz8419by2x5ygfx";
+       revision = "3";
+       editedCabalFile = "1wncfnvh4mv87gh0ddhiqf839d63rqs1qzi3y386y6r8hfnvra0l";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -76001,8 +76076,8 @@ self: {
        pname = "flac";
        version = "0.1.2";
        sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
-       revision = "3";
-       editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh";
+       revision = "4";
+       editedCabalFile = "0bmhd56fg4idz62maig3kykk7dyqy9dpm27fdljqg8jccl0vbwbm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
@@ -77044,6 +77119,8 @@ self: {
        pname = "foldl";
        version = "1.4.4";
        sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7";
+       revision = "1";
+       editedCabalFile = "1qdllf16djf7w5h8jq1f8sb5a0k5ihr9psai8wgkvnhd9addsk0f";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroupoids semigroups text
@@ -77083,8 +77160,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-statistics";
-       version = "0.1.5.0";
-       sha256 = "1z9qx7kiaidl3icz6g3rd6pyycwnvyv7xyw8g6p1n7rpvz60633b";
+       version = "0.1.5.1";
+       sha256 = "196vkbgj6c5dhwfw6l73z8dw505hsjsrx4w1f3zfczm0jfc4fsxl";
        libraryHaskellDepends = [
          base containers foldl hashable math-functions profunctors
          unordered-containers
@@ -77536,8 +77613,8 @@ self: {
        pname = "forma";
        version = "1.1.0";
        sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p";
-       revision = "1";
-       editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q";
+       revision = "2";
+       editedCabalFile = "1yc9gv1rjbl4lsxscp5idfpn7jp27c38j6gm9v7isxgyaih0j4v4";
        libraryHaskellDepends = [
          aeson base containers mtl text unordered-containers
        ];
@@ -77642,6 +77719,8 @@ self: {
        pname = "formatting";
        version = "6.3.6";
        sha256 = "06nkm9scy3a41v4m7npgkl9lvy5py6v7chsx0yhdy4pr4mvdna3a";
+       revision = "1";
+       editedCabalFile = "0vw77ji2d7rhwhq2g7dmln9ifsghgzdlnxg4wjipb128f6gwclh7";
        libraryHaskellDepends = [
          array base bytestring clock ghc-prim integer-gmp old-locale
          scientific semigroups text time transformers
@@ -82049,21 +82128,21 @@ self: {
      }) {};
 
   "geojson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, hlint, lens
-     , scientific, semigroups, tasty, tasty-hspec, tasty-quickcheck
-     , text, transformers, validation, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , hlint, lens, scientific, semigroups, tasty, tasty-hspec
+     , tasty-quickcheck, text, transformers, validation, vector
      }:
      mkDerivation {
        pname = "geojson";
-       version = "2.0.0";
-       sha256 = "0pbdd34z09l7z4alqs92x6aw0s74rcv6hs5nr7gqrhc0wzrsmi5q";
+       version = "3.0.0";
+       sha256 = "0mhvb72cm2xnq2lfdwnabfh3vjkrdlpywh4k846m73birdn1vmx4";
        libraryHaskellDepends = [
-         aeson base deepseq lens scientific semigroups text transformers
-         validation vector
+         aeson base containers deepseq lens scientific semigroups text
+         transformers validation vector
        ];
        testHaskellDepends = [
-         aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text
-         validation vector
+         aeson base bytestring containers hlint tasty tasty-hspec
+         tasty-quickcheck text validation vector
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -97195,6 +97274,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-lexer_1_0_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "haskell-lexer";
+       version = "1.0.2";
+       sha256 = "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq";
+       libraryHaskellDepends = [ base ];
+       description = "A fully compliant Haskell 98 lexer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-lsp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
@@ -109120,6 +109211,8 @@ self: {
        pname = "hreader";
        version = "1.1.0";
        sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara";
+       revision = "1";
+       editedCabalFile = "0kz3yzah7m4c2r9yaawhljcgb579masx3lx4mrr4lmqy39kmsvcb";
        libraryHaskellDepends = [
          base exceptions hset mmorph monad-control mtl tagged transformers
          transformers-base
@@ -109205,6 +109298,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) ruby;};
 
+  "hruby_0_3_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
+     , process, QuickCheck, ruby, scientific, stm, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hruby";
+       version = "0.3.6";
+       sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx";
+       setupHaskellDepends = [ base Cabal process ];
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring scientific stm text
+         unordered-containers vector
+       ];
+       librarySystemDepends = [ ruby ];
+       testHaskellDepends = [
+         aeson attoparsec base QuickCheck text vector
+       ];
+       description = "Embed a Ruby intepreter in your Haskell program !";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) ruby;};
+
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
      mkDerivation {
@@ -112271,6 +112387,8 @@ self: {
        pname = "hspec-megaparsec";
        version = "2.0.0";
        sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8";
+       revision = "1";
+       editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7";
        libraryHaskellDepends = [
          base containers hspec-expectations megaparsec
        ];
@@ -119677,8 +119795,8 @@ self: {
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.6.3";
-       sha256 = "17d375lzpg8vf1yr58llnr8l0diakpz1lns34vg6hwpayyjd5yk2";
+       version = "0.6.4";
+       sha256 = "1lm5ahr57lhwnfvz7kawl211chs4wjkykyicrrg748g4f03sm5a2";
        libraryHaskellDepends = [
          base bitvec bytestring cereal cereal-vector contravariant deepseq
          deferred-folds dense-int-set focus foldl hashable list-t mmorph
@@ -126994,6 +127112,8 @@ self: {
        pname = "kleene";
        version = "0";
        sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6";
+       revision = "1";
+       editedCabalFile = "1izdmr7a2d7qssnj732m2qc02inm3hrc882x9nyvz68648pvwwsx";
        libraryHaskellDepends = [
          base base-compat-batteries containers lattices MemoTrie QuickCheck
          range-set-list regex-applicative step-function text transformers
@@ -130323,6 +130443,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck_0_7_5" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "leancheck";
+       version = "0.7.5";
+       sha256 = "01hmbcp5kn4k0mgv7y5jap54d65ljdd3sm954s5y28h4xvk6dn7g";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Enumerative property-based testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "leankit-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
      mkDerivation {
@@ -132245,6 +132378,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_10_0_3" = callPackage
+    ({ mkDerivation, async, base, constraints, criterion, deepseq
+     , HUnit, lifted-base, monad-control, mtl, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.10.0.3";
+       sha256 = "131bh83yc3jhy0hwgslvs9p9clgl4i2hhvwz2xgx7igpbhsrrl43";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty
+         tasty-expected-failure tasty-hunit tasty-th
+       ];
+       benchmarkHaskellDepends = [ async base criterion deepseq ];
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-base" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
      , test-framework, test-framework-hunit, transformers
@@ -145995,6 +146150,8 @@ self: {
        pname = "multiset";
        version = "0.3.4";
        sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp";
+       revision = "1";
+       editedCabalFile = "0m7xk2217a5zpwb1hwp5j5r6yzlf0f4lmlnln2lb9bqihjl3j9x8";
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base doctest Glob ];
        description = "The Data.MultiSet container type";
@@ -151942,6 +152099,8 @@ self: {
        pname = "numtype-dk";
        version = "0.5.0.2";
        sha256 = "0avkdbhxijcja9i9g3cqh699mys8nhsxgrrpkknycmqpvp07sy4q";
+       revision = "1";
+       editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4";
        libraryHaskellDepends = [ base ];
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
        license = stdenv.lib.licenses.bsd3;
@@ -155149,12 +155308,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "packcheck_0_4_0" = callPackage
+  "packcheck_0_4_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "packcheck";
-       version = "0.4.0";
-       sha256 = "1dlvrad746ns76ah07wr9jgw454srag1wjrfp39pld26i70isif6";
+       version = "0.4.1";
+       sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
@@ -156856,17 +157015,18 @@ self: {
      }) {};
 
   "parconc-examples" = callPackage
-    ({ mkDerivation, abstract-par, accelerate, array, async, base
+    ({ mkDerivation, abstract-par, accelerate, alex, array, async, base
      , binary, bytestring, containers, deepseq, directory
      , distributed-process, distributed-process-simplelocalnet
-     , distributed-static, filepath, http-conduit, monad-par, network
-     , network-uri, normaldistribution, parallel, random, repa, stm
-     , template-haskell, time, transformers, utf8-string, vector, xml
+     , distributed-static, filepath, happy, http-conduit, monad-par
+     , network, network-uri, normaldistribution, parallel, random, repa
+     , stm, template-haskell, time, transformers, utf8-string, vector
+     , xml
      }:
      mkDerivation {
        pname = "parconc-examples";
-       version = "0.4.5";
-       sha256 = "172y33s74jx4cs0fykn5qg2c5s95kg5lngrins9ql9n97rb63pwh";
+       version = "0.4.7";
+       sha256 = "1r05ai6n6dgkqlcv4qlb10yzrjj86408ybz5zlh63qi2y34h9ga7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -156877,6 +157037,7 @@ self: {
          parallel random repa stm template-haskell time transformers
          utf8-string vector xml
        ];
+       executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157930,6 +158091,8 @@ self: {
        pname = "patience";
        version = "0.1.1";
        sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
+       revision = "1";
+       editedCabalFile = "0xj4hypjnhsn5jhs66l9wwhpkn5pbd8xmx7pgcy2ib08cz1087y7";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
@@ -164364,6 +164527,8 @@ self: {
        pname = "postgresql-query";
        version = "3.5.0";
        sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp";
+       revision = "1";
+       editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default exceptions file-embed haskell-src-meta hreader hset
@@ -164811,10 +164976,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.1.2";
-       sha256 = "1f4yf50zawxm6z2lidwrgcvc71f71aichqjihycibkrhp0s34ppj";
-       revision = "1";
-       editedCabalFile = "1qg6s7ppmz505r63k13qvm2ig6lknypji4jlkzpacricmkr3lymm";
+       version = "2.1.3";
+       sha256 = "1cg89jh2s2dim874h8vv52ab2dzvq01zvjn45fwdzs3j6815nlj4";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -164829,8 +164992,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.3.1";
-       sha256 = "1y6sgfafhnbgaifspli90ww4aj4r69vhkgl9v1jvspgrk67nzssj";
+       version = "0.3.2";
+       sha256 = "1fq36ahdrr16mxas2xh4qiwcagy61z2zfvc68p7r5hgdf36yz4d9";
        libraryHaskellDepends = [
          acquire attoparsec base base-prelude bytestring cereal potoki-core
          profunctors text
@@ -164846,24 +165009,25 @@ self: {
 
   "potoki-core" = callPackage
     ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion
-     , deepseq, directory, foldl, hashable, ilist, primitive
-     , profunctors, ptr, QuickCheck, quickcheck-instances, random
-     , rerebase, scanner, split, stm, tasty, tasty-hunit
+     , deepseq, deferred-folds, directory, foldl, hashable, ilist
+     , primitive, profunctors, ptr, QuickCheck, quickcheck-instances
+     , random, rerebase, scanner, split, stm, tasty, tasty-hunit
      , tasty-quickcheck, text, text-builder, time, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.3.2";
-       sha256 = "1438wvf81zx208l1sqxcly4rvvgw14vwhlmrh4zbkkn7pgxqlnky";
+       version = "2.3.3";
+       sha256 = "1f6rr75h4cqgy1qjh5qplcq1qz2pwc11mi4k61z691clz5yfmbm0";
        libraryHaskellDepends = [
-         acquire attoparsec base bytestring deepseq directory foldl hashable
-         primitive profunctors ptr scanner stm text text-builder time
-         transformers unordered-containers vector
+         acquire attoparsec base bytestring deepseq deferred-folds directory
+         foldl hashable primitive profunctors ptr scanner stm text
+         text-builder time transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         acquire attoparsec foldl ilist QuickCheck quickcheck-instances
-         random rerebase split tasty tasty-hunit tasty-quickcheck
+         acquire attoparsec deferred-folds foldl ilist QuickCheck
+         quickcheck-instances random rerebase split tasty tasty-hunit
+         tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
@@ -169766,8 +169930,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "2.0.0.1";
-       sha256 = "0n3f5zhyp0pvrb4ixvrvzs9af2x1mjprlnyjbhhldb3rc64jl7yd";
+       version = "2.0.0.2";
+       sha256 = "18fhvvnmd7nv9ls5jy4ng807q01m2dr4m0znjav57v9mc37vspqk";
        libraryHaskellDepends = [
          base binary bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens process split vector
@@ -170367,8 +170531,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.14.3";
-       sha256 = "1vzn20bci14hlkbdrgjqzb16yyqg332rb1aspsdh19grj0cvr4l8";
+       version = "0.5.0.0";
+       sha256 = "1jg4wkysz2hdfkl9ah9lyvasnr01dvp3lfzzn1cin2ac6b1inj6v";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups semirings tagged transformers
@@ -171934,6 +172098,8 @@ self: {
        pname = "range-set-list";
        version = "0.1.3";
        sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5";
+       revision = "1";
+       editedCabalFile = "00ddj7if8lcrqf5c882m4slm15sdwcghz7d2fz222c7jcw1ahvdr";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
@@ -177755,19 +177921,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "rhine_0_4_0_4" = callPackage
-    ({ mkDerivation, base, containers, dunai, free, time, transformers
+  "rhine_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, dunai, free, time
+     , transformers, vector-sized
      }:
      mkDerivation {
        pname = "rhine";
-       version = "0.4.0.4";
-       sha256 = "00s2rsj3h7wamlrh2p7a600pwqlrrishxy2q2f6av0pzyc8dkc89";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0.0";
+       sha256 = "0cc4f51h9plgd790ix1skja3k06dzc55rqhv17521vb9cw0k2lzy";
        libraryHaskellDepends = [
-         base containers dunai free time transformers
+         base containers deepseq dunai free time transformers vector-sized
        ];
-       executableHaskellDepends = [ base ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187048,8 +187212,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.9.0.5";
-       sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz";
+       version = "1.10.0.1";
+       sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-c shake-cabal shake-ext text
@@ -187313,7 +187477,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "shakespeare_2_0_17" = callPackage
+  "shakespeare_2_0_18" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -187321,8 +187485,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakespeare";
-       version = "2.0.17";
-       sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg";
+       version = "2.0.18";
+       sha256 = "1ny9j1p12c134q5y7k2lg8qgf8sqa328vrb8md9ib44w3xwy6wjr";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers directory
          exceptions ghc-prim parsec process scientific template-haskell text
@@ -194181,6 +194345,8 @@ self: {
        pname = "splitmix";
        version = "0.0.1";
        sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a";
+       revision = "1";
+       editedCabalFile = "0c38sajdpqcmicdh4lfy6vpg8wnzpiyamvbximdsqs605frs3mqs";
        libraryHaskellDepends = [ base deepseq random time ];
        testHaskellDepends = [
          async base base-compat-batteries bytestring deepseq process random
@@ -197510,15 +197676,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_25_0" = callPackage
+  "stratosphere_0_26_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.25.0";
-       sha256 = "0blrdrqhjh3cfddx8y3ra3vzicrcp8zin8fxnjk8hpz546d3a5a4";
+       version = "0.26.0";
+       sha256 = "126fhymf1n96z40lima2kyh2sm68v63f1b7agmdpp6ihjd96xy0i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203040,6 +203206,8 @@ self: {
        pname = "tasty-expected-failure";
        version = "0.11.1.1";
        sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
+       revision = "1";
+       editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16";
        libraryHaskellDepends = [ base tagged tasty ];
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
@@ -203109,8 +203277,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "4";
-       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
+       revision = "5";
+       editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -205463,6 +205631,8 @@ self: {
        pname = "texmath";
        version = "0.11.1";
        sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99";
+       revision = "1";
+       editedCabalFile = "0szpd2kbwb9yqial0q583czy21dnkgyrhizmi7hp38kkhqp7vr9y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206345,10 +206515,8 @@ self: {
      }:
      mkDerivation {
        pname = "text1";
-       version = "0.0.6";
-       sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2";
-       revision = "1";
-       editedCabalFile = "0qlgv9aabmj7lky55ah8qq7x2w0w6j3m1kykq8iy2d3ymss2jasw";
+       version = "0.0.6.1";
+       sha256 = "10kzl1gwi08pxzs8flr5bhfcwqgcl0jz9cadw3hqmbmynpij95ij";
        libraryHaskellDepends = [ base binary lens semigroups text ];
        testHaskellDepends = [
          base HUnit lens QuickCheck semigroups text
@@ -207692,6 +207860,8 @@ self: {
        pname = "thumbnail-plus";
        version = "1.0.5";
        sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
+       revision = "1";
+       editedCabalFile = "0ghmlvcwy8klfq2f0brsg0zyqd0rbclfb990b50clmd2dsmx83wl";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra data-default directory either
          gd imagesize-conduit resourcet temporary transformers
@@ -217399,6 +217569,8 @@ self: {
        pname = "validate-input";
        version = "0.4.0.0";
        sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0";
+       revision = "1";
+       editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli";
        libraryHaskellDepends = [
          base bytestring either mtl pcre-heavy semigroups string-conversions
          text
@@ -222797,6 +222969,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets_0_12_5_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.12.5.2";
+       sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy network
+         random SHA streaming-commons text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy HUnit
+         network QuickCheck random SHA streaming-commons test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers criterion entropy
+         network random SHA text
+       ];
+       doCheck = false;
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , exceptions, hashable, monad-control, mtl, QuickCheck
@@ -226976,6 +227183,8 @@ self: {
        pname = "xmonad-volume";
        version = "0.1.0.1";
        sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild";
+       revision = "1";
+       editedCabalFile = "0wj87ijsfdzibx0k6m1pq2m47gkaddbdy282hcqiishfibkqrig5";
        libraryHaskellDepends = [
          alsa-mixer base composition-prelude containers X11
        ];

From e797f37d02911e613489739811d56a8df6bdeea7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 02:30:43 +0200
Subject: [PATCH 1859/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8d69413ed86e887c93e7a88560a8095dec35002c.
---
 .../haskell-modules/hackage-packages.nix      | 401 +++++++++++++++---
 1 file changed, 336 insertions(+), 65 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 269a87d8208d..ff6c3cd1ddc3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5017,10 +5017,8 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.5";
-       sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq";
-       revision = "1";
-       editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8";
+       version = "2.0.6";
+       sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -5451,6 +5449,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Fin_0_2_6_0" = callPackage
+    ({ mkDerivation, alg, base, foldable1, natural-induction, peano
+     , universe-base
+     }:
+     mkDerivation {
+       pname = "Fin";
+       version = "0.2.6.0";
+       sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw";
+       libraryHaskellDepends = [
+         alg base foldable1 natural-induction peano universe-base
+       ];
+       description = "Finite totally-ordered sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Finance-Quote-Yahoo" = callPackage
     ({ mkDerivation, base, bytestring, http-conduit, network
      , old-locale, time
@@ -13157,8 +13171,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "NoTrace";
-       version = "0.3.0.2";
-       sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir";
+       version = "0.3.0.3";
+       sha256 = "0cdva0d5xp0fw4jfwmhaz8m4pm1d00wazg32hcqjli4blc9s1hvf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
@@ -28203,6 +28217,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {arbb_dev = null;};
 
+  "arbor-lru-cache" = callPackage
+    ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
+     , hw-hspec-hedgehog, lens, stm
+     }:
+     mkDerivation {
+       pname = "arbor-lru-cache";
+       version = "0.1.1.0";
+       sha256 = "0npyc9knih4qpxayz6wpsgw83rlv4bdw6d2jksrsh7rdxhidyiwg";
+       libraryHaskellDepends = [ base containers generic-lens lens stm ];
+       testHaskellDepends = [
+         base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens
+         stm
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "arbor-postgres" = callPackage
     ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
      , optparse-applicative, postgresql-simple, text
@@ -39059,7 +39089,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_41_1" = callPackage
+  "brick_0_41_2" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39067,8 +39097,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.41.1";
-       sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd";
+       version = "0.41.2";
+       sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41056,6 +41086,31 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "c2hs_0_28_6" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , dlist, filepath, HUnit, language-c, pretty, process, shelly
+     , test-framework, test-framework-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "c2hs";
+       version = "0.28.6";
+       sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory dlist filepath
+         language-c pretty process
+       ];
+       testHaskellDepends = [
+         base filepath HUnit shelly test-framework test-framework-hunit text
+         transformers
+       ];
+       description = "C->Haskell FFI tool that gives some cross-language type safety";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "c2hs-extra" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -44288,8 +44343,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.8";
-       sha256 = "15a3sk4xsr9qz30chf4bzpkhp1s24vw30nhi0vibgshlminfbxv4";
+       version = "0.1.2.2";
+       sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46761,6 +46816,36 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "classify-frog" = callPackage
+    ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray
+     , concurrent-split, containers, deepseq, explicit-exception, fft
+     , filemanip, gnuplot, hmatrix, hmm-hmatrix, lazy-csv, llvm-extra
+     , llvm-tf, non-empty, numeric-prelude, optparse-applicative
+     , parallel, pathtype, pooled-io, semigroups, soxlib
+     , storable-record, storablevector, storablevector-carray
+     , synthesizer-core, synthesizer-llvm, tagchup, text, time
+     , transformers, utility-ht, xml-basic
+     }:
+     mkDerivation {
+       pname = "classify-frog";
+       version = "0.2.3";
+       sha256 = "1fhiia335snb14nkvn3sglv0z7mkc7y5vj6jsaa8v9l72fwacz9a";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         array audacity base bifunctors Cabal carray concurrent-split
+         containers deepseq explicit-exception fft filemanip gnuplot hmatrix
+         hmm-hmatrix lazy-csv llvm-extra llvm-tf non-empty numeric-prelude
+         optparse-applicative parallel pathtype pooled-io semigroups soxlib
+         storable-record storablevector storablevector-carray
+         synthesizer-core synthesizer-llvm tagchup text time transformers
+         utility-ht xml-basic
+       ];
+       description = "Classify sounds produced by Xenopus laevis";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "classy-influxdb-simple" = callPackage
     ({ mkDerivation, aeson, async-io-either, base, bytestring, lens
      , mtl, scientific, text, time, vector, wreq
@@ -63170,8 +63255,8 @@ self: {
        pname = "digit";
        version = "0.7";
        sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
-       revision = "1";
-       editedCabalFile = "1zdy8jmsn3a065vapl8lf4kzxafbqdwhp99b9s3ff8dj8q5nx4qj";
+       revision = "2";
+       editedCabalFile = "0335fzcbrf4hciz9gdkk41y9jkd5vm5vbz99v9ick76q48h2bs6p";
        libraryHaskellDepends = [
          base lens parsers scientific semigroupoids semigroups
          template-haskell
@@ -75258,6 +75343,8 @@ self: {
        pname = "fin";
        version = "0.0.1";
        sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil";
+       revision = "1";
+       editedCabalFile = "056d22f1j1xv5ka2qr7a3z5ad5w1im76qdf77v6dqdi4vaz52vd1";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
@@ -82130,19 +82217,19 @@ self: {
   "geojson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hlint, lens, scientific, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, text, transformers, validation, vector
+     , tasty-quickcheck, text, transformers, validation
      }:
      mkDerivation {
        pname = "geojson";
-       version = "3.0.0";
-       sha256 = "0mhvb72cm2xnq2lfdwnabfh3vjkrdlpywh4k846m73birdn1vmx4";
+       version = "3.0.3";
+       sha256 = "05kifzlw077ggxish1hmpqlk180w46qpj4b2c8pjqngk5j0jd5vv";
        libraryHaskellDepends = [
          aeson base containers deepseq lens scientific semigroups text
-         transformers validation vector
+         transformers validation
        ];
        testHaskellDepends = [
          aeson base bytestring containers hlint tasty tasty-hspec
-         tasty-quickcheck text validation vector
+         tasty-quickcheck text validation
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
@@ -83038,6 +83125,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_4" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.4";
+       sha256 = "1wrlz2x9zsrip92m254vh0s07j9afjli6n1kcass8z0lw17m26mh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -84908,8 +85017,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180913";
-       sha256 = "0rsmzbfd4i275c6baa1l9rnyd9a510yyb7g9g8dk8d89f5v6dddb";
+       version = "6.20180926";
+       sha256 = "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -85357,6 +85466,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "github_0_20" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base16-bytestring
+     , binary, binary-orphans, byteable, bytestring, containers
+     , cryptohash, deepseq, deepseq-generics, exceptions, file-embed
+     , hashable, hspec, hspec-discover, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, tls, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "github";
+       version = "0.20";
+       sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp";
+       libraryHaskellDepends = [
+         aeson base base-compat base16-bytestring binary binary-orphans
+         byteable bytestring containers cryptohash deepseq deepseq-generics
+         exceptions hashable http-client http-client-tls http-link-header
+         http-types iso8601-time mtl network-uri semigroups text time tls
+         transformers transformers-compat unordered-containers vector
+         vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring file-embed hspec
+         unordered-containers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Access to the GitHub API, v3";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-backup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, mtl, network
@@ -96199,10 +96339,8 @@ self: {
     ({ mkDerivation, base, hashable, time }:
      mkDerivation {
        pname = "hashable-time";
-       version = "0.2.0.1";
-       sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm";
-       revision = "1";
-       editedCabalFile = "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6";
+       version = "0.2.0.2";
+       sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -97107,12 +97245,12 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
-  "haskell-gi-base_0_21_2" = callPackage
+  "haskell-gi-base_0_21_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.21.2";
-       sha256 = "075x1jxm1r038ajy0raxrm2m3d1j7lc91cq9ik26fvp1vd6p13xg";
+       version = "0.21.3";
+       sha256 = "1nh2cb8l0yvn6hp5bw273yyj0y15f1sd8115wi7sxyvas5h5q7m4";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -101909,6 +102047,8 @@ self: {
        pname = "hedgehog";
        version = "0.6.1";
        sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
+       revision = "1";
+       editedCabalFile = "1fj3m5p5nm3dip93a1z7yrrq3fmqk30qgljdspia13y3lyqlcrf1";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions lifted-async mmorph monad-control mtl
@@ -102009,8 +102149,8 @@ self: {
        pname = "hedgehog-quickcheck";
        version = "0.1";
        sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
-       revision = "2";
-       editedCabalFile = "0fxd4ain7sfxw7q0h3hj2rlp9385zcf9n7lh98i0gqpjqs55dwnd";
+       revision = "3";
+       editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        description = "Use QuickCheck generators in Hedgehog and vice versa";
        license = stdenv.lib.licenses.bsd3;
@@ -107145,6 +107285,8 @@ self: {
        pname = "hoist-error";
        version = "0.2.1.0";
        sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
+       revision = "1";
+       editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -114207,6 +114349,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-api-data_0_3_9" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
+     , Cabal, cabal-doctest, containers, cookie, directory, doctest
+     , filepath, hashable, hspec, hspec-discover, http-types, HUnit
+     , QuickCheck, quickcheck-instances, text, time, time-locale-compat
+     , unordered-containers, uuid-types
+     }:
+     mkDerivation {
+       pname = "http-api-data";
+       version = "0.3.9";
+       sha256 = "013m662vn02vw37gpffnvffwjirhg8lprknav5rinxffq7ra4cr8";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec attoparsec-iso8601 base bytestring containers cookie
+         hashable http-types text time time-locale-compat
+         unordered-containers uuid-types
+       ];
+       testHaskellDepends = [
+         base bytestring directory doctest filepath hspec HUnit QuickCheck
+         quickcheck-instances text time unordered-containers uuid-types
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, http-types }:
      mkDerivation {
@@ -115065,6 +115234,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-types_0_12_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
+     , hspec, QuickCheck, quickcheck-instances, text
+     }:
+     mkDerivation {
+       pname = "http-types";
+       version = "0.12.2";
+       sha256 = "01ck5wmzvl5cqd3w2kwkrmp18n78474a3lngk6ry28w9pbbh4caj";
+       libraryHaskellDepends = [
+         array base bytestring case-insensitive text
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec QuickCheck quickcheck-instances text
+       ];
+       description = "Generic HTTP types for Haskell (for both client and server code)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-wget" = callPackage
     ({ mkDerivation, base, failure, process, transformers }:
      mkDerivation {
@@ -120237,6 +120425,8 @@ self: {
        pname = "inline-c";
        version = "0.5.6.1";
        sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd";
+       revision = "1";
+       editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120488,6 +120678,8 @@ self: {
        pname = "inspection-testing";
        version = "0.3";
        sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al";
+       revision = "1";
+       editedCabalFile = "06lb7gkgv5hns2kpslabl1zhd4i45wnnhcd4kmcz0n7d3hdx35cg";
        libraryHaskellDepends = [
          base containers ghc mtl template-haskell transformers
        ];
@@ -138121,8 +138313,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.5.0.0";
-       sha256 = "1261vap8raffngdxmzv042carjdlcssqbpa9vs3qi0x3jbbwiywc";
+       version = "0.5.0.1";
+       sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07";
        libraryHaskellDepends = [
          array base call-stack comonad constrained-categories containers
          deepseq free free-vector-spaces ieee754 lens linear
@@ -138144,8 +138336,8 @@ self: {
     ({ mkDerivation, base, call-stack, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.5.0.0";
-       sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw";
+       version = "0.5.0.1";
+       sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
@@ -144593,6 +144785,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monopati" = callPackage
+    ({ mkDerivation, base, comonad, directory, free, split }:
+     mkDerivation {
+       pname = "monopati";
+       version = "0.1.0";
+       sha256 = "18bx5xy3d3mk47499anrl1xlmxb8g3l35ibyllkcqhsx822zk9ij";
+       libraryHaskellDepends = [ base comonad directory free split ];
+       description = "Well-typed paths";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "montage" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, ListLike
      , old-locale, pool-conduit, protocol-buffers
@@ -149699,6 +149902,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, network, safe-exceptions, socks
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.3";
+       sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
+       libraryHaskellDepends = [
+         base bytestring network safe-exceptions socks transformers
+       ];
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -149732,6 +149951,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple-tls_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, network
+     , network-simple, safe-exceptions, tls, transformers, x509
+     , x509-store, x509-system, x509-validation
+     }:
+     mkDerivation {
+       pname = "network-simple-tls";
+       version = "0.3.1";
+       sha256 = "12kwi2jc8g310wrw7ynq2hfhkxhh95qn0fy205g7a48xrw75npyj";
+       libraryHaskellDepends = [
+         base bytestring data-default network network-simple safe-exceptions
+         tls transformers x509 x509-store x509-system x509-validation
+       ];
+       description = "Simple interface to TLS secured network sockets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-socket-options" = callPackage
     ({ mkDerivation, base, network }:
      mkDerivation {
@@ -165252,6 +165489,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pqueue_1_4_1_2" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "pqueue";
+       version = "1.4.1.2";
+       sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       description = "Reliable, persistent, fast priority queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pqueue-mtl" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl
      , stateful-mtl, uvector
@@ -174317,6 +174567,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "refined_0_3_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "refined";
+       version = "0.3.0.0";
+       sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks";
+       libraryHaskellDepends = [
+         base deepseq exceptions mtl prettyprinter template-haskell
+         transformers
+       ];
+       description = "Refinement types with static and runtime checking";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -177941,8 +178208,8 @@ self: {
     ({ mkDerivation, base, dunai, gloss, rhine }:
      mkDerivation {
        pname = "rhine-gloss";
-       version = "0.4.0.4";
-       sha256 = "0xbmqhznacmxvcrx1gaq4cy6f98fb2p4f07g16qp50zhs9mb2a63";
+       version = "0.5.0.0";
+       sha256 = "1hhn23lxcdck0h124i1k2fhrn184ih9v8jpf6yhrin6arwbzpchx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base dunai gloss rhine ];
@@ -183649,8 +183916,8 @@ self: {
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.2.0.1";
-       sha256 = "1larh2rp9sa3zd0d7bn6wc0i3hy455dr5zixmp34i8v135wqay2b";
+       version = "0.2.1.0";
+       sha256 = "0jmd7qgdwbyzck8x9i4acs9fx1ww26qr8s74raf0fv9bykynzyy2";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers vector
        ];
@@ -193781,10 +194048,10 @@ self: {
      }:
      mkDerivation {
        pname = "spatial-rotations";
-       version = "0.1.0.0";
-       sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm";
+       version = "0.1.0.1";
+       sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
        revision = "1";
-       editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy";
+       editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c";
        libraryHaskellDepends = [
          base linear manifolds-core vector-space
        ];
@@ -200140,15 +200407,17 @@ self: {
 
   "sv" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
-     , contravariant, hedgehog, hw-dsv, lens, Only, parsers
-     , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog
-     , tasty-hunit, text, transformers, trifecta, utf8-string
-     , validation, vector
+     , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only
+     , parsers, semigroupoids, semigroups, sv-core, tasty
+     , tasty-hedgehog, tasty-hunit, text, transformers, trifecta
+     , utf8-string, validation, vector
      }:
      mkDerivation {
        pname = "sv";
-       version = "1.1.1";
-       sha256 = "1d4f7l2k8vpskwf6iywfj7ivmfhdk2b10c9k8qrk6lms2mx0mwmh";
+       version = "1.2";
+       sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
+       revision = "1";
+       editedCabalFile = "14cs2wh9g0hq48rb8ngxhyw9bindm23c9xbw4w2nayh1j4db5a76";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -200158,6 +200427,10 @@ self: {
          semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
          trifecta utf8-string validation vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion deepseq hw-dsv lens text
+         vector
+       ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200169,10 +200442,8 @@ self: {
      }:
      mkDerivation {
        pname = "sv-cassava";
-       version = "0.2";
-       sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin";
-       revision = "1";
-       editedCabalFile = "1manx0gs4rzsrg9mg83g7ipv36bplxl466c2ypf5dx5f2pn1xvjx";
+       version = "0.3";
+       sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b";
        libraryHaskellDepends = [
          attoparsec base bytestring cassava sv-core utf8-string validation
          vector
@@ -200194,8 +200465,8 @@ self: {
      }:
      mkDerivation {
        pname = "sv-core";
-       version = "0.2.2";
-       sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf";
+       version = "0.3";
+       sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
          deepseq lens mtl parsec profunctors readable semigroupoids
@@ -200217,8 +200488,8 @@ self: {
      }:
      mkDerivation {
        pname = "sv-svfactor";
-       version = "0.1";
-       sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0";
+       version = "0.2";
+       sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb";
        libraryHaskellDepends = [
          base bytestring lens profunctors sv-core svfactor validation
        ];
@@ -218242,8 +218513,8 @@ self: {
        pname = "vec";
        version = "0.1";
        sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y";
-       revision = "2";
-       editedCabalFile = "00z6y4a5hi5pwnnakj00qs3kglaykf4i3kwd9iz8bi2kmm6b09lx";
+       revision = "3";
+       editedCabalFile = "093q5qlhlia12ckhvax322lyy3sb554pg46ghabvsvx8znixw2hh";
        libraryHaskellDepends = [
          adjunctions base base-compat deepseq distributive fin hashable lens
          semigroupoids
@@ -223933,21 +224204,21 @@ self: {
      }) {};
 
   "wkt-geom" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, geojson
-     , hspec, lens, QuickCheck, scientific, trifecta, utf8-string
-     , vector
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, geojson, hspec, lens, QuickCheck, scientific
+     , trifecta, utf8-string, vector
      }:
      mkDerivation {
        pname = "wkt-geom";
-       version = "0.0.1";
-       sha256 = "069jwfycqjg5dz4w80ywwjn3pky5kzg7wlwd7qk9y8lwca0bv4ij";
+       version = "0.0.4";
+       sha256 = "00v2zqgy41zd13yyadiw9x3s2napz0wl3jcq10xbb3i59jb03fa2";
        libraryHaskellDepends = [
-         base binary bytestring geojson scientific trifecta utf8-string
-         vector
+         base binary bytestring containers geojson scientific trifecta
+         utf8-string vector
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base binary bytestring geojson hspec lens QuickCheck
-         scientific trifecta vector
+         ansi-wl-pprint base binary bytestring containers geojson hspec lens
+         QuickCheck scientific trifecta vector
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;

From 0af54ac6704a3227cabf93d4a9d86baa1c6ef608 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 15:15:36 +0200
Subject: [PATCH 1860/3253] all-cabal-hashes: update to Hackage at
 2018-09-27T00:15:48Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 3c837feb6be5..3126269a6e7a 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b16aa9c85633ea49e19aee5e1678d082ce953a17.tar.gz";
-  sha256 = "185p6112b35s2vgbswrmy5lwf09q27gzkpcfla6dbddmbk948d38";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz";
+  sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb";
 }

From 9a74fd0b0fdb7243f5f5db944dd326a374cf493a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Sep 2018 08:32:48 -0500
Subject: [PATCH 1861/3253] udisks: 2.8.0 -> 2.8.1

https://github.com/storaged-project/udisks/blob/udisks-2.8.1/NEWS
---
 pkgs/os-specific/linux/udisks/2-default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 78ab6b37532d..a816a2139395 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "2.8.0";
+  version = "2.8.1";
 in stdenv.mkDerivation rec {
   name = "udisks-${version}";
 
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     owner = "storaged-project";
     repo = "udisks";
     rev = name;
-    sha256 = "110g3vyai3p6vjzy01yd0bbvxk7n7dl5glxf54f3jvqf0zmaqipx";
+    sha256 = "073iqa0pwa7ab0qw33h3ic89508a78incmg6rq914d6br7s030zy";
   };
 
   outputs = [ "out" "man" "dev" "devdoc" ];

From 3ef254a40e1e99eeb08cc4b07df5517b44da2799 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 15:55:02 +0200
Subject: [PATCH 1862/3253] multi-ghc-travis: update to latest git version

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 1403194925d3..2d1ce7f8758c 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -9,8 +9,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "f67bc41621d40d6559684be5406d65409df4c480";
-    sha256 = "1r79dbgjq97h30xa3xhf75l0bivag8an9ag00mgzgpglvgc96czm";
+    rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";
+    sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";
   };
   isLibrary = true;
   isExecutable = true;

From 46651b82b87318e37440c15a639d49ec05e79b79 Mon Sep 17 00:00:00 2001
From: Philip Patsch <philip.patsch@tweag.io>
Date: Wed, 26 Sep 2018 20:38:28 +0200
Subject: [PATCH 1863/3253] include-what-you-use: 0.8 -> 0.10

Updates to llvm 6, fixes python scripts in /bin.
---
 .../tools/analysis/include-what-you-use/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 9aac638d0a80..4222f72248a8 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, cmake, llvmPackages }:
+{ stdenv, fetchurl, cmake, llvmPackages, python2 }:
 
 stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
   # Also bump llvmPackages in all-packages.nix to the supported version!
-  version = "0.8";
+  version = "0.10";
 
   src = fetchurl {
-    sha256 = "0r6n5gqicl0f9c8jrphq40kc2cis952gmnkm3643m3jwad0mn33d";
+    sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s";
     url = "${meta.homepage}/downloads/${name}.src.tar.gz";
   };
 
-  buildInputs = with llvmPackages; [ clang-unwrapped llvm ];
+  buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    substituteInPlace $out/bin/iwyu_tool.py \
+      --replace "['include-what-you-use']" "['$out/bin/include-what-you-use']"
+  '';
+
   meta = with stdenv.lib; {
     description = "Analyze #includes in C/C++ source files with clang";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 284b2301d9a5..3b8b440e6bb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8446,7 +8446,7 @@ with pkgs;
   };
 
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
-    llvmPackages = llvmPackages_4;
+    llvmPackages = llvmPackages_6;
   };
 
   indent = callPackage ../development/tools/misc/indent { };

From 16f55b2bf8df6b1fa5e17808f52fdc2cf3769cbc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 27 Sep 2018 17:42:19 +0200
Subject: [PATCH 1864/3253] android-studio: 3.1.4.0 -> 3.2.0.26

androidStudioPackages.beta: 3.2.0.25 -> 3.2.0.26
---
 pkgs/applications/editors/android-studio/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 7b99e06446b3..5a192b6fa8fd 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,15 +8,11 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.1.4.0"; # "Android Studio 3.1.4"
-    build = "173.4907809";
-    sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2";
-  };
-  betaVersion = {
-    version = "3.2.0.25"; # "Android Studio 3.2 RC 3"
-    build = "181.4987877";
-    sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp";
+    version = "3.2.0.26"; # "Android Studio 3.2.0"
+    build = "181.5014246";
+    sha256Hash = "0v1a3b0n8dq5p8f6jap2ypqw724v61ki31qhqmh9hn36mn6d8wg6";
   };
+  betaVersion = stableVersion;
   latestVersion = { # canary & dev
     version = "3.3.0.10"; # "Android Studio 3.3 Canary 11"
     build = "182.5012296";

From 699b2bde442c060eab03451304b73e3721ef2f4d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 27 Sep 2018 17:50:10 +0200
Subject: [PATCH 1865/3253] androidStudioPackages.{dev,canary}: 3.3.0.10 ->
 3.3.0.11

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 5a192b6fa8fd..682c1c0a6e7e 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-    version = "3.3.0.10"; # "Android Studio 3.3 Canary 11"
-    build = "182.5012296";
-    sha256Hash = "0gqwf904y2pvp10l96gr055gjl1zf9pkb7840abqhl26liliwdm4";
+    version = "3.3.0.11"; # "Android Studio 3.3 Canary 12"
+    build = "182.5026711";
+    sha256Hash = "0k1f8yw3gdil78iqxlwhbz71w1307hwwf8z9m7hs0v9b4ri6x2wk";
   };
 in rec {
   # Old alias

From 312c41c3c4aaa77b70ce4ce2fbaf96dc9e678e3c Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Thu, 27 Sep 2018 19:29:19 +0300
Subject: [PATCH 1866/3253] arc-theme: fix `config.allowAliases = false`
 evaluation (#47427)

---
 pkgs/misc/themes/arc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix
index d9846415484b..0fc86e096f3d 100644
--- a/pkgs/misc/themes/arc/default.nix
+++ b/pkgs/misc/themes/arc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, sassc, autoreconfHook, pkgconfig, gtk3
-, gnome-themes-standard, gtk-engine-murrine, optipng, inkscape}:
+, gnome-themes-extra, gtk-engine-murrine, optipng, inkscape}:
 
 let
   pname = "arc-theme";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig sassc optipng inkscape ];
   buildInputs = [ gtk3 ];
 
-  propagatedUserEnvPkgs = [ gnome-themes-standard gtk-engine-murrine ];
+  propagatedUserEnvPkgs = [ gnome-themes-extra gtk-engine-murrine ];
 
   postPatch = ''
     find . -name render-assets.sh |

From cc481ceddae0727289fb76610bbbca909488bd44 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 18 Sep 2018 20:24:21 -0700
Subject: [PATCH 1867/3253] terraform: update-all: add support for parsing list
 of providers in providers.txt

---
 .../cluster/terraform/providers/data.nix      | 58 ++++++++++++-------
 .../cluster/terraform/providers/providers.txt | 13 +++++
 .../cluster/terraform/providers/update-all    | 35 ++++++++---
 3 files changed, 75 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/terraform/providers/providers.txt

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 508f0658354e..fead9af601f7 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -11,8 +11,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.16.0";
-      sha256  = "10v6g25wna63nay0ac3l31qbwdb8bs4vj6d1dr2kqzfqqmw9wnna";
+      version = "1.17.0";
+      sha256  = "1zmywmcgfmx5ccp0qxj912sqymisxdg2s84b4qclfa225hrbaqpn";
     };
   archive =
     {
@@ -39,8 +39,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.36.0";
-      sha256  = "10lcdi609fa4q5xmqxp0vjb4ajqxvkhn61h7bfcc6syhpm20hdj1";
+      version = "1.38.0";
+      sha256  = "1jhr2l8p7wf7kgr2y0c40n1jb9p2153xkpcp4b2half2vhsh1nwi";
     };
   azurerm =
     {
@@ -56,6 +56,13 @@
       version = "0.4.0";
       sha256  = "1c9am0v4aq95k1jblc767vykk76dp0d6z2fvy148ag77cy2jgryc";
     };
+  bigip =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-bigip";
+      version = "0.12.0";
+      sha256  = "0fmmlx757hph45ffm19zafjfkldg41qkw83vz0jjmvxicza1afbd";
+    };
   bitbucket =
     {
       owner   = "terraform-providers";
@@ -81,8 +88,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-circonus";
-      version = "0.1.0";
-      sha256  = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
+      version = "0.1.1";
+      sha256  = "05n1q9hc0h31icxsmyi2y60wiwd5fs2hz1dqm3bl6hgh5x3ss1im";
     };
   clc =
     {
@@ -95,8 +102,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudflare";
-      version = "1.4.0";
-      sha256  = "17ajzm0m73lrp14ikabg26s9gj1dbh23a34231dwv9zqqky93dn7";
+      version = "1.5.0";
+      sha256  = "0l8bmnxmjr2g3xxw8w0ay91cvs4kzc65wkdwybfahvq9r6mww45n";
     };
   cloudscale =
     {
@@ -130,8 +137,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-datadog";
-      version = "1.2.0";
-      sha256  = "1hr3zsisyv04b0skl3v7ghycz3ac2dqkn47qjszmkdg5vvy8dh0g";
+      version = "1.3.0";
+      sha256  = "0d3xccfkzibjp4jl8irja1cdhppdn3b7nh4wy857zvfxpfhz7aj2";
     };
   digitalocean =
     {
@@ -249,8 +256,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-huaweicloud";
-      version = "1.1.0";
-      sha256  = "1jsvv5yfxgz998p4wbldbq82hl4ykn1yp21igphl94n3b0jj33dj";
+      version = "1.2.0";
+      sha256  = "0r05dfgpzci0lpc2ivbrj6ivib8svbks9612by3w3zakzclpv467";
     };
   icinga2 =
     {
@@ -368,8 +375,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oci";
-      version = "3.0.0";
-      sha256  = "08p13yzc3h8xng77ia3x4lmar8k6860gkx6w16ccw311ndzl586h";
+      version = "3.1.1";
+      sha256  = "0wrvb44gs0c1khvam5lrq53l2889japg7d4nyk2hrpywy9japc8m";
     };
   oneandone =
     {
@@ -410,8 +417,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-oraclepaas";
-      version = "1.3.1";
-      sha256  = "1vyqkxq3c98gfpshr1zz4y91jfblnyzrbzwr40dsc6r9b6jlbwqa";
+      version = "1.3.2";
+      sha256  = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb";
     };
   ovh =
     {
@@ -483,6 +490,13 @@
       version = "2.0.0";
       sha256  = "0plg139pbvqwbs5hcl7d5kjn7vwknjr4n0ysc2j5s25iyhikkv9s";
     };
+  rightscale =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-rightscale";
+      version = "1.3.0";
+      sha256  = "1brzxyd5hg99x75qh0p707lr9cvqpzx2az1swr624w3rzhjl2ygm";
+    };
   rundeck =
     {
       owner   = "terraform-providers";
@@ -494,8 +508,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-runscope";
-      version = "0.3.0";
-      sha256  = "1srnnlw94q1av8rzy8753fk4vazv5ldbimgr9gd51vrmpvmlgxas";
+      version = "0.4.0";
+      sha256  = "1n3q2hdwvkkn5rphrcl5qfv4ry2mrr13dcjwzhbym2i1nhpxkld0";
     };
   scaleway =
     {
@@ -550,8 +564,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-tfe";
-      version = "0.1.0";
-      sha256  = "1mzrp2yk2w8clqkydkz761vj5spgb2n79yi3ng85rkqvchzamsh5";
+      version = "0.2.0";
+      sha256  = "1d3yiaxmmlnnjmx6vnckvdnqgyxakc9i70dgxdbn8ihw5i6anvik";
     };
   tls =
     {
@@ -578,8 +592,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      version = "1.1.3";
-      sha256  = "1aq82w4g3hdvb3ba86fisjc2lqbzsymn2q2kni8cyqvwhcxk1r4c";
+      version = "1.1.4";
+      sha256  = "00i9rl9pnmicvndkmvcmlj6y80341dmkqnhq09f94yljh1w1zpvv";
     };
   vcd =
     {
diff --git a/pkgs/applications/networking/cluster/terraform/providers/providers.txt b/pkgs/applications/networking/cluster/terraform/providers/providers.txt
new file mode 100644
index 000000000000..d0c4a6505981
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/providers.txt
@@ -0,0 +1,13 @@
+# lines starting with a # are comments
+
+# The accepted format (double escape all grep expresssions):
+#  <organisation>         [grep-expression] [grep-v-expression]  - include all repositories in the organisation.
+#                                                                   grep-expression:   filter repo matching the expression
+#                                                                   grep-v-expression: filter repo not matching the expression
+#  <organisation>/<repo>                                         - include only the named repository.
+
+# include all terraform-providers
+terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
+
+# include terraform-provider-nixos
+tweag/terraform-provider-nixos
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index ac005c5f59e9..2009d474db7b 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -4,7 +4,7 @@
 #
 # This scripts scans the github terraform-providers repo for new releases,
 # generates the corresponding nix code and finally generates an index of
-# all the providers.
+# all the providers given in ./providers.txt.
 set -euo pipefail
 
 # the maximum number of attempts before giving up inside of GET and prefetch_github
@@ -109,15 +109,32 @@ cat <<HEADER > data.nix
 {
 HEADER
 
-# add all the repos under the terraform-providers organisation
-org=terraform-providers
-repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort)
-for repo in $repos; do
-  add_repo "$org" "$repo"
-done
+while read line; do
+  IFS=' ' read -r -a fields <<< "$line"
+  if [[ "${#fields[@]}" -eq 0 ]]; then
+    continue
+  fi
 
-# add the repos that live outside of terraform-providers
-add_repo tweag terraform-provider-nixos
+  if [[ "${fields[0]}" = *"/"* ]]; then
+    org="$(echo "${fields[0]}" | cut -d/ -f1)"
+    repo="$(echo "${fields[0]}" | cut -d/ -f2)"
+    add_repo "${org}" "${repo}"
+  else
+    org="${fields[0]}"
+    repos=$(get_org_repos "$org")
+    if [[ "${#fields[@]}" -ge 2 ]] && [[ -n "${fields[1]}" ]]; then
+      repos="$( echo "${repos[@]}" | grep "${fields[1]}" )"
+    fi
+    if [[ "${#fields[@]}" -eq 3 ]] && [[ -n "${fields[2]}" ]]; then
+      repos="$( echo "${repos[@]}" | grep -v "${fields[2]}" )"
+    fi
+    repos="$( echo "${repos[@]}" | sort )"
+
+    for repo in $repos; do
+      add_repo "$org" "$repo"
+    done
+  fi
+done < <(grep -v '^#\|^$' providers.txt)
 
 cat <<FOOTER >> data.nix
 }

From 7dadabb22c49de57bb6bef395f4b0474731e5eaf Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Wed, 26 Sep 2018 13:11:18 -0700
Subject: [PATCH 1868/3253] terraform: add myself as a maintainer

---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index edeac9671c16..1a88fea3d775 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -34,7 +34,7 @@ let
         description = "Tool for building, changing, and versioning infrastructure";
         homepage = https://www.terraform.io/;
         license = licenses.mpl20;
-        maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
+        maintainers = with maintainers; [ jgeerds zimbatm peterhoeg kalbasit ];
       };
     } // attrs');
 

From ec3a7660119a0e269ca0378a65f853c824ce6a06 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 27 Sep 2018 19:13:34 +0200
Subject: [PATCH 1869/3253] stupidterm: 2018-03-10 -> 2018-09-25 (#47428)

Diff: https://github.com/esmil/stupidterm/compare/0463519a96c9e4f9ce9fdc99d8e776499346ccba..d1bc020797330df83d427e361d3620e346a4e792
---
 pkgs/applications/misc/stupidterm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index f6286bfece3d..483fb9cf95a0 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "stupidterm-2018-03-10";
+  name = "stupidterm-2018-09-25";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "esmil";
     repo = "stupidterm";
-    rev = "0463519a96c9e4f9ce9fdc99d8e776499346ccba";
-    sha256 = "1vbk53xyjn33myb3fix6y7sxb1x3rndrkk5l9qa60qaw2ivkr965";
+    rev = "d1bc020797330df83d427e361d3620e346a4e792";
+    sha256 = "1yh2vhq3d0qbh0dh2h9yc7s9gkffgkb987vvwz2bdnvlskrjmmdj";
   };
 
   makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";

From 4f14ccee0779d367390f447e70e99862b441c854 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 27 Sep 2018 18:18:06 +0100
Subject: [PATCH 1870/3253] ranger: fix out-of-the-box previews

I'm guessing this became commented out by default at some point.
---
 pkgs/applications/misc/ranger/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 6d883d89de31..26387264b643 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
 
     # give file previews out of the box
     substituteInPlace ranger/config/rc.conf \
-      --replace "set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
+      --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
   '' + optionalString imagePreviewSupport ''
     substituteInPlace ranger/ext/img_display.py \
       --replace /usr/lib/w3m ${w3m}/libexec/w3m

From 29060b7264c342878243f00857957579eb8d95fd Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 27 Sep 2018 19:23:25 +0200
Subject: [PATCH 1871/3253] traefik: 1.6.5 -> 1.7.0 (#47431)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/servers/traefik/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 58054c34225b..be279937ef8a 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.6.5";
+  version = "1.7.0";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "0swiyyw7j7264avfk0a5jqs7h1hv4bq1k1kr92v4830azc9fxrvn";
+    sha256 = "1nv2w174vw5dq60cz8a2riwjyl9rzxqwp7z7v5zv7ch0bxq9cvhn";
   };
 
   buildInputs = [ go-bindata bash ];

From 0d810c5ac497dd22d8e3528644cb5a169c0d898c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Thu, 27 Sep 2018 19:26:29 +0200
Subject: [PATCH 1872/3253] vscode: 1.26.1 -> 1.27.2 (#47397)

---
 pkgs/applications/editors/vscode/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 0cf0c7bcbc69..3f23021b6d82 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.26.1";
+  version = "1.27.2";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n";
-    "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy";
-    "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl";
+    "i686-linux" = "33704d089b03c636e8c46d434068c97b66e5a9d323b991bd327067aa90e87afa";
+    "x86_64-linux" = "11023c652dd89bde1b7fbc8a7dc04fd4f87df3bfe6952a1c0ad75ab861e3196d";
+    "x86_64-darwin" = "d1f2d046775406e6f339883dab432fcaa149e763ccfcd017556a46e890de6476";
   }.${stdenv.hostPlatform.system};
 
   archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";

From 49bee199ddd662f9f2066d570a26a1e02bc098db Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 19:28:23 +0200
Subject: [PATCH 1873/3253] add gmic-qt

---
 pkgs/tools/graphics/gmic-qt/default.nix | 75 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/tools/graphics/gmic-qt/default.nix

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
new file mode 100644
index 000000000000..65b1bc301fb3
--- /dev/null
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
+, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
+, withGimpPlugin ? true, gimp ? null}:
+
+assert withGimpPlugin -> gimp != null;
+
+let
+  version = "2.3.6";
+
+  gmic-version = "2.3.6";
+
+  # CMakeLists.txt is missing from the tarball and Makefile is terrible
+  #CMakeLists = fetchurl {
+  #  url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
+  #  sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
+  #};
+in stdenv.mkDerivation rec {
+  name = "gmic-qt-${version}";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "c-koi";
+      repo = "gmic-qt";
+      rev = "9e992cff2db418032b849458f5c9443267c7162c";
+      sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
+    (fetchFromGitHub {
+      owner ="dtschump";
+      repo = "gmic";
+      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
+      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
+  ];
+
+  sourceRoot = "gmic-${gmic-version}";
+
+  #src = fetchgit {
+  #  url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
+  #  sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
+  #};
+
+  nativeBuildInputs = [ qt5.qmake ];
+
+  buildInputs = [
+    fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
+  ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
+
+  #cmakeFlags = [
+  #  "-DBUILD_LIB_STATIC=OFF"
+  #  "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
+  #  "-DENABLE_DYNAMIC_LINKING=ON"
+  #] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
+
+  #postPatch = ''
+  #  cp ${CMakeLists} CMakeLists.txt
+  #'';
+
+  buildPhase = ''
+    make -C src CImg.h gmic_stdlib.h;
+    cd ../qmic-qt;
+    mkdir build;
+    qmake HOST=krita ..;
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin;
+    install -Dm755 "gmic-qt/gmic_krita_qt" "$out/gmic_krita_qt"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Krita plugin for the G'MIC image processing framework";
+    homepage = http://gmic.eu/;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..b0255694b1d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1370,6 +1370,8 @@ with pkgs;
 
   gmic = callPackage ../tools/graphics/gmic { };
 
+  gmic-qt = callPackage ../tools/graphics/gmic-qt { };
+
   goa = callPackage ../development/tools/goa {
     buildGoPackage = buildGo110Package;
   };

From a3f8ce2c94598503d3d8c2022d0fc46610bb4e3a Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 27 Sep 2018 19:32:06 +0200
Subject: [PATCH 1874/3253] atom, atom-beta: 1.30.0 -> 1.31.0, 1.31.0-beta0 ->
 1.32.0-beta0 (#47417)

* atom: 1.30.0 -> 1.31.0

* atom-beta: 1.31.0-beta0 -> 1.32.0-beta0
---
 pkgs/applications/editors/atom/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index d5e0259d2adc..25b5cad34dd2 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -73,13 +73,13 @@ let
   };
 in stdenv.lib.mapAttrs common {
   atom = {
-    version = "1.30.0";
-    sha256 = "1hqizfn9c249l51rlpfgk0h374maqgw6pagswlh4xa278qzb6qzs";
+    version = "1.31.0";
+    sha256 = "184vsj7qcpzwiq2v5kh8i21wfzhinhybxmr71y41sjqp78s2gy57";
   };
 
   atom-beta = {
-    version = "1.31.0";
+    version = "1.32.0";
     beta = 0;
-    sha256 = "11nlaz89rg6lgzsxp83qdqk4bnn2cij2p5aqjd9a3phd7v70xmy5";
+    sha256 = "12k5cn70a0diyaqbmq6s6l2sbi9i3d9p7i38qnm97lnw0y1kh0jm";
   };
 }

From d152089772b31417cd243c73fb5d5878d7512f7a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 27 Sep 2018 18:18:30 +0100
Subject: [PATCH 1875/3253] ranger: syntax highlight previews by default

---
 pkgs/applications/misc/ranger/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 26387264b643..5417a135dda4 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3Packages, file, less
+{ stdenv, lib, fetchFromGitHub, python3Packages, file, less, highlight
 , imagePreviewSupport ? true, w3m ? null}:
 
 with stdenv.lib;
@@ -24,6 +24,11 @@ python3Packages.buildPythonApplication rec {
   '';
 
   preConfigure = ''
+    ${lib.optionalString (highlight != null) ''
+      sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \
+        ranger/data/scope.sh
+    ''}
+
     substituteInPlace ranger/data/scope.sh \
       --replace "/bin/echo" "echo"
 
@@ -46,7 +51,7 @@ python3Packages.buildPythonApplication rec {
       --replace "set preview_images false" "set preview_images true"
   '';
 
-  meta =  with stdenv.lib; {
+  meta =  with lib; {
     description = "File manager with minimalistic curses interface";
     homepage = http://ranger.github.io/;
     license = licenses.gpl3;

From 91c304030a509c1913d6baf5d274e2d078d10bfd Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Sep 2018 11:54:40 -0400
Subject: [PATCH 1876/3253] texlive: generate MkIV caches

Documentation:
http://www.pragma-ade.com/general/manuals/tools-mkiv.pdf

Fixes: #19279
Closes: #47370
---
 pkgs/tools/typesetting/tex/texlive/combine.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 8a01ac744145..f76b71ced3cf 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -235,6 +235,19 @@ in buildEnv {
         ln -s -t . ../texmf/doc/"$d"/*
       )
     done
+  '' +
+  # MkIV uses its own lookup mechanism and we need to initialize
+  # caches for it. Unsetting TEXMFCNF is needed to let mtxrun
+  # determine it from kpathsea so that the config path is given with
+  # "selfautodir:" as it will be in runtime. This is important because
+  # the cache is identified by a hash of this path.
+  ''
+    if [[ -e "$out/bin/mtxrun" ]]; then
+      (
+        unset TEXMFCNF
+        mtxrun --generate
+      )
+    fi
   ''
     + bin.cleanBrokenLinks
   ;

From c8f3e0f118a300a48e6c480239b4786bec425c24 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Sep 2018 05:45:31 +0000
Subject: [PATCH 1877/3253] ocamlPackages.elpi: init at 1.0.5

---
 .../ocaml-modules/elpi/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/elpi/default.nix

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
new file mode 100644
index 000000000000..db188a720b88
--- /dev/null
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict
+, ppx_tools_versioned, ppx_deriving, re
+}:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-elpi-${version}";
+  version = "1.0.5";
+  src = fetchFromGitHub {
+    owner = "LPCIC";
+    repo = "elpi";
+    rev = "v${version}";
+    sha256 = "1n1m183l4ms949m2l24w0887m1rmvc9b3j8alnbw8ckn6wwnhpmk";
+  };
+
+  buildInputs = [ ocaml findlib ppx_tools_versioned ];
+
+  propagatedBuildInputs = [ camlp5_strict ppx_deriving re ];
+
+  createFindlibDestdir = true;
+
+  preInstall = "make byte";
+
+  postInstall = ''
+    mkdir -p $out/bin
+    make install-bin BIN=$out/bin
+    make install-bin BYTE=1 BIN=$out/bin
+  '';
+
+  meta = {
+    description = "Embeddable λProlog Interpreter";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 779a24352bf8..9e324257e03d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -240,6 +240,8 @@ let
 
     eliom = callPackage ../development/ocaml-modules/eliom { };
 
+    elpi = callPackage ../development/ocaml-modules/elpi { };
+
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
     erm_xml = callPackage ../development/ocaml-modules/erm_xml { };

From fb2d153dac13f37e2b71811aa8600f99b758a73e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 27 Sep 2018 14:16:23 -0400
Subject: [PATCH 1878/3253] dockerTools: test buildLayeredImage

---
 nixos/tests/docker-tools.nix           | 4 ++++
 pkgs/build-support/docker/examples.nix | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 5a7590cbf364..360b32faae72 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -58,5 +58,9 @@ import ./make-test.nix ({ pkgs, ... }: {
       # Ensure Docker images can use an unstable date
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
       $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
+
+      # Ensure Layered Docker images work
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'");
+      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}");
     '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 822e0dbb31f2..003e7429a81b 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -150,4 +150,11 @@ rec {
     contents = [ pkgs.coreutils ];
     created = "now";
   };
+
+  # 10. Create a layered image
+  layered-image = pkgs.dockerTools.buildLayeredImage {
+    name = "layered-image";
+    tag = "latest";
+    config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+  };
 }

From c26f3baf7d4204521749f82d5255417a9633a090 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 20:34:40 +0200
Subject: [PATCH 1879/3253] still trying

---
 pkgs/tools/graphics/gmic-qt/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 65b1bc301fb3..877ee4eb103d 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -18,16 +18,16 @@ in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
   srcs = [
+    (fetchFromGitHub {
+      owner = "dtschump";
+      repo = "gmic";
+      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
+      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
     (fetchFromGitHub {
       owner = "c-koi";
       repo = "gmic-qt";
       rev = "9e992cff2db418032b849458f5c9443267c7162c";
       sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
-    (fetchFromGitHub {
-      owner ="dtschump";
-      repo = "gmic";
-      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
-      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
   ];
 
   sourceRoot = "gmic-${gmic-version}";
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
-  ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
+  ];
 
   #cmakeFlags = [
   #  "-DBUILD_LIB_STATIC=OFF"

From b0ea289f4c3e865d30707cebdcd3989d0b64aeec Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Sep 2018 18:58:22 +0200
Subject: [PATCH 1880/3253] eclipses: 4.8 -> 4.9

This bumps eclipse-platform, eclipse-sdk, and eclipse-plugin-jdt to
version 4.9.
---
 pkgs/applications/editors/eclipse/default.nix | 34 +++++++++++++++++--
 pkgs/applications/editors/eclipse/plugins.nix |  6 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 8d47a551c93e..fa665b10d0b0 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -96,7 +96,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-48; # always point to latest
+  eclipse-platform = eclipse-platform-49; # always point to latest
 
   eclipse-platform-46 = buildEclipse {
     name = "eclipse-platform-4.6.2";
@@ -143,6 +143,21 @@ rec {
     };
   };
 
+  eclipse-platform-49 = buildEclipse {
+    name = "eclipse-platform-4.9";
+    description = "Eclipse Platform 2018-09";
+    sources = {
+      "x86_64-linux" = fetchurl {
+        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz;
+          sha512 = "875714bb411145c917fccedf2f7c4fd2757640b2debf4a18f775604233abd6f0da893b350cc03da44413d7ec6fae3f773ef08634e632058e4b705e6cda2893eb";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk.tar.gz;
+          sha512 = "758bc0de30fa5c4b76b343ea0325611d87b6928ef5002244f2f1ba2a9fa937de89b2a94ce2c8d33d79344fd574d6e8a72c5d127fe416d785f48600e9e85fce86";
+        };
+    };
+  };
+
   ### Eclipse Scala SDK
 
   eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
@@ -165,7 +180,7 @@ rec {
 
   ### Eclipse SDK
 
-  eclipse-sdk = eclipse-sdk-48; # always point to latest
+  eclipse-sdk = eclipse-sdk-49; # always point to latest
 
   eclipse-sdk-46 = buildEclipse {
     name = "eclipse-sdk-4.6.2";
@@ -212,6 +227,21 @@ rec {
     };
   };
 
+  eclipse-sdk-49 = buildEclipse {
+    name = "eclipse-sdk-4.9";
+    description = "Eclipse 2018-09 Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz;
+          sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-linux-gtk.tar.gz;
+          sha512 = "b1861bd99c8e43f1d04247226584246aa7844af5e2da820fe98a51018dbe8ff4c25dbb9fa655f56e103f95c0696f40a65dcce13430c63aa080f786738e70eb8b";
+        };
+    };
+  };
+
   eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 84371d152493..fa83975b8d97 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -470,12 +470,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.8";
+    version = "4.9";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip;
-      sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip;
+      sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n";
     };
 
     meta = with stdenv.lib; {

From 1bd158734274316d1adab48939d4365bd2475b05 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Sep 2018 19:39:24 +0200
Subject: [PATCH 1881/3253] eclipses: remove old platform and sdk version

This removes the old 4.6.2 version of eclipse-platform and
eclipse-sdk.
---
 pkgs/applications/editors/eclipse/default.nix | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index fa665b10d0b0..4d77c47695a3 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -98,21 +98,6 @@ rec {
 
   eclipse-platform = eclipse-platform-49; # always point to latest
 
-  eclipse-platform-46 = buildEclipse {
-    name = "eclipse-platform-4.6.2";
-    description = "Eclipse Platform Neon 2";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1fmpirjkp210angyfz3nr5jp58snjy6784zkkbmdxkiyg9kg2wqq";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk.tar.gz;
-          sha256 = "0274g6ypiqsqkch10868ygbm6avc5pa57saz9wd196kdivl1bdpm";
-        };
-    };
-  };
-
   eclipse-platform-47 = buildEclipse {
     name = "eclipse-platform-4.7.3a";
     description = "Eclipse Platform Oxygen";
@@ -182,21 +167,6 @@ rec {
 
   eclipse-sdk = eclipse-sdk-49; # always point to latest
 
-  eclipse-sdk-46 = buildEclipse {
-    name = "eclipse-sdk-4.6.2";
-    description = "Eclipse Neon 2 Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "0g3nk1gcz178j8xk6nblkfsaysm8gq8101383fx60x6w25rdfgjb";
-        };
-      "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk.tar.gz;
-          sha256 = "09wlkcxs5h3j8habqxgr4all99vkgmyixc0vr9dj3qs0kl85k5mz";
-        };
-    };
-  };
-
   eclipse-sdk-47 = buildEclipse {
     name = "eclipse-sdk-4.7.3a";
     description = "Eclipse Oxygen Classic";

From f5f9625bffac5f6a56cae78ea392e551fb61d6f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Sep 2018 12:01:08 -0700
Subject: [PATCH 1882/3253] gnustep.system_preferences: 1.1.0 -> 1.2.0 (#45832)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
system_preferences
---
 pkgs/desktops/gnustep/systempreferences/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnustep/systempreferences/default.nix b/pkgs/desktops/gnustep/systempreferences/default.nix
index 2bc4f688184a..096520f08f36 100644
--- a/pkgs/desktops/gnustep/systempreferences/default.nix
+++ b/pkgs/desktops/gnustep/systempreferences/default.nix
@@ -1,12 +1,12 @@
 { back, base, gui, gsmakeDerivation, fetchurl }:
 let
-  version = "1.1.0";
+  version = "1.2.0";
 in
 gsmakeDerivation {
   name = "system_preferences-${version}";
   src = fetchurl {
     url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-${version}.tar.gz";
-    sha256 = "1q68bs8rlq0dxkar01qs5wfyas4iivddnama371jd7ll6cxzmpy7";
+    sha256 = "1fg7c3ihfgvl6n21rd17fs9ivx3l8ps874m80vz86n1callgs339";
   };
 #  GNUSTEP_MAKEFILES = "${gnustep_make}/share/GNUstep/Makefiles";
   buildInputs = [ back base gui ];

From 977a05cc3bc3c699f3c8ade0054a9d39fcbafa0a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Sep 2018 12:03:16 -0700
Subject: [PATCH 1883/3253] p11-kit: 0.23.13 -> 0.23.14 (#46220)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
p11-kit
---
 pkgs/development/libraries/p11-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index e0e0b59a9a9f..b4bdd200211c 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "p11-kit-${version}";
-  version = "0.23.13";
+  version = "0.23.14";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     rev = version;
-    sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6";
+    sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw";
   };
 
   outputs = [ "out" "dev"];

From d47f73242853cfcc41db84344ab36e7fbdd24756 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Sep 2018 12:05:13 -0700
Subject: [PATCH 1884/3253] bison: 3.0.5 -> 3.1 (#45843)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
bison
---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 469e64acff06..d75a7e0ee3db 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "bison-3.0.5";
+  name = "bison-3.1";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.gz";
-    sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd";
+    sha256 = "0ip9krjf0lw57pk3wfbxgjhif1i18hm3vh35d1ifrvhnafskdjx7";
   };
 
   patches = []; # remove on another rebuild

From b1995497f83299245a424d3e4337c57dac77d799 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 22:41:26 +0200
Subject: [PATCH 1885/3253] thank you @Mic92

---
 pkgs/tools/graphics/gmic-qt/default.nix | 94 +++++++++++++------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 877ee4eb103d..2da42a994355 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,69 +1,73 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, withGimpPlugin ? true, gimp ? null}:
-
-assert withGimpPlugin -> gimp != null;
+, curl, krita
+, fetchgit, withGimpPlugin ? true, gimp }:
 
 let
   version = "2.3.6";
 
   gmic-version = "2.3.6";
 
-  # CMakeLists.txt is missing from the tarball and Makefile is terrible
-  #CMakeLists = fetchurl {
-  #  url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
-  #  sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
-  #};
 in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
-  srcs = [
-    (fetchFromGitHub {
-      owner = "dtschump";
-      repo = "gmic";
-      rev = "3e9600c5c99cca3b389099909fc3a231e0a69d8e";
-      sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";})
-    (fetchFromGitHub {
-      owner = "c-koi";
-      repo = "gmic-qt";
-      rev = "9e992cff2db418032b849458f5c9443267c7162c";
-      sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";})
-  ];
+  gmic-community = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic-community";
+    rev = "3fd528f20a2a7d651e96078c205ff21efb9cdd1a";
+    sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
+  };
 
-  sourceRoot = "gmic-${gmic-version}";
+  CImg = fetchgit {
+    url = "https://framagit.org/dtschump/CImg";
+    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
+    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
+  };
 
-  #src = fetchgit {
-  #  url = "https://gmic.eu/files/source/gmic_${version}.tar.gz";
-  #  sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
-  #};
+  gmic_stdlib = fetchurl {
+    name = "gmic_stdlib.h";
+    url = "http://gmic.eu/gmic_stdlib236.h";
+    sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
+  };
 
-  nativeBuildInputs = [ qt5.qmake ];
+  gmic = fetchFromGitHub {
+    owner = "dtschump";
+    repo = "gmic";
+    rev = "b9a6876684f40852ca39300c9d7e7d676cb81b14";
+    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
+  };
+
+  gmic_qt = fetchFromGitHub {
+    owner = "c-koi";
+    repo = "gmic-qt";
+    rev = "9e992cff2db418032b849458f5c9443267c7162c";
+    sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
+  };
+
+  unpackPhase = ''
+    cp -r ${gmic} gmic
+    ln -s ${gmic-community} gmic-community
+    cp -r ${gmic_qt} gmic_qt
+    chmod -R +w gmic gmic_qt
+    ln -s ${CImg} CImg
+
+    cp ${gmic_stdlib} gmic/gmic_stdlib.h
+
+    make -C gmic/src CImg.h gmic_stdlib.h
+    cd gmic_qt
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
+    qt5.qtbase qt5.qttools gimp fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick curl krita
   ];
 
-  #cmakeFlags = [
-  #  "-DBUILD_LIB_STATIC=OFF"
-  #  "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
-  #  "-DENABLE_DYNAMIC_LINKING=ON"
-  #] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
-
-  #postPatch = ''
-  #  cp ${CMakeLists} CMakeLists.txt
-  #'';
-
-  buildPhase = ''
-    make -C src CImg.h gmic_stdlib.h;
-    cd ../qmic-qt;
-    mkdir build;
-    qmake HOST=krita ..;
-    make
-  '';
+  qmakeFlags = [ "HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;
-    install -Dm755 "gmic-qt/gmic_krita_qt" "$out/gmic_krita_qt"
+    install -Dm755 gmic-qt/gmic_krita_qt "$out/gmic_krita_qt"
   '';
 
   meta = with stdenv.lib; {

From 04d5ff82754fc5e3c4aca101c03555c2ae8f2404 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Thu, 27 Sep 2018 23:48:43 +0200
Subject: [PATCH 1886/3253] fixing and cleaning

---
 pkgs/tools/graphics/gmic-qt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 2da42a994355..0ee589783cde 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita
+, curl, krita, gdk_pixbuf, cairo
 , fetchgit, withGimpPlugin ? true, gimp }:
 
 let
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
-    cp ${gmic_stdlib} gmic/gmic_stdlib.h
+    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
 
     make -C gmic/src CImg.h gmic_stdlib.h
     cd gmic_qt
@@ -60,10 +60,11 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools gimp fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick curl krita
+    qt5.qtbase qt5.qttools gimp gdk_pixbuf fftw zlib libjpeg libtiff libpng
+    opencv openexr graphicsmagick curl cairo krita
   ];
 
-  qmakeFlags = [ "HOST=krita" ];
+  cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;

From 24775df8d292f0f0ed91b92d8e8d8ae016879484 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 00:41:12 +0200
Subject: [PATCH 1887/3253] final cleaning

---
 pkgs/tools/graphics/gmic-qt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 0ee589783cde..b301ddaf0ff9 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita, gdk_pixbuf, cairo
-, fetchgit, withGimpPlugin ? true, gimp }:
+, curl, krita
+, fetchgit }:
 
 let
   version = "2.3.6";
@@ -60,15 +60,15 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools gimp gdk_pixbuf fftw zlib libjpeg libtiff libpng
-    opencv openexr graphicsmagick curl cairo krita
+    qt5.qtbase qt5.qttools fftw zlib libjpeg libtiff libpng
+    opencv openexr graphicsmagick curl krita
   ];
 
   cmakeFlags = [ "-DGMIC_QT_HOST=krita" ];
 
   installPhase = ''
     mkdir -p $out/bin;
-    install -Dm755 gmic-qt/gmic_krita_qt "$out/gmic_krita_qt"
+    install -Dm755 gmic_krita_qt "$out/bin/gmic_krita_qt"
   '';
 
   meta = with stdenv.lib; {

From c73048605ca1d199e82fd6761333bfbf679d0f4f Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Sat, 22 Sep 2018 21:20:08 +0700
Subject: [PATCH 1888/3253] pythonPackages.nixpkgs: init at 0.2.2

Allows to `from nixpkgs import` stuff in interactive Python sessions
---
 maintainers/maintainer-list.nix    |  5 +++++
 pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 216d6dac74ea..6593414d1b23 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3978,6 +3978,11 @@
     github = "sztupi";
     name = "Attila Sztupak";
   };
+  t184256 = {
+    email = "monk@unboiled.info";
+    github = "t184256";
+    name = "Alexander Sosedkin";
+  };
   tadfisher = {
     email = "tadfisher@gmail.com";
     github = "tadfisher";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20ba493da153..1234955638fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8247,6 +8247,24 @@ in {
     inherit (pkgs) which;
   };
 
+  nixpkgs = buildPythonPackage rec {
+    disabled = ! pythonAtLeast "3.5";
+    pname = "nixpkgs";
+    version = "0.2.2";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0gsrd99kkv99jsrh3hckz7ns1zwndi9vvh4465v4gnpz723dd6fj";
+    };
+    buildInputs = with self; [ pbr ];
+    propagatedBuildInputs = with self; [ pythonix ];
+    meta = {
+      description = "Allows to `from nixpkgs import` stuff in interactive Python sessions";
+      homepage = http://github.com/t184256/nixpkgs-python-importer;
+      license = licenses.mit;
+      maintainers = with maintainers; [ t184256 ];
+    };
+  };
+
   nodeenv = callPackage ../development/python-modules/nodeenv { };
 
   nose = buildPythonPackage rec {

From 30240a59fe5f6eecc61830ed9a0a588c91677e68 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 28 Sep 2018 09:34:37 +0200
Subject: [PATCH 1889/3253] steamPackages.steam: add udev rules

---
 pkgs/games/steam/steam.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index b8e1982a989f..d0b221c51339 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -25,6 +25,8 @@ in stdenv.mkDerivation rec {
       EOF
       chmod +x $out/bin/steamdeps
     ''}
+    install -d $out/lib/udev/rules.d
+    install -m644 lib/udev/rules.d/*.rules $out/lib/udev/rules.d
   '';
 
   meta = with stdenv.lib; {

From 5c45ca0943b170aa31e917288f1b0aaa9cbb2da1 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Fri, 28 Sep 2018 09:45:22 +0200
Subject: [PATCH 1890/3253] haskellPackages.term-rewriting: doJailbreak and
 dontCheck

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8beca9572e7e..5034aaee6336 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -999,6 +999,9 @@ self: super: {
     '';
   });
 
+  # https://github.com/haskell-rewriting/term-rewriting/issues/11
+  term-rewriting = dontCheck (doJailbreak super.term-rewriting);
+
   # https://github.com/nick8325/twee/pull/1
   twee-lib = dontHaddock super.twee-lib;
 

From f66ae2c8b20fd00853246cfd0a32fea0a7e06814 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 28 Sep 2018 03:15:59 -0500
Subject: [PATCH 1891/3253] libxcb: 1.13 -> 1.13.1 (#47450)

https://lists.freedesktop.org/archives/xcb/2018-September/011155.html
(cherry picked from commit b043a056a2cc6a4ab129ab1ce2bf7d4aa7d2ea69)
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 pkgs/servers/x11/xorg/extra.list  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c33997b72c84..b06f41226ed1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1136,11 +1136,11 @@ let
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
-    name = "libxcb-1.13";
+    name = "libxcb-1.13.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2;
-      sha256 = "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2;
+      sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 222a9f654266..3c45e6062e26 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,5 +1,5 @@
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
-http://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
+http://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2

From dd7de496d87c64f53508a1f461c1cb74551837b7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <offlinehacker@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:20:30 +0200
Subject: [PATCH 1892/3253] ansible: add dopy dependency for digitalocean
 integration (#47441)

---
 pkgs/tools/admin/ansible/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 11671aba633d..2b6877cb25f5 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -19,6 +19,8 @@ let
     '';
 
     postInstall = ''
+      wrapPythonProgramsIn "$out/bin" "$out $PYTHONPATH"
+
       for m in docs/man/man1/*; do
         install -vD $m -t $man/share/man/man1
       done
@@ -30,7 +32,7 @@ let
     dontPatchShebangs = false;
 
     propagatedBuildInputs = with py.pkgs; [
-      pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath
+      pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath dopy
     ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
     meta = with stdenv.lib; {

From 550fe159f0c13a0098bbbf6f76403c4a6ac23f36 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Fri, 28 Sep 2018 09:42:36 +0100
Subject: [PATCH 1893/3253] haskellPackages.generic-lens: apply patch to fix
 tests

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8beca9572e7e..fb1a68b149fc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1150,4 +1150,10 @@ self: super: {
     };
   };
 
+  # https://github.com/kcsongor/generic-lens/pull/60
+  generic-lens = appendPatch super.generic-lens (pkgs.fetchpatch {
+    url = https://github.com/kcsongor/generic-lens/commit/d9af1ec22785d6c21e928beb88fc3885c6f05bed.patch;
+    sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq";
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 35cf30bd8e85c11ffeb76ccf1fb23e38504628a0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:00:22 +0200
Subject: [PATCH 1894/3253] haskell-fgl: fix build with ghc-8.6.x

---
 .../configuration-ghc-8.6.x.nix               |  4 ++
 .../patches/fgl-monad-fail.patch              | 61 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/fgl-monad-fail.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index a60de8f95f8d..d3f1c8513cb0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -69,4 +69,8 @@ self: super: {
   tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 
+  # https://github.com/haskell/fgl/issues/79
+  # https://github.com/haskell/fgl/issues/81
+  fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch;
+
 }
diff --git a/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
new file mode 100644
index 000000000000..d0df9b774e48
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
@@ -0,0 +1,61 @@
+From 344a7e452630ace0f5c647e525e0299d99de5902 Mon Sep 17 00:00:00 2001
+From: Alex Washburn <github@recursion.ninja>
+Date: Mon, 20 Aug 2018 23:46:32 -0400
+Subject: [PATCH] Fixing issue with MonadFailDesugaring.
+
+---
+ .travis.yml                   |  9 +++++++++
+ Data/Graph/Inductive/Monad.hs | 14 ++++++++++++--
+ fgl.cabal                     |  3 ++-
+ 3 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index db5eeb1..f026dd1 100644
+--- a/Data/Graph/Inductive/Monad.hs
++++ b/Data/Graph/Inductive/Monad.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE MultiParamTypeClasses #-}
++{-# LANGUAGE CPP, MultiParamTypeClasses #-}
+ 
+ -- (c) 2002 by Martin Erwig [see file COPYRIGHT]
+ -- | Monadic Graphs
+@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad(
+ 
+ 
+ import Data.Graph.Inductive.Graph
++#if MIN_VERSION_base(4,12,0)
++import Control.Monad.Fail
++import Prelude hiding (fail)
++#endif
+ 
+ {-# ANN module "HLint: ignore Redundant lambda" #-}
+ 
+@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph
+ 
+ -- Monadic Graph
+ --
+-class (Monad m) => GraphM m gr where
++class
++#if MIN_VERSION_base(4,12,0)
++ (MonadFail m)
++#else
++ (Monad m)
++#endif
++  => GraphM m gr where
+   {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-}
+ 
+   emptyM     :: m (gr a b)
+diff --git a/fgl.cabal b/fgl.cabal
+index 4251a21..4b2a039 100644
+--- a/fgl.cabal
++++ b/fgl.cabal
+@@ -18,7 +18,8 @@ extra-source-files:
+                ChangeLog
+ 
+ tested-with:   GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3,
+-               GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.1.*
++               GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2,
++               GHC == 8.4.3, GHC == 8.6.1
+ 
+ source-repository head
+     type:         git

From 147c5da7bce4c556efec6e6f1ebc211d3f5f15e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:00:58 +0200
Subject: [PATCH 1895/3253] haskell-lens: disable test suite to fix build with
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index d3f1c8513cb0..da5eccc73a40 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -57,6 +57,7 @@ self: super: {
   primitive = self.primitive_0_6_4_0;
   tagged = self.tagged_0_8_6;
   unordered-containers = dontCheck super.unordered-containers;
+  lens = dontCheck super.lens;    # avoid depending on broken polyparse
 
   # Over-specified constraints.
   async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5

From b68e320e3a52c483f6cd2cfecd663e92d3746037 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:01:29 +0200
Subject: [PATCH 1896/3253] haskell-JuicyPixels: use latest version when
 building with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index da5eccc73a40..23865e54ba15 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -54,6 +54,8 @@ self: super: {
   hspec-discover = self.hspec-discover_2_5_7;
   hspec-meta = self.hspec-meta_2_5_6;
   hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  JuicyPixels = self.JuicyPixels_3_3_1;
+  polyparse = markBrokenVersion "1.12" super.polyparse;
   primitive = self.primitive_0_6_4_0;
   tagged = self.tagged_0_8_6;
   unordered-containers = dontCheck super.unordered-containers;
@@ -66,7 +68,6 @@ self: super: {
   hashable-time = doJailbreak super.hashable-time;           # base >=4.7 && <4.12
   integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
   optparse-applicative = doJailbreak super.optparse-applicative;   # https://github.com/pcapriotti/optparse-applicative/issues/319
-  polyparse = markBrokenVersion "1.12" super.polyparse;      # version 1.12 fails to compile
   tar = doJailbreak super.tar;                               # containers >=0.2 && <0.6
   test-framework = doJailbreak super.test-framework;         # containers >=0.1 && <0.6
 

From 9f660351a4e4f9b45aa1edd259380c2a9dfac034 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:02:20 +0200
Subject: [PATCH 1897/3253] haskell-Glob: use latest version when building with
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 23865e54ba15..9f4cc057c707 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -48,6 +48,7 @@ self: super: {
   contravariant = self.contravariant_1_5;
   doctest = self.doctest_0_16_0_1;
   doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
+  Glob = self.Glob_0_9_3;
   hspec = self.hspec_2_5_7;
   hspec-core = self.hspec-core_2_5_7;
   hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });

From 89223a9380da7a0a72957ee2b17c6632a8ed1ab5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:02:40 +0200
Subject: [PATCH 1898/3253] haskell-control-monad-free: mark broken when
 building with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 9f4cc057c707..8b3800964663 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -46,6 +46,7 @@ self: super: {
 
   # LTS-12.x versions do not compile.
   contravariant = self.contravariant_1_5;
+  control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
   doctest = self.doctest_0_16_0_1;
   doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
   Glob = self.Glob_0_9_3;

From bb5638e54af293ce72de8eba22f81388a42e3a75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:04:54 +0200
Subject: [PATCH 1899/3253] haskell-lens: put override into alphabetical order

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 8b3800964663..0f40265de361 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -57,11 +57,11 @@ self: super: {
   hspec-meta = self.hspec-meta_2_5_6;
   hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
   JuicyPixels = self.JuicyPixels_3_3_1;
+  lens = dontCheck super.lens;    # avoid depending on broken polyparse
   polyparse = markBrokenVersion "1.12" super.polyparse;
   primitive = self.primitive_0_6_4_0;
   tagged = self.tagged_0_8_6;
   unordered-containers = dontCheck super.unordered-containers;
-  lens = dontCheck super.lens;    # avoid depending on broken polyparse
 
   # Over-specified constraints.
   async = doJailbreak super.async;                           # base >=4.3 && <4.12, stm >=2.2 && <2.5

From 2c5e1c003a02e775ad3aeedb11b31b7246b5cbd7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Sep 2018 17:08:18 +0200
Subject: [PATCH 1900/3253] haskell-hslogger: use latest version when building
 with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 0f40265de361..27a82a20fb91 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -50,6 +50,8 @@ self: super: {
   doctest = self.doctest_0_16_0_1;
   doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
   Glob = self.Glob_0_9_3;
+  haddock-library = markBroken super.haddock-library;
+  hslogger = self.hslogger_1_2_12;
   hspec = self.hspec_2_5_7;
   hspec-core = self.hspec-core_2_5_7;
   hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });

From fd02cfd3ba0a437a265dc33a26cf0eab5521bac9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Sep 2018 02:31:31 +0200
Subject: [PATCH 1901/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/deb25ca30504442999ab210bb91e8e46587c6a0b.
---
 .../haskell-modules/hackage-packages.nix      | 414 ++++++++++++++----
 1 file changed, 318 insertions(+), 96 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ff6c3cd1ddc3..93e36fa78890 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -23426,6 +23426,8 @@ self: {
        pname = "alphachar";
        version = "0.0.3";
        sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx";
+       revision = "1";
+       editedCabalFile = "06pnq2fvz02i6dhx2rq1p63jp3pqvxy15n2vs6696ry5mkq1zjkc";
        libraryHaskellDepends = [ base lens parsers semigroups ];
        testHaskellDepends = [
          ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty
@@ -29225,41 +29227,40 @@ self: {
      }) {};
 
   "asif" = callPackage
-    ({ mkDerivation, arbor-ip, attoparsec, base, binary, bytestring
-     , conduit, conduit-combinators, conduit-extra, containers, cpu
-     , directory, either, exceptions, generic-lens, hedgehog, hspec
-     , hw-bits, hw-hspec-hedgehog, iproute, lens, old-locale
+    ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+     , conduit-combinators, conduit-extra, containers, cpu, directory
+     , either, exceptions, generic-lens, hedgehog, hspec, hw-bits
+     , hw-hspec-hedgehog, hw-ip, iproute, lens, old-locale
      , optparse-applicative, resourcet, temporary-resourcet, text, thyme
      , vector
      }:
      mkDerivation {
        pname = "asif";
-       version = "2.0.0";
-       sha256 = "1wp3g3nmymw9zkfyhi2jc7qqcb14v9pp788xg77acsx4i83ca5fm";
+       version = "3.0.0";
+       sha256 = "01ic071i7cgc888xqdjjq3srihnjxcqx33f9m97ilsp7dxi7a03q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base binary bytestring conduit conduit-combinators
          conduit-extra containers cpu either exceptions generic-lens hw-bits
-         iproute lens old-locale resourcet temporary-resourcet text thyme
-         vector
+         hw-ip iproute lens old-locale resourcet temporary-resourcet text
+         thyme vector
        ];
        executableHaskellDepends = [
          attoparsec base binary bytestring conduit conduit-combinators
          conduit-extra containers cpu directory either exceptions
-         generic-lens hw-bits iproute lens old-locale optparse-applicative
-         resourcet temporary-resourcet text thyme vector
+         generic-lens hw-bits hw-ip iproute lens old-locale
+         optparse-applicative resourcet temporary-resourcet text thyme
+         vector
        ];
        testHaskellDepends = [
-         arbor-ip attoparsec base binary bytestring conduit
-         conduit-combinators conduit-extra containers cpu either exceptions
-         generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog iproute lens
+         attoparsec base binary bytestring conduit conduit-combinators
+         conduit-extra containers cpu either exceptions generic-lens
+         hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens
          old-locale resourcet temporary-resourcet text thyme vector
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {arbor-ip = null;};
+     }) {};
 
   "asil" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
@@ -32097,28 +32098,29 @@ self: {
 
   "axel" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
-     , haskell-src-exts, hedgehog, lens, lens-aeson, mtl
-     , optparse-applicative, parsec, process, regex-pcre, split, strict
-     , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec
-     , template-haskell, text, transformers, typed-process, vector, yaml
+     , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson
+     , optparse-applicative, parsec, process, regex-pcre, singletons
+     , split, strict, tasty, tasty-discover, tasty-golden
+     , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers
+     , typed-process, vector, yaml
      }:
      mkDerivation {
        pname = "axel";
-       version = "0.0.5";
-       sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq";
-       revision = "1";
-       editedCabalFile = "0cyygds6277zbm01b8x7sx700c83z20hdimlnk4wzhm1v2zya3a4";
+       version = "0.0.6";
+       sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath haskell-src-exts lens lens-aeson
-         mtl optparse-applicative parsec process regex-pcre strict text
-         transformers typed-process vector yaml
+         base bytestring directory filepath freer-simple haskell-src-exts
+         lens lens-aeson optparse-applicative parsec process regex-pcre
+         singletons strict text typed-process vector yaml
+       ];
+       executableHaskellDepends = [
+         base freer-simple optparse-applicative
        ];
-       executableHaskellDepends = [ base mtl optparse-applicative ];
        testHaskellDepends = [
-         base bytestring filepath hedgehog lens mtl split tasty
+         base bytestring filepath freer-simple hedgehog lens split tasty
          tasty-discover tasty-golden tasty-hedgehog tasty-hspec
          template-haskell transformers
        ];
@@ -38684,6 +38686,8 @@ self: {
        pname = "boring";
        version = "0.1";
        sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk";
+       revision = "1";
+       editedCabalFile = "0hdvr4rkkj2mapqha335rhncfmrw70qzjmfis2w9l4iqx617fv9m";
        libraryHaskellDepends = [
          adjunctions base base-compat constraints fin generics-sop streams
          tagged transformers transformers-compat vec
@@ -42363,6 +42367,59 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cachix_0_1_2" = callPackage
+    ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
+     , bifunctors, bytestring, cachix-api, conduit, conduit-extra
+     , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
+     , here, hspec, hspec-discover, http-client, http-client-tls
+     , http-conduit, http-types, lzma-conduit, megaparsec, memory
+     , mmorph, optparse-applicative, process, protolude, resourcet
+     , safe-exceptions, servant, servant-auth, servant-auth-client
+     , servant-client, servant-client-core, servant-streaming-client
+     , streaming, text, unix, uri-bytestring, versions
+     }:
+     mkDerivation {
+       pname = "cachix";
+       version = "0.1.2";
+       sha256 = "1pm2cjlllg1sq7vkig8lr9y1gsxa9w4h61rzq47w1mnhn476gv67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
+         directory ed25519 filepath fsnotify here http-client
+         http-client-tls http-conduit http-types lzma-conduit megaparsec
+         memory mmorph optparse-applicative process protolude resourcet
+         safe-exceptions servant servant-auth servant-auth-client
+         servant-client servant-client-core servant-streaming-client
+         streaming text unix uri-bytestring versions
+       ];
+       executableHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
+         directory ed25519 filepath fsnotify here http-client
+         http-client-tls http-conduit http-types lzma-conduit megaparsec
+         memory mmorph optparse-applicative process protolude resourcet
+         safe-exceptions servant servant-auth servant-auth-client
+         servant-client servant-client-core servant-streaming-client
+         streaming text unix uri-bytestring versions
+       ];
+       executableToolDepends = [ hspec-discover ];
+       testHaskellDepends = [
+         async base base16-bytestring base64-bytestring bifunctors
+         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
+         directory ed25519 filepath fsnotify here hspec http-client
+         http-client-tls http-conduit http-types lzma-conduit megaparsec
+         memory mmorph optparse-applicative process protolude resourcet
+         safe-exceptions servant servant-auth servant-auth-client
+         servant-client servant-client-core servant-streaming-client
+         streaming text unix uri-bytestring versions
+       ];
+       description = "Command line client for Nix binary cache hosting https://cachix.org";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cachix-api" = callPackage
     ({ mkDerivation, aeson, amazonka, base, base16-bytestring
      , bytestring, conduit, conduit-combinators, cookie, cryptonite
@@ -42405,6 +42462,47 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "cachix-api_0_1_0_2" = callPackage
+    ({ mkDerivation, aeson, amazonka, base, base16-bytestring
+     , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
+     , http-api-data, http-media, lens, memory, protolude, servant
+     , servant-auth, servant-auth-server, servant-auth-swagger
+     , servant-streaming, servant-swagger, servant-swagger-ui-core
+     , string-conv, swagger2, text, transformers
+     }:
+     mkDerivation {
+       pname = "cachix-api";
+       version = "0.1.0.2";
+       sha256 = "0jqak93ixqzr76lm0mgn9fqfsmkz1ik41j5l629d3hbl7sah15gn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit cookie
+         cryptonite http-api-data http-media lens memory servant
+         servant-auth servant-auth-server servant-auth-swagger
+         servant-streaming servant-swagger servant-swagger-ui-core
+         string-conv swagger2 text transformers
+       ];
+       executableHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit cookie
+         cryptonite http-api-data http-media lens memory servant
+         servant-auth servant-auth-server servant-auth-swagger
+         servant-streaming servant-swagger servant-swagger-ui-core
+         string-conv swagger2 text transformers
+       ];
+       testHaskellDepends = [
+         aeson amazonka base base16-bytestring bytestring conduit cookie
+         cryptonite hspec http-api-data http-media lens memory protolude
+         servant servant-auth servant-auth-server servant-auth-swagger
+         servant-streaming servant-swagger servant-swagger-ui-core
+         string-conv swagger2 text transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Servant HTTP API specification for https://cachix.org";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cacophony" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , bytestring, criterion, cryptonite, deepseq, directory, exceptions
@@ -43821,18 +43919,15 @@ self: {
      }) {};
 
   "cassava-megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, cassava, containers, hspec
-     , hspec-megaparsec, megaparsec, unordered-containers, vector
+    ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec
+     , megaparsec, unordered-containers, vector
      }:
      mkDerivation {
        pname = "cassava-megaparsec";
-       version = "1.0.0";
-       sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28";
-       revision = "1";
-       editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6";
+       version = "2.0.0";
+       sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf";
        libraryHaskellDepends = [
-         base bytestring cassava containers megaparsec unordered-containers
-         vector
+         base bytestring cassava megaparsec unordered-containers vector
        ];
        testHaskellDepends = [
          base bytestring cassava hspec hspec-megaparsec vector
@@ -51230,6 +51325,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-algorithms_0_0_8_2" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, 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.8.2";
+       sha256 = "1s423n2hybxdsady7spi4iy9s5lm07dsl0rjxn400y09faizm5x8";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra 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 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 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 {
@@ -60944,8 +61075,8 @@ self: {
      }:
      mkDerivation {
        pname = "dense-int-set";
-       version = "0.1.5";
-       sha256 = "0xhr7iyhh38nipqb0dkxflh4xr5a10i8zsf8vv11pfqy62irhj6g";
+       version = "0.2";
+       sha256 = "02gfghbpgfcr8vnbahz9y025cb5cvh4ns5xwz9gavpbi8vbcbyv9";
        libraryHaskellDepends = [
          base cereal cereal-vector deferred-folds hashable vector
          vector-algorithms
@@ -72280,8 +72411,8 @@ self: {
        pname = "exitcode";
        version = "0.1.0.1";
        sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
-       revision = "1";
-       editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z";
+       revision = "2";
+       editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9";
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids semigroups transformers
        ];
@@ -116148,37 +116279,37 @@ self: {
      }) {};
 
   "hw-dsv" = callPackage
-    ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion
-     , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits
+    ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava
+     , criterion, deepseq, directory, ghc-prim, hedgehog, hspec, hw-bits
      , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base
-     , lens, mmap, optparse-applicative, resourcet, text, vector, weigh
+     , hw-simd, lens, mmap, optparse-applicative, resourcet, text
+     , vector, weigh
      }:
      mkDerivation {
        pname = "hw-dsv";
-       version = "0.2.1";
-       sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
-       revision = "1";
-       editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04";
+       version = "0.3.0";
+       sha256 = "0cpnzf8f4mk28jpxx66q8mv0gm3rassjp48r17hwzkalvw3ng3ni";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
-         hw-rankselect-base vector
+         base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim
+         hw-rankselect hw-rankselect-base hw-simd vector
        ];
+       libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [
-         base bits-extra bytestring deepseq hedgehog hw-bits hw-prim
-         hw-rankselect hw-rankselect-base lens optparse-applicative
-         resourcet vector
+         base bits-extra bytestring deepseq ghc-prim hedgehog hw-bits
+         hw-prim hw-rankselect hw-rankselect-base hw-simd lens
+         optparse-applicative resourcet vector
        ];
        testHaskellDepends = [
-         base bits-extra bytestring cassava deepseq directory hedgehog hspec
-         hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base
-         text vector weigh
+         base bits-extra bytestring cassava deepseq directory ghc-prim
+         hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect
+         hw-rankselect-base hw-simd text vector weigh
        ];
-       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bits-extra bytestring cassava criterion deepseq directory
-         hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector
+         ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd
+         mmap vector
        ];
        description = "Unbelievably fast streaming DSV file parser";
        license = stdenv.lib.licenses.bsd3;
@@ -116310,14 +116441,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-ip_0_2_1_0" = callPackage
+  "hw-ip_0_2_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
      , hw-bits, hw-hspec-hedgehog, text
      }:
      mkDerivation {
        pname = "hw-ip";
-       version = "0.2.1.0";
-       sha256 = "09qfimmf8dsp1pf0vxjpf5v9ih8rk414jkh50inc83zygzp9if29";
+       version = "0.2.1.1";
+       sha256 = "1vcg2n0ar5j5w02caswjxi549qfkgy7p63vfasbq3a8w3d109931";
        libraryHaskellDepends = [
          attoparsec base generic-lens hw-bits text
        ];
@@ -128774,8 +128905,8 @@ self: {
        pname = "language-c";
        version = "0.8.1";
        sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
-       revision = "1";
-       editedCabalFile = "087h653v6074ax47hr3pqnp78jrs7as9hqfrjyf97m5i5c49fi9l";
+       revision = "2";
+       editedCabalFile = "08h8a747k68nbv2mmbjlq2y2pqs738v8z54glrrh94963b2bh4h1";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process syb
@@ -128794,6 +128925,8 @@ self: {
        pname = "language-c";
        version = "0.8.2";
        sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp";
+       revision = "1";
+       editedCabalFile = "1xg49j4bykgdm6l14m65wyz8r3s4v4dqc7a9zjcsr12ffkiv8nam";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process syb
@@ -131124,6 +131257,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family_1_2_3" = callPackage
+    ({ mkDerivation, base, containers, lens-family-core, mtl
+     , transformers
+     }:
+     mkDerivation {
+       pname = "lens-family";
+       version = "1.2.3";
+       sha256 = "0a8fvvc3fsi5fzk5bnqvbgdz22xvvw55nyfac6411q0pm6vy4nc0";
+       libraryHaskellDepends = [
+         base containers lens-family-core mtl transformers
+       ];
+       description = "Lens Families";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-family-core" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -131135,6 +131284,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-family-core_1_2_3" = callPackage
+    ({ mkDerivation, base, containers, transformers }:
+     mkDerivation {
+       pname = "lens-family-core";
+       version = "1.2.3";
+       sha256 = "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi";
+       libraryHaskellDepends = [ base containers transformers ];
+       description = "Haskell 98 Lens Families";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-family-th" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -157959,6 +158120,8 @@ self: {
        pname = "passman-cli";
        version = "0.2.0.0";
        sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8";
+       revision = "1";
+       editedCabalFile = "197mlc2v7azdgdnvr2pxm2whhpqj4v2czwn5vi6ksrax82xswcnc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -157972,25 +158135,23 @@ self: {
 
   "passman-core" = callPackage
     ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit
-     , conduit-extra, containers, cryptohash-md5, csv-conduit
-     , data-ordlist, directory, filepath, int-cast, memory, QuickCheck
-     , quickcheck-unicode, resourcet, template-haskell, temporary, text
+     , containers, cryptohash-md5, csv-conduit, data-ordlist, directory
+     , filepath, int-cast, memory, QuickCheck, quickcheck-instances
+     , quickcheck-unicode, template-haskell, temporary, text
      , unix-compat, yaml
      }:
      mkDerivation {
        pname = "passman-core";
-       version = "0.2.0.0";
-       sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7";
-       revision = "1";
-       editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x";
+       version = "0.2.0.1";
+       sha256 = "1j258waghli2ahg25ihc13qjwz8zmy6ppld0y6sz3jphpg2azybs";
        libraryHaskellDepends = [
-         aeson base bcrypt bytestring conduit conduit-extra containers
-         cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast
-         memory resourcet text unix-compat yaml
+         aeson base bcrypt bytestring conduit containers cryptohash-md5
+         csv-conduit data-ordlist directory filepath int-cast memory text
+         unix-compat yaml
        ];
        testHaskellDepends = [
-         async base conduit filepath QuickCheck quickcheck-unicode
-         template-haskell temporary text yaml
+         async base conduit filepath QuickCheck quickcheck-instances
+         quickcheck-unicode template-haskell temporary text yaml
        ];
        doHaddock = false;
        description = "Deterministic password generator core";
@@ -175664,20 +175825,20 @@ self: {
 
   "registry" = callPackage
     ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
-     , io-memoize, protolude, resourcet, tasty, tasty-discover
-     , tasty-hedgehog, tasty-th, text, transformers-base
+     , io-memoize, MonadRandom, protolude, random, resourcet, tasty
+     , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base
      }:
      mkDerivation {
        pname = "registry";
-       version = "0.1.0.5";
-       sha256 = "0yqv58ra2h7cmnwvbpbdxma69qr1n44gw8mckrr0sq38rah9dxg3";
+       version = "0.1.1.0";
+       sha256 = "0in2kb12848g4ggph2m2h2csc3j0jg9572vi25pdlvr5xrlvxm0m";
        libraryHaskellDepends = [
          base exceptions protolude resourcet text transformers-base
        ];
        testHaskellDepends = [
-         async base exceptions hedgehog hedgehog-corpus io-memoize protolude
-         resourcet tasty tasty-discover tasty-hedgehog tasty-th text
-         transformers-base
+         async base exceptions hedgehog hedgehog-corpus io-memoize
+         MonadRandom protolude random resourcet tasty tasty-discover
+         tasty-hedgehog tasty-th text transformers-base
        ];
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling \"components\"";
@@ -176111,6 +176272,8 @@ self: {
        pname = "relude";
        version = "0.3.0";
        sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j";
+       revision = "1";
+       editedCabalFile = "04jfgc38pwrqir1j91l8jfzsp0hzggxr7kmbnfqcgrlpqidpj7mh";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable mtl stm text
          transformers unordered-containers utf8-string
@@ -178188,14 +178351,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "rhine_0_5_0_0" = callPackage
+  "rhine_0_5_0_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, dunai, free, time
      , transformers, vector-sized
      }:
      mkDerivation {
        pname = "rhine";
-       version = "0.5.0.0";
-       sha256 = "0cc4f51h9plgd790ix1skja3k06dzc55rqhv17521vb9cw0k2lzy";
+       version = "0.5.0.1";
+       sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23";
        libraryHaskellDepends = [
          base containers deepseq dunai free time transformers vector-sized
        ];
@@ -178208,8 +178371,8 @@ self: {
     ({ mkDerivation, base, dunai, gloss, rhine }:
      mkDerivation {
        pname = "rhine-gloss";
-       version = "0.5.0.0";
-       sha256 = "1hhn23lxcdck0h124i1k2fhrn184ih9v8jpf6yhrin6arwbzpchx";
+       version = "0.5.0.1";
+       sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base dunai gloss rhine ];
@@ -184141,8 +184304,8 @@ self: {
        pname = "separated";
        version = "0.3.2.1";
        sha256 = "0xnpxaz9qr2qqg7kmgv1qsbd4943r54m1vva3xivn4cxf1gnxcaw";
-       revision = "1";
-       editedCabalFile = "0d0721vf4lcixbrm24jlrvjjc1m1w1638ds7pkgz7hy4armznik1";
+       revision = "2";
+       editedCabalFile = "1q501zsxf5kl65aqp8cdaxj2y61jq3480r31cnr81w14ikrd5wdy";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors deriving-compat lens semigroupoids semigroups
@@ -187481,6 +187644,8 @@ self: {
        pname = "shake-ats";
        version = "1.10.0.1";
        sha256 = "1p95r4ksfrb4hs9v75iq9iz565qz43k3cw63sz32nphqn204dbxz";
+       revision = "1";
+       editedCabalFile = "0x23r58i4yhf9rcaxfdy09nr93cpkr0cmxrwcn11hgcr1nkzaa0d";
        libraryHaskellDepends = [
          base binary dependency directory hs2ats language-ats microlens
          shake shake-c shake-cabal shake-ext text
@@ -187507,8 +187672,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-cabal";
-       version = "0.1.0.5";
-       sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s";
+       version = "0.2.0.0";
+       sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555";
        libraryHaskellDepends = [
          base Cabal composition-prelude directory filepath shake
        ];
@@ -190761,15 +190926,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slave-thread_1_0_2_1" = callPackage
+  "slave-thread_1_0_2_2" = callPackage
     ({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, rerebase
      , SafeSemaphore, stm-containers, transformers
      }:
      mkDerivation {
        pname = "slave-thread";
-       version = "1.0.2.1";
-       sha256 = "1bnx07zy89ym45bs1dhnwgxls7jz8yv64j5j0wsym3qqzqdk04dh";
+       version = "1.0.2.2";
+       sha256 = "1jf8n989gsxbqkyxj8kd523dxp5bxs9cs4s6jd4j95mvij6pgpgl";
        libraryHaskellDepends = [
          base deferred-folds foldl mmorph partial-handler stm-containers
          transformers
@@ -197306,6 +197471,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stm-conduit_4_0_1" = callPackage
+    ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
+     , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
+     , QuickCheck, resourcet, stm, stm-chans, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
+     , unliftio
+     }:
+     mkDerivation {
+       pname = "stm-conduit";
+       version = "4.0.1";
+       sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8";
+       libraryHaskellDepends = [
+         async base cereal cereal-conduit conduit conduit-extra directory
+         exceptions monad-loops resourcet stm stm-chans transformers
+         unliftio
+       ];
+       testHaskellDepends = [
+         base conduit directory doctest HUnit QuickCheck resourcet stm
+         stm-chans test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers unliftio
+       ];
+       description = "Introduces conduits to channels, and promotes using conduits concurrently";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-containers" = callPackage
     ({ mkDerivation, async, base, base-prelude, containers, criterion
      , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
@@ -200416,8 +200607,8 @@ self: {
        pname = "sv";
        version = "1.2";
        sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
-       revision = "1";
-       editedCabalFile = "14cs2wh9g0hq48rb8ngxhyw9bindm23c9xbw4w2nayh1j4db5a76";
+       revision = "2";
+       editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -216016,6 +216207,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unliftio-streams" = callPackage
+    ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio-streams";
+       version = "0.1.0.0";
+       sha256 = "0ylyk1g00isqzr7nbhrkf3m0yc36lfjb020lb1ip4s3ymlvkkp22";
+       libraryHaskellDepends = [
+         base bytestring io-streams text unliftio-core
+       ];
+       description = "Generalization of io-streams to MonadUnliftIO";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "unlit" = callPackage
     ({ mkDerivation, base, directory, text }:
      mkDerivation {
@@ -218771,6 +218976,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vector-extras" = callPackage
+    ({ mkDerivation, base, containers, deferred-folds, hashable
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "vector-extras";
+       version = "0.2";
+       sha256 = "0c0wq7ymjhfhxdwkgjd7iwp4vb22495ajrv2ddq6iihc4svakzlw";
+       libraryHaskellDepends = [
+         base containers deferred-folds hashable unordered-containers vector
+       ];
+       description = "Utilities for the \"vector\" library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "vector-fftw" = callPackage
     ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
      mkDerivation {
@@ -227291,6 +227511,8 @@ self: {
        pname = "xmonad-contrib";
        version = "0.14";
        sha256 = "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y";
+       revision = "2";
+       editedCabalFile = "0412lfkq9y2s7avzm7ajx5fmyacqrad3yzv9cz9xp5dg66dn5h60";
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl old-locale old-time process random semigroups unix utf8-string

From d994f1cfd4d9e04fc45e40f911b1d72b786d5d03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Sep 2018 11:15:36 +0200
Subject: [PATCH 1902/3253] git-annex: update sha256 for new version 6.20180926

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d01c1e8a6c5c..40bd4a7f0c9a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs";
+      sha256 = "09rhss1s6gxmqvb8k2l0f55mv38igyvikmm6d07zxkw6049q3maz";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From ddeeade148809080087b5f477ba37546993ba247 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Fri, 28 Sep 2018 11:34:56 +0200
Subject: [PATCH 1903/3253] octave: 4.2.2 -> 4.4.1 (#47391)

---
 pkgs/development/interpreters/octave/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f6bd96af40f5..cbe919c70929 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.2.2";
+  version = "4.4.1";
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.gz";
-    sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p";
+    sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
@@ -46,17 +46,15 @@ stdenv.mkDerivation rec {
     substituteInPlace libinterp/corefcn/help.cc \
       --replace 'Vmakeinfo_program = "makeinfo"' \
                 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
-  ''
-  # REMOVE ON VERSION BUMP
-  # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234
-  + stdenv.lib.optionalString stdenv.isDarwin ''
-    sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
   '';
 
   doCheck = !stdenv.isDarwin;
 
   enableParallelBuilding = true;
 
+  # See https://savannah.gnu.org/bugs/?50339
+  F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
+
   configureFlags =
     [ "--enable-readline"
       "--enable-dl"
@@ -82,6 +80,7 @@ stdenv.mkDerivation rec {
     homepage = http://octave.org/;
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [raskin];
+    description = "Scientific Pragramming Language";
     platforms = if overridePlatforms == null then
       (with stdenv.lib.platforms; linux ++ darwin)
     else overridePlatforms;

From f0e4b31eb2035dfbbb6cb419584141f709579969 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 28 Sep 2018 11:52:39 +0200
Subject: [PATCH 1904/3253] linuxPackages.jool: 3.5.7 -> unstable-20180706
 (#47284)

3.5.7 doesn't build with kernel 4.14.71.
Needs most recent upstream revision to build, which supports
kernels up to 4.17.
---
 pkgs/os-specific/linux/jool/default.nix | 2 +-
 pkgs/os-specific/linux/jool/source.nix  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 84a621e7f120..d65be175fc1d 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, kernel }:
 
-assert stdenv.lib.versionOlder kernel.version "4.17";
+assert stdenv.lib.versionOlder kernel.version "4.18";
 
 let
   sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index f15b91f9f142..24134b8b8182 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub }:
 
 rec {
-  version = "3.5.7";
+  version = "unstable-20180706";
   src = fetchFromGitHub {
     owner = "NICMx";
     repo = "Jool";
-    rev = "v${version}";
-    sha256 = "1qxhrchhm4lbyxkp6wm47a85aa4d9wlyy3kdijl8rarngvh8j1yx";
+    rev = "de791931d94e972c36bb3c102a9cadab5230c285";
+    sha256 = "09mr7lc9k17znpslsfmndx4vgl240llcgblxm92fizmwz23y1d6c";
   };
 }

From d6e3db44cf09d04f0a3cd5b7ccb4a5dc3b7bfaa9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 26 Sep 2018 22:17:14 +0300
Subject: [PATCH 1905/3253] Add ssh backdoor to VM tests infrastructure.

Thanks to @dezgeg for prototype implementation, I've
cleaned it up and added documentation.
---
 .../development/debugging-nixos-tests.xml     | 36 +++++++++++++++++++
 nixos/doc/manual/development/nixos-tests.xml  |  1 +
 nixos/lib/test-driver/Machine.pm              |  6 ++--
 .../modules/testing/test-instrumentation.nix  |  3 +-
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 nixos/doc/manual/development/debugging-nixos-tests.xml

diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml
new file mode 100644
index 000000000000..0adf1293f7a3
--- /dev/null
+++ b/nixos/doc/manual/development/debugging-nixos-tests.xml
@@ -0,0 +1,36 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-debugging-nixos-tests">
+ <title>Debugging NixOS tests</title>
+
+ <para>
+  Tests may fail and infrastructure offers access to inspect machine state.
+ </para>
+
+ <para>
+  To prevent test from stopping and cleaning up, insert a sleep command:
+ </para>
+
+<programlisting>
+$machine->succeed("sleep 84000");
+</programlisting>
+
+ <para>
+  As soon as machine starts run as root:
+ </para>
+
+<programlisting>
+nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor"
+</programlisting>
+
+ <para>
+  You may need to find the correct path, replacing <literal>/tmp</literal>, <literal>*</literal> or <literal>machine</literal>.
+ </para>
+
+ <para>
+  Press "enter" to open up console and login as "root". After you're done, press "ctrl-q" to exit the console.
+ </para>
+ 
+</section>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index 2695082e3867..d068887200a9 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
  <xi:include href="writing-nixos-tests.xml" />
  <xi:include href="running-nixos-tests.xml" />
  <xi:include href="running-nixos-tests-interactively.xml" />
+ <xi:include href="debugging-nixos-tests.xml" />
 </chapter>
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index b18f48464cee..a00fe25c2b8e 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -155,8 +155,10 @@ sub start {
         $ENV{USE_TMPDIR} = 1;
         $ENV{QEMU_OPTS} =
             ($self->{allowReboot} ? "" : "-no-reboot ") .
-            "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
-            "-device virtio-serial -device virtconsole,chardev=shell " .
+            "-monitor unix:./monitor " .
+            "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " .
+            # socket backdoor, see "Debugging NixOS tests" section in NixOS manual
+            "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " .
             "-device virtio-rng-pci " .
             ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
         chdir $self->{stateDir} or die;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index ed4cfa7805e2..aa0db4afd978 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -55,7 +55,8 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
     systemd.services."serial-getty@hvc0".enable = false;
 
     # Only use a serial console, no TTY.
-    virtualisation.qemu.consoles = [ qemuSerialDevice ];
+    # hvc1: socket backdoor, see "Debugging NixOS tests" section in NixOS manual
+    virtualisation.qemu.consoles = [ "hvc1" qemuSerialDevice ];
 
     boot.initrd.preDeviceCommands =
       ''

From 50636fda52160a62d213055492d0cde0e6c9598b Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Fri, 28 Sep 2018 11:54:06 +0200
Subject: [PATCH 1906/3253] pythonPackages.flask-jwt-extended: init at 3.13.1

---
 .../flask-jwt-extended/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-jwt-extended/default.nix

diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix
new file mode 100644
index 000000000000..b14ec9e3eb2a
--- /dev/null
+++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, flask, pyjwt, werkzeug, pytest }:
+
+buildPythonPackage rec {
+  pname = "Flask-JWT-Extended";
+  version = "3.13.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10qz3ljr2kpd93al2km6iijxp23z33kvvwd0y5bc840f86b4mra8";
+  };
+
+  propagatedBuildInputs = [ flask pyjwt werkzeug ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest tests/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "JWT extension for Flask";
+    homepage = https://flask-jwt-extended.readthedocs.io/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ gerschtli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12485237a7ac..269eafccb973 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5278,6 +5278,8 @@ in {
 
   flask_elastic = callPackage ../development/python-modules/flask-elastic { };
 
+  flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { };
+
   flask-limiter = callPackage ../development/python-modules/flask-limiter { };
 
   flask_login = callPackage ../development/python-modules/flask-login { };

From f14d4ba112236afaa246adf68fe528a155f4b8a9 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Fri, 28 Sep 2018 11:55:36 +0200
Subject: [PATCH 1907/3253] pythonPackages.flask_sqlalchemy: 2.1 -> 2.3.2

---
 .../flask-sqlalchemy/default.nix              | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +------------
 2 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/flask-sqlalchemy/default.nix

diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
new file mode 100644
index 000000000000..aa7b40675b89
--- /dev/null
+++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, flask, sqlalchemy, pytest }:
+
+buildPythonPackage rec {
+  pname = "Flask-SQLAlchemy";
+  version = "2.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0lvfynbk9y0whpkhqz7kf3hk342sfa3lwqyv25gnb22q5f2vjwar";
+  };
+
+  propagatedBuildInputs = [ flask sqlalchemy ];
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "SQLAlchemy extension for Flask";
+    homepage = http://flask-sqlalchemy.pocoo.org/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ gerschtli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12485237a7ac..1b78b61c1931 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5306,23 +5306,7 @@ in {
 
   flask-silk = callPackage ../development/python-modules/flask-silk { };
 
-  flask_sqlalchemy = buildPythonPackage rec {
-    name = "Flask-SQLAlchemy-${version}";
-    version = "2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-SQLAlchemy/${name}.tar.gz";
-      sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
-    };
-
-    propagatedBuildInputs = with self ; [ flask sqlalchemy ];
-
-    meta = {
-      description = "SQLAlchemy extension for Flask";
-      homepage = http://flask-sqlalchemy.pocoo.org/;
-      license = licenses.bsd3;
-    };
-  };
+  flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
 
   flask_testing = callPackage ../development/python-modules/flask-testing { };
 

From eeac44c81a4408b022839f955f8ec2ec5f49c2d1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 28 Sep 2018 09:57:26 +0000
Subject: [PATCH 1908/3253] retroshare: mark as broken (#47350)

Broken by libupnp: 1.6.21 -> 1.8.3 (#41684).
---
 pkgs/applications/networking/p2p/retroshare/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index 34b4780633b8..2d523cc07dd9 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
+    broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684)
   };
 }

From f03001111779b25617272fce1391a72f26361686 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Fri, 28 Sep 2018 00:01:18 -1000
Subject: [PATCH 1909/3253] added dysinger as a maintainer

Signed-off-by: Tim Dysinger <tim@dysinger.net>
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5ae4e1209ca2..d193c46b12c3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1135,6 +1135,11 @@
     github = "dtzWill";
     name = "Will Dietz";
   };
+  dysinger = {
+    email = "tim@dysinger.net";
+    github = "dysinger";
+    name = "Tim Dysinger";
+  };
   dywedir = {
     email = "dywedir@protonmail.ch";
     github = "dywedir";

From c917407575edab32c695c23c972fb4a85d795196 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Sep 2018 12:09:50 +0200
Subject: [PATCH 1910/3253] haskell-texmath: patch to fix build with ghc-8.6.x

---
 .../development/haskell-modules/configuration-ghc-8.6.x.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 27a82a20fb91..dbe3bafc41b3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -79,4 +79,10 @@ self: super: {
   # https://github.com/haskell/fgl/issues/81
   fgl = appendPatch super.fgl ./patches/fgl-monad-fail.patch;
 
+  # https://github.com/jgm/texmath/pull/121
+  texmath = appendPatch (doJailbreak super.texmath) (pkgs.fetchpatch
+            { url = https://github.com/jgm/texmath/pull/121.patch;
+              sha256 = "14pz2cpz9rvmy7mlmnz8iz76rsdyv5v442ij2i8k9zrbxj6nai7l";
+            });
+
 }

From aa69bb5743069f62204433aaa493861bea53755f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Sep 2018 21:46:31 +0100
Subject: [PATCH 1911/3253] systemd: don't restart user-runtime-dir@ on
 upgrades

Likewise logind we should not try to restart this service after upgrade,
the user's current session depends on it.
---
 nixos/modules/system/boot/systemd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 12e029ae57f8..3ac4c02b61f5 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -886,6 +886,9 @@ in
     #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
     systemd.services.systemd-logind.restartIfChanged = false;
     systemd.services.systemd-logind.stopIfChanged = false;
+    # The user-runtime-dir@ service is managed by systemd-logind we should not touch it or else we break the users' sessions.
+    systemd.services."user-runtime-dir@".stopIfChanged = false;
+    systemd.services."user-runtime-dir@".restartIfChanged = false;
     systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ];
     systemd.services.systemd-journald.stopIfChanged = false;
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;

From 059286da56d4b4dbf5dd10bb7427b52e19daf460 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 13:40:46 +0200
Subject: [PATCH 1912/3253] moving stuff around

---
 pkgs/tools/graphics/gmic-qt/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index b301ddaf0ff9..65b88b4b15a3 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -6,8 +6,6 @@
 let
   version = "2.3.6";
 
-  gmic-version = "2.3.6";
-
 in stdenv.mkDerivation rec {
   name = "gmic-qt-${version}";
 
@@ -51,10 +49,13 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
+    cd gmic_qt
+  '';
+
+  preConfigure = ''
     cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
 
     make -C gmic/src CImg.h gmic_stdlib.h
-    cd gmic_qt
   '';
 
   nativeBuildInputs = [ cmake pkgconfig ];

From f309440ee3b6830fd886f824be81b0fecfba52fc Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 28 Sep 2018 11:25:32 +0200
Subject: [PATCH 1913/3253] doc: Update section about imperative containers

Nix commands inside the container have been broken since 18.03,
and no fix is yet in sight.  Lets remove from the documentation
that this is a usecase that we support, as it doesn't seem
likely that this will be fixed before 18.09 either.

See #40355
---
 .../administration/imperative-containers.xml  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 9bb62bc2ece9..cfd0e5c172b1 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  There are several ways to change the configuration of the container. First,
-  on the host, you can edit
+  To change the configuration of the container, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -87,7 +86,16 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <xref linkend="opt-services.httpd.enable"/> = true;
   <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
   <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
-'
+  '
+
+  <para>
+    Note that in previous versions of NixOS (17.09 and earlier) one could
+    also use all nix-related commands (like <command>nixos-rebuild switch</command>) 
+    from inside the container. However, since the release of Nix 2.0 this
+    is not supported anymore. Supporting Nix commands inside the
+    container might be possible again in future versions. See
+    <link xlink:ref="https://github.com/NixOS/nixpkgs/issues/40355">the github issue</link> for tracking progress on this issue.
+  </para>
 
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
@@ -96,14 +104,6 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <filename>/etc/nixos/configuration.nix</filename>.
  </para>
 
- <para>
-  Alternatively, you can change the configuration from within the container
-  itself by running <command>nixos-rebuild switch</command> inside the
-  container. Note that the container by default does not have a copy of the
-  NixOS channel, so you should run <command>nix-channel --update</command>
-  first.
- </para>
-
  <para>
   Containers can be stopped and started using <literal>nixos-container
   stop</literal> and <literal>nixos-container start</literal>, respectively, or

From ac4cfba4a77b7182676641f6f94740dc70bbc84e Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 13:53:21 +0200
Subject: [PATCH 1914/3253] sokoban

---
 pkgs/tools/graphics/gmic-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 65b88b4b15a3..2f88b2c8a878 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -49,12 +49,12 @@ in stdenv.mkDerivation rec {
     chmod -R +w gmic gmic_qt
     ln -s ${CImg} CImg
 
+    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
+
     cd gmic_qt
   '';
 
   preConfigure = ''
-    cp ${gmic_stdlib} gmic/src/gmic_stdlib.h
-
     make -C gmic/src CImg.h gmic_stdlib.h
   '';
 

From fe7919f7a135788f5ea81bf94b6eb33ac95a85cd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 3 Sep 2018 21:09:27 +0300
Subject: [PATCH 1915/3253] systemd: Replace meta.available checks

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 pkgs/os-specific/linux/systemd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 482e3e0bc796..96c82a6d9f88 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
+{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , xz, pam, acl, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
 , audit, lz4, bzip2, libmicrohttpd, pcre2
@@ -10,8 +10,8 @@
 , getent
 , buildPackages
 , withSelinux ? false, libselinux
-, withLibseccomp ? libseccomp.meta.available, libseccomp
-, withKexectools ? kexectools.meta.available, kexectools
+, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
+, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
 }:
 
 let

From cdeafe7cdf5d6272049f45dc695a9715fad4d414 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 29 Aug 2018 01:20:22 +0300
Subject: [PATCH 1916/3253] nix: Replace meta.available checks

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ea0cdf9bd0f1..71c5bd53909f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,7 +5,7 @@
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
-, withLibseccomp ? libseccomp.meta.available, libseccomp
+, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
 , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
 }:
 

From 50d036088802a30934103f320458b151fb96f8b0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 29 Aug 2018 01:20:43 +0300
Subject: [PATCH 1917/3253] apparmor: Replace meta.available checks

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 pkgs/os-specific/linux/apparmor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 08428f95b06c..3ffaef8109f3 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, makeWrapper, autoreconfHook
+{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
 , pkgconfig, which
 , flex, bison
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
 , gawk
-, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && perl.meta.available or false, perl
-, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && python.meta.available or false, python
+, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) perl.meta.platforms, perl
+, withPython ? stdenv.hostPlatform == stdenv.buildPlatform && lib.any (lib.meta.platformMatch stdenv.hostPlatform) python.meta.platforms, python
 , swig
 , ncurses
 , pam

From 5e84926a667d496d1c09d00df260299e853cdd03 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 29 Aug 2018 01:20:54 +0300
Subject: [PATCH 1918/3253] treewide: Replace meta.available checks in
 `shouldUsePackages` copypasta

This reverts commit 79d8353b5e4bb98f1b51ab32b9b26df81bb7e106.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 pkgs/development/libraries/wiredtiger/default.nix | 2 +-
 pkgs/misc/jackaudio/default.nix                   | 2 +-
 pkgs/misc/jackaudio/jack1.nix                     | 2 +-
 pkgs/os-specific/linux/ffado/default.nix          | 2 +-
 pkgs/servers/shishi/default.nix                   | 2 +-
 pkgs/tools/filesystems/ceph/generic.nix           | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c4d94af850dd..56068c435d80 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -14,7 +14,7 @@ let
   mkEnable = mkFlag "enable-" "disable-";
   mkWith = mkFlag "with-" "without-";
 
-  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optLz4 = shouldUsePkg lz4;
   optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 391ac107ab71..efd5aa4e9194 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -14,7 +14,7 @@
 with stdenv.lib;
 let
   inherit (python2Packages) python dbus-python;
-  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index c11be4ad0c0c..2e349cf691c9 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optAlsaLib = shouldUsePkg alsaLib;
   optDb = shouldUsePkg db;
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 4e3e373d244c..85218042cf76 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -11,7 +11,7 @@
 
 let
 
-  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   libOnly = prefix == "lib";
 
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 1540a6f1fd18..b066ff18bfdc 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -14,7 +14,7 @@ let
   mkWith = mkFlag "with-" "without-";
   mkOther = mkFlag "" "" true;
 
-  shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
 
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 14fedd6610e1..c4856d925299 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -37,7 +37,8 @@ with stdenv.lib;
 let
 
   shouldUsePkg = pkg_: let pkg = (builtins.tryEval pkg_).value;
-    in if pkg.meta.available or false then pkg else null;
+    in if lib.any (lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms
+      then pkg else null;
 
   optYasm = shouldUsePkg yasm;
   optFcgi = shouldUsePkg fcgi;

From f4dd2fed7f57782fae0b3c9c9226effc5185ab7d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 29 Aug 2018 01:21:05 +0300
Subject: [PATCH 1919/3253] ghc: Replace meta.available checks for
 enableIntegerSimple

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 pkgs/development/compilers/ghc/7.10.3.nix | 2 +-
 pkgs/development/compilers/ghc/8.0.2.nix  | 2 +-
 pkgs/development/compilers/ghc/8.2.2.nix  | 2 +-
 pkgs/development/compilers/ghc/8.4.3.nix  | 2 +-
 pkgs/development/compilers/ghc/8.6.1.nix  | 2 +-
 pkgs/development/compilers/ghc/head.nix   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index a4374a452402..b69ae80d0db5 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 0946db713783..f7422d150ac0 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -14,7 +14,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 6a1914a9c2c8..aac8cf4fd220 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 8fba60d527fd..e43f9a57d0a4 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -14,7 +14,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index c12401f05778..62ea39791b90 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -14,7 +14,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index af5efbd7df8c..87045815a37f 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -14,7 +14,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? !(gmp.meta.available or false), gmp
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform

From 599c4df46a90c7415a6cc0689f0b23d22e7fdb67 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 29 Aug 2018 01:21:33 +0300
Subject: [PATCH 1920/3253] nixos/kexec: Replace meta.available checks

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
---
 nixos/modules/system/boot/kexec.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index 3e5d7b40f2c5..b95673d825b3 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (pkgs.kexectools.meta.available) {
+  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platform) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =

From 6d77f41e58b7b6291221ba9e9fb3af83ca532b8f Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:01:44 +0200
Subject: [PATCH 1921/3253] use tags

---
 pkgs/tools/graphics/gmic-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index 2f88b2c8a878..be923e286852 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -31,14 +31,14 @@ in stdenv.mkDerivation rec {
   gmic = fetchFromGitHub {
     owner = "dtschump";
     repo = "gmic";
-    rev = "b9a6876684f40852ca39300c9d7e7d676cb81b14";
+    rev = "v.${version}";
     sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
   };
 
   gmic_qt = fetchFromGitHub {
     owner = "c-koi";
     repo = "gmic-qt";
-    rev = "9e992cff2db418032b849458f5c9443267c7162c";
+    rev = "v.${version}";
     sha256= "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3";
   };
 

From 92211c0f4c20eb410c60d51ac902aee6073a1241 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:05:41 +0200
Subject: [PATCH 1922/3253] fix wrong location

---
 pkgs/tools/graphics/gmic-qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index be923e286852..da498795ffb6 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    make -C gmic/src CImg.h gmic_stdlib.h
+    make -C ../gmic/src CImg.h gmic_stdlib.h
   '';
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 491a401f6f82e8ca76a352d25edd71626efe27d4 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 14:11:07 +0200
Subject: [PATCH 1923/3253] add clarification

---
 pkgs/tools/graphics/gmic-qt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index da498795ffb6..19691ae6fc0e 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
 
   gmic_stdlib = fetchurl {
     name = "gmic_stdlib.h";
+    # Version should e in sync with gmic. Basically the version string without dots
     url = "http://gmic.eu/gmic_stdlib236.h";
     sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
   };

From b7f2c92d0669ed0d2c9a40beb63fd22957fb1e95 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 15:41:17 +0200
Subject: [PATCH 1924/3253] renaming and restructuring

---
 .../tools/graphics/{gmic-qt => gmic_krita_qt}/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/tools/graphics/{gmic-qt => gmic_krita_qt}/default.nix (91%)

diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
similarity index 91%
rename from pkgs/tools/graphics/gmic-qt/default.nix
rename to pkgs/tools/graphics/gmic_krita_qt/default.nix
index 19691ae6fc0e..899cac504780 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig, qt5
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
 , opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
-, curl, krita
+, curl, krita, qtbase, qttools
 , fetchgit }:
 
 let
   version = "2.3.6";
 
 in stdenv.mkDerivation rec {
-  name = "gmic-qt-${version}";
+  name = "gmic_krita_qt-${version}";
 
   gmic-community = fetchFromGitHub {
     owner = "dtschump";
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase qt5.qttools fftw zlib libjpeg libtiff libpng
+    qtbase qttools fftw zlib libjpeg libtiff libpng
     opencv openexr graphicsmagick curl krita
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0255694b1d7..62b2e97ed068 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1370,7 +1370,7 @@ with pkgs;
 
   gmic = callPackage ../tools/graphics/gmic { };
 
-  gmic-qt = callPackage ../tools/graphics/gmic-qt { };
+  gmic_krita_qt = libsForQt5.callPackage ../tools/graphics/gmic_krita_qt { };
 
   goa = callPackage ../development/tools/goa {
     buildGoPackage = buildGo110Package;

From 6ba1ef4a318224569d23265d6e35982a0e26f637 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 16:14:46 +0200
Subject: [PATCH 1925/3253] fix hash

---
 pkgs/tools/graphics/gmic_krita_qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 899cac504780..8b75f2e5713d 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     owner = "dtschump";
     repo = "gmic";
     rev = "v.${version}";
-    sha256 = "0f69r460lyfb021m7bs8s4rxa3png51cbp1izywsy3sprjd1s57p";
+    sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi";
   };
 
   gmic_qt = fetchFromGitHub {

From 4303814b3002e00cfcbc04996bf50fb8ea574d52 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@chelnok.de>
Date: Fri, 28 Sep 2018 16:22:20 +0200
Subject: [PATCH 1926/3253] fix CImg dependency

---
 pkgs/tools/graphics/gmic_krita_qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gmic_krita_qt/default.nix b/pkgs/tools/graphics/gmic_krita_qt/default.nix
index 8b75f2e5713d..14d47dc30bd8 100644
--- a/pkgs/tools/graphics/gmic_krita_qt/default.nix
+++ b/pkgs/tools/graphics/gmic_krita_qt/default.nix
@@ -18,8 +18,8 @@ in stdenv.mkDerivation rec {
 
   CImg = fetchgit {
     url = "https://framagit.org/dtschump/CImg";
-    rev = "c523f0026f3b03831c0778335fe7c7661bf9a719";
-    sha256 = "13ja8immpjkm2xskddc920axq2rp4hc2sr5ghgvgy1rshc3lp8i8";
+    rev = "90f5657d8eab7b549ef945103ef680e747385805";
+    sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc";
   };
 
   gmic_stdlib = fetchurl {

From 3a76bc7a79e18020716ba063dcd1bd8ec11b0790 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Sep 2018 22:10:03 +0800
Subject: [PATCH 1927/3253] nixos on hyperv: load modules and set video mode

---
 nixos/modules/virtualisation/hyperv-guest.nix | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
index ecd2a8117710..d86cb9fe1ab9 100644
--- a/nixos/modules/virtualisation/hyperv-guest.nix
+++ b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -9,10 +9,33 @@ in {
   options = {
     virtualisation.hypervGuest = {
       enable = mkEnableOption "Hyper-V Guest Support";
+
+      videoMode = mkOption {
+        type = types.str;
+        default = "1152x864";
+        example = "1024x768";
+        description = ''
+          Resolution at which to initialize the video adapter.
+
+          Supports screen resolution up to Full HD 1920x1080 with 32 bit color
+          on Windows Server 2012, and 1600x1200 with 16 bit color on Windows
+          Server 2008 R2 or earlier.
+        '';
+      };
     };
   };
 
   config = mkIf cfg.enable {
+    boot = {
+      initrd.kernelModules = [
+        "hv_balloon" "hv_netvsc" "hv_storvsc" "hv_utils" "hv_vmbus"
+      ];
+
+      kernelParams = [
+        "video=hyperv_fb:${cfg.videoMode}"
+      ];
+    };
+
     environment.systemPackages = [ config.boot.kernelPackages.hyperv-daemons.bin ];
 
     security.rngd.enable = false;

From ca6d41ae654386562ef7f00ae268e6e9070a3f49 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Sep 2018 22:10:31 +0800
Subject: [PATCH 1928/3253] nixos-installer: use the hyperv module on hyperv

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 359caad89a72..b70faa380e54 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -277,8 +277,7 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
 
 # Also for Hyper-V.
 if ($virt eq "microsoft") {
-    push @initrdAvailableKernelModules, "hv_storvsc";
-    $videoDriver = "fbdev";
+    push @attrs, "virtualisation.hypervGuest.enable = true;"
 }
 
 

From 6e3e136f77b3103a0c3b3fe7578c5864932b649c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Sep 2018 22:27:52 +0800
Subject: [PATCH 1929/3253] nixos on hyperv: hot-add CPU

---
 nixos/modules/virtualisation/hyperv-guest.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix
index d86cb9fe1ab9..0f1f052880c5 100644
--- a/nixos/modules/virtualisation/hyperv-guest.nix
+++ b/nixos/modules/virtualisation/hyperv-guest.nix
@@ -40,12 +40,16 @@ in {
 
     security.rngd.enable = false;
 
-    # enable hotadding memory
+    # enable hotadding cpu/memory
     services.udev.packages = lib.singleton (pkgs.writeTextFile {
-      name = "hyperv-memory-hotadd-udev-rules";
-      destination = "/etc/udev/rules.d/99-hyperv-memory-hotadd.rules";
+      name = "hyperv-cpu-and-memory-hotadd-udev-rules";
+      destination = "/etc/udev/rules.d/99-hyperv-cpu-and-memory-hotadd.rules";
       text = ''
-        ACTION="add", SUBSYSTEM=="memory", ATTR{state}="online"
+        # Memory hotadd
+        SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory[0-9]*", TEST=="state", ATTR{state}="online"
+
+        # CPU hotadd
+        SUBSYSTEM=="cpu", ACTION=="add", DEVPATH=="/devices/system/cpu/cpu[0-9]*", TEST=="online", ATTR{online}="1"
       '';
     });
 

From 82cafa41cb5a135da6fff622d385591158eb5f54 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 28 Sep 2018 15:40:33 +0100
Subject: [PATCH 1930/3253] vault: add completion deprecation notice

---
 pkgs/tools/security/vault/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 091b17c6ffe1..a0f7d0f6287f 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
 
 let
+  # Deprecated since vault 0.8.2: use `vault -autocomplete-install` instead
+  # to install auto-complete for bash, zsh and fish
   vaultBashCompletions = fetchFromGitHub {
     owner = "iljaweis";
     repo = "vault-bash-completion";

From 265a340798e9b75c5902aea3e36a16ba06774ab1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Apr 2018 23:13:52 +0800
Subject: [PATCH 1931/3253] redoflacs: init at 0.30.20150202

---
 pkgs/applications/audio/redoflacs/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/audio/redoflacs/default.nix

diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix
new file mode 100644
index 000000000000..1918fa9e3a99
--- /dev/null
+++ b/pkgs/applications/audio/redoflacs/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, makeWrapper
+, flac, sox }:
+
+stdenv.mkDerivation rec {
+  name = "redoflacs-${version}";
+  version = "0.30.20150202";
+
+  src = fetchFromGitHub {
+    owner  = "sirjaren";
+    repo   = "redoflacs";
+    rev    = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735";
+    sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j";
+  };
+
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin redoflacs
+    install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/redoflacs \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger";
+    homepage    = src.meta.homepage;
+    license     = licenses.gpl2;
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..2d3efaf27725 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16629,6 +16629,8 @@ with pkgs;
 
   flac = callPackage ../applications/audio/flac { };
 
+  redoflacs = callPackage ../applications/audio/redoflacs { };
+
   flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {

From fd8bca45c994fc3b36dce4263c1d4419493f193e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 28 Sep 2018 17:33:49 +0200
Subject: [PATCH 1932/3253] nixos/kexec: Fix typo in meta.platforms

Evaluation error introduced in 599c4df46a90c7415a6cc0689f0b23d22e7fdb67.

There is only a "platformS" attribute in kexectools.meta, so let's use
this and from the code in the kexec module it operates on a list,
matching the corresponding platforms, so this seems to be the attribute
the original author intended.

Tested by building nixos/tests/kexec.nix on x86_64-linux and while it
evaluates now, the test still fails by timing out shortly after the
kexec:

machine: waiting for the VM to finish booting
machine# Cannot find the ESP partition mount point.

This however seems to be an unrelated issue and was also the case before
the commit mentioned above.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @dezgeg
---
 nixos/modules/system/boot/kexec.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix
index b95673d825b3..61f9c6d0e7eb 100644
--- a/nixos/modules/system/boot/kexec.nix
+++ b/nixos/modules/system/boot/kexec.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 {
-  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platform) {
+  config = lib.mkIf (lib.any (lib.meta.platformMatch pkgs.stdenv.hostPlatform) pkgs.kexectools.meta.platforms) {
     environment.systemPackages = [ pkgs.kexectools ];
 
     systemd.services."prepare-kexec" =

From 830f9fabd4a564bfbc3fbfc33a62b02010c0a7a5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Sep 2018 17:40:16 -0500
Subject: [PATCH 1933/3253] patch-shebangs: use isScript to safely check for
 shebang start

Fixes commonly encountered errors about broken pipes or null-bytes in
command-substitution.
---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index d5586fccae67..0ac81102658b 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -19,9 +19,8 @@ patchShebangs() {
     local newInterpreterLine
 
     find "$dir" -type f -perm -0100 | while read f; do
-        if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
-            # missing shebang => not a script
-            continue
+        if ! isScript "$f"; then
+          continue
         fi
 
         oldInterpreterLine=$(head -1 "$f" | tail -c+3)

From 286381f0727a5aee3413c24989ad5fb609653c49 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 11:17:33 -0500
Subject: [PATCH 1934/3253] patch-shebangs: simplify a bit per reviewer
 suggestion

---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 0ac81102658b..18eb011b0c79 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -19,9 +19,7 @@ patchShebangs() {
     local newInterpreterLine
 
     find "$dir" -type f -perm -0100 | while read f; do
-        if ! isScript "$f"; then
-          continue
-        fi
+        isScript "$f" || continue
 
         oldInterpreterLine=$(head -1 "$f" | tail -c+3)
         read -r oldPath arg0 args <<< "$oldInterpreterLine"

From f7db287960241736213c0f262ad655ce40cfc624 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 11:21:51 -0500
Subject: [PATCH 1935/3253] patch-shebangs.sh: use more robust 'for each file'
 loop, check for dir

The latter is to avoid warnings printed by find if it doesn't exist.
---
 pkgs/build-support/setup-hooks/patch-shebangs.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 18eb011b0c79..d26bf735d30a 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -18,7 +18,10 @@ patchShebangs() {
     local oldInterpreterLine
     local newInterpreterLine
 
-    find "$dir" -type f -perm -0100 | while read f; do
+    [ -e "$dir" ] || return 0
+
+    local f
+    while IFS= read -r -d $'\0' f; do
         isScript "$f" || continue
 
         oldInterpreterLine=$(head -1 "$f" | tail -c+3)
@@ -58,7 +61,7 @@ patchShebangs() {
                 rm "$f.timestamp"
             fi
         fi
-    done
+    done < <(find "$dir" -type f -perm -0100 -print0)
 
     stopNest
 }

From 776e6da54485c4b04655ccef6ec7cf7a14860415 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Sep 2018 16:28:19 -0500
Subject: [PATCH 1936/3253] google-chrome: fix native inputs, otherwise uses
 wrong patchelf

---
 .../applications/networking/browsers/google-chrome/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 52a2ccb292bb..0d86e4f8294c 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -71,9 +71,8 @@ in stdenv.mkDerivation rec {
 
   src = chromium.upstream-info.binary;
 
+  nativeBuildInputs = [ patchelf makeWrapper ];
   buildInputs = [
-    patchelf makeWrapper
-
     # needed for GSETTINGS_SCHEMAS_PATH
     gsettings-desktop-schemas glib gtk
 

From 196c405efb957a4c419b5eef5b6639ce95604fc8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Sep 2018 16:36:34 -0500
Subject: [PATCH 1937/3253] google-chrome: use patchelfUnstable for nicer
 static binary handling

Current/previous behavior is the patchelf process aborting after
a somewhat unfriendly message about an assertion failure.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..736b3118f2dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16865,7 +16865,7 @@ with pkgs;
 
   googleearth = callPackage ../applications/misc/googleearth { };
 
-  google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
+  google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; patchelf = patchelfUnstable; };
 
   google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
 

From eb91037e7b5de99d887b4f58287e99abeeea05de Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Sep 2018 16:38:10 -0500
Subject: [PATCH 1938/3253] tree-wide: patchelf used during build ->
 nativeBuildInputs

In a few cases it wasn't clear so I left them as-is.

While visiting these moved other things to nativeBuildInputs
when it was clear they were one of these cases:

* makeWrapper
* archive utilities (in order to unpack src)
  * a few of these might no longer be needed but leaving for another day
---
 pkgs/applications/editors/jetbrains/common.nix                | 2 +-
 pkgs/applications/misc/ipmiview/default.nix                   | 2 +-
 .../networking/instant-messengers/bluejeans/default.nix       | 2 +-
 pkgs/applications/networking/mailreaders/inboxer/default.nix  | 3 ++-
 pkgs/applications/networking/spideroak/default.nix            | 2 +-
 pkgs/applications/science/logic/tptp/default.nix              | 3 ++-
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions/default.nix     | 3 ++-
 pkgs/development/compilers/gcc-arm-embedded/default.nix       | 2 +-
 pkgs/development/compilers/mentor/default.nix                 | 2 +-
 pkgs/development/compilers/mlton/default.nix                  | 3 ++-
 pkgs/development/compilers/opendylan/bin.nix                  | 2 +-
 pkgs/development/libraries/scmccid/default.nix                | 2 +-
 pkgs/games/openarena/default.nix                              | 2 +-
 pkgs/games/planetaryannihilation/default.nix                  | 2 +-
 pkgs/games/ue4demos/default.nix                               | 2 +-
 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix            | 3 ++-
 pkgs/misc/drivers/epkowa/default.nix                          | 2 +-
 pkgs/tools/security/gorilla-bin/default.nix                   | 2 +-
 19 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 2bb84bce0b12..38996008f46f 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
     '';
   };
 
-  buildInputs = [ makeWrapper patchelf p7zip unzip ];
+  nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
 
   patchPhase = ''
       get_file_size() {
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 58fcd59a2b2f..b5fa9143ddbb 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
   };
 
-   buildInputs = [ patchelf makeWrapper ];
+   nativeBuildInputs = [ patchelf makeWrapper ];
 
    buildPhase = with xorg; ''
      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index e98c68ff67c2..a2ba2f09f764 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
     };
 
-  buildInputs = [ patchelf rpmextract ];
+  nativeBuildInputs = [ patchelf rpmextract ];
 
   libPath =
     stdenv.lib.makeLibraryPath
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 4edf61ceaaed..e033e532ec1a 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
   unpackPhase = ''
     ar p $src data.tar.xz | tar xJ
   '';
-  buildInputs = [ binutils patchelf makeWrapper ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
+  buildInputs = [ binutils ];
 
   preFixup = with stdenv.lib; let
     lpath = makeLibraryPath [
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index c07ad715afd2..fdb4206d340f 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
     sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop
   '';
 
-  buildInputs = [ patchelf makeWrapper ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
 
   meta = {
     homepage = https://spideroak.com;
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index a1d613e6295e..f3c4f22eae36 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0slqbqv4y43wz6wnh72s4n540ssapah0d12mndi0c7xr04kf2v2d";
   };
 
-  buildInputs = [ tcsh yap perl patchelf ];
+  nativeBuildInputs = [ patchelf ];
+  buildInputs = [ tcsh yap perl ];
 
   installPhase = ''
     sharedir=$out/share/tptp
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 94fc9697e54e..72b2131764d5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -32,12 +32,12 @@ in stdenv.mkDerivation {
 
   outputs = [ "out" "modsrc" ];
 
-  nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ];
+  nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ];
 
   buildInputs =
     [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL
       libcap glib lvm2 alsaLib curl libvpx pam xorriso makeself perl
-      libXmu libpng patchelfUnstable python ]
+      libXmu libpng python ]
     ++ optional javaBindings jdk
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index cb7bcad3592d..fc957f6f4615 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -36,7 +36,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
 
-  buildInputs = [ patchelf cdrkit makeWrapper dbus ] ++ kernel.moduleBuildDependencies;
+  nativeBuildInputs = [ patchelf makeWrapper ];
+  buildInputs = [ cdrkit dbus ] ++ kernel.moduleBuildDependencies;
 
   installPhase = ''
     mkdir -p $out
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 7908d6d06ef8..039b5a9ce362 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     sha256 = sha256;
   };
 
-  buildInputs = [ bzip2 patchelf ];
+  nativeBuildInputs = [ bzip2 patchelf ];
 
   dontPatchELF = true;
 
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
index 7cd3c1793661..4f09df7f2ea0 100644
--- a/pkgs/development/compilers/mentor/default.nix
+++ b/pkgs/development/compilers/mentor/default.nix
@@ -10,7 +10,7 @@ let
     stdenv.mkDerivation rec {
       inherit name src;
 
-      buildInputs = [ patchelf ];
+      nativeBuildInputs = [ patchelf ];
 
       buildCommand = ''
         # Unpack tarball
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 6b6907b0b2e6..0b991e22fa98 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = name;
 
-  buildInputs = [ gmp ] ++ stdenv.lib.optional stdenv.isLinux patchelf;
+  buildInputs = [ gmp ];
+  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
 
   makeFlags = [ "all-no-docs" ];
 
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 9b721312bb78..e11bb7251a60 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     }
     else throw "platform ${stdenv.hostPlatform.system} not supported.";
 
-  buildInputs = [ patchelf boehmgc gnused makeWrapper ];
+  nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ];
 
   buildCommand = ''
     mkdir -p "$out"
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index b305fecc3933..c9c26ca0d66c 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     })
     else throw "Architecture not supported";
 
-  buildInputs = [ patchelf ];
+  nativeBuildInputs = [ patchelf ];
 
   installPhase = ''
     RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 19e608f393a1..d5592e4f7404 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jmc1cmdz1rcvqc9ilzib1kilpwap6v0d331l6q53wsibdzsz3ss";
   };
 
-  buildInputs = [ pkgs.unzip patchelf makeWrapper];
+  nativeBuildInputs = [ pkgs.unzip patchelf makeWrapper];
 
   installPhase = let
     gameDir = "$out/openarena-$version";
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index 95674822aa36..391ced362075 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     inherit (config.planetary_annihilation) url sha256;
   };
 
-  buildInputs = [ patchelf makeWrapper ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
  
   installPhase = ''
     mkdir -p $out/{bin,lib}
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index 0bdb759048ad..b8b165ee0518 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -5,7 +5,7 @@ let
     stdenv.mkDerivation rec {
       inherit name src;
 
-      buildInputs = [ unzip patchelf ];
+      nativeBuildInputs = [ unzip patchelf ];
 
       rtdeps = stdenv.lib.makeLibraryPath
         [ xorg.libXxf86vm xorg.libXext openal ]
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 18dd6c14822b..35b0ba3684fe 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -26,7 +26,8 @@ in stdenv.mkDerivation rec {
     sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
   };
 
-  buildInputs = [ cups' gcc ghostscript glibc patchelf ];
+  nativeBuildInputs = [ patchelf ];
+  buildInputs = [ cups' gcc ghostscript glibc ];
 
   inherit gcc ghostscript glibc;
   cups = cups';
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index ca7ac4b41528..3359f9e94acc 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -30,7 +30,7 @@ let plugins = {
     version = "1.0.1";
     pluginVersion = "2.1.2-1";
 
-    buildInputs = [ patchelf rpm ];
+    nativeBuildInputs = [ patchelf rpm ];
     src = fetchurl {
       url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
       sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix
index df9d42211f6c..152ff40e7a22 100644
--- a/pkgs/tools/security/gorilla-bin/default.nix
+++ b/pkgs/tools/security/gorilla-bin/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "19ir6x4c01825hpx2wbbcxkk70ymwbw4j03v8b2xc13ayylwzx0r";
   };
 
-  buildInputs = [ patchelf makeWrapper ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
   phases = [ "unpackPhase" "installPhase" ];
 
   unpackCmd = ''

From 783a58f363fd1ccfa1817ed3f030eaef59cfde9d Mon Sep 17 00:00:00 2001
From: Brian Olsen <brian@maven-group.org>
Date: Fri, 28 Sep 2018 04:00:24 +0200
Subject: [PATCH 1939/3253] nixos/rspamd: Remove non-working socket activation

The socket activation I added to the rspamd module doesn't actually work
and can't be made to work without changes to rspamd.

See: #47421
See: rspamd/rspamd#2035
---
 nixos/modules/services/mail/rspamd.nix | 82 ++------------------------
 nixos/tests/rspamd.nix                 | 54 ++---------------
 2 files changed, 10 insertions(+), 126 deletions(-)

diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 5ecdd3ef6cf4..bba11796a3d3 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -115,36 +115,10 @@ let
     };
   };
 
-  indexOf = default: start: list: e:
-    if list == []
-    then default
-    else if (head list) == e then start
-    else (indexOf default (start + (length (listenStreams (head list).socket))) (tail list) e);
-
-  systemdSocket = indexOf (abort "Socket not found") 0 allSockets;
-
   isUnixSocket = socket: hasPrefix "/" (if (isString socket) then socket else socket.socket);
-  isPort = hasPrefix "*:";
-  isIPv4Socket = hasPrefix "*v4:";
-  isIPv6Socket = hasPrefix "*v6:";
-  isLocalHost = hasPrefix "localhost:";
-  listenStreams = socket:
-    if (isLocalHost socket) then
-      let port = (removePrefix "localhost:" socket);
-      in [ "127.0.0.1:${port}" ] ++ (if config.networking.enableIPv6 then ["[::1]:${port}"] else [])
-    else if (isIPv6Socket socket) then [removePrefix "*v6:" socket]
-    else if (isPort socket) then [removePrefix "*:" socket]
-    else if (isIPv4Socket socket) then
-      throw "error: IPv4 only socket not supported in rspamd with socket activation"
-    else if (length (splitString " " socket)) != 1 then
-      throw "error: string options not supported in rspamd with socket activation"
-    else [socket];
 
-  mkBindSockets = enabled: socks: concatStringsSep "\n  " (flatten (map (each:
-    if cfg.socketActivation && enabled != false then
-      let systemd = (systemdSocket each);
-      in (imap (idx: e: "bind_socket = \"systemd:${toString (systemd + idx - 1)}\";") (listenStreams each.socket))
-    else "bind_socket = \"${each.rawEntry}\";") socks));
+  mkBindSockets = enabled: socks: concatStringsSep "\n  "
+    (flatten (map (each: "bind_socket = \"${each.rawEntry}\";") socks));
 
   rspamdConfFile = pkgs.writeText "rspamd.conf"
     ''
@@ -175,18 +149,6 @@ let
       ${cfg.extraConfig}
    '';
 
-  allMappedSockets = flatten (mapAttrsToList (name: value:
-    if value.enable != false
-    then imap (idx: each: {
-        name = "${name}";
-        index = idx;
-        value = each;
-      }) value.bindSockets
-    else []) cfg.workers);
-  allSockets = map (e: e.value) allMappedSockets;
-
-  allSocketNames = map (each: "rspamd-${each.name}-${toString each.index}.socket") allMappedSockets;
-
 in
 
 {
@@ -205,13 +167,6 @@ in
         description = "Whether to run the rspamd daemon in debug mode.";
       };
 
-      socketActivation = mkOption {
-        type = types.bool;
-        description = ''
-          Enable systemd socket activation for rspamd.
-        '';
-      };
-
       workers = mkOption {
         type = with types; attrsOf (submodule workerOpts);
         description = ''
@@ -272,13 +227,6 @@ in
 
   config = mkIf cfg.enable {
 
-    services.rspamd.socketActivation = mkDefault (!opts.bindSocket.isDefined && !opts.bindUISocket.isDefined);
-
-    assertions = [ {
-      assertion = !cfg.socketActivation || !(opts.bindSocket.isDefined || opts.bindUISocket.isDefined);
-      message = "Can't use socketActivation for rspamd when using renamed bind socket options";
-    } ];
-
     # Allow users to run 'rspamc' and 'rspamadm'.
     environment.systemPackages = [ pkgs.rspamd ];
 
@@ -299,18 +247,14 @@ in
     systemd.services.rspamd = {
       description = "Rspamd Service";
 
-      wantedBy = mkIf (!cfg.socketActivation) [ "multi-user.target" ];
-      after = [ "network.target" ] ++
-       (if cfg.socketActivation then allSocketNames else []);
-      requires = mkIf cfg.socketActivation allSocketNames;
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
 
       serviceConfig = {
         ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
         Restart = "always";
         RuntimeDirectory = "rspamd";
-        RuntimeDirectoryPreserve = mkIf cfg.socketActivation true;
         PrivateTmp = true;
-        Sockets = mkIf cfg.socketActivation (concatStringsSep " " allSocketNames);
       };
 
       preStart = ''
@@ -318,24 +262,10 @@ in
         ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd
       '';
     };
-    systemd.sockets = mkIf cfg.socketActivation
-      (listToAttrs (map (each: {
-        name = "rspamd-${each.name}-${toString each.index}";
-        value = {
-          description = "Rspamd socket ${toString each.index} for worker ${each.name}";
-          wantedBy = [ "sockets.target" ];
-          listenStreams = (listenStreams each.value.socket);
-          socketConfig = {
-            BindIPv6Only = mkIf (isIPv6Socket each.value.socket) "ipv6-only";
-            Service = "rspamd.service";
-            SocketUser = mkIf (isUnixSocket each.value.socket) each.value.owner;
-            SocketGroup = mkIf (isUnixSocket each.value.socket) each.value.group;
-            SocketMode = mkIf (isUnixSocket each.value.socket) each.value.mode;
-          };
-        };
-      }) allMappedSockets));
   };
   imports = [
+    (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]
+	     "Socket activation never worked correctly and could at this time not be fixed and so was removed")
     (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
     (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
   ];
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
index 6b2e2dd3a531..a12622b6aa0b 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixos/tests/rspamd.nix
@@ -13,13 +13,10 @@ let
     $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]");
     $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]");
   '';
-  simple = name: socketActivation: enableIPv6: makeTest {
+  simple = name: enableIPv6: makeTest {
     name = "rspamd-${name}";
     machine = {
-      services.rspamd = {
-        enable = true;
-        socketActivation = socketActivation;
-      };
+      services.rspamd.enable = true;
       networking.enableIPv6 = enableIPv6;
     };
     testScript = ''
@@ -32,13 +29,6 @@ let
       sleep 10;
       $machine->log($machine->succeed("cat /etc/rspamd.conf"));
       $machine->log($machine->succeed("systemctl cat rspamd.service"));
-      ${if socketActivation then ''
-        $machine->log($machine->succeed("systemctl cat rspamd-controller-1.socket"));
-        $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket"));
-      '' else ''
-        $machine->fail("systemctl cat rspamd-controller-1.socket");
-        $machine->fail("systemctl cat rspamd-normal-1.socket");
-      ''}
       $machine->log($machine->succeed("curl http://localhost:11334/auth"));
       $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth"));
       ${optionalString enableIPv6 ''
@@ -48,10 +38,8 @@ let
   };
 in
 {
-  simple = simple "simple" false true;
-  ipv4only = simple "ipv4only" false false;
-  simple-socketActivated = simple "simple-socketActivated" true true;
-  ipv4only-socketActivated = simple "ipv4only-socketActivated" true false;
+  simple = simple "simple" true;
+  ipv4only = simple "ipv4only" false;
   deprecated = makeTest {
     name = "rspamd-deprecated";
     machine = {
@@ -68,7 +56,6 @@ in
       ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
       ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
       $machine->log($machine->succeed("cat /etc/rspamd.conf"));
-      $machine->fail("systemctl cat rspamd-normal-1.socket");
       $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
       $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
     '';
@@ -79,7 +66,6 @@ in
     machine = {
       services.rspamd = {
         enable = true;
-        socketActivation = false;
         workers.normal.bindSockets = [{
           socket = "/run/rspamd.sock";
           mode = "0600";
@@ -101,38 +87,6 @@ in
       ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
       ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
       $machine->log($machine->succeed("cat /etc/rspamd.conf"));
-      $machine->fail("systemctl cat rspamd-normal-1.socket");
-      $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
-      $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
-    '';
-  };
-  socketActivated = makeTest {
-    name = "rspamd-socketActivated";
-    machine = {
-      services.rspamd = {
-        enable = true;
-        workers.normal.bindSockets = [{
-          socket = "/run/rspamd.sock";
-          mode = "0600";
-          owner = "root";
-          group = "root";
-        }];
-        workers.controller.bindSockets = [{
-          socket = "/run/rspamd-worker.sock";
-          mode = "0666";
-          owner = "root";
-          group = "root";
-        }];
-      };
-    };
-
-    testScript = ''
-      startAll
-      $machine->waitForFile("/run/rspamd.sock");
-      ${checkSocket "/run/rspamd.sock" "root" "root" "600" }
-      ${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
-      $machine->log($machine->succeed("cat /etc/rspamd.conf"));
-      $machine->log($machine->succeed("systemctl cat rspamd-normal-1.socket"));
       $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
       $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
     '';

From 7b87b70b1f3b547d556636ed32679bec824d24e1 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 19:58:56 +0200
Subject: [PATCH 1940/3253] kustomize: 1.0.4 -> 1.0.8 (#47489)

- change the GOPATH to `sigs.k8s.io/kustomize`
- add some buildtags to get a better `kustomize version`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/kustomize/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 4f9512b22137..ce297df13c3a 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -3,12 +3,21 @@
 
 buildGoPackage rec {
   name = "kustomize-${version}";
-  version = "1.0.4";
+  version = "1.0.8";
+  # rev is the 1.0.8 commit, mainly for kustomize version command output
+  rev = "58492e2d83c59ed63881311f46ad6251f77dabc3";
 
-  goPackagePath = "github.com/kubernetes-sigs/kustomize";
+  goPackagePath = "sigs.k8s.io/kustomize";
+
+  buildFlagsArray = let t = "${goPackagePath}/pkg/commands"; in ''
+    -ldflags=
+      -s -X ${t}.kustomizeVersion=${version}
+         -X ${t}.gitCommit=${rev}
+         -X ${t}.buildDate=unknow
+  '';
 
   src = fetchFromGitHub {
-    sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm";
+    sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx";
     rev = "v${version}";
     repo = "kustomize";
     owner = "kubernetes-sigs";
@@ -23,6 +32,6 @@ buildGoPackage rec {
     '';
     homepage = https://github.com/kubernetes-sigs/kustomize;
     license = licenses.asl20;
-    maintainers = [ maintainers.carlosdagos ];
+    maintainers = [ maintainers.carlosdagos maintainers.vdemeester ];
   };
 }

From 2e17793e13496e7b774ea552eb49b42dc2c05152 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 19:59:17 +0200
Subject: [PATCH 1941/3253] gauge: 1.0.0 -> 1.0.2 (#47465)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/gauge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index f4f7af0e084a..983df980a591 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gauge-${version}";
-  version = "1.0.0";
+  version = "1.0.2";
 
   goPackagePath = "github.com/getgauge/gauge";
   excludedPackages = ''\(build\|man\)'';
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "getgauge";
     repo = "gauge";
     rev = "v${version}";
-    sha256 = "1dnlqnpzqsikpxy2mndrmxpcsj4r1zcjmv8px1idzblp117vsnw1";
+    sha256 = "0cnhkxfw78i4lgkbrk87hgrjh98f0z6a97g77c9av20z4962hmfy";
   };
 
   meta = with stdenv.lib; {

From 2fc7b67cef660ce60616331ae2fbeb6539ff1d12 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 19:59:47 +0200
Subject: [PATCH 1942/3253] delve: 1.0.0 -> 1.1.0 (#47463)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/delve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index b101e52aad9c..6ddc778c95c4 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "delve-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   goPackagePath = "github.com/derekparker/delve";
   excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "derekparker";
     repo = "delve";
     rev = "v${version}";
-    sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx";
+    sha256 = "0gpsd9hb7r65rn4ml9jzsmy72b8j0id6wik2l48ghzkwjm72rsdz";
   };
 
   meta = with stdenv.lib; {

From 93e26bae3f59778f800dfd881c83076e18de8a0e Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:00:38 +0200
Subject: [PATCH 1943/3253] go-symbols: unstable-2017-02-06 ->
 unstable-2018-05-23 (#47468)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/go-symbols/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix
index 38ceea7d417b..07cd267b0e9e 100644
--- a/pkgs/development/tools/go-symbols/default.nix
+++ b/pkgs/development/tools/go-symbols/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go-symbols-${version}";
-  version = "unstable-2017-02-06";
-  rev = "5a7f75904fb552189036c640d04cd6afef664836";
+  version = "unstable-2018-05-23";
+  rev = "953befd75e223f514580fcb698aead0dd6ad3421";
 
   goPackagePath = "github.com/acroca/go-symbols";
   goDeps = ./deps.nix;
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/acroca/go-symbols";
-    sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb";
+    owner = "acroca";
+    repo = "go-symbols";
+    sha256 = "0dwf7w3zypv5brk68n7siakz222jwnhrhkzvwk1iwdffk79gqp3x";
   };
 
   meta = {

From 2c6e7ae45fcaf1b2c10cb3badd12951e016c7332 Mon Sep 17 00:00:00 2001
From: baracoder <baracoder@googlemail.com>
Date: Fri, 28 Sep 2018 20:02:15 +0200
Subject: [PATCH 1944/3253] dotnet-sdk: 2.1.401 -> 2.1.402 (#47469)

---
 pkgs/development/compilers/dotnet/sdk/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index d1db965bc814..eb7a1e737193 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,13 +12,14 @@ let
   rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
 in
   stdenv.mkDerivation rec {
-    version = "2.1.401";
+    version = "2.1.402";
+    netCoreVersion = "2.1.4";
     name = "dotnet-sdk-${version}";
 
     src = fetchurl {
       url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
       # use sha512 from the download page
-      sha512 = "639f9f68f225246d9cce798d72d011f65c7eda0d775914d1394df050bddf93e2886555f5eed85a75d6c72e9063a54d8aa053c64c326c683b94e9e0a0570e5654";
+      sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48";
     };
 
     unpackPhase = ''
@@ -49,7 +50,7 @@ in
 
     meta = with stdenv.lib; {
       homepage = https://dotnet.github.io/;
-      description = ".NET Core SDK 2.0.2 with .NET Core 2.0.0";
+      description = ".NET Core SDK ${version} with .NET Core ${netCoreVersion}";
       platforms = [ "x86_64-linux" ];
       maintainers = with maintainers; [ kuznero ];
       license = licenses.mit;

From a87026a439eec3e03f4e03c81ff36aa2d37ab6a4 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:04:53 +0200
Subject: [PATCH 1945/3253] gopkgs: unstable-2017-12-29 -> 2.0.1 (#47464)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/gopkgs/default.nix |  7 +++----
 pkgs/development/tools/gopkgs/deps.nix    | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix
index ea9c92c0d0a1..89a1da772701 100644
--- a/pkgs/development/tools/gopkgs/default.nix
+++ b/pkgs/development/tools/gopkgs/default.nix
@@ -2,17 +2,16 @@
 
 buildGoPackage rec {
   name = "gopkgs-${version}";
-  version = "unstable-2017-12-29";
-  rev = "b2ea2ecd37740e6ce0e020317d90c729aab4dc6d";
+  version = "2.0.1";
 
   goPackagePath = "github.com/uudashr/gopkgs";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
-    inherit rev;
+    rev = "v${version}";
     owner = "uudashr";
     repo = "gopkgs";
-    sha256 = "1hwzxrf2h8xjbbx6l86mjpjh4csxxsy17zkh8h3qzncyfnsnczzg";
+    sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4";
   };
 
   meta = {
diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix
index 0f72ee3e5e0f..715c7bbbc824 100644
--- a/pkgs/development/tools/gopkgs/deps.nix
+++ b/pkgs/development/tools/gopkgs/deps.nix
@@ -1,11 +1,21 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "github.com/MichaelTJones/walk";
+    goPackagePath  = "github.com/karrick/godirwalk";
     fetch = {
       type = "git";
-      url = "https://github.com/MichaelTJones/walk";
-      rev = "4748e29d5718c2df4028a6543edf86fd8cc0f881";
-      sha256 = "03bc3cql3w8cx05xlnzxsff59c6679rcpx4njzk86k00blkkizv7";
+      url = "https://github.com/karrick/godirwalk";
+      rev =  "5cc8b3875be6c21825a1b54d3029ed415c93c4f7";
+      sha256 = "02nlyr0sa0lj1f27fsrxlspcsrx7fs60qwr33l5r6yq52axcikcd";
     };
   }
-]
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+]
\ No newline at end of file

From 83cf856538d9e145e65f2c49d6a9211b6c80c176 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:07:11 +0200
Subject: [PATCH 1946/3253] kail: 0.6.0 -> 0.7.0 (#47472)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/tools/networking/kail/default.nix |   6 +-
 pkgs/tools/networking/kail/deps.nix    | 165 +++++++------------------
 2 files changed, 45 insertions(+), 126 deletions(-)

diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix
index 1444c398e20c..e13511487170 100644
--- a/pkgs/tools/networking/kail/default.nix
+++ b/pkgs/tools/networking/kail/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kail-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   goPackagePath = "github.com/boz/kail";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "boz";
     repo = "kail";
     rev = "v${version}";
-    sha256 = "17ybcncdjssil4bn3n2jp1asfcpl8vj560afb2mry9032qrryvx9";
+    sha256 = "0j0948wjn0jsk89fp0l29pd90n86wi85yghrbdhwihhgyqcdmhi0";
   };
 
   # regenerate deps.nix using following steps:
@@ -26,6 +26,6 @@ buildGoPackage rec {
     description = "Kubernetes log viewer";
     homepage = https://github.com/boz/kail;
     license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
+    maintainers = with maintainers; [ offline vdemeester ];
   };
 }
diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix
index b7b4bfb38560..ee5d2fb8271f 100644
--- a/pkgs/tools/networking/kail/deps.nix
+++ b/pkgs/tools/networking/kail/deps.nix
@@ -14,26 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/Azure/go-autorest";
-      rev =  "f6be1abbb5abd0517522f850dd785990d373da7e";
-      sha256 = "1dgmvvp2lk5z2mc9f6wg5jgi2szgljy02k69lqbym8zqlph3h01n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/PuerkitoBio/purell";
-    fetch = {
-      type = "git";
-      url = "https://github.com/PuerkitoBio/purell";
-      rev =  "7cf257f0a33260797b0febf39f95fccd86aab2a3";
-      sha256 = "1j4dcv8ryqxwpmb6k12ilkgkjwa0viymygfa3ilvfw0149jh0syk";
-    };
-  }
-  {
-    goPackagePath  = "github.com/PuerkitoBio/urlesc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/PuerkitoBio/urlesc";
-      rev =  "de5bf2ad457846296e2031421a34e2568e304e35";
-      sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
+      rev =  "1ff28809256a84bb6966640ff3d0371af82ccba4";
+      sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv";
     };
   }
   {
@@ -77,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/boz/kcache";
-      rev =  "fb1338d323013e9456687dc080038aa0bb211783";
-      sha256 = "05y7j3sxpa9nhpq53af9ad42fvwx7l3cpjm69nminrlqjmjs63zd";
+      rev =  "a012826955254d3f31548911e75a9dbd817f9470";
+      sha256 = "0xqw4mgz0scjrcfsyfwfdhggq1q80dv4mdqgdaryy5ir18srg15l";
     };
   }
   {
@@ -95,26 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dgrijalva/jwt-go";
-      rev =  "a539ee1a749a2b895533f979515ac7e6e0f5b650";
-      sha256 = "1kxvm6zyawisl3w4pcycqjld4r0x6hqpfh9jwqsg5y9pi330n5z9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/emicklei/go-restful";
-    fetch = {
-      type = "git";
-      url = "https://github.com/emicklei/go-restful";
-      rev =  "68c9750c36bb8cb433f1b88c807b4b30df4acc40";
-      sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67";
-    };
-  }
-  {
-    goPackagePath  = "github.com/emicklei/go-restful-swagger12";
-    fetch = {
-      type = "git";
-      url = "https://github.com/emicklei/go-restful-swagger12";
-      rev =  "dcef7f55730566d41eae5db10e7d6981829720f6";
-      sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
     };
   }
   {
@@ -135,42 +99,6 @@
       sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
     };
   }
-  {
-    goPackagePath  = "github.com/go-openapi/jsonpointer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/jsonpointer";
-      rev =  "779f45308c19820f1a69e9a4cd965f496e0da10f";
-      sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/jsonreference";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/jsonreference";
-      rev =  "36d33bfe519efae5632669801b180bf1a245da3b";
-      sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/spec";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/spec";
-      rev =  "3faa0055dbbf2110abc1f3b4e3adbb22721e96e7";
-      sha256 = "1a3q073zaq5d10kzgba7a85l4g389r5qgbpwk4nkbawpdzm8svaz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/swag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/swag";
-      rev =  "f3f9494671f93fcff853e3c6e9e948b3eb71e590";
-      sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy";
-    };
-  }
   {
     goPackagePath  = "github.com/gogo/protobuf";
     fetch = {
@@ -243,15 +171,6 @@
       sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr";
     };
   }
-  {
-    goPackagePath  = "github.com/howeyc/gopass";
-    fetch = {
-      type = "git";
-      url = "https://github.com/howeyc/gopass";
-      rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
-      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
-    };
-  }
   {
     goPackagePath  = "github.com/imdario/mergo";
     fetch = {
@@ -266,26 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/json-iterator/go";
-      rev =  "abe3c4016bd3f50fa9c5b0e909641e2b8370b0cf";
-      sha256 = "18v04mxgssjw2wivrbrfm8v7k617szjjdndgink00pla03pga0cc";
-    };
-  }
-  {
-    goPackagePath  = "github.com/juju/ratelimit";
-    fetch = {
-      type = "git";
-      url = "https://github.com/juju/ratelimit";
-      rev =  "5b9ff866471762aa2ab2dced63c9fb6f53921342";
-      sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mailru/easyjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev =  "2f5df55504ebc322e4d52d34df6a1f5b503bf26d";
-      sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p";
+      rev =  "ab8a2e0c74be9d3be70b3184d9acc634935ded82";
+      sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4";
     };
   }
   {
@@ -306,6 +207,24 @@
       sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
     };
   }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "94122c33edd36123c84d5368cfb2b69df93a0ec8";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
   {
     goPackagePath  = "github.com/petar/GoLLRB";
     fetch = {
@@ -414,6 +333,15 @@
       sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "fbb02b2291d28baffd63558aa44b4b56f178d650";
+      sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4";
+    };
+  }
   {
     goPackagePath  = "google.golang.org/appengine";
     fetch = {
@@ -455,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/api";
-      rev =  "218912509d74a117d05a718bb926d0948e531c20";
-      sha256 = "076jca9c4rsg2kwjwv4kr6qgpbj4w1z0xprkxz5f5glxjnffdifk";
+      rev =  "2d6f90ab1293a1fb871cf149423ebb72aa7423aa";
+      sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx";
     };
   }
   {
@@ -464,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/apimachinery";
-      rev =  "18a564baac720819100827c16fdebcadb05b2d0d";
-      sha256 = "0x6sxr79rmnjyk0m53n66xr58xb8mza716jdn9f0djjwd10d1p1i";
+      rev =  "103fd098999dc9c0c88536f5c9ad2e5da39373ae";
+      sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc";
     };
   }
   {
@@ -473,17 +401,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/client-go";
-      rev =  "82aa063804cf055e16e8911250f888bc216e8b61";
-      sha256 = "1l8dakfsawgxhiaqq0k9360gl13vr44sbjdxf7sbg3pl2csmi6pf";
+      rev =  "1f13a808da65775f22cbf47862c4e5898d8f4ca1";
+      sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9";
     };
   }
-  {
-    goPackagePath  = "k8s.io/kube-openapi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/kube-openapi";
-      rev =  "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8";
-      sha256 = "1hvrdbpf8w6jr533pa3cqws42plasl5vzcr8fj89gxdbhga6b10j";
-    };
-  }
-]
+]
\ No newline at end of file

From 3decb753d888309dc5a2bbe79f2fe07efd36761e Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:07:36 +0200
Subject: [PATCH 1947/3253] drone: 0.8.5 -> 0.8.6 (#47470)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../tools/continuous-integration/drone/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index d8ba99fbf1a8..81dbc54cece0 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "drone.io-${version}";
-  version = "0.8.5-20180329-${stdenv.lib.strings.substring 0 7 revision}";
-  revision = "81103a98208b0bfc76be5b07194f359fbc80183b";
+  version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
+  revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
   goPackagePath = "github.com/drone/drone";
 
   # These dependencies pulled (in `drone` buildprocess) via Makefile,
@@ -16,7 +16,7 @@ buildGoPackage rec {
     owner = "drone";
     repo = "drone";
     rev = revision;
-    sha256 = "1890bwhxr62adv261v4kn1azhq7qvcj2zpll68i9nsvjib8a52bq";
+    sha256 = "0miq2012nivvr1ysi3aa2xrr5ak3mf0l3drybyc83iycy0kp4bda";
   };
 
   meta = with stdenv.lib; {

From f51a090e24c803a819bb9ad84a0aa6c723063a03 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:10:14 +0200
Subject: [PATCH 1948/3253] gomodifytags: unstable-2017-12-14 ->
 unstable-2018-09-14 (#47467)

gomodifytags: unstable-2017-12-14 -> unstable-2018-09-14
---
 pkgs/development/tools/gomodifytags/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix
index 86b7246b4113..112e1769f212 100644
--- a/pkgs/development/tools/gomodifytags/default.nix
+++ b/pkgs/development/tools/gomodifytags/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "gomodifytags-${version}";
-  version = "unstable-2017-12-14";
-  rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa";
+  name = "gomodifytags-unstable-${version}";
+  version = "2018-09-14";
+  rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
 
   goPackagePath = "github.com/fatih/gomodifytags";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/fatih/gomodifytags";
-    sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q";
+    owner = "fatih";
+    repo = "gomodifytags";
+    sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa";
   };
 
   meta = {

From a006e2fd7cd7c25e8db1024e6c1d8ec3bc48d290 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Fri, 28 Sep 2018 20:13:29 +0200
Subject: [PATCH 1949/3253] pythonPackages.django_2_1: 2.1 -> 2.1.1 (#47481)

See https://docs.djangoproject.com/en/2.1/releases/2.1.1/ for release
notes
---
 pkgs/development/python-modules/django/2_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index f63822f363ab..f66215c84db1 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.1";
+  version = "2.1.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dv184lgp7scq8cr4422rrvkd8npyiqww0zw50ygcim5smw6093z";
+    sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 5b39fd6ce6605a72a75b0f0e4b30be94eeeed0fb Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 28 Sep 2018 20:14:06 +0200
Subject: [PATCH 1950/3253] vndr: 20171005 -> unstable-2018-06-23 (#47466)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/vndr/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 0fbcd7b71a60..42cf6f07f4d0 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -1,9 +1,9 @@
 { lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "vndr-${version}";
-  version = "20171005-${lib.strings.substring 0 7 rev}";
-  rev = "b57c5799efd5ed743f347a025482babf01ba963e";
+  name = "vndr-unstable-${version}";
+  version = "2018-06-23";
+  rev = "81cb8916aad3c8d06193f008dba3e16f82851f52";
 
   goPackagePath = "github.com/LK4D4/vndr";
   excludedPackages = "test";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "LK4D4";
     repo = "vndr";
-    sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v";
+    sha256 = "0c0k0cic35d1141az72gbf8r0vm9zaq4xi8v1sqpxhlzf28m297l";
   };
 
   meta = {

From a054f269bf67b77492b5bf5ed526009ec3f2743a Mon Sep 17 00:00:00 2001
From: Tom Bereknyei <tom@dds.mil>
Date: Fri, 28 Sep 2018 14:14:32 -0400
Subject: [PATCH 1951/3253] gnuradio: 3.7.13.3 -> 3.7.13.4

---
 pkgs/applications/misc/gnuradio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 0224d5fd68c7..a7c00cceaa72 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.13.3";
+  version = "3.7.13.4";
 
   src = fetchFromGitHub {
     owner = "gnuradio";
     repo = "gnuradio";
     rev = "v${version}";
-    sha256 = "1qpa53axqavdv2ykby7rwh7xmhvv964xq1d7rcvbwkry7dngrbib";
+    sha256 = "0ybfn2zfr9lc1bi3c794l4bzpj8y6vas9c4rbcj4nqlx0zf3p8fn";
     fetchSubmodules = true;
   };
 

From ef64786cda0607231707c29526555948c085a2d7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 28 Sep 2018 16:02:51 +0100
Subject: [PATCH 1952/3253] terraform: move providers to terraform-providers

Before, providers were only built indirectly. Since proviers don't
depend on terraform to build they can be moved into their own collection
of packages. This also has the advantage that they can be reached
directly using an attribute path (Eg: terraform-providers.nixos).

Co-authored-by: Wael Nasreddine <wael.nasreddine@gmail.com>
---
 .../providers => terraform-providers}/data.nix        |  0
 .../providers => terraform-providers}/default.nix     |  0
 .../providers => terraform-providers}/providers.txt   |  0
 .../providers => terraform-providers}/update-all      |  0
 .../networking/cluster/terraform/default.nix          | 11 +++++++++--
 pkgs/top-level/aliases.nix                            |  1 +
 pkgs/top-level/all-packages.nix                       |  9 +++++++--
 7 files changed, 17 insertions(+), 4 deletions(-)
 rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/data.nix (100%)
 rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/default.nix (100%)
 rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/providers.txt (100%)
 rename pkgs/applications/networking/cluster/{terraform/providers => terraform-providers}/update-all (100%)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform/providers/data.nix
rename to pkgs/applications/networking/cluster/terraform-providers/data.nix
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform/providers/default.nix
rename to pkgs/applications/networking/cluster/terraform-providers/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform/providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform/providers/providers.txt
rename to pkgs/applications/networking/cluster/terraform-providers/providers.txt
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform/providers/update-all
rename to pkgs/applications/networking/cluster/terraform-providers/update-all
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 1a88fea3d775..767eb94454d8 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper }:
+{ stdenv
+, lib
+, buildEnv
+, buildGoPackage
+, fetchFromGitHub
+, makeWrapper
+, terraform-providers
+}:
 
 let
   goPackagePath = "github.com/hashicorp/terraform";
@@ -75,7 +82,7 @@ let
             });
     in withPlugins (_: []);
 
-  plugins = import ./providers { inherit lib buildGoPackage fetchFromGitHub; };
+  plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"];
 in rec {
   terraform_0_8_5 = generic {
     version = "0.8.5";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 26bc7ebc6f1a..6d5d1fe2081c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -277,6 +277,7 @@ mapAliases ({
   telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19
   telepathy_salut = telepathy-salut; # added 2018-02-25
   telnet = inetutils; # added 2018-05-15
+  terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
   tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
   tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
   tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57229f7f547c..2c57dac51cd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22105,14 +22105,19 @@ with pkgs;
   terraform = terraform_0_11;
   terraform-full = terraform_0_11-full;
 
+  terraform-providers = recurseIntoAttrs (
+    callPackage ../applications/networking/cluster/terraform-providers {}
+  );
+
+  terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
+
   terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {};
 
+
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};
 
-  terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
-
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
   terragrunt_0_11_1 = callPackage ../applications/networking/cluster/terragrunt/0.11.1.nix {

From 206e58bde8fc493df5d8d4da9790f758ec7fc4eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 28 Sep 2018 15:29:40 -0300
Subject: [PATCH 1953/3253] perlPackages.LinuxDesktopFiles: init at 0.25
 (#47480)

---
 pkgs/top-level/perl-packages.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f2d2da0cc6ff..ba91c843e802 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8434,6 +8434,20 @@ let
     };
   };
 
+  LinuxDesktopFiles = buildPerlPackage rec {
+    name = "Linux-DesktopFiles-0.25";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TR/TRIZEN/${name}.tar.gz";
+      sha256 = "60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5";
+    };
+    buildInputs = [ ModuleBuild ];
+    meta = {
+      homepage = https://github.com/trizen/Linux-DesktopFiles;
+      description = "Fast parsing of the Linux desktop files";
+      license = stdenv.lib.licenses.artistic2;
+    };
+  };
+
   LinuxDistribution = buildPerlModule {
     name = "Linux-Distribution-0.23";
     src = fetchurl {

From 8172085eb1bc23059c40aa95b9434d60a51aac76 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <screendriver@users.noreply.github.com>
Date: Fri, 28 Sep 2018 20:31:08 +0200
Subject: [PATCH 1954/3253] yarn: 1.9.4 -> 1.10.1 (#47405)

---
 pkgs/development/tools/yarn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index dae90569a90b..69545a764c52 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "1.9.4";
+  version = "1.10.1";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0lxncqvz66167ijhsi76ds2yp8140d9ywn89y5vm92010irsgs20";
+    sha256 = "0j9y53k0wxgwjvvpbs6rr4nbydg3bn4khcxsrnzyrakym0ihgmr1";
   };
 
   buildInputs = [ nodejs ];

From 6ff45f34d8729d93802d16a1d654b1d7cb168ccb Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 28 Sep 2018 11:28:38 -0700
Subject: [PATCH 1955/3253] terraform-providers: move ibm and libvirt
 underneath the terraform-providers

---
 .../cluster/terraform-providers/default.nix           | 11 +++++++++--
 .../ibm}/default.nix                                  |  0
 .../libvirt}/default.nix                              |  0
 pkgs/top-level/aliases.nix                            |  2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename pkgs/applications/networking/cluster/{terraform-provider-ibm => terraform-providers/ibm}/default.nix (100%)
 rename pkgs/applications/networking/cluster/{terraform-provider-libvirt => terraform-providers/libvirt}/default.nix (100%)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index a535ab06f453..b3b13539ff50 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoPackage
+, fetchFromGitHub
+, callPackage
+}:
 let
   list = import ./data.nix;
 
@@ -17,4 +21,7 @@ let
       postBuild = "mv go/bin/${repo}{,_v${version}}";
     };
 in
-  lib.mapAttrs (n: v: toDrv v) list
+  {
+    ibm = callPackage ./ibm {};
+    libvirt = callPackage ./libvirt {};
+  } // lib.mapAttrs (n: v: toDrv v) list
diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
rename to pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix
diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix
rename to pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6d5d1fe2081c..92a0f2b45709 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -277,6 +277,8 @@ mapAliases ({
   telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19
   telepathy_salut = telepathy-salut; # added 2018-02-25
   telnet = inetutils; # added 2018-05-15
+  terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28
+  terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
   terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
   tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
   tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03

From de81064cd425d3bcba664da847ee4109eaa5def8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:37:04 -0700
Subject: [PATCH 1956/3253] deepin.dtkwidget: 2.0.9.3 -> 2.0.9.4 (#47086)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dtkwidget/versions
---
 pkgs/desktops/deepin/dtkwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index c9dbd124b038..268f9518495e 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkwidget";
-  version = "2.0.9.3";
+  version = "2.0.9.4";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "1ngspvjvws1d2nkyqjh9y45ilahkd1fqwxnlmazgik4355mb76bv";
+    sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m";
   };
 
   nativeBuildInputs = [

From 4b8aef50990333cb52bb39e42e78793ccb8e325d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:38:26 -0700
Subject: [PATCH 1957/3253] deepin.deepin-menu: 3.3.10 -> 3.4.0 (#47084)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/deepin-menu/versions
---
 pkgs/desktops/deepin/deepin-menu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index df0dcc379070..eeed3579f459 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-menu";
-  version = "3.3.10";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "1666821c2irs2hjgr3kvivij6c2fgjva8323kplrz75w2lz518xb";
+    sha256 = "15v2v7pg53csxmhmnkglxv5mj9cpn0ph8kv3hj44973sdwyrl51f";
   };
 
   nativeBuildInputs = [

From a84000501a166f084178c7560871fda2babf3968 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:41:16 -0700
Subject: [PATCH 1958/3253] fping: 4.0 -> 4.1 (#47054)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fping/versions
---
 pkgs/tools/networking/fping/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index adcb59135ee1..e0cd0ff8849a 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-4.0";
+  name = "fping-4.1";
 
   src = fetchurl {
     url = "https://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7";
+    sha256 = "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7";
   };
 
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

From b3b457320890e4de1ce6d0b2cc2b0c00087df76d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:43:00 -0700
Subject: [PATCH 1959/3253] googler: 3.6 -> 3.7 (#47044)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/googler/versions
---
 pkgs/applications/misc/googler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index ca6ccdcdb2ae..45b4ad88cff3 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, python}:
 
 stdenv.mkDerivation rec {
-  version = "3.6";
+  version = "3.7";
   name = "googler-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "googler";
     rev = "v${version}";
-    sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6";
+    sha256 = "0dxg849ckyy181zlrb57hd959cgvx105c35ksmvi4wl285sh5kpj";
   };
 
   propagatedBuildInputs = [ python ];

From 0b324f35f60f4df026aa0d369986d802a8ec565b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:50:07 -0700
Subject: [PATCH 1960/3253] folly: 2018.08.13.00 -> 2018.08.27.00 (#46282)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/folly/versions
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index d188cb9810a7..9694765bb93f 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.08.13.00";
+  version = "2018.08.27.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr";
+    sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From b96e52565de6eed58e7a80ab0f5f061fd06e3387 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:54:49 -0700
Subject: [PATCH 1961/3253] crawl: 0.22.0 -> 0.22.1 (#46952)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crawl/versions
---
 pkgs/games/crawl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index b444f5b0be0f..b2015a28947a 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.22.0";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl";
+    sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr";
   };
 
   # Patch hard-coded paths in the makefile

From 1ff5b1342b6cd0335f920715c428e92ec5e9c93e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:55:57 -0700
Subject: [PATCH 1962/3253] workrave: 1.10.20 -> 1.10.21 (#46930)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/workrave/versions
---
 pkgs/applications/misc/workrave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 6e92e98481ea..4a16793b1c65 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "workrave-${version}";
-  version = "1.10.20";
+  version = "1.10.21";
 
   src = let
   in fetchFromGitHub {
-    sha256 = "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941";
+    sha256 = "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia";
     rev = with stdenv.lib;
       "v" + concatStringsSep "_" (splitString "." version);
     repo = "workrave";

From 5bfe6579b1e1fcbaed1c0ee762aa5c918b273043 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:58:00 -0700
Subject: [PATCH 1963/3253] yank: 0.8.3 -> 1.0.0 (#46926)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yank/versions
---
 pkgs/tools/misc/yank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix
index 36aa4ab09c46..eaefd6d61aa6 100644
--- a/pkgs/tools/misc/yank/default.nix
+++ b/pkgs/tools/misc/yank/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     owner = "mptre";
     repo = "yank";
     rev = "v${meta.version}";
-    sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7";
+    sha256 = "03h99i59kq8jlmshfwas1qm4y5ksw9lxaf9kr14l2mp028g7930n";
     inherit name;
   };
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     '';
     downloadPage = "https://github.com/mptre/yank/releases";
     license = licenses.mit;
-    version = "0.8.3";
+    version = "1.0.0";
     maintainers = [ maintainers.dochang ];
     platforms = platforms.unix;
   };

From b0e981d0bf28fd2d3aa256ff3b5037114197a5fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 11:58:55 -0700
Subject: [PATCH 1964/3253] zxcvbn-c: 2.3 -> 2.4 (#46925)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zxcvbn-c/versions
---
 pkgs/development/libraries/zxcvbn-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 1ba073943483..65509d766b96 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   name = "zxcvbn-c-${version}";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "tsyrogit";
     repo = "zxcvbn-c";
     rev = "v${version}";
-    sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b";
+    sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas";
   };
 
   installPhase = ''

From 42af103ae323cce80a70e8ddc530fe5942f91baa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:09:26 -0700
Subject: [PATCH 1965/3253] otter-browser: 0.9.96 -> 0.9.99.3 (#46217)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
otter-browser
---
 pkgs/applications/networking/browsers/otter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix
index d1f50627d905..321980757b9b 100644
--- a/pkgs/applications/networking/browsers/otter/default.nix
+++ b/pkgs/applications/networking/browsers/otter/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cmake, fetchFromGitHub
 , qtbase, qtmultimedia, qtwebengine
-, version ? "0.9.96"
-, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p"
+, version ? "0.9.99.3"
+, sourceSha ? "0dkismjs3daz5afx6s5arwvynsw5qpvv2rqbzvmpihn6khnhap55"
 }:
 stdenv.mkDerivation {
   name = "otter-browser-${version}";

From e799f39632f860f6515ef65d9c5c8324a472d2fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:09:53 -0700
Subject: [PATCH 1966/3253] nss_pam_ldapd: 0.9.7 -> 0.9.10 (#46226)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
nss-pam-ldapd
---
 pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index e5fde0f80385..fc961675c7f1 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nss-pam-ldapd-${version}";
-  version = "0.9.7";
+  version = "0.9.10";
   
   src = fetchurl {
     url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
-    sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d";
+    sha256 = "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0";
   };
   
   nativeBuildInputs = [ pkgconfig ];

From ee8f6be536a6cb0009b368e72f5d3f83671bc6e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:12:26 -0700
Subject: [PATCH 1967/3253] openimageio: 1.8.9 -> 1.8.14 (#46232)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
openimageio
---
 pkgs/applications/graphics/openimageio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 49835298f132..bc669e9e1a01 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "openimageio-${version}";
-  version = "1.8.9";
+  version = "1.8.14";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
     rev = "Release-${version}";
-    sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h";
+    sha256 = "07axn7bziy9h5jawpwcchag0nkczivaajsw69mxgmr508gw9r0xn";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];

From 6b7a60e820210038be72afdc02d1290e63c5358c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:15:11 -0700
Subject: [PATCH 1968/3253] wxSVG: 1.5.14 -> 1.5.15 (#46944)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wxsvg/versions
---
 pkgs/development/libraries/wxSVG/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index 59f6af7eddb2..27b95208432e 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "wxSVG-${version}";
   srcName = "wxsvg-${version}";
-  version = "1.5.14";
+  version = "1.5.15";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
-    sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5";
+    sha256 = "1f6fhkdmcfs8w7x08vhiqygss4qzcsimhd91h0j58zw25ky6rzqn";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e8719747a8eaf1f1d6fee4d277ec5ad1c9e5d005 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:18:05 -0700
Subject: [PATCH 1969/3253] rspamd: 1.7.3 -> 1.7.9 (#46194)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
rspamd
---
 pkgs/servers/mail/rspamd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 4de63d694667..c8da0ea630e1 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.7.3";
+  version = "1.7.9";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "1gb4zg8i1nj337f65s434h299ad19c0d7jyawb2glvv3n4cshm97";
+    sha256 = "1qfkmcrcswh7k7bvr1ki1n83lnjmfd9h0281qgia0dlam7y81bcy";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From c233b35c16a182ad232f1d3b9c750da77b8889f1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:22:37 -0700
Subject: [PATCH 1970/3253] seafile-client: 6.2.4 -> 6.2.5 (#46950)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/seafile-client/versions
---
 pkgs/applications/networking/seafile-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 06c84759a590..245d673bc5a4 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.2.4";
+  version = "6.2.5";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "0z5li1d7ipsm1mp0lk6mls220v4vlmsqm8ym8kxlkinqbmkky0hz";
+    sha256 = "1g09gsaqr4swgwnjxz994xgjsv7mlfaypp6r37bbsiy89a7ppzfl";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From d7f16adf6cc7bfd3bfd1e8bb1faa1444684b4dd4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:27:59 -0700
Subject: [PATCH 1971/3253] lttng-tools: 2.10.4 -> 2.10.5 (#46238)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
lttng-tools
---
 pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 6be23c171a6a..e016882c8ef5 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-tools-${version}";
-  version = "2.10.4";
+  version = "2.10.5";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay";
+    sha256 = "04bll20lqb76xi6hcjrlankvyqc1hkyj8kvc4gf867lnxxw811m4";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e090aaeed4591e60449fa4a14c52179d49d4149a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:30:32 -0700
Subject: [PATCH 1972/3253] adapta-gtk-theme: 3.94.0.132 -> 3.94.0.149 (#47331)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/adapta-gtk-theme/versions
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 09fc7a4b4475..37e7af95a910 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.94.0.132";
+  version = "3.94.0.149";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "11j4mpbw8x2vg0w740v8q3rnwannw2zhp60aj8kirqlgz76lbadl";
+    sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i";
   };
 
   preferLocalBuild = true;

From 8a57be905083d61f2d061619da86333cb4963255 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 12:31:40 -0700
Subject: [PATCH 1973/3253] deepin.dtkcore: 2.0.9 -> 2.0.9.4 (#47072)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dtkcore/versions
---
 pkgs/desktops/deepin/dtkcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 1dfb627c605d..3fc9a1b4a03e 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "dtkcore";
-  version = "2.0.9";
+  version = "2.0.9.4";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "0jfl4w3sviy59rl41a5507dbhqhsxy7hqw3gf64a57gjlbdskmm1";
+    sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4";
   };
 
   nativeBuildInputs = [

From c19cce940909c130d279fbcc7d5c8a5ed2c0bc70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:07:59 -0700
Subject: [PATCH 1974/3253] libsForQt5.libopenshot-audio: 0.1.6 -> 0.1.7
 (#47028)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libopenshot-audio/versions
---
 pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index db6ceedbbf72..9e275464f05c 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -4,13 +4,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-audio-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${version}";
-    sha256 = "0cf8wx6a8ba4rhfby6abpr8ks2a0hxj76mas9751ihz59w1vdisy";
+    sha256 = "08a8wbi28kwrdz4h0rs1b9vsr28ldfi8g75q54rj676y1vwg3qys";
   };
 
   nativeBuildInputs =

From 844ebe2039fb032e4294e2a74eaf92740dbcf4c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:15:11 -0700
Subject: [PATCH 1975/3253] kgraphviewer: 2.4.2 -> 2.4.3 (#47031)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kgraphviewer/versions
---
 pkgs/applications/graphics/kgraphviewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 0d898df14b3f..e70fafa24b60 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   name = "kgraphviewer-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
-    sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9";
+    sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
   };
 
   buildInputs = [

From d7dcea5bf0f906dbad5727bcda91abc01fb41398 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:15:41 -0700
Subject: [PATCH 1976/3253] libsForQt5.libopenshot: 0.2.0 -> 0.2.1 (#47037)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libopenshot/versions
---
 pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 422b50a85854..64bbb07f0aaa 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "15i7wir1ph4g47634f8j3s8ay20zypj6p6fq8781g4w9gzgwrz2c";
+    sha256 = "0n8ksnv6y2qh9iz352zqibfhnfvyjq7pkvy51prl47620ac40pc3";
   };
 
   patchPhase = ''

From e9300aa12c9c18c1214df84ca50ba9b41b2f165f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 28 Sep 2018 21:39:50 +0200
Subject: [PATCH 1977/3253] libgaminggear: init at 0.15.1

This is a requirement for roccat-tools, which is going to be introduced
soon.

The reason why I'm using propagatedBuildInputs here is because the
pkg-config file lists *all* of the dependencies in Requires and
Requires.private, so those libraries are needed whenever any software
uses that library.

Signed-off-by: aszlig <aszlig@nix.build>
---
 .../libraries/libgaminggear/default.nix       | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/libraries/libgaminggear/default.nix

diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
new file mode 100644
index 000000000000..a6fe2bc1435f
--- /dev/null
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, cmake, pkgconfig, gettext
+, gtk2, libcanberra, libnotify, pcre, sqlite, xorg
+}:
+
+stdenv.mkDerivation rec {
+  name = "libgaminggear-${version}";
+  version = "0.15.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2";
+    sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz";
+  };
+
+  outputs = [ "dev" "out" "bin" ];
+
+  nativeBuildInputs = [ cmake pkgconfig gettext ];
+
+  propagatedBuildInputs = [
+    gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs
+  ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DINSTALL_CMAKE_MODULESDIR=lib/cmake"
+    "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig"
+    "-DINSTALL_LIBDIR=lib"
+  ];
+
+  postFixup = ''
+    moveToOutput bin "$bin"
+  '';
+
+  meta = {
+    description = "Provides functionality for gaming input devices";
+    homepage = https://sourceforge.net/projects/libgaminggear/;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..68a98ba5e726 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3781,6 +3781,8 @@ with pkgs;
 
   libfann = callPackage ../development/libraries/libfann { };
 
+  libgaminggear = callPackage ../development/libraries/libgaminggear { };
+
   libipfix = callPackage ../development/libraries/libipfix { };
 
   libircclient = callPackage ../development/libraries/libircclient { };

From c502dd8a5b8af017007adddf73e614fc7bfbbe51 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 28 Sep 2018 21:40:23 +0200
Subject: [PATCH 1978/3253] roccat-tools: init at 5.7.0

I had this package along with libgaminggear laying around since June
2016[1] and basically just did the setup for the ROCCAT device once and
never touched it again since then. However, I got requests from other
users who might need this, so I decided to finally upstream it along
with using the latest versions.

There were a few hardcoded paths to fix, like eg. /etc/xdg and another
one that used /var/lib/roccat, the latter I moved into $XDG_DATA_HOME
instead.

The reason why I put it in os-specific/linux is that the official site
explicitly states that it's for Linux only and I specified the platforms
attribute accordingly.

[1]: https://gist.github.com/aszlig/3a01c0c23254a68c2be4c6df59e26862

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @devhell
---
 .../linux/roccat-tools/default.nix            | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/os-specific/linux/roccat-tools/default.nix

diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
new file mode 100644
index 000000000000..a413008ffd1a
--- /dev/null
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, cmake, pkgconfig, gettext
+, dbus, dbus_glib, libgaminggear, libgudev, lua
+}:
+
+stdenv.mkDerivation rec {
+  name = "roccat-tools-${version}";
+  version = "5.7.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/roccat/${name}.tar.bz2";
+    sha256 = "15gxplcm62167xhk65k8v6gg3j6jr0c5a64wlz72y1vfq0ai7qm6";
+  };
+
+  postPatch = ''
+    sed -i -re 's,/(etc/xdg),\1,' roccateventhandler/CMakeLists.txt
+
+    sed -i -e '/roccat_profile_dir(void).*{/,/}/ {
+      /return/c \
+        return g_build_path("/", g_get_user_data_dir(), "roccat", NULL);
+    }' libroccat/roccat_helper.c
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig gettext ];
+  buildInputs = [ dbus dbus_glib libgaminggear libgudev lua ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = [
+    "-DUDEVDIR=\${out}/lib/udev/rules.d"
+    "-DCMAKE_MODULE_PATH=${libgaminggear.dev}/lib/cmake"
+    "-DWITH_LUA=${lua.luaversion}"
+    "-DLIBDIR=lib"
+  ];
+
+  meta = {
+    description = "Tools to configure ROCCAT devices";
+    homepage = http://roccat.sourceforge.net/;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68a98ba5e726..65fdd745e4dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14661,6 +14661,8 @@ with pkgs;
     payload = "${linux_riscv}/vmlinux";
   };
 
+  roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
+
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
   rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };

From b862d82b79aa7c2adc9c1db12b32ea69e4fc34c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:16:08 -0700
Subject: [PATCH 1979/3253] easyloggingpp: 9.96.4 -> 9.96.5 (#47083)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/easyloggingpp/versions
---
 pkgs/development/libraries/easyloggingpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 8c6337cfaf60..96e294ab2fbd 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -4,12 +4,12 @@
 { stdenv, fetchFromGitHub, cmake, gtest }:
 stdenv.mkDerivation rec {
   name = "easyloggingpp-${version}";
-  version = "9.96.4";
+  version = "9.96.5";
   src = fetchFromGitHub {
     owner = "muflihun";
     repo = "easyloggingpp";
     rev = "v${version}";
-    sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb";
+    sha256 = "03jycliki3h6lc8kci26s6lnx5bap47xsnsjd375qgr9l11g76f5";
   };
 
   nativeBuildInputs = [cmake];

From b65fbe8fcdd279ea57511eece61e3e1d7d56a47e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:17:32 -0700
Subject: [PATCH 1980/3253] gmsh: 4.0.0 -> 4.0.1 (#47060)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gmsh/versions
---
 pkgs/applications/science/math/gmsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 7bc8729c3fe5..7973fa8b3efb 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.0.0"; in
+let version = "4.0.1"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "0pqm0ippj0j07919hld3f3rgq0p1x4j32fxb2m1nyp226zx8l37v";
+    sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz";
   };
 
   # The original CMakeLists tries to use some version of the Lapack lib

From 7fe9b6d925dec00e47cc0b5f4fc2ce96a6aa4867 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:18:57 -0700
Subject: [PATCH 1981/3253] gpxsee: 5.17 -> 5.18 (#47052)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gpxsee/versions
---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 33ffb6b5acb3..2f61ba683f3f 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "5.17";
+  version = "5.18";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0fr835glvwnpq6sy181z0gskvwfrmvh7115r3d92xy71v8b1l5ib";
+    sha256 = "0dl10fr881b8fwf2yj14bd6gagb8hm0s46q18y2y56rw98nk4vrq";
   };
 
   nativeBuildInputs = [ qmake ];

From 9b48d87889a28958c5b3a7f8b0b1bbd74ccd11d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:23:27 -0700
Subject: [PATCH 1982/3253] fio: 3.8 -> 3.10 (#47058)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fio/versions
---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 261f4cee2b83..41016dc49fa5 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
-  version = "3.8";
+  version = "3.10";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "1krifr4ms7x229a3p088zl5rpdrfwz6bw4c2lrz3hksignjxaw91";
+    sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0";
   };
 
   buildInputs = [ python zlib ]

From 99b80a111e4256384cf2367b83e8e49483afd6fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:23:46 -0700
Subject: [PATCH 1983/3253] flexget: 2.14.18 -> 2.14.21 (#47053)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flexget/versions
---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 53ee46e20606..70639e364c3e 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,11 +36,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.14.18";
+  version = "2.14.21";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pyvm1d23qy71rg7fzxcal8978kni7sn09zw4s4dsq56g8w80ay9";
+    sha256 = "08z0pf1g5xp3760da48v9h9hja2j8cgrwkgim156drk259bf5vm2";
   };
 
   postPatch = ''

From 48e3908074c8f221f6fb494df1095f3925352389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 28 Sep 2018 17:28:22 -0300
Subject: [PATCH 1984/3253] neap: init at 0.7.2 (#47393)

---
 pkgs/applications/misc/neap/default.nix | 44 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/misc/neap/default.nix

diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix
new file mode 100644
index 000000000000..21a5ab0cd0f6
--- /dev/null
+++ b/pkgs/applications/misc/neap/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+stdenv.mkDerivation rec {
+  name = "neap-${version}";
+  version = "0.7.2";
+
+  src = fetchFromGitHub {
+    owner = "vzxwco";
+    repo = "neap";
+    rev = "v${version}";
+    sha256 = "04da8rq23rl1qcvrdm5m3l90xbwyli7x601sckv7hmkip2q3g1kz";
+  };
+
+  nativeBuildInputs = [
+    python2Packages.wrapPython
+  ];
+
+  buildInputs = [
+    python2Packages.python
+  ];
+
+  pythonPath = [
+    python2Packages.xlib
+    python2Packages.pygtk
+  ];
+
+  installPhase = ''
+    install -D -t $out/bin neap
+    install -D -t $out/share/man/man1 neap.1
+    install -D -t $out/share/applications neap.desktop
+  '';
+
+  postFixup = ''
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Systray workspace pager";
+    homepage = https://github.com/vzxwco/neap;
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 736b3118f2dc..1c0bb55d8233 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17795,6 +17795,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  neap = callPackage ../applications/misc/neap { };
+
   neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
 
   natron = callPackage ../applications/video/natron { };

From 90ee5cbeb215dffa37ba9ec1e68ce09647a999f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:29:19 -0700
Subject: [PATCH 1985/3253] ccid: 1.4.29 -> 1.4.30 (#47332)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ccid/versions
---
 pkgs/tools/security/ccid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 0f515c518040..67252453743b 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.29";
+  version = "1.4.30";
   name = "ccid-${version}";
 
   src = fetchurl {
     url = "https://ccid.apdu.fr/files/${name}.tar.bz2";
-    sha256 = "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5";
+    sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc";
   };
 
   postPatch = ''

From 3d706c0b0bd09d54fb5c891f1bd0fe9e6f314594 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:32:09 -0700
Subject: [PATCH 1986/3253] leatherman: 1.4.2 -> 1.5.0 (#47035)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/leatherman/versions
---
 pkgs/development/libraries/leatherman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a269069fb048..b01d902fd91a 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
-    sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb";
+    sha256 = "1plx111mfci8z33mwy56y54n597gi8965s7bmnribkk8bvdn10dy";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 78bbf612f1a995aff2ed44816e6075f271e71fea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:34:50 -0700
Subject: [PATCH 1987/3253] chirp: 20180815 -> 20180906 (#47323)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/chirp-daily/versions
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 8a26631d5c0d..051e2c010a81 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180815";
+  version = "20180906";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv";
+    sha256 = "00cq15892p46z1j1fl2pd17y7k4rc6cfz7gaxb446mshxrvbfgam";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 712da92800f796da9f23d3a31c5d49492dfd536d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:36:18 -0700
Subject: [PATCH 1988/3253] lightdm_gtk_greeter: 2.0.5 -> 2.0.6 (#47021)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lightdm-gtk-greeter/versions
---
 pkgs/applications/display-managers/lightdm/gtk-greeter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 7ae854cee3cc..51cb28d02d26 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -9,14 +9,14 @@
 
 let
   ver_branch = "2.0";
-  version = "2.0.5";
+  version = "2.0.6";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-gtk-greeter-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
-    sha256 = "1pw70db8320wvkhkrw4i2qprxlrqy3jmb6yrr4bm3lgrizahiijx";
+    sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a866edc9bf09c1bddf46aed41a7791ffe8e84f48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:40:29 -0700
Subject: [PATCH 1989/3253] mediainfo-gui: 18.08 -> 18.08.1 (#47013)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mediainfo-gui/versions
---
 pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 3ff07ba20084..185cd82435b2 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "18.08";
+  version = "18.08.1";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n";
+    sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 608b5b10ded52afed874fb917e080667ea22e115 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:41:04 -0700
Subject: [PATCH 1990/3253] lynis: 2.6.8 -> 2.6.9 (#47015)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lynis/versions
---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 8158a4fbfd74..ad345afb5fcc 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.8";
+  version = "2.6.9";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "1g7jxjqvzl78fy770vlg6n6l003nvm452i2g3wnrb1fqcwkrm6ax";
+    sha256 = "125p5vpc2ksn0nab8y4ckfgx13rlv3w95amgighiqkh15ccji5kq";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 6d307e69999bf7c91fbfe270317480a3a8591e60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 13:44:54 -0700
Subject: [PATCH 1991/3253] librelp: 1.2.17 -> 1.2.18 (#47014)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/librelp/versions
---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 521f963e277c..e5d64c4143f1 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.17";
+  name = "librelp-1.2.18";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v";
+    sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6c90a975c27d59863600b4cfe47c4c3d2fb8e5d5 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Fri, 28 Sep 2018 23:54:43 +0300
Subject: [PATCH 1992/3253] rust-bindgen: 0.37.0 -> 0.40.0 (#46137)

---
 pkgs/development/tools/rust/bindgen/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 68df0af6ee46..0463ab3ba0af 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }:
+{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }:
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.37.0";
+  version = "0.40.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93";
+    sha256 = "0d7jqgi3aadwqcxiaz7axsq9h6n2i42yd3q0p1hc5l0kcdwwbj5k";
   };
 
-  cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w";
+  cargoSha256 = "1rjyazhnk9xihqw1qzkkcrab627lqbj789g5d5nb8bn2hkbdx5d6";
 
   libclang = llvmPackages.libclang.lib; #for substituteAll
 
@@ -19,14 +19,6 @@ rustPlatform.buildRustPackage rec {
 
   propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE
 
-  patches = [
-    # https://github.com/rust-lang-nursery/rust-bindgen/pull/1376
-    (fetchpatch {
-      url = https://github.com/rust-lang-nursery/rust-bindgen/commit/c8b5406f08af82a92bf8faf852c21ba941d9c176.patch;
-      sha256 = "16ibr2rplh0qz8rsq6gir45xlz5nasad4y8fprwhrb7ssv8wfkss";
-    })
-  ];
-
   configurePhase = ''
     export LIBCLANG_PATH="${libclang}/lib"
   '';

From 68879b36cbf3fae32b485a5af54b009139ae96e5 Mon Sep 17 00:00:00 2001
From: Zach Coyle <zach@trabian.com>
Date: Fri, 28 Sep 2018 16:59:03 -0400
Subject: [PATCH 1993/3253] teamocil: init at 1.4.2

---
 maintainers/maintainer-list.nix       |  5 +++++
 pkgs/tools/misc/teamocil/Gemfile      |  2 ++
 pkgs/tools/misc/teamocil/Gemfile.lock | 13 +++++++++++++
 pkgs/tools/misc/teamocil/default.nix  | 17 +++++++++++++++++
 pkgs/tools/misc/teamocil/gemset.nix   | 10 ++++++++++
 pkgs/tools/misc/teamocil/update       | 10 ++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 7 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/misc/teamocil/Gemfile
 create mode 100644 pkgs/tools/misc/teamocil/Gemfile.lock
 create mode 100644 pkgs/tools/misc/teamocil/default.nix
 create mode 100644 pkgs/tools/misc/teamocil/gemset.nix
 create mode 100755 pkgs/tools/misc/teamocil/update

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5ae4e1209ca2..34f99825184d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4633,6 +4633,11 @@
     github = "maggesi";
     name = "Marco Maggesi";
   };
+  zachcoyle = {
+    email = "zach.coyle@gmail.com";
+    github = "zachcoyle";
+    name = "Zach Coyle";
+  };
   zagy = {
     email = "cz@flyingcircus.io";
     github = "zagy";
diff --git a/pkgs/tools/misc/teamocil/Gemfile b/pkgs/tools/misc/teamocil/Gemfile
new file mode 100644
index 000000000000..046ba3d536e0
--- /dev/null
+++ b/pkgs/tools/misc/teamocil/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'teamocil'
diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock
new file mode 100644
index 000000000000..419c2ae49d31
--- /dev/null
+++ b/pkgs/tools/misc/teamocil/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    teamocil (1.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  teamocil
+
+BUNDLED WITH
+   1.16.3
diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix
new file mode 100644
index 000000000000..2215e4d4fee7
--- /dev/null
+++ b/pkgs/tools/misc/teamocil/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  inherit ruby;
+  pname = "teamocil";
+  gemdir = ./.;
+
+  meta = with lib; {
+    description     = "A simple tool used to automatically create windows and panes in tmux with YAML files";
+    homepage        = https://github.com/remiprev/teamocil;
+    license         = licenses.mit;
+    platforms       = platforms.all;
+    maintainers     = with maintainers; [
+      zachcoyle 
+    ];
+  };
+}
diff --git a/pkgs/tools/misc/teamocil/gemset.nix b/pkgs/tools/misc/teamocil/gemset.nix
new file mode 100644
index 000000000000..f363d62b6d68
--- /dev/null
+++ b/pkgs/tools/misc/teamocil/gemset.nix
@@ -0,0 +1,10 @@
+{
+  teamocil = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1l5f33faipb45xx7ds67s7dqgvjlljlcxgpgig4pg8p002vg06r2";
+      type = "gem";
+    };
+    version = "1.4.2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/teamocil/update b/pkgs/tools/misc/teamocil/update
new file mode 100755
index 000000000000..58a7bd4a4539
--- /dev/null
+++ b/pkgs/tools/misc/teamocil/update
@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash ruby bundler bundix
+
+rm Gemfile.lock
+bundler install
+bundix
+
+if [ "clean" == "$1" ]; then
+  rm -rf ~/.gem
+fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 736b3118f2dc..d31cb39d9317 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2320,6 +2320,8 @@ with pkgs;
 
   tealdeer = callPackage ../tools/misc/tealdeer { };
 
+  teamocil = callPackage ../tools/misc/teamocil { };
+
   uudeview = callPackage ../tools/misc/uudeview { };
 
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {

From c13821825b26e3ae68b085840164ae930b034580 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Fri, 28 Sep 2018 23:04:17 +0200
Subject: [PATCH 1994/3253] goaccess: fix homepage (#47495)

Homepage for goaccess is now https://goaccess.io. Old homepage
redirects here.
---
 pkgs/tools/misc/goaccess/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index 12c199801c71..b7ce52f49b36 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
-    homepage    = http://goaccess.prosoftcorp.com;
+    homepage    = https://goaccess.io;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ];

From 189d534d2b818adc5b6645f21206396d6aa706b7 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Fri, 28 Sep 2018 23:09:58 +0200
Subject: [PATCH 1995/3253] nodePackages_8_x: add http-server

---
 .../node-packages/node-packages-v10.nix       |   53 +-
 .../node-packages/node-packages-v6.nix        |   53 +-
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        | 7615 +++++++++++------
 4 files changed, 4963 insertions(+), 2759 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index b3b1977cdb4a..ae7130375524 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -238,13 +238,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chownr-1.0.1" = {
+    "chownr-1.1.1" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
-        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";
+        sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==";
       };
     };
     "class-utils-0.3.6" = {
@@ -288,10 +288,19 @@ let
       packageName = "combined-stream";
       version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
+    "combined-stream-1.0.7" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
+        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+      };
+    };
     "component-emitter-1.2.1" = {
       name = "component-emitter";
       packageName = "component-emitter";
@@ -1215,7 +1224,7 @@ let
       packageName = "minimist";
       version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
@@ -1224,7 +1233,7 @@ let
       packageName = "minimist";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
@@ -1260,7 +1269,7 @@ let
       packageName = "mkdirp";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
@@ -1282,13 +1291,13 @@ let
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "needle-2.2.2" = {
+    "needle-2.2.4" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.2";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz";
-        sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz";
+        sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==";
       };
     };
     "nopt-3.0.6" = {
@@ -1575,7 +1584,7 @@ let
       packageName = "readable-stream";
       version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
         sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
@@ -2398,7 +2407,7 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
@@ -2411,7 +2420,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."gauge-2.7.4"
@@ -2518,7 +2531,7 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
       sources."code-point-at-1.1.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
@@ -2545,7 +2558,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.2"
+      sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
       sources."npm-packlist-1.1.11"
@@ -2593,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.13.6";
+    version = "2.16.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
-      sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
+      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index c7701f553ed7..842e1a165314 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -238,13 +238,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chownr-1.0.1" = {
+    "chownr-1.1.1" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
-        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";
+        sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==";
       };
     };
     "class-utils-0.3.6" = {
@@ -288,10 +288,19 @@ let
       packageName = "combined-stream";
       version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
+    "combined-stream-1.0.7" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
+        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+      };
+    };
     "component-emitter-1.2.1" = {
       name = "component-emitter";
       packageName = "component-emitter";
@@ -1215,7 +1224,7 @@ let
       packageName = "minimist";
       version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
@@ -1224,7 +1233,7 @@ let
       packageName = "minimist";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+        url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
@@ -1260,7 +1269,7 @@ let
       packageName = "mkdirp";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
@@ -1282,13 +1291,13 @@ let
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "needle-2.2.2" = {
+    "needle-2.2.4" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.2";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz";
-        sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz";
+        sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==";
       };
     };
     "nopt-3.0.6" = {
@@ -1575,7 +1584,7 @@ let
       packageName = "readable-stream";
       version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
         sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
@@ -2398,7 +2407,7 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
@@ -2411,7 +2420,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."gauge-2.7.4"
@@ -2518,7 +2531,7 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
       sources."code-point-at-1.1.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
@@ -2545,7 +2558,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.2"
+      sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
       sources."npm-packlist-1.1.11"
@@ -2593,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.13.6";
+    version = "2.16.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
-      sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
+      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 38d5008ad8c5..a754f3bef61e 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -39,6 +39,7 @@
 , "hipache"
 , "htmlhint"
 , "html-minifier"
+, "http-server"
 , "ionic"
 , "ios-deploy"
 , "istanbul"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 3efef820a9b5..287623d03e43 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -58,22 +58,22 @@ let
         sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
       };
     };
-    "@babel/runtime-7.0.0" = {
+    "@babel/runtime-7.1.1" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.0.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz";
-        sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.1.tgz";
+        sha512 = "5ruvezIb2ccAGj538SRRz6YyZOAVubhUfOq+57LuGd9ADAdiqGWYk1DQ0ReVEdvaAfZfS9+kK3N+BwAuJlzzjQ==";
       };
     };
-    "@babel/runtime-corejs2-7.0.0" = {
+    "@babel/runtime-corejs2-7.1.1" = {
       name = "_at_babel_slash_runtime-corejs2";
       packageName = "@babel/runtime-corejs2";
-      version = "7.0.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.0.0.tgz";
-        sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.1.tgz";
+        sha512 = "J36jrmX2YeGHx+mIF/KV6By0XS4uCxt8JveYnx4LZaCkXDLopanQmbH7kp4VhSolU6nz3cggwCfkbFWwfxQI3Q==";
       };
     };
     "@babel/types-7.0.0-beta.38" = {
@@ -103,6 +103,141 @@ let
         sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
       };
     };
+    "@commitlint/cli-7.1.2" = {
+      name = "_at_commitlint_slash_cli";
+      packageName = "@commitlint/cli";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.1.2.tgz";
+        sha512 = "Dck7MqJCzrATYm4UqIKPdJvLVUuVZcpFw9KicrLw+a9YNIjsaXG9XojgPomTxFBNJZabAYBqKWkqNoFLrFA77w==";
+      };
+    };
+    "@commitlint/config-conventional-7.1.2" = {
+      name = "_at_commitlint_slash_config-conventional";
+      packageName = "@commitlint/config-conventional";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-7.1.2.tgz";
+        sha512 = "DmA4ixkpv03qA1TVs1Bl25QsVym2bPL6pKapesALWIVggG3OpwqGZ55vN75Tx8xZoG7LFKrVyrt7kwhA7X8njQ==";
+      };
+    };
+    "@commitlint/ensure-7.1.2" = {
+      name = "_at_commitlint_slash_ensure";
+      packageName = "@commitlint/ensure";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.1.2.tgz";
+        sha512 = "F0U4UEMgB5lnscgiZtuUolFkQ/dRD4RzXs8KgCik2D0wL3fUXSB5hmfbrbMF9ERseVQCHsxCHWm7bKzxKmXgIA==";
+      };
+    };
+    "@commitlint/execute-rule-7.1.2" = {
+      name = "_at_commitlint_slash_execute-rule";
+      packageName = "@commitlint/execute-rule";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-7.1.2.tgz";
+        sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA==";
+      };
+    };
+    "@commitlint/format-7.1.2" = {
+      name = "_at_commitlint_slash_format";
+      packageName = "@commitlint/format";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/format/-/format-7.1.2.tgz";
+        sha512 = "l+eQChtIeNOddi4t5p+T9ViFXQMMFWIbzKh708YCI8BoByhqedhLsEhEn1nzGq1cVYT2AdGRhY8ed6/Nc5z85w==";
+      };
+    };
+    "@commitlint/is-ignored-7.1.2" = {
+      name = "_at_commitlint_slash_is-ignored";
+      packageName = "@commitlint/is-ignored";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.1.2.tgz";
+        sha512 = "29SHreGSAKxOTtIdG1swo9E14E8KZbyE0Y1u0wz9iKjb6i0m7ahZW0l4Ty+j3pACiYDOOXDW1BWSOFaBwwKlxQ==";
+      };
+    };
+    "@commitlint/lint-7.1.2" = {
+      name = "_at_commitlint_slash_lint";
+      packageName = "@commitlint/lint";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.1.2.tgz";
+        sha512 = "HCkMlnUZD4yVnGDHcJQN/PkJRQpKgsiLojUaUHE8b1YjWW+qviolizbZjcqs/nimzCWlAkaU5KPs+3pzGBfVug==";
+      };
+    };
+    "@commitlint/load-7.1.2" = {
+      name = "_at_commitlint_slash_load";
+      packageName = "@commitlint/load";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-7.1.2.tgz";
+        sha512 = "BEQ9k3iZjB1NDAblmB88WU+256p8xHCWYuqZmJOerx6Upbam7XrpDTurMOKFUxk8tZU9OBqHQtBapX8UxJWi9A==";
+      };
+    };
+    "@commitlint/message-7.1.2" = {
+      name = "_at_commitlint_slash_message";
+      packageName = "@commitlint/message";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/message/-/message-7.1.2.tgz";
+        sha512 = "6FQeK5LAs1Bde6W/jULg+I/XZhj3gbqCWlS2Q11A2JbaTRpRJZzm7WdD9nK3I0+De41EOqW2t4mBnrpio3o1Zg==";
+      };
+    };
+    "@commitlint/parse-7.1.2" = {
+      name = "_at_commitlint_slash_parse";
+      packageName = "@commitlint/parse";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/parse/-/parse-7.1.2.tgz";
+        sha512 = "wrdLwJZL3cs89MfgPtnbbKByijUo3Wrug55aTke5k/F0XNxGaDaNJyH4QXgidgXk57r2t4NJVAKwjnY4wjfNwg==";
+      };
+    };
+    "@commitlint/read-7.1.2" = {
+      name = "_at_commitlint_slash_read";
+      packageName = "@commitlint/read";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/read/-/read-7.1.2.tgz";
+        sha512 = "sarYQgfTay2Eu7onHz53EYyRw7pI5QmLE7tP5Ri9op6eu4LadjSoA/4dfc+VE7avsq21J2ewSbz+9f0uvhDxgg==";
+      };
+    };
+    "@commitlint/resolve-extends-7.1.2" = {
+      name = "_at_commitlint_slash_resolve-extends";
+      packageName = "@commitlint/resolve-extends";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-7.1.2.tgz";
+        sha512 = "zwbifMB9DeHP4sYQdrkx+XJh5Q1lyP/OdlErUCC34NV4Lkxw/XxXF4St3e+y1X28/SgrEc2XSOS6n/vQQfUlLA==";
+      };
+    };
+    "@commitlint/rules-7.1.2" = {
+      name = "_at_commitlint_slash_rules";
+      packageName = "@commitlint/rules";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.1.2.tgz";
+        sha512 = "O9fONZXiJ6NN2mfy+enHmeTzBHcfDVVYjxTdBJFp99yUSvVyHaD+jc2r795gcMv3oP5594BDXSKcD/3yb8sLzA==";
+      };
+    };
+    "@commitlint/to-lines-7.1.2" = {
+      name = "_at_commitlint_slash_to-lines";
+      packageName = "@commitlint/to-lines";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-7.1.2.tgz";
+        sha512 = "Nz3qZwrIEYiN9v/ThJqXAwu4X5+hvT9H8yRPHfjc538R8WhwEfhvym7/4YznDHSvWrQgwqtNPdrb6b2OSBsHmg==";
+      };
+    };
+    "@commitlint/top-level-7.1.2" = {
+      name = "_at_commitlint_slash_top-level";
+      packageName = "@commitlint/top-level";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-7.1.2.tgz";
+        sha512 = "YKugOAKy3hgM/ITezPp7Ns51U3xoJfuOsVnMGW4oDcHLhuQ/Qd58ROv/Hgedtk8HugKX3DdZ8XoEnRG70RDGqQ==";
+      };
+    };
     "@cycle/dom-18.3.0" = {
       name = "_at_cycle_slash_dom";
       packageName = "@cycle/dom";
@@ -175,22 +310,22 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@ionic/cli-framework-1.0.6" = {
+    "@ionic/cli-framework-1.0.7" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.6.tgz";
-        sha512 = "vUKqtMCYTGr7mhNSjVKsl5VYLP+XyNltiVp+afSzOOlNx+GdEDzzxAhpJSryhu77EVtlJEUvkTq0pQIqptC1QA==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.7.tgz";
+        sha512 = "e6yaPkqom2KVNgUpJJMJbClkc8n4r4pOieiVEgfVmjC0ZC1wRZ3hYHzUMbsY/QOnB3UceCBGuYZMScaF/QNY8g==";
       };
     };
-    "@ionic/cli-utils-2.2.0" = {
+    "@ionic/cli-utils-2.2.1" = {
       name = "_at_ionic_slash_cli-utils";
       packageName = "@ionic/cli-utils";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.0.tgz";
-        sha512 = "9FJHRZU4oNh2pwkm3mPgGCQolBvLj5o6llshcH4L9OEHtJUrYSolttuglOh3p6kgmqpJfUbRF/mmoAX7jo2XXA==";
+        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.1.tgz";
+        sha512 = "/fAsYbgNOVcQhihW3EBy//FtBD/uhZyLA/fCd42UbHloR1uNo0KsGW7dh2i5NBYsaYsOequV5ZxGk2p0Wr5HWw==";
       };
     };
     "@ionic/discover-1.0.4" = {
@@ -202,6 +337,24 @@ let
         sha512 = "/9WbB31cv0nr2M8Vi4O2coDiX27IJ5EXwGKrgnV0X0/dfavObNVqV9ksNcHnZTuNArqBXywOsWPIES0+tHXIhA==";
       };
     };
+    "@ionic/utils-fs-0.0.1" = {
+      name = "_at_ionic_slash_utils-fs";
+      packageName = "@ionic/utils-fs";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.1.tgz";
+        sha512 = "l5+RM7lEIKSsxAUyNiarHuNJBioJhFM4CAezZ7YRyFoX6J7Y4paZIfZzoFa6UdNsyucE51lZ1X/6ZOf/gVj73Q==";
+      };
+    };
+    "@ionic/utils-network-0.0.1" = {
+      name = "_at_ionic_slash_utils-network";
+      packageName = "@ionic/utils-network";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.1.tgz";
+        sha512 = "qpzZ+k94PCWbWmub2XHP0XJKcoBflGeOAW64RlIbthoIzj0SRwoYjn4DrFVbYhScQ/xmLe1hSD2Hq8NZ4HEM5g==";
+      };
+    };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
       name = "_at_kbrandwijk_slash_swagger-to-graphql";
       packageName = "@kbrandwijk/swagger-to-graphql";
@@ -211,13 +364,13 @@ let
         sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
       };
     };
-    "@lerna/add-3.2.0" = {
+    "@lerna/add-3.3.2" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "3.2.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz";
-        sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-3.3.2.tgz";
+        sha512 = "nKRRRKb4wt/GAywi8P++NY1TUiyhMs2g2KHSb41I4/qiCFQnTj2zkeshPyNmtBGjKzFXnOqrmc/8Wa2vmHHZVg==";
       };
     };
     "@lerna/batch-packages-3.1.2" = {
@@ -229,49 +382,49 @@ let
         sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
       };
     };
-    "@lerna/bootstrap-3.2.0" = {
+    "@lerna/bootstrap-3.3.2" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "3.2.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz";
-        sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.3.2.tgz";
+        sha512 = "f0/FZ6iCXHNpHoUiM3wfmiJebHetrquP9mdNT7t//2iTGm1nz8iuKSLhfu9APazDXtqo3aDFx7JvuYKMg+GiXQ==";
       };
     };
-    "@lerna/changed-3.2.0" = {
+    "@lerna/changed-3.3.2" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "3.2.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz";
-        sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.3.2.tgz";
+        sha512 = "wLH6RzYPQAryrsJakc9I3k0aFWE/cJyWoUD8dQy186jxwtLgeQdVc0+NegNyab7MIPi7Hsv9A3hx6lM1rPH94A==";
       };
     };
-    "@lerna/check-working-tree-3.1.0" = {
+    "@lerna/check-working-tree-3.3.0" = {
       name = "_at_lerna_slash_check-working-tree";
       packageName = "@lerna/check-working-tree";
-      version = "3.1.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.1.0.tgz";
-        sha512 = "ruy6s44IUcaPEa4JlDDDk6nbacMESUPRSb+dohzLJxfhXx1wFnEVF6L91TGxFP+C0lt5V6zd8rnJxkW/uZzNAA==";
+        url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-3.3.0.tgz";
+        sha512 = "oeEP1dNhiiKUaO0pmcIi73YXJpaD0n5JczNctvVNZ8fGZmrALZtEnmC28o6Z7JgQaqq5nd2kO7xbnjoitrC51g==";
       };
     };
-    "@lerna/child-process-3.0.0" = {
+    "@lerna/child-process-3.3.0" = {
       name = "_at_lerna_slash_child-process";
       packageName = "@lerna/child-process";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.0.0.tgz";
-        sha512 = "8vHRDkpGhzSaMsXgyXVgY80mUSC5WSkDmhWWA3bnB/n5FBK1gK8EKQUpHTk14SckwvUgEJzBd35gR5/XKGOgmQ==";
+        url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-3.3.0.tgz";
+        sha512 = "q2d/OPlNX/cBXB6Iz1932RFzOmOHq6ZzPjqebkINNaTojHWuuRpvJJY4Uz3NGpJ3kEtPDvBemkZqUBTSO5wb1g==";
       };
     };
-    "@lerna/clean-3.1.3" = {
+    "@lerna/clean-3.3.2" = {
       name = "_at_lerna_slash_clean";
       packageName = "@lerna/clean";
-      version = "3.1.3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.1.3.tgz";
-        sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g==";
+        url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.3.2.tgz";
+        sha512 = "mvqusgSp2ou5SGqQgTEoTvGJpGfH4+L6XSeN+Ims+eNFGXuMazmKCf+rz2PZBMFufaHJ/Os+JF0vPCcWI1Fzqg==";
       };
     };
     "@lerna/cli-3.2.0" = {
@@ -283,85 +436,85 @@ let
         sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q==";
       };
     };
-    "@lerna/collect-updates-3.1.0" = {
+    "@lerna/collect-updates-3.3.2" = {
       name = "_at_lerna_slash_collect-updates";
       packageName = "@lerna/collect-updates";
-      version = "3.1.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.1.0.tgz";
-        sha512 = "zHxHRZOteTqcW9mAyLrmoWEKpfxgA3c6LJj4nauB2pM3MKyKNhg0gqiy2RHFu7EGivPki4Q1624I301iAXtUVA==";
+        url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-3.3.2.tgz";
+        sha512 = "9WyBJI2S5sYgEZEScu525Lbi6nknNrdBKop35sCDIC9y6AIGvH6Dr5tkTd+Kg3n1dE+kHwW/xjERkx3+h7th3w==";
       };
     };
-    "@lerna/command-3.1.3" = {
+    "@lerna/command-3.3.0" = {
       name = "_at_lerna_slash_command";
       packageName = "@lerna/command";
-      version = "3.1.3";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/command/-/command-3.1.3.tgz";
-        sha512 = "ptaFNsfcTpxnSkaNrGgW3fRbWWVSVDUx4BpkjUUnRTgy9mwoykQWgQB3inhgTYHwW6e4PzO79F2hovfUMzHuzg==";
+        url = "https://registry.npmjs.org/@lerna/command/-/command-3.3.0.tgz";
+        sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg==";
       };
     };
-    "@lerna/conventional-commits-3.0.2" = {
+    "@lerna/conventional-commits-3.3.0" = {
       name = "_at_lerna_slash_conventional-commits";
       packageName = "@lerna/conventional-commits";
-      version = "3.0.2";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.0.2.tgz";
-        sha512 = "Cxd1eWXn3usADKXIUvYmTERx2+1N7oJD4Whz+FVu8kTfufsfTO7fYOan1RVkg86ukZbNDyS+iOxZ8DJ2JspS9g==";
+        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.3.0.tgz";
+        sha512 = "nUFardc5G4jG5LI/Jlw0kblzlRLJ08ut6uJjHXTnUE/QJuKYaqBZm6goGG8OSxp/WltklndkQUOtThyZpefviA==";
       };
     };
-    "@lerna/create-3.1.3" = {
+    "@lerna/create-3.3.1" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "3.1.3";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-3.1.3.tgz";
-        sha512 = "CmXKCBc6AE3F9O6mMg4Y76cQ8eTCy3ksqDFKxVQMdYDtHKnTrH1s0l8sn3J1AiylqVDnvxhb3Rjyj+OWyzmFPQ==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-3.3.1.tgz";
+        sha512 = "4VASkTLvN66euTcWMPN2vIzEoP07hgutx7V70CXSOc+DiWV8S22z0PjXATi2yli83TC/Qj4gHYtU2futQrdY1A==";
       };
     };
-    "@lerna/create-symlink-3.0.0" = {
+    "@lerna/create-symlink-3.3.0" = {
       name = "_at_lerna_slash_create-symlink";
       packageName = "@lerna/create-symlink";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.0.0.tgz";
-        sha512 = "Q9qAzGGqQtVzHWrCz+Md4SH0tW99DrgFJ68cnFqilOO6H3Y/y/H0gwHICqM9YxRwLs6GJdkzoqJATFShM7PKJA==";
+        url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-3.3.0.tgz";
+        sha512 = "0lb88Nnq1c/GG+fwybuReOnw3+ah4dB81PuWwWwuqUNPE0n50qUf/M/7FfSb5JEh/93fcdbZI0La8t3iysNW1w==";
       };
     };
-    "@lerna/describe-ref-3.1.0" = {
+    "@lerna/describe-ref-3.3.0" = {
       name = "_at_lerna_slash_describe-ref";
       packageName = "@lerna/describe-ref";
-      version = "3.1.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.1.0.tgz";
-        sha512 = "0a7WFKDSmdEwwmEj+ZfhI7SkkG1CDcVhfW8VhPqr6gnCMY+ryt6iV/rR7ygb0eCDg8wEe9eQsiwbnrbXDLjIDw==";
+        url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-3.3.0.tgz";
+        sha512 = "4t7M4OupnYMSPNLrLUau8qkS+dgLEi4w+DkRkV0+A+KNYga1W0jVgNLPIIsxta7OHfodPkCNAqZCzNCw/dmAwA==";
       };
     };
-    "@lerna/diff-3.1.3" = {
+    "@lerna/diff-3.3.0" = {
       name = "_at_lerna_slash_diff";
       packageName = "@lerna/diff";
-      version = "3.1.3";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.1.3.tgz";
-        sha512 = "30G74DxdQC4dR3U0yqh5mjcioLDUmSy1ntntdF3khvKV9oiMVzCSOO0oOlSwIdmohke+bQ//oF+oyl0Dy1TUTQ==";
+        url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.3.0.tgz";
+        sha512 = "sIoMjsm3NVxvmt6ofx8Uu/2fxgldQqLl0zmC9X1xW00j831o5hBffx1EoKj9CnmaEvoSP6j/KFjxy2RWjebCIg==";
       };
     };
-    "@lerna/exec-3.1.3" = {
+    "@lerna/exec-3.3.2" = {
       name = "_at_lerna_slash_exec";
       packageName = "@lerna/exec";
-      version = "3.1.3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.1.3.tgz";
-        sha512 = "r0yQj9Rza5a42Shts8rXYGU1/Va8hO2atk/TEZgrA1EcTwgZyAuXsuML5UWbC/eLgwEjVDmc3MUSj8O1JijBMQ==";
+        url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.3.2.tgz";
+        sha512 = "mN6vGxNir7JOGvWLwKr3DW3LNy1ecCo2ziZj5rO9Mw5Rew3carUu1XLmhF/4judtsvXViUY+rvGIcqHe0vvb+w==";
       };
     };
-    "@lerna/filter-options-3.1.2" = {
+    "@lerna/filter-options-3.3.2" = {
       name = "_at_lerna_slash_filter-options";
       packageName = "@lerna/filter-options";
-      version = "3.1.2";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.1.2.tgz";
-        sha512 = "smbvSGK/eU+7PDKO4jbJ7XYO2XTfhnwPeOTuwSm1mlWS5dUGasYkhAuFzouFh60aZBvmW0e6APe0XYeofQNcCg==";
+        url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.3.2.tgz";
+        sha512 = "0WHqdDgAnt5WKoByi1q+lFw8HWt5tEKP2DnLlGqWv3YFwVF5DsPRlO7xbzjY9sJgvyJtZcnkMtccdBPFhGGyIQ==";
       };
     };
     "@lerna/filter-packages-3.0.0" = {
@@ -391,49 +544,49 @@ let
         sha512 = "LVeZU/Zgc0XkHdGMRYn+EmHfDmmYNwYRv3ta59iCVFXLVp7FRFWF7oB1ss/WRa9x/pYU0o6L8as/5DomLUGASA==";
       };
     };
-    "@lerna/has-npm-version-3.0.4" = {
+    "@lerna/has-npm-version-3.3.0" = {
       name = "_at_lerna_slash_has-npm-version";
       packageName = "@lerna/has-npm-version";
-      version = "3.0.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.0.4.tgz";
-        sha512 = "RisEWZBROi8corPb/PUIQqT+xGPLeriJ/n6VCeO6GROCO1fyYBX7kgFmVpFOytufWFkI04qBgLaUs+CEc8Yspg==";
+        url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-3.3.0.tgz";
+        sha512 = "GX7omRep1eBRZHgjZLRw3MpBJSdA5gPZFz95P7rxhpvsiG384Tdrr/cKFMhm0A09yq27Tk/nuYTaZIj7HsVE6g==";
       };
     };
-    "@lerna/import-3.1.3" = {
+    "@lerna/import-3.3.1" = {
       name = "_at_lerna_slash_import";
       packageName = "@lerna/import";
-      version = "3.1.3";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/import/-/import-3.1.3.tgz";
-        sha512 = "+XV/EHXEHbyMmprz8zQa0VF0TZ+txRIrcF3Q/PsuZ4isVxawIbP1CmgE0yn0/1XSNJwGKsuPfGauRtnjUi2LJw==";
+        url = "https://registry.npmjs.org/@lerna/import/-/import-3.3.1.tgz";
+        sha512 = "2OzTQDkYKbBPpyP2iOI1sWfcvMjNLjjHjmREq/uOWJaSIk5J3Ukt71OPpcOHh4V2CBOlXidCcO+Hyb4FVIy8fw==";
       };
     };
-    "@lerna/init-3.1.3" = {
+    "@lerna/init-3.3.0" = {
       name = "_at_lerna_slash_init";
       packageName = "@lerna/init";
-      version = "3.1.3";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/init/-/init-3.1.3.tgz";
-        sha512 = "c418p6fAfJ+b/tidB8/O/ABGLX7a5y5uJSWxH2/Mp7i5da/RD27XJ6E6818hGAbUbVQw04+XuXHtrWYlWLEJCw==";
+        url = "https://registry.npmjs.org/@lerna/init/-/init-3.3.0.tgz";
+        sha512 = "HvgRLkIG6nDIeAO6ix5sUVIVV+W9UMk2rSSmFT66CDOefRi7S028amiyYnFUK1QkIAaUbVUyOnYaErtbJwICuw==";
       };
     };
-    "@lerna/link-3.1.4" = {
+    "@lerna/link-3.3.0" = {
       name = "_at_lerna_slash_link";
       packageName = "@lerna/link";
-      version = "3.1.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/link/-/link-3.1.4.tgz";
-        sha512 = "AAl4ctKtE6975zxdrsr16CAh/K4y0ZjjY9XDdD+zMxsSPELvRVG6M36O1A72AmKz5Nhh1l82bPrw7w54TbQ8hA==";
+        url = "https://registry.npmjs.org/@lerna/link/-/link-3.3.0.tgz";
+        sha512 = "8CeXzGL7okrsVXsy2sHXI2KuBaczw3cblAnA2+FJPUqSKMPNbUTRzeU3bOlCjYtK0LbxC4ngENJTL3jJ8RaYQQ==";
       };
     };
-    "@lerna/list-3.1.3" = {
+    "@lerna/list-3.3.2" = {
       name = "_at_lerna_slash_list";
       packageName = "@lerna/list";
-      version = "3.1.3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/list/-/list-3.1.3.tgz";
-        sha512 = "/ncX5Kj1ddLgZuBkjaoluJgcmAAm/L4/AymVNBgVrw6dOad0C0RB6oIcRAbxDennEQ25wSOFmuXRZHYHY9VYyg==";
+        url = "https://registry.npmjs.org/@lerna/list/-/list-3.3.2.tgz";
+        sha512 = "XXEVy7w+i/xx8NeJmGirw4upEoEF9OfD6XPLjISNQc24VgQV+frXdVJ02QcP7Y/PkY1rdIVrOjvo3ipKVLUxaQ==";
       };
     };
     "@lerna/listable-3.0.0" = {
@@ -463,40 +616,40 @@ let
         sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w==";
       };
     };
-    "@lerna/npm-dist-tag-3.0.0" = {
+    "@lerna/npm-dist-tag-3.3.0" = {
       name = "_at_lerna_slash_npm-dist-tag";
       packageName = "@lerna/npm-dist-tag";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.0.0.tgz";
-        sha512 = "ZOcfcsNJlCoVHvLOROdCTvqD3keG3TJ78Cu8sALsz8n0kEz2ga7tNy5wbQ67SGyY7+jq4YiBv5BwXjV+56Sv+A==";
+        url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.3.0.tgz";
+        sha512 = "EtZJXzh3w5tqXEev+EBBPrWKWWn0WgJfxm4FihfS9VgyaAW8udIVZHGkIQ3f+tBtupcAzA9Q8cQNUkGF2efwmA==";
       };
     };
-    "@lerna/npm-install-3.0.0" = {
+    "@lerna/npm-install-3.3.0" = {
       name = "_at_lerna_slash_npm-install";
       packageName = "@lerna/npm-install";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.0.0.tgz";
-        sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ==";
+        url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-3.3.0.tgz";
+        sha512 = "WoVvKdS8ltROTGSNQwo6NDq0YKnjwhvTG4li1okcN/eHKOS3tL9bxbgPx7No0wOq5DKBpdeS9KhAfee6LFAZ5g==";
       };
     };
-    "@lerna/npm-publish-3.2.0" = {
+    "@lerna/npm-publish-3.3.1" = {
       name = "_at_lerna_slash_npm-publish";
       packageName = "@lerna/npm-publish";
-      version = "3.2.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz";
-        sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw==";
+        url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.3.1.tgz";
+        sha512 = "bVTlWIcBL6Zpyzqvr9C7rxXYcoPw+l7IPz5eqQDNREj1R39Wj18OWB2KTJq8l7LIX7Wf4C2A1uT5hJaEf9BuvA==";
       };
     };
-    "@lerna/npm-run-script-3.0.0" = {
+    "@lerna/npm-run-script-3.3.0" = {
       name = "_at_lerna_slash_npm-run-script";
       packageName = "@lerna/npm-run-script";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.0.0.tgz";
-        sha512 = "Y1H4Myer1S7an33FDK0eqyR+95PujUePC/xJZKq/H50SaQNwBw7KMlxXxy6kXVEcQhmvQsER4Bw3msgqwwGYIw==";
+        url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-3.3.0.tgz";
+        sha512 = "YqDguWZzp4jIomaE4aWMUP7MIAJAFvRAf6ziQLpqwoQskfWLqK5mW0CcszT1oLjhfb3cY3MMfSTFaqwbdKmICg==";
       };
     };
     "@lerna/output-3.0.0" = {
@@ -535,58 +688,58 @@ let
         sha512 = "XhDFVfqj79jG2Speggd15RpYaE8uiR25UKcQBDmumbmqvTS7xf2cvl2pq2UTvDafaJ0YwFF3xkxQZeZnFMwdkw==";
       };
     };
-    "@lerna/prompt-3.0.0" = {
+    "@lerna/prompt-3.3.1" = {
       name = "_at_lerna_slash_prompt";
       packageName = "@lerna/prompt";
-      version = "3.0.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.0.0.tgz";
-        sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ==";
+        url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.3.1.tgz";
+        sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==";
       };
     };
-    "@lerna/publish-3.2.1" = {
+    "@lerna/publish-3.4.0" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.2.1";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz";
-        sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.0.tgz";
+        sha512 = "wcqWDKbkDjyj6F9Mw4/LL2CtpCN61RazNKxYm+fyJ20P2zfcAwLEwxttA6ZWIO8xUiLXkCTFIhwOulHyAPAq3w==";
       };
     };
-    "@lerna/resolve-symlink-3.0.0" = {
+    "@lerna/resolve-symlink-3.3.0" = {
       name = "_at_lerna_slash_resolve-symlink";
       packageName = "@lerna/resolve-symlink";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.0.0.tgz";
-        sha512 = "MqjW9e+QVXts5IK5dk1XnYx7JKb+g+tQkOnnpAxYWHjahf3rGJ7Ru8maWh8KoPE+nIHAekk4WcjpiA9nLKvkFQ==";
+        url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-3.3.0.tgz";
+        sha512 = "KmoPDcFJ2aOK2inYHbrsiO9SodedUj0L1JDvDgirVNIjMUaQe2Q6Vi4Gh+VCJcyB27JtfHioV9R2NxU72Pk2hg==";
       };
     };
-    "@lerna/rimraf-dir-3.0.0" = {
+    "@lerna/rimraf-dir-3.3.0" = {
       name = "_at_lerna_slash_rimraf-dir";
       packageName = "@lerna/rimraf-dir";
-      version = "3.0.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.0.0.tgz";
-        sha512 = "epvh/RGWSOYdrNgrizMcRq9VyCHkeY0LpIE4074r4ouKdYNhBT0LlpT0yMLvQgQKJkKRlqcfhJHvZeGHhXQyGg==";
+        url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-3.3.0.tgz";
+        sha512 = "vSqOcZ4kZduiSprbt+y40qziyN3VKYh+ygiCdnbBbsaxpdKB6CfrSMUtrLhVFrqUfBHIZRzHIzgjTdtQex1KLw==";
       };
     };
-    "@lerna/run-3.1.3" = {
+    "@lerna/run-3.3.2" = {
       name = "_at_lerna_slash_run";
       packageName = "@lerna/run";
-      version = "3.1.3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run/-/run-3.1.3.tgz";
-        sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA==";
+        url = "https://registry.npmjs.org/@lerna/run/-/run-3.3.2.tgz";
+        sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A==";
       };
     };
-    "@lerna/run-lifecycle-3.2.0" = {
+    "@lerna/run-lifecycle-3.3.1" = {
       name = "_at_lerna_slash_run-lifecycle";
       packageName = "@lerna/run-lifecycle";
-      version = "3.2.0";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz";
-        sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg==";
+        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.3.1.tgz";
+        sha512 = "xy4K3amlXk0LjSa5d3VqmrW9SsxMyvI7lw2dHDMb5PqjjcjMQgb6+nFbycwyJMhCP8u7MwQIZ4hFYF9XYbWSzQ==";
       };
     };
     "@lerna/run-parallel-batches-3.0.0" = {
@@ -598,22 +751,22 @@ let
         sha512 = "Mj1ravlXF7AkkewKd9YFq9BtVrsStNrvVLedD/b2wIVbNqcxp8lS68vehXVOzoL/VWNEDotvqCQtyDBilCodGw==";
       };
     };
-    "@lerna/symlink-binary-3.1.4" = {
+    "@lerna/symlink-binary-3.3.0" = {
       name = "_at_lerna_slash_symlink-binary";
       packageName = "@lerna/symlink-binary";
-      version = "3.1.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.1.4.tgz";
-        sha512 = "uQ8pYxzygahshXJAeC/vY4eSi+kFM0S2Pi15hJsJI3W7Ec6ysSYU1lXemb6kqoIqkTDJZWnfKXEq/3FLE+JYhg==";
+        url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-3.3.0.tgz";
+        sha512 = "zRo6CimhvH/VJqCFl9T4IC6syjpWyQIxEfO2sBhrapEcfwjtwbhoGgKwucsvt4rIpFazCw63jQ/AXMT27KUIHg==";
       };
     };
-    "@lerna/symlink-dependencies-3.1.4" = {
+    "@lerna/symlink-dependencies-3.3.0" = {
       name = "_at_lerna_slash_symlink-dependencies";
       packageName = "@lerna/symlink-dependencies";
-      version = "3.1.4";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.1.4.tgz";
-        sha512 = "iModwb0Xh0N0t55C6S4K2mzLdu1zXVsBc0qubUY1x0RSul92z8NeAe1aM5JzwMzuSoMA/LRiD1lNMWMRBf4JVg==";
+        url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-3.3.0.tgz";
+        sha512 = "IRngSNCmuD5uBKVv23tHMvr7Mplti0lKHilFKcvhbvhAfu6m/Vclxhkfs/uLyHzG+DeRpl/9o86SQET3h4XDhg==";
       };
     };
     "@lerna/validation-error-3.0.0" = {
@@ -625,13 +778,13 @@ let
         sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
       };
     };
-    "@lerna/version-3.2.0" = {
+    "@lerna/version-3.3.2" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "3.2.0";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz";
-        sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-3.3.2.tgz";
+        sha512 = "2MHP6mA1f0t3UdzqPpfgAhsT1L64HOedlJxrQUoHrkou/G25Od4wjmKr9OZ0Oc4CLDbXD/sYEmE/9fZi1GGgKg==";
       };
     };
     "@lerna/write-log-file-3.0.0" = {
@@ -643,6 +796,15 @@ let
         sha512 = "SfbPp29lMeEVOb/M16lJwn4nnx5y+TwCdd7Uom9umd7KcZP0NOvpnX0PHehdonl7TyHZ1Xx2maklYuCLbQrd/A==";
       };
     };
+    "@marionebl/sander-0.6.1" = {
+      name = "_at_marionebl_slash_sander";
+      packageName = "@marionebl/sander";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@marionebl/sander/-/sander-0.6.1.tgz";
+        sha1 = "1958965874f24bc51be48875feb50d642fc41f7b";
+      };
+    };
     "@mrmlnc/readdir-enhanced-2.2.1" = {
       name = "_at_mrmlnc_slash_readdir-enhanced";
       packageName = "@mrmlnc/readdir-enhanced";
@@ -652,13 +814,13 @@ let
         sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@nodelib/fs.stat-1.1.1" = {
+    "@nodelib/fs.stat-1.1.2" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz";
-        sha512 = "KU/VDjC5RwtDUZiz3d+DHXJF2lp5hB9dn552TXIyptj8SH1vXmR40mG0JgGq03IlYsOgGfcv8xrLpSQ0YUMQdA==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.2.tgz";
+        sha512 = "yprFYuno9FtNsSHVlSWd+nRlmGoAbqbeCwOryP6sC/zoCjhpArcRMYp19EvpSUSizJAlsXEwJv+wcWS9XaXdMw==";
       };
     };
     "@protobufjs/aspromise-1.1.2" = {
@@ -841,24 +1003,6 @@ let
         sha512 = "ipZjBVsm2tF/n8qFGOuGBkUij9X9ZswVi9G3bx/6dz7POpVa6gVHcj1wsX/LVEn9MMF41fxK/PnZPPoTD1UFPw==";
       };
     };
-    "@types/cross-spawn-6.0.0" = {
-      name = "_at_types_slash_cross-spawn";
-      packageName = "@types/cross-spawn";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.0.tgz";
-        sha512 = "evp2ZGsFw9YKprDbg8ySgC9NA15g3YgiI8ANkGmKKvvi0P2aDGYLPxQIC5qfeKNUOe3TjABVGuah6omPRpIYhg==";
-      };
-    };
-    "@types/debug-0.0.30" = {
-      name = "_at_types_slash_debug";
-      packageName = "@types/debug";
-      version = "0.0.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/debug/-/debug-0.0.30.tgz";
-        sha512 = "orGL5LXERPYsLov6CWs3Fh6203+dXzJkR7OnddIr2514Hsecwc8xRpzCapshBbKFImCsvS/mk6+FWiN5LyZJAQ==";
-      };
-    };
     "@types/events-1.2.0" = {
       name = "_at_types_slash_events";
       packageName = "@types/events";
@@ -886,51 +1030,6 @@ let
         sha512 = "lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==";
       };
     };
-    "@types/glob-5.0.35" = {
-      name = "_at_types_slash_glob";
-      packageName = "@types/glob";
-      version = "5.0.35";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz";
-        sha512 = "wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==";
-      };
-    };
-    "@types/graphql-0.12.6" = {
-      name = "_at_types_slash_graphql";
-      packageName = "@types/graphql";
-      version = "0.12.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz";
-        sha512 = "wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ==";
-      };
-    };
-    "@types/inquirer-0.0.43" = {
-      name = "_at_types_slash_inquirer";
-      packageName = "@types/inquirer";
-      version = "0.0.43";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-0.0.43.tgz";
-        sha512 = "xgyfKZVMFqE8aIKy1xfFVsX2MxyXUNgjgmbF6dRbR3sL+ZM5K4ka/9L4mmTwX8eTeVYtduyXu0gUVwVJa1HbNw==";
-      };
-    };
-    "@types/klaw-2.1.1" = {
-      name = "_at_types_slash_klaw";
-      packageName = "@types/klaw";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/klaw/-/klaw-2.1.1.tgz";
-        sha512 = "awiTDstwQfX6026T7oC01AoP7knJoM5IT1tgx9STIM4hQzNQlkW8keTxNC+/xxpMgP657ebHMTqrsQ4qtfSJKg==";
-      };
-    };
-    "@types/lodash-4.14.116" = {
-      name = "_at_types_slash_lodash";
-      packageName = "@types/lodash";
-      version = "4.14.116";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.116.tgz";
-        sha512 = "lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==";
-      };
-    };
     "@types/long-4.0.0" = {
       name = "_at_types_slash_long";
       packageName = "@types/long";
@@ -940,15 +1039,6 @@ let
         sha512 = "1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==";
       };
     };
-    "@types/make-dir-1.0.3" = {
-      name = "_at_types_slash_make-dir";
-      packageName = "@types/make-dir";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/make-dir/-/make-dir-1.0.3.tgz";
-        sha512 = "bFRvlvUdPwxj47K2yVh7OBL8Mu8h//5k/hQJkz0iAZAlxhnIDydFezGA96zehtnRfrZDuIyPd+RC2kmBGtcs0w==";
-      };
-    };
     "@types/mime-2.0.0" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
@@ -958,58 +1048,22 @@ let
         sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
       };
     };
-    "@types/minimatch-3.0.3" = {
-      name = "_at_types_slash_minimatch";
-      packageName = "@types/minimatch";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
-        sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
-      };
-    };
-    "@types/minimist-1.2.0" = {
-      name = "_at_types_slash_minimist";
-      packageName = "@types/minimist";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
-      };
-    };
-    "@types/ncp-2.0.1" = {
-      name = "_at_types_slash_ncp";
-      packageName = "@types/ncp";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ncp/-/ncp-2.0.1.tgz";
-        sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg==";
-      };
-    };
-    "@types/node-10.9.4" = {
+    "@types/node-10.11.2" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.9.4";
+      version = "10.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz";
-        sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.11.2.tgz";
+        sha512 = "XubfQDIg88PGJ7netQPf3QOKHF7Xht4WXGtg5W7cGBeQs9ETbYKwfchR9o+tRRA9iLTQ7nAre85M205JbYsjJA==";
       };
     };
-    "@types/node-6.0.117" = {
+    "@types/node-8.10.30" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "6.0.117";
+      version = "8.10.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz";
-        sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg==";
-      };
-    };
-    "@types/node-8.10.29" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "8.10.29";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz";
-        sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz";
+        sha512 = "Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==";
       };
     };
     "@types/range-parser-1.2.2" = {
@@ -1021,132 +1075,6 @@ let
         sha512 = "HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==";
       };
     };
-    "@types/rimraf-2.0.2" = {
-      name = "_at_types_slash_rimraf";
-      packageName = "@types/rimraf";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.2.tgz";
-        sha512 = "Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==";
-      };
-    };
-    "@types/rx-4.1.1" = {
-      name = "_at_types_slash_rx";
-      packageName = "@types/rx";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx/-/rx-4.1.1.tgz";
-        sha1 = "598fc94a56baed975f194574e0f572fd8e627a48";
-      };
-    };
-    "@types/rx-core-4.0.3" = {
-      name = "_at_types_slash_rx-core";
-      packageName = "@types/rx-core";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-core/-/rx-core-4.0.3.tgz";
-        sha1 = "0b3354b1238cedbe2b74f6326f139dbc7a591d60";
-      };
-    };
-    "@types/rx-core-binding-4.0.4" = {
-      name = "_at_types_slash_rx-core-binding";
-      packageName = "@types/rx-core-binding";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz";
-        sha512 = "5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==";
-      };
-    };
-    "@types/rx-lite-4.0.5" = {
-      name = "_at_types_slash_rx-lite";
-      packageName = "@types/rx-lite";
-      version = "4.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite/-/rx-lite-4.0.5.tgz";
-        sha512 = "KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==";
-      };
-    };
-    "@types/rx-lite-aggregates-4.0.3" = {
-      name = "_at_types_slash_rx-lite-aggregates";
-      packageName = "@types/rx-lite-aggregates";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz";
-        sha512 = "MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==";
-      };
-    };
-    "@types/rx-lite-async-4.0.2" = {
-      name = "_at_types_slash_rx-lite-async";
-      packageName = "@types/rx-lite-async";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz";
-        sha512 = "vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==";
-      };
-    };
-    "@types/rx-lite-backpressure-4.0.3" = {
-      name = "_at_types_slash_rx-lite-backpressure";
-      packageName = "@types/rx-lite-backpressure";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz";
-        sha512 = "Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==";
-      };
-    };
-    "@types/rx-lite-coincidence-4.0.3" = {
-      name = "_at_types_slash_rx-lite-coincidence";
-      packageName = "@types/rx-lite-coincidence";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz";
-        sha512 = "1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==";
-      };
-    };
-    "@types/rx-lite-experimental-4.0.1" = {
-      name = "_at_types_slash_rx-lite-experimental";
-      packageName = "@types/rx-lite-experimental";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz";
-        sha1 = "c532f5cbdf3f2c15da16ded8930d1b2984023cbd";
-      };
-    };
-    "@types/rx-lite-joinpatterns-4.0.1" = {
-      name = "_at_types_slash_rx-lite-joinpatterns";
-      packageName = "@types/rx-lite-joinpatterns";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz";
-        sha1 = "f70fe370518a8432f29158cc92ffb56b4e4afc3e";
-      };
-    };
-    "@types/rx-lite-testing-4.0.1" = {
-      name = "_at_types_slash_rx-lite-testing";
-      packageName = "@types/rx-lite-testing";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz";
-        sha1 = "21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9";
-      };
-    };
-    "@types/rx-lite-time-4.0.3" = {
-      name = "_at_types_slash_rx-lite-time";
-      packageName = "@types/rx-lite-time";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz";
-        sha512 = "ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==";
-      };
-    };
-    "@types/rx-lite-virtualtime-4.0.3" = {
-      name = "_at_types_slash_rx-lite-virtualtime";
-      packageName = "@types/rx-lite-virtualtime";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz";
-        sha512 = "3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==";
-      };
-    };
     "@types/semver-5.5.0" = {
       name = "_at_types_slash_semver";
       packageName = "@types/semver";
@@ -1165,24 +1093,6 @@ let
         sha512 = "/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==";
       };
     };
-    "@types/string-width-2.0.0" = {
-      name = "_at_types_slash_string-width";
-      packageName = "@types/string-width";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/string-width/-/string-width-2.0.0.tgz";
-        sha512 = "dA5z2WlP7uurAiveIWTDRgfr1U58Qdmo6doDeAyJlYFQ3vnUOW7BqJ+tl+M8FaLcflhrVvwIfzxJJvlz6anx4A==";
-      };
-    };
-    "@types/strip-ansi-3.0.0" = {
-      name = "_at_types_slash_strip-ansi";
-      packageName = "@types/strip-ansi";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/strip-ansi/-/strip-ansi-3.0.0.tgz";
-        sha1 = "9b63d453a6b54aa849182207711a08be8eea48ae";
-      };
-    };
     "@types/superagent-3.8.2" = {
       name = "_at_types_slash_superagent";
       packageName = "@types/superagent";
@@ -1192,42 +1102,6 @@ let
         sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA==";
       };
     };
-    "@types/through-0.0.29" = {
-      name = "_at_types_slash_through";
-      packageName = "@types/through";
-      version = "0.0.29";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/through/-/through-0.0.29.tgz";
-        sha512 = "9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==";
-      };
-    };
-    "@types/untildify-3.0.0" = {
-      name = "_at_types_slash_untildify";
-      packageName = "@types/untildify";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/untildify/-/untildify-3.0.0.tgz";
-        sha512 = "FTktI3Y1h+gP9GTjTvXBP5v8xpH4RU6uS9POoBcGy4XkS2Np6LNtnP1eiNNth4S7P+qw2c/rugkwBasSHFzJEg==";
-      };
-    };
-    "@types/wrap-ansi-3.0.0" = {
-      name = "_at_types_slash_wrap-ansi";
-      packageName = "@types/wrap-ansi";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz";
-        sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==";
-      };
-    };
-    "@types/write-file-atomic-2.1.1" = {
-      name = "_at_types_slash_write-file-atomic";
-      packageName = "@types/write-file-atomic";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/write-file-atomic/-/write-file-atomic-2.1.1.tgz";
-        sha512 = "mROQhTxpJsOm/S0eOxDHUy5WJ0yS8fmqsq/s+u5OuAh1TxBFSqVBTkLjbyxDPcKh7DeJXk0OYrCkxXlkf8zu1g==";
-      };
-    };
     "@types/ws-5.1.2" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
@@ -1246,202 +1120,229 @@ let
         sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
       };
     };
-    "@vue/cli-shared-utils-3.0.1" = {
+    "@vue/cli-shared-utils-3.0.4" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "3.0.1";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.1.tgz";
-        sha512 = "bdFxerHn/Tz/yIsZH9d1QkegdJR2KzkVHcn1ejDM/QV1RM3OteFbDcTBEIaAOd3OcAtyikzkRrsr1o9iBsBqVg==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.4.tgz";
+        sha512 = "st6f/s1nCo45r3yZDYCuWaFME/ECB9Mz4bPxlC9cl/3McMSESJvhnJAlh75DVdsp5teNr8HSzHwfTRfmQtKKyw==";
       };
     };
-    "@vue/cli-ui-3.0.1" = {
+    "@vue/cli-ui-3.0.4" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "3.0.1";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.1.tgz";
-        sha512 = "Mpj6la1XxjbLE0DdfNbqd3Bi71hhheMhXZfBsgD+xujzW/VCRevrZ/utbR1/NDhl0OXC1eBrvyyDoFWSPCagog==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.4.tgz";
+        sha512 = "tdqcHDyXm/sqO7LQWJ8g1DItez6dJQyeiTn/xJIU/vsTOoUhi2s+PslTB7acPrzgya3j1ORDPJ9nHfkpE0xM8Q==";
       };
     };
-    "@vue/cli-ui-addon-webpack-3.0.1" = {
+    "@vue/cli-ui-addon-webpack-3.0.4" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "3.0.1";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.1.tgz";
-        sha512 = "QVAeazXILNcdSfBhxkoeXme/BgwXj0qUJVPrtXydsmk68GDUj7gz4xXoucaTbor8zDS3hIUfs6XRdl+KPN+Tfg==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.4.tgz";
+        sha512 = "93cZaZxPUUg/hxxkFNUTrtMNP8Yk2KzI3ndX25yPi2THm5gNPYMXiDE/9s8lzs6kzX2VOO1bxbukOdkJ0ZdkNw==";
       };
     };
-    "@webassemblyjs/ast-1.5.13" = {
+    "@webassemblyjs/ast-1.7.8" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz";
-        sha512 = "49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.8.tgz";
+        sha512 = "dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.5.13" = {
+    "@webassemblyjs/floating-point-hex-parser-1.7.8" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz";
-        sha512 = "vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz";
+        sha512 = "kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.5.13" = {
+    "@webassemblyjs/helper-api-error-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz";
-        sha512 = "dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz";
+        sha512 = "xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.5.13" = {
+    "@webassemblyjs/helper-buffer-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz";
-        sha512 = "v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz";
+        sha512 = "WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.5.13" = {
+    "@webassemblyjs/helper-code-frame-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-code-frame";
       packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz";
-        sha512 = "yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz";
+        sha512 = "TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.5.13" = {
+    "@webassemblyjs/helper-fsm-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz";
-        sha512 = "hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz";
+        sha512 = "TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==";
       };
     };
-    "@webassemblyjs/helper-module-context-1.5.13" = {
+    "@webassemblyjs/helper-module-context-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz";
-        sha512 = "zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz";
+        sha512 = "uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.5.13" = {
+    "@webassemblyjs/helper-wasm-bytecode-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz";
-        sha512 = "0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz";
+        sha512 = "AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.5.13" = {
+    "@webassemblyjs/helper-wasm-section-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz";
-        sha512 = "IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz";
+        sha512 = "BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==";
       };
     };
-    "@webassemblyjs/ieee754-1.5.13" = {
+    "@webassemblyjs/ieee754-1.7.8" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz";
-        sha512 = "TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz";
+        sha512 = "tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==";
       };
     };
-    "@webassemblyjs/leb128-1.5.13" = {
+    "@webassemblyjs/leb128-1.7.8" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz";
-        sha512 = "0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.8.tgz";
+        sha512 = "GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==";
       };
     };
-    "@webassemblyjs/utf8-1.5.13" = {
+    "@webassemblyjs/utf8-1.7.8" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz";
-        sha512 = "Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==";
+        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.8.tgz";
+        sha512 = "9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.5.13" = {
+    "@webassemblyjs/wasm-edit-1.7.8" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz";
-        sha512 = "X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz";
+        sha512 = "6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.5.13" = {
+    "@webassemblyjs/wasm-gen-1.7.8" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz";
-        sha512 = "yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz";
+        sha512 = "a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.5.13" = {
+    "@webassemblyjs/wasm-opt-1.7.8" = {
       name = "_at_webassemblyjs_slash_wasm-opt";
       packageName = "@webassemblyjs/wasm-opt";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz";
-        sha512 = "IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz";
+        sha512 = "3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.5.13" = {
+    "@webassemblyjs/wasm-parser-1.7.8" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz";
-        sha512 = "XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz";
+        sha512 = "rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==";
       };
     };
-    "@webassemblyjs/wast-parser-1.5.13" = {
+    "@webassemblyjs/wast-parser-1.7.8" = {
       name = "_at_webassemblyjs_slash_wast-parser";
       packageName = "@webassemblyjs/wast-parser";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz";
-        sha512 = "Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz";
+        sha512 = "Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==";
       };
     };
-    "@webassemblyjs/wast-printer-1.5.13" = {
+    "@webassemblyjs/wast-printer-1.7.8" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
-      version = "1.5.13";
+      version = "1.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz";
-        sha512 = "QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz";
+        sha512 = "GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==";
       };
     };
-    "@zeit/schemas-2.1.1" = {
+    "@xtuc/ieee754-1.2.0" = {
+      name = "_at_xtuc_slash_ieee754";
+      packageName = "@xtuc/ieee754";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+        sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
+      };
+    };
+    "@xtuc/long-4.2.1" = {
+      name = "_at_xtuc_slash_long";
+      packageName = "@xtuc/long";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz";
+        sha512 = "FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==";
+      };
+    };
+    "@yarnpkg/lockfile-1.1.0" = {
+      name = "_at_yarnpkg_slash_lockfile";
+      packageName = "@yarnpkg/lockfile";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz";
+        sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==";
+      };
+    };
+    "@zeit/schemas-2.6.0" = {
       name = "_at_zeit_slash_schemas";
       packageName = "@zeit/schemas";
-      version = "2.1.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.1.1.tgz";
-        sha512 = "7uBms9Uwzq1GnLK7ar4FvhUONW5PuuASBomeMJ5rREMYxWdm2R0/5iXH2gUm8uqVT1x8U51CGuoaF40Tc0xoJA==";
+        url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.6.0.tgz";
+        sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==";
       };
     };
     "CSSselect-0.4.1" = {
@@ -1606,13 +1507,13 @@ let
         sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
       };
     };
-    "accord-0.28.0" = {
+    "accord-0.29.0" = {
       name = "accord";
       packageName = "accord";
-      version = "0.28.0";
+      version = "0.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz";
-        sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ==";
+        url = "https://registry.npmjs.org/accord/-/accord-0.29.0.tgz";
+        sha512 = "3OOR92FTc2p5/EcOzPcXp+Cbo+3C15nV9RXHlOUBCBpHhcB+0frbSNR9ehED/o7sTcyGVtqGJpguToEdlXhD0w==";
       };
     };
     "acorn-1.2.2" = {
@@ -1620,7 +1521,7 @@ let
       packageName = "acorn";
       version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+        url = "http://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
         sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
       };
     };
@@ -1629,7 +1530,7 @@ let
       packageName = "acorn";
       version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+        url = "http://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
         sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
       };
     };
@@ -1638,7 +1539,7 @@ let
       packageName = "acorn";
       version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+        url = "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
         sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
       };
     };
@@ -1651,13 +1552,13 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.7.2" = {
+    "acorn-5.7.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.2";
+      version = "5.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.2.tgz";
-        sha512 = "cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
+        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
       };
     };
     "acorn-dynamic-import-3.0.0" = {
@@ -1674,7 +1575,7 @@ let
       packageName = "acorn-globals";
       version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
+        url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
         sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
       };
     };
@@ -1692,7 +1593,7 @@ let
       packageName = "acorn-jsx";
       version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
+        url = "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
@@ -1939,6 +1840,15 @@ let
         sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==";
       };
     };
+    "ajv-6.5.4" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "6.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz";
+        sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==";
+      };
+    };
     "ajv-keywords-1.5.1" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
@@ -2043,10 +1953,19 @@ let
       packageName = "ansi-colors";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz";
+        url = "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz";
         sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==";
       };
     };
+    "ansi-colors-2.0.5" = {
+      name = "ansi-colors";
+      packageName = "ansi-colors";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz";
+        sha512 = "yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==";
+      };
+    };
     "ansi-cyan-0.1.1" = {
       name = "ansi-cyan";
       packageName = "ansi-cyan";
@@ -2106,7 +2025,7 @@ let
       packageName = "ansi-regex";
       version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
         sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
       };
     };
@@ -2115,7 +2034,7 @@ let
       packageName = "ansi-regex";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
         sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
       };
     };
@@ -2263,40 +2182,40 @@ let
         sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692";
       };
     };
-    "apollo-cache-1.1.16" = {
+    "apollo-cache-1.1.17" = {
       name = "apollo-cache";
       packageName = "apollo-cache";
-      version = "1.1.16";
+      version = "1.1.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.16.tgz";
-        sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg==";
+        url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.17.tgz";
+        sha512 = "7sp24n2HZO4vXgTaKNomLyIfGxG4gDdDkBB0jkRzRi7HhnKmfwhiF/RCiKNbgLdrPX151INdls0KwIVliD0dHQ==";
       };
     };
-    "apollo-cache-control-0.2.3" = {
+    "apollo-cache-control-0.2.5" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.2.3";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz";
-        sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.5.tgz";
+        sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ==";
       };
     };
-    "apollo-cache-inmemory-1.2.9" = {
+    "apollo-cache-inmemory-1.3.0" = {
       name = "apollo-cache-inmemory";
       packageName = "apollo-cache-inmemory";
-      version = "1.2.9";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.9.tgz";
-        sha512 = "Z4m4NpT2eboM4qUww/46CsjOyITavxrKPBrsCugDlmwSzonqMLZmAyZEQgnYXCj8L5q5epnOuf0sqyYK/6sGIQ==";
+        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.0.tgz";
+        sha512 = "7NXKkICo/JswTfTf7E3XAt5qcmt8xydUk86LbFrNiM9w3mHNIJnCJZdycuy34bx4DWsA+Bex4oYDB4H70v4maQ==";
       };
     };
-    "apollo-client-2.4.1" = {
+    "apollo-client-2.4.2" = {
       name = "apollo-client";
       packageName = "apollo-client";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.1.tgz";
-        sha512 = "E6pQD+BwI1zboM9oX83yzH9BmBjJWU5pL36CpGC2+XaaBDc6UvrPtacxQsg/h7Fq5T5IKJoIhuBEWtefJIb9xg==";
+        url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.2.tgz";
+        sha512 = "g1z23umaVSoKLj9xNl0aAnk2KBF4JeBi7MeKFc9CGTixH7TkqeQUQtxcjrC7j2h4KmDbuhOAHOFUGf8YshN+ag==";
       };
     };
     "apollo-codegen-0.19.1" = {
@@ -2304,7 +2223,7 @@ let
       packageName = "apollo-codegen";
       version = "0.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz";
+        url = "http://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz";
         sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng==";
       };
     };
@@ -2317,13 +2236,13 @@ let
         sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw==";
       };
     };
-    "apollo-engine-reporting-0.0.3" = {
+    "apollo-engine-reporting-0.0.6" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "0.0.3";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz";
-        sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.6.tgz";
+        sha512 = "JmfNJ9v3QEJQ8ZhLfCKEDiww53n5kj5HarP85p8LreoYNojbvcWN8Qm6RgvSG5N/ZJrAYHeTRQbSxm1vWwGubw==";
       };
     };
     "apollo-engine-reporting-protobuf-0.0.1" = {
@@ -2335,49 +2254,40 @@ let
         sha512 = "AySoDgog2p1Nph44FyyqaU4AfRZOXx8XZxRsVHvYY4dHlrMmDDhhjfF3Jswa7Wr8X/ivvx3xA0jimRn6rsG8Ew==";
       };
     };
-    "apollo-link-1.2.2" = {
+    "apollo-link-1.2.3" = {
       name = "apollo-link";
       packageName = "apollo-link";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.2.tgz";
-        sha512 = "Uk/BC09dm61DZRDSu52nGq0nFhq7mcBPTjy5EEH1eunJndtCaNXQhQz/BjkI2NdrfGI+B+i5he6YSoRBhYizdw==";
+        url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.3.tgz";
+        sha512 = "iL9yS2OfxYhigme5bpTbmRyC+Htt6tyo2fRMHT3K1XRL/C5IQDDz37OjpPy4ndx7WInSvfSZaaOTKFja9VWqSw==";
       };
     };
-    "apollo-link-context-1.0.8" = {
+    "apollo-link-context-1.0.9" = {
       name = "apollo-link-context";
       packageName = "apollo-link-context";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.8.tgz";
-        sha512 = "wgDwBbWqHblf7W0DD2b80kXLtSAfvbXnsxSrli0GuF77VwxjLChijiHinW5bjurzZvP8YRMNhitmrrF5ia7NsA==";
-      };
-    };
-    "apollo-link-dedup-1.0.9" = {
-      name = "apollo-link-dedup";
-      packageName = "apollo-link-dedup";
       version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.9.tgz";
-        sha512 = "RbuEKpmSHVMtoREMPh2wUFTeh65q+0XPVeqgaOP/rGEAfvLyOMvX0vT2nVaejMohoMxuUnfZwpldXaDFWnlVbg==";
+        url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.9.tgz";
+        sha512 = "gcC1WH7mTyNtS0bF4fPijepXqnERwZjm1JCkuOT6ADBTpDTXIqK+Ec+/QkVawDO26EV9OX5ujWe4kI1qC6T6tA==";
       };
     };
-    "apollo-link-http-1.5.4" = {
-      name = "apollo-link-http";
-      packageName = "apollo-link-http";
-      version = "1.5.4";
+    "apollo-link-dedup-1.0.10" = {
+      name = "apollo-link-dedup";
+      packageName = "apollo-link-dedup";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.4.tgz";
-        sha512 = "e9Ng3HfnW00Mh3TI6DhNRfozmzQOtKgdi+qUAsHBOEcTP0PTAmb+9XpeyEEOueLyO0GXhB92HUCIhzrWMXgwyg==";
+        url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz";
+        sha512 = "tpUI9lMZsidxdNygSY1FxflXEkUZnvKRkMUsXXuQUNoSLeNtEvUX7QtKRAl4k9ubLl8JKKc9X3L3onAFeGTK8w==";
       };
     };
-    "apollo-link-http-common-0.2.4" = {
+    "apollo-link-http-common-0.2.5" = {
       name = "apollo-link-http-common";
       packageName = "apollo-link-http-common";
-      version = "0.2.4";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.4.tgz";
-        sha512 = "4j6o6WoXuSPen9xh4NBaX8/vL98X1xY2cYzUEK1F8SzvHe2oFONfxJBTekwU8hnvapcuq8Qh9Uct+gelu8T10g==";
+        url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.5.tgz";
+        sha512 = "6FV1wr5AqAyJ64Em1dq5hhGgiyxZE383VJQmhIoDVc3MyNcFL92TkhxREOs4rnH2a9X2iJMko7nodHSGLC6d8w==";
       };
     };
     "apollo-link-persisted-queries-0.2.1" = {
@@ -2389,22 +2299,22 @@ let
         sha512 = "OxBum5e5vn8XBBEURXpoYstwcKNtK/p3K3bAQ5yGjj7IyzpLmBcKLzfjk3wAnEyJJYbOUXIvPg7XnxQbcIlNGA==";
       };
     };
-    "apollo-link-state-0.4.1" = {
+    "apollo-link-state-0.4.2" = {
       name = "apollo-link-state";
       packageName = "apollo-link-state";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.1.tgz";
-        sha512 = "69/til4ENfl/Fvf7br2xSsLSBcxcXPbOHVNkzLLejvUZickl93HLO4/fO+uvoBi4dCYRgN17Zr8FwI41ueRx0g==";
+        url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.2.tgz";
+        sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw==";
       };
     };
-    "apollo-link-ws-1.0.8" = {
+    "apollo-link-ws-1.0.9" = {
       name = "apollo-link-ws";
       packageName = "apollo-link-ws";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.8.tgz";
-        sha512 = "ucuGvr8CBBwCHl/Rbtyuv9Fn0FN5Qoyvy84KHtuMl2Uux2Sq+jt3bUum+pZ+hZntEd9k8M1OjrrXqRJ4PtEpyA==";
+        url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.9.tgz";
+        sha512 = "CtKwLE61bCJTW5jrucOMm5PubeAlCl/9i45pg4GKKlAbl0zR4i2dww8TJkYoIY6iCyj4qjKW/uqGD6v5/aVwhg==";
       };
     };
     "apollo-server-caching-0.1.2" = {
@@ -2416,13 +2326,13 @@ let
         sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig==";
       };
     };
-    "apollo-server-core-2.0.5" = {
+    "apollo-server-core-2.1.0" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.0.5";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz";
-        sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.1.0.tgz";
+        sha512 = "D1Tw0o3NzCQ2KGM8EWh9AHELHmn/SE361dtlqJxkbelxXqAkCIGIFywF30h+0ezhMbgbO7eqBBJfvRilF/oJHA==";
       };
     };
     "apollo-server-env-2.0.3" = {
@@ -2443,22 +2353,22 @@ let
         sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg==";
       };
     };
-    "apollo-server-express-2.0.5" = {
+    "apollo-server-express-2.1.0" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.0.5";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz";
-        sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.1.0.tgz";
+        sha512 = "jLFIz1VLduMA/rme4OAy3IPeoaMEZOPoQXpio8AhfjIqCijRPPfoWJ2QMqz56C/g3vas7rZtgcVOrHpjBKudjw==";
       };
     };
-    "apollo-tracing-0.2.3" = {
+    "apollo-tracing-0.2.5" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.2.3";
+      version = "0.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz";
-        sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.5.tgz";
+        sha512 = "DZO7pfL5LATHeJdVFoTZ/N3HwA+IMf1YnIt5K+uMQW+/MrRgYOtTszUv5tYX2cUIqHYHcbdDaBQUuIXwSpaV2Q==";
       };
     };
     "apollo-upload-client-8.1.0" = {
@@ -2470,13 +2380,13 @@ let
         sha512 = "JEgStzhnwybj1ifE2nViLEl7NTM5+zS++fKbDL95PIpodg2AdYeeN7eEa7RXpYD14iC3FVcsfqgGMREv2+cSxw==";
       };
     };
-    "apollo-utilities-1.0.20" = {
+    "apollo-utilities-1.0.21" = {
       name = "apollo-utilities";
       packageName = "apollo-utilities";
-      version = "1.0.20";
+      version = "1.0.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.20.tgz";
-        sha512 = "2M4BJCyX/9UXGJFoV4sTnVTZ4Q29aM18Z1avDrwvlCGGwoRTz50sGBAfTiWnUnnNQyPIIJEYElScw46DgIu0Rg==";
+        url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.21.tgz";
+        sha512 = "ZcxELlEl+sDCYBgEMdNXJAsZtRVm8wk4HIA58bMsqYfd1DSAJQEtZ93F0GZgYNAGy3QyaoBeZtbb0/01++G8JQ==";
       };
     };
     "append-0.1.1" = {
@@ -2515,6 +2425,15 @@ let
         sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a";
       };
     };
+    "append-field-1.0.0" = {
+      name = "append-field";
+      packageName = "append-field";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz";
+        sha1 = "1e3440e915f0b1203d23748e78edd7b9b5b43e56";
+      };
+    };
     "append-tree-2.4.4" = {
       name = "append-tree";
       packageName = "append-tree";
@@ -2551,6 +2470,15 @@ let
         sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
+    "aproba-2.0.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz";
+        sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==";
+      };
+    };
     "arch-2.1.1" = {
       name = "arch";
       packageName = "arch";
@@ -2619,7 +2547,7 @@ let
       packageName = "arg";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz";
+        url = "http://registry.npmjs.org/arg/-/arg-2.0.0.tgz";
         sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w==";
       };
     };
@@ -3199,13 +3127,13 @@ let
         sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
       };
     };
-    "async-retry-1.2.1" = {
+    "async-retry-1.2.3" = {
       name = "async-retry";
       packageName = "async-retry";
-      version = "1.2.1";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async-retry/-/async-retry-1.2.1.tgz";
-        sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw==";
+        url = "https://registry.npmjs.org/async-retry/-/async-retry-1.2.3.tgz";
+        sha512 = "tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q==";
       };
     };
     "async-single-1.0.5" = {
@@ -3307,13 +3235,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.307.0" = {
+    "aws-sdk-2.325.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.307.0";
+      version = "2.325.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz";
-        sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.325.0.tgz";
+        sha512 = "26V/4vzInQ5EO/+HCoZaXO5YB6XWo4sRXbNtc3bFEcUfMZ5Psin2M8McY/zasJyYbZuNisK608kjio+AXm8vig==";
       };
     };
     "aws-sign-0.2.1" = {
@@ -3366,7 +3294,7 @@ let
       packageName = "azure-arm-authorization";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
+        url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
@@ -3438,7 +3366,7 @@ let
       packageName = "azure-arm-dns";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz";
+        url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-2.1.0.tgz";
         sha512 = "/y0tOM9qNijPYqB381JFYiEyfF+L5B8z+F8JS1OMV1JXIb45vZKXeoe82ZNMZ5g38Vme3uAblxpvp5OtIcvW6Q==";
       };
     };
@@ -3510,7 +3438,7 @@ let
       packageName = "azure-arm-resource";
       version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
@@ -4077,7 +4005,7 @@ let
       packageName = "basic-auth";
       version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+        url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
         sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
       };
     };
@@ -4086,7 +4014,7 @@ let
       packageName = "basic-auth";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
+        url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz";
         sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884";
       };
     };
@@ -4099,6 +4027,15 @@ let
         sha1 = "015db3f353e02e56377755f962742e8981e7bbba";
       };
     };
+    "basic-auth-2.0.1" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz";
+        sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==";
+      };
+    };
     "basic-auth-connect-1.0.0" = {
       name = "basic-auth-connect";
       packageName = "basic-auth-connect";
@@ -4234,13 +4171,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.35" = {
+    "big-integer-1.6.36" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.35";
+      version = "1.6.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz";
-        sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ==";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz";
+        sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==";
       };
     };
     "big.js-3.2.0" = {
@@ -4288,13 +4225,13 @@ let
         sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
       };
     };
-    "binary-extensions-1.11.0" = {
+    "binary-extensions-1.12.0" = {
       name = "binary-extensions";
       packageName = "binary-extensions";
-      version = "1.11.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz";
-        sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205";
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.12.0.tgz";
+        sha512 = "DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==";
       };
     };
     "binary-search-1.3.4" = {
@@ -4338,7 +4275,7 @@ let
       packageName = "binstall";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz";
+        url = "http://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz";
         sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933";
       };
     };
@@ -4707,7 +4644,7 @@ let
       packageName = "bottleneck";
       version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
+        url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz";
         sha1 = "55fa64920d9670087d44150404525d59f9511c20";
       };
     };
@@ -4765,15 +4702,6 @@ let
         sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e";
       };
     };
-    "bplist-creator-0.0.7" = {
-      name = "bplist-creator";
-      packageName = "bplist-creator";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz";
-        sha1 = "37df1536092824b87c42f957b01344117372ae45";
-      };
-    };
     "bplist-parser-0.1.1" = {
       name = "bplist-parser";
       packageName = "bplist-parser";
@@ -4887,7 +4815,7 @@ let
       packageName = "browserify";
       version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
+        url = "http://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz";
         sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce";
       };
     };
@@ -4905,7 +4833,7 @@ let
       packageName = "browserify-aes";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
+        url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
         sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
       };
     };
@@ -4968,7 +4896,7 @@ let
       packageName = "browserify-rsa";
       version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+        url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
@@ -5013,7 +4941,7 @@ let
       packageName = "bson";
       version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+        url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
         sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
       };
     };
@@ -5121,7 +5049,7 @@ let
       packageName = "buffer-equals";
       version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz";
+        url = "http://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz";
         sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5";
       };
     };
@@ -5701,13 +5629,13 @@ let
         sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
       };
     };
-    "chai-4.1.2" = {
+    "chai-4.2.0" = {
       name = "chai";
       packageName = "chai";
-      version = "4.1.2";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz";
-        sha1 = "0f64584ba642f0f2ace2806279f4f06ca23ad73c";
+        url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz";
+        sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==";
       };
     };
     "chai-as-promised-7.1.1" = {
@@ -5962,13 +5890,13 @@ let
         sha1 = "178686a85e9278045112e96e8c791793f9a10aea";
       };
     };
-    "chmodr-1.0.2" = {
+    "chmodr-1.2.0" = {
       name = "chmodr";
       packageName = "chmodr";
-      version = "1.0.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz";
-        sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9";
+        url = "https://registry.npmjs.org/chmodr/-/chmodr-1.2.0.tgz";
+        sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA==";
       };
     };
     "chokidar-1.6.0" = {
@@ -5976,7 +5904,7 @@ let
       packageName = "chokidar";
       version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz";
+        url = "http://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz";
         sha1 = "90c32ad4802901d7713de532dc284e96a63ad058";
       };
     };
@@ -6003,17 +5931,17 @@ let
       packageName = "chownr";
       version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz";
+        url = "http://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz";
         sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485";
       };
     };
-    "chownr-1.0.1" = {
+    "chownr-1.1.1" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.0.1";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
-        sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";
+        sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==";
       };
     };
     "chrome-trace-event-1.0.0" = {
@@ -6070,13 +5998,13 @@ let
         sha512 = "GA1NIFDZKElhkjiO6QOyzfK1QbUt6M3gFhUU/aR05JYaDqXbU5d7U92cLvGKdItJEDfojky6NQefy5VL5PpDBA==";
       };
     };
-    "ci-info-1.4.0" = {
+    "ci-info-1.6.0" = {
       name = "ci-info";
       packageName = "ci-info";
-      version = "1.4.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.4.0.tgz";
-        sha512 = "Oqmw2pVfCl8sCL+1QgMywPfdxPJPkC51y4usw0iiE2S9qnEOAqXy8bwl1CpMpnoU39g4iKJTz6QZj+28FvOnjQ==";
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz";
+        sha512 = "vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==";
       };
     };
     "cint-8.2.1" = {
@@ -6115,13 +6043,13 @@ let
         sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
       };
     };
-    "circular-json-0.5.5" = {
+    "circular-json-0.5.7" = {
       name = "circular-json";
       packageName = "circular-json";
-      version = "0.5.5";
+      version = "0.5.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.5.tgz";
-        sha512 = "13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==";
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.7.tgz";
+        sha512 = "/pXoV1JA847qRKPrHbBK6YIBGFF8GOP4wzSgUOA7q0ew0vAv0iJswP+2/nZQ9uzA3Azi7eTrg9L2yzXc/7ZMIA==";
       };
     };
     "clarinet-0.11.0" = {
@@ -6786,7 +6714,7 @@ let
       packageName = "combined-stream";
       version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
         sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
       };
     };
@@ -6795,10 +6723,19 @@ let
       packageName = "combined-stream";
       version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
         sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
       };
     };
+    "combined-stream-1.0.7" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
+        sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
+      };
+    };
     "command-exists-1.2.7" = {
       name = "command-exists";
       packageName = "command-exists";
@@ -6813,7 +6750,7 @@ let
       packageName = "commander";
       version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
         sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
       };
     };
@@ -6822,7 +6759,7 @@ let
       packageName = "commander";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.0.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-1.0.0.tgz";
         sha1 = "5e6a88e7070ff5908836ead19169548c30f90bcd";
       };
     };
@@ -6831,7 +6768,7 @@ let
       packageName = "commander";
       version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
         sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
       };
     };
@@ -6840,7 +6777,7 @@ let
       packageName = "commander";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
         sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
       };
     };
@@ -6849,7 +6786,7 @@ let
       packageName = "commander";
       version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
         sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
       };
     };
@@ -6858,7 +6795,7 @@ let
       packageName = "commander";
       version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
         sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
       };
     };
@@ -6867,7 +6804,7 @@ let
       packageName = "commander";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
         sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
       };
     };
@@ -6876,7 +6813,7 @@ let
       packageName = "commander";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
         sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
       };
     };
@@ -6903,7 +6840,7 @@ let
       packageName = "commander";
       version = "2.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.14.1.tgz";
         sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==";
       };
     };
@@ -6912,7 +6849,7 @@ let
       packageName = "commander";
       version = "2.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz";
         sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==";
       };
     };
@@ -6925,12 +6862,21 @@ let
         sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==";
       };
     };
+    "commander-2.18.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz";
+        sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==";
+      };
+    };
     "commander-2.3.0" = {
       name = "commander";
       packageName = "commander";
       version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
         sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
       };
     };
@@ -6939,7 +6885,7 @@ let
       packageName = "commander";
       version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
         sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
       };
     };
@@ -6948,7 +6894,7 @@ let
       packageName = "commander";
       version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
         sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
       };
     };
@@ -6957,7 +6903,7 @@ let
       packageName = "commander";
       version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
@@ -7006,6 +6952,15 @@ let
         sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
       };
     };
+    "compare-at-paths-1.0.0" = {
+      name = "compare-at-paths";
+      packageName = "compare-at-paths";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compare-at-paths/-/compare-at-paths-1.0.0.tgz";
+        sha512 = "Ke1ejo/RZ+Hzku4gcW34uPMOR4Cpq87MAotELgV9mwiAzDN726cu+eWo0zWg1vRIfyf6yK5bW9uIW+c/SksQ5w==";
+      };
+    };
     "compare-func-1.3.2" = {
       name = "compare-func";
       packageName = "compare-func";
@@ -7060,13 +7015,13 @@ let
         sha1 = "524a9f10903f3a813389b0225d27c48bb751890f";
       };
     };
-    "compressible-2.0.14" = {
+    "compressible-2.0.15" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.14";
+      version = "2.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz";
-        sha1 = "326c5f507fbb055f54116782b969a81b67a29da7";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz";
+        sha512 = "4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==";
       };
     };
     "compression-1.5.2" = {
@@ -7141,13 +7096,13 @@ let
         sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
       };
     };
-    "config-chain-1.1.11" = {
+    "config-chain-1.1.12" = {
       name = "config-chain";
       packageName = "config-chain";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz";
-        sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
+        url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
+        sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
       };
     };
     "configstore-1.4.0" = {
@@ -7159,15 +7114,6 @@ let
         sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021";
       };
     };
-    "configstore-2.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
-        sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
-      };
-    };
     "configstore-3.1.2" = {
       name = "configstore";
       packageName = "configstore";
@@ -7258,13 +7204,13 @@ let
         sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
       };
     };
-    "connect-multiparty-2.1.1" = {
+    "connect-multiparty-2.2.0" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.1.tgz";
-        sha1 = "6ee8212fdb2204d3f135f8c12e3afa495d181fd7";
+        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.2.0.tgz";
+        sha512 = "zKcpA7cuXGEhuw9Pz7JmVCFmp85jzGLGm/iiagXTwyEAJp4ypLPtRS/V4IGuGb9KjjrgHBs6P/gDCpZHnFzksA==";
       };
     };
     "connect-pause-0.1.1" = {
@@ -7570,17 +7516,17 @@ let
       packageName = "convert-source-map";
       version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz";
+        url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz";
         sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
       };
     };
-    "convert-source-map-1.5.1" = {
+    "convert-source-map-1.6.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.5.1";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz";
-        sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
+        sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
       };
     };
     "cookie-0.0.4" = {
@@ -7727,13 +7673,13 @@ let
         sha512 = "Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==";
       };
     };
-    "cookies-0.7.1" = {
+    "cookies-0.7.2" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz";
-        sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.2.tgz";
+        sha512 = "J2JjH9T3PUNKPHknprxgCrCaZshIfxW2j49gq1E1CP5Micj1LppWAR2y9EHSQAzEiX84zOsScWNwUZ0b/ChlMw==";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -7781,13 +7727,13 @@ let
         sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf";
       };
     };
-    "cordova-fetch-1.3.0" = {
+    "cordova-fetch-1.3.1" = {
       name = "cordova-fetch";
       packageName = "cordova-fetch";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz";
-        sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea";
+        url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.1.tgz";
+        sha512 = "/0PNQUPxHvVcjlzVQcydD5BQtfx1XdCfzQ2KigdtZma5oVVUtR4IxfnYB15RuT/GVb/SGRLvR5AIi2Gd5Gb+mg==";
       };
     };
     "cordova-js-4.2.4" = {
@@ -7799,13 +7745,13 @@ let
         sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw==";
       };
     };
-    "cordova-lib-8.0.0" = {
+    "cordova-lib-8.1.0" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "8.0.0";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz";
-        sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.0.tgz";
+        sha512 = "VLLRhEaqi5bD1AxAndlPGiRD5ZX2EwUnxGxIvEUUbgZxwOceGWHM2wdI4V2nJOieJ0N8CbDRsLsOwFJQsRLOyQ==";
       };
     };
     "cordova-registry-mapper-1.1.15" = {
@@ -7862,6 +7808,15 @@ let
         sha1 = "2bd381f2eb201020105cd50ea59da63090694686";
       };
     };
+    "corser-2.0.1" = {
+      name = "corser";
+      packageName = "corser";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz";
+        sha1 = "8eda252ecaab5840dcd975ceb90d9370c819ff87";
+      };
+    };
     "corsify-2.1.0" = {
       name = "corsify";
       packageName = "corsify";
@@ -7880,6 +7835,15 @@ let
         sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==";
       };
     };
+    "cosmiconfig-4.0.0" = {
+      name = "cosmiconfig";
+      packageName = "cosmiconfig";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz";
+        sha512 = "6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==";
+      };
+    };
     "cosmiconfig-5.0.6" = {
       name = "cosmiconfig";
       packageName = "cosmiconfig";
@@ -7984,7 +7948,7 @@ let
       packageName = "create-hash";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
+        url = "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
         sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
       };
     };
@@ -7993,7 +7957,7 @@ let
       packageName = "create-hmac";
       version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
+        url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
@@ -8006,13 +7970,13 @@ let
         sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA==";
       };
     };
-    "cron-1.3.0" = {
+    "cron-1.4.1" = {
       name = "cron";
       packageName = "cron";
-      version = "1.3.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.3.0.tgz";
-        sha512 = "K/SF7JlgMmNjcThWxkKvsHhey2EDB4CeOEWJ9aXWj3fbQJppsvTPIeyLdHfNq5IbbsMUUjRW1nr5dSO95f2E4w==";
+        url = "https://registry.npmjs.org/cron/-/cron-1.4.1.tgz";
+        sha512 = "HlglwQUNh6bhgfoDR6aEzyHN2T4bc0XhxJxkNPp+Ry7lK7Noby94pHcngYf634+MtxplwZm8okFgNe+R9PGDjg==";
       };
     };
     "cross-fetch-2.2.2" = {
@@ -8173,17 +8137,17 @@ let
       packageName = "css";
       version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz";
+        url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
         sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
       };
     };
-    "css-2.2.3" = {
+    "css-2.2.4" = {
       name = "css";
       packageName = "css";
-      version = "2.2.3";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css/-/css-2.2.3.tgz";
-        sha512 = "0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==";
+        url = "https://registry.npmjs.org/css/-/css-2.2.4.tgz";
+        sha512 = "oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==";
       };
     };
     "css-parse-1.0.4" = {
@@ -8213,13 +8177,13 @@ let
         sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "css-select-1.3.0-rc0" = {
+    "css-select-2.0.0" = {
       name = "css-select";
       packageName = "css-select";
-      version = "1.3.0-rc0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz";
-        sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231";
+        url = "https://registry.npmjs.org/css-select/-/css-select-2.0.0.tgz";
+        sha512 = "MGhoq1S9EyPgZIGnts8Yz5WwUOyHmPMdlqeifsYs/xFX7AAm3hY0RJe1dqVlXtYPI66Nsk39R/sa5/ree6L2qg==";
       };
     };
     "css-select-base-adapter-0.1.0" = {
@@ -8240,6 +8204,15 @@ let
         sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
       };
     };
+    "css-tree-1.0.0-alpha.28" = {
+      name = "css-tree";
+      packageName = "css-tree";
+      version = "1.0.0-alpha.28";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz";
+        sha512 = "joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==";
+      };
+    };
     "css-tree-1.0.0-alpha.29" = {
       name = "css-tree";
       packageName = "css-tree";
@@ -8249,15 +8222,6 @@ let
         sha512 = "sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==";
       };
     };
-    "css-tree-1.0.0-alpha25" = {
-      name = "css-tree";
-      packageName = "css-tree";
-      version = "1.0.0-alpha25";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz";
-        sha512 = "XC6xLW/JqIGirnZuUWHXCHRaAjje2b3OIB0Vj5RIJo6mIi/AdJo30quQl5LxUl0gkXDIrTrFGbMlcZjyFplz1A==";
-      };
-    };
     "css-url-regex-1.1.0" = {
       name = "css-url-regex";
       packageName = "css-url-regex";
@@ -8362,7 +8326,7 @@ let
       packageName = "csv-stringify";
       version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz";
+        url = "http://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz";
         sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b";
       };
     };
@@ -8429,13 +8393,13 @@ let
         sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
       };
     };
-    "cvss-1.0.3" = {
+    "cvss-1.0.4" = {
       name = "cvss";
       packageName = "cvss";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cvss/-/cvss-1.0.3.tgz";
-        sha512 = "1FfNhEFVfeC+fgZpEr6oCOOTXifJicZS+Lq/mmUKI4Om+2O8zYspc/uhw51He+CTM5givI1dqIw5JUqyi1BWtA==";
+        url = "https://registry.npmjs.org/cvss/-/cvss-1.0.4.tgz";
+        sha512 = "NvyksySgKXK/98Cdc0IqP7UU/LKFy0O//hoCSQdahcP5w1oSZvOhAeb7PmTmIAkELfyoWGX1jeQKqYCBWy4RyQ==";
       };
     };
     "cycle-1.0.3" = {
@@ -8600,13 +8564,13 @@ let
         sha512 = "oK6R74WV8TdhGR9VCLym7D/vlN8lXND5AyhJhrjtm1WNDrg/6Clx1Tk7k3Dt8quy2AmmGO7vbIk7iwFtzTAJfA==";
       };
     };
-    "dat-node-3.5.12" = {
+    "dat-node-3.5.13" = {
       name = "dat-node";
       packageName = "dat-node";
-      version = "3.5.12";
+      version = "3.5.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.12.tgz";
-        sha512 = "XYxdkeNYk8gM6nb125XrOQKAXLZlICLYZUk7bZAktpQUrSjAQnc9qPY2a/KCvHSbdoJf//PwyB00K0UiBTqawQ==";
+        url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.13.tgz";
+        sha512 = "ArpqeRgc/c/zsCs2Z6ZvK8Xm6EhzAo64UflspEffV2XqO7SoCKzj+qdkdfoYWGRvvp2IoOO0KaZ7PvFy0jdipg==";
       };
     };
     "dat-registry-4.0.0" = {
@@ -8627,13 +8591,13 @@ let
         sha512 = "BUhemnKpXUhKNl/1DuUwfFUyjzomlNF940uHPsOa3okmYu9z6mrp/EGQsLO3lO0YQomDUqS0G0DmHTse9vTU1A==";
       };
     };
-    "dat-storage-1.0.4" = {
+    "dat-storage-1.1.1" = {
       name = "dat-storage";
       packageName = "dat-storage";
-      version = "1.0.4";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz";
-        sha512 = "THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg==";
+        url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.1.1.tgz";
+        sha512 = "PjKjUatJN4ztBDI5nR94VuofyrVKOm6W3/DgqFO6U4ixdX351Jkuj+GiGScEmMOqn8vJgTmlUPTxJaBf38Fmkw==";
       };
     };
     "dat-swarm-defaults-1.0.1" = {
@@ -8731,7 +8695,7 @@ let
       packageName = "debug";
       version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
         sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
       };
     };
@@ -8740,7 +8704,7 @@ let
       packageName = "debug";
       version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
         sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f";
       };
     };
@@ -8749,7 +8713,7 @@ let
       packageName = "debug";
       version = "0.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
         sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
       };
     };
@@ -8767,7 +8731,7 @@ let
       packageName = "debug";
       version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
         sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
       };
     };
@@ -8776,7 +8740,7 @@ let
       packageName = "debug";
       version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
         sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
       };
     };
@@ -8785,7 +8749,7 @@ let
       packageName = "debug";
       version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        url = "http://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
         sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
@@ -8807,6 +8771,24 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
+    "debug-3.2.5" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz";
+        sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==";
+      };
+    };
+    "debug-4.0.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-4.0.1.tgz";
+        sha512 = "K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw==";
+      };
+    };
     "debug-fabulous-1.1.0" = {
       name = "debug-fabulous";
       packageName = "debug-fabulous";
@@ -9442,7 +9424,7 @@ let
       packageName = "diffie-hellman";
       version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+        url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
@@ -9554,13 +9536,13 @@ let
         sha512 = "bvjUS5Cylrm1uJJop/dFhEpnYtz2NQFOO0/z6vk0ORtx0AqKvUwPToc4reJk+TnHV9GBxbtZXj7ad5dJT/Dqkg==";
       };
     };
-    "dns-discovery-6.1.0" = {
+    "dns-discovery-6.2.2" = {
       name = "dns-discovery";
       packageName = "dns-discovery";
-      version = "6.1.0";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.1.0.tgz";
-        sha512 = "Kl2tL2zuNR1w6SnsoRaqrOFm7gGP3/i/HzRXtyVBqaOq/5L1D2TUdViUAZ8e/NDbt+jQCJFWoaKCnmDC343usQ==";
+        url = "https://registry.npmjs.org/dns-discovery/-/dns-discovery-6.2.2.tgz";
+        sha512 = "EZQxH4I5ZAQbV8Njlb4JXhgeIKtcXdCzLCLSJIyzEXbzEm6hNsJdX5F6oW+4a02etsaSPBX3iEDFyPg7VB91PQ==";
       };
     };
     "dns-equal-1.0.0" = {
@@ -9595,7 +9577,7 @@ let
       packageName = "dns-packet";
       version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz";
+        url = "http://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz";
         sha512 = "bn1AKpfkFbm0MIioOMHZ5qJzl2uypdBwI4nYNsqvhjsegBhcKJUlCrMPWLx6JEezRjxZmxhtIz/FkBEur2l8Cw==";
       };
     };
@@ -9838,7 +9820,7 @@ let
       packageName = "dotenv";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
+        url = "http://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz";
         sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d";
       };
     };
@@ -9847,7 +9829,7 @@ let
       packageName = "dotenv";
       version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz";
+        url = "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz";
         sha512 = "4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==";
       };
     };
@@ -9910,7 +9892,7 @@ let
       packageName = "duplexer";
       version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
         sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
       };
     };
@@ -9950,6 +9932,15 @@ let
         sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==";
       };
     };
+    "dynamic-dijkstra-1.0.0" = {
+      name = "dynamic-dijkstra";
+      packageName = "dynamic-dijkstra";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dynamic-dijkstra/-/dynamic-dijkstra-1.0.0.tgz";
+        sha512 = "AUbCFABXNoon689xft5ROX/fO9pdttZ6wZcMXZ4oH85Bn9rtiMdVHVBbAZ9kxAewdm5L1m+y+n97s8ofwya8WA==";
+      };
+    };
     "each-async-1.1.1" = {
       name = "each-async";
       packageName = "each-async";
@@ -10527,13 +10518,13 @@ let
         sha512 = "C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==";
       };
     };
-    "es-to-primitive-1.1.1" = {
+    "es-to-primitive-1.2.0" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz";
-        sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
       };
     };
     "es5-ext-0.10.46" = {
@@ -10604,7 +10595,7 @@ let
       packageName = "es6-promise";
       version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
+        url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
         sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
       };
     };
@@ -10613,7 +10604,7 @@ let
       packageName = "es6-promise";
       version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz";
+        url = "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz";
         sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
       };
     };
@@ -10622,17 +10613,17 @@ let
       packageName = "es6-promise";
       version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz";
+        url = "http://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz";
         sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613";
       };
     };
-    "es6-promise-4.2.4" = {
+    "es6-promise-4.2.5" = {
       name = "es6-promise";
       packageName = "es6-promise";
-      version = "4.2.4";
+      version = "4.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz";
-        sha512 = "/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==";
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz";
+        sha512 = "n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==";
       };
     };
     "es6-promisify-5.0.0" = {
@@ -10779,13 +10770,13 @@ let
         sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
       };
     };
-    "eslint-5.5.0" = {
+    "eslint-5.6.1" = {
       name = "eslint";
       packageName = "eslint";
-      version = "5.5.0";
+      version = "5.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
-        sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz";
+        sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -10824,6 +10815,15 @@ let
         sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==";
       };
     };
+    "esm-3.0.84" = {
+      name = "esm";
+      packageName = "esm";
+      version = "3.0.84";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz";
+        sha512 = "SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==";
+      };
+    };
     "espree-3.5.4" = {
       name = "espree";
       packageName = "espree";
@@ -11013,13 +11013,22 @@ let
         sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d";
       };
     };
-    "event-stream-3.3.4" = {
+    "event-stream-3.3.6" = {
       name = "event-stream";
       packageName = "event-stream";
-      version = "3.3.4";
+      version = "3.3.6";
       src = fetchurl {
-        url = "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
-        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.6.tgz";
+        sha512 = "dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==";
+      };
+    };
+    "event-stream-4.0.0" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.0.tgz";
+        sha512 = "DOB0pW11hF+A572U9vmYbQuLVvzXb2ZQhP14wAhMesOLoWVmWNKZ05niYwgUEEO7Ex+lbPpsqT+pch4O7Ijqmg==";
       };
     };
     "event-to-promise-0.8.0" = {
@@ -11081,7 +11090,7 @@ let
       packageName = "events";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz";
+        url = "http://registry.npmjs.org/events/-/events-1.1.1.tgz";
         sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924";
       };
     };
@@ -11184,6 +11193,15 @@ let
         sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da";
       };
     };
+    "execa-1.0.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
+        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+      };
+    };
     "execall-1.0.0" = {
       name = "execall";
       packageName = "execall";
@@ -11306,7 +11324,7 @@ let
       packageName = "express";
       version = "2.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
+        url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
         sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
       };
     };
@@ -11315,7 +11333,7 @@ let
       packageName = "express";
       version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz";
+        url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
         sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
       };
     };
@@ -11324,7 +11342,7 @@ let
       packageName = "express";
       version = "3.21.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
+        url = "http://registry.npmjs.org/express/-/express-3.21.2.tgz";
         sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
       };
     };
@@ -11333,7 +11351,7 @@ let
       packageName = "express";
       version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz";
+        url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
         sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
       };
     };
@@ -11342,7 +11360,7 @@ let
       packageName = "express";
       version = "4.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz";
+        url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz";
         sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
       };
     };
@@ -11351,7 +11369,7 @@ let
       packageName = "express";
       version = "4.16.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz";
+        url = "http://registry.npmjs.org/express/-/express-4.16.3.tgz";
         sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
       };
     };
@@ -11400,13 +11418,13 @@ let
         sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
       };
     };
-    "express-request-proxy-2.2.0" = {
+    "express-request-proxy-2.2.2" = {
       name = "express-request-proxy";
       packageName = "express-request-proxy";
-      version = "2.2.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-request-proxy/-/express-request-proxy-2.2.0.tgz";
-        sha512 = "tObSNa1H5NMltFxg/UAB7tG2PdjkBeQI7fOTUTWyZWHchS7wY9TKqW1RAe3rn/Tq+EwsPTFRYptuLvBK722ipg==";
+        url = "https://registry.npmjs.org/express-request-proxy/-/express-request-proxy-2.2.2.tgz";
+        sha512 = "0Dzn6LQG0ohd2S+zJVMhsntwcDakEzm/uKJSZxH7B66ZBvTsB5LU/HvfO1dHG+RRiKuCg0aWfUa66PljnDjEdw==";
       };
     };
     "express-session-1.11.3" = {
@@ -11769,13 +11787,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "fast-redact-1.1.14" = {
+    "fast-redact-1.2.0" = {
       name = "fast-redact";
       packageName = "fast-redact";
-      version = "1.1.14";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.1.14.tgz";
-        sha512 = "jWvfd9kIZeRdwIRTUmLrxEaNgr3b8VW6uAAz5rcQwFhvA3TOK/LXv0kTJytjBjVIQWLdeK7YzM6zVY0kHGuGVw==";
+        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.2.0.tgz";
+        sha512 = "k/uSk9PtFmvYx0m7bRk5B2gZChQk4euWhrn7Mf3vYSmwZBLh7cGNuMuc/vhH1MKMPyVJMMtl9oMwPnwlKqs7CQ==";
       };
     };
     "fast-safe-stringify-1.2.3" = {
@@ -11814,6 +11832,15 @@ let
         sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38";
       };
     };
+    "fclone-1.0.11" = {
+      name = "fclone";
+      packageName = "fclone";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fclone/-/fclone-1.0.11.tgz";
+        sha1 = "10e85da38bfea7fc599341c296ee1d77266ee640";
+      };
+    };
     "fd-read-stream-1.1.0" = {
       name = "fd-read-stream";
       packageName = "fd-read-stream";
@@ -12026,7 +12053,7 @@ let
       packageName = "finalhandler";
       version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
+        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
         sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
       };
     };
@@ -12035,7 +12062,7 @@ let
       packageName = "finalhandler";
       version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
+        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
         sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
       };
     };
@@ -12044,7 +12071,7 @@ let
       packageName = "finalhandler";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
+        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz";
         sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd";
       };
     };
@@ -12071,7 +12098,7 @@ let
       packageName = "finalhandler";
       version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
+        url = "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
         sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
       };
     };
@@ -12273,6 +12300,15 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
+    "flatmap-stream-0.1.0" = {
+      name = "flatmap-stream";
+      packageName = "flatmap-stream";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz";
+        sha512 = "Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==";
+      };
+    };
     "flatstr-1.0.8" = {
       name = "flatstr";
       packageName = "flatstr";
@@ -12336,22 +12372,22 @@ let
         sha1 = "ae049a714386bb83e342657a82924b70364a90d6";
       };
     };
-    "flumedb-0.4.9" = {
+    "flumedb-0.5.1" = {
       name = "flumedb";
       packageName = "flumedb";
-      version = "0.4.9";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz";
-        sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw==";
+        url = "https://registry.npmjs.org/flumedb/-/flumedb-0.5.1.tgz";
+        sha512 = "WB/q5YYEvVB2ozp7xhp3ur5NfX03HZywx6EEV6AlKjd1PodZdHVspz3NpakV++mVB89CRoH2nq+WdY33ntbfQw==";
       };
     };
-    "flumelog-offset-3.3.1" = {
+    "flumelog-offset-3.3.2" = {
       name = "flumelog-offset";
       packageName = "flumelog-offset";
-      version = "3.3.1";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz";
-        sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA==";
+        url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.2.tgz";
+        sha512 = "KG0TCb+cWuEvnL44xjBhVNu+jRmJ8Msh2b1krYb4FllLwSbjreaCU/hH3uzv+HmUrtU/EhJepcAu79WxLH3EZQ==";
       };
     };
     "flumeview-hashtable-1.0.4" = {
@@ -12363,13 +12399,13 @@ let
         sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw==";
       };
     };
-    "flumeview-level-3.0.5" = {
+    "flumeview-level-3.0.6" = {
       name = "flumeview-level";
       packageName = "flumeview-level";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz";
-        sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA==";
+        url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.6.tgz";
+        sha512 = "omfYDMixWGL8Xx/mFl7xoALZvvOePiN/7jzY/kUJz3TR4px55QV4tZMba63QPyKj7NZVAPE61wq//P5sdiqvQw==";
       };
     };
     "flumeview-query-6.3.0" = {
@@ -12381,14 +12417,13 @@ let
         sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw==";
       };
     };
-    "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = {
+    "flumeview-query-7.0.0" = {
       name = "flumeview-query";
       packageName = "flumeview-query";
-      version = "6.2.0";
-      src = fetchgit {
-        url = "git://github.com/mmckegg/flumeview-query";
-        rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733";
-        sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.0.0.tgz";
+        sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA==";
       };
     };
     "flumeview-reduce-1.3.13" = {
@@ -12414,17 +12449,17 @@ let
       packageName = "follow-redirects";
       version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
+        url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "follow-redirects-1.5.7" = {
+    "follow-redirects-1.5.8" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.5.7";
+      version = "1.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.7.tgz";
-        sha512 = "NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz";
+        sha512 = "sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==";
       };
     };
     "for-each-0.3.3" = {
@@ -13201,6 +13236,15 @@ let
         sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
+    "get-stream-4.0.0" = {
+      name = "get-stream";
+      packageName = "get-stream";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.0.0.tgz";
+        sha512 = "FneLKMENeOR7wOK0/ZXCh+lwqtnPwkeunJjRN28LPqzGvNAhYvrTAhXv6xDm4vsJ0M7lcRbIYHQudKsSy2RtSQ==";
+      };
+    };
     "get-uri-2.0.2" = {
       name = "get-uri";
       packageName = "get-uri";
@@ -13426,15 +13470,6 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
-    "glob-7.1.1" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
-        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
-      };
-    };
     "glob-7.1.2" = {
       name = "glob";
       packageName = "glob";
@@ -13607,13 +13642,13 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "global-tunnel-ng-2.5.4" = {
+    "global-tunnel-ng-2.6.0" = {
       name = "global-tunnel-ng";
       packageName = "global-tunnel-ng";
-      version = "2.5.4";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.5.4.tgz";
-        sha1 = "5ef9d5ff2f2a6bed1b305abd463837d47e85b5f4";
+        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.6.0.tgz";
+        sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA==";
       };
     };
     "globals-11.7.0" = {
@@ -13697,15 +13732,6 @@ let
         sha1 = "d9430ba32f6a30218243884418767340aafc0400";
       };
     };
-    "got-3.3.1" = {
-      name = "got";
-      packageName = "got";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz";
-        sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
-      };
-    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -13823,13 +13849,13 @@ let
         sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
       };
     };
-    "graphql-anywhere-4.1.18" = {
+    "graphql-anywhere-4.1.19" = {
       name = "graphql-anywhere";
       packageName = "graphql-anywhere";
-      version = "4.1.18";
+      version = "4.1.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.18.tgz";
-        sha512 = "n0jsAEpGpQxsF0RDaxSjtEQdIP3tx2C3q++QuHYFyUl+4Npl5t64zFjWwO3ZhotxmTgs8zaSbZPVFpydn6k0dQ==";
+        url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.19.tgz";
+        sha512 = "mQlvbECzYPBcgBC9JsdM4v+DSvNmcIP+8Vwr+ij3gktbaLSE0Iza30mztuz40Jlf7ooMs+0emBZucNjLzqz7tA==";
       };
     };
     "graphql-cli-prepare-1.4.19" = {
@@ -13855,7 +13881,7 @@ let
       packageName = "graphql-config";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.0.tgz";
+        url = "http://registry.npmjs.org/graphql-config/-/graphql-config-2.0.0.tgz";
         sha512 = "//hZmROEk79zzPlH6SVTQeXd8NVV65rquz1zxZeO6oEuX5KNnii8+oznLu7d897EfJ+NShTZtsY9FMmxxkWmJw==";
       };
     };
@@ -13864,7 +13890,7 @@ let
       packageName = "graphql-config";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-config/-/graphql-config-2.0.1.tgz";
+        url = "http://registry.npmjs.org/graphql-config/-/graphql-config-2.0.1.tgz";
         sha512 = "eb4FzlODifHE/Q+91QptAmkGw39wL5ToinJ2556UUsGt2drPc4tzifL+HSnHSaxiIbH8EUhc/Fa6+neinF04qA==";
       };
     };
@@ -13873,7 +13899,7 @@ let
       packageName = "graphql-config-extension-graphcool";
       version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-config-extension-graphcool/-/graphql-config-extension-graphcool-1.0.8.tgz";
+        url = "http://registry.npmjs.org/graphql-config-extension-graphcool/-/graphql-config-extension-graphcool-1.0.8.tgz";
         sha512 = "eMvL/RAo88EHo8SmP40Zcsrx7nrLTE82G4ZochsHYoEvP+QMo0XA+Vq9lxYeRTJEtGMFD4imjHXGHWh4B0srQw==";
       };
     };
@@ -13886,22 +13912,22 @@ let
         sha512 = "Do6tHyQyxaPhaZdJ+ZCpYbVhczlqNqMVuO46aG/YkMuRQPoj/FRmeH9BFXniFkz60TZyRpLTQNel2sllMekRLQ==";
       };
     };
-    "graphql-config-extension-prisma-0.0.11" = {
+    "graphql-config-extension-prisma-0.2.1" = {
       name = "graphql-config-extension-prisma";
       packageName = "graphql-config-extension-prisma";
-      version = "0.0.11";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.0.11.tgz";
-        sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw==";
+        url = "https://registry.npmjs.org/graphql-config-extension-prisma/-/graphql-config-extension-prisma-0.2.1.tgz";
+        sha512 = "OIqa5hjX3bqHR5x2uPE5ssdaI6DEr/P/+utAaqdM6ZEAi8vgupye4AT5AOyDzwK5iDmbJAkShgwQlHiAm4Srvg==";
       };
     };
-    "graphql-extensions-0.1.3" = {
+    "graphql-extensions-0.2.1" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.1.3";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz";
-        sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.2.1.tgz";
+        sha512 = "/1FTPSWSffDjlRyMAV2UwQhojLmca9aQD0ieo1IYiqT5SE+uOWi4r83QF1CoER0sREIsH3s+nTmdH3cvQVG3MA==";
       };
     };
     "graphql-import-0.4.5" = {
@@ -13909,7 +13935,7 @@ let
       packageName = "graphql-import";
       version = "0.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz";
+        url = "http://registry.npmjs.org/graphql-import/-/graphql-import-0.4.5.tgz";
         sha512 = "G/+I08Qp6/QGTb9qapknCm3yPHV0ZL7wbaalWFpxsfR8ZhZoTBe//LsbsCKlbALQpcMegchpJhpTSKiJjhaVqQ==";
       };
     };
@@ -13963,10 +13989,19 @@ let
       packageName = "graphql-subscriptions";
       version = "0.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz";
+        url = "http://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz";
         sha512 = "0CaZnXKBw2pwnIbvmVckby5Ge5e2ecmjofhYCdyeACbCly2j3WXDP/pl+s+Dqd2GQFC7y99NB+53jrt55CKxYQ==";
       };
     };
+    "graphql-subscriptions-1.0.0" = {
+      name = "graphql-subscriptions";
+      packageName = "graphql-subscriptions";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.0.0.tgz";
+        sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ==";
+      };
+    };
     "graphql-tag-2.9.2" = {
       name = "graphql-tag";
       packageName = "graphql-tag";
@@ -14075,13 +14110,13 @@ let
         sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg==";
       };
     };
-    "gulp-less-3.5.0" = {
+    "gulp-less-4.0.1" = {
       name = "gulp-less";
       packageName = "gulp-less";
-      version = "3.5.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz";
-        sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw==";
+        url = "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz";
+        sha512 = "hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA==";
       };
     };
     "gulp-sourcemaps-2.6.4" = {
@@ -14093,13 +14128,13 @@ let
         sha1 = "cbb2008450b1bcce6cd23bf98337be751bf6e30a";
       };
     };
-    "gulp-typescript-4.0.2" = {
+    "gulp-typescript-5.0.0-alpha.3" = {
       name = "gulp-typescript";
       packageName = "gulp-typescript";
-      version = "4.0.2";
+      version = "5.0.0-alpha.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz";
-        sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA==";
+        url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.0-alpha.3.tgz";
+        sha512 = "6iSBjqBXAUqRsLUh/9XtlOnSzpPMbLrr5rqGj4UPLtGpDwFHW/fVTuRgv6LAWiKesLIUDDM0ourxvcpu2trecQ==";
       };
     };
     "gulp-uglify-3.0.1" = {
@@ -14134,17 +14169,17 @@ let
       packageName = "handlebars";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
+        url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
         sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
       };
     };
-    "handlebars-4.0.11" = {
+    "handlebars-4.0.12" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.0.11";
+      version = "4.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz";
-        sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz";
+        sha512 = "RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==";
       };
     };
     "har-schema-1.0.5" = {
@@ -14539,7 +14574,7 @@ let
       packageName = "he";
       version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz";
+        url = "http://registry.npmjs.org/he/-/he-0.5.0.tgz";
         sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2";
       };
     };
@@ -14552,6 +14587,15 @@ let
         sha1 = "93410fd21b009735151f8868c2f271f3427e23fd";
       };
     };
+    "he-1.2.0" = {
+      name = "he";
+      packageName = "he";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz";
+        sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
+      };
+    };
     "header-case-1.0.1" = {
       name = "header-case";
       packageName = "header-case";
@@ -14809,7 +14853,7 @@ let
       packageName = "http-errors";
       version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
+        url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
@@ -14827,17 +14871,17 @@ let
       packageName = "http-errors";
       version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
+        url = "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
         sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
       };
     };
-    "http-errors-1.7.0" = {
+    "http-errors-1.7.1" = {
       name = "http-errors";
       packageName = "http-errors";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.0.tgz";
-        sha512 = "hz3BtSHB7Z6dNWzYc+gUbWqG4dIpJedwwOhe1cvGUq5tGmcTTIRkPiAbyh/JlZx+ksSJyGJlgcHo5jGahiXnKw==";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.1.tgz";
+        sha512 = "jWEUgtZWGSMba9I1N3gc1HmvpBUaNC9vDdA46yScAdp+C5rdEuKWUBLWTQpW9FwSWSbYYs++b6SDCxf9UEJzfw==";
       };
     };
     "http-headers-3.0.2" = {
@@ -15029,13 +15073,13 @@ let
         sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-6.18.2" = {
+    "hypercore-6.19.1" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.18.2";
+      version = "6.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.18.2.tgz";
-        sha512 = "aPnBx3nyrZGia0D17/+GrGBWCRhM/+0HABRNugva1Z+Cr1LSRlwMeYM/V1goFWity48thoYae5AAJ+WduknZLw==";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.1.tgz";
+        sha512 = "CnpaH6+qlt0w1ynt3y+q9alZh23lK0nD7bbuG0vNtQzFefmTYoLexq/Vpss8CYjoQfh6qeG90g2F8GjCl8/Eag==";
       };
     };
     "hypercore-crypto-1.0.0" = {
@@ -15047,13 +15091,13 @@ let
         sha512 = "xFwOnNlOt8L+SovC7dTNchKaNYJb5l8rKZZwpWQnCme1r7CU4Hlhp1RDqPES6b0OpS7DkTo9iU0GltQGkpsjMw==";
       };
     };
-    "hypercore-protocol-6.6.4" = {
+    "hypercore-protocol-6.7.1" = {
       name = "hypercore-protocol";
       packageName = "hypercore-protocol";
-      version = "6.6.4";
+      version = "6.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.6.4.tgz";
-        sha512 = "9TU7P+uve0e5v1ZiBx70DFhkpepW4iNSGYlZthK+Unm0EbZ+Yppc6clH7JTffPBNUMSnDrE552MfXMilpCHZMw==";
+        url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.7.1.tgz";
+        sha512 = "6jjMwL/XgeAl9BDUWmAJmIum7ynHGqajCnXt5VbJuxNLKkPI8WQS2kpMfcvotI5QHKMu/15+92ZPM6WoYDtd8g==";
       };
     };
     "hyperdrive-9.14.0" = {
@@ -15115,7 +15159,7 @@ let
       packageName = "iconv-lite";
       version = "0.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
         sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
@@ -15124,7 +15168,7 @@ let
       packageName = "iconv-lite";
       version = "0.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
         sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
       };
     };
@@ -15133,7 +15177,7 @@ let
       packageName = "iconv-lite";
       version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz";
         sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
@@ -15169,7 +15213,7 @@ let
       packageName = "iconv-lite";
       version = "0.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+        url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
@@ -15281,6 +15325,15 @@ let
         sha512 = "5s6NiCGbtWc+OQA60jrre54w12U7tynIyUNjO5LJjNA5lWwvCv6640roq8Wk/wIuaqnd4Pgtp453OyJ7hbONkQ==";
       };
     };
+    "immutable-tuple-0.4.8" = {
+      name = "immutable-tuple";
+      packageName = "immutable-tuple";
+      version = "0.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/immutable-tuple/-/immutable-tuple-0.4.8.tgz";
+        sha512 = "1m29EVSrF+LJJAyVo1v12NsIalVKjyi4HNQVQDBx+LNCIuRXnfeMCHuLao5CyN1m3Sn0T63U5JEkmPArPCipQA==";
+      };
+    };
     "import-global-0.1.0" = {
       name = "import-global";
       packageName = "import-global";
@@ -15371,15 +15424,6 @@ let
         sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50";
       };
     };
-    "infinity-agent-2.0.3" = {
-      name = "infinity-agent";
-      packageName = "infinity-agent";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz";
-        sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
-      };
-    };
     "inflected-2.0.4" = {
       name = "inflected";
       packageName = "inflected";
@@ -15493,7 +15537,7 @@ let
       packageName = "inquirer";
       version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.10.1.tgz";
         sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a";
       };
     };
@@ -15502,7 +15546,7 @@ let
       packageName = "inquirer";
       version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
         sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
       };
     };
@@ -15511,7 +15555,7 @@ let
       packageName = "inquirer";
       version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz";
         sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df";
       };
     };
@@ -15520,7 +15564,7 @@ let
       packageName = "inquirer";
       version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz";
         sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918";
       };
     };
@@ -15547,7 +15591,7 @@ let
       packageName = "inquirer";
       version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz";
+        url = "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz";
         sha512 = "E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==";
       };
     };
@@ -15898,7 +15942,7 @@ let
       packageName = "is-builtin-module";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
+        url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
         sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
       };
     };
@@ -15911,13 +15955,13 @@ let
         sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
       };
     };
-    "is-ci-1.2.0" = {
+    "is-ci-1.2.1" = {
       name = "is-ci";
       packageName = "is-ci";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.0.tgz";
-        sha512 = "plgvKjQtalH2P3Gytb7L61Lmz95g2DlpzFiQyRSFew8WoJKxtKRzrZMeyRN2supblm3Psc8OQGy7Xjb6XG11jw==";
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz";
+        sha512 = "s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==";
       };
     };
     "is-data-descriptor-0.1.4" = {
@@ -16109,6 +16153,15 @@ let
         sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5";
       };
     };
+    "is-git-url-1.0.0" = {
+      name = "is-git-url";
+      packageName = "is-git-url";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-git-url/-/is-git-url-1.0.0.tgz";
+        sha1 = "53f684cd143285b52c3244b4e6f28253527af66b";
+      };
+    };
     "is-glob-2.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
@@ -16267,7 +16320,7 @@ let
       packageName = "is-obj";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
+        url = "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz";
         sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     };
@@ -16505,13 +16558,13 @@ let
         sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ==";
       };
     };
-    "is-symbol-1.0.1" = {
+    "is-symbol-1.0.2" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz";
-        sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
+        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
       };
     };
     "is-text-path-1.0.1" = {
@@ -16586,13 +16639,13 @@ let
         sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
-    "is-valid-domain-0.0.5" = {
+    "is-valid-domain-0.0.6" = {
       name = "is-valid-domain";
       packageName = "is-valid-domain";
-      version = "0.0.5";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz";
-        sha1 = "48e70319fcb43009236e96b37f9843889ce7b513";
+        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.6.tgz";
+        sha512 = "XXiNRcLcNKeb0LB3PzB39gJa8QiA+6nnc4NX9zNvFQcaITWU+64hfVqaVppbSd3tSVlJttW6sINkX3xLKPax7A==";
       };
     };
     "is-valid-glob-1.0.0" = {
@@ -16991,15 +17044,6 @@ let
         sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
       };
     };
-    "js-yaml-3.10.0" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz";
-        sha512 = "O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==";
-      };
-    };
     "js-yaml-3.12.0" = {
       name = "js-yaml";
       packageName = "js-yaml";
@@ -17077,7 +17121,7 @@ let
       packageName = "json-buffer";
       version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz";
+        url = "http://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz";
         sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f";
       };
     };
@@ -17266,7 +17310,7 @@ let
       packageName = "json5";
       version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        url = "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
         sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
@@ -17275,7 +17319,7 @@ let
       packageName = "json5";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
+        url = "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
         sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
       };
     };
@@ -17293,7 +17337,7 @@ let
       packageName = "jsonfile";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+        url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
         sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
       };
     };
@@ -17302,7 +17346,7 @@ let
       packageName = "jsonfile";
       version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
+        url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
         sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8";
       };
     };
@@ -17401,7 +17445,7 @@ let
       packageName = "jsonwebtoken";
       version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz";
+        url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz";
         sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw==";
       };
     };
@@ -17703,13 +17747,13 @@ let
         sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
       };
     };
-    "keygrip-1.0.2" = {
+    "keygrip-1.0.3" = {
       name = "keygrip";
       packageName = "keygrip";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz";
-        sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz";
+        sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==";
       };
     };
     "keypress-0.1.0" = {
@@ -17811,15 +17855,6 @@ let
         sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6";
       };
     };
-    "klaw-3.0.0" = {
-      name = "klaw";
-      packageName = "klaw";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz";
-        sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
-      };
-    };
     "klaw-sync-4.0.0" = {
       name = "klaw-sync";
       packageName = "klaw-sync";
@@ -17829,13 +17864,13 @@ let
         sha512 = "go/5tXbgLkgwxQ2c2ewaMen6TpQtI9fTzzmTdlSGK8XxKcFSsJvn/Sgn75Vg+mOJwkKVPrqLw2Xq7x/zP1v7PQ==";
       };
     };
-    "knockout-3.5.0-rc" = {
+    "knockout-3.5.0-rc2" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.5.0-rc";
+      version = "3.5.0-rc2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz";
-        sha512 = "eROh551BD9dDQ2ItCF60IPcZZXP46WiEcFCU6pVlekeQ6mv3L+in4u8BIIUDp1h0OtL7IXLwvwEY8HkG/BPtrQ==";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc2.tgz";
+        sha512 = "ncKkcfOX5hV6QyvNLMLe+s9uYbP+jRKljj01Fcg/BPk3PvfcdZF3dV52qkfpR0IC0iRh0AAP7NXFJEt0ofy14g==";
       };
     };
     "kuduscript-1.0.16" = {
@@ -17883,15 +17918,6 @@ let
         sha1 = "c1bfd0cbcb46790ec9156b8d1aee8fcb86cda22a";
       };
     };
-    "latest-version-1.0.1" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
-        sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
-      };
-    };
     "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -17910,6 +17936,15 @@ let
         sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==";
       };
     };
+    "layered-graph-1.1.0" = {
+      name = "layered-graph";
+      packageName = "layered-graph";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.0.tgz";
+        sha512 = "PSQEdXbmwffcwZ0i7HNfJI/cGnUqVTyt2caanHH/ixxzBqapONxAWYlnj13r3Q79V5ALiCtGrkRnaUo3zwKfzA==";
+      };
+    };
     "lazy-1.0.11" = {
       name = "lazy";
       packageName = "lazy";
@@ -18000,6 +18035,15 @@ let
         sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==";
       };
     };
+    "less-3.8.1" = {
+      name = "less";
+      packageName = "less";
+      version = "3.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/less/-/less-3.8.1.tgz";
+        sha512 = "8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==";
+      };
+    };
     "less-middleware-2.2.1" = {
       name = "less-middleware";
       packageName = "less-middleware";
@@ -18198,6 +18242,24 @@ let
         sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
+    "libnested-1.3.2" = {
+      name = "libnested";
+      packageName = "libnested";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnested/-/libnested-1.3.2.tgz";
+        sha512 = "YvMQglpk/DyB8vFL5usJe6IZTqOU/fRopoUpoOt9TavYh5CaGdTp6zYqrA7DW8tHmZAr8fj+pDXbHBwlVrcVXQ==";
+      };
+    };
+    "libnpmaccess-3.0.0" = {
+      name = "libnpmaccess";
+      packageName = "libnpmaccess";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-3.0.0.tgz";
+        sha512 = "SiE4AZAzMpD7pmmXHfgD7rof8QIQGoKaeyAS8exgx2CKA6tzRTbRljq1xM4Tgj8/tIg+KBJPJWkR0ifqKT3irQ==";
+      };
+    };
     "libqp-1.1.0" = {
       name = "libqp";
       packageName = "libqp";
@@ -18311,7 +18373,7 @@ let
       packageName = "load-json-file";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
+        url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
         sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
       };
     };
@@ -18320,7 +18382,7 @@ let
       packageName = "load-json-file";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        url = "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
         sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
       };
     };
@@ -18333,13 +18395,13 @@ let
         sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
       };
     };
-    "loader-runner-2.3.0" = {
+    "loader-runner-2.3.1" = {
       name = "loader-runner";
       packageName = "loader-runner";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz";
-        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz";
+        sha512 = "By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==";
       };
     };
     "loader-utils-1.1.0" = {
@@ -18387,13 +18449,13 @@ let
         sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced";
       };
     };
-    "locutus-2.0.9" = {
+    "locutus-2.0.10" = {
       name = "locutus";
       packageName = "locutus";
-      version = "2.0.9";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/locutus/-/locutus-2.0.9.tgz";
-        sha1 = "e265af1e85fd19173e74386373888560783a02fc";
+        url = "https://registry.npmjs.org/locutus/-/locutus-2.0.10.tgz";
+        sha512 = "AZg2kCqrquMJ5FehDsBidV0qHl98NrsYtseUClzjAQ3HFnsDBJTCwGVplSQ82t9/QfgahqvTjaKcZqZkHmS0wQ==";
       };
     };
     "lodash-1.0.2" = {
@@ -18459,6 +18521,15 @@ let
         sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
       };
     };
+    "lodash-4.17.11" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz";
+        sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
+      };
+    };
     "lodash-4.17.5" = {
       name = "lodash";
       packageName = "lodash";
@@ -18846,6 +18917,15 @@ let
         sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
       };
     };
+    "lodash.camelcase-4.3.0" = {
+      name = "lodash.camelcase";
+      packageName = "lodash.camelcase";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+        sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+      };
+    };
     "lodash.clone-4.3.2" = {
       name = "lodash.clone";
       packageName = "lodash.clone";
@@ -19143,6 +19223,15 @@ let
         sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
       };
     };
+    "lodash.kebabcase-4.1.1" = {
+      name = "lodash.kebabcase";
+      packageName = "lodash.kebabcase";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz";
+        sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36";
+      };
+    };
     "lodash.keys-2.4.1" = {
       name = "lodash.keys";
       packageName = "lodash.keys";
@@ -19215,6 +19304,15 @@ let
         sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a";
       };
     };
+    "lodash.omit-4.5.0" = {
+      name = "lodash.omit";
+      packageName = "lodash.omit";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz";
+        sha1 = "6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60";
+      };
+    };
     "lodash.once-4.1.1" = {
       name = "lodash.once";
       packageName = "lodash.once";
@@ -19305,6 +19403,15 @@ let
         sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23";
       };
     };
+    "lodash.snakecase-4.1.1" = {
+      name = "lodash.snakecase";
+      packageName = "lodash.snakecase";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz";
+        sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d";
+      };
+    };
     "lodash.some-4.6.0" = {
       name = "lodash.some";
       packageName = "lodash.some";
@@ -19323,6 +19430,15 @@ let
         sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
       };
     };
+    "lodash.startcase-4.4.0" = {
+      name = "lodash.startcase";
+      packageName = "lodash.startcase";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz";
+        sha1 = "9436e34ed26093ed7ffae1936144350915d9add8";
+      };
+    };
     "lodash.support-2.4.1" = {
       name = "lodash.support";
       packageName = "lodash.support";
@@ -19386,6 +19502,15 @@ let
         sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561";
       };
     };
+    "lodash.topairs-4.3.0" = {
+      name = "lodash.topairs";
+      packageName = "lodash.topairs";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz";
+        sha1 = "3b6deaa37d60fb116713c46c5f17ea190ec48d64";
+      };
+    };
     "lodash.union-4.6.0" = {
       name = "lodash.union";
       packageName = "lodash.union";
@@ -19413,6 +19538,15 @@ let
         sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21";
       };
     };
+    "lodash.upperfirst-4.3.1" = {
+      name = "lodash.upperfirst";
+      packageName = "lodash.upperfirst";
+      version = "4.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz";
+        sha1 = "1365edf431480481ef0d1c68957a5ed99d49f7ce";
+      };
+    };
     "log-symbols-1.0.2" = {
       name = "log-symbols";
       packageName = "log-symbols";
@@ -19485,15 +19619,6 @@ let
         sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f";
       };
     };
-    "long-3.2.0" = {
-      name = "long";
-      packageName = "long";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/long/-/long-3.2.0.tgz";
-        sha1 = "d821b7138ca1cb581c172990ef14db200b5c474b";
-      };
-    };
     "long-4.0.0" = {
       name = "long";
       packageName = "long";
@@ -19769,7 +19894,7 @@ let
       packageName = "lunr";
       version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
+        url = "http://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
         sha1 = "79a30e932e216cba163541ee37a3607c12cd7281";
       };
     };
@@ -19890,13 +20015,13 @@ let
         sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
       };
     };
-    "mamacro-0.0.3" = {
-      name = "mamacro";
-      packageName = "mamacro";
-      version = "0.0.3";
+    "map-age-cleaner-0.1.2" = {
+      name = "map-age-cleaner";
+      packageName = "map-age-cleaner";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
-        sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
+        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz";
+        sha512 = "UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==";
       };
     };
     "map-cache-0.2.2" = {
@@ -19913,17 +20038,17 @@ let
       packageName = "map-filter-reduce";
       version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz";
+        url = "http://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz";
         sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2";
       };
     };
-    "map-filter-reduce-3.1.0" = {
+    "map-filter-reduce-3.2.1" = {
       name = "map-filter-reduce";
       packageName = "map-filter-reduce";
-      version = "3.1.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz";
-        sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w==";
+        url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.2.1.tgz";
+        sha512 = "0+0C/3IVCX8PLXRyBL0umF/YMy3/ch7Zgxu91ZUIXS6YHyv4UVMZlkclUk9rQI63FQ+uvBdHYzo8VPJbIxKTVw==";
       };
     };
     "map-merge-1.1.0" = {
@@ -19931,7 +20056,7 @@ let
       packageName = "map-merge";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz";
+        url = "http://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz";
         sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34";
       };
     };
@@ -19953,12 +20078,21 @@ let
         sha1 = "a65cd29087a92598b8791257a523e021222ac1f9";
       };
     };
+    "map-stream-0.0.7" = {
+      name = "map-stream";
+      packageName = "map-stream";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz";
+        sha1 = "8a1f07896d82b10926bd3744a2420009f88974a8";
+      };
+    };
     "map-stream-0.1.0" = {
       name = "map-stream";
       packageName = "map-stream";
       version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+        url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
         sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
       };
     };
@@ -20030,7 +20164,7 @@ let
       packageName = "marked";
       version = "0.3.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz";
+        url = "http://registry.npmjs.org/marked/-/marked-0.3.19.tgz";
         sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==";
       };
     };
@@ -20088,15 +20222,6 @@ let
         sha512 = "FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==";
       };
     };
-    "mdn-data-1.2.0" = {
-      name = "mdn-data";
-      packageName = "mdn-data";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.2.0.tgz";
-        sha512 = "esDqNvsJB2q5V28+u7NdtdMg6Rmg4khQmAVSjUiX7BY/7haIv0K2yWM43hYp0or+3nvG7+UaTF1JHz31hgU1TA==";
-      };
-    };
     "mdns-js-0.5.0" = {
       name = "mdns-js";
       packageName = "mdns-js";
@@ -20178,6 +20303,15 @@ let
         sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ==";
       };
     };
+    "mem-4.0.0" = {
+      name = "mem";
+      packageName = "mem";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz";
+        sha512 = "WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==";
+      };
+    };
     "mem-fs-1.1.3" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -20286,6 +20420,15 @@ let
         sha512 = "xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==";
       };
     };
+    "meow-5.0.0" = {
+      name = "meow";
+      packageName = "meow";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz";
+        sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==";
+      };
+    };
     "merge-1.2.0" = {
       name = "merge";
       packageName = "merge";
@@ -20682,15 +20825,6 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-0.1.0" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
-        sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
-      };
-    };
     "minimist-0.2.0" = {
       name = "minimist";
       packageName = "minimist";
@@ -20948,7 +21082,7 @@ let
       packageName = "mongodb";
       version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
         sha1 = "269665552066437308d0942036646e6795c3a9a3";
       };
     };
@@ -20997,13 +21131,13 @@ let
         sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
       };
     };
-    "morgan-1.9.0" = {
+    "morgan-1.9.1" = {
       name = "morgan";
       packageName = "morgan";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz";
-        sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051";
+        url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz";
+        sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -21060,13 +21194,13 @@ let
         sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
       };
     };
-    "mqtt-2.18.5" = {
+    "mqtt-2.18.8" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.18.5";
+      version = "2.18.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.5.tgz";
-        sha512 = "VkQeH81VIS0nOL3Ilf58ypPtM3I6VzVsE5as+k/AgrnX7xjcrCSfgSJdYGa6rW3px4DLAnh2gCD3URUZ23riKQ==";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.18.8.tgz";
+        sha512 = "3h6oHlPY/yWwtC2J3geraYRtVVoRM6wdI+uchF4nvSSafXPZnaKqF8xnX+S22SU/FcgEAgockVIlOaAX3fkMpA==";
       };
     };
     "mqtt-packet-5.6.0" = {
@@ -21159,13 +21293,13 @@ let
         sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "ms-rest-2.3.6" = {
+    "ms-rest-2.3.7" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.6.tgz";
-        sha512 = "M+Lx9P7Wy4TeAk7jqPLwGS1QS1gvxF6Xo+OHv5j1g3Kcb44T/GTUuSjxTKarF6aKyeacZH1ZD++Nt7pcql7dDA==";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.7.tgz";
+        sha512 = "zZwuckC/Uv8F1Jr1bW+U1tsDTErWhtH6W4mpxvRrta4YrKwkFeLMt53RsaDOWTqMFsVpjNuCfznV1uxeGUF3/g==";
       };
     };
     "ms-rest-azure-1.15.7" = {
@@ -21177,13 +21311,13 @@ let
         sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
-    "ms-rest-azure-2.5.7" = {
+    "ms-rest-azure-2.5.9" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "2.5.7";
+      version = "2.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.7.tgz";
-        sha512 = "e4lgB0z29Dx4ufu/c+PmEAYY1WXq98GYUBkE+iRx7WsxsN04lrM3B1vj8y+B8rKt7clPUE0niqB9VovVL8zvag==";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.9.tgz";
+        sha512 = "qonobzWLS7Jl6qwgTuA/SfyCtnv7olvCRKrcF8nzXSj68ds4Oj3K64ntzgQajroKa0hKVMcPUFbTk1IYMGvu8w==";
       };
     };
     "msgpack-1.0.2" = {
@@ -21213,6 +21347,15 @@ let
         sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw==";
       };
     };
+    "multer-1.4.0" = {
+      name = "multer";
+      packageName = "multer";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/multer/-/multer-1.4.0.tgz";
+        sha512 = "/JATgsDPdb/D9u8A2dFD8MhZYqgDKrWibpA9etSUt8CVzSHtsA13Y8LH9pR2/crsaYFua9g29UBgZB/g6nmOEg==";
+      };
+    };
     "multi-random-access-2.1.1" = {
       name = "multi-random-access";
       packageName = "multi-random-access";
@@ -21222,13 +21365,13 @@ let
         sha1 = "6462f1b204109ccc644601650110a828443d66e2";
       };
     };
-    "multiblob-1.13.0" = {
+    "multiblob-1.13.1" = {
       name = "multiblob";
       packageName = "multiblob";
-      version = "1.13.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz";
-        sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb";
+        url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.1.tgz";
+        sha512 = "AvU9tbDqf3TxYgF1ldo3nVz4HoKI/ZDJBo/znLc6KCRiqr7dQv5vW3i3xh0JKZdLzgKG9JpUiKtwB8E92gn3ZQ==";
       };
     };
     "multiblob-http-0.4.2" = {
@@ -21245,7 +21388,7 @@ let
       packageName = "multicast-dns";
       version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz";
+        url = "http://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz";
         sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2";
       };
     };
@@ -21258,13 +21401,13 @@ let
         sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
       };
     };
-    "multicast-dns-7.0.1" = {
+    "multicast-dns-7.2.0" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
-      version = "7.0.1";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.0.1.tgz";
-        sha512 = "jx8bO2QZvx5oJXWhiuEb6I8XgufpPXvKFSAoSvurD2nECVhbQQTilY33IfChreWqhqPgzKZbpgsyHapjnRTnlw==";
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz";
+        sha512 = "Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q==";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -21312,13 +21455,13 @@ let
         sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
       };
     };
-    "multiparty-4.1.4" = {
+    "multiparty-4.2.1" = {
       name = "multiparty";
       packageName = "multiparty";
-      version = "4.1.4";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.4.tgz";
-        sha1 = "4c96dcbdc11e3f7917e1615e640b4b5022be64fd";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.2.1.tgz";
+        sha512 = "AvESCnNoQlZiOfP9R4mxN8M9csy2L16EIbWIkt3l4FuGti9kXBS8QVzlfyg4HEnarJhrzZilgNFlZtqmoiAIIA==";
       };
     };
     "multipipe-0.1.2" = {
@@ -21330,13 +21473,13 @@ let
         sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
       };
     };
-    "multiserver-1.13.3" = {
+    "multiserver-1.13.5" = {
       name = "multiserver";
       packageName = "multiserver";
-      version = "1.13.3";
+      version = "1.13.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz";
-        sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg==";
+        url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.5.tgz";
+        sha512 = "1bxts3gFkHKJsGAaWR9D4nFLVH995eiEt38n/jPf1dni/FI0o6PH3hlar3ge/bMs58FX/T+DzrGNXZhEkMVFqA==";
       };
     };
     "multistream-2.1.1" = {
@@ -21375,13 +21518,13 @@ let
         sha1 = "5041049269c96633c866386960b2f4289e75e5b0";
       };
     };
-    "mustache-2.3.1" = {
+    "mustache-2.3.2" = {
       name = "mustache";
       packageName = "mustache";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.1.tgz";
-        sha512 = "20dW38oeiTzauvbxs1YxQbr3gbu/Lfo15J4V0EqbspYnn/GwSeTSDNtESy2nak28BW0k8qp7dnrFhrsejLPUtw==";
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.2.tgz";
+        sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==";
       };
     };
     "mutate.js-0.2.0" = {
@@ -21555,22 +21698,22 @@ let
         sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d";
       };
     };
-    "nanobus-4.3.3" = {
+    "nanobus-4.3.4" = {
       name = "nanobus";
       packageName = "nanobus";
-      version = "4.3.3";
+      version = "4.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.3.tgz";
-        sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw==";
+        url = "https://registry.npmjs.org/nanobus/-/nanobus-4.3.4.tgz";
+        sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ==";
       };
     };
-    "nanoid-1.2.2" = {
+    "nanoid-1.2.4" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.2.2";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz";
-        sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.4.tgz";
+        sha512 = "VbM1HbXvDxZhcONUEJ0olXwg5MgOWS89KPL0PlchtB9NJ2dOTva64RR3fypJuEMQffJ7b1rjcPyR39SsV2W5PA==";
       };
     };
     "nanolru-1.0.0" = {
@@ -21667,13 +21810,13 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "natives-1.1.4" = {
+    "natives-1.1.5" = {
       name = "natives";
       packageName = "natives";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz";
-        sha512 = "Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==";
+        url = "https://registry.npmjs.org/natives/-/natives-1.1.5.tgz";
+        sha512 = "1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A==";
       };
     };
     "natural-compare-1.4.0" = {
@@ -21726,7 +21869,7 @@ let
       packageName = "ncp";
       version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
@@ -21735,7 +21878,7 @@ let
       packageName = "ncp";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz";
+        url = "http://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz";
         sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246";
       };
     };
@@ -21744,7 +21887,7 @@ let
       packageName = "ncp";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+        url = "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
         sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
       };
     };
@@ -21807,7 +21950,7 @@ let
       packageName = "needle";
       version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz";
+        url = "http://registry.npmjs.org/needle/-/needle-0.10.0.tgz";
         sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4";
       };
     };
@@ -21816,17 +21959,17 @@ let
       packageName = "needle";
       version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz";
+        url = "http://registry.npmjs.org/needle/-/needle-0.11.0.tgz";
         sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
       };
     };
-    "needle-2.2.2" = {
+    "needle-2.2.4" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.2";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.2.tgz";
-        sha512 = "mW7W8dKuVYefCpNzE3Z7xUmPI9wSrSL/1qH31YGMxmSOAnjatS3S9Zv3cmiHrhx3Jkp1SrWWBdOFXjfF48Uq3A==";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz";
+        sha512 = "HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==";
       };
     };
     "negotiator-0.3.0" = {
@@ -21875,15 +22018,6 @@ let
         sha512 = "vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==";
       };
     };
-    "nested-error-stacks-1.0.2" = {
-      name = "nested-error-stacks";
-      packageName = "nested-error-stacks";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
-        sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
-      };
-    };
     "net-browserify-alt-1.1.0" = {
       name = "net-browserify-alt";
       packageName = "net-browserify-alt";
@@ -21992,13 +22126,13 @@ let
         sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-abi-2.4.3" = {
+    "node-abi-2.4.4" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.4.3";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz";
-        sha512 = "b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz";
+        sha512 = "DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A==";
       };
     };
     "node-alias-1.0.4" = {
@@ -22181,13 +22315,13 @@ let
         sha512 = "+tqda0bNT8A0PM9G47XqFiUP9gEe1zvB/9f+JJhbLWTEk9TeRB4UeyycubmCbR1/TzJnk2v9yCDogFhDJQWbOw==";
       };
     };
-    "node-red-node-feedparser-0.1.12" = {
+    "node-red-node-feedparser-0.1.14" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.12";
+      version = "0.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.12.tgz";
-        sha512 = "kwo7k7pXhl9wANXqgQTRo1WqxyrpJFelvZ2u9EnKfDA2yKrsZq0ZeYB8BDc/uVIycqh8XEJeX44EnAHkidddvQ==";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.14.tgz";
+        sha512 = "Bb9M5bFrOqoFxBVxfstBM/g+VPaV4EPQptXQBMrlsCd3P40CXcGL0mDylXU+3cekWNd5hLHfqTHvXJdkowHGDw==";
       };
     };
     "node-red-node-rbe-0.2.3" = {
@@ -22226,13 +22360,13 @@ let
         sha1 = "2d6ba8e7eff9bf5b338564f91f7ac5d5cdddc55b";
       };
     };
-    "node-static-0.7.10" = {
+    "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
-      version = "0.7.10";
+      version = "0.7.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz";
-        sha512 = "bd7zO5hvCWzdglgwz9t82T4mYTEUzEG5pXnSqEzitvmEacusbhl8/VwuCbMaYR9g2PNK5191yBtAEQLJEmQh1A==";
+        url = "https://registry.npmjs.org/node-static/-/node-static-0.7.11.tgz";
+        sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==";
       };
     };
     "node-swt-0.1.1" = {
@@ -22433,15 +22567,6 @@ let
         sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
       };
     };
-    "nopt-3.0.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
-        sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
-      };
-    };
     "nopt-3.0.6" = {
       name = "nopt";
       packageName = "nopt";
@@ -23199,13 +23324,13 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "ono-4.0.7" = {
+    "ono-4.0.8" = {
       name = "ono";
       packageName = "ono";
-      version = "4.0.7";
+      version = "4.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz";
-        sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA==";
+        url = "https://registry.npmjs.org/ono/-/ono-4.0.8.tgz";
+        sha512 = "x7IM7JLrarP9WxfjDHTBs6io1D1ixEZnhKqnjMnwz+9waPZSapkGYe7jBAqnMTL+HAMfsN6rSHW3Pi+C/9dyjg==";
       };
     };
     "open-0.0.2" = {
@@ -23235,13 +23360,22 @@ let
         sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg==";
       };
     };
-    "opener-1.4.2" = {
+    "opener-1.4.3" = {
       name = "opener";
       packageName = "opener";
-      version = "1.4.2";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz";
-        sha1 = "b32582080042af8680c389a499175b4c54fff523";
+        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
+        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
+      };
+    };
+    "opener-1.5.1" = {
+      name = "opener";
+      packageName = "opener";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz";
+        sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==";
       };
     };
     "openid-2.0.6" = {
@@ -23285,10 +23419,28 @@ let
       packageName = "opn";
       version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
+        url = "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz";
         sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==";
       };
     };
+    "opn-5.4.0" = {
+      name = "opn";
+      packageName = "opn";
+      version = "5.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz";
+        sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==";
+      };
+    };
+    "optimism-0.6.6" = {
+      name = "optimism";
+      packageName = "optimism";
+      version = "0.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimism/-/optimism-0.6.6.tgz";
+        sha512 = "1Y6LY7pYbXP5y6yeXYfXhxJi9hsxYAZWpt7bBp4seAwfcYtaN7tq9wot/pdrhyI809/K4gDm3BcZcEkmwGevjg==";
+      };
+    };
     "optimist-0.2.8" = {
       name = "optimist";
       packageName = "optimist";
@@ -23460,6 +23612,15 @@ let
         sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg==";
       };
     };
+    "os-locale-3.0.1" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz";
+        sha512 = "7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==";
+      };
+    };
     "os-name-1.0.3" = {
       name = "os-name";
       packageName = "os-name";
@@ -23546,10 +23707,19 @@ let
       packageName = "p-cancelable";
       version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
+        url = "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
         sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
       };
     };
+    "p-defer-1.0.0" = {
+      name = "p-defer";
+      packageName = "p-defer";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
+        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+      };
+    };
     "p-finally-1.0.0" = {
       name = "p-finally";
       packageName = "p-finally";
@@ -23564,7 +23734,7 @@ let
       packageName = "p-is-promise";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
+        url = "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
         sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
       };
     };
@@ -23712,15 +23882,6 @@ let
         sha512 = "tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==";
       };
     };
-    "package-json-1.2.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
-        sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
-      };
-    };
     "package-json-4.0.1" = {
       name = "package-json";
       packageName = "package-json";
@@ -23843,17 +24004,17 @@ let
       packageName = "parse-asn1";
       version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
+        url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
         sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==";
       };
     };
-    "parse-entities-1.1.2" = {
+    "parse-entities-1.2.0" = {
       name = "parse-entities";
       packageName = "parse-entities";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
-        sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg==";
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz";
+        sha512 = "XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g==";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -24306,13 +24467,13 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
-    "path-loader-1.0.8" = {
+    "path-loader-1.0.9" = {
       name = "path-loader";
       packageName = "path-loader";
-      version = "1.0.8";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz";
-        sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w==";
+        url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.9.tgz";
+        sha512 = "pD37gArtr+/72Tst9oJoDB9k7gB9A09Efj7yyBi5HDUqaxqULXBWW8Rnw2TfNF+3sN7QZv0ZNdW1Qx2pFGW5Jg==";
       };
     };
     "path-parse-1.0.6" = {
@@ -24446,17 +24607,17 @@ let
       packageName = "pause-stream";
       version = "0.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+        url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
         sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
       };
     };
-    "pbkdf2-3.0.16" = {
+    "pbkdf2-3.0.17" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.16";
+      version = "3.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz";
-        sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
+        sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
       };
     };
     "peer-wire-protocol-0.7.1" = {
@@ -24491,7 +24652,7 @@ let
       packageName = "pegjs";
       version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz";
+        url = "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz";
         sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd";
       };
     };
@@ -24780,7 +24941,7 @@ let
       packageName = "po2json";
       version = "0.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz";
+        url = "http://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz";
         sha1 = "47bb2952da32d58a1be2f256a598eebc0b745118";
       };
     };
@@ -25000,22 +25161,22 @@ let
         sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
       };
     };
-    "prisma-json-schema-0.0.4" = {
+    "prisma-json-schema-0.1.1" = {
       name = "prisma-json-schema";
       packageName = "prisma-json-schema";
-      version = "0.0.4";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.0.4.tgz";
-        sha512 = "NTbourUhkmhM18rrcnp+IdxTdWftUsepZcNX2QntOqkOOwccYADmmZJpTr9tuvCYsW3i48B8LVEwvm0v1pAhxQ==";
+        url = "https://registry.npmjs.org/prisma-json-schema/-/prisma-json-schema-0.1.1.tgz";
+        sha512 = "epi2cDTQu/xk//H79dqRIzqk9ZEEqgcvHR7M/UhG/9UcSYY3OP/tJKDj5AYk86Xt2p5muDp3+y8ZGVNGZVQgNw==";
       };
     };
-    "prisma-yml-1.0.50" = {
+    "prisma-yml-1.0.93" = {
       name = "prisma-yml";
       packageName = "prisma-yml";
-      version = "1.0.50";
+      version = "1.0.93";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.50.tgz";
-        sha512 = "Vpt6q+YzS6yozMnIPU75hlHzmDR1Hj4Z3FXaazJrOXUyeQx/xDqeEwRJ+ii4xl/GRYiFnMEVSLfsPzjLehA1Zw==";
+        url = "https://registry.npmjs.org/prisma-yml/-/prisma-yml-1.0.93.tgz";
+        sha512 = "np7VXqA4t+qhmn2GXGIOL19IMWSyrI1T8uJH8Lrla9uslvSxch6bzarYcQgKsc+sTL/g1zbvNgRl19cr/CUuNQ==";
       };
     };
     "prismjs-1.15.0" = {
@@ -25036,13 +25197,13 @@ let
         sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
       };
     };
-    "private-box-0.2.1" = {
+    "private-box-0.3.0" = {
       name = "private-box";
       packageName = "private-box";
-      version = "0.2.1";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz";
-        sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0";
+        url = "https://registry.npmjs.org/private-box/-/private-box-0.3.0.tgz";
+        sha512 = "zsK6DDEC+cnNiunYamcVbx4ZCLbKnzTOZa09K4Pj3/tH3nQFPUO9K2QoYy4kfxLqmoyw6RPDtACN9OYviMQZ2Q==";
       };
     };
     "probe-image-size-4.0.0" = {
@@ -25122,7 +25283,7 @@ let
       packageName = "promiscuous";
       version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
+        url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
         sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892";
       };
     };
@@ -25131,7 +25292,7 @@ let
       packageName = "promise";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+        url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
         sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
       };
     };
@@ -25140,7 +25301,7 @@ let
       packageName = "promise";
       version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+        url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
         sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
       };
     };
@@ -25347,7 +25508,7 @@ let
       packageName = "proxy-agent";
       version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz";
+        url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz";
         sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg==";
       };
     };
@@ -25437,7 +25598,7 @@ let
       packageName = "public-encrypt";
       version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
+        url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
         sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==";
       };
     };
@@ -25932,7 +26093,7 @@ let
       packageName = "pull-sink-through";
       version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz";
+        url = "http://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz";
         sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f";
       };
     };
@@ -25945,12 +26106,21 @@ let
         sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f";
       };
     };
+    "pull-sort-1.0.1" = {
+      name = "pull-sort";
+      packageName = "pull-sort";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-sort/-/pull-sort-1.0.1.tgz";
+        sha1 = "a8ab0c70c86f45343c9accc939fc42769ad3dc6d";
+      };
+    };
     "pull-stream-2.27.0" = {
       name = "pull-stream";
       packageName = "pull-stream";
       version = "2.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz";
+        url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz";
         sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068";
       };
     };
@@ -25959,7 +26129,7 @@ let
       packageName = "pull-stream";
       version = "2.28.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz";
+        url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz";
         sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4";
       };
     };
@@ -25968,7 +26138,7 @@ let
       packageName = "pull-stream";
       version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
+        url = "http://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
         sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
       };
     };
@@ -25995,7 +26165,7 @@ let
       packageName = "pull-stringify";
       version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz";
+        url = "http://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz";
         sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c";
       };
     };
@@ -26134,13 +26304,13 @@ let
         sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
-    "push-stream-10.0.3" = {
+    "push-stream-10.0.4" = {
       name = "push-stream";
       packageName = "push-stream";
-      version = "10.0.3";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz";
-        sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87";
+        url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.4.tgz";
+        sha512 = "IrP96RziNzT4UR7ZffM26o2NQ/Dq0dlRi1p8S/HE4+pHF6OaKWS1DyaJevsxJ6Q8bHafLqin6/pwI36FCmiV0w==";
       };
     };
     "push-stream-to-pull-stream-1.0.3" = {
@@ -26539,13 +26709,13 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "range-slice-stream-1.2.0" = {
+    "range-slice-stream-2.0.0" = {
       name = "range-slice-stream";
       packageName = "range-slice-stream";
-      version = "1.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-1.2.0.tgz";
-        sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f";
+        url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-2.0.0.tgz";
+        sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==";
       };
     };
     "raven-js-3.26.4" = {
@@ -26629,15 +26799,6 @@ let
         sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
       };
     };
-    "rc-0.5.5" = {
-      name = "rc";
-      packageName = "rc";
-      version = "0.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
-        sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
-      };
-    };
     "rc-1.2.8" = {
       name = "rc";
       packageName = "rc";
@@ -26674,13 +26835,13 @@ let
         sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
+    "read-chunk-2.1.0" = {
+      name = "read-chunk";
+      packageName = "read-chunk";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
+        url = "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz";
+        sha1 = "6a04c0928005ed9d42e1a6ac5600e19cbc7ff655";
       };
     };
     "read-cmd-shim-1.0.1" = {
@@ -26805,7 +26966,7 @@ let
       packageName = "readable-stream";
       version = "1.0.27-1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
         sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
       };
     };
@@ -26814,7 +26975,7 @@ let
       packageName = "readable-stream";
       version = "1.0.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
         sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
       };
     };
@@ -26823,7 +26984,7 @@ let
       packageName = "readable-stream";
       version = "1.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz";
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
@@ -26832,7 +26993,7 @@ let
       packageName = "readable-stream";
       version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
         sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
       };
     };
@@ -26841,17 +27002,17 @@ let
       packageName = "readable-stream";
       version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
         sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
-    "readable-stream-3.0.2" = {
+    "readable-stream-3.0.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.2.tgz";
-        sha512 = "E3RfQoPuKDBhec0s8fOsgFXDVFlEipbsheGBX/NNByfKMfzPEEQJXcLy6fJ7bDD820HG/d+eXQ1ezCj29KoAJA==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.3.tgz";
+        sha512 = "CzN1eAu5Pmh4EaDlJp1g5E37LIHR24b82XlMWRQlPFjhvOYKa4HhClRsQO21zhdDWUpdWfiKt9/L/ZL2+vwxCw==";
       };
     };
     "readdir-scoped-modules-1.0.2" = {
@@ -26863,13 +27024,13 @@ let
         sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747";
       };
     };
-    "readdirp-2.1.0" = {
+    "readdirp-2.2.1" = {
       name = "readdirp";
       packageName = "readdirp";
-      version = "2.1.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz";
-        sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz";
+        sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
       };
     };
     "readline2-0.1.1" = {
@@ -26899,13 +27060,13 @@ let
         sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
       };
     };
-    "recast-0.15.3" = {
+    "recast-0.15.5" = {
       name = "recast";
       packageName = "recast";
-      version = "0.15.3";
+      version = "0.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.15.3.tgz";
-        sha512 = "xqnagxQH7mL4+UpcCVMObPPdjCEE2dmfGcTwcdpyNgZOd9W0rfdLRF3+smoA+AQqMw6xK6G4021dAQK8XfPYIQ==";
+        url = "https://registry.npmjs.org/recast/-/recast-0.15.5.tgz";
+        sha512 = "nkAYNqarh73cMWRKFiPQ8I9dOLFvFk6SnG8u/LUlOYfArDOD/EjsVRAs860TlBLrpxqAXHGET/AUAVjdEymL5w==";
       };
     };
     "rechoir-0.6.2" = {
@@ -27129,7 +27290,7 @@ let
       packageName = "relative-url";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz";
+        url = "http://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz";
         sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287";
       };
     };
@@ -27250,15 +27411,6 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "repeating-1.1.3" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
-        sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
-      };
-    };
     "repeating-2.0.1" = {
       name = "repeating";
       packageName = "repeating";
@@ -27565,6 +27717,15 @@ let
         sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
       };
     };
+    "resolve-global-0.1.0" = {
+      name = "resolve-global";
+      packageName = "resolve-global";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-global/-/resolve-global-0.1.0.tgz";
+        sha1 = "8fb02cfd5b7db20118e886311f15af95bd15fbd9";
+      };
+    };
     "resolve-options-1.1.0" = {
       name = "resolve-options";
       packageName = "resolve-options";
@@ -27682,6 +27843,15 @@ let
         sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
+    "retry-0.12.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
+        sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+      };
+    };
     "retry-0.6.0" = {
       name = "retry";
       packageName = "retry";
@@ -27961,13 +28131,13 @@ let
         sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==";
       };
     };
-    "rxjs-6.3.1" = {
+    "rxjs-6.3.3" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.3.1";
+      version = "6.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz";
-        sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz";
+        sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -28042,13 +28212,13 @@ let
         sha1 = "612da1c96473fa02dccda92dcd5b4ab164a6772a";
       };
     };
-    "sanitize-html-1.18.4" = {
+    "sanitize-html-1.19.1" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
-      version = "1.18.4";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.18.4.tgz";
-        sha512 = "hjyDYCYrQuhnEjq+5lenLlIfdPBtnZ7z0DkQOC8YGxvkuOInH+1SrkNTj30t4f2/SSv9c5kLniB+uCIpBvYuew==";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.19.1.tgz";
+        sha512 = "zNYr6FvBn4bZukr9x2uny6od/9YdjCLwF+FqxivqI0YOt/m9GIxfX+tWhm52tBAPUXiTTb4bJTGVagRz5b06bw==";
       };
     };
     "sax-0.3.5" = {
@@ -28056,7 +28226,7 @@ let
       packageName = "sax";
       version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+        url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
         sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
       };
     };
@@ -28065,7 +28235,7 @@ let
       packageName = "sax";
       version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
         sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
       };
     };
@@ -28074,7 +28244,7 @@ let
       packageName = "sax";
       version = "0.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+        url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
         sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
       };
     };
@@ -28083,7 +28253,7 @@ let
       packageName = "sax";
       version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
+        url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
         sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
       };
     };
@@ -28092,7 +28262,7 @@ let
       packageName = "sax";
       version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
+        url = "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
         sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
       };
     };
@@ -28132,22 +28302,22 @@ let
         sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==";
       };
     };
-    "secret-handshake-1.1.13" = {
+    "secret-handshake-1.1.14" = {
       name = "secret-handshake";
       packageName = "secret-handshake";
-      version = "1.1.13";
+      version = "1.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz";
-        sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A==";
+        url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.14.tgz";
+        sha512 = "e4hiMTahaLiN5XKap1YrifoyT8yRu9yQEZrMTglTBgq8Lv8iChFKLpbmXYeNxy2rCnutuWaQDFbp3sBgl4NQ4g==";
       };
     };
-    "secret-stack-4.1.0" = {
+    "secret-stack-4.2.1" = {
       name = "secret-stack";
       packageName = "secret-stack";
-      version = "4.1.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz";
-        sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w==";
+        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.1.tgz";
+        sha512 = "R4pn1zVaspQUqpC3iKLvA476pfftzE8AZTfMnd7TQpuVdGML0wsLYp4wmU4NZERHYsr0g99JnwUH5ll9n0APjg==";
       };
     };
     "secure-keys-1.0.0" = {
@@ -28159,13 +28329,13 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
-    "secure-scuttlebutt-18.2.0" = {
+    "secure-scuttlebutt-18.3.3" = {
       name = "secure-scuttlebutt";
       packageName = "secure-scuttlebutt";
-      version = "18.2.0";
+      version = "18.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz";
-        sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg==";
+        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.3.3.tgz";
+        sha512 = "f1APqe25N1Te++xtP1ZFnZ9hff/9lbj1o2fMnvFcGD+BezvwkKuR2RURRdu1NApDp0Xmglki45UeVqMfvs73iw==";
       };
     };
     "seek-bzip-1.0.5" = {
@@ -28483,13 +28653,13 @@ let
         sha1 = "935d240cdfe0f5805307fdfe967d88942a2cbcf0";
       };
     };
-    "serve-handler-5.0.0" = {
+    "serve-handler-5.0.3" = {
       name = "serve-handler";
       packageName = "serve-handler";
-      version = "5.0.0";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.0.tgz";
-        sha512 = "VbNr1Yk4cDMAdIyVr5J1vPtGuXUsuu0R8iht+reK0g8t48fSuGWqnsIYVh3xXFJynFDHMLbPQ9mll+/hhmuGEQ==";
+        url = "https://registry.npmjs.org/serve-handler/-/serve-handler-5.0.3.tgz";
+        sha512 = "qtIOHXC+pgEQO+bMwtcQBP3IjuKH5vXwnTb0J9SzTORDqGHvQmPXO3v/DEIEHI1oENWLmbDRBezRnJiw3t/2nA==";
       };
     };
     "serve-index-1.7.3" = {
@@ -28632,7 +28802,7 @@ let
       packageName = "sha.js";
       version = "2.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
+        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
         sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
@@ -28641,7 +28811,7 @@ let
       packageName = "sha.js";
       version = "2.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
+        url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
         sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
       };
     };
@@ -28659,7 +28829,7 @@ let
       packageName = "shasum";
       version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
+        url = "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
         sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
       };
     };
@@ -28861,13 +29031,13 @@ let
         sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
       };
     };
-    "simple-git-1.96.0" = {
+    "simple-git-1.102.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.96.0";
+      version = "1.102.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
-        sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.102.0.tgz";
+        sha512 = "ox/EDIYtyxG9pFBuboxnmR1FFFS2vsrJejuble9d2W0EWvvMB02/ruMUHp1ROPS0OH5Nzr9+/W7JkRRRXDMs8Q==";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -28897,15 +29067,6 @@ let
         sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q==";
       };
     };
-    "simple-plist-0.2.1" = {
-      name = "simple-plist";
-      packageName = "simple-plist";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
-        sha1 = "71766db352326928cf3a807242ba762322636723";
-      };
-    };
     "simple-sha1-2.1.1" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
@@ -29230,13 +29391,13 @@ let
         sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==";
       };
     };
-    "snyk-1.94.0" = {
+    "snyk-1.99.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.94.0";
+      version = "1.99.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.94.0.tgz";
-        sha512 = "65dc0lnzmXc4kAwMOCPu/2I6nY0Sx0FcmO5NIzhnxvsSy6K508RMh1SQcF40V7eUFhOD3uQ/HTHTN0JW/4zYBA==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz";
+        sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg==";
       };
     };
     "snyk-config-2.2.0" = {
@@ -29248,13 +29409,13 @@ let
         sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg==";
       };
     };
-    "snyk-docker-plugin-1.10.4" = {
+    "snyk-docker-plugin-1.11.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "1.10.4";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.10.4.tgz";
-        sha512 = "79yWMaISNbtfTY9UtTF7K24cE4k1tRsxDOZo4/a8WlyO/dmmvbdcyz3jtHiFnS8NZqOkXf7ngqae1hmcR7CdPA==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.11.0.tgz";
+        sha512 = "rJrSj4FfGtaFGNybWTb0bULEqoQEeZfZBpGoDumiXsGqoSWf61Tr1V/Ck9NGcmHWNEVsLZLcE9CXp6Y6Kbo8qA==";
       };
     };
     "snyk-go-plugin-1.5.2" = {
@@ -29266,13 +29427,13 @@ let
         sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA==";
       };
     };
-    "snyk-gradle-plugin-1.3.0" = {
+    "snyk-gradle-plugin-2.0.1" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.3.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz";
-        sha512 = "rKZcPwbDM9zk3pFcO0w77MIKOZTkk5ZBVBkBlTlUiFg+eNOKqPTmw2hBGF5NB4ASQmMnx3uB1C8+hrQ405CthA==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.0.1.tgz";
+        sha512 = "dL9MRlwmDP4OmOk4b61pMqvbu8gG+HVCBTryBEU+vkvjloX0lslKvA5NTUPAM2M8SShnOic54cSegGQChBhYHw==";
       };
     };
     "snyk-module-1.8.2" = {
@@ -29284,22 +29445,22 @@ let
         sha512 = "XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg==";
       };
     };
-    "snyk-mvn-plugin-1.2.0" = {
+    "snyk-mvn-plugin-2.0.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "1.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz";
-        sha512 = "ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w==";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.0.tgz";
+        sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg==";
       };
     };
-    "snyk-nodejs-lockfile-parser-1.4.1" = {
+    "snyk-nodejs-lockfile-parser-1.5.1" = {
       name = "snyk-nodejs-lockfile-parser";
       packageName = "snyk-nodejs-lockfile-parser";
-      version = "1.4.1";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.4.1.tgz";
-        sha512 = "xjkf1BHk7HQlp4ABIWPtEvAOAvWhwMtJ7ElQVUvKBHPVHjMEz3mucBRfrtpuyDBJ3DaBlN8Wiw+kcEinX6f09w==";
+        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.1.tgz";
+        sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A==";
       };
     };
     "snyk-nuget-plugin-1.6.5" = {
@@ -29356,13 +29517,13 @@ let
         sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q==";
       };
     };
-    "snyk-sbt-plugin-1.3.1" = {
+    "snyk-sbt-plugin-2.0.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.3.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.1.tgz";
-        sha512 = "un9ddM4M+7Ye/zhkh5Cm6EYMXU0Z/aM8wuYZvu4O+wd8sonoUClwckzJlsaI2BA7xvfDL9qQUaImtpgy94v5JQ==";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.0.tgz";
+        sha512 = "bOUqsQ1Lysnwfnvf4QQIBfC0M0ZVuhlshTKd7pNwgAJ41YEPJNrPEpzOePl/HfKtwilEEwHh5YHvjYGegEKx0A==";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -29572,13 +29733,13 @@ let
         sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e";
       };
     };
-    "sodium-chloride-1.1.0" = {
+    "sodium-chloride-1.1.2" = {
       name = "sodium-chloride";
       packageName = "sodium-chloride";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz";
-        sha1 = "247a234b88867f6dff51332b605f193a65bf6839";
+        url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.2.tgz";
+        sha512 = "8AVzr9VHueXqfzfkzUA0aXe/Q4XG3UTmhlP6Pt+HQc5bbAPIJFo7ZIMh9tvn+99QuiMcyDJdYumegGAczl0N+g==";
       };
     };
     "sodium-javascript-0.5.5" = {
@@ -29590,13 +29751,13 @@ let
         sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
       };
     };
-    "sodium-native-2.2.1" = {
+    "sodium-native-2.2.2" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.1.tgz";
-        sha512 = "3CfftYV2ATXQFMIkLOvcNUk/Ma+lran0855j5Z/HEjUkSTzjLZi16CK362udOoNVrwn/TwGV8bKEt5OylsFrQA==";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.2.2.tgz";
+        sha512 = "TdAa+PlmWki2Spx3TJyGFVkj6gLsxs5HV/i/j2COZ5INEaCmLz15NIHgUAT/GQ0KrG8Ddy6tkvuP7B5YJpmW6g==";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -29761,6 +29922,15 @@ let
         sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
+    "source-map-0.7.3" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
+        sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
+      };
+    };
     "source-map-resolve-0.5.2" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
@@ -29824,13 +29994,13 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
-    "sourcemap-codec-1.4.1" = {
+    "sourcemap-codec-1.4.3" = {
       name = "sourcemap-codec";
       packageName = "sourcemap-codec";
-      version = "1.4.1";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz";
-        sha512 = "hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==";
+        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.3.tgz";
+        sha512 = "vFrY/x/NdsD7Yc8mpTJXuao9S8lq08Z/kOITHz6b7YbfI9xL8Spe5EvSQUHOI7SbpY8bRPr0U3kKSsPuqEGSfA==";
       };
     };
     "spark-md5-1.0.1" = {
@@ -29878,13 +30048,13 @@ let
         sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
       };
     };
-    "spdx-correct-3.0.0" = {
+    "spdx-correct-3.0.1" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
-        sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz";
+        sha512 = "hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==";
       };
     };
     "spdx-exceptions-2.1.0" = {
@@ -29905,13 +30075,13 @@ let
         sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
       };
     };
-    "spdx-license-ids-3.0.0" = {
+    "spdx-license-ids-3.0.1" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
-        sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz";
+        sha512 = "TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==";
       };
     };
     "spdy-1.32.5" = {
@@ -29946,7 +30116,7 @@ let
       packageName = "split";
       version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz";
+        url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz";
         sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
       };
     };
@@ -29955,7 +30125,7 @@ let
       packageName = "split";
       version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
+        url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz";
         sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
       };
     };
@@ -29973,7 +30143,7 @@ let
       packageName = "split-buffer";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz";
+        url = "http://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz";
         sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027";
       };
     };
@@ -30076,31 +30246,31 @@ let
         sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
       };
     };
-    "ssb-config-2.2.0" = {
+    "ssb-config-2.3.2" = {
       name = "ssb-config";
       packageName = "ssb-config";
-      version = "2.2.0";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz";
-        sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc";
+        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.2.tgz";
+        sha512 = "u+pUKX+ZL8KbfdwL49GuHaVD8kh+LkdLcKyCO+Rxn/MKLfZ1JFfuhm6yZ4ppQu9oTmq/1C49eLpNwZtrLIjVCg==";
       };
     };
-    "ssb-ebt-5.2.2" = {
+    "ssb-ebt-5.2.3" = {
       name = "ssb-ebt";
       packageName = "ssb-ebt";
-      version = "5.2.2";
+      version = "5.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz";
-        sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw==";
+        url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.3.tgz";
+        sha512 = "LTIry3qRZRLqv3l97tcd22dNiLjZHz7Ynot0OQFG10zL4jsECSkSxMUqSwrFUTfZEySUxhAx92TDcafDy+/J3A==";
       };
     };
-    "ssb-friends-2.4.0" = {
+    "ssb-friends-3.1.3" = {
       name = "ssb-friends";
       packageName = "ssb-friends";
-      version = "2.4.0";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz";
-        sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae";
+        url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-3.1.3.tgz";
+        sha512 = "bufgvAcqjAyjKfmh788dr3fV9YYrIgdkIhfETPHidbgIKgx15clNUzjP/s7FZk2PwwrjHyQ54kE0BR2em6u/nQ==";
       };
     };
     "ssb-git-0.5.0" = {
@@ -30130,13 +30300,13 @@ let
         sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5";
       };
     };
-    "ssb-keys-7.0.16" = {
+    "ssb-keys-7.1.3" = {
       name = "ssb-keys";
       packageName = "ssb-keys";
-      version = "7.0.16";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz";
-        sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ==";
+        url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.1.3.tgz";
+        sha512 = "f66vIZ3LkeMx73enLTkPC9ecTUcUrjtVHvRt45nDmubGMom21Z82JQLWYbQ++09v3JG3B4XEir8inhv6AAISSQ==";
       };
     };
     "ssb-links-3.0.3" = {
@@ -30202,31 +30372,31 @@ let
         sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118";
       };
     };
-    "ssb-query-2.2.1" = {
+    "ssb-query-2.3.0" = {
       name = "ssb-query";
       packageName = "ssb-query";
-      version = "2.2.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz";
-        sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA==";
+        url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.3.0.tgz";
+        sha512 = "y4OA2MvGl1jU7bUTYsTmMNSqlPt4eh9401THUW1DO4aFyBFEWvpa3eKJHc8aTmaph2hutPPbdKgEFsWDzw26uw==";
       };
     };
-    "ssb-ref-2.11.2" = {
+    "ssb-ref-2.12.0" = {
       name = "ssb-ref";
       packageName = "ssb-ref";
-      version = "2.11.2";
+      version = "2.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz";
-        sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA==";
+        url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.12.0.tgz";
+        sha512 = "xcVFLYgvWkxZoNDCOQHLqgHYsjmfunVkdby9OPEygjufXbiW6zpnFTBqlqEBojBetxxtVdwCgZreD9kYXED/ZA==";
       };
     };
-    "ssb-validate-3.0.10" = {
+    "ssb-validate-3.0.11" = {
       name = "ssb-validate";
       packageName = "ssb-validate";
-      version = "3.0.10";
+      version = "3.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz";
-        sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ==";
+        url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.11.tgz";
+        sha512 = "mZPI9HKZtqPP7Qi26B0GR7HqYmmcELEaoj5zr8TlUcULg9BOZy7f4VSzcKZ36LIkvpuK2sfA6znxIlBLq78fjg==";
       };
     };
     "ssb-ws-2.1.1" = {
@@ -30252,7 +30422,7 @@ let
       packageName = "ssh-key-to-pem";
       version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
+        url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
         sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
       };
     };
@@ -30468,10 +30638,19 @@ let
       packageName = "stream-combiner";
       version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
         sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
       };
     };
+    "stream-combiner-0.2.2" = {
+      name = "stream-combiner";
+      packageName = "stream-combiner";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz";
+        sha1 = "aec8cbac177b56b6f4fa479ced8c1912cee52858";
+      };
+    };
     "stream-combiner2-1.1.1" = {
       name = "stream-combiner2";
       packageName = "stream-combiner2";
@@ -30706,15 +30885,6 @@ let
         sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
       };
     };
-    "string-length-1.0.1" = {
-      name = "string-length";
-      packageName = "string-length";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
-        sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
-      };
-    };
     "string-length-2.0.0" = {
       name = "string-length";
       packageName = "string-length";
@@ -30724,13 +30894,13 @@ let
         sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
       };
     };
-    "string-similarity-1.2.1" = {
+    "string-similarity-1.2.2" = {
       name = "string-similarity";
       packageName = "string-similarity";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.1.tgz";
-        sha512 = "XqC6lRZF3UIYdxBRHjIfJwU2nYzPm+E8udKFHjIplnRQflkXP1A1Ie3HoEv04W/zY1wGnV6TQpklM2WwZO3gIA==";
+        url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.2.tgz";
+        sha512 = "IoHUjcw3Srl8nsPlW04U3qwWPk3oG2ffLM0tN853d/E/JlIvcmZmDY2Kz5HzKp4lEi2T7QD7Zuvjq/1rDw+XcQ==";
       };
     };
     "string-stream-0.0.7" = {
@@ -31057,13 +31227,13 @@ let
         sha512 = "zhzBZev0uhT2IrFUerenXhfaE0vFUYwAZsnG0gIKGpfM/Gi6jOUQ3cmcvyTsXeDLIPiTubHESeO7EbD6FoPmzw==";
       };
     };
-    "strong-log-transformer-1.0.6" = {
+    "strong-log-transformer-2.0.0" = {
       name = "strong-log-transformer";
       packageName = "strong-log-transformer";
-      version = "1.0.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz";
-        sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3";
+        url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz";
+        sha512 = "FQmNqAXJgOX8ygOcvPLlGWBNT41mvNJ9ALoYf0GTwVt9t30mGTqpmp/oJx5gLcu52DXK10kS7dVWhx8aPXDTlg==";
       };
     };
     "strsplit-1.0.0" = {
@@ -31093,13 +31263,13 @@ let
         sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760";
       };
     };
-    "subscriptions-transport-ws-0.9.14" = {
+    "subscriptions-transport-ws-0.9.15" = {
       name = "subscriptions-transport-ws";
       packageName = "subscriptions-transport-ws";
-      version = "0.9.14";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.14.tgz";
-        sha512 = "n1+mgupVdJn1MIls1ZhSJurJjc+islp7Tv9EIaEJ3HAd9DaINneKq0KRqOYNOrvUI7orVWGomEnlIxoudjfbeA==";
+        url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz";
+        sha512 = "f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ==";
       };
     };
     "sudo-block-1.2.0" = {
@@ -31143,7 +31313,7 @@ let
       packageName = "superagent-proxy";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz";
+        url = "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz";
         sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA==";
       };
     };
@@ -31341,7 +31511,7 @@ let
       packageName = "table";
       version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        url = "http://registry.npmjs.org/table/-/table-3.8.3.tgz";
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
@@ -31350,7 +31520,7 @@ let
       packageName = "table";
       version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz";
+        url = "http://registry.npmjs.org/table/-/table-4.0.3.tgz";
         sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==";
       };
     };
@@ -31409,13 +31579,13 @@ let
         sha1 = "99372a5c999bf2df160afc0d74bed4f47948cd22";
       };
     };
-    "tapable-1.0.0" = {
+    "tapable-1.1.0" = {
       name = "tapable";
       packageName = "tapable";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz";
-        sha512 = "dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==";
+        url = "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz";
+        sha512 = "IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==";
       };
     };
     "tape-2.3.3" = {
@@ -31490,13 +31660,13 @@ let
         sha512 = "PPRybI9+jM5tjtCbN2cxmmRU7YmqT3Zv/UDy48tAh2XRkLa9bAORtSWLkVc13+GJF+cdTh1yEnHEk3cpTaL5Kg==";
       };
     };
-    "tar-stream-1.6.1" = {
+    "tar-stream-1.6.2" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
-        sha512 = "IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz";
+        sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==";
       };
     };
     "temp-0.6.0" = {
@@ -31562,13 +31732,13 @@ let
         sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05";
       };
     };
-    "text-extensions-1.7.0" = {
+    "text-extensions-1.8.0" = {
       name = "text-extensions";
       packageName = "text-extensions";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz";
-        sha512 = "AKXZeDq230UaSzaO5s3qQUZOaC7iKbzq0jOFL614R7d9R593HLqAOL0cYoqLdkNrjBSOdmoQI06yigq1TSBXAg==";
+        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.8.0.tgz";
+        sha512 = "mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==";
       };
     };
     "text-table-0.2.0" = {
@@ -31675,7 +31845,7 @@ let
       packageName = "through";
       version = "2.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz";
+        url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
         sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
       };
     };
@@ -31684,7 +31854,7 @@ let
       packageName = "through";
       version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz";
+        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
         sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
       };
     };
@@ -31693,7 +31863,7 @@ let
       packageName = "through";
       version = "2.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+        url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
         sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
       };
     };
@@ -31787,15 +31957,6 @@ let
         sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3";
       };
     };
-    "timed-out-2.0.0" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
-        sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -32111,13 +32272,13 @@ let
         sha512 = "H/Z/yCuvZJj1vl1IQHI8dvF2QrUuXRJoptT5DW5967/dsLpXlCg+uyhFR5lfNj5mNaYePUbKtnL+qKWZGXv4Nw==";
       };
     };
-    "torrent-stream-1.0.4" = {
+    "torrent-stream-1.1.0" = {
       name = "torrent-stream";
       packageName = "torrent-stream";
-      version = "1.0.4";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.4.tgz";
-        sha512 = "IIAoMzagHFzjRQrFjwAZrE3yQYAPsmkbx0gYMCu/x5vf/Cj5yBjZqW1/98vOcaGGGelH/LhkmrJ56VYhiAKi5g==";
+        url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.1.0.tgz";
+        sha512 = "yjKU8l985+/D2CdnAR2+pEpyMX13rlQ1kNYik34EHxcul7BjifW5sMizT+u47suOeBTji3lHBA7eZGhBjpnM6g==";
       };
     };
     "tosource-1.0.0" = {
@@ -32354,6 +32515,15 @@ let
         sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
       };
     };
+    "ts-node-7.0.1" = {
+      name = "ts-node";
+      packageName = "ts-node";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz";
+        sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==";
+      };
+    };
     "tslib-1.9.3" = {
       name = "tslib";
       packageName = "tslib";
@@ -32404,7 +32574,7 @@ let
       packageName = "tunnel";
       version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
+        url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
         sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
       };
     };
@@ -32516,13 +32686,13 @@ let
         sha512 = "HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==";
       };
     };
-    "typechecker-4.5.0" = {
+    "typechecker-4.6.0" = {
       name = "typechecker";
       packageName = "typechecker";
-      version = "4.5.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.5.0.tgz";
-        sha512 = "bqPE/ck3bVIaXP7gMKTKSHrypT32lpYTpiqzPYeYzdSQnmaGvaGhy7TnN/M/+5R+2rs/kKcp9ZLPRp/Q9Yj+4w==";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.6.0.tgz";
+        sha512 = "83OrXpyP3LNr7aRbLkt2nkjE/d7q8su8/uRvrKxCpswqVCVGOgyaKpaz8/MTjQqBYe4eLNuJ44pNakFZKqyPMA==";
       };
     };
     "typedarray-0.0.6" = {
@@ -32543,24 +32713,6 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-2.7.2" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "2.7.2";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz";
-        sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==";
-      };
-    };
-    "typescript-2.8.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "2.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
-        sha512 = "K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw==";
-      };
-    };
     "typescript-2.9.2" = {
       name = "typescript";
       packageName = "typescript";
@@ -32570,6 +32722,24 @@ let
         sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==";
       };
     };
+    "typescript-3.0.3" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz";
+        sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
+      };
+    };
+    "typescript-3.1.1" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz";
+        sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==";
+      };
+    };
     "typewise-1.0.3" = {
       name = "typewise";
       packageName = "typewise";
@@ -32660,15 +32830,6 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.4.8" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.4.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz";
-        sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==";
-      };
-    };
     "uglify-js-3.4.9" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -32813,13 +32974,13 @@ let
         sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
-    "unbzip2-stream-1.2.5" = {
+    "unbzip2-stream-1.3.0" = {
       name = "unbzip2-stream";
       packageName = "unbzip2-stream";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz";
-        sha512 = "izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==";
+        url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.0.tgz";
+        sha512 = "kE2WkurNnPUMcryNioS68DDbhoPB8Qxsd8btHSj+sd5Pjh2GsjmeHLzMSqV9HHziAo8FzVxVCJl9ZYhk7yY1pA==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -32975,6 +33136,15 @@ let
         sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba";
       };
     };
+    "union-0.4.6" = {
+      name = "union";
+      packageName = "union";
+      version = "0.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/union/-/union-0.4.6.tgz";
+        sha1 = "198fbdaeba254e788b0efcb630bc11f24a2959e0";
+      };
+    };
     "union-value-1.0.0" = {
       name = "union-value";
       packageName = "union-value";
@@ -32993,22 +33163,22 @@ let
         sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
       };
     };
-    "unique-filename-1.1.0" = {
+    "unique-filename-1.1.1" = {
       name = "unique-filename";
       packageName = "unique-filename";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
-        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
+        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
+        sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
       };
     };
-    "unique-slug-2.0.0" = {
+    "unique-slug-2.0.1" = {
       name = "unique-slug";
       packageName = "unique-slug";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
-        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz";
+        sha512 = "n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==";
       };
     };
     "unique-stream-1.0.0" = {
@@ -33218,15 +33388,6 @@ let
         sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ==";
       };
     };
-    "update-notifier-0.5.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz";
-        sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
-      };
-    };
     "update-notifier-2.3.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
@@ -33614,15 +33775,6 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
-      };
-    };
     "uuid-3.1.0" = {
       name = "uuid";
       packageName = "uuid";
@@ -33713,13 +33865,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "validator-10.7.1" = {
+    "validator-10.8.0" = {
       name = "validator";
       packageName = "validator";
-      version = "10.7.1";
+      version = "10.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz";
-        sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ==";
+        url = "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz";
+        sha512 = "mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g==";
       };
     };
     "validator-5.2.0" = {
@@ -33929,13 +34081,13 @@ let
         sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
       };
     };
-    "videostream-2.5.1" = {
+    "videostream-2.6.0" = {
       name = "videostream";
       packageName = "videostream";
-      version = "2.5.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/videostream/-/videostream-2.5.1.tgz";
-        sha512 = "S3f34WE6NB1d/YUAa/EYcTURTkGaxsUqcDmsGWV1jQpQQJxeagc79/XA7ygNjzBf3DoQQ1MKTD+SocPsWSniAg==";
+        url = "https://registry.npmjs.org/videostream/-/videostream-2.6.0.tgz";
+        sha512 = "nSsullx1BYClJxVSt4Fa+Ulsv0Cf7UwaHq+4LQdLkAUdmqNhY1DlGxXDWVY2gui5XV4FvDiSbXmSbGryMrrUCQ==";
       };
     };
     "vinyl-0.4.6" = {
@@ -34078,7 +34230,7 @@ let
       packageName = "vscode-jsonrpc";
       version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz";
+        url = "http://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz";
         sha512 = "PqHHjuTlz3ks0vyZv3IkdduJReA/lqe6OP5zRl5nXn2ptMLW++fBotNyayyZEQLIF6nNrx/Rn6WhMSHElf02Yw==";
       };
     };
@@ -34091,12 +34243,21 @@ let
         sha512 = "T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==";
       };
     };
+    "vscode-jsonrpc-4.0.0" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz";
+        sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
+      };
+    };
     "vscode-languageclient-4.0.1" = {
       name = "vscode-languageclient";
       packageName = "vscode-languageclient";
       version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz";
+        url = "http://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz";
         sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA==";
       };
     };
@@ -34105,26 +34266,26 @@ let
       packageName = "vscode-languageserver";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz";
+        url = "http://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.0.0.tgz";
         sha512 = "bxj9nRadNkXYfVG/fjA5a+KA5WaJCeP1F2Tnj3rYFS0pKALZQCPNqk3KO/LdiGFidjyICMG7xoHvYO9J9xosXg==";
       };
     };
-    "vscode-languageserver-4.4.2" = {
+    "vscode-languageserver-5.1.0" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "4.4.2";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz";
-        sha512 = "61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA==";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz";
+        sha512 = "CIsrgx2Y5VHS317g/HwkSTWYBIQmy0DwEyZPmB2pEpVOhYFwVsYpbiJwHIIyLQsQtmRaO4eA2xM8KPjNSdXpBw==";
       };
     };
-    "vscode-languageserver-protocol-3.12.0" = {
+    "vscode-languageserver-protocol-3.13.0" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.12.0";
+      version = "3.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz";
-        sha512 = "evY6hmyzLnwQrqlQWPrNBq1z8wrSNjLesmgPzeS6Zv11mVS5UJRel26hbM/DH5tHdn45huNzRW0eFHRmIm8LpA==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz";
+        sha512 = "2ZGKwI+P2ovQll2PGAp+2UfJH+FK9eait86VBUdkPd9HRlm8e58aYT9pV/NYanHOcp3pL6x2yTLVCFMcTer0mg==";
       };
     };
     "vscode-languageserver-protocol-3.6.0" = {
@@ -34132,17 +34293,17 @@ let
       packageName = "vscode-languageserver-protocol";
       version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz";
+        url = "http://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz";
         sha512 = "PN5hVQQQxrtHSZR8UCstqaoI9f2H9JctFTtdIpONWjzQNurWrc48qSXXU/vTfnbSrNou8qrJgkZ4QEZsyozOMA==";
       };
     };
-    "vscode-languageserver-types-3.12.0" = {
+    "vscode-languageserver-types-3.13.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.12.0";
+      version = "3.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz";
-        sha512 = "UxqnpzBToPO7Mi2tr/s5JeyPOSKSJtLB8lIdxCg9ZNdvP2cU8wS7iTDtwQKz91Ne4CUmTdf85ddR5SIZKXmMjQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz";
+        sha512 = "BnJIxS+5+8UWiNKCP7W3g9FlE7fErFw0ofP5BXJe7c2tl0VeWh+nNHFbwAS2vmVC4a5kYxHBjRy0UeOtziemVA==";
       };
     };
     "vscode-uri-1.0.3" = {
@@ -34172,13 +34333,13 @@ let
         sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d";
       };
     };
-    "vue-cli-plugin-apollo-0.14.6" = {
+    "vue-cli-plugin-apollo-0.16.6" = {
       name = "vue-cli-plugin-apollo";
       packageName = "vue-cli-plugin-apollo";
-      version = "0.14.6";
+      version = "0.16.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.14.6.tgz";
-        sha512 = "wQf4kCiUGhsKpc52GSwDVAjZlGP77YnjD+p+6TFOVg4RoMZgiFAx/qHZ6N1bUhNS0sEVJZd7wSKauiFr2elRrg==";
+        url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.16.6.tgz";
+        sha512 = "2GFJQg84BrdgLZXkvwxndlAljOvPOhoNVXrVChSTpiOgEu5JqPkVn71fAeVZ/OYzlcs+48trQQ32SXoHrJyQ0A==";
       };
     };
     "walk-2.3.14" = {
@@ -34271,13 +34432,13 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-sources-1.2.0" = {
+    "webpack-sources-1.3.0" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz";
-        sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz";
+        sha512 = "OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==";
       };
     };
     "websocket-driver-0.7.0" = {
@@ -34321,7 +34482,7 @@ let
       packageName = "whatwg-fetch";
       version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz";
+        url = "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz";
         sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==";
       };
     };
@@ -34334,6 +34495,15 @@ let
         sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
       };
     };
+    "whatwg-url-7.0.0" = {
+      name = "whatwg-url";
+      packageName = "whatwg-url";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz";
+        sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==";
+      };
+    };
     "whatwg-url-compat-0.6.5" = {
       name = "whatwg-url-compat";
       packageName = "whatwg-url-compat";
@@ -34528,7 +34698,7 @@ let
       packageName = "winston";
       version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+        url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
         sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
       };
     };
@@ -34537,7 +34707,7 @@ let
       packageName = "winston";
       version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+        url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
         sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
       };
     };
@@ -34546,7 +34716,7 @@ let
       packageName = "winston";
       version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
+        url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
         sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
       };
     };
@@ -34555,7 +34725,7 @@ let
       packageName = "winston";
       version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
+        url = "http://registry.npmjs.org/winston/-/winston-1.1.2.tgz";
         sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c";
       };
     };
@@ -34564,7 +34734,7 @@ let
       packageName = "winston";
       version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
+        url = "http://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
@@ -34658,6 +34828,15 @@ let
         sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba";
       };
     };
+    "wrap-ansi-4.0.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz";
+        sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg==";
+      };
+    };
     "wrap-fn-0.1.5" = {
       name = "wrap-fn";
       packageName = "wrap-fn";
@@ -34811,15 +34990,6 @@ let
         sha1 = "7f6194154fd1786cf261e68b5488c47127a04977";
       };
     };
-    "xcode-1.0.0" = {
-      name = "xcode";
-      packageName = "xcode";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz";
-        sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec";
-      };
-    };
     "xdg-basedir-2.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -35186,7 +35356,7 @@ let
       packageName = "yargs";
       version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
+        url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
         sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
       };
     };
@@ -35226,12 +35396,21 @@ let
         sha512 = "B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==";
       };
     };
+    "yargs-12.0.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "12.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz";
+        sha512 = "e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==";
+      };
+    };
     "yargs-3.10.0" = {
       name = "yargs";
       packageName = "yargs";
       version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        url = "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
@@ -35240,7 +35419,7 @@ let
       packageName = "yargs";
       version = "3.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
+        url = "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
         sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
       };
     };
@@ -35249,7 +35428,7 @@ let
       packageName = "yargs";
       version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        url = "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
         sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
@@ -35397,6 +35576,15 @@ let
         sha512 = "HBpXdNw8V66EwqIFt01rNhSgX33BOzgVb9CxpIvESvCI4ELeOSniB6gV6RXwrBur8kmHZCIAkYQYpib7Qxx8FQ==";
       };
     };
+    "yn-2.0.0" = {
+      name = "yn";
+      packageName = "yn";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz";
+        sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a";
+      };
+    };
     "yosay-2.0.2" = {
       name = "yosay";
       packageName = "yosay";
@@ -35406,13 +35594,13 @@ let
         sha512 = "avX6nz2esp7IMXGag4gu6OyQBsMh/SEn+ZybGu3yKPlOTE6z9qJrzG/0X5vCq/e0rPFy0CUYCze0G5hL310ibA==";
       };
     };
-    "z-schema-3.23.0" = {
+    "z-schema-3.24.1" = {
       name = "z-schema";
       packageName = "z-schema";
-      version = "3.23.0";
+      version = "3.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.23.0.tgz";
-        sha512 = "D8XV0BiHuQbWNEgu68RpjFZJ0C7jt+WYoszXKOohe54TdoTTauUvBQx+lsYCdalGIjGTFdQs5dxKvCUonUERzQ==";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.24.1.tgz";
+        sha512 = "2eR8eq/v1coNqyBc5HzswEcoLbw+S33RMnR326uiuOIr97ve5vwPNMDrKS1IRCB12bZ3a8BrfGxrRwuSXUyPvw==";
       };
     };
     "zen-observable-0.5.2" = {
@@ -35433,13 +35621,13 @@ let
         sha512 = "Y9kPzjGvIZ5jchSlqlCpBW3I82zBBL4z+ulXDRVA1NwsKzjt5kwAi+gOYIy0htNkfuehGZZtP5mRXHRV6TjDWw==";
       };
     };
-    "zen-observable-ts-0.8.9" = {
+    "zen-observable-ts-0.8.10" = {
       name = "zen-observable-ts";
       packageName = "zen-observable-ts";
-      version = "0.8.9";
+      version = "0.8.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz";
-        sha512 = "KJz2O8FxbAdAU5CSc8qZ1K2WYEJb1HxS6XDRF+hOJ1rOYcg6eTMmS9xYHCXzqZZzKw6BbXWyF4UpwSsBQnHJeA==";
+        url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.10.tgz";
+        sha512 = "5vqMtRggU/2GhePC9OU4sYEWOdvmayp2k3gjPf4F0mXwB3CSbbNznfDUvDJx9O2ZTa1EIXdJhPchQveFKwNXPQ==";
       };
     };
     "zeparser-0.0.5" = {
@@ -35535,11 +35723,11 @@ in
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
-      sources."chmodr-1.0.2"
+      sources."chmodr-1.2.0"
       sources."colors-1.3.2"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
-      sources."convert-source-map-1.5.1"
+      sources."convert-source-map-1.6.0"
       sources."core-js-2.5.7"
       sources."debug-2.6.9"
       sources."detect-indent-4.0.0"
@@ -35576,7 +35764,7 @@ in
       sources."json5-0.5.1"
       sources."jsonfile-4.0.0"
       sources."jsonlint-1.6.2"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."loose-envify-1.4.0"
       sources."matcher-collection-1.0.5"
       sources."minimatch-3.0.4"
@@ -35603,6 +35791,7 @@ in
       sources."regenerator-runtime-0.11.1"
       sources."repeating-2.0.1"
       sources."resolve-1.8.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-0.5.8"
       sources."slash-1.0.0"
       sources."source-map-0.6.1"
@@ -35657,8 +35846,8 @@ in
       sources."chainsaw-0.1.0"
       sources."chromium-pickle-js-0.2.0"
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cuint-0.2.2"
@@ -35671,7 +35860,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
       sources."getpass-0.1.7"
@@ -35752,7 +35945,7 @@ in
       sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
     };
     dependencies = [
-      sources."@types/node-8.10.29"
+      sources."@types/node-8.10.30"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
@@ -35905,7 +36098,7 @@ in
       sources."clone-1.0.4"
       sources."co-4.6.0"
       sources."colors-1.1.2"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."commander-1.0.4"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
@@ -35964,7 +36157,7 @@ in
       sources."har-schema-2.0.0"
       (sources."har-validator-2.0.6" // {
         dependencies = [
-          sources."commander-2.17.1"
+          sources."commander-2.18.0"
         ];
       })
       sources."has-ansi-2.0.0"
@@ -36012,7 +36205,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."map-stream-0.1.0"
       sources."md5.js-1.3.4"
       sources."mime-db-1.36.0"
@@ -36021,13 +36214,13 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."moment-2.22.2"
-      (sources."ms-rest-2.3.6" // {
+      (sources."ms-rest-2.3.7" // {
         dependencies = [
           sources."through-2.3.8"
           sources."tunnel-0.0.5"
         ];
       })
-      (sources."ms-rest-azure-2.5.7" // {
+      (sources."ms-rest-azure-2.5.9" // {
         dependencies = [
           sources."async-2.6.0"
         ];
@@ -36083,7 +36276,11 @@ in
           sources."assert-plus-1.0.0"
           sources."aws-sign2-0.7.0"
           sources."caseless-0.12.0"
-          sources."form-data-2.3.2"
+          (sources."form-data-2.3.2" // {
+            dependencies = [
+              sources."combined-stream-1.0.6"
+            ];
+          })
           sources."har-validator-5.1.0"
           sources."http-signature-1.2.0"
           sources."oauth-sign-0.9.0"
@@ -36260,7 +36457,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."natives-1.1.4"
+      sources."natives-1.1.5"
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -36292,10 +36489,10 @@ in
       sources."signal-exit-3.0.2"
       sources."sort-keys-1.1.2"
       sources."sort-keys-length-1.0.1"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
       sources."strip-bom-2.0.0"
       sources."strip-indent-1.0.1"
@@ -36320,14 +36517,14 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.2.2";
+    version = "16.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz";
-      sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A==";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz";
+      sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==";
     };
     dependencies = [
       sources."JSONStream-1.3.4"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."acorn-node-1.5.2"
       sources."array-filter-0.0.1"
@@ -36428,7 +36625,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.16"
+      sources."pbkdf2-3.0.17"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."public-encrypt-4.0.2"
@@ -36552,7 +36749,7 @@ in
       sources."codepage-1.4.0"
       sources."colour-0.7.1"
       sources."combined-stream-0.0.7"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
@@ -36648,7 +36845,8 @@ in
       sources."map-obj-1.0.1"
       (sources."mdns-js-1.0.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       (sources."meow-3.7.0" // {
@@ -36797,10 +36995,10 @@ in
       })
       sources."single-line-log-0.4.1"
       sources."sntp-0.1.4"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."speedometer-0.1.4"
       sources."srt2vtt-1.3.1"
       sources."stream-transcoder-0.0.5"
@@ -36817,7 +37015,7 @@ in
       sources."time-line-1.0.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.2"
-      (sources."torrent-stream-1.0.4" // {
+      (sources."torrent-stream-1.1.0" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
           sources."magnet-uri-4.2.3"
@@ -36919,10 +37117,10 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.3.2"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."follow-redirects-1.5.7"
+      sources."follow-redirects-1.5.8"
       sources."has-flag-3.0.0"
       sources."humanize-plus-1.8.2"
       sources."is-buffer-1.1.6"
@@ -36986,24 +37184,27 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "8.0.0";
+    version = "8.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-8.0.0.tgz";
-      sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43";
+      url = "https://registry.npmjs.org/cordova/-/cordova-8.1.1.tgz";
+      sha512 = "YmsGlgz8yiPFcRphTW3LO+6YaCZU5FmoVMOxIti5tbd4Td3JiXiJblpklijryc7jCY6B6seifu9xCVCpfc0AMA==";
     };
     dependencies = [
       sources."JSONStream-1.3.4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."acorn-node-1.5.2"
+      sources."ajv-5.5.2"
       sources."aliasify-2.1.0"
       sources."ansi-0.3.1"
+      sources."ansi-align-2.0.0"
       sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."array-filter-0.0.1"
+      sources."array-find-index-1.0.2"
       sources."array-flatten-1.1.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
@@ -37015,20 +37216,24 @@ in
           sources."util-0.10.3"
         ];
       })
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."async-1.5.2"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.2.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."big-integer-1.6.35"
-      sources."block-stream-0.0.9"
+      sources."big-integer-1.6.36"
       sources."bn.js-4.11.8"
       sources."body-parser-1.18.2"
-      sources."boom-2.10.1"
-      sources."bplist-creator-0.0.7"
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -37058,16 +37263,23 @@ in
       sources."builtins-1.0.3"
       sources."bytes-3.0.0"
       sources."cached-path-relative-1.0.1"
-      sources."caseless-0.11.0"
+      sources."camelcase-4.1.0"
+      sources."capture-stack-trace-1.0.1"
+      sources."caseless-0.12.0"
       sources."chalk-1.1.3"
+      sources."chownr-1.1.1"
+      sources."ci-info-1.6.0"
       sources."cipher-base-1.0.4"
+      sources."cli-boxes-1.0.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-1.1.1"
+      sources."co-4.6.0"
       sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
       sources."combine-source-map-0.8.0"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
-      sources."compressible-2.0.14"
+      sources."combined-stream-1.0.7"
+      sources."compressible-2.0.15"
       sources."compression-1.7.3"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.5.2" // {
@@ -37077,7 +37289,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."configstore-2.1.0"
+      sources."configstore-3.1.2"
       sources."console-browserify-1.1.0"
       sources."constants-browserify-1.0.0"
       sources."content-disposition-0.5.2"
@@ -37093,37 +37305,35 @@ in
           sources."shelljs-0.3.0"
         ];
       })
-      (sources."cordova-fetch-1.3.0" // {
+      (sources."cordova-fetch-1.3.1" // {
         dependencies = [
           sources."glob-7.1.3"
           sources."shelljs-0.7.8"
         ];
       })
       sources."cordova-js-4.2.4"
-      (sources."cordova-lib-8.0.0" // {
+      (sources."cordova-lib-8.1.0" // {
         dependencies = [
           sources."base64-js-1.1.2"
-          sources."glob-7.1.1"
-          sources."nopt-4.0.1"
+          sources."elementtree-0.1.7"
+          sources."glob-7.1.3"
           sources."plist-2.0.1"
-          sources."q-1.0.1"
+          sources."sax-1.1.4"
           sources."shelljs-0.3.0"
-          sources."underscore-1.8.3"
         ];
       })
       sources."cordova-registry-mapper-1.1.15"
       sources."cordova-serve-2.0.1"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
+      sources."create-error-class-3.0.2"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cryptiles-2.0.5"
+      sources."cross-spawn-5.1.0"
       sources."crypto-browserify-3.12.0"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."crypto-random-string-1.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."dashdash-1.14.1"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
       sources."deep-extend-0.6.0"
@@ -37147,21 +37357,21 @@ in
       sources."detective-4.7.1"
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
-      sources."dot-prop-3.0.0"
+      sources."dot-prop-4.2.0"
       sources."duplexer2-0.1.4"
-      sources."duplexify-3.6.0"
+      sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."editor-1.0.0"
       sources."ee-first-1.1.1"
       sources."elementtree-0.1.6"
       sources."elliptic-6.4.1"
       sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
+      sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
       (sources."express-4.16.3" // {
         dependencies = [
@@ -37171,49 +37381,47 @@ in
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."falafel-2.1.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."figures-1.7.0"
       sources."finalhandler-1.1.1"
       sources."foreach-2.0.5"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
+      sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fstream-1.0.11"
       sources."function-bind-1.1.1"
-      sources."generate-function-2.3.1"
-      sources."generate-object-property-1.2.0"
       sources."get-assigned-identifiers-1.2.0"
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."get-stream-3.0.0"
+      sources."getpass-0.1.7"
       sources."glob-5.0.15"
-      (sources."got-3.3.1" // {
-        dependencies = [
-          sources."object-assign-3.0.0"
-        ];
-      })
+      sources."global-dirs-0.1.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
-      sources."har-validator-2.0.6"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.0"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
+      sources."has-flag-3.0.0"
       sources."hash-base-3.0.4"
       sources."hash.js-1.1.5"
-      sources."hawk-3.1.3"
       sources."hmac-drbg-1.0.1"
-      sources."hoek-2.16.3"
       sources."hosted-git-info-2.7.1"
       sources."htmlescape-1.1.1"
       sources."http-errors-1.6.3"
-      sources."http-signature-1.1.1"
+      sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."iconv-lite-0.4.19"
       sources."ieee754-1.1.12"
+      sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indexof-0.0.1"
-      sources."infinity-agent-2.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -37236,51 +37444,57 @@ in
               sources."uuid-2.0.3"
             ];
           })
-          sources."uuid-3.3.2"
+          sources."write-file-atomic-1.3.4"
+          sources."xdg-basedir-2.0.0"
         ];
       })
       sources."interpret-1.1.0"
       sources."ipaddr.js-1.8.0"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
-      sources."is-finite-1.0.2"
+      sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-1.0.0"
-      sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.19.0"
+      sources."is-git-url-1.0.0"
+      sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
-      sources."is-property-1.0.2"
+      sources."is-path-inside-1.0.1"
       sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
+      sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-0.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
-      sources."jsonpointer-4.0.1"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       (sources."labeled-stream-splicer-2.0.1" // {
         dependencies = [
           sources."isarray-2.0.4"
         ];
       })
-      sources."latest-version-1.0.1"
+      sources."latest-version-3.1.0"
       sources."lodash-3.10.1"
       sources."lodash._getnative-3.9.1"
       sources."lodash.debounce-3.1.1"
       sources."lodash.memoize-3.0.4"
+      sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
+      (sources."lru-cache-4.1.3" // {
+        dependencies = [
+          sources."yallist-2.1.2"
+        ];
+      })
+      sources."make-dir-1.3.0"
       sources."md5.js-1.3.4"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -37292,50 +37506,54 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.0"
+      sources."minipass-2.3.4"
+      sources."minizlib-1.1.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."module-deps-4.1.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."negotiator-0.6.1"
-      sources."nested-error-stacks-1.0.2"
-      sources."nopt-3.0.1"
+      sources."nopt-4.0.1"
       sources."normalize-package-data-2.4.0"
       sources."npm-package-arg-6.1.0"
+      sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.8.2"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."object-keys-1.0.12"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."once-1.4.0"
       sources."onetime-1.1.0"
-      sources."opener-1.4.2"
-      sources."opn-5.3.0"
+      sources."opener-1.5.1"
+      sources."opn-5.4.0"
       sources."os-browserify-0.1.2"
       sources."os-homedir-1.0.2"
       sources."os-name-1.0.3"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      (sources."osx-release-1.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
-      sources."package-json-1.2.0"
+      sources."osx-release-1.1.0"
+      sources."p-finally-1.0.0"
+      sources."package-json-4.0.1"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.1"
       sources."parseurl-1.3.2"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
       sources."path-to-regexp-0.1.7"
-      sources."pbkdf2-3.0.16"
-      sources."pegjs-0.10.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
+      sources."pbkdf2-3.0.17"
+      sources."performance-now-2.1.0"
+      sources."pify-3.0.0"
       sources."plist-2.1.0"
       sources."prepend-http-1.0.4"
       sources."process-0.11.10"
@@ -37343,6 +37561,8 @@ in
       sources."promzard-0.3.0"
       sources."properties-parser-0.3.1"
       sources."proxy-addr-2.0.4"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.1.29"
       sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
@@ -37359,13 +37579,9 @@ in
           sources."setprototypeof-1.0.3"
         ];
       })
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."read-1.0.7"
-      sources."read-all-stream-3.1.0"
+      sources."read-chunk-2.1.0"
       sources."read-only-stream-2.0.0"
       (sources."read-package-json-2.0.13" // {
         dependencies = [
@@ -37385,21 +37601,15 @@ in
         ];
       })
       sources."rechoir-0.6.2"
+      sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."repeating-1.1.3"
-      (sources."request-2.79.0" // {
+      (sources."request-2.88.0" // {
         dependencies = [
-          sources."qs-6.3.2"
-          sources."uuid-3.3.2"
+          sources."qs-6.5.2"
         ];
       })
       sources."resolve-1.8.1"
       sources."restore-cursor-1.0.1"
-      (sources."rimraf-2.6.2" // {
-        dependencies = [
-          sources."glob-7.1.3"
-        ];
-      })
       sources."ripemd160-2.0.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
@@ -37413,68 +37623,65 @@ in
       sources."setprototypeof-1.1.0"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."shell-quote-1.6.1"
       sources."shelljs-0.5.3"
+      sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      (sources."simple-plist-0.2.1" // {
-        dependencies = [
-          sources."base64-js-1.1.2"
-          sources."plist-2.0.1"
-        ];
-      })
       sources."slash-1.0.0"
       sources."slide-1.1.6"
-      sources."sntp-1.0.9"
       sources."source-map-0.5.7"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
-      (sources."sshpk-1.14.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."spdx-license-ids-3.0.1"
+      sources."sshpk-1.14.2"
       sources."statuses-1.4.0"
       sources."stream-browserify-2.0.1"
-      sources."stream-buffers-2.2.0"
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.0"
       sources."stream-splicer-2.0.0"
-      sources."string-length-1.0.1"
-      sources."string.prototype.codepointat-0.2.1"
-      sources."string_decoder-1.0.3"
-      sources."stringstream-0.0.6"
-      sources."strip-ansi-3.0.1"
-      sources."strip-json-comments-2.0.1"
-      (sources."subarg-1.0.0" // {
+      (sources."string-width-2.1.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
         ];
       })
+      sources."string.prototype.codepointat-0.2.1"
+      sources."string_decoder-1.0.3"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."strip-json-comments-2.0.1"
+      sources."subarg-1.0.0"
       sources."supports-color-2.0.0"
       sources."syntax-error-1.4.0"
-      sources."tar-2.2.1"
+      sources."tar-4.4.6"
+      sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
-      sources."timed-out-2.0.0"
+      sources."timed-out-4.0.1"
       sources."timers-browserify-1.4.2"
       sources."to-arraybuffer-1.0.1"
-      sources."tough-cookie-2.3.4"
+      sources."tough-cookie-2.4.3"
       sources."tty-browserify-0.0.1"
-      sources."tunnel-agent-0.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
       sources."undeclared-identifiers-1.1.2"
       sources."underscore-1.9.1"
+      sources."unique-string-1.0.0"
       sources."unorm-1.4.1"
       sources."unpipe-1.0.0"
-      (sources."update-notifier-0.5.0" // {
+      sources."unzip-response-2.0.1"
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
-          sources."configstore-1.4.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.1"
+          sources."supports-color-5.5.0"
         ];
       })
       (sources."url-0.11.0" // {
@@ -37482,32 +37689,27 @@ in
           sources."punycode-1.3.2"
         ];
       })
+      sources."url-parse-lax-1.0.0"
       sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-2.0.3"
+      sources."uuid-3.3.2"
       sources."valid-identifier-0.0.1"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."vm-browserify-0.0.4"
+      sources."which-1.3.1"
+      sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
-      (sources."xcode-1.0.0" // {
-        dependencies = [
-          sources."uuid-3.0.1"
-        ];
-      })
-      sources."xdg-basedir-2.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."xmlbuilder-8.2.2"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
+      sources."yallist-3.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37537,7 +37739,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.9.4"
+      sources."@types/node-10.11.2"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -37564,7 +37766,7 @@ in
       sources."custom-error-instance-2.1.1"
       sources."cycle-onionify-4.0.0"
       sources."d-1.0.0"
-      sources."debug-3.1.0"
+      sources."debug-3.2.5"
       sources."delayed-stream-1.0.0"
       sources."es5-ext-0.10.46"
       sources."es6-iterator-2.0.3"
@@ -37592,7 +37794,7 @@ in
       sources."is-promise-2.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash._baseiteratee-4.7.0"
       sources."lodash._basetostring-4.12.0"
       sources."lodash._baseuniq-4.6.0"
@@ -37607,7 +37809,7 @@ in
       sources."mime-types-2.1.20"
       sources."mimic-fn-1.2.0"
       sources."minimist-1.2.0"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."mute-stream-0.0.7"
       sources."next-tick-1.0.0"
       sources."object-assign-4.1.1"
@@ -37670,7 +37872,7 @@ in
     packageName = "create-react-app";
     version = "1.5.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz";
+      url = "http://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz";
       sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ==";
     };
     dependencies = [
@@ -37682,7 +37884,7 @@ in
       sources."buffer-from-0.1.2"
       sources."builtins-1.0.3"
       sources."chalk-1.1.3"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.2"
@@ -37762,10 +37964,10 @@ in
   create-react-native-app = nodeEnv.buildNodePackage {
     name = "create-react-native-app";
     packageName = "create-react-native-app";
-    version = "1.0.0";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-1.0.0.tgz";
-      sha1 = "fc6046f4407bde2727ce0c4eb1354bb1a8c0f9e6";
+      url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-2.0.2.tgz";
+      sha512 = "xsPgOifP3TJtd+UvqhB4X9amYJq548m8vupcqBukWll2gi3UBu2KigWNtASwVUd6UTYlrJHw3g5Bow9c+/UBmQ==";
     };
     dependencies = [
       sources."ansi-styles-3.2.1"
@@ -37888,7 +38090,7 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       sources."circular-append-file-1.0.1"
       sources."cli-boxes-1.0.0"
       sources."cli-spinners-1.3.1"
@@ -37899,7 +38101,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.3.2"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."configstore-3.1.2"
@@ -37932,12 +38134,16 @@ in
           sources."neat-log-2.4.0"
         ];
       })
-      sources."dat-node-3.5.12"
+      sources."dat-node-3.5.13"
       sources."dat-registry-4.0.0"
       sources."dat-secret-storage-4.0.1"
-      sources."dat-storage-1.0.4"
+      sources."dat-storage-1.1.1"
       sources."dat-swarm-defaults-1.0.1"
-      sources."debug-3.1.0"
+      (sources."debug-3.2.5" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."deep-equal-0.2.2"
       sources."deep-extend-0.6.0"
       sources."delayed-stream-1.0.0"
@@ -37950,7 +38156,7 @@ in
         ];
       })
       sources."discovery-swarm-5.1.2"
-      (sources."dns-discovery-6.1.0" // {
+      (sources."dns-discovery-6.2.2" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."lru-2.0.1"
@@ -37984,7 +38190,11 @@ in
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
       sources."get-stream-3.0.0"
@@ -38001,14 +38211,14 @@ in
       sources."has-flag-3.0.0"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.18.2" // {
+      (sources."hypercore-6.19.1" // {
         dependencies = [
           sources."process-nextick-args-1.0.7"
           sources."unordered-set-2.0.1"
         ];
       })
       sources."hypercore-crypto-1.0.0"
-      (sources."hypercore-protocol-6.6.4" // {
+      (sources."hypercore-protocol-6.7.1" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -38026,7 +38236,7 @@ in
       sources."ip-1.1.5"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.4"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
@@ -38097,14 +38307,14 @@ in
       })
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
-      sources."multicast-dns-7.0.1"
+      sources."multicast-dns-7.2.0"
       sources."multicb-1.2.2"
       sources."multistream-2.1.1"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
       sources."nan-2.11.0"
       sources."nanoassert-1.1.0"
-      sources."nanobus-4.3.3"
+      sources."nanobus-4.3.4"
       sources."nanoscheduler-1.0.3"
       sources."nanotiming-7.3.1"
       sources."ncp-1.0.1"
@@ -38191,7 +38401,7 @@ in
       sources."siphash24-1.1.1"
       sources."slice-ansi-1.0.0"
       sources."sodium-javascript-0.5.5"
-      sources."sodium-native-2.2.1"
+      sources."sodium-native-2.2.2"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.2.0"
       sources."sorted-indexof-1.0.0"
@@ -38572,7 +38782,7 @@ in
         ];
       })
       sources."string_decoder-0.10.31"
-      (sources."tar-stream-1.6.1" // {
+      (sources."tar-stream-1.6.2" // {
         dependencies = [
           sources."bl-1.2.2"
           sources."isarray-1.0.0"
@@ -38608,10 +38818,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.19";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.19.tgz";
-      sha512 = "vGWC/duKn+EgF3wQMQa2x21w1L1KTqKNydAvw0e2kShD1n/iNVekeF1e8juND/ttZW4yDvHLp4y10ZfoZ4st/Q==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.4.0.tgz";
+      sha512 = "DHK6WpqZf5VTW9PK2UjkRADDacT6c2fsHFCy0pQ8c1VYUWz/zI5OGzBBPg5HTZbvTgY+AXJ3JHUB3E7Esktlog==";
     };
     dependencies = [
       sources."JSONStream-1.3.4"
@@ -38620,7 +38830,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.307.0"
+      sources."aws-sdk-2.325.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
@@ -38628,7 +38838,7 @@ in
       sources."buffer-4.9.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."decimal.js-10.0.1"
@@ -38640,7 +38850,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.0"
@@ -38657,7 +38871,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lossless-json-1.0.3"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
@@ -38733,21 +38947,35 @@ in
       sources."anymatch-1.3.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-unique-0.2.1"
       sources."asn1-0.2.4"
       sources."assert-plus-0.2.0"
+      sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
+      sources."atob-2.1.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."binstall-1.2.0"
       sources."block-stream-0.0.9"
       sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."caseless-0.11.0"
       (sources."chalk-2.1.0" // {
         dependencies = [
@@ -38755,11 +38983,32 @@ in
         ];
       })
       sources."chokidar-1.6.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
+      sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.0"
       sources."cryptiles-2.0.5"
@@ -38768,12 +39017,24 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."escape-string-regexp-1.0.5"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
       sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."extglob-0.3.2"
       sources."extsprintf-1.3.0"
       sources."filename-regex-2.0.1"
@@ -38790,12 +39051,14 @@ in
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
+      sources."fragment-cache-0.2.1"
       sources."fs-extra-0.30.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.1.2"
       sources."fstream-1.0.11"
       sources."generate-function-2.3.1"
       sources."generate-object-property-1.2.0"
+      sources."get-value-2.0.6"
       (sources."getpass-0.1.7" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -38813,13 +39076,43 @@ in
       })
       sources."has-ansi-2.0.0"
       sources."has-flag-2.0.0"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."hawk-3.1.3"
       sources."hoek-2.16.3"
       sources."http-signature-1.1.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
@@ -38828,10 +39121,16 @@ in
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.19.0"
       sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-property-1.0.2"
       sources."is-typedarray-1.0.0"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-2.1.0"
@@ -38850,19 +39149,34 @@ in
       sources."klaw-1.3.1"
       sources."lodash-4.13.1"
       sources."lru-cache-4.1.3"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
+      sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
       sources."nan-2.11.0"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       (sources."node-elm-compiler-4.3.3" // {
         dependencies = [
           sources."lodash-4.14.2"
@@ -38870,13 +39184,37 @@ in
       })
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.8.2"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."once-1.4.0"
       sources."os-tmpdir-1.0.2"
       sources."parse-glob-3.0.4"
+      sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."posix-character-classes-0.1.1"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
@@ -38889,23 +39227,127 @@ in
         ];
       })
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      (sources."readdirp-2.2.1" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+        ];
+      })
       sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."request-2.79.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
       sources."sntp-1.0.9"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
       sources."split-1.0.1"
+      sources."split-string-3.1.0"
       (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
       })
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
@@ -38917,9 +39359,35 @@ in
         ];
       })
       sources."through-2.3.8"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
       (sources."verror-1.10.0" // {
@@ -38995,7 +39463,7 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."conf-1.4.0"
-      sources."convert-source-map-1.5.1"
+      sources."convert-source-map-1.6.0"
       sources."core-js-2.5.7"
       sources."cross-spawn-5.1.0"
       sources."currently-unhandled-0.4.1"
@@ -39055,7 +39523,7 @@ in
         ];
       })
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.debounce-4.0.8"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
@@ -39134,10 +39602,10 @@ in
       sources."slash-1.0.0"
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."strip-ansi-4.0.0"
@@ -39181,17 +39649,17 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "5.5.0";
+    version = "5.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz";
-      sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz";
+      sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
       sources."@babel/highlight-7.0.0"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."acorn-jsx-4.1.1"
-      sources."ajv-6.5.3"
+      sources."ajv-6.5.4"
       sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
@@ -39213,7 +39681,7 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
-      sources."debug-3.1.0"
+      sources."debug-4.0.1"
       sources."deep-is-0.1.3"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
@@ -39259,12 +39727,12 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       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."ms-2.1.1"
       sources."mute-stream-0.0.7"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
@@ -39289,7 +39757,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."shebang-command-1.2.0"
@@ -39325,17 +39793,17 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "7.1.0";
+    version = "7.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.1.0.tgz";
-      sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA==";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.1.1.tgz";
+      sha512 = "kmFnV0ohxSzVNA7/axp4MlLX+uZEY8uDF70RCtrpFcSgEB8PE9mWStv4JJMfYfSVIaJdsZBkhzj8S+BLIN7A+w==";
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
       sources."@babel/highlight-7.0.0"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."acorn-jsx-4.1.1"
-      sources."ajv-6.5.3"
+      sources."ajv-6.5.4"
       sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
@@ -39357,12 +39825,12 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
-      sources."debug-3.1.0"
+      sources."debug-4.0.1"
       sources."deep-is-0.1.3"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-5.5.0"
+      sources."eslint-5.6.1"
       sources."eslint-scope-4.0.0"
       sources."eslint-utils-1.3.1"
       sources."eslint-visitor-keys-1.0.0"
@@ -39404,12 +39872,12 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       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."ms-2.1.1"
       sources."mute-stream-0.0.7"
       sources."nanolru-1.0.0"
       sources."natural-compare-1.4.0"
@@ -39437,7 +39905,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."shebang-command-1.2.0"
@@ -39517,7 +39985,7 @@ in
       sources."co-4.6.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.2"
       sources."currently-unhandled-0.4.1"
@@ -39527,7 +39995,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."escape-string-regexp-1.0.5"
       sources."exit-hook-1.1.1"
       sources."extend-3.0.2"
@@ -39538,7 +40006,11 @@ in
       sources."fd-slicer-1.0.1"
       sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-extra-1.0.0"
       sources."get-stdin-4.0.1"
       sources."getpass-0.1.7"
@@ -39636,10 +40108,10 @@ in
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
@@ -39708,11 +40180,20 @@ in
       sources."anymatch-1.3.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-unique-0.2.1"
+      sources."assign-symbols-1.0.0"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
+      sources."atob-2.1.2"
       sources."balanced-match-1.0.0"
-      sources."binary-extensions-1.11.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."binary-extensions-1.12.0"
       sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
       (sources."broadway-0.3.6" // {
@@ -39721,19 +40202,52 @@ in
           sources."winston-0.8.0"
         ];
       })
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."caller-0.0.1"
       sources."chokidar-1.7.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
       (sources."cliff-0.1.10" // {
         dependencies = [
           sources."colors-1.0.3"
         ];
       })
       sources."clone-1.0.4"
+      sources."collection-visit-1.0.0"
       sources."colors-0.6.2"
+      sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
       sources."deep-equal-0.1.2"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."defined-0.0.0"
       sources."director-1.2.7"
       (sources."event-stream-0.5.3" // {
@@ -39744,6 +40258,11 @@ in
       sources."eventemitter2-0.4.14"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."extglob-0.3.2"
       sources."eyes-0.1.8"
       sources."filename-regex-2.0.1"
@@ -39756,43 +40275,96 @@ in
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-monitor-1.7.1"
+      sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
+      sources."get-value-2.0.6"
       sources."glob-7.1.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."i-0.3.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
       sources."is-extglob-1.0.0"
       sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isobject-2.1.0"
       sources."isstream-0.1.2"
       sources."jsonify-0.0.0"
       sources."kind-of-3.2.2"
       sources."lazy-1.0.11"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
+      sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.11.0"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       (sources."nconf-0.6.9" // {
         dependencies = [
           sources."async-0.2.9"
@@ -39803,12 +40375,36 @@ in
       sources."normalize-path-2.1.1"
       sources."nssocket-0.5.3"
       sources."object-assign-3.0.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."once-1.4.0"
       sources."optimist-0.6.1"
       sources."parse-glob-3.0.4"
+      sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."pkginfo-0.3.1"
+      sources."posix-character-classes-0.1.1"
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
@@ -39827,23 +40423,153 @@ in
       })
       sources."read-1.0.7"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      (sources."readdirp-2.2.1" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+        ];
+      })
       sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
+      sources."resolve-url-0.2.1"
       sources."resumer-0.0.0"
+      sources."ret-0.1.15"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
-      sources."set-immediate-shim-1.0.1"
+      sources."safe-regex-1.1.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."shush-1.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."split-string-3.1.0"
       sources."stack-trace-0.0.10"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
       sources."strip-json-comments-0.1.3"
       sources."tape-2.3.3"
       sources."through-2.3.8"
       sources."timespan-2.3.0"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."utile-0.2.1"
       sources."winston-0.8.3"
@@ -39869,13 +40595,13 @@ in
     };
     dependencies = [
       sources."async-2.6.1"
-      sources."debug-3.1.0"
-      sources."lodash-4.17.10"
+      sources."debug-4.0.1"
+      sources."lodash-4.17.11"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
-      sources."ms-2.0.0"
-      sources."simple-git-1.96.0"
+      sources."ms-2.1.1"
+      sources."simple-git-1.102.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -39900,7 +40626,7 @@ in
       sources."chloride-2.2.10"
       sources."chloride-test-1.2.2"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.6.0"
       sources."diff-3.5.0"
       sources."ed2curve-0.1.4"
       sources."emoji-named-characters-1.0.2"
@@ -39920,7 +40646,7 @@ in
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.19.0"
       sources."is-property-1.0.2"
-      sources."is-valid-domain-0.0.5"
+      sources."is-valid-domain-0.0.6"
       sources."json-buffer-2.0.11"
       sources."jsonpointer-4.0.1"
       sources."kvgraph-0.1.0"
@@ -39939,7 +40665,7 @@ in
       })
       sources."moment-2.22.2"
       sources."multicb-1.2.2"
-      sources."multiserver-1.13.3"
+      sources."multiserver-1.13.5"
       sources."muxrpc-6.4.1"
       sources."nan-2.11.0"
       sources."node-gyp-build-3.4.0"
@@ -39950,7 +40676,7 @@ in
       sources."packet-stream-2.0.4"
       sources."packet-stream-codec-1.1.2"
       sources."pako-1.0.6"
-      sources."private-box-0.2.1"
+      sources."private-box-0.3.0"
       sources."progress-1.1.8"
       sources."pull-block-filter-1.0.0"
       sources."pull-box-stream-1.0.13"
@@ -39996,15 +40722,11 @@ in
         ];
       })
       sources."pull-ws-3.3.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."deep-extend-0.6.0"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."relative-url-1.0.2"
       sources."remove-markdown-0.1.0"
       sources."safe-buffer-5.1.2"
-      sources."secret-handshake-1.1.13"
+      sources."secret-handshake-1.1.14"
       sources."semver-5.5.1"
       sources."separator-escape-0.0.0"
       sources."sha.js-2.4.5"
@@ -40016,16 +40738,16 @@ in
           sources."sha.js-2.4.11"
         ];
       })
-      sources."sodium-chloride-1.1.0"
-      sources."sodium-native-2.2.1"
+      sources."sodium-chloride-1.1.2"
+      sources."sodium-native-2.2.2"
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.2.0"
+      sources."ssb-config-2.3.2"
       sources."ssb-git-0.5.0"
       sources."ssb-git-repo-2.8.3"
       sources."ssb-issues-1.0.0"
-      sources."ssb-keys-7.0.16"
+      sources."ssb-keys-7.1.3"
       sources."ssb-marked-0.6.0"
       (sources."ssb-mentions-0.1.2" // {
         dependencies = [
@@ -40039,7 +40761,7 @@ in
       })
       sources."ssb-msgs-5.2.0"
       sources."ssb-pull-requests-1.0.0"
-      sources."ssb-ref-2.11.2"
+      sources."ssb-ref-2.12.0"
       (sources."stream-to-pull-stream-1.7.2" // {
         dependencies = [
           sources."looper-3.0.0"
@@ -40082,10 +40804,10 @@ in
   graphql-cli = nodeEnv.buildNodePackage {
     name = "graphql-cli";
     packageName = "graphql-cli";
-    version = "2.16.5";
+    version = "2.16.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-2.16.5.tgz";
-      sha512 = "a2QYKmjc6H/39ZGpcKGNQIGAtz84BIVYw9LyYy3Iv1cxJ46zeRgyLBdl8vk+f1aYjQ80TAGHL2+qlIKBD7mDfg==";
+      url = "https://registry.npmjs.org/graphql-cli/-/graphql-cli-2.16.7.tgz";
+      sha512 = "I1kkJ9mqgctjOHDTo3bg7CLpZDeuLrOhKeNmohWhka2bWb0jf5T9IspHLDDTIEsOB56KEnvW2fUwRsTFHJK2HQ==";
     };
     dependencies = [
       sources."@babel/generator-7.0.0-beta.38"
@@ -40150,7 +40872,7 @@ in
       sources."chalk-2.4.1"
       sources."change-case-3.0.2"
       sources."chardet-0.4.2"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
@@ -40167,9 +40889,9 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."command-exists-1.2.7"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."common-tags-1.8.0"
       sources."concat-map-0.0.1"
       sources."configstore-3.1.2"
@@ -40224,7 +40946,7 @@ in
       sources."encoding-0.1.12"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."es6-promisify-5.0.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -40238,15 +40960,16 @@ in
       })
       sources."expand-tilde-2.0.2"
       sources."express-4.16.3"
-      (sources."express-request-proxy-2.2.0" // {
+      (sources."express-request-proxy-2.2.2" // {
         dependencies = [
           (sources."body-parser-1.18.3" // {
             dependencies = [
               sources."debug-2.6.9"
             ];
           })
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."iconv-lite-0.4.23"
+          sources."ms-2.1.1"
           sources."path-to-regexp-1.7.0"
           sources."qs-6.5.2"
           sources."raw-body-2.3.3"
@@ -40262,7 +40985,11 @@ in
       sources."find-0.2.9"
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."format-util-1.0.3"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
@@ -40280,9 +41007,10 @@ in
       sources."graphcool-json-schema-1.2.1"
       (sources."graphcool-yml-0.4.15" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."dotenv-4.0.0"
           sources."fs-extra-4.0.3"
+          sources."ms-2.1.1"
         ];
       })
       (sources."graphql-0.13.2" // {
@@ -40299,7 +41027,7 @@ in
       sources."graphql-config-2.0.1"
       sources."graphql-config-extension-graphcool-1.0.8"
       sources."graphql-config-extension-openapi-1.0.6"
-      sources."graphql-config-extension-prisma-0.0.11"
+      sources."graphql-config-extension-prisma-0.2.1"
       sources."graphql-import-0.4.5"
       (sources."graphql-playground-html-1.5.5" // {
         dependencies = [
@@ -40325,7 +41053,8 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."iconv-lite-0.4.24"
@@ -40341,7 +41070,7 @@ in
       sources."ipaddr.js-1.8.0"
       sources."is-arrayish-0.2.1"
       sources."is-builtin-module-1.0.0"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-directory-0.3.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-installed-globally-0.1.0"
@@ -40374,7 +41103,8 @@ in
       sources."json-schema-0.2.3"
       (sources."json-schema-ref-parser-3.3.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."json-schema-traverse-0.3.1"
@@ -40394,7 +41124,7 @@ in
       sources."lcid-1.0.0"
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.get-4.4.2"
       sources."lodash.includes-4.3.0"
       sources."lodash.isboolean-3.0.3"
@@ -40448,9 +41178,9 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."ono-4.0.7"
+      sources."ono-4.0.8"
       sources."open-0.0.5"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."ora-1.4.0"
       sources."os-locale-2.1.0"
       sources."os-tmpdir-1.0.2"
@@ -40475,11 +41205,12 @@ in
       sources."performance-now-2.1.0"
       sources."pify-2.3.0"
       sources."prepend-http-1.0.4"
-      sources."prisma-json-schema-0.0.4"
-      (sources."prisma-yml-1.0.50" // {
+      sources."prisma-json-schema-0.1.1"
+      (sources."prisma-yml-1.0.93" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."dotenv-4.0.0"
+          sources."ms-2.1.1"
         ];
       })
       sources."process-nextick-args-2.0.0"
@@ -40553,10 +41284,10 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
       sources."statuses-1.4.0"
@@ -40602,7 +41333,7 @@ in
       sources."utils-merge-1.0.1"
       sources."uuid-3.3.2"
       sources."validate-npm-package-license-3.0.4"
-      sources."validator-10.7.1"
+      sources."validator-10.8.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
@@ -40630,7 +41361,7 @@ in
         ];
       })
       sources."yargs-parser-8.1.0"
-      sources."z-schema-3.23.0"
+      sources."z-schema-3.24.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -41222,7 +41953,7 @@ in
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
-      sources."natives-1.1.4"
+      sources."natives-1.1.5"
       sources."object-assign-3.0.0"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -41418,15 +42149,26 @@ in
   htmlhint = nodeEnv.buildNodePackage {
     name = "htmlhint";
     packageName = "htmlhint";
-    version = "0.10.0";
+    version = "0.10.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz";
-      sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw==";
+      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.1.tgz";
+      sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w==";
     };
     dependencies = [
+      sources."@yarnpkg/lockfile-1.1.0"
+      sources."abbrev-1.1.1"
+      sources."agent-base-4.2.1"
       sources."ajv-5.5.2"
+      sources."ansi-escapes-3.1.0"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."ansicolors-0.3.2"
+      sources."archy-1.0.0"
+      sources."argparse-1.0.10"
+      sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."ast-types-0.11.5"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -41435,29 +42177,49 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
+      sources."bytes-3.0.0"
+      sources."camelcase-2.1.1"
       sources."caseless-0.12.0"
+      sources."chalk-2.4.1"
+      sources."chardet-0.4.2"
       sources."cli-1.0.1"
-      sources."clone-2.1.2"
-      sources."co-4.6.0"
-      sources."colors-1.3.2"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
-      sources."concat-map-0.0.1"
-      (sources."concat-stream-1.6.2" // {
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      (sources."cliui-3.2.0" // {
         dependencies = [
-          sources."isarray-1.0.0"
-          sources."readable-stream-2.3.6"
-          sources."string_decoder-1.1.1"
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
         ];
       })
+      sources."clone-2.1.2"
+      sources."clone-deep-0.3.0"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.3.2"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.17.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."configstore-3.1.2"
       sources."console-browserify-1.1.0"
+      sources."core-js-2.3.0"
       sources."core-util-is-1.0.2"
+      sources."crypto-random-string-1.0.0"
       sources."csslint-1.0.5"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
+      sources."data-uri-to-buffer-1.2.0"
       sources."date-now-0.1.4"
-      sources."debug-2.6.9"
+      sources."debug-3.2.5"
+      sources."decamelize-1.2.0"
+      sources."deep-is-0.1.3"
+      sources."degenerator-1.0.4"
       sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
@@ -41467,41 +42229,115 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
       sources."domutils-1.5.1"
+      sources."dot-prop-4.2.0"
       sources."ecc-jsbn-0.1.2"
+      sources."email-validator-2.0.4"
       sources."entities-1.0.0"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
+      sources."es6-promisify-5.0.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.11.0"
+      sources."esprima-3.1.3"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
       sources."exit-0.1.2"
       sources."extend-3.0.2"
-      sources."extract-zip-1.6.7"
+      sources."external-editor-2.2.0"
+      (sources."extract-zip-1.6.7" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."extsprintf-1.3.0"
       sources."eyes-0.1.8"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-levenshtein-2.0.6"
       sources."fd-slicer-1.0.1"
+      sources."figures-2.0.0"
+      sources."file-uri-to-path-1.0.0"
+      sources."for-in-1.0.2"
+      sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-extra-1.0.0"
       sources."fs.realpath-1.0.0"
+      (sources."ftp-0.3.10" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+        ];
+      })
+      (sources."get-uri-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."glob-7.1.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
+      sources."graphlib-2.1.5"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.0"
+      sources."has-flag-3.0.0"
+      (sources."hasbin-1.2.3" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
       sources."hasha-2.2.0"
-      sources."htmlparser2-3.8.3"
+      sources."hosted-git-info-2.7.1"
+      (sources."htmlparser2-3.8.3" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+        ];
+      })
+      sources."http-errors-1.6.3"
+      (sources."http-proxy-agent-2.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."http-signature-1.2.0"
+      sources."https-proxy-agent-2.2.1"
+      sources."iconv-lite-0.4.24"
+      sources."immediate-3.0.6"
+      sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."inquirer-3.3.0"
+      sources."invert-kv-1.0.0"
+      sources."ip-1.1.5"
+      sources."is-buffer-1.1.6"
       sources."is-dotfile-1.0.3"
+      sources."is-extendable-0.1.1"
       sources."is-extglob-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-2.0.1"
+      sources."is-obj-1.0.1"
+      sources."is-plain-object-2.0.4"
+      sources."is-promise-2.1.0"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
       sources."isstream-0.1.2"
+      (sources."js-yaml-3.12.0" // {
+        dependencies = [
+          sources."esprima-4.0.1"
+        ];
+      })
       sources."jsbn-0.1.1"
       (sources."jshint-2.9.6" // {
         dependencies = [
@@ -41513,62 +42349,220 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-2.4.0"
       sources."jsprim-1.4.1"
+      (sources."jszip-3.1.5" // {
+        dependencies = [
+          sources."es6-promise-3.0.2"
+          sources."isarray-1.0.0"
+          sources."process-nextick-args-1.0.7"
+          sources."readable-stream-2.0.6"
+        ];
+      })
       sources."kew-0.7.0"
+      sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.10"
+      sources."lazy-cache-0.2.7"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."lie-3.1.1"
+      sources."lodash-4.17.11"
+      sources."lodash.assign-4.2.0"
+      sources."lodash.assignin-4.2.0"
+      sources."lodash.clonedeep-4.5.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.get-4.4.2"
+      sources."lodash.set-4.3.2"
+      sources."lru-cache-4.1.3"
+      sources."macos-release-1.1.0"
+      sources."make-dir-1.3.0"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
+      sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
+      (sources."mixin-object-2.0.1" // {
+        dependencies = [
+          sources."for-in-0.1.8"
+        ];
+      })
       sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
+      sources."mute-stream-0.0.7"
+      (sources."nconf-0.10.0" // {
+        dependencies = [
+          sources."async-1.5.2"
+        ];
+      })
+      (sources."needle-2.2.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."netmask-1.0.6"
+      sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."opn-5.4.0"
+      sources."optionator-0.8.2"
+      sources."os-locale-1.4.0"
+      sources."os-name-2.0.1"
+      sources."os-tmpdir-1.0.2"
+      sources."pac-proxy-agent-2.0.2"
+      sources."pac-resolver-3.0.0"
+      sources."pako-1.0.6"
       sources."parse-glob-3.0.4"
       sources."parserlib-1.1.1"
+      sources."path-0.12.7"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."phantom-4.0.12"
       sources."phantomjs-prebuilt-2.1.16"
+      sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."prelude-ls-1.1.2"
+      sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."progress-1.1.8"
+      sources."promise-7.3.1"
+      sources."proxy-agent-2.3.1"
+      sources."proxy-from-env-1.0.0"
+      sources."pseudomap-1.0.2"
       sources."psl-1.1.29"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
-      sources."readable-stream-1.1.14"
+      (sources."raw-body-2.3.3" // {
+        dependencies = [
+          sources."iconv-lite-0.4.23"
+        ];
+      })
+      (sources."readable-stream-2.3.6" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."recursive-readdir-2.2.2"
       sources."request-2.88.0"
       sources."request-progress-2.0.1"
+      sources."restore-cursor-2.0.0"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."secure-keys-1.0.0"
+      sources."semver-5.5.1"
+      sources."setprototypeof-1.1.0"
+      (sources."shallow-clone-0.1.2" // {
+        dependencies = [
+          sources."kind-of-2.0.1"
+        ];
+      })
       sources."shelljs-0.3.0"
+      sources."signal-exit-3.0.2"
+      sources."smart-buffer-1.1.15"
+      sources."snyk-1.99.1"
+      sources."snyk-config-2.2.0"
+      sources."snyk-docker-plugin-1.11.0"
+      sources."snyk-go-plugin-1.5.2"
+      sources."snyk-gradle-plugin-2.0.1"
+      sources."snyk-module-1.8.2"
+      sources."snyk-mvn-plugin-2.0.0"
+      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
+        dependencies = [
+          sources."lodash-4.17.10"
+        ];
+      })
+      sources."snyk-nuget-plugin-1.6.5"
+      sources."snyk-php-plugin-1.5.1"
+      sources."snyk-policy-1.12.0"
+      sources."snyk-python-plugin-1.8.1"
+      sources."snyk-resolve-1.0.1"
+      sources."snyk-resolve-deps-3.1.0"
+      sources."snyk-sbt-plugin-2.0.0"
+      sources."snyk-tree-1.0.0"
+      sources."snyk-try-require-1.3.1"
+      sources."socks-1.1.10"
+      sources."socks-proxy-agent-3.0.1"
+      sources."source-map-0.6.1"
+      sources."source-map-support-0.5.9"
       sources."split-1.0.1"
+      sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
       sources."stack-trace-0.0.10"
+      sources."statuses-1.5.0"
+      sources."string-width-2.1.1"
       sources."string_decoder-0.10.31"
+      sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
+      sources."supports-color-5.5.0"
+      sources."temp-dir-1.0.0"
+      sources."tempfile-2.0.0"
+      sources."then-fs-2.0.0"
       sources."throttleit-1.0.0"
       sources."through-2.3.8"
+      sources."thunkify-2.1.2"
+      sources."tmp-0.0.33"
+      sources."toml-2.3.3"
       sources."tough-cookie-2.4.3"
+      sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
+      sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."unicode-5.2.0-0.7.5"
+      sources."unique-string-1.0.0"
+      sources."unpipe-1.0.0"
+      sources."util-0.10.4"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
       sources."verror-1.10.0"
       sources."which-1.3.1"
+      sources."win-release-1.1.1"
+      sources."window-size-0.1.4"
       (sources."winston-2.4.4" // {
         dependencies = [
           sources."async-1.0.0"
           sources."colors-1.0.3"
         ];
       })
+      sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
       sources."wrappy-1.0.2"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."xml-1.0.1"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+      sources."xregexp-2.0.0"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-3.32.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
       sources."yauzl-2.4.1"
     ];
     buildInputs = globalBuildInputs;
@@ -41610,50 +42604,72 @@ in
     production = true;
     bypassCache = true;
   };
+  http-server = nodeEnv.buildNodePackage {
+    name = "http-server";
+    packageName = "http-server";
+    version = "0.11.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/http-server/-/http-server-0.11.1.tgz";
+      sha512 = "6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."colors-1.0.3"
+      sources."corser-2.0.1"
+      sources."debug-3.1.0"
+      sources."ecstatic-3.3.0"
+      sources."eventemitter3-3.1.0"
+      sources."follow-redirects-1.5.8"
+      sources."he-1.2.0"
+      sources."http-proxy-1.17.0"
+      sources."mime-1.6.0"
+      sources."minimist-1.2.0"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."ms-2.0.0"
+      sources."opener-1.4.3"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
+      (sources."portfinder-1.0.17" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."qs-2.3.3"
+      sources."requires-port-1.0.0"
+      sources."union-0.4.6"
+      sources."url-join-2.0.5"
+      sources."wordwrap-0.0.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A simple zero-configuration command-line http server";
+      homepage = "https://github.com/indexzero/http-server#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "4.1.1";
+    version = "4.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-4.1.1.tgz";
-      sha512 = "KIBfTmB2d1ZWs9xuaZomqp7LnpkCsyUh5ywP2q109zDE8SNviP0Qs/NeRbX7MMr3ujZozddCZ1BcFtyIRrgKEA==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-4.1.2.tgz";
+      sha512 = "iZOKZI7MRcIi2zgmPJ20Gj4SWPBp7FG87yw3akHhFdGR+OnPqsm/6Zy7/b0jRdMjFk6srlhtVmKgHvXYX3EZhw==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-1.0.6"
-      sources."@ionic/cli-utils-2.2.0"
+      sources."@ionic/cli-framework-1.0.7"
+      sources."@ionic/cli-utils-2.2.1"
       sources."@ionic/discover-1.0.4"
-      sources."@types/cross-spawn-6.0.0"
-      sources."@types/debug-0.0.30"
-      sources."@types/events-1.2.0"
-      sources."@types/glob-5.0.35"
-      sources."@types/inquirer-0.0.43"
-      sources."@types/klaw-2.1.1"
-      sources."@types/lodash-4.14.116"
-      sources."@types/make-dir-1.0.3"
-      sources."@types/minimatch-3.0.3"
-      sources."@types/minimist-1.2.0"
-      sources."@types/ncp-2.0.1"
-      sources."@types/node-6.0.117"
-      sources."@types/rimraf-2.0.2"
-      sources."@types/rx-4.1.1"
-      sources."@types/rx-core-4.0.3"
-      sources."@types/rx-core-binding-4.0.4"
-      sources."@types/rx-lite-4.0.5"
-      sources."@types/rx-lite-aggregates-4.0.3"
-      sources."@types/rx-lite-async-4.0.2"
-      sources."@types/rx-lite-backpressure-4.0.3"
-      sources."@types/rx-lite-coincidence-4.0.3"
-      sources."@types/rx-lite-experimental-4.0.1"
-      sources."@types/rx-lite-joinpatterns-4.0.1"
-      sources."@types/rx-lite-testing-4.0.1"
-      sources."@types/rx-lite-time-4.0.3"
-      sources."@types/rx-lite-virtualtime-4.0.3"
-      sources."@types/string-width-2.0.0"
-      sources."@types/strip-ansi-3.0.0"
-      sources."@types/through-0.0.29"
-      sources."@types/untildify-3.0.0"
-      sources."@types/wrap-ansi-3.0.0"
-      sources."@types/write-file-atomic-2.1.1"
+      sources."@ionic/utils-fs-0.0.1"
+      sources."@ionic/utils-network-0.0.1"
       sources."agent-base-4.2.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
@@ -41670,8 +42686,8 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.1"
       sources."chardet-0.7.0"
-      sources."chownr-1.0.1"
-      sources."ci-info-1.4.0"
+      sources."chownr-1.1.1"
+      sources."ci-info-1.6.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
@@ -41688,7 +42704,11 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."data-uri-to-buffer-1.2.0"
-      sources."debug-3.1.0"
+      (sources."debug-3.2.5" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
@@ -41699,7 +42719,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
       sources."elementtree-0.1.7"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.11.0"
@@ -41735,7 +42755,11 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."http-errors-1.6.3"
-      sources."http-proxy-agent-2.1.0"
+      (sources."http-proxy-agent-2.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.24"
       sources."import-lazy-2.1.0"
@@ -41745,7 +42769,7 @@ in
       sources."ini-1.3.5"
       sources."inquirer-6.2.0"
       sources."ip-1.1.5"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -41758,7 +42782,6 @@ in
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."klaw-3.0.0"
       sources."latest-version-3.1.0"
       (sources."leek-0.0.24" // {
         dependencies = [
@@ -41766,7 +42789,7 @@ in
         ];
       })
       sources."levn-0.3.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash._baseassign-3.2.0"
       sources."lodash._basecopy-3.0.1"
       sources."lodash._bindcallback-3.0.1"
@@ -41807,7 +42830,7 @@ in
       sources."npm-run-path-2.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."optionator-0.8.2"
       sources."os-name-2.0.1"
       sources."os-tmpdir-1.0.2"
@@ -41839,7 +42862,7 @@ in
       sources."rimraf-2.6.2"
       sources."rsvp-3.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
@@ -41892,7 +42915,7 @@ in
       sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."wordwrap-1.0.0"
-      sources."wrap-ansi-3.0.1"
+      sources."wrap-ansi-4.0.0"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.3.0"
       sources."ws-6.0.0"
@@ -41937,21 +42960,13 @@ in
     };
     dependencies = [
       sources."abbrev-1.0.9"
-      sources."align-text-0.1.4"
       sources."amdefine-1.0.1"
       sources."argparse-1.0.10"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."camelcase-1.2.1"
-      sources."center-align-0.1.3"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."commander-2.17.1"
       sources."concat-map-0.0.1"
-      sources."decamelize-1.2.0"
       sources."deep-is-0.1.3"
       sources."escodegen-1.8.1"
       sources."esprima-2.7.3"
@@ -41959,25 +42974,23 @@ in
       sources."esutils-2.0.2"
       sources."fast-levenshtein-2.0.6"
       sources."glob-5.0.15"
-      (sources."handlebars-4.0.11" // {
+      (sources."handlebars-4.0.12" // {
         dependencies = [
-          sources."source-map-0.4.4"
+          sources."async-2.6.1"
+          sources."source-map-0.6.1"
         ];
       })
       sources."has-flag-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."is-buffer-1.1.6"
       sources."isexe-2.0.0"
       (sources."js-yaml-3.12.0" // {
         dependencies = [
           sources."esprima-4.0.1"
         ];
       })
-      sources."kind-of-3.2.2"
-      sources."lazy-cache-1.0.4"
       sources."levn-0.3.0"
-      sources."longest-1.0.1"
+      sources."lodash-4.17.11"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       (sources."mkdirp-0.5.1" // {
@@ -41995,24 +43008,19 @@ in
       sources."optionator-0.8.2"
       sources."path-is-absolute-1.0.1"
       sources."prelude-ls-1.1.2"
-      sources."repeat-string-1.6.1"
       sources."resolve-1.1.7"
-      sources."right-align-0.1.3"
       sources."source-map-0.2.0"
       sources."sprintf-js-1.0.3"
       sources."supports-color-3.2.3"
       sources."type-check-0.3.2"
-      (sources."uglify-js-2.8.29" // {
+      (sources."uglify-js-3.4.9" // {
         dependencies = [
-          sources."source-map-0.5.7"
+          sources."source-map-0.6.1"
         ];
       })
-      sources."uglify-to-browserify-1.0.2"
       sources."which-1.3.1"
-      sources."window-size-0.1.0"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
-      sources."yargs-3.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -42122,80 +43130,234 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.9.4";
+    version = "2.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.4.tgz";
-      sha512 = "kJTsyRj6KZZ5yVvoFyaxMkBOpiJbQeaFXihDJqWlKIYLwBL1SbkBdFOWPbfY9hf7N7gT6ifsqAhYberaqBZ66A==";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.1.tgz";
+      sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA==";
     };
     dependencies = [
+      (sources."@commitlint/cli-7.1.2" // {
+        dependencies = [
+          sources."chalk-2.3.1"
+        ];
+      })
+      sources."@commitlint/config-conventional-7.1.2"
+      sources."@commitlint/ensure-7.1.2"
+      sources."@commitlint/execute-rule-7.1.2"
+      sources."@commitlint/format-7.1.2"
+      sources."@commitlint/is-ignored-7.1.2"
+      sources."@commitlint/lint-7.1.2"
+      sources."@commitlint/load-7.1.2"
+      sources."@commitlint/message-7.1.2"
+      sources."@commitlint/parse-7.1.2"
+      sources."@commitlint/read-7.1.2"
+      sources."@commitlint/resolve-extends-7.1.2"
+      sources."@commitlint/rules-7.1.2"
+      sources."@commitlint/to-lines-7.1.2"
+      sources."@commitlint/top-level-7.1.2"
+      sources."@marionebl/sander-0.6.1"
+      sources."JSONStream-1.3.4"
       sources."ansi-color-0.2.1"
       sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
+      sources."argparse-1.0.10"
+      sources."array-find-index-1.0.2"
+      sources."array-ify-1.0.0"
+      sources."arrify-1.0.1"
       sources."assertion-error-1.1.0"
+      (sources."babel-polyfill-6.26.0" // {
+        dependencies = [
+          sources."regenerator-runtime-0.10.5"
+        ];
+      })
+      sources."babel-runtime-6.26.0"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."bufrw-1.2.1"
-      sources."chai-4.1.2"
+      sources."builtin-modules-1.1.1"
+      sources."caller-path-0.1.0"
+      sources."callsites-0.2.0"
+      sources."camelcase-4.1.0"
+      sources."camelcase-keys-4.2.0"
+      sources."chai-4.2.0"
       sources."chai-as-promised-7.1.1"
       sources."chalk-2.4.1"
       sources."check-error-1.0.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
+      sources."compare-func-1.3.2"
       sources."concat-map-0.0.1"
+      sources."conventional-changelog-angular-1.6.6"
+      (sources."conventional-commits-parser-2.1.7" // {
+        dependencies = [
+          sources."meow-4.0.1"
+        ];
+      })
+      sources."core-js-2.5.7"
+      sources."core-util-is-1.0.2"
+      sources."cosmiconfig-4.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."dargs-4.1.0"
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
       sources."deep-eql-3.0.1"
       sources."deep-equal-1.0.1"
+      sources."dot-prop-3.0.0"
       sources."error-7.0.2"
+      sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.1"
       sources."fast-json-patch-2.0.7"
+      sources."find-up-2.1.0"
       sources."fs.realpath-1.0.0"
       sources."get-func-name-2.0.0"
+      sources."get-stdin-5.0.1"
+      (sources."git-raw-commits-1.3.6" // {
+        dependencies = [
+          sources."meow-4.0.1"
+        ];
+      })
       sources."glob-7.1.3"
+      sources."global-dirs-0.1.1"
+      sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
+      sources."hosted-git-info-2.7.1"
+      sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."is-arrayish-0.2.1"
+      sources."is-builtin-module-1.0.0"
+      sources."is-directory-0.3.1"
+      sources."is-obj-1.0.1"
+      sources."is-plain-obj-1.1.0"
+      sources."is-text-path-1.0.1"
+      sources."isarray-1.0.0"
       sources."iterare-0.0.8"
       (sources."jaeger-client-3.12.0" // {
         dependencies = [
           sources."opentracing-0.13.0"
         ];
       })
-      sources."lodash-4.17.10"
+      sources."js-yaml-3.12.0"
+      sources."json-parse-better-errors-1.0.2"
+      sources."jsonparse-1.3.1"
+      sources."load-json-file-4.0.0"
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.11"
+      sources."lodash._reinterpolate-3.0.0"
+      sources."lodash.camelcase-4.3.0"
       sources."lodash.every-4.6.0"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.foreach-4.5.0"
+      sources."lodash.kebabcase-4.1.1"
       sources."lodash.map-4.6.0"
       sources."lodash.maxby-4.6.0"
+      sources."lodash.merge-4.6.1"
+      sources."lodash.mergewith-4.6.1"
+      sources."lodash.omit-4.5.0"
+      sources."lodash.pick-4.4.0"
+      sources."lodash.snakecase-4.1.1"
+      sources."lodash.startcase-4.4.0"
+      sources."lodash.template-4.4.0"
+      sources."lodash.templatesettings-4.1.0"
+      sources."lodash.topairs-4.3.0"
+      sources."lodash.upperfirst-4.3.1"
       sources."long-2.4.0"
+      sources."loud-rejection-1.6.0"
+      sources."map-obj-2.0.0"
+      sources."meow-5.0.0"
       sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."minimist-options-3.0.2"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."mz-2.7.0"
       sources."node-int64-0.4.0"
+      sources."normalize-package-data-2.4.0"
+      sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
       sources."object-hash-1.3.0"
       sources."once-1.4.0"
       sources."opentracing-0.14.3"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-json-4.0.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
+      sources."path-type-3.0.0"
       sources."pathval-1.1.0"
+      sources."pify-3.0.0"
+      sources."process-nextick-args-2.0.0"
+      sources."q-1.5.1"
+      sources."quick-lru-1.1.0"
+      sources."read-pkg-3.0.0"
+      sources."read-pkg-up-3.0.0"
+      sources."readable-stream-2.3.6"
+      sources."redent-2.0.0"
+      sources."regenerator-runtime-0.11.1"
+      sources."require-from-string-2.0.2"
+      (sources."require-uncached-1.0.3" // {
+        dependencies = [
+          sources."resolve-from-1.0.1"
+        ];
+      })
+      sources."resolve-from-4.0.0"
+      sources."resolve-global-0.1.0"
+      sources."rimraf-2.6.2"
       sources."rxjs-5.5.12"
+      sources."safe-buffer-5.1.2"
       sources."semaphore-async-await-1.5.1"
-      sources."string-similarity-1.2.1"
+      sources."semver-5.5.0"
+      sources."signal-exit-3.0.2"
+      sources."spdx-correct-3.0.1"
+      sources."spdx-exceptions-2.1.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.1"
+      sources."split2-2.2.0"
+      sources."sprintf-js-1.0.3"
+      sources."string-similarity-1.2.2"
       sources."string-template-0.2.1"
+      sources."string_decoder-1.1.1"
+      sources."strip-bom-3.0.0"
+      sources."strip-indent-2.0.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.0.1"
+      sources."text-extensions-1.8.0"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
       sources."thriftrw-3.11.2"
+      sources."through-2.3.8"
+      sources."through2-2.0.3"
+      sources."trim-newlines-2.0.0"
+      sources."trim-off-newlines-1.0.1"
       sources."type-detect-4.0.8"
-      sources."typescript-2.8.3"
+      sources."typescript-3.0.3"
+      sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
+      sources."validate-npm-package-license-3.0.4"
       sources."vscode-jsonrpc-3.6.2"
-      sources."vscode-languageserver-4.4.2"
-      sources."vscode-languageserver-protocol-3.12.0"
-      sources."vscode-languageserver-types-3.12.0"
+      sources."vscode-languageserver-5.1.0"
+      (sources."vscode-languageserver-protocol-3.13.0" // {
+        dependencies = [
+          sources."vscode-jsonrpc-4.0.0"
+        ];
+      })
+      sources."vscode-languageserver-types-3.13.0"
       sources."vscode-uri-1.0.6"
       sources."wrappy-1.0.2"
       sources."xorshift-0.2.1"
       sources."xtend-4.0.1"
+      sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -42293,7 +43455,7 @@ in
       sources."cli-1.0.1"
       sources."co-4.6.0"
       sources."colors-1.0.3"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
         dependencies = [
@@ -42320,7 +43482,7 @@ in
       sources."domutils-1.5.1"
       sources."ecc-jsbn-0.1.2"
       sources."entities-1.0.0"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."exit-0.1.2"
       sources."extend-3.0.2"
       sources."extract-zip-1.6.7"
@@ -42330,7 +43492,11 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."fd-slicer-1.0.1"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-extra-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."getpass-0.1.7"
@@ -42356,7 +43522,7 @@ in
       sources."jsprim-1.4.1"
       sources."kew-0.7.0"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
       sources."minimatch-3.0.4"
@@ -42431,17 +43597,17 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.8.1";
+    version = "1.8.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.1.tgz";
-      sha512 = "e6Ij+fcwlnhxwfEWH148AV240ocW6z6LTZtWc9V7QEOUMu7pe2EINYbO1sM4GPHFwTVWMUWBCXGgsJGRpaQPLQ==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.6.tgz";
+      sha512 = "TYDZa+lg8vEC5U0OmGQEEwiZ0XFBfvZAUeNOtqflLe+woKuIqF4JzlsBx/C1KVYW5lUewZy2ODL4Obq6sH7a4Q==";
     };
     dependencies = [
       sources."@types/commander-2.12.2"
       sources."@types/semver-5.5.0"
       sources."abbrev-1.1.1"
-      sources."commander-2.17.1"
-      sources."config-chain-1.1.11"
+      sources."commander-2.18.0"
+      sources."config-chain-1.1.12"
       sources."editorconfig-0.15.0"
       sources."ini-1.3.5"
       sources."lru-cache-4.1.3"
@@ -42459,8 +43625,8 @@ in
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "jsbeautifier.org for node";
-      homepage = http://jsbeautifier.org/;
+      description = "beautifier.io for node";
+      homepage = https://beautifier.io/;
       license = "MIT";
     };
     production = true;
@@ -42510,10 +43676,10 @@ in
   json-diff = nodeEnv.buildNodePackage {
     name = "json-diff";
     packageName = "json-diff";
-    version = "0.5.2";
+    version = "0.5.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.2.tgz";
-      sha512 = "N7oapTQdD4rLMUtA7d1HATCPY/BpHuSNL1mhvIuoS0u5NideDvyR+gB/ntXB7ejFz/LM0XzPLNUJQcC68n5sBw==";
+      url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.3.tgz";
+      sha512 = "3F9MMFWpZmb8A9VEOAo1xll+z0JGPLN/2mclRm9NyfPi8cynkTNwzqTDw1MZpadEnEHcCtDy6mzReM4O0BLIEA==";
     };
     dependencies = [
       sources."cli-color-0.1.7"
@@ -42547,7 +43713,7 @@ in
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.1.0"
+      sources."debug-3.2.5"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -42557,14 +43723,14 @@ in
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."js-yaml-3.12.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.8"
+      sources."path-loader-1.0.9"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -42606,11 +43772,7 @@ in
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
-      (sources."basic-auth-2.0.0" // {
-        dependencies = [
-          sources."safe-buffer-5.1.1"
-        ];
-      })
+      sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."body-parser-1.18.3"
       sources."boxen-1.3.0"
@@ -42619,15 +43781,15 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       sources."cli-boxes-1.0.0"
       sources."cliui-4.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."compressible-2.0.14"
+      sources."combined-stream-1.0.7"
+      sources."compressible-2.0.15"
       sources."compression-1.7.3"
       sources."configstore-3.1.2"
       sources."connect-pause-0.1.1"
@@ -42689,7 +43851,11 @@ in
       })
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."get-caller-file-1.0.3"
@@ -42710,7 +43876,7 @@ in
       sources."ini-1.3.5"
       sources."invert-kv-1.0.0"
       sources."ipaddr.js-1.8.0"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -42734,7 +43900,7 @@ in
       sources."latest-version-3.1.0"
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.1"
@@ -42750,9 +43916,9 @@ in
       sources."mime-types-2.1.20"
       sources."mimic-fn-1.2.0"
       sources."minimist-1.2.0"
-      sources."morgan-1.9.0"
+      sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nanoid-1.2.2"
+      sources."nanoid-1.2.4"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -42910,7 +44076,7 @@ in
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
       sources."better-assert-1.0.2"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."blob-0.0.4"
       sources."bluebird-3.5.2"
       sources."body-parser-1.18.3"
@@ -42928,7 +44094,7 @@ in
       sources."cache-base-1.0.1"
       sources."callsite-1.0.0"
       sources."chokidar-2.0.4"
-      sources."circular-json-0.5.5"
+      sources."circular-json-0.5.7"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -43034,7 +44200,7 @@ in
           sources."statuses-1.3.1"
         ];
       })
-      (sources."follow-redirects-1.5.7" // {
+      (sources."follow-redirects-1.5.8" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -43088,11 +44254,12 @@ in
       sources."isbinaryfile-3.0.3"
       sources."isobject-3.0.1"
       sources."kind-of-6.0.2"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.debounce-4.0.8"
       (sources."log4js-3.0.5" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."lru-cache-2.2.4"
@@ -43145,7 +44312,7 @@ in
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
@@ -43158,7 +44325,6 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -43237,7 +44403,8 @@ in
       sources."statuses-1.5.0"
       (sources."streamroller-0.7.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."string_decoder-1.1.1"
@@ -43310,7 +44477,7 @@ in
       sources."body-parser-1.13.3"
       sources."bytes-2.1.0"
       sources."commander-2.6.0"
-      sources."compressible-2.0.14"
+      sources."compressible-2.0.15"
       sources."compression-1.5.2"
       sources."connect-2.30.2"
       sources."connect-restreamer-1.0.3"
@@ -43468,7 +44635,7 @@ in
       sources."clone-stats-1.0.0"
       sources."cloneable-readable-1.1.2"
       sources."concat-map-0.0.1"
-      sources."convert-source-map-1.5.1"
+      sources."convert-source-map-1.6.0"
       sources."core-util-is-1.0.2"
       sources."define-properties-1.1.3"
       sources."duplexify-3.6.0"
@@ -43587,7 +44754,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.3.2"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
@@ -43630,7 +44797,11 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."find-up-2.1.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-1.0.3"
       sources."get-stream-3.0.0"
@@ -43668,7 +44839,7 @@ in
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."log-symbols-2.2.0"
       sources."lru-cache-4.1.3"
       sources."mem-1.1.0"
@@ -43806,73 +44977,67 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.2.1";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz";
-      sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.0.tgz";
+      sha512 = "RCLm0gMi8PESEF8PzMxo35foA2NGGC/NKnKiUmJyRrhLybOIUfVPdPStSAWCjW1c+DYCgLZCbxu57/KWt4ZWZA==";
     };
     dependencies = [
-      sources."@lerna/add-3.2.0"
+      sources."@lerna/add-3.3.2"
       sources."@lerna/batch-packages-3.1.2"
-      sources."@lerna/bootstrap-3.2.0"
-      sources."@lerna/changed-3.2.0"
-      sources."@lerna/check-working-tree-3.1.0"
-      sources."@lerna/child-process-3.0.0"
-      sources."@lerna/clean-3.1.3"
+      sources."@lerna/bootstrap-3.3.2"
+      sources."@lerna/changed-3.3.2"
+      sources."@lerna/check-working-tree-3.3.0"
+      sources."@lerna/child-process-3.3.0"
+      sources."@lerna/clean-3.3.2"
       sources."@lerna/cli-3.2.0"
-      sources."@lerna/collect-updates-3.1.0"
-      sources."@lerna/command-3.1.3"
-      sources."@lerna/conventional-commits-3.0.2"
-      sources."@lerna/create-3.1.3"
-      sources."@lerna/create-symlink-3.0.0"
-      sources."@lerna/describe-ref-3.1.0"
-      sources."@lerna/diff-3.1.3"
-      sources."@lerna/exec-3.1.3"
-      sources."@lerna/filter-options-3.1.2"
+      sources."@lerna/collect-updates-3.3.2"
+      sources."@lerna/command-3.3.0"
+      sources."@lerna/conventional-commits-3.3.0"
+      sources."@lerna/create-3.3.1"
+      sources."@lerna/create-symlink-3.3.0"
+      sources."@lerna/describe-ref-3.3.0"
+      sources."@lerna/diff-3.3.0"
+      sources."@lerna/exec-3.3.2"
+      sources."@lerna/filter-options-3.3.2"
       sources."@lerna/filter-packages-3.0.0"
       sources."@lerna/get-npm-exec-opts-3.0.0"
       sources."@lerna/global-options-3.1.3"
-      sources."@lerna/has-npm-version-3.0.4"
-      sources."@lerna/import-3.1.3"
-      sources."@lerna/init-3.1.3"
-      sources."@lerna/link-3.1.4"
-      sources."@lerna/list-3.1.3"
+      sources."@lerna/has-npm-version-3.3.0"
+      sources."@lerna/import-3.3.1"
+      sources."@lerna/init-3.3.0"
+      sources."@lerna/link-3.3.0"
+      sources."@lerna/list-3.3.2"
       sources."@lerna/listable-3.0.0"
       sources."@lerna/log-packed-3.0.4"
       sources."@lerna/npm-conf-3.0.0"
-      sources."@lerna/npm-dist-tag-3.0.0"
-      sources."@lerna/npm-install-3.0.0"
-      sources."@lerna/npm-publish-3.2.0"
-      sources."@lerna/npm-run-script-3.0.0"
+      sources."@lerna/npm-dist-tag-3.3.0"
+      sources."@lerna/npm-install-3.3.0"
+      sources."@lerna/npm-publish-3.3.1"
+      sources."@lerna/npm-run-script-3.3.0"
       sources."@lerna/output-3.0.0"
       sources."@lerna/package-3.0.0"
       sources."@lerna/package-graph-3.1.2"
       sources."@lerna/project-3.0.0"
-      sources."@lerna/prompt-3.0.0"
-      sources."@lerna/publish-3.2.1"
-      sources."@lerna/resolve-symlink-3.0.0"
-      sources."@lerna/rimraf-dir-3.0.0"
-      sources."@lerna/run-3.1.3"
-      sources."@lerna/run-lifecycle-3.2.0"
+      sources."@lerna/prompt-3.3.1"
+      sources."@lerna/publish-3.4.0"
+      sources."@lerna/resolve-symlink-3.3.0"
+      sources."@lerna/rimraf-dir-3.3.0"
+      sources."@lerna/run-3.3.2"
+      sources."@lerna/run-lifecycle-3.3.1"
       sources."@lerna/run-parallel-batches-3.0.0"
-      sources."@lerna/symlink-binary-3.1.4"
-      sources."@lerna/symlink-dependencies-3.1.4"
+      sources."@lerna/symlink-binary-3.3.0"
+      sources."@lerna/symlink-dependencies-3.3.0"
       sources."@lerna/validation-error-3.0.0"
-      sources."@lerna/version-3.2.0"
+      sources."@lerna/version-3.3.2"
       sources."@lerna/write-log-file-3.0.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      sources."@nodelib/fs.stat-1.1.1"
+      sources."@nodelib/fs.stat-1.1.2"
       sources."JSONStream-1.3.4"
       sources."abbrev-1.1.1"
       sources."agent-base-4.2.1"
       sources."agentkeepalive-3.5.1"
       sources."ajv-5.5.2"
-      (sources."align-text-0.1.4" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."amdefine-1.0.1"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
@@ -43893,7 +45058,7 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."async-1.5.2"
+      sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
@@ -43924,11 +45089,10 @@ in
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
       sources."caseless-0.12.0"
-      sources."center-align-0.1.3"
       sources."chalk-2.4.1"
-      sources."chardet-0.4.2"
-      sources."chownr-1.0.1"
-      sources."ci-info-1.4.0"
+      sources."chardet-0.7.0"
+      sources."chownr-1.1.1"
+      sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -43962,7 +45126,8 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."columnify-1.5.4"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.17.1"
       (sources."compare-func-1.3.2" // {
         dependencies = [
           sources."dot-prop-3.0.0"
@@ -43971,7 +45136,7 @@ in
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
-      sources."config-chain-1.1.11"
+      sources."config-chain-1.1.12"
       sources."console-control-strings-1.1.0"
       sources."conventional-changelog-angular-1.6.6"
       (sources."conventional-changelog-core-2.0.11" // {
@@ -44025,11 +45190,11 @@ in
       sources."end-of-stream-1.4.1"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."execa-0.10.0"
+      sources."execa-1.0.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -44054,7 +45219,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."external-editor-2.2.0"
+      sources."external-editor-3.0.3"
       (sources."extglob-2.0.4" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -44080,10 +45245,14 @@ in
       sources."flush-write-stream-1.0.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
-      sources."fs-extra-6.0.1"
+      sources."fs-extra-7.0.0"
       sources."fs-minipass-1.2.5"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
@@ -44104,7 +45273,6 @@ in
           sources."indent-string-2.1.0"
           sources."map-obj-1.0.1"
           sources."meow-3.7.0"
-          sources."minimist-1.2.0"
           sources."redent-1.0.0"
           sources."strip-indent-1.0.1"
           sources."trim-newlines-1.0.0"
@@ -44112,7 +45280,7 @@ in
       })
       sources."get-port-3.2.0"
       sources."get-stdin-4.0.1"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.0.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."git-raw-commits-1.3.6"
@@ -44128,9 +45296,9 @@ in
       sources."glob-to-regexp-0.3.0"
       sources."globby-8.0.1"
       sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.11" // {
+      (sources."handlebars-4.0.12" // {
         dependencies = [
-          sources."source-map-0.4.4"
+          sources."source-map-0.6.1"
         ];
       })
       sources."har-schema-2.0.0"
@@ -44153,7 +45321,8 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."humanize-ms-1.2.1"
@@ -44168,19 +45337,19 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."init-package-json-1.10.3"
-      (sources."inquirer-5.2.0" // {
+      (sources."inquirer-6.2.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."invert-kv-1.0.0"
+      sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-directory-0.3.1"
@@ -44218,29 +45387,32 @@ in
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
       sources."kind-of-6.0.2"
-      sources."lazy-cache-1.0.4"
-      sources."lcid-1.0.0"
+      sources."lcid-2.0.0"
+      (sources."libnpmaccess-3.0.0" // {
+        dependencies = [
+          sources."aproba-2.0.0"
+        ];
+      })
       sources."load-json-file-4.0.0"
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.sortby-4.7.0"
       sources."lodash.template-4.4.0"
       sources."lodash.templatesettings-4.1.0"
-      sources."longest-1.0.1"
       sources."loud-rejection-1.6.0"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
       sources."make-fetch-happen-4.0.1"
+      sources."map-age-cleaner-0.1.2"
       sources."map-cache-0.2.2"
       sources."map-obj-2.0.0"
       sources."map-visit-1.0.0"
-      sources."mem-1.1.0"
+      sources."mem-4.0.0"
       (sources."meow-4.0.1" // {
         dependencies = [
           sources."find-up-2.1.0"
           sources."locate-path-2.0.0"
-          sources."minimist-1.2.0"
           sources."p-limit-1.3.0"
           sources."p-locate-2.0.0"
           sources."p-try-1.0.0"
@@ -44253,7 +45425,7 @@ in
       sources."mime-types-2.1.20"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.1.0"
+      sources."minimist-1.2.0"
       sources."minimist-options-3.0.2"
       (sources."minipass-2.3.4" // {
         dependencies = [
@@ -44273,7 +45445,6 @@ in
         ];
       })
       sources."modify-values-1.0.1"
-      sources."moment-2.22.2"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."multimatch-2.1.0"
@@ -44323,15 +45494,17 @@ in
         ];
       })
       sources."os-homedir-1.0.2"
-      (sources."os-locale-2.1.0" // {
+      (sources."os-locale-3.0.1" // {
         dependencies = [
-          sources."cross-spawn-5.1.0"
-          sources."execa-0.7.0"
+          sources."execa-0.10.0"
+          sources."get-stream-3.0.0"
         ];
       })
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
+      sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
+      sources."p-is-promise-1.1.0"
       sources."p-limit-2.0.0"
       sources."p-locate-3.0.0"
       sources."p-map-1.2.0"
@@ -44340,7 +45513,11 @@ in
       sources."p-reduce-1.0.0"
       sources."p-try-2.0.0"
       sources."p-waterfall-1.0.0"
-      sources."pacote-9.1.0"
+      (sources."pacote-9.1.0" // {
+        dependencies = [
+          sources."get-stream-3.0.0"
+        ];
+      })
       sources."parallel-transform-1.1.0"
       sources."parse-github-repo-url-1.4.1"
       sources."parse-json-4.0.0"
@@ -44419,11 +45596,10 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.10.1"
-      sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."run-queue-1.0.3"
-      sources."rxjs-5.5.12"
+      sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -44474,10 +45650,10 @@ in
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."split-1.0.1"
       sources."split-string-3.1.0"
       sources."split2-2.2.0"
@@ -44514,9 +45690,8 @@ in
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-indent-2.0.0"
-      sources."strong-log-transformer-1.0.6"
+      sources."strong-log-transformer-2.0.0"
       sources."supports-color-5.5.0"
-      sources."symbol-observable-1.0.1"
       (sources."tar-4.4.6" // {
         dependencies = [
           sources."yallist-3.0.2"
@@ -44524,7 +45699,7 @@ in
       })
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
-      sources."text-extensions-1.7.0"
+      sources."text-extensions-1.8.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."tmp-0.0.33"
@@ -44543,19 +45718,15 @@ in
       })
       sources."trim-newlines-2.0.0"
       sources."trim-off-newlines-1.0.1"
+      sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      (sources."uglify-js-2.8.29" // {
+      (sources."uglify-js-3.4.9" // {
         dependencies = [
-          sources."camelcase-1.2.1"
-          sources."cliui-2.1.0"
-          sources."decamelize-1.2.0"
-          sources."wordwrap-0.0.2"
-          sources."yargs-3.10.0"
+          sources."source-map-0.6.1"
         ];
       })
-      sources."uglify-to-browserify-1.0.2"
       sources."uid-number-0.0.6"
       sources."umask-1.1.0"
       (sources."union-value-1.0.0" // {
@@ -44564,8 +45735,8 @@ in
           sources."set-value-0.4.3"
         ];
       })
-      sources."unique-filename-1.1.0"
-      sources."unique-slug-2.0.0"
+      sources."unique-filename-1.1.1"
+      sources."unique-slug-2.0.1"
       sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -44586,11 +45757,10 @@ in
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      sources."whatwg-url-6.5.0"
+      sources."whatwg-url-7.0.0"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.3"
-      sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
       (sources."wrap-ansi-2.1.0" // {
         dependencies = [
@@ -44606,7 +45776,7 @@ in
       sources."xtend-4.0.1"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-12.0.1"
+      sources."yargs-12.0.2"
       sources."yargs-parser-10.1.0"
     ];
     buildInputs = globalBuildInputs;
@@ -44638,7 +45808,7 @@ in
       sources."caseless-0.12.0"
       sources."clone-2.1.2"
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
@@ -44649,7 +45819,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
@@ -44733,26 +45907,65 @@ in
       sources."apache-md5-1.1.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-unique-0.2.1"
+      sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
-      sources."balanced-match-1.0.0"
-      (sources."basic-auth-2.0.0" // {
+      sources."atob-2.1.2"
+      (sources."base-0.11.2" // {
         dependencies = [
-          sources."safe-buffer-5.1.1"
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
         ];
       })
+      sources."basic-auth-2.0.1"
       sources."batch-0.6.1"
       sources."bcryptjs-2.4.3"
-      sources."binary-extensions-1.11.0"
-      sources."brace-expansion-1.1.11"
+      sources."binary-extensions-1.12.0"
       sources."braces-1.8.5"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."chokidar-1.7.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."collection-visit-1.0.0"
       sources."colors-1.3.2"
-      sources."concat-map-0.0.1"
-      sources."connect-3.5.1"
+      sources."component-emitter-1.2.1"
+      (sources."connect-3.5.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.4"
-      sources."debug-2.2.0"
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."duplexer-0.1.1"
@@ -44760,22 +45973,49 @@ in
       sources."encodeurl-1.0.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."event-stream-3.3.4"
+      sources."event-stream-4.0.0"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."extglob-0.3.2"
       sources."faye-websocket-0.11.1"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
-      sources."finalhandler-0.5.1"
+      (sources."finalhandler-0.5.1" // {
+        dependencies = [
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
+      sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
       sources."fsevents-1.2.4"
+      sources."get-value-2.0.6"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."http-auth-3.1.3"
       (sources."http-errors-1.6.3" // {
         dependencies = [
@@ -44784,46 +46024,99 @@ in
       })
       sources."http-parser-js-0.4.13"
       sources."inherits-2.0.3"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
       sources."is-extglob-1.0.0"
       sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
+      sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isobject-2.1.0"
       sources."kind-of-3.2.2"
-      sources."map-stream-0.1.0"
+      sources."map-cache-0.2.2"
+      sources."map-stream-0.0.7"
+      sources."map-visit-1.0.0"
       sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."mime-1.4.1"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
-      sources."minimatch-3.0.4"
-      (sources."morgan-1.9.0" // {
+      (sources."mixin-deep-1.3.1" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
+          sources."is-extendable-1.0.1"
         ];
       })
-      sources."ms-0.7.1"
+      sources."morgan-1.9.1"
+      sources."ms-2.0.0"
       sources."nan-2.11.0"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."negotiator-0.6.1"
       sources."normalize-path-2.1.1"
       sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."parse-glob-3.0.4"
       sources."parseurl-1.3.2"
+      sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."pause-stream-0.0.11"
+      sources."posix-character-classes-0.1.1"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-middleware-0.15.0"
@@ -44835,34 +46128,157 @@ in
       })
       sources."range-parser-1.2.0"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      (sources."readdirp-2.2.1" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+        ];
+      })
       sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
       (sources."send-0.16.2" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
           sources."statuses-1.4.0"
         ];
       })
-      (sources."serve-index-1.9.1" // {
+      sources."serve-index-1.9.1"
+      (sources."set-value-2.0.0" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
+          sources."extend-shallow-2.0.1"
         ];
       })
-      sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
-      sources."split-0.3.3"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."split-1.0.1"
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."statuses-1.3.1"
-      sources."stream-combiner-0.0.4"
+      sources."stream-combiner-0.2.2"
       sources."string_decoder-1.1.1"
       sources."through-2.3.8"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
       sources."unix-crypt-td-js-1.0.0"
       sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.0"
       sources."uuid-3.3.2"
@@ -44895,44 +46311,81 @@ in
       sources."argparse-1.0.10"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-flatten-1.1.1"
       sources."array-unique-0.2.1"
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."async-limiter-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."backo2-1.0.2"
-      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."blob-0.0.4"
       sources."body-parser-1.18.3"
-      sources."brace-expansion-1.1.11"
       sources."braces-1.8.5"
       sources."bytes-3.0.0"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chokidar-1.7.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
+      sources."collection-visit-1.0.0"
+      sources."combined-stream-1.0.7"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
-      sources."concat-map-0.0.1"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
@@ -44973,6 +46426,11 @@ in
         ];
       })
       sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."extglob-0.3.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
@@ -44987,10 +46445,16 @@ in
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
+      sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."fsevents-1.2.4"
+      sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."github-slugger-1.2.0"
       sources."glob-base-0.3.0"
@@ -45004,6 +46468,21 @@ in
         ];
       })
       sources."has-cors-1.1.0"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."html-entities-1.2.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
@@ -45012,17 +46491,38 @@ in
       sources."inherits-2.0.3"
       sources."innertext-1.0.3"
       sources."ipaddr.js-1.8.0"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-extendable-0.1.1"
       sources."is-extglob-1.0.0"
       sources."is-glob-2.0.1"
       sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-typedarray-1.0.0"
+      sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isobject-2.1.0"
@@ -45034,6 +46534,8 @@ in
       sources."jsprim-1.4.1"
       sources."kind-of-3.2.2"
       sources."linkify-it-2.0.3"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       sources."markdown-it-8.4.2"
       sources."markdown-it-emoji-1.4.0"
       sources."markdown-it-github-headings-1.1.1"
@@ -45047,24 +46549,59 @@ in
       sources."mime-1.4.1"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
-      sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."ms-2.0.0"
       sources."nan-2.11.0"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."negotiator-0.6.1"
       sources."normalize-path-2.1.1"
       sources."oauth-sign-0.9.0"
       sources."object-component-0.0.3"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."on-finished-2.3.0"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."parse-glob-3.0.4"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.2"
+      sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
+      sources."posix-character-classes-0.1.1"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.4"
@@ -45080,13 +46617,67 @@ in
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      (sources."readdirp-2.2.1" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+        ];
+      })
       sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."request-2.88.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       (sources."send-0.16.2" // {
         dependencies = [
@@ -45094,8 +46685,37 @@ in
         ];
       })
       sources."serve-static-1.13.2"
-      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."setprototypeof-1.1.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
       (sources."socket.io-2.1.1" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -45113,18 +46733,65 @@ in
           sources."isarray-2.0.1"
         ];
       })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."statuses-1.5.0"
       sources."string_decoder-1.1.1"
       sources."to-array-0.1.4"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
       sources."tough-cookie-2.4.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
       sources."uc.micro-1.0.5"
       sources."ultron-1.1.1"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
       sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-3.3.2"
@@ -45221,10 +46888,10 @@ in
   meguca = nodeEnv.buildNodePackage {
     name = "meguca";
     packageName = "meguca";
-    version = "1.0.9";
+    version = "1.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/meguca/-/meguca-1.0.9.tgz";
-      sha512 = "Q2O9s9cqu19UfhsA6+XDnuuYflxFKck5TvvYF2LMhtKWVVmIGuqVZiDAhx1XV3qO22B5A0vjU4gckaeQLALmPQ==";
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.1.2.tgz";
+      sha512 = "WW3e3r7fCcjX5GH793OaF2SVMdMAhljVZNNCLBXrQhe7RhbhZiEVIGR/6lDLxgySfIF7Hf33ANoH1ytehnxnbg==";
     };
     dependencies = [
       (sources."@gulp-sourcemaps/identity-map-1.0.2" // {
@@ -45242,7 +46909,7 @@ in
           sources."through2-2.0.3"
         ];
       })
-      (sources."accord-0.28.0" // {
+      (sources."accord-0.29.0" // {
         dependencies = [
           sources."glob-7.1.3"
           sources."minimatch-3.0.4"
@@ -45250,15 +46917,14 @@ in
           sources."uglify-js-2.8.29"
         ];
       })
-      sources."acorn-5.7.2"
-      sources."ajv-4.11.8"
+      sources."acorn-5.7.3"
+      sources."ajv-5.5.2"
       (sources."align-text-0.1.4" // {
         dependencies = [
           sources."kind-of-3.2.2"
         ];
       })
       sources."almond-0.3.3"
-      sources."amdefine-1.0.1"
       sources."ansi-colors-1.1.0"
       sources."ansi-cyan-0.1.1"
       sources."ansi-gray-0.1.1"
@@ -45278,11 +46944,11 @@ in
       sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
@@ -45292,7 +46958,6 @@ in
       })
       sources."bcrypt-pbkdf-1.0.2"
       sources."beeper-1.1.1"
-      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
@@ -45340,31 +47005,27 @@ in
       sources."co-4.6.0"
       sources."collection-visit-1.0.0"
       sources."color-support-1.1.3"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."commander-2.17.1"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
-      sources."convert-source-map-1.5.1"
+      sources."convert-source-map-1.6.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
-      (sources."css-2.2.3" // {
+      (sources."css-2.2.4" // {
         dependencies = [
-          sources."source-map-0.1.43"
+          sources."source-map-0.6.1"
         ];
       })
       sources."d-1.0.0"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
       sources."dateformat-2.2.0"
       sources."debug-2.6.9"
       (sources."debug-fabulous-1.1.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."decamelize-1.2.0"
@@ -45433,6 +47094,8 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fancy-log-1.3.2"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       (sources."fill-range-4.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -45452,7 +47115,11 @@ in
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fragment-cache-0.2.1"
       (sources."fs-mkdirp-stream-1.0.0" // {
         dependencies = [
@@ -45466,11 +47133,7 @@ in
       sources."function-bind-1.1.1"
       sources."gaze-0.5.2"
       sources."get-value-2.0.6"
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."getpass-0.1.7"
       sources."glob-4.5.3"
       sources."glob-parent-3.1.0"
       sources."glob-stream-3.1.18"
@@ -45496,7 +47159,7 @@ in
           sources."through2-2.0.3"
         ];
       })
-      (sources."gulp-less-3.5.0" // {
+      (sources."gulp-less-4.0.1" // {
         dependencies = [
           sources."arr-diff-1.1.0"
           sources."arr-union-2.1.0"
@@ -45518,23 +47181,18 @@ in
           sources."through2-2.0.3"
         ];
       })
-      (sources."gulp-typescript-4.0.2" // {
+      (sources."gulp-typescript-5.0.0-alpha.3" // {
         dependencies = [
-          sources."arr-diff-1.1.0"
-          sources."arr-union-2.1.0"
-          sources."array-slice-0.2.3"
+          sources."ansi-colors-2.0.5"
           sources."clone-2.1.2"
           sources."clone-stats-1.0.0"
-          sources."extend-shallow-1.1.4"
           sources."glob-7.1.3"
           sources."glob-stream-6.1.0"
           sources."graceful-fs-4.1.11"
-          sources."kind-of-1.1.0"
           sources."minimatch-3.0.4"
           sources."ordered-read-streams-1.0.1"
-          sources."plugin-error-0.1.2"
           sources."readable-stream-2.3.6"
-          sources."source-map-0.6.1"
+          sources."source-map-0.7.3"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
           sources."unique-stream-2.2.1"
@@ -45544,7 +47202,7 @@ in
       })
       (sources."gulp-uglify-3.0.1" // {
         dependencies = [
-          sources."lodash-4.17.10"
+          sources."lodash-4.17.11"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
           sources."through2-2.0.3"
@@ -45561,8 +47219,8 @@ in
         ];
       })
       sources."gulplog-1.0.0"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.0"
       sources."has-ansi-2.0.0"
       sources."has-gulplog-0.1.0"
       sources."has-symbols-1.0.0"
@@ -45572,10 +47230,8 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
       sources."homedir-polyfill-1.0.1"
-      sources."http-signature-1.1.1"
+      sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
       sources."indx-0.2.3"
       sources."inflight-1.0.6"
@@ -45610,14 +47266,11 @@ in
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."kind-of-6.0.2"
       sources."lazy-cache-1.0.4"
       (sources."lazystream-1.0.0" // {
@@ -45627,9 +47280,11 @@ in
         ];
       })
       sources."lead-1.0.0"
-      (sources."less-2.7.3" // {
+      (sources."less-3.8.1" // {
         dependencies = [
+          sources."clone-2.1.2"
           sources."graceful-fs-4.1.11"
+          sources."source-map-0.6.1"
         ];
       })
       sources."liftoff-2.5.0"
@@ -45685,11 +47340,11 @@ in
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
-      sources."natives-1.1.4"
+      sources."natives-1.1.5"
       sources."next-tick-1.0.0"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.0"
-      sources."oauth-sign-0.8.2"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -45722,13 +47377,14 @@ in
       sources."path-parse-1.0.6"
       sources."path-root-0.1.1"
       sources."path-root-regex-0.1.2"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."plugin-error-1.0.1"
       sources."posix-character-classes-0.1.1"
       sources."pretty-hrtime-1.0.3"
       sources."process-nextick-args-2.0.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
+      sources."psl-1.1.29"
       (sources."pump-2.0.1" // {
         dependencies = [
           (sources."end-of-stream-1.4.1" // {
@@ -45740,7 +47396,7 @@ in
       })
       sources."pumpify-1.5.1"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
+      sources."qs-6.5.2"
       (sources."readable-stream-1.0.34" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -45760,7 +47416,7 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."request-2.81.0"
+      sources."request-2.88.0"
       sources."resolve-1.8.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-options-1.1.0"
@@ -45806,17 +47462,12 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."sntp-1.0.9"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."sparkles-1.0.1"
       sources."split-string-3.1.0"
-      (sources."sshpk-1.14.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sshpk-1.14.2"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -45837,7 +47488,6 @@ in
       sources."stream-consume-0.1.1"
       sources."stream-shift-1.0.0"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-1.0.0"
       sources."strip-bom-string-1.0.0"
@@ -45868,10 +47518,10 @@ in
           sources."through2-2.0.3"
         ];
       })
-      sources."tough-cookie-2.3.4"
+      sources."tough-cookie-2.4.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."typescript-2.7.2"
+      sources."typescript-3.1.1"
       (sources."uglify-js-3.4.9" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -45903,11 +47553,7 @@ in
       sources."uuid-3.3.2"
       sources."v8flags-2.1.1"
       sources."value-or-function-3.0.0"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       (sources."vinyl-0.4.6" // {
         dependencies = [
           sources."clone-0.2.0"
@@ -45923,7 +47569,6 @@ in
         ];
       })
       sources."vinyl-sourcemaps-apply-0.2.1"
-      sources."whatwg-fetch-2.0.4"
       sources."when-3.7.8"
       sources."which-1.3.1"
       sources."window-size-0.1.0"
@@ -45934,7 +47579,7 @@ in
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "[![GoDoc](https://godoc.org/github.com/bakape/meguca?status.svg)](https://godoc.org/github.com/bakape/meguca) [![Build Status](https://travis-ci.org/bakape/meguca.svg)](https://travis-ci.org/bakape/meguca)";
+      description = "[![GoDoc](https://godoc.org/github.com/bakape/meguca?status.svg)](https://godoc.org/github.com/bakape/meguca) [![Build Status](https://travis-ci.org/bakape/meguca.svg?branch=master)](https://travis-ci.org/bakape/meguca)";
       homepage = "https://github.com/bakape/meguca#readme";
       license = "AGPL-3.0";
     };
@@ -45995,11 +47640,11 @@ in
       sources."argparse-1.0.10"
       sources."asynckit-0.4.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.1.0"
+      sources."debug-3.2.5"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -46010,14 +47655,14 @@ in
       sources."isarray-1.0.0"
       sources."js-yaml-3.12.0"
       sources."json-refs-2.1.7"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."native-promise-only-0.8.1"
-      sources."path-loader-1.0.8"
+      sources."path-loader-1.0.9"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -46086,9 +47731,9 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-stream-1.6.2"
-      sources."config-chain-1.1.11"
+      sources."config-chain-1.1.12"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."dashdash-1.14.1"
@@ -46102,7 +47747,11 @@ in
       sources."findit-2.0.0"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       (sources."fs-extra-0.6.4" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -46178,10 +47827,10 @@ in
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
       sources."slide-1.1.6"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
       sources."ssri-5.3.0"
       sources."string-width-1.0.2"
@@ -46239,7 +47888,7 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
@@ -46252,7 +47901,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."gauge-2.7.4"
@@ -46372,7 +48025,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.35"
+      sources."big-integer-1.6.36"
       sources."block-stream-0.0.9"
       sources."body-parser-1.18.2"
       sources."boom-2.10.1"
@@ -46387,7 +48040,7 @@ in
       sources."cliui-3.2.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.2"
@@ -46564,10 +48217,10 @@ in
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
       sources."sntp-1.0.9"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       (sources."sshpk-1.14.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -46657,7 +48310,7 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
       sources."code-point-at-1.1.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
@@ -46684,7 +48337,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.2"
+      sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
       sources."npm-packlist-1.1.11"
@@ -46756,7 +48409,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -46770,7 +48423,7 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."chalk-2.4.1"
       sources."chokidar-2.0.4"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -46800,7 +48453,11 @@ in
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
-      sources."debug-3.1.0"
+      (sources."debug-3.2.5" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."decode-uri-component-0.2.0"
       sources."deep-extend-0.6.0"
       sources."define-property-2.0.2"
@@ -46808,7 +48465,7 @@ in
       sources."duplexer-0.1.1"
       sources."duplexer3-0.1.4"
       sources."escape-string-regexp-1.0.5"
-      sources."event-stream-3.3.4"
+      sources."event-stream-3.3.6"
       sources."execa-0.7.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -46844,6 +48501,7 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
+      sources."flatmap-stream-0.1.0"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
@@ -46873,7 +48531,7 @@ in
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-1.0.1"
@@ -46904,7 +48562,7 @@ in
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.1.0"
+      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."micromatch-3.1.10"
       sources."minimatch-3.0.4"
@@ -46948,7 +48606,7 @@ in
       sources."pstree.remy-1.1.0"
       sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
@@ -46961,7 +48619,6 @@ in
       sources."safe-regex-1.1.0"
       sources."semver-5.5.1"
       sources."semver-diff-2.1.0"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -47004,7 +48661,7 @@ in
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      sources."split-0.3.3"
+      sources."split-1.0.1"
       sources."split-string-3.1.0"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -47023,7 +48680,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."stream-combiner-0.0.4"
+      sources."stream-combiner-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
@@ -47089,15 +48746,16 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.19.2";
+    version = "0.19.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.19.2.tgz";
-      sha512 = "788MCJSRjfYhsGsuRDlWL3Q1E2LheTPjnXzvIdX5/94buaczJifGdoqi2lNxQuCjHXPUvWVTeZCF0ot0igdz7Q==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.19.4.tgz";
+      sha512 = "BcFaU1bCAl0fsu6t3sSPXXPuvUiIKcHj3jrpV3zvVols+dp0zgM9xPX9N8D7978h402H8h2A+0DDQA1vENQIEA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."addressparser-0.3.2"
+      sources."agent-base-4.2.1"
       sources."ajv-6.5.3"
       sources."append-field-0.1.0"
       sources."argparse-1.0.10"
@@ -47138,7 +48796,7 @@ in
       sources."cheerio-0.22.0"
       sources."clone-2.1.2"
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."commander-2.17.1"
       sources."commist-1.0.0"
       sources."concat-map-0.0.1"
@@ -47151,7 +48809,7 @@ in
       sources."core-util-is-1.0.2"
       sources."cors-2.8.4"
       sources."crc-3.4.4"
-      sources."cron-1.3.0"
+      sources."cron-1.4.1"
       sources."css-select-1.2.0"
       sources."css-what-2.1.0"
       sources."d-1.0.0"
@@ -47186,6 +48844,8 @@ in
       sources."es5-ext-0.10.46"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
+      sources."es6-promise-4.2.5"
+      sources."es6-promisify-5.0.0"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
       sources."escape-html-1.0.3"
@@ -47224,7 +48884,11 @@ in
         ];
       })
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-extra-5.0.0"
@@ -47248,6 +48912,12 @@ in
       sources."htmlparser2-3.9.2"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
+      (sources."https-proxy-agent-2.2.1" // {
+        dependencies = [
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
+        ];
+      })
       sources."i18next-11.6.0"
       sources."iconv-lite-0.4.23"
       (sources."imap-0.8.19" // {
@@ -47329,7 +48999,7 @@ in
       })
       sources."moment-2.22.2"
       sources."moment-timezone-0.5.21"
-      sources."mqtt-2.18.5"
+      sources."mqtt-2.18.8"
       sources."mqtt-packet-5.6.0"
       sources."mri-1.1.1"
       sources."ms-2.0.0"
@@ -47338,13 +49008,13 @@ in
           sources."object-assign-3.0.0"
         ];
       })
-      sources."mustache-2.3.1"
+      sources."mustache-2.3.2"
       sources."nan-2.10.0"
       sources."needle-0.11.0"
       sources."negotiator-0.6.1"
       sources."next-tick-1.0.0"
       sources."node-red-node-email-0.1.29"
-      sources."node-red-node-feedparser-0.1.12"
+      sources."node-red-node-feedparser-0.1.14"
       sources."node-red-node-rbe-0.2.3"
       sources."node-red-node-twitter-1.1.2"
       sources."nodemailer-1.11.0"
@@ -47443,7 +49113,7 @@ in
       sources."twitter-ng-0.6.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.4.8"
+      sources."uglify-js-3.4.9"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."ultron-1.1.1"
@@ -47527,9 +49197,9 @@ in
       sources."connect-flash-0.1.0"
       sources."cookie-0.0.5"
       sources."cookie-signature-1.0.1"
-      (sources."debug-3.1.0" // {
+      (sources."debug-4.0.1" // {
         dependencies = [
-          sources."ms-2.0.0"
+          sources."ms-2.1.1"
         ];
       })
       sources."diff-1.0.8"
@@ -47666,9 +49336,9 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."coffee-script-1.12.7"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."concat-map-0.0.1"
-      (sources."config-chain-1.1.11" // {
+      (sources."config-chain-1.1.12" // {
         dependencies = [
           sources."ini-1.3.5"
         ];
@@ -47687,7 +49357,11 @@ in
       sources."findit-1.2.0"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       (sources."fs-extra-0.6.4" // {
         dependencies = [
           sources."rimraf-2.2.8"
@@ -47727,7 +49401,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.3.5"
-      sources."natives-1.1.4"
+      sources."natives-1.1.5"
       sources."ncp-0.4.2"
       sources."nopt-2.2.1"
       (sources."npm-registry-client-0.2.27" // {
@@ -47824,19 +49498,19 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       sources."cint-8.2.1"
       sources."cli-boxes-1.0.0"
       sources."cli-table-0.3.1"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
-      sources."debug-3.1.0"
+      sources."debug-3.2.5"
       sources."deep-extend-0.6.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
@@ -47855,7 +49529,7 @@ in
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."ini-1.3.5"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -47870,12 +49544,12 @@ in
       sources."json-parse-helpfulerror-1.0.3"
       sources."json5-1.0.1"
       sources."latest-version-3.1.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
       sources."minimist-1.2.0"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."node-alias-1.0.4"
       sources."npm-3.10.10"
       sources."npm-run-path-2.0.2"
@@ -47978,11 +49652,11 @@ in
       sources."color-name-1.1.3"
       sources."colors-1.3.2"
       sources."cross-spawn-5.1.0"
-      sources."cvss-1.0.3"
-      sources."debug-3.1.0"
+      sources."cvss-1.0.4"
+      sources."debug-3.2.5"
       sources."decamelize-1.2.0"
       sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.4"
+      sources."es6-promise-4.2.5"
       sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."execa-0.7.0"
@@ -48001,7 +49675,7 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."lodash-4.17.10"
+          sources."lodash-4.17.11"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
@@ -48020,7 +49694,7 @@ in
       sources."lru-cache-4.1.3"
       sources."mem-1.1.0"
       sources."mimic-fn-1.2.0"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."mute-stream-0.0.7"
       sources."nodesecurity-npm-utils-6.0.0"
       sources."normalize-package-data-2.4.0"
@@ -48053,10 +49727,10 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
@@ -48118,7 +49792,7 @@ in
       sources."vscode-languageclient-4.0.1"
       sources."vscode-languageserver-4.0.0"
       sources."vscode-languageserver-protocol-3.6.0"
-      sources."vscode-languageserver-types-3.12.0"
+      sources."vscode-languageserver-types-3.13.0"
       sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -48143,8 +49817,6 @@ in
     dependencies = [
       sources."accepts-1.3.5"
       sources."ajv-5.5.2"
-      sources."align-text-0.1.4"
-      sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
       sources."argparse-1.0.10"
       sources."array-flatten-1.1.1"
@@ -48177,20 +49849,16 @@ in
       sources."bunyan-syslog-udp-0.1.0"
       sources."busboy-0.2.14"
       sources."bytes-3.0.0"
-      sources."camelcase-1.2.1"
+      sources."camelcase-3.0.0"
       sources."caseless-0.12.0"
-      sources."center-align-0.1.3"
       sources."clarinet-0.11.0"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
+      sources."cliui-3.2.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."colors-1.3.2"
-      sources."combined-stream-1.0.6"
-      sources."compressible-2.0.14"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.17.1"
+      sources."compressible-2.0.15"
       sources."compression-1.7.3"
       sources."concat-map-0.0.1"
       sources."connect-busboy-0.0.2"
@@ -48250,7 +49918,11 @@ in
       })
       sources."find-up-1.1.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."function-bind-1.1.1"
@@ -48260,9 +49932,9 @@ in
       sources."getpass-0.1.7"
       sources."glob-6.0.4"
       sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.11" // {
+      (sources."handlebars-4.0.12" // {
         dependencies = [
-          sources."async-1.5.2"
+          sources."async-2.6.1"
         ];
       })
       sources."har-schema-2.0.0"
@@ -48280,7 +49952,6 @@ in
       sources."ipaddr.js-1.8.0"
       sources."is-arguments-1.0.2"
       sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
@@ -48295,6 +49966,7 @@ in
       sources."jsprim-1.4.1"
       (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
         dependencies = [
+          sources."lodash-3.10.1"
           sources."ms-0.7.3"
         ];
       })
@@ -48313,8 +49985,6 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."kind-of-3.2.2"
-      sources."lazy-cache-1.0.4"
       sources."lcid-1.0.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
@@ -48324,10 +49994,9 @@ in
         ];
       })
       sources."load-json-file-1.1.0"
-      sources."lodash-3.10.1"
+      sources."lodash-4.17.11"
       sources."lodash._baseclone-4.5.7"
       sources."lodash.clone-4.3.2"
-      sources."longest-1.0.1"
       sources."media-typer-0.3.0"
       sources."mediawiki-title-0.6.5"
       sources."merge-1.2.0"
@@ -48389,11 +50058,9 @@ in
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-1.1.14"
-      sources."repeat-string-1.6.1"
       sources."request-2.88.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
-      sources."right-align-0.1.3"
       sources."rimraf-2.4.5"
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
@@ -48415,11 +50082,11 @@ in
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."simplediff-0.1.1"
-      sources."source-map-0.4.4"
-      sources."spdx-correct-3.0.0"
+      sources."source-map-0.6.1"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
       sources."statuses-1.5.0"
@@ -48432,13 +50099,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
-      (sources."uglify-js-2.8.29" // {
-        dependencies = [
-          sources."source-map-0.5.7"
-          sources."yargs-3.10.0"
-        ];
-      })
-      sources."uglify-to-browserify-1.0.2"
+      sources."uglify-js-3.4.9"
       sources."unpipe-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
@@ -48447,22 +50108,12 @@ in
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."which-module-1.0.0"
-      sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."y18n-3.2.1"
-      (sources."yargs-7.1.0" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-        ];
-      })
-      (sources."yargs-parser-5.0.0" // {
-        dependencies = [
-          sources."camelcase-3.0.0"
-        ];
-      })
+      sources."yargs-7.1.0"
+      sources."yargs-parser-5.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -48497,7 +50148,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.35"
+      sources."big-integer-1.6.36"
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -48586,7 +50237,7 @@ in
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."lodash-4.17.10"
+          sources."lodash-4.17.11"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
           sources."supports-color-5.5.0"
@@ -48714,10 +50365,10 @@ in
         ];
       })
       sources."single-line-log-1.1.2"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
@@ -48735,7 +50386,7 @@ in
       sources."tmp-0.0.33"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.2"
-      (sources."torrent-stream-1.0.4" // {
+      (sources."torrent-stream-1.1.0" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
           sources."magnet-uri-4.2.3"
@@ -48775,10 +50426,10 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.4.1";
+    version = "0.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.1.tgz";
-      sha512 = "R69EPwlRGmvk976x3KVBaRclnPgK+wCex/Th4eQWWMSoTq+EzSAANRxe/QnEr0k0SQmiiJYsWWv7L7mBmvnD2A==";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.4.2.tgz";
+      sha512 = "UuY4QsKFEPpB52Ee0y0jOOrTN1Mm2Lee/EJN3RdOxJxEupBujBypqZAfxQrjtsKle8QkZHG3z4j/DnwkroYnUQ==";
     };
     dependencies = [
       sources."accepts-1.2.13"
@@ -48814,6 +50465,8 @@ in
       sources."bncode-0.5.3"
       (sources."body-parser-1.13.3" // {
         dependencies = [
+          sources."depd-1.0.1"
+          sources."http-errors-1.3.1"
           sources."qs-4.0.0"
         ];
       })
@@ -48840,11 +50493,13 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."compressible-2.0.14"
+      sources."compressible-2.0.15"
       sources."compression-1.5.2"
       sources."concat-map-0.0.1"
       (sources."connect-2.30.2" // {
         dependencies = [
+          sources."depd-1.0.1"
+          sources."http-errors-1.3.1"
           sources."isarray-0.0.1"
           sources."multiparty-3.3.2"
           sources."qs-4.0.0"
@@ -48852,8 +50507,12 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."connect-multiparty-2.1.1"
-      sources."connect-timeout-1.6.2"
+      sources."connect-multiparty-2.2.0"
+      (sources."connect-timeout-1.6.2" // {
+        dependencies = [
+          sources."http-errors-1.3.1"
+        ];
+      })
       sources."content-disposition-0.5.0"
       sources."content-type-1.0.4"
       sources."cookie-0.1.3"
@@ -48864,13 +50523,21 @@ in
       sources."crc-3.8.0"
       sources."crc32-stream-2.0.0"
       sources."cryptiles-0.1.3"
-      sources."csrf-3.0.6"
-      sources."csurf-1.8.3"
+      (sources."csrf-3.0.6" // {
+        dependencies = [
+          sources."uid-safe-2.1.4"
+        ];
+      })
+      (sources."csurf-1.8.3" // {
+        dependencies = [
+          sources."http-errors-1.3.1"
+        ];
+      })
       sources."cyclist-0.1.1"
       sources."debug-2.2.0"
       sources."decompress-response-3.3.0"
       sources."delayed-stream-0.0.5"
-      sources."depd-1.0.1"
+      sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
       sources."end-of-stream-1.4.1"
@@ -48901,16 +50568,18 @@ in
       sources."etag-1.7.0"
       (sources."express-3.21.2" // {
         dependencies = [
+          sources."depd-1.0.1"
           sources."range-parser-1.0.3"
         ];
       })
       (sources."express-session-1.11.3" // {
         dependencies = [
           sources."crc-3.3.0"
+          sources."depd-1.0.1"
           sources."uid-safe-2.0.0"
         ];
       })
-      sources."fd-slicer-1.0.1"
+      sources."fd-slicer-1.1.0"
       sources."fifo-0.1.4"
       sources."finalhandler-0.4.0"
       sources."flatten-0.0.1"
@@ -48939,7 +50608,7 @@ in
       sources."hat-0.0.3"
       sources."hawk-0.10.2"
       sources."hoek-0.7.6"
-      sources."http-errors-1.3.1"
+      sources."http-errors-1.7.1"
       sources."iconv-lite-0.4.11"
       sources."ieee754-1.1.12"
       sources."immediate-chunk-store-1.0.8"
@@ -48965,7 +50634,7 @@ in
         ];
       })
       sources."lazystream-1.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.assign-4.2.0"
       sources."lodash.defaults-4.2.0"
       sources."lodash.difference-4.5.0"
@@ -48992,9 +50661,13 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."morgan-1.6.1"
+      (sources."morgan-1.6.1" // {
+        dependencies = [
+          sources."depd-1.0.1"
+        ];
+      })
       sources."ms-0.7.1"
-      sources."multiparty-4.1.4"
+      sources."multiparty-4.2.1"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
       sources."normalize-path-3.0.0"
@@ -49053,11 +50726,7 @@ in
           sources."qs-0.5.6"
         ];
       })
-      (sources."response-time-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.2"
-        ];
-      })
+      sources."response-time-2.3.2"
       sources."rimraf-2.6.2"
       sources."rndm-1.2.0"
       sources."run-parallel-1.1.9"
@@ -49066,7 +50735,9 @@ in
       sources."safe-buffer-5.1.2"
       (sources."send-0.13.0" // {
         dependencies = [
+          sources."depd-1.0.1"
           sources."destroy-1.0.3"
+          sources."http-errors-1.3.1"
           sources."range-parser-1.0.3"
           sources."statuses-1.2.1"
         ];
@@ -49079,17 +50750,19 @@ in
       (sources."serve-index-1.7.3" // {
         dependencies = [
           sources."escape-html-1.0.3"
+          sources."http-errors-1.3.1"
         ];
       })
       (sources."serve-static-1.10.3" // {
         dependencies = [
-          sources."depd-1.1.2"
           sources."escape-html-1.0.3"
+          sources."http-errors-1.3.1"
           sources."range-parser-1.0.3"
           sources."send-0.13.2"
           sources."statuses-1.2.1"
         ];
       })
+      sources."setprototypeof-1.1.0"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
@@ -49137,14 +50810,15 @@ in
       })
       sources."string2compact-1.3.0"
       sources."string_decoder-1.1.1"
-      sources."tar-stream-1.6.1"
+      sources."tar-stream-1.6.2"
       sources."thirty-two-0.0.2"
       sources."thunky-1.0.2"
       sources."to-array-0.1.4"
       sources."to-buffer-1.1.1"
+      sources."toidentifier-1.0.0"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.2"
-      (sources."torrent-stream-1.0.4" // {
+      (sources."torrent-stream-1.1.0" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
           sources."mkdirp-0.3.5"
@@ -49154,7 +50828,7 @@ in
       sources."tsscmp-1.0.5"
       sources."tunnel-agent-0.2.0"
       sources."type-is-1.6.16"
-      sources."uid-safe-2.1.4"
+      sources."uid-safe-2.1.5"
       sources."ultron-1.0.2"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
@@ -49203,8 +50877,8 @@ in
       sources."brace-expansion-1.1.11"
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       sources."core-util-is-1.0.2"
@@ -49263,7 +50937,7 @@ in
       })
       sources."kew-0.7.0"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
       sources."minimatch-3.0.4"
@@ -49322,10 +50996,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.15.0";
+    version = "2.16.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz";
-      sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
+      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -49339,10 +51013,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.14.2";
+    version = "1.14.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.14.2.tgz";
-      sha512 = "McHPg0n1pIke+A/4VcaS2en+pTNjy4xF+Uuq86u/5dyDO59/TtFZtQ708QIRkEZ3qwKz3GVkVa6mpxK/CpB8Rg==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.14.3.tgz";
+      sha512 = "qZDVnCrnpsRJJq5nSsiHCE3BYMED2OtsI+cmzIzF1QIfqm5ALf8tEJcO27zV1gKNKRPdhjO0dNWnrzssDQ1tFg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -49363,7 +51037,7 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.4"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."acorn-node-1.5.2"
       sources."anymatch-2.0.0"
@@ -49392,7 +51066,7 @@ in
         ];
       })
       sources."base64-js-1.3.0"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
@@ -49615,7 +51289,7 @@ in
       sources."nan-2.11.0"
       sources."nanomatch-1.2.13"
       sources."neo-async-2.5.2"
-      sources."node-static-0.7.10"
+      sources."node-static-0.7.11"
       sources."normalize-path-2.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -49650,7 +51324,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.16"
+      sources."pbkdf2-3.0.17"
       sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
@@ -49668,7 +51342,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
@@ -49681,7 +51355,6 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."sander-0.5.1"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -49725,7 +51398,7 @@ in
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      sources."sourcemap-codec-1.4.1"
+      sources."sourcemap-codec-1.4.3"
       sources."split-string-3.1.0"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -49849,7 +51522,11 @@ in
       sources."babel-runtime-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
-      sources."basic-auth-2.0.0"
+      (sources."basic-auth-2.0.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."bcrypt-pbkdf-1.0.2"
       sources."bindings-1.2.1"
       sources."bl-1.2.2"
@@ -49864,7 +51541,7 @@ in
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
       sources."character-parser-2.2.0"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
       (sources."clean-css-4.2.1" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -49873,8 +51550,8 @@ in
       sources."cliui-2.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."console-control-strings-1.1.0"
       sources."constantinople-3.1.2"
       sources."content-disposition-0.5.2"
@@ -49989,7 +51666,7 @@ in
       sources."less-2.7.3"
       sources."less-middleware-2.2.1"
       sources."libquassel-2.1.9"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."longest-1.0.1"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -49999,12 +51676,12 @@ in
       sources."mime-types-2.1.20"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."morgan-1.9.0"
+      sources."morgan-1.9.1"
       sources."ms-2.0.0"
       sources."nan-2.5.1"
       sources."negotiator-0.6.1"
       sources."net-browserify-alt-1.1.0"
-      sources."node-abi-2.4.3"
+      sources."node-abi-2.4.4"
       sources."node.extend-2.0.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
@@ -50096,7 +51773,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tar-fs-1.16.3"
-      sources."tar-stream-1.6.1"
+      sources."tar-stream-1.6.2"
       sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."token-stream-0.0.1"
@@ -50150,13 +51827,13 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."amdefine-1.0.1"
       sources."ast-types-0.9.6"
       sources."balanced-match-1.0.0"
       sources."base62-0.1.1"
       sources."brace-expansion-1.1.11"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."commoner-0.10.8"
       sources."concat-map-0.0.1"
       sources."defined-1.0.0"
@@ -50281,7 +51958,7 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."coffee-script-1.6.3"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."commander-2.0.0"
       (sources."connect-2.11.0" // {
         dependencies = [
@@ -50294,7 +51971,7 @@ in
       sources."crc-0.2.0"
       sources."crypto-0.0.3"
       sources."dashdash-1.14.1"
-      sources."debug-3.1.0"
+      sources."debug-4.0.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."events.node-0.4.9"
@@ -50320,7 +51997,11 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."formidable-1.0.11"
       sources."fresh-0.2.0"
       sources."getpass-0.1.7"
@@ -50343,7 +52024,7 @@ in
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
       sources."mkdirp-0.3.5"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."multiparty-2.2.0"
       sources."negotiator-0.3.0"
       sources."node-swt-0.1.1"
@@ -50393,10 +52074,10 @@ in
   scuttlebot = nodeEnv.buildNodePackage {
     name = "scuttlebot";
     packageName = "scuttlebot";
-    version = "11.4.2";
+    version = "12.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz";
-      sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg==";
+      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.0.tgz";
+      sha512 = "zSB0mcodvOOXumXDqITpB6mjmqPnW32pN3SreOF/cr4mpBpWSvSmvlmHQqAVH0RnorNVu0djjDXUO8SMjc+cWQ==";
     };
     dependencies = [
       sources."abstract-leveldown-4.0.3"
@@ -50414,20 +52095,29 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.2.1"
       sources."arrify-1.0.1"
+      sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."async-single-1.0.5"
       sources."async-write-2.1.0"
+      sources."atob-2.1.2"
       sources."atomic-file-0.0.1"
       sources."attach-ware-1.1.1"
       sources."bail-1.0.3"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."base64-url-2.2.0"
       sources."bash-color-0.0.4"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."binary-search-1.3.4"
       sources."bindings-1.3.0"
       sources."bl-1.2.2"
@@ -50441,6 +52131,11 @@ in
       sources."buffer-from-1.1.1"
       sources."bytewise-1.1.0"
       sources."bytewise-core-1.2.3"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."camelcase-2.1.1"
       sources."ccount-1.0.3"
       sources."chalk-1.1.3"
@@ -50452,12 +52147,33 @@ in
       sources."chloride-2.2.10"
       sources."chloride-test-1.2.2"
       sources."chokidar-1.7.0"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."cli-cursor-1.0.2"
       sources."co-3.1.0"
       sources."code-point-at-1.1.0"
       sources."collapse-white-space-1.0.4"
-      sources."commander-2.17.1"
+      sources."collection-visit-1.0.0"
+      sources."commander-2.18.0"
+      sources."compare-at-paths-1.0.0"
+      sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
@@ -50475,18 +52191,26 @@ in
       })
       sources."continuable-para-1.2.0"
       sources."continuable-series-1.2.0"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-5.1.0"
       sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
       sources."deep-extend-0.6.0"
       sources."deferred-leveldown-3.0.0"
       sources."define-properties-1.1.3"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."defined-1.0.0"
       sources."delegates-1.0.0"
       sources."detab-1.0.2"
       sources."detect-libc-1.0.3"
+      sources."dynamic-dijkstra-1.0.0"
       sources."ed2curve-0.1.4"
       sources."elegant-spinner-1.0.1"
       sources."emoji-named-characters-1.0.2"
@@ -50500,7 +52224,7 @@ in
       sources."epidemic-broadcast-trees-6.3.4"
       sources."errno-0.1.7"
       sources."es-abstract-1.12.0"
-      sources."es-to-primitive-1.1.1"
+      sources."es-to-primitive-1.2.0"
       sources."escape-string-regexp-1.0.5"
       sources."exit-hook-1.1.1"
       sources."expand-brackets-0.1.5"
@@ -50508,14 +52232,19 @@ in
       sources."expand-template-1.1.1"
       sources."explain-error-1.0.4"
       sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."extend.js-0.0.2"
       sources."extglob-0.3.2"
       sources."fast-future-1.0.2"
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.4"
       sources."flumecodec-0.0.1"
-      sources."flumedb-0.4.9"
-      (sources."flumelog-offset-3.3.1" // {
+      sources."flumedb-0.5.1"
+      (sources."flumelog-offset-3.3.2" // {
         dependencies = [
           sources."looper-4.0.0"
         ];
@@ -50525,14 +52254,14 @@ in
           sources."atomic-file-1.1.5"
         ];
       })
-      (sources."flumeview-level-3.0.5" // {
+      (sources."flumeview-level-3.0.6" // {
         dependencies = [
           sources."obv-0.0.0"
         ];
       })
       (sources."flumeview-query-6.3.0" // {
         dependencies = [
-          sources."map-filter-reduce-3.1.0"
+          sources."map-filter-reduce-3.2.1"
         ];
       })
       (sources."flumeview-reduce-1.3.13" // {
@@ -50545,11 +52274,13 @@ in
       sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
+      sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
+      sources."get-value-2.0.6"
       sources."github-from-package-0.0.0"
       sources."glob-6.0.4"
       sources."glob-base-0.3.0"
@@ -50560,9 +52291,26 @@ in
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-network-0.0.1"
+      sources."has-symbols-1.0.0"
       sources."has-unicode-2.0.1"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."hashlru-2.2.1"
       sources."he-0.5.0"
+      sources."heap-0.2.6"
       sources."hoox-0.0.1"
       sources."increment-buffer-1.0.1"
       sources."inflight-1.0.6"
@@ -50571,13 +52319,28 @@ in
       sources."int53-0.2.4"
       sources."ip-0.3.3"
       sources."irregular-plurals-1.4.0"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-alphabetical-1.0.2"
       sources."is-alphanumerical-1.0.2"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.4"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-date-object-1.0.1"
       sources."is-decimal-1.0.2"
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."is-dotfile-1.0.3"
       sources."is-electron-2.1.0"
       sources."is-equal-shallow-0.1.3"
@@ -50587,16 +52350,27 @@ in
       sources."is-glob-2.0.1"
       sources."is-hexadecimal-1.0.2"
       sources."is-number-2.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-regex-1.0.4"
-      sources."is-symbol-1.0.1"
-      sources."is-valid-domain-0.0.5"
+      sources."is-symbol-1.0.2"
+      sources."is-valid-domain-0.0.6"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-2.1.0"
       sources."json-buffer-2.0.11"
       sources."kind-of-3.2.2"
+      (sources."layered-graph-1.1.0" // {
+        dependencies = [
+          sources."pull-cont-0.1.1"
+        ];
+      })
       sources."level-3.0.2"
       sources."level-codec-6.2.0"
       sources."level-errors-1.1.2"
@@ -50631,6 +52405,7 @@ in
         ];
       })
       sources."levelup-2.0.2"
+      sources."libnested-1.3.2"
       sources."libsodium-0.7.3"
       sources."libsodium-wrappers-0.7.3"
       sources."log-symbols-1.0.2"
@@ -50640,8 +52415,10 @@ in
       sources."lossy-store-1.2.3"
       sources."lru-cache-4.1.3"
       sources."ltgt-2.2.1"
+      sources."map-cache-0.2.2"
       sources."map-filter-reduce-2.2.1"
       sources."map-merge-1.1.0"
+      sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
       sources."math-random-1.0.1"
       sources."mdmanifest-1.0.8"
@@ -50649,6 +52426,11 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -50656,19 +52438,15 @@ in
       })
       sources."monotonic-timestamp-0.0.9"
       sources."ms-2.0.0"
-      (sources."multiblob-1.13.0" // {
+      (sources."multiblob-1.13.1" // {
         dependencies = [
-          sources."deep-extend-0.2.11"
-          sources."minimist-0.0.10"
           sources."pull-file-0.5.0"
-          sources."rc-0.5.5"
           sources."rimraf-2.2.8"
-          sources."strip-json-comments-0.1.3"
         ];
       })
       sources."multiblob-http-0.4.2"
       sources."multicb-1.2.2"
-      sources."multiserver-1.13.3"
+      sources."multiserver-1.13.5"
       sources."muxrpc-6.4.1"
       (sources."muxrpc-validation-2.0.1" // {
         dependencies = [
@@ -50686,8 +52464,15 @@ in
         ];
       })
       sources."nan-2.11.0"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."ncp-2.0.0"
-      sources."node-abi-2.4.3"
+      sources."node-abi-2.4.4"
       sources."node-gyp-build-3.4.0"
       (sources."non-private-ip-1.4.4" // {
         dependencies = [
@@ -50701,9 +52486,31 @@ in
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
       sources."object-inspect-1.6.0"
       sources."object-keys-1.0.12"
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."observ-0.2.0"
       sources."observ-debounce-1.1.1"
       sources."obv-0.0.1"
@@ -50718,17 +52525,19 @@ in
       sources."osenv-0.1.5"
       sources."packet-stream-2.0.4"
       sources."packet-stream-codec-1.1.2"
-      sources."parse-entities-1.1.2"
+      sources."parse-entities-1.2.0"
       sources."parse-glob-3.0.4"
+      sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."plur-2.1.2"
+      sources."posix-character-classes-0.1.1"
       sources."prebuild-install-4.0.0"
       sources."preserve-0.2.0"
-      sources."private-box-0.2.1"
+      sources."private-box-0.3.0"
       sources."process-nextick-args-2.0.0"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
@@ -50784,6 +52593,7 @@ in
       sources."pull-rate-1.0.2"
       sources."pull-reader-1.3.1"
       sources."pull-sink-through-0.0.0"
+      sources."pull-sort-1.0.1"
       sources."pull-stream-3.6.9"
       sources."pull-stream-to-stream-1.3.4"
       sources."pull-stringify-1.2.2"
@@ -50803,7 +52613,7 @@ in
       sources."pull-write-file-0.2.4"
       sources."pull-ws-3.3.1"
       sources."pump-2.0.1"
-      sources."push-stream-10.0.3"
+      sources."push-stream-10.0.4"
       sources."push-stream-to-pull-stream-1.0.3"
       (sources."randomatic-3.1.0" // {
         dependencies = [
@@ -50813,8 +52623,59 @@ in
       })
       sources."rc-1.2.8"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      (sources."readdirp-2.2.1" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.2"
+          sources."micromatch-3.1.10"
+        ];
+      })
       sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
       sources."relative-url-1.0.2"
       sources."remark-3.2.3"
       sources."remark-html-2.0.2"
@@ -50822,21 +52683,24 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."resolve-1.7.1"
+      sources."resolve-url-0.2.1"
       sources."restore-cursor-1.0.1"
       sources."resumer-0.0.0"
+      sources."ret-0.1.15"
       (sources."rimraf-2.6.2" // {
         dependencies = [
           sources."glob-7.1.3"
         ];
       })
       sources."safe-buffer-5.1.2"
-      sources."secret-handshake-1.1.13"
-      (sources."secret-stack-4.1.0" // {
+      sources."safe-regex-1.1.0"
+      sources."secret-handshake-1.1.14"
+      (sources."secret-stack-4.2.1" // {
         dependencies = [
           sources."ip-1.1.5"
         ];
       })
-      (sources."secure-scuttlebutt-18.2.0" // {
+      (sources."secure-scuttlebutt-18.3.3" // {
         dependencies = [
           sources."deep-equal-0.2.2"
         ];
@@ -50844,7 +52708,11 @@ in
       sources."semver-5.5.1"
       sources."separator-escape-0.0.0"
       sources."set-blocking-2.0.0"
-      sources."set-immediate-shim-1.0.1"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."sha.js-2.4.5"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -50853,6 +52721,31 @@ in
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."smart-buffer-4.0.1"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
       (sources."socks-2.2.1" // {
         dependencies = [
           sources."ip-1.1.5"
@@ -50864,39 +52757,56 @@ in
           sources."sha.js-2.4.11"
         ];
       })
-      sources."sodium-chloride-1.1.0"
-      sources."sodium-native-2.2.1"
+      sources."sodium-chloride-1.1.2"
+      sources."sodium-native-2.2.2"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
       sources."split-buffer-1.0.0"
+      sources."split-string-3.1.0"
       sources."ssb-blobs-1.1.5"
       sources."ssb-client-4.6.0"
-      (sources."ssb-config-2.2.0" // {
-        dependencies = [
-          sources."deep-extend-0.4.2"
-        ];
-      })
-      sources."ssb-ebt-5.2.2"
-      (sources."ssb-friends-2.4.0" // {
+      sources."ssb-config-2.3.2"
+      sources."ssb-ebt-5.2.3"
+      (sources."ssb-friends-3.1.3" // {
         dependencies = [
           sources."pull-cont-0.1.1"
         ];
       })
-      sources."ssb-keys-7.0.16"
+      sources."ssb-keys-7.1.3"
       sources."ssb-links-3.0.3"
       sources."ssb-msgs-5.2.0"
-      (sources."ssb-query-2.2.1" // {
+      (sources."ssb-query-2.3.0" // {
         dependencies = [
-          sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map"
-          sources."map-filter-reduce-3.1.0"
+          sources."flumeview-query-7.0.0"
+          sources."map-filter-reduce-3.2.1"
         ];
       })
-      (sources."ssb-ref-2.11.2" // {
+      (sources."ssb-ref-2.12.0" // {
         dependencies = [
           sources."ip-1.1.5"
         ];
       })
-      sources."ssb-validate-3.0.10"
+      sources."ssb-validate-3.0.11"
       sources."ssb-ws-2.1.1"
       sources."stack-0.1.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."statistics-3.3.0"
       sources."stream-to-pull-stream-1.7.2"
       sources."string-width-1.0.2"
@@ -50916,10 +52826,17 @@ in
           sources."pump-1.0.3"
         ];
       })
-      sources."tar-stream-1.6.1"
+      sources."tar-stream-1.6.2"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."to-buffer-1.1.1"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
       sources."to-vfile-1.0.0"
       sources."trim-0.0.1"
       sources."trim-lines-1.1.1"
@@ -50935,10 +52852,29 @@ in
       sources."ultron-1.0.2"
       sources."unherit-1.1.1"
       sources."unified-2.1.4"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
       sources."unist-util-is-2.1.2"
       sources."unist-util-visit-1.4.0"
       sources."unist-util-visit-parents-2.0.1"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
       sources."untildify-2.1.0"
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
       sources."vfile-1.4.0"
@@ -50987,13 +52923,13 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "10.0.0";
+    version = "10.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-10.0.0.tgz";
-      sha512 = "S9q9cIVeaT78DVk70/JWubco89P5KXIR5IEuVz83YUfvUaqQ7cpVw62eGZsA/ftaTZNmAkQnqn2mBMx+NDLN3A==";
+      url = "https://registry.npmjs.org/serve/-/serve-10.0.2.tgz";
+      sha512 = "9BDXCSpCUDjoPhb37JJGqgnMSfO0HjU5I6g8KxwBA40TvMk9pDxTuDWNKzBJEGXhH5h55Qe8fqSqwpeyQmnhJQ==";
     };
     dependencies = [
-      sources."@zeit/schemas-2.1.1"
+      sources."@zeit/schemas-2.6.0"
       sources."ajv-6.5.3"
       sources."ansi-align-2.0.0"
       sources."ansi-regex-3.0.0"
@@ -51052,7 +52988,7 @@ in
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."safe-buffer-5.1.2"
-      sources."serve-handler-5.0.0"
+      sources."serve-handler-5.0.3"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -51110,8 +53046,8 @@ in
       sources."caseless-0.12.0"
       sources."cheerio-0.17.0"
       sources."co-4.6.0"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
@@ -51152,15 +53088,20 @@ in
       sources."entities-1.1.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."event-stream-3.3.4"
+      sources."event-stream-3.3.6"
       sources."express-4.16.3"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."finalhandler-1.1.1"
+      sources."flatmap-stream-0.1.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
@@ -51194,7 +53135,7 @@ in
       sources."jsprim-1.4.1"
       sources."linewise-0.0.3"
       sources."lodash-2.4.2"
-      sources."map-stream-0.1.0"
+      sources."map-stream-0.0.7"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -51272,10 +53213,10 @@ in
           sources."debug-0.7.4"
         ];
       })
-      sources."split-0.3.3"
+      sources."split-1.0.1"
       sources."sshpk-1.14.2"
       sources."statuses-1.4.0"
-      sources."stream-combiner-0.0.4"
+      sources."stream-combiner-0.2.2"
       sources."string_decoder-0.10.31"
       sources."through-2.3.8"
       sources."tinycolor-0.0.1"
@@ -51350,9 +53291,9 @@ in
       sources."co-4.6.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
-      sources."compressible-2.0.14"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
+      sources."compressible-2.0.15"
       (sources."compression-1.7.3" // {
         dependencies = [
           sources."bytes-3.0.0"
@@ -51363,7 +53304,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."cookies-0.7.1"
+      sources."cookies-0.7.2"
       sources."core-util-is-1.0.2"
       sources."crypt3-0.2.0"
       sources."dashdash-1.14.1"
@@ -51397,7 +53338,11 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."finalhandler-1.0.6"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs-ext-0.6.0"
@@ -51417,7 +53362,7 @@ in
           sources."readable-stream-2.3.6"
         ];
       })
-      (sources."http-errors-1.7.0" // {
+      (sources."http-errors-1.7.1" // {
         dependencies = [
           sources."setprototypeof-1.1.0"
           sources."statuses-1.5.0"
@@ -51439,7 +53384,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
-      sources."keygrip-1.0.2"
+      sources."keygrip-1.0.3"
       sources."linkify-it-1.2.4"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.escaperegexp-4.1.2"
@@ -51509,7 +53454,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
-      sources."sanitize-html-1.18.4"
+      sources."sanitize-html-1.19.1"
       sources."semver-4.3.6"
       (sources."send-0.15.6" // {
         dependencies = [
@@ -51575,26 +53520,230 @@ in
       sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c";
     };
     dependencies = [
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
       sources."async-2.1.5"
-      sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
+      sources."atob-2.1.2"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."cache-base-1.0.1"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."cli-table-0.3.1"
+      sources."collection-visit-1.0.0"
       sources."colors-1.0.3"
       sources."commander-2.9.0"
-      sources."concat-map-0.0.1"
+      sources."component-emitter-1.2.1"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
+      sources."debug-2.6.9"
+      sources."decode-uri-component-0.2.0"
+      sources."define-property-2.0.2"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."for-in-1.0.2"
+      sources."fragment-cache-0.2.1"
+      sources."get-value-2.0.6"
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."inherits-2.0.3"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-0.1.1"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-plain-object-2.0.4"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
-      sources."lodash-4.17.10"
-      sources."minimatch-3.0.4"
+      sources."isobject-3.0.1"
+      sources."kind-of-6.0.2"
+      sources."lodash-4.17.11"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."micromatch-3.1.10"
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."ms-2.0.0"
+      sources."nanomatch-1.2.13"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."pascalcase-0.1.1"
+      sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.0"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
+      sources."regex-not-1.0.2"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
-      sources."set-immediate-shim-1.0.1"
+      sources."safe-regex-1.1.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -51902,7 +54051,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
       sources."css-parse-1.7.0"
-      sources."debug-3.1.0"
+      sources."debug-4.0.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.0.6"
       sources."inflight-1.0.6"
@@ -51910,7 +54059,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."sax-0.5.8"
@@ -51929,25 +54078,24 @@ in
   svgo = nodeEnv.buildNodePackage {
     name = "svgo";
     packageName = "svgo";
-    version = "1.0.5";
+    version = "1.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svgo/-/svgo-1.0.5.tgz";
-      sha512 = "nYrifviB77aNKDNKKyuay3M9aYiK6Hv5gJVDdjj2ZXTQmI8WZc8+UPLR5IpVlktJfSu3co/4XcWgrgI6seGBPg==";
+      url = "https://registry.npmjs.org/svgo/-/svgo-1.1.1.tgz";
+      sha512 = "GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==";
     };
     dependencies = [
       sources."argparse-1.0.10"
       sources."boolbase-1.0.0"
       sources."coa-2.0.1"
       sources."colors-1.1.2"
-      sources."css-select-1.3.0-rc0"
+      sources."css-select-2.0.0"
       sources."css-select-base-adapter-0.1.0"
-      sources."css-tree-1.0.0-alpha25"
+      sources."css-tree-1.0.0-alpha.28"
       sources."css-url-regex-1.1.0"
       sources."css-what-2.1.0"
       (sources."csso-3.5.1" // {
         dependencies = [
           sources."css-tree-1.0.0-alpha.29"
-          sources."mdn-data-1.1.4"
         ];
       })
       sources."define-properties-1.1.3"
@@ -51957,19 +54105,20 @@ in
         ];
       })
       sources."domelementtype-1.3.0"
-      sources."domutils-1.5.1"
+      sources."domutils-1.7.0"
       sources."entities-1.1.1"
       sources."es-abstract-1.12.0"
-      sources."es-to-primitive-1.1.1"
+      sources."es-to-primitive-1.2.0"
       sources."esprima-4.0.1"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
+      sources."has-symbols-1.0.0"
       sources."is-callable-1.1.4"
       sources."is-date-object-1.0.1"
       sources."is-regex-1.0.4"
-      sources."is-symbol-1.0.1"
-      sources."js-yaml-3.10.0"
-      sources."mdn-data-1.2.0"
+      sources."is-symbol-1.0.2"
+      sources."js-yaml-3.12.0"
+      sources."mdn-data-1.1.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.1"
@@ -52004,18 +54153,12 @@ in
     dependencies = [
       sources."URIjs-1.16.1"
       sources."abbrev-1.1.1"
-      (sources."align-text-0.1.4" // {
-        dependencies = [
-          sources."kind-of-3.2.2"
-        ];
-      })
-      sources."amdefine-1.0.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."anymatch-2.0.0"
-      sources."append-field-0.1.0"
+      sources."append-field-1.0.0"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -52032,7 +54175,7 @@ in
           sources."define-property-1.0.0"
         ];
       })
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       (sources."body-parser-1.12.4" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -52069,11 +54212,10 @@ in
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.1"
-      sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."charenc-0.0.2"
       sources."chokidar-2.0.4"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -52094,18 +54236,13 @@ in
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-1.0.2"
       sources."cli-width-1.1.1"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
       sources."clone-2.0.0"
       sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."commander-2.18.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -52114,6 +54251,7 @@ in
       sources."content-type-1.0.4"
       sources."cookiejar-2.1.2"
       sources."copy-descriptor-0.1.1"
+      sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       (sources."cross-spawn-5.1.0" // {
@@ -52125,7 +54263,6 @@ in
       sources."crypto-random-string-1.0.0"
       sources."dag-map-1.0.2"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."deep-extend-0.6.0"
       sources."define-property-2.0.2"
@@ -52149,7 +54286,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
-      sources."event-stream-3.3.4"
+      sources."event-stream-3.3.6"
       sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
       (sources."expand-brackets-2.1.4" // {
@@ -52188,6 +54325,7 @@ in
         ];
       })
       sources."finalhandler-1.1.0"
+      sources."flatmap-stream-0.1.0"
       sources."for-in-1.0.2"
       sources."form-data-2.3.2"
       sources."formidable-1.2.1"
@@ -52210,13 +54348,15 @@ in
       sources."graceful-fs-4.1.11"
       (sources."graphlib-2.1.5" // {
         dependencies = [
-          sources."lodash-4.17.10"
+          sources."lodash-4.17.11"
         ];
       })
       sources."growl-1.9.2"
-      (sources."handlebars-4.0.11" // {
+      (sources."handlebars-4.0.12" // {
         dependencies = [
-          sources."source-map-0.4.4"
+          sources."async-2.6.1"
+          sources."lodash-4.17.11"
+          sources."source-map-0.6.1"
         ];
       })
       sources."has-ansi-2.0.0"
@@ -52243,7 +54383,7 @@ in
       sources."is-accessor-descriptor-1.0.0"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-1.0.1"
@@ -52284,13 +54424,12 @@ in
       sources."json-refs-2.1.7"
       (sources."json-schema-deref-sync-0.3.4" // {
         dependencies = [
-          sources."lodash-4.17.10"
+          sources."lodash-4.17.11"
         ];
       })
       sources."jsonfile-2.4.0"
       sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
-      sources."lazy-cache-1.0.4"
       sources."lodash-3.10.1"
       sources."lodash-compat-3.10.2"
       sources."lodash._arraypool-2.4.1"
@@ -52323,12 +54462,11 @@ in
       sources."lodash.keys-2.4.1"
       sources."lodash.noop-2.4.1"
       sources."lodash.support-2.4.1"
-      sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-2.7.3"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.1.0"
+      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."md5-2.2.1"
       sources."media-typer-0.3.0"
@@ -52355,18 +54493,15 @@ in
       })
       sources."mpath-0.2.1"
       sources."ms-2.0.0"
-      (sources."multer-1.3.1" // {
-        dependencies = [
-          sources."object-assign-3.0.0"
-        ];
-      })
+      sources."multer-1.4.0"
       sources."mute-stream-0.0.5"
       sources."nan-2.11.0"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
       (sources."nodemon-1.18.4" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."supports-color-5.5.0"
         ];
       })
@@ -52402,9 +54537,10 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      (sources."path-loader-1.0.8" // {
+      (sources."path-loader-1.0.9" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."qs-6.5.2"
           sources."superagent-3.8.3"
         ];
@@ -52436,7 +54572,7 @@ in
         ];
       })
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       sources."readline2-1.0.1"
       sources."reduce-component-1.0.1"
       sources."regex-not-1.0.2"
@@ -52448,7 +54584,6 @@ in
       sources."resolve-url-0.2.1"
       sources."restore-cursor-1.0.1"
       sources."ret-0.1.15"
-      sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
@@ -52463,7 +54598,6 @@ in
         ];
       })
       sources."serve-static-1.13.2"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -52509,7 +54643,7 @@ in
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spark-md5-1.0.1"
-      sources."split-0.3.3"
+      sources."split-1.0.1"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
       (sources."static-extend-0.1.2" // {
@@ -52530,7 +54664,7 @@ in
         ];
       })
       sources."statuses-1.3.1"
-      sources."stream-combiner-0.0.4"
+      sources."stream-combiner-0.2.2"
       sources."streamsearch-0.1.2"
       sources."string-3.3.3"
       (sources."string-width-2.1.1" // {
@@ -52582,8 +54716,12 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      sources."uglify-js-2.8.29"
-      sources."uglify-to-browserify-1.0.2"
+      (sources."uglify-js-3.4.9" // {
+        dependencies = [
+          sources."commander-2.17.1"
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."undefsafe-2.0.2"
       (sources."union-value-1.0.0" // {
         dependencies = [
@@ -52621,22 +54759,16 @@ in
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."valid-url-1.0.9"
-      sources."validator-10.7.1"
+      sources."validator-10.8.0"
       sources."which-1.3.1"
       sources."widest-line-2.0.0"
-      sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.3.0"
       sources."xdg-basedir-3.0.0"
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
-      (sources."yargs-3.10.0" // {
-        dependencies = [
-          sources."camelcase-1.2.1"
-        ];
-      })
-      sources."z-schema-3.23.0"
+      sources."z-schema-3.24.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -52650,13 +54782,13 @@ in
   tern = nodeEnv.buildNodePackage {
     name = "tern";
     packageName = "tern";
-    version = "0.22.0";
+    version = "0.22.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tern/-/tern-0.22.0.tgz";
-      sha512 = "YTb3uVStaPA1Ul0KFmfqBH4xc3kLL/9jUvkt/ZKh+FYUtjUckUWAicRiaAwugpRm4IveKBgFKVCggbaT4uwe/A==";
+      url = "https://registry.npmjs.org/tern/-/tern-0.22.3.tgz";
+      sha512 = "A2C8GbR6uJWjHUwxtxF14oY1g8oJDEhM+n9ugRowX+jr8JHgNUeOLrYTOi/LV/JK9KHpxnYwyuhnal9YDXeeDQ==";
     };
     dependencies = [
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
@@ -52696,10 +54828,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.96.0";
+    version = "0.97.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz";
-      sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ==";
+      url = "https://registry.npmjs.org/three/-/three-0.97.0.tgz";
+      sha512 = "ctZF79O1R2aMIDnz9cV5GUIONyFnYvfQKg4+EAwEVaEr1mgy99rglstH6hhRdIThu3SOa4Ns5da/Ee5fTbWc9A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -52749,7 +54881,7 @@ in
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."colors-1.3.0"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."commander-2.17.1"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
@@ -52768,7 +54900,11 @@ in
         ];
       })
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-extra-7.0.0"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
@@ -52785,7 +54921,7 @@ in
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."keypress-0.2.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."longjohn-0.2.12"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
@@ -52901,7 +55037,7 @@ in
         ];
       })
       sources."keep-alive-agent-0.0.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       (sources."lomstream-1.1.0" // {
         dependencies = [
           sources."assert-plus-0.1.5"
@@ -53025,10 +55161,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.0.3";
+    version = "3.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz";
-      sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz";
+      sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -53072,7 +55208,7 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-1.0.2"
       sources."cli-truncate-1.1.0"
@@ -53123,7 +55259,7 @@ in
       sources."invariant-2.2.4"
       sources."is-absolute-0.2.6"
       sources."is-arrayish-0.2.1"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
@@ -53363,7 +55499,7 @@ in
       sources."cookiejar-2.0.1"
       sources."core-util-is-1.0.2"
       sources."crc-3.4.4"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."crossroads-0.12.2"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
@@ -53406,7 +55542,7 @@ in
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eve-0.5.4"
-      sources."execa-0.7.0"
+      sources."execa-0.10.0"
       (sources."express-4.16.3" // {
         dependencies = [
           sources."body-parser-1.18.2"
@@ -53480,7 +55616,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."invert-kv-1.0.0"
+      sources."invert-kv-2.0.0"
       sources."ipaddr.js-1.8.0"
       sources."is-arrayish-0.3.2"
       sources."is-builtin-module-1.0.0"
@@ -53507,14 +55643,15 @@ in
           sources."superagent-0.21.0"
         ];
       })
-      sources."knockout-3.5.0-rc"
-      sources."lcid-1.0.0"
+      sources."knockout-3.5.0-rc2"
+      sources."lcid-2.0.0"
       sources."locate-path-3.0.0"
       sources."locks-0.2.2"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lru-cache-4.1.3"
+      sources."map-age-cleaner-0.1.2"
       sources."media-typer-0.3.0"
-      sources."mem-1.1.0"
+      sources."mem-4.0.0"
       (sources."memorystore-1.6.0" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -53532,6 +55669,7 @@ in
       sources."moment-2.22.2"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
+      sources."nice-try-1.0.5"
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
@@ -53551,10 +55689,12 @@ in
       sources."once-1.4.0"
       sources."opn-5.3.0"
       sources."os-homedir-1.0.2"
-      sources."os-locale-2.1.0"
+      sources."os-locale-3.0.1"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
+      sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
+      sources."p-is-promise-1.1.0"
       sources."p-limit-2.0.0"
       sources."p-locate-3.0.0"
       sources."p-try-2.0.0"
@@ -53589,10 +55729,14 @@ in
       sources."reduce-component-1.0.1"
       (sources."request-2.88.0" // {
         dependencies = [
-          sources."combined-stream-1.0.6"
+          sources."combined-stream-1.0.7"
           sources."delayed-stream-1.0.0"
           sources."extend-3.0.2"
-          sources."form-data-2.3.2"
+          (sources."form-data-2.3.2" // {
+            dependencies = [
+              sources."combined-stream-1.0.6"
+            ];
+          })
           sources."safe-buffer-5.1.2"
         ];
       })
@@ -53637,10 +55781,10 @@ in
           sources."isarray-2.0.1"
         ];
       })
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
       sources."ssri-5.3.0"
       sources."stack-trace-0.0.10"
@@ -53655,12 +55799,13 @@ in
           sources."combined-stream-1.0.6"
           sources."component-emitter-1.2.1"
           sources."cookiejar-2.1.2"
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."delayed-stream-1.0.0"
           sources."extend-3.0.2"
           sources."form-data-2.3.2"
           sources."formidable-1.2.1"
           sources."isarray-1.0.0"
+          sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
@@ -53675,11 +55820,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
-      (sources."typechecker-4.5.0" // {
-        dependencies = [
-          sources."editions-1.3.4"
-        ];
-      })
+      sources."typechecker-4.6.0"
       sources."typedarray-0.0.6"
       sources."uid-safe-2.1.5"
       sources."ultron-1.1.1"
@@ -53708,7 +55849,7 @@ in
       sources."xregexp-4.0.0"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-12.0.1" // {
+      (sources."yargs-12.0.2" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
@@ -53743,8 +55884,6 @@ in
           sources."co-4.6.0"
         ];
       })
-      sources."align-text-0.1.4"
-      sources."amdefine-1.0.1"
       sources."ansi-escapes-3.1.0"
       sources."ansi-red-0.1.1"
       sources."ansi-regex-3.0.0"
@@ -53773,21 +55912,14 @@ in
       sources."buffer-crc32-0.2.13"
       sources."buffer-fill-1.0.0"
       sources."builtins-1.0.3"
-      sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."caw-2.0.1"
-      sources."center-align-0.1.3"
       sources."chalk-2.4.1"
       sources."chardet-0.7.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-width-2.2.0"
-      (sources."cliui-2.1.0" // {
-        dependencies = [
-          sources."wordwrap-0.0.2"
-        ];
-      })
       sources."clone-1.0.4"
       sources."co-3.1.0"
       sources."co-from-stream-0.0.0"
@@ -53796,15 +55928,14 @@ in
       sources."coffee-script-1.12.7"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
-      sources."config-chain-1.1.11"
+      sources."config-chain-1.1.12"
       sources."consolidate-0.14.5"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."dashdash-1.14.1"
-      sources."decamelize-1.2.0"
       sources."decompress-4.2.0"
       sources."decompress-tar-4.1.1"
       (sources."decompress-tarbz2-4.1.1" // {
@@ -53840,7 +55971,11 @@ in
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-2.1.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fs-constants-1.0.0"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
@@ -53853,11 +55988,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."gray-matter-2.1.1"
-      (sources."handlebars-4.0.11" // {
-        dependencies = [
-          sources."async-1.5.2"
-        ];
-      })
+      sources."handlebars-4.0.12"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.0"
       (sources."has-ansi-2.0.0" // {
@@ -53877,7 +56008,6 @@ in
       sources."ini-1.3.5"
       sources."inquirer-6.2.0"
       sources."is-3.2.1"
-      sources."is-buffer-1.1.6"
       sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-natural-number-4.0.1"
@@ -53898,12 +56028,9 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-2.4.0"
       sources."jsprim-1.4.1"
-      sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
-      sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."log-symbols-2.2.0"
-      sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
       (sources."make-dir-1.3.0" // {
         dependencies = [
@@ -53955,13 +56082,11 @@ in
       sources."read-metadata-1.0.0"
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
-      sources."repeat-string-1.6.1"
       sources."request-2.88.0"
       sources."restore-cursor-2.0.0"
-      sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       (sources."seek-bzip-1.0.5" // {
@@ -53971,7 +56096,7 @@ in
       })
       sources."semver-5.5.1"
       sources."signal-exit-3.0.2"
-      sources."source-map-0.4.4"
+      sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.2"
       sources."stat-mode-0.2.2"
@@ -53981,7 +56106,7 @@ in
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.5.0"
-      sources."tar-stream-1.6.1"
+      sources."tar-stream-1.6.2"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
@@ -53995,14 +56120,13 @@ in
       sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      (sources."uglify-js-2.8.29" // {
+      (sources."uglify-js-3.4.9" // {
         dependencies = [
-          sources."source-map-0.5.7"
+          sources."commander-2.17.1"
         ];
       })
-      sources."uglify-to-browserify-1.0.2"
       sources."uid-0.0.2"
-      sources."unbzip2-stream-1.2.5"
+      sources."unbzip2-stream-1.3.0"
       sources."unyield-0.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
@@ -54014,13 +56138,11 @@ in
       sources."verror-1.10.0"
       sources."ware-1.3.0"
       sources."win-fork-1.1.1"
-      sources."window-size-0.1.0"
       sources."wordwrap-0.0.3"
       sources."wrap-fn-0.1.5"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
       sources."yaml-js-0.0.8"
-      sources."yargs-3.10.0"
       sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -54035,19 +56157,19 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "3.0.1";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.1.tgz";
-      sha512 = "z61IlDhTpgDhM6cjbVynkpZzkfhmRKns8DhuuF/OK8VIEI9mwLLn+9df5lFe6Ij/5S9KURXwNeaTLiA1m2R/Yw==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.4.tgz";
+      sha512 = "HC7u3pIjzPV7/5vdZYRpY1VtBsp8xpTxzZLVF61ijQ61bt+cTpF17qOdPW0Tu1muRzD1Qc5d6K15USvtvWg5YQ==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
       sources."@apollographql/apollo-upload-server-5.0.3"
       sources."@apollographql/graphql-playground-html-1.6.0"
-      sources."@babel/runtime-7.0.0"
-      sources."@babel/runtime-corejs2-7.0.0"
+      sources."@babel/runtime-7.1.1"
+      sources."@babel/runtime-corejs2-7.1.1"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      sources."@nodelib/fs.stat-1.1.1"
+      sources."@nodelib/fs.stat-1.1.2"
       sources."@protobufjs/aspromise-1.1.2"
       sources."@protobufjs/base64-1.1.2"
       sources."@protobufjs/codegen-2.0.4"
@@ -54066,21 +56188,20 @@ in
       sources."@types/events-1.2.0"
       sources."@types/express-4.16.0"
       sources."@types/express-serve-static-core-4.16.0"
-      sources."@types/graphql-0.12.6"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
-      sources."@types/node-10.9.4"
+      sources."@types/node-10.11.2"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-5.1.2"
       sources."@types/zen-observable-0.8.0"
-      sources."@vue/cli-shared-utils-3.0.1"
-      (sources."@vue/cli-ui-3.0.1" // {
+      sources."@vue/cli-shared-utils-3.0.4"
+      (sources."@vue/cli-ui-3.0.4" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-3.0.1"
+      sources."@vue/cli-ui-addon-webpack-3.0.4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."ajv-5.5.2"
@@ -54089,29 +56210,36 @@ in
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-2.0.0"
-      sources."apollo-cache-1.1.16"
-      sources."apollo-cache-control-0.2.3"
-      sources."apollo-cache-inmemory-1.2.9"
-      sources."apollo-client-2.4.1"
+      sources."apollo-cache-1.1.17"
+      sources."apollo-cache-control-0.2.5"
+      sources."apollo-cache-inmemory-1.3.0"
+      sources."apollo-client-2.4.2"
       sources."apollo-datasource-0.1.3"
-      sources."apollo-engine-reporting-0.0.3"
+      sources."apollo-engine-reporting-0.0.6"
       sources."apollo-engine-reporting-protobuf-0.0.1"
-      sources."apollo-link-1.2.2"
-      sources."apollo-link-context-1.0.8"
-      sources."apollo-link-dedup-1.0.9"
-      sources."apollo-link-http-1.5.4"
-      sources."apollo-link-http-common-0.2.4"
+      sources."apollo-link-1.2.3"
+      sources."apollo-link-context-1.0.9"
+      sources."apollo-link-dedup-1.0.10"
+      sources."apollo-link-http-common-0.2.5"
       sources."apollo-link-persisted-queries-0.2.1"
-      sources."apollo-link-state-0.4.1"
-      sources."apollo-link-ws-1.0.8"
+      sources."apollo-link-state-0.4.2"
+      sources."apollo-link-ws-1.0.9"
       sources."apollo-server-caching-0.1.2"
-      sources."apollo-server-core-2.0.5"
+      (sources."apollo-server-core-2.1.0" // {
+        dependencies = [
+          sources."graphql-subscriptions-0.5.8"
+        ];
+      })
       sources."apollo-server-env-2.0.3"
       sources."apollo-server-errors-2.0.2"
-      sources."apollo-server-express-2.0.5"
-      sources."apollo-tracing-0.2.3"
+      (sources."apollo-server-express-2.1.0" // {
+        dependencies = [
+          sources."graphql-subscriptions-0.5.8"
+        ];
+      })
+      sources."apollo-tracing-0.2.5"
       sources."apollo-upload-client-8.1.0"
-      sources."apollo-utilities-1.0.20"
+      sources."apollo-utilities-1.0.21"
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -54131,7 +56259,7 @@ in
       sources."async-1.5.2"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
-      sources."async-retry-1.2.1"
+      sources."async-retry-1.2.3"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
@@ -54145,7 +56273,7 @@ in
       })
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       (sources."bl-1.2.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -54170,6 +56298,7 @@ in
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
       sources."buffer-fill-1.0.0"
+      sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
       sources."busboy-0.2.14"
       sources."bytes-3.0.0"
@@ -54182,7 +56311,7 @@ in
       sources."chalk-2.4.1"
       sources."chardet-0.7.0"
       sources."chokidar-2.0.4"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -54211,11 +56340,11 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
-      sources."config-chain-1.1.11"
+      sources."config-chain-1.1.12"
       sources."configstore-3.1.2"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
@@ -54229,7 +56358,11 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."dashdash-1.14.1"
-      sources."debug-3.1.0"
+      (sources."debug-3.2.5" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."decode-uri-component-0.2.0"
       (sources."decompress-4.2.0" // {
         dependencies = [
@@ -54261,6 +56394,7 @@ in
       sources."deprecated-decorator-0.1.6"
       sources."destroy-1.0.4"
       sources."dicer-0.2.5"
+      sources."diff-3.5.0"
       sources."dir-glob-2.0.0"
       sources."dot-prop-4.2.0"
       (sources."download-5.0.3" // {
@@ -54278,13 +56412,14 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.1"
       sources."es-abstract-1.12.0"
-      sources."es-to-primitive-1.1.1"
+      sources."es-to-primitive-1.2.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
+      sources."esm-3.0.84"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
       sources."event-pubsub-4.3.0"
-      sources."event-stream-3.3.4"
+      sources."event-stream-3.3.6"
       sources."eventemitter3-3.1.0"
       sources."exec-sh-0.2.2"
       (sources."execa-0.10.0" // {
@@ -54345,6 +56480,7 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-glob-2.2.2"
       sources."fast-json-stable-stringify-2.0.0"
+      sources."fclone-1.0.11"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
       sources."file-type-5.2.0"
@@ -54357,9 +56493,14 @@ in
           sources."statuses-1.4.0"
         ];
       })
+      sources."flatmap-stream-0.1.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
@@ -54395,9 +56536,9 @@ in
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."graphql-0.13.2"
-      sources."graphql-anywhere-4.1.18"
-      sources."graphql-extensions-0.1.3"
-      sources."graphql-subscriptions-0.5.8"
+      sources."graphql-anywhere-4.1.19"
+      sources."graphql-extensions-0.2.1"
+      sources."graphql-subscriptions-1.0.0"
       sources."graphql-tag-2.9.2"
       sources."graphql-tools-3.1.1"
       sources."graphql-type-json-0.2.1"
@@ -54407,6 +56548,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbol-support-x-1.4.2"
+      sources."has-symbols-1.0.0"
       sources."has-to-string-tag-x-1.4.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -54423,6 +56565,7 @@ in
       sources."ieee754-1.1.12"
       sources."ignore-3.3.10"
       sources."ignore-by-default-1.0.1"
+      sources."immutable-tuple-0.4.8"
       sources."import-global-0.1.0"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -54435,7 +56578,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.4"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
       sources."is-date-object-1.0.1"
       sources."is-descriptor-1.0.2"
@@ -54460,7 +56603,7 @@ in
       sources."is-regex-1.0.4"
       sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.1"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
@@ -54488,7 +56631,7 @@ in
       sources."klaw-sync-4.0.0"
       sources."latest-version-3.1.0"
       sources."launch-editor-2.2.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.debounce-4.0.8"
       sources."lodash.merge-4.6.1"
@@ -54498,8 +56641,9 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
+      sources."make-error-1.3.5"
       sources."map-cache-0.2.2"
-      sources."map-stream-0.1.0"
+      sources."map-stream-0.0.7"
       sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
       sources."merge-1.2.0"
@@ -54532,7 +56676,7 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.11.0"
-      sources."nanoid-1.2.2"
+      sources."nanoid-1.2.4"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -54572,7 +56716,8 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
+      sources."optimism-0.6.6"
       sources."ora-2.1.0"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
@@ -54617,14 +56762,14 @@ in
       sources."raw-body-2.3.3"
       sources."rc-1.2.8"
       sources."readable-stream-1.1.14"
-      (sources."readdirp-2.1.0" // {
+      (sources."readdirp-2.2.1" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
           sources."string_decoder-1.1.1"
         ];
       })
-      (sources."recast-0.15.3" // {
+      (sources."recast-0.15.5" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -54652,10 +56797,10 @@ in
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
-      sources."retry-0.10.1"
+      sources."retry-0.12.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.1"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -54674,7 +56819,6 @@ in
         ];
       })
       sources."serve-static-1.13.2"
-      sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."shebang-command-1.2.0"
@@ -54714,8 +56858,13 @@ in
       })
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
+      (sources."source-map-support-0.5.9" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."source-map-url-0.4.0"
-      sources."split-0.3.3"
+      sources."split-1.0.1"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -54744,7 +56893,7 @@ in
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."steno-0.4.4"
-      sources."stream-combiner-0.0.4"
+      sources."stream-combiner-0.2.2"
       sources."streamsearch-0.1.2"
       sources."string-width-2.1.1"
       sources."string.prototype.padstart-3.0.0"
@@ -54754,10 +56903,10 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."subscriptions-transport-ws-0.9.14"
+      sources."subscriptions-transport-ws-0.9.15"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.2.0"
-      (sources."tar-stream-1.6.1" // {
+      (sources."tar-stream-1.6.2" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
@@ -54795,11 +56944,12 @@ in
         ];
       })
       sources."trim-repeated-1.0.0"
+      sources."ts-node-7.0.1"
       sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
-      sources."unbzip2-stream-1.2.5"
+      sources."unbzip2-stream-1.3.0"
       (sources."undefsafe-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -54838,7 +56988,7 @@ in
       sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vue-cli-plugin-apollo-0.14.6"
+      sources."vue-cli-plugin-apollo-0.16.6"
       sources."watch-1.0.2"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
@@ -54855,8 +57005,9 @@ in
         ];
       })
       sources."yauzl-2.10.0"
+      sources."yn-2.0.0"
       sources."zen-observable-0.8.9"
-      sources."zen-observable-ts-0.8.9"
+      sources."zen-observable-ts-0.8.10"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -54891,11 +57042,11 @@ in
       sources."brace-expansion-1.1.11"
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
-      (sources."config-chain-1.1.11" // {
+      (sources."config-chain-1.1.12" // {
         dependencies = [
           sources."ini-1.3.5"
         ];
@@ -54962,7 +57113,7 @@ in
       })
       sources."kew-0.1.7"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
       sources."minimatch-3.0.4"
@@ -55034,37 +57185,35 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.17.1";
+    version = "4.20.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.17.1.tgz";
-      sha512 = "vdPYogljzWPhFKDj3Gcp01Vqgu7K3IQlybc3XIdKSQHelK1C3eIQuysEUR7MxKJmdandZlQB/9BG2Jb1leJHaw==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.20.2.tgz";
+      sha512 = "75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.5.13"
-      sources."@webassemblyjs/floating-point-hex-parser-1.5.13"
-      sources."@webassemblyjs/helper-api-error-1.5.13"
-      sources."@webassemblyjs/helper-buffer-1.5.13"
-      sources."@webassemblyjs/helper-code-frame-1.5.13"
-      sources."@webassemblyjs/helper-fsm-1.5.13"
-      sources."@webassemblyjs/helper-module-context-1.5.13"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.5.13"
-      sources."@webassemblyjs/helper-wasm-section-1.5.13"
-      sources."@webassemblyjs/ieee754-1.5.13"
-      (sources."@webassemblyjs/leb128-1.5.13" // {
-        dependencies = [
-          sources."long-4.0.0"
-        ];
-      })
-      sources."@webassemblyjs/utf8-1.5.13"
-      sources."@webassemblyjs/wasm-edit-1.5.13"
-      sources."@webassemblyjs/wasm-gen-1.5.13"
-      sources."@webassemblyjs/wasm-opt-1.5.13"
-      sources."@webassemblyjs/wasm-parser-1.5.13"
-      sources."@webassemblyjs/wast-parser-1.5.13"
-      sources."@webassemblyjs/wast-printer-1.5.13"
-      sources."acorn-5.7.2"
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-buffer-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/helper-wasm-section-1.7.8"
+      sources."@webassemblyjs/ieee754-1.7.8"
+      sources."@webassemblyjs/leb128-1.7.8"
+      sources."@webassemblyjs/utf8-1.7.8"
+      sources."@webassemblyjs/wasm-edit-1.7.8"
+      sources."@webassemblyjs/wasm-gen-1.7.8"
+      sources."@webassemblyjs/wasm-opt-1.7.8"
+      sources."@webassemblyjs/wasm-parser-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/ieee754-1.2.0"
+      sources."@xtuc/long-4.2.1"
+      sources."acorn-5.7.3"
       sources."acorn-dynamic-import-3.0.0"
-      sources."ajv-6.5.3"
+      sources."ajv-6.5.4"
       sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
@@ -55090,7 +57239,7 @@ in
       })
       sources."base64-js-1.3.0"
       sources."big.js-3.2.0"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."bluebird-3.5.2"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
@@ -55113,7 +57262,7 @@ in
       sources."cacache-10.0.4"
       sources."cache-base-1.0.1"
       sources."chokidar-2.0.4"
-      sources."chownr-1.0.1"
+      sources."chownr-1.1.1"
       sources."chrome-trace-event-1.0.0"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
@@ -55150,7 +57299,7 @@ in
       sources."crypto-browserify-3.12.0"
       sources."cyclist-0.2.2"
       sources."date-now-0.1.4"
-      sources."debug-3.1.0"
+      sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
       sources."define-property-2.0.2"
       sources."des.js-1.0.0"
@@ -55169,7 +57318,6 @@ in
       sources."evp_bytestokey-1.0.3"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."define-property-0.2.5"
           sources."extend-shallow-2.0.1"
           (sources."is-accessor-descriptor-0.1.6" // {
@@ -55258,14 +57406,12 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json5-0.5.1"
       sources."kind-of-6.0.2"
-      sources."loader-runner-2.3.0"
+      sources."loader-runner-2.3.1"
       sources."loader-utils-1.1.0"
       sources."locate-path-2.0.0"
       sources."lodash.debounce-4.0.8"
-      sources."long-3.2.0"
       sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
-      sources."mamacro-0.0.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.4"
@@ -55322,7 +57468,7 @@ in
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."pbkdf2-3.0.16"
+      sources."pbkdf2-3.0.17"
       sources."pify-3.0.0"
       sources."pkg-dir-2.0.0"
       sources."posix-character-classes-0.1.1"
@@ -55340,7 +57486,7 @@ in
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
@@ -55354,7 +57500,6 @@ in
       sources."safe-regex-1.1.0"
       sources."schema-utils-0.4.7"
       sources."serialize-javascript-1.5.0"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -55364,7 +57509,6 @@ in
       sources."sha.js-2.4.11"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
-          sources."debug-2.6.9"
           sources."define-property-0.2.5"
           sources."extend-shallow-2.0.1"
           (sources."is-accessor-descriptor-0.1.6" // {
@@ -55419,7 +57563,7 @@ in
       sources."stream-http-2.8.3"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
-      sources."tapable-1.0.0"
+      sources."tapable-1.1.0"
       sources."through2-2.0.3"
       sources."timers-browserify-2.0.10"
       sources."to-arraybuffer-1.0.1"
@@ -55449,8 +57593,8 @@ in
           sources."set-value-0.4.3"
         ];
       })
-      sources."unique-filename-1.1.0"
-      sources."unique-slug-2.0.0"
+      sources."unique-filename-1.1.1"
+      sources."unique-slug-2.0.1"
       (sources."unset-value-1.0.0" // {
         dependencies = [
           (sources."has-value-0.3.1" // {
@@ -55474,7 +57618,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
       sources."watchpack-1.6.0"
-      (sources."webpack-sources-1.2.0" // {
+      (sources."webpack-sources-1.3.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -55513,19 +57657,22 @@ in
       sources."bitfield-2.0.0"
       (sources."bittorrent-dht-9.0.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."bittorrent-peerid-1.3.0"
       (sources."bittorrent-protocol-3.0.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
       })
       (sources."bittorrent-tracker-9.10.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."simple-get-3.0.3"
         ];
       })
@@ -55604,7 +57751,7 @@ in
       sources."get-browser-rtc-1.0.2"
       sources."get-stdin-6.0.0"
       sources."glob-7.1.3"
-      sources."he-1.1.1"
+      sources."he-1.2.0"
       sources."immediate-chunk-store-2.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -55701,16 +57848,13 @@ in
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      (sources."range-slice-stream-1.2.0" // {
-        dependencies = [
-          sources."readable-stream-2.3.6"
-        ];
-      })
-      sources."readable-stream-3.0.2"
+      sources."range-slice-stream-2.0.0"
+      sources."readable-stream-3.0.3"
       sources."record-cache-1.1.0"
       (sources."render-media-3.1.3" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."rimraf-2.6.2"
@@ -55725,14 +57869,16 @@ in
       sources."simple-get-2.8.1"
       (sources."simple-peer-9.1.2" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
       })
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-7.2.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
       })
@@ -55749,7 +57895,8 @@ in
       sources."to-arraybuffer-1.0.1"
       (sources."torrent-discovery-9.1.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."torrent-piece-2.0.0"
@@ -55763,17 +57910,19 @@ in
       sources."url-join-2.0.5"
       (sources."ut_metadata-3.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."ut_pex-1.2.1"
       sources."utf-8-validate-5.0.1"
       sources."util-deprecate-1.0.2"
-      sources."videostream-2.5.1"
+      sources."videostream-2.6.0"
       sources."vlc-command-1.1.2"
       (sources."webtorrent-0.102.4" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
           sources."simple-get-3.0.3"
         ];
       })
@@ -55805,10 +57954,11 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.9.4"
+      sources."@types/node-10.11.2"
+      sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
-      sources."acorn-5.7.2"
+      sources."acorn-5.7.3"
       (sources."acorn-jsx-3.0.1" // {
         dependencies = [
           sources."acorn-3.3.0"
@@ -55819,6 +57969,11 @@ in
       sources."adbkit-monkey-1.0.1"
       (sources."addons-linter-1.3.1" // {
         dependencies = [
+          sources."cross-spawn-5.1.0"
+          sources."execa-0.7.0"
+          sources."invert-kv-1.0.0"
+          sources."lcid-1.0.0"
+          sources."mem-1.1.0"
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.6"
           (sources."yargs-12.0.1" // {
@@ -55903,7 +58058,7 @@ in
       })
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-1.11.0"
+      sources."binary-extensions-1.12.0"
       sources."bl-1.2.2"
       sources."bluebird-2.9.34"
       sources."boolbase-1.0.0"
@@ -55975,22 +58130,22 @@ in
       sources."color-name-1.1.3"
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
-      sources."combined-stream-1.0.6"
-      sources."commander-2.17.1"
+      sources."combined-stream-1.0.7"
+      sources."commander-2.18.0"
       sources."common-tags-1.8.0"
       sources."component-emitter-1.2.1"
       sources."compress-commons-1.2.2"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."configstore-3.1.2"
-      sources."convert-source-map-1.5.1"
+      sources."convert-source-map-1.6.0"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.5.7"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       sources."crc32-stream-2.0.0"
       sources."create-error-class-3.0.2"
-      sources."cross-spawn-5.1.0"
+      sources."cross-spawn-6.0.5"
       sources."crx-parser-0.1.2"
       sources."crypto-random-string-1.0.0"
       sources."css-select-1.2.0"
@@ -56022,10 +58177,9 @@ in
       (sources."dispensary-0.22.0" // {
         dependencies = [
           sources."async-2.6.1"
-          sources."os-locale-2.1.0"
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.9"
-          sources."yargs-12.0.1"
+          sources."yargs-12.0.2"
         ];
       })
       sources."doctrine-2.1.0"
@@ -56048,7 +58202,7 @@ in
       sources."entities-1.1.1"
       sources."error-ex-1.3.2"
       sources."es-abstract-1.12.0"
-      sources."es-to-primitive-1.1.1"
+      sources."es-to-primitive-1.2.0"
       sources."es5-ext-0.10.46"
       sources."es6-error-4.1.1"
       sources."es6-iterator-2.0.3"
@@ -56056,7 +58210,7 @@ in
       sources."es6-promise-2.3.0"
       (sources."es6-promisify-5.0.0" // {
         dependencies = [
-          sources."es6-promise-4.2.4"
+          sources."es6-promise-4.2.5"
         ];
       })
       sources."es6-set-0.1.5"
@@ -56072,9 +58226,9 @@ in
       (sources."eslint-5.0.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."cross-spawn-6.0.5"
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."globals-11.7.0"
+          sources."ms-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
       })
@@ -56121,7 +58275,7 @@ in
       sources."esutils-2.0.2"
       sources."event-emitter-0.3.5"
       sources."event-to-promise-0.8.0"
-      sources."execa-0.7.0"
+      sources."execa-0.10.0"
       sources."exit-hook-1.1.1"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -56160,7 +58314,7 @@ in
       sources."fast-json-patch-2.0.7"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fast-redact-1.1.14"
+      sources."fast-redact-1.2.0"
       sources."fast-safe-stringify-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
@@ -56175,7 +58329,6 @@ in
       (sources."firefox-profile-1.2.0" // {
         dependencies = [
           sources."async-2.5.0"
-          sources."fs-extra-4.0.3"
         ];
       })
       sources."first-chunk-stream-2.0.0"
@@ -56185,10 +58338,14 @@ in
       sources."for-in-1.0.2"
       sources."for-own-1.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
-      sources."fs-extra-5.0.0"
+      sources."fs-extra-4.0.3"
       sources."fs.realpath-1.0.0"
       sources."fsevents-1.2.4"
       (sources."ftp-0.3.10" // {
@@ -56204,6 +58361,7 @@ in
         dependencies = [
           sources."commander-2.9.0"
           sources."isexe-1.1.2"
+          sources."lodash-4.17.10"
           sources."which-1.2.4"
         ];
       })
@@ -56270,7 +58428,8 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."iconv-lite-0.4.24"
@@ -56290,7 +58449,7 @@ in
       })
       sources."interpret-1.1.0"
       sources."invariant-2.2.4"
-      sources."invert-kv-1.0.0"
+      sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."is-absolute-0.1.7"
       (sources."is-accessor-descriptor-1.0.0" // {
@@ -56338,7 +58497,7 @@ in
       sources."is-resolvable-1.1.0"
       sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.1"
+      sources."is-symbol-1.0.2"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
@@ -56390,7 +58549,7 @@ in
       sources."latest-version-3.1.0"
       sources."lazy-cache-0.2.7"
       sources."lazystream-1.0.0"
-      sources."lcid-1.0.0"
+      sources."lcid-2.0.0"
       sources."levn-0.3.0"
       sources."lie-3.1.1"
       (sources."load-json-file-1.1.0" // {
@@ -56400,7 +58559,7 @@ in
         ];
       })
       sources."locate-path-3.0.0"
-      sources."lodash-4.17.10"
+      sources."lodash-4.17.11"
       sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
       sources."lodash.clonedeep-4.5.0"
@@ -56427,7 +58586,7 @@ in
       })
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      sources."mem-1.1.0"
+      sources."mem-3.0.1"
       (sources."micromatch-3.1.10" // {
         dependencies = [
           sources."kind-of-6.0.2"
@@ -56478,6 +58637,8 @@ in
           sources."camelcase-2.1.1"
           sources."cliui-3.2.0"
           sources."decamelize-1.2.0"
+          sources."invert-kv-1.0.0"
+          sources."lcid-1.0.0"
           sources."os-locale-1.4.0"
           sources."string-width-1.0.2"
           sources."y18n-3.2.1"
@@ -56485,7 +58646,7 @@ in
         ];
       })
       sources."ncp-2.0.0"
-      sources."needle-2.2.2"
+      sources."needle-2.2.4"
       sources."neo-async-2.5.2"
       sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
@@ -56526,15 +58687,7 @@ in
       sources."opn-5.3.0"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
-      (sources."os-locale-3.0.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."execa-0.10.0"
-          sources."invert-kv-2.0.0"
-          sources."lcid-2.0.0"
-          sources."mem-3.0.1"
-        ];
-      })
+      sources."os-locale-3.0.0"
       sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
@@ -56545,7 +58698,8 @@ in
       sources."p-try-2.0.0"
       (sources."pac-proxy-agent-2.0.2" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."pac-resolver-3.0.0"
@@ -56590,7 +58744,8 @@ in
       sources."promise-7.3.1"
       (sources."proxy-agent-2.3.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."proxy-from-env-1.0.0"
@@ -56614,7 +58769,7 @@ in
         ];
       })
       sources."readable-stream-2.3.6"
-      sources."readdirp-2.1.0"
+      sources."readdirp-2.2.1"
       (sources."readline2-1.0.1" // {
         dependencies = [
           sources."mute-stream-0.0.5"
@@ -56660,7 +58815,6 @@ in
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
-      sources."set-immediate-shim-1.0.1"
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
@@ -56727,77 +58881,86 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.94.0" // {
+      (sources."snyk-1.99.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
           sources."inquirer-3.3.0"
+          sources."ms-2.1.1"
           sources."rx-lite-4.0.8"
+          sources."source-map-0.6.1"
+          sources."source-map-support-0.5.9"
           sources."strip-ansi-4.0.0"
           sources."supports-color-5.5.0"
         ];
       })
       (sources."snyk-config-2.2.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
-      (sources."snyk-docker-plugin-1.10.4" // {
+      (sources."snyk-docker-plugin-1.11.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."snyk-go-plugin-1.5.2"
-      sources."snyk-gradle-plugin-1.3.0"
+      sources."snyk-gradle-plugin-2.0.1"
       (sources."snyk-module-1.8.2" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
-      sources."snyk-mvn-plugin-1.2.0"
-      (sources."snyk-nodejs-lockfile-parser-1.4.1" // {
+      sources."snyk-mvn-plugin-2.0.0"
+      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
         dependencies = [
+          sources."lodash-4.17.10"
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.9"
         ];
       })
       (sources."snyk-nuget-plugin-1.6.5" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       (sources."snyk-php-plugin-1.5.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       (sources."snyk-policy-1.12.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."snyk-python-plugin-1.8.1"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       (sources."snyk-resolve-deps-3.1.0" // {
         dependencies = [
-          sources."debug-3.1.0"
-        ];
-      })
-      (sources."snyk-sbt-plugin-1.3.1" // {
-        dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
+      sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       (sources."snyk-try-require-1.3.1" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       sources."socks-1.1.10"
@@ -56812,10 +58975,10 @@ in
       })
       sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."split-0.3.3"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
@@ -56864,10 +59027,15 @@ in
       sources."supports-color-2.0.0"
       sources."symbol-observable-1.0.1"
       sources."table-4.0.3"
-      sources."tar-stream-1.6.1"
+      sources."tar-stream-1.6.2"
       sources."temp-dir-1.0.0"
       sources."tempfile-2.0.0"
-      sources."term-size-1.2.0"
+      (sources."term-size-1.2.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+          sources."execa-0.7.0"
+        ];
+      })
       sources."text-table-0.2.0"
       sources."then-fs-2.0.0"
       sources."thenify-3.3.0"
@@ -56891,6 +59059,7 @@ in
       sources."tr46-1.0.1"
       sources."traverse-0.4.6"
       sources."trim-right-1.0.1"
+      sources."tslib-1.9.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
@@ -56962,6 +59131,8 @@ in
           sources."camelcase-3.0.0"
           sources."cliui-3.2.0"
           sources."decamelize-1.2.0"
+          sources."invert-kv-1.0.0"
+          sources."lcid-1.0.0"
           sources."os-locale-1.4.0"
           sources."string-width-1.0.2"
           sources."which-module-1.0.0"
@@ -57008,10 +59179,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.9.4";
+    version = "1.10.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.9.4.tgz";
-      sha1 = "3b82d8446b652775723900b470d966861976924b";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.10.1.tgz";
+      sha512 = "EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -57032,7 +59203,7 @@ in
     };
     dependencies = [
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      sources."@nodelib/fs.stat-1.1.1"
+      sources."@nodelib/fs.stat-1.1.2"
       sources."@sindresorhus/is-0.7.0"
       sources."aggregate-error-1.0.0"
       sources."ajv-5.5.2"
@@ -57098,7 +59269,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."chardet-0.7.0"
-      sources."ci-info-1.4.0"
+      sources."ci-info-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -57130,12 +59301,12 @@ in
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."combined-stream-1.0.6"
+      sources."combined-stream-1.0.7"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."conf-1.4.0"
-      sources."config-chain-1.1.11"
+      sources."config-chain-1.1.12"
       sources."configstore-3.1.2"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
@@ -57169,6 +59340,7 @@ in
         ];
       })
       sources."ecc-jsbn-0.1.2"
+      sources."encodeurl-1.0.2"
       sources."env-paths-1.0.0"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
@@ -57227,7 +59399,11 @@ in
       sources."for-in-1.0.2"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.3.2"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
@@ -57245,7 +59421,7 @@ in
       })
       sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
-      sources."global-tunnel-ng-2.5.4"
+      sources."global-tunnel-ng-2.6.0"
       sources."globby-8.0.1"
       sources."got-8.3.2"
       sources."graceful-fs-4.1.11"
@@ -57293,7 +59469,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
-      sources."is-ci-1.2.0"
+      sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
       sources."is-descriptor-1.0.2"
       sources."is-docker-1.1.0"
@@ -57354,8 +59530,8 @@ in
         ];
       })
       sources."locate-path-2.0.0"
-      sources."locutus-2.0.9"
-      sources."lodash-4.17.10"
+      sources."locutus-2.0.10"
+      sources."lodash-4.17.11"
       sources."lodash.debounce-4.0.8"
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
@@ -57435,7 +59611,7 @@ in
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."os-homedir-1.0.2"
       sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
@@ -57523,7 +59699,7 @@ in
       sources."root-check-1.0.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
-      sources."rxjs-6.3.1"
+      sources."rxjs-6.3.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
@@ -57576,10 +59752,10 @@ in
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
-      sources."spdx-correct-3.0.0"
+      sources."spdx-correct-3.0.1"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
+      sources."spdx-license-ids-3.0.1"
       sources."split-string-3.1.0"
       sources."sshpk-1.14.2"
       (sources."static-extend-0.1.2" // {
@@ -57729,7 +59905,8 @@ in
       sources."yeoman-doctor-3.0.2"
       (sources."yeoman-environment-2.3.3" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-3.2.5"
+          sources."ms-2.1.1"
         ];
       })
       (sources."yosay-2.0.2" // {

From 6535a39ef9b4f9ec7732305b5fbb657407a2f36b Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Fri, 28 Sep 2018 23:28:10 +0200
Subject: [PATCH 1996/3253] gixy: 0.1.9 -> 0.1.20 (#47497)

---
 pkgs/tools/admin/gixy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix
index 029c09afdad4..ab5aad6d68cd 100644
--- a/pkgs/tools/admin/gixy/default.nix
+++ b/pkgs/tools/admin/gixy/default.nix
@@ -2,7 +2,7 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "gixy";
-  version = "0.1.9";
+  version = "0.1.20";
 
   # package is only compatible with python 2.7 and 3.5+
   disabled = with python.pkgs; !(pythonAtLeast "3.5" || isPy27);
@@ -12,7 +12,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "yandex";
     repo = "gixy";
     rev = "v${version}";
-    sha256 = "11aps8a8xg1nlw36jgrmnaf38imfz2rj67wnlalrrsqb616xipcv";
+    sha256 = "14arz3fjidb8z37m08xcpih1391varj8s0v3gri79z3qb4zq5k6b";
   };
 
   postPatch = ''

From ef25489db4c3b58a2ece6c65df523ff89d3fbb8d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 14:32:47 -0700
Subject: [PATCH 1997/3253] postgis: 2.4.4 -> 2.4.5 (#46979)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/postgis/versions
---
 pkgs/development/libraries/postgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index a577d318523d..0da66acbde2a 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -42,8 +42,8 @@
 
 
 let
-  version = "2.4.4";
-  sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6";
+  version = "2.4.5";
+  sha256 = "0saxj3w7j9yb9sa1ig3ccxvh2pk0bj47hp7m6199p1a1fpfjgrrg";
 in stdenv.mkDerivation rec {
   name = "postgis-${version}";
 

From c4b4bc00849712bc22424749036826bd53556520 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 14:36:50 -0700
Subject: [PATCH 1998/3253] rsyslog: 8.37.0 -> 8.38.0 (#46968)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rsyslog/versions
---
 pkgs/tools/system/rsyslog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 1367871ded41..fa2d40949e53 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -11,11 +11,11 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.37.0";
+  name = "rsyslog-8.38.0";
 
   src = fetchurl {
     url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1rs7y7xgjm82j4mp0897x2myv73kkcj86np37y7qzgca9jdjhp19";
+    sha256 = "0b52pcamj2g27zdg0szzk03kigm9lanj0v0w80alwy5fpk9qwcjd";
   };
 
   #patches = [ ./fix-gnutls-detection.patch ];

From 5bd92271ccb2a253269a013246832e7f75d2f555 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Fri, 28 Sep 2018 23:38:17 +0200
Subject: [PATCH 1999/3253] phraseapp: 1.6.0 -> 1.11.0 (#46972)

---
 pkgs/tools/misc/phraseapp-client/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
index b4cfe7b26c0e..74d24db574ff 100644
--- a/pkgs/tools/misc/phraseapp-client/default.nix
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "phraseapp-client-${version}";
-  version = "1.6.0";
+  version = "1.11.0";
 
   goPackagePath = "github.com/phrase/phraseapp-client";
   subPackages = [ "." ];
@@ -11,9 +11,13 @@ buildGoPackage rec {
     owner = "phrase";
     repo = "phraseapp-client";
     rev = version;
-    sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622";
+    sha256 = "0lfx0wv95hgczi74qnkw2cripwgvl53z2gi5i6nyflisy4r7vvkr";
   };
 
+  postInstall = ''
+    ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://docs.phraseapp.com;
     description = "PhraseApp API v2 Command Line Client";

From c4bd58d33785280596fb20bf53d556262a438123 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 14:39:33 -0700
Subject: [PATCH 2000/3253] recoverjpeg: 2.6.2 -> 2.6.3 (#46967)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/recoverjpeg/versions
---
 pkgs/tools/misc/recoverjpeg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix
index 72ea7f2ea0b0..484bb765c0db 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/pkgs/tools/misc/recoverjpeg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "recoverjpeg-${version}";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchurl {
     url = "https://www.rfc1149.net/download/recoverjpeg/${name}.tar.gz";
-    sha256 = "01vayn2b3mqmyqz2ka2j3k4a93bjdvkhv5ry9207v04r83r7iwfp";
+    sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1e211a70cbdaf230a18ea4cb67a959039d5c2ddb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Sep 2018 23:42:55 +0200
Subject: [PATCH 2001/3253] nixos/zsh: use `escapeShelLArg' for shell aliases
 (#47471)

Previously single quotes were used by default for aliases and the module
never warned about possible collisions when having a shell alias which
relies on single quotes.

Adding `escapeShellArg` works around this fixes the issue and ensures that a
properly quoted value is written to `/etc/zshrc`.
---
 nixos/modules/programs/zsh/zsh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b4ca8730958c..865d148c1629 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -11,7 +11,7 @@ let
   cfg = config.programs.zsh;
 
   zshAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
   );
 
 in

From 7ecc7c922078c41c9d97177ea13d9cef747dd6d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Sep 2018 14:47:58 -0700
Subject: [PATCH 2002/3253] gtkwave: 3.3.93 -> 3.3.94 (#47048)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gtkwave/versions
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index c0048740193f..e4f0cb8d0b1a 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.93";
+  version = "3.3.94";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "0a92zlwvshp75k7cv11rc4ab11fzsy0a5qfvxkh0bjvrq1k946ys";
+    sha256 = "1v14sdd4lykly6szal6ky79b0s5pv6f1xifk5mkqkg5bkpjq71fg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e502c72773e559a9453086d48943e64074406094 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Fri, 28 Sep 2018 22:15:53 +0000
Subject: [PATCH 2003/3253] exempi: patch CVE-2018-12648, enable tests on linux
 (#47496)

---
 pkgs/development/libraries/exempi/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index ac2c21d4cf0e..3bc5270f0537 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
+{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   name = "exempi-2.4.5";
@@ -8,6 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
   };
 
+  patches = [
+    # CVE-2018-12648
+    # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
+    # remove with exempi > 2.4.5
+    (fetchpatch {
+      name = "CVE-2018-12648.patch";
+      url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch;
+      sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q";
+    })
+  ];
+
   configureFlags = [
     "--with-boost=${boost.dev}"
   ];
@@ -15,6 +26,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ expat zlib boost ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
 
+  doCheck = stdenv.isLinux;
+
   meta = with stdenv.lib; {
     homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
     platforms = platforms.linux ++ platforms.darwin;

From fa46ce38286c36cd8d5c840ba1baebbdc567568a Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 28 Sep 2018 15:32:02 -0700
Subject: [PATCH 2004/3253] browsh: 1.4.10 -> 1.4.13

---
 pkgs/applications/networking/browsers/browsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index cf90d2afd000..a910f1d14bdf 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
 
 let
-  version = "1.4.10";
+  version = "1.4.13";
 
   # TODO: must build the extension instead of downloading it. But since it's
   # literally an asset that is indifferent regardless of the platform, this
   # might be just enough.
   webext = fetchurl {
     url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
-    sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas";
+    sha256 = "11477z7mva8lwfxsrfxckvgqkxrjhc80czra8cqhpakf0fih1a4g";
   };
 
 in buildGoPackage rec {

From 18681d9f798098d9b181676316e4aa281f690789 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Fri, 28 Sep 2018 15:35:36 -0700
Subject: [PATCH 2005/3253] kubetail: 1.6.1 -> 1.6.4

---
 pkgs/applications/networking/cluster/kubetail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix
index 201e3e8b30d2..91f1d958ab61 100644
--- a/pkgs/applications/networking/cluster/kubetail/default.nix
+++ b/pkgs/applications/networking/cluster/kubetail/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "kubetail-${version}";
-  version = "1.6.1";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "johanhaleby";
     repo = "kubetail";
     rev = "${version}";
-    sha256 = "10ql1kdsmyrk73jb6f5saf2q38znm0vdihscj3c9n0qhyhk9blpl";
+    sha256 = "13y3g27z2v4jx1cvphcwl0a5xshm6vcqcxasid5sbg6cpwc2xc66";
   };
 
   installPhase = ''

From 0a156434012133040ec783f81e3594346ac70317 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 22:46:44 -0500
Subject: [PATCH 2006/3253] isync: add zlib dep for compression support

(cherry picked from commit f26f2c8b6f755708a8bfa7aa4f56c52a2c751df6)
---
 pkgs/tools/networking/isync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index 581a45eaebb9..5bdbe17e4d10 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, pkgconfig, db, cyrus_sasl, perl }:
+{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }:
 
 stdenv.mkDerivation rec {
   name = "isync-1.3.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
-  buildInputs = [ openssl db cyrus_sasl ];
+  buildInputs = [ openssl db cyrus_sasl zlib ];
 
   meta = with stdenv.lib; {
     homepage = http://isync.sourceforge.net/;

From 54d950468607e11eeaca40329f2ea948b1cd8e79 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 23:43:54 -0500
Subject: [PATCH 2007/3253] osinfo-db: 20180903 -> 20180920

---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 93ee6d38c7c3..0a5f7b313065 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180903";
+  name = "osinfo-db-20180920";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9";
+    sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 4bc001e41bdb8ee53e70d4676e140cc11675229c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 23:44:27 -0500
Subject: [PATCH 2008/3253] libosinfo: 1.1.0 -> 1.2.0

---
 pkgs/development/libraries/libosinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 111bea61eb65..d77a691ba4b7 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libosinfo-1.1.0";
+  name = "libosinfo-1.2.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
-    sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0";
+    sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From dacdf8b6c7a8250aa763a471a2c6c8948ab3529e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 00:04:25 -0500
Subject: [PATCH 2009/3253] libosinfo: pick upstream patches to fix bug causing
 test failure

---
 ...pand-the-arch-s-parser-for-isodetect.patch | 40 +++++++++++++++++++
 ...nchored-patterns-when-matching-regex.patch | 34 ++++++++++++++++
 .../libraries/libosinfo/default.nix           |  2 +
 3 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
 create mode 100644 pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch

diff --git a/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch b/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
new file mode 100644
index 000000000000..7dcbb75df396
--- /dev/null
+++ b/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
@@ -0,0 +1,40 @@
+From b9cb227842948b1b2289cdd3e9b8d925664c2ee7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Fri, 7 Sep 2018 15:04:20 +0200
+Subject: [PATCH 1/2] tests: Expand the arch's parser for isodetect
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some Windows ISOs isodata, as the ones added as part of commit 857f503,
+uses X64 and X86 and load_iso() didn't take those into consideration.
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+---
+ tests/test-isodetect.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
+index 415770b..76f0c5a 100644
+--- a/tests/test-isodetect.c
++++ b/tests/test-isodetect.c
+@@ -106,6 +106,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
+     info->langs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+     if (strstr(name, "amd64") ||
+              strstr(name, "x64") ||
++             strstr(name, "X64") ||
+              strstr(name, "x86_64") ||
+              strstr(name, "64bit") ||
+              strstr(name, "64-bit"))
+@@ -114,6 +115,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
+              strstr(name, "i586") ||
+              strstr(name, "i686") ||
+              strstr(name, "x86") ||
++             strstr(name, "X86") ||
+              strstr(name, "32bit") ||
+              strstr(name, "32-bit"))
+         arch = "i386";
+-- 
+2.19.0
+
diff --git a/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch b/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
new file mode 100644
index 000000000000..b47c93f3d390
--- /dev/null
+++ b/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
@@ -0,0 +1,34 @@
+From e6168463f4fc659b9827b5c8694dc1c6d7d5239a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Fri, 7 Sep 2018 15:53:20 +0200
+Subject: [PATCH 2/2] db: Force anchored patterns when matching regex
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without forcing anchored patterns some matches may be completely wrong
+as "(J_)?CENN?A_X64FREV" (volume-id for Windows 10) that could be taken
+as a match for "HRM_CENNA_X64FREV" (volume-id of a Windows 8 ISO).
+
+Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+---
+ osinfo/osinfo_db.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
+index fa14c6d..f4b3a8c 100644
+--- a/osinfo/osinfo_db.c
++++ b/osinfo/osinfo_db.c
+@@ -37,7 +37,7 @@ G_DEFINE_TYPE(OsinfoDb, osinfo_db, G_TYPE_OBJECT);
+ #define match_regex(pattern, str)                                       \
+     (((pattern) == NULL) ||                                             \
+      (((str) != NULL) &&                                                \
+-      g_regex_match_simple((pattern), (str), 0, 0)))
++      g_regex_match_simple((pattern), (str), 0, G_REGEX_MATCH_ANCHORED)))
+ 
+ static gchar *get_raw_lang(const char *volume_id, const gchar *regex_str)
+ {
+-- 
+2.19.0
+
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index d77a691ba4b7..3a3dc6952a61 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./osinfo-db-data-dir.patch
+    ./0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
+    ./0002-db-Force-anchored-patterns-when-matching-regex.patch
   ];
 
   postPatch = ''

From f51a495a2464ee96eeb6ee66e10c59291ff33f64 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 29 Sep 2018 01:29:10 -0500
Subject: [PATCH 2010/3253] notmuch-bower: 2017-09-27 -> 0.8.1 (#47510)

0.8.1 was released Mar 31, 2018, so lets move this up to stable.
---
 .../networking/mailreaders/notmuch-bower/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index dbdd64d06b5e..f99a192889c9 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "notmuch-bower-${version}";
-  version = "2017-09-27";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "wangp";
     repo = "bower";
-    rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f";
-    sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i";
+    rev = version;
+    sha256 = "0rdjip6jq7qlfn640ci81m9vfgcn4q5vaj72zp3bria8m55a56rf";
   };
 
   nativeBuildInputs = [ gawk mercury pandoc ];

From 7af3a85d8d1a91b57b6cdee0b2e5d88981f310fa Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 28 Sep 2018 14:38:56 +0200
Subject: [PATCH 2011/3253] steamPackages.steam: 1.0.0.51 -> 1.0.0.56

---
 pkgs/games/steam/steam.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index d0b221c51339..dd6e9a070b19 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,14 +2,14 @@
 
 let
   traceLog = "/tmp/steam-trace-dependencies.log";
-  version = "1.0.0.51";
+  version = "1.0.0.56";
 
 in stdenv.mkDerivation rec {
   name = "steam-original-${version}";
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
-    sha256 = "1ghrfznm9rckm8v87zvh7hx820r5pp7sq575wxwq0fncbyq6sxmz";
+    sha256 = "01jgp909biqf4rr56kb08jkl7g5xql6r2g4ch6lc71njgcsbn5fs";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

From a108b8617b78aa1a96504f08940a7667928378b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Sep 2018 11:36:59 +0200
Subject: [PATCH 2012/3253] pythonPackages.glances: 3.0.1 -> 3.0.2

---
 .../python-modules/glances/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +---------------
 2 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/glances/default.nix

diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
new file mode 100644
index 000000000000..3b0f61c36238
--- /dev/null
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage, fetchFromGitHub, isPyPy, lib
+, psutil, setuptools, bottle, batinfo, pysnmp
+, hddtemp
+, unittest2
+}:
+
+buildPythonPackage rec {
+  name = "glances-${version}";
+  version = "3.0.2";
+  disabled = isPyPy;
+
+  src = fetchFromGitHub {
+    owner = "nicolargo";
+    repo = "glances";
+    rev = "v${version}";
+    sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14";
+  };
+
+  # Requires access to /sys/class/power_supply
+  doCheck = false;
+
+  buildInputs = [ unittest2 ];
+  propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp ];
+
+  preConfigure = ''
+    sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
+  '';
+
+  meta = with lib; {
+    homepage = https://nicolargo.github.io/glances/;
+    description = "Cross-platform curses-based monitoring tool";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ primeos koral ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb512c0bd619..b3fe62baf0a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5828,35 +5828,7 @@ in {
     };
   };
 
-  glances = buildPythonPackage rec {
-    name = "glances-${version}";
-    version = "3.0.1";
-    disabled = isPyPy;
-
-    src = pkgs.fetchFromGitHub {
-      owner = "nicolargo";
-      repo = "glances";
-      rev = "v${version}";
-      sha256 = "18pyp6ij3bzybqj771v48n7yn3a1spk6ncg1kgp6hfpjhpqiw87x";
-    };
-
-    # Requires access to /sys/class/power_supply
-    doCheck = false;
-
-    buildInputs = with self; [ unittest2 ];
-    propagatedBuildInputs = with self; [ psutil setuptools bottle batinfo pkgs.hddtemp pysnmp ];
-
-    preConfigure = ''
-      sed -i 's/data_files\.append((conf_path/data_files.append(("etc\/glances"/' setup.py;
-    '';
-
-    meta = {
-      homepage = https://nicolargo.github.io/glances/;
-      description = "Cross-platform curses-based monitoring tool";
-      license = licenses.lgpl3;
-      maintainers = with maintainers; [ primeos koral ];
-    };
-  };
+  glances = callPackage ../development/python-modules/glances { };
 
   github3_py = buildPythonPackage rec {
     name = "github3.py-${version}";

From 62b15996a71ff206038408a30eea290bfc8cda92 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Fri, 28 Sep 2018 17:36:40 +0200
Subject: [PATCH 2013/3253] mozilla-plugins/trezor: remove
 applications/networking/browsers/mozilla-plugins/trezor

trezor-mozilla-plugin is no longer maintained software

package pkgs/servers/trezord should be used instead
---
 .../networking/browsers/firefox/wrapper.nix   |  3 +-
 .../mozilla-plugins/trezor/default.nix        | 46 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8b06c35fe005..1c214230e4ed 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -4,7 +4,7 @@
 , flashplayer, hal-flash
 , MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
 , jrePlugin, icedtea_web
-, trezor-bridge, bluejeans, djview4, adobe-reader
+, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
 , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
@@ -55,7 +55,6 @@ let
           ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
           ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
           ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
-          ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
           ++ lib.optional (cfg.enableBluejeans or false) bluejeans
           ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
           ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
deleted file mode 100644
index 5f7f601b3545..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, dpkg }:
-
-stdenv.mkDerivation {
-  name = "TREZOR-bridge-1.0.5";
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  src =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_amd64.deb;
-        sha256 = "0097h4v88yca4aayzprrh4pk03xvvj7ncz2mi83chm81gsr2v67z";
-      }
-    else
-      fetchurl {
-        url    = https://mytrezor.com/data/plugin/1.0.5/browser-plugin-trezor_1.0.5_i386.deb;
-        sha256 = "0xzbq78s3ivg00f0bj6gyjgf47pvjx2l4mm05jjmdar60bf1xr1n";
-      };
-
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
-
-  installPhase = ''
-    mkdir -p $out/etc/udev/rules.d/ $out/lib/mozilla/plugins
-    cp ./lib/udev/rules.d/51-trezor-udev.rules $out/etc/udev/rules.d/
-    cp ./usr/lib/mozilla/plugins/npBitcoinTrezorPlugin.so $out/lib/mozilla/plugins
-  '';
-
-  meta = with stdenv.lib;
-    { description = "Plugin for browser to TREZOR device communication";
-      homepage = https://mytrezor.com;
-      license = licenses.unfree;
-      maintainers = with maintainers; [ ehmry ];
-      # Download URL, .deb content & hash (yikes) changed, not version.
-      # New archive doesn't contain any Mozilla plugin at all.
-      broken = true;
-      platforms = platforms.linux;
-   };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..9cbea8c3a44c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19032,8 +19032,6 @@ with pkgs;
 
   treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; };
 
-  trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { };
-
   tribler = callPackage ../applications/networking/p2p/tribler { };
 
   trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };

From 2f92b456ac5aae061ca2995321b3fe69ff14bc73 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sat, 29 Sep 2018 13:31:26 +0200
Subject: [PATCH 2014/3253] dbmate: init at 1.4.1

---
 .../tools/database/dbmate/default.nix         | 25 ++++++
 .../tools/database/dbmate/deps.nix            | 84 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 111 insertions(+)
 create mode 100644 pkgs/development/tools/database/dbmate/default.nix
 create mode 100644 pkgs/development/tools/database/dbmate/deps.nix

diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
new file mode 100644
index 000000000000..14fcc3f8607c
--- /dev/null
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dbmate-${version}";
+  version = "1.4.1";
+
+  goPackagePath = "github.com/amacneil/dbmate";
+
+  src = fetchFromGitHub {
+    owner = "amacneil";
+    repo = "dbmate";
+    rev = "v${version}";
+    sha256 = "0s3l51kmpsaikixq1yxryrgglzk4kfrjagcpf1i2bkq4wc5gyv5d";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Database migration tool";
+    homepage = https://dbmate.readthedocs.io;
+    license = licenses.mit;
+    maintainers = [ maintainers.manveru ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix
new file mode 100644
index 000000000000..97bfc10b20af
--- /dev/null
+++ b/pkgs/development/tools/database/dbmate/deps.nix
@@ -0,0 +1,84 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev =  "2cc627ac8defc45d65066ae98f898166f580f9a4";
+      sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww";
+    };
+  }
+  {
+    goPackagePath  = "github.com/joho/godotenv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/joho/godotenv";
+      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
+      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev =  "19c8e9ad00952ce0c64489b60e8df88bb16dd514";
+      sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev =  "6c771bb9887719704b210e87e934f08be014bdb1";
+      sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
+      sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
+      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6bbd0598ee7..3ce2f9390fe3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6439,6 +6439,8 @@ with pkgs;
 
   crystal = callPackage ../development/compilers/crystal { };
 
+  dbmate = callPackage ../development/tools/database/dbmate { };
+
   devpi-client = callPackage ../development/tools/devpi-client {};
 
   devpi-server = callPackage ../development/tools/devpi-server {};

From ce36f634c16241504d7ef94e358ce820d86e7218 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 29 Sep 2018 05:01:21 -0700
Subject: [PATCH 2015/3253] wireguard-tools: Fix build

---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 4f71d6bc2e4f..3f1949d4bb68 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/src/tools";
 
-  nativeBuildInputs = [ (optional stdenv.isDarwin makeWrapper) ];
-  buildInputs = [ (optional stdenv.isLinux libmnl) ];
+  nativeBuildInputs = optional stdenv.isDarwin makeWrapper;
+  buildInputs = optional stdenv.isLinux libmnl;
 
   makeFlags = [
     "DESTDIR=$(out)"

From 5c5ea8b9eab764ed832e14e3945b76877fe5e17f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 10:44:47 -0500
Subject: [PATCH 2016/3253] libreoffice-fresh: 6.1.1.2 -> 6.1.2.1

---
 .../applications/office/libreoffice/default-primary-src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 711411cd0124..d775ae411f70 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "6";
   minor = "1";
-  patch = "1";
-  tweak = "2";
+  patch = "2";
+  tweak = "1";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "228166908a3404cbb8e6e662f44b1af8644c0589b2309fadce89dcef112fd09d";
+    sha256 = "650c57b60f880db28e49e584f42018da9e714865dfa94fbb8391de15b58a3f91";
   };
 }

From 00262d7d073921566464a200a9aef985a4cd50ed Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 10:57:45 -0500
Subject: [PATCH 2017/3253] libreoffice-srcs.nix: regen (openssl 1.0.2o ->
 1.0.2p)

---
 pkgs/applications/office/libreoffice/libreoffice-srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index aac3ed155202..ce3b3533bec3 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -658,11 +658,11 @@
     md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
-    name = "openssl-1.0.2o.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz";
-    sha256 = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d";
+    name = "openssl-1.0.2p.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz";
+    sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00";
     md5 = "";
-    md5name = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d-openssl-1.0.2o.tar.gz";
+    md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz";
   }
   {
     name = "liborcus-0.13.4.tar.gz";

From 41cb5926db4534970a2cfcb7eddbd83e386ed526 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 11:02:52 -0500
Subject: [PATCH 2018/3253] libreoffice-fresh: update hashes for help and
 translations

---
 pkgs/applications/office/libreoffice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index aa0cdc703455..93c14929aa42 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -48,14 +48,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "2933d0898fbc8ea32cb39b773cf49c5f7da165f75a33522ff91c88d7bd0c7440";
+      sha256 = "33e13d07e9328cdbccbd019ab2491f74f5bb897707886c074791080881544bcc";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "41e1af094f2ca5a9ab88894c2dceca2d91e6c28568d7f002f56c647e973cc595";
+      sha256 = "dffee97ffce5b4979140aa56fa333608e7b004bfc2451245bab33ed97fc4c205";
     };
 
   };

From 551d20377585730378d1f53b8c351d2b2aebee2a Mon Sep 17 00:00:00 2001
From: Eric Evenchick <eric@evenchick.com>
Date: Wed, 29 Aug 2018 18:20:57 -0400
Subject: [PATCH 2019/3253] can-isotp: init at 20180629

changed license to gpl2
---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/os-specific/linux/can-isotp/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/os-specific/linux/can-isotp/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1d6d772e7e95..a951e33e0c23 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1302,6 +1302,11 @@
     github = "etu";
     name = "Elis Hirwing";
   };
+  evck = {
+    email = "eric@evenchick.com";
+    github = "ericevenchick";
+    name = "Eric Evenchick";
+  };
   exfalso = {
     email = "0slemi0@gmail.com";
     github = "exfalso";
diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix
new file mode 100644
index 000000000000..0c32c3f5e62a
--- /dev/null
+++ b/pkgs/os-specific/linux/can-isotp/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, kernel, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "can-isotp-${version}";
+  version = "20180629";
+
+  hardeningDisable = [ "pic" ];
+  
+  src = fetchFromGitHub {
+    owner = "hartkopp";
+    repo = "can-isotp";
+    rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d";
+    sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7";
+  };
+
+  KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  INSTALL_MOD_PATH = "\${out}";
+
+  buildPhase = ''
+    make modules
+  '';
+
+  installPhase = ''
+    make modules_install
+  '';
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+  
+  meta = with stdenv.lib; {
+    description = "Kernel module for ISO-TP (ISO 15765-2)";
+    homepage = "https://github.com/hartkopp/can-isotp";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.evck ];
+  };
+}  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebf6f4f36e8d..7eb97cd3a96f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14176,6 +14176,8 @@ with pkgs;
      }) zfsStable zfsUnstable;
 
      zfs = zfsStable;
+
+     can-isotp = callPackage ../os-specific/linux/can-isotp { };
   });
 
   # The current default kernel / kernel modules.

From d1619bb81dcd5b19055aee63aff78d42123e2339 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 13:05:44 -0500
Subject: [PATCH 2020/3253] vim-plugin-names: add 'ferret', 'workflowish', few
 colorschemes

---
 pkgs/misc/vim-plugins/vim-plugin-names | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index df6b33a53c06..a23bc20e4069 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -60,6 +60,7 @@ esneider/YUNOcommit.vim
 farmergreg/vim-lastplace
 fatih/vim-go
 FelikZ/ctrlp-py-matcher
+fenetikm/falcon
 fisadev/vim-isort
 flazz/vim-colorschemes
 floobits/floobits-neovim
@@ -119,6 +120,7 @@ kana/vim-operator-replace
 kana/vim-operator-user
 kana/vim-tabpagecd
 kchmck/vim-coffee-script
+KeitaNakamura/neodark.vim
 keith/swift.vim
 kien/rainbow_parentheses.vim
 konfekt/fastfold
@@ -134,6 +136,7 @@ lfilho/cosco.vim
 LnL7/vim-nix
 ludovicchabant/vim-gutentags
 ludovicchabant/vim-lawrencium
+lukaszkorecki/workflowish
 luochen1990/rainbow
 lyokha/vim-xkbswitch
 machakann/vim-highlightedyank
@@ -166,6 +169,7 @@ megaannum/forms
 megaannum/self
 mfukar/robotframework-vim
 mhinz/vim-grepper
+mhinz/vim-janah
 mhinz/vim-sayonara
 mhinz/vim-signify
 mhinz/vim-startify
@@ -185,7 +189,9 @@ ncm2/ncm2-ultisnips
 neoclide/vim-easygit
 neovimhaskell/haskell-vim
 neovim/nvimdev.nvim
+neutaaaaan/iosvkem
 nixprime/cpsm
+NLKNguyen/papercolor-theme
 noc7c9/vim-iced-coffee-script
 osyo-manga/shabadou.vim
 osyo-manga/vim-anzu
@@ -194,6 +200,7 @@ osyo-manga/vim-watchdogs
 pangloss/vim-javascript
 parsonsmatt/intero-neovim
 peterhoeg/vim-qml
+phanviet/vim-monokai-pro
 plasticboy/vim-markdown
 powerman/vim-plugin-AnsiEsc
 python-mode/python-mode
@@ -203,6 +210,7 @@ rafaqz/ranger.vim
 rafi/awesome-vim-colorschemes
 raghur/vim-ghost
 raichoo/purescript-vim
+rakr/vim-one
 reedes/vim-pencil
 reedes/vim-wordy
 rhysd/committia.vim
@@ -245,6 +253,7 @@ sjl/gundo.vim
 sjl/splice.vim
 sk1418/last256
 slashmili/alchemist.vim
+sonph/onehalf
 t9md/vim-smalls
 takac/vim-hardtime
 ternjs/tern_for_vim
@@ -319,6 +328,7 @@ wakatime/vim-wakatime
 wellle/targets.vim
 will133/vim-dirdiff
 wincent/command-t
+wincent/ferret
 xolox/vim-easytags
 xolox/vim-misc
 xuhdev/vim-latex-live-preview

From fc5eb7ff74b58f8d1ce7c92f14cf17421198b059 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 29 Sep 2018 13:10:54 -0500
Subject: [PATCH 2021/3253] vim-plugins: regen for new additions, updates
 (2018-09-29)

---
 pkgs/misc/vim-plugins/generated.nix | 166 ++++++++++++++++++++++------
 1 file changed, 133 insertions(+), 33 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a9a997546351..0e4d7bb5e2f1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-20";
+    name = "ale-2018-09-29";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "aa5c82b1718f44d04f6dd11bc63f6eeed2089d9d";
-      sha256 = "03m19d6zcsjr5ydbnkpa93k82sq70lj44l2shw7szjzxxyzb2h14";
+      rev = "04ed87c8829015ff3653a35fb4f6d7a71668d736";
+      sha256 = "1iw0chk1sg60yaxzj3m7dp9j7cn8wpklxvz082isk5y1ndcfqz5w";
     };
   };
 
@@ -264,12 +264,12 @@
   };
 
   csv-vim = buildVimPluginFrom2Nix {
-    name = "csv-vim-2018-08-21";
+    name = "csv-vim-2018-09-26";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
-      rev = "23bc07d2f6b755f2194210dcebf912093849404d";
-      sha256 = "0c2m2nvm5j6hsyhhjqlh9g1df7zhxwxsb9n2mamicncaqay7kx9x";
+      rev = "41e9bd08371c253e7c8d1cb4d16066f8132c5a1c";
+      sha256 = "1fvlw39a8vv3vxrpsg6f25is3drp2j83giydp06h3fyzgqgqfsfx";
     };
   };
 
@@ -334,12 +334,12 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-09-15";
+    name = "denite-nvim-2018-09-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "8685cfbb7f0a4bea173a6b08a72a33ef70780334";
-      sha256 = "0zc15802hda59x42k0962fmawjq021y7ys10h4ypnwy50cn1vjzj";
+      rev = "67351fc647450ed17f164ca68758d8753e8f0f13";
+      sha256 = "1zxqdwx351z5hf8yr3b86ymxajlywkv9jr3dvnn8lhpipavkvmwf";
     };
   };
 
@@ -477,6 +477,16 @@
     };
   };
 
+  falcon = buildVimPluginFrom2Nix {
+    name = "falcon-2018-09-15";
+    src = fetchFromGitHub {
+      owner = "fenetikm";
+      repo = "falcon";
+      rev = "0dbdbf568321bc29ac143370d1b75dc651fd083f";
+      sha256 = "0scds1fc433qcnghxplczama83w65iza9dhq3qnyhr085hyisck3";
+    };
+  };
+
   fastfold = buildVimPluginFrom2Nix {
     name = "fastfold-2018-09-24";
     src = fetchFromGitHub {
@@ -487,6 +497,16 @@
     };
   };
 
+  ferret = buildVimPluginFrom2Nix {
+    name = "ferret-2018-03-23";
+    src = fetchFromGitHub {
+      owner = "wincent";
+      repo = "ferret";
+      rev = "b1ef0cf4af92c3a896821597d0d1a44b9c93dc5a";
+      sha256 = "1gpbk396a7pihi6pg2jmxwv6nibprbcr8fg73kxs6kj0d60wgasy";
+    };
+  };
+
   flake8-vim = buildVimPluginFrom2Nix {
     name = "flake8-vim-2017-02-17";
     src = fetchFromGitHub {
@@ -678,23 +698,33 @@
     };
   };
 
+  iosvkem = buildVimPluginFrom2Nix {
+    name = "iosvkem-2018-08-26";
+    src = fetchFromGitHub {
+      owner = "neutaaaaan";
+      repo = "iosvkem";
+      rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1";
+      sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm";
+    };
+  };
+
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
-    name = "Jenkinsfile-vim-syntax-2018-04-04";
+    name = "Jenkinsfile-vim-syntax-2018-09-25";
     src = fetchFromGitHub {
       owner = "martinda";
       repo = "Jenkinsfile-vim-syntax";
-      rev = "45418b171e06f63e0814cac6a656832384708aba";
-      sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p";
+      rev = "030cd312f7de1786bb5a1f392fa59f7a105054df";
+      sha256 = "17lw8rd2fhybwkhrz8lg1p7b552ki669kr2wlpjb6agkgaiifj8q";
     };
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-09-09";
+    name = "julia-vim-2018-09-26";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "3018668f89ca4bf125d1d57effdea88b07a3b466";
-      sha256 = "13fn3566ql4fcqzh6lfb6qj2xyqyvz70psc67k184k88arqm3y55";
+      rev = "9fe5ce6e4e373ed34a4462bbfac6cedfceb30c22";
+      sha256 = "1xww17h56q1fl83yvfz1kw6v57070ab904l3c0r97s9x0mirlvxb";
     };
   };
 
@@ -878,6 +908,16 @@
     };
   };
 
+  neodark-vim = buildVimPluginFrom2Nix {
+    name = "neodark-vim-2018-05-26";
+    src = fetchFromGitHub {
+      owner = "KeitaNakamura";
+      repo = "neodark.vim";
+      rev = "c966731b54a64b379ca5519c25d3cedb90df1d31";
+      sha256 = "0rimpx3569lr4whg7lc0nym0irminwf6r6f2wr320pdhhfx7a0ch";
+    };
+  };
+
   neoformat = buildVimPluginFrom2Nix {
     name = "neoformat-2018-09-22";
     src = fetchFromGitHub {
@@ -1028,6 +1068,16 @@
     };
   };
 
+  onehalf = buildVimPluginFrom2Nix {
+    name = "onehalf-2018-09-16";
+    src = fetchFromGitHub {
+      owner = "sonph";
+      repo = "onehalf";
+      rev = "ecc3d8d5691b8d3b39345a4400e631638bc078f7";
+      sha256 = "13w5n64wlwp70m74j2k12csm6ajq7jwgg7dq25azwrvxixi3iy9p";
+    };
+  };
+
   open-browser-vim = buildVimPluginFrom2Nix {
     name = "open-browser-vim-2018-04-26";
     src = fetchFromGitHub {
@@ -1038,6 +1088,16 @@
     };
   };
 
+  papercolor-theme = buildVimPluginFrom2Nix {
+    name = "papercolor-theme-2018-09-04";
+    src = fetchFromGitHub {
+      owner = "NLKNguyen";
+      repo = "papercolor-theme";
+      rev = "5bd7d5b3f9dd0650e6bbd1756feebe1651fa6ba8";
+      sha256 = "061551ih3pndnlimxqwa5hrxwn8knpzf87hr6q3zwr9pdfmqpm9l";
+    };
+  };
+
   peskcolor-vim = buildVimPluginFrom2Nix {
     name = "peskcolor-vim-2016-06-11";
     src = fetchFromGitHub {
@@ -1449,12 +1509,12 @@
   };
 
   unite-vim = buildVimPluginFrom2Nix {
-    name = "unite-vim-2018-08-06";
+    name = "unite-vim-2018-09-26";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "unite.vim";
-      rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586";
-      sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v";
+      rev = "e68ccde4192b3faa3717897e65dc7dd8ab87524a";
+      sha256 = "1r22lwzs92ylzl0hs0ny36vr787jwkf65da9dv0zvz2p5ank5ykw";
     };
   };
 
@@ -1679,12 +1739,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-23";
+    name = "vim-airline-2018-09-25";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "2390022e33dc5eac6872a09ec39ee769298e1ef3";
-      sha256 = "1b2y6zz0478ih1zbjqk2mirgbj1vnsi93ggjgfdvmxm8j9lh22h3";
+      rev = "a0298263b7fd55827839862ffd3a8d5b2a787a5c";
+      sha256 = "115mwvkqhfrssihrlb1ds3f82gqmp6ph75nw24l4lwdr1nv6p1r0";
     };
   };
 
@@ -2099,12 +2159,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-24";
+    name = "vim-go-2018-09-26";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "5ec87ee2dd3443bb5d0c7f7331bec1d1ed60df9f";
-      sha256 = "066sja0f78a11943fwilz40csnm13gqzff23hj6hwrlxjq31ysy4";
+      rev = "3d8e82ecb4f66a151f3c1bff84728fa4e3db0ca9";
+      sha256 = "1fy7xsqrdqs569g03hccxpi17qjkibspjjcpddw7a9n5hb7zp8rv";
     };
   };
 
@@ -2189,12 +2249,12 @@
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
-    name = "vim-highlightedyank-2018-06-01";
+    name = "vim-highlightedyank-2018-09-28";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
-      rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a";
-      sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk";
+      rev = "ac2eeb8b384c27a4167fdf1788c2cae93f34ab07";
+      sha256 = "0i4ddagfbrii96msgfsmjsg356z3y71nab84850xqy74m2iivl8m";
     };
   };
 
@@ -2288,6 +2348,16 @@
     };
   };
 
+  vim-janah = buildVimPluginFrom2Nix {
+    name = "vim-janah-2017-04-09";
+    src = fetchFromGitHub {
+      owner = "mhinz";
+      repo = "vim-janah";
+      rev = "684a3343f36bb0f1e7c33281321fa3a70c08aa26";
+      sha256 = "0hq626cvyz5x6fmsqgdfp46pr783p6cz8bl49278gkcdgfb91wnr";
+    };
+  };
+
   vim-javacomplete2 = buildVimPluginFrom2Nix {
     name = "vim-javacomplete2-2018-09-18";
     src = fetchFromGitHub {
@@ -2459,6 +2529,16 @@
     };
   };
 
+  vim-monokai-pro = buildVimPluginFrom2Nix {
+    name = "vim-monokai-pro-2018-06-14";
+    src = fetchFromGitHub {
+      owner = "phanviet";
+      repo = "vim-monokai-pro";
+      rev = "75b2794a057f0ea6b2485ae622e92bb0687d4c9b";
+      sha256 = "1l9cdsilpzyg9y0az7627gi10qyfyjxn9dvi571q7n1vrv6nhl2d";
+    };
+  };
+
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     name = "vim-multiple-cursors-2018-08-10";
     src = fetchFromGitHub {
@@ -2509,6 +2589,16 @@
     };
   };
 
+  vim-one = buildVimPluginFrom2Nix {
+    name = "vim-one-2018-07-22";
+    src = fetchFromGitHub {
+      owner = "rakr";
+      repo = "vim-one";
+      rev = "08aca1b5d8cd83106a430f150aa77b4148f6cd5e";
+      sha256 = "13ldimmm839s8a96l37s8pjx1rrr0cnkjyfiapp1c1n640qn1rd9";
+    };
+  };
+
   vim-operator-replace = buildVimPluginFrom2Nix {
     name = "vim-operator-replace-2015-02-24";
     src = fetchFromGitHub {
@@ -2840,12 +2930,12 @@
   };
 
   vim-snippets = buildVimPluginFrom2Nix {
-    name = "vim-snippets-2018-09-24";
+    name = "vim-snippets-2018-09-25";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "cd463f36f3d449fcb6f21b1385b79c9cbcb16f36";
-      sha256 = "18k63ixxk10rws5z6gplyjgakxc6zhblh2c7jkcbrqv0dv0xhywv";
+      rev = "b51c01137259ac7cd59381001279fa36baefbc5f";
+      sha256 = "00ydadqq5nj94ldcd9ld45hkx6micd3mfllvn5csxbg4vw0p5472";
     };
   };
 
@@ -3170,12 +3260,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-23";
+    name = "vimtex-2018-09-28";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "d16ae14c15bb597c5421cff6c3abf6f9aae22bca";
-      sha256 = "083h9xq25sv6zxcp000gbs7npwfb367m4xdmcz1b80hgv7gnwwr9";
+      rev = "196a8aa7e9f9d04c69adfa7643b0e6ae6b0d3b3b";
+      sha256 = "0d7322cflmi3sxh6nncslp3qdgd766k2mcplgji2744xff65bvma";
     };
   };
 
@@ -3219,6 +3309,16 @@
     };
   };
 
+  workflowish = buildVimPluginFrom2Nix {
+    name = "workflowish-2015-12-03";
+    src = fetchFromGitHub {
+      owner = "lukaszkorecki";
+      repo = "workflowish";
+      rev = "65472189814dddd060aaa558103d837c2f9a5ec9";
+      sha256 = "044jxkcbycmmahi98qd0ynpc8baay72i45qymv4mxvl1d96fjbmd";
+    };
+  };
+
   xptemplate = buildVimPluginFrom2Nix {
     name = "xptemplate-2017-12-06";
     src = fetchFromGitHub {

From eaefbb83e2b1e13ada7532cd4952bfff483a21f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:13:06 -0700
Subject: [PATCH 2022/3253] nwjs: 0.32.2 -> 0.32.4 (#46231)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
nwjs
---
 pkgs/development/tools/nwjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index bd0c7f5002c3..04cbdb6f5748 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -30,12 +30,12 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nwjs-${version}";
-  version = "0.32.2";
+  version = "0.32.4";
 
   src = fetchurl {
     url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
     sha256 = if bits == "x64" then
-      "0f0p17mbr24zhzm2cf77ddy6yj4k0k181dzf4gxdf8szd5vxpliy" else
+      "0hzyiy6sbbjll1b946y3v7bv6sav3rhy4c48d4vcvamyv9pkfn45" else
       "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250";
   };
 

From 42c9c31ad9db294c733f5ada1d3a9c0a5d62749f Mon Sep 17 00:00:00 2001
From: Sean Haugh <sean@lfo.team>
Date: Sat, 29 Sep 2018 13:16:32 -0500
Subject: [PATCH 2023/3253] vimPlugins.wal-vim: init at 2018-06-04

---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a9a997546351..785ed578f6c5 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3199,6 +3199,16 @@
     };
   };
 
+  wal-vim = buildVimPluginFrom2Nix {
+    name = "wal-vim-2018-06-04";
+    src = fetchFromGitHub {
+      owner = "dylanaraps";
+      repo = "wal.vim";
+      rev = "fb6ce53632f93c31cad66398636bfb383ad64d52";
+      sha256 = "1f0rpaff7q9xswc1p5pmwzmhb70s4q148dj2apg98d4qywa9j8ah";
+    };
+  };
+
   webapi-vim = buildVimPluginFrom2Nix {
     name = "webapi-vim-2018-03-14";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index df6b33a53c06..c02fc0cf938f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -42,6 +42,7 @@ dhruvasagar/vim-table-mode
 digitaltoad/vim-jade
 dleonard0/pony-vim-syntax
 dracula/vim
+dylanaraps/wal.vim
 drmingdrmer/xptemplate
 eagletmt/ghcmod-vim
 eagletmt/neco-ghc

From 7e7c0f9e7ab90e3978bc208301ebf2be42b0f62f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:21:00 -0700
Subject: [PATCH 2024/3253] netsurf.buildsystem: 1.6 -> 1.7 (#46249)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
netsurf-buildsystem
---
 pkgs/applications/misc/netsurf/buildsystem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index f25180505e87..882bb75219d6 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "netsurf-buildsystem-${version}";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
-    sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x";
+    sha256 = "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw";
   };
 
   makeFlags = [

From 01754b7ab2ea0c4b1ed99c239cf8af7a620598ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:26:18 -0700
Subject: [PATCH 2025/3253] gzdoom: 3.5.0 -> 3.5.1 (#46276)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
gzdoom
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 3720c109ced7..0f95fa9aaf7f 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "04wdcm7jky8bm01ndx46q3pq7ma6npjwmp204gxidmdwjhn0bfyp";
+    sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From f23fab4708138ebd4e20cb4ffeb7676be7e28f12 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:37:54 -0700
Subject: [PATCH 2026/3253] mpd_clientlib: 2.14 -> 2.15 (#46258)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libmpdclient
---
 pkgs/servers/mpd/clientlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 478d43722679..5201e150e2ab 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.14";
+  version = "2.15";
   name = "libmpdclient-${version}";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm";
+    sha256 = "18x6drzh867afwaakyfb8hcx37pnxxwvvpcs3n2fimnfa6vxgwaa";
   };
 
   nativeBuildInputs = [ meson ninja ]

From 154089109ad7f2caab2f9166bfa8ed17ab0b7185 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:44:15 -0700
Subject: [PATCH 2027/3253] smtube: 18.3.0 -> 18.9.0 (#46960)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/smtube/versions
---
 pkgs/applications/video/smtube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 32610d08f339..0188bb4784d6 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmake, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "18.3.0";
+  version = "18.9.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb";
+    sha256 = "1211vqgmbrqr8mcsyawirmqkzq05g1xwigx6lswnyxd88x37w6fg";
   };
 
   makeFlags = [

From 2df4b3e6eba48ee1a5e2fc7d0d7b7dc1988bb408 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Sep 2018 11:59:48 +0200
Subject: [PATCH 2028/3253] pythonPackages.glances: Enable the tests (skip the
 failing ones)

---
 .../python-modules/glances/default.nix        |  4 +-
 .../glances/skip-failing-tests.patch          | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/glances/skip-failing-tests.patch

diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/development/python-modules/glances/default.nix
index 3b0f61c36238..f25723e7ec72 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/development/python-modules/glances/default.nix
@@ -16,8 +16,10 @@ buildPythonPackage rec {
     sha256 = "1jkjblfk4gbr00j7lny7ajiizzqnp0p1yhzfi14074gwk38z0q14";
   };
 
+  patches = lib.optional doCheck ./skip-failing-tests.patch;
+
   # Requires access to /sys/class/power_supply
-  doCheck = false;
+  doCheck = true;
 
   buildInputs = [ unittest2 ];
   propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp hddtemp ];
diff --git a/pkgs/development/python-modules/glances/skip-failing-tests.patch b/pkgs/development/python-modules/glances/skip-failing-tests.patch
new file mode 100644
index 000000000000..f47f1218aea5
--- /dev/null
+++ b/pkgs/development/python-modules/glances/skip-failing-tests.patch
@@ -0,0 +1,52 @@
+diff --git a/unitest.py b/unitest.py
+--- a/unitest.py
++++ b/unitest.py
+@@ -59,6 +59,7 @@ class TestGlances(unittest.TestCase):
+         """The function is called *every time* before test_*."""
+         print('\n' + '=' * 78)
+ 
++    @unittest.skip("Requires access to /etc/mtab")
+     def test_000_update(self):
+         """Update stats (mandatory step for all the stats).
+ 
+@@ -87,6 +88,7 @@ class TestGlances(unittest.TestCase):
+         for plugin in plugins_to_check:
+             self.assertTrue(plugin in plugins_list)
+ 
++    @unittest.skip("Fails on NixOS")
+     def test_002_system(self):
+         """Check SYSTEM plugin."""
+         stats_to_check = ['hostname', 'os_name']
+@@ -97,6 +99,7 @@ class TestGlances(unittest.TestCase):
+             self.assertTrue(stat in stats_grab, msg='Cannot find key: %s' % stat)
+         print('INFO: SYSTEM stats: %s' % stats_grab)
+ 
++    @unittest.skip("Fails on NixOS")
+     def test_003_cpu(self):
+         """Check CPU plugin."""
+         stats_to_check = ['system', 'user', 'idle']
+@@ -110,7 +113,7 @@ class TestGlances(unittest.TestCase):
+             self.assertLessEqual(stats_grab[stat], 100)
+         print('INFO: CPU stats: %s' % stats_grab)
+ 
+-    @unittest.skipIf(WINDOWS, "Load average not available on Windows")
++    @unittest.skip("Fails on NixOS")
+     def test_004_load(self):
+         """Check LOAD plugin."""
+         stats_to_check = ['cpucore', 'min1', 'min5', 'min15']
+@@ -123,6 +126,7 @@ class TestGlances(unittest.TestCase):
+             self.assertGreaterEqual(stats_grab[stat], 0)
+         print('INFO: LOAD stats: %s' % stats_grab)
+ 
++    @unittest.skip("Fails on NixOS")
+     def test_005_mem(self):
+         """Check MEM plugin."""
+         stats_to_check = ['available', 'used', 'free', 'total']
+@@ -135,6 +139,7 @@ class TestGlances(unittest.TestCase):
+             self.assertGreaterEqual(stats_grab[stat], 0)
+         print('INFO: MEM stats: %s' % stats_grab)
+ 
++    @unittest.skip("Fails on NixOS")
+     def test_006_swap(self):
+         """Check MEMSWAP plugin."""
+         stats_to_check = ['used', 'free', 'total']

From 31540321146be6f7ac9efcae8227dc3b3b92ea9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:47:48 -0700
Subject: [PATCH 2029/3253] mbpfan: 2.0.2 -> 2.1.0 (#46998)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mbpfan/versions
---
 pkgs/os-specific/linux/mbpfan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix
index 77b0d915edb6..7351712b887d 100644
--- a/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/pkgs/os-specific/linux/mbpfan/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "mbpfan-${version}";
-  version = "2.0.2";
+  version = "2.1.0";
   src = fetchFromGitHub {
     owner = "dgraziotin";
     repo = "mbpfan";
     rev = "v${version}";
-    sha256 = "1l8fj92jxfp0sldvznsdsm3pn675b35clq3371h6d5wk4jx67fvg";
+    sha256 = "1gysq778rkl6dvvj9a1swxcl15wvz0bng5bn4nwq118cl8p8pask";
   };
   installPhase = ''
     mkdir -p $out/bin $out/etc

From 9d727e0a913a1a98908d49bdd91105a3b66b530c Mon Sep 17 00:00:00 2001
From: Tycho Grouwstra <tychogrouwstra@gmail.com>
Date: Sat, 29 Sep 2018 20:48:28 +0200
Subject: [PATCH 2030/3253] gitkraken: 4.0.2 -> 4.0.5 (#47512)

Fixes #47498. Note that the releases have moved to a new URL; I'm not sure they still host the earlier versions.
---
 pkgs/applications/version-management/gitkraken/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 051ea080fb4e..0fcbe54be175 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "4.0.2";
+  version = "4.0.5";
 
   src = fetchurl {
-    url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0dnckd75fcgc9wa4ivbnw2djmk4phzzr891snhxpsvb1dhlc7rgx";
+    url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
+    sha256 = "15wxcahlnz2k3331wqv30d5gq38fqh178hv87xky9b9vyh8qpcvz";
   };
 
   libPath = makeLibraryPath [

From 3a939278f74e0ea32745322d910672b4a5212694 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Sep 2018 20:49:18 +0200
Subject: [PATCH 2031/3253] gns3Packages.{server,gui}{Stable,Preview}: 2.1.10
 -> 2.1.11

---
 pkgs/applications/networking/gns3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 4260c3608522..3343141801eb 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.10";
+  stableVersion = "2.1.11";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "0vn33dcd3sfj5gna79vwm35l8aznga91a8r7i6q06dr4c2svml15";
-  serverSrcHash = "062dai1rb04dyrlrjgk0gr5hx0la8n1nalx0il1i7k1inwy52gj5";
+  guiSrcHash = "1skcb47r0wvv7l7z487b2165pwvc397b23abfq24kw79806vknzn";
+  serverSrcHash = "09j2nafxvgc6plk7s3qwv5qc0cc2bi41h4fhg8g7c85ixfx5yz8a";
 in {
   guiStable = mkGui {
     stable = true;

From 0cb95d27962c7890c0ecd86f871de4efc99cee35 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:54:14 -0700
Subject: [PATCH 2032/3253] pspg: 1.4.2 -> 1.6.2 (#46973)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pspg/versions
---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 21d81507dee0..60851b467ed1 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pspg-${version}";
-  version = "1.4.2";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "0hmx9p5pbydnf8sil4vqpmly5mq2rvcj8a33s9fvfisnxxsqz73v";
+    sha256 = "0gg94isnmng1qigghc2lrk4mvim20clbfhacwlxnd237ypv4mn2s";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d1b8d73464fb819587a624ebc515da829b37af14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 11:54:42 -0700
Subject: [PATCH 2033/3253] pgroonga: 2.0.9 -> 2.1.3 (#46984)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgroonga/versions
---
 pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index f4c7bfb1b85f..615a199ddb53 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.0.9";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz";
+    sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 639f7206482e1d1afa6662b0576866c804bc15dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 12:02:04 -0700
Subject: [PATCH 2034/3253] libisofs: 1.4.8 -> 1.5.0 (#47032)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libisofs/versions
---
 pkgs/development/libraries/libisofs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index d0217a908b9f..d52814483870 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libisofs-${version}";
-  version = "1.4.8";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
-    sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw";
+    sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
   };
 
   buildInputs = [ attr zlib ];

From 77f8e10fed57df469b6a8aeeeb5612f061167712 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 12:03:17 -0700
Subject: [PATCH 2035/3253] picard-tools: 2.18.12 -> 2.18.14 (#46978)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/picard-tools/versions
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index c141e6087bfc..e825d1e8454f 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.12";
+  version = "2.18.14";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm";
+    sha256 = "0xc5mqifav2j4zbln04q07wjlzpwp3w0y5iv5bkp4v5486cp2ha9";
   };
 
   buildInputs = [ jre makeWrapper ];

From 5a1652e5bf23197d267b62f9c28bf526640eb39a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 12:14:34 -0700
Subject: [PATCH 2036/3253] libburn: 1.4.8 -> 1.5.0 (#47034)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libburn/versions
---
 pkgs/development/libraries/libburn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index 76977b745197..f68141ef3b47 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libburn-${version}";
-  version = "1.4.8";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
-    sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y";
+    sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
   };
 
   meta = with stdenv.lib; {

From f2fe5f77093cf879cff892cb89203b994990c08e Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Sat, 29 Sep 2018 15:18:57 -0400
Subject: [PATCH 2037/3253] zig: 0.2.0 -> 0.3.0

---
 pkgs/development/compilers/zig/default.nix | 17 +++++------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 44d1f7bfe4a2..fd95635616fc 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }:
+{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.0";
+  version = "0.3.0";
   name = "zig-${version}";
 
   src = fetchFromGitHub {
-    owner = "zig-lang";
+    owner = "ziglang";
     repo = "zig";
     rev = "${version}";
-    sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07";
+    sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ];
+  buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
 
   cmakeFlags = [
-    "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
-    "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib"
     "-DCMAKE_BUILD_TYPE=Release"
-    "-DZIG_EACH_LIB_RPATH=On"
   ];
 
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)"
-  '';
-
   meta = with stdenv.lib; {
     description = "Programming languaged designed for robustness, optimality, and clarity";
     homepage = https://ziglang.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8460da60e9d..cc8c741fd733 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12679,7 +12679,7 @@ with pkgs;
   zmqpp = callPackage ../development/libraries/zmqpp { };
 
   zig = callPackage ../development/compilers/zig {
-    llvmPackages = llvmPackages_6;
+    llvmPackages = llvmPackages_7;
   };
 
   zimlib = callPackage ../development/libraries/zimlib { };

From 2be514d5c389b50aeeb5773ab269863131a294a8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 29 Sep 2018 21:25:08 +0200
Subject: [PATCH 2038/3253] pythonPackages.pystemd: init at 0.5.0 (#47517)

---
 .../python-modules/pystemd/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/pystemd/default.nix

diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix
new file mode 100644
index 000000000000..fc269641ecfd
--- /dev/null
+++ b/pkgs/development/python-modules/pystemd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, mock, pytest, six, systemd }:
+
+buildPythonPackage rec {
+  pname = "pystemd";
+  version = "0.5.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "000001hxv25vwcsvc0avg42v89c7qcjdpw6dr8419prmcb9186i5";
+  };
+
+  buildInputs = [ systemd ];
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytest mock ];
+  checkPhase = "pytest tests";
+
+  meta = with stdenv.lib; {
+    description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way.";
+    homepage = https://github.com/facebookincubator/pystemd/;
+    license = licenses.bsd0;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3fe62baf0a7..9a26dbb82ad9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9805,6 +9805,8 @@ in {
 
   python-pushover = callPackage ../development/python-modules/pushover {};
 
+  pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; };
+
   mongodict = buildPythonPackage rec {
     name = "mongodict-${version}";
     version = "0.3.1";

From 18db34f09bd03fa8f3bb2549c93d190e79b50a5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 12:38:50 -0700
Subject: [PATCH 2039/3253] keepass: 2.39.1 -> 2.40 (#47042)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/keepass/versions
---
 pkgs/applications/misc/keepass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 53b965a1bb70..b954d2d3cdb8 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.39.1";
+  version = "2.40";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00";
+    sha256 = "1gldl74wz2lvsci6rn71d6q1zmnhr52z6fjib9nsragsazq5byz9";
   };
 
   sourceRoot = ".";

From aba95986d2e76b24ad2c45bed2076dda8b1451b3 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 9 Sep 2018 12:10:04 +0200
Subject: [PATCH 2040/3253] lidarr: init at 0.3.1.471

Fork of sonarr (as radarr) but for music instead of series and movies.
---
 nixos/modules/misc/ids.nix             |  2 ++
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/lidarr.nix | 46 ++++++++++++++++++++++++++
 pkgs/servers/lidarr/default.nix        | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 5 files changed, 87 insertions(+)
 create mode 100644 nixos/modules/services/misc/lidarr.nix
 create mode 100644 pkgs/servers/lidarr/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 00562082aa03..0b4ed6d3b628 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -330,6 +330,7 @@
       # render = 303; # unused
       zeronet = 304;
       lirc = 305;
+      lidarr = 306;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -620,6 +621,7 @@
       render = 303; # default udev rules from systemd requires these
       zeronet = 304;
       lirc = 305;
+      lidarr = 306;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 152100aa8c58..f4c7cf601bf1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -365,6 +365,7 @@
   ./services/misc/jackett.nix
   ./services/misc/logkeys.nix
   ./services/misc/leaps.nix
+  ./services/misc/lidarr.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
   ./services/misc/matrix-synapse.nix
diff --git a/nixos/modules/services/misc/lidarr.nix b/nixos/modules/services/misc/lidarr.nix
new file mode 100644
index 000000000000..627f22334fe8
--- /dev/null
+++ b/nixos/modules/services/misc/lidarr.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.lidarr;
+in
+{
+  options = {
+    services.lidarr = {
+      enable = mkEnableOption "Lidarr";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.lidarr = {
+      description = "Lidarr";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        [ ! -d /var/lib/lidarr ] && mkdir -p /var/lib/lidarr
+        chown -R lidarr:lidarr /var/lib/lidarr
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        User = "lidarr";
+        Group = "lidarr";
+        PermissionsStartOnly = "true";
+        ExecStart = "${pkgs.lidarr}/bin/Lidarr";
+        Restart = "on-failure";
+
+        StateDirectory = "/var/lib/lidarr/";
+        StateDirectoryMode = "0770";
+      };
+    };
+
+    users.users.lidarr = {
+      uid = config.ids.uids.lidarr;
+      home = "/var/lib/lidarr";
+      group = "lidarr";
+    };
+
+    users.groups.lidarr.gid = config.ids.gids.lidarr;
+  };
+}
diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
new file mode 100644
index 000000000000..3290d8ba1d1a
--- /dev/null
+++ b/pkgs/servers/lidarr/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "lidarr-${version}";
+  version = "0.3.1.471";
+
+  src = fetchurl {
+    url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
+    sha256 = "1x8q5yivkz8rwpkz0gdi73iaszb253bm1c3rdzar7xgrqr3g11nm";
+  };
+
+  buildInputs = [
+    makeWrapper
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r * $out/bin/
+
+    # Mark all executable files as non-executable
+    find $out/bin -type f -executable | xargs chmod -x
+
+    makeWrapper "${mono}/bin/mono" $out/bin/Lidarr \
+      --add-flags "$out/bin/Lidarr.exe" \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+          curl sqlite libmediainfo ]}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Usenet/BitTorrent music downloader";
+    homepage = https://lidarr.audio/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.etu ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8460da60e9d..eb01eca4e5a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3858,6 +3858,8 @@ with pkgs;
 
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
+  lidarr = callPackage ../servers/lidarr { };
+
   limesuite = callPackage ../applications/misc/limesuite { };
 
   limesurvey = callPackage ../servers/limesurvey { };

From 8ef0f714943875ba9dd8f217609a6ab801296037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 29 Sep 2018 16:46:37 -0300
Subject: [PATCH 2041/3253] menumaker: init at 0.99.10 (#47507)

---
 pkgs/applications/misc/menumaker/default.nix | 21 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/menumaker/default.nix

diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix
new file mode 100644
index 000000000000..56854e7863fe
--- /dev/null
+++ b/pkgs/applications/misc/menumaker/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "menumaker-${version}";
+  version = "0.99.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/menumaker/${name}.tar.gz";
+    sha256 = "1mm4cvg3kphkkd8nwrhcg6d9nm5ar7mgc0wf6fxk6zck1l7xn8ky";
+  };
+
+  format = "other";
+
+  meta = with stdenv.lib; {
+    description = "Heuristics-driven menu generator for several window managers";
+    homepage = http://menumaker.sourceforge.net;
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb01eca4e5a3..8e37008b1f19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17558,6 +17558,8 @@ with pkgs;
     gconf = pkgs.gnome2.GConf;
   };
 
+  menumaker = callPackage ../applications/misc/menumaker { };
+
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
     guiSupport = false; # use mercurialFull to get hgk GUI

From a3ba62db23554247eb13b86ba87b3fe93bf136d3 Mon Sep 17 00:00:00 2001
From: endgame <endgame@users.noreply.github.com>
Date: Sun, 30 Sep 2018 05:49:37 +1000
Subject: [PATCH 2042/3253] ultimate-oldschool-pc-font-pack: simplify using
 fetchzip (#47313)

---
 .../default.nix                               | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
index cb68c30a4a2c..f8df39c95652 100644
--- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchzip }:
 
-stdenv.mkDerivation rec {
-  name = "ultimate-oldschool-pc-font-pack-${version}";
+let
   version = "1.0";
+in
+fetchzip rec {
+  name = "ultimate-oldschool-pc-font-pack-${version}";
+  url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
+  sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
 
-  src = fetchurl {
-    url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
-    sha256 = "7666cf23176e34ea03a218b5c1500f4ad729d97150ab7bdb7cf2adf4c99a9a7a";
-  };
-
-  buildInputs = [ unzip ];
-
-  dontBuild = true;
-
-  sourceRoot = ".";
-
-  installPhase = ''
+  postFetch= ''
     mkdir -p $out/share/fonts/truetype
-    cp 'Px437 (TrueType - DOS charset)'/*.ttf $out/share/fonts/truetype
-    cp 'PxPlus (TrueType - extended charset)'/*.ttf $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
   '';
 
   meta = with stdenv.lib; {

From e3654421d3bd9a52d263c37c26d02d388e3c2975 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Sep 2018 12:50:05 -0700
Subject: [PATCH 2043/3253] chromedriver: 2.41 -> 2.42 (#47329)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/chromedriver/versions
---
 pkgs/development/tools/selenium/chromedriver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index abbd2a9116ca..b19bd67c307f 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,7 +6,7 @@ let
   allSpecs = {
     "x86_64-linux" = {
       system = "linux64";
-      sha256 = "1iwmdkkxfmmiqzvj2bjh98db6j6zfb8s2m5kq15wmnq0g44gxski";
+      sha256 = "10phyz7ffzzx5ysbpyidssvwjdrcyszxf3lnba8qsrcajzm21nff";
     };
 
     "x86_64-darwin" = {
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "chromedriver-${version}";
-  version = "2.41";
+  version = "2.42";
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From 73de0734057b2b0b5203a92e941e6f13fdf1b488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Sat, 29 Sep 2018 20:56:34 +0200
Subject: [PATCH 2044/3253] nixos/kmscon: Add autologin option

---
 nixos/modules/services/ttys/kmscon.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 59c45fcb44ee..82b6a51028e3 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -4,6 +4,8 @@ let
 
   cfg = config.services.kmscon;
 
+  autologinArg = lib.optionalString (cfg.autologinUser != null) "-f ${cfg.autologinUser}";
+
   configDir = pkgs.writeTextFile { name = "kmscon-config"; destination = "/kmscon.conf"; text = cfg.extraConfig; };
 in {
   options = {
@@ -39,6 +41,15 @@ in {
         default = "";
         example = "--term xterm-256color";
       };
+
+      autologinUser = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Username of the account that will be automatically logged in at the console.
+          If unspecified, a login prompt is shown as usual.
+        '';
+      };
     };
   };
 
@@ -61,7 +72,7 @@ in {
 
       [Service]
       ExecStart=
-      ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
+      ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg}
       UtmpIdentifier=%I
       TTYPath=/dev/%I
       TTYReset=yes

From 18aa9b0b6509c516e6ce3dee82d225be26b154f8 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Mon, 10 Sep 2018 22:30:22 -0700
Subject: [PATCH 2045/3253] build-bazel-package: prefix bazel with the USER
 variable

Bazel computes the default value of output_user_root before parsing the
flag[0]. The computation of the default value involves getting the $USER
from the environment. I don't have that variable when building with
sandbox enabled.

[0]: https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
---
 pkgs/build-support/build-bazel-package/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 07d37451ddf9..26f44b922cde 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -25,7 +25,13 @@ in stdenv.mkDerivation (fBuildAttrs // {
     buildPhase = fFetchAttrs.buildPhase or ''
       runHook preBuild
 
-      bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
+      # Bazel computes the default value of output_user_root before parsing the
+      # flag. The computation of the default value involves getting the $USER
+      # from the environment. I don't have that variable when building with
+      # sandbox enabled. Code here
+      # https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124
+      #
+      USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget
 
       runHook postBuild
     '';

From 90b7b4a509799a7382b4fbc3d954c74c37f1c989 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 11 Sep 2018 14:12:31 -0700
Subject: [PATCH 2046/3253] build-bazel-package: remove any .git, .svn and .hg
 from external

---
 pkgs/build-support/build-bazel-package/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 26f44b922cde..190352262ae9 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -47,6 +47,10 @@ in stdenv.mkDerivation (fBuildAttrs // {
       find $bazelOut/external -type l | while read symlink; do
         ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
       done
+      # Remove all vcs files
+      rm -rf $(find $bazelOut/external -type d -name .git)
+      rm -rf $(find $bazelOut/external -type d -name .svn)
+      rm -rf $(find $bazelOut/external -type d -name .hg)
 
       cp -r $bazelOut/external $out
 

From 86a5535b2fdb6fbb88ca83ba9d83851269241927 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Mon, 10 Sep 2018 22:36:11 -0700
Subject: [PATCH 2047/3253] bazel-watcher: init at 0.5.0

---
 .../build-bazel-package/default.nix           | 19 +++--
 .../tools/bazel-watcher/default.nix           | 80 +++++++++++++++++++
 .../update-gazelle-fix-ssl.patch              | 19 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 113 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/tools/bazel-watcher/default.nix
 create mode 100644 pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 190352262ae9..28247bac1021 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -39,19 +39,24 @@ in stdenv.mkDerivation (fBuildAttrs // {
     installPhase = fFetchAttrs.installPhase or ''
       runHook preInstall
 
+      # Remove all built in external workspaces, Bazel will recreate them when building
+      rm -rf $bazelOut/external/{bazel_tools,\@bazel_tools.marker}
+      rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
+      rm -rf $bazelOut/external/{local_*,\@local_*}
+
       # Patching markers to make them deterministic
-      for i in $bazelOut/external/\@*.marker; do
-        sed -i 's, -\?[0-9][0-9]*$, 1,' "$i"
-      done
-      # Patching symlinks to remove build directory reference
-      find $bazelOut/external -type l | while read symlink; do
-        ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
-      done
+      sed -i 's, -\?[0-9][0-9]*$, 1,' $bazelOut/external/\@*.marker
+
       # Remove all vcs files
       rm -rf $(find $bazelOut/external -type d -name .git)
       rm -rf $(find $bazelOut/external -type d -name .svn)
       rm -rf $(find $bazelOut/external -type d -name .hg)
 
+      # Patching symlinks to remove build directory reference
+      find $bazelOut/external -type l | while read symlink; do
+        ln -sf $(readlink "$symlink" | sed "s,$NIX_BUILD_TOP,NIX_BUILD_TOP,") "$symlink"
+      done
+
       cp -r $bazelOut/external $out
 
       runHook postInstall
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
new file mode 100644
index 000000000000..bedb55ec3742
--- /dev/null
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -0,0 +1,80 @@
+{ buildBazelPackage
+, cacert
+, fetchFromGitHub
+, fetchpatch
+, git
+, go
+, stdenv
+}:
+
+buildBazelPackage rec {
+  name = "bazel-watcher-${version}";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "bazelbuild";
+    repo = "bazel-watcher";
+    rev = "v${version}";
+    sha256 = "1sis723hwax4dg0c28x20yj0hjli66q1ykcvjirgy57znz4iwlq9";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/bazelbuild/bazel-watcher/commit/4d5928eee3dd5843a1b55136d914b78fef7f25d0.patch";
+      sha256 = "0gxzcdqgifrmvznfy0p5nd11b39n2pwxcvpmhc6hxf85mwlxz7dg";
+    })
+
+    ./update-gazelle-fix-ssl.patch
+  ];
+
+  nativeBuildInputs = [ go git ];
+
+  bazelTarget = "//ibazel";
+
+  fetchAttrs = {
+    preBuild = ''
+      patchShebangs .
+
+      # tell rules_go to use the Go binary found in the PATH
+      sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
+
+      # tell rules_go to invoke GIT with custom CAINFO path
+      export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
+    '';
+
+    preInstall = ''
+      # Remove the go_sdk (it's just a copy of the go derivation) and all
+      # references to it from the marker files. Bazel does not need to download
+      # this sdk because we have patched the WORKSPACE file to point to the one
+      # currently present in PATH. Without removing the go_sdk from the marker
+      # file, the hash of it will change anytime the Go derivation changes and
+      # that would lead to impurities in the marker files which would result in
+      # a different sha256 for the fetch phase.
+      rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker}
+      sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker
+    '';
+
+    sha256 = "1iyjvibvlwg980p7nizr6x5v31dyp4a344f0xn839x393583k59d";
+  };
+
+  buildAttrs = {
+    preBuild = ''
+      patchShebangs .
+
+      # tell rules_go to use the Go binary found in the PATH
+      sed -e 's:go_register_toolchains():go_register_toolchains(go_version = "host"):g' -i WORKSPACE
+    '';
+
+    installPhase = ''
+      install -Dm755 bazel-bin/ibazel/*_pure_stripped/ibazel $out/bin/ibazel
+    '';
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bazelbuild/bazel-watcher;
+    description = "Tools for building Bazel targets when source files change.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ kalbasit ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch b/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
new file mode 100644
index 000000000000..4cf69e9d1723
--- /dev/null
+++ b/pkgs/development/tools/bazel-watcher/update-gazelle-fix-ssl.patch
@@ -0,0 +1,19 @@
+diff --git a/WORKSPACE b/WORKSPACE
+index 4011d9b..d085ae8 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -52,11 +52,9 @@ http_archive(
+
+ http_archive(
+     name = "bazel_gazelle",
+-    sha256 = "c0a5739d12c6d05b6c1ad56f2200cb0b57c5a70e03ebd2f7b87ce88cabf09c7b",
+-    urls = [
+-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
+-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/0.14.0/bazel-gazelle-0.14.0.tar.gz",
+-    ],
++    sha256 = "0600ea2daf98170211dc561fd348a8a9328c91eb6df66a381eaaf0bcd122e80b",
++    strip_prefix = "bazel-gazelle-b34f46af2f31ee0470e7364352c2376bcc10d079",
++    url = "https://github.com/bazelbuild/bazel-gazelle/archive/b34f46af2f31ee0470e7364352c2376bcc10d079.tar.gz",
+ )
+
+ load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e37008b1f19..68077a3dfea6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8040,6 +8040,8 @@ with pkgs;
     buildBazelPackage = buildBazelPackage.override { enableNixHacks = false; };
   };
 
+  bazel-watcher = callPackage ../development/tools/bazel-watcher { };
+
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 
   bear = callPackage ../development/tools/build-managers/bear { };

From 0a784c094f2c69b22a3baece6a1d32c86f99b3cc Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 29 Sep 2018 20:33:38 +0000
Subject: [PATCH 2048/3253] libvirt: 4.5.0 -> 4.7.0 (#46502)

---
 pkgs/development/libraries/libvirt/default.nix      | 6 +++---
 pkgs/development/python-modules/libvirt/default.nix | 4 ++--
 pkgs/top-level/perl-packages.nix                    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index fd35864fe343..733482ce2687 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -16,19 +16,19 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "4.5.0";
+  version = "4.7.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7";
+        sha256 = "1r37aw1xxlwjkk4n6k503mw1caldijz8n7x86xdaq90n6bvpkhlj";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6";
+        sha256 = "17byylhx0bny4b771hqv92d87a5dg21a5qjv861y50sckgwwi6f1";
         fetchSubmodules = true;
       };
 
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 26b42020fc34..063245c0d4dd 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "4.5.0";
+  version = "4.7.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "0w2rzkxv7jsq4670m0j5c6p4hpyi0r0ja6wd3wdvixcwc6hhx407";
+    sha256 = "1zv3fgwmnkvqif0qsnvpx8hhb6bdfr2b4v55z3nh93bfg8s4rbm8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eee1b8399a66..a86031d5ce7c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14404,12 +14404,12 @@ let
   };
 
   SysVirt = buildPerlModule rec {
-    version = "4.5.0";
+    version = "4.7.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
       rev = "v${version}";
-      sha256 = "18ns94i29c9x0j50pz9r1vcif6baayz769sa7b51v8kcvam9j52s";
+      sha256 = "14q8s6k3d9a1qh6sh618qp30ib4p9qma2z4p2ynyh223i4w3virg";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From d7003ed57662384a77cb747a65851b29cf927be8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Sep 2018 16:36:33 -0400
Subject: [PATCH 2049/3253] patchelf: fix license

Use the attr set instead of a string
---
 pkgs/development/tools/misc/patchelf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index df24f6003d7f..77d03f299f4a 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://nixos.org/patchelf.html;
-    license = "GPL";
+    license = licenses.gpl3;
     description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
   };
 }

From 9d59281c61a48adffa8d3de8c5aac89efb753b55 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 29 Sep 2018 23:26:07 +0200
Subject: [PATCH 2050/3253] mosh: fix clang build

The darwin build started to fail because of protobuf c++11 related
errors https://hydra.nixos.org/build/82082958.
---
 pkgs/tools/networking/mosh/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 1a2086810724..c83ab66b27a0 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
       wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
   '';
 
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   meta = {
     homepage = https://mosh.org/;
     description = "Mobile shell (ssh replacement)";

From 7769fd6a80a5ac8a1ea7d50749eaeae2263cb92e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Sep 2018 17:52:31 -0400
Subject: [PATCH 2051/3253] linux: 4.4.158 -> 4.4.159

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index d906700f437e..bafa975b6184 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.158";
+  version = "4.4.159";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1a921xq475y961izkzn8n4ky9s7n4xsvhs9qh664xk5biip8y72p";
+    sha256 = "1hivz1pyy4scp4s09ibz36ni4d1pwivizwls5dbh5qjy0pdvn00f";
   };
 } // (args.argsOverride or {}))

From 74f56e14d932fa1d964cff5a0f85bda5e0e3cd34 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Sep 2018 17:52:51 -0400
Subject: [PATCH 2052/3253] linux: 4.9.129 -> 4.9.130

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d34db0989963..5c4bee036d86 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.129";
+  version = "4.9.130";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "064kwdsxzk65mn991cmxqs31i332szf2z3lw5lgbzhgyzk9i0mbg";
+    sha256 = "0zqaidirnr3v9xibp04rr2cjww3nd3phg28cgid0s8q0idm3xnv0";
   };
 } // (args.argsOverride or {}))

From 00e57782bcf0f57ebea3200b51769b2c6f28b599 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Sep 2018 17:53:07 -0400
Subject: [PATCH 2053/3253] linux: 4.14.72 -> 4.14.73

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 5decdc14e110..6c1740ea2e43 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.72";
+  version = "4.14.73";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zsmch2m9drk297n6ck8ja6m5p4fzg87lz8ky3y41g0b4l35k4nz";
+    sha256 = "07p3w3p8izgk1d0dblvn9ckk4ay10f40pqbwpzvpsi6c3ha3i7lr";
   };
 } // (args.argsOverride or {}))

From 5eefdebf49b50cda87d5ee958736187a902058d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 29 Sep 2018 17:53:22 -0400
Subject: [PATCH 2054/3253] linux: 4.18.10 -> 4.18.11

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 48ae108c48a7..00e8a04f1b9d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.10";
+  version = "4.18.11";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pli16s1vprmrq4cdii93k8rqrxy20a7vs7jf77fgdfaiizlyq0h";
+    sha256 = "131chbsavavz2hnjyx1xjvsnxdcr0y02p054n9mdvxfalvsiklrn";
   };
 } // (args.argsOverride or {}))

From 74df71bc8b446dd803aed3990a1148f258772f65 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 30 Sep 2018 03:18:58 +0300
Subject: [PATCH 2055/3253] Revert "doc: Update section about imperative
 containers"

This reverts commit f309440ee3b6830fd886f824be81b0fecfba52fc.

Breaks manual build:

https://nix-cache.s3.amazonaws.com/log/wnjcy6n5f871bpyy9nd06smiz1ggv99c-nixos-manual-combined.drv
---
 .../administration/imperative-containers.xml  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index cfd0e5c172b1..9bb62bc2ece9 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,7 +73,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  To change the configuration of the container, you can edit
+  There are several ways to change the configuration of the container. First,
+  on the host, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -86,16 +87,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <xref linkend="opt-services.httpd.enable"/> = true;
   <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
   <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
-  '
-
-  <para>
-    Note that in previous versions of NixOS (17.09 and earlier) one could
-    also use all nix-related commands (like <command>nixos-rebuild switch</command>) 
-    from inside the container. However, since the release of Nix 2.0 this
-    is not supported anymore. Supporting Nix commands inside the
-    container might be possible again in future versions. See
-    <link xlink:ref="https://github.com/NixOS/nixpkgs/issues/40355">the github issue</link> for tracking progress on this issue.
-  </para>
+'
 
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
@@ -104,6 +96,14 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <filename>/etc/nixos/configuration.nix</filename>.
  </para>
 
+ <para>
+  Alternatively, you can change the configuration from within the container
+  itself by running <command>nixos-rebuild switch</command> inside the
+  container. Note that the container by default does not have a copy of the
+  NixOS channel, so you should run <command>nix-channel --update</command>
+  first.
+ </para>
+
  <para>
   Containers can be stopped and started using <literal>nixos-container
   stop</literal> and <literal>nixos-container start</literal>, respectively, or

From f3a114e088658786cfd5de5b2aa3e7cba9e96c64 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Aug 2018 22:10:15 -0500
Subject: [PATCH 2056/3253] NIX_PATH: don't prepend $HOME-based value in
 session variable, set later

environment.sessionVariables cannot refer to the values of env vars,
and as a result this has caused problems in a variety of scenarios.

One use for these is that they're injected into /etc/profile,
elewhere these are used to populate an 'envfile' for pam
(`pam 5 pam_env.conf`) which mentions use of HOME being
potentially problematic.

Anyway if the goal is to make things easier for users,
simply do the NIX_PATH modification as extraInit.

This fixes the annoying problems generated by the current approach
(#40165 and others) while hopefully serving the original goal.

One way to check if things are borked is to try:

$ sudo env | grep NIX_PATH

Which (before this change) prints NIX_PATH variable with
an unexpanded $HOME in the value.

-------

This does mean the following won't contain user channels for 'will':
$ sudo -u will nix-instantiate --eval -E builtins.nixPath

However AFAICT currently they won't be present either,
due to unescaped $HOME.  Unsure if similar situation for other users
of sessionVariables (not sudo) work with current situation
(if they exist they will regress after this change AFAIK).
---
 nixos/modules/services/misc/nix-daemon.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index c0eb882c58f3..9a8ca6f43bfe 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -345,7 +345,6 @@ in
         type = types.listOf types.str;
         default =
           [
-            "$HOME/.nix-defexpr/channels"
             "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
@@ -436,7 +435,7 @@ in
 
     # Set up the environment variables for running Nix.
     environment.sessionVariables = cfg.envVars //
-      { NIX_PATH = concatStringsSep ":" cfg.nixPath;
+      { NIX_PATH = cfg.nixPath;
       };
 
     environment.extraInit = optionalString (!isNix20)
@@ -446,6 +445,8 @@ in
         if [ "$USER" != root -o ! -w /nix/var/nix/db ]; then
             export NIX_REMOTE=daemon
         fi
+      '' + ''
+        export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
       '';
 
     nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);

From 243e28bc96db0827eebfe2769de7e4393f791ca0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 14:53:04 -0500
Subject: [PATCH 2057/3253] nix-daemon: only add channels dir to NIX_PATH if
 exists

Per reviewer comment (thanks!).
---
 nixos/modules/services/misc/nix-daemon.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 9a8ca6f43bfe..24379ec27354 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -446,7 +446,9 @@ in
             export NIX_REMOTE=daemon
         fi
       '' + ''
-        export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
+        if [ -e "$HOME/.nix-defexpr/channels" ]; then
+          export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
+        fi
       '';
 
     nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);

From 9622cd3b38ddbc7faa4cac2a48dbd70bd99570d0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 29 Sep 2018 20:37:11 -0400
Subject: [PATCH 2058/3253] Revert "Revert "doc: Update section about
 imperative containers""

I fixed the problem.

This reverts commit 74df71bc8b446dd803aed3990a1148f258772f65.
---
 .../administration/imperative-containers.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 9bb62bc2ece9..fa380477f6cb 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  There are several ways to change the configuration of the container. First,
-  on the host, you can edit
+  To change the configuration of the container, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -87,8 +86,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <xref linkend="opt-services.httpd.enable"/> = true;
   <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
   <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
-'
-
+  '
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
 </screen>
@@ -97,11 +95,13 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  Alternatively, you can change the configuration from within the container
-  itself by running <command>nixos-rebuild switch</command> inside the
-  container. Note that the container by default does not have a copy of the
-  NixOS channel, so you should run <command>nix-channel --update</command>
-  first.
+  Note that in previous versions of NixOS (17.09 and earlier) one could also
+  use all nix-related commands (like <command>nixos-rebuild switch</command>)
+  from inside the container. However, since the release of Nix 2.0 this is not
+  supported anymore. Supporting Nix commands inside the container might be
+  possible again in future versions. See
+  <link xlink:href="https://github.com/NixOS/nixpkgs/issues/40355">the github
+  issue</link> for tracking progress on this issue.
  </para>
 
  <para>

From 8413f22bb39bd1c8adcf2ca9e6fcd4c59ddb3549 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 29 Sep 2018 20:51:11 -0400
Subject: [PATCH 2059/3253] docs: format

---
 .../doc/manual/configuration/linux-kernel.xml |  19 +-
 .../development/debugging-nixos-tests.xml     |   7 +-
 .../installing-behind-a-proxy.xml             |  47 +-
 nixos/doc/manual/installation/installing.xml  |   4 +-
 nixos/doc/manual/manual.xml                   |   4 +-
 nixos/doc/manual/release-notes/rl-1509.xml    |  10 +-
 nixos/doc/manual/release-notes/rl-1809.xml    | 266 +++---
 nixos/doc/manual/release-notes/rl-1903.xml    |   7 +-
 nixos/modules/i18n/input-method/default.xml   | 295 ++++---
 nixos/modules/programs/digitalbitbox/doc.xml  |  97 +--
 nixos/modules/programs/plotinus.xml           |  37 +-
 nixos/modules/programs/zsh/oh-my-zsh.xml      | 164 ++--
 nixos/modules/security/acme.xml               |  92 +-
 nixos/modules/security/hidepid.xml            |  37 +-
 .../services/databases/foundationdb.xml       | 549 +++++++-----
 .../modules/services/databases/postgresql.xml |  88 +-
 nixos/modules/services/desktops/flatpak.xml   |  71 +-
 nixos/modules/services/editors/emacs.xml      | 787 +++++++++---------
 nixos/modules/services/misc/gitlab.xml        | 106 +--
 .../modules/services/misc/taskserver/doc.xml  | 209 +++--
 nixos/modules/services/misc/weechat.xml       |  73 +-
 .../monitoring/prometheus/exporters.xml       | 148 ++--
 .../services/networking/dnscrypt-proxy.xml    |  69 +-
 .../modules/services/web-apps/matomo-doc.xml  | 131 ++-
 24 files changed, 1784 insertions(+), 1533 deletions(-)

diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 2f766f2b32f7..644d3a33ffd2 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -84,18 +84,17 @@ nixpkgs.config.packageOverrides = pkgs:
     allowImportFromDerivation = true;
   };
   ]]></screen>
-
-You can edit the config with this snippet (by default <command>make menuconfig</command> won't work
-  out of the box on nixos):
-  <screen><![CDATA[
+   You can edit the config with this snippet (by default <command>make
+   menuconfig</command> won't work out of the box on nixos):
+<screen><![CDATA[
       nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
   ]]></screen>
-
-
-  or you can let nixpkgs generate the configuration.
-  Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>.
-  The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename>
-  (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
+   or you can let nixpkgs generate the configuration. Nixpkgs generates it via
+   answering the interactive kernel utility <command>make config</command>. The
+   answers depend on parameters passed to
+   <filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you
+   can influence by overriding <literal>extraConfig, autoModules,
+   modDirVersion, preferBuiltin, extraConfig</literal>).
 <screen><![CDATA[
 
   mptcp93.override ({
diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml
index 0adf1293f7a3..30e58e1e3554 100644
--- a/nixos/doc/manual/development/debugging-nixos-tests.xml
+++ b/nixos/doc/manual/development/debugging-nixos-tests.xml
@@ -26,11 +26,12 @@ nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build
 </programlisting>
 
  <para>
-  You may need to find the correct path, replacing <literal>/tmp</literal>, <literal>*</literal> or <literal>machine</literal>.
+  You may need to find the correct path, replacing <literal>/tmp</literal>,
+  <literal>*</literal> or <literal>machine</literal>.
  </para>
 
  <para>
-  Press "enter" to open up console and login as "root". After you're done, press "ctrl-q" to exit the console.
+  Press "enter" to open up console and login as "root". After you're done,
+  press "ctrl-q" to exit the console.
  </para>
- 
 </section>
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index c59d073c61c7..8f9baff44b51 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
@@ -5,28 +5,29 @@
          xml:id="sec-installing-behind-proxy">
  <title>Installing behind a proxy</title>
 
-<para>
+ <para>
   To install NixOS behind a proxy, do the following before running
   <literal>nixos-install</literal>.
-</para>
-<orderedlist numeration="arabic">
+ </para>
+
+ <orderedlist numeration="arabic">
   <listitem>
-    <para>
-      Update proxy configuration in
-      <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the
-      internet accessible after reboot.
-    </para>
-    <programlisting>
+   <para>
+    Update proxy configuration in
+    <literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
+    accessible after reboot.
+   </para>
+<programlisting>
 networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
 networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
 </programlisting>
   </listitem>
   <listitem>
-    <para>
-      Setup the proxy environment variables in the shell where you are
-      running <literal>nixos-install</literal>.
-    </para>
-    <programlisting>
+   <para>
+    Setup the proxy environment variables in the shell where you are running
+    <literal>nixos-install</literal>.
+   </para>
+<programlisting>
 # proxy_url=&quot;http://user:password@proxy:port/&quot;
 # export http_proxy=&quot;$proxy_url&quot;
 # export HTTP_PROXY=&quot;$proxy_url&quot;
@@ -34,14 +35,14 @@ networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
 # export HTTPS_PROXY=&quot;$proxy_url&quot;
 </programlisting>
   </listitem>
-</orderedlist>
+ </orderedlist>
 
-<note>
-<para>
-  If you are switching networks with different proxy configurations, use the
-  <literal>nesting.clone</literal> option in
-  <literal>configuration.nix</literal> to switch proxies at runtime.
-  Refer to <xref linkend="ch-options" /> for more information.
-</para>
-</note>
+ <note>
+  <para>
+   If you are switching networks with different proxy configurations, use the
+   <literal>nesting.clone</literal> option in
+   <literal>configuration.nix</literal> to switch proxies at runtime. Refer to
+   <xref linkend="ch-options" /> for more information.
+  </para>
+ </note>
 </section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 916384559e24..1366e8f93596 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -327,8 +327,8 @@ Retype new UNIX password: ***
     <note>
      <para>
       For unattended installations, it is possible to use
-      <command>nixos-install --no-root-passwd</command>
-      in order to disable the password prompt entirely.
+      <command>nixos-install --no-root-passwd</command> in order to disable the
+      password prompt entirely.
      </para>
     </note>
    </para>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index a5efde32885c..12f52e1997c8 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -17,8 +17,8 @@
   <para>
    If you encounter problems, please report them on the
    <literal
-    xlink:href="https://discourse.nixos.org">Discourse</literal>
-   or on the <link
+    xlink:href="https://discourse.nixos.org">Discourse</literal> or
+   on the <link
     xlink:href="irc://irc.freenode.net/#nixos">
    <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
    reported in
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 4eb2f9aa0a95..e500c9d63422 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -435,11 +435,11 @@ system.autoUpgrade.enable = true;
 <programlisting>
 system.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that
-     certain configuration changes that could break existing systems (such as
-     the <command>sshd</command> host key setting) will maintain compatibility
-     with the specified NixOS release. NixOps sets the state version of
-     existing deployments automatically.
+     The new option <option>system.stateVersion</option> ensures that certain
+     configuration changes that could break existing systems (such as the
+     <command>sshd</command> host key setting) will maintain compatibility with
+     the specified NixOS release. NixOps sets the state version of existing
+     deployments automatically.
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 5a565f08b2cb..f0797b51340d 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -19,13 +19,13 @@
 
   <itemizedlist>
    <listitem>
-     <para>
-       Support for wrapping binaries using <literal>firejail</literal> has been
-       added through <varname>programs.firejail.wrappedBinaries</varname>.
-     </para>
-     <para>
-       For example
-     </para>
+    <para>
+     Support for wrapping binaries using <literal>firejail</literal> has been
+     added through <varname>programs.firejail.wrappedBinaries</varname>.
+    </para>
+    <para>
+     For example
+    </para>
 <programlisting>
 programs.firejail = {
   enable = true;
@@ -35,9 +35,10 @@ programs.firejail = {
   };
 };
 </programlisting>
-      <para>
-        This will place <literal>firefox</literal> and <literal>mpv</literal> binaries in the global path wrapped by firejail.
-      </para>
+    <para>
+     This will place <literal>firefox</literal> and <literal>mpv</literal>
+     binaries in the global path wrapped by firejail.
+    </para>
    </listitem>
    <listitem>
     <para>
@@ -75,16 +76,20 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     The <varname>services.cassandra</varname> module has been reworked and
-     was rewritten from scratch. The service has succeeding tests for
-     the versions 2.1, 2.2, 3.0 and 3.11 of <link
-     xlink:href="https://cassandra.apache.org/">Apache Cassandra</link>.
+     The <varname>services.cassandra</varname> module has been reworked and was
+     rewritten from scratch. The service has succeeding tests for the versions
+     2.1, 2.2, 3.0 and 3.11 of
+     <link
+     xlink:href="https://cassandra.apache.org/">Apache
+     Cassandra</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     There is a new <varname>services.foundationdb</varname> module for deploying
-     <link xlink:href="https://www.foundationdb.org">FoundationDB</link> clusters.
+     There is a new <varname>services.foundationdb</varname> module for
+     deploying
+     <link xlink:href="https://www.foundationdb.org">FoundationDB</link>
+     clusters.
     </para>
    </listitem>
    <listitem>
@@ -97,24 +102,26 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-      <varname>services.strongswan-swanctl</varname>
-      is a modern replacement for <varname>services.strongswan</varname>.
-      You can use either one of them to setup IPsec VPNs but not both at the same time.
+     <varname>services.strongswan-swanctl</varname> is a modern replacement for
+     <varname>services.strongswan</varname>. You can use either one of them to
+     setup IPsec VPNs but not both at the same time.
     </para>
     <para>
-      <varname>services.strongswan-swanctl</varname> uses the
-      <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link>
-      command which uses the modern
-      <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link>
-      <emphasis>Versatile IKE Configuration Interface</emphasis>.
-      The deprecated <literal>ipsec</literal> command used in <varname>services.strongswan</varname> is using the legacy
-      <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke configuration interface</link>.
+     <varname>services.strongswan-swanctl</varname> uses the
+     <link xlink:href="https://wiki.strongswan.org/projects/strongswan/wiki/swanctl">swanctl</link>
+     command which uses the modern
+     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/src/libcharon/plugins/vici/README.md">vici</link>
+     <emphasis>Versatile IKE Configuration Interface</emphasis>. The deprecated
+     <literal>ipsec</literal> command used in
+     <varname>services.strongswan</varname> is using the legacy
+     <link xlink:href="https://github.com/strongswan/strongswan/blob/master/README_LEGACY.md">stroke
+     configuration interface</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-      The new <varname>services.elasticsearch-curator</varname> service
-      periodically curates or manages, your Elasticsearch indices and snapshots.
+     The new <varname>services.elasticsearch-curator</varname> service
+     periodically curates or manages, your Elasticsearch indices and snapshots.
     </para>
    </listitem>
   </itemizedlist>
@@ -135,8 +142,8 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     The deprecated <varname>services.cassandra</varname> module has
-     seen a complete rewrite. (See above.)
+     The deprecated <varname>services.cassandra</varname> module has seen a
+     complete rewrite. (See above.)
     </para>
    </listitem>
    <listitem>
@@ -186,41 +193,44 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root.
-     Make sure the key file is accessible to the daemon.
+     <varname>services.munge</varname> now runs as user (and group)
+     <literal>munge</literal> instead of root. Make sure the key file is
+     accessible to the daemon.
     </para>
    </listitem>
    <listitem>
     <para>
-      <varname>dockerTools.buildImage</varname> now uses <literal>null</literal> as default value for <varname>tag</varname>,
-      which indicates that the nix output hash will be used as tag.
+     <varname>dockerTools.buildImage</varname> now uses <literal>null</literal>
+     as default value for <varname>tag</varname>, which indicates that the nix
+     output hash will be used as tag.
     </para>
    </listitem>
    <listitem>
     <para>
-     The ELK stack: <varname>elasticsearch</varname>, <varname>logstash</varname> and <varname>kibana</varname>
-     has been upgraded from 2.* to 6.3.*.
-     The 2.* versions have been <link xlink:href="https://www.elastic.co/support/eol">unsupported since last year</link>
-     so they have been removed. You can still use the 5.* versions under the names
-     <varname>elasticsearch5</varname>, <varname>logstash5</varname> and
-     <varname>kibana5</varname>.
+     The ELK stack: <varname>elasticsearch</varname>,
+     <varname>logstash</varname> and <varname>kibana</varname> has been
+     upgraded from 2.* to 6.3.*. The 2.* versions have been
+     <link xlink:href="https://www.elastic.co/support/eol">unsupported since
+     last year</link> so they have been removed. You can still use the 5.*
+     versions under the names <varname>elasticsearch5</varname>,
+     <varname>logstash5</varname> and <varname>kibana5</varname>.
     </para>
     <para>
-     The elastic beats:
-     <varname>filebeat</varname>, <varname>heartbeat</varname>,
-     <varname>metricbeat</varname> and <varname>packetbeat</varname>
-     have had the same treatment: they now target 6.3.* as well.
-     The 5.* versions are available under the names:
+     The elastic beats: <varname>filebeat</varname>,
+     <varname>heartbeat</varname>, <varname>metricbeat</varname> and
+     <varname>packetbeat</varname> have had the same treatment: they now target
+     6.3.* as well. The 5.* versions are available under the names:
      <varname>filebeat5</varname>, <varname>heartbeat5</varname>,
      <varname>metricbeat5</varname> and <varname>packetbeat5</varname>
     </para>
     <para>
      The ELK-6.3 stack now comes with
-     <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by default</link>.
-     Since X-Pack is licensed under the
-     <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic License</link>
-     the ELK packages now have an unfree license. To use them you need to specify
-     <literal>allowUnfree = true;</literal> in your nixpkgs configuration.
+     <link xlink:href="https://www.elastic.co/products/x-pack/open">X-Pack by
+     default</link>. Since X-Pack is licensed under the
+     <link xlink:href="https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt">Elastic
+     License</link> the ELK packages now have an unfree license. To use them
+     you need to specify <literal>allowUnfree = true;</literal> in your nixpkgs
+     configuration.
     </para>
     <para>
      Fortunately there is also a free variant of the ELK stack without X-Pack.
@@ -231,20 +241,23 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-      Options
-      <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal>
-      <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal>
-      were removed. <literal>luksroot.nix</literal> module never supported more than one YubiKey at
-      a time anyway, hence those options never had any effect. You should be able to remove them
-      from your config without any issues.
+     Options
+     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.ramfsMountPoint</literal>
+     <literal>boot.initrd.luks.devices.<replaceable>name</replaceable>.yubikey.storage.mountPoint</literal>
+     were removed. <literal>luksroot.nix</literal> module never supported more
+     than one YubiKey at a time anyway, hence those options never had any
+     effect. You should be able to remove them from your config without any
+     issues.
     </para>
    </listitem>
    <listitem>
     <para>
-      <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs now refer to the host platform instead of the build platform.
-      For native builds this is not change, let alone a breaking one.
-      For cross builds, it is a breaking change, and <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior.
-      They should be using that anyways for clarity.
+     <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs
+     now refer to the host platform instead of the build platform. For native
+     builds this is not change, let alone a breaking one. For cross builds, it
+     is a breaking change, and <literal>stdenv.buildPlatform.system</literal>
+     can be used instead for the old behavior. They should be using that
+     anyways for clarity.
     </para>
    </listitem>
   </itemizedlist>
@@ -298,26 +311,33 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-      The <literal>pkgs</literal> argument to NixOS modules can now be set directly using <literal>nixpkgs.pkgs</literal>. Previously, only the <literal>system</literal>, <literal>config</literal> and <literal>overlays</literal> arguments could be used to influence <literal>pkgs</literal>.
+     The <literal>pkgs</literal> argument to NixOS modules can now be set
+     directly using <literal>nixpkgs.pkgs</literal>. Previously, only the
+     <literal>system</literal>, <literal>config</literal> and
+     <literal>overlays</literal> arguments could be used to influence
+     <literal>pkgs</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-      A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
-      <programlisting>
+     A NixOS system can now be constructed more easily based on a preexisting
+     invocation of Nixpkgs. For example:
+<programlisting>
 inherit (pkgs.nixos {
   boot.loader.grub.enable = false;
   fileSystems."/".device = "/dev/xvda1";
 }) toplevel kernel initialRamdisk manual;
       </programlisting>
-
-      This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays.
+     This benefits evaluation performance, lets you write Nixpkgs packages that
+     depend on NixOS images and is consistent with a deployment architecture
+     that would be centered around Nixpkgs overlays.
     </para>
    </listitem>
    <listitem>
     <para>
-      <literal>lib.traceValIfNot</literal> has been deprecated. Use
-      <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal> instead.
+     <literal>lib.traceValIfNot</literal> has been deprecated. Use
+     <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
+     instead.
     </para>
    </listitem>
    <listitem>
@@ -336,9 +356,9 @@ inherit (pkgs.nixos {
    </listitem>
    <listitem>
     <para>
-     <literal>lib.recursiveUpdateUntil</literal> was not acting according to its
-     specification. It has been fixed to act according to the docstring, and a
-     test has been added.
+     <literal>lib.recursiveUpdateUntil</literal> was not acting according to
+     its specification. It has been fixed to act according to the docstring,
+     and a test has been added.
     </para>
    </listitem>
    <listitem>
@@ -408,11 +428,11 @@ inherit (pkgs.nixos {
     </para>
    </listitem>
    <listitem>
-     <para>
-     The Kubernetes package has been bumped to major version 1.11.
-     Please consult the
-     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link>
-     for details on new features and api changes.
+    <para>
+     The Kubernetes package has been bumped to major version 1.11. Please
+     consult the
+     <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release
+     notes</link> for details on new features and api changes.
     </para>
    </listitem>
    <listitem>
@@ -432,8 +452,8 @@ inherit (pkgs.nixos {
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.address</varname>
-     was renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
+     The option <varname>services.kubernetes.apiserver.address</varname> was
+     renamed to <varname>services.kubernetes.apiserver.bindAddress</varname>.
      Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
     </para>
    </listitem>
@@ -445,76 +465,86 @@ inherit (pkgs.nixos {
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.addons.dashboard.enableRBAC</varname>
-     was renamed to <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
+     The option
+     <varname>services.kubernetes.addons.dashboard.enableRBAC</varname> was
+     renamed to
+     <varname>services.kubernetes.addons.dashboard.rbac.enable</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
      The Kubernetes Dashboard now has only minimal RBAC permissions by default.
-     If dashboard cluster-admin rights are desired,
-     set <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname> to true.
-     On existing clusters, in order for the revocation of privileges to take effect,
-     the current ClusterRoleBinding for kubernetes-dashboard must be manually removed:
-     <literal>kubectl delete clusterrolebinding kubernetes-dashboard</literal>
+     If dashboard cluster-admin rights are desired, set
+     <varname>services.kubernetes.addons.dashboard.rbac.clusterAdmin</varname>
+     to true. On existing clusters, in order for the revocation of privileges
+     to take effect, the current ClusterRoleBinding for kubernetes-dashboard
+     must be manually removed: <literal>kubectl delete clusterrolebinding
+     kubernetes-dashboard</literal>
     </para>
    </listitem>
    <listitem>
     <para>
      The <varname>programs.screen</varname> module provides allows to configure
-     <literal>/etc/screenrc</literal>, however the module behaved fairly counterintuitive as
-     the config exists, but the package wasn't available. Since 18.09 <literal>pkgs.screen</literal>
-     will be added to <literal>environment.systemPackages</literal>.
+     <literal>/etc/screenrc</literal>, however the module behaved fairly
+     counterintuitive as the config exists, but the package wasn't available.
+     Since 18.09 <literal>pkgs.screen</literal> will be added to
+     <literal>environment.systemPackages</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-      The module <option>services.networking.hostapd</option> now uses WPA2 by default.
+     The module <option>services.networking.hostapd</option> now uses WPA2 by
+     default.
     </para>
    </listitem>
    <listitem>
     <para>
-      <varname>s6Dns</varname>, <varname>s6Networking</varname>,
-      <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
-      renamed to
-      <varname>s6-dns</varname>, <varname>s6-networking</varname>,
-      <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively.
+     <varname>s6Dns</varname>, <varname>s6Networking</varname>,
+     <varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
+     renamed to <varname>s6-dns</varname>, <varname>s6-networking</varname>,
+     <varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname>
+     respectively.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The module option <option>nix.useSandbox</option> is now defaulted to <literal>true</literal>.
+     The module option <option>nix.useSandbox</option> is now defaulted to
+     <literal>true</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The config activation script of <literal>nixos-rebuild</literal> now
-      <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
-      all user units for each authenticated user.
+     The config activation script of <literal>nixos-rebuild</literal> now
+     <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemctl.html#Manager%20Lifecycle%20Commands">reloads</link>
+     all user units for each authenticated user.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The default display manager is now LightDM.
-      To use SLiM set <literal>services.xserver.displayManager.slim.enable</literal>
-      to <literal>true</literal>.
+     The default display manager is now LightDM. To use SLiM set
+     <literal>services.xserver.displayManager.slim.enable</literal> to
+     <literal>true</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      NixOS option descriptions are now automatically broken up into individual
-      paragraphs if the text contains two consecutive newlines, so it's no
-      longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start
-      a new paragraph.
+     NixOS option descriptions are now automatically broken up into individual
+     paragraphs if the text contains two consecutive newlines, so it's no
+     longer necessary to use <code>&lt;/para&gt;&lt;para&gt;</code> to start a
+     new paragraph.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Top-level <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in Nixpkgs are deprecated.
-      Please use their equivalents in <literal>stdenv</literal> instead:
-      <literal>stdenv.buildPlatform</literal>, <literal>stdenv.hostPlatform</literal>, and <literal>stdenv.targetPlatform</literal>.
+     Top-level <literal>buildPlatform</literal>,
+     <literal>hostPlatform</literal>, and <literal>targetPlatform</literal> in
+     Nixpkgs are deprecated. Please use their equivalents in
+     <literal>stdenv</literal> instead:
+     <literal>stdenv.buildPlatform</literal>,
+     <literal>stdenv.hostPlatform</literal>, and
+     <literal>stdenv.targetPlatform</literal>.
     </para>
-  </listitem>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 3e7f8d0681d2..1f26d4765b97 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -100,9 +100,10 @@
     </itemizedlist>
    </listitem>
    <listitem>
-     <para>
-       Package <varname>rabbitmq_server</varname> is renamed to <varname>rabbitmq-server</varname>.
-     </para>
+    <para>
+     Package <varname>rabbitmq_server</varname> is renamed to
+     <varname>rabbitmq-server</varname>.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index ab918a9fb23e..117482fb0d57 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -3,32 +3,50 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-input-methods">
+ <title>Input Methods</title>
+ <para>
+  Input methods are an operating system component that allows any data, such as
+  keyboard strokes or mouse movements, to be received as input. In this way
+  users can enter characters and symbols not found on their input devices.
+  Using an input method is obligatory for any language that has more graphemes
+  than there are keys on the keyboard.
+ </para>
+ <para>
+  The following input methods are available in NixOS:
+ </para>
+ <itemizedlist>
+  <listitem>
+   <para>
+    IBus: The intelligent input bus.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Fcitx: A customizable lightweight input method.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Nabi: A Korean input method based on XIM.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Uim: The universal input method, is a library with a XIM bridge.
+   </para>
+  </listitem>
+ </itemizedlist>
+ <section xml:id="module-services-input-methods-ibus">
+  <title>IBus</title>
 
-<title>Input Methods</title>
+  <para>
+   IBus is an Intelligent Input Bus. It provides full featured and user
+   friendly input method user interface.
+  </para>
 
-<para>Input methods are an operating system component that allows any data, such
-  as keyboard strokes or mouse movements, to be received as input. In this way
-  users can enter characters and symbols not found on their input devices. Using
-  an input method is obligatory for any language that has more graphemes than
-  there are keys on the keyboard.</para>
-
-<para>The following input methods are available in NixOS:</para>
-
-<itemizedlist>
-  <listitem><para>IBus: The intelligent input bus.</para></listitem>
-  <listitem><para>Fcitx: A customizable lightweight input
-      method.</para></listitem>
-  <listitem><para>Nabi: A Korean input method based on XIM.</para></listitem>
-  <listitem><para>Uim: The universal input method, is a library with a XIM
-      bridge.</para></listitem>
-</itemizedlist>
-
-<section xml:id="module-services-input-methods-ibus"><title>IBus</title>
-
-<para>IBus is an Intelligent Input Bus. It provides full featured and user
-  friendly input method user interface.</para>
-
-<para>The following snippet can be used to configure IBus:</para>
+  <para>
+   The following snippet can be used to configure IBus:
+  </para>
 
 <programlisting>
 i18n.inputMethod = {
@@ -37,57 +55,89 @@ i18n.inputMethod = {
 };
 </programlisting>
 
-<para><literal>i18n.inputMethod.ibus.engines</literal> is optional and can be
-  used to add extra IBus engines.</para>
+  <para>
+   <literal>i18n.inputMethod.ibus.engines</literal> is optional and can be used
+   to add extra IBus engines.
+  </para>
 
-<para>Available extra IBus engines are:</para>
+  <para>
+   Available extra IBus engines are:
+  </para>
 
-<itemizedlist>
-  <listitem><para>Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a
-      system for Japanese input method. It converts Hiragana text to Kana Kanji
-      mixed text.</para></listitem>
-  <listitem><para>Hangul (<literal>ibus-engines.hangul</literal>): Korean input
-      method.</para></listitem>
-  <listitem><para>m17n (<literal>ibus-engines.m17n</literal>): m17n is an input
-      method that uses input methods and corresponding icons in the m17n
-      database.</para></listitem>
-  <listitem><para>mozc (<literal>ibus-engines.mozc</literal>): A Japanese input
-      method from Google.</para></listitem>
-  <listitem><para>Table (<literal>ibus-engines.table</literal>): An input method
-      that load tables of input methods.</para></listitem>
-  <listitem><para>table-others (<literal>ibus-engines.table-others</literal>):
-      Various table-based input methods. To use this, and any other table-based
-      input methods, it must appear in the list of engines along with
-      <literal>table</literal>. For example:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a system for
+     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Hangul (<literal>ibus-engines.hangul</literal>): Korean input method.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     m17n (<literal>ibus-engines.m17n</literal>): m17n is an input method that
+     uses input methods and corresponding icons in the m17n database.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     mozc (<literal>ibus-engines.mozc</literal>): A Japanese input method from
+     Google.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Table (<literal>ibus-engines.table</literal>): An input method that load
+     tables of input methods.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     table-others (<literal>ibus-engines.table-others</literal>): Various
+     table-based input methods. To use this, and any other table-based input
+     methods, it must appear in the list of engines along with
+     <literal>table</literal>. For example:
 <programlisting>
 ibus.engines = with pkgs.ibus-engines; [ table table-others ];
 </programlisting>
-  </para></listitem>
-</itemizedlist>
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<para>To use any input method, the package must be added in the configuration,
-  as shown above, and also (after running <literal>nixos-rebuild</literal>) the
-  input method must be added from IBus' preference dialog.</para>
+  <para>
+   To use any input method, the package must be added in the configuration, as
+   shown above, and also (after running <literal>nixos-rebuild</literal>) the
+   input method must be added from IBus' preference dialog.
+  </para>
 
-<simplesect xml:id="module-services-input-methods-troubleshooting">
-  <title>Troubleshooting</title>
-  <para>If IBus works in some applications but not others, a likely cause of
-  this is that IBus is depending on a different version of
-  <literal>glib</literal> to what the applications are depending on. This can
-  be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep
-  glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either
-  IBus or an application in the Nix store. The <literal>glib</literal>
-  packages must match exactly. If they do not, uninstalling and reinstalling
-  the application is a likely fix.</para>
-</simplesect>
-</section>
+  <simplesect xml:id="module-services-input-methods-troubleshooting">
+   <title>Troubleshooting</title>
+   <para>
+    If IBus works in some applications but not others, a likely cause of this
+    is that IBus is depending on a different version of <literal>glib</literal>
+    to what the applications are depending on. This can be checked by running
+    <literal>nix-store -q --requisites &lt;path&gt; | grep glib</literal>,
+    where <literal>&lt;path&gt;</literal> is the path of either IBus or an
+    application in the Nix store. The <literal>glib</literal> packages must
+    match exactly. If they do not, uninstalling and reinstalling the
+    application is a likely fix.
+   </para>
+  </simplesect>
+ </section>
+ <section xml:id="module-services-input-methods-fcitx">
+  <title>Fcitx</title>
 
-<section xml:id="module-services-input-methods-fcitx"><title>Fcitx</title>
+  <para>
+   Fcitx is an input method framework with extension support. It has three
+   built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
+  </para>
 
-<para>Fcitx is an input method framework with extension support. It has three
-  built-in Input Method Engine, Pinyin, QuWei and Table-based input
-  methods.</para>
-<para>The following snippet can be used to configure Fcitx:</para>
+  <para>
+   The following snippet can be used to configure Fcitx:
+  </para>
 
 <programlisting>
 i18n.inputMethod = {
@@ -96,51 +146,89 @@ i18n.inputMethod = {
 };
 </programlisting>
 
-<para><literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
-  used to add extra Fcitx engines.</para>
+  <para>
+   <literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
+   used to add extra Fcitx engines.
+  </para>
 
-<para>Available extra Fcitx engines are:</para>
+  <para>
+   Available extra Fcitx engines are:
+  </para>
 
-<itemizedlist>
-  <listitem><para>Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a
-      system for Japanese input method. It converts Hiragana text to Kana Kanji
-      mixed text.</para></listitem>
-  <listitem><para>Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is
-      an intelligent Zhuyin input method. It is one of the most popular input
-      methods among Traditional Chinese Unix users.</para></listitem>
-  <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input
-      method.</para></listitem>
-  <listitem><para>Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input
-      method.</para></listitem>
-  <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input
-      method that uses input methods and corresponding icons in the m17n
-      database.</para></listitem>
-  <listitem><para>mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input
-      method from Google.</para></listitem>
-  <listitem><para>table-others (<literal>fcitx-engines.table-others</literal>):
-      Various table-based input methods.</para></listitem>
-</itemizedlist>
-</section>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a system for
+     Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is an
+     intelligent Zhuyin input method. It is one of the most popular input
+     methods among Traditional Chinese Unix users.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Hangul (<literal>fcitx-engines.hangul</literal>): Korean input method.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input method.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input method that
+     uses input methods and corresponding icons in the m17n database.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input method from
+     Google.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     table-others (<literal>fcitx-engines.table-others</literal>): Various
+     table-based input methods.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section xml:id="module-services-input-methods-nabi">
+  <title>Nabi</title>
 
-<section xml:id="module-services-input-methods-nabi"><title>Nabi</title>
+  <para>
+   Nabi is an easy to use Korean X input method. It allows you to enter
+   phonetic Korean characters (hangul) and pictographic Korean characters
+   (hanja).
+  </para>
 
-<para>Nabi is an easy to use Korean X input method. It allows you to enter
-  phonetic Korean characters (hangul) and pictographic Korean characters
-  (hanja).</para>
-<para>The following snippet can be used to configure Nabi:</para>
+  <para>
+   The following snippet can be used to configure Nabi:
+  </para>
 
 <programlisting>
 i18n.inputMethod = {
   <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "nabi";
 };
 </programlisting>
-</section>
+ </section>
+ <section xml:id="module-services-input-methods-uim">
+  <title>Uim</title>
 
-<section xml:id="module-services-input-methods-uim"><title>Uim</title>
+  <para>
+   Uim (short for "universal input method") is a multilingual input method
+   framework. Applications can use it through so-called bridges.
+  </para>
 
-<para>Uim (short for "universal input method") is a multilingual input method
-  framework. Applications can use it through so-called bridges.</para>
-<para>The following snippet can be used to configure uim:</para>
+  <para>
+   The following snippet can be used to configure uim:
+  </para>
 
 <programlisting>
 i18n.inputMethod = {
@@ -148,8 +236,9 @@ i18n.inputMethod = {
 };
 </programlisting>
 
-<para>Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
-  used to choose uim toolbar.</para>
-
-</section>
+  <para>
+   Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
+   used to choose uim toolbar.
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
index a26653dda535..c63201628dbd 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -3,75 +3,64 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-programs-digitalbitbox">
-
-  <title>Digital Bitbox</title>
-
-  <para>
-    Digital Bitbox is a hardware wallet and second-factor authenticator.
-  </para>
-
-  <para>
-    The <literal>digitalbitbox</literal> programs module may be
-    installed by setting <literal>programs.digitalbitbox</literal>
-    to <literal>true</literal> in a manner similar to
-
+ <title>Digital Bitbox</title>
+ <para>
+  Digital Bitbox is a hardware wallet and second-factor authenticator.
+ </para>
+ <para>
+  The <literal>digitalbitbox</literal> programs module may be installed by
+  setting <literal>programs.digitalbitbox</literal> to <literal>true</literal>
+  in a manner similar to
 <programlisting>
 <xref linkend="opt-programs.digitalbitbox.enable"/> = true;
 </programlisting>
-
-    and bundles the <literal>digitalbitbox</literal> package (see <xref
+  and bundles the <literal>digitalbitbox</literal> package (see
+  <xref
       linkend="sec-digitalbitbox-package" />), which contains the
-    <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries,
-    along with the hardware module (see <xref
+  <literal>dbb-app</literal> and <literal>dbb-cli</literal> binaries, along
+  with the hardware module (see
+  <xref
       linkend="sec-digitalbitbox-hardware-module" />) which sets up the
-    necessary udev rules to access the device.
-  </para>
+  necessary udev rules to access the device.
+ </para>
+ <para>
+  Enabling the digitalbitbox module is pretty much the easiest way to get a
+  Digital Bitbox device working on your system.
+ </para>
+ <para>
+  For more information, see
+  <link xlink:href="https://digitalbitbox.com/start_linux" />.
+ </para>
+ <section xml:id="sec-digitalbitbox-package">
+  <title>Package</title>
 
   <para>
-    Enabling the digitalbitbox module is pretty much the easiest way to
-    get a Digital Bitbox device working on your system.
-  </para>
-
-  <para>
-    For more information, see
-    <link xlink:href="https://digitalbitbox.com/start_linux" />.
-  </para>
-
-  <section xml:id="sec-digitalbitbox-package">
-    <title>Package</title>
-
-    <para>
-      The binaries, <literal>dbb-app</literal> (a GUI tool) and
-      <literal>dbb-cli</literal> (a CLI tool), are available through the
-      <literal>digitalbitbox</literal> package which could be installed
-      as follows:
-
+   The binaries, <literal>dbb-app</literal> (a GUI tool) and
+   <literal>dbb-cli</literal> (a CLI tool), are available through the
+   <literal>digitalbitbox</literal> package which could be installed as
+   follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   pkgs.digitalbitbox
 ];
 </programlisting>
-    </para>
-  </section>
-
-
-  <section xml:id="sec-digitalbitbox-hardware-module">
-    <title>Hardware</title>
-
-    <para>
-      The digitalbitbox hardware package enables the udev rules for
-      Digital Bitbox devices and may be installed as follows:
+  </para>
+ </section>
+ <section xml:id="sec-digitalbitbox-hardware-module">
+  <title>Hardware</title>
 
+  <para>
+   The digitalbitbox hardware package enables the udev rules for Digital Bitbox
+   devices and may be installed as follows:
 <programlisting>
 <xref linkend="opt-hardware.digitalbitbox.enable"/> = true;
 </programlisting>
-    </para>
-
-    <para>
-      In order to alter the udev rules, one may provide different values for
-      the <literal>udevRule51</literal> and <literal>udevRule52</literal>
-      attributes by means of overriding as follows:
+  </para>
 
+  <para>
+   In order to alter the udev rules, one may provide different values for the
+   <literal>udevRule51</literal> and <literal>udevRule52</literal> attributes
+   by means of overriding as follows:
 <programlisting>
 programs.digitalbitbox = {
   <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true;
@@ -80,6 +69,6 @@ programs.digitalbitbox = {
   };
 };
 </programlisting>
-    </para>
-  </section>
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 91740ee16ec2..902cd89e0c49 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -3,23 +3,28 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-program-plotinus">
-
-<title>Plotinus</title>
-
-<para><emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename></para>
-
-<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/></para>
-
-<para>Plotinus is a searchable command palette in every modern GTK+ application.</para>
-
-<para>When in a GTK+3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette.  The command palette provides a searchable list of of all menu items in the application.</para>
-
-<para>To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
-
+ <title>Plotinus</title>
+ <para>
+  <emphasis>Source:</emphasis>
+  <filename>modules/programs/plotinus.nix</filename>
+ </para>
+ <para>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://github.com/p-e-w/plotinus"/>
+ </para>
+ <para>
+  Plotinus is a searchable command palette in every modern GTK+ application.
+ </para>
+ <para>
+  When in a GTK+3 application and Plotinus is enabled, you can press
+  <literal>Ctrl+Shift+P</literal> to open the command palette. The command
+  palette provides a searchable list of of all menu items in the application.
+ </para>
+ <para>
+  To enable Plotinus, add the following to your
+  <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-programs.plotinus.enable"/> = true;
 </programlisting>
-
-</para>
-
+ </para>
 </chapter>
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 6567d4a42fac..5cf690c1a560 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -3,18 +3,20 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-programs-zsh-ohmyzsh">
+ <title>Oh my ZSH</title>
+ <para>
+  <literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a
+  framework to manage your <link xlink:href="https://www.zsh.org/">ZSH</link>
+  configuration including completion scripts for several CLI tools or custom
+  prompt themes.
+ </para>
+ <section xml:id="module-programs-oh-my-zsh-usage">
+  <title>Basic usage</title>
 
-<title>Oh my ZSH</title>
-
-<para><literal><link xlink:href="https://ohmyz.sh/">oh-my-zsh</link></literal> is a framework
-to manage your <link xlink:href="https://www.zsh.org/">ZSH</link> configuration
-including completion scripts for several CLI tools or custom prompt themes.</para>
-
-<section xml:id="module-programs-oh-my-zsh-usage"><title>Basic usage</title>
-<para>The module uses the <literal>oh-my-zsh</literal> package with all available features.  The
-initial setup using Nix expressions is fairly similar to the configuration format
-of <literal>oh-my-zsh</literal>.
-
+  <para>
+   The module uses the <literal>oh-my-zsh</literal> package with all available
+   features. The initial setup using Nix expressions is fairly similar to the
+   configuration format of <literal>oh-my-zsh</literal>.
 <programlisting>
 {
   programs.ohMyZsh = {
@@ -24,39 +26,50 @@ of <literal>oh-my-zsh</literal>.
   };
 }
 </programlisting>
+   For a detailed explanation of these arguments please refer to the
+   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal>
+   docs</link>.
+  </para>
 
-For a detailed explanation of these arguments please refer to the
-<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki"><literal>oh-my-zsh</literal> docs</link>.
-</para>
-<para>The expression generates the needed
-configuration and writes it into your <literal>/etc/zshrc</literal>.
-</para></section>
+  <para>
+   The expression generates the needed configuration and writes it into your
+   <literal>/etc/zshrc</literal>.
+  </para>
+ </section>
+ <section xml:id="module-programs-oh-my-zsh-additions">
+  <title>Custom additions</title>
 
-<section xml:id="module-programs-oh-my-zsh-additions"><title>Custom additions</title>
-
-<para>Sometimes third-party or custom scripts such as a modified theme may be needed.
-<literal>oh-my-zsh</literal> provides the
-<link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link> 
-environment variable for this which points to a directory with additional scripts.</para>
-
-<para>The module can do this as well:
+  <para>
+   Sometimes third-party or custom scripts such as a modified theme may be
+   needed. <literal>oh-my-zsh</literal> provides the
+   <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals"><literal>ZSH_CUSTOM</literal></link>
+   environment variable for this which points to a directory with additional
+   scripts.
+  </para>
 
+  <para>
+   The module can do this as well:
 <programlisting>
 {
   programs.ohMyZsh.custom = "~/path/to/custom/scripts";
 }
 </programlisting>
-</para></section>
+  </para>
+ </section>
+ <section xml:id="module-programs-oh-my-zsh-environments">
+  <title>Custom environments</title>
 
-<section xml:id="module-programs-oh-my-zsh-environments"><title>Custom environments</title>
-
-<para>There are several extensions for <literal>oh-my-zsh</literal> packaged in <literal>nixpkgs</literal>.
-One of them is <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
-which bundles completion scripts and a plugin for <literal>oh-my-zsh</literal>.</para>
-
-<para>Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>, it's also possible to
-generate this path from a list of Nix packages:
+  <para>
+   There are several extensions for <literal>oh-my-zsh</literal> packaged in
+   <literal>nixpkgs</literal>. One of them is
+   <link xlink:href="https://github.com/spwhitt/nix-zsh-completions">nix-zsh-completions</link>
+   which bundles completion scripts and a plugin for
+   <literal>oh-my-zsh</literal>.
+  </para>
 
+  <para>
+   Rather than using a single mutable path for <literal>ZSH_CUSTOM</literal>,
+   it's also possible to generate this path from a list of Nix packages:
 <programlisting>
 { pkgs, ... }:
 {
@@ -66,42 +79,59 @@ generate this path from a list of Nix packages:
   ];
 }
 </programlisting>
+   Internally a single store path will be created using
+   <literal>buildEnv</literal>. Please refer to the docs of
+   <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
+   for further reference.
+  </para>
 
-Internally a single store path will be created using <literal>buildEnv</literal>.
-Please refer to the docs of
-<link xlink:href="https://nixos.org/nixpkgs/manual/#sec-building-environment"><literal>buildEnv</literal></link>
-for further reference.</para>
+  <para>
+   <emphasis>Please keep in mind that this is not compatible with
+   <literal>programs.ohMyZsh.custom</literal> as it requires an immutable store
+   path while <literal>custom</literal> shall remain mutable! An evaluation
+   failure will be thrown if both <literal>custom</literal> and
+   <literal>customPkgs</literal> are set.</emphasis>
+  </para>
+ </section>
+ <section xml:id="module-programs-oh-my-zsh-packaging-customizations">
+  <title>Package your own customizations</title>
 
-<para><emphasis>Please keep in mind that this is not compatible with <literal>programs.ohMyZsh.custom</literal>
-as it requires an immutable store path while <literal>custom</literal> shall remain mutable! An evaluation failure
-will be thrown if both <literal>custom</literal> and <literal>customPkgs</literal> are set.</emphasis>
-</para></section>
+  <para>
+   If third-party customizations (e.g. new themes) are supposed to be added to
+   <literal>oh-my-zsh</literal> there are several pitfalls to keep in mind:
+  </para>
 
-<section xml:id="module-programs-oh-my-zsh-packaging-customizations"><title>Package your own customizations</title>
-
-<para>If third-party customizations (e.g. new themes) are supposed to be added to <literal>oh-my-zsh</literal>
-there are several pitfalls to keep in mind:</para>
-
-<itemizedlist>
-  <listitem>
-    <para>To comply with the default structure of <literal>ZSH</literal> the entire output needs to be written to
-    <literal>$out/share/zsh.</literal></para>
-  </listitem>
-  <listitem>
-    <para>Completion scripts are supposed to be stored at <literal>$out/share/zsh/site-functions</literal>. This directory
-    is part of the <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
-    and the package should be compatible with pure <literal>ZSH</literal> setups. The module will automatically link
-    the contents of <literal>site-functions</literal> to completions directory in the proper store path.</para>
-  </listitem>
-  <listitem>
-    <para>The <literal>plugins</literal> directory needs the structure <literal>pluginname/pluginname.plugin.zsh</literal>
-    as structured in the <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream repo.</link>
+  <itemizedlist>
+   <listitem>
+    <para>
+     To comply with the default structure of <literal>ZSH</literal> the entire
+     output needs to be written to <literal>$out/share/zsh.</literal>
     </para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Completion scripts are supposed to be stored at
+     <literal>$out/share/zsh/site-functions</literal>. This directory is part
+     of the
+     <literal><link xlink:href="http://zsh.sourceforge.net/Doc/Release/Functions.html">fpath</link></literal>
+     and the package should be compatible with pure <literal>ZSH</literal>
+     setups. The module will automatically link the contents of
+     <literal>site-functions</literal> to completions directory in the proper
+     store path.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>plugins</literal> directory needs the structure
+     <literal>pluginname/pluginname.plugin.zsh</literal> as structured in the
+     <link xlink:href="https://github.com/robbyrussell/oh-my-zsh/tree/91b771914bc7c43dd7c7a43b586c5de2c225ceb7/plugins">upstream
+     repo.</link>
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<para>
-A derivation for <literal>oh-my-zsh</literal> may look like this:
+  <para>
+   A derivation for <literal>oh-my-zsh</literal> may look like this:
 <programlisting>
 { stdenv, fetchFromGitHub }:
 
@@ -120,6 +150,6 @@ stdenv.mkDerivation rec {
   '';
 }
 </programlisting>
-</para>
-</section>
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index b4cd83f6632c..ef71fe53d0c7 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -3,23 +3,25 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-security-acme">
+ <title>SSL/TLS Certificates with ACME</title>
+ <para>
+  NixOS supports automatic domain validation &amp; certificate retrieval and
+  renewal using the ACME protocol. This is currently only implemented by and
+  for Let's Encrypt. The alternative ACME client <literal>simp_le</literal> is
+  used under the hood.
+ </para>
+ <section xml:id="module-security-acme-prerequisites">
+  <title>Prerequisites</title>
 
-<title>SSL/TLS Certificates with ACME</title>
-
-<para>NixOS supports automatic domain validation &amp; certificate
-retrieval and renewal using the ACME protocol. This is currently only
-implemented by and for Let's Encrypt. The alternative ACME client
-<literal>simp_le</literal> is used under the hood.</para>
-
-<section xml:id="module-security-acme-prerequisites"><title>Prerequisites</title>
-
-<para>You need to have a running HTTP server for verification. The server must
-have a webroot defined that can serve
-<filename>.well-known/acme-challenge</filename>. This directory must be
-writeable by the user that will run the ACME client.</para>
-
-<para>For instance, this generic snippet could be used for Nginx:
+  <para>
+   You need to have a running HTTP server for verification. The server must
+   have a webroot defined that can serve
+   <filename>.well-known/acme-challenge</filename>. This directory must be
+   writeable by the user that will run the ACME client.
+  </para>
 
+  <para>
+   For instance, this generic snippet could be used for Nginx:
 <programlisting>
 http {
   server {
@@ -37,43 +39,47 @@ http {
   }
 }
 </programlisting>
-</para>
-
-</section>
-
-<section xml:id="module-security-acme-configuring"><title>Configuring</title>
-
-<para>To enable ACME certificate retrieval &amp; renewal for a certificate for
-<literal>foo.example.com</literal>, add the following in your
-<filename>configuration.nix</filename>:
+  </para>
+ </section>
+ <section xml:id="module-security-acme-configuring">
+  <title>Configuring</title>
 
+  <para>
+   To enable ACME certificate retrieval &amp; renewal for a certificate for
+   <literal>foo.example.com</literal>, add the following in your
+   <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-security.acme.certs"/>."foo.example.com" = {
   <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges";
   <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com";
 };
 </programlisting>
-</para>
+  </para>
 
-<para>The private key <filename>key.pem</filename> and certificate
-<filename>fullchain.pem</filename> will be put into
-<filename>/var/lib/acme/foo.example.com</filename>. The target directory can
-be configured with the option <xref linkend="opt-security.acme.directory"/>.
-</para>
+  <para>
+   The private key <filename>key.pem</filename> and certificate
+   <filename>fullchain.pem</filename> will be put into
+   <filename>/var/lib/acme/foo.example.com</filename>. The target directory can
+   be configured with the option <xref linkend="opt-security.acme.directory"/>.
+  </para>
 
-<para>Refer to <xref linkend="ch-options" /> for all available configuration
-options for the <link linkend="opt-security.acme.certs">security.acme</link> module.</para>
+  <para>
+   Refer to <xref linkend="ch-options" /> for all available configuration
+   options for the <link linkend="opt-security.acme.certs">security.acme</link>
+   module.
+  </para>
+ </section>
+ <section xml:id="module-security-acme-nginx">
+  <title>Using ACME certificates in Nginx</title>
 
-</section>
-
-<section xml:id="module-security-acme-nginx"><title>Using ACME certificates in Nginx</title>
-<para>NixOS supports fetching ACME certificates for you by setting
-  <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We
-first create self-signed placeholder certificates in place of the
-real ACME certs. The placeholder certs are overwritten when the ACME
-certs arrive. For <literal>foo.example.com</literal> the config would
-look like.
-</para>
+  <para>
+   NixOS supports fetching ACME certificates for you by setting
+   <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link>
+   = true;</literal> in a virtualHost config. We first create self-signed
+   placeholder certificates in place of the real ACME certs. The placeholder
+   certs are overwritten when the ACME certs arrive. For
+   <literal>foo.example.com</literal> the config would look like.
+  </para>
 
 <programlisting>
 services.nginx = {
@@ -89,5 +95,5 @@ services.nginx = {
   };
 }
 </programlisting>
-</section>
+ </section>
 </chapter>
diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml
index d69341eb3cde..5a17cb1da412 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixos/modules/security/hidepid.xml
@@ -3,31 +3,26 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-hidepid">
-
-  <title>Hiding process information</title>
-
-  <para>
-    Setting
+ <title>Hiding process information</title>
+ <para>
+  Setting
 <programlisting>
 <xref linkend="opt-security.hideProcessInformation"/> = true;
 </programlisting>
-    ensures that access to process information is restricted to the
-    owning user.  This implies, among other things, that command-line
-    arguments remain private.  Unless your deployment relies on unprivileged
-    users being able to inspect the process information of other users, this
-    option should be safe to enable.
-  </para>
-
-  <para>
-    Members of the <literal>proc</literal> group are exempt from process
-    information hiding.
-  </para>
-
-  <para>
-    To allow a service <replaceable>foo</replaceable> to run without process information hiding, set
+  ensures that access to process information is restricted to the owning user.
+  This implies, among other things, that command-line arguments remain private.
+  Unless your deployment relies on unprivileged users being able to inspect the
+  process information of other users, this option should be safe to enable.
+ </para>
+ <para>
+  Members of the <literal>proc</literal> group are exempt from process
+  information hiding.
+ </para>
+ <para>
+  To allow a service <replaceable>foo</replaceable> to run without process
+  information hiding, set
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ];
 </programlisting>
-  </para>
-
+ </para>
 </chapter>
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 7883680d46cc..bf4b644c9b86 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -3,42 +3,50 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-foundationdb">
+ <title>FoundationDB</title>
+ <para>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/databases/foundationdb.nix</filename>
+ </para>
+ <para>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://apple.github.io/foundationdb/"/>
+ </para>
+ <para>
+  <emphasis>Maintainer:</emphasis> Austin Seipp
+ </para>
+ <para>
+  <emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x
+ </para>
+ <para>
+  FoundationDB (or "FDB") is an open source, distributed, transactional
+  key-value store.
+ </para>
+ <section xml:id="module-services-foundationdb-configuring">
+  <title>Configuring and basic setup</title>
 
-<title>FoundationDB</title>
-
-<para><emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename></para>
-
-<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/></para>
-
-<para><emphasis>Maintainer:</emphasis> Austin Seipp</para>
-
-<para><emphasis>Available version(s):</emphasis> 5.1.x, 5.2.x, 6.0.x</para>
-
-<para>FoundationDB (or "FDB") is an open source, distributed, transactional
-key-value store.</para>
-
-<section xml:id="module-services-foundationdb-configuring"><title>Configuring and basic setup</title>
-
-<para>To enable FoundationDB, add the following to your
-<filename>configuration.nix</filename>:
-
+  <para>
+   To enable FoundationDB, add the following to your
+   <filename>configuration.nix</filename>:
 <programlisting>
 services.foundationdb.enable = true;
 services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
 </programlisting>
-</para>
+  </para>
 
-<para>The <option>services.foundationdb.package</option> option is required,
-and must always be specified. Due to the fact FoundationDB network protocols and
-on-disk storage formats may change between (major) versions, and upgrades must
-be explicitly handled by the user, you must always manually specify this
-yourself so that the NixOS module will use the proper version. Note that minor,
-bugfix releases are always compatible.</para>
-
-<para>After running <command>nixos-rebuild</command>, you can verify whether
-FoundationDB is running by executing <command>fdbcli</command> (which is added
-to <option>environment.systemPackages</option>):
+  <para>
+   The <option>services.foundationdb.package</option> option is required, and
+   must always be specified. Due to the fact FoundationDB network protocols and
+   on-disk storage formats may change between (major) versions, and upgrades
+   must be explicitly handled by the user, you must always manually specify
+   this yourself so that the NixOS module will use the proper version. Note
+   that minor, bugfix releases are always compatible.
+  </para>
 
+  <para>
+   After running <command>nixos-rebuild</command>, you can verify whether
+   FoundationDB is running by executing <command>fdbcli</command> (which is
+   added to <option>environment.systemPackages</option>):
 <programlisting>
 $ sudo -u foundationdb fdbcli
 Using cluster file `/etc/foundationdb/fdb.cluster'.
@@ -66,14 +74,14 @@ Cluster:
 
 fdb>
 </programlisting>
-</para>
-
-<para>You can also write programs using the available client libraries.
-For example, the following Python program can be run in order to grab the
-cluster status, as a quick example. (This example uses
-<command>nix-shell</command> shebang support to automatically supply the
-necessary Python modules).
+  </para>
 
+  <para>
+   You can also write programs using the available client libraries. For
+   example, the following Python program can be run in order to grab the
+   cluster status, as a quick example. (This example uses
+   <command>nix-shell</command> shebang support to automatically supply the
+   necessary Python modules).
 <programlisting>
 a@link> cat fdb-status.py
 #! /usr/bin/env nix-shell
@@ -100,255 +108,336 @@ a@link> ./fdb-status.py
 FoundationDB available: True
 a@link>
 </programlisting>
-</para>
+  </para>
 
-<para>FoundationDB is run under the <command>foundationdb</command> user and
-group by default, but this may be changed in the NixOS configuration. The
-systemd unit <command>foundationdb.service</command> controls the
-<command>fdbmonitor</command> process.</para>
+  <para>
+   FoundationDB is run under the <command>foundationdb</command> user and group
+   by default, but this may be changed in the NixOS configuration. The systemd
+   unit <command>foundationdb.service</command> controls the
+   <command>fdbmonitor</command> process.
+  </para>
 
-<para>By default, the NixOS module for FoundationDB creates a single
-SSD-storage based database for development and basic usage. This storage engine
-is designed for SSDs and will perform poorly on HDDs; however it can handle far
-more data than the alternative "memory" engine and is a better default choice
-for most deployments. (Note that you can change the storage backend on-the-fly
-for a given FoundationDB cluster using <command>fdbcli</command>.)</para>
+  <para>
+   By default, the NixOS module for FoundationDB creates a single SSD-storage
+   based database for development and basic usage. This storage engine is
+   designed for SSDs and will perform poorly on HDDs; however it can handle far
+   more data than the alternative "memory" engine and is a better default
+   choice for most deployments. (Note that you can change the storage backend
+   on-the-fly for a given FoundationDB cluster using
+   <command>fdbcli</command>.)
+  </para>
 
-<para>Furthermore, only 1 server process and 1 backup agent are started in the
-default configuration. See below for more on scaling to increase this.</para>
-
-<para>FoundationDB stores all data for all server processes under
-<filename>/var/lib/foundationdb</filename>. You can override this using
-<option>services.foundationdb.dataDir</option>, e.g.
+  <para>
+   Furthermore, only 1 server process and 1 backup agent are started in the
+   default configuration. See below for more on scaling to increase this.
+  </para>
 
+  <para>
+   FoundationDB stores all data for all server processes under
+   <filename>/var/lib/foundationdb</filename>. You can override this using
+   <option>services.foundationdb.dataDir</option>, e.g.
 <programlisting>
 services.foundationdb.dataDir = "/data/fdb";
 </programlisting>
+  </para>
 
-</para>
+  <para>
+   Similarly, logs are stored under <filename>/var/log/foundationdb</filename>
+   by default, and there is a corresponding
+   <option>services.foundationdb.logDir</option> as well.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-scaling">
+  <title>Scaling processes and backup agents</title>
 
-<para>Similarly, logs are stored under
-<filename>/var/log/foundationdb</filename> by default, and there is a
-corresponding <option>services.foundationdb.logDir</option> as well.</para>
+  <para>
+   Scaling the number of server processes is quite easy; simply specify
+   <option>services.foundationdb.serverProcesses</option> to be the number of
+   FoundationDB worker processes that should be started on the machine.
+  </para>
 
-</section>
+  <para>
+   FoundationDB worker processes typically require 4GB of RAM per-process at
+   minimum for good performance, so this option is set to 1 by default since
+   the maximum amount of RAM is unknown. You're advised to abide by this
+   restriction, so pick a number of processes so that each has 4GB or more.
+  </para>
 
-<section xml:id="module-services-foundationdb-scaling"><title>Scaling processes and backup agents</title>
+  <para>
+   A similar option exists in order to scale backup agent processes,
+   <option>services.foundationdb.backupProcesses</option>. Backup agents are
+   not as performance/RAM sensitive, so feel free to experiment with the number
+   of available backup processes.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-clustering">
+  <title>Clustering</title>
 
-<para>Scaling the number of server processes is quite easy; simply specify
-<option>services.foundationdb.serverProcesses</option> to be the number of
-FoundationDB worker processes that should be started on the machine.</para>
+  <para>
+   FoundationDB on NixOS works similarly to other Linux systems, so this
+   section will be brief. Please refer to the full FoundationDB documentation
+   for more on clustering.
+  </para>
 
-<para>FoundationDB worker processes typically require 4GB of RAM per-process at
-minimum for good performance, so this option is set to 1 by default since the
-maximum amount of RAM is unknown. You're advised to abide by this restriction,
-so pick a number of processes so that each has 4GB or more.</para>
+  <para>
+   FoundationDB organizes clusters using a set of
+   <emphasis>coordinators</emphasis>, which are just specially-designated
+   worker processes. By default, every installation of FoundationDB on NixOS
+   will start as its own individual cluster, with a single coordinator: the
+   first worker process on <command>localhost</command>.
+  </para>
 
-<para>A similar option exists in order to scale backup agent processes,
-<option>services.foundationdb.backupProcesses</option>. Backup agents are not
-as performance/RAM sensitive, so feel free to experiment with the number of
-available backup processes.</para>
+  <para>
+   Coordinators are specified globally using the
+   <command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
+   client applications will use to find and join coordinators. Note that this
+   file <emphasis>can not</emphasis> be managed by NixOS so easily:
+   FoundationDB is designed so that it will rewrite the file at runtime for all
+   clients and nodes when cluster coordinators change, with clients
+   transparently handling this without intervention. It is fundamentally a
+   mutable file, and you should not try to manage it in any way in NixOS.
+  </para>
 
-</section>
+  <para>
+   When dealing with a cluster, there are two main things you want to do:
+  </para>
 
-<section xml:id="module-services-foundationdb-clustering"><title>Clustering</title>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Add a node to the cluster for storage/compute.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Promote an ordinary worker to a coordinator.
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<para>FoundationDB on NixOS works similarly to other Linux systems, so this
-section will be brief. Please refer to the full FoundationDB documentation for
-more on clustering.</para>
+  <para>
+   A node must already be a member of the cluster in order to properly be
+   promoted to a coordinator, so you must always add it first if you wish to
+   promote it.
+  </para>
 
-<para>FoundationDB organizes clusters using a set of
-<emphasis>coordinators</emphasis>, which are just specially-designated worker
-processes. By default, every installation of FoundationDB on NixOS will start
-as its own individual cluster, with a single coordinator: the first worker
-process on <command>localhost</command>.</para>
+  <para>
+   To add a machine to a FoundationDB cluster:
+  </para>
 
-<para>Coordinators are specified globally using the
-<command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
-client applications will use to find and join coordinators. Note that this file
-<emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is
-designed so that it will rewrite the file at runtime for all clients and nodes
-when cluster coordinators change, with clients transparently handling this
-without intervention. It is fundamentally a mutable file, and you should not
-try to manage it in any way in NixOS.</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Choose one of the servers to start as the initial coordinator.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Copy the <command>/etc/foundationdb/fdb.cluster</command> file from this
+     server to all the other servers. Restart FoundationDB on all of these
+     other servers, so they join the cluster.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     All of these servers are now connected and working together in the
+     cluster, under the chosen coordinator.
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<para>When dealing with a cluster, there are two main things you want to
-do:</para>
+  <para>
+   At this point, you can add as many nodes as you want by just repeating the
+   above steps. By default there will still be a single coordinator: you can
+   use <command>fdbcli</command> to change this and add new coordinators.
+  </para>
 
-<itemizedlist>
-  <listitem><para>Add a node to the cluster for storage/compute.</para></listitem>
-  <listitem><para>Promote an ordinary worker to a coordinator.</para></listitem>
-</itemizedlist>
+  <para>
+   As a convenience, FoundationDB can automatically assign coordinators based
+   on the redundancy mode you wish to achieve for the cluster. Once all the
+   nodes have been joined, simply set the replication policy, and then issue
+   the <command>coordinators auto</command> command
+  </para>
 
-<para>A node must already be a member of the cluster in order to properly be
-promoted to a coordinator, so you must always add it first if you wish to
-promote it.</para>
-
-<para>To add a machine to a FoundationDB cluster:</para>
-
-<itemizedlist>
-  <listitem><para>Choose one of the servers to start as the initial coordinator.
-      </para></listitem>
-  <listitem><para>Copy the <command>/etc/foundationdb/fdb.cluster</command> file
-      from this server to all the other servers. Restart FoundationDB on all of
-      these other servers, so they join the cluster.</para></listitem>
-  <listitem><para>All of these servers are now connected and working together
-      in the cluster, under the chosen coordinator.</para></listitem>
-</itemizedlist>
-
-<para>At this point, you can add as many nodes as you want by just repeating
-the above steps. By default there will still be a single coordinator: you can
-use <command>fdbcli</command> to change this and add new coordinators.</para>
-
-<para>As a convenience, FoundationDB can automatically assign coordinators
-based on the redundancy mode you wish to achieve for the cluster. Once all the
-nodes have been joined, simply set the replication policy, and then issue the
-<command>coordinators auto</command> command</para>
-
-<para>For example, assuming we have 3 nodes available, we can enable double
-redundancy mode, then auto-select coordinators. For double redundancy, 3
-coordinators is ideal: therefore FoundationDB will make
-<emphasis>every</emphasis> node a coordinator automatically:</para>
+  <para>
+   For example, assuming we have 3 nodes available, we can enable double
+   redundancy mode, then auto-select coordinators. For double redundancy, 3
+   coordinators is ideal: therefore FoundationDB will make
+   <emphasis>every</emphasis> node a coordinator automatically:
+  </para>
 
 <programlisting>
 fdbcli> configure double ssd
 fdbcli> coordinators auto
 </programlisting>
 
-<para>This will transparently update all the servers within seconds, and
-appropriately rewrite the <command>fdb.cluster</command> file, as well as
-informing all client processes to do the same.</para>
+  <para>
+   This will transparently update all the servers within seconds, and
+   appropriately rewrite the <command>fdb.cluster</command> file, as well as
+   informing all client processes to do the same.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-connectivity">
+  <title>Client connectivity</title>
 
-</section>
+  <para>
+   By default, all clients must use the current <command>fdb.cluster</command>
+   file to access a given FoundationDB cluster. This file is located by default
+   in <command>/etc/foundationdb/fdb.cluster</command> on all machines with the
+   FoundationDB service enabled, so you may copy the active one from your
+   cluster to a new node in order to connect, if it is not part of the cluster.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-authorization">
+  <title>Client authorization and TLS</title>
 
-<section xml:id="module-services-foundationdb-connectivity"><title>Client connectivity</title>
+  <para>
+   By default, any user who can connect to a FoundationDB process with the
+   correct cluster configuration can access anything. FoundationDB uses a
+   pluggable design to transport security, and out of the box it supports a
+   LibreSSL-based plugin for TLS support. This plugin not only does in-flight
+   encryption, but also performs client authorization based on the given
+   endpoint's certificate chain. For example, a FoundationDB server may be
+   configured to only accept client connections over TLS, where the client TLS
+   certificate is from organization <emphasis>Acme Co</emphasis> in the
+   <emphasis>Research and Development</emphasis> unit.
+  </para>
 
-<para>By default, all clients must use the current
-<command>fdb.cluster</command> file to access a given FoundationDB cluster.
-This file is located by default in
-<command>/etc/foundationdb/fdb.cluster</command> on all machines with the
-FoundationDB service enabled, so you may copy the active one from your cluster
-to a new node in order to connect, if it is not part of the cluster.</para>
+  <para>
+   Configuring TLS with FoundationDB is done using the
+   <option>services.foundationdb.tls</option> options in order to control the
+   peer verification string, as well as the certificate and its private key.
+  </para>
 
-</section>
+  <para>
+   Note that the certificate and its private key must be accessible to the
+   FoundationDB user account that the server runs under. These files are also
+   NOT managed by NixOS, as putting them into the store may reveal private
+   information.
+  </para>
 
-<section xml:id="module-services-foundationdb-authorization"><title>Client authorization and TLS</title>
-
-<para>By default, any user who can connect to a FoundationDB process with the
-correct cluster configuration can access anything. FoundationDB uses a
-pluggable design to transport security, and out of the box it supports a
-LibreSSL-based plugin for TLS support. This plugin not only does in-flight
-encryption, but also performs client authorization based on the given
-endpoint's certificate chain. For example, a FoundationDB server may be
-configured to only accept client connections over TLS, where the client TLS
-certificate is from organization <emphasis>Acme Co</emphasis> in the
-<emphasis>Research and Development</emphasis> unit.</para>
-
-<para>Configuring TLS with FoundationDB is done using the
-<option>services.foundationdb.tls</option> options in order to control the peer
-verification string, as well as the certificate and its private key.</para>
-
-<para>Note that the certificate and its private key must be accessible to the
-FoundationDB user account that the server runs under. These files are also NOT
-managed by NixOS, as putting them into the store may reveal private
-information.</para>
-
-<para>After you have a key and certificate file in place, it is not enough to
-simply set the NixOS module options -- you must also configure the
-<command>fdb.cluster</command> file to specify that a given set of coordinators
-use TLS. This is as simple as adding the suffix <command>:tls</command> to your
-cluster coordinator configuration, after the port number. For example, assuming
-you have a coordinator on localhost with the default configuration, simply
-specifying:</para>
+  <para>
+   After you have a key and certificate file in place, it is not enough to
+   simply set the NixOS module options -- you must also configure the
+   <command>fdb.cluster</command> file to specify that a given set of
+   coordinators use TLS. This is as simple as adding the suffix
+   <command>:tls</command> to your cluster coordinator configuration, after the
+   port number. For example, assuming you have a coordinator on localhost with
+   the default configuration, simply specifying:
+  </para>
 
 <programlisting>
 XXXXXX:XXXXXX@127.0.0.1:4500:tls
 </programlisting>
 
-<para>will configure all clients and server processes to use TLS from now
-on.</para>
+  <para>
+   will configure all clients and server processes to use TLS from now on.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-disaster-recovery">
+  <title>Backups and Disaster Recovery</title>
 
-</section>
+  <para>
+   The usual rules for doing FoundationDB backups apply on NixOS as written in
+   the FoundationDB manual. However, one important difference is the security
+   profile for NixOS: by default, the <command>foundationdb</command> systemd
+   unit uses <emphasis>Linux namespaces</emphasis> to restrict write access to
+   the system, except for the log directory, data directory, and the
+   <command>/etc/foundationdb/</command> directory. This is enforced by default
+   and cannot be disabled.
+  </para>
 
-<section xml:id="module-services-foundationdb-disaster-recovery"><title>Backups and Disaster Recovery</title>
+  <para>
+   However, a side effect of this is that the <command>fdbbackup</command>
+   command doesn't work properly for local filesystem backups: FoundationDB
+   uses a server process alongside the database processes to perform backups
+   and copy the backups to the filesystem. As a result, this process is put
+   under the restricted namespaces above: the backup process can only write to
+   a limited number of paths.
+  </para>
 
-<para>The usual rules for doing FoundationDB backups apply on NixOS as written
-in the FoundationDB manual. However, one important difference is the security
-profile for NixOS: by default, the <command>foundationdb</command> systemd unit
-uses <emphasis>Linux namespaces</emphasis> to restrict write access to the
-system, except for the log directory, data directory, and the
-<command>/etc/foundationdb/</command> directory. This is enforced by default
-and cannot be disabled.</para>
+  <para>
+   In order to allow flexible backup locations on local disks, the FoundationDB
+   NixOS module supports a
+   <option>services.foundationdb.extraReadWritePaths</option> option. This
+   option takes a list of paths, and adds them to the systemd unit, allowing
+   the processes inside the service to write (and read) the specified
+   directories.
+  </para>
 
-<para>However, a side effect of this is that the <command>fdbbackup</command>
-command doesn't work properly for local filesystem backups: FoundationDB uses a
-server process alongside the database processes to perform backups and copy the
-backups to the filesystem. As a result, this process is put under the
-restricted namespaces above: the backup process can only write to a limited
-number of paths.</para>
-
-<para>In order to allow flexible backup locations on local disks, the
-FoundationDB NixOS module supports a
-<option>services.foundationdb.extraReadWritePaths</option> option. This option
-takes a list of paths, and adds them to the systemd unit, allowing the
-processes inside the service to write (and read) the specified
-directories.</para>
-
-<para>For example, to create backups in <command>/opt/fdb-backups</command>,
-first set up the paths in the module options:</para>
+  <para>
+   For example, to create backups in <command>/opt/fdb-backups</command>, first
+   set up the paths in the module options:
+  </para>
 
 <programlisting>
 services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
 </programlisting>
 
-<para>Restart the FoundationDB service, and it will now be able to write to
-this directory (even if it does not yet exist.) Note: this path
-<emphasis>must</emphasis> exist before restarting the unit. Otherwise, systemd
-will not include it in the private FoundationDB namespace (and it will not add
-it dynamically at runtime).</para>
+  <para>
+   Restart the FoundationDB service, and it will now be able to write to this
+   directory (even if it does not yet exist.) Note: this path
+   <emphasis>must</emphasis> exist before restarting the unit. Otherwise,
+   systemd will not include it in the private FoundationDB namespace (and it
+   will not add it dynamically at runtime).
+  </para>
 
-<para>You can now perform a backup:</para>
+  <para>
+   You can now perform a backup:
+  </para>
 
 <programlisting>
 $ sudo -u foundationdb fdbbackup start  -t default -d file:///opt/fdb-backups
 $ sudo -u foundationdb fdbbackup status -t default
 </programlisting>
+ </section>
+ <section xml:id="module-services-foundationdb-limitations">
+  <title>Known limitations</title>
 
-</section>
+  <para>
+   The FoundationDB setup for NixOS should currently be considered beta.
+   FoundationDB is not new software, but the NixOS compilation and integration
+   has only undergone fairly basic testing of all the available functionality.
+  </para>
 
-<section xml:id="module-services-foundationdb-limitations"><title>Known limitations</title>
+  <itemizedlist>
+   <listitem>
+    <para>
+     There is no way to specify individual parameters for individual
+     <command>fdbserver</command> processes. Currently, all server processes
+     inherit all the global <command>fdbmonitor</command> settings.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ruby bindings are not currently installed.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Go bindings are not currently installed.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section xml:id="module-services-foundationdb-options">
+  <title>Options</title>
 
-<para>The FoundationDB setup for NixOS should currently be considered beta.
-FoundationDB is not new software, but the NixOS compilation and integration has
-only undergone fairly basic testing of all the available functionality.</para>
-
-<itemizedlist>
-  <listitem><para>There is no way to specify individual parameters for
-      individual <command>fdbserver</command> processes. Currently, all server
-      processes inherit all the global <command>fdbmonitor</command> settings.
-      </para></listitem>
-  <listitem><para>Ruby bindings are not currently installed.</para></listitem>
-  <listitem><para>Go bindings are not currently installed.</para></listitem>
-</itemizedlist>
-
-</section>
-
-<section xml:id="module-services-foundationdb-options"><title>Options</title>
-
-<para>NixOS's FoundationDB module allows you to configure all of the most
-relevant configuration options for <command>fdbmonitor</command>, matching it
-quite closely. A complete list of options for the FoundationDB module may be
-found <link linkend="opt-services.foundationdb.enable">here</link>. You should
-also read the FoundationDB documentation as well.</para>
-
-</section>
-
-<section xml:id="module-services-foundationdb-full-docs"><title>Full documentation</title>
-
-<para>FoundationDB is a complex piece of software, and requires careful
-administration to properly use. Full documentation for administration can be
-found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.</para>
-
-</section>
+  <para>
+   NixOS's FoundationDB module allows you to configure all of the most relevant
+   configuration options for <command>fdbmonitor</command>, matching it quite
+   closely. A complete list of options for the FoundationDB module may be found
+   <link linkend="opt-services.foundationdb.enable">here</link>. You should
+   also read the FoundationDB documentation as well.
+  </para>
+ </section>
+ <section xml:id="module-services-foundationdb-full-docs">
+  <title>Full documentation</title>
 
+  <para>
+   FoundationDB is a complex piece of software, and requires careful
+   administration to properly use. Full documentation for administration can be
+   found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 1aaf33963245..f89f0d653164 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -3,36 +3,39 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-postgresql">
-
-<title>PostgreSQL</title>
-
+ <title>PostgreSQL</title>
 <!-- FIXME: render nicely -->
-
 <!-- FIXME: source can be added automatically -->
-<para><emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename></para>
-
-<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/></para>
-
+ <para>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/databases/postgresql.nix</filename>
+ </para>
+ <para>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="http://www.postgresql.org/docs/"/>
+ </para>
 <!-- FIXME: more stuff, like maintainer? -->
+ <para>
+  PostgreSQL is an advanced, free relational database.
+<!-- MORE -->
+ </para>
+ <section xml:id="module-services-postgres-configuring">
+  <title>Configuring</title>
 
-<para>PostgreSQL is an advanced, free relational database.<!-- MORE --></para>
-
-<section xml:id="module-services-postgres-configuring"><title>Configuring</title>
-
-<para>To enable PostgreSQL, add the following to your
-<filename>configuration.nix</filename>:
-
+  <para>
+   To enable PostgreSQL, add the following to your
+   <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.postgresql.enable"/> = true;
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql94;
 </programlisting>
-
-Note that you are required to specify the desired version of
-PostgreSQL (e.g. <literal>pkgs.postgresql94</literal>). Since
-upgrading your PostgreSQL version requires a database dump and reload
-(see below), NixOS cannot provide a default value for
-<xref linkend="opt-services.postgresql.package"/> such as the most recent
-release of PostgreSQL.</para>
+   Note that you are required to specify the desired version of PostgreSQL
+   (e.g. <literal>pkgs.postgresql94</literal>). Since upgrading your PostgreSQL
+   version requires a database dump and reload (see below), NixOS cannot
+   provide a default value for
+   <xref linkend="opt-services.postgresql.package"/> such as the most recent
+   release of PostgreSQL.
+  </para>
 
 <!--
 <para>After running <command>nixos-rebuild</command>, you can verify
@@ -47,31 +50,28 @@ alice=>
 </screen>
 -->
 
-<para>By default, PostgreSQL stores its databases in
-<filename>/var/db/postgresql</filename>. You can override this using
-<xref linkend="opt-services.postgresql.dataDir"/>, e.g.
-
+  <para>
+   By default, PostgreSQL stores its databases in
+   <filename>/var/db/postgresql</filename>. You can override this using
+   <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
 <programlisting>
 <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
 </programlisting>
+  </para>
+ </section>
+ <section xml:id="module-services-postgres-upgrading">
+  <title>Upgrading</title>
 
-</para>
-
-</section>
-
-
-<section xml:id="module-services-postgres-upgrading"><title>Upgrading</title>
-
-<para>FIXME: document dump/upgrade/load cycle.</para>
-
-</section>
-
-
-<section xml:id="module-services-postgres-options"><title>Options</title>
-
-  <para>A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.</para>
-
-</section>
-
+  <para>
+   FIXME: document dump/upgrade/load cycle.
+  </para>
+ </section>
+ <section xml:id="module-services-postgres-options">
+  <title>Options</title>
 
+  <para>
+   A complete list of options for the PostgreSQL module may be found
+   <link linkend="opt-services.postgresql.enable">here</link>.
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
index d9c8b711c450..8045d5fa14f8 100644
--- a/nixos/modules/services/desktops/flatpak.xml
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -3,51 +3,54 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-flatpak">
-
-<title>Flatpak</title>
-
-<para><emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename></para>
-
-<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/></para>
-
-<para>Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.</para>
-
-<para>
-  To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
-
-  <programlisting>
+ <title>Flatpak</title>
+ <para>
+  <emphasis>Source:</emphasis>
+  <filename>modules/services/desktop/flatpak.nix</filename>
+ </para>
+ <para>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://github.com/flatpak/flatpak/wiki"/>
+ </para>
+ <para>
+  Flatpak is a system for building, distributing, and running sandboxed desktop
+  applications on Linux.
+ </para>
+ <para>
+  To enable Flatpak, add the following to your
+  <filename>configuration.nix</filename>:
+<programlisting>
   <xref linkend="opt-services.flatpak.enable"/> = true;
   </programlisting>
-</para>
-
-<para>
-  For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:
-
-  <programlisting>
+ </para>
+ <para>
+  For the sandboxed apps to work correctly, desktop integration portals need to
+  be installed. If you run GNOME, this will be handled automatically for you;
+  in other cases, you will need to add something like the following to your
+  <filename>configuration.nix</filename>:
+<programlisting>
   <xref linkend="opt-services.flatpak.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
   </programlisting>
-</para>
-
-<para>
-  Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
-
-  <programlisting>
+ </para>
+ <para>
+  Then, you will need to add a repository, for example,
+  <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>,
+  either using the following commands:
+<programlisting>
   flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
   flatpak update
   </programlisting>
-
-  or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
-</para>
-
-<para>
+  or by opening the
+  <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository
+  file</link> in GNOME Software.
+ </para>
+ <para>
   Finally, you can search and install programs:
-
-  <programlisting>
+<programlisting>
   flatpak search bustle
   flatpak install flathub org.freedesktop.Bustle
   flatpak run org.freedesktop.Bustle
   </programlisting>
-
   Again, GNOME Software offers graphical interface for these tasks.
-</para>
+ </para>
 </chapter>
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 94eb2e6a77bf..6cf20cf4aa7e 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -3,150 +3,148 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-emacs">
-
-  <title>Emacs</title>
-
-  <!--
+ <title>Emacs</title>
+<!--
     Documentation contributors:
       Damien Cassou @DamienCassou
       Thomas Tuegel @ttuegel
       Rodney Lorrimar @rvl
   -->
+ <para>
+  <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> is an
+  extensible, customizable, self-documenting real-time display editor — and
+  more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
+  programming language with extensions to support text editing.
+ </para>
+ <para>
+  Emacs runs within a graphical desktop environment using the X Window System,
+  but works equally well on a text terminal. Under
+  <productname>macOS</productname>, a "Mac port" edition is available, which
+  uses Apple's native GUI frameworks.
+ </para>
+ <para>
+  <productname>Nixpkgs</productname> provides a superior environment for
+  running <application>Emacs</application>. It's simple to create custom builds
+  by overriding the default packages. Chaotic collections of Emacs Lisp code
+  and extensions can be brought under control using declarative package
+  management. <productname>NixOS</productname> even provides a
+  <command>systemd</command> user service for automatically starting the Emacs
+  daemon.
+ </para>
+ <section xml:id="module-services-emacs-installing">
+  <title>Installing <application>Emacs</application></title>
 
   <para>
-    <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link>
-    is an extensible, customizable, self-documenting real-time display
-    editor — and more. At its core is an interpreter for Emacs Lisp, a
-    dialect of the Lisp programming language with extensions to
-    support text editing.
+   Emacs can be installed in the normal way for Nix (see
+   <xref linkend="sec-package-management" />). In addition, a NixOS
+   <emphasis>service</emphasis> can be enabled.
   </para>
 
-  <para>
-    Emacs runs within a graphical desktop environment using the X
-    Window System, but works equally well on a text terminal. Under
-    <productname>macOS</productname>, a "Mac port" edition is
-    available, which uses Apple's native GUI frameworks.
-  </para>
+  <section xml:id="module-services-emacs-releases">
+   <title>The Different Releases of Emacs</title>
 
-  <para>
-    <productname>Nixpkgs</productname> provides a superior environment
-    for running <application>Emacs</application>. It's simple to
-    create custom builds by overriding the default packages. Chaotic
-    collections of Emacs Lisp code and extensions can be brought under
-    control using declarative package
-    management. <productname>NixOS</productname> even provides a
-    <command>systemd</command> user service for automatically
-    starting the Emacs daemon.
-  </para>
+   <para>
+    <productname>Nixpkgs</productname> defines several basic Emacs packages.
+    The following are attributes belonging to the <varname>pkgs</varname> set:
+    <variablelist>
+     <varlistentry>
+      <term>
+       <varname>emacs</varname>
+      </term>
+      <term>
+       <varname>emacs25</varname>
+      </term>
+      <listitem>
+       <para>
+        The latest stable version of Emacs 25 using the
+        <link
+                xlink:href="http://www.gtk.org">GTK+ 2</link>
+        widget toolkit.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>
+       <varname>emacs25-nox</varname>
+      </term>
+      <listitem>
+       <para>
+        Emacs 25 built without any dependency on X11 libraries.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>
+       <varname>emacsMacport</varname>
+      </term>
+      <term>
+       <varname>emacs25Macport</varname>
+      </term>
+      <listitem>
+       <para>
+        Emacs 25 with the "Mac port" patches, providing a more native look and
+        feel under macOS.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </para>
 
-  <section xml:id="module-services-emacs-installing">
-    <title>Installing <application>Emacs</application></title>
+   <para>
+    If those aren't suitable, then the following imitation Emacs editors are
+    also available in Nixpkgs:
+    <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>,
+    <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>,
+    <link xlink:href="http://yi-editor.github.io/">Yi</link>.
+   </para>
+  </section>
 
-    <para>
-      Emacs can be installed in the normal way for Nix (see
-      <xref linkend="sec-package-management" />).
-      In addition, a NixOS <emphasis>service</emphasis>
-      can be enabled.
-    </para>
+  <section xml:id="module-services-emacs-adding-packages">
+   <title>Adding Packages to Emacs</title>
 
-    <section xml:id="module-services-emacs-releases">
-      <title>The Different Releases of Emacs</title>
+   <para>
+    Emacs includes an entire ecosystem of functionality beyond text editing,
+    including a project planner, mail and news reader, debugger interface,
+    calendar, and more.
+   </para>
 
-      <para>
-        <productname>Nixpkgs</productname> defines several basic Emacs
-        packages. The following are attributes belonging to the
-        <varname>pkgs</varname> set:
-
-        <variablelist>
-          <varlistentry>
-            <term><varname>emacs</varname></term>
-            <term><varname>emacs25</varname></term>
-            <listitem>
-              <para>
-                The latest stable version of Emacs 25 using the <link
-                xlink:href="http://www.gtk.org">GTK+ 2</link> widget
-                toolkit.
-              </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><varname>emacs25-nox</varname></term>
-            <listitem>
-              <para>
-                Emacs 25 built without any dependency on X11
-                libraries.
-              </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term><varname>emacsMacport</varname></term>
-            <term><varname>emacs25Macport</varname></term>
-            <listitem>
-              <para>
-                Emacs 25 with the "Mac port" patches, providing a more
-                native look and feel under macOS.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </para>
-
-      <para>
-        If those aren't suitable, then the following imitation Emacs
-        editors are also available in Nixpkgs:
-        <link xlink:href="https://www.gnu.org/software/zile/">Zile</link>,
-        <link xlink:href="http://homepage.boetes.org/software/mg/">mg</link>,
-        <link xlink:href="http://yi-editor.github.io/">Yi</link>.
-      </para>
-
-    </section>
-    <section xml:id="module-services-emacs-adding-packages">
-      <title>Adding Packages to Emacs</title>
-      <para>
-        Emacs includes an entire ecosystem of functionality beyond
-        text editing, including a project planner, mail and news
-        reader, debugger interface, calendar, and more.
-      </para>
-
-      <para>
-        Most extensions are gotten with the Emacs packaging system
-        (<filename>package.el</filename>) from <link
+   <para>
+    Most extensions are gotten with the Emacs packaging system
+    (<filename>package.el</filename>) from
+    <link
         xlink:href="https://elpa.gnu.org/">Emacs Lisp Package Archive
-        (<acronym>ELPA</acronym>)</link>,
-        <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>,
-        <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>,
-        and <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>.
-        Nixpkgs is regularly updated to mirror all these archives.
-      </para>
+    (<acronym>ELPA</acronym>)</link>,
+    <link xlink:href="https://melpa.org/"><acronym>MELPA</acronym></link>,
+    <link xlink:href="https://stable.melpa.org/">MELPA Stable</link>, and
+    <link xlink:href="http://orgmode.org/elpa.html">Org ELPA</link>. Nixpkgs is
+    regularly updated to mirror all these archives.
+   </para>
 
-      <para>
-        Under NixOS, you can continue to use
-        <function>package-list-packages</function> and
-        <function>package-install</function> to install packages. You
-        can also declare the set of Emacs packages you need using the
-        derivations from Nixpkgs. The rest of this section discusses
-        declarative installation of Emacs packages through nixpkgs.
-      </para>
+   <para>
+    Under NixOS, you can continue to use
+    <function>package-list-packages</function> and
+    <function>package-install</function> to install packages. You can also
+    declare the set of Emacs packages you need using the derivations from
+    Nixpkgs. The rest of this section discusses declarative installation of
+    Emacs packages through nixpkgs.
+   </para>
 
-      <note>
-        <para>
-          This documentation describes the new Emacs packages
-          framework in NixOS 16.03
-          (<varname>emacsPackagesNg</varname>) which should not be
-          confused with the previous and deprecated framework
-          (<varname>emacs24Packages</varname>).
-        </para>
-      </note>
+   <note>
+    <para>
+     This documentation describes the new Emacs packages framework in NixOS
+     16.03 (<varname>emacsPackagesNg</varname>) which should not be confused
+     with the previous and deprecated framework
+     (<varname>emacs24Packages</varname>).
+    </para>
+   </note>
 
-      <para>
-        The first step to declare the list of packages you want in
-        your Emacs installation is to create a dedicated
-        derivation. This can be done in a dedicated
-        <filename>emacs.nix</filename> file such as:
-
-      <example xml:id="ex-emacsNix">
-        <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title>
-        <programlisting language="nix">
+   <para>
+    The first step to declare the list of packages you want in your Emacs
+    installation is to create a dedicated derivation. This can be done in a
+    dedicated <filename>emacs.nix</filename> file such as:
+    <example xml:id="ex-emacsNix">
+     <title>Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)</title>
+<programlisting language="nix">
 /*
 This is a nix expression to build Emacs and some Emacs packages I like
 from source on any distribution where Nix is installed. This will install
@@ -181,119 +179,104 @@ in
     pkgs.notmuch   # From main packages set <co xml:id="ex-emacsNix-7" />
   ])
 </programlisting>
-      </example>
-
-      <calloutlist>
-        <callout arearefs="ex-emacsNix-1">
-          <para>
-            The first non-comment line in this file
-            (<literal>{ pkgs ? ... }</literal>)
-            indicates that the whole file represents a function.
-          </para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-2">
-          <para>
-            The <varname>let</varname> expression below defines a
-            <varname>myEmacs</varname> binding pointing to the current
-            stable version of Emacs. This binding is here to separate the
-            choice of the Emacs binary from the specification of the
-            required packages.
-          </para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-3">
-          <para>
-            This generates an <varname>emacsWithPackages</varname>
-            function. It takes a single argument: a function from a
-            package set to a list of packages (the packages that will
-            be available in Emacs).
-          </para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-4">
-          <para>
-            The rest of the file specifies the list of packages to
-            install. In the example, two packages
-            (<varname>magit</varname> and
-            <varname>zerodark-theme</varname>) are taken from MELPA
-            stable.
-          </para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-5">
-          <para>
-            Two packages (<varname>undo-tree</varname> and
-            <varname>zoom-frm</varname>) are taken from MELPA.
-          </para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-6">
-          <para>Three packages are taken from GNU ELPA.</para>
-        </callout>
-
-        <callout arearefs="ex-emacsNix-7">
-          <para>
-            <varname>notmuch</varname> is taken from a nixpkgs derivation
-            which contains an Emacs mode.
-          </para>
-        </callout>
-
-      </calloutlist>
-      </para>
-
+    </example>
+    <calloutlist>
+     <callout arearefs="ex-emacsNix-1">
       <para>
-        The result of this configuration will be an
-        <command>emacs</command> command which launches Emacs with all
-        of your chosen packages in the <varname>load-path</varname>.
+       The first non-comment line in this file (<literal>{ pkgs ? ...
+       }</literal>) indicates that the whole file represents a function.
       </para>
-
+     </callout>
+     <callout arearefs="ex-emacsNix-2">
       <para>
-        You can check that it works by executing this in a terminal:
+       The <varname>let</varname> expression below defines a
+       <varname>myEmacs</varname> binding pointing to the current stable
+       version of Emacs. This binding is here to separate the choice of the
+       Emacs binary from the specification of the required packages.
+      </para>
+     </callout>
+     <callout arearefs="ex-emacsNix-3">
+      <para>
+       This generates an <varname>emacsWithPackages</varname> function. It
+       takes a single argument: a function from a package set to a list of
+       packages (the packages that will be available in Emacs).
+      </para>
+     </callout>
+     <callout arearefs="ex-emacsNix-4">
+      <para>
+       The rest of the file specifies the list of packages to install. In the
+       example, two packages (<varname>magit</varname> and
+       <varname>zerodark-theme</varname>) are taken from MELPA stable.
+      </para>
+     </callout>
+     <callout arearefs="ex-emacsNix-5">
+      <para>
+       Two packages (<varname>undo-tree</varname> and
+       <varname>zoom-frm</varname>) are taken from MELPA.
+      </para>
+     </callout>
+     <callout arearefs="ex-emacsNix-6">
+      <para>
+       Three packages are taken from GNU ELPA.
+      </para>
+     </callout>
+     <callout arearefs="ex-emacsNix-7">
+      <para>
+       <varname>notmuch</varname> is taken from a nixpkgs derivation which
+       contains an Emacs mode.
+      </para>
+     </callout>
+    </calloutlist>
+   </para>
 
+   <para>
+    The result of this configuration will be an <command>emacs</command>
+    command which launches Emacs with all of your chosen packages in the
+    <varname>load-path</varname>.
+   </para>
+
+   <para>
+    You can check that it works by executing this in a terminal:
 <screen>
 $ nix-build emacs.nix
 $ ./result/bin/emacs -q
 </screen>
+    and then typing <literal>M-x package-initialize</literal>. Check that you
+    can use all the packages you want in this Emacs instance. For example, try
+    switching to the zerodark theme through <literal>M-x load-theme &lt;RET&gt;
+    zerodark &lt;RET&gt; y</literal>.
+   </para>
 
-        and then typing <literal>M-x package-initialize</literal>.
-        Check that you can use all the packages you want in this
-        Emacs instance. For example, try switching to the zerodark
-        theme through
-        <literal>M-x load-theme &lt;RET&gt; zerodark &lt;RET&gt; y</literal>.
-      </para>
+   <tip>
+    <para>
+     A few popular extensions worth checking out are: auctex, company,
+     edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile,
+     and yasnippet.
+    </para>
+   </tip>
 
-      <tip>
-        <para>
-          A few popular extensions worth checking out are: auctex,
-          company, edit-server, flycheck, helm, iedit, magit,
-          multiple-cursors, projectile, and yasnippet.
-        </para>
-      </tip>
-
-      <para>
-        The list of available packages in the various ELPA
-        repositories can be seen with the following commands:
-        <example xml:id="module-services-emacs-querying-packages">
-          <title>Querying Emacs packages</title>
-          <programlisting><![CDATA[
+   <para>
+    The list of available packages in the various ELPA repositories can be seen
+    with the following commands:
+    <example xml:id="module-services-emacs-querying-packages">
+     <title>Querying Emacs packages</title>
+<programlisting><![CDATA[
 nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages
 nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaPackages
 nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaStablePackages
 nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
 ]]></programlisting>
-        </example>
-      </para>
+    </example>
+   </para>
 
-      <para>
-        If you are on NixOS, you can install this particular Emacs for
-        all users by adding it to the list of system packages
-        (see <xref linkend="sec-declarative-package-mgmt" />). Simply
-        modify your file <filename>configuration.nix</filename> to
-        make it contain:
-        <example xml:id="module-services-emacs-configuration-nix">
-          <title>Custom Emacs in <filename>configuration.nix</filename></title>
-          <programlisting><![CDATA[
+   <para>
+    If you are on NixOS, you can install this particular Emacs for all users by
+    adding it to the list of system packages (see
+    <xref linkend="sec-declarative-package-mgmt" />). Simply modify your file
+    <filename>configuration.nix</filename> to make it contain:
+    <example xml:id="module-services-emacs-configuration-nix">
+     <title>Custom Emacs in <filename>configuration.nix</filename></title>
+<programlisting><![CDATA[
 {
  environment.systemPackages = [
    # [...]
@@ -301,60 +284,59 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
   ];
 }
 ]]></programlisting>
-        </example>
-      </para>
+    </example>
+   </para>
 
-      <para>
-        In this case, the next <command>nixos-rebuild switch</command>
-        will take care of adding your <command>emacs</command> to the
-        <varname>PATH</varname> environment variable
-        (see <xref linkend="sec-changing-config" />).
-      </para>
+   <para>
+    In this case, the next <command>nixos-rebuild switch</command> will take
+    care of adding your <command>emacs</command> to the <varname>PATH</varname>
+    environment variable (see <xref linkend="sec-changing-config" />).
+   </para>
 
 <!-- fixme: i think the following is better done with config.nix
 https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
 -->
-      <para>
-        If you are not on NixOS or want to install this particular
-        Emacs only for yourself, you can do so by adding it to your
-        <filename>~/.config/nixpkgs/config.nix</filename>
-        (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
-        <example xml:id="module-services-emacs-config-nix">
-          <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
-          <programlisting><![CDATA[
+
+   <para>
+    If you are not on NixOS or want to install this particular Emacs only for
+    yourself, you can do so by adding it to your
+    <filename>~/.config/nixpkgs/config.nix</filename> (see
+    <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs
+    manual</link>):
+    <example xml:id="module-services-emacs-config-nix">
+     <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
+<programlisting><![CDATA[
 {
   packageOverrides = super: let self = super.pkgs; in {
     myemacs = import /path/to/emacs.nix { pkgs = self; };
   };
 }
 ]]></programlisting>
-        </example>
-      </para>
+    </example>
+   </para>
 
-      <para>
-        In this case, the next
-        <literal>nix-env -f '&lt;nixpkgs&gt;' -iA myemacs</literal>
-        will take care of adding your emacs to the
-        <varname>PATH</varname> environment variable.
-      </para>
-    </section>
+   <para>
+    In this case, the next <literal>nix-env -f '&lt;nixpkgs&gt;' -iA
+    myemacs</literal> will take care of adding your emacs to the
+    <varname>PATH</varname> environment variable.
+   </para>
+  </section>
 
-    <section xml:id="module-services-emacs-advanced">
-      <title>Advanced Emacs Configuration</title>
+  <section xml:id="module-services-emacs-advanced">
+   <title>Advanced Emacs Configuration</title>
 
-      <para>
-        If you want, you can tweak the Emacs package itself from your
-        <filename>emacs.nix</filename>. For example, if you want to
-        have a GTK+3-based Emacs instead of the default GTK+2-based
-        binary and remove the automatically generated
-        <filename>emacs.desktop</filename> (useful is you only use
-        <command>emacsclient</command>), you can change your file
-        <filename>emacs.nix</filename> in this way:
-      </para>
+   <para>
+    If you want, you can tweak the Emacs package itself from your
+    <filename>emacs.nix</filename>. For example, if you want to have a
+    GTK+3-based Emacs instead of the default GTK+2-based binary and remove the
+    automatically generated <filename>emacs.desktop</filename> (useful is you
+    only use <command>emacsclient</command>), you can change your file
+    <filename>emacs.nix</filename> in this way:
+   </para>
 
-      <example xml:id="ex-emacsGtk3Nix">
-        <title>Custom Emacs build</title>
-        <programlisting><![CDATA[
+   <example xml:id="ex-emacsGtk3Nix">
+    <title>Custom Emacs build</title>
+<programlisting><![CDATA[
 { pkgs ? import <nixpkgs> {} }:
 let
   myEmacs = (pkgs.emacs.override {
@@ -370,161 +352,143 @@ let
   });
 in [...]
 ]]></programlisting>
-      </example>
+   </example>
 
-      <para>
-        After building this file as shown in <xref linkend="ex-emacsNix" />,
-        you will get an GTK3-based Emacs binary pre-loaded with your
-        favorite packages.
-      </para>
-    </section>
+   <para>
+    After building this file as shown in <xref linkend="ex-emacsNix" />, you
+    will get an GTK3-based Emacs binary pre-loaded with your favorite packages.
+   </para>
   </section>
-
-<section xml:id="module-services-emacs-running">
+ </section>
+ <section xml:id="module-services-emacs-running">
   <title>Running Emacs as a Service</title>
+
   <para>
-    <productname>NixOS</productname> provides an optional
-    <command>systemd</command> service which launches
-    <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">
-      Emacs daemon
-    </link>
-    with the user's login session.
+   <productname>NixOS</productname> provides an optional
+   <command>systemd</command> service which launches
+   <link xlink:href="https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.html">
+   Emacs daemon </link> with the user's login session.
   </para>
 
   <para>
-    <emphasis>Source:</emphasis>
-    <filename>modules/services/editors/emacs.nix</filename>
+   <emphasis>Source:</emphasis>
+   <filename>modules/services/editors/emacs.nix</filename>
   </para>
 
   <section xml:id="module-services-emacs-enabling">
-    <title>Enabling the Service</title>
-
-    <para>
-      To install and enable the <command>systemd</command>
-      user service for Emacs daemon, add the following to your
-      <filename>configuration.nix</filename>:
+   <title>Enabling the Service</title>
 
+   <para>
+    To install and enable the <command>systemd</command> user service for Emacs
+    daemon, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = true;
 <xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; };
 </programlisting>
-    </para>
+   </para>
 
-    <para>
-      The <varname>services.emacs.package</varname> option allows a
-      custom derivation to be used, for example, one created by
-      <function>emacsWithPackages</function>.
-    </para>
+   <para>
+    The <varname>services.emacs.package</varname> option allows a custom
+    derivation to be used, for example, one created by
+    <function>emacsWithPackages</function>.
+   </para>
 
-    <para>
-      Ensure that the Emacs server is enabled for your user's Emacs
-      configuration, either by customizing the
-      <varname>server-mode</varname> variable, or by adding
-      <literal>(server-start)</literal> to
-      <filename>~/.emacs.d/init.el</filename>.
-    </para>
-
-    <para>
-      To start the daemon, execute the following:
+   <para>
+    Ensure that the Emacs server is enabled for your user's Emacs
+    configuration, either by customizing the <varname>server-mode</varname>
+    variable, or by adding <literal>(server-start)</literal> to
+    <filename>~/.emacs.d/init.el</filename>.
+   </para>
 
+   <para>
+    To start the daemon, execute the following:
 <screen>
 $ nixos-rebuild switch  # to activate the new configuration.nix
 $ systemctl --user daemon-reload        # to force systemd reload
 $ systemctl --user start emacs.service  # to start the Emacs daemon
 </screen>
-
-      The server should now be ready to serve Emacs clients.
-    </para>
-
+    The server should now be ready to serve Emacs clients.
+   </para>
   </section>
 
   <section xml:id="module-services-emacs-starting-client">
-    <title>Starting the client</title>
-    <para>
-      Ensure that the emacs server is enabled, either by customizing
-      the <varname>server-mode</varname> variable, or by adding
-      <literal>(server-start)</literal> to
-      <filename>~/.emacs</filename>.
-    </para>
+   <title>Starting the client</title>
 
-    <para>
-      To connect to the emacs daemon, run one of the following:
-      <programlisting><![CDATA[
+   <para>
+    Ensure that the emacs server is enabled, either by customizing the
+    <varname>server-mode</varname> variable, or by adding
+    <literal>(server-start)</literal> to <filename>~/.emacs</filename>.
+   </para>
+
+   <para>
+    To connect to the emacs daemon, run one of the following:
+<programlisting><![CDATA[
 emacsclient FILENAME
 emacsclient --create-frame  # opens a new frame (window)
 emacsclient --create-frame --tty  # opens a new frame on the current terminal
 ]]></programlisting>
-    </para>
+   </para>
   </section>
 
   <section xml:id="module-services-emacs-editor-variable">
-    <title>Configuring the <varname>EDITOR</varname> variable</title>
-    <!--<title><command>emacsclient</command> as the Default Editor</title>-->
+   <title>Configuring the <varname>EDITOR</varname> variable</title>
 
-    <para>
-      If <xref linkend="opt-services.emacs.defaultEditor"/> is
-      <literal>true</literal>, the <varname>EDITOR</varname> variable
-      will be set to a wrapper script which launches
-      <command>emacsclient</command>.
-    </para>
+<!--<title><command>emacsclient</command> as the Default Editor</title>-->
 
-    <para>
-      Any setting of <varname>EDITOR</varname> in the shell config
-      files will override
-      <varname>services.emacs.defaultEditor</varname>.
-      To make sure <varname>EDITOR</varname> refers to the Emacs
-      wrapper script, remove any existing <varname>EDITOR</varname>
-      assignment from <filename>.profile</filename>,
-      <filename>.bashrc</filename>, <filename>.zshenv</filename> or
-      any other shell config file.
-    </para>
+   <para>
+    If <xref linkend="opt-services.emacs.defaultEditor"/> is
+    <literal>true</literal>, the <varname>EDITOR</varname> variable will be set
+    to a wrapper script which launches <command>emacsclient</command>.
+   </para>
 
-    <para>
-      If you have formed certain bad habits when editing files,
-      these can be corrected with a shell alias to the wrapper
-      script:
-      <programlisting>alias vi=$EDITOR</programlisting>
-    </para>
+   <para>
+    Any setting of <varname>EDITOR</varname> in the shell config files will
+    override <varname>services.emacs.defaultEditor</varname>. To make sure
+    <varname>EDITOR</varname> refers to the Emacs wrapper script, remove any
+    existing <varname>EDITOR</varname> assignment from
+    <filename>.profile</filename>, <filename>.bashrc</filename>,
+    <filename>.zshenv</filename> or any other shell config file.
+   </para>
+
+   <para>
+    If you have formed certain bad habits when editing files, these can be
+    corrected with a shell alias to the wrapper script:
+<programlisting>alias vi=$EDITOR</programlisting>
+   </para>
   </section>
 
   <section xml:id="module-services-emacs-per-user">
-    <title>Per-User Enabling of the Service</title>
-
-    <para>
-      In general, <command>systemd</command> user services
-      are globally enabled by symlinks in
-      <filename>/etc/systemd/user</filename>. In the case where
-      Emacs daemon is not wanted for all users, it is possible to
-      install the service but not globally enable it:
+   <title>Per-User Enabling of the Service</title>
 
+   <para>
+    In general, <command>systemd</command> user services are globally enabled
+    by symlinks in <filename>/etc/systemd/user</filename>. In the case where
+    Emacs daemon is not wanted for all users, it is possible to install the
+    service but not globally enable it:
 <programlisting>
 <xref linkend="opt-services.emacs.enable"/> = false;
 <xref linkend="opt-services.emacs.install"/> = true;
 </programlisting>
-    </para>
+   </para>
 
-    <para>
-      To enable the <command>systemd</command> user service for just
-      the currently logged in user, run:
-
-      <programlisting>systemctl --user enable emacs</programlisting>
-
-      This will add the symlink
-      <filename>~/.config/systemd/user/emacs.service</filename>.
-    </para>
+   <para>
+    To enable the <command>systemd</command> user service for just the
+    currently logged in user, run:
+<programlisting>systemctl --user enable emacs</programlisting>
+    This will add the symlink
+    <filename>~/.config/systemd/user/emacs.service</filename>.
+   </para>
   </section>
-</section>
-
-<section xml:id="module-services-emacs-configuring">
+ </section>
+ <section xml:id="module-services-emacs-configuring">
   <title>Configuring Emacs</title>
 
   <para>
-    The Emacs init file should be changed to load the extension
-    packages at startup:
-
-    <example xml:id="module-services-emacs-package-initialisation">
-      <title>Package initialization in <filename>.emacs</filename></title>
-      <programlisting><![CDATA[
+   The Emacs init file should be changed to load the extension packages at
+   startup:
+   <example xml:id="module-services-emacs-package-initialisation">
+    <title>Package initialization in <filename>.emacs</filename></title>
+<programlisting><![CDATA[
 (require 'package)
 
 ;; optional. makes unpure packages archives unavailable
@@ -533,66 +497,71 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
 (setq package-enable-at-startup nil)
 (package-initialize)
 ]]></programlisting>
-    </example>
+   </example>
   </para>
 
   <para>
-    After the declarative emacs package configuration has been
-    tested, previously downloaded packages can be cleaned up by
-    removing <filename>~/.emacs.d/elpa</filename> (do make a backup
-    first, in case you forgot a package).
+   After the declarative emacs package configuration has been tested,
+   previously downloaded packages can be cleaned up by removing
+   <filename>~/.emacs.d/elpa</filename> (do make a backup first, in case you
+   forgot a package).
   </para>
 
-  <!--
+<!--
       todo: is it worth documenting customizations for
       server-switch-hook, server-done-hook?
   -->
 
   <section xml:id="module-services-emacs-major-mode">
-    <title>A Major Mode for Nix Expressions</title>
+   <title>A Major Mode for Nix Expressions</title>
 
-    <para>
-      Of interest may be <varname>melpaPackages.nix-mode</varname>,
-      which provides syntax highlighting for the Nix language. This is
-      particularly convenient if you regularly edit Nix files.
-    </para>
+   <para>
+    Of interest may be <varname>melpaPackages.nix-mode</varname>, which
+    provides syntax highlighting for the Nix language. This is particularly
+    convenient if you regularly edit Nix files.
+   </para>
   </section>
 
   <section xml:id="module-services-emacs-man-pages">
-    <title>Accessing man pages</title>
-    <para>
-      You can use <function>woman</function> to get completion of all
-      available man pages. For example, type <literal>M-x woman
-      &lt;RET&gt; nixos-rebuild &lt;RET&gt;.</literal>
-    </para>
+   <title>Accessing man pages</title>
+
+   <para>
+    You can use <function>woman</function> to get completion of all available
+    man pages. For example, type <literal>M-x woman &lt;RET&gt; nixos-rebuild
+    &lt;RET&gt;.</literal>
+   </para>
   </section>
 
   <section xml:id="sec-emacs-docbook-xml">
-    <title>Editing DocBook 5 XML Documents</title>
-    <para>
-      Emacs includes <link
+   <title>Editing DocBook 5 XML Documents</title>
+
+   <para>
+    Emacs includes
+    <link
       xlink:href="https://www.gnu.org/software/emacs/manual/html_node/nxml-mode/Introduction.html">nXML</link>,
-      a major-mode for validating and editing XML documents.
-      When editing DocBook 5.0 documents, such as
-      <link linkend="book-nixos-manual">this one</link>,
-      nXML needs to be configured with the relevant schema, which is
-      not included.
-    </para>
+    a major-mode for validating and editing XML documents. When editing DocBook
+    5.0 documents, such as <link linkend="book-nixos-manual">this one</link>,
+    nXML needs to be configured with the relevant schema, which is not
+    included.
+   </para>
 
-    <para>
-      To install the DocBook 5.0 schemas, either add
-      <varname>pkgs.docbook5</varname> to
-      <xref linkend="opt-environment.systemPackages"/> (<link
+   <para>
+    To install the DocBook 5.0 schemas, either add
+    <varname>pkgs.docbook5</varname> to
+    <xref linkend="opt-environment.systemPackages"/>
+    (<link
       linkend="sec-declarative-package-mgmt">NixOS</link>), or run
-      <literal>nix-env -i pkgs.docbook5</literal>
-      (<link linkend="sec-ad-hoc-packages">Nix</link>).
-    </para>
+    <literal>nix-env -i pkgs.docbook5</literal>
+    (<link linkend="sec-ad-hoc-packages">Nix</link>).
+   </para>
 
-    <para>
-      Then customize the variable <varname>rng-schema-locating-files</varname> to include <filename>~/.emacs.d/schemas.xml</filename> and put the following text into that file:
-      <example xml:id="ex-emacs-docbook-xml">
-        <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title>
-        <programlisting language="xml"><![CDATA[
+   <para>
+    Then customize the variable <varname>rng-schema-locating-files</varname> to
+    include <filename>~/.emacs.d/schemas.xml</filename> and put the following
+    text into that file:
+    <example xml:id="ex-emacs-docbook-xml">
+     <title>nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)</title>
+<programlisting language="xml"><![CDATA[
 <?xml version="1.0"?>
 <!--
   To let emacs find this file, evaluate:
@@ -612,9 +581,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
 </locatingRules>
 ]]></programlisting>
     </example>
-  </para>
-
+   </para>
   </section>
-</section>
-
+ </section>
 </chapter>
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index 67b9f1d3e474..ab99d7bd3a60 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -3,20 +3,22 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-gitlab">
+ <title>Gitlab</title>
+ <para>
+  Gitlab is a feature-rich git hosting service.
+ </para>
+ <section xml:id="module-services-gitlab-prerequisites">
+  <title>Prerequisites</title>
 
-<title>Gitlab</title>
-
-<para>Gitlab is a feature-rich git hosting service.</para>
-
-<section xml:id="module-services-gitlab-prerequisites"><title>Prerequisites</title>
-
-<para>The gitlab service exposes only an Unix socket at
-<literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a
-webserver to proxy HTTP requests to the socket.</para>
-
-<para>For instance, the following configuration could be used to use nginx as
-    frontend proxy:
+  <para>
+   The gitlab service exposes only an Unix socket at
+   <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to
+   configure a webserver to proxy HTTP requests to the socket.
+  </para>
 
+  <para>
+   For instance, the following configuration could be used to use nginx as
+   frontend proxy:
 <programlisting>
 <link linkend="opt-services.nginx.enable">services.nginx</link> = {
   <link linkend="opt-services.nginx.enable">enable</link> = true;
@@ -31,21 +33,24 @@ webserver to proxy HTTP requests to the socket.</para>
   };
 };
 </programlisting>
-</para>
+  </para>
+ </section>
+ <section xml:id="module-services-gitlab-configuring">
+  <title>Configuring</title>
 
-</section>
+  <para>
+   Gitlab depends on both PostgreSQL and Redis and will automatically enable
+   both services. In the case of PostgreSQL, a database and a role will be
+   created.
+  </para>
 
-<section xml:id="module-services-gitlab-configuring"><title>Configuring</title>
-
-<para>Gitlab depends on both PostgreSQL and Redis and will automatically enable
-both services. In the case of PostgreSQL, a database and a role will be created.
-</para>
-
-<para>The default state dir is <literal>/var/gitlab/state</literal>. This is where
-all data like the repositories and uploads will be stored.</para>
-
-<para>A basic configuration with some custom settings could look like this:
+  <para>
+   The default state dir is <literal>/var/gitlab/state</literal>. This is where
+   all data like the repositories and uploads will be stored.
+  </para>
 
+  <para>
+   A basic configuration with some custom settings could look like this:
 <programlisting>
 services.gitlab = {
   <link linkend="opt-services.gitlab.enable">enable</link> = true;
@@ -105,40 +110,41 @@ services.gitlab = {
   };
 };
 </programlisting>
-</para>
+  </para>
 
-<para>If you're setting up a new Gitlab instance, generate new secrets. You
-for instance use <literal>tr -dc A-Za-z0-9 &lt; /dev/urandom | head -c 128</literal>
-to generate a new secret. Gitlab encrypts sensitive data stored in the database.
-If you're restoring an existing Gitlab instance, you must specify the secrets
-secret from <literal>config/secrets.yml</literal> located in your Gitlab state
-folder.</para>
+  <para>
+   If you're setting up a new Gitlab instance, generate new secrets. You for
+   instance use <literal>tr -dc A-Za-z0-9 &lt; /dev/urandom | head -c
+   128</literal> to generate a new secret. Gitlab encrypts sensitive data
+   stored in the database. If you're restoring an existing Gitlab instance, you
+   must specify the secrets secret from <literal>config/secrets.yml</literal>
+   located in your Gitlab state folder.
+  </para>
 
-<para>Refer to <xref linkend="ch-options" /> for all available configuration
-options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.</para>
+  <para>
+   Refer to <xref linkend="ch-options" /> for all available configuration
+   options for the
+   <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.
+  </para>
+ </section>
+ <section xml:id="module-services-gitlab-maintenance">
+  <title>Maintenance</title>
 
-</section>
-
-<section xml:id="module-services-gitlab-maintenance"><title>Maintenance</title>
-
-<para>You can run Gitlab's rake tasks with <literal>gitlab-rake</literal>
-which will be available on the system when gitlab is enabled. You will
-have to run the command as the user that you configured to run gitlab
-with.</para>
-
-<para>For example, to backup a Gitlab instance:
+  <para>
+   You can run Gitlab's rake tasks with <literal>gitlab-rake</literal> which
+   will be available on the system when gitlab is enabled. You will have to run
+   the command as the user that you configured to run gitlab with.
+  </para>
 
+  <para>
+   For example, to backup a Gitlab instance:
 <programlisting>
 $ sudo -u git -H gitlab-rake gitlab:backup:create
 </programlisting>
-
-A list of all availabe rake tasks can be obtained by running:
-
+   A list of all availabe rake tasks can be obtained by running:
 <programlisting>
 $ sudo -u git -H gitlab-rake -T
 </programlisting>
-</para>
-
-</section>
-
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 21d25ecf391f..5eac8d9ef784 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -2,101 +2,93 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     version="5.0"
     xml:id="module-taskserver">
-
-  <title>Taskserver</title>
+ <title>Taskserver</title>
+ <para>
+  Taskserver is the server component of
+  <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and
+  open source todo list application.
+ </para>
+ <para>
+  <emphasis>Upstream documentation:</emphasis>
+  <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
+ </para>
+ <section xml:id="module-services-taskserver-configuration">
+  <title>Configuration</title>
 
   <para>
-    Taskserver is the server component of
-    <link xlink:href="https://taskwarrior.org/">Taskwarrior</link>, a free and
-    open source todo list application.
+   Taskserver does all of its authentication via TLS using client certificates,
+   so you either need to roll your own CA or purchase a certificate from a
+   known CA, which allows creation of client certificates. These certificates
+   are usually advertised as <quote>server certificates</quote>.
   </para>
 
   <para>
-    <emphasis>Upstream documentation:</emphasis>
-    <link xlink:href="https://taskwarrior.org/docs/#taskd"/>
+   So in order to make it easier to handle your own CA, there is a helper tool
+   called <command>nixos-taskserver</command> which manages the custom CA along
+   with Taskserver organisations, users and groups.
   </para>
 
-  <section xml:id="module-services-taskserver-configuration">
-    <title>Configuration</title>
+  <para>
+   While the client certificates in Taskserver only authenticate whether a user
+   is allowed to connect, every user has its own UUID which identifies it as an
+   entity.
+  </para>
 
-    <para>
-      Taskserver does all of its authentication via TLS using client
-      certificates, so you either need to roll your own CA or purchase a
-      certificate from a known CA, which allows creation of client
-      certificates.
+  <para>
+   With <command>nixos-taskserver</command> the client certificate is created
+   along with the UUID of the user, so it handles all of the credentials needed
+   in order to setup the Taskwarrior client to work with a Taskserver.
+  </para>
+ </section>
+ <section xml:id="module-services-taskserver-nixos-taskserver-tool">
+  <title>The nixos-taskserver tool</title>
 
-      These certificates are usually advertised as
-      <quote>server certificates</quote>.
-    </para>
+  <para>
+   Because Taskserver by default only provides scripts to setup users
+   imperatively, the <command>nixos-taskserver</command> tool is used for
+   addition and deletion of organisations along with users and groups defined
+   by <xref linkend="opt-services.taskserver.organisations"/> and as well for
+   imperative set up.
+  </para>
 
-    <para>
-      So in order to make it easier to handle your own CA, there is a helper
-      tool called <command>nixos-taskserver</command> which manages the custom
-      CA along with Taskserver organisations, users and groups.
-    </para>
+  <para>
+   The tool is designed to not interfere if the command is used to manually set
+   up some organisations, users or groups.
+  </para>
 
-    <para>
-      While the client certificates in Taskserver only authenticate whether a
-      user is allowed to connect, every user has its own UUID which identifies
-      it as an entity.
-    </para>
+  <para>
+   For example if you add a new organisation using <command>nixos-taskserver
+   org add foo</command>, the organisation is not modified and deleted no
+   matter what you define in
+   <option>services.taskserver.organisations</option>, even if you're adding
+   the same organisation in that option.
+  </para>
 
-    <para>
-      With <command>nixos-taskserver</command> the client certificate is created
-      along with the UUID of the user, so it handles all of the credentials
-      needed in order to setup the Taskwarrior client to work with a Taskserver.
-    </para>
-  </section>
+  <para>
+   The tool is modelled to imitate the official <command>taskd</command>
+   command, documentation for each subcommand can be shown by using the
+   <option>--help</option> switch.
+  </para>
+ </section>
+ <section xml:id="module-services-taskserver-declarative-ca-management">
+  <title>Declarative/automatic CA management</title>
 
-  <section xml:id="module-services-taskserver-nixos-taskserver-tool">
-    <title>The nixos-taskserver tool</title>
+  <para>
+   Everything is done according to what you specify in the module options,
+   however in order to set up a Taskwarrior client for synchronisation with a
+   Taskserver instance, you have to transfer the keys and certificates to the
+   client machine.
+  </para>
 
-    <para>
-      Because Taskserver by default only provides scripts to setup users
-      imperatively, the <command>nixos-taskserver</command> tool is used for
-      addition and deletion of organisations along with users and groups defined
-      by <xref linkend="opt-services.taskserver.organisations"/> and as well for
-      imperative set up.
-    </para>
+  <para>
+   This is done using <command>nixos-taskserver user export $orgname
+   $username</command> which is printing a shell script fragment to stdout
+   which can either be used verbatim or adjusted to import the user on the
+   client machine.
+  </para>
 
-    <para>
-      The tool is designed to not interfere if the command is used to manually
-      set up some organisations, users or groups.
-    </para>
-
-    <para>
-      For example if you add a new organisation using
-      <command>nixos-taskserver org add foo</command>, the organisation is not
-      modified and deleted no matter what you define in
-      <option>services.taskserver.organisations</option>, even if you're adding
-      the same organisation in that option.
-    </para>
-
-    <para>
-      The tool is modelled to imitate the official <command>taskd</command>
-      command, documentation for each subcommand can be shown by using the
-      <option>--help</option> switch.
-    </para>
-  </section>
-  <section xml:id="module-services-taskserver-declarative-ca-management">
-    <title>Declarative/automatic CA management</title>
-
-    <para>
-      Everything is done according to what you specify in the module options,
-      however in order to set up a Taskwarrior client for synchronisation with a
-      Taskserver instance, you have to transfer the keys and certificates to the
-      client machine.
-    </para>
-
-    <para>
-      This is done using
-      <command>nixos-taskserver user export $orgname $username</command> which
-      is printing a shell script fragment to stdout which can either be used
-      verbatim or adjusted to import the user on the client machine.
-    </para>
-
-    <para>
-      For example, let's say you have the following configuration:
+  <para>
+   For example, let's say you have the following configuration:
 <screen>
 {
   <xref linkend="opt-services.taskserver.enable"/> = true;
@@ -105,40 +97,39 @@
   <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ];
 }
 </screen>
-      This creates an organisation called <literal>my-company</literal> with the
-      user <literal>alice</literal>.
-    </para>
+   This creates an organisation called <literal>my-company</literal> with the
+   user <literal>alice</literal>.
+  </para>
 
-    <para>
-      Now in order to import the <literal>alice</literal> user to another
-      machine <literal>alicebox</literal>, all we need to do is something like
-      this:
+  <para>
+   Now in order to import the <literal>alice</literal> user to another machine
+   <literal>alicebox</literal>, all we need to do is something like this:
 <screen>
 $ ssh server nixos-taskserver user export my-company alice | sh
 </screen>
-      Of course, if no SSH daemon is available on the server you can also copy
-      &amp; paste it directly into a shell.
-    </para>
+   Of course, if no SSH daemon is available on the server you can also copy
+   &amp; paste it directly into a shell.
+  </para>
 
-    <para>
-      After this step the user should be set up and you can start synchronising
-      your tasks for the first time with <command>task sync init</command> on
-      <literal>alicebox</literal>.
-    </para>
+  <para>
+   After this step the user should be set up and you can start synchronising
+   your tasks for the first time with <command>task sync init</command> on
+   <literal>alicebox</literal>.
+  </para>
 
-    <para>
-      Subsequent synchronisation requests merely require the command
-      <command>task sync</command> after that stage.
-    </para>
-  </section>
-  <section xml:id="module-services-taskserver-manual-ca-management">
-    <title>Manual CA management</title>
+  <para>
+   Subsequent synchronisation requests merely require the command <command>task
+   sync</command> after that stage.
+  </para>
+ </section>
+ <section xml:id="module-services-taskserver-manual-ca-management">
+  <title>Manual CA management</title>
 
-    <para>
-      If you set any options within
-      <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
-      <command>nixos-taskserver</command> won't issue certificates, but you can
-      still use it for adding or removing user accounts.
-    </para>
-  </section>
+  <para>
+   If you set any options within
+   <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
+   <command>nixos-taskserver</command> won't issue certificates, but you can
+   still use it for adding or removing user accounts.
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index de86dede2eb5..9c9ee0448c92 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -3,22 +3,24 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-weechat">
+ <title>WeeChat</title>
+ <para>
+  <link xlink:href="https://weechat.org/">WeeChat</link> is a fast and
+  extensible IRC client.
+ </para>
+ <section>
+  <title>Basic Usage</title>
 
-<title>WeeChat</title>
-<para><link xlink:href="https://weechat.org/">WeeChat</link> is a fast and extensible IRC client.</para>
-
-<section><title>Basic Usage</title>
-<para>
-By default, the module creates a
-<literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal> unit
-which runs the chat client in a detached
-<literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal> session.
-
-</para>
-
-<para>
-This can be done by enabling the <literal>weechat</literal> service:
+  <para>
+   By default, the module creates a
+   <literal><link xlink:href="https://www.freedesktop.org/wiki/Software/systemd/">systemd</link></literal>
+   unit which runs the chat client in a detached
+   <literal><link xlink:href="https://www.gnu.org/software/screen/">screen</link></literal>
+   session.
+  </para>
 
+  <para>
+   This can be done by enabling the <literal>weechat</literal> service:
 <programlisting>
 { ... }:
 
@@ -26,19 +28,22 @@ This can be done by enabling the <literal>weechat</literal> service:
   <link linkend="opt-services.weechat.enable">services.weechat.enable</link> = true;
 }
 </programlisting>
-</para>
-<para>
-The service is managed by a dedicated user
-named <literal>weechat</literal> in the state directory
-<literal>/var/lib/weechat</literal>.
-</para>
-</section>
-<section><title>Re-attaching to WeeChat</title>
-<para>
-WeeChat runs in a screen session owned by a dedicated user. To explicitly
-allow your another user to attach to this session, the <literal>screenrc</literal> needs to be tweaked
-by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link> support:
+  </para>
 
+  <para>
+   The service is managed by a dedicated user named <literal>weechat</literal>
+   in the state directory <literal>/var/lib/weechat</literal>.
+  </para>
+ </section>
+ <section>
+  <title>Re-attaching to WeeChat</title>
+
+  <para>
+   WeeChat runs in a screen session owned by a dedicated user. To explicitly
+   allow your another user to attach to this session, the
+   <literal>screenrc</literal> needs to be tweaked by adding
+   <link xlink:href="https://www.gnu.org/software/screen/manual/html_node/Multiuser.html#Multiuser">multiuser</link>
+   support:
 <programlisting>
 {
   <link linkend="opt-programs.screen.screenrc">programs.screen.screenrc</link> = ''
@@ -47,15 +52,15 @@ by adding <link xlink:href="https://www.gnu.org/software/screen/manual/html_node
   '';
 }
 </programlisting>
-
-Now, the session can be re-attached like this:
-
+   Now, the session can be re-attached like this:
 <programlisting>
 screen -r weechat-screen
 </programlisting>
-</para>
-<para>
-<emphasis>The session name can be changed using <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
-</para>
-</section>
+  </para>
+
+  <para>
+   <emphasis>The session name can be changed using
+   <link linkend="opt-services.weechat.sessionName">services.weechat.sessionName.</link></emphasis>
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.xml b/nixos/modules/services/monitoring/prometheus/exporters.xml
index be86abb74b44..7a0a1bdf2c14 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.xml
+++ b/nixos/modules/services/monitoring/prometheus/exporters.xml
@@ -3,13 +3,19 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-prometheus-exporters">
+ <title>Prometheus exporters</title>
+ <para>
+  Prometheus exporters provide metrics for the
+  <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.
+ </para>
+ <section xml:id="module-services-prometheus-exporters-configuration">
+  <title>Configuration</title>
 
-<title>Prometheus exporters</title>
-
-<para>Prometheus exporters provide metrics for the <link xlink:href="https://prometheus.io">prometheus monitoring system</link>.</para>
-
-<section xml:id="module-services-prometheus-exporters-configuration"><title>Configuration</title>
-  <para>One of the most common exporters is the <link xlink:href="https://github.com/prometheus/node_exporter">node exporter</link>, it provides hardware and OS metrics from the host it's running on. The exporter could be configured as follows:
+  <para>
+   One of the most common exporters is the
+   <link xlink:href="https://github.com/prometheus/node_exporter">node
+   exporter</link>, it provides hardware and OS metrics from the host it's
+   running on. The exporter could be configured as follows:
 <programlisting>
   services.promtheus.exporters.node = {
     enable = true;
@@ -24,43 +30,88 @@
     firewallFilter = "-i br0 -p tcp -m tcp --dport 9100";
   };
 </programlisting>
-It should now serve all metrics from the collectors
-that are explicitly enabled and the ones that are
-<link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled by default</link>, via http under <literal>/metrics</literal>. In this example the firewall should just
-allow incoming connections to the exporter's port on the bridge interface <literal>br0</literal>
-(this would have to be configured seperately of course).
-For more information about configuration see <literal>man configuration.nix</literal> or
-search through the <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available options</link>.
-</para>
-</section>
-<section xml:id="module-services-prometheus-exporters-new-exporter"><title>Adding a new exporter</title>
-  <para>To add a new exporter, it has to be packaged first (see <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for examples), then a module can be added. The postfix exporter is used in this example:</para>
-<itemizedlist>
-  <listitem>
+   It should now serve all metrics from the collectors that are explicitly
+   enabled and the ones that are
+   <link xlink:href="https://github.com/prometheus/node_exporter#enabled-by-default">enabled
+   by default</link>, via http under <literal>/metrics</literal>. In this
+   example the firewall should just allow incoming connections to the
+   exporter's port on the bridge interface <literal>br0</literal> (this would
+   have to be configured seperately of course). For more information about
+   configuration see <literal>man configuration.nix</literal> or search through
+   the
+   <link xlink:href="https://nixos.org/nixos/options.html#prometheus.exporters">available
+   options</link>.
+  </para>
+ </section>
+ <section xml:id="module-services-prometheus-exporters-new-exporter">
+  <title>Adding a new exporter</title>
+
+  <para>
+   To add a new exporter, it has to be packaged first (see
+   <literal>nixpkgs/pkgs/servers/monitoring/prometheus/</literal> for
+   examples), then a module can be added. The postfix exporter is used in this
+   example:
+  </para>
+
+  <itemizedlist>
+   <listitem>
     <para>
-      Some default options for all exporters are provided by
-      <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
+     Some default options for all exporters are provided by
+     <literal>nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix</literal>:
     </para>
-  </listitem>
-  <listitem override='none'>
+   </listitem>
+   <listitem override='none'>
     <itemizedlist>
-      <listitem><para><literal>enable</literal></para></listitem>
-      <listitem><para><literal>port</literal></para></listitem>
-      <listitem><para><literal>listenAddress</literal></para></listitem>
-      <listitem><para><literal>extraFlags</literal></para></listitem>
-      <listitem><para><literal>openFirewall</literal></para></listitem>
-      <listitem><para><literal>firewallFilter</literal></para></listitem>
-      <listitem><para><literal>user</literal></para></listitem>
-      <listitem><para><literal>group</literal></para></listitem>
+     <listitem>
+      <para>
+       <literal>enable</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>port</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>listenAddress</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>extraFlags</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>openFirewall</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>firewallFilter</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>user</literal>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>group</literal>
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem>
-    <para>As there is already a package available, the module can now be added.
-      This is accomplished by adding a new file to the
-      <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal> directory,
-      which will be called postfix.nix and contains all exporter specific options
-      and configuration:
-      <programlisting>
+   </listitem>
+   <listitem>
+    <para>
+     As there is already a package available, the module can now be added. This
+     is accomplished by adding a new file to the
+     <literal>nixos/modules/services/monitoring/prometheus/exporters/</literal>
+     directory, which will be called postfix.nix and contains all exporter
+     specific options and configuration:
+<programlisting>
         # nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix
         { config, lib, pkgs }:
 
@@ -121,15 +172,16 @@ search through the <link xlink:href="https://nixos.org/nixos/options.html#promet
         }
       </programlisting>
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      This should already be enough for the postfix exporter. Additionally one could
-      now add assertions and conditional default values. This can be done in the
-      'meta-module' that combines all exporter definitions and generates the submodules:
-      <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
+     This should already be enough for the postfix exporter. Additionally one
+     could now add assertions and conditional default values. This can be done
+     in the 'meta-module' that combines all exporter definitions and generates
+     the submodules:
+     <literal>nixpkgs/nixos/modules/services/prometheus/exporters.nix</literal>
     </para>
-  </listitem>
-</itemizedlist>
-</section>
+   </listitem>
+  </itemizedlist>
+ </section>
 </chapter>
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index a97579202523..f90eef69848c 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -3,67 +3,64 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-dnscrypt-proxy">
-
-  <title>DNSCrypt client proxy</title>
+ <title>DNSCrypt client proxy</title>
+ <para>
+  The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled upstream
+  resolver. The traffic between the client and the upstream resolver is
+  encrypted and authenticated, mitigating the risk of MITM attacks, DNS
+  poisoning attacks, and third-party snooping (assuming the upstream is
+  trustworthy).
+ </para>
+ <sect1 xml:id="sec-dnscrypt-proxy-configuration">
+  <title>Basic configuration</title>
 
   <para>
-    The DNSCrypt client proxy relays DNS queries to a DNSCrypt enabled
-    upstream resolver. The traffic between the client and the upstream
-    resolver is encrypted and authenticated, mitigating the risk of MITM
-    attacks, DNS poisoning attacks, and third-party snooping (assuming the
-    upstream is trustworthy).
-  </para>
-
-  <sect1 xml:id="sec-dnscrypt-proxy-configuration"><title>Basic configuration</title>
-
-  <para>
-    To enable the client proxy, set
-    <programlisting>
+   To enable the client proxy, set
+<programlisting>
 <xref linkend="opt-services.dnscrypt-proxy.enable"/> = true;
     </programlisting>
   </para>
 
   <para>
-    Enabling the client proxy does not alter the system nameserver; to
-    relay local queries, prepend <literal>127.0.0.1</literal> to
-    <option>networking.nameservers</option>.
+   Enabling the client proxy does not alter the system nameserver; to relay
+   local queries, prepend <literal>127.0.0.1</literal> to
+   <option>networking.nameservers</option>.
   </para>
-
-  </sect1>
-
-  <sect1 xml:id="sec-dnscrypt-proxy-forwarder"><title>As a forwarder for another DNS client</title>
+ </sect1>
+ <sect1 xml:id="sec-dnscrypt-proxy-forwarder">
+  <title>As a forwarder for another DNS client</title>
 
   <para>
-    To run the DNSCrypt proxy client as a forwarder for another
-    DNS client, change the default proxy listening port to a
-    non-standard value and point the other client to it:
-    <programlisting>
+   To run the DNSCrypt proxy client as a forwarder for another DNS client,
+   change the default proxy listening port to a non-standard value and point
+   the other client to it:
+<programlisting>
 <xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43;
     </programlisting>
   </para>
 
-  <sect2 xml:id="sec-dnscrypt-proxy-forwarder-dsnmasq"><title>dnsmasq</title>
-  <para>
-    <programlisting>
+  <sect2 xml:id="sec-dnscrypt-proxy-forwarder-dsnmasq">
+   <title>dnsmasq</title>
+   <para>
+<programlisting>
 {
   <xref linkend="opt-services.dnsmasq.enable"/> = true;
   <xref linkend="opt-services.dnsmasq.servers"/> = [ "127.0.0.1#43" ];
 }
     </programlisting>
-  </para>
+   </para>
   </sect2>
 
-  <sect2 xml:id="sec-dnscrypt-proxy-forwarder-unbound"><title>unbound</title>
-  <para>
-    <programlisting>
+  <sect2 xml:id="sec-dnscrypt-proxy-forwarder-unbound">
+   <title>unbound</title>
+   <para>
+<programlisting>
 {
   <xref linkend="opt-services.unbound.enable"/> = true;
   <xref linkend="opt-services.unbound.forwardAddresses"/> = [ "127.0.0.1@43" ];
 }
     </programlisting>
-  </para>
+   </para>
   </sect2>
-
-  </sect1>
-
+ </sect1>
 </chapter>
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
index 6f878015c514..510a335edc3b 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -3,28 +3,24 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="module-services-matomo">
-
-  <title>Matomo</title>
-  <para>
-    Matomo is a real-time web analytics application.
-    This module configures php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
-  </para>
+ <title>Matomo</title>
+ <para>
+  Matomo is a real-time web analytics application. This module configures
+  php-fpm as backend for Matomo, optionally configuring an nginx vhost as well.
+ </para>
+ <para>
+  An automatic setup is not suported by Matomo, so you need to configure Matomo
+  itself in the browser-based Matomo setup.
+ </para>
+ <section xml:id="module-services-matomo-database-setup">
+  <title>Database Setup</title>
 
   <para>
-    An automatic setup is not suported by Matomo, so you need to configure Matomo itself in the browser-based Matomo setup.
-  </para>
-
-
-  <section xml:id="module-services-matomo-database-setup">
-    <title>Database Setup</title>
-
-    <para>
-      You also need to configure a MariaDB or MySQL database and -user for Matomo yourself,
-      and enter those credentials in your browser.
-      You can use passwordless database authentication via the UNIX_SOCKET authentication plugin
-      with the following SQL commands:
-
-      <programlisting>
+   You also need to configure a MariaDB or MySQL database and -user for Matomo
+   yourself, and enter those credentials in your browser. You can use
+   passwordless database authentication via the UNIX_SOCKET authentication
+   plugin with the following SQL commands:
+<programlisting>
         # For MariaDB
         INSTALL PLUGIN unix_socket SONAME 'auth_socket';
         CREATE DATABASE matomo;
@@ -37,59 +33,58 @@
         CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket;
         GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
       </programlisting>
+   Then fill in <literal>matomo</literal> as database user and database name,
+   and leave the password field blank. This authentication works by allowing
+   only the <literal>matomo</literal> unix user to authenticate as the
+   <literal>matomo</literal> database user (without needing a password), but no
+   other users. For more information on passwordless login, see
+   <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
+  </para>
 
-      Then fill in <literal>matomo</literal> as database user and database name, and leave the password field blank.
-      This authentication works by allowing only the <literal>matomo</literal> unix user to authenticate as the
-      <literal>matomo</literal> database user (without needing a password), but no other users.
-      For more information on passwordless login, see
-      <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
-    </para>
+  <para>
+   Of course, you can use password based authentication as well, e.g. when the
+   database is not on the same host.
+  </para>
+ </section>
+ <section xml:id="module-services-matomo-backups">
+  <title>Backup</title>
 
+  <para>
+   You only need to take backups of your MySQL database and the
+   <filename>/var/lib/matomo/config/config.ini.php</filename> file. Use a user
+   in the <literal>matomo</literal> group or root to access the file. For more
+   information, see
+   <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
+  </para>
+ </section>
+ <section xml:id="module-services-matomo-issues">
+  <title>Issues</title>
+
+  <itemizedlist>
+   <listitem>
     <para>
-      Of course, you can use password based authentication as well, e.g. when the database is not on the same host.
+     Matomo's file integrity check will warn you. This is due to the patches
+     necessary for NixOS, you can safely ignore this.
     </para>
-  </section>
-
-
-  <section xml:id="module-services-matomo-backups">
-    <title>Backup</title>
+   </listitem>
+   <listitem>
     <para>
-      You only need to take backups of your MySQL database and the
-      <filename>/var/lib/matomo/config/config.ini.php</filename> file.
-      Use a user in the <literal>matomo</literal> group or root to access the file.
-      For more information, see <link xlink:href="https://matomo.org/faq/how-to-install/faq_138/" />.
+     Matomo will warn you that the JavaScript tracker is not writable. This is
+     because it's located in the read-only nix store. You can safely ignore
+     this, unless you need a plugin that needs JavaScript tracker access.
     </para>
-  </section>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section xml:id="module-services-matomo-other-web-servers">
+  <title>Using other Web Servers than nginx</title>
 
-
-  <section xml:id="module-services-matomo-issues">
-    <title>Issues</title>
-    <itemizedlist>
-      <listitem>
-        <para>
-          Matomo's file integrity check will warn you.
-          This is due to the patches necessary for NixOS, you can safely ignore this.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Matomo will warn you that the JavaScript tracker is not writable.
-          This is because it's located in the read-only nix store.
-          You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-
-
-  <section xml:id="module-services-matomo-other-web-servers">
-    <title>Using other Web Servers than nginx</title>
-
-    <para>
-      You can use other web servers by forwarding calls for <filename>index.php</filename> and
-      <filename>piwik.php</filename> to the <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket.
-      You can use the nginx configuration in the module code as a reference to what else should be configured.
-    </para>
-  </section>
+  <para>
+   You can use other web servers by forwarding calls for
+   <filename>index.php</filename> and <filename>piwik.php</filename> to the
+   <literal>/run/phpfpm-matomo.sock</literal> fastcgi unix socket. You can use
+   the nginx configuration in the module code as a reference to what else
+   should be configured.
+  </para>
+ </section>
 </chapter>

From 6058b979ab92f3e3d35ac6ed6a54dfcd85e83460 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Sep 2018 00:23:59 -0500
Subject: [PATCH 2060/3253] libosinfo: externalize patches, fetch w/fetchpatch

---
 ...pand-the-arch-s-parser-for-isodetect.patch | 40 -------------------
 ...nchored-patterns-when-matching-regex.patch | 34 ----------------
 .../libraries/libosinfo/default.nix           | 14 +++++--
 3 files changed, 11 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
 delete mode 100644 pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch

diff --git a/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch b/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
deleted file mode 100644
index 7dcbb75df396..000000000000
--- a/pkgs/development/libraries/libosinfo/0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b9cb227842948b1b2289cdd3e9b8d925664c2ee7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Fri, 7 Sep 2018 15:04:20 +0200
-Subject: [PATCH 1/2] tests: Expand the arch's parser for isodetect
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some Windows ISOs isodata, as the ones added as part of commit 857f503,
-uses X64 and X86 and load_iso() didn't take those into consideration.
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- tests/test-isodetect.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/test-isodetect.c b/tests/test-isodetect.c
-index 415770b..76f0c5a 100644
---- a/tests/test-isodetect.c
-+++ b/tests/test-isodetect.c
-@@ -106,6 +106,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
-     info->langs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-     if (strstr(name, "amd64") ||
-              strstr(name, "x64") ||
-+             strstr(name, "X64") ||
-              strstr(name, "x86_64") ||
-              strstr(name, "64bit") ||
-              strstr(name, "64-bit"))
-@@ -114,6 +115,7 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
-              strstr(name, "i586") ||
-              strstr(name, "i686") ||
-              strstr(name, "x86") ||
-+             strstr(name, "X86") ||
-              strstr(name, "32bit") ||
-              strstr(name, "32-bit"))
-         arch = "i386";
--- 
-2.19.0
-
diff --git a/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch b/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
deleted file mode 100644
index b47c93f3d390..000000000000
--- a/pkgs/development/libraries/libosinfo/0002-db-Force-anchored-patterns-when-matching-regex.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e6168463f4fc659b9827b5c8694dc1c6d7d5239a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Fri, 7 Sep 2018 15:53:20 +0200
-Subject: [PATCH 2/2] db: Force anchored patterns when matching regex
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without forcing anchored patterns some matches may be completely wrong
-as "(J_)?CENN?A_X64FREV" (volume-id for Windows 10) that could be taken
-as a match for "HRM_CENNA_X64FREV" (volume-id of a Windows 8 ISO).
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- osinfo/osinfo_db.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c
-index fa14c6d..f4b3a8c 100644
---- a/osinfo/osinfo_db.c
-+++ b/osinfo/osinfo_db.c
-@@ -37,7 +37,7 @@ G_DEFINE_TYPE(OsinfoDb, osinfo_db, G_TYPE_OBJECT);
- #define match_regex(pattern, str)                                       \
-     (((pattern) == NULL) ||                                             \
-      (((str) != NULL) &&                                                \
--      g_regex_match_simple((pattern), (str), 0, 0)))
-+      g_regex_match_simple((pattern), (str), 0, G_REGEX_MATCH_ANCHORED)))
- 
- static gchar *get_raw_lang(const char *volume_id, const gchar *regex_str)
- {
--- 
-2.19.0
-
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 3a3dc6952a61..ba267b797870 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
 , glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
 }:
 
@@ -20,8 +20,16 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./osinfo-db-data-dir.patch
-    ./0001-tests-Expand-the-arch-s-parser-for-isodetect.patch
-    ./0002-db-Force-anchored-patterns-when-matching-regex.patch
+    # Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
+    # using upstream commits:
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
+      sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
+      sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
+    })
   ];
 
   postPatch = ''

From f449242e83bd441300f009321157dd308326cfcc Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 10:55:46 -0700
Subject: [PATCH 2061/3253] nixos/systemd: remove activation dependency

As far as I can tell, the systemd snippet hasn't depended on groups
being initialized since 5d02c02a9bfd6912e4e0f700b1b35e76d1d6bd3f in
2015, when a `setfacl` call was removed.
---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 12e029ae57f8..c96a502a892f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -783,7 +783,7 @@ in
 
     services.dbus.enable = true;
 
-    system.activationScripts.systemd = stringAfter [ "groups" ]
+    system.activationScripts.systemd =
       ''
         mkdir -m 0755 -p /var/lib/udev
 

From da86afba0d610170993eef053f534afc469269a3 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Sep 2018 10:59:57 +0200
Subject: [PATCH 2062/3253] nixos/steam-hardware: module init

---
 nixos/modules/hardware/steam-hardware.nix | 25 +++++++++++++++++++++++
 nixos/modules/module-list.nix             |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 nixos/modules/hardware/steam-hardware.nix

diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix
new file mode 100644
index 000000000000..378aeffe71b5
--- /dev/null
+++ b/nixos/modules/hardware/steam-hardware.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.hardware.steam-hardware;
+
+in
+
+{
+  options.hardware.steam-hardware = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable udev rules for Steam hardware such as the Steam Controller, other supported controllers and the HTC Vive";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.udev.packages = [
+      pkgs.steamPackages.steam
+    ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1a8f522a969d..fe2cbb23476d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -46,6 +46,7 @@
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
   ./hardware/raid/hpsa.nix
+  ./hardware/steam-hardware.nix
   ./hardware/usb-wwan.nix
   ./hardware/onlykey.nix
   ./hardware/video/amdgpu.nix

From d859a66351181bf63d2f311269e2b71bf949e166 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 30 Sep 2018 11:27:33 +0200
Subject: [PATCH 2063/3253] nixos/steam-hardware: update documentation

---
 doc/package-notes.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index d8f55ef0a856..a4322a0234d3 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -413,11 +413,8 @@ packageOverrides = pkgs: {
     in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
 <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
     if you are using PulseAudio - this will enable 32bit ALSA apps integration.
-    To use the Steam controller, you need to add
-<programlisting>services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
-    KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput"
-  '';</programlisting>
+    To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
+<programlisting>hardware.steam-hardware.enable = true;</programlisting>
     to your configuration.
    </para>
   </section>

From aadd5b3f55cf81ddb1b5d0d2a65f897ffd0eb880 Mon Sep 17 00:00:00 2001
From: Matthias Devlamynck <matthias.devlamynck@mailoo.org>
Date: Tue, 4 Sep 2018 16:59:15 +0200
Subject: [PATCH 2064/3253] plasma-applet-volumewin7mixer: init at v23

---
 maintainers/maintainer-list.nix               |  5 ++++
 .../plasma-applet-volumewin7mixer/cmake.patch | 20 ++++++++++++++
 .../plasma-applet-volumewin7mixer/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
 create mode 100644 pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6356c0c7cefe..5dee165a9308 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2531,6 +2531,11 @@
     github = "mdaiter";
     name = "Matthew S. Daiter";
   };
+  mdevlamynck = {
+    email = "matthias.devlamynck@mailoo.org";
+    github = "mdevlamynck";
+    name = "Matthias Devlamynck";
+  };
   meditans = {
     email = "meditans@gmail.com";
     github = "meditans";
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
new file mode 100644
index 000000000000..b33a3e174bc4
--- /dev/null
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/cmake.patch
@@ -0,0 +1,20 @@
+diff -Naur org.kde.plasma.volumewin7mixer/CMakeLists.txt org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt
+--- org.kde.plasma.volumewin7mixer/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
++++ org.kde.plasma.volumewin7mixer.patch/CMakeLists.txt	2016-04-19 11:23:35.137866949 +0200
+@@ -0,0 +1,15 @@
++# Set minimum CMake version (required for CMake 3.0 or later)
++cmake_minimum_required(VERSION 2.8.12)
++
++# Use Extra CMake Modules (ECM) for common functionality.
++# See http://api.kde.org/ecm/manual/ecm.7.html
++# and http://api.kde.org/ecm/manual/ecm-kde-modules.7.html
++find_package(ECM REQUIRED NO_MODULE)
++# Needed by find_package(KF5Plasma) below.
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH})
++
++# Locate plasma_install_package macro.
++find_package(KF5Plasma REQUIRED)
++
++# Add installatation target ("make install").
++plasma_install_package(package org.kde.plasma.volumewin7mixer)
+
diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
new file mode 100644
index 000000000000..6c23d160f47c
--- /dev/null
+++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, plasma-pa, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "plasma-applet-volumewin7mixer-${version}";
+  version = "23";
+
+  src = fetchFromGitHub {
+    owner = "Zren";
+    repo = "plasma-applet-volumewin7mixer";
+    rev = "v${version}";
+    sha256 = "1j2bq343lnhwqz26qfsvg7vjxv84ibzbc4y86rjkh07nqjwb3xsc";
+  };
+
+  patches = [ ./cmake.patch ];
+  postPatch = '' rm build '';
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  buildInputs = [ plasma-framework kwindowsystem plasma-pa ];
+
+  meta = with stdenv.lib; {
+    description = "A fork of the default volume plasmoid with a Windows 7 theme (vertical sliders).";
+    homepage = "https://github.com/Zren/plasma-applet-volumewin7mixer";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mdevlamynck ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8ff605bbd09..f12c83eec374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20470,6 +20470,8 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
+  plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
+
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg wrapPython;
     inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;

From b1857daa254354ee3f71e70f8b1bb609611e701c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 30 Sep 2018 13:44:41 +0200
Subject: [PATCH 2065/3253] mapnik: 3.0.13 -> 3.0.20

---
 pkgs/development/libraries/mapnik/default.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 0546bdc6359b..ebae2a6c3be0 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, fetchpatch
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
-, libwebp, libxml2, proj, python2, scons, sqlite, zlib
+, libwebp, libxml2, proj, python, scons, sqlite, zlib
 
 # supply a postgresql package to enable the PostGIS input plugin
 , postgresql ? null
@@ -8,28 +8,22 @@
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.13";
+  version = "3.0.20";
 
   src = fetchzip {
     # this one contains all git submodules and is cheaper than fetchgit
     url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
+    sha256 = "05a2hvvk5s4x3wjvh4spd717vd5ri7h0sql7aarpi9jpc5h6xicc";
   };
 
-  patches = [(fetchpatch {
-    name = "icu-59.diff";
-    url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff;
-    sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p";
-  })];
-
   # a distinct dev output makes python-mapnik fail
   outputs = [ "out" ];
 
-  nativeBuildInputs = [ python2 scons ];
+  nativeBuildInputs = [ python scons ];
 
   buildInputs =
     [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
-      libwebp libxml2 proj python2 sqlite zlib
+      libwebp libxml2 proj python sqlite zlib
 
       # optional inputs
       postgresql

From be6451e0205ecf779986128b0f7e0171cb64803a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 30 Sep 2018 13:46:18 +0200
Subject: [PATCH 2066/3253] pythonPackages.python-mapnik: Fix build

There were two things to fix:
- Boost started shipping libboost_python.so as libboost_python{Major}{Minor}
- Make sure that mapnik and boost link to the correct version of python.
---
 pkgs/top-level/python-packages.nix | 32 ++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 157f45f3f2a9..758f84c1a099 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3345,19 +3345,43 @@ in {
 
   python-mapnik = buildPythonPackage rec {
     name = "python-mapnik-${version}";
-    version = "3.0.13";
+    version = "3.0.16";
 
     src = pkgs.fetchFromGitHub {
       owner = "mapnik";
       repo = "python-mapnik";
       rev = "v${version}";
-      sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp";
+      sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
     };
 
     disabled = isPyPy;
     doCheck = false; # doesn't find needed test data files
-    buildInputs = with pkgs;
-      [ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ];
+    preBuild = let
+      pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+    in ''
+      export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
+      export BOOST_THREAD_LIB="boost_thread"
+      export BOOST_SYSTEM_LIB="boost_system"
+    '';
+    buildInputs = with pkgs; [
+        (boost.override {
+          enablePython = true;
+          inherit python;
+        })
+        (mapnik.override {
+          inherit python;
+          boost = (boost.override { enablePython = true; inherit python; });
+        })
+        cairo
+        harfbuzz
+        icu
+        libjpeg
+        libpng
+        libtiff
+        libwebp
+        proj
+        zlib
+      ];
     propagatedBuildInputs = with self; [ pillow pycairo ];
 
     meta = with stdenv.lib; {

From a91c293aaf2f6b2939418e3be9f0d2b1b349e43c Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Sun, 30 Sep 2018 14:49:26 +0200
Subject: [PATCH 2067/3253] kubernetes: 1.11.3 -> 1.12.0

- kubelet CAdvisor port has been removed
---
 nixos/modules/rename.nix                                  | 1 +
 nixos/modules/services/cluster/kubernetes/default.nix     | 8 --------
 .../networking/cluster/kubernetes/default.nix             | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index bc9ff9f63dd7..eb74b9bcac12 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -39,6 +39,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
     (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
     (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
+    (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
     (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index aeaa6bd66c99..e63d91eb9aca 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -622,13 +622,6 @@ in {
         type = types.bool;
       };
 
-      # TODO: remove this deprecated flag
-      cadvisorPort = mkOption {
-        description = "Kubernetes kubelet local cadvisor port.";
-        default = 4194;
-        type = types.int;
-      };
-
       clusterDns = mkOption {
         description = "Use alternative DNS.";
         default = "10.1.0.1";
@@ -862,7 +855,6 @@ in {
             --hostname-override=${cfg.kubelet.hostname} \
             --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \
             --root-dir=${cfg.dataDir} \
-            --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
             ${optionalString (cfg.kubelet.clusterDns != "")
               "--cluster-dns=${cfg.kubelet.clusterDns}"} \
             ${optionalString (cfg.kubelet.clusterDomain != "")
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 96dab6aa66a1..776a1667514f 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.11.3";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb";
+    sha256 = "0bnfhrli9xqf7ygfq5i5p6nsgv7ic57b5b705zbqsxrc24pvsy4s";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];

From 766e3228c2fab89cf4fae3e93f4c0d89912b016e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 30 Sep 2018 14:51:42 +0200
Subject: [PATCH 2068/3253] tdesktop: 1.3.14 -> 1.4.0

tdesktopPackages.preview: 1.3.14 -> 1.4.0
---
 .../instant-messengers/telegram/tdesktop/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 5d8e2c52c218..df627f57de5d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,11 +4,11 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.3.14";
-    sha256Hash = "107m9iqw78b691pcq65s3m3zhamn8slh0wiyipwbbp0w13rqna3v";
+    version = "1.4.0";
+    sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "359861";
-    archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0";
+    archPatchesRevision = "388448";
+    archPatchesHash = "06a1j7fxg55d3wgab9rnwv93dvwdwkx7mvsxaywwwiz7ng20rgs1";
   };
 in {
   stable = mkTelegram stableVersion;

From b46666a86770198f891fb43cc64bf5dcdd3c731d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Sep 2018 08:52:16 +0000
Subject: [PATCH 2069/3253] ocamlPackages.odoc: fix resolution of odoc.css

---
 pkgs/development/ocaml-modules/odoc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 4c5da695eb6c..3b1005106272 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ bos doc-ock-html doc-ock-xml ];
 
+  configurePhase = "ocaml bin/set-etc bin/odoc_etc.ml $out/etc/odoc";
+
   inherit (dune) installPhase;
 
   meta = {

From ebd38185c8f50535b251b487375a671f3943a6be Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 29 Jun 2018 19:17:54 +0200
Subject: [PATCH 2070/3253] nixos/nextcloud: init
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
Co-authored-by: Robin Gloster <mail@glob.in>
Co-authored-by: Janne Heß <janne@hess.ooo>
Co-authored-by: Florian Klink <flokli@flokli.de>
---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/nextcloud.nix | 463 ++++++++++++++++++
 .../services/web-servers/nginx/default.nix    |  17 +-
 .../web-servers/nginx/location-options.nix    |  10 +
 nixos/release.nix                             |   1 +
 nixos/tests/nextcloud/basic.nix               |  56 +++
 nixos/tests/nextcloud/default.nix             |   6 +
 .../nextcloud/with-mysql-and-memcached.nix    |  97 ++++
 .../nextcloud/with-postgresql-and-redis.nix   | 130 +++++
 9 files changed, 778 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/web-apps/nextcloud.nix
 create mode 100644 nixos/tests/nextcloud/basic.nix
 create mode 100644 nixos/tests/nextcloud/default.nix
 create mode 100644 nixos/tests/nextcloud/with-mysql-and-memcached.nix
 create mode 100644 nixos/tests/nextcloud/with-postgresql-and-redis.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f4c7cf601bf1..11484d159b8c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -689,6 +689,7 @@
   ./services/web-apps/codimd.nix
   ./services/web-apps/frab.nix
   ./services/web-apps/mattermost.nix
+  ./services/web-apps/nextcloud.nix
   ./services/web-apps/nexus.nix
   ./services/web-apps/pgpkeyserver-lite.nix
   ./services/web-apps/matomo.nix
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
new file mode 100644
index 000000000000..44c3df1d057b
--- /dev/null
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -0,0 +1,463 @@
+{ config, lib, pkgs, ... }@args:
+
+with lib;
+
+let
+  cfg = config.services.nextcloud;
+
+  toKeyValue = generators.toKeyValue {
+    mkKeyValue = generators.mkKeyValueDefault {} " = ";
+  };
+
+  phpOptionsExtensions = ''
+    ${optionalString cfg.caching.apcu "extension=${cfg.phpPackages.apcu}/lib/php/extensions/apcu.so"}
+    ${optionalString cfg.caching.redis "extension=${cfg.phpPackages.redis}/lib/php/extensions/redis.so"}
+    ${optionalString cfg.caching.memcached "extension=${cfg.phpPackages.memcached}/lib/php/extensions/memcached.so"}
+    zend_extension = opcache.so
+    opcache.enable = 1
+  '';
+  phpOptions = {
+    upload_max_filesize = cfg.maxUploadSize;
+    post_max_size = cfg.maxUploadSize;
+    memory_limit = cfg.maxUploadSize;
+  } // cfg.phpOptions;
+  phpOptionsStr = phpOptionsExtensions + (toKeyValue phpOptions);
+
+  occ = pkgs.writeScriptBin "nextcloud-occ" ''
+    #! ${pkgs.stdenv.shell}
+    cd ${pkgs.nextcloud}
+    exec /run/wrappers/bin/sudo -u nextcloud \
+      NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \
+      ${config.services.phpfpm.phpPackage}/bin/php \
+      -c ${pkgs.writeText "php.ini" phpOptionsStr}\
+      occ $*
+  '';
+
+in {
+  options.services.nextcloud = {
+    enable = mkEnableOption "nextcloud";
+    hostName = mkOption {
+      type = types.str;
+      description = "FQDN for the nextcloud instance.";
+    };
+    home = mkOption {
+      type = types.str;
+      default = "/var/lib/nextcloud";
+      description = "Storage path of nextcloud.";
+    };
+    https = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable if there is a TLS terminating proxy in front of nextcloud.";
+    };
+
+    maxUploadSize = mkOption {
+      default = "512M";
+      type = types.str;
+      description = ''
+        Defines the upload limit for files. This changes the relevant options
+        in php.ini and nginx if enabled.
+      '';
+    };
+
+    skeletonDirectory = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        The directory where the skeleton files are located. These files will be
+        copied to the data directory of new users. Leave empty to not copy any
+        skeleton files.
+      '';
+    };
+
+    nginx.enable = mkEnableOption "nginx vhost management";
+
+    webfinger = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable this option if you plan on using the webfinger plugin.
+        The appropriate nginx rewrite rules will be added to your configuration.
+      '';
+    };
+
+    phpPackages = mkOption {
+      type = types.attrs;
+      default = pkgs.php71Packages;
+      defaultText = "pkgs.php71Packages";
+      description = ''
+        Overridable attribute of the PHP packages set to use.  If any caching
+        module is enabled, it will be taken from here.  Therefore it should
+        match the version of PHP given to
+        <literal>services.phpfpm.phpPackage</literal>.
+      '';
+    };
+
+    phpOptions = mkOption {
+      type = types.attrsOf types.str;
+      default = {
+        "short_open_tag" = "Off";
+        "expose_php" = "Off";
+        "error_reporting" = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
+        "display_errors" = "stderr";
+        "opcache.enable_cli" = "1";
+        "opcache.interned_strings_buffer" = "8";
+        "opcache.max_accelerated_files" = "10000";
+        "opcache.memory_consumption" = "128";
+        "opcache.revalidate_freq" = "1";
+        "opcache.fast_shutdown" = "1";
+        "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
+        "catch_workers_output" = "yes";
+      };
+      description = ''
+        Options for PHP's php.ini file for nextcloud.
+      '';
+    };
+
+    config = {
+      dbtype = mkOption {
+        type = types.enum [ "sqlite" "pgsql" "mysql" ];
+        default = "sqlite";
+        description = "Database type.";
+      };
+      dbname = mkOption {
+        type = types.nullOr types.str;
+        default = "nextcloud";
+        description = "Database name.";
+      };
+      dbuser = mkOption {
+        type = types.nullOr types.str;
+        default = "nextcloud";
+        description = "Database user.";
+      };
+      dbpass = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Database password.  Use <literal>dbpassFile</literal> to avoid this
+          being world-readable in the <literal>/nix/store</literal>.
+        '';
+      };
+      dbpassFile = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          The full path to a file that contains the database password.
+        '';
+      };
+      dbhost = mkOption {
+        type = types.nullOr types.str;
+        default = "localhost";
+        description = "Database host.";
+      };
+      dbport = mkOption {
+        type = with types; nullOr (either int str);
+        default = null;
+        description = "Database port.";
+      };
+      dbtableprefix = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Table prefix in Nextcloud database.";
+      };
+      adminuser = mkOption {
+        type = types.str;
+        default = "root";
+        description = "Admin username.";
+      };
+      adminpass = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Database password.  Use <literal>adminpassFile</literal> to avoid this
+          being world-readable in the <literal>/nix/store</literal>.
+        '';
+      };
+      adminpassFile = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          The full path to a file that contains the admin's password.
+        '';
+      };
+
+      extraTrustedDomains = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Trusted domains, from which the nextcloud installation will be
+          acessible.  You don't need to add
+          <literal>services.nextcloud.hostname</literal> here.
+        '';
+      };
+    };
+
+    caching = {
+      apcu = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to load the APCu module into PHP.
+        '';
+      };
+      redis = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to load the Redis module into PHP.
+          You still need to enable Redis in your config.php.
+          See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html
+        '';
+      };
+      memcached = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to load the Memcached module into PHP.
+          You still need to enable Memcached in your config.php.
+          See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    { assertions = let acfg = cfg.config; in [
+        { assertion = !(acfg.dbpass != null && acfg.dbpassFile != null);
+          message = "Please specify no more than one of dbpass or dbpassFile";
+        }
+        { assertion = ((acfg.adminpass != null || acfg.adminpassFile != null)
+            && !(acfg.adminpass != null && acfg.adminpassFile != null));
+          message = "Please specify exactly one of adminpass or adminpassFile";
+        }
+      ];
+    }
+
+    { systemd.timers."nextcloud-cron" = {
+        wantedBy = [ "timers.target" ];
+        timerConfig.OnBootSec = "5m";
+        timerConfig.OnUnitActiveSec = "15m";
+        timerConfig.Unit = "nextcloud-cron.service";
+      };
+
+      systemd.services = {
+        "nextcloud-setup" = let
+          overrideConfig = pkgs.writeText "nextcloud-config.php" ''
+            <?php
+            $CONFIG = [
+              'apps_paths' => [
+                [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ],
+                [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ],
+              ],
+              'datadirectory' => '${cfg.home}/data',
+              'skeletondirectory' => '${cfg.skeletonDirectory}',
+              ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}
+              'log_type' => 'syslog',
+            ];
+          '';
+          occInstallCmd = let
+            c = cfg.config;
+            adminpass = if c.adminpassFile != null
+              then ''"$(<"${toString c.adminpassFile}")"''
+              else ''"${toString c.adminpass}"'';
+            dbpass = if c.dbpassFile != null
+              then ''"$(<"${toString c.dbpassFile}")"''
+              else if c.dbpass != null
+              then ''"${toString c.dbpass}"''
+              else null;
+            installFlags = concatStringsSep " \\\n    "
+              (mapAttrsToList (k: v: "${k} ${toString v}") {
+              "--database" = ''"${c.dbtype}"'';
+              # The following attributes are optional depending on the type of
+              # database.  Those that evaluate to null on the left hand side
+              # will be omitted.
+              ${if c.dbname != null then "--database-name" else null} = ''"${c.dbname}"'';
+              ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
+              ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
+              ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
+              ${if (any (x: x != null) [c.dbpass c.dbpassFile])
+                 then "--database-pass" else null} = dbpass;
+              ${if c.dbtableprefix != null
+                then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
+              "--admin-user" = ''"${c.adminuser}"'';
+              "--admin-pass" = adminpass;
+              "--data-dir" = ''"${cfg.home}/data"'';
+            });
+          in ''
+            ${occ}/bin/nextcloud-occ maintenance:install \
+                ${installFlags}
+          '';
+          occSetTrustedDomainsCmd = concatStringsSep "\n" (imap0
+            (i: v: ''
+              ${occ}/bin/nextcloud-occ config:system:set trusted_domains \
+                ${toString i} --value="${toString v}"
+            '') ([ cfg.hostName ] ++ cfg.config.extraTrustedDomains));
+
+        in {
+          wantedBy = [ "multi-user.target" ];
+          before = [ "phpfpm-nextcloud.service" ];
+          script = ''
+            chmod og+x ${cfg.home}
+            ln -sf ${pkgs.nextcloud}/apps ${cfg.home}/
+            mkdir -p ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps
+            ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php
+
+            chown -R nextcloud:nginx ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps
+
+            # Do not install if already installed
+            if [[ ! -e ${cfg.home}/config/config.php ]]; then
+              ${occInstallCmd}
+            fi
+
+            ${occ}/bin/nextcloud-occ upgrade
+
+            ${occ}/bin/nextcloud-occ config:system:delete trusted_domains
+            ${occSetTrustedDomainsCmd}
+          '';
+          serviceConfig.Type = "oneshot";
+        };
+        "nextcloud-cron" = {
+          environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
+          serviceConfig.Type = "oneshot";
+          serviceConfig.User = "nextcloud";
+          serviceConfig.ExecStart = "${pkgs.php}/bin/php -f ${pkgs.nextcloud}/cron.php";
+        };
+      };
+
+      services.phpfpm = {
+        phpOptions = phpOptionsExtensions;
+        phpPackage = pkgs.php71;
+        pools.nextcloud = let
+          phpAdminValues = (toKeyValue
+            (foldr (a: b: a // b) {}
+              (mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
+                phpOptions)));
+        in {
+          listen = "/run/phpfpm/nextcloud";
+          extraConfig = ''
+            listen.owner = nginx
+            listen.group = nginx
+            user = nextcloud
+            group = nginx
+            pm = dynamic
+            pm.max_children = 32
+            pm.start_servers = 2
+            pm.min_spare_servers = 2
+            pm.max_spare_servers = 4
+            env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config
+            env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin
+            ${phpAdminValues}
+          '';
+        };
+      };
+
+      users.extraUsers.nextcloud = {
+        home = "${cfg.home}";
+        group = "nginx";
+        createHome = true;
+      };
+
+      environment.systemPackages = [ occ ];
+    }
+
+    (mkIf cfg.nginx.enable {
+      services.nginx = {
+        enable = true;
+        virtualHosts = {
+          "${cfg.hostName}" = {
+            root = pkgs.nextcloud;
+            locations = {
+              "= /robots.txt" = {
+                priority = 100;
+                extraConfig = ''
+                  allow all;
+                  log_not_found off;
+                  access_log off;
+                '';
+              };
+              "/" = {
+                priority = 200;
+                extraConfig = "rewrite ^ /index.php$uri;";
+              };
+              "~ ^/store-apps" = {
+                priority = 201;
+                extraConfig = "root ${cfg.home};";
+              };
+              "= /.well-known/carddav" = {
+                priority = 210;
+                extraConfig = "return 301 $scheme://$host/remote.php/dav;";
+              };
+              "= /.well-known/caldav" = {
+                priority = 210;
+                extraConfig = "return 301 $scheme://$host/remote.php/dav;";
+              };
+              "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/" = {
+                priority = 300;
+                extraConfig = "deny all;";
+              };
+              "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = {
+                priority = 300;
+                extraConfig = "deny all;";
+              };
+              "~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = {
+                priority = 500;
+                extraConfig = ''
+                  include ${pkgs.nginxMainline}/conf/fastcgi.conf;
+                  fastcgi_split_path_info ^(.+\.php)(/.*)$;
+                  fastcgi_param PATH_INFO $fastcgi_path_info;
+                  fastcgi_param HTTPS ${if cfg.https then "on" else "off"};
+                  fastcgi_param modHeadersAvailable true;
+                  fastcgi_param front_controller_active true;
+                  fastcgi_pass unix:/run/phpfpm/nextcloud;
+                  fastcgi_intercept_errors on;
+                  fastcgi_request_buffering off;
+                  fastcgi_read_timeout 120s;
+                '';
+              };
+              "~ ^/(?:updater|ocs-provider)(?:$|/)".extraConfig = ''
+                try_files $uri/ =404;
+                index index.php;
+              '';
+              "~ \\.(?:css|js|woff|svg|gif)$".extraConfig = ''
+                try_files $uri /index.php$uri$is_args$args;
+                add_header Cache-Control "public, max-age=15778463";
+                add_header X-Content-Type-Options nosniff;
+                add_header X-XSS-Protection "1; mode=block";
+                add_header X-Robots-Tag none;
+                add_header X-Download-Options noopen;
+                add_header X-Permitted-Cross-Domain-Policies none;
+                access_log off;
+              '';
+              "~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = ''
+                try_files $uri /index.php$uri$is_args$args;
+                access_log off;
+              '';
+            };
+            extraConfig = ''
+              add_header X-Content-Type-Options nosniff;
+              add_header X-XSS-Protection "1; mode=block";
+              add_header X-Robots-Tag none;
+              add_header X-Download-Options noopen;
+              add_header X-Permitted-Cross-Domain-Policies none;
+              error_page 403 /core/templates/403.php;
+              error_page 404 /core/templates/404.php;
+              client_max_body_size ${cfg.maxUploadSize};
+              fastcgi_buffers 64 4K;
+              gzip on;
+              gzip_vary on;
+              gzip_comp_level 4;
+              gzip_min_length 256;
+              gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
+              gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+
+              ${optionalString cfg.webfinger ''
+                rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
+                rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
+              ''}
+            '';
+          };
+        };
+      };
+    })
+  ]);
+}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index b231ee5a3f01..508398f03ace 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -245,8 +245,8 @@ let
         }
       ''
   ) virtualHosts);
-  mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
-    location ${location} {
+  mkLocations = locations: concatStringsSep "\n" (map (config: ''
+    location ${config.location} {
       ${optionalString (config.proxyPass != null && !cfg.proxyResolveWhileRunning)
         "proxy_pass ${config.proxyPass};"
       }
@@ -266,7 +266,18 @@ let
       ${config.extraConfig}
       ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
     }
-  '') locations);
+  '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));
+  mkBasicAuth = vhostName: authDef: let
+    htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" (
+      concatStringsSep "\n" (mapAttrsToList (user: password: ''
+        ${user}:{PLAIN}${password}
+      '') authDef)
+    );
+  in ''
+    auth_basic secured;
+    auth_basic_user_file ${htpasswdFile};
+  '';
+
   mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
     concatStringsSep "\n" (mapAttrsToList (user: password: ''
       ${user}:{PLAIN}${password}
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 4c772734a749..9b44433d3845 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -71,6 +71,16 @@ with lib;
         These lines go to the end of the location verbatim.
       '';
     };
+
+    priority = mkOption {
+      type = types.int;
+      default = 1000;
+      description = ''
+        Order of this location block in relation to the others in the vhost.
+        The semantics are the same as with `lib.mkOrder`. Smaller values have
+        a greater priority.
+      '';
+    };
   };
 }
 
diff --git a/nixos/release.nix b/nixos/release.nix
index cce2c54f02bf..0c2207c27ad7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -360,6 +360,7 @@ in rec {
   tests.netdata = callTest tests/netdata.nix { };
   tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
   tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
+  tests.nextcloud = callSubTests tests/nextcloud { };
   # TODO: put in networking.nix after the test becomes more complete
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nexus = callTest tests/nexus.nix { };
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
new file mode 100644
index 000000000000..c3b710f0f904
--- /dev/null
+++ b/nixos/tests/nextcloud/basic.nix
@@ -0,0 +1,56 @@
+import ../make-test.nix ({ pkgs, ...}: let
+  adminpass = "notproduction";
+  adminuser = "root";
+in {
+  name = "nextcloud-basic";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ globin eqyiel ];
+  };
+
+  nodes = {
+    # The only thing the client needs to do is download a file.
+    client = { ... }: {};
+
+    nextcloud = { config, pkgs, ... }: {
+      networking.firewall.allowedTCPPorts = [ 80 ];
+
+      services.nextcloud = {
+        enable = true;
+        nginx.enable = true;
+        hostName = "nextcloud";
+        config = {
+          # Don't inherit adminuser since "root" is supposed to be the default
+          inherit adminpass;
+        };
+      };
+    };
+  };
+
+  testScript = let
+    withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+      #!${pkgs.stdenv.shell}
+      export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+      export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+      "''${@}"
+    '';
+    copySharedFile = pkgs.writeScript "copy-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      echo 'hi' | ${withRcloneEnv} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+    '';
+
+    diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+    '';
+  in ''
+    startAll();
+    $nextcloud->waitForUnit("multi-user.target");
+    $nextcloud->succeed("curl -sSf http://nextcloud/login");
+    $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+    $client->waitForUnit("multi-user.target");
+    $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+  '';
+})
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
new file mode 100644
index 000000000000..66da6794b961
--- /dev/null
+++ b/nixos/tests/nextcloud/default.nix
@@ -0,0 +1,6 @@
+{ system ? builtins.currentSystem }:
+{
+  basic = import ./basic.nix { inherit system; };
+  with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system; };
+  with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system; };
+}
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
new file mode 100644
index 000000000000..c0d347238b47
--- /dev/null
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -0,0 +1,97 @@
+import ../make-test.nix ({ pkgs, ...}: let
+  adminpass = "hunter2";
+  adminuser = "root";
+in {
+  name = "nextcloud-with-mysql-and-memcached";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eqyiel ];
+  };
+
+  nodes = {
+    # The only thing the client needs to do is download a file.
+    client = { ... }: {};
+
+    nextcloud = { config, pkgs, ... }: {
+      networking.firewall.allowedTCPPorts = [ 80 ];
+
+      services.nextcloud = {
+        enable = true;
+        hostName = "nextcloud";
+        nginx.enable = true;
+        https = true;
+        caching = {
+          apcu = true;
+          redis = false;
+          memcached = true;
+        };
+        config = {
+          dbtype = "mysql";
+          dbname = "nextcloud";
+          dbuser = "nextcloud";
+          dbhost = "127.0.0.1";
+          dbport = 3306;
+          dbpass = "hunter2";
+          # Don't inherit adminuser since "root" is supposed to be the default
+          inherit adminpass;
+        };
+      };
+
+      services.mysql = {
+        enable = true;
+        bind = "127.0.0.1";
+        package = pkgs.mariadb;
+        initialScript = pkgs.writeText "mysql-init" ''
+          CREATE USER 'nextcloud'@'localhost' IDENTIFIED BY 'hunter2';
+          CREATE DATABASE IF NOT EXISTS nextcloud;
+          GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER,
+            CREATE TEMPORARY TABLES ON nextcloud.* TO 'nextcloud'@'localhost'
+            IDENTIFIED BY 'hunter2';
+          FLUSH privileges;
+        '';
+      };
+
+      systemd.services."nextcloud-setup"= {
+        requires = ["mysql.service"];
+        after = ["mysql.service"];
+      };
+
+      services.memcached.enable = true;
+    };
+  };
+
+  testScript = let
+    configureMemcached = pkgs.writeScript "configure-memcached" ''
+      #!${pkgs.stdenv.shell}
+      nextcloud-occ config:system:set memcached_servers 0 0 --value 127.0.0.1 --type string
+      nextcloud-occ config:system:set memcached_servers 0 1 --value 11211 --type integer
+      nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\APCu' --type string
+      nextcloud-occ config:system:set memcache.distributed --value '\OC\Memcache\Memcached' --type string
+    '';
+    withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+      #!${pkgs.stdenv.shell}
+      export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+      export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+    '';
+    copySharedFile = pkgs.writeScript "copy-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+    '';
+
+    diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+    '';
+  in ''
+    startAll();
+    $nextcloud->waitForUnit("multi-user.target");
+    $nextcloud->succeed("${configureMemcached}");
+    $nextcloud->succeed("curl -sSf http://nextcloud/login");
+    $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+    $client->waitForUnit("multi-user.target");
+    $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+
+  '';
+})
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
new file mode 100644
index 000000000000..0351d4db69ac
--- /dev/null
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -0,0 +1,130 @@
+import ../make-test.nix ({ pkgs, ...}: let
+  adminpass = "hunter2";
+  adminuser = "custom-admin-username";
+in {
+  name = "nextcloud-with-postgresql-and-redis";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eqyiel ];
+  };
+
+  nodes = {
+    # The only thing the client needs to do is download a file.
+    client = { ... }: {};
+
+    nextcloud = { config, pkgs, ... }: {
+      networking.firewall.allowedTCPPorts = [ 80 ];
+
+      services.nextcloud = {
+        enable = true;
+        hostName = "nextcloud";
+        nginx.enable = true;
+        caching = {
+          apcu = false;
+          redis = true;
+          memcached = false;
+        };
+        config = {
+          dbtype = "pgsql";
+          dbname = "nextcloud";
+          dbuser = "nextcloud";
+          dbhost = "localhost";
+          dbpassFile = toString (pkgs.writeText "db-pass-file" ''
+            hunter2
+          '');
+          inherit adminuser;
+          adminpassFile = toString (pkgs.writeText "admin-pass-file" ''
+            ${adminpass}
+          '');
+        };
+      };
+
+      services.redis = {
+        unixSocket = "/var/run/redis/redis.sock";
+        enable = true;
+        extraConfig = ''
+          unixsocketperm 770
+        '';
+      };
+
+      systemd.services.redis = {
+        preStart = ''
+          mkdir -p /var/run/redis
+          chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis
+        '';
+        serviceConfig.PermissionsStartOnly = true;
+      };
+
+      systemd.services."nextcloud-setup"= {
+        requires = ["postgresql.service"];
+        after = [
+          "postgresql.service"
+          "chown-redis-socket.service"
+        ];
+      };
+
+      # At the time of writing, redis creates its socket with the "nobody"
+      # group.  I figure this is slightly less bad than making the socket world
+      # readable.
+      systemd.services."chown-redis-socket" = {
+        enable = true;
+        script = ''
+          until ${pkgs.redis}/bin/redis-cli ping; do
+            echo "waiting for redis..."
+            sleep 1
+          done
+          chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis/redis.sock
+        '';
+        after = [ "redis.service" ];
+        requires = [ "redis.service" ];
+        wantedBy = [ "redis.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+        };
+      };
+
+      services.postgresql = {
+        enable = true;
+        initialScript = pkgs.writeText "psql-init" ''
+          create role nextcloud with login password 'hunter2';
+          create database nextcloud with owner nextcloud;
+        '';
+      };
+    };
+  };
+
+  testScript = let
+    configureRedis = pkgs.writeScript "configure-redis" ''
+      #!${pkgs.stdenv.shell}
+      nextcloud-occ config:system:set redis 'host' --value '/var/run/redis/redis.sock' --type string
+      nextcloud-occ config:system:set redis 'port' --value 0 --type integer
+      nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string
+      nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string
+    '';
+    withRcloneEnv = pkgs.writeScript "with-rclone-env" ''
+      #!${pkgs.stdenv.shell}
+      export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav
+      export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/"
+      export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud"
+      export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}"
+      export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})"
+      "''${@}"
+    '';
+    copySharedFile = pkgs.writeScript "copy-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file
+    '';
+
+    diffSharedFile = pkgs.writeScript "diff-shared-file" ''
+      #!${pkgs.stdenv.shell}
+      diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file)
+    '';
+  in ''
+    startAll();
+    $nextcloud->waitForUnit("multi-user.target");
+    $nextcloud->succeed("${configureRedis}");
+    $nextcloud->succeed("curl -sSf http://nextcloud/login");
+    $nextcloud->succeed("${withRcloneEnv} ${copySharedFile}");
+    $client->waitForUnit("multi-user.target");
+    $client->succeed("${withRcloneEnv} ${diffSharedFile}");
+  '';
+})

From e5b3ea56e1040a4a10141fb822300f502b0a8ba8 Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Sun, 9 Sep 2018 09:21:05 +0930
Subject: [PATCH 2071/3253] nextcloud: 13.0.6 -> 14.0.1

Co-authored-by: Robin Gloster <mail@glob.in>
---
 pkgs/servers/nextcloud/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 8a0a848aa5d6..a0f848da250b 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name= "nextcloud-${version}";
-  version = "13.0.6";
+  name = "nextcloud-${version}";
+  version = "14.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "1m38k5jafz2lniy6fmq17xffkgaqs6rl4w789sqpniva1fb9xz4h";
+    sha256 = "14ymc6fr91735yyc2gqh7c89mbbwsgamhhysf6crp9kp27l83z5a";
   };
 
   installPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Sharing solution for files, calendars, contacts and more";
     homepage = https://nextcloud.com;
-    maintainers = with stdenv.lib.maintainers; [ schneefux bachp ];
+    maintainers = with stdenv.lib.maintainers; [ schneefux bachp globin fpletz ];
     license = stdenv.lib.licenses.agpl3Plus;
     platforms = with stdenv.lib.platforms; unix;
   };

From 1fd6477b35579ae254999128843e28f848cedaaa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Sep 2018 00:59:36 +0200
Subject: [PATCH 2072/3253] nextcloud: fix sendmail path discovery

---
 pkgs/servers/nextcloud/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index a0f848da250b..3b5e46cdb2a8 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "nextcloud-${version}";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "14ymc6fr91735yyc2gqh7c89mbbwsgamhhysf6crp9kp27l83z5a";
   };
 
+  patches = [ (fetchpatch {
+    name = "Mailer-discover-sendmail-path-instead-of-hardcoding-.patch";
+    url = https://github.com/nextcloud/server/pull/11404.patch;
+    sha256 = "1h0cqnfwn735vqrm3yh9nh6a7h6srr9h29p13vywd6rqbcndqjjd";
+  }) ];
+
   installPhase = ''
     mkdir -p $out/
     cp -R . $out/

From e86c84d607a9a1ada80f06d1d0b69ab52ad91e74 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:10:34 +0200
Subject: [PATCH 2073/3253] boringssl: add licenses

---
 pkgs/development/libraries/boringssl/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ff48ffe67f0a..9d65fb554ffe 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
     mv ../include/openssl $out/include
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "https://boringssl.googlesource.com";
-    platforms   = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = platforms.all;
+    maintainers = [ maintainers.thoughtpolice ];
+    license = with licenses; [ openssl isc mit bsd3 ];
   };
 }

From e978d7a9f2a2f65cab54fc321df598ae0c845577 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:15:47 +0200
Subject: [PATCH 2074/3253] cln: add license

---
 pkgs/development/libraries/cln/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index e39386dca3f4..7764e9c67ed2 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "C/C++ library for numbers, a part of GiNaC";
     homepage = http://www.ginac.de/CLN/;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+    license = licenses.gpl2;
+    platforms = platforms.unix; # Once had cygwin problems
   };
 }

From c964f4fc26288b57a09c638b0ed6508c0a50e35d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:19:50 +0200
Subject: [PATCH 2075/3253] clucene: add license

---
 pkgs/development/libraries/clucene-core/2.x.nix     | 5 +++--
 pkgs/development/libraries/clucene-core/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index 0db253bbec26..a14dec370479 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test"
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
       CLucene is a port of the very popular Java Lucene text search engine API.
     '';
     homepage = http://clucene.sourceforge.net;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = with licenses; [ asl20 lgpl2 ];
   };
 }
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index b65e794a92aa..8451b0853729 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc6.patch ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Core library for full-featured text search engine";
     longDescription = ''
       CLucene is a high-performance, scalable, cross platform, full-featured,
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
       CLucene is a port of the very popular Java Lucene text search engine API.
     '';
     homepage = http://clucene.sourceforge.net;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = with licenses; [ asl20 lgpl2 ];
   };
 }

From 796a2584d5b10508672aa1f642841564db5304e6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:22:23 +0200
Subject: [PATCH 2076/3253] cmark: add license

---
 pkgs/development/libraries/cmark/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 81df7e863193..fce02dac950f 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/jgm/cmark;
     maintainers = [ maintainers.michelk ];
     platforms = platforms.unix;
+    license = licenses.bsd2;
   };
 }

From a2046daebd6c7c4d1b38c1c31f557b44114dd507 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:26:18 +0200
Subject: [PATCH 2077/3253] cogl: add licenses

---
 pkgs/development/libraries/cogl/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index c624f9537fb3..085bab6475c2 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -73,6 +73,7 @@ in stdenv.mkDerivation rec {
       render without stepping on each other's toes.
     '';
 
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = platforms.mesaPlatforms;
+    license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ];
   };
 }

From b271fe23110c54648c0e07816539358be634a397 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:27:21 +0200
Subject: [PATCH 2078/3253] ctpl: add license

---
 pkgs/development/libraries/ctpl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index d50aca1679b8..fd81de5139d6 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     description = "Template engine library written in C";
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];
+    license = licenses.gpl3Plus;
   };
 }

From 4faaba0186a87b450b18c9c946bb24456b0dc654 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:29:36 +0200
Subject: [PATCH 2079/3253] ctpp2: add license

---
 pkgs/development/libraries/ctpp2/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 55835cdb63db..5a2a53ef24d5 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high performance templating engine";
     homepage = http://ctpp.havoc.ru;
-    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ maintainers.robbinch ];
+    platforms = platforms.linux;
+    license = licenses.bsd2;
   };
 }

From 63a91653326751964e99b340da006d74981c8713 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:33:34 +0200
Subject: [PATCH 2080/3253] cyrus-sasl: add license

---
 pkgs/development/libraries/cyrus-sasl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 7a9e3991aadb..87752867c350 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
     homepage = http://cyrusimap.web.cmu.edu/;
     description = "Library for adding authentication support to connection-based protocols";
     platforms = platforms.unix;
+    license = licenses.bsdOriginal;
   };
 }

From 70087c5cfb0db3cd85977bbceb2295d1cd5ff9d0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 30 Sep 2018 11:02:17 +0200
Subject: [PATCH 2081/3253] apr: add license

---
 pkgs/development/libraries/apr-util/default.nix | 7 ++++---
 pkgs/development/libraries/apr/default.nix      | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 4e2de01e9adb..fe159afe6854 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -61,10 +61,11 @@ stdenv.mkDerivation rec {
     inherit sslSupport bdbSupport ldapSupport;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://apr.apache.org/;
     description = "A companion library to APR, the Apache Portable Runtime";
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
   };
 }
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 8c31c89947cd..ea84609868cf 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
     platforms = platforms.all;
+    license = licenses.asl20;
     maintainers = [ maintainers.eelco ];
   };
 }

From 8d40083690c2d20d20c32d7d90b9fd7b7f559042 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 11:35:00 -0700
Subject: [PATCH 2082/3253] nixos/stage-2: create empty machine-id at boot

Previously, the activation script was responsible for ensuring that
/etc/machine-id exists. However, the only time it could not already
exist is during stage-2-init, not while switching configurations,
because one of the first things systemd does when starting up as PID 1
is to create this file. So I've moved the initialization to
stage-2-init.

Furthermore, since systemd will do the equivalent of
systemd-machine-id-setup if /etc/machine-id doesn't have valid contents,
we don't need to do that ourselves.

We _do_, however, want to ensure that the file at least exists, because
systemd also uses the non-existence of this file to guess that this is a
first-boot situation. In that case, systemd tries to create some
symlinks in /etc/systemd/system according to its presets, which it can't
do because we've already populated /etc according to the current NixOS
configuration.

This is not necessary for any other activation script snippets, so it's
okay to do it after stage-2-init runs the activation script. None of
them declare a dependency on the "systemd" snippet. Also, most of them
only create files or directories in ways that obviously don't need the
machine-id set.
---
 nixos/modules/system/boot/stage-2-init.sh | 8 ++++++++
 nixos/modules/system/boot/systemd.nix     | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 49764b75a557..03daafa1ce4f 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -152,6 +152,14 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
 @shell@ @postBootCommands@
 
 
+# Ensure systemd doesn't try to populate /etc, by forcing its first-boot
+# heuristic off. It doesn't matter what's in /etc/machine-id for this purpose,
+# and systemd will immediately fill in the file when it starts, so just
+# creating it is enough. This `: >>` pattern avoids forking and avoids changing
+# the mtime if the file already exists.
+: >> /etc/machine-id
+
+
 # Reset the logging file descriptors.
 exec 1>&$logOutFd 2>&$logErrFd
 exec {logOutFd}>&- {logErrFd}>&-
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c96a502a892f..94bbd6180a80 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -787,10 +787,6 @@ in
       ''
         mkdir -m 0755 -p /var/lib/udev
 
-        if ! [ -e /etc/machine-id ]; then
-          ${systemd}/bin/systemd-machine-id-setup
-        fi
-
         # Keep a persistent journal. Note that systemd-tmpfiles will
         # set proper ownership/permissions.
         mkdir -m 0700 -p /var/log/journal

From 89727b3c9a0a3f43524e78997ac9f33e30b9a169 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Sun, 30 Sep 2018 10:56:15 -0700
Subject: [PATCH 2083/3253] plex: 1.13.5.5291 -> 1.13.8.5395

---
 pkgs/servers/plex/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 88a8d0e87071..16070eb5dc5c 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.13.5.5291";
-    vsnHash = "6fa5e50a8";
-    sha256 = "1h0r7hxxw5jf2dn8w4cnj71dm873y2j0l87rg8pf0r3cyx6rhxnx";
+    version = "1.13.8.5395";
+    vsnHash = "10d48da0d";
+    sha256 = "0lpsh87kcrqwi2qqkj1ccb86hif535yb45hhc41c0ixsfxbqk5cw";
   };
 
 in stdenv.mkDerivation rec {
@@ -39,7 +39,6 @@ in stdenv.mkDerivation rec {
     for bin in "Plex Media Server"              \
                "Plex DLNA Server"               \
                "Plex Media Scanner"             \
-               "Plex Media Server Tests"        \
                "Plex Relay"                     \
                "Plex Script Host"               \
                "Plex Transcoder"                \

From 10e865051548f39e8bff205ea09a648c49304d11 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 12:16:45 -0700
Subject: [PATCH 2084/3253] nixos/systemd: let journald create /var/log/journal

The default value for journald's Storage option is "auto", which
determines whether to log to /var/log/journal based on whether that
directory already exists. So NixOS has been unconditionally creating
that directory in activation scripts.

However, we can get the same behavior by configuring journald.conf to
set Storage to "persistent" instead. In that case, journald will create
the directory itself if necessary.
---
 nixos/modules/system/boot/systemd.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 94bbd6180a80..c0d1bd750655 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -747,6 +747,7 @@ in
 
       "systemd/journald.conf".text = ''
         [Journal]
+        Storage=persistent
         RateLimitInterval=${config.services.journald.rateLimitInterval}
         RateLimitBurst=${toString config.services.journald.rateLimitBurst}
         ${optionalString (config.services.journald.console != "") ''
@@ -786,10 +787,6 @@ in
     system.activationScripts.systemd =
       ''
         mkdir -m 0755 -p /var/lib/udev
-
-        # Keep a persistent journal. Note that systemd-tmpfiles will
-        # set proper ownership/permissions.
-        mkdir -m 0700 -p /var/log/journal
       '';
 
     users.users.systemd-network.uid = config.ids.uids.systemd-network;

From bbc0f6f005fa856d914711149838d2f75f9fe41b Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sun, 30 Sep 2018 11:05:47 -0700
Subject: [PATCH 2085/3253] nixos/systemd: don't create /var/lib/udev

As far as I can tell, systemd has never used this directory, so I think
this is a holdover from before udev merged into systemd.
---
 nixos/modules/system/boot/systemd.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c0d1bd750655..f1b8878d04e1 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -784,11 +784,6 @@ in
 
     services.dbus.enable = true;
 
-    system.activationScripts.systemd =
-      ''
-        mkdir -m 0755 -p /var/lib/udev
-      '';
-
     users.users.systemd-network.uid = config.ids.uids.systemd-network;
     users.groups.systemd-network.gid = config.ids.gids.systemd-network;
     users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve;

From ae3d3b0fffe4827a7f126368e01fd8c2c8a4c7fe Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 12:28:54 -0700
Subject: [PATCH 2086/3253] nixos/polkit: use tmpfiles to clean old dirs

These don't need to get cleaned up during activation; that can wait
until systemd-tmpfiles-setup runs.
---
 nixos/modules/security/polkit.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 04685f2c9ea1..7f1de81d5b70 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -88,11 +88,11 @@ in
       "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
     };
 
-    system.activationScripts.polkit =
-      ''
-        # Probably no more needed, clean up
-        rm -rf /var/lib/{polkit-1,PolicyKit}
-      '';
+    systemd.tmpfiles.rules = [
+      # Probably no more needed, clean up
+      "R /var/lib/polkit-1"
+      "R /var/lib/PolicyKit"
+    ];
 
     users.users.polkituser = {
       description = "PolKit daemon";

From dab5c632bd2664555292665192cd9f096b5c5bcf Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 18:02:49 -0700
Subject: [PATCH 2087/3253] nixos/activation: don't create /run/nix

Nix 2.0 no longer uses these directories.

/run/nix/current-load was moved to /nix/var/nix/current-load in 2017
(Nix commit d7653dfc6dea076ecbe00520c6137977e0fced35). Anyway,
src/build-remote/build-remote.cc will create the current-load directory
if it doesn't exist already.

/run/nix/remote-stores seems to have been deprecated since 2014 (Nix
commit b1af336132cfe8a6e4c54912cc512f8c28d4ebf3) when the documentation
for $NIX_OTHER_STORES was removed, and support for it was dropped
entirely in 2016 (Nix commit 4494000e04122f24558e1436e66d20d89028b4bd).
---
 nixos/modules/system/activation/activation-script.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 93a1b13a81dd..b74153885318 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -128,9 +128,6 @@ in
       ''
         # Various log/runtime directories.
 
-        mkdir -m 0755 -p /run/nix/current-load # for distributed builds
-        mkdir -m 0700 -p /run/nix/remote-stores
-
         mkdir -m 0755 -p /var/log
 
         touch /var/log/wtmp /var/log/lastlog # must exist

From 188bdfb95d7218b931f7d605ad0a5e6961dc3a34 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 22:52:27 -0700
Subject: [PATCH 2088/3253] nixos/opengl: create /run/opengl-driver using
 tmpfiles.d

Anything that uses OpenGL starts after sysinit.target, so
systemd-tmpfiles runs before anything that needs these symlinks.
---
 nixos/modules/hardware/opengl.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index b371af353cf9..46d06d71333a 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -129,17 +129,17 @@ in
       message = "Option driSupport32Bit only makes sense on a 64-bit system.";
     };
 
-    system.activationScripts.setup-opengl =
-      ''
-        ln -sfn ${package} /run/opengl-driver
-        ${if pkgs.stdenv.isi686 then ''
-          ln -sfn opengl-driver /run/opengl-driver-32
-        '' else if cfg.driSupport32Bit then ''
-          ln -sfn ${package32} /run/opengl-driver-32
-        '' else ''
-          rm -f /run/opengl-driver-32
-        ''}
-      '';
+    systemd.tmpfiles.rules = [
+      "L+ /run/opengl-driver - - - - ${package}"
+      (
+        if pkgs.stdenv.isi686 then
+          "L+ /run/opengl-driver-32 - - - - opengl-driver"
+        else if cfg.driSupport32Bit then
+          "L+ /run/opengl-driver-32 - - - - ${package32}"
+        else
+          "r /run/opengl-driver-32"
+      )
+    ];
 
     environment.sessionVariables.LD_LIBRARY_PATH =
       [ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib";

From b63f65aea0dea11c20e9299210af1d2ee4299b58 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Sat, 29 Sep 2018 23:30:02 -0700
Subject: [PATCH 2089/3253] nixos/pam: create wtmp/lastlog iff using
 pam_lastlog

I think pam_lastlog is the only thing that writes to these files in
practice on a modern Linux system, so in a configuration that doesn't
use that module, we don't need to create these files.

I used tmpfiles.d instead of activation snippets to create the logs.
It's good enough for upstream and other distros; it's probably good
enough for us.
---
 nixos/modules/security/pam.nix                        | 7 +++++++
 nixos/modules/system/activation/activation-script.nix | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index bef10b4fe614..926c6d77d3bb 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -548,6 +548,13 @@ in
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
 
+    systemd.tmpfiles.rules = optionals
+      (any (s: s.updateWtmp) (attrValues config.security.pam.services))
+      [
+        "f /var/log/wtmp"
+        "f /var/log/lastlog"
+      ];
+
     security.pam.services =
       { other.text =
           ''
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index b74153885318..cd6dc1fb8201 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -128,11 +128,6 @@ in
       ''
         # Various log/runtime directories.
 
-        mkdir -m 0755 -p /var/log
-
-        touch /var/log/wtmp /var/log/lastlog # must exist
-        chmod 644 /var/log/wtmp /var/log/lastlog
-
         mkdir -m 1777 -p /var/tmp
 
         # Empty, immutable home directory of many system accounts.

From ef0b280751aa451e22d70212723973f2d76778b2 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Sun, 30 Sep 2018 11:13:25 -0700
Subject: [PATCH 2090/3253] plex: allow the dataDir to contain spaces by
 quoting the path

---
 pkgs/servers/plex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 16070eb5dc5c..f0f89c3f0fa0 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
     RSC=$out/usr/lib/plexmediaserver/Resources
     for db in "com.plexapp.plugins.library.db"; do
         mv $RSC/$db $RSC/base_$db
-        ln -s ${dataDir}/.skeleton/$db $RSC/$db
+        ln -s "${dataDir}/.skeleton/$db" $RSC/$db
     done
   '';
 

From 61007c0e96681a6f6518eac5bccf0e8271a9a55f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 30 Sep 2018 19:15:01 +0000
Subject: [PATCH 2091/3253] language_subtag_registry: fix hash (#47555)

---
 pkgs/development/libraries/liblangtag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 8ebfa53b7d13..d57d75c5cae7 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   language_subtag_registry = fetchurl {
     url = "http://www.iana.org/assignments/language-subtag-registry";
-    sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b";
+    sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm";
   };
 
   postPatch = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias''
   ];
 
-  buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common 
+  buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common
     unzip ];
   nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ];
 

From 49dcf7be625ea919d3201dc4d78207f258b903ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Sun, 30 Sep 2018 21:19:05 +0200
Subject: [PATCH 2092/3253] pythonPackages.py-cpuinfo: Fix darwin build
 (#47558)

---
 .../development/python-modules/py-cpuinfo/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index 37cf601695ee..c90f81ae28f8 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -1,6 +1,7 @@
 { lib
 , fetchFromGitHub
 , buildPythonPackage
+, pytest
 }:
 
 buildPythonPackage rec {
@@ -14,6 +15,16 @@ buildPythonPackage rec {
      sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm";
   };
 
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    pytest -k "not TestActual"
+    runHook postCheck
+  '';
+
   meta = {
     description = "Get CPU info with pure Python 2 & 3";
     homepage = https://github.com/workhorsy/py-cpuinfo;

From f80730d903de30dba25140bd845b1b34e4a1b386 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sun, 30 Sep 2018 20:07:36 +0000
Subject: [PATCH 2093/3253] gdal: 2.3.1 -> 2.3.2

---
 pkgs/development/libraries/gdal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index f6d8cd6fa4c2..1fe3bcf6cede 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gdal-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
-    sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw";
+    sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite

From c126510809c158477690118048bbde7cd83c174b Mon Sep 17 00:00:00 2001
From: bitmappergit <30481775+bitmappergit@users.noreply.github.com>
Date: Sun, 30 Sep 2018 21:44:06 +0000
Subject: [PATCH 2094/3253] dart: 1.24.3 -> 2.0.0 (#46533)

* dart: 1.24.3 -> 2.0.0

Updated Dart SDK links to 2.0.0.

* dart: 1.24.3 -> 2.0.0

Updated Dart SDK link to 2.0.0.

* dart: 1.24.3 -> 2.0.0

Updated Dart SDK versions in all-packages.nix. Added missing double quote.
---
 pkgs/development/interpreters/dart/default.nix | 10 +++++++++-
 pkgs/top-level/all-packages.nix                |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 4c697ec4e802..fa8996f0fb56 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
+{ stdenv, fetchurl, unzip, version ? "2.0.0" }:
 
 let
 
@@ -25,6 +25,14 @@ let
       url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
       sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528";
     };
+    "2.0.0-x86_64-linux" = fetchurl {
+      url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
+      sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336";
+    };
+    "2.0.0-i686-linux" = fetchurl {
+      url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
+      sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba";
+    };
     "2.0.0-dev.26.0-x86_64-linux" = fetchurl {
       url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip";
       sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1b54b6671b0..5e27fa25a648 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22383,8 +22383,8 @@ with pkgs;
   spdlog = spdlog_1;
 
   dart = callPackage ../development/interpreters/dart { };
-  dart_stable = dart.override { version = "1.24.3"; };
-  dart_old = dart.override { version = "1.16.1"; };
+  dart_stable = dart.override { version = "2.0.0"; };
+  dart_old = dart.override { version = "1.24.3"; };
   dart_dev = dart.override { version = "2.0.0-dev.26.0"; };
 
   httrack = callPackage ../tools/backup/httrack { };

From 90161af7fb2d0d4327ee2c7562f3f3035a288a5d Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Mon, 1 Oct 2018 01:04:52 +0300
Subject: [PATCH 2095/3253] i3status-rust: 0.9.0.2018-06-22 -> 0.9.0.2018-09-30
 (#47566)

---
 pkgs/applications/window-managers/i3/status-rust.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 11b7c49f5ebe..366657b8827e 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "i3status-rust-${version}";
-  version = "0.9.0.2018-06-22";
+  version = "0.9.0.2018-09-30";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = "i3status-rust";
-    rev = "fdca01e88a7ce9bf4de0f58a922de5131e33dd00";
-    sha256 = "12dfvamf9a13b3fa7mqrwhjk3rl53463h03arqd8pvbch006hhqd";
+    rev = "82ea033250c3fc51a112ac68c389da5264840492";
+    sha256 = "06r1nnv3a5vq3s17rgavq639wrq09z0nd2ck50bj1c8i2ggkpvq9";
   };
 
-  cargoSha256 = "01pwknfzkv49cip6asqd4pzkh9l42v06abyd9lb09ip5pkcs60lq";
+  cargoSha256 = "02in0hz2kgbmrd8i8s21vbm9pgfnn4axcji5f2a14pha6lx5rnvv";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 12ed9dfd25ceb80fbddea56fb2a6622997682a5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 30 Sep 2018 15:09:03 -0700
Subject: [PATCH 2096/3253] gcalcli: 3.4.0 -> 4.0.0a4 (#47068)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gcalcli/versions
---
 pkgs/applications/misc/gcalcli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 6a7a7ae604de..25ea9ef06b84 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -33,14 +33,14 @@ let
   };
 
 in with py.pkgs; buildPythonApplication rec {
-  version = "3.4.0";
+  version = "4.0.0a4";
   name = "gcalcli-${version}";
 
   src = fetchFromGitHub {
     owner  = "insanum";
     repo   = "gcalcli";
     rev    = "v${version}";
-    sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
+    sha256 = "00giq5cdigidzv5bz4wgzi1yp6xlf2rdcy6ynmsc6bcf0cl5x64d";
   };
 
   propagatedBuildInputs = [
@@ -55,7 +55,7 @@ in with py.pkgs; buildPythonApplication rec {
       "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
   '';
 
-  # There are no tests as of 3.4.0
+  # There are no tests as of 4.0.0a4
   doCheck = false;
 
   meta = with lib; {

From bf4609404009120701236334f02cfd066597ca1e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 30 Sep 2018 19:45:19 -0400
Subject: [PATCH 2097/3253] linux: 4.19-rc5 -> 4.19-rc6

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4b6be2556637..cabaa59966c1 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc5";
-  modDirVersion = "4.19.0-rc5";
+  version = "4.19-rc6";
+  modDirVersion = "4.19.0-rc6";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0fpv2g6x1hgdrxvh1acjcxmyk2fzqcx1ypi0mqw72swbm587irck";
+    sha256 = "0cq0xr4lwvngyiyall62hddbk27gy72zjiigb8xdsry96a8ccvgl";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 73cabebdd19aed51f50049f9b60b1ad18e65cc39 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 15 Jul 2018 08:32:53 +0000
Subject: [PATCH 2098/3253] xpra.xf86videodummy: init at 0.3.8

---
 pkgs/tools/X11/xpra/default.nix               | 11 ++-
 .../xf86videodummy/0002-Constant-DPI.patch    | 96 +++++++++++++++++++
 .../0003-fix-pointer-limits.patch             | 39 ++++++++
 ...ort-for-30-bit-depth-in-dummy-driver.patch | 41 ++++++++
 .../tools/X11/xpra/xf86videodummy/default.nix | 32 +++++++
 5 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
 create mode 100644 pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
 create mode 100644 pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
 create mode 100644 pkgs/tools/X11/xpra/xf86videodummy/default.nix

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 23270793b34e..915144daa908 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, python2Packages, pkgconfig
+{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig
 , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
 , makeWrapper, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg, x264, libvpx, libwebp
@@ -10,12 +10,14 @@ with lib;
 
 let
   inherit (python2Packages) cython buildPythonApplication;
+
+  xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
-  name = "xpra-${version}";
+  pname = "xpra";
   version = "2.3.3";
 
   src = fetchurl {
-    url = "https://xpra.org/src/${name}.tar.xz";
+    url = "https://xpra.org/src/${pname}-${version}.tar.xz";
     sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01";
   };
 
@@ -73,6 +75,7 @@ in buildPythonApplication rec {
   #  sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
   #'';
 
+  passthru = { inherit xf86videodummy; };
 
   meta = {
     homepage = http://xpra.org/;
@@ -80,7 +83,7 @@ in buildPythonApplication rec {
     downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
     description = "Persistent remote applications for X";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ tstrobel offline ];
     license = licenses.gpl2;
+    maintainers = with maintainers; [ tstrobel offline numinit ];
   };
 }
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
new file mode 100644
index 000000000000..f91e53d1e493
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch
@@ -0,0 +1,96 @@
+--- a/src/dummy.h	2016-12-17 23:02:53.396287041 +0100
++++ b/src/dummy.h	2016-12-17 23:03:30.319616550 +0100
+@@ -51,6 +51,7 @@
+     /* options */
+     OptionInfoPtr Options;
+     Bool swCursor;
++    Bool constantDPI;
+     /* proc pointer */
+     CloseScreenProcPtr CloseScreen;
+     xf86CursorInfoPtr CursorInfo;
+--- a/src/dummy_driver.c	2016-12-14 21:54:20.000000000 +0100
++++ b/src/dummy_driver.c	2016-12-17 23:04:59.916416126 +0100
+@@ -17,6 +17,12 @@
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
++#ifdef RANDR
++#include "randrstr.h"
++#endif
++
++#include "windowstr.h"
++
+ /* identifying atom needed by magnifiers */
+ #include <X11/Xatom.h>
+ #include "property.h"
+@@ -115,11 +121,15 @@
+ };
+ 
+ typedef enum {
+-    OPTION_SW_CURSOR
++    OPTION_SW_CURSOR,
++    OPTION_CONSTANT_DPI
+ } DUMMYOpts;
+ 
+ static const OptionInfoRec DUMMYOptions[] = {
+     { OPTION_SW_CURSOR,	"SWcursor",	OPTV_BOOLEAN,	{0}, FALSE },
++#ifdef RANDR
++    { OPTION_CONSTANT_DPI,	"ConstantDPI",	OPTV_BOOLEAN,	{0}, FALSE },
++#endif
+     { -1,                  NULL,           OPTV_NONE,	{0}, FALSE }
+ };
+ 
+@@ -359,6 +369,7 @@
+     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, dPtr->Options);
+ 
+     xf86GetOptValBool(dPtr->Options, OPTION_SW_CURSOR,&dPtr->swCursor);
++    xf86GetOptValBool(dPtr->Options, OPTION_CONSTANT_DPI, &dPtr->constantDPI);
+ 
+     if (device->videoRam != 0) {
+ 	pScrn->videoRam = device->videoRam;
+@@ -639,10 +650,45 @@
+     return TRUE;
+ }
+ 
++const char *XDPY_PROPERTY = "dummy-constant-xdpi";
++const char *YDPY_PROPERTY = "dummy-constant-ydpi";
++static int get_dpi_value(WindowPtr root, const char *property_name, int default_dpi)
++{
++    PropertyPtr prop;
++    Atom type_atom = MakeAtom("CARDINAL", 8, TRUE);
++    Atom prop_atom = MakeAtom(property_name, strlen(property_name), FALSE);
++
++    for (prop = wUserProps(root); prop; prop = prop->next) {
++       if (prop->propertyName == prop_atom && prop->type == type_atom && prop->data) {
++           int v = (int) (*((CARD32 *) prop->data));
++           if ((v>0) && (v<4096)) {
++               xf86DrvMsg(0, X_INFO, "get_constant_dpi_value() found property \"%s\" with value=%i\n", property_name, (int) v);
++               return (int) v;
++           }
++           break;
++       }
++    }
++    return default_dpi;
++}
++
+ /* Mandatory */
+ Bool
+ DUMMYSwitchMode(SWITCH_MODE_ARGS_DECL)
+ {
++    SCRN_INFO_PTR(arg);
++#ifdef RANDR
++    DUMMYPtr dPtr = DUMMYPTR(pScrn);
++    if (dPtr->constantDPI) {
++        int xDpi = get_dpi_value(pScrn->pScreen->root, XDPY_PROPERTY, pScrn->xDpi);
++        int yDpi = get_dpi_value(pScrn->pScreen->root, YDPY_PROPERTY, pScrn->yDpi);
++        //25.4 mm per inch: (254/10)
++        pScrn->pScreen->mmWidth = mode->HDisplay * 254 / xDpi / 10;
++        pScrn->pScreen->mmHeight = mode->VDisplay * 254 / yDpi / 10;
++        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mm(dpi %ix%i)=%ix%i\n", xDpi, yDpi, pScrn->pScreen->mmWidth, pScrn->pScreen->mmHeight);
++        RRScreenSizeNotify(pScrn->pScreen);
++        RRTellChanged(pScrn->pScreen);
++    }
++#endif
+     return TRUE;
+ }
+ 
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
new file mode 100644
index 000000000000..3dbb6fd179ff
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch
@@ -0,0 +1,39 @@
+--- xf86-video-dummy-0.3.6/src/dummy_driver.c	2014-11-05 19:24:02.668656601 +0700
++++ xf86-video-dummy-0.3.6.new/src/dummy_driver.c	2014-11-05 19:37:53.076061853 +0700
+@@ -55,6 +55,9 @@
+ #include <X11/extensions/xf86dgaproto.h>
+ #endif
+ 
++/* Needed for fixing pointer limits on resize */
++#include "inputstr.h"
++
+ /* Mandatory functions */
+ static const OptionInfoRec *	DUMMYAvailableOptions(int chipid, int busid);
+ static void     DUMMYIdentify(int flags);
+@@ -713,6 +716,26 @@
+         RRTellChanged(pScrn->pScreen);
+     }
+ #endif
++    //ensure the screen dimensions are also updated:
++    pScrn->pScreen->width = mode->HDisplay;
++    pScrn->pScreen->height = mode->VDisplay;
++    pScrn->virtualX = mode->HDisplay;
++    pScrn->virtualY = mode->VDisplay;
++    pScrn->frameX1 = mode->HDisplay;
++    pScrn->frameY1 = mode->VDisplay;
++
++    //ensure the pointer uses the new limits too:
++    DeviceIntPtr pDev;
++    SpritePtr pSprite;
++    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
++        if (pDev->spriteInfo!=NULL && pDev->spriteInfo->sprite!=NULL) {
++            pSprite = pDev->spriteInfo->sprite;
++            pSprite->hotLimits.x2 = mode->HDisplay;
++            pSprite->hotLimits.y2 = mode->VDisplay;
++            pSprite->physLimits.x2 = mode->HDisplay;
++            pSprite->physLimits.y2 = mode->VDisplay;
++        }
++    }
+     return TRUE;
+ }
+ 
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
new file mode 100644
index 000000000000..567db3fc3865
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch
@@ -0,0 +1,41 @@
+--- a/src/dummy.h	2016-12-17 23:33:33.279533389 +0100
++++ b/src/dummy.h	2016-12-17 23:33:56.695739166 +0100
+@@ -69,7 +69,7 @@
+     int overlay_offset;
+     int videoKey;
+     int interlace;
+-    dummy_colors colors[256];
++    dummy_colors colors[1024];
+     pointer* FBBase;
+     Bool        (*CreateWindow)() ;     /* wrapped CreateWindow */
+     Bool prop;
+--- a/src/dummy_driver.c	2016-12-17 23:33:47.446657886 +0100
++++ b/src/dummy_driver.c	2016-12-17 23:33:56.696739175 +0100
+@@ -317,6 +317,7 @@
+ 	case 15:
+ 	case 16:
+ 	case 24:
++        case 30:
+ 	    break;
+ 	default:
+ 	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+@@ -331,8 +332,8 @@
+ 	pScrn->rgbBits = 8;
+ 
+     /* Get the depth24 pixmap format */
+-    if (pScrn->depth == 24 && pix24bpp == 0)
+-	pix24bpp = xf86GetBppFromDepth(pScrn, 24);
++    if (pScrn->depth >= 24 && pix24bpp == 0)
++	pix24bpp = xf86GetBppFromDepth(pScrn, pScrn->depth);
+ 
+     /*
+      * This must happen after pScrn->display has been set because
+@@ -623,7 +624,7 @@
+     if(!miCreateDefColormap(pScreen))
+ 	return FALSE;
+ 
+-    if (!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++    if (!xf86HandleColormaps(pScreen, 1024, pScrn->rgbBits,
+                          DUMMYLoadPalette, NULL, 
+                          CMAP_PALETTED_TRUECOLOR 
+ 			     | CMAP_RELOAD_ON_MODE_SWITCH))
diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix
new file mode 100644
index 000000000000..ab786d9bce84
--- /dev/null
+++ b/pkgs/tools/X11/xpra/xf86videodummy/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchurl
+, fontsproto, randrproto, renderproto, videoproto, xf86dgaproto, xorgserver, xproto
+, pkgconfig
+, xpra }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  version = "0.3.8";
+  suffix = "1";
+  name = "xpra-xf86videodummy-${version}-${suffix}";
+  builder = ../../../../servers/x11/xorg/builder.sh;
+  src = fetchurl {
+    url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2";
+    sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
+  };
+  patches = [
+    ./0002-Constant-DPI.patch
+    ./0003-fix-pointer-limits.patch
+    ./0005-support-for-30-bit-depth-in-dummy-driver.patch
+  ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+
+  meta = {
+    description = "Dummy driver for Xorg with xpra patches";
+    homepage = https://xpra.org/trac/wiki/Xdummy;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ numinit ];
+  };
+}

From d3ada967ae08de0642169b29f93b935b082c7141 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 30 Sep 2018 13:42:17 +0800
Subject: [PATCH 2099/3253] snipes: init at 20180930

---
 pkgs/games/snipes/default.nix   | 45 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/snipes/default.nix

diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix
new file mode 100644
index 000000000000..e8d915dd31a5
--- /dev/null
+++ b/pkgs/games/snipes/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, fetchurl, SDL2, SDL2_ttf }:
+
+let
+  font = fetchurl {
+    url    = "http://kingbird.myphotos.cc/ee22d44076adb8a34d8e20df4be3730a/SnipesConsole.ttf";
+    sha256 = "06n8gq18js0bv4svx84ljzhs9zmi81wy0zqcqj3b4g0rsrkr20a7";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "snipes-${version}";
+  version = "20180930";
+
+  src = fetchFromGitHub {
+    owner  = "Davidebyzero";
+    repo   = "Snipes";
+    rev    = "343e14104b7848eb1f882401888e685b7918ef9f";
+    sha256 = "1rl70d5miak34warbwfv27z11vln4lvf7maqqc78z0gdc5zivdv2";
+  };
+
+  postPatch = ''
+    substitute config-sample.h config.h \
+      --replace SnipesConsole.ttf $out/share/snipes/SnipesConsole.ttf
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ SDL2 SDL2_ttf ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin snipes
+    install -Dm644 -t $out/share/doc/snipes *.md
+    install -Dm644 ${font} $out/share/snipes/SnipesConsole.ttf
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Modern port of the classic 1982 text-mode game Snipes";
+    homepage    = https://www.vogons.org/viewtopic.php?f=7&t=49073;
+    license     = licenses.free; # This reverse-engineered source code is released with the original authors' permission.
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b8b440e6bb7..a6b967fa568a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1512,6 +1512,8 @@ with pkgs;
 
   simg2img = callPackage ../tools/filesystems/simg2img { };
 
+  snipes = callPackage ../games/snipes { };
+
   socklog = callPackage ../tools/system/socklog { };
 
   staccato = callPackage ../tools/text/staccato { };
@@ -1537,7 +1539,7 @@ with pkgs;
   riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
     conf = config.riot-web.conf or null;
   };
-  
+
   roundcube = callPackage ../servers/roundcube { };
 
   rsbep = callPackage ../tools/backup/rsbep { };

From c78cda2a1a882ef6f4b747a79e6e4cff7686e72d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Sep 2018 06:11:56 -0500
Subject: [PATCH 2100/3253] light: 1.1.2 -> 1.2, use new udev support instead
 of setuid wrapper.

---
 nixos/modules/programs/light.nix         |  4 ++--
 pkgs/os-specific/linux/light/default.nix | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 6f8c389acc97..93bfda481fea 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -13,7 +13,7 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether to install Light backlight control with setuid wrapper.
+          Whether to install Light backlight control command and udev rules.
         '';
       };
     };
@@ -21,6 +21,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.light ];
-    security.wrappers.light.source = "${pkgs.light.out}/bin/light";
+    services.udev.packages = [ pkgs.light ];
   };
 }
diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index d500019c50b4..1856c8861cc4 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchFromGitHub, help2man }:
+{ stdenv, fetchFromGitHub, autoreconfHook, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
+  version = "1.2";
   name = "light-${version}";
   src = fetchFromGitHub {
     owner = "haikarainen";
     repo = "light";
-    rev = version;
-    sha256 = "0c934gxav9cgdf94li6dp0rfqmpday9d33vdn9xb2mfp4war9n4w";
+    rev = "v${version}";
+    sha256 = "1h286va0r1xgxlnxfaaarrj3qhxmjjsivfn3khwm0wq1mhkfihra";
   };
 
-  buildInputs = [ help2man ];
+  configureFlags = [ "--with-udev" ];
 
-  installPhase = "mkdir -p $out/bin; cp light $out/bin/";
+  nativeBuildInputs = [ autoreconfHook ];
 
-  preFixup = "make man; mkdir -p $out/man/man1; mv light.1.gz $out/man/man1";
+  # ensure udev rules can find the commands used
+  postPatch = ''
+    substituteInPlace 90-backlight.rules \
+      --replace '/bin/chgrp' '${coreutils}/bin/chgrp' \
+      --replace '/bin/chmod' '${coreutils}/bin/chmod'
+  '';
 
   meta = {
     description = "GNU/Linux application to control backlights";
     homepage = https://haikarainen.github.io/light/;
     license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
+    maintainers = with stdenv.lib.maintainers; [ puffnfresh dtzWill ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 5cc251df89d0396202a4bf3fba8a3a133485265c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Sep 2018 21:16:56 -0500
Subject: [PATCH 2101/3253] light: user needs to be in the 'video' group

---
 nixos/modules/programs/light.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 93bfda481fea..9f2a03e7e763 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -13,7 +13,8 @@ in
         default = false;
         type = types.bool;
         description = ''
-          Whether to install Light backlight control command and udev rules.
+          Whether to install Light backlight control command
+          and udev rules granting access to members of the "video" group.
         '';
       };
     };

From b5c69bca37b667eb493be7bc9372a1a843ded053 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 1 Oct 2018 11:37:47 +0800
Subject: [PATCH 2102/3253] emacs: magithub and magit-svn require git

---
 .../editors/emacs-modes/melpa-packages.nix           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index addae2674684..0e5a0a9ec7f8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -146,6 +146,18 @@ self:
           (attrs.nativeBuildInputs or []) ++ [ external.git ];
       });
 
+      magithub = super.magithub.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
+      magit-svn = super.magit-svn.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       magit-todos = super.magit-todos.overrideAttrs (attrs: {
         # searches for Git at build time
         nativeBuildInputs =

From 396320cab710c0045d0860ee1cff586c15a86c14 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 29 Sep 2018 03:37:03 +0200
Subject: [PATCH 2103/3253] csa: init at 0.5.100810

---
 pkgs/applications/audio/csa/default.nix | 28 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/csa/default.nix

diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix
new file mode 100644
index 000000000000..c3b3b9441357
--- /dev/null
+++ b/pkgs/applications/audio/csa/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "csa-${version}";
+  version = "0.5.100810";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/csa/${name}.tar.gz";
+    sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
+  };
+
+  # after running either cellular leveler mono or stereo, the other stops working,
+  # so we remove one of them:
+  postInstall = "rm $out/lib/ladspa/celllm_3890.*";
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/projects/csa/;
+    description = "A group of LADSPA Audio plugins for FM broadcast and more";
+    longDescription = ''
+      CSA means : Contrôle Signal Audio.
+      It contains the following plugins:
+      Emphazised Limiter, Cellular Leveler, Simple right/left amplifier. Blind Peak Meter.
+    '';
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c0ea7c7ad2d..6d12efcb99ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1537,7 +1537,7 @@ with pkgs;
   riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
     conf = config.riot-web.conf or null;
   };
-  
+
   roundcube = callPackage ../servers/roundcube { };
 
   rsbep = callPackage ../tools/backup/rsbep { };
@@ -15844,6 +15844,8 @@ with pkgs;
     inherit (gnome2) libgnomeui GConf;
   };
 
+  csa = callPackage ../applications/audio/csa { };
+
   csound = callPackage ../applications/audio/csound { };
 
   cinepaint = callPackage ../applications/graphics/cinepaint {

From 285800d5371d9f7613e8c8c6031aea4a957757c9 Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Mon, 1 Oct 2018 01:50:07 -0400
Subject: [PATCH 2104/3253] vscode-extensions.ms-python.python: 2018.7.0 ->
 2018.8.0 (#47572)

---
 pkgs/misc/vscode-extensions/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index f08181d9068c..db6826b2d7e8 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2018.7.0";
-    sha256 = "0ab6ce722b23274a8f70d156f55d02123dd3b686397b11d4eec0831ec69dbec5";
+    version = "2018.8.0";
+    sha256 = "1x1wkqbc0d6h5w2m5qczv6gd5j6yrzhwp0c6wk49bhg2l0ibvyx6";
   };
 
   postPatch = ''

From 4c95508641fe780efe41885366e03339b95d04fb Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Mon, 1 Oct 2018 01:51:04 -0400
Subject: [PATCH 2105/3253] vscode-extensions.ms-vscode.cpptools: 0.17.6 ->
 0.19.0 (#47573)

---
 pkgs/misc/vscode-extensions/cpptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index 5bc1dddeab8e..e3463246ab2c 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -67,8 +67,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.17.6";
-    sha256 = "2625be8b922ffc199e1c776f784d39b6e004523212f7956c93ae40f9040ce6d5";
+    version = "0.19.0";
+    sha256 = "1x97mz859bzr4gxy6cnqgd8qmvnrjn9zdxh457slsxsk4wqcfmgj";
   };
 
   buildInputs = [

From 6b68e6dabdd93b7c5f71d126eb6c946af3af9aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Oct 2018 07:31:21 +0100
Subject: [PATCH 2106/3253] nixos/doc: mention light module change in release
 notes

---
 nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 1f26d4765b97..7a393edb8fbc 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -105,6 +105,14 @@
      <varname>rabbitmq-server</varname>.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       The <literal>light</literal> module no longer use setuids binary, but
+       udev rules. As a consequence users of that module have to belong to the
+       <literal>video</literal> group in order to use the executable
+       (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 3ac175e61fd1048008e95b814579c3d1bec8bf9c Mon Sep 17 00:00:00 2001
From: rys ostrovid <nek0@chelnok.de>
Date: Mon, 1 Oct 2018 09:09:28 +0200
Subject: [PATCH 2107/3253] EmptyEpsilon: fix version numbering (#47546)

---
 pkgs/games/empty-epsilon/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index bf3b16dc9a40..fcefc5989b0e 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -2,7 +2,11 @@
 
 let
 
-  version = "2018.02.15";
+  major = "2018";
+  minor = "02";
+  patch = "15";
+
+  version = "${major}.${minor}.${patch}";
 
   serious-proton = stdenv.mkDerivation rec {
     name = "serious-proton-${version}";
@@ -46,6 +50,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DSERIOUS_PROTON_DIR=${serious-proton.src}"
+    "-DCPACK_PACKAGE_VERSION=${version}"
+    "-DCPACK_PACKAGE_VERSION_MAJOR=${major}"
+    "-DCPACK_PACKAGE_VERSION_MINOR=${minor}"
+    "-DCPACK_PACKAGE_VERSION_PATCH=${patch}"
   ];
 
   meta = with lib; {

From b256df49375add87b0ec5ddd82092e0e2ff45aac Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 1 Oct 2018 09:51:52 +0200
Subject: [PATCH 2108/3253] dockerTools: Use nix instead of nixUnstable

---
 pkgs/build-support/docker/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 73639a521b6a..2d6d6c1fc91d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -10,7 +10,7 @@
   lib,
   pkgs,
   pigz,
-  nixUnstable,
+  nix,
   perl,
   runCommand,
   rsync,
@@ -262,7 +262,7 @@ rec {
     '';
 
   nixRegistration = contents: runCommand "nix-registration" {
-    buildInputs = [ nixUnstable perl ];
+    buildInputs = [ nix perl ];
     # For obtaining the closure of `contents'.
     exportReferencesGraph =
       let contentsList = if builtins.isList contents then contents else [ contents ];
@@ -803,7 +803,7 @@ rec {
         echo "         be better to only have one layer that contains a nix store."
         # This requires Nix 1.12 or higher
         export NIX_REMOTE=local?root=$PWD
-        ${nixUnstable}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump
+        ${nix}/bin/nix-store --load-db < ${nixRegistration contents}/db.dump
 
         # We fill the store in order to run the 'verify' command that
         # generates hash and size of output paths.
@@ -814,7 +814,7 @@ rec {
         storePaths=$(cat ${nixRegistration contents}/storePaths)
         echo "Copying everything to /nix/store (will take a while)..."
         cp -prd $storePaths nix/store/
-        ${nixUnstable}/bin/nix-store --verify --check-contents
+        ${nix}/bin/nix-store --verify --check-contents
 
         mkdir -p nix/var/nix/gcroots/docker/
         for i in ${lib.concatStringsSep " " contents}; do

From 89b618771ad4b0cfdb874dee3d51eb267c4257dd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 1 Oct 2018 17:01:24 +0800
Subject: [PATCH 2109/3253] emacs: fix egg dependency on git

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 0e5a0a9ec7f8..777d8e62541d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -59,8 +59,11 @@ self:
         inherit (self.melpaPackages) easy-kill;
       };
 
-      # missing git
-      egg = markBroken super.egg;
+      egg = super.egg.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
 
       # upstream issue: missing file header
       elmine = markBroken super.elmine;

From 6d90961e6955991b9492e0c80c5fd857419cdd53 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 1 Oct 2018 17:15:00 +0800
Subject: [PATCH 2110/3253] plantuml: 1.2018.10 -> 1.2018.11

---
 pkgs/tools/misc/plantuml/default.nix | 31 +++++++++++++---------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 08df665aede6..b3ceb41191de 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,37 +1,34 @@
-{ stdenv, fetchurl, jre, graphviz }:
+{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2018.10";
+  version = "1.2018.11";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs";
+    sha256 = "006bpxz6zsjypxscxbnz3b7icg47bfwcq1v7rvijflchw12hq9nm";
   };
 
-  # It's only a .jar file and a shell wrapper
-  phases = [ "installPhase" ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mkdir -p "$out/lib"
+  buildCommand = ''
+    install -Dm644 $src $out/lib/plantuml.jar
 
-    cp "$src" "$out/lib/plantuml.jar"
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/plantuml \
+      --argv0 plantuml \
+      --set GRAPHVIZ_DOT ${graphviz}/bin/dot \
+      --add-flags "-jar $out/lib/plantuml.jar"
 
-    cat > "$out/bin/plantuml" << EOF
-    #!${stdenv.shell}
-    export GRAPHVIZ_DOT="${graphviz}/bin/dot"
-    exec "${jre}/bin/java" -jar "$out/lib/plantuml.jar" "\$@"
-    EOF
-    chmod a+x "$out/bin/plantuml"
+    $out/bin/plantuml -help
   '';
 
   meta = with stdenv.lib; {
     description = "Draw UML diagrams using a simple and human readable text description";
     homepage = http://plantuml.sourceforge.net/;
-    # "java -jar plantuml.jar -license" says GPLv3 or later
+    # "plantuml -license" says GPLv3 or later
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor ];
     platforms = platforms.unix;
   };
 }

From 62c4a16ff1e271f7d3613c1b7e23c9c9478e9568 Mon Sep 17 00:00:00 2001
From: Raitis Veinbahs <veinbahs+nixpkgs@gmail.com>
Date: Tue, 18 Sep 2018 22:43:34 +0300
Subject: [PATCH 2111/3253] link-grammar: init at 5.5.1

---
 pkgs/tools/text/link-grammar/default.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/text/link-grammar/default.nix

diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
new file mode 100644
index 000000000000..294aa1576801
--- /dev/null
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "5.5.1";
+  pname = "link-grammar";
+
+  outputs = [ "bin" "out" "dev" "man" ];
+
+  src = fetchurl {
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    sha256 = "1x8kj1yr3b7b6qrvc5b8mm90ff3m4qdbdqplvzii2xlkpvik92ff";
+  };
+
+  nativeBuildInputs = [ pkgconfig python3 ];
+  buildInputs = [ sqlite libedit zlib ];
+
+  configureFlags = [
+    "--disable-java-bindings"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A Grammar Checking library";
+    homepage = https://www.abisource.com/projects/link-grammar/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b995e561f2d..718f23928daf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1421,6 +1421,8 @@ with pkgs;
 
   libxnd = callPackage ../development/libraries/libxnd { };
 
+  link-grammar = callPackage ../tools/text/link-grammar { };
+
   loadwatch = callPackage ../tools/system/loadwatch { };
 
   loccount = callPackage ../development/tools/misc/loccount { };

From c71cc0b98b23ddf3604bd768bd94751e396fcfa4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 1 Oct 2018 09:49:11 +0000
Subject: [PATCH 2112/3253] coqPackages.coqprime: init at 8.7.2 & 8.8

---
 .../coq-modules/coqprime/default.nix          | 46 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/coq-modules/coqprime/default.nix

diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
new file mode 100644
index 000000000000..54cb7c50e407
--- /dev/null
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, coq, bignums }:
+
+let params =
+  {
+    "8.7" = {
+      version = "8.7.2";
+      sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
+    };
+    "8.8" = {
+      version = "8.8";
+      sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
+    };
+  };
+  param = params."${coq.coq-version}"
+; in
+
+stdenv.mkDerivation rec {
+
+  inherit (param) version;
+  name = "coq${coq.coq-version}-coqprime-${version}";
+
+  src = fetchFromGitHub {
+    owner = "thery";
+    repo = "coqprime";
+    rev = "v${version}";
+    inherit (param) sha256;
+  };
+
+  buildInputs = [ coq ];
+
+  propagatedBuildInputs = [ bignums ];
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate";
+    license = licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (coq.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: builtins.hasAttr v params;
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 9c4c9aa9bdab..bc21137903af 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -22,6 +22,7 @@ let
       CoLoR = callPackage ../development/coq-modules/CoLoR {};
       coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
       coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
+      coqprime = callPackage ../development/coq-modules/coqprime {};
       coquelicot = callPackage ../development/coq-modules/coquelicot {};
       dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
       equations = callPackage ../development/coq-modules/equations { };

From cb6ccb6a7e9c3a3a61f36897d0c8f7d29d6bed81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Oct 2018 11:43:30 +0100
Subject: [PATCH 2113/3253] alacritty: 2018-08-30 -> 0.2.0

Based on popular demand I decided to upgraded alacritty from my own fork.
We currently also have a version in staging that works without but we
cannot easily backport this one because it relies on some changes in the rust
build infrastructure
---
 pkgs/applications/misc/alacritty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4544ed1fba3b..ce312e7cea63 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -51,14 +51,14 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-08-30";
+  version = "0.2.0";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "0izvg7dwwb763jc6gnmn47i5zrkxvmh3vssn6vzrrmqhd4j3msmf";
+    sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn";
     fetchSubmodules = true;
   };
 

From 350c79f9838246b1cd26c513e010640bac5e220a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Oct 2018 11:59:58 +0100
Subject: [PATCH 2114/3253] alacritty: restrict platforms to
 x86_64-{linux,darwin}

---
 pkgs/applications/misc/alacritty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index ce312e7cea63..34b96a0093b6 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -119,5 +119,6 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
+    platforms = [ "x86_64-linux" "x86-64-darwin" ];
   };
 }

From 13b2903169f18ac98ed737effb36dabc48051978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Oct 2018 12:08:02 +0100
Subject: [PATCH 2115/3253] alacritty: spell darwin platform correctly

---
 pkgs/applications/misc/alacritty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 34b96a0093b6..34e46e9fa0f0 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -119,6 +119,6 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = [ "x86_64-linux" "x86-64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 }

From bbac304b34c17b1d1eeaffbc69bbda9e9d937ee2 Mon Sep 17 00:00:00 2001
From: Alexander Kahl <ak@sodosopa.io>
Date: Mon, 1 Oct 2018 13:10:43 +0200
Subject: [PATCH 2116/3253] snyk: init at 1.99.1

---
 .../node-packages/node-packages-v8.json       |   1 +
 .../node-packages/node-packages-v8.nix        | 556 ++++++++++++++----
 2 files changed, 437 insertions(+), 120 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index a754f3bef61e..40d70f198abf 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -104,6 +104,7 @@
 , "sinopia"
 , "sloc"
 , "smartdc"
+, "snyk"
 , "socket.io"
 , "stackdriver-statsd-backend"
 , "statsd"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 287623d03e43..c419a0db44e1 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -58,22 +58,22 @@ let
         sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
       };
     };
-    "@babel/runtime-7.1.1" = {
+    "@babel/runtime-7.1.2" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.1.1";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.1.tgz";
-        sha512 = "5ruvezIb2ccAGj538SRRz6YyZOAVubhUfOq+57LuGd9ADAdiqGWYk1DQ0ReVEdvaAfZfS9+kK3N+BwAuJlzzjQ==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz";
+        sha512 = "Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==";
       };
     };
-    "@babel/runtime-corejs2-7.1.1" = {
+    "@babel/runtime-corejs2-7.1.2" = {
       name = "_at_babel_slash_runtime-corejs2";
       packageName = "@babel/runtime-corejs2";
-      version = "7.1.1";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.1.tgz";
-        sha512 = "J36jrmX2YeGHx+mIF/KV6By0XS4uCxt8JveYnx4LZaCkXDLopanQmbH7kp4VhSolU6nz3cggwCfkbFWwfxQI3Q==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.2.tgz";
+        sha512 = "drxaPByExlcRDKW4ZLubUO4ZkI8/8ax9k9wve1aEthdLKFzjB7XRkOQ0xoTIWGxqdDnWDElkjYq77bt7yrcYJQ==";
       };
     };
     "@babel/types-7.0.0-beta.38" = {
@@ -1048,13 +1048,13 @@ let
         sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
       };
     };
-    "@types/node-10.11.2" = {
+    "@types/node-10.11.3" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.11.2";
+      version = "10.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.11.2.tgz";
-        sha512 = "XubfQDIg88PGJ7netQPf3QOKHF7Xht4WXGtg5W7cGBeQs9ETbYKwfchR9o+tRRA9iLTQ7nAre85M205JbYsjJA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz";
+        sha512 = "3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ==";
       };
     };
     "@types/node-8.10.30" = {
@@ -1561,6 +1561,15 @@ let
         sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
       };
     };
+    "acorn-6.0.2" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz";
+        sha512 = "GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg==";
+      };
+    };
     "acorn-dynamic-import-3.0.0" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -1606,13 +1615,22 @@ let
         sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw==";
       };
     };
-    "acorn-node-1.5.2" = {
+    "acorn-node-1.6.0" = {
       name = "acorn-node";
       packageName = "acorn-node";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz";
-        sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg==";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.6.0.tgz";
+        sha512 = "ZsysjEh+Y3i14f7YXCAKJy99RXbd56wHKYBzN4FlFtICIZyFpYwK6OwNJhcz8A/FMtxoUZkJofH1v9KIfNgWmw==";
+      };
+    };
+    "acorn-walk-6.1.0" = {
+      name = "acorn-walk";
+      packageName = "acorn-walk";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.0.tgz";
+        sha512 = "ugTb7Lq7u4GfWSqqpwE0bGyoBZNMTok/zDBXxfEG0QM50jNlGhIWjRC1pPN7bvV1anhF+bs+/gNcRw+o55Evbg==";
       };
     };
     "active-x-obfuscator-0.0.1" = {
@@ -3006,7 +3024,7 @@ let
       packageName = "async";
       version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
         sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
       };
     };
@@ -3015,7 +3033,7 @@ let
       packageName = "async";
       version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
@@ -3024,7 +3042,7 @@ let
       packageName = "async";
       version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz";
+        url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz";
         sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
       };
     };
@@ -3033,7 +3051,7 @@ let
       packageName = "async";
       version = "0.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz";
+        url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
         sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
       };
     };
@@ -3042,7 +3060,7 @@ let
       packageName = "async";
       version = "0.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+        url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
         sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
       };
     };
@@ -3051,7 +3069,7 @@ let
       packageName = "async";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        url = "http://registry.npmjs.org/async/-/async-1.0.0.tgz";
         sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
       };
     };
@@ -3060,7 +3078,7 @@ let
       packageName = "async";
       version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz";
+        url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
         sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
       };
     };
@@ -3069,7 +3087,7 @@ let
       packageName = "async";
       version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+        url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz";
         sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
@@ -3375,7 +3393,7 @@ let
       packageName = "azure-arm-hdinsight";
       version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+        url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
         sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
       };
     };
@@ -4842,7 +4860,7 @@ let
       packageName = "browserify-cache-api";
       version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz";
+        url = "http://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz";
         sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02";
       };
     };
@@ -4869,7 +4887,7 @@ let
       packageName = "browserify-incremental";
       version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz";
+        url = "http://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz";
         sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a";
       };
     };
@@ -8299,7 +8317,7 @@ let
       packageName = "csv";
       version = "0.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz";
+        url = "http://registry.npmjs.org/csv/-/csv-0.4.6.tgz";
         sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d";
       };
     };
@@ -8308,7 +8326,7 @@ let
       packageName = "csv-generate";
       version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz";
+        url = "http://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz";
         sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
@@ -11022,13 +11040,13 @@ let
         sha512 = "dGXNg4F/FgVzlApjzItL+7naHutA3fDqbV/zAZqDDlXTjiMnQmZKu+prImWKszeBM5UQeGvAl3u1wBiKeDh61g==";
       };
     };
-    "event-stream-4.0.0" = {
+    "event-stream-4.0.1" = {
       name = "event-stream";
       packageName = "event-stream";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.0.tgz";
-        sha512 = "DOB0pW11hF+A572U9vmYbQuLVvzXb2ZQhP14wAhMesOLoWVmWNKZ05niYwgUEEO7Ex+lbPpsqT+pch4O7Ijqmg==";
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz";
+        sha512 = "qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==";
       };
     };
     "event-to-promise-0.8.0" = {
@@ -16936,13 +16954,13 @@ let
         sha1 = "06d4912255093419477d425633606e0e90782967";
       };
     };
-    "joi-13.6.0" = {
+    "joi-13.7.0" = {
       name = "joi";
       packageName = "joi";
-      version = "13.6.0";
+      version = "13.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joi/-/joi-13.6.0.tgz";
-        sha512 = "E4QB0yRgEa6ZZKcSHJuBC+QeAwy+akCG0Bsa9edLqljyhlr+GuGDSmXYW1q7sj/FuAPy+ECUI3evVtK52tVfwg==";
+        url = "https://registry.npmjs.org/joi/-/joi-13.7.0.tgz";
+        sha512 = "xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==";
       };
     };
     "jquery-3.3.1" = {
@@ -17085,7 +17103,7 @@ let
       packageName = "jsdom";
       version = "7.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz";
+        url = "http://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz";
         sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e";
       };
     };
@@ -17788,7 +17806,7 @@ let
       packageName = "kind-of";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz";
+        url = "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz";
         sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44";
       };
     };
@@ -17797,7 +17815,7 @@ let
       packageName = "kind-of";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz";
+        url = "http://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz";
         sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5";
       };
     };
@@ -21640,7 +21658,7 @@ let
       packageName = "nan";
       version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+        url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
         sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
       };
     };
@@ -21649,7 +21667,7 @@ let
       packageName = "nan";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
         sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
       };
     };
@@ -21658,7 +21676,7 @@ let
       packageName = "nan";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz";
+        url = "http://registry.npmjs.org/nan/-/nan-2.1.0.tgz";
         sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8";
       };
     };
@@ -21667,17 +21685,17 @@ let
       packageName = "nan";
       version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
+        url = "http://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
         sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
       };
     };
-    "nan-2.11.0" = {
+    "nan-2.11.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.11.0";
+      version = "2.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz";
-        sha512 = "F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz";
+        sha512 = "iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==";
       };
     };
     "nan-2.5.1" = {
@@ -21707,13 +21725,13 @@ let
         sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ==";
       };
     };
-    "nanoid-1.2.4" = {
+    "nanoid-1.2.5" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.4.tgz";
-        sha512 = "VbM1HbXvDxZhcONUEJ0olXwg5MgOWS89KPL0PlchtB9NJ2dOTva64RR3fypJuEMQffJ7b1rjcPyR39SsV2W5PA==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.5.tgz";
+        sha512 = "mOYdCQS3xdgu81Hg3EQEhORykMk53Pkzg15Y6I+O9T3db9qHPf9z6nXzQBCUaHXlQs57eRKotDTzYlYACL+5uA==";
       };
     };
     "nanolru-1.0.0" = {
@@ -22437,7 +22455,7 @@ let
       packageName = "nodemailer";
       version = "0.3.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+        url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
         sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
       };
     };
@@ -22446,7 +22464,7 @@ let
       packageName = "nodemailer";
       version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz";
+        url = "http://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz";
         sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79";
       };
     };
@@ -23324,13 +23342,13 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "ono-4.0.8" = {
+    "ono-4.0.9" = {
       name = "ono";
       packageName = "ono";
-      version = "4.0.8";
+      version = "4.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-4.0.8.tgz";
-        sha512 = "x7IM7JLrarP9WxfjDHTBs6io1D1ixEZnhKqnjMnwz+9waPZSapkGYe7jBAqnMTL+HAMfsN6rSHW3Pi+C/9dyjg==";
+        url = "https://registry.npmjs.org/ono/-/ono-4.0.9.tgz";
+        sha512 = "HuSv0Z//JsX3246ykva50NDq2dw2UOaUKRK/CrD3UN96FQ3kr9msI5wR0lMezAIKgfN9+utK+iDfWzj1df3TZg==";
       };
     };
     "open-0.0.2" = {
@@ -26237,7 +26255,7 @@ let
       packageName = "pump";
       version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
+        url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
         sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b";
       };
     };
@@ -29031,13 +29049,13 @@ let
         sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
       };
     };
-    "simple-git-1.102.0" = {
+    "simple-git-1.103.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.102.0";
+      version = "1.103.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.102.0.tgz";
-        sha512 = "ox/EDIYtyxG9pFBuboxnmR1FFFS2vsrJejuble9d2W0EWvvMB02/ruMUHp1ROPS0OH5Nzr9+/W7JkRRRXDMs8Q==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.103.0.tgz";
+        sha512 = "5QKrOtoXLTA3CdFG//8ZIGIVIVRRMBfSyMXDn1t3y+TOf+Kg39mfzfU4t0CRJBcxBGynjNWVwsx6W04+biIUmg==";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -30246,13 +30264,13 @@ let
         sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
       };
     };
-    "ssb-config-2.3.2" = {
+    "ssb-config-2.3.3" = {
       name = "ssb-config";
       packageName = "ssb-config";
-      version = "2.3.2";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.2.tgz";
-        sha512 = "u+pUKX+ZL8KbfdwL49GuHaVD8kh+LkdLcKyCO+Rxn/MKLfZ1JFfuhm6yZ4ppQu9oTmq/1C49eLpNwZtrLIjVCg==";
+        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.3.tgz";
+        sha512 = "w4tdXE7xEpYe9M071G60Wr/6lf59OTwrsTykUGFySh9Y7Prcu4pORmOIBgQUttZ86QvGMxJO1qdl7toIK53RMA==";
       };
     };
     "ssb-ebt-5.2.3" = {
@@ -31043,7 +31061,7 @@ let
       packageName = "strip-ansi";
       version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
         sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
       };
     };
@@ -31052,7 +31070,7 @@ let
       packageName = "strip-ansi";
       version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
         sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
       };
     };
@@ -31061,7 +31079,7 @@ let
       packageName = "strip-ansi";
       version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
         sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
       };
     };
@@ -31070,7 +31088,7 @@ let
       packageName = "strip-ansi";
       version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
@@ -33771,7 +33789,7 @@ let
       packageName = "uuid";
       version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
+        url = "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
@@ -35824,10 +35842,10 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "0.14.3";
+    version = "0.14.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-0.14.3.tgz";
-      sha512 = "+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==";
+      url = "https://registry.npmjs.org/asar/-/asar-0.14.4.tgz";
+      sha512 = "U+Bd2VY5LkLM3DUpLtlQgS+goiXBmSU4P41xUdck/vyHqhMfxBVAXTMLksDGoWvhx7LPgboSUVF0ujHCVsturw==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -36524,9 +36542,9 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.4"
-      sources."acorn-5.7.3"
-      sources."acorn-dynamic-import-3.0.0"
-      sources."acorn-node-1.5.2"
+      sources."acorn-6.0.2"
+      sources."acorn-node-1.6.0"
+      sources."acorn-walk-6.1.0"
       sources."array-filter-0.0.1"
       sources."array-map-0.0.0"
       sources."array-reduce-0.0.0"
@@ -37194,8 +37212,12 @@ in
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."acorn-5.7.3"
-      sources."acorn-dynamic-import-3.0.0"
-      sources."acorn-node-1.5.2"
+      (sources."acorn-node-1.6.0" // {
+        dependencies = [
+          sources."acorn-6.0.2"
+        ];
+      })
+      sources."acorn-walk-6.1.0"
       sources."ajv-5.5.2"
       sources."aliasify-2.1.0"
       sources."ansi-0.3.1"
@@ -37739,7 +37761,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.11.2"
+      sources."@types/node-10.11.3"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -38312,7 +38334,7 @@ in
       sources."multistream-2.1.1"
       sources."mute-stream-0.0.7"
       sources."mutexify-1.2.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanoassert-1.1.0"
       sources."nanobus-4.3.4"
       sources."nanoscheduler-1.0.3"
@@ -38580,7 +38602,7 @@ in
       sources."mime-types-2.1.20"
       sources."minimist-0.0.10"
       sources."ms-0.7.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // {
         dependencies = [
           sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4"
@@ -39169,7 +39191,7 @@ in
       })
       sources."ms-2.0.0"
       sources."murmur-hash-js-1.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -40357,7 +40379,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -40601,7 +40623,7 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.1.1"
-      sources."simple-git-1.102.0"
+      sources."simple-git-1.103.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -40667,7 +40689,7 @@ in
       sources."multicb-1.2.2"
       sources."multiserver-1.13.5"
       sources."muxrpc-6.4.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."node-gyp-build-3.4.0"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-1.4.4"
@@ -40743,7 +40765,7 @@ in
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.2"
+      sources."ssb-config-2.3.3"
       sources."ssb-git-0.5.0"
       sources."ssb-git-repo-2.8.3"
       sources."ssb-issues-1.0.0"
@@ -41178,7 +41200,7 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."ono-4.0.8"
+      sources."ono-4.0.9"
       sources."open-0.0.5"
       sources."opn-5.4.0"
       sources."ora-1.4.0"
@@ -41688,7 +41710,7 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."msgpack-1.0.2"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."optimist-0.3.7"
       sources."pop-iterate-1.0.1"
       sources."promise-6.1.0"
@@ -43065,7 +43087,7 @@ in
       })
       sources."moment-2.22.2"
       sources."mv-2.1.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."ncp-2.0.0"
       sources."once-1.4.0"
       sources."optimist-0.6.1"
@@ -43918,7 +43940,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nanoid-1.2.4"
+      sources."nanoid-1.2.5"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -44275,7 +44297,7 @@ in
       sources."mixin-deep-1.3.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."negotiator-0.6.1"
       sources."normalize-path-2.1.1"
@@ -45973,7 +45995,7 @@ in
       sources."encodeurl-1.0.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."event-stream-4.0.0"
+      sources."event-stream-4.0.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
       (sources."extend-shallow-3.0.2" // {
@@ -46074,7 +46096,7 @@ in
       })
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -46556,7 +46578,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -48146,7 +48168,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."negotiator-0.6.1"
       (sources."node-pre-gyp-0.6.39" // {
         dependencies = [
@@ -48569,7 +48591,7 @@ in
       sources."minimist-1.2.0"
       sources."mixin-deep-1.3.1"
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."nopt-1.0.10"
       sources."normalize-path-2.1.1"
@@ -50022,7 +50044,7 @@ in
         ];
       })
       sources."mv-2.1.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."ncp-2.0.0"
       sources."negotiator-git+https://github.com/arlolra/negotiator#full-parse-access"
       sources."normalize-package-data-2.4.0"
@@ -51037,9 +51059,9 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.4"
-      sources."acorn-5.7.3"
-      sources."acorn-dynamic-import-3.0.0"
-      sources."acorn-node-1.5.2"
+      sources."acorn-6.0.2"
+      sources."acorn-node-1.6.0"
+      sources."acorn-walk-6.1.0"
       sources."anymatch-2.0.0"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -51152,7 +51174,11 @@ in
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
-      sources."detective-4.7.1"
+      (sources."detective-4.7.1" // {
+        dependencies = [
+          sources."acorn-5.7.3"
+        ];
+      })
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
@@ -51286,7 +51312,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."neo-async-2.5.2"
       sources."node-static-0.7.11"
@@ -52463,7 +52489,7 @@ in
           sources."rimraf-2.4.5"
         ];
       })
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -52766,7 +52792,7 @@ in
       sources."split-string-3.1.0"
       sources."ssb-blobs-1.1.5"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.2"
+      sources."ssb-config-2.3.3"
       sources."ssb-ebt-5.2.3"
       (sources."ssb-friends-3.1.3" // {
         dependencies = [
@@ -53407,7 +53433,7 @@ in
       sources."moment-2.22.2"
       sources."ms-2.0.0"
       sources."mv-2.1.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."ncp-2.0.0"
       sources."negotiator-0.6.1"
       sources."number-is-nan-1.0.1"
@@ -53807,7 +53833,7 @@ in
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."mv-2.1.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."ncp-2.0.0"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
@@ -53897,6 +53923,296 @@ in
     production = true;
     bypassCache = true;
   };
+  snyk = nodeEnv.buildNodePackage {
+    name = "snyk";
+    packageName = "snyk";
+    version = "1.99.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz";
+      sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg==";
+    };
+    dependencies = [
+      sources."@yarnpkg/lockfile-1.1.0"
+      sources."abbrev-1.1.1"
+      sources."agent-base-4.2.1"
+      sources."ansi-escapes-3.1.0"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."ansicolors-0.3.2"
+      sources."archy-1.0.0"
+      sources."argparse-1.0.10"
+      sources."asap-2.0.6"
+      sources."ast-types-0.11.5"
+      sources."async-1.5.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."bytes-3.0.0"
+      sources."camelcase-2.1.1"
+      sources."chalk-2.4.1"
+      sources."chardet-0.4.2"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      (sources."cliui-3.2.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."clone-deep-0.3.0"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."concat-map-0.0.1"
+      sources."configstore-3.1.2"
+      sources."core-js-2.3.0"
+      sources."core-util-is-1.0.2"
+      sources."crypto-random-string-1.0.0"
+      sources."data-uri-to-buffer-1.2.0"
+      sources."debug-3.2.5"
+      sources."decamelize-1.2.0"
+      sources."deep-is-0.1.3"
+      sources."degenerator-1.0.4"
+      sources."depd-1.1.2"
+      sources."dot-prop-4.2.0"
+      sources."email-validator-2.0.4"
+      sources."es6-promise-4.2.5"
+      sources."es6-promisify-5.0.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.11.0"
+      sources."esprima-3.1.3"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."extend-3.0.2"
+      sources."external-editor-2.2.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."figures-2.0.0"
+      sources."file-uri-to-path-1.0.0"
+      sources."for-in-1.0.2"
+      sources."for-own-1.0.0"
+      (sources."ftp-0.3.10" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+        ];
+      })
+      (sources."get-uri-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."graceful-fs-4.1.11"
+      sources."graphlib-2.1.5"
+      sources."has-flag-3.0.0"
+      sources."hasbin-1.2.3"
+      sources."hosted-git-info-2.7.1"
+      sources."http-errors-1.6.3"
+      (sources."http-proxy-agent-2.1.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."https-proxy-agent-2.2.1"
+      sources."iconv-lite-0.4.24"
+      sources."immediate-3.0.6"
+      sources."imurmurhash-0.1.4"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."inquirer-3.3.0"
+      sources."invert-kv-1.0.0"
+      sources."ip-1.1.5"
+      sources."is-buffer-1.1.6"
+      sources."is-extendable-0.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-obj-1.0.1"
+      sources."is-plain-object-2.0.4"
+      sources."is-promise-2.1.0"
+      sources."is-wsl-1.1.0"
+      sources."isarray-0.0.1"
+      sources."isobject-3.0.1"
+      (sources."js-yaml-3.12.0" // {
+        dependencies = [
+          sources."esprima-4.0.1"
+        ];
+      })
+      (sources."jszip-3.1.5" // {
+        dependencies = [
+          sources."es6-promise-3.0.2"
+          sources."isarray-1.0.0"
+          sources."process-nextick-args-1.0.7"
+          sources."readable-stream-2.0.6"
+        ];
+      })
+      sources."kind-of-3.2.2"
+      sources."lazy-cache-0.2.7"
+      sources."lcid-1.0.0"
+      sources."levn-0.3.0"
+      sources."lie-3.1.1"
+      sources."lodash-4.17.11"
+      sources."lodash.assign-4.2.0"
+      sources."lodash.assignin-4.2.0"
+      sources."lodash.clonedeep-4.5.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.get-4.4.2"
+      sources."lodash.set-4.3.2"
+      sources."lru-cache-4.1.3"
+      sources."macos-release-1.1.0"
+      sources."make-dir-1.3.0"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      (sources."mixin-object-2.0.1" // {
+        dependencies = [
+          sources."for-in-0.1.8"
+        ];
+      })
+      sources."ms-2.1.1"
+      sources."mute-stream-0.0.7"
+      sources."nconf-0.10.0"
+      (sources."needle-2.2.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."netmask-1.0.6"
+      sources."number-is-nan-1.0.1"
+      sources."onetime-2.0.1"
+      sources."opn-5.4.0"
+      sources."optionator-0.8.2"
+      sources."os-locale-1.4.0"
+      sources."os-name-2.0.1"
+      sources."os-tmpdir-1.0.2"
+      sources."pac-proxy-agent-2.0.2"
+      sources."pac-resolver-3.0.0"
+      sources."pako-1.0.6"
+      sources."path-0.12.7"
+      sources."pify-3.0.0"
+      sources."prelude-ls-1.1.2"
+      sources."process-0.11.10"
+      sources."process-nextick-args-2.0.0"
+      sources."promise-7.3.1"
+      sources."proxy-agent-2.3.1"
+      sources."proxy-from-env-1.0.0"
+      sources."pseudomap-1.0.2"
+      (sources."raw-body-2.3.3" // {
+        dependencies = [
+          sources."iconv-lite-0.4.23"
+        ];
+      })
+      (sources."readable-stream-2.3.6" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."recursive-readdir-2.2.2"
+      sources."restore-cursor-2.0.0"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."secure-keys-1.0.0"
+      sources."semver-5.5.1"
+      sources."setprototypeof-1.1.0"
+      (sources."shallow-clone-0.1.2" // {
+        dependencies = [
+          sources."kind-of-2.0.1"
+        ];
+      })
+      sources."signal-exit-3.0.2"
+      sources."smart-buffer-1.1.15"
+      sources."snyk-config-2.2.0"
+      sources."snyk-docker-plugin-1.11.0"
+      sources."snyk-go-plugin-1.5.2"
+      sources."snyk-gradle-plugin-2.0.1"
+      sources."snyk-module-1.8.2"
+      sources."snyk-mvn-plugin-2.0.0"
+      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
+        dependencies = [
+          sources."lodash-4.17.10"
+        ];
+      })
+      sources."snyk-nuget-plugin-1.6.5"
+      sources."snyk-php-plugin-1.5.1"
+      sources."snyk-policy-1.12.0"
+      sources."snyk-python-plugin-1.8.1"
+      sources."snyk-resolve-1.0.1"
+      sources."snyk-resolve-deps-3.1.0"
+      sources."snyk-sbt-plugin-2.0.0"
+      sources."snyk-tree-1.0.0"
+      sources."snyk-try-require-1.3.1"
+      sources."socks-1.1.10"
+      sources."socks-proxy-agent-3.0.1"
+      sources."source-map-0.6.1"
+      sources."source-map-support-0.5.9"
+      sources."sprintf-js-1.0.3"
+      sources."statuses-1.5.0"
+      sources."string-width-2.1.1"
+      sources."string_decoder-0.10.31"
+      sources."strip-ansi-4.0.0"
+      sources."supports-color-5.5.0"
+      sources."temp-dir-1.0.0"
+      sources."tempfile-2.0.0"
+      sources."then-fs-2.0.0"
+      sources."through-2.3.8"
+      sources."thunkify-2.1.2"
+      sources."tmp-0.0.33"
+      sources."toml-2.3.3"
+      sources."tslib-1.9.3"
+      sources."type-check-0.3.2"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."unique-string-1.0.0"
+      sources."unpipe-1.0.0"
+      sources."util-0.10.4"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.3.2"
+      sources."win-release-1.1.1"
+      sources."window-size-0.1.4"
+      sources."wordwrap-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
+      sources."xml2js-0.4.19"
+      sources."xmlbuilder-9.0.7"
+      sources."xregexp-2.0.0"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-3.32.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "snyk library and cli utility";
+      homepage = "https://github.com/snyk/snyk#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
   "socket.io" = nodeEnv.buildNodePackage {
     name = "socket.io";
     packageName = "socket.io";
@@ -53986,7 +54302,7 @@ in
       sources."hashring-3.2.0"
       sources."keypress-0.1.0"
       sources."modern-syslog-1.1.2"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."sequence-2.2.1"
       sources."simple-lru-cache-0.0.2"
       sources."winser-0.1.6"
@@ -54495,7 +54811,7 @@ in
       sources."ms-2.0.0"
       sources."multer-1.4.0"
       sources."mute-stream-0.0.5"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
       (sources."nodemon-1.18.4" // {
@@ -55054,7 +55370,7 @@ in
       sources."mooremachine-2.2.1"
       sources."mute-stream-0.0.7"
       sources."mv-2.1.1"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."ncp-2.0.0"
       sources."once-1.3.2"
       sources."path-is-absolute-1.0.1"
@@ -56166,8 +56482,8 @@ in
       sources."@akryum/winattr-3.0.0"
       sources."@apollographql/apollo-upload-server-5.0.3"
       sources."@apollographql/graphql-playground-html-1.6.0"
-      sources."@babel/runtime-7.1.1"
-      sources."@babel/runtime-corejs2-7.1.1"
+      sources."@babel/runtime-7.1.2"
+      sources."@babel/runtime-corejs2-7.1.2"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.2"
       sources."@protobufjs/aspromise-1.1.2"
@@ -56190,7 +56506,7 @@ in
       sources."@types/express-serve-static-core-4.16.0"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
-      sources."@types/node-10.11.2"
+      sources."@types/node-10.11.3"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-5.1.2"
@@ -56616,7 +56932,7 @@ in
       sources."isurl-1.0.0"
       sources."iterall-1.2.2"
       sources."javascript-stringify-1.6.0"
-      sources."joi-13.6.0"
+      sources."joi-13.7.0"
       sources."js-message-1.0.5"
       sources."js-queue-2.0.0"
       sources."js-yaml-3.12.0"
@@ -56675,8 +56991,8 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
-      sources."nan-2.11.0"
-      sources."nanoid-1.2.4"
+      sources."nan-2.11.1"
+      sources."nanoid-1.2.5"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -57431,7 +57747,7 @@ in
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."neo-async-2.5.2"
       (sources."node-libs-browser-2.1.0" // {
@@ -57954,7 +58270,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.11.2"
+      sources."@types/node-10.11.3"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
@@ -58623,7 +58939,7 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."nan-2.11.0"
+      sources."nan-2.11.1"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."kind-of-6.0.2"

From 62bf19d2fcd1ebd7de0381f95c17bcc802b08483 Mon Sep 17 00:00:00 2001
From: haslersn <33969028+haslersn@users.noreply.github.com>
Date: Mon, 1 Oct 2018 16:49:02 +0200
Subject: [PATCH 2117/3253] mkspiffs: init at 0.2.3 (#46674)

---
 maintainers/maintainer-list.nix             |  5 ++++
 pkgs/tools/filesystems/mkspiffs/default.nix | 32 +++++++++++++++++++++
 pkgs/tools/filesystems/mkspiffs/presets.nix | 20 +++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++
 4 files changed, 61 insertions(+)
 create mode 100644 pkgs/tools/filesystems/mkspiffs/default.nix
 create mode 100644 pkgs/tools/filesystems/mkspiffs/presets.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7178c8c0a1e1..3b7329a8d790 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1640,6 +1640,11 @@
     github = "hamhut1066";
     name = "Hamish Hutchings";
   };
+  haslersn = {
+    email = "haslersn@fius.informatik.uni-stuttgart.de";
+    github = "haslersn";
+    name = "Sebastian Hasler";
+  };
   havvy = {
     email = "ryan.havvy@gmail.com";
     github = "havvy";
diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
new file mode 100644
index 000000000000..48f13925ab08
--- /dev/null
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, git }:
+
+# Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by
+# overriding the same-named attributes. See ./presets.nix for examples.
+
+stdenv.mkDerivation rec {
+  name = "mkspiffs-${version}";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "igrr";
+    repo = "mkspiffs";
+    rev = version;
+    fetchSubmodules = true;
+    sha256 = "1fgw1jqdlp83gv56mgnxpakky0q6i6f922niis4awvxjind8pbm1";
+  };
+
+  nativeBuildInputs = [ git ];
+  buildFlags = [ "dist" ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mkspiffs $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool to build and unpack SPIFFS images";
+    license = licenses.mit;
+    homepage = https://github.com/igrr/mkspiffs;
+    maintainers = with maintainers; [ haslersn ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/filesystems/mkspiffs/presets.nix b/pkgs/tools/filesystems/mkspiffs/presets.nix
new file mode 100644
index 000000000000..c0b74d9cf1b7
--- /dev/null
+++ b/pkgs/tools/filesystems/mkspiffs/presets.nix
@@ -0,0 +1,20 @@
+{ lib, mkspiffs }:
+
+# We provide the same presets as the upstream
+
+lib.mapAttrs (
+  name: { CPPFLAGS }:
+  mkspiffs.overrideAttrs (drv: {
+    inherit CPPFLAGS;
+    BUILD_CONFIG_NAME = "-${name}";
+  })
+) {
+  arduino-esp8266.CPPFLAGS = [
+    "-DSPIFFS_USE_MAGIC_LENGTH=0"
+    "-DSPIFFS_ALIGNED_OBJECT_INDEX_TABLES=1"
+  ];
+
+  arduino-esp32.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ];
+
+  esp-idf.CPPFLAGS = [ "-DSPIFFS_OBJ_META_LEN=4" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33a2b6455a23..e413e0dcf269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1460,6 +1460,10 @@ with pkgs;
 
   metabase = callPackage ../servers/metabase { };
 
+  mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
+
+  mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
+
   monetdb = callPackage ../servers/sql/monetdb { };
 
   mp3blaster = callPackage ../applications/audio/mp3blaster { };

From dee90d27e2b6d8a0c4fef347e40500745ec7b05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Mon, 1 Oct 2018 17:20:25 +0200
Subject: [PATCH 2118/3253] uftrace: init at 0.9 (#47117)

* uftrace: init at 0.9

* Dropped dependency leftovers.

* patchShebang needed for sandboxed build
---
 pkgs/development/tools/uftrace/default.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/uftrace/default.nix

diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
new file mode 100644
index 000000000000..fa57ce9df21f
--- /dev/null
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "uftrace-${version}";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner = "namhyung";
+    repo = "uftrace";
+    rev = "f0fed0b24a9727ffed04673b62f66baad21a1f99";
+    sha256 = "0rn2xwd87qy5ihn5zq9pwq8cs1vfmcqqz0wl70wskkgp2ccsd9x8";
+  };
+
+  postUnpack = ''
+        patchShebangs .
+  '';
+
+  meta = {
+    description = "Function (graph) tracer for user-space";
+    homepage = https://github.com/namhyung/uftrace;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.nthorne];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e413e0dcf269..e4177bce4d22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5737,6 +5737,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6; # doesn't build with gcc7
   };
 
+  uftrace = callPackage ../development/tools/uftrace { };
+
   uget = callPackage ../tools/networking/uget { };
 
   uget-integrator = callPackage ../tools/networking/uget-integrator { };

From 9f107e502667a83ec0fddbb19096e6d0afb405e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 1 Oct 2018 12:21:36 -0300
Subject: [PATCH 2119/3253] materia-theme: 20180519 -> 20180928 (#47590)

---
 pkgs/misc/themes/materia-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 8f2cdb0fcff7..0dd490a35b59 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20180519";
+  version = "20180928";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
+    sha256 = "0v4mvc4rrf3jwf77spn9f5sqxp72v66k2k467r0aw3nglcpm4wpv";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];

From 2b054995248d8c181e46f45a6d55b11cfcf6b8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 1 Oct 2018 12:22:53 -0300
Subject: [PATCH 2120/3253] sierra-gtk-theme: 2018-09-14 -> 2018-10-01 (#47588)

---
 pkgs/misc/themes/sierra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/sierra/default.nix b/pkgs/misc/themes/sierra/default.nix
index 057b96febf3a..529553c9211f 100644
--- a/pkgs/misc/themes/sierra/default.nix
+++ b/pkgs/misc/themes/sierra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "sierra-gtk-theme-${version}";
-  version = "2018-09-14";
+  version = "2018-10-01";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "sierra-gtk-theme";
-    rev = "4c07f9e4978ab2d87ce0f8d4a5d60da21784172c";
-    sha256 = "0mp5v462wbjq157hfnqzd8sw374mc611kpk92is2c3qhvj5qb6qd";
+    rev = version;
+    sha256 = "10rjk2lyhlkhhfx6f6r0cykbkxa2jhri4wirc3h2wbzzsx7ch3ix";
   };
 
   nativeBuildInputs = [ libxml2 ];

From a6520fc023a662b1d8ec1ba82a0c74c09494bf32 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Mon, 1 Oct 2018 16:25:44 +0100
Subject: [PATCH 2121/3253] fira-code: 1.205 -> 1.206 (#47598)

---
 pkgs/data/fonts/fira-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 191e52c427a7..b0b58b0ebfcc 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "1.205";
+  version = "1.206";
 in fetchzip {
   name = "fira-code-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip {
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "0h8b89d1n3y56k7x9zrwm9fic09ccg1mc7g1258g152m5g6z6zms";
+  sha256 = "0074d8q4m802f5yms8yxdx4rdz5xnpgv1w5hs330zg2p9ksicgzy";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/tonsky/FiraCode;

From 5e4fe584fab49bfd5d278e513c146b36e76900b5 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Mon, 1 Oct 2018 16:27:31 +0100
Subject: [PATCH 2122/3253] kitty: 0.12.0 -> 0.12.3 (#47599)

---
 pkgs/applications/misc/kitty/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 70b580cd0f8a..4febac10806f 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -7,7 +7,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.12.0";
+  version = "0.12.3";
   name = "kitty-${version}";
   format = "other";
 
@@ -15,7 +15,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1n2pi9pc903inls1fvz257q7wpif76rj394qkgq7pixpisijdyjm";
+    sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c";
   };
 
   buildInputs = [
@@ -33,8 +33,8 @@ buildPythonApplication rec {
       --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
 
     substituteInPlace docs/Makefile \
-      --replace 'python3 .. +launch $(shell which sphinx-build)' \
-                'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere $(shell which sphinx-build)'
+      --replace 'python3 .. +launch :sphinx-build' \
+                'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere sphinx-build'
     '';
 
   buildPhase = ''

From 74ae8fb7a586d5c0a25122b983669b9bf7d085ff Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Mon, 1 Oct 2018 11:29:41 -0400
Subject: [PATCH 2123/3253] scala: 2.12.6 -> 2.12.7 (#47571)

---
 pkgs/development/compilers/scala/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 8a20066becb7..2d6c060e89e0 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.6";
+  name = "scala-2.12.7";
 
   src = fetchurl {
     url = "https://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
+    sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn";
   };
 
   propagatedBuildInputs = [ jre ] ;

From c4ff3664eb07b3777af9a3fdb4604ec27b502f69 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Mon, 1 Oct 2018 17:33:59 +0200
Subject: [PATCH 2124/3253] mint: 0.2.1 -> 0.3.1 (#47586)

---
 pkgs/development/compilers/mint/default.nix | 11 +++++------
 pkgs/development/compilers/mint/shards.nix  |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 2896c0c09139..de7e3bd6a07e 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
 # Updating the dependencies for this package:
 #
-#   wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock
+#   wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock
 #   nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr'
 #
-{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
 let
   crystalPackages = lib.mapAttrs (name: src:
     stdenv.mkDerivation {
@@ -33,17 +33,16 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "0.2.1";
+  version = "0.3.1";
   name = "mint-${version}";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
     rev = version;
-    sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1";
+    sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr";
   };
 
-  nativeBuildInputs = [ which ];
-  buildInputs = [ crystal zlib openssl duktape ];
+  nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];
 
   buildPhase = ''
     mkdir -p $out/bin tmp
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index 069df52ba12d..fbf85ef80426 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,8 +8,8 @@
   ameba = {
     owner = "veelenga";
     repo = "ameba";
-    rev = "v0.7.0";
-    sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
+    rev = "v0.8.0";
+    sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka";
   };
   baked_file_system = {
     owner = "schovi";

From 902c6a5d035524f4539b22590bf2837c4556307b Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 2 Oct 2018 00:38:27 +0900
Subject: [PATCH 2125/3253] feedgnuplot: 1.49 -> 1.51 (#47574)

---
 pkgs/tools/graphics/feedgnuplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix
index 3708bc9c0fc6..fef5c657a7a2 100644
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -10,13 +10,13 @@ in
 
 buildPerlPackage rec {
   name = "feedgnuplot-${version}";
-  version = "1.49";
+  version = "1.51";
 
   src = fetchFromGitHub {
     owner = "dkogan";
     repo = "feedgnuplot";
     rev = "v${version}";
-    sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02";
+    sha256 = "0npk2l032cnmibjj5zf3ii09mpxciqn32lx6g5bal91bkxwn7r5i";
   };
 
   outputs = [ "out" ];

From 83fd9785f65b8fd4cbaa146270f90b2a0d74b5f3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Mon, 1 Oct 2018 17:40:29 +0200
Subject: [PATCH 2126/3253] linux kernel: increase build timeout from 2 to 4
 hrs (#47564)

We've recently seen a lot of kernel build timeouts on hydra,
so let's increase the timeout.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 97921f07e82c..5e6023582082 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -247,7 +247,7 @@ let
           maintainers.thoughtpolice
         ];
         platforms = platforms.linux;
-        timeout = 7200; # 2 hours
+        timeout = 14400; # 4 hours
       } // extraMeta;
     };
 in

From 14cc9a2f0fb513129c741905bf85bfac01b1d56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Sep 2018 09:43:36 +0100
Subject: [PATCH 2127/3253] bitlbee: disable gcov

Code coverage reports is not useful at all for users.
This is a feature for developer.
---
 .../networking/instant-messengers/bitlbee/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 2ed7fbcee3b5..4aa04806e61c 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     ++ optional enableLibPurple pidgin;
 
   configureFlags = [
-    "--gcov=1"
     "--otr=1"
     "--ssl=gnutls"
     "--pidfile=/var/lib/bitlbee/bitlbee.pid"

From d334c1c1d00038801e5c243496105e6f02822eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Sep 2018 10:27:49 +0100
Subject: [PATCH 2128/3253] nixos/bitlbee: option to use pam

---
 nixos/modules/services/networking/bitlbee.nix | 41 +++++++++++++------
 .../instant-messengers/bitlbee/default.nix    | 17 +++++---
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index 392a8d5c2e7c..46e3b7457610 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -7,9 +7,10 @@ let
   cfg = config.services.bitlbee;
   bitlbeeUid = config.ids.uids.bitlbee;
 
-  bitlbeePkg = if cfg.libpurple_plugins == []
-  then pkgs.bitlbee
-  else pkgs.bitlbee.override { enableLibPurple = true; };
+  bitlbeePkg = pkgs.bitlbee.override {
+    enableLibPurple = cfg.libpurple_plugins != [];
+    enablePam = cfg.authBackend == "pam";
+  };
 
   bitlbeeConfig = pkgs.writeText "bitlbee.conf"
     ''
@@ -20,6 +21,7 @@ let
     DaemonInterface = ${cfg.interface}
     DaemonPort = ${toString cfg.portNumber}
     AuthMode = ${cfg.authMode}
+    AuthBackend = ${cfg.authBackend}
     Plugindir = ${pkgs.bitlbee-plugins cfg.plugins}/lib/bitlbee
     ${lib.optionalString (cfg.hostName != "") "HostName = ${cfg.hostName}"}
     ${lib.optionalString (cfg.protocols != "") "Protocols = ${cfg.protocols}"}
@@ -70,6 +72,16 @@ in
         '';
       };
 
+      authBackend = mkOption {
+        default = "storage";
+        type = types.enum [ "storage" "pam" ];
+        description = ''
+          How users are authenticated
+            storage -- save passwords internally
+            pam -- Linux PAM authentication
+        '';
+      };
+
       authMode = mkOption {
         default = "Open";
         type = types.enum [ "Open" "Closed" "Registered" ];
@@ -147,23 +159,22 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.bitlbee.enable {
-
-    users.users = singleton
-      { name = "bitlbee";
+  config =  mkMerge [
+    (mkIf config.services.bitlbee.enable {
+      users.users = singleton {
+        name = "bitlbee";
         uid = bitlbeeUid;
         description = "BitlBee user";
         home = "/var/lib/bitlbee";
         createHome = true;
       };
 
-    users.groups = singleton
-      { name = "bitlbee";
+      users.groups = singleton {
+        name = "bitlbee";
         gid = config.ids.gids.bitlbee;
       };
 
-    systemd.services.bitlbee =
-      {
+      systemd.services.bitlbee = {
         environment.PURPLE_PLUGIN_PATH = purple_plugin_path;
         description = "BitlBee IRC to other chat networks gateway";
         after = [ "network.target" ];
@@ -172,8 +183,12 @@ in
         serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
       };
 
-    environment.systemPackages = [ bitlbeePkg ];
+      environment.systemPackages = [ bitlbeePkg ];
 
-  };
+    })
+    (mkIf (config.services.bitlbee.authBackend == "pam") {
+      security.pam.services.bitlbee = {};
+    })
+  ];
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 4aa04806e61c..fbd326919f33 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,5 +1,7 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
-enableLibPurple ? false, pidgin ? null }:
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python
+, enableLibPurple ? false, pidgin ? null
+, enablePam ? false, pam ? null
+}:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -13,18 +15,23 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
 
   buildInputs = [ gnutls glib libotr python ]
-    ++ optional enableLibPurple pidgin;
+    ++ optional enableLibPurple pidgin
+    ++ optional enablePam pam;
 
   configureFlags = [
     "--otr=1"
     "--ssl=gnutls"
     "--pidfile=/var/lib/bitlbee/bitlbee.pid"
-  ]
-  ++ optional enableLibPurple "--purple=1";
+  ] ++ optional enableLibPurple "--purple=1"
+    ++ optional enablePam "--pam=1";
 
   installTargets = [ "install" "install-dev" ];
 
   doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
+  checkPhase = ''
+    # check flags set VERBOSE=y which breaks the build due overriding a command
+    make check
+  '';
 
   enableParallelBuilding = true;
 

From 9c7d2aa353e27055e00db2c89bbd75dfb041ab16 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Mon, 1 Oct 2018 19:51:54 +0200
Subject: [PATCH 2129/3253] flink: 1.6.0 -> 1.6.1

---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index fe7b73a9e9bc..0211d3393e93 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -8,8 +8,8 @@ let
       sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
     };
     "1.6" = {
-      flinkVersion = "1.6.0";
-      sha256 = "18fnpldzs36qx7myr9rmym9g9p3qkgnd1z3lfkpbaw590ddaqr9i";
+      flinkVersion = "1.6.1";
+      sha256 = "1z4795va15qnnhk2qx3gzimzgfd9nqchfgn759fnqfmcxh6n9vw3";
     };
   };
 in

From fef46259d67d748a3b3efc3f0b26aec87fe8b68b Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Mon, 1 Oct 2018 19:54:11 +0200
Subject: [PATCH 2130/3253] flink_1_5: 1.5.3 -> 1.5.4

---
 pkgs/applications/networking/cluster/flink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index 0211d3393e93..6b9a21c102f1 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -4,8 +4,8 @@
 let
   versionMap = {
     "1.5" = {
-      flinkVersion = "1.5.3";
-      sha256 = "1fq7pd5qpchkkwhh30h3l9rhf298jfcfv2dc50z39qmwwijdjajk";
+      flinkVersion = "1.5.4";
+      sha256 = "193cgiykzbsm6ygnr1h45504xp2qxjikq188wkgivdj9a4wa04il";
     };
     "1.6" = {
       flinkVersion = "1.6.1";

From 18b468ed8186131d5a8a6590ff10253e12d0195a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 1 Oct 2018 19:57:46 +0200
Subject: [PATCH 2131/3253] gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740)

---
 pkgs/applications/misc/gollum/Gemfile.lock | 10 +++++-----
 pkgs/applications/misc/gollum/gemset.nix   | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index f63ffa091a07..977bd5e50ddd 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -11,22 +11,22 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gollum (4.1.3)
+    gollum (4.1.4)
       gemojione (~> 3.2)
-      gollum-lib (>= 4.2.9)
+      gollum-lib (~> 4.2, >= 4.2.10)
       kramdown (~> 1.9.0)
       mustache (>= 0.99.5, < 1.0.0)
       sinatra (~> 1.4, >= 1.4.4)
       useragent (~> 0.16.2)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.9)
+    gollum-lib (4.2.10)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (>= 1.6.1, < 2.0)
       rouge (~> 2.1)
-      sanitize (~> 2.1)
+      sanitize (~> 2.1.1, >= 2.1.1)
       stringex (~> 2.6)
       twitter-text (= 1.14.7)
     json (2.1.0)
@@ -43,7 +43,7 @@ GEM
     rack-protection (1.5.5)
       rack
     rouge (2.2.1)
-    sanitize (2.1.0)
+    sanitize (2.1.1)
       nokogiri (>= 1.4.4)
     sinatra (1.4.8)
       rack (~> 1.5)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 1b3cda168ac2..3413b6ba6310 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -45,10 +45,10 @@
     dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6";
+      sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7";
       type = "gem";
     };
-    version = "4.1.3";
+    version = "4.1.4";
   };
   gollum-grit_adapter = {
     dependencies = ["gitlab-grit"];
@@ -63,10 +63,10 @@
     dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj";
+      sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf";
       type = "gem";
     };
-    version = "4.2.9";
+    version = "4.2.10";
   };
   json = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   sinatra = {
     dependencies = ["rack" "rack-protection" "tilt"];

From 4652b54f380630037a5a32efd448515928024540 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 1 Oct 2018 20:21:45 +0200
Subject: [PATCH 2132/3253] tdesktop: Update the Arch patches

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index df627f57de5d..9b14ac6f2c3c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -7,8 +7,8 @@ let
     version = "1.4.0";
     sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
-    archPatchesRevision = "388448";
-    archPatchesHash = "06a1j7fxg55d3wgab9rnwv93dvwdwkx7mvsxaywwwiz7ng20rgs1";
+    archPatchesRevision = "388730";
+    archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7";
   };
 in {
   stable = mkTelegram stableVersion;

From 438559182f0c95dd75328f8f16e43793e328ddde Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Mon, 1 Oct 2018 20:37:48 +0200
Subject: [PATCH 2133/3253] heptio-ark: 0.9.4 -> 0.9.6

---
 pkgs/applications/networking/cluster/heptio-ark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix
index f786bff01d62..6a83ac34f3f9 100644
--- a/pkgs/applications/networking/cluster/heptio-ark/default.nix
+++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "heptio-ark-${version}";
-  version = "0.9.4";
+  version = "0.9.6";
 
   goPackagePath = "github.com/heptio/ark";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "heptio";
     repo = "ark";
-    sha256 = "01z0zkw7l6haxky9l45iqqnvs6104xx4195jm250nv9j1x8n59ai";
+    sha256 = "0q353a6f3hvg1gr6rmg8pbqnkrbgjchdr7f6f9503l1qbyyf95fz";
   };
 
   postInstall = "rm $bin/bin/generate";

From 16be9adf550ec242a31d04455c899b9a1fc2e979 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 07:42:09 -0500
Subject: [PATCH 2134/3253] iconpack-obsidian: 4.0.1 -> 4.3

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index b033f510f0b9..ee45a186f290 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iconpack-obsidian-${version}";
-  version = "4.0.1";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "iconpack-obsidian";
     rev = "v${version}";
-    sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab";
+    sha256 = "0np2s4mbaykwwv516959r5d9gfdmqb5hadsx18x2if4751a9qz49";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 619d66feb0689773a8fae42299663abddd421421 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 07:52:06 -0500
Subject: [PATCH 2135/3253] obsidian2: 2.5 -> 2.6

---
 pkgs/misc/themes/obsidian2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 41f29f34be88..d5de3bc43edf 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-obsidian2-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-obsidian-2";
     rev = "v${version}";
-    sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv";
+    sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 292d4464001063ee5319e30d923e8851f8cc5f6f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 09:25:52 -0500
Subject: [PATCH 2136/3253] tetra-gtk-theme: init at 1.6

---
 pkgs/misc/themes/tetra/default.nix | 39 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/misc/themes/tetra/default.nix

diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix
new file mode 100644
index 000000000000..f899ddd8717d
--- /dev/null
+++ b/pkgs/misc/themes/tetra/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, gtk3, sassc, optipng, inkscape, which }:
+
+let
+  pname = "tetra-gtk-theme";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner  = "hrdwrrsk";
+    repo   = pname;
+    rev    = version;
+    sha256 = "0jdgj7ac9842cgrjnzdqlf1f3hlf9v7xk377pvqcz2lwcr1dfaxz";
+  };
+
+  preBuild = ''
+    # Shut up inkscape's warnings
+    export HOME="$NIX_BUILD_ROOT"
+  '';
+
+  nativeBuildInputs = [ sassc optipng inkscape which ];
+  buildInputs = [ gtk3 ];
+
+  postPatch = "patchShebangs .";
+
+  buildPhase = "./render-assets.sh";
+
+  installPhase = "./install.sh -d $out";
+
+  meta = with stdenv.lib; {
+    description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme.";
+    homepage    = https://github.com/hrdwrrsk/tetra-gtk-theme;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4177bce4d22..23b2b7ac91b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22157,6 +22157,8 @@ with pkgs;
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
+  tetra-gtk-theme = callPackage ../misc/themes/tetra { };
+
   tewi-font = callPackage ../data/fonts/tewi  {};
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;

From 894872c96ab4e800b538ba28a19826908a4912dd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 09:29:28 -0500
Subject: [PATCH 2137/3253] tetra-gtk-theme: simplify a bit

---
 pkgs/misc/themes/tetra/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix
index f899ddd8717d..079cf19440bb 100644
--- a/pkgs/misc/themes/tetra/default.nix
+++ b/pkgs/misc/themes/tetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, sassc, optipng, inkscape, which }:
+{ stdenv, fetchFromGitHub, gtk3, sassc }:
 
 let
   pname = "tetra-gtk-theme";
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
     export HOME="$NIX_BUILD_ROOT"
   '';
 
-  nativeBuildInputs = [ sassc optipng inkscape which ];
+  nativeBuildInputs = [ sassc ];
   buildInputs = [ gtk3 ];
 
   postPatch = "patchShebangs .";
 
-  buildPhase = "./render-assets.sh";
-
-  installPhase = "./install.sh -d $out";
+  installPhase = ''
+    mkdir -p $out/share/themes
+    ./install.sh -d $out/share/themes
+  '';
 
   meta = with stdenv.lib; {
     description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme.";

From 7180706a66c205fd503bc8b8df378de39a8eb56d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 14:28:15 -0500
Subject: [PATCH 2138/3253] fix minor typo per reviewer feedback

---
 nixos/doc/manual/release-notes/rl-1903.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 7a393edb8fbc..9cb5b93f27cb 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -107,7 +107,7 @@
    </listitem>
    <listitem>
      <para>
-       The <literal>light</literal> module no longer use setuids binary, but
+       The <literal>light</literal> module no longer uses setuid binaries, but
        udev rules. As a consequence users of that module have to belong to the
        <literal>video</literal> group in order to use the executable
        (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).

From 5aa66991a6c16dd497013105e8225a0d49341101 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Mon, 1 Oct 2018 22:02:11 +0200
Subject: [PATCH 2139/3253] pythonPackages.django-raster: Improve django
 version support (#47484)

---
 pkgs/development/python-modules/django-raster/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 39634b8d293a..b5cb017956c4 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -1,7 +1,10 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k,
   numpy, django_colorful, pillow, psycopg2,
-  pyparsing, django_2_1, celery, boto3
+  pyparsing, django, celery, boto3
 }:
+if stdenv.lib.versionOlder django.version "2.0"
+then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2."
+else
 buildPythonPackage rec {
   version = "0.6";
   pname = "django-raster";
@@ -17,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
-                            pyparsing django_2_1 celery boto3 ];
+                            pyparsing django celery boto3 ];
 
   meta = with stdenv.lib; {
     description = "Basic raster data integration for Django";

From aaaa445a61a6c564c293e64ad6ad632492d0777e Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 1 Oct 2018 15:24:22 -0500
Subject: [PATCH 2140/3253] elementary-xfce-icon-theme: 0.13 -> 0.13.1 (#47614)

(cherry picked from commit 24d8eb1cfdddeffb1c512f40fe9f19881bd8dfd3)
---
 pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index c457a8c69ec8..d4a15a105cd3 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "elementary-xfce-icon-theme-${version}";
-  version = "0.13";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
     rev = "v${version}";
-    sha256 = "01hlpw4vh4kgyghki01jp0snbn0g79mys28fb1m993mivnlzmn75";
+    sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
   };
 
   nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];

From 25a0d72e58abb6db7d297baba7f37cca9395a324 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 1 Oct 2018 15:26:30 -0500
Subject: [PATCH 2141/3253] xterm: 335 -> 337 (#47615)

---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 292e4e5ba38b..4306c4fe9559 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-335";
+  name = "xterm-337";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0";
+    sha256 = "19ygmswikbwa633bxf24cvk7qdxjz2nq3cv9zdgqvrs7sgg7gb6c";
   };
 
   buildInputs =

From dc30d9367a6461352cee9fc0d46f696d69707442 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Oct 2018 15:26:34 -0500
Subject: [PATCH 2142/3253] tetra-gtk-theme: no pname per reviewer feedback

Somehow I thought i'd pushed this already,
sorry for that @timokau!
---
 pkgs/misc/themes/tetra/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix
index 079cf19440bb..bcaf67d79706 100644
--- a/pkgs/misc/themes/tetra/default.nix
+++ b/pkgs/misc/themes/tetra/default.nix
@@ -1,16 +1,12 @@
 { stdenv, fetchFromGitHub, gtk3, sassc }:
 
-let
-  pname = "tetra-gtk-theme";
-in
-
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  name = "tetra-gtk-theme-${version}";
   version = "0.1.6";
 
   src = fetchFromGitHub {
     owner  = "hrdwrrsk";
-    repo   = pname;
+    repo   = "tetra-gtk-theme";
     rev    = version;
     sha256 = "0jdgj7ac9842cgrjnzdqlf1f3hlf9v7xk377pvqcz2lwcr1dfaxz";
   };

From 0878a160702eac1c23cf0fc27a4660af8d64fad5 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 1 Oct 2018 15:28:46 -0500
Subject: [PATCH 2143/3253] pasystray: 0.6.0 -> 0.7.0 (#47618)

---
 pkgs/tools/audio/pasystray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 8fe6feaee0a6..57896fd7f637 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "pasystray-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
     rev = name;
-    sha256 = "0k13s7pmz5ks3kli8pwhzd47hcjwv46gd2fgk7i4fbkfwf3z279h";
+    sha256 = "0cc9hjyw4gr4ip4lw74pzb1l9sxs3ffhf0xn0m1fhmyfbjyixwkh";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 510c85f349507bc99418cd669de75981a3537448 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Mon, 1 Oct 2018 22:37:41 +0200
Subject: [PATCH 2144/3253] gitlab-runner: 11.3.0 -> 11.3.1 (#47623)

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 203e140b369e..9981bca3b68e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "11.3.0";
+  version = "11.3.1";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "1xl48lrycwy4d7h83ydp9gj27d9mhbpa4xrd1bn7i3ad9lrn7xjz";
+    sha256 = "13w8fjjc087klracv4ggjifj08vx3b549mhy220r5wn9aga5m549";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "0afjg4hv9iy80anl5h7cnjdxzk4zrkj2zn3f4qsl9rf7354ik1zj";
+    sha256 = "10s2g6mqy7p5dmjmlxggsfqqqf4bfrqjri7m2nd11l1lf4mmr2kk";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0p992mm8zz30nx0q076g0waqvfknn05wyyr1n1sxglbh9nmym157";
+    sha256 = "1k978zsvsvr7ys18zqjg6n45cwi3nj0919fwj442dv99s95zyf6s";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 358a1c8a28902da87ccfe49cec3b5f23bafa3d67 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Mon, 1 Oct 2018 23:01:38 +0200
Subject: [PATCH 2145/3253] nixos/tests/nix-ssh-serve.nix: Use stable nix
 (#47584)

---
 nixos/tests/nix-ssh-serve.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix
index aa366d8612d7..494d55121eb1 100644
--- a/nixos/tests/nix-ssh-serve.nix
+++ b/nixos/tests/nix-ssh-serve.nix
@@ -14,8 +14,8 @@ in
              keys = [ snakeOilPublicKey ];
              protocol = "ssh-ng";
            };
-         server.nix.package = pkgs.nixUnstable;
-         client.nix.package = pkgs.nixUnstable;
+         server.nix.package = pkgs.nix;
+         client.nix.package = pkgs.nix;
        };
      testScript = ''
        startAll;

From da4813072f3cab88cff1ee71be9f877c3ed774a8 Mon Sep 17 00:00:00 2001
From: Milan Svoboda <milan.svoboda@centrum.cz>
Date: Sat, 29 Sep 2018 23:10:23 +0200
Subject: [PATCH 2146/3253] boost: fix fiber header (#47540)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

include/boost/fiber/detail/context_spmc_queue.hpp:1:1: error: stray ‘\357’ in program
caused by a leftover UTF-8 Byte Order Mark
---
 pkgs/development/libraries/boost/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 4131e5f7a27c..1ab0718e7960 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
   postFixup = ''
     # Make boost header paths relative so that they are not runtime dependencies
     cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
-      -exec sed '1i#line 1 "{}"' -i '{}' \;
+      -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
   '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
     $RANLIB "$out/lib/"*.a
   '';

From 9dbb71b1d32ae7418875c052515ff9b2bf5cd645 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Mon, 1 Oct 2018 23:37:25 +0200
Subject: [PATCH 2147/3253] gitlab-runner-v1: remove v1 package (#47624)

It was required for gitlab < 9 which is not supported anymore since some time.

While removinf the V1 the patch was refreshed to cleanly work with version 11.x
---
 .../gitlab-runner/fix-shell-path.patch        | 15 ++--
 .../gitlab-runner/v1.nix                      | 68 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 9 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
index 8f71f9ed630c..8aa419ea5f94 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
@@ -1,16 +1,16 @@
 diff --git a/shells/bash.go b/shells/bash.go
-index 839b7781..2b478e1e 100644
+index 673f4765..a58cc5e2 100644
 --- a/shells/bash.go
 +++ b/shells/bash.go
-@@ -7,6 +7,7 @@ import (
- 	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
- 	"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+@@ -5,6 +5,7 @@ import (
+ 	"bytes"
+ 	"fmt"
  	"io"
 +	"os/exec"
  	"path"
  	"runtime"
  	"strconv"
-@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
+@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
  	if info.User != "" {
  		script.Command = "su"
  		if runtime.GOOS == "linux" {
@@ -22,4 +22,7 @@ index 839b7781..2b478e1e 100644
 +			script.Arguments = append(script.Arguments, "-s", shellPath)
  		}
  		script.Arguments = append(script.Arguments, info.User)
- 		script.Arguments = append(script.Arguments, "-c", shellCommand)
\ No newline at end of file
+ 		script.Arguments = append(script.Arguments, "-c", shellCommand)
+-- 
+2.18.0
+
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
deleted file mode 100644
index 33cbd23d062c..000000000000
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
-
-let
-  version = "1.11.5";
-  # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
-  docker_x86_64 = fetchurl {
-    url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0";
-  };
-
-  docker_arm = fetchurl {
-    url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla";
-  };
-in
-buildGoPackage rec {
-  inherit version;
-  name = "gitlab-runner-${version}";
-  goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
-  commonPackagePath = "${goPackagePath}/common";
-  buildFlagsArray = ''
-    -ldflags=
-      -X ${commonPackagePath}.NAME=gitlab-runner
-      -X ${commonPackagePath}.VERSION=${version}
-      -X ${commonPackagePath}.REVISION=v${version}
-  '';
-
-  src = fetchFromGitLab {
-    owner = "gitlab-org";
-    repo = "gitlab-ci-multi-runner";
-    rev = "v${version}";
-    sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv";
-  };
-
-  patches = [ ./fix-shell-path.patch ];
-
-  buildInputs = [ go-bindata ];
-
-  preBuild = ''
-    (
-    # go-bindata names the assets after the filename thus we create a symlink with the name we want
-    cd go/src/${goPackagePath}
-    ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
-    ln -sf ${docker_arm} prebuilt-arm.tar.xz
-    go-bindata \
-        -pkg docker \
-        -nocompress \
-        -nomemcopy \
-        -o executors/docker/bindata.go \
-        prebuilt-x86_64.tar.xz \
-        prebuilt-arm.tar.xz
-    )
-  '';
-
-  postInstall = ''
-    install -d $out/bin
-    # The recommended name is gitlab-runner so we create a symlink with that name
-    ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
-  '';
-
-  meta = with lib; {
-    description = "GitLab Runner the continuous integration executor of GitLab";
-    license = licenses.mit;
-    homepage = https://about.gitlab.com/gitlab-ci/;
-    platforms = platforms.unix;
-    maintainers = [ lib.maintainers.bachp ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23b2b7ac91b0..907202e279f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2792,7 +2792,6 @@ with pkgs;
   gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
 
   gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
-  gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { };
 
   gitlab-shell = callPackage ../applications/version-management/gitlab-shell { };
 

From 781206217e7ebf46a6b98b1a229022e34ec3b0cf Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 1 Oct 2018 23:08:07 +0200
Subject: [PATCH 2148/3253] nvtop: use version-independent libnvidia-ml.so
 symlink

---
 pkgs/tools/system/nvtop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix
index 054de73c080f..0b4a33e43853 100644
--- a/pkgs/tools/system/nvtop/default.nix
+++ b/pkgs/tools/system/nvtop/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include"
-    "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so.390.67"
+    "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so"
     "-DCMAKE_BUILD_TYPE=Release"
   ];
 

From fe5d78a1f29f09906c9571fa2e023c81c65095ab Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Mon, 1 Oct 2018 23:43:34 +0200
Subject: [PATCH 2149/3253] terraform-landscape: 0.2.0 -> 0.2.1 (#47611)

---
 .../cluster/terraform-landscape/Gemfile.lock   |  4 ++--
 .../cluster/terraform-landscape/gemset.nix     | 18 ++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
index 0b5a091fbb43..b801fad546df 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
+++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
     diffy (3.2.1)
     highline (1.7.10)
     polyglot (0.3.5)
-    terraform_landscape (0.2.0)
+    terraform_landscape (0.2.1)
       colorize (~> 0.7)
       commander (~> 4.4)
       diffy (~> 3.0)
@@ -22,4 +22,4 @@ DEPENDENCIES
   terraform_landscape
 
 BUNDLED WITH
-   1.14.6
+   1.16.3
diff --git a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
index 5c3946f3212e..aa3f5142aa5e 100644
--- a/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
+++ b/pkgs/applications/networking/cluster/terraform-landscape/gemset.nix
@@ -1,7 +1,5 @@
 {
   colorize = {
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
@@ -11,8 +9,6 @@
   };
   commander = {
     dependencies = ["highline"];
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "11sd2sb0id2dbxkv4pvymdiia1xxhms45kh4nr8mryqybad0fwwf";
@@ -21,8 +17,6 @@
     version = "4.4.6";
   };
   diffy = {
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg";
@@ -31,8 +25,6 @@
     version = "3.2.1";
   };
   highline = {
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
@@ -41,8 +33,6 @@
     version = "1.7.10";
   };
   polyglot = {
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -52,19 +42,15 @@
   };
   terraform_landscape = {
     dependencies = ["colorize" "commander" "diffy" "treetop"];
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mlpbsmysyhhbjx40gbwxr4mx7d3qpblbf5ms2v607b8a3saapzj";
+      sha256 = "1i93pih7r6zcqpjhsmvkpfkgbh0l66c60i6fkiymq7vy2xd6wnns";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.2.1";
   };
   treetop = {
     dependencies = ["polyglot"];
-    groups = ["default"];
-    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";

From 5c5cb36f7a90f18e1fc5bf91a940a2c57b5c9957 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maxbode@gmail.com>
Date: Mon, 1 Oct 2018 23:56:08 +0200
Subject: [PATCH 2150/3253] stern: init at 1.8.0 (#47605)

---
 .../networking/cluster/stern/default.nix      |  25 ++
 .../networking/cluster/stern/deps.nix         | 345 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 372 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/stern/default.nix
 create mode 100644 pkgs/applications/networking/cluster/stern/deps.nix

diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix
new file mode 100644
index 000000000000..c7b90d05ff2f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "stern-${version}";
+  version = "1.8.0";
+
+  goPackagePath = "github.com/wercker/stern";
+
+  src = fetchFromGitHub {
+    owner = "wercker";
+    repo = "stern";
+    rev = "${version}";
+    sha256 = "14ccgb41ca2gym7wab0q02ap8g94nhfaihs41qky4wnsfv6j1zc8";
+  };
+
+  goDeps = ./deps.nix;
+
+   meta = with lib; {
+      description      = "Multi pod and container log tailing for Kubernetes";
+      homepage         = "https://github.com/wercker/stern";
+      license          = licenses.asl20;
+      maintainers      = with maintainers; [ mbode ];
+      platforms        = platforms.unix;
+    };
+}
diff --git a/pkgs/applications/networking/cluster/stern/deps.nix b/pkgs/applications/networking/cluster/stern/deps.nix
new file mode 100644
index 000000000000..5c5d34727115
--- /dev/null
+++ b/pkgs/applications/networking/cluster/stern/deps.nix
@@ -0,0 +1,345 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "97efc2c9ffd9fe8ef47f7f3203dc60bbca547374";
+      sha256 = "1zf8imq0hgba13rbn260pqf2qd41cg3i4wzzq2i0li3lxnjglkv1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev =  "1ff28809256a84bb6966640ff3d0371af82ccba4";
+      sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "2d684516a8861da43017284349b7e303e809ac21";
+      sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
+      sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "c0656edd0d9eab7c66d1eb0c568f9039345796f7";
+      sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev =  "4030bb1f1f0c35b30ca7009e9ebd06849dd45306";
+      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "24818f796faf91cd76ec7bddd72458fbced7a6c1";
+      sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "0c5108395e2debce0d731cf0287ddf7242066aba";
+      sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev =  "787624de3eb7bd915c329cba748687a3b22666a6";
+      sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "6633656539c1639d9d78127b7d47c622b5d7b6dc";
+      sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "0ac74bba4a81211b28e32ef260c0f16ae41f1377";
+      sha256 = "07aa3jz9rmhn3cfv06z9549kfpsx4i85qbi3j7q60z2pvasjxqv5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev =  "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "05fbef0ca5da472bbf96c9322b84a53edc03c9fd";
+      sha256 = "1jc7xba9v3scsc8fg5nb9g6lrxxgiaaykx8q817arq9b737y90gm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev =  "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev =  "5f041e8faa004a95c88a202771f4cc3e991971e6";
+      sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "a114f312e075f65bf30d6d9a1430113f857e543b";
+      sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "3ebe029320b2676d667ae88da602a5f854788a8a";
+      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/v2pro/plz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/v2pro/plz";
+      rev =  "10fc95fad3224a032229e59f6e7023137d82b526";
+      sha256 = "0p04pjrz55zn6dbi6l0705prjmhqnmvsvrxzc74hl12wi6r35drp";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "49796115aa4b964c318aad4f3084fdb41e9aa067";
+      sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "1c05540f6879653db88113bc4a2b70aec4bd491f";
+      sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "a6bd8cefa1811bd24b86f8902872e4e8225f74c4";
+      sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "e4b3c5e9061176387e7cea65e4dc5853801f3fb7";
+      sha256 = "1ijx254fycsnr16m24k7lqvkmdkkrqxsl9mr1kz4mf61a8n0arf9";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "f51c12702a4d776e4c1fa9b0fabab841babae631";
+      sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06";
+      sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6";
+      sha256 = "1dpmd59jlkxgrp5aaf8420344c6nq4kjlc1avgcp7690yrzc50v6";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "594fc14b6f143d963ea2c8132e09e73fe244b6c9";
+      sha256 = "0xykhpmjgagyb0ac4y0ps4v1s9bd2b1sc0simh48c41a9fk3yvr7";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "739dd8f9d4801eb23e2bc43423c0b4acaaded29a";
+      sha256 = "15psjmb14rz4kwysim9vfbbylx0khkw29b195rziv1vk202lh28k";
+    };
+  }
+]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 907202e279f1..de4d993a78e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22114,6 +22114,8 @@ with pkgs;
 
   steamcontroller = callPackage ../misc/drivers/steamcontroller { };
 
+  stern = callPackage ../applications/networking/cluster/stern { };
+
   streamripper = callPackage ../applications/audio/streamripper { };
 
   sqsh = callPackage ../development/tools/sqsh { };

From 736d8af3fd0ae1ade885bb2675ecbc0a5e9a7030 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Mon, 1 Oct 2018 21:59:56 +0000
Subject: [PATCH 2151/3253] ocamlPackages.piqi: 0.6.13 -> 0.6.14 (#47621)

---
 pkgs/development/ocaml-modules/piqi/default.nix     |  6 +++---
 .../ocaml-modules/piqi/safe-string.patch            | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/piqi/safe-string.patch

diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index c7baa87a3314..6be1595f7c59 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.13";
+  version = "0.6.14";
   name    = "piqi-${version}";
  
   src = fetchurl {
     url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz";
-    sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l";
+    sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7";
   };
 
   buildInputs = [ ocaml findlib which ocaml_optcomp ];
   propagatedBuildInputs = [ulex xmlm easy-format base64];
 
-  patches = [ ./no-ocamlpath-override.patch ./safe-string.patch ];
+  patches = [ ./no-ocamlpath-override.patch ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/piqi/safe-string.patch b/pkgs/development/ocaml-modules/piqi/safe-string.patch
deleted file mode 100644
index fbc2864d5348..000000000000
--- a/pkgs/development/ocaml-modules/piqi/safe-string.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/piqilib/piqi_json_parser.mll
-+++ b/piqilib/piqi_json_parser.mll
-@@ -189,8 +189,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-     let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in
-     let s = lexbuf.lex_buffer in
-     let start = lexbuf.lex_start_pos in
--    check_adjust_utf8 v lexbuf s start len;
--    Buffer.add_substring v.buf s start len
-+    check_adjust_utf8 v lexbuf (Bytes.unsafe_to_string s) start len;
-+    Buffer.add_subbytes v.buf s start len
- 
-   let map_lexeme f lexbuf =
-     let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos in

From 873173aa3833487147b3c34c056e121a57791be7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Oct 2018 15:02:05 -0700
Subject: [PATCH 2152/3253] inboxer: 1.1.4 -> 1.1.5 (#47047)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/inboxer/versions
---
 pkgs/applications/networking/mailreaders/inboxer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index e033e532ec1a..eb4d710857c1 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "inboxer-${version}";
-  version = "1.1.4";
+  version = "1.1.5";
 
   meta = with stdenv.lib; {
     description = "Unofficial, free and open-source Google Inbox Desktop App";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb";
-    sha256 = "1jhx7mghslk8s2h50g8avnspf2v2r8yj0i8hkhw3qy2sa91m3ck1";
+    sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4";
   };
 
   unpackPhase = ''

From 5716d421728c65a17f9381c0ce4e4b545e9bad92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Oct 2018 15:02:26 -0700
Subject: [PATCH 2153/3253] fanficfare: 2.28.0 -> 3.0.0 (#47065)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fanficfare/versions
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index b31d4cf93e64..1dec03e985b3 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.28.0";
+  version = "3.0.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "18icxs9yaazz9swa2g4ppjsdbl25v22fdv4c1c3xspj3hwksjlvw";
+    sha256 = "0m8p1nn4621fspcas4g4k8y6fnnlzn7kxjxw2fapdrk3cz1pgi69";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

From d25ce11fbc291cb31f578268877d14d0a833cf78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 1 Oct 2018 15:03:09 -0700
Subject: [PATCH 2154/3253] springLobby: 0.264 -> 0.267 (#46948)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/springlobby/versions
---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 632a047e96c7..fa7fad3ecd92 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "springlobby-${version}";
-  version = "0.264";
+  version = "0.267";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "1i31anvvywhl2m8014m3vk74cj74l37j6a0idzfhd4ack8b9hg2x";
+    sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 09df5da98f6dfe09dba0541c3a40d5c8a570ff6a Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <phile314@users.noreply.github.com>
Date: Tue, 2 Oct 2018 00:08:00 +0200
Subject: [PATCH 2155/3253] slimserver: Relax audio scan dependency (#47029)

---
 pkgs/servers/slimserver/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 523292f6b0f4..cf0fddd6699b 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -10,11 +10,6 @@ buildPerlPackage rec {
     sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/Logitech/slimserver/pull/204.patch";
-    sha256 = "0n1c8nsbvqkmwj5ivkcxh1wkqqm1lwymmfz9i47ih6ifj06hkpxk";
-  } ) ];
-
   buildInputs = [
     makeWrapper
     perl
@@ -72,6 +67,10 @@ buildPerlPackage rec {
     rm -rf CPAN
     rm -rf Bin
     touch Makefile.PL
+
+    # relax audio scan version constraints
+    substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01"
+    substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93"
     '';
 
   preConfigurePhase = "";

From 483e2a1a6bfe848e74e39bdc7a5f38adb9c9516e Mon Sep 17 00:00:00 2001
From: Paul TREHIOU <nyanloutre@users.noreply.github.com>
Date: Tue, 2 Oct 2018 00:13:03 +0200
Subject: [PATCH 2156/3253] btchip: init at 0.1.28

electrum and electron-cash: add support for btchip library (#40816)
---
 .../misc/electron-cash/default.nix            |  1 +
 pkgs/applications/misc/electrum/default.nix   |  2 +-
 .../python-modules/btchip/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/btchip/default.nix

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 66a423238b34..8105f4d61bd8 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -34,6 +34,7 @@ python3Packages.buildPythonApplication rec {
     # plugins
     keepkey
     trezor
+    btchip
   ];
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 95754579c487..537627a10d2d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -41,10 +41,10 @@ python3Packages.buildPythonApplication rec {
     # plugins
     keepkey
     trezor
+    btchip
 
     # TODO plugins
     # amodem
-    # btchip
   ];
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix
new file mode 100644
index 000000000000..6e2e703dd569
--- /dev/null
+++ b/pkgs/development/python-modules/btchip/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, hidapi, pyscard, ecdsa }:
+
+buildPythonPackage rec {
+  pname = "btchip-python";
+  version = "0.1.28";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10yxwlsr99gby338rsnczkfigcy36fiajpkr6f44438qlvbx02fs";
+  };
+
+  propagatedBuildInputs = [ hidapi pyscard ecdsa ];
+
+  # tests requires hardware
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python communication library for Ledger Hardware Wallet products";
+    homepage = "https://github.com/LedgerHQ/btchip-python";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2da2892f9beb..c8cb678618f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -250,6 +250,8 @@ in {
 
   dependency-injector = callPackage ../development/python-modules/dependency-injector { };
 
+  btchip = callPackage ../development/python-modules/btchip { };
+
   dbf = callPackage ../development/python-modules/dbf { };
 
   dbfread = callPackage ../development/python-modules/dbfread { };

From 55b6cad5376186affaebc2d990515ad5f1cef1c1 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 1 Oct 2018 17:14:26 -0500
Subject: [PATCH 2157/3253] lz4: 1.8.2 -> 1.8.3 (#47547)

---
 pkgs/tools/compression/lz4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 7e29ee2b856a..1cd4c30a3886 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
-    sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2";
+    sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g";
     rev = "v${version}";
     repo = "lz4";
     owner = "lz4";

From 94de259013beabc0b642e46d62a780d2ddce5e6c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 2 Oct 2018 00:21:04 +0200
Subject: [PATCH 2158/3253] puredata: 0.48-2 -> 0.49-0 (#47505)

---
 pkgs/applications/audio/puredata/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 354b7c4b6c7b..6ade9042b532 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation  rec {
   name = "puredata-${version}";
-  version = "0.48-2";
+  version = "0.49-0";
 
   src = fetchurl {
     url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
-    sha256 = "0p86hncgzkrl437v2wch2fg9iyn6mnrgbn811sh9pwmrjj2f06v8";
+    sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j";
   };
 
   nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
@@ -20,11 +20,9 @@ stdenv.mkDerivation  rec {
     "--enable-jack"
     "--enable-fftw"
     "--disable-portaudio"
+    "--disable-oss"
   ];
 
-  # https://github.com/pure-data/pure-data/issues/188
-  # --disable-oss
-
   postInstall = ''
     wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
   '';

From f8d681a91f77a5bc40e65358137f83dcb02759be Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 2 Oct 2018 00:07:25 +0200
Subject: [PATCH 2159/3253] nixos/clamav: fix daemon/updater services toggling

---
 nixos/modules/services/security/clamav.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 9ad0095252de..b3af4d85cc4b 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -95,7 +95,7 @@ in
     environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
     environment.etc."clamav/clamd.conf".source = clamdConfigFile;
 
-    systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable {
+    systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
       description = "ClamAV daemon (clamd)";
       after = optional cfg.updater.enable "clamav-freshclam.service";
       requires = optional cfg.updater.enable "clamav-freshclam.service";
@@ -116,7 +116,7 @@ in
       };
     };
 
-    systemd.timers.clamav-freshclam = optionalAttrs cfg.updater.enable {
+    systemd.timers.clamav-freshclam = mkIf cfg.updater.enable {
       description = "Timer for ClamAV virus database updater (freshclam)";
       wantedBy = [ "timers.target" ];
       timerConfig = {
@@ -125,7 +125,7 @@ in
       };
     };
 
-    systemd.services.clamav-freshclam = optionalAttrs cfg.updater.enable {
+    systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
       description = "ClamAV virus database updater (freshclam)";
       restartTriggers = [ freshclamConfigFile ];
 

From 11ba2f270f2733d933ff5a70ddbc617512cecd1d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 1 Oct 2018 23:34:06 +0200
Subject: [PATCH 2160/3253] nixos/clamav: fix freshclam service if db up to
 date

---
 nixos/modules/services/security/clamav.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index b3af4d85cc4b..04b433f8f2bf 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -137,6 +137,7 @@ in
       serviceConfig = {
         Type = "oneshot";
         ExecStart = "${pkg}/bin/freshclam";
+        SuccessExitStatus = "1"; # if databases are up to date
         PrivateTmp = "yes";
         PrivateDevices = "yes";
       };

From 483880aeac6a04efe76c2834b1835fbcf12b2322 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Mon, 1 Oct 2018 18:27:41 -0400
Subject: [PATCH 2161/3253] linux: Add hardened test kernel (#47570)

---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d392ddc65f9b..7e4395b7fef0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14380,6 +14380,9 @@ with pkgs;
   linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest);
   linux_latest_hardened = linuxPackages_latest_hardened.kernel;
 
+  linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing);
+  linux_testing_hardened = linuxPackages_testing_hardened.kernel;
+
   linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));
 
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));

From c1dbb90bfdc3b13aa5976973a621fc104a0e55fb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 2 Oct 2018 00:35:32 +0200
Subject: [PATCH 2162/3253] lightdm: add extraConfig option (#47630)

---
 .../modules/services/x11/display-managers/lightdm.nix  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 8078b93a7574..a34f2370649f 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -46,6 +46,7 @@ let
         greeters-directory = ${cfg.greeter.package}
       ''}
       sessions-directory = ${dmcfg.session.desktops}/share/xsessions
+      ${cfg.extraConfig}
 
       [Seat:*]
       xserver-command = ${xserverWrapper}
@@ -113,6 +114,15 @@ in
         };
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          user-authority-in-system-dir = true
+        '';
+        description = "Extra lines to append to LightDM section.";
+      };
+
       background = mkOption {
         type = types.str;
         default = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bottom.png";

From 46e284aedd03111d9718487a6c3230f86e4b95f5 Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Tue, 2 Oct 2018 00:39:48 +0200
Subject: [PATCH 2163/3253] ifdnfc: init at 2016-03-01 (#47625)

---
 pkgs/tools/security/ifdnfc/default.nix | 45 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/tools/security/ifdnfc/default.nix

diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix
new file mode 100644
index 000000000000..5731f3ef8bb6
--- /dev/null
+++ b/pkgs/tools/security/ifdnfc/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub , pkgconfig
+, pcsclite
+, autoreconfHook
+, libnfc
+}:
+
+stdenv.mkDerivation rec {
+  name = "ifdnfc-${version}";
+  version = "2016-03-01";
+
+  src = fetchFromGitHub {
+    owner = "nfc-tools";
+    repo = "ifdnfc";
+    rev = "0e48e8e";
+    sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg";
+  };
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ pcsclite libnfc ];
+
+  configureFlags = [ "--prefix=$(out)" ];
+  makeFlags = [ "DESTDIR=/" "usbdropdir=$(out)/pcsc/drivers" ];
+
+  meta = with stdenv.lib; {
+    description = "PC/SC IFD Handler based on libnfc";
+    longDescription =
+    '' libnfc Interface Plugin to be used in <code>services.pcscd.plugins</code>.
+       It provides support for all readers which are not supported by ccid but by libnfc.
+
+       For activating your reader you need to run
+       <code>ifdnfc-activate yes<code> with this package in your
+       <code>environment.systemPackages</code>
+
+       To use your reader you may need to blacklist your reader kernel modules:
+       <code>boot.blacklistedKernelModules = [ "pn533" "pn533_usb" "nfc" ];</code>
+
+       Supports the pn533 smart-card reader chip which is for example used in
+       the SCM SCL3711.
+    '';
+    homepage = https://github.com/nfc-tools/ifdnfc;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ makefu ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e4395b7fef0..c58ea359c27a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4626,6 +4626,7 @@ with pkgs;
   pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
 
   pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
+  ifdnfc = callPackage ../tools/security/ifdnfc { };
 
   pdd = python3Packages.callPackage ../tools/misc/pdd { };
 

From 2ada8f78d041fe958814f2c7b49e50eeacac0eb0 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Tue, 2 Oct 2018 00:40:10 +0200
Subject: [PATCH 2164/3253] simple-websocket-server: Init at 20180414 (#47567)

---
 .../simple-websocket-server/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/simple-websocket-server/default.nix

diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix
new file mode 100644
index 000000000000..ee9444fd38ec
--- /dev/null
+++ b/pkgs/development/python-modules/simple-websocket-server/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "simple-websocket-server";
+  version = "20180414";
+  src = fetchFromGitHub {
+    owner = "dpallot";
+    repo = "simple-websocket-server";
+    rev = "34e6def93502943d426fb8bb01c6901341dd4fe6";
+    sha256 = "19rcpdx4vxg9is1cpyh9m9br5clyzrpb7gyfqsl0g3im04m098n5";
+  };
+
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    description = "A python based websocket server that is simple and easy to use";
+    homepage = https://github.com/dpallot/simple-websocket-server/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ rvolosatovs ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8cb678618f8..8f04a0e710d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4297,6 +4297,8 @@ in {
 
   schema = callPackage ../development/python-modules/schema {};
 
+  simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {};
+
   stem = callPackage ../development/python-modules/stem { };
 
   svg-path = callPackage ../development/python-modules/svg-path { };

From 8621415289becc0ef8ab4aee2e4d07894702007d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:31 +0000
Subject: [PATCH 2165/3253] [cpan2nix] perlPackages.ArchiveExtract: cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 18ca62c02b04..2d4490731327 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -493,7 +493,6 @@ let
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
       sha256 = "25cbc2d5626c14d39a0b5e4fe8383941e085c9a7e0aa873d86e81b6e709025f4";
     };
-    propagatedBuildInputs = [ ModuleLoadConditional ];
     meta = {
       description = "Generic archive extracting mechanism";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From b139a94587ae589dd4d92517a9e82daf252a014f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:31 +0000
Subject: [PATCH 2166/3253] [cpan2nix] perlPackages.AttributeHandlers: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2d4490731327..18fc60073140 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -407,17 +407,7 @@ let
     };
   };
 
-  AttributeHandlers = buildPerlPackage {
-    name = "Attribute-Handlers-0.99";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Attribute-Handlers-0.99.tar.gz;
-      sha256 = "937ea3ebfc9b14f4a4148bf3c32803709edbd12a387137a26370b38ee1fc9835";
-    };
-    meta = {
-      description = "Simpler definition of attribute handlers";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  AttributeHandlers = null; # part of Perl 5.26
 
   AttributeParamsValidate = buildPerlPackage {
     name = "Attribute-Params-Validate-1.21";

From 002a2a8d399902acff6ea1d362ec374006858db8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:34 +0000
Subject: [PATCH 2167/3253] [cpan2nix] perlPackages.CPANMeta: removed built-in

---
 pkgs/top-level/perl-packages.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 18fc60073140..bdb5ea9f2287 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2795,18 +2795,7 @@ let
      };
   };
 
-  CPANMeta = buildPerlPackage rec {
-    name = "CPAN-Meta-2.150010";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "1mm3dfw3ffyzb2ikpqn9l6zyqrxijb4vyywmbx2l21ryqwp0zy74";
-    };
-    meta = {
-      homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta;
-      description = "The distribution metadata for a CPAN dist";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  CPANMeta = null; # part of Perl 5.26
 
   CPANMetaCheck = buildPerlPackage rec {
     name = "CPAN-Meta-Check-0.014";

From 34d42976681beca8c855abb7407296291da4397d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:35 +0000
Subject: [PATCH 2168/3253] [cpan2nix] perlPackages.CPANMetaRequirements:
 removed built-in

---
 pkgs/top-level/perl-packages.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bdb5ea9f2287..789e3543f546 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2810,18 +2810,7 @@ let
     };
   };
 
-  CPANMetaRequirements = buildPerlPackage {
-    name = "CPAN-Meta-Requirements-2.140";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.140.tar.gz;
-      sha256 = "0898645e8e86f0922f0f0502b503f592a8eb3d3176b4fd87adcc7ba51e751fa9";
-    };
-    meta = {
-      homepage = https://github.com/dagolden/CPAN-Meta-Requirements;
-      description = "A set of version requirements for a CPAN dist";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  CPANMetaRequirements = null; # part of Perl 5.26
 
   CPANMetaYAML = buildPerlPackage rec {
     name = "CPAN-Meta-YAML-0.018";

From 877253bb2485c7dfd03b2a4107faafc95fe9cdbe Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:35 +0000
Subject: [PATCH 2169/3253] [cpan2nix] perlPackages.CPANMetaYAML: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 789e3543f546..05e1395f9b42 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2812,19 +2812,7 @@ let
 
   CPANMetaRequirements = null; # part of Perl 5.26
 
-  CPANMetaYAML = buildPerlPackage rec {
-    name = "CPAN-Meta-YAML-0.018";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "150jh9l7baddl2587m23qs2l0pb395qsx9bhsgdsnn6y9k4zgjik";
-    };
-    doCheck = true;
-    meta = {
-      homepage = https://github.com/dagolden/CPAN-Meta-YAML;
-      description = "Read and write a subset of YAML for CPAN Meta files";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  CPANMetaYAML = null; # part of Perl 5.26
 
   CPANPerlReleases = buildPerlPackage rec {
     name = "CPAN-Perl-Releases-3.74";

From 5342617b49072971cedd554975636086dcb54d7e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:12:35 +0000
Subject: [PATCH 2170/3253] [cpan2nix] perlPackages.CPANPerlReleases: 3.74 ->
 3.76

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 05e1395f9b42..d9c2d776ed1b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2815,10 +2815,10 @@ let
   CPANMetaYAML = null; # part of Perl 5.26
 
   CPANPerlReleases = buildPerlPackage rec {
-    name = "CPAN-Perl-Releases-3.74";
+    name = "CPAN-Perl-Releases-3.76";
     src = fetchurl {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
-      sha256 = "0qdh79fl38cyq9kp2g2s934gl1nn5jd88rgmqarqcmja8xhpfcp3";
+      sha256 = "0p9anb92sfi6cfr3ia8yvd3scn0bzwh2r6z8f6jrawjr8lilgahj";
     };
     meta = {
       homepage = https://github.com/bingos/cpan-perl-releases;

From 53fb0d493d892098f1acdbea48a5b35de20a4ebf Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:00 +0000
Subject: [PATCH 2171/3253] [cpan2nix] perlPackages.DigestMD5: removed built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d9c2d776ed1b..59bcedd37e67 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4444,17 +4444,7 @@ let
     };
   };
 
-  DigestMD5 = buildPerlPackage {
-    name = "Digest-MD5-2.55";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/G/GA/GAAS/Digest-MD5-2.55.tar.gz;
-      sha256 = "03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c";
-    };
-    meta = {
-      description = "Perl interface to the MD-5 algorithm";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  DigestMD5 = null; # part of Perl 5.26
 
   DigestMD5File = buildPerlPackage {
     name = "Digest-MD5-File-0.08";

From 44599c23a4321caae981fa49500cddbdf2cd7e91 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:02 +0000
Subject: [PATCH 2172/3253] [cpan2nix] perlPackages.EmailMIMEContentType:
 cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 59bcedd37e67..97eb4e5cb748 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4963,7 +4963,6 @@ let
       description = "Parse a MIME Content-Type Header";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    propagatedBuildInputs = [ Encode ];
   };
 
   EmailMIMEEncodings = buildPerlPackage rec {

From cc3e2fc39132729b050b1523399317190d778ae8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:40 +0000
Subject: [PATCH 2173/3253] [cpan2nix] perlPackages.ListMoreUtilsXS: cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97eb4e5cb748..a497dced0014 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8462,7 +8462,6 @@ let
      preConfigure = ''
        export LD=$CC
      '';
-     propagatedBuildInputs = [ XSLoader ];
      meta = {
        description = "Provide the stuff missing in List::Util in XS";
        license = with stdenv.lib.licenses; [ asl20 ];

From 4b370f45c2033c64671b64e044fc7d84e8dc2448 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:42 +0000
Subject: [PATCH 2174/3253] [cpan2nix] perlPackages.LocaleMaketext: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a497dced0014..db669dcfd2a4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8530,13 +8530,7 @@ let
      };
   };
 
-  LocaleMaketext = buildPerlPackage {
-    name = "Locale-Maketext-1.28";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TODDR/Locale-Maketext-1.28.tar.gz;
-      sha256 = "1sgpcnh9kqdnsizpwxzsyfv44id7gxsgkd9bmnhmj4g8hfs9712p";
-    };
-  };
+  LocaleMaketext = null; # part of Perl 5.26
 
   LocaleMaketextFuzzy = buildPerlPackage {
     name = "Locale-Maketext-Fuzzy-0.11";

From 5bd2bb1e0db9a14bf90a74ce71240f6a880cc3a9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:48 +0000
Subject: [PATCH 2175/3253] [cpan2nix] perlPackages.MathBigRat: cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index db669dcfd2a4..8b78f28ffc85 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9198,7 +9198,6 @@ let
       url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz";
       sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59";
     };
-    propagatedBuildInputs = [ MathBigInt ];
     meta = {
       description = "Arbitrary big rational numbers";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 2a2c9bff0f7e7368b983f1852e68a55dce46e658 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:52 +0000
Subject: [PATCH 2176/3253] [cpan2nix] perlPackages.ModuleCoreList: 5.20180820
 -> 5.20180920

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b78f28ffc85..44a64e62c42e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9624,10 +9624,10 @@ let
   };
 
   ModuleCoreList = buildPerlPackage {
-    name = "Module-CoreList-5.20180820";
+    name = "Module-CoreList-5.20180920";
     src = fetchurl {
-      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180820.tar.gz;
-      sha256 = "1ccs5mqcfxjv8bax2nfsg11b2vc3sqyapfapxyzrjhaa2fmdn54l";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180920.tar.gz;
+      sha256 = "00gkfkajvamb207xslqakwpzyjdhbyf14l0bs9ywcw8q44n7ghaf";
     };
     meta = {
       homepage = http://dev.perl.org/;

From 0432ee463f9c03cd99e3af44ae2c132e84a82b43 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:53 +0000
Subject: [PATCH 2177/3253] [cpan2nix] perlPackages.ModuleLoadConditional:
 removed built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 44a64e62c42e..a00f330390e0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9734,17 +9734,7 @@ let
     };
   };
 
-  ModuleLoadConditional = buildPerlPackage rec {
-     name = "Module-Load-Conditional-0.68";
-     src = fetchurl {
-       url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Load-Conditional-0.68.tar.gz;
-       sha256 = "1zcq0s7q9bvk9wdv9ijfyddh3b8ck4n3w87rcx31lbsav5fba9vn";
-     };
-     meta = {
-       description = "Looking up module information / loading at runtime";
-       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-     };
-  };
+  ModuleLoadConditional = null; # part of Perl 5.26
 
   ModuleManifest = buildPerlPackage {
     name = "Module-Manifest-1.09";

From fddc77f71f7c205f71904df5327cf9ca47a1208f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:53 +0000
Subject: [PATCH 2178/3253] [cpan2nix] perlPackages.ModuleMetadata: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a00f330390e0..400ee1497fc7 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9750,13 +9750,7 @@ let
     };
   };
 
-  ModuleMetadata = buildPerlPackage rec {
-    name = "Module-Metadata-1.000033";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/Module-Metadata-1.000033.tar.gz;
-      sha256 = "13pzydb22693l33rfx6drwbhjxj04q80ds4m2nn2sbmm95wwr5mw";
-    };
-  };
+  ModuleMetadata = null; # part of Perl 5.26
 
   ModulePath = buildPerlPackage rec {
     name = "Module-Path-0.19";

From ec1b5409fc9ec557e304ec5c5b8949b6a4051f7d Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:13:55 +0000
Subject: [PATCH 2179/3253] [cpan2nix] perlPackages.Mojolicious: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 400ee1497fc7..893d65f76ec0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9916,8 +9916,6 @@ let
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
       sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
     };
-    buildInputs = [ ExtUtilsMakeMaker ];
-    propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];
     meta = {
       homepage = https://mojolicious.org;
       description = "Real-time web framework";

From 93795465a02f753c7803c57ba6e972bb1cb8c5c7 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:14:10 +0000
Subject: [PATCH 2180/3253] [cpan2nix] perlPackages.PerlOSType: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 893d65f76ec0..35e642a05869 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12099,13 +12099,7 @@ let
     doCheck = false;
   };
 
-  PerlOSType = buildPerlPackage rec {
-    name = "Perl-OSType-1.010";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "1ch36kfjwm229xicb9k7b9fhisy58ihdr16vm8iwniymnna4kvg7";
-    };
-  };
+  PerlOSType = null; # part of Perl 5.26
 
   PerlTidy = buildPerlPackage rec {
     name = "Perl-Tidy-20180220";

From 85f063dacc951d88c863fa2f6a5b39d769f88b8f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:14:15 +0000
Subject: [PATCH 2181/3253] [cpan2nix] perlPackages.PodUsage: removed built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 35e642a05869..3f09588e6387 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12884,17 +12884,7 @@ let
      };
   };
 
-  PodUsage = buildPerlPackage {
-    name = "Pod-Usage-1.69";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Usage-1.69.tar.gz;
-      sha256 = "1a920c067b3c905b72291a76efcdf1935ba5423ab0187b9a5a63cfc930965132";
-    };
-    propagatedBuildInputs = [ podlators ];
-    meta = {
-      description = "Pod::Usage extracts POD documentation and shows usage information";
-    };
-  };
+  PodUsage = null; # part of Perl 5.26
 
   PodWeaver = buildPerlPackage rec {
     name = "Pod-Weaver-4.015";

From fef6077d6c45eb9a2909c5734f8489af2ffa42ba Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:14:34 +0000
Subject: [PATCH 2182/3253] [cpan2nix] perlPackages.TermANSIColor: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3f09588e6387..1be0a336c941 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14472,17 +14472,7 @@ let
     };
   };
 
-  TermANSIColor = buildPerlPackage {
-    name = "Term-ANSIColor-4.06";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RR/RRA/Term-ANSIColor-4.06.tar.gz;
-      sha256 = "8161c7434b1984bde588d75f22c786c46cb6d35d264d58111db0b82537de4bad";
-    };
-    meta = {
-      description = "Color output using ANSI escape sequences";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  TermANSIColor = null; # part of Perl 5.26
 
   TermCap = let version = "1.17"; in buildPerlPackage {
     name = "Term-Cap-${version}";

From a17d101d83dbbf976351667a996e1a324ff1578c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:14:35 +0000
Subject: [PATCH 2183/3253] [cpan2nix] perlPackages.TermCap: removed built-in

---
 pkgs/top-level/perl-packages.nix | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1be0a336c941..75cd1379e4a6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14474,18 +14474,7 @@ let
 
   TermANSIColor = null; # part of Perl 5.26
 
-  TermCap = let version = "1.17"; in buildPerlPackage {
-    name = "Term-Cap-${version}";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JS/JSTOWE/Term-Cap-${version}.tar.gz";
-      sha256 = "0qyicyk4aikw6w3fm8c4y6hd7ff70crkl6bf64qmiakbgxy9p6p7";
-    };
-    meta = {
-      inherit version;
-      description = "Perl termcap interface";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  TermCap = null; # part of Perl 5.26
 
   TermEncoding = buildPerlPackage {
     name = "Term-Encoding-0.02";

From a400a6e3bb4193229b816caf88649c962e235561 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:14:57 +0000
Subject: [PATCH 2184/3253] [cpan2nix] perlPackages.ThreadSemaphore: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 75cd1379e4a6..5cd265dd58c6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16544,17 +16544,7 @@ let
     };
   };
 
-  ThreadSemaphore = buildPerlPackage {
-    name = "Thread-Semaphore-2.13";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Semaphore-2.13.tar.gz;
-      sha256 = "e3fe2cc047575529c8ea4c168cef8fab2ec931729a1826ffca1ef63e7e45bc81";
-    };
-    meta = {
-      description = "Thread-safe semaphores";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  ThreadSemaphore = null; # part of Perl 5.26
 
   Throwable = buildPerlPackage rec {
     name = "Throwable-0.200013";

From 8780d22f3dfcad76d414d0fb8cf8644f92acaebc Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:04 +0000
Subject: [PATCH 2185/3253] [cpan2nix] perlPackages.UnicodeNormalize: removed
 built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5cd265dd58c6..c940e6b9f98d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16959,17 +16959,7 @@ let
     };
   };
 
-  UnicodeNormalize = buildPerlPackage rec {
-    name = "Unicode-Normalize-1.25";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/K/KH/KHW/${name}.tar.gz";
-      sha256 = "00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c";
-    };
-    meta = {
-      description = "Unicode Normalization Forms";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  UnicodeNormalize = null; # part of Perl 5.26
 
   UnicodeString = buildPerlPackage rec {
     name = "Unicode-String-2.10";

From 41790ecab6a0e0d2294b4a44081ab7d29c9a9164 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:06 +0000
Subject: [PATCH 2186/3253] [cpan2nix] perlPackages.WWWFormUrlEncoded: 0.24 ->
 0.25

---
 pkgs/top-level/perl-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c940e6b9f98d..eee5b64a3b56 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17203,12 +17203,11 @@ let
   };
 
   WWWFormUrlEncoded = buildPerlModule rec {
-     name = "WWW-Form-UrlEncoded-0.24";
+     name = "WWW-Form-UrlEncoded-0.25";
      src = fetchurl {
-       url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz;
-       sha256 = "04fh54zgmrlhrmdaqs2yrwqmqwk9hd737z7rnbbd438l36skn7vd";
+       url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz;
+       sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1";
      };
-     buildInputs = [ JSON ];
      meta = {
        description = "parser and builder for application/x-www-form-urlencoded";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From dde3ebf389708c1ea318cc3480fa94527d5e5b76 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:09 +0000
Subject: [PATCH 2187/3253] [cpan2nix] perlPackages.XSLoader: removed built-in

---
 pkgs/top-level/perl-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eee5b64a3b56..d00170e48d5b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17707,17 +17707,7 @@ let
     };
   };
 
-  XSLoader = buildPerlPackage {
-    name = "XSLoader-0.24";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.24.tar.gz;
-      sha256 = "0pyqr12jsqagna75fm2gijfzw06wy1hrh5chn9hwnmcfddda66g8";
-    };
-    meta = {
-      description = "Dynamically load C libraries into Perl code";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
+  XSLoader = null; # part of Perl 5.26
 
   XSObjectMagic = buildPerlPackage rec {
     name = "XS-Object-Magic-0.04";

From dd4a0700edfcb910583b027a7dd37671765c9071 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:11 +0000
Subject: [PATCH 2188/3253] [cpan2nix] perlPackages.base: removed built-in

---
 pkgs/top-level/perl-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d00170e48d5b..c691c36d6ab1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -709,13 +709,7 @@ let
     };
   };
 
-  base = buildPerlPackage {
-    name = "base-2.23";
-    src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/base-2.23.tar.gz;
-      sha256 = "40f55841299a9fe6fab03cd098f94e9221fb516978e9ef40fd8ff2cbd6625dde";
-    };
-  };
+  base = null; # part of Perl 5.26
 
   BC = buildPerlPackage rec {
     name = "B-C-1.55";

From fa6238b39bb73f35f00e135332106d43b0eb65fa Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:48 +0000
Subject: [PATCH 2189/3253] [cpan2nix] perlPackages.NetDNS: 1.17 -> 1.18

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c691c36d6ab1..51cad63de5d0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11089,12 +11089,12 @@ let
   };
 
   NetDNS = buildPerlPackage rec {
-    name = "Net-DNS-1.17";
+    name = "Net-DNS-1.18";
     src = fetchurl {
       url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz";
-      sha256 = "9a79fd8fea1a708726c18d193ae4437479206ccb20ffa7f0971371e172e2c2e0";
+      sha256 = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3";
     };
-    propagatedBuildInputs = [ DigestHMAC IOSocketIP ];
+    propagatedBuildInputs = [ DigestHMAC ];
     makeMakerFlags = "--noonline-tests";
     meta = {
       description = "Perl Interface to the Domain Name System";

From c239e0bebfe2227ca92d6f022716bed6f62df981 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:48 +0000
Subject: [PATCH 2190/3253] [cpan2nix] perlPackages.NetIDNEncode: 2.400 ->
 2.401

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 51cad63de5d0..82754f700baa 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11157,10 +11157,10 @@ let
   };
 
   NetIDNEncode = buildPerlModule {
-    name = "Net-IDN-Encode-2.400";
+    name = "Net-IDN-Encode-2.401";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.400.tar.gz;
-      sha256 = "0a9knav5f9kjldrkxx1k47ivd3p23zkmi8aqgyhnxidhgasz1dlq";
+      url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.401.tar.gz;
+      sha256 = "1b5hnlnaxnp9jzdk55dcfh4jviv9mv83y4plsr3hi7lkh06hwdyd";
     };
     buildInputs = [ TestNoWarnings ];
     meta = {

From 1da70e726f84be07fb0afed990160c705b3df2e5 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:15:50 +0000
Subject: [PATCH 2191/3253] [cpan2nix] perlPackages.SubInfo: cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 82754f700baa..d4ae96a3ec53 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14041,7 +14041,6 @@ let
       url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
       sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea";
     };
-    buildInputs = [ TestSimple13 ];
     propagatedBuildInputs = [ Importer ];
     meta = {
       description = "Tool for inspecting subroutines";

From fb70dbb2827b9e2af22cc771ccd691ac1891732f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:16:04 +0000
Subject: [PATCH 2192/3253] [cpan2nix] perlPackages.CryptOpenSSLRSA: 0.30 ->
 0.31

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d4ae96a3ec53..61b43c021457 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3051,10 +3051,10 @@ let
   };
 
   CryptOpenSSLRSA = buildPerlPackage rec {
-    name = "Crypt-OpenSSL-RSA-0.30";
+    name = "Crypt-OpenSSL-RSA-0.31";
     src = fetchurl {
-      url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.30.tar.gz;
-      sha256 = "23e13531397af102db4fd24bcf70137add7c85c23cca697c43aa71c2959a29ac";
+      url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz;
+      sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436";
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";

From a172229664b7438011648f3c355b00c1137725d9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:16:39 +0000
Subject: [PATCH 2193/3253] [cpan2nix] perlPackages.TextBibTeX: cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 61b43c021457..2229ca10ae98 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16012,7 +16012,6 @@ let
       description = "Interface to read and parse BibTeX files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    propagatedBuildInputs = [ ScalarListUtils ];
   };
 
   TextBrew = buildPerlPackage rec {

From fd686b947e6e4810a18ab73e4a455c16a32d77b8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:33 +0000
Subject: [PATCH 2194/3253] [cpan2nix] perlPackages.DataValidateDomain: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2229ca10ae98..f9824fda6aab 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3493,7 +3493,7 @@ let
       url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz";
       sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421";
     };
-    buildInputs = [ Test2Suite TestSimple13 ];
+    buildInputs = [ Test2Suite ];
     propagatedBuildInputs = [ NetDomainTLD ];
     meta = {
       description = "Domain and host name validation";

From d4d9eed5e6f73f4f5604f43790f5f8e94b032eb8 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:38 +0000
Subject: [PATCH 2195/3253] [cpan2nix] perlPackages.Test2PluginNoWarnings:
 cleanup

---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f9824fda6aab..4058d1ad6893 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14674,7 +14674,6 @@ let
        url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz;
        sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242";
      };
-     propagatedBuildInputs = [ TestSimple13 ];
      buildInputs = [ IPCRun3 Test2Suite ];
      meta = {
        description = "Fail if tests warn";

From 9adcdd61e9a6c7c2c077eca514df4cd43f3914cf Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:39 +0000
Subject: [PATCH 2196/3253] [cpan2nix] perlPackages.CookieBaker: 0.09 -> 0.10

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4058d1ad6893..98a2e57630cb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2690,10 +2690,10 @@ let
   };
 
   CookieBaker = buildPerlModule rec {
-    name = "Cookie-Baker-0.09";
+    name = "Cookie-Baker-0.10";
     src = fetchurl {
       url = "mirror://cpan/authors/id/K/KA/KAZEBURO/${name}.tar.gz";
-      sha256 = "be020a634162b319cab55b6e2bf10556a33a210a2eee8a2f1aa1b19b5e33aa4f";
+      sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd";
     };
     buildInputs = [ ModuleBuildTiny TestTime ];
     propagatedBuildInputs = [ URI ];

From 2a38d70964f08808d437a55b27faf5ef384f5b3a Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:42 +0000
Subject: [PATCH 2197/3253] [cpan2nix] perlPackages.TestScript: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 98a2e57630cb..6ffa00d6014e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15663,7 +15663,7 @@ let
 
     buildInputs = [ Test2Suite ];
 
-    propagatedBuildInputs = [ CaptureTiny ProbePerl TestSimple13 ];
+    propagatedBuildInputs = [ CaptureTiny ProbePerl ];
   };
 
   TestSharedFork = buildPerlPackage rec {

From e3eaacf78663b3b37da8fa637906a1083e54f30b Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:46 +0000
Subject: [PATCH 2198/3253] [cpan2nix] perlPackages.ListAllUtils: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6ffa00d6014e..54f3a45ef1df 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8402,7 +8402,7 @@ let
       url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz;
       sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd";
     };
-    propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ScalarListUtils ];
+    propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ];
     meta = {
       description = "Combines List::Util and List::MoreUtils in one bite-sized package";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From f12f974404294809e946708fe6e3f07c10629e1e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:17:48 +0000
Subject: [PATCH 2199/3253] [cpan2nix] perlPackages.TestMost: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 54f3a45ef1df..205fb1c8a76a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15325,7 +15325,7 @@ let
       description = "Most commonly needed test functions and features";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    buildInputs = [ TestDeep TestDifferences TestException TestSimple13 TestWarn ];
+    buildInputs = [ TestDeep TestDifferences TestException TestWarn ];
   };
 
   TestNeeds = buildPerlPackage rec {

From d8418d75b588ada024dab2a5db8e827896d4038f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:24 +0000
Subject: [PATCH 2200/3253] [cpan2nix] perlPackages.Mouse: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 205fb1c8a76a..8f40dfd12dbd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10799,7 +10799,7 @@ let
       url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.6.tar.gz;
       sha256 = "1j3048ip691j91rdig6wrlg6i4jdzhszxmz5pi2g7n355rl2w00l";
     };
-    buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny self.version ];
+    buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ];
     perlPreHook = "export LD=$CC";
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector";
     hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";

From f7864bbab1411b0c4c882646327e50b00568eafe Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:30 +0000
Subject: [PATCH 2201/3253] [cpan2nix] perlPackages.XMLXPath: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8f40dfd12dbd..73342fafaa08 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17526,7 +17526,7 @@ let
       sha256 = "9e6ac67c2cead5f918a060b8b9ccdbdcaa6d610be8517bba42a96cd56748b512";
     };
     buildInputs = [ PathTiny ];
-    propagatedBuildInputs = [ ScalarListUtils XMLParser ];
+    propagatedBuildInputs = [ XMLParser ];
     meta = {
       description = "Modules for parsing and evaluating XPath statements";
       license = stdenv.lib.licenses.artistic2;

From 93c904a369e5de1293c4ed5bb560daa631f65308 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:31 +0000
Subject: [PATCH 2202/3253] [cpan2nix] perlPackages.ArchiveTarWrapper: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 73342fafaa08..42d5057b7b54 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -511,7 +511,7 @@ let
      meta = {
        description = "API wrapper around the 'tar' utility";
      };
-    buildInputs = [ Dumbbench TestSimple13 ];
+    buildInputs = [ Dumbbench ];
   };
 
   ArchiveZip = buildPerlPackage {

From b70d37d67c44a89a093d79db4646777ea15ca02f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:35 +0000
Subject: [PATCH 2203/3253] [cpan2nix] perlPackages.EmailSender: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 42d5057b7b54..46f93c714783 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5011,7 +5011,7 @@ let
       sha256 = "c412372938510283d8c850127895e09c2b670f892e1c3992fd54c0c1a9064f14";
     };
     buildInputs = [ CaptureTiny ];
-    propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike ScalarListUtils SubExporter Throwable TryTiny libnet ];
+    propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ];
     meta = {
       homepage = https://github.com/rjbs/Email-Sender;
       description = "A library for sending email";

From eea9f82e9c3586884e883182557464bfb29372ae Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:36 +0000
Subject: [PATCH 2204/3253] [cpan2nix] perlPackages.ParamsValidationCompiler:
 cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 46f93c714783..2d4b23c31354 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11725,7 +11725,7 @@ let
        sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw";
      };
      propagatedBuildInputs = [ EvalClosure ExceptionClass ];
-     buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestSimple13 TestWithoutModule ];
+     buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ];
      meta = {
        description = "Build an optimized subroutine parameter validator once, use it forever";
        license = with stdenv.lib.licenses; [ artistic2 ];

From 8674253b79c55f3d34584d034850dd63382b4392 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:18:58 +0000
Subject: [PATCH 2205/3253] [cpan2nix] perlPackages.Appperlbrew: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2d4b23c31354..8e8e6ab48a62 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -344,7 +344,7 @@ let
       sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la";
     };
     buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ];
-    propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodUsage locallib ];
+    propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ];
 
     preConfigure = ''
       patchShebangs .

From 326138d201560a8febdc1ee9183d24f4310cf109 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:19:00 +0000
Subject: [PATCH 2206/3253] [cpan2nix] perlPackages.DateTimeLocale: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8e8e6ab48a62..f235696a2c27 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3823,7 +3823,7 @@ let
       sha256 = "757b3915c6b2aac89462c52fed36543f27dfb66abc98c895523d2ab95da65f94";
     };
     buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ];
-    propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler ScalarListUtils Specio namespaceautoclean ];
+    propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ];
     meta = {
       description = "Localization support for DateTime.pm";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 4b4522d4d6528367c9cabacda5c6a5633cbf8197 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:19:11 +0000
Subject: [PATCH 2207/3253] [cpan2nix] perlPackages.Moose: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f235696a2c27..618b509ac13a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9980,7 +9980,7 @@ let
       sha256 = "973d0a35d9f39bf93bbc5206c25f5ec3651f96356f082d31873c0ac9a5c1cd82";
     };
     buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ];
-    propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS ScalarListUtils SubExporter ];
+    propagatedBuildInputs = [ ClassLoadXS DevelGlobalDestruction DevelOverloadInfo DevelStackTrace EvalClosure ModuleRuntimeConflicts PackageDeprecationManager PackageStashXS SubExporter ];
     preConfigure = ''
       export LD=$CC
     '';

From 005f851d8577c4d84d3de06989c235714500d96e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:19:21 +0000
Subject: [PATCH 2208/3253] [cpan2nix] perlPackages.TestRoutine: cleanup

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 618b509ac13a..83e2cb684f19 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15521,7 +15521,7 @@ let
       sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s";
     };
     buildInputs = [ TestAbortable TestFatal ];
-    propagatedBuildInputs = [ Moose TestSimple13 namespaceautoclean ];
+    propagatedBuildInputs = [ Moose namespaceautoclean ];
     meta = {
       homepage = https://github.com/rjbs/Test-Routine;
       description = "Composable units of assertion";

From 580f964503c938f51790aaa2d08ea89e28ca9329 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:20:00 +0000
Subject: [PATCH 2209/3253] [cpan2nix] perlPackages.CatalystRuntime: 5.90118 ->
 5.90119

---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 83e2cb684f19..b162c2e96140 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1317,10 +1317,10 @@ let
   };
 
   CatalystRuntime = buildPerlPackage rec {
-    name = "Catalyst-Runtime-5.90118";
+    name = "Catalyst-Runtime-5.90119";
     src = fetchurl {
-      url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90118.tar.gz;
-      sha256 = "a3e979fc822f500d065e39a03d1883179bfdae77a8372cce0070efd1bf1e9a33";
+      url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Runtime-5.90119.tar.gz;
+      sha256 = "19fff77c70a4fc8df2909db82629fda7f25d3e5d01f0152a145f8f8973ea87c7";
     };
     buildInputs = [ TestFatal TypeTiny ];
     propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ];

From 46327afd1c4c988b8277566aef4340bf24f581c6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 2 Oct 2018 01:26:29 +0000
Subject: [PATCH 2210/3253] perl-packages.nix: group aliases

---
 pkgs/top-level/perl-packages.nix | 48 +++++++++++---------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b162c2e96140..854e403f0c47 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -407,8 +407,6 @@ let
     };
   };
 
-  AttributeHandlers = null; # part of Perl 5.26
-
   AttributeParamsValidate = buildPerlPackage {
     name = "Attribute-Params-Validate-1.21";
     src = fetchurl {
@@ -709,8 +707,6 @@ let
     };
   };
 
-  base = null; # part of Perl 5.26
-
   BC = buildPerlPackage rec {
     name = "B-C-1.55";
     src = fetchurl {
@@ -2789,8 +2785,6 @@ let
      };
   };
 
-  CPANMeta = null; # part of Perl 5.26
-
   CPANMetaCheck = buildPerlPackage rec {
     name = "CPAN-Meta-Check-0.014";
     src = fetchurl {
@@ -2804,10 +2798,6 @@ let
     };
   };
 
-  CPANMetaRequirements = null; # part of Perl 5.26
-
-  CPANMetaYAML = null; # part of Perl 5.26
-
   CPANPerlReleases = buildPerlPackage rec {
     name = "CPAN-Perl-Releases-3.76";
     src = fetchurl {
@@ -4438,8 +4428,6 @@ let
     };
   };
 
-  DigestMD5 = null; # part of Perl 5.26
-
   DigestMD5File = buildPerlPackage {
     name = "Digest-MD5-File-0.08";
     src = fetchurl {
@@ -8524,8 +8512,6 @@ let
      };
   };
 
-  LocaleMaketext = null; # part of Perl 5.26
-
   LocaleMaketextFuzzy = buildPerlPackage {
     name = "Locale-Maketext-Fuzzy-0.11";
     src = fetchurl {
@@ -9728,8 +9714,6 @@ let
     };
   };
 
-  ModuleLoadConditional = null; # part of Perl 5.26
-
   ModuleManifest = buildPerlPackage {
     name = "Module-Manifest-1.09";
     src = fetchurl {
@@ -9744,8 +9728,6 @@ let
     };
   };
 
-  ModuleMetadata = null; # part of Perl 5.26
-
   ModulePath = buildPerlPackage rec {
     name = "Module-Path-0.19";
     src = fetchurl {
@@ -12093,8 +12075,6 @@ let
     doCheck = false;
   };
 
-  PerlOSType = null; # part of Perl 5.26
-
   PerlTidy = buildPerlPackage rec {
     name = "Perl-Tidy-20180220";
     src = fetchurl {
@@ -12878,8 +12858,6 @@ let
      };
   };
 
-  PodUsage = null; # part of Perl 5.26
-
   PodWeaver = buildPerlPackage rec {
     name = "Pod-Weaver-4.015";
     src = fetchurl {
@@ -14465,10 +14443,6 @@ let
     };
   };
 
-  TermANSIColor = null; # part of Perl 5.26
-
-  TermCap = null; # part of Perl 5.26
-
   TermEncoding = buildPerlPackage {
     name = "Term-Encoding-0.02";
     src = fetchurl {
@@ -16535,8 +16509,6 @@ let
     };
   };
 
-  ThreadSemaphore = null; # part of Perl 5.26
-
   Throwable = buildPerlPackage rec {
     name = "Throwable-0.200013";
     src = fetchurl {
@@ -16950,8 +16922,6 @@ let
     };
   };
 
-  UnicodeNormalize = null; # part of Perl 5.26
-
   UnicodeString = buildPerlPackage rec {
     name = "Unicode-String-2.10";
     src = fetchurl {
@@ -17698,8 +17668,6 @@ let
     };
   };
 
-  XSLoader = null; # part of Perl 5.26
-
   XSObjectMagic = buildPerlPackage rec {
     name = "XS-Object-Magic-0.04";
     src = fetchurl {
@@ -17794,6 +17762,22 @@ let
   DigestSHA = null;
   "if" = null;
   TestSimple = null;
+  AttributeHandlers = null; # part of Perl 5.26
+  base = null; # part of Perl 5.26
+  CPANMeta = null; # part of Perl 5.26
+  CPANMetaRequirements = null; # part of Perl 5.26
+  CPANMetaYAML = null; # part of Perl 5.26
+  DigestMD5 = null; # part of Perl 5.26
+  LocaleMaketext = null; # part of Perl 5.26
+  ModuleLoadConditional = null; # part of Perl 5.26
+  ModuleMetadata = null; # part of Perl 5.26
+  PerlOSType = null; # part of Perl 5.26
+  PodUsage = null; # part of Perl 5.26
+  TermANSIColor = null; # part of Perl 5.26
+  TermCap = null; # part of Perl 5.26
+  ThreadSemaphore = null; # part of Perl 5.26
+  UnicodeNormalize = null; # part of Perl 5.26
+  XSLoader = null; # part of Perl 5.26
 
   ArchiveZip_1_53 = self.ArchiveZip;
   Autobox = self.autobox;

From b7efce77d0fc105e4d8403fa38a20111824270bd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 23 Aug 2018 19:24:01 +0800
Subject: [PATCH 2211/3253] shards: minor cleanups

---
 .../tools/build-managers/shards/default.nix   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix
index 9fb7c0e64b80..02d5adb0c34d 100644
--- a/pkgs/development/tools/build-managers/shards/default.nix
+++ b/pkgs/development/tools/build-managers/shards/default.nix
@@ -1,28 +1,32 @@
-{ stdenv, fetchurl, crystal, libyaml, which }:
+{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
 
 stdenv.mkDerivation rec {
   name = "shards-${version}";
   version = "0.8.1";
 
-  src = fetchurl {
-    url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
-    sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm";
+  src = fetchFromGitHub {
+    owner  = "crystal-lang";
+    repo   = "shards";
+    rev    = "v${version}";
+    sha256 = "1cjn2lafr08yiqzlhyqx14jjjxf1y24i2kk046px07gljpnlgqwk";
   };
 
-  buildInputs = [ crystal libyaml which ];
+  buildInputs = [ crystal libyaml pcre which ];
 
   buildFlags = [ "CRFLAGS=--release" ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp bin/shards $out/bin/
+    runHook preInstall
+
+    install -Dm755 bin/shards $out/bin/shards
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://crystal-lang.org/;
-    license = licenses.asl20;
     description = "Dependency manager for the Crystal language";
-    maintainers = with maintainers; [ sifmelcara ];
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit (crystal.meta) homepage platforms;
   };
 }

From 51076b414bead4feb099e116aa210aed5dbfef2e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 23 Aug 2018 19:24:04 +0800
Subject: [PATCH 2212/3253] crystal: 0.26.0 -> 0.26.1

We also start carrying the previous versions as crystal is under rapid
development.

Instead of pulling the binary builder each time, create a derivation that we can
use to build the various versions.
---
 .../development/compilers/crystal/default.nix | 189 +++++++++++-------
 pkgs/top-level/all-packages.nix               |   5 +-
 2 files changed, 123 insertions(+), 71 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index aa1c85ebcb00..0648a245a4c8 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,93 +1,142 @@
-{ stdenv, fetchurl, makeWrapper
+{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
+, gmp, openssl, readline, tzdata, libxml2, libyaml
 , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }:
 
-stdenv.mkDerivation rec {
-  name = "crystal-${version}";
-  version = "0.26.0";
+let
+  binaryVersion = "0.26.0";
+  releaseDate = "2018-08-29";
 
-  src = fetchurl {
-    url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379";
-  };
-
-  prebuiltName = "crystal-0.26.0-1";
-  prebuiltSrc = let arch = {
-    "x86_64-linux" = "linux-x86_64";
-    "i686-linux" = "linux-i686";
+  arch = {
+    "x86_64-linux"  = "linux-x86_64";
+    "i686-linux"    = "linux-i686";
     "x86_64-darwin" = "darwin-x86_64";
-  }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
-  in fetchurl {
-    url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz";
-    sha256 = {
-      "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
-      "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
-      "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
-    }."${stdenv.hostPlatform.system}";
+  }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+  checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ];
+
+  # we could turn this into a function instead in case we cannot use the same
+  # binary to build multiple versions
+  binary = stdenv.mkDerivation rec {
+    name = "crystal-binary-${binaryVersion}";
+
+    src = fetchurl {
+      url = "https://github.com/crystal-lang/crystal/releases/download/${binaryVersion}/crystal-${binaryVersion}-1-${arch}.tar.gz";
+      sha256 = {
+        "x86_64-linux"  = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
+        "i686-linux"    = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
+        "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
+      }."${stdenv.system}";
+    };
+
+    buildCommand = ''
+      mkdir -p $out
+      tar --strip-components=1 -C $out -xf ${src}
+    '';
   };
 
-  unpackPhase = ''
-    mkdir ${prebuiltName}
-    tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc}
-    tar xf ${src}
-  '';
+  generic = { version, sha256, doCheck ? true }:
+  stdenv.mkDerivation rec {
+    inherit doCheck;
+    name = "crystal-${version}";
 
-  # crystal on Darwin needs libiconv to build
-  libs = [
-    boehmgc libatomic_ops pcre libevent
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
-    libiconv
-  ];
+    src = fetchFromGitHub {
+      owner  = "crystal-lang";
+      repo   = "crystal";
+      rev    = version;
+      inherit sha256;
+    };
 
-  nativeBuildInputs = [ which makeWrapper ];
+    # the first bit can go when https://github.com/crystal-lang/crystal/pull/6788 is merged
+    postPatch = ''
+      substituteInPlace src/compiler/crystal/config.cr \
+        --replace '{{ `date "+%Y-%m-%d"`.stringify.chomp }}' '"${releaseDate}"'
+      ln -s spec/compiler spec/std
+      substituteInPlace spec/std/process_spec.cr \
+        --replace /bin/ /run/current-system/sw/bin
+    '';
 
-  buildInputs = libs ++ [ llvm ];
+    buildInputs = [
+      boehmgc libatomic_ops pcre libevent
+      llvm
+    ] ++ stdenv.lib.optionals stdenv.isDarwin [
+      libiconv
+    ];
 
-  libPath = stdenv.lib.makeLibraryPath libs;
+    nativeBuildInputs = [ binary makeWrapper which ];
 
-  sourceRoot = "${name}";
 
-  preBuild = ''
-    patchShebangs bin/crystal
-    patchShebangs ../${prebuiltName}/bin/crystal
-    export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
-  '';
+    makeFlags = [
+      "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}"
+      "CRYSTAL_CONFIG_VERSION=${version}"
+    ];
 
-  makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
-                "FLAGS=--no-debug"
-                "release=1"
-                "all" "docs"
-              ];
+    buildFlags = [
+      "all" "docs"
+    ];
 
-  installPhase = ''
-    install -Dm755 .build/crystal $out/bin/crystal
-    wrapProgram $out/bin/crystal \
-        --suffix PATH : ${clang}/bin \
-        --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
-        --suffix LIBRARY_PATH : $libPath
-    install -dm755 $out/lib/crystal
-    cp -r src/* $out/lib/crystal/
+    FLAGS = [
+      "--release"
+      "--single-module" # needed for deterministic builds
+    ];
 
-    install -dm755 $out/share/doc/crystal/api
-    cp -r docs/* $out/share/doc/crystal/api/
-    cp -r samples $out/share/doc/crystal/
+    # We *have* to add `which` to the PATH or crystal is unable to build stuff
+    # later if which is not available.
+    installPhase = ''
+      runHook preInstall
 
-    install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
-    install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+      install -Dm755 .build/crystal $out/bin/crystal
+      wrapProgram $out/bin/crystal \
+          --suffix PATH : ${lib.makeBinPath [ clang which ]} \
+          --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
+          --suffix LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+      install -dm755 $out/lib/crystal
+      cp -r src/* $out/lib/crystal/
 
-    install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+      install -dm755 $out/share/doc/crystal/api
+      cp -r docs/* $out/share/doc/crystal/api/
+      cp -r samples $out/share/doc/crystal/
 
-    install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
-  '';
+      install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+      install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
 
-  dontStrip = true;
+      install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
 
-  enableParallelBuilding = false;
+      install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
 
-  meta = {
-    description = "A compiled language with Ruby like syntax and type inference";
-    homepage = https://crystal-lang.org/;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ manveru david50407 ];
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+      runHook postInstall
+    '';
+
+    enableParallelBuilding = true;
+
+    dontStrip = true;
+
+    checkTarget = "spec";
+
+    preCheck = ''
+      export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
+    '';
+
+    meta = with lib; {
+      description = "A compiled language with Ruby like syntax and type inference";
+      homepage = https://crystal-lang.org/;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ manveru david50407 peterhoeg ];
+      platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    };
   };
+
+in rec {
+  crystal_0_25 = generic {
+    version = "0.25.1";
+    sha256  = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
+    doCheck = false;
+  };
+
+  crystal_0_26 = generic {
+    version = "0.26.1";
+    sha256  = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84";
+    doCheck = false; # about 20 tests out of more than 14000 are failing
+  };
+
+  crystal = crystal_0_26;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b995e561f2d..ea4739e34c12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6411,7 +6411,10 @@ with pkgs;
     '';
   });
 
-  crystal = callPackage ../development/compilers/crystal { };
+  inherit (callPackages ../development/compilers/crystal {})
+    crystal_0_25
+    crystal_0_26
+    crystal;
 
   devpi-client = callPackage ../development/tools/devpi-client {};
 

From 5200db329e2e90ef75d4d2651efc0ace55d15976 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 21 Sep 2018 08:51:13 +0800
Subject: [PATCH 2213/3253] icr: init at 0.5.0

---
 pkgs/development/tools/icr/default.nix | 34 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/icr/default.nix

diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix
new file mode 100644
index 000000000000..3c6eb6a98b06
--- /dev/null
+++ b/pkgs/development/tools/icr/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, crystal, shards, which
+, openssl, readline }:
+
+stdenv.mkDerivation rec {
+  name = "icr";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner  = "crystal-community";
+    repo   = "icr";
+    rev    = "v${version}";
+    sha256 = "1vavdzgm06ssnxm6mylki6xma0mfsj63n5kivhk1v4pg4xj966w5";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+  '';
+
+  buildInputs = [ openssl readline ];
+
+  nativeBuildInputs = [ crystal shards which ];
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Interactive console for the Crystal programming language";
+    homepage = https://github.com/crystal-community/icr;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea4739e34c12..3dc56a75741c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6416,6 +6416,8 @@ with pkgs;
     crystal_0_26
     crystal;
 
+  icr = callPackage ../development/tools/icr {};
+
   devpi-client = callPackage ../development/tools/devpi-client {};
 
   devpi-server = callPackage ../development/tools/devpi-server {};

From da612211895b7d0910a0eeb2b778c0e9e799a6ee Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 21 Sep 2018 08:51:37 +0800
Subject: [PATCH 2214/3253] scry: init at 0.7.1.20180919

---
 pkgs/development/tools/scry/default.nix | 50 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/tools/scry/default.nix

diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix
new file mode 100644
index 000000000000..ab810a2ae9fa
--- /dev/null
+++ b/pkgs/development/tools/scry/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, crystal, shards, which }:
+
+stdenv.mkDerivation rec {
+  name = "scry";
+  # 0.7.1 doesn't work with crystal > 0.25
+  version = "0.7.1.20180919";
+
+  src = fetchFromGitHub {
+    owner  = "crystal-lang-tools";
+    repo   = "scry";
+    rev    = "543c1c3f764298f9fff192ca884d10f72338607d";
+    sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn";
+  };
+
+  nativeBuildInputs = [ crystal shards which ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    shards build --release
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 -t $out/bin bin/scry
+
+    runHook postInstall
+  '';
+
+  # https://github.com/crystal-lang-tools/scry/issues/138
+  doCheck = false;
+
+  checkPhase = ''
+    runHook preCheck
+
+    crystal spec
+
+    runHook postCheck
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Code analysis server for the Crystal programming language";
+    homepage = https://github.com/crystal-lang-tools/scry;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dc56a75741c..16f25cfc03ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6418,6 +6418,8 @@ with pkgs;
 
   icr = callPackage ../development/tools/icr {};
 
+  scry = callPackage ../development/tools/scry {};
+
   devpi-client = callPackage ../development/tools/devpi-client {};
 
   devpi-server = callPackage ../development/tools/devpi-server {};

From 19e7ae0fac348204ee6dedd85e9f1819e4ff4758 Mon Sep 17 00:00:00 2001
From: Red Davies <red@infect.me>
Date: Tue, 2 Oct 2018 03:02:49 +0000
Subject: [PATCH 2215/3253] openspin: init at 2018-10-02

---
 .../compilers/openspin/default.nix            | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/compilers/openspin/default.nix

diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
new file mode 100644
index 000000000000..71bda3e03d96
--- /dev/null
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "openspin-${version}";
+  version = "unstable-2018-10-02";
+
+  src = fetchFromGitHub {
+    owner = "parallaxinc";
+    repo = "OpenSpin";
+    rev = "f3a587ed3e4f6a50b3c8d2022bbec5676afecedb";
+    sha256 = "1knkbzdanb60cwp7mggymkhd0167lh2sb1c00d1vhw7s0s1rj96n";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv build/openspin $out/bin/openspin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU";
+    homepage = https://github.com/parallaxinc/OpenSpin;
+    license = licenses.mit;
+    maintainers = [ maintainers.redvers ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd0bf1a76da8..d667b25e58be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6869,6 +6869,8 @@ with pkgs;
 
   openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { };
 
+  openspin = callPackage ../development/compilers/openspin { };
+
   oraclejdk = pkgs.jdkdistro true false;
 
   oraclejdk8 = pkgs.oraclejdk8distro true false;

From 1e9e3adfb1ef7ffbfec62531349f39b6e029e81d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 30 Sep 2018 21:20:32 -0500
Subject: [PATCH 2216/3253] icestorm: 2018.08.01 -> 2018.09.04

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 5826dfc2a035..345a25082164 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.08.01";
+  version = "2018.09.04";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "8cac6c584044034210fe0ba1e6b930ff1cc59465";
-    sha256 = "01cnmk4khbbgzc308qj04sfwg0r8b9nh3s7xjsxdjcb3h1m9w88c";
+    rev    = "8f61acd0556c8afee83ec2e77dedb03e700333d9";
+    sha256 = "1dwix8bb87xqf27dixdnfp47pll8739h9m9aw8wvvwz4s4989q6v";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7b0b895053db39c392bc0577415f2d8bb22b75f3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 30 Sep 2018 21:19:36 -0500
Subject: [PATCH 2217/3253] arachne-pnr: 2018.05.13 -> 2018.09.08

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index a54384f0bb27..345bd1250254 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -4,13 +4,13 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2018.05.13";
+  version = "2018.09.08";
 
   src = fetchFromGitHub {
     owner  = "cseed";
     repo   = "arachne-pnr";
-    rev    = "5d830dd94ad956d17d77168fe7718f22f8b55b33";
-    sha256 = "1i056m5zn21nml65q9x9mgks4ydl8lqya6a4szix01vn3k0g06vn";
+    rev    = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd";
+    sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl";
   };
 
   enableParallelBuilding = true;

From d7393024d155755889ba83cea8806481633b2a71 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 30 Sep 2018 21:15:43 -0500
Subject: [PATCH 2218/3253] yosys: 2018.08.08 -> 2018.09.30

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 532fc04a447f..314fbf354e19 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.08.08";
+  version = "2018.09.30";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "93efbd5d158e374a0abe2afb06484ccc14aa2c88";
-      sha256 = "13y7rzpykihal789hyibg629gwj5bh1s0782y5xxj6jlg0bc9ly8";
+      rev    = "4d2917447cc14c590b4fee5ba36948fb4ee6884b";
+      sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1";
       name   = "yosys";
     })
 

From 919a3b7f9cbb3c99977ef083e45e5e0874fd640f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 30 Sep 2018 21:16:16 -0500
Subject: [PATCH 2219/3253] symbiyosys: 2018.07.26 -> 2018.09.12

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 946f65d944b3..e21c274370c8 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.07.26";
+  version = "2018.09.12";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "2fef25f93dd1cb5137a08e71f507e3eee8100fb1";
-    sha256 = "103fga0n11h4n2q346xyz3k0615d9lgx2b8sqr1pwn2hx26kchav";
+    rev    = "e90bcb588e97118af0cdba23fae562fb0efbf294";
+    sha256 = "16nlimpdc3g6lghwqpyirgrr1d9mgk4wg3c06fvglzaicvjixnfr";
   };
 
   buildInputs = [ python3 yosys ];

From 65923ede17636fa850d918205e9a419902c7b36c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 1 Oct 2018 11:23:33 -0500
Subject: [PATCH 2220/3253] perlPackages: init Sereal package family at 4.005

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a86031d5ce7c..455370fcd78a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13423,6 +13423,55 @@ let
     };
   };
 
+  SerealDecoder = buildPerlPackage rec {
+    name = "Sereal-Decoder-4.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+      sha256 = "17syqbq17qw6ajg3w88q9ljdm4c2b7zadq9pwshxxgyijg8dlfh4";
+    };
+    buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+    propagatedBuildInputs = [ XSLoader ];
+    preBuild = ''ls'';
+    meta = {
+      homepage = https://github.com/Sereal/Sereal;
+      description = "Fast, compact, powerful binary deserialization";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
+  SerealEncoder = buildPerlPackage rec {
+    name = "Sereal-Encoder-4.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+      sha256 = "02hbk5dwq7fpnyb3vp7xxhb41ra48xhghl13p9pjq9lzsqlb6l19";
+    };
+    buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+    propagatedBuildInputs = [ XSLoader SerealDecoder ];
+    meta = {
+      homepage = https://github.com/Sereal/Sereal;
+      description = "Fast, compact, powerful binary deserialization";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
+  Sereal = buildPerlPackage rec {
+    name = "Sereal-4.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/Y/YV/YVES/${name}.tar.gz";
+      sha256 = "0lnczrf311pl9b2x75r0ffsszv5aspfb8x6jdvgr3rgqp7nbm1wr";
+    };
+    buildInputs = [ TestDeep TestDifferences TestWarn TestLongString ];
+    propagatedBuildInputs = [ SerealEncoder SerealDecoder ];
+    meta = {
+      homepage = https://github.com/Sereal/Sereal;
+      description = "Fast, compact, powerful binary deserialization";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   ServerStarter = buildPerlModule rec {
     name = "Server-Starter-0.34";
     src = fetchurl {

From 37ce9316bf0f69c7b7cb10cc6257a82888dbe828 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 1 Oct 2018 15:43:40 -0500
Subject: [PATCH 2221/3253] perlPackages.MojoliciousPluginStatus: init at 1.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 455370fcd78a..e652ee5b0a73 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10020,6 +10020,21 @@ let
     };
   };
 
+  MojoliciousPluginStatus = buildPerlPackage rec {
+    name = "Mojolicious-Plugin-Status-1.0";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
+      sha256 = "14ypg679dk9yvgq67mp7lzs131cxhbgcmrpx5f4ddqcrs1bzq5rb";
+    };
+    propagatedBuildInputs = [ Mojolicious IPCShareLite BSDResource Sereal ];
+    meta = {
+      homepage = https://github.com/mojolicious/mojo-status;
+      description = "Mojolicious server status plugin";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   MojoIOLoopForkCall = buildPerlModule rec {
     name = "Mojo-IOLoop-ForkCall-0.20";
     src = fetchurl {

From 5a179ffb014ab77c0b9161bfbe4655bea4933ad7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 1 Oct 2018 15:43:51 -0500
Subject: [PATCH 2222/3253] perlPackages.Mojolicious: 8.0 -> 8.01

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e652ee5b0a73..f1db293cbe9d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10005,10 +10005,10 @@ let
   };
 
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-8.0";
+    name = "Mojolicious-8.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98";
+      sha256 = "1gwf45s6vblff0ima2awjq3awj4wws4hn7df4d9jmyj9rji04z9c";
     };
     buildInputs = [ ExtUtilsMakeMaker ];
     propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];

From 2041c535f239e75c21fb534d1b3ddc073689e271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 2 Oct 2018 00:49:21 -0300
Subject: [PATCH 2223/3253] onestepback: 0.98 -> 0.991

- Update to version 0.991
- Add color variants of the theme
- Change home page
---
 pkgs/misc/themes/onestepback/default.nix | 38 ++++++++++++++++--------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
index 609e027d9eba..5e4f8ffa3d46 100644
--- a/pkgs/misc/themes/onestepback/default.nix
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -1,23 +1,37 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchurl, unzip }:
 
-let
-  version = "0.98";
-
-in fetchzip {
+stdenv.mkDerivation rec {
   name = "onestepback-${version}";
+  version = "0.991";
 
-  url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
+  srcs = [
+    (fetchurl {
+      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
+      sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm";
+    })
+    (fetchurl {
+      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip";
+      sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77";
+    })
+    (fetchurl {
+      url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip";
+      sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy";
+    })
+  ];
 
-  postFetch = ''
-    mkdir -p $out/share/themes
-    unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p  $out/share/themes
+    cp -a OneStepBack* $out/share/themes/
+    rm $out/share/themes/*/{LICENSE,README*}
   '';
 
-  sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr";
-
   meta = with stdenv.lib; {
     description = "Gtk theme inspired by the NextStep look";
-    homepage = https://www.opendesktop.org/p/1013663/;
+    homepage = http://www.vide.memoire.free.fr/perso/OneStepBack;
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = [ maintainers.romildo ];

From 132ed23f35547923f98b42af3f4ebf8d00ed1155 Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Tue, 2 Oct 2018 12:01:22 +0800
Subject: [PATCH 2224/3253] xcodeenv.buildApp: inherit meta

Without `inherit meta;` there was no easy way for XCode packages to
set meta information of the final derivation.
---
 pkgs/development/mobile/xcodeenv/build-app.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index a94f2745894b..d7dd2d1190d8 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -20,6 +20,7 @@
 , bundleId ? null
 , version ? null
 , title ? null
+, meta ? {}
 }:
 
 assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null;
@@ -49,6 +50,7 @@ in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
+  inherit meta;
   buildInputs = [ xcodewrapper ];
   buildPhase = ''
     ${stdenv.lib.optionalString release ''

From 16a8e49ae9c54e05e76a486457c42e31eee264de Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 29 Sep 2018 04:48:35 -0700
Subject: [PATCH 2225/3253] vagrant: remove unused vendored Gemfile{,.lock}

---
 pkgs/development/tools/vagrant/Gemfile      |   2 -
 pkgs/development/tools/vagrant/Gemfile.lock | 149 --------------------
 pkgs/development/tools/vagrant/default.nix  |   9 +-
 3 files changed, 4 insertions(+), 156 deletions(-)
 delete mode 100644 pkgs/development/tools/vagrant/Gemfile
 delete mode 100644 pkgs/development/tools/vagrant/Gemfile.lock

diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile
deleted file mode 100644
index d32951f1c054..000000000000
--- a/pkgs/development/tools/vagrant/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gem 'vagrant'
diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock
deleted file mode 100644
index 2a1515fd1438..000000000000
--- a/pkgs/development/tools/vagrant/Gemfile.lock
+++ /dev/null
@@ -1,149 +0,0 @@
-GIT
-  remote: https://github.com/hashicorp/vagrant-spec.git
-  revision: 9413ab298407114528766efefd1fb1ff24589636
-  specs:
-    vagrant-spec (0.0.1)
-      childprocess (~> 0.6.0)
-      log4r (~> 1.1.9)
-      rspec (~> 3.5.0)
-      thor (~> 0.18.1)
-
-PATH
-  remote: .
-  specs:
-    vagrant (2.1.2)
-      childprocess (~> 0.6.0)
-      erubis (~> 2.7.0)
-      hashicorp-checkpoint (~> 0.1.5)
-      i18n (>= 0.6.0, <= 0.8.0)
-      listen (~> 3.1.5)
-      log4r (~> 1.1.9, < 1.1.11)
-      net-scp (~> 1.2.0)
-      net-sftp (~> 2.1)
-      net-ssh (~> 4.2.0)
-      rb-kqueue (~> 0.2.0)
-      rest-client (>= 1.6.0, < 3.0)
-      ruby_dep (<= 1.3.1)
-      wdm (~> 0.1.0)
-      winrm (~> 2.1)
-      winrm-elevated (~> 1.1)
-      winrm-fs (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.3)
-    childprocess (0.6.3)
-      ffi (~> 1.0, >= 1.0.11)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    fake_ftp (0.1.1)
-    ffi (1.9.23)
-    gssapi (1.2.0)
-      ffi (>= 1.0.1)
-    gyoku (1.3.1)
-      builder (>= 2.1.2)
-    hashdiff (0.3.7)
-    hashicorp-checkpoint (0.1.5)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    i18n (0.8.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    little-plugger (1.1.4)
-    log4r (1.1.10)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    multi_json (1.13.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
-    netrc (0.11.0)
-    nori (2.6.0)
-    public_suffix (3.0.1)
-    rake (12.0.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rb-kqueue (0.2.5)
-      ffi (>= 0.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.3.1)
-    rubyntlm (0.6.2)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    thor (0.18.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-    wdm (0.1.1)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    winrm (2.2.3)
-      builder (>= 2.1.2)
-      erubis (~> 2.7)
-      gssapi (~> 1.2)
-      gyoku (~> 1.0)
-      httpclient (~> 2.2, >= 2.2.0.2)
-      logging (>= 1.6.1, < 3.0)
-      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
-      winrm (~> 2.0)
-      winrm-fs (~> 1.0)
-    winrm-fs (1.2.0)
-      erubis (~> 2.7)
-      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
-      winrm (~> 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fake_ftp (~> 0.1.1)
-  rake (~> 12.0.0)
-  rspec (~> 3.5.0)
-  rspec-its (~> 1.2.0)
-  vagrant!
-  vagrant-spec!
-  webmock (~> 2.3.1)
-
-BUNDLED WITH
-   1.16.2
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index f247a20b1b27..ecc1a2d00946 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,10 +1,8 @@
-{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
+{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText }:
 
 let
   # NOTE: bumping the version and updating the hash is insufficient;
-  # you must copy a fresh Gemfile.lock from the vagrant source,
-  # and use bundix to generate a new gemset.nix.
-  # Do not change the existing Gemfile.
+  # you must use bundix to generate a new gemset.nix in the Vagrant source.
   version = "2.1.2";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
   sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1";
@@ -15,7 +13,8 @@ let
     inherit version;
 
     inherit ruby;
-    gemdir = ./.;
+    gemfile = writeText "Gemfile" "";
+    lockfile = writeText "Gemfile.lock" "";
     gemset = lib.recursiveUpdate (import ./gemset.nix) {
       vagrant = {
         source = {

From 34f20090d3878d6a313660d1ecf1439ae1ea5119 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Tue, 2 Oct 2018 01:24:05 -0700
Subject: [PATCH 2226/3253] nwjs-sdk: init at 0.33.4 (#45320)

---
 pkgs/development/tools/nwjs/default.nix | 16 ++++++++++++----
 pkgs/top-level/all-packages.nix         |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 04cbdb6f5748..211934080c8f 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -5,6 +5,8 @@
 , libnotify
 , ffmpeg, libxcb, cups
 , sqlite, udev
+, libuuid
+, sdk ? false
 }:
 let
   bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -23,6 +25,7 @@ let
       ffmpeg libxcb
       # chromium runtime deps (dlopen’d)
       sqlite udev
+      libuuid
     ];
 
     extraOutputsToInstall = [ "lib" "out" ];
@@ -30,13 +33,18 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nwjs-${version}";
-  version = "0.32.4";
+  version = "0.33.4";
 
-  src = fetchurl {
+  src = if sdk then fetchurl {
+    url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else
+      "00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s";
+  } else fetchurl {
     url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
     sha256 = if bits == "x64" then
-      "0hzyiy6sbbjll1b946y3v7bv6sav3rhy4c48d4vcvamyv9pkfn45" else
-      "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250";
+      "09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else
+      "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce6c103f9653..bcaf137045e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8600,6 +8600,11 @@ with pkgs;
     gconf = pkgs.gnome2.GConf;
   };
 
+  nwjs-sdk = callPackage ../development/tools/nwjs {
+    gconf = pkgs.gnome2.GConf;
+    sdk = true;
+  };
+
   # only kept for nixui, see https://github.com/matejc/nixui/issues/27
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {
     gconf = pkgs.gnome2.GConf;

From 2c9265c95075170ad210ed5635ecffcd36db6b84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 2 Oct 2018 11:07:48 +0200
Subject: [PATCH 2227/3253] nix: 2.1.2 -> 2.1.3

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index adde237c07c9..1cfc8ff8612e 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/mxg4bbblxfns96yrz0nalxyiyjl7gj98-nix-2.1.2";
-  i686-linux = "/nix/store/bgjgmbwirx63mwwychpikd7yc4k4lbjv-nix-2.1.2";
-  aarch64-linux = "/nix/store/yi18azn4nwrcwvaiag04jnxc1qs38fy5-nix-2.1.2";
-  x86_64-darwin = "/nix/store/fpivmcck2qpw5plrp599iraw2x9jp18k-nix-2.1.2";
+  x86_64-linux = "/nix/store/cdcia67siabmj6li7vyffgv2cry86fq8-nix-2.1.3";
+  i686-linux = "/nix/store/6q3xi6y5qnsv7d62b8n00hqfxi8rs2xs-nix-2.1.3";
+  aarch64-linux = "/nix/store/2v93d0vimlm28jg0ms6v1i6lc0fq13pn-nix-2.1.3";
+  x86_64-darwin = "/nix/store/dkjlfkrknmxbjmpfk3dg4q3nmb7m3zvk-nix-2.1.3";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 71c5bd53909f..975d36ddf190 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
   }) // { perl-bindings = nix1; };
 
   nixStable = (common rec {
-    name = "nix-2.1.2";
+    name = "nix-2.1.3";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "68e55382dac9e66f84ead69b3c786a4ea85d4a6611a7a740aa0b78fcc85db3ec";
+      sha256 = "5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4";
     };
   }) // { perl-bindings = perl-bindings {
     nix = nixStable;

From 56621c016d543f58817e0dc2c6189bf635ae9799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Oct 2018 11:16:54 +0200
Subject: [PATCH 2228/3253] ffmpeg: unbreak build of older versions after
 #46078

As in the other cases, I didn't care about passing the dependency
if unused...
---
 pkgs/development/libraries/ffmpeg/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 89e06f8b8d92..7c3b3447d613 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
       "--enable-libmp3lame"
       (ifMinVer "1.2" "--enable-iconv")
       "--enable-libtheora"
-      "--enable-libssh"
+      (ifMinVer "2.1" "--enable-libssh")
       (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
       "--enable-vdpau"
       "--enable-libvorbis"

From 0b2f2f3d96c6b60518b2d66250090dd5c1d1d826 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Tue, 2 Oct 2018 11:38:30 +0200
Subject: [PATCH 2229/3253] jetbrains: add libnotify to wrapper to enable
 notifications

---
 pkgs/applications/editors/jetbrains/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 38996008f46f..be20800cde29 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,5 @@
 { stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, unzip, libsecret
+, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
 }:
 
 { name, product, version, src, wmClass, jdk, meta }:
@@ -67,6 +67,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         # Some internals want libstdc++.so.6
         stdenv.cc.cc.lib libsecret
+        libnotify
       ]}" \
       --set JDK_HOME "$jdk" \
       --set ${hiName}_JDK "$jdk" \

From 6e8da1ddf0be2d511e82f8a7f40236f3aa03ad3b Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 2 Oct 2018 12:13:53 +0200
Subject: [PATCH 2230/3253] WIP emby: 3.5.2.0 -> 3.5.3.0

---
 pkgs/servers/emby/default.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 11cb914bfd80..ab2d5fa08c27 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, unzip, sqlite, makeWrapper, mono54, ffmpeg }:
+{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }:
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.5.2.0";
+  version = "3.5.3.0";
 
   # We are fetching a binary here, however, a source build is possible.
   # See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   # This may also need msbuild (instead of xbuild) which isn't in nixpkgs
   # See -> https://github.com/NixOS/nixpkgs/issues/29817
   src = fetchurl {
-    url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-mono_${version}.zip";
-    sha256 = "12f9skvnr9qxnrvr3q014yggfwvkpjk0ynbgf0fwk56h4kal7fx8";
+    url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip";
+    sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj";
   };
 
   buildInputs = [
@@ -21,26 +21,22 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    mono54
+    dotnet-sdk
     sqlite
   ];
 
   preferLocalBuild = true;
 
-  # Need to set sourceRoot as unpacker will complain about multiple directory output
-  sourceRoot = ".";
-
   buildPhase = ''
-    substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
-    substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
+    rm -rf {electron,runtimes}
   '';
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    cp -r * "$out/bin"
+    install -dm 755 "$out/usr/lib/emby-server"
+    cp -r * "$out/usr/lib/emby-server"
 
-    makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
-      --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
+    makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
+      --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 
   meta =  with stdenv.lib; {

From e9fbc7ce3f28706f9526fac48afd2299761b3750 Mon Sep 17 00:00:00 2001
From: Bruno Bieth <biethb@gmail.com>
Date: Tue, 2 Oct 2018 10:33:37 +0200
Subject: [PATCH 2231/3253] autorandr: 1.6 -> 1.7

---
 pkgs/tools/misc/autorandr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 20beacf2b4f0..9a62f8c3fbf7 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,7 +6,7 @@
 
 let
   python = python3Packages.python;
-  version = "1.6";
+  version = "1.7";
 in
   stdenv.mkDerivation {
     name = "autorandr-${version}";
@@ -48,7 +48,7 @@ in
       owner = "phillipberndt";
       repo = "autorandr";
       rev = "${version}";
-      sha256 = "0m4lqqinr1mqf536gll7qyrnz86ca322pf99lagj00x0r8yj9liy";
+      sha256 = "0wpiimc5xai813h7gywwp20svkn35pkw99bnjflmpwz7x8fn8dfz";
     };
 
     meta = {

From 967baedc2a121c0dcd66b2af846b36fe9d98268c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 2 Oct 2018 10:37:02 +0200
Subject: [PATCH 2232/3253] youtube-dl: 2018.09.18 -> 2018.09.26

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 7e79614c04ca..8cc224f475b1 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.09.18";
+  version = "2018.09.26";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb";
+    sha256 = "0b26cnzdzai82d2bsy91jy1aas8m8psakdrs789xy0v4kwwgrk3n";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From c254feb860e1df8a025539faf74dab6f3cb32a7b Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 2 Oct 2018 09:42:27 +0200
Subject: [PATCH 2233/3253] jackett: 0.10.198 -> 0.10.250

---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index fe416876546c..b85c9c9204ef 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.10.198";
+  version = "0.10.250";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1svlb38iy47bv88rbk1nimb7pixxh142xr4xf761l3nm69w9qyfq";
+    sha256 = "0695r03cgmiwrsjrcippiibpcahxb55pma5a6plcfl1f8jxiwv76";
   };
 
   buildInputs = [ makeWrapper ];

From f7a2e2025f0194389e5a77ff15149c72a6262cac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 2 Oct 2018 12:37:34 +0200
Subject: [PATCH 2234/3253] emby: add sqlite to wrapper

---
 pkgs/servers/emby/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index ab2d5fa08c27..61f4ab721309 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
     cp -r * "$out/usr/lib/emby-server"
 
     makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
+      --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+        sqlite
+      ]}" \
       --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 

From fe970a82ece66e08d5400c22eebd2c2ec19b5457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Oct 2018 12:43:55 +0200
Subject: [PATCH 2235/3253] firefox: drop patch that's applied already

It's a bit weird that noone's noticed,
but I guess it's because of a merge or rebase.
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 7ac1f85c69e5..935be6230cd3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -28,12 +28,6 @@ rec {
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-      # fix build with rust >= 1.29 and firefox < 63
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1479540
-      (fetchpatch {
-        url = "https://github.com/mozilla/gecko-dev/commit/eec0d4f8714e6671402d41632232ef57348e65c4.patch";
-        sha256 = "1cjaqx811bcnp8b6z16q25csaclaic3b11q45ck02srd99n8qp0j";
-      })
     ];
 
     extraNativeBuildInputs = [ python3 ];

From ee3c0cf534ff175758dd8781f54cf5ae9be20644 Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Tue, 2 Oct 2018 12:47:56 +0200
Subject: [PATCH 2236/3253] gen-oath-safe: 2017-06-30 -> 0.11.0 (#47633)

---
 pkgs/tools/security/gen-oath-safe/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix
index 49770813b2b6..ca7793281ef9 100644
--- a/pkgs/tools/security/gen-oath-safe/default.nix
+++ b/pkgs/tools/security/gen-oath-safe/default.nix
@@ -1,12 +1,13 @@
 { coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }:
 
-stdenv.mkDerivation {
-  name = "gen-oath-safe-2017-01-23";
+stdenv.mkDerivation rec {
+  name = "gen-oath-safe-${version}";
+  version = "0.11.0";
   src = fetchFromGitHub {
     owner = "mcepl";
     repo = "gen-oath-safe";
-    rev = "fb53841";
-    sha256 = "0018kqmhg0861r5xkbis2a1rx49gyn0dxcyj05wap5ms7zz69m0m";
+    rev = version;
+    sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp";
   };
 
   buildInputs = [ makeWrapper ];

From 34ac35dfc68abcdc2ce08c724f0ce32031403b77 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@icloud.com>
Date: Tue, 2 Oct 2018 10:49:33 +0000
Subject: [PATCH 2237/3253] gildas: 20180901_a -> 20181001_a (#47657)

- Update gildas to the latest version
 - Remove a patch that has been applied upstream
---
 .../science/astronomy/gildas/default.nix            |  8 ++++----
 .../astronomy/gildas/gag-font-bin-rule.patch        | 13 -------------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 4de4752aefc1..dcb76320a9b5 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "sep18a";
-  version = "20180901_a";
+  srcVersion = "oct18a";
+  version = "20181001_a";
   name = "gildas-${version}";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     # source code of the previous release to a different directory
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
-    sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956";
+    sha256 = "091941a74kaw3xqsmqda7bj972cafi8ppj2c5xq0mca2c075dyfx";
   };
 
   enableParallelBuilding = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
 
-  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
+  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
deleted file mode 100644
index 61ddc37c7fd4..000000000000
--- a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
---- gildas-src-aug18a/kernel/etc/Makefile	2016-09-09 09:39:37.000000000 +0200
-+++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile	2018-09-04 12:03:11.000000000 +0200
-@@ -29,7 +29,8 @@
- 
- SEDEXE=sed -e 's?source tree?executable tree?g'
- 
--$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
-+$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
-+	$(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
- ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
- 	$(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
- else

From 9ac78930426b5d2d2538d838534c574212e81d78 Mon Sep 17 00:00:00 2001
From: catern <catern@catern.com>
Date: Tue, 2 Oct 2018 06:52:58 -0400
Subject: [PATCH 2238/3253] pythonPackages.trio: 0.6.0 -> 0.7.0 (#47638)

---
 pkgs/development/python-modules/trio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 89addb377dc4..ab816cde8355 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.6.0";
+  version = "0.7.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a80c10b89068950aa649edd4b09a6f56236642c2c2e648b956289d2301fdb9e";
+    sha256 = "0df152qnj4xgxrxzd8619f8h77mzry7z8sp4m76fi21gnrcr297n";
   };
 
   checkInputs = [ pytest pyopenssl trustme ];

From aeee761abaf1cb44fa73156ceea7a4e9598a1b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Tue, 2 Oct 2018 12:55:57 +0200
Subject: [PATCH 2239/3253] libcanberra: fix darwin build (#47634)

---
 pkgs/development/libraries/libcanberra/default.nix | 2 ++
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 8addb6128f0c..460a58a19a70 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
 , gtk ? null
 , libpulseaudio, gst_all_1, libvorbis, libcap
+, CoreServices
 , withAlsa ? stdenv.isLinux, alsaLib }:
 
 stdenv.mkDerivation rec {
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libpulseaudio libvorbis gtk
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
+    ++ lib.optional stdenv.isDarwin CoreServices
     ++ lib.optional stdenv.isLinux libcap
     ++ lib.optional withAlsa alsaLib;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcaf137045e3..b152a2e019ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10254,7 +10254,9 @@ with pkgs;
     inherit (xorg) libX11 libXext;
   };
 
-  libcanberra = callPackage ../development/libraries/libcanberra { };
+  libcanberra = callPackage ../development/libraries/libcanberra {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
   libcanberra-gtk3 = pkgs.libcanberra.override {
     gtk = gtk3;
   };

From 1af8f3a980bb8ac92f5c09ac23cca4781571bcd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Oct 2018 12:41:25 +0200
Subject: [PATCH 2240/3253] nixos: include system-level dconf resources in
 GDM's profile

This is necessary when system-wide dconf settings must be configured, i.e. to
disable GDM's auto-suspending of the machine when no user is logged in.

Related to https://github.com/NixOS/nixpkgs/issues/42053.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a775dd0f0e04..a16cbee3bb39 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -142,7 +142,10 @@ in
 
     systemd.user.services.dbus.wantedBy = [ "default.target" ];
 
-    programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
+    programs.dconf.profiles.gdm = pkgs.writeText "dconf-gdm-profile" ''
+      system-db:local
+      ${gdm}/share/dconf/profile/gdm
+    '';
 
     # Use AutomaticLogin if delay is zero, because it's immediate.
     # Otherwise with TimedLogin with zero seconds the prompt is still

From b3531b9719f37de1c25c40192399b34dba4e0494 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 1 Oct 2018 21:12:54 +0200
Subject: [PATCH 2241/3253] gcc-arm-embedded: 6-2017-q2-update ->
 7-2018-q2-update

+ update blackmagic to latest commit which includes gcc7 fixes
---
 maintainers/maintainer-list.nix               |  5 +++
 .../compilers/gcc-arm-embedded/7/default.nix  | 39 +++++++++++++++++++
 .../tools/misc/blackmagic/default.nix         |  4 +-
 pkgs/top-level/all-packages.nix               |  3 +-
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc-arm-embedded/7/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a535cbb3a94..f41027c7fb8d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3304,6 +3304,11 @@
     github = "proglodyte";
     name = "Proglodyte";
   };
+  prusnak = {
+    email = "stick@gk2.sk";
+    github = "prusnak";
+    name = "Pavol Rusnak";
+  };
   pshendry = {
     email = "paul@pshendry.com";
     github = "pshendry";
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
new file mode 100644
index 000000000000..c22683dae03a
--- /dev/null
+++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, ncurses5, python27 }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "gcc-arm-embedded-${version}";
+  version = "7-2018-q2-update";
+  subdir = "7-2018q2";
+
+  urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2";
+
+  src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+  '';
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  preFixup = ''
+    find $out -type f | while read f; do
+      patchelf $f > /dev/null 2>&1 || continue
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+      patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
+    done
+  '';
+
+  meta = {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
+    homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
+    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+    maintainers = with maintainers; [ prusnak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index 2d7225ee03ed..2974c653acdd 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "blacksphere";
     repo = "blackmagic";
-    rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c";
-    sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx";
+    rev = "29386aee140e5e99a958727358f60980418b4c88";
+    sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e37008b1f19..2b1730a442d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6744,7 +6744,8 @@ with pkgs;
     ncurses = pkgsi686Linux.ncurses5;
   };
   gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {};
-  gcc-arm-embedded = gcc-arm-embedded-6;
+  gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {};
+  gcc-arm-embedded = gcc-arm-embedded-7;
 
   gforth = callPackage ../development/compilers/gforth {};
 

From b810cdc09046d5b06ad9dceb4052b0e2c47da60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 2 Oct 2018 10:51:47 -0300
Subject: [PATCH 2242/3253] theme-obsidian2: fix theme name in index.theme
 (#47661)

---
 pkgs/misc/themes/obsidian2/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index d5de3bc43edf..61f7d1debcc0 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
+  postPatch = ''
+    sed -i -e 's|Obsidian-2-Local|Obsidian-2|' Obsidian-2/index.theme
+  '';
+
   installPhase = ''
     mkdir -p $out/share/themes
     cp -a Obsidian-2 $out/share/themes

From 3790cf7345d6af7fd0c4a92df2c09edf8e3ec18b Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Tue, 2 Oct 2018 15:52:22 +0200
Subject: [PATCH 2243/3253] csv2svn: 2.4.0 -> 2.5.0 (#47635)

use buildPythonApplication instead of manual setup.py call
---
 .../version-management/cvs2svn/default.nix    | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 5dc0c48b0f78..a2ebb8195db4 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -1,29 +1,33 @@
-{stdenv, lib, fetchurl, python2, cvs, makeWrapper}:
+{ lib, fetchurl, makeWrapper
+, python2Packages
+, cvs, subversion, git, bazaar
+}:
 
-stdenv.mkDerivation rec {
-  name = "cvs2svn-2.4.0";
+python2Packages.buildPythonApplication  rec {
+  name = "cvs2svn-${version}";
+  version = "2.5.0";
 
   src = fetchurl {
-    url = "http://cvs2svn.tigris.org/files/documents/1462/49237/${name}.tar.gz";
-    sha256 = "05piyrcp81a1jgjm66xhq7h1sscx42ccjqaw30h40dxlwz1pyrx6";
+    url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${name}.tar.gz";
+    sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
   };
 
-  buildInputs = [python2 makeWrapper];
+  buildInputs = [ makeWrapper ];
 
-  dontBuild = true;
-  installPhase = ''
-    python ./setup.py install --prefix=$out
+  checkInputs = [ subversion git bazaar ];
+
+  checkPhase = "python run-tests.py";
+
+  doCheck = false; # Couldn't find node 'transaction...' in expected output tree
+
+  postInstall = ''
     for i in bzr svn git; do
       wrapProgram $out/bin/cvs2$i \
-          --prefix PATH : "${lib.makeBinPath [ cvs ]}" \
-          --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
+          --prefix PATH : "${lib.makeBinPath [ cvs ]}"
     done
   '';
 
-  /* !!! maybe we should absolutise the program names in
-     $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to convert CVS repositories to Subversion repositories";
     homepage = http://cvs2svn.tigris.org/;
     maintainers = [ maintainers.makefu ];

From 624b5c14c0c05e2bf9695093aa07bfcdfde0143d Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 2 Oct 2018 15:58:43 +0200
Subject: [PATCH 2244/3253] traefik: 1.7.0 -> 1.7.1 (#47660)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/servers/traefik/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index be279937ef8a..b1097c1e96fc 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "1nv2w174vw5dq60cz8a2riwjyl9rzxqwp7z7v5zv7ch0bxq9cvhn";
+    sha256 = "13vvwb1mrnxn4y1ga37pc5c46qdj5jkrcnyn2w9rb59madgq4c77";
   };
 
   buildInputs = [ go-bindata bash ];

From 5f5905e30e86db1ac72b98f41873f63606418cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <github@leo.gaspard.ninja>
Date: Tue, 2 Oct 2018 23:03:18 +0900
Subject: [PATCH 2245/3253] jetbrains.idea-community: add IntelliJ keyword to
 the longDescription (#47650)

This should make it easier to find the package under the name
IntelliJ in eg. [1]

[1] https://nixos.org/nixos/packages.html#intellij
---
 pkgs/applications/editors/jetbrains/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9bf80b050a86..23ecfb0c19d3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -130,7 +130,8 @@ let
         longDescription = ''
           IDE for Java SE, Groovy & Scala development Powerful
           environment for building Google Android apps Integration
-          with JUnit, TestNG, popular SCMs, Ant & Maven.
+          with JUnit, TestNG, popular SCMs, Ant & Maven. Also known
+          as IntelliJ.
         '';
         maintainers = with maintainers; [ edwtjo ];
         platforms = platforms.linux;

From 609f9198f218ab19f02bfc53f544635656a65b52 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Sep 2018 02:32:24 -0700
Subject: [PATCH 2246/3253] verilator: 3.926 -> 4.002

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/verilator/versions
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index fd6240fe1b21..986c4a1f32a1 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.926";
+  version = "4.002";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "0f4ajj1gmxskid61qj1ql1rzc3cmn1x2fpgqrbg7x3gszz61c9gr";
+    sha256 = "10g1814kq07a2818p0lmvacy1a6shbc0k6z16wdgas4h5x1n4f43";
   };
 
   enableParallelBuilding = true;

From 3c94e4782f57ffe5d477cf4431f4aeee8d83c0f0 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 2 Oct 2018 00:34:42 +0900
Subject: [PATCH 2247/3253] linux_mptcp: 0.94 -> 0.94.1

Also introduce linux_mptcp_94 alias to prevent from overriding the wrong kernel
when switching across branches.

test
---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 8014cb565267..7375daf61da5 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 buildLinux (rec {
-  mptcpVersion = "0.94";
-  modDirVersion = "4.14.24";
+  mptcpVersion = "0.94.1";
+  modDirVersion = "4.14.70";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
   # autoModules= true;
 
@@ -15,7 +15,7 @@ buildLinux (rec {
     owner = "multipath-tcp";
     repo = "mptcp";
     rev = "v${mptcpVersion}";
-    sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv";
+    sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4";
   };
 
   extraConfig = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b152a2e019ff..a76f5576de02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14067,8 +14067,8 @@ with pkgs;
       ];
   };
 
-  # linux mptcp is based on the 4.4 kernel
-  linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
+  linux_mptcp = linux_mptcp_94;
+  linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.11"

From fbc1fb78e37cc29eadee4ad8687e8777eba3cf0e Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 2 Oct 2018 18:01:42 +0200
Subject: [PATCH 2248/3253] wmfocus: init at 1.0.2 (#47662)

* wmfocus: init at 1.0.2
* wmfocus: fix buildInputs
---
 .../window-managers/i3/wmfocus.nix            | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/window-managers/i3/wmfocus.nix

diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
new file mode 100644
index 000000000000..546589623cbd
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, rustPlatform,
+  xorg, python3, pkgconfig, cairo, libxkbcommon }:
+let
+  pname = "wmfocus";
+  version = "1.0.2";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+  name = "${pname}-${version}";
+
+  nativeBuildInputs = [ python3 pkgconfig ];
+  buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
+
+  # For now, this is the only available featureset. This is also why the file is
+  # in the i3 folder, even though it might be useful for more than just i3
+  # users.
+  cargoBuildFlags = ["--features i3"];
+
+  src = fetchFromGitHub {
+    owner = "svenstaro";
+    repo = pname;
+    rev = version;
+    sha256 = "14yxg2jiqx7gng677sbmvv0a0msb9wpvp3qh8h3nkq0vi17ds668";
+  };
+
+  cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg";
+
+  meta = with stdenv.lib; {
+    description = ''
+      Tool that allows you to rapidly choose a specific window directly
+      without having to use the mouse or directional keyboard navigation.
+    '';
+    maintainers = with maintainers; [ synthetica ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+    homepage = https://github.com/svenstaro/wmfocus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b152a2e019ff..e1a4dbb805e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17096,6 +17096,8 @@ with pkgs;
 
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
 
+  wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
+
   i810switch = callPackage ../os-specific/linux/i810switch { };
 
   icewm = callPackage ../applications/window-managers/icewm {};

From 22e9c0a6fa43a4b4a13b23be94a5c53d0452865e Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Tue, 2 Oct 2018 18:06:55 +0200
Subject: [PATCH 2249/3253] jshint: depend on phantomjs2

---
 pkgs/development/node-packages/default-v8.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 0144400859ab..49313eb16a79 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -16,6 +16,10 @@ nodePackages // {
     '';
   };
 
+  jshint = nodePackages.jshint.override {
+    buildInputs = [ pkgs.phantomjs2 ];
+  };
+
   dat = nodePackages.dat.override {
     buildInputs = [ nodePackages.node-gyp-build ];
   };

From 470fe73332144476bb5ee5446cfd5aaf9d8a358f Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 2 Oct 2018 19:07:49 +0300
Subject: [PATCH 2250/3253] nano-wallet: 16.0 -> 16.1

---
 pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 4667d4029878..3426d8d07a08 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "16.0";
+  version = "16.1";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0fk8jlas3khdh3nlv40krsjdifxp9agblvzap6k93wmm9y34h41c";
+    sha256 = "0sk9g4fv494a5w75vs5a3s5c139lxzz1svz0cn1hkhxqlmz8w081";
     fetchSubmodules = true;
   };
 

From 2671acc47194bb2c9c29790ba0712adc58a8f225 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 2 Oct 2018 19:20:13 +0300
Subject: [PATCH 2251/3253] syncthing: 0.14.50 -> 0.14.51

---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index b7bad13a30d8..86c8b6db2c47 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, patches ? [], postInstall ? "" }:
     stdenv.mkDerivation rec {
-      version = "0.14.50";
+      version = "0.14.51";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "10lilw20mq1zshysb9zrszcpl4slyyxvnbxfqk04nhz0b1gmm9ri";
+        sha256 = "1ycly3vh10s04pk0fk9hb0my7w5b16dfgmnk1mi0zjylcii3yzi5";
       };
 
       inherit patches;

From 9cab954ab6e976dc45af4b4c23a1977966d480e5 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 1 Oct 2018 21:27:52 +0200
Subject: [PATCH 2252/3253] unifiStable: 5.8.28 -> 5.8.30

---
 pkgs/servers/unifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 7436c06d7b84..57b3784d6f41 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,8 +49,8 @@ in rec {
   };
 
   unifiStable = generic {
-    version = "5.8.28";
-    sha256  = "1zyc6n54dwqy9diyqnzlwypgnj3hqcv0lfx47s4rkq3kbm49nwnl";
+    version = "5.8.30";
+    sha256  = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi";
   };
 
   unifiTesting = generic {

From 8fa7b8935390adb3651ce586c29c1f19e50d265d Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 1 Oct 2018 21:29:33 +0200
Subject: [PATCH 2253/3253] unifiTesting: 5.9.22 -> 5.9.29

---
 pkgs/servers/unifi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 57b3784d6f41..ae7dd9805776 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -54,8 +54,8 @@ in rec {
   };
 
   unifiTesting = generic {
-    version = "5.9.22";
-    suffix  = "-d2a4718971";
-    sha256  = "1xxpvvn0815snag4bmmsdm8zh0cb2qjrhnvlkgn8i478ja1r3n54";
+    version = "5.9.29";
+    suffix  = "-04b5d20997";
+    sha256  = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
   };
 }

From f200a322c4f55c853d6543e47ebdbe7457262a61 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 13:52:21 -0400
Subject: [PATCH 2254/3253] nixpkgs docs: move overrides to its own file

---
 doc/functions.xml           | 202 +----------------------------------
 doc/functions/overrides.xml | 205 ++++++++++++++++++++++++++++++++++++
 2 files changed, 206 insertions(+), 201 deletions(-)
 create mode 100644 doc/functions/overrides.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index 8223a8b0531c..754159bff4f1 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -7,208 +7,8 @@
   The nixpkgs repository has several utility functions to manipulate Nix
   expressions.
  </para>
- <section xml:id="sec-overrides">
-  <title>Overriding</title>
 
-  <para>
-   Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
-   derivation attributes, the results of derivations or even the whole package
-   set.
-  </para>
-
-  <section xml:id="sec-pkg-override">
-   <title>&lt;pkg&gt;.override</title>
-
-   <para>
-    The function <varname>override</varname> is usually available for all the
-    derivations in the nixpkgs expression (<varname>pkgs</varname>).
-   </para>
-
-   <para>
-    It is used to override the arguments passed to a function.
-   </para>
-
-   <para>
-    Example usages:
-<programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
-<programlisting>
-import pkgs.path { overlays = [ (self: super: {
-  foo = super.foo.override { barSupport = true ; };
-  })]};
-</programlisting>
-<programlisting>
-mypkg = pkgs.callPackage ./mypkg.nix {
-  mydep = pkgs.mydep.override { ... };
-  }
-</programlisting>
-   </para>
-
-   <para>
-    In the first example, <varname>pkgs.foo</varname> is the result of a
-    function call with some default arguments, usually a derivation. Using
-    <varname>pkgs.foo.override</varname> will call the same function with the
-    given new arguments.
-   </para>
-  </section>
-
-  <section xml:id="sec-pkg-overrideAttrs">
-   <title>&lt;pkg&gt;.overrideAttrs</title>
-
-   <para>
-    The function <varname>overrideAttrs</varname> allows overriding the
-    attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
-    producing a new derivation based on the original one. This function is
-    available on all derivations produced by the
-    <varname>stdenv.mkDerivation</varname> function, which is most packages in
-    the nixpkgs expression <varname>pkgs</varname>.
-   </para>
-
-   <para>
-    Example usage:
-<programlisting>
-helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
-  separateDebugInfo = true;
-});
-</programlisting>
-   </para>
-
-   <para>
-    In the above example, the <varname>separateDebugInfo</varname> attribute is
-    overridden to be true, thus building debug info for
-    <varname>helloWithDebug</varname>, while all other attributes will be
-    retained from the original <varname>hello</varname> package.
-   </para>
-
-   <para>
-    The argument <varname>oldAttrs</varname> is conventionally used to refer to
-    the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
-   </para>
-
-   <note>
-    <para>
-     Note that <varname>separateDebugInfo</varname> is processed only by the
-     <varname>stdenv.mkDerivation</varname> function, not the generated, raw
-     Nix derivation. Thus, using <varname>overrideDerivation</varname> will not
-     work in this case, as it overrides only the attributes of the final
-     derivation. It is for this reason that <varname>overrideAttrs</varname>
-     should be preferred in (almost) all cases to
-     <varname>overrideDerivation</varname>, i.e. to allow using
-     <varname>sdenv.mkDerivation</varname> to process input arguments, as well
-     as the fact that it is easier to use (you can use the same attribute names
-     you see in your Nix code, instead of the ones generated (e.g.
-     <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
-     and involves less typing.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="sec-pkg-overrideDerivation">
-   <title>&lt;pkg&gt;.overrideDerivation</title>
-
-   <warning>
-    <para>
-     You should prefer <varname>overrideAttrs</varname> in almost all cases,
-     see its documentation for the reasons why.
-     <varname>overrideDerivation</varname> is not deprecated and will continue
-     to work, but is less nice to use and does not have as many abilities as
-     <varname>overrideAttrs</varname>.
-    </para>
-   </warning>
-
-   <warning>
-    <para>
-     Do not use this function in Nixpkgs as it evaluates a Derivation before
-     modifying it, which breaks package abstraction and removes error-checking
-     of function arguments. In addition, this evaluation-per-function
-     application incurs a performance penalty, which can become a problem if
-     many overrides are used. It is only intended for ad-hoc customisation,
-     such as in <filename>~/.config/nixpkgs/config.nix</filename>.
-    </para>
-   </warning>
-
-   <para>
-    The function <varname>overrideDerivation</varname> creates a new derivation
-    based on an existing one by overriding the original's attributes with the
-    attribute set produced by the specified function. This function is
-    available on all derivations defined using the
-    <varname>makeOverridable</varname> function. Most standard
-    derivation-producing functions, such as
-    <varname>stdenv.mkDerivation</varname>, are defined using this function,
-    which means most packages in the nixpkgs expression,
-    <varname>pkgs</varname>, have this function.
-   </para>
-
-   <para>
-    Example usage:
-<programlisting>
-mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
-  name = "sed-4.2.2-pre";
-  src = fetchurl {
-    url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
-    sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
-  };
-  patches = [];
-});
-</programlisting>
-   </para>
-
-   <para>
-    In the above example, the <varname>name</varname>, <varname>src</varname>,
-    and <varname>patches</varname> of the derivation will be overridden, while
-    all other attributes will be retained from the original derivation.
-   </para>
-
-   <para>
-    The argument <varname>oldAttrs</varname> is used to refer to the attribute
-    set of the original derivation.
-   </para>
-
-   <note>
-    <para>
-     A package's attributes are evaluated *before* being modified by the
-     <varname>overrideDerivation</varname> function. For example, the
-     <varname>name</varname> attribute reference in <varname>url =
-     "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
-     <varname>overrideDerivation</varname> function modifies the attribute set.
-     This means that overriding the <varname>name</varname> attribute, in this
-     example, *will not* change the value of the <varname>url</varname>
-     attribute. Instead, we need to override both the <varname>name</varname>
-     *and* <varname>url</varname> attributes.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="sec-lib-makeOverridable">
-   <title>lib.makeOverridable</title>
-
-   <para>
-    The function <varname>lib.makeOverridable</varname> is used to make the
-    result of a function easily customizable. This utility only makes sense for
-    functions that accept an argument set and return an attribute set.
-   </para>
-
-   <para>
-    Example usage:
-<programlisting>
-f = { a, b }: { result = a+b; };
-c = lib.makeOverridable f { a = 1; b = 2; };
-</programlisting>
-   </para>
-
-   <para>
-    The variable <varname>c</varname> is the value of the <varname>f</varname>
-    function applied with some default arguments. Hence the value of
-    <varname>c.result</varname> is <literal>3</literal>, in this example.
-   </para>
-
-   <para>
-    The variable <varname>c</varname> however also has some additional
-    functions, like <link linkend="sec-pkg-override">c.override</link> which
-    can be used to override the default arguments. In this example the value of
-    <varname>(c.override { a = 4; }).result</varname> is 6.
-   </para>
-  </section>
- </section>
+ <xi:include href="functions/overrides.xml" />
  <section xml:id="sec-generators">
   <title>Generators</title>
 
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
new file mode 100644
index 000000000000..dc81e3795065
--- /dev/null
+++ b/doc/functions/overrides.xml
@@ -0,0 +1,205 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-overrides">
+  <title>Overriding</title>
+
+  <para>
+   Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
+   derivation attributes, the results of derivations or even the whole package
+   set.
+  </para>
+
+  <section xml:id="sec-pkg-override">
+   <title>&lt;pkg&gt;.override</title>
+
+   <para>
+    The function <varname>override</varname> is usually available for all the
+    derivations in the nixpkgs expression (<varname>pkgs</varname>).
+   </para>
+
+   <para>
+    It is used to override the arguments passed to a function.
+   </para>
+
+   <para>
+    Example usages:
+<programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
+<programlisting>
+import pkgs.path { overlays = [ (self: super: {
+  foo = super.foo.override { barSupport = true ; };
+  })]};
+</programlisting>
+<programlisting>
+mypkg = pkgs.callPackage ./mypkg.nix {
+  mydep = pkgs.mydep.override { ... };
+  }
+</programlisting>
+   </para>
+
+   <para>
+    In the first example, <varname>pkgs.foo</varname> is the result of a
+    function call with some default arguments, usually a derivation. Using
+    <varname>pkgs.foo.override</varname> will call the same function with the
+    given new arguments.
+   </para>
+  </section>
+
+  <section xml:id="sec-pkg-overrideAttrs">
+   <title>&lt;pkg&gt;.overrideAttrs</title>
+
+   <para>
+    The function <varname>overrideAttrs</varname> allows overriding the
+    attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
+    producing a new derivation based on the original one. This function is
+    available on all derivations produced by the
+    <varname>stdenv.mkDerivation</varname> function, which is most packages in
+    the nixpkgs expression <varname>pkgs</varname>.
+   </para>
+
+   <para>
+    Example usage:
+<programlisting>
+helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+  separateDebugInfo = true;
+});
+</programlisting>
+   </para>
+
+   <para>
+    In the above example, the <varname>separateDebugInfo</varname> attribute is
+    overridden to be true, thus building debug info for
+    <varname>helloWithDebug</varname>, while all other attributes will be
+    retained from the original <varname>hello</varname> package.
+   </para>
+
+   <para>
+    The argument <varname>oldAttrs</varname> is conventionally used to refer to
+    the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+   </para>
+
+   <note>
+    <para>
+     Note that <varname>separateDebugInfo</varname> is processed only by the
+     <varname>stdenv.mkDerivation</varname> function, not the generated, raw
+     Nix derivation. Thus, using <varname>overrideDerivation</varname> will not
+     work in this case, as it overrides only the attributes of the final
+     derivation. It is for this reason that <varname>overrideAttrs</varname>
+     should be preferred in (almost) all cases to
+     <varname>overrideDerivation</varname>, i.e. to allow using
+     <varname>sdenv.mkDerivation</varname> to process input arguments, as well
+     as the fact that it is easier to use (you can use the same attribute names
+     you see in your Nix code, instead of the ones generated (e.g.
+     <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
+     and involves less typing.
+    </para>
+   </note>
+  </section>
+
+  <section xml:id="sec-pkg-overrideDerivation">
+   <title>&lt;pkg&gt;.overrideDerivation</title>
+
+   <warning>
+    <para>
+     You should prefer <varname>overrideAttrs</varname> in almost all cases,
+     see its documentation for the reasons why.
+     <varname>overrideDerivation</varname> is not deprecated and will continue
+     to work, but is less nice to use and does not have as many abilities as
+     <varname>overrideAttrs</varname>.
+    </para>
+   </warning>
+
+   <warning>
+    <para>
+     Do not use this function in Nixpkgs as it evaluates a Derivation before
+     modifying it, which breaks package abstraction and removes error-checking
+     of function arguments. In addition, this evaluation-per-function
+     application incurs a performance penalty, which can become a problem if
+     many overrides are used. It is only intended for ad-hoc customisation,
+     such as in <filename>~/.config/nixpkgs/config.nix</filename>.
+    </para>
+   </warning>
+
+   <para>
+    The function <varname>overrideDerivation</varname> creates a new derivation
+    based on an existing one by overriding the original's attributes with the
+    attribute set produced by the specified function. This function is
+    available on all derivations defined using the
+    <varname>makeOverridable</varname> function. Most standard
+    derivation-producing functions, such as
+    <varname>stdenv.mkDerivation</varname>, are defined using this function,
+    which means most packages in the nixpkgs expression,
+    <varname>pkgs</varname>, have this function.
+   </para>
+
+   <para>
+    Example usage:
+<programlisting>
+mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+  name = "sed-4.2.2-pre";
+  src = fetchurl {
+    url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
+    sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k";
+  };
+  patches = [];
+});
+</programlisting>
+   </para>
+
+   <para>
+    In the above example, the <varname>name</varname>, <varname>src</varname>,
+    and <varname>patches</varname> of the derivation will be overridden, while
+    all other attributes will be retained from the original derivation.
+   </para>
+
+   <para>
+    The argument <varname>oldAttrs</varname> is used to refer to the attribute
+    set of the original derivation.
+   </para>
+
+   <note>
+    <para>
+     A package's attributes are evaluated *before* being modified by the
+     <varname>overrideDerivation</varname> function. For example, the
+     <varname>name</varname> attribute reference in <varname>url =
+     "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
+     <varname>overrideDerivation</varname> function modifies the attribute set.
+     This means that overriding the <varname>name</varname> attribute, in this
+     example, *will not* change the value of the <varname>url</varname>
+     attribute. Instead, we need to override both the <varname>name</varname>
+     *and* <varname>url</varname> attributes.
+    </para>
+   </note>
+  </section>
+
+  <section xml:id="sec-lib-makeOverridable">
+   <title>lib.makeOverridable</title>
+
+   <para>
+    The function <varname>lib.makeOverridable</varname> is used to make the
+    result of a function easily customizable. This utility only makes sense for
+    functions that accept an argument set and return an attribute set.
+   </para>
+
+   <para>
+    Example usage:
+<programlisting>
+f = { a, b }: { result = a+b; };
+c = lib.makeOverridable f { a = 1; b = 2; };
+</programlisting>
+   </para>
+
+   <para>
+    The variable <varname>c</varname> is the value of the <varname>f</varname>
+    function applied with some default arguments. Hence the value of
+    <varname>c.result</varname> is <literal>3</literal>, in this example.
+   </para>
+
+   <para>
+    The variable <varname>c</varname> however also has some additional
+    functions, like <link linkend="sec-pkg-override">c.override</link> which
+    can be used to override the default arguments. In this example the value of
+    <varname>(c.override { a = 4; }).result</varname> is 6.
+   </para>
+  </section>
+ </section>

From 9ae39b3553146b3ae72fc5ac26654e1930baba3d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:03:59 -0400
Subject: [PATCH 2255/3253] nixpkgs docs: move generators to its own file

---
 doc/functions.xml            | 88 +----------------------------------
 doc/functions/generators.xml | 90 ++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 87 deletions(-)
 create mode 100644 doc/functions/generators.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index 754159bff4f1..333ed65986b1 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -9,93 +9,7 @@
  </para>
 
  <xi:include href="functions/overrides.xml" />
- <section xml:id="sec-generators">
-  <title>Generators</title>
-
-  <para>
-   Generators are functions that create file formats from nix data structures,
-   e. g. for configuration files. There are generators available for:
-   <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
-  </para>
-
-  <para>
-   All generators follow a similar call interface: <code>generatorName
-   configFunctions data</code>, where <literal>configFunctions</literal> is an
-   attrset of user-defined functions that format nested parts of the content.
-   They each have common defaults, so often they do not need to be set
-   manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
-   ] name)</code> from the <literal>INI</literal> generator. It receives the
-   name of a section and sanitizes it. The default
-   <literal>mkSectionName</literal> escapes <literal>[</literal> and
-   <literal>]</literal> with a backslash.
-  </para>
-
-  <para>
-   Generators can be fine-tuned to produce exactly the file format required by
-   your application/service. One example is an INI-file format which uses
-   <literal>: </literal> as separator, the strings
-   <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
-   requires all string values to be quoted:
-  </para>
-
-<programlisting>
-with lib;
-let
-  customToINI = generators.toINI {
-    # specifies how to format a key/value pair
-    mkKeyValue = generators.mkKeyValueDefault {
-      # specifies the generated string for a subset of nix values
-      mkValueString = v:
-             if v == true then ''"yes"''
-        else if v == false then ''"no"''
-        else if isString v then ''"${v}"''
-        # and delegats all other values to the default generator
-        else generators.mkValueStringDefault {} v;
-    } ":";
-  };
-
-# the INI file can now be given as plain old nix values
-in customToINI {
-  main = {
-    pushinfo = true;
-    autopush = false;
-    host = "localhost";
-    port = 42;
-  };
-  mergetool = {
-    merge = "diff3";
-  };
-}
-</programlisting>
-
-  <para>
-   This will produce the following INI file as nix string:
-  </para>
-
-<programlisting>
-[main]
-autopush:"no"
-host:"localhost"
-port:42
-pushinfo:"yes"
-str\:ange:"very::strange"
-
-[mergetool]
-merge:"diff3"
-</programlisting>
-
-  <note>
-   <para>
-    Nix store paths can be converted to strings by enclosing a derivation
-    attribute like so: <code>"${drv}"</code>.
-   </para>
-  </note>
-
-  <para>
-   Detailed documentation for each generator can be found in
-   <literal>lib/generators.nix</literal>.
-  </para>
- </section>
+ <xi:include href="functions/generators.xml" />
  <section xml:id="sec-debug">
   <title>Debugging Nix Expressions</title>
 
diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml
new file mode 100644
index 000000000000..0a9c346145f9
--- /dev/null
+++ b/doc/functions/generators.xml
@@ -0,0 +1,90 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-generators">
+  <title>Generators</title>
+
+  <para>
+   Generators are functions that create file formats from nix data structures,
+   e. g. for configuration files. There are generators available for:
+   <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
+  </para>
+
+  <para>
+   All generators follow a similar call interface: <code>generatorName
+   configFunctions data</code>, where <literal>configFunctions</literal> is an
+   attrset of user-defined functions that format nested parts of the content.
+   They each have common defaults, so often they do not need to be set
+   manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
+   ] name)</code> from the <literal>INI</literal> generator. It receives the
+   name of a section and sanitizes it. The default
+   <literal>mkSectionName</literal> escapes <literal>[</literal> and
+   <literal>]</literal> with a backslash.
+  </para>
+
+  <para>
+   Generators can be fine-tuned to produce exactly the file format required by
+   your application/service. One example is an INI-file format which uses
+   <literal>: </literal> as separator, the strings
+   <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
+   requires all string values to be quoted:
+  </para>
+
+<programlisting>
+with lib;
+let
+  customToINI = generators.toINI {
+    # specifies how to format a key/value pair
+    mkKeyValue = generators.mkKeyValueDefault {
+      # specifies the generated string for a subset of nix values
+      mkValueString = v:
+             if v == true then ''"yes"''
+        else if v == false then ''"no"''
+        else if isString v then ''"${v}"''
+        # and delegats all other values to the default generator
+        else generators.mkValueStringDefault {} v;
+    } ":";
+  };
+
+# the INI file can now be given as plain old nix values
+in customToINI {
+  main = {
+    pushinfo = true;
+    autopush = false;
+    host = "localhost";
+    port = 42;
+  };
+  mergetool = {
+    merge = "diff3";
+  };
+}
+</programlisting>
+
+  <para>
+   This will produce the following INI file as nix string:
+  </para>
+
+<programlisting>
+[main]
+autopush:"no"
+host:"localhost"
+port:42
+pushinfo:"yes"
+str\:ange:"very::strange"
+
+[mergetool]
+merge:"diff3"
+</programlisting>
+
+  <note>
+   <para>
+    Nix store paths can be converted to strings by enclosing a derivation
+    attribute like so: <code>"${drv}"</code>.
+   </para>
+  </note>
+
+  <para>
+   Detailed documentation for each generator can be found in
+   <literal>lib/generators.nix</literal>.
+  </para>
+ </section>

From 3ac79c89b7da1f674c742f6a30385d37454e7f62 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:07:06 -0400
Subject: [PATCH 2256/3253] nixpkgs docs: move debug to its own file

---
 doc/functions.xml       | 19 +------------------
 doc/functions/debug.xml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 doc/functions/debug.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index 333ed65986b1..b710d30e1081 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -10,24 +10,7 @@
 
  <xi:include href="functions/overrides.xml" />
  <xi:include href="functions/generators.xml" />
- <section xml:id="sec-debug">
-  <title>Debugging Nix Expressions</title>
-
-  <para>
-   Nix is a unityped, dynamic language, this means every value can potentially
-   appear anywhere. Since it is also non-strict, evaluation order and what
-   ultimately is evaluated might surprise you. Therefore it is important to be
-   able to debug nix expressions.
-  </para>
-
-  <para>
-   In the <literal>lib/debug.nix</literal> file you will find a number of
-   functions that help (pretty-)printing values while evaluation is runnnig.
-   You can even specify how deep these values should be printed recursively,
-   and transform them on the fly. Please consult the docstrings in
-   <literal>lib/debug.nix</literal> for usage information.
-  </para>
- </section>
+ <xi:include href="functions/debug.xml" />
  <section xml:id="sec-fhs-environments">
   <title>buildFHSUserEnv</title>
 
diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml
new file mode 100644
index 000000000000..272bdf55513f
--- /dev/null
+++ b/doc/functions/debug.xml
@@ -0,0 +1,21 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-debug">
+  <title>Debugging Nix Expressions</title>
+
+  <para>
+   Nix is a unityped, dynamic language, this means every value can potentially
+   appear anywhere. Since it is also non-strict, evaluation order and what
+   ultimately is evaluated might surprise you. Therefore it is important to be
+   able to debug nix expressions.
+  </para>
+
+  <para>
+   In the <literal>lib/debug.nix</literal> file you will find a number of
+   functions that help (pretty-)printing values while evaluation is runnnig.
+   You can even specify how deep these values should be printed recursively,
+   and transform them on the fly. Please consult the docstrings in
+   <literal>lib/debug.nix</literal> for usage information.
+  </para>
+ </section>

From 0856d5c4add0abe92c1a8d15f95003ce5a2b828d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:08:36 -0400
Subject: [PATCH 2257/3253] nixpkgs docs: move fhs-environments to its own file

---
 doc/functions.xml                  | 142 +---------------------------
 doc/functions/fhs-environments.xml | 144 +++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+), 141 deletions(-)
 create mode 100644 doc/functions/fhs-environments.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index b710d30e1081..ac75c4fc10e4 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -11,147 +11,7 @@
  <xi:include href="functions/overrides.xml" />
  <xi:include href="functions/generators.xml" />
  <xi:include href="functions/debug.xml" />
- <section xml:id="sec-fhs-environments">
-  <title>buildFHSUserEnv</title>
-
-  <para>
-   <function>buildFHSUserEnv</function> provides a way to build and run
-   FHS-compatible lightweight sandboxes. It creates an isolated root with bound
-   <filename>/nix/store</filename>, so its footprint in terms of disk space
-   needed is quite small. This allows one to run software which is hard or
-   unfeasible to patch for NixOS -- 3rd-party source trees with FHS
-   assumptions, games distributed as tarballs, software with integrity checking
-   and/or external self-updated binaries. It uses Linux namespaces feature to
-   create temporary lightweight environments which are destroyed after all
-   child processes exit, without root user rights requirement. Accepted
-   arguments are:
-  </para>
-
-  <variablelist>
-   <varlistentry>
-    <term>
-     <literal>name</literal>
-    </term>
-    <listitem>
-     <para>
-      Environment name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>targetPkgs</literal>
-    </term>
-    <listitem>
-     <para>
-      Packages to be installed for the main host's architecture (i.e. x86_64 on
-      x86_64 installations). Along with libraries binaries are also installed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>multiPkgs</literal>
-    </term>
-    <listitem>
-     <para>
-      Packages to be installed for all architectures supported by a host (i.e.
-      i686 and x86_64 on x86_64 installations). Only libraries are installed by
-      default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraBuildCommands</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional commands to be executed for finalizing the directory
-      structure.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraBuildCommandsMulti</literal>
-    </term>
-    <listitem>
-     <para>
-      Like <literal>extraBuildCommands</literal>, but executed only on multilib
-      architectures.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraOutputsToInstall</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional derivation outputs to be linked for both target and
-      multi-architecture packages.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraInstallCommands</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional commands to be executed for finalizing the derivation with
-      runner script.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>runScript</literal>
-    </term>
-    <listitem>
-     <para>
-      A command that would be executed inside the sandbox and passed all the
-      command line arguments. It defaults to <literal>bash</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <para>
-   One can create a simple environment using a <literal>shell.nix</literal>
-   like that:
-  </para>
-
-<programlisting><![CDATA[
-{ pkgs ? import <nixpkgs> {} }:
-
-(pkgs.buildFHSUserEnv {
-  name = "simple-x11-env";
-  targetPkgs = pkgs: (with pkgs;
-    [ udev
-      alsaLib
-    ]) ++ (with pkgs.xorg;
-    [ libX11
-      libXcursor
-      libXrandr
-    ]);
-  multiPkgs = pkgs: (with pkgs;
-    [ udev
-      alsaLib
-    ]);
-  runScript = "bash";
-}).env
-]]></programlisting>
-
-  <para>
-   Running <literal>nix-shell</literal> would then drop you into a shell with
-   these libraries and binaries available. You can use this to run
-   closed-source applications which expect FHS structure without hassles:
-   simply change <literal>runScript</literal> to the application path, e.g.
-   <filename>./bin/start.sh</filename> -- relative paths are supported.
-  </para>
- </section>
+ <xi:include href="functions/fhs-environments.xml" />
  <xi:include href="shell.section.xml" />
  <section xml:id="sec-pkgs-dockerTools">
   <title>pkgs.dockerTools</title>
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml
new file mode 100644
index 000000000000..bfe0db522a1d
--- /dev/null
+++ b/doc/functions/fhs-environments.xml
@@ -0,0 +1,144 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-fhs-environments">
+  <title>buildFHSUserEnv</title>
+
+  <para>
+   <function>buildFHSUserEnv</function> provides a way to build and run
+   FHS-compatible lightweight sandboxes. It creates an isolated root with bound
+   <filename>/nix/store</filename>, so its footprint in terms of disk space
+   needed is quite small. This allows one to run software which is hard or
+   unfeasible to patch for NixOS -- 3rd-party source trees with FHS
+   assumptions, games distributed as tarballs, software with integrity checking
+   and/or external self-updated binaries. It uses Linux namespaces feature to
+   create temporary lightweight environments which are destroyed after all
+   child processes exit, without root user rights requirement. Accepted
+   arguments are:
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <literal>name</literal>
+    </term>
+    <listitem>
+     <para>
+      Environment name.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>targetPkgs</literal>
+    </term>
+    <listitem>
+     <para>
+      Packages to be installed for the main host's architecture (i.e. x86_64 on
+      x86_64 installations). Along with libraries binaries are also installed.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>multiPkgs</literal>
+    </term>
+    <listitem>
+     <para>
+      Packages to be installed for all architectures supported by a host (i.e.
+      i686 and x86_64 on x86_64 installations). Only libraries are installed by
+      default.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>extraBuildCommands</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional commands to be executed for finalizing the directory
+      structure.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>extraBuildCommandsMulti</literal>
+    </term>
+    <listitem>
+     <para>
+      Like <literal>extraBuildCommands</literal>, but executed only on multilib
+      architectures.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>extraOutputsToInstall</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional derivation outputs to be linked for both target and
+      multi-architecture packages.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>extraInstallCommands</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional commands to be executed for finalizing the derivation with
+      runner script.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <literal>runScript</literal>
+    </term>
+    <listitem>
+     <para>
+      A command that would be executed inside the sandbox and passed all the
+      command line arguments. It defaults to <literal>bash</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <para>
+   One can create a simple environment using a <literal>shell.nix</literal>
+   like that:
+  </para>
+
+<programlisting><![CDATA[
+{ pkgs ? import <nixpkgs> {} }:
+
+(pkgs.buildFHSUserEnv {
+  name = "simple-x11-env";
+  targetPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]) ++ (with pkgs.xorg;
+    [ libX11
+      libXcursor
+      libXrandr
+    ]);
+  multiPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]);
+  runScript = "bash";
+}).env
+]]></programlisting>
+
+  <para>
+   Running <literal>nix-shell</literal> would then drop you into a shell with
+   these libraries and binaries available. You can use this to run
+   closed-source applications which expect FHS structure without hassles:
+   simply change <literal>runScript</literal> to the application path, e.g.
+   <filename>./bin/start.sh</filename> -- relative paths are supported.
+  </para>
+ </section>

From 82b5887cab2f52aaea4f5f63e05f695af5730769 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 2 Oct 2018 11:10:58 -0700
Subject: [PATCH 2258/3253] twa: 1.3.1 -> 1.5.1

---
 pkgs/tools/networking/twa/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index f8004ad0068d..ba7f0669f376 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -1,19 +1,28 @@
-{ stdenv, fetchFromGitHub, makeWrapper, bash, gawk, curl, netcat, ncurses }:
+{ stdenv
+, bash
+, host
+, curl
+, fetchFromGitHub
+, gawk
+, makeWrapper
+, ncurses
+, netcat
+}:
 
 stdenv.mkDerivation rec {
   name = "twa-${version}";
-  version = "1.3.1";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "twa";
     rev = version;
-    sha256 = "16x9nzsrf10waqmjm423vx44820c6mls7gxc8azrdqnz18vdy1h4";
+    sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7";
   };
 
   dontBuild = true;
 
-  buildInputs = [ makeWrapper bash gawk curl netcat ];
+  buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ];
 
   installPhase = ''
     install -Dm 0755 twa "$out/bin/twa"
@@ -22,7 +31,7 @@ stdenv.mkDerivation rec {
     install -Dm 0644 README.md "$out/share/doc/twa/README.md"
 
     wrapProgram "$out/bin/twa" \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]}
   '';
 
   meta = {

From 8bf342ffb86eedf8a9749420b4019ab1e4c21629 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:13:12 -0400
Subject: [PATCH 2259/3253] nixpkgs docs: move dockertool to its own file

---
 doc/functions.xml             | 564 +--------------------------------
 doc/functions/dockertools.xml | 566 ++++++++++++++++++++++++++++++++++
 2 files changed, 567 insertions(+), 563 deletions(-)
 create mode 100644 doc/functions/dockertools.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index ac75c4fc10e4..4fc387f0fbd6 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -13,567 +13,5 @@
  <xi:include href="functions/debug.xml" />
  <xi:include href="functions/fhs-environments.xml" />
  <xi:include href="shell.section.xml" />
- <section xml:id="sec-pkgs-dockerTools">
-  <title>pkgs.dockerTools</title>
-
-  <para>
-   <varname>pkgs.dockerTools</varname> is a set of functions for creating and
-   manipulating Docker images according to the
-   <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
-   Docker Image Specification v1.2.0 </link>. Docker itself is not used to
-   perform any of the operations done by these functions.
-  </para>
-
-  <warning>
-   <para>
-    The <varname>dockerTools</varname> API is unstable and may be subject to
-    backwards-incompatible changes in the future.
-   </para>
-  </warning>
-
-  <section xml:id="ssec-pkgs-dockerTools-buildImage">
-   <title>buildImage</title>
-
-   <para>
-    This function is analogous to the <command>docker build</command> command,
-    in that can used to build a Docker-compatible repository tarball containing
-    a single image with one or multiple layers. As such, the result is suitable
-    for being loaded in Docker with <command>docker load</command>.
-   </para>
-
-   <para>
-    The parameters of <varname>buildImage</varname> with relative example
-    values are described below:
-   </para>
-
-   <example xml:id='ex-dockerTools-buildImage'>
-    <title>Docker build</title>
-<programlisting>
-buildImage {
-  name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
-  tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
-
-  fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
-  fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
-  fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
-
-  contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
-  runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
-    #!${stdenv.shell}
-    mkdir -p /data
-  '';
-
-  config = { <co xml:id='ex-dockerTools-buildImage-8' />
-    Cmd = [ "/bin/redis-server" ];
-    WorkingDir = "/data";
-    Volumes = {
-      "/data" = {};
-    };
-  };
-}
-</programlisting>
-   </example>
-
-   <para>
-    The above example will build a Docker image <literal>redis/latest</literal>
-    from the given base image. Loading and running this image in Docker results
-    in <literal>redis-server</literal> being started automatically.
-   </para>
-
-   <calloutlist>
-    <callout arearefs='ex-dockerTools-buildImage-1'>
-     <para>
-      <varname>name</varname> specifies the name of the resulting image. This
-      is the only required argument for <varname>buildImage</varname>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-2'>
-     <para>
-      <varname>tag</varname> specifies the tag of the resulting image. By
-      default it's <literal>null</literal>, which indicates that the nix output
-      hash will be used as tag.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-3'>
-     <para>
-      <varname>fromImage</varname> is the repository tarball containing the
-      base image. It must be a valid Docker image, such as exported by
-      <command>docker save</command>. By default it's <literal>null</literal>,
-      which can be seen as equivalent to <literal>FROM scratch</literal> of a
-      <filename>Dockerfile</filename>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-4'>
-     <para>
-      <varname>fromImageName</varname> can be used to further specify the base
-      image within the repository, in case it contains multiple images. By
-      default it's <literal>null</literal>, in which case
-      <varname>buildImage</varname> will peek the first image available in the
-      repository.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-5'>
-     <para>
-      <varname>fromImageTag</varname> can be used to further specify the tag of
-      the base image within the repository, in case an image contains multiple
-      tags. By default it's <literal>null</literal>, in which case
-      <varname>buildImage</varname> will peek the first tag available for the
-      base image.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-6'>
-     <para>
-      <varname>contents</varname> is a derivation that will be copied in the
-      new layer of the resulting image. This can be similarly seen as
-      <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
-      By default it's <literal>null</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
-     <para>
-      <varname>runAsRoot</varname> is a bash script that will run as root in an
-      environment that overlays the existing layers of the base image with the
-      new resulting layer, including the previously copied
-      <varname>contents</varname> derivation. This can be similarly seen as
-      <command>RUN ...</command> in a <filename>Dockerfile</filename>.
-      <note>
-       <para>
-        Using this parameter requires the <literal>kvm</literal> device to be
-        available.
-       </para>
-      </note>
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-8'>
-     <para>
-      <varname>config</varname> is used to specify the configuration of the
-      containers that will be started off the built image in Docker. The
-      available options are listed in the
-      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-      Docker Image Specification v1.2.0 </link>.
-     </para>
-    </callout>
-   </calloutlist>
-
-   <para>
-    After the new layer has been created, its closure (to which
-    <varname>contents</varname>, <varname>config</varname> and
-    <varname>runAsRoot</varname> contribute) will be copied in the layer
-    itself. Only new dependencies that are not already in the existing layers
-    will be copied.
-   </para>
-
-   <para>
-    At the end of the process, only one new single layer will be produced and
-    added to the resulting image.
-   </para>
-
-   <para>
-    The resulting repository will only list the single image
-    <varname>image/tag</varname>. In the case of
-    <xref linkend='ex-dockerTools-buildImage'/> it would be
-    <varname>redis/latest</varname>.
-   </para>
-
-   <para>
-    It is possible to inspect the arguments with which an image was built using
-    its <varname>buildArgs</varname> attribute.
-   </para>
-
-   <note>
-    <para>
-     If you see errors similar to <literal>getProtocolByName: does not exist
-     (no such protocol name: tcp)</literal> you may need to add
-     <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
-    </para>
-   </note>
-
-   <note>
-    <para>
-     If you see errors similar to <literal>Error_Protocol ("certificate has
-     unknown CA",True,UnknownCa)</literal> you may need to add
-     <literal>pkgs.cacert</literal> to <varname>contents</varname>.
-    </para>
-   </note>
-
-   <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
-     <title>Impurely Defining a Docker Layer's Creation Date</title>
-     <para>
-       By default <function>buildImage</function> will use a static
-       date of one second past the UNIX Epoch. This allows
-       <function>buildImage</function> to produce binary reproducible
-       images. When listing images with <command>docker list
-       images</command>, the newly created images will be listed like
-       this:
-     </para>
-     <screen><![CDATA[
-$ docker image list
-REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
-hello        latest   08c791c7846e   48 years ago   25.2MB
-]]></screen>
-     <para>
-       You can break binary reproducibility but have a sorted,
-       meaningful <literal>CREATED</literal> column by setting
-       <literal>created</literal> to <literal>now</literal>.
-     </para>
-     <programlisting><![CDATA[
-pkgs.dockerTools.buildImage {
-  name = "hello";
-  tag = "latest";
-  created = "now";
-  contents = pkgs.hello;
-
-  config.Cmd = [ "/bin/hello" ];
-}
-]]></programlisting>
-     <para>
-       and now the Docker CLI will display a reasonable date and
-       sort the images as expected:
-       <screen><![CDATA[
-$ docker image list
-REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
-hello        latest   de2bf4786de6   About a minute ago   25.2MB
-]]></screen>
-       however, the produced images will not be binary reproducible.
-     </para>
-   </example>
-  </section>
-
-  <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage">
-   <title>buildLayeredImage</title>
-
-   <para>
-    Create a Docker image with many of the store paths being on their own layer
-    to improve sharing between images.
-   </para>
-
-   <variablelist>
-    <varlistentry>
-     <term>
-      <varname>name</varname>
-     </term>
-     <listitem>
-      <para>
-       The name of the resulting image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>tag</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Tag of the generated image.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> the output path's hash
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>contents</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Top level paths in the container. Either a single derivation, or a list
-       of derivations.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>[]</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>config</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Run-time configuration of the container. A full list of the options are
-       available at in the
-       <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-       Docker Image Specification v1.2.0 </link>.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>{}</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>created</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Date and time the layers were created. Follows the same
-       <literal>now</literal> exception supported by
-       <literal>buildImage</literal>.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>maxLayers</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Maximum number of layers to create.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>24</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-
-   <section xml:id="dockerTools-buildLayeredImage-arg-contents">
-    <title>Behavior of <varname>contents</varname> in the final image</title>
-
-    <para>
-     Each path directly listed in <varname>contents</varname> will have a
-     symlink in the root of the image.
-    </para>
-
-    <para>
-     For example:
-<programlisting><![CDATA[
-pkgs.dockerTools.buildLayeredImage {
-  name = "hello";
-  contents = [ pkgs.hello ];
-}
-]]></programlisting>
-     will create symlinks for all the paths in the <literal>hello</literal>
-     package:
-<screen><![CDATA[
-/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
-/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
-/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
-]]></screen>
-    </para>
-   </section>
-
-   <section xml:id="dockerTools-buildLayeredImage-arg-config">
-    <title>Automatic inclusion of <varname>config</varname> references</title>
-
-    <para>
-     The closure of <varname>config</varname> is automatically included in the
-     closure of the final image.
-    </para>
-
-    <para>
-     This allows you to make very simple Docker images with very little code.
-     This container will start up and run <command>hello</command>:
-<programlisting><![CDATA[
-pkgs.dockerTools.buildLayeredImage {
-  name = "hello";
-  config.Cmd = [ "${pkgs.hello}/bin/hello" ];
-}
-]]></programlisting>
-    </para>
-   </section>
-
-   <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers">
-    <title>Adjusting <varname>maxLayers</varname></title>
-
-    <para>
-     Increasing the <varname>maxLayers</varname> increases the number of layers
-     which have a chance to be shared between different images.
-    </para>
-
-    <para>
-     Modern Docker installations support up to 128 layers, however older
-     versions support as few as 42.
-    </para>
-
-    <para>
-     If the produced image will not be extended by other Docker builds, it is
-     safe to set <varname>maxLayers</varname> to <literal>128</literal>.
-     However it will be impossible to extend the image further.
-    </para>
-
-    <para>
-     The first (<literal>maxLayers-2</literal>) most "popular" paths will have
-     their own individual layers, then layer #<literal>maxLayers-1</literal>
-     will contain all the remaining "unpopular" paths, and finally layer
-     #<literal>maxLayers</literal> will contain the Image configuration.
-    </para>
-
-    <para>
-     Docker's Layers are not inherently ordered, they are content-addressable
-     and are not explicitly layered until they are composed in to an Image.
-    </para>
-   </section>
-  </section>
-
-  <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
-   <title>pullImage</title>
-
-   <para>
-    This function is analogous to the <command>docker pull</command> command,
-    in that can be used to pull a Docker image from a Docker registry. By
-    default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
-    used to pull images.
-   </para>
-
-   <para>
-    Its parameters are described in the example below:
-   </para>
-
-   <example xml:id='ex-dockerTools-pullImage'>
-    <title>Docker pull</title>
-<programlisting>
-pullImage {
-  imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
-  imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
-  finalImageTag = "1.11";  <co xml:id='ex-dockerTools-pullImage-3' />
-  sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
-  os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
-  arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
-}
-</programlisting>
-   </example>
-
-   <calloutlist>
-    <callout arearefs='ex-dockerTools-pullImage-1'>
-     <para>
-      <varname>imageName</varname> specifies the name of the image to be
-      downloaded, which can also include the registry namespace (e.g.
-      <literal>nixos</literal>). This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-2'>
-     <para>
-      <varname>imageDigest</varname> specifies the digest of the image to be
-      downloaded. Skopeo can be used to get the digest of an image, with its
-      <varname>inspect</varname> subcommand. Since a given
-      <varname>imageName</varname> may transparently refer to a manifest list
-      of images which support multiple architectures and/or operating systems,
-      supply the `--override-os` and `--override-arch` arguments to specify
-      exactly which image you want. By default it will match the OS and
-      architecture of the host the command is run on.
-<programlisting>
-$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
-sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-</programlisting>
-      This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-3'>
-     <para>
-      <varname>finalImageTag</varname>, if specified, this is the tag of the
-      image to be created. Note it is never used to fetch the image since we
-      prefer to rely on the immutable digest ID. By default it's
-      <literal>latest</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-4'>
-     <para>
-      <varname>sha256</varname> is the checksum of the whole fetched image.
-      This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-5'>
-     <para>
-      <varname>os</varname>, if specified, is the operating system of the
-      fetched image. By default it's <literal>linux</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-6'>
-     <para>
-      <varname>arch</varname>, if specified, is the cpu architecture of the
-      fetched image. By default it's <literal>x86_64</literal>.
-     </para>
-    </callout>
-   </calloutlist>
-  </section>
-
-  <section xml:id="ssec-pkgs-dockerTools-exportImage">
-   <title>exportImage</title>
-
-   <para>
-    This function is analogous to the <command>docker export</command> command,
-    in that can used to flatten a Docker image that contains multiple layers.
-    It is in fact the result of the merge of all the layers of the image. As
-    such, the result is suitable for being imported in Docker with
-    <command>docker import</command>.
-   </para>
-
-   <note>
-    <para>
-     Using this function requires the <literal>kvm</literal> device to be
-     available.
-    </para>
-   </note>
-
-   <para>
-    The parameters of <varname>exportImage</varname> are the following:
-   </para>
-
-   <example xml:id='ex-dockerTools-exportImage'>
-    <title>Docker export</title>
-<programlisting>
-exportImage {
-  fromImage = someLayeredImage;
-  fromImageName = null;
-  fromImageTag = null;
-
-  name = someLayeredImage.name;
-}
-  </programlisting>
-   </example>
-
-   <para>
-    The parameters relative to the base image have the same synopsis as
-    described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except
-    that <varname>fromImage</varname> is the only required argument in this
-    case.
-   </para>
-
-   <para>
-    The <varname>name</varname> argument is the name of the derivation output,
-    which defaults to <varname>fromImage.name</varname>.
-   </para>
-  </section>
-
-  <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
-   <title>shadowSetup</title>
-
-   <para>
-    This constant string is a helper for setting up the base files for managing
-    users and groups, only if such files don't exist already. It is suitable
-    for being used in a <varname>runAsRoot</varname>
-    <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
-    in the example below:
-   </para>
-
-   <example xml:id='ex-dockerTools-shadowSetup'>
-    <title>Shadow base files</title>
-<programlisting>
-buildImage {
-  name = "shadow-basic";
-
-  runAsRoot = ''
-    #!${stdenv.shell}
-    ${shadowSetup}
-    groupadd -r redis
-    useradd -r -g redis redis
-    mkdir /data
-    chown redis:redis /data
-  '';
-}
-</programlisting>
-   </example>
-
-   <para>
-    Creating base files like <literal>/etc/passwd</literal> or
-    <literal>/etc/login.defs</literal> are necessary for shadow-utils to
-    manipulate users and groups.
-   </para>
-  </section>
- </section>
+ <xi:include href="functions/dockertools.xml" />
 </chapter>
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
new file mode 100644
index 000000000000..8bfdb3c68d7a
--- /dev/null
+++ b/doc/functions/dockertools.xml
@@ -0,0 +1,566 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-pkgs-dockerTools">
+  <title>pkgs.dockerTools</title>
+
+  <para>
+   <varname>pkgs.dockerTools</varname> is a set of functions for creating and
+   manipulating Docker images according to the
+   <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
+   Docker Image Specification v1.2.0 </link>. Docker itself is not used to
+   perform any of the operations done by these functions.
+  </para>
+
+  <warning>
+   <para>
+    The <varname>dockerTools</varname> API is unstable and may be subject to
+    backwards-incompatible changes in the future.
+   </para>
+  </warning>
+
+  <section xml:id="ssec-pkgs-dockerTools-buildImage">
+   <title>buildImage</title>
+
+   <para>
+    This function is analogous to the <command>docker build</command> command,
+    in that can used to build a Docker-compatible repository tarball containing
+    a single image with one or multiple layers. As such, the result is suitable
+    for being loaded in Docker with <command>docker load</command>.
+   </para>
+
+   <para>
+    The parameters of <varname>buildImage</varname> with relative example
+    values are described below:
+   </para>
+
+   <example xml:id='ex-dockerTools-buildImage'>
+    <title>Docker build</title>
+<programlisting>
+buildImage {
+  name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
+  tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
+
+  fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
+  fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
+  fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
+
+  contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
+  runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
+    #!${stdenv.shell}
+    mkdir -p /data
+  '';
+
+  config = { <co xml:id='ex-dockerTools-buildImage-8' />
+    Cmd = [ "/bin/redis-server" ];
+    WorkingDir = "/data";
+    Volumes = {
+      "/data" = {};
+    };
+  };
+}
+</programlisting>
+   </example>
+
+   <para>
+    The above example will build a Docker image <literal>redis/latest</literal>
+    from the given base image. Loading and running this image in Docker results
+    in <literal>redis-server</literal> being started automatically.
+   </para>
+
+   <calloutlist>
+    <callout arearefs='ex-dockerTools-buildImage-1'>
+     <para>
+      <varname>name</varname> specifies the name of the resulting image. This
+      is the only required argument for <varname>buildImage</varname>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-2'>
+     <para>
+      <varname>tag</varname> specifies the tag of the resulting image. By
+      default it's <literal>null</literal>, which indicates that the nix output
+      hash will be used as tag.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-3'>
+     <para>
+      <varname>fromImage</varname> is the repository tarball containing the
+      base image. It must be a valid Docker image, such as exported by
+      <command>docker save</command>. By default it's <literal>null</literal>,
+      which can be seen as equivalent to <literal>FROM scratch</literal> of a
+      <filename>Dockerfile</filename>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-4'>
+     <para>
+      <varname>fromImageName</varname> can be used to further specify the base
+      image within the repository, in case it contains multiple images. By
+      default it's <literal>null</literal>, in which case
+      <varname>buildImage</varname> will peek the first image available in the
+      repository.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-5'>
+     <para>
+      <varname>fromImageTag</varname> can be used to further specify the tag of
+      the base image within the repository, in case an image contains multiple
+      tags. By default it's <literal>null</literal>, in which case
+      <varname>buildImage</varname> will peek the first tag available for the
+      base image.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-6'>
+     <para>
+      <varname>contents</varname> is a derivation that will be copied in the
+      new layer of the resulting image. This can be similarly seen as
+      <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
+      By default it's <literal>null</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
+     <para>
+      <varname>runAsRoot</varname> is a bash script that will run as root in an
+      environment that overlays the existing layers of the base image with the
+      new resulting layer, including the previously copied
+      <varname>contents</varname> derivation. This can be similarly seen as
+      <command>RUN ...</command> in a <filename>Dockerfile</filename>.
+      <note>
+       <para>
+        Using this parameter requires the <literal>kvm</literal> device to be
+        available.
+       </para>
+      </note>
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-8'>
+     <para>
+      <varname>config</varname> is used to specify the configuration of the
+      containers that will be started off the built image in Docker. The
+      available options are listed in the
+      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+      Docker Image Specification v1.2.0 </link>.
+     </para>
+    </callout>
+   </calloutlist>
+
+   <para>
+    After the new layer has been created, its closure (to which
+    <varname>contents</varname>, <varname>config</varname> and
+    <varname>runAsRoot</varname> contribute) will be copied in the layer
+    itself. Only new dependencies that are not already in the existing layers
+    will be copied.
+   </para>
+
+   <para>
+    At the end of the process, only one new single layer will be produced and
+    added to the resulting image.
+   </para>
+
+   <para>
+    The resulting repository will only list the single image
+    <varname>image/tag</varname>. In the case of
+    <xref linkend='ex-dockerTools-buildImage'/> it would be
+    <varname>redis/latest</varname>.
+   </para>
+
+   <para>
+    It is possible to inspect the arguments with which an image was built using
+    its <varname>buildArgs</varname> attribute.
+   </para>
+
+   <note>
+    <para>
+     If you see errors similar to <literal>getProtocolByName: does not exist
+     (no such protocol name: tcp)</literal> you may need to add
+     <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
+    </para>
+   </note>
+
+   <note>
+    <para>
+     If you see errors similar to <literal>Error_Protocol ("certificate has
+     unknown CA",True,UnknownCa)</literal> you may need to add
+     <literal>pkgs.cacert</literal> to <varname>contents</varname>.
+    </para>
+   </note>
+
+   <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
+     <title>Impurely Defining a Docker Layer's Creation Date</title>
+     <para>
+       By default <function>buildImage</function> will use a static
+       date of one second past the UNIX Epoch. This allows
+       <function>buildImage</function> to produce binary reproducible
+       images. When listing images with <command>docker list
+       images</command>, the newly created images will be listed like
+       this:
+     </para>
+     <screen><![CDATA[
+$ docker image list
+REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
+hello        latest   08c791c7846e   48 years ago   25.2MB
+]]></screen>
+     <para>
+       You can break binary reproducibility but have a sorted,
+       meaningful <literal>CREATED</literal> column by setting
+       <literal>created</literal> to <literal>now</literal>.
+     </para>
+     <programlisting><![CDATA[
+pkgs.dockerTools.buildImage {
+  name = "hello";
+  tag = "latest";
+  created = "now";
+  contents = pkgs.hello;
+
+  config.Cmd = [ "/bin/hello" ];
+}
+]]></programlisting>
+     <para>
+       and now the Docker CLI will display a reasonable date and
+       sort the images as expected:
+       <screen><![CDATA[
+$ docker image list
+REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
+hello        latest   de2bf4786de6   About a minute ago   25.2MB
+]]></screen>
+       however, the produced images will not be binary reproducible.
+     </para>
+   </example>
+  </section>
+
+  <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage">
+   <title>buildLayeredImage</title>
+
+   <para>
+    Create a Docker image with many of the store paths being on their own layer
+    to improve sharing between images.
+   </para>
+
+   <variablelist>
+    <varlistentry>
+     <term>
+      <varname>name</varname>
+     </term>
+     <listitem>
+      <para>
+       The name of the resulting image.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>tag</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Tag of the generated image.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> the output path's hash
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>contents</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Top level paths in the container. Either a single derivation, or a list
+       of derivations.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>[]</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>config</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Run-time configuration of the container. A full list of the options are
+       available at in the
+       <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+       Docker Image Specification v1.2.0 </link>.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>{}</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>created</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Date and time the layers were created. Follows the same
+       <literal>now</literal> exception supported by
+       <literal>buildImage</literal>.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>maxLayers</varname> <emphasis>optional</emphasis>
+     </term>
+     <listitem>
+      <para>
+       Maximum number of layers to create.
+      </para>
+      <para>
+       <emphasis>Default:</emphasis> <literal>24</literal>
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-contents">
+    <title>Behavior of <varname>contents</varname> in the final image</title>
+
+    <para>
+     Each path directly listed in <varname>contents</varname> will have a
+     symlink in the root of the image.
+    </para>
+
+    <para>
+     For example:
+<programlisting><![CDATA[
+pkgs.dockerTools.buildLayeredImage {
+  name = "hello";
+  contents = [ pkgs.hello ];
+}
+]]></programlisting>
+     will create symlinks for all the paths in the <literal>hello</literal>
+     package:
+<screen><![CDATA[
+/bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
+/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
+/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
+]]></screen>
+    </para>
+   </section>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-config">
+    <title>Automatic inclusion of <varname>config</varname> references</title>
+
+    <para>
+     The closure of <varname>config</varname> is automatically included in the
+     closure of the final image.
+    </para>
+
+    <para>
+     This allows you to make very simple Docker images with very little code.
+     This container will start up and run <command>hello</command>:
+<programlisting><![CDATA[
+pkgs.dockerTools.buildLayeredImage {
+  name = "hello";
+  config.Cmd = [ "${pkgs.hello}/bin/hello" ];
+}
+]]></programlisting>
+    </para>
+   </section>
+
+   <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers">
+    <title>Adjusting <varname>maxLayers</varname></title>
+
+    <para>
+     Increasing the <varname>maxLayers</varname> increases the number of layers
+     which have a chance to be shared between different images.
+    </para>
+
+    <para>
+     Modern Docker installations support up to 128 layers, however older
+     versions support as few as 42.
+    </para>
+
+    <para>
+     If the produced image will not be extended by other Docker builds, it is
+     safe to set <varname>maxLayers</varname> to <literal>128</literal>.
+     However it will be impossible to extend the image further.
+    </para>
+
+    <para>
+     The first (<literal>maxLayers-2</literal>) most "popular" paths will have
+     their own individual layers, then layer #<literal>maxLayers-1</literal>
+     will contain all the remaining "unpopular" paths, and finally layer
+     #<literal>maxLayers</literal> will contain the Image configuration.
+    </para>
+
+    <para>
+     Docker's Layers are not inherently ordered, they are content-addressable
+     and are not explicitly layered until they are composed in to an Image.
+    </para>
+   </section>
+  </section>
+
+  <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
+   <title>pullImage</title>
+
+   <para>
+    This function is analogous to the <command>docker pull</command> command,
+    in that can be used to pull a Docker image from a Docker registry. By
+    default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
+    used to pull images.
+   </para>
+
+   <para>
+    Its parameters are described in the example below:
+   </para>
+
+   <example xml:id='ex-dockerTools-pullImage'>
+    <title>Docker pull</title>
+<programlisting>
+pullImage {
+  imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
+  imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
+  finalImageTag = "1.11";  <co xml:id='ex-dockerTools-pullImage-3' />
+  sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
+  os = "linux"; <co xml:id='ex-dockerTools-pullImage-5' />
+  arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
+}
+</programlisting>
+   </example>
+
+   <calloutlist>
+    <callout arearefs='ex-dockerTools-pullImage-1'>
+     <para>
+      <varname>imageName</varname> specifies the name of the image to be
+      downloaded, which can also include the registry namespace (e.g.
+      <literal>nixos</literal>). This argument is required.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-2'>
+     <para>
+      <varname>imageDigest</varname> specifies the digest of the image to be
+      downloaded. Skopeo can be used to get the digest of an image, with its
+      <varname>inspect</varname> subcommand. Since a given
+      <varname>imageName</varname> may transparently refer to a manifest list
+      of images which support multiple architectures and/or operating systems,
+      supply the `--override-os` and `--override-arch` arguments to specify
+      exactly which image you want. By default it will match the OS and
+      architecture of the host the command is run on.
+<programlisting>
+$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
+sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+</programlisting>
+      This argument is required.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-3'>
+     <para>
+      <varname>finalImageTag</varname>, if specified, this is the tag of the
+      image to be created. Note it is never used to fetch the image since we
+      prefer to rely on the immutable digest ID. By default it's
+      <literal>latest</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-4'>
+     <para>
+      <varname>sha256</varname> is the checksum of the whole fetched image.
+      This argument is required.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-5'>
+     <para>
+      <varname>os</varname>, if specified, is the operating system of the
+      fetched image. By default it's <literal>linux</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-6'>
+     <para>
+      <varname>arch</varname>, if specified, is the cpu architecture of the
+      fetched image. By default it's <literal>x86_64</literal>.
+     </para>
+    </callout>
+   </calloutlist>
+  </section>
+
+  <section xml:id="ssec-pkgs-dockerTools-exportImage">
+   <title>exportImage</title>
+
+   <para>
+    This function is analogous to the <command>docker export</command> command,
+    in that can used to flatten a Docker image that contains multiple layers.
+    It is in fact the result of the merge of all the layers of the image. As
+    such, the result is suitable for being imported in Docker with
+    <command>docker import</command>.
+   </para>
+
+   <note>
+    <para>
+     Using this function requires the <literal>kvm</literal> device to be
+     available.
+    </para>
+   </note>
+
+   <para>
+    The parameters of <varname>exportImage</varname> are the following:
+   </para>
+
+   <example xml:id='ex-dockerTools-exportImage'>
+    <title>Docker export</title>
+<programlisting>
+exportImage {
+  fromImage = someLayeredImage;
+  fromImageName = null;
+  fromImageTag = null;
+
+  name = someLayeredImage.name;
+}
+  </programlisting>
+   </example>
+
+   <para>
+    The parameters relative to the base image have the same synopsis as
+    described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except
+    that <varname>fromImage</varname> is the only required argument in this
+    case.
+   </para>
+
+   <para>
+    The <varname>name</varname> argument is the name of the derivation output,
+    which defaults to <varname>fromImage.name</varname>.
+   </para>
+  </section>
+
+  <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
+   <title>shadowSetup</title>
+
+   <para>
+    This constant string is a helper for setting up the base files for managing
+    users and groups, only if such files don't exist already. It is suitable
+    for being used in a <varname>runAsRoot</varname>
+    <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
+    in the example below:
+   </para>
+
+   <example xml:id='ex-dockerTools-shadowSetup'>
+    <title>Shadow base files</title>
+<programlisting>
+buildImage {
+  name = "shadow-basic";
+
+  runAsRoot = ''
+    #!${stdenv.shell}
+    ${shadowSetup}
+    groupadd -r redis
+    useradd -r -g redis redis
+    mkdir /data
+    chown redis:redis /data
+  '';
+}
+</programlisting>
+   </example>
+
+   <para>
+    Creating base files like <literal>/etc/passwd</literal> or
+    <literal>/etc/login.defs</literal> are necessary for shadow-utils to
+    manipulate users and groups.
+   </para>
+  </section>
+ </section>

From 507a63c88557f8afa06a3e507fe3d055fc55a815 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:13:42 -0400
Subject: [PATCH 2260/3253] nixpkgs docs: move shell section to its own file

---
 doc/functions.xml                    | 2 +-
 doc/{ => functions}/shell.section.md | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename doc/{ => functions}/shell.section.md (100%)

diff --git a/doc/functions.xml b/doc/functions.xml
index 4fc387f0fbd6..ee73c46ad4d3 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -12,6 +12,6 @@
  <xi:include href="functions/generators.xml" />
  <xi:include href="functions/debug.xml" />
  <xi:include href="functions/fhs-environments.xml" />
- <xi:include href="shell.section.xml" />
+ <xi:include href="functions/shell.section.xml" />
  <xi:include href="functions/dockertools.xml" />
 </chapter>
diff --git a/doc/shell.section.md b/doc/functions/shell.section.md
similarity index 100%
rename from doc/shell.section.md
rename to doc/functions/shell.section.md

From c3125498fd7d0398f50e2b53a9e274b7c1e2db67 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 14:16:27 -0400
Subject: [PATCH 2261/3253] shell functions: rewrite as xml

---
 doc/functions.xml              |  2 +-
 doc/functions/shell.section.md | 22 ----------------------
 doc/functions/shell.xml        | 27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 23 deletions(-)
 delete mode 100644 doc/functions/shell.section.md
 create mode 100644 doc/functions/shell.xml

diff --git a/doc/functions.xml b/doc/functions.xml
index ee73c46ad4d3..88011061ae6e 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -12,6 +12,6 @@
  <xi:include href="functions/generators.xml" />
  <xi:include href="functions/debug.xml" />
  <xi:include href="functions/fhs-environments.xml" />
- <xi:include href="functions/shell.section.xml" />
+ <xi:include href="functions/shell.xml" />
  <xi:include href="functions/dockertools.xml" />
 </chapter>
diff --git a/doc/functions/shell.section.md b/doc/functions/shell.section.md
deleted file mode 100644
index cb8832a814fc..000000000000
--- a/doc/functions/shell.section.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: pkgs.mkShell
-author: zimbatm
-date: 2017-10-30
----
-
-# mkShell
-
-pkgs.mkShell is a special kind of derivation that is only useful when using
-it combined with nix-shell. It will in fact fail to instantiate when invoked
-with nix-build.
-
-## Usage
-
-```nix
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  # this will make all the build inputs from hello and gnutar available to the shell environment
-  inputsFrom = with pkgs; [ hello gnutar ];
-  buildInputs = [ pkgs.gnumake ];
-}
-```
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml
new file mode 100644
index 000000000000..a8d2a30cb508
--- /dev/null
+++ b/doc/functions/shell.xml
@@ -0,0 +1,27 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-pkgs-mkShell">
+  <title>pkgs.mkShell</title>
+
+  <para>
+    <function>pkgs.mkShell</function> is a special kind of derivation
+    that is only useful when using it combined with
+    <command>nix-shell</command>. It will in fact fail to instantiate
+    when invoked with <command>nix-build</command>.
+  </para>
+
+  <section xml:id="sec-pkgs-mkShell-usage">
+    <title>Usage</title>
+
+    <programlisting><![CDATA[
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  # this will make all the build inputs from hello and gnutar
+  # available to the shell environment
+  inputsFrom = with pkgs; [ hello gnutar ];
+  buildInputs = [ pkgs.gnumake ];
+}
+]]></programlisting>
+  </section>
+</section>

From 9b08685e9645d0a0c1ff66fcd73a4a57654eb5c6 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Tue, 2 Oct 2018 11:30:31 -0700
Subject: [PATCH 2262/3253] twa: set meta.platforms to platforms.unix

---
 pkgs/tools/networking/twa/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix
index ba7f0669f376..8e9a88ad6f94 100644
--- a/pkgs/tools/networking/twa/default.nix
+++ b/pkgs/tools/networking/twa/default.nix
@@ -1,9 +1,10 @@
 { stdenv
 , bash
-, host
 , curl
 , fetchFromGitHub
 , gawk
+, host
+, lib
 , makeWrapper
 , ncurses
 , netcat
@@ -34,10 +35,11 @@ stdenv.mkDerivation rec {
       --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]}
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A tiny web auditor with strong opinions";
     homepage = https://github.com/trailofbits/twa;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ avaq ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ avaq ];
+    platforms = platforms.unix;
   };
 }

From fbf55e95dcc3bd2f7332b67d8c3e7d0a5d6e13ed Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 2 Oct 2018 21:03:41 +0200
Subject: [PATCH 2263/3253] i3lock-color: 2.11-c -> 2.12.c (#47674)

Note the change in naming scheme, this is intentional
(https://github.com/PandorasFox/i3lock-color/issues/92)
---
 pkgs/applications/window-managers/i3/lock-color.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index fa1ddcf810b7..8c775833c28a 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxcb,
   xcbutilkeysyms , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon,
-  libxkbfile, libjpeg_turbo
+  libxkbfile, libjpeg_turbo, xcbutilxrm
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.11-c";
+  version = "2.12.c";
   name = "i3lock-color-${version}";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
     rev = version;
-    sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw";
+    sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11
-    libev cairo libxkbcommon libxkbfile libjpeg_turbo ];
+    libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ];
 
   makeFlags = "all";
   preInstall = ''

From d072586714b0b2e152a0acb9b1f9c7f044c00080 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 30 Sep 2018 16:18:47 +0200
Subject: [PATCH 2264/3253] LTS Haskell 12.11

---
 .../configuration-hackage2nix.yaml            | 162 +++++++++---------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5d7173bf44a4..cdc6a25f016a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.10
+  # LTS Haskell 12.11
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -60,7 +60,7 @@ default-package-overrides:
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
-  - aeson-compat ==0.3.8
+  - aeson-compat ==0.3.9
   - aeson-diff ==1.1.0.5
   - aeson-extra ==0.4.1.1
   - aeson-generic-compat ==0.0.1.3
@@ -76,7 +76,7 @@ default-package-overrides:
   - alarmclock ==0.5.0.2
   - alerts ==0.1.0.0
   - alex ==3.2.4
-  - alg ==0.2.6.0
+  - alg ==0.2.7.0
   - algebra ==4.3.1
   - Allure ==0.8.3.0
   - almost-fix ==0.0.2
@@ -210,7 +210,7 @@ default-package-overrides:
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - attoparsec-ip ==0.0.1
-  - attoparsec-iso8601 ==1.0.0.0
+  - attoparsec-iso8601 ==1.0.1.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-uri ==0.0.4
   - audacity ==0.0.2
@@ -259,7 +259,7 @@ default-package-overrides:
   - binary-parsers ==0.2.3.0
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
-  - binary-tagged ==0.1.5
+  - binary-tagged ==0.1.5.1
   - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.2.1.1
   - bindings-libzip ==1.0.1
@@ -286,7 +286,7 @@ default-package-overrides:
   - blaze-builder ==0.4.1.0
   - blaze-colonnade ==1.2.2
   - blaze-html ==0.9.1.1
-  - blaze-markup ==0.8.2.1
+  - blaze-markup ==0.8.2.2
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bmp ==1.2.6.3
@@ -306,7 +306,7 @@ default-package-overrides:
   - brick ==0.37.2
   - brittany ==0.11.0.0
   - broadcast-chan ==0.1.1
-  - bsb-http-chunked ==0.0.0.3
+  - bsb-http-chunked ==0.0.0.4
   - bson ==0.3.2.6
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
@@ -315,27 +315,27 @@ default-package-overrides:
   - butcher ==1.3.1.1
   - butter ==0.1.0.6
   - bv ==0.5
-  - bv-little ==0.1.1
+  - bv-little ==0.1.2
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
   - bytes ==0.15.5
   - byteset ==0.1.1.0
-  - bytestring-builder ==0.10.8.1.0
+  - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.1
   - bytestring-lexing ==0.5.0.2
   - bytestring-strict-builder ==0.4.5.1
   - bytestring-tree-builder ==0.2.7.2
   - bzlib ==0.5.0.5
   - bzlib-conduit ==0.3.0.1
-  - c2hs ==0.28.5
+  - c2hs ==0.28.6
   - Cabal ==2.2.0.1
   - cabal2spec ==2.1.1
   - cabal-doctest ==1.0.6
   - cabal-rpm ==0.12.5
   - cache ==0.1.1.1
-  - cachix ==0.1.1
-  - cachix-api ==0.1.0.1
+  - cachix ==0.1.2
+  - cachix-api ==0.1.0.2
   - cairo ==0.13.5.0
   - calendar-recycling ==0.0.0.1
   - call-stack ==0.1.0
@@ -364,7 +364,7 @@ default-package-overrides:
   - charsetdetect-ae ==1.1.0.4
   - chart-unit ==0.7.0.0
   - chaselev-deque ==0.5.0.5
-  - ChasingBottoms ==1.3.1.4
+  - ChasingBottoms ==1.3.1.5
   - chatwork ==0.1.3.5
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
@@ -430,14 +430,14 @@ default-package-overrides:
   - composition-prelude ==1.5.3.1
   - compressed ==3.11
   - concise ==0.1.0.1
-  - concurrency ==1.6.0.0
+  - concurrency ==1.6.1.0
   - concurrent-extra ==0.7.0.12
-  - concurrent-output ==1.10.6
+  - concurrent-output ==1.10.7
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.0.3
-  - conduit-algorithms ==0.0.8.1
+  - conduit-algorithms ==0.0.8.2
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
@@ -482,7 +482,7 @@ default-package-overrides:
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - cryptocompare ==0.1.1
-  - crypto-enigma ==0.0.2.12
+  - crypto-enigma ==0.0.2.13
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -543,7 +543,7 @@ default-package-overrides:
   - data-msgpack-types ==0.0.2
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
-  - data-ref ==0.0.1.1
+  - data-ref ==0.0.1.2
   - data-reify ==0.6.1
   - data-serializer ==0.3.4
   - datasets ==0.2.5
@@ -565,7 +565,7 @@ default-package-overrides:
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.5.1
+  - deriving-compat ==0.5.2
   - derulo ==1.0.3
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
@@ -601,10 +601,10 @@ default-package-overrides:
   - discount ==0.1.1
   - discrimination ==0.3
   - disk-free-space ==0.1.0.1
-  - distributed-closure ==0.4.0
+  - distributed-closure ==0.4.1
   - distributed-static ==0.3.8
   - distributive ==0.5.3
-  - dlist ==0.8.0.4
+  - dlist ==0.8.0.5
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.4
@@ -612,7 +612,7 @@ default-package-overrides:
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.2.2.1
-  - doctest ==0.16.0
+  - doctest ==0.16.0.1
   - doctest-discover ==0.1.0.9
   - doctest-driver-gen ==0.2.0.3
   - do-list ==1.0.1
@@ -657,7 +657,7 @@ default-package-overrides:
   - elm-export ==0.6.0.1
   - email-validate ==2.3.2.7
   - enclosed-exceptions ==1.0.3
-  - entropy ==0.4.1.1
+  - entropy ==0.4.1.3
   - enummapset ==0.5.2.2
   - enumset ==0.0.4.1
   - enum-subset-generate ==0.1.0.0
@@ -666,7 +666,7 @@ default-package-overrides:
   - epub-metadata ==4.5
   - eq ==4.2
   - equal-files ==0.0.5.3
-  - equivalence ==0.3.2
+  - equivalence ==0.3.3
   - erf ==2.0.0.0
   - errors ==2.3.0
   - errors-ext ==0.4.2
@@ -698,7 +698,7 @@ default-package-overrides:
   - exp-pairs ==0.1.6.0
   - extensible ==0.4.9
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.9
+  - extra ==1.6.12
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.3
   - facts ==0.0.1.0
@@ -728,7 +728,7 @@ default-package-overrides:
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
   - fin ==0.0.1
-  - Fin ==0.2.5.0
+  - Fin ==0.2.6.0
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
@@ -749,8 +749,8 @@ default-package-overrides:
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - foldable1 ==0.1.0.0
-  - fold-debounce ==0.2.0.7
-  - fold-debounce-conduit ==0.2.0.1
+  - fold-debounce ==0.2.0.8
+  - fold-debounce-conduit ==0.2.0.2
   - foldl ==1.4.4
   - folds ==0.7.4
   - FontyFruity ==0.5.3.3
@@ -823,7 +823,7 @@ default-package-overrides:
   - ghcjs-codemirror ==0.0.0.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.3
+  - ghc-prof ==1.4.1.4
   - ghc-syntax-highlighter ==0.0.2.0
   - ghc-tcplugins-extra ==0.3
   - ghc-typelits-extra ==0.2.6
@@ -837,8 +837,8 @@ default-package-overrides:
   - gi-gio ==2.0.18
   - gi-glib ==2.0.17
   - gi-gobject ==2.0.16
-  - gi-gtk ==3.0.24
-  - gi-gtk-hs ==0.3.6.1
+  - gi-gtk ==3.0.25
+  - gi-gtk-hs ==0.3.6.2
   - gi-gtksource ==3.0.16
   - gi-javascriptcore ==4.0.15
   - gio ==0.13.5.0
@@ -856,7 +856,7 @@ default-package-overrides:
   - glazier ==1.0.0.0
   - GLFW-b ==3.2.1.0
   - glib ==0.13.6.0
-  - Glob ==0.9.2
+  - Glob ==0.9.3
   - gloss ==1.12.0.0
   - gloss-raster ==1.12.0.0
   - gloss-rendering ==1.12.0.0
@@ -874,7 +874,7 @@ default-package-overrides:
   - graylog ==0.1.0.1
   - greskell ==0.2.1.0
   - greskell-core ==0.1.2.3
-  - greskell-websocket ==0.1.1.0
+  - greskell-websocket ==0.1.1.1
   - groom ==0.1.2.1
   - groups ==0.4.1.0
   - gtk ==0.14.10
@@ -886,13 +886,13 @@ default-package-overrides:
   - hackage-security ==0.5.3.0
   - haddock-library ==1.5.0.1
   - hailgun ==0.4.1.8
-  - hakyll ==4.12.3.0
+  - hakyll ==4.12.4.0
   - half ==0.3
   - hamilton ==0.1.0.3
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.10
+  - hapistrano ==0.3.6.0
   - happstack-server ==7.5.1.1
   - happy ==1.19.9
   - hasbolt ==0.1.3.0
@@ -903,16 +903,16 @@ default-package-overrides:
   - hashtables ==1.2.3.1
   - haskeline ==0.7.4.3
   - haskell-gi ==0.21.4
-  - haskell-gi-base ==0.21.1
+  - haskell-gi-base ==0.21.3
   - haskell-gi-overloading ==1.0
-  - haskell-lexer ==1.0.1
+  - haskell-lexer ==1.0.2
   - haskell-lsp ==0.2.2.0
   - haskell-lsp-types ==0.2.2.0
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.3.0
-  - haskell-src-exts ==1.20.2
+  - haskell-src-exts ==1.20.3
   - haskell-src-exts-simple ==1.20.0.0
   - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.3
@@ -934,7 +934,7 @@ default-package-overrides:
   - hasql-transaction ==0.7
   - hasty-hamiltonian ==1.3.2
   - HaTeX ==3.19.0.0
-  - haxl ==2.0.1.0
+  - haxl ==2.0.1.1
   - hbeanstalk ==0.2.4
   - HCodecs ==0.5.1
   - hdaemonize ==0.5.5
@@ -944,7 +944,7 @@ default-package-overrides:
   - heap ==1.0.4
   - heaps ==0.3.6
   - hebrew-time ==0.1.1
-  - hedgehog ==0.6
+  - hedgehog ==0.6.1
   - hedgehog-corpus ==0.1.0
   - hedis ==0.10.4
   - here ==1.2.13
@@ -993,7 +993,7 @@ default-package-overrides:
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
-  - hruby ==0.3.5.4
+  - hruby ==0.3.6
   - hsass ==0.7.0
   - hs-bibutils ==6.6.0.0
   - hscolour ==1.24.4
@@ -1008,7 +1008,7 @@ default-package-overrides:
   - hsini ==0.5.1.2
   - hsinstall ==1.6
   - HSlippyMap ==3.0.1
-  - hslogger ==1.2.10
+  - hslogger ==1.2.12
   - hslua ==0.9.5.2
   - hslua-aeson ==0.3.0.2
   - hslua-module-text ==0.1.2.1
@@ -1059,7 +1059,7 @@ default-package-overrides:
   - http-media ==0.7.1.2
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.6.1
-  - http-types ==0.12.1
+  - http-types ==0.12.2
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
@@ -1081,7 +1081,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.6.2.15
+  - hw-prim ==0.6.2.17
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.3.2.1
   - hw-string-parse ==0.0.0.4
@@ -1155,7 +1155,7 @@ default-package-overrides:
   - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.4
+  - irc-client ==1.1.0.5
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
@@ -1206,7 +1206,7 @@ default-package-overrides:
   - lackey ==1.0.5
   - LambdaHack ==0.8.3.0
   - lame ==0.1.1
-  - language-c ==0.8.1
+  - language-c ==0.8.2
   - language-c-quote ==0.12.2
   - language-docker ==6.0.4
   - language-ecmascript ==0.19
@@ -1224,15 +1224,15 @@ default-package-overrides:
   - lawful ==0.1.0.0
   - lazyio ==0.1.0.4
   - lca ==0.3.1
-  - leancheck ==0.7.4
+  - leancheck ==0.7.5
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.3
   - lens ==4.16.1
   - lens-action ==0.2.3
   - lens-aeson ==1.0.2
   - lens-datetime ==0.3
-  - lens-family ==1.2.2
-  - lens-family-core ==1.2.2
+  - lens-family ==1.2.3
+  - lens-family-core ==1.2.3
   - lens-family-th ==0.5.0.2
   - lens-labels ==0.2.0.2
   - lens-misc ==0.0.2.0
@@ -1247,7 +1247,7 @@ default-package-overrides:
   - libmpd ==0.9.0.8
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
-  - lifted-async ==0.10.0.2
+  - lifted-async ==0.10.0.3
   - lifted-base ==0.2.3.12
   - lift-generics ==0.1.2
   - line ==4.0.1
@@ -1295,11 +1295,11 @@ default-package-overrides:
   - makefile ==1.1.0.0
   - managed ==1.0.6
   - mapquest-api ==0.3.1
-  - markdown ==0.1.17.1
+  - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.2.0.0
+  - massiv ==0.2.1.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1331,7 +1331,7 @@ default-package-overrides:
   - microlens-ghc ==0.4.9.1
   - microlens-mtl ==0.1.11.1
   - microlens-platform ==0.3.10
-  - microlens-th ==0.4.2.2
+  - microlens-th ==0.4.2.3
   - microspec ==0.1.0.0
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
@@ -1444,8 +1444,8 @@ default-package-overrides:
   - network-ip ==0.3.0.2
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.3
-  - network-simple ==0.4.2
-  - network-simple-tls ==0.3
+  - network-simple ==0.4.3
+  - network-simple-tls ==0.3.1
   - network-transport ==0.5.2
   - network-transport-composed ==0.2.1
   - network-transport-inmemory ==0.5.2
@@ -1480,7 +1480,7 @@ default-package-overrides:
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
   - o-clock ==1.0.0
-  - odbc ==0.2.0
+  - odbc ==0.2.2
   - oeis ==0.3.9
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
@@ -1518,7 +1518,7 @@ default-package-overrides:
   - pagination ==0.2.1
   - palette ==0.3.0.1
   - pandoc ==2.2.1
-  - pandoc-citeproc ==0.14.3.1
+  - pandoc-citeproc ==0.14.5
   - pandoc-types ==1.17.5.1
   - pango ==0.13.5.0
   - papillon ==0.1.0.6
@@ -1573,7 +1573,7 @@ default-package-overrides:
   - pipes-binary ==0.4.2
   - pipes-bytestring ==2.1.6
   - pipes-category ==0.3.0.0
-  - pipes-concurrency ==2.0.11
+  - pipes-concurrency ==2.0.12
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.15
   - pipes-fastx ==0.3.0.0
@@ -1601,7 +1601,7 @@ default-package-overrides:
   - pooled-io ==0.0.2.2
   - portable-lines ==0.1
   - postgresql-binary ==0.12.1.1
-  - postgresql-libpq ==0.9.4.1
+  - postgresql-libpq ==0.9.4.2
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.4.0
   - postgresql-simple-migration ==0.1.12.0
@@ -1611,7 +1611,7 @@ default-package-overrides:
   - postgresql-typed ==0.5.3.0
   - post-mess-age ==0.2.1.0
   - pptable ==0.3.0.0
-  - pqueue ==1.4.1.1
+  - pqueue ==1.4.1.2
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.1
   - prelude-extras ==0.4.0.3
@@ -1811,7 +1811,7 @@ default-package-overrides:
   - servant-auth ==0.3.2.0
   - servant-auth-client ==0.3.3.0
   - servant-auth-docs ==0.2.10.0
-  - servant-auth-server ==0.4.0.0
+  - servant-auth-server ==0.4.0.1
   - servant-auth-swagger ==0.2.10.0
   - servant-blaze ==0.8
   - servant-cassava ==0.10
@@ -1854,7 +1854,7 @@ default-package-overrides:
   - SHA ==1.6.4.4
   - shake ==0.16.4
   - shake-language-c ==0.12.0
-  - shakespeare ==2.0.15
+  - shakespeare ==2.0.18
   - shell-conduit ==4.7.0
   - shell-escape ==0.2.0
   - shelltestrunner ==1.9
@@ -1872,7 +1872,7 @@ default-package-overrides:
   - simple-vec3 ==0.4.0.8
   - since ==0.0.0
   - singleton-bool ==0.1.4
-  - singleton-nats ==0.4.1
+  - singleton-nats ==0.4.2
   - singletons ==2.4.1
   - siphash ==1.0.3
   - size-based ==0.1.1.0
@@ -1931,12 +1931,12 @@ default-package-overrides:
   - step-function ==0.2
   - stm ==2.4.5.1
   - stm-chans ==3.0.0.4
-  - stm-conduit ==4.0.0
+  - stm-conduit ==4.0.1
   - stm-containers ==0.2.16
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
   - STMonadTrans ==0.4.3
-  - stm-split ==0.0.2
+  - stm-split ==0.0.2.1
   - stm-stats ==0.2.0.0
   - stopwatch ==0.1.0.5
   - storable-complex ==0.2.2
@@ -1994,7 +1994,7 @@ default-package-overrides:
   - tagged-identity ==0.1.2
   - tagged-transformer ==0.8.1
   - tagshare ==0.0
-  - tagsoup ==0.14.6
+  - tagsoup ==0.14.7
   - tagstream-conduit ==0.5.5.3
   - tao ==1.0.0
   - tao-example ==1.0.0
@@ -2013,7 +2013,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10
-  - tasty-silver ==3.1.11
+  - tasty-silver ==3.1.12
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.4
   - tasty-th ==0.1.7
@@ -2035,8 +2035,8 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - testing-feat ==1.1.0.0
   - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.11.1
-  - text ==1.2.3.0
+  - texmath ==0.11.1.1
+  - text ==1.2.3.1
   - text-binary ==0.2.1.1
   - text-builder ==0.5.4.3
   - text-conversions ==0.3.0
@@ -2057,7 +2057,7 @@ default-package-overrides:
   - th-abstraction ==0.2.8.0
   - th-data-compat ==0.0.2.7
   - th-desugar ==1.8
-  - these ==0.7.4
+  - these ==0.7.5
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.11
@@ -2117,7 +2117,7 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.10
+  - turtle ==1.5.11
   - TypeCompose ==0.9.13
   - typed-process ==0.2.3.0
   - type-fun ==0.1.1
@@ -2133,10 +2133,10 @@ default-package-overrides:
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
   - tz ==0.1.3.1
-  - tzdata ==0.1.20180122.0
+  - tzdata ==0.1.20180501.0
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.3
+  - unbound-generics ==0.3.4
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unconstrained ==0.1.0.2
@@ -2163,7 +2163,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.8.0
+  - unliftio ==0.2.8.1
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2226,7 +2226,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.6
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.24.2
+  - wai-extra ==3.0.24.3
   - wai-handler-launch ==3.0.2.4
   - wai-logger ==2.3.2
   - wai-middleware-caching ==0.1.0.2
@@ -2257,13 +2257,13 @@ default-package-overrides:
   - web-routes-hsp ==0.24.6.1
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.5.1
+  - websockets ==0.12.5.2
   - websockets-snap ==0.10.3.0
   - weigh ==0.0.12
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.2.1
-  - wild-bind-x11 ==0.2.0.4
+  - wild-bind ==0.1.2.2
+  - wild-bind-x11 ==0.2.0.5
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
@@ -2294,7 +2294,7 @@ default-package-overrides:
   - X11 ==1.9
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
-  - x509 ==1.7.3
+  - x509 ==1.7.4
   - x509-store ==1.6.6
   - x509-system ==1.6.6
   - x509-validation ==1.6.10
@@ -2309,7 +2309,7 @@ default-package-overrides:
   - xml-basic ==0.1.3.1
   - xmlbf ==0.4.1
   - xmlbf-xeno ==0.1.1
-  - xml-conduit ==1.8.0
+  - xml-conduit ==1.8.0.1
   - xml-conduit-parse ==0.3.1.2
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.2
@@ -2343,7 +2343,7 @@ default-package-overrides:
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
-  - yesod-paginator ==1.1.0.0
+  - yesod-paginator ==1.1.0.1
   - yesod-persistent ==1.6.0
   - yesod-recaptcha2 ==0.2.4
   - yesod-sitemap ==1.6.0

From ab1a64fe6a0a3cfb54061a94a869e95b9bbbc43b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Sep 2018 02:30:41 +0200
Subject: [PATCH 2265/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8d7d987c0d0c6ae33af1ad8c444342dfdefef8b9.
---
 .../haskell-modules/hackage-packages.nix      | 2718 ++++++-----------
 1 file changed, 914 insertions(+), 1804 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93e36fa78890..506fe1219286 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -139,6 +139,8 @@ self: {
        pname = "AC-HalfInteger";
        version = "1.2.1";
        sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
+       revision = "1";
+       editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9";
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
@@ -151,6 +153,8 @@ self: {
        pname = "AC-MiniTest";
        version = "1.1.1";
        sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
+       revision = "1";
+       editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y";
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
@@ -185,6 +189,8 @@ self: {
        pname = "AC-Terminal";
        version = "1.0";
        sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
+       revision = "1";
+       editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm";
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
@@ -209,6 +215,8 @@ self: {
        pname = "AC-Vector";
        version = "2.3.2";
        sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
+       revision = "1";
+       editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0";
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
@@ -2753,24 +2761,6 @@ self: {
      }) {};
 
   "ChasingBottoms" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
-     , syb
-     }:
-     mkDerivation {
-       pname = "ChasingBottoms";
-       version = "1.3.1.4";
-       sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
-       libraryHaskellDepends = [
-         base containers mtl QuickCheck random syb
-       ];
-       testHaskellDepends = [
-         array base containers mtl QuickCheck random syb
-       ];
-       description = "For testing partial and infinite values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ChasingBottoms_1_3_1_5" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
      }:
@@ -2786,7 +2776,6 @@ self: {
        ];
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CheatSheet" = callPackage
@@ -5437,19 +5426,6 @@ self: {
      }) {};
 
   "Fin" = callPackage
-    ({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
-     mkDerivation {
-       pname = "Fin";
-       version = "0.2.5.0";
-       sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc";
-       libraryHaskellDepends = [
-         alg base foldable1 natural-induction peano
-       ];
-       description = "Finite totally-ordered sets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Fin_0_2_6_0" = callPackage
     ({ mkDerivation, alg, base, foldable1, natural-induction, peano
      , universe-base
      }:
@@ -5462,7 +5438,6 @@ self: {
        ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5615,6 +5590,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "FontyFruity_0_5_3_4" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, filepath, text, vector, xml
+     }:
+     mkDerivation {
+       pname = "FontyFruity";
+       version = "0.5.3.4";
+       sha256 = "0gavpjv83vg5q2x254d3zi3kw5aprl6z8ifcn0vs6hymaj0qgls3";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory filepath text
+         vector xml
+       ];
+       description = "A true type file format loader";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ForSyDe" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, mtl
      , old-time, parameterized-data, pretty, process, random
@@ -6594,28 +6586,6 @@ self: {
      }) {};
 
   "Glob" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, filepath
-     , HUnit, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "Glob";
-       version = "0.9.2";
-       sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
-       libraryHaskellDepends = [
-         base containers directory dlist filepath transformers
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers directory dlist filepath HUnit QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         transformers transformers-compat
-       ];
-       description = "Globbing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Glob_0_9_3" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers, transformers-compat
@@ -6635,7 +6605,6 @@ self: {
        ];
        description = "Globbing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GlomeTrace" = callPackage
@@ -10208,6 +10177,8 @@ self: {
        pname = "IORefCAS";
        version = "0.2.0.1";
        sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
+       revision = "1";
+       editedCabalFile = "0s01hpvl0dqb6lszp1s76li1i1k57j1bzhwhfwz552w85pxpv7ib";
        libraryHaskellDepends = [ base bits-atomic ghc-prim ];
        testHaskellDepends = [
          base bits-atomic ghc-prim HUnit QuickCheck time
@@ -10677,14 +10648,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "JuicyPixels_3_3_1" = callPackage
+  "JuicyPixels_3_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.3.1";
-       sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza";
+       version = "3.3.2";
+       sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -15038,14 +15009,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_12_4" = callPackage
+  "QuickCheck_2_12_5" = callPackage
     ({ mkDerivation, base, containers, deepseq, erf, process, random
      , template-haskell, tf-random, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.12.4";
-       sha256 = "0pagxjsj2anyy1af0qc7b5mydblhnk3976bda3qxv47qp4kb5xn9";
+       version = "2.12.5";
+       sha256 = "1nnxhm7f7j3s5wbyryra24vc3x11701qkj0kmassgk7kv4vlcy27";
        libraryHaskellDepends = [
          base containers deepseq erf random template-haskell tf-random
          transformers
@@ -15552,6 +15523,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.4.1";
+       sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -17381,8 +17370,8 @@ self: {
      }:
      mkDerivation {
        pname = "StrictCheck";
-       version = "0.1.0";
-       sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z";
+       version = "0.1.1";
+       sha256 = "1mm1kyrrrwgxdjnafazggblcjlin3i8bjqrj6q0l7xrgllnqalv2";
        libraryHaskellDepends = [
          base bifunctors containers generics-sop QuickCheck template-haskell
        ];
@@ -21113,6 +21102,8 @@ self: {
        pname = "acquire";
        version = "0.2.0.1";
        sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+       revision = "1";
+       editedCabalFile = "1ihmdh0dpppgshsh7mxdz6bm9kn632xxd3g6nkigpjpfrb372q7z";
        libraryHaskellDepends = [ base ];
        description = "Abstraction over management of resources";
        license = stdenv.lib.licenses.mit;
@@ -21684,34 +21675,6 @@ self: {
      }) {};
 
   "aeson-compat" = callPackage
-    ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
-     , base-compat, base-orphans, bytestring, containers, exceptions
-     , hashable, QuickCheck, quickcheck-instances, scientific, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-compat";
-       version = "0.3.8";
-       sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i";
-       revision = "1";
-       editedCabalFile = "0ayf5hkhl63lmlxpl7w5zvnz0lvpxb2rwmf0wbslff0y2s449mbf";
-       libraryHaskellDepends = [
-         aeson attoparsec attoparsec-iso8601 base base-compat bytestring
-         containers exceptions hashable scientific tagged text time
-         time-locale-compat unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat base-orphans bytestring
-         containers exceptions hashable QuickCheck quickcheck-instances
-         scientific tagged tasty tasty-hunit tasty-quickcheck text time
-         time-locale-compat unordered-containers vector
-       ];
-       description = "Compatibility layer for aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-compat_0_3_9" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
      , base-compat, base-orphans, bytestring, containers, exceptions
      , hashable, QuickCheck, quickcheck-instances, scientific, tagged
@@ -21735,7 +21698,6 @@ self: {
        ];
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-decode" = callPackage
@@ -22003,8 +21965,8 @@ self: {
     ({ mkDerivation, aeson, base }:
      mkDerivation {
        pname = "aeson-options";
-       version = "0.0.0";
-       sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0";
+       version = "0.1.0";
+       sha256 = "0d5wfcgsjrpmangknmrr2lxvr3h96d65y3vkkas6m9aqi1rrkqv4";
        libraryHaskellDepends = [ aeson base ];
        description = "Options to derive FromJSON/ToJSON instances";
        license = stdenv.lib.licenses.mit;
@@ -22947,6 +22909,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alarmclock_0_6_0_1" = callPackage
+    ({ mkDerivation, async, base, clock, hspec, stm, time
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.6.0.1";
+       sha256 = "18yha98skjkvwzc1g47kh8wbsflp3i1bzgx59cq4p649gw3rlzdm";
+       libraryHaskellDepends = [
+         async base clock stm time unbounded-delays
+       ];
+       testHaskellDepends = [
+         async base clock hspec stm time unbounded-delays
+       ];
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alea" = callPackage
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
@@ -23047,6 +23028,8 @@ self: {
        pname = "alex-tools";
        version = "0.4";
        sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
+       revision = "1";
+       editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg";
        libraryHaskellDepends = [ base deepseq template-haskell text ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
@@ -23072,17 +23055,6 @@ self: {
      }) {};
 
   "alg" = callPackage
-    ({ mkDerivation, base, util }:
-     mkDerivation {
-       pname = "alg";
-       version = "0.2.6.0";
-       sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk";
-       libraryHaskellDepends = [ base util ];
-       description = "Algebraic structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alg_0_2_7_0" = callPackage
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
@@ -23091,7 +23063,6 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -27347,8 +27318,8 @@ self: {
      }:
      mkDerivation {
        pname = "apart";
-       version = "0.1.1";
-       sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan";
+       version = "0.1.3";
+       sha256 = "16y5k372kmqsn81bksl9j01nbfhsk0cwriwpfycjsnzgmg8wnkpb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27367,14 +27338,14 @@ self: {
 
   "apecs" = callPackage
     ({ mkDerivation, base, containers, criterion, linear, mtl
-     , QuickCheck, stm, template-haskell, vector
+     , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.5.0.0";
-       sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw";
+       version = "0.5.1.0";
+       sha256 = "1k1190i83xwsgc1jd6mz4xjbq1j12vdizzw3cp2f652zvg9h09s3";
        libraryHaskellDepends = [
-         base containers mtl stm template-haskell vector
+         base containers mtl template-haskell vector
        ];
        testHaskellDepends = [
          base containers criterion linear QuickCheck vector
@@ -27889,6 +27860,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "app-settings_0_2_0_12" = callPackage
+    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
+     , parsec, text
+     }:
+     mkDerivation {
+       pname = "app-settings";
+       version = "0.2.0.12";
+       sha256 = "1nncn8vmq55m4b6zh77mdmx19d1s7z0af4pmz1v082bpf2wril9b";
+       libraryHaskellDepends = [
+         base containers directory mtl parsec text
+       ];
+       testHaskellDepends = [
+         base containers directory hspec HUnit mtl parsec text
+       ];
+       description = "A library to manage application settings (INI file-like)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "appar" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -29306,6 +29296,8 @@ self: {
        pname = "asn1-codec";
        version = "0.2.0";
        sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
+       revision = "1";
+       editedCabalFile = "0d1m0i06i0agh64hbc182yrmd4lfwi6kwmms0gh2yh91ympmyd89";
        libraryHaskellDepends = [
          base bytestring containers contravariant cryptonite hashable
          integer-gmp memory network pretty stm text vector
@@ -30354,6 +30346,8 @@ self: {
        pname = "atto-lisp";
        version = "0.2.2.3";
        sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
+       revision = "1";
+       editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          deepseq text
@@ -30548,19 +30542,6 @@ self: {
      }) {};
 
   "attoparsec-iso8601" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, text, time }:
-     mkDerivation {
-       pname = "attoparsec-iso8601";
-       version = "1.0.0.0";
-       sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a";
-       revision = "1";
-       editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4";
-       libraryHaskellDepends = [ attoparsec base base-compat text time ];
-       description = "Parsing of ISO 8601 dates, originally from aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "attoparsec-iso8601_1_0_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, text, time }:
      mkDerivation {
        pname = "attoparsec-iso8601";
@@ -30569,7 +30550,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base base-compat text time ];
        description = "Parsing of ISO 8601 dates, originally from aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-iteratee" = callPackage
@@ -31480,6 +31460,8 @@ self: {
        pname = "aws";
        version = "0.18";
        sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj";
+       revision = "1";
+       editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32108,6 +32090,8 @@ self: {
        pname = "axel";
        version = "0.0.6";
        sha256 = "17601gv4rjdxmg2qqp2y9b5lk9ia0z1izhympmwf6zs7wkjs6fyh";
+       revision = "2";
+       editedCabalFile = "12m24klalqxpglh9slhr65sxqd4dsqcaz2abmw29cki0cz6x29dp";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -32730,15 +32714,17 @@ self: {
      }) {};
 
   "barbies" = callPackage
-    ({ mkDerivation, base, bifunctors, QuickCheck, tasty
+    ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck
      }:
      mkDerivation {
        pname = "barbies";
-       version = "0.1.4.0";
-       sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada";
+       version = "1.0.0.0";
+       sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci";
        libraryHaskellDepends = [ base bifunctors ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
        description = "Classes for working with types that can change clothes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34068,8 +34054,8 @@ self: {
     ({ mkDerivation, base, bytestring, mtl, time }:
      mkDerivation {
        pname = "benchpress";
-       version = "0.2.2.11";
-       sha256 = "07blpjp84f3xycnrg0dwz3rvlm665dxri2ch54145qd4rxy9hlln";
+       version = "0.2.2.12";
+       sha256 = "0r5b1mdjm08nsxni1qzwq3kap13jflcq7ksd30zl7vaxgz9yhwfm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl time ];
@@ -35012,6 +34998,8 @@ self: {
        pname = "binary-serialise-cbor";
        version = "0.2.0.0";
        sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv";
+       revision = "1";
+       editedCabalFile = "1dkranaa9fn81z0x75b1dblnph9d0pvzzz0jpz374lqsxaimqgp6";
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
        license = stdenv.lib.licenses.bsd3;
@@ -35094,39 +35082,6 @@ self: {
      }) {};
 
   "binary-tagged" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, binary-orphans, bytestring, containers, criterion
-     , deepseq, generics-sop, hashable, nats, quickcheck-instances
-     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
-     , text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "binary-tagged";
-       version = "0.1.5";
-       sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl";
-       revision = "1";
-       editedCabalFile = "0vddb305g3455f0rh0xs6c9i2vllnf83y0pbp53wjwb3l575bqyp";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         generics-sop hashable scientific SHA tagged text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary binary-orphans
-         bytestring containers generics-sop hashable quickcheck-instances
-         scientific SHA tagged tasty tasty-quickcheck text time
-         unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson array base base16-bytestring binary binary-orphans bytestring
-         containers criterion deepseq generics-sop hashable nats scientific
-         semigroups SHA tagged text time unordered-containers vector
-       ];
-       description = "Tagged binary serialisation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "binary-tagged_0_1_5_1" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
      , binary, binary-orphans, bytestring, containers, criterion
      , deepseq, generics-sop, hashable, nats, quickcheck-instances
@@ -35155,7 +35110,6 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tree" = callPackage
@@ -37566,23 +37520,6 @@ self: {
      }) {};
 
   "blaze-markup" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "blaze-markup";
-       version = "0.8.2.1";
-       sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
-       libraryHaskellDepends = [ base blaze-builder bytestring text ];
-       testHaskellDepends = [
-         base blaze-builder bytestring containers HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck text
-       ];
-       description = "A blazingly fast markup combinator library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-markup_0_8_2_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text
      }:
@@ -37597,7 +37534,6 @@ self: {
        ];
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-shields" = callPackage
@@ -39081,6 +39017,8 @@ self: {
        pname = "brick";
        version = "0.37.2";
        sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
+       revision = "1";
+       editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39503,17 +39441,17 @@ self: {
 
   "bsb-http-chunked" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups
-     , tasty, tasty-hedgehog, tasty-hunit
+     , deepseq, doctest, gauge, hedgehog, semigroups, tasty
+     , tasty-hedgehog, tasty-hunit
      }:
      mkDerivation {
        pname = "bsb-http-chunked";
-       version = "0.0.0.3";
-       sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4";
-       libraryHaskellDepends = [ base bytestring bytestring-builder ];
+       version = "0.0.0.4";
+       sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql";
+       libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
-         attoparsec base blaze-builder bytestring bytestring-builder doctest
-         hedgehog tasty tasty-hedgehog tasty-hunit
+         attoparsec base blaze-builder bytestring doctest hedgehog tasty
+         tasty-hedgehog tasty-hunit
        ];
        benchmarkHaskellDepends = [
          base blaze-builder bytestring deepseq gauge semigroups
@@ -40274,8 +40212,8 @@ self: {
      }:
      mkDerivation {
        pname = "bv-little";
-       version = "0.1.1";
-       sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8";
+       version = "0.1.2";
+       sha256 = "0xscq4qjwisqiykdhiirxc58gsrmabvxmxwxw80f2m6ia103k3cc";
        libraryHaskellDepends = [
          base deepseq hashable integer-gmp mono-traversable primitive
          QuickCheck
@@ -40457,18 +40395,6 @@ self: {
      }) {};
 
   "bytestring-builder" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq }:
-     mkDerivation {
-       pname = "bytestring-builder";
-       version = "0.10.8.1.0";
-       sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
-       libraryHaskellDepends = [ base bytestring deepseq ];
-       doHaddock = false;
-       description = "The new bytestring builder, packaged outside of GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bytestring-builder_0_10_8_2_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq }:
      mkDerivation {
        pname = "bytestring-builder";
@@ -40478,7 +40404,6 @@ self: {
        doHaddock = false;
        description = "The new bytestring builder, packaged outside of GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder-varword" = callPackage
@@ -41065,32 +40990,6 @@ self: {
      }) {};
 
   "c2hs" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , dlist, filepath, HUnit, language-c, pretty, process, shelly
-     , test-framework, test-framework-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "c2hs";
-       version = "0.28.5";
-       sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
-       revision = "1";
-       editedCabalFile = "1d6i1wr1kbn61yi7nk1scjfm2800vm2ynnx7555fjkdx4d8va711";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         array base bytestring containers directory dlist filepath
-         language-c pretty process
-       ];
-       testHaskellDepends = [
-         base filepath HUnit shelly test-framework test-framework-hunit text
-         transformers
-       ];
-       description = "C->Haskell FFI tool that gives some cross-language type safety";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "c2hs_0_28_6" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , dlist, filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
@@ -41112,7 +41011,6 @@ self: {
        ];
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c2hs-extra" = callPackage
@@ -42315,59 +42213,6 @@ self: {
      }) {};
 
   "cachix" = callPackage
-    ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
-     , bifunctors, bytestring, cachix-api, conduit, conduit-extra
-     , cookie, cryptonite, dhall, directory, ed25519, fsnotify, here
-     , hspec, hspec-discover, http-client, http-client-tls, http-conduit
-     , http-types, lzma-conduit, megaparsec, memory, mmorph
-     , optparse-applicative, process, protolude, resourcet, servant
-     , servant-auth, servant-auth-client, servant-client
-     , servant-client-core, servant-streaming-client, streaming, text
-     , unix, uri-bytestring, versions
-     }:
-     mkDerivation {
-       pname = "cachix";
-       version = "0.1.1";
-       sha256 = "0jhjan72dp18dblrb7v4h4h4ffvii7n4dwmpgfyjn8kndmxkaqbd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 fsnotify here http-client http-client-tls
-         http-conduit http-types lzma-conduit megaparsec memory mmorph
-         optparse-applicative process protolude resourcet servant
-         servant-auth servant-auth-client servant-client servant-client-core
-         servant-streaming-client streaming text unix uri-bytestring
-         versions
-       ];
-       executableHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 fsnotify here http-client http-client-tls
-         http-conduit http-types lzma-conduit megaparsec memory mmorph
-         optparse-applicative process protolude resourcet servant
-         servant-auth servant-auth-client servant-client servant-client-core
-         servant-streaming-client streaming text unix uri-bytestring
-         versions
-       ];
-       executableToolDepends = [ hspec-discover ];
-       testHaskellDepends = [
-         async base base16-bytestring base64-bytestring bifunctors
-         bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
-         directory ed25519 fsnotify here hspec http-client http-client-tls
-         http-conduit http-types lzma-conduit megaparsec memory mmorph
-         optparse-applicative process protolude resourcet servant
-         servant-auth servant-auth-client servant-client servant-client-core
-         servant-streaming-client streaming text unix uri-bytestring
-         versions
-       ];
-       description = "Command line client for Nix binary cache hosting https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cachix_0_1_2" = callPackage
     ({ mkDerivation, async, base, base16-bytestring, base64-bytestring
      , bifunctors, bytestring, cachix-api, conduit, conduit-extra
      , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
@@ -42421,48 +42266,6 @@ self: {
      }) {};
 
   "cachix-api" = callPackage
-    ({ mkDerivation, aeson, amazonka, base, base16-bytestring
-     , bytestring, conduit, conduit-combinators, cookie, cryptonite
-     , hspec, hspec-discover, http-api-data, http-media, lens, memory
-     , protolude, servant, servant-auth, servant-auth-server
-     , servant-auth-swagger, servant-streaming, servant-swagger
-     , servant-swagger-ui-core, string-conv, swagger2, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "cachix-api";
-       version = "0.1.0.1";
-       sha256 = "0z9dbci88qyyqc4b8kl6ab3k8yvgnmswi590qwyjvhc6va2fn3y6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit
-         conduit-combinators cookie cryptonite http-api-data http-media lens
-         memory servant servant-auth servant-auth-server
-         servant-auth-swagger servant-streaming servant-swagger
-         servant-swagger-ui-core string-conv swagger2 text transformers
-       ];
-       executableHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit
-         conduit-combinators cookie cryptonite http-api-data http-media lens
-         memory servant servant-auth servant-auth-server
-         servant-auth-swagger servant-streaming servant-swagger
-         servant-swagger-ui-core string-conv swagger2 text transformers
-       ];
-       testHaskellDepends = [
-         aeson amazonka base base16-bytestring bytestring conduit
-         conduit-combinators cookie cryptonite hspec http-api-data
-         http-media lens memory protolude servant servant-auth
-         servant-auth-server servant-auth-swagger servant-streaming
-         servant-swagger servant-swagger-ui-core string-conv swagger2 text
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Servant HTTP API specification for https://cachix.org";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "cachix-api_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, amazonka, base, base16-bytestring
      , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
      , http-api-data, http-media, lens, memory, protolude, servant
@@ -42500,7 +42303,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cacophony" = callPackage
@@ -43919,6 +43721,27 @@ self: {
      }) {};
 
   "cassava-megaparsec" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, hspec
+     , hspec-megaparsec, megaparsec, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cassava-megaparsec";
+       version = "1.0.0";
+       sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28";
+       revision = "1";
+       editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6";
+       libraryHaskellDepends = [
+         base bytestring cassava containers megaparsec unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring cassava hspec hspec-megaparsec vector
+       ];
+       description = "Megaparsec parser of CSV files that plays nicely with Cassava";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "cassava-megaparsec_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec
      , megaparsec, unordered-containers, vector
      }:
@@ -43934,6 +43757,7 @@ self: {
        ];
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-records" = callPackage
@@ -47958,6 +47782,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
+  "clr-host_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory
+     , file-embed, filepath, glib, mono, text, transformers
+     }:
+     mkDerivation {
+       pname = "clr-host";
+       version = "0.2.1.0";
+       sha256 = "192yzi7xx2hrk2q0i4qzq0plam2b0xgg9r5s3kjzcvf9hq1vyapy";
+       setupHaskellDepends = [
+         base Cabal directory filepath transformers
+       ];
+       libraryHaskellDepends = [
+         base bytestring clr-marshal file-embed text
+       ];
+       librarySystemDepends = [ glib mono ];
+       testHaskellDepends = [ base ];
+       description = "Hosting the Common Language Runtime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+
   "clr-inline" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, case-insensitive
      , clr-host, clr-marshal, containers, criterion, directory, extra
@@ -48493,23 +48338,21 @@ self: {
      }) {};
 
   "co-log" = callPackage
-    ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
+    ({ mkDerivation, ansi-terminal, base, base-noprelude, bytestring
      , co-log-core, containers, contravariant, markdown-unlit, mtl
      , relude, text, time, transformers, typerep-map
      }:
      mkDerivation {
        pname = "co-log";
-       version = "0.0.0";
-       sha256 = "0bx45ffb1d7sdxcc7srx8sxb6qwjjs8gf90mnr3q1b76b2iczklp";
+       version = "0.1.0";
+       sha256 = "101ajw1qckc7nin5ard3dcamhz447qv0wv1wvnid8xmw9zsjf7gg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base-noprelude bytestring co-log-core containers
          contravariant mtl relude text time transformers typerep-map
        ];
-       executableHaskellDepends = [
-         base-noprelude relude text typerep-map
-       ];
+       executableHaskellDepends = [ base relude text typerep-map ];
        executableToolDepends = [ markdown-unlit ];
        description = "Logging library";
        license = stdenv.lib.licenses.mpl20;
@@ -48519,8 +48362,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "co-log-core";
-       version = "0.0.0";
-       sha256 = "1xml4qbvjlgcqvh0kmgqm2wr50bzd252a40zpc84sk6kg8a3x734";
+       version = "0.1.0";
+       sha256 = "1yxz7p5df70r0327gxfip2nwjh8gsc2fh1i6bjaf9yzfccar69xx";
        libraryHaskellDepends = [ base ];
        description = "Logging library";
        license = stdenv.lib.licenses.mpl20;
@@ -50853,22 +50696,6 @@ self: {
      }) {};
 
   "concurrency" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.6.0.0";
-       sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_6_1_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
@@ -50882,7 +50709,6 @@ self: {
        ];
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrency-benchmarks" = callPackage
@@ -51014,22 +50840,6 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
-       version = "1.10.6";
-       sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_10_7" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -51043,7 +50853,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -51291,41 +51100,6 @@ self: {
      }) {};
 
   "conduit-algorithms" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, 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.8.1";
-       sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd";
-       libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra 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 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 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;
-     }) {};
-
-  "conduit-algorithms_0_0_8_2" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, criterion
      , deepseq, directory, exceptions, HUnit, lzma-conduit
@@ -51358,7 +51132,6 @@ self: {
        ];
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -51810,6 +51583,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "config-ini_0_2_3_0" = callPackage
+    ({ mkDerivation, base, containers, directory, hedgehog, ini
+     , megaparsec, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "config-ini";
+       version = "0.2.3.0";
+       sha256 = "03sv2y9ax3jqcfydfzfvmsixl8qch2zym3sr065pjsh8qxrknkqc";
+       libraryHaskellDepends = [
+         base containers megaparsec text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers directory hedgehog ini text unordered-containers
+       ];
+       description = "A library for simple INI-based configuration files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "config-manager" = callPackage
     ({ mkDerivation, base, directory, filepath, HUnit, parsec
      , temporary, test-framework, test-framework-hunit, text, time
@@ -55220,20 +55012,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.12";
-       sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_13" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -55245,7 +55023,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -56397,8 +56174,8 @@ self: {
        pname = "cue-sheet";
        version = "1.0.1";
        sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
-       revision = "2";
-       editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x";
+       revision = "3";
+       editedCabalFile = "14kgk1digf1vbsr7v5jvj8gajkx0rkn3zjl4m8csqhxalkaxa2zl";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
@@ -56421,6 +56198,8 @@ self: {
        pname = "cue-sheet";
        version = "2.0.0";
        sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql";
+       revision = "1";
+       editedCabalFile = "0cnlyy7psk8qcwahiqfdpaybvrw899bv106p0i53lrdjxfdsmf4g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
@@ -58745,17 +58524,6 @@ self: {
      }) {};
 
   "data-ref" = callPackage
-    ({ mkDerivation, base, stm, transformers }:
-     mkDerivation {
-       pname = "data-ref";
-       version = "0.0.1.1";
-       sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4";
-       libraryHaskellDepends = [ base stm transformers ];
-       description = "Unify STRef and IORef in plain Haskell 98";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-ref_0_0_1_2" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "data-ref";
@@ -58764,7 +58532,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Unify STRef and IORef in plain Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-reify" = callPackage
@@ -61419,8 +61186,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive-storable-plugin";
-       version = "0.2.1.0";
-       sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi";
+       version = "0.2.2.0";
+       sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0";
        libraryHaskellDepends = [ base derive-storable ghc ghci ];
        testHaskellDepends = [
          base derive-storable ghc ghc-paths ghci hspec QuickCheck
@@ -61483,29 +61250,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.5.1";
-       sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_5_2" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -61526,7 +61270,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -62176,14 +61919,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "di_1_1_1" = callPackage
+  "di_1_2" = callPackage
     ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
      , di-monad, exceptions
      }:
      mkDerivation {
        pname = "di";
-       version = "1.1.1";
-       sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk";
+       version = "1.2";
+       sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b";
        libraryHaskellDepends = [
          base containers df1 di-core di-df1 di-handle di-monad exceptions
        ];
@@ -62260,14 +62003,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "di-monad_1_2" = callPackage
+  "di-monad_1_3" = callPackage
     ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
      , stm, transformers
      }:
      mkDerivation {
        pname = "di-monad";
-       version = "1.2";
-       sha256 = "1zqgsylx6z6p0cvlyhl7vnff5sb4jlv9qzqgbz8kg3zli183gwc3";
+       version = "1.3";
+       sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl";
        libraryHaskellDepends = [
          base containers di-core exceptions mtl pipes stm transformers
        ];
@@ -63838,8 +63581,10 @@ self: {
      }:
      mkDerivation {
        pname = "dirstream";
-       version = "1.0.3";
-       sha256 = "1yga8qzmarskjlnz7wnkrjiv438m2yswz640bcw8dawwqk8xf1x4";
+       version = "1.1.0";
+       sha256 = "1xnxsx1m06jm8yvim1xnvfkwylhyab51wvba1j3fbicy4ysblfz0";
+       revision = "1";
+       editedCabalFile = "01bl222ymniz3q7nbpbxhbckvwqgrawrk553widw5d0hnn0h0hnb";
        libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
@@ -64222,22 +63967,6 @@ self: {
      }) {};
 
   "distributed-closure" = callPackage
-    ({ mkDerivation, base, binary, bytestring, constraints, hspec
-     , QuickCheck, syb, template-haskell
-     }:
-     mkDerivation {
-       pname = "distributed-closure";
-       version = "0.4.0";
-       sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm";
-       libraryHaskellDepends = [
-         base binary bytestring constraints syb template-haskell
-       ];
-       testHaskellDepends = [ base binary hspec QuickCheck ];
-       description = "Serializable closures for distributed programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "distributed-closure_0_4_1" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, constraints
      , hspec, QuickCheck, syb, template-haskell
      }:
@@ -64254,7 +63983,6 @@ self: {
        testHaskellDepends = [ base binary hspec QuickCheck ];
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-fork" = callPackage
@@ -65068,18 +64796,6 @@ self: {
      }) {};
 
   "dlist" = callPackage
-    ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "dlist";
-       version = "0.8.0.4";
-       sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base Cabal QuickCheck ];
-       description = "Difference lists";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dlist_0_8_0_5" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
@@ -65089,7 +64805,6 @@ self: {
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dlist-instances" = callPackage
@@ -65333,6 +65048,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "do-notation-dsl" = callPackage
+    ({ mkDerivation, base, containers, doctest, doctest-discover
+     , temporary
+     }:
+     mkDerivation {
+       pname = "do-notation-dsl";
+       version = "0.1.0.0";
+       sha256 = "0m854jzn9d01d6qkf7r0pq987fhnjall7bpz5z21nv8xzpzqjnqh";
+       revision = "1";
+       editedCabalFile = "1wsvia13ll0jkwdgnyhm9zv98hsc5fmgk46rblprkgqmw6f6y3g2";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers doctest doctest-discover temporary
+       ];
+       description = "An alternative to monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -65564,35 +65297,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
-     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
-     , with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.16.0";
-       sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit mockery process QuickCheck setenv silently
-         stringbuilder syb transformers with-location
-       ];
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_16_0_1" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -65619,7 +65323,6 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -69763,10 +69466,10 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.21";
-       sha256 = "0rqpxvw2d2m5hlgkc2a3794874dig84vph1wkqnlrv2vxixkqplw";
+       version = "1.2.22";
+       sha256 = "19hmd804r9k20270zlsfbsyvww5syi5h3nl74klvgmni39ahcxcl";
        revision = "1";
-       editedCabalFile = "1n5l2fs0wn7wps2nr8irymrfac2qris75z3p73mmlxrdxmbjb2vr";
+       editedCabalFile = "098nkv1zrc4b80137pxdz87by83bla9cbsv6920cpbspkic8x9xz";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring errors
          free monad-loops mwc-random stm stm-delay text transformers
@@ -69878,20 +69581,6 @@ self: {
      }) {};
 
   "entropy" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , process, unix
-     }:
-     mkDerivation {
-       pname = "entropy";
-       version = "0.4.1.1";
-       sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
-       setupHaskellDepends = [ base Cabal directory filepath process ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       description = "A platform independent entropy source";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "entropy_0_4_1_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, unix
      }:
@@ -69903,7 +69592,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "entwine" = callPackage
@@ -70027,6 +69715,8 @@ self: {
        pname = "enumerator";
        version = "0.4.20";
        sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
+       revision = "1";
+       editedCabalFile = "10mn8a6sj7fvcprfmngr5z1h434k6yhdij064lqxjpiqyr1srg9z";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -70403,29 +70093,6 @@ self: {
      }) {};
 
   "equivalence" = callPackage
-    ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
-     , template-haskell, test-framework, test-framework-quickcheck2
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "equivalence";
-       version = "0.3.2";
-       sha256 = "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx";
-       revision = "1";
-       editedCabalFile = "010n0gpk2rpninggdnnx0j7fys6hzn80s789b16iw0a55h4z0gn8";
-       libraryHaskellDepends = [
-         base containers mtl STMonadTrans transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base containers mtl QuickCheck STMonadTrans template-haskell
-         test-framework test-framework-quickcheck2 transformers
-         transformers-compat
-       ];
-       description = "Maintaining an equivalence relation implemented as union-find using STT";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "equivalence_0_3_3" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
      , template-haskell, test-framework, test-framework-quickcheck2
      , transformers, transformers-compat
@@ -70444,7 +70111,6 @@ self: {
        ];
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "erd" = callPackage
@@ -70948,6 +70614,8 @@ self: {
        pname = "esqueleto";
        version = "2.5.3";
        sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x";
+       revision = "1";
+       editedCabalFile = "1rmqqx2p4bad6psg8jbzf6jwan9z4a5yjskdkw51q0f47jhpfcdj";
        libraryHaskellDepends = [
          base blaze-html bytestring conduit monad-logger persistent
          resourcet tagged text transformers unordered-containers
@@ -72482,6 +72150,8 @@ self: {
        pname = "exp-pairs";
        version = "0.1.6.0";
        sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
+       revision = "1";
+       editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim prettyprinter
        ];
@@ -72493,6 +72163,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "exp-pairs_0_2_0_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
+     , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "exp-pairs";
+       version = "0.2.0.0";
+       sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp";
+       revision = "1";
+       editedCabalFile = "1fkllbgsygzm1lw3g3a9l8fg8ap74bx0x7ja8yx3lbrjjsaqh8pa";
+       libraryHaskellDepends = [
+         base containers deepseq ghc-prim prettyprinter
+       ];
+       testHaskellDepends = [
+         base matrix QuickCheck random smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       description = "Linear programming over exponent pairs";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "expand" = callPackage
     ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }:
      mkDerivation {
@@ -72820,8 +72513,8 @@ self: {
        pname = "extended-reals";
        version = "0.2.3.0";
        sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
-       revision = "1";
-       editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
+       revision = "2";
+       editedCabalFile = "020aliazf97zrhkcdpblmh9xakabdd8wdxg0667j4553rsijwqcy";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -72976,22 +72669,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.9";
-       sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_12" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -73005,7 +72682,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -74873,6 +74549,8 @@ self: {
        pname = "fgl";
        version = "5.6.0.0";
        sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
+       revision = "1";
+       editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70";
        libraryHaskellDepends = [
          array base containers deepseq transformers
        ];
@@ -75734,8 +75412,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "first-class-families";
-       version = "0.2.0.0";
-       sha256 = "0lwxz2dv0mcls0ww00h1x92gn4gdrz49arrl21lwqs1lf3q748f5";
+       version = "0.3.0.1";
+       sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib";
        libraryHaskellDepends = [ base ];
        description = "First class type families";
        license = stdenv.lib.licenses.mit;
@@ -77245,22 +76923,6 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
-     , time
-     }:
-     mkDerivation {
-       pname = "fold-debounce";
-       version = "0.2.0.7";
-       sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz";
-       libraryHaskellDepends = [
-         base data-default-class stm stm-delay time
-       ];
-       testHaskellDepends = [ base hspec stm time ];
-       description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce_0_2_0_8" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
      }:
@@ -77274,7 +76936,6 @@ self: {
        testHaskellDepends = [ base hspec stm time ];
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -77283,8 +76944,8 @@ self: {
      }:
      mkDerivation {
        pname = "fold-debounce-conduit";
-       version = "0.2.0.1";
-       sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z";
+       version = "0.2.0.2";
+       sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
        libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
@@ -77296,14 +76957,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fold-debounce-conduit_0_2_0_2" = callPackage
+  "fold-debounce-conduit_0_2_0_3" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
      }:
      mkDerivation {
        pname = "fold-debounce-conduit";
-       version = "0.2.0.2";
-       sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
+       version = "0.2.0.3";
+       sha256 = "0rzgaxqv3q0s848bk3hm0mq14sxa1szpxvi9k19n0hpqlx60rj4p";
        libraryHaskellDepends = [
          base conduit fold-debounce resourcet stm transformers
          transformers-base
@@ -81452,6 +81113,8 @@ self: {
        pname = "generic-random";
        version = "1.2.0.0";
        sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv";
+       revision = "1";
+       editedCabalFile = "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Generic random generators";
@@ -81785,6 +81448,8 @@ self: {
        pname = "geniplate-mirror";
        version = "0.7.6";
        sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb";
+       revision = "1";
+       editedCabalFile = "1pyz2vdkr5w9wadmb5v4alx408dqamny3mkvl4x8v2pf549qn37k";
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
@@ -83236,27 +82901,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1.3";
-       sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_4" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -83275,7 +82919,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -84450,28 +84093,6 @@ self: {
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
-       version = "3.0.24";
-       sha256 = "14cyj1acxs39avciyzqqb1qa5dr4my8rv3mfwv1kv92wa9a5i97v";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gtk_3_0_25" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base
@@ -84491,7 +84112,6 @@ self: {
        doHaddock = false;
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gtk-declarative" = callPackage
@@ -84530,23 +84150,6 @@ self: {
      }) {};
 
   "gi-gtk-hs" = callPackage
-    ({ mkDerivation, base, base-compat, containers, gi-gdk
-     , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk-hs";
-       version = "0.3.6.1";
-       sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw";
-       libraryHaskellDepends = [
-         base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
-         gi-gtk haskell-gi-base mtl text transformers
-       ];
-       description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {};
-
-  "gi-gtk-hs_0_3_6_2" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
      , text, transformers
@@ -84561,7 +84164,6 @@ self: {
        ];
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gi-gtkosxapplication" = callPackage
@@ -84947,14 +84549,14 @@ self: {
 
   "ginger" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , data-default, filepath, http-types, mtl, parsec, safe, scientific
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
-     , unordered-containers, utf8-string, vector
+     , data-default, filepath, http-types, mtl, parsec, process, safe
+     , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unordered-containers, utf8-string, vector, yaml
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.7.3.0";
-       sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs";
+       version = "0.8.0.1";
+       sha256 = "0ahd12y6qlnqi8wvhczn5hk2k7g48m6a0d2nxbvjx00iixs5dr34";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -84964,8 +84566,8 @@ self: {
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
-         aeson base bytestring data-default text transformers
-         unordered-containers
+         aeson base bytestring data-default process text transformers
+         unordered-containers yaml
        ];
        testHaskellDepends = [
          aeson base bytestring data-default mtl tasty tasty-hunit
@@ -85550,8 +85152,8 @@ self: {
      }:
      mkDerivation {
        pname = "githash";
-       version = "0.1.0.1";
-       sha256 = "03zc7vjlnrr7ix7cnpgi70s0znsi07ms60dci8baxbcmjbibdcgy";
+       version = "0.1.1.0";
+       sha256 = "14532rljfzlkcbqpi69wj31cqlzid0rwwy0kzlwvxp06zh8lq2a0";
        libraryHaskellDepends = [
          base bytestring directory filepath process template-haskell
        ];
@@ -90145,6 +89747,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphmod-plugin" = callPackage
+    ({ mkDerivation, base, containers, directory, dotgen, filepath, ghc
+     , syb, template-haskell
+     }:
+     mkDerivation {
+       pname = "graphmod-plugin";
+       version = "0.1.0.0";
+       sha256 = "0p95zr37mkvh7gsyj7wkzc3lqqbbkz7jh33jg123hz6qili2hziw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory dotgen filepath ghc syb template-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       description = "A reimplementation of graphmod as a source plugin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "graphql" = callPackage
     ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }:
      mkDerivation {
@@ -90541,28 +90161,6 @@ self: {
      }) {};
 
   "greskell-websocket" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
-     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
-     , unordered-containers, uuid, vector, websockets
-     }:
-     mkDerivation {
-       pname = "greskell-websocket";
-       version = "0.1.1.0";
-       sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13";
-       libraryHaskellDepends = [
-         aeson async base base64-bytestring bytestring greskell-core
-         hashtables safe-exceptions stm text unordered-containers uuid
-         vector websockets
-       ];
-       testHaskellDepends = [
-         aeson base bytestring greskell-core hspec unordered-containers uuid
-         vector
-       ];
-       description = "Haskell client for Gremlin Server using WebSocket serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "greskell-websocket_0_1_1_1" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , greskell-core, hashtables, hspec, safe-exceptions, stm, text
      , unordered-containers, uuid, vector, websockets
@@ -90582,7 +90180,6 @@ self: {
        ];
        description = "Haskell client for Gremlin Server using WebSocket serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grid" = callPackage
@@ -91471,6 +91068,8 @@ self: {
        pname = "gtk2hs-buildtools";
        version = "0.13.4.0";
        sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg";
+       revision = "1";
+       editedCabalFile = "0nbghg11y4nvxjxrvdm4a7fzj8z12fr12hkj4b7p27imlryg3m10";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -94073,43 +93672,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , file-embed, filepath, fsnotify, http-conduit, http-types
-     , lrucache, mtl, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
-     , resourcet, scientific, tagsoup, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, time-locale-compat
-     , unordered-containers, utillinux, vector, wai, wai-app-static
-     , warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.12.3.0";
-       sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory file-embed filepath
-         fsnotify http-conduit http-types lrucache mtl network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-tdfa resourcet scientific tagsoup text time
-         time-locale-compat unordered-containers vector wai wai-app-static
-         warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base bytestring containers filepath QuickCheck tasty tasty-hunit
-         tasty-quickcheck text unordered-containers yaml
-       ];
-       testToolDepends = [ utillinux ];
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_12_4_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptohash, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
@@ -94144,7 +93706,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -95049,32 +94610,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.10";
-       sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_6_0" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -95098,7 +94633,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -97365,18 +96899,6 @@ self: {
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.21.1";
-       sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_21_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -97386,7 +96908,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-gi-overloading_0_0" = callPackage
@@ -97533,17 +97054,6 @@ self: {
      }) {};
 
   "haskell-lexer" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "haskell-lexer";
-       version = "1.0.1";
-       sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
-       libraryHaskellDepends = [ base ];
-       description = "A fully compliant Haskell 98 lexer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-lexer_1_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskell-lexer";
@@ -97552,7 +97062,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp" = callPackage
@@ -98108,28 +97617,6 @@ self: {
      }) {};
 
   "haskell-src-exts" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, directory
-     , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
-     , tasty, tasty-golden, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts";
-       version = "1.20.2";
-       sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
-       revision = "1";
-       editedCabalFile = "0gxpxs3p4qvky6m8g3fjj09hx7nkg28b9a4999ca7afz359si3r9";
-       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
-       libraryToolDepends = [ happy ];
-       testHaskellDepends = [
-         base containers directory filepath mtl pretty-show smallcheck tasty
-         tasty-golden tasty-smallcheck
-       ];
-       doCheck = false;
-       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts_1_20_3" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath
      , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty
      , tasty-golden, tasty-smallcheck
@@ -98147,7 +97634,6 @@ self: {
        doCheck = false;
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-observe" = callPackage
@@ -100771,34 +100257,6 @@ self: {
      }) {};
 
   "haxl" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
-     , stm, test-framework, test-framework-hunit, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "haxl";
-       version = "2.0.1.0";
-       sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
-       revision = "1";
-       editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base binary bytestring containers deepseq exceptions filepath
-         ghc-prim hashable pretty stm text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers deepseq filepath hashable
-         HUnit test-framework test-framework-hunit text time
-         unordered-containers
-       ];
-       description = "A Haskell library for efficient, concurrent, and concise data access";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haxl_2_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
      , stm, test-framework, test-framework-hunit, text, time
@@ -100822,7 +100280,6 @@ self: {
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -102141,32 +101598,6 @@ self: {
      }) {};
 
   "hedgehog" = 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";
-       sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
-       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;
-     }) {};
-
-  "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
@@ -102192,7 +101623,6 @@ self: {
        ];
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -103315,6 +102745,53 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hevm" = callPackage
+    ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+     , base16-bytestring, base64-bytestring, binary, brick, bytestring
+     , cereal, containers, cryptonite, data-dword, deepseq, directory
+     , fgl, filepath, ghci-pretty, haskeline, here, HUnit, lens
+     , lens-aeson, megaparsec, memory, monad-par, mtl, multiset
+     , operational, optparse-generic, process, QuickCheck
+     , quickcheck-text, readline, regex-tdfa, restless-git, rosezipper
+     , s-cargot, scientific, secp256k1, tasty, tasty-hunit
+     , tasty-quickcheck, temporary, text, text-format, time
+     , transformers, tree-view, unordered-containers, vector, vty, wreq
+     }:
+     mkDerivation {
+       pname = "hevm";
+       version = "0.16";
+       sha256 = "0i55jw3xcnh48r81jfs6k5ffckar2p85l67n3x6lkz12q8iq8vkn";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         abstract-par aeson ansi-wl-pprint base base16-bytestring
+         base64-bytestring binary brick bytestring cereal containers
+         cryptonite data-dword deepseq directory fgl filepath ghci-pretty
+         haskeline lens lens-aeson megaparsec memory monad-par mtl multiset
+         operational optparse-generic process QuickCheck quickcheck-text
+         readline restless-git rosezipper s-cargot scientific temporary text
+         text-format time transformers tree-view unordered-containers vector
+         vty wreq
+       ];
+       librarySystemDepends = [ secp256k1 ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint async base base16-bytestring base64-bytestring
+         binary brick bytestring containers cryptonite data-dword deepseq
+         directory filepath ghci-pretty lens lens-aeson memory mtl
+         optparse-generic process QuickCheck quickcheck-text readline
+         regex-tdfa temporary text text-format unordered-containers vector
+         vty
+       ];
+       testHaskellDepends = [
+         base base16-bytestring binary bytestring ghci-pretty here HUnit
+         lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector
+       ];
+       testSystemDepends = [ secp256k1 ];
+       description = "Ethereum virtual machine evaluator";
+       license = stdenv.lib.licenses.agpl3;
+     }) {inherit (pkgs) secp256k1;};
+
   "hevolisa" = callPackage
     ({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }:
      mkDerivation {
@@ -104708,8 +104185,8 @@ self: {
        pname = "hills";
        version = "0.1.2.6";
        sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
-       revision = "1";
-       editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9";
+       revision = "2";
+       editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105593,12 +105070,12 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "1.4.0";
-       sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411";
-       revision = "1";
-       editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4";
+       version = "1.5.0";
+       sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y";
+       revision = "2";
+       editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi";
        libraryHaskellDepends = [
-         aeson base hashable QuickCheck text unordered-containers vector
+         aeson base hashable text unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base hspec http-types QuickCheck text unordered-containers
@@ -105771,55 +105248,54 @@ self: {
 
   "hledger" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat-batteries
-     , bytestring, cmdargs, containers, criterion, csv, data-default
-     , Decimal, Diff, directory, file-embed, filepath, hashable
-     , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl
+     , bytestring, cmdargs, containers, criterion, data-default, Decimal
+     , Diff, directory, easytest, file-embed, filepath, hashable
+     , haskeline, here, hledger-lib, html, lucid, megaparsec, mtl
      , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
-     , safe, shakespeare, split, tabular, temporary, terminfo
-     , test-framework, test-framework-hunit, text, time, timeit
-     , transformers, unordered-containers, utf8-string, utility-ht
-     , wizards
+     , safe, shakespeare, split, statistics, tabular, temporary
+     , terminfo, test-framework, test-framework-hunit, text, time
+     , timeit, transformers, unordered-containers, utf8-string
+     , utility-ht, wizards
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.10";
-       sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
-       revision = "1";
-       editedCabalFile = "1kj1by80j7f6rzwfccwl2cp53bb3lyivh8a8xnawdyxab1pkyz34";
+       version = "1.11";
+       sha256 = "1kkgvyf4vrj5dy41v4z7xbyxhnw79y1j18d46pldim7iq43643ji";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers csv data-default Decimal Diff directory file-embed
-         filepath hashable haskeline here hledger-lib HUnit lucid megaparsec
-         mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe
-         shakespeare split tabular temporary terminfo text time transformers
-         unordered-containers utf8-string utility-ht wizards
+         containers data-default Decimal Diff directory easytest file-embed
+         filepath hashable haskeline here hledger-lib lucid megaparsec mtl
+         mtl-compat old-time parsec pretty-show process regex-tdfa safe
+         shakespeare split statistics tabular temporary terminfo text time
+         transformers unordered-containers utf8-string utility-ht wizards
        ];
        executableHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers csv data-default Decimal directory file-embed filepath
-         haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
-         parsec pretty-show process regex-tdfa safe shakespeare split
-         tabular temporary terminfo text time transformers
+         containers data-default Decimal directory easytest file-embed
+         filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+         old-time parsec pretty-show process regex-tdfa safe shakespeare
+         split statistics tabular temporary terminfo text time transformers
          unordered-containers utf8-string utility-ht wizards
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers csv data-default Decimal directory file-embed filepath
-         haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
-         parsec pretty-show process regex-tdfa safe shakespeare split
-         tabular temporary terminfo test-framework test-framework-hunit text
-         time transformers unordered-containers utf8-string utility-ht
-         wizards
+         containers data-default Decimal directory easytest file-embed
+         filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+         old-time parsec pretty-show process regex-tdfa safe shakespeare
+         split statistics tabular temporary terminfo test-framework
+         test-framework-hunit text time transformers unordered-containers
+         utf8-string utility-ht wizards
        ];
        benchmarkHaskellDepends = [
          ansi-terminal base base-compat-batteries bytestring cmdargs
-         containers criterion csv data-default Decimal directory file-embed
-         filepath haskeline here hledger-lib html HUnit megaparsec mtl
+         containers criterion data-default Decimal directory easytest
+         file-embed filepath haskeline here hledger-lib html megaparsec mtl
          mtl-compat old-time parsec pretty-show process regex-tdfa safe
-         shakespeare split tabular temporary terminfo text time timeit
-         transformers unordered-containers utf8-string utility-ht wizards
+         shakespeare split statistics tabular temporary terminfo text time
+         timeit transformers unordered-containers utf8-string utility-ht
+         wizards
        ];
        description = "Command-line interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -105834,8 +105310,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.10";
-       sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf";
+       version = "1.11";
+       sha256 = "1a59i6gn70mk124mmzfk4wz464a9r6hni0cd8c04fgp1v9zsa3m1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105891,6 +105367,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.3.6";
        sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
+       revision = "1";
+       editedCabalFile = "067mrhg3m77ygv6cph5cxxcyd23acg9mq2fhpkl7714blc58z97v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105948,33 +105426,32 @@ self: {
 
   "hledger-lib" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
-     , blaze-markup, bytestring, cmdargs, containers, csv, data-default
-     , Decimal, deepseq, directory, doctest, easytest, extra, filepath
-     , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time
-     , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split
-     , tabular, test-framework, test-framework-hunit, text, time
+     , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
+     , cmdargs, containers, data-default, Decimal, deepseq, directory
+     , doctest, easytest, extra, filepath, Glob, hashtables, megaparsec
+     , mtl, mtl-compat, old-time, parsec, parser-combinators
+     , pretty-show, regex-tdfa, safe, split, tabular, text, time
      , transformers, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.10";
-       sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1";
-       revision = "1";
-       editedCabalFile = "1b6hj4w1qfh1q8c3ikx5sn8z70cfdmqi4iy3a3l64q4x1j4jgyic";
+       version = "1.11";
+       sha256 = "0zh0y41cxz6skazfbqb1hw5sqy0kvdciib8d4xa0ny9rx4sjjq6a";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
-         bytestring cmdargs containers csv data-default Decimal deepseq
-         directory extra filepath hashtables HUnit megaparsec mtl mtl-compat
-         old-time parsec parser-combinators pretty-show regex-tdfa safe
-         split tabular text time transformers uglymemo utf8-string
+         bytestring call-stack cassava cassava-megaparsec cmdargs containers
+         data-default Decimal deepseq directory easytest extra filepath Glob
+         hashtables megaparsec mtl mtl-compat old-time parsec
+         parser-combinators pretty-show regex-tdfa safe split tabular text
+         time transformers uglymemo utf8-string
        ];
        testHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
-         bytestring cmdargs containers csv data-default Decimal deepseq
-         directory doctest easytest extra filepath Glob hashtables HUnit
-         megaparsec mtl mtl-compat old-time parsec parser-combinators
-         pretty-show regex-tdfa safe split tabular test-framework
-         test-framework-hunit text time transformers uglymemo utf8-string
+         bytestring call-stack cassava cassava-megaparsec cmdargs containers
+         data-default Decimal deepseq directory doctest easytest extra
+         filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec
+         parser-combinators pretty-show regex-tdfa safe split tabular text
+         time transformers uglymemo utf8-string
        ];
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = stdenv.lib.licenses.gpl3;
@@ -105983,24 +105460,21 @@ self: {
   "hledger-ui" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
      , brick, cmdargs, containers, data-default, directory, filepath
-     , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens
+     , fsnotify, hledger, hledger-lib, megaparsec, microlens
      , microlens-platform, pretty-show, process, safe, split, text
      , text-zipper, time, transformers, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.10.1";
-       sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67";
-       revision = "1";
-       editedCabalFile = "1xvppxdkrk64mpqb64r016xshxqq25zzflbysmldgiqm1ibngy1g";
+       version = "1.11";
+       sha256 = "1szn9gx1s331axhg1m51s6v695skblx52fk0i0z03v2xkajn3y2r";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal async base base-compat-batteries brick cmdargs
          containers data-default directory filepath fsnotify hledger
-         hledger-lib HUnit megaparsec microlens microlens-platform
-         pretty-show process safe split text text-zipper time transformers
-         vector vty
+         hledger-lib megaparsec microlens microlens-platform pretty-show
+         process safe split text text-zipper time transformers vector vty
        ];
        description = "Curses-style user interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
@@ -106029,25 +105503,23 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , case-insensitive, clientsession, cmdargs, conduit, conduit-extra
      , data-default, directory, filepath, hjsmin, hledger, hledger-lib
-     , http-client, http-conduit, HUnit, json, megaparsec, mtl
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
-     , yesod, yesod-core, yesod-form, yesod-static
+     , http-client, http-conduit, json, megaparsec, mtl, semigroups
+     , shakespeare, template-haskell, text, time, transformers, wai
+     , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
+     , yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.10";
-       sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9";
-       revision = "1";
-       editedCabalFile = "0zzgc6mjia06fwvjwpzzczh0p9k0a6bi2lib6zq5k1briq4gqblm";
+       version = "1.11";
+       sha256 = "0di7imrlpgldbk4hjv5l3b80v5n9qfyjajz9qgfpr0f1d54l0rdn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring case-insensitive
          clientsession cmdargs conduit conduit-extra data-default directory
-         filepath hjsmin hledger hledger-lib http-client http-conduit HUnit
-         json megaparsec mtl semigroups shakespeare template-haskell text
-         time transformers wai wai-extra wai-handler-launch warp yaml yesod
+         filepath hjsmin hledger hledger-lib http-client http-conduit json
+         megaparsec mtl semigroups shakespeare template-haskell text time
+         transformers wai wai-extra wai-handler-launch warp yaml yesod
          yesod-core yesod-form yesod-static
        ];
        executableHaskellDepends = [ base ];
@@ -106325,6 +105797,8 @@ self: {
        pname = "hmatrix";
        version = "0.19.0.0";
        sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj";
+       revision = "1";
+       editedCabalFile = "0krx0ds5mcj28y6zpg0r50lljn8681wi4c5lqcdz2c71nhixfq8h";
        configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
        libraryHaskellDepends = [
          array base binary bytestring deepseq random semigroups split
@@ -109550,28 +109024,6 @@ self: {
      }) {};
 
   "hruby" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , process, QuickCheck, ruby, scientific, stm, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hruby";
-       version = "0.3.5.4";
-       sha256 = "17nm55xg6v71dp8cvaz9rp2siyywpynlxqxr1j44ciyw114h36vk";
-       setupHaskellDepends = [ base Cabal process ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring scientific stm text
-         unordered-containers vector
-       ];
-       librarySystemDepends = [ ruby ];
-       testHaskellDepends = [
-         aeson attoparsec base QuickCheck text vector
-       ];
-       description = "Embed a Ruby intepreter in your Haskell program !";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) ruby;};
-
-  "hruby_0_3_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , process, QuickCheck, ruby, scientific, stm, text
      , unordered-containers, vector
@@ -109591,7 +109043,6 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -111353,6 +110804,8 @@ self: {
        pname = "hsexif";
        version = "0.6.1.5";
        sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig";
+       revision = "1";
+       editedCabalFile = "1q5ppjq8b08ljccg5680h1kklr288wfz52vnmgpcf9hqjm3icgvb";
        libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -111363,6 +110816,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_1_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.1.6";
+       sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg";
+       revision = "1";
+       editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -111624,23 +111098,6 @@ self: {
      }) {};
 
   "hslogger" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, network
-     , old-locale, process, time, unix
-     }:
-     mkDerivation {
-       pname = "hslogger";
-       version = "1.2.10";
-       sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
-       revision = "1";
-       editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
-       libraryHaskellDepends = [
-         base containers directory mtl network old-locale process time unix
-       ];
-       description = "Versatile logging framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hslogger_1_2_12" = callPackage
     ({ mkDerivation, base, containers, directory, mtl, network
      , old-locale, process, time, unix
      }:
@@ -111653,7 +111110,6 @@ self: {
        ];
        description = "Versatile logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslogger-reader" = callPackage
@@ -111747,15 +111203,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
-  "hslua_1_0_0" = callPackage
+  "hslua_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
      , tasty, tasty-hunit, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "hslua";
-       version = "1.0.0";
-       sha256 = "0xd47h1f2y3k6qrhbadiczx58ykcsm66hbkwd022r6hd2hfqk34c";
+       version = "1.0.1";
+       sha256 = "185izqlvxn406y6frhjr4sk3lq2hcmfm11hyyrxqf5v9pnxp8kna";
        configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -112152,8 +111608,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsparql";
-       version = "0.3.5";
-       sha256 = "0557c81wgk930x2bq72f2f3kycanxxvk1s5nrfxn56lmgijzkkqz";
+       version = "0.3.6";
+       sha256 = "0hx1mwdww6i88g497i26qdg0dhw2a41qclvpgwq7rl2m5wshm9qp";
        libraryHaskellDepends = [
          base bytestring HTTP MissingH mtl network network-uri rdf4h text
          xml
@@ -112230,14 +111686,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_7" = callPackage
+  "hspec_2_5_8" = callPackage
     ({ mkDerivation, base, hspec-core, hspec-discover
      , hspec-expectations, QuickCheck
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.7";
-       sha256 = "1bbxj0bxxhwkzvxg31a8gjyan1px3kx9md4j0ba177g3mk2fnxxy";
+       version = "2.5.8";
+       sha256 = "061k4r1jlzcnl0mzvk5nvamw1bx36rs2a38958m2hlh2mmfnfnsr";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations QuickCheck
        ];
@@ -112345,7 +111801,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_7" = callPackage
+  "hspec-core_2_5_8" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112353,8 +111809,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.7";
-       sha256 = "0rlrc8q92jq3r6qf3bmyy8llz0dv9sdp0n169ni803wzlshaixsn";
+       version = "2.5.8";
+       sha256 = "08y6rhzc2vwmrxzl3bc8iwklkhgzv7x90mf9fnjnddlyaj7wcjg5";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112379,8 +111835,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-dirstream";
-       version = "1.0.0.0";
-       sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf";
+       version = "1.0.0.1";
+       sha256 = "17ac54ac21a5r954zvwxvn1j049q49m4ia7ghmdrcp94q3aczf4n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -112428,13 +111884,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_7" = callPackage
+  "hspec-discover_2_5_8" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.7";
-       sha256 = "042v6wmxw7dwak6wgr02af1majq6qr5migrp360cm3frjfkw22cx";
+       version = "2.5.8";
+       sha256 = "001i0ldxi88qcww2hh3mkdr6svw4kj23lf65camk9bgn5zwvq5aj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -112763,8 +112219,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-need-env";
-       version = "0.1.0.0";
-       sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+       version = "0.1.0.1";
+       sha256 = "1n364lzmiyb27wl88z8g0kpgsgcxa2hp45w1qxzasl2im4q8adv5";
        libraryHaskellDepends = [ base hspec-core hspec-expectations ];
        testHaskellDepends = [ base hspec hspec-core setenv transformers ];
        description = "Read environment variables for hspec tests";
@@ -115348,24 +114804,6 @@ self: {
      }) {};
 
   "http-types" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
-     , hspec, QuickCheck, quickcheck-instances, text
-     }:
-     mkDerivation {
-       pname = "http-types";
-       version = "0.12.1";
-       sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
-       libraryHaskellDepends = [
-         array base bytestring case-insensitive text
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec QuickCheck quickcheck-instances text
-       ];
-       description = "Generic HTTP types for Haskell (for both client and server code)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-types_0_12_2" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, doctest
      , hspec, QuickCheck, quickcheck-instances, text
      }:
@@ -115381,7 +114819,6 @@ self: {
        ];
        description = "Generic HTTP types for Haskell (for both client and server code)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-wget" = callPackage
@@ -115434,6 +114871,8 @@ self: {
        pname = "http2-client";
        version = "0.8.0.1";
        sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
+       revision = "1";
+       editedCabalFile = "190dhnj34b9xnpf6d3lj5a1fr90k2dy1l1i8505mp49lxzdvzkgc";
        libraryHaskellDepends = [
          async base bytestring containers deepseq http2 network stm time tls
        ];
@@ -116267,6 +115706,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hw-conduit-merges" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
+     , mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hw-conduit-merges";
+       version = "0.2.0.0";
+       sha256 = "1302b2dsvv8yazvq5vz9cs2fbqvdsh6zyprijb41g881riqa5klv";
+       revision = "1";
+       editedCabalFile = "1azji7zc0ygqjgd2shbqw7p8a2ll2qp3b1yq5i3665448brlwpvc";
+       libraryHaskellDepends = [ base conduit conduit-extra mtl ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-extra hspec mtl QuickCheck
+       ];
+       description = "Additional merges and joins for Conduit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-diagnostics" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -116691,29 +116148,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.6.2.15";
-       sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc";
-       libraryHaskellDepends = [
-         base bytestring mmap semigroups transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap semigroups transformers vector
-       ];
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_6_2_17" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
      , transformers, vector
@@ -116734,7 +116168,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -118065,6 +117498,8 @@ self: {
        pname = "hyraxAbif";
        version = "0.2.3.10";
        sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
+       revision = "1";
+       editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118196,8 +117631,8 @@ self: {
      }:
      mkDerivation {
        pname = "iCalendar";
-       version = "0.4.0.4";
-       sha256 = "1hgji4riaqjpsqi2c7i1md9p8ig4sfigmldllnpkwbbhwhzmnsq5";
+       version = "0.4.0.5";
+       sha256 = "1s1pnwbp6bnsyswrw4vz8hr33jrfd4xs8vnpvrh57a75jdskgsn0";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
@@ -121919,8 +121354,8 @@ self: {
        pname = "io-string-like";
        version = "0.1.0.1";
        sha256 = "0p8p4xp9qj7h1xa9dyizqpr85j8qjiccj3y9kplbskaqazl9pyqp";
-       revision = "1";
-       editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6";
+       revision = "2";
+       editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6";
        libraryHaskellDepends = [ base binary bytestring text ];
        description = "Classes to handle Prelude style IO functions for different datatypes";
        license = stdenv.lib.licenses.bsd3;
@@ -122307,26 +121742,6 @@ self: {
      }) {};
 
   "irc-client" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, containers
-     , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
-     , network-conduit-tls, old-locale, profunctors, stm, stm-chans
-     , text, time, tls, transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-client";
-       version = "1.1.0.4";
-       sha256 = "1ag1rmsk53v3j5r0raipfc6w9mfc21w92gbanjfdl5nzsr4fzh87";
-       libraryHaskellDepends = [
-         base bytestring conduit connection containers contravariant
-         exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
-         profunctors stm stm-chans text time tls transformers x509
-         x509-store x509-validation
-       ];
-       description = "An IRC client library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-client_1_1_0_5" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, containers
      , contravariant, exceptions, irc-conduit, irc-ctcp, mtl
      , network-conduit-tls, old-locale, profunctors, stm, stm-chans
@@ -122344,7 +121759,6 @@ self: {
        ];
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-colors" = callPackage
@@ -123437,6 +122851,8 @@ self: {
        pname = "ixset-typed";
        version = "0.4";
        sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
+       revision = "1";
+       editedCabalFile = "1ldf6bkm085idwp8a8ppxvyawii4gbhyw1pwrcyi3n8jpjh8hqcq";
        libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
@@ -123447,6 +122863,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ixset-typed_0_4_0_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
+     , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "ixset-typed";
+       version = "0.4.0.1";
+       sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8";
+       libraryHaskellDepends = [
+         base containers deepseq safecopy syb template-haskell
+       ];
+       testHaskellDepends = [
+         base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Efficient relational queries on Haskell sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ixshader" = callPackage
     ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec
      , prettyclass, singletons, template-haskell, text
@@ -126328,8 +125764,10 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.6.0.0";
-       sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3";
+       version = "0.6.1.0";
+       sha256 = "0mqx1dvq5v18sd2rqr2zlvmznj84vwml8zdf0hlhviw7kl9wjbah";
+       revision = "1";
+       editedCabalFile = "1znlk9jkrp3hl1frra563c61p49sp56nw1xps593w2qq9hr037rq";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -126361,8 +125799,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
-       version = "0.5.0.0";
-       sha256 = "1wvsk4lnkjpi38z7f9w8dafsw0cc1cgi8q2fsrqc0f7xv1qgzjb3";
+       version = "0.5.1.0";
+       sha256 = "0nl88srx0w7i7h14g97qxki91vbwg2ibkcqd4v39a7l7j0rzw0vh";
        libraryHaskellDepends = [
          aeson async base bloodhound bytestring enclosed-exceptions
          exceptions http-client http-types katip retry scientific semigroups
@@ -128898,26 +128336,6 @@ self: {
      }) {};
 
   "language-c" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
-     , directory, filepath, happy, pretty, process, syb
-     }:
-     mkDerivation {
-       pname = "language-c";
-       version = "0.8.1";
-       sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
-       revision = "2";
-       editedCabalFile = "08h8a747k68nbv2mmbjlq2y2pqs738v8z54glrrh94963b2bh4h1";
-       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;
-     }) {};
-
-  "language-c_0_8_2" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
      , directory, filepath, happy, pretty, process, syb
      }:
@@ -128935,7 +128353,6 @@ self: {
        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
@@ -129312,6 +128729,8 @@ self: {
        pname = "language-java";
        version = "0.2.9";
        sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x";
+       revision = "1";
+       editedCabalFile = "0fnbg9b8isyk8dpmggh736mms7a2m65956y1z15wds63imzhs2ik";
        libraryHaskellDepends = [ array base parsec pretty ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [
@@ -130757,18 +130176,6 @@ self: {
      }) {};
 
   "leancheck" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "leancheck";
-       version = "0.7.4";
-       sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base ];
-       description = "Enumerative property-based testing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "leancheck_0_7_5" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
@@ -130778,7 +130185,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Enumerative property-based testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -131243,21 +130649,6 @@ self: {
      }) {};
 
   "lens-family" = callPackage
-    ({ mkDerivation, base, containers, lens-family-core, mtl
-     , transformers
-     }:
-     mkDerivation {
-       pname = "lens-family";
-       version = "1.2.2";
-       sha256 = "0fs34wdhmfln06dnmgnbzgjiib6yb6z4ybcxqibal3amg7jlv8nx";
-       libraryHaskellDepends = [
-         base containers lens-family-core mtl transformers
-       ];
-       description = "Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-family_1_2_3" = callPackage
     ({ mkDerivation, base, containers, lens-family-core, mtl
      , transformers
      }:
@@ -131270,21 +130661,9 @@ self: {
        ];
        description = "Lens Families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-family-core" = callPackage
-    ({ mkDerivation, base, containers, transformers }:
-     mkDerivation {
-       pname = "lens-family-core";
-       version = "1.2.2";
-       sha256 = "0a26rbgwq9z7lp52zkvwz13sjd35hr06xxc6zz4sglpjc4dqkzlm";
-       libraryHaskellDepends = [ base containers transformers ];
-       description = "Haskell 98 Lens Families";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-family-core_1_2_3" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "lens-family-core";
@@ -131293,7 +130672,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 98 Lens Families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-family-th" = callPackage
@@ -132711,27 +132089,6 @@ self: {
      }) {};
 
   "lifted-async" = callPackage
-    ({ mkDerivation, async, base, constraints, criterion, deepseq
-     , HUnit, lifted-base, monad-control, mtl, tasty
-     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
-     }:
-     mkDerivation {
-       pname = "lifted-async";
-       version = "0.10.0.2";
-       sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
-       libraryHaskellDepends = [
-         async base constraints lifted-base monad-control transformers-base
-       ];
-       testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty
-         tasty-expected-failure tasty-hunit tasty-th
-       ];
-       benchmarkHaskellDepends = [ async base criterion deepseq ];
-       description = "Run lifted IO operations asynchronously and wait for their results";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-async_0_10_0_3" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty
      , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
@@ -132750,7 +132107,6 @@ self: {
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base" = callPackage
@@ -133294,17 +132650,12 @@ self: {
      }) {};
 
   "linear-socket" = callPackage
-    ({ mkDerivation, base, bytestring, hlint, hspec, network
-     , tasty-hspec
-     }:
+    ({ mkDerivation, base, bytestring, hspec, network, tasty-hspec }:
      mkDerivation {
        pname = "linear-socket";
-       version = "0.3.3.2";
-       sha256 = "1a3ddpay2wyl5bwlnysx037ca0x0bh93ingxl6c2wlxab351zm4h";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.3.3";
+       sha256 = "0bi2idqny1y5d63xhryxl085plc7w3ybk6fgj9xsp6scyxdx8p82";
        libraryHaskellDepends = [ base bytestring network ];
-       executableHaskellDepends = [ base hlint ];
        testHaskellDepends = [ base hspec network tasty-hspec ];
        description = "Typed sockets";
        license = stdenv.lib.licenses.gpl3;
@@ -134677,8 +134028,35 @@ self: {
        pname = "llvm-hs";
        version = "6.3.0";
        sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd";
-       revision = "1";
-       editedCabalFile = "01kmqdma80qzfpzikny0xm69q0ikv5fy3kw4p6mpg15kkypwmcpg";
+       revision = "2";
+       editedCabalFile = "08rm1y7icxp2bdmv65n5nxg5mkppqpqd3m62n50gk6991kki9qdf";
+       setupHaskellDepends = [ base Cabal containers ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers exceptions llvm-hs-pure
+         mtl template-haskell transformers utf8-string
+       ];
+       libraryToolDepends = [ llvm-config ];
+       testHaskellDepends = [
+         base bytestring containers llvm-hs-pure mtl pretty-show process
+         QuickCheck tasty tasty-hunit tasty-quickcheck temporary
+         transformers
+       ];
+       description = "General purpose LLVM bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {llvm-config = null;};
+
+  "llvm-hs_7_0_1" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+     , pretty-show, process, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, transformers
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "llvm-hs";
+       version = "7.0.1";
+       sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134736,6 +134114,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "llvm-hs-pure_7_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, fail
+     , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "llvm-hs-pure";
+       version = "7.0.0";
+       sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers fail mtl template-haskell
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers mtl tasty tasty-hunit tasty-quickcheck transformers
+       ];
+       description = "Pure Haskell LLVM functionality (no FFI)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "llvm-ht" = callPackage
     ({ mkDerivation, base, bytestring, directory, mtl, process
      , type-level
@@ -135567,6 +134966,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_3_3" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , prettyprinter, semigroups, stm, stm-delay, text, time
+     , transformers, transformers-base, unliftio-core
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.3.3";
+       sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl prettyprinter
+         semigroups stm stm-delay text time transformers transformers-base
+         unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         prettyprinter text time
+       ];
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, prettyprinter
@@ -138650,29 +138073,6 @@ self: {
      }) {};
 
   "markdown" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , call-stack, conduit, conduit-extra, containers, data-default
-     , directory, filepath, hspec, text, transformers, xml-conduit
-     , xml-types, xss-sanitize
-     }:
-     mkDerivation {
-       pname = "markdown";
-       version = "0.1.17.1";
-       sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup conduit conduit-extra
-         containers data-default text transformers xml-conduit xml-types
-         xss-sanitize
-       ];
-       testHaskellDepends = [
-         base blaze-html call-stack conduit conduit-extra containers
-         directory filepath hspec text transformers
-       ];
-       description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "markdown_0_1_17_4" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, call-stack, conduit, conduit-extra, containers
      , data-default, directory, filepath, hspec, text, transformers
@@ -138693,7 +138093,6 @@ self: {
        ];
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-kate" = callPackage
@@ -139038,24 +138437,6 @@ self: {
      }) {};
 
   "massiv" = callPackage
-    ({ mkDerivation, base, data-default, data-default-class, deepseq
-     , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
-     }:
-     mkDerivation {
-       pname = "massiv";
-       version = "0.2.0.0";
-       sha256 = "0jyripzh4da29bvbhrfmwvjicr22ll9vbd0f3wiv4gcmlpnhls9j";
-       libraryHaskellDepends = [
-         base data-default-class deepseq ghc-prim primitive vector
-       ];
-       testHaskellDepends = [
-         base data-default deepseq hspec QuickCheck safe-exceptions vector
-       ];
-       description = "Massiv (Массив) is an Array Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, data-default-class
      , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
      , vector
@@ -139074,7 +138455,6 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-io" = callPackage
@@ -140720,6 +140100,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_18" = callPackage
+    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
+     , ghc-prim
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.18";
+       sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
+       revision = "1";
+       editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm";
+       libraryHaskellDepends = [
+         base basement bytestring deepseq ghc-prim
+       ];
+       testHaskellDepends = [ base basement bytestring foundation ];
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -141385,6 +140784,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-contra_0_1_0_2" = callPackage
+    ({ mkDerivation, base, contravariant, microlens }:
+     mkDerivation {
+       pname = "microlens-contra";
+       version = "0.1.0.2";
+       sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
+       libraryHaskellDepends = [ base contravariant microlens ];
+       description = "True folds and getters for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-each" = callPackage
     ({ mkDerivation, base, microlens }:
      mkDerivation {
@@ -141449,8 +140860,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.4.2.2";
-       sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05";
+       version = "0.4.2.3";
+       sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
        libraryHaskellDepends = [
          base containers microlens template-haskell th-abstraction
          transformers
@@ -142641,6 +142052,8 @@ self: {
        pname = "mmark";
        version = "0.0.6.0";
        sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv";
+       revision = "1";
+       editedCabalFile = "0z9r6xjg6qpp2ai1wzkn0cvjw8dv6s94awsys6968ixmdzz9vrbz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -144947,12 +144360,12 @@ self: {
      }) {};
 
   "monopati" = callPackage
-    ({ mkDerivation, base, comonad, directory, free, split }:
+    ({ mkDerivation, base, free, split }:
      mkDerivation {
        pname = "monopati";
-       version = "0.1.0";
-       sha256 = "18bx5xy3d3mk47499anrl1xlmxb8g3l35ibyllkcqhsx822zk9ij";
-       libraryHaskellDepends = [ base comonad directory free split ];
+       version = "0.1.1";
+       sha256 = "0zpqhxq9vq7svkdrn8aph5i1f8kd9l8jgdg8lpj15c311qrz8cl5";
+       libraryHaskellDepends = [ base free split ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148402,6 +147815,8 @@ self: {
        pname = "natural";
        version = "0.3.0.2";
        sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+       revision = "1";
+       editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
        libraryHaskellDepends = [ base lens semigroupoids ];
        testHaskellDepends = [
          base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -149632,8 +149047,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.12";
-       sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd";
+       version = "1.0.13";
+       sha256 = "06cc62fns07flmsl9gbdicmqqg5icmy3m4n0nvp2xqjk1ax8ws39";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -150049,21 +149464,6 @@ self: {
      }) {};
 
   "network-simple" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, network
-     , safe-exceptions, transformers
-     }:
-     mkDerivation {
-       pname = "network-simple";
-       version = "0.4.2";
-       sha256 = "0h3xq0lv9wqczm93m81irqsirwsrw9jip11rxyghxrk4rf6pg4ip";
-       libraryHaskellDepends = [
-         base bytestring exceptions network safe-exceptions transformers
-       ];
-       description = "Simple network sockets usage patterns";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-simple_0_4_3" = callPackage
     ({ mkDerivation, base, bytestring, network, safe-exceptions, socks
      , transformers
      }:
@@ -150076,7 +149476,6 @@ self: {
        ];
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple-sockaddr" = callPackage
@@ -150096,23 +149495,6 @@ self: {
      }) {};
 
   "network-simple-tls" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, exceptions
-     , network, network-simple, tls, transformers, x509, x509-store
-     , x509-system, x509-validation
-     }:
-     mkDerivation {
-       pname = "network-simple-tls";
-       version = "0.3";
-       sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
-       libraryHaskellDepends = [
-         base bytestring data-default exceptions network network-simple tls
-         transformers x509 x509-store x509-system x509-validation
-       ];
-       description = "Simple interface to TLS secured network sockets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-simple-tls_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, data-default, network
      , network-simple, safe-exceptions, tls, transformers, x509
      , x509-store, x509-system, x509-validation
@@ -150127,7 +149509,6 @@ self: {
        ];
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-socket-options" = callPackage
@@ -151870,6 +151251,8 @@ self: {
        pname = "nowdoc";
        version = "0.1.1.0";
        sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg";
+       revision = "1";
+       editedCabalFile = "074xgrxs8ynq29bsx66an03q0457f80ga9jf4sqi0q34jgfpmbcv";
        libraryHaskellDepends = [ base bytestring template-haskell ];
        testHaskellDepends = [ base bytestring template-haskell ];
        description = "Here document without variable expansion like PHP Nowdoc";
@@ -152590,6 +151973,47 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "nvim-hs_1_0_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , containers, data-default, deepseq, directory, dyre, filepath
+     , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
+     , messagepack, mtl, network, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, process, QuickCheck, resourcet
+     , setenv, stm, streaming-commons, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base, unliftio
+     , unliftio-core, utf8-string, void
+     }:
+     mkDerivation {
+       pname = "nvim-hs";
+       version = "1.0.0.3";
+       sha256 = "07pnabrb9hs2l8ajrzcs3wz1m9vfq88wqjirf84ygmmnnd8dva71";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit containers
+         data-default deepseq directory dyre filepath foreign-store hslogger
+         megaparsec messagepack mtl network optparse-applicative
+         prettyprinter prettyprinter-ansi-terminal process resourcet setenv
+         stm streaming-commons template-haskell text time time-locale-compat
+         transformers transformers-base unliftio unliftio-core utf8-string
+         void
+       ];
+       executableHaskellDepends = [ base data-default ];
+       testHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit containers
+         data-default directory dyre filepath foreign-store hslogger hspec
+         hspec-discover HUnit megaparsec messagepack mtl network
+         optparse-applicative prettyprinter prettyprinter-ansi-terminal
+         process QuickCheck resourcet setenv stm streaming-commons
+         template-haskell text time time-locale-compat transformers
+         transformers-base unliftio unliftio-core utf8-string
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Haskell plugin backend for neovim";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nvim-hs-contrib" = callPackage
     ({ mkDerivation, base, bytestring, data-default, directory
      , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs
@@ -152707,6 +152131,32 @@ self: {
        pname = "o-clock";
        version = "1.0.0";
        sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
+       revision = "1";
+       editedCabalFile = "0df6b78y05q8pmlxyfpln01vkm0r38cay1ffsbz1biyfs6s115j5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ghc-prim ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
+         tasty-hspec type-spec
+       ];
+       testToolDepends = [ doctest markdown-unlit ];
+       benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
+       description = "Type-safe time library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "o-clock_1_0_0_1" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
+     , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
+     , tiempo, time-units, type-spec
+     }:
+     mkDerivation {
+       pname = "o-clock";
+       version = "1.0.0.1";
+       sha256 = "0nmv0zvhd2wd327q268xd8x9swb5v6pm5fn9p5zyn0khja38s6fr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim ];
@@ -153100,35 +152550,6 @@ self: {
          inherit (pkgs) systemd;};
 
   "odbc" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , formatting, hspec, optparse-applicative, parsec, QuickCheck
-     , semigroups, template-haskell, text, time, transformers, unixODBC
-     , unliftio-core, weigh
-     }:
-     mkDerivation {
-       pname = "odbc";
-       version = "0.2.0";
-       sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq formatting parsec
-         semigroups template-haskell text time transformers unliftio-core
-       ];
-       librarySystemDepends = [ unixODBC ];
-       executableHaskellDepends = [
-         base bytestring optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base bytestring hspec parsec QuickCheck text time
-       ];
-       benchmarkHaskellDepends = [ async base text weigh ];
-       description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) unixODBC;};
-
-  "odbc_0_2_2" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , formatting, hspec, optparse-applicative, parsec, QuickCheck
      , semigroups, template-haskell, text, time, transformers, unixODBC
@@ -153743,8 +153164,8 @@ self: {
        pname = "opaleye";
        version = "0.6.1.0";
        sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
-       revision = "1";
-       editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f";
+       revision = "2";
+       editedCabalFile = "07yn6xzynvjz9p6mv9kzh1sz05dqqsmihznba8s9q36lixlslyag";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -156169,7 +155590,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_3" = callPackage
+  "pandoc_2_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -156184,8 +155605,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.3";
-       sha256 = "0wyf0rc8macczrql8v1802hdifzk5nbwxzv42kxfx55qnwdil1av";
+       version = "2.3.1";
+       sha256 = "1wf38mqny53ygpaii0vfjrk0889ya7mlsi7hvvqjakjndcyqflbl";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -156227,10 +155648,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.14.3.1";
-       sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
-       revision = "1";
-       editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk";
+       version = "0.14.5";
+       sha256 = "0iiai5f2n8f29p52h4fflhngbh8fj9rrgwfz4nnfhjbrdc0irmz8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -156254,41 +155673,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_14_4" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.14.4";
-       sha256 = "00m81bwb0s0m7qm3b8xslwdyifdar2fzsnhjrxkqjlj8axdlb796";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath mtl pandoc
-         pandoc-types process temporary text yaml
-       ];
-       doCheck = false;
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -156520,6 +155904,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pandoc-pyplot" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , pandoc-types, temporary, typed-process
+     }:
+     mkDerivation {
+       pname = "pandoc-pyplot";
+       version = "1.0.0.0";
+       sha256 = "0dcrvzsg6h8pmrk1k3w12hsnh169n0ahlybpg8zhm4xbac5iafc7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath pandoc-types temporary
+         typed-process
+       ];
+       executableHaskellDepends = [ base pandoc-types ];
+       description = "A Pandoc filter for including figures generated from Matplotlib";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pandoc-sidenote" = callPackage
     ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
      mkDerivation {
@@ -157459,8 +156862,8 @@ self: {
      }:
      mkDerivation {
        pname = "paripari";
-       version = "0.4.0.0";
-       sha256 = "10pg179pcrrwl321xw7q9wyfpfkaczavhlgrmv2nqd2yxwmkgqdb";
+       version = "0.5.0.0";
+       sha256 = "0wk0b7vb3y2gs1sayd0sh5wa643q5vvc6s2cq9p1h8paxkhd3ypb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158025,8 +157428,8 @@ self: {
     ({ mkDerivation, base, doctest, hedgehog }:
      mkDerivation {
        pname = "partial-semigroup";
-       version = "0.3.0.3";
-       sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
+       version = "0.4.0.1";
+       sha256 = "0jfdybqxqrkxwbvscgy6q6vp32jp5h9xbyfykxbvsc64h02kn6gs";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
@@ -158038,8 +157441,8 @@ self: {
     ({ mkDerivation, base, hedgehog, partial-semigroup }:
      mkDerivation {
        pname = "partial-semigroup-hedgehog";
-       version = "0.3.0.1";
-       sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
+       version = "0.4.0.1";
+       sha256 = "1nvfy1cwp7qv77bm0ax3ll7jmqciasq9gsyyrghsx18y1q2d8qzp";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
@@ -158050,8 +157453,8 @@ self: {
     ({ mkDerivation, partial-semigroup-hedgehog }:
      mkDerivation {
        pname = "partial-semigroup-test";
-       version = "0.3.0.1";
-       sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n";
+       version = "0.4.0.1";
+       sha256 = "0p990b35wqy339mhlbcd0xh82rc4qyahzn4ndjyy1cv33cab7is7";
        libraryHaskellDepends = [ partial-semigroup-hedgehog ];
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
@@ -161811,22 +161214,6 @@ self: {
      }) {};
 
   "pipes-concurrency" = callPackage
-    ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
-     , void
-     }:
-     mkDerivation {
-       pname = "pipes-concurrency";
-       version = "2.0.11";
-       sha256 = "03h87b11c64yvj28lxgbvjvqrsx0zfqb92v0apd8ypb9xxabqd4m";
-       libraryHaskellDepends = [
-         async base contravariant pipes semigroups stm void
-       ];
-       testHaskellDepends = [ async base pipes stm ];
-       description = "Concurrency for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-concurrency_2_0_12" = callPackage
     ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
      , void
      }:
@@ -161834,13 +161221,14 @@ self: {
        pname = "pipes-concurrency";
        version = "2.0.12";
        sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
+       revision = "1";
+       editedCabalFile = "1c1rys2pp7a2z6si925ps610q8a38a6m26s182phwa5nfhyggpaw";
        libraryHaskellDepends = [
          async base contravariant pipes semigroups stm void
        ];
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -162390,8 +161778,8 @@ self: {
        pname = "pipes-safe";
        version = "2.2.9";
        sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
-       revision = "1";
-       editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
+       revision = "2";
+       editedCabalFile = "1crpzg72nahmffw468d31l23bw3wgi0p3w7ad2pv3jxhy1432c71";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -162400,6 +161788,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-safe_2_3_0" = callPackage
+    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+     , pipes, primitive, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-safe";
+       version = "2.3.0";
+       sha256 = "1b8cx8drwnviq2fic2ppldf774awih4wd0m1an0iv2x3l7ndy9jp";
+       libraryHaskellDepends = [
+         base containers exceptions monad-control mtl pipes primitive
+         transformers transformers-base
+       ];
+       description = "Safety for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-shell" = callPackage
     ({ mkDerivation, async, base, bytestring, directory, hspec, pipes
      , pipes-bytestring, pipes-safe, process, stm, stm-chans, text
@@ -164839,19 +164244,6 @@ self: {
      }) {};
 
   "postgresql-libpq" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
-     mkDerivation {
-       pname = "postgresql-libpq";
-       version = "0.9.4.1";
-       sha256 = "0ssn12cs643nd1bliaks0l0ssainydsrzjr3l5p7hm3wnqwa77qd";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base bytestring unix ];
-       librarySystemDepends = [ postgresql ];
-       description = "low-level binding to libpq";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) postgresql;};
-
-  "postgresql-libpq_0_9_4_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
      mkDerivation {
        pname = "postgresql-libpq";
@@ -164863,7 +164255,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "postgresql-named" = callPackage
@@ -165639,18 +165030,6 @@ self: {
      }) {};
 
   "pqueue" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "pqueue";
-       version = "1.4.1.1";
-       sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       description = "Reliable, persistent, fast priority queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pqueue_1_4_1_2" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "pqueue";
@@ -165660,7 +165039,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -166624,6 +166002,8 @@ self: {
        pname = "prim-array";
        version = "0.2.2";
        sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3";
+       revision = "1";
+       editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
@@ -168921,10 +168301,8 @@ self: {
      }:
      mkDerivation {
        pname = "pseudo-boolean";
-       version = "0.1.6.0";
-       sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
-       revision = "2";
-       editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
+       version = "0.1.7.0";
+       sha256 = "0y470jrqmc2k9j3zf2w2krjg3ial08v71bcq6zxh1g47iz4kszr7";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder containers deepseq
          dlist hashable megaparsec parsec void
@@ -169834,8 +169212,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "1.5.1.5";
-       sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
+       version = "1.5.1.6";
+       sha256 = "0i5lf3aniff8lnvgkl3mmy5xbjr130baz1h25p6q3asapirbj1k0";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite hashable
          http-client http-types memory text time transformers
@@ -176900,6 +176278,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "repline_0_2_0_0" = callPackage
+    ({ mkDerivation, base, containers, haskeline, mtl, process }:
+     mkDerivation {
+       pname = "repline";
+       version = "0.2.0.0";
+       sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc";
+       libraryHaskellDepends = [ base containers haskeline mtl process ];
+       description = "Haskeline wrapper for GHCi-like REPL interfaces";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "repo-based-blog" = callPackage
     ({ mkDerivation, base, blaze-html, containers, data-default
      , directory, dyre, filepath, filestore, hspec, hspec-discover
@@ -177780,15 +177170,15 @@ self: {
      }) {};
 
   "restless-git" = callPackage
-    ({ mkDerivation, base, bytestring, containers, HSH, tasty
+    ({ mkDerivation, base, bytestring, clock, containers, HSH, tasty
      , tasty-hunit, temporary, text, time
      }:
      mkDerivation {
        pname = "restless-git";
-       version = "0.5.0";
-       sha256 = "0rz3aqrlsyld6slxq9lbpf3ydngpkka6ksr4qbl9qq6f42hb0pwi";
+       version = "0.6";
+       sha256 = "1apg2vd6yw1m02i6fd2m2i6kw08dhds93ky7ncm4psj95wwkw2al";
        libraryHaskellDepends = [
-         base bytestring containers HSH text time
+         base bytestring clock containers HSH text time
        ];
        testHaskellDepends = [
          base bytestring containers tasty tasty-hunit temporary text
@@ -177890,8 +177280,8 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.25";
        sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
-       revision = "1";
-       editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
+       revision = "3";
+       editedCabalFile = "1g4shgl944fd3qbqkd68jv6vh65plaivci4vjzfs4py7a2p62db1";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
          old-locale scientific stm template-haskell text time
@@ -183642,14 +183032,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "selda_0_3_3_1" = callPackage
+  "selda_0_3_4_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
      , psqueues, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.3.3.1";
-       sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr";
+       version = "0.3.4.0";
+       sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj";
        libraryHaskellDepends = [
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
@@ -184079,8 +183469,8 @@ self: {
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.2.1.0";
-       sha256 = "0jmd7qgdwbyzck8x9i4acs9fx1ww26qr8s74raf0fv9bykynzyy2";
+       version = "0.2.1.1";
+       sha256 = "0s28qq6fk2zqzz6y76fa1ddrrmpax99mlkxhz89mw15hx04mnsjp";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers vector
        ];
@@ -184918,36 +184308,6 @@ self: {
      }) {};
 
   "servant-auth-server" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, bytestring-conversion, case-insensitive, cookie
-     , crypto-api, data-default-class, entropy, hspec, hspec-discover
-     , http-api-data, http-client, http-types, jose, lens, lens-aeson
-     , markdown-unlit, monad-time, mtl, QuickCheck, servant
-     , servant-auth, servant-server, tagged, text, time, transformers
-     , unordered-containers, wai, warp, wreq
-     }:
-     mkDerivation {
-       pname = "servant-auth-server";
-       version = "0.4.0.0";
-       sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         bytestring-conversion case-insensitive cookie crypto-api
-         data-default-class entropy http-api-data http-types jose lens
-         monad-time mtl servant servant-auth servant-server tagged text time
-         unordered-containers wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
-         servant-server time transformers wai warp wreq
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-server_0_4_0_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
      , crypto-api, data-default-class, entropy, hspec, hspec-discover
@@ -184960,6 +184320,8 @@ self: {
        pname = "servant-auth-server";
        version = "0.4.0.1";
        sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
+       revision = "1";
+       editedCabalFile = "0l35r80yf1i3hjwls9cvhmzrjkgxfs103qcb1m650y77w1h3xr9p";
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-builder bytestring
          bytestring-conversion case-insensitive cookie crypto-api
@@ -184975,7 +184337,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -185964,8 +185325,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-proto-lens";
-       version = "0.1.0.2";
-       sha256 = "1p97yp3x8lhdr9z33f0pdaxj1bqjqc36gs54j69laxfq2650v3nx";
+       version = "0.1.0.3";
+       sha256 = "0j85f64rjvkm2d487ahmg64x77iyldvdwyalbxw960sdv80mjavw";
        libraryHaskellDepends = [
          base bytestring http-media proto-lens servant
        ];
@@ -187885,31 +187246,6 @@ self: {
      }) {};
 
   "shakespeare" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
-     , process, scientific, template-haskell, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "shakespeare";
-       version = "2.0.15";
-       sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim parsec process scientific template-haskell text
-         time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers directory
-         exceptions ghc-prim hspec HUnit parsec process template-haskell
-         text time transformers
-       ];
-       description = "A toolkit for making compile-time interpolated templates";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "shakespeare_2_0_18" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -187931,7 +187267,6 @@ self: {
        ];
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -190142,17 +189477,6 @@ self: {
      }) {};
 
   "singleton-nats" = callPackage
-    ({ mkDerivation, base, singletons }:
-     mkDerivation {
-       pname = "singleton-nats";
-       version = "0.4.1";
-       sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss";
-       libraryHaskellDepends = [ base singletons ];
-       description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-nats_0_4_2" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
@@ -190161,7 +189485,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -193346,8 +192669,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.10";
-       sha256 = "0kq4xk1slgp2c7ik1gvpxwb0kxpwmxy943hxiq4g6bn5a1g3qis2";
+       version = "1.3.11";
+       sha256 = "078zbbhrpfb5a15vr2vjfxdyi1yabd07rg41ajvpcfqcwq4svw95";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -196502,6 +195825,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stacked-dag" = callPackage
+    ({ mkDerivation, base, containers, doctest, graphviz
+     , optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "stacked-dag";
+       version = "0.1.0.4";
+       sha256 = "067dbhap8aras9ixrmsaw961mlnq9fd3qyksfi8gj1zld0kxbp7k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers graphviz text ];
+       executableHaskellDepends = [
+         base containers graphviz optparse-applicative text
+       ];
+       testHaskellDepends = [ base containers doctest graphviz text ];
+       description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "staf" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -197447,31 +196789,6 @@ self: {
      }) {};
 
   "stm-conduit" = callPackage
-    ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
-     , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
-     , QuickCheck, resourcet, stm, stm-chans, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, transformers
-     , unliftio
-     }:
-     mkDerivation {
-       pname = "stm-conduit";
-       version = "4.0.0";
-       sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
-       libraryHaskellDepends = [
-         async base cereal cereal-conduit conduit conduit-extra directory
-         exceptions monad-loops resourcet stm stm-chans transformers
-         unliftio
-       ];
-       testHaskellDepends = [
-         base conduit directory doctest HUnit QuickCheck resourcet stm
-         stm-chans test-framework test-framework-hunit
-         test-framework-quickcheck2 transformers unliftio
-       ];
-       description = "Introduces conduits to channels, and promotes using conduits concurrently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm-conduit_4_0_1" = callPackage
     ({ mkDerivation, async, base, cereal, cereal-conduit, conduit
      , conduit-extra, directory, doctest, exceptions, HUnit, monad-loops
      , QuickCheck, resourcet, stm, stm-chans, test-framework
@@ -197494,7 +196811,6 @@ self: {
        ];
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-containers" = callPackage
@@ -197698,17 +197014,6 @@ self: {
      }) {};
 
   "stm-split" = callPackage
-    ({ mkDerivation, base, stm }:
-     mkDerivation {
-       pname = "stm-split";
-       version = "0.0.2";
-       sha256 = "01rqf5b75p3np5ym0am98mibmsw6vrqryad5nwjj9h5ci4wa81iw";
-       libraryHaskellDepends = [ base stm ];
-       description = "TMVars, TVars and TChans with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm-split_0_0_2_1" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-split";
@@ -197717,7 +197022,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-stats" = callPackage
@@ -200193,6 +199497,8 @@ self: {
        pname = "summoner";
        version = "1.1.0.1";
        sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
+       revision = "1";
+       editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202949,22 +202255,6 @@ self: {
      }) {};
 
   "tagsoup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , process, QuickCheck, text, time
-     }:
-     mkDerivation {
-       pname = "tagsoup";
-       version = "0.14.6";
-       sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       testHaskellDepends = [
-         base bytestring deepseq directory process QuickCheck time
-       ];
-       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tagsoup_0_14_7" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , process, QuickCheck, text, time
      }:
@@ -202978,7 +202268,6 @@ self: {
        ];
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -203777,8 +203066,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.5";
        sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
-       revision = "2";
-       editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2";
+       revision = "3";
+       editedCabalFile = "14198y7w9y4h36b6agzmsyappkhz4gmmi6nlzj137z5siwic7igm";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -203979,8 +203268,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.12";
-       sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+       version = "1.1.13";
+       sha256 = "1lf7i3ifszvghy0v1ahgif08bb1pgf7hhf147yr43d0r0hb2vrgp";
        libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
@@ -203990,29 +203279,6 @@ self: {
      }) {};
 
   "tasty-silver" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , deepseq, directory, filepath, mtl, optparse-applicative, process
-     , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
-     , tasty-hunit, temporary, text, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-silver";
-       version = "3.1.11";
-       sha256 = "1rvky2661s77wnm8c0jh0hkp3jjp5c1vndv9ilg4s47kw77708az";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring containers deepseq directory
-         filepath mtl optparse-applicative process process-extras regex-tdfa
-         semigroups stm tagged tasty temporary text
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary
-         transformers
-       ];
-       description = "A fancy test runner, including support for golden tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-silver_3_1_12" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
@@ -204033,7 +203299,6 @@ self: {
        ];
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -205215,8 +204480,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.2.1.1";
-       sha256 = "0kp6hwlki99aqi4dmm0xp26y9f6zqbxz4a9ch27nyfxg283jmsl1";
+       version = "0.3";
+       sha256 = "03y5s9c9n1mnij3yh5z4c69isg5cbpwczj5sjjvajqaaqf6xy5f3";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -205233,6 +204498,8 @@ self: {
        pname = "termbox";
        version = "0.1.0";
        sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+       revision = "1";
+       editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -205740,8 +205007,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-karya";
-       version = "0.0.2";
-       sha256 = "16vrpp8qilhfk47fmcvbvdjfgzjh878kn1d4cq0bacihkv79zmf3";
+       version = "0.0.3";
+       sha256 = "1z9zyva8cqrz04ckg7dny297jp5k961nk1l7pp9kz8z78pd7p19q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206091,10 +205358,10 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.11.1";
-       sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99";
+       version = "0.11.1.1";
+       sha256 = "1syvyiw84as79c76mssw1p4d3lrnghnwdyy4ip1w48qd07fadxf6";
        revision = "1";
-       editedCabalFile = "0szpd2kbwb9yqial0q583czy21dnkgyrhizmi7hp38kkhqp7vr9y";
+       editedCabalFile = "0740lpg42r0wdj9hm9gvnzrjka9mqpkzazx2s3qnliiigy39zk96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206305,6 +205572,8 @@ self: {
        pname = "text-format";
        version = "0.3.2";
        sha256 = "1qxs8xyjk8nzzzam62lqqml9s0p08m749jri0lfaa844mnw3frij";
+       revision = "1";
+       editedCabalFile = "155bddqabsxdfzdr7wl67qw9w777c2qkwxgjpx625875cvyhqkpa";
        libraryHaskellDepends = [
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
@@ -207824,33 +207093,6 @@ self: {
      }) {};
 
   "these" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, binary, containers
-     , data-default-class, deepseq, hashable, keys, mtl, profunctors
-     , QuickCheck, quickcheck-instances, semigroupoids, tasty
-     , tasty-quickcheck, transformers, transformers-compat
-     , unordered-containers, vector, vector-instances
-     }:
-     mkDerivation {
-       pname = "these";
-       version = "0.7.4";
-       sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
-       revision = "8";
-       editedCabalFile = "0j3ps7ngrzgxvkbr5gf8zkfkd1ci4dnfh425ndbr2xp9ipy00nkd";
-       libraryHaskellDepends = [
-         aeson base bifunctors binary containers data-default-class deepseq
-         hashable keys mtl profunctors QuickCheck semigroupoids transformers
-         transformers-compat unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors binary containers hashable QuickCheck
-         quickcheck-instances tasty tasty-quickcheck transformers
-         unordered-containers vector
-       ];
-       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "these_0_7_5" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, containers
      , data-default-class, deepseq, hashable, keys, mtl, profunctors
      , QuickCheck, quickcheck-instances, semigroupoids, tasty
@@ -207873,7 +207115,6 @@ self: {
        ];
        description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "these-skinny" = callPackage
@@ -209293,6 +208534,8 @@ self: {
        pname = "timer-wheel";
        version = "0.1.0";
        sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j";
+       revision = "1";
+       editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v";
        libraryHaskellDepends = [
          atomic-primops base ghc-prim primitive psqueues
        ];
@@ -210281,6 +209524,8 @@ self: {
        pname = "tomland";
        version = "0.3.1";
        sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw";
+       revision = "1";
+       editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210307,6 +209552,8 @@ self: {
        pname = "tomland";
        version = "0.4.0";
        sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr";
+       revision = "1";
+       editedCabalFile = "1d02r17m15s5z4xqyy05s515lbsqxc3kcipk25xvn24inz42qg4r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212576,29 +211823,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.10";
-       sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_11" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -212619,7 +211843,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -214173,6 +213396,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typelits-witnesses_0_3_0_3" = callPackage
+    ({ mkDerivation, base, constraints, reflection }:
+     mkDerivation {
+       pname = "typelits-witnesses";
+       version = "0.3.0.3";
+       sha256 = "078r9pbkzwzm1q821zqisj0wrx1rdk9w8c3ip0g1m5j97zzlmpaf";
+       libraryHaskellDepends = [ base constraints reflection ];
+       description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typenums" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
@@ -214385,27 +213620,6 @@ self: {
      }) {};
 
   "tzdata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
-     , test-framework, test-framework-hunit, test-framework-th, unix
-     , vector
-     }:
-     mkDerivation {
-       pname = "tzdata";
-       version = "0.1.20180122.0";
-       sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq vector
-       ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit
-         test-framework-th unix
-       ];
-       description = "Time zone database (as files and as a module)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "tzdata_0_1_20180501_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , test-framework, test-framework-hunit, test-framework-th, unix
      , vector
@@ -214424,7 +213638,6 @@ self: {
        ];
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "u2f" = callPackage
@@ -214557,6 +213770,8 @@ self: {
        pname = "udbus";
        version = "0.2.3";
        sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n";
+       revision = "1";
+       editedCabalFile = "036yscknrmc7dcm111bsjk7q0ghb6ih5b6z1ffsqf442dg83x8w7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -214830,6 +214045,8 @@ self: {
        pname = "unagi-chan";
        version = "0.4.1.0";
        sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb";
+       revision = "1";
+       editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p";
        libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
        testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
@@ -214903,8 +214120,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.3.3";
-       sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
+       version = "0.3.4";
+       sha256 = "01g8zhf9plgl3fcj57fkma3rkdwmh28rla3r1cr0bfmbd03q3fva";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers contravariant deepseq exceptions mtl
          profunctors template-haskell transformers transformers-compat
@@ -216135,28 +215352,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , process, stm, time, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.8.0";
-       sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5";
-       revision = "1";
-       editedCabalFile = "1l9hncv1pavdqyy1zmjfypqd23m243x5fiid7vh1rki71fdlh9z0";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath process stm time transformers
-         unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec process stm time
-         transformers unix unliftio-core
-       ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_8_1" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
      }:
@@ -216176,7 +215371,6 @@ self: {
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -219468,6 +218662,8 @@ self: {
        pname = "versions";
        version = "3.5.0";
        sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w";
+       revision = "1";
+       editedCabalFile = "13gb4n3bdkbgf199q3px7ihaqycbx76cb8isrs3qn16n67mx5b2f";
        libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
        testHaskellDepends = [
          base base-prelude checkers megaparsec microlens QuickCheck tasty
@@ -220697,23 +219893,22 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
+     , http-types, HUnit, iproute, network, old-locale, resourcet
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, void, wai, wai-logger, word8, zlib
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.24.2";
-       sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci";
+       version = "3.0.24.3";
+       sha256 = "0ff4mzxqj3h5zn27q9pq0q89x087dy072z24bczn4irry0zzks21";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base base64-bytestring bytestring
          case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
+         directory fast-logger http-types iproute network old-locale
+         resourcet streaming-commons text time transformers unix unix-compat
+         vault void wai wai-logger word8 zlib
        ];
        testHaskellDepends = [
          base bytestring case-insensitive cookie fast-logger hspec
@@ -221628,6 +220823,8 @@ self: {
        pname = "wai-middleware-travisci";
        version = "0.1.0";
        sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv";
+       revision = "1";
+       editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cryptonite http-types text
          transformers vault wai
@@ -223427,40 +222624,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.12.5.1";
-       sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy network
-         random SHA streaming-commons text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy HUnit
-         network QuickCheck random SHA streaming-commons test-framework
-         test-framework-hunit test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers criterion entropy
-         network random SHA text
-       ];
-       doCheck = false;
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_5_2" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -223492,7 +222655,6 @@ self: {
        doCheck = false;
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -223983,8 +223145,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.2.1";
-       sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
+       version = "0.1.2.2";
+       sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
        libraryHaskellDepends = [
          base containers semigroups text transformers
        ];
@@ -223995,14 +223157,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wild-bind_0_1_2_2" = callPackage
+  "wild-bind_0_1_2_3" = callPackage
     ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
      , semigroups, stm, text, transformers
      }:
      mkDerivation {
        pname = "wild-bind";
-       version = "0.1.2.2";
-       sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
+       version = "0.1.2.3";
+       sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12";
        libraryHaskellDepends = [
          base containers semigroups text transformers
        ];
@@ -224052,8 +223214,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.2.0.4";
-       sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
+       version = "0.2.0.5";
+       sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
        libraryHaskellDepends = [
          base containers fold-debounce mtl semigroups stm text transformers
          wild-bind X11
@@ -224065,14 +223227,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wild-bind-x11_0_2_0_5" = callPackage
+  "wild-bind-x11_0_2_0_6" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
      , semigroups, stm, text, time, transformers, wild-bind, X11
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.2.0.5";
-       sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
+       version = "0.2.0.6";
+       sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9";
        libraryHaskellDepends = [
          base containers fold-debounce mtl semigroups stm text transformers
          wild-bind X11
@@ -225879,29 +225041,6 @@ self: {
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
-     , tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "x509";
-       version = "1.7.3";
-       sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
-       revision = "1";
-       editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring containers
-         cryptonite hourglass memory mtl pem
-       ];
-       testHaskellDepends = [
-         asn1-types base bytestring cryptonite hourglass mtl tasty
-         tasty-quickcheck
-       ];
-       description = "X509 reader and writer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "x509_1_7_4" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, containers, cryptonite, hourglass, memory, mtl, pem
      , tasty, tasty-quickcheck
@@ -225910,6 +225049,8 @@ self: {
        pname = "x509";
        version = "1.7.4";
        sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717";
+       revision = "1";
+       editedCabalFile = "0p9zzzj118n8ymacj6yp7nkf22d09mj31wnzc1alq26w2ybcrifz";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring containers
          cryptonite hourglass memory mtl pem
@@ -225920,7 +225061,6 @@ self: {
        ];
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-store" = callPackage
@@ -226678,29 +225818,6 @@ self: {
      }) {};
 
   "xml-conduit" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , bytestring, conduit, conduit-extra, containers
-     , data-default-class, deepseq, hspec, HUnit, monad-control
-     , resourcet, text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.8.0";
-       sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup bytestring conduit
-         conduit-extra containers data-default-class deepseq monad-control
-         resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-conduit_1_8_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
@@ -226721,7 +225838,6 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -227460,8 +226576,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad";
-       version = "0.14.2";
-       sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949";
+       version = "0.15";
+       sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227509,10 +226625,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-contrib";
-       version = "0.14";
-       sha256 = "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y";
-       revision = "2";
-       editedCabalFile = "0412lfkq9y2s7avzm7ajx5fmyacqrad3yzv9cz9xp5dg66dn5h60";
+       version = "0.15";
+       sha256 = "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms";
        libraryHaskellDepends = [
          base bytestring containers directory extensible-exceptions filepath
          mtl old-locale old-time process random semigroups unix utf8-string
@@ -227651,13 +226765,12 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "2.0.0.0";
-       sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf";
+       version = "2.1.0.0";
+       sha256 = "1np1rq4rn7xm1wqj3bvb279xab7vv95vxhnnbrn6xjygzd7iblxx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          alsa-mixer base composition-prelude containers process X11 xmonad
-         xmonad-contrib
        ];
        executableHaskellDepends = [
          base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume
@@ -229306,6 +228419,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-auth-fb_1_9_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
+     , resourcet, shakespeare, text, time, transformers, unliftio, wai
+     , yesod-auth, yesod-core, yesod-fb
+     }:
+     mkDerivation {
+       pname = "yesod-auth-fb";
+       version = "1.9.1";
+       sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit fb http-conduit resourcet shakespeare
+         text time transformers unliftio wai yesod-auth yesod-core yesod-fb
+       ];
+       description = "Authentication backend for Yesod using Facebook";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-hashdb" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
@@ -230320,26 +229451,6 @@ self: {
      }) {};
 
   "yesod-paginator" = callPackage
-    ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
-     , persistent, safe, text, transformers, uri-encode, yesod-core
-     , yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-paginator";
-       version = "1.1.0.0";
-       sha256 = "03h9zpplsglblcdf0cm36i3kmmfbhk6iqwq2vsh8nw5ygizcqh0n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-markup path-pieces persistent safe text transformers
-         uri-encode yesod-core yesod-persistent
-       ];
-       testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
-       description = "A pagination approach for yesod";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-paginator_1_1_0_1" = callPackage
     ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
      , persistent, safe, text, transformers, uri-encode, yesod-core
      , yesod-test
@@ -230357,7 +229468,6 @@ self: {
        testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paypal-rest" = callPackage

From 8841b09c0f281e58bc67d8ce7f088f035ecfae97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Oct 2018 10:24:57 +0200
Subject: [PATCH 2266/3253] haskell-doctest: drop obsolete override for
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index dbe3bafc41b3..64cfd6ddb837 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -47,8 +47,6 @@ self: super: {
   # LTS-12.x versions do not compile.
   contravariant = self.contravariant_1_5;
   control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
-  doctest = self.doctest_0_16_0_1;
-  doctest_0_16_0_1 = dontCheck super.doctest_0_16_0_1;
   Glob = self.Glob_0_9_3;
   haddock-library = markBroken super.haddock-library;
   hslogger = self.hslogger_1_2_12;

From 8f400527a7dd7825942cb840a2e2adea261d7b62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Oct 2018 10:27:30 +0200
Subject: [PATCH 2267/3253] haskell-hspec: update ghc-8.6.x overrides for
 version 2.5.8

---
 .../haskell-modules/configuration-ghc-8.6.x.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 64cfd6ddb837..bf64f4ddaf94 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -50,12 +50,12 @@ self: super: {
   Glob = self.Glob_0_9_3;
   haddock-library = markBroken super.haddock-library;
   hslogger = self.hslogger_1_2_12;
-  hspec = self.hspec_2_5_7;
-  hspec-core = self.hspec-core_2_5_7;
-  hspec-core_2_5_7 = super.hspec-core_2_5_7.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
-  hspec-discover = self.hspec-discover_2_5_7;
+  hspec = self.hspec_2_5_8;
+  hspec-core = self.hspec-core_2_5_8;
+  hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_5; });
+  hspec-discover = self.hspec-discover_2_5_8;
   hspec-meta = self.hspec-meta_2_5_6;
-  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_4; });
+  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_5; });
   JuicyPixels = self.JuicyPixels_3_3_1;
   lens = dontCheck super.lens;    # avoid depending on broken polyparse
   polyparse = markBrokenVersion "1.12" super.polyparse;

From a4badb243c3382623c4541d4760b05307cc195f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Oct 2018 11:01:39 +0200
Subject: [PATCH 2268/3253] hledger: fix build of new version 1.11

---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 -------
 .../haskell-modules/configuration-hackage2nix.yaml         | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 40bd4a7f0c9a..e4dac4a88612 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -953,13 +953,6 @@ self: super: {
   # https://github.com/yesodweb/Shelly.hs/issues/162
   shelly = dontCheck super.shelly;
 
-  # https://github.com/simonmichael/hledger/issues/852
-  hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
-    url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
-    sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
-    stripLen = 1;
-  });
-
   # Copy hledger man pages from data directory into the proper place. This code
   # should be moved into the cabal2nix generator.
   hledger = overrideCabal super.hledger (drv: {
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cdc6a25f016a..aee9b8df8fa3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,6 +43,8 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
+  # Newer versions don't work in LTS-12.x
+  - cassava-megaparsec < 2
   # LTS Haskell 12.11
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3

From 2125e07024ba75dda187e607739f13c4b9537415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Tue, 2 Oct 2018 09:22:57 +0200
Subject: [PATCH 2269/3253] slic3r-prusa3d: comments on why we apply some
 patches

---
 pkgs/applications/misc/slic3r/prusa3d.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 9f4036c3f967..f871b07b85c9 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -73,7 +73,15 @@ stdenv.mkDerivation rec {
   ]);
 
   prePatch = ''
+    # In nix ioctls.h isn't available from the standard kernel-headers package
+    # on other distributions. As the copy in glibc seems to be identical to the
+    # one in the kernel, we use that one instead.
     sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
+
+    # PERL_VENDORARCH and PERL_VENDORLIB aren't detected correctly by the build
+    # system, so we have to override them. Setting them as environment variables
+    # doesn't work though, so patching the paths directly in the CMakeLists.txt
+    # seems to be the easisest way.
     sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
     sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
   '';

From 444e04b98571ad65269c8a988c4a9f772ca616a2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 15:59:00 -0400
Subject: [PATCH 2270/3253] nixpkgs docs: Rebuild manual-full if nested XML
 docs change

---
 doc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/Makefile b/doc/Makefile
index ba77be6678c4..173e1c0b19ee 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -69,7 +69,7 @@ highlightjs:
 	cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
 
 
-manual-full.xml: ${MD_TARGETS} .version *.xml
+manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
 .version:

From c07ba7c8560250d1b184698e6453b6d5ca11846f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 15:59:59 -0400
Subject: [PATCH 2271/3253] nixpkgs docs: Reformat

---
 doc/cross-compilation.xml          |   7 +-
 doc/functions/debug.xml            |  30 +-
 doc/functions/dockertools.xml      | 848 ++++++++++++++---------------
 doc/functions/fhs-environments.xml | 228 ++++----
 doc/functions/generators.xml       |  73 ++-
 doc/functions/overrides.xml        | 284 +++++-----
 doc/functions/shell.xml            |  21 +-
 doc/package-notes.xml              |  74 ++-
 8 files changed, 788 insertions(+), 777 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b3..da664394f262 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,9 +47,10 @@
 
    <para>
     In Nixpkgs, these three platforms are defined as attribute sets under the
-    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and
-    <literal>targetPlatform</literal>. They are always defined as attributes in
-    the standard environment. That means one can access them like:
+    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
+    and <literal>targetPlatform</literal>. They are always defined as
+    attributes in the standard environment. That means one can access them
+    like:
 <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
     .
    </para>
diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml
index 272bdf55513f..c6b3611eea53 100644
--- a/doc/functions/debug.xml
+++ b/doc/functions/debug.xml
@@ -2,20 +2,20 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-debug">
-  <title>Debugging Nix Expressions</title>
+ <title>Debugging Nix Expressions</title>
 
-  <para>
-   Nix is a unityped, dynamic language, this means every value can potentially
-   appear anywhere. Since it is also non-strict, evaluation order and what
-   ultimately is evaluated might surprise you. Therefore it is important to be
-   able to debug nix expressions.
-  </para>
+ <para>
+  Nix is a unityped, dynamic language, this means every value can potentially
+  appear anywhere. Since it is also non-strict, evaluation order and what
+  ultimately is evaluated might surprise you. Therefore it is important to be
+  able to debug nix expressions.
+ </para>
 
-  <para>
-   In the <literal>lib/debug.nix</literal> file you will find a number of
-   functions that help (pretty-)printing values while evaluation is runnnig.
-   You can even specify how deep these values should be printed recursively,
-   and transform them on the fly. Please consult the docstrings in
-   <literal>lib/debug.nix</literal> for usage information.
-  </para>
- </section>
+ <para>
+  In the <literal>lib/debug.nix</literal> file you will find a number of
+  functions that help (pretty-)printing values while evaluation is runnnig. You
+  can even specify how deep these values should be printed recursively, and
+  transform them on the fly. Please consult the docstrings in
+  <literal>lib/debug.nix</literal> for usage information.
+ </para>
+</section>
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
index 8bfdb3c68d7a..501f46a967c3 100644
--- a/doc/functions/dockertools.xml
+++ b/doc/functions/dockertools.xml
@@ -2,40 +2,40 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-pkgs-dockerTools">
-  <title>pkgs.dockerTools</title>
+ <title>pkgs.dockerTools</title>
+
+ <para>
+  <varname>pkgs.dockerTools</varname> is a set of functions for creating and
+  manipulating Docker images according to the
+  <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
+  Docker Image Specification v1.2.0 </link>. Docker itself is not used to
+  perform any of the operations done by these functions.
+ </para>
+
+ <warning>
+  <para>
+   The <varname>dockerTools</varname> API is unstable and may be subject to
+   backwards-incompatible changes in the future.
+  </para>
+ </warning>
+
+ <section xml:id="ssec-pkgs-dockerTools-buildImage">
+  <title>buildImage</title>
 
   <para>
-   <varname>pkgs.dockerTools</varname> is a set of functions for creating and
-   manipulating Docker images according to the
-   <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
-   Docker Image Specification v1.2.0 </link>. Docker itself is not used to
-   perform any of the operations done by these functions.
+   This function is analogous to the <command>docker build</command> command,
+   in that can used to build a Docker-compatible repository tarball containing
+   a single image with one or multiple layers. As such, the result is suitable
+   for being loaded in Docker with <command>docker load</command>.
   </para>
 
-  <warning>
-   <para>
-    The <varname>dockerTools</varname> API is unstable and may be subject to
-    backwards-incompatible changes in the future.
-   </para>
-  </warning>
+  <para>
+   The parameters of <varname>buildImage</varname> with relative example values
+   are described below:
+  </para>
 
-  <section xml:id="ssec-pkgs-dockerTools-buildImage">
-   <title>buildImage</title>
-
-   <para>
-    This function is analogous to the <command>docker build</command> command,
-    in that can used to build a Docker-compatible repository tarball containing
-    a single image with one or multiple layers. As such, the result is suitable
-    for being loaded in Docker with <command>docker load</command>.
-   </para>
-
-   <para>
-    The parameters of <varname>buildImage</varname> with relative example
-    values are described below:
-   </para>
-
-   <example xml:id='ex-dockerTools-buildImage'>
-    <title>Docker build</title>
+  <example xml:id='ex-dockerTools-buildImage'>
+   <title>Docker build</title>
 <programlisting>
 buildImage {
   name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
@@ -60,151 +60,150 @@ buildImage {
   };
 }
 </programlisting>
-   </example>
+  </example>
 
-   <para>
-    The above example will build a Docker image <literal>redis/latest</literal>
-    from the given base image. Loading and running this image in Docker results
-    in <literal>redis-server</literal> being started automatically.
-   </para>
+  <para>
+   The above example will build a Docker image <literal>redis/latest</literal>
+   from the given base image. Loading and running this image in Docker results
+   in <literal>redis-server</literal> being started automatically.
+  </para>
 
-   <calloutlist>
-    <callout arearefs='ex-dockerTools-buildImage-1'>
-     <para>
-      <varname>name</varname> specifies the name of the resulting image. This
-      is the only required argument for <varname>buildImage</varname>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-2'>
-     <para>
-      <varname>tag</varname> specifies the tag of the resulting image. By
-      default it's <literal>null</literal>, which indicates that the nix output
-      hash will be used as tag.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-3'>
-     <para>
-      <varname>fromImage</varname> is the repository tarball containing the
-      base image. It must be a valid Docker image, such as exported by
-      <command>docker save</command>. By default it's <literal>null</literal>,
-      which can be seen as equivalent to <literal>FROM scratch</literal> of a
-      <filename>Dockerfile</filename>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-4'>
-     <para>
-      <varname>fromImageName</varname> can be used to further specify the base
-      image within the repository, in case it contains multiple images. By
-      default it's <literal>null</literal>, in which case
-      <varname>buildImage</varname> will peek the first image available in the
-      repository.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-5'>
-     <para>
-      <varname>fromImageTag</varname> can be used to further specify the tag of
-      the base image within the repository, in case an image contains multiple
-      tags. By default it's <literal>null</literal>, in which case
-      <varname>buildImage</varname> will peek the first tag available for the
-      base image.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-6'>
-     <para>
-      <varname>contents</varname> is a derivation that will be copied in the
-      new layer of the resulting image. This can be similarly seen as
-      <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
-      By default it's <literal>null</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
-     <para>
-      <varname>runAsRoot</varname> is a bash script that will run as root in an
-      environment that overlays the existing layers of the base image with the
-      new resulting layer, including the previously copied
-      <varname>contents</varname> derivation. This can be similarly seen as
-      <command>RUN ...</command> in a <filename>Dockerfile</filename>.
-      <note>
-       <para>
-        Using this parameter requires the <literal>kvm</literal> device to be
-        available.
-       </para>
-      </note>
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-buildImage-8'>
-     <para>
-      <varname>config</varname> is used to specify the configuration of the
-      containers that will be started off the built image in Docker. The
-      available options are listed in the
-      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-      Docker Image Specification v1.2.0 </link>.
-     </para>
-    </callout>
-   </calloutlist>
-
-   <para>
-    After the new layer has been created, its closure (to which
-    <varname>contents</varname>, <varname>config</varname> and
-    <varname>runAsRoot</varname> contribute) will be copied in the layer
-    itself. Only new dependencies that are not already in the existing layers
-    will be copied.
-   </para>
-
-   <para>
-    At the end of the process, only one new single layer will be produced and
-    added to the resulting image.
-   </para>
-
-   <para>
-    The resulting repository will only list the single image
-    <varname>image/tag</varname>. In the case of
-    <xref linkend='ex-dockerTools-buildImage'/> it would be
-    <varname>redis/latest</varname>.
-   </para>
-
-   <para>
-    It is possible to inspect the arguments with which an image was built using
-    its <varname>buildArgs</varname> attribute.
-   </para>
-
-   <note>
+  <calloutlist>
+   <callout arearefs='ex-dockerTools-buildImage-1'>
     <para>
-     If you see errors similar to <literal>getProtocolByName: does not exist
-     (no such protocol name: tcp)</literal> you may need to add
-     <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
+     <varname>name</varname> specifies the name of the resulting image. This is
+     the only required argument for <varname>buildImage</varname>.
     </para>
-   </note>
-
-   <note>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-2'>
     <para>
-     If you see errors similar to <literal>Error_Protocol ("certificate has
-     unknown CA",True,UnknownCa)</literal> you may need to add
-     <literal>pkgs.cacert</literal> to <varname>contents</varname>.
+     <varname>tag</varname> specifies the tag of the resulting image. By
+     default it's <literal>null</literal>, which indicates that the nix output
+     hash will be used as tag.
     </para>
-   </note>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-3'>
+    <para>
+     <varname>fromImage</varname> is the repository tarball containing the base
+     image. It must be a valid Docker image, such as exported by
+     <command>docker save</command>. By default it's <literal>null</literal>,
+     which can be seen as equivalent to <literal>FROM scratch</literal> of a
+     <filename>Dockerfile</filename>.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-4'>
+    <para>
+     <varname>fromImageName</varname> can be used to further specify the base
+     image within the repository, in case it contains multiple images. By
+     default it's <literal>null</literal>, in which case
+     <varname>buildImage</varname> will peek the first image available in the
+     repository.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-5'>
+    <para>
+     <varname>fromImageTag</varname> can be used to further specify the tag of
+     the base image within the repository, in case an image contains multiple
+     tags. By default it's <literal>null</literal>, in which case
+     <varname>buildImage</varname> will peek the first tag available for the
+     base image.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-6'>
+    <para>
+     <varname>contents</varname> is a derivation that will be copied in the new
+     layer of the resulting image. This can be similarly seen as <command>ADD
+     contents/ /</command> in a <filename>Dockerfile</filename>. By default
+     it's <literal>null</literal>.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
+    <para>
+     <varname>runAsRoot</varname> is a bash script that will run as root in an
+     environment that overlays the existing layers of the base image with the
+     new resulting layer, including the previously copied
+     <varname>contents</varname> derivation. This can be similarly seen as
+     <command>RUN ...</command> in a <filename>Dockerfile</filename>.
+     <note>
+      <para>
+       Using this parameter requires the <literal>kvm</literal> device to be
+       available.
+      </para>
+     </note>
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-buildImage-8'>
+    <para>
+     <varname>config</varname> is used to specify the configuration of the
+     containers that will be started off the built image in Docker. The
+     available options are listed in the
+     <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+     Docker Image Specification v1.2.0 </link>.
+    </para>
+   </callout>
+  </calloutlist>
 
-   <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
-     <title>Impurely Defining a Docker Layer's Creation Date</title>
-     <para>
-       By default <function>buildImage</function> will use a static
-       date of one second past the UNIX Epoch. This allows
-       <function>buildImage</function> to produce binary reproducible
-       images. When listing images with <command>docker list
-       images</command>, the newly created images will be listed like
-       this:
-     </para>
-     <screen><![CDATA[
+  <para>
+   After the new layer has been created, its closure (to which
+   <varname>contents</varname>, <varname>config</varname> and
+   <varname>runAsRoot</varname> contribute) will be copied in the layer itself.
+   Only new dependencies that are not already in the existing layers will be
+   copied.
+  </para>
+
+  <para>
+   At the end of the process, only one new single layer will be produced and
+   added to the resulting image.
+  </para>
+
+  <para>
+   The resulting repository will only list the single image
+   <varname>image/tag</varname>. In the case of
+   <xref linkend='ex-dockerTools-buildImage'/> it would be
+   <varname>redis/latest</varname>.
+  </para>
+
+  <para>
+   It is possible to inspect the arguments with which an image was built using
+   its <varname>buildArgs</varname> attribute.
+  </para>
+
+  <note>
+   <para>
+    If you see errors similar to <literal>getProtocolByName: does not exist (no
+    such protocol name: tcp)</literal> you may need to add
+    <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
+   </para>
+  </note>
+
+  <note>
+   <para>
+    If you see errors similar to <literal>Error_Protocol ("certificate has
+    unknown CA",True,UnknownCa)</literal> you may need to add
+    <literal>pkgs.cacert</literal> to <varname>contents</varname>.
+   </para>
+  </note>
+
+  <example xml:id="example-pkgs-dockerTools-buildImage-creation-date">
+   <title>Impurely Defining a Docker Layer's Creation Date</title>
+   <para>
+    By default <function>buildImage</function> will use a static date of one
+    second past the UNIX Epoch. This allows <function>buildImage</function> to
+    produce binary reproducible images. When listing images with
+    <command>docker list images</command>, the newly created images will be
+    listed like this:
+   </para>
+<screen><![CDATA[
 $ docker image list
 REPOSITORY   TAG      IMAGE ID       CREATED        SIZE
 hello        latest   08c791c7846e   48 years ago   25.2MB
 ]]></screen>
-     <para>
-       You can break binary reproducibility but have a sorted,
-       meaningful <literal>CREATED</literal> column by setting
-       <literal>created</literal> to <literal>now</literal>.
-     </para>
-     <programlisting><![CDATA[
+   <para>
+    You can break binary reproducibility but have a sorted, meaningful
+    <literal>CREATED</literal> column by setting <literal>created</literal> to
+    <literal>now</literal>.
+   </para>
+<programlisting><![CDATA[
 pkgs.dockerTools.buildImage {
   name = "hello";
   tag = "latest";
@@ -214,206 +213,206 @@ pkgs.dockerTools.buildImage {
   config.Cmd = [ "/bin/hello" ];
 }
 ]]></programlisting>
-     <para>
-       and now the Docker CLI will display a reasonable date and
-       sort the images as expected:
-       <screen><![CDATA[
+   <para>
+    and now the Docker CLI will display a reasonable date and sort the images
+    as expected:
+<screen><![CDATA[
 $ docker image list
 REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
 hello        latest   de2bf4786de6   About a minute ago   25.2MB
 ]]></screen>
-       however, the produced images will not be binary reproducible.
-     </para>
-   </example>
-  </section>
+    however, the produced images will not be binary reproducible.
+   </para>
+  </example>
+ </section>
 
-  <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage">
-   <title>buildLayeredImage</title>
+ <section xml:id="ssec-pkgs-dockerTools-buildLayeredImage">
+  <title>buildLayeredImage</title>
+
+  <para>
+   Create a Docker image with many of the store paths being on their own layer
+   to improve sharing between images.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>name</varname>
+    </term>
+    <listitem>
+     <para>
+      The name of the resulting image.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>tag</varname> <emphasis>optional</emphasis>
+    </term>
+    <listitem>
+     <para>
+      Tag of the generated image.
+     </para>
+     <para>
+      <emphasis>Default:</emphasis> the output path's hash
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>contents</varname> <emphasis>optional</emphasis>
+    </term>
+    <listitem>
+     <para>
+      Top level paths in the container. Either a single derivation, or a list
+      of derivations.
+     </para>
+     <para>
+      <emphasis>Default:</emphasis> <literal>[]</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>config</varname> <emphasis>optional</emphasis>
+    </term>
+    <listitem>
+     <para>
+      Run-time configuration of the container. A full list of the options are
+      available at in the
+      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+      Docker Image Specification v1.2.0 </link>.
+     </para>
+     <para>
+      <emphasis>Default:</emphasis> <literal>{}</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>created</varname> <emphasis>optional</emphasis>
+    </term>
+    <listitem>
+     <para>
+      Date and time the layers were created. Follows the same
+      <literal>now</literal> exception supported by
+      <literal>buildImage</literal>.
+     </para>
+     <para>
+      <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>maxLayers</varname> <emphasis>optional</emphasis>
+    </term>
+    <listitem>
+     <para>
+      Maximum number of layers to create.
+     </para>
+     <para>
+      <emphasis>Default:</emphasis> <literal>24</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <section xml:id="dockerTools-buildLayeredImage-arg-contents">
+   <title>Behavior of <varname>contents</varname> in the final image</title>
 
    <para>
-    Create a Docker image with many of the store paths being on their own layer
-    to improve sharing between images.
+    Each path directly listed in <varname>contents</varname> will have a
+    symlink in the root of the image.
    </para>
 
-   <variablelist>
-    <varlistentry>
-     <term>
-      <varname>name</varname>
-     </term>
-     <listitem>
-      <para>
-       The name of the resulting image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>tag</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Tag of the generated image.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> the output path's hash
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>contents</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Top level paths in the container. Either a single derivation, or a list
-       of derivations.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>[]</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>config</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Run-time configuration of the container. A full list of the options are
-       available at in the
-       <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-       Docker Image Specification v1.2.0 </link>.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>{}</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>created</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Date and time the layers were created. Follows the same
-       <literal>now</literal> exception supported by
-       <literal>buildImage</literal>.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>1970-01-01T00:00:01Z</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <varname>maxLayers</varname> <emphasis>optional</emphasis>
-     </term>
-     <listitem>
-      <para>
-       Maximum number of layers to create.
-      </para>
-      <para>
-       <emphasis>Default:</emphasis> <literal>24</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-
-   <section xml:id="dockerTools-buildLayeredImage-arg-contents">
-    <title>Behavior of <varname>contents</varname> in the final image</title>
-
-    <para>
-     Each path directly listed in <varname>contents</varname> will have a
-     symlink in the root of the image.
-    </para>
-
-    <para>
-     For example:
+   <para>
+    For example:
 <programlisting><![CDATA[
 pkgs.dockerTools.buildLayeredImage {
   name = "hello";
   contents = [ pkgs.hello ];
 }
 ]]></programlisting>
-     will create symlinks for all the paths in the <literal>hello</literal>
-     package:
+    will create symlinks for all the paths in the <literal>hello</literal>
+    package:
 <screen><![CDATA[
 /bin/hello -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
 /share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
 /share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
 ]]></screen>
-    </para>
-   </section>
+   </para>
+  </section>
 
-   <section xml:id="dockerTools-buildLayeredImage-arg-config">
-    <title>Automatic inclusion of <varname>config</varname> references</title>
+  <section xml:id="dockerTools-buildLayeredImage-arg-config">
+   <title>Automatic inclusion of <varname>config</varname> references</title>
 
-    <para>
-     The closure of <varname>config</varname> is automatically included in the
-     closure of the final image.
-    </para>
+   <para>
+    The closure of <varname>config</varname> is automatically included in the
+    closure of the final image.
+   </para>
 
-    <para>
-     This allows you to make very simple Docker images with very little code.
-     This container will start up and run <command>hello</command>:
+   <para>
+    This allows you to make very simple Docker images with very little code.
+    This container will start up and run <command>hello</command>:
 <programlisting><![CDATA[
 pkgs.dockerTools.buildLayeredImage {
   name = "hello";
   config.Cmd = [ "${pkgs.hello}/bin/hello" ];
 }
 ]]></programlisting>
-    </para>
-   </section>
-
-   <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers">
-    <title>Adjusting <varname>maxLayers</varname></title>
-
-    <para>
-     Increasing the <varname>maxLayers</varname> increases the number of layers
-     which have a chance to be shared between different images.
-    </para>
-
-    <para>
-     Modern Docker installations support up to 128 layers, however older
-     versions support as few as 42.
-    </para>
-
-    <para>
-     If the produced image will not be extended by other Docker builds, it is
-     safe to set <varname>maxLayers</varname> to <literal>128</literal>.
-     However it will be impossible to extend the image further.
-    </para>
-
-    <para>
-     The first (<literal>maxLayers-2</literal>) most "popular" paths will have
-     their own individual layers, then layer #<literal>maxLayers-1</literal>
-     will contain all the remaining "unpopular" paths, and finally layer
-     #<literal>maxLayers</literal> will contain the Image configuration.
-    </para>
-
-    <para>
-     Docker's Layers are not inherently ordered, they are content-addressable
-     and are not explicitly layered until they are composed in to an Image.
-    </para>
-   </section>
+   </para>
   </section>
 
-  <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
-   <title>pullImage</title>
+  <section xml:id="dockerTools-buildLayeredImage-arg-maxLayers">
+   <title>Adjusting <varname>maxLayers</varname></title>
 
    <para>
-    This function is analogous to the <command>docker pull</command> command,
-    in that can be used to pull a Docker image from a Docker registry. By
-    default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
-    used to pull images.
+    Increasing the <varname>maxLayers</varname> increases the number of layers
+    which have a chance to be shared between different images.
    </para>
 
    <para>
-    Its parameters are described in the example below:
+    Modern Docker installations support up to 128 layers, however older
+    versions support as few as 42.
    </para>
 
-   <example xml:id='ex-dockerTools-pullImage'>
-    <title>Docker pull</title>
+   <para>
+    If the produced image will not be extended by other Docker builds, it is
+    safe to set <varname>maxLayers</varname> to <literal>128</literal>. However
+    it will be impossible to extend the image further.
+   </para>
+
+   <para>
+    The first (<literal>maxLayers-2</literal>) most "popular" paths will have
+    their own individual layers, then layer #<literal>maxLayers-1</literal>
+    will contain all the remaining "unpopular" paths, and finally layer
+    #<literal>maxLayers</literal> will contain the Image configuration.
+   </para>
+
+   <para>
+    Docker's Layers are not inherently ordered, they are content-addressable
+    and are not explicitly layered until they are composed in to an Image.
+   </para>
+  </section>
+ </section>
+
+ <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
+  <title>pullImage</title>
+
+  <para>
+   This function is analogous to the <command>docker pull</command> command, in
+   that can be used to pull a Docker image from a Docker registry. By default
+   <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used to pull
+   images.
+  </para>
+
+  <para>
+   Its parameters are described in the example below:
+  </para>
+
+  <example xml:id='ex-dockerTools-pullImage'>
+   <title>Docker pull</title>
 <programlisting>
 pullImage {
   imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
@@ -424,86 +423,86 @@ pullImage {
   arch = "x86_64"; <co xml:id='ex-dockerTools-pullImage-6' />
 }
 </programlisting>
-   </example>
+  </example>
 
-   <calloutlist>
-    <callout arearefs='ex-dockerTools-pullImage-1'>
-     <para>
-      <varname>imageName</varname> specifies the name of the image to be
-      downloaded, which can also include the registry namespace (e.g.
-      <literal>nixos</literal>). This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-2'>
-     <para>
-      <varname>imageDigest</varname> specifies the digest of the image to be
-      downloaded. Skopeo can be used to get the digest of an image, with its
-      <varname>inspect</varname> subcommand. Since a given
-      <varname>imageName</varname> may transparently refer to a manifest list
-      of images which support multiple architectures and/or operating systems,
-      supply the `--override-os` and `--override-arch` arguments to specify
-      exactly which image you want. By default it will match the OS and
-      architecture of the host the command is run on.
+  <calloutlist>
+   <callout arearefs='ex-dockerTools-pullImage-1'>
+    <para>
+     <varname>imageName</varname> specifies the name of the image to be
+     downloaded, which can also include the registry namespace (e.g.
+     <literal>nixos</literal>). This argument is required.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-pullImage-2'>
+    <para>
+     <varname>imageDigest</varname> specifies the digest of the image to be
+     downloaded. Skopeo can be used to get the digest of an image, with its
+     <varname>inspect</varname> subcommand. Since a given
+     <varname>imageName</varname> may transparently refer to a manifest list of
+     images which support multiple architectures and/or operating systems,
+     supply the `--override-os` and `--override-arch` arguments to specify
+     exactly which image you want. By default it will match the OS and
+     architecture of the host the command is run on.
 <programlisting>
 $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
 sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
 </programlisting>
-      This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-3'>
-     <para>
-      <varname>finalImageTag</varname>, if specified, this is the tag of the
-      image to be created. Note it is never used to fetch the image since we
-      prefer to rely on the immutable digest ID. By default it's
-      <literal>latest</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-4'>
-     <para>
-      <varname>sha256</varname> is the checksum of the whole fetched image.
-      This argument is required.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-5'>
-     <para>
-      <varname>os</varname>, if specified, is the operating system of the
-      fetched image. By default it's <literal>linux</literal>.
-     </para>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-6'>
-     <para>
-      <varname>arch</varname>, if specified, is the cpu architecture of the
-      fetched image. By default it's <literal>x86_64</literal>.
-     </para>
-    </callout>
-   </calloutlist>
-  </section>
-
-  <section xml:id="ssec-pkgs-dockerTools-exportImage">
-   <title>exportImage</title>
-
-   <para>
-    This function is analogous to the <command>docker export</command> command,
-    in that can used to flatten a Docker image that contains multiple layers.
-    It is in fact the result of the merge of all the layers of the image. As
-    such, the result is suitable for being imported in Docker with
-    <command>docker import</command>.
-   </para>
-
-   <note>
-    <para>
-     Using this function requires the <literal>kvm</literal> device to be
-     available.
+     This argument is required.
     </para>
-   </note>
+   </callout>
+   <callout arearefs='ex-dockerTools-pullImage-3'>
+    <para>
+     <varname>finalImageTag</varname>, if specified, this is the tag of the
+     image to be created. Note it is never used to fetch the image since we
+     prefer to rely on the immutable digest ID. By default it's
+     <literal>latest</literal>.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-pullImage-4'>
+    <para>
+     <varname>sha256</varname> is the checksum of the whole fetched image. This
+     argument is required.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-pullImage-5'>
+    <para>
+     <varname>os</varname>, if specified, is the operating system of the
+     fetched image. By default it's <literal>linux</literal>.
+    </para>
+   </callout>
+   <callout arearefs='ex-dockerTools-pullImage-6'>
+    <para>
+     <varname>arch</varname>, if specified, is the cpu architecture of the
+     fetched image. By default it's <literal>x86_64</literal>.
+    </para>
+   </callout>
+  </calloutlist>
+ </section>
 
+ <section xml:id="ssec-pkgs-dockerTools-exportImage">
+  <title>exportImage</title>
+
+  <para>
+   This function is analogous to the <command>docker export</command> command,
+   in that can used to flatten a Docker image that contains multiple layers. It
+   is in fact the result of the merge of all the layers of the image. As such,
+   the result is suitable for being imported in Docker with <command>docker
+   import</command>.
+  </para>
+
+  <note>
    <para>
-    The parameters of <varname>exportImage</varname> are the following:
+    Using this function requires the <literal>kvm</literal> device to be
+    available.
    </para>
+  </note>
 
-   <example xml:id='ex-dockerTools-exportImage'>
-    <title>Docker export</title>
+  <para>
+   The parameters of <varname>exportImage</varname> are the following:
+  </para>
+
+  <example xml:id='ex-dockerTools-exportImage'>
+   <title>Docker export</title>
 <programlisting>
 exportImage {
   fromImage = someLayeredImage;
@@ -513,34 +512,33 @@ exportImage {
   name = someLayeredImage.name;
 }
   </programlisting>
-   </example>
+  </example>
 
-   <para>
-    The parameters relative to the base image have the same synopsis as
-    described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except
-    that <varname>fromImage</varname> is the only required argument in this
-    case.
-   </para>
+  <para>
+   The parameters relative to the base image have the same synopsis as
+   described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that
+   <varname>fromImage</varname> is the only required argument in this case.
+  </para>
 
-   <para>
-    The <varname>name</varname> argument is the name of the derivation output,
-    which defaults to <varname>fromImage.name</varname>.
-   </para>
-  </section>
+  <para>
+   The <varname>name</varname> argument is the name of the derivation output,
+   which defaults to <varname>fromImage.name</varname>.
+  </para>
+ </section>
 
-  <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
-   <title>shadowSetup</title>
+ <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
+  <title>shadowSetup</title>
 
-   <para>
-    This constant string is a helper for setting up the base files for managing
-    users and groups, only if such files don't exist already. It is suitable
-    for being used in a <varname>runAsRoot</varname>
-    <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
-    in the example below:
-   </para>
+  <para>
+   This constant string is a helper for setting up the base files for managing
+   users and groups, only if such files don't exist already. It is suitable for
+   being used in a <varname>runAsRoot</varname>
+   <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
+   in the example below:
+  </para>
 
-   <example xml:id='ex-dockerTools-shadowSetup'>
-    <title>Shadow base files</title>
+  <example xml:id='ex-dockerTools-shadowSetup'>
+   <title>Shadow base files</title>
 <programlisting>
 buildImage {
   name = "shadow-basic";
@@ -555,12 +553,12 @@ buildImage {
   '';
 }
 </programlisting>
-   </example>
+  </example>
 
-   <para>
-    Creating base files like <literal>/etc/passwd</literal> or
-    <literal>/etc/login.defs</literal> are necessary for shadow-utils to
-    manipulate users and groups.
-   </para>
-  </section>
+  <para>
+   Creating base files like <literal>/etc/passwd</literal> or
+   <literal>/etc/login.defs</literal> are necessary for shadow-utils to
+   manipulate users and groups.
+  </para>
  </section>
+</section>
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml
index bfe0db522a1d..79682080be31 100644
--- a/doc/functions/fhs-environments.xml
+++ b/doc/functions/fhs-environments.xml
@@ -2,116 +2,114 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-fhs-environments">
-  <title>buildFHSUserEnv</title>
+ <title>buildFHSUserEnv</title>
 
-  <para>
-   <function>buildFHSUserEnv</function> provides a way to build and run
-   FHS-compatible lightweight sandboxes. It creates an isolated root with bound
-   <filename>/nix/store</filename>, so its footprint in terms of disk space
-   needed is quite small. This allows one to run software which is hard or
-   unfeasible to patch for NixOS -- 3rd-party source trees with FHS
-   assumptions, games distributed as tarballs, software with integrity checking
-   and/or external self-updated binaries. It uses Linux namespaces feature to
-   create temporary lightweight environments which are destroyed after all
-   child processes exit, without root user rights requirement. Accepted
-   arguments are:
-  </para>
+ <para>
+  <function>buildFHSUserEnv</function> provides a way to build and run
+  FHS-compatible lightweight sandboxes. It creates an isolated root with bound
+  <filename>/nix/store</filename>, so its footprint in terms of disk space
+  needed is quite small. This allows one to run software which is hard or
+  unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
+  games distributed as tarballs, software with integrity checking and/or
+  external self-updated binaries. It uses Linux namespaces feature to create
+  temporary lightweight environments which are destroyed after all child
+  processes exit, without root user rights requirement. Accepted arguments are:
+ </para>
 
-  <variablelist>
-   <varlistentry>
-    <term>
-     <literal>name</literal>
-    </term>
-    <listitem>
-     <para>
-      Environment name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>targetPkgs</literal>
-    </term>
-    <listitem>
-     <para>
-      Packages to be installed for the main host's architecture (i.e. x86_64 on
-      x86_64 installations). Along with libraries binaries are also installed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>multiPkgs</literal>
-    </term>
-    <listitem>
-     <para>
-      Packages to be installed for all architectures supported by a host (i.e.
-      i686 and x86_64 on x86_64 installations). Only libraries are installed by
-      default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraBuildCommands</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional commands to be executed for finalizing the directory
-      structure.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraBuildCommandsMulti</literal>
-    </term>
-    <listitem>
-     <para>
-      Like <literal>extraBuildCommands</literal>, but executed only on multilib
-      architectures.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraOutputsToInstall</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional derivation outputs to be linked for both target and
-      multi-architecture packages.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>extraInstallCommands</literal>
-    </term>
-    <listitem>
-     <para>
-      Additional commands to be executed for finalizing the derivation with
-      runner script.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <literal>runScript</literal>
-    </term>
-    <listitem>
-     <para>
-      A command that would be executed inside the sandbox and passed all the
-      command line arguments. It defaults to <literal>bash</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
+ <variablelist>
+  <varlistentry>
+   <term>
+    <literal>name</literal>
+   </term>
+   <listitem>
+    <para>
+     Environment name.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>targetPkgs</literal>
+   </term>
+   <listitem>
+    <para>
+     Packages to be installed for the main host's architecture (i.e. x86_64 on
+     x86_64 installations). Along with libraries binaries are also installed.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>multiPkgs</literal>
+   </term>
+   <listitem>
+    <para>
+     Packages to be installed for all architectures supported by a host (i.e.
+     i686 and x86_64 on x86_64 installations). Only libraries are installed by
+     default.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>extraBuildCommands</literal>
+   </term>
+   <listitem>
+    <para>
+     Additional commands to be executed for finalizing the directory structure.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>extraBuildCommandsMulti</literal>
+   </term>
+   <listitem>
+    <para>
+     Like <literal>extraBuildCommands</literal>, but executed only on multilib
+     architectures.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>extraOutputsToInstall</literal>
+   </term>
+   <listitem>
+    <para>
+     Additional derivation outputs to be linked for both target and
+     multi-architecture packages.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>extraInstallCommands</literal>
+   </term>
+   <listitem>
+    <para>
+     Additional commands to be executed for finalizing the derivation with
+     runner script.
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>
+    <literal>runScript</literal>
+   </term>
+   <listitem>
+    <para>
+     A command that would be executed inside the sandbox and passed all the
+     command line arguments. It defaults to <literal>bash</literal>.
+    </para>
+   </listitem>
+  </varlistentry>
+ </variablelist>
 
-  <para>
-   One can create a simple environment using a <literal>shell.nix</literal>
-   like that:
-  </para>
+ <para>
+  One can create a simple environment using a <literal>shell.nix</literal> like
+  that:
+ </para>
 
 <programlisting><![CDATA[
 { pkgs ? import <nixpkgs> {} }:
@@ -134,11 +132,11 @@
 }).env
 ]]></programlisting>
 
-  <para>
-   Running <literal>nix-shell</literal> would then drop you into a shell with
-   these libraries and binaries available. You can use this to run
-   closed-source applications which expect FHS structure without hassles:
-   simply change <literal>runScript</literal> to the application path, e.g.
-   <filename>./bin/start.sh</filename> -- relative paths are supported.
-  </para>
- </section>
+ <para>
+  Running <literal>nix-shell</literal> would then drop you into a shell with
+  these libraries and binaries available. You can use this to run closed-source
+  applications which expect FHS structure without hassles: simply change
+  <literal>runScript</literal> to the application path, e.g.
+  <filename>./bin/start.sh</filename> -- relative paths are supported.
+ </para>
+</section>
diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml
index 0a9c346145f9..e860b10e8979 100644
--- a/doc/functions/generators.xml
+++ b/doc/functions/generators.xml
@@ -2,33 +2,32 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-generators">
-  <title>Generators</title>
+ <title>Generators</title>
 
-  <para>
-   Generators are functions that create file formats from nix data structures,
-   e. g. for configuration files. There are generators available for:
-   <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
-  </para>
+ <para>
+  Generators are functions that create file formats from nix data structures,
+  e. g. for configuration files. There are generators available for:
+  <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
+ </para>
 
-  <para>
-   All generators follow a similar call interface: <code>generatorName
-   configFunctions data</code>, where <literal>configFunctions</literal> is an
-   attrset of user-defined functions that format nested parts of the content.
-   They each have common defaults, so often they do not need to be set
-   manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
-   ] name)</code> from the <literal>INI</literal> generator. It receives the
-   name of a section and sanitizes it. The default
-   <literal>mkSectionName</literal> escapes <literal>[</literal> and
-   <literal>]</literal> with a backslash.
-  </para>
+ <para>
+  All generators follow a similar call interface: <code>generatorName
+  configFunctions data</code>, where <literal>configFunctions</literal> is an
+  attrset of user-defined functions that format nested parts of the content.
+  They each have common defaults, so often they do not need to be set manually.
+  An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]" ]
+  name)</code> from the <literal>INI</literal> generator. It receives the name
+  of a section and sanitizes it. The default <literal>mkSectionName</literal>
+  escapes <literal>[</literal> and <literal>]</literal> with a backslash.
+ </para>
 
-  <para>
-   Generators can be fine-tuned to produce exactly the file format required by
-   your application/service. One example is an INI-file format which uses
-   <literal>: </literal> as separator, the strings
-   <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
-   requires all string values to be quoted:
-  </para>
+ <para>
+  Generators can be fine-tuned to produce exactly the file format required by
+  your application/service. One example is an INI-file format which uses
+  <literal>: </literal> as separator, the strings
+  <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
+  requires all string values to be quoted:
+ </para>
 
 <programlisting>
 with lib;
@@ -60,9 +59,9 @@ in customToINI {
 }
 </programlisting>
 
-  <para>
-   This will produce the following INI file as nix string:
-  </para>
+ <para>
+  This will produce the following INI file as nix string:
+ </para>
 
 <programlisting>
 [main]
@@ -76,15 +75,15 @@ str\:ange:"very::strange"
 merge:"diff3"
 </programlisting>
 
-  <note>
-   <para>
-    Nix store paths can be converted to strings by enclosing a derivation
-    attribute like so: <code>"${drv}"</code>.
-   </para>
-  </note>
-
+ <note>
   <para>
-   Detailed documentation for each generator can be found in
-   <literal>lib/generators.nix</literal>.
+   Nix store paths can be converted to strings by enclosing a derivation
+   attribute like so: <code>"${drv}"</code>.
   </para>
- </section>
+ </note>
+
+ <para>
+  Detailed documentation for each generator can be found in
+  <literal>lib/generators.nix</literal>.
+ </para>
+</section>
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
index dc81e3795065..99e2a63631a7 100644
--- a/doc/functions/overrides.xml
+++ b/doc/functions/overrides.xml
@@ -2,28 +2,28 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-overrides">
-  <title>Overriding</title>
+ <title>Overriding</title>
+
+ <para>
+  Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
+  derivation attributes, the results of derivations or even the whole package
+  set.
+ </para>
+
+ <section xml:id="sec-pkg-override">
+  <title>&lt;pkg&gt;.override</title>
 
   <para>
-   Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
-   derivation attributes, the results of derivations or even the whole package
-   set.
+   The function <varname>override</varname> is usually available for all the
+   derivations in the nixpkgs expression (<varname>pkgs</varname>).
   </para>
 
-  <section xml:id="sec-pkg-override">
-   <title>&lt;pkg&gt;.override</title>
+  <para>
+   It is used to override the arguments passed to a function.
+  </para>
 
-   <para>
-    The function <varname>override</varname> is usually available for all the
-    derivations in the nixpkgs expression (<varname>pkgs</varname>).
-   </para>
-
-   <para>
-    It is used to override the arguments passed to a function.
-   </para>
-
-   <para>
-    Example usages:
+  <para>
+   Example usages:
 <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
 <programlisting>
 import pkgs.path { overlays = [ (self: super: {
@@ -35,105 +35,103 @@ mypkg = pkgs.callPackage ./mypkg.nix {
   mydep = pkgs.mydep.override { ... };
   }
 </programlisting>
-   </para>
+  </para>
 
-   <para>
-    In the first example, <varname>pkgs.foo</varname> is the result of a
-    function call with some default arguments, usually a derivation. Using
-    <varname>pkgs.foo.override</varname> will call the same function with the
-    given new arguments.
-   </para>
-  </section>
+  <para>
+   In the first example, <varname>pkgs.foo</varname> is the result of a
+   function call with some default arguments, usually a derivation. Using
+   <varname>pkgs.foo.override</varname> will call the same function with the
+   given new arguments.
+  </para>
+ </section>
 
-  <section xml:id="sec-pkg-overrideAttrs">
-   <title>&lt;pkg&gt;.overrideAttrs</title>
+ <section xml:id="sec-pkg-overrideAttrs">
+  <title>&lt;pkg&gt;.overrideAttrs</title>
 
-   <para>
-    The function <varname>overrideAttrs</varname> allows overriding the
-    attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
-    producing a new derivation based on the original one. This function is
-    available on all derivations produced by the
-    <varname>stdenv.mkDerivation</varname> function, which is most packages in
-    the nixpkgs expression <varname>pkgs</varname>.
-   </para>
+  <para>
+   The function <varname>overrideAttrs</varname> allows overriding the
+   attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
+   producing a new derivation based on the original one. This function is
+   available on all derivations produced by the
+   <varname>stdenv.mkDerivation</varname> function, which is most packages in
+   the nixpkgs expression <varname>pkgs</varname>.
+  </para>
 
-   <para>
-    Example usage:
+  <para>
+   Example usage:
 <programlisting>
 helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
   separateDebugInfo = true;
 });
 </programlisting>
-   </para>
+  </para>
 
+  <para>
+   In the above example, the <varname>separateDebugInfo</varname> attribute is
+   overridden to be true, thus building debug info for
+   <varname>helloWithDebug</varname>, while all other attributes will be
+   retained from the original <varname>hello</varname> package.
+  </para>
+
+  <para>
+   The argument <varname>oldAttrs</varname> is conventionally used to refer to
+   the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+  </para>
+
+  <note>
    <para>
-    In the above example, the <varname>separateDebugInfo</varname> attribute is
-    overridden to be true, thus building debug info for
-    <varname>helloWithDebug</varname>, while all other attributes will be
-    retained from the original <varname>hello</varname> package.
+    Note that <varname>separateDebugInfo</varname> is processed only by the
+    <varname>stdenv.mkDerivation</varname> function, not the generated, raw Nix
+    derivation. Thus, using <varname>overrideDerivation</varname> will not work
+    in this case, as it overrides only the attributes of the final derivation.
+    It is for this reason that <varname>overrideAttrs</varname> should be
+    preferred in (almost) all cases to <varname>overrideDerivation</varname>,
+    i.e. to allow using <varname>sdenv.mkDerivation</varname> to process input
+    arguments, as well as the fact that it is easier to use (you can use the
+    same attribute names you see in your Nix code, instead of the ones
+    generated (e.g. <varname>buildInputs</varname> vs
+    <varname>nativeBuildInputs</varname>, and involves less typing.
    </para>
+  </note>
+ </section>
 
+ <section xml:id="sec-pkg-overrideDerivation">
+  <title>&lt;pkg&gt;.overrideDerivation</title>
+
+  <warning>
    <para>
-    The argument <varname>oldAttrs</varname> is conventionally used to refer to
-    the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+    You should prefer <varname>overrideAttrs</varname> in almost all cases, see
+    its documentation for the reasons why.
+    <varname>overrideDerivation</varname> is not deprecated and will continue
+    to work, but is less nice to use and does not have as many abilities as
+    <varname>overrideAttrs</varname>.
    </para>
+  </warning>
 
-   <note>
-    <para>
-     Note that <varname>separateDebugInfo</varname> is processed only by the
-     <varname>stdenv.mkDerivation</varname> function, not the generated, raw
-     Nix derivation. Thus, using <varname>overrideDerivation</varname> will not
-     work in this case, as it overrides only the attributes of the final
-     derivation. It is for this reason that <varname>overrideAttrs</varname>
-     should be preferred in (almost) all cases to
-     <varname>overrideDerivation</varname>, i.e. to allow using
-     <varname>sdenv.mkDerivation</varname> to process input arguments, as well
-     as the fact that it is easier to use (you can use the same attribute names
-     you see in your Nix code, instead of the ones generated (e.g.
-     <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
-     and involves less typing.
-    </para>
-   </note>
-  </section>
-
-  <section xml:id="sec-pkg-overrideDerivation">
-   <title>&lt;pkg&gt;.overrideDerivation</title>
-
-   <warning>
-    <para>
-     You should prefer <varname>overrideAttrs</varname> in almost all cases,
-     see its documentation for the reasons why.
-     <varname>overrideDerivation</varname> is not deprecated and will continue
-     to work, but is less nice to use and does not have as many abilities as
-     <varname>overrideAttrs</varname>.
-    </para>
-   </warning>
-
-   <warning>
-    <para>
-     Do not use this function in Nixpkgs as it evaluates a Derivation before
-     modifying it, which breaks package abstraction and removes error-checking
-     of function arguments. In addition, this evaluation-per-function
-     application incurs a performance penalty, which can become a problem if
-     many overrides are used. It is only intended for ad-hoc customisation,
-     such as in <filename>~/.config/nixpkgs/config.nix</filename>.
-    </para>
-   </warning>
-
+  <warning>
    <para>
-    The function <varname>overrideDerivation</varname> creates a new derivation
-    based on an existing one by overriding the original's attributes with the
-    attribute set produced by the specified function. This function is
-    available on all derivations defined using the
-    <varname>makeOverridable</varname> function. Most standard
-    derivation-producing functions, such as
-    <varname>stdenv.mkDerivation</varname>, are defined using this function,
-    which means most packages in the nixpkgs expression,
-    <varname>pkgs</varname>, have this function.
+    Do not use this function in Nixpkgs as it evaluates a Derivation before
+    modifying it, which breaks package abstraction and removes error-checking
+    of function arguments. In addition, this evaluation-per-function
+    application incurs a performance penalty, which can become a problem if
+    many overrides are used. It is only intended for ad-hoc customisation, such
+    as in <filename>~/.config/nixpkgs/config.nix</filename>.
    </para>
+  </warning>
 
-   <para>
-    Example usage:
+  <para>
+   The function <varname>overrideDerivation</varname> creates a new derivation
+   based on an existing one by overriding the original's attributes with the
+   attribute set produced by the specified function. This function is available
+   on all derivations defined using the <varname>makeOverridable</varname>
+   function. Most standard derivation-producing functions, such as
+   <varname>stdenv.mkDerivation</varname>, are defined using this function,
+   which means most packages in the nixpkgs expression,
+   <varname>pkgs</varname>, have this function.
+  </para>
+
+  <para>
+   Example usage:
 <programlisting>
 mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
   name = "sed-4.2.2-pre";
@@ -144,62 +142,62 @@ mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
   patches = [];
 });
 </programlisting>
-   </para>
+  </para>
 
+  <para>
+   In the above example, the <varname>name</varname>, <varname>src</varname>,
+   and <varname>patches</varname> of the derivation will be overridden, while
+   all other attributes will be retained from the original derivation.
+  </para>
+
+  <para>
+   The argument <varname>oldAttrs</varname> is used to refer to the attribute
+   set of the original derivation.
+  </para>
+
+  <note>
    <para>
-    In the above example, the <varname>name</varname>, <varname>src</varname>,
-    and <varname>patches</varname> of the derivation will be overridden, while
-    all other attributes will be retained from the original derivation.
+    A package's attributes are evaluated *before* being modified by the
+    <varname>overrideDerivation</varname> function. For example, the
+    <varname>name</varname> attribute reference in <varname>url =
+    "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
+    <varname>overrideDerivation</varname> function modifies the attribute set.
+    This means that overriding the <varname>name</varname> attribute, in this
+    example, *will not* change the value of the <varname>url</varname>
+    attribute. Instead, we need to override both the <varname>name</varname>
+    *and* <varname>url</varname> attributes.
    </para>
+  </note>
+ </section>
 
-   <para>
-    The argument <varname>oldAttrs</varname> is used to refer to the attribute
-    set of the original derivation.
-   </para>
+ <section xml:id="sec-lib-makeOverridable">
+  <title>lib.makeOverridable</title>
 
-   <note>
-    <para>
-     A package's attributes are evaluated *before* being modified by the
-     <varname>overrideDerivation</varname> function. For example, the
-     <varname>name</varname> attribute reference in <varname>url =
-     "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
-     <varname>overrideDerivation</varname> function modifies the attribute set.
-     This means that overriding the <varname>name</varname> attribute, in this
-     example, *will not* change the value of the <varname>url</varname>
-     attribute. Instead, we need to override both the <varname>name</varname>
-     *and* <varname>url</varname> attributes.
-    </para>
-   </note>
-  </section>
+  <para>
+   The function <varname>lib.makeOverridable</varname> is used to make the
+   result of a function easily customizable. This utility only makes sense for
+   functions that accept an argument set and return an attribute set.
+  </para>
 
-  <section xml:id="sec-lib-makeOverridable">
-   <title>lib.makeOverridable</title>
-
-   <para>
-    The function <varname>lib.makeOverridable</varname> is used to make the
-    result of a function easily customizable. This utility only makes sense for
-    functions that accept an argument set and return an attribute set.
-   </para>
-
-   <para>
-    Example usage:
+  <para>
+   Example usage:
 <programlisting>
 f = { a, b }: { result = a+b; };
 c = lib.makeOverridable f { a = 1; b = 2; };
 </programlisting>
-   </para>
+  </para>
 
-   <para>
-    The variable <varname>c</varname> is the value of the <varname>f</varname>
-    function applied with some default arguments. Hence the value of
-    <varname>c.result</varname> is <literal>3</literal>, in this example.
-   </para>
+  <para>
+   The variable <varname>c</varname> is the value of the <varname>f</varname>
+   function applied with some default arguments. Hence the value of
+   <varname>c.result</varname> is <literal>3</literal>, in this example.
+  </para>
 
-   <para>
-    The variable <varname>c</varname> however also has some additional
-    functions, like <link linkend="sec-pkg-override">c.override</link> which
-    can be used to override the default arguments. In this example the value of
-    <varname>(c.override { a = 4; }).result</varname> is 6.
-   </para>
-  </section>
+  <para>
+   The variable <varname>c</varname> however also has some additional
+   functions, like <link linkend="sec-pkg-override">c.override</link> which can
+   be used to override the default arguments. In this example the value of
+   <varname>(c.override { a = 4; }).result</varname> is 6.
+  </para>
  </section>
+</section>
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml
index a8d2a30cb508..e5031c9463c0 100644
--- a/doc/functions/shell.xml
+++ b/doc/functions/shell.xml
@@ -2,19 +2,18 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="sec-pkgs-mkShell">
-  <title>pkgs.mkShell</title>
+ <title>pkgs.mkShell</title>
 
-  <para>
-    <function>pkgs.mkShell</function> is a special kind of derivation
-    that is only useful when using it combined with
-    <command>nix-shell</command>. It will in fact fail to instantiate
-    when invoked with <command>nix-build</command>.
-  </para>
+ <para>
+  <function>pkgs.mkShell</function> is a special kind of derivation that is
+  only useful when using it combined with <command>nix-shell</command>. It will
+  in fact fail to instantiate when invoked with <command>nix-build</command>.
+ </para>
 
-  <section xml:id="sec-pkgs-mkShell-usage">
-    <title>Usage</title>
+ <section xml:id="sec-pkgs-mkShell-usage">
+  <title>Usage</title>
 
-    <programlisting><![CDATA[
+<programlisting><![CDATA[
 { pkgs ? import <nixpkgs> {} }:
 pkgs.mkShell {
   # this will make all the build inputs from hello and gnutar
@@ -23,5 +22,5 @@ pkgs.mkShell {
   buildInputs = [ pkgs.gnumake ];
 }
 ]]></programlisting>
-  </section>
+ </section>
 </section>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index d8f55ef0a856..5a13d18aa595 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -671,8 +671,9 @@ overrides = self: super: rec {
     plugins = with availablePlugins; [ python perl ];
   }
 }</programlisting>
-    If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal>
-    attribute, <literal>availablePlugins</literal> will be used automatically.
+   If the <literal>configure</literal> function returns an attrset without the
+   <literal>plugins</literal> attribute, <literal>availablePlugins</literal>
+   will be used automatically.
   </para>
 
   <para>
@@ -706,9 +707,11 @@ overrides = self: super: rec {
 }; }
 </programlisting>
   </para>
+
   <para>
-    WeeChat allows to set defaults on startup using the <literal>--run-command</literal>.
-    The <literal>configure</literal> method can be used to pass commands to the program:
+   WeeChat allows to set defaults on startup using the
+   <literal>--run-command</literal>. The <literal>configure</literal> method
+   can be used to pass commands to the program:
 <programlisting>weechat.override {
   configure = { availablePlugins, ... }: {
     init = ''
@@ -717,12 +720,14 @@ overrides = self: super: rec {
     '';
   };
 }</programlisting>
-    Further values can be added to the list of commands when running
-    <literal>weechat --run-command "your-commands"</literal>.
+   Further values can be added to the list of commands when running
+   <literal>weechat --run-command "your-commands"</literal>.
   </para>
+
   <para>
-    Additionally it's possible to specify scripts to be loaded when starting <literal>weechat</literal>.
-    These will be loaded before the commands from <literal>init</literal>:
+   Additionally it's possible to specify scripts to be loaded when starting
+   <literal>weechat</literal>. These will be loaded before the commands from
+   <literal>init</literal>:
 <programlisting>weechat.override {
   configure = { availablePlugins, ... }: {
     scripts = with pkgs.weechatScripts; [
@@ -734,11 +739,13 @@ overrides = self: super: rec {
   };
 }</programlisting>
   </para>
+
   <para>
-    In <literal>nixpkgs</literal> there's a subpackage which contains derivations for
-    WeeChat scripts. Such derivations expect a <literal>passthru.scripts</literal> attribute
-    which contains a list of all scripts inside the store path. Furthermore all scripts
-    have to live in <literal>$out/share</literal>. An exemplary derivation looks like this:
+   In <literal>nixpkgs</literal> there's a subpackage which contains
+   derivations for WeeChat scripts. Such derivations expect a
+   <literal>passthru.scripts</literal> attribute which contains a list of all
+   scripts inside the store path. Furthermore all scripts have to live in
+   <literal>$out/share</literal>. An exemplary derivation looks like this:
 <programlisting>{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
@@ -817,20 +824,26 @@ citrix_receiver.override {
  <section xml:id="sec-ibus-typing-booster">
   <title>ibus-engines.typing-booster</title>
 
-  <para>This package is an ibus-based completion method to speed up typing.</para>
+  <para>
+   This package is an ibus-based completion method to speed up typing.
+  </para>
 
   <section xml:id="sec-ibus-typing-booster-activate">
    <title>Activating the engine</title>
 
    <para>
-    IBus needs to be configured accordingly to activate <literal>typing-booster</literal>. The configuration
-    depends on the desktop manager in use. For detailed instructions, please refer to the
-    <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream docs</link>.
+    IBus needs to be configured accordingly to activate
+    <literal>typing-booster</literal>. The configuration depends on the desktop
+    manager in use. For detailed instructions, please refer to the
+    <link xlink:href="https://mike-fabian.github.io/ibus-typing-booster/documentation.html">upstream
+    docs</link>.
    </para>
+
    <para>
-    On NixOS you need to explicitly enable <literal>ibus</literal> with given engines
-    before customizing your desktop to use <literal>typing-booster</literal>. This can be achieved
-    using the <literal>ibus</literal> module:
+    On NixOS you need to explicitly enable <literal>ibus</literal> with given
+    engines before customizing your desktop to use
+    <literal>typing-booster</literal>. This can be achieved using the
+    <literal>ibus</literal> module:
 <programlisting>{ pkgs, ... }: {
   i18n.inputMethod = {
     enabled = "ibus";
@@ -844,17 +857,20 @@ citrix_receiver.override {
    <title>Using custom hunspell dictionaries</title>
 
    <para>
-    The IBus engine is based on <literal>hunspell</literal> to support completion in many languages.
-    By default the dictionaries <literal>de-de</literal>, <literal>en-us</literal>, <literal>es-es</literal>,
-    <literal>it-it</literal>, <literal>sv-se</literal> and <literal>sv-fi</literal>
-    are in use. To add another dictionary, the package can be overridden like this:
+    The IBus engine is based on <literal>hunspell</literal> to support
+    completion in many languages. By default the dictionaries
+    <literal>de-de</literal>, <literal>en-us</literal>,
+    <literal>es-es</literal>, <literal>it-it</literal>,
+    <literal>sv-se</literal> and <literal>sv-fi</literal> are in use. To add
+    another dictionary, the package can be overridden like this:
 <programlisting>ibus-engines.typing-booster.override {
   langs = [ "de-at" "en-gb" ];
 }</programlisting>
    </para>
+
    <para>
-     <emphasis>Note: each language passed to <literal>langs</literal> must be an attribute name in
-     <literal>pkgs.hunspellDicts</literal>.</emphasis>
+    <emphasis>Note: each language passed to <literal>langs</literal> must be an
+    attribute name in <literal>pkgs.hunspellDicts</literal>.</emphasis>
    </para>
   </section>
 
@@ -862,10 +878,12 @@ citrix_receiver.override {
    <title>Built-in emoji picker</title>
 
    <para>
-    The <literal>ibus-engines.typing-booster</literal> package contains a program
-    named <literal>emoji-picker</literal>. To display all emojis correctly,
-    a special font such as <literal>noto-fonts-emoji</literal> is needed:
+    The <literal>ibus-engines.typing-booster</literal> package contains a
+    program named <literal>emoji-picker</literal>. To display all emojis
+    correctly, a special font such as <literal>noto-fonts-emoji</literal> is
+    needed:
    </para>
+
    <para>
     On NixOS it can be installed using the following expression:
 <programlisting>{ pkgs, ... }: {

From 1d68b5ee84fb6eb35bb2afe6b824613e78dc0798 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Mon, 30 Oct 2017 18:13:16 +0100
Subject: [PATCH 2272/3253] docs: documentation for `cleanSource`

---
 lib/sources.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/sources.nix b/lib/sources.nix
index 704711b20cd9..e64b23414e86 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -26,6 +26,10 @@ rec {
     (type == "symlink" && lib.hasPrefix "result" baseName)
   );
 
+  # Filters a source tree removing version control files and directories using cleanSourceWith
+  #
+  # Example:
+  #          cleanSource ./.
   cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
 
   # Like `builtins.filterSource`, except it will compose with itself,

From d5166027e26460cce63d0f1540c5142176c9acff Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Mon, 30 Oct 2017 18:12:49 +0100
Subject: [PATCH 2273/3253] docs: lib/options.nix function documentation

---
 lib/options.nix | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/lib/options.nix b/lib/options.nix
index 01160b48ec01..0e3421175306 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -8,7 +8,31 @@ with lib.strings;
 
 rec {
 
+  # Returns true when the given argument is an option
+  #
+  # Examples:
+  #   isOption 1             // => false
+  #   isOption (mkOption {}) // => true
   isOption = lib.isType "option";
+
+  # Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
+  #
+  #  default:     Default value used when no definition is given in the configuration.
+  #  defaultText: Textual representation of the default, for in the manual.
+  #  example:     Example value used in the manual.
+  #  description: String describing the option.
+  #  type:        Option type, providing type-checking and value merging.
+  #  apply:       Function that converts the option value to something else.
+  #  internal:    Whether the option is for NixOS developers only.
+  #  visible:     Whether the option shows up in the manual.
+  #  readOnly:    Whether the option can be set only once
+  #  options:     Obsolete, used by types.optionSet.
+  #
+  # All keys default to `null` when not given.
+  #
+  # Examples:
+  #   mkOption { }  // => { _type = "option"; }
+  #   mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
   mkOption =
     { default ? null # Default value used when no definition is given in the configuration.
     , defaultText ? null # Textual representation of the default, for in the manual.
@@ -24,6 +48,10 @@ rec {
     } @ attrs:
     attrs // { _type = "option"; };
 
+  # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off:
+  #
+  # Examples:
+  #   mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
   mkEnableOption = name: mkOption {
     default = false;
     example = true;
@@ -74,7 +102,18 @@ rec {
       else
         val) (head defs).value defs;
 
+  # Extracts values of all "value" keys of the given list
+  #
+  # Examples:
+  #   getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
+  #   getValues [ ]                               // => [ ]
   getValues = map (x: x.value);
+
+  # Extracts values of all "file" keys of the given list
+  #
+  # Examples:
+  #   getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
+  #   getFiles [ ]                                         // => [ ]
   getFiles = map (x: x.file);
 
   # Generate documentation template from the list of option declaration like

From 024eb9a5a52d9b7876c352ca2471f1829ec12777 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 30 Oct 2017 18:13:50 +0100
Subject: [PATCH 2274/3253] trivial builders: adding usage documentation for
 functions

---
 pkgs/build-support/trivial-builders.nix | 155 ++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d2acc2679afa..7543433640a3 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -12,15 +12,40 @@ in
 
 rec {
 
-  # Run the shell command `buildCommand' to produce a store path named
-  # `name'.  The attributes in `env' are added to the environment
-  # prior to running the command.
+  /* Run the shell command `buildCommand' to produce a store path named
+  * `name'.  The attributes in `env' are added to the environment
+  * prior to running the command. By default `runCommand' runs using
+  * stdenv with no compiler environment. `runCommandCC` 
+  *
+  * Examples:
+  * runCommand "name" {envVariable = true;} ''echo hello''
+  * runCommandNoCC "name" {envVariable = true;} ''echo hello'' # equivalent to prior
+  * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; 
+  */
   runCommand = runCommandNoCC;
   runCommandNoCC = runCommand' stdenvNoCC;
   runCommandCC = runCommand' stdenv;
 
 
-  # Create a single file.
+  /* Writes a text file to the nix store.
+   * The contents of text is added to the file in the store.
+   *
+   * Examples:
+   * # Writes my-file to /nix/store/<store path>
+   * writeTextFile "my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+   * # Writes executable my-file to /nix/store/<store path>/bin/my-file
+   * writeTextFile "my-file"
+   *   ''
+   *   Contents of File
+   *   ''
+   *   true
+   *   "/bin/my-file";
+   *   true
+   */
   writeTextFile =
     { name # the name of the derivation
     , text
@@ -51,13 +76,69 @@ rec {
       '';
 
 
-  # Shorthands for `writeTextFile'.
+  /*
+   * Writes a text file to nix store with no optional parameters available.
+   *
+   * Example:
+   * # Writes contents of file to /nix/store/<store path>
+   * writeText "my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+  */
   writeText = name: text: writeTextFile {inherit name text;};
+  /*
+   * Writes a text file to nix store in a specific directory with no
+   * optional parameters available. Name passed is the destination.
+   *
+   * Example:
+   * # Writes contents of file to /nix/store/<store path>/<name>
+   * writeTextDir "share/my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+  */
   writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
+  /*
+   * Writes a text file to /nix/store/<store path> and marks the file as executable.
+   *
+   * Example:
+   * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable
+   * writeScript "my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+  */
   writeScript = name: text: writeTextFile {inherit name text; executable = true;};
+  /*
+   * Writes a text file to /nix/store/<store path>/bin/<name> and
+   * marks the file as executable.
+   *
+   * Example:
+   * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
+   * writeScript "my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+  */
   writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";};
 
-  # Create a Shell script, check its syntax
+  /*
+   * Writes a Shell script and check its syntax. Automatically includes interpreter
+   * above the contents passed.
+   *
+   * Example:
+   * # Writes my-file to /nix/store/<store path>/bin/my-file and makes executable.
+   * writeScript "my-file"
+   *   ''
+   *   Contents of File
+   *   '';
+   *
+  */
   writeShellScriptBin = name : text :
     writeTextFile {
       inherit name;
@@ -90,7 +171,18 @@ rec {
     $CC -x c code.c -o "$n"
     '';
 
-  # Create a forest of symlinks to the files in `paths'.
+  /*
+  * Create a forest of symlinks to the files in `paths'.
+  *
+  * Examples:
+  * # adds symlinks of hello to current build.
+  * { symlinkJoin, hello }:
+  * symlinkJoin { name = "myhello"; paths = [ hello ]; }
+  *
+  * # adds symlinks of hello to current build and prints "links added"
+  * { symlinkJoin, hello }:
+  * symlinkJoin { name = "myhello"; paths = [ hello ]; postBuild = "echo links added"; }
+  */
   symlinkJoin =
     args_@{ name
          , paths
@@ -112,7 +204,23 @@ rec {
       '';
 
 
-  # Make a package that just contains a setup hook with the given contents.
+  /*
+   * Make a package that just contains a setup hook with the given contents.
+   * This setup hook will be invoked by any package that includes this package
+   * as a buildInput. Optionally takes a list of substitutions that should be
+   * applied to the resulting script.
+   *
+   * Examples:
+   * # setup hook that depends on the hello package and runs ./myscript.sh
+   * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh;
+   *
+   * # wrotes a setup hook where @bash@ myscript.sh is substituted for the
+   * # bash interpreter. 
+   * myhellohookSub = makeSetupHook {
+   *                 deps = [ hello ];
+   *                 substitutions = { bash = "${pkgs.bash}/bin/bash"; };
+   *               } ./myscript.sh;
+   */
   makeSetupHook = { name ? "hook", deps ? [], substitutions ? {} }: script:
     runCommand name substitutions
       (''
@@ -126,6 +234,7 @@ rec {
 
 
   # Write the references (i.e. the runtime dependencies in the Nix store) of `path' to a file.
+
   writeReferencesToFile = path: runCommand "runtime-deps"
     {
       exportReferencesGraph = ["graph" path];
@@ -141,8 +250,17 @@ rec {
     '';
 
 
-  # Quickly create a set of symlinks to derivations.
-  # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; }
+  /*
+   * Quickly create a set of symlinks to derivations.
+   * entries is a list of attribute sets like
+   * { name = "name" ; path = "/nix/store/..."; }
+   *
+   * Example:
+   *
+   * # Symlinks hello path in store to current $out/hello
+   * linkFarm "hello" entries = [ { name = "hello"; path = pkgs.hello; } ];
+   *
+   */
   linkFarm = name: entries: runCommand name { preferLocalBuild = true; }
     ("mkdir -p $out; cd $out; \n" +
       (lib.concatMapStrings (x: ''
@@ -151,9 +269,20 @@ rec {
       '') entries));
 
 
-  # Print an error message if the file with the specified name and
-  # hash doesn't exist in the Nix store. Do not use this function; it
-  # produces packages that cannot be built automatically.
+  /* Print an error message if the file with the specified name and
+   * hash doesn't exist in the Nix store. This function should only
+   * be used by non-redistributable software with an unfree license
+   * that we need to require the user to download manually. It produces
+   * packages that cannot be built automatically.
+   *
+   * Examples:
+   * 
+   * requireFile {
+   *   name = "my-file";
+   *   url = "http://example.com/download/";
+   *   sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff";
+   * }
+   */
   requireFile = { name ? null
                 , sha256 ? null
                 , sha1 ? null

From 300ff965ae3e45548f62bc300059dbecb4a93e7b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 2 Oct 2018 13:08:16 -0500
Subject: [PATCH 2275/3253] haskell: fix x509-system on mojave
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @lnl7 @pikajude
---
 pkgs/development/haskell-modules/configuration-nix.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 43ba2d000eb5..bb9b0e5d5fe6 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -131,8 +131,16 @@ self: super: builtins.intersectAttrs super {
   x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+        # darwin.security_tool is broken in Mojave (#45042)
+
+        # We will use the system provided security for now.
+        # Beware this WILL break in sandboxes!
+
+        # TODO(matthewbauer): If someone really needs this to work in sandboxes,
+        # I think we can add a propagatedImpureHost dep here, but I’m hoping to
+        # get a proper fix available soonish.
         postPatch = (drv.postPatch or "") + ''
-          substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
         '';
       })
     else super.x509-system;

From ff0568380baf59e053ab1098f268b38be8bf22db Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 29 Sep 2018 20:55:28 -0500
Subject: [PATCH 2276/3253] coreutils: remove optionalString in postPatch

no reason to make this part conditional
---
 pkgs/tools/misc/coreutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 582f8d8f05f9..e94f255f7224 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
 
   # The test tends to fail on btrfs and maybe other unusual filesystems.
-  postPatch = optionalString (!stdenv.hostPlatform.isDarwin) ''
+  postPatch = ''
     sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
     sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
     sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh

From b068e220ff7b806e6015c3982853bf3deb8745e3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 29 Sep 2018 20:25:51 -0500
Subject: [PATCH 2277/3253] patch: use checkInputs instead of conditional

This is more clear, to separate test dependencies.
---
 pkgs/tools/text/gnupatch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index e22850a63f01..238dba3a9f1e 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = stdenv.lib.optional doCheck ed;
   nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
@@ -31,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   doCheck = stdenv.hostPlatform.libc != "musl"; # not cross;
+  checkInputs = [ed];
 
   meta = {
     description = "GNU Patch, a program to apply differences to files";

From bae2f2dbda35912fe7d9e9cd0ce6e1e6335d8a34 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Wed, 3 Oct 2018 00:41:48 +0300
Subject: [PATCH 2278/3253] hyperfine: 1.1.0 -> 1.3.0 (#47521)

---
 pkgs/tools/misc/hyperfine/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix       |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index d9c255d2a7a8..339c8dea4606 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform
+, Security
+}:
 
 rustPlatform.buildRustPackage rec {
   name = "hyperfine-${version}";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "hyperfine";
     rev    = "refs/tags/v${version}";
-    sha256 = "13h43sjp059yq3bmdbb9i1082fkx5yzmhrkf5kpkxhnyn67xbdsg";
+    sha256 = "06kghk3gmi47c8g28n8srpb578yym104fa30s4m33ajb60fvwlld";
   };
 
-  cargoSha256 = "0saf0hl21ba2ckqbsw64908nvs0x1rjrnm73ackzpmv5pi9j567s";
+  cargoSha256 = "1rwh8kyrkk5jza4lx7sf1pln68ljwsv4ccyfvzcvc140y7ya8ps0";
+
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
   meta = with stdenv.lib; {
     description = "Command-line benchmarking tool";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b7534d8ee4b..6253c9331276 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21734,7 +21734,9 @@ with pkgs;
 
   hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; };
 
-  hyperfine = callPackage ../tools/misc/hyperfine { };
+  hyperfine = callPackage ../tools/misc/hyperfine {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   epkowa = callPackage ../misc/drivers/epkowa { };
 

From 3c45be7d9bee2848c06170691d57f6dfc05f5a28 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Wed, 3 Oct 2018 01:29:26 +0300
Subject: [PATCH 2279/3253] i3status-rust: 0.9.0.2018-09-30 -> 0.9.0.2018-10-02
 (#47687)

---
 pkgs/applications/window-managers/i3/status-rust.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 366657b8827e..0e3168a5782d 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -1,21 +1,21 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, gperftools }:
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus }:
 
 rustPlatform.buildRustPackage rec {
   name = "i3status-rust-${version}";
-  version = "0.9.0.2018-09-30";
+  version = "0.9.0.2018-10-02";
 
   src = fetchFromGitHub {
     owner = "greshake";
     repo = "i3status-rust";
-    rev = "82ea033250c3fc51a112ac68c389da5264840492";
-    sha256 = "06r1nnv3a5vq3s17rgavq639wrq09z0nd2ck50bj1c8i2ggkpvq9";
+    rev = "11c2a21693ffcd0b6c2e0ac919b2232918293963";
+    sha256 = "019m9qpw7djq6g7lzbm7gjcavlgsp93g3cd7cb408nxnfsi7i9dp";
   };
 
-  cargoSha256 = "02in0hz2kgbmrd8i8s21vbm9pgfnn4axcji5f2a14pha6lx5rnvv";
+  cargoSha256 = "1wnify730f7c3cb8wllqvs7pzrq54g5x81xspvz5gq0iqr0q38zc";
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ dbus gperftools ];
+  buildInputs = [ dbus ];
 
   meta = with stdenv.lib; {
     description = "Very resource-friendly and feature-rich replacement for i3status";

From b6c824682400a0bbb71a0d446ed6bd306fd8f2ee Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 3 Oct 2018 00:30:36 +0200
Subject: [PATCH 2280/3253] gmm: 5.1 -> 5.3 (#47686)

---
 pkgs/development/libraries/gmm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 7f8a2276ef25..6423e1fce981 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "gmm-${version}";
-  version = "5.1";
+  version = "5.3";
 
   src = fetchurl {
-    url ="http://download.gna.org/getfem/stable/${name}.tar.gz";
-    sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh";
+    url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+    sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
   };
 
   meta = with stdenv.lib; {
     description = "Generic C++ template library for sparse, dense and skyline matrices";
-    homepage = http://home.gna.org/getfem/gmm_intro.html;
+    homepage = http://getfem.org/gmm.html;
     license = licenses.lgpl21Plus;
     platforms = platforms.unix;
   };

From 889c72032f8595fcd7542c6032c208f6b8033db6 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Wed, 3 Oct 2018 01:34:16 +0300
Subject: [PATCH 2281/3253] mpv: 0.29.0 -> 0.29.1 (#47689)

---
 pkgs/applications/video/mpv/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 9d843a3bfefb..62a517e80ea6 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchurl, fetchFromGitHub, makeWrapper
+{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
 , docutils, perl, pkgconfig, python3, which, ffmpeg_4
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
@@ -89,22 +89,15 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3";
+    sha256 = "138921kx8g6qprim558xin09xximjhsj9ss8b71ifg2m6kclym8m";
   };
 
-  # FIXME: Remove this patch for building on macOS if it gets released in
-  # the future.
-  patches = optional stdenv.isDarwin (fetchpatch {
-    url = https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch;
-    sha256 = "0pa8vlb8rsxvd1s39c4iv7gbaqlkn3hx21a6xnpij99jdjkw3pg8";
-  });
-
   postPatch = ''
     patchShebangs ./TOOLS/
   '';

From b85cb53c4d2c1ca2485f8bcc51a5a2cf041beaa6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Oct 2018 15:40:39 -0700
Subject: [PATCH 2282/3253] harfbuzz: 1.8.8 -> 1.9.0 (#47049)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 383f7f60f9bf..c45bc80fc394 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.8.8";
+  version = "1.9.0";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8";
+    sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i";
   };
 
   postPatch = ''

From 2d759f2b0a67908b758473c2213c32a4f396b437 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Oct 2018 15:44:42 -0700
Subject: [PATCH 2283/3253] unbound: 1.7.3 -> 1.8.0 (#46938)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/unbound/versions
---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index a009e76d9e0a..f26cef3e61d3 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.7.3";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "https://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d";
+    sha256 = "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From 9f6e5886bb244b63e13d0836246ac4c7c0142579 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Tue, 2 Oct 2018 16:16:19 -0700
Subject: [PATCH 2284/3253] envsubst: init at 1.1.0

---
 pkgs/tools/misc/envsubst/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/envsubst/default.nix

diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
new file mode 100644
index 000000000000..86f78af25603
--- /dev/null
+++ b/pkgs/tools/misc/envsubst/default.nix
@@ -0,0 +1,22 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name = "envsubst-${version}";
+  version = "1.1.0";
+
+  goPackagePath = "github.com/a8m/envsubst";
+  src = fetchFromGitHub {
+    owner = "a8m";
+    repo = "envsubst";
+    rev = "v${version}";
+    sha256 = "1d6nipagjn40n6iw1p3r489l2km5xjd5db9gbh1vc5sxc617l7yk";
+  };
+
+  meta = with lib; {
+    description = "Environment variables substitution for Go";
+    homepage = https://github.com/a8m/envsubst;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nicknovitski ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6253c9331276..1eccc48ce3b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1284,6 +1284,8 @@ with pkgs;
 
   envconsul = callPackage ../tools/system/envconsul { };
 
+  envsubst = callPackage ../tools/misc/envsubst { };
+
   eschalot = callPackage ../tools/security/eschalot { };
 
   esptool = callPackage ../tools/misc/esptool { };

From 276d3d853828bde77281a90f8955e70f46821772 Mon Sep 17 00:00:00 2001
From: Sean Haugh <sean@lfo.team>
Date: Fri, 28 Sep 2018 16:18:49 -0500
Subject: [PATCH 2285/3253] libimagequant: init at 2.12.1

---
 .../libraries/libimagequant/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/libimagequant/default.nix

diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
new file mode 100644
index 000000000000..c5a471712785
--- /dev/null
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, unzip }:
+
+with stdenv;
+
+let
+  version = "2.12.1";
+in
+  mkDerivation {
+    name = "libimagequant-${version}";
+    src = fetchFromGitHub {
+      owner = "ImageOptim";
+      repo = "libimagequant";
+      rev = "${version}";
+      sha256 = "0r7zgsnhqci2rjilh9bzw43miwp669k6b7q16hdjzrq4nr0xpvbl";
+    };
+
+    preConfigure = ''
+      patchShebangs ./configure
+    '';
+
+    meta = {
+      homepage = https://pngquant.org/lib/;
+      description = "Image quantization library";
+      longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
+      license = lib.licenses.gpl3Plus;
+      platforms = lib.platforms.unix;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c58ea359c27a..d413dbfa055c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10735,6 +10735,8 @@ with pkgs;
 
   libiec61883 = callPackage ../development/libraries/libiec61883 { };
 
+  libimagequant = callPackage ../development/libraries/libimagequant {};
+
   libinfinity = callPackage ../development/libraries/libinfinity { };
 
   libinput = callPackage ../development/libraries/libinput {

From 8ba7aa0ed102e2d2c26ea1fcbd46bf811722be69 Mon Sep 17 00:00:00 2001
From: Sean Haugh <sean@lfo.team>
Date: Tue, 2 Oct 2018 12:54:50 -0500
Subject: [PATCH 2286/3253] libimagequant: add myself as maintainer

---
 maintainers/maintainer-list.nix                      | 5 +++++
 pkgs/development/libraries/libimagequant/default.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b7329a8d790..47e64974dc22 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2442,6 +2442,11 @@
     github = "ma27";
     name = "Maximilian Bosch";
   };
+  ma9e = {
+    email = "sean@lfo.team";
+    github = "ma9e";
+    name = "Sean Haugh";
+  };
   madjar = {
     email = "georges.dubus@compiletoi.net";
     github = "madjar";
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
index c5a471712785..d232e268f309 100644
--- a/pkgs/development/libraries/libimagequant/default.nix
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -24,5 +24,6 @@ in
       longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
       license = lib.licenses.gpl3Plus;
       platforms = lib.platforms.unix;
+      maintainers = with lib.maintainers; [ ma9e ];
     };
   }

From bccd0faee40cbaf2839d71cfb48f3a27d0d8d015 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 3 Oct 2018 02:11:17 +0200
Subject: [PATCH 2287/3253] nixos/thefuck: don't run thefuck on
 `environment.shellInit'

The init script slightly differs depending on which shell is in use.
So for bash it should be in the interactiveShellInit as well.

In this case we don't need a mkIf as `bash` is enabled by default
on NixOS.
---
 nixos/modules/programs/thefuck.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index f4ae52934760..21ed6603c1bd 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -29,8 +29,8 @@ in
 
     config = mkIf cfg.enable {
       environment.systemPackages = with pkgs; [ thefuck ];
-      environment.shellInit = initScript;
 
+      programs.bash.interactiveShellInit = initScript;
       programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
       programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
         ${pkgs.thefuck}/bin/thefuck --alias | source

From d4de3b2d34100c3253f18b3404bfe041197324ef Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 3 Oct 2018 09:12:16 +0900
Subject: [PATCH 2288/3253] thunderbird-bin: 60.0 -> 60.2.1

---
 .../thunderbird-bin/release_sources.nix       | 466 +++++++++---------
 1 file changed, 233 insertions(+), 233 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 5097215d4366..a97dfce27448 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,585 +1,585 @@
 {
-  version = "60.0";
+  version = "60.2.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ar/thunderbird-60.2.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd";
+      sha512 = "026d4f74378ab0c94e14689161187793ec614a3c492a20d41401714d3a51a5478d060d0a6072a48e20dca88e7d0f4853efc293d36999ddfea431de466dcf94d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ast/thunderbird-60.2.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13";
+      sha512 = "a9156cd525d072711a78f7c45261d50e9057f1f797fe0847c0b52ebdcb42a9f283432da036c870209aedc37183b2fd4df12527e128f46a06d5eb289bdb11d379";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/be/thunderbird-60.2.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c";
+      sha512 = "d75dc81e7ed655e5bc539362b4ea212ef47bed496c483a6401c8cc52fe2aa7c89f12024ef5364e8e44826c5df2a7cc0eae01a55cbfb22c78b7d29744e05c2389";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/bg/thunderbird-60.2.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef";
+      sha512 = "4302c20cec5239d3cffd1c5756537059f98eb19ebe6332ce255ddeb555f8f07b6ce03c18ccfd2adc7b1a51c954a0ef3dfbd98ca2a5238cf510d4abea48d10df9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/br/thunderbird-60.2.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336";
+      sha512 = "c22bd6606886c50fd782f1646f03917d9988a76020fc5e1a210e39a771980badcea965332ddc80f6f08fd062be4f08a499cbf7ea3585c78cb7089d40b40b92af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ca/thunderbird-60.2.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511";
+      sha512 = "7827c61dcc0294b85db7709029021daf52148a9d00b1d06c3a05f2e3591ca1e9e75a84bed3ac01da3a7f4af7bb2842b7574ec519849c8a5cde30600f0d237c85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cs/thunderbird-60.2.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889";
+      sha512 = "dd51fee0d4e2c87e841c1e13aeff54c49e375bb95ed69f539320815cb551d57853032d42346516627024f88ba77154a8f1aeba651f3e90b5d5ef206dfeb23c5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/cy/thunderbird-60.2.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a";
+      sha512 = "29c32c26fc56d1fe7ae47fc93d121b8591e75f0d42b25ef3e1f9d98f3bfa66bdce551d96c8f98f553bca6425173da43f9e9a13f3f006db1259f1b69a68abb7cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/da/thunderbird-60.2.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9";
+      sha512 = "f57484cf06388193dbf3e6ec9c8c631829e6e0914dd785fa81b007bcd9789cdffc777d6f5df5939a1e125f66f9cd2a04d0b4a9dac5250aa615c7033bffb70d97";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/de/thunderbird-60.2.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156";
+      sha512 = "d12857d40c23f3817809e09e1edf9cf1131939d2aa5e830da2e9a13b4971096f33691deed0a29188510c2f84aeaa2a7ab704f54ced3c79885ea7b883cbd88f49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/dsb/thunderbird-60.2.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54";
+      sha512 = "c65ce176520eaafe2afe54cf3ff6266bdeaef437c29f82e5580f286c31bb97881fe9724435995b5debd14306332ce2d379e45a30350296473f140d8caaeaee6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/el/thunderbird-60.2.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002";
+      sha512 = "8aad41efc6bae79e6e5f238ad6209f0cec7ff3ed0f82a4ef22a0e1e12c3ffb2577ff105983b1f1892591e1b2a58f2d8bb8d9ea51051ec930649dfa954341b219";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-GB/thunderbird-60.2.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427";
+      sha512 = "b75eab236a8749a185083c33b8f28492d903ee84b2b5a9aa3659e04eae7bc72cc93493a6cafa39ca29ebd0c065301e1091d21a23836b41bc4a5b60f4e61f6668";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/en-US/thunderbird-60.2.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb";
+      sha512 = "71308c1d6691894ef60144f7bc119709491eaa3af400197e4fec61f25231266b085e925fe1163d6de8d3d1f3ce34475a299968e9405341a9881c512fbd6e4362";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-AR/thunderbird-60.2.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499";
+      sha512 = "061f0ea13b7c213ef2020aa2cf9ebee51b6b72f0de9b65ccb095f7e67152f5325d6806af90b5f600b7498d8cbd18916079e81914affd29308e04de0c7535939e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/es-ES/thunderbird-60.2.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522";
+      sha512 = "39c7b2806400cd57cd3e778d57f174a45eaa6e15bf1975d7e82f082d31d965e13a43ef130952e00300df9a13470c780c60f0ec9b398210b183593492d30c158a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/et/thunderbird-60.2.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1";
+      sha512 = "29b0399f7d896b09bb74b9ab78d10686061052493b880f72ee31c00db7cc226e3fe04e9519ff23e139c9644045bf9d6a45a8570d105a9675cbbbc310a930370f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/eu/thunderbird-60.2.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac";
+      sha512 = "d53ced6a20ff89966888d9241fe483d0a6a5586ae8da4a6d9584f6298a8c254a06e2e1e4527536e38c42f92cc14b778cc8264f402efa6abbaba6ca52486c5e06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fi/thunderbird-60.2.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b";
+      sha512 = "2fdf8b87cee0829e78d130ebf87b5d4bf62266abf17475d349440f7dca043ff7e1c14feef1f69b630cc81afb42bca52440643d0e2f833ce0a61f19e1c1f25721";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fr/thunderbird-60.2.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29";
+      sha512 = "288f8346cf90dd666cbb082f1761ad8fdd77a33e43bcca1cfa58c1f84c86bd6c3f7cd6d1d4effdb9ed77c6a50d07b8e5ef3505dc2e2098dc3c38ec32e7fa99c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/fy-NL/thunderbird-60.2.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882";
+      sha512 = "836a74aaf424a93304e12a412f0104ed5d577bd10ad1beceed1b78f2dac65d096103e9999298e25cdb8fea9d616fb4f814ad8c3bca84aeaff0cdcdc38b8763e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ga-IE/thunderbird-60.2.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d";
+      sha512 = "8c680f783e26193a26c507491b82128b123ed89e73dba328391d18264c5780ad88b9f077d4d12868dab6968f4be7e8f1c0dbe397196b556a5af31c07c1b1072e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gd/thunderbird-60.2.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034";
+      sha512 = "e5b092f6b1b79b93225c0cae4022bde8452598d8c36b9e5ebd8fb4b9449d265df048526c30a1207b9ebeb7a5ad421ae77085306dbeb9d1d5b9c34decb98da1af";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/gl/thunderbird-60.2.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a";
+      sha512 = "ec235f57cdc56a66885f2d8098ab9ce80ab3fb87fb30b4c5cc97cde874ae321e326b3ce4fc9e69a6c7f0e61e43cbfb28c0392349151b25ee25a2503e13bf5c3a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/he/thunderbird-60.2.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9";
+      sha512 = "fc9f1ef3dd117b6b4198a09997e3e4095036dddcbf50a32b94a36f53ec886bfdb33debaa2c69b68c14ba7af945c1a35891b11fe9ae8602c11842d381bdf0286b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hr/thunderbird-60.2.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e";
+      sha512 = "4d548d121cc8111711ff7a35383ffe859cdd99a692b255dc71d52cb4cfa90614a5415a58f000ce447209c998b03fa545608333a53c5230fe01527aa882eea295";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hsb/thunderbird-60.2.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b";
+      sha512 = "2f98ebdaa190aeebbe60fe20d6246d027425c3d5408abfefcbd50857ba800e9fc53b0177f54cf8b710a013bfc59e4a58b237991058a123cd2f8f0e1f4afaa1b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hu/thunderbird-60.2.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299";
+      sha512 = "b54703d9b7eb868a771538c0f5ffb0e881efd9137ed29b684dc149e77b3f9a675d0b59feac21c8b1f54c35545b9a2ea2274bcb485ce583102a406e916c3c25f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/hy-AM/thunderbird-60.2.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc";
+      sha512 = "f3e3918538df95e6a278bd680d019b39c5382078c79eece57f23810aeadd43fd61810967aa384f222f6d21d5d815cf3bd7520a7d31e44b3d2e6c024ff6b46a47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/id/thunderbird-60.2.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf";
+      sha512 = "3b1956f69a4b82a900dca97f90b29d7cb685c79e6d6063b58bd8de629fd604dca58d058c8b0855ae46daf9517edb1451c40f669cc98e986ada02e317b131b19c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/is/thunderbird-60.2.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5";
+      sha512 = "fa5e7574bd73c1d85d300b151a5d1c7852fb035ca5e4599b675008170074736045ee034169108eafe6171371ee94b84003922088e8e0dc4b1c05ba7837499c4f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/it/thunderbird-60.2.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d";
+      sha512 = "a2bd51df6adf2caf4bb22edd02b3b70d94abb1d3ce22731a3188c718161b492f860be1cdd94c39c4a64e6ccbbbe80092310448ff08d671d870ec565b36466b33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ja/thunderbird-60.2.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73";
+      sha512 = "b065494dbefeb8ed79b40b255bc8551dca4f0606c204f00d7c0cc0534fa1aeff45d0b7fa80454fe8ae8803b002600d3e332f7b3138894005922aac48cbdf9ef3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kab/thunderbird-60.2.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad";
+      sha512 = "a22017107f11151f2b383d11d6a6b8aa45571c3c4def1ce422fa4b108b546273a362279889c60bf5b01dff73b497879d881b0f8960be97ad92526ceb0ae16488";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/kk/thunderbird-60.2.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb";
+      sha512 = "9d9abbd85a6bda636aacf361dafa05b7f64dff8a7cebe81d2ff9b6d5eca9c800753cfbd3e9dd66ca17edea0bdf8b656d242f47e53f5aab364b14a88d2917da0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ko/thunderbird-60.2.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779";
+      sha512 = "083b33b6b50af83380e2976fffcfe9d4fa3fc64199bd6895606392842888ac66734deff738788dbbe449ee7c7a1e06608caa25320c12b1d49885825f7dd8a500";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/lt/thunderbird-60.2.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713";
+      sha512 = "33c16ff80c9cea364bf2d4a501d3d7f04eb6a04c70785d99e0d8d5fa2272acfdaeeb09b45e618ea1c08b9da083f7fdbbfd571eb84699d0d93718e103810983aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ms/thunderbird-60.2.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899";
+      sha512 = "92368bcdf6157b7fbcaad6f5abd40a6dfea2c12d3aaa6eb58a2cc118621ee8df50f34f506aa124413264a44cedadd1755e5dd827f4ad6df069fab9d6cf3b08ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nb-NO/thunderbird-60.2.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4";
+      sha512 = "d06ccb94bbe15947b8cc1d685e6ab8f8001e717e104cd1af6799a02c47ac79ce8e1b5315feb6ea3683f9d89b72202e1e2e41a0226f994931304880535a25e2dc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nl/thunderbird-60.2.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb";
+      sha512 = "2650806011a205cf6dfb1756c270a6a8ec33dc36cfa67d85bbf70264bd306a2b98edf973eac001ac79657fc624f2c56d39c24e7ada9b53b6aaf5825d701c4df5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/nn-NO/thunderbird-60.2.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec";
+      sha512 = "bd58db3533496758873a273d988f9b53f2d201a176b936b549ca543bd3e612e0898c83a42f761885a9b9ac58f5a3dfd38e93e9f807afed02717dc6b47f574c5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pl/thunderbird-60.2.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c";
+      sha512 = "3d2961721fb1d70b4a40b447ff4364039159115b096eb75aff418db20709e102bbf3f752e04bbbc735506b2b4d45554d38b1d217459efa7405676908831fe4f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-BR/thunderbird-60.2.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4";
+      sha512 = "3610306eeb52cc29ea739b1d5140bf0e4cec8536aed99278a82ea0847a592975e5a9fd23d4763032d3a178a9a830e5a8c87bbe6b0be7765a4f961c00fab05f6a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/pt-PT/thunderbird-60.2.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1";
+      sha512 = "30ad1102cd1abdf091cee8971ecd537ee7727e0ff3ef31bc535f830c3c50f8598330b98ab5acd5b1c22d9b4a245f9952b7f6ea0e8ca373c58aaf57f4ae78d554";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/rm/thunderbird-60.2.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1";
+      sha512 = "8581718d7ef1b0e3c6ffbc2dd38f9a183577d80613a79bfdeed4aefdaddb6fe060429c76ac0ecf4c18a4a445499a444f5b0315ec32f3da00ebdd2d1a3e70d262";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ro/thunderbird-60.2.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70";
+      sha512 = "e9393e95ef620474fa40188bcc3deb110b21c58eedeb2791cd7d17d0621f45f345fe219eaeaf4a5d71d80e303ad23b5d8ab93c8b5f7d085c3eead902ce239e5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/ru/thunderbird-60.2.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3";
+      sha512 = "dfa9aba3a85bc6f3264849b54d8f6ef14a5cbfcab2eec6f71b5130eaad6b7d8dfdfa2b9572f965fc19b51f80868183008e441961ee0072a1500eef183111f1c4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/si/thunderbird-60.2.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d";
+      sha512 = "b669455b70def2b7a8e08cf8f7c77db857ef0062b4f791a91ad636e7fcd0eba0aaa5199bbe49d7895a6872370e8cd442e142d017ec6855327d0f555129fa2d68";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sk/thunderbird-60.2.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8";
+      sha512 = "0719f9073db07793a4f061cf430b3aff539ec3e124ae2a7b6596ca5505e0d0ba96d1af1a3e1dfeebc55601be1ea7a173c5c89657036606b0fdf92c07a35efc7d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sl/thunderbird-60.2.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992";
+      sha512 = "66d8ab801f86a5a6a68d5fb48ebb255c3348fe7a0e9eee975fee7c939712cf5cc3bcec084c853600235f8f9774c4bfe66507fae856bc4c9a88d170bc3d6d4e6a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sq/thunderbird-60.2.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68";
+      sha512 = "eeb3d2396f8de38cbd9495a82c766183e1640bb05c48dcb4accf770c4c00fb4823be55c5cab6561dbd2dc413316f383265cdae9e0809da1150b9afde678bf4aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sr/thunderbird-60.2.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76";
+      sha512 = "e251e7c1970e68849bfaa6bd9a34894e9b710c7adba1cd54ea063274e7f07735795879a01b4dde2256eb612539d3fd433507fc9c586a28ec803cd636194ca12f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/sv-SE/thunderbird-60.2.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842";
+      sha512 = "c6d2d165eaa2e46adc9131cbc4aa203308852ee80ccbdc226def37be9505c4e2649e70b668ce38d061dbfebc284e0d604db1094418a02092f189ddd3e7317419";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/tr/thunderbird-60.2.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75";
+      sha512 = "d23cb1cac7becb82cedb768376e200108e08814e55c8308492cc65a687d5d9aa5fd38ae742c39572ead41b2d2c3e03dbf2222f88fb0b94ceba6183d6b8a4d0e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/uk/thunderbird-60.2.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c";
+      sha512 = "7385c719fb86a3c6d64c5d6ed8bea81cb7366cf1cdc97858dd177fb1435f24f3d3d257c60a319dd2db82da1274b9a2e14b73d3eaf20684ca955a0bd7b7b7e3a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/vi/thunderbird-60.2.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55";
+      sha512 = "369be97c79232b58ce2a096814d63c3ee805e2fca8ba40566ddace637c5d9d3686c06e8e0a158ce38395d7056dcc85416251b73ae7b50bdeb79c26fd65044200";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-CN/thunderbird-60.2.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44";
+      sha512 = "934d49874ab0811ad2959de1c43c94e5c94ac52e45dca2e8a6c91ca32c033bbf7c076ab46fbaff5c1f508301d0635b3ada957f09d9f591647d202d09484940c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-x86_64/zh-TW/thunderbird-60.2.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c";
+      sha512 = "50253f13fe918a1f9b066fc9c8b3245aea8fc79502ff7b5130150cf207da080b569fe0aabc5c19cfd77fb79eebe9a9d48f103d6748ea2070bd06476c0bb90e4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ar/thunderbird-60.2.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e";
+      sha512 = "3f0da183490797d4046272a85c9584e95f5b0c66edb94ec4e84906f78f009f8558e4e2c4fcf03f83e8d857aebc13febea3305eb02c6c63ac32474749bd28046b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ast/thunderbird-60.2.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344";
+      sha512 = "e3e0e9d7b30b7a790c681c650e4da123246bb9fc5005dd382f5eb85f3bee9b2e3f79f5a9688f4b5e25da1c1bcb09721ae8c7cce32309e0c554a992fbf1b418ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/be/thunderbird-60.2.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762";
+      sha512 = "ad8c3794452cf734234421b2e7b0e90553f2012e62c1d7ea887610f74aec4af5d60b1ef37765d9cdef93c23367135fdfee800df0f7bcb59cac1761356877e3e0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/bg/thunderbird-60.2.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c";
+      sha512 = "30076e64f51084059186998f36014047ec53f0ec9d9ea2589808c20793403b777f484569eed31d4ecbfd5dec890e1cd219bf071102140d1b4f5ed401225a411d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/br/thunderbird-60.2.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff";
+      sha512 = "9bf11610fdac1278c66bbe7123269e3ebe4e24b619f8b1ee89769460656825c3a170ad730f5297ca5dc1181833ce833b3a812306d5a6339fb80408992eb9f89e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ca/thunderbird-60.2.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0";
+      sha512 = "95a643963817f5105c76d195c1b3ce4def01e0e5262c730a9cf1ee247512e562d16d56e53968d0078cef12514b9294f30ab59f93e4e25c068553d8ed9633dc59";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cs/thunderbird-60.2.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66";
+      sha512 = "a20498a81b5f3a70a0995552875eb8eb2635b1d8d3508540368f6ec9938493927050a17cdbc944e9f0712622666d13ca6e15088cacdfd687de21b83bad7d7b48";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/cy/thunderbird-60.2.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23";
+      sha512 = "9a7ffb9eb9c3d561ba328e43daf232ca2261a30430a17d49010e283f7ae1e190475e3b0c87ab931e26ba6713eb1cd079a1f6f6ac1cd5cf5e991dcee940eae041";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/da/thunderbird-60.2.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7";
+      sha512 = "186a96ba0ade51ac1ef53aeb02b2c140f0b1da048d24dc41f97497ec1b37afeba5226cebcd1b1f0226391f20f972aa385f41220844897bf1cf8ed8f64fd895b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/de/thunderbird-60.2.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b";
+      sha512 = "68aaa7c30f119407f5a7adfcde55865f06841ca60b7819bc4966b16df12af87e32f24d631e483341a171e712979e90d9086fe43a1b1cdd92a512e178d6374ae8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/dsb/thunderbird-60.2.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982";
+      sha512 = "0bb90eec8123035e1833b746ac3ad1558ef01fe4647c94706a4988d1c8ed53b01f8621f3ac2aeffda640a8e6fd05cb71b3edca369a7b445608a8eae5dc12dc9d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/el/thunderbird-60.2.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6";
+      sha512 = "8f2072017f5edf494c091e712e26b253ae4809fbb81d1ee22063ad02f2cbde06f04d9873c61691245ddd249c489c4b3f58230ca12cb390abee8375114331121d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-GB/thunderbird-60.2.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70";
+      sha512 = "8a91106d035033e9a358f99d1b28cebad978586bf2e363b0856333583e6b1fbee191f3a8518efab85c188fa60c8c5d3d4452fffdd8b5f3a7998e213d5e6eaf05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/en-US/thunderbird-60.2.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642";
+      sha512 = "e104e90333fd9ad786cd59cb323a2a87a532b242aa7e6127ba38df00b9d747278cafda32b359258c9e6ade5a945c4a227ad81595e30717b1a06e314c511e975b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-AR/thunderbird-60.2.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f";
+      sha512 = "a7cfeb77ce146102b8583fa086536c58760ff30b69c8f9373be2277815ed57c1132ffdd04edf782ab8224f2ef231ae4c2c581dc13c174db6ff382a72975279b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/es-ES/thunderbird-60.2.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9";
+      sha512 = "7700206c19f5b8a434e323cd3f64df90696b04790620e6e20d23519dc92a8f3abcdcd8799d7d3843968e78cd8a6cf282924f3ebe442eebd40282fc035e096c0c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/et/thunderbird-60.2.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff";
+      sha512 = "14768d992308cee0fcb30d8c676d89f8e30bebc86f4fb4087c06d38afc41df418666446c65e995e74c67a6a6214c05338fd9471e02d5d5101e438b414c9873e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/eu/thunderbird-60.2.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca";
+      sha512 = "b8a33488d452443ee7393d77db68760b96d3f868050f49521a76b522fcddb7f4a573be06810c091e8b02d76b681c393554c01fc6800e420f9adf4c3e42bdb436";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fi/thunderbird-60.2.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672";
+      sha512 = "670db16b381e68e2f6faa353d91120a787ce360143d72c4a9041a4684688314e3dc466b2beb9166b76a822f8d96348b41bb32410678d711e39947c932424f295";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fr/thunderbird-60.2.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f";
+      sha512 = "b3474043fb1b3a6fd1d396d6b0490d8db71c135846e4ef74d22e80abf41ab4ca1faf346c9928424e13ef9c12d6cad19f389b4cd38c45385688b5b4587bcc0a0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/fy-NL/thunderbird-60.2.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9";
+      sha512 = "41b9f80ae6e8ce765d8fb057bd49af032532cee9d5f2c4b17a4d3833fbe8ace4c7ed4336433273e59f98a1b4cadef1ed49f77a95eca868a39e76e7454d7bf91a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ga-IE/thunderbird-60.2.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7";
+      sha512 = "f89277340c6deb07e73fd7a7227fa216960c89269e9d4ada0f8a6863ee60ba004317beb207a1128930fb8c28477963bb66ffb0a76e86dfcc371579672b0eb26f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gd/thunderbird-60.2.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb";
+      sha512 = "d3ac6c868fb504b71823b5a3139155f6f441839c33f10cf73d8e0bafab5e7d9f7bfae3b884b41fee1ced4c10565321bd13900575855d42f70958e569e7756743";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/gl/thunderbird-60.2.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158";
+      sha512 = "88f41447654685280aef548951609cb0ce7054a67c632a66892d1707d6d3dad3fe037dcea6ac8222080c0fc2f19d77f622506e82b6ea93114462b131fd4de308";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/he/thunderbird-60.2.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf";
+      sha512 = "faa622a8b7fb3c5ba4156cfb6ab4414c0a56a820a1593b555e817c3edcefc59fede6b681a0c6722cb540c81ccc425bb27d2895ff84f5ce2e61eaa7b37114be42";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hr/thunderbird-60.2.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5";
+      sha512 = "74321b6e6833014d60b698d7f83337c846452fc1e2148634150f192425607595795036e13d55ea0366c4d3e7c998c9c3766f50abebd606dd2ce7c3e6fbbf4963";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hsb/thunderbird-60.2.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc";
+      sha512 = "5964563cc323a606dd33019888ac483bda47f0da073e3d64ba329521cb7a192ae9014cdd2d44e48091d2f3f0219dab11a60497842e42e37a7b3be9415843fd76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hu/thunderbird-60.2.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e";
+      sha512 = "20ed810d74584d9c79b0dad65c50ab8422f841aa2e4974dcdef249aaf4901315c79ee1f071c4d03cd83fbb973eae35fa730aa0db88fb46617454ad5a4371f107";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/hy-AM/thunderbird-60.2.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5";
+      sha512 = "90973c56fb46c3c150efad6cfd48d24916983302dc459f386c5fa11ebeb4b32d7b7d4a35e8b3e0ff7358b4af9c13e112d01eb30abc069dfaa8ef8aa3af043955";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/id/thunderbird-60.2.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0";
+      sha512 = "9838d3e9a9fd30e03885f4195a951e285230a33757672c54c60edeecfedd220e6a8951d9bbfad34688ab0d16fe38507b3f8524d1ff3a987482cf761d67a17dc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/is/thunderbird-60.2.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2";
+      sha512 = "b951f6db2e2a70a6bf43e5cc7ce203d59b9062aad44bae3634db03dfe202aac723bb8b2283deeace96e8401c772f43aa985b76259de538f62dd970e285b09a42";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/it/thunderbird-60.2.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675";
+      sha512 = "389ec0d921b42e4238ce13546df6bdd1256381e95aea9e9e18e46524feeb4837b2be534fa452a4cae51d3fb060e059dbdffe7f26f017adc4f88aebea19f656ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ja/thunderbird-60.2.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23";
+      sha512 = "d012b6339c6e18aa49c4f6a4db40aae3315128b89938bbc64fee94a90db8cbd65b27bda9742a7a761c52fa974d9b5ab5e1d98ab485123c33be318d216ea8628e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kab/thunderbird-60.2.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552";
+      sha512 = "06b05f5d4c97008706eca67eb9b513b35122716a3083bdf3f3fb97cf0a6f1606c97a097a5c979657234562e505203f66bba483879fc2070c97514000326cdc23";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/kk/thunderbird-60.2.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67";
+      sha512 = "0ea99590b068925f137a63bfad3a0cce2e380f80388a94910836e7f517f0375d43f6f1325c6660eab13a97d1b9685102cef921f99135504abe70650ba7de9697";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ko/thunderbird-60.2.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69";
+      sha512 = "e89d27c4cae745c902f61d9534b6582e2af3806714e596dffac1a0d49416a0ab4eca76d9810853c759312c192679b2aae4a6cdb289c5b5d1f472450757c71ccb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/lt/thunderbird-60.2.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3";
+      sha512 = "3f86701c031aa174ffaacb532f198f7911045a855f8526e8a47ed26695e86bd40d1d83140cdab123e40a9759317724296f4ec7d788781b767590f0135b0c79c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ms/thunderbird-60.2.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96";
+      sha512 = "d44ddf44d0c0b5190f3b282be2e3f98dbd28a584727970ceb8b3569672634ae476b85c4dda4659d1a58d8ae36adb9db1c5a4d341f9f1f7d861af64287e546316";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nb-NO/thunderbird-60.2.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5";
+      sha512 = "d0455dbd94fddabbd474037325c792e3e30fc4aba419d04f0425bdd33db17a1532c955a992b1bf3ffe2c16f440c6ed5c15a5ca6e259c74a5ee1e3f84f457de5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nl/thunderbird-60.2.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d";
+      sha512 = "b4c24a1b73078a9196178d5ff0f386502afc451f0108321bb45641b30bbbe8225ffd54e00b883515b4849bc76ad8c4dfce525ae5e2aea378ffc31ffa5867dca1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/nn-NO/thunderbird-60.2.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16";
+      sha512 = "56ee8a0911a7a7034f18f246d1a607733842846f31d9715611b1e3df5aeb5b70f4d13e4af6785be53ba75a79e845066ffc7ce2aaa8d7319dc92d6ff04a2a5901";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pl/thunderbird-60.2.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e";
+      sha512 = "256331ad82a25c162681e4cc79f5f1c1127b09672e8bb663968950fcfbeeeadce26acb9ecbe10322552ec7d11e80612fab8582906380880e90ae6caa84be6cd3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-BR/thunderbird-60.2.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951";
+      sha512 = "67c7d28061ce5d1f2062092c308be8f88f7a718be637d359c400e56a772e5ff3722bbe3388b5673262dd12373b9728e6e58afbf9a713dabce5d3172532a8257e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/pt-PT/thunderbird-60.2.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2";
+      sha512 = "ce818347a10f580eaeb7f97d343a73149db571527ab207e3eef9108aca7309222e0ed7bda41d523d6e371abd6518d3cccfdc760d28eab692e23746b30940b556";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/rm/thunderbird-60.2.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264";
+      sha512 = "c2cf9e67ebc7aeeb8642fc2f32d721f4c9656456d9fc7d04df31672b9c6b07352d87f25d58d75267d9a8388dbaca238d605373559dca4bc238b02bc7a27dd837";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ro/thunderbird-60.2.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349";
+      sha512 = "f567baa16a96617e01753136f74744cc72c147ef59e40861292048fafb37745e0f8654d355c5e60752a4b86236b378fc15d09f656998a920ab970c6f7ca6e4cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/ru/thunderbird-60.2.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45";
+      sha512 = "e28699b8884f7859323870987fe425af0a8408152a3d373007b634aea1868ab1de483830c07da7efa1fd49c96b5be6c52f5bef91c21c8de0533216be57644fc6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/si/thunderbird-60.2.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac";
+      sha512 = "e8ea29c2b77398611b79cebd674983f9458d07b4866597fa2bc35ce6d78bf81daebe4311e93604e4e5a391e632eaa9f6601eb75d022ef1b2dfc225b9cc61b0c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sk/thunderbird-60.2.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76";
+      sha512 = "587f54eb86b0d0069433e14dce5f24e07ebc355f35f22eaba3ee0982e257782fe4ce5799ee0f7c733fa5a571935d2404ff950acf25b9be61dced6250d76611bd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sl/thunderbird-60.2.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3";
+      sha512 = "196a31e47578bcf064b42c3d3ed1ac3b623a54b5694fab72e1177257d68c13013352228a09ec8dd4fc53d91a0e8036b2b7c815432fdd35c624852cd74f98541c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sq/thunderbird-60.2.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36";
+      sha512 = "5a2b966e7119853fd98e976e555831058aa0c8cfdc463dcc79ca698aa4bb5d9b43b5fa2e6cb60a51cfee987c360c651de509463002aeb9c4e1fbe58b6fa4dd08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sr/thunderbird-60.2.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc";
+      sha512 = "62666fe7d94f3486d1d5df1cf479bd21a13b9bdc9a4f24fa1f280a838c008d28a2fd6e78ac445ea6ce126fc54b60151e3c4f9b3820e231c8593fa83aab1076fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/sv-SE/thunderbird-60.2.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13";
+      sha512 = "b8f75bfdb3ad9ffa768a5ef4cdfed93004232d9d4f301b0e5b9ce56fd47d34efc779fafcb67c0b848a83ed59c1fa4bb17dbdb583599a99b78186489099159d92";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/tr/thunderbird-60.2.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777";
+      sha512 = "b72e4c0d1564248927e1f2d8922651e3f7e37e99de77dc548508d4c0c1951e0e59b461cad18cf0dca0145d7465fe7bac93ecb4841c18db2b57822b0014b2f83e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/uk/thunderbird-60.2.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a";
+      sha512 = "7287cb6fce1c1482e0adf00598139b0e9e97371171a14b15ea42652c5890fb1c7de0aa213220444c68c5fe33a43f242f0475b5836deebcfe5fc6b52e21c195e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/vi/thunderbird-60.2.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5";
+      sha512 = "07886cd20ea43fbac59055d5cf34776fd38616477f8c55f4af78031034f8198ef57d716b365ee7a08f267fef0e3b50ba188dd31b1ba1508545b85fd7001f4326";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-CN/thunderbird-60.2.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7";
+      sha512 = "d34dde5c5f063d8d79a0aa032f54602570426bcce920810d1fc3c8e842827fdbb0b8b9dfa3e4049bf37de4c98356f7e87942bfdd3f7483bb6e3dc7ddd2ebd246";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.2.1/linux-i686/zh-TW/thunderbird-60.2.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59";
+      sha512 = "e8de34531211a60099e677dd619e9e75883f0d5a935df4807b0075dc3d8c57c97dc364eef629896aa46066d290f7138ed67e002fe0cadf7e86b0c77cf99f080f";
     }
     ];
 }

From af08956950a3aa017d99fce8bb00ebbaa9e7b492 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Wed, 3 Oct 2018 03:23:23 +0300
Subject: [PATCH 2289/3253] boohu: init at 0.10.0

---
 pkgs/games/boohu/default.nix    | 38 +++++++++++++++++++++++++++++++++
 pkgs/games/boohu/deps.nix       | 20 +++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 ++++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/games/boohu/default.nix
 create mode 100644 pkgs/games/boohu/deps.nix

diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
new file mode 100644
index 000000000000..6d4129edbd00
--- /dev/null
+++ b/pkgs/games/boohu/default.nix
@@ -0,0 +1,38 @@
+{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}:
+
+buildGoPackage rec {
+
+  name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}";
+  version = "0.10.0";
+
+  goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
+
+  src = fetchurl {
+    url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz";
+    sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6";
+  };
+
+  goDeps = ./deps.nix;
+
+  # If ansiTag is true, the "--tags ansi" will be passed
+  buildFlags = if ansiTag then "--tags ansi" else "";
+
+  # If ansiTag is true, binary output file name will be "boohu-ansi".
+  # Otherwise it will be "boohu".
+  postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi"
+                else "mv $bin/bin/boohu.git $bin/bin/boohu";
+
+  meta = with stdenv.lib; {
+    description = "A new roguelike game";
+    longDescription = ''
+      Break Out Of Hareka's Underground (Boohu) is a roguelike game mainly
+      inspired from DCSS and its tavern, with some ideas from Brogue, but
+      aiming for very short games, almost no character building, and a
+      simplified inventory.
+    '';
+    homepage = https://download.tuxfamily.org/boohu/index.html;
+    license = licenses.isc;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [freepotion];
+  };
+}
diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix
new file mode 100644
index 000000000000..8b6b32811938
--- /dev/null
+++ b/pkgs/games/boohu/deps.nix
@@ -0,0 +1,20 @@
+[
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce";
+      sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94a09120d7f7..e65d130dbc36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19808,6 +19808,10 @@ with pkgs;
 
   blobby = callPackage ../games/blobby { };
 
+  boohu = callPackage ../games/boohu { };
+
+  boohu-ansi = callPackage ../games/boohu { ansiTag = true; };
+
   braincurses = callPackage ../games/braincurses { };
 
   brogue = callPackage ../games/brogue { };

From 5e7bf8c5e9da260c912e8abda5fb8a407ee3da7e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 3 Oct 2018 03:48:04 +0200
Subject: [PATCH 2290/3253] nixos/tests/misc: Fix reboot-wtmp subtest

From commit b63f65aea0dea11c20e9299210af1d2ee4299b58:

  I used tmpfiles.d instead of activation snippets to create the logs.
  It's good enough for upstream and other distros; it's probably good
  enough for us.

The "reboot-wtmp" subtest fails because it it assumes that there is a
reboot record even on the initial boot. This is only the case if wtmp is
created within the activation script, but the implementation now uses
tmpfiles.d, so the creation of the file is done at a much later stage.

Apart from that, if you think about the state after the installation as
"first boot", using the term "reboot" wouldn't probably make sense
either.

So in our subtest, we now reboot the machine and check the wtmp record
afterwards as we did before.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @jameysharp, @Mic92
---
 nixos/tests/misc.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 6d72ac997f8d..3ad55651b112 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -78,6 +78,8 @@ import ./make-test.nix ({ pkgs, ...} : rec {
 
       # Test whether we have a reboot record in wtmp.
       subtest "reboot-wtmp", sub {
+          $machine->shutdown;
+          $machine->waitForUnit('multi-user.target');
           $machine->succeed("last | grep reboot >&2");
       };
 

From ba02a2c3715e03329c143723c8c2c6b43fafd3a6 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 2 Oct 2018 22:53:48 -0400
Subject: [PATCH 2291/3253] Add Darwin as a supported platform

---
 .../libraries/science/math/mkl/default.nix    | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 7412ecdba21d..930dcd87a635 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, writeText, fetchurl, rpm, cpio, openmp }:
+{ stdenvNoCC, writeText, fetchurl, rpmextract, openmp, undmg }:
 
 stdenvNoCC.mkDerivation rec {
   name = "mkl-${version}";
@@ -6,24 +6,40 @@ stdenvNoCC.mkDerivation rec {
   date = "2019.0";
   rel = "117";
 
-  src = fetchurl {
-    url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz";
-    sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf";
-  };
+  src = if stdenvNoCC.isDarwin
+    then
+      (fetchurl {
+        url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13565/m_mkl_${version}.dmg";
+        sha256 = "1f1jppac7vqwn00hkws0p4njx38ajh0n25bsjyb5d7jcacwfvm02";
+      })
+    else
+      (fetchurl {
+        url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz";
+        sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf";
+      });
 
-  buildInputs = [ rpm cpio ];
+  buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ];
   propagatedBuildInputs = [ openmp ];
 
-  buildPhase = ''
-    rpm2cpio rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm | cpio -idmv
-    rpm2cpio rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm | cpio -idmv
-  '';
+  buildPhase = if stdenvNoCC.isDarwin then ''
+      for f in Contents/Resources/pkg/*.tgz; do
+          tar xzvf $f
+      done
+  '' else ''
+    rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
+    rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
+  '' ;
 
-  installPhase = ''
-    mkdir -p $out/lib
-    cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
-    cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
-    cp license.txt $out/lib/
+  installPhase = if stdenvNoCC.isDarwin then ''
+      mkdir -p $out/lib
+      cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
+      cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
+      cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
+  '' else ''
+      mkdir -p $out/lib
+      cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
+      cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
+      cp license.txt $out/lib/
   '';
 
   # Per license agreement, do not modify the binary
@@ -48,8 +64,8 @@ stdenvNoCC.mkDerivation rec {
       threading models.
     '';
     homepage = https://software.intel.com/en-us/mkl;
-    license = licenses.issl;
-    platforms = [ "x86_64-linux" ];
+    license = [ licenses.issl licenses.unfreeRedistributable ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.bhipple ];
   };
 }

From 6487a4799621443de16b61c8c7206d4f11df1687 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 30 Sep 2018 21:42:54 -0400
Subject: [PATCH 2292/3253] Updates 18.09 release notes for release.

---
 nixos/doc/manual/release-notes/rl-1809.xml | 339 ++++++++++++++++++++-
 1 file changed, 337 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index f0797b51340d..1e62f1534248 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -14,7 +14,45 @@
 
   <para>
    In addition to numerous new and upgraded packages, this release has the
-   following highlights:
+   following notable updates:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+     End of support is planned for end of April 2019, handing over to 19.03.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Platform support: x86_64-linux and x86_64-darwin as always. Support for
+     aarch64-linux is as with the previous releases, not equivalent to the
+     x86-64-linux release, but with efforts to reach parity.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Nix has been updated to 2.1; see its
+     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.1">release
+     notes</link>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7
+     (unchanged), systemd: 237 → 239.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12
+     → 5.13.
+    </para>
+   </listitem>
+  </itemizedlist>
+
+  <para>
+   Notable changes and additions for 18.09 include:
   </para>
 
   <itemizedlist>
@@ -70,7 +108,7 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <title>New Services</title>
 
   <para>
-   The following new services were added since the last release:
+   A curated selection of new services that were added since the last release:
   </para>
 
   <itemizedlist>
@@ -125,6 +163,303 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
     </para>
    </listitem>
   </itemizedlist>
+
+  <para>
+   Every new services:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>./config/xdg/autostart.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./config/xdg/icons.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./config/xdg/menus.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./config/xdg/mime.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./hardware/brightnessctl.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./hardware/onlykey.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./hardware/video/uvcvideo/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./misc/documentation.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/firejail.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/iftop.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/sedutil.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/singularity.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/xss-lock.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/zsh/zsh-autosuggestions.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/admin/oxidized.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/backup/duplicati.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/backup/restic.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/backup/restic-rest-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/cluster/hadoop/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/databases/aerospike.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/databases/monetdb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/bamf.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/flatpak.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/zeitgeist.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/development/bloop.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/development/jupyter/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/lcd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/undervolt.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/clipmenu.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/gitweb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/serviio.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/safeeyes.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/sysprof.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/weechat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/monitoring/datadog-agent.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/monitoring/incron.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/dnsdist.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/freeradius.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/hans.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/morty.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/ndppd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/ocserv.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/owamp.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/quagga.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/shadowsocks.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/stubby.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/zeronet.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/security/certmgr.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/security/cfssl.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/security/oauth2_proxy_nginx.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-apps/virtlyst.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-apps/youtrack.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-servers/hitch/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-servers/hydron.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-servers/meguca.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-servers/nginx/gitweb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./virtualisation/kvmgt.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./virtualisation/qemu-guest-agent.nix</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
  </section>
 
  <section xmlns="http://docbook.org/ns/docbook"

From 856fbc8dba947221788841de414bba7a391de4ed Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 2 Oct 2018 21:27:02 -0700
Subject: [PATCH 2293/3253] treewide: fix allowAliases = false evaluation
 problems

---
 pkgs/applications/editors/flpsed/default.nix    | 2 +-
 pkgs/os-specific/linux/roccat-tools/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 1c40b509bfe4..104206a14913 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fltk13, ghostscript, xlibs }:
+{ stdenv, fetchurl, fltk13, ghostscript }:
 
 stdenv.mkDerivation rec {
   name = "flpsed-${version}";
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix
index a413008ffd1a..c2fb55b344b4 100644
--- a/pkgs/os-specific/linux/roccat-tools/default.nix
+++ b/pkgs/os-specific/linux/roccat-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, gettext
-, dbus, dbus_glib, libgaminggear, libgudev, lua
+, dbus, dbus-glib, libgaminggear, libgudev, lua
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ cmake pkgconfig gettext ];
-  buildInputs = [ dbus dbus_glib libgaminggear libgudev lua ];
+  buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6253c9331276..a824858be91f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22155,11 +22155,6 @@ with pkgs;
     callPackage ../applications/networking/cluster/terraform-providers {}
   );
 
-  terraform-provider-libvirt = callPackage ../applications/networking/cluster/terraform-provider-libvirt {};
-
-  terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {};
-
-
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {};

From 1491848406538ba77d12a723eb5046b78481871a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 2 Oct 2018 21:59:49 -0700
Subject: [PATCH 2294/3253] wireguard-tools: 0.0.20180918 -> 0.0.20180925

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireguard-tools/versions
---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 3f1949d4bb68..493f52bd11b1 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180918";
+  version = "0.0.20180925";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0ax6wvapzmn52l7js6n416852npgapa9875yl2ixs271y8m9kv40";
+    sha256 = "10k63ld0f5q5aykpcrg9m3xmrsf3qmlkvhiv18q73hnky2cjfx62";
   };
 
   sourceRoot = "source/src/tools";

From 1a3bd10f5a762524613b1d4eb96d277320bcaced Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 00:10:06 -0700
Subject: [PATCH 2295/3253] yoshimi: 1.5.8.2 -> 1.5.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/yoshimi/versions
---
 pkgs/applications/audio/yoshimi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 65a3bbfdc011..d35c7b05a893 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.5.8.2";
+  version = "1.5.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc";
+    sha256 = "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0";
   };
 
   buildInputs = [

From 17094f37c9983f680617ee7a8f6721c759d19368 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 00:35:14 -0700
Subject: [PATCH 2296/3253] zeal: 0.6.0 -> 0.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/zeal/versions
---
 pkgs/data/documentation/zeal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index e9225900cb7b..63fe26f069c7 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "zeal-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner  = "zealdocs";
     repo   = "zeal";
     rev    = "v${version}";
-    sha256 = "0zsrb89jz04b8in1d69p7mg001yayyljc47vdlvm48cjbhvxwj0k";
+    sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v";
   };
 
   # while ads can be disabled from the user settings, by default they are not so

From 64d02660cb832ceaf1e3fe88c9c3e9a27609cbd4 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 3 Oct 2018 09:35:34 +0200
Subject: [PATCH 2297/3253] firefox-bin: 62.0.2 -> 62.0.3 [critical security
 fixes]

This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
---
 .../browsers/firefox-bin/release_sources.nix  | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 1500597318f3..6c6e05133bdc 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "62.0.2";
+  version = "62.0.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ach/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ach/firefox-62.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "30660e1377c125ec195006d84ba5ae356c8b53b21865675ac7649ffadd169e578ab91d0107f18f26530788ae66aacb7edeec1c507bccb456e1aa89bac95351dd";
+      sha512 = "bcf519e0080aca1cf232ec327ea65973e71230dd60204bc1fef3284dd94fa123f4a60421b647a3f64352829b1ef3b0e0b689a1fa7a06f6b1848c5acb1d33b917";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/af/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/af/firefox-62.0.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "81e3d9b33af731c9a79bdac678c84d2f30de0b77b6d90d4adaa7da11383e360444f85bf7465add562048d13692cce88b3fb1bd63beac30a6d490f6b75eb9be26";
+      sha512 = "5b145ab068216846169303dd75ad3b5a40e82129234cee35cd7a559cde0dcbc6abb1d6ce50680b9a8180828db82f3c23d62e9dc46015a88b0a3c75eb164c17df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/an/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/an/firefox-62.0.3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "42d3118c2bba77aed919a1675538f52230841ec6c8398e2b9964631100c22c70335fc80f8757a916aef7c0ebabccc5356ca323901061d1bd0e5ad4eb0a10b483";
+      sha512 = "92a7b8eda43a1d6323e058d285e5b599b14ff8a7275d8e900d9ad8d5dc8160ddbfeb8134b877cbd078b3e3ce9919c2906f4cf7f9224f807f6c0ebf0c6e906be3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ar/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ar/firefox-62.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "c6a5a647e17b8b4fb4e20a32c2e492c6102cb899acf5af2d3af3af3cd122d989bfa452638d038b9b7c8c0bbade604f6caa11f42cbde5a3260fb13e44080cd720";
+      sha512 = "2592b6808abd04054ab6d71b8f44d94eb040c92f53c755b2258e4a10a3c8cd80241dedc2e57924e9410717cc8943947248b27c753c6223aa57352b0a08cd64dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/as/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/as/firefox-62.0.3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "c1664a83e3dbd7b3041449ab4f7b9b41b038425c126572d380bf9c5d1d7318264a8ba798d670156ba91625de0865ed0b6e4e38bbd2ea700a118b64bbeea95b25";
+      sha512 = "224c3d09c1122f2444d2bc75833d6db60a7cbdacc819d16d40a3d5e6537e275a5720f1b6d4616ed318868683b99547d03aedc21175781eab0b32ec8c6be87495";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ast/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ast/firefox-62.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "31c15cde2d9a0f93fa742c41032e8b6e06ad24a5e6126c953e70c0addc5d1a74c5b5d06088002b4c1516a1f75b2e3e82d9d04c0a624db781bde2d3e8182062f3";
+      sha512 = "26b316efd6d4d238726e5a1fef3a6ad00af3f42cd45846598e4562b9c5b2d35af3372e283efd30713464c440715de82ce49ce3d73569ff528d90ec479264110b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/az/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/az/firefox-62.0.3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "8d3f949c325bd5efb9619e96f8d8688324d113ac7add21b1d3290c160bba1e2193f923a54d3ce295e75b2ea0a59ab9c718e117374a46963ef69c53f3ceaa1957";
+      sha512 = "29935c406c955692a469762a9c53762d6a8f7ccd4555b53c31283f4767db2547a17819f7e55aafd011b3570c30839e350dfe74a52d322047647ddaae58b23919";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/be/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/be/firefox-62.0.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "7cb5fd02ba28c54acb1c73320f794165c0debf35a35c5e15602ccb7677b879ef41c910deb4668c0f160663b7a6afa43f30492fc23691406848e6adde7fcd0b02";
+      sha512 = "e4a438ff8a9100126f0fac456bd6aa7d0713bf2e22e7ce6490c4f3ec5643087b668bb5d8d867c9466a289a964f957ce958dd9545ada53b207bf026f3f8200373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bg/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bg/firefox-62.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "c6484b8b19941e135d2dd983085325d9f5bef118105879b0f830762ec1899096146a454397510286a902d175f9ad4eb3e849fdce38844535bc8a92bcaa478862";
+      sha512 = "3b17536b1bd6cbb94548b7b2b0d05ced711ef116acc4687309c3392f77ec0b51cb4814efbeee26ceb51328a4ae5b5ee1c4d8e69e57c2580be8cb1989bb082cba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-BD/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-BD/firefox-62.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "4526b294ea939f88c92a3275ea17fe16932b410b0114af03d9f3db892cf6ed1a9d0ae0a6e0a651a0599aaee9bf53c69273b8d0286b94656635b3357ee2ab021a";
+      sha512 = "d9969a8d0fda1bc4d108f0c24e934235186420734df1be38db9608e303d7928b45007b40857681d0b29826bc26628b3b86388c81925059ebb23b6ccbeb80f375";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bn-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bn-IN/firefox-62.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "3a17f78a48c7657d7ed834f4c05b523d661c5a692e27751e48ed8ea6f580cee21295b025a2474bca10fdc803ade0acef0ff0f0ce40de992a1fd072ca70a1062e";
+      sha512 = "7e449679b8bece1eed95ca5e3bfbe1a303d9dfa8bd4b9e53d14f99198e01a4dc4367112de48ad50b61c3cc54eaaba8caf143c36336da3c86c2815828ca5a2a80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/br/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/br/firefox-62.0.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7932c59f390580c3a9f333fe40ddb9aace2c7d35703ec022468c503b4e58604fff777fb86e44cfcb84186845e8da26f55a7d0584d09982e88ee08e2b205f289e";
+      sha512 = "328deff7045bfa2187c19a66ca03a0c8f25e266eb6ea9c19715c201702245a0c338458254297974aa18466350231dc800f20b72c552f4633d5eea176f45adf80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/bs/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/bs/firefox-62.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "509b1d013a5ef5bf5f5a8167685a7232ee400202c1bfda37eab1ad8965cf0d7a6ae2988163be050b5d37741bb405df5b28aa937c82e086708cd6d943b5215ede";
+      sha512 = "20f85e5ca5f7a7be5079778b426e252c98112550849fb6e16e3b0d52a15570e638c8a664976a9252891a2254be59fe436dcda0d65b1f9ad5cdbe0cc5636cb93f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ca/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ca/firefox-62.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "75b918bb00c9039228b8881ac8fef4dbd36521b80651dc2d6b1ad1f6701ca39f3527b244c88d9e97ba1ac0a6e12ea7b6a3c40f9b95c0c2167e7c175b5d9ce37e";
+      sha512 = "7abd7b7220c6a5b1cbb4c8f9ee6c55d15682bba5bc1e1356a038f9b1ae7ec351c57ef4dd19a02f8216f6789342d5d91cf76a00ecf13e71c8fad0f1fbc315e775";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cak/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cak/firefox-62.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "8803b41c4651174e4999804071b27d7cbf47497a8a5b83488654d0586fd6245d5d517c03e64e8e75ccc0991b2be47cb0ee95143d08828027e627409fe6c55cd6";
+      sha512 = "2a8070bcd971261d994ae2ded0366b9e07961e1b98aa76c117d1e949a8f9990a22ba461ebda223b76f33c7ca94e1862a888b000642a4f874b8b92d2b5f470736";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cs/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cs/firefox-62.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "182cd25579ad04713852e0343e0d9604f42772a4c6ad06da512a8286314451f7b90c667c2f199afd1a1162c8ff6d1320abfc87207602182a3cb32196916189d1";
+      sha512 = "8beb5c0ee3a0b2a556b455e41887dda126a0892df50aba4e283f0db819c99c4601427370c70c09d176f1a6ee8d629e1ec5f8b803d51b9444237e56c7a273cc0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/cy/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/cy/firefox-62.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c65fff984a351cc67dba5574e7d2b3291de4e6c78f7659a6020d70f09cdb3bc951696ba88b778df4057633e9e06013799af58f5f2d0a052bdc22e7c98aaec278";
+      sha512 = "ec1a4fb0c8f753454aea88fdcfb3a340d0328d9c059653d9390a71841098573d667c2329c0c8dc88a2fc52eedfd8dbc584df2fe44fff273f8aeec8a3f1eaa0f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/da/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/da/firefox-62.0.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e9fa596fb6c825fd3c2b1d5f42ad1c192db42ee046ad2f348733a979135d41bf2b0efbcd8ac2fb68e0337890ac3131a3454425425ef727225786ab0cb51f4d9a";
+      sha512 = "79532e1cf94447797d9d816cdc342fe0f8c37915494ff000bbc7148c2d42a1adeb7226887d51999774b6068f62d71bbb54b0951bc606003a91df12e9f24e7691";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/de/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/de/firefox-62.0.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "7a4c786b18299378c4d8b797e99385e35ad501912f05c02bad311665be6d52a6435a3fa04c7a8ae8a562af654aa3cf17eb497fc9691fbd0b2cf46a67f5967353";
+      sha512 = "5f0d10736912f6ad4bd38538601ceb8db10cf97dd414446366218ccb03ae010037114d688409cd724e194126524bdd442f71b1cf646f1f3ac46499afecc082d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/dsb/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/dsb/firefox-62.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "52ae2b79d9106fb304b4b3b945ac9960614efdc7780406e87bbe1dc15effc049e8cbb91c8f4f2dcd1966ed0085e3574e3e1a4234d933fa587e05901875234344";
+      sha512 = "2cafc29c75b055e4c21e12fe2b2ca3c974ad53fed43c8b082e09323bd1854ae7179da13c7d33edf41f783fe0016053d52292bafbccdcff79cc69d8ffedf01ab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/el/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/el/firefox-62.0.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "956d5d36ec255ec122c09edda12a2242bbbb03793385fa9c417fbb8037fb19506298a31bed94eb39e825e4fcb66184901b3580ced8812cbc44f8a4d8ba339d19";
+      sha512 = "b1246b56eb0d61d5ac874383ee279d3c9dfe559127052c4d4403ab0009d702a76711d05f1ebb781f972d9cbe6cee9a6b3c1aea9cb74866e497f2569480a2cbf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-CA/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-CA/firefox-62.0.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "6a93cedce6724a19ea663e70ef9d57d27c144c1250c438ff15cd8d36c3d92b8a95c9e3f81fb53862b550d0765a8f0b7bdc14d6d9929a41f18357e0d0cfae732e";
+      sha512 = "8d344a08fce1be002b5710031250aa0f13d237bd38386cb31d5f6a75cc29ee17dffd01e1375e4a26b1a136d268db6ebaa591fc23789b3fbd7771f42a6bb59979";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-GB/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-GB/firefox-62.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "c3f825196d8f1d1284644ebf07f08a7626086c869408603d50ded5b0eeaa98bb9f874c7df38bbbf3083dbb4a1ae8afa8e4c90ed35a83fd99bec78cf3813dd92e";
+      sha512 = "88899808190f9013eba157345adc740fbd1889fd1ac963209cf093e9bd9f1e9b3f35126e85c5d3a1590e02ff1da8c09fa390ec519bc0ab01bab7c37d9b5d4bed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-US/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-US/firefox-62.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "f19a938af6bfe6499bb4e4337ece1cc0918fe56b361ced0f131f010652b2849d98e48a7cd06277580cc87843454c7bdfe816b65c99189e1ba749aaa64059a6ef";
+      sha512 = "577cdf1e1c4845e0b22c174833b0e20375443121e429a57d16f1f0e3af86533a6c27d35d8451ab25b3f7ba10ee9385d0f497866b50d4f37a81f9663137aa3395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/en-ZA/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/en-ZA/firefox-62.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "0214fbf75843617b0623eea8c8ea2ef46d23d739f63a74ff47fc87ff16817d9110862696f92ba614167386bc51c5e94a9627d0dcdd22c19c20bac4a24543c126";
+      sha512 = "ee679b5bab64492bd069cd9b3b7509db7a5296a019d8712afd12a5b6ffeb1911fc4daaf63483b895b79652f67f9095b66be780a2b0dce3e7b9b57fb5fcda316a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eo/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eo/firefox-62.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "7da531166d26dfa3cd1edc327eecd583e10c8a2c41d007daba41e6f28e42159e1c43be5759061891c74ab0157ca3d4ce58b8a6a7d879ad4ce4c50586341b460e";
+      sha512 = "32e54f1a83e4b3cf8f7296fad200abedafb5c7d4bd409c7acd2806944a241b6923794a33a7999754e4d2010f2788ea3a3d08ee72a9354713b6cc2ee1dc73a665";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-AR/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-AR/firefox-62.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "e5bc4003ec881a41a28b6847dc9d90c81dec5ba9d103111922fdcc718713c67027f5b04a9d608d4e8b20a656abd94e0c5c8d5819135e8884d84eeb952b855590";
+      sha512 = "ce740d773ecc016eb89e9fe4370e199294f8c51c4f5f74bbe7f09a5ac060b374d23e80fd8a27b63c6149bcaec2b93d58a892ba7f53c08628c141b406838e2d58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-CL/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-CL/firefox-62.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "c5360481d7a86bddb87805672dedab22735e484e3a048e5e57e9265034ac40d0e5586bedab617da1cb54a4b7c1d3b4e18bd5f0cc0c8b8d3563df54b7ad506b23";
+      sha512 = "9ea5c06200091975c98587627ca371bb492cef91ec200a52409b4b30092aeeda64360913b8950ce56031aef34e66364bea71bb071df5549736dc0900ac54f7f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-ES/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-ES/firefox-62.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "8977a46f5946da99c4e3f30e3451110adf7993ad5a64f5dee09016932ee55a63ebca9126f7c3196191e658aa39465701db347068bdc6e6acc85d061873ccf226";
+      sha512 = "df71790d420798b17e64aaeb007f7f8585037d48b7c8933f5760b75385c945ef16e815c84b5872cfef8a2ebafd3293cbb4910befc4844b166f16774947a9b32b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/es-MX/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/es-MX/firefox-62.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2bb3eeb2bef0f7c72c9bd95093e4c80b69e6f56ec41d0d4b3c54d2f8d7496884394583fb77e9f5e985ff6dedeb94711d4732baaaf5947e26e1f7b13f3024470b";
+      sha512 = "02e0948d3f4855a9c9e502627cf5d199364c0f0a7ee7f4314d69c9977f8504e43c3dc1cb8e80c9aa6bb6f4d75609108f6aafa8c9acdac31aedb908b5df26e1a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/et/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/et/firefox-62.0.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "cad31e57d54d5e533f5c999b2009d29c22c9469b7b620499df7f433d0e86f14ba336665a9d9917a48f55d9a57e30be70dd461e8e2159092d5c2c1435e842603f";
+      sha512 = "776bed6ba54f1ac29836681a99ec673741dd439501b7859a68c1d6645693f566fb3dbaf2e827cb23d3ab993ff4ca290008de7256aa28cc6e29625eda4048db27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/eu/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/eu/firefox-62.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "6cfd46bc362a9dca327651ad9219979e321c8ec8ebef21fed64617e7c5540804ce0a16514848faff8e3a3018a454e8b90fac627054b92cb96f5fe8046326db50";
+      sha512 = "7e95ac325fd4726def5aed67ee110693dbeb7953aa5672913c18cb1b91f8a884500e6096a5100e89d9266c28ede9d677be91fb00227944d379a946938ffc752e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fa/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fa/firefox-62.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "cfcd0562561478bf2d14ea6b2d87c081d86c5c6d30bd7c2c1eea673e2a82f875a2f954955fdac959ba96ce5fe8461c82137bd3c6313eefb3fb24bd4993692c29";
+      sha512 = "6cc8d99ddd690f7dac9da19d23666e655aa65a576cf912b195ec3f83ece9b5a6677d656a1d187930897adfc021ee3d16e3113a8d8454fb9b4a9f878c615b49ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ff/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ff/firefox-62.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ffda297f92bfa0a76d613e7c54a71d376c2264570ee8d9f2bbed9faacded01cc8ea9fb171ae14f4d349702d91896899299bfd6b2cb66e9ded933bc6e34e63033";
+      sha512 = "026976b48352d2c292d27b0df8f17f75f2bbdc0822d89b722bd1e58d9189ce35c925da6de287f0f89e18ac9f64134a1bf5dbd3b6da609da823686acfcea5b05b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fi/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fi/firefox-62.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "be791b05d114f2d49c23714898f240aeaf9593aae6b7d06a85fb3e6dbe9116ee19d5089aff137e1c0fc56873c172a73937e15b19eb76db15122019649dd83a58";
+      sha512 = "8d7621858ba33c340248df277f3822c120b4beea5cfb9811afd61b85fc2b5dfdb100c475d0b291c9bedeffae4ba52bea653d925571af8c68bafae6c997beba74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fr/firefox-62.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1f167a7df26ee83671a7c3dea3bcccaa7797da0253110eafa3de5a17b7e19d1710966ac3a82bb0e7bee3d7287a6b39f59b9152672618dbad5d782e297ea6587e";
+      sha512 = "23f73a32cfa388bc21c1e202886d83a36c21a8b4fd83f7001ce72a911be800d9dd2d49e21cdd9d9cf48a82121d4684802dcaa7d97b3bb47b762ec4c95be49011";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/fy-NL/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/fy-NL/firefox-62.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "ed9ee111ba5b451b5fa730bc0f8e14046ad7613d542a7695f68e28d9fddb279770e3663d8b9964617d803f073c7f02dc036e4cc6ce3a17b69ba5fba782831da0";
+      sha512 = "2d3c4d546d1d8f03ab407c2bf481e23bb4bf191b84e9e0da533b2b00a0c8f7cea7c5730fcadd777b909c9515981e61a1fef25fd1037d75bdab15901a877c9fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ga-IE/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ga-IE/firefox-62.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "073b104cebd63452fecff3949195ebeb794dde2d4c2defb44f62f4493165f5dcac20320da8229bd7c3e5410b840bb51b4699d77fdc886974848745e066ccec16";
+      sha512 = "7f52631104ef48631d2d2d5434a50d1f62447b314329e9571915bf16b246c9910a8875500077474303806edc05993d79c72b60a2b6f3a64389446609092320d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gd/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gd/firefox-62.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "307262bb8874fc6115051608bf4a79e51fb08910de7d3df44a6bb3bbde64d3a76aa88361f10b811a2af9a05518d7ba42b6f2e078d5db32f0118cd08f8a3ec7fb";
+      sha512 = "98b9275029ad64dbebebeb697ccfeb1dfd2b0d51e437899a8417292f2a14421a5a83f07164cd4158250aa08d5e45bbe4c97e1fc7ebf3fa02cf42d7dac740aa0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gl/firefox-62.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dbecb09308a701aaf13d278b208fb3b9e7631c8fc07b9b3fc99c27a4035ea7fd75da810063913449c2746933c63cf7a5175d4d5a17aa808f6bd8d19bf0692f0e";
+      sha512 = "6abd8e3d990983094880056924fa60c14efb6c133f05ef129294c7cd83725df1e32a85bc08ddffc22f3e3d4414744345f67ca5f055af74a93a0eaf8838f38f8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gn/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gn/firefox-62.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "f62e0a0cb6794f6fc36c85f98952ccd313676d4389b12a054461789e30effd3effb6fc729bbdfd83674c2691d03aa219ddccfcb6eb74426ff49bd4a458ff7ca9";
+      sha512 = "043471a8b62dc300f1c719ea33a6c8b3690f38876697cf57625e26bf1d66ec2a4b6f952c836359da19f9b346851c3fc20525fad32596c9e91b9f5b23ca1672d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/gu-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/gu-IN/firefox-62.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b0624b04a3a20a48358027aeac449c52198139a3e9dbf0bc035a06c22fae3bcb44f34a07ad88a14a44e87dc16a3393688ce8d45d5070264d1ce63b2c183aceb1";
+      sha512 = "ae849a0f9350fd0382e859ae9fde0217d73014c3fb7a7974b635b3bb2f7d62087c7b40c62707ff64eabd37ca700faa0f392e737b1ace15494d44fd6a87599b69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/he/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/he/firefox-62.0.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7b3f4478100b6122c22fc50a944dc86e46b3d2d73893209be748c001461968a21500562b2eb18a40669d13068618ca3093ada082470833085b78f4083064767f";
+      sha512 = "49a350f95858916d73aa71be60bc3f162bee24556c06524ccc5d10eb7658e91affe4c8945d92c7c6958eb7c8bb3879211d6096a1912bc4b50a9e35b465ddd219";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hi-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hi-IN/firefox-62.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "13d42b552bca18e0020b891f6b3a563b66dd86b3e5fb9b5badae88ecf5a37b5febd5b9c927807f7996b81ddfcd4ef076553fc82655eb05c8a04a920f2a64ca71";
+      sha512 = "a55d2647fa5ffe06fc479675676700edf460c7d7600fe18ae468fc3e13a8cb3cc025dd64bff244b61724ee213835a64c71e51e2d59a0ac2eaaca0a29a692dfaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hr/firefox-62.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "5bf92b1abd156019935c8728435101fcee9973ea413cca05760322dce94b62fed9f7271699610e00e812f0c7d320cbc966bf03fd5250b9dbf9bb2ac2a5f96466";
+      sha512 = "6d961a7936c46dbdeb4d66a6ba91414a158593120a58f9f454ae77839cfedd5af2dc9d3dde02bd2d36e21f946b5ff9de0727abf44c2ea78f6e618cb84242892a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hsb/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hsb/firefox-62.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "777ef75daae66a138f4013ff19fccaf7236700a8c2a46e6f0f811065326c7f4fb7dcb284ee9bac2dc3461b45cb8239015ff24731a691a85a199519398c03e53b";
+      sha512 = "eba4e20491a61d9de7a25373bec43fac62b9ac3b461be5e593117ff4d31884acee63c2c6bbb56cc7eeef67bd36b7d3bfc748169fd7fc49877efdf7656813ee5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hu/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hu/firefox-62.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "800f1cecd46b4adfaf1ed20878d422191709801e148aef5e827c4cc3b9fbd46ecb475dd3c4b412a39ae2b05d4af2be8ec7d75515e2b98b1e07aef74fe49c4d70";
+      sha512 = "d78c29d57143a3aa443ff79718afcc9c7ddd72b8f9fa3dfebcd6c19279947685a7560fbc4ba2de42589cdf4d9a71de94e335fd6641ce284fc60418e483895b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/hy-AM/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/hy-AM/firefox-62.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "910fe027a761480a4673207733fb5a78c0106249806f5c5347bb602de6853ba4299f2b13c896a088368eef036bef38962a487b4b3d6957f765f39eb06bedfebb";
+      sha512 = "e7239c2f90870322c16e9af03da9156d8d36b6ef5b71053006f78f94af9da068e81521eb155abfa74195a83a63f7181cafba270c9bda2d4bea63f9cedf9aabef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ia/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ia/firefox-62.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "4138b14e0cdb6f6760e5892bbdfea3c244460cf2c922e737a1af568b1df5aa0076cdebc836688cfd74d97ac859cb8fd71ba52752f5db1b28e8827ca59123756f";
+      sha512 = "e614f2a89feb9b2555d2d3de019c1c6b74b6891eb4e9b7d9e055444ec923689442e6c7ec8f2d8605236e0556c79827a031a870989635234439e678eaf1846e39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/id/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/id/firefox-62.0.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "463f2d340b7c439ee64ee6429021062cf05b2fd4f32226723bff37a67c5f25566ba5d6815a5e604d82df97b426b677b3158b2f8a565762a340cfa7425ea097ff";
+      sha512 = "2e5e40dbe997459c14432f80d50075029ef79d1fbcf64fffa527bfffbd5c348ad84a2f2909045ddf98f2b268c26a20b1bec0c00ca753e64782a0e7dda972727a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/is/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/is/firefox-62.0.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ec264aad9cfe095119f7f52f3391d376dc1864c24eb133bd51bde3349afc92c3cd1bcd0673b1fe95fa03ad36f869e0a6ee9835e97e922bd949228954779c075c";
+      sha512 = "77875a40aa36692f594ee0e714ad9cffcca0d036669f10dc31ce8492c1b372a885642b9a3f9cb85ab94833cd7accd425ea673535fbbcb93d3255ae74711b0ccf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/it/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/it/firefox-62.0.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c81ee4ff685fae9108b07235931b9d0347ca46e3063211764fd1762e2ef9b5e4e337001304a14309c97593543859800d7dab9fbeb21a18af1b84a2b2b6c6d5cf";
+      sha512 = "6e737a1911bc5a97c6bc3ccdf33d72b5b964b2e155672ae583268393b3d9ec785765d55a0cbbdb0deb4fd4bd8bbd2bdd0849ed27ab782116f3d09293f441f40f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ja/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ja/firefox-62.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "2f0ac4bbf507d3c306dc30dbfb94cb3bf8d907431f9a5c6b863505012cc4b077e22144af3658dca60e056d287273129f4742c72cf78f800162347e64d2b887f7";
+      sha512 = "eb69cae70ef52c96b21f74fcf339ae031c4dde08817b211b4deed493d0ed63c87b28cea1d67123fc2f36ec4ff375f8d8a4f6eb07f0e55be87e1ae74d001dff77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ka/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ka/firefox-62.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4a85a9f34e69abb29d63ef8cae372f225d246a5065a26d03d99a22d137085609e6ef5adc03df70fd7fe1057731472808f510fde2a40926418fb98cdf8dd452ad";
+      sha512 = "87c7a6872de8829615834706fc76f1eb093c57f9c7866a45a4a43f2974288f05d7a98a3b563b65b2464e649c8a34972a9d779b6386bd904283db907981064f58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kab/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kab/firefox-62.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "7b03433b9c79203feb40705469c6788b8df08505ec2e92c704570e0cc5b8066d2b305a68a4c7a61f81e07cb6ea7ea12c059b00e8c11870bc44be54406e8a224b";
+      sha512 = "c65d155fcc48d9b57590bc09ccea6303b85c1a7bffb8ab6783e39408ea271c341f558ca6800eae145baef263af54ed19b882b0aa39ed75b38bfa8a4f5b3842a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kk/firefox-62.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "51c141c62e3251101a5b110573c26547533fb2a8bb2019cee63734ffe4ef2c4d1b4b6e5e540d88e0237721ec7d0d88c26bf5c179630f685c037e3f9eaa0a6f02";
+      sha512 = "2858283a1721fffac6af65505c26d3c761331df82a7a17d5e107d3b9151cb08e448cf7d80eb3bef29068b9a4d0bc2f268207f86e0afa692a50b8c9e6623bf835";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/km/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/km/firefox-62.0.3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "113303e05d1ea54c38ddcb0476873214696f38b17aeae64381a7bc00bd59d3ec551540125190c0a48e9e85abc4de9ab232bda0a6dacd1bf7584b7d09c9be67ad";
+      sha512 = "fb77850dbdbd2078ca6b7933fd630550d52ddc57615a789265756b460840cf6389dbe138be82136612762f48fcc8da2f8aecf94c3ffbf8962b6c1dd6f60cf52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/kn/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/kn/firefox-62.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "3dc579341533e0d9b82919aea3dddae1ad247f9a994d52d26699bd371c8910ae5b417e76be04002af53eb3caf5a6c2323261e48dccb8b4ffa63b27fe80272681";
+      sha512 = "cea7b6c2c1c82b6d5ab14bbcd9345325c826600bb1c736ac898358e9a5d96f0e58eefdbc03190a51d21b4e3ecdc477e6b2e88f493e3a787219dab6970cc3eb40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ko/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ko/firefox-62.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4269f0f945c360e8385dd83d3a62450825a9e74c349dd74a9f8f18e683a83526113ed315e5e363dfe00706b59bad92739e6b08c004e27608addcbf599b7da21e";
+      sha512 = "1f8b2af8a153d1b166ca62cdbb652e255653e8ecca33eb10d81b71007f5f6d3645cb33613f3def21f6384137ddd54697a880f9acf77908ab0b800a88b4420813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lij/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lij/firefox-62.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "ee26793ff03184b9221f7cfc88bb351f27ce01a04fbf74681f355e2a0c6b4330eded098a4ecabc3215e3c6b78fd2d09090275a4793c845b3c6debab962e2999c";
+      sha512 = "0806dce8a381741d7df769e87061c15df57b6839fe3230be30936be5406939d79502602b02202654d78fa45f284e33aaa88c1d62b4cead4230e7368737105761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lt/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lt/firefox-62.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2f7b98d182b4aea92f8e370107d56f647e16a11a1966c2e2e47b8b4ce2b45d9b9742d09c19478c200cd7fe42889ec4c2498304626fefa7531e987ad134e3c05b";
+      sha512 = "5184b3525d094e80bb16acbacd9e8323f83f25a3a1652d82f0bad6a78f6750081140a6c007a4c2fad8c2955fad2aea07577642341dbef01bde1f7c06947a87c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/lv/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/lv/firefox-62.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "7c31be85ff6b3295636f50b9c7491fa467b2cba1e5ffe9c7ef997c3674d8cd801e14ab8fc9bc2d1ab75d2a379aa590109530c1ac81599f26b747a43cb557cfa9";
+      sha512 = "49f878a62d140a6667a76e89b129f28cef1a56e02212aaadf6eaceed2c776e54f4ad23bbe58c6e013a16c29bf81c06ef942451c726b7372a20391cf75e08b1ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mai/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mai/firefox-62.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "e365c3e4a9d2ccb80871c1530ae1e372d4ac1a809cb2c72f82c682161dab6d7707591194a72481a312760a7819fba0e5dc9ae3f80308b7a9c45af66d97e47230";
+      sha512 = "4b24b433fd5c695960476fff3ad678e094bab5d81f9e7cd2d1c6a3c56075f0bdbd4f24f6c6009e0ac5b5a4a25a7e72b2d566fca0f08e6cbada8131b9b5700be4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mk/firefox-62.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "e28b9564ce368a8e68c27436e967cd5ad5adbff1b78b50bad64f7646cee32a28f2dfbeaf0bd049d7057ffef59ce709765cedc85ea139b84cb6b02d95c743cb81";
+      sha512 = "2c500c446c3ba9aa6735df3fca9673e056d04b8d8a059ed50bcb4cd7b5819fb224e12fffde3d33d5658adab93eb9f53c296bb422556264eb3bdc08e4a386e238";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ml/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ml/firefox-62.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "50ce7dc0445a37d125fddfb51951d455b91bec19f807df262bcba0734a7cf855d455e965144e1d8da4692c4013861f62cb683e364e33e85f4962c99097b74838";
+      sha512 = "3e743c899e60cea9010c28355f0b1d3f5f34da6c4865f7c284edfa81ae835bb8ba21e378c3aef36310cdecffcb1be3cc0d06b9e7c9ce2ff15482db3bfee93bcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/mr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/mr/firefox-62.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "defcaaf5c589d0a11104f06890f986ea3cb627db499c2bcd1fc39162402b09f8c1be3fd05ca33571dadae9e8d127d1d67dc5f08804f670e8f8db45b33ead6234";
+      sha512 = "53864ac115e5f84f50b4f33103d549942b4c19286bdb4c236a794239bd9f40bceded9272c43aa808405eabc2a75ad36d2e643caaf30732a57bfa7d2de4c908a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ms/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ms/firefox-62.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "2f36fd10942b2a700b6901efafe2fc14e8a7cd97d41241a070f87edf4d1ebed63bcb1d202b1c557426bdd8fd96639ac263ffcf0c96ecad9196916cc69c9e3e90";
+      sha512 = "8820b20add1fcfe14f30a4b54428008cf770feb321b0e9aa27a0896c94bfca84aa1b4d3c4c7acaa30ea5a615c94259837bc9539c0b96f6702a3a5b093842dcde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/my/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/my/firefox-62.0.3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "71001dd61027cd3acbb12f555a19ac3534c547b2d9b2c964a6bdb656524429ccb25b6c601422ec7f8af9e7d6319319e4bdf0db15df3f3833611d72d3d9eba410";
+      sha512 = "6a34963674a7448a2454e2b84cd732cf679b65db568f165d13c699651efaf1ca4804b0602181a9dbb301aad7e5dd39646b19fb3dc73469792d82f02220a7d9c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nb-NO/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nb-NO/firefox-62.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2bbb7a4cd756757c0559294a487c972ab0c6bc6df005c948a24978a35f51c369b66269dcf6fa96795525758ae66e24670fe8ef7fa0f5b05b7d81bff79f2cb762";
+      sha512 = "cffe42d175570493c853044e0bf774155e1b7020d4d26aec7e578a6bc5cbaad057c125d30c7fe92f818bd9b2c982c775f19ac5535f606346b46bab095dd99b18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ne-NP/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ne-NP/firefox-62.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4bd51046dd55004e6a08dd0fc646344f91d7d830249fa8a33284f4c66bd5f11b1913920119593e45d9488db1b9d7aad1a74b296226633d94a02c0c705f527a60";
+      sha512 = "72ae1ef7e071b665abb92dd07add0b4023cefb64aeed09638768152a0c15d7370686849199771e7f19272b5df8042f72f76bb02e57f9a304c6dc930d49c2d04b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nl/firefox-62.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "408bf232f3c1e592a929ff2364b52af899aba1a7542e6199366a7bb0369ec14bf3c44964851a6dfb37ece8e9ffb342ce7448c11013c3013bb0d4e1d67a43e2ca";
+      sha512 = "b290a26a41a6fa0b0d1d89076aa5beec4a250ad2ff053e83c19108164c95c78ccb50ad1fdc6e1091605bfdb1a829d108fdd4528747309682fbe472b1332ab741";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/nn-NO/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/nn-NO/firefox-62.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "450239e4d62d03151b0ff093e04e4cd5cffafeaa91da7374390d31c5944366bdfd0361e6e59b162352418436f7bdb1ebdfbe959107efd14f0015de0e873cd5e1";
+      sha512 = "9f4ea82b06102744696c1c842cec65250e4361c6e37607ef5cb8e03abb31bf97ac8032de7120f369362199d4aaae1274563a09f61f04dec07d50aa94358e13b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/oc/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/oc/firefox-62.0.3.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "a7c00d91430494659a4a2285ae9505329e18a10985757a50f9543d46b6ddcb740cbc440e31a1718ba4b830661bed56a0054c5309b04bbd8029abc691b59f0c08";
+      sha512 = "e75d1a8c0af6424f7cb7575797c70b230919d840086f4bfef850febe36b863d9663d0dd45c6488528794f7f7356e0042c21dbac8e607689989d55b51cc64f3d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/or/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/or/firefox-62.0.3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "e0ed4fc73fcffd0c59f87b6ed8d1ba4ebf8526acc79ab5a2fdbd689c1329d185bf9717cd34f0921d9ae2028a18bb12d485a0cfdd20dffb3e2a9b33969df943b6";
+      sha512 = "563dc60168a9e686c6058117ec12ab84f55836ff442f606f0a7ae6af663cf73228956c8d12141a0dce0a80d75386623002ede2fdf89c07b6a00379c08d00b544";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pa-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pa-IN/firefox-62.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "8106baacbc84b053eed0527ef78f9ba4bdc94f0679c0d887d72bf19ef5c6a7950b6d8e9a35d493b51de031ef2e4720d03abb9677355a65b2a539c9e73a4ab633";
+      sha512 = "2fca31b8ec096191733a1a7ee6ecca37b3ce2acec56be01e23556f68ca7e6d3cc56fd1ff0a3dec7b2bb090d28606d545690f567d6432e25e8b335d7b238fd601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pl/firefox-62.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "9295362613e98387d10160af9f779a03c8318797e98daf39a514d70618eeffa53066113198257c6cbf1373fbcde33cef525c917c85fc3e838df5f918868e10b0";
+      sha512 = "0c2f125b0aca823fb2a99567ede66e18ce9ebe1dfb649f9d6ef5bb4683c61813d9f9efe94c2224dc7ad441fe0f2b3136a3d090ac1335246ea4c4304229c106a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-BR/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-BR/firefox-62.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "d5bb188822c7b8e5ecba035585621685cd1b334950b8480d73b1841f871325236f9a13a3a4f0098d11588c0085c20fac7525a57cf83687a29d15f05cf9d9cbd2";
+      sha512 = "15563039e10ae5a6464ed0d20c0afab6d6a3bb5e54bea507db87fa03c48be22d7f325af22f776d052e49b9ebf9659c36ad77e92a22f884a0c443e3d49462b003";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/pt-PT/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/pt-PT/firefox-62.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ee2f8aa32c2e20bb69ee291f3bd4ea931d5b2ab863f6f650bce92d35b331234491b93296803f5ede49ce49027b805241db44989bf48ee6d68722d262625b1fe1";
+      sha512 = "93eb9f47254a1119074e462c892698de6339bf68ecb3c1f3d4ccc9c97758ee3a0ce54cc026b8084b50283f7ad7960245efa9f345761ec8a50b4363ec52d86aee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/rm/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/rm/firefox-62.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "60605882860f1e1b805f8cb74539c421e45438aff07e79d6b3b1db3546d38950059665ca443d84617ddc9a4a3c104940d885f294932390170b3bc6c2eedd0529";
+      sha512 = "96295dfe17a2e066f838add7f3002e6307d1ef7e0212c0c3bc543bf7e3ae3be9da5a49bc6850b3c4b5f5bf46e112bc690824e528eb90f15864d43c7ab55d0eaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ro/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ro/firefox-62.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "850063575dd69270903a031748e665cb8363105057f1e170e43f264b3a9b228976fc901f7e3749cee22e3d9489b3357240198dc3f22e20de5b9581729e8c601c";
+      sha512 = "2782b44a49d116e8d15c0df9de710f432195a56cb46934e3d5659e9c91a190dfa49289cac64c738323fc2399058dd9e3bf607fb01d52cc9ee671499c4c29e10c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ru/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ru/firefox-62.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "8491c625171c0bf7c88c3f3a053e5f49a7c56b9dfc7c0ea7c381bfcb7505ffdce6a1079d15c73ce6a4edc5f89125e849e8b5fe8d464a4440d4413dcf6666a0e8";
+      sha512 = "fec5ece757f19a19e5dd4d92a073c8e1fbde56757e12e038a7247edef11e4fc9daf27264b560ea9bf8f37008432df4d306f8209baf826c537360ed8c6ffbb538";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/si/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/si/firefox-62.0.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "bde4eaf6879cb40967ebc872738f5ac6b931f6a1a633886e35985fda76de4ea4c0a4ebc7e68585dab34f7f453cd54977bc84fbcca636d53d6c5eddfad6d13bde";
+      sha512 = "cceac95143d3444e6b4a589d6685ef6740ece81b4ea26c0b31b4253a117b4ee239468d404bdd9caec9543e645e9e985304eb8a354000796e2124d71e23b74921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sk/firefox-62.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "776ea025a2e087a7d8717c3b63e8a203f13ae7e44812e0bcbef8075aad1166f80cb6977970d88f68720772668cca982662c2172f1bfca02732a79daf45974112";
+      sha512 = "1e4b31480a5c75bdd350cc17b159e2e14fcb53ba39215d565510ed54cd7d12d4e9d6901b1ed0909140e03e31f7c1005ba8e1a48a3a2f6d91bca1e51490cb30d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sl/firefox-62.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1bc1a53815d287acef056c981bf306b1ae7cc36d4c8acd3bf556f3a2f44e6af2c05bede49f04bf7fd591cc5f0be40dba10b38c5b64379c673705b57ac0853d79";
+      sha512 = "6ce2f2c338ac8481224518bfaae55ff66e8005ef40ca7a13cec294e1b797723b6c3874f96b6c2e4fb78ae526232ad267cfa407b8952d454fa5f4eb40bbcd19a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/son/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/son/firefox-62.0.3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "ba3f5377ad15c8586c7e826ffe8c614ba71f49c9867caeb1fbddf9ffa86d513f299fcf39d750c7e91db88ba17533097d38def63c8614aca743946d2a3b0b0484";
+      sha512 = "24ad351629771a6f3ad8d381508bad99094ae441f6ffaff9ec19d8018fc711ab852a42b9d1d0f447e8a4da79c1fc177ee9368940f15b1e89344dc7beff49946f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sq/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sq/firefox-62.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "c3f35991e3ff9410c4829491acc4a7f7cdd61f9104778c168adf3e1d359d5d0c8cb57ef552aeed669f80098c546a72f7adaa09cac4f486dacf78bd381f5fad76";
+      sha512 = "d8c80ea61e545f29a8a2b0bb4ee2be81650c131123693f1d6955d00364d67c4bd78ee6c85903d84d62c2405bc0df4f45f08301d1a13c30f6f33cb24ce4e9d7c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sr/firefox-62.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "df6bdface285322457f676d74703084cb677c6c429992a87dfb933bb3da25eff374dd2894f13c37616268266e3934a55cd61f3f6239a487595282ada58bf69ea";
+      sha512 = "c9455bec9df85347e6aff71b252f57f4859bbb8f378d274010ce402da0ba6931d9bb0a6d0f2dfdd4d87700ac68b039ada9fe7f673f5fbc7d95aeff738980e68f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/sv-SE/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/sv-SE/firefox-62.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "a48a11e4b1e1bea955ddd73c77e7f5e1a7d03435b29659f7b610a089b604cdfed57893420d0c1827198efea6365a52ed236a8296646a980fabb6007b865a78e6";
+      sha512 = "7b80caa0fafdd82fe1d0e1909656f894515439fe21f6c41a05455a06c89afcd72fed37c846c8168e874da47598d1eb87c676637ed9047943d0483322acb027ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ta/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ta/firefox-62.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e01845b225c5516ecfc25afde98e9691b9afedf27405207cb91e655a9b48edb416786a2cb99ad73df37da41cb22c58958165836e5e6b1018c6c9f788f2b9337f";
+      sha512 = "47a13f1bb090ea5271aea1add660f765e330b351ea6c77edacb380c74d5dd1939428b98ddd4f4cceaed38af9ca99f6f499298289f44c5f5d7c78c9ee3fceb9d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/te/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/te/firefox-62.0.3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "95b795fd6f995527d85fa83b122bfd9a2c091c792c879f7f4611dde63b4ddaf0502d3ae0ee33002363da359d1931d008c01e40611eea61f1ff66aafac2844f52";
+      sha512 = "7d0c21a749be9d7bdca8a7b6baae2044335244ce35932d913575cfba1eb63b4cc2a41ab79a5e19b6d3ef0607eaccb0e6303f57cfa9d44fa21deca86a34b52843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/th/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/th/firefox-62.0.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9ad3d99c9479155e20559ee1c8ef276a69b591be2cb96700075ca19352f033d9063d9f9b57ea9fbcab5db9bf46e1cb03c9b001e6254b6b0bee5547f8c91fb59c";
+      sha512 = "d02a77da738db455e419fb2bc519650d911b4612e5d5e282c54100e719d8b119b5e3119cb458f652ae532128ca64afad1153cf4b3434bffecf2cdbdd67cfc029";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/tr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/tr/firefox-62.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "90fca950893500868edc6ae1c0aee417cbbee7b7a0f48e0f10421b3d7ba495a56e090543ffd097949c9bebe69784cb8fb03b559156863f9dee940aa867421135";
+      sha512 = "87ec0311160aac012e601ed753599019b499b08e73f256d78c68a695ed6c1ecab53095ff16b007a4be08ffe54feb0dcdf31e7465271a3f48928abbcc5b80d5ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uk/firefox-62.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "18942b931cf09b03973a10e390ac15c6e5bfd1f730953b782b7929943838be19bf4a61f157b33979f1a8e13042f1f4facb08ab205b7825d285b9e96c0ac897b4";
+      sha512 = "d80c098d00c9681220c9ababf0f62b69607ab6b71ba34d177941332450ec51a5b9120e0c3e629e0eaef91c64beb9b10aaafce2fd094f931cb976a99266d63a10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/ur/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/ur/firefox-62.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "7f16c4810467469385a88346f5ee3fac4d3d95342c6a6d37e0df7880f0b08896d0e39e77091eb0262a66ed7fa15c3151f244eb47ce4ea774ad21797b5da502ac";
+      sha512 = "98d1553710997d61efa48c7d84fbad2fba5d730d0259b9213811b7a5f47ef1e4ca8940f4e17708e8dfb7949b4fd908bf80dd5e9faaa86b3e3d2c3a07b3a3d7e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/uz/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/uz/firefox-62.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "8266d638c74a78fa26c939c1ba7a6abd05ede85a9e349135f1934a6e3df27e3f6172026486738cea28e50689b84c29c0dbc63cc8779faa11a6ae55b4f367c23d";
+      sha512 = "7a6074c2d7f1d40c41a5969fb33839df065fb398e7161ca7bf4d6aabf22a87deaeec7d623f0d36f992f8907d696c5aa53136cdee33bb623dfed94cc402b1fc46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/vi/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/vi/firefox-62.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "787e570afae27cb668d6f4b9b6e8b3097f02148c2e2974efd1c58e406354724def031f04fc69c0ed10a04ce5833cbf7bb2ae8fd77ef068f8f17bf2118d1305c5";
+      sha512 = "013c9210066a5b72f9640a5d7d647312391daeadf757e5b13484a035d5bffe2405f80d4fd750e7afe81990daf14baa49c6c4d77cce7e1a60a3483340aa115524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/xh/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/xh/firefox-62.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "805df0dcc24a7d77afca47335b31cbdfd0d0df51145c9cedfdaba4d865aae71697eee14e446351e6fd8db950e3264ed788f66d683356d4fbbab17ea9d7c2c452";
+      sha512 = "b104815968385980a7bb297d83fea2dba4ec18bd853ecb70ac7065f30e0fcf5fd3708376f8202840d71c2d9e6bb3c48dcfa866594d334dc7a5ae3cbf3b83c888";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-CN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-CN/firefox-62.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "cb251f942c31cc0c30c46bab04f658567b16f379068e7bc946970ed512e2de08c6e3511990b722541756e95261dcdf96b03cb247072f0b230f66ba7afdb038f1";
+      sha512 = "7961e947a3c34343c54d06e62e522f503375d83c8fda6648197b1408ec0916e54dadf6da982650c99d4b7215889eba015b5f1c8e5ddc0a48b9aa6c0925286540";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-x86_64/zh-TW/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-x86_64/zh-TW/firefox-62.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "afa5847337657cee3ec28896a089bfc0fc2b25750d6dc271bb83740ea5170e2f926fdf3158b0b136eabe0d2d6b4b81db1ecfabcd8c2049164af54cd796e9a7c2";
+      sha512 = "e09fdc1b84093c49fa8918310fc2a44b0285247548941bb5150a5a64ebff12c1ceacd6e8e397137da14ca6d8336bb2411dac9f4d1126c266da679d1214ba6974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ach/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ach/firefox-62.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "99781074276e530b9ceaf2cdb8f902673ceeba3df515a6c2c2ece3fb3dfa84e6f3d494a3a69346a3f9fef20d11f7bac0361eb80968ec7b9e76b603f8b001749b";
+      sha512 = "f0544809f924d264af750456abd6331af1b4116710ee9149604bbc11745070a76d84cb50f4810307a078e8ae4d2966b6771c318243215a3eef8ad957b8127414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/af/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/af/firefox-62.0.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "bd9c6fe306a8802b22860cad8cb452b6591c0227e12ffc4a33db1a88b811d06725348e5f128d624240b9666393cef35b30f5bc7d12e41a046bb318dd346f63f2";
+      sha512 = "3c96ed1cb9408d888478fdce554d577930d2d365d10dba7c3fb7ce93db8032df25ccfad1f055ae849dfc63428afb9935dde013ffdc737f364704d4b693d9d751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/an/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/an/firefox-62.0.3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "289c00b7bf464fb6d86cdbf24274514dca98dc47e78389125287792e8f77708090c120aeb5ebaf4688e16857c5fc6b78fc1eb6f0a7efd7afb62c22fee325e78d";
+      sha512 = "87038254a3f4a6e200b5de6b6269adc0eca198e9f2739bb810f00fb028f746a989b50b5433fe3577bf63250893b69b45bc7a5184d2a6c050818e86213b1b64be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ar/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ar/firefox-62.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "412cdcb82e2d60e2f37658001638bbe50cdd3a7db1e9bb4cb0e2fab49b878fe64b62ef019e499c3a960bca3510266a0afb3fb4c57cc5a8b6bff22aca772e643f";
+      sha512 = "a7f2231f026fa90f53952bb9cc7c36663226c87afc6629466fe1d15e379048bb9e464876b0d8c79382536bed850c2f806c1e8b06fbbbaa1c02551f778767ca89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/as/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/as/firefox-62.0.3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "8068c78be22e42f9174cd6f9e1e7dedff527a00865f722c6dd9062c6f5cce2b83693d0938ae5f56197f72f5af71bbb485b0970b632ca5dfec9190214558fea2a";
+      sha512 = "9a101cbb2d9b689d05b976035e524f2026154508a3c18a9f1e238e600be0924d36573a951ef3a54a28e62311f661008f66ca8438d40e985357e537bfb7b71d33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ast/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ast/firefox-62.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "37ab6ad2899b3b115bd2b59f6be121e2d340c27eb745f698fd2942ab6424c0840273ddb4afeaf1083d9f458408b939270d971676e9b08e1f0fa409bca69f3e84";
+      sha512 = "3305cd08c09726e04ee0d3a3f0228092e596641d1f80e5703c869ce5d3588fb37bec2d80a2db5690e5fee5517c8745f13e9bf723627a03b499e59c7672ce932e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/az/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/az/firefox-62.0.3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "5724ae7680d7e88061a4cc45706590d519a5bd769b204d06ee0e8e6e86f706b312b665354d22314853af0a73b073acf68be8b7c3ae9dadb87984e1222722b4a8";
+      sha512 = "138b35496601a577752dc1362dab7a5c8dc8b3a78b0c252748dbd15b1bb1013e304aff8d8ef1a9f5138e4e26dee74149c7f66eef752fb77ea75a6dfb8d388895";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/be/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/be/firefox-62.0.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "6249b41382a1d2cdac2d9c9d235697a70bac76d0dfb341d3db41c0f329cce868ef66df6d2f249b4e22a1daf737d5ea3b7f2cad36a2d30b1dcd649fc1476218a5";
+      sha512 = "7f6608f932f96bd84f57902482b691aca966814f1475bbb0479356c792a16e4698a289f944d7462db71e77552f368df1dad3181280e3d0e07a5261ad90c2bf63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bg/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bg/firefox-62.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a769ead4a10d4168d64ac9c2391c0cfcc5e0dc33f4521d6df73c5b53087e3aa073096af09adc49c901489e60af9839ac888483d63f7e9bcb1de2588236cba75a";
+      sha512 = "c284d6ddc03c3bcaf82756a8f9909e12ca193b9b2a21096f84383c71e1dd5ca7369a4eb6c02876ce741ee38e6418e45fec2ad4936e7c6d48ef270ea45ada462d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-BD/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-BD/firefox-62.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0761e32fd88fdea9c87686411ed87affa8875f2047ff9b1b1ec11376583001c9c9b421b2b27cedfe883cc5cd233d4d3a932aba74e50cbd74aea63a6aaeb64c8a";
+      sha512 = "eb9b3e070e6a2882a6b43d2a0fa7792f2b8700df9f64ca70e6f616e6237e0cb15c5d5a642db8f7b236c7cb2f4392dbc553072c544e81e0223c8f4d6d85c36be1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bn-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bn-IN/firefox-62.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1868b2d7d6f32936c6072998afd1ebfc232158940e5270bf483c6c29a8a30682f0ba729161e9b0aeef7d839c9e9209739380a20b8b118c49112bd71caba03ec9";
+      sha512 = "73c4c67bb9f4fbc47509c53820319456c614a74dabe8ba14d05b365a3ba9429d1d9ad9ebbc6d1edc7bf18f4a387ed9dd92850478268f2eea3541929558f14e6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/br/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/br/firefox-62.0.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "43d1691d6b1d9aafaee55be50bf8c4934b75c0501c811314d12e1156c2b68cd58914362e167ed50fdf5267a0d7a2db9730c68bf318d492bacb8c33eee7bdd12e";
+      sha512 = "78921d68f06c26f029f29fea01a15c5dd54f55f59150e08d38e05f640612355a494f72d88c0e80bbb2ea6f54ec26b3a5716c3249f1118202843c4ab1ef05f891";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/bs/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/bs/firefox-62.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "aeac8dc018ed59e2aeb68b63c1a1d6281e543975844e3ce5b7f22991968bf0e05f40cdf1ad3bf434cf9de774363b0ffa6f96d1c0b457f0372d4d1d943c0a40bd";
+      sha512 = "643d5ebb610d3e83a6ed85a3239a8631c150a86925ddfaf5a4adc87d0a8add022a5e35ed20fafe5e6f1a6835b3ec105ae1734cac6552d79d95b83bd34c1e73ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ca/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ca/firefox-62.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "10b6c40701b7cb8f2543e97a61335f426b210273d46d542034bcefd7d23c95124cada1d1df85c3b5e33d25e8680678b18815ed0c8ed58936061f670b0abf1d87";
+      sha512 = "ceb8f81f3fde233be921da104d993546b1200ee348b19340f43dc697685b87c80a4377d406dc72080701614896f7b1cdcc27f364a89a92e433639603e08a6611";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cak/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cak/firefox-62.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "029cfee850c3ba5ac408b6db45d66dd9849db392097dcedc64d637756ffba893770a93915eaded6302f6e667f072949fe6decfdd918be292abb9ab8d1300c2fb";
+      sha512 = "04f5dbdcfcfc2b996a912130335ed855612e5fd2f27bd4cc615a369be2fc2dad14ba43511dfb2bf47a9fde3d28b8b5913cefbbf34b89383eb36bfdcdb96cfb3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cs/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cs/firefox-62.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "ce919ca42a629f171df4faacabc18fc3db0faf2d38f04912720ba697612215e0c26f650781a535b5e956dca912fd47d1d9b9528910b8e9b7a18841c411e25623";
+      sha512 = "b82cfd9dc6b57e0bd147f508a38bf41bedbf8fd9c6725434fcbdc8871cf6f683898ff0507e0e2fc202077d234096cea252acce56e6faaca738e60512b3b9e1d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/cy/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/cy/firefox-62.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "727827fa6b47cdec5048f40005872f021cc506d7c72a7f1a6bef9f736612341fe3cc6127b3bf005f63620f17b180a00c3fa0f799f63e685111119f9661d9ca7c";
+      sha512 = "8f9d4ea520c99d3595d8ebfbb8732e1bbb73b7d39ab707e0a3f86d3cb928231e1b7d84c7ef017d9f685a2d2893c0b486f27cd4a704f05cd7518465452010df97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/da/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/da/firefox-62.0.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e795a7aaa38c28733a8864928229d91d752d6f0fe108bc5a3350b34e783155c3be14a5c0261eea26642097db2a583a34553d746d6040704f34de82953952f21a";
+      sha512 = "28ad6674fdb830d07837b826ead67503a943b7cb2330655b75ae7bdb5f348458f19af37ab775d820a0f0131a6f7d5dda52bdabdedb5b0deccc1605912e46b9c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/de/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/de/firefox-62.0.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "56185cb92f9a246140b58119cbbb6a128905c8e244a7ed8917613a65fe8f87a542b103afe69f1fa542e47efca18c8666e669c266e9c107661b800c5e3b4ebb75";
+      sha512 = "b94ebbfaa81bea44e452d0ae69c3069bf100178c82bc28b3d2841ee14dfb4bc2c55b99d325fa4d8049afad93e674d24160f6bdc235e329e9575b49842c731d5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/dsb/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/dsb/firefox-62.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "ff30865cf3135f466d67143487ad34a50b73c11000419b2caec1c232d4efc805cee5cbd282bd1e0b9ccaf03ccc95e08ac4d1baed93abde27b45b0f2af5d71fbe";
+      sha512 = "c292abb164b948ba76b13548c44fb41033ec9d394b3d3d710dadb72f666c56d16fa7d72dc5c3aa4543b81ccfd2ff76bd5e94cefaf88f537bfa7c8b16b9290f71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/el/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/el/firefox-62.0.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "e22d89c822843db26e05834c088e5d687c6d315a870ef2457f13126bd740135016ebacf83b9fae131128b4fcf62b474a68fcb1fa12098aec22f199a5871e63b6";
+      sha512 = "35e01baea98785db080f801b911023c6ef3d5bc6c61d8e3a5e8ea1ecf7e51153e4f2646db7a8fd32dd1f778e1804cd2065efc28e8d79e8475105d9f12c9b0a7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-CA/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-CA/firefox-62.0.3.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "0f462a6900bf92513c40f28a9fd2ecb0fb3a69678b2b0091e6495b89b9a2fbe6c805e48b2e55fe274996ff7a15c32294d02a3e025b97505f920069cd71b23341";
+      sha512 = "ccf68a4f05f4c5b0dbaec25c69fe66eb9d1c23f3ad21e6fa2be14704fd5227fbfbac8d46dbd036a6e17f0e94b58a4fecbe91520da45d56a2901074bcd7031516";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-GB/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-GB/firefox-62.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "dd7a7fc0b05877f1e1f297b123075695c97247e2641311ff646b953e002278e2e16187682226eb46034cf3959880b2d17d74314ff7dcc654b1963beca6785410";
+      sha512 = "49eda2efa176054adc5579ec26a9da92df9903c16d989d761b8b566568740b135f851e5c2b983512b644e80074171895431b3c1689708dda9d86c757dd7d2599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-US/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-US/firefox-62.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "bdb45cca1c207502ae5f76fe10e4b73d3f7e6079913bc9a6216e9325b8c70fac37d14e32b4e5ef6acadd73c301c3ca1aa2d72a5d44acc0b6cb0c22b481de2e46";
+      sha512 = "08e3ca5f859a531b2895a5442734112de9c450bc8bdc2eea9a8fe3231f3b97b8a243cfb408311c56c1703dce63fc2f5201026719fa01b9c76061a204d59942d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/en-ZA/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/en-ZA/firefox-62.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "351ab5114b25daf11ff2ce1aa377e6c16a7adf9807a7609c97e04f30911f8680da727c6dd1d3067e028978d3f6f793351d99f500374372dc22b11ca760e4d36a";
+      sha512 = "7629e33144c955d015a17bbed4d1e570ae74045511c6ea1db9131b711ac58c67e76748e22ecfaee5b594651f7c736cb0d6d87697ba9dca46705e5328bdfbdb2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eo/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eo/firefox-62.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "1ec40261c42db667f1680361e4e7f12db271f5fbe6d213d44d0722e692a93421bb92d73193f87f42e43df40700cfddc7913454d6a64f5e15fb78f08d7a5a3c0f";
+      sha512 = "13430d5a4462e8e00467f0d39d2ad03ac684e0cdebb21901cd0ee4f2411794794cf5024ec51d915e3917660de6077d6dfc08aef30fe6c342f5b8588f07883f33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-AR/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-AR/firefox-62.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "00cc8c232fb4b7b2c56aeed098719d60deb26abacb38f8a7ffd9117c8d8875c838fc702413a6d8584f862b35843262e2bd31074bfbbc7cefa6f62247d8a16abe";
+      sha512 = "44ca9daf57afbf9dccbb158712e9218d87db4254855838604250b8a4254fed7adadc266e3e1fd49d23b34ba0176dfe5f25fca42dd5fd6d1c322c857337de35b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-CL/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-CL/firefox-62.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "70da97fd43b84b5475e707780c215f73b05a423577f6ccb67a31e01370842319d40c6d691c99da138db881d6c5de8f73c1bea8287fb9ba1cd3647bc74ff8125b";
+      sha512 = "09e43c14a99c54ae123364ceea46ba7b1b38e30da8d15bdb734b873a63e37b6b4292edb6f8ec4ee731e97bd12194ea76ec35e710d29ebbdfcf7fb41b1997934e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-ES/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-ES/firefox-62.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "76b717e852c1aa2f3801a5460a8f0d51256486d5bb688b30cb85abaa30eb8a441cb28391988ef8ac4fdd1a430e0c09a2c298c8738f7a76e6a18742bc2a4f3998";
+      sha512 = "cc1f5b4e421813c9b044c50f66a28f9204196f9ba2574ae537dc3040d04ffb6eafcdca971536387cf2d79c4c35de5ae3a5335f4796aed878aa5ba817dd7bb308";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/es-MX/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/es-MX/firefox-62.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "e4e7f734ba533a0daf56d9c99881c0c1c758ba6e492e8e62b67944fc3a6c42c82df7e4d01a27fe797077708d49c810a51bb05d3fa4f2cf91fb63548f82e25322";
+      sha512 = "5ca49c92ea11127ed80fc48c5699ef541287bb6f53ea7ac96df990e7a82854cf8bfa8c61f21d0bea2fa245a3b0ded7aa7b3afb662b1639c421525900f8e7d688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/et/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/et/firefox-62.0.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "6b832c2b71b0e42db5a2292d90f1545ab545845f30b09baf277bd48597975e426cb98442fc16b7053d5c573d50d42e37e89cc49d7f325835aa5582262333fc4e";
+      sha512 = "074986b9e80ccf1dea362bc7a28f7e44d2fcb9c19878a8456e63b64bb1e0abad293b6dceb6672bae200cff1aac1c774cc99faeb7ce52d7e6a4b3a154dccdf4ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/eu/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/eu/firefox-62.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "5bc67a8afec07f48c99ad331257236cb2fdde7fa23afadeb3de8c270d78e93bf855702bf82781c9c90eb5a4a0b9966d83bcc6d8f357ff5ef2bc265378200d674";
+      sha512 = "b823fa6c5aeced11c6e0878e11cba561a18893e531c28e9d7713e449905225ce8aed35e1240876976c4335e958e6a68d5e39037fdc59e9f0e900d5d822236c89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fa/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fa/firefox-62.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "43d16efdabc3eb39e3aa924387040f6e92c80333087369b754065c34403d202f0881c993bf667322f8ddf303a8e066c4203b2a4daebaf68ce5b95a8c1cf80844";
+      sha512 = "e842e26e5095f008fee36f7b84a9932cc9ab868e9145d92f8069d2f7f24017ecf538db7d0525f7233bc7cae8a2709fa2da8bade077e864cc05c1813ba4a1ff57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ff/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ff/firefox-62.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "86837496c81d9f1209719d46aa396d17eca17a13f111ad0ac3b94f1d3f9bc60ddf8d8b10018e41100e091996d820975db897abb470fc85e0d87a0ff742a67b34";
+      sha512 = "0eb63c6a996dd29ade92ce88f2f9065da63737cea459d8b2e7c79356b51b43eddcb639af9efa85476f500885a249b77347964982ac297cb22adc501590dbb8f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fi/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fi/firefox-62.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "baae77ef1bfc59c87eb72c3ad6f8524dbdf5fda9502abccf297c3b3f6e1033002d9b4e5b341c9fe101bbdbc93dbac768bd962ac9378088c9c567ec5d71ff00d4";
+      sha512 = "db4da21885411214805a45bf4279776144c3270845a6dba20da95a54ddc5cf3205132ce2762ee997895b7a6f83e2f31cc618c17668df4d4211646a1e3b24edf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fr/firefox-62.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "60fc885a6b5703a88dbbb60bed41296e2a1bf73405eba33a82e5f916ac0b22972377aec321c2b13d7007dbd94fdfcd24d43fc8f0acee37fcc9e23543c5a65f67";
+      sha512 = "12f3fbcd0f085f4547a4406b25d83858425a4653ea9bb2bd5700e21687c2d2ec8e1a032f76a242edd72be99813cabea3332c18921f16c54edd8c430a017e4948";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/fy-NL/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/fy-NL/firefox-62.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "945c2b7241e0faa83e1dfa1f36a3dc86cefb03d3c48191f2ae6b3dfe8384ae848440731d69363197f724da3c32988e20c0bbfa3adbc52e7eb99018b7ef8c4510";
+      sha512 = "033bc2ffed09faa76e67258bed77597bdebbe20eb0a8c17765c7f3261e9abb7cec558aeb8dc913344e4d0179b85928ad49c71979eb6f20c6a092fb7d68b9b8a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ga-IE/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ga-IE/firefox-62.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "6b3ffd73216ce3879b26211a3dd26db393eba8f0ec3f35b6626bea3847a614d6624f1fd6fcedd5ac00e5bb08c9465b8ae63fd4105a79acf86bc357dd331d44c7";
+      sha512 = "5481287ee60e87e9f71baebe196254f30f6fd793be8b07e4c216bbb9af3d81c321f0cdf77d4459ef6e50c3fbcd7ea6929eaff38bdda2f8ec18acaf44495f7b9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gd/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gd/firefox-62.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "cdea3ed1ffd14d02d6489983832cf11f87b1f17bc73539e4b27f7a76f267b491ddd3163a80ef9a953e3c79fe184631a32be842474427d9792b2d525df8006ffd";
+      sha512 = "5ab61163854e8255e8cfef5ed8674f6de79cd084839c65b5e2758530135acea5dc159f7001f3ee26f9bbc6d931bf1fd0fbe360a3a570add9560493a8b7e18629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gl/firefox-62.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b098ab10e0fda3fe67a04bf3040112e08ae1e94e30d65a076fa0e1f4d4e30e1be99e9578e06650f2fcddc6cc6b57309afbbda71008af67ad97caf9eacc7dd550";
+      sha512 = "ce59c0e9cef75ad9b762d9d8c31f5c3606c047736ef20fca91a12376ee15bd67a46016d0d84da7303af61e78f1ebb6be0d99f343dd2cced01cdbcac536b0fb87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gn/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gn/firefox-62.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "a83c0134556894a375ba91137d9513322a876299edd0347eead0869aebb4b04003dca12594cb276e3a521452d4b6ebbabc6be8f79040514f26f6827f55c15d3c";
+      sha512 = "c73b5e5b2ea49fc13f2acf0397d0f98d0178f25ee2ee303fc0647ee4f939eaa465d329affb2e3a41eb6a0d46f413918b01cb7e01b3776f42712d81472e1cb325";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/gu-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/gu-IN/firefox-62.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d313657b11f3fecbb0ef26a0c5a2d4b9ead411f2a3c55bbb4bca3ea3a6d861ee54ed1950e9bd5b14b24b9fa569c7c67b73807353331af60e3cd942b570430a76";
+      sha512 = "3a98d619ddfaaa94d0696d05b940d82d12c6696c98dc4356190a6c6a45a602abe14e84888a2282f6b685f26d8954e3efbbd0778b594ac63ed629e922d91549dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/he/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/he/firefox-62.0.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a05a94f0634f1a857eab463825c97ebf2fa1b5315c44082095d6fb674884b77375968ebd39df05fe6f0f3892b87d9f1313532ea022012cb411eb32a43e1d01f7";
+      sha512 = "9e5fd865c107b2b9daf9ebac3ffc1d0c41b35e5d2b10c930e2cbb1da4aabe1040d4c522940b63e42c2cb2dc0923b851dd6a8ad9fd65da73026d9bf2d44dcd238";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hi-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hi-IN/firefox-62.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "e4cc460637c6aefab1b323ac5a13674f9f95eaf5cf0bfc2020869a196fd13f1708814b33c938981017fc27cdaaf57e75591ce2917cc66e5f97b3c8f22d3d44ab";
+      sha512 = "0d625b2ba90172d4e42e17ed7daf1b030ddbaa4327f9d321c67beb0c71e20572705bc54b9ac709fce67384dc6d188fb6832ff7d6e85c79acba8c975cf06455c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hr/firefox-62.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "74c11421c3815b5772cd9a5f74e1c48d914d335babcffbca984187b72dc7a5db0609e7b31915f58d358a12c52a0db204ff191c78af28609c1e68d002a32f313a";
+      sha512 = "317c6fe9bb37418cfa8fe2d48d5afde58a3e5c192d2feef515865ad4669d65010ff5ca0f82efe22003f9ca763cb132798e1c86216f3ef2875178d367b894d651";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hsb/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hsb/firefox-62.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8b399983719f73f65d2db17af40065faaab4793ab32ab1596e79b6f844d43fe4bf3386343b50a244480bb9f724defc795a6479703cfdce305dba0321e4b5fc09";
+      sha512 = "298dd184b47db389e1b40872dec2c40814c063ef6eda8582fa6fbef647b6f91e11d49026806aa7b5f735ddd02dd48128adf8c5f9bfe17f4b9bc9e6c01ceb302c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hu/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hu/firefox-62.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a5443cc52bcc5881a7297f2f200418e2a9791835f705d472bb657caceb0bb59f8dc1a7c424b196c2a66bf1f0c042d092a55c5b0d04a085dea702e11e433ed98e";
+      sha512 = "53df50c2e877dab2bf1d7ee40312f77bfac977ba3a041f98c350c1b9d188b539d409f460134f0e79d07c6a3d53fe063e53b1451fd84e7a817b98d6f5b2564717";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/hy-AM/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/hy-AM/firefox-62.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "ea3e471c41d3e17c99c5b819ab8c3de8759a275d1ee1af66f133f835ebb6be9c7aeb52ae8b6f79d849e489e0c8f79f69d557d101efe681b27ff38b4e8b306b54";
+      sha512 = "eec4295b544ccf4ddd46176e3b391b42c04d2ebba73edbde24a6cd0043c31d5f06e7a1e6cb03d7ed02327a07f2aaecce7d8c55f09156f413ae3e8f2c18f08649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ia/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ia/firefox-62.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "8bd09d0a8bfefc1a73b3a256a2e5be976b88998055299485c6270afc7ee7805a90e6ea9de144bd5ee8d3e40c079adac1dc29e9beb6d7ca376514fbac902f8de2";
+      sha512 = "b9bafd5b616722d5e0b19abe9e2080ede9c0e3d2e971cc1c00f0e3d2678489e5e4268837341fa7eed34e2076c69880e7ec726814729ede4731fc1336f4b5269f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/id/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/id/firefox-62.0.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "c19859ab8b24aa239b0fc91930d8fb581850e631a9aa9033a98aea0287055d2a02ca6ae154ea23e37fd407a00999af1b5f7ce0854865b4b19a8462ccc3838cf5";
+      sha512 = "07a271e3c9b479018de9184b32bb5a164d3ac2ce5431bf714f3b53ff7bf5c324e6e9413b514748b6ef84e2e57b66145ae775b5116e88d1b695f5c9dd001ad530";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/is/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/is/firefox-62.0.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "68fc21b8b3aefe39bc6e87e8d90fb2652f2125af45520e7f91eef12615aff81d0c6237f3fbacce99259761f0f45c7b49aecb59894f161faa8760184271b2fbbb";
+      sha512 = "f101472751e16e29c2928e3d19acd25afeca20abf7f943be14297e6e03762f67edab1ba59db5e22b8ffeac398208083f91ad97772905fe3436e7daac6d554fcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/it/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/it/firefox-62.0.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "8c8866bff0ea8c2e70a82798253334feca4d96d2e79d37d479f8bf2b5580912565ce08bc47777ff9340ceb4e5677d01eda6cb1d28f25274bab400086493e4610";
+      sha512 = "dfa7a5f9cc4c53f392d061b8bc9491dc541deecb6ef5bc7386a2bda353a8980dfbbccbd16b5a2c167cd523b4f52a9993403bd44ab05b38e03b9b0308a61da261";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ja/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ja/firefox-62.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "56e1bd61de818e9271d483bdbeac7c8a95e00a1a2acee2ad7d7e5779b0bba452170d8e0fa6463b0f978ee3c3df720bf338367b8b1f041e5000054268cf267af6";
+      sha512 = "b84f5317b7917be27d1d93d39b0b3ce0143396642d3f5c2a41a656f16074b31aaa549690bfba0675b3ec8cc2ada383929745ed2823ae6afa399bb7407557ca24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ka/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ka/firefox-62.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "de329fbe61b7563aaa2e62b1dad827445809df6f675518d7d19d9483acd6e23fc502f6abeabc13ed7c5eb2cc5b26a6ad0f0dd431c733f25a68a0ae7e2ee9923b";
+      sha512 = "5d56a8f8cfa5132c3cd5cc3c1bbc56cf3c076eabbf21f98747c493c3b64076c8506150262ad65cb62880e31cc37ad7a9ab5728094a8d8e1f704fcea145c3a049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kab/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kab/firefox-62.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "f739aa9432ce0bd8bea4917f590b076c0d88643aa595be951dfec27872d534fa3926a7ed8d82527e95a70689d365c1219d164cda79e06b7418b90652bd2b7cc7";
+      sha512 = "d86d69559d9e7eec6bb111fe05ffb380ba49c2f47a957e6eac8470f81213a544ca44ae685456e22644b08958c54ffe5f815b0812bd045514d1f70a08a5fe9790";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kk/firefox-62.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "131b3ab83b953130cda7c9c388bf096edf90c424f86d1b6f4221b3601829a2ae0b7cc073a9336d7e4af588e497fb5df7731cca80a8413edf40a2f605927ba410";
+      sha512 = "0cab56f34acb5df1b9a83c48f1a1d2f41c68e79c7896ee4da8ba11bd44e3477214e59697c9e9efec802f633171177ed2653e3184c000d145b7d73089a33930d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/km/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/km/firefox-62.0.3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "6b0f4a83a746630b87b5a6c933f9aa65d6dbdb2e686af870562800aaa683371a23fbe79f31dcb0ef6ed397f556df83e1e30f83cb493921631e6ac1c8cbcd37f8";
+      sha512 = "4fe39d6a89138111c2e98d1f449adaf474d3011a966c4e17627f9793d599eeef04cc1081c6cac85df235d8854db6b57de1548834abcf3a96baabb30c797e9073";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/kn/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/kn/firefox-62.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e4042bb8884ecf46396e9e45a70b57c22b0ef76dd6d452ee0609382e87669e6163c1d86845aa904e13894e750eb2f35d1c9a2b7987aa6e7d3fcd5eaad38d8199";
+      sha512 = "563dca7d5874717937747a1771a9ff32d2012205e2da9274f4cff76ae29782d92d7a20eec8c792564d3a4929458cc5c2722fa38d8b08edcc879dc9ea184c67b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ko/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ko/firefox-62.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "02d30f4b2cc7285506239adfea681c780d0e16c1719c6cb68c908c54388e565bf98f1a3a3d98449b0e55b2cdda00627ad6c6f3e63fc9ad10f8c96b2df6138620";
+      sha512 = "69d10aa7d2b91197bb9062ea5bcf1b89e08cd474003e4d9c203f9f4c7df14dac5b991a15c74fad38843d2534ecc5b08878536ca45c2b80e83ec4c8f6168c5acb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lij/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lij/firefox-62.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "3cf57550bc091d756c5a2bb707aabf78cfab1660e1486c9276de5ad37cbae91be24f2170f5b20560ecf7f53d21217bd738b4e4277504d6f8934d3fe1ca5fcb1f";
+      sha512 = "01bb7b7bea7e528e2fb4ad910e591642539e68a8a3771be2b2d28c3f1b54e95d74394f3d9411d8ae9bd13f991ac4dc788e98cbc8532a552fd70e83b6b3cae38b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lt/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lt/firefox-62.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "606f27cc78c5ee0ea3a61f6110611ecc10c35af63cb9e7c5fa1d3d0ca7a74ac8cd81fec30c1ffe5573c27e0a7f5f04ed82105b8cf26b7c22d648ea217cb57e83";
+      sha512 = "0bb6582347ccdf31dee98a09577380f7a66e8b3222127fb222000d64cb09c4d0ab19d4084d98be2b47ecccfaed51793c1b4fa263634f61eed059da27da0e42bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/lv/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/lv/firefox-62.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "ab028d6f31a966ffee99cbcd5263b18cae94c6e0a6e3e055d2c86354849b68120d870a142678184a32f816c7e5803d221f3230b895c6ec71dda20a6540101c50";
+      sha512 = "3357a5fdf0e41b88e13c24c37243bb8bcefe75134df4944f286364d4f926efb9188e66a91ead78c7d9228275b394a8375ff9f24ac83489c987b42e34132d9224";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mai/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mai/firefox-62.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "faebf74c8a194f3dfe33addea35965b11f3f9e0c2b4bac4f9e4056c2248df24c26bc9e5a5696fe3f8c2e30e2172dae03fddcffef09bf7837fb6dd9fb6a1b3075";
+      sha512 = "172783f25dacda040e65ac980d6f3d33125cb6721c2c3568255a27f494e6d80beae3d61783171448caaca89358735a4c3b64dd9be47ca5c904d5727a3e0ab419";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mk/firefox-62.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "dddef2e42aef03d11327ae2bc186c0dfd25e81b11845b319848e7c7253c101d32b2801548f6444f4ca01a91c365cb2bc6067e765490f3b876d149899a9edbf3e";
+      sha512 = "8f3b31e48b1b423df1cdca1c240db88978f8d03a7409727842339096f5c1c6099e87c2fe1d6a122a6874c080b61ae59bcba1303479d80b944b4cc8d938eb7a00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ml/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ml/firefox-62.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0157abf3d8dbd54f50f6a17d796fba6c66e0270649b8dea1674a696a036d2a59f5841bda55d8b326d90266a198ec0dea3a65753b09fffa583b104c976ab75cd1";
+      sha512 = "dec1bae8329c9f8498fa9d95547abb2c2ec737df03b63ab44600b5132fe6037454070ab3bdb2ec0be1de48bb97c014d985fdc8530b97803c4202793a14e5e6d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/mr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/mr/firefox-62.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "9c6aa7a0a943b8f62f6888effeb65c6c3f36aac3353ff54011eeba06ff2bb0b66ead6b75d1107ffc358184df927cb2dc7cd3bca183fc54879427baf74cb8e570";
+      sha512 = "1e876518b8c73eea6aa4f51384e6ba9d7dfa983e7ea878bbc26becc248e2badd4647f3a44d273e33a742e5b6f99ed5ad364d621eff314c830612e0971ff268cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ms/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ms/firefox-62.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "b7a723f79a18db5b3d886c39e76a65975c2f6229022c62cab7d7e38c840206d9004c81da1783f4bf0cc373438518f1367f4a34e3764ea9919568ed4c8725c94a";
+      sha512 = "3c72bd0536ada586d31d02cb0b59184889a064d09cf30f73bcb93417064fc6e7905fe084c554d249d0a29cc6ef6c57dfddde7d97d658c14958861397455f267f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/my/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/my/firefox-62.0.3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "5538fa15d3ff02409bf9145d384e1c8e28a182239a682aa5beba671c09a0b813b56af6482476d57084af6a5895ad21af1f6ead71ecf23ea817780aedbd33661b";
+      sha512 = "1118b4d8caf8dc2b4a4aa6ee01805bef409e9238e38182ad8561bd8cd1885c22e2462b7baa00355aadbd103279ac0aa008299beca0157356f49773040916c3bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nb-NO/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nb-NO/firefox-62.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "8349c51a6b01301de6b0e0e37b665f44bd83abe9f771bc086c3f369534b6d4efc692441a46576b2335afda93cd8dbeff60ce17936e205e3c7212a2ef1b2844ce";
+      sha512 = "b0243d6642d51e9a81d58951e9251cf586080a7c90849adefef1678c856a34c0cac710752efa4f3cf1f9d099461968d0a15327d9610bf1792e451bfb38296c56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ne-NP/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ne-NP/firefox-62.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "f16911685a7d233a8957780c5526be9e94c07f73b259dad09855b8c21bdba1756ca70ee71dd7b732ac56555135d749584986bf4501adb056373ded74f96e265d";
+      sha512 = "668498eb589927f92fc53806111c47b7b130d08c53c8a3d997edab4efe52ac7aa1388dedaf976fe46cc45603249b99922b803f32b5306888df194bf4d6547aa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nl/firefox-62.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "07e271170d05cb87cee9361efe8fee2007ca032b462ce68c562406fde581f4baab96c2ccea66cf92b8e72aba4647e7bb8271ec50e3adcfff6b787699b687a23c";
+      sha512 = "c6db81626bfb20724faadc34e113eba0cc3da7e251d1ea9e859ea4b1c82e2d8ecdc01ae3b60c12eab5b071e62c3cfb85a28cddb43573a9da39d3a07cbe78b7ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/nn-NO/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/nn-NO/firefox-62.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "eaace3b808dbc919d05a9701e7af2bdb241d57cb0356e4eb60b4706def37372a16b7767540947efaa91d5a3f338785187f83caf8bfa5bffe5f4f92aa3bec13d0";
+      sha512 = "dcac12899163fac3d191104542f1d834a2406388f69faa78b871106408772a0cf01f73caf267cda6731e557cb872c341d6ddcaa1be9c972007e7a3cd9c0781a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/oc/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/oc/firefox-62.0.3.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "aeaab0fc9ba77aae2c0ddd92d7096c167a99335b3d795f232a24e685d49b53678bed59b6e873ce1c7667f76d1527bf685b910bb51b8defc539999500eac14d5a";
+      sha512 = "1318631847b588dcf4662a3a82a80fb8bd1eac1fe1e78cd4bb5b1bb8990bc7c2adceef1dc057df1ff54cfb195a05612fc5957ddf22bf8355341d6744e1938df6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/or/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/or/firefox-62.0.3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "92b82c7bca322a9bfb6e6df61c9f2b6d82cf39c67848f2905dd372a627eb0379d235982e5634577825ad72794fd1d49b2e591ad5347977dac9a745d1167f7467";
+      sha512 = "6d9a2af2ab431eaa6205958239e33d336f11ff789ee2cd62b90533153ce41b9e17ce3c8204d679c8949c1edbbf493efbc96d009b463e5ac96b3200ab8ab7d707";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pa-IN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pa-IN/firefox-62.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "2aec320ba120dd3632fa95599a9934ce133544e7b0d15a74236fb20435ab0a9ad44d6515f82897e7badeeeae19eb80d6b68fec4d000d63772d4e5ccd1f11d1eb";
+      sha512 = "e7a0b4ff68c428d0028eb098dc0f1da82e14de691ae77d2d94e32465ef50c8af70dc9abe21f92db4606ce4a42d443b181e11bf2157363faad874b07f9c0e0110";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pl/firefox-62.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "b62565b94eaae3ee225f2bbc8981f493594f48d40e8e8d83564a6d4ac6a4194c952663f9db52d7694993f08f714463b7607d659790236a727cbf803b084eb73e";
+      sha512 = "780886f9fa3136ea6d3981e2b63124e3c625acc971c144978840e254e1fb77da5e65fbc7b6b7edc6a363e5f24fbb09bfe16bcd89d3171e6e92efe18a58946e54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-BR/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-BR/firefox-62.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "2b218b66feb456a86919b395d1cdc40aa73de6ebbca3bc4135c54d5dc1ac993bfaf169bc7b0d2d770aa6f4565e71ead1fa2aaab02dc7362a9f4e5a896dae2c2d";
+      sha512 = "d922b1294bb2aea2019034e7af38b9f01cc7aac316a223ddc54137219f01fa1a6d34b23830d82dc9ce816024532cf0535d2753a55b36e952da1f867e487924d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/pt-PT/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/pt-PT/firefox-62.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "d89122b993083bee798279c72a2d6296a5b966f7ac30269edcfe17a2036db648cd3e1e77eaf5f2479afc3c6831657267b22f2507176d62ee08dfaf4c100e074c";
+      sha512 = "86760623c1aa85efb05fe66929f1668fc6c7b2f631b77c9c93d1b12a23c6409345caebc25a70a6891f480dff2112966f283e3658e08951a49bac700de754c975";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/rm/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/rm/firefox-62.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4ecba1d3bc6b3bbbc3ca974afa86e9b6e7664a0dd23605ea34349bbf822fc2098e7dd394f132b43e2e4127eeec36ec820710391671405b14c414d966540b63e3";
+      sha512 = "b66f542b8ce0e878fb9ad599233adc136a20e09f1b77a82050273e16903b56b6f3f8f94a33fdc7a2a1ff0eae94d20cccd4ec6ade8c2ddaabad3c32547303d5ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ro/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ro/firefox-62.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "97e8ebd7bc491bd320106765408bdd88542bd932c3c1b43a373aa5679f20e2a0aa12b48182454ec36812dbf4044364850cfe3e6878bec670ee46e8971e9293cc";
+      sha512 = "393fdf5d1ffe51694b50f5027243d19c2f1d5d25daf9ad88f14f21ce3bc3e0d5bece8cce2f3192d263e873a8e55e1fdd6ec22ce014c43c71ae9fe9833a7b0df9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ru/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ru/firefox-62.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "f8f433e0d2970d028a01f1039951f1e725cae8e263bed9f0dff64387913ae269558f037d672a65d32614408cdd3267ddd65677dbcf212188c531d04960266535";
+      sha512 = "a1af73215c8e3151e45e8a0a7b1c4eee51301065b3a724f904005f41101018eb11313319c1b8206432c4958d5a415575baebc64ff782b4e3b993b71d4a66e829";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/si/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/si/firefox-62.0.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "11620e27c01dd91114d5e2080b430876282316ce6d527100305806314b4e7fccc38f2e93165f3e544cd3ef63b03aeaf738d6079201a0f7ae3f867b2e0b28239f";
+      sha512 = "ee3a7b6b1e9a5b10661390b7f1d1fa61ef9589d59e4f869ef8ff6c4a1719fb15014e2abcd8472769c4a17b3f74ab7ae2671f3f79ad94a1d3d875f2fbdd03eb8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sk/firefox-62.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "0a43e8fdc1c3f2bc63b6bacc15f9e3f3527302d0d7f0f0e0cc9498bab7728cca944fddf886c33ab67c60bcd9bafa051db97c8e8a77e781d6869a4bdb8096f4b1";
+      sha512 = "478eefc7afb725496e3a17615c8458d29e44dc200dfb4534c32cd15d3c45ec15ddf9f5b1fcaad312e00d693a06d9bcd116038177d9844273a64f81b531b6e676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sl/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sl/firefox-62.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "343a22feab53142ff585985fbaa8a037dbe9c3d3c2c073361f8d4af3b74272a47e5df2053ea91b333bf0da15334b9512c0513726ae80176838774020a7c7c639";
+      sha512 = "f07fae5f52528899ef3dc680ecc551311496125d9c10c2117e35d0ac8af387d99236ac9a3f921a9ad2e40102d70df91fcb43526ccb8910d5ded1379a42bf5914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/son/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/son/firefox-62.0.3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "bb9c9c4bc82550b6d83c3b9995a1ca3afadc9fb5b27a5de4503682d29428ed7751895d1225a3b5ba8472d539c9efca957522187e4119e4e134f46b37da2f43e6";
+      sha512 = "f20dbcdea88828cdaa4d9bc2e8ffd2792e06929495b0268814808f842c1bb9ccd87f86df16b005af989edd3c470d53ef6254288664ea192d15620ed10ef2682d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sq/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sq/firefox-62.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "97b2c394f71e9bda6fa679353c579a01f40a4fb5b588bc177329d6fbfcff0d126e2db072c868eafd6078c26f9190f1a2d4c65f887754af4d25eb9c128d807030";
+      sha512 = "9a548ee02d1290c112ac3a72be6cf96163cb67448a8a5ae00a88e3e115f907945899cfb5a5edbf3e37a13c16550ebe7b6f67f94c05be6659c168a5e0043adc04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sr/firefox-62.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "84024816cfd48076ef5ddbe0af392ab5ae0bcb8a02cc0ee1f6d0dafdf5673d9dfee377e83f0a9508c11593d8f4db682ad400c336a1c37591c25864c9299939f9";
+      sha512 = "ff081635cf761293ca77ce7d3574e0a1b6a57d7dfd5649089e9554c27b85de544a39b2973205e293152a33d69137ae373110a884f6427dd58788c5832caa7773";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/sv-SE/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/sv-SE/firefox-62.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "b630b627b038b16ae1b97f669e79afccba95e66a93dc3b7358e26960ae836f1f3663a49394b7a9be9906871a2301824c6b1f78f1f38943b54e4631f9beb90407";
+      sha512 = "28686a08fc1c4cc63a084cbfa094e6f1b8ace446a5746f3892ea37d1b916806a15641875ef08c850c316059078a116a2060294f754e722d84d1fdc2817ed7618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ta/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ta/firefox-62.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "1306d444c620f558894ea81512944e1d07dfe706306206d1638c2e86ae5a2dba4e02b5927e4c9250df3cbc607d15da15bf2cb1c9e1ff74332354ae883c6bcc42";
+      sha512 = "43b3db7262fc43b19f66cc586af56a404b6b0feaa98d31b53766deaa8d4f5314279dd6aaee5e3373f8c1bb9f4c152e2ae6d7aa5b9e4b1123a5dec7b42c6b68ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/te/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/te/firefox-62.0.3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3b0e1d6fea01ac99e315419365afdee54c107dd33ad577b19fcd9a59de1a176f34497e607fc7466217ddef5a6c442a62f1dd41cdb137651c0274274cb9357171";
+      sha512 = "05936a5de6d723edf72c1155aa0f18c9a6eb5275dac4f4de58fe93cfd9a814e7ef349fa6c630d043d6b39ca5dab6fe5f3c92c45c36d5b515b4748bff6493063f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/th/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/th/firefox-62.0.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "7bcb0d7e17d397a7b114172234f3306f9faa28e7d9f8bb2db1399b58c28bd36ce4e478686c3ec98c76793cc75bbb974a316599b3a7c38fb034e852100ffa13e3";
+      sha512 = "5ececcf6b3404f1010b48956bb2423907261f7d544a695e775900e1a3cbc09e71b008b94118ee39651ff6469cf8c456afc5ab9c9fdf0b9fa4a9c41f76e16788b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/tr/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/tr/firefox-62.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "5c543b8bf79fdcb605b6d763688ca5bcd1e61b0e2088441e1d6d6dd4f0823f9f3d2075f39776d582bb468dc41ef39f7d562c7ebb6d5e4f084c3c1aaf1e61de8e";
+      sha512 = "29cc67dc15acf77589fe72d0e28591b5f4403de5cdfc6cfa7cd9f16ccf7315ed19c2d38872b5c76c1f4a78b2688e9401417b6e6ccba1985c27becb54baba4d22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uk/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uk/firefox-62.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2fe636a02d0adc75d00f67620fcfaba902d16b5d828c2c9770560300c33cd0a8a8bd7208f146943cd62ac0aa8e3be784ff8549de78eb4f247783e1cfc823dd1c";
+      sha512 = "e7814a55b835051c8d02b74e4343739241ea60d69b8060a496f60b6b323b81d8628541d346281e0080d83d9ef4183640c907c144743d3d444499c887c34709ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/ur/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/ur/firefox-62.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c84e1bf737b3a4b93f77098a087bd7ae598364d6a15110d3032bab4ee8aab6d1a64ce3ec4ef17b197b920e334f1e57a7a093581b8ac3b1ecab85d9cbb2da2c50";
+      sha512 = "e6323528d7a916473a62edd9565ed8d67832e3298fba51c7aca32f9d0c2d401ac74d2df5770962e191f7fc79fbbe6f22ae242475075423a23f09c8f11c26afa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/uz/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/uz/firefox-62.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "cee9849825181c517a82c6f6cb07920767ff2c02d54b87c8e509e60bef3adff260f282882b9495b6034fa61b11e2cf831e3adc3ed3928ff32792a62084cf115b";
+      sha512 = "759e63deb63e59166d137e109f81ecd57a314aa045eb97a54ae82fe04a418bc3ac73c83bb663d65fc1b66233ed49e43ba7ba5a8db1bce5138fc6b65b7377b230";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/vi/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/vi/firefox-62.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a0eddaf392addf41017108ded0d32418175ab5ff7cddf74e3224929da93bc84cf07312671f16aa5652ecdc315707a4301c69b856be709f4298861298541a065f";
+      sha512 = "cdd1e2fb71043fa628bc9653a1be4c7a4d64779383b25d2b1812ea7af2eea3711cc2777c09be1acaf2fcba9c931cd212c99bde69d067d331a294825b89c2addb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/xh/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/xh/firefox-62.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "50741d2ff1b7f1d9cf503af66ec61a2d19600ad7240db837392440b2943c6d96a7b8d5538ca24f0d528cbe9fbaede7964c9f8404474f95a1c022e193fa91f81e";
+      sha512 = "97eb405cc8379cd803af5db55166b9db1e489c5a0e29fc316cdeeb49e2c2beca2ba87f7f01e9117dd22639d0cbfddc26ca90aa4187a522462a1b42126bee89a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-CN/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-CN/firefox-62.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "103be3f37fa7a92c00d6465f93bedffc31527939bd85df0c742c04ac75f9ddec4018a368a2ff29730f5a055459b018c64afa344df255638ec3c26bb295e1a31a";
+      sha512 = "7559ae148ce548d2b766be291667e7f04d9c28bca0de467cb36f37772736d2f44cb3724e0bf0c95bdd11ac2a84ab07238e14902d6f8f23280796505cf5b9e471";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.2/linux-i686/zh-TW/firefox-62.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/62.0.3/linux-i686/zh-TW/firefox-62.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0ac22e595f2d87f75b586eabab07470f9eec16026a45902fb40c19fd2cbf93f2f88241900a13703edb89290953127c689bacbc0eccd560822e43bc07a97e3ddf";
+      sha512 = "95829dba29e96497f047e2f03a4bcbe36d61c0a36637087e56300f889f9b191c7b6c4ce936604283145f4a8be8ee4b129fefdeba7efd201cd0a647a0016ebde1";
     }
     ];
 }

From 9ec17c6318451c92c8878d9b9a6f72d148832c79 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 3 Oct 2018 09:44:53 +0200
Subject: [PATCH 2298/3253] emby: move usr/lib to lib

---
 pkgs/servers/emby/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 61f4ab721309..1382e6ecdf2d 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -dm 755 "$out/usr/lib/emby-server"
-    cp -r * "$out/usr/lib/emby-server"
+    install -dm 755 "$out/lib/emby-server"
+    cp -r * "$out/lib/emby-server"
 
     makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         sqlite
       ]}" \
-      --add-flags "$out/usr/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
+      --add-flags "$out/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 
   meta =  with stdenv.lib; {

From e7785f1148a8d9535b320eef4aa2d8cd8b64c400 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 3 Oct 2018 09:38:43 +0200
Subject: [PATCH 2299/3253] firefox: 62.0.2 -> 62.0.3 [critical security fixes]

This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 935be6230cd3..1f1f8d127ab1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -20,10 +20,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "62.0.2";
+    version = "62.0.3";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "0j5q1aa7jhq4pydaywp8ymibc319wv3gw2q15qp14i069qk3fpn33zb5z86lhb6z864f88ikx3zxv6phqs96qvzj25yqbh7nxmzwhvv";
+      sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
     };
 
     patches = nixpkgsPatches ++ [

From 246d2848ff657d56fcf2d8596709e8869ce8616a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 3 Oct 2018 09:39:08 +0200
Subject: [PATCH 2300/3253] firefox-esr-60: 60.2.1 -> 60.2.2 [critical security
 fixes]

This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 1f1f8d127ab1..369b18d5ead5 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -70,10 +70,10 @@ rec {
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.2.1esr";
+    version = "60.2.2esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "2mklws09haki91w3js2i5pv8g3z5ck4blnzxvdbk5qllqlv465hn7rvns78hbcbids55mqx50fsn0161la73v25zs04bf8xdhbkcpsm";
+      sha512 = "2h2naaxx4lv90bjpcrsma4sdhl4mvsisx3zi09vakjwv2lad91gy41cmcpqprpcbsmlvpqf8yiv52ah4d02a8d9335xhw2ajw6asjc1";
     };
 
     patches = nixpkgsPatches ++ [

From 9fb2c17b166ec10b0d9c4c0b94b67304cb797a92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 00:53:23 -0700
Subject: [PATCH 2301/3253] vc: 1.3.3 -> 1.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vc/versions
---
 pkgs/development/libraries/vc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index e2a2af615b88..7f46702c2e8c 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "Vc-${version}";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m";
+    sha256 = "1jwwp3g8pqngdakqy3dxy3vgzh0gla5wvwqqlfvqdgsw6455xhm7";
   };
 
   nativeBuildInputs = [ cmake ];

From d90eeeb60a269bbf6b7526d8f8272d9582065721 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 01:12:12 -0700
Subject: [PATCH 2302/3253] visualvm: 1.4.1 -> 1.4.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visualvm/versions
---
 pkgs/development/tools/java/visualvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 2a707e35b918..3cec26435050 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.4.2";
   name = "visualvm-${version}";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
-    sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78";
+    sha256 = "0kic1rqxaj2rpnflj1wklsy3gjz50gcb0wak4qi3hjkz5rv6gp1y";
   };
 
   desktopItem = makeDesktopItem {

From c064995331adbc19f7abacd32f505022d080ac26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 01:13:31 -0700
Subject: [PATCH 2303/3253] thermald: 1.7.2 -> 1.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/thermald/versions
---
 pkgs/tools/system/thermald/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index a8670203775a..818c76712c7e 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
-  version = "1.7.2";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc";
+    sha256 = "1g1l7k8yxj8bl1ysdx8v6anv1s7xk9j072y44gwki70dy48n7j92";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 929ad8e99662d9ff6f08a5646ecc66e5c7df1bfc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Oct 2018 10:21:41 +0200
Subject: [PATCH 2304/3253] samsung-unified-linux-driver: update default
 version to 4.01.17

 * Version 4.01.17 works fine for me on NixOS, driving both a Samsung ML-2165w
   and a Samsung ML-2510 printer successfully.

 * Version 4.00.39 is broken. The build shows errors, but doesn't abort. The
   generated binaries don't work, because they are lacking rpaths to their
   library dependencies.

 * Renamed old default.nix file to 1.00.37.nix. That version wasn't the default
   and it feels like a bad idea to mix versioned and unversioned file names in
   the same directory.
---
 pkgs/misc/cups/drivers/samsung/{default.nix => 1.00.37.nix} | 0
 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix          | 1 +
 pkgs/top-level/all-packages.nix                             | 5 +++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename pkgs/misc/cups/drivers/samsung/{default.nix => 1.00.37.nix} (100%)

diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/default.nix
rename to pkgs/misc/cups/drivers/samsung/1.00.37.nix
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 35b0ba3684fe..df0a270a5b2b 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -39,5 +39,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.samsung.com/;
     license = licenses.unfree;
     platforms = platforms.linux;
+    broken = true;   # libscmssc.so and libmfp.so can't find their library dependencies at run-time
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a824858be91f..f837da8e58c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22066,9 +22066,10 @@ with pkgs;
   mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
   mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
 
-  samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
+  samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
+  samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
   samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
-  samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
+  samsung-unified-linux-driver = self.samsung-unified-linux-driver_4_01_17;
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;

From 2e53e8155f661d1a6b6d812d4ae0ede3558d56f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 01:33:20 -0700
Subject: [PATCH 2305/3253] sundials: 3.1.2 -> 3.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sundials/versions
---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index fc9abdc24c7c..c903b041fd4d 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "3.1.2";
+  version = "3.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
   url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-  sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658";
+  sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj";
   };
 
   preConfigure = ''

From 63ff7bd008617336b84235e62a072516f08dfafc Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 3 Oct 2018 10:42:59 +0200
Subject: [PATCH 2306/3253] st: remove unused build inputs, drop wrapper

- remove unused buildInputs
- ncurses belongs in nativeBuildInputs (tic to compile terminfo)
- drop dmenu wrapper, st doesn't use dmenu at all
---
 pkgs/applications/misc/st/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index efaf986a9e54..f8340b1bd227 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
-, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
+{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses
+, libXft, conf ? null, patches ? [], extraLibs ? []}:
 
 with stdenv.lib;
 
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
+  nativeBuildInputs = [ pkgconfig ncurses ];
+  buildInputs = [ libX11 libXft ] ++ extraLibs;
 
   installPhase = ''
     TERMINFO=$out/share/terminfo make install PREFIX=$out
-    wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
   '';
 
   meta = {

From c707a8906caef058ee87b51fbf89032b65cc1deb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 01:44:11 -0700
Subject: [PATCH 2307/3253] tiled: 1.1.6 -> 1.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tiled/versions
---
 pkgs/applications/editors/tiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 93f1639107ee..fb670d59bd12 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = "tiled";
     rev = "v${version}";
-    sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s";
+    sha256 = "15apv81c5h17ljrxvm7hlyqg5bw58dzgik8gfhmh97wpwnbz1bl9";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From db013c461841a1aeeb965522ecba34a301dc7a2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 01:49:57 -0700
Subject: [PATCH 2308/3253] strongswan: 5.6.3 -> 5.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/strongswan/versions
---
 pkgs/tools/networking/strongswan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index d176c08829e5..eac1ccb253fc 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.6.3";
+  version = "5.7.1";
 
   src = fetchurl {
     url = "https://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3";
+    sha256 = "1v2b8lnqrkbc9hx3p2rw36xvphdy5ayy3dblm3kz98p24s8rqvq0";
   };
 
   dontPatchELF = true;

From 1d2f4d6b37d26312312600d0344ab04c39d272c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 02:02:15 -0700
Subject: [PATCH 2309/3253] tmuxp: 1.4.0 -> 1.4.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tmuxp/versions
---
 pkgs/tools/misc/tmuxp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index dd0fb4de702e..fe31d324087c 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -4,11 +4,11 @@ with python.pkgs;
 
 buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ghi6w0cfgs94zlz304q37h3lga2jalfm0hqi3g2060zfdnb96n7";
+    sha256 = "087icp1n1qdf53f1314g5biz16sigrnpqr835xqlr6vj85imm2dm";
   };
 
   postPatch = ''

From 7cab2950958ebcfd25c7c124254a57cd53e2f72e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 02:14:57 -0700
Subject: [PATCH 2310/3253] softhsm: 2.4.0 -> 2.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/softhsm/versions
---
 pkgs/tools/security/softhsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 4a4b790181d5..ec5eea52a6f8 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "01ysfmq0pzr3g9laq40xwq8vg8w135d4m8n05mr1bkdavqmw3ai6";
+    sha256 = "1cijq78jr3mzg7jj11r0krawijp99p253f4qdqr94n728p7mdalj";
   };
 
   configureFlags = [

From 7297cc550165a7cd10f6a9946c70c3a7198fcc78 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 3 Oct 2018 12:31:08 +0200
Subject: [PATCH 2311/3253] nixos/activation: fix systemd-user daemon-reload in
 auto-upgrade service (#47695)

The autoupgrade service defined in `system.autoUpgrade`
(`nixos/modules/installer/tools/auto-upgrade.nix`) doesn't have `su` in
its path and thus yields a warning during the `daemon-reload`.

Specifying the absolute path fixes the issue.

Fixes #47648
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 nixos/modules/system/activation/top-level.nix              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index c3e469e4b8a1..daaf8e542147 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -419,7 +419,7 @@ while (my $f = <$listActiveUsers>) {
     my ($uid, $name) = ($+{uid}, $+{user});
     print STDERR "reloading user units for $name...\n";
 
-    system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+    system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
 }
 
 close $listActiveUsers;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 413543df88c6..a560af5ce96d 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -109,6 +109,7 @@ let
     inherit (pkgs) utillinux coreutils;
     systemd = config.systemd.package;
     shell = "${pkgs.bash}/bin/sh";
+    su = "${pkgs.shadow.su}/bin/su";
 
     inherit children;
     kernelParams = config.boot.kernelParams;

From b9f9b05c3719b05ab6700f261dea4b9143d43f8a Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Wed, 3 Oct 2018 12:58:06 +0200
Subject: [PATCH 2312/3253] kubectx: 0.5.1 -> 0.6.1

Also provides shell completions for zsh, bash and fish
---
 pkgs/development/tools/kubectx/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index 5cf0badf668e..959bb8698682 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubectx";
-  version = "0.5.1";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = "${name}";
     rev = "v${version}";
-    sha256 = "1bmmaj5fffx4hy55l6x4vl5gr9rp2yhg4vs5b9sya9rjvdkamdx5";
+    sha256 = "1507g8sm73mqfsxl3fabmj37pk9l4jddsdi4qlpf0ixhk3z1lfkg";
   };
 
   buildInputs = [ makeWrapper ];
@@ -20,9 +20,24 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
+    mkdir -p $out/share/zsh/site-functions
+    mkdir -p $out/share/bash-completion/completions
+    mkdir -p $out/share/fish/vendor_completions.d
+
     cp kubectx $out/bin
     cp kubens $out/bin
 
+    # Provide ZSH completions
+    cp completion/kubectx.zsh $out/share/zsh/site-functions/_kubectx
+    cp completion/kubens.zsh $out/share/zsh/site-functions/_kubens
+
+    # Provide BASH completions
+    cp completion/kubectx.bash $out/share/bash-completion/completions/kubectx
+    cp completion/kubens.bash $out/share/bash-completion/completions/kubens
+
+    # Provide FISH completions
+    cp completion/*.fish $out/share/fish/vendor_completions.d/
+
     for f in $out/bin/*; do
       wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]}
     done

From ced55630564bdc8abb69792aacdd5bd1d9f11e46 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Wed, 3 Oct 2018 12:59:07 +0200
Subject: [PATCH 2313/3253] opensm: 3.3.20 -> 3.3.21

Old git source repository was dead. Switched to GitHub
---
 pkgs/tools/networking/opensm/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index a053c82a8264..075ceff3555e 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, flex, rdma-core }:
 
 stdenv.mkDerivation rec {
   name = "opensm-${version}";
-  version = "3.3.20";
+  version = "3.3.21";
 
-  src = fetchgit {
-    url = git://git.openfabrics.org/~halr/opensm.git;
-    rev = name;
-    sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl";
+  src = fetchFromGitHub {
+    owner = "linux-rdma";
+    repo = "opensm";
+    rev = "${version}";
+    sha256 = "0iikw28vslxq3baq9qmmw08yay7l524wciz7dv7km09ylcbx23b7";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison flex ];
@@ -16,6 +17,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = "bash ./autogen.sh";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Infiniband subnet manager";
     homepage = https://www.openfabrics.org/;

From 94f9b813c80340462e6ba2cc7b073803dc1004f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 04:14:01 -0700
Subject: [PATCH 2314/3253] pscircle: 1.0.0 -> 1.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pscircle/versions
---
 pkgs/os-specific/linux/pscircle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix
index a334465fb71d..1efbd7bc2c9f 100644
--- a/pkgs/os-specific/linux/pscircle/default.nix
+++ b/pkgs/os-specific/linux/pscircle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pscircle-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitLab {
     owner = "mildlyparallel";
     repo = "pscircle";
     rev = "v${version}";
-    sha256 = "188d0db62215pycmx2qfmbbjpmih03vigsz2j448zhsbyxapavv3";
+    sha256 = "1sxdnhkcr26l29nk0zi1zkvkd7128xglfql47rdb1bx940vflgb6";
   };
 
   buildInputs = [

From a0b9099e1a34b15958c8a3e1986774752d5918a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 04:36:47 -0700
Subject: [PATCH 2315/3253] pulseeffects: 4.3.5 -> 4.3.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pulseeffects/versions
---
 pkgs/applications/audio/pulseeffects/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index b055a520be04..f7463207045d 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -44,13 +44,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "pulseeffects-${version}";
-  version = "4.3.5";
+  version = "4.3.7";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "01jxkz4s3m8cqsn6wcbrw7bzr7sr7hqsp9950018riilpni7k4bd";
+    sha256 = "1x1jnbpbc9snya9k2xq39gssf0k4lnd1hr4cjrnwscg5rqybxqsk";
   };
 
   nativeBuildInputs = [

From 51c389d57fabd8beec6b102725c6df4cfe5b89bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 04:43:31 -0700
Subject: [PATCH 2316/3253] pgcli: 1.10.3 -> 1.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgcli/versions
---
 pkgs/development/tools/database/pgcli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 2926946cd45a..bc1c2515bfa7 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "pgcli-${version}";
-  version = "1.10.3";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "dbcli";
     repo = "pgcli";
     rev = "v${version}";
-    sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
+    sha256 = "01qcvl0iwabinq3sb4340js8v3sbwkbxi64sg4xy76wj8xr6kgsk";
   };
 
   buildInputs = with pythonPackages; [ pytest mock ];

From 45d4712b712dbcd610fffeddfc2089e9fe933599 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 04:46:53 -0700
Subject: [PATCH 2317/3253] parallel: 20180822 -> 20180922

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/parallel/versions
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 11a9cd4ff87a..9da8b1c25522 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180822";
+  name = "parallel-20180922";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm";
+    sha256 = "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 22e39f642bf8e8d04fabc068bcd77503e424b7d8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 3 Oct 2018 07:46:31 -0400
Subject: [PATCH 2318/3253] xmonad-extras: jailbreak

Our XMonad identifies as 0.15, which is why we need to jailbreak it
into the extras build
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e4dac4a88612..409f159387fd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1152,4 +1152,5 @@ self: super: {
     sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq";
   });
 
+  xmonad-extras = doJailbreak super.xmonad-extras;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 153f98062c47efdea7497d95230f4efe18a9fa8e Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 3 Oct 2018 13:54:02 +0200
Subject: [PATCH 2319/3253] gitAndTools.stgit: fix fetcher and meta

---
 .../git-and-tools/stgit/default.nix           | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 64e700273d12..4cc1a6f78dfa 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2, git }:
+{ stdenv, fetchFromGitHub, python2, git }:
 
 let
   name = "stgit-${version}";
@@ -7,9 +7,11 @@ in
 stdenv.mkDerivation {
   inherit name;
 
-  src = fetchurl {
-    url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz";
-    sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00";
+  src = fetchFromGitHub {
+    owner = "ctmarinas";
+    repo = "stgit";
+    rev = "v${version}";
+    sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y";
   };
 
   buildInputs = [ python2 git ];
@@ -24,12 +26,11 @@ stdenv.mkDerivation {
   doCheck = false;
   checkTarget = "test";
 
-  meta = {
-    homepage = http://procode.org/stgit/;
+  meta = with stdenv.lib; {
     description = "A patch manager implemented on top of Git";
-    license = "GPL";
-
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://procode.org/stgit/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.unix;
   };
 }

From 508c80c888aecf8493e1813212ef2959b037393a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 04:56:26 -0700
Subject: [PATCH 2320/3253] pcapfix: 1.1.2 -> 1.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pcapfix/versions
---
 pkgs/tools/networking/pcapfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix
index 970844ea6d6d..5e3bf176b2c9 100644
--- a/pkgs/tools/networking/pcapfix/default.nix
+++ b/pkgs/tools/networking/pcapfix/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcapfix-1.1.2";
+  name = "pcapfix-1.1.3";
 
   src = fetchurl {
     url = "https://f00l.de/pcapfix/${name}.tar.gz";
-    sha256 = "0dl6pgqw6d8i5rhn6xwdx7sny16lpf771sn45c3p0l8z4mfzg6ay";
+    sha256 = "0f9g6yh1dc7x1n28xs4lcwlk6sa3mpz0rbw0ddhajqidag2k07sr";
   };
 
   postPatch = ''sed -i "s|/usr|$out|" Makefile'';

From 734cdd77b3e08947b20e17b0ade406808234caf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 05:26:46 -0700
Subject: [PATCH 2321/3253] packagekit: 1.1.10 -> 1.1.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/packagekit/versions
---
 pkgs/tools/package-management/packagekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 2acb39c0b732..5ba387a12f82 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
-  version = "1.1.10";
+  version = "1.1.11";
 
   outputs = [ "out" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs";
+    sha256 = "0zr4b3ax8lcd3wkgj1cybs2cqf38br2nvl91qkw9g2jmzlq6bvic";
   };
 
   buildInputs = [ glib polkit python gobjectIntrospection vala_0_38 ]

From d802524def3c7ca26e2c0206751b1ff7f1c702a6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 3 Oct 2018 09:13:57 +0900
Subject: [PATCH 2322/3253] thunderbird: 60.0 -> 60.2.1

---
 .../mailreaders/thunderbird/default.nix        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d925838e642c..e0bedeb2f045 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
-, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, fetchpatch
+, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
 , freetype, fontconfig, file, nspr, nss, libnotify
 , yasm, libGLU_combined, sqlite, unzip
 , hunspell, libevent, libstartup_notification
@@ -24,11 +24,11 @@ let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "60.0";
+  version = "60.2.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya";
+    sha512 = "018l9pq03nzlirpaf285qpwvb8s4msam8n91d15lzc1bc1caq9zcy2dnrnvn5av3jlapm9ckz028iar66nhqxi2kkqbmiaq0v4s6kfp";
   };
 
   # from firefox, but without sound libraries
@@ -47,6 +47,16 @@ in stdenv.mkDerivation rec {
   # from firefox + m4 + wrapperTool
   nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
+  # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
+  patches = [
+    (fetchpatch {
+      name = "bc651d3d910c.patch";
+      url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
+      sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
+    })
+  ];
+
   configureFlags =
     [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
       "--enable-application=comm/mail"

From aee3689349c3ba13422c4c63de82dd6902abbb1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 05:36:40 -0700
Subject: [PATCH 2323/3253] mtools: 4.0.18 -> 4.0.19

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
---
 pkgs/tools/filesystems/mtools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index f153e59019e3..762368651d70 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.18";
+  name = "mtools-4.0.19";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
+    sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v";
   };
 
   # Prevents errors such as "mainloop.c:89:15: error: expected ')'"

From d8a555d81904b6c92c5ac0502235260111ff0e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Wed, 3 Oct 2018 14:39:36 +0200
Subject: [PATCH 2324/3253] Fix systemd timer unit documentation

Fixes #36210
---
 nixos/modules/system/boot/systemd-unit-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 2cff25a8c854..5f2bec5c34ae 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -394,7 +394,7 @@ in rec {
         Each attribute in this set specifies an option in the
         <literal>[Timer]</literal> section of the unit.  See
         <citerefentry><refentrytitle>systemd.timer</refentrytitle>
-        <manvolnum>7</manvolnum></citerefentry> and
+        <manvolnum>5</manvolnum></citerefentry> and
         <citerefentry><refentrytitle>systemd.time</refentrytitle>
         <manvolnum>7</manvolnum></citerefentry> for details.
       '';

From 212501f4c7226c69c1679687ea1a7153ceeb63fc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 05:48:26 -0700
Subject: [PATCH 2325/3253] neo4j: 3.4.6 -> 3.4.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neo4j/versions
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index cc16838d082f..1fba6571e281 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0bby42sp7gpyglp03c5nq9hzzlcckzfsc84i07jlx8gglidw80l3";
+    sha256 = "0jgk7kvsalpmawdds0ln76ma7qbdxwgh004lkalicciiljkyv8pj";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 98092f7a678e57d435814699150fe968440cae21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 05:54:07 -0700
Subject: [PATCH 2326/3253] nauty: 26r10 -> 26r11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nauty/versions
---
 pkgs/applications/science/math/nauty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index d7b4707420be..9639376fbda3 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "nauty-${version}";
-  version = "26r10";
+  version = "26r11";
   src = fetchurl {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
-    sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6";
+    sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y";
   };
   buildInputs = [];
   installPhase = ''

From 328144f5ade461e80467bc0b42cb0574fb17ae22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 06:00:44 -0700
Subject: [PATCH 2327/3253] nsd: 4.1.24 -> 4.1.25

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nsd/versions
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index ee09024dc0eb..5f330c4f06e2 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.24";
+  name = "nsd-4.1.25";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg";
+    sha256 = "0zyzjd3wmq258jiry62ci1z23qfd0rc5ggnpmybc60xvpddgynwg";
   };
 
   prePatch = ''

From ecd4fc5292f3a5bc5070a4dd4bb8f9cf7fa82fbf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 06:18:19 -0700
Subject: [PATCH 2328/3253] obs-studio: 22.0.2 -> 22.0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/obs-studio/versions
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index cacad5a3e629..3bb8f31b9872 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -30,13 +30,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "22.0.2";
+  version = "22.0.3";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "1bgp2lirpsbp54vvl3p345njlpgv0d78vac2aqwbl34wqx5sqdk0";
+    sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i";
   };
 
   nativeBuildInputs = [ cmake

From 2c54be7375f7e48a29439c383db07836229dcc01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 06:30:21 -0700
Subject: [PATCH 2329/3253] netsniff-ng: 0.6.4 -> 0.6.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/netsniff-ng/versions
---
 pkgs/tools/networking/netsniff-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 60f7b647eea5..8bebe973522b 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "netsniff-ng-${version}";
-  version = "0.6.4";
+  version = "0.6.5";
 
   # Upstream recommends and supports git
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
     rev = "v${version}";
-    sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly";
+    sha256 = "0bcbdiik69g6jnravkkid8gxw2akg01i372msc5x1w9fh9wh2phw";
   };
 
   patches = [ ./glibc-2.26.patch ];

From a3378c5088b89d2428ac8464f9e54a97d0bc49b8 Mon Sep 17 00:00:00 2001
From: Urban Skudnik <urban.skudnik@gmail.com>
Date: Wed, 12 Sep 2018 20:54:21 +0200
Subject: [PATCH 2330/3253] tsung: init at 1.7.0

---
 .../applications/networking/tsung/default.nix | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/networking/tsung/default.nix

diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/applications/networking/tsung/default.nix
new file mode 100644
index 000000000000..0ee6d45e369a
--- /dev/null
+++ b/pkgs/applications/networking/tsung/default.nix
@@ -0,0 +1,50 @@
+{ fetchurl, stdenv, lib, makeWrapper,
+  erlang,
+  python2, python2Packages,
+  perl, perlPackages,
+  gnuplot }:
+
+stdenv.mkDerivation rec {
+  name = "tsung-${version}";
+  version = "1.7.0";
+  src = fetchurl {
+    url = "http://tsung.erlang-projects.org/dist/tsung-${version}.tar.gz";
+    sha256 = "6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a";
+  };
+
+  buildInputs = [ makeWrapper ];
+  propagatedBuildInputs = [
+    erlang
+    gnuplot
+    perl
+    perlPackages.TemplateToolkit
+    python2
+    python2Packages.matplotlib
+  ];
+
+
+  postFixup = ''
+    # Make tsung_stats.pl accessible
+    # Leaving .pl at the end since all of tsung documentation is refering to it
+    # as tsung_stats.pl
+    ln -s $out/lib/tsung/bin/tsung_stats.pl $out/bin/tsung_stats.pl
+
+    # Add Template Toolkit and gnuplot to tsung_stats.pl
+    wrapProgram $out/bin/tsung_stats.pl \
+        --prefix PATH : ${lib.makeBinPath [ gnuplot ]} \
+        --set PERL5LIB "${lib.makePerlPath [ perlPackages.TemplateToolkit ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://tsung.erlang-projects.org/";
+    description = "A high-performance benchmark framework for various protocols including HTTP, XMPP, LDAP, etc.";
+    longDescription = ''
+      Tsung is a distributed load testing tool. It is protocol-independent and
+      can currently be used to stress HTTP, WebDAV, SOAP, PostgreSQL, MySQL,
+      AMQP, MQTT, LDAP and Jabber/XMPP servers.
+    '';
+    license = licenses.gpl2;
+    maintainers = [ maintainers.uskudnik ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70b30adddb62..74b5dc029612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22388,4 +22388,6 @@ with pkgs;
   alibuild = callPackage ../development/tools/build-managers/alibuild {
     python = python27;
   };
+
+  tsung = callPackage ../applications/networking/tsung {};
 }

From 4931655f69befbc81c8b902d932c665afec2879c Mon Sep 17 00:00:00 2001
From: Urban Skudnik <urban.skudnik@gmail.com>
Date: Sun, 16 Sep 2018 21:25:48 +0200
Subject: [PATCH 2331/3253] Add Urban Skudnik (me) as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 837c4f46dee2..2e2de1e36fb5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4257,6 +4257,11 @@
     github = "uri-canva";
     name = "Uri Baghin";
   };
+  uskudnik = {
+    email = "urban.skudnik@gmail.com";
+    github = "uskudnik";
+    name = "Urban Skudnik";
+  };
   utdemir = {
     email = "me@utdemir.com";
     github = "utdemir";

From ba2fe3c9a626a8fb845c786383b8b23ad8355951 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Tue, 25 Sep 2018 11:12:33 -0700
Subject: [PATCH 2332/3253] firefox: disable auto updates using distribution
 policies. Resolves #33884

---
 .../networking/browsers/firefox-bin/default.nix       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 91aee7b1e8a5..c81c79349857 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -42,6 +42,7 @@
 , channel
 , generated
 , writeScript
+, writeText
 , xidel
 , coreutils
 , gnused
@@ -69,6 +70,12 @@ let
 
   systemLocale = config.i18n.defaultLocale or "en-US";
 
+  policies = {
+    DisableAppUpdate = true;
+  };
+
+  policiesJson = writeText "no-update-firefox-policy.json" (builtins.toJSON { inherit policies; });
+
   defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
 
   source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
@@ -172,6 +179,10 @@ stdenv.mkDerivation {
       ln -s "$out/usr/lib" "$out/lib"
 
       gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
+
+      # See: https://github.com/mozilla/policy-templates/blob/master/README.md
+      mkdir -p "$out/lib/firefox-bin-${version}/distribution";
+      ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json";
     '';
 
   passthru.execdir = "/bin";

From aef6830d3e59d554dea2cb96c07326922cffe416 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 30 Sep 2018 12:56:02 +0200
Subject: [PATCH 2333/3253] rustc: 1.29.0 -> 1.29.1

From the changelog:

- The standard library's `str::repeat` function contained an out of bounds write
  caused by an integer overflow. This has been fixed by deterministically
  panicking when an overflow happens.
---
 pkgs/development/compilers/rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 47415ac9177b..7d785093f9b3 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.29.0";
-  cargoVersion = "1.29.0";
+  version = "1.29.1";
+  cargoVersion = "1.29.1";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
+    sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
   };
 in rec {
   rustc = callPackage ./rustc.nix {

From 6ad43a0bce3603b25bcadb458d39701616d245f4 Mon Sep 17 00:00:00 2001
From: Edward Tate <cmalune@gmail.com>
Date: Sun, 30 Sep 2018 16:03:35 +0200
Subject: [PATCH 2334/3253] buildRustPackage now correctly installs binaries to
 bin and libraries to lib.

---
 pkgs/build-support/rust/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 1d5de052f893..ec4514121c24 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -91,8 +91,10 @@ in stdenv.mkDerivation (args // {
 
   installPhase = args.installPhase or ''
     runHook preInstall
-    mkdir -p $out/bin
-    find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \;
+    mkdir -p $out/bin $out/lib
+    find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
+    find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
+    rmdir --ignore-fail-on-non-empty $out/lib $out/bin
     runHook postInstall
   '';
 

From f8f932769700f617e8bf4771b0583283be41345f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 07:27:52 -0700
Subject: [PATCH 2335/3253] mkvtoolnix: 26.0.0 -> 27.0.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mkvtoolnix/versions
---
 pkgs/applications/video/mkvtoolnix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 3f0fb0e8022c..7d9ce1ac453b 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "26.0.0";
+  version = "27.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "0dq0lbr6kzj455mv4z6a851n7ff3xlmsxklijiyp4drn1jf0q1pb";
+    sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n";
   };
 
   nativeBuildInputs = [

From ba98a7aea19cf2b56de4ff39a085b840419f9eee Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 3 Oct 2018 16:41:03 +0200
Subject: [PATCH 2336/3253] minikube: 0.28.1 -> 0.29.0

Hard-code kubernetes version as the upstream python script is broken/not-up-to-date

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/networking/cluster/minikube/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 37431b0fbc44..c68fb48fa1a4 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,7 +14,9 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.28.1";
+  version = "0.29.0";
+
+  kubernetesVersion = "1.11.2";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -22,7 +24,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
+    sha256 = "09px8pxml7xrnfhyjvlhf1hw7zdj9sw47a0fv5wj5aard54lhs1l";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
@@ -35,7 +37,7 @@ in buildGoPackage rec {
 
     ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
     ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
-    KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true
+    KUBERNETES_VERSION=${kubernetesVersion}
 
     export buildFlagsArray="-ldflags=\
       -X k8s.io/minikube/pkg/version.version=v${version} \

From bab32fb789ae084dd623999135aa4587c7163c29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 07:52:09 -0700
Subject: [PATCH 2337/3253] lxterminal: 0.3.1 -> 0.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lxterminal/versions
---
 pkgs/applications/misc/lxterminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index b16507c8b7bd..314f8bcece10 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -2,14 +2,14 @@
 , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
 }:
 
-let version = "0.3.1"; in
+let version = "0.3.2"; in
 
 stdenv.mkDerivation rec {
   name = "lxterminal-${version}";
 
   src = fetchurl {
     url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";
-    sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c";
+    sha256 = "1iafqmccsm3nnzwp6pb2c04iniqqnscj83bq1rvf58ppzk0bvih3";
   };
 
   configureFlags = [

From 1549c0a95cecccb80a3df0ed4cebb1fecc683fcf Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 3 Oct 2018 17:03:31 +0200
Subject: [PATCH 2338/3253] nvie/vim-flake8: init at 2018-09-21

---
 pkgs/misc/vim-plugins/generated.nix    | 10 ++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index bb6d60e33fb5..8717ec5df487 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2088,6 +2088,16 @@
     };
   };
 
+  vim-flake8 = buildVimPluginFrom2Nix {
+    name = "vim-flake8-2018-09-21";
+    src = fetchFromGitHub {
+      owner = "nvie";
+      repo = "vim-flake8";
+      rev = "d50b3715ef386e4d998ff85dad6392110536478d";
+      sha256 = "135374sr4ymyslc9j8qgf4qbhijc3lm8jl9mhhzq1k0ndsz4w3k3";
+    };
+  };
+
   vim-ft-diff_fold = buildVimPluginFrom2Nix {
     name = "vim-ft-diff_fold-2013-02-10";
     src = fetchFromGitHub {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b6c1d584d6a4..8f0527e1b36d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -194,6 +194,7 @@ neutaaaaan/iosvkem
 nixprime/cpsm
 NLKNguyen/papercolor-theme
 noc7c9/vim-iced-coffee-script
+nvie/vim-flake8
 osyo-manga/shabadou.vim
 osyo-manga/vim-anzu
 osyo-manga/vim-textobj-multiblock

From f9ec698fa9bb81a241e5e6857b1e2fae7d1d9285 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 08:10:56 -0700
Subject: [PATCH 2339/3253] ipmiutil: 3.1.2 -> 3.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipmiutil/versions
---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index cd6577694890..a578f9db97a6 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.1.2";
+  version = "3.1.3";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "00s7qbmywk3wka985lhhki17xs7d0ll8p172avv1pzmdwfrm703n";
+    sha256 = "0mxydn6pwdhky659rz6k1jlh95hy43pmz4nx53kligjwy2v060xq";
   };
 
   buildInputs = [ openssl ];

From 7c5c3fceff06ecadf21297d2b5cbed4e7e6168b4 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 23:11:59 +0200
Subject: [PATCH 2340/3253] haskell.lib.getBuildInputs: Use generic builder
 passthru to implement

---
 .../haskell-modules/generic-builder.nix       | 15 ++++-
 pkgs/development/haskell-modules/lib.nix      | 56 +------------------
 2 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 648ee4b6b9b6..8dea5d0493b3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -174,8 +174,7 @@ let
     (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
   ];
 
-  isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
-  isSystemPkg = x: !isHaskellPkg x;
+  isHaskellPkg = x: x ? isHaskellLibrary;
 
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
@@ -192,7 +191,10 @@ let
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
 
-  allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
+
+  allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild;
+  isHaskellPartition =
+    stdenv.lib.partition isHaskellPkg allBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
   systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
@@ -429,6 +431,13 @@ stdenv.mkDerivation ({
 
     compiler = ghc;
 
+
+    getBuildInputs = {
+      inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
+      haskellBuildInputs = isHaskellPartition.right;
+      systemBuildInputs = isHaskellPartition.wrong;
+    };
+
     isHaskellLibrary = isLibrary;
 
     # TODO: ask why the split outputs are configurable at all?
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 8dae7c8d72c0..6155e158e9de 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -299,12 +299,7 @@ rec {
     overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
 
   # Get all of the build inputs of a haskell package, divided by category.
-  getBuildInputs = p:
-    (overrideCabal p (args: {
-      passthru = (args.passthru or {}) // {
-        _getBuildInputs = extractBuildInputs p.compiler args;
-      };
-    }))._getBuildInputs;
+  getBuildInputs = p: p.getBuildInputs;
 
   # Extract the haskell build inputs of a haskell package.
   # This is useful to build environments for developing on that
@@ -339,55 +334,6 @@ rec {
                   , ...
                   }: { inherit doCheck doBenchmark; };
 
-  # Divide the build inputs of the package into useful sets.
-  extractBuildInputs = ghc:
-    { setupHaskellDepends ? [], extraLibraries ? []
-    , librarySystemDepends ? [], executableSystemDepends ? []
-    , pkgconfigDepends ? [], libraryPkgconfigDepends ? []
-    , executablePkgconfigDepends ? [], testPkgconfigDepends ? []
-    , benchmarkPkgconfigDepends ? [], testDepends ? []
-    , testHaskellDepends ? [], testSystemDepends ? []
-    , testToolDepends ? [], benchmarkDepends ? []
-    , benchmarkHaskellDepends ? [], benchmarkSystemDepends ? []
-    , benchmarkToolDepends ? [], buildDepends ? []
-    , libraryHaskellDepends ? [], executableHaskellDepends ? []
-    , ...
-    }@args:
-    let inherit (ghcInfo ghc) isGhcjs nativeGhc;
-        inherit (controlPhases ghc args) doCheck doBenchmark;
-        isHaskellPkg = x: x ? isHaskellLibrary;
-        allPkgconfigDepends =
-          pkgconfigDepends ++ libraryPkgconfigDepends ++
-          executablePkgconfigDepends ++
-          lib.optionals doCheck testPkgconfigDepends ++
-          lib.optionals doBenchmark benchmarkPkgconfigDepends;
-        otherBuildInputs =
-          setupHaskellDepends ++ extraLibraries ++
-          librarySystemDepends ++ executableSystemDepends ++
-          allPkgconfigDepends ++
-          lib.optionals doCheck ( testDepends ++ testHaskellDepends ++
-                                  testSystemDepends ++ testToolDepends
-                                ) ++
-          # ghcjs's hsc2hs calls out to the native hsc2hs
-          lib.optional isGhcjs nativeGhc ++
-          lib.optionals doBenchmark ( benchmarkDepends ++
-                                      benchmarkHaskellDepends ++
-                                      benchmarkSystemDepends ++
-                                      benchmarkToolDepends
-                                    );
-        propagatedBuildInputs =
-          buildDepends ++ libraryHaskellDepends ++
-          executableHaskellDepends;
-        allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
-        isHaskellPartition =
-          lib.partition isHaskellPkg allBuildInputs;
-    in
-      { haskellBuildInputs = isHaskellPartition.right;
-        systemBuildInputs = isHaskellPartition.wrong;
-        inherit propagatedBuildInputs otherBuildInputs
-          allPkgconfigDepends;
-      };
-
   # Utility to convert a directory full of `cabal2nix`-generated files into a
   # package override set
   #

From 56da05d459de4605a53763a14be8387e65c5204b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 23:18:43 +0200
Subject: [PATCH 2341/3253] haskellPackages.shellFor: Clean and fixup

- Now correctly sets NIX_GHC* env vars
---
 .../haskell-modules/make-package-set.nix      | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index b6fe399058c3..bc794cf641d6 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -259,20 +259,46 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     shellFor = { packages, withHoogle ? false, ... } @ args:
       let
         selected = packages self;
-        packageInputs = builtins.map getBuildInputs selected;
-        haskellInputs =
-          builtins.filter
-            (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
-            (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
+
+        packageInputs = map getBuildInputs selected;
+
+        name = if pkgs.lib.length selected == 1
+          then "ghc-shell-for-${(pkgs.lib.head selected).name}"
+          else "ghc-shell-for-packages";
+
+        # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
+        # because cabal will end up ignoring that built version, assuming
+        # new-style commands.
+        haskellInputs = pkgs.lib.filter
+          (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
+          (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
         systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;
+
         withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages;
+        ghcEnv = withPackages (p: haskellInputs);
+        nativeBuildInputs = pkgs.lib.concatMap (p: p.nativeBuildInputs) selected;
+
+        ghcCommand' = if ghc.isGhcjs or false then "ghcjs" else "ghc";
+        ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
+        ghcCommandCaps= pkgs.lib.toUpper ghcCommand';
+
         mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
       in pkgs.stdenv.mkDerivation (mkDrvArgs // {
-        name = "ghc-shell-for-packages";
-        nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or [];
+        name = mkDrvArgs.name or name;
+
         buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
+        nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs ++ mkDrvArgs.nativeBuildInputs or [];
         phases = ["installPhase"];
         installPhase = "echo $nativeBuildInputs $buildInputs > $out";
+        LANG = "en_US.UTF-8";
+        LOCALE_ARCHIVE = pkgs.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+        "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+        "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+        # TODO: is this still valid?
+        "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+        "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
+          then "${ghcEnv}/lib/HaLVM-${ghc.version}"
+          else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
       });
 
     ghc = ghc // {

From 5067773e39a4ac0a001612da15bf653a84d6f50d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Mon, 17 Sep 2018 23:20:29 +0200
Subject: [PATCH 2342/3253] haskellPackages.*.env: Use shellFor

---
 .../haskell-modules/generic-builder.nix       | 33 ++++---------------
 .../haskell-modules/make-package-set.nix      |  2 +-
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8dea5d0493b3..a3426f4e249d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages, buildHaskellPackages, ghc
-, jailbreak-cabal, hscolour, cpphs, nodejs
+, jailbreak-cabal, hscolour, cpphs, nodejs, shellFor
 }:
 
 let
@@ -196,18 +196,10 @@ let
   isHaskellPartition =
     stdenv.lib.partition isHaskellPkg allBuildInputs;
 
-  haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
-  systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
-
-  # When not cross compiling, also include Setup.hs dependencies.
-  ghcEnv = ghc.withPackages (p:
-    haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
-
   setupCommand = "./Setup";
 
   ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
   ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
-  ghcCommandCaps= toUpper ghcCommand';
 
   nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
 
@@ -217,8 +209,7 @@ let
       continue
     fi
   '';
-
-in
+in stdenv.lib.fix (drv:
 
 assert allPkgconfigDepends != [] -> pkgconfig != null;
 
@@ -448,23 +439,10 @@ stdenv.mkDerivation ({
     # TODO: fetch the self from the fixpoint instead
     haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
 
-    env = stdenv.mkDerivation {
-      name = "interactive-${pname}-${version}-environment";
-      buildInputs = systemBuildInputs;
-      nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
-      LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
-      shellHook = ''
-        export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
-        export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
-        # TODO: is this still valid?
-        export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
-        ${if isHaLVM
-            then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''
-            else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''}
-        ${shellHook}
-      '';
+    env = shellFor {
+      packages = p: [ drv ];
     };
+
   };
 
   meta = { inherit homepage license platforms; }
@@ -498,3 +476,4 @@ stdenv.mkDerivation ({
 // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
 // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
 )
+)
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index bc794cf641d6..ef2c33c10915 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -43,7 +43,7 @@ let
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
     inherit stdenv;
     nodejs = buildPackages.nodejs-slim;
-    inherit (self) buildHaskellPackages ghc;
+    inherit (self) buildHaskellPackages ghc shellFor;
     inherit (self.buildHaskellPackages) jailbreak-cabal;
     hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: {
       isLibrary = false;

From e6195f704f2922f0728a01c72466a598060d8c86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 2 Oct 2018 21:13:34 +0200
Subject: [PATCH 2343/3253] haskell-semigroupoids: update to latest version for
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index bf64f4ddaf94..6ac27b1bc449 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -60,6 +60,7 @@ self: super: {
   lens = dontCheck super.lens;    # avoid depending on broken polyparse
   polyparse = markBrokenVersion "1.12" super.polyparse;
   primitive = self.primitive_0_6_4_0;
+  semigroupoids = self.semigroupoids_5_3_1;
   tagged = self.tagged_0_8_6;
   unordered-containers = dontCheck super.unordered-containers;
 

From 2d098f7ef6addf4be80c69d1676cc2be9562c725 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Oct 2018 02:31:16 +0200
Subject: [PATCH 2344/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/007086bd5ba6f5293d2aac0f7f0bd2a3937d14af.
---
 .../haskell-modules/hackage-packages.nix      | 176 ++++++++++++------
 1 file changed, 122 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 506fe1219286..b160174cf5eb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15009,14 +15009,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "QuickCheck_2_12_5" = callPackage
+  "QuickCheck_2_12_6_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, erf, process, random
      , template-haskell, tf-random, transformers
      }:
      mkDerivation {
        pname = "QuickCheck";
-       version = "2.12.5";
-       sha256 = "1nnxhm7f7j3s5wbyryra24vc3x11701qkj0kmassgk7kv4vlcy27";
+       version = "2.12.6.1";
+       sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb";
        libraryHaskellDepends = [
          base containers deepseq erf random template-haskell tf-random
          transformers
@@ -21005,11 +21005,11 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "acme-smuggler";
-       version = "0.1.0.1";
-       sha256 = "1ivajii0gji1inc9qmli3ri3kyzcxyw90m469gs7a16kbprcs3kl";
+       version = "1.1.1.0";
+       sha256 = "0w4m213dcn07hxbnmkbrg2xgfdv9hlfz72ax9pcinswc10zwph1q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       description = "Smuggle arbitrary values in ()";
+       description = "Smuggle arbitrary values in arbitrary types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -22909,14 +22909,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "alarmclock_0_6_0_1" = callPackage
+  "alarmclock_0_6_0_2" = callPackage
     ({ mkDerivation, async, base, clock, hspec, stm, time
      , unbounded-delays
      }:
      mkDerivation {
        pname = "alarmclock";
-       version = "0.6.0.1";
-       sha256 = "18yha98skjkvwzc1g47kh8wbsflp3i1bzgx59cq4p649gw3rlzdm";
+       version = "0.6.0.2";
+       sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc";
        libraryHaskellDepends = [
          async base clock stm time unbounded-delays
        ];
@@ -27342,8 +27342,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.5.1.0";
-       sha256 = "1k1190i83xwsgc1jd6mz4xjbq1j12vdizzw3cp2f652zvg9h09s3";
+       version = "0.5.1.1";
+       sha256 = "1251i3nz2ipg21qyys34ilxi1bnchf4a2v4571l54kaysk8p8lhi";
        libraryHaskellDepends = [
          base containers mtl template-haskell vector
        ];
@@ -31207,8 +31207,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "24";
-       editedCabalFile = "02n8p020d3p52ddsh38w5ih9kmx7qlp7axvxanli945fybjb2m5b";
+       revision = "25";
+       editedCabalFile = "11igp1sw7snsjcrw865rrcp1k14828yj5z9q9kdmn09f0hdl57rb";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -32693,6 +32693,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bank-holidays-england_0_1_0_8" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holidays-england";
+       version = "0.1.0.8";
+       sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j";
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
+       description = "Calculation of bank holidays in England and Wales";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "banwords" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
      , test-framework, test-framework-hunit, text, vector
@@ -39296,6 +39309,8 @@ self: {
        pname = "broadcast-chan";
        version = "0.2.0.1";
        sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf";
+       revision = "2";
+       editedCabalFile = "1vvs1m5n6lflmp8hdxksxa4ibllfx609y791wg21lvyz5m208hp9";
        libraryHaskellDepends = [ base unliftio-core ];
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
@@ -41515,6 +41530,8 @@ self: {
        pname = "cabal-lenses";
        version = "0.8.0";
        sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60";
+       revision = "1";
+       editedCabalFile = "1ij976phgmx7y7v9kbbwqqfkm8vnrggh1qry6wsbbq7f6qb0c0dq";
        libraryHaskellDepends = [
          base Cabal lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -56106,8 +56123,8 @@ self: {
      }:
      mkDerivation {
        pname = "cublas";
-       version = "0.4.0.1";
-       sha256 = "0fk0yrm6arb85xxy7vr2bnkxgwassahfcl8lf9k99s9f9wqc9glr";
+       version = "0.5.0.0";
+       sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f";
        setupHaskellDepends = [ base Cabal cuda directory filepath ];
        libraryHaskellDepends = [
          base cuda half storable-complex template-haskell
@@ -56133,17 +56150,17 @@ self: {
 
   "cuda" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
-     , pretty, template-haskell
+     , pretty, template-haskell, uuid-types
      }:
      mkDerivation {
        pname = "cuda";
-       version = "0.9.0.3";
-       sha256 = "0ym5j3rllxyl9zqji47pngwbi032hzm0bv5j06756d5cb769k44q";
+       version = "0.10.0.0";
+       sha256 = "17l482fnackx4081mxax0dx0bsaqbbg4rxy4zmi5iv5q6f6v37x7";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
-         base bytestring filepath template-haskell
+         base bytestring filepath template-haskell uuid-types
        ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
@@ -56221,8 +56238,8 @@ self: {
      }:
      mkDerivation {
        pname = "cufft";
-       version = "0.9.0.0";
-       sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv";
+       version = "0.9.0.1";
+       sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3";
        setupHaskellDepends = [
          base Cabal cuda directory filepath template-haskell
        ];
@@ -56507,15 +56524,15 @@ self: {
 
   "cusolver" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
-     , directory, filepath, half, storable-complex
+     , directory, filepath, half, storable-complex, template-haskell
      }:
      mkDerivation {
        pname = "cusolver";
-       version = "0.1.0.1";
-       sha256 = "1wjwdhy51pzvhvr50v7b1s9ljgk001wp9qlmwkkjih0csk79047k";
+       version = "0.2.0.0";
+       sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a";
        setupHaskellDepends = [ base Cabal cuda directory filepath ];
        libraryHaskellDepends = [
-         base cublas cuda cusparse half storable-complex
+         base cublas cuda cusparse half storable-complex template-haskell
        ];
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to CUDA Solver, a LAPACK-like library";
@@ -56529,8 +56546,8 @@ self: {
      }:
      mkDerivation {
        pname = "cusparse";
-       version = "0.1.0.1";
-       sha256 = "1fsldpi4bglh875fc9blki3mlz14dal2j37651br1l587ky1v55w";
+       version = "0.2.0.0";
+       sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6";
        setupHaskellDepends = [ base Cabal cuda directory filepath ];
        libraryHaskellDepends = [ base cuda half storable-complex ];
        libraryToolDepends = [ c2hs ];
@@ -60456,8 +60473,10 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.7.1";
-       sha256 = "1mnibf7k40p8y8iqfd28q51nmdz5l3lpmillma2lzbysw24xr6qk";
+       version = "0.9.8";
+       sha256 = "0lrp0dzg6ihm1if2qq6i1dmrwfpnwvyr45yrc8ans0ar9jnrgrn3";
+       revision = "1";
+       editedCabalFile = "08pnfyy4vfwmvyma0h0jwil7p27y5bz9wzihy3kcc6283v9hkh52";
        libraryHaskellDepends = [
          base bytestring containers foldl hashable primitive transformers
          unordered-containers vector
@@ -65054,10 +65073,8 @@ self: {
      }:
      mkDerivation {
        pname = "do-notation-dsl";
-       version = "0.1.0.0";
-       sha256 = "0m854jzn9d01d6qkf7r0pq987fhnjall7bpz5z21nv8xzpzqjnqh";
-       revision = "1";
-       editedCabalFile = "1wsvia13ll0jkwdgnyhm9zv98hsc5fmgk46rblprkgqmw6f6y3g2";
+       version = "0.1.0.3";
+       sha256 = "1q81hl8z4p2mqzijg69znf5cycv27phrrdd9f934brsv8fyvsbzx";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers doctest doctest-discover temporary
@@ -71729,6 +71746,8 @@ self: {
        pname = "exception-transformers";
        version = "0.4.0.7";
        sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+       revision = "1";
+       editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f";
        libraryHaskellDepends = [
          base stm transformers transformers-compat
        ];
@@ -72063,8 +72082,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exit-codes";
-       version = "0.1.1.0";
-       sha256 = "0v8z5wkhyavd7zzcfbjm229mbgp1xcjbz9mvcxnjikcljn5xi181";
+       version = "1.0.0";
+       sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja";
        libraryHaskellDepends = [ base ];
        description = "Exit codes as defined by BSD";
        license = stdenv.lib.licenses.bsd3;
@@ -115930,8 +115949,8 @@ self: {
        pname = "hw-json";
        version = "0.6.0.0";
        sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv";
-       revision = "1";
-       editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771";
+       revision = "2";
+       editedCabalFile = "0ygq95nx4sb70l5kfxlsj6rf2b3ry84ixby567n0jk1g0zks3z7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119549,8 +119568,8 @@ self: {
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.6.4";
-       sha256 = "1lm5ahr57lhwnfvz7kawl211chs4wjkykyicrrg748g4f03sm5a2";
+       version = "0.6.4.1";
+       sha256 = "04xywlx0xngbycc77x14nfvjb8z0q7mmyab75l8z223fj1fh3c21";
        libraryHaskellDepends = [
          base bitvec bytestring cereal cereal-vector contravariant deepseq
          deferred-folds dense-int-set focus foldl hashable list-t mmorph
@@ -133902,6 +133921,8 @@ self: {
        pname = "llvm-extra";
        version = "0.7.3";
        sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a";
+       revision = "1";
+       editedCabalFile = "1zsmfzhlcxcn24z3k21lkk3wmb6rw1mnsky2q85kj6xam92lyn73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134714,8 +134735,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "1.1.0";
-       sha256 = "1x3mj0gcpclv9by51rd1bi1ccaas0cy8yv1g6i08r64hj8jyhlk3";
+       version = "1.1.1";
+       sha256 = "10fd3xnkybca8pi7nw2hq1ggk5g89z8b2ml3avqi1x91chqdqi85";
        libraryHaskellDepends = [
          base bytestring extensible-effects monad-control text
          transformers-base
@@ -144679,6 +144700,46 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "moto" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath
+     , mtl, optparse-applicative, pipes, pipes-attoparsec
+     , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "moto";
+       version = "0.0.3";
+       sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers cryptohash-sha1 df1
+         di-core di-df1 directory filepath mtl optparse-applicative pipes
+         pipes-attoparsec pipes-bytestring safe-exceptions text time
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers di di-core directory filepath random
+         safe-exceptions tasty tasty-hunit tasty-quickcheck text time
+       ];
+       description = "General purpose migrations library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "moto-postgresql" = callPackage
+    ({ mkDerivation, base, bytestring, moto, postgresql-simple
+     , safe-exceptions
+     }:
+     mkDerivation {
+       pname = "moto-postgresql";
+       version = "0.0.1";
+       sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d";
+       libraryHaskellDepends = [
+         base bytestring moto postgresql-simple safe-exceptions
+       ];
+       description = "PostgreSQL-based migrations registry for moto";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "motor" = callPackage
     ({ mkDerivation, base, indexed, indexed-extras, reflection
      , row-types, template-haskell
@@ -145967,8 +146028,8 @@ self: {
        pname = "multistate";
        version = "0.8.0.0";
        sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
-       revision = "2";
-       editedCabalFile = "1dp52gacm8ql3g7xvb1dzp3migwpz2kcnz8pafbf7rs1lmccj1zf";
+       revision = "3";
+       editedCabalFile = "0gi4l3765jgsvhr6jj2q1l7v6188kg2xw4zwcaarq3hcg1ncaakw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -152060,8 +152121,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvvm";
-       version = "0.8.0.3";
-       sha256 = "1kwmgl1bp0mlv4bdnjl6m1v34k68pgg6z00z3i7x3wfjff8gd5sr";
+       version = "0.9.0.0";
+       sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb";
        setupHaskellDepends = [
          base Cabal cuda directory filepath template-haskell
        ];
@@ -177120,6 +177181,8 @@ self: {
        pname = "rest-types";
        version = "1.14.1.2";
        sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy";
+       revision = "1";
+       editedCabalFile = "06wjl45ravvw4vjwpl15r6qdpj3va7hpsk04z1bh8xh1by0r2yhz";
        libraryHaskellDepends = [
          aeson base base-compat case-insensitive generic-aeson
          generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -188548,8 +188611,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "simple-cmd";
-       version = "0.1.0.0";
-       sha256 = "1d9jaar1in01rwg6if6x9p2hacsdd6k6ygkrza9sbklnr4872msl";
+       version = "0.1.1";
+       sha256 = "0y9ga7m3zykrmgfzys6g7k1z79spp2319ln4sayw8i0abpwh63m9";
        libraryHaskellDepends = [ base directory filepath process ];
        description = "Simple String-based process commands";
        license = stdenv.lib.licenses.bsd3;
@@ -197438,15 +197501,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_26_0" = callPackage
+  "stratosphere_0_26_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.26.0";
-       sha256 = "126fhymf1n96z40lima2kyh2sm68v63f1b7agmdpp6ihjd96xy0i";
+       version = "0.26.1";
+       sha256 = "0npmnj71gaf61gcxi772h4sgsz68j5jk7v5z3bjc120z7vc1a22v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198277,6 +198340,8 @@ self: {
        pname = "strict-concurrency";
        version = "0.2.4.2";
        sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
+       revision = "1";
+       editedCabalFile = "12m1jbf01d4k7w1wiqcpdsbhlxi6ssbz9nx0ax2mrjjq2l0011ny";
        libraryHaskellDepends = [ base deepseq ];
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
@@ -199473,6 +199538,8 @@ self: {
        pname = "summoner";
        version = "1.0.6";
        sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
+       revision = "1";
+       editedCabalFile = "08rzxxxfzf5dip9va8wjqgmar5rlmm0fx3wj3vlx0i6rwqq24maz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -218171,15 +218238,16 @@ self: {
      }) {};
 
   "vector-extras" = callPackage
-    ({ mkDerivation, base, containers, deferred-folds, hashable
+    ({ mkDerivation, base, containers, deferred-folds, foldl, hashable
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "vector-extras";
-       version = "0.2";
-       sha256 = "0c0wq7ymjhfhxdwkgjd7iwp4vb22495ajrv2ddq6iihc4svakzlw";
+       version = "0.2.1";
+       sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz";
        libraryHaskellDepends = [
-         base containers deferred-folds hashable unordered-containers vector
+         base containers deferred-folds foldl hashable unordered-containers
+         vector
        ];
        description = "Utilities for the \"vector\" library";
        license = stdenv.lib.licenses.mit;

From 53347519649df7e28f81aad6e5bfc804c0be88bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Oct 2018 10:56:55 +0200
Subject: [PATCH 2345/3253] haskell-hspec: fix overrides to use the newer
 QuickCheck version

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 6ac27b1bc449..402eccac639c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -52,10 +52,10 @@ self: super: {
   hslogger = self.hslogger_1_2_12;
   hspec = self.hspec_2_5_8;
   hspec-core = self.hspec-core_2_5_8;
-  hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_5; });
+  hspec-core_2_5_8 = super.hspec-core_2_5_8.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
   hspec-discover = self.hspec-discover_2_5_8;
   hspec-meta = self.hspec-meta_2_5_6;
-  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_5; });
+  hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
   JuicyPixels = self.JuicyPixels_3_3_1;
   lens = dontCheck super.lens;    # avoid depending on broken polyparse
   polyparse = markBrokenVersion "1.12" super.polyparse;

From 975c77e2d5235b007a4eed064f24a0fcf9673f83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Oct 2018 11:13:55 +0200
Subject: [PATCH 2346/3253] haskell-free and base-orphans: use latest versions
 to fix build with ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 402eccac639c..588f76eca067 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -45,8 +45,10 @@ self: super: {
   hoopl = self.hoopl_3_10_2_2;
 
   # LTS-12.x versions do not compile.
+  base-orphans = self.base-orphans_0_8;
   contravariant = self.contravariant_1_5;
   control-monad-free = markBrokenVersion "0.6.1" super.control-monad-free;
+  free = self.free_5_1;
   Glob = self.Glob_0_9_3;
   haddock-library = markBroken super.haddock-library;
   hslogger = self.hslogger_1_2_12;

From c5d4957103801c04699bf2ce574af5e42f51dc8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Oct 2018 11:21:47 +0200
Subject: [PATCH 2347/3253] haskell-lens: use latest version when building with
 ghc-8.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 588f76eca067..041227059cde 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -59,7 +59,7 @@ self: super: {
   hspec-meta = self.hspec-meta_2_5_6;
   hspec-meta_2_5_6 = super.hspec-meta_2_5_6.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_12_6_1; });
   JuicyPixels = self.JuicyPixels_3_3_1;
-  lens = dontCheck super.lens;    # avoid depending on broken polyparse
+  lens = self.lens_4_17;
   polyparse = markBrokenVersion "1.12" super.polyparse;
   primitive = self.primitive_0_6_4_0;
   semigroupoids = self.semigroupoids_5_3_1;

From dbe2f0ba2371aaf2981dcd5e060e9a3a0e6e754a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 09:30:38 -0700
Subject: [PATCH 2348/3253] krita: 4.1.1 -> 4.1.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/krita/versions
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 0abe90e0ba73..9aa80fc789c9 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -10,11 +10,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.1.1";
+  version = "4.1.3";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw";
+    sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From f72bbc6f04726f962bbec096484efeb7d34d3dcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 09:40:12 -0700
Subject: [PATCH 2349/3253] languagetool: 4.2 -> 4.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/languagetool/versions
---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 42ba36adf310..7e784b917b42 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "LanguageTool-${version}";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "01iy3cq6rwkm8sflj2nwp4ib29hyykd23hfsnrmqxji9csj8pf71";
+    sha256 = "0zsz82jc39j5wjwynmjny7h82kjz7clyk37n6pxmi85ibbdm0zn4";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From 807d73c391d037ecf4291c5f1109006b92b5cf23 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 08:06:06 -0700
Subject: [PATCH 2350/3253] libressl_2_8: 2.8.0 -> 2.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libressl/versions
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index e30f2b0af5d5..1ac4a7185122 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -46,7 +46,7 @@ in {
   };
 
   libressl_2_8 = generic {
-    version = "2.8.0";
-    sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg";
+    version = "2.8.1";
+    sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk";
   };
 }

From 6e58fb8309ed76ed7bc494400e4032a58e9b0f9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:03:27 -0700
Subject: [PATCH 2351/3253] libguestfs: 1.38.4 -> 1.38.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libguestfs/versions
---
 pkgs/development/libraries/libguestfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 6001946cb970..aad6365e4c2d 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation rec {
   name = "libguestfs-${version}";
-  version = "1.38.4";
+  version = "1.38.6";
 
   src = fetchurl {
     url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
-    sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16";
+    sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 997f9bfcc9ee3be0b682e4b41c2aa7818bcd101e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:11:49 -0700
Subject: [PATCH 2352/3253] libisoburn: 1.4.8 -> 1.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libisoburn/versions
---
 pkgs/development/libraries/libisoburn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index 6e7764176091..ce2028e805dc 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libisoburn-${version}";
-  version = "1.4.8";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
-    sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi";
+    sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
   };
 
   buildInputs = [ attr zlib libburn libisofs ];

From 6fb9152c7bd0c74adc83821de3772f6766a7d01d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:29:21 -0700
Subject: [PATCH 2353/3253] inadyn: 2.4 -> 2.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/inadyn/versions
---
 pkgs/tools/networking/inadyn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 8029415a98cf..47352d21c4a2 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "inadyn-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
     rev = "v${version}";
-    sha256 = "1h24yavp1246zn5isypvxrilp6xj2266qr52w2r24qxicr8b320y";
+    sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From eb84586cad3c992d460b64f407874fa372a64581 Mon Sep 17 00:00:00 2001
From: Keshav Kini <keshav.kini@gmail.com>
Date: Fri, 17 Aug 2018 16:59:23 -0700
Subject: [PATCH 2354/3253] makeself: backport megastep/makeself#142

Currently, a self-extracting archive created by makeself will fail to
properly execute on NixOS because the boilerplate Bash code it uses to
clean up the temporary directory it extracted its contents into
assumes that the `rm` command is installed at `/bin/rm`, which is not
the case on NixOS.

This commit, a backport of a pull request I made to the upstream
repository at megastep/makeself#142, fixes the issue by causing the
boilerplate code to call `rm` without specifying an absolute path,
which allows the version of `rm` from one's current Nix environment to
be used instead.
---
 .../misc/makeself/Use-rm-from-PATH.patch      | 43 +++++++++++++++++++
 pkgs/applications/misc/makeself/default.nix   |  5 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/makeself/Use-rm-from-PATH.patch

diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
new file mode 100644
index 000000000000..80b9ebf4d571
--- /dev/null
+++ b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch
@@ -0,0 +1,43 @@
+From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001
+From: Keshav Kini <keshav.kini@gmail.com>
+Date: Thu, 9 Aug 2018 18:36:15 -0700
+Subject: [PATCH] Use `rm` from PATH
+
+On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm`
+command will generally be available in one's path when running shell
+scripts. Here, I change a couple of invocations of `/bin/rm` into
+invocations of `rm` to deal with this issue.
+
+Since `rm` is already called elsewhere in the script without an
+absolute path, I assume this change will not cause any
+regressions. Still, I've tested this on a CentOS machine and a NixOS
+machine, though not other platforms.
+---
+ makeself-header.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/makeself-header.sh b/makeself-header.sh
+index 4d2c005..2babf34 100755
+--- a/makeself-header.sh
++++ b/makeself-header.sh
+@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then
+ fi
+ res=3
+ if test x"\$keep" = xn; then
+-    trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15
++    trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15
+ fi
+ 
+ if test x"\$nodiskspace" = xn; then
+@@ -581,7 +581,7 @@ if test x"\$script" != x; then
+ fi
+ if test x"\$keep" = xn; then
+     cd "\$TMPROOT"
+-    /bin/rm -rf "\$tmpdir"
++    rm -rf "\$tmpdir"
+ fi
+ eval \$finish; exit \$res
+ EOF
+-- 
+2.14.1
+
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index a9ec2760e8ad..a6af1762e289 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n";
   };
 
-  patchPhase = ''
+  # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd
+  patches = [ ./Use-rm-from-PATH.patch ];
+
+  postPatch = ''
     sed -e "s|^HEADER=.*|HEADER=$out/share/${name}/makeself-header.sh|" -i makeself.sh
   '';
 

From 9d8e0819aac165f43992a3ffb08aecdff2bc50eb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:21:33 -0700
Subject: [PATCH 2355/3253] kotlin: 1.2.70 -> 1.2.71

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/kotlin/versions
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 718628d8ad41..7b88efd1e616 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.70";
+  version = "1.2.71";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2";
+    sha256 = "0yzanv2jkjx3vfixzvjsihfi00khs7zr47y01cil8bylzvyr50p4";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 19a9ca96aa7407dcafa7321f96db8905148eef8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:40:13 -0700
Subject: [PATCH 2356/3253] ibus-engines.typing-booster-unwrapped: 2.1.1 ->
 2.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions
---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index c5aaa032b40e..b75ce90cf29f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "ibus-typing-booster-${version}";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "01kpxplk9nh56f32fkq3nnsqykbzpi7pcxbfp38dq0prgrhw9a6b";
+    sha256 = "0qg49d0hsb1mvq33p14nc6mdw6x3km1ax620gphczfmz9ki5bf4g";
   };
 
   patches = [ ./hunspell-dirs.patch ];

From 474587513e4cdc9dd79edb453c68e35aa3c37542 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 10:50:22 -0700
Subject: [PATCH 2357/3253] hwinfo: 21.56 -> 21.57

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hwinfo/versions
---
 pkgs/tools/system/hwinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 066848ea7be9..af934b54185a 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.56";
+  version = "21.57";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "09zc8k1d9l673bb41vjpz3zrzaxaymqgk8m1v7pccvg70rq005kv";
+    sha256 = "1zxc26bljhj04mqzpwnqd6zfnz4dd2syapzn8xcakj882v4a8gnz";
   };
 
   patchPhase = ''

From 0dd86a350d54a5bcdb6f8b969f18bd94e2275214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Tue, 2 Oct 2018 09:23:14 +0200
Subject: [PATCH 2358/3253] slic3r-prusa3d: 1.40.1 -> 1.41.0

---
 pkgs/applications/misc/slic3r/prusa3d.nix | 36 ++++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index f871b07b85c9..15517de3aed1 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
   boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, libGLU,
-  glew, eigen, curl }:
+  glew, eigen, curl, gtest, nlopt, pcre, xorg }:
 let
   AlienWxWidgets = perlPackages.buildPerlPackage rec {
     name = "Alien-wxWidgets-0.69";
@@ -33,22 +33,28 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.40.1";
+  version = "1.41.0";
 
   enableParallelBuilding = true;
 
-  buildInputs = [
+  nativeBuildInputs = [
     cmake
-    curl
-    perl
     makeWrapper
+  ];
+
+  buildInputs = [
+    curl
     eigen
     glew
+    pcre
+    perl
     tbb
     which
     Wx
     WxGLCanvas
-  ] ++ (with perlPackages; [
+    xorg.libXdmcp
+    xorg.libpthreadstubs
+  ] ++ checkInputs ++ (with perlPackages; [
     boost
     ClassXSAccessor
     EncodeLocale
@@ -72,16 +78,24 @@ stdenv.mkDerivation rec {
     XMLSAX
   ]);
 
+  checkInputs = [ gtest ];
+
+  # The build system uses custom logic - defined in
+  # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
+  # for finding the nlopt library, which doesn't pick up the package in the nix store.
+  # We need to set the path via the NLOPT environment variable instead.
+  NLOPT = "${nlopt}";
+
   prePatch = ''
     # In nix ioctls.h isn't available from the standard kernel-headers package
     # on other distributions. As the copy in glibc seems to be identical to the
     # one in the kernel, we use that one instead.
     sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp
 
-    # PERL_VENDORARCH and PERL_VENDORLIB aren't detected correctly by the build
+    # PERL_VENDORARCH and PERL_VENDORLIB aren't set correctly by the build
     # system, so we have to override them. Setting them as environment variables
-    # doesn't work though, so patching the paths directly in the CMakeLists.txt
-    # seems to be the easisest way.
+    # doesn't work though, so substituting the paths directly in CMakeLists.txt
+    # seems to be the easiest way.
     sed -i "s|\''${PERL_VENDORARCH}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
     sed -i "s|\''${PERL_VENDORLIB}|$out/lib/slic3r-prusa3d|g" xs/CMakeLists.txt
   '';
@@ -100,7 +114,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "022mdz8824wg68qwgd49gnplw7wn84hqw113xh8l25v3j1jb9zmc";
+    sha256 = "1al60hrqbhl05dnsr99hzbmxmn26fyx19sc5zxv816x3q6px9n2d";
     rev = "version_${version}";
   };
 
@@ -108,7 +122,7 @@ stdenv.mkDerivation rec {
     description = "G-code generator for 3D printer";
     homepage = https://github.com/prusa3d/Slic3r;
     license = licenses.agpl3;
-    platforms = platforms.linux;
+    platforms = subtractLists ["aarch64-linux"] platforms.linux;
     maintainers = with maintainers; [ tweber ];
   };
 }

From 91c6d352f93922f7f2064d5e02f842403bfe92de Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 3 Oct 2018 18:42:29 +0200
Subject: [PATCH 2359/3253] j: 808 -> 807

"But Synthetica", I hear you say, "isn't that a downgrade?".

That's what I originally thought as well! So I emailed the  maintainer
for the only other repo that had J on version 808, BSD FreePorts. Since
they also didn't know what was going on here, I emailed Jsoftware
themselves. I got a lovely email back from Mr. Iverson (Jr. I presume?)
himself:

![The email](https://i.imgur.com/RidiODe.png)

So it has been confirmed from the horse's mouth that this _is_ the
correct version to be on.

I also re-enabled all the tests, since they all pass now, enabled the
build on ARM and Darwin (I don't have access to either kind of machine,
but I don't see why it wouldn't work), and added myself as a maintainer.
---
 pkgs/development/interpreters/j/default.nix | 43 ++++++++++++---------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index cb351446301d..11feb1170c2c 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, readline, libedit }:
+{ stdenv, fetchFromGitHub, readline, libedit, bc }:
 
 stdenv.mkDerivation rec {
   name = "j-${version}";
-  version = "808";
+  version = "807";
   jtype = "release";
   src = fetchFromGitHub {
     owner = "jsoftware";
     repo = "jsource";
     rev = "j${version}-${jtype}";
-    sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf";
+    sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n";
   };
 
-  buildInputs = [ readline libedit ];
+  buildInputs = [ readline libedit bc ];
   bits = if stdenv.is64bit then "64" else "32";
   platform =
-    /*if stdenv.isRaspberryPi then "raspberry" else*/
+    if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else
     if stdenv.isLinux then "linux" else
     if stdenv.isDarwin then "darwin" else
     "unknown";
@@ -24,18 +24,24 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     export SOURCE_DIR=$(pwd)
     export HOME=$TMPDIR
-    export JBIN=$HOME/j${bits}/bin
     export JLIB=$SOURCE_DIR/jlibrary
+
+    export jbld=$HOME/bld
+    export jplatform=${platform}
+    export jmake=$SOURCE_DIR/make
+    export jgit=$SOURCE_DIR
+    export JBIN=$jbld/j${bits}/bin
     mkdir -p $JBIN
 
+    echo $OUT_DIR
+
     cd make
 
     patchShebangs .
-    sed -i jvars.sh -e '
-      s@~/gitdev/jsource@$SOURCE_DIR@;
+    sed -i jvars.sh -e "
+      s@~/git/jsource@$SOURCE_DIR@;
       s@~/jbld@$HOME@;
-      s@linux@${platform}@;
-      '
+      "
 
     sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
 
@@ -48,7 +54,7 @@ stdenv.mkDerivation rec {
       #define jplatform  "${platform}"
       #define jtype      "${jtype}"         // release,beta,...
       #define jlicense   "GPL3"
-      #define jbuilder   "unknown"  // website or email
+      #define jbuilder   "nixpkgs"  // website or email
       ' > ../jsrc/jversion.h
 
     ./build_jconsole.sh j${bits}
@@ -60,16 +66,17 @@ stdenv.mkDerivation rec {
 
     # Now run the real tests
     cd $SOURCE_DIR/test
-    # for f in *.ijs
-    # do
-    #   echo $f
-    #   $JBIN/jconsole < $f
-    # done
+    for f in *.ijs
+    do
+      echo $f
+      $JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS
+    done
   '';
 
   installPhase = ''
     mkdir -p "$out"
     cp -r $JBIN "$out/bin"
+    rm $out/bin/*.txt # Remove logs from the bin folder
 
     mkdir -p "$out/share/j"
     cp -r $JLIB/{addons,system} "$out/share/j"
@@ -78,8 +85,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "J programming language, an ASCII-based APL successor";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin synthetica ];
+    platforms = with platforms; linux ++ darwin;
     license = licenses.gpl3Plus;
     homepage = http://jsoftware.com/;
   };

From bc39898d2e395f24033f233e94be7273ed63e727 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:02:30 -0700
Subject: [PATCH 2360/3253] help2man: 1.47.6 -> 1.47.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/help2man/versions
---
 pkgs/development/tools/misc/help2man/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix
index 7e2dc49fe0f2..311b206fa910 100644
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, gettext, LocaleGettext }:
 
 stdenv.mkDerivation rec {
-  name = "help2man-1.47.6";
+  name = "help2man-1.47.7";
 
   src = fetchurl {
     url = "mirror://gnu/help2man/${name}.tar.xz";
-    sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr";
+    sha256 = "03gckfr2980qn319c02vflq7d75vq2qdkxrw80kb9g84xn48wnsq";
   };
 
   nativeBuildInputs = [ gettext LocaleGettext ];

From 28839e4b2b0a4ba03b3ce13b8b92d78093de4cc8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 3 Oct 2018 14:06:21 -0400
Subject: [PATCH 2361/3253] sbt-extras: 3c8fcad -> 2018-09-28

Changing the versioning scheme to fix proper detection of
"versionOlder" etc.
---
 .../development/tools/build-managers/sbt-extras/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix
index d501a7953841..5cb5bbacee95 100644
--- a/pkgs/development/tools/build-managers/sbt-extras/default.nix
+++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
 
 let
-  rev = "3c8fcadc3376edfd8e4b08b35f174935bf97bbac";
-  version = stdenv.lib.strings.substring 0 7 rev;
+  rev = "1d8ee2c0a75374afa1cb687f450aeb095180882b";
+  version = "2018-09-27";
 in
 stdenv.mkDerivation {
   name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "paulp";
     repo = "sbt-extras";
     inherit rev;
-    sha256 = "0r79w4kgdrsdnm4ma9rmb9k115rvidpaha7sr9rsxv68jpagwgrj";
+    sha256 = "1a6k1lcpd9sknzyx6niq56z1b90mz7br7y13yk98w06r7fmfchw5";
   };
 
   dontBuild = true;

From add267531fc3e84978b1a75df7556e8a66d68b32 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:25:50 -0700
Subject: [PATCH 2362/3253] gnucash: 3.2 -> 3.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
---
 pkgs/applications/office/gnucash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 63fda1e0e8be..683db389fedf 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gnucash-${version}";
-  version = "3.2";
+  version = "3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0li4b6pvlahgh5n9v91yxfgm972a1kky80xw3q1ggl4f2h6b1rb3";
+    sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];

From bbf519200a946ccf1636e80e911c2812a8202d8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:34:43 -0700
Subject: [PATCH 2363/3253] google-drive-ocamlfuse: 0.6.25 -> 0.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-drive-ocamlfuse/versions
---
 .../networking/google-drive-ocamlfuse/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index ff099a909c75..abf67a3b0ac0 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "google-drive-ocamlfuse-${version}";
-  version = "0.6.25";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "google-drive-ocamlfuse";
     rev = "v${version}";
-    sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
+    sha256 = "14r2y5blvid0640ixd0b4agpcfgkan5j9qdv3g0cn2q6ik39lfyl";
   };
 
   nativeBuildInputs = [ dune ];

From 136513655f92be4ef7e84b37f8465e0469ec208d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:41:55 -0700
Subject: [PATCH 2364/3253] hiredis: 0.13.3 -> 0.14.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hiredis/versions
---
 pkgs/development/libraries/hiredis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 7ff8ed61cab3..0f68d7df2981 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hiredis-${version}";
-  version = "0.13.3";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
     rev = "v${version}";
-    sha256 = "1qxiv61bsp6s847hhkxqj7vnbdlac089r2qdp3zgxhhckaflhb7r";
+    sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c";
   };
 
   PREFIX = "\${out}";

From 2948f4044952484bba6fc5bcacb97cb8767fa823 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Wed, 3 Oct 2018 14:43:14 -0400
Subject: [PATCH 2365/3253] bitcoin: 0.16.3 -> 0.17.0

---
 pkgs/applications/altcoins/bitcoin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index dc463f386582..04a4a18dd4c2 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.16.3";
+  version = "0.17.0";
 
   src = fetchurl {
     urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
              "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3";
+    sha256 = "0pkq28d2dj22qrxyyg9kh0whmhj7ghyabnhyqldbljv4a7l3kvwq";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From d8b9bf558a21df7714f2106b21b95e3eb73adc13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:54:18 -0700
Subject: [PATCH 2366/3253] groonga: 8.0.6 -> 8.0.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groonga/versions
---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index c346d6bd37b7..861bd7fe5ed5 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "8.0.6";
+  version = "8.0.7";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1q00p02jprbsx2c6l3dnv2m04pzxlfag4j1pan0jlb4g3fvb20wf";
+    sha256 = "040q525qdlxlypgs7jzklndshdvd5shzss67lcs6xhkbs0f977cc";
   };
 
   buildInputs = with stdenv.lib;

From 1d6639c575af54ba25785b457fd4dff5f5564dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 3 Oct 2018 20:58:58 +0200
Subject: [PATCH 2367/3253] gnome3.gnome-session: update glib reference

gsettings now reside in glib's `bin` output.
---
 pkgs/desktops/gnome-3/core/gnome-session/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 1882f19bb223..8184f0234fc3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      # FIXME: glib binaries shouldn't be in .dev!
-      gsettings = "${glib.dev}/bin/gsettings";
+      gsettings = "${glib.bin}/bin/gsettings";
       dbusLaunch = "${dbus.lib}/bin/dbus-launch";
     })
   ];

From e7c2c5784fa06a0bf5a67b698a591712db869b65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 12:19:20 -0700
Subject: [PATCH 2368/3253] fswatch: 1.12.0 -> 1.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fswatch/versions
---
 pkgs/development/tools/misc/fswatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index a1f33fdfc9e7..0e8e0116a8b0 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "16f3g6s79gs1sp2ra3cka4c5mf5b557cx697bwcdfgj6r19ni5j7";
+    sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 5f91657ad10aec9776983bc6f927546b34755b04 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 3 Oct 2018 19:25:44 +0000
Subject: [PATCH 2369/3253] remove support for pre-5.26 Perl

---
 .../development/interpreters/perl/default.nix |  11 +-
 .../interpreters/perl/no-sys-dirs.patch       | 250 ------------------
 pkgs/development/libraries/hspell/default.nix |   2 +-
 .../perl-modules/generic/default.nix          |   4 +-
 pkgs/servers/monitoring/munin/default.nix     |   2 +-
 pkgs/top-level/perl-packages.nix              |  10 +-
 6 files changed, 15 insertions(+), 264 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/no-sys-dirs.patch

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f2b900412081..cd8b2f263ddd 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -40,16 +40,15 @@ let
     disallowedReferences = [ stdenv.cc ];
 
     patches =
-      [ ]
-      # Do not look in /usr etc. for dependencies.
-      ++ optional (versionOlder version "5.26") ./no-sys-dirs.patch
-      ++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch
-      ++ optional (versionAtLeast version "5.24") (
+      [
+        # Do not look in /usr etc. for dependencies.
+        ./no-sys-dirs-5.26.patch
         # Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
-        fetchurlBoot {
+        (fetchurlBoot {
           url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
           sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
         })
+      ]
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optional stdenv.isDarwin ./cpp-precomp.patch
       ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch
deleted file mode 100644
index 1793273a76f9..000000000000
--- a/pkgs/development/interpreters/perl/no-sys-dirs.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
-+++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
-@@ -106,15 +106,7 @@
- fi
- 
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
--paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
--paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
--paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
--paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
--paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
--paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
--paths="$paths /sbin /usr/sbin /usr/libexec"
--paths="$paths /system/gnu_library/bin"
-+paths=''
- 
- for p in $paths
- do
-@@ -1337,8 +1329,7 @@
- archname=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
--locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-+locincpth=""
- :
- : no include file wanted by default
- inclwanted=''
-@@ -1349,17 +1340,12 @@
- 
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth=''
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
--loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-+loclibpth=""
- 
- : general looking path for locating libraries
--glibpth="/lib /usr/lib $xlibpth"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
--test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
--test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
--test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-+glibpth=""
- 
- : Private path used by Configure to find libraries.  Its value
- : is prepended to libpth. This variable takes care of special
-@@ -1391,8 +1377,6 @@
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
--glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
--glibpth="/usr/shlib $glibpth"
- : Do not use vfork unless overridden by a hint file.
- usevfork=false
- 
-@@ -2446,7 +2430,6 @@
- zip
- "
- pth=`echo $PATH | sed -e "s/$p_/ /g"`
--pth="$pth $sysroot/lib $sysroot/usr/lib"
- for file in $loclist; do
- 	eval xxx=\$$file
- 	case "$xxx" in
-@@ -4936,7 +4919,7 @@
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
--	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
-+	plibpth="$incpath/usr/lib"
-     fi;;
- esac
- case "$libpth" in
-@@ -8600,13 +8583,8 @@
- echo " "
- case "$sysman" in
- '')
--	syspath='/usr/share/man/man1 /usr/man/man1'
--	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
--	syspath="$syspath /usr/man/u_man/man1"
--	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
--	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
--	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
--	sysman=`./loc . /usr/man/man1 $syspath`
-+	syspath=''
-+	sysman=''
- 	;;
- esac
- if $test -d "$sysman"; then
-@@ -19900,9 +19878,10 @@
- case "$full_ar" in
- '') full_ar=$ar ;;
- esac
-+full_ar=ar
- 
- : Store the full pathname to the sed program for use in the C program
--full_sed=$sed
-+full_sed=sed
- 
- : see what type gids are declared as in the kernel
- echo " "
-Only in perl-5.20.0/: Configure.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
-@@ -126,11 +126,7 @@
- 	if ($dep =~ /(\S+errno\.h)/) {
- 	     $file{$1} = 1;
- 	}
--    } elsif ($^O eq 'linux' &&
--	      $Config{gccversion} ne '' && 
--	      $Config{gccversion} !~ /intel/i
--	      # might be using, say, Intel's icc
--	     ) {
-+    } elsif (0) {
-     # When cross-compiling we may store a path for gcc's "sysroot" option:
-     my $sysroot = $Config{sysroot} || '';
- 	# Some Linuxes have weird errno.hs which generate
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
---- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
-+++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
-@@ -119,21 +119,21 @@
-         objformat=`/usr/bin/objformat`
-         if [ x$objformat = xaout ]; then
-             if [ -e /usr/lib/aout ]; then
--                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
--                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+                libpth=""
-+                glibpth=""
-             fi
-             lddlflags='-Bshareable'
-         else
--            libpth="/usr/lib /usr/local/lib"
--            glibpth="/usr/lib /usr/local/lib"
-+            libpth=""
-+            glibpth=""
-             ldflags="-Wl,-E "
-             lddlflags="-shared "
-         fi
-         cccdlflags='-DPIC -fPIC'
-         ;;
- *)
--       libpth="/usr/lib /usr/local/lib"
--       glibpth="/usr/lib /usr/local/lib"
-+       libpth=""
-+       glibpth=""
-        ldflags="-Wl,-E "
-         lddlflags="-shared "
-         cccdlflags='-DPIC -fPIC'
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
---- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
-@@ -150,25 +150,6 @@
-     ;;
- esac
- 
--# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
--# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
--# where to look.  We don't want gcc's own libraries, however, so we
--# filter those out.
--# This could be conditional on Unbuntu, but other distributions may
--# follow suit, and this scheme seems to work even on rather old gcc's.
--# This unconditionally uses gcc because even if the user is using another
--# compiler, we still need to find the math library and friends, and I don't
--# know how other compilers will cope with that situation.
--# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
--# we don't want its libraries. So we try to prefer the system gcc
--# Still, as an escape hatch, allow Configure command line overrides to
--# plibpth to bypass this check.
--if [ -x /usr/bin/gcc ] ; then
--    gcc=/usr/bin/gcc
--else
--    gcc=gcc
--fi
--
- case "$plibpth" in
- '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
- 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -178,32 +159,6 @@
-     ;;
- esac
- 
--case "$libc" in
--'')
--# If you have glibc, then report the version for ./myconfig bug reporting.
--# (Configure doesn't need to know the specific version since it just uses
--# gcc to load the library for all tests.)
--# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
--# are insufficiently precise to distinguish things like
--# libc-2.0.6 and libc-2.0.7.
--    for p in $plibpth
--    do
--        for trylib in libc.so.6 libc.so
--        do
--            if $test -e $p/$trylib; then
--                libc=`ls -l $p/$trylib | awk '{print $NF}'`
--                if $test "X$libc" != X; then
--                    break
--                fi
--            fi
--        done
--        if $test "X$libc" != X; then
--            break
--        fi
--    done
--    ;;
--esac
--
- # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
- # for this test.
- cat >try.c <<'EOM'
-@@ -367,33 +322,6 @@
- 	;;
- esac
- 
--# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
--# true libraries. The scripts cause binding against static
--# version of -lgdbm which is a bad idea. So if we have 'nm'
--# make sure it can read the file
--# NI-S 2003/08/07
--case "$nm" in
--    '') ;;
--    *)
--    for p in $plibpth
--    do
--        if $test -r $p/libndbm.so; then
--            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
--                echo 'Your shared -lndbm seems to be a real library.'
--                _libndbm_real=1
--                break
--            fi
--        fi
--    done
--    if $test "X$_libndbm_real" = X; then
--        echo 'Your shared -lndbm is not a real library.'
--        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
--        shift
--        libswanted="$*"
--    fi
--    ;;
--esac
--
- # Linux on Synology.
- if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
-     # Tested on Synology DS213 and DS413
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 20dda589b9cc..874d492f19dc 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     version = "1.1";
   };
 
-  PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
+  PERL_USE_UNSAFE_INC = "1";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 1d7e6d17ffb7..a44c7ac6568b 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (
 
     # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
     # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
-    PERL_USE_UNSAFE_INC = lib.optionalString (lib.versionAtLeast (lib.getVersion perl) "5.26") "1";
+    PERL_USE_UNSAFE_INC = "1";
 
     meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
   }
@@ -33,7 +33,7 @@ stdenv.mkDerivation (
   )
   //
   {
-    name = "perl${lib.getVersion perl}-${name}";
+    name = "perl${perl.version}-${name}";
     builder = ./builder.sh;
     nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
     inherit perl;
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 2fec42edff33..72d5f124c63d 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   ];
 
   # needs to find a local perl module during build
-  PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
+  PERL_USE_UNSAFE_INC = "1";
 
   # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1
   # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 94a801e4e816..2d01fa234b59 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7,6 +7,8 @@
 
 {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
 
+# cpan2nix assumes that perl-packages.nix will be used only with perl 5.26 or above
+assert stdenv.lib.versionAtLeast perl.version "5.26";
 let
   inherit (stdenv.lib) maintainers;
   self = _self // overrides;
@@ -1857,7 +1859,7 @@ let
       url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz";
       sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851";
     };
-    preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") ''
+    preConfigure = ''
       # fix error 'Unescaped left brace in regex is illegal here in regex'
       substituteInPlace lib/CHI/t/Driver/Subcache/l1_cache.pm --replace 'qr/CHI stats: {' 'qr/CHI stats: \{'
     '';
@@ -2095,7 +2097,7 @@ let
       url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz";
       sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c";
     };
-    preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") ''
+    preConfigure = ''
       # fix error 'Unescaped left brace in regex is illegal here in regex'
       substituteInPlace tests/xemulator/class_methodmaker/Test.pm --replace 's/(TEST\s{)/$1/g' 's/(TEST\s\{)/$1/g'
     '';
@@ -14825,7 +14827,7 @@ let
     meta = {
       description = "Aggregate C<*.t> tests to make them run faster";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133
+      broken = true; # This module only works with Test::More version < 1.3, but you have 1.302133
     };
   };
 
@@ -16951,7 +16953,7 @@ let
      meta = {
        description = "Turns ref() into a multimethod";
        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-       broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling'
+       broken = true; # 'OP {aka struct op}' has no member named 'op_sibling'
      };
   };
 

From 67f58eee5ee8d21ccd914fbcde18e1be146dd490 Mon Sep 17 00:00:00 2001
From: Aaron VonderHaar <gruen0aermel@gmail.com>
Date: Wed, 3 Oct 2018 11:41:58 -0700
Subject: [PATCH 2370/3253] elm-format: 0.8.0 -> 0.8.1

---
 pkgs/development/compilers/elm/default.nix    | 23 ++++---------------
 .../compilers/elm/packages/elm-format.nix     | 22 ++++++++++--------
 .../elm/packages/tasty-quickcheck.nix         | 14 +++++++++++
 pkgs/development/compilers/elm/update.sh      |  2 --
 4 files changed, 30 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/compilers/elm/packages/tasty-quickcheck.nix

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 692404a19bf6..e9678ddc4ca1 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -107,26 +107,10 @@ let
 
 
             /*
-            This is not a core Elm package, and it's hosted on GitHub.
-            To update, run:
-
-                cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
-
-            where foo is a tag for a new version, for example "0.8.0".
+            The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
+            `pacakge/nix/build.sh`
             */
-            elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix {  }) (drv: {
-              # https://github.com/avh4/elm-format/issues/529
-              patchPhase = ''
-                cat >Setup.hs <<EOF
-                import Distribution.Simple
-                main = defaultMain
-                EOF
-
-                sed -i '/Build_elm_format/d' elm-format.cabal
-                sed -i 's/Build_elm_format.gitDescribe/""/' src/ElmFormat/Version.hs
-                sed -i '/Build_elm_format/d' src/ElmFormat/Version.hs
-              '';
-            });
+            elm-format = self.callPackage ./packages/elm-format.nix {};
           };
       in elmPkgs // {
         inherit elmPkgs;
@@ -134,6 +118,7 @@ let
 
         # Needed for elm-format
         indents = self.callPackage ./packages/indents.nix {};
+        tasty-quickcheck = self.callPackage ./packages/tasty-quickcheck.nix {};
       };
   };
 in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 86d99abab5a5..d773736bba56 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -1,17 +1,21 @@
-{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
-, bytestring, Cabal, cmark, containers, directory, fetchgit
-, filepath, free, HUnit, indents, json, mtl, optparse-applicative
-, parsec, process, QuickCheck, quickcheck-io, split, stdenv, tasty
-, tasty-golden, tasty-hunit, tasty-quickcheck, text
+{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, Cabal, cmark, containers, directory, filepath, free
+, HUnit, indents, json, mtl, optparse-applicative, parsec, process
+, QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden
+, tasty-hunit, tasty-quickcheck, text
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.8.0";
+  version = "0.8.1";
   src = fetchgit {
     url = "http://github.com/avh4/elm-format";
-    sha256 = "1w79xvsyq98vfz3jb4sv8433vdh6pcg8s7yh54lcxzr1p08yhsb6";
-    rev = "f19ac28046d7e83ff95f845849c033cc616f1bd6";
+    sha256 = "0p1dy1m6illsl7i04zsv5jqw7i4znv7pfpdfm53zy0k7mq0fk09j";
+    rev = "89694e858664329e3cbdaeb71b15c4456fd739ff";
   };
+  postPatch = ''
+    sed -i "s|desc <-.*||" ./Setup.hs
+    sed -i "s|gitDescribe = .*|gitDescribe = \\\\\"0.8.1\\\\\"\"|" ./Setup.hs
+  '';
   isLibrary = true;
   isExecutable = true;
   setupHaskellDepends = [ base Cabal directory filepath process ];
@@ -26,8 +30,6 @@ mkDerivation {
     split tasty tasty-golden tasty-hunit tasty-quickcheck text
   ];
   doHaddock = false;
-  jailbreak = true;
-  doCheck = false;
   homepage = "http://elm-lang.org";
   description = "A source code formatter for Elm";
   license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix b/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
new file mode 100644
index 000000000000..54235489edfa
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
@@ -0,0 +1,14 @@
+{ mkDerivation, base, pcre-light, QuickCheck, random, stdenv
+, tagged, tasty, tasty-hunit
+}:
+mkDerivation {
+  pname = "tasty-quickcheck";
+  version = "0.9.2";
+  sha256 = "c5920adeab6e283d5e3ab45f3c80a1b011bedfbe4a3246a52606da2e1da95873";
+  libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
+  testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
+  doCheck = false;
+  homepage = "https://github.com/feuerbach/tasty";
+  description = "QuickCheck support for the Tasty test framework";
+  license = stdenv.lib.licenses.mit;
+}
diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh
index 02e5bdc9b581..2b5d85feeb28 100755
--- a/pkgs/development/compilers/elm/update.sh
+++ b/pkgs/development/compilers/elm/update.sh
@@ -1,3 +1 @@
 cabal2nix https://github.com/elm/compiler --revision  32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix
-cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
-cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix

From cddea0fdc0bb612e55b55f5cd5ff11993a80c146 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 12:33:14 -0700
Subject: [PATCH 2371/3253] cl: 1.2.3 -> 1.2.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cl/versions
---
 pkgs/development/libraries/cl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 7cb75d8de0f3..1890d2b25a0d 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.2.4";
   name = "cl-${version}";
 
   src = fetchFromGitHub {
     owner = "tonyrog";
     repo = "cl";
     rev = "cl-${version}";
-    sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03";
+    sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz";
   };
 
   buildInputs = [ erlang rebar opencl-headers ocl-icd ];

From f95183f34515b4769bdcd751a3ae65c6f54f128e Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Thu, 27 Sep 2018 23:43:06 -1000
Subject: [PATCH 2372/3253] added flmsg: fldigi companion application

https://sourceforge.net/projects/fldigi/
Signed-off-by: Tim Dysinger <tim@dysinger.net>
---
 pkgs/applications/misc/flmsg/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/flmsg/default.nix

diff --git a/pkgs/applications/misc/flmsg/default.nix b/pkgs/applications/misc/flmsg/default.nix
new file mode 100644
index 000000000000..afdf0f91a910
--- /dev/null
+++ b/pkgs/applications/misc/flmsg/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  version = "4.0.7";
+  pname = "flmsg";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    sha256 = "1kdlwhxsw02pas9d0kakkq2713wj1m4q881f6am5aq4x8n01f4xw";
+  };
+
+  buildInputs = [
+    fltk13
+    libjpeg
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  meta = {
+    description = "Digital modem message program";
+    homepage = https://sourceforge.net/projects/fldigi/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ dysinger ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5445de13ea2..6c84bc275eae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16431,6 +16431,8 @@ with pkgs;
   flink = callPackage ../applications/networking/cluster/flink { };
   flink_1_5 = flink.override { version = "1.5"; };
 
+  flmsg = callPackage ../applications/misc/flmsg { };
+
   fluidsynth = callPackage ../applications/audio/fluidsynth {
      inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
   };

From b560d6499f0b790f2078074a307740b98384b412 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Thu, 27 Sep 2018 23:50:08 -1000
Subject: [PATCH 2373/3253] added flwrap: fldigi companion application

Signed-off-by: Tim Dysinger <tim@dysinger.net>
---
 pkgs/applications/misc/flwrap/default.nix | 34 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/flwrap/default.nix

diff --git a/pkgs/applications/misc/flwrap/default.nix b/pkgs/applications/misc/flwrap/default.nix
new file mode 100644
index 000000000000..b96f3c2b3278
--- /dev/null
+++ b/pkgs/applications/misc/flwrap/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.3.5";
+  pname = "flwrap";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    sha256 = "0qqivqkkravcg7j45740xfky2q3k7czqpkj6y364qff424q2pppg";
+  };
+
+  buildInputs = [
+    fltk13
+    libjpeg
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  meta = {
+    description = "Digital modem file transfer program";
+    homepage = https://sourceforge.net/projects/fldigi/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ dysinger ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c84bc275eae..dc28026bd8b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16433,6 +16433,8 @@ with pkgs;
 
   flmsg = callPackage ../applications/misc/flmsg { };
 
+  flwrap = callPackage ../applications/misc/flwrap { };
+
   fluidsynth = callPackage ../applications/audio/fluidsynth {
      inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
   };

From 43cba4f446a63eacd1ffb964e3d96543634a8832 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Thu, 27 Sep 2018 23:57:52 -1000
Subject: [PATCH 2374/3253] added flrig: fldigi companion application

Signed-off-by: Tim Dysinger <tim@dysinger.net>
---
 pkgs/applications/misc/flrig/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/flrig/default.nix

diff --git a/pkgs/applications/misc/flrig/default.nix b/pkgs/applications/misc/flrig/default.nix
new file mode 100644
index 000000000000..baee3010d696
--- /dev/null
+++ b/pkgs/applications/misc/flrig/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.3.40";
+  pname = "flrig";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    sha256 = "1wr7bb2577gha7y3a8m5w60m4xdv8m0199cj2c6349sgbds373w9";
+  };
+
+  buildInputs = [
+    fltk13
+    libjpeg
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  meta = {
+    description = "Digital modem rig control program";
+    homepage = https://sourceforge.net/projects/fldigi/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ dysinger ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc28026bd8b7..05d8171a1b86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16433,6 +16433,8 @@ with pkgs;
 
   flmsg = callPackage ../applications/misc/flmsg { };
 
+  flrig = callPackage ../applications/misc/flrig { };
+
   flwrap = callPackage ../applications/misc/flwrap { };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {

From e6fc7dfb8eb391b91626dd2aadf33944bf785157 Mon Sep 17 00:00:00 2001
From: Tim Dysinger <tim@dysinger.net>
Date: Fri, 28 Sep 2018 00:00:06 -1000
Subject: [PATCH 2375/3253] added fllog: fldigi companion application

Signed-off-by: Tim Dysinger <tim@dysinger.net>
---
 pkgs/applications/misc/fllog/default.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/fllog/default.nix

diff --git a/pkgs/applications/misc/fllog/default.nix b/pkgs/applications/misc/fllog/default.nix
new file mode 100644
index 000000000000..348b1155e41e
--- /dev/null
+++ b/pkgs/applications/misc/fllog/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, fltk13
+, libjpeg
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.5";
+  pname = "fllog";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/fldigi/${name}.tar.gz";
+    sha256 = "042j1g035338vfbl4i9laai8af8iakavar05xn2m4p7ww6x76zzl";
+  };
+
+  buildInputs = [
+    fltk13
+    libjpeg
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  meta = {
+    description = "Digital modem log program";
+    homepage = https://sourceforge.net/projects/fldigi/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ dysinger ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05d8171a1b86..ef13308607f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16431,6 +16431,8 @@ with pkgs;
   flink = callPackage ../applications/networking/cluster/flink { };
   flink_1_5 = flink.override { version = "1.5"; };
 
+  fllog = callPackage ../applications/misc/fllog { };
+
   flmsg = callPackage ../applications/misc/flmsg { };
 
   flrig = callPackage ../applications/misc/flrig { };

From 7868debd467a1b1749c943904a233aac17789885 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 12:56:18 -0700
Subject: [PATCH 2376/3253] fossil: 2.6 -> 2.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fossil/versions
---
 pkgs/applications/version-management/fossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index b65ada145b9e..cf58731b46c2 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "fossil-${version}";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchurl {
     urls =
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
     name = "${name}.tar.gz";
-    sha256 = "1nbfzxwnq66f8162nmddd22xn3nyazqr16kka2c1gghqb5ar99vn";
+    sha256 = "0g032502lx4l1lvkczh8v7g0i90vbyriw0lmvi3mwjfp668ka91c";
   };
 
   buildInputs = [ zlib openssl readline sqlite which ed ]

From fc2a97dea9e94157b13c0afd8f246250ee71773b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 13:00:39 -0700
Subject: [PATCH 2377/3253] dico: 2.6 -> 2.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dico/versions
---
 pkgs/servers/dico/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index 76a3f51caa2e..0e4c392c7a3e 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -2,11 +2,11 @@
 , guile, python, pcre, libffi, groff }:
 
 stdenv.mkDerivation rec {
-  name = "dico-2.6";
+  name = "dico-2.7";
 
   src = fetchurl {
     url = "mirror://gnu/dico/${name}.tar.xz";
-    sha256 = "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i";
+    sha256 = "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq";
   };
 
   hardeningDisable = [ "format" ];

From 63ed8693b783ef87fc6e0de96c52f56fa4f28d52 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 3 Oct 2018 22:04:46 +0200
Subject: [PATCH 2378/3253] mhwaveedit: 1.4.23 -> 1.4.24

+ moved pkgconfig and makeWrapper to nativeBuildInputs
+ fixed fetcher
+ fixed meta.homepage
---
 .../applications/audio/mhwaveedit/default.nix | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index 88b636679cbd..db70e59218b3 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
+{ stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
 , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
 , vorbis-tools }:
 
-stdenv.mkDerivation  rec {
+stdenv.mkDerivation rec {
   name = "mhwaveedit-${version}";
-  version = "1.4.23";
+  version = "1.4.24";
 
-  src = fetchurl {
-    url = "https://github.com/magnush/mhwaveedit/archive/v${version}.tar.gz";
-    sha256 = "1lvd54d8kpxwl4gihhznx1b5skhibz4vfxi9k2kwqg808jfgz37l";
+  src = fetchFromGitHub {
+    owner = "magnush";
+    repo = "mhwaveedit";
+    rev = "v${version}";
+    sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
 
   preAutoreconf = "(cd docgen && sh gendocs.sh)";
 
   buildInputs = [
-     SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile
-     pkgconfig libpulseaudio makeWrapper
+    SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio
   ];
 
   configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ];
@@ -30,7 +31,7 @@ stdenv.mkDerivation  rec {
 
   meta = with stdenv.lib; {
     description = "Graphical program for editing, playing and recording sound files";
-    homepage = https://gna.org/projects/mhwaveedit;
+    homepage = https://github.com/magnush/mhwaveedit;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];

From 8a7cf66ed0ad36dc271ca61d1127501a26158d06 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Wed, 3 Oct 2018 20:34:04 +0000
Subject: [PATCH 2379/3253] remove support for pre-5.26 Perl

---
 pkgs/development/interpreters/perl/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index cd8b2f263ddd..6caf423aa35c 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -50,8 +50,7 @@ let
         })
       ]
       ++ optional stdenv.isSunOS ./ld-shared.patch
-      ++ optional stdenv.isDarwin ./cpp-precomp.patch
-      ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch
+      ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
       ++ optional crossCompiling ./MakeMaker-cross.patch;
 
     postPatch = ''

From 6b143f9002b576bee9b58d7560d889c7c1430408 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 13:53:55 -0700
Subject: [PATCH 2380/3253] cpp-hocon: 0.1.7 -> 0.2.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cpp-hocon/versions
---
 pkgs/development/libraries/cpp-hocon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 1f4b43db16c3..f08077a9a3cf 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-hocon-${version}";
-  version = "0.1.7";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
-    sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m";
+    sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i";
     rev = version;
     repo = "cpp-hocon";
     owner = "puppetlabs";

From f4c968eaefc86a14daaa5ad850fa3ceff79ad007 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 14:07:48 -0700
Subject: [PATCH 2381/3253] disorderfs: 0.5.3 -> 0.5.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/disorderfs/versions
---
 pkgs/tools/filesystems/disorderfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 0bde9b0b26e1..138f727c3d30 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
-    sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq";
+    sha256 = "0rp789qll5nmzw0jffx36ppcl9flr6hvdz84ah080mvghqkfdq8y";
   };
 
   nativeBuildInputs = [ pkgconfig asciidoc ];

From fe071ae077f60a996d45c72015469fc5af40960e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 14:22:13 -0700
Subject: [PATCH 2382/3253] dar: 2.5.16 -> 2.5.17

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dar/versions
---
 pkgs/tools/backup/dar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index b870c08d755f..a96326c76cfd 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.5.16";
+  version = "2.5.17";
   name = "dar-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "0fy39y6kfda0lvbymc0dblvzmli5y9bq81q0r8fwjzd105qwjmz9";
+    sha256 = "1pw6l9nh7w9n7ysh8m6wdzr3k4i9sd6fkmrprnssay5cz7rsbx3v";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From 989b34de7cce6331c5f7443b11c42f526970af88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:11:35 -0700
Subject: [PATCH 2383/3253] elisa: 0.2.80 -> 0.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/elisa/versions
---
 pkgs/applications/audio/elisa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
index 2d35ebb41aee..00e10a2ff1e2 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   name = "elisa-${version}";
-  version = "0.2.80";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "elisa";
     rev    = "v${version}";
-    sha256 = "0wc2kkp28gp1rfgg14a769lalwd44yz7jxkrzanh91v5j2kkln07";
+    sha256 = "0bpkr5rp9nfa2wzm6w3xkhsfgf5dbgxbmhckjh9wkxal3mncpkg4";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];

From cded34d9a58904c43e1dad41edbb7222c1d24db5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:20:50 -0700
Subject: [PATCH 2384/3253] acpica-tools: 20180810 -> 20180927

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/acpica-tools/versions
---
 pkgs/tools/system/acpica-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index c738b611f946..54303d0c177d 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180810";
+  version = "20180927";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1wqy5kizmlk8y92vqhj387j5j9cfzaxxn55r490jxibl1qfr2hr6";
+    sha256 = "1c9d505mw1wyga65y4nmiz55gs357z97wnycx77yvjwvi08qsh6w";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From 7e5f728613c79679200d418e4c2b3cf8f9c88c25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:23:29 -0700
Subject: [PATCH 2385/3253] cgal: 4.12.1 -> 4.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cgal/versions
---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 0de1e35440b9..787c54c1b0a3 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.12.1";
+  version = "4.13";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9";
+    sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;

From c9c9f18f93152e5862800dbb7babf5896b1f6918 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:45:54 -0700
Subject: [PATCH 2386/3253] audacity: 2.2.2 -> 2.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/audacity/versions
---
 pkgs/applications/audio/audacity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 1989fd1400d4..fc32eb799cf9 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -7,12 +7,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.2.2";
+  version = "2.3.0";
   name = "audacity-${version}";
 
   src = fetchurl {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
-    sha256 = "18q7i77ynihx7xp45lz2lv0k0wrh6736pcrivlpwrxjgbvyqx7km";
+    sha256 = "0pi7ksm8hfvwbn580z4kkc55sbaylrrr7v08s04dmdgfvil7y4ip";
   };
 
   preConfigure = /* we prefer system-wide libs */ ''

From 40ea9c71435fee58d1b09dbf61b1256e2fc8ba62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:53:06 -0700
Subject: [PATCH 2387/3253] alfred: 2018.2 -> 2018.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/alfred/versions
---
 pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index cc632db160f2..605334e12a10 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
 
 let
-  ver = "2018.2";
+  ver = "2018.3";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0640p9zy1511pl30i5yybqa0s1yqz83291vw1z22jrcsq57rrgib";
+    sha256 = "06lbyac0w48jkxpji9pgkxnwcrwbzs2dwzfgw2vfr1lix6ivhrb2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 12817622da99570584f86a9396b191f78f8dc688 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 15:55:41 -0700
Subject: [PATCH 2388/3253] appstream-glib: 0.7.12 -> 0.7.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/appstream-glib/versions
---
 pkgs/development/libraries/appstream-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 39b3d6aba6bd..2aacfd07364f 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
 , libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.12";
+  name = "appstream-glib-0.7.13";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax";
+    sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06";
   };
 
   nativeBuildInputs = [

From 904fd99bb4f831b040876d61a1bff46a054780c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 16:01:08 -0700
Subject: [PATCH 2389/3253] calc: 2.12.6.6 -> 2.12.6.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/calc/versions
---
 pkgs/applications/science/math/calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 9d95960bde27..ff6b2d0ad2d1 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   name = "calc-${version}";
-  version = "2.12.6.6";
+  version = "2.12.6.8";
 
   src = fetchurl {
     urls = [
       "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
       "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
     ];
-    sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
+    sha256 = "144am0pra3hh7635fmi7kqynba8z246dx1dzclm9qx965p3xb4hb";
   };
 
   patchPhase = ''

From 3f97539b423da0a6e4cd59ff367b9b2486d08276 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 4 Oct 2018 02:24:28 +0200
Subject: [PATCH 2390/3253] camomile: 0.8.7 -> 1.0.1

---
 pkgs/development/ocaml-modules/camomile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix
index 53c45d17854c..5e156776f860 100644
--- a/pkgs/development/ocaml-modules/camomile/default.nix
+++ b/pkgs/development/ocaml-modules/camomile/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo }:
 
 stdenv.mkDerivation rec {
-	version = "0.8.7";
+	version = "1.0.1";
 	name = "ocaml${ocaml.version}-camomile-${version}";
 
 	src = fetchFromGitHub {
 		owner = "yoriyuki";
 		repo = "camomile";
-		rev = "rel-${version}";
-		sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
+		rev = "${version}";
+		sha256 = "1pfxr9kzkpd5bsdqrpxasfxkawwkg4cpx3m1h6203sxi7qv1z3fn";
 	};
 
 	buildInputs = [ ocaml findlib dune cppo ];

From 3b32efff7ed3c19ea636e627d1b24df4d2340603 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 4 Oct 2018 02:26:00 +0200
Subject: [PATCH 2391/3253] WIP liquidsoap update

---
 pkgs/tools/audio/liquidsoap/full.nix | 40 +++++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index eb544fc693e4..7d3b899048f7 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -4,10 +4,12 @@
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
-, }:
+, autoconf, automake, libtool
+}:
 
 let
-  version = "1.1.1";
+  pname = "liquidsoap";
+  version = "1.3.4";
 
   packageFilters = map (p: "-e '/ocaml-${p}/d'" )
     [ "gstreamer" "shine" "aacplus" "schroedinger"
@@ -15,16 +17,39 @@ let
     ];
 in
 stdenv.mkDerivation {
-  name = "liquidsoap-full-${version}";
+  name = "${pname}-full-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz";
-    sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa";
+    url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2";
+    sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0";
   };
 
-  preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES";
+  preConfigure = /* we prefer system-wide libs */ ''
+    sed -i "s|gsed|sed|" Makefile
+    make bootstrap
+    # autoreconf -vi # use system libraries
+
+    sed ${toString packageFilters} PACKAGES.default > PACKAGES
+  '';
+
   configureFlags = [ "--localstatedir=/var" ];
 
+  # liquidsoap only looks for lame and ffmpeg at runtime, so we need to link them in manually
+  NIX_LDFLAGS = [
+  #   # LAME
+  #   # "-lmp3lame"
+  #   # ffmpeg
+  #   "-lavcodec"
+  #   "-lavdevice"
+  #   "-lavfilter"
+  #   "-lavformat"
+    "-lavresample"
+  #   "-lavutil"
+  #   "-lpostproc"
+  #   "-lswresample"
+    "-lswscale"
+  ];
+
   buildInputs =
     [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig
       libao portaudio alsaLib libpulseaudio libjack2
@@ -33,8 +58,11 @@ stdenv.mkDerivation {
       faad2 flac ladspaH ffmpeg frei0r dssi
       ocamlPackages.xmlm ocamlPackages.ocaml_pcre
       ocamlPackages.camomile
+      # autoconf automake libtool
     ];
 
+  hardeningDisable = [ "format" "fortify" ];
+
   meta = with stdenv.lib; {
     description = "Swiss-army knife for multimedia streaming";
     homepage = http://liquidsoap.fm/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 827e430a7282..fcf20c6e0cab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3582,7 +3582,7 @@ with pkgs;
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_2;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+    # ocamlPackages = ocaml-ng.ocamlPackages_4_03;
   };
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };

From 3b685ee5171416ef322f244187ec9bee01faa358 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 17:43:31 +0200
Subject: [PATCH 2392/3253] xpra: modernize

Port to Python 3 and GTK+ 3.
---
 pkgs/tools/X11/xpra/default.nix     | 64 +++++++++++++++--------------
 pkgs/tools/X11/xpra/fix-paths.patch | 33 +++++++++++++++
 2 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/tools/X11/xpra/fix-paths.patch

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 915144daa908..4df793c5b166 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, callPackage, python2Packages, pkgconfig
-, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which
+{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
+, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
+, wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
 , gst_all_1, pulseaudio, gobjectIntrospection
@@ -9,7 +9,7 @@
 with lib;
 
 let
-  inherit (python2Packages) cython buildPythonApplication;
+  inherit (python3.pkgs) cython buildPythonApplication;
 
   xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
@@ -21,7 +21,14 @@ in buildPythonApplication rec {
     sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit (xorg) xkeyboardconfig;
+    })
+  ];
+
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection wrapGAppsHook ];
   buildInputs = [
     cython
 
@@ -30,11 +37,10 @@ in buildPythonApplication rec {
     xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
     xorg.libXrandr xorg.libxkbfile
 
-    pango cairo gdk_pixbuf atk gtk2 glib
+    pango cairo gdk_pixbuf atk gtk3 glib
 
     ffmpeg libvpx x264 libwebp
 
-    gobjectIntrospection
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -42,38 +48,34 @@ in buildPythonApplication rec {
     gst_all_1.gst-libav
 
     pam
-
-    makeWrapper
   ];
 
-  propagatedBuildInputs = with python2Packages; [
-    pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
-    netifaces numpy websockify pygobject3 gst-python pam
+  propagatedBuildInputs = with python3.pkgs; [
+    pillow rencode pycrypto cryptography pycups lz4 dbus-python
+    netifaces numpy websockify pygobject3 pycairo gst-python pam
   ];
 
-  preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
-    substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
-    substituteInPlace xpra/x11/bindings/keyboard_bindings.pyx --replace "/usr/share/X11/xkb" "${xorg.xkeyboardconfig}/share/X11/xkb"
-  '';
-  setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
+  NIX_CFLAGS_COMPILE = [
+    # error: 'import_cairo' defined but not used
+    "-Wno-error=unused-function"
+  ];
 
-  postInstall = ''
-    wrapProgram $out/bin/xpra \
-      --set XPRA_INSTALL_PREFIX "$out" \
-      --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
-      --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib  \
+  setupPyBuildFlags = [
+    "--with-Xdummy"
+    "--without-strict"
+    "--with-gtk3"
+    "--without-gtk2"
+  ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set XPRA_INSTALL_PREFIX "$out"
+      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
       --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudio ]}
+    )
   '';
 
-  preCheck = "exit 0";
-
-  #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
-  #postFixup = ''
-  #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-  #  sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
-  #'';
+  doCheck = false;
 
   passthru = { inherit xf86videodummy; };
 
diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch
new file mode 100644
index 000000000000..c50ec28c35e2
--- /dev/null
+++ b/pkgs/tools/X11/xpra/fix-paths.patch
@@ -0,0 +1,33 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1885,7 +1885,7 @@
+     if OSX:
+         pycairo = "py3cairo"
+     else:
+-        pycairo = "pycairo"
++        pycairo = "py3cairo"
+     cython_add(Extension("xpra.client.gtk3.cairo_workaround",
+                 ["xpra/client/gtk3/cairo_workaround.pyx"],
+                 **pkgconfig(pycairo)
+--- a/xpra/client/gtk3/cairo_workaround.pyx
++++ b/xpra/client/gtk3/cairo_workaround.pyx
+@@ -65,7 +65,7 @@
+     void cairo_surface_flush (cairo_surface_t *surface)
+     void cairo_surface_mark_dirty (cairo_surface_t *surface)
+ 
+-cdef extern from "pycairo/pycairo.h":
++cdef extern from "py3cairo.h":
+     ctypedef struct Pycairo_CAPI_t:
+         pass
+     ctypedef struct PycairoSurface:
+--- a/xpra/x11/bindings/keyboard_bindings.pyx
++++ b/xpra/x11/bindings/keyboard_bindings.pyx
+@@ -19,7 +19,7 @@
+ 
+ DEF PATH_MAX = 1024
+ DEF DFLT_XKB_RULES_FILE = "base"
+-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb"
++DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb"
+ 
+ ###################################
+ # Headers, python magic

From d4d87b049ba127df57bdb03bc9d960fac964a5a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Sep 2018 17:45:42 +0200
Subject: [PATCH 2393/3253] xpraGtk3: point to xpra

xpra now uses GTK 3
---
 pkgs/tools/X11/xpra/gtk3.nix    | 79 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 pkgs/top-level/all-packages.nix |  2 -
 3 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100644 pkgs/tools/X11/xpra/gtk3.nix

diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
deleted file mode 100644
index ceba4269e808..000000000000
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, buildPythonApplication
-, python, cython, pkgconfig
-, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
-, makeWrapper, xorgserver, getopt, xauth, utillinux, which, fontsConf
-, ffmpeg, x264, libvpx, libwebp
-, libfakeXinerama, pam }:
-
-buildPythonApplication rec {
-  name = "xpra-${version}";
-  version = "2.2.5";
-
-  src = fetchurl {
-    url = "https://xpra.org/src/${name}.tar.xz";
-    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
-  };
-
-  patchPhase = ''
-    substituteInPlace setup.py --replace 'pycairo' 'py3cairo'
-    substituteInPlace xpra/client/gtk3/cairo_workaround.pyx --replace 'pycairo/pycairo.h' 'py3cairo.h'
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto
-    xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto
-    xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage
-    xorg.libXrandr xorg.libxkbfile
-
-    pango cairo gdk_pixbuf atk gtk3 glib gobjectIntrospection
-
-    ffmpeg libvpx x264 libwebp
-
-    makeWrapper
-
-    pam
-  ];
-
-  propagatedBuildInputs = [
-    pygobject3 pycairo cython
-  ];
-
-  preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
-    substituteInPlace xpra/server/auth/pam_auth.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
-  '';
-  setupPyBuildFlags = [ "--without-strict" "--with-gtk3" "--without-gtk2" "--with-Xdummy" ];
-
-  preInstall = ''
-    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
-    ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data_files/d' setup.py
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/xpra \
-      --set FONTCONFIG_FILE "${fontsConf}" \
-      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}
-  '';
-
-  preCheck = "exit 0";
-  doInstallCheck = false;
-
-  #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
-  #postFixup = ''
-  #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-  #  sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra
-  #'';
-
-
-  meta = with stdenv.lib; {
-    homepage = http://xpra.org/;
-    downloadPage = "https://xpra.org/src/";
-    downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
-    description = "Persistent remote applications for X";
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 92a0f2b45709..114902af920f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -310,6 +310,7 @@ mapAliases ({
   xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
+  xpraGtk3 = xpra; # added 2018-09-13
   youtubeDL = youtube-dl;  # added 2014-10-26
 
   # added 2017-05-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 827e430a7282..330498375e05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19681,8 +19681,6 @@ with pkgs;
 
   xpra = callPackage ../tools/X11/xpra { };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
-  #TODO: 'pil' is not available for python3, yet
-  xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
 
   xrectsel = callPackage ../tools/X11/xrectsel { };
 

From 39422260530d183aa4778a672775eb8b9761d666 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 3 Oct 2018 18:37:12 -0400
Subject: [PATCH 2394/3253] arrow-cpp: 0.9.0 -> 0.10.0 pythonPackages.pyarrow:
 0.9.0 -> 0.10.0 parquet: 1.4.0 -> 1.5.0

---
 pkgs/development/libraries/arrow-cpp/darwin.patch   | 11 +++++++++++
 pkgs/development/libraries/arrow-cpp/default.nix    |  7 +++++--
 pkgs/development/libraries/parquet-cpp/api.patch    | 12 ++++++++++++
 pkgs/development/libraries/parquet-cpp/default.nix  |  6 ++++--
 pkgs/development/python-modules/pyarrow/default.nix | 10 +++-------
 5 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/arrow-cpp/darwin.patch
 create mode 100644 pkgs/development/libraries/parquet-cpp/api.patch

diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/development/libraries/arrow-cpp/darwin.patch
new file mode 100644
index 000000000000..de9b1986ffed
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/darwin.patch
@@ -0,0 +1,11 @@
+diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake
+--- a/cmake_modules/FindPythonLibsNew.cmake
++++ b/cmake_modules/FindPythonLibsNew.cmake
+@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
+ list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
+ list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH)
+ list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS)
++string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}")
+ 
+ # Make sure the Python has the same pointer-size as the chosen compiler
+ # Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 952f7435c069..16fc7e0c960d 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,15 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
+    sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
 
+  # patch to fix python-test
+  patches = [ ./darwin.patch ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost python.pkgs.python python.pkgs.numpy ];
 
diff --git a/pkgs/development/libraries/parquet-cpp/api.patch b/pkgs/development/libraries/parquet-cpp/api.patch
new file mode 100644
index 000000000000..3fd567ea098f
--- /dev/null
+++ b/pkgs/development/libraries/parquet-cpp/api.patch
@@ -0,0 +1,12 @@
+diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
+--- a/src/parquet/arrow/reader.cc
++++ b/src/parquet/arrow/reader.cc
+@@ -1421,7 +1421,7 @@ Status StructImpl::DefLevelsToNullArray(std::shared_ptr<Buffer>* null_bitmap_out
+   const int16_t* def_levels_data;
+   size_t def_levels_length;
+   RETURN_NOT_OK(GetDefLevels(&def_levels_data, &def_levels_length));
+-  RETURN_NOT_OK(AllocateEmptyBitmap(pool_, def_levels_length, &null_bitmap));
++  RETURN_NOT_OK(GetEmptyBitmap(pool_, def_levels_length, &null_bitmap));
+   uint8_t* null_bitmap_ptr = null_bitmap->mutable_data();
+   for (size_t i = 0; i < def_levels_length; i++) {
+     if (def_levels_data[i] < struct_def_level_) {
diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix
index e281e604380b..804ddb136f03 100644
--- a/pkgs/development/libraries/parquet-cpp/default.nix
+++ b/pkgs/development/libraries/parquet-cpp/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "parquet-cpp-${version}";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz";
-    sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj";
+    sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli";
   };
 
+  patches = [ ./api.patch ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ];
 
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 1c2cb4a7643d..e73b1717331c 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python;};
@@ -7,18 +7,14 @@ in
 
 buildPythonPackage rec {
   pname = "pyarrow";
-  version = "0.9.0";
 
-  src = fetchurl {
-    url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
-  };
+  inherit (_arrow-cpp) version src;
 
   sourceRoot = "apache-arrow-${version}/python";
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ pandas pytest pytestrunner ];
+  checkInputs = [ pandas pytest pytestrunner JPype1 ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib";

From d10a84eb21a52343041ccb5afa07992845b2b1e2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 4 Oct 2018 10:17:40 +0800
Subject: [PATCH 2395/3253] kcheckpass: it is in kscreenlocker, not
 plasma-workspace

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index e759f69db897..f29a838facdc 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -64,7 +64,7 @@ in
       };
 
       security.wrappers = {
-        kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
+        kcheckpass.source = "${lib.getBin plasma5.kscreenlocker}/lib/libexec/kcheckpass";
         "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
         kwin_wayland = {
           source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";

From 2c0d56f00719f27533a3a1a89d2bd48710735a1e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 3 Oct 2018 22:33:03 -0400
Subject: [PATCH 2396/3253] nixos/doc: Adds sub-folder to input files.

---
 nixos/doc/manual/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 2e9adf70c396..b251a1f5e2c3 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -4,7 +4,7 @@ all: manual-combined.xml format
 .PHONY: debug
 debug: generated manual-combined.xml
 
-manual-combined.xml: generated *.xml
+manual-combined.xml: generated *.xml **/*.xml
 	rm -f ./manual-combined.xml
 	nix-shell --packages xmloscopy \
 		--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"

From 8192fcd0fdac8d17c5719994a0c60ae0bd1109ed Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 2 Oct 2018 20:13:18 -0400
Subject: [PATCH 2397/3253] doc: installing-usb make macOS note a note.

While it seemingly brings more attention to the macOS notes with the
default docbook template, it better represents which parts of the
section are about macOS, and which parts are simply in the flow of the
text; otherwise the last paragraph may be lost into the details for
macOS.
---
 .../manual/installation/installing-usb.xml    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index c5934111749c..4315eb5942b9 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -9,13 +9,12 @@
   For systems without CD drive, the NixOS live CD can be booted from a USB
   stick. You can use the <command>dd</command> utility to write the image:
   <command>dd if=<replaceable>path-to-image</replaceable>
-  of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying
+  of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
   the correct drive; you can use the <command>lsblk</command> command to get a
   list of block devices.
- </para>
-
- <para>
-  On macOS:
+  <note>
+   <title>On macOS</title>
+   <para>
 <programlisting>
 $ diskutil list
 [..]
@@ -26,10 +25,12 @@ $ diskutil unmountDisk diskN
 Unmount of all volumes on diskN was successful
 $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
 </programlisting>
-  Using the 'raw' <command>rdiskN</command> device instead of
-  <command>diskN</command> completes in minutes instead of hours. After
-  <command>dd</command> completes, a GUI dialog "The disk you inserted was not
-  readable by this computer" will pop up, which can be ignored.
+    Using the 'raw' <command>rdiskN</command> device instead of
+    <command>diskN</command> completes in minutes instead of hours. After
+    <command>dd</command> completes, a GUI dialog "The disk you inserted was
+    not readable by this computer" will pop up, which can be ignored.
+   </para>
+  </note>
  </para>
 
  <para>

From 8467dc857bd1cc9c54a15cd36c062554b61234cf Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 2 Oct 2018 20:14:45 -0400
Subject: [PATCH 2398/3253] doc: installing-usb: removes notes about
 unetbootin.

They are known to cause more issues than solving issues; futhermore
using `dd` should work everywhere without fail.
---
 .../manual/installation/installing-usb.xml    | 29 -------------------
 1 file changed, 29 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 4315eb5942b9..0b311189430c 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -36,34 +36,5 @@ $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
  <para>
   The <command>dd</command> utility will write the image verbatim to the drive,
   making it the recommended option for both UEFI and non-UEFI installations.
-  For non-UEFI installations, you can alternatively use
-  <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If
-  you cannot use <command>dd</command> for a UEFI installation, you can also
-  mount the ISO, copy its contents verbatim to your drive, then either:
-  <itemizedlist>
-   <listitem>
-    <para>
-     Change the label of the disk partition to the label of the ISO (visible
-     with the blkid command), or
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
-     and change the <literal>root=</literal> field in the
-     <literal>options</literal> line to point to your drive (see the
-     documentation on <literal>root=</literal> in
-     <link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt">
-     the kernel documentation</link> for more details).
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     If you want to load the contents of the ISO to ram after bootin (So you
-     can remove the stick after bootup) you can append the parameter
-     <literal>copytoram</literal> to the <literal>options</literal> field.
-    </para>
-   </listitem>
-  </itemizedlist>
  </para>
 </section>

From 6cfbf403ca327017257ddbd742e312f3304b64cc Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 1 Oct 2018 23:57:10 -0400
Subject: [PATCH 2399/3253] doc: Reviews partitioning instructions to use
 parted.

The tests in <nixos/tests/installer.nix> are using `parted`, so they are
bound to be better tested than `fdisk`.

This is brought on by a couple issues, plus reports on IRC that the
`fdisk` instructions didn't work as expected.

 * #39354
 * #46309
 * #39942
 * #45478

Care was taken so that the other documented steps did not need changes.

In all this kerfufle, a slight re-organization of the Chapter has been
made, allowing better deep linking.
---
 nixos/doc/manual/installation/installing.xml | 709 +++++++++++--------
 1 file changed, 410 insertions(+), 299 deletions(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 1366e8f93596..2b68def95b70 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -4,60 +4,46 @@
             version="5.0"
             xml:id="sec-installation">
  <title>Installing NixOS</title>
- <para>
-  NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
-  installation is by and large the same as a BIOS installation. The differences
-  are mentioned in the steps that follow.
- </para>
- <orderedlist>
-  <listitem>
-   <para>
-    Boot from the CD.
-   </para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      UEFI systems
-     </term>
-     <listitem>
-      <para>
-       You should boot the live CD in UEFI mode (consult your specific
-       hardware's documentation for instructions). You may find the
-       <link xlink:href="http://www.rodsbooks.com/refind">rEFInd boot
-       manager</link> useful.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </listitem>
-  <listitem>
-   <para>
-    The CD contains a basic NixOS installation. (It also contains Memtest86+,
-    useful if you want to test new hardware). When it’s finished booting, it
-    should have detected most of your hardware.
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
-    or by running <command>nixos-help</command>.
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    You get logged in as <literal>root</literal> (with empty password).
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    If you downloaded the graphical ISO image, you can run <command>systemctl
-    start display-manager</command> to start KDE. If you want to continue on
-    the terminal, you can use <command>loadkeys</command> to switch to your
-    preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
-    neo</command>!)
-   </para>
-  </listitem>
-  <listitem>
+ <section xml:id="sec-installation-booting">
+  <title>Booting the system</title>
+
+  <para>
+   NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
+   installation is by and large the same as a BIOS installation. The
+   differences are mentioned in the steps that follow.
+  </para>
+
+  <para>
+   The installation media can be burned to a CD, or now more commonly, "burned"
+   to a USB drive (see <xref linkend="sec-booting-from-usb"/>).
+  </para>
+
+  <para>
+   The installation media contains a basic NixOS installation. When it’s
+   finished booting, it should have detected most of your hardware.
+  </para>
+
+  <para>
+   The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
+   or by running <command>nixos-help</command>.
+  </para>
+
+  <para>
+   You are logged-in automatically as <literal>root</literal>. (The
+   <literal>root</literal> user account has an empty password.)
+  </para>
+
+  <para>
+   If you downloaded the graphical ISO image, you can run <command>systemctl
+   start display-manager</command> to start KDE. If you want to continue on the
+   terminal, you can use <command>loadkeys</command> to switch to your
+   preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
+   neo</command>!)
+  </para>
+
+  <section xml:id="sec-installation-booting-networking">
+   <title>Networking in the installer</title>
+
    <para>
     The boot process should have brought up networking (check <command>ip
     a</command>). Networking is necessary for the installer, since it will
@@ -65,58 +51,165 @@
     binaries). It’s best if you have a DHCP server on your network. Otherwise
     configure networking manually using <command>ifconfig</command>.
    </para>
+
    <para>
     To manually configure the network on the graphical installer, first disable
     network-manager with <command>systemctl stop network-manager</command>.
    </para>
+
    <para>
     To manually configure the wifi on the minimal installer, run
     <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
     'key')</command>.
    </para>
-  </listitem>
-  <listitem>
+
    <para>
     If you would like to continue the installation from a different machine you
     need to activate the SSH daemon via <literal>systemctl start
     sshd</literal>. In order to be able to login you also need to set a
     password for <literal>root</literal> using <literal>passwd</literal>.
    </para>
-  </listitem>
-  <listitem>
+  </section>
+ </section>
+ <section xml:id="sec-installation-partitioning">
+  <title>Partitioning and formatting</title>
+
+  <para>
+   The NixOS installer doesn’t do any partitioning or formatting, so you need
+   to do that yourself.
+  </para>
+
+  <para>
+   The NixOS installer ships with multiple partitioning tools. The examples
+   below use <command>parted</command>, but also provides
+   <command>fdisk</command>, <command>gdisk</command>,
+   <command>cfdisk</command>, and <command>cgdisk</command>.
+  </para>
+
+  <para>
+   The recommended partition scheme differs depending if the computer uses
+   <emphasis>Legacy Boot</emphasis> or <emphasis>UEFI</emphasis>.
+  </para>
+
+  <section xml:id="sec-installation-partitioning-UEFI">
+   <title>UEFI (GPT)</title>
+
    <para>
-    The NixOS installer doesn’t do any partitioning or formatting yet, so you
-    need to do that yourself. Use the following commands:
-    <itemizedlist>
+    Here's an example partition scheme for UEFI, using
+    <filename>/dev/sda</filename> as the device.
+    <note>
+     <para>
+      You can safely ignore <command>parted</command>'s informational message
+      about needing to update /etc/fstab.
+     </para>
+    </note>
+   </para>
+
+   <para>
+    <orderedlist>
      <listitem>
       <para>
-       For partitioning: <command>fdisk</command>.
-<screen>
-# fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
--- for UEFI systems only
-> n      # <lineannotation>(create a new partition for /boot)</lineannotation>
-> 3      # <lineannotation>(make it a partition number 3)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
-> +512M  # <lineannotation>(the size of the UEFI boot partition)</lineannotation>
-> t      # <lineannotation>(change the partition type ...)</lineannotation>
-> 3      # <lineannotation>(... of the boot partition ...)</lineannotation>
-> 1      # <lineannotation>(... to 'UEFI System')</lineannotation>
--- for BIOS or UEFI systems
-> n      # <lineannotation>(create a new partition for /swap)</lineannotation>
-> 2      # <lineannotation>(make it a partition number 2)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
-> +8G    # <lineannotation>(the size of the swap partition, set to whatever you like)</lineannotation>
-> n      # <lineannotation>(create a new partition for /)</lineannotation>
-> 1      # <lineannotation>(make it a partition number 1)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
->        # <lineannotation>(press enter to accept the default and use the rest of the remaining space)</lineannotation>
-> a      # <lineannotation>(make the partition bootable)</lineannotation>
-> x      # <lineannotation>(enter expert mode)</lineannotation>
-> f      # <lineannotation>(fix up the partition ordering)</lineannotation>
-> r      # <lineannotation>(exit expert mode)</lineannotation>
-> w      # <lineannotation>(write the partition table to disk and exit)</lineannotation></screen>
+       Create a <emphasis>GPT</emphasis> partition table.
+<screen language="commands"># parted /dev/sda -- mklabel gpt</screen>
       </para>
      </listitem>
+     <listitem>
+      <para>
+       Add a <emphasis>swap</emphasis> partition. The size required will vary
+       according to needs, here a 8GiB one is created. The space left in front
+       (512MiB) will be used by the boot partition.
+<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB</screen>
+       <note>
+        <para>
+         The swap partition size rules are no different than for other Linux
+         distributions.
+        </para>
+       </note>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Next, add the <emphasis>root</emphasis> partition. This will fill the
+       remainder ending part of the disk.
+<screen language="commands"># parted /dev/sda -- mkpart primary 8.5GiB -1MiB</screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
+       the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
+       partition. It uses the initially reserved 512MiB at the start of the
+       disk.
+<screen language="commands"># parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+# parted /dev/sda -- set 3 boot on</screen>
+      </para>
+     </listitem>
+    </orderedlist>
+   </para>
+
+   <para>
+    Once complete, you can follow with
+    <xref linkend="sec-installation-partitioning-formatting"/>.
+   </para>
+  </section>
+
+  <section xml:id="sec-installation-partitioning-MBR">
+   <title>Legacy Boot (MBR)</title>
+
+   <para>
+    Here's an example partition scheme for Legacy Boot, using
+    <filename>/dev/sda</filename> as the device.
+    <note>
+     <para>
+      You can safely ignore <command>parted</command>'s informational message
+      about needing to update /etc/fstab.
+     </para>
+    </note>
+   </para>
+
+   <para>
+    <orderedlist>
+     <listitem>
+      <para>
+       Create a <emphasis>MBR</emphasis> partition table.
+<screen language="commands"># parted /dev/sda -- mklabel msdos</screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Add a <emphasis>swap</emphasis> partition. The size required will vary
+       according to needs, here a 8GiB one is created.
+<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 1M 8GiB</screen>
+       <note>
+        <para>
+         The swap partition size rules are no different than for other Linux
+         distributions.
+        </para>
+       </note>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Finally, add the <emphasis>root</emphasis> partition. This will fill the
+       remainder of the disk.
+<screen language="commands"># parted /dev/sda -- mkpart primary 8GiB -1s</screen>
+      </para>
+     </listitem>
+    </orderedlist>
+   </para>
+
+   <para>
+    Once complete, you can follow with
+    <xref linkend="sec-installation-partitioning-formatting"/>.
+   </para>
+  </section>
+
+  <section xml:id="sec-installation-partitioning-formatting">
+   <title>Formatting</title>
+
+   <para>
+    Use the following commands:
+    <itemizedlist>
      <listitem>
       <para>
        For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
@@ -169,242 +262,249 @@
      </listitem>
     </itemizedlist>
    </para>
-  </listitem>
-  <listitem>
-   <para>
-    Mount the target file system on which NixOS should be installed on
-    <filename>/mnt</filename>, e.g.
+  </section>
+ </section>
+ <section xml:id="sec-installation-installing">
+  <title>Installing</title>
+
+  <orderedlist>
+   <listitem>
+    <para>
+     Mount the target file system on which NixOS should be installed on
+     <filename>/mnt</filename>, e.g.
 <screen>
 # mount /dev/disk/by-label/nixos /mnt
 </screen>
-   </para>
-  </listitem>
-  <listitem>
-   <variablelist>
-    <varlistentry>
-     <term>
-      UEFI systems
-     </term>
-     <listitem>
-      <para>
-       Mount the boot file system on <filename>/mnt/boot</filename>, e.g.
+    </para>
+   </listitem>
+   <listitem>
+    <variablelist>
+     <varlistentry>
+      <term>
+       UEFI systems
+      </term>
+      <listitem>
+       <para>
+        Mount the boot file system on <filename>/mnt/boot</filename>, e.g.
 <screen>
 # mkdir -p /mnt/boot
 # mount /dev/disk/by-label/boot /mnt/boot
 </screen>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </listitem>
-  <listitem>
-   <para>
-    If your machine has a limited amount of memory, you may want to activate
-    swap devices now (<command>swapon
-    <replaceable>device</replaceable></command>). The installer (or rather, the
-    build actions that it may spawn) may need quite a bit of RAM, depending on
-    your configuration.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </listitem>
+   <listitem>
+    <para>
+     If your machine has a limited amount of memory, you may want to activate
+     swap devices now (<command>swapon
+     <replaceable>device</replaceable></command>). The installer (or rather,
+     the build actions that it may spawn) may need quite a bit of RAM,
+     depending on your configuration.
 <screen>
 # swapon /dev/sda2</screen>
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    You now need to create a file
-    <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
-    intended configuration of the system. This is because NixOS has a
-    <emphasis>declarative</emphasis> configuration model: you create or edit a
-    description of the desired configuration of your system, and then NixOS
-    takes care of making it happen. The syntax of the NixOS configuration file
-    is described in <xref linkend="sec-configuration-syntax"/>, while a list of
-    available configuration options appears in
-    <xref
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     You now need to create a file
+     <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
+     intended configuration of the system. This is because NixOS has a
+     <emphasis>declarative</emphasis> configuration model: you create or edit a
+     description of the desired configuration of your system, and then NixOS
+     takes care of making it happen. The syntax of the NixOS configuration file
+     is described in <xref linkend="sec-configuration-syntax"/>, while a list
+     of available configuration options appears in
+     <xref
     linkend="ch-options"/>. A minimal example is shown in
-    <xref
+     <xref
     linkend="ex-config"/>.
-   </para>
-   <para>
-    The command <command>nixos-generate-config</command> can generate an
-    initial configuration file for you:
+    </para>
+    <para>
+     The command <command>nixos-generate-config</command> can generate an
+     initial configuration file for you:
 <screen>
 # nixos-generate-config --root /mnt</screen>
-    You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
-    to suit your needs:
+     You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
+     to suit your needs:
 <screen>
 # nano /mnt/etc/nixos/configuration.nix
 </screen>
-    If you’re using the graphical ISO image, other editors may be available
-    (such as <command>vim</command>). If you have network access, you can also
-    install other editors — for instance, you can install Emacs by running
-    <literal>nix-env -i emacs</literal>.
-   </para>
-   <variablelist>
-    <varlistentry>
-     <term>
-      BIOS systems
-     </term>
-     <listitem>
-      <para>
-       You <emphasis>must</emphasis> set the option
-       <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
-       the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      UEFI systems
-     </term>
-     <listitem>
-      <para>
-       You <emphasis>must</emphasis> set the option
-       <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
-       <literal>true</literal>. <command>nixos-generate-config</command> should
-       do this automatically for new configurations when booted in UEFI mode.
-      </para>
-      <para>
-       You may want to look at the options starting with
-       <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
-       and
-       <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
-       as well.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-   <para>
-    If there are other operating systems running on the machine before
-    installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
-    option can be set to <literal>true</literal> to automatically add them to
-    the grub menu.
-   </para>
-   <para>
-    Another critical option is <option>fileSystems</option>, specifying the
-    file systems that need to be mounted by NixOS. However, you typically
-    don’t need to set it yourself, because
-    <command>nixos-generate-config</command> sets it automatically in
-    <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
-    currently mounted file systems. (The configuration file
-    <filename>hardware-configuration.nix</filename> is included from
-    <filename>configuration.nix</filename> and will be overwritten by future
-    invocations of <command>nixos-generate-config</command>; thus, you
-    generally should not modify it.)
-   </para>
-   <note>
-    <para>
-     Depending on your hardware configuration or type of file system, you may
-     need to set the option <option>boot.initrd.kernelModules</option> to
-     include the kernel modules that are necessary for mounting the root file
-     system, otherwise the installed system will not be able to boot. (If this
-     happens, boot from the CD again, mount the target file system on
-     <filename>/mnt</filename>, fix
-     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-     <filename>nixos-install</filename>.) In most cases,
-     <command>nixos-generate-config</command> will figure out the required
-     modules.
+     If you’re using the graphical ISO image, other editors may be available
+     (such as <command>vim</command>). If you have network access, you can also
+     install other editors — for instance, you can install Emacs by running
+     <literal>nix-env -i emacs</literal>.
     </para>
-   </note>
-  </listitem>
-  <listitem>
-   <para>
-    Do the installation:
+    <variablelist>
+     <varlistentry>
+      <term>
+       BIOS systems
+      </term>
+      <listitem>
+       <para>
+        You <emphasis>must</emphasis> set the option
+        <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
+        the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>
+       UEFI systems
+      </term>
+      <listitem>
+       <para>
+        You <emphasis>must</emphasis> set the option
+        <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
+        <literal>true</literal>. <command>nixos-generate-config</command>
+        should do this automatically for new configurations when booted in UEFI
+        mode.
+       </para>
+       <para>
+        You may want to look at the options starting with
+        <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
+        and
+        <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
+        as well.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+    <para>
+     If there are other operating systems running on the machine before
+     installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
+     option can be set to <literal>true</literal> to automatically add them to
+     the grub menu.
+    </para>
+    <para>
+     Another critical option is <option>fileSystems</option>, specifying the
+     file systems that need to be mounted by NixOS. However, you typically
+     don’t need to set it yourself, because
+     <command>nixos-generate-config</command> sets it automatically in
+     <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
+     currently mounted file systems. (The configuration file
+     <filename>hardware-configuration.nix</filename> is included from
+     <filename>configuration.nix</filename> and will be overwritten by future
+     invocations of <command>nixos-generate-config</command>; thus, you
+     generally should not modify it.)
+    </para>
+    <note>
+     <para>
+      Depending on your hardware configuration or type of file system, you may
+      need to set the option <option>boot.initrd.kernelModules</option> to
+      include the kernel modules that are necessary for mounting the root file
+      system, otherwise the installed system will not be able to boot. (If this
+      happens, boot from the installation media again, mount the target file
+      system on <filename>/mnt</filename>, fix
+      <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
+      <filename>nixos-install</filename>.) In most cases,
+      <command>nixos-generate-config</command> will figure out the required
+      modules.
+     </para>
+    </note>
+   </listitem>
+   <listitem>
+    <para>
+     Do the installation:
 <screen>
 # nixos-install</screen>
-    Cross fingers. If this fails due to a temporary problem (such as a network
-    issue while downloading binaries from the NixOS binary cache), you can just
-    re-run <command>nixos-install</command>. Otherwise, fix your
-    <filename>configuration.nix</filename> and then re-run
-    <command>nixos-install</command>.
-   </para>
-   <para>
-    As the last step, <command>nixos-install</command> will ask you to set the
-    password for the <literal>root</literal> user, e.g.
+     Cross fingers. If this fails due to a temporary problem (such as a network
+     issue while downloading binaries from the NixOS binary cache), you can
+     just re-run <command>nixos-install</command>. Otherwise, fix your
+     <filename>configuration.nix</filename> and then re-run
+     <command>nixos-install</command>.
+    </para>
+    <para>
+     As the last step, <command>nixos-install</command> will ask you to set the
+     password for the <literal>root</literal> user, e.g.
 <screen>
 setting root password...
 Enter new UNIX password: ***
-Retype new UNIX password: ***
-    </screen>
-    <note>
-     <para>
-      For unattended installations, it is possible to use
-      <command>nixos-install --no-root-passwd</command> in order to disable the
-      password prompt entirely.
-     </para>
-    </note>
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    If everything went well:
+Retype new UNIX password: ***</screen>
+     <note>
+      <para>
+       For unattended installations, it is possible to use
+       <command>nixos-install --no-root-passwd</command> in order to disable
+       the password prompt entirely.
+      </para>
+     </note>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If everything went well:
 <screen>
-        # reboot</screen>
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    You should now be able to boot into the installed NixOS. The GRUB boot menu
-    shows a list of <emphasis>available configurations</emphasis> (initially
-    just one). Every time you change the NixOS configuration (see
-    <link
+# reboot</screen>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     You should now be able to boot into the installed NixOS. The GRUB boot
+     menu shows a list of <emphasis>available configurations</emphasis>
+     (initially just one). Every time you change the NixOS configuration (see
+     <link
         linkend="sec-changing-config">Changing Configuration</link>
-    ), a new item is added to the menu. This allows you to easily roll back to
-    a previous configuration if something goes wrong.
-   </para>
-   <para>
-    You should log in and change the <literal>root</literal> password with
-    <command>passwd</command>.
-   </para>
-   <para>
-    You’ll probably want to create some user accounts as well, which can be
-    done with <command>useradd</command>:
+     ), a new item is added to the menu. This allows you to easily roll back to
+     a previous configuration if something goes wrong.
+    </para>
+    <para>
+     You should log in and change the <literal>root</literal> password with
+     <command>passwd</command>.
+    </para>
+    <para>
+     You’ll probably want to create some user accounts as well, which can be
+     done with <command>useradd</command>:
 <screen>
 $ useradd -c 'Eelco Dolstra' -m eelco
 $ passwd eelco</screen>
-   </para>
-   <para>
-    You may also want to install some software. For instance,
+    </para>
+    <para>
+     You may also want to install some software. For instance,
 <screen>
 $ nix-env -qa \*</screen>
-    shows what packages are available, and
+     shows what packages are available, and
 <screen>
 $ nix-env -i w3m</screen>
-    install the <literal>w3m</literal> browser.
-   </para>
-  </listitem>
- </orderedlist>
- <para>
-  To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence
-  of commands for installing NixOS on an empty hard drive (here
-  <filename>/dev/sda</filename>). <xref linkend="ex-config"
+     install the <literal>w3m</literal> browser.
+    </para>
+   </listitem>
+  </orderedlist>
+ </section>
+ <section xml:id="sec-installation-summary">
+  <title>Installation summary</title>
+
+  <para>
+   To summarise, <xref linkend="ex-install-sequence" /> shows a typical
+   sequence of commands for installing NixOS on an empty hard drive (here
+   <filename>/dev/sda</filename>). <xref linkend="ex-config"
 /> shows a
-  corresponding configuration Nix expression.
- </para>
- <example xml:id='ex-install-sequence'>
-  <title>Commands for Installing NixOS on <filename>/dev/sda</filename></title>
-<screen>
-# fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
--- for UEFI systems only
-> n      # <lineannotation>(create a new partition for /boot)</lineannotation>
-> 3      # <lineannotation>(make it a partition number 3)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
-> +512M  # <lineannotation>(the size of the UEFI boot partition)</lineannotation>
-> t      # <lineannotation>(change the partition type ...)</lineannotation>
-> 3      # <lineannotation>(... of the boot partition ...)</lineannotation>
-> 1      # <lineannotation>(... to 'UEFI System')</lineannotation>
--- for BIOS or UEFI systems
-> n      # <lineannotation>(create a new partition for /swap)</lineannotation>
-> 2      # <lineannotation>(make it a partition number 2)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
-> +8G    # <lineannotation>(the size of the swap partition)</lineannotation>
-> n      # <lineannotation>(create a new partition for /)</lineannotation>
-> 1      # <lineannotation>(make it a partition number 1)</lineannotation>
->        # <lineannotation>(press enter to accept the default)</lineannotation>
->        # <lineannotation>(press enter to accept the default and use the rest of the remaining space)</lineannotation>
-> a      # <lineannotation>(make the partition bootable)</lineannotation>
-> x      # <lineannotation>(enter expert mode)</lineannotation>
-> f      # <lineannotation>(fix up the partition ordering)</lineannotation>
-> r      # <lineannotation>(exit expert mode)</lineannotation>
-> w      # <lineannotation>(write the partition table to disk and exit)</lineannotation>
+   corresponding configuration Nix expression.
+  </para>
+
+  <example xml:id="ex-partition-scheme-MBR">
+   <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)</title>
+<screen language="commands">
+# parted /dev/sda -- mklabel msdos
+# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB
+# parted /dev/sda -- mkpart primary 8GiB -1s</screen>
+  </example>
+
+  <example xml:id="ex-partition-scheme-UEFI">
+   <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)</title>
+<screen language="commands">
+# parted /dev/sda -- mklabel gpt
+# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB
+# parted /dev/sda -- mkpart primary 8.5GiB -1MiB
+# parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+# parted /dev/sda -- set 3 boot on</screen>
+  </example>
+
+  <example xml:id="ex-install-sequence">
+   <title>Commands for Installing NixOS on <filename>/dev/sda</filename></title>
+   <para>
+    With a partitioned disk.
+<screen language="commands">
 # mkfs.ext4 -L nixos /dev/sda1
 # mkswap -L swap /dev/sda2
 # swapon /dev/sda2
@@ -416,9 +516,11 @@ $ nix-env -i w3m</screen>
 # nano /mnt/etc/nixos/configuration.nix
 # nixos-install
 # reboot</screen>
- </example>
- <example xml:id='ex-config'>
-  <title>NixOS Configuration</title>
+   </para>
+  </example>
+
+  <example xml:id='ex-config'>
+   <title>NixOS Configuration</title>
 <screen>
 { config, pkgs, ... }: {
   imports = [
@@ -438,10 +540,19 @@ $ nix-env -i w3m</screen>
   services.sshd.enable = true;
 }
   </screen>
- </example>
- <xi:include href="installing-usb.xml" />
- <xi:include href="installing-pxe.xml" />
- <xi:include href="installing-virtualbox-guest.xml" />
- <xi:include href="installing-from-other-distro.xml" />
- <xi:include href="installing-behind-a-proxy.xml" />
+  </example>
+ </section>
+ <section xml:id="sec-installation-additional-notes">
+  <title>Additional installation notes</title>
+
+  <xi:include href="installing-usb.xml" />
+
+  <xi:include href="installing-pxe.xml" />
+
+  <xi:include href="installing-virtualbox-guest.xml" />
+
+  <xi:include href="installing-from-other-distro.xml" />
+
+  <xi:include href="installing-behind-a-proxy.xml" />
+ </section>
 </chapter>

From 7b7186d07b1ceeee0763411ca855e7f2a374b19c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 4 Oct 2018 04:35:27 +0200
Subject: [PATCH 2400/3253] tambura: init at 1.0

---
 pkgs/applications/audio/tambura/default.nix | 34 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/audio/tambura/default.nix

diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix
new file mode 100644
index 000000000000..a739d72898e2
--- /dev/null
+++ b/pkgs/applications/audio/tambura/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+stdenv.mkDerivation rec {
+  pname = "Tambura";
+  name = "${pname}-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "olilarkin";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
+  };
+
+  buildInputs = [ faust2jaqt faust2lv2 ];
+
+  buildPhase = ''
+    faust2jaqt -vec -time -t 99999 ${pname}.dsp
+    faust2lv2 -vec -time -gui -t 99999 ${pname}.dsp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${pname} $out/bin/
+    mkdir -p $out/lib/lv2
+    cp -r ${pname}.lv2/ $out/lib/lv2
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre";
+    homepage = https://github.com/olilarkin/Tambura;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 827e430a7282..f8b7f1a57ecb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18929,6 +18929,8 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
+  tambura = callPackage ../applications/audio/tambura { };
+
   teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 

From a78390c1fa0a45f434d07346acf688c89b27c9a7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 3 Oct 2018 16:49:48 -0500
Subject: [PATCH 2401/3253] tetra-gtk-theme: 0.1.6 -> 0.2.0

"October changes"
---
 pkgs/misc/themes/tetra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/tetra/default.nix b/pkgs/misc/themes/tetra/default.nix
index bcaf67d79706..0d2ddb95166d 100644
--- a/pkgs/misc/themes/tetra/default.nix
+++ b/pkgs/misc/themes/tetra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tetra-gtk-theme-${version}";
-  version = "0.1.6";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner  = "hrdwrrsk";
     repo   = "tetra-gtk-theme";
     rev    = version;
-    sha256 = "0jdgj7ac9842cgrjnzdqlf1f3hlf9v7xk377pvqcz2lwcr1dfaxz";
+    sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd";
   };
 
   preBuild = ''

From ebdc294de8c35a1a9dbca1487d21b2350b0c2219 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 3 Oct 2018 23:45:54 -0400
Subject: [PATCH 2402/3253] linux: 4.9.130 -> 4.9.131

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 5c4bee036d86..cdd2c67d25b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.130";
+  version = "4.9.131";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zqaidirnr3v9xibp04rr2cjww3nd3phg28cgid0s8q0idm3xnv0";
+    sha256 = "0q2xmbkh42ikw26bdxgk1f9192hygyq9ffkhjfpr0fcx8sak5nsp";
   };
 } // (args.argsOverride or {}))

From f058c23b2476c445089a5b96d29085c4de4cca8b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 3 Oct 2018 23:46:03 -0400
Subject: [PATCH 2403/3253] linux: 4.14.73 -> 4.14.74

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 6c1740ea2e43..6755e8f90ee1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.73";
+  version = "4.14.74";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "07p3w3p8izgk1d0dblvn9ckk4ay10f40pqbwpzvpsi6c3ha3i7lr";
+    sha256 = "0wjw05brv7l1qpi38drc2z01sa7kpk3kadw36gx9cbvvzn4r3rkh";
   };
 } // (args.argsOverride or {}))

From 06961cccd08bf99fe757ad7162086e37b5b28bda Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 3 Oct 2018 23:46:13 -0400
Subject: [PATCH 2404/3253] linux: 4.18.11 -> 4.18.12

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 00e8a04f1b9d..aa936929a44c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.11";
+  version = "4.18.12";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "131chbsavavz2hnjyx1xjvsnxdcr0y02p054n9mdvxfalvsiklrn";
+    sha256 = "1icz2nkhkb1xhpmc9gxfhc3ywkni8nywk25ixrmgcxp5rgcmlsl4";
   };
 } // (args.argsOverride or {}))

From af910b2ffab2a6133329ad4db759f875937f6e5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 21:30:58 -0700
Subject: [PATCH 2405/3253] checkSSLCert: 1.72.0 -> 1.73.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/check_ssl_cert/versions
---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index ce9e2f8c40b2..b8649715eb37 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "check_ssl_cert-${version}";
-  version = "1.72.0";
+  version = "1.73.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    sha256 = "1125yffw0asxa3blcgg6gr8nvwc5jhxbqi0wak5w06svw8ka9wpr";
+    sha256 = "0ymaypsv1s5pmk8fg9d67khcjy5h7vjbg6hd1fgslp92qcw90dqa";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3768c3a62d4f7468c20302ecc28b5281b3e990b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 21:44:10 -0700
Subject: [PATCH 2406/3253] aubio: 0.4.6 -> 0.4.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/aubio/versions
---
 pkgs/development/libraries/aubio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index adcb86cedf84..8c8fe25f5000 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.6";
+  name = "aubio-0.4.7";
 
   src = fetchurl {
     url = "https://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx";
+    sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
   };
 
   nativeBuildInputs = [ pkgconfig python ];

From 269efba0aa269b5e6dfdd59da64c11b4b360ed5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 21:49:10 -0700
Subject: [PATCH 2407/3253] bowtie2: 2.3.4.2 -> 2.3.4.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bowtie2/versions
---
 pkgs/applications/science/biology/bowtie2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix
index 675c7d4eb0b4..73f70efc14d1 100644
--- a/pkgs/applications/science/biology/bowtie2/default.nix
+++ b/pkgs/applications/science/biology/bowtie2/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "bowtie2";
-  version = "2.3.4.2";
+  version = "2.3.4.3";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "BenLangmead";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1gsfaf7rjg4nwhs7vc1vf63xd5r5v1yq58w7x3barycplzbvixzz";
+    sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp";
   };
 
   buildInputs = [ zlib tbb ];

From 2bc0d8279c395ce801954255f1b994f0edda31d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 23:00:13 -0700
Subject: [PATCH 2408/3253] arangodb: 3.3.15 -> 3.3.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/arangodb/versions
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 72485d388a15..1f4876c11183 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.15";
+  version = "3.3.16";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "177n2l8k8fswxvz102n6lm0qsn0fvq0s2zx6skrfg4g7gil3wkyb";
+    sha256 = "0pw930ri5a0f1s6mhsbjc58lsmpy535f5wv2vcp8mzdx1rk3l091";
   };
 
   buildInputs = [

From f1e5eb571c97b90237de31c762b482feb375bb51 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 23:03:12 -0700
Subject: [PATCH 2409/3253] bfs: 1.2.3 -> 1.2.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bfs/versions
---
 pkgs/tools/system/bfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 56b7b26c7bd4..3734fefe60a2 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "bfs-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
+    sha256 = "0nxx2njjp04ik6msfmf07hprw0j88wg04m0q1sf17mhkliw2d78s";
   };
 
   postPatch = ''

From 38b284bd9821bf934f482138b5920d64337471d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 23:04:55 -0700
Subject: [PATCH 2410/3253] babeld: 1.8.2 -> 1.8.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/babeld/versions
---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 9c8f8d31c0cc..c65c59265b56 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.8.2";
+  name = "babeld-1.8.3";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87";
+    sha256 = "1gb6fcvi1cyl05sr9zhhasqlcbi927sbc2dns1jbnyz029lcb31n";
   };
 
   preBuild = ''

From bd51db9bf2e14e9ca1cfe069f49f1d539ac44407 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 23:13:39 -0700
Subject: [PATCH 2411/3253] bzflag: 2.4.14 -> 2.4.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bzflag/versions
---
 pkgs/games/bzflag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index e6d23cf1b9f0..c8618c13347d 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bzflag";
-  version = "2.4.14";
+  version = "2.4.16";
 
   src = fetchurl {
     url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
-    sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909";
+    sha256 = "00y2ifjgl4yz1pb2fgkg00vrfb6yk5cfxwjbx3fw2alnsaw6cqgg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e5c5eae9288ffe81dca1b8493cb34304811430ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 23:16:00 -0700
Subject: [PATCH 2412/3253] buildbot-worker: 1.3.0 -> 1.4.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buildbot-worker/versions
---
 pkgs/development/tools/build-managers/buildbot/worker.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index cffcb594a0d2..4fabad9d3701 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1l9iqyqn9yln6ln6dhfkngzx92a61v1cf5ahqj4ax663i02yq7fh";
+    sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

From e30a2b0207803730da54ecfeea3e519d0f937918 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 4 Oct 2018 15:34:04 +0900
Subject: [PATCH 2413/3253] khard: fixup zsh autocompletion

I introduced an error in, install -D will create the folders until the last component excluded
so I needed to add the filename for it to create _khard
https://github.com/NixOS/nixpkgs/pull/46515
---
 pkgs/applications/misc/khard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 35c3c9748492..8ec4e7f06d16 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -41,7 +41,7 @@ in with python.pkgs; buildPythonApplication rec {
   ];
 
   postInstall = ''
-    install -D misc/zsh/_khard $out/share/zsh/site-functions/
+    install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard
   '';
 
   # Fails; but there are no tests anyway.

From 0260116fe0b3a0f3d867f0ff718d76d9ae46a3c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 12:14:10 -0700
Subject: [PATCH 2414/3253] girara: 0.3.0 -> 0.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/girara/versions
---
 pkgs/applications/misc/girara/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index dc70747784cf..0dfeac3cf8b2 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
-    sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
+    sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext ];

From 365dad81f8468d9f5081111600055b9dfcff686b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 11:56:24 -0700
Subject: [PATCH 2415/3253] haproxy: 1.8.13 -> 1.8.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/haproxy/versions
---
 pkgs/tools/networking/haproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 8f72976d7dce..381489cc4360 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "1.8.13";
+  version = "1.8.14";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
-    sha256 = "2bf5dafbb5f1530c0e67ab63666565de948591f8e0ee2a1d3c84c45e738220f1";
+    sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi";
   };
 
   buildInputs = [ openssl zlib ]

From 06956fa9daa472ed112cf61ae77e40e8296a7104 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 3 Oct 2018 21:57:07 -0700
Subject: [PATCH 2416/3253] bubblewrap: 0.3.0 -> 0.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bubblewrap/versions
---
 pkgs/tools/admin/bubblewrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index a037a2e42aaa..c0c1e416b80f 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bubblewrap-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8";
+    sha256 = "1y2bdlxnlr84xcbf31lzirc292c5ak9bd2wvcvh4ppsliih6pjny";
   };
 
   nativeBuildInputs = [ libcap libxslt docbook_xsl ];

From c2e269ea05df3b427202ab3b3548226942a4694d Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 4 Oct 2018 10:12:57 +0200
Subject: [PATCH 2417/3253] emby: move lib to opt

---
 pkgs/servers/emby/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 1382e6ecdf2d..932d070577e6 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -32,14 +32,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -dm 755 "$out/lib/emby-server"
-    cp -r * "$out/lib/emby-server"
+    install -dm 755 "$out/opt/emby-server"
+    cp -r * "$out/opt/emby-server"
 
     makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         sqlite
       ]}" \
-      --add-flags "$out/lib/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
+      --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 
   meta =  with stdenv.lib; {

From 98238e58c879ea2e72c0f01e7d66878855ce4a5b Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 4 Oct 2018 10:34:55 +0200
Subject: [PATCH 2418/3253] yapf: 0.22.0 -> 0.24.0

---
 pkgs/development/python-modules/yapf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 3ed7fa640500..9c535d90e919 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.22.0";
+  version = "0.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63";
+    sha256 = "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf";
   };
 
   meta = with stdenv.lib; {

From 4569dd753b8d15d5a7f96febdb0eecf2af7f6302 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 4 Oct 2018 17:57:33 +0800
Subject: [PATCH 2419/3253] pykms: 20171224 -> 20180208

---
 pkgs/tools/networking/pykms/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index a0bac7854c1d..676f1d048554 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -31,13 +31,13 @@ let
 
 in buildPythonApplication rec {
   name = "pykms-${version}";
-  version = "20171224";
+  version = "20180208";
 
   src = fetchFromGitHub {
     owner  = "ThunderEX";
     repo   = "py-kms";
-    rev    = "885f67904f002042d7758e38f9c5426461c5cdc7";
-    sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha";
+    rev    = "a1666a0ee5b404569a234afd05b164accc9a8845";
+    sha256 = "17yj5n8byxp09l5zkap73hpphjy35px84wy68ps824w8l0l8kcd4";
   };
 
   propagatedBuildInputs = [ argparse pytz ];
@@ -61,8 +61,8 @@ in buildPythonApplication rec {
 
     mv * $siteDir
     for b in client server ; do
-      chmod 0755 $siteDir/$b.py
       makeWrapper ${python.interpreter} $out/bin/$b.py \
+        --argv0 $b \
         --add-flags $siteDir/$b.py
     done
 

From 2368d230b42ab10bcb858c9d5e68979ce2ad5beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 4 Oct 2018 13:43:16 +0200
Subject: [PATCH 2420/3253] lidarr: 0.3.1.471 -> 0.4.0.524

---
 pkgs/servers/lidarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix
index 3290d8ba1d1a..9bffb27665dd 100644
--- a/pkgs/servers/lidarr/default.nix
+++ b/pkgs/servers/lidarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lidarr-${version}";
-  version = "0.3.1.471";
+  version = "0.4.0.524";
 
   src = fetchurl {
     url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.develop.${version}.linux.tar.gz";
-    sha256 = "1x8q5yivkz8rwpkz0gdi73iaszb253bm1c3rdzar7xgrqr3g11nm";
+    sha256 = "121898v8n9sr9wwys65c28flpmk941wk6df11bb47pfjcalrr3bj";
   };
 
   buildInputs = [

From 914c341c6f2a35b03976042a50bea650e54d9e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 4 Oct 2018 13:49:33 +0200
Subject: [PATCH 2421/3253] jackett: 0.10.250 -> 0.10.258

---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index b85c9c9204ef..4c384c7b2b89 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.10.250";
+  version = "0.10.258";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0695r03cgmiwrsjrcippiibpcahxb55pma5a6plcfl1f8jxiwv76";
+    sha256 = "1wlg1spz2cxddaagjs6hv5fks3n1wwfm9jmih3rh1vq1rx8j1xnq";
   };
 
   buildInputs = [ makeWrapper ];

From 0b82df8dbe8540eb8a3acc7ff093ea872ae131a8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 4 Oct 2018 02:24:21 +0000
Subject: [PATCH 2422/3253] Convert entire mkl package to a fixed-output
 derivation

---
 .../libraries/science/math/mkl/default.nix    | 36 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 930dcd87a635..37814047f975 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -1,4 +1,20 @@
-{ stdenvNoCC, writeText, fetchurl, rpmextract, openmp, undmg }:
+{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }:
+/*
+  Some (but not all) mkl functions require openmp, but Intel does not add these
+  to SO_NEEDED and instructs users to put openmp on their LD_LIBRARY_PATH. If
+  you are using mkl and your library/application is using some of the functions
+  that require openmp, add a setupHook like this to your package:
+
+  setupHook = writeText "setup-hook.sh" ''
+    addOpenmp() {
+        addToSearchPath LD_LIBRARY_PATH ${openmp}/lib
+    }
+    addEnvHooks "$targetOffset" addOpenmp
+  '';
+
+  We do not add the setup hook here, because avoiding it allows this large
+  package to be a fixed-output derivation with better cache efficiency.
+ */
 
 stdenvNoCC.mkDerivation rec {
   name = "mkl-${version}";
@@ -19,7 +35,6 @@ stdenvNoCC.mkDerivation rec {
       });
 
   buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ];
-  propagatedBuildInputs = [ openmp ];
 
   buildPhase = if stdenvNoCC.isDarwin then ''
       for f in Contents/Resources/pkg/*.tgz; do
@@ -28,7 +43,7 @@ stdenvNoCC.mkDerivation rec {
   '' else ''
     rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
     rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
-  '' ;
+  '';
 
   installPhase = if stdenvNoCC.isDarwin then ''
       mkdir -p $out/lib
@@ -46,14 +61,13 @@ stdenvNoCC.mkDerivation rec {
   dontStrip = true;
   dontPatchELF = true;
 
-  # Some mkl calls require openmp, but Intel does not add these to SO_NEEDED and
-  # instructs users to put openmp on their LD_LIBRARY_PATH.
-  setupHook = writeText "setup-hook.sh" ''
-    addOpenmp() {
-        addToSearchPath LD_LIBRARY_PATH ${openmp}/lib
-    }
-    addEnvHooks "$targetOffset" addOpenmp
-  '';
+  # Since these are unmodified binaries from Intel, they do not depend on stdenv
+  # and we can make them fixed-output derivations for cache efficiency.
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = if stdenvNoCC.isDarwin
+    then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12"
+    else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx";
 
   meta = with stdenvNoCC.lib; {
     description = "Intel Math Kernel Library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9eb92364af2..cba1fa778d68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20858,9 +20858,7 @@ with pkgs;
 
   m4rie = callPackage ../development/libraries/science/math/m4rie { };
 
-  mkl = callPackage ../development/libraries/science/math/mkl {
-    inherit (llvmPackages) openmp;
-  };
+  mkl = callPackage ../development/libraries/science/math/mkl { };
 
   nasc = callPackage ../applications/science/math/nasc { };
 

From e4f4e9fd1d05675be29149d5ac7ea4e12d7efe19 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 4 Oct 2018 15:21:24 +0200
Subject: [PATCH 2423/3253] terraform-providers.matchbox: init at 0.2.2
 (#47863)

---
 .../networking/cluster/terraform-providers/data.nix        | 7 +++++++
 .../networking/cluster/terraform-providers/providers.txt   | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index fead9af601f7..261d067eb1d0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -609,6 +609,13 @@
       version = "1.8.1";
       sha256  = "0y6n7mvv1f3jqsxlvf68iq85k69fj7a333203vkvc83dba84aqki";
     };
+  matchbox =
+    {
+      owner   = "coreos";
+      repo    = "terraform-provider-matchbox";
+      version = "0.2.2";
+      sha256  = "07lzslbl41i3h84bpsmxhvchm5kqk87yzin2yvpbq0m3m7r2f547";
+    };
   nixos =
     {
       owner   = "tweag";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index d0c4a6505981..16305b4b90c6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -9,5 +9,8 @@
 # include all terraform-providers
 terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\)
 
+# include terraform-provider-matchbox
+coreos/terraform-provider-matchbox
+
 # include terraform-provider-nixos
 tweag/terraform-provider-nixos

From 9d49cf1808d1cf90a0f9bc958163dffcb2a746de Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 4 Oct 2018 16:10:47 +0200
Subject: [PATCH 2424/3253] elvish: provide the compiled version

Without this fix, `elvish -version` displays "unknown"
---
 pkgs/shells/elvish/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index dc7133e988fa..0b7b934646e2 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -6,6 +6,10 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/elves/elvish";
   excludedPackages = [ "website" ];
+  buildFlagsArray = ''
+    -ldflags=
+      -X ${goPackagePath}/buildinfo.Version=${version}
+  '';
 
   src = fetchFromGitHub {
     repo = "elvish";

From 0a7e258012b60cbe530a756f09a4f2516786d370 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 4 Oct 2018 16:33:00 +0200
Subject: [PATCH 2425/3253] elan: 0.5.0 -> 0.7.1

---
 pkgs/applications/science/logic/elan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 2b7cb9c30fae..f0b912c57fc5 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
-  version = "0.5.0";
+  version = "0.7.1";
 
-  cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
+  cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1";
 
   src = fetchFromGitHub {
     owner = "kha";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
+    sha256 = "0x5s1wm78yx5ci63wrmlkzm6k3281p33gn4dzw25k5s4vx0p9n24";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From de93b32f902fef6243af2edcf9b2d1c28763f9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Oct 2018 16:52:17 +0200
Subject: [PATCH 2426/3253] nixos-option: fix #47722 when missing
 ~/.nix-defexpr/channels

The problem was that the non-fatal warning was not omitted
from the output when constructing a nix expression.
Now it seems OK for me.  When return code is OK,
the warnings don't get passed anywhere, but I expect
that won't matter for this utility.  Fatal errors are still shown.
---
 nixos/modules/installer/tools/nixos-option.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 3f1e591b97b0..327e3e6989f7 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -82,7 +82,7 @@ evalNix(){
   set -e
 
   if test $exit_code -eq 0; then
-      cat <<EOF
+      sed '/^warning: Nix search path/d' <<EOF
 $result
 EOF
       return 0;
@@ -90,7 +90,7 @@ EOF
       sed -n '
   /^error/ { s/, at (string):[0-9]*:[0-9]*//; p; };
   /^warning: Nix search path/ { p; };
-' <<EOF
+' >&2 <<EOF
 $result
 EOF
     exit_code=1

From ce4072c662a651d62400bda2a05890fd16ba2fce Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Thu, 4 Oct 2018 17:12:52 +0200
Subject: [PATCH 2427/3253] nodePackages.webtorrent-cli: add node-gyp
 dependency, fixes build

---
 pkgs/development/node-packages/default-v8.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 49313eb16a79..020992c86844 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -107,4 +107,8 @@ nodePackages // {
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   };
 
+  webtorrent-cli = nodePackages.webtorrent-cli.override {
+    buildInputs = [ nodePackages.node-gyp-build ];
+  };
+
 }

From 7de7358ed1c1c253a357d8eb117eff560a6721b7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 4 Oct 2018 07:28:19 -0500
Subject: [PATCH 2428/3253] libinput: 0.12.0 -> 0.12.1

---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 4c85971cc3ce..e2d7d09b259c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m";
+    sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 6ffb60c4648b7ce154019d583c26bcd6479676b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 4 Oct 2018 18:17:39 +0200
Subject: [PATCH 2429/3253] i2pd: 2.20.0 -> 2.21.0

---
 pkgs/tools/networking/i2pd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 3920405fe4d1..9ecf69637872 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "182iwfaz9ar18pqknrg60w89iinj91rn2651yaz2ap77h2a2psvf";
+    sha256 = "02zsig63cambwm479ckw4kl1dk00g1q2sbzsvn9vy1xpjy928n7v";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]

From b839b25551c2a7469399a4dbe03b54dd9c17d45f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 9 Sep 2018 02:00:18 +0300
Subject: [PATCH 2430/3253] wine: 3.14 -> 3.15

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 1a257518e728..27f9d40277b4 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.14";
+    version = "3.15";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7";
+    sha256 = "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0h6gck0p92hin0m13q1hnlfnqs4vy474w66ppinvqms2zn3vibgi";
+    sha256 = "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 3b67c0b2434ff8cf4d4e1625776620eaeba23555 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 4 Oct 2018 21:04:02 +0300
Subject: [PATCH 2431/3253] wineUnstable: 3.15 -> 3.17

Staging updated as well
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 27f9d40277b4..c2665353a390 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.15";
+    version = "3.17";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic";
+    sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n";
+    sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 570b9bab252bdf316e1029def98ad30b3ae18ae0 Mon Sep 17 00:00:00 2001
From: Notkea <pacien@users.noreply.github.com>
Date: Thu, 4 Oct 2018 20:30:48 +0200
Subject: [PATCH 2432/3253] matrix-synapse: 0.33.5 -> 0.33.6

---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 8cb93c209de1..dab58d2edd6b 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in python2Packages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.33.5";
+  version = "0.33.6";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0m8pyh27cxz761wiwspj6w5dqxpm683nlrjn40fsrgf1sgiprgl6";
+    sha256 = "0c1dr09f1msv6xvpmdlncx7yyj6qxnpihd93lqckd115fds12g5h";
   };
 
   patches = [

From 9fe857de7d1c77156da1a83276f29e3a5c9a9140 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 4 Oct 2018 22:01:06 +0300
Subject: [PATCH 2433/3253] iwd: 0.8 -> 0.9

---
 pkgs/os-specific/linux/iwd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 1e3286f64d68..f30eac588a2f 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.10";
-     sha256 = "1yzbx4l3a6hbdmirgbvnrjfiwflyzd38mbxnp23gn9hg3ni3br34";
+     rev = "0.11";
+     sha256 = "0nifa5w6fxy7cagyas2a0zhcppi83yrcsnnp70ls2rc90x4r1ip8";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "0bx31f77mz3rbl3xja48lb5zgwgialg7hvax889kpkz92wg26mgv";
+    sha256 = "1l1jbwsshjbz32s4rf0zfcn3fd16si4y9qa0zaxp00bfzflnpcd4";
   };
 
   nativeBuildInputs = [

From 2c3fff00fc744202d1941c13c5e1f80920c9a3f2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 4 Oct 2018 20:58:12 +0200
Subject: [PATCH 2434/3253] androidStudioPackages.{dev,canary}: 3.3.0.11 ->
 3.3.0.12

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 682c1c0a6e7e..051078e1f5a1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -14,9 +14,9 @@ let
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev
-    version = "3.3.0.11"; # "Android Studio 3.3 Canary 12"
-    build = "182.5026711";
-    sha256Hash = "0k1f8yw3gdil78iqxlwhbz71w1307hwwf8z9m7hs0v9b4ri6x2wk";
+    version = "3.3.0.12"; # "Android Studio 3.3 Canary 13"
+    build = "182.5035453";
+    sha256Hash = "0f2glxm41ci016dv9ygr12s72lc5mh0zsxhpmx0xswg9mdwrvwa7";
   };
 in rec {
   # Old alias

From 07ace1d24e42fae33fa76ff135072f7c5989ab8d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 4 Oct 2018 12:44:03 -0700
Subject: [PATCH 2435/3253] kubernetes-helm: 2.10.0 -> 2.11.0

* kubernetes-helm: 2.10.0 -> 2.11.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/helm/versions

* kubernetes-helm: 2.10.0 -> 2.11.0 (fix darwin hash)
---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index bd00404b536b..72ab44e1934a 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
-             else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
+             then "18bk4zqdxdrdcl34qay5mpzzywy9srmpz3mm91l0za6nhqapb902"
+             else "03xb73769awc6dpvz86nqm9fbgp3yrw30kf5lphf76klk2ii66sm";
   pname = "helm";
-  version = "2.10.0";
+  version = "2.11.0";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From d4ff6cae34eddbd500009763232f427579ef4481 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 4 Oct 2018 22:41:19 +0200
Subject: [PATCH 2436/3253] terraform: add plugins tests (#47861)

I wasn't sure if the plugins were downloaded from the Internet or not.
This makes sure that there is no regression in the plugin detection.
---
 .../networking/cluster/terraform/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 767eb94454d8..a4ffe27102a6 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -4,6 +4,8 @@
 , buildGoPackage
 , fetchFromGitHub
 , makeWrapper
+, runCommand
+, writeText
 , terraform-providers
 }:
 
@@ -118,4 +120,25 @@ in rec {
   });
 
   terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;
+
+  # Tests that the plugins are being used. Terraform looks at the specific
+  # file pattern and if the plugin is not found it will try to download it
+  # from the Internet. With sandboxing enable this test will fail if that is
+  # the case.
+  terraform_plugins_test = let
+    mainTf = writeText "main.tf" ''
+      resource "random_id" "test" {}
+    '';
+    terraform = terraform_0_11.withPlugins (p: [ p.random ]);
+    test = runCommand "terraform-plugin-test" { buildInputs = [terraform]; }
+      ''
+        set -e
+        # make it fail outside of sandbox
+        export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
+        cp ${mainTf} main.tf
+        terraform init
+        touch $out
+      '';
+  in test;
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e808b70fb41e..77c4e3972bef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22162,6 +22162,7 @@ with pkgs;
     terraform_0_10-full
     terraform_0_11
     terraform_0_11-full
+    terraform_plugins_test
     ;
 
   terraform = terraform_0_11;

From 78b9ab0713227419814504e367f2736e92940a62 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Tue, 2 Oct 2018 15:56:42 -0700
Subject: [PATCH 2437/3253] kubeval: init at 0.7.3

---
 .../networking/cluster/kubeval/default.nix    |  48 +++++
 .../networking/cluster/kubeval/deps.nix       | 174 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 224 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubeval/default.nix
 create mode 100644 pkgs/applications/networking/cluster/kubeval/deps.nix

diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
new file mode 100644
index 000000000000..55a827f9cf92
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub, buildGoPackage, makeWrapper }:
+
+let
+
+  # Cache schema as a package so network calls are not
+  # necessary at runtime, allowing use in package builds
+  schema = stdenv.mkDerivation rec {
+    name = "kubeval-schema";
+    src = fetchFromGitHub {
+      owner = "garethr";
+      repo = "kubernetes-json-schema";
+      rev = "c7672fd48e1421f0060dd54b6620baa2ab7224ba";
+      sha256 = "0picr3wvjx4qv158jy4f60pl225rm4mh0l97pf8nqi9h9x4x888p";
+    };
+
+    installPhase = ''
+      mkdir -p $out/kubernetes-json-schema/master
+      cp -R . $out/kubernetes-json-schema/master
+    '';
+   };
+
+in
+
+buildGoPackage rec {
+  name = "kubeval-${version}";
+  version = "0.7.3";
+
+  goPackagePath = "github.com/garethr/kubeval";
+  src = fetchFromGitHub {
+    owner = "garethr";
+    repo = "kubeval";
+    rev = version;
+    sha256 = "042v4mc5p80vmk56wp6aw89yiibjnfqn79c0zcd6y179br4gpfnb";
+  };
+  goDeps = ./deps.nix;
+
+  buildInputs = [ makeWrapper ];
+
+  postFixup = "wrapProgram $bin/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}";
+
+  meta = with lib; {
+    description = "Validate your Kubernetes configuration files";
+    homepage = https://github.com/garethr/kubeval;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nicknovitski ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/kubeval/deps.nix b/pkgs/applications/networking/cluster/kubeval/deps.nix
new file mode 100644
index 000000000000..b9565e927ded
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubeval/deps.nix
@@ -0,0 +1,174 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-multierror";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-multierror";
+      rev = "b7773ae218740a7be65057fc60b366a49b538a44";
+      sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "787d034dfe70e44075ccc060d346146ef53270ad";
+      sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "8965335b8c7107321228e3e3702cab9832751bac";
+      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
+      sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+      sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
+      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
+      sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonpointer";
+      rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
+      sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonreference";
+      rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
+      sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
+    };
+  }
+  {
+    goPackagePath = "github.com/xeipuuv/gojsonschema";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xeipuuv/gojsonschema";
+      rev = "9ff6d6c47f3f5de55acc6f464d6e3719b02818ae";
+      sha256 = "0rpkya4lnpv9g33bs0z3vd5dlnadkyq1lg7114nbd73vm878s6sw";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15";
+      sha256 = "1a6x6n1fk5k013w5r4b0bxws1d2fh0s69mbzpi1vkyfpcxabwjhj";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6253c9331276..148cba00c1e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17361,6 +17361,8 @@ with pkgs;
 
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 
+  kubeval = callPackage ../applications/networking/cluster/kubeval { };
+
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {  };
 
   kubectl = (kubernetes.override { components = [ "cmd/kubectl" ]; }).overrideAttrs(oldAttrs: {

From 1bb4b16b3b150ba67d0afd44c058a735b125de98 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Thu, 4 Oct 2018 23:50:15 +0200
Subject: [PATCH 2438/3253] GRV: Fix typos in description

---
 .../version-management/git-and-tools/grv/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 3b4e3a452111..962ddf98d6ce 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -21,7 +21,7 @@ buildGo19Package {
   buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
 
   meta = with stdenv.lib; {
-    description = " GRV is a terminal interface for viewing git repositories";
+    description = "GRV is a terminal interface for viewing Git repositories";
     homepage = https://github.com/rgburke/grv;
     license = licenses.gpl3;
     platforms = platforms.unix;

From f14c0b4610b1560807a2aedc99cca6cde2622e1e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 3 Oct 2018 01:30:23 +0200
Subject: [PATCH 2439/3253] lsp-plugins: init at 1.1.4

---
 .../audio/lsp-plugins/default.nix             | 160 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 162 insertions(+)
 create mode 100644 pkgs/applications/audio/lsp-plugins/default.nix

diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
new file mode 100644
index 000000000000..d567dc584d8b
--- /dev/null
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -0,0 +1,160 @@
+{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
+, libsndfile, jack2Full
+, libGLU, libGL, lv2, cairo
+, ladspaH, php, expat }:
+
+stdenv.mkDerivation rec {
+  pname = "lsp-plugins";
+  version = "1.1.4";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "sadko4u";
+    repo = "${pname}";
+    rev = "${name}";
+    sha256 = "0vb8ax0w4d2a153wxrhkpi21fxsv7c24k57vhfgmm1lqwv6pbl69";
+  };
+
+  nativeBuildInputs = [ pkgconfig php expat ];
+  buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH makeWrapper ];
+
+  makeFlags = [
+    "BIN_PATH=$(out)/bin"
+    "LIB_PATH=$(out)/lib"
+    "DOC_PATH=$(out)/share/doc"
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ];
+
+  patchPhase = ''
+    runHook prePatch
+    substituteInPlace Makefile --replace "/usr/lib" "$out/lib"
+    substituteInPlace ./include/container/jack/main.h --replace "/usr/lib" "$out/lib"
+    substituteInPlace ./include/container/vst/main.h --replace "/usr/lib" "$out/lib"
+    # for https://github.com/sadko4u/lsp-plugins/issues/7#issuecomment-426561549 :
+    sed -i '/X11__NET_WM_WINDOW_TYPE_DOCK;/d' ./src/ui/ws/x11/X11Window.cpp
+    runHook postPatch
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    TEST_PATH=$(pwd)".build-test"
+    make OBJDIR=$TEST_PATH test
+    $TEST_PATH/lsp-plugins-test utest
+    runHook postCheck
+  '';
+
+  buildFlags = "release";
+
+  meta = with stdenv.lib;
+    { description = "Collection of open-source audio plugins";
+      longDescription = ''
+        Compatible with follwing formats:
+
+        - LADSPA - set of plugins for Linux Audio Developer's Simple Plugin API
+        - LV2 - set of plugins and UIs for Linux Audio Developer's Simple Plugin API (LADSPA) version 2
+        - LinuxVST - set of plugins and UIs for Steinberg's VST 2.4 format ported on GNU/Linux Platform
+        - JACK - Standalone versions for JACK Audio connection Kit with UI
+
+        Contains the following plugins:
+
+        - Limiter Mono - Begrenzer Mono
+        - Limiter Stereo - Begrenzer Stereo
+        - Dynamic Processor LeftRight - Dynamikprozessor LeftRight
+        - Dynamic Processor MidSide - Dynamikprozessor MidSide
+        - Dynamic Processor Mono - Dynamikprozessor Mono
+        - Dynamic Processor Stereo - Dynamikprozessor Stereo
+        - Expander LeftRight - Expander LeftRight
+        - Expander MidSide - Expander MidSide
+        - Expander Mono - Expander Mono
+        - Expander Stereo - Expander Stereo
+        - Gate LeftRight - Gate LeftRight
+        - Gate MidSide - Gate MidSide
+        - Gate Mono - Gate Mono
+        - Gate Stereo - Gate Stereo
+        - Graphic Equalizer x16 LeftRight - Grafischer Entzerrer x16 LeftRight
+        - Graphic Equalizer x16 MidSide - Grafischer Entzerrer x16 MidSide
+        - Graphic Equalizer x16 Mono - Grafischer Entzerrer x16 Mono
+        - Graphic Equalizer x16 Stereo - Grafischer Entzerrer x16 Stereo
+        - Graphic Equalizer x32 LeftRight - Grafischer Entzerrer x32 LeftRight
+        - Graphic Equalizer x32 MidSide - Grafischer Entzerrer x32 MidSide
+        - Graphic Equalizer x32 Mono - Grafischer Entzerrer x32 Mono
+        - Graphic Equalizer x32 Stereo - Grafischer Entzerrer x32 Stereo
+        - Impulse Responses Mono - Impulsantworten Mono
+        - Impulse Responses Stereo - Impulsantworten Stereo
+        - Impulse Reverb Mono - Impulsnachhall Mono
+        - Impulse Reverb Stereo - Impulsnachhall Stereo
+        - Sampler Mono - Klangerzeuger Mono
+        - Sampler Stereo - Klangerzeuger Stereo
+        - Compressor LeftRight - Kompressor LeftRight
+        - Compressor MidSide - Kompressor MidSide
+        - Compressor Mono - Kompressor Mono
+        - Compressor Stereo - Kompressor Stereo
+        - Latency Meter - Latenzmessgerät
+        - Multiband Compressor LeftRight x8 - Multi-band Kompressor LeftRight x8
+        - Multiband Compressor MidSide x8 - Multi-band Kompressor MidSide x8
+        - Multiband Compressor Mono x8 - Multi-band Kompressor Mono x8
+        - Multiband Compressor Stereo x8 - Multi-band Kompressor Stereo x8
+        - Oscillator Mono - Oszillator Mono
+        - Parametric Equalizer x16 LeftRight - Parametrischer Entzerrer x16 LeftRight
+        - Parametric Equalizer x16 MidSide - Parametrischer Entzerrer x16 MidSide
+        - Parametric Equalizer x16 Mono - Parametrischer Entzerrer x16 Mono
+        - Parametric Equalizer x16 Stereo - Parametrischer Entzerrer x16 Stereo
+        - Parametric Equalizer x32 LeftRight - Parametrischer Entzerrer x32 LeftRight
+        - Parametric Equalizer x32 MidSide - Parametrischer Entzerrer x32 MidSide
+        - Parametric Equalizer x32 Mono - Parametrischer Entzerrer x32 Mono
+        - Parametric Equalizer x32 Stereo - Parametrischer Entzerrer x32 Stereo
+        - Phase Detector - Phasendetektor
+        - Profiler Mono - Profiler Mono
+        - Multi-Sampler x12 DirectOut - Schlagzeug x12 Direktausgabe
+        - Multi-Sampler x12 Stereo - Schlagzeug x12 Stereo
+        - Multi-Sampler x24 DirectOut - Schlagzeug x24 Direktausgabe
+        - Multi-Sampler x24 Stereo - Schlagzeug x24 Stereo
+        - Multi-Sampler x48 DirectOut - Schlagzeug x48 Direktausgabe
+        - Multi-Sampler x48 Stereo - Schlagzeug x48 Stereo
+        - Sidechain Multiband Compressor LeftRight x8 - Sidechain Multi-band Kompressor LeftRight x8
+        - Sidechain Multiband Compressor MidSide x8 - Sidechain Multi-band Kompressor MidSide x8
+        - Sidechain Multiband Compressor Mono x8 - Sidechain Multi-band Kompressor Mono x8
+        - Sidechain Multiband Compressor Stereo x8 - Sidechain Multi-band Kompressor Stereo x8
+        - Sidechain Limiter Mono - Sidechain-Begrenzer Mono
+        - Sidechain Limiter Stereo - Sidechain-Begrenzer Stereo
+        - Sidechain Dynamic Processor LeftRight - Sidechain-Dynamikprozessor LeftRight
+        - Sidechain Dynamic Processor MidSide - Sidechain-Dynamikprozessor MidSide
+        - Sidechain Dynamic Processor Mono - Sidechain-Dynamikprozessor Mono
+        - Sidechain Dynamic Processor Stereo - Sidechain-Dynamikprozessor Stereo
+        - Sidechain Expander LeftRight - Sidechain-Expander LeftRight
+        - Sidechain Expander MidSide - Sidechain-Expander MidSide
+        - Sidechain Expander Mono - Sidechain-Expander Mono
+        - Sidechain Expander Stereo - Sidechain-Expander Stereo
+        - Sidechain Gate LeftRight - Sidechain-Gate LeftRight
+        - Sidechain Gate MidSide - Sidechain-Gate MidSide
+        - Sidechain Gate Mono - Sidechain-Gate Mono
+        - Sidechain Gate Stereo - Sidechain-Gate Stereo
+        - Sidechain Compressor LeftRight - Sidechain-Kompressor LeftRight
+        - Sidechain Compressor MidSide - Sidechain-Kompressor MidSide
+        - Sidechain Compressor Mono - Sidechain-Kompressor Mono
+        - Sidechain Compressor Stereo - Sidechain-Kompressor Stereo
+        - Slapback Delay Mono - Slapback-Delay Mono
+        - Slapback Delay Stereo - Slapback-Delay Stereo
+        - Spectrum Analyzer x1 - Spektrumanalysator x1
+        - Spectrum Analyzer x12 - Spektrumanalysator x12
+        - Spectrum Analyzer x16 - Spektrumanalysator x16
+        - Spectrum Analyzer x2 - Spektrumanalysator x2
+        - Spectrum Analyzer x4 - Spektrumanalysator x4
+        - Spectrum Analyzer x8 - Spektrumanalysator x8
+        - Trigger MIDI Mono - Triggersensor MIDI Mono
+        - Trigger MIDI Stereo - Triggersensor MIDI Stereo
+        - Trigger Mono - Triggersensor Mono
+        - Trigger Stereo - Triggersensor Stereo
+        - Delay Compensator Mono - Verzögerungsausgleicher Mono
+        - Delay Compensator Stereo - Verzögerungsausgleicher Stereo
+        - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo
+      '';
+      homepage = http://lsp-plug.in;
+      maintainers = with maintainers; [ magnetophon ];
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee96d4424db2..b4aafaedd26e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17498,6 +17498,8 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
+  lsp-plugins = callPackage ../applications/audio/lsp-plugins { };
+
   luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };

From 1bc29400c665acf77b628f7fe1d076225e4ae478 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 5 Oct 2018 01:03:53 +0200
Subject: [PATCH 2440/3253] FIL-plugins: init at 0.3.0

---
 .../audio/FIL-plugins/default.nix             | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/audio/FIL-plugins/default.nix

diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix
new file mode 100644
index 000000000000..b9322c37df00
--- /dev/null
+++ b/pkgs/applications/audio/FIL-plugins/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, ladspaH
+}:
+
+stdenv.mkDerivation rec {
+  name = "FIL-plugins-${version}";
+  version = "0.3.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1scfv9j7jrp50r565haa4rvxn1vk2ss86xssl5qgcr8r45qz42qw";
+  };
+
+  buildInputs = [ ladspaH ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/install@install@g' Makefile
+    sed -i 's@/bin/rm@rm@g' Makefile
+    sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile
+  '';
+
+  preInstall="mkdir -p $out/lib/ladspa";
+
+  meta = {
+    description = ''a four-band parametric equaliser, which has the nice property of being stable even while parameters are being changed'';
+    longDescription = ''
+      Each section has an active/bypass switch, frequency, bandwidth and gain controls.
+      There is also a global bypass switch and gain control.
+      The 2nd order resonant filters are implemented using a Mitra-Regalia style lattice filter.
+      All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises.
+      This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use.
+    '';
+    version = "${version}";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77c4e3972bef..072b873d703e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16424,6 +16424,8 @@ with pkgs;
 
   fig2dev = callPackage ../applications/graphics/fig2dev { };
 
+  FIL-plugins = callPackage ../applications/audio/FIL-plugins { };
+
   flacon = callPackage ../applications/audio/flacon { };
 
   flexget = callPackage ../applications/networking/flexget { };

From 959435e83576141f0e0ad35f49c3b89bd091caa5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 5 Oct 2018 00:40:30 +0200
Subject: [PATCH 2441/3253] =?UTF-8?q?networkmanager-openvpn:=201.8.4=20?=
 =?UTF-8?q?=E2=86=92=201.8.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/network-manager/openvpn/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 66a306ffb66c..d911acc58f4d 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, networkmanager, libsecret
+{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
 , withGnome ? true, gnome3, kmod }:
 
 let
   pname = "NetworkManager-openvpn";
-  version = "1.8.4";
+  version = "1.8.6";
 in stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr";
+    sha256 = "1ksij9438f2lrwkg287qjlfaxja6jgmqxqap96585r3nf5zj69ch";
   };
 
   patches = [
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [ openvpn networkmanager ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret gnome3.networkmanagerapplet ];
 
-  nativeBuildInputs = [ intltool pkgconfig libxml2 ];
+  nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
 
   configureFlags = [
     "--without-libnm-glib"

From 9db0207496cc0ba7534890230b79f1353e5c4785 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 1 Oct 2018 01:56:38 +0200
Subject: [PATCH 2442/3253] gnome3: remove version attribute

It was used by some themes in the past, but it broke them whenever GNOME
was updated, so it should not be used anymore.
---
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 2 +-
 pkgs/desktops/gnome-3/default.nix                      | 1 -
 pkgs/misc/themes/materia-theme/default.nix             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 1938c90a8254..24bf5dc33654 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
 
   meta = with stdenv.lib; {
-    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+    homepage = https://help.gnome.org/users/gnome-help/;
     description = "User and system administration help for the GNOME desktop";
     maintainers = gnome3.maintainers;
     license = licenses.cc-by-30;
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5112f8b496f5..0f9108465b14 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -7,7 +7,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   updateScript = callPackage ./update.nix { };
 
-  version = "3.26";
   maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
 
   corePackages = with gnome3; [
diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 0dd490a35b59..c486d8462ce6 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     patchShebangs install.sh
     sed -i install.sh \
       -e "s|if .*which gnome-shell.*;|if true;|" \
-      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
     mkdir -p $out/share/themes
     ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING

From df48060e4cde381842e943cf36831de02e290576 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 4 Oct 2018 17:13:02 -0700
Subject: [PATCH 2443/3253] coqPackages.coq-haskell: Support building with Coq
 8.8

---
 pkgs/development/coq-modules/coq-haskell/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index 9d9a4cb5f1a1..cbfd79fdd272 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -19,6 +19,12 @@ let params =
       rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
       sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
     };
+
+    "8.8" = {
+      version = "20171215";
+      rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+      sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+    };
   };
   param = params."${coq.coq-version}";
 in

From 5cc18c47813d215c5e198a00f449075df0886f82 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 5 Oct 2018 02:12:11 +0200
Subject: [PATCH 2444/3253] gnome3: remove versionBranch attribute

Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
---
 pkgs/applications/audio/easytag/default.nix                | 2 +-
 pkgs/applications/audio/rhythmbox/default.nix              | 2 +-
 pkgs/applications/audio/sound-juicer/default.nix           | 2 +-
 pkgs/applications/editors/gnome-builder/default.nix        | 2 +-
 pkgs/applications/graphics/shotwell/default.nix            | 2 +-
 pkgs/applications/misc/gnome-usage/default.nix             | 2 +-
 pkgs/applications/misc/orca/default.nix                    | 7 +++----
 pkgs/applications/version-management/meld/default.nix      | 2 +-
 pkgs/applications/video/pitivi/default.nix                 | 2 +-
 pkgs/data/fonts/cantarell-fonts/default.nix                | 2 +-
 pkgs/desktops/gnome-3/apps/accerciser/default.nix          | 2 +-
 pkgs/desktops/gnome-3/apps/bijiben/default.nix             | 2 +-
 pkgs/desktops/gnome-3/apps/cheese/default.nix              | 2 +-
 pkgs/desktops/gnome-3/apps/evolution/default.nix           | 2 +-
 pkgs/desktops/gnome-3/apps/file-roller/default.nix         | 2 +-
 pkgs/desktops/gnome-3/apps/gedit/default.nix               | 2 +-
 pkgs/desktops/gnome-3/apps/ghex/default.nix                | 2 +-
 pkgs/desktops/gnome-3/apps/glade/default.nix               | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix         | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix      | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix    | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix        | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix     | 2 +-
 .../gnome-3/apps/gnome-getting-started-docs/default.nix    | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix          | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix          | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix         | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix        | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix | 2 +-
 .../desktops/gnome-3/apps/gnome-sound-recorder/default.nix | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-todo/default.nix          | 2 +-
 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix       | 2 +-
 pkgs/desktops/gnome-3/apps/polari/default.nix              | 2 +-
 pkgs/desktops/gnome-3/apps/seahorse/default.nix            | 2 +-
 pkgs/desktops/gnome-3/apps/vinagre/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix  | 2 +-
 pkgs/desktops/gnome-3/core/baobab/default.nix              | 2 +-
 pkgs/desktops/gnome-3/core/caribou/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix        | 2 +-
 pkgs/desktops/gnome-3/core/dconf/default.nix               | 2 +-
 pkgs/desktops/gnome-3/core/empathy/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/eog/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/epiphany/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/evince/default.nix              | 2 +-
 .../gnome-3/core/evolution-data-server/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/folks/default.nix               | 2 +-
 pkgs/desktops/gnome-3/core/gcr/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/gdm/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/geocode-glib/default.nix        | 2 +-
 pkgs/desktops/gnome-3/core/gjs/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix   | 2 +-
 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix    | 2 +-
 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix | 2 +-
 pkgs/desktops/gnome-3/core/gnome-common/default.nix        | 2 +-
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix      | 2 +-
 .../desktops/gnome-3/core/gnome-control-center/default.nix | 2 +-
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix       | 2 +-
 pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix    | 2 +-
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix  | 2 +-
 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix   | 2 +-
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix       | 2 +-
 .../gnome-3/core/gnome-online-accounts/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix | 2 +-
 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix    | 2 +-
 pkgs/desktops/gnome-3/core/gnome-session/default.nix       | 2 +-
 .../gnome-3/core/gnome-settings-daemon/default.nix         | 2 +-
 .../gnome-3/core/gnome-shell-extensions/default.nix        | 2 +-
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/gnome-software/default.nix      | 2 +-
 .../desktops/gnome-3/core/gnome-system-monitor/default.nix | 2 +-
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix      | 2 +-
 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix  | 2 +-
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix    | 2 +-
 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix       | 2 +-
 pkgs/desktops/gnome-3/core/grilo/default.nix               | 2 +-
 .../gnome-3/core/gsettings-desktop-schemas/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/gsound/default.nix              | 2 +-
 pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/libcroco/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/libgdata/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/libgee/default.nix              | 2 +-
 pkgs/desktops/gnome-3/core/libgepub/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix    | 2 +-
 pkgs/desktops/gnome-3/core/libgnomekbd/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/libgweather/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/libgxps/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/libpeas/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/libzapojit/default.nix          | 2 +-
 pkgs/desktops/gnome-3/core/mutter/default.nix              | 2 +-
 pkgs/desktops/gnome-3/core/nautilus/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/rest/default.nix                | 2 +-
 pkgs/desktops/gnome-3/core/simple-scan/default.nix         | 2 +-
 pkgs/desktops/gnome-3/core/sushi/default.nix               | 2 +-
 pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix     | 2 +-
 pkgs/desktops/gnome-3/core/totem/default.nix               | 2 +-
 pkgs/desktops/gnome-3/core/tracker-miners/default.nix      | 2 +-
 pkgs/desktops/gnome-3/core/tracker/default.nix             | 2 +-
 pkgs/desktops/gnome-3/core/vino/default.nix                | 2 +-
 pkgs/desktops/gnome-3/core/vte/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/yelp-tools/default.nix          | 2 +-
 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix            | 2 +-
 pkgs/desktops/gnome-3/core/yelp/default.nix                | 2 +-
 pkgs/desktops/gnome-3/core/zenity/default.nix              | 2 +-
 pkgs/desktops/gnome-3/default.nix                          | 4 ----
 pkgs/desktops/gnome-3/devtools/anjuta/default.nix          | 2 +-
 pkgs/desktops/gnome-3/devtools/devhelp/default.nix         | 2 +-
 pkgs/desktops/gnome-3/devtools/gdl/default.nix             | 2 +-
 .../desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 2 +-
 pkgs/desktops/gnome-3/devtools/nemiver/default.nix         | 2 +-
 pkgs/desktops/gnome-3/games/aisleriot/default.nix          | 2 +-
 pkgs/desktops/gnome-3/games/five-or-more/default.nix       | 2 +-
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix      | 2 +-
 pkgs/desktops/gnome-3/games/gnome-chess/default.nix        | 2 +-
 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix      | 2 +-
 pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix     | 2 +-
 pkgs/desktops/gnome-3/games/gnome-mines/default.nix        | 2 +-
 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix      | 2 +-
 pkgs/desktops/gnome-3/games/gnome-robots/default.nix       | 2 +-
 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix       | 2 +-
 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix       | 2 +-
 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix     | 2 +-
 pkgs/desktops/gnome-3/games/hitori/default.nix             | 2 +-
 pkgs/desktops/gnome-3/games/iagno/default.nix              | 2 +-
 pkgs/desktops/gnome-3/games/lightsoff/default.nix          | 2 +-
 pkgs/desktops/gnome-3/games/quadrapassel/default.nix       | 2 +-
 pkgs/desktops/gnome-3/games/swell-foop/default.nix         | 2 +-
 pkgs/desktops/gnome-3/games/tali/default.nix               | 2 +-
 pkgs/desktops/gnome-3/misc/gexiv2/default.nix              | 2 +-
 pkgs/desktops/gnome-3/misc/gfbgraph/default.nix            | 2 +-
 pkgs/desktops/gnome-3/misc/gitg/default.nix                | 2 +-
 pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix        | 2 +-
 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix    | 2 +-
 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix        | 2 +-
 pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix | 2 +-
 pkgs/desktops/gnome-3/misc/gtkhtml/default.nix             | 2 +-
 pkgs/desktops/gnome-3/misc/libgda/default.nix              | 2 +-
 pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix        | 2 +-
 .../gnome-3/misc/libgnome-games-support/default.nix        | 2 +-
 pkgs/desktops/gnome-3/misc/libmediaart/default.nix         | 2 +-
 pkgs/development/libraries/atk/default.nix                 | 2 +-
 pkgs/development/libraries/clutter-gst/default.nix         | 2 +-
 pkgs/development/libraries/clutter-gtk/default.nix         | 2 +-
 pkgs/development/libraries/clutter/default.nix             | 2 +-
 pkgs/development/libraries/cogl/default.nix                | 2 +-
 pkgs/development/libraries/gdk-pixbuf/default.nix          | 2 +-
 pkgs/development/libraries/glib-networking/default.nix     | 2 +-
 pkgs/development/libraries/glib/default.nix                | 2 +-
 .../libraries/gobject-introspection/default.nix            | 2 +-
 pkgs/development/libraries/gspell/default.nix              | 2 +-
 pkgs/development/libraries/gtk+/3.x.nix                    | 2 +-
 pkgs/development/libraries/gtksourceview/3.x.nix           | 2 +-
 pkgs/development/libraries/gtksourceview/4.x.nix           | 2 +-
 pkgs/development/libraries/gvfs/default.nix                | 2 +-
 pkgs/development/libraries/libchamplain/default.nix        | 2 +-
 pkgs/development/libraries/libgtop/default.nix             | 2 +-
 pkgs/development/libraries/libgudev/default.nix            | 2 +-
 pkgs/development/libraries/libhttpseverywhere/default.nix  | 2 +-
 pkgs/development/libraries/librsvg/default.nix             | 2 +-
 pkgs/development/libraries/libsecret/default.nix           | 2 +-
 pkgs/development/libraries/libsoup/default.nix             | 2 +-
 pkgs/development/libraries/libwnck/3.x.nix                 | 2 +-
 pkgs/development/libraries/rarian/default.nix              | 2 +-
 pkgs/development/tools/valadoc/default.nix                 | 2 +-
 165 files changed, 166 insertions(+), 171 deletions(-)

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index f3bcff7a2c51..e61b9d8b290d 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
   };
 
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index 8dab9e32f982..968c5edae63a 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
   };
 
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index f402721e180d..5679a4d53422 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec{
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
   };
 
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index fcf279095051..9e890e172e55 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05";
   };
 
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 1ebc2f88ec5d..be572ca32f9b 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0pa7lb33i4hdnz7hr7x938d48ilrnj47jzb99la79rmm08yyin8n";
   };
 
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix
index f99344b83d64..0f7a89b3c525 100644
--- a/pkgs/applications/misc/gnome-usage/default.nix
+++ b/pkgs/applications/misc/gnome-usage/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0130bwinpkz307nalw6ndi5mk38k5g6jna4gbw2916d54df6a4nq";
   };
 
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 199fa3e9bfe9..0dfc4b2bc58e 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgconfig, fetchurl, buildPythonApplication
+{ stdenv, pkgconfig, fetchurl, buildPythonApplication
 , autoreconfHook, wrapGAppsHook, gobjectIntrospection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
@@ -7,7 +7,6 @@
 , speechd, brltty, setproctitle, gst_all_1, gst-python
 }:
 
-with lib;
 let
   pname = "orca";
   version = "3.28.2";
@@ -17,7 +16,7 @@ in buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "08rh6ji680g5nrw2n7jrxrw7nwg04sj52jxffcfasgss2f51d38q";
   };
 
@@ -54,7 +53,7 @@ in buildPythonApplication rec {
     };
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Orca;
     description = "Screen reader";
     longDescription = ''
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 3f05bd08f3f4..a37b4b7b05c0 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -11,7 +11,7 @@ in buildPythonApplication rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "109px6phfizi2jqrc7d7k7j6nvmanbfp5lykqfrk2sky77sand0r";
   };
 
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index adb5d237f54f..57ee1cf12750 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -26,7 +26,7 @@ in python3Packages.buildPythonApplication rec {
   name = "pitivi-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69";
   };
 
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 9d002ef02ade..7a0b8559b593 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 513948d3b51f..feb865743e6c 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/accerciser/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 38c729a1c429..46c76a8ce17c 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0lg92fl6dmrybkxs3gqhyr8rq945y64k51l6s72yiads7pqabli2";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 9da265e75d67..ab985b1473e3 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index fab175526b1c..8fb8c2307841 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1q1nfga39f44knrcvcxk8ivhl6fvg92g71cq3hcp4a7krb3jwa5v";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index bd97393b7b69..1066cea177aa 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "09y2blmlsccfxc2npcayhicq00r9n03897s1aizkahn1m970hjsp";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 919ebdd77d17..64ef45f3098f 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0791r07d3ixmmfk68lvhp3d5i4vnlrnx10csxwgpfqyfb04vwx7i";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix
index 1f8077ff4af8..d9f1e7850afd 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.18.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/ghex/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/ghex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index a1777137c019..c4be9d7259c6 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.22.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glade/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index b6679ccc2695..9a9c01fbb1a6 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1z1qimspx1nw7l79rardxcx2bydj9nmk60vsdb611xzlqa3hkppm";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 05275fa01ac5..d876569d4df9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 8b497fbf433d..20154359c086 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 78366755ad6a..9943bc778edf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1dd739vchb592mck1dia2hkywn4213cpramyqzgmlmwv8z80p3nl";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e600284550b7..a62965b890af 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index c8a8f8e7e322..de54b6f92e11 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index 18f7f9f6fd4e..421ef8930c52 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0zw6nx1hckv46hn978g57anp4zq4alvz9dpwibgx02wb6gq1r23a";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index cade274e69a8..65270b7124d3 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index eef91ec0fbb8..6602987db374 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 2163e6e875e7..2da382e57223 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1n280j7crgwlzyf09j66f1zkrnnhfrr8pshn824njs1xyk3g0q11";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
index a7861dcf74d9..58c67e6441f1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index 60953d99ac27..1f6e86d49436 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0y0srj1hvr1waa35p6dj1r1mlgcsscc0i99jni50ijp4zb36fjqy";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
index 3a9f33f46f00..37b48a744822 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
index ad759bf5506a..93c8d4147641 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.26.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index dcdf43b15165..3bb4b7887446 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1066j1lbrkpcxhvrg3gcv7gv8dzqv5ny9qi9dnm8r1dsx2hil9yc";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
index 1bcf77839007..179b60e98c13 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df";
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index a8fe76ee03f9..00037f526b64 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vinagre/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 049b586f16db..ce596ec628ec 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
index 693e284e2700..8d21e9c323b5 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0qsx7vx5c3n4yxlxbr11sppw7qwcv9z3g45b5xb9y7wxw5lv42sk";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix
index acfd6dfb3745..fe2b50f296a4 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/core/caribou/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 13d73fa34d2f..8eacbb037dd1 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0nhcpwqrkmpxbhaf0cafvy6dlp6s7vhm5vknl4lgs3l24zc56ns5";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 71779c172807..219aa4e7475f 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "0.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 089c32d602ea..f4aeb6c53db2 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "3.25.90";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 8459ba2c126b..bf5465b16c2e 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1lj8v9m8jdxc3d4nzmgrxcccddg3hh8lkbmz4g71yxa0ykxxvbip";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 01232b0f9977..3c9b4de9ea8b 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.28.3.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 74f10cc384d7..077ffe65ec47 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evince/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1qbk1x2c7iacmmfwjzh136v2sdacrkqn9d6bnqid7xn9hlnx4m89";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index c355c9bbce69..6ed27750dccd 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1247gv0ggwnd1i2n7iglb3crfapx6s9nrl896bzy9k87fb94hlyr";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 981b8504487b..ec059873dcbf 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "folks-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/folks/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/folks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "16hqh2gxlbx0b0hgq216hndr1m72vj54jvryzii9zqkk0g9kxc57";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/core/gcr/default.nix
index a324fda0a7e1..ea2883a5716a 100644
--- a/pkgs/desktops/gnome-3/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/core/gcr/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gcr/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gcr/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index f6049c8bda8c..388fa89acaab 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "12d1cp2dyca8rwh9y9cg8xn6grdp8nmxkkqwg4xpkr8i8ml65n88";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index f48e9b3b1218..3924f0033465 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 1bf640f713f7..5854265d3527 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.52.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
index c52fe5c60492..c1f8c08eebfe 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
index e7acbe8706ec..946e7adff793 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" "man" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
index 2f4743ee2633..a5a3bd03e9f9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0izsrqc9fm2lh25jr3nzi94p5hh2d3cklxqczbq16by85wr1xm5s";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
index 9fcbbe814dce..7fe1c2211e2e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1mixga6mq67wgxdsg6rnl7lvyh3z3yabxjmnyjq2k2v8ljgklczc";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
index 23fd157a528a..d0ab339a504d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.18.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-common/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a9541d64b03c..effb3d521ef6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 6a57e4cdff48..638c5fe9941a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index d6402a3b5b6c..597f45261a68 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
index ee1feb6ddaeb..1019a809d7f8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.26.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index a572e617766e..587bd38f16b6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
index 6af2f7f4b03f..06a5b258c80f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.30.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1wwnx2zrlbd2d6np7m9s78alx6j6ranrnh1g2z6zrv9qcj8rpzz5";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index cce192c9f29d..9d9c874319cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index 4bd2dcbe13e8..023e7b2ce72f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 1df5465382a9..86e5fba36507 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.26.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
index c92280ed5663..21c28f0e9534 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 8184f0234fc3..57bcd826038d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "14nmbirgrp2nm16khbz109saqdlinlbrlhjnbjydpnrlimfgg4xq";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
index bfaf430d5932..ce025899c806 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0z9dip9p0iav646cmxisii5sbkdr9hmaklc5fzvschpbjkhphksr";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index a963ea148bad..9609cd537964 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 8e09c960e75e..2b2572ac632a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0xm2a8inj2zkrpgkhy69rbqh44q62gpwm4javzbvvvgx0srza90w";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 6172f2165439..248acfd17896 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index c402a2edd8fb..7bee6f3a8809 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index a0318514c9b9..13442af337a3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index 0503d3baa6c1..d42797300e61 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "06aqg9asq2vqi9wr29bs4v8z2bf4manhbhfghf4nvw01y2zs0jvw";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index 24bf5dc33654..d17be1e7182a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
index 5ae579417aec..6a5d2fde5018 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-user-share/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "04wjnrcdlmyszj582nsda32sgi44nwgrw2ksy11xp17nb09d7m09";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
index de547ea172d0..f03259c35409 100644
--- a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -5,7 +5,7 @@
 let
   pname = "grilo-plugins";
   version = "0.3.7";
-  major = gnome3.versionBranch version;
+  major = stdenv.lib.versions.majorMinor version;
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 5554cddd043b..de50cc69ed03 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "14cwpk9jxi8rfjcmkav37zf0m52b1lqpkpkz858h80jqvn1clr8y";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
index 5dc6137c9fca..657a40d1805e 100644
--- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gsettings-desktop-schemas/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0rwidacwrxlc54x90h9g3wx2zlisc4vm49vmxi15azmpj1vwvd2c";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gsound/default.nix b/pkgs/desktops/gnome-3/core/gsound/default.nix
index 4978223c9b2b..4468ce78f404 100644
--- a/pkgs/desktops/gnome-3/core/gsound/default.nix
+++ b/pkgs/desktops/gnome-3/core/gsound/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
index 0a37144d8f74..15e9ac41d6c6 100644
--- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.21.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceviewmm/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix
index f5ecf088a87c..312231f648f3 100644
--- a/pkgs/desktops/gnome-3/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/core/libgdata/default.nix
index f430986cc474..be32528ef6c0 100644
--- a/pkgs/desktops/gnome-3/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgdata/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix
index a65d0f401f0e..ea0860a3c4e4 100644
--- a/pkgs/desktops/gnome-3/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgee/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix
index f43b1de46e50..ad7d2a8ebd43 100644
--- a/pkgs/desktops/gnome-3/core/libgepub/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
index 8f77944577ee..867e08de00ec 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
index 6301f6f4ab65..a9b27fa65a47 100644
--- a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.26.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/libgnomekbd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 23405af50d3b..b0d3679b1b71 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/core/libgxps/default.nix
index 65f8090e4ead..c9312c228829 100644
--- a/pkgs/desktops/gnome-3/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgxps/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index d4ca0e509ddd..03c79a27d818 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/libpeas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
index 10c6185fa821..42a7832a2419 100644
--- a/pkgs/desktops/gnome-3/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/core/libzapojit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index b05644366dc0..a08e0fd3cd1a 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 33beb8a87d37..498f6d35b176 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "19dhpa2ylrg8d5274lahy7xqr2p9z3jnq1h4qmsh95czkpy7is4w";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/core/rest/default.nix
index aeef5114435d..b00e4c623d2a 100644
--- a/pkgs/desktops/gnome-3/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/core/rest/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 8596a059ca5d..3d7e78fa18df 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/simple-scan/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "140vz94vml0vf6kiw3sg436qfvajk21x6q86smvycgf24qfyvk6a";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 100a2727fc3c..1881293a2134 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
index 279e7f2e95af..cb10213631ce 100644
--- a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.26.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/totem-pl-parser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0k5pnka907invgds48d73c1xx1a366v5dcld3gr2l1dgmjwc9qka";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 50e060c13c3a..2082dc0ac059 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.26.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1llyisls3pzf5bwkpxyfyxc2d3gpa09n5pjy7qsjdqrp3ya4k36g";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index ad5b40d3c088..1f28c9f0fd05 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   version = "2.1.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 38e0d7cfa502..c53324dd9b3b 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0xf58zld6pnfa8k7k70rv8ya8g7zqgahz6q4sapwxs6k97d2fgsx";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix
index 65c6ace8eec0..6ec2b0a17edb 100644
--- a/pkgs/desktops/gnome-3/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/core/vino/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vino/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 47a2c2f19d3b..3fff1dab39c8 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "0.52.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
index 5a0a5bd43b5b..6f487eacf972 100644
--- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1b61dmlb1sd50fgq6zgnkcpx2s1py33q0x9cx67fzpsr4gmgxnw2";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 6abaff8e32be..e5ed1f31d703 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "14rznm1qpsnmkwksnkd5j7zplakl01kvrcw0fdmd5gdc65xz9kcc";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix
index 9a47ecd2842a..0a7918d01bf5 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "033w5qnhm495pnvscnb3k2dagzgq4fsnzcrh0k2rgr10mw2mv2p8";
   };
 
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix
index 7f9996d17d99..2eb515d971b8 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/core/zenity/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0swavrkc5ps3fwzy6h6l5mmim0wwy10xrq0qqkay5d0zf9a965yv";
   };
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 0f9108465b14..7e4fb77b2b34 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,10 +1,6 @@
 { config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
-  # Convert a version to branch (3.26.18 → 3.26)
-  # Used for finding packages on GNOME mirrors
-  versionBranch = version: builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version));
-
   updateScript = callPackage ./update.nix { };
 
   maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar ];
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 0e50953b3dea..7dee751314f5 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
index aa0f545c2dbd..b20a85b9e717 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.30.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
index 75f9bc48db65..5098ff3bd8bb 100644
--- a/pkgs/desktops/gnome-3/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdl/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
index 57070f7ce38a..c23ff2e65159 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1py0zyfzpaws41p9iw4645ykfnmm408axfghsmq6gnwgp66vl074";
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index e626d293f83a..d48565716c40 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.9.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nemiver/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
index a54c336326ab..7627a45b4d2b 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.22.5";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/aisleriot/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/aisleriot/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0rl39psr5xi584310pyrgw36ini4wn7yr2m1q5118w3a3v1dkhzh";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index 4115fda9f8df..e5dfd279bc75 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/five-or-more/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1fy4a7qdjqvabm0cl45d6xlx6hy4paxvm0b2paifff73bl250d5c";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index bf21f7346809..110e2e5c4393 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/four-in-a-row/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1iszaay2r92swb0q67lmip6r1w3hw2dwmlgnz9v2h6blgdyncs4k";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
index 01e23384b8ea..f7412e022616 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-chess/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1q8gc0mq8k2b7pjy363g0yjd80czqknw6ssqzbvgqx5b8nkfvmv1";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index fc75cd081f9a..0b4d6d770b0d 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0prc0s28pdflgzyvk1g0yfx982q2grivmz3858nwpqmbkha81r7f";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
index b9a4638a947c..29763abba559 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "f5972a14fa4ad04153bd6e68475b85cd79c6b44f6cac1fe1edb64dbad4135218";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
index 297e1a9ed7bf..ab978238cf55 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mines/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "16w55hqaxipcv870n9gpn6qiywbqbyg7bjshaa02r75ias8dfxvf";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
index c871fbbf9160..e36ca2a639d1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.24.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
index 9a81c88206df..19a6b60fb5bd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "3.22.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0dzcjd7rdmlzgr6rmljhrbccwif8wj0cr1xcrrj7malj33098wwk";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
index 1d467e542da9..23783c46e2b0 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "07b4lzniaf3gjsss6zl1lslv18smwc4nrijykvn2z90f423q2xav";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 855e496dfaf4..85036c70d194 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-taquin/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "096a32nhcz243na56iq2wxixd4f3lbj33a5h718r3j6yppqazjx9";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index f456b7ee6831..fe81b429e999 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tetravex/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0a6d7ff5ffcd6c05454a919d46a2e389d6b5f87bc80e82c52c2f20d9d914e18d";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix
index db01eb86f173..8d4be7f1c6b0 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/games/hitori/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.22.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/hitori/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "dcac6909b6007857ee425ac8c65fed179f2c71da138d5e5300cd62c8b9ea15d3";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 55dac4659d0f..4506614b498f 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/iagno/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "12haq1vgrr6wf970rja55rcg0352sm0i3l5z7gj0ipr2isv8506x";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 73b7c092a66d..dcffe7cea7f4 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/lightsoff/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0rwh9kz6aphglp79cyrfjab6vy02vclq68f646zjgb9xgg6ar73g";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 7ae226b3f8e5..c57ab1a9e14d 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/quadrapassel/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
index b7dc6203b8a9..fec448ff47c2 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1yjmg6sgi7mvp10fsqlkqshajmh8kgdmg6vyj5r8y48pv2ihfk64";
   };
 
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index f8d799b69141..e6cdd3c88b72 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tali/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "5ba17794d6fb06b794daaffa62a6aaa372b7de8886ce5ec596c37e62bb71728b";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
index 045dc2ffc331..94f5f4ef7999 100644
--- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0088m7p044n741ly1m6i7w25z513h9wpgyw0rmx5f0sy3vyjiic1";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
index f8d296122235..7e2709fc1c18 100644
--- a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index d2dce9d6f1b8..c50db12f6b0f 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index b1251f5111a4..056aaaa28fcb 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.2.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-autoar/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
index 7bc0ee371752..da50b657007a 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.28.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-packagekit/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "051q3hc78qa85mfh4jxxprfcrfj1hva6smfqsgzm0kx4zkkj1c1r";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index 0ff21a6b0dd8..c2c4c8e94a7d 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
index 38b33ff66671..b65e9c1021e7 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-video-effects/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
index 1b912109cfd5..67f2552b4348 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "4.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix
index 069c769efaa2..002310c52762 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix
@@ -12,7 +12,7 @@ assert postgresSupport -> postgresql != null;
   version = "5.2.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/libgda/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
index 13d34c1c2580..f5f6b799b4b5 100644
--- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.26.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgit2-glib/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/libgit2-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0nhyqas110q7ingw97bvyjdb7v4dzch517dq8sn8c33s8910wqcp";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index 9a55864dfcc2..7054e41d7295 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088";
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
index 74a4cdca722e..d8a564ac17ea 100644
--- a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d";
   };
 
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 813f8c3c9640..288bd9a9dd09 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
   };
 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index a06691d5c715..428114986d1b 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
   };
 
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 9759e4904b29..afeb7064ffea 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
   };
 
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index d8150fd11508..97db6880c5f0 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
   };
 
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 085bab6475c2..3f81c39a9b22 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   version = "1.22.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
   };
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3fb50e98c1c8..9fece4cb7a54 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
   # src = fetchurl {
-  #   url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+  #   url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
   #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
   # };
   src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 3deaf28373dd..4ac6e87b9dd7 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
   };
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index f03ddfc48b2e..508a012c6900 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   name = "glib-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
   };
 
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5ab5005bad4..b2c0a9f89a48 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
   };
 
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 051228aeb152..0145272c2819 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
   outputBin = "dev";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
   };
 
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 27052d1922f6..015843c05393 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   name = "gtk+3-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
+    url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
     sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index fe81c97ab6eb..9e1bc5363a1f 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   version = "3.24.6";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
   };
 
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 2501e0253b39..7cd9de4b06b1 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   version = "4.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
   };
 
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 360c1fb41f4e..6bcf72b8a7e6 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
   };
 
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index e4864aded279..677910328458 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
   };
 
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index d0be9e25b87e..bab7ede2d6e8 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
   };
 
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 54760549a164..e07622eb13af 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
   };
 
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 91e8e2d50f19..81e5f0fe73ea 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
   };
 
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 76b7e7ccaee9..7c94919f344a 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2";
   };
 
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index fde3c7a7b30e..4fc0d6688d4e 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
   };
 
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 2804486e2f0a..9849e2600bb0 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "2.62.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
   };
 
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d693..3137ac2c8f2b 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec{
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
   };
 
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
index 4446226fedef..d0a15e866f7a 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/pkgs/development/libraries/rarian/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.gz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz";
     sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
   };
 
diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix
index 6515e220f3d5..fba5fe91ed86 100644
--- a/pkgs/development/tools/valadoc/default.nix
+++ b/pkgs/development/tools/valadoc/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "valadoc-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/valadoc/${gnome3.versionBranch version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/valadoc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "07501k2j9c016bd7rfr6xzaxdplq7j9sd18b5ixbqdbipvn6whnv";
   };
 

From 8d37a5a99afc12ab21dfc9456d30bfdc9ce1a1d9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 5 Oct 2018 02:38:33 +0200
Subject: [PATCH 2445/3253] eteroj.lv2: init at 0.4.0

---
 .../applications/audio/eteroj.lv2/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/audio/eteroj.lv2/default.nix

diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix
new file mode 100644
index 000000000000..28e4879efdc0
--- /dev/null
+++ b/pkgs/applications/audio/eteroj.lv2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libuv, lv2 }:
+
+stdenv.mkDerivation rec {
+  pname = "eteroj.lv2";
+  version = "0.4.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "OpenMusicKontrollers";
+    repo   = pname;
+    rev    = version;
+    sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn";
+  };
+
+  buildInputs = [ libuv lv2 ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2";
+    homepage = https://open-music-kontrollers.ch/lv2/eteroj;
+    license = licenses.artistic2;
+    maintainers = with maintainers; [ magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77c4e3972bef..4e5b5505ffca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16375,6 +16375,8 @@ with pkgs;
 
   eterm = callPackage ../applications/misc/eterm { };
 
+  eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
+
   etherape = callPackage ../applications/networking/sniffers/etherape { };
 
   evilvte = callPackage ../applications/misc/evilvte {

From ef0f1eb33fda9c5bd6940379e4be7cefd5df93c1 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Wed, 3 Oct 2018 22:51:53 -0400
Subject: [PATCH 2446/3253] bitcoin: enable doCheck Fixes checkPhase for
 bitcoin-qt.

---
 pkgs/applications/altcoins/bitcoin.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 04a4a18dd4c2..c266fa2fef25 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq
-, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec{
     sha256 = "0pkq28d2dj22qrxyyg9kh0whmhj7ghyabnhyqldbljv4a7l3kvwq";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ]
+                   ++ optionals doCheck [ python3 ];
   buildInputs = [ openssl db48 boost zlib zeromq
                   miniupnpc protobuf libevent]
                   ++ optionals stdenv.isLinux [ utillinux ]
@@ -30,9 +31,11 @@ stdenv.mkDerivation rec{
                                             "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
                                           ];
 
-  # Fails with "This application failed to start because it could not
-  # find or load the Qt platform plugin "minimal""
-  doCheck = false;
+  doCheck = true;
+
+  # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+  # See also https://github.com/NixOS/nixpkgs/issues/24256
+  checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ];
 
   enableParallelBuilding = true;
 

From 1353ba26787d398f3595deea28e21a134978df83 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 4 Oct 2018 11:57:18 +0800
Subject: [PATCH 2447/3253] system-activation: support script fragments to run
 in a user context

---
 .../system/activation/activation-script.nix   | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 93a1b13a81dd..5a87a2ec7623 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -100,6 +100,52 @@ in
             exit $_status
           '';
       };
+    };
+
+    system.userActivationScripts = mkOption {
+      default = {};
+
+      example = literalExample ''
+        { plasmaSetup = {
+            text = '''
+              ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5"
+            ''';
+            deps = [];
+          };
+        }
+      '';
+
+      description = ''
+        A set of shell script fragments that are executed by a systemd user
+        service when a NixOS system configuration is activated. Examples are
+        rebuilding the .desktop file cache for showing applications in the menu.
+        Since these are executed every time you run
+        <command>nixos-rebuild</command>, it's important that they are
+        idempotent and fast.
+      '';
+
+      type = types.attrsOf types.unspecified;
+
+      apply = set: {
+        script = ''
+          unset PATH
+          for i in ${toString path}; do
+            PATH=$PATH:$i/bin:$i/sbin
+          done
+
+          _status=0
+          trap "_status=1 _localstatus=\$?" ERR
+
+          ${
+            let
+              set' = mapAttrs (n: v: if isString v then noDepEntry v else v) set;
+              withHeadlines = addAttributeName set';
+            in textClosureMap id (withHeadlines) (attrNames withHeadlines)
+          }
+
+          exit $_status
+        '';
+      };
 
     };
 
@@ -177,6 +223,14 @@ in
         source ${config.system.build.earlyMountScript}
       '';
 
+    systemd.user = {
+      services.nixos-activation = {
+        description = "Run user specific NixOS activation";
+        script = config.system.userActivationScripts.script;
+        unitConfig.ConditionUser = "!@system";
+        serviceConfig.Type = "oneshot";
+      };
+    };
   };
 
 }

From 8118d6eb2e34b6f08511819b4e75650cf7f7d9cd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 5 Oct 2018 10:06:18 +0800
Subject: [PATCH 2448/3253] switch-to-configuration.pl: activate the
 nixos-activation.service user service

---
 nixos/modules/system/activation/switch-to-configuration.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index c3e469e4b8a1..a9824649e387 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -420,6 +420,7 @@ while (my $f = <$listActiveUsers>) {
     print STDERR "reloading user units for $name...\n";
 
     system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
+    system("su", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
 }
 
 close $listActiveUsers;

From 4dada63a174331151251cf8be093cd8fcdf28c12 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 4 Oct 2018 11:57:55 +0800
Subject: [PATCH 2449/3253] plasma5: run kbuildsycoca5 in the user context

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index e759f69db897..706555921454 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -225,11 +225,8 @@ in
       security.pam.services.sddm.enableKwallet = true;
       security.pam.services.slim.enableKwallet = true;
 
-      # Update the start menu for each user that has `isNormalUser` set.
-      system.activationScripts.plasmaSetup = stringAfter [ "users" "groups" ]
-        (concatStringsSep "\n"
-          (mapAttrsToList (name: value: "${pkgs.su}/bin/su ${name} -c ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5")
-            (filterAttrs (n: v: v.isNormalUser) config.users.users)));
+      # Update the start menu for each user that is currently logged in
+      system.userActivationScripts.plasmaSetup = "${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5";
     })
   ];
 

From 4babe7f799e826a040869728a0be56c68071c0ea Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Fri, 5 Oct 2018 01:28:42 -0400
Subject: [PATCH 2450/3253] haskell: re-enable aarch64, but disable parallel
 builds on that arch.

This is a workaround for unreliable parallel Haskell builds on
aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449
---
 pkgs/development/compilers/ghc/8.2.1-binary.nix      | 3 +--
 pkgs/development/compilers/ghc/8.2.2.nix             | 3 ++-
 pkgs/development/compilers/ghc/8.4.3.nix             | 3 ++-
 pkgs/development/compilers/ghc/8.6.1.nix             | 3 ++-
 pkgs/development/haskell-modules/generic-builder.nix | 4 +++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index bfb9c4cd6164..6caeaf20f64c 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -169,6 +169,5 @@ stdenv.mkDerivation rec {
   };
 
   meta.license = stdenv.lib.licenses.bsd3;
-  # AArch64 should work in theory but eventually some builds start segfaulting
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
+  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
 }
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index b548b05339e4..8c3012f881c6 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -88,7 +88,8 @@ stdenv.mkDerivation (rec {
     sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
   };
 
-  enableParallelBuilding = true;
+  # https://ghc.haskell.org/trac/ghc/ticket/15449
+  enableParallelBuilding = !buildPlatform.isAarch64;
 
   outputs = [ "out" "doc" ];
 
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index e43f9a57d0a4..7cd7494df050 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -90,7 +90,8 @@ stdenv.mkDerivation (rec {
     sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
   };
 
-  enableParallelBuilding = true;
+  # https://ghc.haskell.org/trac/ghc/ticket/15449
+  enableParallelBuilding = !buildPlatform.isAarch64;
 
   outputs = [ "out" "doc" ];
 
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 62ea39791b90..a2be9d255713 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -86,7 +86,8 @@ stdenv.mkDerivation (rec {
     sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
   };
 
-  enableParallelBuilding = true;
+  # https://ghc.haskell.org/trac/ghc/ticket/15449
+  enableParallelBuilding = !buildPlatform.isAarch64;
 
   outputs = [ "out" "doc" ];
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a3426f4e249d..4c17581f9d51 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -48,7 +48,9 @@ in
 # We cannot enable -j<n> parallelism for libraries because GHC is far more
 # likely to generate a non-determistic library ID in that case. Further
 # details are at <https://github.com/peti/ghc-library-id-bug>.
-, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
+#
+# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
+, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
 , maintainers ? []
 , doCoverage ? false
 , doHaddock ? !(ghc.isHaLVM or false)

From 858b263bf0f9844d6924c0af4ffc690af2fb4496 Mon Sep 17 00:00:00 2001
From: Pavel Goran <me@pvgoran.name>
Date: Fri, 5 Oct 2018 13:14:45 +0700
Subject: [PATCH 2451/3253] nixos: correct improper uses of mkEnableOption,
 clarify service descriptions

Several service definitions used `mkEnableOption` with text starting
with "Whether to", which produced funny option descriptions like
"Whether to enable Whether to run the rspamd daemon..".

This commit corrects this, and adds short descriptions of services
to affected service definitions.
---
 nixos/modules/config/krb5/default.nix               | 2 +-
 nixos/modules/services/mail/rspamd.nix              | 2 +-
 nixos/modules/services/networking/pptpd.nix         | 2 +-
 nixos/modules/services/networking/xl2tpd.nix        | 2 +-
 nixos/modules/services/networking/xrdp.nix          | 2 +-
 nixos/modules/services/system/saslauthd.nix         | 2 +-
 nixos/modules/virtualisation/xe-guest-utilities.nix | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index c22e99a0a2f1..87021a27d34f 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -79,7 +79,7 @@ in {
 
   options = {
     krb5 = {
-      enable = mkEnableOption "Whether to enable Kerberos V.";
+      enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V";
 
       kerberos = mkOption {
         type = types.package;
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index bba11796a3d3..ff01a5dee53d 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -159,7 +159,7 @@ in
 
     services.rspamd = {
 
-      enable = mkEnableOption "Whether to run the rspamd daemon.";
+      enable = mkEnableOption "rspamd, the Rapid spam filtering system";
 
       debug = mkOption {
         type = types.bool;
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index 56a612b91052..d8b9e8f8341a 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -5,7 +5,7 @@ with lib;
 {
   options = {
     services.pptpd = {
-      enable = mkEnableOption "Whether pptpd should be run on startup.";
+      enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
 
       serverIp = mkOption {
         type        = types.string;
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index 46111a76af80..d0a3ed7bb5e0 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -5,7 +5,7 @@ with lib;
 {
   options = {
     services.xl2tpd = {
-      enable = mkEnableOption "Whether xl2tpd should be run on startup.";
+      enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
 
       serverIp = mkOption {
         type        = types.string;
diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix
index 61f22a366a02..9ed3025e47d4 100644
--- a/nixos/modules/services/networking/xrdp.nix
+++ b/nixos/modules/services/networking/xrdp.nix
@@ -36,7 +36,7 @@ in
 
     services.xrdp = {
 
-      enable = mkEnableOption "Whether xrdp should be run on startup.";
+      enable = mkEnableOption "xrdp, the Remote Desktop Protocol server";
 
       package = mkOption {
         type = types.package;
diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix
index c8ddca9a0db6..8fcf4fb91fc4 100644
--- a/nixos/modules/services/system/saslauthd.nix
+++ b/nixos/modules/services/system/saslauthd.nix
@@ -16,7 +16,7 @@ in
 
     services.saslauthd = {
 
-      enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon.";
+      enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon";
 
       package = mkOption {
         default = pkgs.cyrus_sasl.bin;
diff --git a/nixos/modules/virtualisation/xe-guest-utilities.nix b/nixos/modules/virtualisation/xe-guest-utilities.nix
index d703353858c0..675cf9297371 100644
--- a/nixos/modules/virtualisation/xe-guest-utilities.nix
+++ b/nixos/modules/virtualisation/xe-guest-utilities.nix
@@ -5,7 +5,7 @@ let
 in {
   options = {
     services.xe-guest-utilities = {
-      enable = mkEnableOption "Whether to enable the Xen guest utilities daemon.";
+      enable = mkEnableOption "the Xen guest utilities daemon";
     };
   };
   config = mkIf cfg.enable {

From e1738bf1a2240bf049e708be306ac53b48737912 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 5 Oct 2018 08:22:26 +0200
Subject: [PATCH 2452/3253] whipper: add cddb dependency

---
 pkgs/applications/audio/whipper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 162d5459d648..1097e7b8fd7e 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -14,7 +14,7 @@ python2.pkgs.buildPythonApplication rec {
 
   pythonPath = with python2.pkgs; [
     pygobject2 musicbrainzngs urllib3 chardet
-    pycdio setuptools mutagen
+    pycdio setuptools mutagen CDDB
     requests
   ];
 

From bb06b5b442c132a4cd3db41ab615cd49e5ee21b7 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 5 Oct 2018 09:25:39 +0200
Subject: [PATCH 2453/3253] nixos/emby: fixes binary name change introduced by
 #47659

---
 nixos/modules/services/misc/emby.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index ff68b850cd91..151edd0e761a 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -55,7 +55,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = "true";
-        ExecStart = "${pkgs.emby}/bin/MediaBrowser.Server.Mono";
+        ExecStart = "${pkgs.emby}/bin/emby";
         Restart = "on-failure";
       };
     };

From 1e02a2c063d4ed594f0e6001b3f46c36720c6c75 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 5 Oct 2018 10:50:19 +0300
Subject: [PATCH 2454/3253] uutils-coreutils: 2018-02-09 -> 2018-09-30

---
 pkgs/tools/misc/uutils-coreutils/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 411e0324457a..70f304134d90 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }:
 
 rustPlatform.buildRustPackage {
-  name = "uutils-coreutils-2018-02-09";
+  name = "uutils-coreutils-2018-09-30";
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "coreutils";
-    rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a";
-    sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf";
+    rev = "a161b7e803aef08455ae0547dccd9210e38a4574";
+    sha256 = "19j40cma7rz6yf5j6nyid8qslbcmrnxdk6by53hflal2qx3g555z";
   };
 
   # too many impure/platform-dependent tests
   doCheck = false;
 
-  cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5";
+  cargoSha256 = "1a9k7i4829plkxgsflmpji3mrw2i1vln6jsnhxmkl14h554yi5j4";
 
   makeFlags =
     [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage {
     homepage = https://github.com/uutils/coreutils;
     maintainers = with maintainers; [ ma27 ];
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 3fea6319f96db7075476491ac9185de44af1a8b9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 5 Oct 2018 09:49:57 +0000
Subject: [PATCH 2455/3253] numactl: drop musl patch

musl support was added upstream in v2.0.12 in
https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b
---
 pkgs/os-specific/linux/numactl/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index bf21f92bd66d..3c02cf2bb889 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
-      url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;
-      sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";
-    });
-
   postPatch = ''
     patchShebangs test
   '';

From bea3f1818590d26221b702c2789932cfad552eee Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Thu, 4 Oct 2018 18:06:12 +0200
Subject: [PATCH 2456/3253] notmuch: use test-database in checkPhase

for running all tests, notmuch requires a database file, which can be
downloaded at https://notmuchmail.org/releases/test-databases/

See test/README in notmuch sources for further info.
---
 .../networking/mailreaders/notmuch/default.nix            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9b259cad6d0b..2d1b6ee15301 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -89,6 +89,14 @@ stdenv.mkDerivation rec {
     install_name_tool -change "$badname" "$goodname" "$prg"
   '';
 
+  preCheck = let
+    test-database = fetchurl {
+      url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz";
+      sha256 = "1lk91s00y4qy4pjh8638b5lfkgwyl282g1m27srsf7qfn58y16a2";
+    };
+  in ''
+    ln -s ${test-database} test/test-databases/database-v1.tar.xz
+  '';
   doCheck = !stdenv.isDarwin && (versionAtLeast gmime.version "3.0");
   checkTarget = "test V=1";
 

From 20c7b61963db2586b3c593e367517ee2fcf22ef1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 5 Oct 2018 06:03:36 -0500
Subject: [PATCH 2457/3253] perlPackages.Mojolicious: 8.01 -> 8.02

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 56a59b04b5b9..971ebedba77e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10005,10 +10005,10 @@ let
   };
 
   Mojolicious = buildPerlPackage rec {
-    name = "Mojolicious-8.01";
+    name = "Mojolicious-8.02";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
-      sha256 = "1gwf45s6vblff0ima2awjq3awj4wws4hn7df4d9jmyj9rji04z9c";
+      sha256 = "0m36zlh58bvww15k9ybi6khrrr6ga308y38p49hfq204k7cy02zp";
     };
     buildInputs = [ ExtUtilsMakeMaker ];
     propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ];

From 778dc453b6770b92b1fe59495ebad310c12c5d8a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 5 Oct 2018 06:03:52 -0500
Subject: [PATCH 2458/3253] perlPackages.CryptEd25519: init at 1.04

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 971ebedba77e..f12f75c69fa9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3113,6 +3113,22 @@ let
     buildInputs = [ CryptOpenSSLGuess ];
   };
 
+  CryptEd25519 = buildPerlPackage rec {
+    name = "Crypt-Ed25519-1.04";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
+      sha256 = "1jwh6b8b2ppvzxaljz287zakj4q3ip4zq121i23iwh26wxhlll2q";
+    };
+
+    nativeBuildInputs = [ CanaryStability ];
+
+    meta = {
+      description = "Minimal Ed25519 bindings";
+      license = stdenv.lib.licenses.artistic2;
+      maintainers = [ maintainers.thoughtpolice ];
+    };
+  };
+
   CryptSSLeay = buildPerlPackage rec {
     name = "Crypt-SSLeay-0.72";
     src = fetchurl {

From 7e3b43d75af65b4a81095d19183fbab619f6633e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 5 Oct 2018 12:13:26 +0100
Subject: [PATCH 2459/3253] webhook: init at 2.6.8

---
 pkgs/servers/http/webhook/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/http/webhook/default.nix

diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
new file mode 100644
index 000000000000..5d6b47d28b5d
--- /dev/null
+++ b/pkgs/servers/http/webhook/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "webhook-${version}";
+  version = "2.6.8";
+
+  goPackagePath = "github.com/adnanh/webhook";
+  excludedPackages = [ "test" ];
+
+  src = fetchFromGitHub {
+    owner = "adnanh";
+    repo = "webhook";
+    rev = version;
+    sha256 = "05q6nv04ml1gr4k79czg03i3ifl05xq29iapkgrl3k0a36czxlgs";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/adnanh/webhook;
+    license = [ licenses.mit ];
+    description = "incoming webhook server that executes shell commands";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab5508ef7331..d23729a55e44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13690,6 +13690,8 @@ with pkgs;
 
   webmetro = callPackage ../servers/webmetro { };
 
+  webhook = callPackage ../servers/http/webhook { };
+
   winstone = callPackage ../servers/http/winstone { };
 
   xinetd = callPackage ../servers/xinetd { };

From 071d72a72287cc3ed39a8bcea478d9858529555f Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 5 Oct 2018 14:05:25 +0200
Subject: [PATCH 2460/3253] scribus: 1.4.6 -> 1.4.7

---
 pkgs/applications/office/scribus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index ac1bf18e9999..76bf7ac6893e 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -5,11 +5,11 @@
 let
   pythonEnv = python2.withPackages(ps: [ps.tkinter]);
 in stdenv.mkDerivation rec {
-  name = "scribus-1.4.6";
+  name = "scribus-1.4.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/scribus/scribus/${name}.tar.xz";
-    sha256 = "16m1g38dig37ag0zxjx3wk1rxx9xxzjqfc7prj89rp4y1m83dqr1";
+    sha256 = "1v2ziq3k0yjz35nk5plcbc1jpi53p9v1cq1z3spch9lwlns3bls2";
   };
 
   enableParallelBuilding = true;

From dbc4ee75a295ce4cf70177255e2ee2661dd444c2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 5 Oct 2018 11:28:35 +0000
Subject: [PATCH 2461/3253] psi-plus: 1.3.410 -> 1.3.422

---
 .../networking/instant-messengers/psi-plus/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 0fdd8dfb4bd3..64e3c822108f 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "psi-plus-${version}";
-  version = "1.3.410";
+  version = "1.3.422";
 
   src = fetchFromGitHub {
     owner = "psi-plus";
     repo = "psi-plus-snapshots";
     rev = "${version}";
-    sha256 = "02m984z2dfmlx522q9x1z0aalvi2mi48s5ghhs80hr5afnfyc5w6";
+    sha256 = "193n3yvhp9m14irb49kg2rc4h7ypdmvidrgvv1i2n373iq751z05";
   };
 
   resources = fetchFromGitHub {

From 388adf92a14e7d3a485e8637d4b59e230796c099 Mon Sep 17 00:00:00 2001
From: Henry <cryptix@riseup.net>
Date: Thu, 4 Oct 2018 18:58:52 +0200
Subject: [PATCH 2462/3253] misc/vim-plugins: add posva/vim-vue

---
 pkgs/misc/vim-plugins/generated.nix    | 154 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   1 +
 2 files changed, 83 insertions(+), 72 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 8717ec5df487..4c6c577ce6d1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -53,12 +53,12 @@
   };
 
   ale = buildVimPluginFrom2Nix {
-    name = "ale-2018-09-29";
+    name = "ale-2018-10-03";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "04ed87c8829015ff3653a35fb4f6d7a71668d736";
-      sha256 = "1iw0chk1sg60yaxzj3m7dp9j7cn8wpklxvz082isk5y1ndcfqz5w";
+      rev = "e984497ec9dc8a465c2873d64c51629c9a559111";
+      sha256 = "074s3rgd71nvnanzz1ivd3xpji3qqnsd4ix9ka2xajlscn7i5x6q";
     };
   };
 
@@ -334,22 +334,22 @@
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
-    name = "denite-nvim-2018-09-27";
+    name = "denite-nvim-2018-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "67351fc647450ed17f164ca68758d8753e8f0f13";
-      sha256 = "1zxqdwx351z5hf8yr3b86ymxajlywkv9jr3dvnn8lhpipavkvmwf";
+      rev = "3ffc9a27dd6c2ae4c98f0a153564ee64da2722b2";
+      sha256 = "1q1rh1nw90g04jghc4jhaccssv1r7lc69ij00b3v2253ld9bdmlv";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
-    name = "deol-nvim-2018-06-07";
+    name = "deol-nvim-2018-10-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "195e63e10f320c0dc5c7e6372fe4f6ba96e93dd8";
-      sha256 = "0zb0pa1z847hpbb726i2vmryqap0yvdwnib4r8v1a7h06vvj17qy";
+      rev = "61283778287107a5e2a80b360d6d53610a27774f";
+      sha256 = "099dqlrz5baycrgz27m8hk6xy103jrdgph1yg7nmkchavvjp2rz1";
     };
   };
 
@@ -365,12 +365,12 @@
   };
 
   deoplete-go = buildVimPluginFrom2Nix {
-    name = "deoplete-go-2018-08-21";
+    name = "deoplete-go-2018-09-30";
     src = fetchFromGitHub {
       owner = "zchee";
       repo = "deoplete-go";
-      rev = "c1bdcfa71dcdaec8a1be8f396fc681e104e93a05";
-      sha256 = "0v9i6gz150m7dl7hwk1jzk8f0l23rbagfwwmvhn45akgjyxk4dmq";
+      rev = "5b2c70947eaeafabe3d5429527dc0fbd7e1aad64";
+      sha256 = "0vwsd5mpyaa4ixqavqvxc0b0515v9iidqzxzv1di73xlxrmaghzi";
       fetchSubmodules = true;
     };
   };
@@ -417,12 +417,12 @@
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix {
-    name = "deoplete-nvim-2018-09-12";
+    name = "deoplete-nvim-2018-10-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "93f6e3bce8229557b952dcad792786b1cc228991";
-      sha256 = "033iskhyz91158ifmpzpv1gi4rfx368c6knakj65spcrlfci58y9";
+      rev = "63fb188c547eb5ccf8cd713a33fbb7c80ac03ec9";
+      sha256 = "1f2cfqyc17b8jvd0a2qw0njaw8ac15zbsnjvnwls3wm1f9mmhh6g";
     };
   };
 
@@ -437,12 +437,12 @@
   };
 
   echodoc-vim = buildVimPluginFrom2Nix {
-    name = "echodoc-vim-2018-09-09";
+    name = "echodoc-vim-2018-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "781b1622029cd89350e6383da8ead834fb0cedd2";
-      sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a";
+      rev = "4e229bdc8fadf9842ce873665b63149db200adbf";
+      sha256 = "0xqh1fdi89nph3f400bxqdsp6j0pcxi7l3ay4wldxlljhpva20zr";
     };
   };
 
@@ -549,12 +549,12 @@
   };
 
   fzf-vim = buildVimPluginFrom2Nix {
-    name = "fzf-vim-2018-09-12";
+    name = "fzf-vim-2018-10-01";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "c3954d294a0f6c4fb5a46a1839cd42ec26767dea";
-      sha256 = "0pipa7vgx4vkaysyf195yphggxj5kki66yksfvdvw6yxiicap1ml";
+      rev = "c6275ee1080de4d94bb3f3cfd6e7cc0ccecd9e64";
+      sha256 = "1xy7yk4d9p7mbk8s9nj5kqihdgb4a4b004ivbnxwappj52znzw1g";
     };
   };
 
@@ -719,12 +719,12 @@
   };
 
   julia-vim = buildVimPluginFrom2Nix {
-    name = "julia-vim-2018-09-26";
+    name = "julia-vim-2018-10-01";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "9fe5ce6e4e373ed34a4462bbfac6cedfceb30c22";
-      sha256 = "1xww17h56q1fl83yvfz1kw6v57070ab904l3c0r97s9x0mirlvxb";
+      rev = "6e218a18d7b753423c59790105feb33d0388e2d0";
+      sha256 = "1wl3djm8fc44da6srvw7g3r1xi5j6742wjbz8i98qalai5fkcibd";
     };
   };
 
@@ -809,12 +809,12 @@
   };
 
   ncm2 = buildVimPluginFrom2Nix {
-    name = "ncm2-2018-09-20";
+    name = "ncm2-2018-09-30";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "5b5984b5528a90c40bf1d98c48bda1eda6b5e0f0";
-      sha256 = "1fwg5y3kbxdv64kglkd028kyvp8k9i5wppvw56iwf4qncpd66sdg";
+      rev = "02a263f7e38ee9569d8338da2d1cab2708b59150";
+      sha256 = "0gz3vyv9a3kl3bd3mq7qlgkfvz1p9gnk7fjjb7bsabayq3854di9";
     };
   };
 
@@ -939,12 +939,12 @@
   };
 
   neomake = buildVimPluginFrom2Nix {
-    name = "neomake-2018-09-21";
+    name = "neomake-2018-10-01";
     src = fetchFromGitHub {
       owner = "benekastah";
       repo = "neomake";
-      rev = "1686a91cc4ea4b48152e314decb827946221b1ad";
-      sha256 = "1radvd8nvbgjf158jdymvwi050fncqsf7vw3kw7hcz4adk97a1pr";
+      rev = "a6715ed7df767ac75166b22305232687f47f5be8";
+      sha256 = "0g8rm6y9vvzy1wxrxwjg6y0vw8na727z7mvjf8d20zmscpvmarj0";
     };
   };
 
@@ -959,12 +959,12 @@
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
-    name = "neosnippet-snippets-2018-09-12";
+    name = "neosnippet-snippets-2018-09-30";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "e61e966339bbab2abba6ba92bccd8825463b2d0d";
-      sha256 = "0yis1r2ypxym421gwlsm8zszsg490xw5q0h111k077x19qa5j4fs";
+      rev = "ec928a971f32150119f0ab73d289ea82e2740ae0";
+      sha256 = "1ff8a9z1f3f39y3cqxj33kls4mf5ax1pwxcxhfcxprj48vqwpr7p";
     };
   };
 
@@ -1349,12 +1349,12 @@
   };
 
   syntastic = buildVimPluginFrom2Nix {
-    name = "syntastic-2018-08-27";
+    name = "syntastic-2018-10-03";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "syntastic";
-      rev = "0295d8241db23e24b120e0360a899cb375793a1e";
-      sha256 = "1fpfsc8snmkkbsjb4j1l872sgr840q73rdykr29w1q68q4m06vbc";
+      rev = "df9f7057d18f996b9e40c9c57eea3e016350abdf";
+      sha256 = "1yrs2yli39wjvmwnzsxg57i6kldhcmbwr90cqgbf6qi09rba828p";
     };
   };
 
@@ -1519,12 +1519,12 @@
   };
 
   verilog_systemverilog-vim = buildVimPluginFrom2Nix {
-    name = "verilog_systemverilog-vim-2018-09-06";
+    name = "verilog_systemverilog-vim-2018-09-29";
     src = fetchFromGitHub {
       owner = "vhda";
       repo = "verilog_systemverilog.vim";
-      rev = "2cb0da6a325f19bf662c60c5363bb59e98442c33";
-      sha256 = "1gyyaqj7assryaprxm9a3zcnappr3lvqmgphapa53qq6s6vmljw5";
+      rev = "b82caf39715d7645bd6229e033bea5bb5144ae8c";
+      sha256 = "0i7bqg9aw6c3f0zhs7rq38m44xv7qlhhg0nabnhpk2xkw84cms69";
     };
   };
 
@@ -1739,12 +1739,12 @@
   };
 
   vim-airline = buildVimPluginFrom2Nix {
-    name = "vim-airline-2018-09-25";
+    name = "vim-airline-2018-10-03";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "a0298263b7fd55827839862ffd3a8d5b2a787a5c";
-      sha256 = "115mwvkqhfrssihrlb1ds3f82gqmp6ph75nw24l4lwdr1nv6p1r0";
+      rev = "f045452743736d53c7471bfb4698fd48569dc1e0";
+      sha256 = "16wmigvwxxryx1jkpsfbxwmlglrv1jjmmpckgsxwg4j6v4vkgk4g";
     };
   };
 
@@ -1959,12 +1959,12 @@
   };
 
   vim-dispatch = buildVimPluginFrom2Nix {
-    name = "vim-dispatch-2018-09-19";
+    name = "vim-dispatch-2018-10-02";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "72a08f297e71f25e569f66a825ce2878b038e045";
-      sha256 = "1d0swdrgp3xls4ac854xsqpjipbml9a8yqxcg888xnm8jsqfhqn1";
+      rev = "ab7470d4b03bae9880bf2b5cef60fc0fb51b1101";
+      sha256 = "01slb3lcbdba0a4xky6i5xflh1cjm0aq6g8yyfzrgn4w8pq50h9p";
     };
   };
 
@@ -2119,12 +2119,12 @@
   };
 
   vim-ghost = buildVimPluginFrom2Nix {
-    name = "vim-ghost-2018-09-12";
+    name = "vim-ghost-2018-10-02";
     src = fetchFromGitHub {
       owner = "raghur";
       repo = "vim-ghost";
-      rev = "4e06bc238d23e6eb245a766105c62344a132b3f4";
-      sha256 = "1n5m7xbv4i0bwdqm39n9j6brbjayk4cpq38sqqbvgh3lia7nkbpv";
+      rev = "306d83c152cd9db54bc45c5a21b92615d07bd4c7";
+      sha256 = "1p6fjqlp1w7zy36isb1i3xzmjvlh2ng6iv3mb2ixllmiq4bdk26i";
     };
   };
 
@@ -2169,12 +2169,12 @@
   };
 
   vim-go = buildVimPluginFrom2Nix {
-    name = "vim-go-2018-09-26";
+    name = "vim-go-2018-10-04";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "3d8e82ecb4f66a151f3c1bff84728fa4e3db0ca9";
-      sha256 = "1fy7xsqrdqs569g03hccxpi17qjkibspjjcpddw7a9n5hb7zp8rv";
+      rev = "92b360fca43553b56766aaccaf3d9166575e6061";
+      sha256 = "0wq2v9damr8yp3nxxwdl1kd1vkndb456m33yjky7nrmxyshhxgnm";
     };
   };
 
@@ -2259,12 +2259,12 @@
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
-    name = "vim-highlightedyank-2018-09-28";
+    name = "vim-highlightedyank-2018-10-02";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
-      rev = "ac2eeb8b384c27a4167fdf1788c2cae93f34ab07";
-      sha256 = "0i4ddagfbrii96msgfsmjsg356z3y71nab84850xqy74m2iivl8m";
+      rev = "26a2ecc1ac08462680074a721c265e42b1c545ba";
+      sha256 = "0ak8jws7qxjf52l3a97ks1ylf5ri7x03b90s2v4q3il4sry5h0m7";
     };
   };
 
@@ -2359,12 +2359,12 @@
   };
 
   vim-janah = buildVimPluginFrom2Nix {
-    name = "vim-janah-2017-04-09";
+    name = "vim-janah-2018-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-janah";
-      rev = "684a3343f36bb0f1e7c33281321fa3a70c08aa26";
-      sha256 = "0hq626cvyz5x6fmsqgdfp46pr783p6cz8bl49278gkcdgfb91wnr";
+      rev = "3b8ae976987b6ade2abeac25f0208e8bc90d7138";
+      sha256 = "16bygyri9qxyhl8n8md945wwy1i9lss4hwxa7yjl9ms2fzzragv4";
     };
   };
 
@@ -2830,12 +2830,12 @@
   };
 
   vim-ruby = buildVimPluginFrom2Nix {
-    name = "vim-ruby-2018-08-13";
+    name = "vim-ruby-2018-10-02";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
-      rev = "68aa43c524b20aaaa269265d315a87b89e6d0148";
-      sha256 = "027lyy5wjgi0p23qxiaxssbargdv81ip2z04l7c2wgx4lgs5mi86";
+      rev = "a85f078d06ed11faf1b243315d67b6f37326686d";
+      sha256 = "1d76yjbk9jmh3ci1fbdzsfip0r1npk07vlwibjv4cli8icq5pghz";
     };
   };
 
@@ -2900,12 +2900,12 @@
   };
 
   vim-signify = buildVimPluginFrom2Nix {
-    name = "vim-signify-2018-08-05";
+    name = "vim-signify-2018-10-01";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-signify";
-      rev = "40d1a4ee19ac61ad772dfcedc4d4bd21810f1c0b";
-      sha256 = "1gvj2dqq96mf8h2jdyxr21jrvhr6r9bq9lsxgagvzi4ab81fm507";
+      rev = "ce2dd937bf3a394ef2fbeda8ab56d2b4437be3c3";
+      sha256 = "08ah81bn0cmqphi2lw2y7pjdg8sw2wjwc3p3j6pj0gyqx2bsf408";
     };
   };
 
@@ -2980,12 +2980,12 @@
   };
 
   vim-startify = buildVimPluginFrom2Nix {
-    name = "vim-startify-2018-08-02";
+    name = "vim-startify-2018-10-02";
     src = fetchFromGitHub {
       owner = "mhinz";
       repo = "vim-startify";
-      rev = "187e46aea30e242ef214cbfb20afc0ad49d38171";
-      sha256 = "15gmqm5qscnj70icibdjlw68r5zk1p5xzbznbzhar8l1yd5kkqgk";
+      rev = "556bf1d507dfaddfba4b5795716ea20f8ba902ac";
+      sha256 = "1jjj7iij08455rlc705m3pnbjg87r2l29jclzkiy7nsvjjh3dfwx";
     };
   };
 
@@ -3159,13 +3159,23 @@
     };
   };
 
+  vim-vue = buildVimPluginFrom2Nix {
+    name = "vim-vue-2018-09-01";
+    src = fetchFromGitHub {
+      owner = "posva";
+      repo = "vim-vue";
+      rev = "2df46524311e719af51394726f5f88fc2aa08bd2";
+      sha256 = "0bsg8j4871jvmsyi5mmpyhkmjxajf5ss3dx9072wdc21cx8pn185";
+    };
+  };
+
   vim-wakatime = buildVimPluginFrom2Nix {
-    name = "vim-wakatime-2018-09-24";
+    name = "vim-wakatime-2018-10-03";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "17e5d1b21128b955dba244d5d0d5ad9f359a5c68";
-      sha256 = "0v2hb6hzcdn4ks691m511las5mli6igfg3srxnr3a09krgxi512f";
+      rev = "3fe47846572032fc83d8300c596de6ded4f456a2";
+      sha256 = "0qgy2chdisym34892kzs3gbvq7bj64mxs4q4475hhwpr46p7lyrn";
     };
   };
 
@@ -3270,12 +3280,12 @@
   };
 
   vimtex = buildVimPluginFrom2Nix {
-    name = "vimtex-2018-09-28";
+    name = "vimtex-2018-10-03";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "196a8aa7e9f9d04c69adfa7643b0e6ae6b0d3b3b";
-      sha256 = "0d7322cflmi3sxh6nncslp3qdgd766k2mcplgji2744xff65bvma";
+      rev = "10f3304f39ec1b49e77bb351d0972db179cce1b3";
+      sha256 = "1yqajhr5q12yfjn9nvw4d8s89pcgkgv5hi1gd9wj7wjxk85wa6xm";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8f0527e1b36d..a503f0bedadc 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -204,6 +204,7 @@ parsonsmatt/intero-neovim
 peterhoeg/vim-qml
 phanviet/vim-monokai-pro
 plasticboy/vim-markdown
+posva/vim-vue
 powerman/vim-plugin-AnsiEsc
 python-mode/python-mode
 Quramy/tsuquyomi

From b49c4d2b2e679818e91032bd501eff8ace46316e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 5 Oct 2018 06:14:31 -0700
Subject: [PATCH 2463/3253] eid-mw: 4.4.7 -> 4.4.8 (#47816)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eid-mw/versions
---
 pkgs/tools/security/eid-mw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 143b95d92c40..cc61cce463ce 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.4.7";
+  version = "4.4.8";
 
   src = fetchFromGitHub {
-    sha256 = "0b1i4slxw1l2p1gpfhd5v6n1fzwi8qwf4gsbxmrbhj9qxi4c73ci"; 
+    sha256 = "0khpkpfnbin46aqnb9xkhh5d89lvsshgp4kqpdgk95l73lx8kdqp"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From 75e4fcf26727fc0cb5ae2f763dbf65741a843c6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 5 Oct 2018 06:14:50 -0700
Subject: [PATCH 2464/3253] containerd: 1.1.2 -> 1.1.4 (#47807)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/containerd/versions
---
 pkgs/applications/virtualization/containerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 03b60a5f3853..a1ff9bde3ed8 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "containerd-${version}";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v";
+    sha256 = "1d4qnviv20zi3zk17zz8271mlfqqgfrxblw86izwwfvj3cvsyrah";
   };
 
   hardeningDisable = [ "fortify" ];

From 360054f41788e21649c415951851a8bfcd7545c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 5 Oct 2018 06:15:13 -0700
Subject: [PATCH 2465/3253] brogue: 1.7.4 -> 1.7.5 (#47830)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/brogue/versions
---
 pkgs/games/brogue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix
index d48dc8e8006e..4cfac27451b0 100644
--- a/pkgs/games/brogue/default.nix
+++ b/pkgs/games/brogue/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "brogue-${version}";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchurl {
     url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2";
-    sha256 = "1lygf17hm7wqlp0jppaz8dn9a9ksmxz12vw7jyfavvqpwdgz79gb";
+    sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7";
   };
 
   prePatch = ''

From 4b613137e4ca733360501108b3a97ac74567cdd7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 5 Oct 2018 15:32:51 +0200
Subject: [PATCH 2466/3253] sec: 2.8.0 -> 2.8.1 (#47857)

---
 pkgs/tools/admin/sec/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index dede514729ec..6ce42b69f2cf 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -1,11 +1,13 @@
-{ fetchurl, perl, stdenv }:
+{ fetchFromGitHub, perl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "sec-2.8.0";
+  name = "sec-${meta.version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
-    sha256 = "0q9fhkkh0n0jya4kf5c54smk4xbnv01hqhip2y6fnnj9imwskymz";
+  src = fetchFromGitHub {
+    owner = "simple-evcorr";
+    repo = "sec";
+    rev = meta.version;
+    sha256 = "17qzw7k1r3svagaf6jb7166grwqsyxwd6p23b2m9q9h3ggcwynp9";
   };
 
   buildInputs = [ perl ];
@@ -20,10 +22,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://simple-evcorr.sourceforge.net/;
+    homepage = https://simple-evcorr.github.io;
     license = stdenv.lib.licenses.gpl2;
     description = "Simple Event Correlator";
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.all;
+    version = "2.8.1";
   };
 }

From 03d770c0ee3a16f4f67f6074d870fbc17505db7b Mon Sep 17 00:00:00 2001
From: qolii <36613499+qolii@users.noreply.github.com>
Date: Fri, 5 Oct 2018 13:48:07 +0000
Subject: [PATCH 2467/3253] linux-hardkernel: 4.14.69-148 -> 4.14.73-149
 (#47896)

---
 pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index 0afb92d705c6..fc9cb2f238b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,10 +1,10 @@
 { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.14.69-148";
+  version = "4.14.73-149";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.69";
+  modDirVersion = "4.14.73";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "1grsmb7lnxnkva03nh8ny4zizvrxjim5kf5ssqkcbfz5mx1fqni0";
+    sha256 = "1zc5py6v3xyvy6dwghnqb7nsn9l1aib3d96i5bqy9dd56vyiy5m2";
   };
 
   defconfig = "odroidxu4_defconfig";

From a5d6705e20d730abb6fb1ad99c4499fc8bef2b3f Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Fri, 5 Oct 2018 16:48:38 +0300
Subject: [PATCH 2468/3253] imagemagick7: 7.0.8-6 -> 7.0.8-12 (#47851)

---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 7881741a1cbb..e164a789459b 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.8-6";
-    sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3";
+    version = "7.0.8-12";
+    sha256 = "0rq7qhbfsxvclazi1l6kqi4wqsph7hmzcjbh2pmf0276mrkgm7cd";
     patches = [];
   };
 in

From 65589faa2f4c6e922e51d41d6487de0ca4a7d143 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 5 Oct 2018 15:43:08 +0200
Subject: [PATCH 2469/3253] zn_poly: 0.9 -> 0.9.1

Sage has taken over maintenance since the original author no longer
maintains the project.
---
 .../science/math/zn_poly/default.nix          | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index 19d63d89834e..ad4d4c017376 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -1,17 +1,25 @@
 { stdenv
-, fetchurl
+, lib
+, fetchFromGitLab
+, fetchpatch
 , gmp
 , python2
+, tune ? false # tune to hardware, impure
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9";
+  version = "0.9.1";
   pname = "zn_poly";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/releases/zn_poly-${version}.tar.gz";
-    sha256 = "1kxl25av7i3v68k32hw5bayrfcvmahmqvs97mlh9g238gj4qb851";
+  # sage has picked up the maintenance (bug fixes and building, not development)
+  # from the original, now unmaintained project which can be found at
+  # http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/
+  src = fetchFromGitLab {
+    owner = "sagemath";
+    repo = "zn_poly";
+    rev = version;
+    sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb";
   };
 
   buildInputs = [
@@ -22,27 +30,42 @@ stdenv.mkDerivation rec {
     python2 # needed by ./configure to create the makefile
   ];
 
-  libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}";
+  # name of library file ("libzn_poly.so")
+  libbasename = "libzn_poly";
+  libext = "${stdenv.targetPlatform.extensions.sharedLibrary}";
 
   makeFlags = [ "CC=cc" ];
 
   # Tuning (either autotuning or with hand-written paramters) is possible
   # but not implemented here.
   # It seems buggy anyways (see homepage).
-  buildFlags = [ "all" libname ];
+  buildFlags = [ "all" "${libbasename}${libext}" ];
 
+  configureFlags = lib.optionals (!tune) [
+    "--disable-tuning"
+  ];
+
+  patches = [
+    # fix format-security by not passing variables directly to printf
+    # https://gitlab.com/sagemath/zn_poly/merge_requests/1
+    (fetchpatch {
+      name = "format-security.patch";
+      url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch";
+      sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1";
+    })
+  ];
 
   # `make install` fails to install some header files and the lib file.
   installPhase = ''
     mkdir -p "$out/include/zn_poly"
     mkdir -p "$out/lib"
-    cp "${libname}" "$out/lib"
+    cp "${libbasename}"*"${libext}" "$out/lib"
     cp include/*.h "$out/include/zn_poly"
   '';
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/;
     description = "Polynomial arithmetic over Z/nZ";
     license = with licenses; [ gpl3 ];

From 9db397351a833cddfed0d3cefa320e6fe7607823 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 5 Oct 2018 14:03:20 +0000
Subject: [PATCH 2470/3253] unoconv: fix reference to libreoffice (#47847)

---
 pkgs/tools/text/unoconv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix
index ac90cb556f90..879f903ade97 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/pkgs/tools/text/unoconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, libreoffice, asciidoc, makeWrapper
+{ stdenv, fetchurl, python3, libreoffice-unwrapped, asciidoc, makeWrapper
 # whether to install odt2pdf/odt2doc/... symlinks to unoconv
 , installSymlinks ? true
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -i "s|/usr/bin/env python.*|${python3}/bin/${python3.executable}|" "$out/bin/unoconv"
-    wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice}/lib/libreoffice/program/"
+    wrapProgram "$out/bin/unoconv" --set UNO_PATH "${libreoffice-unwrapped}/lib/libreoffice/program/"
   '' + (if installSymlinks then ''
     make install-links prefix="$out"
   '' else "");

From f835f77e02018c77b48fc7f4911f3fee97f9d777 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 2 Oct 2018 16:06:33 -0400
Subject: [PATCH 2471/3253] nixpkgs: Start documenting library functions in XML

Covers assert functions and about half of the attrsets functions.

Some internal consistency around IDs could be improved.
---
 doc/Makefile                       |   2 +-
 doc/functions.xml                  |   2 +-
 doc/functions/library.xml          |  15 +
 doc/functions/library/asserts.xml  | 113 ++++
 doc/functions/library/attrsets.xml | 938 +++++++++++++++++++++++++++++
 5 files changed, 1068 insertions(+), 2 deletions(-)
 create mode 100644 doc/functions/library.xml
 create mode 100644 doc/functions/library/asserts.xml
 create mode 100644 doc/functions/library/attrsets.xml

diff --git a/doc/Makefile b/doc/Makefile
index 173e1c0b19ee..65a37eb05a3a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -69,7 +69,7 @@ highlightjs:
 	cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
 
 
-manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml
+manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml **/**/*.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
 .version:
diff --git a/doc/functions.xml b/doc/functions.xml
index 88011061ae6e..4193bb49f77a 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -7,7 +7,7 @@
   The nixpkgs repository has several utility functions to manipulate Nix
   expressions.
  </para>
-
+ <xi:include href="functions/library.xml" />
  <xi:include href="functions/overrides.xml" />
  <xi:include href="functions/generators.xml" />
  <xi:include href="functions/debug.xml" />
diff --git a/doc/functions/library.xml b/doc/functions/library.xml
new file mode 100644
index 000000000000..901423c52a18
--- /dev/null
+++ b/doc/functions/library.xml
@@ -0,0 +1,15 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-functions-library">
+ <title>Nixpkgs Library Functions</title>
+
+ <para>
+  Nixpkgs provides a standard library at <varname>pkgs.lib</varname>, or
+  through <code>import &lt;nixpkgs/lib&gt;</code>.
+ </para>
+
+ <xi:include href="./library/asserts.xml" />
+
+ <xi:include href="./library/attrsets.xml" />
+</section>
diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml
new file mode 100644
index 000000000000..1f42078c8cf3
--- /dev/null
+++ b/doc/functions/library/asserts.xml
@@ -0,0 +1,113 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-functions-library-asserts">
+ <title>Assert functions</title>
+
+ <section xml:id="function-library-lib.asserts.assertMsg">
+  <title><function>lib.asserts.assertMsg</function></title>
+
+  <subtitle><literal>assertMsg :: Bool -> String -> Bool</literal>
+  </subtitle>
+
+  <para>
+   Print a trace message if <literal>pred</literal> is false.
+  </para>
+
+  <para>
+   Intended to be used to augment asserts with helpful error messages.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pred</varname>
+    </term>
+    <listitem>
+     <para>
+      Condition under which the <varname>msg</varname> should
+      <emphasis>not</emphasis> be printed.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>msg</varname>
+    </term>
+    <listitem>
+     <para>
+      Message to print.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.asserts.assertMsg-example-false">
+   <title>Printing when the predicate is false</title>
+<programlisting><![CDATA[
+assert lib.asserts.assertMsg ("foo" == "bar") "foo is not bar, silly"
+stderr> trace: foo is not bar, silly
+stderr> assert failed
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.asserts.assertOneOf">
+  <title><function>lib.asserts.assertOneOf</function></title>
+
+  <subtitle><literal>assertOneOf :: String -> String ->
+      StringList -> Bool</literal>
+  </subtitle>
+
+  <para>
+   Specialized <function>asserts.assertMsg</function> for checking if
+   <varname>val</varname> is one of the elements of <varname>xs</varname>.
+   Useful for checking enums.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>name</varname>
+    </term>
+    <listitem>
+     <para>
+      The name of the variable the user entered <varname>val</varname> into,
+      for inclusion in the error message.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>val</varname>
+    </term>
+    <listitem>
+     <para>
+      The value of what the user provided, to be compared against the values in
+      <varname>xs</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>xs</varname>
+    </term>
+    <listitem>
+     <para>
+      The list of valid values.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.asserts.assertOneOf-example">
+   <title>Ensuring a user provided a possible value</title>
+<programlisting><![CDATA[
+let sslLibrary = "bearssl";
+in lib.asserts.assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ];
+=> false
+stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl"
+        ]]></programlisting>
+  </example>
+ </section>
+</section>
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
new file mode 100644
index 000000000000..7ad3f949a024
--- /dev/null
+++ b/doc/functions/library/attrsets.xml
@@ -0,0 +1,938 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xml:id="sec-functions-library-attrset">
+ <title>Attribute-Set Functions</title>
+
+ <section xml:id="function-library-lib.attrsets.attrByPath">
+  <title><function>lib.attrset.attrByPath</function></title>
+
+  <subtitle><literal>attrByPath :: [String] -> Any -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Return an attribute from within nested attribute sets.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrPath</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of strings representing the path through the nested attribute set
+      <varname>set</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>default</varname>
+    </term>
+    <listitem>
+     <para>
+      Default value if <varname>attrPath</varname> does not resolve to an
+      existing value.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The nested attributeset to select values from.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrset.attrByPath-example-value-exists">
+   <title>Extracting a value from a nested attribute set</title>
+<programlisting><![CDATA[
+let set = { a = { b = 3; }; };
+in lib.attrsets.attrByPath [ "a" "b" ] 0 set
+=> 3
+]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrset.attrByPath-example-default-value">
+   <title>No value at the path, instead using the default</title>
+<programlisting><![CDATA[
+lib.attrsets.attrByPath [ "a" "b" ] 0 {}
+=> 0
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.hasAttrByPath">
+  <title><function>lib.attrsets.hasAttrByPath</function></title>
+
+  <subtitle><literal>hasAttrByPath :: [String] -> AttrSet -> Bool</literal>
+  </subtitle>
+
+  <para>
+   Determine if an attribute exists within a nested attribute set.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrPath</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of strings representing the path through the nested attribute set
+      <varname>set</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The nested attributeset to check.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.hasAttrByPath-example">
+   <title>A nested value does exist inside a set</title>
+<programlisting><![CDATA[
+lib.attrsets.hasAttrByPath
+  [ "a" "b" "c" "d" ]
+  { a = { b = { c = { d = 123; }; }; }; }
+=> true
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.setAttrByPath">
+  <title><function>lib.attrsets.setAttrByPath</function></title>
+
+  <subtitle><literal>setAttrByPath :: [String] -> Any -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Create a new attribute set with <varname>value</varname> set at the nested
+   attribute location specified in <varname>attrPath</varname>.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrPath</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of strings representing the path through the nested attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>value</varname>
+    </term>
+    <listitem>
+     <para>
+      The value to set at the location described by
+      <varname>attrPath</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.setAttrByPath-example">
+   <title>Creating a new nested attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.setAttrByPath [ "a" "b" ] 3
+=> { a = { b = 3; }; }
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.getAttrFromPath">
+  <title><function>lib.attrsets.getAttrFromPath</function></title>
+
+  <subtitle><literal>getAttrFromPath :: [String] -> AttrSet -> Value</literal>
+  </subtitle>
+
+  <para>
+   Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except
+   without a default, and it will throw if the value doesn't exist.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrPath</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of strings representing the path through the nested attribute set
+      <varname>set</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The nested attribute set to find the value in.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.getAttrPath-example-success">
+   <title>Succesfully getting a value from an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.getAttrFromPath [ "a" "b" ] { a = { b = 3; }; }
+=> 3
+]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrsets.getAttrPath-example-throw">
+   <title>Throwing after failing to get a value from an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.getAttrFromPath [ "x" "y" ] { }
+=> error: cannot find attribute `x.y'
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.attrVals">
+  <title><function>lib.attrsets.attrVals</function></title>
+
+  <subtitle><literal>attrVals :: [String] -> AttrSet -> [Any]</literal>
+  </subtitle>
+
+  <para>
+   Return the specified attributes from a set. All values must exist.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>nameList</varname>
+    </term>
+    <listitem>
+     <para>
+      The list of attributes to fetch from <varname>set</varname>. Each
+      attribute name must exist on the attrbitue set.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The set to get attribute values from.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.attrVals-example-success">
+   <title>Getting several values from an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.attrVals [ "a" "b" "c" ] { a = 1; b = 2; c = 3; }
+=> [ 1 2 3 ]
+]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrsets.attrVals-failure">
+   <title>Getting missing values from an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.attrVals [ "d" ] { }
+error: attribute 'd' missing
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.attrValues">
+  <title><function>lib.attrsets.attrValues</function></title>
+
+  <subtitle><literal>attrValues :: AttrSet -> [Any]</literal>
+  </subtitle>
+
+  <para>
+   Get all the attribute values from an attribute set.
+  </para>
+
+  <para>
+   Provides a backwards-compatible interface of
+   <function>builtins.attrValues</function> for Nix version older than 1.8.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.attrValues-example">
+   <title></title>
+<programlisting><![CDATA[
+lib.attrsets.attrValues { a = 1; b = 2; c = 3; }
+=> [ 1 2 3 ]
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.catAttrs">
+  <title><function>lib.attrsets.catAttrs</function></title>
+
+  <subtitle><literal>catAttrs :: String -> AttrSet -> [Any]</literal>
+  </subtitle>
+
+  <para>
+   Collect each attribute named `attr' from the list of attribute sets,
+   <varname>sets</varname>. Sets that don't contain the named attribute are
+   ignored.
+  </para>
+
+  <para>
+   Provides a backwards-compatible interface of
+   <function>builtins.catAttrs</function> for Nix version older than 1.9.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attr</varname>
+    </term>
+    <listitem>
+     <para>
+      Attribute name to select from each attribute set in
+      <varname>sets</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>sets</varname>
+    </term>
+    <listitem>
+     <para>
+      The list of attribute sets to select <varname>attr</varname> from.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.catAttrs-example">
+   <title>Collect an attribute from a list of attribute sets.</title>
+   <para>
+    Attribute sets which don't have the attribute are ignored.
+   </para>
+<programlisting><![CDATA[
+catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
+=> [ 1 2 ]
+      ]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.filterAttrs">
+  <title><function>lib.attrsets.filterAttrs</function></title>
+
+  <subtitle><literal>filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Filter an attribute set by removing all attributes for which the given
+   predicate return false.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pred</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any -> Bool</literal>
+     </para>
+     <para>
+      Predicate which returns true to include an attribute, or returns false to
+      exclude it.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's name
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+     <para>
+      Returns <literal>true</literal> to include the attribute,
+      <literal>false</literal> to exclude the attribute.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to filter
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.filterAttrs-example">
+   <title>Filtering an attributeset</title>
+<programlisting><![CDATA[
+filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
+=> { foo = 1; }
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.filterAttrsRecursive">
+  <title><function>lib.attrsets.filterAttrsRecursive</function></title>
+
+  <subtitle><literal>filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Filter an attribute set recursively by removing all attributes for which the
+   given predicate return false.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pred</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any -> Bool</literal>
+     </para>
+     <para>
+      Predicate which returns true to include an attribute, or returns false to
+      exclude it.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's name
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+     <para>
+      Returns <literal>true</literal> to include the attribute,
+      <literal>false</literal> to exclude the attribute.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to filter
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.filterAttrsRecursive-example">
+   <title>Recursively filtering an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.filterAttrsRecursive
+  (n: v: v != null)
+  {
+    levelA = {
+      example = "hi";
+      levelB = {
+        hello = "there";
+        this-one-is-present = {
+          this-is-excluded = null;
+        };
+      };
+      this-one-is-also-excluded = null;
+    };
+    also-excluded = null;
+  }
+=> {
+     levelA = {
+       example = "hi";
+       levelB = {
+         hello = "there";
+         this-one-is-present = { };
+       };
+     };
+   }
+     ]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.foldAttrs">
+  <title><function>lib.attrsets.foldAttrs</function></title>
+
+  <subtitle><literal>foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any</literal>
+  </subtitle>
+
+  <para>
+   Apply fold function to values grouped by key.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>op</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>Any -> Any -> Any</literal>
+     </para>
+     <para>
+      Given a value <varname>val</varname> and a collector
+      <varname>col</varname>, combine the two.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>val</varname>
+       </term>
+       <listitem>
+        <para>
+         An attribute's value
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>col</varname>
+       </term>
+       <listitem>
+<!-- TODO: make this not bad, use more fold-ey terms -->
+        <para>
+         The result of previous <function>op</function> calls with other values
+         and <function>nul</function>.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>nul</varname>
+    </term>
+    <listitem>
+     <para>
+      The null-value, the starting value.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>list_of_attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of attribute sets to fold together by key.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.foldAttrs-example">
+   <title>Combining an attribute of lists in to one attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.foldAttrs
+  (n: a: [n] ++ a) []
+  [
+    { a = 2; b = 7; }
+    { a = 3; }
+    { b = 6; }
+  ]
+=> { a = [ 2 3 ]; b = [ 7 6 ]; }
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.collect">
+  <title><function>lib.attrsets.collect</function></title>
+
+  <subtitle><literal>collect :: (Any -> Bool) -> AttrSet -> [Any]</literal>
+  </subtitle>
+
+  <para>
+   Recursively collect sets that verify a given predicate named
+   <varname>pred</varname> from the set <varname>attrs</varname>. The recursion
+   stops when <varname>pred</varname> returns <literal>true</literal>.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pred</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>Any -> Bool</literal>
+     </para>
+     <para>
+      Given an attribute's value, determine if recursion should stop.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute set value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to recursively collect.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.collect-example-lists">
+   <title>Collecting all lists from an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.collect isList { a = { b = ["b"]; }; c = [1]; }
+=> [["b"] [1]]
+]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrsets.collect-example-outpath">
+   <title>Collecting all attribute-sets which contain the <literal>outPath</literal> attribute name.</title>
+<programlisting><![CDATA[
+collect (x: x ? outPath)
+  { a = { outPath = "a/"; }; b = { outPath = "b/"; }; }
+=> [{ outPath = "a/"; } { outPath = "b/"; }]
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.nameValuePair">
+  <title><function>lib.attrsets.nameValuePair</function></title>
+
+  <subtitle><literal>nameValuePair :: String -> Any -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Utility function that creates a <literal>{name, value}</literal> pair as
+   expected by <function>builtins.listToAttrs</function>.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>name</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute name.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>value</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute value.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.nameValuePair-example">
+   <title>Creating a name value pair</title>
+<programlisting><![CDATA[
+nameValuePair "some" 6
+=> { name = "some"; value = 6; }
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.mapAttrs">
+  <title><function>lib.attrsets.mapAttrs</function></title>
+
+  <subtitle><literal></literal>
+  </subtitle>
+
+  <para>
+   Apply a function to each element in an attribute set, creating a new
+   attribute set.
+  </para>
+
+  <para>
+   Provides a backwards-compatible interface of
+   <function>builtins.mapAttrs</function> for Nix version older than 2.1.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>fn</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any -> Any</literal>
+     </para>
+     <para>
+      Given an attribute's name and value, return a new value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.mapAttrs-example">
+   <title>Modifying each value of an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.mapAttrs
+  (name: value: name + "-" value)
+  { x = "foo"; y = "bar"; }
+=> { x = "x-foo"; y = "y-bar"; }
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.mapAttrs-prime">
+  <title><function>lib.attrsets.mapAttrs&apos;</function></title>
+
+  <subtitle><literal>mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Like <function>mapAttrs</function>, but allows the name of each attribute to
+   be changed in addition to the value. The applied function should return both
+   the new name and value as a <function>nameValuePair</function>.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>fn</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any -> { name = String; value = Any }</literal>
+     </para>
+     <para>
+      Given an attribute's name and value, return a new
+      <link
+       linkend="function-library-lib.attrsets.nameValuePair">name
+      value pair</link>.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to map over.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.mapAttrs-prime-example">
+   <title>Change the name and value of each attribute of an attribute set</title>
+<programlisting><![CDATA[
+lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name) ("bar-" + value))
+   { x = "a"; y = "b"; }
+=> { foo_x = "bar-a"; foo_y = "bar-b"; }
+
+    ]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.mapAttrsToList">
+  <title><function>lib.attrsets.mapAttrsToList</function></title>
+
+  <subtitle><literal>mapAttrsToList :: (String -> Any -> Any) ->
+   AttrSet -> Any</literal>
+  </subtitle>
+
+  <para>
+   Call <varname>fn</varname> for each attribute in the given
+   <varname>set</varname> and return the result in a list.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>fn</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any -> Any</literal>
+     </para>
+     <para>
+      Given an attribute's name and value, return a new value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to map over.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.mapAttrsToList-example">
+   <title>Combine attribute values and names in to a list</title>
+<programlisting><![CDATA[
+lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
+   { x = "a"; y = "b"; }
+=> [ "x=a" "y=b" ]
+]]></programlisting>
+  </example>
+ </section>
+
+ <section xml:id="function-library-lib.attrsets.mapAttrsRecursive">
+  <title><function>lib.attrsets.mapAttrsRecursive</function></title>
+
+  <subtitle><literal>mapAttrsRecursive :: ([String] > Any -> Any) -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <para>
+   Like <function>mapAttrs</function>, except that it recursively applies
+   itself to attribute sets. Also, the first argument of the argument function
+   is a <emphasis>list</emphasis> of the names of the containing attributes.
+  </para>
+ </section>
+</section>

From 4312cfdbda1855088905a3d9959a4fac362fd051 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 5 Oct 2018 10:48:42 -0400
Subject: [PATCH 2472/3253] version.nix: extract revision-fetching function

---
 lib/trivial.nix                | 10 ++++++++++
 nixos/modules/misc/version.nix |  5 +----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index b1eea0bf1247..938df6ced476 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -105,6 +105,16 @@ rec {
     then lib.strings.fileContents suffixFile
     else "pre-git";
 
+  # Attempt to get the revision nixpkgs is from
+  revisionWithDefault = default:
+    let
+      revisionFile = "${toString ./..}/.git-revision";
+      gitRepo      = "${toString ./..}/.git";
+    in if lib.pathIsDirectory gitRepo
+       then lib.commitIdFromGitRepo gitRepo
+       else if lib.pathExists revisionFile then lib.fileContents revisionFile
+       else default;
+
   nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
 
   # Whether we're being called by nix-shell.
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index c593adcdae6e..6d78b7c593f8 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -5,7 +5,6 @@ with lib;
 let
   cfg = config.system.nixos;
 
-  revisionFile = "${toString pkgs.path}/.git-revision";
   gitRepo      = "${toString pkgs.path}/.git";
   gitCommitId  = lib.substring 0 7 (commitIdFromGitRepo gitRepo);
 in
@@ -37,9 +36,7 @@ in
     nixos.revision = mkOption {
       internal = true;
       type = types.str;
-      default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
-                else if pathExists revisionFile then fileContents revisionFile
-                else "master";
+      default = lib.trivial.revisionWithDefault "master";
       description = "The Git revision from which this NixOS configuration was built.";
     };
 

From 5daee73ce41652d21743a7304b4fd3f9da926c35 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 5 Oct 2018 10:46:58 -0400
Subject: [PATCH 2473/3253] Generate links to function definitions

Hydra passes the full revision in to the input, which we pass through.

If we don't get this ,we try to get it from other sources, or default to
master which should have the definition in a close-ish location.

All published docs should have theURL resolve properly, only local
hackers will have the link break.
---
 doc/.gitignore                     |  1 +
 doc/Makefile                       |  8 ++-
 doc/default.nix                    |  5 +-
 doc/functions/library/asserts.xml  |  4 ++
 doc/functions/library/attrsets.xml | 32 +++++++++++
 doc/lib-function-locations.nix     | 85 ++++++++++++++++++++++++++++++
 doc/shell.nix                      |  2 +-
 pkgs/top-level/release.nix         |  4 +-
 8 files changed, 135 insertions(+), 6 deletions(-)
 create mode 100644 doc/lib-function-locations.nix

diff --git a/doc/.gitignore b/doc/.gitignore
index d0ba103fa9f1..cb07135e6858 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -4,3 +4,4 @@
 out
 manual-full.xml
 highlightjs
+functions/library/locations.xml
diff --git a/doc/Makefile b/doc/Makefile
index 65a37eb05a3a..c6aed62a9396 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,7 +19,7 @@ fix-misc-xml:
 
 .PHONY: clean
 clean:
-	rm -f ${MD_TARGETS} .version manual-full.xml
+	rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml
 	rm -rf ./out/ ./highlightjs
 
 .PHONY: validate
@@ -69,13 +69,17 @@ highlightjs:
 	cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
 
 
-manual-full.xml: ${MD_TARGETS} .version *.xml **/*.xml **/**/*.xml
+manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml *.xml **/*.xml **/**/*.xml
 	xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
 
 .version:
 	nix-instantiate --eval \
 		-E '(import ../lib).version' > .version
 
+functions/library/locations.xml:
+	nix-build ./lib-function-locations.nix \
+		--out-link ./functions/library/locations.xml
+
 %.section.xml: %.section.md
 	pandoc $^ -w docbook+smart \
 		-f markdown+smart \
diff --git a/doc/default.nix b/doc/default.nix
index 4c04128052bc..98b4b92be524 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -1,6 +1,7 @@
+{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
 let
-  pkgs = import ./.. { };
   lib = pkgs.lib;
+  locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
 in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
@@ -29,6 +30,8 @@ pkgs.stdenv.mkDerivation {
   ];
 
   postPatch = ''
+    rm -rf ./functions/library/locations.xml
+    ln -s ${locationsXml} ./functions/library/locations.xml
     echo ${lib.version} > .version
   '';
 
diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml
index 1f42078c8cf3..437850e408bc 100644
--- a/doc/functions/library/asserts.xml
+++ b/doc/functions/library/asserts.xml
@@ -10,6 +10,8 @@
   <subtitle><literal>assertMsg :: Bool -> String -> Bool</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.asserts.assertMsg" />
+
   <para>
    Print a trace message if <literal>pred</literal> is false.
   </para>
@@ -59,6 +61,8 @@ stderr> assert failed
       StringList -> Bool</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.asserts.assertOneOf" />
+
   <para>
    Specialized <function>asserts.assertMsg</function> for checking if
    <varname>val</varname> is one of the elements of <varname>xs</varname>.
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 7ad3f949a024..6f23e267bab2 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -10,6 +10,8 @@
   <subtitle><literal>attrByPath :: [String] -> Any -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.attrByPath" />
+
   <para>
    Return an attribute from within nested attribute sets.
   </para>
@@ -73,6 +75,8 @@ lib.attrsets.attrByPath [ "a" "b" ] 0 {}
   <subtitle><literal>hasAttrByPath :: [String] -> AttrSet -> Bool</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.hasAttrByPath" />
+
   <para>
    Determine if an attribute exists within a nested attribute set.
   </para>
@@ -118,6 +122,8 @@ lib.attrsets.hasAttrByPath
   <subtitle><literal>setAttrByPath :: [String] -> Any -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.setAttrByPath" />
+
   <para>
    Create a new attribute set with <varname>value</varname> set at the nested
    attribute location specified in <varname>attrPath</varname>.
@@ -162,6 +168,8 @@ lib.attrsets.setAttrByPath [ "a" "b" ] 3
   <subtitle><literal>getAttrFromPath :: [String] -> AttrSet -> Value</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.getAttrFromPath" />
+
   <para>
    Like <xref linkend="function-library-lib.attrsets.attrByPath" /> except
    without a default, and it will throw if the value doesn't exist.
@@ -214,6 +222,8 @@ lib.attrsets.getAttrFromPath [ "x" "y" ] { }
   <subtitle><literal>attrVals :: [String] -> AttrSet -> [Any]</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.attrVals" />
+
   <para>
    Return the specified attributes from a set. All values must exist.
   </para>
@@ -265,6 +275,8 @@ error: attribute 'd' missing
   <subtitle><literal>attrValues :: AttrSet -> [Any]</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.attrValues" />
+
   <para>
    Get all the attribute values from an attribute set.
   </para>
@@ -302,6 +314,8 @@ lib.attrsets.attrValues { a = 1; b = 2; c = 3; }
   <subtitle><literal>catAttrs :: String -> AttrSet -> [Any]</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.catAttrs" />
+
   <para>
    Collect each attribute named `attr' from the list of attribute sets,
    <varname>sets</varname>. Sets that don't contain the named attribute are
@@ -355,6 +369,8 @@ catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
   <subtitle><literal>filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrs" />
+
   <para>
    Filter an attribute set by removing all attributes for which the given
    predicate return false.
@@ -428,6 +444,8 @@ filterAttrs (n: v: n == "foo") { foo = 1; bar = 2; }
   <subtitle><literal>filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.filterAttrsRecursive" />
+
   <para>
    Filter an attribute set recursively by removing all attributes for which the
    given predicate return false.
@@ -523,6 +541,8 @@ lib.attrsets.filterAttrsRecursive
   <subtitle><literal>foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.foldAttrs" />
+
   <para>
    Apply fold function to values grouped by key.
   </para>
@@ -609,6 +629,8 @@ lib.attrsets.foldAttrs
   <subtitle><literal>collect :: (Any -> Bool) -> AttrSet -> [Any]</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.collect" />
+
   <para>
    Recursively collect sets that verify a given predicate named
    <varname>pred</varname> from the set <varname>attrs</varname>. The recursion
@@ -677,6 +699,8 @@ collect (x: x ? outPath)
   <subtitle><literal>nameValuePair :: String -> Any -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.nameValuePair" />
+
   <para>
    Utility function that creates a <literal>{name, value}</literal> pair as
    expected by <function>builtins.listToAttrs</function>.
@@ -720,6 +744,8 @@ nameValuePair "some" 6
   <subtitle><literal></literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs" />
+
   <para>
    Apply a function to each element in an attribute set, creating a new
    attribute set.
@@ -785,6 +811,8 @@ lib.attrsets.mapAttrs
   <subtitle><literal>mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrs-prime" />
+
   <para>
    Like <function>mapAttrs</function>, but allows the name of each attribute to
    be changed in addition to the value. The applied function should return both
@@ -860,6 +888,8 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name)
    AttrSet -> Any</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsToList" />
+
   <para>
    Call <varname>fn</varname> for each attribute in the given
    <varname>set</varname> and return the result in a list.
@@ -929,6 +959,8 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
   <subtitle><literal>mapAttrsRecursive :: ([String] > Any -> Any) -> AttrSet -> AttrSet</literal>
   </subtitle>
 
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursive" />
+
   <para>
    Like <function>mapAttrs</function>, except that it recursively applies
    itself to attribute sets. Also, the first argument of the argument function
diff --git a/doc/lib-function-locations.nix b/doc/lib-function-locations.nix
new file mode 100644
index 000000000000..ae7036e46264
--- /dev/null
+++ b/doc/lib-function-locations.nix
@@ -0,0 +1,85 @@
+{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
+let
+  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
+
+  libDefPos = set:
+    builtins.map
+      (name: {
+        name = name;
+        location = builtins.unsafeGetAttrPos name set;
+      })
+      (builtins.attrNames set);
+
+  libset = toplib:
+    builtins.map
+      (subsetname: {
+        subsetname = subsetname;
+        functions = libDefPos toplib."${subsetname}";
+      })
+      (builtins.filter
+        (name: builtins.isAttrs toplib."${name}")
+        (builtins.attrNames toplib));
+
+  nixpkgsLib = pkgs.lib;
+
+  flattenedLibSubset = { subsetname, functions }:
+  builtins.map
+    (fn: {
+      name = "lib.${subsetname}.${fn.name}";
+      value = fn.location;
+    })
+    functions;
+
+  locatedlibsets = libs: builtins.map flattenedLibSubset (libset libs);
+  removeFilenamePrefix = prefix: filename:
+    let
+    prefixLen = (builtins.stringLength prefix) + 1; # +1 to remove the leading /
+      filenameLen = builtins.stringLength filename;
+      substr = builtins.substring prefixLen filenameLen filename;
+      in substr;
+
+  removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);
+
+  liblocations =
+    builtins.filter
+      (elem: elem.value != null)
+      (nixpkgsLib.lists.flatten
+        (locatedlibsets nixpkgsLib));
+
+  fnLocationRelative = { name, value }:
+    {
+      inherit name;
+      value = value // { file = removeNixpkgs value.file; };
+    };
+
+  relativeLocs = (builtins.map fnLocationRelative liblocations);
+  sanitizeId = builtins.replaceStrings
+    [ "'"      ]
+    [ "-prime" ];
+
+  urlPrefix = "https://github.com/NixOS/nixpkgs/blob/${revision}";
+  xmlstrings = (nixpkgsLib.strings.concatMapStrings
+      ({ name, value }:
+      ''
+      <section><title>${name}</title>
+        <para xml:id="${sanitizeId name}">
+        Located at
+        <link
+          xlink:href="${urlPrefix}/${value.file}#L${builtins.toString value.line}">${value.file}:${builtins.toString value.line}</link>
+        in  <literal>&lt;nixpkgs&gt;</literal>.
+        </para>
+        </section>
+      '')
+      relativeLocs);
+
+in pkgs.writeText
+    "locations.xml"
+    ''
+    <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         version="5">
+         <title>All the locations for every lib function</title>
+         <para>This file is only for inclusion by other files.</para>
+         ${xmlstrings}
+    </section>
+    ''
diff --git a/doc/shell.nix b/doc/shell.nix
index 24fe20e81050..8ac2019f9d66 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,5 +1,5 @@
 { pkgs ? import ../. {} }:
-(import ./default.nix).overrideAttrs (x: {
+(import ./default.nix {}).overrideAttrs (x: {
   buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
 
 })
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 93400bf0ee65..59e3d5133bbe 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -8,7 +8,7 @@
 
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
 , officialRelease ? false
   # The platforms for which we build Nixpkgs.
 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
@@ -32,7 +32,7 @@ let
 
       metrics = import ./metrics.nix { inherit pkgs nixpkgs; };
 
-      manual = import ../../doc;
+      manual = import ../../doc { inherit pkgs nixpkgs; };
       lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };
 
       darwin-tested = if supportDarwin then pkgs.releaseTools.aggregate

From 76b97596c0577f964e741debfcd7f11b75059ff5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Fri, 5 Oct 2018 10:11:02 +0200
Subject: [PATCH 2474/3253] rtl-sdr: 0.5.4 -> 0.6.0

---
 pkgs/applications/misc/rtl-sdr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index bedfc563b1c0..ef9f9d09ac26 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rtl-sdr-${version}";
-  version = "0.5.4";
+  version = "0.6.0";
 
   src = fetchgit {
     url = "git://git.osmocom.org/rtl-sdr.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01";
+    rev = "refs/tags/${version}";
+    sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3624bb536244ea99f9f9a6d18ff00bbe4a5204af Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 5 Oct 2018 15:42:15 +0200
Subject: [PATCH 2475/3253] nixos-container: Force container to talk to host
 nix-daemon

When logging into a container by using
  nixos-container root-login
all nix-related commands in the container would fail, as they
tried to modify the nix db and nix store, which are mounted
read-only in the container.  We want nixos-container to not
try to modify the nix store at all, but instead delegate
any build commands to the nix daemon of the host operating system.

This already works for non-root users inside a nixos-container,
as it doesn't 'own' the nix-store, and thus defaults
to talking to the daemon socket at /nix/var/nix/daemon-socket/,
which is bind-mounted to the host daemon-socket, causing all nix
commands to be delegated to the host.

However, when we are the root user inside the container, we have the
same uid as the nix store owner, eventhough it's not actually
the same root user (due to user namespaces). Nix gets confused,
and is convinced it's running in single-user mode, and tries
to modify the nix store directly instead.

By setting `NIX_REMOTE=daemon` in `/etc/profile`, we force nix
to operate in multi-user mode, so that it will talk to the host
daemon instead, which will modify the nix store for the container.

This fixes #40355
---
 nixos/modules/virtualisation/container-config.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 5e368acd6d8b..561db7cabcfb 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -22,6 +22,13 @@ with lib;
     # Not supported in systemd-nspawn containers.
     security.audit.enable = false;
 
+    # Make sure that root user in container will talk to host nix-daemon
+    environment.etc."profile".text = ''
+    export NIX_REMOTE=daemon
+    '';
+
+
+
   };
 
 }

From bb31835b1d2d1933a6c1d2cb196491ba1efa9233 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 5 Oct 2018 15:48:41 +0200
Subject: [PATCH 2476/3253] Revert "Revert "Revert "doc: Update section about
 imperative containers"""

nixos-container can now execute nix commands again inside the container

This reverts commit 9622cd3b38ddbc7faa4cac2a48dbd70bd99570d0.
---
 .../administration/imperative-containers.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index fa380477f6cb..9bb62bc2ece9 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -73,7 +73,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  To change the configuration of the container, you can edit
+  There are several ways to change the configuration of the container. First,
+  on the host, you can edit
   <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
   and run
 <screen>
@@ -86,7 +87,8 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
   <xref linkend="opt-services.httpd.enable"/> = true;
   <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
   <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
-  '
+'
+
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
 </screen>
@@ -95,13 +97,11 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
  </para>
 
  <para>
-  Note that in previous versions of NixOS (17.09 and earlier) one could also
-  use all nix-related commands (like <command>nixos-rebuild switch</command>)
-  from inside the container. However, since the release of Nix 2.0 this is not
-  supported anymore. Supporting Nix commands inside the container might be
-  possible again in future versions. See
-  <link xlink:href="https://github.com/NixOS/nixpkgs/issues/40355">the github
-  issue</link> for tracking progress on this issue.
+  Alternatively, you can change the configuration from within the container
+  itself by running <command>nixos-rebuild switch</command> inside the
+  container. Note that the container by default does not have a copy of the
+  NixOS channel, so you should run <command>nix-channel --update</command>
+  first.
  </para>
 
  <para>

From 2ed17db8cdeb8e6385f8ac1153e862183813f244 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 5 Oct 2018 17:00:20 +0000
Subject: [PATCH 2477/3253] slurm: add lz4 dependency

Slurm looks for lz4 by default, and if it finds it can improve its compression techniques
---
 pkgs/servers/computing/slurm/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index ba0e57bb2be8..afb39ac9fb3e 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl
 , ncurses, mysql, gtk2, lua, hwloc, numactl
-, readline, freeipmi, libssh2, xorg
+, readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
 , enableX11 ? true
 }:
@@ -35,15 +35,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl
-      mysql.connector-c ncurses gtk2
+      mysql.connector-c ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
   configureFlags = with stdenv.lib;
-    [ "--with-munge=${munge}"
-      "--with-ssl=${openssl.dev}"
+    [ "--with-freeipmi=${freeipmi}"
       "--with-hwloc=${hwloc.dev}"
-      "--with-freeipmi=${freeipmi}"
+      "--with-lz4=${lz4}"
+      "--with-munge=${munge}"
+      "--with-ssl=${openssl.dev}"
       "--sysconfdir=/etc/slurm"
     ] ++ (optional (gtk2 == null)  "--disable-gtktest")
       ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");

From 11f1b22b4b5bb01ff25b3d64bd780c39ce1353cf Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 5 Oct 2018 20:18:22 +0200
Subject: [PATCH 2478/3253] packer: 1.2.5 -> 1.3.1

---
 pkgs/development/tools/packer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 851c6f01b20f..25ec443be42b 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "packer-${version}";
-  version = "1.2.5";
+  version = "1.3.1";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "0wbf0iqfqphwy2snspf34j16ar4ghk0f1zsw8n8vj8gviiivlr7p";
+    sha256 = "0aif4ilzfv8qyqk4mn525r38xw2w34ryknzd2vrg6mcjcarm8myq";
   };
 
   meta = with stdenv.lib; {

From 5cdecca8b7c3c473c3968f0fe2d59f568c26b3f5 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Fri, 5 Oct 2018 18:36:08 +0000
Subject: [PATCH 2479/3253] git: 2.19.0 -> 2.19.1 (CVE-2018-17456)

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 8bd6457a9e50..368e2b68d0d1 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.19.0";
+  version = "2.19.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq";
+    sha256 = "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From 6dc9e7d2a9dd80759bea5357acc4c71d2d98fbbd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 5 Oct 2018 15:10:04 -0500
Subject: [PATCH 2480/3253] mesa: 18.2.1 -> 18.2.2

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index aca9a237b0c7..ff45162c5a89 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "18.2.1";
+  version = "18.2.2";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
+    sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
   };
 
   prePatch = "patchShebangs .";

From 9a57e00a365c20362b14dca8577d099fddc93194 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Thu, 6 Sep 2018 17:52:39 -0400
Subject: [PATCH 2481/3253] ghostscript: include icc profile validation patch

See https://github.com/apple/cups/issues/5394

closes #47193, #46216

source url
http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=bc3df0773fcc
contains invalid characters, which is why we don't fetchpatch.

(cherry picked from commit 2aa750694e2e0d77bf14e3145c4999b6bcee25b0)
---
 pkgs/misc/ghostscript/default.nix             |  1 +
 .../ghostscript/icc-profile-validation.patch  | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/misc/ghostscript/icc-profile-validation.patch

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 54ad32622756..f9c322b082ac 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./icc-profile-validation.patch
     ./urw-font-files.patch
     ./doc-no-ref.diff
   ];
diff --git a/pkgs/misc/ghostscript/icc-profile-validation.patch b/pkgs/misc/ghostscript/icc-profile-validation.patch
new file mode 100644
index 000000000000..c2b6f91cb30d
--- /dev/null
+++ b/pkgs/misc/ghostscript/icc-profile-validation.patch
@@ -0,0 +1,78 @@
+From bc3df0773fccf4b4906a3e59652ad646ea0fee91 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Tue, 4 Sep 2018 17:01:08 +0100
+Subject: [PATCH] For ICC profile validation, have cups id iteself as DeviceN
+
+Give the range of color spaces and models that cups supports, we can't
+reasonably provide (or expect others to provide) output ICC profiles for all
+cases.
+
+For the purpose of profile validation, have it claim to be DeviceN and benefit
+from the extra tolerance in profiles allowed for that class of device.
+---
+ cups/gdevcups.c  | 15 ++++++++++++++-
+ devices/devs.mak |  2 +-
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/cups/gdevcups.c b/cups/gdevcups.c
+index c1574f8..decd8eb 100644
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -70,6 +70,7 @@
+ #include "std.h"                /* to stop stdlib.h redefining types */
+ #include "gdevprn.h"
+ #include "gsparam.h"
++#include "gxdevsop.h"
+ #include "arch.h"
+ #include "gsicc_manage.h"
+
+@@ -252,6 +253,7 @@ private int cups_put_params(gx_device *, gs_param_list *);
+ private int cups_set_color_info(gx_device *);
+ private dev_proc_sync_output(cups_sync_output);
+ private prn_dev_proc_get_space_params(cups_get_space_params);
++private int cups_spec_op(gx_device *dev_, int op, void *data, int datasize);
+
+ #ifdef dev_t_proc_encode_color
+ private cm_map_proc_gray(cups_map_gray);
+@@ -392,7 +394,7 @@ private gx_device_procs	cups_procs =
+    NULL,				/* push_transparency_state */
+    NULL,				/* pop_transparency_state */
+    NULL,                                /* put_image */
+-
++   cups_spec_op
+ };
+
+ #define prn_device_body_copies(dtype, procs, dname, w10, h10, xdpi, ydpi, lo, to, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_pages)\
+@@ -5927,6 +5929,17 @@ cups_print_planar(gx_device_printer *pdev,
+   return (0);
+ }
+
++private int
++cups_spec_op(gx_device *dev_, int op, void *data, int datasize)
++{
++    /* Although not strictly DeviceN, the range of color models
++       this device supports presets similar issues.
++     */
++    if (op == gxdso_supports_devn) {
++        return true;
++    }
++    return gx_default_dev_spec_op(dev_, op, data, datasize);
++}
+
+ /*
+  */
+diff --git a/devices/devs.mak b/devices/devs.mak
+index c85604c..e8654e5 100644
+--- a/devices/devs.mak
++++ b/devices/devs.mak
+@@ -1860,7 +1860,7 @@ $(DD)pwgraster.dev : $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV) \
+ 	$(ADDMOD) $(DD)pwgraster -include $(lcups_dev)
+ 	$(ADDMOD) $(DD)pwgraster -include $(lcupsi_dev)
+
+-$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(DEVS_MAK) $(MAKEDIRS)
++$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(gxdevsop_h) $(DEVS_MAK) $(MAKEDIRS)
+ 	$(CUPS_CC) $(DEVO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(CUPSCFLAGS) \
+ 	    $(I_)$(GLSRC) \
+ 	    $(I_)$(DEVSRC) \
+--
+2.9.1

From 13883ff4bce838c91dd318e62195804afcdccf1a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 5 Oct 2018 17:01:30 -0400
Subject: [PATCH 2482/3253] systemd-wait: init at 0.1+2018-10-05

---
 .../linux/systemd-wait/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/systemd-wait/default.nix

diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/os-specific/linux/systemd-wait/default.nix
new file mode 100644
index 000000000000..114f4c2444e6
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd-wait/default.nix
@@ -0,0 +1,25 @@
+{ python3Packages, fetchFromGitHub, lib }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "systemd-wait";
+  version = "0.1+2018-10-05";
+
+  src = fetchFromGitHub {
+    owner = "Stebalien";
+    repo = pname;
+    rev = "bbb58dd4584cc08ad20c3888edb7628f28aee3c7";
+    sha256 = "1l8rd0wzf3m7fk0g1c8wc0csdisdfac0filhixpgp0ck9ignayq5";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    dbus-python pygobject3
+  ];
+
+  meta = {
+    homepage = https://github.com/Stebalien/systemd-wait;
+    license = lib.licenses.gpl3;
+    description = "Wait for a systemd unit to enter a specific state";
+    maintainers = [ lib.maintainers.benley ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1a04e636997..2d57ae3bb915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1539,7 +1539,7 @@ with pkgs;
   riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
     conf = config.riot-web.conf or null;
   };
-  
+
   roundcube = callPackage ../servers/roundcube { };
 
   rsbep = callPackage ../tools/backup/rsbep { };
@@ -14746,6 +14746,8 @@ with pkgs;
       '';
   }));
 
+  systemd-wait = callPackages ../os-specific/linux/systemd-wait { };
+
   sysvinit = callPackage ../os-specific/linux/sysvinit { };
 
   sysvtools = sysvinit.override {

From 29b479eb72f3192ed67846dfa6a4ab5c49b6a268 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 5 Oct 2018 18:23:57 -0400
Subject: [PATCH 2483/3253] README: 18.03 -> 18.09

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 004bba34530d..144a23027db9 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add
 ```
 
 For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest
+custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest
 release and `nixos-unstable` for the latest successful build of master:
 
 ```
 % git remote update channels
-% git rebase channels/nixos-18.03
+% git rebase channels/nixos-18.09
 ```
 
 For pull-requests, please rebase onto nixpkgs `master`.
@@ -31,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
 * [Manual (NixOS)](https://nixos.org/nixos/manual/)
 * [Community maintained wiki](https://nixos.wiki/)
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03)
+* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents)
+* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents)
 
 Communication:
 

From 58a02af417369efd58894a287da4fd0c6c9c5acb Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 5 Oct 2018 18:30:49 -0400
Subject: [PATCH 2484/3253] qpdf: Drop CVE-2018-9918.patch (#47935)

This has been merged upstream in 8.2.1.
---
 pkgs/development/libraries/qpdf/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 79deb482161f..456c28503e81 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -14,14 +14,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib libjpeg ];
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2018-9918.patch";
-      url = "https://github.com/qpdf/qpdf/commit/b4d6cf6836ce025ba1811b7bbec52680c7204223";
-      sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
-    })
-  ];
-
   postPatch = ''
     patchShebangs qpdf/fix-qdf
   '';

From 82d1bf96910762eadfd94a5da4b9a8263c568b53 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 5 Oct 2018 18:32:42 -0400
Subject: [PATCH 2485/3253] nixos/doc: Updates release date for 18.09

---
 nixos/doc/manual/release-notes/rl-1809.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 1e62f1534248..c5521735428b 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -3,7 +3,7 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09">
- <title>Release 18.09 (“Jellyfish”, 2018/09/??)</title>
+ <title>Release 18.09 (“Jellyfish”, 2018/10/05)</title>
 
  <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"

From 3a0fbe3cbececa83a89ff91476be552c4dd1e357 Mon Sep 17 00:00:00 2001
From: Philip Nelson <me@pnelson.ca>
Date: Fri, 5 Oct 2018 15:36:03 -0700
Subject: [PATCH 2486/3253] youtube-dl: 2018.09.26 -> 2018.10.05 (#47940)

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 8cc224f475b1..9de0f850d49b 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@
 buildPythonPackage rec {
 
   pname = "youtube-dl";
-  version = "2018.09.26";
+  version = "2018.10.05";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0b26cnzdzai82d2bsy91jy1aas8m8psakdrs789xy0v4kwwgrk3n";
+    sha256 = "1iq02kwxdgh07bf0w0fvbsjbdshs4kja35gy8m70ji9cj10l1mbw";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3f65f1098296f1491d2db083a4c4b547a352c757 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 6 Oct 2018 00:47:08 +0200
Subject: [PATCH 2487/3253] ghostscript: 9.24 -> 9.25 (#47934)

Highlights in this release include:

This release fixes problems with argument handling, some unintended results of the security fixes to the SAFER file access restrictions (specifically accessing ICC profile files), and some additional security issues over the recent 9.24 release.

CVE-2018-16802
CVE-2018-17183

Note: The ps2epsi utility does not, and cannot call Ghostscript with the -dSAFER command line option. It should never be called with input from untrusted sources.

Security issues have been the primary focus of this release, including solving several (well publicised) real and potential exploits.
PLEASE NOTE: We strongly urge users to upgrade to this latest release to avoid these issues.

As well as Ghostscript itself, jbig2dec has had a significant amount of work improving its robustness in the face of out specification files.

IMPORTANT: We are in the process of forking LittleCMS. LCMS2 is not thread safe, and cannot be made thread safe without breaking the ABI. Our fork will be thread safe, and include performance enhancements (these changes have all be been offered and rejected upstream). We will maintain compatibility between Ghostscript and LCMS2 for a time, but not in perpetuity. Our fork will be available as its own package separately from Ghostscript (and MuPDF).

The usual round of bug fixes, compatibility changes, and incremental improvements.
---
 pkgs/misc/ghostscript/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 54ad32622756..1e3b6024b01c 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -9,7 +9,7 @@ assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
   version = "9.${ver_min}";
-  ver_min = "24";
+  ver_min = "25";
   # ghostscript*.tar.xz in https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9xx/SHA512SUMS
   sha512 = "dcbeeb5d3dd5ccaf949dc4be68363c50b1d35e647be4790a50b1bbf5f259f1d9181f705be27bfca708c4d270f945ff4b24e3db10b57800c1ee0ea7a40931c547";
 
@@ -93,7 +93,8 @@ stdenv.mkDerivation rec {
     cp -r Resource "$out/share/ghostscript/${version}"
 
     mkdir -p "$doc/share/doc/ghostscript"
-    mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/"
+    # docs are still built into 9.24
+    mv "$doc/share/doc/9.24" "$doc/share/doc/ghostscript/${version}"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

From 02b0836d4273beda31cc005ca8f810bfd4881277 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 6 Oct 2018 01:54:26 +0200
Subject: [PATCH 2488/3253] ghostscript: update hash (#47946)

I previously didn't update the hash, so was still building ghostscript-9.24
(which explained why docs were still from 9.24)

The ICC profile validation patch from #47937 is included in 9.25, so we
can strip it from the list of patches.

cc @xeji
---
 pkgs/misc/ghostscript/default.nix             |  7 +-
 .../ghostscript/icc-profile-validation.patch  | 78 -------------------
 2 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/misc/ghostscript/icc-profile-validation.patch

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index b554676f7756..20b91ba466a2 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -10,8 +10,7 @@ assert cupsSupport -> cups != null;
 let
   version = "9.${ver_min}";
   ver_min = "25";
-  # ghostscript*.tar.xz in https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9xx/SHA512SUMS
-  sha512 = "dcbeeb5d3dd5ccaf949dc4be68363c50b1d35e647be4790a50b1bbf5f259f1d9181f705be27bfca708c4d270f945ff4b24e3db10b57800c1ee0ea7a40931c547";
+  sha512 = "18pcqzva7pq2a9mmqf9pq8x4winb6qmzni49vq2qx50k60rwyv1kdmixik3ym2bpj5p1j8g0vb47w7w2cf4lba5q583ylpd8rshn73s";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -44,7 +43,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    ./icc-profile-validation.patch
     ./urw-font-files.patch
     ./doc-no-ref.diff
   ];
@@ -94,8 +92,7 @@ stdenv.mkDerivation rec {
     cp -r Resource "$out/share/ghostscript/${version}"
 
     mkdir -p "$doc/share/doc/ghostscript"
-    # docs are still built into 9.24
-    mv "$doc/share/doc/9.24" "$doc/share/doc/ghostscript/${version}"
+    mv "$doc/share/doc/${version}" "$doc/share/doc/ghostscript/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/misc/ghostscript/icc-profile-validation.patch b/pkgs/misc/ghostscript/icc-profile-validation.patch
deleted file mode 100644
index c2b6f91cb30d..000000000000
--- a/pkgs/misc/ghostscript/icc-profile-validation.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From bc3df0773fccf4b4906a3e59652ad646ea0fee91 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 4 Sep 2018 17:01:08 +0100
-Subject: [PATCH] For ICC profile validation, have cups id iteself as DeviceN
-
-Give the range of color spaces and models that cups supports, we can't
-reasonably provide (or expect others to provide) output ICC profiles for all
-cases.
-
-For the purpose of profile validation, have it claim to be DeviceN and benefit
-from the extra tolerance in profiles allowed for that class of device.
----
- cups/gdevcups.c  | 15 ++++++++++++++-
- devices/devs.mak |  2 +-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/cups/gdevcups.c b/cups/gdevcups.c
-index c1574f8..decd8eb 100644
---- a/cups/gdevcups.c
-+++ b/cups/gdevcups.c
-@@ -70,6 +70,7 @@
- #include "std.h"                /* to stop stdlib.h redefining types */
- #include "gdevprn.h"
- #include "gsparam.h"
-+#include "gxdevsop.h"
- #include "arch.h"
- #include "gsicc_manage.h"
-
-@@ -252,6 +253,7 @@ private int cups_put_params(gx_device *, gs_param_list *);
- private int cups_set_color_info(gx_device *);
- private dev_proc_sync_output(cups_sync_output);
- private prn_dev_proc_get_space_params(cups_get_space_params);
-+private int cups_spec_op(gx_device *dev_, int op, void *data, int datasize);
-
- #ifdef dev_t_proc_encode_color
- private cm_map_proc_gray(cups_map_gray);
-@@ -392,7 +394,7 @@ private gx_device_procs	cups_procs =
-    NULL,				/* push_transparency_state */
-    NULL,				/* pop_transparency_state */
-    NULL,                                /* put_image */
--
-+   cups_spec_op
- };
-
- #define prn_device_body_copies(dtype, procs, dname, w10, h10, xdpi, ydpi, lo, to, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_pages)\
-@@ -5927,6 +5929,17 @@ cups_print_planar(gx_device_printer *pdev,
-   return (0);
- }
-
-+private int
-+cups_spec_op(gx_device *dev_, int op, void *data, int datasize)
-+{
-+    /* Although not strictly DeviceN, the range of color models
-+       this device supports presets similar issues.
-+     */
-+    if (op == gxdso_supports_devn) {
-+        return true;
-+    }
-+    return gx_default_dev_spec_op(dev_, op, data, datasize);
-+}
-
- /*
-  */
-diff --git a/devices/devs.mak b/devices/devs.mak
-index c85604c..e8654e5 100644
---- a/devices/devs.mak
-+++ b/devices/devs.mak
-@@ -1860,7 +1860,7 @@ $(DD)pwgraster.dev : $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV) \
- 	$(ADDMOD) $(DD)pwgraster -include $(lcups_dev)
- 	$(ADDMOD) $(DD)pwgraster -include $(lcupsi_dev)
-
--$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(DEVS_MAK) $(MAKEDIRS)
-+$(DEVOBJ)gdevcups.$(OBJ) : $(LCUPSSRCDIR)$(D)gdevcups.c $(std_h) $(gxdevsop_h) $(DEVS_MAK) $(MAKEDIRS)
- 	$(CUPS_CC) $(DEVO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(CUPSCFLAGS) \
- 	    $(I_)$(GLSRC) \
- 	    $(I_)$(DEVSRC) \
---
-2.9.1

From 9289920193616488c0d146770dd6e98e9e4c482e Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Fri, 5 Oct 2018 17:45:13 -0700
Subject: [PATCH 2489/3253] webkitgtk222x: init at 2.22.2

---
 pkgs/development/libraries/webkitgtk/2.22.nix | 83 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 ++
 2 files changed, 90 insertions(+)
 create mode 100644 pkgs/development/libraries/webkitgtk/2.22.nix

diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix
new file mode 100644
index 000000000000..7eae5819daf1
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/2.22.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
+, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
+, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
+, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
+, libidn, libedit, readline, libGLU_combined, libintl
+, enableGeoLocation ? true, geoclue2, sqlite
+, enableGtk2Plugins ? false, gtk2 ? null
+, gst-plugins-base, gst-plugins-bad, woff2
+}:
+
+assert enableGeoLocation -> geoclue2 != null;
+assert enableGtk2Plugins -> gtk2 != null;
+assert stdenv.isDarwin -> !enableGtk2Plugins;
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "webkitgtk-${version}";
+  version = "2.22.2";
+
+  meta = {
+    description = "Web content rendering engine, GTK+ port";
+    homepage = https://webkitgtk.org/;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    hydraPlatforms = [];
+    maintainers = with maintainers; [ ];
+  };
+
+  src = fetchurl {
+    url = "https://webkitgtk.org/releases/${name}.tar.xz";
+    sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l";
+  };
+
+  patches = optionals stdenv.isDarwin [
+    ## TODO add necessary patches for Darwin
+  ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  cmakeFlags = [
+  "-DPORT=GTK"
+  "-DUSE_LIBHYPHEN=0"
+  "-DENABLE_INTROSPECTION=ON"
+  ]
+  ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
+  ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
+  ++ optionals stdenv.isDarwin [
+  "-DUSE_SYSTEM_MALLOC=ON"
+  "-DUSE_ACCELERATE=0"
+  "-DENABLE_MINIBROWSER=OFF"
+  "-DENABLE_VIDEO=ON"
+  "-DENABLE_QUARTZ_TARGET=ON"
+  "-DENABLE_X11_TARGET=OFF"
+  "-DENABLE_OPENGL=OFF"
+  "-DENABLE_WEB_AUDIO=OFF"
+  "-DENABLE_WEBGL=OFF"
+  "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
+  "-DENABLE_GTKDOC=OFF"
+  ];
+
+  nativeBuildInputs = [
+    cmake ninja perl python2 ruby bison gperf
+    pkgconfig gettext gobjectIntrospection
+  ];
+
+  buildInputs = [
+    libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
+    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
+    sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
+  ] ++ optional enableGeoLocation geoclue2
+    ++ optional enableGtk2Plugins gtk2
+    ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
+    ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
+    ++ optional stdenv.isLinux wayland;
+
+  propagatedBuildInputs = [
+    libsoup gtk3
+  ];
+
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab5508ef7331..a8b96bd5a29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12541,6 +12541,13 @@ with pkgs;
     stdenv = overrideCC stdenv gcc6;
   };
 
+  webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix {
+    harfbuzz = harfbuzzFull;
+    inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
+    stdenv = overrideCC stdenv gcc6;
+  };
+
+
   webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
     withGtk2 = true;
     enableIntrospection = false;

From 2012860e7ef0511eb013e8c98ad3044abbb9185e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 5 Oct 2018 22:37:28 -0400
Subject: [PATCH 2490/3253] dbeaver: 5.2.0 -> 5.2.1

---
 pkgs/applications/misc/dbeaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 77cad142d41d..681ee5b0bece 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.2.0";
+  version = "5.2.1";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf";
+    sha256 = "0zm320cdpypv2s58gcg89mdkir9xpz1824dscfqkmahx89g1ma81";
   };
 
   installPhase = ''

From 03d4b5aeb3f98e02e6608dd3ad10b6369bb4f31b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 5 Oct 2018 22:29:03 -0500
Subject: [PATCH 2491/3253] iosevka-bin: 2.0.0 -> 2.0.1

---
 pkgs/data/fonts/iosevka/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index e9be004c2b77..9bf5b40a78de 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "2.0.0";
+  version = "2.0.1";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "17ldxs8rn4y5mzpc6h5rms4khk9fp4d1ixz5bh0pglh1kdansz45";
+  sha256 = "1i21ja348k22rlf8z9jp90cidpmcnwqsw12vdrmm556sdwdkrkpc";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

From 50e947f5296576e557b2fd197f0e3b492c33a230 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 6 Oct 2018 00:59:31 -0400
Subject: [PATCH 2492/3253] lib/systems: use correct config for
 armv7l-hf-multiplatform

---
 lib/systems/examples.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index c2ee829529dc..8ba03a63fd8d 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -28,7 +28,7 @@ rec {
   };
 
   armv7l-hf-multiplatform = rec {
-    config = "armv7a-unknown-linux-gnueabihf";
+    config = "armv7l-unknown-linux-gnueabihf";
     platform = platforms.armv7l-hf-multiplatform;
   };
 

From 47fb4859a5a06d61e4d97d4ddcd5b849c1c7b3eb Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 6 Oct 2018 10:56:53 +0200
Subject: [PATCH 2493/3253] abcde: 2.8.1 -> 2.9.2

Fixes #41789.
---
 pkgs/applications/audio/abcde/abcde.patch | 30 --------------------
 pkgs/applications/audio/abcde/default.nix | 34 +++++++++++------------
 2 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/applications/audio/abcde/abcde.patch

diff --git a/pkgs/applications/audio/abcde/abcde.patch b/pkgs/applications/audio/abcde/abcde.patch
deleted file mode 100644
index ae187043e6c5..000000000000
--- a/pkgs/applications/audio/abcde/abcde.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Two changes:
-
-* Add an alias for `which', so abcde can find things in store
-* Choose the right CDROM reader syntax for `cd-paranoia'
-
---- abcde-2.5.4/abcde~	2012-09-18 06:09:31.000000000 -0700
-+++ abcde-2.5.4/abcde	2012-10-27 00:08:48.000862364 -0700
-@@ -17,6 +17,11 @@
- 
- VERSION='2.5.4'
- 
-+which ()
-+{
-+  type -P $1
-+}
-+
- usage ()
- {
- echo "This is abcde v$VERSION."
-@@ -3497,6 +3502,10 @@
- 	for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do
- 		if new_checkexec $DEFAULT_CDROMREADER; then
- 			CDROMREADERSYNTAX=$DEFAULT_CDROMREADER
-+                        case "$DEFAULT_CDROMREADER" in
-+			  cd-paranoia)  CDROMREADERSYNTAX=cdparanoia;;
-+			  *)            CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;;
-+			esac
- 			break
- 		fi
- 	done
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 7f2080c6fd63..58e8ecc4fcab 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -3,60 +3,58 @@
 , perl, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.8.1";
+let version = "2.9.2";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
       url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
-      sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
+      sha256 = "13c5yvp87ckqgha160ym5rdr1a4divgvyqbjh0yb6ffclip6qd9l";
     };
 
     # FIXME: This package does not support `distmp3', `eject', etc.
 
-    patches = [ ./abcde.patch ];
-
     configurePhase = ''
       sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
               s|^[[:blank:]]*etcdir *=.*$|etcdir = $out/etc|g ;
               s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g" \
         "Makefile";
 
-      # We use `cd-paranoia' from GNU libcdio, which contains a hyphen
-      # in its name, unlike Xiph's cdparanoia.
-      sed -i "s|^[[:blank:]]*CDPARANOIA=.*$|CDPARANOIA=cd-paranoia|g ;
-              s|^[[:blank:]]*DEFAULT_CDROMREADERS=.*$|DEFAULT_CDROMREADERS=\"cd-paranoia cdda2wav\"|g" \
-        "abcde"
+      echo 'CDPARANOIA=${libcdio-paranoia}/bin/cd-paranoia' >>abcde.conf
+      echo CDROMREADERSYNTAX=cdparanoia >>abcde.conf
 
       substituteInPlace "abcde" \
         --replace "/etc/abcde.conf" "$out/etc/abcde.conf"
-
     '';
 
-    buildInputs = [ makeWrapper ];
+    nativeBuildInputs = [ makeWrapper ];
 
-    propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
+    buildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
 
     installFlags = [ "sysconfdir=$(out)/etc" ];
 
     postFixup = ''
       for cmd in abcde cddb-tool abcde-musicbrainz-tool; do
-        wrapProgram "$out/bin/$cmd" --prefix PATH ":" \
-          ${stdenv.lib.makeBinPath [ "$out" which libcdio-paranoia cddiscid wget vorbis-tools id3v2 eyeD3 lame flac glyr ]}
+        wrapProgram "$out/bin/$cmd" \
+          --prefix PERL5LIB : "$PERL5LIB" \
+          --prefix PATH ":" ${stdenv.lib.makeBinPath [
+            "$out" which libcdio-paranoia cddiscid wget
+            vorbis-tools id3v2 eyeD3 lame flac glyr
+          ]}
       done
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = http://abcde.einval.com/wiki/;
-      license = stdenv.lib.licenses.gpl2Plus;
+      license = licenses.gpl2Plus;
+      maintainers = with maintainers; [ gebner ];
       description = "Command-line audio CD ripper";
-
       longDescription = ''
         abcde is a front-end command-line utility (actually, a shell
         script) that grabs tracks off a CD, encodes them to
         Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or MPP/MP+ (Musepack)
         format, and tags them, all in one go.
       '';
-      platforms = stdenv.lib.platforms.linux;
+      platforms = platforms.linux;
     };
   }

From 1cfe58e8227804b6a8ce35ec71cb6c350f88fa25 Mon Sep 17 00:00:00 2001
From: Maximilian Bode <maximilian.bode@tngtech.com>
Date: Mon, 1 Oct 2018 20:10:58 +0200
Subject: [PATCH 2494/3253] aws-rotate-key: 1.0.0 -> 1.0.3

---
 pkgs/tools/admin/aws-rotate-key/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix
index cffb67e7d6ca..a8c00cf0eefa 100644
--- a/pkgs/tools/admin/aws-rotate-key/default.nix
+++ b/pkgs/tools/admin/aws-rotate-key/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "aws-rotate-key-${version}";
-  version = "1.0.0";
+  version = "1.0.3";
 
   goPackagePath = "github.com/Fullscreen/aws-rotate-key";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "Fullscreen";
     repo = "aws-rotate-key";
-    sha256 = "13q7rns65cj8b4i0s75dbswijpra9z74b462zribwfjdm29by5k1";
+    sha256 = "15na7flc0vp14amaq3116a5glqlb4ydvdlzv0q7mwl73pc38zxn3";
   };
 
   goDeps = ./deps.nix;

From 011f1c739647c0b6947d028c217e4a98466c26d2 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sat, 6 Oct 2018 11:33:47 +0100
Subject: [PATCH 2495/3253] sewer: init at 0.6.0

sewer is an ACME client which supports DNS challenges with support for
various DNS servers.
---
 pkgs/tools/admin/sewer/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/admin/sewer/default.nix

diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix
new file mode 100644
index 000000000000..5410d0c833df
--- /dev/null
+++ b/pkgs/tools/admin/sewer/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "sewer";
+  version = "0.6.0";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "180slmc2zk4mvjqp25ks0j8kd63ai4y77ds5icm7qd7av865rryp";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ];
+
+  postPatch = ''
+    # The README has non-ascii characters which makes setup.py crash.
+    sed -i 's/[\d128-\d255]//g' README.md
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/komuw/sewer;
+    description = "ACME client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kevincox ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f2356264a3..3f2b04c4cfd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5214,6 +5214,8 @@ with pkgs;
 
   seqdiag = with python3Packages; toPythonApplication seqdiag;
 
+  sewer = callPackage ../tools/admin/sewer { };
+
   screenfetch = callPackage ../tools/misc/screenfetch { };
 
   sg3_utils = callPackage ../tools/system/sg3_utils { };

From 248ed3575c41866c657d0aa2f4a70ebb7a2c079a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 6 Oct 2018 13:02:20 +0200
Subject: [PATCH 2496/3253] tor-browser-bundle-bin: 8.0.1 -> 8.0.2

Update to latest version due to security updates and 8.0.1 not being
available on the mirrors anymore.

Release notes: https://blog.torproject.org/new-release-tor-browser-802
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 90287c05b5e4..23f0db67e66a 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -103,7 +103,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "8.0.1";
+  version = "8.0.2";
 
   lang = "en-US";
 
@@ -113,7 +113,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c";
+      sha256 = "1vajphnl53bhp0bnq8shljvnnq4k2wpvfrfclmxklp97lqvfl9vz";
     };
 
     "i686-linux" = fetchurl {
@@ -121,7 +121,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7";
+      sha256 = "157yd8n53w79xx58xf5v983a50xq1s0c09cr7qfd5cxgs7zrwh34";
     };
   };
 in

From d2608d29a211a4bc35314dfadbc8c6d8914867ec Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <pmidden+github@secure.mailbox.org>
Date: Sat, 6 Oct 2018 15:19:38 +0200
Subject: [PATCH 2497/3253] black: 18.6b4 -> 18.9b0 (#47914)

---
 pkgs/development/python-modules/black/default.nix      | 4 ++--
 pkgs/development/python-modules/pyls-black/default.nix | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix
index b95ed080e66a..f070ab4fd7a4 100644
--- a/pkgs/development/python-modules/black/default.nix
+++ b/pkgs/development/python-modules/black/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "black";
-  version = "18.6b4";
+  version = "18.9b0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592";
+    sha256 = "1992ramdwv8sg4mbl5ajirwj5i4a48zjgsycib0fnbaliyiajc70";
   };
 
   checkInputs =  [ pytest glibcLocales ];
diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
index b19fad1a1f19..60f6af287652 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -19,6 +19,9 @@ buildPythonPackage rec {
     pytest
   '';
 
+  # Enable when https://github.com/rupert/pyls-black/pull/6 is merged.
+  doCheck = false;
+
   checkInputs = [ pytest ];
 
   propagatedBuildInputs = [ black toml python-language-server ];

From a134b9a3dd181ed21567a1068012d7075f8bcdd7 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <offlinehacker@users.noreply.github.com>
Date: Sat, 6 Oct 2018 15:21:28 +0200
Subject: [PATCH 2498/3253] telepresence: 0.85 -> 0.93 (#47966)

---
 .../tools/networking/telepresence/default.nix | 32 ++++++-------------
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 54d54a76fcb3..2eca68a98f68 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
-, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools
-, openssh, which, coreutils, iptables, bash }:
+{ lib, stdenv, pythonPackages, fetchgit, fetchFromGitHub, makeWrapper, git
+, sshfs-fuse, torsocks, sshuttle, conntrack-tools , openssh, coreutils
+, iptables, bash }:
 
 let
   sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
@@ -15,47 +15,35 @@ let
     postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
     postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
   });
-in stdenv.mkDerivation rec {
+in pythonPackages.buildPythonPackage rec {
   pname = "telepresence";
-  version = "0.85";
-  name = "${pname}-${version}";
+  version = "0.93";
 
   src = fetchFromGitHub {
     owner = "datawire";
     repo = "telepresence";
     rev = version;
-    sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj";
+    sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d";
   };
 
-  buildInputs = [ makeWrapper python3 ];
-
-  phases = ["unpackPhase" "installPhase"];
-
-  installPhase = ''
-    mkdir -p $out/libexec $out/bin
-
-    export PREFIX=$out
-    substituteInPlace ./install.sh \
-      --replace "#!/bin/bash" "#!${stdenv.shell}" \
-      --replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \
-      --replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"'
-    ./install.sh
+  buildInputs = [ makeWrapper ];
 
+  postInstall = ''
     wrapProgram $out/bin/telepresence \
       --prefix PATH : ${lib.makeBinPath [
-        python3
         sshfs-fuse
         torsocks
         conntrack-tools
         sshuttle-telepresence
         openssh
-        which
         coreutils
         iptables
         bash
       ]}
   '';
 
+  doCheck = false;
+
   meta = {
     homepage = https://www.telepresence.io/;
     description = "Local development against a remote Kubernetes or OpenShift cluster";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0f2356264a3..e9e5fc39b2a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5543,7 +5543,9 @@ with pkgs;
 
   teleport = callPackage ../servers/teleport {};
 
-  telepresence = callPackage ../tools/networking/telepresence { };
+  telepresence = callPackage ../tools/networking/telepresence {
+    pythonPackages = python3Packages;
+  };
 
   termplay = callPackage ../tools/misc/termplay { };
 

From 0f283b4f5a18ad00a70a7fc4411d97eb5ef33af1 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 6 Oct 2018 15:26:54 +0200
Subject: [PATCH 2499/3253] dateutils: 0.4.4 -> 0.4.5 (#47961)

datezone needs TZdata
+ enabling parallel building
+ run the tests suite
---
 pkgs/tools/misc/dateutils/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 9b52d3fd3608..e33376243bd6 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook, tzdata }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.4";
+  version = "0.4.5";
   name = "dateutils-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
-    sha256 = "0ky8177is4swgxfqczc78d7yjc13w626k515qw517086n7xjxk59";
+    sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ tzdata ]; # needed for datezone
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "A bunch of tools that revolve around fiddling with dates and times in the command line";
     homepage = http://www.fresse.org/dateutils/;

From e5bea728ce4e49bfbd7711fb7fd196471dc9aa1f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 6 Oct 2018 09:32:03 -0400
Subject: [PATCH 2500/3253] eolie: 0.9.37 -> 0.9.41 (#47942)

---
 pkgs/applications/networking/browsers/eolie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index c94135f73509..1f7ed9732bc7 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   name = "eolie-${version}";
-  version = "0.9.37";
+  version = "0.9.41";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     url = "https://gitlab.gnome.org/World/eolie";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0la458zgh943wmgbzr9fpq78c0n11a2wm7rmks7ispk0719f6lxz";
+    sha256 = "0qrbgyzhvh96d7h2rcz04m7am6av30pcvb3fwlrjx0c402rslsx8";
   };
 
   nativeBuildInputs = [

From 5c2059df2284f5f52cb4f40bd85850b1cd02bac8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 6 Oct 2018 09:32:50 -0400
Subject: [PATCH 2501/3253] antibody: 3.6.1 -> 3.7.0 (#47943)

---
 pkgs/shells/zsh/antibody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 60304531bfbe..bf3d7773640e 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "antibody-${version}";
-  version = "3.6.1";
+  version = "3.7.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/getantibody/antibody";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner  = "getantibody";
     repo   = "antibody";
-    sha256 = "1xlaf3440hs1ffa23ja0fc185sj0rxjv0808ib8li3rq2qfkd0k8";
+    sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5";
   };
 
   goDeps = ./deps.nix;

From f368e55ba1c5884b708bf2bb4bb769fdae0d46ed Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 6 Oct 2018 09:34:37 -0400
Subject: [PATCH 2502/3253] solargraph: 0.28.1 -> 0.28.2 (#47944)

---
 .../development/ruby-modules/solargraph/Gemfile.lock |  6 +++---
 pkgs/development/ruby-modules/solargraph/gemset.nix  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index 04d274d05621..5c1db601988b 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
     jaro_winkler (1.5.1)
     kramdown (1.17.0)
     mini_portile2 (2.3.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
     parser (2.5.1.2)
@@ -17,7 +17,7 @@ GEM
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.59.1)
+    rubocop (0.59.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -26,7 +26,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    solargraph (0.28.1)
+    solargraph (0.28.2)
       coderay (~> 1.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 3319f2a68de5..2f46db60984a 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -59,10 +59,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.8.5";
   };
   parallel = {
     source = {
@@ -110,10 +110,10 @@
     dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b";
+      sha256 = "0110r4yqi6nn97bp2myah76plv6a7daxnm9k04k64n1y4zpqm256";
       type = "gem";
     };
-    version = "0.59.1";
+    version = "0.59.2";
   };
   ruby-progressbar = {
     source = {
@@ -127,10 +127,10 @@
     dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11l759mrzjla2iqy5wdd20r01196pfxkw0b0gzgskdbfi8y8mvg5";
+      sha256 = "0xvxifq5871fh2c34hjvsqn38nw4s63d599vbs5mlrrvdl3c5s01";
       type = "gem";
     };
-    version = "0.28.1";
+    version = "0.28.2";
   };
   thor = {
     source = {

From fa3ec9c8364eb2153d794b6a38cec2f8621d0afd Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 6 Oct 2018 09:35:46 -0400
Subject: [PATCH 2503/3253] wire-desktop: 3.2.2840 -> 3.3.2872 (#47941)

---
 .../wire-desktop/default.nix                  | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 0985f139238e..193e306f2286 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
+{ stdenv, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
 , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
 , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
-, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
+, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell, pulseaudio, pciutils
 }:
 let
-  rpath = lib.makeLibraryPath [
+  rpath = stdenv.lib.makeLibraryPath [
     alsaLib
     atk
     cairo
@@ -17,7 +17,6 @@ let
     glib
     gnome2.GConf
     gtk2
-    pango
     hunspell
     libnotify
     libX11
@@ -33,13 +32,16 @@ let
     libXtst
     nspr
     nss
+    pango
+    pciutils
+    pulseaudio
     stdenv.cc.cc
     udev
     xdg_utils
     xorg.libxcb
   ];
 
-  version = "3.2.2840";
+  version = "3.3.2872";
 
   plat = {
     "i686-linux" = "i386";
@@ -47,8 +49,8 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "071ddh2d8wmiybwafwyb97962zj358l0fq7g2r44231653sgybvq";
-    "x86_64-linux" = "0qp9ms94smnm7k47b0n0jdzvnm1b7gj25hyinsfc6lghrb6jqw3r";
+    "i686-linux" = "16dw4ycajxviqrf4i32rkrhg1j1mdkmk252y8vjwr18xlyn958qb";
+    "x86_64-linux" = "04ysk91h2izyb41b243zki4j08bis9yzjq2va9bakp1lv6ywm8pw";
   }.${stdenv.hostPlatform.system};
 
 in
@@ -74,31 +76,31 @@ in
     nativeBuildInputs = [ dpkg ];
     unpackPhase = "dpkg-deb -x $src .";
     installPhase = ''
-      mkdir -p $out
-      cp -R opt $out
-      cp -R usr/share $out/share
+      mkdir -p "$out"
+      cp -R "opt" "$out"
+      cp -R "usr/share" "$out/share"
 
-      chmod -R g-w $out
+      chmod -R g-w "$out"
 
-      # Patch signal
+      # Patch wire-desktop
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-               --set-rpath "${rpath}:$out/opt/wire-desktop" \
-               "$out/opt/wire-desktop/wire-desktop"
+               --set-rpath "${rpath}:$out/opt/Wire" \
+               "$out/opt/Wire/wire-desktop"
 
       # Symlink to bin
-      mkdir -p $out/bin
-      ln -s "$out/opt/wire-desktop/wire-desktop" $out/bin/wire-desktop
+      mkdir -p "$out/bin"
+      ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop"
 
       # Desktop file
-      mkdir -p $out/share/applications
-      cp ${desktopItem}/share/applications/* $out/share/applications
+      mkdir -p "$out/share/applications"
+      cp ${desktopItem}/share/applications/* "$out/share/applications"
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "A modern, secure messenger";
       homepage    = https://wire.com/;
-      license     = lib.licenses.gpl3;
-      maintainers = with lib.maintainers; [ worldofpeace ];
-      platforms = [ "i686-linux" "x86_64-linux" ];
+      license     = licenses.gpl3;
+      maintainers = with maintainers; [ worldofpeace ];
+      platforms   = [ "i686-linux" "x86_64-linux" ];
     };
   }

From b2f7b14380564cd82186df8c6b8a1ca717171608 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Oct 2018 06:49:15 -0700
Subject: [PATCH 2504/3253] facter: 3.11.4 -> 3.12.0 (#47804)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/facter/versions
---
 pkgs/tools/system/facter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 300778c0935e..ba21fabe4350 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.11.4";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
-    sha256 = "1v134lnh035fpgqqqb7cxvyssvvgxvc42649qzqmsw459di9iqv0";
+    sha256 = "1bg044j3dv6kcksy3cyda650ara8s4awdf665k10gaaxa0gwn0jj";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";

From 310df54aa4456e79b30ffbe4c2678952feca0d6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Oct 2018 06:52:24 -0700
Subject: [PATCH 2505/3253] guake: 3.3.2 -> 3.4.0 (#47795)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/guake/versions
---
 pkgs/applications/misc/guake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 8bf779185b36..52105f49c560 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -2,7 +2,7 @@
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
-  version = "3.3.2";
+  version = "3.4.0";
 in python3.pkgs.buildPythonApplication rec {
   name = "guake-${version}";
   format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
     owner = "Guake";
     repo = "guake";
     rev = version;
-    sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7";
+    sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm";
   };
 
   nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];

From 1b97c37b292a635b06a5431b3bed4b3a20dfd073 Mon Sep 17 00:00:00 2001
From: "M. Herdiansyah" <herdiansyah@netc.eu>
Date: Sat, 6 Oct 2018 20:52:40 +0700
Subject: [PATCH 2506/3253] bubblewrap: remove maintainership (#47970)

---
 pkgs/tools/admin/bubblewrap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index c0c1e416b80f..ba07f75bb36d 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "Unprivileged sandboxing tool";
     homepage = https://github.com/projectatomic/bubblewrap;
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ konimex ];
+    maintainers = with maintainers; [ ];
   };
 }

From 3281c90060f6ee937ef7d8c7106b0c05e921ed90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 6 Oct 2018 07:02:25 -0700
Subject: [PATCH 2507/3253] duc: 1.4.3 -> 1.4.4 (#47824)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duc/versions
---
 pkgs/tools/misc/duc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index 7e98b7d64d2d..f5091ac9720a 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "duc-${version}";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = "${version}";
-    sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif";
+    sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 963dcd935d2e0f6ed1d32dadd68c6e2ec0ba154c Mon Sep 17 00:00:00 2001
From: Yurii Izorkin <Izorkin@gmail.com>
Date: Sat, 6 Oct 2018 17:03:15 +0300
Subject: [PATCH 2508/3253] mariadb galera: 25.3.23 -> 25.3.24 (#47905)

---
 pkgs/servers/sql/mariadb/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index da6143c21f0d..b7793c1ac56f 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
+{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
 , libiconv, openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
 , fixDarwinDylibNames, cctools, CoreServices
@@ -221,11 +221,14 @@ connector-c = stdenv.mkDerivation rec {
 
 galera = stdenv.mkDerivation rec {
   name = "mariadb-galera-${version}";
-  version = "25.3.23";
+  version = "25.3.24";
 
-  src = fetchurl {
-    url = "https://mirrors.nxthost.com/mariadb/mariadb-10.2.14/galera-${version}/src/galera-${version}.tar.gz";
-    sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra";
+  src = fetchFromGitHub {
+    owner = "codership";
+    repo = "galera";
+    rev = "release_${version}";
+    sha256 = "1yx3rqy7r4w2l3hnrri30hvsa296v8xidi18p5fdzcpmnhnlwjbi";
+    fetchSubmodules = true;
   };
 
   buildInputs = [ asio boost check openssl scons ];

From b5a2181899abffea26ea6c4484e88eef9d99bf41 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 6 Oct 2018 14:07:36 +0000
Subject: [PATCH 2509/3253] solvespace: 2.3-20170808 -> 2.3-20180906

---
 pkgs/applications/graphics/solvespace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index a1d0316631fa..2e413839f00b 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -3,12 +3,12 @@
 , wrapGAppsHook
 }:
 stdenv.mkDerivation rec {
-  name = "solvespace-2.3-20170808";
-  rev = "16540b1b2c540a4b44500ac02aaa4493bccfba7e";
+  name = "solvespace-2.3-20180906";
+  rev = "258545a334098cf25c1c9f4cd59b778dfe0b0d29";
   src = fetchgit {
     url = https://github.com/solvespace/solvespace;
     inherit rev;
-    sha256 = "1z10i21xf3yagd984lp1hwasnsizx2s3faq3wdzzjngrikr2zn70";
+    sha256 = "1wimh6l0zpk0vywcsd2minijjf6g550z8i3l8lpmfnl5przymc2v";
     fetchSubmodules = true;
   };
 

From 364d47723692d88e391a9e19679707a1d3a29402 Mon Sep 17 00:00:00 2001
From: Carlos D'Agostino <m@cdagostino.io>
Date: Sat, 6 Oct 2018 17:44:22 +1000
Subject: [PATCH 2510/3253] ocamlPackages.ezxmlm: init at 1.0.2

---
 .../ocaml-modules/ezxmlm/default.nix          | 40 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ezxmlm/default.nix

diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix
new file mode 100644
index 000000000000..d40c47dd7a40
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, xmlm }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "ocaml${ocaml.version}-ezxmlm-${version}";
+
+  src = fetchFromGitHub {
+    owner = "avsm";
+    repo = "ezxmlm";
+    rev = "v${version}";
+    sha256 = "1dgr61f0hymywikn67inq908x5adrzl3fjx3v14l9k46x7kkacl9";
+  };
+
+  propagatedBuildInputs = [ xmlm ];
+
+  buildInputs = [ ocaml findlib dune ];
+
+  buildFlags = "build";
+
+  inherit (dune) installPhase;
+
+  meta = with stdenv.lib; {
+    description = "Combinators to use with xmlm for parsing and selection";
+    longDescription = ''
+      An "easy" interface on top of the xmlm library. This version provides
+      more convenient (but far less flexible) input and output functions
+      that go to and from [string] values. This avoids the need to write signal
+      code, which is useful for quick scripts that manipulate XML.
+
+      More advanced users should go straight to the Xmlm library and use it
+      directly, rather than be saddled with the Ezxmlm interface. Since the
+      types in this library are more specific than Xmlm, it should interoperate
+      just fine with it if you decide to switch over.
+    '';
+    maintainers = [ maintainers.carlosdagos ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+    license = licenses.isc;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9e324257e03d..fab79bd7b729 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -252,6 +252,8 @@ let
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
 
+    ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
+
     facile = callPackage ../development/ocaml-modules/facile { };
 
     faillib = callPackage ../development/ocaml-modules/faillib { };

From 171752daee9aa2b4049d70a7cebe6a72d2838f90 Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Sat, 6 Oct 2018 17:59:26 +0300
Subject: [PATCH 2511/3253] ivan: 053 -> 054 (#47950)

---
 pkgs/games/ivan/default.nix     |  8 ++--
 pkgs/games/ivan/homedir.patch   | 75 ---------------------------------
 pkgs/games/ivan/new.patch       | 33 +++++++++++++++
 pkgs/top-level/all-packages.nix |  4 +-
 4 files changed, 39 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/games/ivan/homedir.patch
 create mode 100644 pkgs/games/ivan/new.patch

diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 07b67fa63978..6d31369a1592 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "ivan-${version}";
-  version = "053";
+  version = "054";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "1r3fcccgpjmzzkg0lfmq76igjapr01kh97vz671z60jg7gyh301b";
+    sha256 = "0ayhp9qvxsi5dsgjvy43i3lpdis883g1xn2b8l5xkwxcqfnvsfmq";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
   hardeningDisable = ["all"];
 
   # To store bone and high score files in ~/.ivan of the current user
-  patches = [./homedir.patch];
+  patches = [./new.patch];
 
   # Enable wizard mode
-  cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"];
+  cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD" "-DFORCE_HOME_AS_STATE_DIR=ON"];
 
   # Help CMake find SDL_mixer.h
   NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2";
diff --git a/pkgs/games/ivan/homedir.patch b/pkgs/games/ivan/homedir.patch
deleted file mode 100644
index 312099f7ffd9..000000000000
--- a/pkgs/games/ivan/homedir.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/FeLib/Include/hscore.h b/FeLib/Include/hscore.h
-index 4caf3ff..1a02845 100644
---- a/FeLib/Include/hscore.h
-+++ b/FeLib/Include/hscore.h
-@@ -31,11 +31,11 @@ class festring;
- class highscore
- {
-  public:
--  highscore(cfestring& = HIGH_SCORE_FILENAME);
-+  highscore();
-   truth Add(long, cfestring&);
-   void Draw() const;
--  void Save(cfestring& = HIGH_SCORE_FILENAME) const;
--  void Load(cfestring& = HIGH_SCORE_FILENAME);
-+  void Save() const;
-+  void Load();
-   truth LastAddFailed() const;
-   void AddToFile(highscore*) const;
-   truth MergeToFile(highscore*) const;
-diff --git a/FeLib/Source/hscore.cpp b/FeLib/Source/hscore.cpp
-index 2e5318d..ff9c174 100644
---- a/FeLib/Source/hscore.cpp
-+++ b/FeLib/Source/hscore.cpp
-@@ -23,7 +23,7 @@ cfestring& highscore::GetEntry(int I) const { return Entry[I]; }
- long highscore::GetScore(int I) const { return Score[I]; }
- long highscore::GetSize() const { return Entry.size(); }
- 
--highscore::highscore(cfestring& File) : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(File); }
-+highscore::highscore() : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(); }
- 
- truth highscore::Add(long NewScore, cfestring& NewEntry,
-                      time_t NewTime, long NewRandomID)
-@@ -98,8 +98,12 @@ void highscore::Draw() const
-   List.Draw();
- }
- 
--void highscore::Save(cfestring& File) const
-+void highscore::Save() const
- {
-+  std::string buffer(getenv("HOME"));
-+  buffer.append("/.ivan/ivan-highscore.scores");
-+  cfestring& File = buffer.c_str();
-+
-   outputfile HighScore(File);
-   long CheckSum = HIGH_SCORE_VERSION + LastAdd;
-   for(ushort c = 0; c < Score.size(); ++c)
-@@ -112,8 +116,12 @@ void highscore::Save(cfestring& File) const
- }
- 
- /* This function needs much more error handling */
--void highscore::Load(cfestring& File)
-+void highscore::Load()
- {
-+  std::string buffer(getenv("HOME"));
-+  buffer.append("/.ivan/ivan-highscore.scores");
-+  cfestring& File = buffer.c_str();
-+
-   {
-     inputfile HighScore(File, 0, false);
- 
-diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp
-index 8927305..c18e790 100644
---- a/Main/Source/game.cpp
-+++ b/Main/Source/game.cpp
-@@ -2380,7 +2380,9 @@ festring game::GetDataDir()
- festring game::GetBoneDir()
- {
- #ifdef UNIX
--  return LOCAL_STATE_DIR "/Bones/";
-+  festring BoneDir;
-+  BoneDir << getenv("HOME") << "/.ivan/Bones/";
-+  return BoneDir;
- #endif
- 
- #if defined(WIN32) || defined(__DJGPP__)
diff --git a/pkgs/games/ivan/new.patch b/pkgs/games/ivan/new.patch
new file mode 100644
index 000000000000..d0ed866b3f32
--- /dev/null
+++ b/pkgs/games/ivan/new.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e143e..a6f9176 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,10 +13,14 @@ set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+ add_definitions(-DIVAN_VERSION="${PROJECT_VERSION}" -DUSE_SDL)
+ 
+ option(BUILD_MAC_APP "Build standalone application for MacOS" OFF)
++option(FORCE_HOME_AS_STATE_DIR "Statedir will be /.ivan/ in current user's homedir" OFF)
+ 
+ if(UNIX)
+   add_definitions(-DUNIX)
+   include(GNUInstallDirs)
++  if(FORCE_HOME_AS_STATE_DIR)
++    add_definitions(-DFORCE_HOME_AS_STATE_DIR)
++  endif(FORCE_HOME_AS_STATE_DIR)
+ 
+   if(BUILD_MAC_APP)
+     install(DIRECTORY Graphics Script Music Sound DESTINATION "ivan")
+diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp
+index 323a185..012feb3 100644
+--- a/Main/Source/game.cpp
++++ b/Main/Source/game.cpp
+@@ -5191,6 +5191,9 @@ festring game::GetDataDir()
+ 
+ festring game::GetStateDir()
+ {
++#ifdef FORCE_HOME_AS_STATE_DIR
++  return GetHomeDir()+"/.ivan/";
++#endif
+ #ifdef UNIX
+ #ifdef MAC_APP
+   return GetHomeDir();
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e5fc39b2a9..c403077dbb9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3406,8 +3406,6 @@ with pkgs;
   isync = callPackage ../tools/networking/isync { };
   isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { };
 
-  ivan = callPackage ../games/ivan { };
-
   jaaa = callPackage ../applications/audio/jaaa { };
 
   jackett = callPackage ../servers/jackett {
@@ -20127,6 +20125,8 @@ with pkgs;
 
   instead-launcher = callPackage ../games/instead-launcher { };
 
+  ivan = callPackage ../games/ivan { };
+
   ja2-stracciatella = callPackage ../games/ja2-stracciatella { };
 
   klavaro = callPackage ../games/klavaro {};

From 0bcbb978795bab0f1a45accc211b8b0e349f1cdb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 5 Oct 2018 23:07:56 +0200
Subject: [PATCH 2512/3253] vault: 0.11.1 -> 0.11.2

changelog: https://github.com/hashicorp/vault/blob/v0.11.2/CHANGELOG.md
---
 pkgs/tools/security/vault/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index a0f7d0f6287f..597047a679bb 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -11,13 +11,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1ydnb9z6rd5ck6wza5ir6927xq375i1a9zh5p2xanp29ly6ijiiz";
+    sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];

From 4af38a251652a4ed67b1a98836230ce7fdbf6d56 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sat, 6 Oct 2018 11:08:47 -0400
Subject: [PATCH 2513/3253] gdal: Add libxml2 to build

---
 pkgs/development/libraries/gdal/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 1fe3bcf6cede..642063220b2c 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
-, libiconv
+, libiconv, libxml2
 , netcdfSupport ? true, netcdf, hdf5, curl
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
-    libspatialite poppler hdf4 qhull giflib expat ]
+    libspatialite poppler hdf4 qhull giflib expat libxml2 ]
   ++ (with pythonPackages; [ python numpy wrapPython ])
   ++ stdenv.lib.optional stdenv.isDarwin libiconv
   ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     "--with-proj=${proj}" # optional
     "--with-geos=${geos}/bin/geos-config"# optional
     "--with-hdf4=${hdf4.dev}" # optional
+    "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
     (if netcdfSupport then "--with-netcdf=${netcdf}" else "")
   ];
 

From 9a5f7b1630c138a82cb9ae0d6a513c4358c1dc10 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <1809783+maggesi@users.noreply.github.com>
Date: Fri, 5 Oct 2018 14:14:25 +0200
Subject: [PATCH 2514/3253] hol_light: 2017-07-06 -> 2018-09-30

Also handle compatibility with newer version of OCaml (depend on num
library as needed).
---
 .../science/logic/hol_light/default.nix       | 39 +++++++++++--------
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index a1779baf5f82..91be7dca1173 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,32 +1,37 @@
-{ stdenv, fetchFromGitHub, fetchpatch, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, ocaml, num, camlp5 }:
 
 let
-  start_script = ''
-    #!/bin/sh
-    cd "$out/lib/hol_light"
-    exec ${ocaml}/bin/ocaml -I \`${camlp5}/bin/camlp5 -where\` -init make.ml
-  '';
+  load_num =
+    if num == null then "" else
+      ''
+        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \
+        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \
+        -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \
+      '';
+
+  start_script =
+    ''
+      #!/bin/sh
+      cd $out/lib/hol_light
+      exec ${ocaml}/bin/ocaml \
+        -I \`${camlp5}/bin/camlp5 -where\` \
+        ${load_num} \
+        -init make.ml
+    '';
 in
 
 stdenv.mkDerivation {
-  name     = "hol_light-2017-07-06";
+  name     = "hol_light-2018-09-30";
 
   src = fetchFromGitHub {
     owner  = "jrh13";
     repo   = "hol-light";
-    rev    = "0ad8cbdb4de08a38dac600f352555e8454499faa";
-    sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq";
+    rev    = "27e09dd27834de46e917057710e9d8ded51a4c9f";
+    sha256 = "1p0rm08wnc2lsrh3xzhlq3zdhzqcv1lbqnkwx3aybrqhbg1ixc1d";
   };
 
   buildInputs = [ ocaml camlp5 ];
-
-  patches = [ (fetchpatch {
-      url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch;
-      sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0";
-    })
-  ];
-
-  postPatch = "cp pa_j_3.1x_{6,7}.xx.ml";
+  propagatedBuildInputs = [ num ];
 
   installPhase = ''
     mkdir -p "$out/lib/hol_light" "$out/bin"
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index fab79bd7b729..a6214abbc367 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1043,6 +1043,7 @@ let
     };
 
     hol_light = callPackage ../applications/science/logic/hol_light {
+      inherit num;
       camlp5 = camlp5_strict;
     };
 

From f0e5a51c98dd1b4c010251cf624f3556597d834d Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Fri, 5 Oct 2018 17:52:24 -0700
Subject: [PATCH 2515/3253] astroid: 0.13 -> 0.14

---
 .../networking/mailreaders/astroid/default.nix  | 17 ++++++-----------
 .../mailreaders/astroid/run_tests.diff          | 10 ----------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/astroid/run_tests.diff

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 0cb07b8ce755..8dd23df7749c 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,36 +1,31 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk222x
 , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
 , makeWrapper, python3, python3Packages
 , vim ? vim_configurable.override {
                     features = "normal";
                     gui = "auto";
                   }
+, ronn
 }:
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.13";
+  version = "0.14";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "105x5g44hng3fi03h67j3an53088148jbq8726nmcp0zs0cy9gac";
+    sha256 = "1wkv1icsx3g3gq485dnvcdhr9srrjgz4ws1i1krcw9n61bj7gxh8";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas
+  buildInputs = [ gnome3.gtkmm gmime3 webkitgtk222x libsass gnome3.libpeas
                   python3 python3Packages.pygobject3
                   notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme
                   glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]);
 
-  patches = [
-    # TODO: remove when https://github.com/astroidmail/astroid/pull/531
-    #       is released
-    ./run_tests.diff
-  ];
-
   postPatch = ''
     sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
     sed -i "s~ -geom 10x10~~g" src/config.cc
diff --git a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff b/pkgs/applications/networking/mailreaders/astroid/run_tests.diff
deleted file mode 100644
index 21b466741ce1..000000000000
--- a/pkgs/applications/networking/mailreaders/astroid/run_tests.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/tests/run_test.sh b/tests/run_test.sh
-index f2ea7d7..927c61d 100755
---- a/tests/run_test.sh
-+++ b/tests/run_test.sh
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#! /usr/bin/env bash
- #
- # Set up environment and run test specified on command line
- 

From f7cd362ae495365251c1ad48fdced79c68920fa4 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sat, 6 Oct 2018 12:21:05 -0500
Subject: [PATCH 2516/3253] gnupg20: set version variable to fix gnupg1compat

Presently, gnupg1compat only works with gnupg22. Without this change, the error

```
error: attribute 'version' missing, at .../nixpkgs/pkgs/tools/security/gnupg/1compat.nix:4:26
```

is emitted when evaluating

```
pkgs.gnupg1compat.override { gnupg = pkgs.gnupg20; }'
```
---
 pkgs/tools/security/gnupg/20.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 9404cb1d0655..6ae2bbc436ed 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,7 +12,8 @@ with stdenv.lib;
 assert guiSupport -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.30";
+  name = "gnupg-${version}";
+  version = "2.0.30";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";

From a959bd928a7557cb74f2e830fcd04749174798e6 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sat, 6 Oct 2018 20:39:20 +0200
Subject: [PATCH 2517/3253] maintainers: add pacien

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 737431effaca..ba87e16a7d4c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3120,6 +3120,11 @@
     github = "oyren";
     name = "Moritz Scheuren";
   };
+  pacien = {
+    email = "b4gx3q.nixpkgs@pacien.net";
+    github = "pacien";
+    name = "Pacien Tran-Girard";
+  };
   paholg = {
     email = "paho@paholg.com";
     github = "paholg";

From 0b13e8a3413274064ecfbd7d3d66f128912e12c0 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 6 Oct 2018 21:43:32 +0300
Subject: [PATCH 2518/3253] midisheetmusic: init at 2.6

---
 .../audio/midisheetmusic/default.nix          | 60 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/applications/audio/midisheetmusic/default.nix

diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix
new file mode 100644
index 000000000000..26962ad9cc85
--- /dev/null
+++ b/pkgs/applications/audio/midisheetmusic/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl
+, mono, dotnetPackages, makeWrapper
+, gtk2, cups, timidity }:
+
+let
+  version = "2.6";
+in stdenv.mkDerivation {
+  name = "midisheetmusic";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";
+    sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p";
+  };
+
+  checkInputs = (with dotnetPackages; [ NUnitConsole ]);
+  nativeBuildInputs = [ mono makeWrapper ];
+
+  buildPhase = ''
+    for i in Classes/MidiPlayer.cs Classes/MidiSheetMusic.cs
+    do
+      substituteInPlace $i --replace "/usr/bin/timidity" "${timidity}/bin/timidity"
+    done
+
+    ./build.sh
+  '';
+
+  # include missing file with unit tests for building
+  # switch from mono nunit dll to standalone dll otherwise mono compiler barks
+  # run via nunit3 console, because mono nunit console wants access $HOME
+  checkPhase = ''
+    substituteInPlace UnitTestDLL.csproj \
+      --replace "</Compile>" '</Compile><Compile Include="Classes\UnitTest.cs"/>' \
+      --replace nunit.framework.dll "${dotnetPackages.NUnit}/lib/dotnet/NUnit/nunit.framework.dll"
+    ./build_unit_test.sh
+    nunit3-console bin/Debug/UnitTest.dll
+  '';
+
+  # 2 tests of 47 are still failing
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/share/applications $out/share/pixmaps $out/bin
+
+    cp deb/midisheetmusic.desktop $out/share/applications
+    cp NotePair.png $out/share/pixmaps/midisheetmusic.png
+    cp bin/Debug/MidiSheetMusic.exe $out/bin/.MidiSheetMusic.exe
+
+    makeWrapper ${mono}/bin/mono $out/bin/midisheetmusic.mono.exe \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 cups ]} \
+      --add-flags $out/bin/.MidiSheetMusic.exe
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Convert MIDI Files to Piano Sheet Music for two hands";
+    homepage = http://midisheetmusic.com;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c403077dbb9b..b0e68b00cd45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4052,6 +4052,8 @@ with pkgs;
 
   mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
 
+  midisheetmusic = callPackage ../applications/audio/midisheetmusic { };
+
   mikutter = callPackage ../applications/networking/instant-messengers/mikutter { };
 
   mimeo = callPackage ../tools/misc/mimeo { };

From 3115f8dffb427f64c5ab12ed51cc173980a4a1c9 Mon Sep 17 00:00:00 2001
From: Ji-Haeng Huh <jhhuh.note@gmail.com>
Date: Sat, 6 Oct 2018 17:03:22 +0900
Subject: [PATCH 2519/3253] tinyemu: init at 2018-09-23

---
 .../virtualization/tinyemu/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/virtualization/tinyemu/default.nix

diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix
new file mode 100644
index 000000000000..a8f113307251
--- /dev/null
+++ b/pkgs/applications/virtualization/tinyemu/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, openssl, curl, SDL }:
+
+stdenv.mkDerivation rec {
+  name = "tinyemu-${version}";
+  version = "2018-09-23";
+  src = fetchurl {
+    url = "https://bellard.org/tinyemu/${name}.tar.gz";
+    sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
+  };
+  buildInputs = [ openssl curl SDL ];
+  makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ];
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';
+  meta = {
+    homepage = https://bellard.org/tinyemu/;
+    description = "A system emulator for the RISC-V and x86 architectures";
+    longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete.";
+    license = with stdenv.lib.licenses; [ mit bsd2 ];
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c403077dbb9b..42a643b91598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5597,6 +5597,8 @@ with pkgs;
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
+  tinyemu = callPackage ../applications/virtualization/tinyemu { };
+
   tinyproxy = callPackage ../tools/networking/tinyproxy {};
 
   tio = callPackage ../tools/misc/tio { };

From 4af5457ebb10fe2fb1c10498b0ca307cf6298d92 Mon Sep 17 00:00:00 2001
From: pmahoney <pat@polycrystal.org>
Date: Sat, 6 Oct 2018 13:56:21 -0500
Subject: [PATCH 2520/3253] jsonnet: fix on darwin (#47939)

Build on darwin fails when using emscripten to build the js
library. Disabling this is unsatisfying, but gets the jsonnet binary
building again.
---
 pkgs/development/compilers/jsonnet/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 4a520471f867..f363c6fdb5ee 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, emscripten }:
+{ stdenv, lib, fetchFromGitHub, emscripten
+, enableJsonnetJs ? !stdenv.isDarwin
+}:
 
 let version = "0.11.2"; in
 
@@ -13,16 +15,17 @@ stdenv.mkDerivation {
     sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
   };
 
-  buildInputs = [ emscripten ];
+  buildInputs = if enableJsonnetJs then [ emscripten ] else [ ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all''];
+  makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++
+    (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]);
 
   installPhase = ''
     mkdir -p $out/bin $out/lib $out/share/
     cp jsonnet $out/bin/
-    cp libjsonnet.so $out/lib/
+    cp libjsonnet*.so $out/lib/
     cp -a doc $out/share/doc
     cp -a include $out/include
   '';

From 1e237142964793c9c3d55faaa3a8cdbe3315c855 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sat, 6 Oct 2018 13:26:35 -0500
Subject: [PATCH 2521/3253] gnupg1compat: reintroduce symlinks, only when
 actually needed

---
 pkgs/tools/security/gnupg/1compat.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
index eadfbe230b3f..371a7ca67afd 100644
--- a/pkgs/tools/security/gnupg/1compat.nix
+++ b/pkgs/tools/security/gnupg/1compat.nix
@@ -4,14 +4,22 @@ stdenv.mkDerivation {
   name = "gnupg1compat-${gnupg.version}";
 
   builder = writeScript "gnupg1compat-builder" ''
+    PATH=${coreutils}/bin
     # First symlink all top-level dirs
-    ${coreutils}/bin/mkdir -p $out
-    ${coreutils}/bin/ln -s "${gnupg}/"* $out
+    mkdir -p $out
+    ln -s "${gnupg}/"* $out
 
     # Replace bin with directory and symlink it contents
-    ${coreutils}/bin/rm $out/bin
-    ${coreutils}/bin/mkdir -p $out/bin
-    ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin
+    rm $out/bin
+    mkdir -p $out/bin
+    ln -s "${gnupg}/bin/"* $out/bin
+
+    # Add symlinks for any executables that end in 2 and lack any non-*2 version
+    for f in $out/bin/*2; do
+      [[ -x $f ]] || continue # ignore failed globs and non-executable files
+      [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions
+      ln -s -- "''${f##*/}" "''${f%2}"
+    done
   '';
 
   meta = gnupg.meta // {

From 5deee7672c675e5dc1ea631b28deed72af8ae2f5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 6 Oct 2018 14:40:09 -0500
Subject: [PATCH 2522/3253] netbsd: support cross compilation

Separates build and host packages to get cross compilation working.
---
 pkgs/os-specific/bsd/netbsd/default.nix | 80 ++++++++++++++++++-------
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 3e1d1f01aa0d..f9a614d32336 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -2,6 +2,9 @@
 , yacc, flex, libressl, bash, less, writeText }:
 
 let
+  inherit (lib) optionalString replaceStrings;
+  inherit (stdenv) hostPlatform;
+
   fetchNetBSD = path: version: sha256: fetchcvs {
     cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
     module = "src/${path}";
@@ -9,20 +12,52 @@ let
     tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE";
   };
 
+  # Needed to support cross correctly. Splicing only happens when we
+  # do callPackage, but sense everything is here, it needs to be done
+  # by hand. All native build inputs should come from here.
+  nbBuildPackages = buildPackages.netbsd;
+
+  MACHINE_ARCH = {
+    "i686" = "i386";
+  }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name;
+
+  MACHINE = {
+    "x86_64" = "amd64";
+    "aarch64" = "evbarm64";
+    "i686" = "i386";
+  }.${hostPlatform.parsed.cpu.name} or hostPlatform.parsed.cpu.name;
+
   netBSDDerivation = attrs: stdenv.mkDerivation ((rec {
-    name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
+    name = "netbsd-${attrs.pname or (baseNameOf attrs.path)}-${attrs.version}";
     src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256;
 
     extraPaths = [ ];
     setOutputFlags = false;
 
-    nativeBuildInputs = [ makeMinimal mandoc groff install stat
-                          yacc flex tsort lorder ];
-    buildInputs = [ compat ];
+    nativeBuildInputs = [ yacc flex mandoc groff
+                          nbBuildPackages.makeMinimal
+                          nbBuildPackages.stat
+                          nbBuildPackages.install
+                          nbBuildPackages.tsort
+                          nbBuildPackages.lorder ];
+    buildInputs = [ nbPackages.compat ];
     installFlags = [ "includes" ];
+    # TODO: eventually move this to a make.conf
+    makeFlags = [
+      "MACHINE=${MACHINE}"
+      "MACHINE_ARCH=${MACHINE_ARCH}"
+
+      "AR=${stdenv.cc.targetPrefix}ar"
+      "CC=${stdenv.cc.targetPrefix}cc"
+      "CPP=${stdenv.cc.targetPrefix}cpp"
+      "CXX=${stdenv.cc.targetPrefix}c++"
+      "LD=${stdenv.cc.targetPrefix}ld"
+      "STRIP=${stdenv.cc.targetPrefix}strip"
+    ] ++ (attrs.makeFlags or []);
 
     # Definitions passed to share/mk/*.mk. Should be pretty simple -
     # eventually maybe move it to a configure script.
+    # TODO: don’t rely on DESTDIR, instead use prefix
     DESTDIR = "$(out)";
     TOOLDIR = "$(out)";
     USETOOLS = "never";
@@ -30,10 +65,9 @@ let
     NOGCCERROR = "yes";
     LEX = "flex";
     MKUNPRIVED = "yes";
-    HOST_SH = "${bash}/bin/sh";
+    HOST_SH = "${buildPackages.bash}/bin/sh";
     OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
-    MACHINE_ARCH = stdenv.hostPlatform.parsed.cpu.name;
-    MACHINE_CPU = stdenv.hostPlatform.parsed.cpu.name;
+    RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp";
 
     INSTALL_FILE = "install -U -c";
     INSTALL_DIR = "xinstall -U -d";
@@ -85,7 +119,7 @@ let
     # NetBSD makefiles should be able to detect this
     # but without they end up using gcc on Darwin stdenv
     preConfigure = ''
-      export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))}
+      export HAVE_${if stdenv.cc.isClang then "LLVM" else "GCC"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))}
 
       # Parallel building. Needs the space.
       export makeFlags+=" -j $NIX_BUILD_CORES"
@@ -128,7 +162,9 @@ let
       platforms = platforms.unix;
       license = licenses.bsd2;
     };
-  }) // attrs);
+  }) // (removeAttrs attrs ["makeFlags"]));
+
+  nbPackages = rec {
 
   ##
   ## BOOTSTRAPPING
@@ -165,7 +201,7 @@ let
     extraPaths = [ make.src ] ++ make.extraPaths;
   };
 
-  compat = netBSDDerivation rec {
+  compat = if hostPlatform.isNetBSD then null else netBSDDerivation rec {
     path = "tools/compat";
     sha256 = "050449lq5gpxqsripdqip5ks49g5ypjga188nd3ss8dg1zf7ydz3";
     version = "8.0";
@@ -176,7 +212,7 @@ let
     ];
 
     # override defaults to prevent infinite recursion
-    nativeBuildInputs = [ makeMinimal ];
+    nativeBuildInputs = [ nbBuildPackages.makeMinimal ];
     buildInputs = [ zlib ];
 
     # temporarily use gnuinstall for bootstrapping
@@ -234,7 +270,7 @@ let
   # HACK to ensure parent directories exist. This emulates GNU
   # install’s -D option. No alternative seems to exist in BSD install.
   install = let binstall = writeText "binstall" ''
-    #!/bin/sh
+    #!${stdenv.shell}
     for last in $@; do true; done
     mkdir -p $(dirname $last)
     xinstall "$@"
@@ -243,7 +279,7 @@ let
     version = "8.0";
     sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj";
     extraPaths = [ mtree.src make.src ];
-    nativeBuildInputs = [ makeMinimal mandoc groff ];
+    nativeBuildInputs = [ nbBuildPackages.makeMinimal mandoc groff ];
     buildInputs = [ compat fts ];
     installPhase = ''
       runHook preInstall
@@ -294,21 +330,24 @@ let
     path = "usr.bin/stat";
     version = "8.0";
     sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh";
-    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+    nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install
+                          mandoc groff ];
   };
 
   tsort = netBSDDerivation {
     path = "usr.bin/tsort";
     version = "8.0";
     sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq";
-    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+    nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install
+                          mandoc groff ];
   };
 
   lorder = netBSDDerivation {
     path = "usr.bin/lorder";
     version = "8.0";
     sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2";
-    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+    nativeBuildInputs = [ nbBuildPackages.makeMinimal nbBuildPackages.install
+                          mandoc groff ];
   };
   ##
   ## END BOOTSTRAPPING
@@ -345,6 +384,8 @@ let
         --replace '-Wl,-rpath,''${SHLIBDIR}' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
         --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \
+        --replace /bin/rm rm
     '' + lib.optionalString stdenv.isDarwin ''
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
         --replace '-Wl,--fatal-warnings' "" \
@@ -390,9 +431,6 @@ let
     '';
   };
 
-in rec {
-  inherit compat install netBSDDerivation fts;
-
   getent = netBSDDerivation {
     path = "usr.bin/getent";
     sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz";
@@ -612,4 +650,6 @@ in rec {
     patches = [ ./locale.patch ];
   };
 
-}
+  };
+
+in nbPackages

From d8bcd2c3d8f0bb346ed899ee1a971de488d4178b Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Sat, 6 Oct 2018 19:48:43 +0000
Subject: [PATCH 2523/3253] nixos/bash: Use `escapeShellArg` for shell aliases

This patch uses the library function `lib.escapeShellArg` to improve
the handling of shell aliases in the NixOS module `bash`, copying the
corresponding change made to the `zsh` module in commit
1e211a70cbdaf230a18ea4cb67a959039d5c2ddb (for which GitHub pull
request #47471 was filed).

This patch resolves GitHub issue #16973.

This change presumably also should be copied to the `fish` module, but
I don't know `fish` syntax so that won't be done by me.

GitHub: Close NixOS/nixpkgs#16973.
---
 nixos/modules/programs/bash/bash.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 424e1506b4c5..f664e2225550 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -33,7 +33,7 @@ let
   '';
 
   bashAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
   );
 
 in

From 2a1fa9a1c98f1cd20d613773bb0d5409a5c7e279 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 6 Oct 2018 17:04:04 -0400
Subject: [PATCH 2524/3253] Add zlib; swap to lz4.dev

---
 pkgs/servers/computing/slurm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index afb39ac9fb3e..e016c5860f74 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
-, python, munge, perl, pam, openssl
+, python, munge, perl, pam, openssl, zlib
 , ncurses, mysql, gtk2, lua, hwloc, numactl
 , readline, freeipmi, libssh2, xorg, lz4
 # enable internal X11 support via libssh2
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    curl python munge perl pam openssl
+    curl python munge perl pam openssl zlib
       mysql.connector-c ncurses gtk2 lz4
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
@@ -42,9 +42,10 @@ stdenv.mkDerivation rec {
   configureFlags = with stdenv.lib;
     [ "--with-freeipmi=${freeipmi}"
       "--with-hwloc=${hwloc.dev}"
-      "--with-lz4=${lz4}"
+      "--with-lz4=${lz4.dev}"
       "--with-munge=${munge}"
       "--with-ssl=${openssl.dev}"
+      "--with-zlib=${zlib}"
       "--sysconfdir=/etc/slurm"
     ] ++ (optional (gtk2 == null)  "--disable-gtktest")
       ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");

From 0cfc923813f803c7a169d257ce856173a2387ffc Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sat, 6 Oct 2018 23:53:06 +0200
Subject: [PATCH 2525/3253] borgbackup: patch bug that allowed for exceeding
 quotas

See also https://github.com/borgbackup/borg/issues/4093 for this.
---
 pkgs/tools/backup/borg/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index fe2f771c7227..72f6cd03e038 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
+{ stdenv, fetchpatch, python3Packages, acl, libb2, lz4, zstd, openssl, openssh }:
 
 python3Packages.buildPythonApplication rec {
   pname = "borgbackup";
@@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec {
     sha256 = "f7b51a132e9edfbe1cacb4f478b28caf3622d79fffcb369bdae9f92d8c8a7fdc";
   };
 
+  patches = [
+    # Workarounds for https://github.com/borgbackup/borg/issues/4093
+    # Can be deleted when 1.1.8 comes out
+    (fetchpatch {
+      url = "https://github.com/borgbackup/borg/commit/975cc33206e0e3644626fb7204c34d2157715b61.patch";
+      sha256 = "0b7apaixpa7bk0sy7g5ycm98cjpkg5gkwcgm7m37xj35lzxdlxhc";
+    })
+  ];
+
   nativeBuildInputs = with python3Packages; [
     # For building documentation:
     sphinx guzzle_sphinx_theme

From c477d6658c47fcd62b897819d9ae1aa535071ad0 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 7 Oct 2018 11:35:55 +0900
Subject: [PATCH 2526/3253] nixos/prometheus-snmp-exporter: fix command line
 argument format

---
 .../services/monitoring/prometheus/exporters/snmp.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index 404cd0a1896b..0d9194124325 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -60,10 +60,10 @@ in
       DynamicUser = true;
       ExecStart = ''
         ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
-          -config.file ${configFile} \
-          -log.format ${cfg.logFormat} \
-          -log.level ${cfg.logLevel} \
-          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --config.file=${configFile} \
+          --log.format=${cfg.logFormat} \
+          --log.level=${cfg.logLevel} \
+          --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };

From c2c534e8ce894a335467f18b25f2aa23eff71c51 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Oct 2018 23:34:24 -0300
Subject: [PATCH 2527/3253] Oroborus: small fixes

---
 pkgs/applications/window-managers/oroborus/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 13eef1c045a4..2681d31ccb1e 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   version = "2.0.20";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ];
+  buildInputs = [ freetype fribidi libSM libICE libXt libXaw libXmu libXext
+                  libXft libXpm libXrandr libXrender xextproto libXinerama ];
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";

From 3807a94545d9016b9d53e3bb9c5acaba05d27f2d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Oct 2018 23:34:43 -0300
Subject: [PATCH 2528/3253] pekwm: small fixes

---
 pkgs/applications/window-managers/pekwm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix
index bdf914fbd751..b2677218e856 100644
--- a/pkgs/applications/window-managers/pekwm/default.nix
+++ b/pkgs/applications/window-managers/pekwm/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
         appear as they should when starting applications.
       - Chainable Keygrabber, usability for everyone.
     '';
-      homepage = https://www.pekwm.org;
+      homepage = http://www.pekwm.org;
       license = licenses.gpl2;
       maintainers = [ maintainers.AndersonTorres ];
       platforms = platforms.linux;

From b1e72d746529777c8130a96427d9d1708b2ca6b2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Oct 2018 23:35:10 -0300
Subject: [PATCH 2529/3253] libtap: small fixes

---
 pkgs/development/libraries/libtap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 2671199ab0e0..99e0ab0a4767 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec{
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ cmake perl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library to implement a test protocol";
     longDescription = ''
       libtap is a library to implement the Test Anything Protocol for
       C originally created by Nik Clayton. This is a maintenance
       branch by Shlomi Fish.
     '';
-    homepage = http://www.shlomifish.org/open-source/projects/libtap/;
+    homepage = https://www.shlomifish.org/open-source/projects/libtap/;
     license = licenses.bsd3;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From f65adf629291127b9877763201b9e5207754e550 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Oct 2018 23:35:41 -0300
Subject: [PATCH 2530/3253] higan: small fixes

---
 pkgs/misc/emulators/higan/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index fbe44c6540b3..18db78d82ad5 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
 
   buildInputs =
-  [ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ];
+  [ p7zip pkgconfig libX11 libXv udev libGLU_combined
+    SDL libao openal libpulseaudio gtk2 gtksourceview ];
 
   unpackPhase = ''
     7z x $src
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
         - NEC's PC Engine, SuperGrafx;
         - Bandai's WonderSwan, WonderSwan Color.
     '';
-    homepage = https://byuu.org/higan/;
+    homepage = https://byuu.org/emulation/higan/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = with platforms; unix;

From adf095d222c982c0167b91e12ecb3d68114e1f0e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sat, 6 Oct 2018 23:35:57 -0300
Subject: [PATCH 2531/3253] guile-reader: small fixes

---
 pkgs/development/guile-modules/guile-reader/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
index 010c523507fd..35bcd7bfc2f3 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
        "token readers" of a standard Scheme readers. For example, it
        is used to implement Skribilo's R5RS-derived document syntax.
     '';
-    homepage = https://www.gnu.org/software/guile-reader;
+    homepage = https://www.nongnu.org/guile-reader/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.gnu;

From 65eb3e38e8842d1110a531ade7b09e890429367c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 6 Oct 2018 23:29:44 -0400
Subject: [PATCH 2532/3253] nano: 3.0 -> 3.1

---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 9c50d8e8b78e..36c400a74faa 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0";
+    sha256 = "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 82b2b9135a331ea786d6c00df3c8e6df3d551159 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Sun, 7 Oct 2018 11:20:53 +0200
Subject: [PATCH 2533/3253] cool-retro-term: Fix link to home page

---
 pkgs/applications/misc/cool-retro-term/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index f4ad3a1c5382..c9cc2d6db424 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       feel of the old cathode tube screens. It has been designed to be
       eye-candy, customizable, and reasonably lightweight.
     '';
-    homepage = https://github.com/Swordifish90/cool-retro-term;
+    homepage = https://github.com/Swordfish90/cool-retro-term;
     license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];

From a9a88b0942c0bbc0b1dc6db22e2608e75c8446c7 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sat, 6 Oct 2018 18:30:44 +0200
Subject: [PATCH 2534/3253] vdirsyncer: fix build due to #47709

---
 pkgs/tools/misc/vdirsyncer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 0655264cc542..c273ef879682 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec {
 
   preBuild = ''
     mkdir -p rust/target/release
-    ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/
+    ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
   '';
 
   LC_ALL = "en_US.utf8";

From 226f31b3a2e5e76302a89cc3617171848b60294c Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sun, 7 Oct 2018 12:46:15 +0200
Subject: [PATCH 2535/3253] ja2-stracciatella: fix build due to #47709

---
 pkgs/games/ja2-stracciatella/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index 0e5702d46146..5dbab979272c 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ./remove-rust-buildstep.patch
   ];
   preConfigure = ''
-    sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt
+    sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt
     cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2")
   '';
 

From 99c8dc4a11c780a67d4443510b3de173b5380d88 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 7 Oct 2018 13:10:50 +0200
Subject: [PATCH 2536/3253] charybdis service: bin/charybdis-ircd ->
 bin/charybdis

---
 nixos/modules/services/networking/charybdis.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index 6d57faa9ac2b..3d02dc8d1375 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -90,7 +90,7 @@ in
           BANDB_DBPATH = "${cfg.statedir}/ban.db";
         };
         serviceConfig = {
-          ExecStart   = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}";
+          ExecStart   = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}";
           Group = cfg.group;
           User = cfg.user;
           PermissionsStartOnly = true; # preStart needs to run with root permissions

From a01cab05c626f17632edb3776f16fabb89afc106 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sun, 7 Oct 2018 14:08:16 +0200
Subject: [PATCH 2537/3253] haskellPackages.arbtt: unbreak with jailbreak

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 409f159387fd..7dc7ba425e10 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1153,4 +1153,7 @@ self: super: {
   });
 
   xmonad-extras = doJailbreak super.xmonad-extras;
+
+  arbtt = doJailbreak super.arbtt;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 096be6d9418e6ead24db1a56738d8a3086c298c5 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 7 Oct 2018 16:45:05 +0200
Subject: [PATCH 2538/3253] haskellPackages.shell-conduit: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 409f159387fd..1f270ce1e158 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -103,18 +103,12 @@ self: super: {
   };
 
   # Fix test trying to access /home directory
-  shell-conduit = (overrideCabal super.shell-conduit (drv: {
+  shell-conduit = overrideCabal super.shell-conduit (drv: {
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";
 
     # the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
     # see: https://github.com/psibi/shell-conduit/issues/12
     doCheck = !pkgs.stdenv.isDarwin;
-  })).overrideScope (self: super: {
-    # shell-conduit doesn't build with conduit 1.3
-    # see https://github.com/psibi/shell-conduit/issues/15
-    conduit = self.conduit_1_2_13_1;
-    conduit-extra = self.conduit-extra_1_2_3_2;
-    resourcet = self.resourcet_1_1_11;
   });
 
   # https://github.com/froozen/kademlia/issues/2

From 250485cb60ef1de0727ab2c20d4d5815f4ed72db Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:28:11 +0200
Subject: [PATCH 2539/3253] aeolus: 0.9.5 -> 0.9.7

---
 pkgs/applications/audio/aeolus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 68a9bb63e2e0..7b80b32331bc 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "aeolus-${version}";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv";
+    sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
   };
 
   buildInputs = [

From d6860f40b447ab82fc6f2ae6fc1dda57203bac1a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:32:38 +0200
Subject: [PATCH 2540/3253] tetraproc: 0.8.2 -> 0.8.6

---
 pkgs/applications/audio/tetraproc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix
index 535d53d99eeb..257963de256f 100644
--- a/pkgs/applications/audio/tetraproc/default.nix
+++ b/pkgs/applications/audio/tetraproc/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "tetraproc-${version}";
-  version = "0.8.2";
+  version = "0.8.6";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv";
+    sha256 = "02155ljfwgvfgq9z258fb4z7jrz7qx022d054fj5gr0v007cv0r7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4fd0f592afec641f439c7ba53d2f46e90ca9a579 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:33:10 +0200
Subject: [PATCH 2541/3253] zita-alsa-pcmi: 0.2.0 -> 0.3.2

---
 .../libraries/audio/zita-alsa-pcmi/default.nix   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index e3c0f0394772..320fc41f76c5 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "zita-alsa-pcmi-${version}";
-  version = "0.2.0";
+  version = "0.3.2";
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9";
+    sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
   };
 
   buildInputs = [ alsaLib ];
 
   buildPhase = ''
-    cd libs
+    cd source
     make PREFIX="$out"
 
     # create lib link for building apps
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
     # apps
     cd ../apps
-    CXXFLAGS+=" -I../libs" \
-    LDFLAGS+=" -L../libs" \
+    CXXFLAGS+=" -I../source" \
+    LDFLAGS+=" -L../source" \
     make PREFIX="$out"
   '';
 
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
     mkdir "$out/include"
     mkdir "$out/bin"
 
-    cd ../libs
+    cd ../source
 
-    # libs
+    # source
     install -Dm755 libzita-alsa-pcmi.so.$version \
       "$out/lib/libzita-alsa-pcmi.so.$version"
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     install -Dm755 ../apps/alsa_delay \
       "$out/bin/alsa_delay"
     install -Dm755 ../apps/alsa_loopback \
-      "$out/bin/alsa_delay"
+      "$out/bin/alsa_loopback"
   '';
 
   meta = {

From 395b5f6a4bc6aedac2ac96561de193061e7d2975 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:34:00 +0200
Subject: [PATCH 2542/3253] zita-convolver: 4.0.0 -> 4.0.3

---
 pkgs/development/libraries/audio/zita-convolver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 11a06d4f39ac..4fc5c12ccc4c 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "zita-convolver-${version}";
-  version = "4.0.0";
+  version = "4.0.3";
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673";
+    sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
   };
 
   buildInputs = [ fftwFloat ];
 
   patchPhase = ''
-    cd libs
+    cd source
     sed -e "s@ldconfig@@" -i Makefile
   '';
 

From 123cb978d3e8aba2709e63966df39564b77fa71e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:35:03 +0200
Subject: [PATCH 2543/3253] zita-resampler: 1.6.0 -> 1.6.2

---
 pkgs/development/libraries/audio/zita-resampler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 00a0a5082137..e9cccab39f02 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "zita-resampler-${version}";
-  version = "1.6.0";
+  version = "1.6.2";
   src = fetchurl {
     url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
-    sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h";
+    sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
   };
 
   makeFlags = [
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   ];
 
   patchPhase = ''
-    cd libs
+    cd source
     sed -e "s@ldconfig@@" -i Makefile
   '';
 

From c1949a3449740e1ca72d0080714d2f28d7b83cf0 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:35:56 +0200
Subject: [PATCH 2544/3253] libclthreads: 2.4.0 -> 2.4.2

---
 .../libraries/libclthreads/default.nix         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 6d37eb19c712..a2f6858a05c9 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -2,20 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "libclthreads-${version}";
-  version = "2.4.0";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
-    sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
+    sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6";
   };
 
   patchPhase = ''
-    # Fix hardcoded paths to executables
-    sed -e "s@/usr/bin/install@install@" -i ./Makefile
-    sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
-
-    # Remove useless symlink: /lib64 -> /lib
-    sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
+    cd source
+    # don't run ldconfig:
+    sed -e "/ldconfig/d" -i ./Makefile
   '';
 
   makeFlags = [
@@ -24,12 +21,13 @@ stdenv.mkDerivation rec {
   ];
 
   preInstall = ''
-    # The Makefile does not create the include directory
+    # The Makefile does not create the include and lib directories
     mkdir -p $out/include
+    mkdir -p $out/lib
   '';
 
   postInstall = ''
-    ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
+    ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
   '';
 
   meta = with stdenv.lib; {

From 9affe6ca47746385cd106a551e3516665663bdfe Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 7 Oct 2018 17:36:36 +0200
Subject: [PATCH 2545/3253] libclxclient: 3.9.0 -> 3.9.2

---
 .../libraries/libclxclient/default.nix           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index ce67a8efa80e..6e6ca647fc0f 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }:
+{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libclxclient-${version}";
-  version = "3.9.0";
+  version = "3.9.2";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
-    sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
+    sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5";
   };
 
   buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include";
 
   patchPhase = ''
-    sed -e "s@ldconfig@@" -i Makefile
+    cd source
+    # use pkg-config instead of pkgcon:
+    sed -e 's/pkgconf/pkg-config/g' -i ./Makefile
+    # don't run ldconfig:
+    sed -e "/ldconfig/d" -i ./Makefile
+    # make sure it can find clxclient.h:
+    sed -e 's/<clxclient.h>/"clxclient.h"/' -i ./enumip.cc
   '';
 
   makeFlags = [

From cd71e1036b874e6c132ee008a4fea356dc10a245 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 18:47:15 +0200
Subject: [PATCH 2546/3253] zimreader: add license

See https://phabricator.wikimedia.org/source/openzim/browse/master/zimreader/COPYING
---
 pkgs/tools/text/zimreader/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index 4271bf095a14..fbd9bc3fa20a 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A tool to serve ZIM files using HTTP";
     homepage = http://git.wikimedia.org/log/openzim;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ robbinch juliendehos ];
     platforms = [ "x86_64-linux" ];
   };

From fdec2e16bc29a58f61f304fd91a21b0e466ea277 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 18:51:24 +0200
Subject: [PATCH 2547/3253] wolfssl: add license

---
 pkgs/development/libraries/wolfssl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 30291a180226..8f57a0bf1b71 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
     homepage    = "https://www.wolfssl.com/";
     platforms   = platforms.all;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with maintainers; [ mcmtroffaes ];
   };
 }

From 241a13cc70329a47da5c6436b927fa4dc616d072 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 18:55:00 +0200
Subject: [PATCH 2548/3253] wego: add license

---
 pkgs/applications/misc/wego/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index b61566af6b2c..7a09a8045770 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -14,4 +14,8 @@ buildGoPackage rec {
   };
 
   goDeps = ./deps.nix;
+
+  meta = {
+    license = stdenv.lib.licenses.isc;
+  };
 }

From 59da2351883489099ccfd4af4129d9f0e329a046 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 18:56:48 +0200
Subject: [PATCH 2549/3253] tnt: add license

See "Disclaimer" at https://math.nist.gov/tnt/download.html
---
 pkgs/development/libraries/tnt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 23ef997e5ce1..229e4cfaa6c0 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://math.nist.gov/tnt/;
     description = "Template Numerical Toolkit: C++ headers for array and matrices";
+    license = stdenv.lib.licenses.publicDomain;
     platforms = stdenv.lib.platforms.unix;
   };
 }

From aba5390bc59d3ceae1178c7f98e8ab85301ff9c8 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 19:02:01 +0200
Subject: [PATCH 2550/3253] sipcmd: add license

---
 pkgs/applications/networking/sipcmd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix
index 4c8a90137bd0..a36c2286956b 100644
--- a/pkgs/applications/networking/sipcmd/default.nix
+++ b/pkgs/applications/networking/sipcmd/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/tmakkonen/sipcmd;
     description = "The command line SIP/H.323/RTP softphone";
     platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
 

From 346f1c8b63e26864b8156e8a7e30aaa9a0dc011c Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sun, 7 Oct 2018 19:04:06 +0200
Subject: [PATCH 2551/3253] rlog: add license

See https://code.google.com/archive/p/rlog/
---
 pkgs/development/libraries/rlog/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
index f96addffb1ae..f8268b5eb7cd 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -12,5 +12,6 @@ stdenv.mkDerivation {
     homepage = http://www.arg0.net/rlog;
     description = "A C++ logging library used in encfs";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl3;
   };
 }

From f41c55b2ca34ba8d6ad78ba8fc29d30a0075892f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Sep 2018 22:06:53 -0400
Subject: [PATCH 2552/3253] vtable-dumper: init at 1.2

---
 .../tools/misc/vtable-dumper/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/misc/vtable-dumper/default.nix

diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix
new file mode 100644
index 000000000000..e806a7796386
--- /dev/null
+++ b/pkgs/development/tools/misc/vtable-dumper/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, libelf }:
+
+stdenv.mkDerivation rec {
+  name = "vtable-dumper-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "lvc";
+    repo = "vtable-dumper";
+    rev = version;
+    sha256 = "0sl7lnjr2l4c2f7qaazvpwpzsp4gckkvccfam88wcq9f7j9xxbyp";
+  };
+
+  buildInputs = [ libelf ];
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/lvc/vtable-dumper;
+    description = "A tool to list content of virtual tables in a C++ shared library";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.bhipple ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15c4a5944a16..469ab09c53b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8909,6 +8909,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
+
   watson-ruby = callPackage ../development/tools/misc/watson-ruby {};
 
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };

From cc07807b5bdaa20acd2b4fb59097edd0cd15b14e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Sep 2018 22:38:07 -0400
Subject: [PATCH 2553/3253] abi-dumper: init at 1.1

---
 .../tools/misc/abi-dumper/default.nix         | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/misc/abi-dumper/default.nix

diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix
new file mode 100644
index 000000000000..047cd466baac
--- /dev/null
+++ b/pkgs/development/tools/misc/abi-dumper/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, ctags, perl, elfutils, vtable-dumper }:
+
+stdenv.mkDerivation rec {
+  name = "abi-dumper-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "lvc";
+    repo = "abi-dumper";
+    rev = version;
+    sha256 = "1byhw132aj7a5a5zh5s3pnjlrhdk4cz6xd5irp1y08jl980qba5j";
+  };
+
+  patchPhase = ''
+    substituteInPlace abi-dumper.pl \
+      --replace eu-readelf ${elfutils}/bin/eu-readelf \
+      --replace vtable-dumper ${vtable-dumper}/bin/vtable-dumper \
+      --replace '"ctags"' '"${ctags}/bin/ctags"'
+  '';
+
+  buildInputs = [ elfutils ctags perl vtable-dumper ];
+
+  preBuild = "mkdir -p $out";
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/lvc/abi-dumper;
+    description = "Dump ABI of an ELF object containing DWARF debug info";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.bhipple ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 469ab09c53b3..f2026c2b7ed8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7960,6 +7960,8 @@ with pkgs;
 
   ### DEVELOPMENT / TOOLS
 
+  abi-dumper = callPackage ../development/tools/misc/abi-dumper { };
+
   activator = throw ''
     Typesafe Activator was removed in 2017-05-08 as the actual package reaches end of life.
 
@@ -7968,13 +7970,13 @@ with pkgs;
     for more information.
   '';
 
+  adtool = callPackage ../tools/admin/adtool { };
+
   inherit (callPackage ../development/tools/alloy { })
     alloy4
     alloy5
     alloy;
 
-  adtool = callPackage ../tools/admin/adtool { };
-
   augeas = callPackage ../tools/system/augeas { };
 
   inherit (callPackages ../tools/admin/ansible {})

From 8d42787c61e149f58e708a641a6e9ffc017efece Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Sep 2018 22:45:15 -0400
Subject: [PATCH 2554/3253] abi-compliance-checker: init at 2.3

---
 .../misc/abi-compliance-checker/default.nix   | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/misc/abi-compliance-checker/default.nix

diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
new file mode 100644
index 000000000000..db0e41d27ab3
--- /dev/null
+++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, ctags, perl, binutils, abi-dumper }:
+
+stdenv.mkDerivation rec {
+  name = "abi-compliance-checker-${version}";
+  version = "2.3";
+
+  src = fetchFromGitHub {
+    owner = "lvc";
+    repo = "abi-compliance-checker";
+    rev = version;
+    sha256 = "1f1f9j2nf9j83sfl2ljadch99v6ha8rq8xm7ax5akc05hjpyckij";
+  };
+
+  buildInputs = [ binutils ctags perl ];
+  propagatedBuildInputs = [ abi-dumper ];
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://lvc.github.io/abi-compliance-checker;
+    description = "A tool for checking backward API/ABI compatibility of a C/C++ library";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.bhipple ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2026c2b7ed8..1195ba9863cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7960,6 +7960,8 @@ with pkgs;
 
   ### DEVELOPMENT / TOOLS
 
+  abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { };
+
   abi-dumper = callPackage ../development/tools/misc/abi-dumper { };
 
   activator = throw ''

From 64d0676fe1cafc47d710f0e62ff1139814e314ad Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sun, 7 Oct 2018 22:14:19 +0200
Subject: [PATCH 2555/3253] buildRustPackage: fix regex for separating lib and
 bin

E.g. exa was wrongly put into /lib, as it matches

  .*.a

but not

  .*\.a
---
 pkgs/build-support/rust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index ec4514121c24..5fdcf520440e 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -92,8 +92,8 @@ in stdenv.mkDerivation (args // {
   installPhase = args.installPhase or ''
     runHook preInstall
     mkdir -p $out/bin $out/lib
-    find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
-    find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
+    find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
+    find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
     rmdir --ignore-fail-on-non-empty $out/lib $out/bin
     runHook postInstall
   '';

From f81fe9d978c2b4eeea8cf628cebccdf57fb40060 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 9 Jun 2018 01:35:34 +0200
Subject: [PATCH 2556/3253] uhub: re-enable sqlite plugin

---
 pkgs/servers/uhub/default.nix      | 1 +
 pkgs/servers/uhub/plugin-dir.patch | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 87d0a0ee4553..297e064d7caf 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     "mod_welcome"
     "mod_logging"
     "mod_auth_simple"
+    "mod_auth_sqlite"
     "mod_chat_history"
     "mod_chat_only"
     "mod_topic"
diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch
index 01cbcbb31cf3..d29d600425ff 100644
--- a/pkgs/servers/uhub/plugin-dir.patch
+++ b/pkgs/servers/uhub/plugin-dir.patch
@@ -7,7 +7,7 @@
 -	install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
 -	install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
 +
-+    set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
++    set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
 +
 +    foreach( PLUGIN ${PLUGINS} )
 +        install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )

From 6cc84ed1e484bec93d8de0478f92a9b602f947a5 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sat, 6 Oct 2018 20:40:33 +0200
Subject: [PATCH 2557/3253] howl: init at 0.5.3

---
 pkgs/applications/editors/howl/default.nix | 40 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/editors/howl/default.nix

diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix
new file mode 100644
index 000000000000..8f75eda7ef70
--- /dev/null
+++ b/pkgs/applications/editors/howl/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk3, librsvg }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "howl-${version}";
+  version = "0.5.3";
+
+  # Use the release tarball containing pre-downloaded dependencies sources
+  src = fetchurl {
+    url = "https://github.com/howl-editor/howl/releases/download/0.5.3/howl-0.5.3.tgz";
+    sha256 = "0gnc8vr5h8mwapbcqc1zr9la62rb633awyqgy8q7pwjpiy85a03v";
+  };
+
+  sourceRoot = "./howl-${version}/src";
+
+  # The Makefile uses "/usr/local" if not explicitly overridden
+  installFlags = [ "PREFIX=$(out)" ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs = [ gtk3 librsvg ];
+  enableParallelBuilding = true;
+
+  # Required for the program to properly load its SVG assets
+  postInstall = ''
+    wrapProgram $out/bin/howl \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
+  meta = {
+    homepage = https://howl.io/;
+    description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pacien ];
+
+    # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c403077dbb9b..5bfc0a544d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17022,6 +17022,8 @@ with pkgs;
     gtk = gtk3;
   };
 
+  howl = callPackage ../applications/editors/howl { };
+
   ht = callPackage ../applications/editors/ht { };
 
   hubstaff = callPackage ../applications/misc/hubstaff { };

From 92a77c32baa6c0f7cbb12213c27f8961bca9bb67 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 8 Oct 2018 00:53:16 +0200
Subject: [PATCH 2558/3253] uhub: use official upstream sources

the project changed the code repository to github
---
 pkgs/servers/uhub/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 297e064d7caf..456f73dc52ed 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
+{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
 , tlsSupport ? false }:
 
 assert tlsSupport -> openssl != null;
@@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
   name = "uhub-${version}";
   version = "0.5.0";
 
-  src = fetchurl {
-    url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
-    sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5";
+  src = fetchFromGitHub {
+    owner = "janvidar";
+    repo = "uhub";
+    rev = version;
+    sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 0329e26f895aeb6bf405014b70c96a582f861eaf Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 7 Oct 2018 16:09:51 -0700
Subject: [PATCH 2559/3253] vips: fetch from GitHub and build directly from
 source

This used to build from what the README calls a "pre-baked tarball".
---
 pkgs/tools/graphics/vips/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 735d2565b045..489442e4c2a4 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,24 +1,34 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxml2, expat,
+{ stdenv, pkgconfig, glib, libxml2, expat,
   fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
   ApplicationServices,
-  python27, libpng ? null
+  python27, libpng ? null,
+  fetchFromGitHub,
+  autoreconfHook,
+  gtk-doc,
+  gobjectIntrospection,
 }:
 
 stdenv.mkDerivation rec {
   name = "vips-${version}";
   version = "8.7.0";
 
-  src = fetchurl {
-    url = "https://github.com/jcupitt/libvips/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "16086hdg6m44llz69fkp1n0ckjb7zhl6i2bg0wwllrchznikwiy4";
+  src = fetchFromGitHub {
+    owner = "libvips";
+    repo = "libvips";
+    rev = "v${version}";
+    sha256 = "1dwcpmpqbgb9lkajnqv50mrsn97mxbxpq6b5aya7fgfkgdnrs9sw";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobjectIntrospection ];
   buildInputs = [ glib libxml2 fftw orc lcms
     imagemagick openexr libtiff libjpeg
     libgsf libexif python27 libpng expat ]
     ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
+  autoreconfPhase = ''
+    ./autogen.sh
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.vips.ecs.soton.ac.uk;
     description = "Image processing system for large images";

From 641cb61ef78c63222a6543e54dd9edb476529044 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 7 Oct 2018 20:04:59 -0400
Subject: [PATCH 2560/3253] jsonnet: skip building the website (#47981)

The emscripten build of jsonnet is only used in the interactive demo
found on jsonnet.org, and I don't think we need to include the whole
website in our package.  This reduces the transitive closure from
~100mb to ~32mb, and the build duration from ~8 minutes to ~20 seconds
on my machine.
---
 .../development/compilers/jsonnet/default.nix | 23 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index f363c6fdb5ee..15eec4134acf 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,12 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, emscripten
-, enableJsonnetJs ? !stdenv.isDarwin
-}:
+{ stdenv, lib, fetchFromGitHub }:
 
-let version = "0.11.2"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "jsonnet-${version}";
-  version = version;
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
@@ -15,19 +11,18 @@ stdenv.mkDerivation {
     sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
   };
 
-  buildInputs = if enableJsonnetJs then [ emscripten ] else [ ];
-
   enableParallelBuilding = true;
 
-  makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache''] ++
-    (if enableJsonnetJs then ["all"] else ["jsonnet" "libjsonnet.so" "libjsonnet++.so"]);
+  makeFlags = [
+    "jsonnet"
+    "libjsonnet.so"
+  ];
 
   installPhase = ''
-    mkdir -p $out/bin $out/lib $out/share/
+    mkdir -p $out/bin $out/lib $out/include
     cp jsonnet $out/bin/
     cp libjsonnet*.so $out/lib/
-    cp -a doc $out/share/doc
-    cp -a include $out/include
+    cp -a include/*.h $out/include/
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15c4a5944a16..bf1f1caa27c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10110,9 +10110,7 @@ with pkgs;
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
 
-  jsonnet = callPackage ../development/compilers/jsonnet {
-    emscripten = emscripten.override {python=python2;};
-  };
+  jsonnet = callPackage ../development/compilers/jsonnet { };
 
   jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
 

From fb0b3ac7217d2f71536cd726cf089d8011178c4d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Mon, 8 Oct 2018 09:28:53 +0900
Subject: [PATCH 2561/3253] nixos/fish: use 'escapeShellArg' for shell aliases

---
 nixos/modules/programs/fish.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c3f742acde2e..5948fe11f92b 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -9,7 +9,7 @@ let
   cfg = config.programs.fish;
 
   fishAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") cfg.shellAliases
   );
 
 in

From 9a904b3a0880e73eb351d3214d1a3f6d09c75600 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 7 Oct 2018 17:21:30 -0500
Subject: [PATCH 2562/3253] nheko: 0.6.1 -> 0.6.2

---
 .../networking/instant-messengers/nheko/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 810720baa7ca..0d34a0a43628 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "00jigca7kcqwm57qalz7ifz9p6v7p3pnamjvpkxjjix2rm9wmg2q";
+    sha256 = "014k68mmw3ys7ldgj96kkr1i1lyv2nk89wndkqznsizcr3097fn5";
   };
 
   # If, on Darwin, you encounter the error

From de25f785e5739b8be708842d11aac9b8396f8af9 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 7 Oct 2018 20:31:33 -0400
Subject: [PATCH 2563/3253] linux_rpi: 1.20180817 -> 1.20180919

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d95c2caa2cf0..096b3ecde22a 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.14.62";
-  tag = "1.20180817";
+  modDirVersion = "4.14.70";
+  tag = "1.20180919";
 in
 lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "17k7c9hcp834qmlpllag8jc6xhym9wkr5lck1vr0y2wlcxccwnaz";
+    sha256 = "1zjvzk6rhrn3ngc012gjq3v7lxn8hy89ljb7fqwld5g7py9lkf0b";
   };
 
   defconfig = {

From ec1aa05a27bc3c9d68b4c448edd9964b21cc923f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 7 Oct 2018 20:32:38 -0400
Subject: [PATCH 2564/3253] raspberrypifw: 1.20180817 -> 1.20180919

---
 pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 11a5074cff2c..db1091e349dc 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20180817";
+  version = "1.20180919";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "0cjlgs7y0x7wjvbz6046017yb9r9wkjrxksvlnc6i9mgdjcryqqm";
+    sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4";
   };
 
   installPhase = ''

From 964ae43b53e689d4b8dd77dcba5dffada875b6b2 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 7 Oct 2018 20:33:30 -0400
Subject: [PATCH 2565/3253] raspberrypi-tools: 2018-02-05 -> 2018-10-03

---
 pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
index 91e6e7f4cc59..4685f6757179 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-tools-${version}";
-  version = "2018-02-05";
+  version = "2018-10-03";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "userland";
-    rev = "a343dcad1dae4e93f4bfb99496697e207f91027e";
-    sha256 = "1z4qrwjb7x3a45mx978q8vyhnx068sgzhymm4z0ayhckji4ngal1";
+    rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac";
+    sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg";
   };
 
   patches = [ ./tools-dont-install-sysv-init-scripts.patch ];

From 7a86c6760a758e3305e668249bd8ddf88c457529 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Thu, 20 Sep 2018 21:36:21 +0000
Subject: [PATCH 2566/3253] plan9port: 2016-04-18 -> 2018-09-20

---
 pkgs/tools/system/plan9port/builder.sh    |  3 ++-
 pkgs/tools/system/plan9port/default.nix   | 30 ++++++++++++++++-------
 pkgs/tools/system/plan9port/fontsrv.patch | 14 -----------
 3 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/system/plan9port/fontsrv.patch

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 6085e6f841ac..7729bae897c0 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,7 +5,8 @@ export PLAN9_TARGET=$PLAN9
 
 configurePhase()
 {
-    echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config
+    echo CFLAGS=\"-I${fontconfig_dev}/include -I${xproto_exp}/include -I${xextproto_exp}/include -I${libX11_dev}/include -I${libXt_dev}/include -I${libXext_dev}/include -I${freetype_dev}/include -I${zlib_dev}/include\" > LOCAL.config
+    echo LDFLAGS=\"-L${fontconfig_lib}/lib -L${xproto_exp}/lib -L${xextproto_exp}/lib -L${libX11_exp}/lib -L${libXt_exp}/lib -L${libXext_exp}/lib -L${freetype_exp}/lib -L${zlib_exp}/lib\" >> LOCAL.config    
     echo X11=\"${libXt_dev}/include\" >> LOCAL.config
 
     for f in `grep -l -r /usr/local/plan9`; do
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index dc588e54aea8..c71c70b57a7a 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -2,24 +2,23 @@
 , xproto ? null
 , xextproto ? null
 , libXext ? null
+, zlib ? null
   # For building web manuals
 , perl ? null
 , samChordingSupport ? true #from 9front
 }:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-2016-04-18";
+  name = "plan9port-2018-09-20";
 
   src = fetchgit {
     # Latest, same as on github, google code is old
-    url = "https://plan9port.googlesource.com/plan9";
-    rev = "35d43924484b88b9816e40d2f6bff4547f3eec47";
-    sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc";
+    url = "https://github.com/9fans/plan9port.git";
+    rev = "a82a8b6368274d77d42f526e379b74e79c137e26";
+    sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1";
   };
 
-  patches = [
-    ./fontsrv.patch
-  ] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ];
+  patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ];
 
   postPatch = ''
     #hardcoded path
@@ -59,11 +58,24 @@ stdenv.mkDerivation rec {
     homepage = http://swtch.com/plan9port/;
     description = "Plan 9 from User Space";
     license = licenses.lpl-102;
-    maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
+    maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ];
     platforms = platforms.unix;
   };
-
+  
+  libX11_dev = libX11.dev;
   libXt_dev = libXt.dev;
+  libXext_dev = libXext.dev;
   fontconfig_dev = fontconfig.dev;
   freetype_dev = freetype.dev;
+  zlib_dev = zlib.dev;
+  
+  xproto_exp = xproto;
+  xextproto_exp = xextproto;
+  libX11_exp = libX11;
+  libXt_exp = libXt;
+  libXext_exp = libXext;
+  freetype_exp = freetype;
+  zlib_exp = zlib;
+
+  fontconfig_lib = fontconfig.lib;
 }
diff --git a/pkgs/tools/system/plan9port/fontsrv.patch b/pkgs/tools/system/plan9port/fontsrv.patch
deleted file mode 100644
index 49fd9c04231b..000000000000
--- a/pkgs/tools/system/plan9port/fontsrv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r dc0640f14d07 src/cmd/mkfile
---- a/src/cmd/mkfile	Tue Mar 25 23:23:10 2014 -0400
-+++ b/src/cmd/mkfile	Mon Apr 14 22:36:05 2014 +0530
-@@ -4,8 +4,8 @@
- 
- <$PLAN9/src/mkmany
- 
--BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
--DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
-+BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
-+DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'`
- 
- <$PLAN9/src/mkdirs
- 

From 95d307ab14876c3675e030d2c5307186bcbbebd3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 Oct 2018 10:36:07 +0800
Subject: [PATCH 2567/3253] xdiff: 4.0.1.2017062 -> 5.0b1 - version bump only

---
 pkgs/development/tools/misc/xxdiff/tip.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
index 844758c0f065..1424b8fe1974 100644
--- a/pkgs/development/tools/misc/xxdiff/tip.nix
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }:
 
 stdenv.mkDerivation rec {
-  name = "xxdiff-4.0.1.20170623";
+  name = "xxdiff-5.0b1";
 
   src = fetchFromBitbucket {
     owner = "blais";

From 1d8aa40898787100a6e06ed6dd26a6eaa6c4a470 Mon Sep 17 00:00:00 2001
From: Marica Odagaki <marica@noredink.com>
Date: Wed, 26 Sep 2018 20:08:20 -0800
Subject: [PATCH 2568/3253] aws-env: init at 0.4

---
 pkgs/tools/admin/aws-env/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/tools/admin/aws-env/deps.nix    | 12 ++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/admin/aws-env/default.nix
 create mode 100644 pkgs/tools/admin/aws-env/deps.nix

diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix
new file mode 100644
index 000000000000..19f149b02274
--- /dev/null
+++ b/pkgs/tools/admin/aws-env/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+
+buildGoPackage rec {
+  pname = "aws-env";
+  version = "0.4";
+  name = "${pname}-${version}";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/Droplr/aws-env";
+
+  src = fetchFromGitHub {
+    owner = "Droplr";
+    repo = pname;
+    inherit rev;
+    sha256 = "0pw1qz1nn0ig90p8d8c1qcwsdz0m9w63ib07carhh86gw55425j7";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Secure way to handle environment variables in Docker and envfile with AWS Parameter Store";
+    homepage = "https://github.com/Droplr/aws-env";
+    license = licenses.mit;
+    maintainers = with maintainers; [ srhb ];
+  };
+}
diff --git a/pkgs/tools/admin/aws-env/deps.nix b/pkgs/tools/admin/aws-env/deps.nix
new file mode 100644
index 000000000000..891a6ecb5962
--- /dev/null
+++ b/pkgs/tools/admin/aws-env/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "5f03c87445c9dcd6aa831a76a77170919265aa97";
+      sha256 = "146rwinw2x4r0f2pixv62b7mmhvnnfvvjmfaj6dqjxrhp0imcxdi";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae61bafd3601..ae46a38ad57e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -583,6 +583,8 @@ with pkgs;
 
   awslogs = callPackage ../tools/admin/awslogs { };
 
+  aws-env = callPackage ../tools/admin/aws-env { };
+
   aws-okta = callPackage ../tools/security/aws-okta { };
 
   aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };

From 38c510c879a964cd1a381705d7898d90449a06c9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 6 Oct 2018 14:42:54 -0500
Subject: [PATCH 2569/3253] netbsd: misc cleanups

---
 pkgs/os-specific/bsd/netbsd/default.nix | 322 ++++++++----------------
 1 file changed, 110 insertions(+), 212 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index f9a614d32336..c53b7e50b9f3 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -69,6 +69,9 @@ let
     OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
     RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp";
 
+    MKPIC = if stdenv.isDarwin then "no" else "yes";
+    MKRELRO = if stdenv.isDarwin then "no" else "yes";
+
     INSTALL_FILE = "install -U -c";
     INSTALL_DIR = "xinstall -U -d";
     INSTALL_LINK = "install -U -l h";
@@ -164,6 +167,100 @@ let
     };
   }) // (removeAttrs attrs ["makeFlags"]));
 
+  libutil = netBSDDerivation {
+    path = "lib/libutil";
+    version = "8.0";
+    sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i";
+    extraPaths = [
+      (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
+    ];
+  };
+
+  libc = netBSDDerivation {
+    path = "lib/libc";
+    version = "8.0";
+    sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3";
+    extraPaths = [
+      (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8")
+    ];
+  };
+
+  make = netBSDDerivation {
+    path = "usr.bin/make";
+    sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c";
+    version = "8.0";
+    postPatch = ''
+      # make needs this to pick up our sys make files
+      export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
+
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \
+        --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \
+        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
+        --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \
+        --replace /bin/rm rm
+    '' + lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
+        --replace '-Wl,--fatal-warnings' "" \
+        --replace '-Wl,--warn-shared-textrel' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
+        --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \
+        --replace '-Wl,--whole-archive' "" \
+        --replace '-Wl,--no-whole-archive' "" \
+        --replace '-Wl,--warn-shared-textrel' "" \
+        --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \
+        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
+    '';
+    postInstall = ''
+      make -C $NETBSDSRCDIR/share/mk FILESDIR=/share/mk install
+    '';
+    extraPaths = [
+      (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs")
+    ];
+  };
+
+  libcurses = netBSDDerivation {
+    path = "lib/libcurses";
+    version = "8.0";
+    sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs";
+    buildInputs = [ nbPackages.libterminfo ];
+    makeFlags = [ "INCSDIR=/include" ];
+    NIX_CFLAGS_COMPILE = [
+      "-D__scanflike(a,b)="
+      "-D__va_list=va_list"
+      "-D__warn_references(a,b)="
+    ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=";
+    propagatedBuildInputs = [ nbPackages.compat ];
+    MKDOC = "no"; # missing vfontedpr
+    postPatch = ''
+      substituteInPlace printw.c \
+        --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \
+        --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'
+      substituteInPlace scanw.c \
+        --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));'
+    '';
+  };
+
+  libedit = netBSDDerivation {
+    path = "lib/libedit";
+    buildInputs = [ nbPackages.libterminfo libcurses ];
+    propagatedBuildInputs = [ nbPackages.compat ];
+    makeFlags = [ "INCSDIR=/include" ];
+    postPatch = ''
+      sed -i '1i #undef bool_t' el.h
+      substituteInPlace config.h \
+        --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" ""
+    '';
+    NIX_CFLAGS_COMPILE = [
+      "-D__noinline="
+      "-D__scanflike(a,b)="
+      "-D__va_list=va_list"
+    ];
+    version = "8.0";
+    sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd";
+  };
+
   nbPackages = rec {
 
   ##
@@ -245,7 +342,12 @@ let
       install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h
       install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h
       install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h
-
+      install -D $NETBSDSRCDIR/include/nl_types.h $out/include/nl_types.h
+      install -D $NETBSDSRCDIR/include/stringlist.h $out/include/stringlist.h
+   '' + lib.optionalString stdenv.isDarwin ''
+      mkdir -p $out/include/ssp
+      touch $out/include/ssp/ssp.h
+   '' + ''
       mkdir -p $out/lib/pkgconfig
       substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \
         --subst-var-by out $out \
@@ -353,82 +455,17 @@ let
   ## END BOOTSTRAPPING
   ##
 
-  libutil = netBSDDerivation {
-    path = "lib/libutil";
-    version = "8.0";
-    sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i";
-    extraPaths = [
-      (fetchNetBSD "common/lib/libutil" "8.0" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
-    ];
-  };
-
-  libc = netBSDDerivation {
-    path = "lib/libc";
-    version = "8.0";
-    sha256 = "0lgbc58qgn8kwm3l011x1ml1kgcf7jsgq7hbf0hxhlbvxq5bljl3";
-    extraPaths = [
-      (fetchNetBSD "common/lib/libc" "8.0" "1kbhj0vxixvdy9fvsr5y70ri4mlkmim1v9m98sqjlzc1vdiqfqc8")
-    ];
-  };
-
-  make = netBSDDerivation {
-    path = "usr.bin/make";
-    sha256 = "103643qs3w5kiahir6cca2rkm5ink81qbg071qyzk63qvspfq10c";
-    version = "8.0";
-    postPatch = ''
-      # make needs this to pick up our sys make files
-      export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
-
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \
-        --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \
-        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
-        --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.kinc.mk \
-        --replace /bin/rm rm
-    '' + lib.optionalString stdenv.isDarwin ''
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
-        --replace '-Wl,--fatal-warnings' "" \
-        --replace '-Wl,--warn-shared-textrel' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
-        --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \
-        --replace '-Wl,--whole-archive' "" \
-        --replace '-Wl,--no-whole-archive' "" \
-        --replace '-Wl,--warn-shared-textrel' "" \
-        --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \
-        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
-    '';
-    postInstall = ''
-      (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install)
-    '';
-    extraPaths = [
-      (fetchNetBSD "share/mk" "8.0" "033q4w3rmvwznz6m7fn9xcf13chyhwwl8ijj3a9mrn80fkwm55qs")
-    ];
-  };
-
   mtree = netBSDDerivation {
     path = "usr.sbin/mtree";
     version = "8.0";
     sha256 = "0hanmzm8bgwz2bhsinmsgfmgy6nbdhprwmgwbyjm6bl17vgn7vid";
+    extraPaths = [ mknod.src ];
   };
 
-  who = netBSDDerivation {
-    path = "usr.bin/who";
+  mknod = netBSDDerivation {
+    path = "sbin/mknod";
     version = "8.0";
-    sha256 = "0ll76rbblps9hqmncxvw5qx0hhwfz678g70vgfyng8ahxz27rhd9";
-    postPatch = lib.optionalString stdenv.isLinux ''
-      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
-        --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \
-        --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec"
-   '' + lib.optionalString stdenv.isDarwin ''
-      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
-        --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec"
-   '' + ''
-      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
-        --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \
-        --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \
-        --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0"
-    '';
+    sha256 = "0vq66v0hj0r4z2r2z2d3l3c5vh48pvcdmddc8bhm8hzq2civ5df2";
   };
 
   getent = netBSDDerivation {
@@ -451,135 +488,17 @@ let
     makeFlags = [ "BINDIR=/share" ];
   };
 
-  games = netBSDDerivation {
-    path = "games";
-    sha256 = "1vb4ahmiywgd3q3lzwb34mdd7agdlhsmw077alddkqinvyyxq1jz";
-    version = "8.0";
-    makeFlags = [ "BINDIR=/bin"
-                  "SCRIPTSDIR=/bin" ];
-    postPatch = ''
-      sed -i '1i #include <time.h>' adventure/save.c
-
-      for f in $(find . -name pathnames.h); do
-        substituteInPlace $f \
-          --replace /usr/share/games $out/share/games \
-          --replace /usr/games $out/bin \
-          --replace /usr/libexec $out/libexec \
-          --replace /usr/bin/more ${less}/bin/less \
-          --replace /usr/share/dict ${dict}/share/dict
-      done
-      substituteInPlace boggle/boggle/bog.h \
-        --replace /usr/share/games $out/share/games
-      substituteInPlace ching/ching/ching.sh \
-        --replace /usr/share $out/share \
-        --replace /usr/libexec $out/libexec
-      substituteInPlace hunt/huntd/driver.c \
-        --replace "(void) setpgrp(getpid(), getpid());" ""
-
-      # Disable some games that don't build. They should be possible
-      # to build but need to look at how to implement stuff in
-      # Linux. macOS is missing gettime. TODO try to get these
-      # working.
-      disableGame() {
-        substituteInPlace Makefile --replace $1 ""
-      }
-
-      disableGame atc
-      disableGame dm
-      disableGame dab
-      disableGame sail
-      disableGame trek
-      ${lib.optionalString stdenv.isLinux "disableGame boggle"}
-      ${lib.optionalString stdenv.isLinux "disableGame hunt"}
-      ${lib.optionalString stdenv.isLinux "disableGame larn"}
-      ${lib.optionalString stdenv.isLinux "disableGame phantasia"}
-      ${lib.optionalString stdenv.isLinux "disableGame rogue"}
-      ${lib.optionalString stdenv.isDarwin "disableGame adventure"}
-      ${lib.optionalString stdenv.isDarwin "disableGame factor"}
-      ${lib.optionalString stdenv.isDarwin "disableGame gomoku"}
-      ${lib.optionalString stdenv.isDarwin "disableGame mille"}
-    '';
-
-    # HACK strfile needs to be installed first & in the path. The
-    # Makefile should do this for us but haven't gotten it to work
-    preBuild = ''
-      (cd fortune/strfile && make && make BINDIR=/bin install)
-      export PATH=$out/bin:$PATH
-    '';
-
-    postInstall = ''
-      substituteInPlace $out/usr/share/games/quiz.db/index \
-        --replace /usr $out
-    '';
-
-    NIX_CFLAGS_COMPILE = [
-      "-D__noinline="
-      "-D__scanflike(a,b)="
-      "-D__va_list=va_list"
-      "-DOXTABS=XTABS"
-      "-DRANDOM_MAX=RAND_MAX"
-      "-DINFTIM=-1"
-      (lib.optionalString stdenv.hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h")
-      "-DBE32TOH(x)=((void)0)"
-      "-DBE64TOH(x)=((void)0)"
-      "-D__c99inline=__inline"
-    ];
-
-    buildInputs = [ compat libcurses libterminfo libressl ];
-    extraPaths = [ dict.src who.src ];
-  };
-
-  finger = netBSDDerivation {
-    path = "usr.bin/finger";
-    sha256 = "1mbxjdzcbx7xsbn3x1qm1cd0kna07yh61wqxmrrphjhl5gv13ra3";
-    version = "8.0";
-    NIX_CFLAGS_COMPILE = [
-      (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP")
-      (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX")
-    ];
-    postPatch = ''
-      NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include"
-
-      substituteInPlace extern.h \
-        --replace psort _psort
-
-      ${who.postPatch}
-    '';
-    extraPaths = [ who.src ]
-              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "8.0" "05690fzz0825p2bq0sfyb01mxwd0wa06qryqgqkwpqk9y2xzc7px");
-  };
-
   fingerd = netBSDDerivation {
     path = "libexec/fingerd";
     sha256 = "0blcahhgyj1lm0mimrbvgmq3wkjvqk5wy85sdvbs99zxg7da1190";
     version = "8.0";
   };
 
-  libedit = netBSDDerivation {
-    path = "lib/libedit";
-    buildInputs = [ libterminfo libcurses ];
-    propagatedBuildInputs = [ compat ];
-    makeFlags = [ "INCSDIR=/include" ];
-    postPatch = ''
-      sed -i '1i #undef bool_t' el.h
-      substituteInPlace config.h \
-        --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" ""
-    '';
-    NIX_CFLAGS_COMPILE = [
-      "-D__noinline="
-      "-D__scanflike(a,b)="
-      "-D__va_list=va_list"
-    ];
-    version = "8.0";
-    sha256 = "0pmqh2mkfp70bwchiwyrkdyq9jcihx12g1awd6alqi9bpr3f9xmd";
-  };
-
   libterminfo = netBSDDerivation {
     path = "lib/libterminfo";
     version = "8.0";
     sha256 = "14gp0d6fh6zjnbac2yjhyq5m6rca7gm6q1s9gilhzpdgl9m7vb9r";
     buildInputs = [ compat tic nbperf ];
-    MKPIC = if stdenv.isDarwin then "no" else "yes";
     makeFlags = [ "INCSDIR=/include" ];
     postPatch = ''
       substituteInPlace term.c --replace /usr/share $out/share
@@ -587,36 +506,14 @@ let
 
     '';
     postInstall = ''
-      (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)
+      make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share
+      make -C $NETBSDSRCDIR/share/terminfo BINDIR=/share install
     '';
     extraPaths = [
       (fetchNetBSD "share/terminfo" "8.0" "18db0fk1dw691vk6lsm6dksm4cf08g8kdm0gc4052ysdagg2m6sm")
     ];
   };
 
-  libcurses = netBSDDerivation {
-    path = "lib/libcurses";
-    version = "8.0";
-    sha256 = "0azhzh1910v24dqx45zmh4z4dl63fgsykajrbikx5xfvvmkcq7xs";
-    buildInputs = [ libterminfo ];
-    makeFlags = [ "INCSDIR=/include" ];
-    NIX_CFLAGS_COMPILE = [
-      "-D__scanflike(a,b)="
-      "-D__va_list=va_list"
-      "-D__warn_references(a,b)="
-    ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=";
-    propagatedBuildInputs = [ compat ];
-    MKDOC = "no"; # missing vfontedpr
-    MKPIC = if stdenv.isDarwin then "no" else "yes";
-    postPatch = lib.optionalString (!stdenv.isDarwin) ''
-      substituteInPlace printw.c \
-        --replace "funopen2(win, NULL, winwrite, NULL, NULL, NULL)" NULL \
-        --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'
-      substituteInPlace scanw.c \
-        --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));'
-    '';
-  };
-
   nbperf = netBSDDerivation {
     path = "usr.bin/nbperf";
     version = "8.0";
@@ -648,6 +545,7 @@ let
     version = "8.0";
     sha256 = "0kk6v9k2bygq0wf9gbinliqzqpzs9bgxn0ndyl2wcv3hh2bmsr9p";
     patches = [ ./locale.patch ];
+    NIX_CFLAGS_COMPILE = "-DYESSTR=__YESSTR -DNOSTR=__NOSTR";
   };
 
   };

From d2866f5afadf89df93a99755fbf8a98a339e5602 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 Oct 2018 12:45:51 +0800
Subject: [PATCH 2570/3253] gcalcli: use python3 i/o python2 so we can drop our
 overrides

---
 pkgs/applications/misc/gcalcli/default.nix | 38 +++-------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 25ea9ef06b84..ac8d082513b2 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,38 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, python2
+{ stdenv, lib, fetchFromGitHub, python3
 , libnotify ? null }:
 
-let
-  py = python2.override {
-    packageOverrides = self: super: {
-      google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec {
-        version = "1.5.1";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig";
-        };
-      });
+with python3.pkgs;
 
-      oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec {
-        version = "1.4.12";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl";
-        };
-      });
-
-      uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec {
-        version = "0.6";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3";
-        };
-        # there are no checks in this version
-        doCheck = false;
-      });
-    };
-  };
-
-in with py.pkgs; buildPythonApplication rec {
+buildPythonApplication rec {
   version = "4.0.0a4";
   name = "gcalcli-${version}";
 
@@ -45,7 +16,6 @@ in with py.pkgs; buildPythonApplication rec {
 
   propagatedBuildInputs = [
     dateutil gflags httplib2 parsedatetime six vobject
-    # overridden
     google_api_python_client oauth2client uritemplate
   ] ++ lib.optional (!isPy3k) futures;
 
@@ -59,8 +29,8 @@ in with py.pkgs; buildPythonApplication rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://github.com/insanum/gcalcli;
     description = "CLI for Google Calendar";
+    homepage = https://github.com/insanum/gcalcli;
     license = licenses.mit;
     maintainers = with maintainers; [ nocoolnametom ];
     inherit version;

From bdaedbe38ce73f874004afdb49658caaaf014b35 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Sep 2018 15:28:36 +0000
Subject: [PATCH 2571/3253] ocamlPackages.ocaml_lwt: 3.3.0 -> 4.1.0

---
 pkgs/development/ocaml-modules/cohttp/lwt.nix |  4 +--
 .../development/ocaml-modules/conduit/lwt.nix |  4 +--
 .../lwt/{default.nix => 3.x.nix}              |  0
 pkgs/development/ocaml-modules/lwt/4.x.nix    | 35 +++++++++++++++++++
 .../ocaml-modules/lwt_log/default.nix         | 15 ++++++--
 .../ocaml-modules/lwt_ssl/default.nix         |  4 +++
 .../ocaml-modules/ojquery/default.nix         |  4 +--
 pkgs/top-level/ocaml-packages.nix             | 34 +++++++++++++-----
 8 files changed, 82 insertions(+), 18 deletions(-)
 rename pkgs/development/ocaml-modules/lwt/{default.nix => 3.x.nix} (100%)
 create mode 100644 pkgs/development/ocaml-modules/lwt/4.x.nix

diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
index 1630bfd131e4..741df5b06145 100644
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, dune, cohttp, lwt3, uri, ppx_sexp_conv }:
+{ stdenv, ocaml, findlib, dune, cohttp, ocaml_lwt, uri, ppx_sexp_conv }:
 
 if !stdenv.lib.versionAtLeast cohttp.version "0.99"
 then cohttp
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib dune uri ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ cohttp lwt3 ];
+	propagatedBuildInputs = [ cohttp ocaml_lwt ];
 
 	buildPhase = "dune build -p cohttp-lwt";
 }
diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix
index 5b085239cfd0..69d7132a83a4 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@@ -1,4 +1,4 @@
-{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, lwt3 }:
+{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, ocaml_lwt }:
 
 if !stdenv.lib.versionAtLeast conduit.version "1.0"
 then conduit
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ conduit lwt3 ];
+	propagatedBuildInputs = [ conduit ocaml_lwt ];
 
 	buildPhase = "dune build -p conduit-lwt";
 }
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/3.x.nix
similarity index 100%
rename from pkgs/development/ocaml-modules/lwt/default.nix
rename to pkgs/development/ocaml-modules/lwt/3.x.nix
diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/4.x.nix
new file mode 100644
index 000000000000..f43a65065b92
--- /dev/null
+++ b/pkgs/development/ocaml-modules/lwt/4.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchzip, pkgconfig, ncurses, libev, dune
+, ocaml, findlib, cppo
+, ocaml-migrate-parsetree, ppx_tools_versioned, result
+}:
+
+let inherit (stdenv.lib) optional versionAtLeast; in
+
+stdenv.mkDerivation rec {
+  version = "4.1.0";
+  name = "ocaml${ocaml.version}-lwt-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
+    sha256 = "16wnc61kfj54z4q8sn9f5iik37pswz328hcz3z6rkza3kh3s6wmm";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ocaml findlib dune cppo
+    ocaml-migrate-parsetree ppx_tools_versioned
+  ] ++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
+  propagatedBuildInputs = [ libev result ];
+
+  configurePhase = "ocaml src/util/configure.ml -use-libev true";
+  buildPhase = "jbuilder build -p lwt";
+  inherit (dune) installPhase;
+
+  meta = {
+    homepage = "https://ocsigen.org/lwt/";
+    description = "A cooperative threads library for OCaml";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (ocaml.meta) platforms;
+  };
+}
+
diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix
index 42ff2f26b7d3..a3d34b190b86 100644
--- a/pkgs/development/ocaml-modules/lwt_log/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_log/default.nix
@@ -1,10 +1,19 @@
-{ stdenv, ocaml, findlib, dune, lwt }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, lwt }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "lwt_log is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.1.0";
   name = "ocaml${ocaml.version}-lwt_log-${version}";
 
-  inherit (lwt) src;
+  src = fetchFromGitHub {
+    owner = "aantron";
+    repo = "lwt_log";
+    rev = version;
+    sha256 = "1c58gkqfvyf2j11jwj2nh4iq999wj9xpnmr80hz9d0nk9fv333pi";
+  };
 
   buildInputs = [ ocaml findlib dune ];
 
diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
index 8fbec7cd4dff..a06e72529864 100644
--- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchzip, ocaml, findlib, dune, ssl, lwt }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "lwt_ssl is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   version = "1.1.2";
   name = "ocaml${ocaml.version}-lwt_ssl-${version}";
diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix
index 8cf5819c9002..6b0eefe195f1 100644
--- a/pkgs/development/ocaml-modules/ojquery/default.nix
+++ b/pkgs/development/ocaml-modules/ojquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, react }:
+{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, ocaml_lwt, react }:
 
 if stdenv.lib.versionAtLeast ocaml.version "4.06"
 then throw "ojquery is not available for OCaml ${ocaml.version}"
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ];
-  propagatedBuildInputs = [ js_of_ocaml lwt3 react ];
+  propagatedBuildInputs = [ js_of_ocaml ocaml_lwt react ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index a6214abbc367..7de4bf3fad40 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -238,7 +238,16 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
-    eliom = callPackage ../development/ocaml-modules/eliom { };
+    eliom = callPackage ../development/ocaml-modules/eliom {
+      js_of_ocaml-lwt = js_of_ocaml-lwt.override {
+        ocaml_lwt = lwt3;
+        lwt_log = lib.overrideDerivation
+          (lwt_log.override { lwt = lwt3; })
+          (_: { inherit (lwt3) src; });
+      };
+      lwt_react = lwt_react.override { lwt = lwt3; };
+      lwt_ssl = lwt_ssl.override { lwt = lwt3; };
+    };
 
     elpi = callPackage ../development/ocaml-modules/elpi { };
 
@@ -401,25 +410,27 @@ let
     lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { };
 
     lwt3 = if lib.versionOlder "4.02" ocaml.version
-      then callPackage ../development/ocaml-modules/lwt { }
+      then callPackage ../development/ocaml-modules/lwt/3.x.nix { }
       else throw "lwt3 is not available for OCaml ${ocaml.version}";
 
-    ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2;
+    lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { };
+
+    ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2;
 
     lwt_log = callPackage ../development/ocaml-modules/lwt_log {
-      lwt = lwt3;
+      lwt = lwt4;
     };
 
     lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix {
-      lwt = lwt3;
+      lwt = ocaml_lwt;
     };
 
     lwt_react = callPackage ../development/ocaml-modules/lwt_react {
-      lwt = lwt3;
+      lwt = ocaml_lwt;
     };
 
     lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl {
-      lwt = lwt3;
+      lwt = ocaml_lwt;
     };
 
     macaque = callPackage ../development/ocaml-modules/macaque { };
@@ -535,7 +546,10 @@ let
 
     ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
 
-    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
+    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server {
+      lwt_react = lwt_react.override { lwt = lwt3; };
+      lwt_ssl = lwt_ssl.override { lwt = lwt3; };
+    };
 
     ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
 
@@ -545,7 +559,9 @@ let
 
     odoc = callPackage ../development/ocaml-modules/odoc { };
 
-    ojquery = callPackage ../development/ocaml-modules/ojquery { };
+    ojquery = callPackage ../development/ocaml-modules/ojquery {
+      ocaml_lwt = lwt3;
+    };
 
     omd = callPackage ../development/ocaml-modules/omd { };
 

From 0668906e8470bb1bfa03a47cbedec5050a16a905 Mon Sep 17 00:00:00 2001
From: Arian van Putten <aeroboy94@gmail.com>
Date: Fri, 5 Oct 2018 16:13:42 +0200
Subject: [PATCH 2572/3253] nixos/containers: Add regression test for #40355

---
 nixos/tests/containers-imperative.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 6f86819f4e88..782095a09dad 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -86,6 +86,9 @@ import ./make-test.nix ({ pkgs, ...} : {
       # Execute commands via the root shell.
       $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
 
+      # Execute a nix command via the root shell. (regression test for #40355)
+      $machine->succeed("nixos-container run $id1 -- nix-instantiate -E 'derivation { name = \"empty\"; builder = \"false\"; system = \"false\"; }'");
+
       # Stop and start (regression test for #4989)
       $machine->succeed("nixos-container stop $id1");
       $machine->succeed("nixos-container start $id1");

From b669a45868eaf31ad3fffe5389c5dec8827a564c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 8 Oct 2018 12:04:10 +0300
Subject: [PATCH 2573/3253] boehmgc: reinstate 7.6.6, use for asymptote

A quickfix after #45708
---
 pkgs/development/libraries/boehm-gc/7.6.6.nix | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/libraries/boehm-gc/7.6.6.nix

diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
new file mode 100644
index 000000000000..da71e40187f4
--- /dev/null
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -0,0 +1,74 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
+, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
+}:
+
+stdenv.mkDerivation rec {
+  name = "boehm-gc-${version}";
+  version = "7.6.6";
+
+  src = fetchurl {
+    urls = [
+      "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
+      "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
+    ];
+    sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
+  };
+
+  buildInputs = [ libatomic_ops ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  outputs = [ "out" "dev" "doc" ];
+  separateDebugInfo = stdenv.isLinux;
+
+  preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+    export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
+  '';
+
+  patches = [ (fetchpatch {
+    url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";
+    sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
+  }) ] ++
+    # https://github.com/ivmai/bdwgc/pull/208
+    lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
+
+  configureFlags =
+    [ "--enable-cplusplus" ]
+    ++ lib.optional enableLargeConfig "--enable-large-config"
+    ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
+
+  doCheck = true; # not cross;
+
+  # Don't run the native `strip' when cross-compiling.
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
+
+    longDescription = ''
+      The Boehm-Demers-Weiser conservative garbage collector can be used as a
+      garbage collecting replacement for C malloc or C++ new.  It allows you
+      to allocate memory basically as you normally would, without explicitly
+      deallocating memory that is no longer useful.  The collector
+      automatically recycles memory when it determines that it can no longer
+      be otherwise accessed.
+
+      The collector is also used by a number of programming language
+      implementations that either use C as intermediate code, want to
+      facilitate easier interoperation with C libraries, or just prefer the
+      simple collector interface.
+
+      Alternatively, the garbage collector may be used as a leak detector for
+      C or C++ programs, though that is not its primary goal.
+    '';
+
+    homepage = http://hboehm.info/gc/;
+
+    # non-copyleft, X11-style license
+    license = http://hboehm.info/gc/license.txt;
+
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf1f1caa27c5..780239f291c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -569,6 +569,7 @@ with pkgs;
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
     gsl = gsl_1;
+    boehmgc = boehmgc_766;
   };
 
   atomicparsley = callPackage ../tools/video/atomicparsley { };
@@ -9074,6 +9075,7 @@ with pkgs;
   bobcat = callPackage ../development/libraries/bobcat { };
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };
+  boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { };
 
   boolstuff = callPackage ../development/libraries/boolstuff { };
 

From 0932acc62227045ffafc770dc2e0b231a9f3dfe2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 8 Oct 2018 17:14:38 +0800
Subject: [PATCH 2574/3253] fbv: init at 1.0b

---
 pkgs/tools/graphics/fbv/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/graphics/fbv/default.nix

diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix
new file mode 100644
index 000000000000..c7fab1710672
--- /dev/null
+++ b/pkgs/tools/graphics/fbv/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, getopt, libjpeg, libpng12, libungif }:
+
+stdenv.mkDerivation rec {
+  name = "fbv-1.0b";
+
+  src = fetchurl {
+    url = "http://s-tech.elsat.net.pl/fbv/${name}.tar.gz";
+    sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv";
+  };
+
+  buildInputs = [ getopt libjpeg libpng12 libungif ];
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,man/man1}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "View pictures on a linux framebuffer device";
+    homepage = http://s-tech.elsat.net.pl/fbv/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e808b70fb41e..f88bd87392a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2588,6 +2588,8 @@ with pkgs;
 
   feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };
 
+  fbv = callPackage ../tools/graphics/fbv { };
+
   fim = callPackage ../tools/graphics/fim { };
 
   flac123 = callPackage ../applications/audio/flac123 { };

From ab6f4d365252fd5709601da86bb45359913067a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Oct 2018 11:26:30 +0200
Subject: [PATCH 2575/3253] systemd-wait: fix evaluation error

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 780239f291c8..0793eee3961a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14784,7 +14784,7 @@ with pkgs;
       '';
   }));
 
-  systemd-wait = callPackages ../os-specific/linux/systemd-wait { };
+  systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
 
   sysvinit = callPackage ../os-specific/linux/sysvinit { };
 

From d2ce22caf05a24fdac43a2cb172fa331bf3d268d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net>
Date: Mon, 8 Oct 2018 11:30:27 +0200
Subject: [PATCH 2576/3253] liquidsoap: 1.1.1 -> 1.3.4

---
 pkgs/tools/audio/liquidsoap/full.nix | 18 ------------------
 pkgs/top-level/all-packages.nix      |  3 +--
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 7d3b899048f7..7ef0793a4831 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -4,7 +4,6 @@
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
-, autoconf, automake, libtool
 }:
 
 let
@@ -34,22 +33,6 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--localstatedir=/var" ];
 
-  # liquidsoap only looks for lame and ffmpeg at runtime, so we need to link them in manually
-  NIX_LDFLAGS = [
-  #   # LAME
-  #   # "-lmp3lame"
-  #   # ffmpeg
-  #   "-lavcodec"
-  #   "-lavdevice"
-  #   "-lavfilter"
-  #   "-lavformat"
-    "-lavresample"
-  #   "-lavutil"
-  #   "-lpostproc"
-  #   "-lswresample"
-    "-lswscale"
-  ];
-
   buildInputs =
     [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig
       libao portaudio alsaLib libpulseaudio libjack2
@@ -58,7 +41,6 @@ stdenv.mkDerivation {
       faad2 flac ladspaH ffmpeg frei0r dssi
       ocamlPackages.xmlm ocamlPackages.ocaml_pcre
       ocamlPackages.camomile
-      # autoconf automake libtool
     ];
 
   hardeningDisable = [ "format" "fortify" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcf20c6e0cab..0309b001797e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3581,8 +3581,7 @@ with pkgs;
   lesspipe = callPackage ../tools/misc/lesspipe { };
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
-    ffmpeg = ffmpeg_2;
-    # ocamlPackages = ocaml-ng.ocamlPackages_4_03;
+    ffmpeg = ffmpeg-full;
   };
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };

From c2e6ca501e3eb2d9ee24367f4ba5dda81699649c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 8 Oct 2018 11:53:08 +0200
Subject: [PATCH 2577/3253] openssh: fix tunnel forwarding (upstream patch)

Close #48031, fixes #48016.  I didn't use the PR commit
because I think it's better to fetch the patch.
---
 pkgs/tools/networking/openssh/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 04a77176682d..96bc2c56ece8 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
 
   patches =
     [
+      # Remove on update!
+      (fetchpatch {
+        name = "fix-tunnel-forwarding.diff";
+        url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff";
+        sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8";
+      })
+
       ./locale_archive.patch
       ./fix-host-key-algorithms-plus.patch
 

From 9da2134cfa704b4862046b0d9e46f9fe791c3fa6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 8 Oct 2018 05:43:15 -0500
Subject: [PATCH 2578/3253] Fix local path to release notes in error message

The error message when produced when Nix is too old refers the user to a local
copy of the NixOS release notes, but the provided path is incorrect.
---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index f4b2640ac5a0..a74a01719c73 100644
--- a/default.nix
+++ b/default.nix
@@ -18,7 +18,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.
 
     For more information, please see the NixOS release notes at
     https://nixos.org/nixos/manual or locally at
-    ${toString ./doc/manual/release-notes}.
+    ${toString ./nixos/doc/manual/release-notes}.
 
     If you need further help, see https://nixos.org/nixos/support.html
   ''

From 3f719b0fad6044ccf8f22ebe22a582f56b447715 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 8 Oct 2018 12:53:07 +0200
Subject: [PATCH 2579/3253] Fix build for rPackages.units

(cherry picked from commit 1eb1fec3aee1f1d1084779acec001e13ee9cbd71)
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 0fbd2ae6fa70..c9766a985f6f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -367,6 +367,7 @@ let
     tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ];
     topicmodels = [ pkgs.gsl_1 ];
     udunits2 = [ pkgs.udunits pkgs.expat ];
+    units = [ pkgs.udunits ];
     V8 = [ pkgs.v8_3_14 ];
     VBLPCM = [ pkgs.gsl_1 ];
     WhopGenome = [ pkgs.zlib.dev ];

From 68a2fceed56d525fbb3bbe4859c44fa6906668d5 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 8 Oct 2018 11:52:55 +0200
Subject: [PATCH 2580/3253] nixos/murmur: mention mumble in description

This makes the option easier to find with the options search or in the
manpage.
---
 nixos/modules/services/networking/murmur.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index fcc813e6898f..a6e90feff7ea 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -50,7 +50,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "If enabled, start the Murmur Service.";
+        description = "If enabled, start the Murmur Mumble server.";
       };
 
       autobanAttempts = mkOption {

From 7d43e2a86144d1834019e4917aad60a35d1e68ca Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 8 Oct 2018 14:10:00 +0200
Subject: [PATCH 2581/3253] nixos/emby : use the dataDir option

---
 nixos/modules/services/misc/emby.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix
index 151edd0e761a..0ad4a3f7376f 100644
--- a/nixos/modules/services/misc/emby.nix
+++ b/nixos/modules/services/misc/emby.nix
@@ -55,7 +55,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = "true";
-        ExecStart = "${pkgs.emby}/bin/emby";
+        ExecStart = "${pkgs.emby}/bin/emby -programdata ${cfg.dataDir}";
         Restart = "on-failure";
       };
     };

From 751c64754fd289a6bef611979de671519d4745d0 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 8 Oct 2018 14:51:49 +0200
Subject: [PATCH 2582/3253] nixos/emby : delete programData hardcode in pkg

---
 pkgs/servers/emby/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 932d070577e6..12b0dde0c9b4 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         sqlite
       ]}" \
-      --add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
+      --add-flags "$out/opt/emby-server/EmbyServer.dll -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
   '';
 
   meta =  with stdenv.lib; {

From 908a75a3ae8b84f7de7f4cafb627abc7c652606f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Mon, 8 Oct 2018 14:54:32 +0200
Subject: [PATCH 2583/3253] gitaly: 0.117.2 -> 0.120.0

---
 pkgs/applications/version-management/gitaly/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index b7eee8926aa5..9523059b42f2 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.120.0";
+  version = "0.125.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0jsk6n1vmddpnnccr8mjvcsfjzaagqy1600q5yss6lbz896w2bx4";
+    sha256 = "14a4qgpnspzw9cjqh6gbw3771bxfm789ibvmvb8jc4pklvbyl4mi";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -27,7 +27,7 @@ in buildGoPackage rec {
 
   postInstall = ''
     mkdir -p $ruby
-    cp -rv $src/ruby/{bin,lib,vendor} $ruby
+    cp -rv $src/ruby/{bin,lib} $ruby
   '';
 
   outputs = [ "bin" "out" "ruby" ];

From 998d4e4e2c2c71034b9232453d33d8a2c9fdbdb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Mon, 8 Oct 2018 14:56:52 +0200
Subject: [PATCH 2584/3253] gitlab-workhorse: 6.1.0 -> 6.1.1, make build
 deterministic

---
 .../version-management/gitlab-workhorse/default.nix   |  6 +++---
 .../gitlab-workhorse/deterministic-build.patch        | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 1fe8c844ebf0..16acf2a91d70 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -2,18 +2,18 @@
 stdenv.mkDerivation rec {
   name = "gitlab-workhorse-${version}";
 
-  version = "6.1.0";
+  version = "6.1.1";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0h0mqalia4ldb2icr2h6x75pnr5jb5y23pi4kv4ri3w3ddnl74bq";
+    sha256 = "1dwvk86bfsqgkp0mwz71yis3i7aypjf96r3hsjkgpd27hwbjgxbr";
   };
 
   buildInputs = [ git go ];
 
-  patches = [ ./remove-hardcoded-paths.patch ];
+  patches = [ ./remove-hardcoded-paths.patch ./deterministic-build.patch ];
 
   makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" ];
 
diff --git a/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
new file mode 100644
index 000000000000..da6dc5493ac5
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch
@@ -0,0 +1,11 @@
+--- a/Makefile	2018-10-08 12:45:15.206269937 +0200
++++ b/Makefile	2018-10-08 12:45:24.435366307 +0200
+@@ -6,7 +6,7 @@
+ BIN_BUILD_DIR := $(TARGET_DIR)/bin
+ PKG_BUILD_DIR := $(TARGET_DIR)/src/$(PKG)
+ COVERAGE_DIR := $(TARGET_DIR)/cover
+-VERSION := $(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++VERSION := 6.1.1
+ GOBUILD := go build -ldflags "-X main.Version=$(VERSION)"
+ EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
+ INSTALL := install

From d837338d6b16146cc4d388f223c8bed878546061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Mon, 8 Oct 2018 15:01:29 +0200
Subject: [PATCH 2585/3253] gitlab: 11.2.3 -> 11.3.4

---
 .../applications/version-management/gitlab/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 98e2e739e0d7..c66260912612 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -11,29 +11,29 @@ let
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
-  version = "11.3.0";
+  version = "11.3.4";
 
   sources = if gitlabEnterprise then {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb";
-      sha256 = "1l5cfbc45xa3gq90wyly3szn93szh162g9szc6dnkqx0db70j9l3";
+      sha256 = "1cgwm6g1mij1958mdyds8f76qjw39nllsr23dvsqgf60h4vbsdfd";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ee";
       rev = "v${version}-ee";
-      sha256 = "0gmainjhs21hipbvshga5dzkjrpmlkk9vxxnxgwjaqbg9wrhw47m";
+      sha256 = "1ifaa879l85d4yfzrgszrgj04bfjxjh3n7v31zfb6lsqmh87xbm4";
     };
   } else {
     gitlabDeb = fetchurl {
       url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb";
-      sha256 = "162xy8xpa2qhz10nh2dw0vbd0665pz9984vnim9i30xcafr5picq";
+      sha256 = "0hls81ns9n10xrzw0b9pn1916445irqrysbicsdl8kdn83ds35p7";
     };
     gitlab = fetchFromGitLab {
       owner = "gitlab-org";
       repo = "gitlab-ce";
       rev = "v${version}";
-      sha256 = "158n2qnp1zsj5kk2w3v9xyakgdb739n955hlq3i9sl80q8f4xda3";
+      sha256 = "0dymr706yn917niybg2gj1pkgrzgiirbv4ib9pkgs140kbf3hn0c";
     };
   };
 

From 0083ca12664a4fbda9a8716267c5173676a8194a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Th=C3=B8mt=20Ravneberg?= <ktra@dbc.dk>
Date: Mon, 8 Oct 2018 15:02:14 +0200
Subject: [PATCH 2586/3253] gitlab-ee: Add ee rubyEnv, fixes regression
 introduced by 11.3.0 in #45574

---
 .../version-management/gitlab/default.nix     |    2 +-
 .../gitlab/{ => rubyEnv-ce}/Gemfile           |    0
 .../gitlab/{ => rubyEnv-ce}/Gemfile.lock      |    0
 .../gitlab/{ => rubyEnv-ce}/gemset.nix        |    0
 .../gitlab/rubyEnv-ee/Gemfile                 |  461 +++
 .../gitlab/rubyEnv-ee/Gemfile.lock            | 1239 ++++++
 .../gitlab/rubyEnv-ee/gemset.nix              | 3681 +++++++++++++++++
 7 files changed, 5382 insertions(+), 1 deletion(-)
 rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/Gemfile (100%)
 rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/Gemfile.lock (100%)
 rename pkgs/applications/version-management/gitlab/{ => rubyEnv-ce}/gemset.nix (100%)
 create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
 create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
 create mode 100644 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index c66260912612..c1a4392ec0ef 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -7,7 +7,7 @@ let
   rubyEnv = bundlerEnv {
     name = "gitlab-env-${version}";
     inherit ruby;
-    gemdir = ./.;
+    gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}";
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
similarity index 100%
rename from pkgs/applications/version-management/gitlab/Gemfile
rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
similarity index 100%
rename from pkgs/applications/version-management/gitlab/Gemfile.lock
rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gemset.nix
rename to pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
new file mode 100644
index 000000000000..86502db9d26e
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
@@ -0,0 +1,461 @@
+# --- Special code for migrating to Rails 5.0 ---
+def rails5?
+  %w[1 true].include?(ENV["RAILS5"])
+end
+
+gem_versions = {}
+gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0'      : '0.2'
+gem_versions['default_value_for']               = rails5? ? '~> 3.0.5' : '~> 3.0.0'
+gem_versions['rails']                           = rails5? ? '5.0.7'    : '4.2.10'
+gem_versions['rails-i18n']                      = rails5? ? '~> 5.1'   : '~> 4.0.9'
+# --- The end of special code for migrating to Rails 5.0 ---
+
+source 'https://rubygems.org'
+
+gem 'rails', gem_versions['rails']
+gem 'rails-deprecated_sanitizer', '~> 1.0.3'
+
+# Responders respond_to and respond_with
+gem 'responders', '~> 2.0'
+
+gem 'sprockets', '~> 3.7.0'
+
+# Default values for AR models
+gem 'default_value_for', gem_versions['default_value_for']
+
+# Supported DBs
+gem 'mysql2', '~> 0.4.10', group: :mysql
+gem 'pg', '~> 0.18.2', group: :postgres
+
+gem 'rugged', '~> 0.27'
+gem 'grape-path-helpers', '~> 1.0'
+
+gem 'faraday', '~> 0.12'
+
+# Authentication libraries
+gem 'devise', '~> 4.4'
+gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper-openid_connect', '~> 1.5'
+gem 'omniauth', '~> 1.8'
+gem 'omniauth-auth0', '~> 2.0.0'
+gem 'omniauth-azure-oauth2', '~> 0.0.9'
+gem 'omniauth-cas3', '~> 1.1.4'
+gem 'omniauth-facebook', '~> 4.0.0'
+gem 'omniauth-github', '~> 1.3'
+gem 'omniauth-gitlab', '~> 1.0.2'
+gem 'omniauth-google-oauth2', '~> 0.5.3'
+gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
+gem 'omniauth-oauth2-generic', '~> 0.2.2'
+gem 'omniauth-saml', '~> 1.10'
+gem 'omniauth-shibboleth', '~> 1.3.0'
+gem 'omniauth-twitter', '~> 1.4'
+gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth-authentiq', '~> 0.3.3'
+gem 'rack-oauth2', '~> 1.2.1'
+gem 'jwt', '~> 1.5.6'
+
+# Kerberos authentication. EE-only
+gem 'gssapi', group: :kerberos
+
+# Spam and anti-bot protection
+gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
+gem 'akismet', '~> 2.0'
+
+# Two-factor authentication
+gem 'devise-two-factor', '~> 3.0.0'
+gem 'rqrcode-rails3', '~> 0.1.7'
+gem 'attr_encrypted', '~> 3.1.0'
+gem 'u2f', '~> 0.2.1'
+
+# GitLab Pages
+gem 'validates_hostname', '~> 1.0.6'
+
+# Browser detection
+gem 'browser', '~> 2.5'
+
+# GPG
+gem 'gpgme'
+
+# LDAP Auth
+# GitLab fork with several improvements to original library. For full list of changes
+# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
+gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
+gem 'net-ldap'
+
+# Git Wiki
+# Required manually in config/initializers/gollum.rb to control load order
+gem 'gitlab-gollum-lib', '~> 4.2', require: false
+
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
+
+# Language detection
+gem 'github-linguist', '~> 5.3.3', require: 'linguist'
+
+# API
+gem 'grape', '~> 1.0'
+gem 'grape-entity', '~> 0.7.1'
+gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+
+# GraphQL API
+gem 'graphql', '~> 1.8.0'
+gem 'graphiql-rails', '~> 1.4.10'
+
+# Disable strong_params so that Mash does not respond to :permitted?
+gem 'hashie-forbidden_attributes'
+
+# Pagination
+gem 'kaminari', '~> 1.0'
+
+# HAML
+gem 'hamlit', '~> 2.8.8'
+
+# Files attachments
+# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged.
+# config/initializers/carrierwave_patch.rb can be removed once that change is released.
+gem 'carrierwave', '= 1.2.3'
+gem 'mini_magick'
+
+# Drag and Drop UI
+gem 'dropzonejs-rails', '~> 0.7.1'
+
+# for backups
+gem 'fog-aws', '~> 2.0.1'
+gem 'fog-core', '~> 1.44'
+gem 'fog-google', '~> 1.7.1'
+gem 'fog-local', '~> 0.3'
+gem 'fog-openstack', '~> 0.1'
+gem 'fog-rackspace', '~> 0.1.1'
+gem 'fog-aliyun', '~> 0.2.0'
+
+# for Google storage
+gem 'google-api-client', '~> 0.23'
+
+# for aws storage
+gem 'unf', '~> 0.1.4'
+
+# Seed data
+gem 'seed-fu', '~> 2.3.7'
+
+# Search
+gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-rails', '~> 0.1.9'
+gem 'elasticsearch-api',   '5.0.3'
+gem 'aws-sdk'
+gem 'faraday_middleware-aws-signers-v4'
+
+# Markdown and HTML processing
+gem 'html-pipeline', '~> 2.8'
+gem 'deckar01-task_list', '2.0.0'
+gem 'gitlab-markup', '~> 1.6.4'
+gem 'redcarpet', '~> 3.4'
+gem 'commonmarker', '~> 0.17'
+gem 'RedCloth', '~> 4.3.2'
+gem 'rdoc', '~> 6.0'
+gem 'org-ruby', '~> 0.9.12'
+gem 'creole', '~> 0.5.0'
+gem 'wikicloth', '0.8.1'
+gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor-plantuml', '0.0.8'
+gem 'rouge', '~> 3.1'
+gem 'truncato', '~> 0.7.9'
+gem 'bootstrap_form', '~> 2.7.0'
+gem 'nokogiri', '~> 1.8.2'
+
+# Calendar rendering
+gem 'icalendar'
+
+# Diffs
+gem 'diffy', '~> 3.1.0'
+
+# Application server
+group :unicorn do
+  gem 'unicorn', '~> 5.1.0'
+  gem 'unicorn-worker-killer', '~> 0.4.4'
+end
+
+# State machine
+gem 'state_machines-activerecord', '~> 0.5.1'
+
+# Issue tags
+gem 'acts-as-taggable-on', '~> 5.0'
+
+# Background jobs
+gem 'sidekiq', '~> 5.1'
+gem 'sidekiq-cron', '~> 0.6.0'
+gem 'redis-namespace', '~> 1.6.0'
+gem 'sidekiq-limit_fetch', '~> 3.4', require: false
+
+# Cron Parser
+gem 'rufus-scheduler', '~> 3.4'
+
+# HTTP requests
+gem 'httparty', '~> 0.13.3'
+
+# Colored output to console
+gem 'rainbow', '~> 3.0'
+
+# Progress bar
+gem 'ruby-progressbar'
+
+# GitLab settings
+gem 'settingslogic', '~> 2.0.9'
+
+# Linear-time regex library for untrusted regular expressions
+gem 're2', '~> 1.1.1'
+
+# Misc
+
+gem 'version_sorter', '~> 2.1.0'
+
+# Export Ruby Regex to Javascript
+gem 'js_regex', '~> 2.2.1'
+
+# User agent parsing
+gem 'device_detector'
+
+# Cache
+gem 'redis-rails', '~> 5.0.2'
+
+# Redis
+gem 'redis', '~> 3.2'
+gem 'connection_pool', '~> 2.0'
+
+# HipChat integration
+gem 'hipchat', '~> 1.5.0'
+
+# JIRA integration
+gem 'jira-ruby', '~> 1.4'
+
+# Flowdock integration
+gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
+
+# Slack integration
+gem 'slack-notifier', '~> 1.5.1'
+
+# Hangouts Chat integration
+gem 'hangouts-chat', '~> 0.0.5'
+
+# Asana integration
+gem 'asana', '~> 0.6.0'
+
+# FogBugz integration
+gem 'ruby-fogbugz', '~> 0.2.1'
+
+# Kubernetes integration
+gem 'kubeclient', '~> 3.1.0'
+
+# Sanitize user input
+gem 'sanitize', '~> 4.6'
+gem 'babosa', '~> 1.0.2'
+
+# Sanitizes SVG input
+gem 'loofah', '~> 2.2'
+
+# Working with license
+gem 'licensee', '~> 8.9'
+
+# Protect against bruteforcing
+gem 'rack-attack', '~> 4.4.1'
+
+# Ace editor
+gem 'ace-rails-ap', '~> 4.1.0'
+
+# Keyboard shortcuts
+gem 'mousetrap-rails', '~> 1.4.6'
+
+# Detect and convert string character encoding
+gem 'charlock_holmes', '~> 0.7.5'
+
+# Faster blank
+gem 'fast_blank'
+
+# Parse time & duration
+gem 'chronic', '~> 0.10.2'
+gem 'chronic_duration', '~> 0.10.6'
+
+gem 'webpack-rails', '~> 0.9.10'
+gem 'rack-proxy', '~> 0.6.0'
+
+gem 'sass-rails', '~> 5.0.6'
+gem 'uglifier', '~> 2.7.2'
+
+gem 'addressable', '~> 2.5.2'
+gem 'font-awesome-rails', '~> 4.7'
+gem 'gemojione', '~> 3.3'
+gem 'gon', '~> 6.2'
+gem 'jquery-atwho-rails', '~> 1.3.2'
+gem 'request_store', '~> 1.3'
+gem 'select2-rails', '~> 3.5.9'
+gem 'virtus', '~> 1.0.1'
+gem 'base32', '~> 0.3.0'
+
+gem "gitlab-license", "~> 1.0"
+
+# Sentry integration
+gem 'sentry-raven', '~> 2.7'
+
+gem 'premailer-rails', '~> 1.9.7'
+
+# I18n
+gem 'ruby_parser', '~> 3.8', require: false
+gem 'rails-i18n', gem_versions['rails-i18n']
+gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails_js', '~> 1.3'
+gem 'gettext', '~> 3.2.2', require: false, group: :development
+
+gem 'batch-loader', '~> 1.2.1'
+
+# Perf bar
+gem 'peek', '~> 1.0.1'
+gem 'peek-gc', '~> 0.0.2'
+gem 'peek-mysql2', '~> 1.1.0', group: :mysql
+gem 'peek-pg', '~> 1.3.0', group: :postgres
+gem 'peek-rblineprof', '~> 0.2.0'
+gem 'peek-redis', '~> 1.2.0'
+gem 'peek-sidekiq', '~> 1.0.3'
+
+# Metrics
+group :metrics do
+  gem 'method_source', '~> 0.8', require: false
+  gem 'influxdb', '~> 0.2', require: false
+
+  # Prometheus
+  gem 'prometheus-client-mmap', '~> 0.9.4'
+  gem 'raindrops', '~> 0.18'
+end
+
+group :development do
+  gem 'foreman', '~> 0.84.0'
+  gem 'brakeman', '~> 4.2', require: false
+
+  gem 'letter_opener_web', '~> 1.3.0'
+  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
+
+  # Better errors handler
+  gem 'better_errors', '~> 2.1.0'
+  gem 'binding_of_caller', '~> 0.7.2'
+
+  # thin instead webrick
+  gem 'thin', '~> 1.7.0'
+end
+
+group :development, :test do
+  gem 'bootsnap', '~> 1.3'
+  gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
+  gem 'pry-byebug', '~> 3.4.1', platform: :mri
+  gem 'pry-rails', '~> 0.3.4'
+
+  gem 'awesome_print', require: false
+  gem 'fuubar', '~> 2.2.0'
+
+  gem 'database_cleaner', '~> 1.5.0'
+  gem 'factory_bot_rails', '~> 4.8.2'
+  gem 'rspec-rails', '~> 3.7.0'
+  gem 'rspec-retry', '~> 0.4.5'
+  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec-set', '~> 0.1.3'
+  gem 'rspec-parameterized', require: false
+
+  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
+  gem 'minitest', '~> 5.7.0'
+
+  # Generate Fake data
+  gem 'ffaker', '~> 2.4'
+
+  gem 'capybara', '~> 2.15'
+  gem 'capybara-screenshot', '~> 1.0.0'
+  gem 'selenium-webdriver', '~> 3.12'
+
+  gem 'spring', '~> 2.0.0'
+  gem 'spring-commands-rspec', '~> 1.0.4'
+
+  gem 'gitlab-styles', '~> 2.4', require: false
+  # Pin these dependencies, otherwise a new rule could break the CI pipelines
+  gem 'rubocop', '~> 0.54.0'
+  gem 'rubocop-rspec', '~> 1.22.1'
+
+  gem 'scss_lint', '~> 0.56.0', require: false
+  gem 'haml_lint', '~> 0.26.0', require: false
+  gem 'simplecov', '~> 0.14.0', require: false
+  gem 'bundler-audit', '~> 0.5.0', require: false
+
+  gem 'benchmark-ips', '~> 2.3.0', require: false
+
+  gem 'license_finder', '~> 5.4', require: false
+  gem 'knapsack', '~> 1.16'
+
+  gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
+
+  gem 'stackprof', '~> 0.2.10', require: false
+
+  gem 'simple_po_parser', '~> 1.1.2', require: false
+
+  gem 'timecop', '~> 0.8.0'
+end
+
+group :test do
+  gem 'shoulda-matchers', '~> 3.1.2', require: false
+  gem 'email_spec', '~> 2.2.0'
+  gem 'json-schema', '~> 2.8.0'
+  gem 'webmock', '~> 2.3.2'
+  gem 'rails-controller-testing' if rails5? # Rails5 only gem.
+  gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
+  gem 'sham_rack', '~> 1.3.6'
+  gem 'concurrent-ruby', '~> 1.0.5'
+  gem 'test-prof', '~> 0.2.5'
+  gem 'rspec_junit_formatter'
+end
+
+gem 'octokit', '~> 4.9'
+
+gem 'mail_room', '~> 0.9.1'
+
+gem 'email_reply_trimmer', '~> 0.1'
+gem 'html2text'
+
+gem 'ruby-prof', '~> 0.17.0'
+gem 'rbtrace', '~> 0.4', require: false
+
+# OAuth
+gem 'oauth2', '~> 1.4'
+
+# Health check
+gem 'health_check', '~> 2.6.0'
+
+# System information
+gem 'vmstat', '~> 2.3.0'
+gem 'sys-filesystem', '~> 1.1.6'
+
+# NTP client
+gem 'net-ntp'
+
+# SSH host key support
+gem 'net-ssh', '~> 5.0'
+gem 'sshkey', '~> 1.9.0'
+
+# Required for ED25519 SSH host key support
+group :ed25519 do
+  gem 'ed25519', '~> 1.2'
+  gem 'bcrypt_pbkdf', '~> 1.0'
+end
+
+# Gitaly GRPC client
+gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly'
+gem 'grpc', '~> 1.11.0'
+
+# Locked until https://github.com/google/protobuf/issues/4210 is closed
+gem 'google-protobuf', '= 3.5.1'
+
+gem 'toml-rb', '~> 1.0.0', require: false
+
+# Feature toggles
+gem 'flipper', '~> 0.13.0'
+gem 'flipper-active_record', '~> 0.13.0'
+gem 'flipper-active_support_cache_store', '~> 0.13.0'
+
+# Structured logging
+gem 'lograge', '~> 0.5'
+gem 'grape_logging', '~> 1.7'
+
+# Asset synchronization
+gem 'asset_sync', '~> 2.4'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
new file mode 100644
index 000000000000..d7c4f80efd15
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
@@ -0,0 +1,1239 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.3.2)
+    abstract_type (0.0.7)
+    ace-rails-ap (4.1.2)
+    actionmailer (4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.10)
+      activesupport (= 4.2.10)
+      globalid (>= 0.3.0)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
+      builder (~> 3.1)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
+      arel (~> 6.0)
+    activerecord_sane_schema_dumper (0.2)
+      rails (>= 4, < 5)
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts-as-taggable-on (5.0.0)
+      activerecord (>= 4.2.8)
+    adamantium (0.2.0)
+      ice_nine (~> 0.11.0)
+      memoizable (~> 0.4.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    aes_key_wrap (1.0.1)
+    akismet (2.0.0)
+    arel (6.0.4)
+    asana (0.6.0)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (~> 1.0)
+    asciidoctor (1.5.6.2)
+    asciidoctor-plantuml (0.0.8)
+      asciidoctor (~> 1.5)
+    asset_sync (2.4.0)
+      activemodel (>= 4.1.0)
+      fog-core
+      mime-types (>= 2.99)
+      unf
+    ast (2.4.0)
+    atomic (1.1.99)
+    attr_encrypted (3.1.0)
+      encryptor (~> 3.0.0)
+    attr_required (1.0.0)
+    awesome_print (1.8.0)
+    aws-sdk (2.9.32)
+      aws-sdk-resources (= 2.9.32)
+    aws-sdk-core (2.9.32)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.9.32)
+      aws-sdk-core (= 2.9.32)
+    aws-sigv4 (1.0.0)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    babosa (1.0.2)
+    base32 (0.3.2)
+    batch-loader (1.2.1)
+    bcrypt (3.1.12)
+    bcrypt_pbkdf (1.0.0)
+    benchmark-ips (2.3.0)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    bindata (2.4.3)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    bootsnap (1.3.1)
+      msgpack (~> 1.0)
+    bootstrap_form (2.7.0)
+    brakeman (4.2.1)
+    browser (2.5.3)
+    builder (3.2.3)
+    bullet (5.5.1)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.10.0)
+    bundler-audit (0.5.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
+    byebug (9.0.6)
+    capybara (2.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    capybara-screenshot (1.0.14)
+      capybara (>= 1.0, < 3)
+      launchy
+    carrierwave (1.2.3)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    cause (0.1)
+    charlock_holmes (0.7.6)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chronic (0.10.2)
+    chronic_duration (0.10.6)
+      numerizer (~> 0.1.1)
+    chunky_png (1.3.5)
+    citrus (3.0.2)
+    coderay (1.1.2)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
+    concord (0.1.5)
+      adamantium (~> 0.2.0)
+      equalizer (~> 0.0.9)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby-ext (1.0.5)
+      concurrent-ruby (= 1.0.5)
+    connection_pool (2.2.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    crass (1.0.4)
+    creole (0.5.0)
+    css_parser (1.5.0)
+      addressable
+    daemons (1.2.3)
+    database_cleaner (1.5.3)
+    debug_inspector (0.0.2)
+    debugger-ruby_core_source (1.3.8)
+    deckar01-task_list (2.0.0)
+      html-pipeline
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    default_value_for (3.0.2)
+      activerecord (>= 3.2.0, < 5.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    device_detector (1.0.0)
+    devise (4.4.3)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 6.0)
+      responders
+      warden (~> 1.2.3)
+    devise-two-factor (3.0.0)
+      activesupport
+      attr_encrypted (>= 1.3, < 4, != 2)
+      devise (~> 4.0)
+      railties
+      rotp (~> 2.0)
+    diff-lcs (1.3)
+    diffy (3.1.0)
+    docile (1.1.5)
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    doorkeeper (4.3.2)
+      railties (>= 4.2)
+    doorkeeper-openid_connect (1.5.0)
+      doorkeeper (~> 4.3)
+      json-jwt (~> 1.6)
+    dropzonejs-rails (0.7.2)
+      rails (> 3.1)
+    ed25519 (1.2.4)
+    elasticsearch (5.0.3)
+      elasticsearch-api (= 5.0.3)
+      elasticsearch-transport (= 5.0.3)
+    elasticsearch-api (5.0.3)
+      multi_json
+    elasticsearch-model (0.1.9)
+      activesupport (> 3)
+      elasticsearch (> 0.4)
+      hashie
+    elasticsearch-rails (0.1.9)
+    elasticsearch-transport (5.0.3)
+      faraday
+      multi_json
+    email_reply_trimmer (0.1.6)
+    email_spec (2.2.0)
+      htmlentities (~> 4.3.3)
+      launchy (~> 2.1)
+      mail (~> 2.7)
+    encryptor (3.0.0)
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    escape_utils (1.1.1)
+    et-orbi (1.0.3)
+      tzinfo
+    eventmachine (1.0.8)
+    excon (0.62.0)
+    execjs (2.6.0)
+    expression_parser (0.9.0)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
+      railties (>= 3.0.0)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    faraday_middleware-aws-signers-v4 (0.1.7)
+      aws-sdk-resources (~> 2)
+      faraday (~> 0.9)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
+    fast_blank (1.0.0)
+    fast_gettext (1.6.0)
+    ffaker (2.4.0)
+    ffi (1.9.25)
+    flipper (0.13.0)
+    flipper-active_record (0.13.0)
+      activerecord (>= 3.2, < 6)
+      flipper (~> 0.13.0)
+    flipper-active_support_cache_store (0.13.0)
+      activesupport (>= 3.2, < 6)
+      flipper (~> 0.13.0)
+    flowdock (0.7.1)
+      httparty (~> 0.7)
+      multi_json
+    fog-aliyun (0.2.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
+      builder
+      excon (~> 0.58)
+      formatador (~> 0.2)
+    fog-google (1.7.1)
+      fog-core
+      fog-json
+      fog-xml
+      google-api-client (~> 0.23.0)
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.3.1)
+      fog-core (~> 1.27)
+    fog-openstack (0.1.21)
+      fog-core (>= 1.40)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-rackspace (0.1.1)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-rails (4.7.0.1)
+      railties (>= 3.2, < 5.1)
+    foreman (0.84.0)
+      thor (~> 0.19.1)
+    formatador (0.2.5)
+    fuubar (2.2.0)
+      rspec-core (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    gemojione (3.3.0)
+      json
+    get_process_mem (0.2.0)
+    gettext (3.2.9)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext_i18n_rails (1.8.0)
+      fast_gettext (>= 0.9.0)
+    gettext_i18n_rails_js (1.3.0)
+      gettext (>= 3.0.2)
+      gettext_i18n_rails (>= 0.7.1)
+      po_to_json (>= 1.0.0)
+      rails (>= 3.2.0)
+    gitaly-proto (0.117.0)
+      google-protobuf (~> 3.1)
+      grpc (~> 1.10)
+    github-linguist (5.3.3)
+      charlock_holmes (~> 0.7.5)
+      escape_utils (~> 1.1.0)
+      mime-types (>= 1.19)
+      rugged (>= 0.25.1)
+    github-markup (1.7.0)
+    gitlab-flowdock-git-hook (1.0.1)
+      flowdock (~> 0.7)
+      gitlab-grit (>= 2.4.1)
+      multi_json
+    gitlab-gollum-lib (4.2.7.5)
+      gemojione (~> 3.2)
+      github-markup (~> 1.6)
+      gollum-grit_adapter (~> 1.0)
+      nokogiri (>= 1.6.1, < 2.0)
+      rouge (~> 3.1)
+      sanitize (~> 4.6.4)
+      stringex (~> 2.6)
+    gitlab-gollum-rugged_adapter (0.4.4.1)
+      mime-types (>= 1.15)
+      rugged (~> 0.25)
+    gitlab-grit (2.8.2)
+      charlock_holmes (~> 0.6)
+      diff-lcs (~> 1.1)
+      mime-types (>= 1.16)
+      posix-spawn (~> 0.3)
+    gitlab-license (1.0.0)
+    gitlab-markup (1.6.4)
+    gitlab-styles (2.4.1)
+      rubocop (~> 0.54.0)
+      rubocop-gitlab-security (~> 0.1.0)
+      rubocop-rspec (~> 1.19)
+    gitlab_omniauth-ldap (2.0.4)
+      net-ldap (~> 0.16)
+      omniauth (~> 1.3)
+      pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
+      rubyntlm (~> 0.5)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    gollum-grit_adapter (1.0.1)
+      gitlab-grit (~> 2.7, >= 2.7.1)
+    gon (6.2.0)
+      actionpack (>= 3.0)
+      multi_json
+      request_store (>= 1.0)
+    google-api-client (0.23.4)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    google-protobuf (3.5.1)
+    googleapis-common-protos-types (1.0.1)
+      google-protobuf (~> 3.0)
+    googleauth (0.6.2)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    gpgme (2.0.13)
+      mini_portile2 (~> 2.1)
+    grape (1.0.3)
+      activesupport
+      builder
+      mustermann-grape (~> 1.0.0)
+      rack (>= 1.3.0)
+      rack-accept
+      virtus (>= 1.0.0)
+    grape-entity (0.7.1)
+      activesupport (>= 4.0)
+      multi_json (>= 1.3.2)
+    grape-path-helpers (1.0.6)
+      activesupport (>= 4, < 5.1)
+      grape (~> 1.0)
+      rake (~> 12)
+    grape_logging (1.7.0)
+      grape
+    graphiql-rails (1.4.10)
+      railties
+      sprockets-rails
+    graphql (1.8.1)
+    grpc (1.11.0)
+      google-protobuf (~> 3.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
+    gssapi (1.2.0)
+      ffi (>= 1.0.1)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    haml_lint (0.26.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
+      rake (>= 10, < 13)
+      rubocop (>= 0.49.0)
+      sysexits (~> 1.1)
+    hamlit (2.8.8)
+      temple (>= 0.8.0)
+      thor
+      tilt
+    hangouts-chat (0.0.5)
+    hashdiff (0.3.4)
+    hashie (3.5.7)
+    hashie-forbidden_attributes (0.1.1)
+      hashie (>= 3.0)
+    health_check (2.6.0)
+      rails (>= 4.0)
+    hipchat (1.5.2)
+      httparty
+      mimemagic
+    html-pipeline (2.8.4)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    html2text (0.2.0)
+      nokogiri (~> 1.6)
+    htmlentities (4.3.4)
+    http (2.2.2)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (1.0.3)
+    http_parser.rb (0.6.0)
+    httparty (0.13.7)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    icalendar (2.4.1)
+    ice_nine (0.11.2)
+    influxdb (0.2.3)
+      cause
+      json
+    ipaddress (0.8.3)
+    jira-ruby (1.4.1)
+      activesupport
+      multipart-post
+      oauth (~> 0.5, >= 0.5.0)
+    jmespath (1.3.1)
+    jquery-atwho-rails (1.3.2)
+    js_regex (2.2.1)
+      regexp_parser (>= 0.4.11, <= 0.5.0)
+    json (1.8.6)
+    json-jwt (1.9.4)
+      activesupport
+      aes_key_wrap
+      bindata
+    json-schema (2.8.0)
+      addressable (>= 2.4)
+    jwt (1.5.6)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
+    kgio (2.10.0)
+    knapsack (1.16.0)
+      rake
+    kubeclient (3.1.0)
+      http (~> 2.2.2)
+      recursive-open-struct (~> 1.0, >= 1.0.4)
+      rest-client (~> 2.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    letter_opener (1.4.1)
+      launchy (~> 2.2)
+    letter_opener_web (1.3.0)
+      actionmailer (>= 3.2)
+      letter_opener (~> 1.0)
+      railties (>= 3.2)
+    license_finder (5.4.0)
+      bundler
+      rubyzip
+      thor
+      toml (= 0.2.0)
+      with_env (= 1.1.0)
+      xml-simple
+    licensee (8.9.2)
+      rugged (~> 0.24)
+    little-plugger (1.1.4)
+    locale (2.1.2)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    lograge (0.10.0)
+      actionpack (>= 4)
+      activesupport (>= 4)
+      railties (>= 4)
+      request_store (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mail_room (0.9.1)
+    memoist (0.16.0)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    method_source (0.9.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.0)
+    mini_magick (4.8.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.7.0)
+    mousetrap-rails (1.4.6)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    mustermann (1.0.2)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
+    mysql2 (0.4.10)
+    net-ldap (0.16.0)
+    net-ntp (2.1.3)
+    net-ssh (5.0.1)
+    netrc (0.11.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    nokogumbo (1.5.0)
+      nokogiri
+    numerizer (0.1.1)
+    oauth (0.5.4)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    octokit (4.9.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-auth0 (2.0.0)
+      omniauth-oauth2 (~> 1.4)
+    omniauth-authentiq (0.3.3)
+      jwt (>= 1.5)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-azure-oauth2 (0.0.9)
+      jwt (~> 1.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.4)
+    omniauth-cas3 (1.1.4)
+      addressable (~> 2.3)
+      nokogiri (~> 1.7, >= 1.7.1)
+      omniauth (~> 1.2)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-gitlab (1.0.3)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.0)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-kerberos (0.3.0)
+      omniauth-multipassword
+      timfel-krb5-auth (~> 0.8)
+    omniauth-multipassword (0.4.2)
+      omniauth (~> 1.0)
+    omniauth-oauth (1.1.0)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    omniauth-oauth2-generic (0.2.2)
+      omniauth-oauth2 (~> 1.0)
+    omniauth-saml (1.10.0)
+      omniauth (~> 1.3, >= 1.3.2)
+      ruby-saml (~> 1.7)
+    omniauth-shibboleth (1.3.0)
+      omniauth (>= 1.0.0)
+    omniauth-twitter (1.4.0)
+      omniauth-oauth (~> 1.1)
+      rack
+    omniauth_crowd (2.2.3)
+      activesupport
+      nokogiri (>= 1.4.4)
+      omniauth (~> 1.0)
+    org-ruby (0.9.12)
+      rubypants (~> 0.2)
+    orm_adapter (0.5.0)
+    os (0.9.6)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    parslet (1.8.2)
+    peek (1.0.1)
+      concurrent-ruby (>= 0.9.0)
+      concurrent-ruby-ext (>= 0.9.0)
+      railties (>= 4.0.0)
+    peek-gc (0.0.2)
+      peek
+    peek-mysql2 (1.1.0)
+      atomic (>= 1.0.0)
+      mysql2
+      peek
+    peek-pg (1.3.0)
+      concurrent-ruby
+      concurrent-ruby-ext
+      peek
+      pg
+    peek-rblineprof (0.2.0)
+      peek
+      rblineprof
+    peek-redis (1.2.0)
+      atomic (>= 1.0.0)
+      peek
+      redis
+    peek-sidekiq (1.0.3)
+      atomic (>= 1.0.0)
+      peek
+      sidekiq
+    pg (0.18.4)
+    po_to_json (1.0.1)
+      json (>= 1.6.0)
+    posix-spawn (0.3.13)
+    powerpack (0.1.1)
+    premailer (1.10.4)
+      addressable
+      css_parser (>= 1.4.10)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.9.7)
+      actionmailer (>= 3, < 6)
+      premailer (~> 1.7, >= 1.7.9)
+    proc_to_ast (0.1.0)
+      coderay
+      parser
+      unparser
+    procto (0.0.3)
+    prometheus-client-mmap (0.9.4)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.4.3)
+      byebug (>= 9.0, < 9.1)
+      pry (~> 0.10)
+    pry-rails (0.3.5)
+      pry (>= 0.9.10)
+    public_suffix (3.0.2)
+    pyu-ruby-sasl (0.0.3.3)
+    rack (1.6.10)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-attack (4.4.1)
+      rack
+    rack-cors (1.0.2)
+    rack-oauth2 (1.2.3)
+      activesupport (>= 2.3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
+      multi_json (>= 1.3.6)
+      rack (>= 1.1)
+    rack-protection (2.0.1)
+      rack
+    rack-proxy (0.6.0)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.10)
+      actionmailer (= 4.2.10)
+      actionpack (= 4.2.10)
+      actionview (= 4.2.10)
+      activejob (= 4.2.10)
+      activemodel (= 4.2.10)
+      activerecord (= 4.2.10)
+      activesupport (= 4.2.10)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.10)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
+      railties (~> 4.0)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rainbow (3.0.0)
+    raindrops (0.18.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rblineprof (0.3.6)
+      debugger-ruby_core_source (~> 1.3)
+    rbtrace (0.4.10)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
+    rdoc (6.0.4)
+    re2 (1.1.1)
+    recaptcha (3.0.0)
+      json
+    recursive-open-struct (1.1.0)
+    redcarpet (3.4.0)
+    redis (3.3.5)
+    redis-actionpack (5.0.2)
+      actionpack (>= 4.0, < 6)
+      redis-rack (>= 1, < 3)
+      redis-store (>= 1.1.0, < 2)
+    redis-activesupport (5.0.4)
+      activesupport (>= 3, < 6)
+      redis-store (>= 1.3, < 2)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    redis-rack (2.0.4)
+      rack (>= 1.5, < 3)
+      redis-store (>= 1.2, < 2)
+    redis-rails (5.0.2)
+      redis-actionpack (>= 5.0, < 6)
+      redis-activesupport (>= 5.0, < 6)
+      redis-store (>= 1.2, < 2)
+    redis-store (1.4.1)
+      redis (>= 2.2, < 5)
+    regexp_parser (0.5.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    request_store (1.3.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    retriable (3.1.2)
+    rinku (2.0.0)
+    rotp (2.1.2)
+    rouge (3.2.1)
+    rqrcode (0.7.0)
+      chunky_png
+    rqrcode-rails3 (0.1.7)
+      rqrcode (>= 0.4.2)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-parameterized (0.4.0)
+      binding_of_caller
+      parser
+      proc_to_ast
+      rspec (>= 2.13, < 4)
+      unparser
+    rspec-rails (3.7.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-retry (0.4.5)
+      rspec-core
+    rspec-set (0.1.3)
+    rspec-support (3.7.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rspec_profiling (0.0.5)
+      activerecord
+      pg
+      rails
+      sqlite3
+    rubocop (0.54.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-gitlab-security (0.1.1)
+      rubocop (>= 0.51)
+    rubocop-rspec (1.22.2)
+      rubocop (>= 0.52.1)
+    ruby-enum (0.7.2)
+      i18n
+    ruby-fogbugz (0.2.1)
+      crack (~> 0.4)
+    ruby-prof (0.17.0)
+    ruby-progressbar (1.9.0)
+    ruby-saml (1.7.2)
+      nokogiri (>= 1.5.10)
+    ruby_parser (3.9.0)
+      sexp_processor (~> 4.1)
+    rubyntlm (0.6.2)
+    rubypants (0.2.0)
+    rubyzip (1.2.2)
+    rufus-scheduler (3.4.0)
+      et-orbi (~> 1.0)
+    rugged (0.27.4)
+    safe_yaml (1.0.4)
+    sanitize (4.6.6)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.4.4)
+      nokogumbo (~> 1.4)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    scss_lint (0.56.0)
+      rake (>= 0.9, < 13)
+      sass (~> 3.5.3)
+    seed-fu (2.3.7)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
+    select2-rails (3.5.9.3)
+      thor (~> 0.14)
+    selenium-webdriver (3.12.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    sentry-raven (2.7.2)
+      faraday (>= 0.7.6, < 1.0)
+    settingslogic (2.0.9)
+    sexp_processor (4.9.0)
+    sham_rack (1.3.6)
+      rack
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    sidekiq (5.1.3)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
+    sidekiq-cron (0.6.0)
+      rufus-scheduler (>= 3.3.0)
+      sidekiq (>= 4.2.1)
+    sidekiq-limit_fetch (3.4.0)
+      sidekiq (>= 4)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simple_po_parser (1.1.2)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    slack-notifier (1.5.1)
+    spring (2.0.1)
+      activesupport (>= 4.2)
+    spring-commands-rspec (1.0.4)
+      spring (>= 0.9.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    sshkey (1.9.0)
+    stackprof (0.2.10)
+    state_machines (0.5.0)
+    state_machines-activemodel (0.5.1)
+      activemodel (>= 4.1, < 6.0)
+      state_machines (>= 0.5.0)
+    state_machines-activerecord (0.5.1)
+      activerecord (>= 4.1, < 6.0)
+      state_machines-activemodel (>= 0.5.0)
+    stringex (2.8.4)
+    sys-filesystem (1.1.6)
+      ffi
+    sysexits (1.2.0)
+    temple (0.8.0)
+    test-prof (0.2.5)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    text (1.3.1)
+    thin (1.7.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    timecop (0.8.1)
+    timfel-krb5-auth (0.8.3)
+    toml (0.2.0)
+      parslet (~> 1.8.0)
+    toml-rb (1.0.0)
+      citrus (~> 3.0, > 3.0)
+    trollop (2.1.3)
+    truncato (0.7.10)
+      htmlentities (~> 4.3.1)
+      nokogiri (~> 1.8.0, >= 1.7.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    u2f (0.2.1)
+    uber (0.1.0)
+    uglifier (2.7.2)
+      execjs (>= 0.3.0)
+      json (>= 1.8.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.3.2)
+    unicorn (5.1.0)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
+    unicorn-worker-killer (0.4.4)
+      get_process_mem (~> 0)
+      unicorn (>= 4, < 6)
+    uniform_notifier (1.10.0)
+    unparser (0.2.7)
+      abstract_type (~> 0.0.7)
+      adamantium (~> 0.2.0)
+      concord (~> 0.1.5)
+      diff-lcs (~> 1.3)
+      equalizer (~> 0.0.9)
+      parser (>= 2.3.1.2, < 2.6)
+      procto (~> 0.0.2)
+    validates_hostname (1.0.6)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+    version_sorter (2.1.0)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+    vmstat (2.3.0)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    webpack-rails (0.9.10)
+      railties (>= 3.2.0)
+    wikicloth (0.8.1)
+      builder
+      expression_parser
+      rinku
+    with_env (1.1.0)
+    xml-simple (1.1.5)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth (~> 4.3.2)
+  ace-rails-ap (~> 4.1.0)
+  activerecord_sane_schema_dumper (= 0.2)
+  acts-as-taggable-on (~> 5.0)
+  addressable (~> 2.5.2)
+  akismet (~> 2.0)
+  asana (~> 0.6.0)
+  asciidoctor (~> 1.5.6)
+  asciidoctor-plantuml (= 0.0.8)
+  asset_sync (~> 2.4)
+  attr_encrypted (~> 3.1.0)
+  awesome_print
+  aws-sdk
+  babosa (~> 1.0.2)
+  base32 (~> 0.3.0)
+  batch-loader (~> 1.2.1)
+  bcrypt_pbkdf (~> 1.0)
+  benchmark-ips (~> 2.3.0)
+  better_errors (~> 2.1.0)
+  binding_of_caller (~> 0.7.2)
+  bootsnap (~> 1.3)
+  bootstrap_form (~> 2.7.0)
+  brakeman (~> 4.2)
+  browser (~> 2.5)
+  bullet (~> 5.5.0)
+  bundler-audit (~> 0.5.0)
+  capybara (~> 2.15)
+  capybara-screenshot (~> 1.0.0)
+  carrierwave (= 1.2.3)
+  charlock_holmes (~> 0.7.5)
+  chronic (~> 0.10.2)
+  chronic_duration (~> 0.10.6)
+  commonmarker (~> 0.17)
+  concurrent-ruby (~> 1.0.5)
+  connection_pool (~> 2.0)
+  creole (~> 0.5.0)
+  database_cleaner (~> 1.5.0)
+  deckar01-task_list (= 2.0.0)
+  default_value_for (~> 3.0.0)
+  device_detector
+  devise (~> 4.4)
+  devise-two-factor (~> 3.0.0)
+  diffy (~> 3.1.0)
+  doorkeeper (~> 4.3)
+  doorkeeper-openid_connect (~> 1.5)
+  dropzonejs-rails (~> 0.7.1)
+  ed25519 (~> 1.2)
+  elasticsearch-api (= 5.0.3)
+  elasticsearch-model (~> 0.1.9)
+  elasticsearch-rails (~> 0.1.9)
+  email_reply_trimmer (~> 0.1)
+  email_spec (~> 2.2.0)
+  factory_bot_rails (~> 4.8.2)
+  faraday (~> 0.12)
+  faraday_middleware-aws-signers-v4
+  fast_blank
+  ffaker (~> 2.4)
+  flipper (~> 0.13.0)
+  flipper-active_record (~> 0.13.0)
+  flipper-active_support_cache_store (~> 0.13.0)
+  fog-aliyun (~> 0.2.0)
+  fog-aws (~> 2.0.1)
+  fog-core (~> 1.44)
+  fog-google (~> 1.7.1)
+  fog-local (~> 0.3)
+  fog-openstack (~> 0.1)
+  fog-rackspace (~> 0.1.1)
+  font-awesome-rails (~> 4.7)
+  foreman (~> 0.84.0)
+  fuubar (~> 2.2.0)
+  gemojione (~> 3.3)
+  gettext (~> 3.2.2)
+  gettext_i18n_rails (~> 1.8.0)
+  gettext_i18n_rails_js (~> 1.3)
+  gitaly-proto (~> 0.117.0)
+  github-linguist (~> 5.3.3)
+  gitlab-flowdock-git-hook (~> 1.0.1)
+  gitlab-gollum-lib (~> 4.2)
+  gitlab-gollum-rugged_adapter (~> 0.4.4)
+  gitlab-license (~> 1.0)
+  gitlab-markup (~> 1.6.4)
+  gitlab-styles (~> 2.4)
+  gitlab_omniauth-ldap (~> 2.0.4)
+  gon (~> 6.2)
+  google-api-client (~> 0.23)
+  google-protobuf (= 3.5.1)
+  gpgme
+  grape (~> 1.0)
+  grape-entity (~> 0.7.1)
+  grape-path-helpers (~> 1.0)
+  grape_logging (~> 1.7)
+  graphiql-rails (~> 1.4.10)
+  graphql (~> 1.8.0)
+  grpc (~> 1.11.0)
+  gssapi
+  haml_lint (~> 0.26.0)
+  hamlit (~> 2.8.8)
+  hangouts-chat (~> 0.0.5)
+  hashie-forbidden_attributes
+  health_check (~> 2.6.0)
+  hipchat (~> 1.5.0)
+  html-pipeline (~> 2.8)
+  html2text
+  httparty (~> 0.13.3)
+  icalendar
+  influxdb (~> 0.2)
+  jira-ruby (~> 1.4)
+  jquery-atwho-rails (~> 1.3.2)
+  js_regex (~> 2.2.1)
+  json-schema (~> 2.8.0)
+  jwt (~> 1.5.6)
+  kaminari (~> 1.0)
+  knapsack (~> 1.16)
+  kubeclient (~> 3.1.0)
+  letter_opener_web (~> 1.3.0)
+  license_finder (~> 5.4)
+  licensee (~> 8.9)
+  lograge (~> 0.5)
+  loofah (~> 2.2)
+  mail_room (~> 0.9.1)
+  method_source (~> 0.8)
+  mini_magick
+  minitest (~> 5.7.0)
+  mousetrap-rails (~> 1.4.6)
+  mysql2 (~> 0.4.10)
+  net-ldap
+  net-ntp
+  net-ssh (~> 5.0)
+  nokogiri (~> 1.8.2)
+  oauth2 (~> 1.4)
+  octokit (~> 4.9)
+  omniauth (~> 1.8)
+  omniauth-auth0 (~> 2.0.0)
+  omniauth-authentiq (~> 0.3.3)
+  omniauth-azure-oauth2 (~> 0.0.9)
+  omniauth-cas3 (~> 1.1.4)
+  omniauth-facebook (~> 4.0.0)
+  omniauth-github (~> 1.3)
+  omniauth-gitlab (~> 1.0.2)
+  omniauth-google-oauth2 (~> 0.5.3)
+  omniauth-kerberos (~> 0.3.0)
+  omniauth-oauth2-generic (~> 0.2.2)
+  omniauth-saml (~> 1.10)
+  omniauth-shibboleth (~> 1.3.0)
+  omniauth-twitter (~> 1.4)
+  omniauth_crowd (~> 2.2.0)
+  org-ruby (~> 0.9.12)
+  peek (~> 1.0.1)
+  peek-gc (~> 0.0.2)
+  peek-mysql2 (~> 1.1.0)
+  peek-pg (~> 1.3.0)
+  peek-rblineprof (~> 0.2.0)
+  peek-redis (~> 1.2.0)
+  peek-sidekiq (~> 1.0.3)
+  pg (~> 0.18.2)
+  premailer-rails (~> 1.9.7)
+  prometheus-client-mmap (~> 0.9.4)
+  pry-byebug (~> 3.4.1)
+  pry-rails (~> 0.3.4)
+  rack-attack (~> 4.4.1)
+  rack-cors (~> 1.0.0)
+  rack-oauth2 (~> 1.2.1)
+  rack-proxy (~> 0.6.0)
+  rails (= 4.2.10)
+  rails-deprecated_sanitizer (~> 1.0.3)
+  rails-i18n (~> 4.0.9)
+  rainbow (~> 3.0)
+  raindrops (~> 0.18)
+  rblineprof (~> 0.3.6)
+  rbtrace (~> 0.4)
+  rdoc (~> 6.0)
+  re2 (~> 1.1.1)
+  recaptcha (~> 3.0)
+  redcarpet (~> 3.4)
+  redis (~> 3.2)
+  redis-namespace (~> 1.6.0)
+  redis-rails (~> 5.0.2)
+  request_store (~> 1.3)
+  responders (~> 2.0)
+  rouge (~> 3.1)
+  rqrcode-rails3 (~> 0.1.7)
+  rspec-parameterized
+  rspec-rails (~> 3.7.0)
+  rspec-retry (~> 0.4.5)
+  rspec-set (~> 0.1.3)
+  rspec_junit_formatter
+  rspec_profiling (~> 0.0.5)
+  rubocop (~> 0.54.0)
+  rubocop-rspec (~> 1.22.1)
+  ruby-fogbugz (~> 0.2.1)
+  ruby-prof (~> 0.17.0)
+  ruby-progressbar
+  ruby_parser (~> 3.8)
+  rufus-scheduler (~> 3.4)
+  rugged (~> 0.27)
+  sanitize (~> 4.6)
+  sass-rails (~> 5.0.6)
+  scss_lint (~> 0.56.0)
+  seed-fu (~> 2.3.7)
+  select2-rails (~> 3.5.9)
+  selenium-webdriver (~> 3.12)
+  sentry-raven (~> 2.7)
+  settingslogic (~> 2.0.9)
+  sham_rack (~> 1.3.6)
+  shoulda-matchers (~> 3.1.2)
+  sidekiq (~> 5.1)
+  sidekiq-cron (~> 0.6.0)
+  sidekiq-limit_fetch (~> 3.4)
+  simple_po_parser (~> 1.1.2)
+  simplecov (~> 0.14.0)
+  slack-notifier (~> 1.5.1)
+  spring (~> 2.0.0)
+  spring-commands-rspec (~> 1.0.4)
+  sprockets (~> 3.7.0)
+  sshkey (~> 1.9.0)
+  stackprof (~> 0.2.10)
+  state_machines-activerecord (~> 0.5.1)
+  sys-filesystem (~> 1.1.6)
+  test-prof (~> 0.2.5)
+  test_after_commit (~> 1.1)
+  thin (~> 1.7.0)
+  timecop (~> 0.8.0)
+  toml-rb (~> 1.0.0)
+  truncato (~> 0.7.9)
+  u2f (~> 0.2.1)
+  uglifier (~> 2.7.2)
+  unf (~> 0.1.4)
+  unicorn (~> 5.1.0)
+  unicorn-worker-killer (~> 0.4.4)
+  validates_hostname (~> 1.0.6)
+  version_sorter (~> 2.1.0)
+  virtus (~> 1.0.1)
+  vmstat (~> 2.3.0)
+  webmock (~> 2.3.2)
+  webpack-rails (~> 0.9.10)
+  wikicloth (= 0.8.1)
+
+BUNDLED WITH
+   1.16.4
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
new file mode 100644
index 000000000000..a067d1e42722
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix
@@ -0,0 +1,3681 @@
+{
+  abstract_type = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14";
+      type = "gem";
+    };
+    version = "0.0.7";
+  };
+  ace-rails-ap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h";
+      type = "gem";
+    };
+    version = "4.1.2";
+  };
+  actionmailer = {
+    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ivyjsapqgn1xfb2p8yqjrg2jldqm5r7hxrjxq6kdr05gk4fsg59";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  actionpack = {
+    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l6agrxdaishxjx2zc2x8md95plfp39bfskzgs6v9gsdp2y2arpx";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  actionview = {
+    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jrx2pmkywk70z7n17gw3jrcdw3n03wdzvg45bnq8wxshl1lmbhv";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  activejob = {
+    dependencies = ["activesupport" "globalid"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10jsa5pqklcsd2npicqxr5abjlwi53di2brpzgz35k557fkpc1z8";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  activemodel = {
+    dependencies = ["activesupport" "builder"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c4vj9xajxa906bqbcjpni74nya6rh2nbb15gl8xm0vl9zf3ll9v";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  activerecord = {
+    dependencies = ["activemodel" "activesupport" "arel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lws9y4p9c2vnmv3ddfpv8jh6azlddppl3fi31vahaz14ifxjk5s";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  activerecord_sane_schema_dumper = {
+    dependencies = ["rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "122c7v7lvs0gwckvx2rar07waxnx1vv0lryz322nybb69d8vbhl6";
+      type = "gem";
+    };
+    version = "0.2";
+  };
+  activesupport = {
+    dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  acts-as-taggable-on = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
+      type = "gem";
+    };
+    version = "5.0.0";
+  };
+  adamantium = {
+    dependencies = ["ice_nine" "memoizable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  aes_key_wrap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  akismet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  arel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+      type = "gem";
+    };
+    version = "6.0.4";
+  };
+  asana = {
+    dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bn7f3sc2f02g871jd0y6qdhixn464mflkjchp56x6kcnyqy24z6";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  asciidoctor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f";
+      type = "gem";
+    };
+    version = "1.5.6.2";
+  };
+  asciidoctor-plantuml = {
+    dependencies = ["asciidoctor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna";
+      type = "gem";
+    };
+    version = "0.0.8";
+  };
+  asset_sync = {
+    dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wjd662yyg72dwwc6cav7gk2bjv9nkhn056f03h8zmyank451hdf";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  atomic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9";
+      type = "gem";
+    };
+    version = "1.1.99";
+  };
+  attr_encrypted = {
+    dependencies = ["encryptor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  attr_required = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  awesome_print = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  aws-sdk = {
+    dependencies = ["aws-sdk-resources"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-sigv4" "jmespath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sdk-resources = {
+    dependencies = ["aws-sdk-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
+      type = "gem";
+    };
+    version = "2.9.32";
+  };
+  aws-sigv4 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  axiom-types = {
+    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  babosa = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  base32 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  batch-loader = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nvmwzn8q6dkp2n8wz47z7gldj3yrj7h6syy0cwrkzi19bfvxba2";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  bcrypt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy";
+      type = "gem";
+    };
+    version = "3.1.12";
+  };
+  bcrypt_pbkdf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  benchmark-ips = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  better_errors = {
+    dependencies = ["coderay" "erubis" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11csk41yhijqvp0dkky0cjl8kn6blw4jhr8b6v4islfvvayddcxc";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  bindata = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  binding_of_caller = {
+    dependencies = ["debug_inspector"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  bootsnap = {
+    dependencies = ["msgpack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i3llrdqkndxzhv1a7a2yjpavmdabyq5ps296vmb32hv8fy95xk9";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  bootstrap_form = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sw88vi5sb48xzgwclic38jdgmcbvah2qfi3rijrlmi1wai4j1fw";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  brakeman = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v";
+      type = "gem";
+    };
+    version = "4.2.1";
+  };
+  browser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      type = "gem";
+    };
+    version = "3.2.3";
+  };
+  bullet = {
+    dependencies = ["activesupport" "uniform_notifier"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5";
+      type = "gem";
+    };
+    version = "5.5.1";
+  };
+  bundler-audit = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  byebug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0";
+      type = "gem";
+    };
+    version = "9.0.6";
+  };
+  capybara = {
+    dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bahhwrd1rpfhci1x57yz0df9plziipljbw3p4k6mlash4wq6w92";
+      type = "gem";
+    };
+    version = "2.15.1";
+  };
+  capybara-screenshot = {
+    dependencies = ["capybara" "launchy"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xy79lf3rwn3602r4hqm9s8a03bhlf6hzwdi6345dzrkmhwwj2ij";
+      type = "gem";
+    };
+    version = "1.0.14";
+  };
+  carrierwave = {
+    dependencies = ["activemodel" "activesupport" "mime-types"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k9kla5ncygm97vn33lsrs7ch5zy4qqhhvc8m3khm986yaqh75qs";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  cause = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
+      type = "gem";
+    };
+    version = "0.1";
+  };
+  charlock_holmes = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  childprocess = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  chronic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  chronic_duration = {
+    dependencies = ["numerizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs";
+      type = "gem";
+    };
+    version = "0.10.6";
+  };
+  chunky_png = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
+      type = "gem";
+    };
+    version = "1.3.5";
+  };
+  citrus = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  coercible = {
+    dependencies = ["descendants_tracker"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  commonmarker = {
+    dependencies = ["ruby-enum"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9";
+      type = "gem";
+    };
+    version = "0.17.13";
+  };
+  concord = {
+    dependencies = ["adamantium" "equalizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  concurrent-ruby-ext = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "119l554zi3720d3rk670ldcqhsgmfii28a9z307v4mwdjckdm4gp";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  connection_pool = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  crack = {
+    dependencies = ["safe_yaml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+      type = "gem";
+    };
+    version = "0.4.3";
+  };
+  crass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  creole = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  css_parser = {
+    dependencies = ["addressable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  daemons = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  database_cleaner = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fx6zmqznklmkbjl6f713jyl11d4g9q220rcl86m2jp82r8kfwjj";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  debug_inspector = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  debugger-ruby_core_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
+      type = "gem";
+    };
+    version = "1.3.8";
+  };
+  deckar01-task_list = {
+    dependencies = ["html-pipeline"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  declarative = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
+      type = "gem";
+    };
+    version = "0.0.10";
+  };
+  declarative-option = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  default_value_for = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "014482mxjrc227fxv6vff6ccjr9dr0ydz52flxslsa7biq542k73";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  descendants_tracker = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  device_detector = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  devise = {
+    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj";
+      type = "gem";
+    };
+    version = "4.4.3";
+  };
+  devise-two-factor = {
+    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  diff-lcs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
+    };
+    version = "1.3";
+  };
+  diffy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
+      type = "gem";
+    };
+    version = "0.5.20180417";
+  };
+  doorkeeper = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
+  doorkeeper-openid_connect = {
+    dependencies = ["doorkeeper" "json-jwt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  dropzonejs-rails = {
+    dependencies = ["rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  ed25519 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  elasticsearch = {
+    dependencies = ["elasticsearch-api" "elasticsearch-transport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-api = {
+    dependencies = ["multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  elasticsearch-model = {
+    dependencies = ["activesupport" "elasticsearch" "hashie"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  elasticsearch-transport = {
+    dependencies = ["faraday" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26";
+      type = "gem";
+    };
+    version = "5.0.3";
+  };
+  email_reply_trimmer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz";
+      type = "gem";
+    };
+    version = "0.1.6";
+  };
+  email_spec = {
+    dependencies = ["htmlentities" "launchy" "mail"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  encryptor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  equalizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  erubis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  escape_utils = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "088r5c2mz2vy2jbbx1xjbi8msnzg631ggli29nhik2spbcp1z6vh";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  et-orbi = {
+    dependencies = ["tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  eventmachine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+      type = "gem";
+    };
+    version = "1.0.8";
+  };
+  excon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
+      type = "gem";
+    };
+    version = "0.62.0";
+  };
+  execjs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  expression_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  factory_bot = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx";
+      type = "gem";
+    };
+    version = "4.8.2";
+  };
+  factory_bot_rails = {
+    dependencies = ["factory_bot" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2";
+      type = "gem";
+    };
+    version = "4.8.2";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2";
+      type = "gem";
+    };
+    version = "0.12.2";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
+      type = "gem";
+    };
+    version = "0.12.2";
+  };
+  faraday_middleware-aws-signers-v4 = {
+    dependencies = ["aws-sdk-resources" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
+  faraday_middleware-multi_json = {
+    dependencies = ["faraday_middleware" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
+  fast_blank = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  fast_gettext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  ffaker = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rlfvf2iakphs3krxy1hiywr2jzmrhvhig8n8fw6rcivpz9v52ry";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+      type = "gem";
+    };
+    version = "1.9.25";
+  };
+  flipper = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  flipper-active_record = {
+    dependencies = ["activerecord" "flipper"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  flipper-active_support_cache_store = {
+    dependencies = ["activesupport" "flipper"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  flowdock = {
+    dependencies = ["httparty" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  fog-aliyun = {
+    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  fog-aws = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  fog-core = {
+    dependencies = ["builder" "excon" "formatador"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
+      type = "gem";
+    };
+    version = "1.45.0";
+  };
+  fog-google = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  fog-json = {
+    dependencies = ["fog-core" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  fog-local = {
+    dependencies = ["fog-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
+  fog-openstack = {
+    dependencies = ["fog-core" "fog-json" "ipaddress"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
+      type = "gem";
+    };
+    version = "0.1.21";
+  };
+  fog-rackspace = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  fog-xml = {
+    dependencies = ["fog-core" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  font-awesome-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qc07vj7qyllrj7lr7wl89l5ir0gj104rc7sds2jynzmrqsamnlw";
+      type = "gem";
+    };
+    version = "4.7.0.1";
+  };
+  foreman = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
+      type = "gem";
+    };
+    version = "0.84.0";
+  };
+  formatador = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  fuubar = {
+    dependencies = ["rspec-core" "ruby-progressbar"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  gemojione = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  get_process_mem = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  gettext = {
+    dependencies = ["locale" "text"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
+      type = "gem";
+    };
+    version = "3.2.9";
+  };
+  gettext_i18n_rails = {
+    dependencies = ["fast_gettext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  gettext_i18n_rails_js = {
+    dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  gitaly-proto = {
+    dependencies = ["google-protobuf" "grpc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ixgzw4clmhjhmv3fy9niq4x16k1yn9iyjbc99z5674xlp7nm40i";
+      type = "gem";
+    };
+    version = "0.117.0";
+  };
+  github-linguist = {
+    dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
+      type = "gem";
+    };
+    version = "5.3.3";
+  };
+  github-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  gitlab-flowdock-git-hook = {
+    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  gitlab-gollum-lib = {
+    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15h6a7lsfkm967d5dhjlbcm2lnl1l9akzvaq92qlxq40r5apw0kn";
+      type = "gem";
+    };
+    version = "4.2.7.5";
+  };
+  gitlab-gollum-rugged_adapter = {
+    dependencies = ["mime-types" "rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "092i02k3kd4ghk1h1l5yrvi9b180dgfxrvwni26facb2kc9f3wbi";
+      type = "gem";
+    };
+    version = "0.4.4.1";
+  };
+  gitlab-grit = {
+    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
+      type = "gem";
+    };
+    version = "2.8.2";
+  };
+  gitlab-license = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  gitlab-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v6w3z7smmkqnhphb4ghgpqg61vimflqzpszybji0li99f2k1jb6";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  gitlab-styles = {
+    dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
+  gitlab_omniauth-ldap = {
+    dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  globalid = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02smrgdi11kziqi9zhnsy9i6yr2fnxrqlv3lllsvdjki3cd4is38";
+      type = "gem";
+    };
+    version = "0.4.1";
+  };
+  gollum-grit_adapter = {
+    dependencies = ["gitlab-grit"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  gon = {
+    dependencies = ["actionpack" "multi_json" "request_store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806";
+      type = "gem";
+    };
+    version = "6.2.0";
+  };
+  google-api-client = {
+    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k";
+      type = "gem";
+    };
+    version = "0.23.4";
+  };
+  google-protobuf = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s8ijd9wdrkqwsb6nasrsv7f9i5im2nyax7f7jlb5y9vh8nl98qi";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  googleapis-common-protos-types = {
+    dependencies = ["google-protobuf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yf10s7w8wpa49hc86z7z2fkn9yz7j2njz0n8xmqb24ji090z4ck";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  googleauth = {
+    dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  gpgme = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fclgx3pg3sihk9xn3amcf8db0q749dsqkycayn1c8x134zml3gb";
+      type = "gem";
+    };
+    version = "2.0.13";
+  };
+  grape = {
+    dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lz17804lpip6cm3g0j9xyzc38lxsn84cl3v3ixn6djnwlmp6427";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  grape-entity = {
+    dependencies = ["activesupport" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  grape-path-helpers = {
+    dependencies = ["activesupport" "grape" "rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13h5575xfc144wsr48sp3qngpwvh4ikz4r3m55j8jmdr6sa16rbw";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
+  grape_logging = {
+    dependencies = ["grape"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  graphiql-rails = {
+    dependencies = ["railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8";
+      type = "gem";
+    };
+    version = "1.4.10";
+  };
+  graphql = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  grpc = {
+    dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
+      type = "gem";
+    };
+    version = "1.11.0";
+  };
+  gssapi = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  haml = {
+    dependencies = ["temple" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
+      type = "gem";
+    };
+    version = "5.0.4";
+  };
+  haml_lint = {
+    dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04illnjl9hsg7wqf8x5s108m5is9aj52g80c6nrgsksyp4vh9ynn";
+      type = "gem";
+    };
+    version = "0.26.0";
+  };
+  hamlit = {
+    dependencies = ["temple" "thor" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i";
+      type = "gem";
+    };
+    version = "2.8.8";
+  };
+  hangouts-chat = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  hashdiff = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
+  hashie = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb";
+      type = "gem";
+    };
+    version = "3.5.7";
+  };
+  hashie-forbidden_attributes = {
+    dependencies = ["hashie"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  health_check = {
+    dependencies = ["rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  hipchat = {
+    dependencies = ["httparty" "mimemagic"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  html-pipeline = {
+    dependencies = ["activesupport" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad";
+      type = "gem";
+    };
+    version = "2.8.4";
+  };
+  html2text = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  htmlentities = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
+      type = "gem";
+    };
+    version = "4.3.4";
+  };
+  http = {
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  "http_parser.rb" = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  httparty = {
+    dependencies = ["json" "multi_xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+      type = "gem";
+    };
+    version = "0.13.7";
+  };
+  httpclient = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      type = "gem";
+    };
+    version = "2.8.3";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
+      type = "gem";
+    };
+    version = "0.9.5";
+  };
+  icalendar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
+  ice_nine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
+      type = "gem";
+    };
+    version = "0.11.2";
+  };
+  influxdb = {
+    dependencies = ["cause" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  ipaddress = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  jira-ruby = {
+    dependencies = ["activesupport" "multipart-post" "oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  jmespath = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  jquery-atwho-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  js_regex = {
+    dependencies = ["regexp_parser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";
+      type = "gem";
+    };
+    version = "1.8.6";
+  };
+  json-jwt = {
+    dependencies = ["activesupport" "aes_key_wrap" "bindata"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r";
+      type = "gem";
+    };
+    version = "1.9.4";
+  };
+  json-schema = {
+    dependencies = ["addressable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
+      type = "gem";
+    };
+    version = "2.8.0";
+  };
+  jwt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
+      type = "gem";
+    };
+    version = "1.5.6";
+  };
+  kaminari = {
+    dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  kaminari-actionview = {
+    dependencies = ["actionview" "kaminari-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  kaminari-activerecord = {
+    dependencies = ["activerecord" "kaminari-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  kaminari-core = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  kgio = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
+      type = "gem";
+    };
+    version = "2.10.0";
+  };
+  knapsack = {
+    dependencies = ["rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di";
+      type = "gem";
+    };
+    version = "1.16.0";
+  };
+  kubeclient = {
+    dependencies = ["http" "recursive-open-struct" "rest-client"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1czzdp9lfsrah2jkaddkqzmphyvnk096zm1ra6jddh626d8d53r4";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  launchy = {
+    dependencies = ["addressable"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  letter_opener = {
+    dependencies = ["launchy"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pcrdbxvp2x5six8fqn8gf09bn9rd3jga76ds205yph5m8fsda21";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  letter_opener_web = {
+    dependencies = ["actionmailer" "letter_opener" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "050x5cwqbxj2cydd2pzy9vfhmpgn1w6lfbwjaax1m1vpkn3xg9bv";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  license_finder = {
+    dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
+  licensee = {
+    dependencies = ["rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
+      type = "gem";
+    };
+    version = "8.9.2";
+  };
+  little-plugger = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  locale = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  logging = {
+    dependencies = ["little-plugger" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  lograge = {
+    dependencies = ["actionpack" "activesupport" "railties" "request_store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  loofah = {
+    dependencies = ["crass" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  mail = {
+    dependencies = ["mini_mime"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10dyifazss9mgdzdv08p47p344wmphp5pkh5i73s7c04ra8y6ahz";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  mail_room = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa";
+      type = "gem";
+    };
+    version = "0.9.1";
+  };
+  memoist = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh";
+      type = "gem";
+    };
+    version = "0.16.0";
+  };
+  memoizable = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  method_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+      type = "gem";
+    };
+    version = "3.1";
+  };
+  mime-types-data = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      type = "gem";
+    };
+    version = "3.2016.0521";
+  };
+  mimemagic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  mini_magick = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n";
+      type = "gem";
+    };
+    version = "4.8.0";
+  };
+  mini_mime = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8";
+      type = "gem";
+    };
+    version = "5.7.0";
+  };
+  mousetrap-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
+      type = "gem";
+    };
+    version = "1.4.6";
+  };
+  msgpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
+  multi_xml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  mustermann = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  mustermann-grape = {
+    dependencies = ["mustermann"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  mysql2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
+      type = "gem";
+    };
+    version = "0.4.10";
+  };
+  net-ldap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq";
+      type = "gem";
+    };
+    version = "0.16.0";
+  };
+  net-ntp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  net-ssh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hj2i8rk5wb6235r5n19in1hkrp1fbz2bf40xmagavb5ahv7205w";
+      type = "gem";
+    };
+    version = "5.0.1";
+  };
+  netrc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+      type = "gem";
+    };
+    version = "1.8.4";
+  };
+  nokogumbo = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  numerizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
+      type = "gem";
+    };
+    version = "0.5.4";
+  };
+  oauth2 = {
+    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "094hmmfms8vpm6nwglpl7jmlv85nlfzl0kik4fizgx1rg70a6mr5";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  octokit = {
+    dependencies = ["sawyer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
+      type = "gem";
+    };
+    version = "4.9.0";
+  };
+  omniauth = {
+    dependencies = ["hashie" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  omniauth-auth0 = {
+    dependencies = ["omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  omniauth-authentiq = {
+    dependencies = ["jwt" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi";
+      type = "gem";
+    };
+    version = "0.3.3";
+  };
+  omniauth-azure-oauth2 = {
+    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ck5616fjik0dw89xvak1mi8ijcv10lsh6n9h4107l5dys2g3jfx";
+      type = "gem";
+    };
+    version = "0.0.9";
+  };
+  omniauth-cas3 = {
+    dependencies = ["addressable" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  omniauth-facebook = {
+    dependencies = ["omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  omniauth-github = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  omniauth-gitlab = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  omniauth-google-oauth2 = {
+    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym";
+      type = "gem";
+    };
+    version = "0.5.3";
+  };
+  omniauth-kerberos = {
+    dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  omniauth-multipassword = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  omniauth-oauth = {
+    dependencies = ["oauth" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  omniauth-oauth2 = {
+    dependencies = ["oauth2" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  omniauth-oauth2-generic = {
+    dependencies = ["omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273";
+      type = "gem";
+    };
+    version = "0.2.2";
+  };
+  omniauth-saml = {
+    dependencies = ["omniauth" "ruby-saml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p";
+      type = "gem";
+    };
+    version = "1.10.0";
+  };
+  omniauth-shibboleth = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  omniauth-twitter = {
+    dependencies = ["omniauth-oauth" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  omniauth_crowd = {
+    dependencies = ["activesupport" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  org-ruby = {
+    dependencies = ["rubypants"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
+      type = "gem";
+    };
+    version = "0.9.12";
+  };
+  orm_adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  os = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      type = "gem";
+    };
+    version = "0.9.6";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      type = "gem";
+    };
+    version = "2.5.1.0";
+  };
+  parslet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  peek = {
+    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  peek-gc = {
+    dependencies = ["peek"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  peek-mysql2 = {
+    dependencies = ["atomic" "mysql2" "peek"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb2fzx3dwj7k6sc87jwhjk8vzp8dskv49j141xx15vvkg603j8k";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  peek-pg = {
+    dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  peek-rblineprof = {
+    dependencies = ["peek" "rblineprof"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  peek-redis = {
+    dependencies = ["atomic" "peek" "redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  peek-sidekiq = {
+    dependencies = ["atomic" "peek" "sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y7s32p6cp66z1hpd1wcv4crmvvvcag5i39aazclckjsfpdfn24x";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  pg = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+      type = "gem";
+    };
+    version = "0.18.4";
+  };
+  po_to_json = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  posix-spawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
+      type = "gem";
+    };
+    version = "0.3.13";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  premailer = {
+    dependencies = ["addressable" "css_parser" "htmlentities"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf";
+      type = "gem";
+    };
+    version = "1.10.4";
+  };
+  premailer-rails = {
+    dependencies = ["actionmailer" "premailer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim";
+      type = "gem";
+    };
+    version = "1.9.7";
+  };
+  proc_to_ast = {
+    dependencies = ["coderay" "parser" "unparser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  procto = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c";
+      type = "gem";
+    };
+    version = "0.0.3";
+  };
+  prometheus-client-mmap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14ww8c2qy43jw3fzmq54hsljmqmlx9a7zg9sv6ddw48qy118ls10";
+      type = "gem";
+    };
+    version = "0.9.4";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
+      type = "gem";
+    };
+    version = "0.11.3";
+  };
+  pry-byebug = {
+    dependencies = ["byebug" "pry"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g820bqmlq8vvh78895zgrzgmj3g6n63px7cba11s02lpz56630n";
+      type = "gem";
+    };
+    version = "3.4.3";
+  };
+  pry-rails = {
+    dependencies = ["pry"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v8xlzzb535k7wcl0vrpday237xwc04rr9v3gviqzasl7ydw32x6";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  pyu-ruby-sasl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
+      type = "gem";
+    };
+    version = "0.0.3.3";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+  rack-accept = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
+      type = "gem";
+    };
+    version = "0.4.5";
+  };
+  rack-attack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
+      type = "gem";
+    };
+    version = "4.4.1";
+  };
+  rack-cors = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  rack-oauth2 = {
+    dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j7fh3fyajpfwg47gyfd8spavn7lmd6dcm468w7lhnhcviy5vmyf";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  rack-proxy = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  rack-test = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  rails = {
+    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vbdlkmlh470g7msqhmcmhxhi4finv3cjg595x9viafvphnf40l";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  rails-deprecated_sanitizer = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails-dom-testing = {
+    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+      type = "gem";
+    };
+    version = "1.0.9";
+  };
+  rails-html-sanitizer = {
+    dependencies = ["loofah"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  rails-i18n = {
+    dependencies = ["i18n" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17a02f2671pw5r2hl2n3isiz6w9wy2dxq8g52srciyl1xcmvsw01";
+      type = "gem";
+    };
+    version = "4.0.9";
+  };
+  railties = {
+    dependencies = ["actionpack" "activesupport" "rake" "thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0snymfqj2cql0gp51i6a44avcirdridc15yggnxjj9raa9f3229p";
+      type = "gem";
+    };
+    version = "4.2.10";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  raindrops = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
+      type = "gem";
+    };
+    version = "0.18.0";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
+      type = "gem";
+    };
+    version = "12.3.1";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
+      type = "gem";
+    };
+    version = "0.10.2";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  rblineprof = {
+    dependencies = ["debugger-ruby_core_source"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  rbtrace = {
+    dependencies = ["ffi" "msgpack" "trollop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv";
+      type = "gem";
+    };
+    version = "0.4.10";
+  };
+  rdoc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
+      type = "gem";
+    };
+    version = "6.0.4";
+  };
+  re2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  recaptcha = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pppfgica4629i8gbji6pnh681wjf03m6m1ix2ficpnqg2z7gl9n";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  recursive-open-struct = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  redcarpet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  RedCloth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
+  redis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv";
+      type = "gem";
+    };
+    version = "3.3.5";
+  };
+  redis-actionpack = {
+    dependencies = ["actionpack" "redis-rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
+      type = "gem";
+    };
+    version = "5.0.2";
+  };
+  redis-activesupport = {
+    dependencies = ["activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5";
+      type = "gem";
+    };
+    version = "5.0.4";
+  };
+  redis-namespace = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  redis-rack = {
+    dependencies = ["rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb";
+      type = "gem";
+    };
+    version = "2.0.4";
+  };
+  redis-rails = {
+    dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40";
+      type = "gem";
+    };
+    version = "5.0.2";
+  };
+  redis-store = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00yh8rhv91vxjlqs4ylic99m9npjxmgib2vjj8hgzk1174y6vcmq";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  regexp_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  representable = {
+    dependencies = ["declarative" "declarative-option" "uber"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+      type = "gem";
+    };
+    version = "3.0.4";
+  };
+  request_store = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  responders = {
+    dependencies = ["actionpack" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  rest-client = {
+    dependencies = ["http-cookie" "mime-types" "netrc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
+      type = "gem";
+    };
+    version = "2.0.2";
+  };
+  retriable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
+  rinku = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  rotp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  rouge = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f";
+      type = "gem";
+    };
+    version = "3.2.1";
+  };
+  rqrcode = {
+    dependencies = ["chunky_png"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  rqrcode-rails3 = {
+    dependencies = ["rqrcode"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zvjbymx3avxm3lf8v4gka3a862vnaxldmwvp6767bpy48nhnvjj";
+      type = "gem";
+    };
+    version = "3.7.1";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  rspec-parameterized = {
+    dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  rspec-rails = {
+    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cdcnbv5dppwy3b4jdp5a0wd9m07a8wlqwb9yazn8i7k1k2mwgvx";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  rspec-retry = {
+    dependencies = ["rspec-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0izvxab7jvk25kaprk0i72asjyh1ip3cm70bgxlm8lpid35qjar6";
+      type = "gem";
+    };
+    version = "0.4.5";
+  };
+  rspec-set = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nl30xb6jmcl0awhqp6jycl01wdssblifwy921phfml70rd9flj1";
+      type = "gem";
+    };
+    version = "3.7.1";
+  };
+  rspec_junit_formatter = {
+    dependencies = ["builder" "rspec-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  rspec_profiling = {
+    dependencies = ["activerecord" "pg" "rails" "sqlite3"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  rubocop = {
+    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "106y99lq0fg62k3vk1w5wwb4vq16pnh4l61skc82xck627z0h8is";
+      type = "gem";
+    };
+    version = "0.54.0";
+  };
+  rubocop-gitlab-security = {
+    dependencies = ["rubocop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  rubocop-rspec = {
+    dependencies = ["rubocop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla";
+      type = "gem";
+    };
+    version = "1.22.2";
+  };
+  ruby-enum = {
+    dependencies = ["i18n"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  ruby-fogbugz = {
+    dependencies = ["crack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  ruby-prof = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
+      type = "gem";
+    };
+    version = "0.17.0";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  ruby-saml = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3";
+      type = "gem";
+    };
+    version = "1.7.2";
+  };
+  ruby_parser = {
+    dependencies = ["sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18apbsmmivgc1schfxmkp429aijrwy8psm30dwx5cpmpjf48ir3n";
+      type = "gem";
+    };
+    version = "3.9.0";
+  };
+  rubyntlm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  rubypants = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  rubyzip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  rufus-scheduler = {
+    dependencies = ["et-orbi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  rugged = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y6k5yrfmhc1v4albbpa3xzl28vk5lric3si8ada28sp9mmk2x72";
+      type = "gem";
+    };
+    version = "0.27.4";
+  };
+  safe_yaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  sanitize = {
+    dependencies = ["crass" "nokogiri" "nokogumbo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv";
+      type = "gem";
+    };
+    version = "4.6.6";
+  };
+  sass = {
+    dependencies = ["sass-listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v";
+      type = "gem";
+    };
+    version = "3.5.5";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  sass-rails = {
+    dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iji20hb8crncz14piss1b29bfb6l89sz3ai5fny3iw39vnxkdcb";
+      type = "gem";
+    };
+    version = "5.0.6";
+  };
+  sawyer = {
+    dependencies = ["addressable" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  scss_lint = {
+    dependencies = ["rake" "sass"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
+      type = "gem";
+    };
+    version = "0.56.0";
+  };
+  seed-fu = {
+    dependencies = ["activerecord" "activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi";
+      type = "gem";
+    };
+    version = "2.3.7";
+  };
+  select2-rails = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
+      type = "gem";
+    };
+    version = "3.5.9.3";
+  };
+  selenium-webdriver = {
+    dependencies = ["childprocess" "rubyzip"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07bl3wjkf254r3ljfl4qdazz5aw60s6nqjwrbbgq754j9b7226kz";
+      type = "gem";
+    };
+    version = "3.12.0";
+  };
+  sentry-raven = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  settingslogic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  sexp_processor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c6kp2qxq550hz7gsxqi37irxn3vynkz7ibgy9hfwqymf6y1jdik";
+      type = "gem";
+    };
+    version = "4.9.0";
+  };
+  sham_rack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
+  shoulda-matchers = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zvv94pqk5b5my3w1shdz7h34xf2ldhg5k4qfdpbwi2iy0j9zw2a";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
+  sidekiq = {
+    dependencies = ["concurrent-ruby" "connection_pool" "rack-protection" "redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0af7sh9ckds36wv80azlanw1ch29nbvr1w3m00mlj1hbk2il6cxh";
+      type = "gem";
+    };
+    version = "5.1.3";
+  };
+  sidekiq-cron = {
+    dependencies = ["rufus-scheduler" "sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  sidekiq-limit_fetch = {
+    dependencies = ["sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr";
+      type = "gem";
+    };
+    version = "3.4.0";
+  };
+  signet = {
+    dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  simple_po_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  simplecov = {
+    dependencies = ["docile" "json" "simplecov-html"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww";
+      type = "gem";
+    };
+    version = "0.14.1";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  slack-notifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
+  spring = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wwbyg2nab2k4hdpd1i65qmnfixry29b4yqynrqfnmjghn0xvc7x";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  spring-commands-rspec = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  sprockets = {
+    dependencies = ["concurrent-ruby" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  sprockets-rails = {
+    dependencies = ["actionpack" "activesupport" "sprockets"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
+      type = "gem";
+    };
+    version = "3.2.1";
+  };
+  sqlite3 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
+      type = "gem";
+    };
+    version = "1.3.13";
+  };
+  sshkey = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  stackprof = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski";
+      type = "gem";
+    };
+    version = "0.2.10";
+  };
+  state_machines = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  state_machines-activemodel = {
+    dependencies = ["activemodel" "state_machines"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
+  state_machines-activerecord = {
+    dependencies = ["activerecord" "state_machines-activemodel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
+  stringex = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
+      type = "gem";
+    };
+    version = "2.8.4";
+  };
+  sys-filesystem = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq";
+      type = "gem";
+    };
+    version = "1.1.6";
+  };
+  sysexits = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  temple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  test-prof = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  test_after_commit = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  text = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  thin = {
+    dependencies = ["daemons" "eventmachine" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dq9q7qyjyg4444bmn12r2s0mir8dqnvc037y0zidhbyaavrv95q";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns";
+      type = "gem";
+    };
+    version = "0.19.4";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      type = "gem";
+    };
+    version = "2.0.8";
+  };
+  timecop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  timfel-krb5-auth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  toml = {
+    dependencies = ["parslet"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  toml-rb = {
+    dependencies = ["citrus"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  trollop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq";
+      type = "gem";
+    };
+    version = "2.1.3";
+  };
+  truncato = {
+    dependencies = ["htmlentities" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b";
+      type = "gem";
+    };
+    version = "0.7.10";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  u2f = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  uber = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  uglifier = {
+    dependencies = ["execjs" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  unf_ext = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
+      type = "gem";
+    };
+    version = "0.0.7.5";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  unicorn = {
+    dependencies = ["kgio" "raindrops"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
+      type = "gem";
+    };
+    version = "5.1.0";
+  };
+  unicorn-worker-killer = {
+    dependencies = ["get_process_mem" "unicorn"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
+      type = "gem";
+    };
+    version = "0.4.4";
+  };
+  uniform_notifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l";
+      type = "gem";
+    };
+    version = "1.10.0";
+  };
+  unparser = {
+    dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w";
+      type = "gem";
+    };
+    version = "0.2.7";
+  };
+  validates_hostname = {
+    dependencies = ["activerecord" "activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
+  version_sorter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  virtus = {
+    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  vmstat = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  warden = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  webmock = {
+    dependencies = ["addressable" "crack" "hashdiff"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+      type = "gem";
+    };
+    version = "2.3.2";
+  };
+  webpack-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l0jzw05yk1c19q874nhkanrn2ik7hjbr2vjcdnk1fqp2f3ypzvv";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  wikicloth = {
+    dependencies = ["builder" "expression_parser" "rinku"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  with_env = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  xml-simple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  xpath = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ha626m6fh50fpilb9pdnmq9xl586w7c0zyidg895c3iq13rqgyw";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+}
\ No newline at end of file

From 7686d7225628c1b478f8d6e4d701c0680a2afcc6 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 7 Oct 2018 15:19:32 -0400
Subject: [PATCH 2587/3253] linux_testing: 4.19-rc6 -> 4.19-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index cabaa59966c1..3d28bd68121d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc6";
-  modDirVersion = "4.19.0-rc6";
+  version = "4.19-rc7";
+  modDirVersion = "4.19.0-rc7";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0cq0xr4lwvngyiyall62hddbk27gy72zjiigb8xdsry96a8ccvgl";
+    sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 9bbd4f653fff6ac1b5befc7ff6095d0806e25369 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 15:32:48 +0200
Subject: [PATCH 2588/3253] qtgraphicaleffects: Add dev output

This shrank my system closure by about 192 MiB.
---
 pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
index 888f627baab8..d0be6ae77694 100644
--- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
@@ -3,5 +3,5 @@
 qtModule {
   name = "qtgraphicaleffects";
   qtInputs = [ qtdeclarative ];
-  outputs = [ "out" ];
+  outputs = [ "out" "dev" ];
 }

From 2be42950c3b726f3cbf8c0198c66190aed094121 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 16:30:19 +0200
Subject: [PATCH 2589/3253] thunderbird: Remove buildconfig

This reduces the closure size from 1689 MiB to 425 MiB.
---
 .../networking/mailreaders/thunderbird/default.nix       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index e0bedeb2f045..419cc2fd2d84 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -47,14 +47,17 @@ in stdenv.mkDerivation rec {
   # from firefox + m4 + wrapperTool
   nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
-  # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
   patches = [
+    # https://bugzilla.mozilla.org/show_bug.cgi?format=default&id=1479540
+    # https://hg.mozilla.org/releases/mozilla-release/rev/bc651d3d910c
     (fetchpatch {
       name = "bc651d3d910c.patch";
       url = "https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c";
       sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g";
     })
+
+    # Remove buildconfig.html to prevent a dependency on clang etc.
+    ../../browsers/firefox/no-buildconfig.patch
   ];
 
   configureFlags =
@@ -191,6 +194,8 @@ in stdenv.mkDerivation rec {
       "$out/bin/thunderbird" --version
     '';
 
+  disallowedRequisites = [ stdenv.cc ];
+
   meta = with stdenv.lib; {
     description = "A full-featured e-mail client";
     homepage = http://www.mozilla.org/thunderbird/;

From 15a190eb27167c1817e0d5154394d0b3d768a56c Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 8 Oct 2018 16:51:37 +0200
Subject: [PATCH 2590/3253] tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17

Critical security update (CVE-2018-16737, CVE-2018-16738, CVE-2018-16758)
---
 pkgs/tools/networking/tinc/default.nix | 4 ++--
 pkgs/tools/networking/tinc/pre.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix
index bf039b653cc6..a17f382557ac 100644
--- a/pkgs/tools/networking/tinc/default.nix
+++ b/pkgs/tools/networking/tinc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, lzo, openssl, zlib}:
 
 stdenv.mkDerivation rec {
-  version = "1.0.34";
+  version = "1.0.35";
   name = "tinc-${version}";
 
   src = fetchurl {
     url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz";
-    sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0";
+    sha256 = "0pl92sdwrkiwgll78x0ww06hfljd07mkwm62g8x17qn3gha3pj0q";
   };
 
   buildInputs = [ lzo openssl zlib ];
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 09c737c048ae..0cc1fb99455a 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
-  version = "1.1pre16";
+  version = "1.1pre17";
 
   src = fetchgit {
     rev = "refs/tags/release-${version}";
     url = "git://tinc-vpn.org/tinc";
-    sha256 = "03dsm1kxagq8srskzg649xyhbdqbbqxc84pdwrz7yakpa9m6225c";
+    sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q";
   };
 
   outputs = [ "out" "man" "info" ];

From 24320f4a9e398e03374d8dbca95d553850ac2ee4 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 16:28:35 +0200
Subject: [PATCH 2591/3253] nixos/prometheus-varnish-exporter: avoid crash on
 restart

---
 .../modules/services/monitoring/prometheus/exporters/varnish.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
index 8dbf2d735ab9..aaed76175b84 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
@@ -69,6 +69,7 @@ in
     path = [ pkgs.varnish ];
     serviceConfig = {
       DynamicUser = true;
+      RestartSec = mkDefault 1;
       ExecStart = ''
         ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \

From fbb7e0c82f297815950e9153c21e561a704bfcd5 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 16:30:53 +0200
Subject: [PATCH 2592/3253] nixos/prometheus-exporters: fix unapplied service
 config

Prior to this commit, the default values for `Restart`, `PrivateTmp` and
`WorkingDirectory` were falsely ignored.

I also added myself as maintainer.
---
 .../monitoring/prometheus/exporters.nix       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 1d5f400250fd..ae8caac436da 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -123,15 +123,13 @@ let
       systemd.services."prometheus-${name}-exporter" = mkMerge ([{
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
-        serviceConfig = {
-          Restart = mkDefault "always";
-          PrivateTmp = mkDefault true;
-          WorkingDirectory = mkDefault /tmp;
-        } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) {
-          User = conf.user;
-          Group = conf.group;
-        };
-      } serviceOpts ]);
+        serviceConfig.Restart = mkDefault "always";
+        serviceConfig.PrivateTmp = mkDefault true;
+        serviceConfig.WorkingDirectory = mkDefault /tmp;
+      } serviceOpts ] ++ optional (serviceOpts.serviceConfig.DynamicUser or false) {
+        serviceConfig.User = conf.user;
+        serviceConfig.Group = conf.group;
+      });
   };
 in
 {
@@ -172,5 +170,8 @@ in
     }) exporterOpts)
   );
 
-  meta.doc = ./exporters.xml;
+  meta = {
+    doc = ./exporters.xml;
+    maintainers = [ maintainers.willibutz ];
+  };
 }

From 0febc64ed1928e163d9747ee1a7d3d1c7c0f9c6d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 16:38:16 +0200
Subject: [PATCH 2593/3253] nixos/tests: add test for prometheus exporters

---
 nixos/release.nix                    |   1 +
 nixos/tests/prometheus-exporters.nix | 297 +++++++++++++++++++++++++++
 2 files changed, 298 insertions(+)
 create mode 100644 nixos/tests/prometheus-exporters.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8016dba09152..858c01d75806 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -390,6 +390,7 @@ in rec {
   tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.prometheus = callTest tests/prometheus.nix {};
+  tests.prometheus-exporters = callTest tests/prometheus-exporters.nix {};
   tests.prosody = callTest tests/prosody.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   tests.quagga = callTest tests/quagga.nix {};
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
new file mode 100644
index 000000000000..2f2c06dcb7d6
--- /dev/null
+++ b/nixos/tests/prometheus-exporters.nix
@@ -0,0 +1,297 @@
+import ./make-test.nix ({ lib, pkgs, ... }:
+let
+  escape' = str: lib.replaceChars [''"'' "$" "\n"] [''\\\"'' "\\$" ""] str;
+
+/*
+ * The attrset `exporterTests` contains one attribute
+ * for each exporter test. Each of these attributes
+ * is expected to be an attrset containing:
+ *
+ *  `exporterConfig`:
+ *    this attribute set contains config for the exporter itself
+ *
+ *  `exporterTest`
+ *    this attribute set contains test instructions
+ *
+ *  `metricProvider` (optional)
+ *    this attribute contains additional machine config
+ *
+ *  Example:
+ *    exporterTests.<exporterName> = {
+ *      exporterConfig = {
+ *        enable = true;
+ *      };
+ *      metricProvider = {
+ *        services.<metricProvider>.enable = true;
+ *      };
+ *      exporterTest = ''
+ *        waitForUnit("prometheus-<exporterName>-exporter.service");
+ *        waitForOpenPort("1234");
+ *        succeed("curl -sSf 'localhost:1234/metrics'");
+ *      '';
+ *    };
+ *
+ *  # this would generate the following test config:
+ *
+ *    nodes.<exporterName> = {
+ *      services.prometheus.<exporterName> = {
+ *        enable = true;
+ *      };
+ *      services.<metricProvider>.enable = true;
+ *    };
+ *
+ *    testScript = ''
+ *      $<exporterName>->start();
+ *      $<exporterName>->waitForUnit("prometheus-<exporterName>-exporter.service");
+ *      $<exporterName>->waitForOpenPort("1234");
+ *      $<exporterName>->succeed("curl -sSf 'localhost:1234/metrics'");
+ *      $<exporterName>->shutdown();
+ *    '';
+ */
+
+  exporterTests = {
+
+    blackbox = {
+      exporterConfig = {
+        enable = true;
+        configFile = pkgs.writeText "config.yml" (builtins.toJSON {
+          modules.icmp_v6 = {
+            prober = "icmp";
+            icmp.preferred_ip_protocol = "ip6";
+          };
+        });
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-blackbox-exporter.service");
+        waitForOpenPort(9115);
+        succeed("curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep -q 'probe_success 1'");
+      '';
+    };
+
+    collectd = {
+      exporterConfig = {
+        enable = true;
+        extraFlags = [ "--web.collectd-push-path /collectd" ];
+      };
+      exporterTest =let postData = escape' ''
+        [{
+          "values":[23],
+          "dstypes":["gauge"],
+          "type":"gauge",
+          "interval":1000,
+          "host":"testhost",
+          "plugin":"testplugin",
+          "time":$(date +%s)
+        }]
+        ''; in ''
+        waitForUnit("prometheus-collectd-exporter.service");
+        waitForOpenPort(9103);
+        succeed("curl -sSfH 'Content-Type: application/json' -X POST --data \"${postData}\" localhost:9103/collectd");
+        succeed("curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'");
+      '';
+    };
+
+    dnsmasq = {
+      exporterConfig = {
+        enable = true;
+        leasesPath = "/var/lib/dnsmasq/dnsmasq.leases";
+      };
+      metricProvider = {
+        services.dnsmasq.enable = true;
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-dnsmasq-exporter.service");
+        waitForOpenPort(9153);
+        succeed("curl -sSf http://localhost:9153/metrics | grep -q 'dnsmasq_leases 0'");
+      '';
+    };
+
+    dovecot = {
+      exporterConfig = {
+        enable = true;
+        scopes = [ "global" ];
+        socketPath = "/var/run/dovecot2/old-stats";
+        user = "root"; # <- don't use user root in production
+      };
+      metricProvider = {
+        services.dovecot2.enable = true;
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-dovecot-exporter.service");
+        waitForOpenPort(9166);
+        succeed("curl -sSf http://localhost:9166/metrics | grep -q 'dovecot_up{scope=\"global\"} 1'");
+      '';
+    };
+
+    fritzbox = { # TODO add proper test case
+      exporterConfig = {
+        enable = true;
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-fritzbox-exporter.service");
+        waitForOpenPort(9133);
+        succeed("curl -sSf http://localhost:9133/metrics | grep -q 'fritzbox_exporter_collect_errors 0'");
+      '';
+    };
+
+    json = {
+      exporterConfig = {
+        enable = true;
+        url = "http://localhost";
+        configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON [{
+          name = "json_test_metric";
+          path = "$.test";
+        }]);
+      };
+      metricProvider = {
+        systemd.services.prometheus-json-exporter.after = [ "nginx.service" ];
+        services.nginx = {
+          enable = true;
+          virtualHosts.localhost.locations."/".extraConfig = ''
+            return 200 "{\"test\":1}";
+          '';
+        };
+      };
+      exporterTest = ''
+        waitForUnit("nginx.service");
+        waitForOpenPort(80);
+        waitForUnit("prometheus-json-exporter.service");
+        waitForOpenPort(7979);
+        succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'");
+      '';
+    };
+
+    nginx = {
+      exporterConfig = {
+        enable = true;
+      };
+      metricProvider = {
+        services.nginx = {
+          enable = true;
+          statusPage = true;
+          virtualHosts."/".extraConfig = "return 204;";
+        };
+      };
+      exporterTest = ''
+        waitForUnit("nginx.service")
+        waitForUnit("prometheus-nginx-exporter.service")
+        waitForOpenPort(9113)
+        succeed("curl -sSf http://localhost:9113/metrics | grep -q 'nginx_up 1'")
+      '';
+    };
+
+    node = {
+      exporterConfig = {
+        enable = true;
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-node-exporter.service");
+        waitForOpenPort(9100);
+        succeed("curl -sSf http://localhost:9100/metrics | grep -q 'node_exporter_build_info{.\\+} 1'");
+      '';
+    };
+
+    postfix = {
+      exporterConfig = {
+        enable = true;
+      };
+      metricProvider = {
+        services.postfix.enable = true;
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-postfix-exporter.service");
+        waitForOpenPort(9154);
+        succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'");
+      '';
+    };
+
+    snmp = {
+      exporterConfig = {
+        enable = true;
+        configuration.default = {
+          version = 2;
+          auth.community = "public";
+        };
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-snmp-exporter.service");
+        waitForOpenPort(9116);
+        succeed("curl -sSf localhost:9116/metrics | grep -q 'snmp_request_errors_total 0'");
+      '';
+    };
+
+    surfboard = {
+      exporterConfig = {
+        enable = true;
+        modemAddress = "localhost";
+      };
+      metricProvider = {
+        systemd.services.prometheus-surfboard-exporter.after = [ "nginx.service" ];
+        services.nginx = {
+          enable = true;
+          virtualHosts.localhost.locations."/cgi-bin/status".extraConfig = ''
+            return 204;
+          '';
+        };
+      };
+      exporterTest = ''
+        waitForUnit("nginx.service");
+        waitForOpenPort(80);
+        waitForUnit("prometheus-surfboard-exporter.service");
+        waitForOpenPort(9239);
+        succeed("curl -sSf localhost:9239/metrics | grep -q 'surfboard_up 1'");
+      '';
+    };
+
+    varnish = {
+      exporterConfig = {
+        enable = true;
+        instance = "/var/spool/varnish/varnish";
+        group = "varnish";
+      };
+      metricProvider = {
+        systemd.services.prometheus-varnish-exporter.after = [
+          "varnish.service"
+        ];
+        services.varnish = {
+          enable = true;
+          config = ''
+            vcl 4.0;
+            backend default {
+              .host = "127.0.0.1";
+              .port = "80";
+            }
+          '';
+        };
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-varnish-exporter.service");
+        waitForOpenPort(9131);
+        succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'");
+      '';
+    };
+  };
+
+  nodes = lib.mapAttrs (exporter: testConfig: lib.mkMerge [{
+    services.prometheus.exporters.${exporter} = testConfig.exporterConfig;
+  } testConfig.metricProvider or {}]) exporterTests;
+
+  testScript = lib.concatStrings (lib.mapAttrsToList (exporter: testConfig: (''
+    subtest "${exporter}", sub {
+      ${"$"+exporter}->start();
+      ${lib.concatStringsSep "  " (map (line: ''
+        ${"$"+exporter}->${line};
+      '') (lib.splitString "\n" (lib.removeSuffix "\n" testConfig.exporterTest)))}
+      ${"$"+exporter}->shutdown();
+    };
+  '')) exporterTests);
+in
+{
+  name = "prometheus-exporters";
+
+  inherit nodes testScript;
+
+  meta = with lib.maintainers; {
+    maintainers = [ willibutz ];
+  };
+})

From ee56a8bba52366a3f3572eeba3e7dc2e2242fe6e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 8 Oct 2018 10:33:36 -0500
Subject: [PATCH 2594/3253] gnuplot: 5.2.4 -> 5.2.5

http://www.gnuplot.info/ReleaseNotes_5_2_5.html
---
 pkgs/tools/graphics/gnuplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index f2be9fafc605..8de7ca3262cf 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -19,11 +19,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.2.4";
+  name = "gnuplot-5.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m";
+    sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;

From 9cc18fa7f969e7671a34cf85e6296be9e9823f63 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 8 Oct 2018 18:02:13 +0200
Subject: [PATCH 2595/3253] debian vm tools: use snapshot.debian.org

snapshot.debian.org actually keeps track of all of the updates as they
come in rather than doing arbitrary (?) snapshots.
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 03b3fb1f9f27..7880d98e6b6a 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -990,7 +990,7 @@ rec {
       name = "debian-9.4-stretch-i386";
       fullName = "Debian 9.4 Stretch (i386)";
       packagesList = fetchurl {
-        url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz;
+        url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-i386/Packages.xz;
         sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
       };
       urlPrefix = mirror://debian;
@@ -1001,7 +1001,7 @@ rec {
       name = "debian-9.4-stretch-amd64";
       fullName = "Debian 9.4 Stretch (amd64)";
       packagesList = fetchurl {
-        url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz;
+        url = http://snapshot.debian.org/archive/debian/20180912T154744Z/dists/stretch/main/binary-amd64/Packages.xz;
         sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
       };
       urlPrefix = mirror://debian;

From 7b9c4954f2edc116a8052be28674c22a4c40adcf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 18:05:27 +0200
Subject: [PATCH 2596/3253] git: Strip libsecret

This reduces gitFull's closure size from 412 MiB to 271 MiB.
---
 .../version-management/git-and-tools/git/default.nix            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 368e2b68d0d1..b946d0b7daaf 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -303,6 +303,8 @@ EOF
     disable_test t0028-working-tree-encoding
   '';
 
+  stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ];
+
 
   meta = {
     homepage = https://git-scm.com/;

From 8abfa4084b5e9b81710e2a0a0d40c08a1531f4e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 17:28:45 +0200
Subject: [PATCH 2597/3253] geeqie: Reduce closure size

This reduces the closure size from 568 MiB to 289 MiB.
---
 pkgs/development/libraries/clutter-gtk/default.nix  | 2 ++
 pkgs/development/libraries/clutter/default.nix      | 2 ++
 pkgs/development/libraries/cogl/default.nix         | 2 ++
 pkgs/development/libraries/libchamplain/default.nix | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index afeb7064ffea..6c8951165313 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
   };
 
+  outputs = [ "out" "dev" ];
+
   propagatedBuildInputs = [ clutter gtk3 ];
   nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
 
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 97db6880c5f0..090f85554b66 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 3f81c39a9b22..f35335e4be7b 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -31,6 +31,8 @@ in stdenv.mkDerivation rec {
     })
   ];
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig libintl ];
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 677910328458..95b1ad074b05 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
   };
 
+  outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];

From 467bec34bb24d59c1178247935d92ac3195bac78 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 7 Oct 2018 20:08:03 -0400
Subject: [PATCH 2598/3253] nixos/doc: Actually fix partitioning instructions.

The previous tentative to the fix got the order mixed up a bit. This
new fix has been re-verified to get them in the good order as per the
instructions in the following chapters.
---
 nixos/doc/manual/installation/installing.xml | 54 ++++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 2b68def95b70..8e94f946c5ee 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -115,10 +115,17 @@
      </listitem>
      <listitem>
       <para>
-       Add a <emphasis>swap</emphasis> partition. The size required will vary
-       according to needs, here a 8GiB one is created. The space left in front
-       (512MiB) will be used by the boot partition.
-<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB</screen>
+       Add the <emphasis>root</emphasis> partition. This will fill the disk
+       except for the end part, where the swap will live, and the space left in
+       front (512MiB) which will be used by the boot partition.
+<screen language="commands"># parted /dev/sda -- mkpart primary 512MiB -8GiB</screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Next, add a <emphasis>swap</emphasis> partition. The size required will
+       vary according to needs, here a 8GiB one is created.
+<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
          The swap partition size rules are no different than for other Linux
@@ -127,20 +134,13 @@
        </note>
       </para>
      </listitem>
-     <listitem>
-      <para>
-       Next, add the <emphasis>root</emphasis> partition. This will fill the
-       remainder ending part of the disk.
-<screen language="commands"># parted /dev/sda -- mkpart primary 8.5GiB -1MiB</screen>
-      </para>
-     </listitem>
      <listitem>
       <para>
        Finally, the <emphasis>boot</emphasis> partition. NixOS by default uses
        the ESP (EFI system partition) as its <emphasis>/boot</emphasis>
        partition. It uses the initially reserved 512MiB at the start of the
        disk.
-<screen language="commands"># parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+<screen language="commands"># parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
 # parted /dev/sda -- set 3 boot on</screen>
       </para>
      </listitem>
@@ -177,9 +177,16 @@
      </listitem>
      <listitem>
       <para>
-       Add a <emphasis>swap</emphasis> partition. The size required will vary
-       according to needs, here a 8GiB one is created.
-<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap 1M 8GiB</screen>
+       Add the <emphasis>root</emphasis> partition. This will fill the the disk
+       except for the end part, where the swap will live.
+<screen language="commands"># parted /dev/sda -- mkpart primary 1MiB -8GiB</screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Finally, add a <emphasis>swap</emphasis> partition. The size required
+       will vary according to needs, here a 8GiB one is created.
+<screen language="commands"># parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
        <note>
         <para>
          The swap partition size rules are no different than for other Linux
@@ -188,13 +195,6 @@
        </note>
       </para>
      </listitem>
-     <listitem>
-      <para>
-       Finally, add the <emphasis>root</emphasis> partition. This will fill the
-       remainder of the disk.
-<screen language="commands"># parted /dev/sda -- mkpart primary 8GiB -1s</screen>
-      </para>
-     </listitem>
     </orderedlist>
    </para>
 
@@ -486,17 +486,17 @@ $ nix-env -i w3m</screen>
    <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)</title>
 <screen language="commands">
 # parted /dev/sda -- mklabel msdos
-# parted /dev/sda -- mkpart primary linux-swap 1M 8GiB
-# parted /dev/sda -- mkpart primary 8GiB -1s</screen>
+# parted /dev/sda -- mkpart primary 1MiB -8GiB
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%</screen>
   </example>
 
   <example xml:id="ex-partition-scheme-UEFI">
    <title>Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)</title>
 <screen language="commands">
 # parted /dev/sda -- mklabel gpt
-# parted /dev/sda -- mkpart primary linux-swap 512MiB 8.5GiB
-# parted /dev/sda -- mkpart primary 8.5GiB -1MiB
-# parted /dev/sda -- mkpart ESP fat32 1M 512MiB
+# parted /dev/sda -- mkpart primary 512MiB -8GiB
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
+# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
 # parted /dev/sda -- set 3 boot on</screen>
   </example>
 

From 6ec4ebf6f87fdfc221103f41a0353aa7c0a21684 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Oct 2018 11:25:23 +0200
Subject: [PATCH 2599/3253] LTS Haskell 12.12

---
 .../configuration-hackage2nix.yaml            | 105 +++++++++---------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index aee9b8df8fa3..f68270ba772e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -45,7 +45,7 @@ default-package-overrides:
   - base-compat-batteries ==0.10.1
   # Newer versions don't work in LTS-12.x
   - cassava-megaparsec < 2
-  # LTS Haskell 12.11
+  # LTS Haskell 12.12
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -80,6 +80,7 @@ default-package-overrides:
   - alex ==3.2.4
   - alg ==0.2.7.0
   - algebra ==4.3.1
+  - algebraic-graphs ==0.2
   - Allure ==0.8.3.0
   - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
@@ -187,7 +188,7 @@ default-package-overrides:
   - apply-refact ==0.5.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.1
-  - app-settings ==0.2.0.11
+  - app-settings ==0.2.0.12
   - arithmoi ==0.7.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
@@ -219,12 +220,12 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.11
+  - autoexporter ==1.1.13
   - auto-update ==0.1.4
   - avro ==0.3.5.1
   - avwx ==0.3.0.2
   - backprop ==0.2.5.0
-  - bank-holidays-england ==0.1.0.7
+  - bank-holidays-england ==0.1.0.8
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
@@ -314,7 +315,7 @@ default-package-overrides:
   - btrfs ==0.1.2.3
   - buffer-builder ==0.2.4.6
   - buffer-pipe ==0.0
-  - butcher ==1.3.1.1
+  - butcher ==1.3.2.0
   - butter ==0.1.0.6
   - bv ==0.5
   - bv-little ==0.1.2
@@ -399,7 +400,7 @@ default-package-overrides:
   - clock ==0.7.2
   - clock-extras ==0.1.0.2
   - closed ==0.2.0
-  - clr-host ==0.2.0.1
+  - clr-host ==0.2.1.0
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
   - ClustalParser ==1.2.3
@@ -460,7 +461,7 @@ default-package-overrides:
   - contravariant ==1.4.1
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
-  - control-monad-free ==0.6.1
+  - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.1
   - convertible ==1.1.1.0
   - cookie ==0.4.4
@@ -568,7 +569,7 @@ default-package-overrides:
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
   - deriving-compat ==0.5.2
-  - derulo ==1.0.3
+  - derulo ==1.0.5
   - detour-via-sci ==1.0.0
   - df1 ==0.1.1
   - dhall ==1.15.1
@@ -616,7 +617,7 @@ default-package-overrides:
   - doctemplates ==0.2.2.1
   - doctest ==0.16.0.1
   - doctest-discover ==0.1.0.9
-  - doctest-driver-gen ==0.2.0.3
+  - doctest-driver-gen ==0.2.0.4
   - do-list ==1.0.1
   - dom-parser ==3.1.0
   - dotenv ==0.5.2.5
@@ -729,8 +730,8 @@ default-package-overrides:
   - fileplow ==0.1.0.0
   - filter-logger ==0.6.0.0
   - filtrable ==0.1.1.0
-  - fin ==0.0.1
   - Fin ==0.2.6.0
+  - fin ==0.0.1
   - FindBin ==0.0.5
   - find-clumpiness ==0.2.3.1
   - fingertree ==0.1.4.1
@@ -746,16 +747,16 @@ default-package-overrides:
   - flay ==0.4
   - flexible-defaults ==0.0.2
   - floatshow ==0.2.4
-  - flow ==1.0.15
+  - flow ==1.0.17
   - fmlist ==0.9.2
   - fn ==0.3.0.2
   - focus ==0.1.5.2
   - foldable1 ==0.1.0.0
   - fold-debounce ==0.2.0.8
-  - fold-debounce-conduit ==0.2.0.2
-  - foldl ==1.4.4
+  - fold-debounce-conduit ==0.2.0.3
+  - foldl ==1.4.5
   - folds ==0.7.4
-  - FontyFruity ==0.5.3.3
+  - FontyFruity ==0.5.3.4
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
   - ForestStructures ==0.0.0.2
@@ -802,15 +803,15 @@ default-package-overrides:
   - genvalidity ==0.5.1.0
   - genvalidity-aeson ==0.2.0.2
   - genvalidity-bytestring ==0.2.0.2
-  - genvalidity-containers ==0.5.0.0
-  - genvalidity-hspec ==0.6.1.1
+  - genvalidity-containers ==0.5.1.0
+  - genvalidity-hspec ==0.6.2.0
   - genvalidity-hspec-aeson ==0.3.0.0
   - genvalidity-hspec-binary ==0.2.0.2
   - genvalidity-hspec-cereal ==0.2.0.2
   - genvalidity-hspec-hashable ==0.2.0.2
   - genvalidity-path ==0.3.0.2
-  - genvalidity-property ==0.2.1.0
-  - genvalidity-scientific ==0.2.0.1
+  - genvalidity-property ==0.2.1.1
+  - genvalidity-scientific ==0.2.1.0
   - genvalidity-text ==0.5.1.0
   - genvalidity-time ==0.2.1.0
   - genvalidity-unordered-containers ==0.2.0.3
@@ -874,9 +875,9 @@ default-package-overrides:
   - graph-wrapper ==0.2.5.1
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
-  - greskell ==0.2.1.0
-  - greskell-core ==0.1.2.3
-  - greskell-websocket ==0.1.1.1
+  - greskell ==0.2.1.1
+  - greskell-core ==0.1.2.4
+  - greskell-websocket ==0.1.1.2
   - groom ==0.1.2.1
   - groups ==0.4.1.0
   - gtk ==0.14.10
@@ -962,11 +963,11 @@ default-package-overrides:
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
   - hierarchy ==1.0.2
-  - higher-leveldb ==0.5.0.1
+  - higher-leveldb ==0.5.0.2
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.10
   - hint ==0.8.0
-  - histogram-fill ==0.9.0.0
+  - histogram-fill ==0.9.1.0
   - hjsmin ==0.2.0.2
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.7.0
@@ -980,7 +981,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - Hoed ==0.5.1
   - hoopl ==3.10.2.2
-  - hOpenPGP ==2.7.2
+  - hOpenPGP ==2.7.3
   - hopenpgp-tools ==0.21.2
   - hopfli ==0.2.2.1
   - hostname ==1.0
@@ -1004,7 +1005,7 @@ default-package-overrides:
   - hsemail ==2
   - HSet ==0.0.1
   - hset ==2.2.0
-  - hsexif ==0.6.1.5
+  - hsexif ==0.6.1.6
   - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
@@ -1058,7 +1059,7 @@ default-package-overrides:
   - http-date ==0.0.8
   - httpd-shed ==0.4.0.3
   - http-link-header ==1.0.3.1
-  - http-media ==0.7.1.2
+  - http-media ==0.7.1.3
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.6.1
   - http-types ==0.12.2
@@ -1070,7 +1071,7 @@ default-package-overrides:
   - hvega ==0.1.0.3
   - hw-balancedparens ==0.2.0.2
   - hw-bits ==0.7.0.3
-  - hw-conduit ==0.2.0.3
+  - hw-conduit ==0.2.0.5
   - hw-diagnostics ==0.0.0.5
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.2
@@ -1117,10 +1118,10 @@ default-package-overrides:
   - immortal ==0.3
   - include-file ==0.1.0.3
   - incremental-parser ==0.3.1.1
-  - indentation-core ==0.0.0.1
-  - indentation-parsec ==0.0.0.1
+  - indentation-core ==0.0.0.2
+  - indentation-parsec ==0.0.0.2
   - indents ==0.5.0.0
-  - indexed-list-literals ==0.2.1.1
+  - indexed-list-literals ==0.2.1.2
   - inflections ==0.4.0.3
   - influxdb ==1.6.0.9
   - ini ==0.3.6
@@ -1153,7 +1154,7 @@ default-package-overrides:
   - ip ==1.3.0
   - ip6addr ==1.0.0
   - iproute ==1.7.5
-  - IPv6Addr ==1.1.0
+  - IPv6Addr ==1.1.1
   - IPv6DB ==0.3.1
   - ipython-kernel ==0.9.1.0
   - irc ==0.6.1.0
@@ -1166,7 +1167,7 @@ default-package-overrides:
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
   - iterable ==3.0
-  - ixset-typed ==0.4
+  - ixset-typed ==0.4.0.1
   - ix-shapable ==0.1.0
   - jack ==0.7.1.4
   - jmacro ==0.6.15
@@ -1273,7 +1274,7 @@ default-package-overrides:
   - log-domain ==0.12
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.3.2
+  - logging-effect ==1.3.3
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
   - logict ==0.6.0.2
@@ -1318,7 +1319,7 @@ default-package-overrides:
   - med-module ==0.1.1
   - megaparsec ==6.5.0
   - mega-sdist ==0.3.3.1
-  - memory ==0.14.16
+  - memory ==0.14.18
   - MemoTrie ==0.6.9
   - mercury-api ==0.1.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1329,7 +1330,7 @@ default-package-overrides:
   - microformats2-parser ==1.0.1.9
   - microlens ==0.4.9.1
   - microlens-aeson ==2.3.0
-  - microlens-contra ==0.1.0.1
+  - microlens-contra ==0.1.0.2
   - microlens-ghc ==0.4.9.1
   - microlens-mtl ==0.1.11.1
   - microlens-platform ==0.3.10
@@ -1392,7 +1393,7 @@ default-package-overrides:
   - mongoDB ==2.4.0.0
   - monoidal-containers ==0.3.1.0
   - monoid-extras ==0.5
-  - monoid-subclasses ==0.4.6
+  - monoid-subclasses ==0.4.6.1
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.9.0
   - mono-traversable-instances ==0.1.0.0
@@ -1405,9 +1406,9 @@ default-package-overrides:
   - multiarg ==0.30.0.10
   - multimap ==1.2.1
   - multipart ==0.1.3
-  - multistate ==0.8.0.0
+  - multistate ==0.8.0.1
   - murmur-hash ==0.1.0.9
-  - MusicBrainz ==0.4
+  - MusicBrainz ==0.4.1
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
   - mwc-probability ==2.0.4
@@ -1476,12 +1477,12 @@ default-package-overrides:
   - numhask-test ==0.1.0.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.2
-  - nvim-hs ==1.0.0.2
+  - nvim-hs ==1.0.0.3
   - nvim-hs-contrib ==1.0.0.0
   - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
-  - o-clock ==1.0.0
+  - o-clock ==1.0.0.1
   - odbc ==0.2.2
   - oeis ==0.3.9
   - ofx ==0.4.2.0
@@ -1509,7 +1510,7 @@ default-package-overrides:
   - opml-conduit ==0.6.0.4
   - optional-args ==1.0.2
   - options ==1.2.1.1
-  - optparse-applicative ==0.14.2.0
+  - optparse-applicative ==0.14.3.0
   - optparse-generic ==1.3.0
   - optparse-simple ==0.1.0
   - optparse-text ==0.1.1.0
@@ -1737,12 +1738,13 @@ default-package-overrides:
   - relational-schemas ==0.1.6.2
   - relude ==0.1.1
   - renderable ==0.2.0.1
-  - repa ==3.4.1.3
+  - repa ==3.4.1.4
   - repline ==0.1.7.0
   - req ==1.1.0
   - req-conduit ==1.0.0
   - require ==0.2.1
   - req-url-extra ==0.1.0.0
+  - reroute ==0.5.0.0
   - resolv ==0.1.1.1
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.1
@@ -1774,7 +1776,7 @@ default-package-overrides:
   - safe-money ==0.6
   - SafeSemaphore ==0.10.1
   - saltine ==0.1.0.1
-  - salve ==1.0.4
+  - salve ==1.0.6
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
@@ -1913,6 +1915,8 @@ default-package-overrides:
   - splice ==0.6.1.1
   - split ==0.2.3.3
   - splitmix ==0.0.1
+  - Spock ==0.13.0.0
+  - Spock-core ==0.13.0.0
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
   - sqlite-simple ==0.4.16.0
@@ -1950,7 +1954,7 @@ default-package-overrides:
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.24.4
-  - streaming ==0.2.1.0
+  - streaming ==0.2.2.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
   - streaming-commons ==0.2.1.0
@@ -1972,7 +1976,6 @@ default-package-overrides:
   - strive ==5.0.6
   - structs ==0.1.1
   - stylish-haskell ==0.9.2.0
-  - summoner ==1.0.6
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
@@ -2119,7 +2122,7 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.11
+  - turtle ==1.5.12
   - TypeCompose ==0.9.13
   - typed-process ==0.2.3.0
   - type-fun ==0.1.1
@@ -2127,7 +2130,7 @@ default-package-overrides:
   - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
-  - typelits-witnesses ==0.3.0.2
+  - typelits-witnesses ==0.3.0.3
   - typenums ==0.1.2
   - type-of-html ==1.4.0.1
   - type-of-html-static ==0.1.0.2
@@ -2201,7 +2204,7 @@ default-package-overrides:
   - vec ==0.1
   - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.4
-  - vector-binary-instances ==0.2.4
+  - vector-binary-instances ==0.2.5
   - vector-buffer ==0.4.1
   - vector-builder ==0.3.6
   - vector-bytes-instances ==0.1.1
@@ -2264,8 +2267,8 @@ default-package-overrides:
   - weigh ==0.0.12
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.2.2
-  - wild-bind-x11 ==0.2.0.5
+  - wild-bind ==0.1.2.3
+  - wild-bind-x11 ==0.2.0.6
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
@@ -2333,7 +2336,7 @@ default-package-overrides:
   - yesod ==1.6.0
   - yesod-alerts ==0.1.2.0
   - yesod-auth ==1.6.4.1
-  - yesod-auth-fb ==1.9.0
+  - yesod-auth-fb ==1.9.1
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
   - yesod-core ==1.6.6

From 478eff0225383d88b4f30b583f81377c2bbb64a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Oct 2018 02:31:17 +0200
Subject: [PATCH 2600/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/23ec1f32c66bdb679d0f5b8c6e8727611bff6629.
---
 .../haskell-modules/hackage-packages.nix      | 1700 ++++++++++-------
 1 file changed, 975 insertions(+), 725 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b160174cf5eb..352d97d497ab 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5575,22 +5575,6 @@ self: {
      }) {};
 
   "FontyFruity" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, filepath, text, vector, xml
-     }:
-     mkDerivation {
-       pname = "FontyFruity";
-       version = "0.5.3.3";
-       sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq directory filepath text
-         vector xml
-       ];
-       description = "A true type file format loader";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "FontyFruity_0_5_3_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, text, vector, xml
      }:
@@ -5604,7 +5588,6 @@ self: {
        ];
        description = "A true type file format loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ForSyDe" = callPackage
@@ -5820,8 +5803,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.5.0";
-       sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl";
+       version = "0.6.0";
+       sha256 = "0ri1x80za9gjcv44xk9kgx5w5jczr2p26jlpwhmn1sgmjdyc2m02";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5865,6 +5848,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Frames-dsv" = callPackage
+    ({ mkDerivation, base, bytestring, Frames, hspec, hw-dsv, pipes
+     , template-haskell, text, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames-dsv";
+       version = "0.1.1";
+       sha256 = "0932k8aqn9c08ijbs29g04gcka441gg424g90cqd4ky9b3yxzm7w";
+       libraryHaskellDepends = [
+         base bytestring Frames hw-dsv pipes template-haskell text vector
+         vinyl
+       ];
+       testHaskellDepends = [ base Frames hspec pipes ];
+       description = "Alternative CSV parser for the Frames package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -10205,8 +10205,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6Addr";
-       version = "1.1.0";
-       sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29";
+       version = "1.1.1";
+       sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v";
        libraryHaskellDepends = [
          aeson attoparsec base iproute network network-info random text
        ];
@@ -10754,8 +10754,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.2";
        sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
-       revision = "1";
-       editedCabalFile = "1snx05qpllybd9yvy03p0lpnmimj0m24x1bxa4svxcsiv56yv9w8";
+       revision = "2";
+       editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -12723,8 +12723,8 @@ self: {
      }:
      mkDerivation {
        pname = "MusicBrainz";
-       version = "0.4";
-       sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr";
+       version = "0.4.1";
+       sha256 = "0mydq3bjf15ksfrh4lf947ka43i3978q58y2aij3aqd763v2jb16";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra HTTP http-conduit
          http-types monad-control resourcet text time time-locale-compat
@@ -19976,8 +19976,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate";
-       version = "1.2.0.0";
-       sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj";
+       version = "1.2.0.1";
+       sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base base-orphans bytestring
@@ -20272,6 +20272,8 @@ self: {
        pname = "accelerate-io";
        version = "1.2.0.0";
        sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf";
+       revision = "1";
+       editedCabalFile = "0n1bch7rb2pvfqajjzaxrlw06f7vr583ckvn2ldr6lv59w1jrk3l";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring primitive repa vector
        ];
@@ -21031,6 +21033,8 @@ self: {
        pname = "acme-stringly-typed";
        version = "1.0.0.0";
        sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f";
+       revision = "1";
+       editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23";
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -26999,8 +27003,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "6.0.3";
-       sha256 = "0w50dw9fig4fhk40fjgj1hggs1jbw0yhdrzinmwr2a8lg3nxx5z6";
+       version = "6.1.1";
+       sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27016,8 +27020,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "6.0.3";
-       sha256 = "001qywhyk013148g4cjw5xkr6b006zvn9f18m98mj5wg6wm1yxzc";
+       version = "6.1.1";
+       sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27032,8 +27036,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "6.0.3";
-       sha256 = "1zrp7dp86vgcj215ykwagjwpqnz137qbi1czhasxq3bby6rmkvca";
+       version = "6.1.1";
+       sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring generic-lens http-client
          lens monad-logger mtl resourcet transformers unliftio-core
@@ -27053,8 +27057,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "6.0.3";
-       sha256 = "1s4x1y88zzac8i5p2yg28q91lknh4cxm72fsxqbpdwq43p1iynb0";
+       version = "6.1.1";
+       sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -27074,8 +27078,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "6.0.3";
-       sha256 = "1mvg36wbj5knqrzmrvh9pn7aw1a22pcv1j8dafvg9qzm6wkr2liw";
+       version = "6.1.1";
+       sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
          base generic-lens lens lens-aeson monad-loops network-uri text
@@ -27091,24 +27095,26 @@ self: {
      }) {};
 
   "antiope-s3" = callPackage
-    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
-     , bytestring, conduit, conduit-extra, exceptions, generic-lens
-     , http-types, lens, monad-logger, network-uri, resourcet, text
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core
+     , base, bytestring, conduit, conduit-extra, exceptions
+     , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog
+     , lens, monad-logger, mtl, network-uri, resourcet, text
      , unliftio-core
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "6.0.3";
-       sha256 = "17ffjl3myk0575cds8z49rv9nkc72yvx37ka5l4r43p8faj82q2m";
+       version = "6.1.1";
+       sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7";
        libraryHaskellDepends = [
-         amazonka amazonka-core amazonka-s3 base bytestring conduit
-         conduit-extra exceptions generic-lens http-types lens monad-logger
-         network-uri resourcet text unliftio-core
+         amazonka amazonka-core amazonka-s3 antiope-core base bytestring
+         conduit conduit-extra exceptions generic-lens http-types lens
+         monad-logger mtl network-uri resourcet text unliftio-core
        ];
        testHaskellDepends = [
-         amazonka amazonka-core amazonka-s3 base bytestring conduit
-         conduit-extra exceptions generic-lens http-types lens monad-logger
-         network-uri resourcet text unliftio-core
+         amazonka amazonka-core amazonka-s3 antiope-core base bytestring
+         conduit conduit-extra exceptions generic-lens hedgehog hspec
+         http-types hw-hspec-hedgehog lens monad-logger mtl network-uri
+         resourcet text unliftio-core
        ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27120,8 +27126,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "6.0.3";
-       sha256 = "1zxwhlaypk0pykrg39zi1zlz7zs0dha4ri3b6cb0qdbprcwbfvvx";
+       version = "6.1.1";
+       sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base generic-lens lens
          text unliftio-core
@@ -27141,8 +27147,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "6.0.3";
-       sha256 = "0clljlvbz6irxpfjrzhc541991r9spsw8aj5mblb666llc34nbax";
+       version = "6.1.1";
+       sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
          antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27843,24 +27849,6 @@ self: {
      }) {};
 
   "app-settings" = callPackage
-    ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
-     , parsec, text
-     }:
-     mkDerivation {
-       pname = "app-settings";
-       version = "0.2.0.11";
-       sha256 = "1cahrpf42g5ids4k6hlzys1kmbgy1ypgax9ljckwymafradcc53a";
-       libraryHaskellDepends = [
-         base containers directory mtl parsec text
-       ];
-       testHaskellDepends = [
-         base containers directory hspec HUnit mtl parsec text
-       ];
-       description = "A library to manage application settings (INI file-like)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "app-settings_0_2_0_12" = callPackage
     ({ mkDerivation, base, containers, directory, hspec, HUnit, mtl
      , parsec, text
      }:
@@ -27876,7 +27864,6 @@ self: {
        ];
        description = "A library to manage application settings (INI file-like)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "appar" = callPackage
@@ -31031,8 +31018,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.1.11";
-       sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn";
+       version = "1.1.13";
+       sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -31207,8 +31194,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "25";
-       editedCabalFile = "11igp1sw7snsjcrw865rrcp1k14828yj5z9q9kdmn09f0hdl57rb";
+       revision = "28";
+       editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -32682,18 +32669,6 @@ self: {
      }) {};
 
   "bank-holidays-england" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
-     mkDerivation {
-       pname = "bank-holidays-england";
-       version = "0.1.0.7";
-       sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks";
-       libraryHaskellDepends = [ base containers time ];
-       testHaskellDepends = [ base containers hspec QuickCheck time ];
-       description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bank-holidays-england_0_1_0_8" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
@@ -32703,7 +32678,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "banwords" = callPackage
@@ -39635,6 +39609,8 @@ self: {
        pname = "btrfs";
        version = "0.1.2.3";
        sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y";
+       revision = "1";
+       editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
@@ -40149,10 +40125,10 @@ self: {
      }:
      mkDerivation {
        pname = "butcher";
-       version = "1.3.1.1";
-       sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z";
-       revision = "2";
-       editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m";
+       version = "1.3.2.0";
+       sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc";
+       revision = "1";
+       editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
@@ -40165,6 +40141,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "butcher_1_3_2_1" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, deque, extra, free
+     , hspec, microlens, microlens-th, mtl, multistate, pretty
+     , transformers, unsafe, void
+     }:
+     mkDerivation {
+       pname = "butcher";
+       version = "1.3.2.1";
+       sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda";
+       libraryHaskellDepends = [
+         base bifunctors containers deque extra free microlens microlens-th
+         mtl multistate pretty transformers unsafe void
+       ];
+       testHaskellDepends = [
+         base containers deque extra free hspec microlens microlens-th mtl
+         multistate pretty transformers unsafe
+       ];
+       description = "Chops a command or program invocation into digestable pieces";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "butter" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , forkable-monad, free, HUnit, network-simple, stm
@@ -46847,6 +46845,8 @@ self: {
        pname = "classy-prelude";
        version = "1.4.0";
        sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb";
+       revision = "1";
+       editedCabalFile = "1gf615lz0bfsn09vrjgj63d8zcpsmz1cgvdv8px3h0b4jrwdij6v";
        libraryHaskellDepends = [
          async base basic-prelude bifunctors bytestring chunked-data
          containers deepseq dlist ghc-prim hashable mono-traversable
@@ -47780,26 +47780,6 @@ self: {
      }) {};
 
   "clr-host" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory
-     , file-embed, filepath, glib, mono, text, transformers
-     }:
-     mkDerivation {
-       pname = "clr-host";
-       version = "0.2.0.1";
-       sha256 = "15hfdwddqij5dhl8qbq89rsbjvxpymvph8wz2naxa8mrd09yl1jk";
-       setupHaskellDepends = [
-         base Cabal directory filepath transformers
-       ];
-       libraryHaskellDepends = [
-         base bytestring clr-marshal file-embed text
-       ];
-       librarySystemDepends = [ glib mono ];
-       testHaskellDepends = [ base ];
-       description = "Hosting the Common Language Runtime";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
-
-  "clr-host_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, clr-marshal, directory
      , file-embed, filepath, glib, mono, text, transformers
      }:
@@ -47817,7 +47797,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Hosting the Common Language Runtime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "clr-inline" = callPackage
@@ -49159,6 +49138,8 @@ self: {
        pname = "colour-accelerate";
        version = "0.3.0.0";
        sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz";
+       revision = "1";
+       editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn";
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -50530,8 +50511,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.12.1";
-       sha256 = "1zjrv58fl4lkknmmih0dwi9ds241mxi42q3fxlpd8z5hlgq9pxpj";
+       version = "0.13.0";
+       sha256 = "1b03h65ww3cb0vxjrvj8y7bn30ci0fdbjcf8gxnmyy34npgz1ihw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52566,6 +52547,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "contiguous-fft" = callPackage
+    ({ mkDerivation, base, contiguous, prim-instances, primitive }:
+     mkDerivation {
+       pname = "contiguous-fft";
+       version = "0.1.0.1";
+       sha256 = "07nv27gj4shh22azf1nl1yr7xvzy4hzmp66yjsgxywj50850i6dq";
+       libraryHaskellDepends = [
+         base contiguous prim-instances primitive
+       ];
+       description = "dft of contiguous memory structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "continue" = callPackage
     ({ mkDerivation, base, bifunctors, monad-control, mtl
      , semigroupoids, transformers, transformers-base
@@ -52721,6 +52715,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "control-dsl" = callPackage
+    ({ mkDerivation, base, containers, doctest, doctest-discover
+     , temporary
+     }:
+     mkDerivation {
+       pname = "control-dsl";
+       version = "0.2.1.1";
+       sha256 = "0nfbipf26kkkjbxb9mqbjxqg99z3dfmpada28ajqjvz6n3mg4grg";
+       revision = "1";
+       editedCabalFile = "11rjly75f57a1818hjzy18pms51jicnzn99kx2mqzf7c7lygnsgg";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers doctest doctest-discover temporary
+       ];
+       description = "An alternative to monads for control flow DSLs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "control-event" = callPackage
     ({ mkDerivation, base, containers, stm, time }:
      mkDerivation {
@@ -52859,14 +52871,12 @@ self: {
      }) {};
 
   "control-monad-free" = callPackage
-    ({ mkDerivation, base, prelude-extras, transformers }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "control-monad-free";
-       version = "0.6.1";
-       sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
-       revision = "1";
-       editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh";
-       libraryHaskellDepends = [ base prelude-extras transformers ];
+       version = "0.6.2";
+       sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33";
+       libraryHaskellDepends = [ base transformers ];
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -54626,32 +54636,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "criterion_1_5_1_0" = callPackage
+  "criterion_1_5_2_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, bytestring, cassava, code-page
      , containers, criterion-measurement, deepseq, directory, exceptions
-     , fail, filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl
-     , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups
-     , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, transformers-compat, vector, vector-algorithms
+     , filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl
+     , mwc-random, optparse-applicative, parsec, QuickCheck, statistics
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , transformers-compat, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.5.1.0";
-       sha256 = "1ixmr1mjid3yds5lzhcrjmvvlpgsn579wns96x5n1rkba14srxcq";
+       version = "1.5.2.0";
+       sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base base-compat-batteries binary bytestring
          cassava code-page containers criterion-measurement deepseq
-         directory exceptions fail filepath Glob js-flot js-jquery
-         microstache mtl mwc-random optparse-applicative parsec semigroups
-         statistics text time transformers transformers-compat vector
-         vector-algorithms
+         directory exceptions filepath Glob js-flot js-jquery microstache
+         mtl mwc-random optparse-applicative parsec statistics text time
+         transformers transformers-compat vector vector-algorithms
        ];
        executableHaskellDepends = [
-         base base-compat-batteries optparse-applicative semigroups
+         base base-compat-batteries optparse-applicative
        ];
        testHaskellDepends = [
          aeson base base-compat base-compat-batteries bytestring deepseq
@@ -55860,6 +55869,8 @@ self: {
        pname = "css-syntax";
        version = "0.1.0.0";
        sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh";
+       revision = "1";
+       editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr";
        libraryHaskellDepends = [ base scientific text ];
        testHaskellDepends = [
          base directory hspec QuickCheck scientific text
@@ -56486,6 +56497,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cursor" = callPackage
+    ({ mkDerivation, base, containers, microlens, text, validity
+     , validity-containers, validity-text
+     }:
+     mkDerivation {
+       pname = "cursor";
+       version = "0.0.0.1";
+       sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr";
+       libraryHaskellDepends = [
+         base containers microlens text validity validity-containers
+         validity-text
+       ];
+       description = "Purely Functional Cursors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "cursor-gen" = callPackage
+    ({ mkDerivation, base, containers, cursor, genvalidity
+     , genvalidity-containers, genvalidity-hspec
+     , genvalidity-hspec-optics, genvalidity-text, hspec, microlens
+     , pretty-show, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cursor-gen";
+       version = "0.0.0.0";
+       sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52";
+       libraryHaskellDepends = [
+         base containers cursor genvalidity genvalidity-containers
+         genvalidity-text QuickCheck text
+       ];
+       testHaskellDepends = [
+         base containers cursor genvalidity-hspec genvalidity-hspec-optics
+         hspec microlens pretty-show QuickCheck text
+       ];
+       description = "Generators for Purely Functional Cursors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "curve25519" = callPackage
     ({ mkDerivation, base, bytestring, crypto-api, DRBG, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
@@ -56665,6 +56714,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "czipwith_1_0_1_1" = callPackage
+    ({ mkDerivation, base, template-haskell, transformers }:
+     mkDerivation {
+       pname = "czipwith";
+       version = "1.0.1.1";
+       sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base transformers ];
+       description = "CZipWith class and deriving via TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "d-bus" = callPackage
     ({ mkDerivation, async, attoparsec, base, binary, blaze-builder
      , bytestring, conduit, conduit-extra, containers
@@ -56696,6 +56758,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "d10" = callPackage
+    ({ mkDerivation, base, doctest, template-haskell }:
+     mkDerivation {
+       pname = "d10";
+       version = "0.1.0.0";
+       sha256 = "0ymhfarhsryqw0h6nksz9ki640b3xa1613k40hp85mk4rqir0zjq";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base doctest ];
+       description = "Digits 0-9";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "d3d11binding" = callPackage
     ({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler
      , d3dx11, d3dxof, dxgi, dxguid, vect, Win32
@@ -60469,18 +60543,22 @@ self: {
 
   "deferred-folds" = callPackage
     ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , primitive, transformers, unordered-containers, vector
+     , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.9.8";
-       sha256 = "0lrp0dzg6ihm1if2qq6i1dmrwfpnwvyr45yrc8ans0ar9jnrgrn3";
-       revision = "1";
-       editedCabalFile = "08pnfyy4vfwmvyma0h0jwil7p27y5bz9wzihy3kcc6283v9hkh52";
+       version = "0.9.9";
+       sha256 = "1hsfz93h6d4bzrllgmqr22ankl5pas3vlwg2yhbbcfpf35pdk9vd";
        libraryHaskellDepends = [
          base bytestring containers foldl hashable primitive transformers
          unordered-containers vector
        ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60857,16 +60935,21 @@ self: {
 
   "dense-int-set" = callPackage
     ({ mkDerivation, base, cereal, cereal-vector, deferred-folds
-     , hashable, vector, vector-algorithms
+     , hashable, QuickCheck, quickcheck-instances, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "dense-int-set";
-       version = "0.2";
-       sha256 = "02gfghbpgfcr8vnbahz9y025cb5cvh4ns5xwz9gavpbi8vbcbyv9";
+       version = "0.3";
+       sha256 = "04aww0ffsw1mfj7v3qhvfrbllqiwihyipis3zah0m4y47197x8gh";
        libraryHaskellDepends = [
          base cereal cereal-vector deferred-folds hashable vector
          vector-algorithms
        ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61064,6 +61147,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "deque_0_2_4" = callPackage
+    ({ mkDerivation, base, semigroups }:
+     mkDerivation {
+       pname = "deque";
+       version = "0.2.4";
+       sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9";
+       libraryHaskellDepends = [ base semigroups ];
+       description = "Double-ended queue";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dequeue" = callPackage
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck
      , safe
@@ -61318,8 +61413,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.3";
-       sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m";
+       version = "1.0.5";
+       sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -62229,8 +62324,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.1.1";
        sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
-       revision = "1";
-       editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25";
+       revision = "2";
+       editedCabalFile = "1lf7xcq42l4hjksgp1nhj7600shvw9q5a27bh729fyfphmvv3xkf";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -65416,8 +65511,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "doctest-driver-gen";
-       version = "0.2.0.3";
-       sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6";
+       version = "0.2.0.4";
+       sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base doctest ];
@@ -66568,8 +66663,8 @@ self: {
        pname = "dual-tree";
        version = "0.2.2";
        sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
-       revision = "1";
-       editedCabalFile = "1hkjhij3s2a82b0sd898511lr6iphk3myk1l0hpl42ai32sf606q";
+       revision = "2";
+       editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -71990,34 +72085,87 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exinst_0_7" = callPackage
+    ({ mkDerivation, base, binary, bytestring, constraints, deepseq
+     , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "exinst";
+       version = "0.7";
+       sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac";
+       libraryHaskellDepends = [
+         base binary constraints deepseq hashable profunctors QuickCheck
+         singletons
+       ];
+       testHaskellDepends = [
+         base binary bytestring constraints deepseq hashable profunctors
+         QuickCheck singletons tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Dependent pairs and their instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exinst-aeson" = callPackage
-    ({ mkDerivation, aeson, base, constraints, exinst, singletons }:
+    ({ mkDerivation, aeson, base, bytestring, constraints, exinst
+     , QuickCheck, singletons, tasty, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "exinst-aeson";
-       version = "0.2";
-       sha256 = "12qnc7kfr51gxnmyj71m82rh76phj207bd6fl8iwhwvzb5xhnnsr";
+       version = "0.7";
+       sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67";
        libraryHaskellDepends = [
          aeson base constraints exinst singletons
        ];
-       description = "Derive instances for the `aeson` library for your existential types";
+       testHaskellDepends = [
+         aeson base bytestring exinst QuickCheck tasty tasty-quickcheck
+       ];
+       description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-bytes" = callPackage
-    ({ mkDerivation, base, bytes, constraints, exinst, singletons }:
+    ({ mkDerivation, base, binary, bytes, bytestring, cereal
+     , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty
+     , tasty-quickcheck
+     }:
      mkDerivation {
        pname = "exinst-bytes";
-       version = "0.2";
-       sha256 = "0rxjfy3ljkmjnvsvif0wvcwhcgvz1yr5amj10ii08lr3vn6papnj";
+       version = "0.7";
+       sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r";
        libraryHaskellDepends = [
          base bytes constraints exinst singletons
        ];
-       description = "Derive instances for the `bytes` library for your existential types";
+       testHaskellDepends = [
+         base binary bytes bytestring cereal exinst exinst-cereal QuickCheck
+         tasty tasty-quickcheck
+       ];
+       description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exinst-cereal" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, constraints
+     , exinst, QuickCheck, singletons, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "exinst-cereal";
+       version = "0.7";
+       sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74";
+       libraryHaskellDepends = [
+         base cereal constraints exinst singletons
+       ];
+       testHaskellDepends = [
+         base binary bytestring cereal exinst QuickCheck tasty
+         tasty-quickcheck
+       ];
+       description = "Dependent pairs and their instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exinst-deepseq" = callPackage
     ({ mkDerivation, base, constraints, deepseq, exinst }:
      mkDerivation {
@@ -72044,6 +72192,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exinst-serialise" = callPackage
+    ({ mkDerivation, base, binary, constraints, exinst, QuickCheck
+     , serialise, singletons, tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "exinst-serialise";
+       version = "0.7";
+       sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588";
+       libraryHaskellDepends = [
+         base constraints exinst serialise singletons
+       ];
+       testHaskellDepends = [
+         base binary exinst QuickCheck serialise tasty tasty-quickcheck
+       ];
+       description = "Dependent pairs and their instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "existential" = callPackage
     ({ mkDerivation, base, cereal, constraints, control-invariants
      , lens, portable-template-haskell-lens, QuickCheck
@@ -72442,8 +72608,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.2";
-       sha256 = "1mqkz354w29fyc1sihr8bv10j6igcjhdn807ga9608r1lccgqf2d";
+       version = "0.4.2";
+       sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5";
        libraryHaskellDepends = [
          attoparsec base containers free lattices singletons text
          transformers
@@ -72459,8 +72625,8 @@ self: {
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.2";
-       sha256 = "17q4mjlh8dxs1al3mw6xm9maxhbmmqprckqnyq9mwqc5j6c26b84";
+       version = "0.4";
+       sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv";
        libraryHaskellDepends = [
          base containers expressions list-t singletons transformers z3
        ];
@@ -73162,8 +73328,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.1.1";
-       sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8";
+       version = "0.6.2.2";
+       sha256 = "0rdlsl1k6kp766nm85afilwcvkdbi40kvqi5iy9a1ldkdk277vlk";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [
          arithmoi base combinat-compat hspec QuickCheck
@@ -75711,8 +75877,8 @@ self: {
      }:
      mkDerivation {
        pname = "fixed-vector-binary";
-       version = "1.0.0.0";
-       sha256 = "1q3rjjgn16fa5d8cqrlaac2b29v3045am1aanyn77vi843xzah98";
+       version = "1.0.0.1";
+       sha256 = "10s0mc6xdx7n6dmdgpjysbqmk79ssfw9zmaz5j0spjy7dy55zq3m";
        libraryHaskellDepends = [ base binary fixed-vector ];
        testHaskellDepends = [
          base binary fixed-vector tasty tasty-quickcheck
@@ -75727,8 +75893,8 @@ self: {
      }:
      mkDerivation {
        pname = "fixed-vector-cborg";
-       version = "1.0.0.0";
-       sha256 = "0fmdl4vfg65709iw8s18hjayqhdx4zgn36l17z2x9xlh0prspkki";
+       version = "1.0.0.1";
+       sha256 = "0m5xcy99hydcs99yph6n63517h2asg611rgg0h28blqd1f7bfch8";
        libraryHaskellDepends = [ base cborg fixed-vector serialise ];
        testHaskellDepends = [
          base fixed-vector serialise tasty tasty-quickcheck
@@ -75743,8 +75909,8 @@ self: {
      }:
      mkDerivation {
        pname = "fixed-vector-cereal";
-       version = "1.0.0.0";
-       sha256 = "1vg44xjwf4ffq4jxiqzk5rphbkgys81lzm1nzjsrfr8s7hhn0clp";
+       version = "1.0.0.1";
+       sha256 = "15vg3kr7fkd6i0swm4lm76gkfdnh0ydl4nci5abj1zss8qcn9gam";
        libraryHaskellDepends = [ base cereal fixed-vector ];
        testHaskellDepends = [
          base cereal fixed-vector tasty tasty-quickcheck
@@ -76417,8 +76583,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
-       version = "1.0.15";
-       sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y";
+       version = "1.0.17";
+       sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Write more understandable Haskell";
@@ -76958,25 +77124,6 @@ self: {
      }) {};
 
   "fold-debounce-conduit" = callPackage
-    ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
-     , stm, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "fold-debounce-conduit";
-       version = "0.2.0.2";
-       sha256 = "18hxlcm0fixx4iiac26cdbkkqivg71qk3z50k71l9n3yashijjdc";
-       libraryHaskellDepends = [
-         base conduit fold-debounce resourcet stm transformers
-         transformers-base
-       ];
-       testHaskellDepends = [
-         base conduit hspec resourcet stm transformers
-       ];
-       description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce-conduit_0_2_0_3" = callPackage
     ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet
      , stm, transformers, transformers-base
      }:
@@ -76993,7 +77140,6 @@ self: {
        ];
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldable1" = callPackage
@@ -77015,10 +77161,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl";
-       version = "1.4.4";
-       sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7";
-       revision = "1";
-       editedCabalFile = "1qdllf16djf7w5h8jq1f8sb5a0k5ihr9psai8wgkvnhd9addsk0f";
+       version = "1.4.5";
+       sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
        libraryHaskellDepends = [
          base bytestring comonad containers contravariant hashable
          mwc-random primitive profunctors semigroupoids semigroups text
@@ -78198,20 +78342,20 @@ self: {
      }) {};
 
   "free-algebras" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-fix, free
-     , groups, hedgehog, kan-extensions, mtl, natural-numbers
+    ({ mkDerivation, base, constraints, containers, data-fix, dlist
+     , free, groups, hedgehog, kan-extensions, mtl, natural-numbers
      , transformers
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.4.0";
-       sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly";
+       version = "0.0.5.0";
+       sha256 = "1aqzah0c95mi9aqlvhl9r56im59jgjl38r199d7zb4lligfzvacr";
        libraryHaskellDepends = [
-         base constraints containers data-fix free groups kan-extensions mtl
-         natural-numbers transformers
+         base constraints containers data-fix dlist free groups
+         kan-extensions mtl natural-numbers transformers
        ];
        testHaskellDepends = [
-         base constraints containers data-fix free groups hedgehog
+         base constraints containers data-fix dlist free groups hedgehog
          kan-extensions mtl natural-numbers transformers
        ];
        description = "Free algebras in Haskell";
@@ -81533,6 +81677,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_6_1_0" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.6.1.0";
+       sha256 = "0wjqwn040yn7wpmcmhfp5slvyspal104p5wgkwwi40ykaj2zhayg";
+       libraryHaskellDepends = [ base QuickCheck validity ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-aeson" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
@@ -81600,8 +81757,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.5.0.0";
-       sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br";
+       version = "0.5.1.0";
+       sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -81618,8 +81775,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.1.1";
-       sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs";
+       version = "0.6.2.0";
+       sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          transformers validity
@@ -81711,8 +81868,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-optics";
-       version = "0.1.0.0";
-       sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5";
+       version = "0.1.1.0";
+       sha256 = "13nspyfd8apvqf30dr8zz027d60qh2f25rc6gk8fliiq626ajz17";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec hspec microlens QuickCheck
        ];
@@ -81772,8 +81929,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.1.0";
-       sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm";
+       version = "0.2.1.1";
+       sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81788,8 +81945,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.2.0.1";
-       sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
+       version = "0.2.1.0";
+       sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -81834,6 +81991,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-time_0_2_1_1" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, time, validity-time
+     }:
+     mkDerivation {
+       pname = "genvalidity-time";
+       version = "0.2.1.1";
+       sha256 = "0x3qddniy2a0qfyaxi1mfw9kqijky2gwyp19bcsp1gfxxl3c4mf5";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck time validity-time
+       ];
+       testHaskellDepends = [ base genvalidity-hspec hspec time ];
+       description = "GenValidity support for time";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-unordered-containers" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
@@ -82036,8 +82210,8 @@ self: {
      }:
      mkDerivation {
        pname = "geojson";
-       version = "3.0.3";
-       sha256 = "05kifzlw077ggxish1hmpqlk180w46qpj4b2c8pjqngk5j0jd5vv";
+       version = "3.0.4";
+       sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5";
        libraryHaskellDepends = [
          aeson base containers deepseq lens scientific semigroups text
          transformers validation
@@ -82260,26 +82434,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc_8_4_3" = callPackage
+  "ghc_8_6_1" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy
-     , hpc, process, template-haskell, terminfo, time, transformers
-     , unix
+     , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
+     , ghci, happy, hpc, process, template-haskell, terminfo, time
+     , transformers, unix
      }:
      mkDerivation {
        pname = "ghc";
-       version = "8.4.3";
-       sha256 = "1yryz21fnx5g1khpa7y2ps58kws3s1wjmz1ipnbv3hdcf6gyq46d";
+       version = "8.6.1";
+       sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq directory filepath
-         ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo
-         time transformers unix
+         ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell
+         terminfo time transformers unix
        ];
        libraryToolDepends = [ alex happy ];
        description = "The GHC API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {ghc-heap = null;};
 
   "ghc-boot_8_6_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
@@ -82907,12 +83082,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-prim_0_5_2_0" = callPackage
+  "ghc-prim_0_5_3" = callPackage
     ({ mkDerivation, rts }:
      mkDerivation {
        pname = "ghc-prim";
-       version = "0.5.2.0";
-       sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr";
+       version = "0.5.3";
+       sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9";
        libraryHaskellDepends = [ rts ];
        description = "GHC primitives";
        license = stdenv.lib.licenses.bsd3;
@@ -83353,6 +83528,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghci-hexcalc" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck }:
+     mkDerivation {
+       pname = "ghci-hexcalc";
+       version = "0.1.0.1";
+       sha256 = "1mwh4wz3ccmh0fi0k0y19bk33vn8p6ylmkklidpw5vg7k3v9d7s2";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck ];
+       description = "GHCi as a Hex Calculator interactive";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghci-history-parser" = callPackage
     ({ mkDerivation, base, doctest, hspec, parsec }:
      mkDerivation {
@@ -86361,6 +86548,8 @@ self: {
        pname = "gloss";
        version = "1.13.0.1";
        sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q";
+       revision = "1";
+       editedCabalFile = "1nyg324icnlky647zq4c21sqxv2bgnwnzgh2hz5d5ys6ba69j59h";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
@@ -86386,6 +86575,8 @@ self: {
        pname = "gloss-algorithms";
        version = "1.13.0.1";
        sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95";
+       revision = "1";
+       editedCabalFile = "140zmk3br0nn98mjc6ri36nk8yl93n4v69zybzv2vc41yxgvnac5";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
@@ -86425,8 +86616,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-examples";
-       version = "1.13.0.1";
-       sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w";
+       version = "1.13.0.2";
+       sha256 = "1g2l3jjj2mmmw9w45bmasqn9nbbsxxny6zhdvda931r6ryanq8db";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86506,14 +86697,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "gloss-raster_1_13_0_1" = callPackage
+  "gloss-raster_1_13_0_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
      , repa
      }:
      mkDerivation {
        pname = "gloss-raster";
-       version = "1.13.0.1";
-       sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x";
+       version = "1.13.0.2";
+       sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49";
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -86559,6 +86750,8 @@ self: {
        pname = "gloss-rendering";
        version = "1.13.0.2";
        sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0";
+       revision = "1";
+       editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih";
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
@@ -90144,8 +90337,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell";
-       version = "0.2.1.0";
-       sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z";
+       version = "0.2.1.1";
+       sha256 = "0nplscs0gv9isb1z2i8qh50yssvd7kkd669j53491hjw53rwy1cs";
        libraryHaskellDepends = [
          aeson base greskell-core semigroups text transformers
          unordered-containers vector
@@ -90165,8 +90358,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell-core";
-       version = "0.1.2.3";
-       sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s";
+       version = "0.1.2.4";
+       sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790";
        libraryHaskellDepends = [
          aeson base containers hashable scientific semigroups text
          unordered-containers uuid vector
@@ -90186,8 +90379,8 @@ self: {
      }:
      mkDerivation {
        pname = "greskell-websocket";
-       version = "0.1.1.1";
-       sha256 = "133jwmqm5swm214sav8kigg8lqvk64g1nly5zk1xcij6rajxryci";
+       version = "0.1.1.2";
+       sha256 = "1rydw93dscnq41a1j4l7fchbpxgbqgf2kx8c58kb0m8qxi7v6qlh";
        libraryHaskellDepends = [
          aeson async base base64-bytestring bytestring greskell-core
          hashtables safe-exceptions stm text unordered-containers uuid
@@ -91813,8 +92006,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.7.2";
-       sha256 = "1fcpzc1ph0nykjs4k5hm6b67698h1n9452wlpm55acdf53mrk1lg";
+       version = "2.7.3";
+       sha256 = "0qxqq46p4l61chkxk7c6lhnscik3gzsgcvszp6ywspk8zp1yhbi8";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring
          base64-bytestring bifunctors binary binary-conduit bytestring bzlib
@@ -102778,8 +102971,8 @@ self: {
      }:
      mkDerivation {
        pname = "hevm";
-       version = "0.16";
-       sha256 = "0i55jw3xcnh48r81jfs6k5ffckar2p85l67n3x6lkz12q8iq8vkn";
+       version = "0.17";
+       sha256 = "0xp28mm3wxyj3win37nvrjdywkrfzm4l0j441q88bd35vr25yi2k";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103169,6 +103362,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "heyting-algebras" = callPackage
+    ({ mkDerivation, base, containers, free-algebras, hashable
+     , lattices, QuickCheck, tagged, tasty, tasty-quickcheck
+     , universe-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "heyting-algebras";
+       version = "0.0.1.2";
+       sha256 = "132r0k0m8b7f8rkyay57k42kjl7nyzqv7942njkz6nwnhjg8i6ag";
+       libraryHaskellDepends = [
+         base containers free-algebras hashable lattices QuickCheck tagged
+         universe-base unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers lattices QuickCheck tasty tasty-quickcheck
+         universe-base
+       ];
+       description = "Heyting and Boolean algebras";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "hfann" = callPackage
     ({ mkDerivation, base, doublefann, fann }:
      mkDerivation {
@@ -104005,8 +104219,8 @@ self: {
      }:
      mkDerivation {
        pname = "higher-leveldb";
-       version = "0.5.0.1";
-       sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24";
+       version = "0.5.0.2";
+       sha256 = "1wmgz2aqz0vg0fnnigpg27gnzs9i6slyn6lb41myv6m20j0j5z1a";
        libraryHaskellDepends = [
          base bytestring cereal data-default exceptions leveldb-haskell mtl
          resourcet transformers transformers-base unliftio-core
@@ -104546,6 +104760,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_9_0" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
+     , unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.9.0";
+       sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random temporary unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit unix
+       ];
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hint-server" = callPackage
     ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
      }:
@@ -104902,8 +105137,8 @@ self: {
      }:
      mkDerivation {
        pname = "histogram-fill";
-       version = "0.9.0.0";
-       sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56";
+       version = "0.9.1.0";
+       sha256 = "0qcil8lgkzklgbzb9a81kdzsyzrsgzwdgz424mlvp8sbrfmbnz3m";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        description = "Library for histograms creation";
@@ -105278,8 +105513,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.11";
-       sha256 = "1kkgvyf4vrj5dy41v4z7xbyxhnw79y1j18d46pldim7iq43643ji";
+       version = "1.11.1";
+       sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105329,8 +105564,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.11";
-       sha256 = "1a59i6gn70mk124mmzfk4wz464a9r6hni0cd8c04fgp1v9zsa3m1";
+       version = "1.11.1";
+       sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105414,8 +105649,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-interest";
-       version = "1.5.2";
-       sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq";
+       version = "1.5.3";
+       sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105454,8 +105689,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.11";
-       sha256 = "0zh0y41cxz6skazfbqb1hw5sqy0kvdciib8d4xa0ny9rx4sjjq6a";
+       version = "1.11.1";
+       sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -105485,8 +105720,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.11";
-       sha256 = "1szn9gx1s331axhg1m51s6v695skblx52fk0i0z03v2xkajn3y2r";
+       version = "1.11.1";
+       sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105529,8 +105764,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.11";
-       sha256 = "0di7imrlpgldbk4hjv5l3b80v5n9qfyjajz9qgfpr0f1d54l0rdn";
+       version = "1.11.1";
+       sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105994,8 +106229,8 @@ self: {
     ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }:
      mkDerivation {
        pname = "hmatrix-nlopt";
-       version = "0.1.2.0";
-       sha256 = "1w04gi7shpck8z80a3lx77054i39ig7n3rig66hbpq1wp11snivs";
+       version = "0.1.3.0";
+       sha256 = "17c6s4q5sldr3mqqbyg4yknqxfgd45a0aw6sac33xcv9dvgyjyfc";
        libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
        testHaskellDepends = [ base doctest ];
        description = "Interface HMatrix with the NLOPT minimizer";
@@ -110552,14 +110787,16 @@ self: {
      }) {};
 
   "hscrtmpl" = callPackage
-    ({ mkDerivation, base, directory, process, time }:
+    ({ mkDerivation, base, directory, filepath, process, time }:
      mkDerivation {
        pname = "hscrtmpl";
-       version = "1.5";
-       sha256 = "12b5409gaiasgap0lvykvapjbls1p2p9jz62sqpl70181y4812l0";
+       version = "1.6";
+       sha256 = "166xp46bxi079h9bpr8xfnlzzivwkhnykv7g7kg7rnp35cmwxshm";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base directory process time ];
+       executableHaskellDepends = [
+         base directory filepath process time
+       ];
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -110816,26 +111053,6 @@ self: {
      }) {};
 
   "hsexif" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
-     , iconv, text, time
-     }:
-     mkDerivation {
-       pname = "hsexif";
-       version = "0.6.1.5";
-       sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig";
-       revision = "1";
-       editedCabalFile = "1q5ppjq8b08ljccg5680h1kklr288wfz52vnmgpcf9hqjm3icgvb";
-       libraryHaskellDepends = [
-         base binary bytestring containers iconv text time
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers hspec HUnit iconv text time
-       ];
-       description = "EXIF handling library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsexif_0_6_1_6" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
      , iconv, text, time
      }:
@@ -110853,7 +111070,6 @@ self: {
        ];
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -111854,8 +112070,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-dirstream";
-       version = "1.0.0.1";
-       sha256 = "17ac54ac21a5r954zvwxvn1j049q49m4ia7ghmdrcp94q3aczf4n";
+       version = "1.0.0.2";
+       sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -112947,6 +113163,8 @@ self: {
        pname = "hstatistics";
        version = "0.3";
        sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs";
+       revision = "1";
+       editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w";
        libraryHaskellDepends = [
          array base hmatrix hmatrix-gsl-stats random vector
        ];
@@ -113808,8 +114026,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "2.1.0.2";
-       sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl";
+       version = "2.1.0.3";
+       sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -113955,7 +114173,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http-api-data_0_3_9" = callPackage
+  "http-api-data_0_3_10" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
      , Cabal, cabal-doctest, containers, cookie, directory, doctest
      , filepath, hashable, hspec, hspec-discover, http-types, HUnit
@@ -113964,8 +114182,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-api-data";
-       version = "0.3.9";
-       sha256 = "013m662vn02vw37gpffnvffwjirhg8lprknav5rinxffq7ra4cr8";
+       version = "0.3.10";
+       sha256 = "061v98l5j8791jzp6fzhdc0gpmzzf4qxavrjzm7ir8x5h7il3qm8";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base bytestring containers cookie
@@ -113973,8 +114191,9 @@ self: {
          unordered-containers uuid-types
        ];
        testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         quickcheck-instances text time unordered-containers uuid-types
+         base bytestring cookie directory doctest filepath hspec HUnit
+         QuickCheck quickcheck-instances text time unordered-containers
+         uuid-types
        ];
        testToolDepends = [ hspec-discover ];
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
@@ -114525,10 +114744,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-media";
-       version = "0.7.1.2";
-       sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
-       revision = "2";
-       editedCabalFile = "0in3xw1hqdz0s8pqvkfqw5qr186cd1yr4zxc5rnr0q95asi8s0rh";
+       version = "0.7.1.3";
+       sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers utf8-string
        ];
@@ -115706,16 +115923,16 @@ self: {
 
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit
-     , conduit-combinators, criterion, hspec, mmap, time, vector, word8
+     , conduit-combinators, criterion, hspec, mmap, time, transformers
+     , unliftio-core, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
-       version = "0.2.0.3";
-       sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a";
-       revision = "1";
-       editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7";
+       version = "0.2.0.5";
+       sha256 = "00fpinpafvrdkmk6gksqd9v6f3lzrqcg79yja0h55gw7qjz5lz84";
        libraryHaskellDepends = [
-         array base bytestring conduit conduit-combinators time word8
+         array base bytestring conduit conduit-combinators time transformers
+         unliftio-core word8
        ];
        testHaskellDepends = [ base bytestring conduit hspec ];
        benchmarkHaskellDepends = [
@@ -115980,16 +116197,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-json_0_8_1_0" = callPackage
+  "hw-json_0_9_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, containers, criterion, directory, dlist, hspec
-     , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
-     , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8
+     , bytestring, containers, criterion, directory, dlist, generic-lens
+     , hspec, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
+     , hw-rankselect, hw-rankselect-base, lens, mmap
+     , optparse-applicative, resourcet, text, vector, word8
      }:
      mkDerivation {
        pname = "hw-json";
-       version = "0.8.1.0";
-       sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179";
+       version = "0.9.0.0";
+       sha256 = "0465pc8k4wvvih4z5klq3ign2cznrb837ivqxg9nrzbx8szsnsc7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115998,8 +116216,9 @@ self: {
          hw-rankselect-base mmap text vector word8
        ];
        executableHaskellDepends = [
-         base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery
-         hw-prim hw-rankselect hw-rankselect-base mmap vector
+         base bytestring criterion dlist generic-lens hw-balancedparens
+         hw-bits hw-mquery hw-prim hw-rankselect hw-rankselect-base lens
+         mmap optparse-applicative resourcet vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers hspec hw-balancedparens
@@ -119420,6 +119639,8 @@ self: {
        pname = "incremental-parser";
        version = "0.3.1.1";
        sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
+       revision = "1";
+       editedCabalFile = "0g6haprqb1w06bazjj107frraxc6bbj8i98im16k66wlx7c9f99i";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -119469,8 +119690,8 @@ self: {
      }:
      mkDerivation {
        pname = "indentation";
-       version = "0.3.2";
-       sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k";
+       version = "0.3.3";
+       sha256 = "0iwnz4j4zkr9xpw5f8p42blgifdj6mqbxpqsci76pic6safp3avq";
        libraryHaskellDepends = [
          base indentation-core indentation-parsec indentation-trifecta mtl
          parsec parsers trifecta
@@ -119484,8 +119705,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "indentation-core";
-       version = "0.0.0.1";
-       sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1";
+       version = "0.0.0.2";
+       sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9";
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
@@ -119497,8 +119718,8 @@ self: {
      }:
      mkDerivation {
        pname = "indentation-parsec";
-       version = "0.0.0.1";
-       sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp";
+       version = "0.0.0.2";
+       sha256 = "1m7jr1s7h4vrx0lbl88gjrpd6zgzalmqzqsv6rn5s17ay5p88dqf";
        libraryHaskellDepends = [ base indentation-core mtl parsec ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
@@ -119511,8 +119732,8 @@ self: {
      }:
      mkDerivation {
        pname = "indentation-trifecta";
-       version = "0.0.2";
-       sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis";
+       version = "0.1.0";
+       sha256 = "1za8x4w26ifxvfv5xra5xpykr67ari91c4p0vca89y28q54l9qpj";
        libraryHaskellDepends = [
          base indentation-core mtl parsers trifecta
        ];
@@ -119633,8 +119854,8 @@ self: {
     ({ mkDerivation, base, hspec, Only }:
      mkDerivation {
        pname = "indexed-list-literals";
-       version = "0.2.1.1";
-       sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
+       version = "0.2.1.2";
+       sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq";
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base hspec ];
        description = "Type safe indexed list literals";
@@ -122016,24 +122237,24 @@ self: {
      }) {};
 
   "iridium" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
-     , extra, foldl, http-conduit, lifted-base, monad-control
-     , multistate, process, split, system-filepath, tagged, text
-     , transformers, transformers-base, turtle, unordered-containers
-     , vector, xmlhtml, yaml
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
+     , containers, extra, foldl, HTTP, lifted-base, monad-control
+     , multistate, network-uri, process, split, system-filepath, tagged
+     , text, transformers, transformers-base, turtle
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "iridium";
-       version = "0.1.5.7";
-       sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp";
+       version = "0.1.5.8";
+       sha256 = "02l18z38n3cbrav7lyi3d27393invc216j78xgg7qfpbvhm3pfgw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         ansi-terminal base bytestring Cabal containers extra foldl
-         http-conduit lifted-base monad-control multistate process split
+         aeson ansi-terminal base bytestring Cabal containers extra foldl
+         HTTP lifted-base monad-control multistate network-uri process split
          system-filepath tagged text transformers transformers-base turtle
-         unordered-containers vector xmlhtml yaml
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          base extra multistate text transformers unordered-containers yaml
@@ -122862,27 +123083,6 @@ self: {
      }) {};
 
   "ixset-typed" = callPackage
-    ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
-     , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "ixset-typed";
-       version = "0.4";
-       sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
-       revision = "1";
-       editedCabalFile = "1ldf6bkm085idwp8a8ppxvyawii4gbhyw1pwrcyi3n8jpjh8hqcq";
-       libraryHaskellDepends = [
-         base containers deepseq safecopy syb template-haskell
-       ];
-       testHaskellDepends = [
-         base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Efficient relational queries on Haskell sets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ixset-typed_0_4_0_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
      , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell
@@ -122899,7 +123099,6 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ixshader" = callPackage
@@ -123549,6 +123748,8 @@ self: {
        pname = "jmacro";
        version = "0.6.15";
        sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
+       revision = "1";
+       editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123933,6 +124134,8 @@ self: {
        pname = "jsaddle";
        version = "0.9.5.0";
        sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z";
+       revision = "1";
+       editedCabalFile = "1f77rxrmd0rqdz81dqaw5rxxcrsjw7ibw5qp93lkgw6yj531ki99";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq exceptions filepath ghc-prim http-types lens primitive
@@ -124613,6 +124816,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.2";
        sha256 = "09bgcc00q1v24rdglw9b24dgi690mlax6abarhcgvgmn22406wp8";
+       revision = "1";
+       editedCabalFile = "0pwmh48z54n0mrwzmgff95mwy1jbmy1rwsk5kmddby86f0j5873g";
        libraryHaskellDepends = [
          aeson base base-compat-batteries containers generic-aeson
          generic-deriving mtl scientific text time unordered-containers
@@ -125697,13 +125902,17 @@ self: {
      }) {};
 
   "kansas-lava-shake" = callPackage
-    ({ mkDerivation, base, hastache, kansas-lava, shake, text }:
+    ({ mkDerivation, base, containers, kansas-lava, mustache, shake
+     , text, vector
+     }:
      mkDerivation {
        pname = "kansas-lava-shake";
-       version = "0.2.0";
-       sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl";
+       version = "0.3.0";
+       sha256 = "00mmk0fsv1vdm3xidmv9wa5dwbnka564bhjp2j3jx5i4l7kw4xrb";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base hastache kansas-lava shake text ];
+       libraryHaskellDepends = [
+         base containers kansas-lava mustache shake text vector
+       ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126966,18 +127175,18 @@ self: {
      }) {};
 
   "knead" = callPackage
-    ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
+    ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record
      , storable-tuple, tfp, transformers, utility-ht
      }:
      mkDerivation {
        pname = "knead";
-       version = "0.2.3";
-       sha256 = "14wi37i3y8hvfiwfs82mg7nanin84if4wlxi3rdg4w3fkdqm9ycl";
+       version = "0.3";
+       sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40";
        libraryHaskellDepends = [
-         base llvm-extra llvm-tf storable-record storable-tuple tfp
+         base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp
          transformers utility-ht
        ];
-       description = "Repa array processing using LLVM JIT";
+       description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -127139,8 +127348,8 @@ self: {
        pname = "kraken";
        version = "0.1.0";
        sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
-       revision = "1";
-       editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6";
+       revision = "2";
+       editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -130027,6 +130236,8 @@ self: {
        pname = "lazysplines";
        version = "0.2";
        sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y";
+       revision = "1";
+       editedCabalFile = "0781158jza2q6zdd7z0szsnsw1kvsbhiijivbi61rridjgv1yq23";
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
@@ -130609,6 +130820,8 @@ self: {
        pname = "lens-accelerate";
        version = "0.2.0.0";
        sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk";
+       revision = "1";
+       editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9";
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -133914,20 +134127,18 @@ self: {
      }) {};
 
   "llvm-extra" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, cpuid, llvm-tf
-     , non-empty, tfp, transformers, unsafe, utility-ht
+    ({ mkDerivation, base, bifunctors, bool8, containers, cpuid
+     , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht
      }:
      mkDerivation {
        pname = "llvm-extra";
-       version = "0.7.3";
-       sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a";
-       revision = "1";
-       editedCabalFile = "1zsmfzhlcxcn24z3k21lkk3wmb6rw1mnsky2q85kj6xam92lyn73";
+       version = "0.8";
+       sha256 = "0gy7zl3ln64aypkci5gc1bxy1j98zfj9wj7z07lk9n07s6ddm9k2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors containers cpuid llvm-tf non-empty tfp transformers
-         unsafe utility-ht
+         base bifunctors bool8 containers cpuid llvm-tf non-empty tfp
+         transformers unsafe utility-ht
        ];
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
@@ -134965,29 +135176,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , prettyprinter, semigroups, stm, stm-delay, text, time
-     , transformers, transformers-base, unliftio-core
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.3.2";
-       sha256 = "1q8mhshz95xckqn4d8wxj0nsg4qrxmc6a826fjzxm1ii0krwpgbd";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl prettyprinter
-         semigroups stm stm-delay text time transformers transformers-base
-         unliftio-core
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         prettyprinter text time
-       ];
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_3_3" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , prettyprinter, semigroups, stm, stm-delay, text, time
@@ -135008,7 +135196,6 @@ self: {
        ];
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -140104,24 +140291,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
-     , ghc-prim
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.16";
-       sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
-       revision = "1";
-       editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq foundation ghc-prim
-       ];
-       testHaskellDepends = [ base basement bytestring foundation ];
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_18" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, foundation
      , ghc-prim
      }:
@@ -140137,7 +140306,6 @@ self: {
        testHaskellDepends = [ base basement bytestring foundation ];
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -140795,17 +140963,6 @@ self: {
      }) {};
 
   "microlens-contra" = callPackage
-    ({ mkDerivation, base, contravariant, microlens }:
-     mkDerivation {
-       pname = "microlens-contra";
-       version = "0.1.0.1";
-       sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9";
-       libraryHaskellDepends = [ base contravariant microlens ];
-       description = "True folds and getters for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-contra_0_1_0_2" = callPackage
     ({ mkDerivation, base, contravariant, microlens }:
      mkDerivation {
        pname = "microlens-contra";
@@ -140814,7 +140971,6 @@ self: {
        libraryHaskellDepends = [ base contravariant microlens ];
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-each" = callPackage
@@ -141762,18 +141918,23 @@ self: {
      }) {};
 
   "mios" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }:
+    ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec
+     , primitive, vector
+     }:
      mkDerivation {
        pname = "mios";
-       version = "1.6.0";
-       sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7";
+       version = "1.6.2";
+       sha256 = "1q2lz5sir6pcxiqxb3vr1xp6zsld0nfwjymg0zbhszd5w0iprxdh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring ghc-prim primitive vector
        ];
        executableHaskellDepends = [
-         base bytestring ghc-prim primitive vector
+         base bytestring ghc-prim gitrev primitive vector
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim hspec primitive vector
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -142595,6 +142756,8 @@ self: {
        pname = "mole";
        version = "0.0.6";
        sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b";
+       revision = "2";
+       editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143707,8 +143870,8 @@ self: {
     ({ mkDerivation, base, mtl, stm }:
      mkDerivation {
        pname = "monadIO";
-       version = "0.11.0.0";
-       sha256 = "11pbg83fw5vdlny5w9afmzdhn3ryg1av429gbsk8w6wl8zqhd4n9";
+       version = "0.11.1.0";
+       sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
@@ -144241,8 +144404,8 @@ self: {
        pname = "monoid-extras";
        version = "0.5";
        sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
-       revision = "1";
-       editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw";
+       revision = "2";
+       editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "Various extra monoid-related definitions and utilities";
@@ -144298,8 +144461,8 @@ self: {
      }:
      mkDerivation {
        pname = "monoid-subclasses";
-       version = "0.4.6";
-       sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m";
+       version = "0.4.6.1";
+       sha256 = "19mfklkdhyv94pfg5i92h0z90sc99rbgpi8z0w55bz3qhxnqg5yh";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -144339,6 +144502,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoidal-containers_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
+     , newtype, semigroups, unordered-containers
+     }:
+     mkDerivation {
+       pname = "monoidal-containers";
+       version = "0.4.0.0";
+       sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1";
+       libraryHaskellDepends = [
+         aeson base containers deepseq hashable lens newtype semigroups
+         unordered-containers
+       ];
+       description = "Containers with monoidal accumulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoidplus" = callPackage
     ({ mkDerivation, base, contravariant, semigroups, transformers }:
      mkDerivation {
@@ -144381,12 +144561,12 @@ self: {
      }) {};
 
   "monopati" = callPackage
-    ({ mkDerivation, base, free, split }:
+    ({ mkDerivation, base, directory, free, split }:
      mkDerivation {
        pname = "monopati";
-       version = "0.1.1";
-       sha256 = "0zpqhxq9vq7svkdrn8aph5i1f8kd9l8jgdg8lpj15c311qrz8cl5";
-       libraryHaskellDepends = [ base free split ];
+       version = "0.1.2";
+       sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8";
+       libraryHaskellDepends = [ base directory free split ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146026,10 +146206,8 @@ self: {
      }:
      mkDerivation {
        pname = "multistate";
-       version = "0.8.0.0";
-       sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
-       revision = "3";
-       editedCabalFile = "0gi4l3765jgsvhr6jj2q1l7v6188kg2xw4zwcaarq3hcg1ncaakw";
+       version = "0.8.0.1";
+       sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146769,8 +146947,8 @@ self: {
        pname = "mwc-random-accelerate";
        version = "0.1.0.0";
        sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
-       revision = "2";
-       editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic";
+       revision = "3";
+       editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic";
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -147520,12 +147698,18 @@ self: {
      }) {};
 
   "nano-cryptr" = callPackage
-    ({ mkDerivation, base, bytestring }:
+    ({ mkDerivation, base, bytestring, HUnit, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "nano-cryptr";
-       version = "0.1.1.3";
-       sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
+       version = "0.2.1";
+       sha256 = "00c0niyjhkcv942vhm775jml3frhj0i3svgj9xxy0hnfb3nawvjb";
        libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150577,8 +150761,8 @@ self: {
     ({ mkDerivation, base, nlopt, vector }:
      mkDerivation {
        pname = "nlopt-haskell";
-       version = "0.1.2.0";
-       sha256 = "0hzg2y11lacgn9793zsk0vib3wb9kyqkcp65vfcfwvd90lny3mmn";
+       version = "0.1.3.0";
+       sha256 = "1lsh2wbl1l291xqwjxdqjpvxss9zzl2ivvwigza7zkbmaz9a0zvx";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ nlopt ];
        testHaskellDepends = [ base vector ];
@@ -151995,46 +152179,6 @@ self: {
      }) {};
 
   "nvim-hs" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
-     , containers, data-default, deepseq, directory, dyre, filepath
-     , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
-     , messagepack, mtl, network, optparse-applicative, prettyprinter
-     , prettyprinter-ansi-terminal, process, QuickCheck, resourcet
-     , setenv, stm, streaming-commons, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base, unliftio
-     , unliftio-core, utf8-string, void
-     }:
-     mkDerivation {
-       pname = "nvim-hs";
-       version = "1.0.0.2";
-       sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring cereal cereal-conduit conduit containers
-         data-default deepseq directory dyre filepath foreign-store hslogger
-         megaparsec messagepack mtl network optparse-applicative
-         prettyprinter prettyprinter-ansi-terminal process resourcet setenv
-         stm streaming-commons template-haskell text time time-locale-compat
-         transformers transformers-base unliftio unliftio-core utf8-string
-         void
-       ];
-       executableHaskellDepends = [ base data-default ];
-       testHaskellDepends = [
-         base bytestring cereal cereal-conduit conduit containers
-         data-default directory dyre filepath foreign-store hslogger hspec
-         hspec-discover HUnit megaparsec messagepack mtl network
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal
-         process QuickCheck resourcet setenv stm streaming-commons
-         template-haskell text time time-locale-compat transformers
-         transformers-base unliftio unliftio-core utf8-string
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell plugin backend for neovim";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "nvim-hs_1_0_0_3" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , containers, data-default, deepseq, directory, dyre, filepath
      , foreign-store, hslogger, hspec, hspec-discover, HUnit, megaparsec
@@ -152072,7 +152216,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -152184,32 +152327,6 @@ self: {
      }) {};
 
   "o-clock" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
-     , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
-     , tiempo, time-units, type-spec
-     }:
-     mkDerivation {
-       pname = "o-clock";
-       version = "1.0.0";
-       sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
-       revision = "1";
-       editedCabalFile = "0df6b78y05q8pmlxyfpln01vkm0r38cay1ffsbz1biyfs6s115j5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog
-         tasty-hspec type-spec
-       ];
-       testToolDepends = [ doctest markdown-unlit ];
-       benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
-       description = "Type-safe time library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "o-clock_1_0_0_1" = callPackage
     ({ mkDerivation, base, deepseq, doctest, gauge, ghc-prim, Glob
      , hedgehog, markdown-unlit, tasty, tasty-hedgehog, tasty-hspec
      , tiempo, time-units, type-spec
@@ -154401,8 +154518,8 @@ self: {
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.14.2.0";
-       sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
+       version = "0.14.3.0";
+       sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -155971,8 +156088,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-pyplot";
-       version = "1.0.0.0";
-       sha256 = "0dcrvzsg6h8pmrk1k3w12hsnh169n0ahlybpg8zhm4xbac5iafc7";
+       version = "1.0.0.1";
+       sha256 = "1sxksn2b7x1mrgla0c3dn5x9js0yhfg125259kh1iqzlkanj81px";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156115,8 +156232,8 @@ self: {
      }:
      mkDerivation {
        pname = "pangraph";
-       version = "0.2.0";
-       sha256 = "1zm19gbidi6a27vi7x66dlw3q0syy5vwdykck716kdfka88vr9k5";
+       version = "0.2.1";
+       sha256 = "09jyhaxl89y8arkm4xmbx3bp859viq00bdnqk3bnvdiwv3klry8l";
        libraryHaskellDepends = [
          algebraic-graphs attoparsec base bytestring containers fgl hexml
          html-entities text
@@ -157713,26 +157830,28 @@ self: {
      }) {};
 
   "patch-image" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
+    ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-cufft, accelerate-fourier, accelerate-io
-     , accelerate-utility, array, base, bytestring, Cabal, carray
-     , cassava, containers, enumset, explicit-exception, fft, filepath
-     , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf
-     , non-empty, pqueue, storable-tuple, tfp, unordered-containers
-     , utility-ht, vector
+     , accelerate-llvm-ptx, accelerate-utility, array, base, bool8
+     , bytestring, Cabal, carray, cassava, containers, dsp, enumset
+     , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead
+     , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat
+     , semigroups, storable-complex, storable-tuple, tfp
+     , unordered-containers, utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.3.1";
-       sha256 = "1l7iv83r145wmfhr8mygc7ln78jv669n2klhm1n9p50dinv1gj17";
+       version = "0.3.2";
+       sha256 = "00zjpbhw5886zc4cmflqw4721kvndyc7r3i7p5493visqr0d1hvk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
-         accelerate-fourier accelerate-io accelerate-utility array base
-         bytestring Cabal carray cassava containers enumset
-         explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead
-         llvm-extra llvm-tf non-empty pqueue storable-tuple tfp
+         accelerate accelerate-arithmetic accelerate-cufft
+         accelerate-fourier accelerate-io accelerate-llvm-ptx
+         accelerate-utility array base bool8 bytestring Cabal carray cassava
+         containers dsp enumset explicit-exception fft filepath gnuplot
+         JuicyPixels knead llvm-extra llvm-tf non-empty pqueue
+         prelude-compat semigroups storable-complex storable-tuple tfp
          unordered-containers utility-ht vector
        ];
        description = "Compose a big image from overlapping parts";
@@ -161849,14 +161968,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-safe_2_3_0" = callPackage
+  "pipes-safe_2_3_1" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, primitive, transformers, transformers-base
      }:
      mkDerivation {
        pname = "pipes-safe";
-       version = "2.3.0";
-       sha256 = "1b8cx8drwnviq2fic2ppldf774awih4wd0m1an0iv2x3l7ndy9jp";
+       version = "2.3.1";
+       sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly";
        libraryHaskellDepends = [
          base containers exceptions monad-control mtl pipes primitive
          transformers transformers-base
@@ -165865,6 +165984,8 @@ self: {
        pname = "pretty-sop";
        version = "0.2.0.2";
        sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn";
+       revision = "1";
+       editedCabalFile = "16j80587sfq4hm2p24awcv388sm2snrwj3fhg9l3x256fbl4bm4s";
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
@@ -167182,16 +167303,16 @@ self: {
      , hashable, hashable-time, haskeline, http-api-data, http-types
      , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl
      , network, network-transport, network-transport-tcp, old-locale
-     , optparse-applicative, parallel, path-pieces, QuickCheck, random
-     , random-shuffle, resourcet, rset, scotty, semigroups, stm
-     , stm-containers, template-haskell, temporary, text, time
-     , transformers, unix, unordered-containers, uuid, vector
-     , vector-binary-instances, websockets, zlib
+     , optparse-applicative, parallel, path-pieces, QuickCheck
+     , quickcheck-instances, random, random-shuffle, resourcet, rset
+     , scotty, semigroups, stm, stm-containers, template-haskell
+     , temporary, text, time, transformers, unix, unordered-containers
+     , uuid, vector, vector-binary-instances, websockets, zlib
      }:
      mkDerivation {
        pname = "project-m36";
-       version = "0.5";
-       sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1";
+       version = "0.5.1";
+       sha256 = "1i3g6x3447hy1df6kzh8afpp366lzi9jspqzwi7gjkhkqhxxc94q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167203,10 +167324,10 @@ self: {
          filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
          hashable-time haskeline http-api-data list-t monad-parallel
          MonadRandom mtl network-transport network-transport-tcp old-locale
-         optparse-applicative parallel path-pieces QuickCheck random-shuffle
-         resourcet rset semigroups stm stm-containers temporary text time
-         transformers unix unordered-containers uuid vector
-         vector-binary-instances zlib
+         optparse-applicative parallel path-pieces QuickCheck
+         quickcheck-instances random-shuffle resourcet rset semigroups stm
+         stm-containers temporary text time transformers unix
+         unordered-containers uuid vector vector-binary-instances zlib
        ];
        executableHaskellDepends = [
          aeson attoparsec base base64-bytestring binary blaze-html
@@ -173469,6 +173590,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase_1_3" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , containers, contravariant, contravariant-extras, deepseq, dlist
+     , either, fail, hashable, mtl, profunctors, scientific
+     , semigroupoids, semigroups, stm, text, time, transformers
+     , unordered-containers, uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "1.3";
+       sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7";
+       revision = "1";
+       editedCabalFile = "1yz51pghns6xanzdnlkagghpzwnkl7wjqnqcp5gs0zs1iywrbl45";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring containers contravariant
+         contravariant-extras deepseq dlist either fail hashable mtl
+         profunctors scientific semigroupoids semigroups stm text time
+         transformers unordered-containers uuid vector void
+       ];
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rebindable" = callPackage
     ({ mkDerivation, base, data-default-class, indexed }:
      mkDerivation {
@@ -175111,8 +175256,8 @@ self: {
      }:
      mkDerivation {
        pname = "regexdot";
-       version = "0.12.1.0";
-       sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j";
+       version = "0.12.2.0";
+       sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8";
        libraryHaskellDepends = [
          base data-default deepseq extra parallel parsec toolshed
        ];
@@ -175990,10 +176135,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa";
-       version = "3.4.1.3";
-       sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
-       revision = "2";
-       editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp";
+       version = "3.4.1.4";
+       sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -176005,10 +176148,8 @@ self: {
     ({ mkDerivation, base, repa, vector }:
      mkDerivation {
        pname = "repa-algorithms";
-       version = "3.4.1.2";
-       sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87";
-       revision = "1";
-       editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k";
+       version = "3.4.1.3";
+       sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y";
        libraryHaskellDepends = [ base repa vector ];
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
@@ -176092,10 +176233,8 @@ self: {
      }:
      mkDerivation {
        pname = "repa-examples";
-       version = "3.4.1.1";
-       sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
-       revision = "3";
-       editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f";
+       version = "3.4.1.2";
+       sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -176153,8 +176292,8 @@ self: {
        pname = "repa-io";
        version = "3.4.1.1";
        sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
-       revision = "2";
-       editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm";
+       revision = "3";
+       editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl";
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
@@ -176703,8 +176842,8 @@ self: {
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.2.2";
-       sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks";
+       version = "1.3";
+       sha256 = "16c5r69shz9zg01awjpwh7jpw3hqy81p4hh22rwdm0scdc45n5fa";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
@@ -177238,8 +177377,8 @@ self: {
      }:
      mkDerivation {
        pname = "restless-git";
-       version = "0.6";
-       sha256 = "1apg2vd6yw1m02i6fd2m2i6kw08dhds93ky7ncm4psj95wwkw2al";
+       version = "0.7";
+       sha256 = "0r344f4q9bvqfrh1ls1g90xq7r1p30anwhnwjckz5v26idiynxy3";
        libraryHaskellDepends = [
          base bytestring clock containers HSH text time
        ];
@@ -179409,16 +179548,12 @@ self: {
      }) {};
 
   "rss" = callPackage
-    ({ mkDerivation, base, HaXml, network, network-uri, old-locale
-     , time
-     }:
+    ({ mkDerivation, base, HaXml, network, network-uri, time }:
      mkDerivation {
        pname = "rss";
-       version = "3000.2.0.6";
-       sha256 = "03crzmi9903w6xsdc00wd9jhsr41b8pglz9n502h68w3jkm6zr4d";
-       libraryHaskellDepends = [
-         base HaXml network network-uri old-locale time
-       ];
+       version = "3000.2.0.7";
+       sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym";
+       libraryHaskellDepends = [ base HaXml network network-uri time ];
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180605,8 +180740,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.4";
-       sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd";
+       version = "1.0.6";
+       sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Semantic version numbers and constraints";
@@ -184402,6 +184537,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-server_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-conversion, case-insensitive, cookie
+     , crypto-api, data-default-class, entropy, hspec, hspec-discover
+     , http-api-data, http-client, http-types, jose, lens, lens-aeson
+     , markdown-unlit, monad-time, mtl, QuickCheck, servant
+     , servant-auth, servant-server, tagged, text, time, transformers
+     , unordered-containers, wai, warp, wreq
+     }:
+     mkDerivation {
+       pname = "servant-auth-server";
+       version = "0.4.1.0";
+       sha256 = "1fxh50fjrdi5j88qs2vsrflqdwq3pc8s5h424nhjrpc24w277bqi";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data http-types jose lens
+         monad-time mtl servant servant-auth servant-server tagged text time
+         unordered-containers wai
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive hspec http-client http-types
+         jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+         servant-server time transformers wai warp wreq
+       ];
+       testToolDepends = [ hspec-discover markdown-unlit ];
+       description = "servant-server/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-swagger" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
      , servant, servant-auth, servant-swagger, swagger2, text
@@ -187688,6 +187854,8 @@ self: {
        pname = "shell-monad";
        version = "0.6.4";
        sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
+       revision = "1";
+       editedCabalFile = "0hm3nlr9a3n18f7y0pnw4q4x3s8y1jxz9mify7hplpj2fq23wpdm";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -188981,6 +189149,8 @@ self: {
        pname = "simple-pipe";
        version = "0.0.0.29";
        sha256 = "0ilc781520h1x65x3cqdzp2067g7rf7vdlnss8wsg2x1f5cxs6yh";
+       revision = "1";
+       editedCabalFile = "1bp8dwhympy43g43496vgp6dclbfjibdwgqsild681bn83yprsdz";
        libraryHaskellDepends = [
          base bytestring lifted-base monad-control monads-tf stm
          transformers-base
@@ -195894,8 +196064,8 @@ self: {
      }:
      mkDerivation {
        pname = "stacked-dag";
-       version = "0.1.0.4";
-       sha256 = "067dbhap8aras9ixrmsaw961mlnq9fd3qyksfi8gj1zld0kxbp7k";
+       version = "0.1.1.0";
+       sha256 = "0bvifa45dlqnyybydi5lbwhhnkqv1bvjdp6fvsmjnsf7mi5m0fq3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers graphviz text ];
@@ -197014,6 +197184,8 @@ self: {
        pname = "stm-lifted";
        version = "0.1.1.0";
        sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c";
+       revision = "1";
+       editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
@@ -197715,10 +197887,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming";
-       version = "0.2.1.0";
-       sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1";
-       revision = "2";
-       editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq";
+       version = "0.2.2.0";
+       sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss";
        libraryHaskellDepends = [
          base containers ghc-prim mmorph mtl semigroups transformers
          transformers-base
@@ -197956,6 +198126,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-fft" = callPackage
+    ({ mkDerivation, base, contiguous-fft, ghc-prim, prim-instances
+     , primitive, streaming
+     }:
+     mkDerivation {
+       pname = "streaming-fft";
+       version = "0.1.0.0";
+       sha256 = "1qphhbap1va897ghcr8v4d3nnpcb4w0b422d24isz8rg138m99wi";
+       libraryHaskellDepends = [
+         base contiguous-fft ghc-prim prim-instances primitive streaming
+       ];
+       description = "online streaming fft";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-histogram" = callPackage
     ({ mkDerivation, base, containers, criterion, tasty, tasty-hunit
      , tasty-quickcheck
@@ -198413,8 +198598,8 @@ self: {
      }:
      mkDerivation {
        pname = "strict-types";
-       version = "0.1.2";
-       sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li";
+       version = "0.1.3";
+       sha256 = "0rkycz6fxwqnx5lz3ycmd29402iw8p4896lrmwksphqyl957c0ks";
        libraryHaskellDepends = [
          array base bytestring containers deepseq hashable text
          unordered-containers vector
@@ -199529,32 +199714,6 @@ self: {
      }) {};
 
   "summoner" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
-     , filepath, generic-deriving, hedgehog, neat-interpolation
-     , optparse-applicative, process, relude, tasty, tasty-discover
-     , tasty-hedgehog, text, time, tomland
-     }:
-     mkDerivation {
-       pname = "summoner";
-       version = "1.0.6";
-       sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
-       revision = "1";
-       editedCabalFile = "08rzxxxfzf5dip9va8wjqgmar5rlmm0fx3wj3vlx0i6rwqq24maz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring directory filepath
-         generic-deriving neat-interpolation optparse-applicative process
-         relude text time tomland
-       ];
-       executableHaskellDepends = [ base relude ];
-       testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ];
-       testToolDepends = [ tasty-discover ];
-       description = "Tool for creating completely configured production Haskell projects";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "summoner_1_1_0_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
      , directory, filepath, generic-deriving, gitrev, hedgehog
      , neat-interpolation, optparse-applicative, process, relude, tasty
@@ -199580,7 +199739,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -201800,6 +201958,8 @@ self: {
        pname = "tabl";
        version = "1.0.3";
        sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f";
+       revision = "1";
+       editedCabalFile = "15zmgsylfmm8pf355i0ph1dcczy0z6jw0d9dh4xfmfba8ailvcdg";
        libraryHaskellDepends = [ base safe text ];
        description = "Table layout";
        license = "unknown";
@@ -205551,7 +205711,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-builder_0_6_3" = callPackage
+  "text-builder_0_6_4" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, criterion
      , deferred-folds, QuickCheck, quickcheck-instances, rerebase
      , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
@@ -205559,8 +205719,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.6.3";
-       sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z";
+       version = "0.6.4";
+       sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg";
        libraryHaskellDepends = [
          base base-prelude bytestring deferred-folds semigroups text
          transformers
@@ -206062,8 +206222,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-replace";
-       version = "0.0.0.3";
-       sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n";
+       version = "0.0.0.4";
+       sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -206109,8 +206269,8 @@ self: {
        pname = "text-show";
        version = "3.7.4";
        sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
-       revision = "1";
-       editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9";
+       revision = "2";
+       editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers contravariant generic-deriving
@@ -206130,6 +206290,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show_3_7_5" = callPackage
+    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
+     , bifunctors, bytestring, bytestring-builder, containers
+     , contravariant, criterion, deepseq, deriving-compat
+     , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover
+     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+     , tagged, template-haskell, text, th-abstraction, th-lift
+     , transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.7.5";
+       sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r";
+       libraryHaskellDepends = [
+         array base base-compat-batteries bifunctors bytestring
+         bytestring-builder containers contravariant generic-deriving
+         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+         template-haskell text th-abstraction th-lift transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat-batteries base-orphans bytestring
+         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+         nats QuickCheck quickcheck-instances semigroups tagged
+         template-haskell text transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -206166,6 +206359,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-show-instances_3_7" = callPackage
+    ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
+     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+     , haskeline, hpc, hspec, hspec-discover, old-locale, old-time
+     , pretty, QuickCheck, quickcheck-instances, random, semigroups
+     , tagged, template-haskell, terminfo, text, text-show, th-orphans
+     , time, transformers, transformers-compat, unix
+     , unordered-containers, vector, xhtml
+     }:
+     mkDerivation {
+       pname = "text-show-instances";
+       version = "3.7";
+       sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c";
+       libraryHaskellDepends = [
+         base base-compat-batteries bifunctors binary containers directory
+         ghc-boot-th haskeline hpc old-locale old-time pretty random
+         semigroups tagged template-haskell terminfo text text-show time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
+       ];
+       testHaskellDepends = [
+         base base-compat-batteries bifunctors binary containers directory
+         generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec
+         old-locale old-time pretty QuickCheck quickcheck-instances random
+         tagged template-haskell terminfo text-show th-orphans time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Additional instances for text-show";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-stream-decode" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
      }:
@@ -207421,17 +207648,17 @@ self: {
 
   "threepenny-editors" = callPackage
     ({ mkDerivation, base, bifunctors, casing, containers, generics-sop
-     , profunctors, text, threepenny-gui
+     , profunctors, semigroups, text, threepenny-gui
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.5.6";
-       sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw";
+       version = "0.5.6.1";
+       sha256 = "0x6x4cfs52lwdcxjyqirrb8ka5pm40l89xsxaz9vvz44hmixqjrj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors casing containers generics-sop profunctors text
-         threepenny-gui
+         base bifunctors casing containers generics-sop profunctors
+         semigroups text threepenny-gui
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
@@ -207954,6 +208181,8 @@ self: {
        pname = "tighttp";
        version = "0.0.0.10";
        sha256 = "0q0177nm71c6sl7qdw0za740m52bhqavkn4b7f6dxwvfw15icxdz";
+       revision = "1";
+       editedCabalFile = "077s20c7cl29h65v5sgh4df5r41574srll20r6cmbdbb339jr4nr";
        libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
@@ -209656,6 +209885,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "toodles" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, cmdargs
+     , directory, filepath, http-types, megaparsec, MissingH
+     , regex-posix, servant, servant-blaze, servant-server, strict, text
+     , transformers, wai, warp, yaml
+     }:
+     mkDerivation {
+       pname = "toodles";
+       version = "0.1.0.0";
+       sha256 = "0hbmnyym6hrwvacc783hl7s26yqbw8vcify4vna0mmp8y67rwjfx";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring cmdargs directory filepath
+         http-types megaparsec MissingH regex-posix servant servant-blaze
+         servant-server strict text transformers wai warp yaml
+       ];
+       description = "Manage the TODO entries in your code";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "toolshed" = callPackage
     ({ mkDerivation, array, base, containers, data-default, deepseq
      , directory, extra, filepath, HUnit, QuickCheck, random
@@ -211898,8 +212148,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.11";
-       sha256 = "19jn9k70qwhdlzkm8kq1jq37i8ck3q4fnkzn1x75prwhs60rgr0f";
+       version = "1.5.12";
+       sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -213449,21 +213699,6 @@ self: {
      }) {};
 
   "typelits-witnesses" = callPackage
-    ({ mkDerivation, base, base-compat, constraints, reflection
-     , transformers
-     }:
-     mkDerivation {
-       pname = "typelits-witnesses";
-       version = "0.3.0.2";
-       sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf";
-       libraryHaskellDepends = [
-         base base-compat constraints reflection transformers
-       ];
-       description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "typelits-witnesses_0_3_0_3" = callPackage
     ({ mkDerivation, base, constraints, reflection }:
      mkDerivation {
        pname = "typelits-witnesses";
@@ -213472,7 +213707,6 @@ self: {
        libraryHaskellDepends = [ base constraints reflection ];
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typenums" = callPackage
@@ -216034,8 +216268,8 @@ self: {
     ({ mkDerivation, base, parsec, safe, utf8-string }:
      mkDerivation {
        pname = "uri";
-       version = "0.1.6.4";
-       sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359";
+       version = "0.1.6.5";
+       sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
@@ -217417,6 +217651,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_8_0_0" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.8.0.0";
+       sha256 = "0yr342gd8ylji7nqa8w3ssik8qcgb4v3h3j30qf5nbzg900k5rsn";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-aeson" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
@@ -217701,16 +217948,16 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, criterion, hspec, QuickCheck, time
-     , transformers
+    ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck
+     , time, transformers
      }:
      mkDerivation {
        pname = "varying";
-       version = "0.7.0.3";
-       sha256 = "0283cjsl7siyjyvppwpss5nc5jwy0lfx47d0sndqy3dksvx1gm3c";
+       version = "0.7.1.0";
+       sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base transformers ];
+       libraryHaskellDepends = [ base contravariant transformers ];
        executableHaskellDepends = [ base time transformers ];
        testHaskellDepends = [ base hspec QuickCheck time transformers ];
        benchmarkHaskellDepends = [ base criterion time transformers ];
@@ -218125,16 +218372,14 @@ self: {
      }:
      mkDerivation {
        pname = "vector-binary-instances";
-       version = "0.2.4";
-       sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
-       revision = "1";
-       editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
+       version = "0.2.5";
+       sha256 = "0l9zj58a4sbpic1dc9if7iwv4rihya2bj4zb4qfna5fb3pf6plwc";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
        benchmarkHaskellDepends = [
          base binary bytestring criterion deepseq vector
        ];
-       description = "Instances of Data.Binary and Data.Serialize for vector";
+       description = "Instances of Data.Binary for vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -218403,14 +218648,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-space_0_14" = callPackage
+  "vector-space_0_15" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
-       version = "0.14";
-       sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3";
-       revision = "2";
-       editedCabalFile = "0rz23fkpx6fgn3pjmmnz0mj5iyq70wv4j9z0c4c9ar7g72dalch7";
+       version = "0.15";
+       sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8";
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
@@ -221807,6 +222050,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weak-bag" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "weak-bag";
+       version = "0.1.0.0";
+       sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc";
+       libraryHaskellDepends = [ base containers ];
+       description = "Mutable bag backed by weak pointers to each item";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "weather-api" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network
      , network-uri, utf8-string, vector
@@ -223208,24 +223462,6 @@ self: {
      }) {};
 
   "wild-bind" = callPackage
-    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
-     , semigroups, stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "wild-bind";
-       version = "0.1.2.2";
-       sha256 = "0s1hwgc1fzr2mgls6na6xsc51iw8xp11ydwgwcaqq527gcij101p";
-       libraryHaskellDepends = [
-         base containers semigroups text transformers
-       ];
-       testHaskellDepends = [
-         base hspec microlens QuickCheck stm transformers
-       ];
-       description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind_0_1_2_3" = callPackage
     ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
      , semigroups, stm, text, transformers
      }:
@@ -223241,7 +223477,6 @@ self: {
        ];
        description = "Dynamic key binding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -223277,25 +223512,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
-     , semigroups, stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.2.0.5";
-       sha256 = "0r9nlv96f1aavigd70r33q11a125kn3zah17z5vvsjlw55br0wxy";
-       libraryHaskellDepends = [
-         base containers fold-debounce mtl semigroups stm text transformers
-         wild-bind X11
-       ];
-       testHaskellDepends = [
-         async base hspec text time transformers wild-bind X11
-       ];
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_6" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
      , semigroups, stm, text, time, transformers, wild-bind, X11
      }:
@@ -223312,7 +223528,6 @@ self: {
        ];
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wilton-ffi" = callPackage
@@ -226606,8 +226821,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.28";
-       sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd";
+       version = "0.28.1";
+       sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -227357,6 +227572,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yak" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hspec, lens
+     , template-haskell, text, time
+     }:
+     mkDerivation {
+       pname = "yak";
+       version = "0.1.0.0";
+       sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a";
+       libraryHaskellDepends = [
+         attoparsec base bytestring lens template-haskell text time
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
+       description = "A strongly typed IRC library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yall" = callPackage
     ({ mkDerivation, base, categories, transformers }:
      mkDerivation {
@@ -228471,23 +228702,6 @@ self: {
      }) {};
 
   "yesod-auth-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
-     , resourcet, shakespeare, text, time, transformers, unliftio, wai
-     , yesod-auth, yesod-core, yesod-fb
-     }:
-     mkDerivation {
-       pname = "yesod-auth-fb";
-       version = "1.9.0";
-       sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit fb http-conduit resourcet shakespeare
-         text time transformers unliftio wai yesod-auth yesod-core yesod-fb
-       ];
-       description = "Authentication backend for Yesod using Facebook";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yesod-auth-fb_1_9_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, fb, http-conduit
      , resourcet, shakespeare, text, time, transformers, unliftio, wai
      , yesod-auth, yesod-core, yesod-fb
@@ -228502,7 +228716,6 @@ self: {
        ];
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -228932,6 +229145,43 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_7" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, fast-logger, gauge, hspec, hspec-expectations
+     , http-types, HUnit, monad-logger, mtl, network, parsec
+     , path-pieces, primitive, random, resourcet, rio, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , unix-compat, unliftio, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.7";
+       sha256 = "0smjkfidavm1iggdi4wd47ykbx7jw1qknj6glyjq8cc3p75zc3w7";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types monad-logger mtl
+         parsec path-pieces primitive random resourcet rio shakespeare
+         template-haskell text time transformers unix-compat unliftio
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -230309,8 +230559,8 @@ self: {
      }:
      mkDerivation {
        pname = "yet-another-logger";
-       version = "0.3.0";
-       sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri";
+       version = "0.3.1";
+       sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From b5f43fa04e0f291f83745b1d7592fd037c211d67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Oct 2018 18:39:32 +0200
Subject: [PATCH 2601/3253] all-cabal-hashes: update to Hackage at
 2018-10-08T09:07:42Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 3126269a6e7a..079fccadfcb1 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3715ae81be1a8e0c6a1cb5902c054b6cedfb7f41.tar.gz";
-  sha256 = "05bsk99d4k2nq8dfiagpby0cllx19crzn2rh29v26p0irzagrqfb";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/70f02ad82349a18e1eff41eea4949be532486f7b.tar.gz";
+  sha256 = "1ajqybsl8hfzbhziww57zp9a8kgypj96ngxrargk916v3xpf3x15";
 }

From a6955ad37a2ed3bab7396b64430765bb8a0a6cee Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 8 Oct 2018 19:02:47 +0200
Subject: [PATCH 2602/3253] scdoc: Switch to fetchgit because the archive is
 unavailable

The Git repository is still accessible but the webpage [0] and the
download link [1] currently return "404 Not Found".

[0]: https://git.sr.ht/~sircmpwn/scdoc/
[1]: https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz
---
 pkgs/tools/typesetting/scdoc/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index bdf074b558e7..225e360b8d34 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
   version = "1.4.2";
 
-  src = fetchurl {
-    url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz";
-    sha256 = "1hhvg9cifx1v8b5i91lgq5cjdcskzl3rz7vwmwdq7ad0nqnykz82";
+  src = fetchgit {
+    url = "https://git.sr.ht/~sircmpwn/scdoc";
+    rev = version;
+    sha256 = "00a23kw8d36qik6h5kds13pzfnr58krlblfh9n2f0rldf0m9ldk1";
   };
 
   postPatch = ''

From 203903343f982d80a372028b9fc897e1294482cf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 8 Oct 2018 19:11:15 +0200
Subject: [PATCH 2603/3253] scdoc: 1.4.2 -> 1.5.1

---
 pkgs/tools/typesetting/scdoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 225e360b8d34..3a4c7813c695 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
-  version = "1.4.2";
+  version = "1.5.1";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/scdoc";
     rev = version;
-    sha256 = "00a23kw8d36qik6h5kds13pzfnr58krlblfh9n2f0rldf0m9ldk1";
+    sha256 = "0fm3x6ma1pzlajfcy32ayqrcab8lwl64nxfaqgc6019mxw87y1ja";
   };
 
   postPatch = ''

From 9e502600ba88f237f6973d6c0582eac61d77f102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 8 Oct 2018 18:45:33 +0100
Subject: [PATCH 2604/3253] stack2nix: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 409f159387fd..8ff6aed506f2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1074,6 +1074,10 @@ self: super: {
     hpack = self.hpack_0_31_0;
     yaml = self.yaml_0_10_2_0;
   });
+  stack2nix = super.stack2nix.overrideScope (self: super: {
+    hpack = self.hpack_0_31_0;
+    yaml = self.yaml_0_10_2_0;
+  });
 
   # Break out of "aeson <1.3, temporary <1.3".
   stack = doJailbreak super.stack;

From de2f79467d20bd524c915c171cf3c5d381056851 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 8 Oct 2018 07:06:31 -0700
Subject: [PATCH 2605/3253] rapidcheck: init at unstable-2018-09-27

rapidcheck is a C++ property-based testing framework inspired by QuickCheck

Signed-off-by: William Casarin <jb55@jb55.com>
---
 .../libraries/rapidcheck/default.nix          | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/rapidcheck/default.nix

diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
new file mode 100644
index 000000000000..9d8ce8cef202
--- /dev/null
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec{
+  name = "rapidcheck-${version}";
+  version = "unstable-2018-09-27";
+
+  src = fetchFromGitHub {
+    owner = "emil-e";
+    repo  = "rapidcheck";
+    rev   = "de54478fa35c0d9cea14ec0c5c9dfae906da524c";
+    sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  postInstall = ''
+    cp ../extras/boost_test/include/rapidcheck/boost_test.h $out/include/rapidcheck
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A C++ framework for property based testing inspired by QuickCheck";
+    inherit (src.meta) homepage;
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2548afe22f58..b0e88d39a3a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11958,6 +11958,8 @@ with pkgs;
 
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
 
+  rapidcheck = callPackage ../development/libraries/rapidcheck {};
+
   rapidjson = callPackage ../development/libraries/rapidjson {};
 
   raul = callPackage ../development/libraries/audio/raul { };

From fe8515de6e8ac33b94917869c668e55a8617eef8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 8 Oct 2018 21:37:27 +0300
Subject: [PATCH 2606/3253] asymptote: apply upstream patch for compatibility
 with a newer boehmgc

As referenced in https://github.com/NixOS/nixpkgs/pull/45708#issuecomment-427840944
---
 pkgs/tools/graphics/asymptote/default.nix | 11 ++++++++++-
 pkgs/top-level/all-packages.nix           |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index a0bf0a434471..102ffae5f9d0 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl
+{stdenv, fetchurl, fetchpatch
   , freeglut, ghostscriptX, imagemagick, fftw
   , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
@@ -33,6 +33,15 @@ stdenv.mkDerivation {
     inherit (s) url sha256;
   };
 
+  patches = [
+    # Remove when updating from 2.47 to 2.48
+    # Compatibility with BoehmGC 7.6.8
+    (fetchpatch {
+      url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch";
+      sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1";
+    })
+  ];
+
   preConfigure = ''
     export HOME="$PWD"
     patchShebangs .
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22ae50b68663..5b97cd827968 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -569,7 +569,6 @@ with pkgs;
   asymptote = callPackage ../tools/graphics/asymptote {
     texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super; };
     gsl = gsl_1;
-    boehmgc = boehmgc_766;
   };
 
   atomicparsley = callPackage ../tools/video/atomicparsley { };

From 3ae9bf6d0e715be438a2f321784c55cd858d5af0 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Mon, 8 Oct 2018 14:13:26 -0400
Subject: [PATCH 2607/3253] v42lloopback: 0.11 -> 0.12

---
 pkgs/os-specific/linux/v4l2loopback/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix
index 3db2814a0878..2e22b99a95f3 100644
--- a/pkgs/os-specific/linux/v4l2loopback/default.nix
+++ b/pkgs/os-specific/linux/v4l2loopback/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "v4l2loopback-${version}-${kernel.version}";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "umlaeute";
     repo = "v4l2loopback";
     rev = "v${version}";
-    sha256 = "1wb5qmy13w8rl4279bwp69s4sb1x5hk5d2n563p1yk8yi567p2az";
+    sha256 = "1rf8dvabksxb2sj14j32h7n7pw7byqfnpqs4m4afj3398y9y23c4";
   };
 
   hardeningDisable = [ "format" "pic" ];

From df63fd1627e2906991a71e984a70990105acbaeb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 20:40:15 +0200
Subject: [PATCH 2608/3253] limesuite: 18.06.0->18.10.0

---
 pkgs/applications/misc/limesuite/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index 070073ea3e2c..e1cdc4a0f863 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -4,7 +4,7 @@
 } :
 
 let
-  version = "18.06.0";
+  version = "18.10.0";
 
 in stdenv.mkDerivation {
   name = "limesuite-${version}";
@@ -13,9 +13,11 @@ in stdenv.mkDerivation {
     owner = "myriadrf";
     repo = "LimeSuite";
     rev = "v${version}";
-    sha256 = "0j6mxlvij2k6ib1d9jwzvilmqgm1h0q7wy9sf8a6bvidwlphvy25";
+    sha256 = "0nbyvcdwvfvln1wic9qwb7y221v3jv454gp5v6ms9112a41zj46h";
   };
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
@@ -36,10 +38,6 @@ in stdenv.mkDerivation {
 
     mkdir -p $out/share/limesuite
     cp bin/Release/lms7suite_mcu/* $out/share/limesuite
-
-    cp bin/dualRXTX $out/bin
-    cp bin/basicRX $out/bin
-    cp bin/singleRX $out/bin
   '';
 
   meta = with stdenv.lib; {

From a29f2f20cd2deabccd3d0352504f828c8b7805a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 6 Sep 2018 18:43:49 -0700
Subject: [PATCH 2609/3253] libbsd: 0.8.7 -> 0.9.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
libbsd
---
 pkgs/development/libraries/libbsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 36410e842a5d..b304b73e7e03 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
-  version = "0.8.7";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
+    sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
   };
 
   # darwin changes configure.ac which means we need to regenerate

From cf1f8b2d0492d21a04aa0b2832be352ea9480b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:09:59 +0200
Subject: [PATCH 2610/3253] camlp5: remove old version 5.15

---
 pkgs/development/tools/ocaml/camlp5/5.15.nix | 46 --------------------
 pkgs/top-level/ocaml-packages.nix            | 12 -----
 2 files changed, 58 deletions(-)
 delete mode 100644 pkgs/development/tools/ocaml/camlp5/5.15.nix

diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix
deleted file mode 100644
index 2e03bb8025ef..000000000000
--- a/pkgs/development/tools/ocaml/camlp5/5.15.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{stdenv, fetchurl, ocaml, transitional ? false}:
-
-let
-  pname = "camlp5";
-  webpage = http://pauillac.inria.fr/~ddr/camlp5/;
-  metafile = ./META;
-in
-
-assert !stdenv.lib.versionOlder "4.00" ocaml.version;
-
-stdenv.mkDerivation rec {
-
-  name = "${pname}${if transitional then "_transitional" else ""}-${version}";
-  version = "5.15";
-
-  src = fetchurl {
-    url = "${webpage}/distrib/src/${pname}-${version}.tgz";
-    sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
-  };
-
-  buildInputs = [ ocaml ];
-
-  prefixKey = "-prefix ";
-
-  preConfigure = "configureFlagsArray=(" +  (if transitional then "--transitional" else "--strict") +
-                  " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
-
-  buildFlags = "world.opt";
-
-  postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
-
-  meta = {
-    description = "Preprocessor-pretty-printer for OCaml";
-    longDescription = ''
-      Camlp5 is a preprocessor and pretty-printer for OCaml programs.
-      It also provides parsing and printing tools.
-    '';
-    homepage = "${webpage}";
-    license = stdenv.lib.licenses.bsd3;
-    branch = "5";
-    platforms = ocaml.meta.platforms or [];
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-    ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7de4bf3fad40..429f9d3155f4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -88,18 +88,6 @@ let
       then callPackage ../development/tools/ocaml/camlp4 { }
       else null;
 
-    camlp5_old_strict =
-      if lib.versionOlder "4.00" ocaml.version
-      then camlp5_6_strict
-      else callPackage ../development/tools/ocaml/camlp5/5.15.nix { };
-
-    camlp5_old_transitional =
-      if lib.versionOlder "4.00" ocaml.version
-      then camlp5_6_transitional
-      else callPackage ../development/tools/ocaml/camlp5/5.15.nix {
-        transitional = true;
-      };
-
     camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
 
     camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {

From 3d683f33f342a70eb8f03a7077a32ff3cf84e440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:10:04 +0200
Subject: [PATCH 2611/3253] ocamlPackages_3_08_0: remove

---
 pkgs/top-level/aliases.nix        | 1 -
 pkgs/top-level/ocaml-packages.nix | 2 --
 2 files changed, 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 92a0f2b45709..682562bfd7b8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -348,7 +348,6 @@ mapAliases ({
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-  ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
   ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
   ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
   ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 429f9d3155f4..be49095dbd47 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1065,8 +1065,6 @@ in rec
 
   inherit mkOcamlPackages;
 
-  ocamlPackages_3_08_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.08.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
-
   ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
 
   ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });

From 62cf2840bdadeeb5aceee4cd3a1947fb22496335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:10:05 +0200
Subject: [PATCH 2612/3253] ocamlPackages_3_10_0: remove

---
 pkgs/top-level/aliases.nix        | 3 +--
 pkgs/top-level/ocaml-packages.nix | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 682562bfd7b8..f06044829b4d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -329,7 +329,7 @@ mapAliases ({
   callPackage_i686 = pkgsi686Linux.callPackage;
 
   inherit (ocaml-ng) # added 2016-09-14
-    ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
+    ocamlPackages_3_11_2 ocamlPackages_3_12_1
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
     ocamlPackages_4_03
     ocamlPackages_latest;
@@ -348,7 +348,6 @@ mapAliases ({
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-  ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
   ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
   ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
   ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index be49095dbd47..026bab235065 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1065,8 +1065,6 @@ in rec
 
   inherit mkOcamlPackages;
 
-  ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
-
   ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
 
   ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; });

From 34394a38efa222bf37192a0326935c1b066f9541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:10:05 +0200
Subject: [PATCH 2613/3253] ocamlPackages_3_11_2: remove

This requires removing also the Coq 8.3 and Matita 0.5.8 packages.

Coq 8.3 was released 8 years ago (2010) and there is no trace left
of users of this version (contrary to Coq 8.4, released 2012).
It is well over time to remove it.

Matita 0.5.8 was released in 2010 and because this version was still
used for teaching according to the official website, a legacy release
(0.5.9) was released in 5 years later to compile with more recent
OCaml libraries.
Updating to 0.5.9 (or a more recent version like 0.99.3) should allow
getting rid of the dependency on older OCaml but it is hard to test
given that the package is already broken before this update.
---
 pkgs/applications/science/logic/coq/8.3.nix   |   82 --
 .../science/logic/coq/configure.8.3.patch     | 1112 -----------------
 .../science/logic/coq/no-codesign.patch       |   19 -
 pkgs/top-level/aliases.nix                    |    3 +-
 pkgs/top-level/all-packages.nix               |   17 +-
 pkgs/top-level/coq-packages.nix               |    7 -
 pkgs/top-level/ocaml-packages.nix             |    2 -
 7 files changed, 14 insertions(+), 1228 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/coq/8.3.nix
 delete mode 100644 pkgs/applications/science/logic/coq/configure.8.3.patch
 delete mode 100644 pkgs/applications/science/logic/coq/no-codesign.patch

diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix
deleted file mode 100644
index 341267b2cebe..000000000000
--- a/pkgs/applications/science/logic/coq/8.3.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-# - coqide compilation can be disabled by setting lablgtk to null;
-# - The csdp program used for the Micromega tactic is statically referenced.
-#   However, coq can build without csdp by setting it to null.
-#   In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found.
-
-{ stdenv, lib, make, fetchurl
-, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }:
-
-assert lib.versionOlder ocaml.version "4";
-
-let 
-  version = "8.3pl4";
-  buildIde = lablgtk != null;
-  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
-  idePatch = if buildIde then ''
-    substituteInPlace scripts/coqmktop.ml --replace \
-    "\"-I\"; \"+lablgtk2\"" \
-    "\"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)\"; \"-I\"; \"$(echo "${lablgtk}"/lib/ocaml/*/site-lib/stublibs)\""
-  '' else "";
-  csdpPatch = if csdp != null then ''
-    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
-    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.search_exe_in_path \"csdp\"" "Some \"${csdp}/bin/csdp\""
-  '' else "";
-in
-
-stdenv.mkDerivation {
-  name = "coq-${version}";
-
-  src = fetchurl {
-    url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr";
-  };
-
-  buildInputs = [ make ocaml findlib camlp5 ncurses lablgtk ];
-
-  prefixKey = "-prefix ";
-
-  preConfigure = ''
-    configureFlagsArray=(
-      -opt
-      -camldir ${ocaml}/bin
-      -camlp5dir $(ocamlfind query camlp5)
-      ${ideFlags}
-    )
-  '';
-
-  buildFlags = "world"; # Debug with "world VERBOSE=1";
-
-  patches = [ ./configure.8.3.patch ];
-
-  postPatch = ''
-    UNAME=$(type -tp uname)
-    RM=$(type -tp rm)
-    substituteInPlace configure --replace "/bin/uname" "$UNAME"
-    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
-    ${idePatch}
-    ${csdpPatch}
-  '';
-
-  # This post install step is needed to build ssrcoqide from the ssreflect package
-  # It could be made optional, but I see little harm in including it in the default
-  # distribution -- roconnor
-  # This will likely no longer be necessary for coq >= 8.4. -- roconnor
-  postInstall = if buildIde then ''
-   cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/
-  '' else "";
-
-  meta = with stdenv.lib; {
-    description = "Coq proof assistant";
-    longDescription = ''
-      Coq is a formal proof management system.  It provides a formal language
-      to write mathematical definitions, executable algorithms and theorems
-      together with an environment for semi-interactive development of
-      machine-checked proofs.
-    '';
-    homepage = http://coq.inria.fr;
-    license = licenses.lgpl21;
-    branch = "8.3";
-    maintainers = with maintainers; [ roconnor vbgl ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/applications/science/logic/coq/configure.8.3.patch b/pkgs/applications/science/logic/coq/configure.8.3.patch
deleted file mode 100644
index 431cccac4b0b..000000000000
--- a/pkgs/applications/science/logic/coq/configure.8.3.patch
+++ /dev/null
@@ -1,1112 +0,0 @@
-diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure
---- coq-8.3pl3-orig/configure	2011-12-19 22:57:30.000000000 +0100
-+++ coq-8.3pl3/configure	2012-03-17 16:38:16.000000000 +0100
-@@ -395,7 +395,6 @@
- 	 ocamlyaccexec=$CAMLBIN/ocamlyacc
- 	 ocamlmktopexec=$CAMLBIN/ocamlmktop
- 	 ocamlmklibexec=$CAMLBIN/ocamlmklib
--	 camlp4oexec=$CAMLBIN/camlp4o
- esac
- 
- if test ! -f "$CAMLC" ; then
-@@ -628,7 +627,7 @@
-             no)  LABLGTKLIB=+lablgtk2                   # Pour le message
-                  LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
-             yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
--                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
-+                 LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
-         esac;;
-     no) LABLGTKINCLUDES="";;
- esac
-diff -Nuar coq-8.3pl3-orig/configure~ coq-8.3pl3/configure~
---- coq-8.3pl3-orig/configure~	1970-01-01 01:00:00.000000000 +0100
-+++ coq-8.3pl3/configure~	2011-12-19 22:57:30.000000000 +0100
-@@ -0,0 +1,1088 @@
-+#!/bin/sh
-+
-+##################################
-+#
-+#  Configuration script for Coq
-+# 
-+##################################
-+
-+VERSION=8.3pl3
-+VOMAGIC=08300
-+STATEMAGIC=58300
-+DATE=`LANG=C date +"%B %Y"`
-+
-+# Create the bin/ directory if non-existent
-+test -d bin || mkdir bin
-+
-+# a local which command for sh
-+which () {
-+IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames)
-+for i in $PATH; do
-+  if test -z "$i"; then i=.; fi 
-+  if [ -f "$i/$1" ] ; then
-+	IFS=" "
-+        echo "$i/$1"
-+	break
-+  fi
-+done
-+}
-+
-+usage () {
-+    printf "Available options for configure are:\n"
-+    echo "-help"
-+    printf "\tDisplays this help page\n"
-+    echo "-prefix <dir>"
-+    printf "\tSet installation directory to <dir>\n"
-+    echo "-local"
-+    printf "\tSet installation directory to the current source tree\n"
-+    echo "-coqrunbyteflags"
-+    printf "\tSet link flags for VM-dependent bytecode (coqtop)\n"
-+    echo "-coqtoolsbyteflags"
-+    printf "\tSet link flags for VM-independant bytecode (coqdep, coqdoc, ...)\n"
-+    echo "-custom"
-+    printf "\tGenerate all bytecode executables with -custom (not recommended)\n"
-+    echo "-src"
-+    printf "\tSpecifies the source directory\n"
-+    echo "-bindir"
-+    echo "-libdir"
-+    echo "-mandir"
-+    echo "-docdir"
-+    printf "\tSpecifies where to install bin/lib/man/doc files resp.\n"
-+    echo "-emacslib"
-+    echo "-emacs"
-+    printf "\tSpecifies where emacs files are to be installed\n"
-+    echo "-coqdocdir"
-+    printf "\tSpecifies where Coqdoc style files are to be installed\n"
-+    echo "-camldir"
-+    printf "\tSpecifies the path to the OCaml library\n"
-+    echo "-lablgtkdir"
-+    printf "\tSpecifies the path to the Lablgtk library\n"
-+    echo "-camlp5dir"
-+    printf "\tSpecifies where to look for the Camlp5 library and tells to use it\n"
-+    echo "-arch"
-+    printf "\tSpecifies the architecture\n"
-+    echo "-opt"
-+    printf "\tSpecifies whether or not to use OCaml *.opt optimized compilers\n"
-+    echo "-natdynlink (yes|no)"
-+    printf "\tSpecifies whether or not to use dynamic loading of native code\n"
-+    echo "-coqide (opt|byte|no)"
-+    printf "\tSpecifies whether or not to compile Coqide\n"
-+    echo "-browser <command>"
-+    printf "\tUse <command> to open URL %%s\n"
-+    echo "-with-doc (yes|no)"
-+    printf "\tSpecifies whether or not to compile the documentation\n"
-+    echo "-with-geoproof (yes|no)"
-+    printf "\tSpecifies whether or not to use Geoproof binding\n"
-+    echo "-with-cc <file>"
-+    echo "-with-ar <file>"
-+    echo "-with-ranlib <file>"
-+    printf "\tTells configure where to find gcc/ar/ranlib executables\n"
-+    echo "-byte-only"
-+    printf "\tCompiles only bytecode version of Coq\n"
-+    echo "-debug"
-+    printf "\tAdd debugging information in the Coq executables\n"
-+    echo "-profile"
-+    printf "\tAdd profiling information in the Coq executables\n"
-+    echo "-annotate"
-+    printf "\tCompiles Coq with -dtypes option\n"
-+}
-+
-+
-+# Default OCaml binaries
-+bytecamlc=ocamlc
-+nativecamlc=ocamlopt
-+ocamlmklibexec=ocamlmklib
-+ocamlexec=ocaml
-+ocamldepexec=ocamldep
-+ocamldocexec=ocamldoc
-+ocamllexexec=ocamllex
-+ocamlyaccexec=ocamlyacc
-+ocamlmktopexec=ocamlmktop
-+camlp4oexec=camlp4o
-+
-+
-+coq_debug_flag=
-+coq_debug_flag_opt=
-+coq_profile_flag=
-+coq_annotate_flag=
-+best_compiler=opt
-+cflags="-fno-defer-pop -Wall -Wno-unused"
-+natdynlink=yes
-+
-+gcc_exec=gcc
-+ar_exec=ar
-+ranlib_exec=ranlib
-+
-+local=false
-+coqrunbyteflags_spec=no
-+coqtoolsbyteflags_spec=no
-+custom_spec=no
-+src_spec=no
-+prefix_spec=no
-+bindir_spec=no
-+libdir_spec=no
-+mandir_spec=no
-+docdir_spec=no
-+emacslib_spec=no
-+emacs_spec=no
-+camldir_spec=no
-+lablgtkdir_spec=no
-+coqdocdir_spec=no
-+arch_spec=no
-+coqide_spec=no
-+browser_spec=no
-+wwwcoq_spec=no
-+with_geoproof=false
-+with_doc=all
-+with_doc_spec=no
-+force_caml_version=no
-+force_caml_version_spec=no
-+
-+COQSRC=`pwd`
-+
-+# Parse command-line arguments
-+
-+while : ; do
-+  case "$1" in
-+    "") break;;
-+    -help|--help) usage
-+	          exit;;
-+    -prefix|--prefix) prefix_spec=yes
-+                      prefix="$2"
-+		      shift;;
-+    -local|--local) local=true;;
-+    -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes
-+                                        coqrunbyteflags="$2"
-+                                        shift;;
-+    -coqtoolsbyteflags|--coqtoolsbyteflags) coqtoolsbyteflags_spec=yes
-+                                            coqtoolsbyteflags="$2"
-+                                            shift;;
-+    -custom|--custom) custom_spec=yes
-+                      shift;;
-+    -src|--src) src_spec=yes
-+                COQSRC="$2"
-+	        shift;;
-+    -bindir|--bindir) bindir_spec=yes
-+                      bindir="$2"
-+		      shift;;
-+    -libdir|--libdir) libdir_spec=yes
-+                      libdir="$2"
-+		      shift;;
-+    -mandir|--mandir) mandir_spec=yes
-+                      mandir="$2"
-+		      shift;;
-+    -docdir|--docdir) docdir_spec=yes
-+                      docdir="$2"
-+		      shift;;
-+    -emacslib|--emacslib) emacslib_spec=yes
-+                          emacslib="$2"
-+			  shift;;
-+    -emacs |--emacs) emacs_spec=yes
-+		     emacs="$2"
-+		     shift;;
-+    -coqdocdir|--coqdocdir) coqdocdir_spec=yes
-+	              coqdocdir="$2"
-+		      shift;;
-+    -camldir|--camldir) camldir_spec=yes
-+	                camldir="$2"
-+			shift;;
-+    -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes
-+	                lablgtkdir="$2"
-+			shift;;
-+    -camlp5dir|--camlp5dir)
-+	                camlp5dir="$2"
-+			shift;;
-+    -arch|--arch) arch_spec=yes
-+                  arch=$2
-+		  shift;;
-+    -opt|--opt) bytecamlc=ocamlc.opt
-+                camlp4oexec=camlp4o  # can't add .opt since dyn load'll be required
-+                nativecamlc=ocamlopt.opt;;
-+    -natdynlink|--natdynlink) case "$2" in
-+	                  yes) natdynlink=yes;;
-+                          *) natdynlink=no
-+                        esac
-+                        shift;;
-+    -coqide|--coqide) coqide_spec=yes
-+		      case "$2" in
-+			  byte|opt) COQIDE=$2;;
-+			  *) COQIDE=no
-+		      esac
-+		      shift;;
-+    -browser|--browser) browser_spec=yes
-+		      BROWSER=$2
-+		      shift;;
-+    -coqwebsite|--coqwebsite) wwwcoq_spec=yes
-+                      WWWCOQ=$2
-+                      shift;;
-+    -with-doc|--with-doc) with_doc_spec=yes
-+		      case "$2" in
-+			  yes|all) with_doc=all;;
-+			  *) with_doc=no
-+		      esac
-+		      shift;;
-+    -with-geoproof|--with-geoproof) 
-+	  case "$2" in
-+	      yes) with_geoproof=true;;
-+	      no) with_geoproof=false;;
-+	  esac
-+	  shift;;
-+    -with-cc|-with-gcc|--with-cc|--with-gcc) 
-+	  gcc_spec=yes
-+	  gcc_exec=$2
-+	  shift;;
-+    -with-ar|--with-ar) 
-+	  ar_spec=yes
-+	  ar_exec=$2
-+	  shift;;
-+    -with-ranlib|--with-ranlib) 
-+	  ranlib_spec=yes
-+	  ranlib_exec=$2
-+	  shift;;
-+    -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;;
-+    -debug|--debug) coq_debug_flag=-g;;
-+    -profile|--profile) coq_profile_flag=-p;;
-+    -annotate|--annotate) coq_annotate_flag=-dtypes;;
-+    -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) 
-+          force_caml_version_spec=yes
-+	  force_caml_version=yes;;
-+    *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;;
-+  esac
-+  shift
-+done
-+
-+if [ $prefix_spec = yes -a $local = true ] ; then
-+  echo "Options -prefix and -local are incompatible."
-+  echo "Configure script failed!"
-+  exit 1
-+fi
-+
-+# compile date
-+DATEPGM=`which date`
-+case $DATEPGM in
-+    "") echo "I can't find the program \"date\" in your path."
-+        echo "Please give me the current date"
-+	read COMPILEDATE;;
-+    *)  COMPILEDATE=`date +"%h %d %Y %H:%M:%S"`;;
-+esac
-+
-+# Architecture
-+
-+case $arch_spec in
-+    no) 
-+    # First we test if we are running a Cygwin system
-+    if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then
-+	ARCH="win32"
-+    else
-+	# If not, we determine the architecture
-+	if test -x /bin/arch ; then
-+ 	    ARCH=`/bin/arch`
-+ 	elif test -x /usr/bin/arch ; then
-+ 	    ARCH=`/usr/bin/arch`
-+ 	elif test -x /usr/ucb/arch ; then
-+ 	    ARCH=`/usr/ucb/arch`
-+ 	elif test -x /bin/uname ; then
-+ 	    ARCH=`/bin/uname -s`
-+ 	elif test -x /usr/bin/uname ; then
-+ 	    ARCH=`/usr/bin/uname -s`
-+	else
-+	    echo "I can not automatically find the name of your architecture."
-+	    printf "%s"\
-+		"Give me a name, please [win32 for Win95, Win98 or WinNT]: "
-+	    read ARCH
-+	fi
-+    fi;;
-+    yes) ARCH=$arch
-+esac
-+
-+# executable extension
-+
-+case $ARCH in
-+    win32) 
-+      EXE=".exe"
-+      DLLEXT=".dll";;
-+    *) EXE=""
-+       DLLEXT=".so"
-+esac
-+
-+# Is the source tree checked out from a recognised
-+# version control system ?
-+if test -e .svn/entries ; then 
-+    checkedout=svn
-+elif [ -d '{arch}' ]; then
-+    checkedout=gnuarch
-+elif [ -z "${GIT_DIR}" ] && [ -d .git ] || [ -d "${GIT_DIR}" ]; then
-+    checkedout=git
-+else
-+    checkedout=0
-+fi
-+
-+# make command
-+
-+MAKE=`which make`
-+if [ "$MAKE" != "" ]; then
-+  MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3`
-+  MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1`
-+  MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2`
-+  if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then
-+      echo "You have GNU Make $MAKEVERSION. Good!"
-+  else
-+      OK="no"
-+      if [ -x ./make ]; then
-+	  MAKEVERSION=`./make -v | head -1`
-+	  if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi
-+      fi
-+      if [ $OK = "no" ]; then
-+	  echo "GNU Make >= 3.81 is needed."
-+	  echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz"
-+	  echo "then locally installed on a Unix-style system by issuing:"
-+	  echo "  tar xzvf make-3.81.tar.gz"
-+	  echo "  cd make-3.81"
-+          echo "  ./configure"
-+          echo "  make"
-+          echo "  mv make .."
-+	  echo "  cd .."
-+	  echo "Restart then the configure script and later use ./make instead of make."
-+	  exit 1
-+      else
-+	  echo "You have locally installed GNU Make 3.81. Good!"
-+      fi
-+  fi
-+else
-+  echo "Cannot find GNU Make >= 3.81."
-+fi
-+
-+# Browser command
-+
-+if [ "$browser_spec" = "no" ]; then
-+    case $ARCH in
-+        win32) BROWSER='C:\PROGRA~1\INTERN~1\IEXPLORE %s' ;;
-+        *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;;
-+    esac
-+fi
-+
-+if [ "$wwwcoq_spec" = "no" ]; then
-+    WWWCOQ="http://coq.inria.fr/"
-+fi
-+
-+#########################################
-+# Objective Caml programs
-+
-+case $camldir_spec in
-+    no) CAMLC=`which $bytecamlc`
-+	case "$CAMLC" in
-+	    "") echo "$bytecamlc is not present in your path!"
-+		echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: "
-+		read CAMLC
-+		
-+		case "$CAMLC" in
-+		    "") CAMLC=/usr/local/bin/$bytecamlc;;
-+		    */ocamlc|*/ocamlc.opt) true;;
-+		    */) CAMLC="${CAMLC}"$bytecamlc;;
-+		    *) CAMLC="${CAMLC}"/$bytecamlc;;
-+		esac
-+	esac
-+	CAMLBIN=`dirname "$CAMLC"`;;
-+    yes) CAMLC=$camldir/$bytecamlc
-+        
-+         CAMLBIN=`dirname "$CAMLC"`
-+	 bytecamlc="$CAMLC"
-+	 nativecamlc=$CAMLBIN/$nativecamlc
-+	 ocamlexec=$CAMLBIN/ocaml
-+	 ocamldepexec=$CAMLBIN/ocamldep
-+	 ocamldocexec=$CAMLBIN/ocamldoc
-+	 ocamllexexec=$CAMLBIN/ocamllex
-+	 ocamlyaccexec=$CAMLBIN/ocamlyacc
-+	 ocamlmktopexec=$CAMLBIN/ocamlmktop
-+	 ocamlmklibexec=$CAMLBIN/ocamlmklib
-+	 camlp4oexec=$CAMLBIN/camlp4o
-+esac
-+
-+if test ! -f "$CAMLC" ; then
-+    echo "I can not find the executable '$CAMLC'. Have you installed it?"
-+    echo "Configuration script failed!"
-+    exit 1
-+fi
-+
-+# Under Windows, OCaml only understands Windows filenames (C:\...)
-+case $ARCH in
-+    win32) CAMLBIN=`cygpath -m ${CAMLBIN}`;;
-+esac
-+
-+CAMLVERSION=`"$bytecamlc" -version`
-+
-+case $CAMLVERSION in
-+    1.*|2.*|3.00|3.01|3.02|3.03|3.03alpha|3.04|3.05beta|3.05|3.06|3.07*|3.08*|3.09*)
-+	echo "Your version of Objective-Caml is $CAMLVERSION."
-+	if [ "$force_caml_version" = "yes" ]; then
-+	    echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml."
-+	else
-+	    echo "          You need Objective-Caml 3.10.2 or later."
-+	    echo "          Configuration script failed!"
-+	    exit 1
-+	fi;;
-+    ?*)
-+	CAMLP4COMPAT="-loc loc" 
-+	echo "You have Objective-Caml $CAMLVERSION. Good!";;
-+    *)
-+	echo "I found the Objective-Caml compiler but cannot find its version number!"
-+	echo "Is it installed properly?"
-+	echo "Configuration script failed!"
-+	exit 1;;
-+esac
-+
-+CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"`
-+
-+# For coqmktop & bytecode compiler
-+
-+case $ARCH in
-+    win32) # Awfull trick to get around a ^M problem at the end of CAMLLIB
-+      CAMLLIB=`"$CAMLC" -where | sed -e 's/^\(.*\)$/\1/'` ;;
-+    *)
-+      CAMLLIB=`"$CAMLC" -where`
-+esac
-+
-+if [ "$coq_debug_flag" = "-g" ]; then
-+    case $CAMLTAG in
-+        OCAML31*)
-+            # Compilation debug flag
-+            coq_debug_flag_opt="-g"
-+            ;;
-+    esac
-+fi
-+
-+# Native dynlink
-+if [ "$natdynlink" = "yes" -a -f `"$CAMLC" -where`/dynlink.cmxa ]; then
-+    HASNATDYNLINK=true
-+else
-+    HASNATDYNLINK=false
-+fi
-+
-+case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in
-+    true,Darwin,9.*,3.11.*)  # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy
-+        NATDYNLINKFLAG=os5fixme;;
-+    #Possibly a problem on 10.6.0/10.6.1/10.6.2
-+    #May just be a 32 vs 64 problem for all 10.6.*
-+    true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0
-+        NATDYNLINKFLAG=os5fixme;;
-+    true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1
-+        NATDYNLINKFLAG=os5fixme;;
-+    true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2
-+        NATDYNLINKFLAG=os5fixme;;
-+    true,Darwin,10.*,3.11.*)
-+        if [ `getconf LONG_BIT` = "32" ]; then
-+	    # Still a problem for x86_32
-+            NATDYNLINKFLAG=os5fixme
-+        else
-+	    # Not a problem for x86_64
-+            NATDYNLINKFLAG=$HASNATDYNLINK
-+        fi;;
-+    *)
-+        NATDYNLINKFLAG=$HASNATDYNLINK;;
-+esac
-+
-+# Camlp4 / Camlp5 configuration
-+
-+if [ "$camlp5dir" != "" ]; then
-+    CAMLP4=camlp5
-+    CAMLP4LIB=$camlp5dir
-+    if [ ! -f $camlp5dir/camlp5.cma ]; then
-+	echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)."
-+	echo "Configuration script failed!"
-+	exit 1
-+    fi
-+    camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
-+else
-+    case $CAMLTAG in
-+        OCAML31*)
-+            if [ -x "${CAMLLIB}/camlp5" ]; then
-+                CAMLP4LIB=+camlp5
-+            elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then
-+                CAMLP4LIB=+site-lib/camlp5
-+            else
-+	        echo "Objective Caml $CAMLVERSION found but no Camlp5 installed."
-+	        echo "Configuration script failed!"
-+	        exit 1
-+            fi
-+            CAMLP4=camlp5
-+            camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
-+            ;;
-+        *)
-+            CAMLP4=camlp4
-+            CAMLP4LIB=+camlp4
-+            ;;
-+    esac
-+fi
-+
-+if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then
-+    echo "Camlp5 version 5.00 not supported: versions 4.0x or >= 5.01 are OK"
-+    echo "(depending also on your ocaml version)."
-+    echo "Configuration script failed!"
-+    exit 1
-+fi
-+
-+
-+case $CAMLP4LIB in
-+    +*) FULLCAMLP4LIB=$CAMLLIB/`echo $CAMLP4LIB | cut -b 2-`;;
-+    *)  FULLCAMLP4LIB=$CAMLP4LIB;;
-+esac
-+
-+# Assume that camlp(4|5) binaries are at the same place as ocaml ones
-+# (this should become configurable some day) 
-+CAMLP4BIN=${CAMLBIN}
-+
-+# do we have a native compiler: test of ocamlopt and its version
-+
-+if [ "$best_compiler" = "opt" ] ; then
-+  if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then
-+      CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `
-+      if [ "`uname -s`" = "Darwin" -a "$ARCH" = "i386" ]; then
-+	  case $CAMLOPTVERSION in
-+	      3.09.3|3.1?*) ;;
-+	      *) echo "Native compilation on MacOS X Pentium requires Objective-Caml >= 3.09.3,"
-+		 best_compiler=byte
-+		 echo "only the bytecode version of Coq will be available."
-+	  esac
-+      elif [ ! -f $FULLCAMLP4LIB/gramlib.cmxa ]; then
-+	  best_compiler=byte
-+	  echo "Cannot find native-code $CAMLP4,"
-+	  echo "only the bytecode version of Coq will be available."
-+      else
-+        if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then
-+	  echo "Native and bytecode compilers do not have the same version!"
-+        fi
-+        echo "You have native-code compilation. Good!"
-+      fi
-+  else
-+      best_compiler=byte
-+      echo "You have only bytecode compilation."
-+  fi
-+fi
-+
-+# OS dependent libraries
-+
-+case $ARCH in
-+  sun4*) OS=`uname -r`
-+	case $OS in
-+	   5*) OS="Sun Solaris $OS"
-+	       OSDEPLIBS="-cclib -lunix -cclib -lnsl -cclib -lsocket";;
-+	   *) OS="Sun OS $OS"
-+	      OSDEPLIBS="-cclib -lunix"
-+        esac;;
-+  alpha) OSDEPLIBS="-cclib -lunix";;
-+  win32) OS="Win32" 
-+	 OSDEPLIBS="-cclib -lunix"
-+	 cflags="-mno-cygwin $cflags";;
-+  *) OSDEPLIBS="-cclib -lunix"
-+esac
-+
-+# lablgtk2 and CoqIDE
-+
-+# -byte-only should imply -coqide byte, unless the user decides otherwise
-+
-+if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then 
-+    coqide_spec=yes
-+    COQIDE=byte
-+fi
-+
-+# Which coqide is asked ? which one is possible ?
-+
-+if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then 
-+    echo "CoqIde disabled as requested."
-+else
-+    case $lablgtkdir_spec in
-+	no) 
-+	    if [ -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then
-+		lablgtkdir=${CAMLLIB}/lablgtk2
-+	    elif [ -f "${CAMLLIB}/site-lib/lablgtk2/glib.mli" ]; then
-+		lablgtkdir=${CAMLLIB}/site-lib/lablgtk2
-+	    fi;;
-+	yes)
-+	    if [ ! -f "$lablgtkdir/glib.mli" ]; then
-+		echo "Incorrect LablGtk2 library (glib.mli not found)."
-+		echo "Configuration script failed!"
-+		exit 1
-+	    fi;;
-+    esac
-+    if [ "$lablgtkdir" = "" ]; then
-+	echo "LablGtk2 not found: CoqIde will not be available."
-+	COQIDE=no
-+    elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then
-+	echo "LablGtk2 found but too old: CoqIde will not be available."
-+	COQIDE=no;
-+    elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then 
-+	echo "LablGtk2 found, bytecode CoqIde will be used as requested."
-+	COQIDE=byte
-+    elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" ]; then 
-+	echo "LablGtk2 found, no native threads: bytecode CoqIde will be available."
-+	COQIDE=byte
-+    else 
-+	echo "LablGtk2 found, native threads: native CoqIde will be available."
-+	COQIDE=opt
-+    fi
-+fi
-+
-+case $COQIDE in
-+    byte|opt)
-+        case $lablgtkdir_spec in
-+            no)  LABLGTKLIB=+lablgtk2                   # Pour le message
-+                 LABLGTKINCLUDES="-I $LABLGTKLIB";;     # Pour le makefile
-+            yes) LABLGTKLIB="$lablgtkdir"               # Pour le message
-+                 LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile
-+        esac;;
-+    no) LABLGTKINCLUDES="";;
-+esac
-+
-+# strip command
-+
-+case $ARCH in
-+    win32)
-+	# true -> strip : it exists under cygwin !
-+	STRIPCOMMAND="strip";; 
-+    *)
-+    if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] ||
-+       [ "`uname -s`" = "Darwin" -a "$HASNATDYNLINK" = "true" ]
-+    then
-+	STRIPCOMMAND="true"
-+    else
-+	STRIPCOMMAND="strip"
-+    fi
-+esac
-+
-+# mktexlsr
-+#MKTEXLSR=`which mktexlsr`
-+#case $MKTEXLSR in
-+#    "") MKTEXLSR=true;;
-+#esac
-+
-+# "
-+### Test if documentation can be compiled (latex, hevea)
-+
-+if test "$with_doc" = "all" 
-+then
-+    for cmd in "latex" "hevea" ; do
-+	if test ! -x "`which $cmd`"
-+	then 
-+	    echo "$cmd was not found; documentation will not be available"
-+	    with_doc=no
-+	    break
-+	fi
-+    done
-+fi
-+
-+###########################################
-+# bindir, libdir, mandir, docdir, etc.
-+
-+case $src_spec in
-+  no) COQTOP=${COQSRC}
-+esac
-+
-+# OCaml only understand Windows filenames (C:\...)
-+case $ARCH in
-+    win32) COQTOP=`cygpath -m ${COQTOP}`
-+esac
-+
-+case $ARCH in
-+  win32)
-+	 bindir_def='C:\coq\bin'
-+	 libdir_def='C:\coq\lib'
-+	 mandir_def='C:\coq\man'
-+	 docdir_def='C:\coq\doc'
-+	 emacslib_def='C:\coq\emacs'
-+         coqdocdir_def='C:\coq\latex';;
-+  *)
-+	 bindir_def=/usr/local/bin
-+	 libdir_def=/usr/local/lib/coq
-+	 mandir_def=/usr/local/man
-+	 docdir_def=/usr/local/share/doc/coq
-+	 emacslib_def=/usr/local/share/emacs/site-lisp
-+         coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;;
-+esac
-+
-+emacs_def=emacs
-+
-+case $bindir_spec/$prefix_spec/$local in
-+    yes/*/*) BINDIR=$bindir ;;
-+    */yes/*) BINDIR=$prefix/bin ;;
-+    */*/true) BINDIR=$COQTOP/bin ;;
-+    *) printf "Where should I install the Coq binaries [$bindir_def]? "
-+        read BINDIR
-+	case $BINDIR in
-+	    "") BINDIR=$bindir_def;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+case $libdir_spec/$prefix_spec/$local in
-+    yes/*/*) LIBDIR=$libdir;;
-+    */yes/*)
-+        case $ARCH in
-+          win32) LIBDIR=$prefix ;;
-+          *)  LIBDIR=$prefix/lib/coq ;;
-+        esac ;;
-+    */*/true) LIBDIR=$COQTOP ;;
-+    *)  printf "Where should I install the Coq library [$libdir_def]? "
-+        read LIBDIR
-+	case $LIBDIR in
-+	    "") LIBDIR=$libdir_def;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+case $mandir_spec/$prefix_spec/$local in
-+    yes/*/*) MANDIR=$mandir;;
-+    */yes/*) MANDIR=$prefix/man ;;
-+    */*/true) MANDIR=$COQTOP/man ;;
-+    *)  printf "Where should I install the Coq man pages [$mandir_def]? "
-+        read MANDIR
-+	case $MANDIR in
-+	    "") MANDIR=$mandir_def;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+case $docdir_spec/$prefix_spec/$local in
-+    yes/*/*) DOCDIR=$docdir; HTMLREFMANDIR=$DOCDIR/html/refman;;
-+    */yes/*) DOCDIR=$prefix/share/doc/coq; HTMLREFMANDIR=$DOCDIR/html/refman;;
-+    */*/true) DOCDIR=$COQTOP/doc; HTMLREFMANDIR=$DOCDIR/refman/html;;
-+    *)  printf "Where should I install the Coq documentation [$docdir_def]? "
-+        read DOCDIR
-+	case $DOCDIR in
-+	    "") DOCDIR=$docdir_def; HTMLREFMANDIR=$DOCDIR/html/refman;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+case $emacslib_spec/$prefix_spec/$local in
-+    yes/*/*) EMACSLIB=$emacslib;;
-+    */yes/*)
-+        case $ARCH in
-+          win32) EMACSLIB=$prefix/emacs ;;
-+          *)  EMACSLIB=$prefix/share/emacs/site-lisp ;;
-+        esac ;;
-+    */*/true) EMACSLIB=$COQTOP/tools/emacs ;;
-+    *) printf "Where should I install the Coq Emacs mode [$emacslib_def]? "
-+        read EMACSLIB
-+	case $EMACSLIB in
-+	    "") EMACSLIB=$emacslib_def;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+case $coqdocdir_spec/$prefix_spec/$local in
-+    yes/*/*) COQDOCDIR=$coqdocdir;;
-+    */yes/*)
-+        case $ARCH in
-+          win32) COQDOCDIR=$prefix/latex ;;
-+          *)  COQDOCDIR=$prefix/share/emacs/site-lisp ;;
-+        esac ;;
-+    */*/true) COQDOCDIR=$COQTOP/tools/coqdoc ;;
-+    *) printf "Where should I install Coqdoc TeX/LaTeX files [$coqdocdir_def]? "
-+        read COQDOCDIR
-+	case $COQDOCDIR in
-+	    "") COQDOCDIR=$coqdocdir_def;;
-+	    *) true;;
-+	esac;;
-+esac
-+
-+# Determine if we enable -custom by default (Windows and MacOS)
-+CUSTOM_OS=no
-+if [ "$ARCH" = "win32" ] || [ "`uname -s`" = "Darwin" ]; then
-+    CUSTOM_OS=yes
-+fi
-+
-+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!"
-+case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in
-+    yes/*/*/*) COQRUNBYTEFLAGS="$coqrunbyteflags";;
-+    */*/yes/*|*/*/*/yes) COQRUNBYTEFLAGS="-custom";;
-+    */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";;
-+    *)
-+        COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'"
-+        BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";;
-+esac
-+case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in
-+    yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";;
-+    */yes/*|*/*/yes) COQTOOLSBYTEFLAGS="-custom";;
-+    *) COQTOOLSBYTEFLAGS="";;
-+esac
-+
-+# case $emacs_spec in
-+#     no) printf "Which Emacs command should I use to compile coq.el [$emacs_def]? "
-+#         read EMACS
-+	
-+# 	case $EMACS in
-+# 	    "") EMACS=$emacs_def;;
-+# 	    *) true;;
-+# 	esac;;
-+#     yes) EMACS=$emacs;;
-+# esac
-+
-+
-+
-+###########################################
-+# Summary of the configuration
-+
-+echo ""
-+echo "  Coq top directory                 : $COQTOP"
-+echo "  Architecture                      : $ARCH"
-+if test ! -z "$OS" ; then
-+  echo "  Operating system                  : $OS"
-+fi
-+echo "  Coq VM bytecode link flags        : $COQRUNBYTEFLAGS"
-+echo "  Coq tools bytecode link flags     : $COQTOOLSBYTEFLAGS"
-+echo "  OS dependent libraries            : $OSDEPLIBS"
-+echo "  Objective-Caml/Camlp4 version     : $CAMLVERSION"
-+echo "  Objective-Caml/Camlp4 binaries in : $CAMLBIN"
-+echo "  Objective-Caml library in         : $CAMLLIB"
-+echo "  Camlp4 library in                 : $CAMLP4LIB"
-+if test "$best_compiler" = opt ; then
-+echo "  Native dynamic link support       : $HASNATDYNLINK"
-+fi
-+if test "$COQIDE" != "no"; then
-+echo "  Lablgtk2 library in               : $LABLGTKLIB"
-+fi
-+if test "$with_doc" = "all"; then
-+echo "  Documentation                     : All"
-+else
-+echo "  Documentation                     : None"
-+fi
-+echo "  CoqIde                            : $COQIDE"
-+echo "  Web browser                       : $BROWSER"
-+echo "  Coq web site                      : $WWWCOQ"
-+echo ""
-+
-+echo "  Paths for true installation:"
-+echo "    binaries      will be copied in $BINDIR"
-+echo "    library       will be copied in $LIBDIR"
-+echo "    man pages     will be copied in $MANDIR"
-+echo "    documentation will be copied in $DOCDIR"
-+echo "    emacs mode    will be copied in $EMACSLIB"
-+echo ""
-+
-+##################################################
-+# Building the $COQTOP/dev/ocamldebug-coq file
-+##################################################
-+
-+OCAMLDEBUGCOQ=$COQSRC/dev/ocamldebug-coq
-+
-+if test "$coq_debug_flag" = "-g" ; then
-+  rm -f $OCAMLDEBUGCOQ
-+  sed -e "s|COQTOPDIRECTORY|$COQTOP|" \
-+      -e "s|COQLIBDIRECTORY|$LIBDIR|" \
-+      -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \
-+      -e "s|CAMLP4LIBDIRECTORY|$FULLCAMLP4LIB|"\
-+      $OCAMLDEBUGCOQ.template > $OCAMLDEBUGCOQ
-+  chmod a-w,a+x $OCAMLDEBUGCOQ
-+fi
-+
-+####################################################
-+# Fixing lablgtk types (before/after 2.6.0) 
-+####################################################
-+
-+if [ ! "$COQIDE" = "no" ]; then 
-+    if grep "class view " "$lablgtkdir/gText.mli" | grep -q "\[>" ; then
-+       if grep -q "?accepts_tab:bool" "$lablgtkdir/gText.mli" ; then
-+        cp -f ide/undo_lablgtk_ge212.mli ide/undo.mli
-+       else
-+	cp -f ide/undo_lablgtk_ge26.mli ide/undo.mli
-+       fi
-+    else
-+	cp -f ide/undo_lablgtk_lt26.mli ide/undo.mli
-+    fi
-+fi  
-+
-+##############################################
-+# Creation of configuration files
-+##############################################
-+
-+mlconfig_file="$COQSRC/config/coq_config.ml"
-+config_file="$COQSRC/config/Makefile"
-+config_template="$COQSRC/config/Makefile.template"
-+
-+
-+### Warning !!
-+### After this line, be careful when using variables,
-+### since some of them (e.g. $COQSRC) will be escaped
-+
-+
-+# An escaped version of a variable
-+escape_var () {
-+"$ocamlexec" 2>&1 1>/dev/null <<EOF
-+  prerr_endline(String.escaped(Sys.getenv"$VAR"));;
-+EOF
-+}
-+
-+# Escaped version of browser command
-+export BROWSER
-+BROWSER=`VAR=BROWSER escape_var`
-+
-+# damned backslashes under M$Windows
-+case $ARCH in
-+    win32)
-+	COQTOP=`echo $COQTOP |sed -e 's|\\\|\\\\\\\|g'`
-+	BINDIR=`echo $BINDIR |sed -e 's|\\\|\\\\\\\|g'`
-+	COQSRC=`cygpath -m $COQSRC |sed -e 's|\\\|\\\\\\\|g'`
-+	LIBDIR=`echo $LIBDIR |sed -e 's|\\\|\\\\\\\|g'`
-+	CAMLBIN=`echo $CAMLBIN |sed -e 's|\\\|\\\\\\\|g'`
-+	CAMLLIB=`echo $CAMLLIB |sed -e 's|\\\|\\\\\\\|g'`
-+	MANDIR=`echo $MANDIR |sed -e 's|\\\|\\\\\\\|g'`
-+	DOCDIR=`echo $DOCDIR |sed -e 's|\\\|\\\\\\\|g'`
-+	EMACSLIB=`echo $EMACSLIB |sed -e 's|\\\|\\\\\\\|g'`
-+	COQDOCDIR=`echo $COQDOCDIR |sed -e 's|\\\|\\\\\\\|g'`
-+	CAMLP4BIN=`echo $CAMLP4BIN |sed -e 's|\\\|\\\\\\\|g'`
-+	CAMLP4LIB=`echo $CAMLP4LIB |sed -e 's|\\\|\\\\\\\|g'`
-+	LABLGTKINCLUDES=`echo $LABLGTKINCLUDES |sed -e 's|\\\|\\\\\\\|g'`
-+	COQRUNBYTEFLAGS=`echo $COQRUNBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'`
-+	COQTOOLSBYTEFLAGS=`echo $COQTOOLSBYTEFLAGS |sed -e 's|\\\|\\\\\\\|g'`
-+	BUILDLDPATH=`echo $BUILDLDPATH |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamlexec=`echo $ocamlexec |sed -e 's|\\\|\\\\\\\|g'`
-+	bytecamlc=`echo $bytecamlc |sed -e 's|\\\|\\\\\\\|g'`
-+	nativecamlc=`echo $nativecamlc |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamlmklibexec=`echo $ocamlmklibexec |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamldepexec=`echo $ocamldepexec |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamldocexec=`echo $ocamldocexec |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamllexexec=`echo $ocamllexexec |sed -e 's|\\\|\\\\\\\|g'`
-+	ocamlyaccexec=`echo $ocamlyaccexec |sed -e 's|\\\|\\\\\\\|g'`
-+	camlp4oexec=`echo $camlp4oexec |sed -e 's|\\\|\\\\\\\|g'`
-+    ;;
-+esac
-+
-+#####################################################
-+# Building the $COQTOP/config/coq_config.ml file
-+#####################################################
-+
-+rm -f "$mlconfig_file"
-+cat << END_OF_COQ_CONFIG > $mlconfig_file
-+(* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
-+
-+let local = $local
-+let coqrunbyteflags = "$COQRUNBYTEFLAGS"
-+let coqlib = "$LIBDIR"
-+let coqsrc = "$COQSRC"
-+let ocaml = "$ocamlexec"
-+let ocamlc = "$bytecamlc"
-+let ocamlopt = "$nativecamlc"
-+let ocamlmklib = "$ocamlmklibexec"
-+let ocamldep = "$ocamldepexec"
-+let ocamldoc = "$ocamldocexec"
-+let ocamlyacc = "$ocamlyaccexec"
-+let ocamllex = "$ocamllexexec"
-+let camlbin = "$CAMLBIN"
-+let camllib = "$CAMLLIB"
-+let camlp4 = "$CAMLP4"
-+let camlp4o = "$camlp4oexec"
-+let camlp4bin = "$CAMLP4BIN"
-+let camlp4lib = "$CAMLP4LIB"
-+let camlp4compat = "$CAMLP4COMPAT"
-+let coqideincl = "$LABLGTKINCLUDES"
-+let cflags = "$cflags"
-+let best = "$best_compiler"
-+let arch = "$ARCH"
-+let has_coqide = "$COQIDE"
-+let has_natdynlink = $HASNATDYNLINK
-+let natdynlinkflag = "$NATDYNLINKFLAG"
-+let osdeplibs = "$OSDEPLIBS"
-+let version = "$VERSION"
-+let caml_version = "$CAMLVERSION"
-+let date = "$DATE"
-+let compile_date = "$COMPILEDATE"
-+let vo_magic_number = $VOMAGIC
-+let state_magic_number = $STATEMAGIC
-+let exec_extension = "$EXE"
-+let with_geoproof = ref $with_geoproof
-+let browser = "$BROWSER"
-+let wwwcoq = "$WWWCOQ"
-+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/"
-+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/"
-+let localwwwrefman = "file://$HTMLREFMANDIR/"
-+
-+END_OF_COQ_CONFIG
-+
-+# to be sure printf is found on windows when spaces occur in PATH variable
-+PRINTF=`which printf`
-+
-+# Subdirectories of theories/ added in coq_config.ml
-+subdirs () {
-+    (cd $1; find * \( -name .svn -prune \) -o \( -type d -exec $PRINTF "\"%s\";\n" {} \; \) >> "$mlconfig_file")
-+}
-+
-+echo "let theories_dirs = [" >> "$mlconfig_file"
-+subdirs theories
-+echo "]" >> "$mlconfig_file"
-+
-+echo "let plugins_dirs = [" >> "$mlconfig_file"
-+subdirs plugins
-+echo "]" >> "$mlconfig_file"
-+
-+chmod a-w "$mlconfig_file"
-+
-+
-+###############################################
-+# Building the $COQTOP/config/Makefile file
-+###############################################
-+
-+rm -f "$config_file"
-+
-+sed -e "s|LOCALINSTALLATION|$local|" \
-+    -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \
-+    -e "s|XCOQTOOLSBYTEFLAGS|$COQTOOLSBYTEFLAGS|" \
-+    -e "s|COQSRCDIRECTORY|$COQSRC|" \
-+    -e "s|COQVERSION|$VERSION|" \
-+    -e "s|BINDIRDIRECTORY|$BINDIR|" \
-+    -e "s|COQLIBDIRECTORY|$LIBDIR|" \
-+    -e "s|BUILDLDPATH=|$BUILDLDPATH|" \
-+    -e "s|MANDIRDIRECTORY|$MANDIR|" \
-+    -e "s|DOCDIRDIRECTORY|$DOCDIR|" \
-+    -e "s|EMACSLIBDIRECTORY|$EMACSLIB|" \
-+    -e "s|EMACSCOMMAND|$EMACS|" \
-+    -e "s|COQDOCDIRECTORY|$COQDOCDIR|" \
-+    -e "s|MKTEXLSRCOMMAND|$MKTEXLSR|" \
-+    -e "s|ARCHITECTURE|$ARCH|" \
-+    -e "s|OSDEPENDENTLIBS|$OSDEPLIBS|" \
-+    -e "s|OSDEPENDENTP4OPTFLAGS|$OSDEPP4OPTFLAGS|" \
-+    -e "s|CAMLLIBDIRECTORY|$CAMLLIB|" \
-+    -e "s|CAMLTAG|$CAMLTAG|" \
-+    -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \
-+    -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \
-+    -e "s|CAMLP4TOOL|$camlp4oexec|" \
-+    -e "s|CAMLP4COMPATFLAGS|$CAMLP4COMPAT|" \
-+    -e "s|LABLGTKINCLUDES|$LABLGTKINCLUDES|" \
-+    -e "s|COQDEBUGFLAGOPT|$coq_debug_flag_opt|" \
-+    -e "s|COQDEBUGFLAG|$coq_debug_flag|" \
-+    -e "s|COQPROFILEFLAG|$coq_profile_flag|" \
-+    -e "s|CAMLANNOTATEFLAG|$coq_annotate_flag|" \
-+    -e "s|CCOMPILEFLAGS|$cflags|" \
-+    -e "s|BESTCOMPILER|$best_compiler|" \
-+    -e "s|DLLEXTENSION|$DLLEXT|" \
-+    -e "s|EXECUTEEXTENSION|$EXE|" \
-+    -e "s|BYTECAMLC|$bytecamlc|" \
-+    -e "s|OCAMLMKLIBEXEC|$ocamlmklibexec|" \
-+    -e "s|NATIVECAMLC|$nativecamlc|" \
-+    -e "s|OCAMLEXEC|$ocamlexec|" \
-+    -e "s|OCAMLDEPEXEC|$ocamldepexec|" \
-+    -e "s|OCAMLDOCEXEC|$ocamldocexec|" \
-+    -e "s|OCAMLLEXEXEC|$ocamllexexec|" \
-+    -e "s|OCAMLYACCEXEC|$ocamlyaccexec|" \
-+    -e "s|CAMLMKTOPEXEC|$ocamlmktopexec|" \
-+    -e "s|CCEXEC|$gcc_exec|" \
-+    -e "s|AREXEC|$ar_exec|" \
-+    -e "s|RANLIBEXEC|$ranlib_exec|" \
-+    -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \
-+    -e "s|COQIDEOPT|$COQIDE|" \
-+    -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \
-+    -e "s|WITHDOCOPT|$with_doc|" \
-+    -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \
-+      "$config_template" > "$config_file"
-+
-+chmod a-w "$config_file"
-+
-+##################################################
-+# The end
-+####################################################
-+
-+echo "If anything in the above is wrong, please restart './configure'."
-+echo
-+echo "*Warning* To compile the system for a new architecture"
-+echo "          don't forget to do a 'make archclean' before './configure'."
-+
-+# $Id: configure 14833 2011-12-19 21:57:30Z notin $
diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch
deleted file mode 100644
index 0f917fbf56d4..000000000000
--- a/pkgs/applications/science/logic/coq/no-codesign.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Makefile.build b/Makefile.build
-index 2963a3d..876479c 100644
---- a/Makefile.build
-+++ b/Makefile.build
-@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS)
- OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS)
- DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils
- 
--ifeq ($(ARCH),Darwin)
--LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist"
--CODESIGN=codesign -s -
--else
- LINKMETADATA=
- CODESIGN=true
--endif
- 
- define bestocaml
- $(if $(OPT),\
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f06044829b4d..1617f9330b49 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -329,7 +329,7 @@ mapAliases ({
   callPackage_i686 = pkgsi686Linux.callPackage;
 
   inherit (ocaml-ng) # added 2016-09-14
-    ocamlPackages_3_11_2 ocamlPackages_3_12_1
+    ocamlPackages_3_12_1
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
     ocamlPackages_4_03
     ocamlPackages_latest;
@@ -348,7 +348,6 @@ mapAliases ({
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-  ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
   ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
   ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
   ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ed05e4972f1..632b88c8012c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21148,12 +21148,11 @@ with pkgs;
   boogie = dotnetPackages.Boogie;
 
   inherit (callPackage ./coq-packages.nix {
-    inherit (ocaml-ng) ocamlPackages_3_12_1
-                       ocamlPackages_4_02
+    inherit (ocaml-ng) ocamlPackages_4_02
                        ocamlPackages_4_05
     ;
   }) mkCoqPackages
-    coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8
+    coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8
     coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8
     coqPackages coq
   ;
@@ -21232,7 +21231,17 @@ with pkgs;
 
   ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
 
-  inherit (ocaml-ng.ocamlPackages_3_11_2) matita;
+  #inherit (ocaml-ng.ocamlPackages_3_11_2) matita;
+
+  # Current version is 0.5.8. Official website says:
+
+  # Version 0.5.9, released on December 23, 2014, is an update of version 0.5.8
+  # to compile with the latter OCaml version and libraries.
+  # It is unsupported, but still used for teaching at the University of Bologna.
+
+  # It should allow us removing the dependency on OCaml 3.11 but I haven't been
+  # able to confirm because Matita depends on lablgtkmathview-0.7.2 which
+  # already reports as broken.
 
   matita_130312 = lowPrio ocamlPackages.matita_130312;
 
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index bc21137903af..305d9ba351ba 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -1,6 +1,5 @@
 { lib, callPackage, newScope, recurseIntoAttrs
 , gnumake3
-, ocamlPackages_3_12_1
 , ocamlPackages_4_02
 , ocamlPackages_4_05
 }:
@@ -56,12 +55,6 @@ in rec {
     let self = mkCoqPackages' self coq; in
     filterCoqPackages coq self;
 
-  coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
-    make = gnumake3;
-    inherit (ocamlPackages_3_12_1) ocaml findlib;
-    camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
-    lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
-  };
   coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
     inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
     camlp5 = ocamlPackages_4_02.camlp5_transitional;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 026bab235065..ee0f554efa3f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1065,8 +1065,6 @@ in rec
 
   inherit mkOcamlPackages;
 
-  ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; });
-
   ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; });
 
   ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { });

From 0f8ef669ac3988bc731e9722609f80994755ffc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:10:05 +0200
Subject: [PATCH 2614/3253] ocamlPackages_3_12_1: remove

---
 pkgs/top-level/aliases.nix        | 2 --
 pkgs/top-level/ocaml-packages.nix | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1617f9330b49..fe0d3816413e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -329,7 +329,6 @@ mapAliases ({
   callPackage_i686 = pkgsi686Linux.callPackage;
 
   inherit (ocaml-ng) # added 2016-09-14
-    ocamlPackages_3_12_1
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
     ocamlPackages_4_03
     ocamlPackages_latest;
@@ -348,7 +347,6 @@ mapAliases ({
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-  ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
   ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml;
   ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml;
   ocaml_4_02   = ocamlPackages_4_02.ocaml;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ee0f554efa3f..4de581e2932d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1065,8 +1065,6 @@ in rec
 
   inherit mkOcamlPackages;
 
-  ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; });
-
   ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { });
 
   ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { });

From e2407c1e057c46c65db8ff71979292b7b1f4bb5e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 21:32:14 +0200
Subject: [PATCH 2615/3253] dbus-sharp-[glib]: add license

---
 .../libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix            | 1 +
 pkgs/development/libraries/dbus-sharp-glib/default.nix           | 1 +
 pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix         | 1 +
 pkgs/development/libraries/dbus-sharp/default.nix                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 208288bfca1d..0f897d97467f 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index ef1ddd9bfff5..cd020317f4c2 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus for .NET: GLib integration module";
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 013913e52972..18ea3ad3ecb7 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 855dd9f3832e..2704ef2de9fd 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D-Bus for .NET";
     platforms = platforms.linux;
+    license = licenses.mit;
   };
 }

From e6c947ad7065eceb1a8c56563db1cb96d66d44f1 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 21:11:14 +0200
Subject: [PATCH 2616/3253] opensm: use native shell to run autogen.sh

---
 pkgs/tools/networking/opensm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index 075ceff3555e..ea20306e26f2 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -15,7 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ rdma-core ];
 
-  preConfigure = "bash ./autogen.sh";
+  preConfigure = ''
+    patchShebangs ./autogen.sh
+    ./autogen.sh
+  '';
 
   enableParallelBuilding = true;
 

From a3962299f14944a0e9ccf8fd84bd7be524b74cd6 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 8 Oct 2018 15:52:21 -0400
Subject: [PATCH 2617/3253] vscode: 1.27.2 -> 1.28.0

---
 pkgs/applications/editors/vscode/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 3f23021b6d82..b8a717fc0e70 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.27.2";
+  version = "1.28.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "33704d089b03c636e8c46d434068c97b66e5a9d323b991bd327067aa90e87afa";
-    "x86_64-linux" = "11023c652dd89bde1b7fbc8a7dc04fd4f87df3bfe6952a1c0ad75ab861e3196d";
-    "x86_64-darwin" = "d1f2d046775406e6f339883dab432fcaa149e763ccfcd017556a46e890de6476";
+    "i686-linux" = "0f54py00lmw96x47nk823gwxxc9kr9haaa821ggi974ycr54af0y";
+    "x86_64-linux" = "07bbzm1159k2gkajj6z7dsr0kmadd5gx721w92r252i5hcwg5sx4";
+    "x86_64-darwin" = "019cl2rswls3gwwa8y70cllc4jnd8xj0y2m9rvg2rz695snp6rcm";
   }.${stdenv.hostPlatform.system};
 
   archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz";

From 5a8a98252612cb1de63d3ce6dec1a488aaeb057c Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Sun, 7 Oct 2018 17:37:59 +0100
Subject: [PATCH 2618/3253] gramps: add support for recommended packages

The GRAMPS readme indicates there are a number of recommended packages (graphviz, ghostscript,
PyICU and osm-gps-map which was already supported).  These default to true.
---
 pkgs/applications/misc/gramps/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index b12b84d106dc..dd8cdef4df1a 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3,
   pango, gobjectIntrospection, wrapGAppsHook,
 # Optional packages:
- enableOSM ? true, osm-gps-map
+ enableOSM ? true, osm-gps-map,
+ enableGraphviz ? true, graphviz,
+ enableGhostscript ? true, ghostscript
  }:
 
 let
@@ -14,6 +16,11 @@ in buildPythonApplication rec {
   buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] 
     # Map support
     ++ stdenv.lib.optional enableOSM osm-gps-map
+    # Graphviz support
+    ++ stdenv.lib.optional enableGraphviz graphviz
+    # Ghostscript support
+    ++ stdenv.lib.optional enableGhostscript ghostscript
+    
   ;
 
   src = fetchFromGitHub {

From 2b93aed3ccfddc1516d5d8be35ff171f5fbcd181 Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Sun, 7 Oct 2018 17:46:29 +0100
Subject: [PATCH 2619/3253] gramps: add joncojonathan to package maintainers

---
 pkgs/applications/misc/gramps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index dd8cdef4df1a..413679afd219 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -60,5 +60,6 @@ in buildPythonApplication rec {
     description = "Genealogy software";
     homepage = https://gramps-project.org;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ joncojonathan ];
   };
 }

From 82fa8d90afb5012fe6e9ffea321cb58c925132a3 Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <thilo.uttendorfer@allianz.de>
Date: Mon, 8 Oct 2018 22:08:54 +0200
Subject: [PATCH 2620/3253] ansible-lint: 3.4.20 -> 3.4.23

---
 pkgs/development/tools/ansible-lint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ansible-lint/default.nix b/pkgs/development/tools/ansible-lint/default.nix
index 16d2782b7340..c460662f4f88 100644
--- a/pkgs/development/tools/ansible-lint/default.nix
+++ b/pkgs/development/tools/ansible-lint/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   pname = "ansible-lint";
-  version = "3.4.20";
+  version = "3.4.23";
 
   src = fetchFromGitHub {
     owner = "willthames";
     repo = "ansible-lint";
     rev = "v${version}";
-    sha256 = "0wgczijrg5azn2f63hjbkas1w0f5hbvxnk3ia53w69mybk0gy044";
+    sha256 = "0cnfgxh5m7alzm811hc95jigbca5vc1pf8fjazmsakmhdjyfbpb7";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pyyaml six ] ++ [ ansible ];

From 788c070012918172e7a69fb3d7ef47a29ac41709 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 22:09:55 +0200
Subject: [PATCH 2621/3253] dclxvi: add license

---
 pkgs/development/libraries/dclxvi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
index 47f3794f5ad5..1f8f9a4e69cc 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
     maintainers = with maintainers; [ wkennington ];
     platforms = platforms.x86_64;
+    license = licenses.publicDomain;
   };
 }

From 0d57159eca8f3bfc2d009da57a253298d127d0e4 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 8 Oct 2018 22:21:09 +0200
Subject: [PATCH 2622/3253] dwarf-fortress: fix build error

---
 pkgs/games/dwarf-fortress/wrapper/default.nix | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 8d9f06ffe143..058bb5f72ae6 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildEnv, substituteAll
+{ stdenv, lib, buildEnv, substituteAll, runCommand
 , dwarf-fortress, dwarf-fortress-unfuck
 , dwarf-therapist
 , enableDFHack ? false, dfhack
@@ -33,44 +33,41 @@ let
          ++ lib.optional enableTWBT twbt.art
          ++ [ dwarf-fortress ];
 
+  fixup = lib.singleton (runCommand "fixup" {} ''
+    mkdir -p $out/data/init
+    cp ${dwarf-fortress}/data/init/init.txt $out/data/init/init.txt
+  '' + lib.optionalString enableDFHack ''
+    mkdir -p $out/hack
+
+    # Patch the MD5
+    orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig")
+    patched_md5=$(cat "${dwarf-fortress}/hash.md5")
+    input_file="${dfhack_}/hack/symbols.xml"
+    output_file="$out/hack/symbols.xml"
+
+    echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:"
+    echo "  Input:   $input_file"
+    echo "  Search:  $orig_md5"
+    echo "  Output:  $output_file"
+    echo "  Replace: $patched_md5"
+
+    substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
+  '' + lib.optionalString enableTWBT ''
+    substituteInPlace $out/data/init/init.txt \
+      --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
+  '' + ''
+    substituteInPlace $out/data/init/init.txt \
+      --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
+      --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
+      --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
+  '');
+
   env = buildEnv {
     name = "dwarf-fortress-env-${dwarf-fortress.dfVersion}";
 
-    paths = themePkg ++ pkgs;
+    paths = fixup ++ themePkg ++ pkgs;
     pathsToLink = [ "/" "/hack" "/hack/scripts" ];
 
-    postBuild = ''
-      # De-symlink init.txt
-      cp $out/data/init/init.txt init.txt
-      rm -f $out/data/init/init.txt
-      mv init.txt $out/data/init/init.txt
-    '' + lib.optionalString enableDFHack ''
-      # De-symlink symbols.xml
-      rm $out/hack/symbols.xml
-
-      # Patch the MD5
-      orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig")
-      patched_md5=$(cat "${dwarf-fortress}/hash.md5")
-      input_file="${dfhack_}/hack/symbols.xml"
-      output_file="$out/hack/symbols.xml"
-
-      echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:"
-      echo "  Input:   $input_file"
-      echo "  Search:  $orig_md5"
-      echo "  Output:  $output_file"
-      echo "  Replace: $patched_md5"
-
-      substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5"
-    '' + lib.optionalString enableTWBT ''
-      substituteInPlace $out/data/init/init.txt \
-        --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
-    '' + ''
-      substituteInPlace $out/data/init/init.txt \
-        --replace '[INTRO:YES]' '[INTRO:${unBool enableIntro}]' \
-        --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \
-        --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]'
-    '';
-
     ignoreCollisions = true;
   };
 in

From 9428c28f7a37038b594c5ff36b1669b0f21afe41 Mon Sep 17 00:00:00 2001
From: joncojonathan <joncojonathan@gmail.com>
Date: Mon, 8 Oct 2018 18:18:58 +0100
Subject: [PATCH 2623/3253] CONTRIBUTING.md: add clarification on periods in
 commit messages

---
 .github/CONTRIBUTING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 576beb18de6a..2b88f15d276e 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,6 +20,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
   (Motivation for change. Additional information.)
   ```
 
+  For consistency, there should not be a period at the end of the commit message.
+
   Examples:
 
   * nginx: init at 2.0.1

From cd2145b33229d6d4f0ad77759083699570e67f51 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 22:37:05 +0200
Subject: [PATCH 2624/3253] enchant: add license

---
 pkgs/development/libraries/enchant/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index c51475ecc2a9..a9446306d335 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ aspell glib hunspell hspell ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Generic spell checking library";
     homepage = http://www.abisource.com/enchant;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.lgpl21;
   };
 }

From abbc68a7560a085637e68cc26b7bee1594457d55 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 22:38:48 +0200
Subject: [PATCH 2625/3253] farstream: add license

---
 pkgs/development/libraries/farstream/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 020d04542864..924fb52b0900 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -24,10 +24,10 @@ in stdenv.mkDerivation rec {
     gst-plugins-good gst-plugins-bad gst-libav
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.freedesktop.org/wiki/Software/Farstream;
     description = "Audio/Video Communications Framework formely known as farsight";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }

From 5ebf16dc9e20e5ef3d6f15fce47cea724ce523d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 8 Oct 2018 22:42:31 +0200
Subject: [PATCH 2626/3253] slic3r-prusa3d: mark as broken on aarch64

---
 pkgs/applications/misc/slic3r/prusa3d.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 15517de3aed1..7df4007cf403 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
     description = "G-code generator for 3D printer";
     homepage = https://github.com/prusa3d/Slic3r;
     license = licenses.agpl3;
-    platforms = subtractLists ["aarch64-linux"] platforms.linux;
     maintainers = with maintainers; [ tweber ];
+    broken = stdenv.hostPlatform.isAarch64;
   };
 }

From 01a0b1f0c31f74b1744e40123cd0e7740c4c81e2 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 17 Jul 2018 00:10:15 +0000
Subject: [PATCH 2627/3253] kdbg: init at 3.0.0

---
 pkgs/development/tools/misc/kdbg/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/misc/kdbg/default.nix

diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix
new file mode 100644
index 000000000000..b431e804d8dc
--- /dev/null
+++ b/pkgs/development/tools/misc/kdbg/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
+  ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem,
+}:
+
+stdenv.mkDerivation rec {
+  name = "kdbg-${version}";
+  version = "3.0.0";
+  src = fetchurl {
+    url = "mirror://sourceforge/kdbg/${version}/${name}.tar.gz";
+    sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in";
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.kdbg.org/;
+    description = ''
+      A graphical user interface to gdb, the GNU debugger. It provides an
+      intuitive interface for setting breakpoints, inspecting variables, and
+      stepping through code.
+    '';
+    license = licenses.gpl2;
+    maintainers = [ maintainers.catern ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15c4a5944a16..e41f2dcb69ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3624,6 +3624,8 @@ with pkgs;
 
   lvmsync = callPackage ../tools/backup/lvmsync { };
 
+  kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
+
   kippo = callPackage ../servers/kippo { };
 
   kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { };

From 0ad87d7ae0b1e559a176b3f4c726a010604f04f2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 8 Oct 2018 22:54:55 +0200
Subject: [PATCH 2628/3253] bitlbee-discord: 2017-12-27 -> 0.4.1

---
 .../instant-messengers/bitlbee-discord/default.nix         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index 00636c7c1e9a..4dd26103cbe6 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -2,13 +2,14 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-discord-2017-12-27";
+  name = "bitlbee-discord-${version}";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
-    rev = "6a03db169ad44fee55609ecd16e19f3c0f99a182";
+    rev = version;
     owner = "sm00th";
     repo = "bitlbee-discord";
-    sha256 = "1ci9a12c6zg8d6i9f95pq6dal79cp4klmmsyj8ag2gin90kl3x95";
+    sha256 = "1n3xw5mcmg7224r09gbm39bd6h2158dwl6jx21290636b4345f4c";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From c8a2533516b4174455601572c80298d0c23b08c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 19:34:26 +0200
Subject: [PATCH 2629/3253] opencv3: Reduce closure size from 520 to 154 MiB

---
 pkgs/development/libraries/opencv/3.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index dd87fa932604..64aa11e17634 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -165,6 +165,11 @@ stdenv.mkDerivation rec {
       ${installExtraFiles face}
     '');
 
+  postConfigure = ''
+    [ -e modules/core/version_string.inc ]
+    echo '"(build info elided)"' > modules/core/version_string.inc
+  '';
+
   buildInputs =
        [ zlib pcre hdf5 glog boost google-gflags protobuf ]
     ++ lib.optional enablePython pythonPackages.python

From cd3a0b7f38e3872872db91556b6d277265e95b8e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 20:23:02 +0200
Subject: [PATCH 2630/3253] libqtav: Reduce closure size from 734 to 457 MiB

---
 pkgs/development/libraries/libqtav/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index b291ec2fdf0b..048ba48bb674 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,6 +1,6 @@
 { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
 , qtbase, qtmultimedia, qtquick1, qttools
-, libGLU_combined, libX11
+, libGL, libX11
 , libass, openal, ffmpeg, libuchardet
 , alsaLib, libpulseaudio, libva
 }:
@@ -14,7 +14,7 @@ mkDerivation rec {
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [
     qtbase qtmultimedia qtquick1
-    libGLU_combined libX11
+    libGL libX11
     libass openal ffmpeg libuchardet
     alsaLib libpulseaudio libva
   ];
@@ -27,18 +27,20 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  # Make sure libqtav finds its libGL dependancy at both link and run time
-  # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like
-  # the other libraries as `libGLU_combined` is part of our `buildInputs`.
-  NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"];
+  # Make sure libqtav finds its libGL dependency at both link and run time
+  # by adding libGL to rpath. Not sure why it wasn't done automatically like
+  # the other libraries as `libGL` is part of our `buildInputs`.
+  NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"];
 
   preFixup = ''
     mkdir -p "$out/bin"
     cp -a "./bin/"* "$out/bin"
   '';
 
+  stripDebugList = [ "lib" "libexec" "bin" "qml" ];
+
   meta = {
-    description = "A multimedia playback framework based on Qt + FFmpeg.";
+    description = "A multimedia playback framework based on Qt + FFmpeg";
     #license = licenses.lgpl21; # For the libraries / headers only.
     license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used.
     homepage = http://www.qtav.org/;

From 13c1f26807140e3821262022d43378864543ebb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 21:20:34 +0200
Subject: [PATCH 2631/3253] marble: Add dev output

---
 pkgs/applications/kde/marble.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index e0e80b05ebce..ea140cad5ee5 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -8,6 +8,7 @@
 mkDerivation {
   name = "marble";
   meta.license = with lib.licenses; [ lgpl21 gpl3 ];
+  outputs = [ "out" "dev" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
   propagatedBuildInputs = [
     qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts

From a3382a85b38227f9c82ce325150c57250c9514bb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 21:50:48 +0200
Subject: [PATCH 2632/3253] digikam: libGLU_combined -> libGL + libGLU

This prevents a runtime dependency on a large number of -dev outputs.
---
 pkgs/applications/graphics/digikam/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index a31bbe8caeb6..fb99d3e38322 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -34,7 +34,8 @@
 , libqtav
 , libusb1
 , marble
-, libGLU_combined
+, libGL
+, libGLU
 , opencv3
 , pcre
 , threadweaver
@@ -75,7 +76,8 @@ mkDerivation rec {
     liblqr1
     libqtav
     libusb1
-    libGLU_combined
+    libGL
+    libGLU
     opencv3
     pcre
 

From 1eff910a15c58873fc9bbb46934ba354bef612a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 21:59:26 +0200
Subject: [PATCH 2633/3253] lsof: Don't record compiler flags / build kernel

This removed glibc.dev from the closure and improves binary
reproducibility.
---
 pkgs/development/tools/misc/lsof/default.nix  |  2 +-
 .../tools/misc/lsof/no-build-info.patch       | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/lsof/no-build-info.patch

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 0a5a3c487810..63003f338eb9 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
+  patches = [ ./no-build-info.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-dfile.patch;
 
   postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace dialects/linux/dlsof.h --replace "defined(__UCLIBC__)" 1
diff --git a/pkgs/development/tools/misc/lsof/no-build-info.patch b/pkgs/development/tools/misc/lsof/no-build-info.patch
new file mode 100644
index 000000000000..cf785e248f2a
--- /dev/null
+++ b/pkgs/development/tools/misc/lsof/no-build-info.patch
@@ -0,0 +1,43 @@
+diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c
+--- lsof_4.91_src-orig/usage.c	2018-02-14 15:20:32.000000000 +0100
++++ lsof_4.91_src/usage.c	2018-10-08 21:57:45.718560869 +0200
+@@ -930,26 +930,6 @@
+ 		(void) fprintf(stderr, "    configuration info: %s\n", cp);
+ #endif	/* defined(LSOF_CINFO) */
+ 
+-	    if ((cp = isnullstr(LSOF_CCDATE)))
+-		(void) fprintf(stderr, "    constructed: %s\n", cp);
+-	    cp = isnullstr(LSOF_HOST);
+-	    if (!(cp1 = isnullstr(LSOF_LOGNAME)))
+-		cp1 = isnullstr(LSOF_USER);
+-	    if (cp || cp1) {
+-		if (cp && cp1)
+-		    cp2 = "by and on";
+-		else if (cp)
+-		    cp2 = "on";
+-		else
+-		    cp2 = "by";
+-		(void) fprintf(stderr, "    constructed %s: %s%s%s\n",
+-		    cp2,
+-		    cp1 ? cp1 : "",
+-		    (cp && cp1) ? "@" : "",
+-		    cp  ? cp  : ""
+-		);
+-	    }
+-
+ #if	defined(LSOF_BLDCMT)
+ 	    if ((cp = isnullstr(LSOF_BLDCMT)))
+ 		(void) fprintf(stderr, "    builder's comment: %s\n", cp);
+@@ -959,12 +939,8 @@
+ 		(void) fprintf(stderr, "    compiler: %s\n", cp);
+ 	    if ((cp = isnullstr(LSOF_CCV)))
+ 		(void) fprintf(stderr, "    compiler version: %s\n", cp);
+-	    if ((cp = isnullstr(LSOF_CCFLAGS)))
+-		(void) fprintf(stderr, "    compiler flags: %s\n", cp);
+ 	    if ((cp = isnullstr(LSOF_LDFLAGS)))
+ 		(void) fprintf(stderr, "    loader flags: %s\n", cp);
+-	    if ((cp = isnullstr(LSOF_SYSINFO)))
+-		(void) fprintf(stderr, "    system info: %s\n", cp);
+ 	    (void) report_SECURITY("    ", ".\n");
+ 	    (void) report_WARNDEVACCESS("    ", "are", ".\n");
+ 	    (void) report_HASKERNIDCK("    K", "is");

From 642b68cfcc8479903ce9db9f1735452ce523425c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 22:40:56 +0200
Subject: [PATCH 2634/3253] nfs-utils: Reduce closure size from 269 to 135 MiB

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 86e9e0d3d4d0..a86c7d75f043 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -94,6 +94,8 @@ in stdenv.mkDerivation rec {
         $out/etc/systemd/system/*
     '';
 
+  stripDebugList = [ "bin" "lib" "etc" ];
+
   # One test fails on mips.
   doCheck = !stdenv.isMips;
 

From 5352cb3748a80a5471f7ed216372aaa0cd1b465e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 8 Oct 2018 16:59:49 -0400
Subject: [PATCH 2635/3253] pythonPackages.av: 0.4.1 -> 0.5.3

---
 pkgs/development/python-modules/av/default.nix | 12 ++++++------
 pkgs/top-level/python-packages.nix             |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 7e68265eed83..4440edc22362 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -4,7 +4,7 @@
 , nose
 , pillow
 , numpy
-, ffmpeg_2
+, ffmpeg_4
 , git
 , libav
 , pkgconfig
@@ -12,16 +12,16 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "0.4.1";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f";
+    sha256 = "0k5nbff8c2wxc8wnyn1qghndbd2rjck1y3552s63w41mccj1k1qr";
   };
 
-  buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
+  buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];
 
-  # Because of https://github.com/mikeboers/PyAV/issues/152
+  # Tests require downloading files from internet
   doCheck = false;
 
   meta = {
@@ -29,4 +29,4 @@ buildPythonPackage rec {
     homepage = https://github.com/mikeboers/PyAV/;
     license = lib.licenses.bsd2;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f04a0e710d5..37ea0c59fa62 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -744,9 +744,7 @@ in {
 
   autopep8 = callPackage ../development/python-modules/autopep8 { };
 
-  av = callPackage ../development/python-modules/av {
-    inherit (pkgs) ffmpeg_2 git libav pkgconfig;
-  };
+  av = callPackage ../development/python-modules/av { };
 
   avro = callPackage ../development/python-modules/avro {};
 

From c40ba6355e244ffc120eea12b440bed9c96fb6b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 8 Oct 2018 23:02:51 +0200
Subject: [PATCH 2636/3253] Revert "nfs-utils: Reduce closure size from 269 to
 135 MiB"

This reverts commit 642b68cfcc8479903ce9db9f1735452ce523425c.
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index a86c7d75f043..86e9e0d3d4d0 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -94,8 +94,6 @@ in stdenv.mkDerivation rec {
         $out/etc/systemd/system/*
     '';
 
-  stripDebugList = [ "bin" "lib" "etc" ];
-
   # One test fails on mips.
   doCheck = !stdenv.isMips;
 

From 5a752ad8797f27e87490894a862b001560ab3c14 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 8 Oct 2018 23:05:15 +0200
Subject: [PATCH 2637/3253] nixos/gnome3: don't autoenable gdm

This seems to cause problems if people have other display-managers
enabled
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index eb86f7b53bb6..0d5b860d4617 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -133,7 +133,6 @@ in {
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ];
 
-    services.xserver.displayManager.gdm.enable = mkDefault true;
     services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
 
     services.xserver.displayManager.sessionCommands = ''

From b04da30d6554063e3483c45b2728dc86fd1935e5 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 23:05:56 +0200
Subject: [PATCH 2638/3253] libungif:  add license + description

---
 pkgs/development/libraries/giflib/libungif.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix
index 357ca751ccf1..6336d30aebad 100644
--- a/pkgs/development/libraries/giflib/libungif.nix
+++ b/pkgs/development/libraries/giflib/libungif.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library and utilities for processing GIFs";
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From 154e9e11f7517fe0824e8ebc5aa3cee32cae4610 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 8 Oct 2018 23:08:14 +0200
Subject: [PATCH 2639/3253] gobject-introspection: add licenses

---
 pkgs/development/libraries/gobject-introspection/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index b2c0a9f89a48..482710f18df5 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
     homepage    = http://live.gnome.org/GObjectIntrospection;
     maintainers = with maintainers; [ lovek323 lethalman ];
     platforms   = platforms.unix;
+    license = with licenses; [ gpl2 lgpl2 ];
 
     longDescription = ''
       GObject introspection is a middleware layer between C libraries (using

From 03bcca7a457e60bbfd80272347a2a85ff821b832 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Wed, 3 Oct 2018 18:19:21 -0700
Subject: [PATCH 2640/3253] nodePackages_8_x: add gulp-cli

---
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        | 1636 +++++++++++------
 2 files changed, 1120 insertions(+), 517 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 40d70f198abf..779e6389bd39 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -36,6 +36,7 @@
 , "grunt-cli"
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 , "gulp"
+, "gulp-cli"
 , "hipache"
 , "htmlhint"
 , "html-minifier"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index c419a0db44e1..de90e1d188c5 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -103,13 +103,13 @@ let
         sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
       };
     };
-    "@commitlint/cli-7.1.2" = {
+    "@commitlint/cli-7.2.0" = {
       name = "_at_commitlint_slash_cli";
       packageName = "@commitlint/cli";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.1.2.tgz";
-        sha512 = "Dck7MqJCzrATYm4UqIKPdJvLVUuVZcpFw9KicrLw+a9YNIjsaXG9XojgPomTxFBNJZabAYBqKWkqNoFLrFA77w==";
+        url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.0.tgz";
+        sha512 = "qFTXZoyi+XFkUXRj1pgcfRw5ao31kPkP/V3c7O8SU52GUVxFo2LM8sFiTF9WEqlgSd7WJA0SGl5tOX/VtCMYEA==";
       };
     };
     "@commitlint/config-conventional-7.1.2" = {
@@ -121,13 +121,13 @@ let
         sha512 = "DmA4ixkpv03qA1TVs1Bl25QsVym2bPL6pKapesALWIVggG3OpwqGZ55vN75Tx8xZoG7LFKrVyrt7kwhA7X8njQ==";
       };
     };
-    "@commitlint/ensure-7.1.2" = {
+    "@commitlint/ensure-7.2.0" = {
       name = "_at_commitlint_slash_ensure";
       packageName = "@commitlint/ensure";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.1.2.tgz";
-        sha512 = "F0U4UEMgB5lnscgiZtuUolFkQ/dRD4RzXs8KgCik2D0wL3fUXSB5hmfbrbMF9ERseVQCHsxCHWm7bKzxKmXgIA==";
+        url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-7.2.0.tgz";
+        sha512 = "j2AJE4eDeLP6O/Z1CdPwEXAzcrRRoeeHLuvW8bldQ4J2nHiX9hzmSe87H87Ob8Avm+zIegsqVPGaBAtRmbODYw==";
       };
     };
     "@commitlint/execute-rule-7.1.2" = {
@@ -139,40 +139,40 @@ let
         sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA==";
       };
     };
-    "@commitlint/format-7.1.2" = {
+    "@commitlint/format-7.2.0" = {
       name = "_at_commitlint_slash_format";
       packageName = "@commitlint/format";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/format/-/format-7.1.2.tgz";
-        sha512 = "l+eQChtIeNOddi4t5p+T9ViFXQMMFWIbzKh708YCI8BoByhqedhLsEhEn1nzGq1cVYT2AdGRhY8ed6/Nc5z85w==";
+        url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.0.tgz";
+        sha512 = "Vx10wFyP3yfE4tq1x0HWb/vqkZc5+79uWak91sARSu5wG5JVzBvQXxfqOhefOKbVqXGKXlP2yXrSq8fM6YUQ3w==";
       };
     };
-    "@commitlint/is-ignored-7.1.2" = {
+    "@commitlint/is-ignored-7.2.0" = {
       name = "_at_commitlint_slash_is-ignored";
       packageName = "@commitlint/is-ignored";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.1.2.tgz";
-        sha512 = "29SHreGSAKxOTtIdG1swo9E14E8KZbyE0Y1u0wz9iKjb6i0m7ahZW0l4Ty+j3pACiYDOOXDW1BWSOFaBwwKlxQ==";
+        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.0.tgz";
+        sha512 = "6HCkLSuh4hms72x0EJp9mt9UXq27MRpZtmf7exhBnYqNyd76vMMA7/nGjdULxldr2xyzlzKNjMbh2lpQRD4aog==";
       };
     };
-    "@commitlint/lint-7.1.2" = {
+    "@commitlint/lint-7.2.0" = {
       name = "_at_commitlint_slash_lint";
       packageName = "@commitlint/lint";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.1.2.tgz";
-        sha512 = "HCkMlnUZD4yVnGDHcJQN/PkJRQpKgsiLojUaUHE8b1YjWW+qviolizbZjcqs/nimzCWlAkaU5KPs+3pzGBfVug==";
+        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.0.tgz";
+        sha512 = "aZAiQggpF638/XmY7EJe5yTEhg4C4GrxWktcdEDMQrRG1phFUPp+AKXBqljDYzrpmptiL9glY3fLO1m5XzA+BA==";
       };
     };
-    "@commitlint/load-7.1.2" = {
+    "@commitlint/load-7.2.0" = {
       name = "_at_commitlint_slash_load";
       packageName = "@commitlint/load";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/load/-/load-7.1.2.tgz";
-        sha512 = "BEQ9k3iZjB1NDAblmB88WU+256p8xHCWYuqZmJOerx6Upbam7XrpDTurMOKFUxk8tZU9OBqHQtBapX8UxJWi9A==";
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.0.tgz";
+        sha512 = "+7rh1jeYhSMj6+zzZVbo5bMnuWx1nL4c5JJdEq3rMQT6ILI169xlL94sPdkz0to6dDmi4yLgC4/kipyLyynriA==";
       };
     };
     "@commitlint/message-7.1.2" = {
@@ -211,13 +211,13 @@ let
         sha512 = "zwbifMB9DeHP4sYQdrkx+XJh5Q1lyP/OdlErUCC34NV4Lkxw/XxXF4St3e+y1X28/SgrEc2XSOS6n/vQQfUlLA==";
       };
     };
-    "@commitlint/rules-7.1.2" = {
+    "@commitlint/rules-7.2.0" = {
       name = "_at_commitlint_slash_rules";
       packageName = "@commitlint/rules";
-      version = "7.1.2";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.1.2.tgz";
-        sha512 = "O9fONZXiJ6NN2mfy+enHmeTzBHcfDVVYjxTdBJFp99yUSvVyHaD+jc2r795gcMv3oP5594BDXSKcD/3yb8sLzA==";
+        url = "https://registry.npmjs.org/@commitlint/rules/-/rules-7.2.0.tgz";
+        sha512 = "c15Q9H5iYE9fnncLnFnMuvPLYA/i0pve5moV0uxJJGr4GgJoBKyldd4CCDhoE80C1k8ABuqr2o2qsopzVEp3Ww==";
       };
     };
     "@commitlint/to-lines-7.1.2" = {
@@ -310,49 +310,40 @@ let
         sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
       };
     };
-    "@ionic/cli-framework-1.0.7" = {
+    "@ionic/cli-framework-1.1.1" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
-      version = "1.0.7";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.0.7.tgz";
-        sha512 = "e6yaPkqom2KVNgUpJJMJbClkc8n4r4pOieiVEgfVmjC0ZC1wRZ3hYHzUMbsY/QOnB3UceCBGuYZMScaF/QNY8g==";
+        url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.1.1.tgz";
+        sha512 = "atY7TZO7Lh00iz9TIkEuzAg+h+onaf9tR5Xdq365grIDlOD6iRm1xAYKkLOzlObzNQ3WqDW5vqKmtiVrvg3Kfg==";
       };
     };
-    "@ionic/cli-utils-2.2.1" = {
-      name = "_at_ionic_slash_cli-utils";
-      packageName = "@ionic/cli-utils";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-2.2.1.tgz";
-        sha512 = "/fAsYbgNOVcQhihW3EBy//FtBD/uhZyLA/fCd42UbHloR1uNo0KsGW7dh2i5NBYsaYsOequV5ZxGk2p0Wr5HWw==";
-      };
-    };
-    "@ionic/discover-1.0.4" = {
+    "@ionic/discover-1.0.6" = {
       name = "_at_ionic_slash_discover";
       packageName = "@ionic/discover";
-      version = "1.0.4";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.4.tgz";
-        sha512 = "/9WbB31cv0nr2M8Vi4O2coDiX27IJ5EXwGKrgnV0X0/dfavObNVqV9ksNcHnZTuNArqBXywOsWPIES0+tHXIhA==";
+        url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.6.tgz";
+        sha512 = "7OsJ4Kr6G9PWVOFdlfXuM7Cz39qFff60dOOzPpIwDXInive+jk42pZ9aKPz/3NMrwWULUOY8pSZ4leiZJNPFpg==";
       };
     };
-    "@ionic/utils-fs-0.0.1" = {
+    "@ionic/utils-fs-0.0.3" = {
       name = "_at_ionic_slash_utils-fs";
       packageName = "@ionic/utils-fs";
-      version = "0.0.1";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.1.tgz";
-        sha512 = "l5+RM7lEIKSsxAUyNiarHuNJBioJhFM4CAezZ7YRyFoX6J7Y4paZIfZzoFa6UdNsyucE51lZ1X/6ZOf/gVj73Q==";
+        url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-0.0.3.tgz";
+        sha512 = "nj976Lms/0ocagWkfizM/zSWwfYRMOnT+wgNO3B9LMW8OjOH/llxTulBvTih0epqgLl9jjU7moW310BeECVC4g==";
       };
     };
-    "@ionic/utils-network-0.0.1" = {
+    "@ionic/utils-network-0.0.3" = {
       name = "_at_ionic_slash_utils-network";
       packageName = "@ionic/utils-network";
-      version = "0.0.1";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.1.tgz";
-        sha512 = "qpzZ+k94PCWbWmub2XHP0XJKcoBflGeOAW64RlIbthoIzj0SRwoYjn4DrFVbYhScQ/xmLe1hSD2Hq8NZ4HEM5g==";
+        url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.3.tgz";
+        sha512 = "jc71iYRTg+st9K39rHtT2FWcgtVP9QIWTaDt4o+WFDD1lUicscosFncx5DEzHsb3Shn24SgbiqhcfQ2F//nfyw==";
       };
     };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -364,13 +355,13 @@ let
         sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q==";
       };
     };
-    "@lerna/add-3.3.2" = {
+    "@lerna/add-3.4.1" = {
       name = "_at_lerna_slash_add";
       packageName = "@lerna/add";
-      version = "3.3.2";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/add/-/add-3.3.2.tgz";
-        sha512 = "nKRRRKb4wt/GAywi8P++NY1TUiyhMs2g2KHSb41I4/qiCFQnTj2zkeshPyNmtBGjKzFXnOqrmc/8Wa2vmHHZVg==";
+        url = "https://registry.npmjs.org/@lerna/add/-/add-3.4.1.tgz";
+        sha512 = "Vf54B42jlD6G52qnv/cAGH70cVQIa+LX//lfsbkxHvzkhIqBl5J4KsnTOPkA9uq3R+zP58ayicCHB9ReiEWGJg==";
       };
     };
     "@lerna/batch-packages-3.1.2" = {
@@ -382,22 +373,22 @@ let
         sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ==";
       };
     };
-    "@lerna/bootstrap-3.3.2" = {
+    "@lerna/bootstrap-3.4.1" = {
       name = "_at_lerna_slash_bootstrap";
       packageName = "@lerna/bootstrap";
-      version = "3.3.2";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.3.2.tgz";
-        sha512 = "f0/FZ6iCXHNpHoUiM3wfmiJebHetrquP9mdNT7t//2iTGm1nz8iuKSLhfu9APazDXtqo3aDFx7JvuYKMg+GiXQ==";
+        url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.4.1.tgz";
+        sha512 = "yZDJgNm/KDoRH2klzmQGmpWMg/XMzWgeWvauXkrfW/mj1wwmufOuh5pN4fBFxVmUUa/RFZdfMeaaJt3+W3PPBw==";
       };
     };
-    "@lerna/changed-3.3.2" = {
+    "@lerna/changed-3.4.1" = {
       name = "_at_lerna_slash_changed";
       packageName = "@lerna/changed";
-      version = "3.3.2";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.3.2.tgz";
-        sha512 = "wLH6RzYPQAryrsJakc9I3k0aFWE/cJyWoUD8dQy186jxwtLgeQdVc0+NegNyab7MIPi7Hsv9A3hx6lM1rPH94A==";
+        url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.4.1.tgz";
+        sha512 = "gT7fhl4zQWyGETDO4Yy5wsFnqNlBSsezncS1nkMW1uO6jwnolwYqcr1KbrMR8HdmsZBn/00Y0mRnbtbpPPey8w==";
       };
     };
     "@lerna/check-working-tree-3.3.0" = {
@@ -454,22 +445,22 @@ let
         sha512 = "NTOkLEKlWcBLHSvUr9tzVpV7RJ4GROLeOuZ6RfztGOW/31JPSwVVBD2kPifEXNZunldOx5GVWukR+7+NpAWhsg==";
       };
     };
-    "@lerna/conventional-commits-3.3.0" = {
+    "@lerna/conventional-commits-3.4.1" = {
       name = "_at_lerna_slash_conventional-commits";
       packageName = "@lerna/conventional-commits";
-      version = "3.3.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.3.0.tgz";
-        sha512 = "nUFardc5G4jG5LI/Jlw0kblzlRLJ08ut6uJjHXTnUE/QJuKYaqBZm6goGG8OSxp/WltklndkQUOtThyZpefviA==";
+        url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.4.1.tgz";
+        sha512 = "3NETrA58aUkaEW3RdwdJ766Bg9NVpLzb26mtdlsJQcvB5sQBWH5dJSHIVQH1QsGloBeH2pE/mDUEVY8ZJXuR4w==";
       };
     };
-    "@lerna/create-3.3.1" = {
+    "@lerna/create-3.4.1" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "3.3.1";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-3.3.1.tgz";
-        sha512 = "4VASkTLvN66euTcWMPN2vIzEoP07hgutx7V70CXSOc+DiWV8S22z0PjXATi2yli83TC/Qj4gHYtU2futQrdY1A==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-3.4.1.tgz";
+        sha512 = "l+4t2SRO5nvW0MNYY+EWxbaMHsAN8bkWH3nyt7EzhBjs4+TlRAJRIEqd8o9NWznheE3pzwczFz1Qfl3BWbyM5A==";
       };
     };
     "@lerna/create-symlink-3.3.0" = {
@@ -607,13 +598,13 @@ let
         sha512 = "vVQHgMagE2wnbxhNY9nFkdu+Cx2TsyWalkJfkxbNzmo6gOCrDsxCBDj9vTEV8Q+4aWx0C0Bsc0sB2Eb8y/+ofA==";
       };
     };
-    "@lerna/npm-conf-3.0.0" = {
+    "@lerna/npm-conf-3.4.1" = {
       name = "_at_lerna_slash_npm-conf";
       packageName = "@lerna/npm-conf";
-      version = "3.0.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.0.0.tgz";
-        sha512 = "xXG7qt349t+xzaHTQELmIDjbq8Q49HOMR8Nx/gTDBkMl02Fno91LXFnA4A7ErPiyUSGqNSfLw+zgij0hgpeN7w==";
+        url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-3.4.1.tgz";
+        sha512 = "i9G6DnbCqiAqxKx2rSXej/n14qxlV/XOebL6QZonxJKzNTB+Q2wglnhTXmfZXTPJfoqimLaY4NfAEtbOXRWOXQ==";
       };
     };
     "@lerna/npm-dist-tag-3.3.0" = {
@@ -697,13 +688,13 @@ let
         sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==";
       };
     };
-    "@lerna/publish-3.4.0" = {
+    "@lerna/publish-3.4.1" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.0.tgz";
-        sha512 = "wcqWDKbkDjyj6F9Mw4/LL2CtpCN61RazNKxYm+fyJ20P2zfcAwLEwxttA6ZWIO8xUiLXkCTFIhwOulHyAPAq3w==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.1.tgz";
+        sha512 = "Nd5PT2Ksngo1GHqT6ccmGVfMvoA9MplBvqyzPFIjFIJOgODrJ9IGJAMobxgBQ6xXXShflQ/1dHWk8faTOYKLoQ==";
       };
     };
     "@lerna/resolve-symlink-3.3.0" = {
@@ -733,13 +724,13 @@ let
         sha512 = "cruwRGZZWnQ5I0M+AqcoT3Xpq2wj3135iVw4n59/Op6dZu50sMFXZNLiTTTZ15k8rTKjydcccJMdPSpTHbH7/A==";
       };
     };
-    "@lerna/run-lifecycle-3.3.1" = {
+    "@lerna/run-lifecycle-3.4.1" = {
       name = "_at_lerna_slash_run-lifecycle";
       packageName = "@lerna/run-lifecycle";
-      version = "3.3.1";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.3.1.tgz";
-        sha512 = "xy4K3amlXk0LjSa5d3VqmrW9SsxMyvI7lw2dHDMb5PqjjcjMQgb6+nFbycwyJMhCP8u7MwQIZ4hFYF9XYbWSzQ==";
+        url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.4.1.tgz";
+        sha512 = "N/hi2srM9A4BWEkXccP7vCEbf4MmIuALF00DTBMvc0A/ccItwUpl3XNuM7+ADDRK0mkwE3hDw89lJ3A7f8oUQw==";
       };
     };
     "@lerna/run-parallel-batches-3.0.0" = {
@@ -778,13 +769,13 @@ let
         sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA==";
       };
     };
-    "@lerna/version-3.3.2" = {
+    "@lerna/version-3.4.1" = {
       name = "_at_lerna_slash_version";
       packageName = "@lerna/version";
-      version = "3.3.2";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/version/-/version-3.3.2.tgz";
-        sha512 = "2MHP6mA1f0t3UdzqPpfgAhsT1L64HOedlJxrQUoHrkou/G25Od4wjmKr9OZ0Oc4CLDbXD/sYEmE/9fZi1GGgKg==";
+        url = "https://registry.npmjs.org/@lerna/version/-/version-3.4.1.tgz";
+        sha512 = "oefNaQLBJSI2WLZXw5XxDXk4NyF5/ct0V9ys/J308NpgZthPgwRPjk9ZR0o1IOxW1ABi6z3E317W/dxHDjvAkg==";
       };
     };
     "@lerna/write-log-file-3.0.0" = {
@@ -1048,22 +1039,22 @@ let
         sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
       };
     };
-    "@types/node-10.11.3" = {
+    "@types/node-10.11.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.11.3";
+      version = "10.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.11.3.tgz";
-        sha512 = "3AvcEJAh9EMatxs+OxAlvAEs7OTy6AG94mcH1iqyVDwVVndekLxzwkWQ/Z4SDbY6GO2oyUXyWW8tQ4rENSSQVQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz";
+        sha512 = "ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==";
       };
     };
-    "@types/node-8.10.30" = {
+    "@types/node-8.10.34" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.30";
+      version = "8.10.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz";
-        sha512 = "Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.34.tgz";
+        sha512 = "alypNiaAEd0RBGXoWehJ2gchPYCITmw4CYBoB5nDlji8l8on7FsklfdfIs4DDmgpKLSX3OF3ha6SV+0W7cTzUA==";
       };
     };
     "@types/range-parser-1.2.2" = {
@@ -2074,6 +2065,15 @@ let
         sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
+    "ansi-regex-4.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz";
+        sha512 = "iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==";
+      };
+    };
     "ansi-split-1.0.1" = {
       name = "ansi-split";
       packageName = "ansi-split";
@@ -2218,13 +2218,13 @@ let
         sha512 = "xEDrUvo3U2mQKSzA8NzQmgeqK4ytwFnTGl2YKGKPfG0+r8fZdswKp6CDBue29KLO8KkSuqW/hntveWrAdK51FQ==";
       };
     };
-    "apollo-cache-inmemory-1.3.0" = {
+    "apollo-cache-inmemory-1.3.5" = {
       name = "apollo-cache-inmemory";
       packageName = "apollo-cache-inmemory";
-      version = "1.3.0";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.0.tgz";
-        sha512 = "7NXKkICo/JswTfTf7E3XAt5qcmt8xydUk86LbFrNiM9w3mHNIJnCJZdycuy34bx4DWsA+Bex4oYDB4H70v4maQ==";
+        url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.5.tgz";
+        sha512 = "CD4Dl9vcCp7N05KUqR3rNDj2WJ1DQNNfeyBUIo5T6XTiUhfBQp5x+CL7S+ezy5mPp+xo4TnwFzLFh/vy2LdDog==";
       };
     };
     "apollo-client-2.4.2" = {
@@ -2812,6 +2812,15 @@ let
         sha512 = "B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==";
       };
     };
+    "array-sort-1.0.0" = {
+      name = "array-sort";
+      packageName = "array-sort";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz";
+        sha512 = "ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==";
+      };
+    };
     "array-union-1.0.2" = {
       name = "array-union";
       packageName = "array-union";
@@ -3253,13 +3262,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.325.0" = {
+    "aws-sdk-2.330.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.325.0";
+      version = "2.330.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.325.0.tgz";
-        sha512 = "26V/4vzInQ5EO/+HCoZaXO5YB6XWo4sRXbNtc3bFEcUfMZ5Psin2M8McY/zasJyYbZuNisK608kjio+AXm8vig==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.330.0.tgz";
+        sha512 = "biW3J8S9/b9uqeED2jbBHEbscwIclc0PBiylUkd3lJ5s226Yuv7mwSOfoI2Eogpyg/i97phK3uiUb/Q89/pCpQ==";
       };
     };
     "aws-sign-0.2.1" = {
@@ -4392,7 +4401,7 @@ let
       packageName = "bl";
       version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
+        url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
         sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
       };
     };
@@ -4401,7 +4410,7 @@ let
       packageName = "bl";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
+        url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
         sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
       };
     };
@@ -4410,7 +4419,7 @@ let
       packageName = "bl";
       version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
+        url = "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
         sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
       };
     };
@@ -4419,7 +4428,7 @@ let
       packageName = "bl";
       version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz";
+        url = "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz";
         sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
@@ -4720,6 +4729,15 @@ let
         sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e";
       };
     };
+    "bplist-creator-0.0.7" = {
+      name = "bplist-creator";
+      packageName = "bplist-creator";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.7.tgz";
+        sha1 = "37df1536092824b87c42f957b01344117372ae45";
+      };
+    };
     "bplist-parser-0.1.1" = {
       name = "bplist-parser";
       packageName = "bplist-parser";
@@ -6889,6 +6907,15 @@ let
         sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==";
       };
     };
+    "commander-2.19.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz";
+        sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==";
+      };
+    };
     "commander-2.3.0" = {
       name = "commander";
       packageName = "commander";
@@ -7475,40 +7502,49 @@ let
         sha512 = "suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==";
       };
     };
-    "conventional-changelog-core-2.0.11" = {
+    "conventional-changelog-angular-5.0.1" = {
+      name = "conventional-changelog-angular";
+      packageName = "conventional-changelog-angular";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.1.tgz";
+        sha512 = "q4ylJ68fWZDdrFC9z4zKcf97HW6hp7Mo2YlqD4owfXhecFKy/PJCU/1oVFF4TqochchChqmZ0Vb0e0g8/MKNlA==";
+      };
+    };
+    "conventional-changelog-core-3.1.0" = {
       name = "conventional-changelog-core";
       packageName = "conventional-changelog-core";
-      version = "2.0.11";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz";
-        sha512 = "HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==";
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-3.1.0.tgz";
+        sha512 = "bcZkcFXkqVgG2W8m/1wjlp2wn/BKDcrPgw3/mvSEQtzs8Pax8JbAPFpEQReHY92+EKNNXC67wLA8y2xcNx0rDA==";
       };
     };
-    "conventional-changelog-preset-loader-1.1.8" = {
+    "conventional-changelog-preset-loader-2.0.1" = {
       name = "conventional-changelog-preset-loader";
       packageName = "conventional-changelog-preset-loader";
-      version = "1.1.8";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz";
-        sha512 = "MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==";
+        url = "https://registry.npmjs.org/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.0.1.tgz";
+        sha512 = "HiSfhXNzAzG9klIqJaA97MMiNBR4js+53g4Px0k7tgKeCNVXmrDrm+CY+nIqcmG5NVngEPf8rAr7iji1TWW7zg==";
       };
     };
-    "conventional-changelog-writer-3.0.9" = {
+    "conventional-changelog-writer-4.0.0" = {
       name = "conventional-changelog-writer";
       packageName = "conventional-changelog-writer";
-      version = "3.0.9";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz";
-        sha512 = "n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==";
+        url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.0.tgz";
+        sha512 = "hMZPe0AQ6Bi05epeK/7hz80xxk59nPA5z/b63TOHq2wigM0/akreOc8N4Jam5b9nFgKWX1e9PdPv2ewgW6bcfg==";
       };
     };
-    "conventional-commits-filter-1.1.6" = {
+    "conventional-commits-filter-2.0.0" = {
       name = "conventional-commits-filter";
       packageName = "conventional-commits-filter";
-      version = "1.1.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz";
-        sha512 = "KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==";
+        url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.0.tgz";
+        sha512 = "Cfl0j1/NquB/TMVx7Wrmyq7uRM+/rPQbtVVGwzfkhZ6/yH6fcMmP0Q/9044TBZPTNdGzm46vXFXL14wbET0/Mg==";
       };
     };
     "conventional-commits-parser-2.1.7" = {
@@ -7520,13 +7556,22 @@ let
         sha512 = "BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==";
       };
     };
-    "conventional-recommended-bump-2.0.9" = {
+    "conventional-commits-parser-3.0.0" = {
+      name = "conventional-commits-parser";
+      packageName = "conventional-commits-parser";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz";
+        sha512 = "GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==";
+      };
+    };
+    "conventional-recommended-bump-4.0.1" = {
       name = "conventional-recommended-bump";
       packageName = "conventional-recommended-bump";
-      version = "2.0.9";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-2.0.9.tgz";
-        sha512 = "YE6/o+648qkX3fTNvfBsvPW3tSnbZ6ec3gF0aBahCPgyoVHU2Mw0nUAZ1h1UN65GazpORngrgRC8QCltNYHPpQ==";
+        url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-4.0.1.tgz";
+        sha512 = "9waJvW01TUs4HQJ3khwGSSlTlKsY+5u7OrxHL+oWEoGNvaNO/0qL6qqnhS3J0Fq9fNKA9bmlf5cOXjCQoW+I4Q==";
       };
     };
     "convert-source-map-1.1.3" = {
@@ -7718,6 +7763,15 @@ let
         sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
       };
     };
+    "copy-props-2.0.4" = {
+      name = "copy-props";
+      packageName = "copy-props";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz";
+        sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==";
+      };
+    };
     "cordova-app-hello-world-3.12.0" = {
       name = "cordova-app-hello-world";
       packageName = "cordova-app-hello-world";
@@ -7763,13 +7817,13 @@ let
         sha512 = "Qy0O3w/gwbIqIJzlyCy60nPwJlF1c74ELpsfDIGXB92/uST5nQSSUDVDP4UOfb/c6OU7yPqxhCWOGROyTYKPDw==";
       };
     };
-    "cordova-lib-8.1.0" = {
+    "cordova-lib-8.1.1" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "8.1.0";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.0.tgz";
-        sha512 = "VLLRhEaqi5bD1AxAndlPGiRD5ZX2EwUnxGxIvEUUbgZxwOceGWHM2wdI4V2nJOieJ0N8CbDRsLsOwFJQsRLOyQ==";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.1.1.tgz";
+        sha512 = "PcrlEGRGubV2c9ThcSwoVtN/1hKQ0qtwRopl4188rD10gjtt8K+NSKrnRqh6Ia5PouVUUOZBrlhBxDd5BRbfeg==";
       };
     };
     "cordova-registry-mapper-1.1.15" = {
@@ -8798,13 +8852,13 @@ let
         sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==";
       };
     };
-    "debug-4.0.1" = {
+    "debug-4.1.0" = {
       name = "debug";
       packageName = "debug";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.0.1.tgz";
-        sha512 = "K23FHJ/Mt404FSlp6gSZCevIbTMLX0j3fmHhUEhQ3Wq0FMODW3+cUSoLdy1Gx4polAf4t/lphhmHH35BB8cLYw==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz";
+        sha512 = "heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==";
       };
     };
     "debug-fabulous-1.1.0" = {
@@ -9028,7 +9082,7 @@ let
       packageName = "deepmerge";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz";
+        url = "http://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz";
         sha512 = "Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==";
       };
     };
@@ -9041,6 +9095,15 @@ let
         sha512 = "urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w==";
       };
     };
+    "deepmerge-2.2.1" = {
+      name = "deepmerge";
+      packageName = "deepmerge";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz";
+        sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==";
+      };
+    };
     "default-browser-id-1.0.4" = {
       name = "default-browser-id";
       packageName = "default-browser-id";
@@ -9050,6 +9113,15 @@ let
         sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a";
       };
     };
+    "default-compare-1.0.0" = {
+      name = "default-compare";
+      packageName = "default-compare";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz";
+        sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==";
+      };
+    };
     "default-uid-1.0.0" = {
       name = "default-uid";
       packageName = "default-uid";
@@ -9968,6 +10040,15 @@ let
         sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
       };
     };
+    "each-props-1.3.2" = {
+      name = "each-props";
+      packageName = "each-props";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz";
+        sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==";
+      };
+    };
     "eachr-3.2.0" = {
       name = "eachr";
       packageName = "eachr";
@@ -10446,13 +10527,13 @@ let
         sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
       };
     };
-    "envinfo-3.4.2" = {
+    "envinfo-5.10.0" = {
       name = "envinfo";
       packageName = "envinfo";
-      version = "3.4.2";
+      version = "5.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-3.4.2.tgz";
-        sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g==";
+        url = "https://registry.npmjs.org/envinfo/-/envinfo-5.10.0.tgz";
+        sha512 = "rXbzXWvnQxy+TcqZlARbWVQwgGVVouVJgFZhLVN5htjLxl1thstrP2ZGi0pXC309AbK7gVOPU+ulz/tmpCI7iw==";
       };
     };
     "epidemic-broadcast-trees-6.3.4" = {
@@ -11733,13 +11814,13 @@ let
         sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
       };
     };
-    "fast-diff-1.1.2" = {
+    "fast-diff-1.2.0" = {
       name = "fast-diff";
       packageName = "fast-diff";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz";
-        sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==";
+        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz";
+        sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==";
       };
     };
     "fast-future-1.0.2" = {
@@ -11751,13 +11832,13 @@ let
         sha1 = "8435a9aaa02d79248d17d704e76259301d99280a";
       };
     };
-    "fast-glob-2.2.2" = {
+    "fast-glob-2.2.3" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz";
-        sha512 = "TR6zxCKftDQnUAPvkrCWdBgDq/gbqx8A3ApnBrR5rMvpp6+KMJI0Igw7fkWPgeVK0uhRXTXdvO3O+YP0CaUX2g==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.3.tgz";
+        sha512 = "NiX+JXjnx43RzvVFwRWfPKo4U+1BrK5pJPsHQdKMlLoFHrrGktXglQhHliSihWAq+m1z6fHk3uwGHrtRbS9vLA==";
       };
     };
     "fast-json-parse-1.0.3" = {
@@ -11805,13 +11886,13 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "fast-redact-1.2.0" = {
+    "fast-redact-1.3.0" = {
       name = "fast-redact";
       packageName = "fast-redact";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.2.0.tgz";
-        sha512 = "k/uSk9PtFmvYx0m7bRk5B2gZChQk4euWhrn7Mf3vYSmwZBLh7cGNuMuc/vhH1MKMPyVJMMtl9oMwPnwlKqs7CQ==";
+        url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.3.0.tgz";
+        sha512 = "ci4qKDR8nDzQCQTPw4hviyDFaSwTgSYiqddRh/EslkUQa0otpzM8IGnuG+LwiUE54t4OjU2T7bYKmjtd7632Wg==";
       };
     };
     "fast-safe-stringify-1.2.3" = {
@@ -11963,7 +12044,7 @@ let
       packageName = "file-type";
       version = "3.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz";
+        url = "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz";
         sha1 = "257a078384d1db8087bc449d107d52a52672b9e9";
       };
     };
@@ -12318,13 +12399,13 @@ let
         sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
       };
     };
-    "flatmap-stream-0.1.0" = {
+    "flatmap-stream-0.1.1" = {
       name = "flatmap-stream";
       packageName = "flatmap-stream";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.0.tgz";
-        sha512 = "Nlic4ZRYxikqnK5rj3YoxDVKGGtUjcNDUtvQ7XsdGLZmMwdUYnXf10o1zcXtzEZTBgc6GxeRpQxV/Wu3WPIIHA==";
+        url = "https://registry.npmjs.org/flatmap-stream/-/flatmap-stream-0.1.1.tgz";
+        sha512 = "lAq4tLbm3sidmdCN8G3ExaxH7cUCtP5mgDvrYowsx84dcYkJJ4I28N7gkxA6+YlSXzaGLJYIDEi9WGfXzMiXdw==";
       };
     };
     "flatstr-1.0.8" = {
@@ -12444,13 +12525,13 @@ let
         sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA==";
       };
     };
-    "flumeview-reduce-1.3.13" = {
+    "flumeview-reduce-1.3.14" = {
       name = "flumeview-reduce";
       packageName = "flumeview-reduce";
-      version = "1.3.13";
+      version = "1.3.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz";
-        sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ==";
+        url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.14.tgz";
+        sha512 = "hMk9g42JrD92PCmNDiET6JGjur09wQrlAUQRPjmsk8LNqDz/tC5upvCfiynIgWUphe8dZMhUHIzOTh75xa1WKA==";
       };
     };
     "flush-write-stream-1.0.3" = {
@@ -13241,7 +13322,7 @@ let
       packageName = "get-stream";
       version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
+        url = "http://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz";
         sha1 = "5f38f93f346009666ee0150a054167f91bdd95de";
       };
     };
@@ -13250,17 +13331,17 @@ let
       packageName = "get-stream";
       version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+        url = "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
         sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
-    "get-stream-4.0.0" = {
+    "get-stream-4.1.0" = {
       name = "get-stream";
       packageName = "get-stream";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.0.0.tgz";
-        sha512 = "FneLKMENeOR7wOK0/ZXCh+lwqtnPwkeunJjRN28LPqzGvNAhYvrTAhXv6xDm4vsJ0M7lcRbIYHQudKsSy2RtSQ==";
+        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
+        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
       };
     };
     "get-uri-2.0.2" = {
@@ -13353,6 +13434,15 @@ let
         sha512 = "svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==";
       };
     };
+    "git-raw-commits-2.0.0" = {
+      name = "git-raw-commits";
+      packageName = "git-raw-commits";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.0.tgz";
+        sha512 = "w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==";
+      };
+    };
     "git-remote-origin-url-2.0.0" = {
       name = "git-remote-origin-url";
       packageName = "git-remote-origin-url";
@@ -13380,13 +13470,13 @@ let
         sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce";
       };
     };
-    "git-semver-tags-1.3.6" = {
+    "git-semver-tags-2.0.0" = {
       name = "git-semver-tags";
       packageName = "git-semver-tags";
-      version = "1.3.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-1.3.6.tgz";
-        sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==";
+        url = "https://registry.npmjs.org/git-semver-tags/-/git-semver-tags-2.0.0.tgz";
+        sha512 = "lSgFc3zQTul31nFje2Q8XdNcTOI6B4I3mJRPCgFzHQQLfxfqdWTYzdtCaynkK5Xmb2wQlSJoKolhXJ1VhKROnQ==";
       };
     };
     "git-ssb-web-2.8.0" = {
@@ -13669,13 +13759,13 @@ let
         sha512 = "glWGTgPzsOQs0mPRxHnWIwqYrEuQcxYpUFWF7BJxJL+c2F4fW304vdn53pqgod4PzOqZKDr1cex+a/pXCwrncA==";
       };
     };
-    "globals-11.7.0" = {
+    "globals-11.8.0" = {
       name = "globals";
       packageName = "globals";
-      version = "11.7.0";
+      version = "11.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz";
-        sha512 = "K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==";
+        url = "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz";
+        sha512 = "io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==";
       };
     };
     "globals-9.18.0" = {
@@ -14020,13 +14110,13 @@ let
         sha512 = "+ytmryoHF1LVf58NKEaNPRUzYyXplm120ntxfPcgOBC7TnK7Tv/4VRHeh4FAR9iL+O1bqhZs4nkibxQ+OA5cDQ==";
       };
     };
-    "graphql-tag-2.9.2" = {
+    "graphql-tag-2.10.0" = {
       name = "graphql-tag";
       packageName = "graphql-tag";
-      version = "2.9.2";
+      version = "2.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.9.2.tgz";
-        sha512 = "qnNmof9pAqj/LUzs3lStP0Gw1qhdVCUS7Ab7+SUB6KD5aX1uqxWQRwMnOGTkhKuLvLNIs1TvNz+iS9kUGl1MhA==";
+        url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.0.tgz";
+        sha512 = "9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==";
       };
     };
     "graphql-tools-3.1.1" = {
@@ -14115,7 +14205,7 @@ let
       packageName = "gulp";
       version = "3.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+        url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
         sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
       };
     };
@@ -15091,13 +15181,13 @@ let
         sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-6.19.1" = {
+    "hypercore-6.19.2" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.19.1";
+      version = "6.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.1.tgz";
-        sha512 = "CnpaH6+qlt0w1ynt3y+q9alZh23lK0nD7bbuG0vNtQzFefmTYoLexq/Vpss8CYjoQfh6qeG90g2F8GjCl8/Eag==";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.2.tgz";
+        sha512 = "AQS6mtwI7RDKRT3u68EEcehtI1VpaavWXxfnGDyOrR/AVBDUMdIUw8wcYCZdiZZVHarh5xKS4+VRCdJjS67LuA==";
       };
     };
     "hypercore-crypto-1.0.0" = {
@@ -19601,13 +19691,13 @@ let
         sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
       };
     };
-    "log4js-3.0.5" = {
+    "log4js-3.0.6" = {
       name = "log4js";
       packageName = "log4js";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log4js/-/log4js-3.0.5.tgz";
-        sha512 = "IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==";
+        url = "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz";
+        sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==";
       };
     };
     "lokijs-1.5.3" = {
@@ -20186,6 +20276,15 @@ let
         sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==";
       };
     };
+    "matchdep-2.0.0" = {
+      name = "matchdep";
+      packageName = "matchdep";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz";
+        sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e";
+      };
+    };
     "matcher-collection-1.0.5" = {
       name = "matcher-collection";
       packageName = "matcher-collection";
@@ -20218,10 +20317,19 @@ let
       packageName = "md5.js";
       version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        url = "http://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
+    "md5.js-1.3.5" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
+        sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
+      };
+    };
     "mdmanifest-1.0.8" = {
       name = "mdmanifest";
       packageName = "mdmanifest";
@@ -21244,7 +21352,7 @@ let
       packageName = "ms";
       version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+        url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
         sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
       };
     };
@@ -21253,7 +21361,7 @@ let
       packageName = "ms";
       version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
+        url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
         sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
       };
     };
@@ -21262,7 +21370,7 @@ let
       packageName = "ms";
       version = "0.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+        url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
@@ -21271,7 +21379,7 @@ let
       packageName = "ms";
       version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        url = "http://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
         sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
@@ -21554,6 +21662,15 @@ let
         sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef";
       };
     };
+    "mute-stdout-1.0.1" = {
+      name = "mute-stdout";
+      packageName = "mute-stdout";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz";
+        sha512 = "kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==";
+      };
+    };
     "mute-stream-0.0.4" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -21725,13 +21842,13 @@ let
         sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ==";
       };
     };
-    "nanoid-1.2.5" = {
+    "nanoid-1.2.6" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.2.5";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.5.tgz";
-        sha512 = "mOYdCQS3xdgu81Hg3EQEhORykMk53Pkzg15Y6I+O9T3db9qHPf9z6nXzQBCUaHXlQs57eRKotDTzYlYACL+5uA==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.6.tgz";
+        sha512 = "um9vXiM407BaRbBNa0aKPzFBSD2fDbVmmA9TzCWWlxZvEBzTbixM7ss6GDS4G/cNMYeZSNFx5SzAgWoG1uHU9g==";
       };
     };
     "nanolru-1.0.0" = {
@@ -22144,13 +22261,13 @@ let
         sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
       };
     };
-    "node-abi-2.4.4" = {
+    "node-abi-2.4.5" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.4.4";
+      version = "2.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz";
-        sha512 = "DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.5.tgz";
+        sha512 = "aa/UC6Nr3+tqhHGRsAuw/edz7/q9nnetBrKWxj6rpTtm+0X9T1qU7lIEHMS3yN9JwAbRiKUbRRFy1PLz/y3aaA==";
       };
     };
     "node-alias-1.0.4" = {
@@ -22351,13 +22468,13 @@ let
         sha512 = "5+MtH9t8tX6Aw6M+SeoyGR23XplNTOln3aTQ7El9tj/606bxea4GxYyvV4ymTmuoODz3GXQlLLQVdGkFLyIdDQ==";
       };
     };
-    "node-red-node-twitter-1.1.2" = {
+    "node-red-node-twitter-1.1.3" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.2.tgz";
-        sha512 = "6qyeZluZCn3SBkmDFGNm3Zf5Y21FosRQ0AMHv9UM9KOf1v9gFS82Ybyah2Z85NHaXqTvyIM5R7zJbvsK2GMq9g==";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-1.1.3.tgz";
+        sha512 = "H4q6wfIeDkDp7ykFh4nK7vrnJa9NI3FmC2rASabup/9LEJ5XD5KXH07eqo+B3Cf3jAzJDmL7RFEFucA8C1oqCw==";
       };
     };
     "node-request-by-swagger-1.1.3" = {
@@ -22720,13 +22837,13 @@ let
         sha512 = "zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==";
       };
     };
-    "npm-packlist-1.1.11" = {
+    "npm-packlist-1.1.12" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz";
-        sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz";
+        sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==";
       };
     };
     "npm-path-2.0.4" = {
@@ -23342,13 +23459,13 @@ let
         sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "ono-4.0.9" = {
+    "ono-4.0.10" = {
       name = "ono";
       packageName = "ono";
-      version = "4.0.9";
+      version = "4.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ono/-/ono-4.0.9.tgz";
-        sha512 = "HuSv0Z//JsX3246ykva50NDq2dw2UOaUKRK/CrD3UN96FQ3kr9msI5wR0lMezAIKgfN9+utK+iDfWzj1df3TZg==";
+        url = "https://registry.npmjs.org/ono/-/ono-4.0.10.tgz";
+        sha512 = "4Xz4hlbq7MzV0I3vKfZwRvyj8tCbXODqBNzFqtkjP+KTV93zzDRju8kw1qnf6P5kcZ2+xlIq6wSCqA+euSKxhA==";
       };
     };
     "open-0.0.2" = {
@@ -23891,6 +24008,15 @@ let
         sha512 = "cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==";
       };
     };
+    "pac-proxy-agent-3.0.0" = {
+      name = "pac-proxy-agent";
+      packageName = "pac-proxy-agent";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz";
+        sha512 = "AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==";
+      };
+    };
     "pac-resolver-3.0.0" = {
       name = "pac-resolver";
       packageName = "pac-resolver";
@@ -25530,6 +25656,15 @@ let
         sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg==";
       };
     };
+    "proxy-agent-3.0.3" = {
+      name = "proxy-agent";
+      packageName = "proxy-agent";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz";
+        sha512 = "PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==";
+      };
+    };
     "proxy-from-env-1.0.0" = {
       name = "proxy-from-env";
       packageName = "proxy-from-env";
@@ -25611,13 +25746,13 @@ let
         sha512 = "q5I5vLRMVtdWa8n/3UEzZX7Lfghzrg9eG2IKk2ENLSofKRCXVqMvMUHxCKgXNaqH/8ebhBxrqftHWnyTFweJ5Q==";
       };
     };
-    "public-encrypt-4.0.2" = {
+    "public-encrypt-4.0.3" = {
       name = "public-encrypt";
       packageName = "public-encrypt";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
-        sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==";
+        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
+        sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
       };
     };
     "pug-2.0.3" = {
@@ -26552,7 +26687,7 @@ let
       packageName = "query-string";
       version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz";
+        url = "http://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz";
         sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf";
       };
     };
@@ -26561,7 +26696,7 @@ let
       packageName = "query-string";
       version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
+        url = "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
         sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
       };
     };
@@ -26799,13 +26934,13 @@ let
         sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
       };
     };
-    "raw-socket-1.6.2" = {
+    "raw-socket-1.6.3" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.6.2";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.2.tgz";
-        sha512 = "JbmNAXPFNI+yJv3Kx0Lsl+ao2doZ/kdz9J4Ba9+ggC1U4e50BK0GfHHYuLFj8acnYzqXgKiLzhi2ixOPk6/kcw==";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.3.tgz";
+        sha512 = "OcplcSbIIyEZxW6YFsqbvyrUrqvwFNmA4jhA9ZmMhquLrd9VBzIrFRRZ2qaD98UpyVk/VYJLemO8haECHMmEgQ==";
       };
     };
     "rc-0.4.0" = {
@@ -27024,13 +27159,13 @@ let
         sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
       };
     };
-    "readable-stream-3.0.3" = {
+    "readable-stream-3.0.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.0.3";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.3.tgz";
-        sha512 = "CzN1eAu5Pmh4EaDlJp1g5E37LIHR24b82XlMWRQlPFjhvOYKa4HhClRsQO21zhdDWUpdWfiKt9/L/ZL2+vwxCw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz";
+        sha512 = "9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==";
       };
     };
     "readdir-scoped-modules-1.0.2" = {
@@ -27245,17 +27380,17 @@ let
       packageName = "regexpp";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz";
+        url = "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz";
         sha512 = "LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==";
       };
     };
-    "regexpp-2.0.0" = {
+    "regexpp-2.0.1" = {
       name = "regexpp";
       packageName = "regexpp";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz";
-        sha512 = "g2FAVtR8Uh8GO1Nv5wpxW7VFVwHcCEr4wyA8/MHiRkO8uHoR5ntAA8Uq3P1vvMTX/BeQiRVSpDGLd+Wn5HNOTA==";
+        url = "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz";
+        sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -27456,6 +27591,15 @@ let
         sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
       };
     };
+    "replace-homedir-1.0.0" = {
+      name = "replace-homedir";
+      packageName = "replace-homedir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz";
+        sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c";
+      };
+    };
     "replaceall-0.1.6" = {
       name = "replaceall";
       packageName = "replaceall";
@@ -27582,6 +27726,15 @@ let
         sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5";
       };
     };
+    "requestretry-3.0.1" = {
+      name = "requestretry";
+      packageName = "requestretry";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/requestretry/-/requestretry-3.0.1.tgz";
+        sha512 = "vJUdB4xucpx+Hc5N1hV44/fHmT4ovhrwGWfG9MtZR6AeO1G350IqPUXJL4gfZND6RtqoSqB+Zs9EeCsMizYf9A==";
+      };
+    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -28347,13 +28500,13 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
-    "secure-scuttlebutt-18.3.3" = {
+    "secure-scuttlebutt-18.4.0" = {
       name = "secure-scuttlebutt";
       packageName = "secure-scuttlebutt";
-      version = "18.3.3";
+      version = "18.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.3.3.tgz";
-        sha512 = "f1APqe25N1Te++xtP1ZFnZ9hff/9lbj1o2fMnvFcGD+BezvwkKuR2RURRdu1NApDp0Xmglki45UeVqMfvs73iw==";
+        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.4.0.tgz";
+        sha512 = "v74wJIcscPYRG+OF7cQPUi3wCBIy0lRT0e7w+bleFpAPvPL3LTlKtPqt9Stbjrtj5LKV7yWALjoLrkWT0eg+xg==";
       };
     };
     "seek-bzip-1.0.5" = {
@@ -28491,6 +28644,15 @@ let
         sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
       };
     };
+    "semver-greatest-satisfied-range-1.1.0" = {
+      name = "semver-greatest-satisfied-range";
+      packageName = "semver-greatest-satisfied-range";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz";
+        sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b";
+      };
+    };
     "semver-regex-1.0.0" = {
       name = "semver-regex";
       packageName = "semver-regex";
@@ -29049,13 +29211,13 @@ let
         sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
       };
     };
-    "simple-git-1.103.0" = {
+    "simple-git-1.104.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.103.0";
+      version = "1.104.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.103.0.tgz";
-        sha512 = "5QKrOtoXLTA3CdFG//8ZIGIVIVRRMBfSyMXDn1t3y+TOf+Kg39mfzfU4t0CRJBcxBGynjNWVwsx6W04+biIUmg==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.104.0.tgz";
+        sha512 = "KTELLFyhLhN1qZGQkglx1e0YezYKNabCY4oKrTVb9y0BllkWwruK2qFCQDm2zpT7rE4IPd4/hzZt/6+0ykQIdA==";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -29085,6 +29247,15 @@ let
         sha512 = "MUWWno5o5cvISKOH4pYQ18PQJLpDaNWoKUbrPPKuspCLCkkh+zhtuQyTE8h2U2Ags+/OUN5wnUe92+9B8/Sm2Q==";
       };
     };
+    "simple-plist-0.2.1" = {
+      name = "simple-plist";
+      packageName = "simple-plist";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz";
+        sha1 = "71766db352326928cf3a807242ba762322636723";
+      };
+    };
     "simple-sha1-2.1.1" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
@@ -29409,13 +29580,13 @@ let
         sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==";
       };
     };
-    "snyk-1.99.1" = {
+    "snyk-1.102.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.99.1";
+      version = "1.102.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz";
-        sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz";
+        sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ==";
       };
     };
     "snyk-config-2.2.0" = {
@@ -29445,13 +29616,13 @@ let
         sha512 = "XWajcSh6Ld+I+WdcyU3DGDuE2ydThQd8ORkESy0nQ2LwekygLYVYN66OBy0uxpqYfd4qoqeg+J8lb4oGzCmyGA==";
       };
     };
-    "snyk-gradle-plugin-2.0.1" = {
+    "snyk-gradle-plugin-2.1.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "2.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.0.1.tgz";
-        sha512 = "dL9MRlwmDP4OmOk4b61pMqvbu8gG+HVCBTryBEU+vkvjloX0lslKvA5NTUPAM2M8SShnOic54cSegGQChBhYHw==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.0.tgz";
+        sha512 = "9gYJluomFZ5kaww5FoBvp4zUIsr27pEJ12jQJaVf0FJ0BmyYHmbCoxvHdqjCSYS2fVtF+fmPnvw0XKQOIwA1SA==";
       };
     };
     "snyk-module-1.8.2" = {
@@ -29508,13 +29679,13 @@ let
         sha512 = "CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w==";
       };
     };
-    "snyk-python-plugin-1.8.1" = {
+    "snyk-python-plugin-1.8.2" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.8.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.1.tgz";
-        sha512 = "DsUBkQZiPlXGkwzhxxEo2Tvfq6XhygWQThWM0yRBythi9M5n8UimZEwdkBHPj7xKC1clsB8boM3+sT/E1x6XGA==";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.8.2.tgz";
+        sha512 = "LBvjztnXarSHKyhivzM567icOOLOB98I7S9EEnjepuG+EZ0jiZzqOEMVRmzuYi+hRq3Cwh0hhjkwgJAQpKDz+g==";
       };
     };
     "snyk-resolve-1.0.1" = {
@@ -29526,13 +29697,13 @@ let
         sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==";
       };
     };
-    "snyk-resolve-deps-3.1.0" = {
+    "snyk-resolve-deps-4.0.1" = {
       name = "snyk-resolve-deps";
       packageName = "snyk-resolve-deps";
-      version = "3.1.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz";
-        sha512 = "YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q==";
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz";
+        sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA==";
       };
     };
     "snyk-sbt-plugin-2.0.0" = {
@@ -30066,22 +30237,22 @@ let
         sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476";
       };
     };
-    "spdx-correct-3.0.1" = {
+    "spdx-correct-3.0.2" = {
       name = "spdx-correct";
       packageName = "spdx-correct";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.1.tgz";
-        sha512 = "hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==";
+        url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz";
+        sha512 = "q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==";
       };
     };
-    "spdx-exceptions-2.1.0" = {
+    "spdx-exceptions-2.2.0" = {
       name = "spdx-exceptions";
       packageName = "spdx-exceptions";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
-        sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
+        url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+        sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
       };
     };
     "spdx-expression-parse-3.0.0" = {
@@ -30264,13 +30435,13 @@ let
         sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
       };
     };
-    "ssb-config-2.3.3" = {
+    "ssb-config-2.3.4" = {
       name = "ssb-config";
       packageName = "ssb-config";
-      version = "2.3.3";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.3.tgz";
-        sha512 = "w4tdXE7xEpYe9M071G60Wr/6lf59OTwrsTykUGFySh9Y7Prcu4pORmOIBgQUttZ86QvGMxJO1qdl7toIK53RMA==";
+        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.4.tgz";
+        sha512 = "Yp0DKsc9eSaU+9+5xMO4/NVdOFyBtHD+QgraZ+1Id2K4f0eUiKpJ2ogLNmGanTvkLVhm/vq27TLI27Fq83njWQ==";
       };
     };
     "ssb-ebt-5.2.3" = {
@@ -31101,6 +31272,15 @@ let
         sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
+    "strip-ansi-5.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz";
+        sha512 = "Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==";
+      };
+    };
     "strip-bom-1.0.0" = {
       name = "strip-bom";
       packageName = "strip-bom";
@@ -31326,13 +31506,13 @@ let
         sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
       };
     };
-    "superagent-proxy-1.0.3" = {
+    "superagent-proxy-2.0.0" = {
       name = "superagent-proxy";
       packageName = "superagent-proxy";
-      version = "1.0.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "http://registry.npmjs.org/superagent-proxy/-/superagent-proxy-1.0.3.tgz";
-        sha512 = "79Ujg1lRL2ICfuHUdX+H2MjIw73kB7bXsIkxLwHURz3j0XUmEEEoJ+u/wq+mKwna21Uejsm2cGR3OESA00TIjA==";
+        url = "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.0.0.tgz";
+        sha512 = "TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==";
       };
     };
     "supports-color-0.2.0" = {
@@ -31416,6 +31596,15 @@ let
         sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
       };
     };
+    "sver-compat-1.5.0" = {
+      name = "sver-compat";
+      packageName = "sver-compat";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz";
+        sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8";
+      };
+    };
     "swagger-converter-0.1.7" = {
       name = "swagger-converter";
       packageName = "swagger-converter";
@@ -31547,7 +31736,7 @@ let
       packageName = "tabtab";
       version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
+        url = "http://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
         sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
       };
     };
@@ -31822,13 +32011,13 @@ let
         sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a";
       };
     };
-    "thriftrw-3.11.2" = {
+    "thriftrw-3.11.3" = {
       name = "thriftrw";
       packageName = "thriftrw";
-      version = "3.11.2";
+      version = "3.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.2.tgz";
-        sha512 = "3iCowlHgCEXjabCkurHTaECb2+U0V+NzqBmwfKHn8fzJJwXd/oDo7Wh6Vs0kaESN7YNJMRPC8ObL3AfQ1gxKmQ==";
+        url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.3.tgz";
+        sha512 = "mnte80Go5MCfYyOQ9nk6SljaEicCXlwLchupHR+/zlx0MKzXwAiyt38CHjLZVvKtoyEzirasXuNYtkEjgghqCw==";
       };
     };
     "throat-3.2.0" = {
@@ -32002,13 +32191,13 @@ let
         sha512 = "YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==";
       };
     };
-    "timers-ext-0.1.5" = {
+    "timers-ext-0.1.7" = {
       name = "timers-ext";
       packageName = "timers-ext";
-      version = "0.1.5";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz";
-        sha512 = "tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==";
+        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz";
+        sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==";
       };
     };
     "timespan-2.3.0" = {
@@ -33105,7 +33294,7 @@ let
       packageName = "underscore.string";
       version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
         sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
       };
     };
@@ -33114,7 +33303,7 @@ let
       packageName = "underscore.string";
       version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+        url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
@@ -33793,6 +33982,15 @@ let
         sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "uuid-3.1.0" = {
       name = "uuid";
       packageName = "uuid";
@@ -33847,6 +34045,15 @@ let
         sha512 = "6sgSKoFw1UpUPd3cFdF7QGnrH6tDeBgW1F3v9gy8gLY0mlbiBXq8soy8aQpY6xeeCjH5K+JvC62Acp7gtl7wWA==";
       };
     };
+    "v8flags-3.1.1" = {
+      name = "v8flags";
+      packageName = "v8flags";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz";
+        sha512 = "iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==";
+      };
+    };
     "valid-identifier-0.0.1" = {
       name = "valid-identifier";
       packageName = "valid-identifier";
@@ -34932,7 +35139,7 @@ let
       packageName = "ws";
       version = "0.4.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
         sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927";
       };
     };
@@ -34941,7 +35148,7 @@ let
       packageName = "ws";
       version = "0.4.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+        url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
         sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
       };
     };
@@ -34981,13 +35188,13 @@ let
         sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==";
       };
     };
-    "ws-6.0.0" = {
+    "ws-6.1.0" = {
       name = "ws";
       packageName = "ws";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-6.0.0.tgz";
-        sha512 = "c2UlYcAZp1VS8AORtpq6y4RJIkJ9dQz18W32SpR/qXGfLDZ2jU4y4wKvvZwqbi7U6gxFQTeE+urMbXU/tsDy4w==";
+        url = "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz";
+        sha512 = "H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==";
       };
     };
     "wtf-8-1.0.0" = {
@@ -35008,6 +35215,15 @@ let
         sha1 = "7f6194154fd1786cf261e68b5488c47127a04977";
       };
     };
+    "xcode-1.0.0" = {
+      name = "xcode";
+      packageName = "xcode";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xcode/-/xcode-1.0.0.tgz";
+        sha1 = "e1f5b1443245ded38c180796df1a10fdeda084ec";
+      };
+    };
     "xdg-basedir-2.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -35491,7 +35707,7 @@ let
       packageName = "yargs-parser";
       version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        url = "http://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
         sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
@@ -35842,10 +36058,10 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "0.14.4";
+    version = "0.14.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-0.14.4.tgz";
-      sha512 = "U+Bd2VY5LkLM3DUpLtlQgS+goiXBmSU4P41xUdck/vyHqhMfxBVAXTMLksDGoWvhx7LPgboSUVF0ujHCVsturw==";
+      url = "https://registry.npmjs.org/asar/-/asar-0.14.5.tgz";
+      sha512 = "2Di/TnY1sridHFKMFgxBh0Wk0gVxSZN4qQhRhjJn3UywZAvP5MHI0RNVSkpzmJ+n6t0BC8w/+1257wtSgQ3Kdg==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -35963,7 +36179,7 @@ in
       sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
     };
     dependencies = [
-      sources."@types/node-8.10.30"
+      sources."@types/node-8.10.34"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
@@ -36507,8 +36723,8 @@ in
       sources."signal-exit-3.0.2"
       sources."sort-keys-1.1.2"
       sources."sort-keys-length-1.0.1"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
@@ -36626,7 +36842,7 @@ in
       sources."jsonparse-1.3.1"
       sources."labeled-stream-splicer-2.0.1"
       sources."lodash.memoize-3.0.4"
-      sources."md5.js-1.3.4"
+      sources."md5.js-1.3.5"
       sources."miller-rabin-4.0.1"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
@@ -36646,7 +36862,7 @@ in
       sources."pbkdf2-3.0.17"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
-      sources."public-encrypt-4.0.2"
+      sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -37013,8 +37229,8 @@ in
       })
       sources."single-line-log-0.4.1"
       sources."sntp-0.1.4"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."speedometer-0.1.4"
@@ -37202,10 +37418,10 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "8.1.1";
+    version = "8.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-8.1.1.tgz";
-      sha512 = "YmsGlgz8yiPFcRphTW3LO+6YaCZU5FmoVMOxIti5tbd4Td3JiXiJblpklijryc7jCY6B6seifu9xCVCpfc0AMA==";
+      url = "https://registry.npmjs.org/cordova/-/cordova-8.1.2.tgz";
+      sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg==";
     };
     dependencies = [
       sources."JSONStream-1.3.4"
@@ -37247,6 +37463,7 @@ in
       sources."base64-js-1.2.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.36"
+      sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       sources."body-parser-1.18.2"
       (sources."boxen-1.3.0" // {
@@ -37256,6 +37473,7 @@ in
           sources."supports-color-5.5.0"
         ];
       })
+      sources."bplist-creator-0.0.7"
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -37289,7 +37507,6 @@ in
       sources."capture-stack-trace-1.0.1"
       sources."caseless-0.12.0"
       sources."chalk-1.1.3"
-      sources."chownr-1.1.1"
       sources."ci-info-1.6.0"
       sources."cipher-base-1.0.4"
       sources."cli-boxes-1.0.0"
@@ -37334,7 +37551,7 @@ in
         ];
       })
       sources."cordova-js-4.2.4"
-      (sources."cordova-lib-8.1.0" // {
+      (sources."cordova-lib-8.1.1" // {
         dependencies = [
           sources."base64-js-1.1.2"
           sources."elementtree-0.1.7"
@@ -37416,8 +37633,8 @@ in
       })
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
+      sources."fstream-1.0.11"
       sources."function-bind-1.1.1"
       sources."get-assigned-identifiers-1.2.0"
       sources."get-stream-3.0.0"
@@ -37511,13 +37728,9 @@ in
       sources."lodash.memoize-3.0.4"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      (sources."lru-cache-4.1.3" // {
-        dependencies = [
-          sources."yallist-2.1.2"
-        ];
-      })
+      sources."lru-cache-4.1.3"
       sources."make-dir-1.3.0"
-      sources."md5.js-1.3.4"
+      sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -37529,8 +37742,6 @@ in
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.3.4"
-      sources."minizlib-1.1.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -37574,6 +37785,7 @@ in
       sources."path-platform-0.11.15"
       sources."path-to-regexp-0.1.7"
       sources."pbkdf2-3.0.17"
+      sources."pegjs-0.10.0"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
       sources."plist-2.1.0"
@@ -37585,7 +37797,7 @@ in
       sources."proxy-addr-2.0.4"
       sources."pseudomap-1.0.2"
       sources."psl-1.1.29"
-      sources."public-encrypt-4.0.2"
+      sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
       sources."qs-6.5.1"
@@ -37632,6 +37844,11 @@ in
       })
       sources."resolve-1.8.1"
       sources."restore-cursor-1.0.1"
+      (sources."rimraf-2.6.2" // {
+        dependencies = [
+          sources."glob-7.1.3"
+        ];
+      })
       sources."ripemd160-2.0.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
@@ -37651,16 +37868,23 @@ in
       sources."shelljs-0.5.3"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
+      (sources."simple-plist-0.2.1" // {
+        dependencies = [
+          sources."base64-js-1.1.2"
+          sources."plist-2.0.1"
+        ];
+      })
       sources."slash-1.0.0"
       sources."slide-1.1.6"
       sources."source-map-0.5.7"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
       sources."statuses-1.4.0"
       sources."stream-browserify-2.0.1"
+      sources."stream-buffers-2.2.0"
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.3"
       sources."stream-splicer-2.0.0"
@@ -37679,7 +37903,7 @@ in
       sources."subarg-1.0.0"
       sources."supports-color-2.0.0"
       sources."syntax-error-1.4.0"
-      sources."tar-4.4.6"
+      sources."tar-2.2.1"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
@@ -37727,11 +37951,16 @@ in
       sources."win-release-1.1.1"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.3.0"
+      (sources."xcode-1.0.0" // {
+        dependencies = [
+          sources."uuid-3.0.1"
+        ];
+      })
       sources."xdg-basedir-3.0.0"
       sources."xmlbuilder-8.2.2"
       sources."xmldom-0.1.27"
       sources."xtend-4.0.1"
-      sources."yallist-3.0.2"
+      sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37745,10 +37974,10 @@ in
   create-cycle-app = nodeEnv.buildNodePackage {
     name = "create-cycle-app";
     packageName = "create-cycle-app";
-    version = "4.0.0";
+    version = "5.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-4.0.0.tgz";
-      sha512 = "ofgR7gXf+7lgnXQvj0KeveHAyrtoK8zveCDD3sTHPFQY1FKJGkJ7M404ak+G8w6VbTuHwzaBrYbEh8M/SBuykQ==";
+      url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz";
+      sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA==";
     };
     dependencies = [
       sources."@cycle/dom-18.3.0"
@@ -37761,7 +37990,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.11.3"
+      sources."@types/node-10.11.4"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -37892,10 +38121,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "1.5.2";
+    version = "2.0.3";
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-react-app/-/create-react-app-1.5.2.tgz";
-      sha512 = "vnYIzsfTaqai2l07P9qtxhsZgHbzirC2omxKmf16wqvpXao9CNCDmpk+BCZRElih7HTn/mpO3soe8DTZV4DsgQ==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.3.tgz";
+      sha512 = "HpApfnkI/kc8mfqN9JkPUZ0MmaqsKkvhJzUWjXg/PqeeGNrO4NKXmWzc2QUncszl/o+jfaqxy8ajgO0BQuRcow==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -37912,9 +38141,9 @@ in
       sources."cross-spawn-4.0.2"
       sources."debug-2.6.9"
       sources."duplexer2-0.0.2"
-      sources."envinfo-3.4.2"
+      sources."envinfo-5.10.0"
       sources."escape-string-regexp-1.0.5"
-      sources."fs-extra-1.0.0"
+      sources."fs-extra-5.0.0"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
@@ -37926,20 +38155,13 @@ in
       sources."inherits-2.0.3"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
-      sources."jsonfile-2.4.0"
-      sources."klaw-1.3.1"
+      sources."jsonfile-4.0.0"
       sources."lru-cache-4.1.3"
-      sources."macos-release-1.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."once-1.4.0"
-      sources."os-name-2.0.1"
       sources."os-tmpdir-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
@@ -37964,12 +38186,12 @@ in
           sources."readable-stream-1.0.34"
         ];
       })
-      sources."tmp-0.0.31"
+      sources."tmp-0.0.33"
       sources."uid-number-0.0.6"
+      sources."universalify-0.1.2"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-name-3.0.0"
       sources."which-1.3.1"
-      sources."win-release-1.1.1"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
@@ -37977,7 +38199,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "Create React apps with no build configuration.";
-      homepage = "https://github.com/facebookincubator/create-react-app#readme";
+      homepage = "https://github.com/facebook/create-react-app#readme";
       license = "MIT";
     };
     production = true;
@@ -38233,7 +38455,7 @@ in
       sources."has-flag-3.0.0"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.19.1" // {
+      (sources."hypercore-6.19.2" // {
         dependencies = [
           sources."process-nextick-args-1.0.7"
           sources."unordered-set-2.0.1"
@@ -38840,10 +39062,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.4.0";
+    version = "4.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.4.0.tgz";
-      sha512 = "DHK6WpqZf5VTW9PK2UjkRADDacT6c2fsHFCy0pQ8c1VYUWz/zI5OGzBBPg5HTZbvTgY+AXJ3JHUB3E7Esktlog==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-4.0.3.tgz";
+      sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA==";
     };
     dependencies = [
       sources."JSONStream-1.3.4"
@@ -38852,12 +39074,13 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.325.0"
+      sources."aws-sdk-2.330.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."buffer-4.9.1"
+      sources."bytes-3.0.0"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.7"
@@ -38910,6 +39133,7 @@ in
           sources."uuid-3.3.2"
         ];
       })
+      sources."requestretry-3.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
@@ -38925,6 +39149,7 @@ in
       sources."url-0.10.3"
       sources."uuid-3.1.0"
       sources."verror-1.10.0"
+      sources."when-3.7.8"
       sources."wordwrap-0.0.3"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
@@ -39624,8 +39849,8 @@ in
       sources."slash-1.0.0"
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       (sources."string-width-2.1.1" // {
@@ -39703,7 +39928,7 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
-      sources."debug-4.0.1"
+      sources."debug-4.1.0"
       sources."deep-is-0.1.3"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
@@ -39727,7 +39952,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.3"
-      sources."globals-11.7.0"
+      sources."globals-11.8.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
@@ -39773,7 +39998,7 @@ in
       sources."prelude-ls-1.1.2"
       sources."progress-2.0.0"
       sources."punycode-2.1.1"
-      sources."regexpp-2.0.0"
+      sources."regexpp-2.0.1"
       sources."require-uncached-1.0.3"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
@@ -39847,7 +40072,7 @@ in
       sources."color-name-1.1.3"
       sources."concat-map-0.0.1"
       sources."cross-spawn-6.0.5"
-      sources."debug-4.0.1"
+      sources."debug-4.1.0"
       sources."deep-is-0.1.3"
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
@@ -39872,7 +40097,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.3"
-      sources."globals-11.7.0"
+      sources."globals-11.8.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
@@ -39920,7 +40145,7 @@ in
       sources."prelude-ls-1.1.2"
       sources."progress-2.0.0"
       sources."punycode-2.1.1"
-      sources."regexpp-2.0.0"
+      sources."regexpp-2.0.1"
       sources."require-uncached-1.0.3"
       sources."resolve-1.8.1"
       sources."resolve-from-1.0.1"
@@ -40130,8 +40355,8 @@ in
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
@@ -40617,13 +40842,13 @@ in
     };
     dependencies = [
       sources."async-2.6.1"
-      sources."debug-4.0.1"
+      sources."debug-4.1.0"
       sources."lodash-4.17.11"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.1.1"
-      sources."simple-git-1.103.0"
+      sources."simple-git-1.104.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -40765,7 +40990,7 @@ in
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.3"
+      sources."ssb-config-2.3.4"
       sources."ssb-git-0.5.0"
       sources."ssb-git-repo-2.8.3"
       sources."ssb-issues-1.0.0"
@@ -40809,10 +41034,10 @@ in
   git-standup = nodeEnv.buildNodePackage {
     name = "git-standup";
     packageName = "git-standup";
-    version = "2.1.9";
+    version = "2.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.9.tgz";
-      sha512 = "+XT110zb/S1XzG+amg5gKGWcD6dW58mnstS4GkuiO63aA8qGvpgNB9Cq89qxhFSIQ2smeB/00QGsVLn4CL1V+A==";
+      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.2.0.tgz";
+      sha512 = "GlQib2CmkcPfPlZhelfZmFKP2AbkeAOZ9SK3Z2M+CwdsrAA62bhI6CTDYWk/bm0C3bxizlX+U86/RNSk4O9efQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -41200,7 +41425,7 @@ in
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."ono-4.0.9"
+      sources."ono-4.0.10"
       sources."open-0.0.5"
       sources."opn-5.4.0"
       sources."ora-1.4.0"
@@ -41306,8 +41531,8 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
@@ -41763,7 +41988,7 @@ in
     packageName = "gulp";
     version = "3.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+      url = "http://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
       sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
     };
     dependencies = [
@@ -42144,6 +42369,345 @@ in
     production = true;
     bypassCache = true;
   };
+  gulp-cli = nodeEnv.buildNodePackage {
+    name = "gulp-cli";
+    packageName = "gulp-cli";
+    version = "2.0.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz";
+      sha512 = "RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==";
+    };
+    dependencies = [
+      sources."ansi-colors-1.1.0"
+      sources."ansi-gray-0.1.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-wrap-0.1.0"
+      sources."archy-1.0.0"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-each-1.0.1"
+      sources."array-slice-1.1.0"
+      sources."array-sort-1.0.0"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
+      sources."atob-2.1.2"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-1.1.1"
+      sources."cache-base-1.0.1"
+      sources."camelcase-3.0.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."cliui-3.2.0"
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."color-support-1.1.3"
+      sources."component-emitter-1.2.1"
+      sources."concat-stream-1.6.2"
+      sources."copy-descriptor-0.1.1"
+      sources."copy-props-2.0.4"
+      sources."core-util-is-1.0.2"
+      sources."d-1.0.0"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."default-compare-1.0.0"
+      sources."define-property-2.0.2"
+      sources."detect-file-1.0.0"
+      sources."each-props-1.3.2"
+      sources."error-ex-1.3.2"
+      sources."es5-ext-0.10.46"
+      sources."es6-iterator-2.0.3"
+      sources."es6-symbol-3.1.1"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."expand-tilde-2.0.2"
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."fancy-log-1.3.2"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."find-up-1.1.2"
+      sources."findup-sync-2.0.0"
+      sources."fined-1.1.0"
+      sources."flagged-respawn-1.0.0"
+      sources."for-in-1.0.2"
+      sources."for-own-1.0.0"
+      sources."fragment-cache-0.2.1"
+      sources."get-caller-file-1.0.3"
+      sources."get-value-2.0.6"
+      sources."global-modules-1.0.0"
+      sources."global-prefix-1.0.2"
+      sources."glogg-1.0.1"
+      sources."graceful-fs-4.1.11"
+      sources."gulplog-1.0.0"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."homedir-polyfill-1.0.1"
+      sources."hosted-git-info-2.7.1"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."interpret-1.1.0"
+      sources."invert-kv-1.0.0"
+      sources."is-absolute-1.0.0"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
+      sources."is-builtin-module-1.0.0"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-3.1.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-plain-object-2.0.4"
+      sources."is-relative-1.0.0"
+      sources."is-unc-path-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."kind-of-5.1.0"
+      sources."lcid-1.0.0"
+      sources."liftoff-2.5.0"
+      sources."load-json-file-1.1.0"
+      (sources."make-iterator-1.0.1" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."matchdep-2.0.0"
+      (sources."micromatch-3.1.10" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."mixin-deep-1.3.1" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."ms-2.0.0"
+      sources."mute-stdout-1.0.1"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."next-tick-1.0.0"
+      sources."normalize-package-data-2.4.0"
+      sources."number-is-nan-1.0.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.defaults-1.1.0"
+      sources."object.map-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."os-locale-1.4.0"
+      sources."parse-filepath-1.0.2"
+      sources."parse-json-2.2.0"
+      sources."parse-passwd-1.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-exists-2.1.0"
+      sources."path-parse-1.0.6"
+      sources."path-root-0.1.1"
+      sources."path-root-regex-0.1.2"
+      sources."path-type-1.1.0"
+      sources."pify-2.3.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."posix-character-classes-0.1.1"
+      sources."pretty-hrtime-1.0.3"
+      sources."process-nextick-args-2.0.0"
+      sources."read-pkg-1.1.0"
+      sources."read-pkg-up-1.0.1"
+      sources."readable-stream-2.3.6"
+      sources."rechoir-0.6.2"
+      sources."regex-not-1.0.2"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."replace-homedir-1.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."resolve-1.8.1"
+      sources."resolve-dir-1.0.1"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
+      sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
+      sources."semver-5.5.1"
+      sources."semver-greatest-satisfied-range-1.1.0"
+      sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
+      sources."sparkles-1.0.1"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.1"
+      sources."split-string-3.1.0"
+      sources."stack-trace-0.0.10"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-2.0.0"
+      sources."sver-compat-1.5.0"
+      sources."time-stamp-1.1.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."typedarray-0.0.6"
+      sources."unc-path-regex-0.1.2"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."set-value-0.4.3"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."v8flags-3.1.1"
+      sources."validate-npm-package-license-3.0.4"
+      sources."which-1.3.1"
+      sources."which-module-1.0.0"
+      sources."wrap-ansi-2.1.0"
+      sources."y18n-3.2.1"
+      sources."yargs-7.1.0"
+      sources."yargs-parser-5.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Command line interface for gulp";
+      homepage = http://gulpjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
   hipache = nodeEnv.buildNodePackage {
     name = "hipache";
     packageName = "hipache";
@@ -42389,6 +42953,7 @@ in
       sources."lodash-4.17.11"
       sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
+      sources."lodash.clone-4.5.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.flatten-4.4.0"
       sources."lodash.get-4.4.2"
@@ -42488,11 +43053,11 @@ in
       sources."shelljs-0.3.0"
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
-      sources."snyk-1.99.1"
+      sources."snyk-1.102.0"
       sources."snyk-config-2.2.0"
       sources."snyk-docker-plugin-1.11.0"
       sources."snyk-go-plugin-1.5.2"
-      sources."snyk-gradle-plugin-2.0.1"
+      sources."snyk-gradle-plugin-2.1.0"
       sources."snyk-module-1.8.2"
       sources."snyk-mvn-plugin-2.0.0"
       (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
@@ -42503,9 +43068,9 @@ in
       sources."snyk-nuget-plugin-1.6.5"
       sources."snyk-php-plugin-1.5.1"
       sources."snyk-policy-1.12.0"
-      sources."snyk-python-plugin-1.8.1"
+      sources."snyk-python-plugin-1.8.2"
       sources."snyk-resolve-1.0.1"
-      sources."snyk-resolve-deps-3.1.0"
+      sources."snyk-resolve-deps-4.0.1"
       sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.3.1"
@@ -42681,17 +43246,16 @@ in
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
-    version = "4.1.2";
+    version = "4.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ionic/-/ionic-4.1.2.tgz";
-      sha512 = "iZOKZI7MRcIi2zgmPJ20Gj4SWPBp7FG87yw3akHhFdGR+OnPqsm/6Zy7/b0jRdMjFk6srlhtVmKgHvXYX3EZhw==";
+      url = "https://registry.npmjs.org/ionic/-/ionic-4.2.1.tgz";
+      sha512 = "4QwbtBxHYTaa/wxlYx+iXdSALs8aoEAw8poR24tTUtJRd0aKoAJM4K815DuNKLUFdgn3v0pTixdTTPLH8CADxw==";
     };
     dependencies = [
-      sources."@ionic/cli-framework-1.0.7"
-      sources."@ionic/cli-utils-2.2.1"
-      sources."@ionic/discover-1.0.4"
-      sources."@ionic/utils-fs-0.0.1"
-      sources."@ionic/utils-network-0.0.1"
+      sources."@ionic/cli-framework-1.1.1"
+      sources."@ionic/discover-1.0.6"
+      sources."@ionic/utils-fs-0.0.3"
+      sources."@ionic/utils-network-0.0.3"
       sources."agent-base-4.2.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
@@ -42726,11 +43290,7 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."data-uri-to-buffer-1.2.0"
-      (sources."debug-3.2.5" // {
-        dependencies = [
-          sources."ms-2.1.1"
-        ];
-      })
+      sources."debug-4.1.0"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
@@ -42769,6 +43329,7 @@ in
       (sources."get-uri-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."ms-2.0.0"
         ];
       })
       sources."glob-7.1.3"
@@ -42780,16 +43341,25 @@ in
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."https-proxy-agent-2.2.1" // {
+        dependencies = [
+          sources."debug-3.2.5"
         ];
       })
-      sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.24"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-6.2.0"
+      (sources."inquirer-6.2.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."ip-1.1.5"
       sources."is-ci-1.2.1"
       sources."is-fullwidth-code-point-2.0.0"
@@ -42808,6 +43378,7 @@ in
       (sources."leek-0.0.24" // {
         dependencies = [
           sources."debug-2.6.9"
+          sources."ms-2.0.0"
         ];
       })
       sources."levn-0.3.0"
@@ -42845,7 +43416,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."ms-2.0.0"
+      sources."ms-2.1.1"
       sources."mute-stream-0.0.7"
       sources."ncp-2.0.0"
       sources."netmask-1.0.6"
@@ -42857,7 +43428,11 @@ in
       sources."os-name-2.0.1"
       sources."os-tmpdir-1.0.2"
       sources."p-finally-1.0.0"
-      sources."pac-proxy-agent-2.0.2"
+      (sources."pac-proxy-agent-3.0.0" // {
+        dependencies = [
+          sources."debug-3.2.5"
+        ];
+      })
       sources."pac-resolver-3.0.0"
       sources."package-json-4.0.1"
       sources."path-is-absolute-1.0.1"
@@ -42867,7 +43442,11 @@ in
       sources."prelude-ls-1.1.2"
       sources."prepend-http-1.0.4"
       sources."process-nextick-args-2.0.0"
-      sources."proxy-agent-2.3.1"
+      (sources."proxy-agent-3.0.3" // {
+        dependencies = [
+          sources."debug-3.2.5"
+        ];
+      })
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."qs-6.5.2"
@@ -42895,21 +43474,37 @@ in
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."slice-ansi-1.0.0"
-      sources."smart-buffer-1.1.15"
-      sources."socks-1.1.10"
-      sources."socks-proxy-agent-3.0.1"
+      sources."smart-buffer-4.0.1"
+      sources."socks-2.2.1"
+      sources."socks-proxy-agent-4.0.1"
       sources."source-map-0.6.1"
       sources."split2-2.2.0"
       sources."ssh-config-1.1.3"
       sources."statuses-1.5.0"
       sources."stream-combiner2-1.1.1"
-      sources."string-width-2.1.1"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."string_decoder-1.1.1"
-      sources."strip-ansi-4.0.0"
+      (sources."strip-ansi-5.0.0" // {
+        dependencies = [
+          sources."ansi-regex-4.0.0"
+        ];
+      })
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."superagent-3.8.3"
-      sources."superagent-proxy-1.0.3"
+      (sources."superagent-3.8.3" // {
+        dependencies = [
+          sources."debug-3.2.5"
+        ];
+      })
+      (sources."superagent-proxy-2.0.0" // {
+        dependencies = [
+          sources."debug-3.2.5"
+        ];
+      })
       sources."supports-color-5.5.0"
       (sources."tar-4.4.6" // {
         dependencies = [
@@ -42937,10 +43532,14 @@ in
       sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."wordwrap-1.0.0"
-      sources."wrap-ansi-4.0.0"
+      (sources."wrap-ansi-4.0.0" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.3.0"
-      sources."ws-6.0.0"
+      sources."ws-6.1.0"
       sources."xdg-basedir-3.0.0"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
@@ -43158,23 +43757,23 @@ in
       sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA==";
     };
     dependencies = [
-      (sources."@commitlint/cli-7.1.2" // {
+      (sources."@commitlint/cli-7.2.0" // {
         dependencies = [
           sources."chalk-2.3.1"
         ];
       })
       sources."@commitlint/config-conventional-7.1.2"
-      sources."@commitlint/ensure-7.1.2"
+      sources."@commitlint/ensure-7.2.0"
       sources."@commitlint/execute-rule-7.1.2"
-      sources."@commitlint/format-7.1.2"
-      sources."@commitlint/is-ignored-7.1.2"
-      sources."@commitlint/lint-7.1.2"
-      sources."@commitlint/load-7.1.2"
+      sources."@commitlint/format-7.2.0"
+      sources."@commitlint/is-ignored-7.2.0"
+      sources."@commitlint/lint-7.2.0"
+      sources."@commitlint/load-7.2.0"
       sources."@commitlint/message-7.1.2"
       sources."@commitlint/parse-7.1.2"
       sources."@commitlint/read-7.1.2"
       sources."@commitlint/resolve-extends-7.1.2"
-      sources."@commitlint/rules-7.1.2"
+      sources."@commitlint/rules-7.2.0"
       sources."@commitlint/to-lines-7.1.2"
       sources."@commitlint/top-level-7.1.2"
       sources."@marionebl/sander-0.6.1"
@@ -43341,8 +43940,8 @@ in
       sources."semaphore-async-await-1.5.1"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."split2-2.2.0"
@@ -43357,7 +43956,7 @@ in
       sources."text-extensions-1.8.0"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
-      sources."thriftrw-3.11.2"
+      sources."thriftrw-3.11.3"
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."trim-newlines-2.0.0"
@@ -43722,10 +44321,10 @@ in
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
     packageName = "json-refs";
-    version = "3.0.10";
+    version = "3.0.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz";
-      sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw==";
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz";
+      sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -43940,7 +44539,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nanoid-1.2.5"
+      sources."nanoid-1.2.6"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -44278,7 +44877,7 @@ in
       sources."kind-of-6.0.2"
       sources."lodash-4.17.11"
       sources."lodash.debounce-4.0.8"
-      (sources."log4js-3.0.5" // {
+      (sources."log4js-3.0.6" // {
         dependencies = [
           sources."debug-3.2.5"
           sources."ms-2.1.1"
@@ -44999,24 +45598,24 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.4.0";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.0.tgz";
-      sha512 = "RCLm0gMi8PESEF8PzMxo35foA2NGGC/NKnKiUmJyRrhLybOIUfVPdPStSAWCjW1c+DYCgLZCbxu57/KWt4ZWZA==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.1.tgz";
+      sha512 = "00X2mYuwJk/bvxdjJceUxTjUgUg7MIMWllo2zGfDVGPijLadrg8QCtJASZqVE7HDQbBLDxLGPjswk29HF5JS2Q==";
     };
     dependencies = [
-      sources."@lerna/add-3.3.2"
+      sources."@lerna/add-3.4.1"
       sources."@lerna/batch-packages-3.1.2"
-      sources."@lerna/bootstrap-3.3.2"
-      sources."@lerna/changed-3.3.2"
+      sources."@lerna/bootstrap-3.4.1"
+      sources."@lerna/changed-3.4.1"
       sources."@lerna/check-working-tree-3.3.0"
       sources."@lerna/child-process-3.3.0"
       sources."@lerna/clean-3.3.2"
       sources."@lerna/cli-3.2.0"
       sources."@lerna/collect-updates-3.3.2"
       sources."@lerna/command-3.3.0"
-      sources."@lerna/conventional-commits-3.3.0"
-      sources."@lerna/create-3.3.1"
+      sources."@lerna/conventional-commits-3.4.1"
+      sources."@lerna/create-3.4.1"
       sources."@lerna/create-symlink-3.3.0"
       sources."@lerna/describe-ref-3.3.0"
       sources."@lerna/diff-3.3.0"
@@ -45032,7 +45631,7 @@ in
       sources."@lerna/list-3.3.2"
       sources."@lerna/listable-3.0.0"
       sources."@lerna/log-packed-3.0.4"
-      sources."@lerna/npm-conf-3.0.0"
+      sources."@lerna/npm-conf-3.4.1"
       sources."@lerna/npm-dist-tag-3.3.0"
       sources."@lerna/npm-install-3.3.0"
       sources."@lerna/npm-publish-3.3.1"
@@ -45042,16 +45641,16 @@ in
       sources."@lerna/package-graph-3.1.2"
       sources."@lerna/project-3.0.0"
       sources."@lerna/prompt-3.3.1"
-      sources."@lerna/publish-3.4.0"
+      sources."@lerna/publish-3.4.1"
       sources."@lerna/resolve-symlink-3.3.0"
       sources."@lerna/rimraf-dir-3.3.0"
       sources."@lerna/run-3.3.2"
-      sources."@lerna/run-lifecycle-3.3.1"
+      sources."@lerna/run-lifecycle-3.4.1"
       sources."@lerna/run-parallel-batches-3.0.0"
       sources."@lerna/symlink-binary-3.3.0"
       sources."@lerna/symlink-dependencies-3.3.0"
       sources."@lerna/validation-error-3.0.0"
-      sources."@lerna/version-3.3.2"
+      sources."@lerna/version-3.4.1"
       sources."@lerna/write-log-file-3.0.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.2"
@@ -45160,8 +45759,8 @@ in
       sources."concat-stream-1.6.2"
       sources."config-chain-1.1.12"
       sources."console-control-strings-1.1.0"
-      sources."conventional-changelog-angular-1.6.6"
-      (sources."conventional-changelog-core-2.0.11" // {
+      sources."conventional-changelog-angular-5.0.1"
+      (sources."conventional-changelog-core-3.1.0" // {
         dependencies = [
           sources."load-json-file-1.1.0"
           sources."parse-json-2.2.0"
@@ -45171,11 +45770,11 @@ in
           sources."strip-bom-2.0.0"
         ];
       })
-      sources."conventional-changelog-preset-loader-1.1.8"
-      sources."conventional-changelog-writer-3.0.9"
-      sources."conventional-commits-filter-1.1.6"
-      sources."conventional-commits-parser-2.1.7"
-      sources."conventional-recommended-bump-2.0.9"
+      sources."conventional-changelog-preset-loader-2.0.1"
+      sources."conventional-changelog-writer-4.0.0"
+      sources."conventional-commits-filter-2.0.0"
+      sources."conventional-commits-parser-3.0.0"
+      sources."conventional-recommended-bump-4.0.1"
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
@@ -45250,7 +45849,7 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
-      (sources."fast-glob-2.2.2" // {
+      (sources."fast-glob-2.2.3" // {
         dependencies = [
           sources."is-glob-4.0.0"
         ];
@@ -45302,16 +45901,16 @@ in
       })
       sources."get-port-3.2.0"
       sources."get-stdin-4.0.1"
-      sources."get-stream-4.0.0"
+      sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
-      sources."git-raw-commits-1.3.6"
+      sources."git-raw-commits-2.0.0"
       (sources."git-remote-origin-url-2.0.0" // {
         dependencies = [
           sources."pify-2.3.0"
         ];
       })
-      sources."git-semver-tags-1.3.6"
+      sources."git-semver-tags-2.0.0"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.3"
       sources."glob-parent-3.1.0"
@@ -45485,7 +46084,7 @@ in
       sources."npm-bundled-1.0.5"
       sources."npm-lifecycle-2.1.0"
       sources."npm-package-arg-6.1.0"
-      sources."npm-packlist-1.1.11"
+      sources."npm-packlist-1.1.12"
       sources."npm-pick-manifest-2.1.0"
       sources."npm-registry-fetch-3.8.0"
       sources."npm-run-path-2.0.2"
@@ -45672,8 +46271,8 @@ in
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."split-1.0.1"
@@ -47524,7 +48123,7 @@ in
       })
       sources."tildify-1.2.0"
       sources."time-stamp-1.1.0"
-      sources."timers-ext-0.1.5"
+      sources."timers-ext-0.1.7"
       sources."to-absolute-glob-2.0.2"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -47849,8 +48448,8 @@ in
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
       sources."slide-1.1.6"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
@@ -48239,8 +48838,8 @@ in
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
       sources."sntp-1.0.9"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       (sources."sshpk-1.14.2" // {
@@ -48362,7 +48961,7 @@ in
       sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
-      sources."npm-packlist-1.1.11"
+      sources."npm-packlist-1.1.12"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -48523,7 +49122,7 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."flatmap-stream-0.1.0"
+      sources."flatmap-stream-0.1.1"
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
@@ -49038,7 +49637,7 @@ in
       sources."node-red-node-email-0.1.29"
       sources."node-red-node-feedparser-0.1.14"
       sources."node-red-node-rbe-0.2.3"
-      sources."node-red-node-twitter-1.1.2"
+      sources."node-red-node-twitter-1.1.3"
       sources."nodemailer-1.11.0"
       sources."nodemailer-direct-transport-1.1.0"
       (sources."nodemailer-smtp-transport-1.1.0" // {
@@ -49219,7 +49818,7 @@ in
       sources."connect-flash-0.1.0"
       sources."cookie-0.0.5"
       sources."cookie-signature-1.0.1"
-      (sources."debug-4.0.1" // {
+      (sources."debug-4.1.0" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
@@ -49275,7 +49874,7 @@ in
       sources."qs-0.5.1"
       sources."rai-0.1.12"
       sources."range-parser-0.0.4"
-      (sources."raw-socket-1.6.2" // {
+      (sources."raw-socket-1.6.3" // {
         dependencies = [
           sources."nan-2.10.0"
         ];
@@ -49527,7 +50126,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
@@ -49539,7 +50138,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."execa-0.7.0"
-      sources."fast-diff-1.1.2"
+      sources."fast-diff-1.2.0"
       sources."find-up-1.1.2"
       sources."get-stdin-5.0.1"
       sources."get-stream-3.0.0"
@@ -49749,8 +50348,8 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."string-width-1.0.2"
@@ -50105,8 +50704,8 @@ in
       sources."setprototypeof-1.1.0"
       sources."simplediff-0.1.1"
       sources."source-map-0.6.1"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
@@ -50387,8 +50986,8 @@ in
         ];
       })
       sources."single-line-log-1.1.2"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."speedometer-0.1.4"
@@ -50900,7 +51499,7 @@ in
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       sources."core-util-is-1.0.2"
@@ -51282,7 +51881,7 @@ in
       sources."lodash.memoize-3.0.4"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      sources."md5.js-1.3.4"
+      sources."md5.js-1.3.5"
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
@@ -51354,7 +51953,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
-      sources."public-encrypt-4.0.2"
+      sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -51577,7 +52176,7 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."console-control-strings-1.1.0"
       sources."constantinople-3.1.2"
       sources."content-disposition-0.5.2"
@@ -51707,7 +52306,7 @@ in
       sources."nan-2.5.1"
       sources."negotiator-0.6.1"
       sources."net-browserify-alt-1.1.0"
-      sources."node-abi-2.4.4"
+      sources."node-abi-2.4.5"
       sources."node.extend-2.0.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
@@ -51859,7 +52458,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base62-0.1.1"
       sources."brace-expansion-1.1.11"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."commoner-0.10.8"
       sources."concat-map-0.0.1"
       sources."defined-1.0.0"
@@ -51997,7 +52596,7 @@ in
       sources."crc-0.2.0"
       sources."crypto-0.0.3"
       sources."dashdash-1.14.1"
-      sources."debug-4.0.1"
+      sources."debug-4.1.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."events.node-0.4.9"
@@ -52100,10 +52699,10 @@ in
   scuttlebot = nodeEnv.buildNodePackage {
     name = "scuttlebot";
     packageName = "scuttlebot";
-    version = "12.2.0";
+    version = "12.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.0.tgz";
-      sha512 = "zSB0mcodvOOXumXDqITpB6mjmqPnW32pN3SreOF/cr4mpBpWSvSmvlmHQqAVH0RnorNVu0djjDXUO8SMjc+cWQ==";
+      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.3.tgz";
+      sha512 = "Y40HTj8B8DHdGUCbup//Ge/BiVcmp6fVPCGHnn5Jmq0QyQitlnFUaeMlv2fdqealM4xB3xuCTS2KChbiRJOWtw==";
     };
     dependencies = [
       sources."abstract-leveldown-4.0.3"
@@ -52197,7 +52796,7 @@ in
       sources."code-point-at-1.1.0"
       sources."collapse-white-space-1.0.4"
       sources."collection-visit-1.0.0"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."compare-at-paths-1.0.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -52290,7 +52889,7 @@ in
           sources."map-filter-reduce-3.2.1"
         ];
       })
-      (sources."flumeview-reduce-1.3.13" // {
+      (sources."flumeview-reduce-1.3.14" // {
         dependencies = [
           sources."atomic-file-1.1.5"
           sources."flumecodec-0.0.0"
@@ -52498,7 +53097,7 @@ in
         ];
       })
       sources."ncp-2.0.0"
-      sources."node-abi-2.4.4"
+      sources."node-abi-2.4.5"
       sources."node-gyp-build-3.4.0"
       (sources."non-private-ip-1.4.4" // {
         dependencies = [
@@ -52726,7 +53325,7 @@ in
           sources."ip-1.1.5"
         ];
       })
-      (sources."secure-scuttlebutt-18.3.3" // {
+      (sources."secure-scuttlebutt-18.4.0" // {
         dependencies = [
           sources."deep-equal-0.2.2"
         ];
@@ -52792,7 +53391,7 @@ in
       sources."split-string-3.1.0"
       sources."ssb-blobs-1.1.5"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.3"
+      sources."ssb-config-2.3.4"
       sources."ssb-ebt-5.2.3"
       (sources."ssb-friends-3.1.3" // {
         dependencies = [
@@ -53073,7 +53672,7 @@ in
       sources."cheerio-0.17.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.1.2"
       sources."component-inherit-0.0.3"
@@ -53121,7 +53720,7 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."finalhandler-1.1.1"
-      sources."flatmap-stream-0.1.0"
+      sources."flatmap-stream-0.1.1"
       sources."forever-agent-0.6.1"
       (sources."form-data-2.3.2" // {
         dependencies = [
@@ -53318,7 +53917,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."compressible-2.0.15"
       (sources."compression-1.7.3" // {
         dependencies = [
@@ -53926,10 +54525,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.99.1";
+    version = "1.102.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.99.1.tgz";
-      sha512 = "vN2jUGwHPHAbqqOeZQsBrnWgTvuCnbxsP8i9BIaqZxINeKbuBOS1t5Kg9KMMCRJyqqCB/y76PQSdoqavh4yxkg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz";
+      sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ==";
     };
     dependencies = [
       sources."@yarnpkg/lockfile-1.1.0"
@@ -54055,6 +54654,7 @@ in
       sources."lodash-4.17.11"
       sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
+      sources."lodash.clone-4.5.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.flatten-4.4.0"
       sources."lodash.get-4.4.2"
@@ -54130,7 +54730,7 @@ in
       sources."snyk-config-2.2.0"
       sources."snyk-docker-plugin-1.11.0"
       sources."snyk-go-plugin-1.5.2"
-      sources."snyk-gradle-plugin-2.0.1"
+      sources."snyk-gradle-plugin-2.1.0"
       sources."snyk-module-1.8.2"
       sources."snyk-mvn-plugin-2.0.0"
       (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
@@ -54141,9 +54741,9 @@ in
       sources."snyk-nuget-plugin-1.6.5"
       sources."snyk-php-plugin-1.5.1"
       sources."snyk-policy-1.12.0"
-      sources."snyk-python-plugin-1.8.1"
+      sources."snyk-python-plugin-1.8.2"
       sources."snyk-resolve-1.0.1"
-      sources."snyk-resolve-deps-3.1.0"
+      sources."snyk-resolve-deps-4.0.1"
       sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.3.1"
@@ -54367,7 +54967,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
       sources."css-parse-1.7.0"
-      sources."debug-4.0.1"
+      sources."debug-4.1.0"
       sources."fs.realpath-1.0.0"
       sources."glob-7.0.6"
       sources."inflight-1.0.6"
@@ -54558,7 +55158,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -54641,7 +55241,7 @@ in
         ];
       })
       sources."finalhandler-1.1.0"
-      sources."flatmap-stream-0.1.0"
+      sources."flatmap-stream-0.1.1"
       sources."for-in-1.0.2"
       sources."form-data-2.3.2"
       sources."formidable-1.2.1"
@@ -55294,10 +55894,10 @@ in
   triton = nodeEnv.buildNodePackage {
     name = "triton";
     packageName = "triton";
-    version = "6.1.2";
+    version = "6.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/triton/-/triton-6.1.2.tgz";
-      sha1 = "1f4376383ea07de8bffbfd00b445719d57a5f474";
+      url = "https://registry.npmjs.org/triton/-/triton-6.2.0.tgz";
+      sha512 = "wERRcxLL1DnjCl5N/t68zu1/cPpqLs70clFI2ke1fLfwjuGF+PdZhO8dZwZZROJqOwlOozCqf3qMWiMAfztWzQ==";
     };
     dependencies = [
       sources."asn1-0.2.4"
@@ -56097,8 +56697,8 @@ in
           sources."isarray-2.0.1"
         ];
       })
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sshpk-1.14.2"
@@ -56245,7 +56845,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.12"
       sources."consolidate-0.14.5"
@@ -56506,7 +57106,7 @@ in
       sources."@types/express-serve-static-core-4.16.0"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
-      sources."@types/node-10.11.3"
+      sources."@types/node-10.11.4"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-5.1.2"
@@ -56528,7 +57128,7 @@ in
       sources."anymatch-2.0.0"
       sources."apollo-cache-1.1.17"
       sources."apollo-cache-control-0.2.5"
-      sources."apollo-cache-inmemory-1.3.0"
+      sources."apollo-cache-inmemory-1.3.5"
       sources."apollo-client-2.4.2"
       sources."apollo-datasource-0.1.3"
       sources."apollo-engine-reporting-0.0.6"
@@ -56657,7 +57257,7 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.12"
@@ -56700,7 +57300,7 @@ in
         ];
       })
       sources."deep-extend-0.6.0"
-      sources."deepmerge-2.1.1"
+      sources."deepmerge-2.2.1"
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
@@ -56794,7 +57394,7 @@ in
       sources."extract-files-3.1.0"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
-      sources."fast-glob-2.2.2"
+      sources."fast-glob-2.2.3"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fclone-1.0.11"
       sources."fd-slicer-1.1.0"
@@ -56809,7 +57409,7 @@ in
           sources."statuses-1.4.0"
         ];
       })
-      sources."flatmap-stream-0.1.0"
+      sources."flatmap-stream-0.1.1"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       (sources."form-data-2.3.2" // {
@@ -56855,7 +57455,7 @@ in
       sources."graphql-anywhere-4.1.19"
       sources."graphql-extensions-0.2.1"
       sources."graphql-subscriptions-1.0.0"
-      sources."graphql-tag-2.9.2"
+      sources."graphql-tag-2.10.0"
       sources."graphql-tools-3.1.1"
       sources."graphql-type-json-0.2.1"
       sources."growly-1.3.0"
@@ -56992,7 +57592,7 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.11.1"
-      sources."nanoid-1.2.5"
+      sources."nanoid-1.2.6"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -57359,7 +57959,7 @@ in
       sources."caseless-0.11.0"
       sources."chalk-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.5.0"
       (sources."config-chain-1.1.12" // {
@@ -57730,7 +58330,7 @@ in
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      sources."md5.js-1.3.4"
+      sources."md5.js-1.3.5"
       sources."memory-fs-0.4.1"
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
@@ -57793,7 +58393,7 @@ in
       sources."promise-inflight-1.0.1"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."public-encrypt-4.0.2"
+      sources."public-encrypt-4.0.3"
       sources."pump-2.0.1"
       sources."pumpify-1.5.1"
       sources."punycode-2.1.1"
@@ -58165,7 +58765,7 @@ in
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."range-slice-stream-2.0.0"
-      sources."readable-stream-3.0.3"
+      sources."readable-stream-3.0.6"
       sources."record-cache-1.1.0"
       (sources."render-media-3.1.3" // {
         dependencies = [
@@ -58244,7 +58844,7 @@ in
       })
       sources."winreg-1.2.4"
       sources."wrappy-1.0.2"
-      sources."ws-6.0.0"
+      sources."ws-6.1.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
@@ -58270,7 +58870,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.11.3"
+      sources."@types/node-10.11.4"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
@@ -58447,7 +59047,7 @@ in
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."common-tags-1.8.0"
       sources."component-emitter-1.2.1"
       sources."compress-commons-1.2.2"
@@ -58543,7 +59143,7 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."debug-3.2.5"
-          sources."globals-11.7.0"
+          sources."globals-11.8.0"
           sources."ms-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
@@ -58630,7 +59230,7 @@ in
       sources."fast-json-patch-2.0.7"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fast-levenshtein-2.0.6"
-      sources."fast-redact-1.2.0"
+      sources."fast-redact-1.3.0"
       sources."fast-safe-stringify-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-2.0.0"
@@ -58878,6 +59478,7 @@ in
       sources."lodash-4.17.11"
       sources."lodash.assign-4.2.0"
       sources."lodash.assignin-4.2.0"
+      sources."lodash.clone-4.5.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lodash.debounce-4.0.8"
       sources."lodash.flatten-4.4.0"
@@ -59197,7 +59798,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.99.1" // {
+      (sources."snyk-1.102.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
@@ -59225,7 +59826,7 @@ in
         ];
       })
       sources."snyk-go-plugin-1.5.2"
-      sources."snyk-gradle-plugin-2.0.1"
+      sources."snyk-gradle-plugin-2.1.0"
       (sources."snyk-module-1.8.2" // {
         dependencies = [
           sources."debug-3.2.5"
@@ -59258,17 +59859,18 @@ in
           sources."ms-2.1.1"
         ];
       })
-      sources."snyk-python-plugin-1.8.1"
+      sources."snyk-python-plugin-1.8.2"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
           sources."debug-3.2.5"
           sources."ms-2.1.1"
         ];
       })
-      (sources."snyk-resolve-deps-3.1.0" // {
+      (sources."snyk-resolve-deps-4.0.1" // {
         dependencies = [
           sources."debug-3.2.5"
           sources."ms-2.1.1"
+          sources."semver-5.5.1"
         ];
       })
       sources."snyk-sbt-plugin-2.0.0"
@@ -59291,8 +59893,8 @@ in
       })
       sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."split-0.3.3"
@@ -59700,7 +60302,7 @@ in
       })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
-      sources."fast-glob-2.2.2"
+      sources."fast-glob-2.2.3"
       sources."fast-json-stable-stringify-2.0.0"
       sources."figures-2.0.0"
       (sources."fill-range-4.0.0" // {
@@ -60068,8 +60670,8 @@ in
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
-      sources."spdx-correct-3.0.1"
-      sources."spdx-exceptions-2.1.0"
+      sources."spdx-correct-3.0.2"
+      sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."split-string-3.1.0"

From 583e9835a872c1a632369cce352bc7d58f228b3e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <offlinehacker@users.noreply.github.com>
Date: Tue, 9 Oct 2018 00:17:19 +0200
Subject: [PATCH 2641/3253] maintainers: change my email

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8d159033192e..fd79376b14d3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3057,7 +3057,7 @@
     name = "Oliver Dunkl";
   };
   offline = {
-    email = "jakahudoklin@gmail.com";
+    email = "jaka@x-truder.net";
     github = "offlinehacker";
     name = "Jaka Hudoklin";
   };

From c7fa58f6b391625171c1aec7d636d89d7e280360 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 8 Oct 2018 20:02:24 -0300
Subject: [PATCH 2642/3253] steam: add libxcb to steamrt overrides

This fixes 'glXChooseVisual failed' when starting steam on mesa after
the libxcb 1.12 -> 1.13 upgrade.
---
 pkgs/games/steam/runtime-wrapped.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index a0ed5aaf210c..1cde38058e7c 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -14,6 +14,7 @@ let
     gcc.cc
     nss
     nspr
+    xorg.libxcb
   ]);
 
   allPkgs = overridePkgs ++ [ steam-runtime ];

From 844bcbd13728fc55f5459341287e5e8943a5418f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 8 Oct 2018 20:13:31 -0400
Subject: [PATCH 2643/3253] sbt: 1.2.3 -> 1.2.4

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index bbbbbf462ec8..60f342db12aa 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm";
+    sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn";
   };
 
   patchPhase = ''

From d35e8d323942e979327c20d4c4667889d084505c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 8 Oct 2018 19:42:51 -0500
Subject: [PATCH 2644/3253] papirus-icon-theme: 20180816 -> 20181007

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 1efd4145ce03..83cae45426f7 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "papirus-icon-theme-${version}";
-  version = "20180816";
+  version = "20181007";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = "papirus-icon-theme";
     rev = version;
-    sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk";
+    sha256 = "1hv526k0ykq2yj9f6bcl711sgdxwx5y0yqjf5acpvcmx9pm58vz5";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 2de131bfc3ca974acc7b6c03e0889527e302f60d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 4 Oct 2018 10:20:31 -0500
Subject: [PATCH 2645/3253] dex: grab simple upstream patch so it reports the
 right version

---
 pkgs/tools/X11/dex/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
index fd0c0503de9f..9387c62c2a51 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/pkgs/tools/X11/dex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3 }:
+{ stdenv, fetchFromGitHub, python3, fetchpatch }:
 
 stdenv.mkDerivation rec {
   program = "dex";
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ python3.pkgs.sphinx ];
   makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch;
+      sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A program to generate and execute DesktopEntry files of the Application type";
     homepage = https://github.com/jceb/dex;

From f1987fb58f57828944ca822bbb39b3de87f01863 Mon Sep 17 00:00:00 2001
From: Erlend Pedersen <erlendpe@online.no>
Date: Tue, 9 Oct 2018 01:21:28 +0200
Subject: [PATCH 2646/3253] kbd: Rename some keymaps.

From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g.  "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.

Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.

fixes #47878
---
 pkgs/os-specific/linux/kbd/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index bfade509fcac..a37e65f8cb50 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -25,6 +25,19 @@ stdenv.mkDerivation rec {
       # Add Neo keymap subdirectory
       sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
 
+      # Renaming keymaps with name clashes, because loadkeys just picks
+      # the first keymap it sees. The clashing names lead to e.g.
+      # "loadkeys no" defaulting to a norwegian dvorak map instead of
+      # the much more common qwerty one.
+      pushd data/keymaps/i386
+      mv qwertz/cz{,-qwertz}.map
+      mv olpc/es{,-olpc}.map
+      mv olpc/pt{,-olpc}.map
+      mv dvorak/{no.map,dvorak-no.map}
+      mv fgGIod/trf{,-fgGIod}.map
+      mv colemak/{en-latin9,colemak}.map
+      popd
+
       # Fix the path to gzip/bzip2.
       substituteInPlace src/libkeymap/findfile.c \
         --replace gzip ${gzip}/bin/gzip \

From c76ffb92539d830eacf3e5bf5164ac7621c77010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 8 Oct 2018 21:10:05 +0200
Subject: [PATCH 2647/3253] matita: remove broken package

As requested by Vincent Laporte.
---
 .../science/logic/matita/130312.nix           | 65 -------------------
 .../science/logic/matita/Makefile.patch       | 11 ----
 .../science/logic/matita/configure.patch      | 36 ----------
 .../logic/matita/configure_130312.patch       | 35 ----------
 .../science/logic/matita/default.nix          | 52 ---------------
 pkgs/top-level/all-packages.nix               | 14 ----
 pkgs/top-level/ocaml-packages.nix             |  6 --
 7 files changed, 219 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/matita/130312.nix
 delete mode 100644 pkgs/applications/science/logic/matita/Makefile.patch
 delete mode 100644 pkgs/applications/science/logic/matita/configure.patch
 delete mode 100644 pkgs/applications/science/logic/matita/configure_130312.patch
 delete mode 100644 pkgs/applications/science/logic/matita/default.nix

diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix
deleted file mode 100644
index 573b0ad7e4b5..000000000000
--- a/pkgs/applications/science/logic/matita/130312.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }:
-
-let
-  version = "0.99.1pre130312";
-  pname = "matita";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://matita.cs.unibo.it/sources/${pname}_130312.tar.gz";
-    sha256 = "13mjvvldv53dcdid6wmc6g8yn98xca26xq2rgq2jg700lqsni59s";
-  };
-
-  sourceRoot="${pname}-${version}";
-
-  unpackPhase = ''
-   mkdir $sourceRoot
-   tar -xvzf $src -C $sourceRoot
-   echo "source root is $sourceRoot"
-  '';
-
-  prePatch = ''
-   autoreconf -fvi
-  '';
-
-  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre automake autoconf];
-
-  postPatch = ''
-    BASH=$(type -tp bash)
-    substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
-    substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
-    substituteInPlace configure --replace "ulex08" "ulex"
-    substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex"
-    substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex"
-    substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex"
-    substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex"
-    substituteInPlace configure --replace "zip" "camlzip"
-    substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip"
-    substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip"
-  '';
-
-  patches = [ ./configure_130312.patch ];
-
-  preConfigure = ''
-    # Setup for findlib.
-    OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH
-    RTDIR=$out/share/matita
-    export configureFlags="--with-runtime-dir=$RTDIR"
-  '';
-
-  postInstall = ''
-    mkdir -p $out/bin
-    ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
-  '';
-
-  meta = {
-    homepage = http://matita.cs.unibo.it/;
-    description = "Matita is an experimental, interactive theorem prover";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/science/logic/matita/Makefile.patch b/pkgs/applications/science/logic/matita/Makefile.patch
deleted file mode 100644
index 64c9a13f2d07..000000000000
--- a/pkgs/applications/science/logic/matita/Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- matita-0.5.8/Makefile	2009-12-01 18:21:00.000000000 -0500
-+++ matita-0.5.8/Makefile	2010-09-16 10:33:59.665461260 -0400
-@@ -38,7 +38,7 @@
- uninstall: $(foreach d,$(SUBDIRS),rec@uninstall@$(d))
- 
- rec@%:
--	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*)) DESTDIR=$(shell pwd)/$(DESTDIR)
-+	$(MAKE) -C $(word 2, $(subst @, ,$*)) $(word 1, $(subst @, ,$*))
- 
- # {{{ Distribution stuff
- 
diff --git a/pkgs/applications/science/logic/matita/configure.patch b/pkgs/applications/science/logic/matita/configure.patch
deleted file mode 100644
index 9a3bbbb13f52..000000000000
--- a/pkgs/applications/science/logic/matita/configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- zzz/matita-0.5.8/configure	2009-12-01 18:21:00.000000000 -0500
-+++ matita-0.5.8/configure	2010-09-07 19:57:29.732139550 -0400
-@@ -1895,6 +1895,7 @@
- # look for METAS dir
- 
- LIBSPATH="`pwd`/components"
-+OLDCAMLPATH="$OCAMLPATH"
- OCAMLPATH="$LIBSPATH/METAS"
- 
- # creating META.*
-@@ -1917,7 +1918,7 @@
- gdome2 \
- http \
- lablgtk2 \
--lablgtksourceview2.gtksourceview2 \
-+lablgtk2.gtksourceview \
- lablgtkmathview \
- mysql \
- netstring \
-@@ -1951,14 +1952,14 @@
- $FINDLIB_CREQUIRES \
- lablgtk2.glade \
- lablgtkmathview \
--lablgtksourceview2.gtksourceview2 \
-+lablgtk2.gtksourceview \
- helm-xmldiff \
- "
- for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
- do
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5
- $as_echo_n "checking for $r ocaml library... " >&6; }
--  if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then
-+  if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-   else
diff --git a/pkgs/applications/science/logic/matita/configure_130312.patch b/pkgs/applications/science/logic/matita/configure_130312.patch
deleted file mode 100644
index 255feec566bf..000000000000
--- a/pkgs/applications/science/logic/matita/configure_130312.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- matita/configure     2011-11-22 06:04:17.000000000 -0500
-+++ matita/configure     2011-11-24 11:43:11.584847938 -0500
-@@ -1905,6 +1905,7 @@
- # look for METAS dir
- 
- LIBSPATH="`pwd`/components"
-+OLDCAMLPATH="$OCAMLPATH"
- OCAMLPATH="$LIBSPATH/METAS"
- 
- # creating META.*
-@@ -1927,7 +1928,7 @@
- gdome2 \
- http \
- lablgtk2 \
--lablgtksourceview2.gtksourceview2 \
-+lablgtk2.gtksourceview \
- mysql \
- netstring \
- ulex08 \
-@@ -1953,13 +1954,13 @@
- FINDLIB_REQUIRES="\
- $FINDLIB_CREQUIRES \
- lablgtk2.glade \
--lablgtksourceview2.gtksourceview2 \
-+lablgtk2.gtksourceview \
- "
- for r in $FINDLIB_LIBSREQUIRES $FINDLIB_REQUIRES
- do
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $r ocaml library" >&5
- $as_echo_n "checking for $r ocaml library... " >&6; }
--  if OCAMLPATH=$OCAMLPATH $OCAMLFIND query $r &> /dev/null; then
-+  if OCAMLPATH=$OCAMLPATH:$OLDCAMLPATH $OCAMLFIND query $r &> /dev/null; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-   else
diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix
deleted file mode 100644
index 5495f61bfd88..000000000000
--- a/pkgs/applications/science/logic/matita/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
-
-let
-  version = "0.5.8";
-  pname = "matita";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://matita.cs.unibo.it/FILES/${pname}-${version}.orig.tar.gz";
-    sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh";
-  };
-
-  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
-
-  postPatch = ''
-    BASH=$(type -tp bash)
-    substituteInPlace components/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
-    substituteInPlace matita/Makefile --replace "SHELL=/bin/bash" "SHELL=$BASH"
-    substituteInPlace configure --replace "ulex08" "ulex"
-    substituteInPlace components/METAS/meta.helm-content_pres.src --replace "ulex08" "ulex"
-    substituteInPlace components/content_pres/Makefile --replace "ulex08" "ulex"
-    substituteInPlace components/METAS/meta.helm-grafite_parser.src --replace "ulex08" "ulex"
-    substituteInPlace components/grafite_parser/Makefile --replace "ulex08" "ulex"
-    substituteInPlace configure --replace "zip" "camlzip"
-    substituteInPlace components/METAS/meta.helm-getter.src --replace "zip" "camlzip"
-    substituteInPlace components/METAS/meta.helm-xml.src --replace "zip" "camlzip"
-  '';
-
-  patches = [ ./configure.patch ./Makefile.patch ];
-
-  preConfigure = ''
-    # Setup for findlib.
-    OCAMLPATH=$(pwd)/components/METAS:$OCAMLPATH
-    RTDIR=$out/share/matita
-    export configureFlags="--with-runtime-dir=$RTDIR"
-  '';
-
-  postInstall = ''
-    mkdir -p $out/bin
-    ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
-  '';
-
-  meta = {
-    homepage = http://matita.cs.unibo.it/;
-    description = "Experimental, interactive theorem prover";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 632b88c8012c..2da5edcd6646 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21231,20 +21231,6 @@ with pkgs;
 
   ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
 
-  #inherit (ocaml-ng.ocamlPackages_3_11_2) matita;
-
-  # Current version is 0.5.8. Official website says:
-
-  # Version 0.5.9, released on December 23, 2014, is an update of version 0.5.8
-  # to compile with the latter OCaml version and libraries.
-  # It is unsupported, but still used for teaching at the University of Bologna.
-
-  # It should allow us removing the dependency on OCaml 3.11 but I haven't been
-  # able to confirm because Matita depends on lablgtkmathview-0.7.2 which
-  # already reports as broken.
-
-  matita_130312 = lowPrio ocamlPackages.matita_130312;
-
   metis-prover = callPackage ../applications/science/logic/metis-prover { };
 
   mcrl2 = callPackage ../applications/science/logic/mcrl2 { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4de581e2932d..5f6d6fc9bc1d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1051,12 +1051,6 @@ let
       camlp5 = camlp5_strict;
     };
 
-    matita = callPackage ../applications/science/logic/matita {
-      ulex08 = ulex08.override { camlp5 = camlp5_old_transitional; };
-    };
-
-    matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { };
-
   };
     in (ocamlPackages.janeStreet // ocamlPackages);
     in lib.fix' (lib.extends overrides packageSet);

From 01108c0d4b0110eee99aee97a809b7d05292c1fa Mon Sep 17 00:00:00 2001
From: edude03 <edude03@gmail.com>
Date: Tue, 9 Oct 2018 13:49:58 +0800
Subject: [PATCH 2648/3253] Add @edude03 to the maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fd79376b14d3..a77df8e8cc27 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1195,6 +1195,11 @@
     github = "eduarrrd";
     name = "Eduard Bachmakov";
   };
+  edude03 = {
+    email = "michael@melenion.com";
+    github = "edude03";
+    name = "Michael Francis";
+  };
   edwtjo = {
     email = "ed@cflags.cc";
     github = "edwtjo";

From c292638b401d1b9916e27ea5fd7989ff88cceeab Mon Sep 17 00:00:00 2001
From: edude03 <edude03@gmail.com>
Date: Tue, 9 Oct 2018 13:28:50 +0800
Subject: [PATCH 2649/3253] helm: build from sources

---
 .../networking/cluster/helm/default.nix       |  68 +-
 .../networking/cluster/helm/deps.nix          | 840 ++++++++++++++++++
 2 files changed, 873 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/helm/deps.nix

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 72ab44e1934a..be88dc5ae0eb 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,50 +1,48 @@
-{ stdenv, fetchurl, kubectl }:
-let
-  isLinux = stdenv.isLinux;
-  arch = if isLinux
-         then "linux-amd64"
-         else "darwin-amd64";
-  checksum = if isLinux
-             then "18bk4zqdxdrdcl34qay5mpzzywy9srmpz3mm91l0za6nhqapb902"
-             else "03xb73769awc6dpvz86nqm9fbgp3yrw30kf5lphf76klk2ii66sm";
-  pname = "helm";
-  version = "2.11.0";
-in
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-  src = fetchurl {
-    url = "https://kubernetes-helm.storage.googleapis.com/helm-v${version}-${arch}.tar.gz";
-    sha256 = checksum;
+buildGoPackage rec {
+  version = "2.11.0";
+  name = "helm-${version}";
+
+  src = fetchFromGitHub {
+    owner = "helm";
+    repo = "helm";
+    rev = "v${version}";
+    sha256 = "1z810a6mxyrrw4i908dip8aqsj95c0kmv6xpb1wwhskg1zmf85wk";
   };
 
-  preferLocalBuild = true;
+  goPackagePath = "k8s.io/helm";
+  subPackages = [ "cmd/helm" "cmd/tiller" "cmd/rudder" ];
 
-  buildInputs = [ ];
+  goDeps = ./deps.nix;
 
-  propagatedBuildInputs = [ kubectl ];
-
-  phases = [ "buildPhase" "installPhase" ];
-
-  buildPhase = ''
-    mkdir -p $out/bin
+  # Thsese are the original flags from the helm makefile
+  buildFlagsArray = ''
+    -ldflags=
+    -w
+    -s
   '';
 
-  installPhase = ''
-    tar -xvzf $src
-    cp ${arch}/helm $out/bin/${pname}
-    chmod +x $out/bin/${pname}
-    mkdir -p $out/share/bash-completion/completions
-    mkdir -p $out/share/zsh/site-functions
-    $out/bin/helm completion bash > $out/share/bash-completion/completions/helm
-    $out/bin/helm completion zsh > $out/share/zsh/site-functions/_helm
+  preBuild = ''
+    # This is a hack(?) to flatten the dependency tree the same way glide or dep would
+    # Otherwise you'll get errors like
+    # have DeepCopyObject() "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime".Object
+    # want DeepCopyObject() "k8s.io/apimachinery/pkg/runtime".Object
+    rm -rf $NIX_BUILD_TOP/go/src/k8s.io/kubernetes/vendor
+    rm -rf $NIX_BUILD_TOP/go/src/k8s.io/apiextensions-apiserver/vendor
+  '';
+
+  postInstall = ''
+    mkdir -p $bin/share/bash-completion/completions
+    mkdir -p $bin/share/zsh/site-functions
+    $bin/bin/helm completion bash > $bin/share/bash-completion/completions/helm
+    $bin/bin/helm completion zsh > $bin/share/zsh/site-functions/_helm
   '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/kubernetes/helm;
     description = "A package manager for kubernetes";
     license = licenses.asl20;
-    maintainers = [ maintainers.rlupton20 ];
-    platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+    maintainers = [ maintainers.rlupton20 maintainers.edude03 ];
   };
 }
diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix
new file mode 100644
index 000000000000..36bd3406f5bf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helm/deps.nix
@@ -0,0 +1,840 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "3b1ae45394a234c385be014e9a488f2bb6eef821";
+      sha256 = "0alb495ql6s02kb6lxcbnlkdcmhixyl8zv11sgrkhsk1bckzh119";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-ansiterm";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-ansiterm";
+      rev =  "19f72df4d05d31cbe1c56bfc8045c96babff6c7e";
+      sha256 = "0663w5m5qlidpj17s5pqp6rhl0phw7vypf104n04dvdy5nd418ix";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/go-autorest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/go-autorest";
+      rev =  "1ff28809256a84bb6966640ff3d0371af82ccba4";
+      sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev =  "b26d9c308763d68093482582cea63d69be07a0f0";
+      sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+    };
+  }
+  {
+    goPackagePath  = "github.com/MakeNowJust/heredoc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/MakeNowJust/heredoc";
+      rev =  "bb23615498cded5e105af4ce27de75b089cbe851";
+      sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Masterminds/semver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/semver";
+      rev =  "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd";
+      sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Masterminds/sprig";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/sprig";
+      rev =  "15f9564e7e9cf0da02a48e0d25f12a7b83559aa6";
+      sha256 = "1k5pfx9hxzb70kh73a009ikr3vqlq0jvzvbyvxz9x7a7yc4r5b14";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Masterminds/vcs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/vcs";
+      rev =  "3084677c2c188840777bff30054f2b553729d329";
+      sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/purell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/purell";
+      rev =  "8a290539e2e8629dbc4e6bad948158f790ec31f4";
+      sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/PuerkitoBio/urlesc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/PuerkitoBio/urlesc";
+      rev =  "5bd2802263f21d8788851d5305584c82a5c75d7e";
+      sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aokoli/goutils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aokoli/goutils";
+      rev =  "9c37978a95bd5c709a15883b6242714ea6709e64";
+      sha256 = "1c51qgk4pjc8c776h7589c3d14791h86f1yj3ykg4q7vlcf9xrnr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/asaskevich/govalidator";
+    fetch = {
+      type = "git";
+      url = "https://github.com/asaskevich/govalidator";
+      rev =  "7664702784775e51966f0885f5cd27435916517b";
+      sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968";
+    };
+  }
+  {
+    goPackagePath  = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev =  "3ac7bf7a47d159a033b107610db8a1b6575507a4";
+      sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/chai2010/gettext-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/chai2010/gettext-go";
+      rev =  "bf70f2a70fb1b1f36d90d671a72795984eab0fcb";
+      sha256 = "0bwjwvjl7zqm7kxram1rzz0ri3h897kiin13ljy9hx3fzz1i9lml";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev =  "71acacd42f85e5e82f70a55327789582a5200a90";
+      sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cyphar/filepath-securejoin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cyphar/filepath-securejoin";
+      rev =  "a261ee33d7a517f054effbf451841abaafe3e0fd";
+      sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "782f4967f2dc4564575ca782fe2d04090b5faca8";
+      sha256 = "1ypijjawqc0xgmgim42260ibcyclfgfizicz5cbvndw4plqfsswk";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dgrijalva/jwt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgrijalva/jwt-go";
+      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
+      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/distribution";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/distribution";
+      rev =  "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c";
+      sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev =  "4f3616fb1c112e206b88cb7a9922bf49067a7756";
+      sha256 = "0zmsqm1lkwggfqgy2rw34g4g2jlvr6mvcsh65fmpdb30l65iaqzf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-connections";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-connections";
+      rev =  "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
+      sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev =  "9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1";
+      sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii";
+    };
+  }
+  {
+    goPackagePath  = "github.com/docker/spdystream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/spdystream";
+      rev =  "449fdfce4d962303d702fec724ef0ad181c92528";
+      sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/evanphx/json-patch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/evanphx/json-patch";
+      rev =  "94e38aa1586e8a6c8a75770bddf5ff84c48a106b";
+      sha256 = "1c9gzc3gb76lm5famc0345y90is1lyffn39bmdr0xk19462f8av5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/exponent-io/jsonpath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/exponent-io/jsonpath";
+      rev =  "d6023ce2651d8eafb5c75bb0c7167536102ec9f5";
+      sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/camelcase";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/camelcase";
+      rev =  "f6a740d52f961c60348ebb109adde9f4635d7540";
+      sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ghodss/yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ghodss/yaml";
+      rev =  "73d445a93680fa1a78ae23a5839bad48f32ba1ee";
+      sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonpointer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonpointer";
+      rev =  "46af16f9f7b149af66e5d1bd010e3574dc06de98";
+      sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/jsonreference";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/jsonreference";
+      rev =  "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272";
+      sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/spec";
+      rev =  "1de3e0542de65ad8d75452a595886fdd0befb363";
+      sha256 = "13i9y71fk9vr2abvpsk04k55il32ly3fjinvl1zlamh9mi2mdzf4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-openapi/swag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-openapi/swag";
+      rev =  "f3f9494671f93fcff853e3c6e9e948b3eb71e590";
+      sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gobwas/glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/glob";
+      rev =  "5ccd90ef52e1e632236f7326478d4faa74f99438";
+      sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev =  "c0656edd0d9eab7c66d1eb0c568f9039345796f7";
+      sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev =  "44145f04b68cf362d9c4df2182967c2275eaefed";
+      sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/groupcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/groupcache";
+      rev =  "02826c3e79038b59d737d3b1c0a1d937f71a4433";
+      sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9";
+      sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev =  "7d79101e329e5a3adf994758c578dab82b90c017";
+      sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/gofuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/gofuzz";
+      rev =  "44d81051d367757e1c7c6a5a86423ece9afcf63c";
+      sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev =  "064e2069ce9c359c118179501254f67d7d37ba24";
+      sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gnostic";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gnostic";
+      rev =  "0c5108395e2debce0d731cf0287ddf7242066aba";
+      sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gophercloud/gophercloud";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gophercloud/gophercloud";
+      rev =  "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d";
+      sha256 = "0xvapk94p1259k8arvwyvhwvcnzma9vdg12g750cgz2ghkzvfhff";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gosuri/uitable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gosuri/uitable";
+      rev =  "36ee7e946282a3fb1cfecd476ddc9b35d8847e42";
+      sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev =  "787624de3eb7bd915c329cba748687a3b22666a6";
+      sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/grpc-ecosystem/go-grpc-prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
+      rev =  "0c1b191dbfe51efdabe3c14b9f6f3b96429e0722";
+      sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4";
+      sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/huandu/xstrings";
+    fetch = {
+      type = "git";
+      url = "https://github.com/huandu/xstrings";
+      rev =  "3959339b333561bf62a38b424fd41517c2c90f40";
+      sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/imdario/mergo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/imdario/mergo";
+      rev =  "6633656539c1639d9d78127b7d47c622b5d7b6dc";
+      sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev =  "f2b4162afba35581b6d4a50d3b8f34e33c144682";
+      sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev =  "2f5df55504ebc322e4d52d34df6a1f5b503bf26d";
+      sha256 = "0d9m8kyhbawa452vnwn255xxnh6pkp3im0d2310rw1k14nh3yh1p";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "d6bea18f789704b5f83375793155289da36a3c7f";
+      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev =  "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
+      sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/go-wordwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-wordwrap";
+      rev =  "ad45545899c7b13c020ea92b2072220eefad42b8";
+      sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
+      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/go-digest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/go-digest";
+      rev =  "a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb";
+      sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/image-spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/image-spec";
+      rev =  "372ad780f63454fbbbbcc7cf80e5b90245c13e13";
+      sha256 = "0wajddbm49bfybkab9midilg18zvdvvsffwhkq7bpp7inj4jnsvs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev =  "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev =  "5f041e8faa004a95c88a202771f4cc3e991971e6";
+      sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+      sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev =  "c5b7fccd204277076155f10851dad72b76a49317";
+      sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev =  "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
+      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev =  "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207";
+      sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev =  "65c1f6f8f0fc1e2185eb9863a3bc751496404259";
+      sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev =  "300106c228d52c8941d4b3de6054a6062a86dda3";
+      sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev =  "10ef21a441db47d8b13ebcc5fd2310f636973c77";
+      sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
+    };
+  }
+  {
+    goPackagePath  = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev =  "89742aefa4b206dcf400792f3bd35b542998eb3b";
+      sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "c439c4fa093711d42e1b01acb1235b52004753c1";
+      sha256 = "14v5vhb180yzaknxnm8j4n9jai58b0y2nzrqzpdq7bj9slsga1vd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "e3a8ff8ce36581f87a15341206f205b1da467059";
+      sha256 = "179k26lcgafkbjylbhgj2f5pnh52bmv19rr1w95gca944blw8yga";
+    };
+  }
+  {
+    goPackagePath  = "github.com/technosophos/moniker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/technosophos/moniker";
+      rev =  "a5dbd03a2245d554160e3ae6bfdcf969fe58b431";
+      sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "49796115aa4b964c318aad4f3084fdb41e9aa067";
+      sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "1c05540f6879653db88113bc4a2b70aec4bd491f";
+      sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "a6bd8cefa1811bd24b86f8902872e4e8225f74c4";
+      sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "43eea11bc92608addb41b8a406b0407495c106f6";
+      sha256 = "0k9wy278f5753d130p8asva2g573vi6wviwkxwwnpxni118knq1l";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "b19bf474d317b857955b12035d2c5acb57ce8b01";
+      sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "f51c12702a4d776e4c1fa9b0fabab841babae631";
+      sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "12d5545dc1cfa6047a286d5e853841b6471f4c19";
+      sha256 = "1bv6cjakhi6j3s1bqb3n45qrmvf20qkhwxllvi94jag4i7hd91w8";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev =  "09f6ed296fc66555a25fe4ce95173148778dfa85";
+      sha256 = "06x5wr7vjsnvv35rpv7jaklilksqbzsbqk8bxababw8vr6avfwki";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev =  "5ffe3083946d5603a0578721101dc8165b1d5b5f";
+      sha256 = "1ij3sy49xfihwpcpiwd68mlfkrk375kdh6r6jlqka18zalxgpaan";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/inf.v0";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-inf/inf";
+      rev =  "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
+      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/square/go-jose.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/square/go-jose";
+      rev =  "f8f38de21b4dcd69d0413faf231983f5fd6634b1";
+      sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "670d4cfef0544295bc27a114dbac37980d83185a";
+      sha256 = "182x97q4826cpzybkrl8icyx1n6l1z0kspmbz33fh901v10b6322";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/api";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/api";
+      rev =  "2d6f90ab1293a1fb871cf149423ebb72aa7423aa";
+      sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apiextensions-apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apiextensions-apiserver";
+      rev =  "898b0eda132e1aeac43a459785144ee4bf9b0a2e";
+      sha256 = "1zn4i4wfmk3y36n6mqcidgsp4aqzwy5w9749zjl2bfbwzpk81bcp";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apimachinery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apimachinery";
+      rev =  "103fd098999dc9c0c88536f5c9ad2e5da39373ae";
+      sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apiserver";
+      rev =  "8b122ec9e3bbab91a262d17a39325e69349dc44d";
+      sha256 = "0qfxjypa10s16sll2a75kn2ddjddr2xsa5rsiaxar3gs5pqvq1h5";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/client-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/client-go";
+      rev =  "59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82";
+      sha256 = "0f069d1msdb2x4yvwv0wa3hzanl97csg4hsp1pycxpnqck6qx6qh";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/kube-openapi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kube-openapi";
+      rev =  "91cfa479c814065e420cee7ed227db0f63a5854e";
+      sha256 = "0l9yvc7gfa8i4snpv1d13vy03dplzp2jh47rqr3fhiihcz2wx4s7";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/kubernetes";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kubernetes";
+      rev =  "2e809eed16445fff9dcbfc56e9936cf76ccbdadc";
+      sha256 = "13fzcbjfc5c35gy66nbn1ms63b8bj3g8z7wja0p8dd3yj9lcj68h";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/utils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/utils";
+      rev =  "258e2a2fa64568210fbd6267cf1d8fd87c3cb86e";
+      sha256 = "1mbw3q03sflrdgj6l7q3frqzb5f78n0m0gzjm228sy1wnm4c3760";
+    };
+  }
+  {
+    goPackagePath  = "vbom.ml/util";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fvbommel/util";
+      rev =  "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394";
+      sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682";
+    };
+  }
+]

From a0e41023ec1f4e5f7801a534d1788b0d447063c1 Mon Sep 17 00:00:00 2001
From: edude03 <edude03@gmail.com>
Date: Tue, 9 Oct 2018 16:41:13 +0800
Subject: [PATCH 2650/3253] helmfile: update from 0.19.0 to 0.40.1

---
 .../applications/networking/cluster/helmfile/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 358f4cdb7df7..73ec998ed8e8 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoPackage, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.19.0"; in
+let version = "0.40.1"; in
 
 buildGoPackage {
   name = "helmfile-${version}";
@@ -9,13 +9,18 @@ buildGoPackage {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0wjzzaygdnnvyi5a78bhmz2sxc4gykdl00h78dkgvj7aaw05s9yd";
+    sha256 = "02ir10070rpayv9s53anldwjy5ggl268shgf085d188wl6vshaiv";
   };
 
   goPackagePath = "github.com/roboll/helmfile";
 
   nativeBuildInputs = [ makeWrapper ];
 
+  buildFlagsArray = ''
+    -ldflags=
+    -X main.Version=${version}
+  '';
+
   postInstall = ''
     wrapProgram $bin/bin/helmfile \
       --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}

From c19fc349268ab2229b20cf2687fb0bac0b1617d0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 9 Oct 2018 17:36:02 +0800
Subject: [PATCH 2651/3253] firefox-devedition-bin: 63.0b9 -> 63.0b13

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index d175c02ff800..582da6bd8c94 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b9";
+  version = "63.0b13";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "8b5a6d1e9abea221f134804ddc9bea5e8500e51338487cd004bd1d39b67102491e5d5b18c9737847461dfb8f711e5fc7345c013c057eee478ec1d7f1be71fd4d";
+      sha512 = "34615c8bf9be4bc1f544c32df32d986b44d66f91e5f9a834fa7d7321b951700889e7ba1cf41348df457ffc71dd40e8f52177266299ca3044fc2af4514956a8b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "64d5927caf64b39bfc9bef4b5d9cccff4a19abbee6447580eff5d66c0af331bd6076f9cd4d6c8cb8aa6e25dea7623e2ed0ef18501b044240dab5c1c9ffc71b6e";
+      sha512 = "501cd71d70809bd81f233b5205f06f289046eeab8258b1fc87e652ec2235ec73dd7f783f5d4eb8206f8981ba06f4ef312ea4a28e3a23dbb34a099cbe74bfbc7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "fe4042a34cc3704dabf4de8cc373949cbda705a9aeee28a908fb406972d3746cdf8b10f92b8a8f61bf491f7d662afc64aab207a826d672dc06d57f04592a8e08";
+      sha512 = "e3cb48e42d423843e9e563f94bf28086c6b68306191b1893aa5ddf9e482ab947bc3bb123e36d64b3f10eb9a6750c845799ecaea721858c3de93cb120561f34e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "585224e0ca25a21ea0a6f20936594da9c914d1d5c6993cfdcaec3a43792fb32f16c6dc6ffc86b02c02101ca39da3d81be0e6abd1c9188d76cfa0f05419573de3";
+      sha512 = "ccea5e826c4701f33b72165a6aa5087e9cd030c763fb291d94deac2a4650d1666b187909a6122f80df2d5182053cc31c63354fbba468709d8bbf9d3581604469";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "cc794031e63fc76438b6e995fe1b093ce0e010683bba68ac0f73c0eaea7d61e67cfc400621b57389e10330d750e244e6ab4b9b88006821b2fd513d1baaf72304";
+      sha512 = "5562bdcfe2922203a51e28ed2b03d98b24e401d447acd91b32de25db4553f779bf98530912e1063757d2340e73b7c93092d7b56a208f4b0e899b78c1f1a02f07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "189a5f4fa12838d33adf29fbfe7d96e87de7a54fe3ea7078b2af124158d99457d2c83c1b490adb9608a0e3d42f2f721a1597c80dedf3d342c4f3ce176c93865e";
+      sha512 = "4dae80bb715f931f2b7b85a4031335edecab8eeda9bbf8d5afa850d4c4db6cff1c41827a35d95d0bd3bd06351d835edf12f23f37a2fcd8735778cd898b969746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "a7dfa9984917ea02eb61cd800033e8c090d630bf49eae1c1ce9419e2c424717f4203bf9bdae59f88144fb098d20673178528a5fa7f9d343ab4b95f9fc6490d19";
+      sha512 = "dbea03117bbd76daf7dbe2b0fd5364255c998b9de8f1d5b1731613f676d442abb0a4e2de43eddcc0162f96898aa1bc7b08b72264d87d7625a56d177eb49d6d08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "79af6add5a203cc4815fd615ede035ba5b15c1cef22d69b5dc81d7874c6ebee5560e6b442a3e626aa72dcee5ce2b5bee90e31a3b2c0223b1d4cf43848d35d822";
+      sha512 = "b194bed02d6fdaa0389856e9b838cfb48d2d3a39cec8a6e4a6b80fc5fff9fd6ffaad431c34d546475e8cc126fc3a686619f72a557ad9f2395f5e2db4932443ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "7f2b152d342a3d864f18088a6ff6e09f54887c50251c47acea2a98e019cf7cc6308085ce3a2f9fe3f6533ed1593ec8a13d8d07e0e94ef870c60ea726bd0a411c";
+      sha512 = "5b6c8ed858b5e412bdf75643f988226a762e8c649f33064e488e1790b1266c8fad5a75eb79110aa1d03f9699a05b0d87494d7a1171894696399c1b74f8ac929d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a5b2f54c57122f81ab5477f6e74140fbf4eecd58837cb14550a6dd48c586f37ae584bdc3ebd3c508986bf966f5a0c1b3e5510040f24a9a6caa43f28b1357f649";
+      sha512 = "a44fbd3c3d0607c5c5193125002bcbe890e7fddb6306e45ea7dafe491b43085d55bcc912e8e94ef9c6bb7c3672e6456806f17a5291b0588742319a69ef93474c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "361fd5ff3e5c8572537cf5bfb875e80c12f2ce6de46ff5fd20863d00f550341f58532e1f7e918958ea6754cc1bf8f174e61d1a0bb819603cebefa44185e010cd";
+      sha512 = "dda156f8acf3e0790c4ef2195eeac9ccc5895e1d92999f4b8254531c55e1074c313d8acd98182781b35c5d96592227ff29435d1f4c55ba8c39de60de4ea0ae92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "a70cd83ac27d2bb1cb01f5fe2a897f7f626954725d04974adad6fed90ca9aab70484a0920af465293c859b48fa6ed1fcc8723c166fee9e2faede4b8b6b5ce006";
+      sha512 = "8812bd2e2871ead8b507ea1b9625c997cfd21547a0acd1bd2a181c5a88180708b5a9b29d8c162c977fe6dcaec48e0704ea17e49623f0b15b194ff553d5cdad99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "c394fd9da07c12e060bcc91ac79f2cb5fd43fab74ffed738f9c5afc3d2c22069d54c38331ea97c944c0d20d884295560016cd094b413e8f3156c6cc548b18d19";
+      sha512 = "e016283425dca5e6622bdd3826ad6f720f7ffbfeab4eb3e3f862da2ba2129f3ceb17a2d0b39af514d197519a2e09294f0a4284b8f4d0362598b776e3791a54fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "5c93688a59b84c324d2ce846d9d235bbf4ae56a2dcdcf6437207bded60311e7b7d0ba6a207cd6089a7f6afb6bf1dadc58ac72454e6831b50bcc0a1fc0f9713b6";
+      sha512 = "cab866b668a3e010e22fd92e29bec5b65404f1690f593e49b9aa03cc2ad22d3707f04451e8f6d86e796f46270c671c370e103296952bb63a59708b627ea6788e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "67ce43c2a19448d08eccad1c0788c73a7de6cbd81fe41a171177d8110886e4cc3e43418b1f4a07cc4c9073fc04c24c9215fa6216ebe91d620e313d23aa9f67b3";
+      sha512 = "2bc6de3f1e4bb5a99734a04aedc9e4e73b71a588bb92dfbe520ab5df3e4128b683b83d67648f7b39261aa25d20f1b12af875ae92ff4fd628faaa202a268eacb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "50c02eb32459c8cd394a12c23f81295c75d5ffa2e62ce501bcb75b06b60b3d23c16a392d3c965222ff9eb7e50d41ce03cc32cf3d54c42086b092e25cc4a11648";
+      sha512 = "de405fffb62de62c06cb6ae9360adcbf97496addff647a1a738f35a6d04b58eeecf0f2869f1daf5147da1cbc91661a04e6607d7ef2759ed4933dc061ad769cdc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c2e65a560da8011a50f7694adef788dddeaa68a5d7262c1da0456b22e2fa7229991c1f06ae737f7b9d85e0dfb954c7330796398bf0103f162beedec9b2383f04";
+      sha512 = "107bef8675386b084a74a318aa1526aab541a281cfe38a782a42800cb8d20f009d90d11c08386274d20e0f91f2aa32b09814d64ac759b56c247cc23c4921547c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "262a796bdb63a4fdad4bbc79395781d660dec3f24606f8ea715a1d97d8e62d01536538529c79e6a70316319e967c4537b81a1b4b597e5981ecdf7895cfe06b1a";
+      sha512 = "88ff633e4e332e32d1f494f7032d1218ec122046c0d134365e1b7195232c77a06c9c2267f27f5ff2ba115832557159f9bbab4c6d9405c2a051a3b3f31662ae2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d26a474d464338b472899726fe41ba53c1e00dd3879ea8afca9814b4ee8268a518be3820c54ad8c358c8e2ff62b164f7665087bc9776237858f1edd5c22a4d16";
+      sha512 = "427f9b2bb38d94ec872b3fee46a234e3d778f468330be582edaf3205fa9721a7608d5611df9c3c0586f325f116c044a1c64f1920e3939ebf40990878b00d24d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "3d228820f0bc1e61f4de3d99cae0b0b52174e88effbf8ea36250c30e9baec63cc716478ce775f5e4ce3adc35913dbb2942c0a67da2d1082adcaaf514815ab49b";
+      sha512 = "b51741ac82877a212b7ce3f6f58c60b9cd2cc10b4cfd3bee584ad14acd6381f04268c9670e3457048c1bc804fd534e6d271124684e3d5eb19d204b9068b9ca2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "77eac6e37f285250efe9e5ea53b0666eb52886b4a877c4fc40be0aeba6492a5b54e8311ebf305237c57dc5c838ba5181de5cb593c338eff8132e73dcd4459927";
+      sha512 = "a2e9960b35789d53e74ee55081790962ff5aa0c928b68a04c99c06ed32bd35cf776e3f39f1d8933403f97a3d1c5471f3e9915100c1b20ee7e3613801adee1dcd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "7a0bc375c742ac0c45f95f3f25d7fc84b3ee9fe6895fb5b3d4462fbbcf421191f50e096637e73e71d25718cf5772e9c1966ce15639c3b2bc1adc9227506723ec";
+      sha512 = "7aca0601a1e298f745267efada3d9999f57643bde087d182ba053b32f995b19a9ee166297d805b440cd5716b28ebca1b6a1ab234da26fc83ee71148e279338de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "7d37c2a3b66c5bae98ee09b81f262bc8aedbde5d6d700abf6dbae232785774daae661fa7c1933e2c6408d0ea95c09153e0cc45efa02468794f03e81079b504b5";
+      sha512 = "0eafc24598a7f5e7c15e2d49db5326551c215eb0e8a89215df30c3a26b09c44fd2ed632698223ef78e24024196860625aeadfd290c5bb35adea04e84d003614f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "88a144836494b18ee1f46024771e15cbe778b5630ab884aeafbaf7e59d5df6ff915c71f13f449faa3e56aab46a61bf5d56b354d36f5d378ee51bf34f4565c04c";
+      sha512 = "bfdd31f584b739ad09498b0b540150348c68ccd669383e7afefdb303573b553c4fef74e0d3e587486178f7fc00c9096781172cfcb81b0dfa4d135a4c1a597e80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4f7f4d020559323e9ac1db113418c418a35c5fa8739b75cbb510d55122bc96b0c7492a79ea2862149f34019d95839733883d5516bb399a3d3e623b96d606db69";
+      sha512 = "e3989ac6cbdd96e4bcd66c80865249ac501bc833708969d68f2ba07411ef8feebe74cbffe04676dba7979908b794d33af8aff82e79b8e17bbc7a09b344233cb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ded60b65f9ee8d21ac8d88723a6114c9ffae6b5e632c27f6d03c50deb054b178a576dde5379b5406366a938fa8285c7e34a71d48e3357e2439a22cc8476bb6f0";
+      sha512 = "d2ce6fc32f5fabde2d7748b3b2930d3fce260eb08e49e290539e6f8ccf2c7434324ad99395879e3fbc6f34b97abb6e7b450359045f9344a68dc55c4a8d49dd9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "c0963472026a9467c057f772835727d8f8b7aba52c09a73d4017943332455a98642c1732bb0f762ccb771fed9d956525fe761f85861d007950921ba8df73f2ea";
+      sha512 = "a23f44b93e87781fd4b7f2dbb9084f67410d4713c622be52c4d66f3dd4caf41f135592fe852a21b29ba2364fc3bc8c910d2447dfa102340c0a9260ca53da07e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "4a5acfa9427e86835b1a1faac10dbdb19f1e80dc797dad3235513addd58a6a0a348a20310fddf20791a2a2758543c4aed18fa1802423b506f5cffc72d65d534d";
+      sha512 = "628910a5012f060f98308415965050184c17b4d8cf5cec9ee90c97a59da6f4384f8a571fe9b1107d2596c10e8a9c9ea2102e8b393ef04c6f0125269f8e207b57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "484c2e083135215b2266f5731f308c5f3adf57d1b065654eef2f36a83e37367c8190ce906cd0fb96f3e34a0f712953d4c0d3531056cd5f213aa92b20fcc8182a";
+      sha512 = "a9bfba0b13e057fc05b4fbda7a5da6ea3dbdb014ba7d46dbaf76d193d677bbcaea7cb2c65aa6b174c8c0a967e88411e03d11039bc4942f4f8214770b636c2ea2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "300d9d5419fcd2aadf7122180408d85130e1289456a81e623bea3160a1c98205d750c7dec639ca8c731a548042852c9411b9c1e344477dd7297678c34f6f7981";
+      sha512 = "b600afd00e3b8d3ad597aadaaff99c0ebdb121829a637b197acb993368a792c88a6219b37e2d10c9ee57e941794cd279837f63ad7c772acbce9cd8a9067a95f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9b9e58975178d0a8770d29ab9e205cfc6200a70e423afc4ed6b3c5bf93e25ae39a1ffcec62f468a2ca99e6ffe75434963c0ec39f52c385f746bcaa4e7fe5f98c";
+      sha512 = "5938b8535f581ee8801ff78a31425f147a6d21c708c11c0a5c65253ebe811f684380249077e7df4f502dfce35edbccd9f9c5418139f1cc2b327d601c91d222ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "5114575659341ee38dc5ee5685338d8b1f1f09d97b3fe7ef9cf79574ea61078b399756d289e444eb03d00f1df6e053fc9f927d3eb249f24985facf863bc8901c";
+      sha512 = "235c1bb90687d250a7abe644149aa0000ede3b90f070593801beaf77133ab90b52697a3a799b9da9abc5d61a5f489e991c5989281fb13a1558d4bbe1fb2a5547";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "30c901a0a9b4093af3f143641a15ddfdb79bfe41c1c85a2c797426a6c0de4af359aabf7ec1a5a9498dd6228b60dd0dafb18f8237e87623b978e724fb60c1976a";
+      sha512 = "9d29949da55984f261a3b5b74f3cd29222b8c7743da838674ed44f21df3548f940e295cd34f4c9cedb5f26165a1f65e9d9f5263b931ef414c446600f6246cc0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c29ae3741e16f88e23c113167b6e32ced9256b3ff219e9125a251d810d1355049931b94e28e12ff7377837899720443cf1f26eb887d17d12418b755c850d7ffb";
+      sha512 = "994ac583be5d6428b7fe575c9a33d0396f0e2cb6fe3cfd256fd069b5c4590787f7606d7c0ff89004cc3adfbcd40a3466a1af72a93cba1f1d072f2dd0e9c25763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "37231275a2ff967da020f2f2549437be552e9d12f3919bb7999c97641d723daba4744a5ecd6240f246028fa4e9d708169152e96578bd76882656f9d8d3aa133b";
+      sha512 = "710ec15475c002f14dec5b63cff6878be3ce9bd36626641d7a9927bbf7f393338541945b77fa309f10f22a67a89b8960e19b5edf6390ccbcd37bcf17a166eb20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "16c41300ef3c70b872c7fbce71c8dda35e6b7a0783be96fe77fa33514f8678cb9cd08e57075513e39ec0ededf64c4502fa3391c55b55f3187ff451fc970ee8dd";
+      sha512 = "2e7e2d0c3d7db2a2b8967cfff4341d63a17513d4953f8ab1d7822ef71ea3735f0b2c092a56ea7acb1253de1dcbccedf68680d68b25d0e01f923375ee7d92dc6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a3e1453b0f6e4d3a9ea5989489c963bb45c7ae3f476353f77ef572cc98643cb517fcbde08d2b3051fd1bf9265ee34c52aac262d179ec28ee7819b71e3c8b0fa4";
+      sha512 = "feac9d6a241186e8a5d995fc4fc959be09b7d8561b1d36fb885801fd061941d1a882de2d5aa81135f7bb63f9fc332b748486518d690c375162e3e987353c4e71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "313547aa3d90a90acde80c8a9c093b0c0cf5e12141562075c006432a5fb65839a7a1facf4b150ef9c91d6de787e5b1958db9e3239d392da5bbe467acfc5913a4";
+      sha512 = "25a9d4d87eb083d48dee3ddca9ca70b8d1fa30262c002a41eaecf885343164345204d4a3588bff03fe0729b1b3de5352e3223f091fb37f8f490c987ceefd788e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c058b18deeec9949667e15e715fe0f71fe37db598f187fb6c5f9e112e06aa1fdc8cd1a16635d719ec107fd399848f5ff90dd2b39dcba15ca98daf3ebc4cc28ce";
+      sha512 = "83cc9f13165bf0220c943ce0557ca58224ea9dc66cf054c7d68ef0879340989ff1ad90dbefa34cd1c4b82944c17403465b99c9c0fef3b7e4c944e4681560b71f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ba4780796f50b0ebfebb2249d372801837348a59d805ba1f918cdbb941eb0754ebf2f1ee6b04dc95e0fbb765fc70b1c06c65fe5e4f0f03c7c252b0b706d15794";
+      sha512 = "b23daf5212d56b386c2fd080e9a56d1b19235b794a27b529c9bcb23984abe1464955bae5ab40f7d358b3ab7fa8ed2d68cb086c323b0d42ab672a8a646ebae8f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "56a7ef1f12e2dd65d6b474323ecea3e7e1a2828ea31cdfe91ab2e4457db84d55d207217d9aae927c3d0cc28791511c35bc6f9881825fce6bbae16a91f203559c";
+      sha512 = "31e47a2402f48031b502dc40ea12350846c9915bde6ee7f11eccd4de1f427258f2a187c9b1469ed9d47689ec9953826362f4c7e6161651d175723a238db569ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e0e671642e03dd877763bd27e1a9f4e88df922676558bfb079d992d84752ac017edb6d641c7952120338625510923d684e8eb43e45ca80619ee77d08d974f655";
+      sha512 = "8bc66f49f4ab7584128d3574760e16eca026701caab8aa3c28d4a3e9543dde25e6d8f4bb4216549cda80b89e5c39547205e94f11813af1920bb4488b465e8422";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "4915c3f2848bb4967a23f8d6fcf4c21527187785c0e4e419770a4949f37901372635503c97a23a8876c76491977ba83cd4d090da09f6cd994b841073f571a84d";
+      sha512 = "50e316c0acbfca298fc8d02ecc5561797d4557fdd0f2347ee9cb6547d9b4b78076ccc52b114df81479f96c0b122959da088703388f29597c1e802c27b080e09e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "269d92393fa1d11f55664439f320834dc61134a55be5470130726bb4a58e00c17ed187ec9ae1bb27001c9a5ffd9b17ec7fbedbc4383d9e03b6d9aac77babcfc2";
+      sha512 = "193ae2c739c39d3933170a1a53aa9e987fed221be59d862a49f8ed916470a4009c46b222b5e92b02a362b07f3abfe85263cd0a7eebd6c45a8915dab2398bd702";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "f2b5082db9b8dae90a186bc6fc4f998e047e8b2925bafbc3fc4832f267116e482bdf25f022271d5a849989fdc37915d84d25b71af85427d29d5400c4fed0306f";
+      sha512 = "da7ee45b5b8beba3476aea9949bed3bf22a71f03642855c3c67a32028f94c6ef709b8ab3fbc0b8a4dae7bc95fc977615e6aadf00f2f1002061ea69e327ac1e71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "dc43c58836f25f3df85c0afe6ed4040a18364081d933615823704b0ba2dfff87626cdcdea412eba8d1f09a3897306a52a3b76afc8414c16f66ec1ad3e01c268b";
+      sha512 = "e8bc21952b7bf8a41598b7294546136089b21c4515b7a5101b1d2191f6b1d3bae082590b9c921d13c46a459fa2f67cfd3c37ba0b636f027f3e7a67685bfb5c75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5911ee66aa79fe78d01dca3da65dccffef2eeeeee8c52e1853cd29b097d65c0e552e0b90f6f1691d50ed5a9863857c70ead858f5695c0c76f19262d84e9a2668";
+      sha512 = "3e73a62b810dcb521c7f5e477ba4a26c70c003c53f59c4ab9984a983df785a871eaaabef57a9873edc22c64ceb572a658c5d4ed4f53e4f02d2bf5a62d0032c5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b39d418a1fdaaab483d75cfca73a8224a769c266366d48d14e306fc2dda8de1a582cb8a51deb6427dc2c4acf5d411f22247f6bd128b87bc23fa1a43d24eda3a0";
+      sha512 = "a10ccb8f7d38572ab16dd7ce4495633edbe66dfd668b05008cef4dc0a5dd01df7317d2795daec8f41f06ccca344673072ac1dbc7e56d77e5233577d9a73ce300";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "b1d186c332841942c33265e93c185ba51ceafdb5b22314f06d9ccdf21fc47efdd8d26124f53caa70b4c3f35035259150d39ea426eb5ba38bc2cc51f386ca15f8";
+      sha512 = "9240f49fd6d3bc0531acb01f31c4777e911da1ac5bf86ff620d197037d8b814ef9df217e3e4c53152eac32f8504511257818433dc0da86fa2b83963501c37f4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a23bec75f62edd71c9a7c5d329d00763c4f2ef12008e724f7e2b59b0c02a1c913bd0c079c0868190a920619e7b715ce6b91499ccdb02c0f45fd5bbc9d845c10c";
+      sha512 = "43556f5c0fda64eb3164ee62d4deb21e5cb6b32fce5820dace98c745b89a5edcb8881cdbbf7dac26f840145a3450f363ec0fdcde0cefa607f090e35fe4dd5c6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "c16c9148f78f9e99c78a82500acea75cfe9ebba0a7e916f4840c9f734fef18184b03805e55556f20201f75d25ce59e8f78b780ccdf922936a26b46f556af5ec6";
+      sha512 = "a1e3cc5ad9efd33e9053ce1c7495bdb6420dd71aa966cbc4a8ef74fb92993943f5afc6563f8863f6e2efb9f9fc13e56b92771ff209966d7f3b3b28b107686b55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "731112a159a8fab05733ba9945f06c2d278164ab73a83c09986146993e68caa591ed00e59dfbc6479f284f0aaa6171dfc4c4fde8656b11842483a7501062799a";
+      sha512 = "74ad88540de11314be567d277bb4b8c015eefc6ca676d58ffd844aa7ac84fdc9e01c88c1eea16731bcf7e21b69a4d0a3c52a283c0b8a9c19746f9deb971f3502";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3a1fa485a9fa134bb8892b410555a4dafe230fa818a14d9befe29c792ce43c1a92e4e1e4ecf33e7acd7861ede11469f5b4b74e465fbfc97943eaed904bf64396";
+      sha512 = "d4be7496a7c051007e2c0766cc4efed5def3fca6ddb54db1aa17e4644323b7029cfc57deeb33f80ce0266fa129e303cfbd1eef7cb57565d7e2740c0f98dc23fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ae6ddd192ea353b6b1b961976e8591db920b3355ab3c09988fa72d99415855254ba3e687261782d5eb35407a951f625efece356e1648a785963414f38460bf4e";
+      sha512 = "8b5128e43d6bd626bc0ef52b7f6dc1625bff751fba00ba04dfb3e378274b578be4384dca22b37a2c01b70358b098ba8062f2228219cc3194d84bd7f3a5f8e39d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "51d989032b7c5fa3f4103f6835dc13560b0bac0b3cc7085edb655f2fff45c45154816ef126fe16599e7ccc20bef1bb198a3f3466fe9b2ac05c178bc3867ef729";
+      sha512 = "a6bbfa967cb96f167a595453ccd699f55ff2175366063fb69a28026498334901286e3a1527b36a0cfcdccdb5c7b22d6ab61e39979e261c206b51565b408625b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "38d5bfe52516213f4fd9952e9c458a27223d7d07456e451cee353fd22f5a6cd2f83b48a1911417dc62ed73b9e686d686bc292c3b78a365702498aa81fb6b65d8";
+      sha512 = "bc1e4b1c2b4a9d098cac8ad7f227f1be756dde3c172d2867297862f1d86ac268d77a3d4ee1b4d685cb8f7fcf0f4ac5eeef6bdb41e802da1b5cbaacfd121c8285";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7abeca23f35464e9fcb88902bbda0eee9ab2b05e3a6e887b92a3383f21f82a45681e0fc5df365096eb340a43f79dcfdab91e2dec3c567cad7d5ee8cf1ab9f82a";
+      sha512 = "6600bf27398ac41d447d3c73f03f61b3f631303ecbcd31106c9db824d805e24c0754e8da34a6befd30c72fbf6c4eb059b468924f26fa145bdb1444813b7fd895";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "10ea3bd4aba05b67916c43c6d28972b31b947843d23c37885869f8df2153ff426b3ecd9df652ba78b8e29f087ab9ecdd65e41e9d21088492e0ca193986508af9";
+      sha512 = "7d10dfb714e62820f02ea51f453c6ef8671fc6feddae63354d73ab053e584151c32f6490421853f56f048d2540a4537f99e50ceaedefb8330e6d85f6d3a62c6b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "7b43a7760e4cd6c8c40af2783dd9428cfaa1e10f05b1db03e843a06dff05043ef36ba4214b758477ea2a2834457ef73538ded0025749e4fec895afd1417437a2";
+      sha512 = "6ddb53a1a2f7df7b7578e9c241f0c838ae5b29650fead195d8d2182f7ded0ad7827c938a59320553539b3b0fea4c6694e37b578e8c9733d38622123a46a17bbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "0718601664e8f656fe052e76b84d69e79d7939adf27dfad98b748b1d9ada0f8de75f8303da756812cf8bd66435f3ec6fe459581fc76b70719ba5ab40538e3454";
+      sha512 = "dbea98459bc6a0aca38f47c48b72d22a102c7d544aa085d3ef12a8e290b56ea2ef11a95f4cffd9280c20601d85eae129ae31c48a607fad778bcc096165b3c585";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ed823d71d94bfd796c0641a9c1f304e306f40ab3ae8748bd3953565f0017378dad18c27ae5390075aa20227fc69bbc6fdb25853381a97c1552fd8c2097fe561e";
+      sha512 = "b1813a9cbb879019241e5cfc5439ad79f6bfbc141a8702b5c6ae58d0eddc34e7b9f5ed4428bed3b04d616d6a3b369b9ee56d1fb2458154edd27a4844c5a57fbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "6fd6e4abdc7d3af659907f427e3c1e05f5e0108a6bfebc64e1ba56fab83dd280a9a94a5f719d96129b72ab569d217ee3e5983822512264a11ea99e409e0b07ea";
+      sha512 = "9a2d526c26eae72699bad13d7441589688bca84541e83f1fae4539934c973d86631eb055e48807c19f3f65cc34f3144605ed8ba0dffc1f951f7ad2da551b4cd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "8fbe293fc29acc1633f47667e2ec2aa4c9d17cbbdac8d7a5fe727c586a65818f7a9fe091c8ebe17515aa008a2848b82152ca49abdc5de6a5ecff2d0415e9b74c";
+      sha512 = "24f5466284251416f1d54261f074a3e35cc44241b52774a2c0dbe56289cf4ec5bcedc530ae8db33df628265c41031d47ca84de9877d60236c33fd9b8e71c1d97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b0bd1aa305c38c493bf41daa6f385f87d2b8bea73fbdc2f20a6c84c5f1a90bc7cab464bad659a06eca87806acbae9fc702ae91c61e91519c8b7dd0b584ab792d";
+      sha512 = "e1458a97cd0383e93804b7bf069285e18e797050891fac46e7e98dbfae9956e6a22dba38ba4514554a4134018317c2bd59d1fe7875419c3c5120410035db4888";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "cc43c32c3af0e6db3d4dfb2919b6de8bb1aecbab1566ad8cd9b5bf5df1b31e3307fd8cc2994f2496cea56f2c6f1089615ce963d1c81436d4a8b1392a9fed5026";
+      sha512 = "07a71306ff1ebda998beedaf275f393c4aed96b12b1ed5f6c6d55d6c7f1fe8c65343be3d6924c61cc88c21e376c386ba2b837f1765261842a86a748dc672bb0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "dac2e8593b629b9821b3003e5005df1a4b1dfd5b5b806fbeec9b1293b8371d2adb4df0c87c1d895f084d679d7492f64d11e80f44cc22e436a10ffbc2cc4cac22";
+      sha512 = "b9f9aa5acc722642ed4a27274d60ac054f06d43bd0bbb80c790c9d88afd25675dc8a2fd4d22f04b5085135916c383d5e4b6c612a821274d2bb7941b128d9c331";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ef3005c1c7cfd935899d9051e57e1808b2f3af7902994979862c74e9ae1d2e84d97babb33d924a58507c7574756c76db8ed78b57fad9814a796d081a2c38981a";
+      sha512 = "ad341798073be55ca24190ce3774ffc5e355c4db34fd17bdb5488449893826968ebc47591318f2a0fae9cd6319c6b529ca203cde4ca250790b451f3232740795";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "ac397b34649079e06ca6180722943d9fda3ea4a34ecf051e94bc9264b919b9b535957a87fc0030f53d7c23b571473b232f62ff6bdb507612dc2206ce0445f0e1";
+      sha512 = "d6b631660961d6027ec227a8352c2fb9ea97fd8345908fbc8b8273d29ebb3391af49e89efb8c060013c7ffdfa733e6b0319e6a37cd84907ddcbc441e8b689b63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "614b537e3d80b0f73f3e64f28be6b7d05f4733da559c051ee953de51ef6f00e86714ec5285c1ea0cab2c40abb438f60ebcd007bc37d3ad0b60c7b3a255cbea7b";
+      sha512 = "f809901e3018d02236bb6d6fbfee3aaa98d3332887e83e0e9b94104e11eeb1066a7dd313d3924adec68afa962e89f71f56e164391a4d4b0502469f4146a040be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "c0d97e45e54d468cd8ee4deef0465886efbd9fb43a6995b3fc09e2fadc06587a425dc4b0a625997429ac154077d27ad27f91fb77669f8413ce2247d6df4579fa";
+      sha512 = "860786fb3bb15792e5c6180fb1d2ad3a44f71ed71aae8d6e4c7799cb3daabd37378656672a3124759ab9c6b5d32793966992fc3de54c7a17de0066d09a3287bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c21a9d73378ca0c5994780505a7bfa3221a714db25bb3a44fe981892457231382823cc032e3ce0f1f63819ddfd301ee3d0ac35c7bf8bc44af90ed6e73024491e";
+      sha512 = "dca1ea920a191735011a44522166a2e46e023a7d61dc3e779954dccb9aae5a6c0af9e94221d150ce55351ba14c3de3de5c0beac65117e90ef5cce8107c39da45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "1c6765886b7f9808cc342bda04f624a676ac097b175be297238a70610404171b485472be3bb974b6d9fce8ff1113aaa9c9c631b338e98e1292e6573c4d8dece1";
+      sha512 = "033ef00d2c1ea1e5459c0ce6c3f1cc5e0d136a88a7dac28a2dd9d90ad2e8d036769fbce1993463800bbc96236913cf37ffd0b5f2139ab65547288feabfecdbfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0b212f54478321be6185724d9c72b8fdc15d46f52e80051e8fd9f6e853934ce425ab7ed07aef4d74bb73ad9165562a0204c79ffa2db277b9bac927fd1894007a";
+      sha512 = "912da545e8fd176b269ab8d28407f00a4790136656b94c74fac4236636879c3fa4019490ddb2600bb897d58fc8171cbf7a2612dd9f8c98ab71c2b145d1a1ace0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "ddd916e8b5073263670c4474860f447c0eeea15ccf43474a2dbdcdbacac1d30db56e2ee8f95f0907bfd41fca3d3db55dd230e53b17f531138444b9e91d711afe";
+      sha512 = "49a2a5403deaf9895f18eca6a1248ad6defaea47d95831f555d05c995c70c519b2bafec8db9273f25068924bc3c80cdcc0dc7eda592449af574fcdb93ec87e73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "d0db3905c6d3db720e108c36de4f442bdbb195ca35d9876c1658282630c1256359677183c22027fb2484435e232cc362c986a2b46edfb128c265f98f6cc899f8";
+      sha512 = "2b91579e572e7d52e843c6303c5df04d34af0ab371b6cbba98c02c6fc41bb9e5d1a6e116cbbf2c91ed730fb5a19c308e825ac916785b1c447bde3d1d82c81f8f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "fb20a5d61a31b8f119479912751b17e741258b651b682b7e47db131316d3ef8bb823d4d8b8df0ff24885093e28609bfb055d051f96caa4fea11934ac996907de";
+      sha512 = "d5c5250644ff2815b532c129a55e1d7ffb10302f156c78d6d06be07959504c613deac8e12640ededf66f6e70e2a1e7f81a8513504753386fa83d8fa805a12ee9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "570153b3f9ef1213ef5f38d56da9e62e43607d5385eb63d35bce6884186b2e48d48cc0c4c1a1a66cf8270e4c4aac78e3d4caf88b338791f7ef7295465ad180fb";
+      sha512 = "ee1304064ff6503433e4d6523727827f43b5ef8ce14a3a41f936d3c8f8f744594aa2749103c4f2d55687520d5e539795b77d5063e59b11f424729cadf49732df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "68ef51079373eb05f743ddcf5c1a574de69dca1d2f927b5479d72ba232f5c44544e7aa7a3b945dd592c60cca0768387080053bf121ca3c873f802e8b466960f2";
+      sha512 = "a26f9aa7713589c072d92129533eaa50fe162ed60e862541915da40af2f79337bd0c49ea1589fa38c5742c7f684850ab986d4510557d203e25512437a81fb3b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "73251e69ad99ecac500f57b9b7edee0c892e633f01d2594cc972e95b525a9516551de124fcb906d72998c10b49861219830bed3bd5bc6b479a28672e0bbe4406";
+      sha512 = "38dc7cef6558f4bd4625f628fa2d048064d94ee0b03d157ec0bcf5577bc1d481c15ce29a0b430a3c7126ff60a374e07bab45c2fb05610d4aa5e1a03aedf0d5b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e68797f62737578f9a01ad51cbb462b89c056d1ea3fa426f96ce7bb248ecb15592fe3641b502f12ccf95c21b6ef38473bbbe0406e36990cd5af234b3c3879041";
+      sha512 = "7dab5b2679ff891eeb8fb28b5828069b338d1e9c5d679168551556784f5962b71a7c848fc13edf92f736f3349c403fa0a86a485643b1e29a52070fcc9e575d9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9261a4bf36400b1a4d4dc20abfe984e79ff10ade602cdf529d9995959a9dedf1ec78a00562b310b3e1cbd91869d89aee382f5760d07e1f32a4b3d9cd7328ef4a";
+      sha512 = "853c0ad182add84b9eb2033b21b3f7421252dfcfde0bedc16380b159173b293f1d478a821480af7ccf7717532fc2566b2ce9426dd52fda9c8ad588685c2ff8d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d72b75c96695e8df4bad4dde1e91c3d3fa666ef0c40ed69b39c8b95c093f6127399203ed29bd36c02c99180a786a117af496201738c3a489b4bf2ba5f5fdde7c";
+      sha512 = "dc0cd90a3a540be1abf132cdcd0491a1a58c17f0a32ec398699e2a9fe1e73751e16203310405c0c8f60477662778fc1fdc4e139073eb213232115f9cd0189d5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "3361539812c51898fa7890c90215a2b23544f27b13da5ce160f8a4ba28e4e1be097a7e4e94cb4c1311d9c4d307cea3007694f913f227d5669f1a5070d2962513";
+      sha512 = "ab9521a26c9cf2794318095829150a49cc3b01e2c88e6e7c604c0a2f45aa0087b997560b1111486743a89d78f8df3d76048afd503f09a41fcd03ae715c6f5254";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "e2b2032653d45af1b201bb51c053b1eaad089316f4ac31da1df3b1effe925cb22c015e0928502377fb24e5c5d97fbd1db0f0cdba52dcf332e26f7ad7b4a4f79b";
+      sha512 = "f1f5473848cdf05e1fc401254879e8591d2cc660ec5aa94ba64820d0423bbb85385f5be5db957cd4df5e2690557c9c85ab5795ca909fff2c3fd109be0f9e2f75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "fbe4f5d07d74179d018edd877fe4811bf78a25bb9a0b8e374f8bd0166557502aabad43586de363729f923ae6deb3f66b6b4e1de4547e137a059a8f2a08f390c6";
+      sha512 = "f074e38aae351973fb4ce4fb3e97b0c07cb7f9766961f88d8c992c87670ea79437517ffc7562d6d36e40f30c717a3b36dc1da2d6e5ed59cdec5c20c5e84ac527";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b7a30f7f943ace41ab1c099de12b2098f07d4bd88cb871bbe4550e2f7e4479e2e0c484b286f939a839af75054f10426515ec2686fec5830bc318c0d35083ea4d";
+      sha512 = "7e27f79d7ae1d6861a5cc41c2a5c08bc9aa011017af214c443719e292c1e42bdd41f38fdba356ef2954822e47135c5ebf7af35efebdd4b0b6b6f89d1bd7195c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "562b516c767116da4f01cbdc1e463b9bc63838f7a3a03bdaf57f6c188805b5a1b0f1b82495fae43cd3989ec9b80bad4c0621e0fc78da0853449e99cb2e11e23b";
+      sha512 = "84cbe8a1320a99048c0600f7b3078fb96b5fc7b350298d05647d36a9523ead178ee79b1a29c00dc814c9d225b70cf33f708ca6ca845c9316802a4ddeb6310d73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "10be9908b228df38c7ae420cf9c0c6b46371cf942f59a00cc77c1198c8870a85c28857dd09757015f8efb13df492b3d600bad720200e79b9c28e677d300f8bd8";
+      sha512 = "8a28af04b02558556814dac039ea7bb16f06e4824d9f5536258286d0ad9abd6cd415ce3043aea3eb2be49a2deba54ef215093843ec78b5d145eebc70495a0df2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "1a1cc424588cfc3556dbadd136ce28bd5e6b8879d623b6d7f6825bc154b3dce9b40267cf0536d35144c152a6726692a00240e9639dcce67981b65b2bc8c648e3";
+      sha512 = "c1e46473b31c8f45eaa72f329e28654e214fcdafa7a4bdfa27aa7e4777901c5adf6249ca5dced05f4f027b68ec26a2427b3a577d43ee6d7683ddce304b357f48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "c53fd59378b8da7fa6256e1af62cefb214402d9c9ac022015ae8c628dce2e384a965a80d206ceb6f9e4ac113a2e491c9ff66c02e68a866b4606ebf1afd301e38";
+      sha512 = "df5c5c2bb42027ec729b5eecb1efd82fe6c2703dc39b7cf412109e316b389aac77b0b302809b0f6e9a82ca718d4018745999a96bf6810c58922518a01081a088";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "848c544742993d0b075489f324d2e8ac11d51fcf3001253e7a242098f02c0721c4ba7fc9d622d38495ae46fc7bcf98119d3dfc7d2ca0b7589a6f956f2e69c295";
+      sha512 = "0f735b5e4b4e7081826bac7b9d85aa5cb2bffe805ceb5d396d48137869ca414f332677549aec4cb160390c1aa8d2103c7bd614b87fd065d8d80689e90b58f458";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "336ea26ef61234d1adaca4c4d4d0ac8c37b891bf8770072bc16828ba05de572b6e5b72e901360f24fceae1e1f933a13fae80e5957eac0b0145ac347227062de0";
+      sha512 = "3646e8277d2adcfcadff557ac1537f30859e1bb8413e45deafa46d171341e0b0f8c250d500355104def1023d7f46886244acb5a90e3abc08aaba36530df3b12e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "cfa0ed64bf0d6054fe8e6eb2d9edc7c6b6eb84ecac36f7e166c8fac6d26a78d70b21174f24df61c942d8bfca6a838db9206f00026eee5f6c8cfc6a4f36c8ce63";
+      sha512 = "2f2e5a128e0032a966b520515f3954106d095510915add883d5b4996e99d80ecfd442379bd1070bc45f5424f7be757dcd3ad869274a638807457a4edf9794834";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "0b2520ea0a3feb87efd3b387ea22fc8bba9a62dc3d212d897d263b25954accb1869858f4d655ab82dba00d58deee38d984d547f7bb1d2715f723c8998626733d";
+      sha512 = "cfd25e52b91a38769b440b0452ad99089c98f0c99c8d371ba54ab5930eeec5cee9a701c4df216e67b6d8dfafaa269286a70b9ad77b6f8ad45e687b1f5d44d6ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ac628adb5a2362cf721a25af62e94ee98995d2d74b66d75463eab92e229d2614af5652dd5af8bf04f966d787bc91ce34d1d9654a2609da073ee69e0202694eae";
+      sha512 = "9ea58c5fa76134916076bed9727afcb6f87935d9bef0631da0060c519c45fdb741c1f1d8df08b572c7848de378c23fc038dcfce446c10d9115c16d272aca89f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "fc0e815629c30b3d03e4700980d2c1894e8be6d6fe98e1d8d38d36c61c39e3030dd4f3ef7baef14ee68d8625da025f89367eb201be2f6feee2c6b7a09cb2caae";
+      sha512 = "87db8282cce46499ec31ca67ec52ec6216f883dbcc725192d97209e59f59dfa29c2fc106c3dfbbaf04ba738feaa902ced14a23cd95ae0f09e58701cc276b7f2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "1652c92d67ef49d4b5e14e348647c21b9a7485d1f23d6e4b3251edd2505af95c60e7b9bc7d3d37f87a99f12bbb332a70ccc250f43ea7af8b03c76abfaea8a46d";
+      sha512 = "fb42f2801b529f49c0deec9f8fe5705621fa63bac84ea302c8a0fb83ce76bcb288969a9dfa7e43d90193055fca006595d31689cd3404784dcefee76f1e5439c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "3dc448c450274255f327cf7130273b9c220699c98c4af5cccd85f7e153674e9db6dfdcea4bc3ab2bdc3c1e5fe3eb848ffbf16ecc1673584b992380a0bf18f4a4";
+      sha512 = "f3799097631b4f4515ab672abed8edd0aa5ea3168a55b40ed70d5d981bdd4a04810d07a2355c46c54c5eb80500fcf0a071bd22c5f1f7584b96c1e7c3917df0d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "683b8dc78a420c11ad657bedb86959900be81ddc21e3fc45c22a2b0a17af62d7615761ed545d58ce0843d97191ac2ab0f5f080107a07f7c3ed765ff38a3f1d50";
+      sha512 = "aca754e9f2517db05e9418687e039bcf3b990c3d484b138d7cfc103a57713193eadd50a361909467d2dc6d2c9cc93f11557ec48935fd5fb31e867436f2b4f171";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "1978ab44856b91b1d9691e492c86d0f3e6c676312c156c852e0c69764e4500da7c8ec6f77fc417df850e73e5577fbd260c4023712d6b5cf17df885a02460a7c3";
+      sha512 = "689a076a45197afd8371b286422970446a2ab53be9440bb18fbf5787f177aac6eca4d2038247042da8377baf1694a576d0121deb5763db0f3a23ae72febd959d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "284183486d1715bfb89a41a92f195b73ab36a34ff01373c4559ff97473e9813aa8adccfeb1629142f947a817f750bf63222f19d77318fcd56a599cc2292ac7f4";
+      sha512 = "2f1ec4e19ab51001c79b17b582f1d348eb8e40ba63c2ea4201df1d3cfca72dfaee7b141884674165c33596b295e16c91c26eba9d9808d6285adaeb767a4cb617";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e61a418db6e78d260a28b4baefdb6ad58f7c8ec8ba85d0f9da0ca1630ad7cb3d9e8dd6676b05f4791d029c57aef6fca9cddfa28fd55a1b762740591ceab187f4";
+      sha512 = "0b0aa3f8edc3f49c93896e5485cc2223fdff4edb45a437cb0e8197a5779163ea3e660303fecda2a1f8306e7e385410ec5f8891cd7e41b21b0a619d8af9c1d9c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7a61d7f58e4a776b1b63dd576af91ed71887cc0ca191f2799eeb160de55a7c2439bcf44335f4e343a7b7d66336c35ef07c27c49548cf7b18bc2643018c1d576f";
+      sha512 = "d19ecb3f9f12a572f8a1bd125efa09f4947823b4ddcee12e8467176274cdb5677733935c2967e66d40012fe29c87123ba501c45d1594d0e1afd14460a824e56e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "0248abd063856e71cf1318b183f3cf9d34d4d59843411ce3119583d80dcc63628def6893a9610858b055a6ab93633f2c2b813a3f824c7bf5ac82e0d833ec83be";
+      sha512 = "b481962d3d88fc7ea015a7514ab3a0ad4593eb587debbd3afd51485437bef7f5dd3a447ed0d3a57f1c500533bde9026b2185d2137127f159743d8adab8794b19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "cc0bf69fdabc6f72c72b11b04f6bc1e72eb17e0b54f4e8890f343dd0de59d730132d53087b89f707803d5fcd6dc70f83c1f01a0462595068851ea5bdcf96f572";
+      sha512 = "b08a438a6298aa4144e8798893f9df8ed25846c0fe5831018f6ecbacae7c84b23448f03a7fa16bc05866d92ee2606d7b43b1fc0ead6745c2491da286d99fb112";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "6836c22daf3b0e3140cdaf595fcfffb364002c42c2b3b2374aec6a1f50a469bd20a0e27293402571f48dcf3703c944d8d0704f4b4229c7dbaea0c40a8b89ab6e";
+      sha512 = "69ee1200a4fac5059e4d91e48e7921952e304fbcc4c560f6ab53f0c13fd57b5c5ec775a07926c01087878a80e7e15369e97062a7c5cfd8db2f47c15ef9da3e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "dafd1bc57b1ea6f817a4705373d0dae4fdb5669887e96eba735e43c1aba1b6277ed08eedfb01372aba0dd0cd2b1bf10d5f75984e4dabc5dd8c1c26f07932b6f6";
+      sha512 = "a0e909524a56e80f8cb75021390f7ad7ac035afeec5295b14d3cced450a0bddc223d677fe567d406aa7836ffd5768712b105c5e0db2ab14558a159d6aa359ca0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b6f23b0c4e2baf837881f9fc183f19ecd83daba1190cb828ba1442ac5db3bbb2d1555a52bcc8fa48564614943ab7e6f0b81e9a5d6784874b45b08727fc4be04e";
+      sha512 = "070cd6775ec08a6c77b92ff9f8c4b2a0439a4326121e47d1afa15db3445aa15e992be465179ddaf0e907455cf3891bd236c0a9e65b13696cf158166a5d6e5ef3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "5f1cbe0e96422c73e5dd9552886324a256a9fc33e8f8bf8111a4533bd45ac799e4b25d63ab9d8a0e93a302aa39fcc1300fbc33453e7efde8e24798ab1ed92853";
+      sha512 = "fc27567c007d42d038ae699ab4175e32068f144645eb7f087807aabe5305b5f33c8991f9a4fb43f3489bf3c5245eef29b363a744d595e6517d2f8a72a0074927";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "1e01547c8454e376d78bf9ed3c5ded5d85e38bf6e7bf05bdcb984a0c978a4790d61dc6357156ab5d3999cc3d8ebf8d418fe18c03de1b2bb1772b914a37bb55fc";
+      sha512 = "115651b2c72497b05d92b745edc27851a00054865b930c87448267c1427db6c65178a337387daa2fbbb826c687d8940a08d9cabeb4faecb902f08898b6239934";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "49f78074d8078b81adf03a371841777f72842727365cb05b0e6f04fe478778972592540071599f14c2e760342831bd9fa0b1d1d6e18f1a5fcb766fd83e20a871";
+      sha512 = "2072f3b12787d799c378cd727f168807ee6a20b79f42988d08bda2b990c19b227caa57e5c996337489d000e682a53a0d6e7cb33a8f3c6270e32741c414d7ed49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "03540ca42b87073455d7a16645d4af9843d25de86a00ede526531de920c7112191aef16097551b497c6f086baa7d92000acf6e396a544f5933f879a87e23fd57";
+      sha512 = "ddf09c431e74d6bfab7a49a10fde28b20a24f732315a7bda9295d035bcf4cf2c3d049f2a66dba7f9abe9f66fc64bf99549bed2abb7e5a0ac1ba1a9c77457b707";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "db81d8ef8d676271e1a9c756bd9e55957aa65759649c211a69b7ffb5648cf641da30cf5068cd0b16ea197f7454738bd17ae7d73a419503b4e0f6f7dccbbfc71b";
+      sha512 = "cfd3f91f39b499f3a0125da9c952d68a8e815492b6597535017f824722f25eddd3a8b92817f546ffb4236d2984128d9b179366361f917c5d3e46b8da25da91ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "974f9894e248c89d4f772a090250f0d5697224746860990d692eb2b75d86b6c98bf64f1fadb7208ce6a1f57f5cdd8e2ff91c9301fb77bf2a21ca3bc9bf24776f";
+      sha512 = "d077b44d7dd813a7d17ede21273d7e56bef8378b76ccf73f36f3fa7611186f7d63d266736f59f59301d0fdf26b6063b366ba7e6f1caea16407d3b1d20fc323b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "ae5d3e44196348cf1690dc0723565214f9f72ef7e045185ef0fa65f9a58bff9340dbe989306287b1462291e01d5dfc64e71296d7340517a455d7081619739368";
+      sha512 = "66454a7c5055e1550eed48d2ec70c4d921db524d449392a9edbe6e42ea111ab1152b225de3095e9ccb3922e3327eaa3180d01105cd4e9fd7634471472fc18fb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2ed50ea85102a7e201ec7618289af29b079a4dd568178310aab3c41738183c22b90d34cac4763d28bbfdbdc92078078a99a18893b3edf7a513d7ffdde5dfdd28";
+      sha512 = "9c1d3ed7acc8ecdcb9f10d5a3af3ee2cde1331a7fd6c9a4f6f97c26289722c96a8cafc2580b0608a8c7226d5b211d4eee137deb45f1cab9df5c1fe9462ff5062";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "cd9ea4ec76ca7b8e391d8565536b3da9ac5c9406788f60307a6c4179da6947f01bffb593b9cb2ff988128c0926fdf92f0a4a6a747e593a436b8afdb984a85421";
+      sha512 = "5bf78b9b0dff6f4ddce433703549602fb73d98d2dd9b9720acd4fd9c023cda6bb52a92bac16d57ea339e0ffa56b4ce3eb831ffa0974940a12ca72dc250c5de6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "4ab7b30c9c74c111fc229ea109b892335c1c453ba5d119c3e1a481a1168990702c277acc9ffd22350b2f4a657a2786dcc77275a86e2c6372b0931dfe92d6c06a";
+      sha512 = "78ca04e9dae5d05ce20db93f33b312469e6e3da1b936e43daf60d0e7eadd76eefb64a1f171fab674f688accc347d464284c410d81e9a5a407d9fcbb407031bf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "34a8104bf029558dccdbee73b40f357afec438768a45aad870e455305a07b6eaf25aa57a67b3e8cef72362e1c17239097c9cedd0093f3ad58e120860c9cbf6fa";
+      sha512 = "b3569c4d4be9fe8dee22b1a3667807b89f2526a0477ac6f99886c2b8e687598eb799328589d951f6ebc1de6b05a3c2493037575d324f322bf39acff24b645c26";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f13cb383aa609cf5c8b997c52324f4c8f345697f12c489e6a8eae076a3c56327e00315c30942c2454623804b6889ab529ce988d83dcb940905d98dd38f0d056e";
+      sha512 = "024f90c38265badd689fba3950b18da9834f03bc0a754910115f34e3bfc232d9728073c058891c592c4292e4148e8459f3515caa1a05acaa1ed2c9dc709e1b48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "72c97423432457f299428f43657d257008585fd31eb4006bb8ed20077563d0e708f16c3331f88224f5780bd039cbef2a7c894bb1fa965cce98047698bf2abc90";
+      sha512 = "0317e9d27964f9c9c1b7fd5df85bafdf553703bc493f6f67a52bdf9f893d560b6b5c0479624599d3756ddbbb66a86fe9b88577353b1f01c3cb1c0be4425847ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "199ce1699b93774f7e206167f694415cbce6e7321607cd7f680798c391ac4eb58159962b36cdbf4e6e5928b6b9d1dfe926880651c764742aa2b10c7ad6981d8b";
+      sha512 = "a700f4708e585afcef5c84a6c2a2e4d13c87c82d897f1403e9ffd7da62ba6938d8260d6ca65a3d97a4be927085a85e07fdde2cfe0fbeae7d0775fe5e875a69f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "01ee82125f77c4a3dc25dc86dec4cb2e37a07a4d24afe811b5a8efa8c6ade58eb9e7a75ea34e58673b11f367dcf15838af775c39f4aad6bc39d8c86385bb7c1d";
+      sha512 = "46e4b65651202497bc01e49eda6a3e39196023c83d7c7407dd2a3cabb11cd954f7d2e1056ea0ed032f8eab52dfe9aeb3398f77f6aecc6be377053d4cd7ebe852";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "5023173aa1c6ef8bb3c8872fba37edac66330543a688c17b43e4bfd45f08379b6309994a5dc9be98dc1766905d91865f026f9027644c906d170130b3a920f07f";
+      sha512 = "535e2d45789b7486060d00d03fa5dd6d33fb650bfd00344306e1c237d4a4c68cf30176f39b6ecc1cb1f211186dc53d749421a8b72f8b9a0e68261f447bfbc09d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "c570a2b74dc4185d2175db8047ddc7e979593b094893fe92254861ac9f714c76a872e18926d6c73a5be26b6f6593e56e647c7561e432349c0ab7175fff41d7a2";
+      sha512 = "24c179f95f5475ca9923792808139693c8cfbbcd46e8ce94b7fe5a17e51b7ff26fd4e5acee41e65b2a73c06801768246d21ddf65d0324d56a77df78ad21cbf90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "bc6adc9c6ab971d3af9eaad370792feb18c162a43e9361de437fe90a55ef304b1c7ac0275267e722d6d7f9a4ede37a2539bab60a551ce7bf2ebc0040e9a5ec8c";
+      sha512 = "dd950166b500e45181dc09b76e01651c360b9bc350768125ab963e328d249d6769a8237628bbd4d0ece0a9e1b7c782a59e9a5e0b515a26eef7b2ff906a59e98e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "99044eb8bb8d799ae6045c37cb6a12016e885ee5c9d2a893d4d653d34579fb1403078d484389623b22f1532ea33ae1b29e3532366f9fdc6ec1228b68cbb9dd12";
+      sha512 = "9f68c9746c951259ab156c6e326c62de4bd8db3b0497a5128e3024f2e640f54f1d11495d6a8ff5940e7dd9acdd6f3f0125b85326149f994dce08c96a19deb69c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c5638fac25f3715a4f7389f32b2d9e8f22e5a356e02e2ee94116080951c451c85245834c8b55fa9df95f0848a0b54eb8f68f57936e69bcf5210932c782fd621f";
+      sha512 = "f63b6011aca761312eb5e5c468844b0bde291b0e1ad67a8ad7a0c020ea2e7f2ad43565998ed49f4c618656e9ad5d04d6324f9d22c1ee45bc6af6a560dc863e4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9a329cc370a2e7dbf1b76bf185f1b118e33b20b349bda8e8419797aef87db8881b4161d790f03c51b06020929a8b85bd6539fed4f8aa9838e98f4f6710321aaf";
+      sha512 = "6640a1c96477906749457aa9670559c44327b25cb6526534cdd7be70c84b6687819b0ff433aaa37ce13a7f9895c2899797a3f4e4982969a1869ac1788a1b4bb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f09f4e49dac39d91ea7b146122f3d99b034de486ae6339b8fadaabf1bf87eedf297503475cdf559d69a14c205841ddc2f75c0f961b9a8913f16bc14dd7593274";
+      sha512 = "622842075565b7708bd4c1e06b49a8e15a5a52c768cd8dad0fa6744b1295269c38f5547cb061d4c9096a0309251c29f388b0670d7a773276c232f7124a455b38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "871e683e51d619e19189b8f0341ffe6e14d14c058e0b4ab973f804ddecad9c1e3c8dd7730a3da884392aaaeae99022196af27641facc1a8fd25052f516c56c22";
+      sha512 = "328840563121cdaa39918ab443b1946e3b6e39a7a1866ce95daaef9f12fe46f8aa18ba4394515ad72eb7ef332cdbcf0b893fd4095368c0ca949039b31f335f80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "7e0d7651ebcf03f40cd9cf5faec8a404fd028a213575c644f2b2640cb00fee06a029ada21aa17ca9f24f22b7aa73767390e635f169fbdfca8d162dd914bb19cf";
+      sha512 = "8d9081a75b7543c2e1c25c67d41cbebedd914f7f21eb1fc970241031120345adc7851305f57ae341b8ae7f7119712dd6a1cd9f6bc9d44d6f7cac5fc6a9591b3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "fbb8c2fc1d6e589fbc42a1efe33af0aa129b2a435e33c8cc7dcabf2dfae917403c2f0d9cf62e2045ed2350ba72d07ccb92ef46842a6d34a5def928386222560f";
+      sha512 = "c53f07a1bb521ea5f3a3084fa6899c5fc81693bb51ba51d848c9581dabd108c769d0793e72aad7c03b7d017cc75ac084910f2d114f9e2c23e967f731eff85118";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e2639d8060552ff688bc0961b19da279ea8563143f8dade844f906218a3816427562b895d30e4732c96c39fec81cecee6d39f572823e3f4890a680f0b8acc61f";
+      sha512 = "4c08f8034ee0319f2e0eb75c4bf72620b793601c08fe7bc196bdd99e2d054bb1bda7cf65633546af0d91fdb857ec451f003040d38b6de999293cbfd35d76ecb7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1da0564312f8a180d5d793e1a782519331ad78bdd7a44dd361b15c8230520127c69b52667f0bf670038d9b5b25426522e7fbab20bc2fabf0fb9fccfcefeea442";
+      sha512 = "b4d96844c39cf9ab5ea348adcbea6777446791c39d2832373881e22625a60c72f5261f04e36c44955c7069a9b94cfa46caa719c6495035708328d41cf07c5d10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cd9e14f1469f2c0530d36b5d29e26efb93b38fdf45b29775fea481a305c3a4a12c8cd6b016ec5796e2fcf3a9901348214ede9aecb62cd101022287c415c7d370";
+      sha512 = "08995d67415319ce82a49b80099669714bfcd1e54a8e2590d38c1ecdd1707eca03a4b885ee608d28881609ba3ac1e1ae8f0a3460588ee713c0c9faf60d01ce50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "dfcdaad90a50cd80337e3015b060e554de815b31b4075bb0738bdcd88a373a88ec9a308497c4f7b6ac031101abd700f9a796f52e10b071c7bf4cd2832f2b0d2b";
+      sha512 = "a53f8909fb0e778d821404fc6566a8a5e0e13c46190777900abcbeb86648275272f37a94afbe4c83e4438f4f4f3949b945824e3d8c16734fb444bbcd2354e4f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "8fcf87ad0c1d85d5be1fd81ef4d3f17c93060d29c6ce889a2c96a53f3ca78a55777ff2c709c4500c643dde6b7c468fa27a5e0b71e677b5ccfc90291eca6d6744";
+      sha512 = "a6e9ba4cd2a0c2f032b1f88e0e5966bfc04520ba63606f640386216719ad1c900dc3978e0cc858659912dd89140d26641157b32d5daf7fa0c35dfe2d826dd9ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "76aa9c700f00b86575cc81e3a7c0bf485e819c3cff7765ad7ae28b3089afa7adf2ea7c4afdbdfa36e29c57257c74a467d9225cbe524217c525c91e4f43c28892";
+      sha512 = "0f902f3bf54dd76fb6fa5c0622e2ad51b85adc5cdfe4a1baede2cbba66b71856dc1c306d5ef85b49fc3222b52a210a0ac7f54796fe60329e9859d618bc4a200b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "01775737dafdbf6d0da9da6c20aae3ea631e59db156aed56bf2423cfd344e7cf7dd4c4ab409e0d98c2f2e3188b6b27f2228d18bac02d4a3570fb0095aff460dd";
+      sha512 = "63f9c95a8b8eab315cb2a531a6573cfac53eabacabebec97d2869fd8ce07b753ab633f4ef7ced7d92784d5682dc87dc40492df78ff37a0f45326668422fe62f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "4d57c9cf63031533db0f731c6087802ebc33aaff64f6520244b82c6b2e5b26c84c5721483405fb36e85c87b00780f5c849ca9b8627f44e57e2e0de82890928ae";
+      sha512 = "28b79ef84f412f747cc03f8b5622fe8eba7bb5834da6a95ef376348a95cb5d146bbcc1597425f61f898f40fba70a79fa8e0c3e03716addf0e9fb33b523f014c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f99e1e067fab39e8c7a63a55535fa1a8157b501ccdfd8a45274d5c5e34e9c2817c6ef6a77692619bf7d744af99c484a62dcdcee066103711fd430f41a9b0c1d8";
+      sha512 = "65a49ad024813a51692466b4cfa62ac13a53615d4b16e423d6eec0424bfd7c151c07b66c177c348bf2127eb1c623c979658a524085af8938e18e9f353462cf47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b9e6f5d952178667662225f6ea47e392eeb2fad54d3acd96f7d51074cf30565e8cf9fa549a77c83ef6812bd540ae41a1c4bd51ac9bf70abc40c310b6f7e6348b";
+      sha512 = "495fb3e61076679cc5d57da9d542ef80c039d91be15e09a5dc37a26ed48cac1b05b36ff5c91dfb6d912debadec67a0a9914f81796bbf63b07153c47d27536475";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "c7b4ffcdbab0ee56d77f9ce59c8525cc91f99aef6aa0fd5015468ff69cf3817ee9ef98c79b8fc868275ed1dfb24e0cb8f6594eeb0e7231d0594c5169b39d60ce";
+      sha512 = "826e7c4b0b56a0d1d766e0f2eaff0a5b4329ad4d0e01d715d3a50b61cc26aa07042b7ad1d1ea3098a439ebde266fb919e6acdfaaa521ce9a7f3a09640f3419f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "002bad3e119386e3c62850e8b6e145e8242538da2367ee83d383a7c47ddc002101c2f4a1d3a775819059f83fb0f94ec041348d0440849ff6677672b01be5fff3";
+      sha512 = "816bd4044bc536dde81789303aea5b26d494535e82e330bf189fa42a7a41f6a89a82525680db5551f6906457772a4b3616a349b1a730bd1fc63b9f16869aa59d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "4ee79e8f4eefbbe29762537f117e7aae5d67a7ae2052eeb73ac19fa4119d2e4a344777aa6a4f2c449e9cc9bf247041b4085d39b76c568d7aa87bcfea6654e26c";
+      sha512 = "1570c8cf2792b39f4e56e7bcc48bcee3e383a7918b908e56dae302a086d3866527de61d75e3e277b3a52de0200d68d4e8cf43303f2837562be23de79f64baae0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4818076c75e28bfee746cdfc9ade97c3dbf05b987f7c1053e7c1e5f40d9b90345cce4e5cd3497520d7c87a827de6e61bd32f2b3cbad61da040e98e7433aa5044";
+      sha512 = "0343efa60301b2fb79f2c34cc04c7aced7b96fc9eb3c2bbd1cd843704c97188b016fb276ad4b1c80623271ae6b610c1177c971c30189d5e6f42b3cc941697eff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "96f7768946a349d3ece7dbc71ef1abe53bab26ed34bc63b5371e9dfd667ef168d778edb6fae873e0a378c96677455d547267ed38bd186daa0ca9d6008f7abb19";
+      sha512 = "963e565dd8e2e96f60b83031532260cf464960528655bb69ff7c554f503b6e635162692c7ad91d9fade88e69fa88c3c7d758db15160b805f9b68356dd7b9f3ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "eeeccee3c1a8c8a21d320d23c6fcdcb95d0cfea3ae6c6501e33caacd18a161725e72f848fffbb7c192600e0e4f3ad047dcdefebee22574f34c59386df87971a6";
+      sha512 = "63ce005570a8917dc75025249962c68919d3335bd4d9568148be138c51be477383a23a2ee790774cb1426e6a4b8fe4b7057219a11d8dff27e1a88d6106e61ba4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ed625feb72929469734be42ad6eff565e2f4fba5a73d0e7c0b6616ee642630d090ed48bc622367b6ad9bd2c13a8e1ae940e87bd546ac63d266863123d8363dba";
+      sha512 = "49a219ca5427b8a7553d0b2a490afb6e4e82012cd6f6917735eeac9ae43a38b150ae568300dcae864a228a80f8c8184c76aaba9092b7dd51a617859a700b4be3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7af81f8bfa22f021e6e820d51b007da961de995dca36faada43414578ed205a274b2120b7821aebc4e70533a3af53b74322b4183df86e447b317aaf53c08a7ee";
+      sha512 = "dace66b729e7800834271b5dab8a7bf0e12f1d1ed52a4ab4fff5a74f3ee16318d60ed199902f67bed92c541da0e3c92cb1407d5520aeff7b3bcd2f4d0f71e840";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "a25ec6be34de7f80bedb83b0311c3df564fb46d8521e367ca85135ff66dc8f67fe38f8a0a2dc50fdb74db3c0c93fcf5355e80cb8fef83be1ec88d4bbe3a63155";
+      sha512 = "5ac65b01efd765eded53d94f1e97614045cdb350efab9dd576d5aef88e9acd0625437fecda35516726cbf4c47dab96061ce50e04d260a848ca31cb18ec8176c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "94dea7384f702ee9f4991bbd1732f93d610e83d451124bb598891f1f1a36c72e2a3da5681584e3b27e71e7c4fda4980a09be23bcfdfa0fb83389300bb231bc16";
+      sha512 = "00da1a788dd8887b2ae2e512a56b3ff05ef7b564f2abc6661fa9b5ba2928a49645aeef4a53978120207dd6d361a3133765c414f6868d2543511f173e96f615d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "3b20e653a7f70939402486ab7daefbacb91fc074acd28b718e914dfd1596e33431119f28c1caa318f911a4006dc6f7c51259fb962ef9113cf8df83fc4cbe6377";
+      sha512 = "ccdc2f88de9fbdd87fa639993a5f241bfd3afa68e36923d8f04ed7b70e30c44aa4a7969b402e839f535c3cbf202b89d287364dc5124b08db01fe3a03f4fa21ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "6db1a0d8dd25f6199e50035830314e3a9bea1168b441ea2708b62c6b8fe673b146926d92e55a9c7d4d0c07da74d1c8aaf3a4216a117d18d4b217f67bc082da4b";
+      sha512 = "105e96a68895ed65a7e32155f248daf03c7389a3eeab42ffc2ac9bdd82122f0f8257ac2bdba4d0a60c6591db18564850c0615cccd6a7cedfe42f51938b9c5b64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "3595148a4b24d85ccb4e8e7ea4d0591a278d4e0b43fdd91504757e01fe51cc163e7866760ccf00be621dcb07321290de22a85710ff8cc5afeb11a21b67704ac3";
+      sha512 = "234b65b2c053be05846845219bb3c7e2fbe74b5e0062f361a7d5d0d27a9f14d9235b88e0af734587035597baadb1933c2e762c75436325c362de0e0377d1d0de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "5bf194dfc1ad7d7a48d1a29735f88c2aa86fc79aace1159bc6fb2c6b11d088402dc9477d80075b8913699f9e02e651882a1d24d2996770ca9ec1835fb0bb73a7";
+      sha512 = "763a405e942190c5314b44ace507e6d019a875e8252bc25af1ec0294265e9729fcf1d3732b22e74c3327b6fb4599f58d97599a1d46eb8762a49136fac23a57a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3b9bf762ed356fbca85a9e9742258484ab6edae9cae6667c64cf8572b07ed3cf83e090b30932d3beb542ffdd9906e609ed51c79906115ce7be0fd2e8cd7dbcda";
+      sha512 = "076c5b2fe53b32a63238ef2c61026e9fae925725da7fc75e117edb48b4df91f2cc7b7730b82695ca7689f460518218e9a7ff32484dad63931f9d45eb6990a9cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "7a3552c80157ca05eec6cb018af0ced148b2cca2f8f713ef71c37ebf64c778eb881eb7dee7daa86a788ea542fe62f45080dac05259aec30070dfa79994422974";
+      sha512 = "a1d756abb22516279e5473642abb1922feae9ee5604127a47f298850f620ff610ad4e0e3785ec386e28d3bc94e2dd7f09a070f40d7e3de910471b7bc694ecc75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "030f0d0756b3f259079539cb4ef0f1268526970e636f27540bd72647a5acb25d73d0a35f9efb4d3ef8120990ad2fa5ea1a0c5faabfab4b8a50eb670ab1f04d1a";
+      sha512 = "9566c7bda61b662d371c11d899daa67a6110bb0202aee4fa7c32398a7238d0a3453f5c0b9c5f20b5b7c6d225c16883220b0739e06ab42ac5c7dae53a581e29c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "508b40d3251cdf63f36f46e632a798ebe796c8288ba91549ff94dad8a8105946df1379881c4d4a66f82d54e027356889a9b7e684fe924ee956a777d00ca8124f";
+      sha512 = "e31862b260634f32fbc61a75bbdc550ee4310d7d53a1f3e810cc5c9a8c8b64b00b6dcf53c229219988b88e44e832d5d197ae544685b79eccd34c3f5fbb40036b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "1d1747277d8e8bd4643abdd261c77bf799997470ef0d6af8c55733e59f3ae7324a05bb8bb831846a6d7da3644c6cce39d83fe39935f459b1b01c3ddb8aa3af91";
+      sha512 = "c347401f25574a5fc7dac814e61c2699b53ead432eaa48001df4c83184e1f609a34e7c6843a1d03c60756bed7176fc05bce0fd56c3b4586d2543c31f7e0fb809";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "0270f0b638fd7371b6dd302ab02bb8bbbe55a445c50ad6c62676d6ad61564b40e72ca1ee2e4b84427b8b50fa5874eba657da7bc8c316aee997164a86eb36e65e";
+      sha512 = "c50615219573dbf30b60349e85138dc788fab5e162524b0fa5b78f0fd69060dc910e7c7960061f016d13e3c8880ce801c7fcb69a5da5f634567d5460f2bb2ce9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "99f7eba79ccb6fa69113fc30689c599a1d2b66795eed8fdc7c3b49733b42948eda051b5d178d3d07bcb8d7d37f065ca5115a2c0807c39209adcf294890f64c13";
+      sha512 = "a879ffa00eeac859a2bd265aeb44971afd0119c43ef81552d1dfc477465e0d0b947b9acad7bbe6bc4cfac3c7405c5635cc181fa3bd393d3d4d7891fbd78cc29c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "c377e0c9f1390a31ee7390bc0272b669115a796c5fcce2effb34e0e5b2cd342b59e20465b56da30de2e35265930684dcdc122bbe16a0b28f54d23665f3ca463c";
+      sha512 = "0ab05a8aba2ba9b3faf6cdf764db59d7e85593ac13cf4be1981d18a6bfdd0817bb411210ea3810d6c59c1046a76c8e4147f67647da4f047175b71aa5cb1b7ab1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d1102ecfb52eb0dcc1036774c7f2d3cbdce75fc893521ac2283772a956ccbf97bf84e5a70de5ec2610dd97ead87af76a217d27b3bc01ab111be989b377c22143";
+      sha512 = "6669fdb2e0a73f295220327248e954ab0c80c762766535ab63cd1d1625de55439865632b7b9243fcc2663abd7acb83833dcc0cd8afed5aee0393fca7142a68e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "60c35a0475fc8ea7f377fb9ed958f85ad0d844b8b68234b52bb75ecf4165ee8fec6adc715bdb3862012307e8497c15a594a83cb9812f11f00b81dfe1f5f1e67a";
+      sha512 = "d2a48eebdec336da92588a7bbc318844058b8735e229a0059dcabbed16b47b2887dc042bea37ad1ea6be95ee55356a1093ea5b077289de8b0c9e5c14c199dd65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c177111dbe0696f772801fbc0cb015ba6ad4cf3e2fea1e060d14e69ea08a68714e8dabbfd67ceb7a2d228aadd6dbebdfaa97db0aff3816fd60672be909e7e1cf";
+      sha512 = "28febae6395caae9156f5e4168ed030767a6daf259bb96d3779a35da58d0a72e96b5530c57cd8d0570c4eec3d142772839f14d52a542418f2ca52db2b1641895";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9fd64628bca69b9571a66d0dff0d86111be76a9b1f33221883081864f44f4f8d33d470012cba7dde3c215384e4b6813ea23d7389360ff14843d28d884ab23389";
+      sha512 = "519617b868bca07510faaa8e21bd705718d3ac23aeebaf4a4513e0346597662dd2cc5f6480a71ae1c93d9399b61f908d2090ea7c5ed5e0a30beb3efa2e4d143b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "302e61504fbe381ab40fdd5a8ffdc62a8051dc331106109392bd1872ea46ab736f19ac075f9f6f3eac93fe09b512f5fb84ca18a2013d54a672f1caf43ad8e095";
+      sha512 = "20a19189579d2e45be4659a77bee320a62fd6df2b48a8ecfc273f507674c3ce495b56cc4a1d22b0c923e2759475f7e25eaf363f361c729abcca0906d5faaf87f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "b0bb001ca13024cad21cd97502a48381fa92dcd6f5a83dbdce1efbc28b23abeb3e84812b650187d22f775d8729c492b7a8a17987c1905e8ee827643e06a3d0d0";
+      sha512 = "7efa4e6a168e6cfd2de234d3868d02083d88dd4928d721481dc57605bedc7d947b3aa097935291d6c18ba0898baeea8f325830ed6588c0b90408588fc2956d98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "e5f1eabce231b3ebba8102e6f13665ea34b38e1aeb8ac02e249d4c62a1ef65a8182bea28d51ea606ceb2493b9a8e8ae3e510dc92cecfd37713cb5dee8dc52c90";
+      sha512 = "216c24840bdac20d43c992d2347b4301d13f72d4425292ac30c9f8414d5cfd991830c5dca09db829c16882dc3ee62a7e389eb0c0d202cf4a01b6ad1cfcdbf7b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f55315d533e28e998cdda05bc91a9d26895f7d69be151732a50715928e63d14017e191628b564ddf005708c459354ea999aaca34771ea27598cbe5a9b238f21e";
+      sha512 = "17c770c27d32ef8cf4f5255240b8d307f8c483d299b0d9d97a40f18accfa11788efee1e210055711e7c892ac7c03c14fa5ee0e6f4cff399f89ca37f8a56bdbb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "fa07e94f5b7550bf25e2cb21059d1b0a6ede77dead1fb6403fce47b23da91722ee1a022ba564c7e11dbe2ea2ff30c782c77b461b3bb4e5ad348a55582e7d4349";
+      sha512 = "665b931bf1bf79e356fc29c5bfcec44ceceb6fb9a462148fcce3f6edb711a21043e9b5e9043321188238dfe9aa0d92955aadd1a28e080917f571e5ec02dd1c49";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "55834f3b4f5ec07b91fdddd7397a9214f96a85a24172fdcfb18e01eea3e3c5108505af8bd172a53eccd9f00ec218e8b46fd0e178d3ece960ed7448e9a5eb79c7";
+      sha512 = "2331674e5dbadcaab35991f7863493957ff054c008917200d33f8c1770f3db33ce9373965d48ef230ef45f1ba43c8de798d3a60f1c77ba2da2281fc16c352ba1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d4d3278f06d991fd63e400e3cbea799e721edf62de6241cc712ecdd61997e23b15dfd23197c8ea3602149af6a9ef6aa9245511ea0d4bb00591797f7d68e568e9";
+      sha512 = "e0f487145013ed40f0708a44d90ad78e859472e48f2f77153065d04fe7b06ad2b862624092ce822fc8f20bab9c55dab4d70a0070d8a64c130104d41d821edf88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "317f290c2eb4a7c0aed978f927cbd1292843c38a9bf4a9ea16cfbc3a4bc1f452079a6439d4578712ce2d04ee5cb46e8e17a50ae5950b2d036bc91d746bf47a7a";
+      sha512 = "2426bb2da07fc96e7083c1d52f1cf593503b9f07372484075170f1b9591caaa5dad8a7b74b573cf09eee4e76bccedb367f427fac98470cb31b12fff7efcc95a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "b0826babdc742bf6365c33aa7f7be7b15c15ead4fe5aa2acecabe35e53edaabd1d31d02b57a3be83104a4fb14cab6f344c7b67a12c5ea234e75d2075358036e4";
+      sha512 = "587d112fd2da7c05a482804aeabcac701414eb1d48092b9d3020a3658a5bfa5de3e8314879eaf7fc59321a54b79b820f34c54d342395469d8324e6f677ada9b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "36915aba5be63ee3f5b6a46bf835cef732bfb41c105b3b0e7bc2c72c7abc359c014398948365be75a133d3dcb1fc69288dc44da01426395bab0b8616c51078b4";
+      sha512 = "9e08891a07b5a3d2e1043f0713383124ddac0e7266e1dd6f3218f5d3c90bab787d00b1e1bc2dde01cf5f777734931708d601133392f87452156444c25dbe7d5e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "c43c79f415ae5ec5ffac83db60e0c7f4f4b9f39dff51d78e79a4ef3df60ccee8328aff22a8543aa58067e6418124ccc39152de6a024c58df45e01e3cd75c7ac6";
+      sha512 = "d1dea1d65f29301048e185b5cf5845b8ce32bfe8c6bcb2a1be571a505e9755b5bcbce507c30054ddf021700f460e1f5e3cbef65c463727866b3962cc4e6e5dac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "55dc14dcbbb9ac2369d1cefdac04e0433c371ddc660978793ba44f2bf8b982c13644da7c6ddc0d2bffc6068f51233caae8b28afaa0d979eaf318be81d80d4e9f";
+      sha512 = "d0f30cc64b7300c437d581c367006f5ddd9a3fba453f9e1d86928d77da6fc104467c090c6dd4d5c897f3d9324812efdd09f8e8c9fd8561f6e066c8218ae486f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "884fe79157630df26eddf10193d09bc929c14af774599beff9fb34a965c713da961cc45e0acd6f9a66df5b2763a6a4db7e7e361fcec8d486fd18b607e3e5c145";
+      sha512 = "a001ab086a7ff80a429c133871c3257ac29e0ddfe0ad480f1f7e06c095aaae5c7637b0a40b6712ffc5d51eff12aa77a8cb7e734ab2ebc35c7ac8f3e3e07275ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "606145426e3ca2c361de129290d8968c77fc099d8afecf6e22ea771533912d8f60fb0da9ac60302f19bac7979f840be6365c8a7459d067ec6f68a9dd29ae611b";
+      sha512 = "a3bdf74b5d7e9e5b0f3934a6c9b11c336ed99b34727e32c9263e31106dfc77bbf9cd0e11b2289f6a94261d6f6ec641e5f8b1e22dee0b2aad1e220d7dd1f0860d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "13c2b730ba38adb35d69bea2315179517892663e9aa7d31d41812496e691f37b3fb52dbd0a99cbe56af705fac0b9b51c6a9d96c1769f4aa6d6f6cbc174b223ca";
+      sha512 = "3eb55a9e6f0bde7d236357ed19db896a7999409d07995997e7b464083c730ab3fd21c80f92f61babeff03520b209aec06a55c6f5764ec858de9402e4f436c848";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "9ffb352754822966685dbe85a42e5f083ead0f3d38b8bc6181f624b561a60390ac968064987a593e96f5a74c01f9b7815cd58c5759f295b85d99dfd54312821d";
+      sha512 = "24b5dde86cfba7463556572772fd142d1610a66776d6e021307484ae8087285c1a578c4e6849668fa345292acc889efad22bb1243418406c6b28d7768f94e4d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "333d38a1a0fca834e7c68dffbe78173a1751461f30f0eeb642aba6936cd09bcf0f5b6fefa5eff23e34126fcdd40b7acf28d68eb3da3400a70c245332c8175f23";
+      sha512 = "863f5ca12705d5ce5c75ee4da9951bc4f8d232596857ed6354ad29c5e28e15b7e610a6c282b8607145c37be6f365cfc8e0ebe2f8ce9a8410b39f44a4b6f30985";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "888eb9dd0d673815f7cf87be600341d0fb42b92f92b4c39cccefd8bf48b666b542b679bf9d7c87957e39c9c235b8bd80b510fe56e0b449e2bfec301e9f10ae8e";
+      sha512 = "a1179cf0010cb1d8f84e06292c932ea1b6d91b7278ced351e920b752e6105e6bce8d2792640c382ccd4a495fd4f58cadbb5dd5d35e8bd90a791050b05b8e975a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "7d237b92a23ba67d016f94aa1f2a5b65425adb9d9a7ecdbb8090fad4edf200cf8ccbd512998914c4d36ca53edb144b138f838685f0c6f757fb8f3b3abdcde969";
+      sha512 = "f46dee416a015612f973577a77ccd151bec500ebd52d05467a8e8ced85dd698edab13d2d38ee2bfcd16ebda7c2970c7f2eb22726bb06c355965216da32acfbda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "4aea0a2f2d0563f054fa59ad024efb4fb01f23bcfae74a3984222a584125aa7fe8d88729049f9c748e679fa9dab9cea10e3f6072e7bb8d65d3d9313234206985";
+      sha512 = "303b4a892479f8ae8d0628e58522929fc184d7179733b38fe45f154cdff14ff1e9675bfd6a16e1d1975ce8787b930f6ac1794390d2c4ef1a9009927735d37ab5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "172b2d4d91d145d05fb45a9ef4415d5c31335f464a35adf7a29325e8eb97e6720908ec6cf962935945bc8f01dc18b052ede28c779f276bffe4fe497e73026ab6";
+      sha512 = "e9ceb65512d95c6d3e8d5fc77f428e7047fed84664be1ce77376d4e8e73ac31c23c8b2008bd73d87f3dc463708bce6631be885e23385790ee35b9d32cab69164";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "d69bb024bad2d27498fda94cd878014e8dbfcfa436c89b1a8fcbed5968ddc33f2680887547abfb5867c8e47acd926a907e4b7fd3a4fbe91d583de3cae200a90c";
+      sha512 = "2996a1f32dac40cb2e327cdbf89b8b28b13e210c5d7a4fc4d8e9ab13f8d6e6a29992f240e9791d7fc7d1bafa8fe86a905ea216fc1c14eacf4649ba9f95f8601a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "db35d4c9fdf59644b39b16604dbe61def9142b4799ea22e0ce9ad1855a8c4fdfaf06d0db83aca92de8b57e368b6f4933da61d5b9a1b992fadbc1db3a59eeed08";
+      sha512 = "30514c8de52e33a021c94261fce16a9e7606cd511a1fb492cb817d4f57d2230fa6ff94317112fce230b8e4a4b3fb7db17961c4080c55269c398bcfdca036357f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "adc59c274967e05de777b591e6e85a65bb8c8fc62d03abb0a5f0f59be33d128bc45ffc731f4ef68cdec743e1def5bb1a49932ff68095716c866c1a039f9c6c8c";
+      sha512 = "60460b758f82d306494c601a6fa708ae203ff712bd4a14128114ffb90bed91fcfd482dd43556841871c0a352e92abaaf8c75cc24d3b79022f5847d17c2341083";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9bcfe72ded0b8ac3e153a41c3440306c6696035af5a288e912b8a946c13431881f53e8a59a242df4f73bf83b5fa6cc9de75fbd0f1ea469eb51b959c54be22a8f";
+      sha512 = "cd5e6c09f778dafa923ddbf01f24e1143f1c8719b2af5d2a4a697ce9dc6998a2893d7019762f1c87c80a190ffb42469e27eade981bf3d35f0e3428421fda2645";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "eb580260af95438e0d6e3eec37846f684ce61c12c09a0c563e66ae43d30a9f9cbc4c2c36b9830691d94f2d86ddce0a70b2996b82a9a9b14bbe00f87cac145b00";
+      sha512 = "ff892cc4b533aabb1821ded5d2157a594c7e0581ce59cab600c4d083d563aacc7c67ba58ac2133bccf31997a81e649eab87417485d7c9de1f93b3846df4df8f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "8f794848b9d1da7b4dc90fe91b53d16b572153a6f8cecbbb92fc0ebce468982cdac339938a4c74d629e85f65edc6c2697ab9a671b6fe9f3396c81a6503aaf967";
+      sha512 = "db3786087ea3aed24f04b4fdc94717260fae98c288f0df17cc753df572b092b25bcbbe08de765f76b84ac9e7f1d39bcbcc2cbb1372b3c76775cf2a55f45cc32f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "7cc3f84221270f495f1eab5a6bdb6e3d968edde0586bf6260b7a474ad2e6b9c0de737a0cebaa6c7a312fb5a26490336194915b4715d1e9939381e39e1f73476c";
+      sha512 = "f803c7b7b593b66baf6995ca9e2ac51613b668b878c26bfb1280ec4263e4ca1e4300bf4abf41b327b90736d78be0a823431a7e3c0c121347cd13d88ecf12da97";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "93961413dcd0cb6343e5b65793a7528e4001af511d04cf28d5f869b1fa838113a2904ad27d3e7bda0589d87ae0cf69eaea69e4d126df8c103a3a981f36a9d9eb";
+      sha512 = "27836c549263ec7ed275a9a65a3707e8b04f2cd6ce87fe29c796ecd6639a4dd95749157004e370876df058da3d452804633bbe34517dab186a54b964ab655181";
     }
     ];
 }

From ffc899dab1dfadba1f2576ef378ca3bb31dde858 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 9 Oct 2018 17:36:10 +0800
Subject: [PATCH 2652/3253] firefox-beta-bin: 63.0b9 -> 63.0b13

---
 .../browsers/firefox-bin/beta_sources.nix     | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index fa382a2bf246..a2b01c888419 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b9";
+  version = "63.0b13";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ach/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "34bbbd919c8b756392fb085afa6dc23b4a2101f2b089f1a4ea558eeefdbe5fa01334e8a2c45abb3ea2d5409f38693699921938b913da8195efe25353f4af9b5c";
+      sha512 = "f07014570689a2f4f55771d199340193a3059ae121e7d5825e818fc6e5245bce15cde80de1f7c35bb13a595e898b79481b20f7b80abe63181cb46b6f47da4076";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/af/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "62e754f4e1a1972cd737feb5d2960d2a9271695ab38fc58a53c62ebf66a889d724fead843b72ee7f48d416a1af66eb2387d49f8cb665fcae1be1ecf40f939f70";
+      sha512 = "76606553f77a5a0deb6e50908b39824242175b044ab1562b1276ba97c8bf0d24154edd46e67c13afdba06df6e65725e291d4d25f1cd9177265f747bf729ed7db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/an/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "8068aad55ca3d6fe47c19ff43b814fa84d93dc051e4f22197ab4b512ba525b30bfcb0a39d490effaea383d4841482c1415f5e0737957cdc83ad8188b3136aac8";
+      sha512 = "fa29b6af86d37befb227359254d680d2ce7eed7cbd4ff511be222ef112fca6b477fe3dd5c78696bcd71402aa4e99051ef3a0b6326ac959dc3262c9b8193e69b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ar/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "58dce7a3530872be9e1961c4a14a84e77d43d874f4ae0ec0bc1a9bf05e4f8264f832add17c4b05f6586ed7b456667ef85764786dff386feabd23269da7abd725";
+      sha512 = "1921963fd0a8b515c351d30d9b7683f7984e619e77df0f9bdbcae85b0a0c1e4a9475be238cac6049d61135677af26868fc91ae76ec2ba81535116c95665afc4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/as/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "7599160ec4dfbdf774ea12231fa1a06e6448304898c031d973448a04aafc2966ab6421a1952a39ab0faf6bbc41151c8f4da97af3400afc0ca8c2f2da74aadc93";
+      sha512 = "083b1f189b5b25f788d5bb8aa4367743a701e760e3ffa9c3d7bef8d221dccab9ebbb5c4486349f156bcf3cc44b90aae215fb76ea22c18b0401f69988915ee8ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ast/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "93aa64c23a9d52c67b3da7df22de140ca82e285cbfd55f2803cb55c3c369ce61c32c43383cf140b8ef884d137f072e258f13c3e657b10ceedd7853a84896b690";
+      sha512 = "c1a7dfcf12d8b4fd4a7c6b657436073c41a10cd4ffc1e131482b83242d8a023cc89920bae085a3d7e334e5f8a87be8e2c01967d3d5e76f687c6528af09dd2adb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/az/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7ddd48532987004cd48faee65ab93d6d6155df674d37ce744e06a32086e3e739355066b0411e673636d192a7d2610012ead4d417a1801fd11bef58d7b9a64dff";
+      sha512 = "febe74dfeece3c7fddf3d24e682f4c991eecd511702217c3e18941edb9ec6a5120b95da72bd7b7f5f146f74174a0f4624ff112c56e3d6d9cb1ff5e8e349a294d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/be/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9b94f1741354bd018b539fabc167b842d42ede08a7f91ecca731d90c8677478b239150c06b1fc29888334358b724424fe011630f2b8ebe8ab80557ef6e6a2965";
+      sha512 = "0ef2883de7eeb54eacd376cf00bdcfaf399f1a7761f2a26ce8756d70673f9074d0f919ca0253795db7643161aaf780461f238ae1065506376ce6511f0134444e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bg/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8f5f3c7ee95a7b2542de91262d2e67b5ad86a6f1b95eadd5852c04814bfe19600f6a4dba1cc872a09afc124c60e7a9e5ffe630d197f4bc41e15f9e5d4bbf3766";
+      sha512 = "df39cacd1c8b40c863fa4d64bf1eba8016f5789b1a09f5d3dc0947795e11b51dd67fa61dc666ab22d00c2d21c3eb3891cbef5e6ccfd6f419ba5ca47d8b98d588";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-BD/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "54c6be22eeeadc70c390a0cc0da72097468349bdd710698f7e1111c3f1157162f37cdcfa42532a80f2631d26ecd023bab8c247b2e1e4a73632e0f203aebb60ed";
+      sha512 = "8398e8048bf7f15a234e6bc311561aae170d97715f73f9d8fd1dd5441562158970eae4628cd16a67992edd14f7a38bb5c7c32e6e9b554b0d234d2b012c80f76a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bn-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "bae82b157d08ccb6f7e070d0a187c65dcf2e0d04ca2017658b523298aeb27e87ec1429bb5f8351baf5936599d70a20dc9da673bb7d46217babf2f5d0cc9f16bc";
+      sha512 = "56cb6e80aaa4e9d98c8baad5bd8082e580d9d43e86e461939c41eda37fb19b95b55c693ef2b3e2d1cca486b307b0a9cf50367f66844bf8ab04c36e69b8d97ecd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/br/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b3324be13c515feb2a91399fc490a736947856ebdacb0ce672b854841296e4a8912e0f26ec3d4b8dcec57a59eb178f01284098a3ab575c5f22984eceb1107b63";
+      sha512 = "408693dd3d83be1c61bdb0618eb690477c6249e1ab3b7a2ab5dea03e29fa3574894d3ea1bfa3c5d9f3c853b5385f456aadf0a95a2972f39cf559a5a599cdf2c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/bs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "90df8d7791f187e27d698552be49d29467113628a743034eb972ed79c6e054b64aa76a199bfb71f2396284250da8a599e57c85595a0dfd8e184a983cc2e00853";
+      sha512 = "afb9bc011ba0a95b2a87372de281024a1327d28b586e1465c7533b615357668ab5f89d1b6497e63b682dbc891da78f70fda4a70935380747ad8013a8492467c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ca/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "ae4326cf2eebfe722f12ffa6d75f1406115401edfe5503b49b116bacda0da94476d7a2e6efca9a3986f530d8ffa386c889ae3a2f559afc5fe7cc76681cfa8928";
+      sha512 = "3faa14062e22dcbde97a66541e5d070d1a02b3471cabd3105a5ca546df6e34e7bfeba5af1c106b3f0db11d33343ff7df2d3fb39e8b55ea3cba22a172e93eec6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cak/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a9218854b8795e0558ad35f210d29b57ddd285822ac7177f9393fedb9572b99567c580fea7c107caf3453323576e048ce1527343432303e3c4c0881d03732c45";
+      sha512 = "d1ea0e03595edf8c8a55b8bf60596aa866f6d228a28ca68f28b33bbee09016800b7ddde07ede3b1131f5502f57fceb4c088d977f2da0669b9b8771668aa77fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "543a3cb1688f7f917e06a23d10e5f5c21355fa1ffc01bb26db41b8867bbf42c185f86ac9d6ba5411ee5278bfcb7b32d2659d7a808da680e0dc264e492da2b983";
+      sha512 = "f3e8a43371919735279f934d207ccb78d568dbc17fe678a36c50d04371f55dae97c3a7ebb1f6afe16f884cab65d02bdad4e7cd59d1b34d59295bd90965159673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/cy/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "e06850664dabc4c90f9a9ecb6a11bcc5b8b7410a3402cc13c1ca75a92d5d69213f01cd5a94adcb45214d9fe334d537c7cf85fd2df0222977d1bd1a2c7f312a41";
+      sha512 = "9e053f5b2dd82cdc81577fc17b115c0e1630612b70e16d2286f4fcf7eb56298d88a927f42b387f298997f33bcc56e2b85b08761220193b486bab0a8d76a85de1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/da/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "185617b4af7374b7cead277667dea7d9ea13c6edf0e5fecad156e1fcc940c26c8022dc9c4443b06859a65cd979c82529032a6ffbaaaaf710f2b56c3efc3658f3";
+      sha512 = "8bda7cd63969acb27aba21113d8d44f833a7b8bbf5fea9af43b905edbd4e4db6a33830d4954af2635e684f04f9bdc35d4f4eb08f2433443c65704d8d482b7a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/de/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "17ee2eac1b1f978c8b2a30cedb19361a37c6eb77974a037d13983b774639fa82807ecbb9226d3916a9177a21d3e3d322db0ed2cb06ca3c48d32e9d264c6b933b";
+      sha512 = "640bc5d6195c7cc8291d890b707ac68dc2bdd7d5c1af1476482a3ebe8af738ffec60d8d01eedb11120393e3dc636d7c84403a28df579d1af4235e0d2831f3411";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/dsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "af6ef7176e9b93e04302675b5b13cf8087821e1e708721141dede14db494e997783f279a8b5cceee8283581efd5d04ff18a5602703ad87f1ac86a1338be77638";
+      sha512 = "55734d9efd54b0b67a7d8e3fb5b51cbe426e32b801037042d83e72ab7c2f039a42f9be4f15facf29b30e2b7e94ec568ba05e21f90714c5d42f9f96c6594185f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/el/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "1d225254cef8025eee2811d3ee8dae017c1a91e56e1bf749b2f88d0cfb784a384f773b64d394e56097182de5e74c9807fd44efa35fb1d27dc68b3afe511d5745";
+      sha512 = "c8f088dd546dd551c0400269a3cff29a79e9f125fb6a7f8faa558efa6331b5f34a389282e2a69a35f16dbea37826a411b9091eb0dbb5a2b2885bc84f493ec5d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-CA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "6dfb80b4f9b2b70651959bf5675b615eb096de271fd63bf1542e5d6b04a6c6bb850c520bd20240d757a5a9d84a524269495e933875fd5cd389da30cecab44620";
+      sha512 = "2d093cacb7be796934b1f83f96bfe0c8c453fff180e5e10cb467123d6dc12620751e0074679220e874163fea1ae49447ea0ab4a4abaae710a891860b9731c42d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-GB/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ea6a81fd71445400b500bcd3a41d3af15b6125d0607b54742120119430c3993f65e534ec9183e9290b674df271706b0b9c20b9c3fd482e79e99dda67f222e03b";
+      sha512 = "a791aec86b3ed14efb08d70159950bc5019f34b052dc773ea829ba37352fbf692c6e37df4b47fe256af5b6977390f0b47d82473778f489af3f43031eb83a3636";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-US/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c438b8c0a0c14575eeab5e41ffa5760378567ffae890a2cb5b8bb61b17013f815341425c489158c3bc6fa62e23a7316b79aed20fa971f476a873c163ca79bde8";
+      sha512 = "b815f79b53694e370d4a7cae85a2222b9ba245f9d84db424bf8c25b5b4b3bb95e3895cb3d5ba10a1d33b9e0459ac57c158d75fa757c8b923df5d3ae253289e4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/en-ZA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "44a5b04d64cb7f6528838165197d8be83ea45c0b84a0b4e444caf7f3b33d4ac8ca0e95fc8f1abf9e54b1b4102dda7d57709549649f9b7af35b4fdf112a266e85";
+      sha512 = "7769ddef410d868ef5eb8c9c2b205bc1083a3224eb260734363653867bb1efbc2b524444401dc6ed2e65e2dcd8849e6ae05b3ff8143a2eb06b266bad7e43552f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eo/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d5586193387bcb9edefdcc2d66e0e718b10f0790c29a7b45b0a7ef2382537a18d151eefb2a5e28af05078fcb798e6a6ca2b6dc2348dabfbe9b77b79fdcf6d9f6";
+      sha512 = "78845601a316d7d0902031a0909ccaa53e1c36afe1607150b28ab6e0067dbf4c84c6b08aec6b334ecf04d714514b02a9b62852dcba22b54652d0fbde99223210";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-AR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b2dbeaef33d58cb69ab4ae3474af984211eb180f31b9207a0a8de9801899b25aca63fa0164d8f631650a8a117b29078b780e90891e22fade85d1910d352dddd5";
+      sha512 = "54e0a9200b55e10a5a480d0df47884b2c5c6f3f8f11c61bb645a1196d00dd6c121ee9710e6b2ccc5050c659c90cf36c9489a9045800cd566d64628f7e2affb97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-CL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e28890ea9fdf6ff771198f5dcdbdd0dd0bb2bc85fc3c1d2e0085536c9651fe0c853be528edeef1b37f96c9623ea0f71defb51839239f04b4c79f9fc9f462def9";
+      sha512 = "b9f22d8318097134f70a22cdb21ce47300ee17cfc319dbb7872bc4ca5e3e7537fe255fb2db67ba347fc2ebf3ab2cbc8a6ff5b797385a0603f5a651a8cb820154";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-ES/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "fcb9cd80dc5d55394b47239431614093f40963a208fe0269631906b19628514a93e0777e6e05b703adf3c474e92613d6239ad889d1602dbb36dcaa196af74af6";
+      sha512 = "14cd21583ed2c74da7d75eca039bcec68689e369c4851062c5fa205488b577e29222fd6a025e5264d0423061d1c11d617339359a2cbcec927c453181df6b0c59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/es-MX/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2cf4f172fbac8ab6c91f33e177c7919560556733f5cb18f6ddea8f8bada941d44161b6d0485e04538d334854f629e54f159e66b061d65aa9d7ad27f30c58907a";
+      sha512 = "770cf8416d344ca603acde18841fb21ab1c8946e7a5a150876c47783de79bb43b85e8b366e55a4ce105b3ddf43f46272ee165deed6bb497471b74d849b858e55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/et/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e70b40ac7a951da75f03e04640d8497c8628aa1b3633df180c6239025538c9dc66008aa717022bd2ddabeb01b924b05e1c076775ea5188bd70f60c921477e169";
+      sha512 = "7402a094d60729cb28b71cb6d3774201fb6331fdc77321cf4705fbfa330a418c92bca2b5a7a3a2901b843d8bdb55045e339b0d87753148ecab699588bb1923c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/eu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "b4301494e41c0078fd34779a7da0d49efc7cdca25f83a9afc609b1deb1ab217cc5ede37e9c13d447e10cf2dd34b0b1b55a696b36beee96d40fc53f32e5d6f0a2";
+      sha512 = "485ab61f0e85bd8a391560f4f2cac43ab35b81c7fdf957c36ac21f7b25f9538f1d118041f44742b978fd0619a977d8ec69553890d8bdef73c88944228f63022d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fa/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9412d03c831ceed000d277de746efbe85347617fd15fda1e0649f546c3cf9a8f845230342af4fa629bc0cfbb6dea1fd8994d3dc392b0ea893e4aa9da0f076222";
+      sha512 = "3f82d765e55611f1204068f2a62cb8a51f8db0940dee4d184fd2de69dc2336a1b6ad6132ad6e0188fb82028daafd244a2c478799e648c74d8efc8c46b6309e62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ff/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "867ffaf66c28e111da286b3bd00605f8b5a373e73dfc660e0d5c3762cd08486491f25662867b964f24f5485bc41ce6783c391d7619781ce03d1576f9edea2001";
+      sha512 = "33a5c4fa3436bd719fa2e02fdb23f9aaa33303f57db7ab27e86fe86d44065ea5218ccbfa13b410b9de0525c0c882e67ed6c6bc7b6546501edaed635460e26f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b9005b63b6216f24a8d6be5acf2b086b682557dafbeaca593fa4aa9d9bcb13150443e97309a9bd585abb9245af37d041982088c0541b95391654eceb8c0e54e8";
+      sha512 = "43d44d212bbb8d1f964abaa553b26fe5ac1c14c5cc2bd535697a03a28671984559925eeb66e0301db4b5f4cca615e77edfba5d443655205a5648de8dde6552ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "a8bdb7f2a27eff5973ff6c15fb68842c0470337c5fb765d7a0874501f9bfbcbf1864a3a258c9cb56df5e29ad8c69d77bc8b8c5572b51a02ac077e572893c9788";
+      sha512 = "8d68e0667444cb5451382adf002dbd52f2cc755f0da0e91d5476c1cb88e62b0c1d14d8f796bd45940cbce01c2a180cde1ca087558a3e0985137f9f2db8ff4ef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/fy-NL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e5d9bb130212db0c1e729c03a7a16ba584a00ceb26cbfbc254b8bd2851b9d57b8d81b746359452d66a0dd6617e62734a68e88db6cc74fa8ed5baae063bfd6acc";
+      sha512 = "332a3219011cf0662ef0c560f86a7480fb270bf0ab9c6643ecd53f28b95cd7a8118a08638fd9b9197b2f6353bf3acf05656501ae67106cbde008edee87a8ba3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ga-IE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b582d7bf274c6a43cca7a441a36704a22e5dab8903c323525ce6b29949104a057d692b9d1e3190bcf254c4cf76006e8e312d3e835e160413e7b659f0328a34f0";
+      sha512 = "55eca096ca6a8bdf779d6ded920bbddee406a0f925b293b9c5c346e5542b1349811248014d908edfbf757c6510ca2ad561e97fa5b4557804f15a62da45afa97c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gd/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "028454bc9220da6ae7c45a08c897401fca9bb44b6fd5b358373c7c6d19673301ec1643578b386bc3d1b6faaa51e9df40ef31f27a829ddbde302b34a7473c0a0e";
+      sha512 = "f70cc87ecccb1357a33fc0e8e5a94a5fce1c4150d9f80946faaee7e6280bfb821a403b522dc6c1579f36fe91697e02dbaf79c1c83b3e1858007fcf7570e8c6bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f9957dd96b0b67d6f842c0908caacc747203cd143814c50c04d51387d869fdd6e958b1f0d262fdcf331f02b6672db738f4b55075de9d9036d3890f99e63f872e";
+      sha512 = "bc5fa19ee0f1b907bec355f2fd0dff4f5ff8797c8ee77ba4c9085119ba25b270c664b488c66600c85ae30c12acfdd9e8cf1d84d785743a62b85030f3739cff36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "c2346118765b436ea32eb56b3c8cdf3d4eb89729f5bebf708e7c7cd4778e5068d39d8295e045b1503c65c2a3388c98ab45532597e802ba0740e3081779204511";
+      sha512 = "6009359591c9d0656eaa2c371c73d9a7141ef99d1533db04003ae3d7fcc31e33694cb0e2d29fbedaa63689a3556c40b281a6723fd7a28764ff77fd2ff624d9a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/gu-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8cf5a1b00f038c0d06048ff88f1e49ef6db82d86b58341bd7b4758430ed2a990c49deb274ad9faba87f2531acd6bf4506886a518d02648cb0d8b33299ab8fb2d";
+      sha512 = "2f3d315c8424fdb5823343885a115faaf57732977fe535526220125d38b0daa3faaec89c196cf5e153190575dd0162988a26a7d483e96f367c1dc7d1753ca676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/he/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "a7423bb84d6e299ae39d6fbfe0c7fc0650e46e6509c1bfa9fee7cadc50ebbd161a8fdc44289a910b4199d2fe97028b7f62a821b321ae1884e9359a7b3283ed2d";
+      sha512 = "34577bb7b26c0c8fd8d12a278e55d89bc291e5c3aec101325a664125dffb4a33fbaa7decb9f75751ea3e83d06cff755db7012776ef1948789b2005edc4838505";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hi-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ae7404c79f130fd75943e9f1687b15baa7d29ae6dec176a5faba0d55c5d2795367b1fc8d665ef2c8f3767d70a34e4ca0efeef449f39f44ee0250100d6f3deb7c";
+      sha512 = "a4319f07f092d10afbefdb316d3ccb550dbfe81f886458797a23a8ef9633e04269d2c8839f6e440e91cba48554eb604d491fff685bc3773114c5c413ca760149";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c3f77366765494c689707ba0159c496c2bcd55b8a76e9abb49e3f849a99d34d7ff2a57f37b6468df91f91abfda87d142dd72a5ccdb4e5f4aeac6f6360b30767d";
+      sha512 = "69503b9c45edbe65c8e21477583bfcde353b588bfb0ba2686fa4e73f279f050a62a0ef5c93cea60e05e777175993302740b3e1907013c648bebfc318c05b72d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "591da976361db115ccca4d859ac1e105e8fad61f4e0b945643e1fccb77989604517421900889c2007248c672261c5e7bdd37c195610f9b47db7013fe5518c6bc";
+      sha512 = "8a45b429b0f338f13b59fde3b98455a9c57312030bde04d1ed1478c0fa393d0523b6aae94a8127de429d47c52ad997aee1e49bfb3fda051386365c2f772a0d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "9310a55c992c545cb296319329e275363e944dbdf9109fe75fddf6d4b87e33d5bfa5ce582235933218777ccc76ad51743e50bb2045563d8d00f20fb8d3359159";
+      sha512 = "7001c9ee64a1052d117e5bb649dfcf287982f55e5262baccfb7c9492c7535e975d831a92321fdc65775dc31b5abcc1bd2bf7240d7eea701bd2548f95ef646660";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/hy-AM/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b89921e45b08b9c8d93498b76a265cecdc5d15a6ff12948f7ae0f4de414403e096ab238e115923cc51541a4d220f4efd7a2840199adb852527ed0f53b97076b3";
+      sha512 = "1fdf9cd98aec5cde88511fc3a79ff43c85185ac2c6008da6b432aa870eb3a9643814cea6bf402a17dacc7f2ad2c84a95e19a2f85180eb87e8a365e64a0e6a532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ia/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "5c857e348ca910dcc200ebfb3d3d3afc9ee30f00cca22f8201587c8f9464317690e330c89c244877a9a5ad12d090a47ef0ca8de725e4ef9676f55c9a9a612108";
+      sha512 = "6ffb602151ac4c9d9caa8b529caceca673521379fae298a9d1daf9049e0d4005a52adf079036b340d9a4099444404e9fed522011a953bedd2000fc7d42c0e03f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/id/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "ea5cb9b840cc20d7f1298097b2aaa35966021186c5b59d39b47e58c7a6701a4c7029e1e891273ec73f937b237068073e91cc416dea58864c907cdb0979c7b9d8";
+      sha512 = "bc95099398a49a8417a8cbd7745fd3d07788d6f1f4ccbfb70cad2e705ce45386e7ead17a1864755497576c3055a0ce05007c5a33e82db2e1b8e41995e68b9c87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/is/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ceccb4d0d3388866488adf59a12de217cbae5d26d679db63b132cd4ecebb8dd1fee754f9fe4e3419718a33cd8582bce983b5166639fe375a1a3c7493749b2b73";
+      sha512 = "09d898308d707dfa60ffb05ff816ad10f9d5acec5956f634b344f345c19ef47621512da73b27ec59db822f6c66ebf478ea83e43d6c1c40f5dca32f824542607b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/it/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e1834195e237972c48d5b7f237281cc6e1622091efb8aeda4be6f4ecabe04b8f51d3cc86be4a1aebb50cfeeae039deeaa758a23bf4c36ea57d927c5a57c01fb6";
+      sha512 = "7373941b6f58e72a99bceaa18ac36922ac07f6af3b7b0bb669c223644f52b0253912c4ba199094d7d1faacb410f445f0e13a9793b0ad4810acc387692e9d5262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ja/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "65f07c789cb22d0993065e592be705ba80b03a9453770f0681bc355ac6aa32d7aee6afd2a4d106e39cc763dda9b9578213647dfeeb2db0108f354d64c5c9121f";
+      sha512 = "07680a13fba7016b030aa70430094250fd75332675402a051501c1c7588869dcf0adb52c1c74366ad12291bee5f43c0748637afa465cec5ba9a9675779e4b0f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ka/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7da0dcb993d25e4642d86fd1ed40d88328cd380dc1d9e037c7d771785c128e085516ff302e168d6ba08ef27de47c0cff14c5a2f6cfb0d7430d9b2d37caffb5c2";
+      sha512 = "0a2a7903ce148d8643a51f0dcc30121245a05fe36928a318a12fdea3708cae991978782565384ff4131f0551c1deefd83b3c636eb461b69eba468e4781f2f03c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kab/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "2c79187951b8225dc88130e1e37baa40d3b9aa8a954b8b4d51bd23c713e96f80e9205f902346ecee1229623be64c59b34ade01a1aaaff10f7786cb80f3af4a7d";
+      sha512 = "3d6151e50dc676d694bbd88cf3947ac6bacae371ff534fc8d5cd20a0a670056f7b3bbbb490bb44904668058660c6d3937b713a5818d5d69bcdf68706780ac9da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "28ce4f55d95f8db27fd246ba812fb9d1ab2eefb955e544601429caeb5e1767820abf8f5cdba693033b91813371ff1cc0bb106ed88de869866960aaf92aa57d31";
+      sha512 = "7984af247c9e825dd25c37d50443f310ad5b2575a98bf06abbb734511b1b9705196260f82e40f8fdb7c9298cbdfc314f4a4d3516f6bfc99c5f0ada945160ae11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/km/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e61a3a5cbb9c5c094d2441511db8b6883e2a5a15180d60f03d05bc597eb260955341a0247c4191acade5fe26806e11e660e5d9360d9da4f2e6a88ca8b205fca8";
+      sha512 = "e0e565783f069f2484c70e74f1fc6c0a4625d8d6b2fc80bf87f757a04ef9f3b86581354b84b64bafb356f01f5daf602bda845f376153b753f2144230cd17ddc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/kn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "e6fa91115190efe19e210ff1f77c03dc3b5529903664ed6ab8e205843df49523b9b4b8d24ecce8c46670d2a9512872e1f406c28ff7127c574cf7402d869888b6";
+      sha512 = "28e9d308d29a8400506a497a2b2bbb3a8462646c7c0039015d74e2405971bd17c53357e994ec24bf61593e64443c90308034637e25b52b61c05c1870b8cd35ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ko/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "373738364d15ecd81112a64e8f32822ad00994a1e4014c33631f05c4ad3656e7398d8ecf2ee9988bb3a885282190599c2b19941457ac405438f6f5304a92e6c0";
+      sha512 = "de5cb0e68eedc4dc3893ddd92ae1380ed13a3c629af353a84210bf606fec6afc6a14c34408e84a9671a489a73bc1e041055dedff66d903a832878b918ac22814";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lij/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "11530c0504400332469a654363825e08b5c338c6b8e27be5721a23ab49ed69d8a69e97286ba5e930ecd9a67cf17e453dc130ae8f8c100450f6fdc8507972d8f4";
+      sha512 = "bdf96509b64cd3d6fcc6fe573409ba95252d9ce8b903279ec866a796b2f84da09d1a8361fbded06f5ba7a632b4e5b9dab5d278fd5307f09274a2a6f1921db524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lt/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "63970fb0d3005a4da865789623d302f45e4dfe5e140e6a7158ccabdcafd53a48eaca43a5d016c7bff3b522888c8def078eaf95bd8b7cd8710df492d89a7c8ca5";
+      sha512 = "7533b8894aebce270fe279d38ada97f2daf1e21f412386e59f4fbc8da1b833d8c0999102870ad3ef77274240ba4428ff44a3e19ce66e7d8502cd09fd9b09c38f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/lv/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3b5d286ea467cbf1e3435ab13a1a7ca90694af534a11b34e2efa1b3eb1dd4d9bb18402959c247628b97b698f0a62447b23027995125387e1be84dc39e42584a6";
+      sha512 = "207e76a7168535e019e302996fe90e187652e78d114119a01b85247bdc2c35c8f99a1ec7ce4aea50206ef3515f24b21823271d5ac708ce48d66dd98ef65995e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mai/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "da8d85e7160207670043fc03f2a7bb1053fe6480e0a0e5f5ba583dbaf922ebd5a77b5faa6c3ade512c4ba53378df083b8c9a59485e5330a63fb9c876f6b7f4a7";
+      sha512 = "eb53a363dc68e5ff0913a264eac23fd55966d779a421fd73adb8ca48343b31a72fe4281a25875c4bf75df1e600cdf8cb15ac2444933cfbb4239ea097fd337c8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "fc375837230aa468dcf1e5a89a162f46c386f95d07e007698470e5bfb48900750709dc57a723bd54aa89dcb466fed768cdc4ac5edb2acc51b3cf56fec2c22e79";
+      sha512 = "cae33d4b6712fd95891da966e3382c6bd3d9cb643a1a8e38a56de719f066f01b0219a158faeddf8a001021b489cef85369243ff51279261bd456f70c6da759a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ml/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "f4d8615fb76480b4af8ba497632c45b06c0e464109ece1bc425dadf376581b01d7a34540178334081b485ec280de46d83616b0570f50eeced483cc4eb6bf344e";
+      sha512 = "d6752487843849640e2104c285ec6c0981cde2905b25c2cf93a9b4602322fd3f232043832e933cdfaad8552a137398b2bb70fed7846a57c67703372bb6e710c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/mr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "30b7e1c97aab33077d1c322f3e25391fb3a47378e8365d7437e0cdb814a45ccbd5e7f03129aedfb83f51ec06785427dcf180f41ac247f562cda7f32d9d6ec060";
+      sha512 = "120f02bf41cee52f8a0d0244622c02df18e3870a389428aa2fd2d3f3b3ca4763c3a1e2c93b68f2eb2efc57abc308838128410abcdd6edcba7089458771eb4386";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ms/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8aa1546bddd95c28cd155e614532090d01a6343c46f67eb55ad9b82c48f6f0b83aa27852b67756e58869496b4c3ba3b27cf130a69c24ace248c092cb877b87c0";
+      sha512 = "813c1912d70069c36de7c54a6797a635c7838d2befa50e9cce21b718ab4f00443ba53f714b8a6447aeb1b1b72e02f4c66f31436f17be7b1f6e9eb4bcdbbcdd13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/my/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1e38cf10b3ae242610d81a964e0816cbd947e7cc0ca5445aa3cc4af14e27b4e4ee2f7325d9011e01f3b45a3ef1ef8c8880c80bbefd9c88f1e4fddefdf871c74f";
+      sha512 = "bb112178b58424654e0f384733d52a2f99a3769f4314b62a911db7bc67d4c08b0a75c9281fe853d774535cd74a14816e78bffd4df00ea50534b95c113d79e212";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nb-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d5ecc468ee26cd61f65984ebb02e21898a4eabbe3f81f3dd98b127e4b98b14237b6c72b94bd96e890e44a3a92f70d9a4c3734d80bf52b58e2160f3d3febc831f";
+      sha512 = "e9116f7ed4a375c35ffe574194b846c336c1603946115eff03fc0a79556a7ff4ccee5bd2853f925aa08e4f7c40b596644bce09b3930a0c541a00c134f2f68da5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ne-NP/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f0ed61857efb6527ae2d1be0e141e61c3b43d7e1a4b6415b2d7717924332603910d2df02f9124c77f67736b776eb99f035498f104fe863b7dc071a7f5431caa0";
+      sha512 = "688515bfebcc238c16861eb2044dd6f715e08f61eadc28eed5bc639138e32b94db74e4e9f06833bbc81cd681473dd3e8c3c3a3c5cea58a476eccef7eb40ecb81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0b4aad92078da9071a17c0abdcdcaaf800b2028c4154d35974daebe6253427cc22cbf322f974acc84b4f6ac6b669088813fd3bb6f6cde35155f281db0656f7b4";
+      sha512 = "23fde17dd874441f13c73439f9ddccbc08485d21325fd92ff4201ef61b969e5db30b1228bbfd0f6f32ac8a596c19e44e8edb8fbd28e910b41b2b272afee8e19e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/nn-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "cbb3cb267763dbce0ab77aee54b2211eff26f7307ff6a7dfdebd8f6f1321ea3ffd396bdffec17ebbbf7a274a4d37503dc9f0b70cae0854c740df158de5360e36";
+      sha512 = "f90ba4addda86e2b8fead3e1d2ea3105204e5173b85ac0ede40a2d69b5b9a3a2c29f0b75015eb93210909c61df8f73ca8bf9c428767019355ed98f402be5d7ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/oc/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "26656804968ec7287441bc28a0e5d6a43d8c47c922e33784e2186fe3552c68c054602483b99cf97f093fa7457bfe07f94d0f6838253354283d3a705b29cf5313";
+      sha512 = "af7672a5cdea2e0d834e510711db4d1a2de541c44e97ee501af113d5dc102b2c5bffac86bdd363d2b541107ff1d121a182b14e90e9a68a8792977a3e73361023";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/or/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "fa55e0b1c927d698bc0c640dedf0b134996b56e12a73ea493f30c3321ad4df3587dba0829f1cd116f95d6e9bc5a35732dd32a4b4a1b9de611a70e93977780f47";
+      sha512 = "49cedc91af113cfad9a15d6933bef8c1bc9c6d0174cb1d6f57aded210296db6a248561c4ecedcc44dbd605922761e220404c335b0e7206402a4ff6d039b5b9c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pa-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "2a394a2d29ff2c63f8db24c09b85c4d7a488a4e0a4b17121ca54b95a0c7a3f40a12c59105c959eb4baded027de8301ea7161475d3f4130d353e7bd95e2d36cef";
+      sha512 = "48fffe7aac458bf9879c6471733d7d0d4fd43b3609aa3ba04647721e7dc60be609009136d42e58d760a4ff298ee83c2e624529cd1b08daacfe60d7bfec7f1f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1f4fadb6767b7c58cf242c9714925aabfabd9a080a3b29d39f1002b9f01e73b6f19f39427d57c7604eb3f3518922ca4f2127322565080817e674bce64aa6f3d6";
+      sha512 = "a7c613e88606be20d514be2e2dbd2a09f94fc500541ded40ba73b5e4c66dcd01ea5f7a96a55059f0714d321f712655c67ca86a0a328783a2a9aa9ca9d2802b57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-BR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "e15090e6a2b79ba0829b3727e6ef7349443b51263e596a39fef83951142b6ed0ab2a10bdad9afc1b78941f1c38c996b4556548bbb92553b48335e183c210f92d";
+      sha512 = "6ab1c44c2a04f14a89385a2708916dfaa4f8d095a56c1bb1dc06c4e59a23f5faa356b1e86d26a905523855aa11d332a9f290291953e6fb9517cc73318935e0ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/pt-PT/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "eee661bca9d04cd7c479e1f371b0d426061ed691c85067ac3c36e9fa7c11aa03e1bb137459fc3f638aecc17e94254d4f4290caeffcdde9225075bdbc3b68f5eb";
+      sha512 = "965e5973a197f1122adf63b39e9dbdf1e2cf88653c7eb3eeb77ec498a1bff5abe54ecb3b76d2e39e267fb78ad13417e376e0ef5aba2ebee7ab21f0f4735a006e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/rm/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "8152b4f2811eb156c45850851a801e4d9c3f235357a0a42b25f4257ddbf1e4494df612f5a94c99e7c3f3927f94f697f34dc233d4c88c042c17648b538ea63968";
+      sha512 = "e2eadf2a965e62b9fad998d3897eec6f888c95fd52e149ee85a2557ec5c7fb85f77dbe77817e919f868cd4f50d374a4557815cbdc6dd7219ba9260ee25c804bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ro/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0930ebfd13a5ac96322458fbe4ff98f0ad2faa69de467275e345f55ccf836d4393d5a78f3d47f363b73602374a331496461f68c1a76eeeb7586ae6dc1171ef7e";
+      sha512 = "d5f848de1c19d1bfd9a10e14c356002524e07692be8383ea7d31f3f30b623b2503b986ea33f7c1cfcb03886652b551d58b1fbc50e37f02975548e03f490def07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ru/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "618814427d173a0219a223bf3052bba7c8c7d22e244d66ed1fbddb061bcdb786d78176842e34ee0cfa7c739f958043a52a6f55904512e766a9315fbcbdaef351";
+      sha512 = "d85f76ef591e0349083681bbd24d2f7fb4dc2a7483a21665c1f9b71396a29573e7aeafc431422bba271c63eaa4dc11b9cc87036338cb62084cc5e13b4b187c2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/si/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e5407e2469f78e73a78eeed46d0e5cb310313c5bfadd0dcdc12670bb63f8e399b7bcbaada3ecd17e77596be4fb15f28d1706a193743cb7d519f8cc0350b8ed30";
+      sha512 = "e44299e24ab160ae39acbc1b3b6ccac1e8eeb30d99a2a60fa39ab7bb1dd1c7296383040542cd81da8fe8fc5a778eadc10d90ade11346bc8886b714762f8d2ae0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "7eb1c68eea484df32aae65dc87961f58c59c97b31a12c5e9de7d7805cfd4ed9fddbd1da7fb8e7b9857a835979b2a6635111e211f72bc1bfc78aa0534b40e03fc";
+      sha512 = "20c1a9437398ab3f0509850e23fbc8dec319fabdb139d0e953f3e0782df3f355fbc48701a08f13ead7689b094fa1f7df2308e8e47b2095d55ab5dcfa93f701fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3574599de52fe2c887cf81992f9cd7302524082a00b26324d3ca701f2eb2c59eae870c70abe7dd424bf9c0a2ee869a34107265c0d8ea6bb7a7df149f12345af1";
+      sha512 = "ca4433207bf6321b822e273977c3c432a322c66b9132cbd91fa0993eb142997f304aedf5c96e4e62b2fb7b2530942d9f48bd40a329d10266efe9af8c062de89d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/son/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "6487b05d6b6657b2565d506ce7bdba7cb7281fe6d0acd5a20052012e22488acadce65f238c0195e089c2da4b9bb13781e5b31b2bb85208da9622853c12a8f648";
+      sha512 = "4534137bbc75738b4246d899ca5e16489a025b37315fa81e6bf0bc71edf4736749e90c953fa7dc7c829f1494f18d7c94ee84b6bfaf70ee3ccfd11b8d7636323b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sq/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "e69a3757a5c752f3e417787c4cb02c2330a467ff76c4930eb4c32faf64e63943162ec0681af1899b8e96782de6f50c5c31ab25e7ac1f777b52e4da223df5ee49";
+      sha512 = "b2bf90fac89b89f3d61aebc26978120531d757c8500d2ade97e9c48f2168c64cb8da1be6d6c3c8ddffd23fbc463d54123e322b04febecfccb7bd4327620aac99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "38c57fb51a76c912d07a9a56f81f4428aa2fe47be395009af1e2b6221e0baaa4f3ed8d31693a737d615b5e97d8fcec33ef22a3151210877e625c20759b355034";
+      sha512 = "4c28ba897cdfa60f548f52ee4cd98444010204a59efb7fcd8bdc5b6318a9f001500cdef11c7b7ea7637168adf6491ba269c30996ddcf526b5e1a2dde1388d6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/sv-SE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "6b2319ce5e131e05419b946435c901f654d9d3b35374396220b89290600ac05a6df41cb344f0b3d6366cde1693b925870221f2d8f98d69e0f6bb41f0ab6e4dbc";
+      sha512 = "04db58a9c1f80d4fd77a32f663ca95aea107b61c90fff8307b077c666af1369536e668c60c89ab8ae92b7b6a585a41c35f487c92e96484f0ce0c138525614e87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ta/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "39641d56d492786df53a39dc9a12c26aaea0035895b225a4b0c82484e32ef1a907a07d158e20962d3243cfa7bbd4205c7e3bf7b5ed5fbc5ac92e0e28d1cd6f35";
+      sha512 = "5a2efde48546042d640de3cc76f6e7918ccc8b34df3c53935505b321d23611d86999b1c3ef00c08af003cf7991b7b00909ee5825251c9a13521e1477bd9242fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/te/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3beea5023cabd7c5c30e9d95eb162987cf44dbf34885d5b72e931adb0ffa8385be8a72190109558a6af7050cd479757dd5426553c22a321b4c21073956e5d1ca";
+      sha512 = "cefe7a27d4a246549dd19f6c95d99cfc21ccd8b7b48b57425b51ff081cbfee4e35ee06350d7b90f40ed60029883ec7ad3d0a9ad64bfd851996bb301279a688b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/th/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "40eb8a38fd4a66d5a1b81563b05dfc5d8e22767ac7e7a69f47c02ee34d132868e9b2b2be3591c6183e5e9c659e8e27c99c7e002c8846b069233b91bb65c1552a";
+      sha512 = "68a997083d7c8fde45746ac55c8994f54d87b5ffe48c3aa1fb83460ac5bb61bd13d5b9f1d33e2ec6e6c2b9c965ed7ea8f1642b3145edd8a4977206c38da42044";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/tr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "69214b1e322743ae364f86efe15a4589b283ef2bb19cca99dfaede9b9672f79ccfcab5b2929f910ffa203a74de9fb6ac2945bf79af55a701394ee499a0f7278c";
+      sha512 = "02718cabffcf3585faad05e07697ba1b832d2af7fe9c99adefd4d68b2ff19773884467fe3f9c6fe6cc0e8ca47056f500f4b76b184f7fa8fd899e9e26c024f013";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "3f8e68f2e665909bd531a24d6d66d1f8e23bbe3c6bb40def5c28e71a8cd8418ab604adb19750d1ac509e583264bae41804a228b854a0df479a2a32aaaf452145";
+      sha512 = "202043343fe98673ad33d032267a5696d0554348c709cb2e356136a6becd5a0e2c1147d07fd752afb80384cf13a56296b859c4b771ab993d5a3feebe5415fecf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/ur/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "3020c7e26afbe079c87c4a64631ccf57003135fa2e06516503bb40cd0e499e935a95a94bd729890090a4037bd2bd400a68d68e26bf8b6af91465dd5235310abe";
+      sha512 = "834849bea96f7176bd4b897a1877b56447674bd32ed0bb5b15715fb5d37fa1bbcb8d10af459bf08d7def3f973489aa33e6fb359be81f69a5492c5aecc20c57da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/uz/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6b7895cb2425071f77705fce09b7de49e01eae4c00af1d35fe31783bfb83d62e310988c73612689aec9f05b3825f1fef663ee7d42b52ecc84a04a3c1aaa45bbc";
+      sha512 = "b360d917901e693c29f49bbb349d10bc4129bffbd8f105b2b9e9e6169dc13edd0d453368a831bf1be21b5d856766bccc4536f50727b5f7b7a6f6d2fa287bc803";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/vi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e34f384f75faac4bc45c9cbc0d92fadf238b8d9d0d877312b3bec2bd9e47ae0bbfd7097dc647e5b4fe68a28fe351a659600bc860f2caf6fb6a9cd9d22ad7273f";
+      sha512 = "279807df6ac7d0a19d8010311973b5e623ec91909d952120f565656fcf78f3a549b3eeaac3fd27ed1e30554a7b57c4a129757f37bb8971fed7785867277d14c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/xh/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "e11dec71ea6c8cc54cc785f264f280c4983fcb0e3f5a6c21e73f660d455a1f96e3266fa5d714072fd868b09ce381cdef0f6497948fb4dea44adb3a89da901db2";
+      sha512 = "313dfce1b88243761718b313b0753e09def7cfef69c1f65088872543ce31c6957739dec51113b301c5c788d1b89aa173d750c3b214dba6413fc5522378ac333c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-CN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2a1af884c86303c07162b3750394d3ab9faad5f5dd8d1867ae88385b70b66b757c53afdb51ae12f1c8ab7f57c347259f561d176dd9104068d5f3f1271fab2d4e";
+      sha512 = "1351106b16c20d80eacea77e26ab6235b00d16f33a94577184f61ce926675bdc9bd662dbcc39cadaca18c9ade0ba786690b12aea752520c671157f5525f581fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-x86_64/zh-TW/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "b9568016dadd0fee3c01e37206b515762edd21a558b523723f6764f469af99054f5e17712327ecb883f1a84ed799bd263e11fd867073ea2f68a238b78e0b189f";
+      sha512 = "da9808a83c45d5a233aa1649a7bcb7d88fc3fafe59d93d9a872de2902b8b0c7f80be073f905bc2dee587b53bb5d010e66f2926d2c35d50a9237884d3d03fb6b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ach/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "099ee11bce1f4cae44427463b45713821f2e0363119446c3ea04425504cb2b812f9f9c28102b38fd65bb4115d38ffdc0249079cfdc3f850c3a59755f6429eec6";
+      sha512 = "98f43a0ec582e6753f12a079f07a4e55f8e699b9a8624a632e141b09afc8484901ab3cbea5609d7cf2107fd90da3d10308245a28ef3d93e07d35cbad68200bd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/af/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "77930408b3feb29e49582ebabed8859fdfd488feecc250aa6c8315975d6cbff09a551ab5e3c4330eb3d4ed8ef43a3c4776fdda2bd2baa876591f634a4ce0bfbf";
+      sha512 = "b8ab0b90538b7b8ced483b2771c8340228d23d39f28413f82468626553aeb81169c629fb9f1a1b4e17ac312b8bcc984ecfe711e4a85af8afb02ec485ae589a64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/an/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "0c3b334a51ed74cde2296745177df5ce57eedb43644af43ee16cd4fb0d070dc1bd117012bf5759975a708098791b6d0ff637a0501b064874c9d8decc2778111e";
+      sha512 = "43b923b7b99c4aa1a3efda001c60b9570f15ccb648d70dba5f7ae57c282a1923d310ec48b3424a641d8508d05a18a1da76fd7203d947c9383695d91d2b7e2da2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ar/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9591eb30ce5bd4779629faa60316651c90e6c97754c8580dbbafe7ac85d345488b4af613068ed5778390dbdf9e1e06cdd28f9b758bc5940dd87ee39b77bc31d9";
+      sha512 = "562a1a314a598f442acbc92a0d752e48136dfb10303e0dd51bb3ab0a2c2774e5f5eb3f932d9a880fe37674be3288f5406ab4a0251aca2ef1bb3d23f5e0ab303f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/as/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "cc3eb28017b91a77cc72984669cf5f62e7ac4d9fc0b415597cb4216bbbc62028e3864ea897d3b3ae616da7c603fa3109456b1bb331e712fcdd10e48151fa87dc";
+      sha512 = "acb3076508c51621d11ad6c0a8031e6aa9f26fb376fbdc0b1eaedbdeed5e84e61682e5f1d45511567e1159125bede12be12f0e0f7c716a1addca8affe12cdb00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ast/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "23c04d3674afffdea2f9abcbd0fcffd45f9e6e1c7288fc22cb457f80c664ba25f89b154fa1ef80a12594b93417da943eb12e803a74c3467ff523e27feb3eff6f";
+      sha512 = "c262869d7a4aea66cfea24911cae4e43de2a17a371167f4d78f3353f598187a1e6102708346afde86166f360e9d42842016f65a272d9106ef54938e21048a83b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/az/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "2c99eed922b254e6b1f64ae62f958a6156de1fef5a26185b1d70f5569f4452f52ed3b58dfeb3dd0ccd121fdcb365c68a613d25c2d0b55b4ad15b5a91145e1a46";
+      sha512 = "a9da5d539e4ebe59b1d21b21bd018413e935cd7eadeb60c437f3a5e972851b1087a2269d31b414a17fc712c1f9cf180287b8a69d7b3d4faf34a61b555d1d109d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/be/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "1d0299bdb7f4bdf8967888e1e749c0f84a96bc2f9b7ac6cf857e0f368ffd66df08dd65da20d6a8c93ce5831f9328870c5d50078e29a3698e521a5dabc19f49b3";
+      sha512 = "661f58b200c1d18c4b837aec8b2ec334270a06d68ceb48b4d6cf6762ee8fc94c6c871cc9bb956ca67c2759da3450c08fd2870bf32f88798396ccf3c24ecd7fe9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bg/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "4659e8ff47719639f6fa0c16c974e02ac73d4bb51635352647bf006238c916280217c9ee2691723ca40ef10451ec5940b2317730a322c00c609f01ff68634d06";
+      sha512 = "f8517bcfebede31aaab3c20c10be22b2dd4e9ee56ab37fd8c0c362933f375189ad41df04a2452b83759555211a9699998143aae224f688473fd4da8d258e8566";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-BD/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "54b366a1b07867d6d24d051eb367183489a0bc87b5ad72607aa1c6f7393f0420d7cd38d1ce7c2ed5cbfd910fd1c9d0ab65fee4aaa1a18792e09798ef85d44098";
+      sha512 = "98eba90fd685eb3e5a22f68027464735e6eae764ab5063fc3b49cb2a0888839eb7fed41978ef9edbf2729a66278368313a61363c7b0a9abddb68d7a93a22fff5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bn-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "6224053e229ba628ca78e54bee868113709bf4e6e559681e74d8c6a656958842f1d9f0e157dff7fe003215f3880c237e060ff5b5c6b5ac9882237edd8bbb90a6";
+      sha512 = "e916abc4c8e0f547f0f510a2919637029d9531dc275e8330164d0092864d5912697c89ea23100c1c411632a6f4238554e83162aaaa50f23d85534838e05d9b87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/br/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "0e96eb748c5cbf4d21ddb9ae6d98d4c87c54db7c6f59205b77365522137598a29f97dcce47f6d91ff479fbd5830b316e29a9a36f69045d5fb078e340309208bf";
+      sha512 = "db5c9c663c0b12654602ceb5b73033cc97c0d45e3ec6b5d755b94ce3daf7743417777fdcadd8263b1272f7503ea6ace25358285fa22a8fcb7d4bf50038bb2727";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/bs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5eef8480eb7166c78ae9552e783ada29b1a2ed0774414c1807089263ad3b6b4726ace0f68af4454f03fbd379cd9e69d7963ed4a9b23ea383d71f33f2e77af5d4";
+      sha512 = "4216655dc3ffeb28fba06405b5854114e0ed5cdf014e3bdbc3873083a27b336e5348b326b85f09d690bc6345589889738f5ec92b0c1776cf93bda76310d3e117";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ca/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "3480209479c215604c4f7b34d41b5d766d4c5a0c3d6e5d71f249a5c27d22c2049fdcbedf49b766f4aad950d1601af061e98c1be22c8d919ef3e78d125a8a6ada";
+      sha512 = "164b57623737c0ad20f5f470b39293872aaca3018db55f181fce19a40c11650111ebce4b54b5fcbeea7292455f9d5ac7f5d3c1460c50c1b577b935a7c8738d9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cak/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "6a8e24323139654e8e484699df06cd6109f343a9a7e524f50a8f5366c2de2869b92bb56b742f9ad3191830f0dd62a4bf11b0b60c40214ea1b32dc56235ce04d8";
+      sha512 = "e7e03b8a6f70978528d9d0671ae0dc73f78f6af998bb1ca6c84dad5186559087bda0aeb1c870c377eb009e7ad6f14490dd959cd28beb564731c43b9f699ebc6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cs/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "3cd2d6c739348e939bf84ab793d3ea105e37f16aec9cb353c31f772219be2cb1ed4fdc3fc99b71754e0450545086694a94e86c53354c7dfbec7436c655c0aa04";
+      sha512 = "b0c17ae3f61f6829b7d578968eb1166ce4043d33b81935e1c5ca51353a0bfe64ae2c326ba555008a30c59f34af72ab8ef8460e204caea203a6b174f2e3b92993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/cy/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "db650f6c6201c8d6885a364e3477c8f0341c526aaa0e708039c545814bf95c66b516275ef464a1c1ab2f1bc4d5e7c58d03b4d6deae8cb6a4de477f64108f128b";
+      sha512 = "88e93d54fadfa6149c8de03e82b898ab4c319cf66c0aa1f6a16b24f73815031a943d0c91d9b382e97c29ac0bcb83f09cc391e01b7bd3120e8f2c9328e85da4ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/da/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ed189013ee62440e2f6a326e2ca1ff3a0764ff589e514a2eda489e519695144cd9378bc78d10fd18bfef65e39a27500fbe4f09c64ec9904693db153d83b884b9";
+      sha512 = "1ff1029bf7486c6ec3516ed7e57d22d0dab95bcd8b21aa5e60d32c630ff88c15eaa484892e35a473d962b89f49b281bd25b6d16db3a6446fc9959fd64d75aab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/de/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f77538811ea28c701db8a4d38d9286aeb6782f4b56153c98d2133caff823aaffb23a3b3c014adb09d2a5c295a68a8e0e1a071f41d86ecec21c6f284c52a9338e";
+      sha512 = "6523e7ed4aa0ef502f2a64653c7d06909b67c6a8f173295783c97e97b39f9c00b36b1f06038352bb2a247a156e4a1310ff0fed5b688a5f2b84efbad1d1406362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/dsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "366fff164bc3dbdbbc143ba37aa3a66befd5c2bd89bace5c9bb669fa5d812e7505140405c08919994cd65e937e91035b9c62bfbb2a5668f4273f295fc6dad485";
+      sha512 = "34aae423aa61bbe02f31b07513cdd4734d94dca42cfd64dd3db7f3e55529316815a266d578af1771135a264e69b8869373df061370e4046a2046ca1e0f75b74a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/el/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8898b25d271037fe02772270f358ab2e44d286bf1d5be45b67d57907ead81be2990aec0104e724d8d105793e45454d571e7eb45ba67dc75dbd25ab0a467f698e";
+      sha512 = "542ec3370d58e4ee767013c3511e7e04e76d84926f12986d9e9611dd337c1a649de3e8bb95365bb92f339a95058f8cbc9194d3f22f54f96504cda24860c1fcc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-CA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "5ee77fd93d9b557fb729031f96880b9ba72990d47ddfdfb3e4eba38a6eabcbf63587b0892551b1d9c023472fc8681deb529c6d4f8b283d11b4832f9e2992cb4f";
+      sha512 = "bc11f690284b11100608002f3e1402f758d9d1cb981390f14d16c841ef605451b7cd043928ffad60c3505423bd89f7d3dbb268abeb8f1835aeb1d2ce185286de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-GB/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "74e415c2545b0fb760be6c459c7262e309c72b3e41a580e36250f381a74dd1d48a2b62db4ca93274dcb71b0951cbc42f897275a8664242d0424281f227699a37";
+      sha512 = "9fbf9ca0c1da0a80b77c975a980acf7afb2ac7f99c3f69a1d8cce88c8651957e1e203ac97fff9a67965a36d85f09c7a80e970d043e0affa2f273615d8fb9aedb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-US/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c37ae4711dc74c4beb8bdac272e0e6353c4c88b170c84de86003c11d0d7a6d615f28d567d2e3a36b7dd9a06eaa68f21a5e2e64d12ecfa8c4e6f8cd2eb8eb9925";
+      sha512 = "25d9a0510fea951dfaa432117adf90591bba6dfb021fb18bdcd8849e71f59e8ba3ce9067e8291dd0d7769f1d2c8e5ac803c1d76d52e98e8ea7233ad5daadc45c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/en-ZA/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "bbfc1d6bd97fdf2302c399ac1c0e76f949b73cb3af99af04ec0e502f2b9b0e353cc3ada738dad6699cd658170098b6f87f87aa231e563d62527f75106e1d101f";
+      sha512 = "c8a6ea2aab2bfec44dd0d13d3f8f8f3e17377f54889f9b13ad1e6529bfc8b27a4f08fd287964edb5f63e8bba00ab961e413fa23b37cc05e46e050d11622a324b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eo/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "2c7cc1b01a4348ea18b6fc39e773c79a0dfe60a72b9637cda0ac4cc05de65eeaaaf6bbc05b5b15f92c1cebbde0b385d58b173f347af4538f2545709800877070";
+      sha512 = "1335b46db5961afa02401f4f318c52aae40c00611688f2eb32506f10faf24046d2d495f4c3e8579d7271e0728e5608aa7af461ee3c3e3940a2c5532ae52bc270";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-AR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4e9a3fb356d0e88c8b620a0ff00eb56bd25e341e951f3e4139d631ee276dabf78575ee9b2b30e159708388a25ebf088b7c5c88dc7004ad4e0fa8b1bd8daa5667";
+      sha512 = "db631bc0fa67e2440ff068f009f1cd59f8f0004341911af9372a09c89f8882ddd82fb7cc350bf609b81ffb7ed23fa0a0aaafc91ac3aa0a7e03c9a52b10eafaca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-CL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "5b85539c1d8c30e817c4b82996f9a5cc8d078224b97c32c910931965db45a09a186472722de84e7de7349e8f9f086b9d76d2fc87c8775f67ac829e9137305e32";
+      sha512 = "e65a58b49ae8c24466f9762276fd3f006dbae2ec4c200ec298d787bc4aaeb742cd17e5dcda24226327377082cb4aa5f4b37966e94d30bbd920bc1f8b7210fd6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-ES/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5a39cf930255d271e8e318bc285446a5346cff9443db8dc5270ae0232d2b4b61345dce191136da2531bc3213f4e0abf6902231abdaaf5bdf6baff2b7b689e84c";
+      sha512 = "0d4dc421d87aa50bfb43be4d80405741901d6ee69ce0537dff064077f5713afd692cdd1405c1504e8ed3bca1affd672985f8dafce63a398d8ed8758a259c6c1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/es-MX/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "2a57741f8a2f2325ab6ebfa46d3e26f92b07daef81dc01997d8ea981e9713240a08830741f37542ddf948f022a2ff56378915b5bdffa4215f64a84136850c648";
+      sha512 = "798b502fe83e7ea9d0e32786e618009d7631018b303f31489754e2b04b5c89ddd8dca48a0472f8b4785da5aaf2a2a4454428d5794c6e1f8e2ee8d08c655d2137";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/et/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "1b8bcf9dc03af2ee215a24eaf82ad75efe8c8ce6dc9c2fbd4b7d8f751f7854604b0fcf3ae941f7b19ed2b36daa03fd603b1ec2f8bfca87b16fc8741b939ba8e1";
+      sha512 = "4e32583343514637080a7d41366949d415a8caf6abb2d220f55fb0623fa2df08eb51f8e1205e38fcb0635052eda52c1175728a63dc06ab555e1d26ef22035b1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/eu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "04ed8f610132573951d32e2532543e8a056a89f6f2ae252c72c3dfe1450bfa1d969ceb6ead5c707ec0a5b9e44d16b25238db1d4e52035d2555339bcef20c1947";
+      sha512 = "4619ff888774f2da4c0a745d08462c6b584e49f6bed7cf4a9f38f1e69c0553eb40f461491858bbba9d26835bf86493459c273ced320f5292306863d7e1b4900c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fa/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "71204442585640cec6f2ca6f554b403f4a44a5aad4d899d264b1c224280a03fe5053e21d030d2c21be41571f26f6d97468d26add6fd4c8b3e82a97ab1be528a1";
+      sha512 = "d47c39364157f96bca30c84795ab216a3d12677f39a43fa3a411b2d6c1a58ff60204242266b4ffd0b48474417d791ae6cb01ff657d3b66a01932a632a23e4a68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ff/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "cc9d2d4de8a29cab8ced52ee92e810f43ab15052baddec3275f5a5245246be4f5fa1c19d9eae8d6dce4337421a88cc81ccd3e87538e85740531ae1140512a396";
+      sha512 = "b816e4d844112785a33a8519833dbc1ac5b4832b6186946b0e0866e53c47936bffb385f464ff04659f03db8938c25f330de75e3940c644e8e19fb5d9cc30f1cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "28b1be8512bea62cd40c83d52a1e5a0d3e1ef1e12cb7e40df2205f0a973558ab70a88a7df5d9bf0c3aaad2d73c55b0dd6cd0130f89e844d555369e844552f092";
+      sha512 = "e6420db4cd448e62ce975f4090365749bccdaaff39b881e7c40eb75686799851f264ee3e9c9b2d69ce833b59ce5d1cba2a2fba4017e03495b23b7501a87e046b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "f946653b1ca82eb83fffdc2ccf4df81dbd3952acdf77f6f7c3f2bdeca4b4b09af9f7ed282743494fb790a14bab9863c99e18ec3077c6d03e979621ca2ead6387";
+      sha512 = "1ad0a3de8e08007ea64a0476bed1c202e35f938f31152a18a4bf043f78c0e3e9a172c9be73a578a69c1d873ba702116a484b921f9e0de48c0e00d551e973417f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/fy-NL/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "5d4bc41b40f8bb680f3e4d81c011994d73f84f8040d05b5427f0932013789935e064272621c25b19bd51c2cf3c8316f62aaac60b75c2f950de77d2e306dfd52d";
+      sha512 = "3b082ee567267ebe7e846cc928607c832c96c9a4d996e098c0fcc887bc4cf52d696fe1dffcae9a06a927b45d2f29d4137c55cc99f2ddb95b79dc2c61ba561912";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ga-IE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "09a34eb4a3866998b7a26aedbc6d4e7ae5bc5b091c5edaf0675c473730f42fc8446727e7fb3936f5768269de43786ac823911038272ba615d745df43e23e6928";
+      sha512 = "1bddad6efd191825751252c6c543286614e5c52c2fe514c3cb5835953f28b11eb642abe72460d55fbbcd937fa93a57cbe6dc8cfdc3fe179961922402f81e90d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gd/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "77c8f4d6a3fdd2a8525d173fffd36254419f87f46b42d91b050faf5779c0fae4944df3bc646f1d893477f3aca943e09438b467b5ba6d8862a9f3ffb2848e69de";
+      sha512 = "55d1dffb686b0f0c9072171b1dbb6059ae31a88f77252d922ca0f52e8210e724a1e951a1049ff5f5395eb247ddc3d93ef6e865b50b94fa8226394a1c32768e66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "9634ff8df8c375013d020415d6b4fa944b539511291a6c0e2e4994ff618b4cdb36420bcd78285427f9aa146fe774207f39ad2c0ccb6e23040e15e3cb0ce39cc2";
+      sha512 = "11ebfffae756c46685091c63245e8bde2068c192f335d37585629a646a78478e76eea84d01b4dca85b6fbc0d53c09477ce59a29a3ce4219593c24cddbdf3cbbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "226e115d8e26e9c06dc07a3611db551632fc383f3347ca421df3fd82d21001c51ab2e16c937be2c98bf07d00529d19de090bf9427d548a2f6c2280d03ad81006";
+      sha512 = "9f2ce62956775b7b75014d62a6af3caa6e55cad0bce6b69a5bf41f83c89db0a7d6446c8b13d84b0bcb59e14f11a92c998e489339fd15c1c92c7ae2273ae4219c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/gu-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "6522b70c7122a18e9d975ef2dbc51c6fe3d23cf8e5fa287210bc29a7e63821ca3fe3d24b6a6fddb0fb800116ae55010eea95f7d555c94468beb90bc9f3e5ec1f";
+      sha512 = "185c6a2daf7ea7c221c2de73aa113d81ab0b28b085e2098943e1d315be52ddb43deb90ce1fc53a94bfac20562923e7aa90ebbe959c0d66bd9035674eb2e146f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/he/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "3a2481485d2c641f9d2205bf2679a733be224fc463476bb7f3ca8ea275d27a1490410fd9fd54f09b3d91bf165d46d26f4fbf8d173f01740280b50119ad25d80b";
+      sha512 = "8b40e3c315ae5b6f90c396a68bcb08781c4161715f9b4ba1fa7d1c6b584b8093942e9da3dde7232a0e97847eb3749ae9225e0a136c5ac6c3e95eea0710ad0ede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hi-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b5a6241c748654d858337b81febe8a2219ba2d3ed3e03725ca1432fcb5dccb1d715920b2a009a00ba330ff51d202b4da27ac6bddc329011e830a4e715a089db7";
+      sha512 = "bcdd3223262d192e07e68e51cc610654387f4c3c05b21652740c11fea1010aa6e5dc564974daac1801bd50d0b0f78f0e8173b3cd2b0ef8a0719251bcc83e66b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f704b353e92532c8ab0598263a5ad92323f46289a9a4369f05487f22dfbbefc59893938916689b0bdf1c07a079ecd8f6d8754b16c9cfb99333673f94ab1699c3";
+      sha512 = "4075cd52c92433515fd97ad2b04878d21711d52fcf388ae19477ddad63a7a1d88fe62983f47fcad844ee8be1881e1fa353e18865b8c0c02c57d43b2be6250c48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hsb/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "44517eb11cd22ee1bb201b14c7cd18dbb1663f0e2a52c8cd1d0e215985f2f9e67d80ba4e10ee599f693e9b12436a9757eed94e3dd4b82a8ae37d1892296b1428";
+      sha512 = "2534c74303a9e40de6e32ed3552c575a38a2be612237e9daeca2334c4f3354698d640c62f7bb170b38bc8267735e75ff2c7dc61bbe1b9e0a7b4adfeda891a1a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hu/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "24d7a30076378d584f8f524353dee730d9ebd5be16a5e6ba0a44af1e7f0b51fc96670f8fb1f6a661b662d649bfdc1b6be6ff19410a913031a108f610f0f63e2b";
+      sha512 = "002b67ca863b1da0e68c39cb05b11b956f4f8a47968b88541b73b45bf795235d1b851bfb3c06200a71c7205806d637c8da315303f8050e56f5560d1066d2eb97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/hy-AM/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4bd50fcb8405a59b4624277ccfb2a528667dc386b87f815551ef264655d6c9cef4cf0d2452b1c7babde138aa81fbdc6a6484cdc6890e0f6a4e926786ac0fbeb5";
+      sha512 = "2ee7f78a9a8eae99792be88885b9d10f596473e9fc03d935d4d16b927cfb5e6305a037edfd5d4cef1e253a46a9d7b2c2c3bca3f86e557302e326f1002ba12ba7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ia/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "d62d825507c92878bc022d85947d59d93c9913cfb02a8dce0e2937a4527a80444e59bb324f175d18322726f1ba9686faf349236ebb12fb268a3e13eab32fe317";
+      sha512 = "c901603efeb9b40a0eae5c6c52973dacd218cd4a31f94a597f3cd20338dae8dc2a10c0b991e4367a72e8ee473d000e972ca6aabf2dbc4ea16f0d4dac4b2edad7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/id/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "955ac0a9b30e9209a0fbcec5e88b94d75bec3b8455a78e08770e5ce54b10f73b8642a8a2a1b534ab9b3671611fc6a9278c597c3a3e84b073008c42745fdb6892";
+      sha512 = "8c215c9bdd711f9165a99dd5276b73036590234be62f42c93587598d0d6423ee26d312fb015f176de4afe799ffdacdf860f0d00b3006f0229c1dec84d2af9f7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/is/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "984a706f8ae3bfd09ef720e5586c69da7bee182281b8231132431080b6504a265e891114bd7937381c64dbd9dd09904b9e531849998409c29c235783ad8c22cb";
+      sha512 = "39af62503e8de0c74630e4c877c920553902661deff8a2271252a0b15ab3f544d4c843f53e6ef3a6f386dfbf047d2ecf47d29b3b91a683dae181f1bd5c175791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/it/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "5d917c06052408d11c22945aaf0f26b1c312c8aadb631c935fb341893d3d2c762feaf1fac8aedd944fea13518a73fddc5fd4850863036e05964e4ae72cca6542";
+      sha512 = "50e8f50ae82f3cd13799884367968bc3e1d1b01f029bad18a2ee1f658c1c45a98782b831172d9bc65c2c97da29478767429a299851a7f498b534c121ab493d13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ja/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "3fa9888377d958d879cc04f2763593a7e88871d09e304e597f27997b4c4291d5db7d9345cc3c19d09de8cde34d5c4c1e9488eb205d075cc9b6f368db6c77cf29";
+      sha512 = "01d52a8d525bae042f78f865284412bac2861f8804e214725671a25d2d4128671bdda564e73b9342520939426f7c1c68349637cc5a85030f1a559a5af940507a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ka/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "b0e49faf822c1145e185069e001d63480132619b39b76ec2baa36456f2402f88e6d500cfb86b3edd7387e11f145283e1256218e0fae8d95bf716f00c5d682a44";
+      sha512 = "dbad627cfb3eb60b4c7ff47f54faf75df232fae7919073641a394e6c882035af32e8bef25084115b25959fbbbfbf30753f32a2868838e87c7905fee109ad5037";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kab/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1b4f60da621fd4d7e2690b84541edb16f58a4065f87bb6062efa8efc650b1e12de51ad583c5f11941dfb9849572edd27e5bea83d766a9b629337a3f13b3d0502";
+      sha512 = "ae48811af05c1ac602270e8e6acc230dbf2e497567fafe9c7b402897f4e5cfb34c3645f14e63f463cb784e56bd49aba1b8ab692b9500a5241b5f91bb3a89e239";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "97aebb3ff8b39d2bd5fc7bac22db0169eb30fd16523b8e92fa25d840b289331cfd3aabe8686f85e76396fe8d57e5c4c7b32d5f28bb949166b48eb88858285f65";
+      sha512 = "70077e5aa220d6e67c819e98f230894277d8ee9446885397bd2bdfc886f1075907639ead92007dac2c74cc0ff7baac75c921b7c6ddf56120d87f66714e1e9388";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/km/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "2dea52a11615a8fdac422cc495a5a344ada2540778c0300eea3e85ef5cd906bb6fd009631fd62565bbeb01a65470f9833cb66345fab63493fbc0e8fd8c4d85d1";
+      sha512 = "25e487b8dea02fa31211cf9b8e143911293f14485ec167e5524be0ff61db8cd9cdc86d2e4ccba58e63f14a82439dd11f6e25b9c9b591d0915c8119cabab81551";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/kn/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "72ccf22a789a7aae6132c9522138e5482024e61550fd81122969a641227448d4e781fa40e0472e95b36e66abd0c74be3a96f4479781894be1323cde248c00e8f";
+      sha512 = "9a947d844a81c3f6e2f62ee5a9dc0129afac82d9c6e77e59232ff3e140b3552b146a702a4be49fec64edeb3f506f4ee86c4c85345315f76171cfbf72c3f269da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ko/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "b9d627ecd91bc9510b777d355cc821f6eb4830748eec14ef44ff1022fc3daf42caf9212e9bb4ad541584cef9eb41f5ff56b216c2c6e68dd067e91e75202f4eeb";
+      sha512 = "c56662d013ac5ebe4cd6bb64785ea165321aee492dd37fb5c7368c4932c4f871d2bd33128d3201dd9c3e73fbabe4319190eb1701332891f62bbb48fd5c5776a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lij/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fab085b0db9c01852def72428421440731a17656f9d77da2e5f5743703aa7ae3e51e1a2172efe47610a4f02b5655520776ce2b48a7e6ecf9cefced78cf533ec6";
+      sha512 = "c1f6944f4f52e4e6b6f84a69050b5692a2982a30a9ae7ddb747ecc2f183d9be225428675ac1ed1553efd573f71bd3350efd9d247d16ae0c3d80044000b0cbbf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lt/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "28ec2617cf310b2a007112b308bb47f668f89511515375b2e822947a7ca9218c3209975845fdb91989a70285601c2b5f7b04e1ea98055d1c0804f73956e3b5df";
+      sha512 = "5be16d895d58829791afed1c9fec00a2c84c849729cdf5b0a0e51ab06fc55deeee24bf98107f4e75ca8616f936676630455cfefc9034d6f53167247438e956a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/lv/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "08dc0583e0c7642aab90c9d4536b567026cb245fb44cbaeea8e91bfde9ba1bbfe90667ddffe8c1224ac59867d4626c4e3641b044d7b25fc85d4832c2fe0e3522";
+      sha512 = "f75d0186d228a03137aa9174122109c42e9aee19a1ffb0e810f53b8f0af9f72d1a81ad86468db3bdcf0401ade5407764253ae1176457f1823afa8d1f2e44db11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mai/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "dcc85c2b60851cafd12bad1c018cde11150b946147fcc2e213eaeffa5e89f4eae9b346ce90552b0ccff6efea64fe126eaf51d5a442173e0954bcc4d33e616b8a";
+      sha512 = "e010c961c9e6dc4d7c8b29a2acda5aaaa7c0e4f2ef2bcbcc9b3a29e8b1a80f375c877b8f925cfe0a35e018fea2acd3acb67394547943f2dd1818a2138db7b83a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "56a8dd0b99aaaf975e932d18a89dd5364c0277e11ffb6077bfd38b63e38a9960b16f638e304e836599add79db4d35c05db13110a5a0081c24855caaf0ad25f88";
+      sha512 = "91d984cab9a39cbdb9bb5a6971ed107b0de33ebec913db1c8c48c459abefaecada9267d1b7211626c4617edaf85c1f827e92e0f8fb2af42dd67a09792e4cdfff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ml/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d89b9385905130130373612a6f0e79da26e0ab2bd7b0a28101b429b3d226d833ad2b415f6ce02746bc6b9c5fe5eec80e7ffa733a547835c636408559281766ad";
+      sha512 = "868cf98a5cb99e9a5879d13a7de79f62178ec8dccbe7b36ef7392f5313fc93b4252e08fa9e2926b51a1f885c86e2198712523e9d144da36d4c0e84ecb2b7a563";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/mr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "a1c76c260d4347e7e3feea2eb5070dab80301a305195befc2d988f2cd982e8a7d6dddd16dd4b0016fa71709426ef3e9bc533aaaa3d3e07fcb8c1817994baf3d5";
+      sha512 = "07e3df41fb1f8e4ae97ae02b3d559fc5e1ac133478913b0bb3767bf5f528aae34d241a1aa8b1de876d20d244afe5ce5ec88d9663bc6b4d81a6c89a72b5435a92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ms/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a68f7794f28ad0f083d6200b5bce8849b370afb6e5cc0b5013659f7818afd3dae38fd2216c80a2b555a0dad897365e6cef2c2152d969cdc5d4e4e59ef73d23b4";
+      sha512 = "c07bb19e1cd42a6b7125140ebba6b76801ce6120075e5dd1c93dcafa78cede7e2f905c1cafa2d16272278468019808334d6428039b94816fbefe358e5c20a54d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/my/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "936b3fcd3bb4b3119768bb49f382cda0e5d6601a83432939801248b0fd3e1f734438a0f5d69bee96469be25333a77dc12d57f2ab65462feb13d6f50f8671d85d";
+      sha512 = "3153f92490938d546c7f7b8497c08a5a71c78a847948f1853fe2faeb5c077311b8e42175f639bc27d0ea4bb72343e0a35fc2ccbd1cf04e5e556619eb11282ce3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nb-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "4bd3ee6c762423d3e10b96f583b0b785778ca7a72074122941e3cbacb8e8680fc6d6fb4daf2a8d13615947297a27dde03cb415579762c015a6fdd3dbd23bfd31";
+      sha512 = "e4a63f4a19d28e248f97b4f6791873f6bdefd61f80cf8476a555864ed5ba6ff2001e69c02a2a271c8b78c28e1c78adc7c766b8e1bc2791111127eceef777c30e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ne-NP/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "de6f295ea831a91249857e896d888d3866db4aa39fa9a2bc57d46d4f8e0c0db2858733fd6db7326803dd75d6d5a9eb9f34d85b285851ac2066a6dbf7242e1a5f";
+      sha512 = "abadef6736bd802c81e1a741e77291600dd7f90cd12d623a3c39392515c23191c1a3d5f1f9771b62c6d8a7add46dadf5722dc9d0dc47d8a4e15227879875c6d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "603e7b90798d500dd9c6dc10b29735f8a0e1dbdf8ae8c776f1433ea92291550b67581a0a58b60314fe32a1e3b9856d3c2cc22b42d23f5c339201240e91047d8c";
+      sha512 = "a3654dfaf19fe2a30445e9f0e8007739e446a78c3f630ec42d28d802698fb41fcfe7c8977b9d05dbbb9bf5eab264ab73b70993825f285473c941c10293df1863";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/nn-NO/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e4a4513296533a965f470464b1530a14225f71cda1edf17605d49a565b91ccad25ec226878c315d1ed1cb80d491c9e3b2577e41ce252f0b8b5c7fd99b136b6c6";
+      sha512 = "06817e98fa2f89f7fc513f8b439ea12d2d7cce4b24384cc5c442d61b6d974261d6cca5f3ac06db267be22988a87a9e672ef948a78bfd3cf92e83a3f11620543a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/oc/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "d95abb474023bed4471f366c1109f28f7be2a938d333cf30d3e0b76429a6625078f78cfa7deea42a541bdb815611e46ba6c4c77f3e890143cb001aa26a1b6ef8";
+      sha512 = "67b3baeaf105149491bb98f7a7e1d38a056116ad331ce56e39263172240f89a76c6a0b7e322069c9f23f11cd0486cf51d7847b70bb28801fd8abf0d669326c07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/or/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "16eaab71e1896ba201a44cabb84083d3aecd75a8f1e4736d9046976e2ddd983de63b287512c41ec2fb0b942af7d2f36b2b7f8923d77ecbfdfb751f64416d0b19";
+      sha512 = "447a66d8938c9fee0ff2c8c0b2e7c5539e55ee7151e46ddba3e6ba09499138e0fc1f6ae8cd954463c65a58ecdf69bc65996bad02580b16e5a5e963c6ff268f88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pa-IN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "0b274e05f65cb11be8c0b6b70cbdefe5c910b8a9e8c7200b6778e40e755e656c4849bb1bfb128b36150a7fcfe1cf5b641c7a1872cf14549c9d039aebed7ccc07";
+      sha512 = "5f3cbd069ce774d5055b39e9a6a97fc421e47f4e49e05d0505a2386d017a76dc25d14b7bbb19a53ac4d5a5baa858257633a4d2f8c4f5f4965587da4dcc7a7c67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "2b03845b3795bdabe1b38ec890164cd4d83e2ecc2ac36fb2a96aa37c9db97f79ce3e8b7d8d113c2a88decda342b445b2caf0f137aed25def4177197fe4ea9d2b";
+      sha512 = "b07d5d238eccae9447cb2fba17b4dfbf8c11e983bd57e75460d4219be2cf9883fe26efae3319491baec68539840c3bd0a707e5c7b74c3449b950b2e1e1aa7c48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-BR/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "80f1105afefbff17774f5389a95453d9f2c89684329506ac9c6bd9ad8c7c40b29a65c0f6773bd9ad6988ecb89a29e21dcb1eaf1d53b91f6186632f4cc1de8858";
+      sha512 = "0ae1543d6e0b49353963a2e7ccc271ada1ab79018975895c838c83da3bccc01c9f5c420b186086eb2204dedf2cdc9a8321bc164963e6e45bf1f919b32bbc798e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/pt-PT/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ee0b41a61efce3b9c439b08de1e518e8c886655d0952b1c7c575c413c042dad19da3f4da6505615706046c522ffe918c7bfb26c5ad97525d60ccf36a0e17adb2";
+      sha512 = "5100ffba1866e21c83254e8bb49ad7f18167500d03f034d2b9db298130ee8804317692a1fbf177c39f997b4c9d1fbec0112836fd1930137f740c779069050dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/rm/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "6c761c8b83da4361398efdc196e2390677d485c12fa5a696ed5a9b9bd8974d693cf199048369d1804df739a6f1cc45de406afb08cce2354bcae35c66230f66ce";
+      sha512 = "2c4efea31a1c091a417b35d3007db737baec62f9b19174b7f8254ac0277909f3c5751613effee4b344b3ea2da2bb04408eb337870efbcc339e44e7327a023eb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ro/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "59f679d4113a12d14f99bc3faf765c7ef0a811ee1b638ea1b6e04f67cf3a97da81f9388833e94a38bb47bd88eb8c16b0134508289128771ec7135001b79b199b";
+      sha512 = "a2db9d68c20467cae286929d168bdcf2992d95cbe8c7cd8cce792110c8fd66e0bb8d1e1f5a0d671d6de4b220afd88d326f2ca842f6ae89ba4117d8b3e30750ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ru/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "2296a95fd6417eaccf832f33811c6a65cbce5e6520ad4cc79ce3adbc1b773ff51169654ac348c6ae3040abada2b3d1b1d3981fb3ade7998df033e5fa52fce391";
+      sha512 = "01caeb7ea42435fa560866f8acbbbf1a3ef34e2a97a5616dfc0e017469b86e730076591121eb1ae4e8542a5d9dc297f1b8081e9815ca2f191245362c7bab409f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/si/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "4b67e4731bc9d5e0570a5d03864d1857cb4864768006740c8f5880aef4bddb499976d4f69223def08a7db104eb459bbe06c2e9023e2e2c84af85166b17457451";
+      sha512 = "879a4adf470d5dba2e3b99a8415aa34bd491cd7392bc138d5a98cac9cbfbc53ad23aacc947f14775cbd438f5af7a28abf2c9072847a42e53a9ad6d43a5e01082";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "0fbe91caef978c857f765d3bfa4d6c116f0a4d80d1fdd4d9d1f65baa8358a53ab0f18d8527e301e36229230d28a68e1b840ed5bc4fdd5751be39b1e9c3095609";
+      sha512 = "52abceea5248ea7fdf70e9d7f6ffcbfe903ef09fa91458930d1fd9a39717621491b65b198fc72bb6e39d5dc189fd4a7aea59482cbfc851df76a3e53904ec784b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sl/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "75345e5b882142b16ffd1a978fe91f3185cf7dc906494ec1a886130d9a51189bb2cd3a2d3b340b63b8c7ccaddfc60d46e2e7c9314a9337dd1db21e0a1dda03d0";
+      sha512 = "b6e55f76896463fb6b9e964dbac60be2dae5aa60bb59be2a22f4742249539ce35791c408e7b5258f35e9d24c1732d0a8900e8855e7866d401e636ab7c603fe77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/son/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "25f9791dd9fa9ec38d52291de240130c998fc6186ced18a41128b6c68d3375702794260a77b7ab8c28dbfac2afe0bce0f80bbb8ebfa3f3529346e264690c934d";
+      sha512 = "2a27edaf71212ce13e2b841db8892fbe6bab969767833475abbb1e63b075d3811e00d95f39008a1a0a198f98059d8148b78939657f7ed0837d438dcc7e9f460c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sq/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6e199b772d1e89ee6b74add0ebe53a1ad590abc7c436851445ef5eb060011d27d371d06f8dfb08316e84f4971637450c76272bc77e57b76d3f8945a4f1e36169";
+      sha512 = "e347bdc355e4dcfe7e2fc85d0ac6e2bdc72d51d697820b00cf5e6f30ee4a4117765430fa1f0a40ad647a87e4c9ca0721be1fa345c6c31dd9da403ac576091779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "331fcf1f0ffe68d3925518a044c40562d37480392534e161df9546c4da2e648b0c1a765714bc2fc3457ddf80bb7ff4b65c0092d3e2a6f2a11af1b66a099086c3";
+      sha512 = "b32eb6ba5290674d81893419f38279d0761d0a45a68204f3fec0625db09ae53e959c02276a852d7cbc59dc8bccef149ed024246c343836e57750ab73ed739a43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/sv-SE/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ce9b87e63e9fbc975d48432996d12c31e13548f328befc9c52a5da9b2998f3bf286e7d4cbd1fe36b77e0f99dee32cf186ab81e90ab4760771bbe7fd98e70adf6";
+      sha512 = "b5244288fcc8dbcbfe705e20b754214f26bc0c28b929ebfc946a5ee93230094486cb06313eb130d5782a874369b4690edb9f40ef960cdf367363db3bdac2467d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ta/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "d40ec15bd52e4a71c73366a3a5fa58458401300375723eb76fdf68d5bcfd101cbc18d15f773d58005cc80f78b3f8d52e6d2c7e969a351e8ceb9e0226bf2cabc2";
+      sha512 = "ac680424cf44999fd33473f96a82f9ab5b05fa2ec415370694449aa5513423f4d7a416026047d04660d2273c3953c60a72e8f31120a88bcf77f9c9ddfcbfa209";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/te/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3a1f6a31f6f6ae2c50a9a082314489e23a294ae8df8bff191b18606621e1eafafbb4b1d8172a61cf62e2572864d3973b8edd82cdd352e2227883cd020ff05285";
+      sha512 = "ef821bac5631cddfa1cd5c6ecd5bc10b3e6085d94c2d2a1f86c4a557ceec8d0081c41fdd46b83bd3f03412bc9dd4ff66988ccc2a4447b134e3a7115d02714558";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/th/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "9f8b425f1acb31e1cb147daf0139d6d74235b0c73cb7fc9b371eaabcb543e75409f9fac5027d0475acba7d811e3fd69e406788a7eec5f958329b1b159511aea0";
+      sha512 = "ee5733a21ff7ef0d58ff1b5dd056ff2b97de2f6a90c733b3244235e9d51aa3d14cf16f2b6738d53e33ae9bf641197ef129571ee297401663286d93303e6fd6c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/tr/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6b9e1de61d667f47d6f77d92872a24c360e8cc0833c14338d16db9af6eac511c2b92a371b5afb64af08c50e5367ae8c7567a3473080227cefc8ed9e04e1dba86";
+      sha512 = "49ffe5b0ac9b2987d330b8c34dafa352a5c2d327cd7af652ccaadc85c45d63d5bd4222cb4fbccc513f13f2797a7525a0456f30de0603f65581001ed629e0bc8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uk/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e9dd5bb21770ca8fac633c22cdce120d2e1eefd10eab66345afa76c0c7e4533dc325ef954878e13c223f545eebcfb15875a4735f990c5ee121eddf976ece1cff";
+      sha512 = "bf6eacd5877f6d157d35f532878f6806eb2bbc6946fb3dcd79c7ca608e649da3f86428182d596242c7c57d3daeaaafdba62a4cb62bd6eb3df57f7788dbfaf0c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/ur/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "54ab27f01b7885f9c99c2df40bc660d642a5671c348ecc587f7989816d6ee0ad8003c7c6ca92c6ff644edf04fb72444d87bc041d75d13ab70c713e0f52ae17ef";
+      sha512 = "07d175fa078d9be7effc148380b737e2611c301c2af833c9b475388d2b3715a2207ed20f2d4f583a921196199e10816674428c68e7410e7e237f74243fc0641a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/uz/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "da7c03cad4b58447d41d74f6ba36544290cd1a68b9b822473685c8d467cd3570d0ec172f5d510f9fe9b0554c138e4484e64c5fc7858ebe68912d4cf7cbe4f7d7";
+      sha512 = "b9a52df09d30406fc21f82e683ce8704df9ce69816f52288ce8d04f72a18842d2cec8fc560bf9fb4e18d513150a14c3b93d3fd15b3dcacfa304f4026666f2a4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/vi/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "246880d50325895b6cdf549b48f3abda0ce0983284623907f8a08cdfc32f9e748e0918e07c606b398fe48d1e23e713b53cdaeca218c54282c68221420cd94b8d";
+      sha512 = "2f255254ce614dd77c8a5f250a83020b5649dc7f8a6b2f4007c857bf7528ee7b959425ca54b1878261cdc26ed5c51fb0539aa05551f2591909ca0728d0415bf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/xh/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "dc59e7c637964ffee861ec41a7012ce96980301548882d4c115b8963217487e82eca939f73fab76fdb67d1c676a580eeebdee1b332d22f45435c5d58dadf9499";
+      sha512 = "79ae1a6c8ed23b37764be436a0d6cce60c14d91bebd44c8644adf8800f894b475383132f37620893f994aa6620146f08f48d8c2721ba54ff2ddd9ce063918f63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-CN/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "fc6518d0dd4c24b2c4c3bb72fec23690e8647210f97e2154817bf0793049943becd6d25061c3a57e36f693082af93084faf2357a35d9e19ca1eb8722a7587ba1";
+      sha512 = "6f99f8239f5ed00003ce61d82e82c9df5ea6f30b68b6c5b51f26e153e3b2f5ec26c38b09e9b05bd12e9ebf9e1156d59ac102a9258017a1359cd66763945c38d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b9/linux-i686/zh-TW/firefox-63.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c85ca42f38731e27ebff681af104330d486744215f8db829dbf0f4abd9460a655a5b6d93bbfc4ee83aa6b1bccdd90d3b8743d340a818d84f6fe4a715f775f7f4";
+      sha512 = "9a61516afb0fe59775794dabfe0a9a7bae2a71472453bac321468391541d3d052817d5f7650d1b2d1a554af57434c11845d5591bc9e7e79336b8a57706aa133b";
     }
     ];
 }

From 8609055ac23630599c4b3702dad50170707ed3a5 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Tue, 9 Oct 2018 12:41:47 +0200
Subject: [PATCH 2653/3253] kubernetes: 1.12.0 -> 1.12.1

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 776a1667514f..343380c60751 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0bnfhrli9xqf7ygfq5i5p6nsgv7ic57b5b705zbqsxrc24pvsy4s";
+    sha256 = "1gm0v5p008w9i4k94ddjdyfqfsbx7a6ngmh81p155599hifm32zc";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];

From 9ee3f9dbc3d11b8a111b5a84f2a8aa71a5148ba8 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 9 Oct 2018 13:19:21 +0200
Subject: [PATCH 2654/3253] hwloc: 1.11.1 -> 2.0.2

Enable netloc at compile time (was added in 2.0)
---
 pkgs/development/libraries/hwloc/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 90a16bcf7f94..8aebe0e66e7d 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,15 +7,16 @@ assert x11Support -> libX11 != null && cairo != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.11.10";
+  name = "hwloc-2.0.2";
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
-    sha256 = "1ryibcng40xcq22lsj85fn2vcvrksdx9rr3wwxpq8dw37lw0is1b";
+    url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2";
+    sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l";
   };
 
   configureFlags = [
     "--localstatedir=/var"
+    "--enable-netloc"
   ];
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.

From daf21814e0a819c36417eaf0f260f346ac3fe475 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 9 Oct 2018 13:19:56 +0200
Subject: [PATCH 2655/3253] hwloc: add markuskowa as maintainer

---
 pkgs/development/libraries/hwloc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 8aebe0e66e7d..8f38170d87e4 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     # http://www.open-mpi.org/projects/hwloc/license.php
     license = licenses.bsd3;
     homepage = https://www.open-mpi.org/projects/hwloc/;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz markuskowa ];
     platforms = platforms.all;
   };
 }

From 4d88ce447a7068c2dcec374913312cd1fe854838 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 9 Oct 2018 19:30:44 +0300
Subject: [PATCH 2656/3253] midisheetmusic: add version to name

---
 pkgs/applications/audio/midisheetmusic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix
index 26962ad9cc85..448977e5705b 100644
--- a/pkgs/applications/audio/midisheetmusic/default.nix
+++ b/pkgs/applications/audio/midisheetmusic/default.nix
@@ -5,7 +5,7 @@
 let
   version = "2.6";
 in stdenv.mkDerivation {
-  name = "midisheetmusic";
+  name = "midisheetmusic-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";

From 6e78a003761971d5b8fc903c634fcf3a8f6bbebf Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 9 Oct 2018 19:42:42 +0200
Subject: [PATCH 2657/3253] atom: 1.31.0 -> 1.31.2

---
 pkgs/applications/editors/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 25b5cad34dd2..6cfba39ed4b3 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -73,8 +73,8 @@ let
   };
 in stdenv.lib.mapAttrs common {
   atom = {
-    version = "1.31.0";
-    sha256 = "184vsj7qcpzwiq2v5kh8i21wfzhinhybxmr71y41sjqp78s2gy57";
+    version = "1.31.2";
+    sha256 = "1szx9p2nz1qzjpig0l8h4hj5mqwpjvkcynn8crh21drply4bpfr0";
   };
 
   atom-beta = {

From 04d2af6b1a0f62d63251cfd30bd8f0dbfdf74cc4 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Oct 2018 12:57:54 -0700
Subject: [PATCH 2658/3253] urbanterror: 4.3.3 -> 4.3.4

---
 pkgs/games/urbanterror/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix
index 8ceff15b93d0..1cd87541b8c3 100644
--- a/pkgs/games/urbanterror/default.nix
+++ b/pkgs/games/urbanterror/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "urbanterror-${version}";
-  version = "4.3.3";
+  version = "4.3.4";
 
   srcs =
     [ (fetchurl {
-         url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror433_full.zip";
-         sha256 = "0rrh08ypnw805gd2wrs6af34nvp02x7vggfp0ymcmbr44wcjfn63";
+         url = "http://cdn.urbanterror.info/urt/43/releases/zips/UrbanTerror434_full.zip";
+         sha256 = "1rx4nnndsk88nvd7k4p35cw6znclkkzm2bl5j6vn6mjjdk66jrki";
        })
       (fetchurl {
-         url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip";
-         sha256 = "1624zsnr02nhdksmwnwmvw129lw3afd8h0hvv2j8qmcyxa7jw68b";
+         url = "https://github.com/FrozenSand/ioq3-for-UrbanTerror-4/archive/release-${version}.zip";
+         sha256 = "1s9pmw7rbnzwzl1llcs0kr2krf4daf8hhnz1j89qk4bq9a9qfp71";
        })
     ];
 

From d4f5f3a504249c8e380e8a0e7261b0d1f068d185 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 6 Oct 2018 10:04:09 -0700
Subject: [PATCH 2659/3253] mwprocapture: 1.2.3773 -> 1.2.3950

---
 .../linux/mwprocapture/default.nix            |  6 +-
 .../linux/mwprocapture/linux_4_14_fix.patch   | 71 -------------------
 2 files changed, 2 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch

diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index 72095bc8cdab..f6f6c10112a7 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -15,17 +15,15 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mwprocapture-1.2.${version}-${kernel.version}";
-  version = "3773";
+  version = "3950";
 
   src = fetchurl {
     url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz";
-    sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g";
+    sha256 = "1im3k533r6c0dx08h9wjfbhadzk7zawrxxaz7v94c92m3q133ys6";
   };
 
   nativeBuildInputs = [ kernel.moduleBuildDependencies ];
 
-  patches = [ ./linux_4_14_fix.patch ];
-
   preConfigure =
   ''
     cd ./src
diff --git a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch b/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
deleted file mode 100644
index 94da5a00a2e2..000000000000
--- a/pkgs/os-specific/linux/mwprocapture/linux_4_14_fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.c ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c
---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.c	2017-12-15 01:59:57.000000000 -0800
-+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.c	2017-12-23 22:47:33.666823299 -0800
-@@ -7,8 +7,9 @@
- 
- #include "linux-file.h"
- 
--#include <asm/uaccess.h>
- #include <linux/sched.h>
-+#include <asm/uaccess.h>
-+#include <linux/version.h>
- 
- struct file *linux_file_open(const char *path, int flags, int mode)
- {
-@@ -28,29 +29,36 @@
-     filp_close(file, NULL);
- }
- 
--ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size)
-+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
-+    return(kernel_read(file, data, size, &offset));
-+#else
-     mm_segment_t oldfs;
-     ssize_t ret;
- 
-     oldfs = get_fs();
-     set_fs(get_ds());
--    ret = vfs_read(file, data, size, &offset);
-+    ret = vfs_read(file, (unsigned char *)data, size, &offset);
-     set_fs(oldfs);
- 
-     return ret;
-+#endif
- }
- 
--ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size)
-+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)
-+    return(kernel_write(file, data, size, &offset));
-+#else
-     mm_segment_t oldfs;
-     ssize_t ret;
- 
-     oldfs = get_fs();
-     set_fs(get_ds());
--    ret = vfs_write(file, data, size, &offset);
-+    ret = vfs_write(file, (const unsigned char *)data, size, &offset);
-     set_fs(oldfs);
- 
-     return ret;
-+#endif
- }
--
-diff -Naur ProCaptureForLinux_3773/src/sources/ospi/linux-file.h ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h
---- ProCaptureForLinux_3773/src/sources/ospi/linux-file.h	2017-12-15 01:59:57.000000000 -0800
-+++ ProCaptureForLinux_3773_new/src/sources/ospi/linux-file.h	2017-12-23 22:46:22.028545189 -0800
-@@ -13,9 +13,9 @@
- 
- void linux_file_close(struct file *file);
- 
--ssize_t linux_file_read(struct file *file, loff_t offset, unsigned char *data, size_t size);
-+ssize_t linux_file_read(struct file *file, loff_t offset, void *data, size_t size);
- 
--ssize_t linux_file_write(struct file *file, loff_t offset, unsigned char *data, size_t size);
-+ssize_t linux_file_write(struct file *file, loff_t offset, const void *data, size_t size);
- 
- #endif /* __LINUX_FILE_H__ */
- 

From dcd8cec0f0a39dcefa3331b7aa5671c3001353fe Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 8 Oct 2018 06:06:29 -0700
Subject: [PATCH 2660/3253] winetricks: 20180603 -> 20180815

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index c2665353a390..b1af27807316 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
-    version = "20180603";
-    sha256 = "02valprlb64cc40ivd8sxgxy2hsgqn22s49a47inl6pknj5nmvar";
+    version = "20180815";
+    sha256 = "0ksz2jkpqq8vnsc511zag9zcx8486hs8mwlmkkygljc8ylb1ibn5";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 2c881054f8ac71a6373e9b7d275cc180bd212ce1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 9 Oct 2018 21:50:30 +0200
Subject: [PATCH 2661/3253] scdoc: Update the URLs (homepage and download)

---
 pkgs/tools/typesetting/scdoc/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 3a4c7813c695..270fd7da1717 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
   version = "1.5.1";
 
-  src = fetchgit {
-    url = "https://git.sr.ht/~sircmpwn/scdoc";
-    rev = version;
-    sha256 = "0fm3x6ma1pzlajfcy32ayqrcab8lwl64nxfaqgc6019mxw87y1ja";
+  src = fetchurl {
+    url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
+    sha256 = "0hcwpyy97afwq40qn8jq75f1b2p0172lil1v0hs9a0rislpqk5nm";
   };
 
   postPatch = ''
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
       scdoc is a simple man page generator written for POSIX systems written in
       C99.
     '';
-    homepage = https://git.sr.ht/~sircmpwn/scdoc/;
+    homepage = https://git.sr.ht/~sircmpwn/scdoc;
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From 11c0d07761f692e2bc1285d7f45a57e99a9cf0c7 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 16:37:18 -0400
Subject: [PATCH 2662/3253] f2fs-tools: fetch src from HTTPS instead of SSH
 (#48110)

All users can use HTTPS, but some enterprise users may not be able to access
external SSH endpoints behind corporate firewalls.
---
 pkgs/tools/filesystems/f2fs-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 20e1853a3af6..a1428a257742 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.11.0";
 
   src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
+    url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git";
     rev = "refs/tags/v${version}";
     sha256 = "188yv77ga466wpzbirsx6vspym8idaschgi7cx92z4jwqpnkk5gv";
   };

From 2f7c24295357240da704cb28c4240ecef36bcd7c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 9 Oct 2018 22:44:29 +0200
Subject: [PATCH 2663/3253] net_snmp: fix CVE-2018-18065

---
 .../monitoring/net-snmp/CVE-2018-18065.patch  | 30 +++++++++++++++++++
 pkgs/servers/monitoring/net-snmp/default.nix  |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch

diff --git a/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch b/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch
new file mode 100644
index 000000000000..c33f7bb03fa8
--- /dev/null
+++ b/pkgs/servers/monitoring/net-snmp/CVE-2018-18065.patch
@@ -0,0 +1,30 @@
+commit 7ffb8e25a0db851953155de91f0170e9bf8c457d
+Author: Robert Story <rstory@freesnmp.com>
+Date:   Thu Oct 6 10:43:10 2016 -0400
+
+    CHANGES: BUG: 2743: snmpd crashes when receiving a GetNext PDU with multiple Varbinds
+    
+    skip out-of-range varbinds when calling next handler
+
+diff --git a/agent/helpers/table.c b/agent/helpers/table.c
+index 32a08033a..2666638b5 100644
+--- a/agent/helpers/table.c
++++ b/agent/helpers/table.c
+@@ -340,6 +340,8 @@ table_helper_handler(netsnmp_mib_handler *handler,
+             else if (reqinfo->mode == MODE_GET)
+                 table_helper_cleanup(reqinfo, request,
+                                      SNMP_NOSUCHOBJECT);
++            else
++                request->processed = 1; /* skip if next handler called */
+             continue;
+         }
+ 
+@@ -409,6 +411,8 @@ table_helper_handler(netsnmp_mib_handler *handler,
+                 else if (reqinfo->mode == MODE_GET)
+                     table_helper_cleanup(reqinfo, request,
+                                          SNMP_NOSUCHOBJECT);
++                else
++                    request->processed = 1; /* skip if next handler called */
+                 continue;
+             }
+             /*
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index a6b738270a9a..0e7a53306eb4 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m")
     (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid")
     (fetchAlpinePatch "remove-U64-typedef.patch" "1msxyhcqkvhqa03dwb50288g7f6nbrcd9cs036m9xc8jdgjb8k8j")
+    ./CVE-2018-18065.patch
   ];
 
   preConfigure =

From 2ac35c806bcacc65385b89e1f47dcfd6bed6bb17 Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Tue, 9 Oct 2018 23:36:13 +0200
Subject: [PATCH 2664/3253] gutenberg: 0.4.1 -> 0.4.2 (#48104)

---
 pkgs/applications/misc/gutenberg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix
index c5982f68201d..c71dcf2e0182 100644
--- a/pkgs/applications/misc/gutenberg/default.nix
+++ b/pkgs/applications/misc/gutenberg/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "gutenberg-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "Keats";
     repo = "gutenberg";
     rev = "v${version}";
-    sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla";
+    sha256 = "0kzxz26khk5rwb9mz0wi9r8y7r93w4n2dbq6v2qr07cy5h14pa6w";
   };
 
-  cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z";
+  cargoSha256 = "0n4ji06chybmcvg5yz6cnhzqh162zhh5xpbz374a796dwp1132m8";
 
   nativeBuildInputs = [ cmake pkgconfig openssl ];
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ];

From dd58c35332eaabf5f48613f6bc34fbbbb189cfa0 Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Tue, 9 Oct 2018 23:39:52 +0200
Subject: [PATCH 2665/3253] prometheus-alertmanager: 0.15.1 -> 0.15.2 (#48121)

---
 pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 38b789261773..516a537bb247 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "alertmanager-${version}";
-  version = "0.15.1";
+  version = "0.15.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/alertmanager";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy";
+    sha256 = "1r4j22jnxayicz9hn0pwm77cgzzywr5haq0hwz6sx5j2xwjmnwm7";
   };
 
   # Tests exist, but seem to clash with the firewall.

From 5ead27394d6adf7ea41497768ada6faee1bf1f88 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <github@tazj.in>
Date: Tue, 9 Oct 2018 23:45:43 +0200
Subject: [PATCH 2666/3253] journaldriver: 1.0.0 -> 1.1.0 (#48106)

Included changes:

* upstream repository has moved, URLs changed accordingly
* journaldriver bumped to new upstream release

The new release includes an important workaround for an issue that
could cause log-forwarding to fail after service restarts due to
invalid journal cursors being persisted.
---
 nixos/modules/services/logging/journaldriver.nix |  2 +-
 pkgs/tools/misc/journaldriver/default.nix        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix
index 74ac3d4c2365..9bd581e9ec0e 100644
--- a/nixos/modules/services/logging/journaldriver.nix
+++ b/nixos/modules/services/logging/journaldriver.nix
@@ -7,7 +7,7 @@
 # to be set.
 #
 # For further information please consult the documentation in the
-# upstream repository at: https://github.com/aprilabank/journaldriver/
+# upstream repository at: https://github.com/tazjin/journaldriver/
 
 { config, lib, pkgs, ...}:
 
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 58c9ee770b7f..e97f4048f0ff 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   name        = "journaldriver-${version}";
-  version     = "1.0.0";
-  cargoSha256 = "04llhriwsrjqnkbjgd22nhci6zmhadclnd8r2bw5092gwdamf49k";
+  version     = "1.1.0";
+  cargoSha256 = "03rq96hzv97wh2gbzi8sz796bqgh6pbpvdn0zy6zgq2f2sgkavsl";
 
   src = fetchFromGitHub {
-    owner  = "aprilabank";
+    owner  = "tazjin";
     repo   = "journaldriver";
     rev    = "v${version}";
-    sha256 = "1163ghf7dxxchyawdaa7zdi8ly2pxmc005c2k549larbirjjbmgc";
+    sha256 = "0672iq6s9klb1p37hciyl7snbjgjw98kwrbfkypv07lplc5qcnrf";
   };
 
   buildInputs       = [ openssl systemd ];
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Log forwarder from journald to Stackdriver Logging";
-    homepage    = "https://github.com/aprilabank/journaldriver";
+    homepage    = "https://github.com/tazjin/journaldriver";
     license     = licenses.gpl3;
     maintainers = [ maintainers.tazjin ];
     platforms   = platforms.linux;

From 205b3d94e13324fe5af8a6c692e41e294b68eb83 Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Wed, 10 Oct 2018 00:18:54 +0200
Subject: [PATCH 2667/3253] nginxMainline: 1.15.3 -> 1.15.5 (#48127)

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 49f212a8fe57..f830f0acee35 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.15.3";
-  sha256 = "11dysslkz76cdzhshc6w5qivdplk10pjpb73li0d1sz2qf8zp4ck";
+  version = "1.15.5";
+  sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs";
 })

From f9ba5e9407a313c7640349cf439d61d51a8b99f5 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 10 Oct 2018 07:28:07 +0900
Subject: [PATCH 2668/3253] accountsservice: 0.6.50 -> 0.6.54 (#48112)

---
 .../libraries/accountsservice/default.nix     | 18 ++++++++-----
 .../accountsservice/no-create-dirs.patch      | 26 ++++++++++---------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 36d7912d0f8a..66d540f8d66b 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -1,22 +1,26 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow
-, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
+, gobjectIntrospection, polkit, systemd, coreutils, meson, dbus
+, ninja, python3 }:
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.50";
+  version = "0.6.54";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83";
+    sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];
 
-  buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ];
+  buildInputs = [ glib intltool gobjectIntrospection polkit systemd dbus ];
 
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--localstatedir=/var" ];
+  mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system"
+                 "-Dlocalstatedir=/var" ];
   prePatch = ''
+    chmod +x meson_post_install.py
+    patchShebangs meson_post_install.py
+
     substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \
                                    --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"'
     substituteInPlace src/user.c   --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
index f26f5c738227..ef1a59b0249f 100644
--- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch
+++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
@@ -1,13 +1,15 @@
---- a/src/Makefile.in	2014-04-23 22:30:00.276005326 +0200
-+++ b/src/Makefile.in	2014-04-23 22:30:16.809409113 +0200
-@@ -881,8 +881,8 @@
- 	gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
+diff --git a/meson_post_install.py b/meson_post_install.py
+index ba95055..17f7926 100644
+--- a/meson_post_install.py
++++ b/meson_post_install.py
+@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
+ # FIXME: meson will not track the creation of these directories
+ #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
+ dst_dirs = [
+-  os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
+-  os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
++  #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
++  #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
+ ]
  
- install-data-hook:
--	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
--	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
-+#	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
-+#	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ for dst_dir in dst_dirs:

From 6424a1425c09f789b3e0fca3b9650e0ecb71e3ca Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 9 Oct 2018 17:36:03 -0500
Subject: [PATCH 2669/3253] gpgme: 1.11.1 -> 1.12.0

https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000429.html
---
 pkgs/development/libraries/gpgme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 416ecb5631ed..04ceea137cdd 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -14,11 +14,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gpgme-${version}";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd";
+    sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l";
   };
 
   outputs = [ "out" "dev" "info" ];

From 0f2869a8063daff487fb0d69ea53a7a568c7afb1 Mon Sep 17 00:00:00 2001
From: Lassulus <github@lassul.us>
Date: Wed, 10 Oct 2018 01:24:58 +0200
Subject: [PATCH 2670/3253] quickserve: init at 2018 (#48083)

---
 pkgs/tools/networking/quickserve/default.nix | 35 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/networking/quickserve/default.nix

diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix
new file mode 100644
index 000000000000..06e5918dccd8
--- /dev/null
+++ b/pkgs/tools/networking/quickserve/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, makeWrapper, fetchzip, python3, python3Packages, writeScript }:
+let
+  threaded_servers = python3Packages.buildPythonPackage {
+    name = "threaded_servers";
+    src = fetchzip {
+      url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz;
+      sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf";
+    };
+
+    # stuff we don't care about pacserve
+    doCheck = false;
+  };
+  wrappedPython = python3.withPackages (_: [ threaded_servers ]);
+in stdenv.mkDerivation {
+  name = "quickserve";
+  version = "2018";
+
+  unpackPhase = ":";
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \
+      --add-flags -mThreadedServers.PeeredQuickserve
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple HTTP server for quickly sharing files.";
+    homepage = https://xyne.archlinux.ca/projects/quickserve/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ lassulus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8a54a8b6827..392102b4285e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4925,6 +4925,8 @@ with pkgs;
 
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
+  quickserve = callPackage ../tools/networking/quickserve { };
+
   quicktun = callPackage ../tools/networking/quicktun { };
 
   quilt = callPackage ../development/tools/quilt { };

From cd1f5914bdecd4f9a2faed3ca285a330e367f8ef Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 21:02:27 -0400
Subject: [PATCH 2671/3253] pythonPackages.atom: init at 0.4.1

---
 .../python-modules/atom/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/atom/default.nix

diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix
new file mode 100644
index 000000000000..0a7dbf561a0f
--- /dev/null
+++ b/pkgs/development/python-modules/atom/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, future }:
+
+buildPythonPackage rec {
+  pname = "atom";
+  version = "0.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0awzja4k3f32y01gd068yyxvh35km62m4wka0vbg1yyy37ahgjmv";
+  };
+
+  propagatedBuildInputs = [ future ];
+
+  # Tests not released to pypi
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Memory efficient Python objects";
+    maintainers = [ maintainers.bhipple ];
+    homepage = https://github.com/nucleic/atom;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..eafa80eb131e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -190,7 +190,9 @@ in {
 
   astral = callPackage ../development/python-modules/astral { };
 
-  astropy = callPackage ../development/python-modules/astropy {  };
+  astropy = callPackage ../development/python-modules/astropy { };
+
+  atom = callPackage ../development/python-modules/atom { };
 
   augeas = callPackage ../development/python-modules/augeas {
     inherit (pkgs) augeas;

From b721a1b9a91a0a6b203be286dedd37dfbd9f3f7c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 21:23:37 -0400
Subject: [PATCH 2672/3253] pytest: add license

---
 pkgs/development/python-modules/pytest/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 6146159ad0ab..deb9cbdb7d0a 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -37,8 +37,10 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
-    platforms = platforms.unix;
+    homepage = https://docs.pytest.org;
     description = "Framework for writing tests";
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
 }

From 3ec3116faeb2daf6b970aa95e9956ea8d0bdf1dd Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 21:27:05 -0400
Subject: [PATCH 2673/3253] harfbuzz: add license

---
 pkgs/development/libraries/harfbuzz/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 383f7f60f9bf..b3ab9c7881a9 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
     homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
     downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/";
     maintainers = [ maintainers.eelco ];
+    license = licenses.mit;
     platforms = with platforms; linux ++ darwin;
     inherit version;
     updateWalker = true;

From 87a089bacc358d7d8c788105090d34c5cbb50bde Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 21:29:08 -0400
Subject: [PATCH 2674/3253] xen: add license

---
 pkgs/applications/virtualization/xen/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 6d0344d46865..968d998792df 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -234,5 +234,6 @@ stdenv.mkDerivation (rec {
                     + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
     platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
+    license = stdenv.lib.licenses.gpl2;
   } // (config.meta or {});
 } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])

From d78da463c52cf54fa6d24a0cb4860538b124f962 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 21:35:12 -0400
Subject: [PATCH 2675/3253] par: add license

---
 pkgs/tools/text/par/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix
index c7a686201b0d..5f9ca5212d30 100644
--- a/pkgs/tools/text/par/default.nix
+++ b/pkgs/tools/text/par/default.nix
@@ -28,9 +28,11 @@ stdenv.mkDerivation {
   '';
 
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.nicemice.net/par/;
     description = "Paragraph reflow for email";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    # See https://fedoraproject.org/wiki/Licensing/Par for license details
+    license = licenses.free;
   };
 }

From b10940cd2367c3331ddb8961ebd8fbd842242ccd Mon Sep 17 00:00:00 2001
From: Free Potion <42352817+freepotion@users.noreply.github.com>
Date: Wed, 10 Oct 2018 04:45:38 +0300
Subject: [PATCH 2676/3253] boohu: leave one package

There will be only one version of the package with
the fewest external dependencies.
---
 pkgs/games/boohu/default.nix    | 14 ++++----------
 pkgs/games/boohu/deps.nix       | 20 --------------------
 pkgs/top-level/all-packages.nix |  2 --
 3 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/games/boohu/deps.nix

diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix
index 6d4129edbd00..92eccd67a1f1 100644
--- a/pkgs/games/boohu/default.nix
+++ b/pkgs/games/boohu/default.nix
@@ -1,8 +1,8 @@
-{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}:
+{stdenv, fetchurl, buildGoPackage}:
 
 buildGoPackage rec {
 
-  name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}";
+  name = "boohu-${version}";
   version = "0.10.0";
 
   goPackagePath = "git.tuxfamily.org/boohu/boohu.git";
@@ -12,15 +12,9 @@ buildGoPackage rec {
     sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6";
   };
 
-  goDeps = ./deps.nix;
+  buildFlags = "--tags ansi";
 
-  # If ansiTag is true, the "--tags ansi" will be passed
-  buildFlags = if ansiTag then "--tags ansi" else "";
-
-  # If ansiTag is true, binary output file name will be "boohu-ansi".
-  # Otherwise it will be "boohu".
-  postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi"
-                else "mv $bin/bin/boohu.git $bin/bin/boohu";
+  postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu";
 
   meta = with stdenv.lib; {
     description = "A new roguelike game";
diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix
deleted file mode 100644
index 8b6b32811938..000000000000
--- a/pkgs/games/boohu/deps.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/nsf/termbox-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nsf/termbox-go";
-      rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce";
-      sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
-      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
-    };
-  }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index becd4148f1f6..f3e54fa8d76d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19933,8 +19933,6 @@ with pkgs;
 
   boohu = callPackage ../games/boohu { };
 
-  boohu-ansi = callPackage ../games/boohu { ansiTag = true; };
-
   braincurses = callPackage ../games/braincurses { };
 
   brogue = callPackage ../games/brogue { };

From 804c227b83faa017c377eb899d18e5931e0ad936 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 10 Oct 2018 16:06:06 +0800
Subject: [PATCH 2677/3253] uchiwa: 1.2.0 -> 1.3.1

---
 pkgs/servers/monitoring/uchiwa/bower-packages.nix | 4 ++--
 pkgs/servers/monitoring/uchiwa/src.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index f18ea3875516..a8180c5de3dc 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,7 +1,7 @@
 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "1.2.0" "1.2.0" "0733ha6bahzg9qlvhz75agi8hwwqdk99hfx9j8dhpdf1v5xkj2fz")
+  (fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk")
   (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
   (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")
@@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")
   (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")
   (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
-  (fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0")
+  (fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn")
   (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
   (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
 ]; }
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 0cf6815fbe5d..51c343d01da8 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-    version = "1.2.0-1";
-    sha256  = "1gj9cr0gkiivxdlq7ha6gxq9s8s26j79crijkrlrsqpg59jz063p";
+    version = "1.3.1-1";
+    sha256  = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi";
 }

From 018573b7579b4212d7001bf6f0e9b31e1bdadb14 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 10 Oct 2018 01:20:42 +0200
Subject: [PATCH 2678/3253] nixos/weechat: add setuid wrapper for `screen' to
 ensure true multiuser capabilities

Previously you either had to set the setuid bit yourself or workaround
`isSystemUser = true` (for a loginable shell) to access the weechat
screen.

`programs.screen` shouldn't do this by default to avoid taking too much
assumptions about the setup, however `services.weechat` explicitly
requires tihs.

See #45728
---
 nixos/modules/services/misc/weechat.nix | 4 +++-
 nixos/modules/services/misc/weechat.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix
index 1fcfb440485d..c6ff540ea12f 100644
--- a/nixos/modules/services/misc/weechat.nix
+++ b/nixos/modules/services/misc/weechat.nix
@@ -46,10 +46,12 @@ in
         Group = "weechat";
         RemainAfterExit = "yes";
       };
-      script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
+      script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
       wantedBy = [ "multi-user.target" ];
       wants = [ "network.target" ];
     };
+
+    security.wrappers.screen.source = "${pkgs.screen}/bin/screen";
   };
 
   meta.doc = ./weechat.xml;
diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml
index 9c9ee0448c92..b7f755bbc5c7 100644
--- a/nixos/modules/services/misc/weechat.xml
+++ b/nixos/modules/services/misc/weechat.xml
@@ -54,7 +54,7 @@
 </programlisting>
    Now, the session can be re-attached like this:
 <programlisting>
-screen -r weechat-screen
+screen -x weechat/weechat-screen
 </programlisting>
   </para>
 

From d3b79965df495f09d37fa5216a7dd271d000589b Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 10 Oct 2018 12:53:48 +0200
Subject: [PATCH 2679/3253] Revert "Increase Virtualbox disk image size"
 (#48151)

---
 nixos/modules/virtualisation/virtualbox-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 3d4c06f1f23f..60048911658c 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -12,7 +12,7 @@ in {
     virtualbox = {
       baseImageSize = mkOption {
         type = types.int;
-        default = 100 * 1024;
+        default = 10 * 1024;
         description = ''
           The size of the VirtualBox base image in MiB.
         '';

From 11c17034b6bb89aff62eed3ab285fa420e6c3ecb Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Mon, 8 Oct 2018 09:16:13 +0900
Subject: [PATCH 2680/3253] ibmquantumexperience: 2.0.2 -> 2.0.3

---
 .../python-modules/ibmquantumexperience/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix
index 82f6cb144ac7..22b809c46c20 100644
--- a/pkgs/development/python-modules/ibmquantumexperience/default.nix
+++ b/pkgs/development/python-modules/ibmquantumexperience/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "IBMQuantumExperience";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f2a5662d7457c297af0751985979e64a88569beb07cfedad0ce1dfa5a7237842";
+    sha256 = "c5dbcc140344c7bdf545ad59db87f31a90ca35107c40d6cae1489bb997a47ba9";
   };
 
   propagatedBuildInputs = [

From ce5e1b5b0a8e524d6ca5c5b48f6e41debe866f2a Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 22:14:29 +0200
Subject: [PATCH 2681/3253] codimd: update patch

---
 pkgs/servers/web-apps/codimd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix
index d99542d3ea27..e9f5e0898720 100644
--- a/pkgs/servers/web-apps/codimd/default.nix
+++ b/pkgs/servers/web-apps/codimd/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch { # fixes for configurable paths
       url = "https://patch-diff.githubusercontent.com/raw/hackmdio/codimd/pull/940.patch";
-      sha256 = "0n9lfaxirngywx8m5f0nqzykqdjzc8f3cl10ir1g7s5kq4zc7hhn";
+      sha256 = "0w1cvnp3k1n8690gzlrfijisn182i0v8psjs3df394rfx2347xyp";
     })
   ];
 

From cf4742365012a6718de0a2bee991066ae0e9697d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 8 Oct 2018 22:15:18 +0200
Subject: [PATCH 2682/3253] nixos/tests: fix non-determinism for good

---
 nixos/tests/codimd.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix
index 9dedac96844a..562f6f24f999 100644
--- a/nixos/tests/codimd.nix
+++ b/nixos/tests/codimd.nix
@@ -40,8 +40,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
     subtest "CodiMD sqlite", sub {
       $codimdSqlite->waitForUnit("codimd.service");
       $codimdSqlite->waitForOpenPort(3000);
-      $codimdSqlite->sleep(10); # avoid 503 during startup
-      $codimdSqlite->succeed("curl -sSf http://localhost:3000/new");
+      $codimdSqlite->waitUntilSucceeds("curl -sSf http://localhost:3000/new");
     };
 
     subtest "CodiMD postgres", sub {
@@ -49,8 +48,7 @@ import ./make-test.nix ({ pkgs, lib, ... }:
       $codimdPostgres->waitForUnit("codimd.service");
       $codimdPostgres->waitForOpenPort(5432);
       $codimdPostgres->waitForOpenPort(3000);
-      $codimdPostgres->sleep(10); # avoid 503 during startup
-      $codimdPostgres->succeed("curl -sSf http://localhost:3000/new");
+      $codimdPostgres->waitUntilSucceeds("curl -sSf http://localhost:3000/new");
     };
   '';
 })

From d66ce10ce63c409ae98de14b815e8fa995b0ccaa Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 10 Oct 2018 08:59:24 -0400
Subject: [PATCH 2683/3253] Remove .dir-locals.el

---
 .dir-locals.el | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .dir-locals.el

diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index a53c8aa6db54..000000000000
--- a/.dir-locals.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
-((nil
-  (bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)")
-  (bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s"))
- (nix-mode
-  (tab-width . 2)))

From e79623115f1ad5736154f7ef36b21cac84eab29b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Oct 2018 09:27:50 -0700
Subject: [PATCH 2684/3253] libdap: 3.19.1 -> 3.20.0

* libdap: 3.19.1 -> 3.20.0 (#47785)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdap/versions

* libdap: homepage has moved
---
 pkgs/development/libraries/libdap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 5a0006ad6c6e..d399998455e1 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
 
 stdenv.mkDerivation rec {
-  version = "3.19.1";
+  version = "3.20.0";
   name = "libdap-${version}";
 
   nativeBuildInputs = [ bison flex ];
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.opendap.org/pub/source/${name}.tar.gz";
-    sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj";
+    sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92";
   };
 
   meta = with stdenv.lib; {
     description = "A C++ SDK which contains an implementation of DAP";
-    homepage = https://www.opendap.org/download/libdap;
+    homepage = https://www.opendap.org/software/libdap;
     license = licenses.lgpl2;
     maintainers = [ maintainers.bzizou ];
     platforms = platforms.linux;

From 1ba4d23c3a1409c954bca89e69fe04a5ce9a1517 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 10 Oct 2018 10:00:23 -0700
Subject: [PATCH 2685/3253] Revert "coqPackages.fiat_HEAD: Update 2016-10-24 ->
 2018-02-27"

This reverts commit f5f71c08cdbf1f66b654a1321460b6a7d771c26a, due to
insufficient testing.
---
 pkgs/development/coq-modules/fiat/HEAD.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index bc5c0fdd6bb7..b970747c7726 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchgit, coq, ocamlPackages, python27}:
+{stdenv, fetchgit, coq, python27}:
 
 stdenv.mkDerivation rec {
 
   name = "coq-fiat-${coq.coq-version}-unstable-${version}";
-  version = "2018-02-27";
+  version = "2016-10-24";
 
   src = fetchgit {
     url = "https://github.com/mit-plv/fiat.git";
-    rev = "253fc133397f73d6daed0b9518ca7ab5507a1cb0";
-    sha256 = "0b5z7nz0cr1s7vy04s996dj0pd7ljqx6g5a8syh4hy2z87ijkjzd";
+    rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
+    sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
   };
 
-  buildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp5_transitional
-                  ocamlPackages.findlib python27 ];
+  buildInputs = [ coq.ocaml coq.camlp5 python27 ];
   propagatedBuildInputs = [ coq ];
 
   doCheck = false;
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false;
   buildPhase = "make -j$NIX_BUILD_CORES";
 
   installPhase = ''
@@ -34,6 +33,6 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+    compatibleCoqVersions = v: v == "8.5";
   };
 }

From fc29f68e3f2af611f3d253b8fa9fc59ba227bebb Mon Sep 17 00:00:00 2001
From: rys ostrovid <nek0@chelnok.de>
Date: Wed, 10 Oct 2018 19:01:29 +0200
Subject: [PATCH 2686/3253] openra: 20180307 -> 20180923 (#47545)

---
 pkgs/games/openra/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index 069ed900e8f0..d0649237b127 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "openra-${version}";
-  version = "20180307";
+  version = "20180923";
 
   meta = with stdenv.lib; {
     description = "Real Time Strategy game engine recreating the C&C titles";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "OpenRA";
     repo = "OpenRA";
     rev = "release-${version}";
-    sha256 = "05c6vrmlgzfxgfx1idqmp6czmr079px3n57q5ahnwzqvcl11a2jj";
+    sha256 = "1pgi3zaq9fwwdq6yh19bwxscslqgabjxkvl9bcn1a5agy4bfbqk5";
 
     extraPostFetch = ''
       sed -i 's,curl,curl --insecure,g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh
@@ -64,7 +64,8 @@ stdenv.mkDerivation rec {
   in ''
     wrapProgram $out/lib/openra/launch-game.sh \
       --prefix PATH : "${binaries}" \
-      --prefix LD_LIBRARY_PATH : "${runtime}"
+      --prefix LD_LIBRARY_PATH : "${runtime}" \
+      --set TERM "xterm"
 
     mkdir -p $out/bin
     makeWrapper $out/lib/openra/launch-game.sh $out/bin/openra --run "cd $out/lib/openra"

From 61c83b108d4141d57c242aa769caca9a55411ed0 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 13:10:47 -0400
Subject: [PATCH 2687/3253] pythonPackages.escapism: 0.0.1 -> 1.0.0 move to
 python-modules

---
 .../python-modules/escapism/default.nix       | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------------
 2 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/escapism/default.nix

diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix
new file mode 100644
index 000000000000..b2ac36582357
--- /dev/null
+++ b/pkgs/development/python-modules/escapism/default.nix
@@ -0,0 +1,24 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "escapism";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5f1cc1fa04a95f5b85b3da194750f8a71846d493ea332f62e8798949f10c9b86";
+  };
+
+  # No tests distributed
+  doCheck = false;
+
+  meta = with pkgs.lib; {
+    description = "Simple, generic API for escaping strings";
+    homepage = "https://github.com/minrk/escapism";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bzizou ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..c89de5708256 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2223,25 +2223,7 @@ in {
 
   enzyme = callPackage ../development/python-modules/enzyme {};
 
-  escapism = buildPythonPackage rec {
-    name = "escapism-${version}";
-    version = "0.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/escapism/${name}.tar.gz";
-      sha256 = "1yfyxwxb864xrmrrqgp85xgsh4yrrq5mmzvkdg19jwr7rm6sqx9p";
-    };
-
-    # No tests distributed
-    doCheck = false;
-
-    meta = {
-      description = "Simple, generic API for escaping strings";
-      homepage = "https://github.com/minrk/escapism";
-      license = licenses.mit;
-      maintainers = with maintainers; [ bzizou ];
-    };
-  };
+  escapism = callPackage ../development/python-modules/escapism { };
 
   etcd = buildPythonPackage rec {
     name = "etcd-${version}";

From 1c7c1be1a8a3324dfdc4f01945661a0246d92331 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 8 Oct 2018 16:34:46 +0000
Subject: [PATCH 2688/3253] ocamlPackages.merlin: 3.1.0 -> 3.2.1

---
 pkgs/development/tools/ocaml/merlin/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 4ad1bfb3234d..d74b480c9c5a 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchzip, ocaml, findlib, yojson
-, withEmacsMode ? false, emacs }:
+{ stdenv, fetchzip, ocaml, findlib, dune, yojson }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 
 let
-  version = "3.1.0";
+  version = "3.2.1";
 in
 
 stdenv.mkDerivation {
@@ -13,15 +12,12 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
-    sha256 = "1vf0c2mmflp94r8hshb44lsvnfdy03ld6mld2n79cdxr3zl24ci2";
+    sha256 = "1szv2b7d12ll5n6pvnhlv3a6vnlyrkpya4l9fiyyiwyvgd4xzxwf";
   };
 
-  buildInputs = [ ocaml findlib yojson ]
-    ++ stdenv.lib.optional withEmacsMode emacs;
+  buildInputs = [ ocaml findlib dune yojson ];
 
-  preConfigure = "mkdir -p $out/bin";
-  prefixKey = "--prefix ";
-  configureFlags = stdenv.lib.optional withEmacsMode "--enable-compiled-emacs-mode";
+  inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
     description = "An editor-independent tool to ease the development of programs in OCaml";

From de2a995c83511ab88e9f13b298c350467b3f2ec8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 13:32:38 -0400
Subject: [PATCH 2689/3253] pythonPackages.facebook-sdk: 0.3.0 -> 3.0.0
 refactor move to python-modules

---
 .../python-modules/facebook-sdk/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +---------
 2 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/facebook-sdk/default.nix

diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix
new file mode 100644
index 000000000000..249acb262fba
--- /dev/null
+++ b/pkgs/development/python-modules/facebook-sdk/default.nix
@@ -0,0 +1,32 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, requests
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "facebook-sdk";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f3d450ec313b62d3716fadc4e5098183760e1d2a9e0434a94b74e59ea6ea3e4d";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # checks require network
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} test/test_facebook.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK";
+    homepage = https://github.com/pythonforfacebook/facebook-sdk;
+    license = licenses.asl20 ;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..a15295db93b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2367,22 +2367,7 @@ in {
 
   ezdxf = callPackage ../development/python-modules/ezdxf {};
 
-  facebook-sdk = buildPythonPackage rec {
-    name = "facebook-sdk-0.4.0";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz";
-      sha256 = "5a96c54d06213039dff1fe1fabc51972e394666cd6d83ea70f7c2e67472d9b72";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK";
-      homepage = https://github.com/pythonforfacebook/facebook-sdk;
-      license = licenses.asl20 ;
-    };
-  };
+  facebook-sdk = callPackage ../development/python-modules/facebook-sdk { };
 
   face_recognition = callPackage ../development/python-modules/face_recognition { };
 

From 7ac0a231949f23a716e379dfab5aed4d179acc4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 10 Oct 2018 16:24:24 +0200
Subject: [PATCH 2690/3253] prooftree: 0.12 -> 0.13

---
 pkgs/applications/science/logic/prooftree/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                       | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index 2d5fcfd2d261..a88a84e3b0d1 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (rec {
   name = "prooftree-${version}";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchurl {
     url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz";
-    sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m";
+    sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3e54fa8d76d..7596a49bae29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21277,10 +21277,9 @@ with pkgs;
 
   libpoly = callPackage ../applications/science/logic/poly {};
 
-  prooftree = (with ocaml-ng.ocamlPackages_4_01_0;
-    callPackage  ../applications/science/logic/prooftree {
-      camlp5 = camlp5_transitional;
-    });
+  prooftree = ocamlPackages.callPackage  ../applications/science/logic/prooftree {
+    camlp5 = ocamlPackages.camlp5_strict;
+  };
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 

From eaf0de5985ef1316323c7da4026ed268399a3589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 10 Oct 2018 16:32:05 +0200
Subject: [PATCH 2691/3253] ulex: remove version 0.8

---
 .../ocaml-modules/ulex/0.8/camlp5.patch       | 72 -------------------
 .../ocaml-modules/ulex/0.8/default.nix        | 36 ----------
 .../ocaml-modules/ulex/0.8/meta_version.patch | 10 ---
 pkgs/top-level/ocaml-packages.nix             |  4 --
 4 files changed, 122 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch
 delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/default.nix
 delete mode 100644 pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch

diff --git a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch b/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch
deleted file mode 100644
index 2fa92527035e..000000000000
--- a/pkgs/development/ocaml-modules/ulex/0.8/camlp5.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Author: Stefano Zacchiroli <zack@debian.org>
-Description: build (and install) using camlp5 instead of camlp4
---- ulex0.8.orig/META
-+++ ulex0.8/META
-@@ -1,5 +1,5 @@
- version = "0.8"
--requires = "camlp4"
-+requires = "camlp5"
- description = "Runtime support for ulex"
- archive(byte) = "ulexing.cma"
- archive(native) = "ulexing.cmxa"
---- ulex0.8.orig/Makefile
-+++ ulex0.8/Makefile
-@@ -20,7 +20,7 @@
- 	ocamlopt -a -o ulexing.cmxa $(ULEXING)
- 
- pa_ulex.cma: $(ULEX)
--	ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX)
-+	ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I `camlp5 -where` $(ULEX)
- 
- pa_ulex.ml: pa_ulex.ml.src
- 	ocaml mk_pa_ulex.ml
-@@ -29,14 +29,14 @@
- 	rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml
- 
- view_test: pa_ulex.cma
--	camlp4o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml
-+	camlp5o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml
- 
- run_test: ulexing.cma pa_ulex.cma
--	ocamlc -o test -pp 'camlp4o ./pa_ulex.cma' ulexing.cma test.ml
-+	ocamlc -o test -pp 'camlp5o ./pa_ulex.cma' ulexing.cma test.ml
- 	./test
- 
- custom_ulexing: ulexing.cma pa_ulex.cma
--	ocamlc -o custom_ulexing -pp 'camlp4o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml
-+	ocamlc -o custom_ulexing -pp 'camlp5o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml
- 
- 
- doc:
---- ulex0.8.orig/README
-+++ ulex0.8/README
-@@ -142,7 +142,7 @@
- 
- Compilation of OCaml files with lexer specifications:
- 
--  ocamlfind ocamlc -c -package ulex -syntax camlp4o my_file.ml
-+  ocamlfind ocamlc -c -package ulex -syntax camlp5o my_file.ml
- 
- When linking, you must also include the ulex package:
-   ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo
---- ulex0.8.orig/mk_pa_ulex.ml
-+++ ulex0.8/mk_pa_ulex.ml
-@@ -1,10 +1,4 @@
- let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in
--if (s < 3.09) then (
-   print_endline "Old camlp4 (loc)";
-   Sys.command "sed s/_loc/loc/ < pa_ulex.ml.src > pa_ulex.ml"
--)
--else  (
--  print_endline "New camlp4 (_loc)";
--  Sys.command "cp pa_ulex.ml.src pa_ulex.ml"
--)
- 
---- ulex0.8.orig/pa_ulex.ml.src
-+++ ulex0.8/pa_ulex.ml.src
-@@ -1,4 +1,4 @@
--let _loc = (Lexing.dummy_pos,Lexing.dummy_pos)
-+let _loc = Stdpp.dummy_loc
- 
- (* Named regexp *)
- 
diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix
deleted file mode 100644
index 6c0cf9214f29..000000000000
--- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl, ocaml, findlib, camlp5 }:
-
-let
-  pname = "ulex";
-in
-
-if stdenv.lib.versionAtLeast ocaml.version "4.06"
-then throw "ulex-0.8 is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "0.8";
-
-  src = fetchurl {
-    url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz";
-    sha256 = "19faabg8hzz155xlzmjwsl59d7slahb5m1l9zh1fqvvpp81r26cp";
-  };
-
-  buildInputs = [ocaml findlib camlp5];
-
-  createFindlibDestdir = true;
-
-  patches = [ ./meta_version.patch ./camlp5.patch ];
-
-  propagatedBuildInputs = [ camlp5 ];
-
-  buildFlags = "all all.opt";
-
-  meta = {
-    homepage = http://www.cduce.org/download.html;
-    description = "A lexer generator for Unicode and OCaml";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
-  };
-}
diff --git a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch b/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch
deleted file mode 100644
index 7a39510cf0b4..000000000000
--- a/pkgs/development/ocaml-modules/ulex/0.8/meta_version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Author: Stefano Zacchiroli <zack@debian.org>
-Description: fix a typo in the findlib package version number specified in META
---- ulex0.8.orig/META
-+++ ulex0.8/META
-@@ -1,4 +1,4 @@
--version = "0.7"
-+version = "0.8"
- requires = "camlp4"
- description = "Runtime support for ulex"
- archive(byte) = "ulexing.cma"
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5f6d6fc9bc1d..0840aa66100b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -592,10 +592,6 @@ let
 
     ulex = callPackage ../development/ocaml-modules/ulex { };
 
-    ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 {
-      camlp5 = camlp5_transitional;
-    };
-
     textutils_p4 = callPackage ../development/ocaml-modules/textutils { };
 
     tls = callPackage ../development/ocaml-modules/tls {

From 2fdd38ed2df0f6df08154a8982c87d77b9ca7b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 10 Oct 2018 17:27:19 +0200
Subject: [PATCH 2692/3253] camlp5_transitional: remove in favor of camlp5
 (strict)

---
 pkgs/applications/science/logic/coq/default.nix |  7 +++----
 pkgs/development/ocaml-modules/elpi/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix                 |  4 +---
 pkgs/top-level/coq-packages.nix                 |  3 +--
 pkgs/top-level/ocaml-packages.nix               | 16 ++++------------
 5 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 0ede4230aa6d..23f1ff85edf0 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -27,7 +27,6 @@ let
    "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd";
   }."${version}";
   coq-version = builtins.substring 0 3 version;
-  camlp5 = ocamlPackages.camlp5_strict;
   ideFlags = if buildIde then "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   csdpPatch = if csdp != null then ''
     substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
@@ -37,8 +36,8 @@ self = stdenv.mkDerivation {
   name = "coq-${version}";
 
   passthru = {
-    inherit coq-version camlp5;
-    inherit (ocamlPackages) ocaml findlib num;
+    inherit coq-version;
+    inherit (ocamlPackages) ocaml camlp5 findlib num;
     emacsBufferSetup = pkgs: ''
       ; Propagate coq paths to children
       (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
@@ -93,7 +92,7 @@ self = stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ]
+  buildInputs = [ ncurses ] ++ (with ocamlPackages; [ ocaml findlib camlp5 num ])
   ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk;
 
   postPatch = ''
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index db188a720b88..3eecb9b45b7d 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5_strict
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlp5
 , ppx_tools_versioned, ppx_deriving, re
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml findlib ppx_tools_versioned ];
 
-  propagatedBuildInputs = [ camlp5_strict ppx_deriving re ];
+  propagatedBuildInputs = [ camlp5 ppx_deriving re ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7596a49bae29..f6db3528430e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21277,9 +21277,7 @@ with pkgs;
 
   libpoly = callPackage ../applications/science/logic/poly {};
 
-  prooftree = ocamlPackages.callPackage  ../applications/science/logic/prooftree {
-    camlp5 = ocamlPackages.camlp5_strict;
-  };
+  prooftree = ocamlPackages.callPackage  ../applications/science/logic/prooftree { };
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 305d9ba351ba..ca367aeb0d1a 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -56,8 +56,7 @@ in rec {
     filterCoqPackages coq self;
 
   coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
-    inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_02.camlp5_transitional;
+    inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5;
   };
   coq_8_5 = callPackage ../applications/science/logic/coq {
     ocamlPackages = ocamlPackages_4_05;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0840aa66100b..c9df0f908ee2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -88,15 +88,10 @@ let
       then callPackage ../development/tools/ocaml/camlp4 { }
       else null;
 
-    camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { };
+    camlp5 = callPackage ../development/tools/ocaml/camlp5 { };
 
-    camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 {
-      transitional = true;
-    };
-
-    camlp5_strict = camlp5_6_strict;
-
-    camlp5_transitional = camlp5_6_transitional;
+    # Compatibility alias
+    camlp5_strict = camlp5;
 
     camlpdf = callPackage ../development/ocaml-modules/camlpdf { };
 
@@ -1042,10 +1037,7 @@ let
       enableX11 = config.unison.enableX11 or true;
     };
 
-    hol_light = callPackage ../applications/science/logic/hol_light {
-      inherit num;
-      camlp5 = camlp5_strict;
-    };
+    hol_light = callPackage ../applications/science/logic/hol_light { };
 
   };
     in (ocamlPackages.janeStreet // ocamlPackages);

From 9fd53e02ad12d63de44c72b03d62ccbc657da1a5 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 10 Oct 2018 20:15:14 +0200
Subject: [PATCH 2693/3253] erlang: temporarily disable wxSupport on darwin

Workaround for #48065
---
 pkgs/development/interpreters/erlang/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 9393c87b0a88..f6ff1e0db864 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -18,7 +18,7 @@
 , enableKernelPoll ? true
 , javacSupport ? false, javacPackages ? [ openjdk ]
 , odbcSupport ? false, odbcPackages ? [ unixODBC ]
-, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
+, wxSupport ? !stdenv.isDarwin, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
 , preUnpack ? "", postUnpack ? ""
 , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
 , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""

From f9d247a8d8ae8b4a8a36cc732d56f2e17f18e5a6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 10 Oct 2018 20:15:21 +0200
Subject: [PATCH 2694/3253] tdesktop: 1.4.0 -> 1.4.2

tdesktopPackages.preview: 1.4.0 -> 1.4.2
---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 9b14ac6f2c3c..56bf7ee078db 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.4.0";
-    sha256Hash = "1zlsvbk9vgsqwplcswh2q0mqjdqf5md1043paab02wy3qg2x37d8";
+    version = "1.4.2";
+    sha256Hash = "025qld597b6x7wbf1y1qpcsz0brpf3qsqj650mq9fpps1yi1vfk7";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "388730";
     archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7";

From adc6e9c2c4f4772defc36452e9aaf61da2e99cbc Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Wed, 10 Oct 2018 22:22:04 +0200
Subject: [PATCH 2695/3253] prometheus_2: 2.3.2 -> 2.4.3 (#48118)

---
 pkgs/servers/monitoring/prometheus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index b254b8470c42..2430a8cf1711 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -50,7 +50,7 @@ in rec {
   };
 
   prometheus_2 = generic {
-    version = "2.3.2";
-    sha256 = "09q3p3kvgrvgyfkkvpy2mmlr6jxzxad6nzjni3iycs4bahsxl27a";
+    version = "2.4.3";
+    sha256 = "1kci2zhh4ixil0b72d138vm8006y117mw51wsyz8j0gyy4180msj";
   };
 }

From 4e7c822dc6bad757f704e3f7a522f19eea8ea2c9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 10 Oct 2018 16:25:14 -0400
Subject: [PATCH 2696/3253] grub: fetch from HTTPS instead of FTP; update meta
 (#48137)

HTTPS is unlikely to be worse and is often better than FTP. Aside from being
faster, there are many networking setups where outgoing FTP traffic is blocked.
---
 pkgs/tools/misc/grub/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index f5ba8b7fe100..87e9814d8993 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,12 +1,10 @@
-{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}:
+{ stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }:
 
-let
-in
 stdenv.mkDerivation {
   name = "grub-0.97-73";
 
   src = fetchurl {
-    url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
+    url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
     sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af";
   };
 
@@ -29,6 +27,8 @@ stdenv.mkDerivation {
   passthru.grubTarget = "";
 
   meta = with stdenv.lib; {
+    homepage = https://www.gnu.org/software/grub;
+    description = "GRand Unified Bootloader";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };

From 6a5a5b9fa0a0e2865f62de9824835f875c617db9 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 11 Oct 2018 05:46:29 +0900
Subject: [PATCH 2697/3253] gnome3.gnome-contacts: fix compile failure due to
 clutter-gtk change (#48135)

---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index effb3d521ef6..2acf04e657a3 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
   # /nix/store/*-cheese-3.28.0/include/cheese/cheese-widget.h:26:10: fatal error: clutter-gtk/clutter-gtk.h: No such file or directory
   #  #include <clutter-gtk/clutter-gtk.h>
   #           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-  NIX_CFLAGS_COMPILE = "-I${clutter-gtk}/include/clutter-gtk-1.0";
+  NIX_CFLAGS_COMPILE = "-I${stdenv.lib.getDev clutter-gtk}/include/clutter-gtk-1.0";
 
   doCheck = true;
 

From fd9518a53272a22c07e20b788200badbb9c597f4 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 10 Oct 2018 13:52:38 -0700
Subject: [PATCH 2698/3253] powershell: 6.0.4 -> 6.1.0 (#48130)

---
 pkgs/shells/powershell/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a9b34824e494..2c89ea0f2c60 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -4,8 +4,8 @@
 let platformString = if stdenv.isDarwin then "osx"
                      else if stdenv.isLinux then "linux"
                      else throw "unsupported platform";
-    platformSha = if stdenv.isDarwin then "01j92myljgphf68la9q753m5wgfmd0kwlsk441yic7qshcly5xkw"
-                     else if stdenv.isLinux then "0al1mrlz3m5ksnq86mqm0axb8bjdxa05j2p5y9bmcykrgkdwi3vk"
+    platformSha = if stdenv.isDarwin then "0jngmqxjiiz5dpgky027wl0s3nn321rxs6kxab27kmp031j65x8g"
+                     else if stdenv.isLinux then "0nmqv32mck16b7zljfpb9ydg3h2jvcqrid9ga2i5wac26x3ix531"
                      else throw "unsupported platform";
     platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
                      else if stdenv.isLinux then "LD_LIBRARY_PATH"
@@ -14,7 +14,7 @@ let platformString = if stdenv.isDarwin then "osx"
 in
 stdenv.mkDerivation rec {
   name = "powershell-${version}";
-  version = "6.0.4";
+  version = "6.1.0";
 
   src = fetchzip {
     url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
@@ -25,15 +25,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ less ] ++ libraries;
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
-  # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in
-  # https://github.com/PowerShell/PowerShell/pull/6144
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/powershell
     cp -r * $out/share/powershell
-    rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY
     makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
-                                           --set PAGER ${less}/bin/less --set TERM xterm
+                                           --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1
   '';
 
   dontStrip = true;

From cbda94201cc72384e5128be27c8b5b0d690144de Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Wed, 10 Oct 2018 13:55:14 -0700
Subject: [PATCH 2699/3253] fastlane: 2.91.0 -> 2.105.2 (#48085)

---
 pkgs/tools/admin/fastlane/Gemfile.lock |  68 ++++++++-------
 pkgs/tools/admin/fastlane/gemset.nix   | 109 +++++++++++--------------
 2 files changed, 78 insertions(+), 99 deletions(-)

diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock
index 9cb80eb131c0..631d9cb9628a 100644
--- a/pkgs/tools/admin/fastlane/Gemfile.lock
+++ b/pkgs/tools/admin/fastlane/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     CFPropertyList (3.0.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    atomos (0.1.2)
+    atomos (0.1.3)
     babosa (1.0.2)
     claide (1.0.2)
     colored (1.2)
@@ -13,20 +13,20 @@ GEM
       highline (~> 1.7.2)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.2)
+    dotenv (2.5.0)
     emoji_regex (0.1.1)
     excon (0.62.0)
-    faraday (0.14.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.1)
-    fastlane (2.91.0)
+    fastimage (2.1.4)
+    fastlane (2.105.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -41,7 +41,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.13.1, < 0.14.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -50,7 +50,7 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.1.0, < 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -59,24 +59,24 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.5.7, < 2.0.0)
-      xcpretty (>= 0.2.4, < 1.0.0)
+      xcodeproj (>= 1.6.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-api-client (0.13.6)
+    google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.2)
+      signet (~> 0.9)
+    googleauth (0.6.6)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     highline (1.7.10)
     http-cookie (1.0.3)
@@ -84,60 +84,56 @@ GEM
     httpclient (2.8.3)
     json (2.1.0)
     jwt (2.1.0)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
     memoist (0.16.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mini_magick (4.5.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.5)
-    naturally (2.1.0)
-    os (0.9.6)
+    nanaimo (0.2.6)
+    naturally (2.2.0)
+    os (1.0.0)
     plist (3.4.0)
     public_suffix (2.0.5)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rouge (2.0.7)
-    rubyzip (1.2.1)
+    rubyzip (1.2.2)
     security (0.1.3)
-    signet (0.8.1)
+    signet (0.10.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.3)
+    simctl (1.6.5)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
     terminal-notifier (1.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-cursor (0.5.0)
-    tty-screen (0.6.4)
+    tty-cursor (0.6.0)
+    tty-screen (0.6.5)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.7)
+    xcodeproj (1.6.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
-    xcpretty (0.2.8)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
@@ -149,4 +145,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   1.14.6
+   1.16.3
diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix
index 4a0d0467d804..c2133c7c8c9c 100644
--- a/pkgs/tools/admin/fastlane/gemset.nix
+++ b/pkgs/tools/admin/fastlane/gemset.nix
@@ -11,10 +11,10 @@
   atomos = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk";
+      sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "0.1.3";
   };
   babosa = {
     source = {
@@ -85,18 +85,18 @@
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
       type = "gem";
     };
-    version = "0.5.20170404";
+    version = "0.5.20180417";
   };
   dotenv = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f9s04xwa9gcsql734nwxvacgsl1si7xka4g4w3r6d3ab8a274y9";
+      sha256 = "1va5y19f7l5jh53vz5vibz618lg8z93k5m2k70l25s9k46v2gfm3";
       type = "gem";
     };
-    version = "2.2.2";
+    version = "2.5.0";
   };
   emoji_regex = {
     source = {
@@ -118,10 +118,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c3x3s8vb5nf7inyfvhdxwa4q3swmnacpxby6pish5fgmhws7zrr";
+      sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
       type = "gem";
     };
-    version = "0.14.0";
+    version = "0.15.3";
   };
   faraday-cookie_jar = {
     dependencies = ["faraday" "http-cookie"];
@@ -144,19 +144,19 @@
   fastimage = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dzv34dgpw1sakj4wdd26dnw1z7iwvwfdvfr9aiirspabibfq6vc";
+      sha256 = "0i7p9jgb9x1lxkhkwq8xlq7an5qbgdq6gsyrbs2xnf5ffa8yx1i2";
       type = "gem";
     };
-    version = "2.1.1";
+    version = "2.1.4";
   };
   fastlane = {
     dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04k6pn95qbpvbmqxrs4pngvfyk4pifcv8is3819b33p754pkiqrp";
+      sha256 = "1fq1zqvwim939klkx2893cbm1v4gi3a991qrj8933l3qg1y41fx2";
       type = "gem";
     };
-    version = "2.91.0";
+    version = "2.105.2";
   };
   gh_inspector = {
     source = {
@@ -167,22 +167,22 @@
     version = "1.1.3";
   };
   google-api-client = {
-    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
+    dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y";
+      sha256 = "1z925kbqyaxdi6ld3gvaqc9527xfi8k3rr6snq5mvx5kibdi072a";
       type = "gem";
     };
-    version = "0.13.6";
+    version = "0.23.9";
   };
   googleauth = {
-    dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
+      sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.6";
   };
   highline = {
     source = {
@@ -225,23 +225,6 @@
     };
     version = "2.1.0";
   };
-  little-plugger = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
-      type = "gem";
-    };
-    version = "1.1.4";
-  };
-  logging = {
-    dependencies = ["little-plugger" "multi_json"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
-      type = "gem";
-    };
-    version = "2.2.2";
-  };
   memoist = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -254,18 +237,18 @@
     dependencies = ["mime-types-data"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
+      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
       type = "gem";
     };
-    version = "3.1";
+    version = "3.2.2";
   };
   mime-types-data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
+      sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
       type = "gem";
     };
-    version = "3.2016.0521";
+    version = "3.2018.0812";
   };
   mini_magick = {
     source = {
@@ -302,26 +285,26 @@
   nanaimo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi";
+      sha256 = "0ajfyaqjw3dzykk612yw8sm21savfqy292hgps8h8l4lvxww1lz6";
       type = "gem";
     };
-    version = "0.2.5";
+    version = "0.2.6";
   };
   naturally = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0avn8b2qbfm22afln2p7rky73zns8c444mdhdh4ki8hbjsn0f8cx";
+      sha256 = "0dzqdawqr4agx7zr1fr5zxdwl8vb5rhpz57l1lk7d2y46ha6l4l7";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   os = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz";
+      sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
       type = "gem";
     };
-    version = "0.9.6";
+    version = "1.0.0";
   };
   plist = {
     source = {
@@ -351,10 +334,10 @@
   retriable = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pnriyn9zh120hxm92vb12hfsf7c98nawyims1shxj3ldpl0l3ar";
+      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.1.2";
   };
   rouge = {
     source = {
@@ -367,10 +350,10 @@
   rubyzip = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.2.2";
   };
   security = {
     source = {
@@ -384,19 +367,19 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
+      sha256 = "14rhv3riz6ki4ix4l79b6ckq7d015673gxkxvzdcxjl1h8plpdcy";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.10.0";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0l1hwxkbpgfhla6dbf0f6nhj794c0k6ilxlh07zcm8by3vdrsvib";
+      sha256 = "0bbvbpdk955q1g797md960fdznw6p6hmj2pc62yrbpvb1ymag1sf";
       type = "gem";
     };
-    version = "1.6.3";
+    version = "1.6.5";
   };
   slack-notifier = {
     source = {
@@ -426,18 +409,18 @@
   tty-cursor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmggqwbikamd4qjwvahrv0vpbznm06bqpl498pb5fy3pra2xyxz";
+      sha256 = "1f4rsapf4apaxn11xnqrq7axgrlvn6pdlqxqb2g34jnpfh5yrk1i";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.6.0";
   };
   tty-screen = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19iq03prqjbm0nr7yn0181lph52d994jwbcsqss3lwpwkl20s6bv";
+      sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.6.5";
   };
   tty-spinner = {
     dependencies = ["tty-cursor"];
@@ -476,10 +459,10 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   word_wrap = {
     source = {
@@ -493,19 +476,19 @@
     dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz";
+      sha256 = "1f4shbzff3wsk1jq0v9bs10496qdx69k2jfpf11p4q2ik3jdnsv7";
       type = "gem";
     };
-    version = "1.5.7";
+    version = "1.6.0";
   };
   xcpretty = {
     dependencies = ["rouge"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b8x9m53a1hbw0lamffjm4m1ydigj3azl97jc5w7prv1bm27s2y3";
+      sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
       type = "gem";
     };
-    version = "0.2.8";
+    version = "0.3.0";
   };
   xcpretty-travis-formatter = {
     dependencies = ["xcpretty"];

From 1c84e29bd1e15c2d507c292632b26d4e02153498 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:59:47 -0400
Subject: [PATCH 2700/3253] lollypop: 0.9.601 -> 0.9.604

---
 pkgs/applications/audio/lollypop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 2ba35a9a0444..ec9122406993 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -4,7 +4,7 @@
 , gobjectIntrospection, wrapGAppsHook }:
 
 python3.pkgs.buildPythonApplication rec  {
-  version = "0.9.601";
+  version = "0.9.604";
   name = "lollypop-${version}";
 
   format = "other";
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "029hyylwjsbwkw1v75nbkkmrncgz30y2qwdysmpz0xyb5q7x6zbj";
+    sha256 = "0pfljs5q0xzqll6dybslin4nr7w18bn1yi0xn79vh44zn3l0r8q4";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From e74c7666c7cb80fb48e65403b916ba775538cd0e Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 10 Oct 2018 21:06:12 +0000
Subject: [PATCH 2701/3253] CONTRIBUTING.md: Clarify clarification on periods

Commit 9428c28f7a37038b594c5ff36b1669b0f21afe41 added a note in
`CONTRIBUTING.md` saying that, "For consistency, there should not be a
period at the end of the commit message."

I believe it would be more correct (with respect to consistency) to
say that there should not be a full stop/period at the end of the
commit message's *summary line* (the first line of the commit message)
(indeed, the example commit message just above this note clearly does
use full stops outside of its summary line), and this patch changes
`CONTRIBUTING.md` accordingly.
---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2b88f15d276e..07eddc80c253 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,7 +20,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
   (Motivation for change. Additional information.)
   ```
 
-  For consistency, there should not be a period at the end of the commit message.
+  For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message).
 
   Examples:
 

From af6e2464bba2d178b278c66d822f8c95378e6f58 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 10 Oct 2018 23:07:44 +0200
Subject: [PATCH 2702/3253] nixos/display-managers/startx: init (#47773)

Dummy display manager that allows running X as a normal user.
The X server is started manually from a vt using `startx`.
Session startup commands must be provided by the user
in ~/.xinitrc, which is NOT automatically generated.
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/x11/display-managers/startx.nix  | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 nixos/modules/services/x11/display-managers/startx.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b6849a4df574..261de6955ec2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -735,6 +735,7 @@
   ./services/x11/display-managers/lightdm.nix
   ./services/x11/display-managers/sddm.nix
   ./services/x11/display-managers/slim.nix
+  ./services/x11/display-managers/startx.nix
   ./services/x11/display-managers/xpra.nix
   ./services/x11/fractalart.nix
   ./services/x11/hardware/libinput.nix
diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix
new file mode 100644
index 000000000000..15609540a6e7
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/startx.nix
@@ -0,0 +1,44 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xserver.displayManager.startx;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.xserver.displayManager.startx = {
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to enable the dummy "startx" pseudo-display manager,
+          which allows users to start X manually via the "startx" command
+          from a vt shell. The X server runs under the user's id, not as root.
+          The user must provide a ~/.xinintrc file containing session startup
+          commands, see startx(1). This is not autmatically generated
+          from the desktopManager and windowManager settings.
+        '';
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    services.xserver = {
+      exportConfiguration = true;
+      displayManager.job.execCmd = "";
+      displayManager.lightdm.enable = lib.mkForce false;
+    };
+    systemd.services.display-manager.enable = false;
+    environment.systemPackages =  with pkgs; [ xorg.xinit ];
+  };
+
+}

From 05f0026af3d39538ea69fcfde1fed4e95972d439 Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Thu, 11 Oct 2018 00:17:32 +0300
Subject: [PATCH 2703/3253] goa: 1.0.0 -> 1.4.0 (#48147)

---
 pkgs/development/tools/goa/default.nix |  6 +--
 pkgs/development/tools/goa/deps.nix    | 67 ++++++--------------------
 2 files changed, 19 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index dfb603d101fc..7469d506244b 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "goa-${version}";
-  version = "1.0.0";
+  version = "1.4.0";
 
   goPackagePath = "github.com/goadesign/goa";
   subPackages = [ "goagen" ];
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1";
+    sha256 = "1qx3c7dyq5wqxidfrk3ywc55fk64najj63f2jmfisfq4ixgwxdw9";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix
index 14e9234be8a2..d92489259055 100644
--- a/pkgs/development/tools/goa/deps.nix
+++ b/pkgs/development/tools/goa/deps.nix
@@ -1,39 +1,12 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
 [
-  {
-    goPackagePath = "github.com/armon/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/go-metrics";
-      rev = "3df31a1ada83e310c2e24b267c8e8b68836547b4";
-      sha256 = "1l99f1bzvdhyqhnsrpi1pd07bps0msilzilrd7m4w7i1m5kra529";
-    };
-  }
   {
     goPackagePath = "github.com/dimfeld/httppath";
     fetch = {
       type = "git";
       url = "https://github.com/dimfeld/httppath";
-      rev = "c8e499c3ef3c3e272ed8bdcc1ccf39f73c88debc";
-      sha256 = "0452zvrzjvy8pk5q6ykivz2cks082r4lmh7hghscxfqw6gf3siwi";
-    };
-  }
-  {
-    goPackagePath = "github.com/dimfeld/httptreemux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dimfeld/httptreemux";
-      rev = "96acf0909c0b45ebf4a25a816cedc6d317e63679";
-      sha256 = "0f9qbm1b8l7b21i2v8vmjyzfwf1mgkvxlk5250bwkp5i8n4ml2r6";
-    };
-  }
-  {
-    goPackagePath = "github.com/goadesign/goa";
-    fetch = {
-      type = "git";
-      url = "https://github.com/goadesign/goa";
-      rev = "ea323df387ea68f8ac9fd79336f523c25e12c92e";
-      sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1";
+      rev = "ee938bf735983d53694d79138ad9820efff94c92";
+      sha256 = "1c1kic8g3r78g6h4xl8n2ac1waxsb9fqz40k20ypi08k24mv3ha9";
     };
   }
   {
@@ -41,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/manveru/faker";
-      rev = "717f7cf83fb78669bfab612749c2e8ff63d5be11";
-      sha256 = "1p6laz0hnb2vhfvam83rz6vl2amajqa6nifnsj2lg3mcs9ga8c0f";
+      rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97";
+      sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy";
     };
   }
   {
@@ -50,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/satori/go.uuid";
-      rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6";
-      sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w";
+      rev = "36e9d2ebbde5e3f13ab2e25625fd453271d6522e";
+      sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
     };
   }
   {
@@ -59,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744";
-      sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3";
+      rev = "4dab30cb33e6633c33c787106bafbfbfdde7842d";
+      sha256 = "1g7p7c2azqaxbfkx5yaznk0z1inqnajlbwv921k6vh8i1xdblxk5";
     };
   }
   {
@@ -68,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
-      sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
+      rev = "1ce0cc6db4029d97571db82f85092fccedb572ce";
+      sha256 = "02wsc01npnpc7srqw7rzaihn2hjmrkfy2x412fxbb675j2hk9cx6";
     };
   }
   {
@@ -81,22 +54,13 @@
       sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l";
     };
   }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "71a035914f99bb58fe82eac0f1289f10963d876c";
-      sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm";
-    };
-  }
   {
     goPackagePath = "golang.org/x/tools";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/tools";
-      rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09";
-      sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg";
+      rev = "f60d9635b16a5a57b06eaa119614ba4df421966a";
+      sha256 = "1h587gvgwlpjdn8q3s8i1blfwfklqi0cpb0szj99w1mkgl0ads13";
     };
   }
   {
@@ -104,8 +68,9 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f";
-      sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
 ]
+

From c047572a1798f142c24b1e9c673f5ce91ff48dfa Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 10 Oct 2018 17:20:34 -0400
Subject: [PATCH 2704/3253] dia: fix on darwin (#48176)

Fixes runtime error:
  GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
---
 pkgs/applications/graphics/dia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index a1f26f7bc09f..222328d2b917 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
 perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
 libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
-gtk-mac-integration }:
+gtk-mac-integration-gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "dia-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
       libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
       ++ stdenv.lib.optional withGNOME libgnomeui
-      ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
+      ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
 

From 5a6c4d39fbc9514b64345c4e679633dea2250fa6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Oct 2018 14:27:28 -0700
Subject: [PATCH 2705/3253] dovecot: 2.3.2.1 -> 2.3.3 (#47814)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dovecot/versions
---
 pkgs/servers/mail/dovecot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 5b7f433feb63..3e628f876dd7 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.2.1";
+  name = "dovecot-2.3.3";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "0d2ffbicgl3wswbnyjbw6qigz7r1aqzprpchbwp5cynw122i2raa";
+    sha256 = "13kd0rxdg9scwnx6n24p6mv8p6dyh7v8s7sqv55gp2i54pp2gbqm";
   };
 
   preConfigure = ''

From e00bfcd798c2981433ef57a6b6a981f8b575b1c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Oct 2018 14:27:56 -0700
Subject: [PATCH 2706/3253] dovecot_pigeonhole: 0.5.2 -> 0.5.3 (#47820)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dovecot-pigeonhole/versions
---
 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 1b744181096c..a0b03193729a 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchurl {
     url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "0d95q2yj2f750jwg599jlizlglldcz9hs52y4mhrflwfqlaqw3lm";
+    sha256 = "08i6vw6k2v906s4sc6wl9ffpz6blzdga6vglqpqjm7jzq10jfbz0";
   };
 
   buildInputs = [ dovecot openssl ];

From 1039da1556d4e7b9f966a5848a4dac8b4ed11bb4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 10 Oct 2018 14:28:22 -0700
Subject: [PATCH 2707/3253] copyq: 3.5.0 -> 3.6.1 (#47818)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/copyq/versions
---
 pkgs/applications/misc/copyq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 7b34674c2183..39a87314ca7b 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.5.0";
+  version = "3.6.1";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0hzdv6rhjpq9yrfafnkc6d8m5pzw9qr520vsjf2gn1819gdybmr0";
+    sha256 = "0drhafnr1d595wa8zwvmgmrrqb86navdk4iw6ly6gmh0i800wz0z";
   };
 
   nativeBuildInputs = [ cmake ];

From a5d839f874c6cd23256592040a1014661217e006 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 10 Oct 2018 23:33:43 +0200
Subject: [PATCH 2708/3253] nsjail: 2.2 -> 2.7 (#48024)

---
 pkgs/tools/security/nsjail/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix
index 8f087ef3d93c..80398d2d30cb 100644
--- a/pkgs/tools/security/nsjail/default.nix
+++ b/pkgs/tools/security/nsjail/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, autoconf, pkgconfig, libtool
-, bison, flex, libnl, protobuf, protobufc }:
+{ stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which
+, libnl, protobuf, protobufc }:
 
 stdenv.mkDerivation rec {
   name = "nsjail-${version}";
-  version = "2.2";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner           = "google";
     repo            = "nsjail";
     rev             = version;
     fetchSubmodules = true;
-    sha256          = "11323j5wd02nm8ibvzbzq7dla70bmcldc71lv5bpk4x7h64ai14v";
+    sha256          = "13s1bi2b80rlwrgls1bx4bk140qhncwdamm9q51jd677s0i3xg3s";
   };
 
-  nativeBuildInputs = [ autoconf libtool pkgconfig ];
-  buildInputs = [ bison flex libnl protobuf protobufc ];
+  nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ];
+  buildInputs = [ libnl protobuf protobufc ];
   enableParallelBuilding = true;
 
   installPhase = ''

From 81e3fb3cf71064b2cad78ae28e3033ad10270fa8 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 10 Oct 2018 16:35:09 -0500
Subject: [PATCH 2709/3253] xdg-utils: 1.1.2 -> 1.1.3 (#48089)

---
 pkgs/tools/X11/xdg-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index d8ae32c6ee4c..44016b801e5d 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -17,11 +17,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-${version}";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchurl {
     url = "https://portland.freedesktop.org/download/${name}.tar.gz";
-    sha256 = "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm";
+    sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p";
   };
 
   # just needed when built from git

From 608f6b4f138e6f5012181a55fafbe7d2537e5ead Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Wed, 10 Oct 2018 23:43:31 +0200
Subject: [PATCH 2710/3253] Flexget: 2.14.21 -> 2.15.1 (#48035)

---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 70639e364c3e..d10043751599 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,11 +36,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.14.21";
+  version = "2.15.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08z0pf1g5xp3760da48v9h9hja2j8cgrwkgim156drk259bf5vm2";
+    sha256 = "0c0qyafm01j94m9vky6x4k6j6g3nygzhgm79fb25brc2fyydkm3c";
   };
 
   postPatch = ''

From 632ae0502e1671c887c538097b431809762e8099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Wed, 10 Oct 2018 23:47:09 +0200
Subject: [PATCH 2711/3253] resilio-sync: 2.6.0 -> 2.6.1 (#47973)

Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log
---
 pkgs/applications/networking/resilio-sync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index b59219d99366..b6c54a6d4525 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,13 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "resilio-sync-${version}";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz";
-      "i686-linux"   = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs";
+      "x86_64-linux" = "02wbllrj80kqpyywfr05fsqpgwrv2i8smr3gfdpn7ni9b8hkj0ji";
+      "i686-linux"   = "02zhh6gfds6miznbx30ghzihhm330mh5xnm42mxj8j29aqlzgd95";
     }.${stdenv.hostPlatform.system};
   };
 

From bde4483d1336333f7c0bcd099a110dd8954c539e Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Wed, 10 Oct 2018 23:49:40 +0200
Subject: [PATCH 2712/3253] flashplayer:  31.0.0.108 -> 31.0.0.122 (#48126)

previous version was removed upstream (404)
---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 9faa7e5e31fd..60e94e137676 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,11 +98,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "31.0.0.108";
+    version = "31.0.0.122";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0dcwyx0fp7wbsx0cyi7xpwq0nnvcvkzfgi6zyy75487820ssc4h1";
+      sha256 = "16cx92lq7zx8k22mfnsfjj09kyh3fi266qc5vvjz5b2rj53rmkdg";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 07ef1397f9fb..38b064ec6e29 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "31.0.0.108";
+  version = "31.0.0.122";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "1mn29ahxjf6pdy2zp2na14cz46jrl88f54kp3bs3cz75syyizyb6"
+          "0mjyb8mk4av8cia34gmqi0n4nq0spiblgn18z6f4nkx12wgdka2c"
         else
-          "0inpj6bcsn5lh8gdv1wxpgipzrmpc553nhr68a55b2wff9fkv1ci"
+          "07qgawd4xgy9690gbx0c6k97cp7lp04l70ccp4jd81y4xjsc9bq3"
       else
         if arch == "x86_64" then
-          "1dfgsl5jf8ja9f7wwkzj5bfz1v5rdsyf4qhg1shqqldadmyyha7p"
+          "0264kcn0frgcl7zfd60ybs4r7x1p3f8nj496z264ax6qc390qr02"
         else
-          "0yiqwwqs3z9zzkfgqzjwqqdr2vaj1ia5xychs9fgxix3y4j934da";
+          "0w170wz920imca8wc7kggl2vldn9k7cqm2xwvx8yqqi1p42a1941";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 03255e6eecc0..108d7c5f4a1a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,7 +49,7 @@
 
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "31.0.0.108";
+  version = "31.0.0.122";
 
   src = fetchurl {
     url =
@@ -59,9 +59,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0i047fvj3x9lx7x8bf7jl1ybf9xpmr6g77q0h7n2s8qvscsw0pmm"
+        "1psd49bxn6w6kgcjhml44g5wb4za18m8apas8qyly4xcapdylias"
       else
-        "19wfs452ix57yfi4cy2din6mi5jky9hjzbdjny1bl8w32fy8xmm3";
+        "0g3h31pdxw91r3067zrkgyziwl18i5kidwx83y13ff4d17v999ss";
   };
 
   nativeBuildInputs = [ unzip ];

From 33b68f87680d138326a559625e38f138cef9a158 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 10 Oct 2018 19:47:41 -0400
Subject: [PATCH 2713/3253] linux: 4.4.159 -> 4.4.160

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index bafa975b6184..39e96d4b5dc2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.159";
+  version = "4.4.160";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hivz1pyy4scp4s09ibz36ni4d1pwivizwls5dbh5qjy0pdvn00f";
+    sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd";
   };
 } // (args.argsOverride or {}))

From 8f9743d2b70143a88c8f08bcf443112df3b2e02f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 10 Oct 2018 19:47:57 -0400
Subject: [PATCH 2714/3253] linux: 4.9.131 -> 4.9.132

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cdd2c67d25b2..24c11fca7935 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.131";
+  version = "4.9.132";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0q2xmbkh42ikw26bdxgk1f9192hygyq9ffkhjfpr0fcx8sak5nsp";
+    sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7";
   };
 } // (args.argsOverride or {}))

From fab0c8824ac1e56f1680c87ea2e28e70be4b279e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 10 Oct 2018 19:48:16 -0400
Subject: [PATCH 2715/3253] linux: 4.14.74 -> 4.14.75

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 6755e8f90ee1..9afc81eddf52 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.74";
+  version = "4.14.75";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0wjw05brv7l1qpi38drc2z01sa7kpk3kadw36gx9cbvvzn4r3rkh";
+    sha256 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh";
   };
 } // (args.argsOverride or {}))

From cf440dae56392484f893eb6913b56cb5865976e8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 10 Oct 2018 19:48:22 -0400
Subject: [PATCH 2716/3253] linux: 4.18.12 -> 4.18.13

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index aa936929a44c..2b65ed377ffc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.12";
+  version = "4.18.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1icz2nkhkb1xhpmc9gxfhc3ywkni8nywk25ixrmgcxp5rgcmlsl4";
+    sha256 = "0l4n72gajgw2vqghl6ps0yjy1safnypyzkcp841zkkwinp3a31yw";
   };
 } // (args.argsOverride or {}))

From 0041d742aba89f035b3740b94a457a90e806f312 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Thu, 11 Oct 2018 01:53:34 +0200
Subject: [PATCH 2717/3253] nodejs: 10.11.0 -> 10.12.0

---
 pkgs/development/web/nodejs/v10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index 784c59c7c1e1..471808980082 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.11.0";
-    sha256 = "16wfgwnb2yd6y608svj2fizdq3sid44m0wqn4swkvclxb71444mr";
+    version = "10.12.0";
+    sha256 = "1r0aqcxafha13ks8586x77n77zi88db259cpaix0y1ivdh6qkkfr";
   }

From c04e6e04e2f5ed33816c59b1fade01ca3e00aa3f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 11 Oct 2018 02:06:16 +0200
Subject: [PATCH 2718/3253] xsecurelock: hardcode path to xset

---
 pkgs/tools/X11/xsecurelock/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix
index 4ee51100b339..88e36bfde39c 100644
--- a/pkgs/tools/X11/xsecurelock/default.nix
+++ b/pkgs/tools/X11/xsecurelock/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
 , libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick
-, pamtester, xscreensaver }:
+, pamtester, xscreensaver, xset }:
 
 stdenv.mkDerivation rec {
   name = "xsecurelock-${version}";
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
   ];
 
+  preInstall = ''
+    substituteInPlace helpers/saver_blank \
+      --replace 'protect xset' 'protect ${xset}/bin/xset'
+  '';
+
   meta = with lib; {
     description = "X11 screen lock utility with security in mind";
     homepage = https://github.com/google/xsecurelock;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ef3780f9e7d..626054c2a562 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6212,7 +6212,9 @@ with pkgs;
     libxml2 = libxml2Python;
   };
 
-  xsecurelock = callPackage ../tools/X11/xsecurelock { };
+  xsecurelock = callPackage ../tools/X11/xsecurelock {
+    xset = xorg.xset;
+  };
 
   xsel = callPackage ../tools/misc/xsel { };
 

From 6892cbce0905fed4f67904425478e5fb35d05582 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 11 Oct 2018 02:07:24 +0200
Subject: [PATCH 2719/3253] equilux-theme: init at 20180927

---
 pkgs/misc/themes/equilux-theme/default.nix | 39 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/misc/themes/equilux-theme/default.nix

diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
new file mode 100644
index 000000000000..42fe402a4860
--- /dev/null
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
+
+stdenv.mkDerivation rec {
+  name = "equilux-theme-${version}";
+  version = "20180927";
+
+  src = fetchFromGitHub {
+    owner = "ddnexus";
+    repo = "equilux-theme";
+    rev = "equilux-v${version}";
+    sha256 = "1j7ykygmwv3dmzqdc9byir86sjz6ykhv9bv1pll1bjvvnaalyzgk";
+  };
+
+  nativeBuildInputs = [ gnome3.glib libxml2 bc ];
+
+  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    patchShebangs install.sh
+    sed -i install.sh \
+      -e "s|if .*which gnome-shell.*;|if true;|" \
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|"
+    mkdir -p $out/share/themes
+    ./install.sh --dest $out/share/themes
+    rm $out/share/themes/*/COPYING
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A Material Design theme for GNOME/GTK+ based desktop environments";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 626054c2a562..866adafff53f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21724,6 +21724,8 @@ with pkgs;
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
+  equilux-theme = callPackage ../misc/themes/equilux-theme { };
+
   flam3 = callPackage ../tools/graphics/flam3 { };
 
   glee = callPackage ../tools/graphics/glee { };

From bd9ce1a7614564ad4350de0c30d6ffece8a56b2b Mon Sep 17 00:00:00 2001
From: Kim Burgess <kim@acaprojects.com>
Date: Wed, 10 Oct 2018 00:36:07 +1000
Subject: [PATCH 2720/3253] maintainers: add kimburgess

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a77df8e8cc27..061703dce75d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2153,6 +2153,11 @@
     github = "kiloreux";
     name = "Kiloreux Emperex";
   };
+  kimburgess = {
+    email = "kim@acaprojects.com";
+    github = "kimburgess";
+    name = "Kim Burgess";
+  };
   kini = {
     email = "keshav.kini@gmail.com";
     github = "kini";

From 1cb5b509f1a78ed7a38a327fb122abdf971c1222 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 10 Oct 2018 21:04:08 -0400
Subject: [PATCH 2721/3253] redmine: refactor, cleanup, bug fix, and add
 functionality

- added package option to specify which version of redmine
- added themes option back in to allow specifying redmine themes
- added plugins option back in to allow specifying redmine plugins
- added database.socket option to allow mysql unix socket authentication
- added port option to allow specifying the port rails runs on

- cleaned up Gemfile so it is much less hacky
- switched to ruby version 2.4 by default as suggested by documentation http://www.redmine.org/projects/redmine/wiki/redmineinstall#Installing-Redmine
- fixed an annoyance (bug) in the service causing recursive symlinks
- fixed ownership bug on log files generated by redmine
- updates reflecting renames in nixos options

- added a nixos test
---
 nixos/modules/services/misc/redmine.nix       | 152 +++++++++++++++---
 nixos/tests/redmine.nix                       |  40 +++++
 .../version-management/redmine/Gemfile        |  64 ++------
 .../version-management/redmine/Gemfile.lock   |  48 +++++-
 .../version-management/redmine/default.nix    |   9 +-
 .../version-management/redmine/gemset.nix     | 151 ++++++++++++++++-
 pkgs/top-level/all-packages.nix               |   2 +-
 7 files changed, 384 insertions(+), 82 deletions(-)
 create mode 100644 nixos/tests/redmine.nix

diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index f763ba21d0b2..c25901708e01 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -5,7 +5,7 @@ with lib;
 let
   cfg = config.services.redmine;
 
-  bundle = "${pkgs.redmine}/share/redmine/bin/bundle";
+  bundle = "${cfg.package}/share/redmine/bin/bundle";
 
   databaseYml = pkgs.writeText "database.yml" ''
     production:
@@ -15,6 +15,7 @@ let
       port: ${toString cfg.database.port}
       username: ${cfg.database.user}
       password: #dbpass#
+      ${optionalString (cfg.database.socket != null) "socket: ${cfg.database.socket}"}
   '';
 
   configurationYml = pkgs.writeText "configuration.yml" ''
@@ -29,6 +30,19 @@ let
     ${cfg.extraConfig}
   '';
 
+  unpackTheme = unpack "theme";
+  unpackPlugin = unpack "plugin";
+  unpack = id: (name: source:
+    pkgs.stdenv.mkDerivation {
+      name = "redmine-${id}-${name}";
+      buildInputs = [ pkgs.unzip ];
+      buildCommand = ''
+        mkdir -p $out
+        cd $out
+        unpackFile ${source}
+      '';
+  });
+
 in
 
 {
@@ -40,6 +54,14 @@ in
         description = "Enable the Redmine service.";
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.redmine;
+        defaultText = "pkgs.redmine";
+        description = "Which Redmine package to use.";
+        example = "pkgs.redmine.override { ruby = pkgs.ruby_2_3; }";
+      };
+
       user = mkOption {
         type = types.str;
         default = "redmine";
@@ -52,6 +74,12 @@ in
         description = "Group under which Redmine is ran.";
       };
 
+      port = mkOption {
+        type = types.int;
+        default = 3000;
+        description = "Port on which Redmine is ran.";
+      };
+
       stateDir = mkOption {
         type = types.str;
         default = "/var/lib/redmine";
@@ -66,6 +94,41 @@ in
 
           See https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration
         '';
+        example = literalExample ''
+          email_delivery:
+            delivery_method: smtp
+            smtp_settings:
+              address: mail.example.com
+              port: 25
+        '';
+      };
+
+      themes = mkOption {
+        type = types.attrsOf types.path;
+        default = {};
+        description = "Set of themes.";
+        example = literalExample ''
+          {
+            dkuk-redmine_alex_skin = builtins.fetchurl {
+              url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip;
+              sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl";
+            };
+          }
+        '';
+      };
+
+      plugins = mkOption {
+        type = types.attrsOf types.path;
+        default = {};
+        description = "Set of plugins.";
+        example = literalExample ''
+          {
+            redmine_env_auth = builtins.fetchurl {
+              url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip;
+              sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak";
+            };
+          }
+        '';
       };
 
       database = {
@@ -78,7 +141,7 @@ in
 
         host = mkOption {
           type = types.str;
-          default = "127.0.0.1";
+          default = (if cfg.database.socket != null then "localhost" else "127.0.0.1");
           description = "Database host address.";
         };
 
@@ -119,6 +182,13 @@ in
             <option>database.user</option>.
           '';
         };
+
+        socket = mkOption {
+          type = types.nullOr types.path;
+          default = null;
+          example = "/run/mysqld/mysqld.sock";
+          description = "Path to the unix socket file to use for authentication.";
+        };
       };
     };
   };
@@ -126,17 +196,20 @@ in
   config = mkIf cfg.enable {
 
     assertions = [
-      { assertion = cfg.database.passwordFile != null || cfg.database.password != "";
-        message = "either services.redmine.database.passwordFile or services.redmine.database.password must be set";
+      { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null;
+        message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set";
+      }
+      { assertion = cfg.database.socket != null -> (cfg.database.type == "mysql2");
+        message = "Socket authentication is only available for the mysql2 database type";
       }
     ];
 
-    environment.systemPackages = [ pkgs.redmine ];
+    environment.systemPackages = [ cfg.package ];
 
     systemd.services.redmine = {
       after = [ "network.target" (if cfg.database.type == "mysql2" then "mysql.service" else "postgresql.service") ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = "${pkgs.redmine}/share/redmine";
+      environment.HOME = "${cfg.package}/share/redmine";
       environment.RAILS_ENV = "production";
       environment.RAILS_CACHE = "${cfg.stateDir}/cache";
       environment.REDMINE_LANG = "en";
@@ -151,43 +224,80 @@ in
         subversion
       ];
       preStart = ''
-        # start with a fresh config directory every time
-        rm -rf ${cfg.stateDir}/config
-        cp -r ${pkgs.redmine}/share/redmine/config.dist ${cfg.stateDir}/config
+        # ensure cache directory exists for db:migrate command
+        mkdir -p ${cfg.stateDir}/cache
 
-        # create the basic state directory layout pkgs.redmine expects
-        mkdir -p /run/redmine
+        # create the basic directory layout the redmine package expects
+        mkdir -p /run/redmine/public
 
         for i in config files log plugins tmp; do
           mkdir -p ${cfg.stateDir}/$i
-          ln -fs ${cfg.stateDir}/$i /run/redmine/$i
+          ln -fs ${cfg.stateDir}/$i /run/redmine/
         done
 
-        # ensure cache directory exists for db:migrate command
-        mkdir -p ${cfg.stateDir}/cache
+        for i in plugin_assets themes; do
+          mkdir -p ${cfg.stateDir}/public/$i
+          ln -fs ${cfg.stateDir}/public/$i /run/redmine/public/
+        done
+
+
+        # start with a fresh config directory
+        # the config directory is copied instead of linked as some mutable data is stored in there
+        rm -rf ${cfg.stateDir}/config/*
+        cp -r ${cfg.package}/share/redmine/config.dist/* ${cfg.stateDir}/config/
 
         # link in the application configuration
         ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml
 
+
+        # link in all user specified themes
+        rm -rf ${cfg.stateDir}/public/themes/*
+        for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do
+          ln -fs $theme/* ${cfg.stateDir}/public/themes/
+        done
+
+        # link in redmine provided themes
+        ln -sf ${cfg.package}/share/redmine/public/themes.dist/* ${cfg.stateDir}/public/themes/
+
+
+        # link in all user specified plugins
+        rm -rf ${cfg.stateDir}/plugins/*
+        for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do
+          ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}
+        done
+
+
+        # ensure correct permissions for most files
         chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/
 
-        # handle database.passwordFile
+
+        # handle database.passwordFile & permissions
         DBPASS=$(head -n1 ${cfg.database.passwordFile})
         cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml
         sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml
         chmod 440 ${cfg.stateDir}/config/database.yml
 
+
         # generate a secret token if required
         if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then
           ${bundle} exec rake generate_secret_token
           chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb
         fi
 
+
         # ensure everything is owned by ${cfg.user}
         chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
 
-        ${bundle} exec rake db:migrate
-        ${bundle} exec rake redmine:load_default_data
+
+        # execute redmine required commands prior to starting the application
+        # NOTE: su required in case using mysql socket authentication
+        /run/wrappers/bin/su -s ${pkgs.bash}/bin/bash -m -l redmine -c '${bundle} exec rake db:migrate'
+        /run/wrappers/bin/su -s ${pkgs.bash}/bin/bash -m -l redmine -c '${bundle} exec rake redmine:load_default_data'
+
+
+        # log files don't exist until after first command has been executed
+        # correct ownership of files generated by calling exec rake ...
+        chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}/log
       '';
 
       serviceConfig = {
@@ -196,13 +306,13 @@ in
         User = cfg.user;
         Group = cfg.group;
         TimeoutSec = "300";
-        WorkingDirectory = "${pkgs.redmine}/share/redmine";
-        ExecStart="${bundle} exec rails server webrick -e production -P ${cfg.stateDir}/redmine.pid";
+        WorkingDirectory = "${cfg.package}/share/redmine";
+        ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P ${cfg.stateDir}/redmine.pid";
       };
 
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "redmine") (singleton
+    users.users = optionalAttrs (cfg.user == "redmine") (singleton
       { name = "redmine";
         group = cfg.group;
         home = cfg.stateDir;
@@ -210,7 +320,7 @@ in
         uid = config.ids.uids.redmine;
       });
 
-    users.extraGroups = optionalAttrs (cfg.group == "redmine") (singleton
+    users.groups = optionalAttrs (cfg.group == "redmine") (singleton
       { name = "redmine";
         gid = config.ids.gids.redmine;
       });
diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix
new file mode 100644
index 000000000000..c1cb15f8288f
--- /dev/null
+++ b/nixos/tests/redmine.nix
@@ -0,0 +1,40 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+{
+  name = "redmine";
+  meta.maintainers = [ lib.maintainers.aanderse ];
+
+  machine =
+    { config, pkgs, ... }:
+    { services.mysql.enable = true;
+      services.mysql.package = pkgs.mariadb;
+      services.mysql.ensureDatabases = [ "redmine" ];
+      services.mysql.ensureUsers = [
+        { name = "redmine";
+          ensurePermissions = { "redmine.*" = "ALL PRIVILEGES"; };
+        }
+      ];
+
+      services.redmine.enable = true;
+      services.redmine.database.socket = "/run/mysqld/mysqld.sock";
+      services.redmine.plugins = {
+        redmine_env_auth = builtins.fetchurl {
+          url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip;
+          sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak";
+        };
+      };
+      services.redmine.themes = {
+        dkuk-redmine_alex_skin = builtins.fetchurl {
+          url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip;
+          sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl";
+        };
+      };
+    };
+
+  testScript = ''
+    startAll;
+
+    $machine->waitForUnit('redmine.service');
+    $machine->waitForOpenPort('3000');
+    $machine->succeed("curl --fail http://localhost:3000/");
+  '';
+})
\ No newline at end of file
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 744d6bfdd74e..a5c509f81a9a 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -54,60 +54,26 @@ platforms :mri, :mingw, :x64_mingw do
   end
 end
 
-# Include database gems for the adapters found in the database
-# configuration file
-require 'erb'
-require 'yaml'
-
-# NixOS - manually added to ensure mysql and postgres will always be include
+# Include database gems for the database adapters NixOS supports
 gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
 gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
 
-database_file = File.join(File.dirname(__FILE__), "config/database.yml")
-if File.exist?(database_file)
-  database_config = YAML::load(ERB.new(IO.read(database_file)).result)
-  adapters = database_config.values.map {|c| c['adapter']}.compact.uniq
-  if adapters.any?
-    adapters.each do |adapter|
-      case adapter
-      when 'mysql2'
-        gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
-      when /postgresql/
-        gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
-      when /sqlite3/
-        gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"),
-                       :platforms => [:mri, :mingw, :x64_mingw]
-      when /sqlserver/
-        gem "tiny_tds", (RUBY_VERSION >= "2.0" ? "~> 1.0.5" : "~> 0.7.0"), :platforms => [:mri, :mingw, :x64_mingw]
-        gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
-      else
-        warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems")
-      end
-    end
-  else
-    warn("No adapter found in config/database.yml, please configure it first")
-  end
-else
-  warn("Please configure your config/database.yml first")
+group :development do
+  gem "rdoc", "~> 4.3"
+  gem "yard"
 end
 
-# NixOS - manually removed because I couldn't figure out how to get "bundle exec rails server webrick -e production" to ignore these groups
-#group :development do
-#  gem "rdoc", "~> 4.3"
-#  gem "yard"
-#end
-
-#group :test do
-#  gem "minitest"
-#  gem "rails-dom-testing"
-#  gem "mocha"
-#  gem "simplecov", "~> 0.9.1", :require => false
-#  # TODO: remove this after upgrading to Rails 5
-#  gem "test_after_commit", "~> 0.4.2"
-#  # For running UI tests
-#  gem "capybara"
-#  gem "selenium-webdriver", "~> 2.53.4"
-#end
+group :test do
+  gem "minitest"
+  gem "rails-dom-testing"
+  gem "mocha"
+  gem "simplecov", "~> 0.9.1", :require => false
+  # TODO: remove this after upgrading to Rails 5
+  gem "test_after_commit", "~> 0.4.2"
+  # For running UI tests
+  gem "capybara"
+  gem "selenium-webdriver", "~> 2.53.4"
+end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exists?(local_gemfile)
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 589537c2af75..54eed51cd868 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -41,12 +41,23 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     builder (3.2.3)
+    capybara (3.9.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     css_parser (1.6.0)
       addressable
+    docile (1.1.5)
     erubis (2.7.0)
+    ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
@@ -59,15 +70,20 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
+    mocha (1.7.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.13.1)
     mysql2 (0.4.10)
     net-ldap (0.12.1)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     pg (0.18.4)
     protected_attributes (1.1.4)
@@ -104,10 +120,11 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.3.1)
-    rbpdf (1.19.5)
+    rbpdf (1.19.6)
       htmlentities
       rbpdf-font (~> 1.19.0)
     rbpdf-font (1.19.1)
+    rdoc (4.3.0)
     redcarpet (3.4.0)
     request_store (1.0.5)
     rmagick (2.16.0)
@@ -118,6 +135,16 @@ GEM
       railties (>= 3.0, < 5.1)
       roadie (~> 3.1)
     ruby-openid (2.3.0)
+    rubyzip (1.2.2)
+    selenium-webdriver (2.53.4)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -125,22 +152,31 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    test_after_commit (0.4.2)
+      activerecord (>= 3.2)
     thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    websocket (1.2.8)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
+    yard (0.9.16)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   actionpack-xml_parser
+  capybara
   coderay (~> 1.1.1)
   i18n (~> 0.7.0)
   jquery-rails (~> 3.1.4)
   mail (~> 2.6.4)
   mime-types (~> 3.0)
   mimemagic
+  minitest
+  mocha
   mysql2 (~> 0.4.6)
   net-ldap (~> 0.12.0)
   nokogiri (~> 1.8.1)
@@ -148,15 +184,21 @@ DEPENDENCIES
   protected_attributes
   rack-openid
   rails (= 4.2.8)
+  rails-dom-testing
   rails-html-sanitizer (>= 1.0.3)
   rbpdf (~> 1.19.3)
+  rdoc (~> 4.3)
   redcarpet (~> 3.4.0)
   request_store (= 1.0.5)
   rmagick (>= 2.14.0)
   roadie (~> 3.2.1)
   roadie-rails (~> 1.1.1)
   ruby-openid (~> 2.3.0)
+  selenium-webdriver (~> 2.53.4)
+  simplecov (~> 0.9.1)
+  test_after_commit (~> 0.4.2)
   tzinfo-data
+  yard
 
 BUNDLED WITH
-   1.16.1
+   1.16.3
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 3c3fd4da33d4..d07e0f3e4544 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -7,6 +7,7 @@ let
 
     inherit ruby;
     gemdir = ./.;
+    groups = [ "ldap" "openid" ];
   };
 in
   stdenv.mkDerivation rec {
@@ -21,15 +22,15 @@ in
 
     buildPhase = ''
       mv config config.dist
+      mv public/themes public/themes.dist
     '';
 
     installPhase = ''
       mkdir -p $out/share
       cp -r . $out/share/redmine
-
-      for i in config files log plugins tmp; do
+      for i in config files log plugins public/plugin_assets public/themes tmp; do
         rm -rf $out/share/redmine/$i
-        ln -fs /run/redmine/$i $out/share/redmine/
+        ln -fs /run/redmine/$i $out/share/redmine/$i
       done
     '';
 
@@ -39,4 +40,4 @@ in
       maintainers = [ maintainers.garbas ];
       license = licenses.gpl2;
     };
-  }
+  }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 7423fcdb9fb9..fe56298056b1 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -96,6 +96,24 @@
     };
     version = "3.2.3";
   };
+  capybara = {
+    dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sz6ick0pn7886jh9fd4571wyplshnpb95pr22ds4hd51zcrnfi4";
+      type = "gem";
+    };
+    version = "3.9.0";
+  };
+  childprocess = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
   coderay = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -129,6 +147,14 @@
     };
     version = "1.6.0";
   };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
   erubis = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -137,6 +163,14 @@
     };
     version = "2.7.0";
   };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
+      type = "gem";
+    };
+    version = "1.9.25";
+  };
   globalid = {
     dependencies = ["activesupport"];
     source = {
@@ -189,6 +223,14 @@
     };
     version = "2.6.6";
   };
+  metaclass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
   mime-types = {
     dependencies = ["mime-types-data"];
     source = {
@@ -214,6 +256,14 @@
     };
     version = "0.3.2";
   };
+  mini_mime = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -230,6 +280,23 @@
     };
     version = "5.11.3";
   };
+  mocha = {
+    dependencies = ["metaclass"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13whjmrm4n48rwx7h7a2jwa5grar3m0fxspbm2pm4lyp7hi119c1";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
   mysql2 = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -250,10 +317,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.8.5";
   };
   pg = {
     source = {
@@ -363,10 +430,10 @@
     dependencies = ["htmlentities" "rbpdf-font"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "021fda3gcz9pyydxnn40vs1nrkycwslb9ip4q0yg3hlip41k1b49";
+      sha256 = "159vg56bzy09f6zrh9h3rxm2r0vkvsfn9qczqmv1vi5xkd918s0d";
       type = "gem";
     };
-    version = "1.19.5";
+    version = "1.19.6";
   };
   rbpdf-font = {
     source = {
@@ -376,6 +443,14 @@
     };
     version = "1.19.1";
   };
+  rdoc = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
   redcarpet = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -426,6 +501,40 @@
     };
     version = "2.3.0";
   };
+  rubyzip = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  selenium-webdriver = {
+    dependencies = ["childprocess" "rubyzip" "websocket"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15qyf7b9fa2nxhhwp551b9fjj82kb3wmy65559yrrcwpdadqvcs4";
+      type = "gem";
+    };
+    version = "2.53.4";
+  };
+  simplecov = {
+    dependencies = ["docile" "multi_json" "simplecov-html"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
   sprockets = {
     dependencies = ["concurrent-ruby" "rack"];
     source = {
@@ -444,6 +553,15 @@
     };
     version = "3.2.1";
   };
+  test_after_commit = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
   thor = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -469,4 +587,29 @@
     };
     version = "1.2.5";
   };
+  websocket = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f11rcn4qgffb1rq4kjfwi7di79w8840x9l74pkyif5arp0mb08x";
+      type = "gem";
+    };
+    version = "1.2.8";
+  };
+  xpath = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y61ijvv04bwga802s8py5xd7fcxci6478wgr9wkd35p45x20jzi";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  yard = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67";
+      type = "gem";
+    };
+    version = "0.9.16";
+  };
 }
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ef3780f9e7d..d2138a8271fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4968,7 +4968,7 @@ with pkgs;
 
   redir = callPackage ../tools/networking/redir { };
 
-  redmine = callPackage ../applications/version-management/redmine { };
+  redmine = callPackage ../applications/version-management/redmine { ruby = pkgs.ruby_2_4; };
 
   redsocks = callPackage ../tools/networking/redsocks { };
 

From 72635ba35908a3b5a04e796f4aba0778b68da70c Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 10 Oct 2018 21:16:42 -0400
Subject: [PATCH 2722/3253] added test to nixos/release.nix so it will be run
 on hydra

---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index 8016dba09152..b0bf94924f3e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -396,6 +396,7 @@ in rec {
   tests.quake3 = callTest tests/quake3.nix {};
   tests.rabbitmq = callTest tests/rabbitmq.nix {};
   tests.radicale = callTest tests/radicale.nix {};
+  tests.redmine = callTest tests/redmine.nix {};
   tests.rspamd = callSubTests tests/rspamd.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.rxe = callTest tests/rxe.nix {};

From c7ac364278a571b4cdd2056a72dd6b74b04af9eb Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Tue, 3 Jul 2018 14:40:09 +0900
Subject: [PATCH 2723/3253] qiskit: 0.5.7 -> 0.6.1

---
 pkgs/development/python-modules/qiskit/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index 0f02560c81f8..1938cb37c75a 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -13,19 +13,21 @@
 , requests
 , requests_ntlm
 , IBMQuantumExperience
+, jsonschema
+, psutil
 , cmake
 , llvmPackages 
 }:
 
 buildPythonPackage rec {
   pname = "qiskit";
-  version = "0.5.7";
+  version = "0.6.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a5a2c6c074f8479dc83d1d599dfebf2363402a182835b8fa5742804055148b17";
+    sha256 = "601e8db4db470593b94a32495c6e90e2db11a9382817a34584520573a7b8cc38";
   };
 
   buildInputs = [ cmake ]
@@ -43,6 +45,8 @@ buildPythonPackage rec {
     requests
     requests_ntlm
     IBMQuantumExperience
+    jsonschema
+    psutil
   ];
 
   # Pypi's tarball doesn't contain tests

From 355fa854f7416b6ef8e9d7546d3023c0388f8077 Mon Sep 17 00:00:00 2001
From: pandaman64 <kointosudesuyo@infoseek.jp>
Date: Wed, 10 Oct 2018 19:53:25 +0900
Subject: [PATCH 2724/3253] qasm2image: 0.7.0 -> 0.8.0

---
 pkgs/development/python-modules/qasm2image/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix
index 5f7cded86fda..429159d05d7d 100644
--- a/pkgs/development/python-modules/qasm2image/default.nix
+++ b/pkgs/development/python-modules/qasm2image/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "qasm2image";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
-    owner = "nelimeee";
+    owner = "nelimee";
     repo = "qasm2image";
-    rev = "57a640621bbbc74244f07e2e068a26411b0d9b24";
-    sha256 = "1ha5vfl4jfwcwbipsq07xlknkrvx79z5bwbzndybclyk9pa69dlz";
+    rev = "2c01756946ba9782973359dbd7bbf6651af6bee5";
+    sha256 = "1bnkzv7wrdvrq71dmsqanb3v2hcsxh5zaglfcxm2d9zzpmvb4a2n";
   };
 
   propagatedBuildInputs = [

From b823983d106c1978f36eb3e35454ee4cbac4317b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 Oct 2018 11:51:09 +0800
Subject: [PATCH 2725/3253] okteta: 0.25.3 -> 0.25.4

---
 pkgs/applications/editors/okteta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index a2337483bf1f..b14065429152 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "okteta-${version}";
-  version = "0.25.3";
+  version = "0.25.4";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
-    sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai";
+    sha256 = "0liar1xbns6mr6j320nyxqfii82i4ysp62hf3j6jg1112v874amf";
   };
 
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

From 6113d95235e67ca49e2a58688c789ee76dca4e2e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 10 Oct 2018 17:32:46 +0000
Subject: [PATCH 2726/3253] prooftree: cleaning

---
 pkgs/applications/science/logic/prooftree/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix
index a88a84e3b0d1..1f6620a2872d 100644
--- a/pkgs/applications/science/logic/prooftree/default.nix
+++ b/pkgs/applications/science/logic/prooftree/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+{ stdenv, fetchurl, pkgconfig, ncurses, ocamlPackages }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "prooftree-${version}";
   version = "0.13";
 
@@ -10,7 +10,8 @@ stdenv.mkDerivation (rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
+  buildInputs = [ ncurses ] ++ (with ocamlPackages; [
+    ocaml findlib camlp5 lablgtk ]);
 
   dontAddPrefix = true;
   configureFlags = [ "--prefix" "$(out)" ];
@@ -39,4 +40,4 @@ stdenv.mkDerivation (rec {
     maintainers = [ maintainers.jwiegley ];
     license = licenses.gpl3;
   };
-})
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 866adafff53f..5a5ae8c1ba10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21278,7 +21278,7 @@ with pkgs;
 
   libpoly = callPackage ../applications/science/logic/poly {};
 
-  prooftree = ocamlPackages.callPackage  ../applications/science/logic/prooftree { };
+  prooftree = callPackage  ../applications/science/logic/prooftree {};
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 

From 714c0781c3bd9956b26becccc05d2f997afd4aa3 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 11 Oct 2018 16:17:40 +0900
Subject: [PATCH 2727/3253] rfc-bibtex: init at 2.2.1

Generate bibtex entries from IETF rfc/drafts, for instance:
$ rfcbibtex RFC5246 draft-ietf-tls-tls13-21

@techreport{RFC5246,
  author = {T. Dierks and E. Rescorla},
  title = {{The Transport Layer Security (TLS) Protocol Version 1.2}},
  howpublished = {Internet Requests for Comments},
  type = {RFC},
  number = {5246},
  year = {2008},
  month = {August},
  issn = {2070-1721},
  publisher = {RFC Editor},
  institution = {RFC Editor},
  url = {http://www.rfc-editor.org/rfc/rfc5246.txt},
  note = {\url{http://www.rfc-editor.org/rfc/rfc5246.txt}},
}

@techreport{I-D.ietf-tls-tls13,
  author = {Eric Rescorla},
  title = {{The Transport Layer Security (TLS) Protocol Version 1.3}},
  howpublished = {Working Draft},
  type = {Internet-Draft},
  number = {draft-ietf-tls-tls13-21},
  year = {2017},
  month = {July},
  institution = {IETF Secretariat},
  url = {http://www.ietf.org/internet-drafts/draft-ietf-tls-tls13-21.txt},
  note = {\url{http://www.ietf.org/internet-drafts/draft-ietf-tls-tls13-21.txt}},
}
---
 .../python-modules/rfc-bibtex/default.nix     | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/rfc-bibtex/default.nix

diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix
new file mode 100644
index 000000000000..a1626d6b65c3
--- /dev/null
+++ b/pkgs/development/python-modules/rfc-bibtex/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonApplication, fetchPypi, isPy3k }:
+
+buildPythonApplication rec {
+  pname = "rfc-bibtex";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p8xjgq4rig1jgqy5jqh34mbifxgxsyyxh8sizwz2wyixf8by8lq";
+  };
+
+  disabled = !isPy3k;
+
+  meta = with stdenv.lib; {
+    homepage = ttps://github.com/iluxonchik/rfc-bibtex/;
+    description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts";
+    license = licenses.mit;
+    maintainers = with maintainers; [ teto ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e808b70fb41e..a33d1bd0ccaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22033,6 +22033,8 @@ with pkgs;
 
   retrofe = callPackage ../misc/emulators/retrofe { };
 
+  rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { };
+
   rpl = callPackage ../tools/text/rpl {
     pythonPackages = python3Packages;
   };

From 6fca3c5700a80d791c07214c8376db2f65d4d331 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 6 Oct 2018 21:21:35 +0100
Subject: [PATCH 2728/3253] cups-googlecloudprint: init at 20160502

---
 nixos/modules/services/printing/cupsd.nix     |  2 +-
 .../cups/drivers/googlecloudprint/default.nix | 64 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/cups/drivers/googlecloudprint/default.nix

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index dbf18ec1d114..1031d6f3d7e2 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -250,7 +250,7 @@ in
       drivers = mkOption {
         type = types.listOf types.path;
         default = [];
-        example = literalExample "[ pkgs.gutenprint pkgs.hplip pkgs.splix ]";
+        example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]";
         description = ''
           CUPS drivers to use. Drivers provided by CUPS, cups-filters,
           Ghostscript and Samba are added unconditionally. If this list contains
diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
new file mode 100644
index 000000000000..b3fc87fbf1da
--- /dev/null
+++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, lib, fetchFromGitHub, python2, python2Packages, file, makeWrapper, cups }:
+
+# Setup instructions can be found at https://github.com/simoncadman/CUPS-Cloud-Print#configuration
+# So the nix version is something like:
+# nix run nixpkgs.cups-googlecloudprint -c sudo setupcloudprint
+# nix run nixpkgs.cups-googlecloudprint -c sudo listcloudprinters
+
+let pythonEnv = python2.buildEnv.override {
+  extraLibs = with python2Packages; [
+    six
+    httplib2
+    pycups
+  ];
+};
+
+in stdenv.mkDerivation rec {
+  name    = "cups-googlecloudprint-${version}";
+  version = "20160502";
+
+  src = fetchFromGitHub {
+    owner  = "simoncadman";
+    repo   = "CUPS-Cloud-Print";
+    rev    = version;
+    sha256 = "0760i12w7jrhq7fsgyz3yqla5cvpjb45n6m2jz96wsy3p3xf6dzz";
+  };
+
+  buildInputs = [ cups makeWrapper ];
+
+  cupsgroup = "nonexistantgroup";
+  NOPERMS = 1;
+
+  postConfigure = ''
+    substituteInPlace Makefile --replace "${cups}" "$out"
+  '';
+
+  postInstall = ''
+    pushd "$out"
+    for s in lib/cups/backend/gcp lib/cups/driver/cupscloudprint
+    do
+      echo "Wrapping $s..."
+      wrapProgram "$out/$s" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
+    done
+
+    mkdir bin
+
+    for s in share/cloudprint-cups/*.py
+    do
+      if [ -x "$s" ] # Only wrapping those Python scripts marked as executable
+      then
+        o="bin/$(echo $s | sed 's,share/cloudprint-cups/\(.*\).py,\1,')"
+        echo "Wrapping $o -> $s..."
+        makeWrapper "$out/$s" "$o" --set PATH "${lib.makeBinPath [pythonEnv file]}" --prefix PYTHONPATH : "$out/share/cloudprint-cups"
+      fi
+    done
+    popd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print";
+    homepage    = http://ccp.niftiestsoftware.com;
+    platforms   = platforms.linux;
+    license     = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a3b1fcfb74a..d8fd9e855f7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21682,6 +21682,8 @@ with pkgs;
 
   cups-brother-hl1110 = pkgsi686Linux.callPackage ../misc/cups/drivers/hl1110 { };
 
+  cups-googlecloudprint = callPackage ../misc/cups/drivers/googlecloudprint { };
+
   # this driver ships with pre-compiled 32-bit binary libraries
   cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
 

From 3dec3de2d3a89ea212154aaaca4621fb62a16af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 4 Oct 2018 23:26:45 +0100
Subject: [PATCH 2729/3253] dino: 2018-09-05 -> 2018-09-21

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 777057b327b0..7fe68163ab96 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-09-05";
+  name = "dino-unstable-2018-09-21";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "79e0aee5fdb90830fad748fdfae717cb5fbf91f9";
-    sha256 = "1sfh729fg6c5ds3rcma13paqnvv58jln34s93j74jnca19wgn7k5";
+    rev = "6b7ef800f54e781a618425236ba8d4ed2f2fef9c";
+    sha256 = "1si815b6y06lridj88hws0dgq54w9jfam9sqbrq3cfcvmhc38ysk";
     fetchSubmodules = true;
   };
 

From a814322eda88c16d72c5963023ec05777fb8d247 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 11 Oct 2018 10:26:33 +0200
Subject: [PATCH 2730/3253] piper: fix gi dependencies

Currently fails with "ValueError: Namespace Gtk not available"
---
 pkgs/os-specific/linux/piper/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index 3e774faaffe2..a3ae0b74f126 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -1,5 +1,6 @@
 { stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3
-, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 }:
+, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
+, gobjectIntrospection }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "piper-${version}";
@@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb";
   };
 
-  nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib ];
+  nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];
   buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ];
   propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
 

From 4f3c13b84f1b762b27785b9dc68b4382eabc1c73 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@icloud.com>
Date: Thu, 11 Oct 2018 09:37:38 +0000
Subject: [PATCH 2731/3253] gildas: 20181001_a -> 20181001_b (#48200)

---
 pkgs/applications/science/astronomy/gildas/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index dcb76320a9b5..802f558731a8 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "oct18a";
-  version = "20181001_a";
+  srcVersion = "oct18b";
+  version = "20181001_b";
   name = "gildas-${version}";
 
   src = fetchurl {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     # source code of the previous release to a different directory
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
-    sha256 = "091941a74kaw3xqsmqda7bj972cafi8ppj2c5xq0mca2c075dyfx";
+    sha256 = "1q54q7y4zdax9vr28pvmy5g34kyr92jr3v1rkpjw7lxjafyqwy27";
   };
 
   enableParallelBuilding = true;

From 3bc454fda771ac97cdc71dcc01c26929b11a1f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 Oct 2018 10:45:42 +0100
Subject: [PATCH 2732/3253] alacritty: 0.2.0 -> 0.2.1

---
 pkgs/applications/misc/alacritty/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 34e46e9fa0f0..e4dffa98f39a 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,6 +1,6 @@
 { stdenv,
   lib,
-  fetchgit,
+  fetchFromGitHub,
   rustPlatform,
   cmake,
   makeWrapper,
@@ -51,18 +51,16 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
-  # At the moment we cannot handle git dependencies in buildRustPackage.
-  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
-  src = fetchgit {
-    url = https://github.com/Mic92/alacritty.git;
-    rev = "rev-${version}";
-    sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn";
-    fetchSubmodules = true;
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "alacritty";
+    rev = "v${version}";
+    sha256 = "1402axwjz70gg6ylhhm82f1rl6xvxkr1qy0jx3r4r32vzfap1l67";
   };
 
-  cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx";
+  cargoSha256 = "0slcyn77svj0686g1vk7kgndzirpkba9jwwybgsdl755r53dswk0";
 
   nativeBuildInputs = [
     cmake

From 1c0c0cb7c9a2dc2df1a3a47b4a659367dab17b19 Mon Sep 17 00:00:00 2001
From: Edmund Wu <22758444+eadwu@users.noreply.github.com>
Date: Thu, 11 Oct 2018 05:53:41 -0400
Subject: [PATCH 2733/3253] glava: 1.5.1 -> 1.5.5 (#48086)

---
 pkgs/applications/misc/glava/default.nix | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 1eb0d0048f64..7e32e566234e 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -5,17 +5,6 @@
 let
   inherit (stdenv.lib) optional makeLibraryPath;
 
-  # gl.xml
-  gl = fetchurl {
-    url = https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/56312cfe680e4be5ae61bbf1c628e420f8731718/xml/gl.xml;
-    sha256 = "1c45bcgaxiic5gmb3gkrd9qcvascvij97vz5y6fc3a2y7x3gjc5l";
-  };
-  # EGL 1.5
-  egl = fetchurl {
-    url = https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h;
-    sha256 = "0p0vs4siiya05cvbqq7cw3ci2zvvlfh8kycgm9k9cwvmrkj08349";
-  };
-
   wrapperScript = writeScript "glava" ''
     #!${stdenv.shell}
     case "$1" in
@@ -33,12 +22,12 @@ let
 in
   stdenv.mkDerivation rec {
     name = "glava-${version}";
-    version = "1.5.1";
+    version = "1.5.5";
 
     src = fetchgit {
       url = "https://github.com/wacossusca34/glava.git";
       rev = "v${version}";
-      sha256 = "1k8x0a0g2pm7ficsk4az9s7mjbm85a987apjg5c4y6iyldxgd6sb";
+      sha256 = "0mpbgllwz45wkax6pgvnh1pz2q4yvbzq2l8z8kff13wrsdvl8lh0";
     };
 
     buildInputs = [
@@ -54,12 +43,8 @@ in
       python3
     ];
 
-    patchPhase = ''
-      mkdir -p glad/include/KHR
-
-      cp ${gl} glad/gl.xml
-      cp ${egl} glad/include/KHR/khrplatform.h
-      patchShebangs .
+    preConfigure = ''
+      export CFLAGS="-march=native"
     '';
 
     makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1";

From 58654866ceab5d3161a4afcd037e425085dab652 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 12:12:54 +0200
Subject: [PATCH 2734/3253] libssh2: add license

---
 pkgs/development/libraries/libssh2/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index a6802a7f5183..b050dede8c61 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl zlib ]
     ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = https://www.libssh2.org;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.bsd3;
     maintainers = [ ];
   };
 }

From d429573ddbded1ff453745ef42ed006ae952a2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 Oct 2018 10:45:42 +0100
Subject: [PATCH 2735/3253] alacritty: 0.2.0 -> 0.2.1

---
 pkgs/applications/misc/alacritty/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 34e46e9fa0f0..e4dffa98f39a 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,6 +1,6 @@
 { stdenv,
   lib,
-  fetchgit,
+  fetchFromGitHub,
   rustPlatform,
   cmake,
   makeWrapper,
@@ -51,18 +51,16 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "0.2.0";
+  version = "0.2.1";
 
-  # At the moment we cannot handle git dependencies in buildRustPackage.
-  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
-  src = fetchgit {
-    url = https://github.com/Mic92/alacritty.git;
-    rev = "rev-${version}";
-    sha256 = "1c9izflacm693rwkxwakxgnpkvxwc8mqasr5p7x0ys6xg91h9sxn";
-    fetchSubmodules = true;
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "alacritty";
+    rev = "v${version}";
+    sha256 = "1402axwjz70gg6ylhhm82f1rl6xvxkr1qy0jx3r4r32vzfap1l67";
   };
 
-  cargoSha256 = "1ijgkwv9ij4haig1h6n2b9xbhp5vahy9vp1sx72wxaaj9476msjx";
+  cargoSha256 = "0slcyn77svj0686g1vk7kgndzirpkba9jwwybgsdl755r53dswk0";
 
   nativeBuildInputs = [
     cmake

From 6327ba8fbd475ad1f21e8d2f7d39dfd0cbff73ea Mon Sep 17 00:00:00 2001
From: Kim Burgess <kim@acaprojects.com>
Date: Wed, 10 Oct 2018 00:41:28 +1000
Subject: [PATCH 2736/3253] teleconsole: init at 0.4.0

---
 pkgs/tools/misc/teleconsole/default.nix | 34 +++++++++++++++++++++++++
 pkgs/tools/misc/teleconsole/deps.nix    | 13 ++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/misc/teleconsole/default.nix
 create mode 100644 pkgs/tools/misc/teleconsole/deps.nix

diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix
new file mode 100644
index 000000000000..2d3eb91250a8
--- /dev/null
+++ b/pkgs/tools/misc/teleconsole/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "teleconsole-${version}";
+  version = "0.4.0";
+
+  goPackagePath = "github.com/gravitational/teleconsole";
+
+  src = fetchFromGitHub {
+    owner = "gravitational";
+    repo = "teleconsole";
+    rev = version;
+    sha256 = "01552422n0bj1iaaw6pvg9l1qr66r69sdsngxbcdjn1xh3mj74sm";
+  };
+
+  goDeps = ./deps.nix;
+
+  CGO_ENABLED = 1;
+  buildFlags = "-ldflags";
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.teleconsole.com/";
+    description = "Share your terminal session with people you trust";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    # Builds for Aarch64 not possible in the current release due to
+    # incompatibilities further up the dependency chain.
+    # See:
+    #  - https://github.com/gravitational/teleport/issues/679
+    #  - https://github.com/kr/pty/issues/27
+    broken = stdenv.isAarch64;
+    maintainers = [ maintainers.kimburgess ];
+  };
+}
diff --git a/pkgs/tools/misc/teleconsole/deps.nix b/pkgs/tools/misc/teleconsole/deps.nix
new file mode 100644
index 000000000000..f13529d4b25a
--- /dev/null
+++ b/pkgs/tools/misc/teleconsole/deps.nix
@@ -0,0 +1,13 @@
+[
+    # Teleport v2.0.0-alpha.4 required for build.
+    # See https://github.com/gravitational/teleconsole/blob/09591f227c2a8df4c68af8bc4adfadfc596f4ed2/Makefile#L8
+    {
+      goPackagePath = "github.com/gravitational/teleport";
+      fetch = {
+        type = "git";
+        url = "https://github.com/gravitational/teleport";
+        rev = "2cb40abd8ea8fb2915304ea4888b5b9f3e5bc223";
+        sha256 = "1xw3bfnjbj88x465snwwzn4bmpmzmsrq9r0pkj388qwvfrclgnfk";
+      };
+    }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9978b2969c91..075c22c800be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5550,6 +5550,8 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
+  teleconsole = callPackage ../tools/misc/teleconsole { };
+
   telegraf = callPackage ../servers/monitoring/telegraf { };
 
   teleport = callPackage ../servers/teleport {};

From bccf6af31084a122bad89592dead265150c67cd3 Mon Sep 17 00:00:00 2001
From: Brendan Hall <brendan.j.hall@bath.edu>
Date: Thu, 11 Oct 2018 02:24:01 +0100
Subject: [PATCH 2737/3253] Maintainers: Add Brendan Hall (me) as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a77df8e8cc27..d5a2874b38e5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -520,6 +520,11 @@
     github = "bgamari";
     name = "Ben Gamari";
   };
+  bhall = {
+    email = "brendan.j.hall@bath.edu";
+    github = "brendan-hall";
+    name = "Brendan Hall";
+  };
   bhipple = {
     email = "bhipple@protonmail.com";
     github = "bhipple";

From e1c5b4793532f3e85afa44b7816d76c7b9654950 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 11 Oct 2018 04:20:01 -0700
Subject: [PATCH 2738/3253] pmd: 6.7.0 -> 6.8.0 (#47736)

* pmd: 6.7.0 -> 6.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pmd/versions

* pmd: refresh meta

Homepage is now https://pmd.github.io/
Added licenses
---
 pkgs/development/tools/analysis/pmd/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 187b2d7b03f9..89b0a33c0682 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.7.0";
+  version = "6.8.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c";
+    sha256 = "1vfkg2l3sl5ahhs89nvkg0z1ah1k67c44nwpvaymq73rb2bb8ibr";
   };
 
   installPhase = ''
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
     cp -R * $out
   '';
 
-  meta = {
-    description = "Scans Java source code and looks for potential problems";
-    homepage = http://pmd.sourceforge.net/;
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "An extensible cross-language static code analyzer.";
+    homepage = https://pmd.github.io/;
+    platforms = platforms.unix;
+    license = with licenses; [ bsdOriginal asl20 ];
   };
 }
 

From 975f476cd27c6a8a3ea11aac746396573845b091 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 11 Oct 2018 08:04:47 -0400
Subject: [PATCH 2739/3253] quoting stateDir path in case it includes spaces

---
 nixos/modules/services/misc/redmine.nix | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index c25901708e01..8d25ac5cb76f 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -225,68 +225,68 @@ in
       ];
       preStart = ''
         # ensure cache directory exists for db:migrate command
-        mkdir -p ${cfg.stateDir}/cache
+        mkdir -p "${cfg.stateDir}/cache"
 
         # create the basic directory layout the redmine package expects
         mkdir -p /run/redmine/public
 
         for i in config files log plugins tmp; do
-          mkdir -p ${cfg.stateDir}/$i
-          ln -fs ${cfg.stateDir}/$i /run/redmine/
+          mkdir -p "${cfg.stateDir}/$i"
+          ln -fs "${cfg.stateDir}/$i" /run/redmine/
         done
 
         for i in plugin_assets themes; do
-          mkdir -p ${cfg.stateDir}/public/$i
-          ln -fs ${cfg.stateDir}/public/$i /run/redmine/public/
+          mkdir -p "${cfg.stateDir}/public/$i"
+          ln -fs "${cfg.stateDir}/public/$i" /run/redmine/public/
         done
 
 
         # start with a fresh config directory
         # the config directory is copied instead of linked as some mutable data is stored in there
-        rm -rf ${cfg.stateDir}/config/*
-        cp -r ${cfg.package}/share/redmine/config.dist/* ${cfg.stateDir}/config/
+        rm -rf "${cfg.stateDir}/config/"*
+        cp -r ${cfg.package}/share/redmine/config.dist/* "${cfg.stateDir}/config/"
 
         # link in the application configuration
-        ln -fs ${configurationYml} ${cfg.stateDir}/config/configuration.yml
+        ln -fs ${configurationYml} "${cfg.stateDir}/config/configuration.yml"
 
 
         # link in all user specified themes
-        rm -rf ${cfg.stateDir}/public/themes/*
+        rm -rf "${cfg.stateDir}/public/themes/"*
         for theme in ${concatStringsSep " " (mapAttrsToList unpackTheme cfg.themes)}; do
-          ln -fs $theme/* ${cfg.stateDir}/public/themes/
+          ln -fs $theme/* "${cfg.stateDir}/public/themes"
         done
 
         # link in redmine provided themes
-        ln -sf ${cfg.package}/share/redmine/public/themes.dist/* ${cfg.stateDir}/public/themes/
+        ln -sf ${cfg.package}/share/redmine/public/themes.dist/* "${cfg.stateDir}/public/themes/"
 
 
         # link in all user specified plugins
-        rm -rf ${cfg.stateDir}/plugins/*
+        rm -rf "${cfg.stateDir}/plugins/"*
         for plugin in ${concatStringsSep " " (mapAttrsToList unpackPlugin cfg.plugins)}; do
-          ln -fs $plugin/* ${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}
+          ln -fs $plugin/* "${cfg.stateDir}/plugins/''${plugin##*-redmine-plugin-}"
         done
 
 
         # ensure correct permissions for most files
-        chmod -R ug+rwX,o-rwx+x ${cfg.stateDir}/
+        chmod -R ug+rwX,o-rwx+x "${cfg.stateDir}/"
 
 
         # handle database.passwordFile & permissions
         DBPASS=$(head -n1 ${cfg.database.passwordFile})
-        cp -f ${databaseYml} ${cfg.stateDir}/config/database.yml
-        sed -e "s,#dbpass#,$DBPASS,g" -i ${cfg.stateDir}/config/database.yml
-        chmod 440 ${cfg.stateDir}/config/database.yml
+        cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml"
+        sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml"
+        chmod 440 "${cfg.stateDir}/config/database.yml"
 
 
         # generate a secret token if required
         if ! test -e "${cfg.stateDir}/config/initializers/secret_token.rb"; then
           ${bundle} exec rake generate_secret_token
-          chmod 440 ${cfg.stateDir}/config/initializers/secret_token.rb
+          chmod 440 "${cfg.stateDir}/config/initializers/secret_token.rb"
         fi
 
 
         # ensure everything is owned by ${cfg.user}
-        chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
+        chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}"
 
 
         # execute redmine required commands prior to starting the application
@@ -297,7 +297,7 @@ in
 
         # log files don't exist until after first command has been executed
         # correct ownership of files generated by calling exec rake ...
-        chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}/log
+        chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}/log"
       '';
 
       serviceConfig = {
@@ -307,7 +307,7 @@ in
         Group = cfg.group;
         TimeoutSec = "300";
         WorkingDirectory = "${cfg.package}/share/redmine";
-        ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P ${cfg.stateDir}/redmine.pid";
+        ExecStart="${bundle} exec rails server webrick -e production -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'";
       };
 
     };

From e820c4cdaad03a2b9354f6d55928153b6cd7ea08 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 11 Oct 2018 20:22:25 +0800
Subject: [PATCH 2740/3253] iio-sensor-proxy: 2.4 -> 2.5 (#48195)

---
 pkgs/os-specific/linux/iio-sensor-proxy/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
index 0ccc8acfdca9..dcd5b4763ff1 100644
--- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
+++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
@@ -3,19 +3,23 @@
 
 stdenv.mkDerivation rec {
   name = "iio-sensor-proxy-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner  = "hadess";
     repo   = "iio-sensor-proxy";
     rev    = version;
-    sha256 = "1c8izq73c00gvv0jc6zby5hcircs4cb16a1d3ivp1i1iflknj46n";
+    sha256 = "06x1vvslsa44bgw8s5rr17q9i2ssbw0x04l75zsy3rql9r3y2jzg";
   };
 
   configurePhase = ''
+    runHook preConfigure
+
     ./autogen.sh --prefix=$out \
       --with-udevrulesdir=$out/lib/udev/rules.d \
       --with-systemdsystemunitdir=$out/lib/systemd/system
+
+    runHook postConfigure
   '';
 
   buildInputs = [

From cc6e59e5d16d14281f0a9ccb8a9ef9073c71795a Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:24:40 +0200
Subject: [PATCH 2741/3253] libqalculate: add license meta

---
 pkgs/development/libraries/libqalculate/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 377d9fe50be7..2c25d4181196 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     description = "An advanced calculator library";
     homepage = http://qalculate.github.io;
     maintainers = with maintainers; [ gebner ];
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
   };
 }

From e2f10b5a74ec45b20b52928f6197abf3d8c0b0c3 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:26:30 +0200
Subject: [PATCH 2742/3253] libtiger: add license meta

---
 pkgs/development/libraries/libtiger/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix
index bd0084dbaaf7..7a72fa2b7a31 100644
--- a/pkgs/development/libraries/libtiger/default.nix
+++ b/pkgs/development/libraries/libtiger/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     homepage = https://code.google.com/archive/p/libtiger/;
     description = "A rendering library for Kate streams using Pango and Cairo";
     platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ matthewbauer ];
   };
 }

From a174f3ea97bc50bbb103054002e004f74b4007e8 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:27:14 +0200
Subject: [PATCH 2743/3253] libtxc_dxtn: add license meta

---
 pkgs/development/libraries/libtxc_dxtn/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index 21e3a15449c2..b0be3cb3c12d 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libGLU_combined ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://dri.freedesktop.org/wiki/S3TC;
     repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
 }

From 55c736cd78440ec7b8b7810eff3b7e2e0e81531f Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:28:08 +0200
Subject: [PATCH 2744/3253] libui: add license meta

---
 pkgs/development/libraries/libui/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index b1e6938a1494..9eb2fe04fe68 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -49,9 +49,10 @@ in
       install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage    = https://github.com/andlabs/libui;
       description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";
-      platforms   = stdenv.lib.platforms.unix;
+      license     = licenses.mit;
+      platforms   = platforms.unix;
     };
   }

From 9ea9d86126b8fefbe0930e809313a34317c47ac7 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 11 Oct 2018 08:32:00 -0400
Subject: [PATCH 2745/3253] switched from builtins.fetchurl to pkgs.fetchurl

---
 nixos/tests/redmine.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix
index c1cb15f8288f..330f72854cac 100644
--- a/nixos/tests/redmine.nix
+++ b/nixos/tests/redmine.nix
@@ -17,13 +17,13 @@ import ./make-test.nix ({ pkgs, lib, ... }:
       services.redmine.enable = true;
       services.redmine.database.socket = "/run/mysqld/mysqld.sock";
       services.redmine.plugins = {
-        redmine_env_auth = builtins.fetchurl {
+        redmine_env_auth = pkgs.fetchurl {
           url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip;
           sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak";
         };
       };
       services.redmine.themes = {
-        dkuk-redmine_alex_skin = builtins.fetchurl {
+        dkuk-redmine_alex_skin = pkgs.fetchurl {
           url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip;
           sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl";
         };
@@ -37,4 +37,4 @@ import ./make-test.nix ({ pkgs, lib, ... }:
     $machine->waitForOpenPort('3000');
     $machine->succeed("curl --fail http://localhost:3000/");
   '';
-})
\ No newline at end of file
+})

From 0cda784a79ca48fe64f2b90241e32eb737130e39 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:30:10 +0200
Subject: [PATCH 2746/3253] libusb: add license and other metadata

---
 pkgs/development/libraries/libusb/default.nix  | 12 ++++++++++--
 pkgs/development/libraries/libusb1/default.nix | 13 +++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 4704a1e5c331..adf354c45f2e 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -16,7 +16,15 @@ stdenv.mkDerivation {
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    homepage = "https://libusb.info/";
+    repositories.git = "https://github.com/libusb/libusb-compat-0.1";
+    description = "cross-platform user-mode USB device library";
+    longDescription = ''
+      libusb is a cross-platform user-mode library that provides access to USB devices.
+      The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API.
+    '';
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 7ec714f02237..ac5c38a34f11 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -21,10 +21,15 @@ stdenv.mkDerivation rec {
     sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
-  meta = {
-    homepage = http://www.libusb.info;
-    description = "User-space USB library";
-    platforms = stdenv.lib.platforms.all;
+  meta = with stdenv.lib; {
+    homepage = "https://libusb.info/";
+    repositories.git = "https://github.com/libusb/libusb";
+    description = "cross-platform user-mode USB device library";
+    longDescription = ''
+      libusb is a cross-platform user-mode library that provides access to USB devices.
+    '';
+    platforms = platforms.all;
+    license = licenses.lgpl21Plus;
     maintainers = [ ];
   };
 }

From 8362673d4bcedb4fd1c554282df57e72f24530d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 11 Oct 2018 14:37:49 +0200
Subject: [PATCH 2747/3253] nload: Include patch to fix screen corruption.
 (#48017)

See added comment for details.
---
 pkgs/applications/networking/nload/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
index 879461c8acd5..2c16fabc5c41 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/pkgs/applications/networking/nload/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, fetchpatch, ncurses }:
 
 stdenv.mkDerivation rec {
   version = "0.7.4";
@@ -9,6 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61";
   };
 
+  patches = [
+    # Fixes an ugly bug of graphs scrolling to the side, corrupting the view.
+    # There is an upstream fix, but not a new upstream release that includes it.
+    # Other distributions like Gentoo also patch this as a result; see:
+    #   https://github.com/rolandriegel/nload/issues/3#issuecomment-427579143
+    # TODO Remove when https://github.com/rolandriegel/nload/issues/3 is merged and available
+    (fetchpatch {
+      url = "https://github.com/rolandriegel/nload/commit/8a93886e0fb33a81b8fe32e88ee106a581fedd34.patch";
+      name = "nload-0.7.4-Eliminate-flicker-on-some-terminals.patch";
+      sha256 = "10yppy5l50wzpcvagsqkbyf1rcan6aj30am4rw8hmkgnbidf4zbq";
+    })
+  ];
+
   buildInputs = [ ncurses ];
 
   meta = {

From 33171befdbbd4370343d2250fdc82309125fb2ac Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 11 Oct 2018 14:33:20 +0200
Subject: [PATCH 2748/3253] spotify: fix icon

---
 pkgs/applications/audio/spotify/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 81cda4edaedb..cbcf5220564b 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -126,6 +126,9 @@ stdenv.mkDerivation {
         --prefix LD_LIBRARY_PATH : "$librarypath" \
         --prefix PATH : "${gnome3.zenity}/bin"
 
+      # fix Icon line in the desktop file (#48062)
+      sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop"
+
       # Desktop file
       mkdir -p "$out/share/applications/"
       cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"

From e3d97997fff1bad6fbef5001619dc5a0910a2364 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Wed, 3 Oct 2018 13:40:34 +0200
Subject: [PATCH 2749/3253] brigand: init at 1.3.0

---
 .../development/libraries/brigand/default.nix | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/brigand/default.nix

diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
new file mode 100644
index 000000000000..b4a57396cc8b
--- /dev/null
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "brigand-${version}";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "edouarda";
+    repo = "brigand";
+    rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3";
+    sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Instant compile time C++ 11 metaprogramming library";
+    longDescription = ''
+      Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
+      Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!'';
+    homepage = https://github.com/edouarda/brigand;
+    license = licenses.boost;
+    maintainers = with maintainers; [ pmiddend ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8fd9e855f7e..2c8d5a3548dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -963,6 +963,8 @@ with pkgs;
 
   brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
 
+  brigand = callPackage ../development/libraries/brigand { };
+
   brltty = callPackage ../tools/misc/brltty {
     alsaSupport = (!stdenv.isDarwin);
     systemdSupport = stdenv.isLinux;

From 2dcd512e7431001c7c0b80db60f524e2893c7654 Mon Sep 17 00:00:00 2001
From: Victor SENE <Vskilet@users.noreply.github.com>
Date: Thu, 11 Oct 2018 16:13:23 +0200
Subject: [PATCH 2750/3253] nixos/nextcloud: add poolConfig option (#48094)

---
 nixos/modules/services/web-apps/nextcloud.nix | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 44c3df1d057b..db4c8e1a3d85 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -114,6 +114,21 @@ in {
       '';
     };
 
+    poolConfig = mkOption {
+      type = types.lines;
+      default = ''
+        pm = dynamic
+        pm.max_children = 32
+        pm.start_servers = 2
+        pm.min_spare_servers = 2
+        pm.max_spare_servers = 4
+        pm.max_requests = 500
+      '';
+      description = ''
+        Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
+      '';
+    };
+
     config = {
       dbtype = mkOption {
         type = types.enum [ "sqlite" "pgsql" "mysql" ];
@@ -339,11 +354,7 @@ in {
             listen.group = nginx
             user = nextcloud
             group = nginx
-            pm = dynamic
-            pm.max_children = 32
-            pm.start_servers = 2
-            pm.min_spare_servers = 2
-            pm.max_spare_servers = 4
+            ${cfg.poolConfig}
             env[NEXTCLOUD_CONFIG_DIR] = ${cfg.home}/config
             env[PATH] = /run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin
             ${phpAdminValues}

From 3e356b55dde193545e89492f50c1364b84f7a526 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 11 Oct 2018 16:17:57 +0200
Subject: [PATCH 2751/3253] lazygit: init at 0.4

---
 pkgs/development/tools/lazygit/default.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/tools/lazygit/default.nix

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
new file mode 100644
index 000000000000..87571f1fcbb7
--- /dev/null
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "lazygit-${version}";
+  version = "0.4";
+
+  goPackagePath = "github.com/jesseduffield/lazygit";
+
+  src = fetchFromGitHub {
+    owner = "jesseduffield";
+    repo = "lazygit";
+    rev = "v${version}";
+    sha256 = "0piljnwv778z7zc1pglkidiys1a3yv4d7z9wsrcj1nszlcn3ifyz";
+  };
+
+  postPatch = ''
+    rm -rf scripts
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Simple terminal UI for git commands";
+    license = licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ fpletz ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c8d5a3548dc..8c8696d7f794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8558,6 +8558,8 @@ with pkgs;
 
   kythe = callPackage ../development/tools/kythe { };
 
+  lazygit = callPackage ../development/tools/lazygit { };
+
   Literate = callPackage ../development/tools/literate-programming/Literate {};
 
   lcov = callPackage ../development/tools/analysis/lcov { };

From fceab3ec621e13b6317af77c7177c7ebd2c1dd64 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 11 Oct 2018 17:23:47 +0200
Subject: [PATCH 2752/3253] lib: fix wording of the `overrideScope` warning

---
 lib/customisation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index df9d977e9ec7..68062dd0daf0 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -196,7 +196,7 @@ rec {
           newScope = scope: newScope (self // scope);
           callPackage = self.newScope {};
           overrideScope = g: lib.warn
-            "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: self: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
+            "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: super: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
             (makeScope newScope (lib.fixedPoints.extends (lib.flip g) f));
           overrideScope' = g: makeScope newScope (lib.fixedPoints.extends g f);
           packages = f;

From da3529718d7cb6dffc780ece0c638c4d20bbe6c9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 11 Oct 2018 21:04:29 +0200
Subject: [PATCH 2753/3253] gem-config: add sassc (#48212)

---
 pkgs/development/ruby-modules/gem-config/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index eb9be9ed18c9..8640d43775dc 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -319,6 +319,10 @@ in
     dontUseCmakeConfigure = true;
   };
 
+  sassc = attrs: {
+    nativeBuildInputs = [ rake ];
+  };
+
   scrypt = attrs:
     if stdenv.isDarwin then {
       dontBuild = false;

From 544051b0b0c0b7a78680f65a44e1e75ca0cfdffb Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 11 Oct 2018 19:09:22 +0000
Subject: [PATCH 2754/3253] coreutils-full: fix cross build

---
 pkgs/tools/misc/coreutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 582f8d8f05f9..de971cc51ac4 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) ''
     rm $out/share/man/man1/*
-    cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
+    cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1
   ''
   # du: 8.7 M locale + 0.4 M man pages
   + optionalString minimal ''

From edff37b83aa8b78fd66ca02a8fd4499b2ed2b949 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 11 Oct 2018 17:00:01 +0200
Subject: [PATCH 2755/3253] ti-rpc: Add dev output

---
 pkgs/development/libraries/ti-rpc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 77c0b4a1a460..c139b5be1027 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
   };
 
+  outputs = [ "out" "dev" ];
+
   postPatch = ''
     sed '1i#include <stdint.h>' -i src/xdr_sizeof.c
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''

From 8beb1e26e05eb40c2ebf1a7907f41d612c2350b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 11 Oct 2018 17:40:20 +0200
Subject: [PATCH 2756/3253] nfs-utils: Get rid of runtime dependency on
 kerberos.dev

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 86e9e0d3d4d0..7235d8415f55 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -5,14 +5,9 @@
 
 let
   statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
+in
 
-  # Not nice; feel free to find a nicer solution.
-  kerberosEnv = buildEnv {
-    name = "kerberos-env-${kerberos.version}";
-    paths = with lib; [ (getDev kerberos) (getLib kerberos) ];
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "nfs-utils-${version}";
   version = "2.3.3";
 
@@ -34,10 +29,19 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preConfigure =
+    ''
+      substituteInPlace configure \
+        --replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \
+        --replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config
+    '';
+
+  #configureScript = "bash -x configure";
+
   configureFlags =
     [ "--enable-gss"
       "--with-statedir=/var/lib/nfs"
-      "--with-krb5=${kerberosEnv}"
+      "--with-krb5=${lib.getLib kerberos}"
       "--with-systemd=${placeholder "out"}/etc/systemd/system"
       "--enable-libmount-mount"
       "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
@@ -97,6 +101,8 @@ in stdenv.mkDerivation rec {
   # One test fails on mips.
   doCheck = !stdenv.isMips;
 
+  disallowedReferences = [ (lib.getDev kerberos) ];
+
   meta = with stdenv.lib; {
     description = "Linux user-space NFS utilities";
 

From 6d74e1cb5be952e767d56a396cb0d644da588dac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 11 Oct 2018 17:57:50 +0200
Subject: [PATCH 2757/3253] udisks2: Fix broken dependency on xfsprogs

---
 pkgs/os-specific/linux/udisks/2-default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index a816a2139395..4f59828098c3 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -2,7 +2,7 @@
 , gnome3, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash
 , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted
 , gobjectIntrospection, docbook_xml_dtd_412, docbook_xml_dtd_43
-, libxfs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
+, xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
 }:
 
 let
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     })
     (substituteAll {
       src = ./force-path.patch;
-      path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils libxfs ntfs3g parted utillinux ];
+      path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted utillinux ];
     })
   ];
 

From 2004343f56287dda5ab8cb1a78c47ac2ff9d3835 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 11 Oct 2018 17:47:20 +0200
Subject: [PATCH 2758/3253] libotf: Add dev output

---
 pkgs/tools/inputmethods/m17n-lib/otf.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix
index 6e13b4a949c4..95eea7641875 100644
--- a/pkgs/tools/inputmethods/m17n-lib/otf.nix
+++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, libXaw, freetype }:
+
 stdenv.mkDerivation rec {
   name = "libotf-0.9.16";
 
@@ -7,8 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8";
   };
 
+  outputs = [ "out" "dev" ];
+
   buildInputs = [ libXaw freetype ];
 
+  postInstall =
+    ''
+      mkdir -p $dev/bin
+      mv $out/bin/libotf-config $dev/bin/
+    '';
+
   meta = {
     homepage = http://www.nongnu.org/m17n/;
     description = "Multilingual text processing library (libotf)";

From 9fc4f0681070ea486562f6b96be8639e57f8c86e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 21:44:16 -0400
Subject: [PATCH 2759/3253] pythonPackages.filterpy: init at 1.4.5

---
 .../python-modules/filterpy/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/filterpy/default.nix

diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix
new file mode 100644
index 000000000000..47f2c083d8a3
--- /dev/null
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, scipy
+, matplotlib
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.4.5";
+  pname = "filterpy";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ numpy scipy matplotlib ];
+
+  # single test fails (even on master branch of repository)
+  # project does not use CI
+  checkPhase = ''
+    pytest --ignore=filterpy/common/tests/test_discretization.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/rlabbe/filterpy;
+    description = "Kalman filtering and optimal estimation library";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..7c5c61431a8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -302,6 +302,8 @@ in {
 
   fido2 = callPackage ../development/python-modules/fido2 {  };
 
+  filterpy = callPackage ../development/python-modules/filterpy { };
+
   fire = callPackage ../development/python-modules/fire { };
 
   fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; };

From bd4301a2ae264f88acf99296183c8295660e6a24 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Thu, 11 Oct 2018 21:42:28 +0200
Subject: [PATCH 2760/3253] nix-index: 0.1.1 -> 0.1.2

---
 pkgs/tools/package-management/nix-index/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index b5d66bec5cca..0b336d47fe4c 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -4,15 +4,15 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "nix-index-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "bennofs";
     repo = "nix-index";
     rev = "v${version}";
-    sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin";
+    sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
   };
-  cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10";
+  cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl curl];
 

From e4f8d5c254d8cb94fa4b2da1ae785e9f3fdf7976 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 11 Oct 2018 21:53:30 +0200
Subject: [PATCH 2761/3253] terraform-providers.gandi: init at 1.0.0 (#48223)

---
 .../cluster/terraform-providers/default.nix   |  1 +
 .../terraform-providers/gandi/default.nix     | 26 +++++++++++++++++++
 .../terraform-providers/gandi/deps.nix        | 21 +++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
 create mode 100644 pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index b3b13539ff50..702a7cb7eb1e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -22,6 +22,7 @@ let
     };
 in
   {
+    gandi = callPackage ./gandi {};
     ibm = callPackage ./ibm {};
     libvirt = callPackage ./libvirt {};
   } // lib.mapAttrs (n: v: toDrv v) list
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
new file mode 100644
index 000000000000..291698f3065f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+buildGoPackage rec {
+  name = "terraform-provider-gandi-${version}";
+  version = "1.0.0";
+
+  goPackagePath = "github.com/tiramiseb/terraform-provider-gandi";
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "tiramiseb";
+    repo = "terraform-provider-gandi";
+    rev = "v${version}";
+    sha256 = "0byydpqsimvnk11bh9iz8zlxbsmsk65w55pvkp18vjzqrhf4kyfv";
+  };
+
+  # Terraform allow checking the provider versions, but this breaks
+  # if the versions are not provided via file paths.
+  postBuild = "mv go/bin/terraform-provider-gandi{,_v${version}}";
+
+  meta = with stdenv.lib; {
+    description = "Terraform provider for the Gandi LiveDNS service.";
+    homepage = "https://github.com/tiramiseb/terraform-provider-gandi";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ manveru ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix b/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix
new file mode 100644
index 000000000000..3d4a3547502d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/hashicorp/terraform";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/terraform";
+      rev = "27b720113ed5143a870ec151b3b7c9d955a09bc0";
+      sha256 = "1f0hwdf2z68p0ll3pgrx949h09q52gcfaxap0zz52m7px98sfab4";
+    };
+  }
+  {
+    goPackagePath = "github.com/tiramiseb/go-gandi-livedns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tiramiseb/go-gandi-livedns";
+      rev = "4773a84f8ee7365ed21edc6cd0602aaf93e94e59";
+      sha256 = "1i8s7yclrkhf974vs2splh5symzk0ym54px0bc216bq4ifzkwkqc";
+    };
+  }
+]

From 264cb7407c9274e6b3fe9e5d6f112f399ae91090 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 11 Oct 2018 15:52:11 -0400
Subject: [PATCH 2762/3253] nixos: initrd/luks: make script indentation
 consistent

---
 nixos/modules/system/boot/luksroot.nix | 66 +++++++++++++-------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 1079089bc5a8..1b153f2132bb 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -7,19 +7,19 @@ let
 
   commonFunctions = ''
     die() {
-      echo "$@" >&2
-      exit 1
+        echo "$@" >&2
+        exit 1
     }
 
     dev_exist() {
-      local target="$1"
-      if [ -e $target ]; then
-        return 0
-      else
-        local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g')
-        local dev=$(blkid --uuid $uuid)
-        return $?
-      fi
+        local target="$1"
+        if [ -e $target ]; then
+            return 0
+        else
+            local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g')
+            local dev=$(blkid --uuid $uuid)
+            return $?
+        fi
     }
 
     wait_target() {
@@ -51,30 +51,30 @@ let
     }
 
     wait_yubikey() {
-      local secs="''${1:-10}"
+        local secs="''${1:-10}"
 
-      ykinfo -v 1>/dev/null 2>&1
-      if [ $? != 0 ]; then
-          echo -n "Waiting $secs seconds for Yubikey to appear..."
-          local success=false
-          for try in $(seq $secs); do
-              echo -n .
-              sleep 1
-              ykinfo -v 1>/dev/null 2>&1
-              if [ $? == 0 ]; then
-                  success=true
-                  break
-              fi
-          done
-          if [ $success == true ]; then
-              echo " - success";
-              return 0
-          else
-              echo " - failure";
-              return 1
-          fi
-      fi
-      return 0
+        ykinfo -v 1>/dev/null 2>&1
+        if [ $? != 0 ]; then
+            echo -n "Waiting $secs seconds for Yubikey to appear..."
+            local success=false
+            for try in $(seq $secs); do
+                echo -n .
+                sleep 1
+                ykinfo -v 1>/dev/null 2>&1
+                if [ $? == 0 ]; then
+                    success=true
+                    break
+                fi
+            done
+            if [ $success == true ]; then
+                echo " - success";
+                return 0
+            else
+                echo " - failure";
+                return 1
+            fi
+        fi
+        return 0
     }
   '';
 

From 76977590faed8e57c8e7d43769e20a4cde3daa14 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 11 Oct 2018 15:52:46 -0400
Subject: [PATCH 2763/3253] nixos: initrd/luks: fix detection of devices by
 UUID

---
 nixos/modules/system/boot/luksroot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 1b153f2132bb..018e7b2e7f89 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -17,7 +17,7 @@ let
             return 0
         else
             local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g')
-            local dev=$(blkid --uuid $uuid)
+            blkid --uuid $uuid >/dev/null
             return $?
         fi
     }

From 63ed3c8c5ebbad8f22e49d799bc88fddd74ff41c Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Thu, 11 Oct 2018 12:19:42 -0800
Subject: [PATCH 2764/3253] fastlane: disable update check

---
 pkgs/tools/admin/fastlane/default.nix | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix
index b9008c919bf3..8aba7524008b 100644
--- a/pkgs/tools/admin/fastlane/default.nix
+++ b/pkgs/tools/admin/fastlane/default.nix
@@ -1,11 +1,27 @@
-{ lib, bundlerEnv, ruby }:
+{ stdenv, bundlerEnv, ruby, makeWrapper }:
 
-bundlerEnv rec {
-  inherit ruby;
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   pname = "fastlane";
-  gemdir = ./.;
+  version = (import ./gemset.nix).fastlane.version;
 
-  meta = with lib; {
+  nativeBuildInputs = [ makeWrapper ];
+
+  env = bundlerEnv {
+    name = "${name}-gems";
+    inherit pname ruby;
+    gemdir = ./.;
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/fastlane $out/bin/fastlane \
+     --set FASTLANE_SKIP_UPDATE_CHECK 1
+  '';
+
+  meta = with stdenv.lib; {
     description     = "A tool to automate building and releasing iOS and Android apps";
     longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application.";
     homepage        = https://github.com/fastlane/fastlane;

From 0e0577e2e29320570be4cbceb1cd31f881de02b8 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 7 Oct 2018 18:04:59 -0400
Subject: [PATCH 2765/3253] networkmanager: Fix patches with fetchpatch and
 updated hashes

---
 pkgs/tools/networking/network-manager/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 01b979c3c5bf..66d9434a470a 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3
-, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
+{ stdenv, fetchurl, fetchpatch, substituteAll, intltool, pkgconfig, dbus-glib
+, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
@@ -67,13 +67,13 @@ in stdenv.mkDerivation rec {
 
   patches = [
     # https://bugzilla.gnome.org/show_bug.cgi?id=796751
-    (fetchurl {
+    (fetchpatch {
       url = https://bugzilla.gnome.org/attachment.cgi?id=372953;
-      sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a";
+      sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc";
     })
-    (fetchurl {
+    (fetchpatch {
       url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch;
-      sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e";
+      sha256 = "0r7338q3za7mf419a244vi65b1q497rg84avijybmv6w4x6p1ksd";
     })
     (substituteAll {
       src = ./fix-paths.patch;

From 36e3fdd9b6d78ba720ddc7c3ba8a73358fd485f7 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 11 Oct 2018 22:01:59 +0200
Subject: [PATCH 2766/3253] php71: 7.1.22 -> 7.1.23

Changelog: https://secure.php.net/ChangeLog-7.php#7.1.23
---
 pkgs/development/interpreters/php/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 67c38a354b43..42767f3c70c2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -227,7 +227,7 @@ in {
   # We can't update the darwin versions because they simply don't compile at
   # all due to a bug in the intl extensions.
   #
-  # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
+  # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10.
 
   php71 = generic (
     if stdenv.isDarwin then
@@ -237,8 +237,8 @@ in {
       }
     else
       {
-        version = "7.1.22";
-        sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
+        version = "7.1.23";
+        sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
       }
   );
 

From b9773bd12ed0e29aa4ea39adc8d2446e493994da Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 11 Oct 2018 22:03:50 +0200
Subject: [PATCH 2767/3253] php72: 7.2.10 -> 7.2.11

Changelog: https://secure.php.net/ChangeLog-7.php#7.2.11
---
 pkgs/development/interpreters/php/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 42767f3c70c2..f9938de6f59d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -227,7 +227,7 @@ in {
   # We can't update the darwin versions because they simply don't compile at
   # all due to a bug in the intl extensions.
   #
-  # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10.
+  # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11.
 
   php71 = generic (
     if stdenv.isDarwin then
@@ -250,8 +250,8 @@ in {
       }
     else
       {
-        version = "7.2.10";
-        sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
+        version = "7.2.11";
+        sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
       }
   );
 }

From 468d41db465bd5a825a7419bc6047402f88a5032 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Thu, 11 Oct 2018 16:44:43 -0400
Subject: [PATCH 2768/3253] keybase: 2.5.0 -> 2.7.3

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index beea202a9562..555244bc38cd 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -4,7 +4,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "2.5.0";
+  version = "2.7.3";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -15,7 +15,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "0fa55nizld8q0szhlpsf75ifb53js3crh98xmf8mn4bvms7d0x09";
+    sha256 = "1sw6v3vf544vp8grw8p287cx078mr9v0v1wffcj6f9p9shlwj7ic";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ];

From 254c5a0100ca745cbdbd88157def1f690d0562f2 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Thu, 11 Oct 2018 16:45:43 -0400
Subject: [PATCH 2769/3253] kbfs: 2.5.0 -> 2.6.0

---
 pkgs/tools/security/kbfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index ff153fddf4d3..f5b2ba3803c8 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "kbfs-${version}";
-  version = "2.5.0";
+  version = "2.6.0";
 
   goPackagePath = "github.com/keybase/kbfs";
   subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "kbfs";
     rev = "v${version}";
-    sha256 = "196w7vvi49xpmzn9d75qr5a1b8w23931544kx9bkc9bbwbjfc4la";
+    sha256 = "0i4f1bc0gcnax572s749m7zcpy53a0f9yzi4lwc312zzxi7krz2f";
   };
 
   buildFlags = [ "-tags production" ];

From 68ad1f8774a217a9fe963a7f126a41689c259f75 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Thu, 11 Oct 2018 16:46:12 -0400
Subject: [PATCH 2770/3253] keybase-gui: 2.5.0 -> 2.7.0

---
 pkgs/tools/security/keybase/gui.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index c8bbe42c9d6a..8831f26a42d5 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -38,10 +38,10 @@ let
 in
 stdenv.mkDerivation rec {
   name = "keybase-gui-${version}";
-  version = "2.5.0-20180807164805.0fda758997";
+  version = "2.7.0-20180926133747.0d62c866fc";
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
-    sha256 = "135sm3h5i2h9j06py827psjbhhiqy1mb133s92p7jp6q1mhr8j1x";
+    sha256 = "0a0ax3skfw398vcjl7822qp7160lbll1snwdqsa13dy8qrjl1byp";
   };
   phases = ["unpackPhase" "installPhase" "fixupPhase"];
   unpackPhase = ''

From b4b5862be94a1fbaf627d1504e614b593cd585ff Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 11 Oct 2018 23:57:02 +0300
Subject: [PATCH 2771/3253] rust-bindgen: 0.40.0 -> 0.42.2

---
 pkgs/development/tools/rust/bindgen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 0463ab3ba0af..836003eeb736 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.40.0";
+  version = "0.42.2";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "0d7jqgi3aadwqcxiaz7axsq9h6n2i42yd3q0p1hc5l0kcdwwbj5k";
+    sha256 = "10h0h7x8yf4dsyw2p2nas2jg5p3i29np0y3rfzrdq898d70gvq4j";
   };
 
-  cargoSha256 = "1rjyazhnk9xihqw1qzkkcrab627lqbj789g5d5nb8bn2hkbdx5d6";
+  cargoSha256 = "01jvi86xgz0r7ia9agnfpms6b6x68lzwj6f085m0w659i94acgpi";
 
   libclang = llvmPackages.libclang.lib; #for substituteAll
 

From 8b6248a8231b22a60db27f06953da63416826f85 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 11 Oct 2018 15:34:28 -0500
Subject: [PATCH 2772/3253] pcsctools: 1.4.25 -> 1.5.3

---
 pkgs/tools/security/pcsctools/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 5b67a6d89ceb..42f1df8b3842 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -6,17 +6,15 @@
 let deps = lib.makeBinPath [ wget coreutils ];
 
 in stdenv.mkDerivation rec {
-  name = "pcsc-tools-1.4.25";
+  name = "pcsc-tools-1.5.3";
 
   src = fetchurl {
-    url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz";
-    sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9";
+    url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2";
+    sha256 = "050x3yqd5ywl385zai3k1zhbm2lz1f5ksalfpm9hd86s50f03ans";
   };
 
   buildInputs = [ udev dbus perl pcsclite ];
 
-  makeFlags = [ "DESTDIR=$(out)" ];
-
   nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   postInstall = ''

From a33dec8cd58421ed8b03b3254b5a80b42eba6d1f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 10 Oct 2018 23:17:53 +0200
Subject: [PATCH 2773/3253] retdec: 3.0 -> 3.2

---
 .../tools/analysis/retdec/default.nix         | 249 ++++++++++++------
 .../tools/analysis/retdec/yaracpp.nix         |  49 ++++
 2 files changed, 222 insertions(+), 76 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/retdec/yaracpp.nix

diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index a4c62e6fc32c..428ca259f496 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -1,121 +1,218 @@
-{ stdenv, fetchFromGitHub, fetchurl, fetchzip,
-# Native build inputs
-cmake,
-autoconf, automake, libtool,
-pkgconfig,
-bison, flex,
-groff,
-perl,
-python,
-# Runtime tools
-time,
-upx,
-# Build inputs
-ncurses,
-libffi,
-libxml2,
-zlib,
-# PE (Windows) data, huge space savings if not needed
-withPEPatterns ? false,
+{ stdenv
+, fetchFromGitHub
+, fetchzip
+, lib
+, callPackage
+, openssl
+, cmake
+, autoconf
+, automake
+, libtool
+, pkgconfig
+, bison
+, flex
+, groff
+, perl
+, python3
+, time
+, upx
+, ncurses
+, libffi
+, libxml2
+, zlib
+, withPEPatterns ? false
 }:
 
 let
-  release = "3.0";
-
+  capstone = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "capstone";
+    rev = "27c713fe4f6eaf9721785932d850b6291a6073fe";
+    sha256 = "105z1g9q7s6n15qpln9vzhlij7vj6cyc5dqdr05n7wzjvlagwgxc";
+  };
+  elfio = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "elfio";
+    rev = "998374baace397ea98f3b1d768e81c978b4fba41";
+    sha256 = "09n34rdp0wpm8zy30zx40wkkc4gbv2k3cv181y6c1260rllwk5d1";
+  };
+  keystone = fetchFromGitHub { # only for tests
+    owner = "keystone-engine";
+    repo = "keystone";
+    rev = "d7ba8e378e5284e6384fc9ecd660ed5f6532e922";
+    sha256 = "1yzw3v8xvxh1rysh97y0i8y9svzbglx2zbsqjhrfx18vngh0x58f";
+  };
+  libdwarf = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "libdwarf";
+    rev = "85465d5e235cc2d2f90d04016d6aca1a452d0e73";
+    sha256 = "11y62r65py8yp57i57a4cymxispimn62by9z4j2g19hngrpsgbki";
+  };
+  llvm = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "llvm";
+    rev = "725d0cee133c6ab9b95c493f05de3b08016f5c3c";
+    sha256 = "0dzvafmn4qs62w1y9vh0a11clpj6q3hb41aym4izpcyybjndf9bq";
+  };
+  pelib = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "pelib";
+    rev = "a7004b2e80e4f6dc984f78b821e7b585a586050d";
+    sha256 = "0nyrb3g749lxgcymz1j584xbb1x6rvy1mc700lyn0brznvqsm81n";
+  };
   rapidjson = fetchFromGitHub {
     owner = "Tencent";
     repo = "rapidjson";
     rev = "v1.1.0";
     sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
   };
+  yaracpp = callPackage ./yaracpp.nix {}; # is its own package because it needs a patch
+  yaramod = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "yaramod";
+    rev = "v2.1.2";
+    sha256 = "1rpyqzkrqvk721hf75wb7aasw5mzp9wz4j89p0x1l9p5x1b3maz3";
+  };
   jsoncpp = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
-    rev = "1.8.3";
-    sha256 = "05gkmg6r94q8a0qdymarcjlnlvmy9s365m9jhz3ysvi71cr31lkz";
+    rev = "1.8.4";
+    sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
   };
-  googletest = fetchFromGitHub {
+  googletest = fetchFromGitHub { # only for tests
     owner = "google";
     repo = "googletest";
-    rev = "release-1.8.0";
-    sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+    rev = "83fa0cb17dad47a1d905526dcdddb5b96ed189d2";
+    sha256 = "1c2r0p9v7vz2vasy8bknfb448l6wsvzw35s8hmc5z013z5502mpk";
   };
   tinyxml2 = fetchFromGitHub {
     owner = "leethomason";
     repo = "tinyxml2";
-    rev = "5.0.1";
+    rev = "cc1745b552dd12bb1297a99f82044f83b06729e0";
     sha256 = "015g8520a0c55gwmv7pfdsgfz2rpdmh3d1nq5n9bd65n35492s3q";
   };
-  yara = fetchurl {
-     url = "https://github.com/avast-tl/yara/archive/v1.0-retdec.zip";
-     sha256 = "1bjrkgp1sgld2y7gvwrlrz5fs16521ink6xyq72v7yxj3vfa9gps";
-  };
-  openssl = fetchurl {
-    url = "https://www.openssl.org/source/openssl-1.1.0f.tar.gz";
-    sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
+
+  retdec-support = let
+    version = "2018-02-08"; # make sure to adjust both hashes (once with withPEPatterns=true and once withPEPatterns=false)
+  in fetchzip {
+    url = "https://github.com/avast-tl/retdec-support/releases/download/${version}/retdec-support_${version}.tar.xz";
+    sha256 = if withPEPatterns then "148i8flbyj1y4kfdyzsz7jsj38k4h97npjxj18h6v4wksd4m4jm7"
+                               else "0ixv9qyqq40pzyqy6v9jf5rxrvivjb0z0zn260nbmb9gk765bacy";
+    stripRoot = false;
+    # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed)
+    extraPostFetch = lib.optionalString (!withPEPatterns) ''
+      rm -r "$out/generic/yara_patterns/static-code/pe"
+    '';
+  } // {
+    inherit version; # necessary to check the version against the expected version
   };
 
-  retdec-support = fetchzip {
-    url = "https://github.com/avast-tl/retdec-support/releases/download/2017-12-12/retdec-support_2017-12-12.tar.xz";
-    sha256 = if withPEPatterns then "0pchl7hb42dm0sdbmpr8d3c6xc0lm6cs4p6g6kdb2cr9c99gjzn3"
-                               else "1hcyq6bf4wk739kb53ic2bs71gsbx6zd07pc07lzfnxf8k497mhv";
-    # Removing PE signatures reduces this from 3.8GB -> 642MB (uncompressed)
-    extraPostFetch = stdenv.lib.optionalString (!withPEPatterns) ''
-      rm -rf $out/generic/yara_patterns/static-code/pe
-    '';
-  };
+  # patch CMakeLists.txt for a dependency and compare the versions to the ones expected by upstream
+  # this has to be applied for every dependency (which it is in postPatch)
+  patchDep = dep: ''
+    # check if our version of dep is the same version that upstream expects
+    echo "Checking version of ${dep.dep_name}"
+    expected_rev="$( sed -n -e 's|.*URL https://github.com/.*/archive/\(.*\)\.zip.*|\1|p' "deps/${dep.dep_name}/CMakeLists.txt" )"
+    if [ "$expected_rev" != '${dep.rev}' ]; then
+      echo "The ${dep.dep_name} dependency has the wrong version: ${dep.rev} while $expected_rev is expected."
+      exit 1
+    fi
+
+    # patch the CMakeLists.txt file to use our local copy of the dependency instead of fetching it at build time
+    sed -i -e 's|URL .*|URL ${dep}|' "deps/${dep.dep_name}/CMakeLists.txt"
+  '';
+
 in stdenv.mkDerivation rec {
   name = "retdec-${version}";
-  version = "${release}.0";
+
+  # If you update this you will also need to adjust the versions of the updated dependencies. You can do this by first just updating retdec
+  # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
+  # I've notified upstream about this problem here:
+  # https://github.com/avast-tl/retdec/issues/412
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "avast-tl";
     repo = "retdec";
-    name = "retdec-${release}";
-    rev = "refs/tags/v${release}";
-    sha256 = "0cpc5lxg8qphdzl3gg9dx992ar35r8ik8wyysr91l2qvfhx93wks";
-    fetchSubmodules = true;
+    name = "retdec-${version}";
+    rev = "refs/tags/v${version}";
+    sha256 = "0chky656lsddn20bnm3pmz6ix20y4a0y8swwr42hrhi01vkhmzrp";
   };
 
-  nativeBuildInputs = [ cmake autoconf automake libtool pkgconfig bison flex groff perl python ];
+  nativeBuildInputs = [
+    cmake
+    autoconf
+    automake
+    libtool
+    pkgconfig
+    bison
+    flex
+    groff
+    perl
+    python3
+  ];
 
-  buildInputs = [ ncurses libffi libxml2 zlib ];
+  buildInputs = [
+    openssl
+    ncurses
+    libffi
+    libxml2
+    zlib
+  ];
 
-  prePatch = ''
-    find . -wholename "*/deps/rapidjson/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${rapidjson}|'
-    find . -wholename "*/deps/jsoncpp/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${jsoncpp}|'
-    find . -wholename "*/deps/googletest/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${googletest}|'
-    find . -wholename "*/deps/tinyxml2/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|GIT_REPOSITORY.*|URL ${tinyxml2}|'
+  cmakeFlags = [
+    "-DRETDEC_TESTS=ON" # build tests
+  ];
 
-    find . -wholename "*/yaracpp/deps/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|URL .*|URL ${yara}|'
+  # all dependencies that are normally fetched during build time (the subdirectories of `deps`)
+  # all of these need to be fetched through nix and the CMakeLists files need to be patched not to fetch them themselves
+  external_deps = [
+    (capstone // { dep_name = "capstone"; })
+    (elfio // { dep_name = "elfio"; })
+    (googletest // { dep_name = "googletest"; })
+    (jsoncpp // { dep_name = "jsoncpp"; })
+    (keystone // { dep_name = "keystone"; })
+    (libdwarf // { dep_name = "libdwarf"; })
+    (llvm // { dep_name = "llvm"; })
+    (pelib // { dep_name = "pelib"; })
+    (rapidjson // { dep_name = "rapidjson"; })
+    (tinyxml2 // { dep_name = "tinyxml2"; })
+    (yaracpp // { dep_name = "yaracpp"; })
+    (yaramod // { dep_name = "yaramod"; })
+  ];
 
-    find . -wholename "*/deps/openssl/CMakeLists.txt" -print0 | \
-      xargs -0 sed -i -e 's|OPENSSL_URL .*)|OPENSSL_URL ${openssl})|'
+  postPatch = (lib.concatMapStrings patchDep external_deps) + ''
+    # install retdec-support
+    echo "Checking version of retdec-support"
+    expected_version="$( sed -n -e "s|^version = '\(.*\)'$|\1|p" 'cmake/install-share.py' )"
+    if [ "$expected_version" != '${retdec-support.version}' ]; then
+      echo "The retdec-support dependency has the wrong version: ${retdec-support.version} while $expected_version is expected."
+      exit 1
+    fi
+    mkdir -p "$out/share/retdec"
+    cp -r ${retdec-support} "$out/share/retdec/support" # write permission needed during install
+    chmod -R u+w "$out/share/retdec/support"
+    # python file originally responsible for fetching the retdec-support archive to $out/share/retdec
+    # that is not necessary anymore, so empty the file
+    echo > cmake/install-share.py
 
-    cat > cmake/install-share.sh <<EOF
-      #!/bin/sh
-      mkdir -p $out/share/retdec/
-      ln -s ${retdec-support} $out/share/retdec/support
-    EOF
-    chmod +x cmake/*.sh
-    patchShebangs cmake/*.sh
-
-    substituteInPlace scripts/unpack.sh --replace '	upx -d' '	${upx}/bin/upx -d'
-    substituteInPlace scripts/config.sh --replace /usr/bin/time ${time}/bin/time
+    # call correct `time` and `upx` programs
+    substituteInPlace scripts/retdec-config.py --replace /usr/bin/time ${time}/bin/time
+    substituteInPlace scripts/retdec-unpacker.py --replace "'upx'" "'${upx}/bin/upx'"
   '';
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  doInstallCheck = true;
+  installCheckPhase = ''
+    ${python3.interpreter} "$out/bin/retdec-tests-runner.py"
+  '';
+
+  meta = with lib; {
     description = "A retargetable machine-code decompiler based on LLVM";
     homepage = https://retdec.com;
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
-    broken = withPEPatterns; # retdec-full is broken, 2018-04-11
+    maintainers = with maintainers; [ dtzWill timokau ];
+    platforms = ["x86_64-linux" "i686-linux"];
   };
 }
diff --git a/pkgs/development/tools/analysis/retdec/yaracpp.nix b/pkgs/development/tools/analysis/retdec/yaracpp.nix
new file mode 100644
index 000000000000..cc857b86145f
--- /dev/null
+++ b/pkgs/development/tools/analysis/retdec/yaracpp.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchFromGitHub
+, coreutils
+}:
+
+let
+  yara = fetchFromGitHub {
+    owner = "avast-tl";
+    repo = "yara";
+    rev = "ea101c5856941f39cad2db3012f2660d1d5c8b65";
+    sha256 = "033ssx2hql5k4pv9si043s3mjq2b748ymjzif8pg6rdwh260faky";
+  };
+in stdenv.mkDerivation rec {
+  # only fetches the yaracpp source patched to work with a local yara clone,
+  # does not build anything
+  name = "yaracpp-src-${version}";
+  version = "2018-10-09";
+  rev = "b92bde0e59e3b75bc445227e04b71105771dee8b"; # as specified in retdec/deps/yaracpp/CMakeLists.txt
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "avast-tl";
+    repo = "yaracpp";
+    sha256 = "0fan7q79j7s3bjmhsd2nw6sqyi14xgikn7mr2p4nj87lick5l4a2";
+  };
+
+  postPatch = ''
+      # check if our version of yara is the same version that upstream expects
+      echo "Checking version of yara"
+      expected_rev="$( sed -n -e 's|.*URL https://github.com/.*/archive/\(.*\)\.zip.*|\1|p' "deps/CMakeLists.txt" )"
+      if [ "$expected_rev" != '${yara.rev}' ]; then
+        echo "The yara dependency has the wrong version: ${yara.rev} while $expected_rev is expected."
+        exit 1
+      fi
+
+      # patch the CMakeLists.txt file to use our local copy of the dependency instead of fetching it at build time
+      sed -i -e "s|URL .*|URL ${yara}|" "deps/CMakeLists.txt"
+
+      # abuse the CONFIGURE_COMMAND to make the source writeable after copying it to the build locatoin (necessary for the build)
+      sed -i -e 's|CONFIGURE_COMMAND ""|CONFIGURE_COMMAND COMMAND ${coreutils}/bin/chmod -R u+w .|' "deps/CMakeLists.txt"
+    '';
+
+  buildPhase = "# do nothing";
+  configurePhase = "# do nothing";
+  installPhase = ''
+    mkdir -p "$out"
+    cp -r * "$out"
+  '';
+}

From 05bcae15957bf6da5bc97ae37f5fa08b47eb9d00 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 11 Oct 2018 21:53:52 +0000
Subject: [PATCH 2774/3253] perl-cross: 1.2 -> gitmaster

---
 pkgs/development/interpreters/perl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f2b900412081..b46bd20697eb 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -155,11 +155,11 @@ let
       platforms = platforms.all;
     };
   } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
-    crossVersion = "1.2";
+    crossVersion = "ab8d05c9e695d3db4f7dc15c70f23623349c2f49"; # Oct 03, 2018
 
     perl-cross-src = fetchurlBoot {
-      url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
-      sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
+      url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
+      sha256 = "1g7p7mqmx8x3diqvbh881gr72d106cn6yvm4gx7f0ars3n3b3wj0";
     };
 
     depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];

From 628fa1d50f242f231bd39c954bbf02b30a2b2a72 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 25 Sep 2018 22:52:05 +0900
Subject: [PATCH 2775/3253] oraclejdk: deprecate oraclejdk 10

---
 pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index de063500b709..23f44331dd89 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -150,6 +150,7 @@ let result = stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+    knownVulnerabilities = [ "Support ended in September 2018.  Use OpenJDK or JDK 8." ];
   };
 
 }; in result

From 9d293db6afe5260eedc714102c103d928c644145 Mon Sep 17 00:00:00 2001
From: paddygord <pgpatrickgordon@gmail.com>
Date: Thu, 11 Oct 2018 15:13:07 -0700
Subject: [PATCH 2776/3253] yojimbo: init at 1.1 (#48214)

---
 maintainers/maintainer-list.nix               |  5 +++
 .../development/libraries/yojimbo/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/yojimbo/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 061703dce75d..9d93bbed9cfb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3135,6 +3135,11 @@
     github = "pacien";
     name = "Pacien Tran-Girard";
   };
+  paddygord = {
+    email = "pgpatrickgordon@gmail.com";
+    github = "paddygord";
+    name = "Patrick Gordon";
+  };
   paholg = {
     email = "paho@paholg.com";
     github = "paholg";
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
new file mode 100644
index 000000000000..9a3416a368bb
--- /dev/null
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
+
+stdenv.mkDerivation rec {
+  name = "yojimbo";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "networkprotocol";
+    repo = "yojimbo";
+    rev = "e02219c102d9b440290539036992d77608eab3b0";
+    sha256 = "0jn25ddv73hwjals883a910m66kwj6glxxhnmn96bpzsvsaimnkr";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ premake5 doxygen ];
+  propagatedBuildInputs = [ libsodium mbedtls ];
+
+  buildPhase = ''
+    premake5 gmake
+    make all
+    premake5 docs
+  '';
+
+  installPhase = ''
+    install -Dm555 -t $out/lib bin/libyojimbo.a
+    install -Dm444 -t $out/include yojimbo.h
+    mkdir -p $out/share/doc/yojimbo
+    cp -r docs/html $out/share/doc/yojimbo
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A network library for client/server games with dedicated servers";
+    longDescription = ''
+      yojimbo is a network library for client/server games with dedicated servers.
+      It's designed around the networking requirements of competitive multiplayer games like first person shooters.
+      As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance.
+    '';
+    homepage = https://github.com/networkprotocol/yojimbo;
+    license = licenses.bsd3;
+    platforms = platforms.x86_64;
+    maintainers = with maintainers; [ paddygord ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d911181ae372..e0c7db35e4a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12706,6 +12706,8 @@ with pkgs;
 
   yajl = callPackage ../development/libraries/yajl { };
 
+  yojimbo = callPackage ../development/libraries/yojimbo { };
+
   yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { };
 
   yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };

From 225b8de73dd0d61a87c5c50e4d4199a56beb863b Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 16 Dec 2017 21:12:34 -0500
Subject: [PATCH 2777/3253] pythonPackages.sphinx-jinja: 0.2.1 -> 1.1.0, Python
 3 support

---
 .../python-modules/sphinx-jinja/default.nix   | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +--------------
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/sphinx-jinja/default.nix

diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix
new file mode 100644
index 000000000000..375f59ec3f91
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-jinja/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, pbr, sphinx, sphinx-testing, nose, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "sphinx-jinja";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02pgp9pbn0zrs0lggrc74mv6cvlnlq8wib84ga6yjvq30gda9v8q";
+  };
+
+  buildInputs = [ pbr ];
+  propagatedBuildInputs = [ sphinx ];
+
+  checkInputs = [ sphinx-testing nose glibcLocales ];
+
+  checkPhase = ''
+    # Zip (epub) does not support files with epoch timestamp
+    LC_ALL="en_US.UTF-8" nosetests -e test_build_epub
+  '';
+
+  meta = with lib; {
+    description = "Sphinx extension to include jinja templates in documentation";
+    maintainers = with maintainers; [ nand0p ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8677cf5eeae..0df3f855c3ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12977,26 +12977,7 @@ in {
     };
   });
 
-  sphinx-jinja = buildPythonPackage (rec {
-    name = "${pname}-${version}";
-    pname = "sphinx-jinja";
-    version = "0.2.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/${pname}/${name}.tar.gz";
-      sha256 = "1zsnhc573rvaww9qqyzs4f5h4hhvxklvppv14450vi5dk8rij81z";
-    };
-    buildInputs = with self; [ sphinx-testing pytest pbr];
-    propagatedBuildInputs = with self; [ sphinx blockdiag ];
-    checkPhase = ''
-      py.test -k "not test_build_epub"
-    '';
-    disabled = isPy3k;
-    meta = {
-      description = "includes jinja templates in a documentation";
-      maintainers = with maintainers; [ nand0p ];
-      license = licenses.mit;
-    };
-  });
+  sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
 
   sphinx_pypi_upload = buildPythonPackage (rec {
     name = "Sphinx-PyPI-upload-0.2.1";

From 511d651e583c37df146d5fe8af3477334c3e174f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 17 Dec 2017 17:02:18 -0500
Subject: [PATCH 2778/3253] pythonPackages.tempita: 0.5.2 -> 0.5.3-2016-09-28

---
 .../python-modules/tempita/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +----------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/tempita/default.nix

diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix
new file mode 100644
index 000000000000..318c47d21608
--- /dev/null
+++ b/pkgs/development/python-modules/tempita/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
+
+buildPythonPackage rec {
+  version = "0.5.3-2016-09-28";
+  name = "tempita-${version}";
+
+  src = fetchFromGitHub {
+    owner = "gjhiggins";
+    repo = "tempita";
+    rev = "47414a7c6e46a9a9afe78f0bce2ea299fa84d10";
+    sha256 = "0f33jjjs5rvp7ar2j6ggyfykcrsrn04jaqcq71qfvycf6b7nw3rn";
+  };
+
+  buildInputs = [ nose ];
+
+  meta = {
+    homepage = https://github.com/gjhiggins/tempita;
+    description = "A very small text templating language";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0df3f855c3ae..28ba36f1ccba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13310,24 +13310,7 @@ in {
     };
   };
 
-  tempita = buildPythonPackage rec {
-    version = "0.5.2";
-    name = "tempita-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/T/Tempita/Tempita-${version}.tar.gz";
-      sha256 = "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c";
-    };
-
-    disabled = isPy3k;
-
-    buildInputs = with self; [ nose ];
-
-    meta = {
-      homepage = http://pythonpaste.org/tempita/;
-      description = "A very small text templating language";
-    };
-  };
+  tempita = callPackage ../development/python-modules/tempita { };
 
   terminado = callPackage ../development/python-modules/terminado { };
 

From 4f09e0584906a6792128330a9b44bfe6e729b94c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 30 Aug 2018 18:28:38 -0400
Subject: [PATCH 2779/3253] python2Packages.astroid: init at 1.6.5

---
 .../python-modules/astroid/1.6.nix            | 39 +++++++++++++++++++
 .../python-modules/astroid/default.nix        |  4 +-
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/astroid/1.6.nix

diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix
new file mode 100644
index 000000000000..ca26da5a3737
--- /dev/null
+++ b/pkgs/development/python-modules/astroid/1.6.nix
@@ -0,0 +1,39 @@
+{ lib, fetchPypi, buildPythonPackage, pythonOlder, isPyPy
+, lazy-object-proxy, six, wrapt, enum34, singledispatch, backports_functools_lru_cache
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "astroid";
+  version = "1.6.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw";
+  };
+
+  # From astroid/__pkginfo__.py
+  propagatedBuildInputs = [
+    lazy-object-proxy
+    six
+    wrapt
+    enum34
+    singledispatch
+    backports_functools_lru_cache
+  ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    # test_builtin_help is broken
+    pytest -k "not test_builtin_help" astroid
+  '';
+
+  meta = with lib; {
+    description = "An abstract syntax tree for Python with inference support";
+    homepage = https://github.com/PyCQA/astroid;
+    license = licenses.lgpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index ccf6f4055269..d773c08e189a 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -22,8 +22,8 @@ buildPythonPackage rec {
   checkInputs = [ pytestrunner pytest ];
 
   meta = with lib; {
-    description = "A abstract syntax tree for Python with inference support";
-    homepage = https://bitbucket.org/logilab/astroid;
+    description = "An abstract syntax tree for Python with inference support";
+    homepage = https://github.com/PyCQA/astroid;
     license = licenses.lgpl2;
     platforms = platforms.all;
     maintainers = with maintainers; [ nand0p ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28ba36f1ccba..11aa73a04bf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -736,7 +736,8 @@ in {
   # argparse is part of stdlib in 2.7 and 3.2+
   argparse = null;
 
-  astroid = callPackage ../development/python-modules/astroid { };
+  astroid = if isPy3k then callPackage ../development/python-modules/astroid { }
+            else callPackage ../development/python-modules/astroid/1.6.nix { };
 
   attrdict = callPackage ../development/python-modules/attrdict { };
 

From 67ea56717a54096f499b195a4f44d11fdbbcda2b Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 30 Aug 2018 21:14:41 -0400
Subject: [PATCH 2780/3253] python2Packages.pylint: init at 1.9.2

---
 .../development/python-modules/pylint/1.9.nix | 49 +++++++++++++++++++
 .../python-modules/pylint/default.nix         | 26 +++++-----
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylint/1.9.nix

diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
new file mode 100644
index 000000000000..ad3140cf1572
--- /dev/null
+++ b/pkgs/development/python-modules/pylint/1.9.nix
@@ -0,0 +1,49 @@
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, astroid, six, isort,
+  mccabe, configparser, backports_functools_lru_cache, singledispatch,
+  pytest, pytestrunner, pyenchant }:
+
+buildPythonPackage rec {
+  pname = "pylint";
+  version = "1.9.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cxr1j037hsm4spmvl64v2j2rdq72pc2z0gnn3iggd4np6y21wpz";
+  };
+
+  checkInputs = [ pytest pytestrunner pyenchant ];
+
+  propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch ];
+
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    # Remove broken darwin test
+    rm -vf pylint/test/test_functional.py
+  '';
+
+  checkPhase = ''
+    pytest pylint/test -k "not ${lib.concatStringsSep " and not " (
+      [ # Broken test
+        "test_good_comprehension_checks"
+        # See PyCQA/pylint#2535
+        "test_libmodule" ] ++
+      # Disable broken darwin tests
+      lib.optionals stdenv.isDarwin [
+        "test_parallel_execution"
+        "test_py3k_jobs_option"
+      ]
+    )}"
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp "elisp/"*.el $out/share/emacs/site-lisp/
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/PyCQA/pylint;
+    description = "A bug and style checker for Python";
+    platforms = platforms.all;
+    license = licenses.gpl1Plus;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index c9a44548c142..4f4eb3cfc731 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, isort,
-  pytest, pytestrunner,  mccabe, pytest_xdist, pyenchant }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid,
+  isort, mccabe, pytest, pytestrunner, pyenchant }:
 
 buildPythonPackage rec {
   pname = "pylint";
@@ -12,21 +12,25 @@ buildPythonPackage rec {
     sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb";
   };
 
-  checkInputs = [ pytest pytestrunner pytest_xdist pyenchant ];
+  checkInputs = [ pytest pytestrunner pyenchant ];
 
   propagatedBuildInputs = [ astroid isort mccabe ];
 
-  postPatch = ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     # Remove broken darwin test
     rm -vf pylint/test/test_functional.py
   '';
 
   checkPhase = ''
-    cat pylint/test/test_self.py
-    # Disable broken darwin tests
-    pytest pylint/test -k "not test_parallel_execution \
-                       and not test_py3k_jobs_option \
-                       and not test_good_comprehension_checks"
+    pytest pylint/test -k "not ${lib.concatStringsSep " and not " (
+      # Broken test
+      [ "test_good_comprehension_checks" ] ++
+      # Disable broken darwin tests
+      lib.optionals stdenv.isDarwin [
+        "test_parallel_execution"
+        "test_py3k_jobs_option"
+      ]
+    )}"
   '';
 
   postInstall = ''
@@ -34,8 +38,8 @@ buildPythonPackage rec {
     cp "elisp/"*.el $out/share/emacs/site-lisp/
   '';
 
-  meta = with stdenv.lib; {
-    homepage = https://www.logilab.org/project/pylint;
+  meta = with lib; {
+    homepage = https://github.com/PyCQA/pylint;
     description = "A bug and style checker for Python";
     platforms = platforms.all;
     license = licenses.gpl1Plus;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11aa73a04bf8..73d2cf6d2ac6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10227,7 +10227,8 @@ in {
 
   pygpgme = callPackage ../development/python-modules/pygpgme { };
 
-  pylint = callPackage ../development/python-modules/pylint { };
+  pylint = if isPy3k then callPackage ../development/python-modules/pylint { }
+           else callPackage ../development/python-modules/pylint/1.9.nix { };
 
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 

From fcaae4fc356adf6ca8c9708fa7939a0a97cffd92 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 31 Aug 2018 13:09:39 -0400
Subject: [PATCH 2781/3253] pythonPackages.hyperlink: don't create
 .pytest_cache

---
 pkgs/development/python-modules/hyperlink/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 53a245c45dcf..2e2e4e1cb774 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -11,12 +11,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ idna ];
 
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    py.test $out
-  '';
-
   meta = with stdenv.lib; {
     description = "A featureful, correct URL for Python";
     license = licenses.mit;

From 820feccb18ba0948b7d077bccb13b2912b168873 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 2 Sep 2018 23:40:36 -0400
Subject: [PATCH 2782/3253] pythonPackages.trollius: 1.0.4 -> 2.2

---
 .../python-modules/trollius/default.nix       | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix
index 6d43aa8da869..01ad57e55d7d 100644
--- a/pkgs/development/python-modules/trollius/default.nix
+++ b/pkgs/development/python-modules/trollius/default.nix
@@ -1,45 +1,49 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, isPyPy, mock, futures  }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, mock, unittest2, six, futures }:
+
 buildPythonPackage rec {
   pname = "trollius";
-  version = "1.0.4";
+  version = "2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xny8y12x3wrflmyn6xi8a7n3m3ac80fgmgzphx5jbbaxkjcm148";
+    sha256 = "093978388qvw5hyscbbj062dbdc2761xs9yzrq26mh63g689lnxk";
   };
 
-  checkInputs = [ mock ];
+  checkInputs = [ mock ] ++ lib.optional (!isPy3k) unittest2;
 
-  propagatedBuildInputs = lib.optionals (isPy27 || isPyPy) [ futures ];
+  propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) futures;
 
   patches = [
     ./tests.patch
   ];
 
-  # Some of the tests fail on darwin with `error: AF_UNIX path too long'
-  # because of the *long* path names for sockets
-  patchPhase = lib.optionalString stdenv.isDarwin ''
-      sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py
-      sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py
-      sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py
-      sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py
-      sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py
-      sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py
-      sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py
-      sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py
-      sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py
-      sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py
-      sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py
-      sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py
-      sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py
-      sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py
-      sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py
-      sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
+  postPatch = ''
+    # Overrides PYTHONPATH causing dependencies not to be found
+    sed -i -e "s|test_env_var_debug|skip_test_env_var_debug|g" tests/test_tasks.py
+  '' + lib.optionalString stdenv.isDarwin ''
+    # Some of the tests fail on darwin with `error: AF_UNIX path too long'
+    # because of the *long* path names for sockets
+    sed -i -e "s|test_create_ssl_unix_connection|skip_test_create_ssl_unix_connection|g" tests/test_events.py
+    sed -i -e "s|test_create_unix_connection|skip_test_create_unix_connection|g" tests/test_events.py
+    sed -i -e "s|test_create_unix_server_existing_path_nonsock|skip_test_create_unix_server_existing_path_nonsock|g" tests/test_unix_events.py
+    sed -i -e "s|test_create_unix_server_existing_path_sock|skip_test_create_unix_server_existing_path_sock|g" tests/test_unix_events.py
+    sed -i -e "s|test_create_unix_server_ssl_verified|skip_test_create_unix_server_ssl_verified|g" tests/test_events.py
+    sed -i -e "s|test_create_unix_server_ssl_verify_failed|skip_test_create_unix_server_ssl_verify_failed|g" tests/test_events.py
+    sed -i -e "s|test_create_unix_server_ssl|skip_test_create_unix_server_ssl|g" tests/test_events.py
+    sed -i -e "s|test_create_unix_server|skip_test_create_unix_server|g" tests/test_events.py
+    sed -i -e "s|test_open_unix_connection_error|skip_test_open_unix_connection_error|g" tests/test_streams.py
+    sed -i -e "s|test_open_unix_connection_no_loop_ssl|skip_test_open_unix_connection_no_loop_ssl|g" tests/test_streams.py
+    sed -i -e "s|test_open_unix_connection|skip_test_open_unix_connection|g" tests/test_streams.py
+    sed -i -e "s|test_pause_reading|skip_test_pause_reading|g" tests/test_subprocess.py
+    sed -i -e "s|test_read_pty_output|skip_test_read_pty_output|g" tests/test_events.py
+    sed -i -e "s|test_start_unix_server|skip_test_start_unix_server|g" tests/test_streams.py
+    sed -i -e "s|test_unix_sock_client_ops|skip_test_unix_sock_client_ops|g" tests/test_events.py
+    sed -i -e "s|test_write_pty|skip_test_write_pty|g" tests/test_events.py
   '';
 
   meta = with stdenv.lib; {
-    description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2";
-    homepage = "https://bitbucket.org/enovance/trollius";
+    description = "Port of the asyncio project to Python 2.7";
+    homepage = https://github.com/vstinner/trollius;
     license = licenses.asl20;
     maintainers = with maintainers; [ garbas ];
   };

From 1c3f7302faa5da6e42f5a1c471b934124106d71a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 31 Aug 2018 13:11:24 -0400
Subject: [PATCH 2783/3253] pythonPackages.autobahn: use checkInputs

---
 .../python-modules/autobahn/default.nix       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 04aa9411247e..f618b05373a7 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy33,
-  unittest2, mock, pytest, trollius, asyncio,
-  pytest-asyncio, futures, cffi,
-  six, twisted, txaio, zope_interface
+{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy33,
+  six, txaio, twisted, zope_interface, cffi, asyncio, trollius, futures,
+  mock, pytest
 }:
 buildPythonPackage rec {
   pname = "autobahn";
@@ -12,21 +11,18 @@ buildPythonPackage rec {
     sha256 = "b69858e0be4bff8437b0bd82a0db1cbef7405e16bd9354ba587c043d6d5e1ad9";
   };
 
-  # Upstream claim python2 support, but tests require pytest-asyncio which
-  # is pythn3 only. Therefore, tests are skipped for python2.
-  doCheck = isPy3k;
-  checkInputs = stdenv.lib.optionals isPy3k [ unittest2 mock pytest pytest-asyncio ];
-  propagatedBuildInputs = [ cffi six twisted zope_interface txaio ] ++
-    (stdenv.lib.optional isPy33 asyncio) ++
-    (stdenv.lib.optionals (!isPy3k) [ trollius futures ]);
+  propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++
+    (lib.optional isPy33 asyncio) ++
+    (lib.optionals (!isPy3k) [ trollius futures ]);
 
+  checkInputs = [ mock pytest ];
   checkPhase = ''
     runHook preCheck
     USE_TWISTED=true py.test $out
     runHook postCheck
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "WebSocket and WAMP in Python for Twisted and asyncio.";
     homepage    = "https://crossbar.io/autobahn";
     license     = licenses.mit;

From 5b2a1db2e334542bb590d19950a5b136c6a0d40a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sun, 2 Sep 2018 21:56:53 -0400
Subject: [PATCH 2784/3253] pythonPackages.sqlalchemy_migrate: patch backslash
 escapes

---
 .../python-modules/sqlalchemy-migrate/default.nix    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 8a5609c1cd9f..41269aa6567f 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python
 , unittest2, scripttest, pytz, pylint, mock
 , testtools, pbr, tempita, decorator, sqlalchemy
 , six, sqlparse, testrepository
@@ -12,6 +12,12 @@ buildPythonPackage rec {
     sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
   };
 
+  # See: https://review.openstack.org/#/c/608382/
+  patches = [ (fetchpatch {
+    url = https://github.com/openstack/sqlalchemy-migrate/pull/18.patch;
+    sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07";
+  }) ];
+
   checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
   propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
 
@@ -32,10 +38,8 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test
   '';
 
-  doCheck = true;
-
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/sqlalchemy-migrate/;
+    homepage = https://github.com/openstack/sqlalchemy-migrate;
     description = "Schema migration tools for SQLAlchemy";
     license = licenses.asl20;
     maintainers = with maintainers; [ makefu ];

From 71c42462ab71811bfacb65e89541846fe8c97e0a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 30 Aug 2018 22:06:48 -0400
Subject: [PATCH 2785/3253] buildbot: 1.2.0 -> 1.4.0

---
 .../tools/build-managers/buildbot/default.nix     |  5 ++---
 .../tools/build-managers/buildbot/pkg.nix         |  7 ++-----
 .../tools/build-managers/buildbot/plugins.nix     | 15 +++++----------
 .../tools/build-managers/buildbot/worker.nix      |  1 -
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index adb279cdea68..7e89fdc348eb 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -12,13 +12,12 @@ let
   '';
 
   package = pythonPackages.buildPythonApplication rec {
-    name = "${pname}-${version}";
     pname = "buildbot";
-    version = "1.2.0";
+    version = "1.4.0";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "02gwmls8kgm6scy36hdy0bg645zs1pxlrgwkcn79wrl7cfmabcbv";
+      sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx";
     };
 
     buildInputs = with pythonPackages; [
diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/tools/build-managers/buildbot/pkg.nix
index 11f5be4e98e9..452c2ffea04a 100644
--- a/pkgs/development/tools/build-managers/buildbot/pkg.nix
+++ b/pkgs/development/tools/build-managers/buildbot/pkg.nix
@@ -1,17 +1,14 @@
 { stdenv, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "buildbot-pkg";
-  version = "1.2.0";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "70f429311c5812ffd334f023f4f50b904be5c672c8674ee6d28a11a7c096f18a";
+    sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a";
   };
 
-  propagatedBuildInputs = [ setuptools ];
-
   postPatch = ''
     # Their listdir function filters out `node_modules` folders.
     # Do we have to care about that with Nix...?
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 430cdee3ca8c..91499b6e755c 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -2,7 +2,6 @@
 
 {
   www = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "buildbot_www";
     version = buildbot-pkg.version;
 
@@ -11,7 +10,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "001kxjcyn5sxiq7m1izy4djj7alw6qpgaid4f518s9xgm4a8hwcb";
+      sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v";
     };
 
     meta = with stdenv.lib; {
@@ -23,13 +22,12 @@
   };
 
   console-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "buildbot-console-view";
     version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "11p9l9r9rh8cq0ihzjcdxfbi55n7inbsz45zqq67rkvqn5nhj5b6";
+      sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -43,13 +41,12 @@
   };
 
   waterfall-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
     version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1yx63frfpbvwy4hfib1psyq5ad0wysyzfrla8d7lgbdaip021wzw";
+      sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -63,13 +60,12 @@
   };
 
   grid-view = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "buildbot-grid-view";
     version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "06my75hli3w1skdkx1qz6zqw2wckanhrcvlqm4inylj9v9pcrgv6";
+      sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -83,13 +79,12 @@
   };
 
   wsgi-dashboards = pythonPackages.buildPythonPackage rec {
-    name = "${pname}-${version}";
     pname = "buildbot-wsgi-dashboards";
     version = buildbot-pkg.version;
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "073gz44fa5k1p8k46k0ld9gg16j8zdj6sc297qfyqpiw28ybhc5s";
+      sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 4fabad9d3701..02beb686399d 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -1,7 +1,6 @@
 { stdenv, pythonPackages }:
 
 pythonPackages.buildPythonApplication (rec {
-  name = "${pname}-${version}";
   pname = "buildbot-worker";
   version = "1.4.0";
 

From 60ae563293ec956d683e3b9a62dbdef46f71437e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 11 Oct 2018 15:04:37 -0500
Subject: [PATCH 2786/3253] yubikey-manager: 0.7.0 -> 1.0.0

---
 pkgs/tools/misc/yubikey-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index c8c0ba706c36..140e322c862b 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -2,11 +2,11 @@
   yubikey-personalization, libu2f-host, libusb1 }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "yubikey-manager-0.7.0";
+  name = "yubikey-manager-1.0.0";
 
   srcs = fetchurl {
     url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
-    sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr";
+    sha256 = "1qdb2b3mv4wafghnmv3sxw4fh7cjc06hnkdimfnwmqcjafzvbawd";
   };
 
   propagatedBuildInputs =

From 74e6e0547999dca07c5bfe4d3f244b2647950384 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 11 Oct 2018 20:37:55 -0400
Subject: [PATCH 2787/3253] apacheHttpd: add lynx binary path to apachectl

---
 pkgs/servers/http/apache-httpd/2.4.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index c7bb6cfb6cdc..b4b4cf49592d 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv
+{ stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx
 , proxySupport ? true
 , sslSupport ? true, openssl
 , http2Support ? true, nghttp2
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
+    sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
   '';
 
   # Required for ‘pthread_cancel’.

From 9dd5dc57a77b1b592708a6d27fef081be0b06fa8 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 00:45:59 +0000
Subject: [PATCH 2788/3253] bootStage1: fix cross build

---
 nixos/modules/system/boot/stage-1.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index f58b68cb3353..8688b5ad9bfb 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -251,7 +251,8 @@ let
     postInstall = ''
       echo checking syntax
       # check both with bash
-      ${pkgs.bash}/bin/sh -n $target
+      ${pkgs.buildPackages.bash}/bin/sh -n $target
+    '' + optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
       # and with ash shell, just in case
       ${extraUtils}/bin/ash -n $target
     '';

From dbb445736f74482780490c7ce4be07dbf2ac8e9c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 12 Oct 2018 01:16:50 +0000
Subject: [PATCH 2789/3253] use buildPackages in environment.extraSetup

---
 nixos/modules/config/system-path.nix | 2 +-
 nixos/modules/config/xdg/mime.nix    | 4 ++--
 nixos/modules/misc/documentation.nix | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 3c24dab85e4d..c07e19bd03c4 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -140,7 +140,7 @@ in
           if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
               $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
           fi
-          
+
           ${config.environment.extraSetup}
         '';
     };
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index 4323a49ea1dd..cd1064630fbc 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -24,11 +24,11 @@ with lib;
 
     environment.extraSetup = ''
       if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
-          XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
+          XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
       fi
 
       if [ -w $out/share/applications ]; then
-          ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
+          ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database $out/share/applications
       fi
     '';
   };
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 6a7105e9cdaa..09d53c322fb3 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -166,7 +166,7 @@ in
         if [ -w $out/share/info ]; then
           shopt -s nullglob
           for i in $out/share/info/*.info $out/share/info/*.info.gz; do
-              ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir
+              ${pkgs.buildPackages.texinfo}/bin/install-info $i $out/share/info/dir
           done
         fi
       '';

From 73c523a605d455eacee45d7cb811dfba45103e8b Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 16 Dec 2017 23:06:43 -0500
Subject: [PATCH 2790/3253] buildbot: add Python 3 support

---
 nixos/doc/manual/release-notes/rl-1903.xml    |   9 +
 .../buildbot/master.nix                       |  67 ++++--
 .../buildbot/worker.nix                       |  77 ++++++-
 nixos/release.nix                             |   2 +-
 nixos/tests/buildbot.nix                      | 210 +++++++++---------
 .../buildbot/default.nix                      |  96 ++++----
 .../buildbot/pkg.nix                          |   4 +-
 .../buildbot/plugins.nix                      |  55 ++---
 .../buildbot/skip_test_linux_distro.patch     |   0
 .../buildbot/worker.nix                       |  13 +-
 pkgs/top-level/aliases.nix                    |   5 +
 pkgs/top-level/all-packages.nix               |  15 --
 pkgs/top-level/python-packages.nix            |   7 +
 13 files changed, 331 insertions(+), 229 deletions(-)
 rename pkgs/development/{tools/build-managers => python-modules}/buildbot/default.nix (52%)
 rename pkgs/development/{tools/build-managers => python-modules}/buildbot/pkg.nix (87%)
 rename pkgs/development/{tools/build-managers => python-modules}/buildbot/plugins.nix (61%)
 rename pkgs/development/{tools/build-managers => python-modules}/buildbot/skip_test_linux_distro.patch (100%)
 rename pkgs/development/{tools/build-managers => python-modules}/buildbot/worker.nix (63%)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 9cb5b93f27cb..c4847b60e274 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -113,6 +113,15 @@
        (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
      </para>
    </listitem>
+   <listitem>
+    <para>
+     Buildbot now supports Python 3 and its packages have been moved to
+     <literal>pythonPackages</literal>. The options
+     <option>services.buildbot-master.package</option> and
+     <option>services.buildbot-worker.package</option> can be used to select
+     the Python 2 or 3 version of the package.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 8d767de37f00..0f07e6133bb5 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -6,8 +6,12 @@ with lib;
 
 let
   cfg = config.services.buildbot-master;
+
+  python = cfg.package.pythonModule;
+
   escapeStr = s: escape ["'"] s;
-  masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" ''
+
+  defaultMasterCfg = pkgs.writeText "master.cfg" ''
     from buildbot.plugins import *
     factory = util.BuildFactory()
     c = BuildmasterConfig = dict(
@@ -27,8 +31,28 @@ let
       factory.addStep(step)
 
     ${cfg.extraConfig}
-  ''
-  else cfg.masterCfg;
+  '';
+
+  tacFile = pkgs.writeText "buildbot-master.tac" ''
+    import os
+
+    from twisted.application import service
+    from buildbot.master import BuildMaster
+
+    basedir = '${cfg.buildbotDir}'
+
+    configfile = '${cfg.masterCfg}'
+
+    # Default umask for server
+    umask = None
+
+    # note: this line is matched against to check that this is a buildmaster
+    # directory; do not edit it.
+    application = service.Application('buildmaster')
+
+    m = BuildMaster(basedir, configfile, umask)
+    m.setServiceParent(application)
+  '';
 
 in {
   options = {
@@ -66,9 +90,9 @@ in {
       };
 
       masterCfg = mkOption {
-        type = types.nullOr types.path;
+        type = types.path;
         description = "Optionally pass master.cfg path. Other options in this configuration will be ignored.";
-        default = null;
+        default = defaultMasterCfg;
         example = "/etc/nixos/buildbot/master.cfg";
       };
 
@@ -175,18 +199,25 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.buildbot-full;
-        defaultText = "pkgs.buildbot-full";
+        default = pkgs.pythonPackages.buildbot-full;
+        defaultText = "pkgs.pythonPackages.buildbot-full";
         description = "Package to use for buildbot.";
-        example = literalExample "pkgs.buildbot-full";
+        example = literalExample "pkgs.python3Packages.buildbot-full";
       };
 
       packages = mkOption {
-        default = with pkgs; [ python27Packages.twisted git ];
+        default = [ pkgs.git ];
         example = literalExample "[ pkgs.git ]";
         type = types.listOf types.package;
         description = "Packages to add to PATH for the buildbot process.";
       };
+
+      pythonPackages = mkOption {
+        default = pythonPackages: with pythonPackages; [ ];
+        defaultText = "pythonPackages: with pythonPackages; [ ]";
+        description = "Packages to add the to the PYTHONPATH of the buildbot process.";
+        example = literalExample "pythonPackages: with pythonPackages; [ requests ]";
+      };
     };
   };
 
@@ -210,14 +241,15 @@ in {
       description = "Buildbot Continuous Integration Server.";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = cfg.packages;
+      path = cfg.packages ++ cfg.pythonPackages python.pkgs;
+      environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}";
 
       preStart = ''
-        env > envvars
-        mkdir -vp ${cfg.buildbotDir}
-        ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg
-        rm -fv $cfg.buildbotDir}/buildbot.tac
-        ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
+        mkdir -vp "${cfg.buildbotDir}"
+        # Link the tac file so buildbot command line tools recognize the directory
+        ln -sf "${tacFile}" "${cfg.buildbotDir}/buildbot.tac"
+        ${cfg.package}/bin/buildbot create-master --db "${cfg.dbUrl}" "${cfg.buildbotDir}"
+        rm -f buildbot.tac.new master.cfg.sample
       '';
 
       serviceConfig = {
@@ -225,12 +257,11 @@ in {
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.home;
-        ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
+        # NOTE: call twistd directly with stdout logging for systemd
+        ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${tacFile}";
       };
-
     };
   };
 
   meta.maintainers = with lib.maintainers; [ nand0p mic92 ];
-
 }
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 67c541570b97..4130ec918a70 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -7,6 +7,40 @@ with lib;
 let
   cfg = config.services.buildbot-worker;
 
+  python = cfg.package.pythonModule;
+
+  tacFile = pkgs.writeText "aur-buildbot-worker.tac" ''
+    import os
+    from io import open
+
+    from buildbot_worker.bot import Worker
+    from twisted.application import service
+
+    basedir = '${cfg.buildbotDir}'
+
+    # note: this line is matched against to check that this is a worker
+    # directory; do not edit it.
+    application = service.Application('buildbot-worker')
+
+    master_url_split = '${cfg.masterUrl}'.split(':')
+    buildmaster_host = master_url_split[0]
+    port = int(master_url_split[1])
+    workername = '${cfg.workerUser}'
+
+    with open('${cfg.workerPassFile}', 'r', encoding='utf-8') as passwd_file:
+        passwd = passwd_file.read().strip('\r\n')
+    keepalive = 600
+    umask = None
+    maxdelay = 300
+    numcpus = None
+    allow_shutdown = None
+
+    s = Worker(buildmaster_host, port, workername, passwd, basedir,
+               keepalive, umask=umask, maxdelay=maxdelay,
+               numcpus=numcpus, allow_shutdown=allow_shutdown)
+    s.setServiceParent(application)
+  '';
+
 in {
   options = {
     services.buildbot-worker = {
@@ -59,6 +93,23 @@ in {
         description = "Specifies the Buildbot Worker password.";
       };
 
+      workerPassFile = mkOption {
+        type = types.path;
+        description = "File used to store the Buildbot Worker password";
+      };
+
+      hostMessage = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = "Description of this worker";
+      };
+
+      adminMessage = mkOption {
+        default = null;
+        type = types.nullOr types.str;
+        description = "Name of the administrator of this worker";
+      };
+
       masterUrl = mkOption {
         default = "localhost:9989";
         type = types.str;
@@ -67,23 +118,24 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.buildbot-worker;
-        defaultText = "pkgs.buildbot-worker";
+        default = pkgs.pythonPackages.buildbot-worker;
+        defaultText = "pkgs.pythonPackages.buildbot-worker";
         description = "Package to use for buildbot worker.";
-        example = literalExample "pkgs.buildbot-worker";
+        example = literalExample "pkgs.python3Packages.buildbot-worker";
       };
 
       packages = mkOption {
-        default = with pkgs; [ python27Packages.twisted git ];
+        default = with pkgs; [ git ];
         example = literalExample "[ pkgs.git ]";
         type = types.listOf types.package;
         description = "Packages to add to PATH for the buildbot process.";
       };
-
     };
   };
 
   config = mkIf cfg.enable {
+    services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass);
+
     users.groups = optional (cfg.group == "bbworker") {
       name = "bbworker";
     };
@@ -104,11 +156,16 @@ in {
       after = [ "network.target" "buildbot-master.service" ];
       wantedBy = [ "multi-user.target" ];
       path = cfg.packages;
+      environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}";
 
       preStart = ''
-        mkdir -vp ${cfg.buildbotDir}
-        rm -fv $cfg.buildbotDir}/buildbot.tac
-        ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}
+        mkdir -vp "${cfg.buildbotDir}/info"
+        ${optionalString (cfg.hostMessage != null) ''
+          ln -sf "${pkgs.writeText "buildbot-worker-host" cfg.hostMessage}" "${cfg.buildbotDir}/info/host"
+        ''}
+        ${optionalString (cfg.adminMessage != null) ''
+          ln -sf "${pkgs.writeText "buildbot-worker-admin" cfg.adminMessage}" "${cfg.buildbotDir}/info/admin"
+        ''}
       '';
 
       serviceConfig = {
@@ -116,11 +173,9 @@ in {
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.home;
-        Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages";
 
         # NOTE: call twistd directly with stdout logging for systemd
-        #ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}";
-        ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac";
+        ExecStart = "${python.pkgs.twisted}/bin/twistd --nodaemon --pidfile= --logfile - --python ${tacFile}";
       };
 
     };
diff --git a/nixos/release.nix b/nixos/release.nix
index 86383f502a72..5412080cca18 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -257,7 +257,7 @@ in rec {
   tests.boot = callSubTests tests/boot.nix {};
   tests.boot-stage1 = callTest tests/boot-stage1.nix {};
   tests.borgbackup = callTest tests/borgbackup.nix {};
-  tests.buildbot = callTest tests/buildbot.nix {};
+  tests.buildbot = callSubTests tests/buildbot.nix {};
   tests.cadvisor = callTestOnMatchingSystems ["x86_64-linux"] tests/cadvisor.nix {};
   tests.ceph = callTestOnMatchingSystems ["x86_64-linux"] tests/ceph.nix {};
   tests.certmgr = callSubTests tests/certmgr.nix {};
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index cf408dc7fec9..399fd39005e2 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -1,111 +1,117 @@
-# Test ensures buildbot master comes up correctly and workers can connect
+{ system ? builtins.currentSystem }:
 
-import ./make-test.nix ({ pkgs, ... } : {
-  name = "buildbot";
+with import ../lib/testing.nix { inherit system; };
 
-  nodes = {
-    bbmaster = { pkgs, ... }: {
-      services.buildbot-master = {
-        enable = true;
-        package = pkgs.buildbot-full;
+let
+  # Test ensures buildbot master comes up correctly and workers can connect
+  mkBuildbotTest = python: makeTest {
+    name = "buildbot";
 
-        # NOTE: use fake repo due to no internet in hydra ci
-        factorySteps = [
-          "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
-          "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
-        ];
-        changeSource = [
-          "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
-        ];
+    nodes = {
+      bbmaster = { pkgs, ... }: {
+        services.buildbot-master = {
+          enable = true;
+          package = python.pkgs.buildbot-full;
+
+          # NOTE: use fake repo due to no internet in hydra ci
+          factorySteps = [
+            "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
+            "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
+          ];
+          changeSource = [
+            "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+          ];
+        };
+        networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
+        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ];
       };
-      networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
-      environment.systemPackages = with pkgs; [ git buildbot-full ];
-    };
 
-    bbworker = { pkgs, ... }: {
-      services.buildbot-worker = {
-        enable = true;
-        masterUrl = "bbmaster:9989";
+      bbworker = { pkgs, ... }: {
+        services.buildbot-worker = {
+          enable = true;
+          masterUrl = "bbmaster:9989";
+        };
+        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ];
+      };
+
+      gitrepo = { pkgs, ... }: {
+        services.openssh.enable = true;
+        networking.firewall.allowedTCPPorts = [ 22 9418 ];
+        environment.systemPackages = with pkgs; [ git ];
       };
-      environment.systemPackages = with pkgs; [ git buildbot-worker ];
     };
 
-    gitrepo = { pkgs, ... }: {
-      services.openssh.enable = true;
-      networking.firewall.allowedTCPPorts = [ 22 9418 ];
-      environment.systemPackages = with pkgs; [ git ];
-    };
+    testScript = ''
+      #Start up and populate fake repo
+      $gitrepo->waitForUnit("multi-user.target");
+      print($gitrepo->execute(" \
+        git config --global user.name 'Nobody Fakeuser' && \
+        git config --global user.email 'nobody\@fakerepo.com' && \
+        rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
+        mkdir -pv /srv/repos/fakerepo ~/.ssh && \
+        ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
+        cat ~/.ssh/known_hosts && \
+        cd /srv/repos/fakerepo && \
+        git init && \
+        echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
+        cat fakerepo.sh && \
+        touch .git/git-daemon-export-ok && \
+        git add fakerepo.sh .git/git-daemon-export-ok && \
+        git commit -m fakerepo && \
+        git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
+      "));
+
+      # Test gitrepo
+      $bbmaster->waitForUnit("network-online.target");
+      #$bbmaster->execute("nc -z gitrepo 9418");
+      print($bbmaster->execute(" \
+        rm -rfv /tmp/fakerepo && \
+        git clone git://gitrepo/fakerepo /tmp/fakerepo && \
+        pwd && \
+        ls -la && \
+        ls -la /tmp/fakerepo \
+      "));
+
+      # Test start master and connect worker
+      $bbmaster->waitForUnit("buildbot-master.service");
+      $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
+      $bbworker->waitForUnit("network-online.target");
+      $bbworker->execute("nc -z bbmaster 8010");
+      $bbworker->execute("nc -z bbmaster 9989");
+      $bbworker->waitForUnit("buildbot-worker.service");
+      print($bbworker->execute("ls -la /home/bbworker/worker"));
+
+
+      # Test stop buildbot master and worker
+      print($bbmaster->execute(" \
+        systemctl -l --no-pager status buildbot-master && \
+        systemctl stop buildbot-master \
+      "));
+      $bbworker->fail("nc -z bbmaster 8010");
+      $bbworker->fail("nc -z bbmaster 9989");
+      print($bbworker->execute(" \
+        systemctl -l --no-pager status buildbot-worker && \
+        systemctl stop buildbot-worker && \
+        ls -la /home/bbworker/worker \
+      "));
+
+
+      # Test buildbot daemon mode
+      $bbmaster->execute("buildbot create-master /tmp");
+      $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
+      $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
+      $bbmaster->execute("buildbot start /tmp");
+      $bbworker->execute("nc -z bbmaster 8011");
+      $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
+      $bbmaster->execute("buildbot stop /tmp");
+      $bbworker->fail("nc -z bbmaster 8011");
+
+    '';
+
+    meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
+
   };
-
-  testScript = ''
-    #Start up and populate fake repo
-    $gitrepo->waitForUnit("multi-user.target");
-    print($gitrepo->execute(" \
-      git config --global user.name 'Nobody Fakeuser' && \
-      git config --global user.email 'nobody\@fakerepo.com' && \
-      rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
-      mkdir -pv /srv/repos/fakerepo ~/.ssh && \
-      ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
-      cat ~/.ssh/known_hosts && \
-      cd /srv/repos/fakerepo && \
-      git init && \
-      echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
-      cat fakerepo.sh && \
-      touch .git/git-daemon-export-ok && \
-      git add fakerepo.sh .git/git-daemon-export-ok && \
-      git commit -m fakerepo && \
-      git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
-    "));
-
-    # Test gitrepo
-    $bbmaster->waitForUnit("network-online.target");
-    #$bbmaster->execute("nc -z gitrepo 9418");
-    print($bbmaster->execute(" \
-      rm -rfv /tmp/fakerepo && \
-      git clone git://gitrepo/fakerepo /tmp/fakerepo && \
-      pwd && \
-      ls -la && \
-      ls -la /tmp/fakerepo \
-    "));
-
-    # Test start master and connect worker
-    $bbmaster->waitForUnit("buildbot-master.service");
-    $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
-    $bbworker->waitForUnit("network-online.target");
-    $bbworker->execute("nc -z bbmaster 8010");
-    $bbworker->execute("nc -z bbmaster 9989");
-    $bbworker->waitForUnit("buildbot-worker.service");
-    print($bbworker->execute("ls -la /home/bbworker/worker"));
-
-
-    # Test stop buildbot master and worker
-    print($bbmaster->execute(" \
-      systemctl -l --no-pager status buildbot-master && \
-      systemctl stop buildbot-master \
-    "));
-    $bbworker->fail("nc -z bbmaster 8010");
-    $bbworker->fail("nc -z bbmaster 9989");
-    print($bbworker->execute(" \
-      systemctl -l --no-pager status buildbot-worker && \
-      systemctl stop buildbot-worker && \
-      ls -la /home/bbworker/worker \
-    "));
-
-
-    # Test buildbot daemon mode
-    # NOTE: daemon mode tests disabled due to broken PYTHONPATH child inheritence
-    #
-    #$bbmaster->execute("buildbot create-master /tmp");
-    #$bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
-    #$bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
-    #$bbmaster->execute("buildbot start /tmp");
-    #$bbworker->execute("nc -z bbmaster 8011");
-    #$bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
-    #$bbmaster->execute("buildbot stop /tmp");
-    #$bbworker->fail("nc -z bbmaster 8011");
-
-  '';
-
-  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
-
-})
+in {
+  python2 = mkBuildbotTest pkgs.python2;
+  python3 = mkBuildbotTest pkgs.python3;
+}
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
similarity index 52%
rename from pkgs/development/tools/build-managers/buildbot/default.nix
rename to pkgs/development/python-modules/buildbot/default.nix
index 7e89fdc348eb..0110aa92c061 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,72 +1,68 @@
-{ stdenv, openssh, buildbot-worker, buildbot-pkg, pythonPackages, runCommand, makeWrapper }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
+  python, twisted, jinja2, zope_interface, future, sqlalchemy,
+  sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
+  txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint,
+  flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
 
 let
-  withPlugins = plugins: runCommand "wrapped-${package.name}" {
-    buildInputs = [ makeWrapper ] ++ plugins;
-    propagatedBuildInputs = package.propagatedBuildInputs;
-    passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
-  } ''
-    makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
-      --prefix PYTHONPATH : "${package}/lib/python2.7/site-packages:$PYTHONPATH"
-    ln -sfv ${package}/lib $out/lib
-  '';
+  withPlugins = plugins: buildPythonPackage {
+    name = "${package.name}-with-plugins";
+    phases = [ "installPhase" "fixupPhase" ];
+    buildInputs = [ makeWrapper ];
+    propagatedBuildInputs = plugins ++ package.propagatedBuildInputs;
 
-  package = pythonPackages.buildPythonApplication rec {
+    installPhase = ''
+      makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
+        --prefix PYTHONPATH : "${package}/${python.sitePackages}:$PYTHONPATH"
+      ln -sfv ${package}/lib $out/lib
+    '';
+
+    passthru = package.passthru // {
+      withPlugins = morePlugins: withPlugins (morePlugins ++ plugins);
+    };
+  };
+
+  package = buildPythonPackage rec {
     pname = "buildbot";
     version = "1.4.0";
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "0dfa926nh642i3bnpzlz0q347zicyx6wswjfqbniri59ya64fncx";
     };
 
-    buildInputs = with pythonPackages; [
-      lz4
-      txrequests
-      pyjade
-      boto3
-      moto
-      txgithub
-      mock
-      setuptoolsTrial
-      isort
-      pylint
-      astroid
-      pyflakes
-      openssh
-      buildbot-worker
-      buildbot-pkg
-      treq
-    ];
-
-    propagatedBuildInputs = with pythonPackages; [
+    propagatedBuildInputs = [
       # core
       twisted
       jinja2
       zope_interface
+      future
       sqlalchemy
       sqlalchemy_migrate
-      future
       dateutil
       txaio
       autobahn
       pyjwt
-      distro
 
       # tls
-      pyopenssl
-      service-identity
-      idna
-
-      # docs
-      sphinx
-      sphinxcontrib-blockdiag
-      sphinxcontrib-spelling
-      pyenchant
-      docutils
-      ramlfications
-      sphinx-jinja
+      twisted.extras.tls
+    ];
 
+    checkInputs = [
+      treq
+      txrequests
+      pyjade
+      boto3
+      moto
+      mock
+      lz4
+      setuptoolsTrial
+      isort
+      pylint
+      flake8
+      buildbot-worker
+      buildbot-pkg
+      glibcLocales
     ];
 
     patches = [
@@ -75,6 +71,8 @@ let
       ./skip_test_linux_distro.patch
     ];
 
+    LC_ALL = "en_US.UTF-8";
+
     # TimeoutErrors on slow machines -> aarch64
     doCheck = !stdenv.isAarch64;
 
@@ -82,9 +80,11 @@ let
       substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
     '';
 
-    passthru = { inherit withPlugins; };
+    passthru = {
+      inherit withPlugins;
+    };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes";
       maintainers = with maintainers; [ nand0p ryansydnor ];
diff --git a/pkgs/development/tools/build-managers/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
similarity index 87%
rename from pkgs/development/tools/build-managers/buildbot/pkg.nix
rename to pkgs/development/python-modules/buildbot/pkg.nix
index 452c2ffea04a..b9358b1c420b 100644
--- a/pkgs/development/tools/build-managers/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, setuptools }:
+{ lib, buildPythonPackage, fetchPypi, setuptools }:
 
 buildPythonPackage rec {
   pname = "buildbot-pkg";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://buildbot.net/;
     description = "Buildbot Packaging Helper";
     maintainers = with maintainers; [ nand0p ryansydnor ];
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
similarity index 61%
rename from pkgs/development/tools/build-managers/buildbot/plugins.nix
rename to pkgs/development/python-modules/buildbot/plugins.nix
index 91499b6e755c..bdc67d178d44 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -1,19 +1,19 @@
-{ stdenv, pythonPackages, buildbot-pkg }:
+{ lib, buildPythonPackage, fetchPypi, buildbot, buildbot-pkg }:
 
 {
-  www = pythonPackages.buildPythonPackage rec {
+  www = buildPythonPackage rec {
     pname = "buildbot_www";
-    version = buildbot-pkg.version;
+    inherit (buildbot-pkg) version;
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version format;
       sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot UI";
       maintainers = with maintainers; [ nand0p ryansydnor ];
@@ -21,18 +21,19 @@
     };
   };
 
-  console-view = pythonPackages.buildPythonPackage rec {
+  console-view = buildPythonPackage rec {
     pname = "buildbot-console-view";
-    version = buildbot-pkg.version;
+    inherit (buildbot-pkg) version;
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+    propagatedBuildInputs = [ buildbot-pkg ];
+    checkInputs = [ buildbot ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot Console View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
@@ -40,18 +41,19 @@
     };
   };
 
-  waterfall-view = pythonPackages.buildPythonPackage rec {
+  waterfall-view = buildPythonPackage rec {
     pname = "buildbot-waterfall-view";
-    version = buildbot-pkg.version;
+    inherit (buildbot-pkg) version;
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+    propagatedBuildInputs = [ buildbot-pkg ];
+    checkInputs = [ buildbot ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot Waterfall View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
@@ -59,18 +61,19 @@
     };
   };
 
-  grid-view = pythonPackages.buildPythonPackage rec {
+  grid-view = buildPythonPackage rec {
     pname = "buildbot-grid-view";
-    version = buildbot-pkg.version;
+    inherit (buildbot-pkg) version;
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+    propagatedBuildInputs = [ buildbot-pkg ];
+    checkInputs = [ buildbot ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot Grid View Plugin";
       maintainers = with maintainers; [ nand0p ];
@@ -78,23 +81,23 @@
     };
   };
 
-  wsgi-dashboards = pythonPackages.buildPythonPackage rec {
+  wsgi-dashboards = buildPythonPackage rec {
     pname = "buildbot-wsgi-dashboards";
-    version = buildbot-pkg.version;
+    inherit (buildbot-pkg) version;
 
-    src = pythonPackages.fetchPypi {
+    src = fetchPypi {
       inherit pname version;
       sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz";
     };
 
-    propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
+    propagatedBuildInputs = [ buildbot-pkg ];
+    checkInputs = [ buildbot ];
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot WSGI dashboards Plugin";
       maintainers = with maintainers; [ ];
       license = licenses.gpl2;
     };
   };
-
 }
diff --git a/pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch b/pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/buildbot/skip_test_linux_distro.patch
rename to pkgs/development/python-modules/buildbot/skip_test_linux_distro.patch
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
similarity index 63%
rename from pkgs/development/tools/build-managers/buildbot/worker.nix
rename to pkgs/development/python-modules/buildbot/worker.nix
index 02beb686399d..4e54276f8aed 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -1,22 +1,23 @@
-{ stdenv, pythonPackages }:
+{ lib, buildPythonPackage, fetchPypi, python, setuptoolsTrial, mock, twisted, future }:
 
-pythonPackages.buildPythonApplication (rec {
+buildPythonPackage (rec {
   pname = "buildbot-worker";
   version = "1.4.0";
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
   };
 
-  buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
-  propagatedBuildInputs = with pythonPackages; [ twisted future ];
+  propagatedBuildInputs = [ twisted future ];
+
+  checkInputs = [ setuptoolsTrial mock ];
 
   postPatch = ''
     substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://buildbot.net/;
     description = "Buildbot Worker Daemon";
     maintainers = with maintainers; [ nand0p ryansydnor ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fe0d3816413e..0abf0e608466 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -49,6 +49,11 @@ mapAliases ({
   bashCompletion = bash-completion; # Added 2016-09-28
   bridge_utils = bridge-utils;  # added 2015-02-20
   btrfsProgs = btrfs-progs; # added 2016-01-03
+  buildbot = pythonPackages.buildbot; # added 2018-10-11
+  buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11
+  buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11
+  buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11
+  buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11
   bundler_HEAD = bundler; # added 2015-11-15
   cantarell_fonts = cantarell-fonts; # added 2018-03-03
   checkbashism = checkbashisms; # added 2016-08-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d911181ae372..b34501a8f69f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8135,21 +8135,6 @@ with pkgs;
 
   buck = callPackage ../development/tools/build-managers/buck { };
 
-  buildbot = callPackage ../development/tools/build-managers/buildbot {
-    pythonPackages = python2Packages;
-  };
-  buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix {
-    pythonPackages = python2Packages;
-  };
-  buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix {
-    inherit (python2Packages) buildPythonPackage fetchPypi setuptools;
-  };
-  buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix {
-    pythonPackages = python2Packages;
-  };
-  buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
-  buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]);
-
   buildkite-agent = buildkite-agent2;
   buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { };
   buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73d2cf6d2ac6..3822f08bad7b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1421,6 +1421,13 @@ in {
 
   bugzilla = callPackage ../development/python-modules/bugzilla { };
 
+  buildbot = callPackage ../development/python-modules/buildbot { };
+  buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { });
+  buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
+  buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]);
+  buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { };
+  buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { };
+
   check-manifest = callPackage ../development/python-modules/check-manifest { };
 
   devpi-common = callPackage ../development/python-modules/devpi-common { };

From 559d0ee2844b507f5ad938f0750725020cbe0d08 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 12 Oct 2018 06:54:56 +0300
Subject: [PATCH 2791/3253] nano-wallet: 16.1 -> 16.2

---
 pkgs/applications/altcoins/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
index 3426d8d07a08..22da11cdd63b 100644
--- a/pkgs/applications/altcoins/nano-wallet/default.nix
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "nano-wallet-${version}";
-  version = "16.1";
+  version = "16.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "0sk9g4fv494a5w75vs5a3s5c139lxzz1svz0cn1hkhxqlmz8w081";
+    sha256 = "18zp4xl5iwwrnzrqzsygdrym5565v8dpfz0jxczw21896kw1i9i7";
     fetchSubmodules = true;
   };
 

From 0fc9fdf7f2e6bc36224275cebebb4992c7d31ea4 Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Thu, 11 Oct 2018 23:58:25 -0400
Subject: [PATCH 2792/3253] mlton: use stdenv.cc.bintools.dynamicLinker

---
 pkgs/development/compilers/mlton/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 0b991e22fa98..63fa3445b44c 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -5,9 +5,7 @@ let
 
   usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
 
-  dynamic_linker =
-    if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
-                       else "${stdenv.glibc.out}/lib/ld-linux.so.2";
+  dynamic_linker = stdenv.cc.bintools.dynamicLinker;
 in
 
 stdenv.mkDerivation rec {

From 4845d9324f96a0b879030e87b99cf1b841a833a0 Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Fri, 12 Oct 2018 00:04:16 -0400
Subject: [PATCH 2793/3253] mlton: prepare old version for refactoring

20130715.nix is exactly the same as the old default.nix other than
pulling the meta data out into its own file.
---
 pkgs/development/compilers/mlton/20130715.nix | 118 +++++++++++++++
 pkgs/development/compilers/mlton/default.nix  | 134 +-----------------
 pkgs/development/compilers/mlton/meta.nix     |  15 ++
 pkgs/top-level/all-packages.nix               |   5 +-
 4 files changed, 141 insertions(+), 131 deletions(-)
 create mode 100644 pkgs/development/compilers/mlton/20130715.nix
 create mode 100644 pkgs/development/compilers/mlton/meta.nix

diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
new file mode 100644
index 000000000000..f495be8a93e4
--- /dev/null
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -0,0 +1,118 @@
+{ stdenv, fetchurl, patchelf, gmp }:
+
+let
+  version = "20130715";
+
+  usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
+
+  dynamic_linker = stdenv.cc.bintools.dynamicLinker;
+in
+
+stdenv.mkDerivation rec {
+  name = "mlton-${version}";
+
+  binSrc =
+    if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
+      sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
+    })
+    else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
+        sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
+    })
+    else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
+        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
+    })
+    else throw "Architecture not supported";
+
+  codeSrc =
+    fetchurl {
+      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
+      sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
+    };
+
+  srcs = [ binSrc codeSrc ];
+
+  sourceRoot = name;
+
+  buildInputs = [ gmp ];
+  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+
+  makeFlags = [ "all-no-docs" ];
+
+  configurePhase = ''
+    # Fix paths in the source.
+    find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
+
+    substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
+    substituteInPlace bin/mlton-script --replace gcc cc
+    substituteInPlace bin/regression --replace gcc cc
+    substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
+    substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
+    substituteInPlace runtime/Makefile --replace gcc cc
+    substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
+
+    # Fix paths in the binary distribution.
+    BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
+    for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
+      substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
+    done
+
+    substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
+  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+    sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
+  '';
+
+  preBuild = ''
+    # To build the source we have to put the binary distribution in the $PATH.
+    export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
+
+    # Let the builder execute the binary distribution.
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
+
+    # So the builder runs the binary compiler with gmp.
+    export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH
+
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    # Patch ELF interpreter.
+    patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    for e in mllex mlyacc ; do
+      patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
+    done
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Patch libgmp linking
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
+    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
+  '';
+
+  doCheck = true;
+
+  installTargets = [ "install-no-docs" ];
+
+  postInstall = ''
+    # Fix path to mlton libraries.
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
+
+    # Path to libgmp.
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'"
+
+    # Path to gmp.h.
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'"
+
+    # Path to the same cc used in the build; needed at runtime.
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'"
+
+    # Copy files to final positions.
+    cp -r $(pwd)/install/${usr_prefix}/bin $out
+    cp -r $(pwd)/install/${usr_prefix}/lib $out
+    cp -r $(pwd)/install/${usr_prefix}/man $out
+  '';
+
+  meta = import ./meta.nix;
+}
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 63fa3445b44c..7139a8a073de 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -1,132 +1,6 @@
-{ stdenv, fetchurl, patchelf, gmp }:
-
-let
-  version = "20130715";
-
-  usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
-
-  dynamic_linker = stdenv.cc.bintools.dynamicLinker;
-in
-
-stdenv.mkDerivation rec {
-  name = "mlton-${version}";
-
-  binSrc =
-    if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
-      sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
-    })
-    else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
-        sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
-    })
-    else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
-        url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
-        sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
-    })
-    else throw "Architecture not supported";
-
-  codeSrc =
-    fetchurl {
-      url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
-      sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
-    };
-
-  srcs = [ binSrc codeSrc ];
-
-  sourceRoot = name;
-
-  buildInputs = [ gmp ];
-  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
-
-  makeFlags = [ "all-no-docs" ];
-
-  configurePhase = ''
-    # Fix paths in the source.
-    find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
-
-    substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
-    substituteInPlace bin/mlton-script --replace gcc cc
-    substituteInPlace bin/regression --replace gcc cc
-    substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
-    substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
-    substituteInPlace runtime/Makefile --replace gcc cc
-    substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
-
-    # Fix paths in the binary distribution.
-    BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
-    for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
-      substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
-    done
-
-    substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
-  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
-    sed -i "s_	patch -s -p0 <gdtoa.hide-public-fns.patch_	patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
-  '';
-
-  preBuild = ''
-    # To build the source we have to put the binary distribution in the $PATH.
-    export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
-
-    # Let the builder execute the binary distribution.
-    chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
-    chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
-    chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
-
-    # So the builder runs the binary compiler with gmp.
-    export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH
-
-  '' + stdenv.lib.optionalString stdenv.isLinux ''
-    # Patch ELF interpreter.
-    patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-    for e in mllex mlyacc ; do
-      patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
-    done
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # Patch libgmp linking
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
-    install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
-  '';
-
-  doCheck = true;
-
-  installTargets = [ "install-no-docs" ];
-
-  postInstall = ''
-    # Fix path to mlton libraries.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
-
-    # Path to libgmp.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'"
-
-    # Path to gmp.h.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'"
-
-    # Path to the same cc used in the build; needed at runtime.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'"
-
-    # Copy files to final positions.
-    cp -r $(pwd)/install/${usr_prefix}/bin $out
-    cp -r $(pwd)/install/${usr_prefix}/lib $out
-    cp -r $(pwd)/install/${usr_prefix}/man $out
-  '';
-
-  meta = {
-    description = "Open-source, whole-program, optimizing Standard ML compiler";
-    longDescription = ''
-      MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
-      MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming
-      by eliminating performance penalties often associated with the use of high-level language features.
-      MLton development began in 1997, and continues to this day with a growing worldwide community of
-      developers and users, who have helped to port MLton to a number of platforms.
-      Description taken from http://en.wikipedia.org/wiki/Mlton .
-    '';
-
-    homepage = http://mlton.org/;
-    license = "bsd";
-    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
+{ stdenv, fetchurl, fetchFromGitHub, patchelf, gmp }:
+rec {
+  mlton20130715 = import ./20130715.nix {
+    inherit stdenv fetchurl patchelf gmp;
   };
 }
diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix
new file mode 100644
index 000000000000..c4dc9c430bc2
--- /dev/null
+++ b/pkgs/development/compilers/mlton/meta.nix
@@ -0,0 +1,15 @@
+{
+  description = "Open-source, whole-program, optimizing Standard ML compiler";
+  longDescription = ''
+    MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
+    MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming
+    by eliminating performance penalties often associated with the use of high-level language features.
+    MLton development began in 1997, and continues to this day with a growing worldwide community of
+    developers and users, who have helped to port MLton to a number of platforms.
+    Description taken from http://en.wikipedia.org/wiki/Mlton .
+  '';
+
+  homepage = http://mlton.org/;
+  license = "bsd";
+  platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0c7db35e4a9..b998cbedec77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7162,7 +7162,10 @@ with pkgs;
 
   mkcl = callPackage ../development/compilers/mkcl {};
 
-  mlton = callPackage ../development/compilers/mlton { };
+  inherit (callPackage ../development/compilers/mlton {})
+    mlton20130715;
+
+  mlton = mlton20130715;
 
   mono  = mono5;
   mono5 = mono58;

From 30da2b565917622f52108bcb93bf759700e6a144 Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Fri, 12 Oct 2018 00:21:49 -0400
Subject: [PATCH 2794/3253] mlton: adds binary release package for mlton
 version 20180207

This works the same as the binary package in the old derivation, by
patching the release binary. The difference is that this derivation
is also exposed at the top level.
---
 .../compilers/mlton/20180207-binary.nix       | 57 +++++++++++++++++++
 pkgs/development/compilers/mlton/default.nix  |  4 ++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/mlton/20180207-binary.nix

diff --git a/pkgs/development/compilers/mlton/20180207-binary.nix b/pkgs/development/compilers/mlton/20180207-binary.nix
new file mode 100644
index 000000000000..0589733cb3c6
--- /dev/null
+++ b/pkgs/development/compilers/mlton/20180207-binary.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, patchelf, gmp }:
+let
+  dynamic-linker = stdenv.cc.bintools.dynamicLinker;
+in
+stdenv.mkDerivation rec {
+  name = "mlton-${version}";
+  version = "20180207";
+
+  src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
+    sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
+    })
+  else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
+    url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
+      sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
+    })
+  else
+    throw "Architecture not supported";
+
+  buildInputs = [ gmp ];
+  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+
+  buildPhase = ''
+    make update \
+      CC="$(type -p cc)" \
+      WITH_GMP_INC_DIR="${gmp.dev}/include" \
+      WITH_GMP_LIB_DIR="${gmp}/lib"
+  '';
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+    patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
+    patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
+
+    for e in mllex mlnlffigen mlprof mlyacc; do
+      patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
+      patchelf --set-rpath ${gmp}/lib $out/bin/$e
+    done
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change \
+      /opt/local/lib/libgmp.10.dylib \
+      ${gmp}/lib/libgmp.10.dylib \
+      $out/lib/mlton/mlton-compile
+
+    for e in mllex mlnlffigen mlprof mlyacc; do
+      install_name_tool -change \
+        /opt/local/lib/libgmp.10.dylib \
+        ${gmp}/lib/libgmp.10.dylib \
+        $out/bin/$e
+    done
+  '';
+
+  meta = import ./meta.nix;
+}
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 7139a8a073de..a0662cd18a31 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -3,4 +3,8 @@ rec {
   mlton20130715 = import ./20130715.nix {
     inherit stdenv fetchurl patchelf gmp;
   };
+
+  mlton20180207Binary = import ./20180207-binary.nix {
+    inherit stdenv fetchurl patchelf gmp;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b998cbedec77..539b84abd4e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7163,7 +7163,8 @@ with pkgs;
   mkcl = callPackage ../development/compilers/mkcl {};
 
   inherit (callPackage ../development/compilers/mlton {})
-    mlton20130715;
+    mlton20130715
+    mlton20180207Binary;
 
   mlton = mlton20130715;
 

From a130228fe87c06a75f2f19343caea6905f611388 Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Fri, 12 Oct 2018 00:30:48 -0400
Subject: [PATCH 2795/3253] mlton: adds mlton version 20180207

---
 pkgs/development/compilers/mlton/default.nix  | 10 +++++-
 .../compilers/mlton/from-git-source.nix       | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/mlton/from-git-source.nix

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index a0662cd18a31..b32a817e20ac 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, patchelf, gmp }:
+{ stdenv, fetchurl, fetchgit, patchelf, gmp }:
 rec {
   mlton20130715 = import ./20130715.nix {
     inherit stdenv fetchurl patchelf gmp;
@@ -7,4 +7,12 @@ rec {
   mlton20180207Binary = import ./20180207-binary.nix {
     inherit stdenv fetchurl patchelf gmp;
   };
+
+  mlton20180207 = import ./from-git-source.nix {
+    mltonBootstrap = mlton20180207Binary;
+    version = "20180207";
+    rev = "on-20180207-release";
+    sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
+    inherit stdenv fetchgit gmp;
+  };
 }
diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
new file mode 100644
index 000000000000..6678335b4b9c
--- /dev/null
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -0,0 +1,33 @@
+{ fetchgit
+, gmp
+, mltonBootstrap
+, url ? "https://github.com/mlton/mlton"
+, rev
+, sha256
+, stdenv
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "mlton-${version}";
+
+  src = fetchgit {
+    inherit url rev sha256;
+  };
+
+  buildInputs = [mltonBootstrap gmp];
+
+  preBuild = ''
+    makeFlagsArray=(
+      MLTON_VERSION="${version} ${rev}"
+      CC="$(type -p cc)"
+      PREFIX="$out"
+      WITH_GMP_INC_DIR="${gmp.dev}/include"
+      WITH_GMP_LIB_DIR="${gmp}/lib"
+      )
+  '';
+
+  doCheck = true;
+
+  meta = import ./meta.nix;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 539b84abd4e0..a221c194a246 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7164,7 +7164,8 @@ with pkgs;
 
   inherit (callPackage ../development/compilers/mlton {})
     mlton20130715
-    mlton20180207Binary;
+    mlton20180207Binary
+    mlton20180207;
 
   mlton = mlton20130715;
 

From fd9a07c7d4dc1679805e2699bdea8ade3c0ed1d9 Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Fri, 12 Oct 2018 00:36:07 -0400
Subject: [PATCH 2796/3253] mlton: add one-liner from old derivation to fix
 source files

Updates from-git-source.nix to use the one-liner to fix up the bash
shebang lines.
---
 pkgs/development/compilers/mlton/from-git-source.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix
index 6678335b4b9c..3a3538a7ea42 100644
--- a/pkgs/development/compilers/mlton/from-git-source.nix
+++ b/pkgs/development/compilers/mlton/from-git-source.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
   buildInputs = [mltonBootstrap gmp];
 
   preBuild = ''
+    find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
+
     makeFlagsArray=(
       MLTON_VERSION="${version} ${rev}"
       CC="$(type -p cc)"

From bb7ed2cd8119583a8ed2f5ef0b8b71f26bd436ce Mon Sep 17 00:00:00 2001
From: Sophia Donataccio <srdqty@gmail.com>
Date: Fri, 12 Oct 2018 00:47:54 -0400
Subject: [PATCH 2797/3253] mlton: refactor and adds mlton20180207Binary
 mlton20180207 mltonHEAD

This commit adds mltonHEAD.

Summary of all the changes in this branch:

* mlton20130715
  - for this one I just copy and pasted the old default.nix
  - I have tested some projects that compile with this version and don't
    compile with the newer version, so I think it makes sense to keep
    the old version

* mlton20180207Binary
  - This is used to build the source derivations

* mlton20180207
  - latest release

* mltonHEAD
  - latest commit to the master branch of the github repo at the time of
    creating this derivation
---
 pkgs/development/compilers/mlton/default.nix | 8 ++++++++
 pkgs/top-level/all-packages.nix              | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index b32a817e20ac..aaf588851402 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -15,4 +15,12 @@ rec {
     sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
     inherit stdenv fetchgit gmp;
   };
+
+  mltonHEAD = import ./from-git-source.nix {
+    mltonBootstrap = mlton20180207Binary;
+    version = "HEAD";
+    rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde";
+    sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d";
+    inherit stdenv fetchgit gmp;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a221c194a246..011a42c32552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7165,9 +7165,10 @@ with pkgs;
   inherit (callPackage ../development/compilers/mlton {})
     mlton20130715
     mlton20180207Binary
-    mlton20180207;
+    mlton20180207
+    mltonHEAD;
 
-  mlton = mlton20130715;
+  mlton = mlton20180207;
 
   mono  = mono5;
   mono5 = mono58;

From 6ab21f44861f65404f18beea039cf24acc79585f Mon Sep 17 00:00:00 2001
From: Michael Francis <edude03@gmail.com>
Date: Fri, 12 Oct 2018 14:16:58 +0800
Subject: [PATCH 2798/3253] cfssl: allow building on all platforms (#48093)

---
 pkgs/tools/security/cfssl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index 2391ea1b859b..750539b3ace8 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -27,8 +27,8 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = https://cfssl.org/;
     description = "Cloudflare's PKI and TLS toolkit";
-    platforms = platforms.linux;
     license = licenses.bsd2;
     maintainers = with maintainers; [ mbrgm ];
+    platforms = platforms.all;
   };
 }

From c0af13f1c87fad7cd99f4f27903c73fb5a7b32e2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 9 Oct 2018 20:42:29 -0400
Subject: [PATCH 2799/3253] python: update documentation

This touches up a handful of places in the python documentation to try to make
the current best-practices more obvious. In particular, I often find the
function signatures (what to pass, what not to pass) confusing and have added
them to the docs.

Also updated the metas to be more consistent with the most frequently used
modern style.
---
 doc/languages-frameworks/python.section.md    | 48 ++++++++++---------
 .../python-modules/toolz/default.nix          |  8 ++--
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 5eabb866654e..dda9e1077da7 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -186,7 +186,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
 `toolz` package.
 
 ```nix
-{ # ...
+{ lib, buildPythonPackage, fetchPypi }:
 
   toolz = buildPythonPackage rec {
     pname = "toolz";
@@ -199,8 +199,8 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
 
     doCheck = false;
 
-    meta = {
-      homepage = "https://github.com/pytoolz/toolz/";
+    meta = with lib; {
+      homepage = https://github.com/pytoolz/toolz;
       description = "List processing tools and functional utilities";
       license = licenses.bsd3;
       maintainers = with maintainers; [ fridh ];
@@ -267,12 +267,13 @@ that we introduced with the `let` expression.
 
 #### Handling dependencies
 
-Our example, `toolz`, does not have any dependencies on other Python
-packages or system libraries. According to the manual,  `buildPythonPackage`
-uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
-exclusively a build-time dependency, then the dependency should be included as a
-`buildInput`, but if it is (also) a runtime dependency, then it should be added
-to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
+Our example, `toolz`, does not have any dependencies on other Python packages or
+system libraries. According to the manual, `buildPythonPackage` uses the
+arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If
+something is exclusively a build-time dependency, then the dependency should be
+included as a `buildInput`, but if it is (also) a runtime dependency, then it
+should be added to `propagatedBuildInputs`. Test dependencies are considered
+build-time dependencies and passed to `checkInputs`.
 
 The following example shows which arguments are given to `buildPythonPackage` in
 order to build [`datashape`](https://github.com/blaze/datashape).
@@ -292,7 +293,7 @@ order to build [`datashape`](https://github.com/blaze/datashape).
     checkInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
 
-    meta = {
+    meta = with lib; {
       homepage = https://github.com/ContinuumIO/datashape;
       description = "A data description language";
       license = licenses.bsd2;
@@ -326,7 +327,7 @@ when building the bindings and are therefore added as `buildInputs`.
 
     buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
 
-    meta = {
+    meta = with lib; {
       description = "Pythonic binding for the libxml2 and libxslt libraries";
       homepage = https://lxml.de;
       license = licenses.bsd3;
@@ -370,9 +371,9 @@ and `CFLAGS`.
       export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
     '';
 
-    meta = {
+    meta = with lib; {
       description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
-      homepage = http://hgomersall.github.com/pyFFTW/;
+      homepage = http://hgomersall.github.com/pyFFTW;
       license = with licenses; [ bsd2 bsd3 ];
       maintainers = with maintainers; [ fridh ];
     };
@@ -478,8 +479,6 @@ don't explicitly define which `python` derivation should be used. In the above
 example we use `buildPythonPackage` that is part of the set `python35Packages`,
 and in this case the `python35` interpreter is automatically used.
 
-
-
 ## Reference
 
 ### Interpreters
@@ -549,31 +548,31 @@ The `buildPythonPackage` function is implemented in
 
 The following is an example:
 ```nix
+{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:
 
 buildPythonPackage rec {
-  version = "3.3.1";
   pname = "pytest";
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
+  version = "3.3.1";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
   };
 
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
   checkInputs = [ hypothesis ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
     description = "Framework for writing tests";
   };
 }
-
 ```
 
 The `buildPythonPackage` mainly does four things:
@@ -655,6 +654,9 @@ Another difference is that `buildPythonPackage` by default prefixes the names of
 the packages with the version of the interpreter. Because this is irrelevant for
 applications, the prefix is omitted.
 
+When packaging a python application with `buildPythonApplication`, it should be
+invoked with `callPackage` and passed `python` or `pythonPackages`.
+
 #### `toPythonApplication` function
 
 A distinction is made between applications and libraries, however, sometimes a
diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index 0fea8f1ab751..974e3a43bc7c 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -21,10 +21,10 @@ buildPythonPackage rec{
     nosetests toolz/tests
   '';
 
-  meta = {
-    homepage = https://github.com/pytoolz/toolz/;
+  meta = with lib; {
+    homepage = https://github.com/pytoolz/toolz;
     description = "List processing tools and functional utilities";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ fridh ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
   };
 }

From 1bcdf27c48cb730294136a5399a92d40cd3efef1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 11 Oct 2018 20:18:33 +0000
Subject: [PATCH 2800/3253] Update with code review feedback; add example
 python application

---
 doc/languages-frameworks/python.section.md | 34 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index dda9e1077da7..b52b79c62d91 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -559,7 +559,7 @@ buildPythonPackage rec {
     sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
   };
 
-  preCheck = ''
+  postPatch = ''
     # don't test bash builtins
     rm testing/test_argcomplete.py
   '';
@@ -655,7 +655,37 @@ the packages with the version of the interpreter. Because this is irrelevant for
 applications, the prefix is omitted.
 
 When packaging a python application with `buildPythonApplication`, it should be
-invoked with `callPackage` and passed `python` or `pythonPackages`.
+called with `callPackage` and passed `python` or `pythonPackages` (possibly
+specifying an interpreter version), like this:
+
+```nix
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "luigi";
+  version = "2.7.9";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
+
+  meta = with lib; {
+    ...
+  };
+}
+```
+
+This is then added to `all-packages.nix` just as any other application would be.
+
+```nix
+luigi = callPackage ../applications/networking/cluster/luigi { };
+```
+
+Since the package is an application, a consumer doesn't need to care about
+python versions or modules, which is why they don't go in `pythonPackages`.
 
 #### `toPythonApplication` function
 

From e5ee89f7583319672632866364ff4c1ed875e4a2 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Fri, 12 Oct 2018 10:24:56 +0200
Subject: [PATCH 2801/3253] minikube: bump version 0.29.0 -> 0.30.0

This is a fix release for CVE-2018-1002103. More details in
https://github.com/kubernetes/minikube/issues/3208
---
 pkgs/applications/networking/cluster/minikube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c68fb48fa1a4..c44b7ac1dc76 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -14,7 +14,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.29.0";
+  version = "0.30.0";
 
   kubernetesVersion = "1.11.2";
 
@@ -24,7 +24,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "09px8pxml7xrnfhyjvlhf1hw7zdj9sw47a0fv5wj5aard54lhs1l";
+    sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z";
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;

From b3dff39105beb0190d9a576afba95cd2a6903540 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 09:24:00 +0000
Subject: [PATCH 2802/3253] bootStage1: fix cross build (@matthewbauer's
 solution)

---
 nixos/modules/system/boot/stage-1.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 8688b5ad9bfb..f4cf9753c0a1 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -252,9 +252,8 @@ let
       echo checking syntax
       # check both with bash
       ${pkgs.buildPackages.bash}/bin/sh -n $target
-    '' + optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
       # and with ash shell, just in case
-      ${extraUtils}/bin/ash -n $target
+      ${pkgs.buildPackages.busybox}/bin/ash -n $target
     '';
 
     inherit udevRules extraUtils modulesClosure;

From 432c44f6f0f48978f891747b4a62f583f4cf3ae2 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 10:02:34 +0000
Subject: [PATCH 2803/3253] coreutils-full: fix cross build (@matthewbauer's
 version)

---
 pkgs/tools/misc/coreutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index de971cc51ac4..fe8d1a8380fc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) ''
     rm $out/share/man/man1/*
-    cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1
+    cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1
   ''
   # du: 8.7 M locale + 0.4 M man pages
   + optionalString minimal ''

From a08feadbe1b646ff71ca86f1b8398af61a8755b2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 11 Oct 2018 07:58:10 +0200
Subject: [PATCH 2804/3253] i2p: 0.9.35 -> 0.9.37

also update tanuki's java-service-wrapper 3.5.32 -> 3.5.35
---
 pkgs/tools/networking/i2p/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 55abeb4f583d..101f2a635a4b 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -2,10 +2,10 @@
 
 let wrapper = stdenv.mkDerivation rec {
   name = "wrapper-${version}";
-  version = "3.5.32";
+  version = "3.5.35";
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1";
+    sha256 = "0mjyw9ays9v6lnj21pmfd3qdvd9b6rwxfmw3pg6z0kyf2jadixw2";
   };
   buildInputs = [ jdk ];
   buildPhase = ''
@@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec {
 in
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.35";
+  name = "i2p-0.9.37";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g";
+    sha256 = "1lmqdqavy471s187y0lhckznlxx6id6h0dlwlyif2vr8c0pwv2q9";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];

From 4b7de150a83128f28031c30ab865b69cd5373612 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 13:10:10 -0500
Subject: [PATCH 2805/3253] chromium/update.sh: don't use remote builders, lots
 of copying for work

---
 pkgs/applications/networking/browsers/chromium/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index df53068713de..ea67a62c107a 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 cd "$(dirname "$0")"
-sp="$(nix-build -Q --no-out-link update.nix -A update)"
+sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)"
 cat "$sp" > upstream-info.nix

From ce6db5e36e1d01576d042b219b5208508696dab3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 13:04:29 -0500
Subject: [PATCH 2806/3253] chromium: update to 69.0.3497.100 (and others), ran
 update.sh

---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index ebf730129079..a26c8b8ddded 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
-    sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs";
-    version = "69.0.3497.81";
+    sha256 = "16biicw86mnjrmjazfbml2pf4rykhbvsz854cyfnpjhcvmlh24jp";
+    sha256bin64 = "07jr1sqsxfdy3rymylkbpbgi79j9b2pax4igdzj943d0nbka84y5";
+    version = "70.0.3538.35";
   };
   dev = {
-    sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1";
-    sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj";
-    version = "70.0.3538.9";
+    sha256 = "0fmkhvvydinv5f543n7rrmsv99rf0skwwhlpmszvspx6y4wz9smv";
+    sha256bin64 = "0plr8ph78kfg2dpyacjy3aw3msfif95fqpb8xx0n8whkkpbl9968";
+    version = "71.0.3559.6";
   };
   stable = {
-    sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
-    sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7";
-    version = "69.0.3497.81";
+    sha256 = "0dcyzsb70ssx5hd2b25ab3ydpqh7crhxab9zzi5gn99ywxh1afg3";
+    sha256bin64 = "0w56k7hmdi9knjaw67kdmyz0fdkjmk2ldh2n4l1c6szkr66vq30q";
+    version = "69.0.3497.100";
   };
 }

From ee561d9f57d28d15925ae3407c6ae82065369bfe Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 11 Oct 2018 08:20:08 +0200
Subject: [PATCH 2807/3253] linuxPackages.systemtap: 3.2 (2017.10.18) -> 3.3

removed quoting workaround. should be fixed as of https://sourceware.org/PR22462
---
 .../tools/profiling/systemtap/default.nix          | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
index 55902f48bb73..ecc86d51a06e 100644
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ b/pkgs/development/tools/profiling/systemtap/default.nix
@@ -5,9 +5,9 @@
 let
   ## fetchgit info
   url = git://sourceware.org/git/systemtap.git;
-  rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892";
-  sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq";
-  version = "2017.10.18";
+  rev = "release-${version}";
+  sha256 = "0hckbmrlcz5nj438409fmdjjaaqzf68r2242v10lkssw5daia1gj";
+  version = "3.3";
 
   inherit (kernel) stdenv;
   inherit (stdenv) lib;
@@ -18,12 +18,6 @@ let
     src = fetchgit { inherit url rev sha256; };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
-    # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
-    postPatch = ''
-      substituteInPlace buildrun.cxx --replace \
-        'o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;' \
-        'o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;'
-    '';
     enableParallelBuilding = true;
   };
 
@@ -53,7 +47,7 @@ in runCommand "systemtap-${kernel.version}-${version}" {
   };
 } ''
   mkdir -p $out/bin
-  for bin in $stapBuild/bin/*; do # hello emacs */
+  for bin in $stapBuild/bin/*; do
     ln -s $bin $out/bin
   done
   rm $out/bin/stap $out/bin/dtrace

From b8e1e564101486af8b1cd74bef8f1266e3b0a85f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 11:02:37 +0000
Subject: [PATCH 2808/3253] dos2unix: fix cross build

---
 pkgs/tools/text/dos2unix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index 2db82c36a72a..dd0d1bbc9410 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     --replace /usr $out
     '';
 
-  buildInputs = [ perl gettext ];
+  nativeBuildInputs = [ perl gettext ];
 
   meta = with stdenv.lib; {
     homepage = http://waterlan.home.xs4all.nl/dos2unix.html;

From 1aa94ba52d9ad22a6e2cfd8ede4405e65d9e0010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 12 Oct 2018 08:06:54 -0300
Subject: [PATCH 2809/3253] go-gir-generator: fix instalation directory for
 source

---
 pkgs/desktops/deepin/go-gir-generator/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index cc05f6f055b0..d5ec29f1ef8b 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -22,9 +22,13 @@ stdenv.mkDerivation rec {
     libgudev
   ];
 
+  postPatch = ''
+    sed -i -e 's:/share/gocode:/share/go:' Makefile
+  '';
+
   makeFlags = [
     "PREFIX=$(out)"
-    "HOME=$(TMP)"
+    "GOCACHE=off"
   ];
 
   meta = with stdenv.lib; {

From 4c04969ef5daf70f39e22d49fbe16007827d66d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 12 Oct 2018 08:07:58 -0300
Subject: [PATCH 2810/3253] dde-api: init at 3.1.30

---
 pkgs/desktops/deepin/dde-api/default.nix |  60 +++++++++++
 pkgs/desktops/deepin/dde-api/deps.nix    | 129 +++++++++++++++++++++++
 pkgs/desktops/deepin/default.nix         |   1 +
 3 files changed, 190 insertions(+)
 create mode 100644 pkgs/desktops/deepin/dde-api/default.nix
 create mode 100644 pkgs/desktops/deepin/dde-api/deps.nix

diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
new file mode 100644
index 000000000000..d8452e5f7a38
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
+go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib,
+libcanberra, gnome3, deepin-gettext-tools, go }:
+
+buildGoPackage rec {
+  name = "${pname}-${version}";
+  pname = "dde-api";
+  version = "3.1.30";
+
+  goPackagePath = "pkg.deepin.io/dde/api";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir";
+  };
+
+  goDeps = ./deps.nix;
+
+  nativeBuildInputs = [
+    pkgconfig
+    go-gir-generator
+    deepin-gettext-tools
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    poppler
+    librsvg
+    pulseaudio
+    alsaLib
+    libcanberra
+    gnome3.libgudev
+  ];
+
+  postPatch = ''
+    sed -i -e "s|/var|$bin/var|" Makefile
+  '';
+
+  buildPhase = ''
+    make -C go/src/${goPackagePath}
+  '';
+
+  installPhase = ''
+    make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath}
+    mkdir -p $out/share
+    mv $bin/share/gocode $out/share/go
+    remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/*
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Go-lang bindings for dde-daemon";
+    homepage = https://github.com/linuxdeepin/dde-api;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix
new file mode 100644
index 000000000000..9df368325e3c
--- /dev/null
+++ b/pkgs/desktops/deepin/dde-api/deps.nix
@@ -0,0 +1,129 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/cryptix/wav";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cryptix/wav";
+      rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
+      sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
+    };
+  }
+  {
+    goPackagePath = "github.com/disintegration/imaging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/disintegration/imaging";
+      rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2";
+      sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/linuxdeepin/go-dbus-factory";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linuxdeepin/go-dbus-factory";
+      rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa";
+      sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w";
+    };
+  }
+  {
+    goPackagePath = "github.com/linuxdeepin/go-x11-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linuxdeepin/go-x11-client";
+      rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3";
+      sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d";
+    };
+  }
+  {
+    goPackagePath = "github.com/nfnt/resize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nfnt/resize";
+      rev = "83c6a9932646f83e3267f353373d47347b6036b2";
+      sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "991ec62608f3c0da01d400756917825d1e2fd528";
+      sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87";
+      sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "788fd78401277ebd861206a03c884797c6ec5541";
+      sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+    };
+  }
+  {
+    goPackagePath = "pkg.deepin.io/lib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/linuxdeepin/go-lib.git";
+      rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9";
+      sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4";
+    };
+  }
+]
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index f85d51b2072d..1ef7177e94d4 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -4,6 +4,7 @@ let
   packages = self: with self; {
 
     dbus-factory = callPackage ./dbus-factory { };
+    dde-api = callPackage ./dde-api { };
     dde-calendar = callPackage ./dde-calendar { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };

From 7a65f2c43dc3580ad8bee54fb939b7015af93d36 Mon Sep 17 00:00:00 2001
From: edude03 <edude03@gmail.com>
Date: Tue, 9 Oct 2018 15:00:39 +0800
Subject: [PATCH 2811/3253] envdir: init at 1.0.0

---
 pkgs/tools/misc/envdir-go/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/envdir-go/default.nix

diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix
new file mode 100644
index 000000000000..ea08608da01c
--- /dev/null
+++ b/pkgs/tools/misc/envdir-go/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  version = "1.0.0";
+  name = "envdir-${version}";
+
+  goPackagePath = "github.com/d10n/envdir";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "d10n";
+    repo = "envdir";
+    sha256 = "1wdlblj127skgynf9amk7waabc3abbyxys9dvyc6c72zpcpdy5nc";
+  };
+
+  preBuild = ''
+   # TODO: is there a way to get the commit ref so we can set main.buildCommit?
+		buildFlagsArray+=("-ldflags" "-X main.buildDate=1970-01-01T00:00:00+0000 -X main.buildVersion=${version}")
+'';
+
+  meta = {
+    description = "A go rewrite of envdir";
+    homepage = https://github.com/d10n/envdir;
+    maintainers = with stdenv.lib.maintainers; [ edude03 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3e54fa8d76d..b4c8612c53fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15075,6 +15075,8 @@ with pkgs;
 
   envypn-font = callPackage ../data/fonts/envypn-font { };
 
+  envdir = callPackage ../tools/misc/envdir-go { };
+
   fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
 
   fira = callPackage ../data/fonts/fira { };

From d74ea280d1cdd630642da22230b4eb9391392e03 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 8 Oct 2018 00:54:00 +0200
Subject: [PATCH 2812/3253] uhub: fix build for aarch64

related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770175
related: https://github.com/janvidar/uhub/issues/46
---
 pkgs/servers/uhub/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index 456f73dc52ed..52866784faa9 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
 , tlsSupport ? false }:
 
 assert tlsSupport -> openssl != null;
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./plugin-dir.patch
+    # fix aarch64 build: https://github.com/janvidar/uhub/issues/46
+    (fetchpatch {
+      url = "https://github.com/janvidar/uhub/pull/47.patch";
+      sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq";
+    })
 
     # Fixed compilation on systemd > 210
-    (fetchurl {
+    (fetchpatch {
       url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff";
       sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp";
     })

From d4f88f1d0c8b3d80f2b1b9a15a6cb91786be8076 Mon Sep 17 00:00:00 2001
From: Shreyansh Khajanchi <shreyansh_k@live.com>
Date: Fri, 12 Oct 2018 17:39:58 +0530
Subject: [PATCH 2813/3253] hugo: apply upstream patch to call rst2html
 directly on Nix

Initially, rst2html was called via the python interpreter which would
fail if the script was wrapped in a launcher as on NixOS.
---
 pkgs/applications/misc/hugo/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index a6a489492e31..c353a779b646 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
 
 buildGoPackage rec {
   name = "hugo-${version}";
@@ -13,6 +13,13 @@ buildGoPackage rec {
     sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/gohugoio/hugo/commit/b137ad4dbd6d14d0a9af68c044aaee61f2c87fe5.diff";
+      sha256 = "0w1gpg11idqywqcpwzvx4xabn02kk8y4jmyz4h67mc3yh2dhq3ll";
+    })
+  ];
+
   goDeps = ./deps.nix;
 
   buildFlags = "-tags extended";

From d26c303bef670e33d7211b6c053fdb04983c7692 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 21 Jul 2018 00:04:19 +0200
Subject: [PATCH 2814/3253] futhark: init at 0.6.2

---
 .../development/compilers/futhark/default.nix | 24 ++++++++
 .../compilers/futhark/unwrapped.nix           | 55 +++++++++++++++++++
 .../haskell-modules/configuration-common.nix  |  2 +
 3 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/compilers/futhark/default.nix
 create mode 100644 pkgs/development/compilers/futhark/unwrapped.nix

diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix
new file mode 100644
index 000000000000..6cabd686b497
--- /dev/null
+++ b/pkgs/development/compilers/futhark/default.nix
@@ -0,0 +1,24 @@
+{ callPackage, symlinkJoin, makeWrapper, stdenv, gcc, opencl-headers, opencl-icd }:
+
+let
+  unwrapped = callPackage ./unwrapped.nix {};
+
+  path = stdenv.lib.makeBinPath [ gcc ];
+
+  wrapped = symlinkJoin {
+    name = "futhark-wrapped";
+    buildInputs = [ makeWrapper ];
+    paths = [ unwrapped ];
+    postBuild = ''
+      wrapProgram $out/bin/futhark-c \
+        --prefix PATH : "${path}"
+
+      wrapProgram $out/bin/futhark-opencl \
+        --prefix PATH : "${path}" \
+        --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
+        --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
+        --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
+    '';
+  };
+
+in wrapped
diff --git a/pkgs/development/compilers/futhark/unwrapped.nix b/pkgs/development/compilers/futhark/unwrapped.nix
new file mode 100644
index 000000000000..890be3431c3a
--- /dev/null
+++ b/pkgs/development/compilers/futhark/unwrapped.nix
@@ -0,0 +1,55 @@
+# Generated using `cabal2nix --hpack .`, then replace src
+{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html
+, bytestring, containers, data-binary-ieee754, directory
+, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy
+, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty
+, markdown, mtl, neat-interpolation, parallel, parsec, process
+, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa
+, srcloc, stdenv, template-haskell, temporary, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
+, th-lift-instances, transformers, vector, vector-binary-instances
+, zlib, fetchFromGitHub
+}:
+mkDerivation {
+  pname = "futhark";
+  version = "0.6.2";
+  src = fetchFromGitHub {
+    owner = "diku-dk";
+    repo = "futhark";
+    rev = "v0.6.2";
+    sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2";
+  };
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev language-c-quote mainland-pretty markdown mtl
+    neat-interpolation parallel parsec process raw-strings-qq
+    regex-tdfa srcloc template-haskell text th-lift-instances
+    transformers vector vector-binary-instances zlib
+  ];
+  libraryToolDepends = [ alex happy hpack ];
+  executableHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev haskeline json language-c-quote mainland-pretty
+    markdown mtl neat-interpolation parallel parsec process
+    process-extras random raw-strings-qq regex-tdfa srcloc
+    template-haskell temporary text th-lift-instances transformers
+    vector vector-binary-instances zlib
+  ];
+  testHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl
+    neat-interpolation parallel parsec process QuickCheck
+    raw-strings-qq regex-tdfa srcloc template-haskell test-framework
+    test-framework-hunit test-framework-quickcheck2 text
+    th-lift-instances transformers vector vector-binary-instances zlib
+  ];
+  preConfigure = "hpack";
+  homepage = "https://futhark-lang.org";
+  description = "An optimising compiler for a functional, array-oriented language";
+  license = stdenv.lib.licenses.isc;
+}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8ff6aed506f2..447e9cb42272 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -707,6 +707,8 @@ self: super: {
   # vaultenv is not available from Hackage.
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
+  futhark = self.callPackage ../compilers/futhark { };
+
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {

From 0c25079958ac46f7438d2a90e837acf7c69a2ab9 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 20 Aug 2018 22:14:32 +0200
Subject: [PATCH 2815/3253] futhark: introduce the top-level futhark attribute

The fact that futhark is a Haskell package is an implementation detail. To
install it users should just have to specify `futhark` instead of
`haskellPackages.futhark`.

Additionally futhark is overridden with `haskell.lib.justStaticExecutables` to
reduce closure size.
---
 .../development/compilers/futhark/default.nix | 77 +++++++++++++------
 .../compilers/futhark/unwrapped.nix           | 55 -------------
 .../haskell-modules/configuration-common.nix  |  1 +
 .../haskell-modules/configuration-nix.nix     | 15 ++++
 pkgs/tools/audio/mpdsync/default.nix          | 24 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 96 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/development/compilers/futhark/unwrapped.nix
 create mode 100644 pkgs/tools/audio/mpdsync/default.nix

diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix
index 6cabd686b497..890be3431c3a 100644
--- a/pkgs/development/compilers/futhark/default.nix
+++ b/pkgs/development/compilers/futhark/default.nix
@@ -1,24 +1,55 @@
-{ callPackage, symlinkJoin, makeWrapper, stdenv, gcc, opencl-headers, opencl-icd }:
-
-let
-  unwrapped = callPackage ./unwrapped.nix {};
-
-  path = stdenv.lib.makeBinPath [ gcc ];
-
-  wrapped = symlinkJoin {
-    name = "futhark-wrapped";
-    buildInputs = [ makeWrapper ];
-    paths = [ unwrapped ];
-    postBuild = ''
-      wrapProgram $out/bin/futhark-c \
-        --prefix PATH : "${path}"
-
-      wrapProgram $out/bin/futhark-opencl \
-        --prefix PATH : "${path}" \
-        --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
-        --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
-        --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
-    '';
+# Generated using `cabal2nix --hpack .`, then replace src
+{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html
+, bytestring, containers, data-binary-ieee754, directory
+, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy
+, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty
+, markdown, mtl, neat-interpolation, parallel, parsec, process
+, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa
+, srcloc, stdenv, template-haskell, temporary, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
+, th-lift-instances, transformers, vector, vector-binary-instances
+, zlib, fetchFromGitHub
+}:
+mkDerivation {
+  pname = "futhark";
+  version = "0.6.2";
+  src = fetchFromGitHub {
+    owner = "diku-dk";
+    repo = "futhark";
+    rev = "v0.6.2";
+    sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2";
   };
-
-in wrapped
+  isLibrary = true;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev language-c-quote mainland-pretty markdown mtl
+    neat-interpolation parallel parsec process raw-strings-qq
+    regex-tdfa srcloc template-haskell text th-lift-instances
+    transformers vector vector-binary-instances zlib
+  ];
+  libraryToolDepends = [ alex happy hpack ];
+  executableHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev haskeline json language-c-quote mainland-pretty
+    markdown mtl neat-interpolation parallel parsec process
+    process-extras random raw-strings-qq regex-tdfa srcloc
+    template-haskell temporary text th-lift-instances transformers
+    vector vector-binary-instances zlib
+  ];
+  testHaskellDepends = [
+    array base bifunctors binary blaze-html bytestring containers
+    data-binary-ieee754 directory directory-tree dlist extra file-embed
+    filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl
+    neat-interpolation parallel parsec process QuickCheck
+    raw-strings-qq regex-tdfa srcloc template-haskell test-framework
+    test-framework-hunit test-framework-quickcheck2 text
+    th-lift-instances transformers vector vector-binary-instances zlib
+  ];
+  preConfigure = "hpack";
+  homepage = "https://futhark-lang.org";
+  description = "An optimising compiler for a functional, array-oriented language";
+  license = stdenv.lib.licenses.isc;
+}
diff --git a/pkgs/development/compilers/futhark/unwrapped.nix b/pkgs/development/compilers/futhark/unwrapped.nix
deleted file mode 100644
index 890be3431c3a..000000000000
--- a/pkgs/development/compilers/futhark/unwrapped.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# Generated using `cabal2nix --hpack .`, then replace src
-{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html
-, bytestring, containers, data-binary-ieee754, directory
-, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy
-, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty
-, markdown, mtl, neat-interpolation, parallel, parsec, process
-, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa
-, srcloc, stdenv, template-haskell, temporary, test-framework
-, test-framework-hunit, test-framework-quickcheck2, text
-, th-lift-instances, transformers, vector, vector-binary-instances
-, zlib, fetchFromGitHub
-}:
-mkDerivation {
-  pname = "futhark";
-  version = "0.6.2";
-  src = fetchFromGitHub {
-    owner = "diku-dk";
-    repo = "futhark";
-    rev = "v0.6.2";
-    sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    array base bifunctors binary blaze-html bytestring containers
-    data-binary-ieee754 directory directory-tree dlist extra file-embed
-    filepath gitrev language-c-quote mainland-pretty markdown mtl
-    neat-interpolation parallel parsec process raw-strings-qq
-    regex-tdfa srcloc template-haskell text th-lift-instances
-    transformers vector vector-binary-instances zlib
-  ];
-  libraryToolDepends = [ alex happy hpack ];
-  executableHaskellDepends = [
-    array base bifunctors binary blaze-html bytestring containers
-    data-binary-ieee754 directory directory-tree dlist extra file-embed
-    filepath gitrev haskeline json language-c-quote mainland-pretty
-    markdown mtl neat-interpolation parallel parsec process
-    process-extras random raw-strings-qq regex-tdfa srcloc
-    template-haskell temporary text th-lift-instances transformers
-    vector vector-binary-instances zlib
-  ];
-  testHaskellDepends = [
-    array base bifunctors binary blaze-html bytestring containers
-    data-binary-ieee754 directory directory-tree dlist extra file-embed
-    filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl
-    neat-interpolation parallel parsec process QuickCheck
-    raw-strings-qq regex-tdfa srcloc template-haskell test-framework
-    test-framework-hunit test-framework-quickcheck2 text
-    th-lift-instances transformers vector vector-binary-instances zlib
-  ];
-  preConfigure = "hpack";
-  homepage = "https://futhark-lang.org";
-  description = "An optimising compiler for a functional, array-oriented language";
-  license = stdenv.lib.licenses.isc;
-}
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 447e9cb42272..46e104e34724 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -707,6 +707,7 @@ self: super: {
   # vaultenv is not available from Hackage.
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
+  # futhark is not available from Hackage.
   futhark = self.callPackage ../compilers/futhark { };
 
   # https://github.com/Philonous/hs-stun/pull/1
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bb9b0e5d5fe6..523f4ed0212c 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -528,4 +528,19 @@ self: super: builtins.intersectAttrs super {
 
   # The test-suite requires a running PostgreSQL server.
   Frames-beam = dontCheck super.Frames-beam;
+
+  futhark = with pkgs;
+    let path = stdenv.lib.makeBinPath [ gcc ];
+    in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: {
+      postInstall = ''
+        wrapProgram $out/bin/futhark-c \
+          --prefix PATH : "${path}"
+
+        wrapProgram $out/bin/futhark-opencl \
+          --prefix PATH : "${path}" \
+          --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
+          --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
+          --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
+      '';
+    });
 }
diff --git a/pkgs/tools/audio/mpdsync/default.nix b/pkgs/tools/audio/mpdsync/default.nix
new file mode 100644
index 000000000000..51f5ba656168
--- /dev/null
+++ b/pkgs/tools/audio/mpdsync/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, python2, fetchFromGitHub }:
+with python2.pkgs;
+stdenv.mkDerivation {
+  name = "mpdsync-2017-06-15";
+
+  src = fetchFromGitHub {
+    owner = "alphapapa";
+    repo = "mpdsync";
+    rev = "da90058f44dd9578cc5f2fb96a1fb2b26da40d07";
+    sha256 = "1mfg3ipqj5dvyyqbgp6ia6sc1ja5gmm2c9mfrwx0jw2dl182if6q";
+  };
+
+  pythonPath = [ mpd2 ];
+
+  nativeBuildInputs = [
+    wrapPython
+  ];
+
+  dontBuild = true;
+
+  installPhase = "install -D mpdsync.py $out/bin/mpdsync";
+  postFixup = "wrapPythonPrograms";
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31834b053a2..eb6e1505db9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1336,6 +1336,8 @@ with pkgs;
 
   fsmark = callPackage ../tools/misc/fsmark { };
 
+  futhark = haskell.lib.justStaticExecutables haskellPackages.futhark;
+
   fwup = callPackage ../tools/misc/fwup { };
 
   fzf = callPackage ../tools/misc/fzf { };

From 7b49b870cb2326b998e90818a22055fd6e52959d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 25 Aug 2018 15:24:41 +0200
Subject: [PATCH 2816/3253] haskell: have a dedicated file for non Hackage
 packages

We had a few "overrides" in configuration-common.nix that were really
extensions. They introduced packages that weren't in hackage-packages.nix.

The advantage of having a dedicated file for these packages is that we can still
place Nix-specific overrides to these packages in configuration-nix.nix. We
weren't able do this before because configuration-nix.nix extended only the
packages from hackage-packages.nix.
---
 .../haskell-modules/configuration-common.nix       |  9 ---------
 pkgs/development/haskell-modules/default.nix       |  5 ++++-
 .../haskell-modules/non-hackage-packages.nix       | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/non-hackage-packages.nix

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 46e104e34724..15bd1507cc93 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -704,12 +704,6 @@ self: super: {
     then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
     else super.gtk;
 
-  # vaultenv is not available from Hackage.
-  vaultenv = self.callPackage ../tools/haskell/vaultenv { };
-
-  # futhark is not available from Hackage.
-  futhark = self.callPackage ../compilers/futhark { };
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
@@ -950,9 +944,6 @@ self: super: {
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
 
-  # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
-  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
-
   # https://github.com/yesodweb/Shelly.hs/issues/162
   shelly = dontCheck super.shelly;
 
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index b8943a55394a..a4f0399cf3c6 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -4,6 +4,7 @@
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
 , initialPackages ? import ./initial-packages.nix
+, nonHackagePackages ? import ./non-hackage-packages.nix
 , configurationCommon ? import ./configuration-common.nix
 , configurationNix ? import ./configuration-nix.nix
 }:
@@ -26,7 +27,9 @@ let
       (extends packageSetConfig
         (extends compilerConfig
           (extends commonConfiguration
-            (extends nixConfiguration haskellPackages)))));
+            (extends nixConfiguration
+              (extends nonHackagePackages
+                haskellPackages))))));
 
 in
 
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
new file mode 100644
index 000000000000..642c6bff6b53
--- /dev/null
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -0,0 +1,14 @@
+# EXTRA HASKELL PACKAGES NOT ON HACKAGE
+#
+# This file should only contain packages that are not in ./hackage-packages.nix.
+# Attributes in this set should be nothing more than a callPackage call.
+# Overrides to these packages should go to either configuration-nix.nix,
+# configuration-common.nix or to one of the compiler specific configuration
+# files.
+self: super: {
+  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { };
+
+  vaultenv = self.callPackage ../tools/haskell/vaultenv { };
+
+  futhark = self.callPackage ../compilers/futhark { };
+}

From b64193f69bb1dbadb9ff44cefb990d48d2a5d198 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 25 Aug 2018 15:54:17 +0200
Subject: [PATCH 2817/3253] haskellPackages.multi-ghc-travis: removed in favour
 of haskell-ci

multi-ghc-travis has been renamed to haskell-ci which is now also on Hackage.
---
 pkgs/development/haskell-modules/non-hackage-packages.nix | 4 +++-
 pkgs/top-level/all-packages.nix                           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 642c6bff6b53..6b8477b524bf 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -6,7 +6,9 @@
 # configuration-common.nix or to one of the compiler specific configuration
 # files.
 self: super: {
-  multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { };
+
+  multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
+    + "to haskell-ci, which is now on hackage");
 
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb6e1505db9c..88fe95c4196e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8602,7 +8602,7 @@ with pkgs;
 
   msitools = callPackage ../development/tools/misc/msitools { };
 
-  multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis;
+  haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci;
 
   neoload = callPackage ../development/tools/neoload {
     licenseAccepted = (config.neoload.accept_license or false);

From 5ea9d9d097222cd0aa7ed9ff3ceaa9cd81a3e8cf Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 25 Aug 2018 15:54:30 +0200
Subject: [PATCH 2818/3253] haskell: add GitHub issues to
 non-hackage-packages.nix

---
 pkgs/development/haskell-modules/non-hackage-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 6b8477b524bf..68fcbdb79a5d 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -10,7 +10,9 @@ self: super: {
   multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
     + "to haskell-ci, which is now on hackage");
 
+  # https://github.com/channable/vaultenv/issues/1
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
+  # https://github.com/diku-dk/futhark/issues/614
   futhark = self.callPackage ../compilers/futhark { };
 }

From fbeeed1c5c81dec0823ca12691a6cd66d5c7599f Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 12:36:48 +0000
Subject: [PATCH 2819/3253] p7zip: fix cross-compilation

---
 pkgs/tools/archivers/p7zip/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 4886217211df..5430c2cb73e7 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
 
     # I think this is a typo and should be CXX? Either way let's kill it
     sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
+  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    substituteInPlace makefile.machine \
+      --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \
+      --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
   '';
 
   preConfigure = ''

From a4f4886ba30548e4920ade520c9a1a37d3897b69 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 12:48:59 +0000
Subject: [PATCH 2820/3253] ntp: fix cross-build

---
 pkgs/tools/networking/ntp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 8c4462c36bcf..de2fb1472aa9 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     "--with-openssl-libdir=${openssl.out}/lib"
     "--with-openssl-incdir=${openssl.dev}/include"
     "--enable-ignore-dns-errors"
+    "--with-yielding-select=yes"
   ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps"
     ++ stdenv.lib.optional withSeccomp "--enable-libseccomp";
 

From 0653da427ac4e75d2f5831e50b71bdb14769ef6c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 13:03:50 +0000
Subject: [PATCH 2821/3253] psmisc: fix cross-compiling

---
 pkgs/os-specific/linux/psmisc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 8b3906dedb1f..68e51afdf1bb 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake gettext ];
   buildInputs = [ ncurses ];
 
-  preConfigure = ''
+  preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    # Goes past the rpl_malloc linking failure
+    export ac_cv_func_malloc_0_nonnull=yes
+    export ac_cv_func_realloc_0_nonnull=yes
+  '' + ''
     echo $version > .tarball-version
     ./autogen.sh
   '';

From 4b17b8bba4507a322148bf901cfec387d5cd5e89 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 13:14:25 +0000
Subject: [PATCH 2822/3253] screen: fix cross-compiling

---
 pkgs/tools/misc/screen/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 1753f52ab1b6..fd641ea613d5 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     });
 
+  postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform)
+    # XXX: Awful hack to allow cross-compilation.
+    '' sed -i ./configure \
+           -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
+    ''; # "
+
   buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam
                             ++ stdenv.lib.optional stdenv.isDarwin utmp;
 

From d6273e5161b85a8eec197c07d48cb0136b10fb1a Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Fri, 12 Oct 2018 12:48:05 +0200
Subject: [PATCH 2823/3253] termbox: init at 1.1.2

---
 .../development/libraries/termbox/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/termbox/default.nix

diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
new file mode 100644
index 000000000000..0898289978a2
--- /dev/null
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, python3 }:
+
+stdenv.mkDerivation rec {
+  name = "termbox-${version}";
+  version = "1.1.2";
+  src = fetchFromGitHub {
+    owner = "nsf";
+    repo = "termbox";
+    rev = "v${version}";
+    sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs";
+  };
+  nativeBuildInputs = [ python3 ];
+  configurePhase = "python3 ./waf configure --prefix=$out";
+  buildPhase = "python3 ./waf build";
+  installPhase = "python3 ./waf install --destdir=$out";
+  meta = with stdenv.lib; {
+    description = "Library for writing text-based user interfaces";
+    license = licenses.mit;
+    homepage = "https://github.com/nsf/termbox#readme";
+    downloadPage = "https://github.com/nsf/termbox/releases";
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a0b0956d759..1fc675ffc044 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12283,6 +12283,8 @@ with pkgs;
 
   telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };
 
+  termbox = callPackage ../development/libraries/termbox { };
+
   tevent = callPackage ../development/libraries/tevent {
     python = python2;
   };

From 992b13bd72788860705317bf06447cc27f418754 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 07:23:00 -0700
Subject: [PATCH 2824/3253] wavebox: 3.14.10 -> 4.3.0 (#47701)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wavebox/versions
---
 .../networking/instant-messengers/wavebox/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index ce73acf8d596..ac58d4f39d6f 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 let
   bits = "x86_64";
 
-  version = "3.14.10";
+  version = "4.3.0";
 
   desktopItem = makeDesktopItem rec {
     name = "Wavebox";
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   name = "wavebox-${version}";
   src = fetchurl {
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
-    sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74";
+    sha256 = "0kdg5q9rv8nxlg5jhmdfy5vv7gkdswzhy49af29d3zf57z69187c";
   };
 
   # don't remove runtime deps

From b61dd2bcb7e0c88fcc53f48f8430d352b87b3388 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 12 Oct 2018 17:28:48 +0300
Subject: [PATCH 2825/3253] nixos/rmilter: don't enable by default, if rspamd
 enabled

---
 nixos/modules/services/mail/rmilter.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 0d91b247cd34..492c64583219 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -52,7 +52,7 @@ in
 
       enable = mkOption {
         type = types.bool;
-        default = cfg.rspamd.enable;
+        default = false;
         description = "Whether to run the rmilter daemon.";
       };
 

From 7969b9ed3ce1b1792e7a59845364e2f3c2134bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 12 Oct 2018 16:44:53 +0200
Subject: [PATCH 2826/3253] knot-dns: 2.7.2 -> 2.7.3 (minor update)

https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.7.3
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 3837f06264b7..64b78d335f79 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.7.2";
+  version = "2.7.3";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "cb70b2ee1c7ecbaad8774a1e0c449a68c6a6f7c9d60595524f003201d6e38431";
+    sha256 = "8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 7658ae6b729a46b458f37243671db3d2cbe476d3 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Fri, 12 Oct 2018 17:59:49 +0300
Subject: [PATCH 2827/3253] solc: 0.4.24 -> 0.4.25

---
 pkgs/development/compilers/solc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index edb7fc61d2a3..e67e2191debe 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
 
 let
-  version = "0.4.24";
-  rev = "e67f0147998a9e3835ed3ce8bf6a0a0c634216c5";
-  sha256 = "1gy2miv6ia1z98zy6w4y03balwfr964bnvwzyg8v7pn2mayqnaap";
+  version = "0.4.25";
+  rev = "59dbf8f1085b8b92e8b7eb0ce380cbeb642e97eb";
+  sha256 = "11lss1sldzjg4689c06iw0iivyi9f4zpi4l9za0fgy6k85qz43v9";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;

From dd6b5082a52617594863e4e03d5d7c909ef5ab9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 08:47:44 -0700
Subject: [PATCH 2828/3253] eccodes: 2.8.2 -> 2.9.0 (#47822)

* eccodes: 2.8.2 -> 2.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eccodes/versions

* eccodes: src and homepage URLs changed
---
 pkgs/development/libraries/eccodes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 5cd004c8d136..01600f90f284 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib; 
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchurl {
-    url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin";
+    url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
+    sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://software.ecmwf.int/wiki/display/ECC/;
+    homepage = https://confluence.ecmwf.int/display/ECC/;
     license = licenses.asl20;
     maintainers = with maintainers; [ knedlsepp ];
     platforms = platforms.unix;

From 7bafe255530a73f8b68ed211099d7770277f9e1f Mon Sep 17 00:00:00 2001
From: Jeff Slight <jeff@pololu.com>
Date: Fri, 12 Oct 2018 09:33:37 -0700
Subject: [PATCH 2829/3253] add custom hooks directory to gitlab-shell

Add custom_hooks_dir to gitlab-shell yml config file.
---
 nixos/modules/services/misc/gitlab.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index d81aa5643e53..8ea831afb7c1 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -53,6 +53,7 @@ let
     repos_path: "${cfg.statePath}/repositories"
     secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
     log_file: "${cfg.statePath}/log/gitlab-shell.log"
+    custom_hooks_dir: "${cfg.statePath}/custom_hooks"
     redis:
       bin: ${pkgs.redis}/bin/redis-cli
       host: 127.0.0.1
@@ -562,6 +563,9 @@ in {
         mkdir -p ${cfg.statePath}/shell
         mkdir -p ${cfg.statePath}/db
         mkdir -p ${cfg.statePath}/uploads
+        mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d
+        mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d
+        mkdir -p ${cfg.statePath}/custom_hooks/update.d
 
         rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
         mkdir -p ${cfg.statePath}/config

From c429b2b38952ea34808bac610b6f0065dbd03276 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 12 Oct 2018 19:01:51 +0200
Subject: [PATCH 2830/3253] cloc: 1.78 -> 1.80

---
 pkgs/tools/misc/cloc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 0eff3f0c3916..5a69a6ae7ad2 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "cloc-${version}";
-  version = "1.78";
+  version = "1.80";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
-    rev = version;
-    sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2";
+    rev = "v${version}";
+    sha256 = "0zmkjpv4dbdr29x95j4i585wz4rxwlrkp6ldfr5wiw83h90n0ilp";
   };
 
   setSourceRoot = ''

From 5eb7ca4e5d7d4c2931fa14c5575b9fe2befd2647 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 12 Oct 2018 19:04:09 +0200
Subject: [PATCH 2831/3253] pwsafe: 0.99BETA -> 1.06BETA (#48003)

pwsafe: add c0bw3b as maintainer
---
 pkgs/applications/misc/pwsafe/default.nix | 64 ++++++++---------------
 pkgs/top-level/all-packages.nix           |  4 +-
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 0ea530b6bf1c..7b0e299924cb 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -1,25 +1,31 @@
-{ stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst
-, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
+, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto
+, libqrencode, libuuid, libyubikey, yubikey-personalization
 }:
 
 stdenv.mkDerivation rec {
-  name = "pwsafe-${version}";
-  version = "0.99";
+  pname = "pwsafe";
+  version = "1.06";
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
-    owner = "pwsafe";
-    repo = "pwsafe";
+    owner = "${pname}";
+    repo = "${pname}";
     rev = "${version}BETA";
-    sha256 = "1bkimz4g9v9kfjkqr3dqddh4jps7anzc1hgmirmmhwpac0xdp60g";
+    sha256 = "1q3xi7i4r3nmz3hc79lx8l15sr1nqhwbi3lrnfqr356nv6aaf03y";
   };
 
-  makefile = "Makefile.linux";
-  makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib";
-
-  buildFlags = "unicoderelease";
-  buildInputs = [ wxGTK libuuid gettext perl zip
-                  xercesc libXt libXtst libXi xextproto
-                  pkgconfig libyubikey yubikey-personalization ];
+  nativeBuildInputs = [ cmake pkgconfig zip ];
+  buildInputs = [
+    gettext perl libqrencode libuuid
+    libXi libXt libXtst wxGTK31 xercesc xextproto
+    libyubikey yubikey-personalization
+  ];
+  cmakeFlags = [
+    "-DNO_GTEST=ON"
+    "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1"
+  ];
+  enableParallelBuilding = true;
 
   postPatch = ''
     # Fix perl scripts used during the build.
@@ -40,31 +46,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin \
-             $out/share/applications \
-             $out/share/pwsafe/xml \
-             $out/share/icons/hicolor/48x48/apps \
-             $out/share/doc/passwordsafe/help \
-             $out/share/man/man1 \
-             $out/share/locale
-
-    (cd help && make -f Makefile.linux)
-    cp help/help*.zip $out/share/doc/passwordsafe/help
-
-    (cd src/ui/wxWidgets/I18N && make mos)
-    cp -dr src/ui/wxWidgets/I18N/mos/* $out/share/locale/
-    # */
-
-    cp README.txt docs/ReleaseNotes.txt docs/ChangeLog.txt \
-      LICENSE install/copyright $out/share/doc/passwordsafe
-
-    cp src/ui/wxWidgets/GCCUnicodeRelease/pwsafe $out/bin/
-    cp install/graphics/pwsafe.png $out/share/icons/hicolor/48x48/apps
-    cp docs/pwsafe.1 $out/share/man/man1
-    cp xml/* $out/share/pwsafe/xml
-    #  */
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A password database utility";
@@ -77,8 +59,8 @@ stdenv.mkDerivation rec {
       username/password combinations that you use.
     '';
 
-    homepage = http://passwordsafe.sourceforge.net/;
-    maintainers = with maintainers; [ pjones ];
+    homepage = https://pwsafe.org/;
+    maintainers = with maintainers; [ c0bw3b pjones ];
     platforms = platforms.linux;
     license = licenses.artistic2;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b373b03dceaa..7cd28d95b165 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4327,9 +4327,7 @@ with pkgs;
 
   pulsemixer = callPackage ../tools/audio/pulsemixer { };
 
-  pwsafe = callPackage ../applications/misc/pwsafe {
-    wxGTK = wxGTK30;
-  };
+  pwsafe = callPackage ../applications/misc/pwsafe { };
 
   niff = callPackage ../tools/package-management/niff { };
 

From 5c14decaa36ae559541cfb34d1477b8b1e76c81a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 12 Oct 2018 19:04:19 +0200
Subject: [PATCH 2832/3253] nix-index: fix darwin build

---
 pkgs/tools/package-management/nix-index/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  4 +++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index 0b336d47fe4c..d0a81140fc83 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -1,8 +1,8 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }:
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
+, Security
+}:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "nix-index-${version}";
   version = "0.1.2";
 
@@ -14,7 +14,8 @@ buildRustPackage rec {
   };
   cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl curl];
+  buildInputs = [ openssl curl ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   postInstall = ''
     mkdir -p $out/etc/profile.d
@@ -23,7 +24,7 @@ buildRustPackage rec {
       --replace "@out@" "$out"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A files database for nixpkgs";
     homepage = https://github.com/bennofs/nix-index;
     license = with licenses; [ bsd3 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b373b03dceaa..83949c4d865b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21971,7 +21971,9 @@ with pkgs;
   nix-info = callPackage ../tools/nix/info { };
   nix-info-tested = nix-info.override { doCheck = true; };
 
-  nix-index = callPackage ../tools/package-management/nix-index { };
+  nix-index = callPackage ../tools/package-management/nix-index {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 

From 964214b10700fab42bbeac6092d20bb7ad8d4e35 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 4 Oct 2018 01:17:18 +0000
Subject: [PATCH 2833/3253] cpplint: init at 1.3.0

Static analyzer for C++ code. Licensed under a very permissive, generic Google license (BSD3 wording).
---
 .../tools/analysis/cpplint/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/cpplint/default.nix

diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix
new file mode 100644
index 000000000000..10ed99e3ffe6
--- /dev/null
+++ b/pkgs/development/tools/analysis/cpplint/default.nix
@@ -0,0 +1,29 @@
+{ lib, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "cpplint";
+  version = "1.3.0";
+
+  # Fetch from github instead of pypi, since the test cases are not in the pypi archive
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "107v7bp35kxbv9v7wl79h7115z1m4b48rhasp0cnivql1grd277i";
+  };
+
+  postPatch = ''
+    patchShebangs cpplint_unittest.py
+  '';
+
+  checkPhase = ''
+    ./cpplint_unittest.py
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/cpplint/cpplint;
+    description = "Static code checker for C++";
+    maintainers = [ maintainers.bhipple ];
+    license = [ licenses.bsd3 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d911181ae372..3126fe4fd1ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8264,6 +8264,8 @@ with pkgs;
 
   cppcheck = callPackage ../development/tools/analysis/cppcheck { };
 
+  cpplint = callPackage ../development/tools/analysis/cpplint { };
+
   cquery = callPackage ../development/tools/misc/cquery {
     llvmPackages = llvmPackages_6;
   };

From ad992cbde10879455a5359ceb17937fc57cf2fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <github@leo.gaspard.ninja>
Date: Sat, 13 Oct 2018 04:28:30 +0900
Subject: [PATCH 2834/3253] nheko: mark as insecure (#48281)

The package is no longer maintained and includes potential security
vulnerabilities (a use-after-free and several crashes) that are known
and not fixed in the version present in nixpkgs. They don't look too bad
judging from the trigger vectors mentioned in the changelog, but with
the project going unmaintained one of them becoming a security
vulnerability would likely not be noticed.
---
 .../applications/networking/instant-messengers/nheko/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 0d34a0a43628..6e78a9034aec 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ ekleog fpletz ];
     platforms = platforms.unix;
     license = licenses.gpl3Plus;
+    knownVulnerabilities = [ "No longer maintained" ];
   };
 }

From f969e6e4744f998454dafad2c69f2ccfbbb16da3 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 12 Oct 2018 19:29:34 +0000
Subject: [PATCH 2835/3253] go: do not wrap with `go get` tools

See: https://github.com/NixOS/nixpkgs/issues/46603

These tools are not required for `buildGoPackage`, while
significantly affecting closure size and build time.

This essentially reverts 458895db332d394bfadc05404a020ea0b4b1ee7f.
---
 pkgs/development/compilers/go/1.10.nix | 10 ++--------
 pkgs/development/compilers/go/1.11.nix | 10 ++--------
 pkgs/development/compilers/go/1.9.nix  | 10 ++--------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index fa4b4abafdee..163577935839 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
 
 let
 
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
   GOCACHE = "off";
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+  nativeBuildInputs = [ perl which pkgconfig patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp -r . $GOROOT
     ( cd $GOROOT/src && ./all.bash )
-
-    # (https://github.com/golang/go/wiki/GoGetTools)
-    wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
   '';
 
   preFixup = ''
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 56d363f1015f..f58e0801030e 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
 
 let
 
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
   GOCACHE = "off";
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+  nativeBuildInputs = [ perl which pkgconfig patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -171,9 +168,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp -r . $GOROOT
     ( cd $GOROOT/src && ./all.bash )
-
-    # (https://github.com/golang/go/wiki/GoGetTools)
-    wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
   '';
 
   preFixup = ''
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 48f16c3ffa5a..d6ae163813f3 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
 
 let
 
@@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
   };
 
   # perl is used for testing go vet
-  nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+  nativeBuildInputs = [ perl which pkgconfig patch procps ];
   buildInputs = [ cacert pcre ]
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp -r . $GOROOT
     ( cd $GOROOT/src && ./all.bash )
-
-    # (https://github.com/golang/go/wiki/GoGetTools)
-    wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
   '';
 
   preFixup = ''

From f830ab11968e8075229f4929282070caf1d8e656 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Fri, 12 Oct 2018 16:00:56 +0200
Subject: [PATCH 2836/3253] airspy: fix license

---
 pkgs/applications/misc/airspy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix
index 9b6771a3925b..2042f1047b22 100644
--- a/pkgs/applications/misc/airspy/default.nix
+++ b/pkgs/applications/misc/airspy/default.nix
@@ -28,7 +28,7 @@ in
     meta = with stdenv.lib; {
       homepage = https://github.com/airspy/airspyone_host;
       description = "Host tools and driver library for the AirSpy SDR";
-      license = licenses.free;
+      license = licenses.bsd3;
       platforms = with platforms; linux ++ darwin;
       maintainers = with maintainers; [ markuskowa ];
     };

From 9580d80abe414ba3f89b02ef0cb5b80d6a57a66d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 21:40:32 +0200
Subject: [PATCH 2837/3253] grantlee: add licenses

---
 pkgs/development/libraries/grantlee/5/default.nix | 1 +
 pkgs/development/libraries/grantlee/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index aa670cd4c86b..52c087b19147 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -46,6 +46,7 @@ mkDerivation rec {
 
     homepage = http://gitorious.org/grantlee;
     maintainers = [ maintainers.ttuegel ];
+    license = licenses.lgpl21;
     inherit (qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 9dde67b5c795..1446e339745e 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       and the design of Django is reused in Grantlee.'';
 
     homepage = http://gitorious.org/grantlee;
-    maintainers = [ ];
+    license = stdenv.lib.licenses.lgpl21;
     inherit (qt4.meta) platforms;
   };
 }

From 867ddb29eafd56a71739a3eb0cf3d4906dba1e15 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 21:42:14 +0200
Subject: [PATCH 2838/3253] qt-gstreamer: add license

---
 .../development/libraries/gstreamer/qt-gstreamer/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index a9e7f9fcff3e..a099643061a1 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }

From 2e335ac4bb64800db4ac74d3f36084ed6f3ebb3a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 21:44:03 +0200
Subject: [PATCH 2839/3253] gtk-sharp-bean: add license, fix description

---
 pkgs/development/libraries/gtk-sharp-beans/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index b92bbf64514e..7f35f088da2b 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   meta = with stdenv.lib; {
-    description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x";
+    description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x";
     platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }

From e7549b96ad013da56e990440bb58986683d80d7c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 14:51:46 -0400
Subject: [PATCH 2840/3253] nixpkgs docs: finish up mapAttrsRecursive

---
 doc/functions/library/attrsets.xml | 82 ++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 6f23e267bab2..5d8182cc6097 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -966,5 +966,87 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
    itself to attribute sets. Also, the first argument of the argument function
    is a <emphasis>list</emphasis> of the names of the containing attributes.
   </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>f</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>[ String ] -> Any -> Any</literal>
+     </para>
+     <para>
+      Given a list of attribute names and value, return a new value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name_path</varname>
+       </term>
+       <listitem>
+        <para>
+         The list of attribute names to this value.
+        </para>
+        <para>
+         For example, the <varname>name_path</varname> for the
+         <literal>example</literal> string in the attribute set <literal>{ foo
+         = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
+         ]</literal>.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to recursively map over.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.mapAttrsRecursive-example">
+   <title>A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function></title>
+<programlisting><![CDATA[
+mapAttrsRecursive
+  (path: value: concatStringsSep "-" (path ++ [value]))
+  {
+    n = {
+      a = "A";
+      m = {
+        b = "B";
+        c = "C";
+      };
+    };
+    d = "D";
+  }
+=> {
+     n = {
+       a = "n-a-A";
+       m = {
+         b = "n-m-b-B";
+         c = "n-m-c-C";
+       };
+     };
+     d = "d-D";
+   }
+    ]]></programlisting>
+  </example>
  </section>
 </section>

From d664b8f5e3aeff8d6cf826d103bca342a7cf81c2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 15:22:41 -0400
Subject: [PATCH 2841/3253] nixpkgs docs: document mapAttrsRecursiveCond

---
 doc/functions/library/attrsets.xml | 123 +++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 5d8182cc6097..7a8ce95fd030 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1049,4 +1049,127 @@ mapAttrsRecursive
     ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.mapAttrsRecursiveCond">
+  <title><function>lib.attrsets.mapAttrsRecursiveCond</function></title>
+
+  <subtitle><literal>mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursiveCond" />
+
+  <para>
+   Like <function>mapAttrsRecursive</function>, but it takes an additional
+   predicate function that tells it whether to recursive into an attribute set.
+   If it returns false, <function>mapAttrsRecursiveCond</function> does not
+   recurse, but does apply the map function. It is returns true, it does
+   recurse, and does not apply the map function.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>cond</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>(AttrSet -> Bool)</literal>
+     </para>
+     <para>
+      Determine if <function>mapAttrsRecursive</function> should recurse deeper
+      in to the attribute set.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>attributeset</varname>
+       </term>
+       <listitem>
+        <para>
+         An attribute set.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>f</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>[ String ] -> Any -> Any</literal>
+     </para>
+     <para>
+      Given a list of attribute names and value, return a new value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name_path</varname>
+       </term>
+       <listitem>
+        <para>
+         The list of attribute names to this value.
+        </para>
+        <para>
+         For example, the <varname>name_path</varname> for the
+         <literal>example</literal> string in the attribute set <literal>{ foo
+         = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
+         ]</literal>.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>value</varname>
+       </term>
+       <listitem>
+        <para>
+         The attribute's value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>set</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to recursively map over.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.mapAttrsRecursiveCond-example">
+   <title>Only convert attribute values to JSON if the containing attribute set is marked for recursion</title>
+<programlisting><![CDATA[
+lib.attrsets.mapAttrsRecursiveCond
+  ({ recurse ? false, ... }: recurse)
+  (name: value: builtins.toJSON value)
+  {
+    dorecur = {
+      recurse = true;
+      hello = "there";
+    };
+    dontrecur = {
+      converted-to- = "json";
+    };
+  }
+=> {
+     dorecur = {
+       hello = "\"there\"";
+       recurse = "true";
+     };
+     dontrecur = "{\"converted-to\":\"json\"}";
+   }
+    ]]></programlisting>
+  </example>
+ </section>
+
 </section>

From ef05e1057b91647b7c2662437fd658e8b0286e80 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 15:29:09 -0400
Subject: [PATCH 2842/3253] nixpkgs docs: document genAttrs

---
 doc/functions/library/attrsets.xml | 59 ++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 7a8ce95fd030..78d05589aa8f 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1172,4 +1172,63 @@ lib.attrsets.mapAttrsRecursiveCond
   </example>
  </section>
 
+ <section xml:id="function-library-lib.attrsets.genAttrs">
+  <title><function>lib.attrsets.genAttrs</function></title>
+
+  <subtitle><literal>genAttrs :: [ String ] -> (String -> Any) -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.genAttrs" />
+
+  <para>
+   Generate an attribute set by mapping a function over a list of attribute
+   names.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>names</varname>
+    </term>
+    <listitem>
+     <para>
+      Names of values in the resulting attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>f</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>String -> Any</literal>
+     </para>
+     <para>
+      Takes the name of the attribute and return the attribute's value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute to generate a value for.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.genAttrs-example">
+   <title>Generate an attrset based on names only</title>
+<programlisting><![CDATA[
+lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}")
+=> { foo = "x_foo"; bar = "x_bar"; }
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From f85a4ba9c30434f9e0a2e2a57489543304d29f42 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 15:29:52 -0400
Subject: [PATCH 2843/3253] nixpkgs docs: document isDerivation

---
 doc/functions/library/attrsets.xml | 43 ++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 78d05589aa8f..f671c5f4e4be 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1231,4 +1231,47 @@ lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}")
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.isDerivation">
+  <title><function>lib.attrsets.isDerivation</function></title>
+
+  <subtitle><literal>isDerivation :: Any -> Bool</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.isDerivation" />
+
+  <para>
+   Check whether the argument is a derivation. Any set with <code>{ type =
+   "derivation"; }</code> counts as a derivation.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>value</varname>
+    </term>
+    <listitem>
+     <para>
+      The value which is possibly a derivation.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.isDerivation-example-true">
+   <title>A package is a derivation</title>
+<programlisting><![CDATA[
+lib.attrsets.isDerivation (import <nixpkgs> {}).ruby
+=> true
+     ]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrsets.isDerivation-example-false">
+   <title>Anything else is not a derivation</title>
+<programlisting><![CDATA[
+lib.attrsets.isDerivation "foobar"
+=> false
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From c547c3fe8262270ab8ddf129ec2bb8ebd4a38766 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 15:34:57 -0400
Subject: [PATCH 2844/3253] nixpkgs docs: document toDerivation

---
 doc/functions/library/attrsets.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index f671c5f4e4be..222b4a882917 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1274,4 +1274,30 @@ lib.attrsets.isDerivation "foobar"
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.toDerivation">
+  <title><function>lib.attrsets.toDerivation</function></title>
+
+  <subtitle><literal>toDerivation :: Path -> Derivation</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.toDerivation" />
+
+  <para>
+   Converts a store path to a fake derivation.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>path</varname>
+    </term>
+    <listitem>
+     <para>
+      A store path to convert to a derivation.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
 </section>

From e0c6981d19d39d41258ab626a6b9871ff0014af2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 15:42:39 -0400
Subject: [PATCH 2845/3253] nixpkgs docs: document optionalAttrs

---
 doc/functions/library/attrsets.xml | 53 ++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 222b4a882917..8206142d7df2 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1300,4 +1300,57 @@ lib.attrsets.isDerivation "foobar"
    </varlistentry>
   </variablelist>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.optionalAttrs">
+  <title><function>lib.attrsets.optionalAttrs</function></title>
+
+  <subtitle><literal>optionalAttrs :: Bool -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.optionalAttrs" />
+
+  <para>
+   Conditionally return an attribute set or an empty attribute set.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>cond</varname>
+    </term>
+    <listitem>
+     <para>
+      Condition under which the <varname>as</varname> attribute set is
+      returned.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>as</varname>
+    </term>
+    <listitem>
+     <para>
+      The attribute set to return if <varname>cond</varname> is true.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.optionalAttrs-example-true">
+   <title>Return the provided attribute set when <varname>cond</varname> is true</title>
+<programlisting><![CDATA[
+lib.attrsets.optionalAttrs true { my = "set"; }
+=> { my = "set"; }
+     ]]></programlisting>
+  </example>
+
+  <example xml:id="function-library-lib.attrsets.optionalAttrs-example-false">
+   <title>Return an empty attribute set when <varname>cond</varname> is false</title>
+<programlisting><![CDATA[
+lib.attrsets.optionalAttrs false { my = "set"; }
+=> { }
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From 3b3bde463ba7092dffdb78f20bffff4520e1df76 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:02:26 -0400
Subject: [PATCH 2846/3253] nixpkgs docs: document zipAttrsWithNames

---
 doc/functions/library/attrsets.xml | 88 ++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 8206142d7df2..b49ccaf739ac 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1353,4 +1353,92 @@ lib.attrsets.optionalAttrs false { my = "set"; }
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.zipAttrsWithNames">
+  <title><function>lib.attrsets.zipAttrsWithNames</function></title>
+
+  <subtitle><literal>zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWithNames" />
+
+  <para>
+   Merge sets of attributes and use the function <varname>f</varname> to merge
+   attribute values.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>names</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of attribute names to zip.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>f</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>(String -> [ Any ] -> Any</literal>
+     </para>
+     <para>
+      Accepts an attribute name, all the values, and returns a combined value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute each value came from.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>vs</varname>
+       </term>
+       <listitem>
+        <para>
+         A list of values collected from the list of attribute sets.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>sets</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of attribute sets to zip together.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.zipAttrsWithNames-example">
+   <title>Summing a list of attribute sets of numbers</title>
+<programlisting><![CDATA[
+lib.attrsets.zipAttrsWithNames
+  [ "a" "b" ]
+  (name: vals: "${name} ${toString (builtins.foldl' (a: b: a + b) 0 vals)}")
+  [
+    { a = 1; b = 1; c = 1; }
+    { a = 10; }
+    { b = 100; }
+    { c = 1000; }
+  ]
+=> { a = "a 11"; b = "b 101"; }
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From d856710c1fd632d27f5100c696da34e0c860f3f9 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 12 Oct 2018 22:31:43 +0200
Subject: [PATCH 2847/3253] reattach-to-user-namespace: 2.6 -> 2.7 (#48283)

Adds macOS Mojave (10.14) support.
---
 .../darwin/reattach-to-user-namespace/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
index b14008e11f10..631c59523e2a 100644
--- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
+++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "reattach-to-user-namespace-${version}";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchurl {
-    url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v2.6.tar.gz";
-    sha256 = "1d8ynzkdlxyyky9f88f7z50g9lwdydkpb2n7gkw3jgl2ac569xc0";
+    url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz";
+    sha256 = "00mjyj8yicrpnlm46rlbkvxgl5381l8xawh7rmjk10p3zrm56jbv";
   };
 
   buildFlags = "ARCHES=x86_64";

From 8d6f4e5ca3167baa4993b7a83aa115b9510c79f3 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 12 Oct 2018 22:33:43 +0200
Subject: [PATCH 2848/3253] allegro: fix v4.4.2 src URL (#48287)

Gna.org forge has disappeared
---
 pkgs/development/libraries/allegro/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 21d9ce23d319..f53aa873b482 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version="4.4.2";
 
   src = fetchurl {
-    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
+    url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz";
     sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 

From 1ae8d8b793406434b8bf1e348931bb1a41973515 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 12 Oct 2018 18:58:38 +0000
Subject: [PATCH 2849/3253] libcacard: init at 2.6.1

---
 .../libraries/libcacard/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/libcacard/default.nix

diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
new file mode 100644
index 000000000000..f116360474e4
--- /dev/null
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, nss }:
+
+stdenv.mkDerivation rec {
+  name = "libcacard-${version}";
+  version = "2.6.1";
+
+  src = fetchurl {
+    url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz";
+    sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib nss ];
+
+  meta = with stdenv.lib; {
+    description = "Smart card emulation library";
+    homepage = https://gitlab.freedesktop.org/spice/libcacard;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ yegortimoshenko ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cc5fb80c254..a543fa9e6ee9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10279,6 +10279,8 @@ with pkgs;
     inherit (xorg) libX11 libXext;
   };
 
+  libcacard = callPackage ../development/libraries/libcacard { };
+
   libcanberra = callPackage ../development/libraries/libcanberra {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };

From 475da25b40e91d1030d96559b596e42125e4c617 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 12 Oct 2018 18:58:49 +0000
Subject: [PATCH 2850/3253] qemu: enable smartcard support

---
 pkgs/applications/virtualization/qemu/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 596bc9dd9e09..d9495bd984ef 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -10,6 +10,7 @@
 , sdlSupport ? !stdenv.isDarwin, SDL2
 , gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3
 , vncSupport ? true, libjpeg, libpng
+, smartcardSupport ? true, libcacard
 , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
 , usbredirSupport ? spiceSupport, usbredir
 , xenSupport ? false, xen
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
     ++ optionals sdlSupport [ SDL2 ]
     ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ]
     ++ optionals vncSupport [ libjpeg libpng ]
+    ++ optionals smartcardSupport [ libcacard ]
     ++ optionals spiceSupport [ spice-protocol spice ]
     ++ optionals usbredirSupport [ usbredir ]
     ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
@@ -108,6 +110,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isDarwin "--cpu=x86_64"
     ++ optional numaSupport "--enable-numa"
     ++ optional seccompSupport "--enable-seccomp"
+    ++ optional smartcardSupport "--enable-smartcard"
     ++ optional spiceSupport "--enable-spice"
     ++ optional usbredirSupport "--enable-usb-redir"
     ++ optional hostCpuOnly "--target-list=${hostCpuTargets}"

From 02602b2c15eaccf80490168591cf289ac81cc9d5 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 12 Oct 2018 18:59:01 +0000
Subject: [PATCH 2851/3253] spice: enable smartcard support

---
 pkgs/development/libraries/spice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ba3791a8a8bd..e9b12d169849 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib
 , openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama
 , libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl
-, lz4 }:
+, libcacard, lz4 }:
 
 with stdenv.lib;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
-                  python pyparsing glib cyrus_sasl lz4 ];
+                  python pyparsing glib cyrus_sasl libcacard lz4 ];
 
   nativeBuildInputs = [ pkgconfig spice-protocol ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-sasl"
-    "--disable-smartcard"
+    "--enable-smartcard"
     "--enable-client"
     "--enable-lz4"
   ];

From 541e5b890004a17e3c868cc2b202934d229407d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:43:15 -0700
Subject: [PATCH 2852/3253] xpra: 2.3.3 -> 2.3.4 (#47705)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xpra/versions
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 915144daa908..3e4d49108b71 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -14,11 +14,11 @@ let
   xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
   pname = "xpra";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url = "https://xpra.org/src/${pname}-${version}.tar.xz";
-    sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01";
+    sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 21ed2b9d32c00b585dccecd1b4c4460a652449ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:45:14 -0700
Subject: [PATCH 2853/3253] mercurialFull: 4.7.1 -> 4.7.2 (#47759)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mercurial-full/versions
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 41809e83b457..5464f605cbdb 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -4,7 +4,7 @@
 
 let
   # if you bump version, update pkgs.tortoisehg too or ping maintainer
-  version = "4.7.1";
+  version = "4.7.2";
   name = "mercurial-${version}";
   inherit (python2Packages) docutils hg-git dulwich python;
 in python2Packages.buildPythonApplication {
@@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/${name}.tar.gz";
-    sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5";
+    sha256 = "1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From ba3dbfd635cbc7ba5d619d50ce8968ec5c5997f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:47:02 -0700
Subject: [PATCH 2854/3253] mcelog: 160 -> 161 (#47768)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mcelog/versions
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 642653259c34..c0e8e1292330 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "160";
+  version = "161";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48";
+    sha256 = "1bqz53xgvwab3r487ihri3nvk7nsgjykdv8m993983vxsi2bgjmz";
   };
 
   postPatch = ''

From 0e85226ee890881595ddb4d2403698a8d7a0f9b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:49:20 -0700
Subject: [PATCH 2855/3253] libcouchbase: 2.9.4 -> 2.9.5 (#47772)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libcouchbase/versions
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 4da0738fde5e..e3d5c7d6424e 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.9.4";
+  version = "2.9.5";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "0d6lmnr5yfpkzr1yr6f2ilxprl6v9r4r7917k4iz0wc3jlcndwl3";
+    sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From c43e752dcb9a45b9c661cfb2549fbb755c272f57 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:50:47 -0700
Subject: [PATCH 2856/3253] duo-unix: 1.10.4 -> 1.10.5 (#47819)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/duo-unix/versions
---
 pkgs/tools/security/duo-unix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix
index 3ef07c44f501..a76e88772bcf 100644
--- a/pkgs/tools/security/duo-unix/default.nix
+++ b/pkgs/tools/security/duo-unix/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "duo-unix-${version}";
-  version = "1.10.4";
+  version = "1.10.5";
 
   src = fetchurl {
     url    = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp";
+    sha256 = "1h88gwvbh8vwwga7d65iwa9qrmyx23wh5m0rmlv8qbx4fyj7q1f9";
   };
 
   buildInputs = [ pam openssl zlib ];

From 437f58adcb5840e04ecb5a317b93a4763688860f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:51:36 -0700
Subject: [PATCH 2857/3253] qmmp: 1.2.3 -> 1.2.4 (#47730)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qmmp/versions
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index f58e75c9e263..31b8bce90f49 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.2.3";
+  name = "qmmp-1.2.4";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j";
+    sha256 = "0rmfd6h0186b6n4g079d8kshdmp3k5n8w06a1l41m4p3fgq08j92";
   };
 
   buildInputs =

From e6b0646b3b5decaaf9a6b7fe5f59cb98f865d25f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:53:01 -0700
Subject: [PATCH 2858/3253] vulkan-headers: 1.1.82.0 -> 1.1.85 (#47702)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vulkan-headers/versions
---
 pkgs/development/libraries/vulkan-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 2a07eba261b7..dd3f14f91928 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   name = "vulkan-headers-${version}";
-  version = "1.1.82.0";
+  version = "1.1.85";
 
   buildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p";
+    sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
   };
 
   meta = with stdenv.lib; {

From 4edb31882c9830d947202542a13bdb0ede17e782 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:23:49 -0400
Subject: [PATCH 2859/3253] nixpkgs docs: Clarify zipAttrsWithNames's docs

---
 doc/functions/library/attrsets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index b49ccaf739ac..fe44dfe4f8e6 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1364,7 +1364,7 @@ lib.attrsets.optionalAttrs false { my = "set"; }
 
   <para>
    Merge sets of attributes and use the function <varname>f</varname> to merge
-   attribute values.
+   attribute values where the attribute name is in <varname>names</varname>.
   </para>
 
   <variablelist>

From 655a5fa8bf47e104a50a2e627e1cf234fff1402e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:26:56 -0400
Subject: [PATCH 2860/3253] nixpkgs docs: document zipAttrsWith

---
 doc/functions/library/attrsets.xml | 79 ++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index fe44dfe4f8e6..da73e02e0561 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1441,4 +1441,83 @@ lib.attrsets.zipAttrsWithNames
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.zipAttrsWith">
+  <title><function>lib.attrsets.zipAttrsWith</function></title>
+
+  <subtitle><literal>zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWith" />
+
+  <para>
+   Merge sets of attributes and use the function <varname>f</varname> to merge
+   attribute values. Similar to <xref
+   linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where
+   all key names are passed for <varname>names</varname>.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>f</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>(String -> [ Any ] -> Any</literal>
+     </para>
+     <para>
+      Accepts an attribute name, all the values, and returns a combined value.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>name</varname>
+       </term>
+       <listitem>
+        <para>
+         The name of the attribute each value came from.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>vs</varname>
+       </term>
+       <listitem>
+        <para>
+         A list of values collected from the list of attribute sets.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>sets</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of attribute sets to zip together.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.zipAttrsWith-example">
+   <title>Summing a list of attribute sets of numbers</title>
+<programlisting><![CDATA[
+lib.attrsets.zipAttrsWith
+  (name: vals: "${name} ${toString (builtins.foldl' (a: b: a + b) 0 vals)}")
+  [
+    { a = 1; b = 1; c = 1; }
+    { a = 10; }
+    { b = 100; }
+    { c = 1000; }
+  ]
+=> { a = "a 11"; b = "b 101"; c = "c 1001"; }
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From 77140a9075ea651c060fcb91a7a5da832e3a1e68 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:31:23 -0400
Subject: [PATCH 2861/3253] nixpkgs docs: document zipAttrs

---
 doc/functions/library/attrsets.xml | 45 +++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index da73e02e0561..a719b7958458 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1452,7 +1452,8 @@ lib.attrsets.zipAttrsWithNames
 
   <para>
    Merge sets of attributes and use the function <varname>f</varname> to merge
-   attribute values. Similar to <xref
+   attribute values. Similar to
+   <xref
    linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where
    all key names are passed for <varname>names</varname>.
   </para>
@@ -1520,4 +1521,46 @@ lib.attrsets.zipAttrsWith
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.zipAttrs">
+  <title><function>lib.attrsets.zipAttrs</function></title>
+
+  <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />
+
+  <para>
+   Merge sets of attributes and combine each attribute value in to a list.
+   Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" />
+   where the merge function returns a list of all values.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>sets</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of attribute sets to zip together.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.zipAttrs-example">
+   <title>Combining a list of attribute sets</title>
+<programlisting><![CDATA[
+lib.attrsets.zipAttrs
+  [
+    { a = 1; b = 1; c = 1; }
+    { a = 10; }
+    { b = 100; }
+    { c = 1000; }
+  ]
+=> { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; }
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From c100a456b1da162ea010e5880cded268aa68cec6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:51:05 -0400
Subject: [PATCH 2862/3253] nixpkgs docs: document recursivelyUpdateUntil

---
 doc/functions/library/attrsets.xml | 108 +++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index a719b7958458..a6fa2ea0e295 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1563,4 +1563,112 @@ lib.attrsets.zipAttrs
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.recursiveUpdateUntil">
+  <title><function>lib.attrsets.recursiveUpdateUntil</function></title>
+
+  <subtitle><literal>recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdateUntil" />
+
+  <para>
+   Does the same as the update operator <literal>//</literal> except that
+   attributes are merged until the given predicate is verified. The predicate
+   should accept 3 arguments which are the path to reach the attribute, a part
+   of the first attribute set and a part of the second attribute set. When the
+   predicate is verified, the value of the first attribute set is replaced by
+   the value of the second attribute set.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pred</varname>
+    </term>
+    <listitem>
+     <para>
+      <literal>[ String ] -> AttrSet -> AttrSet -> Bool</literal>
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term>
+        <varname>path</varname>
+       </term>
+       <listitem>
+        <para>
+         The path to the values in the left and right hand sides.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>l</varname>
+       </term>
+       <listitem>
+        <para>
+         The left hand side value.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term>
+        <varname>r</varname>
+       </term>
+       <listitem>
+        <para>
+         The right hand side value.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>lhs</varname>
+    </term>
+    <listitem>
+     <para>
+      The left hand attribute set of the merge.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>rhs</varname>
+    </term>
+    <listitem>
+     <para>
+      The right hand attribute set of the merge.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.recursiveUpdateUntil-example">
+   <title>Recursively merging two attribute sets</title>
+<programlisting><![CDATA[
+lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"])
+  {
+    # first attribute set
+    foo.bar = 1;
+    foo.baz = 2;
+    bar = 3;
+  }
+  {
+    #second attribute set
+    foo.bar = 1;
+    foo.quz = 2;
+    baz = 4;
+  }
+=> {
+  foo.bar = 1; # 'foo.*' from the second set
+  foo.quz = 2; #
+  bar = 3;     # 'bar' from the first set
+  baz = 4;     # 'baz' from the second set
+}
+     ]]></programlisting>
+  </example>
+ </section>
 </section>

From 0eb3b93e1ae4ee6cea97768a1f24f90a88635753 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 12 Oct 2018 16:53:50 -0400
Subject: [PATCH 2863/3253] nixpkgs docs: document recursivelyUpdate

---
 doc/functions/library/attrsets.xml | 57 ++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index a6fa2ea0e295..65d0b40e2e82 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1671,4 +1671,61 @@ lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"])
      ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.recursiveUpdate">
+  <title><function>lib.attrsets.recursiveUpdate</function></title>
+
+  <subtitle><literal>recursiveUpdate :: AttrSet -> AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdate" />
+
+  <para>
+   A recursive variant of the update operator <literal>//</literal>. The
+   recursion stops when one of the attribute values is not an attribute set, in
+   which case the right hand side value takes precedence over the left hand
+   side value.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>lhs</varname>
+    </term>
+    <listitem>
+     <para>
+      The left hand attribute set of the merge.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term>
+     <varname>rhs</varname>
+    </term>
+    <listitem>
+     <para>
+      The right hand attribute set of the merge.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.recursiveUpdate-example">
+   <title>Recursively merging two attribute sets</title>
+<programlisting><![CDATA[
+recursiveUpdate
+  {
+    boot.loader.grub.enable = true;
+    boot.loader.grub.device = "/dev/hda";
+  }
+  {
+    boot.loader.grub.device = "";
+  }
+=> {
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "";
+}
+]]></programlisting>
+  </example>
+ </section>
 </section>

From adeb9fade6a9639039efbce80c8ece7119fd3fa3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:55:20 -0700
Subject: [PATCH 2864/3253] libmesode: 0.9.1 -> 0.9.2 (#47767)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libmesode/versions
---
 pkgs/development/libraries/libmesode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index 1becd0ee8ef6..e46eb9208de6 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libmesode-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "boothj5";
     repo = "libmesode";
     rev = version;
-    sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh";
+    sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 979ebcd81fd45dbd4eef2724f354378b98c7198f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 13:56:49 -0700
Subject: [PATCH 2865/3253] libblockdev: 2.19 -> 2.20 (#47770)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libblockdev/versions
---
 pkgs/development/libraries/libblockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 585f6f18bbab..b99a3c7059aa 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.19";
+  version = "2.20";
 in stdenv.mkDerivation rec {
   name = "libblockdev-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner = "storaged-project";
     repo = "libblockdev";
     rev = "${version}-1";
-    sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys";
+    sha256 = "13xy8vx2dnnxczpnwapchc5ncigcxb2fhpmrmglbpkjqmhn2zbdj";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From 9665e64848b50ec37fcfa751c8527ce3d8b3c66e Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 12 Oct 2018 23:01:26 +0200
Subject: [PATCH 2866/3253] linuxPackages.evdi: mark broken on aarch64

never built in available Hydra history
---
 pkgs/os-specific/linux/evdi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 79a943895740..3c7e2f98b890 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     homepage = http://www.displaylink.com/;
-    broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15";
+    broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15" || stdenv.isAarch64;
   };
 }

From 89e38721a47a724957ae76030d201ccbad139326 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 14:04:26 -0700
Subject: [PATCH 2867/3253] xdgmenumaker: 1.4 -> 1.5 (#47708)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xdgmenumaker/versions
---
 pkgs/applications/misc/xdgmenumaker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index 01782d18b12b..ed7f2b27c381 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xdgmenumaker-${version}";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "gapan";
     repo = "xdgmenumaker";
     rev = version;
-    sha256 = "0i909dk9chdsc7njp5llgm5xlag4lr0nkxkwl1g5lf8cvdjrawh2";
+    sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
   };
 
   nativeBuildInputs = [

From 759703419a6b6214ef0e5e8fcc7b74a1f7369561 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 14:05:16 -0700
Subject: [PATCH 2868/3253] vim: 8.1.0348 -> 8.1.0450 (#47725)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 87a525b33021..dcec9fdfef95 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.1.0348";
+  version = "8.1.0450";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "0f18kpywnph708mvj1fpi06qb53nbhc26ngjh2kvfxwawn63k8ab";
+    sha256 = "1zhggpn4i704apfqn2kqr717kz9dvkjwnbmc3ydza621zjyrnxb2";
   };
 
   enableParallelBuilding = true;

From fa3b0afe077f551e5b1dc0a9edd99897cb9b3f6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 14:09:51 -0700
Subject: [PATCH 2869/3253] pjsip: 2.7.2 -> 2.8 (#47735)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pjsip/versions
---
 pkgs/applications/networking/pjsip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index f7f989dc3a9d..3930ea4ff11f 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pjsip-${version}";
-  version = "2.7.2";
+  version = "2.8";
 
   src = fetchurl {
     url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
-    sha256 = "0wiph6g51wanzwjjrpwsz63amgvly8g08jz033gnwqmppa584b4w";
+    sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah";
   };
 
   buildInputs = [ openssl libsamplerate alsaLib ];

From ef93155f60284e7cd694ded81bd15f07997575bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 12 Oct 2018 14:11:18 -0700
Subject: [PATCH 2870/3253] libuv: 1.23.0 -> 1.23.1 (#47763)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions
---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 73d2db8e9993..e608ea300d1a 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.23.0";
+  version = "1.23.1";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0";
+    sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
   };
 
   patches = [

From aed19d59ae0b5afac92c924fe561216244ba85cb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 22:36:57 +0200
Subject: [PATCH 2871/3253] gtk-sharp: add meta data

---
 pkgs/development/libraries/gtk-sharp/2.0.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 5b3ca828a3f8..c037db97c044 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -46,7 +46,10 @@ stdenv.mkDerivation {
     gtk = gtk2;
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Graphical User Interface Toolkit for mono and .Net";
+    homepage = https://www.mono-project.com/docs/gui/gtksharp;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From e3b313bb59f49f10970205aafd44878d35da07e7 Mon Sep 17 00:00:00 2001
From: Brendan Hall <brendan.j.hall@bath.edu>
Date: Thu, 11 Oct 2018 02:32:08 +0100
Subject: [PATCH 2872/3253] now-cli: init at 11.4.6

---
 pkgs/development/web/now-cli/default.nix | 87 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 89 insertions(+)
 create mode 100644 pkgs/development/web/now-cli/default.nix

diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
new file mode 100644
index 000000000000..911e03daa371
--- /dev/null
+++ b/pkgs/development/web/now-cli/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, lib, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "now-cli-${version}";
+  version = "11.4.6";
+
+  # TODO: switch to building from source, if possible
+  src = fetchurl {
+    url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
+    sha256 = "1bl0yrzxdfy6sks674qlfch8mg3b0x1wj488v83glags8ibsg3cl";
+  };
+
+  sourceRoot = ".";
+  unpackCmd = ''
+    gunzip -c $curSrc > now-linux
+  '';
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir $out
+    mkdir $out/bin
+    cp now-linux $out/bin/now
+  '';
+
+    # now is a node program packaged using zeit/pkg.
+    # thus, it contains hardcoded offsets.
+    # patchelf shifts these locations when it expands headers.
+
+    # this could probably be generalised into allowing any program packaged
+    # with zeit/pkg to be run on nixos.
+
+  preFixup = let
+    libPath = lib.makeLibraryPath [stdenv.cc.cc];
+  in ''
+
+    orig_size=$(stat --printf=%s $out/bin/now)
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/now
+    patchelf --set-rpath ${libPath} $out/bin/now
+    chmod +x $out/bin/now
+
+    new_size=$(stat --printf=%s $out/bin/now)
+
+    ###### zeit-pkg fixing starts here.
+    # we're replacing plaintext js code that looks like
+    # PAYLOAD_POSITION = '1234                  ' | 0
+    # [...]
+    # PRELUDE_POSITION = '1234                  ' | 0
+    # ^-----20-chars-----^^------22-chars------^
+    # ^-- grep points here
+    #
+    # var_* are as described above
+    # shift_by seems to be safe so long as all patchelf adjustments occur 
+    # before any locations pointed to by hardcoded offsets
+
+    var_skip=20
+    var_select=22
+    shift_by=$(expr $new_size - $orig_size)
+
+    function fix_offset {
+      # $1 = name of variable to adjust
+      location=$(grep -obUam1 "$1" $out/bin/now | cut -d: -f1)
+      location=$(expr $location + $var_skip)
+
+      value=$(dd if=$out/bin/now iflag=count_bytes,skip_bytes skip=$location \
+                 bs=1 count=$var_select status=none)
+      value=$(expr $shift_by + $value)
+
+      echo -n $value | dd of=$out/bin/now bs=1 seek=$location conv=notrunc
+    }
+
+    fix_offset PAYLOAD_POSITION
+    fix_offset PRELUDE_POSITION
+
+  '';
+  dontStrip = true;
+
+
+
+  meta = with stdenv.lib; {
+    homepage = https://zeit.co/now;
+    description = "The Command Line Interface for Now - Global Serverless Deployments";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bhall ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 866adafff53f..7a47916d5900 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3759,6 +3759,8 @@ with pkgs;
 
   npm2nix = nodePackages.npm2nix;
 
+  now-cli = callPackage ../development/web/now-cli {};
+
   file-rename = callPackage ../tools/filesystems/file-rename { };
 
   kea = callPackage ../tools/networking/kea {

From 2216467f32a30e1f8d1e9c131bef2a8a4cf98208 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <pmidden+github@secure.mailbox.org>
Date: Fri, 12 Oct 2018 23:45:07 +0200
Subject: [PATCH 2873/3253] fcppt: 2.5.0 -> 2.9.0 (#48257)

---
 pkgs/development/libraries/fcppt/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
index 660cdfa6414b..49e929821f7f 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake, boost, brigand }:
 
 stdenv.mkDerivation rec {
   name = "fcppt-${version}";
-  version = "2.5.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "freundlich";
     repo = "fcppt";
     rev = version;
-    sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi";
+    sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost ];
 
-  cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ];
+  cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
 
   enableParallelBuilding = true;
 

From 340c76263d88bf47119c638164093c63d5292f8b Mon Sep 17 00:00:00 2001
From: Thilo Uttendorfer <tlo@sengaya.de>
Date: Sat, 13 Oct 2018 00:03:44 +0200
Subject: [PATCH 2874/3253] openxcom: 1.0.0.2018.01.28 -> 1.0.0.2018.10.08
 (#48290)

---
 pkgs/games/openxcom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 9a82c678f370..211172cee203 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost
 , SDL, SDL_image, SDL_mixer, SDL_gfx }:
 
-let version = "1.0.0.2018.01.28"; in
+let version = "1.0.0.2018.10.08"; in
 stdenv.mkDerivation {
   name = "openxcom-${version}";
   src = fetchFromGitHub {
     owner = "SupSuper";
     repo = "OpenXcom";
-    rev = "b148916268a6ce104c3b6b7eb4d9e0487cba5487";
-    sha256 = "1128ip3g4aw59f3f23mvlyhl8xckhwjjw9rd7wn7xv51hxdh191c";
+    rev = "13049d617fe762b91893faaf7c14ddefa49e2f1d";
+    sha256 = "0vpcfk3g1bnwwmrln14jkj2wvw2z8igxw2mdb7c3y66466wm93ig";
   };
 
   nativeBuildInputs = [ cmake ];

From 59e9c12db3bc1f68da113b5e4b5baad721bb8321 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 23:20:54 +0200
Subject: [PATCH 2875/3253] gtk-spell: add meta data

---
 pkgs/development/libraries/gtkspell/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 22094f3a3f64..14676be0dcb9 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -2,16 +2,19 @@
 
 stdenv.mkDerivation {
   name = "gtkspell-2.0.16";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz;
     sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
   };
-  
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [aspell gtk2 enchant intltool];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Word-processor-style highlighting and replacement of misspelled words";
+    homepage = http://gtkspell.sourceforge.net;
+    platforms = platforms.unix;
+    license = licenses.gpl2;
   };
 }

From 4d83f5305f9184224a13872a94ab612a13b03024 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 23:24:30 +0200
Subject: [PATCH 2876/3253] hspell: add license

---
 pkgs/development/libraries/hspell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 20dda589b9cc..9d2088808c13 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   patchPhase = ''patchShebangs .'';
   buildInputs = [ perl zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Hebrew spell checker";
     homepage = http://hspell.ivrix.org.il/;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ ];
+    platforms = platforms.all;
+    license = licenses.gpl2;
   };
 }

From f9e1b104b1e8401a9d8b43af5fbbca42f59b535c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 23:26:50 +0200
Subject: [PATCH 2877/3253] hunspell: add licenses

---
 pkgs/development/libraries/hunspell/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index b3914a4438b3..62c3d79cf9a1 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
         * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
     '';
     platforms = platforms.all;
+    license = with licenses; [ gpl2 lgpl21 mpl11 ];
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From f7995a6ea67cbeb06b1b2718c0b5ea799f5106ac Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 23:28:05 +0200
Subject: [PATCH 2878/3253] hyena: add license

---
 pkgs/development/libraries/hyena/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index f99aa0b6f0cf..516e4184623a 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.all;
     maintainers = with maintainers; [ obadz ];
+    license = licenses.mit;
   };
 }

From 8f4eb29584e5f328f9bcc5809187b244a23f9e89 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 12 Oct 2018 23:33:05 +0200
Subject: [PATCH 2879/3253] id3lib: add meta data

---
 pkgs/development/libraries/id3lib/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index dda1435c1dac..ddce76b10f72 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -17,7 +17,10 @@ stdenv.mkDerivation {
 
   doCheck = false; # fails to compile
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags";
+    homepage = http://id3lib.sourceforge.net;
+    platforms = platforms.unix;
+    license = licenses.lgpl2;
   };
 }

From adbdba25d07b03acebaa91a11966802fadb4512b Mon Sep 17 00:00:00 2001
From: Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 12 Oct 2018 18:16:47 -0400
Subject: [PATCH 2880/3253] pythonPackages.tinycss: 0.3 -> 0.4 refactor move to
 python-modules (#48163)

---
 .../python-modules/tinycss/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +-------------
 2 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/tinycss/default.nix

diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix
new file mode 100644
index 000000000000..ab6a4183df50
--- /dev/null
+++ b/pkgs/development/python-modules/tinycss/default.nix
@@ -0,0 +1,35 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, pytest
+, python
+, cssutils
+, isPyPy
+}:
+
+buildPythonPackage rec {
+  pname = "tinycss";
+  version = "0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ cssutils ];
+
+  checkPhase = ''
+    py.test $out/${python.sitePackages}
+  '';
+
+  # Disable Cython tests for PyPy
+  TINYCSS_SKIP_SPEEDUPS_TESTS = pkgs.lib.optional isPyPy true;
+
+  meta = with pkgs.lib; {
+    description = "Complete yet simple CSS parser for Python";
+    license = licenses.bsd3;
+    homepage = https://pythonhosted.org/tinycss/;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57f8c947fcc5..62b77b187bc7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1979,32 +1979,7 @@ in {
 
   pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
 
-  tinycss = buildPythonPackage rec {
-    name = "tinycss-${version}";
-    version = "0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tinycss/${name}.tar.gz";
-      sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    propagatedBuildInputs = with self; [ cssutils ];
-
-    checkPhase = ''
-      py.test $out/${python.sitePackages}
-    '';
-
-    # Disable Cython tests for PyPy
-    TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true;
-
-    meta = {
-      description = "Complete yet simple CSS parser for Python";
-      license = licenses.bsd3;
-      homepage = https://pythonhosted.org/tinycss/;
-    };
-  };
+  tinycss = callPackage ../development/python-modules/tinycss { };
 
   tinycss2 = callPackage ../development/python-modules/tinycss2 { };
 

From 0d44d639f67336050efc470b1776714d504e22b8 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 12 Oct 2018 22:41:46 +0000
Subject: [PATCH 2881/3253] nixos/qemu-guest-agent: pkgs.{kvm -> qemu} (#48293)

there is no top-level pkgs.kvm
---
 nixos/modules/virtualisation/qemu-guest-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix
index e0d2b3dc509d..665224e35d8c 100644
--- a/nixos/modules/virtualisation/qemu-guest-agent.nix
+++ b/nixos/modules/virtualisation/qemu-guest-agent.nix
@@ -25,7 +25,7 @@ in {
       systemd.services.qemu-guest-agent = {
         description = "Run the QEMU Guest Agent";
         serviceConfig = {
-          ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga";
+          ExecStart = "${pkgs.qemu.ga}/bin/qemu-ga";
           Restart = "always";
           RestartSec = 0;
         };

From 0808c7cd31aaa329aba21430b8b26c3a233dd83f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 11 Oct 2018 21:23:11 -0400
Subject: [PATCH 2882/3253] lib/types: enhances separatedString's description

The previous description "string" is misleading in the full options
manual pages; they are actually concatenated strings, with a specific
character.

The empty string version ("types.string") has been special-cased to
provide a better message.
---
 lib/types.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 4e44e7521c4b..ca6794e274c3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -194,7 +194,10 @@ rec {
     # separator between the values).
     separatedString = sep: mkOptionType rec {
       name = "separatedString";
-      description = "string";
+      description = if sep == ""
+        then "Concatenated string" # for types.string.
+        else "strings concatenated with ${builtins.toJSON sep}"
+      ;
       check = isString;
       merge = loc: defs: concatStringsSep sep (getValues defs);
       functor = (defaultFunctor name) // {

From 028164ef057119ee37c99bcb98224672441d2d81 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 13 Oct 2018 02:54:42 +0200
Subject: [PATCH 2883/3253] monero: 0.12.3.0 -> 0.13.0.2

---
 pkgs/applications/altcoins/monero/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index a4a884707a98..2b396c4b938d 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit
 , cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
-, zeromq, pcsclite, readline
+, zeromq, pcsclite, readline, libsodium
 , CoreData, IOKit, PCSC
 }:
 
@@ -11,12 +11,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.12.3.0";
+  version = "0.13.0.2";
 
   src = fetchgit {
     url    = "https://github.com/monero-project/monero.git";
     rev    = "v${version}";
-    sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
+    sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
+    libsodium
   ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
 
   cmakeFlags = [

From 6dc4ae5eb237b709dcb1b637b6b3a733fdc1f616 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 13 Oct 2018 03:02:10 +0200
Subject: [PATCH 2884/3253] xmr-stak: 2.4.7 -> 2.5.0

---
 pkgs/applications/misc/xmr-stak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index b98d10efdee1..877a25fe662e 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
 
 stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
-  version = "2.4.7";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "fireice-uk";
     repo = "xmr-stak";
     rev = "${version}";
-    sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817";
+    sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From c02fc32e1d3fefb9ccc7e8f3b1cba7d11180851c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 12 Oct 2018 21:45:02 -0500
Subject: [PATCH 2885/3253] gpgme: enable tests, they pass! :)

---
 pkgs/development/libraries/gpgme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 04ceea137cdd..8e7d10782157 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   checkInputs = [ which ];
 
-  doCheck = false; # fails 8 out of 26 tests with "GPGME: Decryption failed". Spooky!
+  doCheck = true;
 
   meta = with stdenv.lib; {
     homepage = https://gnupg.org/software/gpgme/index.html;

From a838003c323c8910f479a75d070b880695d9a294 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 13 Oct 2018 00:04:15 -0500
Subject: [PATCH 2886/3253] notmuch: 0.27 -> 0.28

https://notmuchmail.org/pipermail/notmuch/2018/027128.html
---
 .../applications/networking/mailreaders/notmuch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2d1b6ee15301..9db9782e2ed6 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.27";
+  version = "0.28";
   name = "notmuch-${version}";
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0";
+    sha256 = "0dqarmjc8544m2w7bqrqmvsfy55fw82707z3lz9cql8nr777bjmc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     doxygen perl  # (optional) api docs
     pythonPackages.sphinx pythonPackages.python  # (optional) documentation -> doc/INSTALL
     bash-completion  # (optional) dependency to install bash completion
-    emacs  # (optional) to byte compile emacs code
+    emacs  # (optional) to byte compile emacs code, also needed for tests
     ruby  # (optional) ruby bindings
     which dtach openssl bash  # test dependencies
   ]

From 13f3021bbbddd060eb92672d570c2a87fda65795 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 13 Oct 2018 00:17:22 -0500
Subject: [PATCH 2887/3253] notmuch: fix zsh completions by specifying dir to
 use

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 9db9782e2ed6..c2c5d18e2f0d 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  configureFlags = [ "--zshcompletiondir=$(out)/share/zsh/site-functions" ];
+
   # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and
   # friends
   setOutputFlags = false;

From 909c46b271617d0322bb137aa6d63771ec513fbc Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 19:44:17 -0400
Subject: [PATCH 2888/3253] pythonPackages.atsim_potentials: init at 0.2.1

---
 .../atsim_potentials/default.nix              | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/atsim_potentials/default.nix

diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix
new file mode 100644
index 000000000000..5d664e77d295
--- /dev/null
+++ b/pkgs/development/python-modules/atsim_potentials/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, future
+}:
+
+buildPythonPackage rec {
+  version = "0.2.1";
+  pname = "atsim.potentials";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2abdec2fb4e8198f4e0e41634ad86625d5356a4a3f1ba1f41568d0697df8f36f";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ future ];
+
+  # tests are not included with release
+  doCheck = false;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/mjdr/atsim_potentials;
+    description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62b77b187bc7..2bea7b3053b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -745,6 +745,8 @@ in {
 
   attrs = callPackage ../development/python-modules/attrs { };
 
+  atsim_potentials = callPackage ../development/python-modules/atsim_potentials { };
+
   audioread = callPackage ../development/python-modules/audioread { };
 
   audiotools = callPackage ../development/python-modules/audiotools { };

From 979f91567dc813b4132bb4cd7e941e78d6fcc134 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 19:30:47 -0400
Subject: [PATCH 2889/3253] pythonPackages.pyannotate: init at 1.0.6

---
 .../python-modules/pyannotate/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyannotate/default.nix

diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix
new file mode 100644
index 000000000000..5bcf07f10157
--- /dev/null
+++ b/pkgs/development/python-modules/pyannotate/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, six
+, mypy_extensions
+, typing
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.0.6";
+  pname = "pyannotate";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dbdc2a26cbf45490a650e976ba45f99abe9ddbf0af5746307914e5ef419e325e";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ six mypy_extensions ]
+    ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dropbox/pyannotate;
+    description = "Auto-generate PEP-484 annotations";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2bea7b3053b9..1a79b3b8be39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -416,6 +416,8 @@ in {
     inherit (pkgs) arrow-cpp cmake pkgconfig;
   };
 
+  pyannotate = callPackage ../development/python-modules/pyannotate { };
+
   pyatspi = callPackage ../development/python-modules/pyatspi { };
 
   pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };

From 648acbabcae11bef8c82e60a517bed5ed8fa192d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 19:31:12 -0400
Subject: [PATCH 2890/3253] pythonPackages.pytest-annotate: init at 1.0.2

---
 .../pytest-annotate/default.nix               | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-annotate/default.nix

diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
new file mode 100644
index 000000000000..581de7beeebc
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyannotate
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "1.0.2";
+  pname = "pytest-annotate";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3";
+  };
+
+  propagatedBuildInputs = [ pyannotate pytest ];
+
+  # not testing for a testing module...
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kensho-technologies/pytest-annotate;
+    description = "Generate PyAnnotate annotations from your pytest tests";
+    license = licenses.asl20;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a79b3b8be39..e07a1d7d7432 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1919,6 +1919,8 @@ in {
 
   pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { };
 
+  pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
+
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
 
   pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { };

From 1533099b9f95ae71d332597536dfb069cc374d5d Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 19:31:31 -0400
Subject: [PATCH 2891/3253] pythonPackages.pytest-ansible: init at 2.0.1

---
 .../python-modules/pytest-ansible/default.nix | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-ansible/default.nix

diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix
new file mode 100644
index 000000000000..09d8aa40e197
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-ansible/default.nix
@@ -0,0 +1,42 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, ansible
+, pytest
+, mock
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "2.0.1";
+  pname = "pytest-ansible";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "553f2bc9e64f8c871ad29b7d5c100f6e549fe85db26bd1ff5dda8b769bb38a3e";
+  };
+
+  patchPhase = ''
+    sed -i "s/'setuptools-markdown'//g" setup.py
+  '';
+
+  # requires pandoc < 2.0
+  # buildInputs = [ setuptools-markdown ];
+  checkInputs =  [ mock ];
+  propagatedBuildInputs = [ ansible pytest ];
+
+  # tests not included with release
+  doCheck = false;
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/jlaska/pytest-ansible;
+    description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e07a1d7d7432..5e5e6128f559 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1921,6 +1921,8 @@ in {
 
   pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
 
+  pytest-ansible = callPackage ../development/python-modules/pytest-ansible { };
+
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
 
   pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { };

From 56e277354aa46b12eb50799310ca1fe796454e5f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 17:32:13 -0400
Subject: [PATCH 2892/3253] pythonPackages.amqplib: 0.6.1 -> 1.0.2

---
 .../python-modules/amqplib/default.nix        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix
index 3699fdd5d499..682dee000144 100644
--- a/pkgs/development/python-modules/amqplib/default.nix
+++ b/pkgs/development/python-modules/amqplib/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, buildPythonPackage, fetchurl }:
+{ stdenv, buildPythonPackage, fetchPypi, python }:
 
 buildPythonPackage rec {
   pname = "amqplib";
-  version = "0.6.1";
+  version = "1.0.2";
 
-  src = fetchurl {
-    url = https://github.com/barryp/py-amqplib/archive/0.6.1.tar.gz;
-    sha256 = "04nsn68wz9m24rvbssirkyighazbn20j60wjmi0r7jcpcf00sb3s";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "tgz";
+    sha256 = "843d69b681a60afd21fbf50f310404ec67fcdf9d13dfcf6e9d41f3b456217e5b";
   };
 
-  # error: invalid command 'test'
+  # testing assumes network connection
   doCheck = false;
 
+  checkPhase = ''
+    ${python.interpreter} tests/client_0_8/run_all.py
+  '';
+
   meta = with stdenv.lib; {
-    homepage = http://code.google.com/p/py-amqplib/;
+    homepage = https://github.com/barryp/py-amqplib;
     description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
     license = licenses.lgpl21;
   };

From 08505d87d36c2219b50cd0c1bb43bfda8c8f5cad Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:48:15 -0400
Subject: [PATCH 2893/3253] pythonPackages.boto: 2.47.0 -> 2.49.0

refactor move to python-modules
---
 .../python-modules/boto/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 31 +--------------
 2 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/python-modules/boto/default.nix

diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix
new file mode 100644
index 000000000000..e58f071589a6
--- /dev/null
+++ b/pkgs/development/python-modules/boto/default.nix
@@ -0,0 +1,38 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, nose
+, mock
+, requests
+, httpretty
+}:
+
+buildPythonPackage rec {
+  pname = "boto";
+  version = "2.49.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} tests/test.py default
+  '';
+
+  checkInputs = [ nose mock ];
+  propagatedBuildInputs = [ requests httpretty ];
+
+  meta = with pkgs.lib; {
+    homepage = https://github.com/boto/boto;
+    license = licenses.mit;
+    description = "Python interface to Amazon Web Services";
+    longDescription = ''
+      The boto module is an integrated interface to current and
+      future infrastructural services offered by Amazon Web
+      Services.  This includes S3, SQS, EC2, among others.
+    '';
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e5e6128f559..72b5e0b97b03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1338,36 +1338,7 @@ in {
 
   bokeh = callPackage ../development/python-modules/bokeh { };
 
-  boto = buildPythonPackage rec {
-    name = "boto-${version}";
-    version = "2.47.0";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/boto/boto/archive/${version}.tar.gz";
-      sha256 = "051gq8z9m2cir03jhc00qs36bnpla7zkqm9xqiqcqvdknmi2ndbq";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} tests/test.py default
-    '';
-
-    buildInputs = [ self.nose self.mock ];
-    propagatedBuildInputs = [ self.requests self.httpretty ];
-
-    meta = {
-      homepage = https://github.com/boto/boto;
-
-      license = "bsd";
-
-      description = "Python interface to Amazon Web Services";
-
-      longDescription = ''
-        The boto module is an integrated interface to current and
-        future infrastructural services offered by Amazon Web
-        Services.  This includes S3, SQS, EC2, among others.
-      '';
-    };
-  };
+  boto = callPackage ../development/python-modules/boto { };
 
   boto3 = callPackage ../development/python-modules/boto3 { };
 

From 990da90083d2fb911143a4af5f682b4fe48c4839 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:23:25 -0400
Subject: [PATCH 2894/3253] pythonPackages.azure: refactor move to
 python-modules

---
 .../python-modules/azure/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +---------
 2 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure/default.nix

diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix
new file mode 100644
index 000000000000..c021e483d943
--- /dev/null
+++ b/pkgs/development/python-modules/azure/default.nix
@@ -0,0 +1,39 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, dateutil
+, futures
+, pyopenssl
+, requests
+, pythonOlder
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.11.0";
+  pname = "azure";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
+  };
+
+  propagatedBuildInputs = [ dateutil pyopenssl requests ]
+                            ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+  # depends on futures for python 3 (not necissary)
+  patchPhase = if (!isPy3k) then "" else ''
+    sed -i -e "s/'futures'//" setup.py
+  '';
+
+  # tests are not packaged in pypi release
+  doCheck = false;
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72b5e0b97b03..1ae2dfc76302 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -216,6 +216,8 @@ in {
 
   ansiconv = callPackage ../development/python-modules/ansiconv { };
 
+  azure = callPackage ../development/python-modules/azure { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -767,25 +769,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-  azure = buildPythonPackage rec {
-    version = "0.11.0";
-    name = "azure-${version}";
-    disabled = pythonOlder "2.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/azure/${name}.zip";
-      sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
-    };
-
-    propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];
-
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
 
   azure-nspkg = buildPythonPackage rec {
     version = "1.0.0";

From 1c397de0ff9a0453ca8c7659f9c2cd0d1acf9e80 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:24:46 -0400
Subject: [PATCH 2895/3253] pythonPackages.azure-common: refactor move to
 python-modules

---
 .../python-modules/azure-common/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 ++-----------
 2 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-common/default.nix

diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
new file mode 100644
index 000000000000..00cc67d34bd9
--- /dev/null
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -0,0 +1,32 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, azure-nspkg
+, isPyPy
+, python
+}:
+
+buildPythonPackage rec {
+  version = "1.0.0";
+  pname = "azure-common";
+  disabled = isPyPy;
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491";
+  };
+
+  propagatedBuildInputs = [ azure-nspkg ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ae2dfc76302..b779ab8a25e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -218,6 +218,8 @@ in {
 
   azure = callPackage ../development/python-modules/azure { };
 
+  azure-common = callPackage ../development/python-modules/azure-common { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -785,26 +787,6 @@ in {
     };
   };
 
-  azure-common = buildPythonPackage rec {
-    version = "1.0.0";
-    name = "azure-common-${version}";
-    disabled = isPyPy;
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-common/azure-common-1.0.0.zip;
-      sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491";
-    };
-    propagatedBuildInputs = with self; [ azure-nspkg ];
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-    '';
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-mgmt-common = buildPythonPackage rec {
     version = "0.20.0";
     name = "azure-mgmt-common-${version}";

From caaac35fffe7013227e5495a859defb3abb89a25 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:25:27 -0400
Subject: [PATCH 2896/3253] pythonPackages.azure-mgmt-common: refactor move to
 python-modules

---
 .../azure-mgmt-common/default.nix             | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 ++-----------
 2 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-common/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix
new file mode 100644
index 000000000000..5ba49d1f3f1f
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix
@@ -0,0 +1,33 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-common
+, azure-mgmt-nspkg
+, requests
+}:
+
+buildPythonPackage rec {
+  version = "0.20.0";
+  pname = "azure-mgmt-common";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
+  };
+
+  propagatedBuildInputs = [ azure-common azure-mgmt-nspkg requests ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b779ab8a25e1..4801ac847300 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -220,6 +220,8 @@ in {
 
   azure-common = callPackage ../development/python-modules/azure-common { };
 
+  azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -787,26 +789,6 @@ in {
     };
   };
 
-  azure-mgmt-common = buildPythonPackage rec {
-    version = "0.20.0";
-    name = "azure-mgmt-common-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip;
-      sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
-    };
-    propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests ];
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
-    '';
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-mgmt-compute = buildPythonPackage rec {
     version = "0.20.0";
     name = "azure-mgmt-compute-${version}";

From acb73361338956b0d5e108890e726b098e24f314 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:26:06 -0400
Subject: [PATCH 2897/3253] pythonPackages.azure-mgmt-compute: refactor move to
 python-modules

---
 .../azure-mgmt-compute/default.nix            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +-------------
 2 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-compute/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
new file mode 100644
index 000000000000..4ea60f2f29a5
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -0,0 +1,37 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-mgmt-common
+}:
+
+buildPythonPackage rec {
+  version = "0.20.0";
+  pname = "azure-mgmt-compute";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
+  };
+
+  preConfigure = ''
+    # Patch to make this package work on requests >= 2.11.x
+    # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+    sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
+  '';
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+  '';
+
+  propagatedBuildInputs = [ azure-mgmt-common ];
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4801ac847300..fb95b40888cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -222,6 +222,8 @@ in {
 
   azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { };
 
+  azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -789,31 +791,6 @@ in {
     };
   };
 
-  azure-mgmt-compute = buildPythonPackage rec {
-    version = "0.20.0";
-    name = "azure-mgmt-compute-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
-      sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
-    };
-    preConfigure = ''
-      # Patch to make this package work on requests >= 2.11.x
-      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
-      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
-    '';
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
-    '';
-    propagatedBuildInputs = with self; [ azure-mgmt-common ];
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-mgmt-network = buildPythonPackage rec {
     version = "0.20.1";
     name = "azure-mgmt-network-${version}";

From 3b49976b8af26d3143616f548d17bb3add18fd13 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:26:45 -0400
Subject: [PATCH 2898/3253] pythonPackages.azure-mgmt-network: refactor move to
 python-modules

---
 .../azure-mgmt-network/default.nix            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +-------------
 2 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-network/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
new file mode 100644
index 000000000000..fd47f8895fd4
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -0,0 +1,37 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, azure-mgmt-common
+, python
+}:
+
+buildPythonPackage rec {
+  version = "0.20.1";
+  pname = "azure-mgmt-network";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
+  };
+
+  preConfigure = ''
+    # Patch to make this package work on requests >= 2.11.x
+    # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+    sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
+  '';
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+  '';
+
+  propagatedBuildInputs = [ azure-mgmt-common ];
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb95b40888cf..87db5d400630 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -224,6 +224,8 @@ in {
 
   azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { };
 
+  azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -791,31 +793,6 @@ in {
     };
   };
 
-  azure-mgmt-network = buildPythonPackage rec {
-    version = "0.20.1";
-    name = "azure-mgmt-network-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
-      sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
-    };
-    preConfigure = ''
-      # Patch to make this package work on requests >= 2.11.x
-      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
-      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
-    '';
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
-    '';
-    propagatedBuildInputs = with self; [ azure-mgmt-common ];
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-mgmt-nspkg = buildPythonPackage rec {
     version = "1.0.0";
     name = "azure-mgmt-nspkg-${version}";

From 1675213fac242b0f2174b170fd04d35d8d271602 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:27:54 -0400
Subject: [PATCH 2899/3253] pythonPackages.azure-nspkg: refactor move to
 python-modules

---
 .../azure-mgmt-nspkg/default.nix              | 25 +++++++++++++
 .../python-modules/azure-nspkg/default.nix    | 22 ++++++++++++
 pkgs/top-level/python-packages.nix            | 36 +++----------------
 3 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
 create mode 100644 pkgs/development/python-modules/azure-nspkg/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
new file mode 100644
index 000000000000..aa037b48b4f5
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix
@@ -0,0 +1,25 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, azure-nspkg
+}:
+
+buildPythonPackage rec {
+  version = "1.0.0";
+  pname = "azure-mgmt-nspkg";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
+  };
+
+  propagatedBuildInputs = [ azure-nspkg ];
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix
new file mode 100644
index 000000000000..fb06758c5d40
--- /dev/null
+++ b/pkgs/development/python-modules/azure-nspkg/default.nix
@@ -0,0 +1,22 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "1.0.0";
+  pname = "azure-nspkg";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "293f286c15ea123761f30f5b1cb5adebe5f1e5009efade923c6dd1e017621bf7";
+  };
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87db5d400630..2e94571c72af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -218,6 +218,8 @@ in {
 
   azure = callPackage ../development/python-modules/azure { };
 
+  azure-nspkg = callPackage ../development/python-modules/azure-nspkg { };
+
   azure-common = callPackage ../development/python-modules/azure-common { };
 
   azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { };
@@ -226,6 +228,8 @@ in {
 
   azure-mgmt-network = callPackage ../development/python-modules/azure-mgmt-network { };
 
+  azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -777,38 +781,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-
-  azure-nspkg = buildPythonPackage rec {
-    version = "1.0.0";
-    name = "azure-nspkg-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-nspkg/azure-nspkg-1.0.0.zip;
-      sha256 = "1xqvc8by1lbd7j9dxyly03jz3rgbmnsiqnqgydhkf4pa2mn2hgr9";
-    };
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
-  azure-mgmt-nspkg = buildPythonPackage rec {
-    version = "1.0.0";
-    name = "azure-mgmt-nspkg-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-nspkg/azure-mgmt-nspkg-1.0.0.zip;
-      sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
-    };
-    propagatedBuildInputs = with self; [ azure-nspkg ];
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-mgmt-resource = buildPythonPackage rec {
     version = "0.20.1";
     name = "azure-mgmt-resource-${version}";

From 071053bcb03001597e4b4e926c40c88cac095092 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:29:12 -0400
Subject: [PATCH 2900/3253] pythonPackages.azure-mgmt-storage: refactor move to
 python-modules

---
 .../azure-mgmt-storage/default.nix            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-storage/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
new file mode 100644
index 000000000000..2e0523bb25cc
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -0,0 +1,37 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-mgmt-common
+}:
+
+buildPythonPackage rec {
+  version = "0.20.0";
+  pname = "azure-mgmt-storage";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
+  };
+
+  preConfigure = ''
+    # Patch to make this package work on requests >= 2.11.x
+    # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+    sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
+  '';
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+  '';
+
+  propagatedBuildInputs = [ azure-mgmt-common ];
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e94571c72af..43c4c2e275a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,6 +230,8 @@ in {
 
   azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { };
 
+  azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};

From 110afaae5cd5e59f3c7573434cb9c0c23e74faab Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:30:56 -0400
Subject: [PATCH 2901/3253] pythonPackages.azure-mgmt-resource: refactor move
 to python-modules

---
 .../azure-mgmt-resource/default.nix           | 38 ++++++++++++++
 pkgs/top-level/python-packages.nix            | 52 +------------------
 2 files changed, 40 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-mgmt-resource/default.nix

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
new file mode 100644
index 000000000000..b60e3aee3402
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -0,0 +1,38 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-mgmt-common
+}:
+
+
+buildPythonPackage rec {
+  version = "0.20.1";
+  pname = "azure-mgmt-resource";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
+  };
+
+  preConfigure = ''
+    # Patch to make this package work on requests >= 2.11.x
+    # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+    sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
+  '';
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+  '';
+
+  propagatedBuildInputs = [ azure-mgmt-common ];
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43c4c2e275a6..4d773612f186 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -230,6 +230,8 @@ in {
 
   azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { };
 
+  azure-mgmt-resource = callPackage ../development/python-modules/azure-mgmt-resource { };
+
   azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { };
 
   backports_csv = callPackage ../development/python-modules/backports_csv {};
@@ -783,56 +785,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-  azure-mgmt-resource = buildPythonPackage rec {
-    version = "0.20.1";
-    name = "azure-mgmt-resource-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
-      sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
-    };
-    preConfigure = ''
-      # Patch to make this package work on requests >= 2.11.x
-      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
-      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
-    '';
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
-    '';
-    propagatedBuildInputs = with self; [ azure-mgmt-common ];
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
-  azure-mgmt-storage = buildPythonPackage rec {
-    version = "0.20.0";
-    name = "azure-mgmt-storage-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
-      sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
-    };
-    preConfigure = ''
-      # Patch to make this package work on requests >= 2.11.x
-      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
-      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
-    '';
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
-    '';
-    propagatedBuildInputs = with self; [ azure-mgmt-common ];
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-storage = buildPythonPackage rec {
     version = "0.20.3";
     name = "azure-storage-${version}";

From 5d26b1b9c0f9e04103ef4193819b7c0b2ec7fe7f Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:31:40 -0400
Subject: [PATCH 2902/3253] pythonPackages.azure-storage: refactor move to
 python-modules

---
 .../python-modules/azure-storage/default.nix  | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 ++---------
 2 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-storage/default.nix

diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix
new file mode 100644
index 000000000000..6693a7464d43
--- /dev/null
+++ b/pkgs/development/python-modules/azure-storage/default.nix
@@ -0,0 +1,35 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, python
+, azure-common
+, futures
+, dateutil
+, requests
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.20.3";
+  pname = "azure-storage";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
+  };
+
+  propagatedBuildInputs = [ azure-common dateutil requests ]
+                            ++ pkgs.lib.optionals (!isPy3k) [ futures ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d773612f186..da8d303ead5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -234,6 +234,8 @@ in {
 
   azure-mgmt-storage = callPackage ../development/python-modules/azure-mgmt-storage { };
 
+  azure-storage = callPackage ../development/python-modules/azure-storage { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -785,25 +787,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-  azure-storage = buildPythonPackage rec {
-    version = "0.20.3";
-    name = "azure-storage-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip;
-      sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
-    };
-    propagatedBuildInputs = with self; [ azure-common futures dateutil requests ];
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-    '';
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   azure-servicemanagement-legacy = buildPythonPackage rec {
     version = "0.20.1";
     name = "azure-servicemanagement-legacy-${version}";

From 9a5aaf34211b9dd53d45751226ffd83159c27d06 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 12:32:20 -0400
Subject: [PATCH 2903/3253] pythonPackages.azure-servicemanagement-lagacy:
 refactor move to python-modules

---
 .../default.nix                               | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 ++-----------
 2 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix

diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
new file mode 100644
index 000000000000..8fb27be0e51f
--- /dev/null
+++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix
@@ -0,0 +1,31 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, azure-common
+, requests
+, python
+}:
+
+buildPythonPackage rec {
+  version = "0.20.1";
+  pname = "azure-servicemanagement-legacy";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs";
+  };
+
+  propagatedBuildInputs = [ azure-common requests ];
+
+  postInstall = ''
+    echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Microsoft Azure SDK for Python";
+    homepage = "https://azure.microsoft.com/en-us/develop/python/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ olcai ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da8d303ead5c..30e23885f14d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -236,6 +236,8 @@ in {
 
   azure-storage = callPackage ../development/python-modules/azure-storage { };
 
+  azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
@@ -787,25 +789,6 @@ in {
 
   noise = callPackage ../development/python-modules/noise {};
 
-  azure-servicemanagement-legacy = buildPythonPackage rec {
-    version = "0.20.1";
-    name = "azure-servicemanagement-legacy-${version}";
-    src = pkgs.fetchurl {
-      url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip;
-      sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs";
-    };
-    propagatedBuildInputs = with self; [ azure-common requests ];
-    postInstall = ''
-      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
-    '';
-    meta = {
-      description = "Microsoft Azure SDK for Python";
-      homepage = "https://azure.microsoft.com/en-us/develop/python/";
-      license = licenses.asl20;
-      maintainers = with maintainers; [ olcai ];
-    };
-  };
-
   backcall = callPackage ../development/python-modules/backcall { };
 
   backports_abc = callPackage ../development/python-modules/backports_abc { };

From e79d93a848565478e3eea1c7d7690ec8d355f8dd Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 10 Oct 2018 14:55:38 +0200
Subject: [PATCH 2904/3253] pythonPackages.django: 1.11.15 -> 1.11.16

See https://docs.djangoproject.com/en/1.11/releases/1.11.16/
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index ba65297dbb9c..c8c9267265d9 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.15";
+  version = "1.11.16";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi";
+    sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9";
   };
 
   patches = stdenv.lib.optionals withGdal [

From b80f6ea733cc2280d3a9ae07d20b0eb3b8ea9541 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 10 Oct 2018 14:57:45 +0200
Subject: [PATCH 2905/3253] pythonPackages.django_2_1: 2.0.8 -> 2.0.9

See https://docs.djangoproject.com/en/2.0/releases/2.0.9/
---
 pkgs/development/python-modules/django/2_0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index 0bfe43a20e18..bf04f5e61197 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.0.8";
+  version = "2.0.9";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8";
+    sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 66a11d365c04454d55af5df3061380f4d89f1daf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 10 Oct 2018 14:58:51 +0200
Subject: [PATCH 2906/3253] pythonPackages.django_2_1: 2.1.1 -> 2.1.2

See https://docs.djangoproject.com/en/2.1/releases/2.1.2/
---
 pkgs/development/python-modules/django/2_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix
index f66215c84db1..f79a7c49ca9b 100644
--- a/pkgs/development/python-modules/django/2_1.nix
+++ b/pkgs/development/python-modules/django/2_1.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.1.1";
+  version = "2.1.2";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71";
+    sha256 = "0ibbs76pzy8zd47yviljrp1s66fmbf5b62fixayaznj7pdzavg7g";
   };
 
   patches = stdenv.lib.optionals withGdal [

From a3b28907289c0fcabfe89a39886ae2acab6b2fd4 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 01:53:40 -0400
Subject: [PATCH 2907/3253] pythonPackages.fdint: init at 2.0.2

---
 .../python-modules/fdint/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/fdint/default.nix

diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix
new file mode 100644
index 000000000000..869e26d675a3
--- /dev/null
+++ b/pkgs/development/python-modules/fdint/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cython
+, numpy
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "2.0.2";
+  pname = "fdint";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "30db139684d362652670e2cd3206b5dd7b3b93b86c3aff37f4b4fd4a3f98aead";
+  };
+
+  buildInputs = [ cython ];
+  propagatedBuildInputs = [ numpy ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} -m fdint.tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/scott-maddox/fdint;
+    description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30e23885f14d..437c1b94749b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -330,6 +330,8 @@ in {
 
   fire = callPackage ../development/python-modules/fire { };
 
+  fdint = callPackage ../development/python-modules/fdint { };
+
   fuse = callPackage ../development/python-modules/fuse-python { fuse = pkgs.fuse; };
 
   genanki = callPackage ../development/python-modules/genanki { };

From e8bcf55d34faa1636f9d491c590fd3b757ee0a65 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 01:33:00 -0400
Subject: [PATCH 2908/3253] python36Packages.pyvoro: init at 1.3.2

python wrapper to voro++
---
 .../python-modules/pyvoro/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyvoro/default.nix

diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix
new file mode 100644
index 000000000000..83bdcec86bd2
--- /dev/null
+++ b/pkgs/development/python-modules/pyvoro/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "1.3.2";
+  pname = "pyvoro";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc";
+  };
+
+  # No tests in package
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/joe-jordan/pyvoro;
+    description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 437c1b94749b..a8cfcdbdc432 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -574,6 +574,8 @@ in {
 
   pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });
 
+  pyvoro = callPackage ../development/python-modules/pyvoro { };
+
   relatorio = callPackage ../development/python-modules/relatorio { };
 
   pyzufall = callPackage ../development/python-modules/pyzufall { };

From 343a5b4e63a991c28c7981fabf99b513f35478e5 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Thu, 20 Sep 2018 15:57:05 -0400
Subject: [PATCH 2909/3253] pythonPackages.nest-asyncio: init at 0.9.1

---
 .../python-modules/nest-asyncio/default.nix   | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/nest-asyncio/default.nix

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
new file mode 100644
index 000000000000..7cfc42e352b6
--- /dev/null
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  version = "0.9.1";
+  pname = "nest_asyncio";
+  disabled = !(pythonAtLeast "3.5");
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0844af67deda3243389d47cd8754b6775c5c828345e0277beca7bd008d273392";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/erdewit/nest_asyncio;
+    description = "Patch asyncio to allow nested event loops";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8cfcdbdc432..524556732be3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -382,6 +382,8 @@ in {
 
   mwoauth = callPackage ../development/python-modules/mwoauth { };
 
+  nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
+
   neuron = pkgs.neuron.override {
     inherit python;
   };

From 08d2c98e2ba5399dd36fede68c1ac228035e332c Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 21 Sep 2018 15:16:14 -0400
Subject: [PATCH 2910/3253] pythonPackages.gsd: init at 1.5.2

---
 .../python-modules/gsd/default.nix            | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/gsd/default.nix

diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
new file mode 100644
index 000000000000..d6c6a41ae084
--- /dev/null
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+}:
+
+buildPythonPackage rec {
+  version = "1.5.2";
+  pname = "gsd";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ce73a9bc7b79968a2b96cc2b0934e2cbe11700adbd02b4b492fea1e3d4d51f4";
+  };
+
+  propagatedBuildInputs = [ numpy ];
+
+  # tests not packaged with gsd
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/glotzer/gsd;
+    description = "General simulation data file format";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 524556732be3..f55fbfc6c5ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -340,6 +340,8 @@ in {
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };
 
+  gsd = callPackage ../development/python-modules/gsd { };
+
   gssapi = callPackage ../development/python-modules/gssapi { };
 
   h5py = callPackage ../development/python-modules/h5py {

From 5410e6b6b6b15721e0591c9b73b1d1bb1721d489 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 13 Oct 2018 10:10:02 +0200
Subject: [PATCH 2911/3253] maintainers: add delroth

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e7756f0bff11..3a50eb2819b8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -986,6 +986,11 @@
     github = "deepfire";
     name = "Kosyrev Serge";
   };
+  delroth = {
+    email = "delroth@gmail.com";
+    github = "delroth";
+    name = "Pierre Bourdon";
+  };
   deltaevo = {
     email = "deltaduartedavid@gmail.com";
     github = "DeltaEvo";

From 86d644f8cc85234e10165989ebc25e1da5135e99 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 13 Oct 2018 10:07:05 +0200
Subject: [PATCH 2912/3253] prometheus-tor-exporter: init at 0.3

Upstream: https://github.com/atx/prometheus-tor_exporter
---
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../monitoring/prometheus/exporters/tor.nix   | 40 +++++++++++++++++++
 .../monitoring/prometheus/tor-exporter.nix    | 37 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 79 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/tor.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/tor-exporter.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index ae8caac436da..950af848c0f6 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -30,6 +30,7 @@ let
     postfix   = import ./exporters/postfix.nix   { inherit config lib pkgs; };
     snmp      = import ./exporters/snmp.nix      { inherit config lib pkgs; };
     surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; };
+    tor       = import ./exporters/tor.nix       { inherit config lib pkgs; };
     unifi     = import ./exporters/unifi.nix     { inherit config lib pkgs; };
     varnish   = import ./exporters/varnish.nix   { inherit config lib pkgs; };
   };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
new file mode 100644
index 000000000000..0e2a13c44ab7
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.tor;
+in
+{
+  port = 9130;
+  extraOpts = {
+    torControlAddress = mkOption {
+      type = types.str;
+      default = "127.0.0.1";
+      description = ''
+        Tor control IP address or hostname.
+      '';
+    };
+
+    torControlPort = mkOption {
+      type = types.int;
+      default = 9051;
+      description = ''
+        Tor control port.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \
+          -b ${cfg.listenAddress} \
+          -p ${toString cfg.port} \
+          -a ${cfg.torControlAddress} \
+          -c ${toString cfg.torControlPort} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix
new file mode 100644
index 000000000000..88f469ebe179
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix
@@ -0,0 +1,37 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "tor-exporter-${version}";
+  version = "0.3";
+
+  # Just a single .py file to use as the application's main entry point.
+  format = "other";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "atx";
+    repo = "prometheus-tor_exporter";
+    sha256 = "0d7pk8s8ya2pm8b4ijbfdniqcbd3vqy15dlhnmaf4wgb51pmm5yv";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ];
+
+  installPhase = ''
+    mkdir -p $out/share/
+    cp prometheus-tor-exporter.py $out/share/
+  '';
+
+  fixupPhase = ''
+    makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-tor-exporter" \
+          --set PYTHONPATH "$PYTHONPATH" \
+          --add-flags "$out/share/prometheus-tor-exporter.py"
+  '';
+
+  meta = with lib; {
+    description = "Prometheus exporter that exposes metrics from a Tor daemon";
+    homepage = https://github.com/atx/prometheus-tor_exporter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ delroth ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f4bc519285f..e837d5049f84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13530,6 +13530,7 @@ with pkgs;
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix {
     buildGoPackage = buildGo110Package;
   };
+  prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
   prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
   prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
   prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };

From 489d120ef508e6e605ba2091e9decd898b1dafd0 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 00:58:07 -0400
Subject: [PATCH 2913/3253] pythonPackages.progress: init at 1.4

---
 .../python-modules/progress/default.nix       | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/progress/default.nix

diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix
new file mode 100644
index 000000000000..4b8269136ad2
--- /dev/null
+++ b/pkgs/development/python-modules/progress/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  version = "1.4";
+  pname = "progress";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a";
+  };
+
+  # tests not packaged with pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} test_progress.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/verigak/progress/;
+    description = "Easy to use progress bars";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f55fbfc6c5ff..563494605464 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -428,6 +428,8 @@ in {
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
+  progress = callPackage ../development/python-modules/progress { };
+
   pymysql = callPackage ../development/python-modules/pymysql { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };

From 77e8b33cb74e9900afad523a282adbef3d0950d6 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 00:58:37 -0400
Subject: [PATCH 2914/3253] pythonPackages.imutils: init at 0.5.1

---
 .../python-modules/imutils/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/imutils/default.nix

diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix
new file mode 100644
index 000000000000..4afdb1a1dc9c
--- /dev/null
+++ b/pkgs/development/python-modules/imutils/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, opencv3
+}:
+
+buildPythonPackage rec {
+  version = "0.5.1";
+  pname = "imutils";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "37d17adc9e71386c59b28f4ef5972ef6fe0023714fa1a652b8edc83f7ce0654c";
+  };
+
+  propagatedBuildInputs = [ opencv3 ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/jrosebr1/imutils;
+    description = "A series of convenience functions to make basic image processing functions";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 563494605464..efec8fda7d11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -360,6 +360,8 @@ in {
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };
 
+  imutils = callPackage ../development/python-modules/imutils { };
+
   intelhex = callPackage ../development/python-modules/intelhex { };
 
   jira = callPackage ../development/python-modules/jira { };

From 045a4a4b724fe344ad1f65edff44b8d824e3e79e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 00:58:59 -0400
Subject: [PATCH 2915/3253] pythonPackages.vidstab: init at 0.1.5

---
 .../python-modules/vidstab/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/vidstab/default.nix

diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix
new file mode 100644
index 000000000000..8697d5dc4427
--- /dev/null
+++ b/pkgs/development/python-modules/vidstab/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, pandas
+, imutils
+, progress
+, matplotlib
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.1.5";
+  pname = "vidstab";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b775652cc4f41812de04bc443ad522c1bdaef456a00c74857e9ebc5d2066e362";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ];
+
+  # tests not packaged with pypi
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/AdamSpannbauer/python_video_stab;
+    description = "Video Stabilization using OpenCV";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index efec8fda7d11..7136ce18d9da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -646,6 +646,8 @@ in {
 
   unifi = callPackage ../development/python-modules/unifi { };
 
+  vidstab = callPackage ../development/python-modules/vidstab { };
+
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };
 
   # packages defined here

From 4ed993367f085b8881e71cb86ed1e31800d62279 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 13 Oct 2018 03:12:26 -0500
Subject: [PATCH 2916/3253] arrow-cpp: 0.10.0 -> 0.11.0 (#48066)

* arrow-cpp: 0.10.0 -> 0.11.0

* arrow-cpp: enable testing
---
 .../libraries/arrow-cpp/default.nix           | 49 ++++++++++++++++---
 .../arrow-cpp/double-conversion_cmake.patch   | 43 ++++++++++++++++
 .../libraries/parquet-cpp/default.nix         | 39 ---------------
 .../python-modules/pyarrow/default.nix        | 18 ++-----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 90 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch
 delete mode 100644 pkgs/development/libraries/parquet-cpp/default.nix

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 16fc7e0c960d..77ce77dee5ad 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,42 +1,75 @@
-{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }:
+{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
+
+let
+  parquet-testing = fetchFromGitHub {
+    owner = "apache";
+    repo = "parquet-testing";
+    rev = "46ae2605c2de306f5740587107dcf333a527f2d1";
+    sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik";
+  };
+in
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
+    sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
 
-  # patch to fix python-test
-  patches = [ ./darwin.patch ];
+  patches = [
+    # fix ARROW-3467
+    ./double-conversion_cmake.patch
+
+    # patch to fix python-test
+    ./darwin.patch
+    ];
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost python.pkgs.python python.pkgs.numpy ];
+  buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ];
 
   preConfigure = ''
+    substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
     substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
+    substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
     substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
     substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
+
+    patchShebangs build-support/
   '';
 
   BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; };
+  DOUBLE_CONVERSION_HOME = double-conversion;
   FLATBUFFERS_HOME = flatbuffers;
-  GTEST_HOME = gtest;
   GFLAGS_HOME = gflags;
+  GLOG_HOME = glog;
+  GTEST_HOME = gtest;
   LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
   RAPIDJSON_HOME = rapidjson;
   SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
-  ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; };
+  THRIFT_HOME = thrift;
+  ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; };
   ZSTD_HOME = zstd;
 
   cmakeFlags = [
     "-DARROW_PYTHON=ON"
+    "-DARROW_PARQUET=ON"
   ];
 
+  doInstallCheck = true;
+  PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null;
+  installCheckInputs = [ perl which ];
+  installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
+    for f in release/*-test; do
+      install_name_tool -add_rpath "$out"/lib  "$f"
+    done
+  '') + ''
+    ctest -L unittest -V
+  '';
+
   meta = {
     description = "A  cross-language development platform for in-memory data";
     homepage = https://arrow.apache.org/;
diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch
new file mode 100644
index 000000000000..336fdde9e8fb
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,7 +615,7 @@ endif(UNIX)
+ set(ARROW_LINK_LIBS)
+ 
+ # Libraries to link statically with libarrow.so
+-set(ARROW_STATIC_LINK_LIBS double-conversion)
++set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET})
+ 
+ if (ARROW_WITH_BROTLI)
+   SET(ARROW_STATIC_LINK_LIBS
+@@ -694,7 +694,7 @@ else ()
+   set(ARROW_MIN_TEST_LIBS
+     arrow_shared
+     ${ARROW_LINK_LIBS}
+-    double-conversion
++    ${DOUBLE_CONVERSION_TARGET}
+     ${BOOST_SYSTEM_LIBRARY}
+     ${BOOST_FILESYSTEM_LIBRARY}
+     ${BOOST_REGEX_LIBRARY}
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "")
+   set(DOUBLE_CONVERSION_VENDORED 1)
+ else()
+   find_package(double-conversion REQUIRED)
++  set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion)
+   set(DOUBLE_CONVERSION_VENDORED 0)
+ endif()
+ 
+ include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR})
+-ADD_THIRDPARTY_LIB(double-conversion
+-  STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
+ 
+ if (DOUBLE_CONVERSION_VENDORED)
++  ADD_THIRDPARTY_LIB(double-conversion
++    STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
++  set(DOUBLE_CONVERSION_TARGET double-conversion)
+   add_dependencies(arrow_dependencies double-conversion_ep)
+ endif()
+ 
diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix
deleted file mode 100644
index 804ddb136f03..000000000000
--- a/pkgs/development/libraries/parquet-cpp/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "parquet-cpp-${version}";
-  version = "1.5.0";
-
-  src = fetchurl {
-    url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz";
-    sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli";
-  };
-
-  patches = [ ./api.patch ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost ];
-
-  preConfigure = ''
-    substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
-    substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
-  '';
-
-  ARROW_HOME = arrow-cpp;
-  THRIFT_HOME = thrift;
-  GTEST_HOME = gtest;
-  SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
-  ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; };
-
-  cmakeFlags = [
-    "-DPARQUET_BUILD_BENCHMARKS=OFF"
-  ];
-
-  meta = {
-    description = "A C++ library to read and write the Apache Parquet columnar data format";
-    homepage = http://parquet.apache.org;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ veprbl ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index e73b1717331c..8ebb88fa6a73 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,8 +1,7 @@
-{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, fetchurl, arrow-cpp, cmake, cython, futures, JPype1, numpy, pandas, pytest, pytestrunner, pkgconfig, setuptools_scm, six }:
 
 let
-  _arrow-cpp = arrow-cpp.override { inherit python;};
-  _parquet-cpp = parquet-cpp.override { arrow-cpp = _arrow-cpp; };
+  _arrow-cpp = arrow-cpp.override { inherit python; };
 in
 
 buildPythonPackage rec {
@@ -17,18 +16,11 @@ buildPythonPackage rec {
   checkInputs = [ pandas pytest pytestrunner JPype1 ];
 
   PYARROW_BUILD_TYPE = "release";
-  PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib";
-
-  preBuild = ''
-    substituteInPlace CMakeLists.txt --replace "\''${ARROW_ABI_VERSION}" '"0.0.0"'
-    substituteInPlace CMakeLists.txt --replace "\''${ARROW_SO_VERSION}" '"0"'
-
-    # fix the hardcoded value
-    substituteInPlace cmake_modules/FindParquet.cmake --replace 'set(PARQUET_ABI_VERSION "1.0.0")' 'set(PARQUET_ABI_VERSION "${_parquet-cpp.version}")'
-  '';
+  PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib";
 
   preCheck = ''
     rm pyarrow/tests/test_hdfs.py
+    rm pyarrow/tests/test_cuda.py
 
     # fails: "ArrowNotImplementedError: Unsupported numpy type 22"
     substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled"
@@ -47,7 +39,7 @@ buildPythonPackage rec {
   '';
 
   ARROW_HOME = _arrow-cpp;
-  PARQUET_HOME = _parquet-cpp;
+  PARQUET_HOME = _arrow-cpp;
 
   setupPyBuildFlags = ["--with-parquet" ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0abf0e608466..8fcf0baba02d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -207,6 +207,7 @@ mapAliases ({
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
+  parquet-cpp = arrow-cpp; # added 2018-09-08
   pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f4bc519285f..e05d180457ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11600,8 +11600,6 @@ with pkgs;
 
   paperkey = callPackage ../tools/security/paperkey { };
 
-  parquet-cpp = callPackage ../development/libraries/parquet-cpp {};
-
   pangoxsl = callPackage ../development/libraries/pangoxsl { };
 
   pcaudiolib = callPackage ../development/libraries/pcaudiolib {

From fd9d45c7c146c6b7dc59f9ab950cac00ccb1ae1d Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Sun, 7 Oct 2018 21:54:34 +0000
Subject: [PATCH 2917/3253] pythonPackages.mypy_extensions: use typing from
 stdlib on >=3.5

It's not necessary to depend on the "typing" backport since it's in
the standard library; I also observed serious breakage in anything
using the typing module (including) when the backport was in the
closure on >=3.5.
---
 pkgs/development/python-modules/mypy/extensions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/extensions.nix b/pkgs/development/python-modules/mypy/extensions.nix
index f57ac12c0da8..36407fd684ae 100644
--- a/pkgs/development/python-modules/mypy/extensions.nix
+++ b/pkgs/development/python-modules/mypy/extensions.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, typing, isPy3k }:
+{ stdenv, fetchPypi, buildPythonPackage, typing, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "mypy_extensions";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "04h8brrbbx151dfa2cvvlnxgmb5wa00mhd2z7nd20s8kyibfkq1p";
   };
 
-  propagatedBuildInputs = [ typing ];
+  propagatedBuildInputs = if pythonOlder "3.5" then [ typing ] else [ ];
 
   meta = with stdenv.lib; {
     description = "Experimental type system extensions for programs checked with the mypy typechecker";

From fcbec42fc838d7bf99406796b41322be75f23717 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 5 Oct 2018 15:46:26 -0400
Subject: [PATCH 2918/3253] pythonPackages.histbook: init at 1.2.3

---
 .../python-modules/histbook/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/histbook/default.nix

diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix
new file mode 100644
index 000000000000..8c44bd3ebdae
--- /dev/null
+++ b/pkgs/development/python-modules/histbook/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, numpy, pandas }:
+
+buildPythonPackage rec {
+  pname = "histbook";
+  version = "1.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "12d5l4c5pxwac5hzcfif51j87qjljm0w9nd0c8pnhj7q2snap4x4";
+  };
+
+  propagatedBuildInputs = [ numpy pandas ];
+
+  meta = with lib; {
+    homepage = https://github.com/scikit-hep/histbook;
+    description = "Versatile, high-performance histogram toolkit for Numpy";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7136ce18d9da..27f6d3b0b9e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -356,6 +356,8 @@ in {
 
   habanero = callPackage ../development/python-modules/habanero { };
 
+  histbook = callPackage ../development/python-modules/histbook { };
+
   httpsig = callPackage ../development/python-modules/httpsig { };
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };

From 24c6f141c2a5442853fd549f2b7f96492063fc13 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 2 Oct 2018 19:56:28 +0300
Subject: [PATCH 2919/3253] pythonPackages.XlsxWriter: 1.0.9 -> 1.1.1

---
 pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index 71229b886e7b..8b7caef8eda5 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "XlsxWriter";
-  version = "1.0.9";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "98a94b32d4929d3e34595b4654b8e7f951182f540056b9cb734c88899912f729";
+    sha256 = "15yhjbx1xwdbfkg0l1c1wgjayb55zgm8rywjymj655yaqiammm5r";
   };
 
   meta = {

From 69af83b202743f53e7488d0167c712bb95efd612 Mon Sep 17 00:00:00 2001
From: Herman Fries <h.fries@nyris.io>
Date: Fri, 21 Sep 2018 11:36:43 +0200
Subject: [PATCH 2920/3253] tensorflow: Add contrib/tensor_forest to rpath

---
 pkgs/development/python-modules/tensorflow/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index b09da2d4cecf..cad2a93640ae 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -72,7 +72,7 @@ in buildPythonPackage rec {
       ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]);
   in
   lib.optionalString (stdenv.isLinux) ''
-    rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}"
+    rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
     internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
     find $out -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \;
   '';

From fc92b6167fa90a4116ce06c71cea1b1023a44156 Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <me@sephalon.net>
Date: Tue, 9 Oct 2018 23:26:00 +0200
Subject: [PATCH 2921/3253] jameica: 2.8.1 -> 2.8.2

---
 pkgs/applications/office/jameica/default.nix | 24 ++++++--------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix
index 8d17ef2acaa4..61cc3ea78f05 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }:
+{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
 
 let
-  _version = "2.8.1";
-  _build = "449";
+  _version = "2.8.2";
+  _build = "450";
   version = "${_version}-${_build}";
   name = "jameica-${version}";
 
@@ -23,7 +23,7 @@ in
 stdenv.mkDerivation rec {
   inherit name version;
 
-  nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ];
+  nativeBuildInputs = [ ant jdk makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
                 ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
@@ -31,23 +31,13 @@ stdenv.mkDerivation rec {
     owner = "willuhn";
     repo = "jameica";
     rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
-    sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2";
+    sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68";
   };
 
   # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
   # and is not able to build the application itself
   buildPhase = ''
-    (cd build; ant init compile jar)
-  '';
-
-  # jameica itself loads ./plugin.xml to determine it's version.
-  # Unfortunately, the version attribute there seems to be wrong,
-  # so it thinks it's older than it really is,
-  # and refuses to load plugins destined for its version.
-  # Set version manually to workaround that.
-  postPatch = ''
-    xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new
-    mv plugin.xml.new plugin.xml
+    (cd build; ant -Dsystem.version=${version} init compile jar)
   '';
 
   installPhase = ''
@@ -73,7 +63,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.willuhn.de/products/jameica/;
-    description = "Free Runtime Environment for Java Applications.";
+    description = "Free Runtime Environment for Java Applications";
     longDescription = ''
       Runtime Environment for plugins like Hibiscus (HBCI Online Banking),
       SynTAX (accounting) and JVerein (club management).

From 95db49f5c3f91dcc906103b2b78b3b4d43fbf671 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sat, 13 Oct 2018 10:44:56 +0200
Subject: [PATCH 2922/3253] go-sct: 20160529 -> 20180605

---
 pkgs/tools/X11/go-sct/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
index 189dc56975f3..c750a5ce1c66 100644
--- a/pkgs/tools/X11/go-sct/default.nix
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, xorg, buildGoPackage, fetchgit }:
+{ stdenv, xorg, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "go-sct-${version}";
-  version = "20160529-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "1d6b5e05a0b63bfeac9df55003efec352e1bc19d";
+  version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
 
   goPackagePath = "github.com/d4l3k/go-sct";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
     inherit rev;
-    url = "https://github.com/d4l3k/go-sct";
-    sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7";
+    owner = "d4l3k";
+    repo = "go-sct";
+    sha256 = "16z2ml9x424cnliazyxlw7pm7q64pppjam3dnmq2xab0wlbbm3nm";
   };
 
   goDeps = ./deps.nix;
@@ -20,7 +21,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
     license = licenses.mit;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ rvolosatovs cstrahan ];
+    platforms = platforms.linux ++ platforms.windows;
   };
 }

From c15006d410d053da4a70e23e1d82d7b9a2928381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@github.danieldk.eu>
Date: Sat, 13 Oct 2018 11:27:54 +0200
Subject: [PATCH 2923/3253] liblinear: 2.20 -> 2.21 (#48304)

---
 pkgs/development/libraries/liblinear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index ea05df45169f..5f295009b994 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "liblinear-${version}";
-  version = "2.20";
+  version = "2.21";
 
   src = fetchurl {
     url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz";
-    sha256 = "13q48azqy9pd8jyhk0c2hzj5xav1snbdrj8pp38vwrv2wwhfz7rz";
+    sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs";
   };
 
   buildPhase = ''

From b6421bfec41c82d46350c9120decf0ca4f533b85 Mon Sep 17 00:00:00 2001
From: Ben Challenor <ben@challenor.org>
Date: Sat, 13 Oct 2018 09:47:41 +0100
Subject: [PATCH 2924/3253] jenkins: add update script

---
 .../tools/continuous-integration/jenkins/update.sh  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100755 pkgs/development/tools/continuous-integration/jenkins/update.sh

diff --git a/pkgs/development/tools/continuous-integration/jenkins/update.sh b/pkgs/development/tools/continuous-integration/jenkins/update.sh
new file mode 100755
index 000000000000..e8b6d9257758
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/jenkins/update.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts jq
+
+set -eu -o pipefail
+
+core_json="$(curl --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)"
+
+version="$(jq -r .version <<<$core_json)"
+sha256="$(jq -r .sha256 <<<$core_json)"
+hash="$(nix-hash --type sha256 --to-base32 "$sha256")"
+url="$(jq -r .url <<<$core_json)"
+
+update-source-version jenkins "$version" "$hash" "$url"

From 88e7d7b350c4012f413c0a308e7248f15a6524ab Mon Sep 17 00:00:00 2001
From: Ben Challenor <ben@challenor.org>
Date: Sat, 13 Oct 2018 09:55:29 +0100
Subject: [PATCH 2925/3253] jenkins: 2.138.1 -> 2.138.2

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index a6a6e9a11054..0f7fc4804906 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.138.1";
+  version = "2.138.2";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c";
+    sha256 = "10qyr8izngnhlr1b03a9vdnbmwprbqsjnd55hjdalmxy6dq5mvfq";
   };
 
   buildCommand = ''

From 4283eca2658dfa9f208b4c2853ce06440bd878d2 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Sat, 13 Oct 2018 11:55:26 +0200
Subject: [PATCH 2926/3253] teamspeak_server: 3.3.0 -> 3.4.0

---
 .../networking/instant-messengers/teamspeak/server.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index bd1346b12194..e3566c50962b 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 let
-  version = "3.3.0";
+  version = "3.4.0";
   arch = if stdenv.is64bit then "amd64" else "x86";
   libDir = if stdenv.is64bit then "lib64" else "lib";
 in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
     ];
     sha256 = if stdenv.is64bit
-      then "1jv5c1br3ypxz8px7fl5rg75j0kfdg8mqasdk2gka6yvgf7qc97i"
-      else "0m889xl9iz3fmq7wyjjn42swprpspagbkn52a82nzkhgvagd45bz";
+      then "12wis5sbbx502g86irhi3g2gvpczbxzjw7z0lw9rk7jagplwhvkx"
+      else "01ajiqizy4f8niqipxccimvvsqlfypr4a28rwxk6zran7m1kjpp6";
   };
 
   buildInputs = [ makeWrapper ];

From 7472c5477a7f37355867d8d3caf836fae257835d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 5 Oct 2018 00:56:01 +0000
Subject: [PATCH 2927/3253] luigi: init at 2.7.9

---
 .../networking/cluster/luigi/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/luigi/default.nix

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
new file mode 100644
index 000000000000..ced7b9882b9c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -0,0 +1,32 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "luigi";
+  version = "2.7.9";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
+  };
+
+  # Relax version constraint
+  postPatch = ''
+    sed -i 's/<2.2.0//' setup.py
+  '';
+
+  propagatedBuildInputs = with python3Packages; [ tornado_4 pythondaemon ];
+
+  # Requires tox, hadoop, and google cloud
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/spotify/luigi;
+    description = "Python package that helps you build complex pipelines of batch jobs";
+    longDescription = ''
+      Luigi handles dependency resolution, workflow management, visualization,
+      handling failures, command line integration, and much more.
+    '';
+    license =  [ licenses.asl20 ];
+    maintainers = [ maintainers.bhipple ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e05d180457ec..ee6dcbb74be8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -736,6 +736,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
+  luigi = callPackage ../applications/networking/cluster/luigi { };
+
   m-cli = callPackage ../os-specific/darwin/m-cli { };
 
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};

From b73579e5f16064e235d460aeaa6e5dffef645dcd Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 4 Oct 2018 14:57:07 +0200
Subject: [PATCH 2928/3253] taskell: init at 1.3.2

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Suggested-by: Profpatsch <mail@profpatsch.de>
---
 pkgs/applications/misc/taskell/default.nix | 59 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/misc/taskell/default.nix

diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
new file mode 100644
index 000000000000..6cb78e6d6bd7
--- /dev/null
+++ b/pkgs/applications/misc/taskell/default.nix
@@ -0,0 +1,59 @@
+{ haskell, lib, haskellPackages, fetchFromGitHub }:
+
+let
+  version = "1.3.2";
+  sha256  = "0cyysvkl8m1ldlprmw9mpvch3r244nl25yv74dwcykga3g5mw4aa";
+
+in (haskellPackages.mkDerivation {
+  pname = "taskell";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "smallhadroncollider";
+    repo = "taskell";
+    rev = version;
+    inherit sha256;
+  };
+
+  postPatch = ''${haskellPackages.hpack}/bin/hpack'';
+
+  # basically justStaticExecutables; TODO: use justStaticExecutables
+  enableSharedExecutables = false;
+  enableLibraryProfiling = false;
+  isExecutable = true;
+  doHaddock = false;
+  postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+
+  # copied from packages.yaml
+  libraryHaskellDepends = with haskellPackages; [
+    classy-prelude
+    # base <=5
+    aeson
+    brick
+    # bytestring
+    config-ini
+    # containers
+    # directory
+    file-embed
+    http-conduit
+    http-client
+    http-types
+    lens
+    # mtl
+    # template-haskell
+    # text
+    time
+    vty
+  ];
+
+  executableHaskellDepends = [];
+
+  testHaskellDepends = with haskellPackages; [
+    tasty
+    tasty-discover
+    tasty-expected-failure
+    tasty-hunit
+  ];
+
+  license = lib.licenses.bsd3;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e05d180457ec..8a2e972ef2c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18993,6 +18993,8 @@ with pkgs;
   teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
+  taskell = callPackage ../applications/misc/taskell { };
+
   taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
   tasknc = callPackage ../applications/misc/tasknc { };

From 80651cff84da00f04262cd9c69968e13ca261de9 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 4 Oct 2018 21:26:03 -0400
Subject: [PATCH 2929/3253] pythonPackages.eradicate: init at 0.2.1

---
 .../python-modules/eradicate/default.nix      | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/eradicate/default.nix

diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix
new file mode 100644
index 000000000000..7c071a5cee6b
--- /dev/null
+++ b/pkgs/development/python-modules/eradicate/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "eradicate";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "092zmck919bn6sl31ixrzhn88g9nvhwzmwzpq8dzgn6c8k2h3bzr";
+  };
+
+  meta = with lib; {
+    description = "eradicate removes commented-out code from Python files.";
+    homepage = https://github.com/myint/eradicate;
+    license = [ licenses.mit ];
+
+    maintainers = [ maintainers.mmlb ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27f6d3b0b9e4..4c66fd52d43b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -324,6 +324,8 @@ in {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  eradicate = callPackage ../development/python-modules/eradicate {  };
+
   fido2 = callPackage ../development/python-modules/fido2 {  };
 
   filterpy = callPackage ../development/python-modules/filterpy { };

From 123e3a7e9d8704d79a71ee27d31cfe0ecb72e376 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 4 Oct 2018 21:27:47 -0400
Subject: [PATCH 2930/3253] pythonPackages.pylama: 7.4.3 -> 7.5.5

---
 .../python-modules/pylama/default.nix         | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix
index c4ef98b43ef6..c463ab8823c8 100644
--- a/pkgs/development/python-modules/pylama/default.nix
+++ b/pkgs/development/python-modules/pylama/default.nix
@@ -1,22 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch
-, mccabe, pycodestyle, pydocstyle, pyflakes
+{ lib, buildPythonPackage, fetchPypi
+, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes
 , pytest, ipdb }:
 
 buildPythonPackage rec {
   pname = "pylama";
-  version = "7.4.3";
+  version = "7.5.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712";
+    sha256 = "1zg7wca9s5srvbj3kawalv4438l47hg7m6gaw8rd4i43lbyyqya6";
   };
 
-  patches = fetchpatch {
-    url = "${meta.homepage}/pull/116.patch";
-    sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv";
-  };
-
-  propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ];
+  propagatedBuildInputs = [
+    eradicate
+    mccabe
+    pycodestyle
+    pydocstyle
+    pyflakes
+  ];
 
   checkInputs = [ pytest ipdb ];
 
@@ -27,7 +28,7 @@ buildPythonPackage rec {
     description = "Code audit tool for python";
     homepage = https://github.com/klen/pylama;
     # ambiguous license declarations: https://github.com/klen/pylama/issues/64
-    license = licenses.lgpl3;
+    license = [ licenses.lgpl3 ];
     maintainers = with maintainers; [ dotlambda ];
   };
 }

From 12d9443a66248165e49322ff67a16b7d7c0bbed6 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Wed, 26 Sep 2018 13:55:56 +0200
Subject: [PATCH 2931/3253] wineStable: 3.0.2 -> 3.0.3

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index b1af27807316..214d259f9c1f 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "3.0.2";
+    version = "3.0.3";
     url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
-    sha256 = "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya";
+    sha256 = "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From c73ed9625bfcb9b4726cc4468b8c557c6e6f530d Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Wed, 26 Sep 2018 16:24:14 +0200
Subject: [PATCH 2932/3253] wine: use current flex

---
 pkgs/misc/emulators/wine/base.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index d56a485c1529..f87f8eab9849 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,7 +1,6 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
-  # flex 2.6.3 causes: undefined reference to `yywrap'
-  pkgconfig, fontforge, makeWrapper, flex_2_6_1, bison,
+  pkgconfig, fontforge, makeWrapper, flex, bison,
   supportFlags,
   buildScript ? null, configureFlags ? []
 }:
@@ -14,7 +13,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   inherit name src configureFlags;
 
   nativeBuildInputs = [
-    pkgconfig fontforge makeWrapper flex_2_6_1 bison
+    pkgconfig fontforge makeWrapper flex bison
   ];
 
   buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs:

From bae3fd3d83cc9f227ae7974c32506afdda103ea6 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sat, 13 Oct 2018 13:05:34 +0200
Subject: [PATCH 2933/3253] vulkan-loader: update to match vulkan-headers at
 1.1.85

---
 pkgs/development/libraries/vulkan-loader/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 5ffdc4375373..ad110817fea1 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
   xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
-let version = "1.1.82.0"; in
+let version = "1.1.85"; in
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
   name = "vulkan-loader-${version}";

From a1b4859d1b560ec1b61bad16db4f6bf0e7a3f0d2 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sat, 13 Oct 2018 13:09:20 +0200
Subject: [PATCH 2934/3253] wine: 3.17 -> 3.18 (unstable and staging)

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 214d259f9c1f..78e4faf433c1 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.17";
+    version = "3.18";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac";
+    sha256 = "0xqs76hxcym8nb95r7l72xx0msbscp7fhkr1wrv4r0923d5x9s4v";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w";
+    sha256 = "18g1lmqzkc7ngppynimfvza1gkdhqlnjbvnckmaws847ns4i0kzp";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 011a463d17031c0c5d54710cef90d48f0de0b9d8 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 6 Oct 2018 19:34:30 +0000
Subject: [PATCH 2935/3253] wireguard: 0.0.20180925 -> 0.0.20181006

---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 493f52bd11b1..048748b9fea3 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180925";
+  version = "0.0.20181006";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "10k63ld0f5q5aykpcrg9m3xmrsf3qmlkvhiv18q73hnky2cjfx62";
+    sha256 = "0283slpyqb8d4cx9wyahqmqi4lwhzamc4i2710zid5y71vjgsgw3";
   };
 
   sourceRoot = "source/src/tools";

From fed0a4ec94cacca2ebec9b6f2929d65bac0e60cd Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 13 Oct 2018 12:26:42 +0000
Subject: [PATCH 2936/3253] wireguard-go: 0.0.20180613 -> 0.0.20181001

---
 pkgs/tools/networking/wireguard-go/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index c6b8cb242fdc..a6a32ccf12ad 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
-  version = "0.0.20180613";
+  version = "0.0.20181001";
 
   goPackagePath = "git.zx2c4.com/wireguard-go";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "0pvg7s1kyn48az54lsnyn1ryhjk0flmpz5dx520rc94g6xn88fic";
+    sha256 = "0yh9f58xn8kcq3wgx2s8j19k2h1vbmg70fn5gvw9k98f5mzynls3";
   };
 
   goDeps = ./deps.nix;

From dee07afe96d559929b74a6720972af556c1edd17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 05:44:31 -0700
Subject: [PATCH 2937/3253] urh: 2.2.4 -> 2.3.0 (#47715)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urh/versions
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index c5e8d1e24560..dba492ca8dd1 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.2.4";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1afmja4cffyw0ipx7zm93wvjmz0v5ccl7vcw2r18kdzrs1mr99zl";
+    sha256 = "1n105lwz8w5fiw93w9amasq0f4gknihl3x9kj0q77lw7ha1lvdfz";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From 972aa96f27ae9a5c7d02010f3ca040caafe772a2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 13 Oct 2018 14:13:58 +0200
Subject: [PATCH 2938/3253] tdesktop: 1.4.2 -> 1.4.3

tdesktopPackages.preview: 1.4.2 -> 1.4.3
---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 56bf7ee078db..03a99aea4001 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.4.2";
-    sha256Hash = "025qld597b6x7wbf1y1qpcsz0brpf3qsqj650mq9fpps1yi1vfk7";
+    version = "1.4.3";
+    sha256Hash = "1pvjvndqc7ylgc8ihf20fl1vb1x6fj7ywl6p1fr16j683vhdcml8";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "388730";
     archPatchesHash = "1gvisz36bc6bl4zcpjyyk0a2dl6ixp65an8wgm2lkc9mhkl783q7";

From ac6f4851480e3a7016a2257a62c34ed46dcea789 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 13 Oct 2018 15:02:15 +0200
Subject: [PATCH 2939/3253] Revert "vulkan-headers: 1.1.82.0 -> 1.1.85
 (#47702)"

This reverts commit e6b0646b3b5decaaf9a6b7fe5f59cb98f865d25f.

The bump broke vulkan-loader (eval error).
---
 pkgs/development/libraries/vulkan-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index dd3f14f91928..2a07eba261b7 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   name = "vulkan-headers-${version}";
-  version = "1.1.85";
+  version = "1.1.82.0";
 
   buildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
+    sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p";
   };
 
   meta = with stdenv.lib; {

From 4eee2cd0e03657dfb39e3e7c93460442e3d2d86c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 21 Aug 2018 21:05:20 +0200
Subject: [PATCH 2940/3253] nixos/znc: move to own folder

Move legacy options to separate file
---
 nixos/modules/module-list.nix                 |   2 +-
 .../services/networking/znc/default.nix       | 170 ++++++++++++++++++
 .../networking/{znc.nix => znc/options.nix}   | 153 +---------------
 3 files changed, 175 insertions(+), 150 deletions(-)
 create mode 100644 nixos/modules/services/networking/znc/default.nix
 rename nixos/modules/services/networking/{znc.nix => znc/options.nix} (61%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f55c32fa511d..290db674c68e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -634,7 +634,7 @@
   ./services/networking/zerobin.nix
   ./services/networking/zeronet.nix
   ./services/networking/zerotierone.nix
-  ./services/networking/znc.nix
+  ./services/networking/znc/default.nix
   ./services/printing/cupsd.nix
   ./services/scheduling/atd.nix
   ./services/scheduling/chronos.nix
diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix
new file mode 100644
index 000000000000..e2526550caf3
--- /dev/null
+++ b/nixos/modules/services/networking/znc/default.nix
@@ -0,0 +1,170 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+  cfg = config.services.znc;
+
+  defaultUser = "znc"; # Default user to own process.
+
+  modules = pkgs.buildEnv {
+    name = "znc-modules";
+    paths = cfg.modulePackages;
+  };
+
+in
+
+{
+
+  imports = [
+    ./options.nix
+  ];
+
+  ###### Interface
+
+  options = {
+    services.znc = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable a ZNC service for a user.
+        '';
+      };
+
+      user = mkOption {
+        default = "znc";
+        example = "john";
+        type = types.string;
+        description = ''
+          The name of an existing user account to use to own the ZNC server process.
+          If not specified, a default user will be created to own the process.
+        '';
+      };
+
+      group = mkOption {
+        default = "";
+        example = "users";
+        type = types.string;
+        description = ''
+          Group to own the ZNCserver process.
+        '';
+      };
+
+      dataDir = mkOption {
+        default = "/var/lib/znc/";
+        example = "/home/john/.znc/";
+        type = types.path;
+        description = ''
+          The data directory. Used for configuration files and modules.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to open ports in the firewall for ZNC.
+        '';
+      };
+
+      modulePackages = mkOption {
+        type = types.listOf types.package;
+        default = [ ];
+        example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
+        description = ''
+          A list of global znc module packages to add to znc.
+        '';
+      };
+
+      mutable = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Indicates whether to allow the contents of the `dataDir` directory to be changed
+          by the user at run-time.
+          If true, modifications to the ZNC configuration after its initial creation are not
+            overwritten by a NixOS system rebuild.
+          If false, the ZNC configuration is rebuilt by every system rebuild.
+          If the user wants to manage the ZNC service using the web admin interface, this value
+            should be set to true.
+        '';
+      };
+
+      extraFlags = mkOption {
+        default = [ ];
+        example = [ "--debug" ];
+        type = types.listOf types.str;
+        description = ''
+          Extra flags to use when executing znc command.
+        '';
+      };
+    };
+  };
+
+
+  ###### Implementation
+
+  config = mkIf cfg.enable {
+
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ ]; # TODO: Add port
+    };
+
+    systemd.services.znc = {
+      description = "ZNC Server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.service" ];
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "always";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecStop   = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
+      };
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
+
+        # If mutable, regenerate conf file every time.
+        ${optionalString (!cfg.mutable) ''
+          ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
+          ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
+        ''}
+
+        # Ensure essential files exist.
+        if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
+            ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
+            ${pkgs.coreutils}/bin/cp --no-clobber ${/* TODO */"zncConfFile"} ${cfg.dataDir}/configs/znc.conf
+            ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
+            ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
+        fi
+
+        if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
+          ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
+          ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
+        fi
+
+        # Symlink modules
+        rm ${cfg.dataDir}/modules || true
+        ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules
+      '';
+      script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}";
+    };
+
+    users.users = optional (cfg.user == defaultUser)
+      { name = defaultUser;
+        description = "ZNC server daemon owner";
+        group = defaultUser;
+        uid = config.ids.uids.znc;
+        home = cfg.dataDir;
+        createHome = true;
+      };
+
+    users.groups = optional (cfg.user == defaultUser)
+      { name = defaultUser;
+        gid = config.ids.gids.znc;
+        members = [ defaultUser ];
+      };
+
+  };
+}
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc/options.nix
similarity index 61%
rename from nixos/modules/services/networking/znc.nix
rename to nixos/modules/services/networking/znc/options.nix
index f817db2ad000..ce5ca0a9a3b6 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc/options.nix
@@ -1,11 +1,10 @@
-{ config, lib, pkgs, ...}:
+{ lib, config, ... }:
 
 with lib;
 
 let
-  cfg = config.services.znc;
 
-  defaultUser = "znc"; # Default user to own process.
+  cfg = config.services.znc;
 
   # Default user and pass:
   # un=znc
@@ -20,11 +19,6 @@ let
         </Pass>
   ";
 
-  modules = pkgs.buildEnv {
-    name = "znc-modules";
-    paths = cfg.modulePackages;
-  };
-
   # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
   mkZncConf = confOpts: ''
     Version = 1.6.3
@@ -70,7 +64,7 @@ let
       else mkZncConf cfg.confOptions;
   };
 
-  networkOpts = { ... }: {
+  networkOpts = {
     options = {
       server = mkOption {
         type = types.str;
@@ -176,49 +170,6 @@ in
 
   options = {
     services.znc = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable a ZNC service for a user.
-        '';
-      };
-
-      user = mkOption {
-        default = "znc";
-        example = "john";
-        type = types.string;
-        description = ''
-          The name of an existing user account to use to own the ZNC server process.
-          If not specified, a default user will be created to own the process.
-        '';
-      };
-
-      group = mkOption {
-        default = "";
-        example = "users";
-        type = types.string;
-        description = ''
-          Group to own the ZNCserver process.
-        '';
-      };
-
-      dataDir = mkOption {
-        default = "/var/lib/znc/";
-        example = "/home/john/.znc/";
-        type = types.path;
-        description = ''
-          The data directory. Used for configuration files and modules.
-        '';
-      };
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to open ports in the firewall for ZNC.
-        '';
-      };
 
       zncConf = mkOption {
         default = "";
@@ -231,6 +182,7 @@ in
         '';
       };
 
+
       confOptions = {
         modules = mkOption {
           type = types.listOf types.str;
@@ -329,103 +281,6 @@ in
         };
       };
 
-      modulePackages = mkOption {
-        type = types.listOf types.package;
-        default = [ ];
-        example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
-        description = ''
-          A list of global znc module packages to add to znc.
-        '';
-      };
-
-      mutable = mkOption {
-        default = true;
-        type = types.bool;
-        description = ''
-          Indicates whether to allow the contents of the `dataDir` directory to be changed
-          by the user at run-time.
-          If true, modifications to the ZNC configuration after its initial creation are not
-            overwritten by a NixOS system rebuild.
-          If false, the ZNC configuration is rebuilt by every system rebuild.
-          If the user wants to manage the ZNC service using the web admin interface, this value
-            should be set to true.
-        '';
-      };
-
-      extraFlags = mkOption {
-        default = [ ];
-        example = [ "--debug" ];
-        type = types.listOf types.str;
-        description = ''
-          Extra flags to use when executing znc command.
-        '';
-      };
     };
   };
-
-
-  ###### Implementation
-
-  config = mkIf cfg.enable {
-
-    networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.confOptions.port ];
-    };
-
-    systemd.services.znc = {
-      description = "ZNC Server";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.service" ];
-      serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
-        Restart = "always";
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        ExecStop   = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
-      };
-      preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
-
-        # If mutable, regenerate conf file every time.
-        ${optionalString (!cfg.mutable) ''
-          ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
-          ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
-        ''}
-
-        # Ensure essential files exist.
-        if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
-            ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
-            ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
-            ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
-            ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
-        fi
-
-        if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
-          ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
-          ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
-        fi
-
-        # Symlink modules
-        rm ${cfg.dataDir}/modules || true
-        ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules
-      '';
-      script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}";
-    };
-
-    users.users = optional (cfg.user == defaultUser)
-      { name = defaultUser;
-        description = "ZNC server daemon owner";
-        group = defaultUser;
-        uid = config.ids.uids.znc;
-        home = cfg.dataDir;
-        createHome = true;
-      };
-
-    users.groups = optional (cfg.user == defaultUser)
-      { name = defaultUser;
-        gid = config.ids.gids.znc;
-        members = [ defaultUser ];
-      };
-
-  };
 }

From 7e615310f7085d0083e76799ac281f0fae91b0b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 13 Oct 2018 14:57:16 +0200
Subject: [PATCH 2941/3253] android-studio: 3.2.0.26 -> 3.2.1.0

androidStudioPackages.beta: 3.2.0.26 -> 3.2.1.0
---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 051078e1f5a1..51ecfc0866e4 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.2.0.26"; # "Android Studio 3.2.0"
-    build = "181.5014246";
-    sha256Hash = "0v1a3b0n8dq5p8f6jap2ypqw724v61ki31qhqmh9hn36mn6d8wg6";
+    version = "3.2.1.0"; # "Android Studio 3.2.1"
+    build = "181.5056338";
+    sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
   };
   betaVersion = stableVersion;
   latestVersion = { # canary & dev

From ef54c618dc7af978e875704b0142d3d1e8b96f29 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 13 Oct 2018 13:22:18 +0000
Subject: [PATCH 2942/3253] COPYING: move notice to README.md

---
 COPYING   | 9 ---------
 README.md | 6 ++++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/COPYING b/COPYING
index 198597a1b410..7c52fb768978 100644
--- a/COPYING
+++ b/COPYING
@@ -18,12 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-======================================================================
-
-Note: the license above does not apply to the packages built by the
-Nix Packages collection, merely to the package descriptions (i.e., Nix
-expressions, build scripts, etc.).  It also might not apply to patches
-included in Nixpkgs, which may be derivative works of the packages to
-which they apply.  The aforementioned artifacts are all covered by the
-licenses of the respective packages.
diff --git a/README.md b/README.md
index 144a23027db9..278ef66cf7e8 100644
--- a/README.md
+++ b/README.md
@@ -39,3 +39,9 @@ Communication:
 
 * [Discourse Forum](https://discourse.nixos.org/)
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
+
+Note: MIT license does not apply to the packages built by Nixpkgs, merely to
+the package descriptions (Nix expressions, build scripts, and so on). It also
+might not apply to patches included in Nixpkgs, which may be derivative works
+of the packages to which they apply. The aforementioned artifacts are all
+covered by the licenses of the respective packages.

From b13a6b6791def7d50931015db6413f11c85262ab Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Sat, 13 Oct 2018 15:38:57 +0200
Subject: [PATCH 2943/3253] guile-cairo: 1.4.1 -> 1.10.0

---
 .../development/guile-modules/guile-cairo/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  4 +---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 32a22566bdb1..4bd49b06796d 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -2,19 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "guile-cairo-${version}";
-  version = "1.4.1";
+  version = "1.10.0";
 
   src = fetchurl {
-    url = "http://download.gna.org/guile-cairo/${name}.tar.gz";
-    sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x";
+    url = "mirror://savannah/guile-cairo/${name}.tar.gz";
+    sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ guile cairo expat ];
-  checkInputs = [ guile-lib ];
+  enableParallelBuilding = true;
 
   doCheck = true;
+  checkInputs = [ guile-lib ];
 
   meta = with stdenv.lib; {
     description = "Cairo bindings for GNU Guile";
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
       maintained graphics library with all of the benefits of Scheme: memory
       management, exceptions, macros, and a dynamic programming environment.
     '';
-    homepage = "http://home.gna.org/guile-cairo/";
+    homepage = https://www.nongnu.org/guile-cairo/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ vyp ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c9bdd844033..626f75abd130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7939,9 +7939,7 @@ with pkgs;
 
   jython = callPackage ../development/interpreters/jython {};
 
-  guile-cairo = callPackage ../development/guile-modules/guile-cairo {
-    guile = guile_2_0;
-  };
+  guile-cairo = callPackage ../development/guile-modules/guile-cairo { };
 
   guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
 

From 97d2779059869653e2d97ed46da16842046eff81 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 13 Oct 2018 15:44:18 +0200
Subject: [PATCH 2944/3253] wireguard: 0.0.20181006 -> 0.0.20181007

---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 048748b9fea3..33b62d1bb380 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20181006";
+  version = "0.0.20181007";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0283slpyqb8d4cx9wyahqmqi4lwhzamc4i2710zid5y71vjgsgw3";
+    sha256 = "1nrhwnccs6sqq1qs7yhxqb989inrc9n2saibpqs6ga6gb0pvpac6";
   };
 
   sourceRoot = "source/src/tools";

From 49284e4a00a1b8a93d1ae93896f3856c98f5f266 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 07:41:54 -0700
Subject: [PATCH 2945/3253] goxel: 0.8.0 -> 0.8.1 (#47789)

* goxel: 0.8.0 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/goxel/versions

* goxel: build only on x86_64-linux
---
 pkgs/applications/graphics/goxel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 99230eb23e32..27dd37d1803a 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "goxel-${version}";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "guillaumechereau";
     repo = "goxel";
     rev = "v${version}";
-    sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17";
+    sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb";
   };
 
   patches = [ ./disable-imgui_ini.patch ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Open Source 3D voxel editor";
     homepage = https://guillaumechereau.github.io/goxel/;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ]; # see https://github.com/guillaumechereau/goxel/issues/125
     maintainers = with maintainers; [ tilpner ];
   };
 }

From e4e160cc3990584bf3472d8df76d6cb3deb38b47 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sat, 4 Aug 2018 17:35:05 +0900
Subject: [PATCH 2946/3253] nixos/shells: do not override user-defined shell
 aliases

---
 nixos/modules/config/shells-environment.nix | 9 +++++++--
 nixos/modules/programs/shell.nix            | 6 ------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 555db459f57a..a279120e125d 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -108,14 +108,13 @@ in
     };
 
     environment.shellAliases = mkOption {
-      default = {};
       example = { ll = "ls -l"; };
       description = ''
         An attribute set that maps aliases (the top level attribute names in
         this option) to command strings or directly to build outputs. The
         aliases are added to all users' shells.
       '';
-      type = types.attrs; # types.attrsOf types.stringOrPath;
+      type = with types; attrsOf (either str path);
     };
 
     environment.binsh = mkOption {
@@ -157,6 +156,12 @@ in
     # terminal instead of logging out of X11).
     environment.variables = config.environment.sessionVariables;
 
+    environment.shellAliases = mapAttrs (name: mkDefault) {
+      ls = "ls --color=tty";
+      ll = "ls -l";
+      l  = "ls -alh";
+    };
+
     environment.etc."shells".text =
       ''
         ${concatStringsSep "\n" (map utils.toShellPath cfg.shells)}
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 944a8bdf16fc..6aa0262e3a4c 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -8,12 +8,6 @@ with lib;
 
   config = {
 
-    environment.shellAliases =
-      { ls = "ls --color=tty";
-        ll = "ls -l";
-        l  = "ls -alh";
-      };
-
     environment.shellInit =
       ''
         # Set up the per-user profile.

From 3b5449b80c1840aeb07322fbd3c37f8a80d11958 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sat, 4 Aug 2018 12:32:30 +0900
Subject: [PATCH 2947/3253] nixos/shells: programs.*sh.shellAliases override
 environment.shellAliases

---
 nixos/modules/programs/bash/bash.nix | 10 ++++++----
 nixos/modules/programs/fish.nix      | 10 ++++++----
 nixos/modules/programs/zsh/zsh.nix   |  9 +++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index f664e2225550..aa524a333ee6 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -59,12 +59,12 @@ in
       */
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases;
+        default = {};
         description = ''
-          Set of aliases for bash shell. See <option>environment.shellAliases</option>
-          for an option format description.
+          Set of aliases for bash shell, which overrides <option>environment.shellAliases</option>.
+          See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = types.attrs; # types.attrsOf types.stringOrPath;
+        type = with types; attrsOf (either str path);
       };
 
       shellInit = mkOption {
@@ -125,6 +125,8 @@ in
 
     programs.bash = {
 
+      shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
       shellInit = ''
         if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
             . ${config.system.build.setEnvironment}
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 5948fe11f92b..82af9ecc5611 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -53,12 +53,12 @@ in
       };
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases;
+        default = {};
         description = ''
-          Set of aliases for fish shell. See <option>environment.shellAliases</option>
-          for an option format description.
+          Set of aliases for fish shell, which overrides <option>environment.shellAliases</option>.
+          See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = types.attrs;
+        type = with types; attrsOf (either str path);
       };
 
       shellInit = mkOption {
@@ -99,6 +99,8 @@ in
 
   config = mkIf cfg.enable {
 
+    programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
     environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
     environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
     environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 865d148c1629..66ca5e5d4eb5 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -34,13 +34,12 @@ in
       };
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases;
+        default = {};
         description = ''
-          Set of aliases for zsh shell. Overrides the default value taken from
-           <option>environment.shellAliases</option>.
+          Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>.
           See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = types.attrs; # types.attrsOf types.stringOrPath;
+        type = with types; attrsOf (either str path);
       };
 
       shellInit = mkOption {
@@ -106,6 +105,8 @@ in
 
   config = mkIf cfg.enable {
 
+    programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
     environment.etc."zshenv".text =
       ''
         # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.

From c941577dcb68ad413853ae744a458555b3209c21 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 12 Oct 2018 22:58:35 +0900
Subject: [PATCH 2948/3253] nixos/shells: enable to nullify already defined
 aliases

---
 nixos/modules/config/shells-environment.nix | 5 +++--
 nixos/modules/programs/bash/bash.nix        | 5 +++--
 nixos/modules/programs/fish.nix             | 5 +++--
 nixos/modules/programs/zsh/zsh.nix          | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index a279120e125d..6379b52870ea 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -108,13 +108,14 @@ in
     };
 
     environment.shellAliases = mkOption {
-      example = { ll = "ls -l"; };
+      example = { l = null; ll = "ls -l"; };
       description = ''
         An attribute set that maps aliases (the top level attribute names in
         this option) to command strings or directly to build outputs. The
         aliases are added to all users' shells.
+        Aliases mapped to <code>null</code> are ignored.
       '';
-      type = with types; attrsOf (either str path);
+      type = with types; attrsOf (nullOr (either str path));
     };
 
     environment.binsh = mkOption {
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index aa524a333ee6..0fbc77ea44cf 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -33,7 +33,8 @@ let
   '';
 
   bashAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
+      (filterAttrs (k: v: !isNull v) cfg.shellAliases)
   );
 
 in
@@ -64,7 +65,7 @@ in
           Set of aliases for bash shell, which overrides <option>environment.shellAliases</option>.
           See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = with types; attrsOf (either str path);
+        type = with types; attrsOf (nullOr (either str path));
       };
 
       shellInit = mkOption {
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 82af9ecc5611..b38af07b92c3 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -9,7 +9,8 @@ let
   cfg = config.programs.fish;
 
   fishAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}")
+      (filterAttrs (k: v: !isNull v) cfg.shellAliases)
   );
 
 in
@@ -58,7 +59,7 @@ in
           Set of aliases for fish shell, which overrides <option>environment.shellAliases</option>.
           See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = with types; attrsOf (either str path);
+        type = with types; attrsOf (nullOr (either str path));
       };
 
       shellInit = mkOption {
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 66ca5e5d4eb5..164d8db5859a 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -11,7 +11,8 @@ let
   cfg = config.programs.zsh;
 
   zshAliases = concatStringsSep "\n" (
-    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
+    mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
+      (filterAttrs (k: v: !isNull v) cfg.shellAliases)
   );
 
 in
@@ -39,7 +40,7 @@ in
           Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>.
           See <option>environment.shellAliases</option> for an option format description.
         '';
-        type = with types; attrsOf (either str path);
+        type = with types; attrsOf (nullOr (either str path));
       };
 
       shellInit = mkOption {

From a1825aecfcbf4605047cbb0cb33241e25dcd0b38 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Tue, 15 May 2018 15:30:54 +0200
Subject: [PATCH 2949/3253] nixos/matomo: introduce services.matomo.package
 option

---
 nixos/doc/manual/release-notes/rl-1903.xml |  6 +++++-
 nixos/modules/services/web-apps/matomo.nix | 15 +++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 1f26d4765b97..ef17f104ff1e 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -117,7 +117,11 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+    <para>
+     The <option>services.matomo</option> module gained the option
+     <option>services.matomo.package</option> which determines the used
+     Matomo version.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index fbbd7715c6b3..9fddf8320748 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -34,6 +34,13 @@ in {
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        description = "Matomo package to use";
+        default = pkgs.matomo;
+        defaultText = "pkgs.matomo";
+      };
+
       webServerUser = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -124,7 +131,7 @@ in {
       # the update part of the script can only work if the database is already up and running
       requires = [ databaseService ];
       after = [ databaseService ];
-      path = [ pkgs.matomo ];
+      path = [ cfg.package ];
       serviceConfig = {
         Type = "oneshot";
         User = user;
@@ -151,7 +158,7 @@ in {
             # Use User-Private Group scheme to protect matomo data, but allow administration / backup via matomo group
             # Copy config folder
             chmod g+s "${dataDir}"
-            cp -r "${pkgs.matomo}/config" "${dataDir}/"
+            cp -r "${cfg.package}/config" "${dataDir}/"
             chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
 
             # check whether user setup has already been done
@@ -164,7 +171,7 @@ in {
 
     systemd.services.${phpExecutionUnit} = {
       # stop phpfpm on package upgrade, do database upgrade via matomo_setup_update, and then restart
-      restartTriggers = [ pkgs.matomo ];
+      restartTriggers = [ cfg.package ];
       # stop config.ini.php from getting written with read permission for others
       serviceConfig.UMask = "0007";
     };
@@ -195,7 +202,7 @@ in {
       "${user}.${fqdn}" = mkMerge [ cfg.nginx {
         # don't allow to override the root easily, as it will almost certainly break matomo.
         # disadvantage: not shown as default in docs.
-        root = mkForce "${pkgs.matomo}/share";
+        root = mkForce "${cfg.package}/share";
 
         # define locations here instead of as the submodule option's default
         # so that they can easily be extended with additional locations if required

From 45351e6916ac56a04b633b445e5f42a357d0437e Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 13 Oct 2018 16:14:09 +0000
Subject: [PATCH 2950/3253] Revert "Revert "vulkan-headers: 1.1.82.0 -> 1.1.85
 (#47702)""

This reverts commit ac6f4851480e3a7016a2257a62c34ed46dcea789.
vulkan-loader bump: bae3fd3d83cc9f227ae7974c32506afdda103ea6.
---
 pkgs/development/libraries/vulkan-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 2a07eba261b7..dd3f14f91928 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   name = "vulkan-headers-${version}";
-  version = "1.1.82.0";
+  version = "1.1.85";
 
   buildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p";
+    sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
   };
 
   meta = with stdenv.lib; {

From 3ad8afbf3e5cda12b402fa0ee80241741c8cf4cb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 13 Oct 2018 12:40:53 -0400
Subject: [PATCH 2951/3253] linux: 4.4.160 -> 4.4.161

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 39e96d4b5dc2..641e368f74e6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.160";
+  version = "4.4.161";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1i0wqccab2xxjsx58pgzgbmm5cclfd3hh3yjasnfrqsdaarxvgkd";
+    sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy";
   };
 } // (args.argsOverride or {}))

From b4d4affe41285fb47ed6d9f57967c7998b91439d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 13 Oct 2018 12:41:07 -0400
Subject: [PATCH 2952/3253] linux: 4.9.132 -> 4.9.133

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 24c11fca7935..cdf7000fba89 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.132";
+  version = "4.9.133";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1lz53r6p293y5fwx7pz9ymj9sss3wmip8hcc48zwkcwm8phnmrk7";
+    sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk";
   };
 } // (args.argsOverride or {}))

From 43d8a40653c66ab72836d54a721d75db7728df8a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 13 Oct 2018 12:41:16 -0400
Subject: [PATCH 2953/3253] linux: 4.14.75 -> 4.14.76

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 9afc81eddf52..60b3ffb2d8dc 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.75";
+  version = "4.14.76";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "084176rl51ls0dhy39vpj9fhasm4436iqv6aa0s5a74g1cixg4sh";
+    sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf";
   };
 } // (args.argsOverride or {}))

From 0ba1f0aa727bb76aa4ebc76a42ee3fb78844b932 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 13 Oct 2018 12:41:21 -0400
Subject: [PATCH 2954/3253] linux: 4.18.13 -> 4.18.14

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 2b65ed377ffc..9bf33c068b55 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.13";
+  version = "4.18.14";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0l4n72gajgw2vqghl6ps0yjy1safnypyzkcp841zkkwinp3a31yw";
+    sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin";
   };
 } // (args.argsOverride or {}))

From 994b84d816b76425964cabdbee334b52aa151d52 Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:12:58 -0700
Subject: [PATCH 2955/3253] pythonPackages.helper: 2.4.1 -> 2.4.2 | cleanup

---
 .../python-modules/helper/default.nix         | 24 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 ++-----------------
 2 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/helper/default.nix

diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix
new file mode 100644
index 000000000000..15dadd0bf114
--- /dev/null
+++ b/pkgs/development/python-modules/helper/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyyaml, mock }:
+ 
+buildPythonPackage rec {
+  pname = "helper";
+  version = "2.4.2";
+  name = "${pname}-${version}";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6";
+  };
+  
+  buildInputs = [ mock ];
+  propagatedBuildInputs = [ pyyaml ];
+  
+  # No tests in the pypi tarball
+  doCheck = false;
+  
+  meta = with stdenv.lib; {
+    description = "Development library for quickly writing configurable applications and daemons";
+    homepage = https://helper.readthedocs.org/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c66fd52d43b..3ab1af6c32a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -358,6 +358,8 @@ in {
 
   habanero = callPackage ../development/python-modules/habanero { };
 
+  helper = callPackage ../development/python-modules/helper { };
+
   histbook = callPackage ../development/python-modules/histbook { };
 
   httpsig = callPackage ../development/python-modules/httpsig { };
@@ -2532,31 +2534,6 @@ in {
 
   hbmqtt = callPackage ../development/python-modules/hbmqtt { };
 
-  helper = buildPythonPackage rec {
-    pname = "helper";
-    version = "2.4.1";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/${pname}/${name}.tar.gz";
-      sha256 = "4e33dde42ad4df30fb7790689f93d77252cff26a565610d03ff2e434865a53a2";
-    };
-
-    buildInputs = with self; [ mock ];
-    propagatedBuildInputs = with self; [ pyyaml ];
-
-    # No tests
-    doCheck = false;
-
-    meta = {
-      description = "Development library for quickly writing configurable applications and daemons";
-      homepage = https://helper.readthedocs.org/;
-      license = licenses.bsd3;
-    };
-
-
-  };
-
   hiro = callPackage ../development/python-modules/hiro {};
 
   hglib = callPackage ../development/python-modules/hglib {};

From 206f9ce2e008ac85e58fcfbf731e60ab2847e5d8 Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:24:23 -0700
Subject: [PATCH 2956/3253] pythonPackages.mwclient: 0.8.3 -> 0.9.1 | move to a
 seperate file

---
 .../python-modules/mwclient/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 ++-----------------
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/mwclient/default.nix

diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix
new file mode 100644
index 000000000000..186bc26f002f
--- /dev/null
+++ b/pkgs/development/python-modules/mwclient/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
+, responses, mock, pytestcov, pytest, pytestcache, pytestpep8, coverage, six }:
+
+buildPythonPackage rec {
+  version = "0.9.1";
+  pname = "mwclient";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mwclient";
+    repo = "mwclient";
+    rev = "v${version}";
+    sha256 = "0l7l5j7znlyn2yqvdfxr4dq23wyp6d8z49pnkjqy2kan11nrjzym";
+  };
+
+  buildInputs = [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
+
+  propagatedBuildInputs = [ six requests requests_oauthlib ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python client library to the MediaWiki API";
+    maintainers = with maintainers; [ ];
+    license = licenses.mit;
+    homepage = https://github.com/mwclient/mwclient;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ab1af6c32a9..30c9de1c445a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -390,6 +390,8 @@ in {
     mpi = pkgs.openmpi;
   };
 
+  mwclient = callPackage ../development/python-modules/mwclient { };
+
   mwoauth = callPackage ../development/python-modules/mwoauth { };
 
   nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
@@ -7479,34 +7481,6 @@ in {
 
   mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };
 
-  mwclient = buildPythonPackage rec {
-    version = "0.8.3";
-    pname = "mwclient";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "mwclient";
-      repo = "mwclient";
-      rev = "v${version}";
-      sha256 = "0kl1yp9z5f1wl6lkm0vix87zkrbl9wcmkrrj1x5c35xvf95laf53";
-    };
-
-    buildInputs = with self; [ mock responses pytestcov pytest pytestcache pytestpep8 coverage ];
-
-    propagatedBuildInputs = with self; [ six requests requests_oauthlib ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      description = "Python client library to the MediaWiki API";
-      maintainers = with maintainers; [ ];
-      license = licenses.mit;
-      homepage = https://github.com/mwclient/mwclient;
-    };
-  };
-
   neuronpy = buildPythonPackage rec {
     name = "neuronpy-${version}";
     version = "0.1.6";

From 1d1748c3c0b8b3c972451ec7aafbc5ea97e8a2ef Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Sat, 13 Oct 2018 10:35:18 -0700
Subject: [PATCH 2957/3253] pythonPackages.pystache: move to a seperate file

---
 .../python-modules/pystache/default.nix       | 29 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 ++-----------------
 2 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/pystache/default.nix

diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
new file mode 100644
index 000000000000..ee57c4995481
--- /dev/null
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, python, fetchPypi, isPy3k, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "pystache-${version}";
+  version = "0.5.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  buildInputs = [ glibcLocales ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  # SyntaxError Python 3
+  # https://github.com/defunkt/pystache/issues/181
+  doCheck = !isPy3k;
+
+  meta = with stdenv.lib; {
+    description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
+    homepage = https://github.com/defunkt/pystache;
+    license = licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30c9de1c445a..dfd6437550bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -559,6 +559,8 @@ in {
     slurm = pkgs.slurm;
   };
 
+  pystache = callPackage ../development/python-modules/pystache { }; 
+
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
   python-binance = callPackage ../development/python-modules/python-binance { };
@@ -10333,34 +10335,6 @@ in {
     };
   };
 
-  pystache = buildPythonPackage rec {
-    name = "pystache-${version}";
-    version = "0.5.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pystache/${name}.tar.gz";
-      sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    buildInputs = [ pkgs.glibcLocales ];
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    # SyntaxError Python 3
-    # https://github.com/defunkt/pystache/issues/181
-    doCheck = !isPy3k;
-
-    meta = {
-      description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
-      homepage = https://github.com/defunkt/pystache;
-      license = licenses.mit;
-    };
-  };
-
   PyStemmer = callPackage ../development/python-modules/pystemmer {};
 
   Pyro = callPackage ../development/python-modules/pyro { };

From 2e31732bc4d66de470d46c50de9fe6fd35f274bc Mon Sep 17 00:00:00 2001
From: Jos van Bakel <josvanbakel@protonmail.com>
Date: Sat, 13 Oct 2018 13:46:30 +0200
Subject: [PATCH 2958/3253] sonic-pi: 3.0.1 -> 3.1.0

---
 pkgs/applications/audio/sonic-pi/default.nix           | 10 +++++-----
 .../development/interpreters/supercollider/default.nix |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index d1c48ce44ed8..ee72b6cdb1a4 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -20,14 +20,14 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  version = "3.0.1";
+  version = "3.1.0";
   name = "sonic-pi-${version}";
 
   src = fetchFromGitHub {
     owner = "samaaron";
     repo = "sonic-pi";
     rev = "v${version}";
-    sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81";
+    sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9";
   };
 
   buildInputs = [
@@ -58,21 +58,21 @@ in stdenv.mkDerivation rec {
     export SONIC_PI_HOME=$TMPDIR
     export AUBIO_LIB=${aubio}/lib/libaubio.so
 
-    pushd app/server/bin
+    pushd app/server/ruby/bin
       ./compile-extensions.rb
       ./i18n-tool.rb -t
     popd
 
     pushd app/gui/qt
       cp -f ruby_help.tmpl ruby_help.h
-      ../../server/bin/qt-doc.rb -o ruby_help.h
+      ../../server/ruby/bin/qt-doc.rb -o ruby_help.h
 
       substituteInPlace SonicPi.pro \
         --replace "LIBS += -lrt -lqt5scintilla2" \
                   "LIBS += -lrt -lqscintilla2 -lqwt"
 
       lrelease SonicPi.pro
-      qmake SonicPi.pro 
+      qmake SonicPi.pro
 
       make
     popd
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2737fd6fae04..7109ec68d3c8 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     description = "Programming language for real time audio synthesis";
     homepage = http://supercollider.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x686-linux" "x86_64-linux" ];
   };
 }

From 6738033727ca7945f1465ad76492891489e133ce Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Wed, 10 Oct 2018 21:03:45 +0200
Subject: [PATCH 2959/3253] alt-ergo: 1.30->2.2.0, ocplib-simplex: 0.3->0.4

---
 lib/licenses.nix                                          | 6 ++++++
 pkgs/applications/science/logic/alt-ergo/default.nix      | 8 ++++----
 pkgs/development/ocaml-modules/ocplib-simplex/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                           | 4 +---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c4db280645a4..2d4e52ae4806 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -500,6 +500,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Non-Profit Open Software License 3.0";
   };
 
+  ocamlpro_nc = {
+    fullName = "OCamlPro Non Commercial license version 1";
+    url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf";
+    free = false;
+  };
+
   ofl = spdx {
     spdxId = "OFL-1.1";
     fullName = "SIL Open Font License 1.1";
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 8cf4bb9b6d25..794430ebbe84 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "alt-ergo-${version}";
-  version = "1.30";
+  version = "2.2.0";
 
   src = fetchurl {
     url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
     name   = "${name}.tar.gz";
-    sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g";
+    sha256 = "106zfgisq6qxr7dlk8z7gi68ly7qff4frn8wab2g8z2nkkwla92w";
   };
 
   buildInputs = with ocamlPackages;
-    [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex ];
+    [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex psmt2-frontend menhir num ];
 
   meta = {
     description = "High-performance theorem prover and SMT solver";
     homepage    = "https://alt-ergo.ocamlpro.com/";
-    license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
+    license     = stdenv.lib.licenses.ocamlpro_nc;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index eb25982a69b3..1c09edf3a7ea 100644
--- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "ocplib-simplex";
-  version = "0.3";
+  version = "0.4";
 in
 
 stdenv.mkDerivation {
@@ -11,13 +11,15 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "OCamlPro-Iguernlala";
     repo = pname;
-    rev = version;
-    sha256 = "1fmz38w2cj9fny4adqqyil59dvndqkr59s7wk2gqs47r72b6sisa";
+    rev = "v${version}";
+    sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ ocaml findlib ];
 
+  installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)";
+
   createFindlibDestdir = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c64ccdc34b5..f2b38e80b041 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21171,9 +21171,7 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_05;
   };
 
-  alt-ergo = callPackage ../applications/science/logic/alt-ergo {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
-  };
+  alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
 
   aspino = callPackage ../applications/science/logic/aspino {};
 

From 4d9366805219775e98d1b1da7587d56986168195 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 13 Oct 2018 17:54:45 +0000
Subject: [PATCH 2960/3253] vulkan-loader: lock rev, update sha256 after bump

See: https://git.io/fxRIA
---
 .../libraries/vulkan-loader/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index ad110817fea1..6f720857f7cf 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
-  xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
-let version = "1.1.85"; in
+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
+, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
+
+let
+  version = "1.1.85";
+in
+
 assert version == vulkan-headers.version;
 stdenv.mkDerivation rec {
   name = "vulkan-loader-${version}";
@@ -9,8 +13,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
-    rev = "sdk-${version}";
-    sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d";
+    rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c";
+    sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d21881ca5af8769c1694fb93262f92cd181fa241 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 13 Oct 2018 18:00:22 +0000
Subject: [PATCH 2961/3253] vulkan-headers: lock rev

---
 pkgs/development/libraries/vulkan-headers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index dd3f14f91928..c93ba1b12909 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
-    rev = "sdk-${version}";
+    rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0";
     sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
   };
 

From 63b897a473bba49e0882362224def68c8bc08803 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Thu, 11 Oct 2018 20:14:43 +0200
Subject: [PATCH 2962/3253] masterpdfeditor: use qtbase.qtPluginPrefix #44047

---
 pkgs/applications/misc/masterpdfeditor/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index c5a125e95adf..c821690e14fe 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -17,8 +17,9 @@ in stdenv.mkDerivation {
 
   dontStrip = true;
 
+  # Please remove this when #44047 is fixed
   postInstall = ''
-    wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins
+    wrapProgram $out/bin/masterpdfeditor5 --prefix QT_PLUGIN_PATH : ${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
   '';
 
   installPhase = ''

From 27298d378f2128450bedbb7cec3d0dc4b967a131 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Thu, 11 Oct 2018 20:17:37 +0200
Subject: [PATCH 2963/3253] masterpdfeditor: 5.1.36 -> 5.1.60

---
 pkgs/applications/misc/masterpdfeditor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index c821690e14fe..1cb472ff0194 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
 
 let
-  version = "5.1.36";
+  version = "5.1.60";
 
 in stdenv.mkDerivation {
   name = "masterpdfeditor-${version}";
 
   src = fetchurl {
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-    sha256 = "10kydjg9qi6kvzn7ny5nk4xn2fsm47anq3al89hq97ppm9dlvh48";
+    sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz";
   };
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];

From 7bffaa8efa2b2b191ec8595dbb7fe409f943459e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 13 Oct 2018 14:05:26 -0500
Subject: [PATCH 2964/3253] gmailieer: 0.9 -> 0.10

---
 pkgs/applications/networking/gmailieer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index 6d134708a5eb..fdd8e004c8b2 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "gmailieer-${version}";
-  version = "0.9";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "gmailieer";
     rev = "v${version}";
-    sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk";
+    sha256 = "0qv74marzdv99xc2jbzzcwx3b2hm6byjl734h9x42g4mcg5pq9yf";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 14a971d60950ab11c605675aa26789effc2bfa8f Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 13 Oct 2018 15:22:32 -0500
Subject: [PATCH 2965/3253] notmuch-bower: 0.8.1 -> 0.9 (#48332)

---
 .../networking/mailreaders/notmuch-bower/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
index f99a192889c9..84466f7cd3d6 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "notmuch-bower-${version}";
-  version = "0.8.1";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "wangp";
     repo = "bower";
     rev = version;
-    sha256 = "0rdjip6jq7qlfn640ci81m9vfgcn4q5vaj72zp3bria8m55a56rf";
+    sha256 = "0f8djiclq4rz9isbx18bpzymbvb2q0spvjp982b149hr1my6klaf";
   };
 
   nativeBuildInputs = [ gawk mercury pandoc ];

From c7f27571d34b7130b7e7584249860b98fcdd3c74 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 13 Oct 2018 22:42:40 +0200
Subject: [PATCH 2966/3253] cryptodev-linux: update meta.homepage

gna.org forge is closed
---
 pkgs/os-specific/linux/cryptodev/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index 45a7fe177f2b..c146e18f68d5 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     urls = [
       "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz"
-      "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"
     ];
     sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z";
   };
@@ -20,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Device that allows access to Linux kernel cryptographic drivers";
-    homepage = http://home.gna.org/cryptodev-linux/;
+    homepage = http://cryptodev-linux.org/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
     broken = !stdenv.lib.versionOlder kernel.version "4.13";

From ffa6c12b29eab05364f2778a250d3060d45cf056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 13 Oct 2018 18:10:45 -0300
Subject: [PATCH 2967/3253] deepin-wallpapers: init at 1.7.5

---
 .../deepin/deepin-wallpapers/default.nix      | 41 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-wallpapers/default.nix

diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
new file mode 100644
index 000000000000..ed2c795fd9cb
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, dde-api }:
+
+stdenv.mkDerivation rec {
+  name = "deepin-wallpapers-${version}";
+  version = "1.7.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = "deepin-wallpapers";
+    rev = version;
+    sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn";
+  };
+
+  nativeBuildInputs = [ dde-api.bin ];
+
+  postPatch = ''
+    sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile
+    sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/wallpapers/deepin
+    cp -a deepin/* deepin-community/* deepin-private/* $out/share/wallpapers/deepin
+    mkdir -p $out/var/cache
+    cp -a image-blur $out/var/cache
+    
+    # Suggested by upstream
+    mkdir -p $out/share/backgrounds/deepin
+    ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg $out/share/backgrounds/deepin/desktop.jpg
+    ln -s $(echo -n $out/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \
+      $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Wallpapers for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/deepin-wallpapers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 1ef7177e94d4..225de83a3a5f 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -19,6 +19,7 @@ let
       inherit (pkgs.gnome3) libgee vte;
       wnck = pkgs.libwnck3;
     };
+    deepin-wallpapers = callPackage ./deepin-wallpapers { };
     dtkcore = callPackage ./dtkcore { };
     dtkwm = callPackage ./dtkwm { };
     dtkwidget = callPackage ./dtkwidget { };

From 02ef5eb7a64ec00ce1df824a03aa2055bfd9563f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 13 Oct 2018 18:11:55 -0300
Subject: [PATCH 2968/3253] deepin-desktop-schemas: init at 3.2.18.7

---
 .../deepin/deepin-desktop-schemas/default.nix | 43 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix

diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
new file mode 100644
index 000000000000..b1a9c52014b8
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, python, deepin-gtk-theme,
+deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-desktop-schemas";
+  version = "3.2.18.7";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j";
+  };
+
+  nativeBuildInputs = [
+    python
+  ];
+
+  buildInputs = [
+    gnome3.dconf
+    deepin-gtk-theme
+    deepin-icon-theme
+    deepin-sound-theme
+    deepin-wallpapers
+  ];
+
+  postPatch = ''
+    # fix default background url
+    sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \
+      overrides/common/com.deepin.wrap.gnome.desktop.override
+  '';
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "GSettings deepin desktop-wide schemas";
+    homepage = https://github.com/linuxdeepin/deepin-desktop-schemas;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 225de83a3a5f..84f41dc3451b 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
     dde-api = callPackage ./dde-api { };
     dde-calendar = callPackage ./dde-calendar { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
+    deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
     deepin-icon-theme = callPackage ./deepin-icon-theme { };

From 07f8104707c7a2d078b00189ebeb3e9b73a42b32 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 13 Oct 2018 15:32:07 -0700
Subject: [PATCH 2969/3253] treewide: fix evaluation with `allowAliases =
 false`

---
 pkgs/applications/networking/p2p/soulseekqt/default.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-nix.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 1b7901e3c463..104131e47752 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -5,7 +5,7 @@
 , qtbase, qtmultimedia
 , libjson, libgpgerror
 , libX11, libxcb, libXau, libXdmcp, freetype, libbsd
-, pythonPackages, squashfsTools, desktop_file_utils
+, pythonPackages, squashfsTools, desktop-file-utils
 }:
 
 with stdenv.lib;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
 
   dontBuild = true;
 
-  buildInputs = [ pythonPackages.binwalk squashfsTools desktop_file_utils ];
+  buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ];
 
   # avoid usage of appimage's runner option --appimage-extract 
   unpackCmd = ''
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 523f4ed0212c..e1fd8d13285f 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -540,7 +540,7 @@ self: super: builtins.intersectAttrs super {
           --prefix PATH : "${path}" \
           --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
           --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
-          --set NIX_CFLAGS_LINK "-L${opencl-icd}/lib"
+          --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
       '';
     });
 }

From fa6c8ec2a7fc71f05c2687f3e6411eae34831fdf Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <palo@pepe>
Date: Tue, 9 Oct 2018 22:13:58 +0200
Subject: [PATCH 2970/3253] nixos/modules: services.syncthing add guiAddress
 parameter

---
 nixos/modules/services/networking/syncthing.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index c610b3b66606..cf21aa9eb70f 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -16,6 +16,14 @@ in {
         available on http://127.0.0.1:8384/.
       '';
 
+      guiAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1:8384";
+        description = ''
+          Address to serve the GUI.
+        '';
+      };
+
       systemService = mkOption {
         type = types.bool;
         default = true;
@@ -132,7 +140,12 @@ in {
           User = cfg.user;
           Group = cfg.group;
           PermissionsStartOnly = true;
-          ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
+          ExecStart = ''
+            ${cfg.package}/bin/syncthing \
+              -no-browser \
+              -gui-address=${cfg.guiAddress} \
+              -home=${cfg.dataDir}
+          '';
         };
       };
 

From 7c61bb615a3bcda46534436fd3136ef6103f3505 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 13 Oct 2018 18:14:56 -0500
Subject: [PATCH 2971/3253] libbsd: update patches

---
 pkgs/development/libraries/libbsd/cdefs.patch | 222 -----
 .../development/libraries/libbsd/darwin.patch | 758 +++++-------------
 pkgs/development/libraries/libbsd/default.nix |  11 +-
 .../libraries/libbsd/features.patch           |  26 -
 .../libraries/libbsd/non-glibc.patch          |  74 --
 5 files changed, 209 insertions(+), 882 deletions(-)
 delete mode 100644 pkgs/development/libraries/libbsd/cdefs.patch
 delete mode 100644 pkgs/development/libraries/libbsd/features.patch
 delete mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch

diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch
deleted file mode 100644
index 81822654aeb4..000000000000
--- a/pkgs/development/libraries/libbsd/cdefs.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:41:35 +0100
-Subject: Handle systems missing <sys/cdefs.h>
-
-This is a non-portable header, and we cannot expect it to be provided by
-the system libc (e.g. musl). We just need and rely on declaration that
-we have defined ourselves in our own <bsd/sys/cdefs.h>. So we switch to
-only ever assume that.
-
-Fixes: https://bugs.freedesktop.org/105281
----
- include/bsd/libutil.h        | 4 ++++
- include/bsd/md5.h            | 4 ++++
- include/bsd/nlist.h          | 4 ++++
- include/bsd/readpassphrase.h | 4 ++++
- include/bsd/stdlib.h         | 4 ++++
- include/bsd/string.h         | 4 ++++
- include/bsd/stringlist.h     | 5 +++++
- include/bsd/sys/queue.h      | 4 ++++
- include/bsd/sys/tree.h       | 4 ++++
- include/bsd/timeconv.h       | 4 ++++
- include/bsd/vis.h            | 4 ++++
- include/bsd/wchar.h          | 4 ++++
- 12 files changed, 49 insertions(+)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..ccca29a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_LIBUTIL_H
- 
- #include <features.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- #include <stdint.h>
- #include <stdio.h>
-diff --git a/include/bsd/md5.h b/include/bsd/md5.h
-index 5f3ae46..bf36a30 100644
---- a/include/bsd/md5.h
-+++ b/include/bsd/md5.h
-@@ -27,7 +27,11 @@ typedef struct MD5Context {
- 	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
- } MD5_CTX;
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
-index cb297e8..8767117 100644
---- a/include/bsd/nlist.h
-+++ b/include/bsd/nlist.h
-@@ -27,7 +27,11 @@
- #ifndef LIBBSD_NLIST_H
- #define LIBBSD_NLIST_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- struct nlist {
- 	union {
-diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h
-index 14744b8..5eb8021 100644
---- a/include/bsd/readpassphrase.h
-+++ b/include/bsd/readpassphrase.h
-@@ -31,7 +31,11 @@
- #define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
- #define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..8d33d1f 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -42,7 +42,11 @@
- #ifndef LIBBSD_STDLIB_H
- #define LIBBSD_STDLIB_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/stat.h>
- #include <stdint.h>
- 
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..29097f6 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_STRING_H
- #define LIBBSD_STRING_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h
-index ff30cac..dd71496 100644
---- a/include/bsd/stringlist.h
-+++ b/include/bsd/stringlist.h
-@@ -31,7 +31,12 @@
- 
- #ifndef LIBBSD_STRINGLIST_H
- #define LIBBSD_STRINGLIST_H
-+
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- /*
-diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h
-index 4a94ea7..ac00026 100644
---- a/include/bsd/sys/queue.h
-+++ b/include/bsd/sys/queue.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_SYS_QUEUE_H
- #define LIBBSD_SYS_QUEUE_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- /*
-  * This file defines four types of data structures: singly-linked lists,
-diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h
-index 628bec0..325b382 100644
---- a/include/bsd/sys/tree.h
-+++ b/include/bsd/sys/tree.h
-@@ -30,7 +30,11 @@
- #ifndef LIBBSD_SYS_TREE_H
- #define LIBBSD_SYS_TREE_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- /*
-  * This file defines data structures for different types of trees:
-diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h
-index e2a2c55..a426bd3 100644
---- a/include/bsd/timeconv.h
-+++ b/include/bsd/timeconv.h
-@@ -41,7 +41,11 @@
- #ifndef LIBBSD_TIMECONV_H
- #define LIBBSD_TIMECONV_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <stdint.h>
- #include <time.h>
- 
-diff --git a/include/bsd/vis.h b/include/bsd/vis.h
-index 970dfdd..ab5430c 100644
---- a/include/bsd/vis.h
-+++ b/include/bsd/vis.h
-@@ -72,7 +72,11 @@
-  */
- #define	UNVIS_END	1	/* no more characters */
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- __BEGIN_DECLS
- char	*vis(char *, int, int, int);
-diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h
-index 33a500e..7216503 100644
---- a/include/bsd/wchar.h
-+++ b/include/bsd/wchar.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_WCHAR_H
- 
- #include <stddef.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
--- 
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
index 4bddec6b0ffd..0f9cc9aaf964 100644
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -1,497 +1,103 @@
 diff --git a/configure.ac b/configure.ac
-index 88ccd91..0857782 100644
+index 55fcfe6..1e26c93 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -59,7 +59,7 @@ AS_CASE([$host_os],
- )
+@@ -51,15 +51,19 @@ AS_CASE([$host_os],
+     AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"])
+     AC_SUBST([CLOCK_GETTIME_LIBS])
+     LIBS="$saved_LIBS"
++    AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
+   ],
+   [*-musl*], [
+     # Upstream refuses to define this, we will do it ourselves then.
+     AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl])
++    AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
+   ],
+-)
++  [
++  AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
++  ])
  
  # Checks for header files.
 -AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
-+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h nlist.h])
  
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_INLINE
-@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
-                 pstat_getproc sysconf])
+@@ -143,7 +147,8 @@ AC_LINK_IFELSE(
+ 
+ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
+                 getauxval getentropy getexecname getline \
+-                pstat_getproc sysconf])
++                pstat_getproc sysconf \
++		strlcpy strlcat strnstr strmode fpurge])
  AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
  
-+HostOS=`echo "$host" | sed 's/.*-//'`
-+os_is_macosx=false
-+nonLinuxOS=false
-+AC_SUBST(HostOS)
-+case ${HostOS} in
-+	darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
-+		os_is_macosx=true
-+		nonLinuxOS=true
-+		echo HostOS="$HostOS"
-+		;;
-+	*)
-+		echo host="$host"
-+		echo HostOS="$HostOS"
-+		os_is_macosx=false
-+		nonLinuxOS=false
-+		;;
-+esac		
-+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
-+AM_COND_IF([IS_DARWIN],
-+	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
-+
-+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
-+AM_COND_IF([NON_LINUX],
-+	[AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
-+
  AC_CONFIG_FILES([
- 	Makefile
- 	include/Makefile
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..d0d4043 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,9 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
- 
-+#ifdef HAVE_FEATURES_H
- #include <features.h>
-+#endif
- #include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdint.h>
-diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
-index 4b69983..c75151b 100644
---- a/include/bsd/stdio.h
-+++ b/include/bsd/stdio.h
-@@ -48,12 +48,16 @@
- __BEGIN_DECLS
- const char *fmtcheck(const char *, const char *);
- 
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- /* XXX: The function requires cooperation from the system libc to store the
-  * line buffer in the FILE struct itself. */
- char *fgetln(FILE *fp, size_t *lenp)
--	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
--	                  "use getline(3) instead, as it is supported "
--	                  "by GNU and POSIX.1-2008.");
-+	__attribute__((deprecated("This functions cannot be safely ported, "
-+	                          "use getline(3) instead, as it is supported "
-+	                          "by GNU and POSIX.1-2008.")));
-+#else
-+char *fgetln(FILE *fp, size_t *lenp);
-+#endif
- 
- /*
-  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..6cd7943 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
-                const unsigned char *table, unsigned endbyte);
- 
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-+#if !__GLIBC_PREREQ(2, 26)
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
-+#endif
- 
- long long strtonum(const char *nptr, long long minval, long long maxval,
-                    const char **errstr);
 diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..6baaa14 100644
+index f987fee..a1e17ed 100644
 --- a/include/bsd/string.h
 +++ b/include/bsd/string.h
-@@ -37,6 +37,12 @@
+@@ -41,10 +41,21 @@
  #include <sys/types.h>
  
  __BEGIN_DECLS
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
-+size_t bsd_strlcat(char *dst, const char *src, size_t siz);
-+char *bsd_strnstr(const char *str, const char *find, size_t str_len);
-+void bsd_strmode(mode_t mode, char *str);
-+#else
++#if !HAVE_STRLCPY
  size_t strlcpy(char *dst, const char *src, size_t siz);
- size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
-@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
- #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
- void explicit_bzero(void *buf, size_t len);
- #endif
 +#endif
- __END_DECLS
++
++#if !HAVE_STRLCAT
+ size_t strlcat(char *dst, const char *src, size_t siz);
++#endif
++
++#if !HAVE_STRNSTR
+ char *strnstr(const char *str, const char *find, size_t str_len);
++#endif
++
++#if !HAVE_STRMODE
+ void strmode(mode_t mode, char *str);
++#endif
  
- #endif
+ #if !defined(__GLIBC__) || \
+     (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
 diff --git a/src/Makefile.am b/src/Makefile.am
-index ad83dbf..0f2a7ee 100644
+index f3cc0fa..3aaecd4 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
- 	libbsd.map
+@@ -56,8 +56,10 @@ libbsd_la_DEPENDENCIES = \
  libbsd_la_LIBADD = \
  	$(CLOCK_GETTIME_LIBS)
-+
-+if IS_DARWIN
-+libbsd_la_LDFLAGS = \
-+	-Wl \
-+	-version-number $(LIBBSD_ABI)
-+else
  libbsd_la_LDFLAGS = \
- 	-Wl,--version-script=$(srcdir)/libbsd.map \
+-	-Wl,--version-script=$(srcdir)/libbsd.map \
  	-version-number $(LIBBSD_ABI)
++if BUILD_LINK_VERSION_SCRIPT
++libbsd_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libbsd.map
 +endif
-+
  libbsd_la_SOURCES = \
  	arc4random.c \
--	arc4random.h \
--	arc4random_unix.h \
--	arc4random_openbsd.h \
- 	arc4random_uniform.c \
- 	bsd_getopt.c \
--	chacha_private.h \
- 	closefrom.c \
- 	dehumanize_number.c \
- 	err.c \
-@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
- 	$(nil)
- endif
- 
-+noinst_HEADERS = \
-+	arc4random.h \
-+	arc4random_bsd.h \
-+	arc4random_linux.h \
-+	arc4random_unix.h \
-+	arc4random_osx.h \
-+	arc4random_openbsd.h \
-+	chacha_private.h
-+
- libbsd_ctor_a_SOURCES = \
- 	setproctitle_ctor.c \
- 	$(nil)
-diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
-new file mode 100644
-index 0000000..ece2f85
---- /dev/null
-+++ b/src/arc4random_bsd.h
-@@ -0,0 +1,86 @@
-+/*	$OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+/*
-+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
-+ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
-+ * appear to fail silently. So, it is not always possible to detect a PID
-+ * wraparound.
-+ */
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
-new file mode 100644
-index 0000000..d61a8db
---- /dev/null
-+++ b/src/arc4random_linux.h
-@@ -0,0 +1,86 @@
-+/*	$OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#ifdef __GLIBC__
-+extern void *__dso_handle;
-+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
-+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
-+#else
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+#endif
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
-new file mode 100644
-index 0000000..14771a6
---- /dev/null
-+++ b/src/arc4random_osx.h
-@@ -0,0 +1,82 @@
-+/*	$OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <unistd.h>
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		*rsp = NULL;
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/fgetln.c b/src/fgetln.c
-index 4d1726e..9c73788 100644
---- a/src/fgetln.c
-+++ b/src/fgetln.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <string.h>
- 
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- #include "local-link.h"
-+#endif
- 
- #ifdef HAVE_GETLINE
- struct filebuf {
-@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
- 		return fb->buf;
- 	}
- }
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- libbsd_link_warning(fgetln,
-                     "This functions cannot be safely ported, use getline(3) "
-                     "instead, as it is supported by GNU and POSIX.1-2008.")
-+#endif
- #else
- #error "Function fgetln() needs to be ported."
- #endif
+ 	arc4random.h \
 diff --git a/src/fpurge.c b/src/fpurge.c
-index 462535a..e7eb46f 100644
+index 462535a..a8941db 100644
 --- a/src/fpurge.c
 +++ b/src/fpurge.c
-@@ -26,9 +26,11 @@
+@@ -26,9 +26,10 @@
  
  #include <errno.h>
  #include <stdio.h>
-+#if HAVE___FPURGE
- #include <stdio_ext.h>
-+#endif
+-#include <stdio_ext.h>
  
--#ifdef HAVE___FPURGE
-+#ifdef HAVE___FPURGE                   /* glibc >= 2.2, Haiku, Solaris >= 7 */
+ #ifdef HAVE___FPURGE
++#include <stdio_ext.h>
++
  int
  fpurge(FILE *fp)
  {
-@@ -42,5 +44,55 @@ fpurge(FILE *fp)
+@@ -41,6 +42,36 @@ fpurge(FILE *fp)
+ 
  	return 0;
  }
- #else
--#error "Function fpurge() needs to be ported."
-+#define fp_ fp
-+//#error "Function fpurge() needs to be ported."
-+//#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++#elif HAVE_FPURGE
 +int
 +fpurge(FILE *fp)
 +{
@@ -501,12 +107,13 @@ index 462535a..e7eb46f 100644
 +	}
 +
 +  /* Call the system's fpurge function.  */
-+# undef fpurge
-+# if !HAVE_DECL_FPURGE
++#undef fpurge
++#if !HAVE_DECL_FPURGE
 +  extern int fpurge (FILE *);
-+# endif
++#endif
 +  int result = fpurge (fp);
-+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++#if defined(__sferror) || defined(__DragonFly__)
 +  if (result == 0)
 +    /* Correct the invariants that fpurge broke.
 +       <stdio.h> on BSD systems says:
@@ -514,69 +121,35 @@ index 462535a..e7eb46f 100644
 +       If this invariant is not fulfilled and the stream is read-write but
 +       currently reading, subsequent putc or fputc calls will write directly
 +       into the buffer, although they shouldn't be allowed to.  */
-+    if ((fp_->_flags & __SRD) != 0)
-+      fp_->_w = 0;
++    if ((fp->_flags & __SRD) != 0)
++      fp->_w = 0;
 +#endif
 +  return result;
 +}
-+//#endif
-+#endif
-+
-+#ifdef TEST
-+int
-+main()
-+{
-+	static FILE fp_bad;
-+	FILE *fp;
-+
-+	if (fpurge(&fp_bad) == 0)
-+		return 1;
-+
-+	fp = fopen("/dev/zero", "r");
-+	if (fpurge(fp) < 0)
-+		return 1;
-+
-+	fclose(fp);
-+
-+	return 0;
-+}
+ #else
+ #error "Function fpurge() needs to be ported."
  #endif
 diff --git a/src/funopen.c b/src/funopen.c
-index 1e05c7e..75e61ea 100644
+index 1e05c7e..65ba5a8 100644
 --- a/src/funopen.c
 +++ b/src/funopen.c
 @@ -143,6 +143,7 @@ funopen(const void *cookie,
   * they will not add the needed support to implement it. Just ignore this
   * interface there, as it has never been provided anyway.
   */
-+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#elif defined(__MACH__)
  #else
  #error "Function funopen() needs to be ported or disabled."
  #endif
-diff --git a/src/getentropy.c b/src/getentropy.c
-index 3f11a1e..8a23a07 100644
---- a/src/getentropy.c
-+++ b/src/getentropy.c
-@@ -28,9 +28,7 @@
- #include "getentropy_linux.c"
- #elif defined(__GNU__)
- #include "getentropy_hurd.c"
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--#include "getentropy_bsd.c"
--#elif defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- #include "getentropy_bsd.c"
- #elif defined(__sun)
- #include "getentropy_solaris.c"
 diff --git a/src/hash/sha512.h b/src/hash/sha512.h
-index 4f368a1..ab22fc1 100644
+index 4f368a1..7632e25 100644
 --- a/src/hash/sha512.h
 +++ b/src/hash/sha512.h
 @@ -29,7 +29,11 @@
  #ifndef _SHA512_H_
  #define _SHA512_H_
  
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#ifdef __MACH__
 +#include <stdint.h>
 +#else
  #include <sys/types.h>
@@ -585,16 +158,15 @@ index 4f368a1..ab22fc1 100644
  #define SHA512_DIGEST_LENGTH		64
  
 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
-index b3c8d5e..f69013d 100644
+index b3c8d5e..602f54e 100644
 --- a/src/hash/sha512c.c
 +++ b/src/hash/sha512c.c
-@@ -25,7 +25,13 @@
+@@ -25,7 +25,12 @@
   */
  
  #include <sys/cdefs.h>
-+__FBSDID("$FreeBSD$");
 +
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#ifdef __MACH__
 +#include <machine/endian.h>
 +#else
  #include <sys/endian.h>
@@ -602,102 +174,188 @@ index b3c8d5e..f69013d 100644
  #include <sys/types.h>
  
  #include <string.h>
+diff --git a/src/local-link.h b/src/local-link.h
+index d518dcf..84694a2 100644
+--- a/src/local-link.h
++++ b/src/local-link.h
+@@ -27,7 +27,11 @@
+ #ifndef LIBBSD_LOCAL_LINK_H
+ #define LIBBSD_LOCAL_LINK_H
+ 
++#ifdef __MACH__
++#define libbsd_link_warning(symbol, msg)
++#else
+ #define libbsd_link_warning(symbol, msg) \
+ 	static const char libbsd_emit_link_warning_##symbol[] \
+ 		__attribute__((used,section(".gnu.warning." #symbol))) = msg;
+ #endif
++#endif
 diff --git a/src/nlist.c b/src/nlist.c
-index 0932f59..598a329 100644
+index 0932f59..4502048 100644
 --- a/src/nlist.c
 +++ b/src/nlist.c
-@@ -27,6 +27,10 @@
-  * SUCH DAMAGE.
-  */
+@@ -41,6 +41,7 @@
+ #include <unistd.h>
+ #include <nlist.h>
  
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-+#endif /* LIBC_SCCS and not lint */
- #include <sys/cdefs.h>
++#if !HAVE_NLIST_H
+ #include "local-elf.h"
  
- #include <sys/param.h>
-@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
+ #define SIZE_T_MAX 0xffffffffU
+@@ -265,3 +266,4 @@ nlist(const char *name, struct nlist *list)
  	(void)close(fd);
  	return (n);
  }
-+#endif /* _NLIST_DO_ELF */
++#endif
+diff --git a/src/readpassphrase.c b/src/readpassphrase.c
+index f9f6195..2bc5fb4 100644
+--- a/src/readpassphrase.c
++++ b/src/readpassphrase.c
+@@ -36,6 +36,14 @@
+ #define TCSASOFT 0
+ #endif
+ 
++#ifndef _SIGMAX
++#define	_SIGMAX	64
++#endif
++
++#ifndef _NSIG
++#define _NSIG (_SIGMAX + 1)
++#endif
++
+ static volatile sig_atomic_t signo[_NSIG];
+ 
+ static void handler(int);
 diff --git a/src/setproctitle.c b/src/setproctitle.c
-index 038ac7d..d0ef01b 100644
+index 038ac7d..e9ee09c 100644
 --- a/src/setproctitle.c
 +++ b/src/setproctitle.c
-@@ -32,6 +32,11 @@
+@@ -32,6 +32,10 @@
  #include <unistd.h>
  #include <string.h>
  
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+#define __asm__(x)
++#ifdef __MACH__
 +extern char **environ;
 +#endif
 +
  static struct {
  	/* Original value. */
  	const char *arg0;
-@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
+@@ -280,16 +284,22 @@ setproctitle_impl(const char *fmt, ...)
+ 		*++nul = '\0';
+ 	}
+ }
++#ifndef __MACH__
+ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
++#endif
+ 
+ /* The original function introduced in 0.2 was a stub, it only got implemented
+  * in 0.5, make the implementation available in the old version as an alias
   * for code linking against that version, and change the default to use the
   * new version, so that new code depends on the implemented version. */
- #ifdef HAVE_TYPEOF
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+//
-+// HACK: even weak aliasing breaks in clang so just comment this out for now
-+//
-+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
-+#else
+-#ifdef HAVE_TYPEOF
++#ifdef __MACH__
++void setproctitle_stub(const char *fmt, ...);
++#elif HAVE_TYPEOF
  extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
-+#endif
  #else
  void setproctitle_stub(const char *fmt, ...)
  	__attribute__((alias("setproctitle_impl")));
+ #endif
++#ifndef __MACH__
+ __asm__(".symver setproctitle_stub,setproctitle@LIBBSD_0.2");
++#endif
 diff --git a/src/strlcat.c b/src/strlcat.c
-index 14c53a1..e01cb60 100644
+index 14c53a1..5961c17 100644
 --- a/src/strlcat.c
 +++ b/src/strlcat.c
-@@ -27,7 +27,11 @@
+@@ -26,6 +26,7 @@
+  * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
   * If retval >= dsize, truncation occurred.
   */
++#if !HAVE_STRLCAT
  size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcat(char *dst, const char *src, size_t dsize)
-+#else
  strlcat(char *dst, const char *src, size_t dsize)
-+#endif
  {
- 	const char *odst = dst;
- 	const char *osrc = src;
+@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize)
+ 
+ 	return(dlen + (src - osrc));	/* count does not include NUL */
+ }
++#endif
 diff --git a/src/strlcpy.c b/src/strlcpy.c
-index e9a7fe4..10a855f 100644
+index e9a7fe4..5137acb 100644
 --- a/src/strlcpy.c
 +++ b/src/strlcpy.c
-@@ -25,7 +25,11 @@
+@@ -24,6 +24,7 @@
+  * chars will be copied.  Always NUL terminates (unless dsize == 0).
   * Returns strlen(src); if retval >= dsize, truncation occurred.
   */
++#if !HAVE_STRLCPY
  size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcpy(char *dst, const char *src, size_t dsize)
-+#else
  strlcpy(char *dst, const char *src, size_t dsize)
-+#endif
  {
- 	const char *osrc = src;
- 	size_t nleft = dsize;
+@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize)
+ 
+ 	return(src - osrc - 1);	/* count does not include NUL */
+ }
++#endif
 diff --git a/src/strmode.c b/src/strmode.c
-index e6afde5..c463243 100644
+index e6afde5..da680c9 100644
 --- a/src/strmode.c
 +++ b/src/strmode.c
-@@ -33,7 +33,11 @@
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
  #include <string.h>
  
++#if !HAVE_STRMODE
  void
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strmode(mode_t mode, char *p)
-+#else
  strmode(mode_t mode, char *p)
-+#endif
  {
- 	 /* print type */
- 	switch (mode & S_IFMT) {
+@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p)
+ 	*p++ = ' ';		/* will be a '+' if ACL's implemented */
+ 	*p = '\0';
+ }
++#endif
+diff --git a/src/unvis.c b/src/unvis.c
+index 94e3e7a..fba4c66 100644
+--- a/src/unvis.c
++++ b/src/unvis.c
+@@ -565,11 +565,15 @@ strnunvis_openbsd(char *dst, const char *src, size_t dlen)
+ {
+ 	return strnunvisx(dst, dlen, src, 0);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnunvis_openbsd,strnunvis@@LIBBSD_0.2");
++#endif
+ 
+ int
+ strnunvis_netbsd(char *dst, size_t dlen, const char *src)
+ {
+ 	return strnunvisx(dst, dlen, src, 0);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnunvis_netbsd,strnunvis@LIBBSD_0.9.1");
++#endif
+diff --git a/src/vis.c b/src/vis.c
+index c2cd2d8..2d84330 100644
+--- a/src/vis.c
++++ b/src/vis.c
+@@ -723,14 +723,18 @@ strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags)
+ {
+ 	return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2");
++#endif
+ 
+ int
+ strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags)
+ {
+ 	return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1");
++#endif
+ 
+ int
+ stravis(char **mbdstp, const char *mbsrc, int flags)
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index b304b73e7e03..dc7213acd638 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -13,16 +13,7 @@ stdenv.mkDerivation rec {
   # the configure scripts
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
-    # Suitable for all, but limited to musl to avoid rebuilds
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-      # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
-      ./non-glibc.patch
-      # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
-      ./cdefs.patch
-      # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
-      ./features.patch
-  ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch
deleted file mode 100644
index 66bd1e9232ba..000000000000
--- a/pkgs/development/libraries/libbsd/features.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:42:52 +0100
-Subject: Remove <features.h> inclusion from <bsd/libutil.h>
-
-This is a non-portable header, and we should not assume it is present.
-Let the first system header pull it in if needed.
----
- include/bsd/libutil.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index ccca29a..e5f148a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,6 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
- 
--#include <features.h>
- #ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
- #else
--- 
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch
deleted file mode 100644
index f61e0d242943..000000000000
--- a/pkgs/development/libraries/libbsd/non-glibc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:39:45 +0100
-Subject: Fix function declaration protection for glibc already providing them
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On non-glibc based systems we cannot unconditionally use the
-__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead,
-if it is undefined, define it to 0.
-
-We should also always declare these functions on non-glibc based
-systems. And on systems with a new enough glibc, which provides these
-functions, we should still provide the declarations if _GNU_SOURCE
-is *not* defined.
-
-Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- include/bsd/stdlib.h    | 3 ++-
- include/bsd/string.h    | 3 ++-
- include/bsd/sys/cdefs.h | 8 ++++++++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index 8d33d1f..a5b063c 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb,
-                const unsigned char *table, unsigned endbyte);
- 
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if !defined(__GLIBC__) || \
-+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
- 
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 29097f6..f987fee 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
- void strmode(mode_t mode, char *str);
- 
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
-+#if !defined(__GLIBC__) || \
-+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
- void explicit_bzero(void *buf, size_t len);
- #endif
- __END_DECLS
-diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
-index b4c8f30..d1cc419 100644
---- a/include/bsd/sys/cdefs.h
-+++ b/include/bsd/sys/cdefs.h
-@@ -59,6 +59,14 @@
- #endif
- 
- /*
-+ * On non-glibc based systems, we cannot unconditionally use the
-+ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
-+ */
-+#ifndef __GLIBC_PREREQ
-+#define __GLIBC_PREREQ(maj, min) 0
-+#endif
-+
-+/*
-  * Some kFreeBSD headers expect those macros to be set for sanity checks.
-  */
- #ifndef _SYS_CDEFS_H_
--- 
-cgit v1.1
-

From ff444175b3a48994e280e4516c2b32a5f7cbe5fc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 1 Oct 2018 23:12:46 +0200
Subject: [PATCH 2972/3253] pythonPackages.peewee: init at 3.7.1

---
 .../python-modules/peewee/default.nix         | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/peewee/default.nix

diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
new file mode 100644
index 000000000000..09ee7dc92eaa
--- /dev/null
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, buildPythonPackage, fetchFromGitHub
+, sqlite
+, cython
+, apsw
+, flask
+, withPostgres ? false, psycopg2
+, withMysql ? false, mysql-connector
+}:
+
+buildPythonPackage rec {
+
+  pname = "peewee";
+  version = "3.7.1";
+
+  # pypi release does not provide tests
+  src = fetchFromGitHub {
+    owner = "coleifer";
+    repo = pname;
+    rev = version;
+    sha256 = "0chn8mknzvkmcmysy2291hanf0vg3sfzqgfc5hqx1nnrd6qkiq8r";
+  };
+
+
+  checkInputs = [ flask ];
+
+  checkPhase = ''
+    rm -r playhouse # avoid using the folder in the cwd
+    python runtests.py
+  '';
+
+  buildInputs = [
+    sqlite
+    cython # compile speedups
+  ];
+
+  propagatedBuildInputs = [
+    apsw # sqlite performance improvement
+  ] ++ (lib.optional withPostgres psycopg2)
+    ++ (lib.optional withMysql mysql-connector);
+
+  meta = with stdenv.lib;{
+    description = "a small, expressive orm";
+    homepage    = http://peewee-orm.com;
+    license     = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2da2892f9beb..ee1bee109a3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3666,6 +3666,8 @@ in {
     };
   };
 
+  peewee =  callPackage ../development/python-modules/peewee { };
+
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.5";
 

From f20899dd41f8fac6028a6a811da068e2b3a1460e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 2 Oct 2018 00:17:42 +0200
Subject: [PATCH 2973/3253] cozy: init at 0.6.3

---
 .../audio/cozy-audiobooks/default.nix         | 85 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/applications/audio/cozy-audiobooks/default.nix

diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix
new file mode 100644
index 000000000000..f0a7280b038d
--- /dev/null
+++ b/pkgs/applications/audio/cozy-audiobooks/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchFromGitHub
+, ninja
+, boost
+, meson
+, pkgconfig
+, wrapGAppsHook
+, appstream-glib
+, desktop-file-utils
+, gtk3
+, gst_all_1
+, gobjectIntrospection
+, python3Packages
+, file
+, cairo
+, sqlite
+, gettext
+, gnome3
+}:
+
+python3Packages.buildPythonApplication rec {
+
+  format = "other"; # no setup.py
+
+  name = "cozy-${version}";
+  version = "0.6.3";
+
+  src = fetchFromGitHub {
+    owner = "geigi";
+    repo = "cozy";
+    rev = version;
+    sha256 = "0xs6vzvmx0nvybpjqlrngggv2x8b2ky073slh760iirs1p0dclbc";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig
+    wrapGAppsHook
+    appstream-glib
+    desktop-file-utils
+    gobjectIntrospection
+  ];
+
+  buildInputs = [
+    gtk3
+    cairo
+    gettext
+    gnome3.defaultIconTheme
+  ] ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-plugins-base
+  ]);
+
+  propagatedBuildInputs = with python3Packages; [
+    gst-python
+    pygobject3
+    dbus-python
+    mutagen
+    peewee
+    magic
+  ];
+
+  postPatch = ''
+    chmod +x data/meson_post_install.py
+    patchShebangs data/meson_post_install.py
+    substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'"
+  '';
+
+  checkPhase = ''
+    ninja test
+  '';
+
+  postInstall = ''
+    ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+       A modern audio book player for Linux using GTK+ 3
+    '';
+    homepage = https://cozy.geigi.de/;
+    maintainers = [ maintainers.makefu ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23b2b7ac91b0..2c118561c8b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -653,6 +653,8 @@ with pkgs;
 
   chkcrontab = callPackage ../tools/admin/chkcrontab { };
 
+  cozy = callPackage ../applications/audio/cozy-audiobooks { };
+
   djmount = callPackage ../tools/filesystems/djmount { };
 
   dgsh = callPackage ../shells/dgsh { };

From 3251dab047d66c16a172f64e9df09dd2e7e6f382 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 17:14:36 -0700
Subject: [PATCH 2974/3253] libtoxcore: 0.2.3 -> 0.2.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libtoxcore/versions
---
 pkgs/development/libraries/libtoxcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index b3636eef2621..4a8dfc40d4a1 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -49,7 +49,7 @@ in rec {
   };
 
   libtoxcore_0_2 = generic {
-    version = "0.2.3";
-    sha256 = "1z8638cmxssc4jvbf64x549m84pz28729xbxc4c4ss1k792x30ya";
+    version = "0.2.8";
+    sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm";
   };
 }

From 8e15e9c45235f015bb7cfbb634fd5f91a03acbb2 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 14 Oct 2018 02:41:33 +0200
Subject: [PATCH 2975/3253] monero-gui: 0.12.3.0 -> 0.13.0.2

---
 pkgs/applications/altcoins/monero-gui/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index 49b8db51bcc8..c26df670930b 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -5,20 +5,20 @@
 , qtlocation, qtquickcontrols2, qtwebchannel
 , qtwebengine, qtx11extras, qtxmlpatterns
 , monero, unbound, readline, boost, libunwind
-, pcsclite, zeromq, cppzmq, pkgconfig
+, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "monero-gui-${version}";
-  version = "0.12.3.0";
+  version = "0.13.0.2";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i";
+    sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     qtdeclarative qtlocation qtquickcontrols2
     qtwebchannel qtwebengine qtx11extras
     qtxmlpatterns monero unbound readline
-    boost libunwind pcsclite zeromq cppzmq
-    makeWrapper
+    boost libunwind libsodium pcsclite zeromq
+    cppzmq makeWrapper
   ];
 
   patches = [

From e2f8d7bd447bf06496cf3f8c151ccbb58e08ebbe Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 13 Oct 2018 19:53:19 -0500
Subject: [PATCH 2976/3253] libbsd: fix build w/musl by adding missing include

Patch from void, with prefix added.
---
 pkgs/development/libraries/libbsd/default.nix |  4 +++-
 pkgs/development/libraries/libbsd/musl.patch  | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libbsd/musl.patch

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index dc7213acd638..a8d1925e5c0d 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   # the configure scripts
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+    # Suitable for all but limited to musl to avoid rebuild
+    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch;
 
   meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
diff --git a/pkgs/development/libraries/libbsd/musl.patch b/pkgs/development/libraries/libbsd/musl.patch
new file mode 100644
index 000000000000..fc07cfb6e855
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/musl.patch
@@ -0,0 +1,14 @@
+Source: maxice8
+Upstream: no
+Reason: fixes compilation
+
+--- a/src/flopen.c
++++ b/src/flopen.c
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <stdarg.h>
+ #include <unistd.h>
++#include <fcntl.h>
+ 
+ #include <libutil.h>
+ 

From 6a1e3aacf3039f782ae599c65f57aaf11fc5038b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 18:16:14 -0700
Subject: [PATCH 2977/3253] slurm: 18.08.0-1 -> 18.08.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/slurm/versions
---
 pkgs/servers/computing/slurm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index e016c5860f74..44ae3b894d54 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "slurm-${version}";
-  version = "18.08.0-1";
+  version = "18.08.1.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${builtins.replaceStrings ["."] ["-"] name}";
-    sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq";
+    sha256 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k";
   };
 
   outputs = [ "out" "dev" ];

From d1ab722b26c983da1ff3f56687289b5ebc09a7a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 18:32:22 -0700
Subject: [PATCH 2978/3253] renpy: 7.0.0 -> 7.1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/renpy/versions
---
 pkgs/development/interpreters/renpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 4dff7e6974ef..22b4f93b136c 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -7,7 +7,7 @@ with pythonPackages;
 
 stdenv.mkDerivation rec {
   name = "renpy-${version}";
-  version = "7.0.0";
+  version = "7.1.1";
 
   meta = with stdenv.lib; {
     description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
-    sha256 = "0yrwp5iw4fjg7kbd041qv8gh2p0dnbrnkrgmn0ndk5k10pjij82g";
+    sha256 = "1lmahwgy5jyak0bdbh4jlr23x35f87k7jcydkywns3mph6q7r01i";
   };
 
   patches = [

From d545e4dd52824f397c8aa6f06b59fbd256646b3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 18:40:40 -0700
Subject: [PATCH 2979/3253] sbc: 1.3 -> 1.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sbc/versions
---
 pkgs/development/libraries/sbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 0dc9c1afd2b4..b9830b65ffb7 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.3";
+  name = "sbc-1.4";
 
   src = fetchurl {
     url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
-    sha256 = "02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476";
+    sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f60759ab37b7e856e939424628a40a6ad5865aa2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:03:27 -0700
Subject: [PATCH 2980/3253] rspamd: 1.7.9 -> 1.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rspamd/versions
---
 pkgs/servers/mail/rspamd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index c8da0ea630e1..02e14f3b5aca 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -6,13 +6,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "1.7.9";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
     rev = version;
-    sha256 = "1qfkmcrcswh7k7bvr1ki1n83lnjmfd9h0281qgia0dlam7y81bcy";
+    sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From ebb8bef904d763aed346017e1f2da83decebf5de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:05:14 -0700
Subject: [PATCH 2981/3253] sslmate: 1.6.0 -> 1.7.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sslmate/versions
---
 pkgs/development/tools/sslmate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix
index 279bce20d142..9261b892cca5 100644
--- a/pkgs/development/tools/sslmate/default.nix
+++ b/pkgs/development/tools/sslmate/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, perl, makeWrapper, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "sslmate-1.6.0";
+  name = "sslmate-1.7.0";
 
   src = fetchurl {
     url = "https://packages.sslmate.com/other/${name}.tar.gz";
-    sha256 = "1ypabdk0nlqjzpmn3m1szjyw7yq20svgbm92sqd5wqmsapyn3a6s";
+    sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm";
   };
 
   makeFlags = "PREFIX=$(out)";

From 18f2d12a810ee22bd2dcc64c8ca08bc29dc590ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:16:16 -0700
Subject: [PATCH 2982/3253] react-native-debugger: 0.7.20 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/react-native-debugger/versions
---
 pkgs/development/tools/react-native-debugger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index a1b9090417c1..3bba4237cf85 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -38,11 +38,11 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "react-native-debugger-${version}";
-  version = "0.7.20";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
-    sha256 = "0nd707plj2c96g0dl976dv8b6dlfh12pdqrmxvp0qc2m2j6y9vig";
+    sha256 = "180rvcnr3xxg7nb5g4b45l9a67h2dx8ps0l05r6ph3f71kzh4dd9";
   };
 
   buildInputs = [ unzip ];

From 2b1d4611d19755cfe62d3a0ee6476deccf10e1bd Mon Sep 17 00:00:00 2001
From: Jonathan Queiroz <dev@johnjq.com>
Date: Mon, 27 Aug 2018 21:25:10 -0300
Subject: [PATCH 2983/3253] spotifywm-unstable: init at 2016-11-28

---
 pkgs/applications/audio/spotifywm/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/audio/spotifywm/default.nix

diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix
new file mode 100644
index 000000000000..f22340b69412
--- /dev/null
+++ b/pkgs/applications/audio/spotifywm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, spotify, xorg }:
+stdenv.mkDerivation rec {
+  name = "spotifywm-unstable-${version}";
+  version = "2016-11-28";
+
+  src = fetchFromGitHub {
+    owner  = "dasJ";
+    repo   = "spotifywm";
+    rev    = "91dd5532ffb7a398d775abe94fe7781904ab406f";
+    sha256 = "01z088i83410bpx1vbp7c6cq01r431v55l7340x3izp53lnpp379";
+  };
+
+  buildInputs = [ xorg.libX11 ];
+
+  propagatedBuildInputs = [ spotify ];
+
+  installPhase = ''
+    echo "#!${stdenv.shell}" > spotifywm
+    echo "LD_PRELOAD="$out/lib/spotifywm.so" ${spotify}/bin/spotify \$*" >> spotifywm
+    install -Dm644 spotifywm.so $out/lib/spotifywm.so
+    install -Dm755 spotifywm $out/bin/spotifywm
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dasJ/spotifywm;
+    description = "Wrapper around Spotify that correctly sets class name before opening the window";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jqueiroz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab5508ef7331..abfae478d295 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18826,6 +18826,8 @@ with pkgs;
     apiKey = config.libspotify.apiKey or null;
   };
 
+  spotifywm = callPackage ../applications/audio/spotifywm { };
+
   squeezelite = callPackage ../applications/audio/squeezelite { };
 
   ltunify = callPackage ../tools/misc/ltunify { };

From 1828799f471a9d57392388215f9b80fba28ea13b Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Sat, 13 Oct 2018 20:10:21 -0700
Subject: [PATCH 2984/3253] easyrsa: add support for darwin

---
 pkgs/tools/networking/easyrsa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index fcc6c1d86bdf..8205bddc7fe0 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -35,6 +35,6 @@ in stdenv.mkDerivation rec {
     homepage = https://openvpn.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.offline ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 726dd7915135ad5fc1098776a822f5695e49ee23 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 14 Oct 2018 11:24:03 +0800
Subject: [PATCH 2985/3253] firefox-devedition-bin: 63.0b13 -> 63.0b14

---
 .../firefox-bin/devedition_sources.nix        | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 582da6bd8c94..fcfa88a755f4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b13";
+  version = "63.0b14";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "34615c8bf9be4bc1f544c32df32d986b44d66f91e5f9a834fa7d7321b951700889e7ba1cf41348df457ffc71dd40e8f52177266299ca3044fc2af4514956a8b2";
+      sha512 = "baf8a78f63e7fe6b09ac1d5fc4cab9d51b7f43f5dd747c569aa9dc17380745b306a714ce3c166ebaf48f180a62492e15bfc3f1e4d597bbbb766101a9a984a68f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "501cd71d70809bd81f233b5205f06f289046eeab8258b1fc87e652ec2235ec73dd7f783f5d4eb8206f8981ba06f4ef312ea4a28e3a23dbb34a099cbe74bfbc7a";
+      sha512 = "556958203022beeb2a091f347bb02dc6815cb8480dc05c92021d8b8290f7eec632baca2e697d476d63f52db5ffb62546f52b696ada1163e39abf4afee1d73792";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "e3cb48e42d423843e9e563f94bf28086c6b68306191b1893aa5ddf9e482ab947bc3bb123e36d64b3f10eb9a6750c845799ecaea721858c3de93cb120561f34e4";
+      sha512 = "2ba5e5a9d5a4aa80f3fd30e85d2b94aa024d14d13572433fcf148d3211b9400a08c899cae57359b4ba09b0038d5e867e4266fdecb5da5a45ff14d09a38f864fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ccea5e826c4701f33b72165a6aa5087e9cd030c763fb291d94deac2a4650d1666b187909a6122f80df2d5182053cc31c63354fbba468709d8bbf9d3581604469";
+      sha512 = "866c25745a7ef818e9293bdf3e5c0d64da71afe6f63157a3fa0ef0712cda2d1ffa6407ca2d9d4e240977f01fd71215fd9446f23a850c012f5ce86eccdbc5e3e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "5562bdcfe2922203a51e28ed2b03d98b24e401d447acd91b32de25db4553f779bf98530912e1063757d2340e73b7c93092d7b56a208f4b0e899b78c1f1a02f07";
+      sha512 = "15bc92f11b42ebe01a1e3c908f9567807c8cfc2abb67a29a6bfa90d59f4835b01ff6b36272b9db1f6e5880fa7d38fbec5edbde7a7444ecae74eb8c429e89c8d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "4dae80bb715f931f2b7b85a4031335edecab8eeda9bbf8d5afa850d4c4db6cff1c41827a35d95d0bd3bd06351d835edf12f23f37a2fcd8735778cd898b969746";
+      sha512 = "4e8b4f5543dfa4f73ecb4b18a3ffc10ac1a50cb39e67ce5077d78eb95ce7664f261663051bb29354fbef8e8f0ab0213f1abbbb4aa7a9b6d313baaa787bbdcb7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "dbea03117bbd76daf7dbe2b0fd5364255c998b9de8f1d5b1731613f676d442abb0a4e2de43eddcc0162f96898aa1bc7b08b72264d87d7625a56d177eb49d6d08";
+      sha512 = "211032b7d21542900298ddcf7157a7d40991a6337ee51e7e646327eec8464b28e054a8ad8a42003c998a5010427c6f7618405ea3b95dfd0e484f73614250936c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "b194bed02d6fdaa0389856e9b838cfb48d2d3a39cec8a6e4a6b80fc5fff9fd6ffaad431c34d546475e8cc126fc3a686619f72a557ad9f2395f5e2db4932443ad";
+      sha512 = "985f1f45357ec1579a7aa84bceb2450f5fd8779e509c9ce8a01138f5c4b840ef18195ed1b7309e3d6d436e9002516c2f76a7a5d1081345b5a1893fcee43bd123";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5b6c8ed858b5e412bdf75643f988226a762e8c649f33064e488e1790b1266c8fad5a75eb79110aa1d03f9699a05b0d87494d7a1171894696399c1b74f8ac929d";
+      sha512 = "2294ca16c22477953f9bb75c4be3914822c07c19cf7ae776d4108df6c3bc3333bfa72a129645487a5b245cb5c97a3ddfd225079be5380d2a9433e98d165022f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a44fbd3c3d0607c5c5193125002bcbe890e7fddb6306e45ea7dafe491b43085d55bcc912e8e94ef9c6bb7c3672e6456806f17a5291b0588742319a69ef93474c";
+      sha512 = "99f1fd21abd3f92d73daaaeab5c9987728c7b852505e6b92a67cf59efad7115aa4586e34d37c77e4f5a3011c5a82bbf927e9a918c723221a2b48d64d650d9d3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "dda156f8acf3e0790c4ef2195eeac9ccc5895e1d92999f4b8254531c55e1074c313d8acd98182781b35c5d96592227ff29435d1f4c55ba8c39de60de4ea0ae92";
+      sha512 = "c1ee3e532fbd6eb047d2de9499ac1010d9ca2d4b4b0c19845b3d248771022d885e4c3fc159d6ae37820186bb4a2031e1049ee8af219fcdcf0873d0b585840258";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "8812bd2e2871ead8b507ea1b9625c997cfd21547a0acd1bd2a181c5a88180708b5a9b29d8c162c977fe6dcaec48e0704ea17e49623f0b15b194ff553d5cdad99";
+      sha512 = "7e7b0c3fc861aa4628acd0ea6cc1a4d0b5015ffe2b02b8ef716861f1ec97122f1ea4bb60e7bf3c287ad77cbb91836513b6e073f88f8183800a77afaa2693a833";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e016283425dca5e6622bdd3826ad6f720f7ffbfeab4eb3e3f862da2ba2129f3ceb17a2d0b39af514d197519a2e09294f0a4284b8f4d0362598b776e3791a54fc";
+      sha512 = "6db4e06f0c4ed652f983415009079b7a92b73d715e4b5b629cb4962c533a9080c1cd5129f2d4f1d59dd9118d0d715ed39f76f976a50b0b2235ca220b5483f7fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "cab866b668a3e010e22fd92e29bec5b65404f1690f593e49b9aa03cc2ad22d3707f04451e8f6d86e796f46270c671c370e103296952bb63a59708b627ea6788e";
+      sha512 = "cfbc585b9404a9a1aa5a94eb2e8bc4cac923c557c9c2b8f22d084c0b118aa8b93cba4f28850b6e3e435e6456e63f0c7a2c029e9269db5a55a66d597a91b05235";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2bc6de3f1e4bb5a99734a04aedc9e4e73b71a588bb92dfbe520ab5df3e4128b683b83d67648f7b39261aa25d20f1b12af875ae92ff4fd628faaa202a268eacb2";
+      sha512 = "1e96d1e9b91147dad5244514e87c1aabb1f7e17bde43eca2c9044b8085e12228c943adb540eff283dcd5be78b319beddd0161f0397ec4486109401023ab3c29f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "de405fffb62de62c06cb6ae9360adcbf97496addff647a1a738f35a6d04b58eeecf0f2869f1daf5147da1cbc91661a04e6607d7ef2759ed4933dc061ad769cdc";
+      sha512 = "0ee029b5ade528f59cf039cf63c4fb03a25ec79c4c8ddaaf9995a10572f7a26f446461d3948023c54d6fc5124200b11e331233100eccbe74c5b2c819358f0474";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "107bef8675386b084a74a318aa1526aab541a281cfe38a782a42800cb8d20f009d90d11c08386274d20e0f91f2aa32b09814d64ac759b56c247cc23c4921547c";
+      sha512 = "6270844c17a7c0f5e25454083acdaeb668bd76fad90b925762aefcfa3bf281116e47ab5946389e3a0791cc3ff43e1faee022e701421156e1991aac863dfd6ca1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "88ff633e4e332e32d1f494f7032d1218ec122046c0d134365e1b7195232c77a06c9c2267f27f5ff2ba115832557159f9bbab4c6d9405c2a051a3b3f31662ae2a";
+      sha512 = "2d2b84db47b7ef1023f321a001223b30596df58ca322e6e893797fb1806df24647c5c529063b503869e0c34ad9982902a252f5a6e4151bcdeb97ec5015a2b255";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "427f9b2bb38d94ec872b3fee46a234e3d778f468330be582edaf3205fa9721a7608d5611df9c3c0586f325f116c044a1c64f1920e3939ebf40990878b00d24d7";
+      sha512 = "602577b05601b303eebd51d6fc922e60cf1706dde4bd7d9d1a9549a8dbd960e726d58b86ecf0607c3984382fa8ce20d5cf5152a84b01484baf9dde235efe948c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b51741ac82877a212b7ce3f6f58c60b9cd2cc10b4cfd3bee584ad14acd6381f04268c9670e3457048c1bc804fd534e6d271124684e3d5eb19d204b9068b9ca2c";
+      sha512 = "e3ada860ad1b25dabe55d7497cabfb495324a57429d7fae70548a40e0bf613b9a8c699f109e2c93faefad774a05fac8ba59e7356f360547f38cb7fe96327f72a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a2e9960b35789d53e74ee55081790962ff5aa0c928b68a04c99c06ed32bd35cf776e3f39f1d8933403f97a3d1c5471f3e9915100c1b20ee7e3613801adee1dcd";
+      sha512 = "efd92ecf884798196dc04121ad93a1a152187806f4b33829914a4e2034b8a131d5e58d2b2f455ca65f8983cfb39d6993e0c6ecb335c0246a20411da0d132ff0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "7aca0601a1e298f745267efada3d9999f57643bde087d182ba053b32f995b19a9ee166297d805b440cd5716b28ebca1b6a1ab234da26fc83ee71148e279338de";
+      sha512 = "1933a5c39c8eca1ddad4918fd2f49b820a281d18831b5fed0193dd6a78b6ee3b019c5307d1853fdf14d805c5642b92982e1ef4079a191254c69f8c9c78ec3883";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "0eafc24598a7f5e7c15e2d49db5326551c215eb0e8a89215df30c3a26b09c44fd2ed632698223ef78e24024196860625aeadfd290c5bb35adea04e84d003614f";
+      sha512 = "ccb03d4eb7e81f04dfb700016c0b84be72c2d0fa15d63460f36ef66a619bd2de7e98840f9600e2be0be4bed8f247ec4363b4544ee66a43540ae0ba4f6a00a52e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "bfdd31f584b739ad09498b0b540150348c68ccd669383e7afefdb303573b553c4fef74e0d3e587486178f7fc00c9096781172cfcb81b0dfa4d135a4c1a597e80";
+      sha512 = "e533cedecae4c0916b18d14a2045d0bd0acc5b2b812a81adf268280505027b034c29f584c71343e10d88d1b021cc6cd22481d1c36b50ac9a8504014db5741138";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e3989ac6cbdd96e4bcd66c80865249ac501bc833708969d68f2ba07411ef8feebe74cbffe04676dba7979908b794d33af8aff82e79b8e17bbc7a09b344233cb6";
+      sha512 = "a2996e9ed146f2ef5da7c837d5341be9c87f65ff8ac42d97a455aea5e00109c702295df393234f19dec6af16d77652d53d94a1822604367530a088e8b3ae6a3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d2ce6fc32f5fabde2d7748b3b2930d3fce260eb08e49e290539e6f8ccf2c7434324ad99395879e3fbc6f34b97abb6e7b450359045f9344a68dc55c4a8d49dd9a";
+      sha512 = "2fddb89b3da67fd871028c1740887582be7414607f7dbacf7fa05984a593b59eaad7a2e96da6dd28941fc17511db2152a4bfd673a7e5c9e11e2c04d56be21a7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "a23f44b93e87781fd4b7f2dbb9084f67410d4713c622be52c4d66f3dd4caf41f135592fe852a21b29ba2364fc3bc8c910d2447dfa102340c0a9260ca53da07e4";
+      sha512 = "37cab9ccb5254ca55ba798da4c26617acc75d47a4a8610e8dbcdca3c3494ddc32969a1743a440a2e6935535093b86520df94997bb01bae6185a12ddb041a09c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "628910a5012f060f98308415965050184c17b4d8cf5cec9ee90c97a59da6f4384f8a571fe9b1107d2596c10e8a9c9ea2102e8b393ef04c6f0125269f8e207b57";
+      sha512 = "ca661918dea82892d0e44277ac2513f9104485c897ff1239495f63bf976efa04ebb10e32817522f8a237aad7c85e6678661568ee456a8cf5a99a36b7bd6d6478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a9bfba0b13e057fc05b4fbda7a5da6ea3dbdb014ba7d46dbaf76d193d677bbcaea7cb2c65aa6b174c8c0a967e88411e03d11039bc4942f4f8214770b636c2ea2";
+      sha512 = "d2316270848dca3922e5b18264fae1fc8f791a9234cb234ad3c9a80f56c8e13bedd63e73712542509a68f9b7f9482a46fda56ea61478b44b9571151822bc83cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "b600afd00e3b8d3ad597aadaaff99c0ebdb121829a637b197acb993368a792c88a6219b37e2d10c9ee57e941794cd279837f63ad7c772acbce9cd8a9067a95f4";
+      sha512 = "bf032b016c2f9fa2dc79b22fb7ae807ce9c744ae563dcae66f20849f8696d1dbd30404c629acad472e89a4f42a504b6c46750684e45988146747d505c7b81d28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "5938b8535f581ee8801ff78a31425f147a6d21c708c11c0a5c65253ebe811f684380249077e7df4f502dfce35edbccd9f9c5418139f1cc2b327d601c91d222ed";
+      sha512 = "1d89153f009e29709d20f2a38a2ac34395bc64ded8021897eab06a31fd573962b2166d8367432e30489ec0e5062e3b526f7077ed08b7177aa4744a50da33286d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "235c1bb90687d250a7abe644149aa0000ede3b90f070593801beaf77133ab90b52697a3a799b9da9abc5d61a5f489e991c5989281fb13a1558d4bbe1fb2a5547";
+      sha512 = "e42f0014a0235b9baf6cc0c15731a70cb2ae6d35b477cc12d989cb383b3714aa827292bfe4943163648194f79ccd542ef03378ad119020c59e8251a8161df60b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9d29949da55984f261a3b5b74f3cd29222b8c7743da838674ed44f21df3548f940e295cd34f4c9cedb5f26165a1f65e9d9f5263b931ef414c446600f6246cc0c";
+      sha512 = "e6d2cd4a97b45519adab8e0b498e06100556614f9ff783030bd5a06acde8dad508b8f4c312fe7bb97ae837d10f4d0ed00ab0add86c7551b97a6c4101829d036e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "994ac583be5d6428b7fe575c9a33d0396f0e2cb6fe3cfd256fd069b5c4590787f7606d7c0ff89004cc3adfbcd40a3466a1af72a93cba1f1d072f2dd0e9c25763";
+      sha512 = "b44ad961e626c0964aea65673b54ec2555ad322d0ca25b7b1cd934afec17a2809a1c46ebb15d2a22b4ac597c06f2420e940e7f4c980cbd6aca9badf9c39fee3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "710ec15475c002f14dec5b63cff6878be3ce9bd36626641d7a9927bbf7f393338541945b77fa309f10f22a67a89b8960e19b5edf6390ccbcd37bcf17a166eb20";
+      sha512 = "9b8769687c95f867ccf53184d0012507c7ec6835779563c8ae89556380a44f61532f1d44b2da13e39998cceb4591cc0d57cc7b627ec80467c2ca6b291022255a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2e7e2d0c3d7db2a2b8967cfff4341d63a17513d4953f8ab1d7822ef71ea3735f0b2c092a56ea7acb1253de1dcbccedf68680d68b25d0e01f923375ee7d92dc6f";
+      sha512 = "e9d8fb68d4adcd2cdfe0d3849cc59f3aac13ff488f34459e1f391ce896b5bc302cf48a3bd979770db3fa19650b764bd2980be5f62ea2853a7fe247a62734e996";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "feac9d6a241186e8a5d995fc4fc959be09b7d8561b1d36fb885801fd061941d1a882de2d5aa81135f7bb63f9fc332b748486518d690c375162e3e987353c4e71";
+      sha512 = "52514c4098e6cb2a109e2530b7c59a0d9338c3c7085c5ee99bf9ed1c0400bbc1c846aa7e3303967c7d2eb7bfec691c4875418bba0aef2bd5133e0f7721edb71f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "25a9d4d87eb083d48dee3ddca9ca70b8d1fa30262c002a41eaecf885343164345204d4a3588bff03fe0729b1b3de5352e3223f091fb37f8f490c987ceefd788e";
+      sha512 = "d37863818720ebac9d97f09464aae36b02c38ca82bc6a0eeee5bd38dd4e57ab98a5ca340a6dad4504ea230def09984854ef10ed91a4cbbbe0cb18eff1a4af929";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "83cc9f13165bf0220c943ce0557ca58224ea9dc66cf054c7d68ef0879340989ff1ad90dbefa34cd1c4b82944c17403465b99c9c0fef3b7e4c944e4681560b71f";
+      sha512 = "24baa5cb6a00b40cb6bb53e1981abd0b048ed30c2898f5f7b24c2c3ca41465f5f7fb258b86441bb2a2327a461a2764969f216715a5be4e1744b798501e56c239";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "b23daf5212d56b386c2fd080e9a56d1b19235b794a27b529c9bcb23984abe1464955bae5ab40f7d358b3ab7fa8ed2d68cb086c323b0d42ab672a8a646ebae8f6";
+      sha512 = "7a653d3262c3b433dac0442b03be5c358a357a7905bcb352a7d808c00d68110d4587d1f2155acfc69522374c91b44261b3f2f874ae2f17b06e492f7cd9fb4085";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "31e47a2402f48031b502dc40ea12350846c9915bde6ee7f11eccd4de1f427258f2a187c9b1469ed9d47689ec9953826362f4c7e6161651d175723a238db569ac";
+      sha512 = "54c135c24001d57a79e8da52548b9589d4d1a5864776976fba20fe9be63f6b2429705e07f816aba438e6d6fabb16cfe309a5b267062a5e3a19ae3b946752ad56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "8bc66f49f4ab7584128d3574760e16eca026701caab8aa3c28d4a3e9543dde25e6d8f4bb4216549cda80b89e5c39547205e94f11813af1920bb4488b465e8422";
+      sha512 = "e86d31256874667c80db2c568c0189dcdb0a5bf4e86390638a49ab8a411b5c4e3d8facd9c6aba181962a61288992d9c5f7506fab168005db93452e7d79533b5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "50e316c0acbfca298fc8d02ecc5561797d4557fdd0f2347ee9cb6547d9b4b78076ccc52b114df81479f96c0b122959da088703388f29597c1e802c27b080e09e";
+      sha512 = "1544ce91046c2c5dcce685889cfc6aa17032d3cbb8f6ac59eb8859916567922062c38d566d69e0fdaaac81be19eabebcc35d816c455cbc02e2e439ac7613ae63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "193ae2c739c39d3933170a1a53aa9e987fed221be59d862a49f8ed916470a4009c46b222b5e92b02a362b07f3abfe85263cd0a7eebd6c45a8915dab2398bd702";
+      sha512 = "8780464509cbdbcdd7c7a7e21964881dcbc5e2e6b9289ab4cb262b63e264459ba85e78af89ece752432b352ac0c0132bd8f551500180cd6e0886fcad8d71cdc4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "da7ee45b5b8beba3476aea9949bed3bf22a71f03642855c3c67a32028f94c6ef709b8ab3fbc0b8a4dae7bc95fc977615e6aadf00f2f1002061ea69e327ac1e71";
+      sha512 = "5221765d6d4781dce88d9c4904e2b0c29b0328ff029672b1a4caa773a556fca3e871b53da5fb580b9878cd0556f5db629065171c79035709bf0a750d3e14f0fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "e8bc21952b7bf8a41598b7294546136089b21c4515b7a5101b1d2191f6b1d3bae082590b9c921d13c46a459fa2f67cfd3c37ba0b636f027f3e7a67685bfb5c75";
+      sha512 = "c4f61ea2530d279df1f96ff29631c43f3cbf23dc023b93579e8434539921ed9705e64f8d4f0a4fde1980384505b237c926b50a15f17eec5bdf2599c9584b1fc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "3e73a62b810dcb521c7f5e477ba4a26c70c003c53f59c4ab9984a983df785a871eaaabef57a9873edc22c64ceb572a658c5d4ed4f53e4f02d2bf5a62d0032c5d";
+      sha512 = "e06a424d115b32bc5225639d6fcb5251904d49730613da9e308d40f681392b992b4aca1d251d2a68921b2bfd270de1506f5647a59d42e9c1f6305347f0fd6328";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "a10ccb8f7d38572ab16dd7ce4495633edbe66dfd668b05008cef4dc0a5dd01df7317d2795daec8f41f06ccca344673072ac1dbc7e56d77e5233577d9a73ce300";
+      sha512 = "b856071f3cd1a90ae12b06797c2b3eaa8e019a49890599670e5e3d564029052f27b62a7ac6dc80056cd6f1be6b05bfff44a1341a5685514959c69462d5c68e92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "9240f49fd6d3bc0531acb01f31c4777e911da1ac5bf86ff620d197037d8b814ef9df217e3e4c53152eac32f8504511257818433dc0da86fa2b83963501c37f4b";
+      sha512 = "5355629b1db1cacd0fff5b681da7fedb234a19187027925534ec18d59e9e68e84ba2e1f86c0969da5459ead80b2bef14257b6c4fd193e492b7d22c3db7c498bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "43556f5c0fda64eb3164ee62d4deb21e5cb6b32fce5820dace98c745b89a5edcb8881cdbbf7dac26f840145a3450f363ec0fdcde0cefa607f090e35fe4dd5c6f";
+      sha512 = "59741fe39778528934766b321061dfc7b50853a6c2aed9f1316662aa7bced6a2adc6ecb4598bd7d8e4180e5b446d840b917794c017f897f4800b6722ae6e8192";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a1e3cc5ad9efd33e9053ce1c7495bdb6420dd71aa966cbc4a8ef74fb92993943f5afc6563f8863f6e2efb9f9fc13e56b92771ff209966d7f3b3b28b107686b55";
+      sha512 = "1c90d23e59f2a499d98715e8f747ef80361130031345aee44a85bd385a802c13cc55a04374cdd18ba85a2796fc68a749e77a23f1c4d402cb0f28c0a70e9d762c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "74ad88540de11314be567d277bb4b8c015eefc6ca676d58ffd844aa7ac84fdc9e01c88c1eea16731bcf7e21b69a4d0a3c52a283c0b8a9c19746f9deb971f3502";
+      sha512 = "fae18f485444ca9db42b44759452ccbb814db34a9f5e95b061ffece9492a9dd06fa0d83b898e76e33882c5fb3dd353b343714ab74a7fcc83314e76cfc248fc70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d4be7496a7c051007e2c0766cc4efed5def3fca6ddb54db1aa17e4644323b7029cfc57deeb33f80ce0266fa129e303cfbd1eef7cb57565d7e2740c0f98dc23fd";
+      sha512 = "5d034246e87efe01eeab0d3b209f968e861cf2c2d6a45d64be733d944c0e2c9788db274c21d470abb603d2522b3fa5705c5f3990ebfc3cc4c9fa5f641a98c07b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8b5128e43d6bd626bc0ef52b7f6dc1625bff751fba00ba04dfb3e378274b578be4384dca22b37a2c01b70358b098ba8062f2228219cc3194d84bd7f3a5f8e39d";
+      sha512 = "1cc70ae6775038225a83595e74113b3f14650ce0cfb7890945387afe638ca2a8a11ffd9084c395ceeda58b36d15f89a6458236964c6e4893764312fbb85f2893";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a6bbfa967cb96f167a595453ccd699f55ff2175366063fb69a28026498334901286e3a1527b36a0cfcdccdb5c7b22d6ab61e39979e261c206b51565b408625b6";
+      sha512 = "4df6f0b331410e8669eb450ccf57a959dff94b3b8941baf9e14d033fc43481b62c89351217a65c2e425225b5bc412e29cecc743c75f751e7d4f54817af1bb78a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "bc1e4b1c2b4a9d098cac8ad7f227f1be756dde3c172d2867297862f1d86ac268d77a3d4ee1b4d685cb8f7fcf0f4ac5eeef6bdb41e802da1b5cbaacfd121c8285";
+      sha512 = "dc524414f0da850b15327a47b02f7f1852095aa6878a1015da3807103ac9cdb54a7dc1126a44a0dc02e12edf593eedc3db7e11905079fbda1fb6cc3be94b2a27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "6600bf27398ac41d447d3c73f03f61b3f631303ecbcd31106c9db824d805e24c0754e8da34a6befd30c72fbf6c4eb059b468924f26fa145bdb1444813b7fd895";
+      sha512 = "bb003bb4a67b6ef935ba8c90aedeeac77c813c26bff798927c9056f53fa287fa69bb07fcf998aa1603c78b7f22238ef2dc91442f73c22a2488f7bbc887d315bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "7d10dfb714e62820f02ea51f453c6ef8671fc6feddae63354d73ab053e584151c32f6490421853f56f048d2540a4537f99e50ceaedefb8330e6d85f6d3a62c6b";
+      sha512 = "eba80394d9cabf5cd5de8cbbc1a91176df19e9b25604a0291f17fbf0c84b4a6dd6a4139b19a26d6f1e112cd57acfb3b567e7d16c8ddf9854bc6e8d44b9672e62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6ddb53a1a2f7df7b7578e9c241f0c838ae5b29650fead195d8d2182f7ded0ad7827c938a59320553539b3b0fea4c6694e37b578e8c9733d38622123a46a17bbf";
+      sha512 = "77a6c5a9c18534ff6ba70d52760f9989105aa72266ab7ff830d4a8dd21b028d42d209068c7c023b54098c9b22a1118370093bff0c9fdb3cf779cd4058e6756a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "dbea98459bc6a0aca38f47c48b72d22a102c7d544aa085d3ef12a8e290b56ea2ef11a95f4cffd9280c20601d85eae129ae31c48a607fad778bcc096165b3c585";
+      sha512 = "3e0598765c0e05f233c73a5198bb94fc506dda4f0653a445d2d03968d709b6da875c03bf088efd2dc40e56682f77a33b848b6d29ac5e31e7ff7e5ac5d2824255";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "b1813a9cbb879019241e5cfc5439ad79f6bfbc141a8702b5c6ae58d0eddc34e7b9f5ed4428bed3b04d616d6a3b369b9ee56d1fb2458154edd27a4844c5a57fbe";
+      sha512 = "ff07d3dd2d594c8abbac8662aaeef6beff0d5465205f84c79e1271d3ed9ee935548444268cf072d26d8574bf48bf69c5b74a3b451c93dfc581e23f7aac5ade1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9a2d526c26eae72699bad13d7441589688bca84541e83f1fae4539934c973d86631eb055e48807c19f3f65cc34f3144605ed8ba0dffc1f951f7ad2da551b4cd9";
+      sha512 = "235b13b9d3e8c9d8e43265c5af82f7ea0aab3a0113787ab9b5a52aa9707a0a6c443ce6469ea88c34397bbdecceaefc570474ed05c3e9b1efb5576790638bbe71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "24f5466284251416f1d54261f074a3e35cc44241b52774a2c0dbe56289cf4ec5bcedc530ae8db33df628265c41031d47ca84de9877d60236c33fd9b8e71c1d97";
+      sha512 = "0b9d67be23502e1279f895566e69fbee36452f6848f8dc814fbae23ded7b09a06850bf3b99d42038cb532b4c309f8ce21f7f4bb4f3eb74cdb688278aa23bdc6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "e1458a97cd0383e93804b7bf069285e18e797050891fac46e7e98dbfae9956e6a22dba38ba4514554a4134018317c2bd59d1fe7875419c3c5120410035db4888";
+      sha512 = "da8458afd3b0f244d298ce70ea50f22ae7a5b2070078ecafa1f5b7dc5838430e6ffaafe9c333eaf81e21b11da9e65ba4feca23ea5abcebaefaa7e05f0865a7f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "07a71306ff1ebda998beedaf275f393c4aed96b12b1ed5f6c6d55d6c7f1fe8c65343be3d6924c61cc88c21e376c386ba2b837f1765261842a86a748dc672bb0a";
+      sha512 = "4ac011104c0d52f418a712321bff63310575209b4e445e5bd53a047b7d3da2c62389862131ece662b7460b1aca57c51bcdad2a5dff2b692a5e1c40b154da2ffd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "b9f9aa5acc722642ed4a27274d60ac054f06d43bd0bbb80c790c9d88afd25675dc8a2fd4d22f04b5085135916c383d5e4b6c612a821274d2bb7941b128d9c331";
+      sha512 = "8d37b246a9b9b527e188e557c496df0f2efcdb92ade95ac3e34788ed5b1d4d9a2a748cd8ccba01360cc9e3273e143f63341fa4b87e50c1b30b07c3da884ecabe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ad341798073be55ca24190ce3774ffc5e355c4db34fd17bdb5488449893826968ebc47591318f2a0fae9cd6319c6b529ca203cde4ca250790b451f3232740795";
+      sha512 = "5d67846ccd9b1e5550ac51f49528340a31ee5218169af5dd93a37e034feca13deae208610d1e2ecf14b515ad618e40db2857bacc043dac0662f9d9c4e1e86816";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "d6b631660961d6027ec227a8352c2fb9ea97fd8345908fbc8b8273d29ebb3391af49e89efb8c060013c7ffdfa733e6b0319e6a37cd84907ddcbc441e8b689b63";
+      sha512 = "e55d0d24b8cc6ce22f6d16467631e857ebc7d7bee6bb3ecfefa536927cb7f32af08b5f0b9924286c7a2df8ab48c12d8af2751da9fdb3e012d1c031bea01ad39d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "f809901e3018d02236bb6d6fbfee3aaa98d3332887e83e0e9b94104e11eeb1066a7dd313d3924adec68afa962e89f71f56e164391a4d4b0502469f4146a040be";
+      sha512 = "8820195b803b46b4b01ff27c1f2dfb5182b96b329cc7a0c0a22e25f9507d2f2138528beeb4a2e371f432ae2ab67189c0f066da920d81adfa6790e7735d6fb79f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "860786fb3bb15792e5c6180fb1d2ad3a44f71ed71aae8d6e4c7799cb3daabd37378656672a3124759ab9c6b5d32793966992fc3de54c7a17de0066d09a3287bd";
+      sha512 = "76f9fa940003a7d1596db4e8c231c2e773207a36dc6c2d3ccaa6667211b6015f8d8d5d7fb799ad86f9731184ac338d0f07e1ffa2220c03710dfee84d12937d7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "dca1ea920a191735011a44522166a2e46e023a7d61dc3e779954dccb9aae5a6c0af9e94221d150ce55351ba14c3de3de5c0beac65117e90ef5cce8107c39da45";
+      sha512 = "35c90c990926cec24de48d3748d49285d9238a8a3ec7068c219145619f3370c0f0add66b364fe17f29b0db221b588050c6445399410f568f89bbe8d3d7efa978";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "033ef00d2c1ea1e5459c0ce6c3f1cc5e0d136a88a7dac28a2dd9d90ad2e8d036769fbce1993463800bbc96236913cf37ffd0b5f2139ab65547288feabfecdbfc";
+      sha512 = "d5d851790e746108d98160d96bfa035af08a9ad27134d377e69f1b08f059afe751a6f516e76a512999420662e0c58cc1b1c06572fe596b86975efede5ee28349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "912da545e8fd176b269ab8d28407f00a4790136656b94c74fac4236636879c3fa4019490ddb2600bb897d58fc8171cbf7a2612dd9f8c98ab71c2b145d1a1ace0";
+      sha512 = "27f61535766bb7f1008f900147c387d611ed7269b6826af271ddef98fab22b7db73f58c452130bd1d31303ff64f75e663dff4d2bd533589f97d183bc731cd9c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "49a2a5403deaf9895f18eca6a1248ad6defaea47d95831f555d05c995c70c519b2bafec8db9273f25068924bc3c80cdcc0dc7eda592449af574fcdb93ec87e73";
+      sha512 = "210d2981e4c48f4b9381558ab77e9f55e9cdfa450adcd23b4348e8b7f554fc844d4de8b48283d14b7588c86843d1a2c41acb49df12d167099e42805fae268980";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "2b91579e572e7d52e843c6303c5df04d34af0ab371b6cbba98c02c6fc41bb9e5d1a6e116cbbf2c91ed730fb5a19c308e825ac916785b1c447bde3d1d82c81f8f";
+      sha512 = "09f5277ab266b671633f11eaa4389f3ca0e3ac2ae9e8b0c5c4cdc8d3d457a6973c213617f1f450bd4b7e598bedf5cb0820f06ae55846b1d47dbe34cbe4209804";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d5c5250644ff2815b532c129a55e1d7ffb10302f156c78d6d06be07959504c613deac8e12640ededf66f6e70e2a1e7f81a8513504753386fa83d8fa805a12ee9";
+      sha512 = "8f1071a5ef4596355f17e65c1cc06641f224b53486c9be9aa7ad8ba8e240239cef9dbd913c44f1f0136ef27bff152e0def1e3366255bfe555ad87331735a7789";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ee1304064ff6503433e4d6523727827f43b5ef8ce14a3a41f936d3c8f8f744594aa2749103c4f2d55687520d5e539795b77d5063e59b11f424729cadf49732df";
+      sha512 = "609402cb9f3ae4d94ad33f0189e85681de1d356bb97d73e2b8c682b4e664462ec486a3a757234a7353c08a92ca7b5b3ced349c1c10e40e78950c493c09d3d788";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a26f9aa7713589c072d92129533eaa50fe162ed60e862541915da40af2f79337bd0c49ea1589fa38c5742c7f684850ab986d4510557d203e25512437a81fb3b4";
+      sha512 = "4d375ce5879b9272396868ab4a70e82e8e1117dcb07d8d1e8780d90d35c77ff6b9c94179ce48233ca9b6e1c559d7c0b339f49066366b15ef2adc563cf358cdd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "38dc7cef6558f4bd4625f628fa2d048064d94ee0b03d157ec0bcf5577bc1d481c15ce29a0b430a3c7126ff60a374e07bab45c2fb05610d4aa5e1a03aedf0d5b3";
+      sha512 = "1583dcaca18fbe88ac598449ad2d352a6857ba80bd7e97d07beb282b270b7277ee58992e622ab6a6fd66d9393dca4653c7e3562c8d7c6a006c7637162eca0e73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7dab5b2679ff891eeb8fb28b5828069b338d1e9c5d679168551556784f5962b71a7c848fc13edf92f736f3349c403fa0a86a485643b1e29a52070fcc9e575d9d";
+      sha512 = "79fb6405d9db8f6fe97dd7612574863636edaae54ed879bff5b2b137bec006664684de98e94c37c0d64f37c8b930b075dd47a47491b8377b8b1cfc351aa4b6ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "853c0ad182add84b9eb2033b21b3f7421252dfcfde0bedc16380b159173b293f1d478a821480af7ccf7717532fc2566b2ce9426dd52fda9c8ad588685c2ff8d1";
+      sha512 = "eb23667f89441c24dc38835e5fb105e24eeb3e7a5d896943e796a92f9bdaacd654b984cef060328d8df6cd659ff6ced32d86bee5c3372c47f3106ce95e5f8898";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "dc0cd90a3a540be1abf132cdcd0491a1a58c17f0a32ec398699e2a9fe1e73751e16203310405c0c8f60477662778fc1fdc4e139073eb213232115f9cd0189d5d";
+      sha512 = "e867a968620d23742c78f6798870a3e96c38849247fe66e068fd92f04ea78de434b6f4faea9e5bb01fe7dc0dca18285e39310ed354e24fac12a5c86a6378cb63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "ab9521a26c9cf2794318095829150a49cc3b01e2c88e6e7c604c0a2f45aa0087b997560b1111486743a89d78f8df3d76048afd503f09a41fcd03ae715c6f5254";
+      sha512 = "bbfffdef77d2aaab7c2becf876b28fff518ed6eb3a87d96d9faf2c62dc0861a1a33a9260e34a3f4ad2bfe475361234a3401fa091531d1c90b3179fcb0a946aa6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "f1f5473848cdf05e1fc401254879e8591d2cc660ec5aa94ba64820d0423bbb85385f5be5db957cd4df5e2690557c9c85ab5795ca909fff2c3fd109be0f9e2f75";
+      sha512 = "11101ac18a3f473028407d413057a9801afc76a898126b65b73bab057578e6d8f2eb2e9b29cb6be35a5375ac59a11a3bd6918c54a8fc23fb6caf35ff7e667910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "f074e38aae351973fb4ce4fb3e97b0c07cb7f9766961f88d8c992c87670ea79437517ffc7562d6d36e40f30c717a3b36dc1da2d6e5ed59cdec5c20c5e84ac527";
+      sha512 = "be40096b63bcb006c587489fa99abd758fe3a24b5f965f9e53b9e2602bfa37a3f07fe6660f7064fdba6861a8e2bac5f3da5b0616968ba4b88d1868d0955cb0bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "7e27f79d7ae1d6861a5cc41c2a5c08bc9aa011017af214c443719e292c1e42bdd41f38fdba356ef2954822e47135c5ebf7af35efebdd4b0b6b6f89d1bd7195c1";
+      sha512 = "cd6b1f2e826d575865cf51fe78f3872c50571c9bfeb726f4a253dfabe3af3a91ca1fd238d5b5ee73e1a01339c88444fc3dc3a1ba38492d6b99924c597dc96fca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "84cbe8a1320a99048c0600f7b3078fb96b5fc7b350298d05647d36a9523ead178ee79b1a29c00dc814c9d225b70cf33f708ca6ca845c9316802a4ddeb6310d73";
+      sha512 = "f0cf8e489db3cd8b7fc535a0b3a95c67f6f63fc7c76d5b1882e3fa8d17ec18fc751aa91945dcda984ee09547ce161b8b7965186ce0013819eb45fcc2d72c9391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8a28af04b02558556814dac039ea7bb16f06e4824d9f5536258286d0ad9abd6cd415ce3043aea3eb2be49a2deba54ef215093843ec78b5d145eebc70495a0df2";
+      sha512 = "12223fd3031b445d4b413cc48b74131793f3c2d8158e7aa7b2271d6b94645b33956e066b30fd4021dd36fa0e32c08deafd3f5c9c1fcc554b87e364715480a5d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "c1e46473b31c8f45eaa72f329e28654e214fcdafa7a4bdfa27aa7e4777901c5adf6249ca5dced05f4f027b68ec26a2427b3a577d43ee6d7683ddce304b357f48";
+      sha512 = "97095e3ca525aa45f7339b5fdd171acc7e0758c401924cb2721e368513c260e8094162bf2e22daf5f34fd680416dd7fdec3f5e3b65b6fd655be1ffd4a1850de2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "df5c5c2bb42027ec729b5eecb1efd82fe6c2703dc39b7cf412109e316b389aac77b0b302809b0f6e9a82ca718d4018745999a96bf6810c58922518a01081a088";
+      sha512 = "739142d798738f12758d335b8556f518dc8b2784b9517586215f82d5653059a3cd98539c5784ec3461529156282f6246d93220a7d06208872d9c90eaf08582f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "0f735b5e4b4e7081826bac7b9d85aa5cb2bffe805ceb5d396d48137869ca414f332677549aec4cb160390c1aa8d2103c7bd614b87fd065d8d80689e90b58f458";
+      sha512 = "a138503adb1f0ee2197714fb1e0db4b5bfb004b64205835078cfbd51548a99e0b9d920552130d0646c4f16699b084e4fa88eead584846be9650964fd51ef4882";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3646e8277d2adcfcadff557ac1537f30859e1bb8413e45deafa46d171341e0b0f8c250d500355104def1023d7f46886244acb5a90e3abc08aaba36530df3b12e";
+      sha512 = "ae9f2a6f83816f02a0b0c2240cb8c6eb003b50b3b9cb3c6b959b3c11f6b87effc38f40daf3d4b2b33140fdda3dc99a5f90af582e9d78689ce1cc965f5a88e119";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2f2e5a128e0032a966b520515f3954106d095510915add883d5b4996e99d80ecfd442379bd1070bc45f5424f7be757dcd3ad869274a638807457a4edf9794834";
+      sha512 = "b0e650c6149a761f202403d0e4e4c75e976657924bce2c10d592c5669b7a055ff9d6a82f1795b5fae2f57c6d49be4cd6923a36da73e300a5b6d287f442be93b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "cfd25e52b91a38769b440b0452ad99089c98f0c99c8d371ba54ab5930eeec5cee9a701c4df216e67b6d8dfafaa269286a70b9ad77b6f8ad45e687b1f5d44d6ba";
+      sha512 = "c7d7c61d810042bee0f5befca5c139550bd73efb67785b87b21a002521fde0d415c4aca753fa47471fb7489bcda0f9248426ccaa8a2bf0967f71f5b1d4329df5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "9ea58c5fa76134916076bed9727afcb6f87935d9bef0631da0060c519c45fdb741c1f1d8df08b572c7848de378c23fc038dcfce446c10d9115c16d272aca89f9";
+      sha512 = "6e79e3635b68ff87d616f8626475684b4c18626c9e8a2bccf99987e96124a31751c6c9638725c8882146acd9368a290c51fd5726a9b9903f1b0e9f1ada42e6e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "87db8282cce46499ec31ca67ec52ec6216f883dbcc725192d97209e59f59dfa29c2fc106c3dfbbaf04ba738feaa902ced14a23cd95ae0f09e58701cc276b7f2f";
+      sha512 = "d4137788bc763ea1a2663fb0bb4aec3b7af412cf1e38ccb9fd484f9f486b877a19d86d17fe9af19df12104433705053eb374dd65cb76c6b180526871f0d50290";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "fb42f2801b529f49c0deec9f8fe5705621fa63bac84ea302c8a0fb83ce76bcb288969a9dfa7e43d90193055fca006595d31689cd3404784dcefee76f1e5439c1";
+      sha512 = "614d803676b83df0ded1db004b7f17aa66cef14e6fba2f20504d1629b55ead1daead52fba7eacd66e6519dc41ecd5802f7c1ec49b6ad5b402129528914d0de69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "f3799097631b4f4515ab672abed8edd0aa5ea3168a55b40ed70d5d981bdd4a04810d07a2355c46c54c5eb80500fcf0a071bd22c5f1f7584b96c1e7c3917df0d1";
+      sha512 = "741671e9bc6d102873b899e649d733befa3e4ad26b2429f04e87073eaf445a9c571087602a8c347cad0412a9efee7483b9440f794248a2dbc30962c9e4a599f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "aca754e9f2517db05e9418687e039bcf3b990c3d484b138d7cfc103a57713193eadd50a361909467d2dc6d2c9cc93f11557ec48935fd5fb31e867436f2b4f171";
+      sha512 = "615ce8b1f44f02aab20407dd090a7f7aabee0b022b616d33e2d7992563ef8703493967a2762df1457c6e520a886a4f03c0477ee79025ec36a4b345a0aa913362";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "689a076a45197afd8371b286422970446a2ab53be9440bb18fbf5787f177aac6eca4d2038247042da8377baf1694a576d0121deb5763db0f3a23ae72febd959d";
+      sha512 = "070e6e47174129cfbc530975bf5a59ac055e942a2732379578a30502b109b80c93162d144ead7306a8604c1945723bca0666c26d1250cd17c4404d5164551d06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "2f1ec4e19ab51001c79b17b582f1d348eb8e40ba63c2ea4201df1d3cfca72dfaee7b141884674165c33596b295e16c91c26eba9d9808d6285adaeb767a4cb617";
+      sha512 = "e808f80625803ef21873fbc52f82569b086e20671011049761ea1e9562c57df677a3bb4baf147442d1c699f7c79e61b89bf3011a47457940dc5497ee03410b91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "0b0aa3f8edc3f49c93896e5485cc2223fdff4edb45a437cb0e8197a5779163ea3e660303fecda2a1f8306e7e385410ec5f8891cd7e41b21b0a619d8af9c1d9c2";
+      sha512 = "45fb2dabfe3bac2bcd78e659a03140d9e75fe9ff9a458037cb35f7bd2eb81b6c33484b1b6766c72e03705020f25cf98ede7a5946e99ffe59963b054d27ce05e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "d19ecb3f9f12a572f8a1bd125efa09f4947823b4ddcee12e8467176274cdb5677733935c2967e66d40012fe29c87123ba501c45d1594d0e1afd14460a824e56e";
+      sha512 = "7bb953deaef6f5d3c09f8a62a7e2abb285e9f23a8b6a47286cab12b2de9ac5fa911dde47c652110b635cfcc3c28312e348113ae8a791a7e7552cc30d9767f3c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b481962d3d88fc7ea015a7514ab3a0ad4593eb587debbd3afd51485437bef7f5dd3a447ed0d3a57f1c500533bde9026b2185d2137127f159743d8adab8794b19";
+      sha512 = "38cba3560bcdf6356c10ee2813743fda65563385510588a5d58703b4ed033d43f6ddf1019f18b29ab803f25cee5cf2263291eb49969d998b26fdd105bcd14312";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "b08a438a6298aa4144e8798893f9df8ed25846c0fe5831018f6ecbacae7c84b23448f03a7fa16bc05866d92ee2606d7b43b1fc0ead6745c2491da286d99fb112";
+      sha512 = "1d632c4fa3e15145dd58f311bd3f4cb731fab4646f6a54bce4d5d58f53bb58964ddff8aed77cf5c3dcf59a00a9441b0f508bd9a031b79448009fdb37b501e249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "69ee1200a4fac5059e4d91e48e7921952e304fbcc4c560f6ab53f0c13fd57b5c5ec775a07926c01087878a80e7e15369e97062a7c5cfd8db2f47c15ef9da3e98";
+      sha512 = "3b4a42141d00480775d96db00376a66b4c65d9702a91fc5390805298f9b94eab260c6433aa8ae9c1c2e79f4706128b2771ed058c1196a40e90dbf1c24be880ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a0e909524a56e80f8cb75021390f7ad7ac035afeec5295b14d3cced450a0bddc223d677fe567d406aa7836ffd5768712b105c5e0db2ab14558a159d6aa359ca0";
+      sha512 = "aa4b8a4dbd3721e8162d391108e209c02f50d5d681e31fd2d4877794c9d24c8d2669dcad7720832c6dd6bfefcfce110ea25face288acdd368c5437d77b0e7466";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "070cd6775ec08a6c77b92ff9f8c4b2a0439a4326121e47d1afa15db3445aa15e992be465179ddaf0e907455cf3891bd236c0a9e65b13696cf158166a5d6e5ef3";
+      sha512 = "b9df5e8149384a09039db582a4548994ffc47344326feb96cd6f6ef228e3a6e222495284ba0cf35f9c130b871ad827dc31022242179c88dbca86c61ff5185aa2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fc27567c007d42d038ae699ab4175e32068f144645eb7f087807aabe5305b5f33c8991f9a4fb43f3489bf3c5245eef29b363a744d595e6517d2f8a72a0074927";
+      sha512 = "a58ab41fb6282e64447021ec4b41ef1653ab7ad11d3b2947ed61d6d711061c476cc19d20320aa70fac30ed106869a0f88e8a22ce0e1184d68795a25bb8b4b4dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "115651b2c72497b05d92b745edc27851a00054865b930c87448267c1427db6c65178a337387daa2fbbb826c687d8940a08d9cabeb4faecb902f08898b6239934";
+      sha512 = "5a690010ceeebeeb9130fadcf04eec5eefb087990ba254e11a5c6f67561bea287783656d1cc9ec7fd1945afdefdb56dbe93eb43a7fad6ae130a56aab64652e24";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "2072f3b12787d799c378cd727f168807ee6a20b79f42988d08bda2b990c19b227caa57e5c996337489d000e682a53a0d6e7cb33a8f3c6270e32741c414d7ed49";
+      sha512 = "d2be7334cc018260c299879c9c9c64da71f62d44f8f0e0262af6140fa0471faa9354d9289c4146e9152e1e8fb7b9791b8169136f4902fabebdec05c15695e15c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ddf09c431e74d6bfab7a49a10fde28b20a24f732315a7bda9295d035bcf4cf2c3d049f2a66dba7f9abe9f66fc64bf99549bed2abb7e5a0ac1ba1a9c77457b707";
+      sha512 = "9197ed27907f509e1dff0cd4f4fa1d7309ffc1196b937f77ea0623ceb772ba653568b295ef6532ea3599ef7df5a7ce47eee55663df0f811b006ee303bff8ba1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "cfd3f91f39b499f3a0125da9c952d68a8e815492b6597535017f824722f25eddd3a8b92817f546ffb4236d2984128d9b179366361f917c5d3e46b8da25da91ab";
+      sha512 = "efa6c11c2137f336576abf75b40b91326fc1593aed79cfe78fe84994b275c4f49c9fde8e6f45379333225bb41e50d8815e64297008816b1fd93367ab849955ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d077b44d7dd813a7d17ede21273d7e56bef8378b76ccf73f36f3fa7611186f7d63d266736f59f59301d0fdf26b6063b366ba7e6f1caea16407d3b1d20fc323b0";
+      sha512 = "465611898bc9bcaa69a6aabcbd214f8f83fac62759d4bf2a64b9f07e258dd6d5f5c4ceb17682ba9c885f97b53536ba65acbd772f692dd6e40bbfe41ef1b0bf4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "66454a7c5055e1550eed48d2ec70c4d921db524d449392a9edbe6e42ea111ab1152b225de3095e9ccb3922e3327eaa3180d01105cd4e9fd7634471472fc18fb1";
+      sha512 = "e6c2a3f4412946576cc91a1ecc45e4cf18d2e4547c935f45ff776c736faed9513d777ca443033ed7e99f4a4aee11792651617c658d4d8e020d67ec302c457613";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9c1d3ed7acc8ecdcb9f10d5a3af3ee2cde1331a7fd6c9a4f6f97c26289722c96a8cafc2580b0608a8c7226d5b211d4eee137deb45f1cab9df5c1fe9462ff5062";
+      sha512 = "38136e7cbdf7d6b297ea2e183747bbdc79f61d8bee2372bd6f40c1c407e24eaf2f21dbf92f3b96dfd116437e0212ad20eff53ca512c2fe129c395e2d117e26b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "5bf78b9b0dff6f4ddce433703549602fb73d98d2dd9b9720acd4fd9c023cda6bb52a92bac16d57ea339e0ffa56b4ce3eb831ffa0974940a12ca72dc250c5de6f";
+      sha512 = "0ef2e6e928a04d8560286b01ff735647aaba246d1f2d6880644b7750d1cae89e63858ad98332c6cee99edc051a50f3c560edd4d20d836dbf7f4aa01ff281db4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "78ca04e9dae5d05ce20db93f33b312469e6e3da1b936e43daf60d0e7eadd76eefb64a1f171fab674f688accc347d464284c410d81e9a5a407d9fcbb407031bf7";
+      sha512 = "0e66e8ba386846eb140cc9f6606b9b0dde49d1827f98345801967b02d87c0f1b6071ed8fe217b41b0412e098b52fdc80751089058f42bcf550a2b5ccd614a6f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b3569c4d4be9fe8dee22b1a3667807b89f2526a0477ac6f99886c2b8e687598eb799328589d951f6ebc1de6b05a3c2493037575d324f322bf39acff24b645c26";
+      sha512 = "d37a0a5ee7f9f03ff3385ea1ffe886949d63ae52b2e8e0bf1c49192edf725686be73f63fa9f528a5d4911401927777488dd1b490be36d21b541b5b71850a05b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "024f90c38265badd689fba3950b18da9834f03bc0a754910115f34e3bfc232d9728073c058891c592c4292e4148e8459f3515caa1a05acaa1ed2c9dc709e1b48";
+      sha512 = "8af83b0c3c498dc157986598d5b5559944089bc27e62b832cf16937be1a3aa7888731fd16bc8a4400c49be012cf217404aff865e8cc8996959b594aa55becff9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "0317e9d27964f9c9c1b7fd5df85bafdf553703bc493f6f67a52bdf9f893d560b6b5c0479624599d3756ddbbb66a86fe9b88577353b1f01c3cb1c0be4425847ea";
+      sha512 = "7ae083c02e5a98bda3d74c6f3c8269bd668b6985c411b5deda5b1618c34721650c881ed32987ab369d7b730c9ab4db38f0d7047c23ed8f513a0ab9cfa8a1ae41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a700f4708e585afcef5c84a6c2a2e4d13c87c82d897f1403e9ffd7da62ba6938d8260d6ca65a3d97a4be927085a85e07fdde2cfe0fbeae7d0775fe5e875a69f9";
+      sha512 = "281132f7cf22eae25ee953794d6a26f9cf574e8a794d8a9e1e85359fd5e3ea9ce9d74b961babbb0e91bf0bf4dd29bd49cbcc177c5ed80bdbbf8418ef8e837969";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "46e4b65651202497bc01e49eda6a3e39196023c83d7c7407dd2a3cabb11cd954f7d2e1056ea0ed032f8eab52dfe9aeb3398f77f6aecc6be377053d4cd7ebe852";
+      sha512 = "0ab406c65017d67a05759145305816a05f802c7d71e445abe1b0e91385a1edfdebd2991aec7ed808ab2eb006112c5967dddbcca6e46cd7055caf4b7328d2fb0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "535e2d45789b7486060d00d03fa5dd6d33fb650bfd00344306e1c237d4a4c68cf30176f39b6ecc1cb1f211186dc53d749421a8b72f8b9a0e68261f447bfbc09d";
+      sha512 = "e85ec9f241bd282d9803b3d2bd56f96ee54605c64a0cc458861baf8006080f1e9765069368aa7315e800a3d67ece1a07f0d97d7d8ffa2386de7c6c4f284cf214";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "24c179f95f5475ca9923792808139693c8cfbbcd46e8ce94b7fe5a17e51b7ff26fd4e5acee41e65b2a73c06801768246d21ddf65d0324d56a77df78ad21cbf90";
+      sha512 = "208161f8ef28da94564f2ee317dccd8a142770e1656b748737b4d3a474713b683a49c9071515c0ee8de1dd20609a2c72cfbf9ebbadb88aa4a024b74db79479c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "dd950166b500e45181dc09b76e01651c360b9bc350768125ab963e328d249d6769a8237628bbd4d0ece0a9e1b7c782a59e9a5e0b515a26eef7b2ff906a59e98e";
+      sha512 = "4a847c0e6230a3f48363e327adb8b940a7bbc266cec09dc007ad1357be1a219ea0870dbabe227a3771048396bfbfe41114b9109a3de6a69f52dbbf959bf7d428";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9f68c9746c951259ab156c6e326c62de4bd8db3b0497a5128e3024f2e640f54f1d11495d6a8ff5940e7dd9acdd6f3f0125b85326149f994dce08c96a19deb69c";
+      sha512 = "c5a95e4bbec779e250d8cf4ded6623a99fa8088ab67b2d645287249c097e5e645d51524fdf79de408df5c2136efae8718f01c028d15a94991ad87c2ed6469ceb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f63b6011aca761312eb5e5c468844b0bde291b0e1ad67a8ad7a0c020ea2e7f2ad43565998ed49f4c618656e9ad5d04d6324f9d22c1ee45bc6af6a560dc863e4a";
+      sha512 = "2dc7893b667b8c381c242190a55fee072a911f3f4f11c80983de84b5a9533bad67b05bb4e42a2a5ca12de751703ddccb2be22226ec66919b9125f1df05d0bf05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "6640a1c96477906749457aa9670559c44327b25cb6526534cdd7be70c84b6687819b0ff433aaa37ce13a7f9895c2899797a3f4e4982969a1869ac1788a1b4bb4";
+      sha512 = "9c4667dfb88881dac477df7a87d351ff26b6cb4640f0a92332f5c62dd88efeebce6840fa8ac4d931d8ec17ebb75ace57e1129cab5fd06a65d2e84218bf6a5118";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "622842075565b7708bd4c1e06b49a8e15a5a52c768cd8dad0fa6744b1295269c38f5547cb061d4c9096a0309251c29f388b0670d7a773276c232f7124a455b38";
+      sha512 = "9b68ddfa1049e6a533a070a07672c160e5199e26552242cdfbb8954f649ded4372396071b302ab359ee6010fd912b590d39e1f1f8971d73c805e6db8ae194952";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "328840563121cdaa39918ab443b1946e3b6e39a7a1866ce95daaef9f12fe46f8aa18ba4394515ad72eb7ef332cdbcf0b893fd4095368c0ca949039b31f335f80";
+      sha512 = "fab38c25d1c35bba77fcef1caf4cabade57d9735d3c09decd824bc9c9982846c0790d279ef3915a7255df86db2129a41db22a2bdcfe98a55c5589e4554d63d5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8d9081a75b7543c2e1c25c67d41cbebedd914f7f21eb1fc970241031120345adc7851305f57ae341b8ae7f7119712dd6a1cd9f6bc9d44d6f7cac5fc6a9591b3c";
+      sha512 = "160940c8771a376e2cb2e22bce0a3a5bd9619328c1b2d8596a222414e5962805d8c8e343bb0b969114eaf0218e4e1830470b813bc68972f814097de2fbba56a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "c53f07a1bb521ea5f3a3084fa6899c5fc81693bb51ba51d848c9581dabd108c769d0793e72aad7c03b7d017cc75ac084910f2d114f9e2c23e967f731eff85118";
+      sha512 = "519438cbb8fed811428060f0e94196a276fcf6fd02bdb4359098b4a9c33635f4d0022ccc6557976672ac39d4097425af91c07789a443e978fd84c1237e8b034a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4c08f8034ee0319f2e0eb75c4bf72620b793601c08fe7bc196bdd99e2d054bb1bda7cf65633546af0d91fdb857ec451f003040d38b6de999293cbfd35d76ecb7";
+      sha512 = "defcb3c8039228e9c6d64338d9e2c4eb39e87078d0f66b98c229f9f2205516be97fec53b50f18406ab6a14edd06afa6197ba62cc31612b48196b39f5babf99a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b4d96844c39cf9ab5ea348adcbea6777446791c39d2832373881e22625a60c72f5261f04e36c44955c7069a9b94cfa46caa719c6495035708328d41cf07c5d10";
+      sha512 = "d02c656de8c92f3d8bcbb07ed17308c5753ba08905eca36a4d081fe18fde86443f7a4de939b39feb57def17aca7782756c4a264816ad6fd092252331bab958bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "08995d67415319ce82a49b80099669714bfcd1e54a8e2590d38c1ecdd1707eca03a4b885ee608d28881609ba3ac1e1ae8f0a3460588ee713c0c9faf60d01ce50";
+      sha512 = "89f1e0b0f908ca0a6238e76895d4f8e70008d987e20b64accc91efb0a9024de0d739d7bb34d608e4b125324e19e93dd044490992bb26a1a25cad1c83d4ebc19c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a53f8909fb0e778d821404fc6566a8a5e0e13c46190777900abcbeb86648275272f37a94afbe4c83e4438f4f4f3949b945824e3d8c16734fb444bbcd2354e4f9";
+      sha512 = "7d3724d3e824ba80e5342049a1e1cdb2754f25b8c85f2135ae782000dd11caded9afd760533371b46cf2dc30dac0d396fb5c4223100c130c2e390d12ce77fc48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a6e9ba4cd2a0c2f032b1f88e0e5966bfc04520ba63606f640386216719ad1c900dc3978e0cc858659912dd89140d26641157b32d5daf7fa0c35dfe2d826dd9ab";
+      sha512 = "1ad110a807b0e823d3d99350c72a92c0bb81724faf32587d0809f040a29317bb3286139be6652a74efeca4e1e461d98c36d5cba93d18abf98fef9634e7724ec6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "0f902f3bf54dd76fb6fa5c0622e2ad51b85adc5cdfe4a1baede2cbba66b71856dc1c306d5ef85b49fc3222b52a210a0ac7f54796fe60329e9859d618bc4a200b";
+      sha512 = "cfca9987511af0185cdc5594681807af1a6519443c225942c68b3b53f0424ff0cb6173b0686164b681aca08f8d93f81499f6d15dc18ad729c762d8344dd76c12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "63f9c95a8b8eab315cb2a531a6573cfac53eabacabebec97d2869fd8ce07b753ab633f4ef7ced7d92784d5682dc87dc40492df78ff37a0f45326668422fe62f4";
+      sha512 = "28f18f8c402b41e4145988f93939b329efbe447ebc332ee88b32c3071a786a7bd68aa8be8e6f85073026fe1ff56c09d7c366efc9c155b6bb9edd2d84d36467f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "28b79ef84f412f747cc03f8b5622fe8eba7bb5834da6a95ef376348a95cb5d146bbcc1597425f61f898f40fba70a79fa8e0c3e03716addf0e9fb33b523f014c2";
+      sha512 = "a8e45a24c09a0285daf2029a4a483c4d2067acb622aad1be2213a4f5f7ecbe6c1f3ec2095edb15060bd37d3c009cab222fa21e0555a93dc2bd1dd6cfdff54e40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "65a49ad024813a51692466b4cfa62ac13a53615d4b16e423d6eec0424bfd7c151c07b66c177c348bf2127eb1c623c979658a524085af8938e18e9f353462cf47";
+      sha512 = "9414106287db53abf4a57a0e3396a6dc03ebb8f4b5655d23cae019ffda804d8121544d843931082a21969846ac8d13f0f726c275c15ccc84fd7cf7e8c5e3fef9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "495fb3e61076679cc5d57da9d542ef80c039d91be15e09a5dc37a26ed48cac1b05b36ff5c91dfb6d912debadec67a0a9914f81796bbf63b07153c47d27536475";
+      sha512 = "5b971598c8b2c89150ddd563d9e2001816a4283288f34814abcd8a96520f09c35f9f07068145010f8091496fda33b5200a4ce95be0804d2debd9b34c2ac71a2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "826e7c4b0b56a0d1d766e0f2eaff0a5b4329ad4d0e01d715d3a50b61cc26aa07042b7ad1d1ea3098a439ebde266fb919e6acdfaaa521ce9a7f3a09640f3419f2";
+      sha512 = "7d8ce6ee5d6bc6847481c13ddd1f1002dd7cb6464d5669eea629808bd3d1cd1c28dd653119bdbc131c59588d4c92c1172f7d926a07ded78f8aebc28beb8f0053";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "816bd4044bc536dde81789303aea5b26d494535e82e330bf189fa42a7a41f6a89a82525680db5551f6906457772a4b3616a349b1a730bd1fc63b9f16869aa59d";
+      sha512 = "73d581fcda9b9e8a6a97402f0b9a42245e015b20feea2428000c05fe10a255a7345bbbc8ef6f83097500dd7910e21928175911bccb12a5b841a651ffe0bb77af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "1570c8cf2792b39f4e56e7bcc48bcee3e383a7918b908e56dae302a086d3866527de61d75e3e277b3a52de0200d68d4e8cf43303f2837562be23de79f64baae0";
+      sha512 = "3f84f4d13b2f474252de73ea7940a70bc2da1d27e3b560c3f448493e1c5b10277a508848ceff8f2bee0fe11ef2196974033a88242b93cb0cd4c34c16996b653a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "0343efa60301b2fb79f2c34cc04c7aced7b96fc9eb3c2bbd1cd843704c97188b016fb276ad4b1c80623271ae6b610c1177c971c30189d5e6f42b3cc941697eff";
+      sha512 = "4a667161aebf1b3888b0e78187d5de9030aba10f1fc90c74960104c38eb1d4474e2109b59e1eb2f4a41309833d0fc6c3c6e0dbda5d2c3428875cac6dec7178e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "963e565dd8e2e96f60b83031532260cf464960528655bb69ff7c554f503b6e635162692c7ad91d9fade88e69fa88c3c7d758db15160b805f9b68356dd7b9f3ba";
+      sha512 = "a3efa1a6335c7ba1ba7615f90fce09ca508bc1de4e1483cc26f28c0781c215f71dc119a4fa1df0b17cea62c47ada4e75482e45f359bbcafb5d48b11f8acae7e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "63ce005570a8917dc75025249962c68919d3335bd4d9568148be138c51be477383a23a2ee790774cb1426e6a4b8fe4b7057219a11d8dff27e1a88d6106e61ba4";
+      sha512 = "f5186a99d31215c07ec6533956b52f263ee6c50cac8421eba039b9a5ffdc431efc075bc9f7cd0cad950e56b9a574f6ae47ddd79f1135e82b602d8bc2ad43e4d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "49a219ca5427b8a7553d0b2a490afb6e4e82012cd6f6917735eeac9ae43a38b150ae568300dcae864a228a80f8c8184c76aaba9092b7dd51a617859a700b4be3";
+      sha512 = "4c0103edb3041f5b3dd4af8c7a24ef87d372d64cea923f1e911a5ac565c89d734f30d8e17df2a457868e67d470c8609e2e60729974f37fc17c0ffc08ca676c88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "dace66b729e7800834271b5dab8a7bf0e12f1d1ed52a4ab4fff5a74f3ee16318d60ed199902f67bed92c541da0e3c92cb1407d5520aeff7b3bcd2f4d0f71e840";
+      sha512 = "f00b933c155199ee59639f2e8f790d5995c48b3ff9280f3cfd2a968960e64fedd8bc8a6f90f023898ba966f4a91bd6ef6692e5d66d117f8fb828d08ed4536d4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "5ac65b01efd765eded53d94f1e97614045cdb350efab9dd576d5aef88e9acd0625437fecda35516726cbf4c47dab96061ce50e04d260a848ca31cb18ec8176c5";
+      sha512 = "188e79610192fa583ad20b1db294079187ed8e7ee9bb1e488bb62c3ea3da6a7607876cbfa14158f2f8f39963f18e52d5926b95dd9e0228aa7969e24367b75d9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "00da1a788dd8887b2ae2e512a56b3ff05ef7b564f2abc6661fa9b5ba2928a49645aeef4a53978120207dd6d361a3133765c414f6868d2543511f173e96f615d5";
+      sha512 = "e14b97d251e1ba190375e8e6a29483515f123b9527963c7c90df6d54a022bde02b4f1d6df1c8ed77c427d01ce81e13132e6c178b5f5035bd4e7ac9c5f5bea6c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ccdc2f88de9fbdd87fa639993a5f241bfd3afa68e36923d8f04ed7b70e30c44aa4a7969b402e839f535c3cbf202b89d287364dc5124b08db01fe3a03f4fa21ca";
+      sha512 = "7ebe6f342e189dc2ef50e9e0a5672acf30169ea28b080df0106e25fb43ee6916a8bc7cf395f4c16c060672d27e53e551d938eef448adf4d36110a045c0b87094";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "105e96a68895ed65a7e32155f248daf03c7389a3eeab42ffc2ac9bdd82122f0f8257ac2bdba4d0a60c6591db18564850c0615cccd6a7cedfe42f51938b9c5b64";
+      sha512 = "277c44da1ae25755970483abf6eea4303898feb9f0dda099d5245f6b24ed638a565a616515521fc565153504fe86c4d832a780c1799569d4764c7f9ace9cfcb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "234b65b2c053be05846845219bb3c7e2fbe74b5e0062f361a7d5d0d27a9f14d9235b88e0af734587035597baadb1933c2e762c75436325c362de0e0377d1d0de";
+      sha512 = "41b351181cc9ca4a77b1ce3d33c27a2e89fdbb8a6132c231cc17959c61b8295503e09e8f828a458f47df49c52166680c07d34a07460daec82b0897b5b6abcbc6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "763a405e942190c5314b44ace507e6d019a875e8252bc25af1ec0294265e9729fcf1d3732b22e74c3327b6fb4599f58d97599a1d46eb8762a49136fac23a57a6";
+      sha512 = "40242adb26067a9502876399c2e1b53c170c7f8b0accbe03e85ecc69f9ba9d377f643d54386184e0f7a612417e45586949c5c47c93cf0e192b5f81adcf391ba3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "076c5b2fe53b32a63238ef2c61026e9fae925725da7fc75e117edb48b4df91f2cc7b7730b82695ca7689f460518218e9a7ff32484dad63931f9d45eb6990a9cb";
+      sha512 = "3880d95e5e5fdc1da8e36c58ce16350f9a3eaee4e6d400370b375c4ed77e1eaec950acd483de560dc66634cf0931bcc83b3454c89575029197402be18976cf2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a1d756abb22516279e5473642abb1922feae9ee5604127a47f298850f620ff610ad4e0e3785ec386e28d3bc94e2dd7f09a070f40d7e3de910471b7bc694ecc75";
+      sha512 = "6bfa9b6569d188f8544cfcb7d20e17f1a2827e5bf10db63fe2b10e64c1993df2f7026a957fbd9df5815ffda67698a095253ae623d20d2dd0db4e9cee9329dad2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "9566c7bda61b662d371c11d899daa67a6110bb0202aee4fa7c32398a7238d0a3453f5c0b9c5f20b5b7c6d225c16883220b0739e06ab42ac5c7dae53a581e29c0";
+      sha512 = "c8cedf4026472dfe887bdafdd15ef6cf1593bcbb1121ffb8dac5ab5d6ef230c463a8afc36df408ef81f5a3dedcef8367bd8a07deb0c6fb47f34f89f34553affc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "e31862b260634f32fbc61a75bbdc550ee4310d7d53a1f3e810cc5c9a8c8b64b00b6dcf53c229219988b88e44e832d5d197ae544685b79eccd34c3f5fbb40036b";
+      sha512 = "c903182cdf3cfd403304e47dc28603749fdf760e4a1b18b23a7723fee73d3c6835390bc868ecd445abaf3267bb69c188499f52c27942a63147b99068a1ec80da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "c347401f25574a5fc7dac814e61c2699b53ead432eaa48001df4c83184e1f609a34e7c6843a1d03c60756bed7176fc05bce0fd56c3b4586d2543c31f7e0fb809";
+      sha512 = "56b586ba243bf31499504e38f4025b3ca760a409c8b9d6c9edce120ce92eb697fe2b00fb69552dde0937174e8ae90c19d3cb1671bc91a38a0c9a930137c1c954";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "c50615219573dbf30b60349e85138dc788fab5e162524b0fa5b78f0fd69060dc910e7c7960061f016d13e3c8880ce801c7fcb69a5da5f634567d5460f2bb2ce9";
+      sha512 = "9f3e97f154553e6969dce0403e05305da31e3363ce84dddd48bf5156ec2c86e7ee2ff2ceab3400e4c7cf0820318b981cd01383a77402f2856dae44b42138c52e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a879ffa00eeac859a2bd265aeb44971afd0119c43ef81552d1dfc477465e0d0b947b9acad7bbe6bc4cfac3c7405c5635cc181fa3bd393d3d4d7891fbd78cc29c";
+      sha512 = "ed3c06e17d2ff131b45ba66c66834b69f733356a7c95a1bc6f1c4f8f987dbff1dc1aabc2439bcd01e6d6a27f45919584a09fbd2fe61563008870e90f9dc3d970";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "0ab05a8aba2ba9b3faf6cdf764db59d7e85593ac13cf4be1981d18a6bfdd0817bb411210ea3810d6c59c1046a76c8e4147f67647da4f047175b71aa5cb1b7ab1";
+      sha512 = "2c14e0ce6ffd02722e9d41492b1dbc9a5af909a49199a685733a351b1f3638702a9234c6ce35c5bf25dcb2c3155d7496c10fd6d38b45cdb5ea7fe066176378ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "6669fdb2e0a73f295220327248e954ab0c80c762766535ab63cd1d1625de55439865632b7b9243fcc2663abd7acb83833dcc0cd8afed5aee0393fca7142a68e3";
+      sha512 = "23f6e5eae45c273efdf7f4758a56e5883e3063cfb2ee223ca775149a8dffdb9fb614e5ccc22be07e7d6ff3ec83534adcf6511131c6a4b2464ac02c520fe0dcc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "d2a48eebdec336da92588a7bbc318844058b8735e229a0059dcabbed16b47b2887dc042bea37ad1ea6be95ee55356a1093ea5b077289de8b0c9e5c14c199dd65";
+      sha512 = "f0589827713b4466ad07dcdb7d289f5b7ffec184b8f259ebf6718deddd242a8269301b13974360c5e10a4dc96eb17bcb3255e1c4f10fabe8e8cbb66e8557d8ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "28febae6395caae9156f5e4168ed030767a6daf259bb96d3779a35da58d0a72e96b5530c57cd8d0570c4eec3d142772839f14d52a542418f2ca52db2b1641895";
+      sha512 = "de31966866491c5a91be0bfa8fec3f0c5bbf6add028caeafdf1f7479e7e37f20d58e7988facefaf40ff9e524dda554db8f425821a2cc056a0eab1b19e8cc2773";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "519617b868bca07510faaa8e21bd705718d3ac23aeebaf4a4513e0346597662dd2cc5f6480a71ae1c93d9399b61f908d2090ea7c5ed5e0a30beb3efa2e4d143b";
+      sha512 = "1d9c1fbb917315a22a28fc6fbfc9813a6e2cfc66bc774f20128c2b4949c5c96425e74f26f0872ab91858e339af70e5f3c0dea73aa01f2491d757bbab9d5ba434";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "20a19189579d2e45be4659a77bee320a62fd6df2b48a8ecfc273f507674c3ce495b56cc4a1d22b0c923e2759475f7e25eaf363f361c729abcca0906d5faaf87f";
+      sha512 = "f3639b1bd361d86f2b134de404319ef6fab9f44d7150e8070a5fa2ea2e8cfea708a7426781ec4e177f4ba4355815f0e7c55479fea2e9e4a7ace4c53cd90005ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "7efa4e6a168e6cfd2de234d3868d02083d88dd4928d721481dc57605bedc7d947b3aa097935291d6c18ba0898baeea8f325830ed6588c0b90408588fc2956d98";
+      sha512 = "4e4a678741561a2268292643563688cdaf15e188190bbf760952ea7c566f410092347800537cb7b80753a474e031e9066365d162d21225e8257440412e99f9ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "216c24840bdac20d43c992d2347b4301d13f72d4425292ac30c9f8414d5cfd991830c5dca09db829c16882dc3ee62a7e389eb0c0d202cf4a01b6ad1cfcdbf7b2";
+      sha512 = "f4525312cbbe3048f1d671517f552739a5ceacb52b672e212848a13ffdbf736ab475adadf1cca02a26068ad0a9edc0dab5e6dba19c1831647be16781a56390b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "17c770c27d32ef8cf4f5255240b8d307f8c483d299b0d9d97a40f18accfa11788efee1e210055711e7c892ac7c03c14fa5ee0e6f4cff399f89ca37f8a56bdbb1";
+      sha512 = "fbcd1297fe658b0743a5a791a05204e4bb7f4951a3250f494e48daf8da31432ba56de05232e68f6d3a0f6cdc4a7cf205a0088d56cb3fe08add03a27b05770a92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "665b931bf1bf79e356fc29c5bfcec44ceceb6fb9a462148fcce3f6edb711a21043e9b5e9043321188238dfe9aa0d92955aadd1a28e080917f571e5ec02dd1c49";
+      sha512 = "2dd10ff59acf1f362405842913eb14490d40947bef3ca2a793813ab99fe3d908dcb5cef5dfa2854399b37f11aa4cb3025383a73dad0c95e008122f87d73e5787";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "2331674e5dbadcaab35991f7863493957ff054c008917200d33f8c1770f3db33ce9373965d48ef230ef45f1ba43c8de798d3a60f1c77ba2da2281fc16c352ba1";
+      sha512 = "50d5283440925c946088f97e779b84070c7ac4f8710c43aad42ad85879446ef8b9d4e070299cb64b35435421db8b1b4b1848b43e8aa1e3b88be453d4c84c0a9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e0f487145013ed40f0708a44d90ad78e859472e48f2f77153065d04fe7b06ad2b862624092ce822fc8f20bab9c55dab4d70a0070d8a64c130104d41d821edf88";
+      sha512 = "51a561e1aff7c3f9d80a8da2343c168d7d12130d94b77c4a4f8ef5daba928082e3668bd87c7502877443d6f5d51e7e03ae8c2a993e91806048ccc40b59e4ef31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2426bb2da07fc96e7083c1d52f1cf593503b9f07372484075170f1b9591caaa5dad8a7b74b573cf09eee4e76bccedb367f427fac98470cb31b12fff7efcc95a8";
+      sha512 = "837d627728c6ae2f1f717c379505a5f2d9b709368448c8344d156da6c9e87282f9821655ecbf4d4639d81c310777e29043126c01d4196a31358456d31489714b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "587d112fd2da7c05a482804aeabcac701414eb1d48092b9d3020a3658a5bfa5de3e8314879eaf7fc59321a54b79b820f34c54d342395469d8324e6f677ada9b0";
+      sha512 = "f783fd68377303a315e8ca4ca971c7a302d4e1c62b7e3a289ded882ed972156131bf2a48ed7b904ebacef64e44f9dd6d14608b9edb90726a4081e241881d301e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9e08891a07b5a3d2e1043f0713383124ddac0e7266e1dd6f3218f5d3c90bab787d00b1e1bc2dde01cf5f777734931708d601133392f87452156444c25dbe7d5e";
+      sha512 = "df0be20c8dbf5cb352c20ebeef479bc1a9bc4f60bb8b54b4d81bf0e1dbcc83dcbfdfad5cedb42713ebba888860639a8e3669cc2c159254fee3885d07f8cb1625";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d1dea1d65f29301048e185b5cf5845b8ce32bfe8c6bcb2a1be571a505e9755b5bcbce507c30054ddf021700f460e1f5e3cbef65c463727866b3962cc4e6e5dac";
+      sha512 = "bedb4e28f62ecd75fc93af2c8ccfadec755ec500a5aedd0a8136f69c23e39c5cb64ea509e9b3551453754a3feae7dd123564aadf8dc13e9179c199177b82be5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d0f30cc64b7300c437d581c367006f5ddd9a3fba453f9e1d86928d77da6fc104467c090c6dd4d5c897f3d9324812efdd09f8e8c9fd8561f6e066c8218ae486f6";
+      sha512 = "02bac6fcb481ae02feff97ae7f83fbadb170e9ae133ee4f557882e004c21707f82e5e4db24ea6d67170f4ed88f7f0a271292eefb98853b0f96b0c894f88abd27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a001ab086a7ff80a429c133871c3257ac29e0ddfe0ad480f1f7e06c095aaae5c7637b0a40b6712ffc5d51eff12aa77a8cb7e734ab2ebc35c7ac8f3e3e07275ca";
+      sha512 = "d4669ddfb2675b3cd47a617e122079546ee4a35cb10ffc69ccaea76e3108155f3e209b2654744de356f68d789394a82b12b4a0c1ef54c358441e0887c584911f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "a3bdf74b5d7e9e5b0f3934a6c9b11c336ed99b34727e32c9263e31106dfc77bbf9cd0e11b2289f6a94261d6f6ec641e5f8b1e22dee0b2aad1e220d7dd1f0860d";
+      sha512 = "7e58faa6d6a72d0a750d9a5375931a69b82ddb0ed1ed28c154d93accb3f8db2f0b4416de18352e36b4d5182b634ba1ffabd44fe6a89905f06755288c5c3361c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "3eb55a9e6f0bde7d236357ed19db896a7999409d07995997e7b464083c730ab3fd21c80f92f61babeff03520b209aec06a55c6f5764ec858de9402e4f436c848";
+      sha512 = "f4472e1cdc43a1a9d36d06306bd12259f3d63f6282c0ab51787d33af58546554442de80064775f4f55e37a3b492c33a6ca41acadadc85d4036b874d001a9f49d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "24b5dde86cfba7463556572772fd142d1610a66776d6e021307484ae8087285c1a578c4e6849668fa345292acc889efad22bb1243418406c6b28d7768f94e4d4";
+      sha512 = "3e3d4b7eba47980b83e9abaae4d59afbb879273e55c942e8320c22a67fec924744cdec93e679c4d789596fd3227695865d446a8604580f18b3125c88f50f26e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "863f5ca12705d5ce5c75ee4da9951bc4f8d232596857ed6354ad29c5e28e15b7e610a6c282b8607145c37be6f365cfc8e0ebe2f8ce9a8410b39f44a4b6f30985";
+      sha512 = "4670270b2fb252c9fd75cb22e79c68ece97e6bafcbb042eed842b12fff2d7224042b273c1106390a0f2ec4a246923877cda50c93313be2aa736a54f0ba127c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a1179cf0010cb1d8f84e06292c932ea1b6d91b7278ced351e920b752e6105e6bce8d2792640c382ccd4a495fd4f58cadbb5dd5d35e8bd90a791050b05b8e975a";
+      sha512 = "30e7f709d3c9efd5f559082b00222dc6cb1b3e8376e977239bb5d76d9793092729d49255599e537c86fe615eb0713ca8c3f9a36a78c6d41ab1bc676ba46cc9b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "f46dee416a015612f973577a77ccd151bec500ebd52d05467a8e8ced85dd698edab13d2d38ee2bfcd16ebda7c2970c7f2eb22726bb06c355965216da32acfbda";
+      sha512 = "313a8d22b9870ee916a571a9d591517ecc162c8d37fea2d3efce4e839bb0dfd5ba3f960796b3e2279f1c115d68296d31bb05434fdd2335164c0c211dc2a1638d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "303b4a892479f8ae8d0628e58522929fc184d7179733b38fe45f154cdff14ff1e9675bfd6a16e1d1975ce8787b930f6ac1794390d2c4ef1a9009927735d37ab5";
+      sha512 = "4cf19ea59dd841de4494f4d458075ce42d9d97471215b7ba2f7a84eec79d1258c5cd341ee013ddc422e060f1aef902dc93216aac15aad04c9b28466feaed89af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "e9ceb65512d95c6d3e8d5fc77f428e7047fed84664be1ce77376d4e8e73ac31c23c8b2008bd73d87f3dc463708bce6631be885e23385790ee35b9d32cab69164";
+      sha512 = "cf873be3f9d72655093719937242a69f0b0644396e3332fabec20eb696a1310f88481b2f412ab45835c5ebf40821b298ba2371b20db101621710d7f522e19cfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2996a1f32dac40cb2e327cdbf89b8b28b13e210c5d7a4fc4d8e9ab13f8d6e6a29992f240e9791d7fc7d1bafa8fe86a905ea216fc1c14eacf4649ba9f95f8601a";
+      sha512 = "598d4308933d01459cecb91e3edd2bd428a70d7f40905f03e04009ab0f890537310b8ad93393340937e7eccce2d78ef15915530ef2f27dff46885f95b23d702a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "30514c8de52e33a021c94261fce16a9e7606cd511a1fb492cb817d4f57d2230fa6ff94317112fce230b8e4a4b3fb7db17961c4080c55269c398bcfdca036357f";
+      sha512 = "b5099c35b12c6ce96ee04b49c0b8e38b6304274ecaec1897008cf74af1809fb0a3deb5acd4a5cdfb27d949ba06a669d3eae450b59721afe9441aedb8c6728822";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "60460b758f82d306494c601a6fa708ae203ff712bd4a14128114ffb90bed91fcfd482dd43556841871c0a352e92abaaf8c75cc24d3b79022f5847d17c2341083";
+      sha512 = "f1f5435ddc19aa2ea3199982a2eb83cff78f016473837e375ab0ab9b3985ea7f727c9b5a94137a76c08c3c1fe4af0d8f127b479d4bb9778bdc807cb46147dd87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "cd5e6c09f778dafa923ddbf01f24e1143f1c8719b2af5d2a4a697ce9dc6998a2893d7019762f1c87c80a190ffb42469e27eade981bf3d35f0e3428421fda2645";
+      sha512 = "019a84aa64fc11eb0266d33f67e19623f75960f5272a4b46ce9985349a15a4e16be7c84f3bd7293617cd4c778d62ec8d745b99ee707fee30f3a3627717793587";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "ff892cc4b533aabb1821ded5d2157a594c7e0581ce59cab600c4d083d563aacc7c67ba58ac2133bccf31997a81e649eab87417485d7c9de1f93b3846df4df8f4";
+      sha512 = "32ffe1615af1522970a00608a4689360ca21d51b3003d2ab41cf317a27043c72db483ad427af982925034c40cd84684c973d4faaba81ea503cd28503afb6055e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "db3786087ea3aed24f04b4fdc94717260fae98c288f0df17cc753df572b092b25bcbbe08de765f76b84ac9e7f1d39bcbcc2cbb1372b3c76775cf2a55f45cc32f";
+      sha512 = "bc88e7f0cf213377d77a3d8ba2b7a391a57c69ea1ed8c5253da5191cd0742b97b0de1566c971d5a9870156cd98af9e3c8ad9a1b175e1079e7a023f002a72af20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "f803c7b7b593b66baf6995ca9e2ac51613b668b878c26bfb1280ec4263e4ca1e4300bf4abf41b327b90736d78be0a823431a7e3c0c121347cd13d88ecf12da97";
+      sha512 = "1c2c9177fdb47271b7388e9cb445de61e2e21739a558788f0012c3ab8f9da5a64fc5d833ce4f8d8a7326807daa3147420b88d8d78aeecc827a8596adfcd60b0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "27836c549263ec7ed275a9a65a3707e8b04f2cd6ce87fe29c796ecd6639a4dd95749157004e370876df058da3d452804633bbe34517dab186a54b964ab655181";
+      sha512 = "5d7066183b5f8dd41f00fe89f5423109d6d1a8df6d51934c49e2c50c627fe3492294ba992a92d1f07b0ca96811a0d27842418b416618d059981a8dff21452391";
     }
     ];
 }

From 00d7ce7ef1a8e90a108f3c39278e3ac2ea587ffb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 14 Oct 2018 11:24:12 +0800
Subject: [PATCH 2986/3253] firefox-beta-bin: 63.0b13 -> 63.0b14

---
 .../browsers/firefox-bin/beta_sources.nix     | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index a2b01c888419..6633c6d22d93 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,995 +1,995 @@
 {
-  version = "63.0b13";
+  version = "63.0b14";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ach/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ach/firefox-63.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "f07014570689a2f4f55771d199340193a3059ae121e7d5825e818fc6e5245bce15cde80de1f7c35bb13a595e898b79481b20f7b80abe63181cb46b6f47da4076";
+      sha512 = "23bf5d5195c7678ec4bdcb1c4caa46e2681031213cce0239509e4999c81ad196c8c3cc77720f83154ff4f60ac161c01d0f8fb0c22655777325f67ee7cf31b4a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/af/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/af/firefox-63.0b14.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "76606553f77a5a0deb6e50908b39824242175b044ab1562b1276ba97c8bf0d24154edd46e67c13afdba06df6e65725e291d4d25f1cd9177265f747bf729ed7db";
+      sha512 = "7e8983fd49deae14281a400ad15146ab27abd9e2f7b3cb060734f2538519541bfe0c20411df35baa836f62a176955edc005755b4359eb66a661e73c75e72a04f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/an/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/an/firefox-63.0b14.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "fa29b6af86d37befb227359254d680d2ce7eed7cbd4ff511be222ef112fca6b477fe3dd5c78696bcd71402aa4e99051ef3a0b6326ac959dc3262c9b8193e69b6";
+      sha512 = "3542bceed63d08bb955cb089fc29c3d49b0f60ee5dcaed70bee27f1b340b3e34706e64079a5496c4c11cd99ff8ade790a7105b22f9a13a2aad8a0dfca80690b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ar/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ar/firefox-63.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "1921963fd0a8b515c351d30d9b7683f7984e619e77df0f9bdbcae85b0a0c1e4a9475be238cac6049d61135677af26868fc91ae76ec2ba81535116c95665afc4a";
+      sha512 = "010a259bc60e823417411ac9cfc35597fc7a5ba997ae30d2f5359194720e7dafacac152def59cb755ea658d581d2a19e434c5863cc837c43d478454837910811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/as/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/as/firefox-63.0b14.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "083b1f189b5b25f788d5bb8aa4367743a701e760e3ffa9c3d7bef8d221dccab9ebbb5c4486349f156bcf3cc44b90aae215fb76ea22c18b0401f69988915ee8ac";
+      sha512 = "a78ded1af77b7ef20c319022d94275a8843995bbb279b3570f7d389692287af5f7e50f1a5bc3da46ab60300f5f9fe43396d577170c7bdf950bb38e2433a97b1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ast/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ast/firefox-63.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c1a7dfcf12d8b4fd4a7c6b657436073c41a10cd4ffc1e131482b83242d8a023cc89920bae085a3d7e334e5f8a87be8e2c01967d3d5e76f687c6528af09dd2adb";
+      sha512 = "97891240277fb80a206c5bea6e9e2edf98adae043bd68b421ff92339c8857084a5261b91bb672485fdda4ccea31a5b37230a94d760fe35390dc9736e8dff4163";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/az/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/az/firefox-63.0b14.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "febe74dfeece3c7fddf3d24e682f4c991eecd511702217c3e18941edb9ec6a5120b95da72bd7b7f5f146f74174a0f4624ff112c56e3d6d9cb1ff5e8e349a294d";
+      sha512 = "fb31a2b02c901f1b52b8a46b80c6118a2689fb4567f64c9ce963dbca2c106983a1e1fe56bd428e3aec381f85136f4914e1c57692bd4a021a5204059232bb74e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/be/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/be/firefox-63.0b14.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "0ef2883de7eeb54eacd376cf00bdcfaf399f1a7761f2a26ce8756d70673f9074d0f919ca0253795db7643161aaf780461f238ae1065506376ce6511f0134444e";
+      sha512 = "2efdeae4f09e12b99528f6370e3486630224e0d5baf19df62e79a890f03c2d512c81dc60963d537c128f3749d7d9fa73f2bd44e65563261f4c3850e75a7f3eee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bg/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bg/firefox-63.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "df39cacd1c8b40c863fa4d64bf1eba8016f5789b1a09f5d3dc0947795e11b51dd67fa61dc666ab22d00c2d21c3eb3891cbef5e6ccfd6f419ba5ca47d8b98d588";
+      sha512 = "066ea34c198e13ed78c4b48c6b4d751c3fda1d42d9470a7295982d9510e23d17ec0a937a49b5403bdfcfe8bcddde16438dba0879759ec362f26a4583b435b448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-BD/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-BD/firefox-63.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "8398e8048bf7f15a234e6bc311561aae170d97715f73f9d8fd1dd5441562158970eae4628cd16a67992edd14f7a38bb5c7c32e6e9b554b0d234d2b012c80f76a";
+      sha512 = "3d25f71604d83984c0c86eb9fa27fa3bfc35631087cac1bae4ba2a773b6c870ed2bf81167633757108b631a18506255a0bc8e9dd4160b8cb35960efd987c9bb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bn-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bn-IN/firefox-63.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "56cb6e80aaa4e9d98c8baad5bd8082e580d9d43e86e461939c41eda37fb19b95b55c693ef2b3e2d1cca486b307b0a9cf50367f66844bf8ab04c36e69b8d97ecd";
+      sha512 = "be90418ef58e6005086919dc89ba6168654a6bfde2dc87001a8092174e2b38d8695a70d7d1afdd75307db332785b5248e4b2d38facb6f9a7884d6483c8ab6c2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/br/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/br/firefox-63.0b14.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "408693dd3d83be1c61bdb0618eb690477c6249e1ab3b7a2ab5dea03e29fa3574894d3ea1bfa3c5d9f3c853b5385f456aadf0a95a2972f39cf559a5a599cdf2c9";
+      sha512 = "b8dfee8bafd5b1ae7edb061c04b66ba63cd2421da54780499b947b4cf13721cc8cf7ed1ea06409a6a30dc831bedbbc648ac3a123d994ad676061edd10e7e1478";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/bs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/bs/firefox-63.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "afb9bc011ba0a95b2a87372de281024a1327d28b586e1465c7533b615357668ab5f89d1b6497e63b682dbc891da78f70fda4a70935380747ad8013a8492467c2";
+      sha512 = "402898f9b309d56ffba067d7cf607b56b01d7df80fc8eb60fd04f6d659e4e473b3c2553238bc63a4372059d7841eded51f4f80de602104a6a52ec34cd2a6eedc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ca/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ca/firefox-63.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3faa14062e22dcbde97a66541e5d070d1a02b3471cabd3105a5ca546df6e34e7bfeba5af1c106b3f0db11d33343ff7df2d3fb39e8b55ea3cba22a172e93eec6a";
+      sha512 = "233640ecd9dc6847ee9a538563fb3668a851aad7ac0216c09a31c62151c31cd6afa3ce84c36558aea39ead48a85d4270f0a4bc64701d699ead668f687c0e8e28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cak/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cak/firefox-63.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d1ea0e03595edf8c8a55b8bf60596aa866f6d228a28ca68f28b33bbee09016800b7ddde07ede3b1131f5502f57fceb4c088d977f2da0669b9b8771668aa77fb6";
+      sha512 = "e326c1e011f9a58b40a026853c2d1d34ef45090a2f86d69aab46d358c2e3a42367424bba49d4c93fe92cf27c8bcc4d802084b28432b550b3c1e3098f37b72fd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cs/firefox-63.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f3e8a43371919735279f934d207ccb78d568dbc17fe678a36c50d04371f55dae97c3a7ebb1f6afe16f884cab65d02bdad4e7cd59d1b34d59295bd90965159673";
+      sha512 = "efc79e7384761d996a9ac636dccfcab32f4d14cdff218eb3c0161957b8a659ced0ebddd2ed0bc9dcc915ebb863ee8054b1f8bc6f16666f42421e4982682f97d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/cy/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/cy/firefox-63.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9e053f5b2dd82cdc81577fc17b115c0e1630612b70e16d2286f4fcf7eb56298d88a927f42b387f298997f33bcc56e2b85b08761220193b486bab0a8d76a85de1";
+      sha512 = "89d06350b5fe8c83bc23b69620c7b6707d2e35981031783ad41cec728e41b842f990d7acfe2ba9e0298f0955f11f54d7c6551752e9f51e5b563a553001fc27fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/da/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/da/firefox-63.0b14.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8bda7cd63969acb27aba21113d8d44f833a7b8bbf5fea9af43b905edbd4e4db6a33830d4954af2635e684f04f9bdc35d4f4eb08f2433443c65704d8d482b7a38";
+      sha512 = "103c34d736307f91e4e4343ad0b5f3ebbcc1efbca660782768ca20bc7a2cdada2fa40382f46ee57d70499529819f000eebc3e5d62c53ee5bd5f15437a18be6ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/de/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/de/firefox-63.0b14.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "640bc5d6195c7cc8291d890b707ac68dc2bdd7d5c1af1476482a3ebe8af738ffec60d8d01eedb11120393e3dc636d7c84403a28df579d1af4235e0d2831f3411";
+      sha512 = "6a5e6e92fcc85846b3c92d34694e30672399d9a2821a9107f5a00942bd90e0e351ac6de435709149647cf94943c5f07fad834f7925682f0c0668f4c29b4644e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/dsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/dsb/firefox-63.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "55734d9efd54b0b67a7d8e3fb5b51cbe426e32b801037042d83e72ab7c2f039a42f9be4f15facf29b30e2b7e94ec568ba05e21f90714c5d42f9f96c6594185f9";
+      sha512 = "bbe625995bf300b561fe55210f396d4131bbcadc33c707051b226115cde5982f52520cd815a857542535e5787df210d612493deef50df5e361108db27ee86478";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/el/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/el/firefox-63.0b14.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c8f088dd546dd551c0400269a3cff29a79e9f125fb6a7f8faa558efa6331b5f34a389282e2a69a35f16dbea37826a411b9091eb0dbb5a2b2885bc84f493ec5d0";
+      sha512 = "6b5ea1e59bca7b531728c70ecb644969a33955fa1975b7c9d03b550389f8fcb24de45d041df59e44d5a4cd66c8caa98725d2349d5b6c45da8f9cba917528d1a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-CA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-CA/firefox-63.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "2d093cacb7be796934b1f83f96bfe0c8c453fff180e5e10cb467123d6dc12620751e0074679220e874163fea1ae49447ea0ab4a4abaae710a891860b9731c42d";
+      sha512 = "ffbf1ea4c01004c435d12ae5b0309f3a60df116df371255d53e252cc3d3e220b154b9f32fc81c6868dd20108ac9d35cb79e4b2402cb62948408288d9cff774a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-GB/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-GB/firefox-63.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "a791aec86b3ed14efb08d70159950bc5019f34b052dc773ea829ba37352fbf692c6e37df4b47fe256af5b6977390f0b47d82473778f489af3f43031eb83a3636";
+      sha512 = "7649d91b6d454992d457a3152f066c8c76375bca41ed6101fb5f2dc700f5c5a9adb0c560b5abc5a8e21135e5d2abe577d286e64e77a11fc4d14f0a95a367e371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-US/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-US/firefox-63.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "b815f79b53694e370d4a7cae85a2222b9ba245f9d84db424bf8c25b5b4b3bb95e3895cb3d5ba10a1d33b9e0459ac57c158d75fa757c8b923df5d3ae253289e4b";
+      sha512 = "068297ed38ee0ebe823069a823a46a3b871528b36815324a7ef514967e2e640f9277373cf1841df5ee64a24d3909bf317ab6d6e70670c4067a2d1a8caaa4f0ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/en-ZA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/en-ZA/firefox-63.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "7769ddef410d868ef5eb8c9c2b205bc1083a3224eb260734363653867bb1efbc2b524444401dc6ed2e65e2dcd8849e6ae05b3ff8143a2eb06b266bad7e43552f";
+      sha512 = "5f50d62bc6fba7dc71169e5f7c2dd66c0a654c150d29b51a33333147e536eba671b0778ed66e08ef49d8399f3b77a34f31b90cc5ff47e8d6a779bad29d402974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eo/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eo/firefox-63.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "78845601a316d7d0902031a0909ccaa53e1c36afe1607150b28ab6e0067dbf4c84c6b08aec6b334ecf04d714514b02a9b62852dcba22b54652d0fbde99223210";
+      sha512 = "341bdf9ec2185e353c27e8037dfeb427c189214964766b4191e1b2b85cfd713a8ec7cd000d2f52d347a605fd41608a574a56f1334ceb8c1cf11fb51ab2e4c7c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-AR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-AR/firefox-63.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "54e0a9200b55e10a5a480d0df47884b2c5c6f3f8f11c61bb645a1196d00dd6c121ee9710e6b2ccc5050c659c90cf36c9489a9045800cd566d64628f7e2affb97";
+      sha512 = "6c92fc52e6b63e9fc14161d20e90d58551f7b062682fc12fb40491fead1c042f21bb0e4cd241f6bbc63df865bc28b60177508275b46f340d9438707431c74a74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-CL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-CL/firefox-63.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "b9f22d8318097134f70a22cdb21ce47300ee17cfc319dbb7872bc4ca5e3e7537fe255fb2db67ba347fc2ebf3ab2cbc8a6ff5b797385a0603f5a651a8cb820154";
+      sha512 = "85ab9fbf84396f15c7d3fa350b9da367aa3e13550a4f936f6578333216c828913635c18f19eda04c31ff8ecd511330aaa9b3499aa86c5113981e91de5ce3ffa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-ES/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-ES/firefox-63.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "14cd21583ed2c74da7d75eca039bcec68689e369c4851062c5fa205488b577e29222fd6a025e5264d0423061d1c11d617339359a2cbcec927c453181df6b0c59";
+      sha512 = "78fb7a9d8bba35aeb3ca6c4a28ee92cebefdbcf84a1d169bcdde659d9dcbf4f7770e0a0a5f448b38a9cfa4f8dbe780fd324ccb904d0a16bd44ce82ce1c51942b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/es-MX/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/es-MX/firefox-63.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "770cf8416d344ca603acde18841fb21ab1c8946e7a5a150876c47783de79bb43b85e8b366e55a4ce105b3ddf43f46272ee165deed6bb497471b74d849b858e55";
+      sha512 = "e354e8cb44f9ca53df613d40b3c80f3e1c29900d3a1b7c72ffe886d4160e76c7b692ba9e047616e1526aadae8e72050752b4bf310d73f19beebf6533a2f3a160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/et/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/et/firefox-63.0b14.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7402a094d60729cb28b71cb6d3774201fb6331fdc77321cf4705fbfa330a418c92bca2b5a7a3a2901b843d8bdb55045e339b0d87753148ecab699588bb1923c8";
+      sha512 = "68ba92cc0e8d26177884f921239dcbfb43642cf145a8445b22e3f2d0d8b34a2755c68bfd00ba3a05763b9606d27b4a13b8bcd91553e4f6aebf3920bb64eb5a59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/eu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/eu/firefox-63.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "485ab61f0e85bd8a391560f4f2cac43ab35b81c7fdf957c36ac21f7b25f9538f1d118041f44742b978fd0619a977d8ec69553890d8bdef73c88944228f63022d";
+      sha512 = "d140d0fdae10e801203e490b4ad6816393e88a55f1caa1b4e76e11cfa4eb48360f43331ff7c544061a24d9c9f0df91a3ddb39c0926eabd8a2a85a16aa95ca8bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fa/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fa/firefox-63.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3f82d765e55611f1204068f2a62cb8a51f8db0940dee4d184fd2de69dc2336a1b6ad6132ad6e0188fb82028daafd244a2c478799e648c74d8efc8c46b6309e62";
+      sha512 = "f9895dafc082cb31f74f6f467b59be3e161ebab65a191cd2bd8432e67615280c9d37db3b57d949290c3abf1d50911370d12fb40ac77f1f178608124f1d298071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ff/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ff/firefox-63.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "33a5c4fa3436bd719fa2e02fdb23f9aaa33303f57db7ab27e86fe86d44065ea5218ccbfa13b410b9de0525c0c882e67ed6c6bc7b6546501edaed635460e26f12";
+      sha512 = "051ea2a565519497f481f2270290eddbd4f698e6bb9a9777ba49bc751b3069b04961ed67314512727404bcb23d8411be967261b3be54b2f8be2a2f4379688ef9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fi/firefox-63.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "43d44d212bbb8d1f964abaa553b26fe5ac1c14c5cc2bd535697a03a28671984559925eeb66e0301db4b5f4cca615e77edfba5d443655205a5648de8dde6552ae";
+      sha512 = "813c556ebe83639558f2af959cece13e3940ddd51826fdc0afaf7ce4142f78d07e6454dffe76d57e78dbf7e0479a64024b3720529eb032260509e51f72ac4372";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fr/firefox-63.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "8d68e0667444cb5451382adf002dbd52f2cc755f0da0e91d5476c1cb88e62b0c1d14d8f796bd45940cbce01c2a180cde1ca087558a3e0985137f9f2db8ff4ef0";
+      sha512 = "b63c2db2f5c115aaf2dc4f784d0ee194ab5647e493e64f315557023241d93c7228e4a94f8a7ab9521956a1ad8d811c5b8b7adcb34bf241a0eb2ff28e87472700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/fy-NL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/fy-NL/firefox-63.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "332a3219011cf0662ef0c560f86a7480fb270bf0ab9c6643ecd53f28b95cd7a8118a08638fd9b9197b2f6353bf3acf05656501ae67106cbde008edee87a8ba3d";
+      sha512 = "eef5fa19a954138a97c7f14371bf53b66eecab4e932b559cb241d885414db578d90ddbb835450589cde6ac97937c9946c7abfe37f2808c7141b46730f899980a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ga-IE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ga-IE/firefox-63.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "55eca096ca6a8bdf779d6ded920bbddee406a0f925b293b9c5c346e5542b1349811248014d908edfbf757c6510ca2ad561e97fa5b4557804f15a62da45afa97c";
+      sha512 = "5e5ba8b843dcf7d9beb2f27482bc7269d4b3488aadfae0f55fb2cb88d78ef11734255b557699539fa91a772c44c27366faf5d004221b523636d101d6c11a6be6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gd/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gd/firefox-63.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "f70cc87ecccb1357a33fc0e8e5a94a5fce1c4150d9f80946faaee7e6280bfb821a403b522dc6c1579f36fe91697e02dbaf79c1c83b3e1858007fcf7570e8c6bb";
+      sha512 = "f69b169d9e1fc361ef762c2c6e23e6974e525b984d05d61364aaa1e08d7f71ecec333bed1e5f6e923ed19e6f733add637b6915ba28d6751273f75bea02f6a285";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gl/firefox-63.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "bc5fa19ee0f1b907bec355f2fd0dff4f5ff8797c8ee77ba4c9085119ba25b270c664b488c66600c85ae30c12acfdd9e8cf1d84d785743a62b85030f3739cff36";
+      sha512 = "dabbd994076fffa9e4b265724dd43123e58dbed9f2bf6875e3cee296361be6e90d293e03d7a7dc36a0c7b5e06358970d0d2da9ce59445e6dd8cba853cc7d6625";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gn/firefox-63.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "6009359591c9d0656eaa2c371c73d9a7141ef99d1533db04003ae3d7fcc31e33694cb0e2d29fbedaa63689a3556c40b281a6723fd7a28764ff77fd2ff624d9a1";
+      sha512 = "daad08e31d848a8944e36de81e01bc2d25614033ff89dfc7e9a4124e2c7c9193752c4be08240778c05a317c27e2c7b924f45c91b20de46e54ce28d030b4aeb96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/gu-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/gu-IN/firefox-63.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "2f3d315c8424fdb5823343885a115faaf57732977fe535526220125d38b0daa3faaec89c196cf5e153190575dd0162988a26a7d483e96f367c1dc7d1753ca676";
+      sha512 = "e7f674c1588c1674f28e7f76f8a413f20b8f50a290297f045f24db0a0911e65f7069ca53a985aeabe86fb69ee8ff26e8897eaca6a36de47adb42ebcc36a8a4f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/he/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/he/firefox-63.0b14.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "34577bb7b26c0c8fd8d12a278e55d89bc291e5c3aec101325a664125dffb4a33fbaa7decb9f75751ea3e83d06cff755db7012776ef1948789b2005edc4838505";
+      sha512 = "236f84d6ad9588d3ef8accbde3361cf89bc27e72d16bd5702925f929a7da46108671e2ec15a4daac553868433e3758d280dac5bd6e4c60676f55a22575114a01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hi-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hi-IN/firefox-63.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a4319f07f092d10afbefdb316d3ccb550dbfe81f886458797a23a8ef9633e04269d2c8839f6e440e91cba48554eb604d491fff685bc3773114c5c413ca760149";
+      sha512 = "a8865c86b1a86fe1c60ddd42ec848b1be92f686571777fbf7b874902cc07458bf5e0e5739e6afbe399b499baa38e92414653d469e9d64b26dab15fcab89ae2fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hr/firefox-63.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "69503b9c45edbe65c8e21477583bfcde353b588bfb0ba2686fa4e73f279f050a62a0ef5c93cea60e05e777175993302740b3e1907013c648bebfc318c05b72d5";
+      sha512 = "0a55d784b892c4d7704da36e8d4d173d96b594fb452e61c7b090b4d1634d4f32be21490501bad131b98bcb3648d36a08f1e6a944e6ea20f606136b4bd8b063b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hsb/firefox-63.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "8a45b429b0f338f13b59fde3b98455a9c57312030bde04d1ed1478c0fa393d0523b6aae94a8127de429d47c52ad997aee1e49bfb3fda051386365c2f772a0d5e";
+      sha512 = "74a645a86ad9af1a9dcb9fd8c98970deb1f5cb435e3a648f420e66d85235a7348f392f34c0f1a6467965c877b1a12e0bf67dab6e979bb1df82057d059fdeff21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hu/firefox-63.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7001c9ee64a1052d117e5bb649dfcf287982f55e5262baccfb7c9492c7535e975d831a92321fdc65775dc31b5abcc1bd2bf7240d7eea701bd2548f95ef646660";
+      sha512 = "b4f6ec7eb9fbf8da6e1f9bd99c54c84557c29596fab6f9f75211d72632ce644cf2a103c02a4ee67196e161a2ec9127c569ed0fd47bf7d037c01c301c91bc14e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/hy-AM/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/hy-AM/firefox-63.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "1fdf9cd98aec5cde88511fc3a79ff43c85185ac2c6008da6b432aa870eb3a9643814cea6bf402a17dacc7f2ad2c84a95e19a2f85180eb87e8a365e64a0e6a532";
+      sha512 = "8c8e175aa2f2ae57f525d4b1391eb919b847598019b1e1f2dbe27da40512293075bd87574df5490fbbbd13bcaf5bda5017d980d815475a82b3c0df4dbcc28301";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ia/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ia/firefox-63.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "6ffb602151ac4c9d9caa8b529caceca673521379fae298a9d1daf9049e0d4005a52adf079036b340d9a4099444404e9fed522011a953bedd2000fc7d42c0e03f";
+      sha512 = "9ab9458e038d48871f6c978e50ba419dd94be472f06aa42fd781b8a75a28be20d365c7828aaa674bd818b32198dfd5a075f2481caa5a7e201e7e94a10e7d2763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/id/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/id/firefox-63.0b14.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "bc95099398a49a8417a8cbd7745fd3d07788d6f1f4ccbfb70cad2e705ce45386e7ead17a1864755497576c3055a0ce05007c5a33e82db2e1b8e41995e68b9c87";
+      sha512 = "0f0ba70673b6aa030d4fe415097822c3259ff7e76a0a4163fada661886a7a422ade8defb6d47ff8c49833892ea0ed224af2c2d0a95ba6bb3a25a89a990b39ce7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/is/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/is/firefox-63.0b14.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "09d898308d707dfa60ffb05ff816ad10f9d5acec5956f634b344f345c19ef47621512da73b27ec59db822f6c66ebf478ea83e43d6c1c40f5dca32f824542607b";
+      sha512 = "ef5065a080d382ed3046e0f2c3f5dc09ae88fbb295d457ac659eb506f5ee171a0f6554ea83e486e98f41e3e4fab0a2e47247e9d72d67636ace34844262446330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/it/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/it/firefox-63.0b14.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "7373941b6f58e72a99bceaa18ac36922ac07f6af3b7b0bb669c223644f52b0253912c4ba199094d7d1faacb410f445f0e13a9793b0ad4810acc387692e9d5262";
+      sha512 = "ff46ec69b6778e9f17e0829d007e11d8e9f33dc83469beaaf0c7d99b4157d612f4c749ba0b4080c1f6384b0b0e56d2ee10df6a6e9e220935009a3c09a65ec570";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ja/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ja/firefox-63.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "07680a13fba7016b030aa70430094250fd75332675402a051501c1c7588869dcf0adb52c1c74366ad12291bee5f43c0748637afa465cec5ba9a9675779e4b0f5";
+      sha512 = "f1df613339e61bacd632f986511f0b933857e7a24207aebcdb068d2290f52f1224907347263fb2aa121d14894a0f49bcb3b87e8737338c95a701dac5a4c858a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ka/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ka/firefox-63.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "0a2a7903ce148d8643a51f0dcc30121245a05fe36928a318a12fdea3708cae991978782565384ff4131f0551c1deefd83b3c636eb461b69eba468e4781f2f03c";
+      sha512 = "94c378806ac9b3c80801f344323efa0a3680f9f7319193d176032b36f36a879c9528fcb010168ac8e7b2f2c72a78e7f30eb9f0d88c2db4d9d4e57b99219e48d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kab/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kab/firefox-63.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "3d6151e50dc676d694bbd88cf3947ac6bacae371ff534fc8d5cd20a0a670056f7b3bbbb490bb44904668058660c6d3937b713a5818d5d69bcdf68706780ac9da";
+      sha512 = "cc69f5fda4840fb6e23bca315eac82614e0987aedbd54c01cd685cb09a9737eabf75b2074457cfa44880283701b0f178c903922be948ee94638b88c1102ad11d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kk/firefox-63.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "7984af247c9e825dd25c37d50443f310ad5b2575a98bf06abbb734511b1b9705196260f82e40f8fdb7c9298cbdfc314f4a4d3516f6bfc99c5f0ada945160ae11";
+      sha512 = "20d3d3a2fa0ac8a8226e242076a431072324fd9cbab2a0e15901d6f2bee3532878e8453a2460e6ce1b0d211ce409c9659098a2b02c303ca171a1857fb8469395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/km/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/km/firefox-63.0b14.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e0e565783f069f2484c70e74f1fc6c0a4625d8d6b2fc80bf87f757a04ef9f3b86581354b84b64bafb356f01f5daf602bda845f376153b753f2144230cd17ddc1";
+      sha512 = "1ab989e25b9bd016b65b45c3361f7bb3cbabfd3246ae9395101b1316a77123a09d07c780355279f79219dfd42e3b053f88ef3a33596eea07e6eec0ea3306a886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/kn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/kn/firefox-63.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "28e9d308d29a8400506a497a2b2bbb3a8462646c7c0039015d74e2405971bd17c53357e994ec24bf61593e64443c90308034637e25b52b61c05c1870b8cd35ca";
+      sha512 = "a8cbc0b97e8c5ddba7ea34cdd2d23b4251fff3196b8709c22a0f4627709d63827db36119d707b5e1b985a5efe3ca157365e29e090fab971b5b399f5c65cb1059";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ko/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ko/firefox-63.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "de5cb0e68eedc4dc3893ddd92ae1380ed13a3c629af353a84210bf606fec6afc6a14c34408e84a9671a489a73bc1e041055dedff66d903a832878b918ac22814";
+      sha512 = "f1a81822c8e4b2881bbe149e709450084be843d71f4397584e1c4c1c665752a1e5f1928e4e7c1562b6c9a7a4a2f394376753c61d8ed71c65e2d9acbbe3817f4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lij/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lij/firefox-63.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "bdf96509b64cd3d6fcc6fe573409ba95252d9ce8b903279ec866a796b2f84da09d1a8361fbded06f5ba7a632b4e5b9dab5d278fd5307f09274a2a6f1921db524";
+      sha512 = "e8e4743ec730f999a5944a0ce33244a38d4721a9993fa37bbd2544e7d1599c4005e79bbeeee4f3cbed5385c5fcc40db14db7b07d0e68816b85b0a5d7e64feedb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lt/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lt/firefox-63.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "7533b8894aebce270fe279d38ada97f2daf1e21f412386e59f4fbc8da1b833d8c0999102870ad3ef77274240ba4428ff44a3e19ce66e7d8502cd09fd9b09c38f";
+      sha512 = "c32ca1a2394dcb6d022319f204101803292cad9bd8210bef6c55210c4b52fd7bda257172e751554a652b6c904d53675f0927c0e10a05d0ed13eb2e1bf41d66eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/lv/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/lv/firefox-63.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "207e76a7168535e019e302996fe90e187652e78d114119a01b85247bdc2c35c8f99a1ec7ce4aea50206ef3515f24b21823271d5ac708ce48d66dd98ef65995e4";
+      sha512 = "79c2414ffd2b386bdc232adde3f79de6b3163833b91b42e6a2cb5698536378ced2fb2c87d74af7b5bb00767076a66e8cd7b994dd014a0aade07d4a635a038692";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mai/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mai/firefox-63.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "eb53a363dc68e5ff0913a264eac23fd55966d779a421fd73adb8ca48343b31a72fe4281a25875c4bf75df1e600cdf8cb15ac2444933cfbb4239ea097fd337c8c";
+      sha512 = "0c5ae8842de2fdbec65204d409cb64e96264865b06931c0d83e3d7ea17892b68ae19344807510a660db0f7508c4a12cc846156cf07c19ff99579fdfbdbbc3789";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mk/firefox-63.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "cae33d4b6712fd95891da966e3382c6bd3d9cb643a1a8e38a56de719f066f01b0219a158faeddf8a001021b489cef85369243ff51279261bd456f70c6da759a5";
+      sha512 = "5d4dea8c824a27f9a1c4611f4d147d3ad6dcf58ff855239609dcd3b0f5b63dbec68127b6d9004b956db9992768ae9f18c4162ffea37c430342de010de3f9720e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ml/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ml/firefox-63.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "d6752487843849640e2104c285ec6c0981cde2905b25c2cf93a9b4602322fd3f232043832e933cdfaad8552a137398b2bb70fed7846a57c67703372bb6e710c9";
+      sha512 = "69dadd70e72b441ca0d769de082e5d8bdb30728c0ec94fd173e9cdd18207a06cb819a3e0fc5a473878debc223d7c61a6cea4b9fb05c1e430d9c3335e7643ef18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/mr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/mr/firefox-63.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "120f02bf41cee52f8a0d0244622c02df18e3870a389428aa2fd2d3f3b3ca4763c3a1e2c93b68f2eb2efc57abc308838128410abcdd6edcba7089458771eb4386";
+      sha512 = "4192cc3e34c83e4af33851de30ec113af55fdd3c68e7808a14e506861ccfca63909eb550c263a6b5297d37518ad82741e9ff36d155d27e0eb2189e7215c22492";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ms/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ms/firefox-63.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "813c1912d70069c36de7c54a6797a635c7838d2befa50e9cce21b718ab4f00443ba53f714b8a6447aeb1b1b72e02f4c66f31436f17be7b1f6e9eb4bcdbbcdd13";
+      sha512 = "11bab8f2f33f277e5720dbf298a22c6f175645c3f4f8452e62eff8614fdb0959a25f5069db208521f2878cd3222744c81c6aa33dda0da883bd4b938b9a3fda78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/my/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/my/firefox-63.0b14.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "bb112178b58424654e0f384733d52a2f99a3769f4314b62a911db7bc67d4c08b0a75c9281fe853d774535cd74a14816e78bffd4df00ea50534b95c113d79e212";
+      sha512 = "3ef85a1a63026f878cf75ad2d48f1008495cc24d52a884eaacabdb13039c5f212c9b0c2fd28c8dc5bd48102bdadd98aec7c975e53f8abc028747c6c90dafeeee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nb-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nb-NO/firefox-63.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e9116f7ed4a375c35ffe574194b846c336c1603946115eff03fc0a79556a7ff4ccee5bd2853f925aa08e4f7c40b596644bce09b3930a0c541a00c134f2f68da5";
+      sha512 = "b91108f3e30085becf9bac0e743d5e84129f8713f31a3fddefdb05433b269b16b05db3d4751928010f135ca975d4979e6ae0c8a2ab465be09908987ad79fff63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ne-NP/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ne-NP/firefox-63.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "688515bfebcc238c16861eb2044dd6f715e08f61eadc28eed5bc639138e32b94db74e4e9f06833bbc81cd681473dd3e8c3c3a3c5cea58a476eccef7eb40ecb81";
+      sha512 = "dfe613dc9a749805202c762de75de6d16571e37a9f74594bd3011c8c62388cae10b4556031094e8e3dfe7cc6773cdaa03532e99da80499b24ffb4d98a3bc6ee0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nl/firefox-63.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "23fde17dd874441f13c73439f9ddccbc08485d21325fd92ff4201ef61b969e5db30b1228bbfd0f6f32ac8a596c19e44e8edb8fbd28e910b41b2b272afee8e19e";
+      sha512 = "cbc5dd229cc5f33350625fbf6667354a21c8ac63b2afb0c256b7c507a2ecd9a089e577e28280f34a91416d1dad3aa5b2b787b104e26703e8db947e9c05e7e6c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/nn-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/nn-NO/firefox-63.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "f90ba4addda86e2b8fead3e1d2ea3105204e5173b85ac0ede40a2d69b5b9a3a2c29f0b75015eb93210909c61df8f73ca8bf9c428767019355ed98f402be5d7ed";
+      sha512 = "827b51031897e41a796f212c9377d8119b9d1d0da9b7974170ada0d7ee27111bd55223797dcbbe272ef576780c6b80e8b8057d4bb461f1679f487a24baf3ba54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/oc/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/oc/firefox-63.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "af7672a5cdea2e0d834e510711db4d1a2de541c44e97ee501af113d5dc102b2c5bffac86bdd363d2b541107ff1d121a182b14e90e9a68a8792977a3e73361023";
+      sha512 = "6ad998087dac027dc02b0157fe11b4b7ce9d2f2f3c923853cd1181557417e91e43e499b83730a5201060b31e30c996fdbd8a3b7c29b263f68c377c34662e8783";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/or/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/or/firefox-63.0b14.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "49cedc91af113cfad9a15d6933bef8c1bc9c6d0174cb1d6f57aded210296db6a248561c4ecedcc44dbd605922761e220404c335b0e7206402a4ff6d039b5b9c4";
+      sha512 = "8da84ebe54eba9df2b4754bbae8911570f0dff51d41e07b331ff4c0cb6929ec7835c166f0d0dbad1987ee0692d88dd41d3fc86b749b5b5144b52b2530b822379";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pa-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pa-IN/firefox-63.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "48fffe7aac458bf9879c6471733d7d0d4fd43b3609aa3ba04647721e7dc60be609009136d42e58d760a4ff298ee83c2e624529cd1b08daacfe60d7bfec7f1f43";
+      sha512 = "6ddf92d42e02778060e3ad6c9faf08187ddd0926fc85f8904f10b5d20bc57a243b61db0ae42c57d264c345d1b5bee51c7e6e62e207c8bd8edc170d84d673e87b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pl/firefox-63.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a7c613e88606be20d514be2e2dbd2a09f94fc500541ded40ba73b5e4c66dcd01ea5f7a96a55059f0714d321f712655c67ca86a0a328783a2a9aa9ca9d2802b57";
+      sha512 = "aa7ea0983b12ecff3ba235615ff2df5323fa979b02486506af9de83cb4eee679c90751ad43ba60d71ef8d30c39882e69793f266e79d45070157b097d7d12db1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-BR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-BR/firefox-63.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "6ab1c44c2a04f14a89385a2708916dfaa4f8d095a56c1bb1dc06c4e59a23f5faa356b1e86d26a905523855aa11d332a9f290291953e6fb9517cc73318935e0ee";
+      sha512 = "e28af3020417ef5d42b1f48b18310fb78c6ea33332ad2714c69d8979b4269327b76e1c7e9c55534800d8a3c4937bddf95273097ddcd4270e67bb23366b641584";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/pt-PT/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/pt-PT/firefox-63.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "965e5973a197f1122adf63b39e9dbdf1e2cf88653c7eb3eeb77ec498a1bff5abe54ecb3b76d2e39e267fb78ad13417e376e0ef5aba2ebee7ab21f0f4735a006e";
+      sha512 = "efae38a659b0d15fe1b1af9fb4d860df2796705df3c11aa51369c6844fcf24aaa342ff5a897b5d2f3be36a929f3fa748646e99db6bff70876e43387f45769b14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/rm/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/rm/firefox-63.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "e2eadf2a965e62b9fad998d3897eec6f888c95fd52e149ee85a2557ec5c7fb85f77dbe77817e919f868cd4f50d374a4557815cbdc6dd7219ba9260ee25c804bf";
+      sha512 = "1b382086b6e2acab4298ebd6f80cc2585878c30f48a264e9501dfe4bb503818ed84d87e4e520f646a727ebe6180ca3a639267297ee4b463d5661cc61294f91e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ro/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ro/firefox-63.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d5f848de1c19d1bfd9a10e14c356002524e07692be8383ea7d31f3f30b623b2503b986ea33f7c1cfcb03886652b551d58b1fbc50e37f02975548e03f490def07";
+      sha512 = "6eff37c77266ac61e9fd28bfdc7a674bd9ca26e30c1cc4697e0e48946e788b632291891fabe11d602727db931af1fdb56467f20c362aab555afd6ca9cb9eb690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ru/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ru/firefox-63.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "d85f76ef591e0349083681bbd24d2f7fb4dc2a7483a21665c1f9b71396a29573e7aeafc431422bba271c63eaa4dc11b9cc87036338cb62084cc5e13b4b187c2c";
+      sha512 = "bac168bc68b214100078b88d66c2c88de66e23f0e456bbddeaa371a5a64a44c831281f4443edcbba49af34c6a1a5677e43d8a5c56d69ebe63614d8b3badd9799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/si/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/si/firefox-63.0b14.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "e44299e24ab160ae39acbc1b3b6ccac1e8eeb30d99a2a60fa39ab7bb1dd1c7296383040542cd81da8fe8fc5a778eadc10d90ade11346bc8886b714762f8d2ae0";
+      sha512 = "2a0c42e62eaf8e23ea423fbd9f8995fd4c42c8c65141a537c51c8157861a8d9ad38912ca864824d52f961e752695739610bc626862153b091b9bbb1e83086265";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sk/firefox-63.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "20c1a9437398ab3f0509850e23fbc8dec319fabdb139d0e953f3e0782df3f355fbc48701a08f13ead7689b094fa1f7df2308e8e47b2095d55ab5dcfa93f701fe";
+      sha512 = "5839b61e1bb4a74340d3068c13111ada01f38d60fedd9e64e78770ac92340f025f1cc92e562686a12b65fe1f17ba170ed925ea2e53cd4b70e0d2f5a1253623da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sl/firefox-63.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "ca4433207bf6321b822e273977c3c432a322c66b9132cbd91fa0993eb142997f304aedf5c96e4e62b2fb7b2530942d9f48bd40a329d10266efe9af8c062de89d";
+      sha512 = "2787536b263be9b7e0fa9f9bd91286b544d83468bc7cbab64ebb6c3c4e3d8ac7018e7ffa877c8a6b35718cffe190dd9ca96c3e3855029eec636dccf25636d3b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/son/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/son/firefox-63.0b14.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4534137bbc75738b4246d899ca5e16489a025b37315fa81e6bf0bc71edf4736749e90c953fa7dc7c829f1494f18d7c94ee84b6bfaf70ee3ccfd11b8d7636323b";
+      sha512 = "835bc4e3710394916c23ad066969364cb3ede5bd671ec2d96cbeaa448158f0048d4a33d54a98add87a0471253932f1dfa2cae05094d04bcd859846e6027903d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sq/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sq/firefox-63.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b2bf90fac89b89f3d61aebc26978120531d757c8500d2ade97e9c48f2168c64cb8da1be6d6c3c8ddffd23fbc463d54123e322b04febecfccb7bd4327620aac99";
+      sha512 = "ec44a791fd197df0f878e69592aa00eb8425515e072628ae857ac15101d08620023dba0f30eeda14baa8c6bfacf343c22e3e8c344576b413e32cca218d6e1001";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sr/firefox-63.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "4c28ba897cdfa60f548f52ee4cd98444010204a59efb7fcd8bdc5b6318a9f001500cdef11c7b7ea7637168adf6491ba269c30996ddcf526b5e1a2dde1388d6d0";
+      sha512 = "6913e130cbc2e982a39e88656e15793e2583ef4686132588e5b1b101af1e4aab53124732b64b46eac2d2df43376b2a65fac961c6120d05158a44e3217c315805";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/sv-SE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/sv-SE/firefox-63.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "04db58a9c1f80d4fd77a32f663ca95aea107b61c90fff8307b077c666af1369536e668c60c89ab8ae92b7b6a585a41c35f487c92e96484f0ce0c138525614e87";
+      sha512 = "8469bbbe04052d1fc120a2748997376f397359bafdad36690bd7c498c401c4934b278e1d1e57d39c1869fbd4f3a195247aa6a339f49e8b17f9399c21253901b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ta/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ta/firefox-63.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "5a2efde48546042d640de3cc76f6e7918ccc8b34df3c53935505b321d23611d86999b1c3ef00c08af003cf7991b7b00909ee5825251c9a13521e1477bd9242fb";
+      sha512 = "048dec7d7c0e2959176ac19f215cf585b12168d7a83f117a35fdc82afe8d001b7df7f84da628976d1e43dae2e6f28fed06701bd1c9a44b0fffe9c2d893f64d52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/te/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/te/firefox-63.0b14.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "cefe7a27d4a246549dd19f6c95d99cfc21ccd8b7b48b57425b51ff081cbfee4e35ee06350d7b90f40ed60029883ec7ad3d0a9ad64bfd851996bb301279a688b6";
+      sha512 = "63bcefa4ef757bde099b7661e21d241b2ee88a9b8632567b8f2e8150f70ccbe21b89c4fb6d59a7488ebb372130bc93406408b33ff8bbb54c555538cd77744c9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/th/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/th/firefox-63.0b14.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "68a997083d7c8fde45746ac55c8994f54d87b5ffe48c3aa1fb83460ac5bb61bd13d5b9f1d33e2ec6e6c2b9c965ed7ea8f1642b3145edd8a4977206c38da42044";
+      sha512 = "ce360ddefbaa522c5f4bfecb7e5deb61c342b0adc59a69d1fffd953dde013ab999430b9f0dbfb7ceae94e9684896d83c9222bd3460a5eb7afba9eba26447dc0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/tr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/tr/firefox-63.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "02718cabffcf3585faad05e07697ba1b832d2af7fe9c99adefd4d68b2ff19773884467fe3f9c6fe6cc0e8ca47056f500f4b76b184f7fa8fd899e9e26c024f013";
+      sha512 = "eb0c148b071a7d654ffabf62ecb1236f9294421bff913648c95fb729547f6388be2f8f0c8f771e5dbec2c446dc4b6c1db962a5abb46019c2cc0f8eb8a775b402";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uk/firefox-63.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "202043343fe98673ad33d032267a5696d0554348c709cb2e356136a6becd5a0e2c1147d07fd752afb80384cf13a56296b859c4b771ab993d5a3feebe5415fecf";
+      sha512 = "a0023efdb0ff31515f51b4150ee35ae834d6f0ae976d0209ee23c93dfcd70db58c5c94ebb8f8e319690701d2364ab5fd5db03ed7a151fd33875787c0478e5eb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/ur/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/ur/firefox-63.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "834849bea96f7176bd4b897a1877b56447674bd32ed0bb5b15715fb5d37fa1bbcb8d10af459bf08d7def3f973489aa33e6fb359be81f69a5492c5aecc20c57da";
+      sha512 = "b850af8723d3d32fde0b938fb4f7a8734cbddbbae34881deef09bd537d27275d553c107bde3aa97c3123324f8bd0f63e7dadacb9f85b38859bd30a5085bb1511";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/uz/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/uz/firefox-63.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "b360d917901e693c29f49bbb349d10bc4129bffbd8f105b2b9e9e6169dc13edd0d453368a831bf1be21b5d856766bccc4536f50727b5f7b7a6f6d2fa287bc803";
+      sha512 = "57bf9bf93df74d3b8549aa706604d9c49c3157ebe9f23fc4fc0a221f9c00d2e60570055135fe4534ad5f364529e6918110997d5ff2872bd7e8a78021a0df32da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/vi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/vi/firefox-63.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "279807df6ac7d0a19d8010311973b5e623ec91909d952120f565656fcf78f3a549b3eeaac3fd27ed1e30554a7b57c4a129757f37bb8971fed7785867277d14c0";
+      sha512 = "067ce92c82925b7b5e9bb74aa98d59b4d7828e47780790634941f6e08334822bbd0751d783d7ae4a0ab1058f33676ef94fe15db7626e4b0aff6c514e972689a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/xh/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/xh/firefox-63.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "313dfce1b88243761718b313b0753e09def7cfef69c1f65088872543ce31c6957739dec51113b301c5c788d1b89aa173d750c3b214dba6413fc5522378ac333c";
+      sha512 = "cc6b9af7acf4d5d075cd53f1bbcf433a379fcaa3326f483a88ba7c44022aab53d4c53a2620b94189b2034c5009d2cc93c1fce2e0143c0d3ca0469bc00edbe8a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-CN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-CN/firefox-63.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "1351106b16c20d80eacea77e26ab6235b00d16f33a94577184f61ce926675bdc9bd662dbcc39cadaca18c9ade0ba786690b12aea752520c671157f5525f581fc";
+      sha512 = "20d87043704c605855962db40da5b66514a0920b396f815e4ea091769c6564e9226f6ea016415f1f99ec914450a9b364741c32bdc84a12976902451e41b16463";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-x86_64/zh-TW/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-x86_64/zh-TW/firefox-63.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "da9808a83c45d5a233aa1649a7bcb7d88fc3fafe59d93d9a872de2902b8b0c7f80be073f905bc2dee587b53bb5d010e66f2926d2c35d50a9237884d3d03fb6b9";
+      sha512 = "d868cf388f5748e282eb6f276d318babf7e44ce8540fe6a13aedc04a7cee8adc85597e5b95f72780fbcf17ef54cd3b3127742e18ded91f0d6b08a4b9491c3d19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ach/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ach/firefox-63.0b14.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "98f43a0ec582e6753f12a079f07a4e55f8e699b9a8624a632e141b09afc8484901ab3cbea5609d7cf2107fd90da3d10308245a28ef3d93e07d35cbad68200bd6";
+      sha512 = "1d874e55ca2994701c7a52807ec518e46cfbf16626b174e0f3e6cbe8827a885e3517ff709db5fc66c98c3859384d87cf839f7e72655a0d8d769f4db9cc39e666";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/af/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/af/firefox-63.0b14.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "b8ab0b90538b7b8ced483b2771c8340228d23d39f28413f82468626553aeb81169c629fb9f1a1b4e17ac312b8bcc984ecfe711e4a85af8afb02ec485ae589a64";
+      sha512 = "91d5d2a53d8d85e59e9ad4ca9dc0eaa931091f6f267506aad095c77b71be59826cba00de1814d2e78eb95c869ff0c8bda02676aef290b4a8332df0d066fe94a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/an/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/an/firefox-63.0b14.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "43b923b7b99c4aa1a3efda001c60b9570f15ccb648d70dba5f7ae57c282a1923d310ec48b3424a641d8508d05a18a1da76fd7203d947c9383695d91d2b7e2da2";
+      sha512 = "3abfce359bfe5cd385417d2fc30a4af9bd705602b3d902d51030a12ca6ee9086ee7b741a07def056a0e37c767a5e38f293f0d52a48c8f6f60458e74ee73cd300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ar/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ar/firefox-63.0b14.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "562a1a314a598f442acbc92a0d752e48136dfb10303e0dd51bb3ab0a2c2774e5f5eb3f932d9a880fe37674be3288f5406ab4a0251aca2ef1bb3d23f5e0ab303f";
+      sha512 = "d79566a5c6889421e66f189c86dab9e32c377270b2fd70e1e128810dd391c651cd66283045c8b0888520f7f42f4d98f03274fc06dda0a1dde23c3e3f50ad91e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/as/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/as/firefox-63.0b14.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "acb3076508c51621d11ad6c0a8031e6aa9f26fb376fbdc0b1eaedbdeed5e84e61682e5f1d45511567e1159125bede12be12f0e0f7c716a1addca8affe12cdb00";
+      sha512 = "6bb45e54027839ceb0f8ece8a5a3d49ced35bd4f391385a69f5c26f191e87e9f06f9f59c2471ec156aa38a23cae38dc3996967946d12e88bd98743e15d888edd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ast/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ast/firefox-63.0b14.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "c262869d7a4aea66cfea24911cae4e43de2a17a371167f4d78f3353f598187a1e6102708346afde86166f360e9d42842016f65a272d9106ef54938e21048a83b";
+      sha512 = "3707d12351e2c7f1d4c793593ae2773625c4342d53a5bb32fd1a1f52d85c504eb662beb995894a5b2eca67753d1db1988a247317cb60252b95dc1262618582e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/az/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/az/firefox-63.0b14.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "a9da5d539e4ebe59b1d21b21bd018413e935cd7eadeb60c437f3a5e972851b1087a2269d31b414a17fc712c1f9cf180287b8a69d7b3d4faf34a61b555d1d109d";
+      sha512 = "d18c2cde2cf0964d8a52a68a3f4e2c9ee8c6239ea7c642ec2ef12bf2024dbc15c125a9ce2c49223c826114714c22a27bb831b3f5dcef0680646212cdae6849f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/be/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/be/firefox-63.0b14.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "661f58b200c1d18c4b837aec8b2ec334270a06d68ceb48b4d6cf6762ee8fc94c6c871cc9bb956ca67c2759da3450c08fd2870bf32f88798396ccf3c24ecd7fe9";
+      sha512 = "2085451b2deee6741ea6e724ffcfd373118dc309018e66efec6364eda48b05d06836819d86a23d623ed584de547e9c55bdc11ce5a2c4e1d44d64c442d3bef929";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bg/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bg/firefox-63.0b14.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "f8517bcfebede31aaab3c20c10be22b2dd4e9ee56ab37fd8c0c362933f375189ad41df04a2452b83759555211a9699998143aae224f688473fd4da8d258e8566";
+      sha512 = "2736a45bb91407cf262973337afbf8d2612890b82dba65f1d9c83007550809464a60d3b74bc33cde23a23afba0e2cad905ee96123dbe791d14cb4ada7f87e1de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-BD/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-BD/firefox-63.0b14.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "98eba90fd685eb3e5a22f68027464735e6eae764ab5063fc3b49cb2a0888839eb7fed41978ef9edbf2729a66278368313a61363c7b0a9abddb68d7a93a22fff5";
+      sha512 = "7ba928225062999981206972559f6c52f9367d714d38ea0d7fa086e2f1d9d990b336ebfd0b7d1b08fc06cbb386f89dc5c95d8e136a393c7568a0b9198c0fa6df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bn-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bn-IN/firefox-63.0b14.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "e916abc4c8e0f547f0f510a2919637029d9531dc275e8330164d0092864d5912697c89ea23100c1c411632a6f4238554e83162aaaa50f23d85534838e05d9b87";
+      sha512 = "92c33e5139b130fd9e3e83614443ccc2a189b19cb61949a381e259dcaf0dabd66b3b127446abd1117079cbf4c584c1de0398dacb1612285db56f5a4f0072cc90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/br/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/br/firefox-63.0b14.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "db5c9c663c0b12654602ceb5b73033cc97c0d45e3ec6b5d755b94ce3daf7743417777fdcadd8263b1272f7503ea6ace25358285fa22a8fcb7d4bf50038bb2727";
+      sha512 = "bc34bde0506218c0e4251b22b1849d05b9d49ccbdaa8df650f56ebf87f04172b8adbf2204709f182b286212bdce08ef9448e8818dd2622bccc3cd9496c48e111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/bs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/bs/firefox-63.0b14.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "4216655dc3ffeb28fba06405b5854114e0ed5cdf014e3bdbc3873083a27b336e5348b326b85f09d690bc6345589889738f5ec92b0c1776cf93bda76310d3e117";
+      sha512 = "8fdf9e385f94357aa7a08147585d02e7d293d7c6155afff3da92ee37475afee222439f4d93198bd24c02d7f8109bd6842426c65725f19aedec9b38c8aa088627";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ca/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ca/firefox-63.0b14.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "164b57623737c0ad20f5f470b39293872aaca3018db55f181fce19a40c11650111ebce4b54b5fcbeea7292455f9d5ac7f5d3c1460c50c1b577b935a7c8738d9a";
+      sha512 = "f95d32c4dd652b35102cea1f9791713a4dbf40cf985c33268ed35f3e5abec87a46d304cebb961f8a80d97e4e26ee907266502f9e6d1f72741a018a29e48544f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cak/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cak/firefox-63.0b14.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e7e03b8a6f70978528d9d0671ae0dc73f78f6af998bb1ca6c84dad5186559087bda0aeb1c870c377eb009e7ad6f14490dd959cd28beb564731c43b9f699ebc6d";
+      sha512 = "b4909593c8c99530b791dd40381e891f4ee61c0473a0fcf44e0c5e5ed76e4424930747ac7f479b21d977e245b0b53b2e692a43931a5d72ad16b65f37f8726967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cs/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cs/firefox-63.0b14.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "b0c17ae3f61f6829b7d578968eb1166ce4043d33b81935e1c5ca51353a0bfe64ae2c326ba555008a30c59f34af72ab8ef8460e204caea203a6b174f2e3b92993";
+      sha512 = "43f40720b91f6de7323fcf866b032ebbfa34640ae9786198f87f0e662c1e33d7910812e3c4bf45fcf929d9e2d669f7ec4d8f10cfe47d1fc82c5654b4bf2b40b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/cy/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/cy/firefox-63.0b14.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "88e93d54fadfa6149c8de03e82b898ab4c319cf66c0aa1f6a16b24f73815031a943d0c91d9b382e97c29ac0bcb83f09cc391e01b7bd3120e8f2c9328e85da4ab";
+      sha512 = "a9905e192147a4bde8b97f26a63f08d982fbb05fce96482084ffad7ef8aa54355cb79859ec8e095ce49497e2c24ada38fadbd77e0e31ac70a5fb6632bc7d31de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/da/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/da/firefox-63.0b14.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "1ff1029bf7486c6ec3516ed7e57d22d0dab95bcd8b21aa5e60d32c630ff88c15eaa484892e35a473d962b89f49b281bd25b6d16db3a6446fc9959fd64d75aab9";
+      sha512 = "d1275cac1c2c1e98df38d745b6d1673b341198d87db6bd767ea8e2fb4f525df874b3dcf9c000e4ebe196bbd2a0707af6ac3fbf28f4b21dedab78cdb89d6342da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/de/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/de/firefox-63.0b14.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6523e7ed4aa0ef502f2a64653c7d06909b67c6a8f173295783c97e97b39f9c00b36b1f06038352bb2a247a156e4a1310ff0fed5b688a5f2b84efbad1d1406362";
+      sha512 = "d40af9cc9212d83a260d42e1c4e9dc1102253cea3090f8aa232ffcf97b5fe417252b1360f126c97c44d9f333187b896883cc3a8de77ced1020805d7bcf1980db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/dsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/dsb/firefox-63.0b14.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "34aae423aa61bbe02f31b07513cdd4734d94dca42cfd64dd3db7f3e55529316815a266d578af1771135a264e69b8869373df061370e4046a2046ca1e0f75b74a";
+      sha512 = "2e2dd4c1f5c2f53f3df2510f88a1e73f320025871b3b1e4e08f3553c51a1f41b8974f17754d705c2939d84442af4b4e6e0f2f09b35674bad0fe14dd57415d191";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/el/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/el/firefox-63.0b14.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "542ec3370d58e4ee767013c3511e7e04e76d84926f12986d9e9611dd337c1a649de3e8bb95365bb92f339a95058f8cbc9194d3f22f54f96504cda24860c1fcc9";
+      sha512 = "6fa7e9d22e7c379325de750725b25e31ccf814bf391dc4f7ec30c226d64345c52d07542d05d4d096f1feb6d75da37fcb3028a5cefce7a4a7bcb72cdfe940cc1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-CA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-CA/firefox-63.0b14.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "bc11f690284b11100608002f3e1402f758d9d1cb981390f14d16c841ef605451b7cd043928ffad60c3505423bd89f7d3dbb268abeb8f1835aeb1d2ce185286de";
+      sha512 = "0887354d8e3a990cb3a2a1267b6e6e60084aec7bea75f4839a41834023f327077f36164dae5317da47fd333223488b903c77258d73fc1077bf411e1eca860b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-GB/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-GB/firefox-63.0b14.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9fbf9ca0c1da0a80b77c975a980acf7afb2ac7f99c3f69a1d8cce88c8651957e1e203ac97fff9a67965a36d85f09c7a80e970d043e0affa2f273615d8fb9aedb";
+      sha512 = "53ce519552bfaeba90c00e108a7af36bbffa8f6ca1f580abadbf441ee29a40bd93d31ac65ba3c875e04299646237ed4a51736653552d607436ae177d5682c84a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-US/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-US/firefox-63.0b14.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "25d9a0510fea951dfaa432117adf90591bba6dfb021fb18bdcd8849e71f59e8ba3ce9067e8291dd0d7769f1d2c8e5ac803c1d76d52e98e8ea7233ad5daadc45c";
+      sha512 = "1c23a2e28c7c14da5f2c0fd30525ec38c1169e8433991123c8bc97145354c8d1ecbbf6df0430b89e981222011e27b0c5b723af093ce640c8881e0b9e5b231939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/en-ZA/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/en-ZA/firefox-63.0b14.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c8a6ea2aab2bfec44dd0d13d3f8f8f3e17377f54889f9b13ad1e6529bfc8b27a4f08fd287964edb5f63e8bba00ab961e413fa23b37cc05e46e050d11622a324b";
+      sha512 = "9439499f577858237dbc39c6cdc20a87276cda77d45e14ba5ea7f090cabe6813d7fdd8b77a32dee6a98fb880f421562a861e98aefa619fc44b0c4aab8b522b4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eo/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eo/firefox-63.0b14.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "1335b46db5961afa02401f4f318c52aae40c00611688f2eb32506f10faf24046d2d495f4c3e8579d7271e0728e5608aa7af461ee3c3e3940a2c5532ae52bc270";
+      sha512 = "a04051d0bf181a02a04e2c36b8f05b38d7f3eb6188c5977ed965776120a692d8fbb1d3d2ceb38da8768d201f27c1b36995f68b002a9261fce8786d34aa2265e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-AR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-AR/firefox-63.0b14.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "db631bc0fa67e2440ff068f009f1cd59f8f0004341911af9372a09c89f8882ddd82fb7cc350bf609b81ffb7ed23fa0a0aaafc91ac3aa0a7e03c9a52b10eafaca";
+      sha512 = "2230ee909e8cdcc10d40939eb6eaeb5c8289c697e2d0a5e4a25a9b1345fc6b49c9528e974212ca3a5aea3e54c8c8948ae56a2232bf0d207e82658ca2dfdd82c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-CL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-CL/firefox-63.0b14.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "e65a58b49ae8c24466f9762276fd3f006dbae2ec4c200ec298d787bc4aaeb742cd17e5dcda24226327377082cb4aa5f4b37966e94d30bbd920bc1f8b7210fd6b";
+      sha512 = "26e7a24204190fb43a972038c1036e93e2fcfb68be804a8189b0006ef8a15094e152659206b1fa9b7f0cb5f9409aa4dd769fd675fbebbc90f323d28b0f3d58d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-ES/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-ES/firefox-63.0b14.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0d4dc421d87aa50bfb43be4d80405741901d6ee69ce0537dff064077f5713afd692cdd1405c1504e8ed3bca1affd672985f8dafce63a398d8ed8758a259c6c1d";
+      sha512 = "9a86d804c199c530dd7d41d4ae0d72604f85061a594c5cbbe1de2daf4860c4e36831efe00ccdfb6b5440c88575a6d4bc2d786396f13999453729861ee723cc9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/es-MX/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/es-MX/firefox-63.0b14.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "798b502fe83e7ea9d0e32786e618009d7631018b303f31489754e2b04b5c89ddd8dca48a0472f8b4785da5aaf2a2a4454428d5794c6e1f8e2ee8d08c655d2137";
+      sha512 = "181c0a83a5bd7d7fc2e80948704f2a466057518c5a748a54e43bbbc0fb8aab37bd7a1c83892af60ee359243633fb8317c42552121b4e0ee476c5bc7fe115c0d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/et/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/et/firefox-63.0b14.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4e32583343514637080a7d41366949d415a8caf6abb2d220f55fb0623fa2df08eb51f8e1205e38fcb0635052eda52c1175728a63dc06ab555e1d26ef22035b1e";
+      sha512 = "6734e4572f50cc7cef74dcf63994ac5ac2d17cb0c2a2110a99cf0d5c38cb3075f72fa21561ed9ec98dd860c39262bf282c3a82083e436d1b160a3d15dfce3a51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/eu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/eu/firefox-63.0b14.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "4619ff888774f2da4c0a745d08462c6b584e49f6bed7cf4a9f38f1e69c0553eb40f461491858bbba9d26835bf86493459c273ced320f5292306863d7e1b4900c";
+      sha512 = "85382c13dc0a828155142805b83543371487162821c1677e5411d8570dc8e1393479116a0e7bb62abcd6e0abe477f0671ba2c2c600bbf855ed32ed86f1aa744b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fa/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fa/firefox-63.0b14.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "d47c39364157f96bca30c84795ab216a3d12677f39a43fa3a411b2d6c1a58ff60204242266b4ffd0b48474417d791ae6cb01ff657d3b66a01932a632a23e4a68";
+      sha512 = "a2c071e374c3dea2da8dfb4e1d7a001ee30bc33c3702d5e352427596dc03b36b734767fd3bd72fc4e3323f99ff88b475a1d7deaa8d14c47921986b4e3b6e9454";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ff/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ff/firefox-63.0b14.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b816e4d844112785a33a8519833dbc1ac5b4832b6186946b0e0866e53c47936bffb385f464ff04659f03db8938c25f330de75e3940c644e8e19fb5d9cc30f1cd";
+      sha512 = "3f92ae32d51baa4dcdc13322aef8653da33fa0bfb970c3a58e5cb4297d90f8162f2020902b3f3bc566b7e5a07a317c8eb51a7f9c737a27bf043e56cee258d523";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fi/firefox-63.0b14.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e6420db4cd448e62ce975f4090365749bccdaaff39b881e7c40eb75686799851f264ee3e9c9b2d69ce833b59ce5d1cba2a2fba4017e03495b23b7501a87e046b";
+      sha512 = "eaec68e83af4a68e8dd1e7ac63097811c4c1a84fc577ec8c4ed9cdce72785fd2d99e4e534257f34a4ad53254e81a6c56711cca9f85cabf1fa8eddcd26ed0946d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fr/firefox-63.0b14.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1ad0a3de8e08007ea64a0476bed1c202e35f938f31152a18a4bf043f78c0e3e9a172c9be73a578a69c1d873ba702116a484b921f9e0de48c0e00d551e973417f";
+      sha512 = "b0264932f94862f6b4629f1c853e6207120234dc030a298f7d5dd975f9fdcc357cd9b8bf38f46221e090b1f63aa7092c3c5005b3f569a937e8d6ac69a941d4bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/fy-NL/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/fy-NL/firefox-63.0b14.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "3b082ee567267ebe7e846cc928607c832c96c9a4d996e098c0fcc887bc4cf52d696fe1dffcae9a06a927b45d2f29d4137c55cc99f2ddb95b79dc2c61ba561912";
+      sha512 = "a557244b523d64db01ff42209e48fc5ca21f603916339e61fbadbd74a59477b9adff021a0f47759d5104eded00a12f4b008644279c19cab7a45cfa9a9a3494d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ga-IE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ga-IE/firefox-63.0b14.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "1bddad6efd191825751252c6c543286614e5c52c2fe514c3cb5835953f28b11eb642abe72460d55fbbcd937fa93a57cbe6dc8cfdc3fe179961922402f81e90d6";
+      sha512 = "11619898aa4163d6ee42e178e58b3d25ef8c9263312a1c62cb9e2c0b9516150ef9990a971594f8b1f1421231c4a03c3337d2aadc292150d384c085a1c012cb96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gd/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gd/firefox-63.0b14.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "55d1dffb686b0f0c9072171b1dbb6059ae31a88f77252d922ca0f52e8210e724a1e951a1049ff5f5395eb247ddc3d93ef6e865b50b94fa8226394a1c32768e66";
+      sha512 = "642ac490b5171afa96f3363919e6b5bf4e16ec65671b36fcc543f7e160bb0d595bf271606b25ebf1bcfdda5fc3b3ec5a088a766d52fc6b72b72a1bc5d107ebb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gl/firefox-63.0b14.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "11ebfffae756c46685091c63245e8bde2068c192f335d37585629a646a78478e76eea84d01b4dca85b6fbc0d53c09477ce59a29a3ce4219593c24cddbdf3cbbb";
+      sha512 = "bad1ba5729895d622c0a452af5a0b34b24fd332a386cf27d71505ce1e9a0cd164671b0ed6b4c4c7befb1aeaef75f3142f73ade1dd384580dc71a3eb382f221a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gn/firefox-63.0b14.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "9f2ce62956775b7b75014d62a6af3caa6e55cad0bce6b69a5bf41f83c89db0a7d6446c8b13d84b0bcb59e14f11a92c998e489339fd15c1c92c7ae2273ae4219c";
+      sha512 = "d8b89350f75d4cd6f33e2eaae4c3098462ae319f4a7df6674239992bebfbc961b9e60a2cebec99488e1391fe68b218663822e8c1b773f63c6fccf36fd57fea46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/gu-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/gu-IN/firefox-63.0b14.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "185c6a2daf7ea7c221c2de73aa113d81ab0b28b085e2098943e1d315be52ddb43deb90ce1fc53a94bfac20562923e7aa90ebbe959c0d66bd9035674eb2e146f6";
+      sha512 = "835550054ecad1bd4aef10f18b805d9bf1726cf7ccbdeca04696c73a684777cc51defb1e9ff7fc67a1f37ee99a0b5adb553078cc7a83e95ad6d87ce338c9bef3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/he/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/he/firefox-63.0b14.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "8b40e3c315ae5b6f90c396a68bcb08781c4161715f9b4ba1fa7d1c6b584b8093942e9da3dde7232a0e97847eb3749ae9225e0a136c5ac6c3e95eea0710ad0ede";
+      sha512 = "cb6836604f5159d13f883678287c340ef01118980014ba9e72ad4c17d86e10349a5b44be1ad0c0ec14e789a1b24e47580236e0d298d816a2fec0c5c02ca0f19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hi-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hi-IN/firefox-63.0b14.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "bcdd3223262d192e07e68e51cc610654387f4c3c05b21652740c11fea1010aa6e5dc564974daac1801bd50d0b0f78f0e8173b3cd2b0ef8a0719251bcc83e66b8";
+      sha512 = "119ae4627c1945b00acfbf03b43e97b1b94ba4d80ce71e277a6e23ef5953bf775e575236cb16ce4d4e298007f02fbb1676fc0526ae44564c87c8212769811587";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hr/firefox-63.0b14.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "4075cd52c92433515fd97ad2b04878d21711d52fcf388ae19477ddad63a7a1d88fe62983f47fcad844ee8be1881e1fa353e18865b8c0c02c57d43b2be6250c48";
+      sha512 = "aae23b11eea3a49054c0ce4e9e9ea9c1200d9414599a6e9e993912a3b64b5c94c2819f1f9f4b65d6ac8bdd2cfc0ff125047cdceae286324db33174c3d6e7bedd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hsb/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hsb/firefox-63.0b14.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "2534c74303a9e40de6e32ed3552c575a38a2be612237e9daeca2334c4f3354698d640c62f7bb170b38bc8267735e75ff2c7dc61bbe1b9e0a7b4adfeda891a1a9";
+      sha512 = "aa88612f31e96a0babbd08ca4c43db75a869cfac1020176bcdf00125a7dddd0736935a453e277b6408a59d3b21636a3c60cd9e40bbe9098c2da31aae54d790bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hu/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hu/firefox-63.0b14.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "002b67ca863b1da0e68c39cb05b11b956f4f8a47968b88541b73b45bf795235d1b851bfb3c06200a71c7205806d637c8da315303f8050e56f5560d1066d2eb97";
+      sha512 = "25668686e42ca15bdd7dbe95380c95b907262ae72c3758fb0993e077326c183e1af79af4bc9d33b7e7d8dfb142d92618b1ead67a834d01e9cbb3fb346f139b8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/hy-AM/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/hy-AM/firefox-63.0b14.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "2ee7f78a9a8eae99792be88885b9d10f596473e9fc03d935d4d16b927cfb5e6305a037edfd5d4cef1e253a46a9d7b2c2c3bca3f86e557302e326f1002ba12ba7";
+      sha512 = "9beb520fc3da468a73d0df7fb8ea937f05107191167fff8ffff2242d4db6677d4ad1d4d248170ab55a6b31365b5bf965b17e0a52d4c3c748cb0fe62f7eec85e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ia/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ia/firefox-63.0b14.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c901603efeb9b40a0eae5c6c52973dacd218cd4a31f94a597f3cd20338dae8dc2a10c0b991e4367a72e8ee473d000e972ca6aabf2dbc4ea16f0d4dac4b2edad7";
+      sha512 = "14f5bc56ea03912ce445cdbfea2840fac886bf048587db3230bb03e2f6999050e532b27011c1d83995e74885fc0cf870990773df564fa3232337a13b4951d1a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/id/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/id/firefox-63.0b14.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "8c215c9bdd711f9165a99dd5276b73036590234be62f42c93587598d0d6423ee26d312fb015f176de4afe799ffdacdf860f0d00b3006f0229c1dec84d2af9f7f";
+      sha512 = "57816fefb3fb9024473723c1e53dd769356d08f7cee6fd18f3a618707d7c474b71ece7e0da9b61f9dfc8d870db046d29a6905330248cf4021e538cfd93684761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/is/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/is/firefox-63.0b14.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "39af62503e8de0c74630e4c877c920553902661deff8a2271252a0b15ab3f544d4c843f53e6ef3a6f386dfbf047d2ecf47d29b3b91a683dae181f1bd5c175791";
+      sha512 = "8ba70aab5a6407a5c4d4ee301b0f5d91c02cc446b1543abfc9ada2063a53d6c9335b6523c6a35abe45cea142cbce92c86f0100a036ffe69932b587cb16caefbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/it/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/it/firefox-63.0b14.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "50e8f50ae82f3cd13799884367968bc3e1d1b01f029bad18a2ee1f658c1c45a98782b831172d9bc65c2c97da29478767429a299851a7f498b534c121ab493d13";
+      sha512 = "ce9cae447999f616bdedc37c45ab1bba851ba8f983a4b8b9b1670d080521172fbec753377c7577818144fe297c9a7f81b9ac3cff5f42a216b089d40b035a9cbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ja/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ja/firefox-63.0b14.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "01d52a8d525bae042f78f865284412bac2861f8804e214725671a25d2d4128671bdda564e73b9342520939426f7c1c68349637cc5a85030f1a559a5af940507a";
+      sha512 = "0792d7a73fa37b69be10f65e99184c6bfb7de72c493a06d2a808583dc091f414c686b9274335b532d6e371024c069d20200d0454dbb4c4568e46cf6c0fba2bf4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ka/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ka/firefox-63.0b14.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dbad627cfb3eb60b4c7ff47f54faf75df232fae7919073641a394e6c882035af32e8bef25084115b25959fbbbfbf30753f32a2868838e87c7905fee109ad5037";
+      sha512 = "59fc959730efd2e78399984a3d0ed18d653e92bc2edf8a37b055ff715e66672d8f938b128fcb9f5a5c932ea8d265a509f1c16cbed7f054449a4f4f2fd51c42ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kab/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kab/firefox-63.0b14.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ae48811af05c1ac602270e8e6acc230dbf2e497567fafe9c7b402897f4e5cfb34c3645f14e63f463cb784e56bd49aba1b8ab692b9500a5241b5f91bb3a89e239";
+      sha512 = "575d9b2e082d5729f09587434965b383049375771029c188f0476e34bd21e10fdfa20d766cb934c567602f6f38d883c848c8110f6a42f9f62ad258c478ec0f5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kk/firefox-63.0b14.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "70077e5aa220d6e67c819e98f230894277d8ee9446885397bd2bdfc886f1075907639ead92007dac2c74cc0ff7baac75c921b7c6ddf56120d87f66714e1e9388";
+      sha512 = "712438e519188f19bb9786c72a795c030214dfe02995419934e58276a4b5b22413daf0ed0c21da4849c347c222f7d22b3bd9a95e9cf9aee6b5e94e7b950ce801";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/km/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/km/firefox-63.0b14.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "25e487b8dea02fa31211cf9b8e143911293f14485ec167e5524be0ff61db8cd9cdc86d2e4ccba58e63f14a82439dd11f6e25b9c9b591d0915c8119cabab81551";
+      sha512 = "8bf978cd1d226dfb74e9da959da105d6cf995c1028c1cd2bbcdf09c93ee300de6eb58eadfea690fb629ac93bd49f85cbf81b9bd49390af6c6e54048e0191b8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/kn/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/kn/firefox-63.0b14.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "9a947d844a81c3f6e2f62ee5a9dc0129afac82d9c6e77e59232ff3e140b3552b146a702a4be49fec64edeb3f506f4ee86c4c85345315f76171cfbf72c3f269da";
+      sha512 = "47c20810081469552659ae2d845c292db2dc447c1974dd768544f2444020127df85d3320d7cb25225b8dbedb4e3015009de9eb7b5aaa1e7a4298302f527db32b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ko/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ko/firefox-63.0b14.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c56662d013ac5ebe4cd6bb64785ea165321aee492dd37fb5c7368c4932c4f871d2bd33128d3201dd9c3e73fbabe4319190eb1701332891f62bbb48fd5c5776a8";
+      sha512 = "4c4feff0c959291112f30b952232d50fa78e4d05e715fcd6c34e26d26ee7629545ae46791d04a8672aab3bdb19024295c94a6fbf2b8b818346107378016cb72b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lij/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lij/firefox-63.0b14.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c1f6944f4f52e4e6b6f84a69050b5692a2982a30a9ae7ddb747ecc2f183d9be225428675ac1ed1553efd573f71bd3350efd9d247d16ae0c3d80044000b0cbbf2";
+      sha512 = "980910788cd4d38db52374cc399e90315b0829e741c211ce0d225289c8e763bd45df45b09ef4ee0228484a7a33c3ccc9d05015ede42eb427b2336ce09747649f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lt/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lt/firefox-63.0b14.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "5be16d895d58829791afed1c9fec00a2c84c849729cdf5b0a0e51ab06fc55deeee24bf98107f4e75ca8616f936676630455cfefc9034d6f53167247438e956a9";
+      sha512 = "cd2f42c3ac9daf3fa4ea83467926ba9b08f718847eb22847be933d561c485791f1befbe04600a87bf0c5bc9016864c46c85add776f5e6c0a1586437fb57a9532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/lv/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/lv/firefox-63.0b14.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f75d0186d228a03137aa9174122109c42e9aee19a1ffb0e810f53b8f0af9f72d1a81ad86468db3bdcf0401ade5407764253ae1176457f1823afa8d1f2e44db11";
+      sha512 = "6f1f8fc6aeb632a9b64b86c38ca38ed1baff443ca2594506e7b899c422a9bb38d02ede49bfbde255ef2ff6d0bec55d4f42d05693459b4391521a2bb5971ed6de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mai/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mai/firefox-63.0b14.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "e010c961c9e6dc4d7c8b29a2acda5aaaa7c0e4f2ef2bcbcc9b3a29e8b1a80f375c877b8f925cfe0a35e018fea2acd3acb67394547943f2dd1818a2138db7b83a";
+      sha512 = "f44f549ac0119c680fcc345bcca64f5cfc6211184ba4cd02970268bcb26a9ba574fd402b4f6c0f979d0585ab53b63997adee54b3ad681637323abfeb13c5b0cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mk/firefox-63.0b14.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "91d984cab9a39cbdb9bb5a6971ed107b0de33ebec913db1c8c48c459abefaecada9267d1b7211626c4617edaf85c1f827e92e0f8fb2af42dd67a09792e4cdfff";
+      sha512 = "b1b2b02937e7eb609dacc7fa5328028b91ada27ed0402354db6e9824afc6d0a51fbc54a65ef9e779ee202b6f900950393ec057c1486036a6976894f35d0a79ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ml/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ml/firefox-63.0b14.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "868cf98a5cb99e9a5879d13a7de79f62178ec8dccbe7b36ef7392f5313fc93b4252e08fa9e2926b51a1f885c86e2198712523e9d144da36d4c0e84ecb2b7a563";
+      sha512 = "04446201bddec281e7f47512490aeec2f408c73f6f075a0ca354c012266bb96f5b5bd1d226e75cae470229b4b2b3ab6aa2b2fe48040a10d576f6a4647dd0ba45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/mr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/mr/firefox-63.0b14.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "07e3df41fb1f8e4ae97ae02b3d559fc5e1ac133478913b0bb3767bf5f528aae34d241a1aa8b1de876d20d244afe5ce5ec88d9663bc6b4d81a6c89a72b5435a92";
+      sha512 = "09099db984cc27c86a0c86a0d45edaf6e4028cb5d946fac90022e65e18736e1d048137e3728338ddcd465075ae77a863e39648c08a173da366071168aa35bff8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ms/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ms/firefox-63.0b14.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c07bb19e1cd42a6b7125140ebba6b76801ce6120075e5dd1c93dcafa78cede7e2f905c1cafa2d16272278468019808334d6428039b94816fbefe358e5c20a54d";
+      sha512 = "0bdfd73251227b87ce233bb482d2b690cf462ff0ace68533a1c69689894c109500e8fbf76e51a20ce086d59a0cdd717b0605bfdf906fb964abf9d2c2d4ec1d96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/my/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/my/firefox-63.0b14.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "3153f92490938d546c7f7b8497c08a5a71c78a847948f1853fe2faeb5c077311b8e42175f639bc27d0ea4bb72343e0a35fc2ccbd1cf04e5e556619eb11282ce3";
+      sha512 = "a6c55d4c646fe6579901b29eef484c5584c4f35115d3820280ef45d5d45a2e95e6f9dd5167663df2cea9276eaa4d3bbd05cb9550cfa3e9b3d3f1741cb1e3796b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nb-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nb-NO/firefox-63.0b14.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e4a63f4a19d28e248f97b4f6791873f6bdefd61f80cf8476a555864ed5ba6ff2001e69c02a2a271c8b78c28e1c78adc7c766b8e1bc2791111127eceef777c30e";
+      sha512 = "934276a4b149df5d511652c8a0e159a5f9bfb1d903e09d6ea171e89463d00fab344944b90751d28f4352ec09147f6ba02fa018311e4d0bf47994f3be2ea4fe87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ne-NP/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ne-NP/firefox-63.0b14.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "abadef6736bd802c81e1a741e77291600dd7f90cd12d623a3c39392515c23191c1a3d5f1f9771b62c6d8a7add46dadf5722dc9d0dc47d8a4e15227879875c6d1";
+      sha512 = "8e1cdc427310c5f8e26d321f4b741908e3413461fe7ad54b7a18ca9e3d93800fed87a907e0e4c5f689c4becdba3066ce22f03269cd668e98ed30efe577d9f3f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nl/firefox-63.0b14.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a3654dfaf19fe2a30445e9f0e8007739e446a78c3f630ec42d28d802698fb41fcfe7c8977b9d05dbbb9bf5eab264ab73b70993825f285473c941c10293df1863";
+      sha512 = "de83fd739c30a7cd23eafb0ca2e0abfd55c1ba84d0fad159f99489d948205b4cf5cbc71f929b4e1ce1caa03f70b67465564986fdac1c0ab0e0a21df99849c5f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/nn-NO/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/nn-NO/firefox-63.0b14.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "06817e98fa2f89f7fc513f8b439ea12d2d7cce4b24384cc5c442d61b6d974261d6cca5f3ac06db267be22988a87a9e672ef948a78bfd3cf92e83a3f11620543a";
+      sha512 = "588be3d59eeb3413f18b642c392af4431141597598ad8e9d9625231c0831f62b06d591a997a68711d042715f939d57ef4bb7df481f3b512dbaac0e29ad46d55b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/oc/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/oc/firefox-63.0b14.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "67b3baeaf105149491bb98f7a7e1d38a056116ad331ce56e39263172240f89a76c6a0b7e322069c9f23f11cd0486cf51d7847b70bb28801fd8abf0d669326c07";
+      sha512 = "c261aaedfcb393c76ea74b0c0ad69a8df90530f9f39d49e69d6639cad3d9255090180880fc70e650b5301d7d1480517aaf630502fb6a750fe9fef23d4e25fefd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/or/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/or/firefox-63.0b14.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "447a66d8938c9fee0ff2c8c0b2e7c5539e55ee7151e46ddba3e6ba09499138e0fc1f6ae8cd954463c65a58ecdf69bc65996bad02580b16e5a5e963c6ff268f88";
+      sha512 = "bf743378ace07a33ce50752ae804a4fededaef212d38d102f3374f53a7ff794a777397f50e202e952dafd04aef88b0175f34af69b1265b347aac8c48f923dc54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pa-IN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pa-IN/firefox-63.0b14.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "5f3cbd069ce774d5055b39e9a6a97fc421e47f4e49e05d0505a2386d017a76dc25d14b7bbb19a53ac4d5a5baa858257633a4d2f8c4f5f4965587da4dcc7a7c67";
+      sha512 = "61dfa74084c99644a38ccbb81ee0ea634fc067a27c6ddcfccf57d9b29ddbb0315e48dd17305417ad580f3864cb3be65e57776e34b7771d21f55510104e5d58ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pl/firefox-63.0b14.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "b07d5d238eccae9447cb2fba17b4dfbf8c11e983bd57e75460d4219be2cf9883fe26efae3319491baec68539840c3bd0a707e5c7b74c3449b950b2e1e1aa7c48";
+      sha512 = "43fc4a57484f67ee3e93373c0bf67a6b2c1989fd3f366d98970d68f94c1ec6514a45cab77e06c54f61a31a6ae0d629ab37157373cc56bae1752158db4e4bc648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-BR/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-BR/firefox-63.0b14.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "0ae1543d6e0b49353963a2e7ccc271ada1ab79018975895c838c83da3bccc01c9f5c420b186086eb2204dedf2cdc9a8321bc164963e6e45bf1f919b32bbc798e";
+      sha512 = "303dcbe422e52be5276d98e062e4a9b46eae0ba36797f9ed1566899ef5c2dace22244b5449ceb042aaa75f72138d19e3f8c0b920541f36fd5df7aeb52d0bace5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/pt-PT/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/pt-PT/firefox-63.0b14.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5100ffba1866e21c83254e8bb49ad7f18167500d03f034d2b9db298130ee8804317692a1fbf177c39f997b4c9d1fbec0112836fd1930137f740c779069050dea";
+      sha512 = "75e73332122afd1e86060c57d0c0987fcebce290d0591b5661571514523d746dbfb43a55ba1ea95f66c91f3c045f7b944e14f8d65a372104a9390e334ff900cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/rm/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/rm/firefox-63.0b14.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "2c4efea31a1c091a417b35d3007db737baec62f9b19174b7f8254ac0277909f3c5751613effee4b344b3ea2da2bb04408eb337870efbcc339e44e7327a023eb2";
+      sha512 = "2b6f03107cb7e1724a48854e88536809b7e235e04e7cbd7454ca8f2c952b83ed2a004e25f637f22690f4c9c73eb12fcb35980fc1e7cf4f53aaa061ff8a6066b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ro/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ro/firefox-63.0b14.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a2db9d68c20467cae286929d168bdcf2992d95cbe8c7cd8cce792110c8fd66e0bb8d1e1f5a0d671d6de4b220afd88d326f2ca842f6ae89ba4117d8b3e30750ea";
+      sha512 = "aa6e8cc7181ebfc77c5ead071871dc0fcaec2a64bdc2aed4ef22ad43ad81b18aebc4acd600aca7ac83f5acfe1fab07154a9f15bd4e189bc787935d3d0777c291";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ru/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ru/firefox-63.0b14.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "01caeb7ea42435fa560866f8acbbbf1a3ef34e2a97a5616dfc0e017469b86e730076591121eb1ae4e8542a5d9dc297f1b8081e9815ca2f191245362c7bab409f";
+      sha512 = "c48abdd9531a39d3f63f8db2d3bd6aaf85c0f4d22d0297aa16734eb67d81d653aa6862ec7d48557e29c768f0431fed57ed2a83577719d8411dd0410d4465d35d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/si/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/si/firefox-63.0b14.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "879a4adf470d5dba2e3b99a8415aa34bd491cd7392bc138d5a98cac9cbfbc53ad23aacc947f14775cbd438f5af7a28abf2c9072847a42e53a9ad6d43a5e01082";
+      sha512 = "7d2c1faf418662c762a227c04b3b23bf0e7614001c94535a8bbc75d2b95e540de8f1ed059aafc224118550fca350d459cb74d398b0cbded1aaa5a46ac6198bb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sk/firefox-63.0b14.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "52abceea5248ea7fdf70e9d7f6ffcbfe903ef09fa91458930d1fd9a39717621491b65b198fc72bb6e39d5dc189fd4a7aea59482cbfc851df76a3e53904ec784b";
+      sha512 = "d63443f220ba1c099385410e458033a0132110f26b511fa1b9d5f157dede1aadbd958019cc25e47f70cd0b30f7c6f0482427a5591a8b0c714efc46851f787091";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sl/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sl/firefox-63.0b14.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b6e55f76896463fb6b9e964dbac60be2dae5aa60bb59be2a22f4742249539ce35791c408e7b5258f35e9d24c1732d0a8900e8855e7866d401e636ab7c603fe77";
+      sha512 = "c52dd6462fd950c0a120cdfb721234300b84812b10fde3436f35c583728e5a6d05153eb30f9bd55722b48fc047fe096f8a2e63870a33b25c67e73477355b7c40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/son/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/son/firefox-63.0b14.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "2a27edaf71212ce13e2b841db8892fbe6bab969767833475abbb1e63b075d3811e00d95f39008a1a0a198f98059d8148b78939657f7ed0837d438dcc7e9f460c";
+      sha512 = "4a4a4a26e17f8d49eff0192d25afb02b11573dd4970a1b7ed6033695f4ff92ea7d0b417cbdea8e8677b8572c23d84878d52752b603ae3abec23a87436b13b9ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sq/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sq/firefox-63.0b14.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "e347bdc355e4dcfe7e2fc85d0ac6e2bdc72d51d697820b00cf5e6f30ee4a4117765430fa1f0a40ad647a87e4c9ca0721be1fa345c6c31dd9da403ac576091779";
+      sha512 = "c663e5c4cabdb0328fff7847e510081c8800ea4f05228874cfc97dec3d88bdb539eb0998bd355cc5e229c8763819c3611d207c2f1dbaecb2be8d4f418f9b2f9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sr/firefox-63.0b14.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b32eb6ba5290674d81893419f38279d0761d0a45a68204f3fec0625db09ae53e959c02276a852d7cbc59dc8bccef149ed024246c343836e57750ab73ed739a43";
+      sha512 = "bc19998a6e0f25d9cf96b22dd4ad8d131cb230d578a46b255478d658af83fe5ed5d2199adbe8118f18059734e644fe3658313df08978c25a785c0c61087e3344";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/sv-SE/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/sv-SE/firefox-63.0b14.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "b5244288fcc8dbcbfe705e20b754214f26bc0c28b929ebfc946a5ee93230094486cb06313eb130d5782a874369b4690edb9f40ef960cdf367363db3bdac2467d";
+      sha512 = "317fb7ad0a8974b691a713a37a7a4d9acb9e22a9f0d542afe64cfe9ab5ddf5f584b8607af5deefbb46d5c8fe1161124fa73f02aa8df1fb8b77080b36d5aa6393";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ta/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ta/firefox-63.0b14.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ac680424cf44999fd33473f96a82f9ab5b05fa2ec415370694449aa5513423f4d7a416026047d04660d2273c3953c60a72e8f31120a88bcf77f9c9ddfcbfa209";
+      sha512 = "8a65324441eba950e4312eb9850d0033f3c9add390804141791a2ff39c43fcc042f2fc97073ed20dcd2223e67360c7bbcceb105f8999bd79c1b857c71f3288b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/te/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/te/firefox-63.0b14.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ef821bac5631cddfa1cd5c6ecd5bc10b3e6085d94c2d2a1f86c4a557ceec8d0081c41fdd46b83bd3f03412bc9dd4ff66988ccc2a4447b134e3a7115d02714558";
+      sha512 = "665a95603538b594c4fe6d7b3607a83184e69720400022605215e229b4f103766b02083499f4c0c3c0d30255f478db81c4d0bc6ed93c0991cb7ead7a102c8dd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/th/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/th/firefox-63.0b14.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ee5733a21ff7ef0d58ff1b5dd056ff2b97de2f6a90c733b3244235e9d51aa3d14cf16f2b6738d53e33ae9bf641197ef129571ee297401663286d93303e6fd6c8";
+      sha512 = "ad7aa47085404415b7bf99142480c5a4d2b2688a98b2d9ba904e383da0e25138f9e8992787a4cfdbe3830ba2f7ef777676e0700d4611a6e17bf0be76c8991bed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/tr/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/tr/firefox-63.0b14.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "49ffe5b0ac9b2987d330b8c34dafa352a5c2d327cd7af652ccaadc85c45d63d5bd4222cb4fbccc513f13f2797a7525a0456f30de0603f65581001ed629e0bc8a";
+      sha512 = "4c777f58eec33a68e1c10088250be80d018f54ca47d22d16db37f6e26a294e4bc7ba6551b1674468df2e8db4bc0f4c531b19efb8faa254782a2a34d606e59297";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uk/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uk/firefox-63.0b14.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bf6eacd5877f6d157d35f532878f6806eb2bbc6946fb3dcd79c7ca608e649da3f86428182d596242c7c57d3daeaaafdba62a4cb62bd6eb3df57f7788dbfaf0c7";
+      sha512 = "bc7801da3a0d7374dcc11a44c967d8752027bf8f8c921dd6ce1c52bbd6a198ac0fcc61f7fe23985ab7088bd2b7fa4218e3ddbe0e2429a35f7492a788fe9c299e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/ur/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/ur/firefox-63.0b14.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "07d175fa078d9be7effc148380b737e2611c301c2af833c9b475388d2b3715a2207ed20f2d4f583a921196199e10816674428c68e7410e7e237f74243fc0641a";
+      sha512 = "6e6e0d4ccab43555b769942e26f9a60509270e7f90350997237cd00d717219f41b5993dfb1b7a55ef1a0c3bf5e4dea1e25336ce604482f19d1fcdcf0a07eeca8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/uz/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/uz/firefox-63.0b14.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b9a52df09d30406fc21f82e683ce8704df9ce69816f52288ce8d04f72a18842d2cec8fc560bf9fb4e18d513150a14c3b93d3fd15b3dcacfa304f4026666f2a4e";
+      sha512 = "f25f9f16af30b9301319de38659f2d046c5a03d7d9c027a9aab5477d5a65fe46218721deff5d635023ba87bd4c493bdbc3002707c120e0879abe72c87a9f08fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/vi/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/vi/firefox-63.0b14.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "2f255254ce614dd77c8a5f250a83020b5649dc7f8a6b2f4007c857bf7528ee7b959425ca54b1878261cdc26ed5c51fb0539aa05551f2591909ca0728d0415bf2";
+      sha512 = "8a8bb70b56db334606dba006ca4863f7c09d9ba546ceec2e5fafa5eeb6944e66e795ef4837933be871a4f5b5d63f8c2f918136667b955eeadab11163aaaab6a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/xh/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/xh/firefox-63.0b14.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "79ae1a6c8ed23b37764be436a0d6cce60c14d91bebd44c8644adf8800f894b475383132f37620893f994aa6620146f08f48d8c2721ba54ff2ddd9ce063918f63";
+      sha512 = "3cbf6c26c1831f8e7926bae33c380f84f278c1717516e08bb2cac98805d5c4bfcc67d8cd37ce2116224b010d1f6198063e4741c4ad82b9526e4c042ac40b1941";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-CN/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-CN/firefox-63.0b14.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "6f99f8239f5ed00003ce61d82e82c9df5ea6f30b68b6c5b51f26e153e3b2f5ec26c38b09e9b05bd12e9ebf9e1156d59ac102a9258017a1359cd66763945c38d8";
+      sha512 = "5288f4186b731c82ce1bb3edca0321ccfbca69882f0e2fc728c7d3effed36cc4a4c01f79d51fc52be8cc1509c4d516de9d6cbfa9add416c36a6c90543fab1e67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b13/linux-i686/zh-TW/firefox-63.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/63.0b14/linux-i686/zh-TW/firefox-63.0b14.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9a61516afb0fe59775794dabfe0a9a7bae2a71472453bac321468391541d3d052817d5f7650d1b2d1a554af57434c11845d5591bc9e7e79336b8a57706aa133b";
+      sha512 = "9cd0537802f9e1465a9cb55a5929757631b14c2b61b8ba701b8408a274ba35de95a7df1d1b2af22ee2a3db9ef9d106b93ee6698eb411ff67bb0f7b9a56cfd454";
     }
     ];
 }

From a041dd92fe79588fca073a82ff157d52651b5365 Mon Sep 17 00:00:00 2001
From: ft <git@f-t.me>
Date: Sat, 13 Oct 2018 20:30:24 -0700
Subject: [PATCH 2987/3253] sil-fonts: added andika, charis, doulos

---
 maintainers/maintainer-list.nix        |  5 +++++
 pkgs/data/fonts/andika/default.nix     | 31 ++++++++++++++++++++++++++
 pkgs/data/fonts/charis-sil/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/data/fonts/doulos-sil/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  6 +++++
 5 files changed, 104 insertions(+)
 create mode 100644 pkgs/data/fonts/andika/default.nix
 create mode 100644 pkgs/data/fonts/charis-sil/default.nix
 create mode 100644 pkgs/data/fonts/doulos-sil/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a50eb2819b8..cfbd3784ede5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1377,6 +1377,11 @@
     github = "expipiplus1";
     name = "Joe Hermaszewski";
   };
+  f--t = {
+    email = "git@f-t.me";
+    github = "f--t";
+    name = "f--t";
+  };
   f-breidenstein = {
     email = "mail@felixbreidenstein.de";
     github = "f-breidenstein";
diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix
new file mode 100644
index 000000000000..4b6965563a3a
--- /dev/null
+++ b/pkgs/data/fonts/andika/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchzip}:
+
+let
+  version = "5.000";
+in
+  fetchzip rec {
+    name = "andika-${version}";
+
+    url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip";
+
+    postFetch = ''
+      mkdir -p $out/share/{doc,fonts}
+      unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+      unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
+    '';
+
+    sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy";
+
+    meta = with stdenv.lib; {
+      homepage = https://software.sil.org/andika;
+      description = "A family designed especially for literacy use taking into account the needs of beginning readers";
+      longDescription = ''
+      Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another.
+
+      A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues.
+      '';
+      license = licenses.ofl;
+      platforms = platforms.all;
+      maintainers = [ maintainers.f--t ];
+    };
+  }
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix
new file mode 100644
index 000000000000..995e03372fb4
--- /dev/null
+++ b/pkgs/data/fonts/charis-sil/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchzip}:
+
+let
+  version = "5.000";
+in
+  fetchzip rec {
+    name = "charis-sil-${version}";
+
+    url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip";
+
+    postFetch = ''
+      mkdir -p $out/share/{doc,fonts}
+      unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+      unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
+    '';
+
+    sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n";
+
+    meta = with stdenv.lib; {
+      homepage = https://software.sil.org/charis;
+      description = "A family of highly readable fonts for broad multilingual use";
+      longDescription = ''
+      This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents.
+
+      The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally.
+      '';
+      license = licenses.ofl;
+      platforms = platforms.all;
+      maintainers = [ maintainers.f--t ];
+    };
+  }
diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix
new file mode 100644
index 000000000000..324f6f63e556
--- /dev/null
+++ b/pkgs/data/fonts/doulos-sil/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchzip}:
+
+let
+  version = "5.000";
+in
+  fetchzip rec {
+    name = "doulos-sil-${version}";
+
+    url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip";
+
+    postFetch = ''
+      mkdir -p $out/share/{doc,fonts}
+      unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+      unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}"
+    '';
+
+    sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad";
+
+    meta = with stdenv.lib; {
+      homepage = https://software.sil.org/doulos;
+      description = "A font that provides complete support for the International Phonetic Alphabet";
+      longDescription = ''
+      This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular.
+
+      The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally.
+      '';
+      license = licenses.ofl;
+      platforms = platforms.all;
+      maintainers = [ maintainers.f--t ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f5659ccb864..ea8ec731bb80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14946,6 +14946,8 @@ with pkgs;
 
   andagii = callPackage ../data/fonts/andagii { };
 
+  andika = callPackage ../data/fonts/andika { };
+
   android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { };
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
@@ -14978,6 +14980,8 @@ with pkgs;
 
   carlito = callPackage ../data/fonts/carlito {};
 
+  charis-sil = callPackage ../data/fonts/charis-sil { };
+
   comfortaa = callPackage ../data/fonts/comfortaa {};
 
   comic-neue = callPackage ../data/fonts/comic-neue { };
@@ -15036,6 +15040,8 @@ with pkgs;
 
   documentation-highlighter = callPackage ../misc/documentation-highlighter { };
 
+  doulos-sil = callPackage ../data/fonts/doulos-sil { };
+
   cabin = callPackage ../data/fonts/cabin { };
 
   camingo-code = callPackage ../data/fonts/camingo-code { };

From b524b7d087a6533bf6f9399611ba5622d3f431a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 21:34:47 -0700
Subject: [PATCH 2988/3253] postgis: 2.4.5 -> 2.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/postgis/versions
---
 pkgs/development/libraries/postgis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 0da66acbde2a..04fdeea1fa0b 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -42,8 +42,8 @@
 
 
 let
-  version = "2.4.5";
-  sha256 = "0saxj3w7j9yb9sa1ig3ccxvh2pk0bj47hp7m6199p1a1fpfjgrrg";
+  version = "2.5.0";
+  sha256 = "1m9n1shhqhjrhbq6fd9fyfccxcgpng37s3lffhlmyrp98zbsnwxy";
 in stdenv.mkDerivation rec {
   name = "postgis-${version}";
 

From 170c6104b66c8f5a12314ee96121876862182901 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 21:36:56 -0700
Subject: [PATCH 2989/3253] pg_cron: 1.0.2 -> 1.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pg_cron/versions
---
 pkgs/servers/sql/postgresql/pg_cron/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_cron/default.nix b/pkgs/servers/sql/postgresql/pg_cron/default.nix
index c5a7a40546ef..959c2c382524 100644
--- a/pkgs/servers/sql/postgresql/pg_cron/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_cron/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "pg_cron-${version}";
-  version = "1.0.2";
+  version = "1.1.2";
 
   buildInputs = [ postgresql ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "pg_cron";
     rev    = "refs/tags/v${version}";
-    sha256 = "0z743bbal9j0pvqskznfj0zvjsqvdl7p90d4fdrl0sc0crc3nvyx";
+    sha256 = "0n74dx1wkg9qxvjhnx03028465ap3p97v2kzqww833dws1wqk5m1";
   };
 
   installPhase = ''

From d2e1dd7fc715c675f2ba774a5b6174860d2a2b41 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <palo@pepe>
Date: Sun, 14 Oct 2018 06:46:36 +0200
Subject: [PATCH 2990/3253] nixos/modules: services.syncthing use types.str
 instead of types.string

As Infinisil mentioned in https://github.com/NixOS/nixpkgs/pull/48119#discussion_r224974201
---
 nixos/modules/services/networking/syncthing.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index cf21aa9eb70f..fd31b2a67687 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -17,7 +17,7 @@ in {
       '';
 
       guiAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1:8384";
         description = ''
           Address to serve the GUI.
@@ -31,7 +31,7 @@ in {
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = defaultUser;
         description = ''
           Syncthing will be run under this user (user will be created if it doesn't exist.
@@ -40,7 +40,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "nogroup";
         description = ''
           Syncthing will be run under this group (group will not be created if it doesn't exist.
@@ -49,7 +49,7 @@ in {
       };
 
       all_proxy = mkOption {
-        type = types.nullOr types.string;
+        type = with types; nullOr str;
         default = null;
         example = "socks5://address.com:1234";
         description = ''

From 411044a934a9eb284b0a61b6eb873de6f2480ead Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 14 Oct 2018 13:30:48 +0800
Subject: [PATCH 2991/3253] go-ethereum: 1.8.13 -> 1.8.17

---
 pkgs/applications/altcoins/default.nix     | 1 -
 pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index e0a0dbef632c..87f5d0be68a3 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -53,7 +53,6 @@ rec {
 
   freicoin = callPackage ./freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ./go-ethereum.nix {
-    buildGoPackage = buildGo110Package;
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 02e0412449a0..156cbc01a29b 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.13";
+  version = "1.8.17";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "123jkyb293z7ww3sa9ji5rw7xd229isi03k4ayyh5p7rr0dg8al0";
+    sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd";
   };
 
   meta = with stdenv.lib; {

From 2e94003c9cdb294ab5f24b84139337efeb74a2e0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 14 Oct 2018 13:58:02 +0800
Subject: [PATCH 2992/3253] nodejs-8_x: 8.11.4 -> 8.12.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index c5f899f9bb42..4e6ba7945ec5 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "8.11.4";
-    sha256 = "02d6a9sq81mbvap6h1ckwrang6wrxbkg0xxzn06wn2vbv7k7vkpv";
+    version = "8.12.0";
+    sha256 = "16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as";
   }

From caa6ab00485a8d49e221c2872bbb2a79daee0d6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 20:48:13 -0700
Subject: [PATCH 2993/3253] qutebrowser: 1.4.2 -> 1.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qutebrowser/versions
---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index b71eea791550..bf3debf6c7b8 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -28,12 +28,12 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.4.2";
+  version = "1.5.1";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1pnj47mllg1x34qakxs7s59x8mj262nfhdxgihsb2h2ywjq4fpgx";
+    sha256 = "1yn181gscj04ni58swk6cmggn047q29siqwgn66pvxhfdf0ny7fq";
   };
 
   # Needs tox

From 9af40cfa17b50ade505d6b30269d7f91dbbc6486 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 21:42:45 -0700
Subject: [PATCH 2994/3253] pipenv: 2018.7.1 -> 2018.10.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pipenv/versions
---
 pkgs/development/tools/pipenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix
index 297d2c3c6667..1d23f5426a55 100644
--- a/pkgs/development/tools/pipenv/default.nix
+++ b/pkgs/development/tools/pipenv/default.nix
@@ -2,11 +2,11 @@
 with python3Packages; buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "pipenv";
-    version = "2018.7.1";
+    version = "2018.10.9";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0fpnfxdkymz9an3m6isq5g24ykd6hnkjc8llfnvbmnakz1sd0sxv";
+      sha256 = "0b0safavjxq6malmv44acmgds21m2sp1wqa7gs0qz621v6gcgq4j";
     };
 
     LC_ALL = "en_US.UTF-8";

From 0c667e8ba7f9393a87cf696489803458c81a6531 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 21:10:13 -0700
Subject: [PATCH 2995/3253] khal: 0.9.9 -> 0.9.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/khal/versions
---
 pkgs/applications/misc/khal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index f9c929c21bfb..b94d067dd18d 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -18,11 +18,11 @@ let
 
 in with python.pkgs; buildPythonApplication rec {
   pname = "khal";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh";
+    sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4";
   };
 
   LC_ALL = "en_US.UTF-8";

From 820e2fd72f434ed094debb2be9cd9990af5d336c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 20:03:47 -0700
Subject: [PATCH 2996/3253] shotcut: 18.09.16 -> 18.10.08

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/shotcut/versions
---
 pkgs/applications/video/shotcut/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index a92cb5eb1e14..0c9d9757584e 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.09.16";
+  version = "18.10.08";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "0mv28v9c45gvf1jizb7zwmhcckpy7mznpai1zncc5gb5p7kqf56y";
+    sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08";
   };
 
   enableParallelBuilding = true;

From 72283489f2841cfd5c4a14f040ffdb8152c1e521 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:46:59 -0700
Subject: [PATCH 2997/3253] sigal: 1.4.0 -> 1.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sigal/versions
---
 pkgs/applications/misc/sigal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix
index 936b1a389f1e..e57e9394c105 100644
--- a/pkgs/applications/misc/sigal/default.nix
+++ b/pkgs/applications/misc/sigal/default.nix
@@ -1,12 +1,12 @@
 { lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }:
 
 buildPythonApplication rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname   = "sigal";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0da0n8jhjp2swr18zga87xc77r8c7qwqf5sp222ph9sn3yyyc35i";
+    sha256 = "1fg32ii26j3xpq3cryi212lx9z33qnicm1cszwv1wfpg6sr2rr61";
   };
 
   buildInputs = with pythonPackages; [ pytest ];

From 29eab7234e41a35f7ea4f27719c7254ea5c35a87 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:39:55 -0700
Subject: [PATCH 2998/3253] sonarr: 2.0.0.5228 -> 2.0.0.5252

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sonarr/versions
---
 pkgs/servers/sonarr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 6e78a84b4c7d..1b4bad093c49 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.5228";
+  version = "2.0.0.5252";
 
   src = fetchurl {
     url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "0nys6livqzdn19f9qazs6w9mz35d1wj2f2fgcrccshrbwafrxdw1";
+    sha256 = "0rs6sw2yjnhv3v3qbnalz445cilppw91zxxkj93dbp5vdlinw3fp";
   };
 
   buildInputs = [

From c5e2470b2ea6145ee13e75a841520bf27659a134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:23:17 -0700
Subject: [PATCH 2999/3253] subversionClient: 1.10.2 -> 1.10.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/subversion-client/versions
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 0a61dc38c64a..2a77e1395b46 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -121,8 +121,8 @@ in {
   };
 
   subversion_1_10 = common {
-    version = "1.10.2";
-    sha256 = "127dysfc31q4dhbbxaznh9kqixy9jd44kgwji2gdwj6rb2lf6dav";
+    version = "1.10.3";
+    sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz";
     extraBuildInputs = [ lz4 utf8proc ];
   };
 }

From 91638e161edf0fc83a0038cd210d61e9235789bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 19:11:12 -0700
Subject: [PATCH 3000/3253] remmina: 1.2.31.4 -> 1.2.32

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/remmina/versions
---
 pkgs/applications/networking/remote/remmina/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index fb138a1e8d45..96aa037d35bf 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.2.31.4";
+  version = "1.2.32";
 
   desktopItem = makeDesktopItem {
     name = "remmina";
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
     owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "1jx704f5zjns3nqy0ffgyfaxfxcxp83mfm5k539xfnqjn5g5h1qr";
+    sha256 = "15szv1xs6drxq6qyksmxcfdz516ja4zm52r4yf6hwij3fgl8qdpw";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d074fb1940c623a44162002dfe3b3aa8c7c926ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 18:06:03 -0700
Subject: [PATCH 3001/3253] verilator: 4.002 -> 4.004

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/verilator/versions
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 986c4a1f32a1..dd31f28db313 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "4.002";
+  version = "4.004";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "10g1814kq07a2818p0lmvacy1a6shbc0k6z16wdgas4h5x1n4f43";
+    sha256 = "1nkdmz4bm1v2xarajf2g3z5vb2611a4fkvpgjxac4xrja5r8wpwk";
   };
 
   enableParallelBuilding = true;

From 77d29e5f06665a9c558884af7da95ed55aa4561f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 16:43:33 -0700
Subject: [PATCH 3002/3253] wireshark: 2.6.3 -> 2.6.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wireshark-qt/versions
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index f145d55daf38..753defb0b4f0 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.6.3";
+  version = "2.6.4";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "1v538h02y8avwy3cr11xz6wkyf9xd8qva4ng4sl9f2fw4skahn6i";
+    sha256 = "0qf81dk726sdsmjqa9nd251j1cwvzkyb4hrlp6w4iwa3cdz00sx0";
   };
 
   cmakeFlags = [

From 43b61d8474c842f2c367ce43b472be5808e7ea28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 16:15:40 -0700
Subject: [PATCH 3003/3253] woeusb: 3.2.9 -> 3.2.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/woeusb/versions
---
 pkgs/tools/misc/woeusb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index 0f0455fe0fe3..5232088ab1b1 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.9";
+  version = "3.2.10";
   name = "woeusb-${version}";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "1h2msp45slcd2s5jgw7ma9r7pl7schrvifw3kp53skxfpyax4j35";
+    sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0";
   };
 
   buildInputs = [ wxGTK30 autoreconfHook makeWrapper ];

From 6d74aaf76e46c7b4b0a1e208257e3384cc2d9893 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 16:06:21 -0700
Subject: [PATCH 3004/3253] xdg-desktop-portal: 1.0.2 -> 1.0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xdg-desktop-portal/versions
---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 171ef68cf569..9cdada9bf3b2 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
 
 let
-  version = "1.0.2";
+  version = "1.0.3";
 in stdenv.mkDerivation rec {
   name = "xdg-desktop-portal-${version}";
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     rev = version;
-    sha256 = "1vl0150gz20x106di9yfa6l3zjw0nd2lr44rkq2147n2a254p79p";
+    sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
   };
 
   patches = [

From 2bd753b98c796f6b22df4a95ac837996aa801af4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 15:57:37 -0700
Subject: [PATCH 3005/3253] workrave: 1.10.21 -> 1.10.23

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/workrave/versions
---
 pkgs/applications/misc/workrave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 4a16793b1c65..f20ef722a8c8 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "workrave-${version}";
-  version = "1.10.21";
+  version = "1.10.23";
 
   src = let
   in fetchFromGitHub {
-    sha256 = "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia";
+    sha256 = "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw";
     rev = with stdenv.lib;
       "v" + concatStringsSep "_" (splitString "." version);
     repo = "workrave";

From 4ca9524e987d2396c9a7aa4b44c205c7346bd2a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 18:36:35 -0700
Subject: [PATCH 3006/3253] spectre-meltdown-checker: 0.39 -> 0.40

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spectre-meltdown-checker/versions
---
 pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index c406316940e4..256423892c48 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spectre-meltdown-checker-${version}";
-  version = "0.39";
+  version = "0.40";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     rev = "v${version}";
-    sha256 = "1llp6iyvbykn9w7vnz1jklmy6gmbksk234b46mzjfvg7mvg91dc5";
+    sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs";
   };
 
   prePatch = ''

From f02d1e6064807c16201318aa5a399c98f4fca33b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 13 Oct 2018 17:43:39 -0700
Subject: [PATCH 3007/3253] tvheadend: 4.2.6 -> 4.2.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tvheadend/versions
---
 pkgs/servers/tvheadend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index c0a3b5a28c31..674d96e54622 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -3,7 +3,7 @@
 , which, zlib }:
 
 let
-  version = "4.2.6";
+  version = "4.2.7";
 
 in stdenv.mkDerivation rec {
   name = "tvheadend-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner  = "tvheadend";
     repo   = "tvheadend";
     rev    = "v${version}";
-    sha256 = "0rnhk0r34mfmz3cnf735nzkkyal7pnv16hfyrs0g4v5rk99rlab3";
+    sha256 = "09q6lddkld22z9nbxx5v3v3z5yvcnl4lgjirvrdprwkv67fld70g";
   };
 
   buildInputs = [

From cb4e4dca01d7abe7e6593b65304b0b7b88a7d5e3 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Thu, 11 Oct 2018 14:30:46 +0200
Subject: [PATCH 3008/3253] libwacom: add license and website metadata

---
 pkgs/development/libraries/libwacom/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index cc3f19ab7d31..67563e41d01f 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
-    homepage = https://sourceforge.net/projects/linuxwacom/;
+    homepage = https://linuxwacom.github.io/;
     description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
+    license = licenses.mit;
   };
 }

From 4b2bff8164d45024d7b51c6d194aa1bcafbb222b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 03:05:02 -0700
Subject: [PATCH 3009/3253] osinfo-db: 20180920 -> 20181011

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osinfo-db/versions
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 0a5f7b313065..94e3218ad35e 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180920";
+  name = "osinfo-db-20181011";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "19jbzf1g523bkckli043q21hgbfv0043b5ib4zjiz8x98h7ngiac";
+    sha256 = "1f0xa50xn15p3zig9031icqky8drf0654sbjmmziw2ijcdyzfkcp";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 6d189bc97d8a76640b52d70aee1d781b67f2bbb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 03:22:25 -0700
Subject: [PATCH 3010/3253] neo4j: 3.4.7 -> 3.4.8

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/neo4j/versions
---
 pkgs/servers/nosql/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 1fba6571e281..9365612c14ed 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.4.7";
+  version = "3.4.8";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
-    sha256 = "0jgk7kvsalpmawdds0ln76ma7qbdxwgh004lkalicciiljkyv8pj";
+    sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From fbcb547a902acb5f4b4b7dbb2113082b48b780e8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 14 Sep 2018 16:04:59 -0400
Subject: [PATCH 3011/3253] pythonPackages.python-json-logger: init at 0.1.9

---
 .../python-json-logger/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-json-logger/default.nix

diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix
new file mode 100644
index 000000000000..312b6a106e6a
--- /dev/null
+++ b/pkgs/development/python-modules/python-json-logger/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+}:
+
+buildPythonPackage rec {
+  version = "0.1.9";
+  pname = "python-json-logger";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e3636824d35ba6a15fc39f573588cba63cf46322a5dc86fb2f280229077e9fbe";
+  };
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/madzak/python-json-logger;
+    description = "A python library adding a json log formatter";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb032f3634f3..4398d1c6e998 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1659,6 +1659,8 @@ in {
 
   python-jose = callPackage ../development/python-modules/python-jose {};
 
+  python-json-logger = callPackage ../development/python-modules/python-json-logger { };
+
   python-ly = callPackage ../development/python-modules/python-ly {};
 
   pyhepmc = buildPythonPackage rec {

From e21f98dfd84cc8077241bb7f450bd09d66ecd414 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 14 Sep 2018 16:05:48 -0400
Subject: [PATCH 3012/3253] pythonPackages.jupyter-repo2docker: init at 0.6.0

---
 .../jupyter-repo2docker/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupyter-repo2docker/default.nix

diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
new file mode 100644
index 000000000000..0413a5badba8
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs-docker
+, docker
+, traitlets
+, python-json-logger
+, escapism
+, jinja2
+, ruamel_yaml
+, pyyaml
+, pytest
+, wheel
+, pytestcov
+, pythonAtLeast
+}:
+
+buildPythonPackage rec {
+  version = "0.6.0";
+  pname = "jupyter-repo2docker";
+  disabled = !(pythonAtLeast "3.4");
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "32c6dc6fd2402d6f5a955f8ab59299097bb5f4972c7dcc6fe2a8fe4c96dcab27";
+  };
+
+  checkInputs = [ pytest pyyaml wheel pytestcov ];
+  propagatedBuildInputs = [ pkgs-docker docker traitlets python-json-logger escapism jinja2 ruamel_yaml ];
+
+  # tests not packaged with pypi release
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://repo2docker.readthedocs.io/en/latest/;
+    description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4398d1c6e998..ea4f901b8516 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6320,6 +6320,10 @@ in {
 
   jupyter_core = callPackage ../development/python-modules/jupyter_core { };
 
+  jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
+    pkgs-docker = pkgs.docker;
+  };
+
   jupyterhub = callPackage ../development/python-modules/jupyterhub { };
 
   jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };

From 34e8009dcb9ca473ce98386697eefd539ac5eb19 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 03:46:48 -0700
Subject: [PATCH 3013/3253] riot-web: 0.16.2 -> 0.16.5

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 14cfb37197e1..70d272187837 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.16.2";
+  version = "0.16.5";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "14k8hsz2i1nd126jprvi45spdxawk4c8nb3flkrg7rmjdp5sski2";
+    sha256 = "1b82d82pfv4kjdxghc8y78zwmnc89hi7arvql2bx0zyfhzxj6drl";
   };
 
   installPhase = ''

From 6d3b54a1e99ff7283f003d1736b0f258d9307a15 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Sat, 13 Oct 2018 14:03:08 +0200
Subject: [PATCH 3014/3253] nextcloud: 14.0.1 -> 14.0.3

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 3b5e46cdb2a8..3f6fed1e0a03 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nextcloud-${version}";
-  version = "14.0.1";
+  version = "14.0.3";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "14ymc6fr91735yyc2gqh7c89mbbwsgamhhysf6crp9kp27l83z5a";
+    sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p";
   };
 
   patches = [ (fetchpatch {

From 097966bc25517f2c59714efea0567c109329a71e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 03:50:55 -0700
Subject: [PATCH 3015/3253] ne: 3.1.1 -> 3.1.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ne/versions
---
 pkgs/applications/editors/ne/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index a24fb90ed9c7..9bc6425bc411 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "ne-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
   src = fetchFromGitHub {
     owner = "vigna";
     repo = "ne";
     rev = version;
-    sha256 = "1i4vk5r2wn4cd6sgsidzqs9s3bmb4j9cn4392izkidi0j9mm3hvg";
+    sha256 = "154grh9gdzydnqn9xxj7zpia9cc5x6a7y1g73vwizr9bkg92l5cc";
   };
   buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ];
   dontBuild = true;

From 691eaabff7a708e02e972cd31459bb4fbcd9441e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 04:14:46 -0700
Subject: [PATCH 3016/3253] nlohmann_json: 3.2.0 -> 3.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nlohmann_json/versions
---
 pkgs/development/libraries/nlohmann_json/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 15bdbb1b48e8..ffb735e725ae 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "nlohmann_json-${version}";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk";
+    sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h";
   };
 
   nativeBuildInputs = [ cmake ];

From 487e8dab8fd6b2becd0df9fbc86a5b4016bb1fb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 04:31:34 -0700
Subject: [PATCH 3017/3253] metabase: 0.30.3 -> 0.30.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/metabase/versions
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 2e1cba52ee54..0f2f291318c7 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.30.3";
+  version = "0.30.4";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1w8886xkg88r8dla4l9kpxw2rwwjx23y1dk5rgfgh1vcw8da8cn4";
+    sha256 = "0mvyl5v798qwdydqsjjq94ihfwi62kq4gprxjg3rcckmjdyx2ycs";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From df6ec1aa6d742303a1b2bbd932b03635e75cbcf2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 04:44:09 -0700
Subject: [PATCH 3018/3253] mopidy-iris: 3.26.2 -> 3.27.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mopidy-iris/versions
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index be44112d82a8..546a47118a03 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.26.2";
+  version = "3.27.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "04jg5k8znkn0iirfnsndm74f8mypj8zwj76j489l0m263k1kn715";
+    sha256 = "00qlvfwfn7kybrx6rlj5h862syw3d5yak4sjqpxvacp7i5n1arsk";
   };
 
   propagatedBuildInputs = [

From 9cd21807c8b6261c0e4d32c8d430bd18e54fde0d Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sun, 7 Oct 2018 16:32:08 +0100
Subject: [PATCH 3019/3253] nixos/profile-sync-daemon: add missing path to
 systemd service

---
 nixos/modules/services/desktops/profile-sync-daemon.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index 4165bb64fe46..e4e47cfbd438 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -36,7 +36,7 @@ in {
             description = "Profile Sync daemon";
             wants = [ "psd-resync.service" "local-fs.target" ];
             wantedBy = [ "default.target" ];
-            path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
+            path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
             unitConfig = {
               RequiresMountsFor = [ "/home/" ];
             };
@@ -55,7 +55,7 @@ in {
             wants = [ "psd-resync.timer" ];
             partOf = [ "psd.service" ];
             wantedBy = [ "default.target" ];
-            path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
+            path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
             serviceConfig = {
               Type = "oneshot";
               ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";

From 4cb7173651ceddc8c6f1a6dc448cd0de1e16a1f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 05:09:52 -0700
Subject: [PATCH 3020/3253] mailman: 2.1.24 -> 2.1.29

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mailman/versions
---
 pkgs/servers/mail/mailman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index a38c0b277dae..87e0d219c9c6 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mailman-${version}";
-  version = "2.1.24";
+  version = "2.1.29";
 
   src = fetchurl {
     url = "mirror://gnu/mailman/${name}.tgz";
-    sha256 = "1r6sjapjmbav45xibjzc2a8y1xf4ikz09470ma1kw7iz174wn8z7";
+    sha256 = "0b0dpwf6ap260791c7lg2vpw30llf19hymbf2hja3s016rqp5243";
   };
 
   buildInputs = [ python2 python2.pkgs.dnspython ];

From a25e765dc90a6896f33f1fdfe0fe535006c468f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 11 Oct 2018 14:18:13 +0100
Subject: [PATCH 3021/3253] rambox: 0.5.17 -> 0.6.1

---
 .../networking/instant-messengers/rambox/bare.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 334c50814d78..2a80349c4e62 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "rambox-bare-${version}";
-  version = "0.5.17";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "saenzramiro";
     repo = "rambox";
     rev = version;
-    sha256 = "18adga0symhb825db80l4c7kjl3lzzh54p1qibqsfa087rjxx9ay";
+    sha256 = "1cyxxgcv0qvm1la8yl5ag3j11spw7zvnj75zpf9c1y33pqmp44yc";
   };
 
   nativeBuildInputs = [ nodejs-8_x ruby sencha ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k";
+    sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
   };
 
   patches = [ ./isDev.patch ];

From 8cdf5ae36cc5087c6282ceb1feb3bb1359cd4967 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 05:39:30 -0700
Subject: [PATCH 3022/3253] mapnik: 3.0.20 -> 3.0.21

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mapnik/versions
---
 pkgs/development/libraries/mapnik/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index ebae2a6c3be0..693260af1c76 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.20";
+  version = "3.0.21";
 
   src = fetchzip {
     # this one contains all git submodules and is cheaper than fetchgit
     url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "05a2hvvk5s4x3wjvh4spd717vd5ri7h0sql7aarpi9jpc5h6xicc";
+    sha256 = "0cq2gbmf1sssg72sq4b5s3x1z6wvl1pzxliymm06flw5bpim5as2";
   };
 
   # a distinct dev output makes python-mapnik fail

From 1b4e48ab2b905eb6b9f34118023ee5847cb6d38d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 14 Oct 2018 14:41:40 +0200
Subject: [PATCH 3023/3253] clisp: Mark as broken for aarch64

---
 pkgs/development/interpreters/clisp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 0a54a916ba73..e6112c5a3343 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -96,7 +96,8 @@ stdenv.mkDerivation rec {
     description = "ANSI Common Lisp Implementation";
     homepage = http://clisp.cons.org;
     maintainers = with stdenv.lib.maintainers; [raskin tohl];
+    platforms = stdenv.lib.platforms.unix;
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
-    platforms = stdenv.lib.platforms.linux;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 }

From ce783564f1311575122ee2171ded889d5e345a43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 05:42:57 -0700
Subject: [PATCH 3024/3253] memcached: 1.5.10 -> 1.5.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/memcached/versions
---
 pkgs/servers/memcached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 9790df9ce765..dc66c710a5d4 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.10";
+  version = "1.5.11";
   name = "memcached-${version}";
 
   src = fetchurl {
     url = "https://memcached.org/files/${name}.tar.gz";
-    sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29";
+    sha256 = "0ajql8qs3w1lpw41vxkq2xabkxmmdk2nwg3i4lkclraq8pw92yk9";
   };
 
   buildInputs = [cyrus_sasl libevent];

From 0d44bb4f12a6a43dda608b5583c944dc020b565c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 05:57:20 -0700
Subject: [PATCH 3025/3253] libtorrentRasterbar: 1.1.9 -> 1.1.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libtorrent-rasterbar/versions
---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index f19e9d274313..6b5182fa992f 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.1.9";
+  version = "1.1.10";
   formattedVersion = lib.replaceChars ["."] ["_"] version;
 
   # Make sure we override python, so the correct version is chosen
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
     owner = "arvidn";
     repo = "libtorrent";
     rev = "libtorrent-${formattedVersion}";
-    sha256 = "04w3pjzd6q9wplj1dcphylxn1i2b2x0iw1l0ma58ymh14swdah7a";
+    sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms";
   };
 
   enableParallelBuilding = true;

From e47a7f89daa1f2843742abc7fbed420b5bc237a8 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 13:04:55 -0400
Subject: [PATCH 3026/3253] pythonPackages.dopy: refactor move to
 python-modules

---
 .../python-modules/dopy/default.nix           | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +---------------
 2 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/dopy/default.nix

diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix
new file mode 100644
index 000000000000..beaca0757507
--- /dev/null
+++ b/pkgs/development/python-modules/dopy/default.nix
@@ -0,0 +1,26 @@
+{ pkgs
+, buildPythonPackage
+, requests
+, six
+}:
+
+buildPythonPackage rec {
+  version = "2016-01-04";
+  pname = "dopy";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "Wiredcraft";
+    repo = "dopy";
+    rev = "cb443214166a4e91b17c925f40009ac883336dc3";
+    sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
+  };
+
+  propagatedBuildInputs = [ requests six ];
+
+  meta = with pkgs.lib; {
+    description = "Digital Ocean API python wrapper";
+    homepage = "https://github.com/Wiredcraft/dopy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lihop ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..4bdf74214f84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2136,27 +2136,7 @@ in {
 
   dogpile_core = callPackage ../development/python-modules/dogpile.core { };
 
-  dopy = buildPythonPackage rec {
-    version = "2016-01-04";
-    name = "dopy-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "Wiredcraft";
-      repo = "dopy";
-      rev = "cb443214166a4e91b17c925f40009ac883336dc3";
-      sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
-    };
-
-    propagatedBuildInputs = with self; [ requests six ];
-
-    meta = {
-      description = "Digital Ocean API python wrapper";
-      homepage = "https://github.com/Wiredcraft/dopy";
-      license = licenses.mit;
-      maintainers = with maintainers; [ lihop ];
-      platforms = platforms.all;
-    };
-  };
+  dopy = callPackage ../development/python-modules/dopy { };
 
   dpkt = callPackage ../development/python-modules/dpkt {};
 

From 31a4e4f11b7dd906f0040301480962910d576da1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 06:14:22 -0700
Subject: [PATCH 3027/3253] libgit2_0_27: 0.27.4 -> 0.27.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libgit2/versions
---
 pkgs/development/libraries/git2/0.27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix
index bafd6be37df6..db627449e1ba 100644
--- a/pkgs/development/libraries/git2/0.27.nix
+++ b/pkgs/development/libraries/git2/0.27.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.27.4";
+  version = "0.27.5";
   name = "libgit2-${version}";
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s";
+    sha256 = "1f6jxgw4pf6jln439v1pj8a0kgym5sq5xry8x0gq18dr5gv3wims";
   };
 
   cmakeFlags = [ "-DTHREADSAFE=ON" ];

From fd6d6d987094597fc7ede6fbc67a90c220dfa76c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sun, 14 Oct 2018 15:18:48 +0200
Subject: [PATCH 3028/3253] tribler: Fix startup

The python component of libtorrentRasterbar seems to now be in pythonPackages
---
 pkgs/applications/networking/p2p/tribler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 1169dba188cd..77ca7afe871e 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, libtorrentRasterbar, imagemagick
+{ stdenv, fetchurl, pythonPackages, makeWrapper, imagemagick
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ];
 
   pythonPath = [
-    libtorrentRasterbar
+    pythonPackages.libtorrentRasterbar
     pythonPackages.apsw
     pythonPackages.twisted
     pythonPackages.netifaces

From 323faf056552c86dae504ba4a3cd49d4e1db0530 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 06:20:40 -0700
Subject: [PATCH 3029/3253] leatherman: 1.5.0 -> 1.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/leatherman/versions
---
 pkgs/development/libraries/leatherman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index b01d902fd91a..259975815d8e 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.5.0";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
-    sha256 = "1plx111mfci8z33mwy56y54n597gi8965s7bmnribkk8bvdn10dy";
+    sha256 = "0drn8wdl4mwqz84lwc7cjmc6pxj2jwpx7n2dxwzwj43ps624zhbj";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 9f8b40c2de7f6cf5f2f1456645386b5f926de5ee Mon Sep 17 00:00:00 2001
From: Limbo Peng <iwinux@gmail.com>
Date: Sun, 14 Oct 2018 21:20:42 +0800
Subject: [PATCH 3030/3253] httping: add libintl to buildInputs on Darwin
 (#48188)

* httping: add libintl to buildInputs on Darwin

Otherwise it won't compile.

* httping: fix URLs
---
 pkgs/tools/networking/httping/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index bfe9f115133c..abde3f2a380d 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, ncurses, openssl
+{ stdenv, fetchurl, gettext, libintl, ncurses, openssl
 , fftw ? null }:
 
 stdenv.mkDerivation rec {
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   version = "2.5";
 
   src = fetchurl {
-    url = "https://www.vanheusden.com/httping/${name}.tgz";
+    url = "https://vanheusden.com/httping/${name}.tgz";
     sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
   };
 
-  buildInputs = [ fftw ncurses openssl ];
+  buildInputs = [ fftw libintl ncurses openssl ];
   nativeBuildInputs = [ gettext ];
 
   makeFlags = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.vanheusden.com/httping;
+    homepage = https://vanheusden.com/httping;
     description = "ping with HTTP requests";
     longDescription = ''
       Give httping an url, and it'll show you how long it takes to connect,
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.agpl3;
     maintainers = with maintainers; [ rickynils ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 605821e1b2fac0ce7dca5ac5decb59418a491eab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 06:24:22 -0700
Subject: [PATCH 3031/3253] libpqxx: 6.2.4 -> 6.2.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libpqxx/versions
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 5afed2b2a2f5..fbee81ab677a 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.2.4";
+  version = "6.2.5";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "18fkyfa3a917ljmarf3jy8ycdhqzpc47cj87542sjpxnpaj9hy59";
+    sha256 = "15x9xlj2v66w81j90cb438qkrrcqaq4dqrvhllwyqfz4lprqnhh9";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From 3287e88cf0fa4896e2d0a527a3a993c458acc536 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 15:00:37 -0400
Subject: [PATCH 3032/3253] pythonPackages.backports_os: init at 0.1.1

---
 .../python-modules/backports_os/default.nix   | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/backports_os/default.nix

diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix
new file mode 100644
index 000000000000..9d0ddc2cad9a
--- /dev/null
+++ b/pkgs/development/python-modules/backports_os/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, future
+, isPy3k
+, python
+, hypothesis
+}:
+
+buildPythonPackage rec {
+  version = "0.1.1";
+  pname = "backports.os";
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b472c4933094306ca08ec90b2a8cbb50c34f1fb2767775169a1c1650b7b74630";
+  };
+
+  buildInputs = [ setuptools_scm ];
+  checkInputs = [ hypothesis ];
+  propagatedBuildInputs = [ future ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pjdelport/backports.os;
+    description = "Backport of new features in Python's os module";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7445c6d8bb..32b9daa45e54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -995,6 +995,8 @@ in {
 
   backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { };
 
+  backports_os = callPackage ../development/python-modules/backports_os { };
+
   backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { };
 
   backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else

From 77c1ca887bcb419c341b2e7e6a6d6ab7374a0621 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 15:01:14 -0400
Subject: [PATCH 3033/3253] pythonPackages.pyftpdlib: init at 1.5.4

---
 .../python-modules/pyftpdlib/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyftpdlib/default.nix

diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
new file mode 100644
index 000000000000..b8f483d3a1dc
--- /dev/null
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, mock
+, psutil
+, pyopenssl
+, pysendfile
+, python
+}:
+
+buildPythonPackage rec {
+  version = "1.5.4";
+  pname = "pyftpdlib";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e5fca613978743d41c3bfc68e25a811d646a3b8a9eee9eb07021daca89646a0f";
+  };
+
+  checkInputs = [ mock psutil ];
+  propagatedBuildInputs = [ pyopenssl pysendfile ];
+
+  checkPhase = ''
+    ${python.interpreter} pyftpdlib/test/runner.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/giampaolo/pyftpdlib/;
+    description = "Very fast asynchronous FTP server library";
+    license = licenses.mit;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32b9daa45e54..2bde64c14866 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3857,6 +3857,8 @@ in {
 
   pydotplus = callPackage ../development/python-modules/pydotplus { };
 
+  pyftpdlib = callPackage ../development/python-modules/pyftpdlib { };
+
   pyfxa = callPackage ../development/python-modules/pyfxa { };
 
   pyhomematic = callPackage ../development/python-modules/pyhomematic { };

From 7f613c8d4992b980a97c8d06aa550e09ebc7dbd1 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 15:01:40 -0400
Subject: [PATCH 3034/3253] pythonPackages.fs: 0.5.4 -> 2.1.1 refactor move to
 python-modules

---
 .../development/python-modules/fs/default.nix | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 32 +----------
 2 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/python-modules/fs/default.nix

diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
new file mode 100644
index 000000000000..9d5de0c73ea2
--- /dev/null
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -0,0 +1,53 @@
+{ pkgs
+, buildPythonPackage
+, fetchPypi
+, six
+, nose
+, appdirs
+, scandir
+, backports_os
+, typing
+, pytz
+, enum34
+, pyftpdlib
+, psutil
+, mock
+, pythonAtLeast
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "fs";
+  version = "2.1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b20a4aeac9079b194f0160957d4265bb6c99ce68f1b12e980b0fb96f74aafb70";
+  };
+
+  buildInputs = [ pkgs.glibcLocales ];
+  checkInputs = [ nose pyftpdlib mock psutil ];
+  propagatedBuildInputs = [ six appdirs pytz ]
+    ++ pkgs.lib.optionals (!isPy3k) [ backports_os ]
+    ++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ]
+    ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ]
+    ++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
+
+  postPatch = ''
+    # required for installation
+    touch LICENSE
+    # tests modify home directory results in (4 tests failing) / 1600
+    rm tests/test_appfs.py tests/test_opener.py
+  '';
+
+  LC_ALL="en_US.utf-8";
+
+  meta = with pkgs.lib; {
+    description = "Filesystem abstraction";
+    homepage    = https://github.com/PyFilesystem/pyfilesystem2;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2bde64c14866..c4bd0b6446bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5581,37 +5581,7 @@ in {
     };
   };
 
-  fs = buildPythonPackage rec {
-    name = "fs-0.5.4";
-
-    src = pkgs.fetchurl {
-      url    = "mirror://pypi/f/fs/${name}.tar.gz";
-      sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-    buildInputs = [ pkgs.glibcLocales ];
-    propagatedBuildInputs = [ self.six ];
-
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
-
-    # Because 2to3 is used the tests in $out need to be run.
-    # Both when using unittest and pytest this resulted in many errors,
-    # some Python byte/str errors, and others specific to resources tested.
-    # Failing tests due to the latter is to be expected with this type of package.
-    # Tests are therefore disabled.
-    doCheck = false;
-
-    meta = {
-      description = "Filesystem abstraction";
-      homepage    = https://pypi.python.org/pypi/fs;
-      license     = licenses.bsd3;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.unix;
-    };
-  };
+  fs = callPackage ../development/python-modules/fs { };
 
   fusepy = buildPythonPackage rec {
     name = "fusepy-2.0.4";

From c8f7188f171aa7832595e623d602bb8ba090a644 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sun, 14 Oct 2018 16:55:09 +0300
Subject: [PATCH 3035/3253] zstd: 1.3.5 -> 1.3.6 (#47965)

---
 pkgs/tools/compression/zstd/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index f9a05c4281af..53aaf1004906 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
-    sha256 = "0fpv8k16s14g0r552mhbh0mkr716cqy41d2znyrvks6qfphkgir4";
+    sha256 = "1x4a8r4m68m93q52ffxvaip9nnwx9yqvd1m90v80777c11s20a4n";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
@@ -21,8 +21,11 @@ stdenv.mkDerivation rec {
   ];
 
   checkInputs = [ file ];
-  doCheck = false; # fails with "zstd: --list does not support reading from standard input"
-                   # probably a bug
+  doCheck = true;
+  preCheck = ''
+    substituteInPlace tests/playTests.sh \
+      --replace 'MD5SUM="md5 -r"' 'MD5SUM="md5sum"'
+  '';
 
   installFlags = [
     "PREFIX=$(out)"

From 6fb80eeacc72e2d7702e4555fca0122ec9a55ed1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 06:55:36 -0700
Subject: [PATCH 3036/3253] libsForQt5.libopenshot: 0.2.1 -> 0.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libopenshot/versions
---
 pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 64bbb07f0aaa..aab54e6d2ee2 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libopenshot-${version}";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "0n8ksnv6y2qh9iz352zqibfhnfvyjq7pkvy51prl47620ac40pc3";
+    sha256 = "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd";
   };
 
   patchPhase = ''

From b3dd5ef4c7ef6828552dd495d6410a88197fa58d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 07:09:02 -0700
Subject: [PATCH 3037/3253] librealsense: 2.15.0 -> 2.16.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/librealsense/versions
---
 pkgs/development/libraries/librealsense/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index ea24c9da88b9..f91fa192c034 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.15.0";
+  version = "2.16.1";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x";
+    sha256 = "0vs2vcfmsb574bvdqrfgdmam0p631c738apk0w9mjdqk59zy1bz2";
   };
 
   buildInputs = [

From 1a7682deb292d3a19b9002bc0986ec1f3f0f8180 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 21:20:34 -0400
Subject: [PATCH 3038/3253] pythonPackages.CacheControl: init at 0.12.5

---
 .../python-modules/cachecontrol/default.nix   | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/cachecontrol/default.nix

diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
new file mode 100644
index 000000000000..7fedf8c5461b
--- /dev/null
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+, msgpack
+, pytest
+}:
+
+buildPythonPackage rec {
+  version = "0.12.5";
+  pname = "CacheControl";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ requests msgpack ];
+
+  # tests not included with pypi release
+  doCheck = false;
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ionrock/cachecontrol;
+    description = "Httplib2 caching for requests";
+    license = licenses.asl20;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea4f901b8516..35251c154450 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -264,6 +264,8 @@ in {
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
+  cachecontrol = callPackage ../development/python-modules/cachecontrol { };
+
   cdecimal = callPackage ../development/python-modules/cdecimal { };
 
   clustershell = callPackage ../development/python-modules/clustershell { };

From aaa1af9bde4d32cedae4f3bdadfe4e615ce18d22 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 21:21:09 -0400
Subject: [PATCH 3039/3253] pythonPackages.hdmedians: init at 0.13

---
 .../python-modules/hdmedians/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/hdmedians/default.nix

diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
new file mode 100644
index 000000000000..5dbf6215574a
--- /dev/null
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, nose
+, cython
+, numpy
+}:
+
+buildPythonPackage rec {
+  version = "0.13";
+  pname = "hdmedians";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277";
+  };
+
+  buildInputs = [ cython ];
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ numpy ];
+
+  # cannot resolve path for packages in tests
+  doCheck = false;
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://github.com/daleroberts/hdmedians;
+    description = "High-dimensional medians";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35251c154450..82638130220e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -364,6 +364,8 @@ in {
 
   histbook = callPackage ../development/python-modules/histbook { };
 
+  hdmedians = callPackage ../development/python-modules/hdmedians { };
+
   httpsig = callPackage ../development/python-modules/httpsig { };
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -561,7 +563,7 @@ in {
     slurm = pkgs.slurm;
   };
 
-  pystache = callPackage ../development/python-modules/pystache { }; 
+  pystache = callPackage ../development/python-modules/pystache { };
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 

From 0f8ccbf259a35da67c34f4ac5b793d6a1a818643 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 21:21:38 -0400
Subject: [PATCH 3040/3253] pythonPackages.lockfile: init at 0.12.2

---
 .../python-modules/lockfile/default.nix       | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +--------------
 2 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/lockfile/default.nix

diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix
new file mode 100644
index 000000000000..15cfee67f84a
--- /dev/null
+++ b/pkgs/development/python-modules/lockfile/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pbr
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "lockfile";
+  version = "0.12.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799";
+  };
+
+  buildInputs = [ pbr ];
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with lib; {
+    homepage = https://launchpad.net/pylockfile;
+    description = "Platform-independent advisory file locking capability for Python applications";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 82638130220e..505874ecf6c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6612,29 +6612,7 @@ in {
 
   llvmlite = callPackage ../development/python-modules/llvmlite { llvm = pkgs.llvm_6; };
 
-  lockfile = buildPythonPackage rec {
-    pname = "lockfile";
-    version = "0.12.2";
-    name = "${pname}-${version}";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799";
-    };
-
-    buildInputs = with self; [
-      pbr nose
-    ];
-
-    checkPhase = ''
-      nosetests
-    '';
-
-    meta = {
-      homepage = https://launchpad.net/pylockfile;
-      description = "Platform-independent advisory file locking capability for Python applications";
-      license = licenses.asl20;
-    };
-  };
+  lockfile = callPackage ../development/python-modules/lockfile { };
 
   logilab_common = callPackage ../development/python-modules/logilab/common.nix {};
 

From 4f25a138612ff62df020ff74753bd47d6fbd91f9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 10 Oct 2018 21:21:58 -0400
Subject: [PATCH 3041/3253] pythonPackages.scikit-bio: init at 0.5.4

---
 .../python-modules/scikit-bio/default.nix     | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/scikit-bio/default.nix

diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
new file mode 100644
index 000000000000..7a2ab097a71e
--- /dev/null
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, cython
+, lockfile
+, cachecontrol
+, decorator
+, ipython
+, matplotlib
+, natsort
+, numpy
+, pandas
+, scipy
+, hdmedians
+, scikitlearn
+, pytest
+, coverage
+, python
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  version = "0.5.4";
+  pname = "scikit-bio";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3243f1995ef24643c09ff4d9391a79528aadd8232e5aa5d66c38d7b2e0c92f24";
+  };
+
+  buildInputs = [ cython ];
+  checkInputs = [ coverage ];
+  propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy hdmedians scikitlearn ];
+
+  # remove on when version > 0.5.4
+  postPatch = ''
+    sed -i "s/numpy >= 1.9.2, < 1.14.0/numpy/" setup.py
+    sed -i "s/pandas >= 0.19.2, < 0.23.0/pandas/" setup.py
+  '';
+
+  # cython package not included for tests
+  doCheck = false;
+
+  checkPhase = ''
+    ${python.interpreter} -m skbio.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://scikit-bio.org/;
+    description = "Data structures, algorithms and educational resources for bioinformatics";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 505874ecf6c1..a2935c111943 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11715,6 +11715,8 @@ in {
     inherit (pkgs) gfortran glibcLocales;
   };
 
+  scikit-bio = callPackage ../development/python-modules/scikit-bio { };
+
   scp = callPackage ../development/python-modules/scp {};
 
   scripttest = buildPythonPackage rec {

From 5f028007a532f8952b0681bf0309f9435c911106 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 14 Oct 2018 10:05:50 -0400
Subject: [PATCH 3042/3253] pythonPackages.hdmedians: init at 0.13

---
 pkgs/development/python-modules/hdmedians/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix
index 5dbf6215574a..76d5921487e7 100644
--- a/pkgs/development/python-modules/hdmedians/default.nix
+++ b/pkgs/development/python-modules/hdmedians/default.nix
@@ -15,8 +15,8 @@ buildPythonPackage rec {
     sha256 = "230f80e064d905c49a1941af1b7e806e2f22b3c9a90ad5c21fd17d72636ea277";
   };
 
-  buildInputs = [ cython ];
-  checkInputs = [ nose ];
+  # nose was specified in setup.py as a build dependency...
+  buildInputs = [ cython nose ];
   propagatedBuildInputs = [ numpy ];
 
   # cannot resolve path for packages in tests

From 9cae5814e04726bf0beb0bd91b6e613742ae5dbc Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 14 Oct 2018 14:24:04 +0000
Subject: [PATCH 3043/3253] maintainers: update yegortimoshenko's email

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3a50eb2819b8..629ba8d63c38 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4654,7 +4654,7 @@
     name = "Dmitry V.";
   };
   yegortimoshenko = {
-    email = "yegortimoshenko@gmail.com";
+    email = "yegortimoshenko@riseup.net";
     github = "yegortimoshenko";
     name = "Yegor Timoshenko";
   };

From 562866e64fd3357e24ee5f56921f38c74ecb2001 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 14 Oct 2018 10:26:38 -0400
Subject: [PATCH 3044/3253] fail2ban: 0.10.3.1 -> 0.10.4

---
 pkgs/tools/security/fail2ban/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 30e8d4303dc1..6b1d8e6c4f88 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python, pythonPackages, gamin }:
 
-let version = "0.10.3.1"; in
+let version = "0.10.4"; in
 
 pythonPackages.buildPythonApplication {
   name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
     owner  = "fail2ban";
     repo   = "fail2ban";
     rev    = version;
-    sha256 = "03gljmqykwwvwxcfhqqfccmnsjhsl93052i38r9mf7hj4jj8v7x5";
+    sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l";
   };
 
   propagatedBuildInputs = [ gamin ]
@@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication {
 
   preInstall = ''
     substituteInPlace setup.py --replace /usr/share/doc/ share/doc/
-  
+
     # see https://github.com/NixOS/nixpkgs/issues/4968
     ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
   '';

From 45fcf07fcbec6494eb387a40eb5a9e0058015b7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 07:28:33 -0700
Subject: [PATCH 3045/3253] mpd_clientlib: 2.15 -> 2.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libmpdclient/versions
---
 pkgs/servers/mpd/clientlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 5201e150e2ab..d8aed78e28ae 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.15";
+  version = "2.16";
   name = "libmpdclient-${version}";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "18x6drzh867afwaakyfb8hcx37pnxxwvvpcs3n2fimnfa6vxgwaa";
+    sha256 = "0kd76pcf8pvmzl4k3cbq68c16imwaak2zljsa1wwwgk6idyw6gb1";
   };
 
   nativeBuildInputs = [ meson ninja ]

From 5a51d74e37957afa86631da1bf186671880b5d34 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 07:38:34 -0700
Subject: [PATCH 3046/3253] hwinfo: 21.57 -> 21.58

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hwinfo/versions
---
 pkgs/tools/system/hwinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index af934b54185a..59ece285676c 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.57";
+  version = "21.58";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "1zxc26bljhj04mqzpwnqd6zfnz4dd2syapzn8xcakj882v4a8gnz";
+    sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2";
   };
 
   patchPhase = ''

From 7f5a8093745a7d0ff6e83ddcc1305daca91be7a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 07:57:25 -0700
Subject: [PATCH 3047/3253] jackett: 0.10.258 -> 0.10.304

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jackett/versions
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 4c384c7b2b89..4f9cfa46e714 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.10.258";
+  version = "0.10.304";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1wlg1spz2cxddaagjs6hv5fks3n1wwfm9jmih3rh1vq1rx8j1xnq";
+    sha256 = "15v9xyvcdx9kbarilq7d7nm8ac8mljw641nrr3mnk8ij3gjdgb38";
   };
 
   buildInputs = [ makeWrapper ];

From 0ec21495ed4b0689ef5a980972d07a16741c7409 Mon Sep 17 00:00:00 2001
From: catern <catern@catern.com>
Date: Sun, 14 Oct 2018 11:08:33 -0400
Subject: [PATCH 3048/3253] bazel-buildtools: upgrade to 2018-10-11 (#48243)

---
 .../tools/build-managers/bazel/buildtools/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index 52fec3f131b9..d7bed13ec9d9 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -2,21 +2,21 @@
 
 buildGoPackage rec {
   name = "bazel-buildtools-unstable-${version}";
-  version = "2018-05-24";
+  version = "2018-10-11";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "buildtools";
-    rev = "588d90030bc8054b550967aa45a8a8d170deba0b";
-    sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv";
+    rev = "86b40b7fee59cc67d3371d20f10702fe8c6dd808";
+    sha256 = "10fzqbafwzv0bvx8aag78gh731k5j9nwlbcflhc5xm5zwhla9cyf";
   };
 
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
-    description = "This derivation contains developer tools for working with Google's bazel buildtool.";
+    description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps.";
     homepage = https://github.com/bazelbuild/buildtools;
     license = licenses.asl20;
     maintainers = with maintainers; [ uri-canva ];

From c3439d3dfc83573493cf8032b3d3b8b4c559a06e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 08:09:47 -0700
Subject: [PATCH 3049/3253] nanoflann: 1.2.3 -> 1.3.0 (#48384)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nanoflann/versions
---
 pkgs/development/libraries/nanoflann/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index b5d4ea0f4ebf..f29fb9564f31 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.3.0";
   name = "nanoflann-${version}";
   
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";
     rev = "v${version}";
-    sha256 = "1jrh73kjvdv7s7zc1sc3z254i17lpvn77b19wx32nvzsfxs4g44i";
+    sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv";
   };
 
   buildInputs = [ cmake ];

From ab050719baa0e82fa2c3761bbc26139bd11c064e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 08:11:02 -0700
Subject: [PATCH 3050/3253] ipopt: 3.12.10 -> 3.12.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipopt/versions
---
 pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 4a6aabb447f3..7e58a4c7c982 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipopt-${version}";
-  version = "3.12.10";
+  version = "3.12.11";
 
   src = fetchurl {
     url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9";
+    sha256 = "1qihlwwqsqpbwpp6zqfa7nrmb55dndppzmdy98897aiknaa2650h";
   };
 
   CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

From 265bb51798bf4489609f12479496a1bbfd0efae6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 08:16:18 -0700
Subject: [PATCH 3051/3253] jbake: 2.6.1 -> 2.6.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jbake/versions
---
 pkgs/development/tools/jbake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index 9c3094fb4fec..c11e6f15ce96 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "2.6.1";
+  version = "2.6.2";
   name = "jbake-${version}";
 
   src = fetchzip {
     url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip";
-    sha256 = "0zlh2azmv8gj3c4d4ndivar31wd42nmvhxq6xhn09cib9kffxbc7";
+    sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9";
   };
 
   buildInputs = [ makeWrapper jre ];

From cce05bfb08be15d168eccdcc8cabb44df8f4a1ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 08:18:52 -0700
Subject: [PATCH 3052/3253] mdp: 1.0.14 -> 1.0.15 (#48399)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mdp/versions
---
 pkgs/applications/misc/mdp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index f5950b877035..cd7bdd1fe7e2 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.14";
+  version = "1.0.15";
   name = "mdp-${version}";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "1nljb2bkk7kswywvvn3b2k6q14bh2jnwm8cypax3mwssjmid78af";
+    sha256 = "1m9a0vvyw2m55cn7zcq011vrjkiaj5a3g5g6f2dpq953gyi7gff9";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 55e222430f094c053e752910fdd1567df9e2f356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 15 Oct 2018 00:42:29 +0900
Subject: [PATCH 3053/3253] wabt: 1.0.5 -> 1.0.6

---
 pkgs/development/tools/wabt/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix
index 26347d4b2782..20c9a71aadd5 100644
--- a/pkgs/development/tools/wabt/default.nix
+++ b/pkgs/development/tools/wabt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wabt-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner  = "WebAssembly";
     repo   = "wabt";
     rev    = version;
-    sha256 = "1cbak3ach7cna98j2r0v3y38c59ih2gv0p6f43qp782pyj07hzfy";
+    sha256 = "0lqsf4wmg24mb3ksmib8xwvmghx8m2vzrjrs8dazwlmik7rill8i";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "The WebAssembly Binary Toolkit";
     longDescription = ''
-      WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
-      including:
+      WABT (pronounced "wabbit") is a suite of tools for WebAssembly, including:
        * wat2wasm: translate from WebAssembly text format to the WebAssembly
          binary format
        * wasm2wat: the inverse of wat2wasm, translate from the binary format

From 0c78e88ef6ea918815a4a69552d45b5e8ab1cc74 Mon Sep 17 00:00:00 2001
From: Lucie <lucie.daeye@gmail.com>
Date: Sun, 14 Oct 2018 17:42:59 +0200
Subject: [PATCH 3054/3253] invoke: 1.1.1 -> 1.2.0 (#48408)

---
 pkgs/development/python-modules/invoke/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix
index 8785f1fa6dbd..0438a035501b 100644
--- a/pkgs/development/python-modules/invoke/default.nix
+++ b/pkgs/development/python-modules/invoke/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "invoke";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c2cf54c9b9af973ad9704d8ba81b225117cab612568cacbfb3fc42958cc20a9";
+    sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw";
   };
 
   # errors with vendored libs

From 82f3fc0c83a7953c66b0e9331b3f633f62913f3f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:48:33 -0500
Subject: [PATCH 3055/3253] pythonPackages.structlog: add six to
 propagatedBuildInputs

Move simplejson to checkInputs
---
 pkgs/development/python-modules/structlog/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 4dc9c3c79bc9..f667f17f77df 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -6,6 +6,7 @@
 , pretend
 , freezegun
 , simplejson
+, six
 }:
 
 buildPythonPackage rec {
@@ -25,8 +26,8 @@ buildPythonPackage rec {
     })
   ];
 
-  checkInputs = [ pytest pretend freezegun ];
-  propagatedBuildInputs = [ simplejson ];
+  checkInputs = [ pytest pretend freezegun simplejson ];
+  propagatedBuildInputs = [ six ];
 
   checkPhase = ''
     rm tests/test_twisted.py*

From d03f4390addccc727033102f7e773d1b6a12a00f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 14 Oct 2018 12:47:14 -0500
Subject: [PATCH 3056/3253] pythonPackages.nvchecker: init at 1.1

---
 .../python-modules/nvchecker/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/nvchecker/default.nix

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
new file mode 100644
index 000000000000..6e70f90e3705
--- /dev/null
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, pytest_xdist, flaky, tornado }:
+
+buildPythonPackage rec {
+  pname = "nvchecker";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nk9ff26s5r6v5v7w4l9110qi5kmhllvwk5kh20zyyhdvxv72m3i";
+  };
+
+  # tornado is not present in the tarball setup.py but is required by the executable
+  propagatedBuildInputs = [ setuptools structlog tornado ];
+  checkInputs = [ pytest pytest-asyncio pytest_xdist flaky ];
+
+  # Disable tests for now, because our version of pytest seems to be too new
+  # https://github.com/lilydjwg/nvchecker/commit/42a02efec84824a073601e1c2de30339d251e4c7
+  doCheck = false;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  disabled = pythonOlder "3.5";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/lilydjwg/nvchecker;
+    description = "New version checker for software";
+    license = licenses.mit;
+    maintainers = with maintainers; [ marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2935c111943..116226428239 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -418,6 +418,8 @@ in {
 
   ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
 
+  nvchecker = callPackage ../development/python-modules/nvchecker { };
+
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
   ordered-set = callPackage ../development/python-modules/ordered-set { };

From 7748c3da1b116055c637a2441e1f0e9434f82f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 14 Oct 2018 20:12:08 +0200
Subject: [PATCH 3057/3253] nixos/nixos-install: Unset system

The system variable is used from the (possibly polluted) shell
environment.
This causes nixos-install to fail in a nix-shell because the system
shell variable is automatically set to the current system (e.g.
x86_64-linux).
---
 nixos/modules/installer/tools/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 22c1e0fe9a34..defc46ad2a72 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -13,6 +13,7 @@ extraBuildFlags=()
 
 mountPoint=/mnt
 channelPath=
+system=
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1

From 81c3ae949281a7d027dd5a1e9e61a1df5745eabe Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 21 Aug 2018 22:16:48 +0200
Subject: [PATCH 3058/3253] nixos/znc: add config option

This option represents the ZNC configuration as a Nix value. It will be
converted to a syntactically valid file. This provides:
- Flexibility: Any ZNC option can be used
- Modularity: These values can be set from any NixOS module and will be
merged correctly
- Overridability: Default values can be overridden

Also done:
Remove unused/unneeded options, mkRemovedOptionModule unfortunately doesn't work
inside submodules (yet). The options userName and modulePackages were never used
to begin with
---
 .../services/networking/znc/default.nix       | 222 ++++++++++++++----
 .../services/networking/znc/options.nix       | 190 +++++++--------
 2 files changed, 265 insertions(+), 147 deletions(-)

diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix
index e2526550caf3..bce5b15a19ec 100644
--- a/nixos/modules/services/networking/znc/default.nix
+++ b/nixos/modules/services/networking/znc/default.nix
@@ -3,51 +3,102 @@
 with lib;
 
 let
+
   cfg = config.services.znc;
 
-  defaultUser = "znc"; # Default user to own process.
+  defaultUser = "znc";
 
   modules = pkgs.buildEnv {
     name = "znc-modules";
     paths = cfg.modulePackages;
   };
 
+  listenerPorts = concatMap (l: optional (l ? Port) l.Port)
+    (attrValues (cfg.config.Listener or {}));
+
+  # Converts the config option to a string
+  semanticString = let
+
+      sortedAttrs = set: sort (l: r:
+        if l == "extraConfig" then false # Always put extraConfig last
+        else if isAttrs set.${l} == isAttrs set.${r} then l < r
+        else isAttrs set.${r} # Attrsets should be last, makes for a nice config
+        # This last case occurs when any side (but not both) is an attrset
+        # The order of these is correct when the attrset is on the right
+        # which we're just returning
+      ) (attrNames set);
+
+      # Specifies an attrset that encodes the value according to its type
+      encode = name: value: {
+          null = [];
+          bool = [ "${name} = ${boolToString value}" ];
+          int = [ "${name} = ${toString value}" ];
+
+          # extraConfig should be inserted verbatim
+          string = [ (if name == "extraConfig" then value else "${name} = ${value}") ];
+
+          # Values like `Foo = [ "bar" "baz" ];` should be transformed into
+          #   Foo=bar
+          #   Foo=baz
+          list = concatMap (encode name) value;
+
+          # Values like `Foo = { bar = { Baz = "baz"; Qux = "qux"; Florps = null; }; };` should be transmed into
+          #   <Foo bar>
+          #     Baz=baz
+          #     Qux=qux
+          #   </Foo>
+          set = concatMap (subname: [
+              "<${name} ${subname}>"
+            ] ++ map (line: "\t${line}") (toLines value.${subname}) ++ [
+              "</${name}>"
+            ]) (filter (v: v != null) (attrNames value));
+
+        }.${builtins.typeOf value};
+
+      # One level "above" encode, acts upon a set and uses encode on each name,value pair
+      toLines = set: concatMap (name: encode name set.${name}) (sortedAttrs set);
+
+    in
+      concatStringsSep "\n" (toLines cfg.config);
+
+  semanticTypes = with types; rec {
+    zncAtom = nullOr (either (either int bool) str);
+    zncAttr = attrsOf (nullOr zncConf);
+    zncAll = either (either zncAtom (listOf zncAtom)) zncAttr;
+    zncConf = attrsOf (zncAll // {
+      # Since this is a recursive type and the description by default contains
+      # the description of its subtypes, infinite recursion would occur without
+      # explicitly breaking this cycle
+      description = "znc values (null, atoms (str, int, bool), list of atoms, or attrsets of znc values)";
+    });
+  };
+
 in
 
 {
 
-  imports = [
-    ./options.nix
-  ];
-
-  ###### Interface
+  imports = [ ./options.nix ];
 
   options = {
     services.znc = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable a ZNC service for a user.
-        '';
-      };
+      enable = mkEnableOption "ZNC";
 
       user = mkOption {
         default = "znc";
         example = "john";
-        type = types.string;
+        type = types.str;
         description = ''
-          The name of an existing user account to use to own the ZNC server process.
-          If not specified, a default user will be created to own the process.
+          The name of an existing user account to use to own the ZNC server
+          process. If not specified, a default user will be created.
         '';
       };
 
       group = mkOption {
-        default = "";
+        default = defaultUser;
         example = "users";
-        type = types.string;
+        type = types.str;
         description = ''
-          Group to own the ZNCserver process.
+          Group to own the ZNC process.
         '';
       };
 
@@ -56,7 +107,8 @@ in
         example = "/home/john/.znc/";
         type = types.path;
         description = ''
-          The data directory. Used for configuration files and modules.
+          The state directory for ZNC. The config and the modules will be linked
+          to from this directory as well.
         '';
       };
 
@@ -64,7 +116,79 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Whether to open ports in the firewall for ZNC.
+          Whether to open ports in the firewall for ZNC. Does work with
+          ports for listeners specified in
+          <option>services.znc.config.Listener</option>.
+        '';
+      };
+
+      config = mkOption {
+        type = semanticTypes.zncConf;
+        default = {};
+        example = literalExample ''
+          {
+            LoadModule = [ "webadmin" "adminlog" ];
+            User.paul = {
+              Admin = true;
+              Nick = "paul";
+              AltNick = "paul1";
+              LoadModule = [ "chansaver" "controlpanel" ];
+              Network.freenode = {
+                Server = "chat.freenode.net +6697";
+                LoadModule = [ "simple_away" ];
+                Chan = {
+                  "#nixos" = { Detached = false; };
+                  "##linux" = { Disabled = true; };
+                };
+              };
+              Pass.password = {
+                Method = "sha256";
+                Hash = "e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93";
+                Salt = "l5Xryew4g*!oa(ECfX2o";
+              };
+            };
+          }
+        '';
+        description = ''
+          Configuration for ZNC, see
+          <literal>https://wiki.znc.in/Configuration</literal> for details. The
+          Nix value declared here will be translated directly to the xml-like
+          format ZNC expects. This is much more flexible than the legacy options
+          under <option>services.znc.confOptions.*</option>, but also can't do
+          any type checking.
+          </para>
+          <para>
+          You can use <command>nix-instantiate --eval --strict '&lt;nixpkgs/nixos&gt;' -A config.services.znc.config</command>
+          to view the current value. By default it contains a listener for port
+          5000 with SSL enabled.
+          </para>
+          <para>
+          Nix attributes called <literal>extraConfig</literal> will be inserted
+          verbatim into the resulting config file.
+          </para>
+          <para>
+          If <option>services.znc.useLegacyConfig</option> is turned on, the
+          option values in <option>services.znc.confOptions.*</option> will be
+          gracefully be applied to this option.
+          </para>
+          <para>
+          If you intend to update the configuration through this option, be sure
+          to enable <option>services.znc.mutable</option>, otherwise none of the
+          changes here will be applied after the initial deploy.
+        '';
+      };
+
+      configFile = mkOption {
+        type = types.path;
+        example = "~/.znc/configs/znc.conf";
+        description = ''
+          Configuration file for ZNC. It is recommended to use the
+          <option>config</option> option instead.
+          </para>
+          <para>
+          Setting this option will override any auto-generated config file
+          through the <option>confOptions</option> or <option>config</option>
+          options.
         '';
       };
 
@@ -78,16 +202,21 @@ in
       };
 
       mutable = mkOption {
-        default = true;
+        default = true; # TODO: Default to true when config is set, make sure to not delete the old config if present
         type = types.bool;
         description = ''
-          Indicates whether to allow the contents of the `dataDir` directory to be changed
-          by the user at run-time.
-          If true, modifications to the ZNC configuration after its initial creation are not
-            overwritten by a NixOS system rebuild.
-          If false, the ZNC configuration is rebuilt by every system rebuild.
-          If the user wants to manage the ZNC service using the web admin interface, this value
-            should be set to true.
+          Indicates whether to allow the contents of the
+          <literal>dataDir</literal> directory to be changed by the user at
+          run-time.
+          </para>
+          <para>
+          If enabled, modifications to the ZNC configuration after its initial
+          creation are not overwritten by a NixOS rebuild. If disabled, the
+          ZNC configuration is rebuilt on every NixOS rebuild.
+          </para>
+          <para>
+          If the user wants to manage the ZNC service using the web admin
+          interface, this option should be enabled.
         '';
       };
 
@@ -96,7 +225,7 @@ in
         example = [ "--debug" ];
         type = types.listOf types.str;
         description = ''
-          Extra flags to use when executing znc command.
+          Extra arguments to use for executing znc.
         '';
       };
     };
@@ -107,40 +236,48 @@ in
 
   config = mkIf cfg.enable {
 
-    networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [ ]; # TODO: Add port
+    services.znc = {
+      configFile = mkDefault (pkgs.writeText "znc-generated.conf" semanticString);
+      config = {
+        Version = (builtins.parseDrvName pkgs.znc.name).version;
+        Listener.l.Port = mkDefault 5000;
+        Listener.l.SSL = mkDefault true;
+      };
     };
 
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall listenerPorts;
+
     systemd.services.znc = {
       description = "ZNC Server";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.service" ];
+      after = [ "network-online.target" ];
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
         Restart = "always";
+        ExecStart = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${escapeShellArgs cfg.extraFlags}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        ExecStop   = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
+        ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
       };
       preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
+        mkdir -p ${cfg.dataDir}/configs
 
         # If mutable, regenerate conf file every time.
         ${optionalString (!cfg.mutable) ''
-          ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
-          ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
+          echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
+          rm -f ${cfg.dataDir}/configs/znc.conf
         ''}
 
         # Ensure essential files exist.
         if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
-            ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
-            ${pkgs.coreutils}/bin/cp --no-clobber ${/* TODO */"zncConfFile"} ${cfg.dataDir}/configs/znc.conf
-            ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
-            ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
+            echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
+            cp --no-clobber ${cfg.configFile} ${cfg.dataDir}/configs/znc.conf
+            chmod u+rw ${cfg.dataDir}/configs/znc.conf
+            chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
         fi
 
         if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
-          ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
+          echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
           ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
         fi
 
@@ -148,7 +285,6 @@ in
         rm ${cfg.dataDir}/modules || true
         ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules
       '';
-      script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}";
     };
 
     users.users = optional (cfg.user == defaultUser)
diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix
index ce5ca0a9a3b6..505ebb3bf0ad 100644
--- a/nixos/modules/services/networking/znc/options.nix
+++ b/nixos/modules/services/networking/znc/options.nix
@@ -6,66 +6,9 @@ let
 
   cfg = config.services.znc;
 
-  # Default user and pass:
-  # un=znc
-  # pw=nixospass
-
-  defaultUserName = "znc";
-  defaultPassBlock = "
-        <Pass password>
-                Method = sha256
-                Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93
-                Salt = l5Xryew4g*!oa(ECfX2o
-        </Pass>
-  ";
-
-  # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
-  mkZncConf = confOpts: ''
-    Version = 1.6.3
-    ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
-
-    <Listener l>
-            Port = ${toString confOpts.port}
-            IPv4 = true
-            IPv6 = true
-            SSL = ${boolToString confOpts.useSSL}
-            ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"}
-    </Listener>
-
-    <User ${confOpts.userName}>
-            ${confOpts.passBlock}
-            Admin = true
-            Nick = ${confOpts.nick}
-            AltNick = ${confOpts.nick}_
-            Ident = ${confOpts.nick}
-            RealName = ${confOpts.nick}
-            ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
-
-            ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: ''
-              <Network ${name}>
-                  ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules}
-                  Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password}
-                  ${concatMapStrings (c: "<Chan #${c}>\n</Chan>\n") net.channels}
-                  ${lib.optionalString net.hasBitlbeeControlChannel ''
-                    <Chan &bitlbee>
-                    </Chan>
-                  ''}
-                  ${net.extraConf}
-              </Network>
-              '') confOpts.networks) }
-    </User>
-    ${confOpts.extraZncConf}
-  '';
-
-  zncConfFile = pkgs.writeTextFile {
-    name = "znc.conf";
-    text = if cfg.zncConf != ""
-      then cfg.zncConf
-      else mkZncConf cfg.confOptions;
-  };
-
   networkOpts = {
     options = {
+
       server = mkOption {
         type = types.str;
         example = "chat.freenode.net";
@@ -75,23 +18,13 @@ let
       };
 
       port = mkOption {
-        type = types.int;
+        type = types.ints.u16;
         default = 6697;
-        example = 6697;
         description = ''
           IRC server port.
         '';
       };
 
-      userName = mkOption {
-        default = "";
-        example = "johntron";
-        type = types.string;
-        description = ''
-          A nick identity specific to the IRC server.
-        '';
-      };
-
       password = mkOption {
         type = types.str;
         default = "";
@@ -108,21 +41,12 @@ let
         '';
       };
 
-      modulePackages = mkOption {
-        type = types.listOf types.package;
-        default = [];
-        example = [ "pkgs.zncModules.push" "pkgs.zncModules.fish" ];
-        description = ''
-          External ZNC modules to build.
-        '';
-      };
-
       modules = mkOption {
         type = types.listOf types.str;
         default = [ "simple_away" ];
         example = literalExample "[ simple_away sasl ]";
         description = ''
-          ZNC modules to load.
+          ZNC network modules to load.
         '';
       };
 
@@ -156,7 +80,8 @@ let
           Nick = johntron
         '';
         description = ''
-          Extra config for the network.
+          Extra config for the network. Consider using
+          <option>services.znc.config</option> instead.
         '';
       };
     };
@@ -166,23 +91,29 @@ in
 
 {
 
-  ###### Interface
-
   options = {
     services.znc = {
 
-      zncConf = mkOption {
-        default = "";
-        example = "See: http://wiki.znc.in/Configuration";
-        type = types.lines;
+      useLegacyConfig = mkOption {
+        default = true;
+        type = types.bool;
         description = ''
-          Config file as generated with `znc --makeconf` to use for the whole ZNC configuration.
-          If specified, `confOptions` will be ignored, and this value, as-is, will be used.
-          If left empty, a conf file with default values will be used.
+          Whether to propagate the legacy options under
+          <option>services.znc.confOptions.*</option> to the znc config. If this
+          is turned on, the znc config will contain a user with the default name
+          "znc", global modules "webadmin" and "adminlog" will be enabled by
+          default, and more, all controlled through the
+          <option>services.znc.confOptions.*</option> options.
+          You can use <command>nix-instantiate --eval --strict '&lt;nixpkgs/nixos&gt;' -A config.services.znc.config</command>
+          to view the current value of the config.
+          </para>
+          <para>
+          In any case, if you need more flexibility,
+          <option>services.znc.config</option> can be used to override/add to
+          all of the legacy options.
         '';
       };
 
-
       confOptions = {
         modules = mkOption {
           type = types.listOf types.str;
@@ -203,9 +134,9 @@ in
         };
 
         userName = mkOption {
-          default = defaultUserName;
+          default = "znc";
           example = "johntron";
-          type = types.string;
+          type = types.str;
           description = ''
             The user name used to log in to the ZNC web admin interface.
           '';
@@ -217,37 +148,47 @@ in
           description = ''
             IRC networks to connect the user to.
           '';
-          example = {
-            "freenode" = {
-              server = "chat.freenode.net";
-              port = 6697;
-              useSSL = true;
-              modules = [ "simple_away" ];
+          example = literalExample ''
+            {
+              "freenode" = {
+                server = "chat.freenode.net";
+                port = 6697;
+                useSSL = true;
+                modules = [ "simple_away" ];
+              };
             };
-          };
+          '';
         };
 
         nick = mkOption {
           default = "znc-user";
           example = "john";
-          type = types.string;
+          type = types.str;
           description = ''
             The IRC nick.
           '';
         };
 
         passBlock = mkOption {
-          example = defaultPassBlock;
-          type = types.string;
+          example = literalExample ''
+            &lt;Pass password&gt;
+               Method = sha256
+               Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93
+               Salt = l5Xryew4g*!oa(ECfX2o
+            &lt;/Pass&gt;
+          '';
+          type = types.str;
           description = ''
             Generate with `nix-shell -p znc --command "znc --makepass"`.
             This is the password used to log in to the ZNC web admin interface.
+            You can also set this through
+            <option>services.znc.config.User.&lt;username&gt;.Pass.Method</option>
+            and co.
           '';
         };
 
         port = mkOption {
           default = 5000;
-          example = 5000;
           type = types.int;
           description = ''
             Specifies the port on which to listen.
@@ -258,7 +199,8 @@ in
           default = true;
           type = types.bool;
           description = ''
-            Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
+            Indicates whether the ZNC server should use SSL when listening on
+            the specified port. A self-signed certificate will be generated.
           '';
         };
 
@@ -283,4 +225,44 @@ in
 
     };
   };
+
+  config = mkIf cfg.useLegacyConfig {
+
+    services.znc.config = let
+      c = cfg.confOptions;
+      # defaults here should override defaults set in the non-legacy part
+      mkDefault = mkOverride 900;
+    in {
+      LoadModule = mkDefault c.modules;
+      Listener.l = {
+        Port = mkDefault c.port;
+        IPv4 = mkDefault true;
+        IPv6 = mkDefault true;
+        SSL = mkDefault c.useSSL;
+      };
+      User.${c.userName} = {
+        Admin = mkDefault true;
+        Nick = mkDefault c.nick;
+        AltNick = mkDefault "${c.nick}_";
+        Ident = mkDefault c.nick;
+        RealName = mkDefault c.nick;
+        LoadModule = mkDefault c.userModules;
+        Network = mapAttrs (name: net: {
+          LoadModule = mkDefault net.modules;
+          Server = mkDefault "${net.server} ${optionalString net.useSSL "+"}${toString net.port} ${net.password}";
+          Chan = optionalAttrs net.hasBitlbeeControlChannel { "&bitlbee" = mkDefault {}; } //
+            listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels);
+          extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf;
+        }) c.networks;
+        extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf;
+      };
+    };
+  };
+
+  imports = [
+    (mkRemovedOptionModule ["services" "znc" "zncConf"] ''
+      Instead of `services.znc.zncConf = "... foo ...";`, use
+      `services.znc.configFile = pkgs.writeText "znc.conf" "... foo ...";`.
+    '')
+  ];
 }

From 7e316780438b01cbb0ae79d0516fc204a11a5881 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 13 Oct 2018 15:08:06 +0200
Subject: [PATCH 3059/3253] nixos/znc: Add release note entry for removed
 options

---
 nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index c4847b60e274..ac5a2201c869 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -122,6 +122,14 @@
      the Python 2 or 3 version of the package.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      Options
+      <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal> and
+      <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal>
+      were removed. They were never used for anything and can therefore safely be removed.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 561fcf4c820c6db65b0efeba675680c54f9f2e41 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 12 Oct 2018 21:20:19 +0000
Subject: [PATCH 3060/3253] agdaIowaStdlib: 18734 -> 1.4.0

---
 .../libraries/agda/agda-iowa-stdlib/default.nix   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index ce25521ad2e5..3ab4ed3e9623 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, agda, fetchsvn }:
+{ stdenv, agda, fetchFromGitHub }:
 
 agda.mkDerivation (self: rec {
-  version = "18734";
+  version = "1.4.0";
   name = "agda-iowa-stdlib-${version}";
 
-  src = fetchsvn {
-    url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
-    rev = version;
-    sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky";
+  src = fetchFromGitHub {
+    owner = "cedille";
+    repo  = "ial";
+    rev = "v${version}";
+    sha256 = "1gwxpybxwdj5ipbb3gapm7r5hfl3g6sj9kp13954pdmx8d5b0gma";
   };
 
   sourceDirectories = [ "./." ];
@@ -22,7 +23,5 @@ agda.mkDerivation (self: rec {
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-
-    broken = true;
   };
 })

From 43ae33728bace6deb31042ab61efb196c1b8e2b0 Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Fri, 12 Oct 2018 21:22:25 +0000
Subject: [PATCH 3061/3253] cedille: init at 1.0.0

---
 .../science/logic/cedille/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/science/logic/cedille/default.nix

diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix
new file mode 100644
index 000000000000..5b99a47bb415
--- /dev/null
+++ b/pkgs/applications/science/logic/cedille/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchFromGitHub, alex, happy, Agda, agdaIowaStdlib,
+  buildPlatform, buildPackages, ghcWithPackages }:
+stdenv.mkDerivation rec {
+  version = "1.0.0";
+  name = "cedille-${version}";
+  src = fetchFromGitHub {
+    owner = "cedille";
+    repo = "cedille";
+    rev = "v${version}";
+    sha256 = "08c2vgg8i6l3ws7hd5gsj89mki36lxm7x7s8hi1qa5gllq04a832";
+  };
+  buildInputs = [ alex happy Agda (ghcWithPackages (ps: [ps.ieee])) ];
+
+  LANG = "en_US.UTF-8";
+  LOCALE_ARCHIVE =
+    lib.optionalString (buildPlatform.libc == "glibc")
+      "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+
+  postPatch = ''
+    patchShebangs create-libraries.sh
+    cp -r ${agdaIowaStdlib.src} ial
+    chmod -R 755 ial
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv cedille $out/bin/cedille
+  '';
+
+  meta = {
+    description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory.";
+    homepage = https://cedille.github.io/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.mpickering ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8daf69f64f65..256e11ada728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1091,6 +1091,10 @@ with pkgs;
 
   cddl = callPackage ../development/tools/cddl { };
 
+  cedille = callPackage ../applications/science/logic/cedille
+                          { inherit (haskellPackages) alex happy Agda ghcWithPackages;
+                          };
+
   cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
 
   ckbcomp = callPackage ../tools/X11/ckbcomp { };

From 9e348b4613c734d114e85ec40b72119a3c5ffd4f Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Sat, 13 Oct 2018 09:16:57 +0000
Subject: [PATCH 3062/3253] emacsPackages.cedille: init at 1.0.0

---
 .../editors/emacs-modes/cedille/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/cedille/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs-modes/cedille/default.nix
new file mode 100644
index 000000000000..2d1cbb75981e
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/cedille/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, cedille, emacs }:
+
+stdenv.mkDerivation rec {
+  name    = "cedille-mode-${version}";
+  version = cedille.version;
+
+  src = cedille.src;
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ":";
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install se-mode/*.el se-mode/*.elc $out/share/emacs/site-lisp
+    install cedille-mode/*.el cedille-mode/*.elc $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+    substituteInPlace $out/share/emacs/site-lisp/cedille-mode.el \
+      --replace /usr/bin/cedille ${cedille}/bin/cedille \
+
+  '';
+
+  meta = {
+    description = "Emacs major mode for Cedille";
+    homepage    = cedille.meta.homepage;
+    license     = cedille.meta.license ;
+    platforms   = cedille.meta.platforms;
+    maintainers = cedille.meta.maintainers;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 256e11ada728..43c5dfb36f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16236,6 +16236,8 @@ with pkgs;
 
     calfw = callPackage ../applications/editors/emacs-modes/calfw { };
 
+    cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; };
+
     coffee = callPackage ../applications/editors/emacs-modes/coffee { };
 
     colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };

From 983563105004f4968b930689dc1a619087c2f56c Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Sun, 30 Sep 2018 22:37:32 +0700
Subject: [PATCH 3063/3253] omegat: init at 4.1.5.2

OmegaT is a Computer-Assisted Translation tool written in Java.
This derivation doesn't build it from source, but rather downloads
a 'Cross-platform without JRE' zip file.
I took the liberty of shorting the upstream version naming of
"4.1.5 update 2 Beta" to a more concise "4.1.5.2".
---
 pkgs/applications/misc/omegat.nix | 40 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/omegat.nix

diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
new file mode 100644
index 000000000000..e6a6be88b6c0
--- /dev/null
+++ b/pkgs/applications/misc/omegat.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, unzip, jdk, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  version = "4.1.5.2";
+  name = "omegat";
+
+  src = fetchurl {  # their zip has repeated files or something, so no fetchzip
+    url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip;
+    sha256 = "1mdnsvjgsccpd5xwpqzgva5jjp8yd1akq9aqpild4v6k70lqql2b";
+  };
+
+  buildInputs = [ unzip makeWrapper ];
+
+  unpackCmd = "unzip -o $curSrc";  # tries to go interactive without -o
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r lib docs images plugins scripts *.txt *.html OmegaT.jar $out/
+
+    cat > $out/bin/omegat <<EOF
+    #! $SHELL -e
+    CLASSPATH="$out/lib"
+    exec ${jdk}/bin/java -jar -Xmx1024M $out/OmegaT.jar "\$@"
+    EOF
+    chmod +x $out/bin/omegat
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The free computer aided translation (CAT) tool for professionals";
+    longDescription = ''
+      OmegaT is a free and open source multiplatform Computer Assisted Translation
+      tool with fuzzy matching, translation memory, keyword search, glossaries, and
+      translation leveraging into updated projects.
+    '';
+    homepage = http://www.omegat.org/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ t184256 ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1a04e636997..36e6bc1a3b0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18021,6 +18021,8 @@ with pkgs;
 
   ogmtools = callPackage ../applications/video/ogmtools { };
 
+  omegat = callPackage ../applications/misc/omegat.nix { };
+
   omxplayer = callPackage ../applications/video/omxplayer { };
 
   openbox = callPackage ../applications/window-managers/openbox { };

From 45988d0d301eca838b4b3eb1b0d0aa4788d2775d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 14 Oct 2018 08:03:17 -0700
Subject: [PATCH 3064/3253] josm: 14178 -> 14289

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/josm/versions
---
 pkgs/applications/misc/josm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index fc10bc852e5c..4f98ec1bba91 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "14178";
+  version = "14289";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r";
+    sha256 = "102dph3479qskzf72cpb9139pq9ifka6pzna1c6s5rs2il6mfvsb";
   };
 
   buildInputs = [ jre10 makeWrapper ];

From d85317c7b2445c40e30b985517e078e50c24921b Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 6 Oct 2018 09:24:08 -0700
Subject: [PATCH 3065/3253] nixos/containers: Make systemd journals available
 from the host

This is set by default if using the upstream systemd-nspawn@ units.
---
 nixos/modules/virtualisation/containers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index b91165ce3b82..8fe59badd335 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -130,6 +130,7 @@ let
         --bind-ro=/nix/var/nix/daemon-socket \
         --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
         --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
+        --link-journal=try-guest \
         --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
         --setenv HOST_BRIDGE="$HOST_BRIDGE" \
         --setenv HOST_ADDRESS="$HOST_ADDRESS" \

From 72128fcd9dc01b06b1acac4aecdded7a773c55f8 Mon Sep 17 00:00:00 2001
From: Tycho Grouwstra <tychogrouwstra@gmail.com>
Date: Sun, 14 Oct 2018 23:46:38 +0200
Subject: [PATCH 3066/3253] skypeforlinux: 8.28.0.41 -> 8.32.0.44 (#48391)

* skypeforlinux: 8.28.0.41 -> 8.32.0.44

Fixes 404 on https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.28.0.41_amd64.deb, as only [more recent versions](https://repo.skype.com/deb/pool/main/s/skypeforlinux/) are still available, as previously noted at #31047. Avoiding `x.y.76.z` releases as per the comment.

* update sha256
---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index eaa9103a7b64..49e5a12d447c 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -6,7 +6,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.28.0.41";
+  version = "8.32.0.44";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -56,7 +56,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x";
+        sha256 = "0yzh4bmv8mrfp0ml9nhcpcy0lhi8jp1fnmnxy0krvnphkp8750c7";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From a1600d0aa8f9eee9f6d6cd067d6cbdb1fdd51d46 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Sun, 14 Oct 2018 18:00:06 -0400
Subject: [PATCH 3067/3253] ghc: enable parallel building of GHC on aarch64.

Note: this only affects GHC, not haskellPackages, which still suffers
from https://ghc.haskell.org/trac/ghc/ticket/15449.
---
 pkgs/development/compilers/ghc/8.2.2.nix | 3 +--
 pkgs/development/compilers/ghc/8.4.3.nix | 3 +--
 pkgs/development/compilers/ghc/8.6.1.nix | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 8c3012f881c6..b548b05339e4 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -88,8 +88,7 @@ stdenv.mkDerivation (rec {
     sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv";
   };
 
-  # https://ghc.haskell.org/trac/ghc/ticket/15449
-  enableParallelBuilding = !buildPlatform.isAarch64;
+  enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 7cd7494df050..e43f9a57d0a4 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -90,8 +90,7 @@ stdenv.mkDerivation (rec {
     sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
   };
 
-  # https://ghc.haskell.org/trac/ghc/ticket/15449
-  enableParallelBuilding = !buildPlatform.isAarch64;
+  enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index a2be9d255713..62ea39791b90 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -86,8 +86,7 @@ stdenv.mkDerivation (rec {
     sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
   };
 
-  # https://ghc.haskell.org/trac/ghc/ticket/15449
-  enableParallelBuilding = !buildPlatform.isAarch64;
+  enableParallelBuilding = true;
 
   outputs = [ "out" "doc" ];
 

From 72bb5a5449f9c0dc0948b2174592f2b201ee2968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 14 Oct 2018 19:01:37 -0300
Subject: [PATCH 3068/3253] matcha: 2018-09-14 -> 2018-10-12 (#48426)

---
 pkgs/misc/themes/matcha/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix
index 264d171292d2..e23fb7ff47cf 100644
--- a/pkgs/misc/themes/matcha/default.nix
+++ b/pkgs/misc/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matcha-${version}";
-  version = "2018-09-14";
+  version = "2018-10-12";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "matcha";
-    rev = "fe35259742b5ae007ab17d46d21acad5754477b9";
-    sha256 = "1qwb8l1xfx9ca2y9gcsckxikijz1ij28dirvpqvhbbyn1m8i9hwd";
+    rev = "c1c91db44d9e28cc71af019784a77175a60a7b9d";
+    sha256 = "0sr805ghgh8sr9nncs693b9p756nmi1l4d8mfywj6z219jhy77qv";
   };
 
   buildInputs = [ gdk_pixbuf librsvg ];

From e619998eb3778e7064b7c84e3338e65bbe114f31 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 14 Oct 2018 22:42:01 +0200
Subject: [PATCH 3069/3253] nixos/lock-kernel-modules: add myself to
 maintainers

---
 nixos/modules/security/lock-kernel-modules.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix
index c81521ed9b08..fc9e7939d814 100644
--- a/nixos/modules/security/lock-kernel-modules.nix
+++ b/nixos/modules/security/lock-kernel-modules.nix
@@ -3,6 +3,10 @@
 with lib;
 
 {
+  meta = {
+    maintainers = [ maintainers.joachifm ];
+  };
+
   options = {
     security.lockKernelModules = mkOption {
       type = types.bool;

From cb845123d413b873f2463411447e35d4ce026e74 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Oct 2018 00:18:33 +0200
Subject: [PATCH 3070/3253] nixos/hardened: add myself to maintainers

---
 nixos/modules/profiles/hardened.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 2af8bf1f8e30..38c5a42ba6fb 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -6,6 +6,10 @@
 with lib;
 
 {
+  meta = {
+    maintainers = [ maintainers.joachifm ];
+  };
+
   boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
 
   security.hideProcessInformation = mkDefault true;

From 22c12da8aa6e12e6c92f687dff4b47660bc1b6ee Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 14 Oct 2018 20:36:25 -0400
Subject: [PATCH 3071/3253] dbeaver: 5.2.1 -> 5.2.2

---
 pkgs/applications/misc/dbeaver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 681ee5b0bece..412a2e9d4fd0 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.2.1";
+  version = "5.2.2";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0zm320cdpypv2s58gcg89mdkir9xpz1824dscfqkmahx89g1ma81";
+    sha256 = "1rrj0c7ksvv9irsz9hb4ip30qgmzps4dy1nj4vl8mzzf389xa43n";
   };
 
   installPhase = ''

From 01d1f776818176a9cac7d7c9d3a319694fea4f1a Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 13 Oct 2018 23:42:28 +0200
Subject: [PATCH 3072/3253] tests/prometheus-exporters: add new Tor exporter

This new exporter was added in #48307.
---
 nixos/tests/prometheus-exporters.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 2f2c06dcb7d6..5d1e004c5dd1 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -243,6 +243,25 @@ let
       '';
     };
 
+    tor = {
+      exporterConfig = {
+        enable = true;
+      };
+      metricProvider = {
+        # Note: this does not connect the test environment to the Tor network.
+        # Client, relay, bridge or exit connectivity are disabled by default.
+        services.tor.enable = true;
+        services.tor.controlPort = 9051;
+      };
+      exporterTest = ''
+        waitForUnit("tor.service");
+        waitForOpenPort(9051);
+        waitForUnit("prometheus-tor-exporter.service");
+        waitForOpenPort(9130);
+        succeed("curl -sSf localhost:9130/metrics | grep -q 'tor_version{.\\+} 1'");
+      '';
+    };
+
     varnish = {
       exporterConfig = {
         enable = true;

From 259cf8812b152d6f5db61821441d51bb446e3b01 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Mon, 15 Oct 2018 03:26:46 +0200
Subject: [PATCH 3073/3253] dolphin-emu: fix metadata (GPLv2 -> GPLv2+, http ->
 https)

Dolphin has been GPLv2+ since 2015.
---
 pkgs/misc/emulators/dolphin-emu/default.nix | 6 +++---
 pkgs/misc/emulators/dolphin-emu/master.nix  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index 01e1847973c7..392f5618b6e5 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
                   wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ];
 
   meta = {
-    homepage = http://dolphin-emu.org/;
-    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
-    license = stdenv.lib.licenses.gpl2;
+    homepage = https://dolphin-emu.org/;
+    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 8717d9355d2b..68176ff427e3 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -71,9 +71,9 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://dolphin-emu.org";
-    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
-    license = licenses.gpl2;
+    homepage = "https://dolphin-emu.org";
+    description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ MP2E ];
     branch = "master";
     # x86_32 is an unsupported platform.

From 962756e8183518e0d2fe2ac9a448b873a4d55ce0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 14 Oct 2018 22:09:36 -0500
Subject: [PATCH 3074/3253] emacs-mac: use generic builder

this builder leads to confusion, especially since it is no longer used
in the normal emacs derivation.
---
 pkgs/applications/editors/emacs/builder.sh  | 40 ---------------------
 pkgs/applications/editors/emacs/macport.nix |  2 --
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/builder.sh

diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh
deleted file mode 100644
index 545520cca7c0..000000000000
--- a/pkgs/applications/editors/emacs/builder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-# This hook is supposed to be run on Linux. It patches the proper locations of
-# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with
-# *our* versions, not the ones found in the system, as it would do by default.
-# On other platforms, this appears to be unnecessary.
-preConfigure() {
-    ./autogen.sh
-
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
-        substituteInPlace $i --replace /bin/pwd pwd
-    done
-
-    case "${system}" in
-	x86_64-linux)	glibclibdir=lib64 ;;
-	i686-linux)	glibclibdir=lib ;;
-        *)              return;
-    esac
-
-    libc=$(cat ${NIX_CC}/nix-support/orig-libc)
-    echo "libc: $libc"
-
-    for i in src/s/*.h src/m/*.h; do
-        substituteInPlace $i \
-            --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \
-            --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \
-            --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \
-            --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \
-            --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \
-            --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o
-    done
-}
-
-preInstall () {
-    for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
-        substituteInPlace $i --replace /bin/pwd pwd
-    done
-}
-
-genericBuild
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 71a41da57474..0876a71cbf73 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -9,8 +9,6 @@ stdenv.mkDerivation rec {
   macportVersion = "7.2";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
     sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";

From 975c9b57eb483e1bce1b5a97ea94e7b73bbb0d33 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 15 Oct 2018 15:04:43 +0900
Subject: [PATCH 3075/3253] gotop: 1.2.9 -> 1.5.0 (#48407)

---
 pkgs/tools/system/gotop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix
index 0afdb28728c8..3aba05f7aefe 100644
--- a/pkgs/tools/system/gotop/default.nix
+++ b/pkgs/tools/system/gotop/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gotop-${version}";
-  version = "1.2.9";
+  version = "1.5.0";
 
   goPackagePath = "github.com/cjbassi/gotop";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     repo = "gotop";
     owner = "cjbassi";
     rev = version;
-    sha256 = "07s2f04yhc79vqr1gdh2v974kpn7flp4slnp99mavpa331lv9q8a";
+    sha256 = "19kj7mziwkfcf9kkwph05jh5vlkfqpyrpxdk5gdf2swg07w1ld35";
   };
 
   meta = with stdenv.lib; {

From e4c54f1cc87e9099e7bb3ca432ecaba406bcf2aa Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 15 Oct 2018 01:14:26 -0500
Subject: [PATCH 3076/3253] termdown: 1.11.0 -> 1.14.1 (#48443)

---
 pkgs/applications/misc/termdown/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix
index 631fc08e95ee..65963f9aa34f 100644
--- a/pkgs/applications/misc/termdown/default.nix
+++ b/pkgs/applications/misc/termdown/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name    = "termdown-${version}";
-  version = "1.11.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
-    rev    = "d1e3504e02ad49013595112cb03fbf175822e58d";
-    sha256 = "1i6fxymg52q95n0cbm4imdxh6yvpj3q57yf7w9z5d9pr35cf1iq5";
+    rev    = version;
+    sha256 = "0jgjzglna0gwp0j31l48pny69szslczl13aahwjfjypkv9lx8w2a";
     repo   = "termdown";
     owner  = "trehn";
   };

From 0d7ed1b771600b5fc66ff650dee5a435054a0465 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 13 Oct 2018 19:18:55 +0200
Subject: [PATCH 3077/3253] spectmorph: init at 0.4.1

---
 .../applications/audio/spectmorph/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/audio/spectmorph/default.nix

diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
new file mode 100644
index 000000000000..9557770418e8
--- /dev/null
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libjack2, lv2, glib, qt5, libao, cairo, libsndfile, fftwFloat }:
+
+stdenv.mkDerivation rec {
+  name = "spectmorph-${version}";
+  version = "0.4.1";
+  src = fetchurl {
+    url = "http://spectmorph.org/files/releases/${name}.tar.bz2";
+    sha256 = "0z00yvv3jl8qsx6bz9msmg09mdnj5r5d4ws5bmnylwxk182whbrv";
+  };
+
+  buildInputs = [  libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds";
+    homepage = http://spectmorph.org;
+    license = licenses.gpl3;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eaed48e6d9fd..124c9f36e532 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17124,6 +17124,8 @@ with pkgs;
 
   singularity = callPackage ../applications/virtualization/singularity { };
 
+  spectmorph = callPackage ../applications/audio/spectmorph { };
+
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
   spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { };

From 3653909bb94711ab83e8fbc36976873e3a594cab Mon Sep 17 00:00:00 2001
From: ryan4729 <ryan4729@example.com>
Date: Mon, 15 Oct 2018 00:22:24 -0700
Subject: [PATCH 3078/3253] protobuf3: support cross compilation

Provide a native c compiler, which, and protoc
---
 pkgs/development/libraries/protobuf/3.1.nix   |  4 ++-
 pkgs/development/libraries/protobuf/3.4.nix   |  4 ++-
 pkgs/development/libraries/protobuf/3.5.nix   |  4 ++-
 pkgs/development/libraries/protobuf/3.6.nix   |  4 ++-
 .../libraries/protobuf/generic-v3.nix         |  9 ++++--
 pkgs/top-level/all-packages.nix               | 28 ++++++++++++++++---
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix
index 91ef87512c84..2af2d547d70b 100644
--- a/pkgs/development/libraries/protobuf/3.1.nix
+++ b/pkgs/development/libraries/protobuf/3.1.nix
@@ -1,6 +1,8 @@
-{ callPackage, ... }:
+{ callPackage, externalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.1.0";
   sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
+  externalProtoc = externalProtoc;
+  buildProtobuf = buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix
index 5a9034a56a80..c7e4153b2bc1 100644
--- a/pkgs/development/libraries/protobuf/3.4.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,6 +1,8 @@
-{ callPackage, lib, ... }:
+{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.4.1";
   sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
+  externalProtoc = externalProtoc;
+  buildProtobuf = buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix
index db9cb6f0371b..2313067a2ac9 100644
--- a/pkgs/development/libraries/protobuf/3.5.nix
+++ b/pkgs/development/libraries/protobuf/3.5.nix
@@ -1,6 +1,8 @@
-{ callPackage, lib, ... }:
+{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.5.1.1";
   sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
+  externalProtoc = externalProtoc;
+  buildProtobuf = buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
index 0009209d9cef..b52cbbfe06e0 100644
--- a/pkgs/development/libraries/protobuf/3.6.nix
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -1,6 +1,8 @@
-{ callPackage, ... }:
+{ callPackage, externalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.6.1";
   sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
+  externalProtoc = externalProtoc;
+  buildProtobuf = buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 79e4c387cdf5..c810558a070b 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,6 +1,8 @@
 { stdenv
 , fetchFromGitHub
-, autoreconfHook, zlib, gmock
+, autoreconfHook, zlib, gmock, which, buildPackages
+, externalProtoc
+, buildProtobuf ? null
 , version, sha256
 , ...
 }:
@@ -28,8 +30,11 @@ stdenv.mkDerivation rec {
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
+                      ++ stdenv.lib.optional externalProtoc [ buildProtobuf ];
+
   buildInputs = [ zlib ];
+  configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 124c9f36e532..6fff2cd66f0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11726,10 +11726,30 @@ with pkgs;
 
   protobuf = protobuf3_6;
 
-  protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
-  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
-  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
-  protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
+  protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix {
+    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
+                    then buildPackages.protobuf3_6
+                    else null;
+  };
+  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix {
+    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
+                    then buildPackages.protobuf3_5
+                    else null;
+  };
+  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix {
+    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
+                    then buildPackages.protobuf3_4
+                    else null;
+  };
+  protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix {
+    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
+                    then buildPackages.protobuf3_1
+                    else null;
+  };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 
   protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };

From f4541316be0be32f4e3f36a34b60ab28b89bcb97 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@gmail.com>
Date: Mon, 15 Oct 2018 10:22:54 +0200
Subject: [PATCH 3079/3253] staruml: fix download URL

---
 pkgs/tools/misc/staruml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 486634452ae9..a7518625771f 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
 
   src =
     if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
-      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
+      url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb";
       sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
     } else fetchurl {
-      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
+      url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb";
       sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
     };
 

From 1a3ae02e669f63fd3951bd40b41e75dbe09d516f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Oct 2018 10:25:20 +0200
Subject: [PATCH 3080/3253] pythonPackages.emoji: 0.5.0 -> 0.5.1

---
 pkgs/development/python-modules/emoji/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
index 2c3b7cc05523..019c29d79cd4 100644
--- a/pkgs/development/python-modules/emoji/default.nix
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "emoji";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "001b92b9c8a157e1ca49187745fa450513bc8b31c87328dfd83d674b9d7dfa63";
+    sha256 = "0gmdcdvh21v33ldg8kbxi7lph7znl2zdz1ic45100z4hx65w1sd9";
   };
 
   checkInputs = [ nose ];

From ff473c9ec7aeaec73058b5f2a171dfed7d47c811 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Oct 2018 10:31:10 +0200
Subject: [PATCH 3081/3253] pythonPackages.jsonrpclib: move expression to
 python-modules

---
 .../python-modules/jsonrpclib/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +-----------------
 2 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonrpclib/default.nix

diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix
new file mode 100644
index 000000000000..9f3efdf627ef
--- /dev/null
+++ b/pkgs/development/python-modules/jsonrpclib/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, cjson }:
+
+buildPythonPackage rec {
+  pname = "jsonrpclib";
+  version = "0.1.7";
+
+  disabled = !isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
+  };
+
+  propagatedBuildInputs = [ cjson ];
+
+  meta = {
+    description = "JSON RPC client library";
+    homepage = https://pypi.python.org/pypi/jsonrpclib/;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.joachifm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 116226428239..8fb12c45036b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2835,26 +2835,7 @@ in {
     };
   };
 
-  jsonrpclib = buildPythonPackage rec {
-    name = "jsonrpclib-${version}";
-    version = "0.1.7";
-
-    disabled = !isPy27;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz";
-      sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
-    };
-
-    propagatedBuildInputs = with self; [ cjson ];
-
-    meta = {
-      description = "JSON RPC client library";
-      homepage = https://pypi.python.org/pypi/jsonrpclib/;
-      license = stdenv.lib.licenses.asl20;
-      maintainers = [ stdenv.lib.maintainers.joachifm ];
-    };
-  };
+  jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };
 
   jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {};
 

From 12ededf3d84dc3b4e1cf4845655c56fabfc8d5d2 Mon Sep 17 00:00:00 2001
From: ryan4729 <ryan4729@example.com>
Date: Mon, 15 Oct 2018 01:57:47 -0700
Subject: [PATCH 3082/3253] protobuf3: fix parameter naming

---
 pkgs/development/libraries/protobuf/3.1.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.4.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.5.nix        | 5 ++---
 pkgs/development/libraries/protobuf/3.6.nix        | 5 ++---
 pkgs/development/libraries/protobuf/generic-v3.nix | 6 +++---
 pkgs/top-level/all-packages.nix                    | 8 ++++----
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix
index 2af2d547d70b..79e3711ff104 100644
--- a/pkgs/development/libraries/protobuf/3.1.nix
+++ b/pkgs/development/libraries/protobuf/3.1.nix
@@ -1,8 +1,7 @@
-{ callPackage, externalProtoc, buildProtobuf, ... }:
+{ callPackage, useExternalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.1.0";
   sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix
index c7e4153b2bc1..a80517250f5d 100644
--- a/pkgs/development/libraries/protobuf/3.4.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,8 +1,7 @@
-{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.4.1";
   sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix
index 2313067a2ac9..8558e60a5e86 100644
--- a/pkgs/development/libraries/protobuf/3.5.nix
+++ b/pkgs/development/libraries/protobuf/3.5.nix
@@ -1,8 +1,7 @@
-{ callPackage, lib, externalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.5.1.1";
   sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
index b52cbbfe06e0..a3fac7eb0641 100644
--- a/pkgs/development/libraries/protobuf/3.6.nix
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -1,8 +1,7 @@
-{ callPackage, externalProtoc, buildProtobuf, ... }:
+{ callPackage, useExternalProtoc, buildProtobuf, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.6.1";
   sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
-  externalProtoc = externalProtoc;
-  buildProtobuf = buildProtobuf;
+  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index c810558a070b..3db4571d8bad 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook, zlib, gmock, which, buildPackages
-, externalProtoc
+, useExternalProtoc
 , buildProtobuf ? null
 , version, sha256
 , ...
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
-                      ++ stdenv.lib.optional externalProtoc [ buildProtobuf ];
+                      ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ];
 
   buildInputs = [ zlib ];
-  configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
+  configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fff2cd66f0a..65e11ac65325 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11727,25 +11727,25 @@ with pkgs;
   protobuf = protobuf3_6;
 
   protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_6
                     else null;
   };
   protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_5
                     else null;
   };
   protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_4
                     else null;
   };
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix {
-    externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
+    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
     buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
                     then buildPackages.protobuf3_1
                     else null;

From 7d20acdbcd6311d4ec86b8665b535320b409fa57 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 9 Oct 2018 16:50:55 +0900
Subject: [PATCH 3083/3253] apvlv: add .desktop file

---
 pkgs/applications/misc/apvlv/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index eb35eb9cf73b..2d9ea5e3574b 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/doc/apvlv/
     cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
     cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
+  ''
+  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    install -D ../apvlv.desktop $out/share/applications/apvlv.desktop
   '';
 
   meta = with stdenv.lib; {

From 069bf7aee30faf7b3ed773cfae2154d761b2d6c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Oct 2018 11:55:19 +0200
Subject: [PATCH 3084/3253] ghc: add new 8.4.4 version

---
 pkgs/development/compilers/ghc/8.4.4.nix | 247 +++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix      |  10 +
 2 files changed, 257 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.4.4.nix

diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
new file mode 100644
index 000000000000..0588d7fba921
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -0,0 +1,247 @@
+{ stdenv, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+
+, libiconv ? null, ncurses
+
+, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, # LLVM is conceptually a run-time-only depedendency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+, # Whether to backport https://phabricator.haskell.org/D4388 for
+  # deterministic profiling symbol names, at the cost of a slightly
+  # non-standard GHC API
+  deterministicProfiling ? false
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+    HADDOCK_DOCS = NO
+    BUILD_SPHINX_HTML = NO
+    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget =
+    if hostPlatform == buildPlatform then
+      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
+    else assert targetPlatform == hostPlatform; # build != host == target
+      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+  version = "8.4.4";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  patches = [(fetchpatch {
+    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+    extraPrefix = "utils/hsc2hs/";
+    stripLen = 1;
+  }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
+    url = "http://tarballs.nixos.org/sha256/${sha256}";
+    name = "D5123.diff";
+    sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+  })] ++ stdenv.lib.optional deterministicProfiling
+    (fetchpatch rec {
+      url = "http://tarballs.nixos.org/sha256/${sha256}";
+      name = "D4388.diff";
+      sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
+    })
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+
+  postPatch = "patchShebangs .";
+
+  # GHC is a bit confused on its cross terminology.
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+    echo -n "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+  '';
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ]
+    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
+    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = libDeps hostPlatform;
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ];
+
+  postInstall = ''
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
+
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+    done
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+    inherit enableShared;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-8.4.4";
+  };
+
+  meta = {
+    homepage = http://haskell.org/ghc;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6bdcaf49af91..e654b35d258d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -69,6 +69,11 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
+    ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
+      bootPkgs = packages.ghc821Binary;
+      buildLlvmPackages = buildPackages.llvmPackages_5;
+      llvmPackages = pkgs.llvmPackages_5;
+    };
     ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix {
       bootPkgs = packages.ghc822;
       buildLlvmPackages = buildPackages.llvmPackages_6;
@@ -153,6 +158,11 @@ in {
       ghc = bh.compiler.ghc843;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
     };
+    ghc844 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc844;
+      ghc = bh.compiler.ghc844;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
+    };
     ghc861 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc861;
       ghc = bh.compiler.ghc861;

From 1f9188b708da7d2ea973a840ac086e6542ed0d2a Mon Sep 17 00:00:00 2001
From: ryan4729 <ryan4729@example.com>
Date: Mon, 15 Oct 2018 03:01:29 -0700
Subject: [PATCH 3085/3253] protobuf3: clean up cross compile

---
 pkgs/development/libraries/protobuf/3.1.nix   |  3 +-
 pkgs/development/libraries/protobuf/3.4.nix   |  3 +-
 pkgs/development/libraries/protobuf/3.5.nix   |  3 +-
 pkgs/development/libraries/protobuf/3.6.nix   |  3 +-
 .../libraries/protobuf/generic-v3.nix         | 14 ++++++----
 pkgs/top-level/all-packages.nix               | 28 +++----------------
 6 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix
index 79e3711ff104..91ef87512c84 100644
--- a/pkgs/development/libraries/protobuf/3.1.nix
+++ b/pkgs/development/libraries/protobuf/3.1.nix
@@ -1,7 +1,6 @@
-{ callPackage, useExternalProtoc, buildProtobuf, ... }:
+{ callPackage, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.1.0";
   sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
-  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix
index a80517250f5d..5a9034a56a80 100644
--- a/pkgs/development/libraries/protobuf/3.4.nix
+++ b/pkgs/development/libraries/protobuf/3.4.nix
@@ -1,7 +1,6 @@
-{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.4.1";
   sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
-  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix
index 8558e60a5e86..db9cb6f0371b 100644
--- a/pkgs/development/libraries/protobuf/3.5.nix
+++ b/pkgs/development/libraries/protobuf/3.5.nix
@@ -1,7 +1,6 @@
-{ callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
+{ callPackage, lib, ... }:
 
 lib.overrideDerivation (callPackage ./generic-v3.nix {
   version = "3.5.1.1";
   sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
-  inherit useExternalProtoc buildProtobuf;
 }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
index a3fac7eb0641..0009209d9cef 100644
--- a/pkgs/development/libraries/protobuf/3.6.nix
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -1,7 +1,6 @@
-{ callPackage, useExternalProtoc, buildProtobuf, ... }:
+{ callPackage, ... }:
 
 callPackage ./generic-v3.nix {
   version = "3.6.1";
   sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
-  inherit useExternalProtoc buildProtobuf;
 }
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 3db4571d8bad..43e5e5d799d1 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,13 +1,12 @@
 { stdenv
 , fetchFromGitHub
 , autoreconfHook, zlib, gmock, which, buildPackages
-, useExternalProtoc
-, buildProtobuf ? null
 , version, sha256
 , ...
 }:
 
-stdenv.mkDerivation rec {
+let
+mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
   name = "protobuf-${version}";
 
   # make sure you test also -A pythonPackages.protobuf
@@ -31,10 +30,10 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
-                      ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ];
+                      ++ (if buildProtobuf == null then [] else [ buildProtobuf ]);
 
   buildInputs = [ zlib ];
-  configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
+  configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
 
   enableParallelBuilding = true;
 
@@ -59,4 +58,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru.version = version;
-}
+};
+in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
+                        then (mkProtobufDerivation null buildPackages.stdenv)
+                        else null) stdenv
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65e11ac65325..124c9f36e532 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11726,30 +11726,10 @@ with pkgs;
 
   protobuf = protobuf3_6;
 
-  protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix {
-    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
-    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
-                    then buildPackages.protobuf3_6
-                    else null;
-  };
-  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix {
-    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
-    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
-                    then buildPackages.protobuf3_5
-                    else null;
-  };
-  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix {
-    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
-    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
-                    then buildPackages.protobuf3_4
-                    else null;
-  };
-  protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix {
-    useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
-    buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
-                    then buildPackages.protobuf3_1
-                    else null;
-  };
+  protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
+  protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
+  protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };
+  protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 
   protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };

From ad6ee9c61f2263334ece09830335002ee3d7f4b0 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 15 Oct 2018 19:10:30 +0900
Subject: [PATCH 3086/3253] python3Packages.cmd2: 0.9.4 -> 0.9.6

---
 .../python-modules/cmd2/default.nix           | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index 4217d193cfea..019ab4e6cdd8 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k
 , pyperclip, six, pyparsing, vim, wcwidth, colorama
-, contextlib2 ? null, setuptools_scm
-, pytest, mock, which, glibcLocales
+, contextlib2 ? null, typing ? null, setuptools_scm
+, pytest, mock ? null, pytest-mock
+, which, glibcLocales
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.4";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0037dcf92331c63ae43e7e644536e646fff8be2fd5a83da06b3482f910f929c6";
+    sha256 = "0279p76n6yny6psys9fc6yjdrqiisbpmrl59a2vxy56hi7094kaw";
   };
 
   LC_ALL="en_US.UTF-8";
@@ -23,12 +24,6 @@ buildPythonPackage rec {
     export PATH=$(realpath bin):$PATH
   '';
 
-  checkInputs= [ pytest mock which vim glibcLocales ];
-  checkPhase = ''
-    # test_path_completion_user_expansion might be fixed in the next release
-    py.test -k 'not test_path_completion_user_expansion'
-  '';
-  doCheck = !stdenv.isDarwin;
   disabled = !isPy3k;
 
   buildInputs = [
@@ -42,9 +37,20 @@ buildPythonPackage rec {
     pyparsing
     wcwidth
   ]
-  ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2
+  ++ stdenv.lib.optionals (pythonOlder "3.5") [contextlib2 typing]
   ;
 
+
+  doCheck = !stdenv.isDarwin;
+  # pytest-cov
+  # argcomplete  will generate errors
+  checkInputs= [ pytest mock which vim glibcLocales pytest-mock ]
+        ++ stdenv.lib.optional (pythonOlder "3.6") [ mock ];
+  checkPhase = ''
+    # test_path_completion_user_expansion might be fixed in the next release
+    py.test -k 'not test_path_completion_user_expansion'
+  '';
+
   meta = with stdenv.lib; {
     description = "Enhancements for standard library's cmd module";
     homepage = https://github.com/python-cmd2/cmd2;

From 65a81afcf5ef9bc96c21089b370bece300849977 Mon Sep 17 00:00:00 2001
From: ryan4729 <ryan4729@example.com>
Date: Mon, 15 Oct 2018 03:13:20 -0700
Subject: [PATCH 3087/3253] protobuf3: remove unnecessary null check

---
 pkgs/development/libraries/protobuf/generic-v3.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 43e5e5d799d1..883dff56f2ee 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -29,8 +29,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
 
-  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
-                      ++ (if buildProtobuf == null then [] else [ buildProtobuf ]);
+  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
 
   buildInputs = [ zlib ];
   configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];

From 08cc85951e09135fb3c1ba1e0c043051381df8b4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 15 Oct 2018 13:28:24 +0300
Subject: [PATCH 3088/3253] saga: add mpickering as a co-maintainer after
 #39125

---
 pkgs/applications/gis/saga/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 10cec193cc0d..4738bfba14a8 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "System for Automated Geoscientific Analyses";
     homepage = http://www.saga-gis.org;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.michelk ];
+    maintainers = with maintainers; [ michelk mpickering ];
     platforms = with platforms; unix;
   };
 }

From e04931e0190beeae354c753350dbf6d802a1eac7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Oct 2018 16:16:06 +0200
Subject: [PATCH 3089/3253] LTS Haskell 12.13

---
 .../configuration-hackage2nix.yaml            | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f68270ba772e..012afc545ab6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -45,7 +45,7 @@ default-package-overrides:
   - base-compat-batteries ==0.10.1
   # Newer versions don't work in LTS-12.x
   - cassava-megaparsec < 2
-  # LTS Haskell 12.12
+  # LTS Haskell 12.13
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -313,7 +313,7 @@ default-package-overrides:
   - bson ==0.3.2.6
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
-  - buffer-builder ==0.2.4.6
+  - buffer-builder ==0.2.4.7
   - buffer-pipe ==0.0
   - butcher ==1.3.2.0
   - butter ==0.1.0.6
@@ -354,7 +354,7 @@ default-package-overrides:
   - cast ==0.1.0.2
   - category ==0.2.0.1
   - cayley-client ==0.4.7
-  - cborg ==0.2.0.0
+  - cborg ==0.2.1.0
   - cereal ==0.5.7.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
@@ -439,7 +439,7 @@ default-package-overrides:
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0.3
+  - conduit ==1.3.1
   - conduit-algorithms ==0.0.8.2
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
@@ -461,6 +461,7 @@ default-package-overrides:
   - contravariant ==1.4.1
   - contravariant-extras ==0.3.4
   - control-bool ==0.2.1
+  - control-dsl ==0.2.1.1
   - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.1
   - convertible ==1.1.1.0
@@ -516,7 +517,7 @@ default-package-overrides:
   - currency ==0.2.0.0
   - cutter ==0.0
   - cyclotomic ==0.5.1
-  - czipwith ==1.0.1.0
+  - czipwith ==1.0.1.1
   - darcs ==2.14.1
   - data-accessor ==0.2.2.8
   - data-accessor-mtl ==0.2.0.4
@@ -587,7 +588,7 @@ default-package-overrides:
   - diagrams-html5 ==1.4.1
   - diagrams-lib ==1.4.2.3
   - diagrams-postscript ==1.4.1
-  - diagrams-rasterific ==1.4.1
+  - diagrams-rasterific ==1.4.1.1
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.2
   - di-core ==1.0.3
@@ -813,7 +814,7 @@ default-package-overrides:
   - genvalidity-property ==0.2.1.1
   - genvalidity-scientific ==0.2.1.0
   - genvalidity-text ==0.5.1.0
-  - genvalidity-time ==0.2.1.0
+  - genvalidity-time ==0.2.1.1
   - genvalidity-unordered-containers ==0.2.0.3
   - genvalidity-uuid ==0.1.0.2
   - genvalidity-vector ==0.2.0.2
@@ -905,8 +906,8 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.3.1
   - haskeline ==0.7.4.3
-  - haskell-gi ==0.21.4
-  - haskell-gi-base ==0.21.3
+  - haskell-gi ==0.21.5
+  - haskell-gi-base ==0.21.4
   - haskell-gi-overloading ==1.0
   - haskell-lexer ==1.0.2
   - haskell-lsp ==0.2.2.0
@@ -1003,8 +1004,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.6
   - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
@@ -1266,7 +1267,7 @@ default-package-overrides:
   - llvm-hs-pretty ==0.5.0.0
   - llvm-hs-pure ==6.2.1
   - lmdb ==0.2.5
-  - load-env ==0.2.0.1
+  - load-env ==0.2.0.2
   - locators ==0.2.4.4
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.3.1
@@ -1339,7 +1340,7 @@ default-package-overrides:
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
   - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.2
+  - milena ==0.5.2.3
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.8
@@ -1502,7 +1503,7 @@ default-package-overrides:
   - OpenGL ==3.0.2.2
   - OpenGLRaw ==3.3.1.0
   - openpgp-asciiarmor ==0.1.1
-  - opensource ==0.1.0.0
+  - opensource ==0.1.1.0
   - openssl-streams ==1.2.1.3
   - open-witness ==0.4.0.1
   - operational ==0.2.3.5
@@ -1655,7 +1656,7 @@ default-package-overrides:
   - proto-lens ==0.3.1.0
   - proto-lens-arbitrary ==0.1.2.2
   - proto-lens-combinators ==0.1.0.11
-  - proto-lens-optparse ==0.1.1.3
+  - proto-lens-optparse ==0.1.1.4
   - proto-lens-protobuf-types ==0.3.0.1
   - proto-lens-protoc ==0.3.1.2
   - protolude ==0.2.2
@@ -1695,7 +1696,7 @@ default-package-overrides:
   - rank1dynamic ==0.4.0
   - rank2classes ==1.1.0.1
   - Rasterific ==0.7.4
-  - rasterific-svg ==0.3.3.1
+  - rasterific-svg ==0.3.3.2
   - ratel ==1.0.5
   - ratel-wai ==1.0.3
   - ratio-int ==0.1.2
@@ -1747,7 +1748,7 @@ default-package-overrides:
   - reroute ==0.5.0.0
   - resolv ==0.1.1.1
   - resource-pool ==0.2.3.2
-  - resourcet ==1.2.1
+  - resourcet ==1.2.2
   - rest-stringmap ==0.2.0.7
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
@@ -1775,7 +1776,7 @@ default-package-overrides:
   - safeio ==0.0.5.0
   - safe-money ==0.6
   - SafeSemaphore ==0.10.1
-  - saltine ==0.1.0.1
+  - saltine ==0.1.0.2
   - salve ==1.0.6
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
@@ -1784,8 +1785,8 @@ default-package-overrides:
   - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.3.17
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1881,8 +1882,8 @@ default-package-overrides:
   - siphash ==1.0.3
   - size-based ==0.1.1.0
   - skein ==1.0.9.4
-  - skylighting ==0.7.3
-  - skylighting-core ==0.7.3
+  - skylighting ==0.7.4
+  - skylighting-core ==0.7.4
   - slack-web ==0.2.0.6
   - slave-thread ==1.0.2
   - smallcheck ==1.1.5
@@ -1931,7 +1932,7 @@ default-package-overrides:
   - statestack ==0.2.0.5
   - StateVar ==1.1.1.1
   - static-canvas ==0.2.0.3
-  - static-text ==0.2.0.2
+  - static-text ==0.2.0.3
   - statistics ==0.14.0.2
   - stb-image-redux ==0.2.1.2
   - step-function ==0.2
@@ -1964,7 +1965,7 @@ default-package-overrides:
   - streams ==3.3
   - strict ==0.3.2
   - strict-base-types ==0.6.1
-  - strict-concurrency ==0.2.4.2
+  - strict-concurrency ==0.2.4.3
   - stringbuilder ==0.5.1
   - string-class ==0.1.7.0
   - string-combinators ==0.6.0.5
@@ -1981,7 +1982,7 @@ default-package-overrides:
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.1
   - SVGFonts ==1.7
-  - svg-tree ==0.6.2.2
+  - svg-tree ==0.6.2.3
   - swagger ==0.3.0
   - swagger2 ==2.2.2
   - swish ==0.9.2.1
@@ -2006,7 +2007,7 @@ default-package-overrides:
   - tar ==0.5.1.0
   - tar-conduit ==0.2.5
   - tardis ==0.4.1.0
-  - tasty ==1.1.0.3
+  - tasty ==1.1.0.4
   - tasty-ant-xml ==1.1.4
   - tasty-dejafu ==1.2.0.7
   - tasty-discover ==4.2.1
@@ -2074,7 +2075,7 @@ default-package-overrides:
   - thread-local-storage ==0.2
   - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
-  - threepenny-gui ==0.8.2.4
+  - threepenny-gui ==0.8.3.0
   - th-reify-compat ==0.0.1.5
   - th-reify-many ==0.1.8
   - throttle-io-stream ==0.2.0.1
@@ -2174,7 +2175,7 @@ default-package-overrides:
   - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.1
   - unsafe ==0.0
-  - uri-bytestring ==0.3.2.0
+  - uri-bytestring ==0.3.2.1
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - urlpath ==9.0.0
@@ -2339,7 +2340,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.9.1
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.3
-  - yesod-core ==1.6.6
+  - yesod-core ==1.6.8
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
@@ -2360,7 +2361,7 @@ default-package-overrides:
   - yi-language ==0.17.1
   - yi-rope ==0.11
   - yjtools ==0.9.18
-  - yoga ==0.0.0.2
+  - yoga ==0.0.0.5
   - youtube ==0.2.1.1
   - zero ==0.1.4
   - zeromq4-haskell ==0.7.0

From 5dbe6ac45b94877c6baaa5d1cd9d00dc70f97663 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Oct 2018 12:33:13 +0200
Subject: [PATCH 3090/3253] hackage2nix: disable failing Hydra builds

---
 .../configuration-hackage2nix.yaml            | 72 +++++++++++++++++--
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 012afc545ab6..8b469e6c0f5e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2886,13 +2886,14 @@ dont-distribute-packages:
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii-string:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-string:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-table:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   asciidiagram:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2905,7 +2906,7 @@ dont-distribute-packages:
   ast-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  async-combinators:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-dejafu:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2931,11 +2932,13 @@ dont-distribute-packages:
   attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-ip:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-trans:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attoparsec-uri:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-varword:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   attosplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2945,7 +2948,7 @@ dont-distribute-packages:
   augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aura:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aura:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   authenticate-ldap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2987,7 +2990,7 @@ dont-distribute-packages:
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  axel:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  axel:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3024,6 +3027,7 @@ dont-distribute-packages:
   base-feature-macros:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-noprelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   baserock-schema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3050,6 +3054,7 @@ dont-distribute-packages:
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   belka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bench-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bench-show:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   benchpress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3287,6 +3292,7 @@ dont-distribute-packages:
   c2ats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-cargs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3355,6 +3361,7 @@ dont-distribute-packages:
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capability:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   capnp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capped-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3499,6 +3506,7 @@ dont-distribute-packages:
   clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classify-frog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-miso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3560,6 +3568,7 @@ dont-distribute-packages:
   CMQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  co-log:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   coalpit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-beam:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3702,6 +3711,7 @@ dont-distribute-packages:
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   contiguous-checked:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contiguous-fft:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   contiguous:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3827,6 +3837,8 @@ dont-distribute-packages:
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cursedcsv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cursor-gen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cursor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3914,6 +3926,7 @@ dont-distribute-packages:
   datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dawdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DBFunctor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBlimited:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4011,6 +4024,7 @@ dont-distribute-packages:
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-lex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-to-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   di-df1:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4263,6 +4277,7 @@ dont-distribute-packages:
   engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  entwine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4349,8 +4364,10 @@ dont-distribute-packages:
   exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exinst-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exinst-serialise:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4365,6 +4382,8 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions-z3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4577,6 +4596,7 @@ dont-distribute-packages:
   fractals:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames-beam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Frames-dsv:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5054,6 +5074,7 @@ dont-distribute-packages:
   graphics-formats-collada:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphmod-plugin:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5196,6 +5217,7 @@ dont-distribute-packages:
   hakyll-contrib-links:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-convert:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-dhall:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-ogmarkup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shortcode:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5208,6 +5230,7 @@ dont-distribute-packages:
   halma-telegram-bot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   halves:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hamilton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5311,6 +5334,8 @@ dont-distribute-packages:
   haskell-abci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-aliyun:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-awk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-bitmex-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-bitmex-rest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-brainfuck:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-cnc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-coffee:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5567,6 +5592,7 @@ dont-distribute-packages:
   heterolist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetris:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heukarya:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hevm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hevolisa-dph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hevolisa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexchat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5691,6 +5717,8 @@ dont-distribute-packages:
   HLearn-datastructures:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-iadd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-irr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5716,6 +5744,7 @@ dont-distribute-packages:
   hmatrix-sundials:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-vector-sized:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5840,6 +5869,7 @@ dont-distribute-packages:
   HRay:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hricket:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hricket:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hriemann:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-graf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-hist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5954,6 +5984,7 @@ dont-distribute-packages:
   hsparql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsParrot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-dirstream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-match:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6079,6 +6110,7 @@ dont-distribute-packages:
   hVOIDP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-dsv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-prim-bits:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-simd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hweblib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6255,6 +6287,8 @@ dont-distribute-packages:
   introduction:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  invertible-hxt:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  invertible:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   IOR:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6263,6 +6297,7 @@ dont-distribute-packages:
   iothread:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2location:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipopt-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6425,6 +6460,7 @@ dont-distribute-packages:
   katip-syslog:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kazura-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keccak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6647,6 +6683,7 @@ dont-distribute-packages:
   libxml-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   licensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  life-sync:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-base-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6871,6 +6908,7 @@ dont-distribute-packages:
   markdown2svg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   marked-pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6992,6 +7030,7 @@ dont-distribute-packages:
   minirotate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ministg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   minst-idx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mios:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mirror-tweet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   missing-py2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MissingPy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7058,6 +7097,7 @@ dont-distribute-packages:
   MonadCatchIO-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadiccp-gecode:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadIO:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monadius:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadLab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadLib-compose:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7095,6 +7135,8 @@ dont-distribute-packages:
   morfeusz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   morph:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  moto-postgresql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  moto:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   motor-diagrams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   motor-reflection:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   motor:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7267,6 +7309,7 @@ dont-distribute-packages:
   network-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-hans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-messagepack-rpc-websocket:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-minihttp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-msgpack-rpc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7451,6 +7494,7 @@ dont-distribute-packages:
   optional:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   optparse-applicative-simple:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   optparse-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchestrate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrchestrateDB:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid-demo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7617,6 +7661,7 @@ dont-distribute-packages:
   persistent-mysql-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-odbc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-vector:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7707,6 +7752,7 @@ dont-distribute-packages:
   plat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plex:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   plocketed:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7773,6 +7819,7 @@ dont-distribute-packages:
   postgresql-simple-sop:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-url:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7835,6 +7882,7 @@ dont-distribute-packages:
   priority-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   priority-sync:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prizm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   proc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8190,6 +8238,7 @@ dont-distribute-packages:
   reproject:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   req-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rerebase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reserve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   reservoir:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8234,6 +8283,7 @@ dont-distribute-packages:
   rfc-servant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc3339:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rhine-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhythm-game-tutorial:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   RichConditional:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8403,6 +8453,7 @@ dont-distribute-packages:
   scrape-changes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ScratchFs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   script-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SCRIPTWriter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrobble:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8936,6 +8987,7 @@ dont-distribute-packages:
   streaming-cassava:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-fft:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-osm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-pcap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-png:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8977,6 +9029,7 @@ dont-distribute-packages:
   suffixarray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   suitable:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  summoner:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sump:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunlight:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-compiler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9226,6 +9279,7 @@ dont-distribute-packages:
   thrift:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  throwable-exceptions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   thumbnail-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9330,6 +9384,7 @@ dont-distribute-packages:
   translatable-intset:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate-cli:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trasa-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-server:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9444,6 +9499,7 @@ dont-distribute-packages:
   types-compat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   typesafe-precure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   typescript-docs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typograffiti:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tyro:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   u2f:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   uAgda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9464,6 +9520,7 @@ dont-distribute-packages:
   unboxed-containers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbreak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unexceptionalio-trans:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unfix-binders:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-events:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-graphs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-htk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9516,6 +9573,7 @@ dont-distribute-packages:
   uri-enumerator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-parse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-template:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   url-decoders:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   url-generic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9523,6 +9581,7 @@ dont-distribute-packages:
   urldecode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urlpath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9590,6 +9649,7 @@ dont-distribute-packages:
   vector-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-clock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-functorlazy:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-heterogenous:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-instances-collections:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9697,10 +9757,12 @@ dont-distribute-packages:
   WaveFront:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavesurfer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavy:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  weak-bag:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-css:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-encodings:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-fpco:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-inv-route:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-mongrel2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-output:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-page:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9784,6 +9846,7 @@ dont-distribute-packages:
   wrecker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wreq-sb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ws:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsjtx-udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9894,6 +9957,7 @@ dont-distribute-packages:
   yahoo-web-search:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yak:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-servant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-odbc:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-web:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]

From 21daeb205961938e9c8f408a3f8405e2dd33ad88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Oct 2018 02:31:32 +0200
Subject: [PATCH 3091/3253] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.11.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/15d56e428a051c01c0e7c5e516e76ff89bf88cdb.
---
 .../haskell-modules/hackage-packages.nix      | 2155 +++++++++++++----
 1 file changed, 1659 insertions(+), 496 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 352d97d497ab..e7a5b5b1626d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3515,6 +3515,36 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "DBFunctor" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, cereal, containers
+     , deepseq, either, MissingH, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "DBFunctor";
+       version = "0.1.0.0";
+       sha256 = "0add2hbk8jz8pmmk1in7z3rc4r7xgks0b5xqz113lzf4abnpiac7";
+       revision = "1";
+       editedCabalFile = "1gfadkmnf1c151kkcq41ca2vx36drp2kfhq74ybhvdz32kbrvwq3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cassava cereal containers deepseq either MissingH
+         text transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava cereal containers deepseq either MissingH
+         text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring cassava cereal containers deepseq either MissingH
+         text transformers unordered-containers vector
+       ];
+       description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "DBlimited" = callPackage
     ({ mkDerivation, base, containers, parsec }:
      mkDerivation {
@@ -5863,6 +5893,7 @@ self: {
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frank" = callPackage
@@ -7281,15 +7312,18 @@ self: {
      }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
-     , parsec, postgresql, time, utf8-string
+    ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
+     , old-time, parsec, postgresql, time, utf8-string
      }:
      mkDerivation {
        pname = "HDBC-postgresql";
        version = "2.3.2.5";
        sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8";
+       revision = "1";
+       editedCabalFile = "1myhqsn3kk21pchlwf9s6vxggl59s6vmhmbx2539ad4jvnfy2ijx";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
@@ -8598,8 +8632,8 @@ self: {
        pname = "HTTP";
        version = "4000.3.12";
        sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
-       revision = "1";
-       editedCabalFile = "108i60vy6r7k1yaraw9g6xc7r82nwb9h84vsk9q5s01z980c7kk4";
+       revision = "2";
+       editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -11838,8 +11872,8 @@ self: {
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "MASMGen";
-       version = "0.5.0.0";
-       sha256 = "1fdskc92m5bv5m19irhv3b8mr4wyzv1xnwaxgnd3ynmjgrrb127c";
+       version = "0.7.0.0";
+       sha256 = "0b5vscpdf252gqi7qpsz9ia4101iik3bgrcdawz1mlinlv1zaccv";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
@@ -12281,6 +12315,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "MissingH_1_4_1_0" = callPackage
+    ({ mkDerivation, array, base, containers, directory
+     , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
+     , old-locale, old-time, parsec, process, QuickCheck, random
+     , regex-compat, testpack, time, unix
+     }:
+     mkDerivation {
+       pname = "MissingH";
+       version = "1.4.1.0";
+       sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29";
+       libraryHaskellDepends = [
+         array base containers directory filepath hslogger HUnit mtl network
+         old-locale old-time parsec process random regex-compat time unix
+       ];
+       testHaskellDepends = [
+         array base containers directory errorcall-eq-instance filepath
+         hslogger HUnit mtl network old-locale old-time parsec process
+         QuickCheck random regex-compat testpack time unix
+       ];
+       description = "Large utility library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MissingK" = callPackage
     ({ mkDerivation, base, glib, template-haskell }:
      mkDerivation {
@@ -15532,6 +15590,8 @@ self: {
        pname = "Rasterific";
        version = "0.7.4.1";
        sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b";
+       revision = "1";
+       editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2";
        libraryHaskellDepends = [
          base bytestring containers dlist FontyFruity free JuicyPixels mtl
          primitive transformers vector vector-algorithms
@@ -15634,8 +15694,8 @@ self: {
      }:
      mkDerivation {
        pname = "RepLib";
-       version = "0.5.4";
-       sha256 = "13c34k78fqvr3h1lvsa0kkwk2bv1cv3m27spp4429cafgbi4fr4q";
+       version = "0.5.4.1";
+       sha256 = "064avhz0x77yd5irvvs4sa1fcn8srb3n5sqbd4vmsjva6514jr9y";
        libraryHaskellDepends = [
          base containers mtl template-haskell transformers
        ];
@@ -15788,6 +15848,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SCRIPTWriter" = callPackage
+    ({ mkDerivation, array, base, binary, bitcoin-hs, bitcoin-script
+     , bytestring, containers, mtl, uu-tc
+     }:
+     mkDerivation {
+       pname = "SCRIPTWriter";
+       version = "1.0";
+       sha256 = "0333p5r2ms9yhkxgbhdrmhylszqq6xpr4hdvjgn62xwd6a4a1i3l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bitcoin-hs bitcoin-script bytestring containers
+         mtl uu-tc
+       ];
+       executableHaskellDepends = [ base ];
+       description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "SCalendar" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, scalendar
      , text, time
@@ -16767,8 +16847,8 @@ self: {
      }:
      mkDerivation {
        pname = "Slides";
-       version = "0.1.0.9";
-       sha256 = "0jfhbgk1i8gbpi2ka33r23q7336xnf6y4bxfszhs09bhvhsr95ia";
+       version = "0.1.0.10";
+       sha256 = "0w60zffs83d5xmhz0d12aip5xqgih495wfrah25d64f9fh6j4j0i";
        libraryHaskellDepends = [
          base colour diagrams-lib diagrams-svg file-embed regex-applicative
        ];
@@ -17370,15 +17450,15 @@ self: {
      }:
      mkDerivation {
        pname = "StrictCheck";
-       version = "0.1.1";
-       sha256 = "1mm1kyrrrwgxdjnafazggblcjlin3i8bjqrj6q0l7xrgllnqalv2";
+       version = "0.2.0";
+       sha256 = "11gr15c17134fddh3ms9m1z0hjsf8dqhk2z7vvd61gfzzpcx5xms";
        libraryHaskellDepends = [
          base bifunctors containers generics-sop QuickCheck template-haskell
        ];
        testHaskellDepends = [
          base deepseq generics-sop HUnit QuickCheck
        ];
-       description = "StrictCheck: Keep Your Laziness In Check";
+       description = "Keep Your Laziness In Check";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -20272,8 +20352,8 @@ self: {
        pname = "accelerate-io";
        version = "1.2.0.0";
        sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf";
-       revision = "1";
-       editedCabalFile = "0n1bch7rb2pvfqajjzaxrlw06f7vr583ckvn2ldr6lv59w1jrk3l";
+       revision = "2";
+       editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq";
        libraryHaskellDepends = [
          accelerate array base bmp bytestring primitive repa vector
        ];
@@ -21132,8 +21212,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
-       revision = "6";
-       editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3";
+       revision = "7";
+       editedCabalFile = "0z4l6j1q3y5zq4941bsb6ypkhfg3pyvb5gcmasymh2nj9g952xkd";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -22526,23 +22606,22 @@ self: {
   "aip" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, checkers
      , Crypto, directory, exceptions, filepath, HTTP, lens, network-uri
-     , optparse-applicative, parsec, parsers, QuickCheck, tagsoup
-     , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck, time
-     , transformers, unordered-containers, utf8-string
+     , optparse-applicative, parsec, parsers, process, QuickCheck
+     , semigroupoids, semigroups, tagsoup, tagsoup-selection, tasty
+     , tasty-hunit, tasty-quickcheck, time, transformers
+     , unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "aip";
-       version = "0.1.0";
-       sha256 = "0b2jr4z0mdkpqzay2c8m2zbbsrs5ia1l5m7zy02nh63ifl5avw2k";
-       revision = "1";
-       editedCabalFile = "13n79gq17kj5q81512j51gz0ld772anyxixfdx1q8inay4araplx";
+       version = "0.1.1";
+       sha256 = "05pv8m5wjzpj5wxsad6rzka9fcch5aakd73697ndaiwasqajvx3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring Crypto directory exceptions
          filepath HTTP lens network-uri optparse-applicative parsec parsers
-         tagsoup tagsoup-selection time transformers unordered-containers
-         utf8-string
+         process semigroupoids semigroups tagsoup tagsoup-selection time
+         transformers unordered-containers utf8-string
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -27348,8 +27427,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.5.1.1";
-       sha256 = "1251i3nz2ipg21qyys34ilxi1bnchf4a2v4571l54kaysk8p8lhi";
+       version = "0.6.0.0";
+       sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9";
        libraryHaskellDepends = [
          base containers mtl template-haskell vector
        ];
@@ -27361,6 +27440,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs-physics" = callPackage
+    ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
+     , template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs-physics";
+       version = "0.2.0.0";
+       sha256 = "17mbf06785mdn8pmy90hw92240zq889rh2dlv1sh45p44grr2h5c";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         apecs base containers inline-c linear template-haskell vector
+       ];
+       description = "2D physics for apecs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "apelsin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, filepath, glib, gtk, HTTP, mtl, network, process
@@ -29172,8 +29267,8 @@ self: {
      }:
      mkDerivation {
        pname = "asciidiagram";
-       version = "1.3.3.1";
-       sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly";
+       version = "1.3.3.2";
+       sha256 = "0kbf4jswdyvd0x4yk00ss4yjqla852rd64081lkf1xn7yi0k8d1b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29237,6 +29332,7 @@ self: {
          old-locale resourcet temporary-resourcet text thyme vector
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asil" = callPackage
@@ -30509,6 +30605,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-ip_0_0_3" = callPackage
@@ -30658,6 +30755,7 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-uri_0_0_6" = callPackage
@@ -32960,6 +33058,7 @@ self: {
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -34026,6 +34125,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bench-show" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
+     , directory, filepath, mwc-random, split, statistics, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "bench-show";
+       version = "0.2.0";
+       sha256 = "17d7dk5r697r9fls14labciwp3rwykv6n5mkhljrjszf2z2c6j65";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
+         mwc-random split statistics transformers vector
+       ];
+       testHaskellDepends = [ base split text ];
+       description = "Show, plot and compare benchmark results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -34725,6 +34843,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "binary-conduit_1_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, conduit, exceptions
+     , hspec, QuickCheck, quickcheck-assertions, resourcet, vector
+     }:
+     mkDerivation {
+       pname = "binary-conduit";
+       version = "1.3.1";
+       sha256 = "17yj8rn6fwzbv0z6lczrddv7mkr8906xg2pf2dlvmnwb97zw7004";
+       libraryHaskellDepends = [
+         base binary bytestring conduit exceptions vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring conduit hspec QuickCheck
+         quickcheck-assertions resourcet
+       ];
+       description = "data serialization/deserialization conduit library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-derive" = callPackage
     ({ mkDerivation, base, binary, ghc-prim }:
      mkDerivation {
@@ -34983,10 +35121,8 @@ self: {
     ({ mkDerivation, base, bytestring, cborg, serialise }:
      mkDerivation {
        pname = "binary-serialise-cbor";
-       version = "0.2.0.0";
-       sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv";
-       revision = "1";
-       editedCabalFile = "1dkranaa9fn81z0x75b1dblnph9d0pvzzz0jpz374lqsxaimqgp6";
+       version = "0.2.1.0";
+       sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854";
        libraryHaskellDepends = [ base bytestring cborg serialise ];
        description = "Yet Another Binary Serialisation Library (compatibility shim)";
        license = stdenv.lib.licenses.bsd3;
@@ -36143,10 +36279,8 @@ self: {
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "1.0.4";
-       sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c";
-       revision = "2";
-       editedCabalFile = "0r1fz9h92zyb7ryk8lngqlyl75djr8ngbcfrr9bbmz8img2ipb2a";
+       version = "1.1.0";
+       sha256 = "0sd12i3542hkvy7ijabc0y5dcf758diyvmdpi120wbvh0ay15gvy";
        libraryHaskellDepends = [
          async attoparsec base base-prelude bytestring containers exceptions
          hashable primitive stm text transformers unix unordered-containers
@@ -38401,6 +38535,8 @@ self: {
        pname = "boolean-normal-forms";
        version = "0.0.1";
        sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b";
+       revision = "1";
+       editedCabalFile = "1p31kqxp77xdhkszppmnzqgxp883vasrh5910qfif50lch39myfm";
        libraryHaskellDepends = [ base cond containers deepseq ];
        testHaskellDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
@@ -39684,8 +39820,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.4.6";
-       sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l";
+       version = "0.2.4.7";
+       sha256 = "0n1zb12zm86rm3jqpdh7j15w6dd1mii0fmaihkdqm0b1rv2zm2dk";
        libraryHaskellDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -39780,8 +39916,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.2.0";
-       sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl";
+       version = "0.0.2.1";
+       sha256 = "09vvckg6advf47ciq3cv2g06g13d2az1kinby5fpfz1wma7s1zjg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39854,8 +39990,8 @@ self: {
      }:
      mkDerivation {
        pname = "buildbox";
-       version = "2.2.1.1";
-       sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z";
+       version = "2.2.1.2";
+       sha256 = "10kasyr2rk8zm1dh7c2ka1djlxmb20lriphd9sm18z4fw3w82cxz";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions mtl old-locale
          process stm temporary text time
@@ -40266,8 +40402,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.3.1.0";
-       sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d";
+       version = "0.3.2.0";
+       sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41176,6 +41312,7 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -42940,6 +43077,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "capability" = callPackage
+    ({ mkDerivation, base, containers, dlist, exceptions, generic-lens
+     , hspec, lens, monad-control, monad-unlift, mtl, mutable-containers
+     , primitive, safe-exceptions, silently, streaming, temporary, text
+     , transformers, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "capability";
+       version = "0.1.0.0";
+       sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51";
+       libraryHaskellDepends = [
+         base dlist exceptions generic-lens lens monad-control monad-unlift
+         mtl mutable-containers primitive safe-exceptions streaming
+         transformers unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         base containers hspec lens mtl silently streaming temporary text
+         unliftio
+       ];
+       description = "Extensional capabilities and deriving combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "capataz" = callPackage
     ({ mkDerivation, async, base, bytestring, pretty-show
      , prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck
@@ -43803,8 +43964,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-streams";
-       version = "0.3.0.2";
-       sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna";
+       version = "0.3.0.3";
+       sha256 = "01s0h2mi9b4h3jy405jvz2an8w6fdvg370mizfk910anx7wsa3ix";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44158,10 +44319,8 @@ self: {
      }:
      mkDerivation {
        pname = "cbor-tool";
-       version = "0.2.0.0";
-       sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp";
-       revision = "1";
-       editedCabalFile = "08yd8qv9kalgr6hn2kwwzmqzaq4i05fp7d7pfmnkfm7jg6zm8kwy";
+       version = "0.2.1.0";
+       sha256 = "0cjgkl8az6qnq0b48ljw5yshkzq7lb7c6mb0gm07z2dpaxsk0rwm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44173,19 +44332,24 @@ self: {
      }) {};
 
   "cborg" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim
-     , half, integer-gmp, primitive, text
+    ({ mkDerivation, aeson, array, base, base16-bytestring
+     , base64-bytestring, bytestring, containers, deepseq, fail
+     , ghc-prim, half, integer-gmp, primitive, QuickCheck, scientific
+     , tasty, tasty-hunit, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "cborg";
-       version = "0.2.0.0";
-       sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340";
-       revision = "2";
-       editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l";
+       version = "0.2.1.0";
+       sha256 = "10vlv5mwg9625rmir7mi0zj5ygs3j3vlhm2h8lilkbj5frgp764i";
        libraryHaskellDepends = [
-         array base bytestring containers ghc-prim half integer-gmp
+         array base bytestring containers deepseq ghc-prim half integer-gmp
          primitive text
        ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring base64-bytestring bytestring
+         deepseq fail half QuickCheck scientific tasty tasty-hunit
+         tasty-quickcheck text vector
+       ];
        description = "Concise Binary Object Representation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44196,10 +44360,8 @@ self: {
      }:
      mkDerivation {
        pname = "cborg-json";
-       version = "0.2.0.0";
-       sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x";
-       revision = "1";
-       editedCabalFile = "1v0brbq9ri5fx19kb2ijhd3h3ibqadfprgcisja0mx6amzkbqnrz";
+       version = "0.2.1.0";
+       sha256 = "01i0npbwf6cnjkwwk0l4fnwlbjhsj7vn3d4zd202hcnxdm7bbdiz";
        libraryHaskellDepends = [
          aeson aeson-pretty base cborg scientific text unordered-containers
          vector
@@ -46157,8 +46319,8 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.6";
        sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
-       revision = "1";
-       editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs";
+       revision = "2";
+       editedCabalFile = "1ag213lv6yfzxdc4ghbywy165qblnqx5b3j9d23kc6fcyf19nfyk";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
@@ -46778,6 +46940,7 @@ self: {
        ];
        description = "Classify sounds produced by Xenopus laevis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classy-influxdb-simple" = callPackage
@@ -46861,6 +47024,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "classy-prelude_1_5_0" = callPackage
+    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
+     , hspec, mono-traversable, mono-traversable-instances, mtl
+     , mutable-containers, primitive, QuickCheck, say, semigroups, stm
+     , stm-chans, text, time, transformers, unliftio
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "1.5.0";
+       sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk";
+       libraryHaskellDepends = [
+         async base basic-prelude bifunctors bytestring chunked-data
+         containers deepseq dlist ghc-prim hashable mono-traversable
+         mono-traversable-instances mtl mutable-containers primitive say
+         semigroups stm stm-chans text time transformers unliftio
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
      , monad-control, QuickCheck, resourcet, transformers, void
@@ -46880,6 +47070,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "classy-prelude-conduit_1_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
+     , monad-control, QuickCheck, resourcet, transformers, void
+     }:
+     mkDerivation {
+       pname = "classy-prelude-conduit";
+       version = "1.5.0";
+       sha256 = "007xz0yzp0bzbrx7arj7xmjlwrja120kwgxrbkm98sydjlsph9ys";
+       libraryHaskellDepends = [
+         base bytestring classy-prelude conduit monad-control resourcet
+         transformers void
+       ];
+       testHaskellDepends = [
+         base bytestring conduit hspec QuickCheck transformers
+       ];
+       description = "classy-prelude together with conduit functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-yesod" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
@@ -46899,6 +47109,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude-yesod_1_5_0" = callPackage
+    ({ mkDerivation, aeson, base, classy-prelude
+     , classy-prelude-conduit, data-default, http-conduit, http-types
+     , persistent, yesod, yesod-newsfeed, yesod-static
+     }:
+     mkDerivation {
+       pname = "classy-prelude-yesod";
+       version = "1.5.0";
+       sha256 = "10wz09ksn537w5z9lmj4dsfi0ygk37d5khijr8qq3py2gr2c9ywz";
+       libraryHaskellDepends = [
+         aeson base classy-prelude classy-prelude-conduit data-default
+         http-conduit http-types persistent yesod yesod-newsfeed
+         yesod-static
+       ];
+       description = "Provide a classy prelude including common Yesod functionality";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classyplate" = callPackage
     ({ mkDerivation, base, criterion, parallel, template-haskell
      , uniplate
@@ -48352,6 +48581,7 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        description = "Logging library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "co-log-core" = callPackage
@@ -49433,12 +49663,17 @@ self: {
      }) {};
 
   "comfort-array" = callPackage
-    ({ mkDerivation, base, utility-ht }:
+    ({ mkDerivation, base, guarded-allocation, QuickCheck, transformers
+     , utility-ht
+     }:
      mkDerivation {
        pname = "comfort-array";
-       version = "0.0.1.1";
-       sha256 = "1p6ba5yjpldhy5j7cml2i0i6597pjw87l6xpym1hccn6q1mkqxq5";
-       libraryHaskellDepends = [ base utility-ht ];
+       version = "0.1.1";
+       sha256 = "0kmqb7mcanx3n597nm8p6g76nc4v5smkl5srjmb2757fb3w68xmk";
+       libraryHaskellDepends = [
+         base guarded-allocation QuickCheck transformers utility-ht
+       ];
+       testHaskellDepends = [ base QuickCheck ];
        description = "Arrays where the index type is a function of the shape type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50511,8 +50746,8 @@ self: {
      }:
      mkDerivation {
        pname = "concraft";
-       version = "0.13.0";
-       sha256 = "1b03h65ww3cb0vxjrvj8y7bn30ci0fdbjcf8gxnmyy34npgz1ihw";
+       version = "0.14.1";
+       sha256 = "0v7han8ps1ysxi929clkbx0c0vjd6dyxxhfp8q5k2jx58blwzxyg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51078,8 +51313,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0.3";
-       sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
+       version = "1.3.1";
+       sha256 = "1mi0ad2ha51lyx1sw15zkzbh2bvv1q7jcfrxd4xc91d7mmk9n4mf";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -51530,6 +51765,62 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "confcrypt" = callPackage
+    ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring
+     , bytestring, conduit, containers, crypto-pubkey-openssh
+     , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec
+     , memory, mtl, optparse-applicative, parser-combinators, QuickCheck
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "confcrypt";
+       version = "0.1.0.2";
+       sha256 = "0iw47xz34f2dljsq6hm75046sy7wmzj4ndgfh9h3x4iixs5vidfw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-kms base base64-bytestring bytestring conduit
+         containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+         deepseq lens megaparsec mtl optparse-applicative parser-combinators
+         text transformers
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-kms base base64-bytestring bytestring conduit
+         containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+         deepseq lens megaparsec mtl optparse-applicative parser-combinators
+         text transformers
+       ];
+       testHaskellDepends = [
+         amazonka amazonka-kms base base64-bytestring bytestring conduit
+         containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+         deepseq HUnit lens megaparsec memory mtl optparse-applicative
+         parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck
+         text transformers
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "confetti" = callPackage
+    ({ mkDerivation, base, directory, filepath, MissingH, tasty
+     , tasty-hunit, tasty-smallcheck, text, time, unix, yaml
+     }:
+     mkDerivation {
+       pname = "confetti";
+       version = "0.3.2";
+       sha256 = "0ac1mrxwiyjwihywy7hclfymrixhb0mj8266sljzpmk1671qr4ym";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath MissingH text time unix yaml
+       ];
+       executableHaskellDepends = [ base directory text ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-smallcheck text
+       ];
+       description = "A simple config file swapping tool";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "conffmt" = callPackage
     ({ mkDerivation, base, language-conf, megaparsec
      , optparse-applicative, pretty, text
@@ -51589,6 +51880,8 @@ self: {
        pname = "config-ini";
        version = "0.2.3.0";
        sha256 = "03sv2y9ax3jqcfydfzfvmsixl8qch2zym3sr065pjsh8qxrknkqc";
+       revision = "1";
+       editedCabalFile = "0q5lps38g92irp6hm8lvdjds6qi0nafxxlar5wjh0544v78z0d9q";
        libraryHaskellDepends = [
          base containers megaparsec text transformers unordered-containers
        ];
@@ -52558,6 +52851,7 @@ self: {
        ];
        description = "dft of contiguous memory structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continue" = callPackage
@@ -54558,8 +54852,8 @@ self: {
      }:
      mkDerivation {
        pname = "crf-chain2-tiers";
-       version = "0.3.0";
-       sha256 = "1iv86nscnrvy2yskpx4xilzqbz7y2gv9kzvlgz2h44svhshnypar";
+       version = "0.5.0";
+       sha256 = "1gwfkvs9lc7ni68n2mxrqx0haawnc8dwx0b73q7a75ysx538f84x";
        libraryHaskellDepends = [
          array base binary comonad containers data-lens data-memocombinators
          logfloat monad-codec parallel pedestrian-dag sgd vector
@@ -54649,6 +54943,8 @@ self: {
        pname = "criterion";
        version = "1.5.2.0";
        sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd";
+       revision = "1";
+       editedCabalFile = "0v42832227asv9qb1cyq8lg37ygi13956j11jcg4hzrc68ck39vv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -55051,6 +55347,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-enigma_0_0_2_14" = callPackage
+    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
+     , split
+     }:
+     mkDerivation {
+       pname = "crypto-enigma";
+       version = "0.0.2.14";
+       sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p";
+       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       description = "An Enigma machine simulator with display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "crypto-multihash" = callPackage
     ({ mkDerivation, base, base58-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -56309,6 +56620,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "curl-runnings_0_9_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs
+     , directory, hspec, hspec-expectations, http-conduit, http-types
+     , megaparsec, pretty-simple, regex-posix, tar, text
+     , unordered-containers, vector, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "curl-runnings";
+       version = "0.9.2";
+       sha256 = "1xslp7zg6l3adljac6iga9c421cf0hab9zi4dyjbkws76imh1d0b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive directory hspec
+         hspec-expectations http-conduit http-types megaparsec pretty-simple
+         regex-posix text unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs directory http-conduit tar text zlib
+       ];
+       testHaskellDepends = [ base directory hspec hspec-expectations ];
+       description = "A framework for declaratively writing curl based API tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "curlhs" = callPackage
     ({ mkDerivation, base, bytestring, hspec, rtld, time }:
      mkDerivation {
@@ -56511,6 +56848,7 @@ self: {
        ];
        description = "Purely Functional Cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cursor-gen" = callPackage
@@ -56533,6 +56871,7 @@ self: {
        ];
        description = "Generators for Purely Functional Cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curve25519" = callPackage
@@ -56703,18 +57042,6 @@ self: {
      }) {};
 
   "czipwith" = callPackage
-    ({ mkDerivation, base, template-haskell, transformers }:
-     mkDerivation {
-       pname = "czipwith";
-       version = "1.0.1.0";
-       sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p";
-       libraryHaskellDepends = [ base template-haskell ];
-       testHaskellDepends = [ base transformers ];
-       description = "CZipWith class and deriving via TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "czipwith_1_0_1_1" = callPackage
     ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
        pname = "czipwith";
@@ -56724,7 +57051,6 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -60277,6 +60603,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "decidable" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "decidable";
+       version = "0.1.2.0";
+       sha256 = "1dgxkwdazqdlnc6pvqwkx531xajl4ygjm5315dz9ilacgbbl2qss";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Combinators for manipulating dependently-typed predicates";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "decimal-arithmetic" = callPackage
     ({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec
      , mtl, QuickCheck
@@ -60955,6 +61292,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dense-linear-algebra" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, math-functions, primitive
+     , QuickCheck, vector, vector-algorithms, vector-binary-instances
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "dense-linear-algebra";
+       version = "0.1.0.0";
+       sha256 = "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp";
+       libraryHaskellDepends = [
+         base deepseq math-functions primitive vector vector-algorithms
+         vector-binary-instances vector-th-unbox
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "Simple and incomplete pure haskell implementation of linear algebra";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
      , criterion, deepseq, hspec, microlens
@@ -61929,6 +62284,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Lexer for the Dhall language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
@@ -62301,6 +62657,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.3";
        sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
+       revision = "1";
+       editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -62443,6 +62801,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.3";
        sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
+       revision = "1";
+       editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -62566,8 +62926,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.4.1";
-       sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih";
+       version = "1.4.1.1";
+       sha256 = "0raki8c20s40y5xy2ax8y38xl3y40fb9qv95ax3qgnmi46s8fapp";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
@@ -62620,8 +62980,8 @@ self: {
        pname = "diagrams-solve";
        version = "0.1.1";
        sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
-       revision = "2";
-       editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf";
+       revision = "3";
+       editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
@@ -62640,8 +63000,8 @@ self: {
        pname = "diagrams-svg";
        version = "1.4.2";
        sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
-       revision = "1";
-       editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
+       revision = "2";
+       editedCabalFile = "15sn85xaachw4cj56w61bjcwrbf4qmnkfl8mbgdapxi5k0y4f2qv";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -63758,19 +64118,20 @@ self: {
      }) {};
 
   "discord-haskell" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , data-default, http-client, iso8601-time, MonadRandom, req
-     , safe-exceptions, text, time, unordered-containers, vector
-     , websockets, wuss
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , containers, data-default, http-client, iso8601-time, JuicyPixels
+     , MonadRandom, req, safe-exceptions, text, time
+     , unordered-containers, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "0.5.1";
-       sha256 = "0y4ha8zsds53bq330740a0m4wjxmsrdlnhf2fmhp5i3c7rjknka8";
+       version = "0.6.0";
+       sha256 = "1202zfh3lq0ci48ylp637hcih469awz6sfkp14lzq5psybiiynvw";
        libraryHaskellDepends = [
-         aeson async base bytestring containers data-default http-client
-         iso8601-time MonadRandom req safe-exceptions text time
-         unordered-containers vector websockets wuss
+         aeson async base base64-bytestring bytestring containers
+         data-default http-client iso8601-time JuicyPixels MonadRandom req
+         safe-exceptions text time unordered-containers vector websockets
+         wuss
        ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -65788,6 +66149,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dotenv_0_6_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, containers, directory
+     , exceptions, hspec, hspec-megaparsec, megaparsec
+     , optparse-applicative, process, text, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.6.0.2";
+       sha256 = "0xgpz4pk684vlm3w2k9ynywj0knrx6am2szja6x4k9wyk9a64w89";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat containers directory exceptions megaparsec process
+         text transformers yaml
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers yaml
+       ];
+       testHaskellDepends = [
+         base base-compat containers directory exceptions hspec
+         hspec-megaparsec megaparsec process text transformers yaml
+       ];
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -69246,6 +69636,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3_2_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3.2.8";
+       sha256 = "1lsf6x3hmic8anx9dw6dryvsdh128rprb6dxqkyjr17iqy5ww6yp";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -69732,6 +70139,7 @@ self: {
        ];
        description = "entwine - Concurrency tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -70662,53 +71070,56 @@ self: {
   "espial" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive
      , classy-prelude, classy-prelude-conduit, classy-prelude-yesod
-     , conduit, containers, data-default, directory, esqueleto
-     , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec
-     , http-conduit, iso8601-time, microlens, monad-control
-     , monad-logger, mtl, optparse-generic, persistent
-     , persistent-sqlite, persistent-template, pretty-show, safe
-     , shakespeare, template-haskell, text, time, transformers
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static
-     , yesod-test
+     , conduit, containers, data-default, directory, ekg, ekg-core
+     , esqueleto, fast-logger, file-embed, foreign-store, hjsmin
+     , hscolour, hspec, http-conduit, iso8601-time, microlens
+     , monad-control, monad-logger, monad-metrics, mtl, optparse-generic
+     , persistent, persistent-sqlite, persistent-template, pinboard
+     , pretty-show, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai, wai-extra
+     , wai-logger, wai-middleware-metrics, warp, yaml, yesod, yesod-auth
+     , yesod-core, yesod-form, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "espial";
-       version = "0.0.4";
-       sha256 = "15v0apj7mfb61jmbl806ak92h5a8qbp8cl05g07qnrp8hmh1g9fp";
+       version = "0.0.5.1";
+       sha256 = "010a809fmi6sxh2fwiwvjqk3d293cg5acj57lb1qbm6qjzn7ir37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bcrypt bytestring case-insensitive classy-prelude
          classy-prelude-conduit classy-prelude-yesod conduit containers
-         data-default directory esqueleto fast-logger file-embed
-         foreign-store hjsmin hscolour http-conduit iso8601-time
-         monad-control monad-logger mtl persistent persistent-sqlite
-         persistent-template pretty-show safe shakespeare template-haskell
-         text time transformers unordered-containers vector wai wai-extra
-         wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
-         yesod-static
+         data-default directory ekg ekg-core esqueleto fast-logger
+         file-embed foreign-store hjsmin hscolour http-conduit iso8601-time
+         microlens monad-control monad-logger monad-metrics mtl persistent
+         persistent-sqlite persistent-template pinboard pretty-show safe
+         shakespeare template-haskell text time transformers
+         unordered-containers vector wai wai-extra wai-logger
+         wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
+         yesod-form yesod-static
        ];
        executableHaskellDepends = [
          aeson base bcrypt bytestring case-insensitive classy-prelude
          classy-prelude-conduit classy-prelude-yesod conduit containers
-         data-default directory esqueleto fast-logger file-embed
-         foreign-store hjsmin hscolour http-conduit iso8601-time
-         monad-control monad-logger mtl optparse-generic persistent
-         persistent-sqlite persistent-template pretty-show safe shakespeare
-         template-haskell text time transformers unordered-containers vector
-         wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+         data-default directory ekg ekg-core esqueleto fast-logger
+         file-embed foreign-store hjsmin hscolour http-conduit iso8601-time
+         microlens monad-control monad-logger monad-metrics mtl
+         optparse-generic persistent persistent-sqlite persistent-template
+         pinboard pretty-show safe shakespeare template-haskell text time
+         transformers unordered-containers vector wai wai-extra wai-logger
+         wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
          yesod-form yesod-static
        ];
        testHaskellDepends = [
          aeson base bcrypt bytestring case-insensitive classy-prelude
          classy-prelude-conduit classy-prelude-yesod conduit containers
-         data-default directory esqueleto fast-logger file-embed
-         foreign-store hjsmin hscolour hspec http-conduit iso8601-time
-         microlens monad-control monad-logger mtl persistent
-         persistent-sqlite persistent-template pretty-show safe shakespeare
-         template-haskell text time transformers unordered-containers vector
-         wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+         data-default directory ekg ekg-core esqueleto fast-logger
+         file-embed foreign-store hjsmin hscolour hspec http-conduit
+         iso8601-time microlens monad-control monad-logger monad-metrics mtl
+         persistent persistent-sqlite persistent-template pinboard
+         pretty-show safe shakespeare template-haskell text time
+         transformers unordered-containers vector wai wai-extra wai-logger
+         wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
          yesod-form yesod-static yesod-test
        ];
        description = "Espial is an open-source, web-based bookmarking server";
@@ -72164,6 +72575,7 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -72208,6 +72620,7 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "existential" = callPackage
@@ -72617,6 +73030,7 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expressions-z3" = callPackage
@@ -72635,6 +73049,7 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -72869,6 +73284,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_13" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.13";
+       sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -73328,8 +73760,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.2.2";
-       sha256 = "0rdlsl1k6kp766nm85afilwcvkdbi40kvqi5iy9a1ldkdk277vlk";
+       version = "0.6.2.3";
+       sha256 = "17k8xghlk0nqmby33ziwbp6zvb27kh6adwhlydzzy8azn1m2snf7";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [
          arithmoi base combinat-compat hspec QuickCheck
@@ -77043,6 +77475,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fmt-terminal-colors" = callPackage
+    ({ mkDerivation, ansi-terminal, base, fmt }:
+     mkDerivation {
+       pname = "fmt-terminal-colors";
+       version = "0.1.0.0";
+       sha256 = "1x2g5vc84l00lz4i8x2jhliglg6l32zxa7mm2l9f4rsgav6mvgc1";
+       libraryHaskellDepends = [ ansi-terminal base fmt ];
+       testHaskellDepends = [ ansi-terminal base fmt ];
+       description = "ANSI terminal colors formatters for fmt library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fn" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, directory
      , filepath, hspec, http-types, resourcet, text
@@ -77513,8 +77957,8 @@ self: {
        pname = "force-layout";
        version = "0.4.0.6";
        sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
-       revision = "3";
-       editedCabalFile = "0rp5ggzdqy9i8bsjz7i36l8l2b04vjy6sqm6gxmb4pqmakj1x8q6";
+       revision = "4";
+       editedCabalFile = "0hpr1z68lflgcdl9gbmva0i52wbgfhh4qj3iwdvzipsp8mwav7s7";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -78348,8 +78792,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.5.0";
-       sha256 = "1aqzah0c95mi9aqlvhl9r56im59jgjl38r199d7zb4lligfzvacr";
+       version = "0.0.5.1";
+       sha256 = "1h8966am7j0xdqq2vmfj2cyrzmkd70bs1kx9fpx1bgn1acdpg1xa";
        libraryHaskellDepends = [
          base constraints containers data-fix dlist free groups
          kan-extensions mtl natural-numbers transformers
@@ -79361,8 +79805,8 @@ self: {
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.5.0.1";
-       sha256 = "1mffpifpsp3l0nmpd6wabgxmz459ky47bzfizqbijxac24x69455";
+       version = "0.5.1.0";
+       sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v";
        libraryHaskellDepends = [
          attoparsec base bytestring connection containers exceptions network
          transformers
@@ -79374,21 +79818,19 @@ self: {
 
   "ftp-client-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, connection, exceptions
-     , ftp-client, ftp-clientconduit, resourcet
+     , ftp-client, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.5.0.2";
-       sha256 = "0hkipszpl6nkd8c79nvi591dqp7aaflvmpadf84r82n5agadf4ss";
+       version = "0.5.0.3";
+       sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv";
        libraryHaskellDepends = [
          base bytestring conduit connection exceptions ftp-client resourcet
        ];
-       testHaskellDepends = [ base ftp-clientconduit ];
+       testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {ftp-clientconduit = null;};
+     }) {};
 
   "ftp-conduit" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, conduit, MissingH
@@ -81115,8 +81557,8 @@ self: {
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.2.0.0";
-       sha256 = "0md52nnc8zhi26hywmqyfcxjzh4kvc0jl5ia005mi8c3dvr5l819";
+       version = "0.3.0.0";
+       sha256 = "0n53z9vmwfmb8h1x86wm9lcqrkfi1lvlfvm6kcw79d2xxx6l90jc";
        libraryHaskellDepends = [
          base base-orphans contravariant show-combinators
        ];
@@ -81976,22 +82418,6 @@ self: {
      }) {};
 
   "genvalidity-time" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, time, validity-time
-     }:
-     mkDerivation {
-       pname = "genvalidity-time";
-       version = "0.2.1.0";
-       sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s";
-       libraryHaskellDepends = [
-         base genvalidity QuickCheck time validity-time
-       ];
-       testHaskellDepends = [ base genvalidity-hspec hspec time ];
-       description = "GenValidity support for time";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-time_0_2_1_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
      }:
@@ -82005,7 +82431,6 @@ self: {
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -82875,8 +83300,8 @@ self: {
     ({ mkDerivation, base, ghc, hashable, inspection-testing }:
      mkDerivation {
        pname = "ghc-justdoit";
-       version = "0.1";
-       sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby";
+       version = "0.1.0.1";
+       sha256 = "1f52cq2c886djr59xmwdaby7diba7j687s20d48sxirvrk95wcmb";
        libraryHaskellDepends = [ base ghc hashable ];
        testHaskellDepends = [ base inspection-testing ];
        description = "A magic typeclass that just does it";
@@ -84956,8 +85381,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180926";
-       sha256 = "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d";
+       version = "6.20181011";
+       sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -85673,32 +86098,34 @@ self: {
   "gitit" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, ConfigFile, containers, directory, feed, filepath
-     , filestore, ghc, ghc-paths, happstack-server, highlighting-kate
-     , hoauth2, hslogger, HStringTemplate, HTTP, http-client-tls
-     , http-conduit, json, mtl, network, network-uri, old-locale
-     , old-time, pandoc, pandoc-types, parsec, pretty, process, random
-     , recaptcha, safe, SHA, split, syb, tagsoup, text, time, uri, url
-     , utf8-string, uuid, xhtml, xml, xss-sanitize, zlib
+     , filestore, ghc, ghc-paths, happstack-server, hoauth2, hslogger
+     , HStringTemplate, HTTP, http-client-tls, http-conduit, json, mtl
+     , network, network-uri, old-locale, old-time, pandoc, pandoc-types
+     , parsec, pretty, process, random, recaptcha, safe, SHA
+     , skylighting, split, syb, tagsoup, text, time, uri, uri-bytestring
+     , url, utf8-string, uuid, xhtml, xml, xml-conduit, xss-sanitize
+     , zlib
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.12.2.1";
-       sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m";
+       version = "0.12.3";
+       sha256 = "0jfi8rvvj2sh0dv19575fr781azsnahs7a828r1z2cql0dslkljl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
-         happstack-server highlighting-kate hoauth2 hslogger HStringTemplate
-         HTTP http-client-tls http-conduit json mtl network network-uri
+         happstack-server hoauth2 hslogger HStringTemplate HTTP
+         http-client-tls http-conduit json mtl network network-uri
          old-locale old-time pandoc pandoc-types parsec pretty process
-         random recaptcha safe SHA split syb tagsoup text time uri url
-         utf8-string uuid xhtml xml xss-sanitize zlib
+         random recaptcha safe SHA skylighting split syb tagsoup text time
+         uri uri-bytestring url utf8-string uuid xhtml xml xml-conduit
+         xss-sanitize zlib
        ];
        executableHaskellDepends = [
          base bytestring directory filepath hslogger HTTP mtl network
-         network-uri syb url utf8-string
+         network-uri syb text url utf8-string
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -86360,16 +86787,14 @@ self: {
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , bytestring, Cabal, config-schema, config-value, containers
      , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
-     , HUnit, irc-core, kan-extensions, lens, network, process
+     , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
      , regex-tdfa, semigroupoids, split, stm, template-haskell, text
      , time, transformers, unix, unordered-containers, vector, vty
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.28";
-       sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
-       revision = "2";
-       editedCabalFile = "082abvc99w4pkv41dzbqbmz3kcyi3zl7i201vr2rdfpwjv8r40pa";
+       version = "2.29";
+       sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -86377,8 +86802,8 @@ self: {
          async attoparsec base base64-bytestring bytestring config-schema
          config-value containers directory filepath free gitrev hashable
          hookup HsOpenSSL irc-core kan-extensions lens network process
-         regex-tdfa semigroupoids split stm template-haskell text time
-         transformers unix unordered-containers vector vty
+         psqueues regex-tdfa semigroupoids split stm template-haskell text
+         time transformers unix unordered-containers vector vty
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
@@ -89975,6 +90400,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphql" = callPackage
@@ -92042,6 +92468,56 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP_2_7_4_1" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, prettyprinter, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.7.4.1";
+       sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+         conduit conduit-extra containers crypto-cipher-types cryptonite
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor
+         prettyprinter resourcet semigroups split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype prettyprinter QuickCheck
+         quickcheck-instances resourcet semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unliftio-core unordered-containers zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit bytestring bzlib conduit conduit-extra containers
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor prettyprinter
+         resourcet semigroups split text time time-locale-compat
+         transformers unliftio-core unordered-containers zlib
+       ];
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel
@@ -94070,6 +94546,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakyll-dhall" = callPackage
+    ({ mkDerivation, base, binary, cborg, containers
+     , data-default-class, dhall, filepath, hakyll, lens-family-core
+     , mtl, prettyprinter, text, transformers
+     }:
+     mkDerivation {
+       pname = "hakyll-dhall";
+       version = "0.2.2.0";
+       sha256 = "02hqp9gm26n2w3hh54j94h3ga9nbh24yglx8ljkr30gz7l6r9sc8";
+       revision = "1";
+       editedCabalFile = "1q9dz2cb26272hfj4dqgp0kcl2rprh7vvpxyjwvh04n3siixxf62";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary cborg containers data-default-class dhall filepath
+         hakyll lens-family-core mtl prettyprinter text transformers
+       ];
+       executableHaskellDepends = [ base dhall hakyll ];
+       description = "Dhall compiler for Hakyll";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hakyll-dir-list" = callPackage
     ({ mkDerivation, base, containers, data-default, filepath, hakyll
      }:
@@ -94474,6 +94973,7 @@ self: {
        ];
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamlet" = callPackage
@@ -94847,6 +95347,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_6_1" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.6.1";
+       sha256 = "0g0i0n952zjvysjrsp4srhqgrq5fyy7kdinixsxazpccf01f229y";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -96765,6 +97292,61 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-bitmex-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , cryptonite, haskell-bitmex-rest, http-client, http-client-tls
+     , http-types, katip, memory, microlens, mtl, network
+     , safe-exceptions, text, time, vector, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "haskell-bitmex-client";
+       version = "0.1.0.1";
+       sha256 = "13qqi0ribc20p9h3nmfsjzhizyyz0nzsxfwx21i2r4v9md9j9n3c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring bytestring-conversion cryptonite
+         haskell-bitmex-rest http-client http-client-tls http-types katip
+         memory microlens mtl network safe-exceptions text time vector
+         websockets wuss
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring haskell-bitmex-rest http-client
+         http-client-tls katip mtl text time websockets
+       ];
+       description = "Complete BitMEX Client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-bitmex-rest" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, containers, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, iso8601-time, katip, microlens, mtl, network
+     , QuickCheck, random, safe-exceptions, semigroups, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haskell-bitmex-rest";
+       version = "0.1.0.0";
+       sha256 = "09xj9bf50wwq1xgy800wadm8jbnbs4qnjcxqx0gy3jmx1z7mgmmc";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive containers
+         deepseq exceptions http-api-data http-client http-client-tls
+         http-media http-types iso8601-time katip microlens mtl network
+         random safe-exceptions text time transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+         semigroups text time transformers unordered-containers vector
+       ];
+       description = "Auto-generated bitmex API Client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-brainfuck" = callPackage
     ({ mkDerivation, base, bytestring, mtl, parsec, QuickCheck, tasty
      , tasty-quickcheck, tasty-th
@@ -97091,19 +97673,14 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.21.4";
-       sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.21.5";
+       sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j";
        libraryHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath
          haskell-gi-base mtl pretty-show process regex-tdfa safe text
          transformers xdg-basedir xml-conduit
        ];
        libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
        testHaskellDepends = [ base doctest process ];
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
@@ -97114,8 +97691,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.21.3";
-       sha256 = "1nh2cb8l0yvn6hp5bw273yyj0y15f1sd8115wi7sxyvas5h5q7m4";
+       version = "0.21.4";
+       sha256 = "0vrl0cqws1l0ba7avf16c9zyfsvq7gd8wv4sjzd7rjk6jmg38vds";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        description = "Foundation for libraries generated by haskell-gi";
@@ -97476,8 +98053,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-names";
-       version = "0.9.2";
-       sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv";
+       version = "0.9.3";
+       sha256 = "1gr5sxjjkf7faiyc4y1sbiv06c5fiz7w5s8sxz7hh5k54w8nhs4c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring containers data-lens-light filepath
@@ -99146,22 +99723,20 @@ self: {
 
   "haskoin-core" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
-     , cereal, conduit, containers, cryptonite, deepseq, entropy
-     , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
-     , network, QuickCheck, safe, scientific, secp256k1-haskell, split
-     , string-conversions, text, time, transformers
-     , unordered-containers, vector
+     , cereal, conduit, containers, cryptonite, entropy, hashable, hspec
+     , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck
+     , safe, scientific, secp256k1-haskell, split, string-conversions
+     , text, time, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.5.2";
-       sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b";
+       version = "0.8.1";
+       sha256 = "0wlsxxrb4a7dn19412gxkwlayrjzpawkpxxy7mww279i159zl7k8";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
-         containers cryptonite deepseq entropy hashable memory mtl murmur3
-         network QuickCheck scientific secp256k1-haskell split
-         string-conversions text time transformers unordered-containers
-         vector
+         containers cryptonite entropy hashable memory mtl murmur3 network
+         QuickCheck scientific secp256k1-haskell split string-conversions
+         text time transformers unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
@@ -99198,23 +99773,26 @@ self: {
 
   "haskoin-node" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
-     , haskoin-core, hspec, monad-logger, mtl, network, nqe, random
-     , resourcet, rocksdb-haskell, rocksdb-query, string-conversions
-     , time, unliftio
+     , data-default, hashable, haskoin-core, hspec, hspec-discover
+     , HUnit, monad-logger, mtl, network, nqe, random, resourcet
+     , rocksdb-haskell, rocksdb-query, safe, string-conversions, text
+     , time, transformers, unliftio, unordered-containers
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.6.1";
-       sha256 = "06f1jmdgy5afkxcr06y1cp4jz21nby4snhnbpylj25d2y0dak8wy";
+       version = "0.8.1";
+       sha256 = "08zwn8s1ddr6aw2c3n6j2xazxa7zc3x5ga27v2rwqky0cma311c4";
        libraryHaskellDepends = [
-         base bytestring cereal conduit conduit-extra haskoin-core
-         monad-logger mtl network nqe random resourcet rocksdb-haskell
-         rocksdb-query string-conversions time unliftio
+         base bytestring cereal conduit conduit-extra data-default hashable
+         haskoin-core monad-logger mtl network nqe random resourcet
+         rocksdb-haskell rocksdb-query string-conversions text time
+         transformers unliftio unordered-containers
        ];
        testHaskellDepends = [
-         base bytestring cereal haskoin-core hspec monad-logger mtl network
-         nqe random rocksdb-haskell unliftio
+         base bytestring cereal haskoin-core hspec HUnit monad-logger mtl
+         network nqe random rocksdb-haskell safe unliftio
        ];
+       testToolDepends = [ hspec-discover ];
        description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103002,6 +103580,7 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -105642,6 +106221,7 @@ self: {
        ];
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -105676,6 +106256,7 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
@@ -106391,6 +106972,7 @@ self: {
        ];
        description = "Conversions between hmatrix and vector-sized types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap" = callPackage
@@ -108519,6 +109101,8 @@ self: {
        pname = "hpack-dhall";
        version = "0.3.0";
        sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
+       revision = "2";
+       editedCabalFile = "0qjw27y6q1g2yfgg7wijzi0xd9ccz3far4dixs18nd2wqsw8ih51";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -109275,6 +109859,7 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hruby" = callPackage
@@ -110851,35 +111436,33 @@ self: {
      }) {};
 
   "hsdev" = callPackage
-    ({ mkDerivation, aeson, aeson-lens, aeson-pretty, array, async
-     , attoparsec, base, bytestring, Cabal, containers, cpphs
-     , data-default, deepseq, direct-sqlite, directory, exceptions
-     , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils
-     , haddock-api, haddock-library, haskell-names, haskell-src-exts
-     , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph
-     , monad-control, monad-loops, mtl, network, optparse-applicative
-     , process, regex-pcre-builtin, scientific, simple-log
-     , sqlite-simple, stm, syb, template-haskell, text, text-region
-     , time, transformers, transformers-base, traverse-with-class
-     , uniplate, unix, unordered-containers, vector
+    ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
+     , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
+     , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
+     , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names
+     , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens
+     , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl
+     , network, optparse-applicative, process, regex-pcre-builtin
+     , scientific, simple-log, sqlite-simple, stm, syb, template-haskell
+     , text, text-region, time, transformers, transformers-base
+     , traverse-with-class, uniplate, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.1.4";
-       sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9";
+       version = "0.3.2.1";
+       sha256 = "01sfpd2dsqbbkxq5arb0gzllfyfcmjwcln91v02f5x1f6ksjlpzp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array async attoparsec base bytestring Cabal
          containers cpphs data-default deepseq direct-sqlite directory
-         exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils
-         haddock-api haddock-library haskell-names haskell-src-exts hdocs
-         hformat hlint HTTP lens lifted-base mmorph monad-control
-         monad-loops mtl network optparse-applicative process
-         regex-pcre-builtin scientific simple-log sqlite-simple stm syb
-         template-haskell text text-region time transformers
-         transformers-base traverse-with-class uniplate unix
-         unordered-containers vector
+         exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api
+         haddock-library haskell-names haskell-src-exts hdocs hformat hlint
+         HTTP lens lifted-base mmorph monad-control monad-loops mtl network
+         optparse-applicative process regex-pcre-builtin scientific
+         simple-log sqlite-simple stm syb template-haskell text text-region
+         time transformers transformers-base traverse-with-class uniplate
+         unix unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers deepseq directory
@@ -110887,8 +111470,8 @@ self: {
          process text transformers unordered-containers
        ];
        testHaskellDepends = [
-         aeson aeson-lens async base containers data-default deepseq
-         directory filepath hformat hspec lens mtl text
+         aeson async base containers data-default deepseq directory filepath
+         hformat hspec lens lens-aeson mtl text
        ];
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
@@ -112080,6 +112663,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Helper functions to simplify adding integration tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover_2_4_8" = callPackage
@@ -115177,8 +115761,8 @@ self: {
        pname = "httpd-shed";
        version = "0.4.0.3";
        sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
-       revision = "1";
-       editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw";
+       revision = "2";
+       editedCabalFile = "12y9qf8s0aq4dc80wrvh14cjvvm4mcygrqq72w4z8w9n8mp8jg9p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
@@ -116426,6 +117010,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -119549,8 +120134,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "inchworm";
-       version = "1.0.2.2";
-       sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h";
+       version = "1.0.2.4";
+       sha256 = "0r4d3pqpkmfa6ksjzvm8kjzrrkvb0lv76cf6fcrciwm7dj5biz74";
        libraryHaskellDepends = [ base ];
        description = "Inchworm Lexer Framework";
        license = stdenv.lib.licenses.mit;
@@ -119653,6 +120238,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "incremental-parser_0_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.3.2";
+       sha256 = "0rzm83mjbvaxa48yjs16c1v41l0yy1nfilc549z4vjgzqixy1pw6";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -119789,8 +120394,8 @@ self: {
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.6.4.1";
-       sha256 = "04xywlx0xngbycc77x14nfvjb8z0q7mmyab75l8z223fj1fh3c21";
+       version = "0.8";
+       sha256 = "111ikvrmxhqb1idpc1n70hds6slp3c9i15pigmpldj73jxinqihf";
        libraryHaskellDepends = [
          base bitvec bytestring cereal cereal-vector contravariant deepseq
          deferred-folds dense-int-set focus foldl hashable list-t mmorph
@@ -120056,6 +120661,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inflections_0_4_0_4" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , hspec-megaparsec, megaparsec, QuickCheck, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "inflections";
+       version = "0.4.0.4";
+       sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl";
+       libraryHaskellDepends = [
+         base exceptions megaparsec text unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       description = "Inflections library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inflist" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -120476,16 +121101,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inspection-testing_0_3" = callPackage
+  "inspection-testing_0_4" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, template-haskell
      , transformers
      }:
      mkDerivation {
        pname = "inspection-testing";
-       version = "0.3";
-       sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al";
-       revision = "1";
-       editedCabalFile = "06lb7gkgv5hns2kpslabl1zhd4i45wnnhcd4kmcz0n7d3hdx35cg";
+       version = "0.4";
+       sha256 = "04km186267ssaqs18kxjzsbya4jhsbyfj51959clfzbi1bfj0yfb";
        libraryHaskellDepends = [
          base containers ghc mtl template-haskell transformers
        ];
@@ -120733,6 +121356,8 @@ self: {
        pname = "integer-logarithms";
        version = "1.0.2.2";
        sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms";
+       revision = "1";
+       editedCabalFile = "1684dkh8j2xqsd85bfsmhv3iam37hasjg4x79mvl6xh7scmpfdbw";
        libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
        testHaskellDepends = [
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
@@ -121355,6 +121980,7 @@ self: {
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-grammar" = callPackage
@@ -121397,6 +122023,7 @@ self: {
        ];
        description = "invertible transformer instances for HXT Picklers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -121716,6 +122343,7 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip_1_4_1" = callPackage
@@ -122764,6 +123392,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "iterm-show" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring }:
+     mkDerivation {
+       pname = "iterm-show";
+       version = "0.1.0.1";
+       sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base base64-bytestring bytestring ];
+       executableHaskellDepends = [ base bytestring ];
+       description = "Enable graphical display of images inline on some terminals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "iterm-show-JuicyPixels" = callPackage
+    ({ mkDerivation, base, iterm-show, JuicyPixels }:
+     mkDerivation {
+       pname = "iterm-show-JuicyPixels";
+       version = "0.1.0.0";
+       sha256 = "1r4if1izanpz7kc2hl8vcn6iz7p0sk5dqq8rxvrpclcx3dklhh6z";
+       libraryHaskellDepends = [ base iterm-show JuicyPixels ];
+       description = "Orphan Show instances for JuciyPixels image types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "iterm-show-diagrams" = callPackage
+    ({ mkDerivation, base, diagrams-lib, diagrams-rasterific
+     , iterm-show, JuicyPixels
+     }:
+     mkDerivation {
+       pname = "iterm-show-diagrams";
+       version = "0.1.0.0";
+       sha256 = "1szan9v24d8fksxcw3fqvzppf49664xm5y1zdk9yv007r5pfxr4c";
+       libraryHaskellDepends = [
+         base diagrams-lib diagrams-rasterific iterm-show JuicyPixels
+       ];
+       description = "Orphan Show instances for diagrams package that render inline in some terminals";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ival" = callPackage
     ({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }:
      mkDerivation {
@@ -125992,10 +126660,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.6.1.0";
-       sha256 = "0mqx1dvq5v18sd2rqr2zlvmznj84vwml8zdf0hlhviw7kl9wjbah";
-       revision = "1";
-       editedCabalFile = "1znlk9jkrp3hl1frra563c61p49sp56nw1xps593w2qq9hr037rq";
+       version = "0.6.3.0";
+       sha256 = "0pjd81rp5rhf0nxgqi274zlffhcvd3v8nl60y5pj06wpyn55wx0g";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -126259,6 +126925,7 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -130941,12 +131608,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-labels_0_3_0_0" = callPackage
+  "lens-labels_0_3_0_1" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
-       version = "0.3.0.0";
-       sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn";
+       version = "0.3.0.1";
+       sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
@@ -132211,6 +132878,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {xslt = null;};
 
+  "libyaml" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, resourcet }:
+     mkDerivation {
+       pname = "libyaml";
+       version = "0.1.0.0";
+       sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw";
+       libraryHaskellDepends = [ base bytestring conduit resourcet ];
+       description = "Low-level, streaming YAML interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "libzfs" = callPackage
     ({ mkDerivation, base, mtl, nvpair, transformers, zfs }:
      mkDerivation {
@@ -132287,6 +132965,7 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lift-generics" = callPackage
@@ -134598,8 +135277,8 @@ self: {
      }:
      mkDerivation {
        pname = "load-env";
-       version = "0.2.0.1";
-       sha256 = "1xkk72lfpb4fbnmm7wqxxl1v7jwk9b6da53i90k3dvypakl4gryb";
+       version = "0.2.0.2";
+       sha256 = "063zd2nbwbyndfy1hrir9x270f99wzbyarfj561r9dddak2754w1";
        libraryHaskellDepends = [ base directory filepath parsec ];
        testHaskellDepends = [
          base directory doctest hspec parsec temporary
@@ -138444,6 +139123,7 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -138665,6 +139345,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, data-default-class
+     , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+     , vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.2.2.0";
+       sha256 = "1mw636d070icl2wanvgrr8k0a44fhzdmzkw3047442nvl3nyghbc";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq ghc-prim primitive
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring data-default deepseq hspec QuickCheck
+         safe-exceptions vector
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-io" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq, directory
      , filepath, JuicyPixels, massiv, netpbm, process, vector
@@ -141466,8 +142168,8 @@ self: {
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.2.2";
-       sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1";
+       version = "0.5.2.3";
+       sha256 = "0s3bxj6d3p0fng08da9y2qb8cl967lqhsqplhcwmaj3aai72rj5w";
        libraryHaskellDepends = [
          base bytestring cereal containers digest lens lifted-base
          monad-control mtl murmur-hash network random resource-pool
@@ -141938,6 +142640,7 @@ self: {
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mirror-tweet" = callPackage
@@ -143875,6 +144578,7 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadLib" = callPackage
@@ -144903,6 +145607,7 @@ self: {
        ];
        description = "General purpose migrations library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -144918,6 +145623,7 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "motor" = callPackage
@@ -149527,6 +150233,7 @@ self: {
        ];
        description = "WebSocket backend for MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-metrics" = callPackage
@@ -151553,19 +152260,19 @@ self: {
      }) {};
 
   "nqe" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit
      , text, unique, unliftio
      }:
      mkDerivation {
        pname = "nqe";
-       version = "0.5.0";
-       sha256 = "0i5rp2nh4gr6isqvzkxmq31b7ycp2dhs885hn5ng6bc9q3nsjxly";
+       version = "0.6.1";
+       sha256 = "1l0dydhcqmgf6bamy29sgry8sjirvw3khzjkhpjlb12zl2y75xxd";
        libraryHaskellDepends = [
          base conduit containers hashable mtl stm unique unliftio
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-extra exceptions hspec stm
+         async base bytestring conduit conduit-extra exceptions hspec stm
          stm-conduit text unliftio
        ];
        description = "Concurrency library in the style of Erlang/OTP";
@@ -153899,10 +154606,8 @@ self: {
      }:
      mkDerivation {
        pname = "opensource";
-       version = "0.1.0.0";
-       sha256 = "09q1c9v27b7d482ccgv73fhvhk3jfq2fvxnrz6ywi3zvf37bcn9l";
-       revision = "1";
-       editedCabalFile = "02zb9m7d6fsjbqgwbjnkrpgqc93zm34bvzgasw903hhdkskshrp6";
+       version = "0.1.1.0";
+       sha256 = "10jlgk1rbpz5h1mbknq0i71k0n4ppp3yd498i7p2l79a9gi6pwqy";
        libraryHaskellDepends = [
          aeson base http-client http-client-tls text transformers
        ];
@@ -154637,6 +155342,7 @@ self: {
        ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchestrate" = callPackage
@@ -154865,21 +155571,21 @@ self: {
 
   "orgmode-parse" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , free, hashable, HUnit, neat-interpolation, old-locale, tasty
-     , tasty-hunit, text, thyme, unordered-containers
+     , free, hashable, HUnit, neat-interpolation, old-locale, semigroups
+     , tasty, tasty-hunit, text, thyme, unordered-containers
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.2.1";
-       sha256 = "1zpkj3f0gdi5ri39s7g532j2pgk5mgs97y2g1gj42q9aa5lm5hw5";
+       version = "0.2.2";
+       sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
-         old-locale text thyme unordered-containers
+         old-locale semigroups text thyme unordered-containers
        ];
        testHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable HUnit
-         neat-interpolation old-locale tasty tasty-hunit text thyme
-         unordered-containers
+         neat-interpolation old-locale semigroups tasty tasty-hunit text
+         thyme unordered-containers
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
@@ -154887,27 +155593,27 @@ self: {
      }) {};
 
   "orgstat" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, boxes, bytestring, colour
-     , containers, data-default, diagrams-lib, diagrams-svg, directory
-     , exceptions, filepath, formatting, hashable, hspec, HUnit, lens
-     , linear, log-warper, mtl, optparse-simple, orgmode-parse
-     , QuickCheck, quickcheck-text, text, time, transformers, turtle
-     , universum, yaml
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes
+     , bytestring, colour, containers, data-default, diagrams-lib
+     , diagrams-svg, directory, exceptions, filepath, fmt, formatting
+     , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple
+     , orgmode-parse, QuickCheck, quickcheck-text, text, time
+     , transformers, turtle, universum, yaml
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.1.4";
-       sha256 = "063iqrxcqj4mxlic934ksrl23alvpwr3q5k2w666sqc02nkmcv88";
+       version = "0.1.5";
+       sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base boxes bytestring colour containers
-         data-default diagrams-lib diagrams-svg directory exceptions
-         filepath formatting hashable lens linear log-warper mtl
+         aeson ansi-terminal attoparsec base boxes bytestring colour
+         containers data-default diagrams-lib diagrams-svg directory
+         exceptions filepath fmt formatting hashable lens linear mtl
          optparse-simple orgmode-parse text time turtle universum yaml
        ];
        executableHaskellDepends = [
-         base bytestring directory exceptions filepath formatting log-warper
+         base bytestring directory exceptions filepath formatting
          optparse-simple universum
        ];
        testHaskellDepends = [
@@ -155851,6 +156557,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_14_7" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.14.7";
+       sha256 = "18r0pqv170yrsvgarj4xlpgmanydycqq9akxlnp1pkinqhs24iyd";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -156088,8 +156829,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-pyplot";
-       version = "1.0.0.1";
-       sha256 = "1sxksn2b7x1mrgla0c3dn5x9js0yhfg125259kh1iqzlkanj81px";
+       version = "1.0.2.0";
+       sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157040,8 +157781,8 @@ self: {
      }:
      mkDerivation {
        pname = "paripari";
-       version = "0.5.0.0";
-       sha256 = "0wk0b7vb3y2gs1sayd0sh5wa643q5vvc6s2cq9p1h8paxkhd3ypb";
+       version = "0.6.0.0";
+       sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159450,6 +160191,38 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent_2_9_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-html, blaze-markup, bytestring, conduit, containers
+     , fast-logger, hspec, http-api-data, monad-control, monad-logger
+     , mtl, old-locale, path-pieces, resource-pool, resourcet
+     , scientific, silently, tagged, template-haskell, text, time
+     , transformers, unliftio-core, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.9.0";
+       sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html blaze-markup
+         bytestring conduit containers fast-logger http-api-data
+         monad-logger mtl old-locale path-pieces resource-pool resourcet
+         scientific silently tagged template-haskell text time transformers
+         unliftio-core unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger hspec http-api-data monad-control
+         monad-logger mtl old-locale path-pieces resource-pool resourcet
+         scientific tagged template-haskell text time transformers
+         unordered-containers vector
+       ];
+       description = "Type-safe, multi-backend data serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-audit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , getopt-generics, hashable, hspec, mongoDB, persistent
@@ -159646,6 +160419,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "persistent-mysql_2_9_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-logger, mysql, mysql-simple, persistent
+     , resource-pool, resourcet, text, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-mysql";
+       version = "2.9.0";
+       sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers monad-logger
+         mysql mysql-simple persistent resource-pool resourcet text
+         transformers unliftio-core
+       ];
+       description = "Backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-mysql-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
@@ -159725,6 +160517,27 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-postgresql_2_9_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-logger, persistent, postgresql-libpq
+     , postgresql-simple, resource-pool, resourcet, text, time
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "persistent-postgresql";
+       version = "2.9.0";
+       sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers monad-logger
+         persistent postgresql-libpq postgresql-simple resource-pool
+         resourcet text time transformers unliftio-core
+       ];
+       description = "Backend for the persistent library using postgresql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-protobuf" = callPackage
     ({ mkDerivation, base, bytestring, persistent, protocol-buffers
      , protocol-buffers-descriptor, template-haskell, text
@@ -159742,6 +160555,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-qq" = callPackage
+    ({ mkDerivation, base, haskell-src-meta, mtl, persistent
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "persistent-qq";
+       version = "2.9.0";
+       sha256 = "02dvsmlamfy93490qhb9qq25vq8wrqhzzza5q5shvak1n7wgjvh0";
+       revision = "1";
+       editedCabalFile = "15zkam90rfq33549kqpwyllrjpdvgkcpwnv16y6n439xd96vyyci";
+       libraryHaskellDepends = [
+         base haskell-src-meta mtl persistent template-haskell text
+       ];
+       description = "Provides a quasi-quoter for raw SQL for persistent";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-ratelimit" = callPackage
     ({ mkDerivation, base, time, yesod }:
      mkDerivation {
@@ -159871,6 +160702,35 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
+  "persistent-sqlite_2_9_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , hspec, microlens-th, monad-logger, old-locale, persistent
+     , persistent-template, resource-pool, resourcet, sqlite, temporary
+     , text, time, transformers, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-sqlite";
+       version = "2.9.0";
+       sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y";
+       configureFlags = [ "-fsystemlib" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers microlens-th monad-logger
+         old-locale persistent resource-pool resourcet text time
+         transformers unliftio-core unordered-containers
+       ];
+       librarySystemDepends = [ sqlite ];
+       testHaskellDepends = [
+         base hspec persistent persistent-template temporary text time
+         transformers
+       ];
+       description = "Backend for the persistent library using sqlite3";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {inherit (pkgs) sqlite;};
+
   "persistent-template" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
@@ -161106,6 +161966,8 @@ self: {
        pname = "pipes";
        version = "4.3.9";
        sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
+       revision = "1";
+       editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa";
        libraryHaskellDepends = [
          base exceptions mmorph mtl semigroups transformers void
        ];
@@ -162615,6 +163477,7 @@ self: {
        ];
        description = "run a subprocess, combining stdout and stderr";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plist" = callPackage
@@ -164379,8 +165242,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-connector";
-       version = "0.2.6";
-       sha256 = "1nhsplb7s4k3y2450pr57fl39n1gjs2110vvr9v4pn0h6hwz1yl3";
+       version = "0.2.7";
+       sha256 = "1p5nqav8yxgj8knbrmfv1lgpflid338ka2a9xp3pixq0dwz7argk";
        libraryHaskellDepends = [
          base bytestring exceptions lens mtl postgresql-simple resource-pool
          resourcet time transformers-base
@@ -164715,6 +165578,7 @@ self: {
        testHaskellDepends = [ rerebase ];
        description = "PostgreSQL SQL syntax utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {pg_query = null;};
 
   "postgresql-transactional" = callPackage
@@ -165297,18 +166161,18 @@ self: {
     ({ mkDerivation, aeson, base, basic-prelude, exceptions
      , fast-logger, lens, lifted-base, monad-control, monad-logger
      , MonadRandom, mtl, network, resourcet, safe, template-haskell
-     , text, text-manipulate, time, transformers-base, unliftio-core
+     , text, text-manipulate, time, transformers-base
      , unordered-containers, uuid
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.64";
-       sha256 = "1h7px6kz2plp5fix7i0dviv0hg3nzq31pvwwayh4q747lh3xjwp4";
+       version = "0.0.65";
+       sha256 = "1i11d46rrnlsjipy74rb9yfq0d91lk7wjkiz4z9sl099pgmgc9lw";
        libraryHaskellDepends = [
          aeson base basic-prelude exceptions fast-logger lens lifted-base
          monad-control monad-logger MonadRandom mtl network resourcet safe
          template-haskell text text-manipulate time transformers-base
-         unliftio-core unordered-containers uuid
+         unordered-containers uuid
        ];
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
@@ -166671,6 +167535,7 @@ self: {
        ];
        description = "Convert colors to different color spaces, interpolate colors, and transform colors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "probability" = callPackage
@@ -167862,15 +168727,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens_0_4_0_0" = callPackage
+  "proto-lens_0_4_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , lens-family, lens-labels, parsec, pretty, text, transformers
      , void
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.4.0.0";
-       sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r";
+       version = "0.4.0.1";
+       sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq lens-family
@@ -167896,14 +168761,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-arbitrary_0_1_2_3" = callPackage
+  "proto-lens-arbitrary_0_1_2_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "proto-lens-arbitrary";
-       version = "0.1.2.3";
-       sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn";
+       version = "0.1.2.4";
+       sha256 = "0d17vkcv21qphs44ig5fdcvisxn20980m0lx693w52ikzsax5k4s";
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
@@ -167934,15 +168799,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-combinators_0_4" = callPackage
+  "proto-lens-combinators_0_4_0_1" = callPackage
     ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core
      , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework
      , test-framework-hunit, transformers
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.4";
-       sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b";
+       version = "0.4.0.1";
+       sha256 = "0dkd9jmmxf5r01di3q1r0qnyhkyxrjlnfxa40c2vq0fl16h68lkb";
        setupHaskellDepends = [ base Cabal proto-lens-setup ];
        libraryHaskellDepends = [
          base lens-family proto-lens transformers
@@ -167977,8 +168842,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
-       version = "0.1.1.3";
-       sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd";
+       version = "0.1.1.4";
+       sha256 = "1dn5cjwbagcykh1fv99v6mmj7mlnl46nqlwpz1878fy7vl7i8lzh";
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
@@ -168021,14 +168886,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
-  "proto-lens-protobuf-types_0_4_0_0" = callPackage
+  "proto-lens-protobuf-types_0_4_0_1" = callPackage
     ({ mkDerivation, base, Cabal, lens-labels, proto-lens
      , proto-lens-runtime, proto-lens-setup, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.4.0.0";
-       sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg";
+       version = "0.4.0.1";
+       sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira";
        setupHaskellDepends = [ base Cabal proto-lens-setup ];
        libraryHaskellDepends = [
          base lens-labels proto-lens proto-lens-runtime text
@@ -168092,14 +168957,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) protobuf;};
 
-  "proto-lens-protoc_0_4_0_0" = callPackage
+  "proto-lens-protoc_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath
      , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.4.0.0";
-       sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8";
+       version = "0.4.0.1";
+       sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168121,8 +168986,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-runtime";
-       version = "0.4.0.1";
-       sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc";
+       version = "0.4.0.2";
+       sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr";
        libraryHaskellDepends = [
          base bytestring containers deepseq filepath lens-family lens-labels
          proto-lens text
@@ -168138,8 +169003,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-setup";
-       version = "0.4.0.0";
-       sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf";
+       version = "0.4.0.1";
+       sha256 = "1x8lj5z2ih20757m0di0lg4kn3s3g90qpjpv5wkzj2xf097cwqjp";
        libraryHaskellDepends = [
          base bytestring Cabal containers deepseq directory filepath process
          proto-lens-protoc temporary text
@@ -168333,6 +169198,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "protolude_0_2_3" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "protolude";
+       version = "0.2.3";
+       sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj";
+       libraryHaskellDepends = [
+         array async base bytestring containers deepseq ghc-prim hashable
+         mtl mtl-compat stm text transformers transformers-compat
+       ];
+       description = "A small prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protolude-lifted" = callPackage
     ({ mkDerivation, async, base, lifted-async, lifted-base, protolude
      }:
@@ -171763,6 +172646,8 @@ self: {
        pname = "random-bytestring";
        version = "0.1.3.1";
        sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
+       revision = "1";
+       editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
        benchmarkHaskellDepends = [
          async base bytestring criterion cryptonite entropy ghc-prim
@@ -172442,10 +173327,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.3.3.1";
-       sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn";
-       revision = "1";
-       editedCabalFile = "0mhg2k786zx1cmblijnz73cf12h1s5grmkc0wb63612hnxxz53i7";
+       version = "0.3.3.2";
+       sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174480,8 +175363,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-fragment-shader-canvas";
-       version = "0.1.0.1";
-       sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z";
+       version = "0.2";
+       sha256 = "08ayk3y22mmgrpd03128h60wmg698d0c1cxack9akm636hp83y7z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176847,6 +177730,7 @@ self: {
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -177119,8 +178003,8 @@ self: {
      }:
      mkDerivation {
        pname = "resourcet";
-       version = "1.2.1";
-       sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7";
+       version = "1.2.2";
+       sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk";
        libraryHaskellDepends = [
          base containers exceptions mtl primitive transformers unliftio-core
        ];
@@ -177971,6 +178855,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -178717,18 +179602,18 @@ self: {
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-query" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, hspec
-     , resourcet, rocksdb-haskell, unliftio
+    ({ mkDerivation, base, bytestring, cereal, conduit, data-default
+     , hspec, resourcet, rocksdb-haskell, unliftio
      }:
      mkDerivation {
        pname = "rocksdb-query";
-       version = "0.1.4";
-       sha256 = "1qk3l9plpid6i9xb1im3xkvsjvj3mk74wgxv9bpd3c3d8x83gwhb";
+       version = "0.2.0";
+       sha256 = "01n2zlbpldhx8rxvq89i9hsp99dvlhm6s4rwlygxd3y989an8bcf";
        libraryHaskellDepends = [
          base bytestring cereal conduit resourcet rocksdb-haskell unliftio
        ];
        testHaskellDepends = [
-         base cereal hspec rocksdb-haskell unliftio
+         base cereal data-default hspec rocksdb-haskell unliftio
        ];
        description = "RocksDB database querying library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -179215,6 +180100,8 @@ self: {
        pname = "roundtrip";
        version = "0.2.0.5";
        sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa";
+       revision = "1";
+       editedCabalFile = "1kxlgbgwlrln9pal7yq4i487yy6jyf04s6fpb63w7z16anxly4bs";
        libraryHaskellDepends = [
          base containers pretty safe template-haskell text xml-types
        ];
@@ -179230,8 +180117,8 @@ self: {
      }:
      mkDerivation {
        pname = "roundtrip-aeson";
-       version = "0.2.0.0";
-       sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
+       version = "0.3.0.2";
+       sha256 = "0qlsmmcidiagjyb3kfp1hplkkzpibgxw31j7cxhma3l2gs2yal6f";
        libraryHaskellDepends = [
          aeson base bytestring containers lens lens-aeson roundtrip
          scientific text unordered-containers vector
@@ -180139,8 +181026,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "safe-coerce";
-       version = "0.1.0.0";
-       sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p";
+       version = "0.2.0.0";
+       sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df";
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
        license = stdenv.lib.licenses.bsd3;
@@ -180704,8 +181591,8 @@ self: {
      }:
      mkDerivation {
        pname = "saltine";
-       version = "0.1.0.1";
-       sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5";
+       version = "0.1.0.2";
+       sha256 = "0253m8n6s39fnr8wz1z240kaizw3chfm1fgwp51dgqgk0nwrv67x";
        libraryHaskellDepends = [ base bytestring profunctors ];
        libraryPkgconfigDepends = [ libsodium ];
        testHaskellDepends = [
@@ -183082,21 +183969,21 @@ self: {
 
   "secp256k1-haskell" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, cereal
-     , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1
-     , string-conversions
+     , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
+     , secp256k1, string-conversions
      }:
      mkDerivation {
        pname = "secp256k1-haskell";
-       version = "0.1.2";
-       sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva";
+       version = "0.1.3";
+       sha256 = "0wdxz8vmk5yfhjrwpynk1zpmvgl1rnwz7zvkx7g7pxxvz3z8rpbz";
        libraryHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy QuickCheck
-         string-conversions
+         base base16-bytestring bytestring cereal entropy hashable
+         QuickCheck string-conversions
        ];
        librarySystemDepends = [ secp256k1 ];
        testHaskellDepends = [
-         base base16-bytestring bytestring cereal entropy hspec HUnit mtl
-         QuickCheck string-conversions
+         base base16-bytestring bytestring cereal entropy hashable hspec
+         HUnit mtl QuickCheck string-conversions
        ];
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
@@ -184152,34 +185039,29 @@ self: {
      }) {};
 
   "serialise" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring
-     , base64-bytestring, binary, bytestring, cborg, cereal
-     , cereal-vector, containers, criterion, deepseq, directory
+    ({ mkDerivation, aeson, array, base, binary, bytestring, cborg
+     , cereal, cereal-vector, containers, criterion, deepseq, directory
      , filepath, ghc-prim, half, hashable, pretty, primitive, QuickCheck
-     , quickcheck-instances, scientific, store, tar, tasty, tasty-hunit
+     , quickcheck-instances, semigroups, store, tar, tasty, tasty-hunit
      , tasty-quickcheck, text, time, unordered-containers, vector, zlib
      }:
      mkDerivation {
        pname = "serialise";
-       version = "0.2.0.0";
-       sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0";
-       revision = "2";
-       editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf";
+       version = "0.2.1.0";
+       sha256 = "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4";
        libraryHaskellDepends = [
          array base bytestring cborg containers ghc-prim half hashable
          primitive text time unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson array base base16-bytestring base64-bytestring binary
-         bytestring cborg containers deepseq directory filepath ghc-prim
-         half hashable primitive QuickCheck quickcheck-instances scientific
-         tasty tasty-hunit tasty-quickcheck text time unordered-containers
-         vector
+         base bytestring cborg containers directory filepath primitive
+         QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         text time unordered-containers vector
        ];
        benchmarkHaskellDepends = [
          aeson array base binary bytestring cborg cereal cereal-vector
          containers criterion deepseq directory filepath ghc-prim half
-         pretty store tar text time vector zlib
+         pretty semigroups store tar text time vector zlib
        ];
        description = "A binary serialisation library for Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -186676,8 +187558,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
        pname = "set-monad";
-       version = "0.2.0.0";
-       sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb";
+       version = "0.3.0.0";
+       sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
@@ -187225,6 +188107,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake_0_17" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, directory
+     , extra, filepath, hashable, heaps, js-flot, js-jquery, primitive
+     , process, QuickCheck, random, time, transformers, unix
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "shake";
+       version = "0.17";
+       sha256 = "18nlnxd8vad5vs4399lz1875dvapmk4fimpz3sp4b6z590d68rs1";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         heaps js-flot js-jquery primitive process random time transformers
+         unix unordered-containers utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         heaps js-flot js-jquery primitive process random time transformers
+         unix unordered-containers utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring deepseq directory extra filepath hashable
+         heaps js-flot js-jquery primitive process QuickCheck random time
+         transformers unix unordered-containers utf8-string
+       ];
+       description = "Build system library, like Make, but more accurate dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hs2ats
      , language-ats, microlens, shake, shake-c, shake-cabal, shake-ext
@@ -187465,8 +188380,8 @@ self: {
      }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.49";
-       sha256 = "0zhysqnr5vbmj04ippyipyqpml2zx3av3d5ikprdwksrsjhfgbp3";
+       version = "0.0.50";
+       sha256 = "0n1cr2bn2ar0iifjzmg714wa55r5dr0q8ygrs0lrdvanbg9s0ml6";
        libraryHaskellDepends = [
          base basic-prelude directory lifted-base shake
        ];
@@ -187852,10 +188767,8 @@ self: {
     ({ mkDerivation, base, containers, text, unix }:
      mkDerivation {
        pname = "shell-monad";
-       version = "0.6.4";
-       sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
-       revision = "1";
-       editedCabalFile = "0hm3nlr9a3n18f7y0pnw4q4x3s8y1jxz9mify7hplpj2fq23wpdm";
+       version = "0.6.5";
+       sha256 = "0vg2g65km3i963scyj7fn17g562wg0mh88syxqrf7favnljid1bk";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -189001,8 +189914,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.7";
-       sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5";
+       version = "0.9.8";
+       sha256 = "1yn2nnvmzfw4v7bi6jchsd8y27vpd8m4in0shydyyglpjmaq751k";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -190266,8 +191179,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.7.3";
-       sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g";
+       version = "0.7.4";
+       sha256 = "0w1cv21rm4ssmr2zbn7bamlfc2pkswxg5plvqzrf7rs4h1y43672";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190290,8 +191203,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting-core";
-       version = "0.7.3";
-       sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c";
+       version = "0.7.4";
+       sha256 = "1awddq9cn5gyafz97ir21rncq97k2gzfxijn2xmxw35qhr2kbfl0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -192566,12 +193479,12 @@ self: {
      }) {};
 
   "snipcheck" = callPackage
-    ({ mkDerivation, base, containers, pandoc, process }:
+    ({ mkDerivation, base, containers, pandoc, process, text }:
      mkDerivation {
        pname = "snipcheck";
-       version = "0.1.0.2";
-       sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk";
-       libraryHaskellDepends = [ base containers pandoc process ];
+       version = "0.1.0.3";
+       sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0";
+       libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196365,8 +197278,8 @@ self: {
        pname = "statestack";
        version = "0.2.0.5";
        sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl";
-       revision = "2";
-       editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp";
+       revision = "3";
+       editedCabalFile = "0s9v88gcc5wnfj4c6xq86asadmh4y8z8ycv2wz5nwfwfazfgzcy3";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -196496,8 +197409,8 @@ self: {
      }:
      mkDerivation {
        pname = "static-text";
-       version = "0.2.0.2";
-       sha256 = "04sbf0zydgf18ajb20wd8wfbw4gdjmxx3f4h62w0qmafgvrr8w5c";
+       version = "0.2.0.3";
+       sha256 = "189x85skhzms3iydzh4gd5hmklx7ps2skzymls514drg8cz7m7ar";
        libraryHaskellDepends = [
          base bytestring template-haskell text vector
        ];
@@ -196549,6 +197462,34 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "statistics_0_15_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base-orphans, binary
+     , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
+     , ieee754, math-functions, monad-par, mwc-random, primitive
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-algorithms
+     , vector-binary-instances, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "statistics";
+       version = "0.15.0.0";
+       sha256 = "0wk4pv4fjpqq49vf8zanb9801lbgcbbfhhvlpp3ka6p8jmfc9scm";
+       libraryHaskellDepends = [
+         aeson base base-orphans binary data-default-class deepseq
+         dense-linear-algebra math-functions monad-par mwc-random primitive
+         vector vector-algorithms vector-binary-instances vector-th-unbox
+       ];
+       testHaskellDepends = [
+         aeson base binary dense-linear-algebra erf HUnit ieee754
+         math-functions mwc-random primitive QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+         vector-algorithms
+       ];
+       description = "A library of statistical types, data, and functions";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "statistics-dirichlet" = callPackage
     ({ mkDerivation, base, deepseq, hmatrix-special
      , nonlinear-optimization, vector
@@ -198139,6 +199080,7 @@ self: {
        ];
        description = "online streaming fft";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -198523,10 +199465,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "strict-concurrency";
-       version = "0.2.4.2";
-       sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
-       revision = "1";
-       editedCabalFile = "12m1jbf01d4k7w1wiqcpdsbhlxi6ssbz9nx0ax2mrjjq2l0011ny";
+       version = "0.2.4.3";
+       sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82";
        libraryHaskellDepends = [ base deepseq ];
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
@@ -198913,6 +199853,8 @@ self: {
        pname = "stringsearch";
        version = "0.3.6.6";
        sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
+       revision = "1";
+       editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378";
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Fast searching, splitting and replacing of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -199306,18 +200248,19 @@ self: {
 
   "stutter" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
-     , conduit-combinators, conduit-extra, mtl, optparse-applicative
-     , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text
+     , conduit-combinators, conduit-extra, exceptions, mtl
+     , optparse-applicative, resourcet, snipcheck, tasty, tasty-ant-xml
+     , tasty-hunit, text
      }:
      mkDerivation {
        pname = "stutter";
-       version = "0.1.0.1";
-       sha256 = "1s3bwwylbf7mcjzpnl8681aaw92q8kcyp074gns5cazsi0slfzl4";
+       version = "0.1.0.2";
+       sha256 = "1cha46fnx9balwkvwcc5b7irq410mr357rqvw85g91vv8ww209sj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-combinators
-         conduit-extra mtl resourcet text
+         conduit-extra exceptions mtl resourcet text
        ];
        executableHaskellDepends = [
          attoparsec base conduit conduit-combinators optparse-applicative
@@ -199739,6 +200682,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -200251,6 +201195,8 @@ self: {
        pname = "svg-builder";
        version = "0.1.1";
        sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
+       revision = "1";
+       editedCabalFile = "1bhp9gvid2iis411k1vvyj5krzc4ahxcqcd9cwx9h37jxg180xw1";
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
@@ -200281,8 +201227,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.6.2.2";
-       sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s";
+       version = "0.6.2.3";
+       sha256 = "0snvv2l7fpj7nl1sxnpxz5h2xpskjxxl0l2c7bqkwhcj7571br99";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -200510,19 +201456,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "swagger2_2_3" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries
-     , bytestring, Cabal, cabal-doctest, containers, doctest
-     , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
-     , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck
+  "swagger2_2_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
+     , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
+     , hashable, hspec, hspec-discover, http-media, HUnit
+     , insert-ordered-containers, lens, mtl, network, QuickCheck
      , quickcheck-instances, scientific, template-haskell, text, time
      , transformers, transformers-compat, unordered-containers
-     , uuid-types, vector
+     , utf8-string, uuid-types, vector
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "2.3";
-       sha256 = "0r1bkx667727h4wvcq1l6295c78s24s6qk9p62jdiafq3844bwm3";
+       version = "2.3.0.1";
+       sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring containers generics-sop
@@ -200531,10 +201477,10 @@ self: {
          transformers-compat unordered-containers uuid-types vector
        ];
        testHaskellDepends = [
-         aeson aeson-qq base base-compat-batteries bytestring containers
-         doctest Glob hashable hspec HUnit insert-ordered-containers lens
-         mtl QuickCheck quickcheck-instances text time unordered-containers
-         vector
+         aeson base base-compat-batteries bytestring containers doctest Glob
+         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+         quickcheck-instances template-haskell text time
+         unordered-containers utf8-string vector
        ];
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
@@ -203093,8 +204039,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "1.1.0.3";
-       sha256 = "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22";
+       version = "1.1.0.4";
+       sha256 = "1gzf1gqi5p78m8rc21g9a8glc69r68igxr9n4qn4bs6wqyi3ykiv";
        libraryHaskellDepends = [
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix wcwidth
@@ -207294,8 +208240,8 @@ self: {
      }:
      mkDerivation {
        pname = "themoviedb";
-       version = "1.1.4.0";
-       sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6";
+       version = "1.1.5.0";
+       sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207674,8 +208620,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.8.2.4";
-       sha256 = "0fy8mwg4h78c7h1k6igc9i8k5r7avj59jkljbg47wlr0x8fs06yb";
+       version = "0.8.3.0";
+       sha256 = "173aacscvf2llk6n5nnxvww22673cg2hclkb3s18av3xk03b4qf6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -207835,6 +208781,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thumbnail" = callPackage
@@ -209893,10 +210840,11 @@ self: {
      }:
      mkDerivation {
        pname = "toodles";
-       version = "0.1.0.0";
-       sha256 = "0hbmnyym6hrwvacc783hl7s26yqbw8vcify4vna0mmp8y67rwjfx";
+       version = "0.1.0.6";
+       sha256 = "18i8y9bmpysyz8mbjc1wksw1m35z78ljv0b3k5qxjav8fswfv0la";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base blaze-html bytestring cmdargs directory filepath
          http-types megaparsec MissingH regex-posix servant servant-blaze
@@ -210942,6 +211890,7 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -213813,8 +214762,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.0.1";
-       sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178";
+       version = "0.7.1.1";
+       sha256 = "1csg945w81qqa5fipj9fyzqy1f2n6blf55cjcqg7gm1k1jln768k";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -213857,6 +214806,33 @@ self: {
        license = "GPL";
      }) {};
 
+  "typograffiti" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, freetype2
+     , gl, linear, mtl, pretty-show, sdl2, stm, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "typograffiti";
+       version = "0.1.0.0";
+       sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers freetype2 gl linear mtl pretty-show stm
+         template-haskell vector
+       ];
+       executableHaskellDepends = [
+         base bytestring containers filepath freetype2 gl linear mtl
+         pretty-show sdl2 stm template-haskell vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers freetype2 gl linear mtl pretty-show stm
+         template-haskell vector
+       ];
+       description = "Display TTF fonts in OpenGL. Includes caching for fast rendering.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typography-geometry" = callPackage
     ({ mkDerivation, base, containers, parallel, polynomials-bernstein
      , vector
@@ -214399,8 +215375,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound";
-       version = "0.5.1";
-       sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12";
+       version = "0.5.1.1";
+       sha256 = "1pr06iii1pm6dkdm4rxc4cr817p5iri877573p06kj53w1xk5scj";
        libraryHaskellDepends = [
          base binary containers mtl RepLib transformers
        ];
@@ -214586,6 +215562,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unfix-binders" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unfix-binders";
+       version = "0.1.0";
+       sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss";
+       libraryHaskellDepends = [ base ];
+       description = "Unfixing and recursion schemes for data types with binders";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unfoldable" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
@@ -214952,6 +215940,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "union_0_1_2" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hashable, lens
+     , profunctors, tagged, vinyl
+     }:
+     mkDerivation {
+       pname = "union";
+       version = "0.1.2";
+       sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
+       libraryHaskellDepends = [
+         base deepseq hashable profunctors tagged vinyl
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq lens ];
+       description = "Extensible type-safe unions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "union-find" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -215193,8 +216198,8 @@ self: {
      }:
      mkDerivation {
        pname = "units-parser";
-       version = "0.1.1.2";
-       sha256 = "06kmrqswlivsas183jswsnqi21rmdh6cqw392b3ycj2x5avghqqa";
+       version = "0.1.1.3";
+       sha256 = "0lyy8nh86b0nq2znkli8y1zcg87l6acaaxi8b1m6falb6xnfi0nw";
        libraryHaskellDepends = [ base containers mtl multimap parsec ];
        testHaskellDepends = [
          base containers mtl multimap parsec syb tasty tasty-hunit
@@ -216273,6 +217278,7 @@ self: {
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-bytestring" = callPackage
@@ -216285,8 +217291,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.3.2.0";
-       sha256 = "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c";
+       version = "0.3.2.1";
+       sha256 = "1z61l4l8sg8vyrf7cri0awj5pnpzly8gp7dw9j26v9pcs6z1dgb4";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers
          template-haskell th-lift-instances
@@ -216566,6 +217572,7 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath_9_0_0_1" = callPackage
@@ -217591,6 +218598,8 @@ self: {
        pname = "validation";
        version = "1";
        sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh";
+       revision = "1";
+       editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3";
        libraryHaskellDepends = [
          base bifunctors deepseq lens semigroupoids semigroups
        ];
@@ -218337,14 +219346,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-algorithms_0_8_0_0" = callPackage
+  "vector-algorithms_0_8_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, mwc-random
      , primitive, QuickCheck, vector
      }:
      mkDerivation {
        pname = "vector-algorithms";
-       version = "0.8.0.0";
-       sha256 = "1czili52fsjfz2d19c4v6p1qw8jya4gcqsfan1njiydrzplw18np";
+       version = "0.8.0.1";
+       sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m";
        libraryHaskellDepends = [ base bytestring primitive vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
@@ -218496,6 +219505,7 @@ self: {
        ];
        description = "Utilities for the \"vector\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-fftw" = callPackage
@@ -219171,8 +220181,8 @@ self: {
      }:
      mkDerivation {
        pname = "vimeta";
-       version = "0.2.4.0";
-       sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d";
+       version = "0.2.5.0";
+       sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -219540,6 +220550,20 @@ self: {
        license = "GPL";
      }) {};
 
+  "vivid-osc_0_4_0_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, microspec, time
+     }:
+     mkDerivation {
+       pname = "vivid-osc";
+       version = "0.4.0.0";
+       sha256 = "10wbl11xwkahjsnvy14ysvkbylh615x7i8v4hwrji81rfy2bs29n";
+       libraryHaskellDepends = [ base binary bytestring cereal time ];
+       testHaskellDepends = [ base bytestring cereal microspec time ];
+       description = "Open Sound Control encode/decode";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vivid-supercollider" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, microspec
      , QuickCheck, split, utf8-string, vivid-osc
@@ -219781,7 +220805,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_24" = callPackage
+  "vty_5_24_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -219792,8 +220816,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.24";
-       sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw";
+       version = "5.24.1";
+       sha256 = "0xd9p9p1bfma5mvn9k4hv4h7sji2hq27b4lg6czgiwf97dmdw3yc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -221832,8 +222856,8 @@ self: {
      }:
      mkDerivation {
        pname = "warped";
-       version = "0.0.7";
-       sha256 = "04090z3sz551q604kkpaqwy2i0wsnzbqrnanvkw0wg3nikh9a3s6";
+       version = "0.0.8";
+       sha256 = "13s9z1vlgi29rb4ay5d508snh982gp04vclv6y4fsga2gia4sbhz";
        libraryHaskellDepends = [
          aeson base blaze-builder conduit http-types lifted-async
          monad-control preamble uuid wai wai-conduit wai-cors warp
@@ -222059,6 +223083,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weather-api" = callPackage
@@ -222154,6 +223179,7 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -224870,6 +225896,7 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ws-chans" = callPackage
@@ -227586,6 +228613,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "A strongly typed IRC library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yall" = callPackage
@@ -227797,7 +228825,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "yaml_0_10_2_0" = callPackage
+  "yaml_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -227806,27 +228834,26 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.10.2.0";
-       sha256 = "0yklc3fz18h9gawp00ff2qhmymh2g25dsf08si935rjd1wadhf23";
+       version = "0.11.0.0";
+       sha256 = "1gr72lb3zan7g9pxqzxn3zxcbnrkc0vapm2dvp1mdlm4576ncr76";
        configureFlags = [ "-fsystem-libyaml" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit containers directory
-         filepath mtl resourcet scientific template-haskell text
+         filepath libyaml mtl resourcet scientific template-haskell text
          transformers unordered-containers vector
        ];
-       librarySystemDepends = [ libyaml ];
        testHaskellDepends = [
          aeson attoparsec base base-compat bytestring conduit containers
-         directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet
-         scientific template-haskell temporary text transformers
+         directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
+         resourcet scientific template-haskell temporary text transformers
          unordered-containers vector
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libyaml;};
+     }) {};
 
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
@@ -228029,8 +229056,8 @@ self: {
        pname = "yampa-canvas";
        version = "0.2.2";
        sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
-       revision = "5";
-       editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg";
+       revision = "6";
+       editedCabalFile = "05bfjzmfvy4ir1bkky8iq4m988z4yww2k7h8s1na5i9w60c26d20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -228388,6 +229415,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yeshql-core_4_1_0_2" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, parsec
+     , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "yeshql-core";
+       version = "4.1.0.2";
+       sha256 = "1zhpccdqy8y5ynyn2ax7p9l2lvz573f559iqkip26ijq84pjmny0";
+       libraryHaskellDepends = [
+         base containers convertible filepath parsec template-haskell
+       ];
+       testHaskellDepends = [
+         base containers stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (core)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-hdbc" = callPackage
     ({ mkDerivation, base, containers, convertible, filepath, HDBC
      , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
@@ -228408,6 +229454,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yeshql-hdbc_4_1_0_2" = callPackage
+    ({ mkDerivation, base, containers, convertible, filepath, HDBC
+     , parsec, stm, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, yeshql-core
+     }:
+     mkDerivation {
+       pname = "yeshql-hdbc";
+       version = "4.1.0.2";
+       sha256 = "1p2j0fys7kdgb9882hiifnc1r4768c8jp7qy69ns1nbhd4f55b7l";
+       libraryHaskellDepends = [
+         base containers convertible filepath HDBC parsec template-haskell
+         yeshql-core
+       ];
+       testHaskellDepends = [
+         base containers HDBC stm tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "YesQL-style SQL database abstraction (HDBC backend)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yeshql-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible
      , filepath, parsec, postgresql-simple, stm, tasty, tasty-hunit
@@ -228415,8 +229482,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeshql-postgresql-simple";
-       version = "4.1.0.1";
-       sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq";
+       version = "4.1.0.2";
+       sha256 = "0mpha4lwb8z89cqlqly6ipssx37abpq10wbrhl979gm25s9yp4ab";
        libraryHaskellDepends = [
          base containers convertible filepath parsec postgresql-simple
          template-haskell yeshql-core
@@ -228580,6 +229647,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_6_5" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , cryptonite, data-default, email-validate, file-embed, http-client
+     , http-client-tls, http-conduit, http-types, memory, network-uri
+     , nonce, persistent, random, safe, shakespeare, template-haskell
+     , text, time, transformers, unliftio, unliftio-core
+     , unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.6.5";
+       sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-client-tls http-conduit http-types
+         memory network-uri nonce persistent random safe shakespeare
+         template-haskell text time transformers unliftio unliftio-core
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -228850,15 +229946,15 @@ self: {
 
   "yesod-auth-oauth" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, text
-     , transformers, unliftio, yesod-auth, yesod-core, yesod-form
+     , unliftio, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.6.0";
-       sha256 = "1czm2zs9w8aicpqxmcn97c6skrhcy7g57q51vvnf40pffblvh33g";
+       version = "1.6.0.1";
+       sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s";
        libraryHaskellDepends = [
-         authenticate-oauth base bytestring text transformers unliftio
-         yesod-auth yesod-core yesod-form
+         authenticate-oauth base bytestring text unliftio yesod-auth
+         yesod-core yesod-form
        ];
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -229110,42 +230206,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, fast-logger, gauge, hspec, hspec-expectations
-     , http-types, HUnit, monad-logger, mtl, network, parsec
-     , path-pieces, random, resourcet, rio, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , unix-compat, unliftio, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.6";
-       sha256 = "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types monad-logger mtl
-         parsec path-pieces random resourcet rio shakespeare
-         template-haskell text time transformers unix-compat unliftio
-         unordered-containers vector wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_7" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -229158,8 +230218,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.6.7";
-       sha256 = "0smjkfidavm1iggdi4wd47ykbx7jw1qknj6glyjq8cc3p75zc3w7";
+       version = "1.6.8";
+       sha256 = "010wjhf053bhivxascvlrxfmsqirhx6mf54aph3xblrkq8sx64hy";
        libraryHaskellDepends = [
          aeson auto-update base blaze-html blaze-markup byteable bytestring
          case-insensitive cereal clientsession conduit conduit-extra
@@ -229179,7 +230239,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -229462,6 +230521,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_6_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, text, time, transformers, wai
+     , xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.6.3";
+       sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare text time
+         transformers wai xss-sanitize yesod-core yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-bootstrap4" = callPackage
     ({ mkDerivation, base, text, yesod-core, yesod-form }:
      mkDerivation {
@@ -229845,6 +230927,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-persistent_1_6_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.6.0.1";
+       sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-platform" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
      , asn1-parse, asn1-types, attoparsec-conduit, authenticate
@@ -230301,6 +231405,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_6_0_1" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, conduit, containers, cryptonite
+     , cryptonite-conduit, css-text, data-default, directory, file-embed
+     , filepath, hashable, hjsmin, hspec, http-types, HUnit, memory
+     , mime-types, process, template-haskell, text, transformers
+     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+     , yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.6.0.1";
+       sha256 = "1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         conduit containers cryptonite cryptonite-conduit css-text
+         data-default directory file-embed filepath hashable hjsmin
+         http-types memory mime-types process template-haskell text
+         transformers unix-compat unordered-containers wai wai-app-static
+         yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring conduit containers
+         cryptonite cryptonite-conduit data-default directory file-embed
+         filepath hjsmin hspec http-types HUnit memory mime-types process
+         template-haskell text transformers unix-compat unordered-containers
+         wai wai-app-static wai-extra yesod-core yesod-test
+       ];
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
@@ -230405,6 +231542,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_6_5_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , bytestring, case-insensitive, conduit, containers, cookie, hspec
+     , hspec-core, html-conduit, http-types, HUnit, network, pretty-show
+     , semigroups, text, time, transformers, unliftio, wai, wai-extra
+     , xml-conduit, xml-types, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.6.5.1";
+       sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html bytestring
+         case-insensitive conduit containers cookie hspec-core html-conduit
+         http-types HUnit network pretty-show semigroups text time
+         transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit text
+         unliftio wai wai-extra xml-conduit yesod-core yesod-form
+       ];
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -231188,8 +232351,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, ieee754 }:
      mkDerivation {
        pname = "yoga";
-       version = "0.0.0.2";
-       sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c";
+       version = "0.0.0.5";
+       sha256 = "14az05jh60ncsyw859b9v9m7lb5xcgsv2478pa3if93vxy1h40ih";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];

From c6c29def605191f17f1de17418103b3c01875426 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Oct 2018 11:06:26 +0200
Subject: [PATCH 3092/3253] cabal2nix: update overrides for latest yaml version

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 86c0b93917e7..2971b941e156 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1060,11 +1060,11 @@ self: super: {
   # The tool needs a newer hpack version than the one mandated by LTS-12.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
     hpack = self.hpack_0_31_0;
-    yaml = self.yaml_0_10_2_0;
+    yaml = self.yaml_0_11_0_0;
   });
   stack2nix = super.stack2nix.overrideScope (self: super: {
     hpack = self.hpack_0_31_0;
-    yaml = self.yaml_0_10_2_0;
+    yaml = self.yaml_0_11_0_0;
   });
 
   # Break out of "aeson <1.3, temporary <1.3".

From 1e44702fc01ba746a21ff4c633be84d8361125ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 14 Oct 2018 16:14:51 +0200
Subject: [PATCH 3093/3253] git-annex: update sha256 hash for the new
 6.20181011 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2971b941e156..98521cce4ea7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -86,7 +86,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "09rhss1s6gxmqvb8k2l0f55mv38igyvikmm6d07zxkw6049q3maz";
+      sha256 = "069w4gdb104lc3vp48k3wywmgql56yc5g2g2i240xrr88in3qvqw";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From fe91334fbf2dffed16e59e9903efbae899818dab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Oct 2018 11:36:57 +0200
Subject: [PATCH 3094/3253] haskell-yesod-core: disable broken test suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 98521cce4ea7..6f654c32dbb2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1148,4 +1148,7 @@ self: super: {
 
   arbtt = doJailbreak super.arbtt;
 
+  # https://github.com/yesodweb/yesod/issues/1563
+  yesod-core = dontCheck super.yesod-core;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 6a4967d61fb0735bae309ae0981dc56deaf31cd3 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 15 Oct 2018 13:44:16 +0200
Subject: [PATCH 3095/3253] python.pkgs.pymediainfo: fix test

---
 pkgs/development/python-modules/pymediainfo/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index 3245c3d3c48f..2169f23295a7 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -22,6 +22,11 @@ buildPythonPackage rec {
                 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}")' \
       --replace 'CDLL("libmediainfo.so.0")' \
                 'CDLL("${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0")'
+
+    # Fix test, remove after version 2.3.0
+    substituteInPlace tests/test_pymediainfo.py \
+      --replace 'codec, "AVC"'    'format, "AVC"' \
+      --replace 'codec, "AAC LC"' 'format, "AAC"'
   '';
 
   nativeBuildInputs = [ setuptools_scm ];

From 6032bdd532c46dc11915c77d4992101b6a91221d Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 15 Oct 2018 13:45:10 +0200
Subject: [PATCH 3096/3253] rapid-photo-downloader: 0.9.10 -> 0.9.12

---
 pkgs/applications/graphics/rapid-photo-downloader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index d47f08c90b9c..d4edbae1d28e 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -6,11 +6,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rapid-photo-downloader";
-  version = "0.9.10";
+  version = "0.9.12";
 
   src = fetchurl {
     url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz";
-    sha256 = "1i0lfj9gnfya49gxx59ls364z651fqagd4krnz9jhg9m0l48ljdf";
+    sha256 = "0nzahps7hs120xv2r55k293kialf83nx44x3jg85yh349rpqrii8";
   };
 
   # Disable version check and fix install tests

From c7214bd17eae1cfcb13aafc214c7172ce7f38c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 15 Oct 2018 12:56:23 +0100
Subject: [PATCH 3097/3253] postfix: enable openldap by default

Ldap authentication is fairly common in any reasonable sized mail setup.
Our dovecot also comes with ldap support.
Other distributions like debian, archlinux, ubuntu and fedora also
provide ldap support along with there postfix server.
It might be also useful to have database support, but this is a different pull request.
---
 pkgs/servers/mail/postfix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index d88b9f8b0dbc..796d5696ebfa 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
 , coreutils, findutils, gnugrep, gawk, icu, pcre
+, withLDAP ? true, openldap
 , withPgSQL ? false, postgresql
 , withMySQL ? false, mysql
 , withSQLite ? false, sqlite
-, withLDAP ? false, openldap
 }:
 
 let

From 455e0ed88527d69a9c4a52e1238d35ec61556257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 14 Oct 2018 02:55:00 +0900
Subject: [PATCH 3098/3253] generators: make toPretty handle floats correctly

---
 lib/generators.nix | 1 +
 lib/tests/misc.nix | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/generators.nix b/lib/generators.nix
index f5faf7007860..863ba847423e 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -143,6 +143,7 @@ rec {
   }@args: v: with builtins;
     let     isPath   = v: typeOf v == "path";
     in if   isInt      v then toString v
+    else if isFloat    v then "~${toString v}"
     else if isString   v then ''"${libStr.escape [''"''] v}"''
     else if true  ==   v then "true"
     else if false ==   v then "false"
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index d89bcfde4819..853d911cdc81 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -369,6 +369,7 @@ runTests {
   testToPretty = {
     expr = mapAttrs (const (generators.toPretty {})) rec {
       int = 42;
+      float = 0.1337;
       bool = true;
       string = ''fno"rd'';
       path = /. + "/foo";
@@ -381,6 +382,7 @@ runTests {
     };
     expected = rec {
       int = "42";
+      float = "~0.133700";
       bool = "true";
       string = ''"fno\"rd"'';
       path = "/foo";

From 91ddc9d27f669e1dc09012cc7577377bf4e90e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 15 Oct 2018 13:12:06 +0100
Subject: [PATCH 3099/3253] postfix: add setgid wrapper for postqueue/postdrop

Both postqueue[1] and postdrop[2] implement a subset of administration
task that are supposed to be run unprivileged users
and require the setgid bit to full-fill this task.

[1] http://www.postfix.org/postqueue.1.html
[2] http://www.postfix.org/postdrop.1.html
---
 nixos/modules/services/mail/postfix.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 33249aa3e554..d43733484ffa 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -602,7 +602,7 @@ in
             target = "postfix";
           };
 
-        # This makes comfortable for root to run 'postqueue' for example.
+        # This makes it comfortable to run 'postqueue/postdrop' for example.
         systemPackages = [ pkgs.postfix ];
       };
 
@@ -616,6 +616,22 @@ in
         setgid = true;
       };
 
+      security.wrappers.postqueue = {
+        program = "postqueue";
+        source = "${pkgs.postfix}/bin/postqueue";
+        group = setgidGroup;
+        setuid = false;
+        setgid = true;
+      };
+
+      security.wrappers.postdrop = {
+        program = "postdrop";
+        source = "${pkgs.postfix}/bin/postdrop";
+        group = setgidGroup;
+        setuid = false;
+        setgid = true;
+      };
+
       users.users = optional (user == "postfix")
         { name = "postfix";
           description = "Postfix mail server user";

From f028f77abe3faad0a2883ea10deca614d93cbc84 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 15 Oct 2018 14:30:45 +0200
Subject: [PATCH 3100/3253] Revert "protobuf3: support cross compilation"

---
 pkgs/development/libraries/protobuf/generic-v3.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 883dff56f2ee..79e4c387cdf5 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,12 +1,11 @@
 { stdenv
 , fetchFromGitHub
-, autoreconfHook, zlib, gmock, which, buildPackages
+, autoreconfHook, zlib, gmock
 , version, sha256
 , ...
 }:
 
-let
-mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "protobuf-${version}";
 
   # make sure you test also -A pythonPackages.protobuf
@@ -29,10 +28,8 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
       --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
   '';
 
-  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
-
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ zlib ];
-  configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
 
   enableParallelBuilding = true;
 
@@ -57,7 +54,4 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
   };
 
   passthru.version = version;
-};
-in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
-                        then (mkProtobufDerivation null buildPackages.stdenv)
-                        else null) stdenv
+}

From 5fe8bb506cd43425837346d16caa0595cfa946da Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Tue, 28 Aug 2018 16:01:58 +0200
Subject: [PATCH 3101/3253] python.packages.tensorboard: 1.9.0 -> 1.11.0

---
 .../python-modules/tensorflow-tensorboard/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index 5cd0e9266022..7f2c2539a738 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "1.9.0";
+  version = "1.11.0";
   format = "wheel";
 
   src = fetchPypi ({
@@ -22,10 +22,10 @@ buildPythonPackage rec {
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "42a04637a636e16054b065907c81396b83a9702948ecd14218f19dc5cf85de98";
+    sha256 = "1nkd37zq9mk0gc9x6d4x8whahbx2cn0wl94lir3g1pibdzx9hc4v";
   } else {
     python = "py2";
-    sha256 = "97661706fbe857c372405e0f5bd7c3db2197b5e70cec88f6924b726fde65c2c1";
+    sha256 = "1mkyb5gn952i4s7fmc9ay4yh74ysrqbiqna6dl1qmahjpbaavbf5";
   }));
 
   propagatedBuildInputs = [ numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures;

From a8a3928a34146b3f6ad6152cf41e936ffb3ec625 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Tue, 28 Aug 2018 16:02:28 +0200
Subject: [PATCH 3102/3253] python.packages.tensorflow: 1.9.0 -> 1.11.0

---
 .../python-modules/tensorflow/bin.nix         | 11 +++---
 .../python-modules/tensorflow/prefetcher.sh   |  2 +-
 .../tensorflow/tf1.11.0-hashes.nix            | 34 +++++++++++++++++++
 .../tensorflow/tf1.9.0-hashes.nix             | 34 -------------------
 4 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix
 delete mode 100644 pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index cad2a93640ae..b925b74e03b5 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -22,6 +22,8 @@
 , zlib
 , python
 , symlinkJoin
+, keras-applications
+, keras-preprocessing
 }:
 
 # We keep this binary build for two reasons:
@@ -39,7 +41,7 @@ let
 
 in buildPythonPackage rec {
   pname = "tensorflow";
-  version = "1.9.0";
+  version = "1.11.0";
   format = "wheel";
 
   src = let
@@ -48,12 +50,11 @@ in buildPythonPackage rec {
     platform = if stdenv.isDarwin then "mac" else "linux";
     unit = if cudaSupport then "gpu" else "cpu";
     key = "${platform}_py_${pyver}_${unit}";
-    dls = import ./tf1.9.0-hashes.nix;
+    dls = import ./tf1.11.0-hashes.nix;
   in fetchurl dls.${key};
 
-  propagatedBuildInputs = [  protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard ]
-                 ++ lib.optional (!isPy3k) mock
-                 ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ];
+  propagatedBuildInputs = [  protobuf numpy termcolor grpcio six astor absl-py gast tensorflow-tensorboard keras-applications keras-preprocessing ]
+                 ++ lib.optional (!isPy3k) mock;
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
   # and the propageted input tensorflow-tensorboard which causes environment collisions.
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh
index 6b98ece974eb..0954a3810057 100644
--- a/pkgs/development/python-modules/tensorflow/prefetcher.sh
+++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh
@@ -1,4 +1,4 @@
-version=1.9.0
+version=1.11.0
 hashfile=tf${version}-hashes.nix
 rm -f $hashfile
 echo "{" >> $hashfile
diff --git a/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix
new file mode 100644
index 000000000000..47cd25ef7571
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/tf1.11.0-hashes.nix
@@ -0,0 +1,34 @@
+{
+linux_py_27_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp27-none-linux_x86_64.whl";
+  sha256 = "0s3ar2jzz2m9ilqfl4aigfi4bq8k5n04grnfqy4nyii2y98xjy14";
+};
+linux_py_35_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "0vfw2v033h8wdgjlbwjx2i9fdqqnxxc3r085irq9nzkdmwzw2jl8";
+};
+linux_py_36_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.11.0-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "0zmr5bw3ki5l6jb19h70kmq3k3xnq60jkw6wqqr6par1c7b4i9c3";
+};
+linux_py_27_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp27-none-linux_x86_64.whl";
+  sha256 = "1pcacy4ky7zhq7h7d93s4xp213q1yj2zxn2khlyll389lq0bcbax";
+};
+linux_py_35_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "04ggz7jzbhl41alnj526rp0vz88h68mcv3rbs5pmrwyg0j2cqjz3";
+};
+linux_py_36_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.11.0-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "1ywpq3n51pn7jrr231immi2s6ghdy9s0bnkk7dg4dbbxrisxg33a";
+};
+mac_py_2_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py2-none-any.whl";
+  sha256 = "1rjb6gm0spj0l5zl02zsr6x3qagf2khrjw02z7znmsshb5xhsx8j";
+};
+mac_py_3_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.11.0-py3-none-any.whl";
+  sha256 = "16la41a2d29wa4i7h1g32d94g23ixzc3wc69kd9w82w45bwfv4xl";
+};
+}
diff --git a/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix
deleted file mode 100644
index 504ed7b5b957..000000000000
--- a/pkgs/development/python-modules/tensorflow/tf1.9.0-hashes.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-linux_py_27_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp27-none-linux_x86_64.whl";
-  sha256 = "1dvmajv5ddgzrazdnxpfhk9dkj0lfiviw4jmvk00d4q5v68z6ihg";
-};
-linux_py_35_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "07ilrxbhz9p3xwqhl2p8c40y1gsq68x10f34pzayrvcg2i52bvpv";
-};
-linux_py_36_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.9.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "0x2l64ab7i8nr0dzvsryblhn869qyjb85xkhy69nwahqswb68hxl";
-};
-linux_py_27_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp27-none-linux_x86_64.whl";
-  sha256 = "0q7i82jgy0mzn2mw8i1z0pvv7ssi6m7zqkkjg2i4zxpk8djg8k6z";
-};
-linux_py_35_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "0nhq2s8fanm095x1sc9h40dvqcv9bc2aj47crv3c2sajbj7dn43g";
-};
-linux_py_36_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.9.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "1m4b9cd8ghghqxaqrlzq7j9499ddidgr78bx0c20pgyrzg38jiz1";
-};
-mac_py_2_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.9.0-py2-none-any.whl";
-  sha256 = "1djj0xahzrmxhfc6kyjx1lkyfh7jhq3ix0gz9j3iq4smb3ca9z01";
-};
-mac_py_3_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.9.0-py3-none-any.whl";
-  sha256 = "0igffy7r0d8mhkn4pybp19jmc25alfpfl4k4fxh2s3rvgii8gk22";
-};
-}

From de4f6cb453640dfe156177b08e54a0a072010e6e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 15 Oct 2018 13:41:45 +0000
Subject: [PATCH 3103/3253] ocamlPackages.elpi: 1.0.5 -> 1.1.0

---
 pkgs/development/ocaml-modules/elpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 3eecb9b45b7d..fd42cbe20c7f 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-elpi-${version}";
-  version = "1.0.5";
+  version = "1.1.0";
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "1n1m183l4ms949m2l24w0887m1rmvc9b3j8alnbw8ckn6wwnhpmk";
+    sha256 = "1fd4mqggdcnbhqwrg8r0ikb1j2lv0fc9hv9xfbyjzbzxbjggf5zc";
   };
 
   buildInputs = [ ocaml findlib ppx_tools_versioned ];

From bf7600d3b568963b41124699940bda6092962910 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Mon, 15 Oct 2018 15:48:19 +0200
Subject: [PATCH 3104/3253] openafs: Align package name with kernel version
 based on modDirVersion

---
 pkgs/servers/openafs/1.6/module.nix | 2 +-
 pkgs/servers/openafs/1.8/module.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index 7ad9199b7ace..f5b735158e9c 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -8,7 +8,7 @@ let
   kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
 in stdenv.mkDerivation rec {
-  name = "openafs-${version}-${kernel.version}";
+  name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
   nativeBuildInputs = [ autoconf automake flex perl bison which ] ++ kernel.moduleBuildDependencies;
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index cfd9f0561e99..7167cf5dec49 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -8,7 +8,7 @@ let
   kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
 
 in stdenv.mkDerivation rec {
-  name = "openafs-${version}-${kernel.version}";
+  name = "openafs-${version}-${kernel.modDirVersion}";
   inherit version src;
 
   nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]

From a8623de3071d1c9333bca483dd2a687c5c06f394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 15 Oct 2018 10:58:42 -0300
Subject: [PATCH 3105/3253] deepin-wm: init at 1.9.32

---
 pkgs/desktops/deepin/deepin-wm/default.nix | 58 ++++++++++++++++++++++
 pkgs/desktops/deepin/default.nix           |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-wm/default.nix

diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix
new file mode 100644
index 000000000000..f936934dcc0c
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-wm/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
+  bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3,
+  deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
+  hicolor-icon-theme }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-wm";
+  version = "1.9.32";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libtool
+    gnome3.gnome-common
+    vala
+  ];
+
+  buildInputs = [
+    gnome3.gnome-desktop
+    gnome3.libgee
+    bamf
+    clutter-gtk
+    granite
+    libcanberra-gtk3
+    libwnck3
+    deepin-mutter
+    deepin-wallpapers
+    deepin-desktop-schemas
+    hicolor-icon-theme
+  ];
+
+  postPatch = ''
+    sed -i src/Background/BackgroundSource.vala \
+      -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
+  '';
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Deepin Window Manager";
+    homepage = https://github.com/linuxdeepin/deepin-wm;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 84f41dc3451b..d661a978d712 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -21,6 +21,7 @@ let
       wnck = pkgs.libwnck3;
     };
     deepin-wallpapers = callPackage ./deepin-wallpapers { };
+    deepin-wm = callPackage ./deepin-wm { };
     dtkcore = callPackage ./dtkcore { };
     dtkwm = callPackage ./dtkwm { };
     dtkwidget = callPackage ./dtkwidget { };

From 2a2c99673bca1d30d53c530787a10a7d1c5b1de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 15 Oct 2018 22:04:47 +0900
Subject: [PATCH 3106/3253] release-notes/18-09: add licenses marked as unfree

---
 nixos/doc/manual/release-notes/rl-1809.xml | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index c5521735428b..0ddf40acbfcc 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -475,6 +475,48 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   </para>
 
   <itemizedlist>
+   <listitem>
+    <para>
+     Some licenses that were incorrectly not marked as unfree now are. This is
+     the case for:
+     <itemizedlist>
+      <listitem>
+       <para>
+        cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
+        2.0
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
+        2.5
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
+        3.0
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
+        4.0
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        cc-by-nd-30: Creative Commons Attribution-No Derivative Works v3.00
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        msrla: Microsoft Research License Agreement
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
    <listitem>
     <para>
      The deprecated <varname>services.cassandra</varname> module has seen a

From 02e8e56500b95159f892804a81178b636a8534f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 15 Oct 2018 22:28:19 +0900
Subject: [PATCH 3107/3253] package-notes: line wrap by auto-cleanup

---
 doc/package-notes.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 0543e06a05d4..dad28d3ec8b2 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -413,7 +413,8 @@ packageOverrides = pkgs: {
     in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
 <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
     if you are using PulseAudio - this will enable 32bit ALSA apps integration.
-    To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
+    To use the Steam controller or other Steam supported controllers such as
+    the DualShock 4 or Nintendo Switch Pro, you need to add
 <programlisting>hardware.steam-hardware.enable = true;</programlisting>
     to your configuration.
    </para>

From 861b70f4839be610f16fbfdf58a9670a3f8f3296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 15 Oct 2018 22:48:28 +0900
Subject: [PATCH 3108/3253] nixos manual: automatic reflow

---
 .../manual/administration/container-networking.xml   |  1 +
 nixos/doc/manual/release-notes/rl-1903.xml           | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 8aca329c8f1f..2ee8bfdd50f1 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -52,6 +52,7 @@ $ ping -c1 10.233.4.2
 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 </programlisting>
  </para>
+
  <para>
   You may need to restart your system for the changes to take effect.
  </para>
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 9cb5b93f27cb..8b2eba9c10d6 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -106,12 +106,12 @@
     </para>
    </listitem>
    <listitem>
-     <para>
-       The <literal>light</literal> module no longer uses setuid binaries, but
-       udev rules. As a consequence users of that module have to belong to the
-       <literal>video</literal> group in order to use the executable
-       (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
-     </para>
+    <para>
+     The <literal>light</literal> module no longer uses setuid binaries, but
+     udev rules. As a consequence users of that module have to belong to the
+     <literal>video</literal> group in order to use the executable (i.e.
+     <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
+    </para>
    </listitem>
   </itemizedlist>
  </section>

From ff937fd06c5fff1017ef80573edb6e943ae10b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 14 Oct 2018 21:44:26 +0900
Subject: [PATCH 3109/3253] webassemblyjs tool suite: init at 1.7.8

---
 .../node-packages/node-packages-v10.nix       |   56 +-
 .../node-packages/node-packages-v6.nix        |   56 +-
 .../node-packages/node-packages-v8.json       |    5 +
 .../node-packages/node-packages-v8.nix        | 2322 +++++++++--------
 pkgs/top-level/all-packages.nix               |    6 +
 5 files changed, 1308 insertions(+), 1137 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index ae7130375524..e94e8bfff1ed 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -1246,13 +1246,13 @@ let
         sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==";
       };
     };
-    "minizlib-1.1.0" = {
+    "minizlib-1.1.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
-        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
+        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -1327,13 +1327,13 @@ let
         sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==";
       };
     };
-    "npm-packlist-1.1.11" = {
+    "npm-packlist-1.1.12" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz";
-        sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz";
+        sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==";
       };
     };
     "npmlog-4.1.2" = {
@@ -1719,17 +1719,17 @@ let
       packageName = "semver";
       version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
         sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
       };
     };
-    "semver-5.5.1" = {
+    "semver-5.6.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.5.1";
+      version = "5.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz";
-        sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
+        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -1831,13 +1831,13 @@ let
         sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
       };
     };
-    "sshpk-1.14.2" = {
+    "sshpk-1.15.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.2";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
-        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz";
+        sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==";
       };
     };
     "static-extend-0.1.2" = {
@@ -1872,7 +1872,7 @@ let
       packageName = "strip-ansi";
       version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
@@ -2475,7 +2475,7 @@ in
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
@@ -2502,10 +2502,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
-      sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
+      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -2555,13 +2555,13 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.4"
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
-      sources."npm-packlist-1.1.11"
+      sources."npm-packlist-1.1.12"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -2581,7 +2581,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -2606,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.16.2";
+    version = "2.16.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
-      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz";
+      sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 842e1a165314..dc028435ad0a 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1246,13 +1246,13 @@ let
         sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==";
       };
     };
-    "minizlib-1.1.0" = {
+    "minizlib-1.1.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
-        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
+        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -1327,13 +1327,13 @@ let
         sha512 = "m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==";
       };
     };
-    "npm-packlist-1.1.11" = {
+    "npm-packlist-1.1.12" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "1.1.11";
+      version = "1.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz";
-        sha512 = "CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz";
+        sha512 = "WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==";
       };
     };
     "npmlog-4.1.2" = {
@@ -1719,17 +1719,17 @@ let
       packageName = "semver";
       version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
         sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
       };
     };
-    "semver-5.5.1" = {
+    "semver-5.6.0" = {
       name = "semver";
       packageName = "semver";
-      version = "5.5.1";
+      version = "5.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz";
-        sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
+        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -1831,13 +1831,13 @@ let
         sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
       };
     };
-    "sshpk-1.14.2" = {
+    "sshpk-1.15.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.2";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
-        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz";
+        sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==";
       };
     };
     "static-extend-0.1.2" = {
@@ -1872,7 +1872,7 @@ let
       packageName = "strip-ansi";
       version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
@@ -2475,7 +2475,7 @@ in
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
@@ -2502,10 +2502,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
-      sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
+      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -2555,13 +2555,13 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.4"
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.5"
-      sources."npm-packlist-1.1.11"
+      sources."npm-packlist-1.1.12"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -2581,7 +2581,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -2606,10 +2606,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.16.2";
+    version = "2.16.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
-      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz";
+      sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 779e6389bd39..f297614ec38f 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -125,6 +125,11 @@
 , "ungit"
 , "vue-cli"
 , "@vue/cli"
+, "@webassemblyjs/cli"
+, "@webassemblyjs/repl"
+, "@webassemblyjs/wasm-strip"
+, "@webassemblyjs/wasm-text-gen"
+, "@webassemblyjs/wast-refmt"
 , "webdrvr"
 , "webpack"
 , "webtorrent-cli"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index de90e1d188c5..4a6c248e2952 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -49,6 +49,15 @@ let
         sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA==";
       };
     };
+    "@babel/generator-7.1.3" = {
+      name = "_at_babel_slash_generator";
+      packageName = "@babel/generator";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz";
+        sha512 = "ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==";
+      };
+    };
     "@babel/highlight-7.0.0" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
@@ -58,6 +67,15 @@ let
         sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==";
       };
     };
+    "@babel/parser-7.1.3" = {
+      name = "_at_babel_slash_parser";
+      packageName = "@babel/parser";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz";
+        sha512 = "gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==";
+      };
+    };
     "@babel/runtime-7.1.2" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -76,6 +94,15 @@ let
         sha512 = "drxaPByExlcRDKW4ZLubUO4ZkI8/8ax9k9wve1aEthdLKFzjB7XRkOQ0xoTIWGxqdDnWDElkjYq77bt7yrcYJQ==";
       };
     };
+    "@babel/template-7.1.2" = {
+      name = "_at_babel_slash_template";
+      packageName = "@babel/template";
+      version = "7.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz";
+        sha512 = "SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==";
+      };
+    };
     "@babel/types-7.0.0-beta.38" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -85,6 +112,15 @@ let
         sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q==";
       };
     };
+    "@babel/types-7.1.3" = {
+      name = "_at_babel_slash_types";
+      packageName = "@babel/types";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz";
+        sha512 = "RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==";
+      };
+    };
     "@cliqz-oss/firefox-client-0.3.1" = {
       name = "_at_cliqz-oss_slash_firefox-client";
       packageName = "@cliqz-oss/firefox-client";
@@ -103,13 +139,13 @@ let
         sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
       };
     };
-    "@commitlint/cli-7.2.0" = {
+    "@commitlint/cli-7.2.1" = {
       name = "_at_commitlint_slash_cli";
       packageName = "@commitlint/cli";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.0.tgz";
-        sha512 = "qFTXZoyi+XFkUXRj1pgcfRw5ao31kPkP/V3c7O8SU52GUVxFo2LM8sFiTF9WEqlgSd7WJA0SGl5tOX/VtCMYEA==";
+        url = "https://registry.npmjs.org/@commitlint/cli/-/cli-7.2.1.tgz";
+        sha512 = "PUHWGoQOx8m6ZSpZPSHb+YISFAvW7jiWvCJOQiViKHZC8CLKu4bjyc/AwP8gBte0RsTGAu1ekiitp5Q0NcLGcA==";
       };
     };
     "@commitlint/config-conventional-7.1.2" = {
@@ -139,40 +175,40 @@ let
         sha512 = "EP/SqX2U2L4AQHglZ2vGM1pvHJOh3sbYtHn1QhtllqEpsdmhuNpVPSGHP/r9OD2h4i90vtnWgZQoskt2MkbknA==";
       };
     };
-    "@commitlint/format-7.2.0" = {
+    "@commitlint/format-7.2.1" = {
       name = "_at_commitlint_slash_format";
       packageName = "@commitlint/format";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.0.tgz";
-        sha512 = "Vx10wFyP3yfE4tq1x0HWb/vqkZc5+79uWak91sARSu5wG5JVzBvQXxfqOhefOKbVqXGKXlP2yXrSq8fM6YUQ3w==";
+        url = "https://registry.npmjs.org/@commitlint/format/-/format-7.2.1.tgz";
+        sha512 = "1YcL+ZWB8V52oDFQBhSBJjiJOZDt4Vl06O5TkG70BMpre3EQru5KYIN16eEPqfihNw0bj8gSIWcf87Gvh3OrOw==";
       };
     };
-    "@commitlint/is-ignored-7.2.0" = {
+    "@commitlint/is-ignored-7.2.1" = {
       name = "_at_commitlint_slash_is-ignored";
       packageName = "@commitlint/is-ignored";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.0.tgz";
-        sha512 = "6HCkLSuh4hms72x0EJp9mt9UXq27MRpZtmf7exhBnYqNyd76vMMA7/nGjdULxldr2xyzlzKNjMbh2lpQRD4aog==";
+        url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-7.2.1.tgz";
+        sha512 = "3DsEEKRnj8Bv9qImsxWcGf9BwerDnk5Vs+oK6ELzIwkndHaAZLHyATjmaz/rsc+U+DWiVjgKrrw3xvd/UsoazA==";
       };
     };
-    "@commitlint/lint-7.2.0" = {
+    "@commitlint/lint-7.2.1" = {
       name = "_at_commitlint_slash_lint";
       packageName = "@commitlint/lint";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.0.tgz";
-        sha512 = "aZAiQggpF638/XmY7EJe5yTEhg4C4GrxWktcdEDMQrRG1phFUPp+AKXBqljDYzrpmptiL9glY3fLO1m5XzA+BA==";
+        url = "https://registry.npmjs.org/@commitlint/lint/-/lint-7.2.1.tgz";
+        sha512 = "rM7nUyNUJyuKw1MTwJG/wk4twB5YCAG2wzJMn5NqVpGD/qmLOzlZoBl0+CYmuOsbIRAA2rlEV6KZHBk9tTfAdQ==";
       };
     };
-    "@commitlint/load-7.2.0" = {
+    "@commitlint/load-7.2.1" = {
       name = "_at_commitlint_slash_load";
       packageName = "@commitlint/load";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.0.tgz";
-        sha512 = "+7rh1jeYhSMj6+zzZVbo5bMnuWx1nL4c5JJdEq3rMQT6ILI169xlL94sPdkz0to6dDmi4yLgC4/kipyLyynriA==";
+        url = "https://registry.npmjs.org/@commitlint/load/-/load-7.2.1.tgz";
+        sha512 = "FnfmfhPGJqGwILVRznduBejOicNey6p/byfcyxtcBkN2+X96gDuNtqcnGcngCrzPIAgaIrQQcTQDA1/KMtW21A==";
       };
     };
     "@commitlint/message-7.1.2" = {
@@ -688,13 +724,13 @@ let
         sha512 = "eJhofrUCUaItMIH6et8kI7YqHfhjWqGZoTsE+40NRCfAraOMWx+pDzfRfeoAl3qeRAH2HhNj1bkYn70FbUOxuQ==";
       };
     };
-    "@lerna/publish-3.4.1" = {
+    "@lerna/publish-3.4.3" = {
       name = "_at_lerna_slash_publish";
       packageName = "@lerna/publish";
-      version = "3.4.1";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.1.tgz";
-        sha512 = "Nd5PT2Ksngo1GHqT6ccmGVfMvoA9MplBvqyzPFIjFIJOgODrJ9IGJAMobxgBQ6xXXShflQ/1dHWk8faTOYKLoQ==";
+        url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.4.3.tgz";
+        sha512 = "baeRL8xmOR25p86cAaS9mL0jdRzdv4dUo04PlK2Wes+YlL705F55cSXeC9npNie+9rGwFyLzCTQe18WdbZyLuw==";
       };
     };
     "@lerna/resolve-symlink-3.3.0" = {
@@ -918,7 +954,7 @@ let
       packageName = "@types/accepts";
       version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz";
+        url = "http://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz";
         sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==";
       };
     };
@@ -927,7 +963,7 @@ let
       packageName = "@types/async";
       version = "2.0.49";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/async/-/async-2.0.49.tgz";
+        url = "http://registry.npmjs.org/@types/async/-/async-2.0.49.tgz";
         sha512 = "Benr3i5odUkvpFkOpzGqrltGdbSs+EVCkEBGXbuR7uT0VzhXKIkhem6PDzHdx5EonA+rfbB3QvP6aDOw5+zp5Q==";
       };
     };
@@ -958,15 +994,6 @@ let
         sha512 = "a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==";
       };
     };
-    "@types/commander-2.12.2" = {
-      name = "_at_types_slash_commander";
-      packageName = "@types/commander";
-      version = "2.12.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/commander/-/commander-2.12.2.tgz";
-        sha512 = "0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q==";
-      };
-    };
     "@types/connect-3.4.32" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
@@ -999,7 +1026,7 @@ let
       packageName = "@types/events";
       version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz";
+        url = "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz";
         sha512 = "KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==";
       };
     };
@@ -1039,22 +1066,22 @@ let
         sha512 = "A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==";
       };
     };
-    "@types/node-10.11.4" = {
+    "@types/node-10.11.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.11.4";
+      version = "10.11.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.11.4.tgz";
-        sha512 = "ojnbBiKkZFYRfQpmtnnWTMw+rzGp/JiystjluW9jgN3VzRwilXddJ6aGQ9V/7iuDG06SBgn7ozW9k3zcAnYjYQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.11.7.tgz";
+        sha512 = "yOxFfkN9xUFLyvWaeYj90mlqTJ41CsQzWKS3gXdOMOyPVacUsymejKxJ4/pMW7exouubuEeZLJawGgcNGYlTeg==";
       };
     };
-    "@types/node-8.10.34" = {
+    "@types/node-8.10.36" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.34";
+      version = "8.10.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.34.tgz";
-        sha512 = "alypNiaAEd0RBGXoWehJ2gchPYCITmw4CYBoB5nDlji8l8on7FsklfdfIs4DDmgpKLSX3OF3ha6SV+0W7cTzUA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.36.tgz";
+        sha512 = "SL6KhfM7PTqiFmbCW3eVNwVBZ+88Mrzbuvn9olPsfv43mbiWaFY+nRcz/TGGku0/lc2FepdMbImdMY1JrQ+zbw==";
       };
     };
     "@types/range-parser-1.2.2" = {
@@ -1111,31 +1138,31 @@ let
         sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
       };
     };
-    "@vue/cli-shared-utils-3.0.4" = {
+    "@vue/cli-shared-utils-3.0.5" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.4.tgz";
-        sha512 = "st6f/s1nCo45r3yZDYCuWaFME/ECB9Mz4bPxlC9cl/3McMSESJvhnJAlh75DVdsp5teNr8HSzHwfTRfmQtKKyw==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.5.tgz";
+        sha512 = "z5vPzUQGZJnRkojqVbDYar8NvGSvB0kUcO0O+Y+xkxVbjZxrq78e9bJFB4PR4QsqQbuBS9v3zawLWY4MhKwKOA==";
       };
     };
-    "@vue/cli-ui-3.0.4" = {
+    "@vue/cli-ui-3.0.5" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.4.tgz";
-        sha512 = "tdqcHDyXm/sqO7LQWJ8g1DItez6dJQyeiTn/xJIU/vsTOoUhi2s+PslTB7acPrzgya3j1ORDPJ9nHfkpE0xM8Q==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.0.5.tgz";
+        sha512 = "lQ/xdtX/p+yER6tLxAt1oeudsQ4el/BWKqqGolKKydv78nk8AQlcVVH5AsojqqICuDpHO20XFKIp45lXhJ4YnA==";
       };
     };
-    "@vue/cli-ui-addon-webpack-3.0.4" = {
+    "@vue/cli-ui-addon-webpack-3.0.5" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.4.tgz";
-        sha512 = "93cZaZxPUUg/hxxkFNUTrtMNP8Yk2KzI3ndX25yPi2THm5gNPYMXiDE/9s8lzs6kzX2VOO1bxbukOdkJ0ZdkNw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.0.5.tgz";
+        sha512 = "DhZ+wIaJnLzcVmkZMWxy0If9Rh68YWhsxeXuxIbcL4tpGBbIdd+44A5CqHWFkTkVma5zWlqckhVuTXUYdstEZw==";
       };
     };
     "@webassemblyjs/ast-1.7.8" = {
@@ -1183,6 +1210,15 @@ let
         sha512 = "TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==";
       };
     };
+    "@webassemblyjs/helper-flaten-ast-1.7.8" = {
+      name = "_at_webassemblyjs_slash_helper-flaten-ast";
+      packageName = "@webassemblyjs/helper-flaten-ast";
+      version = "1.7.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-flaten-ast/-/helper-flaten-ast-1.7.8.tgz";
+        sha512 = "Z6U67Havfc1LsCysc2Wb7FKjSxBXgaEp39wfzjPA86mcctxYv6T+6udzmgD872/s24TZoV4cC65eC78JT0kaeg==";
+      };
+    };
     "@webassemblyjs/helper-fsm-1.7.8" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
@@ -1246,6 +1282,15 @@ let
         sha512 = "9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==";
       };
     };
+    "@webassemblyjs/validation-1.7.8" = {
+      name = "_at_webassemblyjs_slash_validation";
+      packageName = "@webassemblyjs/validation";
+      version = "1.7.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.7.8.tgz";
+        sha512 = "UmEQX0TMA+uCbaQYA+Z8YwwIr+Y5W5UMaROEh4V+7Ef6HpkFZBn8sHRo5xNQORy2rxkkOSR25tjUK62n6iQlDA==";
+      };
+    };
     "@webassemblyjs/wasm-edit-1.7.8" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
@@ -1368,7 +1413,7 @@ let
       packageName = "JSONStream";
       version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz";
         sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0";
       };
     };
@@ -1377,17 +1422,17 @@ let
       packageName = "JSONStream";
       version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
         sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
       };
     };
-    "JSONStream-1.3.4" = {
+    "JSONStream-1.3.5" = {
       name = "JSONStream";
       packageName = "JSONStream";
-      version = "1.3.4";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.4.tgz";
-        sha512 = "Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==";
+        url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz";
+        sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==";
       };
     };
     "JSV-4.0.2" = {
@@ -1719,7 +1764,7 @@ let
       packageName = "adm-zip";
       version = "0.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
+        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
@@ -3010,6 +3055,15 @@ let
         sha512 = "oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==";
       };
     };
+    "ast-types-0.11.6" = {
+      name = "ast-types";
+      packageName = "ast-types";
+      version = "0.11.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.11.6.tgz";
+        sha512 = "nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==";
+      };
+    };
     "ast-types-0.9.6" = {
       name = "ast-types";
       packageName = "ast-types";
@@ -3262,13 +3316,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.330.0" = {
+    "aws-sdk-2.334.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.330.0";
+      version = "2.334.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.330.0.tgz";
-        sha512 = "biW3J8S9/b9uqeED2jbBHEbscwIclc0PBiylUkd3lJ5s226Yuv7mwSOfoI2Eogpyg/i97phK3uiUb/Q89/pCpQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.334.0.tgz";
+        sha512 = "JiqtB2t/PklHCfo86HA6g6a8CXu5SDNa8XiaQ0rYyVBlzDR41p/s/yNlva3D1/QGiBTojl2fd9ZxBUxKa2Q9cg==";
       };
     };
     "aws-sign-0.2.1" = {
@@ -3469,6 +3523,15 @@ let
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
+    "azure-arm-resource-7.0.0" = {
+      name = "azure-arm-resource";
+      packageName = "azure-arm-resource";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.0.0.tgz";
+        sha512 = "LW1OmW49d5xQo/KDBK2BNfoFVOlP8Gq9yKqP2kz0e6RURl5UXhIfN65Y4GeJramuyGIOXeGPV+NrXrzl1k4d4g==";
+      };
+    };
     "azure-arm-servermanagement-1.1.0" = {
       name = "azure-arm-servermanagement";
       packageName = "azure-arm-servermanagement";
@@ -3496,13 +3559,13 @@ let
         sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50";
       };
     };
-    "azure-arm-website-0.11.5" = {
+    "azure-arm-website-5.3.0" = {
       name = "azure-arm-website";
       packageName = "azure-arm-website";
-      version = "0.11.5";
+      version = "5.3.0";
       src = fetchurl {
-        url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz";
-        sha1 = "51942423e1238ec19e551926353a8e9f73bc534a";
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-5.3.0.tgz";
+        sha512 = "R2x44/SIGCuTBkRvnZuEjagIMAqcec38HnCl1AEO9NwpEh0HiD9eIa1XEM7j6wa7vHqyQdL7hNwYnCS0QRDkNQ==";
       };
     };
     "azure-asm-compute-0.18.0" = {
@@ -3631,13 +3694,13 @@ let
         sha512 = "ab0LlM5Q3pcKm+V6F6yx2ShzGOTYMcmJvLdL3PQsC9hF+hrYsBdkTCdNZdlPBgrSB8jp5vzhmK83qHGRs14hHw==";
       };
     };
-    "azure-keyvault-1.0.0" = {
+    "azure-keyvault-3.0.4" = {
       name = "azure-keyvault";
       packageName = "azure-keyvault";
-      version = "1.0.0";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-1.0.0.tgz";
-        sha1 = "d630f98032aadbb5e72fb04d2da49b368e441c9e";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-3.0.4.tgz";
+        sha1 = "b7733d8f58d99a66f9ae766451556eb3b058dae5";
       };
     };
     "azure-monitoring-0.10.6" = {
@@ -3649,13 +3712,13 @@ let
         sha512 = "6HNA8VuC5qYvQMjcQt2/zlB7oyAJ7n6KGIYGstS6KS9Orux0peqxlrGPDeQRa4jDNq6ili83KiGc7RhWcgsE4Q==";
       };
     };
-    "azure-servicefabric-0.1.5" = {
+    "azure-servicefabric-2.0.0" = {
       name = "azure-servicefabric";
       packageName = "azure-servicefabric";
-      version = "0.1.5";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
-        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-2.0.0.tgz";
+        sha512 = "SkMg4vVrQ7Vd7/h8h3qZzURQysV4KJqUIy4pjs/XRjVbCduSePlJ3EOgAl9ed739RWkT906xIAU3tu2Pf5RKFQ==";
       };
     };
     "azure-storage-2.10.1" = {
@@ -4297,13 +4360,13 @@ let
         sha512 = "DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==";
       };
     };
-    "binstall-1.2.0" = {
+    "binstall-1.2.1" = {
       name = "binstall";
       packageName = "binstall";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "http://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz";
-        sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933";
+        url = "https://registry.npmjs.org/binstall/-/binstall-1.2.1.tgz";
+        sha512 = "mRTtOHr76uwiHuMjAxgK2TY10M99NgeXBFitGrOGXdGyTcAXOq5brPdzVz8y361TO3Chgnce9iQ9jVyv4xMW+Q==";
       };
     };
     "bitfield-0.1.0" = {
@@ -5935,15 +5998,6 @@ let
         sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA==";
       };
     };
-    "chokidar-1.6.0" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz";
-        sha1 = "90c32ad4802901d7713de532dc284e96a63ad058";
-      };
-    };
     "chokidar-1.7.0" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -6646,6 +6700,15 @@ let
         sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
       };
     };
+    "colornames-1.1.1" = {
+      name = "colornames";
+      packageName = "colornames";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz";
+        sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96";
+      };
+    };
     "colors-0.5.1" = {
       name = "colors";
       packageName = "colors";
@@ -6700,6 +6763,15 @@ let
         sha512 = "rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==";
       };
     };
+    "colorspace-1.1.1" = {
+      name = "colorspace";
+      packageName = "colorspace";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.1.tgz";
+        sha512 = "pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==";
+      };
+    };
     "colour-0.7.1" = {
       name = "colour";
       packageName = "colour";
@@ -6772,13 +6844,13 @@ let
         sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
       };
     };
-    "command-exists-1.2.7" = {
+    "command-exists-1.2.8" = {
       name = "command-exists";
       packageName = "command-exists";
-      version = "1.2.7";
+      version = "1.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.7.tgz";
-        sha512 = "doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw==";
+        url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz";
+        sha512 = "PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==";
       };
     };
     "commander-0.6.1" = {
@@ -6862,15 +6934,6 @@ let
         sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==";
       };
     };
-    "commander-2.13.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz";
-        sha512 = "MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==";
-      };
-    };
     "commander-2.14.1" = {
       name = "commander";
       packageName = "commander";
@@ -8843,13 +8906,13 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.5" = {
+    "debug-3.2.6" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.5";
+      version = "3.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz";
-        sha512 = "D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==";
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
       };
     };
     "debug-4.1.0" = {
@@ -9464,6 +9527,15 @@ let
         sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
       };
     };
+    "diagnostics-1.1.1" = {
+      name = "diagnostics";
+      packageName = "diagnostics";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz";
+        sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==";
+      };
+    };
     "dicer-0.2.5" = {
       name = "dicer";
       packageName = "dicer";
@@ -9500,13 +9572,13 @@ let
         sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
-    "diff2html-2.3.3" = {
+    "diff2html-2.4.0" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.3.3";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.3.tgz";
-        sha1 = "31bb815881c975634c7f3907a5e789341e1560bc";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.4.0.tgz";
+        sha1 = "de632384eefa5a7f6b0e92eafb1fa25d22dc88ab";
       };
     };
     "diffie-hellman-5.0.3" = {
@@ -10013,13 +10085,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.6.0" = {
+    "duplexify-3.6.1" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.6.0";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
-        sha512 = "fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz";
+        sha512 = "vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==";
       };
     };
     "dynamic-dijkstra-1.0.0" = {
@@ -10148,13 +10220,13 @@ let
         sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742";
       };
     };
-    "editorconfig-0.15.0" = {
+    "editorconfig-0.15.2" = {
       name = "editorconfig";
       packageName = "editorconfig";
-      version = "0.15.0";
+      version = "0.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.0.tgz";
-        sha512 = "j7JBoj/bpNzvoTQylfRZSc85MlLNKWQiq5y6gwKhmqD2h1eZ+tH4AXbkhEJD468gjDna/XMx2YtSkCxBRX9OGg==";
+        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz";
+        sha512 = "GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==";
       };
     };
     "ee-first-1.1.0" = {
@@ -10302,6 +10374,15 @@ let
         sha1 = "9eba6837d16d0982b59f87d889bf754443d52931";
       };
     };
+    "enabled-1.0.2" = {
+      name = "enabled";
+      packageName = "enabled";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz";
+        sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -10518,6 +10599,15 @@ let
         sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
       };
     };
+    "env-variable-0.0.5" = {
+      name = "env-variable";
+      packageName = "env-variable";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz";
+        sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==";
+      };
+    };
     "envconf-0.0.4" = {
       name = "envconf";
       packageName = "envconf";
@@ -10869,13 +10959,13 @@ let
         sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==";
       };
     };
-    "eslint-5.6.1" = {
+    "eslint-5.7.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "5.6.1";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz";
-        sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz";
+        sha512 = "zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A==";
       };
     };
     "eslint-plugin-no-unsafe-innerhtml-1.0.16" = {
@@ -11166,15 +11256,6 @@ let
         sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
       };
     };
-    "eventemitter3-1.2.0" = {
-      name = "eventemitter3";
-      packageName = "eventemitter3";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz";
-        sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
-      };
-    };
     "eventemitter3-3.1.0" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
@@ -11472,6 +11553,15 @@ let
         sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53";
       };
     };
+    "express-4.16.4" = {
+      name = "express";
+      packageName = "express";
+      version = "4.16.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz";
+        sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==";
+      };
+    };
     "express-5.0.0-alpha.6" = {
       name = "express";
       packageName = "express";
@@ -11531,7 +11621,7 @@ let
       packageName = "express-session";
       version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
         sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
       };
     };
@@ -11967,6 +12057,15 @@ let
         sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e";
       };
     };
+    "fecha-2.3.3" = {
+      name = "fecha";
+      packageName = "fecha";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz";
+        sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==";
+      };
+    };
     "feedparser-2.2.9" = {
       name = "feedparser";
       packageName = "feedparser";
@@ -12516,13 +12615,13 @@ let
         sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw==";
       };
     };
-    "flumeview-query-7.0.0" = {
+    "flumeview-query-7.1.0" = {
       name = "flumeview-query";
       packageName = "flumeview-query";
-      version = "7.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.0.0.tgz";
-        sha512 = "lk3Gs5wf6BwZKDafjE95/r0wv4nkMRsZULmulDCybFu1mPFeqUMR4H+ENcg+fgOpQBGaiNRTyHPQyg0OLur2wA==";
+        url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.1.0.tgz";
+        sha512 = "z/23qWuRW5dj7yNJ1i61R0RgnUWn4rdaf9Fr1Ckz3CzKpwJBWR1MqnABuGY3k1PZg1T11Busm2aRdb6oH1ZLsQ==";
       };
     };
     "flumeview-reduce-1.3.14" = {
@@ -12552,13 +12651,13 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "follow-redirects-1.5.8" = {
+    "follow-redirects-1.5.9" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
-      version = "1.5.8";
+      version = "1.5.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz";
-        sha512 = "sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz";
+        sha512 = "Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==";
       };
     };
     "for-each-0.3.3" = {
@@ -14745,17 +14844,17 @@ let
       packageName = "highlight.js";
       version = "8.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz";
+        url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz";
         sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
       };
     };
-    "highlight.js-9.12.0" = {
+    "highlight.js-9.13.0" = {
       name = "highlight.js";
       packageName = "highlight.js";
-      version = "9.12.0";
+      version = "9.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
-        sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.13.0.tgz";
+        sha512 = "2B90kcNnErqRTmzdZw6IPLEC9CdsiIMhj+r8L3LJKRCgtEJ+LY5yzWuQCVnADTI0wwocQinFzaaL/JjTQNqI/g==";
       };
     };
     "hiredis-0.4.1" = {
@@ -15028,15 +15127,6 @@ let
         sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
       };
     };
-    "http-proxy-1.16.2" = {
-      name = "http-proxy";
-      packageName = "http-proxy";
-      version = "1.16.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
-        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
-      };
-    };
     "http-proxy-1.17.0" = {
       name = "http-proxy";
       packageName = "http-proxy";
@@ -15181,13 +15271,13 @@ let
         sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w==";
       };
     };
-    "hypercore-6.19.2" = {
+    "hypercore-6.20.2" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.19.2";
+      version = "6.20.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.19.2.tgz";
-        sha512 = "AQS6mtwI7RDKRT3u68EEcehtI1VpaavWXxfnGDyOrR/AVBDUMdIUw8wcYCZdiZZVHarh5xKS4+VRCdJjS67LuA==";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.20.2.tgz";
+        sha512 = "VALfzDCqS0cIxoRvlQmCn4QYnQcUDCazyOQq3c0lbp1AvzEjaq62BvYDH28pmWeASokBszuysgsrPFTn704DbA==";
       };
     };
     "hypercore-crypto-1.0.0" = {
@@ -15370,6 +15460,15 @@ let
         sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
       };
     };
+    "ignore-5.0.2" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "5.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore/-/ignore-5.0.2.tgz";
+        sha512 = "ilxkgh36cTqJxlipxQdCOxkbQae5dIeCwo5fSw6pBDW8m8GiMTnadClKST2+aATqjs9BTHsi0IqOsTp0jiihAw==";
+      };
+    };
     "ignore-by-default-1.0.1" = {
       name = "ignore-by-default";
       packageName = "ignore-by-default";
@@ -15798,7 +15897,7 @@ let
       packageName = "into-stream";
       version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
+        url = "http://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
         sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
       };
     };
@@ -16981,13 +17080,13 @@ let
         sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
       };
     };
-    "jaeger-client-3.12.0" = {
+    "jaeger-client-3.13.0" = {
       name = "jaeger-client";
       packageName = "jaeger-client";
-      version = "3.12.0";
+      version = "3.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.12.0.tgz";
-        sha512 = "TRwzui1D0OdNREHKWGw0Iuz2EkyTmlPVnzpIEXgPeiEbr/8j164Xvpfc1eCpbfGjNStcWj7Ipcvba/JBSy+q8w==";
+        url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.13.0.tgz";
+        sha512 = "ykrXLxcmSHSdDXqK6/DY+IObekfj4kbONC3QPu/ln7sbY5bsA+Yu4LYVlW9/vLm0lxLlsz52mSyC+sjiqM8xCw==";
       };
     };
     "javascript-stringify-1.6.0" = {
@@ -17990,6 +18089,15 @@ let
         sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw==";
       };
     };
+    "kuler-1.0.1" = {
+      name = "kuler";
+      packageName = "kuler";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz";
+        sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==";
+      };
+    };
     "kvgraph-0.1.0" = {
       name = "kvgraph";
       packageName = "kvgraph";
@@ -18044,13 +18152,13 @@ let
         sha512 = "On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==";
       };
     };
-    "layered-graph-1.1.0" = {
+    "layered-graph-1.1.1" = {
       name = "layered-graph";
       packageName = "layered-graph";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.0.tgz";
-        sha512 = "PSQEdXbmwffcwZ0i7HNfJI/cGnUqVTyt2caanHH/ixxzBqapONxAWYlnj13r3Q79V5ALiCtGrkRnaUo3zwKfzA==";
+        url = "https://registry.npmjs.org/layered-graph/-/layered-graph-1.1.1.tgz";
+        sha512 = "YqnSwwiLxLdvJBi6ZrUEQEdjv+Z3S5fO1mT6ItWCfZu2tsBG22gr49Bj+hgtMeose/74apZeCx+/T9j4NgMDNA==";
       };
     };
     "lazy-1.0.11" = {
@@ -18602,15 +18710,6 @@ let
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
-    "lodash-4.13.1" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.13.1";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz";
-        sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68";
-      };
-    };
     "lodash-4.14.2" = {
       name = "lodash";
       packageName = "lodash";
@@ -19700,6 +19799,15 @@ let
         sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==";
       };
     };
+    "logform-1.10.0" = {
+      name = "logform";
+      packageName = "logform";
+      version = "1.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz";
+        sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg==";
+      };
+    };
     "lokijs-1.5.3" = {
       name = "lokijs";
       packageName = "lokijs";
@@ -20591,13 +20699,13 @@ let
         sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
       };
     };
-    "merge2-1.2.2" = {
+    "merge2-1.2.3" = {
       name = "merge2";
       packageName = "merge2";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz";
-        sha512 = "bgM8twH86rWni21thii6WCMQMRMmwqqdW3sGWi9IipnVAszdLXRjwDwAnyrVXo6DuP3AjRMMttZKUB48QWIFGg==";
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz";
+        sha512 = "gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==";
       };
     };
     "merkle-tree-stream-3.0.3" = {
@@ -20987,13 +21095,13 @@ let
         sha512 = "mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==";
       };
     };
-    "minizlib-1.1.0" = {
+    "minizlib-1.1.1" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz";
-        sha512 = "4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.1.1.tgz";
+        sha512 = "TrfjCjk4jLhcJyGMYymBH6oTXcWjYbUAXTHDbtnWHjZC25h0cdajHuPE1zxb4DVmu8crfh+HwH/WMuyLG0nHBg==";
       };
     };
     "mirror-folder-3.0.0" = {
@@ -21473,13 +21581,13 @@ let
         sha512 = "JHdEoxkA/5NgZRo91RNn4UT+HdcJV9XUo01DTkKC7vo1erNIngtuaw9Y0WI8RdTlyi+wMIbunflhghzVLuGJyw==";
       };
     };
-    "multer-1.4.0" = {
+    "multer-1.4.1" = {
       name = "multer";
       packageName = "multer";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multer/-/multer-1.4.0.tgz";
-        sha512 = "/JATgsDPdb/D9u8A2dFD8MhZYqgDKrWibpA9etSUt8CVzSHtsA13Y8LH9pR2/crsaYFua9g29UBgZB/g6nmOEg==";
+        url = "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz";
+        sha512 = "zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw==";
       };
     };
     "multi-random-access-2.1.1" = {
@@ -21842,13 +21950,13 @@ let
         sha512 = "N1IBreECNaxmsaOLMqqm01K7XIp+sMvoVX8mvmT/p1VjM2FLcBU0lj0FalKooi2/2i+ph9WsEoEogOJevqQ6LQ==";
       };
     };
-    "nanoid-1.2.6" = {
+    "nanoid-1.3.0" = {
       name = "nanoid";
       packageName = "nanoid";
-      version = "1.2.6";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.6.tgz";
-        sha512 = "um9vXiM407BaRbBNa0aKPzFBSD2fDbVmmA9TzCWWlxZvEBzTbixM7ss6GDS4G/cNMYeZSNFx5SzAgWoG1uHU9g==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-1.3.0.tgz";
+        sha512 = "OP8SoC91Kyjl1sdSTEnM1xYh4gUEOSkUl6wRBUklWOPyfPRbeJbhvdhQYXEjVtZ1LI9amVMkIWQI2nO8O7DL9A==";
       };
     };
     "nanolru-1.0.0" = {
@@ -21945,13 +22053,13 @@ let
         sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11";
       };
     };
-    "natives-1.1.5" = {
+    "natives-1.1.6" = {
       name = "natives";
       packageName = "natives";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/natives/-/natives-1.1.5.tgz";
-        sha512 = "1pJ+02gl2KJgCPFtpZGtuD4lGSJnIZvvFHCQTOeDRMSXjfu2GmYWuhI8NFMA4W2I5NNFRbfy/YCiVt4CgNpP8A==";
+        url = "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz";
+        sha512 = "6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==";
       };
     };
     "natural-compare-1.4.0" = {
@@ -22144,13 +22252,13 @@ let
         sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
-    "neo-async-2.5.2" = {
+    "neo-async-2.6.0" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.5.2";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.2.tgz";
-        sha512 = "vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==";
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz";
+        sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==";
       };
     };
     "net-browserify-alt-1.1.0" = {
@@ -22378,6 +22486,15 @@ let
         sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
       };
     };
+    "node-gyp-build-3.5.0" = {
+      name = "node-gyp-build";
+      packageName = "node-gyp-build";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
+        sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
+      };
+    };
     "node-int64-0.4.0" = {
       name = "node-int64";
       packageName = "node-int64";
@@ -22783,13 +22900,13 @@ let
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "npm-6.1.0" = {
+    "npm-6.4.1" = {
       name = "npm";
       packageName = "npm";
-      version = "6.1.0";
+      version = "6.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.1.0.tgz";
-        sha512 = "e38cCtJ0lEjLXXpc4twEfj8Xw5hDLolc2Py87ueWnUhJfZ8GA/5RVIeD+XbSr1+aVRGsRsdtLdzUNO63PvQJ1w==";
+        url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz";
+        sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg==";
       };
     };
     "npm-bundled-1.0.5" = {
@@ -22900,6 +23017,15 @@ let
         sha512 = "7rjGF2eA7hKDidGyEWmHTiKfXkbrcQAsGL/Rh4Rt3x3YNRNHhwaTzVJfW3aNvvlhg4G62VCluif0sLCb/i51Hg==";
       };
     };
+    "npm-registry-client-8.6.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz";
+        sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
+      };
+    };
     "npm-registry-fetch-3.8.0" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
@@ -23441,6 +23567,15 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
+    "one-time-0.0.4" = {
+      name = "one-time";
+      packageName = "one-time";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz";
+        sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e";
+      };
+    };
     "onetime-1.1.0" = {
       name = "onetime";
       packageName = "onetime";
@@ -24058,7 +24193,7 @@ let
       packageName = "packet-stream";
       version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz";
+        url = "http://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz";
         sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw==";
       };
     };
@@ -24918,13 +25053,13 @@ let
         sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ==";
       };
     };
-    "pino-std-serializers-2.2.1" = {
+    "pino-std-serializers-2.3.0" = {
       name = "pino-std-serializers";
       packageName = "pino-std-serializers";
-      version = "2.2.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.2.1.tgz";
-        sha512 = "QqL7kkF7eMCpFG4hpZD8UPQga/kxkkh3E62HzMzTIL4OQyijyisAnBL8msBEAml8xcb/ioGhH7UUzGxuHqczhQ==";
+        url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.3.0.tgz";
+        sha512 = "klfGoOsP6sJH7ON796G4xoUSx2fkpFgKHO4YVVO2zmz31jR+etzc/QzGJILaOIiCD6HTCFgkPx+XN8nk+ruqPw==";
       };
     };
     "pkg-dir-2.0.0" = {
@@ -25274,7 +25409,7 @@ let
       packageName = "pretty-hrtime";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
+        url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz";
         sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1";
       };
     };
@@ -26628,15 +26763,6 @@ let
         sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
       };
     };
-    "qs-6.3.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
-        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
-      };
-    };
     "qs-6.4.0" = {
       name = "qs";
       packageName = "qs";
@@ -26871,13 +26997,13 @@ let
         sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==";
       };
     };
-    "raven-js-3.26.4" = {
+    "raven-js-3.27.0" = {
       name = "raven-js";
       packageName = "raven-js";
-      version = "3.26.4";
+      version = "3.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven-js/-/raven-js-3.26.4.tgz";
-        sha512 = "5VmC3IWhTQJkaiQaCY0S5V8za4bpUgbbuVT1MkDH7JVqgu8CPQ750XaFF8BVRbLV9F5nvoz7n0UT0CKteDuZAg==";
+        url = "https://registry.npmjs.org/raven-js/-/raven-js-3.27.0.tgz";
+        sha512 = "vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw==";
       };
     };
     "raw-body-0.0.3" = {
@@ -27636,15 +27762,6 @@ let
         sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
       };
     };
-    "request-2.79.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.79.0";
-      src = fetchurl {
-        url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
-      };
-    };
     "request-2.81.0" = {
       name = "request";
       packageName = "request";
@@ -28482,13 +28599,13 @@ let
         sha512 = "e4hiMTahaLiN5XKap1YrifoyT8yRu9yQEZrMTglTBgq8Lv8iChFKLpbmXYeNxy2rCnutuWaQDFbp3sBgl4NQ4g==";
       };
     };
-    "secret-stack-4.2.1" = {
+    "secret-stack-4.2.4" = {
       name = "secret-stack";
       packageName = "secret-stack";
-      version = "4.2.1";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.1.tgz";
-        sha512 = "R4pn1zVaspQUqpC3iKLvA476pfftzE8AZTfMnd7TQpuVdGML0wsLYp4wmU4NZERHYsr0g99JnwUH5ll9n0APjg==";
+        url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.4.tgz";
+        sha512 = "HUG0YujOk20t7CeQz75dz79XmQQl1qsxEVngF+3l5ZNEHNEO6TJHNKo0OAxAWGKzSWiJDkzKLSnHqqZFNKcrPA==";
       };
     };
     "secure-keys-1.0.0" = {
@@ -28500,13 +28617,13 @@ let
         sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
       };
     };
-    "secure-scuttlebutt-18.4.0" = {
+    "secure-scuttlebutt-18.5.0" = {
       name = "secure-scuttlebutt";
       packageName = "secure-scuttlebutt";
-      version = "18.4.0";
+      version = "18.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.4.0.tgz";
-        sha512 = "v74wJIcscPYRG+OF7cQPUi3wCBIy0lRT0e7w+bleFpAPvPL3LTlKtPqt9Stbjrtj5LKV7yWALjoLrkWT0eg+xg==";
+        url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.5.0.tgz";
+        sha512 = "b50xp0XAWtd6y4ygw2RRgDxaFNgGqC7XahRt/mC4XhiCe6HoTjpt6j07HVnTDcRtLzNiCPKlFJnYySFTFay2lQ==";
       };
     };
     "seek-bzip-1.0.5" = {
@@ -28541,7 +28658,7 @@ let
       packageName = "semver";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
         sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
       };
     };
@@ -28550,7 +28667,7 @@ let
       packageName = "semver";
       version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
         sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
       };
     };
@@ -28559,7 +28676,7 @@ let
       packageName = "semver";
       version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
         sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
       };
     };
@@ -28568,7 +28685,7 @@ let
       packageName = "semver";
       version = "4.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
         sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
       };
     };
@@ -28577,7 +28694,7 @@ let
       packageName = "semver";
       version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
         sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
       };
     };
@@ -28586,7 +28703,7 @@ let
       packageName = "semver";
       version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
         sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
       };
     };
@@ -28595,7 +28712,7 @@ let
       packageName = "semver";
       version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.1.1.tgz";
         sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19";
       };
     };
@@ -28604,7 +28721,7 @@ let
       packageName = "semver";
       version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
+        url = "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz";
         sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
       };
     };
@@ -28626,6 +28743,15 @@ let
         sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
       };
     };
+    "semver-5.6.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
+        sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
+      };
+    };
     "semver-compare-1.0.0" = {
       name = "semver-compare";
       packageName = "semver-compare";
@@ -28671,13 +28797,13 @@ let
         sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8";
       };
     };
-    "semver-utils-1.1.2" = {
+    "semver-utils-1.1.4" = {
       name = "semver-utils";
       packageName = "semver-utils";
-      version = "1.1.2";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.2.tgz";
-        sha512 = "+RvtdCZJdLJXN6ozVqbypYII/m4snihgWvmFHW8iWusxqGVdEP31QdUVVaC6GeJ9EYE0JCMdWiNlLF3edjifEw==";
+        url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz";
+        sha512 = "EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==";
       };
     };
     "send-0.0.3" = {
@@ -29211,13 +29337,13 @@ let
         sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
       };
     };
-    "simple-git-1.104.0" = {
+    "simple-git-1.105.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.104.0";
+      version = "1.105.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.104.0.tgz";
-        sha512 = "KTELLFyhLhN1qZGQkglx1e0YezYKNabCY4oKrTVb9y0BllkWwruK2qFCQDm2zpT7rE4IPd4/hzZt/6+0ykQIdA==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.105.0.tgz";
+        sha512 = "ZrGcCPRIKCm6Q8gNJ+gx+leHqaokKpXae6K9lZpVD4sfeA2/rVvxcIR4KVVujNOmA6wHE2xaQ0GQWuIY88o6pA==";
       };
     };
     "simple-lru-cache-0.0.2" = {
@@ -29580,13 +29706,13 @@ let
         sha512 = "FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==";
       };
     };
-    "snyk-1.102.0" = {
+    "snyk-1.103.4" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.102.0";
+      version = "1.103.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz";
-        sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ==";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.103.4.tgz";
+        sha512 = "ynLlsLDjAkzymd0qi1il6f34S4oNTfIgvFCFvkYxvqfBkedfOoDQT4TLU8gi+55MGM6iornf2iefC2FW92BwnQ==";
       };
     };
     "snyk-config-2.2.0" = {
@@ -29598,13 +29724,13 @@ let
         sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg==";
       };
     };
-    "snyk-docker-plugin-1.11.0" = {
+    "snyk-docker-plugin-1.12.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "1.11.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.11.0.tgz";
-        sha512 = "rJrSj4FfGtaFGNybWTb0bULEqoQEeZfZBpGoDumiXsGqoSWf61Tr1V/Ck9NGcmHWNEVsLZLcE9CXp6Y6Kbo8qA==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.12.0.tgz";
+        sha512 = "QqKq2bGdnf1L2PNGQrHoqcoaV/PIlJv1qjKIzwA93gfhToKGkgJ31oPXwfef/l9N+ui0Y44c4POBHFbFf8PlJw==";
       };
     };
     "snyk-go-plugin-1.5.2" = {
@@ -29643,13 +29769,13 @@ let
         sha512 = "9jAhZhv+7YcqtoQYCYlgMoxK+dWBKlk+wkX27Ebg3vNddNop9q5jZitRXTjsXwfSUZHRt+Ptw1f8vei9kjzZVg==";
       };
     };
-    "snyk-nodejs-lockfile-parser-1.5.1" = {
+    "snyk-nodejs-lockfile-parser-1.5.3" = {
       name = "snyk-nodejs-lockfile-parser";
       packageName = "snyk-nodejs-lockfile-parser";
-      version = "1.5.1";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.1.tgz";
-        sha512 = "rfFcW+ZrOEH3NxufUCpMBpNLSb4BPOxLbAM6MoRqfYH5DhSdTHsecwRDf1gU6XzQok/9Koav+1qtP8+welJC2A==";
+        url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.5.3.tgz";
+        sha512 = "hVUUxRm7f8mN3RdTbeZGJn+w4VMKb7ke4/OB8Qhr4O5S04AMb4YOcsZ80niur05VUykPT32IyFwyGRTBi99WUw==";
       };
     };
     "snyk-nuget-plugin-1.6.5" = {
@@ -29697,13 +29823,13 @@ let
         sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==";
       };
     };
-    "snyk-resolve-deps-4.0.1" = {
+    "snyk-resolve-deps-4.0.2" = {
       name = "snyk-resolve-deps";
       packageName = "snyk-resolve-deps";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.1.tgz";
-        sha512 = "gieaYoOuJLXzUmDDKfQJAqfwaxa43KmSqN2d9abRfgMXnLlX9IqyoZ1wqZMbd3WN7tsHSkpWvVwc4FHdQEkUKA==";
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.2.tgz";
+        sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA==";
       };
     };
     "snyk-sbt-plugin-2.0.0" = {
@@ -30048,13 +30174,13 @@ let
         sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006";
       };
     };
-    "source-list-map-2.0.0" = {
+    "source-list-map-2.0.1" = {
       name = "source-list-map";
       packageName = "source-list-map";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz";
-        sha512 = "I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
+        sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
       };
     };
     "source-map-0.1.31" = {
@@ -30435,13 +30561,13 @@ let
         sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA==";
       };
     };
-    "ssb-config-2.3.4" = {
+    "ssb-config-2.3.5" = {
       name = "ssb-config";
       packageName = "ssb-config";
-      version = "2.3.4";
+      version = "2.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.4.tgz";
-        sha512 = "Yp0DKsc9eSaU+9+5xMO4/NVdOFyBtHD+QgraZ+1Id2K4f0eUiKpJ2ogLNmGanTvkLVhm/vq27TLI27Fq83njWQ==";
+        url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.3.5.tgz";
+        sha512 = "lT30POSTXX6nsACYwMkNto0M74YMoEzLqpSpZqK+AwaRWlNvFqGmjEMwLb5G5jz7deCrXJFo87O3IubiQrwdGg==";
       };
     };
     "ssb-ebt-5.2.3" = {
@@ -30467,7 +30593,7 @@ let
       packageName = "ssb-git";
       version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz";
+        url = "http://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz";
         sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4";
       };
     };
@@ -30485,7 +30611,7 @@ let
       packageName = "ssb-issues";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz";
+        url = "http://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz";
         sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5";
       };
     };
@@ -30503,7 +30629,7 @@ let
       packageName = "ssb-links";
       version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz";
+        url = "http://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz";
         sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw==";
       };
     };
@@ -30557,7 +30683,7 @@ let
       packageName = "ssb-pull-requests";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz";
+        url = "http://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz";
         sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118";
       };
     };
@@ -30588,13 +30714,13 @@ let
         sha512 = "mZPI9HKZtqPP7Qi26B0GR7HqYmmcELEaoj5zr8TlUcULg9BOZy7f4VSzcKZ36LIkvpuK2sfA6znxIlBLq78fjg==";
       };
     };
-    "ssb-ws-2.1.1" = {
+    "ssb-ws-3.0.0" = {
       name = "ssb-ws";
       packageName = "ssb-ws";
-      version = "2.1.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz";
-        sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ==";
+        url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-3.0.0.tgz";
+        sha512 = "Qna9Oa9+MYhv+Xtqmidb6xww2JZAdO6ZzidJleWbOLJTSV2QkkB7aAFpWdYst/N78ZhThPqT/mdgEmWpaCqTbw==";
       };
     };
     "ssh-config-1.1.3" = {
@@ -30620,17 +30746,17 @@ let
       packageName = "sshpk";
       version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
+        url = "http://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz";
         sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb";
       };
     };
-    "sshpk-1.14.2" = {
+    "sshpk-1.15.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.14.2";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
-        sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz";
+        sha512 = "mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==";
       };
     };
     "sshpk-1.7.1" = {
@@ -30638,7 +30764,7 @@ let
       packageName = "sshpk";
       version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz";
+        url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz";
         sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c";
       };
     };
@@ -31506,6 +31632,15 @@ let
         sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
       };
     };
+    "superagent-4.0.0-beta.5" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "4.0.0-beta.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-4.0.0-beta.5.tgz";
+        sha512 = "v4FTm6kg6zJOfLcot9kCTcWy/wjD/hvtUXWcv0Pd8TlUqxKDctif2rtDPRb4gW6Df9MMXU1BHB+1z5U2VFVsYg==";
+      };
+    };
     "superagent-proxy-2.0.0" = {
       name = "superagent-proxy";
       packageName = "superagent-proxy";
@@ -31731,6 +31866,15 @@ let
         sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==";
       };
     };
+    "table-5.1.0" = {
+      name = "table";
+      packageName = "table";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-5.1.0.tgz";
+        sha512 = "e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==";
+      };
+    };
     "tabtab-1.3.2" = {
       name = "tabtab";
       packageName = "tabtab";
@@ -31939,13 +32083,22 @@ let
         sha1 = "a87ee424be01a1d28f2f301045043a5bcd679a05";
       };
     };
-    "text-extensions-1.8.0" = {
+    "text-extensions-1.9.0" = {
       name = "text-extensions";
       packageName = "text-extensions";
-      version = "1.8.0";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.8.0.tgz";
-        sha512 = "mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==";
+        url = "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz";
+        sha512 = "wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==";
+      };
+    };
+    "text-hex-1.0.0" = {
+      name = "text-hex";
+      packageName = "text-hex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz";
+        sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==";
       };
     };
     "text-table-0.2.0" = {
@@ -32704,6 +32857,15 @@ let
         sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg==";
       };
     };
+    "triple-beam-1.3.0" = {
+      name = "triple-beam";
+      packageName = "triple-beam";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz";
+        sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
+      };
+    };
     "truncate-2.0.1" = {
       name = "truncate";
       packageName = "truncate";
@@ -32938,13 +33100,13 @@ let
         sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
       };
     };
-    "typescript-3.1.1" = {
+    "typescript-3.1.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz";
-        sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz";
+        sha512 = "+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==";
       };
     };
     "typewise-1.0.3" = {
@@ -33181,13 +33343,13 @@ let
         sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
-    "unbzip2-stream-1.3.0" = {
+    "unbzip2-stream-1.3.1" = {
       name = "unbzip2-stream";
       packageName = "unbzip2-stream";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.0.tgz";
-        sha512 = "kE2WkurNnPUMcryNioS68DDbhoPB8Qxsd8btHSj+sd5Pjh2GsjmeHLzMSqV9HHziAo8FzVxVCJl9ZYhk7yY1pA==";
+        url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz";
+        sha512 = "fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==";
       };
     };
     "unc-path-regex-0.1.2" = {
@@ -34639,6 +34801,15 @@ let
         sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       };
     };
+    "webassemblyjs-1.7.8" = {
+      name = "webassemblyjs";
+      packageName = "webassemblyjs";
+      version = "1.7.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.7.8.tgz";
+        sha512 = "7J64n2yTf2apgtRJypiHUFNRc2twQrMAFIWsm8u4qih7nG+sry2Bna1zq3qFI35fazIF1m42VGHHvdp9bBXmBA==";
+      };
+    };
     "webidl-conversions-2.0.1" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -34972,6 +35143,24 @@ let
         sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==";
       };
     };
+    "winston-3.1.0" = {
+      name = "winston";
+      packageName = "winston";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz";
+        sha512 = "FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==";
+      };
+    };
+    "winston-transport-4.2.0" = {
+      name = "winston-transport";
+      packageName = "winston-transport";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.2.0.tgz";
+        sha512 = "0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==";
+      };
+    };
     "with-4.0.3" = {
       name = "with";
       packageName = "with";
@@ -35337,7 +35526,7 @@ let
       packageName = "xmlbuilder";
       version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
         sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
       };
     };
@@ -35346,7 +35535,7 @@ let
       packageName = "xmlbuilder";
       version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
         sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
       };
     };
@@ -35355,7 +35544,7 @@ let
       packageName = "xmlbuilder";
       version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
         sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
       };
     };
@@ -35364,7 +35553,7 @@ let
       packageName = "xmlbuilder";
       version = "8.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz";
         sha1 = "69248673410b4ba42e1a6136551d2922335aa773";
       };
     };
@@ -35373,7 +35562,7 @@ let
       packageName = "xmlbuilder";
       version = "9.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
         sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d";
       };
     };
@@ -35924,10 +36113,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.13.2";
+    version = "1.13.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.2.tgz";
-      sha512 = "XtcUf7n2nfz7tEyV2auK55d018ji3WIJYSQAowF9h69go3Jr68OPvhJiaCQikpbM5b+NNw7LBBkKUVJxA3LVsA==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.3.tgz";
+      sha512 = "IU15/1dufp+iI9FmXshIo9z9x4HmDk5Wslo2VkHlA1k8pYzHQ3XapRflDkEdV1tZ9LXTEMJW40t8mnWLjZjDqg==";
     };
     dependencies = [
       sources."JSV-4.0.2"
@@ -35959,7 +36148,7 @@ in
       sources."chalk-1.1.3"
       sources."chmodr-1.2.0"
       sources."colors-1.3.2"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.6.0"
       sources."core-js-2.5.7"
@@ -36081,7 +36270,7 @@ in
       sources."chromium-pickle-js-0.2.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."cuint-0.2.2"
@@ -36145,7 +36334,7 @@ in
       })
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string_decoder-0.10.31"
       sources."tmp-0.0.28"
       (sources."touch-0.0.3" // {
@@ -36173,13 +36362,13 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.19";
+    version = "0.10.20";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.19.tgz";
-      sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA==";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.20.tgz";
+      sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
     };
     dependencies = [
-      sources."@types/node-8.10.34"
+      sources."@types/node-8.10.36"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.28"
       sources."ajv-5.5.2"
@@ -36202,6 +36391,7 @@ in
       (sources."azure-arm-datalake-analytics-1.0.2-preview" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."azure-arm-resource-1.6.1-preview"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
           sources."request-2.74.0"
@@ -36210,6 +36400,7 @@ in
       (sources."azure-arm-datalake-store-1.0.2-preview" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."azure-arm-resource-1.6.1-preview"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
           sources."request-2.74.0"
@@ -36225,6 +36416,7 @@ in
       (sources."azure-arm-powerbiembedded-0.1.1" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."azure-arm-resource-1.6.1-preview"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
           sources."request-2.74.0"
@@ -36233,30 +36425,17 @@ in
       (sources."azure-arm-rediscache-0.2.3" // {
         dependencies = [
           sources."async-0.2.7"
+          sources."azure-arm-resource-1.6.1-preview"
           sources."ms-rest-1.15.7"
           sources."ms-rest-azure-1.15.7"
           sources."request-2.74.0"
         ];
       })
-      (sources."azure-arm-resource-1.6.1-preview" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-          sources."request-2.74.0"
-        ];
-      })
+      sources."azure-arm-resource-7.0.0"
       sources."azure-arm-servermanagement-1.1.0"
       sources."azure-arm-storage-5.2.0"
       sources."azure-arm-trafficmanager-1.1.0-preview"
-      (sources."azure-arm-website-0.11.5" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-          sources."request-2.74.0"
-        ];
-      })
+      sources."azure-arm-website-5.3.0"
       sources."azure-asm-compute-0.18.0"
       sources."azure-asm-hdinsight-0.10.2"
       sources."azure-asm-mgmt-0.10.1"
@@ -36284,27 +36463,13 @@ in
       })
       sources."azure-gallery-2.0.0-pre.18"
       sources."azure-graph-2.2.0"
-      (sources."azure-keyvault-1.0.0" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-          sources."request-2.74.0"
-        ];
-      })
+      sources."azure-keyvault-3.0.4"
       (sources."azure-monitoring-0.10.6" // {
         dependencies = [
           sources."underscore-1.9.1"
         ];
       })
-      (sources."azure-servicefabric-0.1.5" // {
-        dependencies = [
-          sources."async-0.2.7"
-          sources."ms-rest-1.15.7"
-          sources."ms-rest-azure-1.15.7"
-          sources."request-2.74.0"
-        ];
-      })
+      sources."azure-servicefabric-2.0.0"
       (sources."azure-storage-2.10.1" // {
         dependencies = [
           sources."extend-1.2.1"
@@ -36391,7 +36556,7 @@ in
       sources."har-schema-2.0.0"
       (sources."har-validator-2.0.6" // {
         dependencies = [
-          sources."commander-2.18.0"
+          sources."commander-2.19.0"
         ];
       })
       sources."has-ansi-2.0.0"
@@ -36536,7 +36701,7 @@ in
           sources."asn1-0.1.11"
         ];
       })
-      (sources."sshpk-1.14.2" // {
+      (sources."sshpk-1.15.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -36691,7 +36856,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."natives-1.1.5"
+      sources."natives-1.1.6"
       sources."normalize-package-data-2.4.0"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
@@ -36719,7 +36884,7 @@ in
           sources."glob-7.1.3"
         ];
       })
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
       sources."sort-keys-1.1.2"
       sources."sort-keys-length-1.0.1"
@@ -36757,7 +36922,7 @@ in
       sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==";
     };
     dependencies = [
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."acorn-6.0.2"
       sources."acorn-node-1.6.0"
       sources."acorn-walk-6.1.0"
@@ -36983,7 +37148,7 @@ in
       sources."codepage-1.4.0"
       sources."colour-0.7.1"
       sources."combined-stream-0.0.7"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."compact2string-1.4.0"
       sources."concat-map-0.0.1"
       (sources."concat-stream-1.6.2" // {
@@ -37079,7 +37244,7 @@ in
       sources."map-obj-1.0.1"
       (sources."mdns-js-1.0.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -37206,7 +37371,7 @@ in
       sources."rx-2.5.3"
       sources."safe-buffer-5.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
@@ -37351,10 +37516,10 @@ in
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."colors-1.3.2"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."follow-redirects-1.5.8"
+      sources."follow-redirects-1.5.9"
       sources."has-flag-3.0.0"
       sources."humanize-plus-1.8.2"
       sources."is-buffer-1.1.6"
@@ -37384,27 +37549,60 @@ in
   configurable-http-proxy = nodeEnv.buildNodePackage {
     name = "configurable-http-proxy";
     packageName = "configurable-http-proxy";
-    version = "3.1.1";
+    version = "4.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-3.1.1.tgz";
-      sha512 = "e+fxBy5cCayuNpxt3tcigBIuFsU/+oN48eK3aQtCBV12glavbBMxJa3ut2AEDHhXa/g3pC8r2BorKthrofHGRw==";
+      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.0.1.tgz";
+      sha512 = "Agj3tsKjvXD53aSdy7rmEo35vYMSHm1MiW8NssH4+z+TpifPQwJxl0y72z+v4TbTg/K1xe5IUGrMfqZ00Z82zw==";
     };
     dependencies = [
-      sources."async-1.0.0"
-      sources."colors-1.0.3"
-      sources."commander-2.13.0"
-      sources."cycle-1.0.3"
-      sources."eventemitter3-1.2.0"
-      sources."eyes-0.1.8"
-      sources."http-proxy-1.16.2"
-      sources."isstream-0.1.2"
+      sources."async-2.6.1"
+      sources."color-3.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."color-string-1.5.3"
+      sources."colornames-1.1.1"
+      sources."colors-1.3.2"
+      sources."colorspace-1.1.1"
+      sources."commander-2.19.0"
+      sources."core-util-is-1.0.2"
+      sources."debug-3.1.0"
+      sources."diagnostics-1.1.1"
+      sources."enabled-1.0.2"
+      sources."env-variable-0.0.5"
+      sources."eventemitter3-3.1.0"
+      sources."fast-safe-stringify-2.0.6"
+      sources."fecha-2.3.3"
+      sources."follow-redirects-1.5.9"
+      sources."http-proxy-1.17.0"
+      sources."inherits-2.0.3"
+      sources."is-arrayish-0.3.2"
+      sources."is-stream-1.1.0"
+      sources."isarray-1.0.0"
+      sources."kuler-1.0.1"
+      sources."lodash-4.17.11"
+      (sources."logform-1.10.0" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
       sources."lynx-0.2.0"
       sources."mersenne-0.0.4"
+      sources."ms-2.0.0"
+      sources."one-time-0.0.4"
+      sources."process-nextick-args-2.0.0"
+      sources."readable-stream-2.3.6"
       sources."requires-port-1.0.0"
+      sources."safe-buffer-5.1.2"
+      sources."simple-swizzle-0.2.2"
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."winston-2.4.4"
+      sources."string_decoder-1.1.1"
+      sources."text-hex-1.0.0"
+      sources."triple-beam-1.3.0"
+      sources."util-deprecate-1.0.2"
+      sources."winston-3.1.0"
+      sources."winston-transport-4.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -37424,7 +37622,7 @@ in
       sha512 = "IfslM3MP42CA/ebVJVlit6FhQ2P6Fercwx9NNQjkVs0wahEwqamL4bcqh1gKiTti7+/ZsDtBRSVmRv+y7LcTbg==";
     };
     dependencies = [
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."acorn-5.7.3"
@@ -37465,7 +37663,7 @@ in
       sources."big-integer-1.6.36"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
-      sources."body-parser-1.18.2"
+      sources."body-parser-1.18.3"
       (sources."boxen-1.3.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -37612,11 +37810,7 @@ in
       sources."evp_bytestokey-1.0.3"
       sources."execa-0.7.0"
       sources."exit-hook-1.1.1"
-      (sources."express-4.16.3" // {
-        dependencies = [
-          sources."safe-buffer-5.1.1"
-        ];
-      })
+      sources."express-4.16.4"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."falafel-2.1.0"
@@ -37656,7 +37850,7 @@ in
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."ieee754-1.1.12"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -37800,19 +37994,13 @@ in
       sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.0.6"
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."rc-1.2.8"
       sources."read-1.0.7"
       sources."read-chunk-2.1.0"
@@ -37837,11 +38025,7 @@ in
       sources."rechoir-0.6.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."qs-6.5.2"
-        ];
-      })
+      sources."request-2.88.0"
       sources."resolve-1.8.1"
       sources."restore-cursor-1.0.1"
       (sources."rimraf-2.6.2" // {
@@ -37855,7 +38039,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-0.3.5"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -37881,7 +38065,7 @@ in
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.4.0"
       sources."stream-browserify-2.0.1"
       sources."stream-buffers-2.2.0"
@@ -37990,7 +38174,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.0"
-      sources."@types/node-10.11.4"
+      sources."@types/node-10.11.7"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -38017,7 +38201,7 @@ in
       sources."custom-error-instance-2.1.1"
       sources."cycle-onionify-4.0.0"
       sources."d-1.0.0"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."delayed-stream-1.0.0"
       sources."es5-ext-0.10.46"
       sources."es6-iterator-2.0.3"
@@ -38121,10 +38305,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "2.0.3";
+    version = "2.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.3.tgz";
-      sha512 = "HpApfnkI/kc8mfqN9JkPUZ0MmaqsKkvhJzUWjXg/PqeeGNrO4NKXmWzc2QUncszl/o+jfaqxy8ajgO0BQuRcow==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.0.4.tgz";
+      sha512 = "8FP0i8GNAVADIH6zc1INmpkxDZADi+wWNOveq/ja/vjpkfgXcHd0bglNC5mg03cVmJUZWm/Am9qNY1IsUW+PGQ==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -38232,7 +38416,7 @@ in
       sources."path-exists-3.0.0"
       sources."pseudomap-1.0.2"
       sources."regenerator-runtime-0.11.1"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."source-map-0.5.7"
@@ -38383,7 +38567,7 @@ in
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.1.1"
       sources."dat-swarm-defaults-1.0.1"
-      (sources."debug-3.2.5" // {
+      (sources."debug-3.2.6" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
@@ -38411,7 +38595,7 @@ in
       sources."dom-walk-0.1.1"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.6.0"
+      sources."duplexify-3.6.1"
       sources."ecc-jsbn-0.1.2"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -38455,7 +38639,7 @@ in
       sources."has-flag-3.0.0"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.19.2" // {
+      (sources."hypercore-6.20.2" // {
         dependencies = [
           sources."process-nextick-args-1.0.7"
           sources."unordered-set-2.0.1"
@@ -38568,7 +38752,7 @@ in
       sources."neat-tasks-1.1.1"
       sources."nets-3.2.0"
       sources."network-address-1.1.2"
-      sources."node-gyp-build-3.4.0"
+      sources."node-gyp-build-3.5.0"
       sources."normalize-path-2.1.1"
       sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
@@ -38631,7 +38815,7 @@ in
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -38651,7 +38835,7 @@ in
       sources."sorted-indexof-1.0.0"
       sources."sparse-bitfield-3.0.3"
       sources."speedometer-1.1.0"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stack-trace-0.0.10"
       sources."stream-collector-1.0.1"
       sources."stream-each-1.2.3"
@@ -38924,7 +39108,7 @@ in
       sources."cors-2.8.4"
       sources."deferred-leveldown-0.2.0"
       sources."docker-parse-image-3.0.1"
-      (sources."duplexify-3.6.0" // {
+      (sources."duplexify-3.6.1" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."readable-stream-2.3.6"
@@ -39068,13 +39252,13 @@ in
       sha512 = "Rxbsh4LWdIlMUO+NxET9g1xHZ9Q93i7jtPESYcCyEOnRiSsZXi/AF6UmCdvmM38IgHrklI2e4DwuG1OwRIGQAA==";
     };
     dependencies = [
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."ajv-5.5.2"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.330.0"
+      sources."aws-sdk-2.334.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."base64-js-1.3.0"
@@ -39137,7 +39321,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."through-2.3.8"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [
@@ -39183,53 +39367,52 @@ in
   elm-test = nodeEnv.buildNodePackage {
     name = "elm-test";
     packageName = "elm-test";
-    version = "0.18.13-beta";
+    version = "0.18.13-beta3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz";
-      sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg==";
+      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta3.tgz";
+      sha512 = "qKYcejb/fXOaZ1dg6N2JQqMc1QLuk1SKZHN2uP4eg+HQIlxWkQ7HQE2Kgo3bojMfdo0t0ZbGS6yhe06NmdeGmg==";
     };
     dependencies = [
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."anymatch-1.3.2"
-      sources."arr-diff-2.0.0"
+      sources."ajv-5.5.2"
+      sources."ansi-styles-3.2.1"
+      sources."anymatch-2.0.0"
+      sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
-      sources."array-unique-0.2.1"
+      sources."array-unique-0.3.2"
       sources."asn1-0.2.4"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.8.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-extensions-1.12.0"
-      sources."binstall-1.2.0"
+      sources."binstall-1.2.1"
       sources."block-stream-0.0.9"
-      sources."boom-2.10.1"
       sources."brace-expansion-1.1.11"
-      sources."braces-1.8.5"
-      (sources."cache-base-1.0.1" // {
+      (sources."braces-2.3.2" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
-      sources."caseless-0.11.0"
-      (sources."chalk-2.1.0" // {
+      sources."cache-base-1.0.1"
+      sources."caseless-0.12.0"
+      sources."chalk-2.1.0"
+      (sources."chokidar-2.0.4" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
+          sources."fsevents-1.2.4"
         ];
       })
-      sources."chokidar-1.6.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -39244,262 +39427,30 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
-          sources."isobject-3.0.1"
           sources."kind-of-5.1.0"
         ];
       })
+      sources."co-4.6.0"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.7"
-      sources."commander-2.18.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."cross-spawn-4.0.0"
-      sources."cryptiles-2.0.5"
-      (sources."dashdash-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
-      (sources."define-property-2.0.2" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
       sources."escape-string-regexp-1.0.5"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      sources."extend-3.0.2"
-      (sources."extend-shallow-3.0.2" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      sources."extglob-0.3.2"
-      sources."extsprintf-1.3.0"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
-      (sources."find-elm-dependencies-1.0.2" // {
-        dependencies = [
-          sources."firstline-1.2.0"
-          sources."lodash-4.14.2"
-        ];
-      })
-      sources."find-parent-dir-0.3.0"
-      sources."firstline-1.2.1"
-      sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
-      sources."fragment-cache-0.2.1"
-      sources."fs-extra-0.30.0"
-      sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.2"
-      sources."fstream-1.0.11"
-      sources."generate-function-2.3.1"
-      sources."generate-object-property-1.2.0"
-      sources."get-value-2.0.6"
-      (sources."getpass-0.1.7" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."glob-7.1.3"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
-      sources."graceful-fs-4.1.11"
-      (sources."har-validator-2.0.6" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."has-ansi-2.0.0"
-      sources."has-flag-2.0.0"
-      (sources."has-value-1.0.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      (sources."has-values-1.0.0" // {
-        dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."kind-of-4.0.0"
-        ];
-      })
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      (sources."is-accessor-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."is-binary-path-1.0.1"
-      sources."is-buffer-1.1.6"
-      (sources."is-data-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      (sources."is-descriptor-1.0.2" // {
-        dependencies = [
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-glob-2.0.1"
-      sources."is-my-ip-valid-1.0.0"
-      sources."is-my-json-valid-2.19.0"
-      sources."is-number-2.1.0"
-      (sources."is-plain-object-2.0.4" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
-      sources."is-property-1.0.2"
-      sources."is-typedarray-1.0.0"
-      sources."is-windows-1.0.2"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
-      sources."jsonpointer-4.0.1"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
-      sources."kind-of-3.2.2"
-      sources."klaw-1.3.1"
-      sources."lodash-4.13.1"
-      sources."lru-cache-4.1.3"
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
-      sources."math-random-1.0.1"
-      sources."micromatch-2.3.11"
-      sources."mime-db-1.36.0"
-      sources."mime-types-2.1.20"
-      sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
-      (sources."mixin-deep-1.3.1" // {
-        dependencies = [
-          sources."is-extendable-1.0.1"
-        ];
-      })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."ms-2.0.0"
-      sources."murmur-hash-js-1.0.0"
-      sources."nan-2.11.1"
-      (sources."nanomatch-1.2.13" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."kind-of-6.0.2"
-        ];
-      })
-      (sources."node-elm-compiler-4.3.3" // {
-        dependencies = [
-          sources."lodash-4.14.2"
-        ];
-      })
-      sources."normalize-path-2.1.1"
-      sources."oauth-sign-0.8.2"
-      (sources."object-copy-0.1.0" // {
+      (sources."expand-brackets-2.1.4" // {
         dependencies = [
           sources."define-property-0.2.5"
-          sources."is-accessor-descriptor-0.1.6"
-          sources."is-data-descriptor-0.1.4"
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-        ];
-      })
-      (sources."object-visit-1.0.1" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      sources."object.omit-2.0.1"
-      (sources."object.pick-1.3.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
-      sources."once-1.4.0"
-      sources."os-tmpdir-1.0.2"
-      sources."parse-glob-3.0.4"
-      sources."pascalcase-0.1.1"
-      sources."path-is-absolute-1.0.1"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."posix-character-classes-0.1.1"
-      sources."preserve-0.2.0"
-      sources."process-nextick-args-2.0.0"
-      sources."pseudomap-1.0.2"
-      sources."punycode-1.4.1"
-      sources."qs-6.3.2"
-      (sources."randomatic-3.1.0" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-          sources."kind-of-6.0.2"
-        ];
-      })
-      sources."readable-stream-2.3.6"
-      (sources."readdirp-2.2.1" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."extglob-2.0.4" // {
-            dependencies = [
-              sources."define-property-1.0.0"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
+          sources."extend-shallow-2.0.1"
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -39510,27 +39461,159 @@ in
               sources."kind-of-3.2.2"
             ];
           })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      (sources."find-elm-dependencies-1.0.2" // {
+        dependencies = [
+          sources."firstline-1.2.0"
+          sources."lodash-4.14.2"
+        ];
+      })
+      sources."find-parent-dir-0.3.0"
+      sources."firstline-1.2.1"
+      sources."for-in-1.0.2"
+      sources."forever-agent-0.6.1"
+      (sources."form-data-2.3.2" // {
+        dependencies = [
+          sources."combined-stream-1.0.6"
+        ];
+      })
+      sources."fragment-cache-0.2.1"
+      sources."fs-extra-0.30.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.1.2"
+      sources."fstream-1.0.11"
+      sources."get-value-2.0.6"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.3"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."graceful-fs-4.1.11"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.0"
+      sources."has-flag-2.0.0"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-plain-object-2.0.4"
+      sources."is-typedarray-1.0.0"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.3.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-2.4.0"
+      sources."jsprim-1.4.1"
+      sources."kind-of-6.0.2"
+      sources."klaw-1.3.1"
+      sources."lodash-4.17.11"
+      sources."lodash.debounce-4.0.8"
+      sources."lru-cache-4.1.3"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."micromatch-3.1.10"
+      sources."mime-db-1.36.0"
+      sources."mime-types-2.1.20"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.0"
+      sources."mixin-deep-1.3.1"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."ms-2.0.0"
+      sources."murmur-hash-js-1.0.0"
+      sources."nan-2.11.1"
+      sources."nanomatch-1.2.13"
+      (sources."node-elm-compiler-4.3.3" // {
+        dependencies = [
+          sources."lodash-4.14.2"
+        ];
+      })
+      sources."normalize-path-2.1.1"
+      sources."oauth-sign-0.9.0"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
           (sources."is-descriptor-0.1.6" // {
             dependencies = [
               sources."kind-of-5.1.0"
             ];
           })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.2"
-          sources."micromatch-3.1.10"
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."regex-cache-0.4.4"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."once-1.4.0"
+      sources."os-tmpdir-1.0.2"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."performance-now-2.1.0"
+      sources."posix-character-classes-0.1.1"
+      sources."process-nextick-args-2.0.0"
+      sources."pseudomap-1.0.2"
+      sources."psl-1.1.29"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
+      sources."readable-stream-2.3.6"
+      sources."readdirp-2.2.1"
       sources."regex-not-1.0.2"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."request-2.79.0"
+      sources."request-2.88.0"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."rimraf-2.6.2"
@@ -39540,6 +39623,7 @@ in
       (sources."set-value-2.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
         ];
       })
       (sources."snapdragon-0.8.2" // {
@@ -39557,27 +39641,26 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
           sources."kind-of-5.1.0"
         ];
       })
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
-      sources."snapdragon-util-3.0.1"
-      sources."sntp-1.0.9"
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."split-1.0.1"
       sources."split-string-3.1.0"
-      (sources."sshpk-1.14.2" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -39596,8 +39679,6 @@ in
         ];
       })
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.6"
-      sources."strip-ansi-3.0.1"
       sources."supports-color-4.2.0"
       sources."tar-2.2.1"
       (sources."temp-0.8.3" // {
@@ -39606,19 +39687,20 @@ in
         ];
       })
       sources."through-2.3.8"
-      sources."to-object-path-0.3.0"
-      sources."to-regex-3.0.2"
-      (sources."to-regex-range-2.1.1" // {
+      (sources."to-object-path-0.3.0" // {
         dependencies = [
-          sources."is-number-3.0.0"
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."tough-cookie-2.3.4"
-      sources."tunnel-agent-0.4.3"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."tough-cookie-2.4.3"
+      sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       (sources."union-value-1.0.0" // {
         dependencies = [
           sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
           sources."set-value-0.4.3"
         ];
       })
@@ -39630,22 +39712,17 @@ in
             ];
           })
           sources."has-values-0.1.4"
-          sources."isobject-3.0.1"
         ];
       })
+      sources."upath-1.1.0"
       sources."urix-0.1.0"
       sources."use-3.1.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.3.2"
-      (sources."verror-1.10.0" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."xmlbuilder-8.2.2"
-      sources."xtend-4.0.1"
       sources."yallist-2.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -39841,7 +39918,7 @@ in
       sources."resolve-from-3.0.0"
       sources."restore-cursor-2.0.0"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -39896,10 +39973,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "5.6.1";
+    version = "5.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-5.6.1.tgz";
-      sha512 = "hgrDtGWz368b7Wqf+v1Z69O3ZebNR0+GA7PtDdbmuz4rInFVUV9uw7whjZEiWyLzCjVb5Rs5WRN1TAS6eo7AYA==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-5.7.0.tgz";
+      sha512 = "zYCeFQahsxffGl87U2aJ7DPyH8CbWgxBC213Y8+TCanhUTf2gEvfq3EKpHmEcozTLyPmGe9LZdMAwC/CpJBM5A==";
     };
     dependencies = [
       sources."@babel/code-frame-7.0.0"
@@ -39907,7 +39984,6 @@ in
       sources."acorn-5.7.3"
       sources."acorn-jsx-4.1.1"
       sources."ajv-6.5.4"
-      sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -40006,7 +40082,7 @@ in
       sources."run-async-2.3.0"
       sources."rxjs-6.3.3"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -40016,7 +40092,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."table-4.0.3"
+      sources."table-5.1.0"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -40051,7 +40127,6 @@ in
       sources."acorn-5.7.3"
       sources."acorn-jsx-4.1.1"
       sources."ajv-6.5.4"
-      sources."ajv-keywords-3.2.0"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -40077,7 +40152,7 @@ in
       sources."del-2.2.2"
       sources."doctrine-2.1.0"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-5.6.1"
+      sources."eslint-5.7.0"
       sources."eslint-scope-4.0.0"
       sources."eslint-utils-1.3.1"
       sources."eslint-visitor-keys-1.0.0"
@@ -40154,7 +40229,7 @@ in
       sources."run-async-2.3.0"
       sources."rxjs-6.3.3"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -40164,7 +40239,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."table-4.0.3"
+      sources."table-5.1.0"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
@@ -40353,13 +40428,13 @@ in
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
       sources."spdx-correct-3.0.2"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -40848,7 +40923,7 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.1.1"
-      sources."simple-git-1.104.0"
+      sources."simple-git-1.105.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -40884,7 +40959,7 @@ in
       sources."git-remote-ssb-2.0.4"
       sources."git-ssb-web-2.8.0"
       sources."hashlru-2.2.1"
-      sources."highlight.js-9.12.0"
+      sources."highlight.js-9.13.0"
       sources."increment-buffer-1.0.1"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -40915,7 +40990,7 @@ in
       sources."multiserver-1.13.5"
       sources."muxrpc-6.4.1"
       sources."nan-2.11.1"
-      sources."node-gyp-build-3.4.0"
+      sources."node-gyp-build-3.5.0"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-1.4.4"
       sources."options-0.0.6"
@@ -40974,7 +41049,7 @@ in
       sources."remove-markdown-0.1.0"
       sources."safe-buffer-5.1.2"
       sources."secret-handshake-1.1.14"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."separator-escape-0.0.0"
       sources."sha.js-2.4.5"
       sources."smart-buffer-4.0.1"
@@ -40990,7 +41065,7 @@ in
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.4"
+      sources."ssb-config-2.3.5"
       sources."ssb-git-0.5.0"
       sources."ssb-git-repo-2.8.3"
       sources."ssb-issues-1.0.0"
@@ -41100,9 +41175,9 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bluebird-3.5.2"
-      (sources."body-parser-1.18.2" // {
+      (sources."body-parser-1.18.3" // {
         dependencies = [
-          sources."iconv-lite-0.4.19"
+          sources."iconv-lite-0.4.23"
         ];
       })
       sources."boxen-1.3.0"
@@ -41137,8 +41212,8 @@ in
         ];
       })
       sources."combined-stream-1.0.7"
-      sources."command-exists-1.2.7"
-      sources."commander-2.18.0"
+      sources."command-exists-1.2.8"
+      sources."commander-2.19.0"
       sources."common-tags-1.8.0"
       sources."concat-map-0.0.1"
       sources."configstore-3.1.2"
@@ -41206,20 +41281,12 @@ in
         ];
       })
       sources."expand-tilde-2.0.2"
-      sources."express-4.16.3"
+      sources."express-4.16.4"
       (sources."express-request-proxy-2.2.2" // {
         dependencies = [
-          (sources."body-parser-1.18.3" // {
-            dependencies = [
-              sources."debug-2.6.9"
-            ];
-          })
-          sources."debug-3.2.5"
-          sources."iconv-lite-0.4.23"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."path-to-regexp-1.7.0"
-          sources."qs-6.5.2"
-          sources."raw-body-2.3.3"
         ];
       })
       sources."extend-3.0.2"
@@ -41254,7 +41321,7 @@ in
       sources."graphcool-json-schema-1.2.1"
       (sources."graphcool-yml-0.4.15" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."dotenv-4.0.0"
           sources."fs-extra-4.0.3"
           sources."ms-2.1.1"
@@ -41300,7 +41367,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -41350,7 +41417,7 @@ in
       sources."json-schema-0.2.3"
       (sources."json-schema-ref-parser-3.3.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -41455,7 +41522,7 @@ in
       sources."prisma-json-schema-0.1.1"
       (sources."prisma-yml-1.0.93" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."dotenv-4.0.0"
           sources."ms-2.1.1"
         ];
@@ -41467,14 +41534,11 @@ in
       sources."pseudomap-1.0.2"
       sources."psl-1.1.29"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
+      (sources."raw-body-2.3.3" // {
         dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."iconv-lite-0.4.19"
-          sources."setprototypeof-1.0.3"
+          sources."iconv-lite-0.4.23"
         ];
       })
       (sources."rc-1.2.8" // {
@@ -41493,12 +41557,7 @@ in
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."replaceall-0.1.6"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."qs-6.5.2"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."request-2.88.0"
       sources."request-promise-4.2.2"
       sources."request-promise-core-1.1.1"
       sources."require-directory-2.1.1"
@@ -41509,10 +41568,10 @@ in
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."rxjs-5.5.12"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."scuid-1.1.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       sources."send-0.16.2"
       sources."sentence-case-2.1.1"
@@ -41536,7 +41595,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.4.0"
       sources."stealthy-require-1.1.1"
       (sources."string-width-2.1.1" // {
@@ -42200,7 +42259,7 @@ in
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
-      sources."natives-1.1.5"
+      sources."natives-1.1.6"
       sources."object-assign-3.0.0"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -42609,7 +42668,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-greatest-satisfied-range-1.1.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.0" // {
@@ -42754,7 +42813,7 @@ in
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."ast-types-0.11.5"
+      sources."ast-types-0.11.6"
       sources."async-2.6.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -42800,7 +42859,7 @@ in
       sources."dashdash-1.14.1"
       sources."data-uri-to-buffer-1.2.0"
       sources."date-now-0.1.4"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
@@ -43043,7 +43102,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."setprototypeof-1.1.0"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
@@ -43053,14 +43112,14 @@ in
       sources."shelljs-0.3.0"
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
-      sources."snyk-1.102.0"
+      sources."snyk-1.103.4"
       sources."snyk-config-2.2.0"
-      sources."snyk-docker-plugin-1.11.0"
+      sources."snyk-docker-plugin-1.12.0"
       sources."snyk-go-plugin-1.5.2"
       sources."snyk-gradle-plugin-2.1.0"
       sources."snyk-module-1.8.2"
       sources."snyk-mvn-plugin-2.0.0"
-      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
+      (sources."snyk-nodejs-lockfile-parser-1.5.3" // {
         dependencies = [
           sources."lodash-4.17.10"
         ];
@@ -43070,7 +43129,7 @@ in
       sources."snyk-policy-1.12.0"
       sources."snyk-python-plugin-1.8.2"
       sources."snyk-resolve-1.0.1"
-      sources."snyk-resolve-deps-4.0.1"
+      sources."snyk-resolve-deps-4.0.2"
       sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.3.1"
@@ -43080,7 +43139,7 @@ in
       sources."source-map-support-0.5.9"
       sources."split-1.0.1"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
       sources."string-width-2.1.1"
@@ -43206,7 +43265,7 @@ in
       sources."debug-3.1.0"
       sources."ecstatic-3.3.0"
       sources."eventemitter3-3.1.0"
-      sources."follow-redirects-1.5.8"
+      sources."follow-redirects-1.5.9"
       sources."he-1.2.0"
       sources."http-proxy-1.17.0"
       sources."mime-1.6.0"
@@ -43261,7 +43320,7 @@ in
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
-      sources."ast-types-0.11.5"
+      sources."ast-types-0.11.6"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
       sources."balanced-match-1.0.0"
@@ -43346,7 +43405,7 @@ in
       })
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
         ];
       })
       sources."iconv-lite-0.4.24"
@@ -43410,7 +43469,7 @@ in
           sources."yallist-3.0.2"
         ];
       })
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -43430,7 +43489,7 @@ in
       sources."p-finally-1.0.0"
       (sources."pac-proxy-agent-3.0.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
         ];
       })
       sources."pac-resolver-3.0.0"
@@ -43444,7 +43503,7 @@ in
       sources."process-nextick-args-2.0.0"
       (sources."proxy-agent-3.0.3" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
         ];
       })
       sources."proxy-from-env-1.0.0"
@@ -43467,7 +43526,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       sources."setprototypeof-1.1.0"
       sources."shebang-command-1.2.0"
@@ -43497,12 +43556,12 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."superagent-3.8.3" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
         ];
       })
       (sources."superagent-proxy-2.0.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
         ];
       })
       sources."supports-color-5.5.0"
@@ -43757,7 +43816,7 @@ in
       sha512 = "Kkal2i0jcXsgwgn61gnhVJuh0R0J+HqyzREVaeBvZHgMCAQVW02kYwVbY8xzpBfcZmDBYcT5LrPBBQa27C9tRA==";
     };
     dependencies = [
-      (sources."@commitlint/cli-7.2.0" // {
+      (sources."@commitlint/cli-7.2.1" // {
         dependencies = [
           sources."chalk-2.3.1"
         ];
@@ -43765,10 +43824,10 @@ in
       sources."@commitlint/config-conventional-7.1.2"
       sources."@commitlint/ensure-7.2.0"
       sources."@commitlint/execute-rule-7.1.2"
-      sources."@commitlint/format-7.2.0"
-      sources."@commitlint/is-ignored-7.2.0"
-      sources."@commitlint/lint-7.2.0"
-      sources."@commitlint/load-7.2.0"
+      sources."@commitlint/format-7.2.1"
+      sources."@commitlint/is-ignored-7.2.1"
+      sources."@commitlint/lint-7.2.1"
+      sources."@commitlint/load-7.2.1"
       sources."@commitlint/message-7.1.2"
       sources."@commitlint/parse-7.1.2"
       sources."@commitlint/read-7.1.2"
@@ -43777,7 +43836,7 @@ in
       sources."@commitlint/to-lines-7.1.2"
       sources."@commitlint/top-level-7.1.2"
       sources."@marionebl/sander-0.6.1"
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."ansi-color-0.2.1"
       sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
@@ -43806,7 +43865,7 @@ in
       sources."check-error-1.0.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."compare-func-1.3.2"
       sources."concat-map-0.0.1"
       sources."conventional-changelog-angular-1.6.6"
@@ -43860,7 +43919,7 @@ in
       sources."is-text-path-1.0.1"
       sources."isarray-1.0.0"
       sources."iterare-0.0.8"
-      (sources."jaeger-client-3.12.0" // {
+      (sources."jaeger-client-3.13.0" // {
         dependencies = [
           sources."opentracing-0.13.0"
         ];
@@ -43938,7 +43997,7 @@ in
       sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."semaphore-async-await-1.5.1"
-      sources."semver-5.5.0"
+      sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
       sources."spdx-correct-3.0.2"
       sources."spdx-exceptions-2.2.0"
@@ -43953,7 +44012,7 @@ in
       sources."strip-indent-2.0.0"
       sources."supports-color-5.5.0"
       sources."symbol-observable-1.0.1"
-      sources."text-extensions-1.8.0"
+      sources."text-extensions-1.9.0"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
       sources."thriftrw-3.11.3"
@@ -44171,7 +44230,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."shelljs-0.3.0"
       sources."split-1.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stack-trace-0.0.10"
       sources."string_decoder-0.10.31"
       sources."strip-json-comments-1.0.4"
@@ -44218,18 +44277,18 @@ in
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
-    version = "1.8.6";
+    version = "1.8.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.6.tgz";
-      sha512 = "TYDZa+lg8vEC5U0OmGQEEwiZ0XFBfvZAUeNOtqflLe+woKuIqF4JzlsBx/C1KVYW5lUewZy2ODL4Obq6sH7a4Q==";
+      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.7.tgz";
+      sha512 = "yhAMCTv0L9GNg6Gql7i+g4C1z9rQhfHXy4J0TGYFoBzzHR4reWYS573gkRrPuE58dYOH451LmBeAb8L1pLEfdA==";
     };
     dependencies = [
-      sources."@types/commander-2.12.2"
+      sources."@types/node-10.11.7"
       sources."@types/semver-5.5.0"
       sources."abbrev-1.1.1"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."config-chain-1.1.12"
-      sources."editorconfig-0.15.0"
+      sources."editorconfig-0.15.2"
       sources."ini-1.3.5"
       sources."lru-cache-4.1.3"
       sources."minimist-0.0.8"
@@ -44240,7 +44299,7 @@ in
       sources."osenv-0.1.5"
       sources."proto-list-1.2.4"
       sources."pseudomap-1.0.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."sigmund-1.0.1"
       sources."yallist-2.1.2"
     ];
@@ -44334,7 +44393,7 @@ in
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -44440,19 +44499,8 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."execa-0.7.0"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
-          sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
       })
@@ -44539,7 +44587,7 @@ in
       sources."minimist-1.2.0"
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
-      sources."nanoid-1.2.6"
+      sources."nanoid-1.3.0"
       sources."negotiator-0.6.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -44578,7 +44626,7 @@ in
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
       (sources."send-0.16.2" // {
@@ -44593,7 +44641,7 @@ in
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
       sources."string-width-2.1.1"
@@ -44821,7 +44869,7 @@ in
           sources."statuses-1.3.1"
         ];
       })
-      (sources."follow-redirects-1.5.8" // {
+      (sources."follow-redirects-1.5.9" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -44879,7 +44927,7 @@ in
       sources."lodash.debounce-4.0.8"
       (sources."log4js-3.0.6" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -45024,7 +45072,7 @@ in
       sources."statuses-1.5.0"
       (sources."streamroller-0.7.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -45259,7 +45307,7 @@ in
       sources."convert-source-map-1.6.0"
       sources."core-util-is-1.0.2"
       sources."define-properties-1.1.3"
-      sources."duplexify-3.6.0"
+      sources."duplexify-3.6.1"
       sources."end-of-stream-1.4.1"
       sources."extend-3.0.2"
       sources."flush-write-stream-1.0.3"
@@ -45527,7 +45575,7 @@ in
       sources."sntp-2.1.0"
       sources."source-map-0.6.1"
       sources."sprintf-js-1.1.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stack-trace-0.0.10"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
@@ -45598,10 +45646,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "3.4.1";
+    version = "3.4.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.1.tgz";
-      sha512 = "00X2mYuwJk/bvxdjJceUxTjUgUg7MIMWllo2zGfDVGPijLadrg8QCtJASZqVE7HDQbBLDxLGPjswk29HF5JS2Q==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-3.4.3.tgz";
+      sha512 = "tWq1LvpHqkyB+FaJCmkEweivr88yShDMmauofPVdh0M5gU1cVucszYnIgWafulKYu2LMQ3IfUMUU5Pp3+MvADQ==";
     };
     dependencies = [
       sources."@lerna/add-3.4.1"
@@ -45641,7 +45689,7 @@ in
       sources."@lerna/package-graph-3.1.2"
       sources."@lerna/project-3.0.0"
       sources."@lerna/prompt-3.3.1"
-      sources."@lerna/publish-3.4.1"
+      sources."@lerna/publish-3.4.3"
       sources."@lerna/resolve-symlink-3.3.0"
       sources."@lerna/rimraf-dir-3.3.0"
       sources."@lerna/run-3.3.2"
@@ -45654,7 +45702,7 @@ in
       sources."@lerna/write-log-file-3.0.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.2"
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."agent-base-4.2.1"
       sources."agentkeepalive-3.5.1"
@@ -45805,7 +45853,7 @@ in
       sources."dir-glob-2.0.0"
       sources."dot-prop-4.2.0"
       sources."duplexer-0.1.1"
-      sources."duplexify-3.6.0"
+      sources."duplexify-3.6.1"
       sources."ecc-jsbn-0.1.2"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
@@ -45942,7 +45990,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -46040,7 +46088,7 @@ in
           sources."read-pkg-up-3.0.0"
         ];
       })
-      sources."merge2-1.2.2"
+      sources."merge2-1.2.3"
       sources."micromatch-3.1.10"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
@@ -46053,7 +46101,7 @@ in
           sources."yallist-3.0.2"
         ];
       })
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.1" // {
         dependencies = [
@@ -46224,7 +46272,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.0" // {
         dependencies = [
@@ -46279,7 +46327,7 @@ in
       sources."split-string-3.1.0"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."ssri-6.0.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -46320,7 +46368,7 @@ in
       })
       sources."temp-dir-1.0.0"
       sources."temp-write-3.4.0"
-      sources."text-extensions-1.8.0"
+      sources."text-extensions-1.9.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."tmp-0.0.33"
@@ -46474,7 +46522,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."source-map-0.6.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."tough-cookie-2.4.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -47030,19 +47078,8 @@ in
       sources."etag-1.8.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
-          sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
       })
@@ -47359,7 +47396,7 @@ in
       sources."source-map-url-0.4.0"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -47534,7 +47571,7 @@ in
         dependencies = [
           sources."glob-7.1.3"
           sources."minimatch-3.0.4"
-          sources."semver-5.5.1"
+          sources."semver-5.6.0"
           sources."uglify-js-2.8.29"
         ];
       })
@@ -47645,7 +47682,7 @@ in
       sources."debug-2.6.9"
       (sources."debug-fabulous-1.1.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -47665,7 +47702,7 @@ in
           sources."readable-stream-1.1.14"
         ];
       })
-      (sources."duplexify-3.6.0" // {
+      (sources."duplexify-3.6.1" // {
         dependencies = [
           sources."end-of-stream-1.4.1"
           sources."once-1.4.0"
@@ -47961,7 +47998,7 @@ in
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
-      sources."natives-1.1.5"
+      sources."natives-1.1.6"
       sources."next-tick-1.0.0"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.0"
@@ -48088,7 +48125,7 @@ in
       sources."source-map-url-0.4.0"
       sources."sparkles-1.0.1"
       sources."split-string-3.1.0"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -48142,7 +48179,7 @@ in
       sources."tough-cookie-2.4.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."typescript-3.1.1"
+      sources."typescript-3.1.3"
       (sources."uglify-js-3.4.9" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -48261,11 +48298,11 @@ in
       sources."argparse-1.0.10"
       sources."asynckit-0.4.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.18.0"
+      sources."commander-2.19.0"
       sources."component-emitter-1.2.1"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."delayed-stream-1.0.0"
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
@@ -48408,7 +48445,7 @@ in
       sources."mime-types-2.1.20"
       sources."minimist-0.0.8"
       sources."minipass-2.3.4"
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
@@ -48452,7 +48489,7 @@ in
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."ssri-5.3.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
@@ -48577,7 +48614,7 @@ in
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
@@ -48604,10 +48641,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "3.4.0";
+    version = "3.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.4.0.tgz";
-      sha512 = "YoviGBJYGrPdLOKDIQB0sKxuKy/EEsxzooNkOZak4vSTKT/qH0Pa6dj3t1MJjEQGsefih61IyHDmO1WW7xOFfw==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.5.0.tgz";
+      sha512 = "qjEE8eIWVyqZhkAFUzytGpOGvLHeX5kXBB6MYyTOCPZBrBlsLyXAAzTsp/hWMbVlg8kVpzDJCZZowIrnKpwmqQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -48648,7 +48685,7 @@ in
       sources."biased-opener-0.2.8"
       sources."big-integer-1.6.36"
       sources."block-stream-0.0.9"
-      sources."body-parser-1.18.2"
+      sources."body-parser-1.18.3"
       sources."boom-2.10.1"
       sources."bplist-parser-0.1.1"
       sources."brace-expansion-1.1.11"
@@ -48691,7 +48728,7 @@ in
       sources."error-ex-1.3.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      sources."express-4.16.3"
+      sources."express-4.16.4"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."finalhandler-1.1.1"
@@ -48721,7 +48758,7 @@ in
       sources."hosted-git-info-2.7.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.1.1"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -48773,7 +48810,7 @@ in
         dependencies = [
           sources."glob-7.1.3"
           sources."rimraf-2.6.2"
-          sources."semver-5.5.1"
+          sources."semver-5.6.0"
         ];
       })
       sources."nopt-4.0.1"
@@ -48803,15 +48840,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."rc-1.2.8"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -48824,13 +48855,14 @@ in
         ];
       })
       sources."rimraf-2.2.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-4.3.6"
       sources."send-0.16.2"
       (sources."serve-favicon-2.5.0" // {
         dependencies = [
           sources."ms-2.1.1"
+          sources."safe-buffer-5.1.1"
         ];
       })
       sources."serve-static-1.13.2"
@@ -48842,7 +48874,7 @@ in
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
-      (sources."sshpk-1.14.2" // {
+      (sources."sshpk-1.15.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -48955,7 +48987,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."minipass-2.3.4"
-      sources."minizlib-1.1.0"
+      sources."minizlib-1.1.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."needle-2.2.4"
@@ -48981,7 +49013,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -49074,7 +49106,7 @@ in
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
-      (sources."debug-3.2.5" // {
+      (sources."debug-3.2.6" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
@@ -49238,7 +49270,7 @@ in
       sources."ret-0.1.15"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       (sources."set-value-2.0.0" // {
         dependencies = [
@@ -49455,7 +49487,7 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
-      sources."duplexify-3.6.0"
+      sources."duplexify-3.6.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -49535,7 +49567,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -49716,7 +49748,7 @@ in
       sources."source-map-0.6.1"
       sources."split2-2.2.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.0"
       sources."streamsearch-0.1.2"
@@ -50022,7 +50054,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.3.5"
-      sources."natives-1.1.5"
+      sources."natives-1.1.6"
       sources."ncp-0.4.2"
       sources."nopt-2.2.1"
       (sources."npm-registry-client-0.2.27" // {
@@ -50060,7 +50092,7 @@ in
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slide-1.1.6"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
@@ -50131,7 +50163,7 @@ in
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."deep-extend-0.6.0"
       sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
@@ -50201,9 +50233,9 @@ in
       sources."registry-url-3.1.0"
       sources."require-from-string-2.0.2"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
-      sources."semver-utils-1.1.2"
+      sources."semver-utils-1.1.4"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
@@ -50274,7 +50306,7 @@ in
       sources."colors-1.3.2"
       sources."cross-spawn-5.1.0"
       sources."cvss-1.0.4"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."error-ex-1.3.2"
       sources."es6-promise-4.2.5"
@@ -50343,7 +50375,7 @@ in
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
@@ -50510,20 +50542,9 @@ in
       sources."escape-html-1.0.3"
       sources."esprima-4.0.1"
       sources."etag-1.8.1"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
           sources."content-type-1.0.4"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
-          sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
       })
@@ -50686,7 +50707,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       (sources."send-0.16.2" // {
         dependencies = [
           sources."statuses-1.4.0"
@@ -50709,7 +50730,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.5.0"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
@@ -50972,7 +50993,7 @@ in
       sources."rxjs-5.5.12"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."server-destroy-1.0.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
@@ -51580,7 +51601,7 @@ in
       sources."rimraf-2.6.2"
       sources."safer-buffer-2.1.2"
       sources."sntp-1.0.9"
-      (sources."sshpk-1.14.2" // {
+      (sources."sshpk-1.15.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -51617,10 +51638,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "2.16.2";
+    version = "2.16.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.2.tgz";
-      sha512 = "MYb5lDNvYE3f0UfbZqV6HSMHWOiVveTRbT7+f3IocRgLaEIJTEy1QTuuXOUUuAmbSOkjJ11euYb+qy4HTNZaUg==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-2.16.3.tgz";
+      sha512 = "W63qZOC9YGr+33JYvZjvhzvYL4YKT2gAywDJQrHvKTL6vmnnSh+GdM3ZdGIIZ6A57YB3NgvQaq/BJ2uYjwn3ZQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -51657,7 +51678,7 @@ in
       sha512 = "Sm1XQg2h2JBVHWK3bxSHnmMdMoM0hEi5cbGfBBLpM6E2qU1vjJhDJsO/8bEkxC2RvNAAEOWROKMI3tTzmVxLbQ==";
     };
     dependencies = [
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."acorn-6.0.2"
       sources."acorn-node-1.6.0"
       sources."acorn-walk-6.1.0"
@@ -51913,7 +51934,7 @@ in
       sources."mute-stream-0.0.7"
       sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
-      sources."neo-async-2.5.2"
+      sources."neo-async-2.6.0"
       sources."node-static-0.7.11"
       sources."normalize-path-2.1.1"
       (sources."object-copy-0.1.0" // {
@@ -52147,11 +52168,7 @@ in
       sources."babel-runtime-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
-      (sources."basic-auth-2.0.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."bindings-1.2.1"
       sources."bl-1.2.2"
@@ -52210,18 +52227,8 @@ in
       sources."etag-1.8.1"
       sources."eventemitter2-3.0.2"
       sources."expand-template-1.1.1"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -52364,9 +52371,9 @@ in
       })
       sources."resolve-1.8.1"
       sources."right-align-0.1.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       (sources."send-0.16.2" // {
         dependencies = [
           sources."statuses-1.4.0"
@@ -52386,7 +52393,7 @@ in
       sources."simple-get-1.4.3"
       sources."sntp-1.0.9"
       sources."source-map-0.5.7"
-      (sources."sshpk-1.14.2" // {
+      (sources."sshpk-1.15.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -52540,7 +52547,7 @@ in
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."stack-trace-0.0.10"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
@@ -52676,7 +52683,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."send-0.1.4"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stream-counter-0.2.0"
       sources."string-1.6.1"
       sources."string_decoder-0.10.31"
@@ -52699,10 +52706,10 @@ in
   scuttlebot = nodeEnv.buildNodePackage {
     name = "scuttlebot";
     packageName = "scuttlebot";
-    version = "12.2.3";
+    version = "13.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-12.2.3.tgz";
-      sha512 = "Y40HTj8B8DHdGUCbup//Ge/BiVcmp6fVPCGHnn5Jmq0QyQitlnFUaeMlv2fdqealM4xB3xuCTS2KChbiRJOWtw==";
+      url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.0.0.tgz";
+      sha512 = "niRO3ySzMcXXIrx88zBMdLZ53zvC3DALiFZL42hELL0nE3ohGlhSYQNYefgPB1KiVyMomuNvlhusw9yQsYs/dQ==";
     };
     dependencies = [
       sources."abstract-leveldown-4.0.3"
@@ -52991,7 +52998,7 @@ in
       sources."isobject-2.1.0"
       sources."json-buffer-2.0.11"
       sources."kind-of-3.2.2"
-      (sources."layered-graph-1.1.0" // {
+      (sources."layered-graph-1.1.1" // {
         dependencies = [
           sources."pull-cont-0.1.1"
         ];
@@ -53098,7 +53105,7 @@ in
       })
       sources."ncp-2.0.0"
       sources."node-abi-2.4.5"
-      sources."node-gyp-build-3.4.0"
+      sources."node-gyp-build-3.5.0"
       (sources."non-private-ip-1.4.4" // {
         dependencies = [
           sources."ip-1.1.5"
@@ -53320,17 +53327,17 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."secret-handshake-1.1.14"
-      (sources."secret-stack-4.2.1" // {
+      (sources."secret-stack-4.2.4" // {
         dependencies = [
           sources."ip-1.1.5"
         ];
       })
-      (sources."secure-scuttlebutt-18.4.0" // {
+      (sources."secure-scuttlebutt-18.5.0" // {
         dependencies = [
           sources."deep-equal-0.2.2"
         ];
       })
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."separator-escape-0.0.0"
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.0" // {
@@ -53391,7 +53398,7 @@ in
       sources."split-string-3.1.0"
       sources."ssb-blobs-1.1.5"
       sources."ssb-client-4.6.0"
-      sources."ssb-config-2.3.4"
+      sources."ssb-config-2.3.5"
       sources."ssb-ebt-5.2.3"
       (sources."ssb-friends-3.1.3" // {
         dependencies = [
@@ -53403,7 +53410,7 @@ in
       sources."ssb-msgs-5.2.0"
       (sources."ssb-query-2.3.0" // {
         dependencies = [
-          sources."flumeview-query-7.0.0"
+          sources."flumeview-query-7.1.0"
           sources."map-filter-reduce-3.2.1"
         ];
       })
@@ -53413,7 +53420,7 @@ in
         ];
       })
       sources."ssb-validate-3.0.11"
-      sources."ssb-ws-2.1.1"
+      sources."ssb-ws-3.0.0"
       sources."stack-0.1.0"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -53531,10 +53538,10 @@ in
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
-    version = "5.5.1";
+    version = "5.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz";
-      sha512 = "PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==";
+      url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
+      sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -53665,7 +53672,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."blob-0.0.2"
-      sources."body-parser-1.18.2"
+      sources."body-parser-1.18.3"
       sources."bytes-3.0.0"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
@@ -53714,7 +53721,7 @@ in
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."event-stream-3.3.6"
-      sources."express-4.16.3"
+      sources."express-4.16.4"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
@@ -53744,7 +53751,7 @@ in
       })
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."indexof-0.0.1"
       sources."inherits-2.0.3"
       sources."ipaddr.js-1.8.0"
@@ -53788,24 +53795,13 @@ in
       sources."proxy-addr-2.0.4"
       sources."psl-1.1.29"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."qs-6.5.2"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
-      sources."safe-buffer-5.1.1"
+      sources."request-2.88.0"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -53839,7 +53835,7 @@ in
         ];
       })
       sources."split-1.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.4.0"
       sources."stream-combiner-0.2.2"
       sources."string_decoder-0.10.31"
@@ -53881,7 +53877,7 @@ in
       sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     dependencies = [
-      sources."JSONStream-1.3.4"
+      sources."JSONStream-1.3.5"
       sources."accepts-1.3.5"
       sources."ajv-5.5.2"
       sources."amdefine-1.0.1"
@@ -54098,7 +54094,7 @@ in
       sources."source-map-0.1.43"
       sources."sprintf-js-1.0.3"
       sources."srcset-1.0.0"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."statuses-1.3.1"
       sources."string_decoder-1.1.1"
       sources."supports-color-5.5.0"
@@ -54525,10 +54521,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.102.0";
+    version = "1.103.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.102.0.tgz";
-      sha512 = "OZfjEJeMdrYj7KVXaNhLwVi1vv5omRyrLv469BD6Bc6mvOK4/JVEcJGoNgn3MyWazgpOy8/4Xi9mMQvrdwfRfQ==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.103.4.tgz";
+      sha512 = "ynLlsLDjAkzymd0qi1il6f34S4oNTfIgvFCFvkYxvqfBkedfOoDQT4TLU8gi+55MGM6iornf2iefC2FW92BwnQ==";
     };
     dependencies = [
       sources."@yarnpkg/lockfile-1.1.0"
@@ -54541,7 +54537,7 @@ in
       sources."archy-1.0.0"
       sources."argparse-1.0.10"
       sources."asap-2.0.6"
-      sources."ast-types-0.11.5"
+      sources."ast-types-0.11.6"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
@@ -54571,7 +54567,7 @@ in
       sources."core-util-is-1.0.2"
       sources."crypto-random-string-1.0.0"
       sources."data-uri-to-buffer-1.2.0"
-      sources."debug-3.2.5"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-is-0.1.3"
       sources."degenerator-1.0.4"
@@ -54718,7 +54714,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."secure-keys-1.0.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."setprototypeof-1.1.0"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
@@ -54728,12 +54724,12 @@ in
       sources."signal-exit-3.0.2"
       sources."smart-buffer-1.1.15"
       sources."snyk-config-2.2.0"
-      sources."snyk-docker-plugin-1.11.0"
+      sources."snyk-docker-plugin-1.12.0"
       sources."snyk-go-plugin-1.5.2"
       sources."snyk-gradle-plugin-2.1.0"
       sources."snyk-module-1.8.2"
       sources."snyk-mvn-plugin-2.0.0"
-      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
+      (sources."snyk-nodejs-lockfile-parser-1.5.3" // {
         dependencies = [
           sources."lodash-4.17.10"
         ];
@@ -54743,7 +54739,7 @@ in
       sources."snyk-policy-1.12.0"
       sources."snyk-python-plugin-1.8.2"
       sources."snyk-resolve-1.0.1"
-      sources."snyk-resolve-deps-4.0.1"
+      sources."snyk-resolve-deps-4.0.2"
       sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       sources."snyk-try-require-1.3.1"
@@ -55409,14 +55405,14 @@ in
       })
       sources."mpath-0.2.1"
       sources."ms-2.0.0"
-      sources."multer-1.4.0"
+      sources."multer-1.4.1"
       sources."mute-stream-0.0.5"
       sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
       (sources."nodemon-1.18.4" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."supports-color-5.5.0"
         ];
@@ -55455,7 +55451,7 @@ in
       sources."path-key-2.0.1"
       (sources."path-loader-1.0.9" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."qs-6.5.2"
           sources."superagent-3.8.3"
@@ -55506,7 +55502,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."sanitize-filename-1.6.1"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       (sources."send-0.16.2" // {
         dependencies = [
@@ -55863,7 +55859,7 @@ in
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.9"
       sources."sprintf-0.1.5"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stack-trace-0.0.10"
       sources."temp-0.8.3"
       sources."tough-cookie-2.3.4"
@@ -56077,10 +56073,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.1.1";
+    version = "3.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz";
-      sha512 = "Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.1.3.tgz";
+      sha512 = "+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -56221,7 +56217,7 @@ in
       sources."p-finally-1.0.0"
       (sources."package-json-4.0.1" // {
         dependencies = [
-          sources."semver-5.5.1"
+          sources."semver-5.6.0"
         ];
       })
       sources."parse-json-2.2.0"
@@ -56332,10 +56328,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.32";
+    version = "1.4.34";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.32.tgz";
-      sha512 = "qPsvjAYgdeO2Zrx5KvW8oxI8Vof3iK+x/0SfHxKbs+CJjbY5nzpaGI2wCoyiS8nWykcxAmy3RjZKpzOpzBnW0A==";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.34.tgz";
+      sha512 = "7sgDDNaWakL7tzp5NwENWHV0SekB6LzcW99nVv0CLthggQnw7wWDnSFAz9iHbBINNj14Sh3gscO7nd73qBtlgA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -56427,7 +56423,7 @@ in
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."diff-3.5.0"
-      sources."diff2html-2.3.3"
+      sources."diff2html-2.4.0"
       sources."dnd-page-scroll-0.0.4"
       (sources."eachr-3.2.0" // {
         dependencies = [
@@ -56459,18 +56455,8 @@ in
       sources."etag-1.8.1"
       sources."eve-0.5.4"
       sources."execa-0.10.0"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -56527,7 +56513,7 @@ in
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.23"
-      sources."ignore-3.3.10"
+      sources."ignore-5.0.2"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -56589,9 +56575,9 @@ in
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
-      sources."npm-6.1.0"
+      sources."npm-6.4.1"
       sources."npm-package-arg-6.1.0"
-      sources."npm-registry-client-8.5.1"
+      sources."npm-registry-client-8.6.0"
       sources."npm-run-path-2.0.2"
       sources."npmlog-4.1.2"
       sources."nprogress-0.2.0"
@@ -56603,7 +56589,7 @@ in
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."once-1.4.0"
-      sources."opn-5.3.0"
+      sources."opn-5.4.0"
       sources."os-homedir-1.0.2"
       sources."os-locale-3.0.1"
       sources."os-tmpdir-1.0.2"
@@ -56634,7 +56620,7 @@ in
       sources."qs-6.5.2"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.0"
-      sources."raven-js-3.26.4"
+      sources."raven-js-3.27.0"
       sources."raw-body-2.3.3"
       (sources."rc-1.2.8" // {
         dependencies = [
@@ -56653,14 +56639,13 @@ in
               sources."combined-stream-1.0.6"
             ];
           })
-          sources."safe-buffer-5.1.2"
         ];
       })
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.1"
       (sources."send-0.16.2" // {
@@ -56701,7 +56686,7 @@ in
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."ssri-5.3.0"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
@@ -56710,19 +56695,18 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."superagent-3.8.3" // {
+      (sources."superagent-4.0.0-beta.5" // {
         dependencies = [
           sources."combined-stream-1.0.6"
           sources."component-emitter-1.2.1"
           sources."cookiejar-2.1.2"
-          sources."debug-3.2.5"
+          sources."debug-4.1.0"
           sources."delayed-stream-1.0.0"
-          sources."extend-3.0.2"
           sources."form-data-2.3.2"
           sources."formidable-1.2.1"
-          sources."isarray-1.0.0"
+          sources."mime-2.3.1"
           sources."ms-2.1.1"
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-3.0.6"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -57010,11 +56994,11 @@ in
           sources."commander-2.8.1"
         ];
       })
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."signal-exit-3.0.2"
       sources."source-map-0.6.1"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       sources."stat-mode-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
@@ -57042,7 +57026,7 @@ in
         ];
       })
       sources."uid-0.0.2"
-      sources."unbzip2-stream-1.3.0"
+      sources."unbzip2-stream-1.3.1"
       sources."unyield-0.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
@@ -57073,10 +57057,10 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "3.0.4";
+    version = "3.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.4.tgz";
-      sha512 = "HC7u3pIjzPV7/5vdZYRpY1VtBsp8xpTxzZLVF61ijQ61bt+cTpF17qOdPW0Tu1muRzD1Qc5d6K15USvtvWg5YQ==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-3.0.5.tgz";
+      sha512 = "wNwK6oosaMY5gCmzONatVAVLf8dMmpGqxoT1Z6ne0aBRg6gOUZ+XrLN6MiF34tlETvQ/XhHUC5d+YVWoBVlllQ==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
@@ -57106,18 +57090,18 @@ in
       sources."@types/express-serve-static-core-4.16.0"
       sources."@types/long-4.0.0"
       sources."@types/mime-2.0.0"
-      sources."@types/node-10.11.4"
+      sources."@types/node-10.11.7"
       sources."@types/range-parser-1.2.2"
       sources."@types/serve-static-1.13.2"
       sources."@types/ws-5.1.2"
       sources."@types/zen-observable-0.8.0"
-      sources."@vue/cli-shared-utils-3.0.4"
-      (sources."@vue/cli-ui-3.0.4" // {
+      sources."@vue/cli-shared-utils-3.0.5"
+      (sources."@vue/cli-ui-3.0.5" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-3.0.4"
+      sources."@vue/cli-ui-addon-webpack-3.0.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.5"
       sources."ajv-5.5.2"
@@ -57274,7 +57258,7 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."dashdash-1.14.1"
-      (sources."debug-3.2.5" // {
+      (sources."debug-3.2.6" // {
         dependencies = [
           sources."ms-2.1.1"
         ];
@@ -57362,19 +57346,9 @@ in
         ];
       })
       sources."expand-tilde-2.0.2"
-      (sources."express-4.16.3" // {
+      (sources."express-4.16.4" // {
         dependencies = [
-          sources."body-parser-1.18.2"
           sources."debug-2.6.9"
-          (sources."http-errors-1.6.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          sources."raw-body-2.3.2"
           sources."statuses-1.4.0"
         ];
       })
@@ -57564,7 +57538,7 @@ in
       sources."media-typer-0.3.0"
       sources."merge-1.2.0"
       sources."merge-descriptors-1.0.1"
-      sources."merge2-1.2.2"
+      sources."merge2-1.2.3"
       sources."methods-1.1.2"
       (sources."micromatch-3.1.10" // {
         dependencies = [
@@ -57592,7 +57566,7 @@ in
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.11.1"
-      sources."nanoid-1.2.6"
+      sources."nanoid-1.3.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -57702,11 +57676,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."request-2.88.0"
       sources."request-promise-core-1.1.1"
       sources."request-promise-native-1.0.5"
       sources."resolve-1.8.1"
@@ -57717,7 +57687,7 @@ in
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."rxjs-6.3.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       (sources."seek-bzip-1.0.5" // {
@@ -57726,7 +57696,7 @@ in
         ];
       })
       sources."select-1.1.2"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       (sources."send-0.16.2" // {
         dependencies = [
@@ -57788,7 +57758,7 @@ in
         ];
       })
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -57865,7 +57835,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.16"
-      sources."unbzip2-stream-1.3.0"
+      sources."unbzip2-stream-1.3.1"
       (sources."undefsafe-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -57934,6 +57904,196 @@ in
     production = true;
     bypassCache = true;
   };
+  "@webassemblyjs/cli" = nodeEnv.buildNodePackage {
+    name = "_at_webassemblyjs_slash_cli";
+    packageName = "@webassemblyjs/cli";
+    version = "1.7.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.7.8.tgz";
+      sha512 = "/zEE5vL2lVlZVv3XYLo6+yeEU5pqi8AByBWBVYSuPSRBu0bY9cTCRU4exS/Jd7bdbF9I3s1Moa1FRG1wCQErfA==";
+    };
+    dependencies = [
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-flaten-ast-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/ieee754-1.7.8"
+      sources."@webassemblyjs/leb128-1.7.8"
+      sources."@webassemblyjs/utf8-1.7.8"
+      sources."@webassemblyjs/validation-1.7.8"
+      sources."@webassemblyjs/wasm-parser-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/ieee754-1.2.0"
+      sources."@xtuc/long-4.2.1"
+      sources."webassemblyjs-1.7.8"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Toolbox for WebAssembly";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  "@webassemblyjs/repl" = nodeEnv.buildNodePackage {
+    name = "_at_webassemblyjs_slash_repl";
+    packageName = "@webassemblyjs/repl";
+    version = "1.7.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.7.8.tgz";
+      sha512 = "IClmDKT+XgTiJ3lNaaXbHBAt2LqabugJmsabtF8TIlulG5Y5NEOOeJGjm56/rmwuW3/ul/zvaLQ1pFpU3WEIXg==";
+    };
+    dependencies = [
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-flaten-ast-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/ieee754-1.7.8"
+      sources."@webassemblyjs/leb128-1.7.8"
+      sources."@webassemblyjs/utf8-1.7.8"
+      sources."@webassemblyjs/validation-1.7.8"
+      sources."@webassemblyjs/wasm-parser-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/ieee754-1.2.0"
+      sources."@xtuc/long-4.2.1"
+      sources."webassemblyjs-1.7.8"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "WebAssembly REPL";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage {
+    name = "_at_webassemblyjs_slash_wasm-strip";
+    packageName = "@webassemblyjs/wasm-strip";
+    version = "1.7.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@webassemblyjs/wasm-strip/-/wasm-strip-1.7.8.tgz";
+      sha512 = "ZhPzbEX3UKaLjJ7hjPVjNG3tNjiD7B8eriTR11yrctdyD5vAOVoyrUEsBPX0WadxDOzOsGZmSbFD1SHBjJT8jQ==";
+    };
+    dependencies = [
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-buffer-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/helper-wasm-section-1.7.8"
+      sources."@webassemblyjs/ieee754-1.7.8"
+      sources."@webassemblyjs/leb128-1.7.8"
+      sources."@webassemblyjs/utf8-1.7.8"
+      sources."@webassemblyjs/wasm-gen-1.7.8"
+      sources."@webassemblyjs/wasm-parser-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/ieee754-1.2.0"
+      sources."@xtuc/long-4.2.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "> Strips custom sections";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage {
+    name = "_at_webassemblyjs_slash_wasm-text-gen";
+    packageName = "@webassemblyjs/wasm-text-gen";
+    version = "1.7.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.7.8.tgz";
+      sha512 = "cDzQh/rniwchQfzGQriAg7Io2xqEu5s1Po29jMkRfJse4OFbh54aWcbKk2DO0ph+9lbNQZ0VYTPBP5NGIKqNmw==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.0.0"
+      sources."@babel/generator-7.1.3"
+      sources."@babel/highlight-7.0.0"
+      sources."@babel/parser-7.1.3"
+      sources."@babel/template-7.1.2"
+      sources."@babel/types-7.1.3"
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/ieee754-1.7.8"
+      sources."@webassemblyjs/leb128-1.7.8"
+      sources."@webassemblyjs/utf8-1.7.8"
+      sources."@webassemblyjs/wasm-parser-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/ieee754-1.2.0"
+      sources."@xtuc/long-4.2.1"
+      sources."ansi-styles-3.2.1"
+      sources."chalk-2.4.1"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."commander-2.19.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.2"
+      sources."has-flag-3.0.0"
+      sources."js-tokens-4.0.0"
+      sources."jsesc-2.5.1"
+      sources."lodash-4.17.11"
+      sources."source-map-0.5.7"
+      sources."supports-color-5.5.0"
+      sources."to-fast-properties-2.0.0"
+      sources."trim-right-1.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Emit documentation/code for your WASM binary Edit";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
+  "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage {
+    name = "_at_webassemblyjs_slash_wast-refmt";
+    packageName = "@webassemblyjs/wast-refmt";
+    version = "1.7.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.7.8.tgz";
+      sha512 = "eSkc1/NnfbMYQP/DQaC2W0/DEY/TO4reAS/F/v2cnafFMBrwJ8xQCQwr9IAMiez1aKKYZmL4kyRRbU/0Q9Qbtg==";
+    };
+    dependencies = [
+      sources."@webassemblyjs/ast-1.7.8"
+      sources."@webassemblyjs/floating-point-hex-parser-1.7.8"
+      sources."@webassemblyjs/helper-api-error-1.7.8"
+      sources."@webassemblyjs/helper-code-frame-1.7.8"
+      sources."@webassemblyjs/helper-fsm-1.7.8"
+      sources."@webassemblyjs/helper-module-context-1.7.8"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.7.8"
+      sources."@webassemblyjs/wast-parser-1.7.8"
+      sources."@webassemblyjs/wast-printer-1.7.8"
+      sources."@xtuc/long-4.2.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "WAST refmt";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
   webdrvr = nodeEnv.buildNodePackage {
     name = "webdrvr";
     packageName = "webdrvr";
@@ -58062,7 +58222,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."semver-2.3.2"
       sources."sntp-1.0.9"
-      (sources."sshpk-1.14.2" // {
+      (sources."sshpk-1.15.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -58221,7 +58381,7 @@ in
       sources."des.js-1.0.0"
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
-      sources."duplexify-3.6.0"
+      sources."duplexify-3.6.1"
       sources."elliptic-6.4.1"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -58349,7 +58509,7 @@ in
       sources."ms-2.0.0"
       sources."nan-2.11.1"
       sources."nanomatch-1.2.13"
-      sources."neo-async-2.5.2"
+      sources."neo-async-2.6.0"
       (sources."node-libs-browser-2.1.0" // {
         dependencies = [
           sources."punycode-1.4.1"
@@ -58451,7 +58611,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."source-list-map-2.0.0"
+      sources."source-list-map-2.0.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
@@ -58573,21 +58733,21 @@ in
       sources."bitfield-2.0.0"
       (sources."bittorrent-dht-9.0.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
       sources."bittorrent-peerid-1.3.0"
       (sources."bittorrent-protocol-3.0.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
       })
       (sources."bittorrent-tracker-9.10.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."simple-get-3.0.3"
         ];
@@ -58769,7 +58929,7 @@ in
       sources."record-cache-1.1.0"
       (sources."render-media-3.1.3" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -58785,7 +58945,7 @@ in
       sources."simple-get-2.8.1"
       (sources."simple-peer-9.1.2" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
@@ -58793,7 +58953,7 @@ in
       sources."simple-sha1-2.1.1"
       (sources."simple-websocket-7.2.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."readable-stream-2.3.6"
         ];
@@ -58811,7 +58971,7 @@ in
       sources."to-arraybuffer-1.0.1"
       (sources."torrent-discovery-9.1.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -58826,7 +58986,7 @@ in
       sources."url-join-2.0.5"
       (sources."ut_metadata-3.3.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -58837,7 +58997,7 @@ in
       sources."vlc-command-1.1.2"
       (sources."webtorrent-0.102.4" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
           sources."simple-get-3.0.3"
         ];
@@ -58870,7 +59030,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.11.4"
+      sources."@types/node-10.11.7"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
@@ -58935,7 +59095,7 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."ast-types-0.11.5"
+      sources."ast-types-0.11.6"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
@@ -59142,7 +59302,7 @@ in
       (sources."eslint-5.0.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."globals-11.8.0"
           sources."ms-2.1.1"
           sources."strip-ansi-4.0.0"
@@ -59344,7 +59504,7 @@ in
       sources."http-signature-1.2.0"
       (sources."https-proxy-agent-2.2.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -59564,7 +59724,7 @@ in
       })
       sources."ncp-2.0.0"
       sources."needle-2.2.4"
-      sources."neo-async-2.5.2"
+      sources."neo-async-2.6.0"
       sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
@@ -59615,7 +59775,7 @@ in
       sources."p-try-2.0.0"
       (sources."pac-proxy-agent-2.0.2" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -59639,7 +59799,7 @@ in
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."pino-5.0.4"
-      sources."pino-std-serializers-2.2.1"
+      sources."pino-std-serializers-2.3.0"
       sources."pluralize-7.0.0"
       sources."po2json-0.4.5"
       sources."posix-character-classes-0.1.1"
@@ -59661,7 +59821,7 @@ in
       sources."promise-7.3.1"
       (sources."proxy-agent-2.3.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -59798,12 +59958,12 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."snyk-1.102.0" // {
+      (sources."snyk-1.103.4" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."inquirer-3.3.0"
           sources."ms-2.1.1"
           sources."rx-lite-4.0.8"
@@ -59815,13 +59975,13 @@ in
       })
       (sources."snyk-config-2.2.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
-      (sources."snyk-docker-plugin-1.11.0" // {
+      (sources."snyk-docker-plugin-1.12.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -59829,12 +59989,12 @@ in
       sources."snyk-gradle-plugin-2.1.0"
       (sources."snyk-module-1.8.2" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
       sources."snyk-mvn-plugin-2.0.0"
-      (sources."snyk-nodejs-lockfile-parser-1.5.1" // {
+      (sources."snyk-nodejs-lockfile-parser-1.5.3" // {
         dependencies = [
           sources."lodash-4.17.10"
           sources."source-map-0.6.1"
@@ -59843,41 +60003,41 @@ in
       })
       (sources."snyk-nuget-plugin-1.6.5" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
       (sources."snyk-php-plugin-1.5.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
       (sources."snyk-policy-1.12.0" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
       sources."snyk-python-plugin-1.8.2"
       (sources."snyk-resolve-1.0.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
-      (sources."snyk-resolve-deps-4.0.1" // {
+      (sources."snyk-resolve-deps-4.0.2" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
-          sources."semver-5.5.1"
+          sources."semver-5.6.0"
         ];
       })
       sources."snyk-sbt-plugin-2.0.0"
       sources."snyk-tree-1.0.0"
       (sources."snyk-try-require-1.3.1" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
@@ -59900,7 +60060,7 @@ in
       sources."split-0.3.3"
       sources."split-string-3.1.0"
       sources."sprintf-js-1.0.3"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -60472,7 +60632,7 @@ in
           sources."read-pkg-up-1.0.1"
         ];
       })
-      sources."merge2-1.2.2"
+      sources."merge2-1.2.3"
       sources."micromatch-3.1.10"
       sources."mime-db-1.36.0"
       sources."mime-types-2.1.20"
@@ -60622,7 +60782,7 @@ in
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-1.0.0"
-      sources."semver-5.5.1"
+      sources."semver-5.6.0"
       sources."semver-diff-2.1.0"
       sources."semver-regex-1.0.0"
       sources."semver-truncate-1.1.2"
@@ -60675,7 +60835,7 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.1"
       sources."split-string-3.1.0"
-      sources."sshpk-1.14.2"
+      sources."sshpk-1.15.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -60823,7 +60983,7 @@ in
       sources."yeoman-doctor-3.0.2"
       (sources."yeoman-environment-2.3.3" // {
         dependencies = [
-          sources."debug-3.2.5"
+          sources."debug-3.2.6"
           sources."ms-2.1.1"
         ];
       })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaa8da74333d..9e043632a8c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5923,6 +5923,12 @@ with pkgs;
 
   wbox = callPackage ../tools/networking/wbox {};
 
+  webassemblyjs-cli = nodePackages."@webassemblyjs/cli";
+  webassemblyjs-repl = nodePackages."@webassemblyjs/repl";
+  wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
+  wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen";
+  wast-refmt = nodePackages."@webassemblyjs/wast-refmt";
+
   welkin = callPackage ../tools/graphics/welkin {};
 
   whipper = callPackage ../applications/audio/whipper { };

From 0a5c7cf512fcefb4b337186f0aee69ae8dd1df2c Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Tue, 9 Oct 2018 23:56:26 +0200
Subject: [PATCH 3110/3253] gitea: 1.5.1 -> 1.5.2

---
 .../version-management/gitea/default.nix             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index c6eb563155f6..58cfa1862604 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,21 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "06h6v9py35mm0xk9l8xrq02vvr5vzl15gfbw9qqvpn8kiamkn53r";
+    sha256 = "168pbndlh7c148p8wzkd39kd7idiba9zw7v0alp9zqcqzzayaydj";
+    # Required to generate the same checksum on MacOS due to unicode encoding differences
+    # More information: https://github.com/NixOS/nixpkgs/pull/48128
+    extraPostFetch = ''
+      rm -rf $out/integrations
+      rm -rf $out/vendor/github.com/Unknown/cae/tz/testdata
+      rm -rf $out/vendor/github.com/Unknown/cae/zip/testdata
+      rm -rf $out/vendor/gopkg.in/macaron.v1/fixtures
+    '';
   };
 
   patches = [ ./static-root-path.patch ];

From dd1b66e5d4c864fb6cfc71cfb129ad98d122f122 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 14 Oct 2018 22:36:17 +0200
Subject: [PATCH 3111/3253] lkl: 2018-03-10 -> 2018-08-22

Among other things, this brings lkl up to linux 4.16
---
 pkgs/applications/virtualization/lkl/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 8d5ecfce9fd2..1d22385a2732 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
+{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "lkl-2018-03-10";
-  rev  = "8772a4da6064444c5b70766b806fe272b0287c31";
+  name = "lkl-2018-08-22";
+  rev  = "5221c547af3d29582703f01049617a6bf9f6232a";
 
   outputs = [ "dev" "lib" "out" ];
 
-  nativeBuildInputs = [ bc python ];
+  nativeBuildInputs = [ bc bison flex python ];
 
   buildInputs = [ fuse libarchive ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "1m6gh4zcx1q7rv05d0knjpk3ivk2b3kc0kwjndciadqc45kws4wh";
+    sha256 = "1k2plyx40xaphm8zsk2dd1lyv6dhsp7kj6hfmdgiamvl80bjajqy";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds

From adf9c5080fef37be24b4a64a4289e455f70dc31a Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 15 Oct 2018 19:34:24 +0200
Subject: [PATCH 3112/3253] postgresql-jdbc: 42.2.2 -> 42.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

¤ set read-only permissions on .jar at install (mode 0444)
¤ license is now BSD 2-clause
---
 pkgs/servers/sql/postgresql/jdbc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix
index 62ebf6b44533..c67d72705482 100644
--- a/pkgs/servers/sql/postgresql/jdbc/default.nix
+++ b/pkgs/servers/sql/postgresql/jdbc/default.nix
@@ -2,25 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "postgresql-jdbc-${version}";
-  version = "42.2.2";
+  version = "42.2.5";
 
   src = fetchMavenArtifact {
     artifactId = "postgresql";
     groupId = "org.postgresql";
-    sha256 = "0w7sfi1gmzqhyhr4iq9znv8hff41xwwqcblkyd9ph0m34r0555hr";
+    sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz";
     inherit version;
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
-    install -D $src/share/java/*_postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
+    install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar
   '';
 
   meta = with stdenv.lib; {
     homepage = https://jdbc.postgresql.org/;
     description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database";
-    license = licenses.bsd3;
+    license = licenses.bsd2;
     platforms = platforms.unix;
   };
 }

From 01dfe3f56019b0c330bc2e46da90146698844330 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 14 Oct 2018 00:26:09 -0500
Subject: [PATCH 3113/3253] stage.nix: fix cross compiling with pkgsMusl

Fixes #48265
---
 pkgs/top-level/stage.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 7637371a40f1..d0fb885dc747 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -134,13 +134,16 @@ let
     # default GNU libc on Linux systems. Non-Linux systems are not
     # supported.
     pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
-      localSystem = {
+      inherit overlays config;
+      ${if stdenv.hostPlatform == stdenv.buildPlatform
+        then "localSystem" else "crossSystem"} = {
         parsed = stdenv.hostPlatform.parsed // {
           abi = {
             "gnu" = lib.systems.parse.abis.musl;
             "gnueabi" = lib.systems.parse.abis.musleabi;
             "gnueabihf" = lib.systems.parse.abis.musleabihf;
-          }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl;
+          }.${stdenv.hostPlatform.parsed.abi.name}
+            or lib.systems.parse.abis.musl;
         };
       };
     } else throw "Musl libc only supports Linux systems.";
@@ -148,7 +151,9 @@ let
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
     pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
-      localSystem = {
+      inherit overlays config;
+      ${if stdenv.hostPlatform == stdenv.buildPlatform
+        then "localSystem" else "crossSystem"} = {
         parsed = stdenv.hostPlatform.parsed // {
           cpu = lib.systems.parse.cpuTypes.i686;
         };

From ed6e251ff0350e70ed7a60f699dad7bf7ea4a252 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 15 Oct 2018 20:45:50 +0200
Subject: [PATCH 3114/3253] sqlite-jdbc: 3.20.0 -> 3.25.2

---
 pkgs/servers/sql/sqlite/jdbc/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix
index 5b0425c410fc..4e40d8761526 100644
--- a/pkgs/servers/sql/sqlite/jdbc/default.nix
+++ b/pkgs/servers/sql/sqlite/jdbc/default.nix
@@ -1,25 +1,28 @@
-{ lib, stdenv, fetchurl }:
+{ stdenv, fetchMavenArtifact }:
 
 stdenv.mkDerivation rec {
-  version = "3.20.0";
   pname = "sqlite-jdbc";
   name = "${pname}-${version}";
+  version = "3.25.2";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/xerial/${pname}/downloads/${name}.jar";
-    sha256 = "0wxfxnq2ghiwy2mwz3rljgmy1lciafhrw80lprvqz6iw8l51qfql";
+  src = fetchMavenArtifact {
+    groupId = "org.xerial";
+    artifactId = "sqlite-jdbc";
+    inherit version;
+    sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4";
   };
 
   phases = [ "installPhase" ];
 
   installPhase = ''
-    install -D "${src}" "$out/share/java/${name}.jar"
+    install -m444 -D ${src}/share/java/*${name}.jar "$out/share/java/${name}.jar"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/xerial/sqlite-jdbc";
-    description = "SQLite JDBC Driver";
+    description = "Library for accessing and creating SQLite database files in Java";
     license = licenses.asl20;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ jraygauthier ];
   };
 }

From 6fe0f07557e481a4861ee938897d25e219dced1c Mon Sep 17 00:00:00 2001
From: Joakim Pettersvold <joakimpokemeg@hotmail.no>
Date: Sun, 14 Oct 2018 14:02:23 +0200
Subject: [PATCH 3115/3253] eclipses: add Eclipse IDE for Java Developers 4.9

---
 pkgs/applications/editors/eclipse/default.nix | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 4d77c47695a3..55bbc778e3ae 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -228,6 +228,27 @@ rec {
   };
   eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
 
+  ### Eclipse Java
+
+  eclipse-java = eclipse-java-49;
+
+  eclipse-java-49 = buildEclipse {
+    name = "eclipse-java-4.9.0";
+    description = "Eclipse IDE for Java Developers";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk-x86_64.tar.gz;
+          sha512 = "9dac5d040cdabf779de3996de87290e352130c7e860c1d0a98772f41da828ad45f90748b68e0a8a4f8d1ebbbbe5fdfe6401b7d871b93af34103d4a81a041c6a5";
+        }
+      else if stdenv.system == "i686-linux" then
+        fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/2018-09/R/eclipse-java-2018-09-linux-gtk.tar.gz;
+          sha512 = "24208e95b972e848d6b65ed8108d9e81584cf051397f2f43fb6269f5a625b8d7552ad77c7980a1a5653c87f06776e2926fd85607aae44e44657b4f6cc9b3e2e3";
+        }
+      else throw "Unsupported system: ${stdenv.system}";
+  };
+
   ### Environments
 
   # Function that assembles a complete Eclipse environment from an

From 4c6d8da299f0a18a9efb54b8dc1fc07a6bb58df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 15 Oct 2018 16:07:23 -0300
Subject: [PATCH 3116/3253] deepin-metacity: init at 3.22.22

---
 .../deepin/deepin-metacity/default.nix        | 62 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-metacity/default.nix

diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix
new file mode 100644
index 000000000000..b5eb71108763
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-metacity/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
+  json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
+  deepin-wallpapers, deepin-desktop-schemas }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-metacity";
+  version = "3.22.22";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libtool
+    gnome3.gnome-common
+    gnome3.glib.dev
+  ];
+
+  buildInputs = [
+    gnome3.dconf
+    gnome3.gtk
+    gnome3.libgtop
+    gnome3.zenity
+    bamf
+    json-glib
+    libcanberra-gtk3
+    libstartup_notification
+    libxkbcommon
+    deepin-wallpapers
+    deepin-desktop-schemas
+  ];
+
+  postPatch = ''
+    sed -i src/ui/deepin-background-cache.c \
+      -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+
+  configureFlags = [ "--disable-themes-documentation" ];
+
+  preConfigure = ''
+    HOME=$TMP
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "2D window manager for Deepin";
+    homepage = https://github.com/linuxdeepin/deepin-metacity;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 84f41dc3451b..a602d18e2095 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -13,6 +13,7 @@ let
     deepin-icon-theme = callPackage ./deepin-icon-theme { };
     deepin-image-viewer = callPackage ./deepin-image-viewer { };
     deepin-menu = callPackage ./deepin-menu { };
+    deepin-metacity = callPackage ./deepin-metacity { };
     deepin-mutter = callPackage ./deepin-mutter { };
     deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
     deepin-sound-theme = callPackage ./deepin-sound-theme { };

From 47dfe25e1b17cd405b81052ffcdab6ca92b467fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Oct 2018 21:43:16 +0200
Subject: [PATCH 3117/3253] ec2-amis.nix: Add 18.09 images

---
 nixos/modules/virtualisation/ec2-amis.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 76facac39fc6..aaea06bb9a63 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -257,5 +257,22 @@ let self = {
   "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a";
   "18.03".ap-south-1.hvm-ebs = "ami-6a390b05";
 
-  latest = self."18.03";
+  # 18.09.910.c15e342304a
+  "18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97";
+  "18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e";
+  "18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2";
+  "18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8";
+  "18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3";
+  "18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6";
+  "18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38";
+  "18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1";
+  "18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c";
+  "18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f";
+  "18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c";
+  "18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547";
+  "18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15";
+  "18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112";
+  "18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313";
+
+  latest = self."18.09";
 }; in self

From 0bdd0d8e04006b97fd8fd330049274c9fb4a6c22 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 Oct 2018 21:47:51 +0200
Subject: [PATCH 3118/3253] amazon-image.nix: Disable udisks

This reduces the system closure by 89 MiB.
---
 nixos/modules/virtualisation/amazon-image.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index e9e935e90202..c92570582f20 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -145,8 +145,12 @@ let cfg = config.ec2; in
     environment.systemPackages = [ pkgs.cryptsetup ];
 
     boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
-    
+
     # EC2 has its own NTP server provided by the hypervisor
     networking.timeServers = [ "169.254.169.123" ];
+
+    # udisks has become too bloated to have in a headless system
+    # (e.g. it depends on GTK+).
+    services.udisks2.enable = false;
   };
 }

From c8a59e845369f24eb9518d6c5d1d4df105647aa7 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Mon, 15 Oct 2018 16:31:59 -0400
Subject: [PATCH 3119/3253] haskellPackages.cryptonite: re-enable tests.

This has been fixed since cryptonite-0.7:

https://github.com/haskell-crypto/cryptonite/issues/28

cryptonite is also no longer listed in expected-test-failures in
Stackage.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6f654c32dbb2..29f776bb4af8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -676,9 +676,6 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/122
   singletons = dontCheck super.singletons;
 
-  # https://github.com/fpco/stackage/issues/838
-  cryptonite = dontCheck super.cryptonite;
-
   # We cannot build this package w/o the C library from <http://www.phash.org/>.
   phash = markBroken super.phash;
 

From 321626d5ee6410e6a431e8e487cc1a5d7f4fa894 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Mon, 15 Oct 2018 17:11:32 -0400
Subject: [PATCH 3120/3253] haskellPackages.cryptonite: fix for aarch64.

This is a cherry-pick from upstream (see
https://github.com/haskell-crypto/cryptonite/issues/234); there has
been no upstream release since the fix was committed.
---
 pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 29f776bb4af8..125413d61511 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -676,6 +676,14 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/122
   singletons = dontCheck super.singletons;
 
+  # Fix an aarch64 issue with cryptonite-0.25:
+  # https://github.com/haskell-crypto/cryptonite/issues/234
+  # This has been committed upstream, but there is, as of yet, no new release.
+  cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch {
+    url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch;
+    sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq";
+  });
+
   # We cannot build this package w/o the C library from <http://www.phash.org/>.
   phash = markBroken super.phash;
 

From f4ea22e5de572efa9babc7674fdc79fa637a7e31 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 15 Oct 2018 00:39:26 +0200
Subject: [PATCH 3121/3253] nixos/security/misc: init

A module for security options that are too small to warrant their own module.

The impetus for adding this module is to make it more convenient to override
the behavior of the hardened profile wrt user namespaces.
Without a dedicated option for user namespaces, the user needs to
1) know which sysctl knob controls userns
2) know how large a value the sysctl knob needs to allow e.g.,
   Nix sandbox builds to work

In the future, other mitigations currently enabled by the hardened profile may
be promoted to options in this module.
---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/profiles/hardened.nix | 14 ++---------
 nixos/modules/security/misc.nix     | 39 +++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/security/misc.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f55c32fa511d..2bb41767b0b2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -149,6 +149,7 @@
   ./security/duosec.nix
   ./security/hidepid.nix
   ./security/lock-kernel-modules.nix
+  ./security/misc.nix
   ./security/oath.nix
   ./security/pam.nix
   ./security/pam_usb.nix
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 2af8bf1f8e30..da47313f180a 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -12,6 +12,8 @@ with lib;
 
   security.lockKernelModules = mkDefault true;
 
+  security.allowUserNamespaces = mkDefault false;
+
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [
@@ -55,18 +57,6 @@ with lib;
   # ... or at least apply some hardening to it
   boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true;
 
-  # A recurring problem with user namespaces is that there are
-  # still code paths where the kernel's permission checking logic
-  # fails to account for namespacing, instead permitting a
-  # namespaced process to act outside the namespace with the
-  # same privileges as it would have inside it.  This is particularly
-  # bad in the common case of running as root within the namespace.
-  #
-  # Setting the number of allowed user namespaces to 0 effectively disables
-  # the feature at runtime.  Attempting to create a user namespace
-  # with unshare will then fail with "no space left on device".
-  boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
-
   # Raise ASLR entropy for 64bit & 32bit, respectively.
   #
   # Note: mmap_rnd_compat_bits may not exist on 64bit.
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
new file mode 100644
index 000000000000..42f872b7b088
--- /dev/null
+++ b/nixos/modules/security/misc.nix
@@ -0,0 +1,39 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+  meta = {
+    maintainers = [ maintainers.joachifm ];
+  };
+
+  options = {
+    security.allowUserNamespaces = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to allow creation of user namespaces.  A recurring problem
+        with user namespaces is the presence of code paths where the kernel's
+        permission checking logic fails to account for namespacing, instead
+        permitting a namespaced process to act outside the namespace with the
+        same privileges as it would have inside it.  This is particularly
+        damaging in the common case of running as root within the namespace.
+        When user namespace creation is disallowed, attempting to create
+        a user namespace fails with "no space left on device" (ENOSPC).
+      '';
+    };
+  };
+
+  config = mkIf (!config.security.allowUserNamespaces) {
+    # Setting the number of allowed user namespaces to 0 effectively disables
+    # the feature at runtime.  Note that root may raise the limit again
+    # at any time.
+    boot.kernel.sysctl."user.max_user_namespaces" = 0;
+
+    assertions = [
+      { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
+        message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
+      }
+    ];
+  };
+}

From 387632ab333d71c360aff219999705b7edcc9257 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 16 Oct 2018 00:46:42 +0200
Subject: [PATCH 3122/3253] xstatic-*: update to latest version

---
 pkgs/development/python-modules/xstatic-bootbox/default.nix   | 4 ++--
 pkgs/development/python-modules/xstatic-bootstrap/default.nix | 4 ++--
 .../python-modules/xstatic-jquery-file-upload/default.nix     | 4 ++--
 pkgs/development/python-modules/xstatic-jquery-ui/default.nix | 4 ++--
 pkgs/development/python-modules/xstatic-jquery/default.nix    | 4 ++--
 pkgs/development/python-modules/xstatic-pygments/default.nix  | 4 ++--
 pkgs/development/python-modules/xstatic/default.nix           | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix
index 68c81157eb08..1f60a0fbe6cf 100644
--- a/pkgs/development/python-modules/xstatic-bootbox/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-Bootbox";
-  version = "4.3.0.1";
+  version = "4.4.0.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0wks1lsqngn3gvlhzrvaan1zj8w4wr58xi0pfqhrzckbghvvr0gj";
+    sha256 = "1g00q38g1k576lxjlwglv4w3fj4z0z8lxlwpc66wyhjglj4r4bwd";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
index 757c2cc240ed..f648df6c570e 100644
--- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix
+++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-Bootstrap";
-  version = "3.3.5.1";
+  version = "3.3.7.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0jzjq3d4vp2shd2n20f9y53jnnk1cvphkj1v0awgrf18qsy2bmin";
+    sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
index 0cf029c68a59..3b9c7affe161 100644
--- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-jQuery-File-Upload";
-  version = "9.7.0.1";
+  version = "9.22.0.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0d5za18lhzhb54baxq8z73wazq801n3qfj5vgcz7ri3ngx7nb0cg";
+    sha256 = "0jy7xnww0177fv0asssxvv8l1032jcnbkvz39z16yd6k34v53fzf";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
index 1b884a97eb22..d411119bbfa2 100644
--- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-jquery-ui";
-  version = "1.12.0.1";
+  version = "1.12.1.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0w7mabv6qflpd47g33j3ggp5rv17mqk0xz3bsdswcj97wqpga2l2";
+    sha256 = "0449rkjcksq49yjyyszz9v11wa4nmvvfw0mynayah8248yxlifnn";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index d884f12bdbf1..8e3f084ca7f0 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-jQuery";
-  version = "1.10.2.1";
+  version = "3.3.1.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "018kx4zijflcq8081xx6kmiqf748bsjdq7adij2k91bfp1mnlhc3";
+    sha256 = "0xlgs4rlabzfcp8p2zspwpsljycb0djyrk7qy4qh76i7zkfhwn8j";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix
index 8ec9b77860c2..956d331e7b89 100644
--- a/pkgs/development/python-modules/xstatic-pygments/default.nix
+++ b/pkgs/development/python-modules/xstatic-pygments/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-Pygments";
-  version = "1.6.0.1";
+  version = "2.2.0.1";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0fjqgg433wfdnswn7fad1g6k2x6mf24wfnay2j82j0fwgkdxrr7m";
+    sha256 = "1rm073ag1hgwlazl52mng62wvnayz7ckr5ki341shvp9db1x2n51";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix
index 02931215b8d3..4410525a3d4d 100644
--- a/pkgs/development/python-modules/xstatic/default.nix
+++ b/pkgs/development/python-modules/xstatic/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "09npcsyf1ccygjs0qc8kdsv4qqy8gm1m6iv63g9y1fgbcry3vj8f";
+    sha256 = "1a13i9b62qfmqz04gpa6kcwwy2x8fm9wcr1x6kjdxrmw6zz8vdw0";
   };
 
   # no tests implemented

From c539c020beef063ba8a91ac81a35c5a32832b012 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 16 Oct 2018 00:46:55 +0200
Subject: [PATCH 3123/3253] bepasty: 0.4.0 -> 0.5.0

---
 pkgs/tools/misc/bepasty/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index ae88b7e99c65..a1e9f21c52cc 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -1,15 +1,15 @@
-{ python
+{ python3Packages
 , lib
 }:
 
-with python.pkgs;
+with python3Packages;
 
 #We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
 #This is needed for services.bepasty
 #https://github.com/NixOS/nixpkgs/pull/38300
 buildPythonPackage rec {
   pname = "bepasty";
-  version = "0.4.0";
+  version = "0.5.0";
 
   propagatedBuildInputs = [
     flask
@@ -22,9 +22,12 @@ buildPythonPackage rec {
     xstatic-jquery-ui
     xstatic-pygments
   ];
+
+  buildInputs = [ setuptools_scm ];
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
+    sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh";
   };
 
   checkInputs = [

From 46f937dddd519e7e48fcaa32393956e104a0c305 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Mon, 15 Oct 2018 20:07:27 -0400
Subject: [PATCH 3124/3253] haskellPackages.language-nix: disable tests on
 aarch64.

The test suite fails on aarch64 with a linker error that looks
suspiciously like this outstanding GHC issue:

https://ghc.haskell.org/trac/ghc/ticket/15275

Note that this change also fixes the existing `isi686` check to
conform to the new cross-compiling arch check.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 125413d61511..e59e4a67269d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -332,7 +332,7 @@ self: super: {
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
-  language-nix = if pkgs.stdenv.isi686 then dontCheck super.language-nix else super.language-nix;
+  language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
   ldap-client = dontCheck super.ldap-client;
   lensref = dontCheck super.lensref;
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25

From 8a3a91f29b4a517c540bee42f01701762243f808 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 15 Oct 2018 20:35:28 -0400
Subject: [PATCH 3125/3253] linux: 4.19-rc7 -> 4.19-rc8

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 3d28bd68121d..f866d858eaeb 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.19-rc7";
-  modDirVersion = "4.19.0-rc7";
+  version = "4.19-rc8";
+  modDirVersion = "4.19.0-rc8";
   extraMeta.branch = "4.19";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0wjh62vfhvi2prz9sx9c0s0f9sa9z1775qn4jf8zz5y5isixzdml";
+    sha256 = "1xw8grzn4i4b2vprfwi4p4003n7rr9725dbiqyrl8w1pm11jwpin";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 95c698d119bee110a49c968d2a1d8c5df76717ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 20:39:48 -0700
Subject: [PATCH 3126/3253] ipv6calc: 1.0.0 -> 1.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ipv6calc/versions
---
 pkgs/tools/networking/ipv6calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index c66218c48986..9b4edd763057 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "1gcl8mqjdn5j1rcnv2gz2j0i8ayx747hwzjyiazl6j43c5g4bc3l";
+    sha256 = "1q74ikg780v5hllbq08wdfvxr2lf0fc7i41hclqrh1ajc6dqybbq";
   };
 
   buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];

From 828b042b43c1190c2f0967c1102a75b7c3bc1989 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 20:44:48 -0700
Subject: [PATCH 3127/3253] homebank: 5.2.1 -> 5.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/homebank/versions
---
 pkgs/applications/office/homebank/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 039e2fc1fde9..12b5aef898d1 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor-icon-theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.2.1";
+  name = "homebank-5.2.2";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz";
+    sha256 = "19cm49p2x6nwia2yvwj3fv7jxbhw0vx4bs1zqbfvdr5vzwgj5j5c";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From d953d8d424ba11a50ebe0dc32a59530c750c7023 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 20:56:02 -0700
Subject: [PATCH 3128/3253] imapfilter: 2.6.11 -> 2.6.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imapfilter/versions
---
 pkgs/applications/networking/mailreaders/imapfilter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 4d0c09c2dcc2..e5a919af2e6f 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "imapfilter-${version}";
-  version = "2.6.11";
+  version = "2.6.12";
 
   src = fetchFromGitHub {
     owner = "lefcha";
     repo = "imapfilter";
     rev = "v${version}";
-    sha256 = "0cjnp7vqmgqym2zswabkmwlbj21r063vw7wkwxglj08z5qyjl5ps";
+    sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab";
   };
 
   makeFlagsArray = "PREFIX=$(out)";

From fedc17a99de87dfd0b0bdae6b67f96124deb3e85 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 21:05:03 -0700
Subject: [PATCH 3129/3253] jmol: 14.29.22 -> 14.29.26

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jmol/versions
---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index b89b28ed0479..dab30e90f4d8 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,7 +17,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "14.29.22";
+  version = "14.29.26";
   pname = "jmol";
   name = "${pname}-${version}";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    sha256 = "1wnrrn2wza9z6bp5axg191qf32sx4q8fj4xz404zp278rc4i2fpv";
+    sha256 = "0a728lwqbbnm5v2spi5rbqy3xldbcf2gcsf48rkq3p43laps3630";
   };
 
   patchPhase = ''

From b6cfaf1d9f369a0e0cad6cb2aeda29d3b6a52b93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 21:35:20 -0700
Subject: [PATCH 3130/3253] gzdoom: 3.5.1 -> 3.6.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 0f95fa9aaf7f..5563e7836cca 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "109qmjkafr1xghpn0k1a8a0zgladc8r6hyw99v8r51ryjf5qf9sd";
+    sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From eeb2ee296c00358516082fd4cdf1a2625a6c54d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 21:54:45 -0700
Subject: [PATCH 3131/3253] gmsh: 4.0.1 -> 4.0.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gmsh/versions
---
 pkgs/applications/science/math/gmsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 7973fa8b3efb..525fc5f1dc26 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
 , zlib, libGLU_combined, libGLU, xorg }:
 
-let version = "4.0.1"; in
+let version = "4.0.2"; in
 
 stdenv.mkDerivation {
   name = "gmsh-${version}";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "0s9pay32kci03qx3dlpf9h2n3hihf8zpidjnn8p9vmhnn0vav7rz";
+    sha256 = "03aw3sbz4x998rk29az7mgm0mrdb6614aqnppg81p5jkh5097jgk";
   };
 
   # The original CMakeLists tries to use some version of the Lapack lib

From f3a8e772a567ccb76372f390ccd455bfd088695a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 22:04:05 -0700
Subject: [PATCH 3132/3253] git-review: 1.26.0 -> 1.27.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/git-review/versions
---
 pkgs/applications/version-management/git-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index 7b81c28c3755..101770da8885 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -2,7 +2,7 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "git-review-${version}";
-  version = "1.26.0";
+  version = "1.27.0";
 
   # Manually set version because prb wants to get it from the git
   # upstream repository (and we are installing from tarball instead)
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
 
   src = fetchurl rec {
     url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
-    sha256 = "106nk6p7byf5vi68b2fvmwma5nk7qrv39nfj9p1bfxmb1gjdixhc";
+    sha256 = "0smdkps9avnj58izyfc5m0amq8nafgs9iqlyaf7ncrlvypia1f3q";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pbr requests setuptools ];

From f78fa3f28846d2a9919684236f0f2c50b4ff75c1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 22:22:12 -0700
Subject: [PATCH 3133/3253] flatpak-builder: 1.0.0 -> 1.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/flatpak-builder/versions
---
 pkgs/development/tools/flatpak-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index d2052bc0e8e2..530e80f4fae6 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -37,7 +37,7 @@
 }:
 
 let
-  version = "1.0.0";
+  version = "1.0.1";
 in stdenv.mkDerivation rec {
   name = "flatpak-builder-${version}";
 
@@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0ysnz0dwc8wfd31afwssg9prvaqdga7z4mybnrzy8sgm0hi5p2l5";
+    sha256 = "01p3j8ndk9bimnqibw3dyny0ysv6nw2f7z5im19s9jlhlzdqb48w";
   };
 
   nativeBuildInputs = [

From 3da7fc8a5749077c3932484829f5901120013746 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 22:22:56 -0700
Subject: [PATCH 3134/3253] fatsort: 1.4.2.439 -> 1.5.0.456

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fatsort/versions
---
 pkgs/tools/filesystems/fatsort/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix
index 75a94400627d..18d9097dacbc 100644
--- a/pkgs/tools/filesystems/fatsort/default.nix
+++ b/pkgs/tools/filesystems/fatsort/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, help2man}:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2.439";
+  version = "1.5.0.456";
   name = "fatsort-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/fatsort/${name}.tar.xz";
-    sha256 = "1q51qq69854kr12knhyqjv7skj95qld6j04pv5v3xvxs0y9zkg5x";
+    sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8";
   };
 
   patches = [ ./fatsort-Makefiles.patch ];

From 15f3717b5ebbddda6516f08e41ec25471931d90a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 22:31:17 -0700
Subject: [PATCH 3135/3253] fio: 3.10 -> 3.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/fio/versions
---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 41016dc49fa5..c0210127d9f2 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
-  version = "3.10";
+  version = "3.11";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "0cg6knaja32g46j1vlf0qw4q8yng7hrnnvh6b768pbjdxpn3wvi0";
+    sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz";
   };
 
   buildInputs = [ python zlib ]

From 4b43a79a5a266d944ea2f4d89ba202fb9282fbcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 22:36:28 -0700
Subject: [PATCH 3136/3253] frostwire-bin: 6.7.2 -> 6.7.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/frostwire/versions
---
 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 25deef0aef94..5305ca10383a 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.7.2";
+  version = "6.7.4";
   name = "frostwire-${version}";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "1dxk2cmwbn4ahkmr8qpiq1dpkkyswg5wz1cnv36izafpr87lxfvj";
+    sha256 = "03vxg0qas4mz5ggrmi396nkz44x1kgq8bfbhbr9mnal9ay9qmi8m";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e2dfafed6b9b18b736be89a9a0db0597ae82e75d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 23:22:38 -0700
Subject: [PATCH 3137/3253] checkstyle: 8.12 -> 8.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/checkstyle/versions
---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 690db9a30e1a..d99ab3df75ef 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.12";
+  version = "8.13";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y";
+    sha256 = "05w60yg5ghjdg36k4xd8m0yyfia9viyz51j053030b74bq65yvai";
   };
 
   nativeBuildInputs = [ makeWrapper jre ];

From f890eb9e3b131800c79a57b340ea498a9a2aa5ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 15 Oct 2018 23:28:46 -0700
Subject: [PATCH 3138/3253] cherrytree: 0.38.5 -> 0.38.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cherrytree/versions
---
 pkgs/applications/misc/cherrytree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 6bd1cef7c1b2..cf93096c7873 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "cherrytree-${version}";
-  version = "0.38.5";
+  version = "0.38.6";
 
   src = fetchurl {
     url = "https://www.giuspen.com/software/${name}.tar.xz";
-    sha256 = "1ja3b14vm3yd26pf82p2qlld0flqkqvgdg2g33r5dav6wfq3pz6y";
+    sha256 = "0b83ygv0y4lrclsyagmllkwiia62xkwij14i6z53avba191jvhma";
   };
 
   buildInputs = with pythonPackages;

From 2f6097b783f26cb53890ace955b80948aebdf6f5 Mon Sep 17 00:00:00 2001
From: Jeroen de Haas <jeroen@dehaas.online>
Date: Wed, 10 Oct 2018 15:44:48 +0200
Subject: [PATCH 3139/3253] fmt: init at 5.2.1

This commit adds fmt, a C++ formatting library.
---
 maintainers/maintainer-list.nix            |  5 ++++
 pkgs/development/libraries/fmt/default.nix | 31 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/fmt/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e7756f0bff11..2a5ce689d55f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1882,6 +1882,11 @@
     github = "jdagilliland";
     name = "Jason Gilliland";
   };
+  jdehaas = {
+    email = "qqlq@nullptr.club";
+    github = "jeroendehaas";
+    name = "Jeroen de Haas";
+  };
   jefdaj = {
     email = "jefdaj@gmail.com";
     github = "jefdaj";
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
new file mode 100644
index 000000000000..c120f7c9b43f
--- /dev/null
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+  version = "5.2.1";
+  name = "fmt-${version}";
+  src = fetchFromGitHub {
+    owner = "fmtlib";
+    repo = "fmt";
+    rev = "${version}";
+    sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
+  };
+  nativeBuildInputs = [ cmake ];
+  doCheck = true;
+  # preCheckHook ensures the test binaries can find libfmt.so.5
+  preCheck = if enableShared
+             then "export LD_LIBRARY_PATH=\"$PWD\""
+             else "";
+  cmakeFlags = [ "-DFMT_TEST=yes"
+                 "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ];
+  meta = with stdenv.lib; {
+    homepage = http://fmtlib.net/;
+    description = "Small, safe and fast formatting library";
+    longDescription = ''
+      fmt (formerly cppformat) is an open-source formatting library. It can be
+      used as a fast and safe alternative to printf and IOStreams.
+    '';
+    maintainers = [ maintainers.jdehaas ];
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a2e972ef2c3..eead864f6681 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9487,6 +9487,8 @@ with pkgs;
 
   flyway = callPackage ../development/tools/flyway { };
 
+  fmt = callPackage ../development/libraries/fmt/default.nix { };
+
   fplll = callPackage ../development/libraries/fplll {};
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
 

From 18258bae34ad16e808a2f5447962008d082fd19f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 01:13:22 -0500
Subject: [PATCH 3140/3253] teeworlds: 0.6.4 -> 0.6.5

This release adds support for building with cmake!
So switch to that eagerly instead of fighting with bam.

(if nothing else cmake is the devil we know...)

Also:

* fixup 'DATA_DIR' so programs can find resources
  (without need for wrappers)
* install readme+license as previously done ("docs")
* don't install tools since not built or installed by default
  * esp since doesn't appear to have non-adhoc method for installation
  * other distros don't seem to include
---
 pkgs/games/teeworlds/default.nix | 57 +++++++++++---------------------
 1 file changed, 19 insertions(+), 38 deletions(-)

diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 7c5074c07085..58b04821e129 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,54 +1,35 @@
-{ fetchurl, stdenv, makeWrapper, python, alsaLib
-, libX11, libGLU, SDL, lua5, zlib, bam, freetype
+{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib
+, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack
 }:
 
 stdenv.mkDerivation rec {
-  name = "teeworlds-0.6.4";
+  name = "teeworlds-0.6.5";
 
   src = fetchurl {
-    url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz";
-    sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2";
+    url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz";
+    sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb";
   };
 
-  # we always want to use system libs instead of these
-  postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}";
+  postPatch = ''
+    # we always want to use system libs instead of these
+    rm -r other/{freetype,sdl}/{include,mac,windows}
 
-  buildInputs = [
-    python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype
-  ];
-
-  buildPhase = ''
-    bam -a -v release
+    # set compiled-in DATA_DIR so resources can be found
+    substituteInPlace src/engine/shared/storage.cpp \
+      --replace '#define DATA_DIR "data"' \
+                '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
   '';
 
-  installPhase = ''
-    # Copy the graphics, sounds, etc.
-    mkdir -p "$out/share/${name}"
-    cp -rv data other/icons "$out/share/${name}"
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-    # Copy the executables (client, server, etc.).
-    mkdir -p "$out/bin"
-    executables=""
-    for file in *
-    do
-      if [ -f "$file" ] && [ -x "$file" ]
-      then
-          executables="$file $executables"
-      fi
-    done
-    cp -v $executables "$out/bin"
 
-    # Make sure the programs are executed from the right directory so
-    # that they can access the graphics and sounds.
-    for program in $executables
-    do
-      wrapProgram $out/bin/$program \
-        --run "cd $out/share/${name}"
-    done
+  buildInputs = [
+    python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack
+  ];
 
-    # Copy the documentation.
-    mkdir -p "$out/doc/${name}"
-    cp -v *.txt "$out/doc/${name}"
+  postInstall = ''
+    mkdir -p $out/share/doc/teeworlds
+    cp -v *.txt $out/share/doc/teeworlds/
   '';
 
   meta = {

From e26422c9d044ddbeb9a86e564460b260cb52ac3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 00:02:26 -0700
Subject: [PATCH 3141/3253] commonsMath: 3.3 -> 3.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/commons-math/versions
---
 pkgs/development/libraries/java/commons/math/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index d43dcd2a91d5..10c39f037890 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.3";
+  version = "3.6.1";
   name    = "commons-math-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
-    sha256 = "1xs71c4vbai6zr84982g4ggv6c18dhkilkzw9n1irjqnjbgm5kzc";
+    sha256 = "0x4nx5pngv2n4ga11c1s4w2mf6cwydwkgs7da6wwvcjraw57bhkz";
   };
 
   installPhase = ''

From 2012f61d98ff8622f4955a9ed15fa1242f353382 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Tue, 16 Oct 2018 10:11:33 +0300
Subject: [PATCH 3142/3253] rclone: 1.43.1 -> 1.44

---
 pkgs/applications/networking/sync/rclone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 13e69427aa48..34712a522feb 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.43.1";
+  version = "1.44";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx";
+    sha256 = "0kpx9r4kksscsvia7r79z9h8ghph25ay9dgpqrnp599fq1bqky61";
   };
 
   outputs = [ "bin" "out" "man" ];

From 4b05aa5fab810313189f31f0053af27eeb176b0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 00:14:42 -0700
Subject: [PATCH 3143/3253] commonsCompress: 1.17 -> 1.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/commons-compress/versions
---
 pkgs/development/libraries/java/commons/compress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index cf9c554d57f4..3c729f42320a 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.17";
+  version = "1.18";
   name    = "commons-compress-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
-    sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0";
+    sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
   };
 
   installPhase = ''

From dec04173472a90643388c495d397a8c7732cb04f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 00:37:15 -0700
Subject: [PATCH 3144/3253] baresip: 0.5.10 -> 0.5.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/baresip/versions
---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index b7570e85217c..db8eea645874 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -3,11 +3,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.5.10";
+  version = "0.5.11";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1yx721qnyhgk2lna1p6iwndl767cy0ss5zcwhyjccgqd848b0grr";
+    sha256 = "1pv2fllg5z6q524k7dyqwm41kaj6bh2xjqg98p6v25n31v3gvy04";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem cairo mpg123

From b7a07313cc72219964b93e47c36fffeed314a351 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 11 Oct 2018 12:15:25 +0200
Subject: [PATCH 3145/3253] move the codeName to /.codeName

Make the codeName globally accessible in the repo. The release is not
only for NixOS anymore.
---
 .codeName                      | 1 +
 lib/trivial.nix                | 3 +++
 nixos/modules/misc/version.nix | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 .codeName

diff --git a/.codeName b/.codeName
new file mode 100644
index 000000000000..0bb82a2888e3
--- /dev/null
+++ b/.codeName
@@ -0,0 +1 @@
+Koi
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 938df6ced476..811c298d8620 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -98,6 +98,9 @@ rec {
   # The current nixpkgs version number as string.
   release = lib.strings.fileContents ../.version;
 
+  # Note: the first letter is bumped on every release.  It's an animal.
+  codeName = lib.strings.fileContents ../.codeName;
+
   # The current nixpkgs version suffix as string.
   versionSuffix =
     let suffixFile = ../.version-suffix;
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 6d78b7c593f8..fd77f6372720 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -43,6 +43,7 @@ in
     nixos.codeName = mkOption {
       readOnly = true;
       type = types.str;
+      default = lib.trivial.codeName;
       description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
     };
 
@@ -79,9 +80,6 @@ in
       version = mkDefault (cfg.release + cfg.versionSuffix);
       revision      = mkIf (pathIsDirectory gitRepo) (mkDefault            gitCommitId);
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
-
-      # Note: the first letter is bumped on every release.  It's an animal.
-      codeName = "Koi";
     };
 
     # Generate /etc/os-release.  See

From 187534454271910dcc023a9b0a0c27e9e79ecade Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 9 Oct 2018 23:10:45 +0200
Subject: [PATCH 3146/3253] nixos-*: init as package

Move all the nixos-* scripts from the nixos distribution as real
packages in the pkgs/ package set.

This allows non-nixos users to run the script as well. For example,
deploying a remote machine with:

    nixos-rebuild --target-host root@hostname --build-host root@hostname
---
 nixos/modules/installer/tools/tools.nix       | 88 +++++--------------
 pkgs/tools/nixos/nixos-build-vms/default.nix  |  7 ++
 .../nixos}/nixos-build-vms/nixos-build-vms.sh |  2 +-
 pkgs/tools/nixos/nixos-enter/default.nix      |  7 ++
 .../tools/nixos/nixos-enter}/nixos-enter.sh   |  0
 .../nixos/nixos-generate-config/default.nix   | 16 ++++
 .../nixos-generate-config.pl                  |  0
 pkgs/tools/nixos/nixos-install/default.nix    | 13 +++
 .../nixos/nixos-install}/nixos-install.sh     |  0
 pkgs/tools/nixos/nixos-option/default.nix     |  7 ++
 .../tools/nixos/nixos-option}/nixos-option.sh |  0
 pkgs/tools/nixos/nixos-rebuild/default.nix    | 13 +++
 .../nixos-rebuild}/nix-fallback-paths.nix     |  0
 .../nixos/nixos-rebuild}/nixos-rebuild.sh     |  0
 pkgs/tools/nixos/nixos-version/default.nix    | 13 +++
 .../nixos/nixos-version}/nixos-version.sh     |  0
 pkgs/top-level/all-packages.nix               | 10 +++
 17 files changed, 110 insertions(+), 66 deletions(-)
 create mode 100644 pkgs/tools/nixos/nixos-build-vms/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos}/nixos-build-vms/nixos-build-vms.sh (99%)
 create mode 100644 pkgs/tools/nixos/nixos-enter/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-enter}/nixos-enter.sh (100%)
 create mode 100644 pkgs/tools/nixos/nixos-generate-config/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-generate-config}/nixos-generate-config.pl (100%)
 create mode 100644 pkgs/tools/nixos/nixos-install/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-install}/nixos-install.sh (100%)
 create mode 100644 pkgs/tools/nixos/nixos-option/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-option}/nixos-option.sh (100%)
 create mode 100644 pkgs/tools/nixos/nixos-rebuild/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-rebuild}/nix-fallback-paths.nix (100%)
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-rebuild}/nixos-rebuild.sh (100%)
 create mode 100644 pkgs/tools/nixos/nixos-version/default.nix
 rename {nixos/modules/installer/tools => pkgs/tools/nixos/nixos-version}/nixos-version.sh (100%)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index af0a3a2fcc88..6d9ebf750825 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -6,77 +6,35 @@
 with lib;
 
 let
-  makeProg = args: pkgs.substituteAll (args // {
-    dir = "bin";
-    isExecutable = true;
-  });
-
-  nixos-build-vms = makeProg {
-    name = "nixos-build-vms";
-    src = ./nixos-build-vms/nixos-build-vms.sh;
-  };
-
-  nixos-install = makeProg {
-    name = "nixos-install";
-    src = ./nixos-install.sh;
-    nix = config.nix.package.out;
-    path = makeBinPath [ nixos-enter ];
-  };
-
-  nixos-rebuild =
-    let fallback = import ./nix-fallback-paths.nix; in
-    makeProg {
-      name = "nixos-rebuild";
-      src = ./nixos-rebuild.sh;
-      nix = config.nix.package.out;
-      nix_x86_64_linux = fallback.x86_64-linux;
-      nix_i686_linux = fallback.i686-linux;
-    };
-
-  nixos-generate-config = makeProg {
-    name = "nixos-generate-config";
-    src = ./nixos-generate-config.pl;
-    path = [ pkgs.btrfs-progs ];
-    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
-    inherit (config.system.nixos) release;
-  };
-
-  nixos-option = makeProg {
-    name = "nixos-option";
-    src = ./nixos-option.sh;
-  };
-
-  nixos-version = makeProg {
-    name = "nixos-version";
-    src = ./nixos-version.sh;
-    inherit (config.system.nixos) version codeName revision;
-  };
-
-  nixos-enter = makeProg {
-    name = "nixos-enter";
-    src = ./nixos-enter.sh;
-  };
-
+  nixos-build-vms = pkgs.nixos-build-vms;
+  nixos-enter = pkgs.nixos-enter;
+  nixos-generate-config = pkgs.nixos-generate-config.override { inherit (config.system.nixos) release; };
+  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
+  nixos-option = pkgs.nixos-option;
+  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; };
+  nixos-version = pkgs.nixos-version.override { inherit (config.system.nixos) version codeName revision; };
 in
 
 {
-
   config = {
-
-    environment.systemPackages =
-      [ nixos-build-vms
-        nixos-install
-        nixos-rebuild
-        nixos-generate-config
-        nixos-option
-        nixos-version
-        nixos-enter
-      ];
+    environment.systemPackages = [
+      nixos-build-vms
+      nixos-enter
+      nixos-generate-config
+      nixos-install
+      nixos-option
+      nixos-rebuild
+      nixos-version
+    ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
+      inherit
+        nixos-enter
+        nixos-generate-config
+        nixos-install
+        nixos-option
+        nixos-rebuild
+        ;
     };
-
   };
-
 }
diff --git a/pkgs/tools/nixos/nixos-build-vms/default.nix b/pkgs/tools/nixos/nixos-build-vms/default.nix
new file mode 100644
index 000000000000..579f80c8256c
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-build-vms/default.nix
@@ -0,0 +1,7 @@
+{ substituteAll }:
+substituteAll {
+  name = "nixos-build-vms";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-build-vms.sh;
+}
diff --git a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh b/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh
similarity index 99%
rename from nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
rename to pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh
index 4e981c074a57..237a807609a0 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
+++ b/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh
@@ -35,7 +35,7 @@ do
 	    exit 0
 	    ;;
     esac
-    
+
     shift
 done
 
diff --git a/pkgs/tools/nixos/nixos-enter/default.nix b/pkgs/tools/nixos/nixos-enter/default.nix
new file mode 100644
index 000000000000..ccf455c40dcf
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-enter/default.nix
@@ -0,0 +1,7 @@
+{ substituteAll }:
+substituteAll {
+  name = "nixos-enter";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-enter.sh;
+}
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/pkgs/tools/nixos/nixos-enter/nixos-enter.sh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-enter.sh
rename to pkgs/tools/nixos/nixos-enter/nixos-enter.sh
diff --git a/pkgs/tools/nixos/nixos-generate-config/default.nix b/pkgs/tools/nixos/nixos-generate-config/default.nix
new file mode 100644
index 000000000000..3d9e26d1d08d
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-generate-config/default.nix
@@ -0,0 +1,16 @@
+{ substituteAll
+, btrfs-progs
+, perl
+, perlPackages
+, lib
+, release ? lib.trivial.release
+}:
+substituteAll {
+  name = "nixos-generate-config";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-generate-config.pl;
+  path = [ btrfs-progs ];
+  perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl";
+  inherit release;
+}
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl
similarity index 100%
rename from nixos/modules/installer/tools/nixos-generate-config.pl
rename to pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl
diff --git a/pkgs/tools/nixos/nixos-install/default.nix b/pkgs/tools/nixos/nixos-install/default.nix
new file mode 100644
index 000000000000..c652fb67f62f
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-install/default.nix
@@ -0,0 +1,13 @@
+{ substituteAll
+, lib
+, nix
+, nixos-enter
+}:
+substituteAll {
+  name = "nixos-install";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-install.sh;
+  nix = nix.out;
+  path = lib.makeBinPath [ nixos-enter ];
+}
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/pkgs/tools/nixos/nixos-install/nixos-install.sh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-install.sh
rename to pkgs/tools/nixos/nixos-install/nixos-install.sh
diff --git a/pkgs/tools/nixos/nixos-option/default.nix b/pkgs/tools/nixos/nixos-option/default.nix
new file mode 100644
index 000000000000..1fe84c01bced
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-option/default.nix
@@ -0,0 +1,7 @@
+{ substituteAll }:
+substituteAll {
+  name = "nixos-option";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-option.sh;
+}
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/pkgs/tools/nixos/nixos-option/nixos-option.sh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-option.sh
rename to pkgs/tools/nixos/nixos-option/nixos-option.sh
diff --git a/pkgs/tools/nixos/nixos-rebuild/default.nix b/pkgs/tools/nixos/nixos-rebuild/default.nix
new file mode 100644
index 000000000000..2216252f6cbf
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-rebuild/default.nix
@@ -0,0 +1,13 @@
+{ substituteAll, nix }:
+let
+  fallback = import ./nix-fallback-paths.nix;
+in
+  substituteAll {
+    name = "nixos-rebuild";
+    dir = "bin";
+    isExecutable = true;
+    src = ./nixos-rebuild.sh;
+    nix = nix.out;
+    nix_x86_64_linux = fallback.x86_64-linux;
+    nix_i686_linux = fallback.i686-linux;
+  }
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix
similarity index 100%
rename from nixos/modules/installer/tools/nix-fallback-paths.nix
rename to pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-rebuild.sh
rename to pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh
diff --git a/pkgs/tools/nixos/nixos-version/default.nix b/pkgs/tools/nixos/nixos-version/default.nix
new file mode 100644
index 000000000000..f81f9ac9927b
--- /dev/null
+++ b/pkgs/tools/nixos/nixos-version/default.nix
@@ -0,0 +1,13 @@
+{ substituteAll
+, lib
+, version ? lib.trivial.version
+, codeName ? "unknown"
+, revision ? lib.trivial.revisionWithDefault "master"
+}:
+substituteAll {
+  name = "nixos-version";
+  dir = "bin";
+  isExecutable = true;
+  src = ./nixos-version.sh;
+  inherit version codeName revision;
+}
diff --git a/nixos/modules/installer/tools/nixos-version.sh b/pkgs/tools/nixos/nixos-version/nixos-version.sh
similarity index 100%
rename from nixos/modules/installer/tools/nixos-version.sh
rename to pkgs/tools/nixos/nixos-version/nixos-version.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a3da230798e..6ecb95582725 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21951,6 +21951,16 @@ with pkgs;
     nixStable
     nixUnstable;
 
+  # NixOS tools
+  nixos-build-vms = callPackage ../tools/nixos/nixos-build-vms { };
+  nixos-enter = callPackage ../tools/nixos/nixos-enter { };
+  nixos-generate-config = callPackage ../tools/nixos/nixos-generate-config { };
+  nixos-install = callPackage ../tools/nixos/nixos-install { };
+  nixos-option = callPackage ../tools/nixos/nixos-option { };
+  nixos-rebuild = callPackage ../tools/nixos/nixos-rebuild { };
+  nixos-version = callPackage ../tools/nixos/nixos-version { };
+
+
   nixops = callPackage ../tools/package-management/nixops { };
 
   nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { });

From e14f9cea94f08abdbf78b8fdd0a3ca2d3144b073 Mon Sep 17 00:00:00 2001
From: "Christoph Neidahl (OPNA2608)" <christoph.neidahl@uni-leipzig.de>
Date: Tue, 16 Oct 2018 11:40:27 +0200
Subject: [PATCH 3147/3253] x11vnc: 0.9.13 -> 0.9.15

updated x11vnc to use the GitHub repo and up-to-date version 0.9.15
---
 pkgs/tools/X11/x11vnc/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 2dc6d8ffd78c..d91c91b10e20 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,34 +1,42 @@
-{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg, coreutils }:
+{ stdenv, fetchFromGitHub,
+  openssl, zlib, libjpeg, xorg, coreutils, libvncserver,
+  autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.13";
+  name = "x11vnc-${version}";
+  version = "0.9.15";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
-    sha256 = "0fzib5xb1vbs8kdprr4z94v0fshj2c5hhaz69llaarwnc8p9z0pn";
+  src = fetchFromGitHub {
+    owner = "LibVNC";
+    repo = "x11vnc";
+    rev = version;
+    sha256 = "1a1b65k1hsy4nhg2sx1yrpaz3vx6s7rmrx8nwygpaam8wpdlkh8p";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
   buildInputs =
     [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
       xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
       xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
       xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
       xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
+      libvncserver
     ];
 
   preConfigure = ''
     configureFlags="--mandir=$out/share/man"
 
-    substituteInPlace x11vnc/unixpw.c \
+    substituteInPlace src/unixpw.c \
         --replace '"/bin/su"' '"/run/wrappers/bin/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
-    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h
+    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
   '';
 
   meta = with stdenv.lib; {
     description = "A VNC server connected to a real X11 screen";
-    homepage = http://www.karlrunge.com/x11vnc/;
+    homepage = https://github.com/LibVNC/x11vnc/;
     platforms = platforms.linux;
     license = licenses.gpl2;
   };

From 09504f62a72ea38435a3cb1217c8cd12a695a79d Mon Sep 17 00:00:00 2001
From: "Christoph Neidahl (OPNA2608)" <christoph.neidahl@uni-leipzig.de>
Date: Tue, 16 Oct 2018 11:43:48 +0200
Subject: [PATCH 3148/3253] x11vnc: added maintainer

adding myself as maintainer
---
 maintainers/maintainer-list.nix   | 5 +++++
 pkgs/tools/X11/x11vnc/default.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5f33e316e183..3791c6772c4f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3110,6 +3110,11 @@
     github = "olynch";
     name = "Owen Lynch";
   };
+  OPNA2608 = {
+    email = "christoph.neidahl@gmail.com";
+    github = "OPNA2608";
+    name = "Christoph Neidahl";
+  };
   orbekk = {
     email = "kjetil.orbekk@gmail.com";
     github = "orbekk";
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index d91c91b10e20..51307f0df09f 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/LibVNC/x11vnc/;
     platforms = platforms.linux;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ OPNA2608 ];
   };
 }

From db7637377bf3b328008b8d77427ac75a193fcd94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 04:30:20 -0700
Subject: [PATCH 3149/3253] caf: 0.15.7 -> 0.16.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/actor-framework/versions
---
 pkgs/development/libraries/caf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 397e80961e06..09c1560d6f60 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
-  version = "0.15.7";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = "${version}";
-    sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb";
+    sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02";
   };
 
   nativeBuildInputs = [ cmake ];

From ddaefd444e622f7cf4426d1dd5e64760cfb45fec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 04:38:35 -0700
Subject: [PATCH 3150/3253] bindfs: 1.13.9 -> 1.13.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bindfs/versions
---
 pkgs/tools/filesystems/bindfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 1499e81b624e..a674de9ac49b 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.13.9";
+  version = "1.13.10";
   name    = "bindfs-${version}";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${name}.tar.gz";
-    sha256 = "1dgqjq2plpds442ygpv8czr5v199ljscp33m89y19x04ssljrymc";
+    sha256 = "14wfp2dcjm0f1pmqqvkf94k7pijbi8ka395cm3hryqpi4k0w3f4j";
   };
 
   dontStrip = true;

From 2b2e4e1a3b7dd28a16c23fd3bcb731bfc1388993 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 04:53:24 -0700
Subject: [PATCH 3151/3253] adapta-gtk-theme: 3.94.0.149 -> 3.95.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/adapta-gtk-theme/versions
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index 37e7af95a910..0c144b567418 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.94.0.149";
+  version = "3.95.0.1";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "1rb07yv4iz4yp6cnigzy690mw3w6fcf7szlcbbna6wnjaf1rbf2i";
+    sha256 = "0hc3ar55wjg51qf8c7h0nix0lyqs16mk1d4hhxyv102zq4l5fz97";
   };
 
   preferLocalBuild = true;

From 62dc7fbc6170e9c96fed8eda70783bb012f57a84 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 16 Oct 2018 13:55:31 +0200
Subject: [PATCH 3152/3253] appimage-run: Fix type-1 support, used wrong
 directory

---
 pkgs/tools/package-management/appimage-run/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 8e236aa426fd..e744b897f46a 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -134,7 +134,8 @@ buildFHSUserEnv {
 
       if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
         # is type-1 appimage
-        ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE"
+        mkdir "$APPDIR"
+        ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
       else
         # is type-2 appimage
         "$APPIMAGE" --appimage-extract 2>/dev/null

From 2e1b04b4efbc90555a34d44f00bc3ef92b1570d0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 04:58:58 -0700
Subject: [PATCH 3153/3253] babl: 0.1.56 -> 0.1.58

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/babl/versions
---
 pkgs/development/libraries/babl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 1e341d3124b4..027b86a97747 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.56";
+  name = "babl-0.1.58";
 
   src = fetchurl {
     url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla";
+    sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr";
   };
 
   doCheck = true;

From b2ba477e713574fa49811c420726542911bf89dc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 16 Oct 2018 14:51:13 +0200
Subject: [PATCH 3154/3253] altcoins.bitcoin-abc: 3.6.7 -> 3.6.10

---
 pkgs/applications/altcoins/bitcoin-abc.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 6d2cbcdf9f9b..3b65b06d8db8 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
 , zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
@@ -7,19 +7,19 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.17.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y";
+    sha256 = "1ha219xnd61qicf7r3j0wbfrifh7blwp3lyk3ycgdn381q1qln29";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db48 boost zlib
+  buildInputs = [ openssl db53 boost zlib
                   miniupnpc utillinux protobuf libevent ]
                   ++ optionals withGui [ qtbase qttools qrencode ];
 

From d36c55a530e31955ef9657dab745faf9f315eae8 Mon Sep 17 00:00:00 2001
From: Doug Beardsley <mightybyte@gmail.com>
Date: Mon, 15 Oct 2018 16:15:03 -0400
Subject: [PATCH 3155/3253] Add name parameter to developPackage

---
 pkgs/development/haskell-modules/make-package-set.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ef2c33c10915..400465264883 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -194,6 +194,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
 
     # : { root : Path
+    #   , name : Defaulted String
     #   , source-overrides : Defaulted (Either Path VersionNumber)
     #   , overrides : Defaulted (HaskellPackageOverrideSet)
     #   , modifier : Defaulted
@@ -207,6 +208,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # for nix-build or nix-shell to build that package.
     developPackage =
       { root
+      , name ? builtins.baseNameOf root
       , source-overrides ? {}
       , overrides ? self: super: {}
       , modifier ? drv: drv
@@ -216,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
            (pkgs.lib.composeExtensions
               (self.packageSourceOverrides source-overrides)
               overrides))
-        .callCabal2nix (builtins.baseNameOf root) root {};
+        .callCabal2nix name root {};
       in if returnShellEnv then (modifier drv).env else modifier drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);

From aac680d4c97cce08ce759043dd25a3efd5d9b5dd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 16 Oct 2018 16:25:43 +0200
Subject: [PATCH 3156/3253] vbam: unstable-2017-09-04 -> 2.1.0

---
 pkgs/misc/emulators/vbam/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index ac078f622515..59f0252259cc 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -4,25 +4,23 @@
 , fetchFromGitHub
 , ffmpeg
 , gettext
-, gtk2-x11
 , libGLU_combined
 , openal
 , pkgconfig
 , SDL2
 , sfml
-, wxGTK
 , zip
 , zlib
 }:
 
 stdenv.mkDerivation rec {
   name = "visualboyadvance-m-${version}";
-  version = "unstable-2017-09-04";
+  version = "2.1.0";
   src = fetchFromGitHub {
     owner = "visualboyadvance-m";
     repo = "visualboyadvance-m";
-    rev = "ceef480";
-    sha256 = "1lpmlj8mv6fwlfg9m58hzggx8ld6cnjvaqx5ka5sffxd9v95qq2l";
+    rev = "v${version}";
+    sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz";
   };
 
   buildInputs = [
@@ -30,13 +28,11 @@ stdenv.mkDerivation rec {
     cmake
     ffmpeg
     gettext
-    gtk2-x11
     libGLU_combined
     openal
     pkgconfig
     SDL2
     sfml
-    wxGTK
     zip
     zlib
   ];
@@ -44,8 +40,10 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE='Release'"
     "-DENABLE_FFMPEG='true'"
-    #"-DENABLE_LINK='true'" currently broken :/
+    "-DENABLE_LINK='true'"
     "-DSYSCONFDIR=etc"
+    "-DENABLE_WX='false'"
+    "-DENABLE_SDL='true'"
   ];
 
   meta = {

From bd0aa43571d329c5b5f2703affdf185e3b6bbeb1 Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Tue, 16 Oct 2018 15:39:49 +0100
Subject: [PATCH 3157/3253] magit-filenotify: Fix missing dependency on git

magit-filenotify has a build-time dependency on git, fix this in same
way as magit by adding override
---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix    | 6 ++++++
 .../editors/emacs-modes/melpa-stable-packages.nix           | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 777d8e62541d..b95a944e612b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -167,6 +167,12 @@ self:
           (attrs.nativeBuildInputs or []) ++ [ external.git ];
       });
 
+      magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       # missing OCaml
       merlin = markBroken super.merlin;
 
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 98927cbd9873..6d1a8f081e5a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -157,6 +157,12 @@ self:
           (attrs.nativeBuildInputs or []) ++ [ external.git ];
       });
 
+      magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
+        # searches for Git at build time
+        nativeBuildInputs =
+          (attrs.nativeBuildInputs or []) ++ [ external.git ];
+      });
+
       # missing OCaml
       merlin = markBroken super.merlin;
 

From 6c7fa2f1580fd623a30e2b7beca3b53bc3656601 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 16 Oct 2018 17:04:43 +0200
Subject: [PATCH 3158/3253] blivet: fix reference to selinux python modules

(cherry picked from commit 7ceea6f6013e8a6abf4925e0b2ad94c23f64442d)
---
 pkgs/development/python-modules/blivet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 9d2485711d0c..1c86c02f7a88 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -31,7 +31,7 @@ in buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
-    pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython
+    pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython
     six
   ];
 

From 34ea15f5e401b93aefe2f98057a6ecd79b63f5a2 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 16 Oct 2018 17:12:05 +0200
Subject: [PATCH 3159/3253] nixpart0.blivet: fix reference to selinux python
 modules

(cherry picked from commit 71941853a13878e5cc17b493f3791db7d4b29e51)
---
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 5879fd9d0821..24aab7dc6dd4 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -35,7 +35,7 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    pykickstart pyparted pyblock libselinux cryptsetup
+    pykickstart pyparted pyblock libselinux.py cryptsetup
   ] ++ stdenv.lib.optional useNixUdev systemd;
 
   # tests are currently _heavily_ broken upstream

From 4e75120cd4541a2f919d1d3663217e6f1b1a1820 Mon Sep 17 00:00:00 2001
From: kmille <christian.schneider@androidloves.me>
Date: Tue, 16 Oct 2018 17:37:34 +0200
Subject: [PATCH 3160/3253] tmux: 2.7 -> 2.8

tmux 2.8 has a broken version string (2.8-rc) which we patch in configure.ac

CHANGES FROM 2.7 to 2.8

* Make display-panes block the client until a pane is chosen or it
  times out.

* Clear history on RIS like most other terminals do.

* Add an "Any" key to run a command if a key is pressed that is not
  bound in the current key table.

* Expand formats in load-buffer and save-buffer.

* Add a rectangle_toggle format.

* Add set-hook -R to run a hook immediately.

* Add README.ja.

* Add pane focus hooks.

* Allow any punctuation as separator for s/x/y not only /.

* Improve resizing with the mouse (fix resizing the wrong pane in some
  layouts, and allow resizing multiple panes at the same time).

* Allow , and } to be escaped in formats as #, and #}.

* Add KRB5CCNAME to update-environment.

* Change meaning of -c to display-message so the client is used if it
  matches the session given to -t.

* Fixes to : form of SGR.

* Add x and X to choose-tree to kill sessions, windows or panes.
---
 pkgs/tools/misc/tmux/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index fcec511b7ef5..038b3206ac24 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "tmux-${version}";
-  version = "2.7";
+  version = "2.8";
 
   outputs = [ "out" "man" ];
 
@@ -21,9 +21,13 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "1yr4l8ckd67c3id4vrbpha91xxpdfpw0cpbr3v81lam0m7k4rgba";
+    sha256 = "0n8sjddy00xgh1rvvw968hh72pyslg1gahmzajfc4b3xax87drpi";
   };
 
+  postPatch = ''
+    sed -i 's/2.8-rc/2.8/' configure.ac
+  '';
+
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [ ncurses libevent makeWrapper ];

From 592030340f28b6a257579aa768166ed8151fbd1b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 16 Oct 2018 15:50:51 +0000
Subject: [PATCH 3161/3253] varnish4: 4.1.9 -> 4.1.10 (#48488)

---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 4d8841fad318..8031276e24a6 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -39,8 +39,8 @@ let
 in
 {
   varnish4 = common {
-    version = "4.1.9";
-    sha256 = "11zwyasz2fn9qxc87r175wb5ba7388sd79mlygjmqn3yv2m89n12";
+    version = "4.1.10";
+    sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n";
   };
   varnish5 = common {
     version = "5.2.1";

From d3b747627884fda87b09041ea90c4eef70ab88e4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jpc+github@ejpcmac.net>
Date: Tue, 16 Oct 2018 17:55:51 +0200
Subject: [PATCH 3162/3253] erlangR21: 21.0 -> 21.1.1 (#47371)

* erlangR21: 21.0 -> 21.1
* erlangR21: 21.1 -> 21.1.1
---
 pkgs/development/interpreters/erlang/R21.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index e9aa2a3dc426..381ffc75f8cf 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "21.0";
-  sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8";
+  version = "21.1.1";
+  sha256 = "1kgny4nvw40d93jn5f4y5bcfhdlshg79n2w7lr0xj35kgwkyci39";
 
   prePatch = ''
     substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'

From 4b61dde1dbf924ef23f87c93f0ac951e73299045 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 16 Oct 2018 16:09:04 +0000
Subject: [PATCH 3163/3253] varnish6: 6.0.1 -> 6.1.0 (#48487)

---
 pkgs/servers/varnish/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 8031276e24a6..7517560a521c 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -2,7 +2,7 @@
 , python2, makeWrapper }:
 
 let
-  common = { version, sha256 }:
+  common = { version, sha256, extraBuildInputs ? [] }:
     stdenv.mkDerivation rec {
       name = "varnish-${version}";
 
@@ -15,7 +15,7 @@ let
       buildInputs = [
         pcre libxslt groff ncurses readline python2 libedit
         python2.pkgs.docutils makeWrapper
-      ];
+      ] ++ extraBuildInputs;
 
       buildFlags = "localstatedir=/var/spool";
 
@@ -47,7 +47,8 @@ in
     sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq";
   };
   varnish6 = common {
-    version = "6.0.1";
-    sha256 = "1f7k751r31sgfvr1ns6s3h48c5x06kkps1p6zd40wvylm56qxwj7";
+    version = "6.1.0";
+    sha256 = "0zg2aqkg7a4zsjpxj0s7mphxv5f9xy279hjwln30h901k18r46qn";
+    extraBuildInputs = [ python2.pkgs.sphinx ];
   };
 }

From 2ad99a662d3500e45c9e57b49fb2619f2bd7142e Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 16 Oct 2018 16:11:41 +0000
Subject: [PATCH 3164/3253] chromium plugins: add meta.platforms (#48495)

to prevent their installation on aarch64
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 60e94e137676..c5622f0c63cb 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,6 +94,8 @@ let
         envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib";
       }}
     '';
+    
+    meta.platforms = platforms.x86_64;
   };
 
   flash = stdenv.mkDerivation rec {
@@ -133,6 +135,8 @@ let
     '';
 
     dontStrip = true;
+    
+    meta.platforms = platforms.x86_64;
   };
 
 in {

From e58816bcc6917e746cd9219b6591bfb478ecc910 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 16 Oct 2018 09:12:59 -0700
Subject: [PATCH 3165/3253] googler: 3.7 -> 3.7.1 (#48508)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/googler/versions
---
 pkgs/applications/misc/googler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 45b4ad88cff3..4b5c17d8e51b 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, python}:
 
 stdenv.mkDerivation rec {
-  version = "3.7";
+  version = "3.7.1";
   name = "googler-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "googler";
     rev = "v${version}";
-    sha256 = "0dxg849ckyy181zlrb57hd959cgvx105c35ksmvi4wl285sh5kpj";
+    sha256 = "0dcszpz85h3yjnr55ixf8mzsdv46w3g27frhgcsl5zlsgk6vl8kw";
   };
 
   propagatedBuildInputs = [ python ];

From eca462813d7586063deb5c9989ae9bcef29f9495 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 16 Oct 2018 18:28:09 +0200
Subject: [PATCH 3166/3253] libssh: 0.7.5 -> 0.7.6

Fixes CVE-2018-10933:

libssh versions 0.6 and above have an authentication bypass
vulnerability in the server code. By presenting the server an
SSH2_MSG_USERAUTH_SUCCESS message in place of the
SSH2_MSG_USERAUTH_REQUEST message which the server would expect to
initiate authentication, the attacker could successfully authentciate
without any credentials.

Source:
https://www.libssh.org/2018/10/16/libssh-0-8-4-and-0-7-6-security-and-bugfix-release/
---
 pkgs/development/libraries/libssh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 9b5c3d530ebf..1ec15e88f13d 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.5";
+  name = "libssh-0.7.6";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
-    sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
+    url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz";
+    sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x";
   };
 
   patches = [

From 56ef6eeb43f2ea9c47701bbe4534999aca78dd34 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 09:54:51 -0500
Subject: [PATCH 3167/3253] radare2: 2.9.0 -> 3.0.0

---
 .../tools/analysis/radare2/default.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index f10b820a73ea..4a2a32bf22a4 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -86,21 +86,21 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "19349";
-    gittap = "2.9.0";
-    gittip = "d5e9539ec8068ca2ab4759dc3b0697781ded4cc8";
-    rev = "2.9.0";
-    version = "2.9.0";
-    sha256 = "0zz6337p9095picfvjrcnqaxdi2a2b68h9my523ilnw8ynwfhdzw";
-    cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
-    cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+    version_commit = "19720";
+    gittap = "3.0.0";
+    gittip = "13e3ebd2aa6653eb5b6bdd65a93dcddf3550fcfa";
+    rev = "3.0.0";
+    version = "3.0.0";
+    sha256 = "0awbk9v7qjkarscaqzyly310f04dxgndxvxwxbjrsswqlp206b40";
+    cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+    cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
   };
   r2-for-cutter = generic {
-    version_commit = "19349";
+    version_commit = "19720";
     gittap = "2.8.0-189-gf82b28982";
     gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
     rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
-    version = "2018-08-14";
+    version = "2018-08-13";
     sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
     cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";

From f88957d1701d08e61dc44653d34524fa930b2778 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 11:57:44 -0500
Subject: [PATCH 3168/3253] radare2: libuv and actually use deps we're
 providing

Particularly openssl and zlib.
There are others we may wish to provide but for now
let's at least use the ones in buildInputs :).
---
 pkgs/development/tools/analysis/radare2/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 4a2a32bf22a4..a6dbb8e601fe 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -2,6 +2,7 @@
 , callPackage
 , ninja, meson , pkgconfig
 , libusb, readline, libewf, perl, zlib, openssl
+, libuv
 , gtk2 ? null, vte ? null, gtkdialog ? null
 , python ? null
 , ruby ? null
@@ -62,12 +63,15 @@ let
         "-Dr2_gittip=${gittip}"
         # 2.8.0 expects this, but later it becomes an option with default=false.
         "-Dcapstone_in_builddir=true"
+
+        "-Duse_sys_openssl=true"
+        "-Duse_sys_zlib=true"
       ];
 
       enableParallelBuilding = true;
 
       nativeBuildInputs = [ pkgconfig ninja meson ];
-      buildInputs = [ readline libusb libewf perl zlib openssl]
+      buildInputs = [ readline libusb libewf perl zlib openssl libuv ]
         ++ optional useX11 [gtkdialog vte gtk2]
         ++ optional rubyBindings [ruby]
         ++ optional pythonBindings [python]

From 9b590126a7af8a9488d52f1ea752a79cf2ab8a3d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 09:56:17 -0500
Subject: [PATCH 3169/3253] radare2-cutter: 1.7.1 -> 1.7.2

---
 .../tools/analysis/radare2/cutter.nix            |  4 ++--
 .../tools/analysis/radare2/default.nix           | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index 659d6a94f5eb..25c6d6d58792 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -8,7 +8,7 @@
 , python3 }:
 
 let
-  version = "1.7.1";
+  version = "1.7.2";
 in
 stdenv.mkDerivation rec {
   name = "radare2-cutter-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "0dfi6f016jnh3swppvks5qkvmk0j2hvggh9sd1f40kg9pg5p08hy";
+    sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index f10b820a73ea..3302e17c69c3 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -96,14 +96,14 @@ in {
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
   };
   r2-for-cutter = generic {
-    version_commit = "19349";
-    gittap = "2.8.0-189-gf82b28982";
-    gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
-    rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
-    version = "2018-08-14";
-    sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
-    cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
-    cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";
+    version_commit = "19720";
+    gittap = "2.9.0-310-gcb62c376b";
+    gittip = "cb62c376bef6c7427019a7c28910c33c364436dd";
+    rev = "cb62c376bef6c7427019a7c28910c33c364436dd";
+    version = "2018-10-07";
+    sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l";
+    cs_tip = "e2c1cd46c06744beaceff42dd882de3a90f0a37c";
+    cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
   };
   #</generated>
 }

From 6fdc1655649076262a93cddd4cb389457a0287e4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 12:35:16 -0500
Subject: [PATCH 3170/3253] r2-for-cutter: revert accidental change to version
 info

---
 pkgs/development/tools/analysis/radare2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index a6dbb8e601fe..7e7f10ea7ff0 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -100,11 +100,11 @@ in {
     cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722";
   };
   r2-for-cutter = generic {
-    version_commit = "19720";
+    version_commit = "19349";
     gittap = "2.8.0-189-gf82b28982";
     gittip = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
     rev = "f82b289822825e4c7403734f3b95dfd7f5e4f725";
-    version = "2018-08-13";
+    version = "2018-08-14";
     sha256 = "0zc2a09xmwbxphxd1b0ia0zm8323wfcmxwwx6k239681jj9qwgr1";
     cs_tip = "782ea67e17a391ca0d3faafdc365b335a1a8930a";
     cs_sha256 = "1maww4ir78a193pm3f8lr2kdkizi7rywn68ffa65ipyr7j4pl6i4";

From 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 16 Oct 2018 19:35:45 +0200
Subject: [PATCH 3171/3253] terraform-providers.libvirt: fix plugin output
 (#48577)

Terraform depends on this binary name format to detect the provider
version.
---
 .../cluster/terraform-providers/libvirt/default.nix         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 2beceddc7fba..d24a5780315d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -3,7 +3,7 @@
 # USAGE:
 # install the following package globally or in nix-shell:
 #
-#   (terraform.withPlugins (old: [terraform-provider-libvirt]))
+#   (terraform.withPlugins (p: [p.libvirt]))
 #
 # configuration.nix:
 #
@@ -36,6 +36,10 @@ buildGoPackage rec {
   # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
   propagatedBuildInputs = [ cdrtools ];
 
+  # Terraform allow checking the provider versions, but this breaks
+  # if the versions are not provided via file paths.
+  postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}";
+
   meta = with stdenv.lib; {
     homepage = https://github.com/dmacvicar/terraform-provider-libvirt;
     description = "Terraform provider for libvirt";

From b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 16 Oct 2018 20:25:44 +0200
Subject: [PATCH 3172/3253] Revert "Merge pull request #48122 from
 zimbatm/pkg-nixos-rebuild"

This reverts commit 10addad6035034b2b78f3c74ef436cd7146d5231, reversing
changes made to 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2.

NixOS scripts should be kept in the NixOS source tree, not in
pkgs. Moving them around is just confusing and creates unnecessary
code/history churn.
---
 .codeName                                     |  1 -
 lib/trivial.nix                               |  3 -
 .../installer/tools}/nix-fallback-paths.nix   |  0
 .../tools}/nixos-build-vms/nixos-build-vms.sh |  2 +-
 .../modules/installer/tools}/nixos-enter.sh   |  0
 .../installer/tools}/nixos-generate-config.pl |  0
 .../modules/installer/tools}/nixos-install.sh |  0
 .../modules/installer/tools}/nixos-option.sh  |  0
 .../modules/installer/tools}/nixos-rebuild.sh |  0
 .../modules/installer/tools}/nixos-version.sh |  0
 nixos/modules/installer/tools/tools.nix       | 88 ++++++++++++++-----
 nixos/modules/misc/version.nix                |  4 +-
 pkgs/tools/nixos/nixos-build-vms/default.nix  |  7 --
 pkgs/tools/nixos/nixos-enter/default.nix      |  7 --
 .../nixos/nixos-generate-config/default.nix   | 16 ----
 pkgs/tools/nixos/nixos-install/default.nix    | 13 ---
 pkgs/tools/nixos/nixos-option/default.nix     |  7 --
 pkgs/tools/nixos/nixos-rebuild/default.nix    | 13 ---
 pkgs/tools/nixos/nixos-version/default.nix    | 13 ---
 pkgs/top-level/all-packages.nix               | 10 ---
 20 files changed, 69 insertions(+), 115 deletions(-)
 delete mode 100644 .codeName
 rename {pkgs/tools/nixos/nixos-rebuild => nixos/modules/installer/tools}/nix-fallback-paths.nix (100%)
 rename {pkgs/tools/nixos => nixos/modules/installer/tools}/nixos-build-vms/nixos-build-vms.sh (99%)
 rename {pkgs/tools/nixos/nixos-enter => nixos/modules/installer/tools}/nixos-enter.sh (100%)
 rename {pkgs/tools/nixos/nixos-generate-config => nixos/modules/installer/tools}/nixos-generate-config.pl (100%)
 rename {pkgs/tools/nixos/nixos-install => nixos/modules/installer/tools}/nixos-install.sh (100%)
 rename {pkgs/tools/nixos/nixos-option => nixos/modules/installer/tools}/nixos-option.sh (100%)
 rename {pkgs/tools/nixos/nixos-rebuild => nixos/modules/installer/tools}/nixos-rebuild.sh (100%)
 rename {pkgs/tools/nixos/nixos-version => nixos/modules/installer/tools}/nixos-version.sh (100%)
 delete mode 100644 pkgs/tools/nixos/nixos-build-vms/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-enter/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-generate-config/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-install/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-option/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-rebuild/default.nix
 delete mode 100644 pkgs/tools/nixos/nixos-version/default.nix

diff --git a/.codeName b/.codeName
deleted file mode 100644
index 0bb82a2888e3..000000000000
--- a/.codeName
+++ /dev/null
@@ -1 +0,0 @@
-Koi
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 811c298d8620..938df6ced476 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -98,9 +98,6 @@ rec {
   # The current nixpkgs version number as string.
   release = lib.strings.fileContents ../.version;
 
-  # Note: the first letter is bumped on every release.  It's an animal.
-  codeName = lib.strings.fileContents ../.codeName;
-
   # The current nixpkgs version suffix as string.
   versionSuffix =
     let suffixFile = ../.version-suffix;
diff --git a/pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
similarity index 100%
rename from pkgs/tools/nixos/nixos-rebuild/nix-fallback-paths.nix
rename to nixos/modules/installer/tools/nix-fallback-paths.nix
diff --git a/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
similarity index 99%
rename from pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh
rename to nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
index 237a807609a0..4e981c074a57 100644
--- a/pkgs/tools/nixos/nixos-build-vms/nixos-build-vms.sh
+++ b/nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh
@@ -35,7 +35,7 @@ do
 	    exit 0
 	    ;;
     esac
-
+    
     shift
 done
 
diff --git a/pkgs/tools/nixos/nixos-enter/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
similarity index 100%
rename from pkgs/tools/nixos/nixos-enter/nixos-enter.sh
rename to nixos/modules/installer/tools/nixos-enter.sh
diff --git a/pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
similarity index 100%
rename from pkgs/tools/nixos/nixos-generate-config/nixos-generate-config.pl
rename to nixos/modules/installer/tools/nixos-generate-config.pl
diff --git a/pkgs/tools/nixos/nixos-install/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
similarity index 100%
rename from pkgs/tools/nixos/nixos-install/nixos-install.sh
rename to nixos/modules/installer/tools/nixos-install.sh
diff --git a/pkgs/tools/nixos/nixos-option/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
similarity index 100%
rename from pkgs/tools/nixos/nixos-option/nixos-option.sh
rename to nixos/modules/installer/tools/nixos-option.sh
diff --git a/pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
similarity index 100%
rename from pkgs/tools/nixos/nixos-rebuild/nixos-rebuild.sh
rename to nixos/modules/installer/tools/nixos-rebuild.sh
diff --git a/pkgs/tools/nixos/nixos-version/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh
similarity index 100%
rename from pkgs/tools/nixos/nixos-version/nixos-version.sh
rename to nixos/modules/installer/tools/nixos-version.sh
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 6d9ebf750825..af0a3a2fcc88 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -6,35 +6,77 @@
 with lib;
 
 let
-  nixos-build-vms = pkgs.nixos-build-vms;
-  nixos-enter = pkgs.nixos-enter;
-  nixos-generate-config = pkgs.nixos-generate-config.override { inherit (config.system.nixos) release; };
-  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
-  nixos-option = pkgs.nixos-option;
-  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; };
-  nixos-version = pkgs.nixos-version.override { inherit (config.system.nixos) version codeName revision; };
+  makeProg = args: pkgs.substituteAll (args // {
+    dir = "bin";
+    isExecutable = true;
+  });
+
+  nixos-build-vms = makeProg {
+    name = "nixos-build-vms";
+    src = ./nixos-build-vms/nixos-build-vms.sh;
+  };
+
+  nixos-install = makeProg {
+    name = "nixos-install";
+    src = ./nixos-install.sh;
+    nix = config.nix.package.out;
+    path = makeBinPath [ nixos-enter ];
+  };
+
+  nixos-rebuild =
+    let fallback = import ./nix-fallback-paths.nix; in
+    makeProg {
+      name = "nixos-rebuild";
+      src = ./nixos-rebuild.sh;
+      nix = config.nix.package.out;
+      nix_x86_64_linux = fallback.x86_64-linux;
+      nix_i686_linux = fallback.i686-linux;
+    };
+
+  nixos-generate-config = makeProg {
+    name = "nixos-generate-config";
+    src = ./nixos-generate-config.pl;
+    path = [ pkgs.btrfs-progs ];
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    inherit (config.system.nixos) release;
+  };
+
+  nixos-option = makeProg {
+    name = "nixos-option";
+    src = ./nixos-option.sh;
+  };
+
+  nixos-version = makeProg {
+    name = "nixos-version";
+    src = ./nixos-version.sh;
+    inherit (config.system.nixos) version codeName revision;
+  };
+
+  nixos-enter = makeProg {
+    name = "nixos-enter";
+    src = ./nixos-enter.sh;
+  };
+
 in
 
 {
+
   config = {
-    environment.systemPackages = [
-      nixos-build-vms
-      nixos-enter
-      nixos-generate-config
-      nixos-install
-      nixos-option
-      nixos-rebuild
-      nixos-version
-    ];
+
+    environment.systemPackages =
+      [ nixos-build-vms
+        nixos-install
+        nixos-rebuild
+        nixos-generate-config
+        nixos-option
+        nixos-version
+        nixos-enter
+      ];
 
     system.build = {
-      inherit
-        nixos-enter
-        nixos-generate-config
-        nixos-install
-        nixos-option
-        nixos-rebuild
-        ;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
     };
+
   };
+
 }
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index fd77f6372720..6d78b7c593f8 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -43,7 +43,6 @@ in
     nixos.codeName = mkOption {
       readOnly = true;
       type = types.str;
-      default = lib.trivial.codeName;
       description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
     };
 
@@ -80,6 +79,9 @@ in
       version = mkDefault (cfg.release + cfg.versionSuffix);
       revision      = mkIf (pathIsDirectory gitRepo) (mkDefault            gitCommitId);
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
+
+      # Note: the first letter is bumped on every release.  It's an animal.
+      codeName = "Koi";
     };
 
     # Generate /etc/os-release.  See
diff --git a/pkgs/tools/nixos/nixos-build-vms/default.nix b/pkgs/tools/nixos/nixos-build-vms/default.nix
deleted file mode 100644
index 579f80c8256c..000000000000
--- a/pkgs/tools/nixos/nixos-build-vms/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ substituteAll }:
-substituteAll {
-  name = "nixos-build-vms";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-build-vms.sh;
-}
diff --git a/pkgs/tools/nixos/nixos-enter/default.nix b/pkgs/tools/nixos/nixos-enter/default.nix
deleted file mode 100644
index ccf455c40dcf..000000000000
--- a/pkgs/tools/nixos/nixos-enter/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ substituteAll }:
-substituteAll {
-  name = "nixos-enter";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-enter.sh;
-}
diff --git a/pkgs/tools/nixos/nixos-generate-config/default.nix b/pkgs/tools/nixos/nixos-generate-config/default.nix
deleted file mode 100644
index 3d9e26d1d08d..000000000000
--- a/pkgs/tools/nixos/nixos-generate-config/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ substituteAll
-, btrfs-progs
-, perl
-, perlPackages
-, lib
-, release ? lib.trivial.release
-}:
-substituteAll {
-  name = "nixos-generate-config";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-generate-config.pl;
-  path = [ btrfs-progs ];
-  perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl";
-  inherit release;
-}
diff --git a/pkgs/tools/nixos/nixos-install/default.nix b/pkgs/tools/nixos/nixos-install/default.nix
deleted file mode 100644
index c652fb67f62f..000000000000
--- a/pkgs/tools/nixos/nixos-install/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ substituteAll
-, lib
-, nix
-, nixos-enter
-}:
-substituteAll {
-  name = "nixos-install";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-install.sh;
-  nix = nix.out;
-  path = lib.makeBinPath [ nixos-enter ];
-}
diff --git a/pkgs/tools/nixos/nixos-option/default.nix b/pkgs/tools/nixos/nixos-option/default.nix
deleted file mode 100644
index 1fe84c01bced..000000000000
--- a/pkgs/tools/nixos/nixos-option/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ substituteAll }:
-substituteAll {
-  name = "nixos-option";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-option.sh;
-}
diff --git a/pkgs/tools/nixos/nixos-rebuild/default.nix b/pkgs/tools/nixos/nixos-rebuild/default.nix
deleted file mode 100644
index 2216252f6cbf..000000000000
--- a/pkgs/tools/nixos/nixos-rebuild/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ substituteAll, nix }:
-let
-  fallback = import ./nix-fallback-paths.nix;
-in
-  substituteAll {
-    name = "nixos-rebuild";
-    dir = "bin";
-    isExecutable = true;
-    src = ./nixos-rebuild.sh;
-    nix = nix.out;
-    nix_x86_64_linux = fallback.x86_64-linux;
-    nix_i686_linux = fallback.i686-linux;
-  }
diff --git a/pkgs/tools/nixos/nixos-version/default.nix b/pkgs/tools/nixos/nixos-version/default.nix
deleted file mode 100644
index f81f9ac9927b..000000000000
--- a/pkgs/tools/nixos/nixos-version/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ substituteAll
-, lib
-, version ? lib.trivial.version
-, codeName ? "unknown"
-, revision ? lib.trivial.revisionWithDefault "master"
-}:
-substituteAll {
-  name = "nixos-version";
-  dir = "bin";
-  isExecutable = true;
-  src = ./nixos-version.sh;
-  inherit version codeName revision;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11719f6cd6f5..b0ac63a3e975 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21955,16 +21955,6 @@ with pkgs;
     nixStable
     nixUnstable;
 
-  # NixOS tools
-  nixos-build-vms = callPackage ../tools/nixos/nixos-build-vms { };
-  nixos-enter = callPackage ../tools/nixos/nixos-enter { };
-  nixos-generate-config = callPackage ../tools/nixos/nixos-generate-config { };
-  nixos-install = callPackage ../tools/nixos/nixos-install { };
-  nixos-option = callPackage ../tools/nixos/nixos-option { };
-  nixos-rebuild = callPackage ../tools/nixos/nixos-rebuild { };
-  nixos-version = callPackage ../tools/nixos/nixos-version { };
-
-
   nixops = callPackage ../tools/package-management/nixops { };
 
   nixopsUnstable = lowPrio (callPackage ../tools/package-management/nixops/unstable.nix { });

From 26dfc0c533a226de7bc2b0e93f6cac6009247e6e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 14:01:08 -0500
Subject: [PATCH 3173/3253] radare2: fix update script to handle invocation
 from elsewhere

It looks like `with Path:` is supposed to be a context-manager
for changing directory but it doesn't seem to work and the only
way I've found to make that work is if we made our own and annotated it.

Instead just use nix search path to tell the expression where
to find the file it looks for.

Also re-use SCRIPT_DIR elsewhere instead of re-"computing" it.
---
 pkgs/development/tools/analysis/radare2/update.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
index 45920fd1e4bf..684d70bc0bc4 100755
--- a/pkgs/development/tools/analysis/radare2/update.py
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -38,10 +38,9 @@ def get_radare2_rev() -> str:
 
 def get_cutter_version() -> str:
     version_expr = """
-(with import <nixpkgs> {}; (builtins.parseDrvName (qt5.callPackage ./cutter.nix {}).name).version)
+(with import <nixpkgs> {}; (builtins.parseDrvName (qt5.callPackage <radare2/cutter.nix> {}).name).version)
 """
-    with SCRIPT_DIR:
-        return sh("nix", "eval", "--raw", version_expr.strip())
+    return sh("nix", "eval", "--raw", version_expr.strip(), "-I", "radare2={0}".format(SCRIPT_DIR))
 
 
 def get_r2_cutter_rev() -> str:
@@ -109,7 +108,7 @@ def main() -> None:
             "https://github.com/radare/radare2",
             ".",
         )
-        nix_file = str(Path(__file__).parent.joinpath("default.nix"))
+        nix_file = str(SCRIPT_DIR.joinpath("default.nix"))
 
         radare2_info = get_repo_info(dirname, radare2_rev)
 

From 5edc1dd7a873bf1afaa9563def7b94d7b82a5421 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 16 Oct 2018 21:34:08 +0200
Subject: [PATCH 3174/3253] signal-desktop: 1.16.2 -> 1.16.3

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 02166e237724..92f0b11c63fe 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -56,11 +56,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "signal-desktop-${version}";
-  version = "1.16.2";
+  version = "1.16.3";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y";
+    sha256 = "1fhs3408i8f80z5rlchrc3gwm0481rxqb5jk37gb8ip94zf97hsf";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From 67ef59334ca874abf02efbbb2b9a10d15745cab4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 16 Oct 2018 22:14:16 +0200
Subject: [PATCH 3175/3253] julia_10: update to 1.0.1

(cherry picked from commit 3b3a2d30df2de8dec7fa5bc5fe5ee8897e51630e)
---
 pkgs/development/compilers/julia/1.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 2301d0c1f437..528a0d26d056 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -1,6 +1,6 @@
 import ./shared.nix {
   majorVersion = "1";
   minorVersion = "0";
-  maintenanceVersion = "0";
-  src_sha256 = "083277z90m1jxr2d1ysb96rgjj9h5q97l6h54mx3pb3f38ykshz2";
+  maintenanceVersion = "1";
+  src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
 }

From e0a98c5dc02d10b84cd12efc18b7d9946c1c9e1f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 16 Oct 2018 16:50:46 -0400
Subject: [PATCH 3176/3253] oh-my-zsh: 2018-09-03 -> 2018-09-14

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 22aa478d743c..d4082465b19e 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2018-09-03";
+  version = "2018-09-14";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "69e637c35578305e19dbfc520e65c514180db6ef";
-    sha256 = "067qwvdlghjb2kcv4fydnnbwss2kb4fgn1qib88ygz82fpvb0cwf";
+    rev = "489be2452a6410a2c7837910c4cd3c0ed47a7481";
+    sha256 = "05svfd2q4w4hnd9rsh57z7rsc50lavg3lqm3nmm6dqak1nnrkhbz";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 5ac9af234060b509d48ca8cca9082ca93080490c Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Tue, 16 Oct 2018 14:33:48 -0700
Subject: [PATCH 3177/3253] pythonPackages.python-ldap-test: init at 0.3.1

---
 .../python-ldap-test/default.nix              | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-ldap-test/default.nix

diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix
new file mode 100644
index 000000000000..3ba81cacfd41
--- /dev/null
+++ b/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, py4j }:
+
+buildPythonPackage rec {
+  pname = "python-ldap-test";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf";
+  };
+
+  propagatedBuildInputs = [ py4j ];
+
+  # Tests needs java to be present in path
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Tool for testing code speaking with LDAP server";
+    homepage = https://github.com/zoldar/python-ldap-test;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c66fd52d43b..e53cee981343 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -563,6 +563,8 @@ in {
 
   python-lz4 = callPackage ../development/python-modules/python-lz4 { };
 
+  python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
+
   python-igraph = callPackage ../development/python-modules/python-igraph {
     pkgconfig = pkgs.pkgconfig;
     igraph = pkgs.igraph;

From b7632217aba97b805b79a52f6deb27a0d361a09b Mon Sep 17 00:00:00 2001
From: Lassulus <github@lassul.us>
Date: Wed, 17 Oct 2018 00:20:38 +0200
Subject: [PATCH 3178/3253] gitolite 3.6.7 -> 3.6.10 (#48562)

---
 pkgs/applications/version-management/gitolite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 78b59f59e949..0150c6021da6 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gitolite-${version}";
-  version = "3.6.7";
+  version = "3.6.10";
 
   src = fetchFromGitHub {
     owner = "sitaramc";
     repo = "gitolite";
-    rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac";
-    sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb";
+    rev = "v${version}";
+    sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h";
   };
 
   buildInputs = [ git nettools perl ];

From 6a23e11e658b7a7a77f1b61d30d64153b46bc852 Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Wed, 17 Oct 2018 00:48:23 +0200
Subject: [PATCH 3179/3253] Flexget: 2.15.1 -> 2.16.2 (#48583)

---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index d10043751599..6e1d008e0d36 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -36,11 +36,11 @@ with python'.pkgs;
 
 buildPythonApplication rec {
   pname = "FlexGet";
-  version = "2.15.1";
+  version = "2.16.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c0qyafm01j94m9vky6x4k6j6g3nygzhgm79fb25brc2fyydkm3c";
+    sha256 = "1b9nyrg1r69kmwhpmw9pxdrwa9pnw5mphpdlki85cpxiii2sms9j";
   };
 
   postPatch = ''

From 1e3ce59e7d1da5f8ccee921d58bec909e91c9c0c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 16 Oct 2018 18:09:22 -0500
Subject: [PATCH 3180/3253] git-recent: 1.0.4 -> 1.1.0

---
 .../version-management/git-and-tools/git-recent/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 82bcbf74a9eb..c52a78ff0076 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "git-recent-${version}";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "paulirish";
     repo = "git-recent";
     rev = "v${version}";
-    sha256 = "0dbnm5b2v04fy0jgzphm3xvz9scx0n4p10fw8wjd0cy56308h79k";
+    sha256 = "06r1jzmzdv3d4vxdh5qyf5g5rgavxfmh2rpbs7a7byg3k7d77hpn";
   };
 
   buildInputs = [ makeWrapper ];

From 7131749bee3742b18b0000554676bb3d760976ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@aon.at>
Date: Wed, 17 Oct 2018 01:18:46 +0200
Subject: [PATCH 3181/3253] pythonPackages.cligj: 0.4.0 -> 0.5.0 (#48584)

---
 pkgs/development/python-modules/cligj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix
index c47a15d64bbc..0ec82efed8b2 100644
--- a/pkgs/development/python-modules/cligj/default.nix
+++ b/pkgs/development/python-modules/cligj/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "cligj";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "cligj";
     rev = version;
-    sha256 = "0fclxagxv23v75yiypb29a8sja23dakhvmx3blmxyhg2sci92sx8";
+    sha256 = "13vlibbn86dhh6iy8k831vsa249746jnk419wcr9vvr3pqxml6g2";
   };
 
   propagatedBuildInputs = [

From 0c8cdb53f62a3997ab5471b0d32a85dac9231009 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 16 Oct 2018 23:21:29 +0000
Subject: [PATCH 3182/3253] chromium: fix aarch64 build (#48586)

* chromium: fix aarch64 build

* chromium: use more stable urls
---
 .../networking/browsers/chromium/common.nix   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6b9f7225c84f..acd3493fe7c8 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -140,8 +140,26 @@ let
       ./patches/fix-freetype.patch
       ./patches/nix_plugin_paths_68.patch
       ./patches/remove-webp-include-69.patch
-    ] ++ optional enableWideVine ./patches/widevine.patch;
-
+    ] ++ optional enableWideVine ./patches/widevine.patch
+      ++ optional ((versionRange "69" "70") && stdenv.isAarch64)
+           (fetchpatch {
+              url    = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch;
+              sha256 = "0f37rsjx7jcvdngkj8y6600091nwgn4jci0ny7bxlapq0zx2a4x7";
+            })
+      ++ optional stdenv.isAarch64
+           (if (versionOlder version "71") then
+              fetchpatch {
+                url       = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
+                sha256    = "0dkchqair8cy2f5a5p5vi24r9b4d28pgn2bfvm1568lypbjw6iab";
+              }
+            else
+              fetchpatch {
+                url       = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
+                postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
+                sha256    = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
+              }
+            );
+            
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
       substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \

From d8410167d1a5c3f84a4bf88995528a3e788db9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Tue, 16 Oct 2018 18:31:14 -0500
Subject: [PATCH 3183/3253] linux_testing_bcachefs: 4.18.2018.09.21 ->
 4.18.2018.10.12

---
 pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
index f58ab5c95cc4..b4df3b7b33e8 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, fetchgit, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.18.2018.09.21";
+  version = "4.18.2018.10.12";
   modDirVersion = "4.18.0";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs.git";
-    rev = "2fe17e38d355271a8212a8123a9281e2f9df811f";
-    sha256 = "1p35qf7fdwpr8sz4alblmbq6rmhd87rwrrwk6xpgxsfkkhmf36d6";
+    rev = "d7f6da1d60ec24266301231538ff6f09716537ed";
+    sha256 = "05d7dh41nc35www8vmrn47wlf2mr2b8i4rm15vq3zgm32d0xv3lk";
   };
 
   extraConfig = "BCACHEFS_FS m";

From 0c4a7a86fd26a45c44c258181f7e2d977071b95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=A0=E5=B2=90=E5=A5=88?= <okinan@chiru.no>
Date: Tue, 16 Oct 2018 18:31:53 -0500
Subject: [PATCH 3184/3253] bcachefs-tools: 2018-08-22 -> 2018-10-12

---
 pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix
index ee1ee2e61789..75737e2da7fc 100644
--- a/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -2,12 +2,12 @@
 , liburcu, zlib, libaio, zstd, lz4 }:
 
 stdenv.mkDerivation rec {
-  name = "bcachefs-tools-unstable-2018-08-22";
+  name = "bcachefs-tools-unstable-2018-10-12";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "ebf97e8e01a8e76ff4bec23f29106430852c3081";
-    sha256 = "0f2ycin0gmi1a4fm7qln0c10zn451gljfbc2piy1fm768xqqrmld";
+    rev = "55fbb25501330038e1714905b9ddeb25d875c11c";
+    sha256 = "0cwzbyf133jc0fkc8nmjcvv3wmglqhyxda1hh10hgxrbq5vm39wx";
   };
 
   enableParallelBuilding = true;

From 76db7492db2465f4bd63bfedf6f34d27b26b4b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 Oct 2018 00:47:02 +0100
Subject: [PATCH 3185/3253] python3.pkgs.pyls: 0.2.1 -> 0.3.0

---
 pkgs/development/python-modules/pyls-black/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix
index 60f6af287652..10c34dd8353c 100644
--- a/pkgs/development/python-modules/pyls-black/default.nix
+++ b/pkgs/development/python-modules/pyls-black/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "pyls-black";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "rupert";
     repo = "pyls-black";
     rev = "v${version}";
-    sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8";
+    sha256 = "1pagbafb9r9glzy7nbvrq19msjy4wqahrvmc0wll0a0r4msqpi1d";
   };
 
   disabled = !isPy3k;
@@ -19,9 +19,6 @@ buildPythonPackage rec {
     pytest
   '';
 
-  # Enable when https://github.com/rupert/pyls-black/pull/6 is merged.
-  doCheck = false;
-
   checkInputs = [ pytest ];
 
   propagatedBuildInputs = [ black toml python-language-server ];

From 8f64cedf17c320150dabe92813d5016281fab7ae Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 17 Oct 2018 00:12:40 -0400
Subject: [PATCH 3186/3253] nextpnr: 2018.08.09 -> 2018.10.17

---
 pkgs/development/compilers/nextpnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index 5ec3b5f59d88..d6dd0601e624 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -7,13 +7,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nextpnr-${version}";
-  version = "2018.08.09";
+  version = "2018.10.17";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "nextpnr";
-    rev    = "2e02f2d6166c75b1fcec73d268e97e407071a372";
-    sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr";
+    rev    = "529a595157a2eef24f8529b0de0c504a40ed503b";
+    sha256 = "06yp89rpvb2s4zc1qkbcp76kqwkk9s8j2ckblqw547dy5ah2cl7h";
   };
 
   nativeBuildInputs = [ cmake ];

From 95e3b53b064c13409ec1e6cfcae3b1b3a1be9d24 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 17 Oct 2018 00:13:05 -0400
Subject: [PATCH 3187/3253] yosys: 2018.09.30 -> 2018.10.17

---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 314fbf354e19..275a25c84959 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.09.30";
+  version = "2018.10.17";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "4d2917447cc14c590b4fee5ba36948fb4ee6884b";
-      sha256 = "0b9mmzq2jhx8x8b58nk97fzh70nbhlc3lcfln5facxddv4mp2gl1";
+      rev    = "yosys-0.8";
+      sha256 = "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv";
       name   = "yosys";
     })
 

From 1ba50fe163b03b4e1083c8baaa112c827f5197ab Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Sun, 14 Oct 2018 10:36:50 -0400
Subject: [PATCH 3188/3253] pythonPackages.gidgethub: init at 2.5.0

---
 .../python-modules/gidgethub/default.nix      | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/gidgethub/default.nix

diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix
new file mode 100644
index 000000000000..2a06ae1cb6df
--- /dev/null
+++ b/pkgs/development/python-modules/gidgethub/default.nix
@@ -0,0 +1,40 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, setuptools
+, pytestrunner
+, pytest
+, pytest-asyncio
+, twisted
+, treq
+, tornado
+, aiohttp
+, uritemplate
+}:
+
+buildPythonPackage rec {
+  pname = "gidgethub";
+  version = "2.5.0";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d37fdfd149bc0efa21d3899c737d9b5c7ff6348a9b3f03bf3aa0e9f8ca345483";
+  };
+
+  buildInputs = [ setuptools pytestrunner ];
+  checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ];
+  propagatedBuildInputs = [ uritemplate ];
+
+  # requires network (reqests github.com)
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "An async GitHub API library";
+    homepage = https://github.com/brettcannon/gidgethub;
+    license = licenses.asl20;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2c0c7c1b27a..981b3146a078 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -340,6 +340,8 @@ in {
 
   genanki = callPackage ../development/python-modules/genanki { };
 
+  gidgethub = callPackage ../development/python-modules/gidgethub { };
+
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };

From ef927360e3c71418f833e1b7cb5a73e42973050e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 17 Oct 2018 14:53:39 +0800
Subject: [PATCH 3189/3253] unifiStable: 5.8.30 -> 5.9.29

---
 pkgs/servers/unifi/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index ae7dd9805776..fd1787d4c99d 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,13 +49,9 @@ in rec {
   };
 
   unifiStable = generic {
-    version = "5.8.30";
-    sha256  = "051cx1y51xmhvd3s8zbmknrcjdi46mj4yf1rlnngzr77rj77sqvi";
-  };
-
-  unifiTesting = generic {
     version = "5.9.29";
-    suffix  = "-04b5d20997";
     sha256  = "0djdjh7lwaa5nvhvz2yh6dn07iad5nq4jpab7rc909sljl6wvwvx";
   };
+
+  unifiTesting = unifiStable;
 }

From 3055a0c9755c89616257c5d8318a32dc42b01341 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 12 Oct 2018 13:39:26 -0400
Subject: [PATCH 3190/3253] lirc: add support for Python bindings

---
 pkgs/development/libraries/lirc/default.nix | 20 +++++++++++++-------
 pkgs/top-level/python-packages.nix          |  4 ++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index ad6d2df1d8bd..13fbe2b55b67 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
-, libxslt, systemd, libusb, libftdi1 }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
+  alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
 
 stdenv.mkDerivation rec {
   name = "lirc-0.10.1";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
   };
 
+  # Fix installation of Python bindings
+  patches = [ (fetchpatch {
+    url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
+    sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
+  }) ];
+
   postPatch = ''
     patchShebangs .
 
@@ -24,17 +30,17 @@ stdenv.mkDerivation rec {
     touch lib/lirc/input_map.inc
   '';
 
-  nativeBuildInputs = [ pkgconfig help2man ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig help2man
+    (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
 
-  buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]
-  ++ (with python3.pkgs; [ python pyyaml setuptools ]);
+  buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
 
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
-    "--enable-uinput" # explicite activation because build env has no uinput
-    "--enable-devinput" # explicite activation because build env has not /dev/input
+    "--enable-uinput" # explicit activation because build env has no uinput
+    "--enable-devinput" # explicit activation because build env has no /dev/input
   ];
 
   installFlags = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 981b3146a078..f5b747b165c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2929,6 +2929,10 @@ in {
     };
   };
 
+  lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override {
+    python3 = python;
+  }));
+
   jupyter = buildPythonPackage rec {
     version = "1.0.0";
     name = "jupyter-${version}";

From 725fcdef3f675e96e591377ff9776c72edb13c60 Mon Sep 17 00:00:00 2001
From: clefru <clemens@endorphin.org>
Date: Wed, 17 Oct 2018 09:18:52 +0200
Subject: [PATCH 3191/3253] Fix hostapd's place in systemd dependency tree.
 (#45464)

* nat/bind/dhcp.service:
  Remove. Those services have nothing to do with a link-level service.

* sys-subsystem-net-devices-${if}.device:
  Add as BindsTo dependency as this will make hostapd stop when the
  device is unplugged.

* network-link-${if}.service:
  Add hostapd as dependency for this service via requiredBy clause,
  so that the network link is only considered to be established
  only after hostapd has started.

* network.target:
  Remove this from wantedBy clause as this is already implied from
  dependencies stacked above hostapd. And if it's not implied than
  starting hostapd is not required for this particular network
  configuration.
---
 nixos/modules/services/networking/hostapd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 3af0441a89d8..9f74e4963296 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -157,9 +157,9 @@ in
       { description = "hostapd wireless AP";
 
         path = [ pkgs.hostapd ];
-        wantedBy = [ "network.target" ];
-
-        after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
+        after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+        bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
+        requiredBy = [ "network-link-${cfg.interface}.service" ];
 
         serviceConfig =
           { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";

From 0800c3a72208eaf9d2087c72746da46b69b10483 Mon Sep 17 00:00:00 2001
From: "Christoph Neidahl (OPNA2608)" <christoph.neidahl@uni-leipzig.de>
Date: Wed, 17 Oct 2018 10:09:16 +0200
Subject: [PATCH 3192/3253] x11vnc: don't build broken Xdummy script

patching the currently broken Xdummy script out of the Makefile.am, else it gets put into bin.
this is not a regression of functionality, as it doesn't appear to be put into bin in the upstream version either.
---
 pkgs/tools/X11/x11vnc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 51307f0df09f..9e38a2bc888e 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
     sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
+    sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am
   '';
 
   meta = with stdenv.lib; {

From 17f1eebb5be05c96d56754a585b4672015abb706 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 2 Oct 2018 19:52:27 +0300
Subject: [PATCH 3193/3253] pythonPackages.pvlib: 0.5.2 -> 0.6.0

---
 pkgs/development/python-modules/pvlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index 296b20fac4a2..34134546f56d 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi";
+    sha256 = "1j2p6w41hv7k604jbcpxvs5f04y8dsfdvd3d202l60ks0fc0agyj";
   };
 
   checkInputs = [ pytest ];

From 4051fc901b52c233b7fa3f4ee2ac390ed3406583 Mon Sep 17 00:00:00 2001
From: Anatolii Prylutskyi <anpryl@gmail.com>
Date: Wed, 17 Oct 2018 08:08:44 +0300
Subject: [PATCH 3194/3253] rambox: fix invalid sha256

---
 pkgs/applications/networking/instant-messengers/rambox/bare.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
index 2a80349c4e62..e08fdad50fb4 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     inherit src;
 
     nodejs = nodejs-8_x;
-    sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
+    sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
   };
 
   patches = [ ./isDev.patch ];

From 695156e1f5f4cbb0b4fe356c8d1a8bf2796c0681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 17 Oct 2018 15:08:52 +0200
Subject: [PATCH 3195/3253] pdfpc: 4.1.2 -> 4.2.1

---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index e61613a4b305..adfd9fa7eac4 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.1.2";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli";
+    sha256 = "1rmsrpf5vlqhnyyrhq8apndny88ld2qvfjx6258653pqbimv7mx5";
   };
 
   nativeBuildInputs = [

From 4035086bafadaa92d7993c27b9a63124f024d0fc Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 17 Oct 2018 14:28:29 +0000
Subject: [PATCH 3196/3253] oraclejdk8: 8u181 -> 8u191 (#48624)

---
 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix | 10 +++++-----
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 55faf277b159..48304b6af264 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "181";
+  patchVersion = "191";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
-  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
-  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
-  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+  sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+  sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+  sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+  sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 55faf277b159..48304b6af264 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "181";
+  patchVersion = "191";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
-  sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
-  sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
-  sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+  sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+  sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+  sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+  sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 54de840aaf156169bf8e3bf15e4968a12b78a8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 17 Oct 2018 11:29:49 -0300
Subject: [PATCH 3197/3253] theme-obsidian2: 2.6 -> 2.7 (#48601)

---
 pkgs/misc/themes/obsidian2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 61f7d1debcc0..571639a99014 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-obsidian2-${version}";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-obsidian-2";
     rev = "v${version}";
-    sha256 = "1bb629y11j79h0rxi36iszki6m6l59iwlcraygr472gf44a2xp11";
+    sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 6ed5b4624dd660a7af8137273c8b1818f70a30ca Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 17 Oct 2018 10:50:43 +0200
Subject: [PATCH 3198/3253] grafana: 5.2.4 -> 5.3.1

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index e795d74fe989..b3a31d2d1ba1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.2.4";
+  version = "5.3.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "15w935i22ddx6ff32ynypjh3q670vnrj74qw0vdkxdmrlwk3q7wc";
+    sha256 = "0k4jsqgk0wbp1xc159vrs855d42kcdc4d38v498imp6a90idniyp";
   };
 
   srcStatic = fetchurl {
     url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "187dqjahz1z1gkcx9pxnf2hri6g3b5j3ppadwfahz0rwsqj4v2lf";
+    sha256 = "133ckn5f4l6vqy65y1z3mzhzhy8xcyq65nqb34mwn2zsi7pzvssz";
   };
 
   postPatch = ''

From d447f01ec6f9c69b0387f1a53c5f7bc3ca050995 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 17 Oct 2018 09:49:39 -0500
Subject: [PATCH 3199/3253] gpa: 0.9.10 -> 0.10.0 (#48620)

https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000430.html
---
 pkgs/applications/misc/gpa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 149092c70d38..a48890144127 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
 
 stdenv.mkDerivation rec {
-  name = "gpa-0.9.10";
+  name = "gpa-0.10.0";
 
   src = fetchurl {
     url = "mirror://gnupg/gpa/${name}.tar.bz2";
-    sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3";
+    sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm";
   };
 
   nativeBuildInputs = [ intltool pkgconfig ];

From d3657f676638ef8e8e024998b26a7d46e922d481 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 17 Oct 2018 00:45:25 +0200
Subject: [PATCH 3200/3253] speedtest-cli: move ot python-modules

---
 .../python-modules/speedtest-cli/default.nix  | 26 +++++++++++++++++++
 .../networking/speedtest-cli/default.nix      | 21 ---------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 ++
 4 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/speedtest-cli/default.nix
 delete mode 100644 pkgs/tools/networking/speedtest-cli/default.nix

diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
new file mode 100644
index 000000000000..f2c38a3414ba
--- /dev/null
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+# cannot be built as pythonApplication because the library functions are
+# required for home-assistant
+buildPythonPackage rec {
+  pname = "speedtest-cli";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2f3d5aa1086d9b367c03b99db6e3207525af174772d877c6b982289b8d2bdefe";
+  };
+
+  # tests require working internet connection
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Command line interface for testing internet bandwidth using speedtest.net";
+    homepage = https://github.com/sivel/speedtest-cli;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ makefu domenkozar ndowens ];
+  };
+}
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
deleted file mode 100644
index eedea841356d..000000000000
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
-
-python3Packages.buildPythonApplication rec {
-  name = "speedtest-cli-${version}";
-  version = "2.0.2";
-
-  src = fetchFromGitHub {
-    owner = "sivel";
-    repo = "speedtest-cli";
-    rev = "v${version}";
-    sha256 = "0vv2z37g2kgm2dzkfa4bhri92hs0d1acxi8z66gznsl5148q7sdi";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/sivel/speedtest-cli;
-    description = "Command line interface for testing internet bandwidth using speedtest.net";
-    platforms = platforms.all;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ domenkozar ndowens ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c118561c8b7..bd1f0fbd2e83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8784,7 +8784,7 @@ with pkgs;
 
   sparse = callPackage ../development/tools/analysis/sparse { };
 
-  speedtest-cli = callPackage ../tools/networking/speedtest-cli { };
+  speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
 
   spin = callPackage ../development/tools/analysis/spin { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ee1bee109a3f..4087b58bd487 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15458,6 +15458,8 @@ EOF
     };
   };
 
+  speedtest-cli = callPackage ../development/python-modules/speedtest-cli { };
+
   pushbullet = callPackage ../development/python-modules/pushbullet { };
 
   power = buildPythonPackage rec {

From f0c643a99e8813df39bcff497ccf29361a26fe88 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 17 Oct 2018 00:51:39 +0200
Subject: [PATCH 3201/3253] home-assistant: add speedtest-cli to
 component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index a67de2dab1aa..c1b35946d684 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -998,7 +998,7 @@
     "sensor.sochain" = ps: with ps; [  ];
     "sensor.socialblade" = ps: with ps; [  ];
     "sensor.sonarr" = ps: with ps; [  ];
-    "sensor.speedtest" = ps: with ps; [  ];
+    "sensor.speedtest" = ps: with ps; [ speedtest-cli ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
     "sensor.startca" = ps: with ps; [ xmltodict ];

From 7026831c7ac5790ab61cd60a1228c1b07b001178 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 17 Oct 2018 14:33:07 +0100
Subject: [PATCH 3202/3253] bundler: 1.16.3 -> 1.16.6

---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 7f89d1ffa87c..65cde9815029 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.16.3";
-  source.sha256 = "0spddjiq6yscl4sywwcj5zrjk3lq02zacigrz2fh78yfdzyi34fq";
+  version = "1.16.4";
+  source.sha256 = "15zrxqv817w4vawc23lx3miigir36ba59wkykkr6l1nkf0iy013d";
   dontPatchShebangs = true;
 
   postFixup = ''

From 5ef745b98379fc05fba250fa2c865d41ed66eac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 17 Oct 2018 17:47:35 +0200
Subject: [PATCH 3203/3253] esptool: 2.5.0 -> 2.5.1

---
 pkgs/tools/misc/esptool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
index abb0b4edc17e..fe574b4f8d43 100644
--- a/pkgs/tools/misc/esptool/default.nix
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -2,13 +2,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "esptool";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     rev = "v${version}";
-    sha256 = "0cvxapcln1xcz8hy0hidw6g8q61s5j3q03j3wrviagbh0zip8jdx";
+    sha256 = "19l3b1fqg1n3ch484dcibbi5a3nbmjq086has5pwqn348h4k57mh";
   };
 
   checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ];

From 280b1171c11eabdddb5b34ecef3f6d7b1147463d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 17 Oct 2018 17:49:33 +0200
Subject: [PATCH 3204/3253] seafile-shared: 6.2.4 -> 6.2.5

---
 pkgs/misc/seafile-shared/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 6fba977e0085..bccc55914fea 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}:
 
 stdenv.mkDerivation rec {
-  version = "6.2.4";
+  version = "6.2.5";
   name = "seafile-shared-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "0v6wvw8x3zfcapi0lk71mg89gy3gw2qmdiq6mhw6qbbrzvqprlmr";
+    sha256 = "1s8cqh5wfll81d060f4zknxhmwwqckci6dadmslbvbvx55lgyspa";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ];

From d37bb7302fad56bf01bb3cf06436c9558119e08c Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 16 Oct 2018 16:44:02 +0200
Subject: [PATCH 3205/3253] openafs_1_8: 1.8.0 -> 1.8.2

This release adds support for ARM64.
---
 pkgs/servers/openafs/1.8/cross-build.patch | 223 +++++++++++++++++++++
 pkgs/servers/openafs/1.8/default.nix       |  12 +-
 pkgs/servers/openafs/1.8/module.nix        |   4 +-
 pkgs/servers/openafs/1.8/srcs.nix          |   6 +-
 4 files changed, 235 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/servers/openafs/1.8/cross-build.patch

diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/servers/openafs/1.8/cross-build.patch
new file mode 100644
index 000000000000..2b4fd58b23a4
--- /dev/null
+++ b/pkgs/servers/openafs/1.8/cross-build.patch
@@ -0,0 +1,223 @@
+diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac
+--- openafs-1.8.2/configure.ac	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/configure.ac	2018-10-16 15:56:36.512277860 +0200
+@@ -23,6 +23,7 @@
+ 
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
++AX_PROG_CC_FOR_BUILD
+ 
+ AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
+ AC_SUBST([PATH_CPP])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4
+--- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4	1970-01-01 01:00:00.000000000 +0100
++++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4	2018-10-16 16:20:40.278641658 +0200
+@@ -0,0 +1,125 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PROG_CC_FOR_BUILD
++#
++# DESCRIPTION
++#
++#   This macro searches for a C compiler that generates native executables,
++#   that is a C compiler that surely is not a cross-compiler. This can be
++#   useful if you have to generate source code at compile-time like for
++#   example GCC does.
++#
++#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
++#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
++#   The value of these variables can be overridden by the user by specifying
++#   a compiler with an environment variable (like you do for standard CC).
++#
++#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
++#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
++#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
++#   substituted in the Makefile.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 9
++
++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_CPP])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++dnl Use the standard macros, but make them use other variable names
++dnl
++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
++pushdef([ac_cv_objext], ac_cv_build_objext)dnl
++pushdef([ac_exeext], ac_build_exeext)dnl
++pushdef([ac_objext], ac_build_objext)dnl
++pushdef([CC], CC_FOR_BUILD)dnl
++pushdef([CPP], CPP_FOR_BUILD)dnl
++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
++pushdef([host], build)dnl
++pushdef([host_alias], build_alias)dnl
++pushdef([host_cpu], build_cpu)dnl
++pushdef([host_vendor], build_vendor)dnl
++pushdef([host_os], build_os)dnl
++pushdef([ac_cv_host], ac_cv_build)dnl
++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
++pushdef([ac_cv_host_os], ac_cv_build_os)dnl
++pushdef([ac_cpp], ac_build_cpp)dnl
++pushdef([ac_compile], ac_build_compile)dnl
++pushdef([ac_link], ac_build_link)dnl
++
++save_cross_compiling=$cross_compiling
++save_ac_tool_prefix=$ac_tool_prefix
++cross_compiling=no
++ac_tool_prefix=
++
++AC_PROG_CC
++AC_PROG_CPP
++AC_EXEEXT
++
++ac_tool_prefix=$save_ac_tool_prefix
++cross_compiling=$save_cross_compiling
++
++dnl Restore the old definitions
++dnl
++popdef([ac_link])dnl
++popdef([ac_compile])dnl
++popdef([ac_cpp])dnl
++popdef([ac_cv_host_os])dnl
++popdef([ac_cv_host_vendor])dnl
++popdef([ac_cv_host_cpu])dnl
++popdef([ac_cv_host_alias])dnl
++popdef([ac_cv_host])dnl
++popdef([host_os])dnl
++popdef([host_vendor])dnl
++popdef([host_cpu])dnl
++popdef([host_alias])dnl
++popdef([host])dnl
++popdef([LDFLAGS])dnl
++popdef([CPPFLAGS])dnl
++popdef([CFLAGS])dnl
++popdef([CPP])dnl
++popdef([CC])dnl
++popdef([ac_objext])dnl
++popdef([ac_exeext])dnl
++popdef([ac_cv_objext])dnl
++popdef([ac_cv_exeext])dnl
++popdef([ac_cv_prog_cc_g])dnl
++popdef([ac_cv_prog_cc_cross])dnl
++popdef([ac_cv_prog_cc_works])dnl
++popdef([ac_cv_prog_gcc])dnl
++popdef([ac_cv_prog_CPP])dnl
++
++dnl Finally, set Makefile variables
++dnl
++BUILD_EXEEXT=$ac_build_exeext
++BUILD_OBJEXT=$ac_build_objext
++AC_SUBST(BUILD_EXEEXT)dnl
++AC_SUBST(BUILD_OBJEXT)dnl
++AC_SUBST([CFLAGS_FOR_BUILD])dnl
++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
++AC_SUBST([LDFLAGS_FOR_BUILD])dnl
++])
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in
+--- openafs-1.8.2/src/comerr/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/comerr/Makefile.in	2018-10-16 15:48:19.678898925 +0200
+@@ -38,11 +38,14 @@
+ compile_et:	compile_et.o error_table.o
+ 	$(Q)case $(SYS_NAME) in \
+ 	*_linux* | *_umlinux* | *_darwin* ) \
+-	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
++	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
+ 	* ) \
+-	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \
++	$(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \
+ 	esac
+ 
++compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD)
++compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD)
++
+ libafscom_err.a: $(LT_objs)
+ 	$(LT_LDLIB_lwp) $(LT_objs)
+ 
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in
+--- openafs-1.8.2/src/config/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/config/Makefile.in	2018-10-16 15:48:19.677898926 +0200
+@@ -54,6 +54,8 @@
+ 
+ config.o: config.c AFS_component_version_number.c
+ 
++config mkvers config.o mc.o: CC=$(CC_FOR_BUILD)
++
+ #
+ # Include installation targets
+ #
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in
+--- openafs-1.8.2/src/opr/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/opr/Makefile.in	2018-10-16 15:48:19.678898925 +0200
+@@ -21,7 +21,7 @@
+ 	  $(TOP_INCDIR)/opr/time.h \
+ 	  $(TOP_INCDIR)/opr/uuid.h
+ 
+-all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
++all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a
+ 
+ liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps)
+ 	$(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+@@ -29,12 +29,26 @@
+ libopr.a: $(LT_objs)
+ 	$(LT_LDLIB_static) $(LT_objs)
+ 
++LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs))
++
++%_build.lo: %.c
++	$(LT_CCRULE) $<
++
++libopr_build.a: $(LT_objs_build)
++	$(LT_LDLIB_static) $(LT_objs_build)
++
++libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD)
++libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD)
++
+ libopr_pic.la: $(LT_objs)
+ 	$(LT_LDLIB_pic) $(LT_objs)
+ 
+ $(TOP_LIBDIR)/libopr.a: libopr.a
+ 	$(INSTALL_DATA) libopr.a $@
+ 
++$(TOP_LIBDIR)/libopr_build.a: libopr_build.a
++	$(INSTALL_DATA) libopr_build.a $@
++
+ $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la
+ 	$(INSTALL_DATA) .libs/libopr_pic.a $@
+ 
+diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in
+--- openafs-1.8.2/src/rxgen/Makefile.in	2018-09-11 17:52:48.000000000 +0200
++++ openafs-1.8.2.new/src/rxgen/Makefile.in	2018-10-16 15:48:19.677898926 +0200
+@@ -25,6 +25,8 @@
+ 
+ CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\""
+ 
++rxgen $(OBJS): CC=$(CC_FOR_BUILD)
++
+ #
+ # Install targets
+ #
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index fc6b1bc2426b..c77bef6ad24e 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, which, autoconf, automake, flex, yacc
-, glibc, perl, kerberos, libxslt, docbook_xsl, docbook_xml_dtd_43
-, libtool_2, removeReferencesTo
+{ stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
+, yacc , glibc, perl, kerberos, libxslt, docbook_xsl
+, docbook_xml_dtd_43 , libtool_2, removeReferencesTo
 , ncurses # Extra ncurses utilities. Only needed for debugging.
 , tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
 }:
@@ -11,12 +11,13 @@ stdenv.mkDerivation rec {
   name = "openafs-${version}";
   inherit version srcs;
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
     removeReferencesTo which yacc ];
 
   buildInputs = [ kerberos ncurses ];
 
-  patches = [ ./bosserver.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
+  patches = [ ./bosserver.patch ./cross-build.patch ] ++ stdenv.lib.optional (tsmbac != null) ./tsmbac.patch;
 
   outputs = [ "out" "dev" "man" "doc" "server" ];
 
@@ -27,6 +28,9 @@ stdenv.mkDerivation rec {
   # Makefiles don't include install targets for all new shared libs, yet.
   dontDisableStatic = true;
 
+  # Fixes broken format string in 1.8.2
+  hardeningDisable=[ "format" ];
+
   preConfigure = ''
     patchShebangs .
     for i in `grep -l -R '/usr/\(include\|src\)' .`; do
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 7167cf5dec49..958fcd578c2b 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -54,9 +54,7 @@ in stdenv.mkDerivation rec {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z maintainers.spacefrogg ];
-    broken = (versionOlder kernel.version "3.18") ||
-             (versionAtLeast kernel.version "4.18") ||
-             stdenv.targetPlatform.isAarch64;
+    broken = versionOlder kernel.version "3.18";
   };
 
 }
diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix
index e51504528999..ffdbe47220d7 100644
--- a/pkgs/servers/openafs/1.8/srcs.nix
+++ b/pkgs/servers/openafs/1.8/srcs.nix
@@ -1,14 +1,14 @@
 { fetchurl }:
 rec {
-  version = "1.8.0";
+  version = "1.8.2";
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d";
+    sha256 = "13hksffp7k5f89c9lc5g5b1q0pc9h7wyarq3sjyjqam7c513xz95";
   };
 
   srcs = [ src
     (fetchurl {
       url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
-      sha256 = "e26f3bb399f524b4978543eb3ec169fd58f2d409cf4bc22c75c65fb9b09f12e8";
+      sha256 = "09n8nymrhpyb0fhahpln2spzhy9pn48hvry35ccqif2jd4wsxdmr";
     })];
 }

From f8b5b5dcb758f307e4de9c93ddf53877b98a0fd5 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 16 Oct 2018 16:45:21 +0200
Subject: [PATCH 3206/3253] openafs: 1.6.22.2 -> 1.6.23

Add support for 4.18 kernels.
---
 pkgs/servers/openafs/1.6/module.nix | 4 ++--
 pkgs/servers/openafs/1.6/srcs.nix   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix
index f5b735158e9c..c133161cf576 100644
--- a/pkgs/servers/openafs/1.6/module.nix
+++ b/pkgs/servers/openafs/1.6/module.nix
@@ -51,8 +51,8 @@ in stdenv.mkDerivation rec {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [ maintainers.z77z maintainers.spacefrogg ];
-    broken = versionOlder kernel.version "3.18" ||
-             versionAtLeast kernel.version "4.18";
+    broken = versionOlder kernel.version "3.18"
+             || stdenv.targetPlatform.isAarch64;
   };
 
 }
diff --git a/pkgs/servers/openafs/1.6/srcs.nix b/pkgs/servers/openafs/1.6/srcs.nix
index 9e9ff623e5cd..17048b68024e 100644
--- a/pkgs/servers/openafs/1.6/srcs.nix
+++ b/pkgs/servers/openafs/1.6/srcs.nix
@@ -1,14 +1,14 @@
 { fetchurl }:
 rec {
-  version = "1.6.22.2";
+  version = "1.6.23";
   src = fetchurl {
     url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
-    sha256 = "15j17igignsfzv5jb47ryczsrz3zsmiqwnj38dx9gzz95807rkyf";
+    sha256 = "1gy7a0jhagxif8av540xb1aa6cl7id08nsgjbgady54bnmb0viga";
   };
 
   srcs = [ src
     (fetchurl {
       url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
-      sha256 = "1lpydca95nx5pmqvplb9n3akmxbzvhhypswh0s589ywxpv3zynxm";
+      sha256 = "18my71s9mddy0k835852ksjzkza7xs73kyxavmdqflh5vkywb6y0";
     })];
 }

From dc427b0ff06a52b65979be536bb20a5edaaa3686 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 17 Oct 2018 21:55:05 +0800
Subject: [PATCH 3207/3253] pulseaudio-modules-bt: unstable-2018-09-11 ->
 unstable-2018-10-16

---
 .../audio/pulseaudio-modules-bt/default.nix   | 35 ++++++++++++++-----
 .../fix-install-path.patch                    | 11 ++++++
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index e3d07fcc2457..6bb432b3fd88 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -4,11 +4,14 @@
 , libpulseaudio
 , pulseaudio
 , pkgconfig
+, ffmpeg_4
+, patchelf
 , libtool
 , cmake
 , bluez
 , dbus
 , sbc
+, lib
 }:
 
 let
@@ -20,37 +23,53 @@ let
 
 in stdenv.mkDerivation rec {
   name = "pulseaudio-modules-bt-${version}";
-  version = "unstable-2018-09-11";
+  version = "unstable-2018-10-16";
 
   src = fetchFromGitHub {
     owner = "EHfive";
     repo = "pulseaudio-modules-bt";
-    rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc";
-    sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h";
+    rev = "552c2b48c0cc7dd44d0746b261f7c7d5559e8e30";
+    sha256 = "052jb1hjx1in7bafx4zpn78s7r6f2y7djriwi36dzqy9wmalmyjy";
     fetchSubmodules = true;
   };
 
+  patches = [
+    ./fix-install-path.patch
+  ];
+
   nativeBuildInputs = [
     pkgconfig
+    patchelf
     cmake
   ];
 
   buildInputs = [
     libpulseaudio
     pulseaudio
+    ffmpeg_4
     libtool
     bluez
     dbus
     sbc
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-L${pulseaudio}/lib/pulseaudio"
-  ];
-
-  prePatch = ''
+  postPatch = ''
+    # Upstream bundles pulseaudio as a submodule
     rm -r pa
     ln -s ${pulseSources} pa
+
+    # Pulseaudio version is detected with a -rebootstrapped suffix which build system assumptions
+    substituteInPlace config.h.in --replace PulseAudio_VERSION ${pulseaudio.version}
+    substituteInPlace CMakeLists.txt --replace '${"\${PulseAudio_VERSION}"}' ${pulseaudio.version}
+  '';
+
+  postFixup = ''
+    for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
+      orig_rpath=$(patchelf --print-rpath "$so")
+      patchelf \
+        --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \
+        "$so"
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
new file mode 100644
index 000000000000..2b4ff86ab71b
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch
@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f5baa0..1f35cce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,5 +121,4 @@ INSTALL(TARGETS
+         module-bluez5-device
+         module-bluetooth-discover
+         module-bluetooth-policy
+-        LIBRARY DESTINATION ${PulseAudio_modlibexecdir})
+-
++        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/)

From 1ee5cbe9d435af9e179a2fb6ed286c60d26a2054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 17 Oct 2018 17:56:57 +0200
Subject: [PATCH 3208/3253] abcm2ps: 8.13.24 -> 8.14.0

---
 pkgs/tools/audio/abcm2ps/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 023d03f0414d..5d3050108b8a 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, pkgconfig, which, freetype, pango }:
+{ stdenv, fetchFromGitHub, pkgconfig, which, docutils, freetype, pango }:
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.24";
+  version = "8.14.0";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0xb0gdxbagy6bzrh61s667svab43r06d6yi20gw52dh022mj99ag";
+    sha256 = "1nlvq2cfdy5pghll3aprws7yx5p14gcrhz10q9fa6myrd8ad4if1";
   };
 
   prePatch = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cc}/bin/cc"
   ];
 
-  nativeBuildInputs = [ which pkgconfig ];
+  nativeBuildInputs = [ which pkgconfig docutils ];
 
   buildInputs = [ freetype pango ];
 

From 8929e036ce2d683f17a27474685a10b13c18f72f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 17 Oct 2018 18:00:51 +0200
Subject: [PATCH 3209/3253] monero: 0.13.0.2 -> 0.13.0.3

---
 pkgs/applications/altcoins/monero/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 2b396c4b938d..e344f4d94bab 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -11,12 +11,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.13.0.2";
+  version = "0.13.0.3";
 
   src = fetchgit {
     url    = "https://github.com/monero-project/monero.git";
     rev    = "v${version}";
-    sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5";
+    sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git ];

From e57438faf030f139bc73e79e28cefa668c2a2edb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 17 Oct 2018 18:02:11 +0200
Subject: [PATCH 3210/3253] monero-gui: 0.13.0.2 -> 0.13.0.3

---
 pkgs/applications/altcoins/monero-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
index c26df670930b..46e317a3b12a 100644
--- a/pkgs/applications/altcoins/monero-gui/default.nix
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "monero-gui-${version}";
-  version = "0.13.0.2";
+  version = "0.13.0.3";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68";
+    sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];

From 6963bc351194ca902577955b9b02eff1482df02f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 17 Oct 2018 18:34:15 +0200
Subject: [PATCH 3211/3253] bs1770gain: 0.4.12 -> 0.5.0 (#48628)

---
 pkgs/applications/audio/bs1770gain/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 2401a6101566..edf7a313ff5f 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bs1770gain-${version}";
-  version = "0.4.12";
+  version = "0.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
-    sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a";
+    sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii";
   };
 
   buildInputs = [ ffmpeg sox ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd8ee2b2a55d..b8b09186acc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15826,9 +15826,7 @@ with pkgs;
 
   bristol = callPackage ../applications/audio/bristol { };
 
-  bs1770gain = callPackage ../applications/audio/bs1770gain {
-    ffmpeg = ffmpeg_2;
-  };
+  bs1770gain = callPackage ../applications/audio/bs1770gain { };
 
   bspwm = callPackage ../applications/window-managers/bspwm { };
 

From 5179813d98baad08db90e8987107309c654c1848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 17 Oct 2018 13:52:56 -0300
Subject: [PATCH 3212/3253] deepin-desktop-base: init at 2018.7.23 (#48552)

---
 .../deepin/deepin-desktop-base/default.nix    | 45 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-desktop-base/default.nix

diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
new file mode 100644
index 000000000000..5b96e335c67e
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, deepin-wallpapers }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-desktop-base";
+  version = "2018.7.23";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc";
+  };
+
+  buildInputs = [ deepin-wallpapers ];
+
+  postPatch = ''
+    sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:"
+  '';
+
+  postInstall = ''
+    # Remove Deepin distro's lsb-release
+    rm $out/etc/lsb-release
+
+    # Don't override systemd timeouts
+    rm -r $out/etc/systemd
+
+    # Remove apt-specific templates
+    rm -r $out/share/python-apt
+
+    # Remove empty backgrounds directory
+    rm -r $out/share/backgrounds
+
+    # Make a symlink for deepin-version
+    ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Base assets and definitions for Deepin Desktop Environment";
+    homepage = https://github.com/linuxdeepin/deepin-desktop-base;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 291aa8c11be1..4e6530c2d18b 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -7,6 +7,7 @@ let
     dde-api = callPackage ./dde-api { };
     dde-calendar = callPackage ./dde-calendar { };
     dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
+    deepin-desktop-base = callPackage ./deepin-desktop-base { };
     deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
     deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
     deepin-gtk-theme = callPackage ./deepin-gtk-theme { };

From ea691fc8ee9cb4b49342148bac05b73e5068323f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 17 Oct 2018 19:39:49 +0200
Subject: [PATCH 3213/3253] tdesktopPackages.preview: 1.4.3 -> 1.4.4

---
 .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 03a99aea4001..1e8080fd9c9d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -13,6 +13,8 @@ let
 in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
+    version = "1.4.4";
+    sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0";
     stable = false;
   });
 }

From e494e1c4e3135304175e26502946f9d8645d9897 Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Tue, 16 Oct 2018 14:57:47 -0700
Subject: [PATCH 3214/3253] pythonPackages.python-packer: init at 0.1.2

---
 .../python-modules/python-packer/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-packer/default.nix

diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
new file mode 100644
index 000000000000..3f0c1f8138f9
--- /dev/null
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, sh }:
+
+buildPythonPackage rec {
+  pname = "python-packer";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
+  };
+
+  propagatedBuildInputs = [ sh ];
+  
+  # Tests requires network connections
+  doCheck = false;
+  
+  meta = with stdenv.lib; {
+    description = "An interface for packer.io";
+    homepage = https://github.com/nir0s/python-packer;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c66fd52d43b..662475469544 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -570,6 +570,8 @@ in {
 
   python3-openid = callPackage ../development/python-modules/python3-openid { };
 
+  python-packer = callPackage ../development/python-modules/python-packer { };
+
   python-periphery = callPackage ../development/python-modules/python-periphery { };
 
   python-prctl = callPackage ../development/python-modules/python-prctl { };

From 37593414201b31e719d796a09d58ba62251979e1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 17 Oct 2018 19:59:15 +0200
Subject: [PATCH 3215/3253] monkeysphere: 0.41 -> 0.42

---
 pkgs/tools/security/monkeysphere/default.nix | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index f4def72b728c..228695878dcc 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -1,27 +1,44 @@
 { stdenv, fetchurl, makeWrapper
 , perl, libassuan, libgcrypt
 , perlPackages, lockfileProgs, gnupg
+# For the tests:
+, bash, openssh, which, socat, cpio, hexdump
 }:
 
 stdenv.mkDerivation rec {
   name = "monkeysphere-${version}";
-  version = "0.41";
+  version = "0.42";
 
   src = fetchurl {
     url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz";
-    sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li";
+    sha256 = "1haqgjxm8v2xnhc652lx79p2cqggb9gxgaf19w9l9akar2qmdjf1";
   };
 
   patches = [ ./monkeysphere.patch ];
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ perl libassuan libgcrypt ];
+  buildInputs = [ perl libassuan libgcrypt ]
+    ++ stdenv.lib.optional doCheck
+      ([ gnupg openssh which socat cpio hexdump ] ++
+      (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ]));
 
   makeFlags = ''
     PREFIX=/
     DESTDIR=$(out)
   '';
 
+  # Not all checks pass yet (NixOS specific problems) and the tests "drain"
+  # entropy (apparently GnuPG still uses /dev/random).
+  doCheck = false;
+  preCheck = ''
+    patchShebangs tests/keytrans
+    patchShebangs src/share/keytrans
+    patchShebangs src/share/checkperms
+    sed -i "s,/usr/bin/env\ bash,${bash}/bin/bash," tests/basic
+    sed -i "s,/usr/sbin/sshd,${openssh}/bin/sshd," tests/basic
+    sed -i "s/<(hd/<(hexdump/" tests/keytrans
+  '';
+
   postFixup =
     let wrapperArgs = runtimeDeps:
           "--prefix PERL5LIB : "

From 07f135c7f55cfb96bd1e49170b98abbbb847da90 Mon Sep 17 00:00:00 2001
From: "Christoph Neidahl (OPNA2608)" <christoph.neidahl@uni-leipzig.de>
Date: Wed, 17 Oct 2018 20:13:07 +0200
Subject: [PATCH 3216/3253] x11vnc: moving substitutions, commenting sed line

moved substitutions to postPatch phase and commented on workaround sed line, as requested in the code reviews
---
 pkgs/tools/X11/x11vnc/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 9e38a2bc888e..6dc785621b59 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -24,17 +24,21 @@ stdenv.mkDerivation rec {
       libvncserver
     ];
 
-  preConfigure = ''
-    configureFlags="--mandir=$out/share/man"
-
+  postPatch = ''
     substituteInPlace src/unixpw.c \
         --replace '"/bin/su"' '"/run/wrappers/bin/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
     sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h
+
+    # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile
     sed -i -e '/^\tXdummy.c\ \\$/,$d' -e 's/\tx11vnc_loop\ \\/\tx11vnc_loop/' misc/Makefile.am
   '';
 
+  preConfigure = ''
+    configureFlags="--mandir=$out/share/man"
+  '';
+
   meta = with stdenv.lib; {
     description = "A VNC server connected to a real X11 screen";
     homepage = https://github.com/LibVNC/x11vnc/;

From c3c82aa675bb32f666d67b320a0f2a624298c0d7 Mon Sep 17 00:00:00 2001
From: Doug Beardsley <mightybyte@gmail.com>
Date: Wed, 17 Oct 2018 14:44:07 -0400
Subject: [PATCH 3217/3253] Update developPackage documentation

---
 .../development/haskell-modules/make-package-set.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 400465264883..5803e2946bff 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -200,12 +200,12 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #   , modifier : Defaulted
     #   , returnShellEnv : Defaulted
     #   } -> NixShellAwareDerivation
-    # Given a path to a haskell package directory whose cabal file is
-    # named the same as the directory name, an optional set of
-    # source overrides as appropriate for the 'packageSourceOverrides'
-    # function, an optional set of arbitrary overrides, and an optional
-    # haskell package modifier,  return a derivation appropriate
-    # for nix-build or nix-shell to build that package.
+    # Given a path to a haskell package directory, an optional package name
+    # which defaults to the base name of the path, an optional set of source
+    # overrides as appropriate for the 'packageSourceOverrides' function, an
+    # optional set of arbitrary overrides, and an optional haskell package
+    # modifier, return a derivation appropriate for nix-build or nix-shell to
+    # build that package.
     developPackage =
       { root
       , name ? builtins.baseNameOf root

From 15c5f9b1f067f98051cfe3374a2775a8ccc6ecf3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 19:56:01 +0200
Subject: [PATCH 3218/3253] libHX: add licenses

---
 pkgs/development/libraries/libHX/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 7de72ed73a65..39f493d821c3 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation rec {
     sh autogen.sh
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libhx.sourceforge.net/;
     longDescription = ''
       libHX is a C library (with some C++ bindings available) that provides data structures
       and functions commonly needed, such as maps, deques, linked lists, string formatting
       and autoresizing, option and config file parsing, type checking casts and more.
       '';
-    maintainers = [ stdenv.lib.maintainers.tstrobel ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+    license = with licenses; [ gpl3 lgpl21Plus wtfpl ];
   };
 }

From c8709769dcfdaef18ae75e50ad360369f514e7e0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:01:03 +0200
Subject: [PATCH 3219/3253] lesstif: add license, description, and homepage

---
 pkgs/development/libraries/lesstif/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 04e8eab4d287..b678a0893867 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
   # in Debian, so we assume they have been sent upstream.
   #
   patches = [
-    ./c-missing_xm_h.patch        
-    ./c-render_table_crash.patch 
+    ./c-missing_xm_h.patch
+    ./c-render_table_crash.patch
     ./c-xpmpipethrough.patch
     ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "An open source clone of the Motif widget set";
+    homepage = http://lesstif.sourceforge.net;
+    platforms = platforms.unix;
+    license = with licenses; [ gpl2 lgpl2 ];
   };
 }

From a0a4756ed3e4c48bb75cd28a3fc2252841fb6ade Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:03:43 +0200
Subject: [PATCH 3220/3253] libaccounts-glib: add license + description

---
 pkgs/development/libraries/libaccounts-glib/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 4bb806b91d8a..16e9f213ed48 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Library for managing accounts which can be used from GLib applications";
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
   };
 }

From bbcfb99e8d79f79dc41e061d5f46c7ebe3212483 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:06:06 +0200
Subject: [PATCH 3221/3253] libaom: add license

---
 pkgs/development/libraries/libaom/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index b94c845479aa..a08a1e335232 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     homepage    = https://aomedia.org/av1-features/get-started/;
     maintainers = with maintainers; [ kiloreux ];
     platforms   = platforms.all;
+    license = licenses.bsd2;
   };
 }

From 8ddce99ab9211152987f01c03d7a7046432a2601 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:07:05 +0200
Subject: [PATCH 3222/3253] libbap: add license

---
 pkgs/development/libraries/libbap/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 54fb89df0451..5153b63e91c5 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/binaryanalysisplatform/bap-bindings;
     description = "A C library for interacting with BAP";
-    maintainers = [ stdenv.lib.maintainers.maurer ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.maurer ];
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From a36e9b2047d8c6f74a3c4dd905f5afb33de751af Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:08:55 +0200
Subject: [PATCH 3223/3253] libdbusmenu-qt: add license

---
 pkgs/development/libraries/libdbusmenu-qt/default.nix | 2 +-
 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1342ee6773f7..501341d202ba 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
     inherit homepage;
-    maintainers = [ ];
     inherit (qt4.meta) platforms;
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 9c25757efb03..e8651de2b346 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
     inherit (qtbase.meta) platforms;
+    license = licenses.gpl2;
   };
 }

From f54413553b349c61693c0df67fb356bada61c3b4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:12:38 +0200
Subject: [PATCH 3224/3253] libexttextcat: add license

---
 pkgs/development/libraries/libexttextcat/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8d264c929a5b..7b3df42c24c3 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
     homepage = https://wiki.documentfoundation.org/Libexttextcat;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    license = licenses.bsd3;
   };
 }

From 2887798de50bdf852c625b9810a06414e122503c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:31:22 +0200
Subject: [PATCH 3225/3253] libgdiplus: add license + meta data

---
 pkgs/development/libraries/libgdiplus/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 5e94d00dcdb7..d54f9203d23d 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
+    homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
+    platforms = platforms.unix;
+    license = licenses.mit;
   };
 }

From 06cb58fba77beab5d3ba396af779afb888ea791d Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:33:02 +0200
Subject: [PATCH 3226/3253] libgnome-keyring: add license

---
 pkgs/development/libraries/libgnome-keyring/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index e7157afbaee5..0b496ff593b3 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
 
   meta = {
     inherit (glib.meta) platforms maintainers;
+    license = stdenv.lib.licenses.gpl2;
   };
 }

From 3e85c53ca6f1effb2617f33603084e3c6bc509a6 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:42:47 +0200
Subject: [PATCH 3227/3253] libgnurl: add licenses

---
 pkgs/development/libraries/libgnurl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 33276b424e7c..752d2ce5a1e7 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     homepage    = https://gnunet.org/gnurl;
     maintainers = with maintainers; [ falsifian vrthra ];
     platforms = platforms.linux;
+    license = with licenses; [ bsdOriginal mit ];
   };
 }

From 592e998cd7fe5f76e919deab0accb8bc98c5eb2b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:45:44 +0200
Subject: [PATCH 3228/3253] libicns: add licenses

---
 pkgs/development/libraries/libicns/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 08d80bcf9856..298d6124505c 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng jasper ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Library for manipulation of the Mac OS icns resource format";
+    homepage = https://icns.sourceforge.io;
+    license = with licenses; [ gpl2 lgpl2 lgpl21 ];
+    platforms = platforms.unix;
   };
 }

From ed09cdd0f6bd3f049c0545eaa779f6ca86f69c81 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:55:14 +0200
Subject: [PATCH 3229/3253] libiodbc: add license

---
 pkgs/development/libraries/libiodbc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 45649f944f51..faa070b3468c 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "iODBC driver manager";
     homepage = http://www.iodbc.org;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    license = licenses.bsd3;
   };
 }

From 1d902ca5a2e3f48ce29917a9e4a7c63ed294f12c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 17 Oct 2018 20:59:00 +0200
Subject: [PATCH 3230/3253] libite: add licenses

---
 pkgs/development/libraries/libite/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 7580c1b092e2..1616aa1e0cc1 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];
+    license = with licenses; [ mit isc ];
   };
 }
 

From 10c56c5cfbde7a2180d82e22c35887527b1e909f Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@blockstream.io>
Date: Wed, 17 Oct 2018 16:45:10 -0400
Subject: [PATCH 3231/3253] trezord: 2.0.19 -> 2.0.24

---
 pkgs/servers/trezord/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 9869da95a048..86fe1d7b008c 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "trezord-go-${version}";
-  version = "2.0.19";
+  version = "2.0.24";
 
   # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
   hardeningDisable = [ "fortify" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "19am5zs2mx36w2f8b5001i1sg6v72y1nq5cagnw6rza8qxyw83qs";
+    sha256 = "1fl2d57qqrrwl995w4b2d57rvl2cxxy6afjmcp648hhb3dnmp7c3";
   };
 
   meta = with stdenv.lib; {

From d039722d0e56ad08982154b5e02232ab9cd0945b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 17 Oct 2018 21:03:43 +0000
Subject: [PATCH 3232/3253] chromium 71+: add at-spi2-core dependency (#48594)

---
 pkgs/applications/networking/browsers/chromium/common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index acd3493fe7c8..e39a35ae1b0d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -14,7 +14,7 @@
 , glib, gtk2, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libGLU_combined
 , protobuf, speechd, libXdamage, cups
-, ffmpeg, libxslt, libxml2
+, ffmpeg, libxslt, libxml2, at-spi2-core
 
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
@@ -129,7 +129,8 @@ let
     ] ++ optional gnomeKeyringSupport libgnome-keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
-      ++ optional pulseSupport libpulseaudio;
+      ++ optional pulseSupport libpulseaudio
+      ++ optional (versionAtLeast version "71") at-spi2-core;
 
     patches = [
       # As major versions are added, you can trawl the gentoo and arch repos at

From d767ba99964eb776c2b482ca8a3a0ef42d7ccf8b Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 17 Oct 2018 21:04:15 +0000
Subject: [PATCH 3233/3253] chromium 71+: there is no more option 'use_gtk3'
 (#48595)

---
 pkgs/applications/networking/browsers/chromium/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e39a35ae1b0d..c18f77f8f996 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -233,7 +233,6 @@ let
       is_clang = false;
       clang_use_chrome_plugins = false;
       remove_webcore_debug_symbols = true;
-      use_gtk3 = true;
       enable_swiftshader = false;
       fieldtrial_testing_like_official_build = true;
 
@@ -244,6 +243,8 @@ let
       google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
       google_default_client_id = "404761575300.apps.googleusercontent.com";
       google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+    } // optionalAttrs (versionRange "60" "70") {
+      use_gtk3 = true;
     } // optionalAttrs proprietaryCodecs {
       # enable support for the H.264 codec
       proprietary_codecs = true;

From 21bb1fa004aae4d96e38bb14a06c24062118dde0 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 11 Aug 2018 11:32:00 -0400
Subject: [PATCH 3234/3253] nvidia_x11_beta: reinit at 410.57

---
 nixos/modules/hardware/video/nvidia.nix       | 12 ++--
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 58 +++++++++++--------
 pkgs/os-specific/linux/nvidia-x11/default.nix |  8 ++-
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 25 +++++---
 4 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 6944d1a4f76b..f8524ab99e8a 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
 # This module provides the proprietary NVIDIA X11 / OpenGL drivers.
 
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
 
 with lib;
 
@@ -23,7 +23,11 @@ let
     else null;
 
   nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
-  nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
+  nvidia_libs32 =
+    if versionOlder nvidia_x11.version "391" then
+      ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+    else
+      (nvidiaForKernel config.boot.kernelPackages).lib32;
 
   enabled = nvidia_x11 != null;
 
@@ -98,7 +102,7 @@ in
     assertions = [
       {
         assertion = config.services.xserver.displayManager.gdm.wayland;
-        message = "NVidia drivers don't support wayland";
+        message = "NVIDIA drivers don't support wayland";
       }
       {
         assertion = !optimusCfg.enable ||
@@ -161,7 +165,7 @@ in
     };
 
     hardware.opengl.package = nvidia_x11.out;
-    hardware.opengl.package32 = nvidia_libs32.out;
+    hardware.opengl.package32 = nvidia_libs32;
 
     environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
       ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 15c3e10e1199..8882ffdd45e7 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -26,32 +26,44 @@ buildPhase() {
     fi
 }
 
-    
+
 installPhase() {
     # Install libGL and friends.
+
+    # since version 391, 32bit libraries are bundled in the 32/ sub-directory
+    if [ "$i686bundled" = "1" ]; then
+        mkdir -p "$lib32/lib"
+        cp -prd 32/*.so.* 32/tls "$lib32/lib/"
+    fi
+
     mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
-    rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately
-    rm -f $out/lib/libnvidia-gtk* # built from source
-    if [ "$useGLVND" = "1" ]; then
-        # Pre-built libglvnd
-        rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
-    fi
-    # Use ocl-icd instead
-    rm $out/lib/libOpenCL.so*
-    # Move VDPAU libraries to their place
-    mkdir $out/lib/vdpau
-    mv $out/lib/libvdpau* $out/lib/vdpau
 
-    # Install ICDs.
-    install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd
-    if [ -e nvidia_icd.json.template ]; then
-        sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
-        install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json
-    fi
-    if [ "$useGLVND" = "1" ]; then
-        install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json
-    fi
+    for i in $lib32 $out; do
+        rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately
+        rm -f $i/lib/libnvidia-gtk* # built from source
+        if [ "$useGLVND" = "1" ]; then
+            # Pre-built libglvnd
+            rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.*
+        fi
+        # Use ocl-icd instead
+        rm -f $i/lib/libOpenCL.so*
+        # Move VDPAU libraries to their place
+        mkdir $i/lib/vdpau
+        mv $i/lib/libvdpau* $i/lib/vdpau
+
+        # Install ICDs.
+        install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd
+        if [ -e nvidia_icd.json.template ]; then
+            sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
+            install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
+        fi
+        if [ "$useGLVND" = "1" ]; then
+            install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json
+        fi
+
+    done
+
 
     if [ -n "$bin" ]; then
         # Install the X drivers.
@@ -60,7 +72,7 @@ installPhase() {
         mkdir -p $bin/lib/xorg/modules/drivers
         cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers
         mkdir -p $bin/lib/xorg/modules/extensions
-        cp -p libglx.so.* $bin/lib/xorg/modules/extensions
+        cp -p libglx*.so* $bin/lib/xorg/modules/extensions
 
         # Install the kernel module.
         mkdir -p $bin/lib/modules/$kernelVersion/misc
@@ -78,7 +90,7 @@ installPhase() {
     fi
 
     # All libs except GUI-only are installed now, so fixup them.
-    for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
+    for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*')
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
       # Unfortunately --shrink-rpath would strip too much.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index d9ff157e1429..492b268610f1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -26,8 +26,12 @@ rec {
     patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
   };
 
-  beta = stable; # not enough interest to maintain beta ATM
-
+  beta = generic {
+    version = "410.57";
+    sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w";
+    settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915";
+    persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw";
+  };
 
   legacy_340 = generic {
     version = "340.104";
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 090fce3a485c..a40a64344932 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -1,5 +1,5 @@
 { version
-, sha256_32bit
+, sha256_32bit ? null
 , sha256_64bit
 , settingsSha256
 , persistencedSha256
@@ -22,11 +22,15 @@
 
 with stdenv.lib;
 
-assert (!libsOnly) -> kernel != null;
+assert !libsOnly -> kernel != null;
+assert versionOlder version "391" -> sha256_32bit != null;
+assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux";
 
 let
   nameSuffix = optionalString (!libsOnly) "-${kernel.version}";
   pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
+  i686bundled = versionAtLeast version "391";
+
 
   self = stdenv.mkDerivation {
     name = "nvidia-x11-${version}${nameSuffix}";
@@ -34,24 +38,27 @@ let
     builder = ./builder.sh;
 
     src =
-      if stdenv.hostPlatform.system == "i686-linux" then
-        fetchurl {
-          url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
-          sha256 = sha256_32bit;
-        }
-      else if stdenv.hostPlatform.system == "x86_64-linux" then
+      if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
           sha256 = sha256_64bit;
         }
+      else if stdenv.hostPlatform.system == "i686-linux" then
+        fetchurl {
+          url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
+          sha256 = sha256_32bit;
+        }
       else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
 
     patches = if libsOnly then null else patches;
     inherit prePatch;
     inherit version useGLVND useProfiles;
     inherit (stdenv.hostPlatform) system;
+    inherit i686bundled;
 
-    outputs = [ "out" ] ++ optional (!libsOnly) "bin";
+    outputs = [ "out" ]
+        ++ optional i686bundled "lib32"
+        ++ optional (!libsOnly) "bin";
     outputDev = if libsOnly then null else "bin";
 
     kernel = if libsOnly then null else kernel.dev;

From 70d532cf2cc60cb0d6744e5a8fca961cd2dc511a Mon Sep 17 00:00:00 2001
From: Matthew Robbetts <mrobbetts@gmail.com>
Date: Wed, 17 Oct 2018 16:57:59 -0700
Subject: [PATCH 3235/3253] eternal-terminal: 4.1.2 -> 5.1.6.

---
 pkgs/tools/networking/eternal-terminal/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 8941494e316e..dd7a43a82ae0 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }:
+{ stdenv, fetchFromGitHub, cmake, gflags, libsodium, protobuf }:
 
 stdenv.mkDerivation rec {
   name = "eternal-terminal-${version}";
-  version = "4.1.2";
+  version = "5.1.6";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTCP";
     rev = "refs/tags/et-v${version}";
-    sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz";
+    sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ gflags glog libsodium protobuf ];
+  buildInputs = [ gflags libsodium protobuf ];
 
   enableParallelBuilding = true;
 

From b2dabdc697b760b3c95056c2dd8dc2771ef93a12 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 17 Oct 2018 20:48:19 -0400
Subject: [PATCH 3236/3253] sbt: 1.2.4 -> 1.2.6

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 60f342db12aa..dce19a1d8395 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.2.4";
+  version = "1.2.6";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "06zv1mm4rhl0h6qa7m4w5lbwjcyqp43r183q36q9zlyip965mnrn";
+    sha256 = "1nv8r3j2vhp38qbb123n86wfhb6mvwz7vgrrsjp344zg211psncn";
   };
 
   patchPhase = ''

From f1195b912be8bd55c34ce6dfa268cb402d9abec7 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 17 Oct 2018 20:59:52 -0400
Subject: [PATCH 3237/3253] jdk10: remove special handling for arm

neither oraclejdk nor openjdk is supported on arm, so this is needless
complexity
---
 pkgs/top-level/all-packages.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1879dc063ee..4c888fe1f5e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6964,14 +6964,12 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
-  jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+  jdk10 = openjdk10 // { outputs = [ "out" ]; };
+  jre10 = lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk10.jre // { outputs = [ "jre" ]; }));
   jre10_headless =
-    if stdenv.isAarch32 || stdenv.isAarch64 then
-      oraclejre10
-    else if stdenv.isDarwin then
+    if stdenv.isDarwin then
       jre10
     else
       lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}-headless"

From 21b8427b0c9e734ca31f5561567f92ff759ed917 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 17 Oct 2018 19:41:18 -0500
Subject: [PATCH 3238/3253] ruby_2_4: 2.4.4 -> 2.4.5

---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9e6d35b818f4..1aa7d5d53791 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -210,10 +210,10 @@ in {
   };
 
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "4" "";
+    version = rubyVersion "2" "4" "5" "";
     sha256 = {
-      src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
-      git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
+      src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
+      git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index ca180b3c2294..984dee84fa18 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,7 +6,7 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.4" = ops useRailsExpress [
+  "2.4.5" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"

From ee9d62241cf5c6b24838c5b2f472c8ddc4e9ba08 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 17 Oct 2018 19:44:15 -0500
Subject: [PATCH 3239/3253] ruby_2_3: 2.3.7 -> 2.3.8

---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 1aa7d5d53791..e2b4730b0d09 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -202,10 +202,10 @@ let
 
 in {
   ruby_2_3 = generic {
-    version = rubyVersion "2" "3" "7" "";
+    version = rubyVersion "2" "3" "8" "";
     sha256 = {
-      src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
-      git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
+      src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
+      git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 984dee84fa18..bf4a406e9874 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,7 +1,7 @@
 { patchSet, useRailsExpress, ops, patchLevel }:
 
 rec {
-  "2.3.7" = ops useRailsExpress [
+  "2.3.8" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"

From ce0bec2baa81def4889a79969b379f43d9c5582f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 17 Oct 2018 20:05:14 -0500
Subject: [PATCH 3240/3253] ruby_2_5: 2.5.1 -> 2.5.2

---
 pkgs/development/interpreters/ruby/default.nix   | 10 +++++-----
 pkgs/development/interpreters/ruby/patchsets.nix |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index e2b4730b0d09..4120124d9bae 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -111,8 +111,8 @@ let
 
         postPatch = if isRuby25 then ''
           sed -i configure.ac -e '/config.guess/d'
-          cp ${config}/config.guess tool/
-          cp ${config}/config.sub tool/
+          cp --remove-destination ${config}/config.guess tool/
+          cp --remove-destination ${config}/config.sub tool/
         ''
         else opString useRailsExpress ''
           sed -i configure.in -e '/config.guess/d'
@@ -218,10 +218,10 @@ in {
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "1" "";
+    version = rubyVersion "2" "5" "2" "";
     sha256 = {
-      src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
-      git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
+      src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk";
+      git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index bf4a406e9874..151e9c483530 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -11,7 +11,7 @@ rec {
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.1" = ops useRailsExpress [
+  "2.5.2" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"

From 747377a9f8b68daba819e409aed0840289625303 Mon Sep 17 00:00:00 2001
From: Matthew Robbetts <mrobbetts@gmail.com>
Date: Wed, 17 Oct 2018 23:05:21 -0700
Subject: [PATCH 3241/3253] Add ninja, remove enableParallelBuilding.

---
 pkgs/tools/networking/eternal-terminal/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index dd7a43a82ae0..fda5d25aa17d 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gflags, libsodium, protobuf }:
+{ stdenv, fetchFromGitHub, cmake, ninja, gflags, libsodium, protobuf }:
 
 stdenv.mkDerivation rec {
   name = "eternal-terminal-${version}";
@@ -11,11 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0df573c5hi3hxa0d3m02zf2iyh841540dklj9lmp6faik8cp39jz";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ gflags libsodium protobuf ];
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Remote shell that automatically reconnects without interrupting the session";
     license = licenses.asl20;

From 1c7d38bcfbf5a27fe3df9cefa1dac5864e492075 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Tue, 16 Oct 2018 09:38:36 +1100
Subject: [PATCH 3242/3253] bazel: 0.17.1 -> 0.18.0

---
 .../tools/build-managers/bazel/default.nix    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e9f005f79917..19836b412c04 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -13,8 +13,8 @@
 let
   srcDeps = lib.singleton (
     fetchurl {
-      url = "https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip";
-      sha256 = "c80f3f3d442d8a6ca7adc83f90ecd638c3864087fdd6787ffac070b6f1cc8f9b";
+      url = "https://github.com/google/desugar_jdk_libs/archive/fd937f4180c1b557805219af4482f1a27eb0ff2b.zip";
+      sha256 = "04hs399340xfwcdajbbcpywnb2syp6z5ydwg966if3hqdb2zrf23";
     }
   );
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
 
-  version = "0.17.1";
+  version = "0.18.0";
 
   meta = with lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,19 +42,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13";
+    sha256 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h";
   };
 
   sourceRoot = ".";
 
   patches =
-    lib.optional enableNixHacks ./nix-hacks.patch
-    # patch perl out of the bash completions
-    # should land in 0.18
-    ++ [(fetchpatch {
-           url = "https://github.com/bazelbuild/bazel/commit/27be70979b54d7510bf401d9581fb4075737ef34.patch";
-           sha256 = "04rip46lnibrsdyzjpi29wf444b49cbwb1xjcbrr3kdqsdj4d8h5";
-       })];
+    lib.optional enableNixHacks ./nix-hacks.patch;
 
   # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
 
@@ -137,10 +131,10 @@ stdenv.mkDerivation rec {
       echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
       echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
       echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
-      sed -i -e "362 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
-      sed -i -e "362 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
-      sed -i -e "362 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
-      sed -i -e "362 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "378 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "378 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "378 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
+      sed -i -e "378 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
 
       # --experimental_strict_action_env (which will soon become the
       # default, see bazelbuild/bazel#2574) hardcodes the default

From 613d3bac86eebfeec082ee742b1706f2cc66c7c1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 18 Oct 2018 03:04:36 +0800
Subject: [PATCH 3243/3253] pulseaudio-modules-bt: Patched rpath takes
 precedence over original

This fixes a segmentation fault when loaded via pulseaudio's dl-search-path
---
 pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
index 6bb432b3fd88..b377db65c0c9 100644
--- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
+++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , runCommand
 , fetchFromGitHub
-, libpulseaudio
 , pulseaudio
 , pkgconfig
 , ffmpeg_4
@@ -44,7 +43,6 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libpulseaudio
     pulseaudio
     ffmpeg_4
     libtool
@@ -67,7 +65,7 @@ in stdenv.mkDerivation rec {
     for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
       orig_rpath=$(patchelf --print-rpath "$so")
       patchelf \
-        --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \
+        --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
         "$so"
     done
   '';

From 78c0e1aa11f6b93fcbbf473b0691f3dbf9bc6039 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 18 Oct 2018 03:05:46 +0800
Subject: [PATCH 3244/3253] nixos/pulseaudio: Add extraModules config option

---
 nixos/modules/config/pulseaudio.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e16a021ec20b..d4aa59506295 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -154,6 +154,18 @@ in {
         '';
       };
 
+      extraModules = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        example = literalExample "[ pkgs.pulseaudio-modules-bt ]";
+        description = ''
+          Extra pulseaudio modules to use. This is intended for out-of-tree
+          pulseaudio modules like extra bluetooth codecs.
+
+          Extra modules take precedence over built-in pulseaudio modules.
+        '';
+      };
+
       daemon = {
         logLevel = mkOption {
           type = types.str;
@@ -236,6 +248,18 @@ in {
       systemd.packages = [ overriddenPackage ];
     })
 
+    (mkIf (cfg.extraModules != []) {
+      hardware.pulseaudio.daemon.config.dl-search-path = let
+        overriddenModules = builtins.map
+          (drv: drv.override { pulseaudio = overriddenPackage; })
+          cfg.extraModules;
+        modulePaths = builtins.map
+          (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
+          # User-provided extra modules take precedence
+          (overriddenModules ++ [ overriddenPackage ]);
+      in lib.concatStringsSep ":" modulePaths;
+    })
+
     (mkIf hasZeroconf {
       services.avahi.enable = true;
     })

From 5df3a4d9b916bf2f6c2a1eeb1594d161cf2a6352 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 17 Oct 2018 21:38:38 -0500
Subject: [PATCH 3245/3253] pythonPackages.pathlib2: remove unnecessary python
 version check

---
 pkgs/development/python-modules/pathlib2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 412186e6075b..c85b29eac858 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -8,7 +8,7 @@
 , mock
 }:
 
-if !(pythonOlder "3.4") then null else buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "pathlib2";
   version = "2.3.2";
 

From 5143e303619dd21e134d036667d4f2316b6e8a27 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 17 Oct 2018 21:40:16 -0500
Subject: [PATCH 3246/3253] pythonPackages.pytest: pathlib2 is only required
 for python<3.6

---
 pkgs/development/python-modules/pytest/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index deb9cbdb7d0a..cdfdb8a64c95 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
+{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
 , atomicwrites, mock, writeText, pathlib2
 }:
@@ -19,7 +19,8 @@ buildPythonPackage rec {
   checkInputs = [ hypothesis mock ];
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
-    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ];
+    ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ]
+    ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ];
 
   checkPhase = ''
     runHook preCheck

From 0e6a5c908d4dd47725fb8e8cd3266a1c6684ed02 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 18 Oct 2018 12:17:43 +0300
Subject: [PATCH 3247/3253] bat: 0.7.1 -> 0.8.0

---
 pkgs/tools/misc/bat/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 0cacfa6e54e4..4bd4a02c7a2d 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "1fzk0z7r70rjvv2c6531zaa1jzbcb7j9wbi0xqb9y4dls538bmz0";
+    sha256 = "1xvjw61q0qbnzj95g7g8xckcqha9jrf2172b5l7faj7i0jhmz2kx";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "19syz0sxcpk3i4675bfq5gpb9i6hp81in36w820kkvamaimq10nd";
+  cargoSha256 = "0xv769f2iqrgnbmb7ma9p3gbb2xpx2lhqc0kq5nizf8w8xdc5m11";
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 
@@ -22,6 +22,13 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     install -m 444 -Dt $out/share/man/man1 doc/bat.1
+
+    install -Dm644 target/release/build/bat-*/out/_bat \
+      "$out/share/zsh/site-functions/_bat"
+    install -Dm644 target/release/build/bat-*/out/bat.bash \
+      "$out/share/bash-completions/completions/bat.bash"
+    install -Dm644 target/release/build/bat-*/out/bat.fish \
+      "$out/share/fish/vendor_completions.d/bat.fish"
   '';
 
   meta = with stdenv.lib; {

From 17685a40221f9170ae782819f42001b746a6924f Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Thu, 18 Oct 2018 11:34:43 +0200
Subject: [PATCH 3248/3253] bento4: init at 1.5.1-624 (#47632)

---
 pkgs/tools/video/bento4/default.nix | 30 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/video/bento4/default.nix

diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix
new file mode 100644
index 000000000000..687f80f1adfc
--- /dev/null
+++ b/pkgs/tools/video/bento4/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub
+, cmake
+}:
+stdenv.mkDerivation rec {
+  name = "bento4-${version}";
+  version = "1.5.1-624";
+
+  src = fetchFromGitHub {
+    owner = "axiomatic-systems";
+    repo = "Bento4";
+    rev = "v${version}";
+    sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  installPhase = ''
+    mkdir -p $out/{lib,bin}
+    find -iname '*.so' -exec mv --target-directory="$out/lib" {} \;
+    find -maxdepth 1 -executable -type f -exec mv --target-directory="$out/bin" {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Full-featured MP4 format and MPEG DASH library and tools";
+    homepage = http://bento4.com;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ makefu ];
+    broken = stdenv.isAarch64;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfe6f5628d8c..105e31496d13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1684,6 +1684,8 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
+  bento4 = callPackage ../tools/video/bento4 { };
+
   bepasty = callPackage ../tools/misc/bepasty { };
 
   bettercap = callPackage ../tools/security/bettercap { };

From f12513b53e99dc72fac0da4a35ff34bf99e82275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 18 Oct 2018 06:36:14 -0300
Subject: [PATCH 3249/3253] deepin-movie-reborn: init at 3.2.10 (#48651)

---
 .../deepin/deepin-movie-reborn/default.nix    | 53 +++++++++++++++++++
 pkgs/desktops/deepin/default.nix              |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/desktops/deepin/deepin-movie-reborn/default.nix

diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
new file mode 100644
index 000000000000..52a51c0db861
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
+  dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
+  libdvdnav, libdvdread, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "deepin-movie-reborn";
+  version = "3.2.10";
+
+  src = fetchFromGitHub {
+    owner = "linuxdeepin";
+    repo = pname;
+    rev = version;
+    sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    qttools
+  ];
+
+  buildInputs = [
+    dtkcore
+    dtkwidget
+    ffmpeg
+    ffmpegthumbnailer
+    libdvdnav
+    libdvdread
+    mpv
+    pulseaudio
+    qtx11extras
+    xorg.libXdmcp
+    xorg.libXtst
+    xorg.libpthreadstubs
+    xorg.xcbproto
+  ];
+
+  NIX_LDFLAGS = "-ldvdnav";
+
+  postPatch = ''
+    sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2,"
+    sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Deepin movie player";
+    homepage = https://github.com/linuxdeepin/deepin-movie-reborn;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 4e6530c2d18b..83a9de2d9b75 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -15,6 +15,7 @@ let
     deepin-image-viewer = callPackage ./deepin-image-viewer { };
     deepin-menu = callPackage ./deepin-menu { };
     deepin-metacity = callPackage ./deepin-metacity { };
+    deepin-movie-reborn = callPackage ./deepin-movie-reborn { };
     deepin-mutter = callPackage ./deepin-mutter { };
     deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
     deepin-sound-theme = callPackage ./deepin-sound-theme { };

From 290a7d2ee9394724c80df4fce4d102503c5d68fd Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Thu, 18 Oct 2018 13:11:52 +0200
Subject: [PATCH 3250/3253] nixos/openafs: Add defaultText to avoid evaluating
 packages

---
 nixos/modules/services/network-filesystems/openafs/client.nix | 2 ++
 nixos/modules/services/network-filesystems/openafs/server.nix | 1 +
 2 files changed, 3 insertions(+)

diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix
index 52c0966e05bc..240c1392088f 100644
--- a/nixos/modules/services/network-filesystems/openafs/client.nix
+++ b/nixos/modules/services/network-filesystems/openafs/client.nix
@@ -149,11 +149,13 @@ in
       packages = {
         module = mkOption {
           default = config.boot.kernelPackages.openafs;
+          defaultText = "config.boot.kernelPackages.openafs";
           type = types.package;
           description = "OpenAFS kernel module package. MUST match the userland package!";
         };
         programs = mkOption {
           default = getBin pkgs.openafs;
+          defaultText = "config.boot.kernelPackages.openafs";
           type = types.package;
           description = "OpenAFS programs package. MUST match the kernel module package!";
         };
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index 4c80ed0839f7..095024d2c8af 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -80,6 +80,7 @@ in {
 
       package = mkOption {
         default = pkgs.openafs.server or pkgs.openafs;
+        defaultText = "pkgs.openafs.server or pkgs.openafs";
         type = types.package;
         description = "OpenAFS package for the server binaries";
       };

From ab8ff7c07c7f90fa0a5969c21d0c5611924fac48 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 18 Oct 2018 08:26:51 -0400
Subject: [PATCH 3251/3253] linux: 4.9.133 -> 4.9.134

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cdf7000fba89..2810652aab67 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.133";
+  version = "4.9.134";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0qv5n8vipkqcd0hpf5l41h023n46rgja39h895phlcxs4p00ywsk";
+    sha256 = "0xvsk5q4w4sa3vk0rhckxn7faj12rvmfpwn08m4qf7024b8yiyvd";
   };
 } // (args.argsOverride or {}))

From 7abe0e881e4a1167f124234efe4f4ed43d84d6bd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 18 Oct 2018 08:27:03 -0400
Subject: [PATCH 3252/3253] linux: 4.14.76 -> 4.14.77

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 60b3ffb2d8dc..f82f7406e91c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.76";
+  version = "4.14.77";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gl2wkq4sazvpr0xnn4vrajj3j7w6hfiwdiy34y7jhlazyj1jgzf";
+    sha256 = "1y567wkr4p7hywq3pdw06yc4hi16rp1vkx764wzy5nyajkhz95h4";
   };
 } // (args.argsOverride or {}))

From 42cfc436ceae4861a6ef6737bab500ad0e82677b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 18 Oct 2018 08:27:12 -0400
Subject: [PATCH 3253/3253] linux: 4.18.14 -> 4.18.15

---
 pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 9bf33c068b55..c694d4503ed2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.18.14";
+  version = "4.18.15";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1lv2hpxzlk1yzr5dcjb0q0ylvlwx4ln2jvfvf01b9smr1lvd3iin";
+    sha256 = "0cr9ash165yimwf8742c9cshfnjvmnzibyfrii9cnfig9m8m3hwg";
   };
 } // (args.argsOverride or {}))